diff --git a/src/core/UBApplication.cpp b/src/core/UBApplication.cpp index b6b6e52c..7936148a 100644 --- a/src/core/UBApplication.cpp +++ b/src/core/UBApplication.cpp @@ -534,7 +534,6 @@ void UBApplication::decorateActionMenu(QAction* action) menu->addSeparator(); menu->addAction(mainWindow->actionPreferences); menu->addAction(mainWindow->actionMultiScreen); - menu->addAction(mainWindow->actionImportUniboardDocuments); // SANKORE-48: Hide the check update action if the setting // EnableAutomaticSoftwareUpdates is false in Uniboard.config if(UBSettings::settings()->appEnableAutomaticSoftwareUpdates->get().toBool()) diff --git a/src/core/UBDisplayManager.cpp b/src/core/UBDisplayManager.cpp index a436e383..51577ae3 100644 --- a/src/core/UBDisplayManager.cpp +++ b/src/core/UBDisplayManager.cpp @@ -19,14 +19,13 @@ * along with Open-Sankoré. If not, see . */ - - #include "UBDisplayManager.h" #include "frameworks/UBPlatformUtils.h" #include "core/UBApplication.h" #include "core/UBApplicationController.h" +#include "core/UBSettings.h" #include "board/UBBoardView.h" @@ -66,7 +65,7 @@ void UBDisplayManager::initScreenIndexes() mControlScreenIndex = mDesktop->primaryScreen(); if (UBSettings::settings()->swapControlAndDisplayScreens->get().toBool()) { - mControlScreenIndex = mControlScreenIndex^1; + mControlScreenIndex = mControlScreenIndex^1; } mScreenIndexesRoles << Control; @@ -90,13 +89,13 @@ void UBDisplayManager::initScreenIndexes() if (screenCount > 2) { - for(int i = 2; i < screenCount; i++) - { - if(mControlScreenIndex == i) - mPreviousScreenIndexes.append(1); - else - mPreviousScreenIndexes.append(i); - } + for(int i = 2; i < screenCount; i++) + { + if(mControlScreenIndex == i) + mPreviousScreenIndexes.append(1); + else + mPreviousScreenIndexes.append(i); + } } }