Commit 462a4ee2 authored by Claudio Valerio's avatar Claudio Valerio

fixed dependance

parent 3646be9f
...@@ -534,7 +534,6 @@ void UBApplication::decorateActionMenu(QAction* action) ...@@ -534,7 +534,6 @@ void UBApplication::decorateActionMenu(QAction* action)
menu->addSeparator(); menu->addSeparator();
menu->addAction(mainWindow->actionPreferences); menu->addAction(mainWindow->actionPreferences);
menu->addAction(mainWindow->actionMultiScreen); menu->addAction(mainWindow->actionMultiScreen);
menu->addAction(mainWindow->actionImportUniboardDocuments);
// SANKORE-48: Hide the check update action if the setting // SANKORE-48: Hide the check update action if the setting
// EnableAutomaticSoftwareUpdates is false in Uniboard.config // EnableAutomaticSoftwareUpdates is false in Uniboard.config
if(UBSettings::settings()->appEnableAutomaticSoftwareUpdates->get().toBool()) if(UBSettings::settings()->appEnableAutomaticSoftwareUpdates->get().toBool())
......
...@@ -19,14 +19,13 @@ ...@@ -19,14 +19,13 @@
* along with Open-Sankoré. If not, see <http://www.gnu.org/licenses/>. * along with Open-Sankoré. If not, see <http://www.gnu.org/licenses/>.
*/ */
#include "UBDisplayManager.h" #include "UBDisplayManager.h"
#include "frameworks/UBPlatformUtils.h" #include "frameworks/UBPlatformUtils.h"
#include "core/UBApplication.h" #include "core/UBApplication.h"
#include "core/UBApplicationController.h" #include "core/UBApplicationController.h"
#include "core/UBSettings.h"
#include "board/UBBoardView.h" #include "board/UBBoardView.h"
...@@ -66,7 +65,7 @@ void UBDisplayManager::initScreenIndexes() ...@@ -66,7 +65,7 @@ void UBDisplayManager::initScreenIndexes()
mControlScreenIndex = mDesktop->primaryScreen(); mControlScreenIndex = mDesktop->primaryScreen();
if (UBSettings::settings()->swapControlAndDisplayScreens->get().toBool()) if (UBSettings::settings()->swapControlAndDisplayScreens->get().toBool())
{ {
mControlScreenIndex = mControlScreenIndex^1; mControlScreenIndex = mControlScreenIndex^1;
} }
mScreenIndexesRoles << Control; mScreenIndexesRoles << Control;
...@@ -90,13 +89,13 @@ void UBDisplayManager::initScreenIndexes() ...@@ -90,13 +89,13 @@ void UBDisplayManager::initScreenIndexes()
if (screenCount > 2) if (screenCount > 2)
{ {
for(int i = 2; i < screenCount; i++) for(int i = 2; i < screenCount; i++)
{ {
if(mControlScreenIndex == i) if(mControlScreenIndex == i)
mPreviousScreenIndexes.append(1); mPreviousScreenIndexes.append(1);
else else
mPreviousScreenIndexes.append(i); mPreviousScreenIndexes.append(i);
} }
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment