feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

ModelEditor: Simplify UiController

Browse Source 
Change-Id: I3182f3e3c038d0c2d6daa94d59cb96865d2baf20
Reviewed-by: Marcus Tillmanns <marcus.tillmanns@qt.io>
This commit is contained in:
hjk
2023-09-27 15:48:29 +02:00
parent 0eacd0190d
commit 018993fc37
2 changed files with 19 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
src/plugins/modeleditor/uicontroller.cpp
View File

@@ -3,9 +3,8 @@
#include "uicontroller.h" #include "uicontroller.h"
#include "modeleditor_constants.h"
#include <coreplugin/icore.h> #include <coreplugin/icore.h>
#include <utils/qtcsettings.h> #include <utils/qtcsettings.h>
using namespace Utils; using namespace Utils;
@@ -13,52 +12,39 @@ using namespace Utils;
namespace ModelEditor { namespace ModelEditor {
namespace Internal { namespace Internal {
class UiController::UiControllerPrivate // Settings entries
{ const char SETTINGS_RIGHT_SPLITTER[] = "ModelEditorPlugin/RightSplitter";
public: const char SETTINGS_RIGHT_HORIZ_SPLITTER[] = "ModelEditorPlugin/RightHorizSplitter";
QByteArray rightSplitterState;
QByteArray rightHorizSplitterState;
};
UiController::UiController()
: d(new UiControllerPrivate)
{
}
UiController::~UiController()
{
delete d;
}
bool UiController::hasRightSplitterState() const bool UiController::hasRightSplitterState() const
{ {
return !d->rightSplitterState.isEmpty(); return !m_rightSplitterState.isEmpty();
} }
QByteArray UiController::rightSplitterState() const QByteArray UiController::rightSplitterState() const
{ {
return d->rightSplitterState; return m_rightSplitterState;
} }
bool UiController::hasRightHorizSplitterState() const bool UiController::hasRightHorizSplitterState() const
{ {
return !d->rightHorizSplitterState.isEmpty(); return !m_rightHorizSplitterState.isEmpty();
} }
QByteArray UiController::rightHorizSplitterState() const QByteArray UiController::rightHorizSplitterState() const
{ {
return d->rightHorizSplitterState; return m_rightHorizSplitterState;
} }
void UiController::onRightSplitterChanged(const QByteArray &state) void UiController::onRightSplitterChanged(const QByteArray &state)
{ {
d->rightSplitterState = state; m_rightSplitterState = state;
emit rightSplitterChanged(state); emit rightSplitterChanged(state);
} }
void UiController::onRightHorizSplitterChanged(const QByteArray &state) void UiController::onRightHorizSplitterChanged(const QByteArray &state)
{ {
d->rightHorizSplitterState = state; m_rightHorizSplitterState = state;
emit rightHorizSplitterChanged(state); emit rightHorizSplitterChanged(state);
} }
@@ -66,23 +52,18 @@ void UiController::saveSettings()
{ {
QtcSettings *settings = Core::ICore::settings(); QtcSettings *settings = Core::ICore::settings();
if (hasRightSplitterState()) if (hasRightSplitterState())
settings->setValue(Constants::SETTINGS_RIGHT_SPLITTER, d->rightSplitterState); settings->setValue(SETTINGS_RIGHT_SPLITTER, m_rightSplitterState);
if (hasRightHorizSplitterState()) if (hasRightHorizSplitterState())
settings->setValue(Constants::SETTINGS_RIGHT_HORIZ_SPLITTER, d->rightHorizSplitterState); settings->setValue(SETTINGS_RIGHT_HORIZ_SPLITTER, m_rightHorizSplitterState);
settings->endGroup();
} }
void UiController::loadSettings() void UiController::loadSettings()
{ {
QtcSettings *settings = Core::ICore::settings(); QtcSettings *settings = Core::ICore::settings();
settings->beginGroup(Constants::SETTINGS_GROUP); if (settings->contains(SETTINGS_RIGHT_SPLITTER))
if (settings->contains(Constants::SETTINGS_RIGHT_SPLITTER)) m_rightSplitterState = settings->value(SETTINGS_RIGHT_SPLITTER).toByteArray();
d->rightSplitterState = settings->value(Constants::SETTINGS_RIGHT_SPLITTER).toByteArray(); if (settings->contains(SETTINGS_RIGHT_HORIZ_SPLITTER))
if (settings->contains(Constants::SETTINGS_RIGHT_HORIZ_SPLITTER)) { m_rightHorizSplitterState = settings->value(SETTINGS_RIGHT_HORIZ_SPLITTER).toByteArray();
d->rightHorizSplitterState = settings->value(Constants::SETTINGS_RIGHT_HORIZ_SPLITTER)
.toByteArray();
}
settings->endGroup();
} }
} // namespace Internal } // namespace Internal

6
src/plugins/modeleditor/uicontroller.h
View File

@@ -14,8 +14,7 @@ class UiController : public QObject
class UiControllerPrivate; class UiControllerPrivate;
public: public:
UiController(); UiController() {}
~UiController();
signals: signals:
void rightSplitterChanged(const QByteArray &state); void rightSplitterChanged(const QByteArray &state);
@@ -33,7 +32,8 @@ public:
void loadSettings(); void loadSettings();
private: private:
UiControllerPrivate *d; QByteArray m_rightSplitterState;
QByteArray m_rightHorizSplitterState;
}; };
} // namespace Internal } // namespace Internal