krageon/openmw-tes3coop
1
0
Fork 0
forked from teamnwah/openmw-tes3coop
Code Issues Pull requests Releases Wiki Activity

Moved signalUpdateEditorSettings from UserSettingsDialog to

Browse source 
UserSettings.

UserSettings is now derived from QObject.
This commit is contained in:
graffy76 2013-05-12 15:15:57 -05:00
parent 144be59735
commit c71d921f09
5 changed files with 15 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
apps/opencs/CMakeLists.txt
View file

@ -93,12 +93,12 @@ opencs_units_noqt (view/settings
)
opencs_units (model/settings
usersettings
settingcontainer
)
opencs_units_noqt (model/settings
support
usersettings
settingsitem
)

8
apps/opencs/model/settings/usersettings.hpp
View file

@ -17,8 +17,11 @@ class QFile;
namespace CSMSettings {
struct UserSettings
struct UserSettings: public QObject
{
Q_OBJECT
public:
static UserSettings &instance()
@ -41,6 +44,9 @@ namespace CSMSettings {
UserSettings (UserSettings const &); //not implemented
void operator= (UserSettings const &); //not implemented
signals:
void signalUpdateEditorSetting (const QString &settingName, const QString &settingValue);
};
}
#endif // USERSETTINGS_HPP

6
apps/opencs/view/doc/view.cpp
View file

@ -16,6 +16,8 @@
#include "operations.hpp"
#include "subview.hpp"
#include <QDebug>
void CSVDoc::View::closeEvent (QCloseEvent *event)
{
if (!mViewManager.closeRequest (this))
@ -250,7 +252,7 @@ void CSVDoc::View::showUserSettings()
{
CSVSettings::UserSettingsDialog *settingsDialog = new CSVSettings::UserSettingsDialog(this);
connect (settingsDialog, SIGNAL (signalUpdateEditorSetting (const QString &, const QString &)),
connect (&(CSMSettings::UserSettings::instance()), SIGNAL (signalUpdateEditorSetting (const QString &, const QString &)),
this, SLOT (slotUpdateEditorSetting (const QString &, const QString &)) );
settingsDialog->show();
@ -260,6 +262,8 @@ void CSVDoc::View::slotUpdateEditorSetting(const QString &settingName, const QSt
{
static QString lastValue = "";
qDebug() << "updating setting: " << settingName << " = " << settingValue;
if (lastValue != settingValue)
{
//evaluate settingName against tokens to determine which function to call to update Editor application.

2
apps/opencs/view/settings/usersettingsdialog.cpp
View file

@ -92,7 +92,7 @@ void CSVSettings::UserSettingsDialog::createSamplePage()
new QListWidgetItem (page->objectName(), mListWidget);
connect ( page, SIGNAL ( signalUpdateEditorSetting (const QString &, const QString &)),
this, SIGNAL ( signalUpdateEditorSetting (const QString &, const QString &)));
&(CSMSettings::UserSettings::instance()), SIGNAL ( signalUpdateEditorSetting (const QString &, const QString &)));
}
void CSVSettings::UserSettingsDialog::positionWindow ()

4
apps/opencs/view/settings/usersettingsdialog.hpp
View file

@ -16,6 +16,7 @@ class QListWidget;
namespace CSVSettings {
class AbstractPage;
class UserSettingsDialog : public QMainWindow
{
Q_OBJECT
@ -59,9 +60,6 @@ namespace CSVSettings {
resize (mStackedWidget->sizeHint());
}
signals:
void signalUpdateEditorSetting (const QString &settingName, const QString &settingValue);
public slots:
void slotChangePage (QListWidgetItem*, QListWidgetItem*);
};