mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-05-09 22:41:25 +00:00
Code Issues Releases Wiki Activity

cleaned up opening the settings dialogue from a view

Browse source
This commit is contained in:
Marc Zinnschlag 2013-09-08 09:33:45 +02:00
parent efdf2961f0
commit cae5eb424d
5 changed files with 7 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
apps/opencs/editor.cpp
View file

@ -14,6 +14,7 @@ CS::Editor::Editor() : mViewManager (mDocumentManager)
connect (&mViewManager, SIGNAL (newDocumentRequest ()), this, SLOT (createDocument ())); connect (&mViewManager, SIGNAL (newDocumentRequest ()), this, SLOT (createDocument ()));
connect (&mViewManager, SIGNAL (loadDocumentRequest ()), this, SLOT (loadDocument ())); connect (&mViewManager, SIGNAL (loadDocumentRequest ()), this, SLOT (loadDocument ()));
connect (&mViewManager, SIGNAL (editSettingsRequest()), this, SLOT (showSettings ()));
connect (&mStartup, SIGNAL (createGame()), this, SLOT (createDocument ())); /// \todo split connect (&mStartup, SIGNAL (createGame()), this, SLOT (createDocument ())); /// \todo split
connect (&mStartup, SIGNAL (createAddon()), this, SLOT (createDocument ())); connect (&mStartup, SIGNAL (createAddon()), this, SLOT (createDocument ()));

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

@ -67,7 +67,7 @@ void CSVDoc::View::setupEditMenu()
edit->addAction (mRedo); edit->addAction (mRedo);
QAction *userSettings = new QAction (tr ("&Preferences"), this); QAction *userSettings = new QAction (tr ("&Preferences"), this);
connect (userSettings, SIGNAL (triggered()), this, SLOT (showUserSettings())); connect (userSettings, SIGNAL (triggered()), this, SIGNAL (editSettingsRequest()));
edit->addAction (userSettings); edit->addAction (userSettings);
} }
@ -415,13 +415,6 @@ void CSVDoc::View::exit()
emit exitApplicationRequest (this); emit exitApplicationRequest (this);
} }
void CSVDoc::View::showUserSettings()
{
CSVSettings::UserSettingsDialog *settingsDialog = new CSVSettings::UserSettingsDialog(this);
settingsDialog->show();
}
void CSVDoc::View::resizeViewWidth (int width) void CSVDoc::View::resizeViewWidth (int width)
{ {
if (width >= 0) if (width >= 0)

4
apps/opencs/view/doc/view.hpp
View file

@ -112,6 +112,8 @@ namespace CSVDoc
void exitApplicationRequest (CSVDoc::View *view); void exitApplicationRequest (CSVDoc::View *view);
void editSettingsRequest();
public slots: public slots:
void addSubView (const CSMWorld::UniversalId& id); void addSubView (const CSMWorld::UniversalId& id);
@ -160,8 +162,6 @@ namespace CSVDoc
void addFiltersSubView(); void addFiltersSubView();
void showUserSettings();
void toggleShowStatusBar (bool show); void toggleShowStatusBar (bool show);
}; };
} }

1
apps/opencs/view/doc/viewmanager.cpp
View file

@ -114,6 +114,7 @@ CSVDoc::View *CSVDoc::ViewManager::addView (CSMDoc::Document *document)
connect (view, SIGNAL (newDocumentRequest ()), this, SIGNAL (newDocumentRequest())); connect (view, SIGNAL (newDocumentRequest ()), this, SIGNAL (newDocumentRequest()));
connect (view, SIGNAL (loadDocumentRequest ()), this, SIGNAL (loadDocumentRequest())); connect (view, SIGNAL (loadDocumentRequest ()), this, SIGNAL (loadDocumentRequest()));
connect (view, SIGNAL (editSettingsRequest()), this, SIGNAL (editSettingsRequest()));
updateIndices(); updateIndices();

2
apps/opencs/view/doc/viewmanager.hpp
View file

@ -61,6 +61,8 @@ namespace CSVDoc
void closeMessageBox(); void closeMessageBox();
void editSettingsRequest();
public slots: public slots:
void exitApplication (CSVDoc::View *view); void exitApplication (CSVDoc::View *view);