smw/deskflow
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

#6583 Changed Server config to pull Settings directly from AppConfig instead of maintaining its own pointer

Browse source 
Signed-off-by: jnewbon <jamie@symless.com>
This commit is contained in:
jnewbon 2020-02-25 16:32:46 +00:00
parent 87692ad0a5
commit 0243ba9171
2 changed files with 21 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
src/gui/src/ServerConfig.cpp
View file

@ -42,21 +42,21 @@ static const struct
const int serverDefaultIndex = 7; const int serverDefaultIndex = 7;
ServerConfig::ServerConfig(QSettings* settings, int numColumns, int numRows , ServerConfig::ServerConfig(AppConfig* appConfig, int numColumns, int numRows ,
QString serverName, MainWindow* mainWindow) : QString serverName, MainWindow* mainWindow) :
m_pSettings(settings), m_pAppConfig(appConfig),
m_Screens(), m_Screens(),
m_NumColumns(numColumns), m_NumColumns(numColumns),
m_NumRows(numRows), m_NumRows(numRows),
m_ServerName(serverName), m_ServerName(serverName),
m_IgnoreAutoConfigClient(false), m_IgnoreAutoConfigClient(false),
m_EnableDragAndDrop(false), m_EnableDragAndDrop(false),
m_DisableLockToScreen(false), m_DisableLockToScreen(false),
m_ClipboardSharing(true), m_ClipboardSharing(true),
m_ClipboardSharingSize(defaultClipboardSharingSize()), m_ClipboardSharingSize(defaultClipboardSharingSize()),
m_pMainWindow(mainWindow) m_pMainWindow(mainWindow)
{ {
Q_ASSERT(m_pSettings); Q_ASSERT(m_pAppConfig);
loadSettings(); loadSettings();
} }
@ -430,3 +430,7 @@ size_t ServerConfig::setClipboardSharingSize(size_t size) {
swap (size, m_ClipboardSharingSize); swap (size, m_ClipboardSharingSize);
return size; return size;
} }
QSettings &ServerConfig::settings() {
return m_pAppConfig->settings();
}

7
src/gui/src/ServerConfig.h
View file

@ -32,6 +32,7 @@ class QString;
class QFile; class QFile;
class ServerConfigDialog; class ServerConfigDialog;
class MainWindow; class MainWindow;
class AppConfig;
class ServerConfig : public BaseConfig class ServerConfig : public BaseConfig
{ {
@ -39,7 +40,7 @@ class ServerConfig : public BaseConfig
friend QTextStream& operator<<(QTextStream& outStream, const ServerConfig& config); friend QTextStream& operator<<(QTextStream& outStream, const ServerConfig& config);
public: public:
ServerConfig(QSettings* settings, int numColumns, int numRows, ServerConfig(AppConfig* settings, int numColumns, int numRows,
QString serverName, MainWindow* mainWindow); QString serverName, MainWindow* mainWindow);
~ServerConfig(); ~ServerConfig();
@ -75,7 +76,7 @@ class ServerConfig : public BaseConfig
int autoAddScreen(const QString name); int autoAddScreen(const QString name);
protected: protected:
QSettings& settings() { return *m_pSettings; } QSettings& settings();
ScreenList& screens() { return m_Screens; } ScreenList& screens() { return m_Screens; }
void setScreens(const ScreenList& screens) { m_Screens = screens; } void setScreens(const ScreenList& screens) { m_Screens = screens; }
void addScreen(const Screen& screen) { m_Screens.append(screen); } void addScreen(const Screen& screen) { m_Screens.append(screen); }
@ -110,7 +111,7 @@ class ServerConfig : public BaseConfig
void addToFirstEmptyGrid(const QString& clientName); void addToFirstEmptyGrid(const QString& clientName);
private: private:
QSettings* m_pSettings; AppConfig* m_pAppConfig;
ScreenList m_Screens; ScreenList m_Screens;
int m_NumColumns; int m_NumColumns;
int m_NumRows; int m_NumRows;