mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-04-01 01:06:42 +00:00
Code Issues Releases Wiki Activity

hooked up edit config signal from startup window

Browse source
This commit is contained in:
Marc Zinnschlag 2013-09-08 09:26:43 +02:00
parent 17bf7e59a4
commit 0e81fb32dd
2 changed files with 17 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
apps/opencs/editor.cpp
View file

@ -18,6 +18,7 @@ CS::Editor::Editor() : mViewManager (mDocumentManager)
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 ()));
connect (&mStartup, SIGNAL (loadDocument()), this, SLOT (loadDocument ())); connect (&mStartup, SIGNAL (loadDocument()), this, SLOT (loadDocument ()));
connect (&mStartup, SIGNAL (editConfig()), this, SLOT (showSettings ()));
connect (&mFileDialog, SIGNAL(openFiles()), this, SLOT(openFiles())); connect (&mFileDialog, SIGNAL(openFiles()), this, SLOT(openFiles()));
connect (&mFileDialog, SIGNAL(createNewFile()), this, SLOT(createNewFile())); connect (&mFileDialog, SIGNAL(createNewFile()), this, SLOT(createNewFile()));
@ -127,6 +128,15 @@ void CS::Editor::showStartup()
mStartup.activateWindow(); mStartup.activateWindow();
} }
void CS::Editor::showSettings()
{
if (mSettings.isHidden())
mSettings.show();
mSettings.raise();
mSettings.activateWindow();
}
bool CS::Editor::makeIPCServer() bool CS::Editor::makeIPCServer()
{ {
mServer = new QLocalServer(this); mServer = new QLocalServer(this);

8
apps/opencs/editor.hpp
View file

@ -9,12 +9,15 @@
#ifndef Q_MOC_RUN #ifndef Q_MOC_RUN
#include <components/files/configurationmanager.hpp> #include <components/files/configurationmanager.hpp>
#endif #endif
#include "model/settings/usersettings.hpp"
#include "model/doc/documentmanager.hpp" #include "model/doc/documentmanager.hpp"
#include "view/doc/viewmanager.hpp" #include "view/doc/viewmanager.hpp"
#include "view/doc/startup.hpp" #include "view/doc/startup.hpp"
#include "view/doc/filedialog.hpp" #include "view/doc/filedialog.hpp"
#include "model/settings/usersettings.hpp"
#include "view/settings/usersettingsdialog.hpp"
namespace CS namespace CS
{ {
@ -26,6 +29,7 @@ namespace CS
CSMDoc::DocumentManager mDocumentManager; CSMDoc::DocumentManager mDocumentManager;
CSVDoc::ViewManager mViewManager; CSVDoc::ViewManager mViewManager;
CSVDoc::StartupDialogue mStartup; CSVDoc::StartupDialogue mStartup;
CSVSettings::UserSettingsDialog mSettings;
FileDialog mFileDialog; FileDialog mFileDialog;
Files::ConfigurationManager mCfgMgr; Files::ConfigurationManager mCfgMgr;
@ -55,6 +59,8 @@ namespace CS
void showStartup(); void showStartup();
void showSettings();
private: private:
QString mIpcServerName; QString mIpcServerName;