Fix to SANKORE-516.

preferencesAboutTextFull
Aleksei Kanash 13 years ago
parent d1613ddb8c
commit 9db221f60f
  1. 3
      src/core/UBApplication.cpp
  2. 2
      src/core/UBApplicationController.cpp
  3. 1
      src/core/UBSettings.cpp
  4. 2
      src/core/UBSettings.h

@ -281,6 +281,9 @@ int UBApplication::exec(const QString& pFileToImport)
toolBarPositionChanged(UBSettings::settings()->appToolBarPositionedAtTop->get()); toolBarPositionChanged(UBSettings::settings()->appToolBarPositionedAtTop->get());
bool bUseMultiScreen = UBSettings::settings()->appUseMultiscreen->get().toBool();
mainWindow->actionMultiScreen->setChecked(bUseMultiScreen);
applicationController->useMultiScreen(bUseMultiScreen);
connect(mainWindow->actionMultiScreen, SIGNAL(triggered(bool)), applicationController, SLOT(useMultiScreen(bool))); connect(mainWindow->actionMultiScreen, SIGNAL(triggered(bool)), applicationController, SLOT(useMultiScreen(bool)));
connect(mainWindow->actionWidePageSize, SIGNAL(triggered(bool)), boardController, SLOT(setWidePageSize(bool))); connect(mainWindow->actionWidePageSize, SIGNAL(triggered(bool)), boardController, SLOT(setWidePageSize(bool)));
connect(mainWindow->actionRegularPageSize, SIGNAL(triggered(bool)), boardController, SLOT(setRegularPageSize(bool))); connect(mainWindow->actionRegularPageSize, SIGNAL(triggered(bool)), boardController, SLOT(setRegularPageSize(bool)));

@ -723,6 +723,8 @@ void UBApplicationController::importFile(const QString& pFilePath)
void UBApplicationController::useMultiScreen(bool use) void UBApplicationController::useMultiScreen(bool use)
{ {
mDisplayManager->setUseMultiScreen(use); mDisplayManager->setUseMultiScreen(use);
UBSettings::settings()->appUseMultiscreen->set(use);
} }

@ -210,6 +210,7 @@ void UBSettings::init()
appIsInSoftwareUpdateProcess = new UBSetting(this, "App", "IsInSoftwareUpdateProcess", false); appIsInSoftwareUpdateProcess = new UBSetting(this, "App", "IsInSoftwareUpdateProcess", false);
appLastSessionDocumentUUID = new UBSetting(this, "App", "LastSessionDocumentUUID", ""); appLastSessionDocumentUUID = new UBSetting(this, "App", "LastSessionDocumentUUID", "");
appLastSessionPageIndex = new UBSetting(this, "App", "LastSessionPageIndex", 0); appLastSessionPageIndex = new UBSetting(this, "App", "LastSessionPageIndex", 0);
appUseMultiscreen = new UBSetting(this, "App", "UseMusliscreenMode", true);
boardPenFineWidth = new UBSetting(this, "Board", "PenFineWidth", 1.5); boardPenFineWidth = new UBSetting(this, "Board", "PenFineWidth", 1.5);
boardPenMediumWidth = new UBSetting(this, "Board", "PenMediumWidth", 3.0); boardPenMediumWidth = new UBSetting(this, "Board", "PenMediumWidth", 3.0);

@ -212,6 +212,8 @@ class UBSettings : public QObject
UBSetting* appLastSessionDocumentUUID; UBSetting* appLastSessionDocumentUUID;
UBSetting* appLastSessionPageIndex; UBSetting* appLastSessionPageIndex;
UBSetting* appUseMultiscreen;
UBSetting* boardPenFineWidth; UBSetting* boardPenFineWidth;
UBSetting* boardPenMediumWidth; UBSetting* boardPenMediumWidth;
UBSetting* boardPenStrongWidth; UBSetting* boardPenStrongWidth;

Loading…
Cancel
Save