Fix to SANKORE-324 and to SANKORE-297.

src/core/UBApplicationController.cpp

@@ -141,6 +141,7 @@ void UBApplicationController::initScreenLayout()
     mDisplayManager->setAsDisplay(mDisplayView);
 
     mDisplayManager->setAsPreviousDisplays(mPreviousViews);
+    mDisplayManager->setAsDesktop(mUninoteController->drawingView());
 
     mDisplayManager->adjustScreens(-1);
 }

src/core/UBDisplayManager.cpp

@@ -34,6 +34,7 @@ UBDisplayManager::UBDisplayManager(QObject *parent)
     , mDisplayScreenIndex(-1)
     , mControlWidget(0)
     , mDisplayWidget(0)
+    , mDesktopWidget(0)
 {
     mDesktop = qApp->desktop();
 
@@ -55,8 +56,10 @@ void UBDisplayManager::initScreenIndexes()
     if (screenCount > 0)
     {
         mControlScreenIndex = mDesktop->primaryScreen();
-
-        //qDebug() <<  "The primary screen: " << mControlScreenIndex << mDesktop->screenGeometry(mControlScreenIndex);
+        if (UBSettings::settings()->swapControlAndDisplayScreens->get().toBool())
+        {
+           mControlScreenIndex = mControlScreenIndex^1;
+        }
 
         mScreenIndexesRoles << Control;
     }
@@ -130,6 +133,20 @@ void UBDisplayManager::setAsControl(QWidget* pControlWidget )
     }
 }
 
+void UBDisplayManager::setAsDesktop(QWidget* pControlWidget )
+{
+    if(hasControl() && pControlWidget && (pControlWidget != mControlWidget))
+    {
+        mDesktopWidget = pControlWidget;
+        mDesktopWidget->hide();
+        mDesktopWidget->setGeometry(mDesktop->screenGeometry(mControlScreenIndex));
+//        mDisplayWidget->showFullScreen();
+        // !!!! Should be included into Windows after QT recompilation
+#ifdef Q_WS_MAC
+        //        mControlWidget->setAttribute(Qt::WA_MacNoShadow);
+#endif
+    }
+}
 
 void UBDisplayManager::setAsDisplay(QWidget* pDisplayWidget)
 {
@@ -163,6 +180,12 @@ QRect UBDisplayManager::displayGeometry()
     return mDesktop->screenGeometry(mDisplayScreenIndex);
 }
 
+void UBDisplayManager::swapScreens(bool swap)
+{
+
+    adjustScreens(-1);
+}
+
 void UBDisplayManager::adjustScreens(int screen)
 {
     Q_UNUSED(screen);
@@ -189,6 +212,11 @@ void UBDisplayManager::positionScreens()
         mDisplayWidget->setGeometry(mDesktop->screenGeometry(mDisplayScreenIndex));
         mDisplayWidget->showFullScreen();
     }
+    if(mDesktopWidget && mControlScreenIndex > -1)
+    {
+        mDesktopWidget->setGeometry(mDesktop->screenGeometry(mControlScreenIndex));
+   //     mDesktopWidget->showFullScreen();
+    }
     else if(mDisplayWidget)
     {
         mDisplayWidget->hide();

src/core/UBDisplayManager.h

@@ -37,6 +37,8 @@ class UBDisplayManager : public QObject
 
         void setAsDisplay(QWidget* pDisplayWidget);
 
+        void setAsDesktop(QWidget* pControlWidget);
+
         void setAsPreviousDisplays(QList<UBBoardView*> pPreviousViews);
 
         bool hasControl()
@@ -75,6 +77,8 @@ class UBDisplayManager : public QObject
 
    public slots:
 
+        void swapScreens(bool bswap);
+
         void adjustScreens(int screen);
 
         void blackout();
@@ -101,6 +105,8 @@ class UBDisplayManager : public QObject
 
         QWidget* mDisplayWidget;
 
+        QWidget *mDesktopWidget;
+
         QList<UBBoardView*> mPreviousDisplayWidgets;
 
         QList<UBBlackoutWidget*> mBlackoutWidgets;

src/core/UBPreferencesController.cpp

@@ -116,6 +116,8 @@ void UBPreferencesController::wire()
 
     connect(mPreferencesUI->useExternalBrowserCheckBox, SIGNAL(clicked(bool)), settings->webUseExternalBrowser, SLOT(setBool(bool)));
     connect(mPreferencesUI->displayBrowserPageCheckBox, SIGNAL(clicked(bool)), settings->webShowPageImmediatelyOnMirroredScreen, SLOT(setBool(bool)));
+    connect(mPreferencesUI->swapControlAndDisplayScreensCheckBox, SIGNAL(clicked(bool)), settings->swapControlAndDisplayScreens, SLOT(setBool(bool)));
+    connect(mPreferencesUI->swapControlAndDisplayScreensCheckBox, SIGNAL(clicked(bool)), UBApplication::applicationController->displayManager(), SLOT(swapScreens(bool)));
 
     connect(mPreferencesUI->toolbarAtTopRadioButton, SIGNAL(clicked(bool)), this, SLOT(toolbarPositionChanged(bool)));
     connect(mPreferencesUI->toolbarAtBottomRadioButton, SIGNAL(clicked(bool)), this, SLOT(toolbarPositionChanged(bool)));
@@ -193,6 +195,7 @@ void UBPreferencesController::init()
 
     mPreferencesUI->Username_textBox->setText(settings->communityUsername());
     mPreferencesUI->Password_textEdit->setText(settings->communityPassword());
+    mPreferencesUI->swapControlAndDisplayScreensCheckBox->setChecked(settings->swapControlAndDisplayScreens->get().toBool());
 
     // pen tab
     mPenProperties->fineSlider->setValue(settings->boardPenFineWidth->get().toDouble() * sSliderRatio);

src/core/UBSettings.cpp

@@ -373,6 +373,7 @@ void UBSettings::init()
     intranetPodcastAuthor = new UBSetting(this, "IntranetPodcast", "Author", "");
 
 	KeyboardLocale = new UBSetting(this, "Board", "StartupKeyboardLocale", 0);
+    swapControlAndDisplayScreens = new UBSetting(this, "App", "SwapControlAndDisplayScreens", false);
 }
 
 

src/core/UBSettings.h

@@ -321,6 +321,7 @@ class UBSettings : public QObject
         UBSetting* pageSize;
 
         UBSetting* KeyboardLocale;
+        UBSetting* swapControlAndDisplayScreens;
 
     public slots: