Change orientation buttons for portrait/landscape device

Reviewed-by: ckamm

18 files changed, 46 insertions, 4 deletions

diff --git a/src/ui/configurationwidget.cpp b/src/ui/configurationwidget.cpp
index b6ec1a3..ea16db2 100644
--- a/src/ui/configurationwidget.cpp
+++ b/src/ui/configurationwidget.cpp
@@ -89,10 +89,7 @@ void ConfigurationWidget::initializeViewArea()
     mOrientationButtons->addButton(ui_inspector->leftUp, static_cast<int>(leftUp));
     connect(mOrientationButtons, SIGNAL(buttonClicked(int)), this, SLOT(changeOrientation(int)));
 
-    ui_inspector->topUp->setIcon(QIcon(":/ui/icons/topup.png"));
-    ui_inspector->topDown->setIcon(QIcon(":/ui/icons/topdown.png"));
-    ui_inspector->leftUp->setIcon(QIcon(":/ui/icons/leftup.png"));
-    ui_inspector->rightUp->setIcon(QIcon(":/ui/icons/rightup.png"));
+    updateOrientationsButtonsIcons(false);
 
     connect(ui_inspector->scaleSlider, SIGNAL(valueChanged(int)), this, SLOT(changeScaleFactor(int)));
     connect(ui_inspector->deviceListView, SIGNAL(currentIndexChanged(int)), this, SLOT(changeDeviceSelection(int)));
@@ -178,6 +175,21 @@ void ConfigurationWidget::updateOrientationButtonsState(Orientation orientation)
     mOrientationButtons->button(orientation)->setChecked(true);
 }
 
+void ConfigurationWidget::updateOrientationsButtonsIcons(bool standardOrientationPortrait)
+{
+    if (standardOrientationPortrait) {
+        ui_inspector->topUp->setIcon(QIcon(":/ui/icons/topup.png"));
+        ui_inspector->topDown->setIcon(QIcon(":/ui/icons/topdown.png"));
+        ui_inspector->leftUp->setIcon(QIcon(":/ui/icons/leftup.png"));
+        ui_inspector->rightUp->setIcon(QIcon(":/ui/icons/rightup.png"));
+    } else {
+        ui_inspector->topUp->setIcon(QIcon(":/ui/icons/topup_landscape.png"));
+        ui_inspector->topDown->setIcon(QIcon(":/ui/icons/topdown_landscape.png"));
+        ui_inspector->leftUp->setIcon(QIcon(":/ui/icons/leftup_landscape.png"));
+        ui_inspector->rightUp->setIcon(QIcon(":/ui/icons/rightup_landscape.png"));
+    }
+}
+
 void ConfigurationWidget::updateOrientationButtons(const DeviceData &data)
 {
     const bool rotateScreen = ui_inspector->rotateScreen->isChecked();
diff --git a/src/ui/configurationwidget.h b/src/ui/configurationwidget.h
index 5cbfa70..b528c30 100644
--- a/src/ui/configurationwidget.h
+++ b/src/ui/configurationwidget.h
@@ -77,6 +77,7 @@ public slots:
     void changeDeviceSelection(int newIndex);
     void updateMenuBarWidget(Widget *menuBarWidget);
     void updateOrientationButtonsState(Orientation orientation);
+    void updateOrientationsButtonsIcons(bool standardOrientationPortrait);
 
 signals:
     void deviceSelectionChanged(const DeviceData &data);
diff --git a/src/ui/icons/facedown.png b/src/ui/icons/facedown.png
index 2e65212..97dda7a 100644
--- a/src/ui/icons/facedown.png
+++ b/src/ui/icons/facedown.png
diff --git a/src/ui/icons/facedown_landscape.png b/src/ui/icons/facedown_landscape.png
new file mode 100644
index 0000000..8ac6f63
--- /dev/null
+++ b/src/ui/icons/facedown_landscape.png
diff --git a/src/ui/icons/faceup.png b/src/ui/icons/faceup.png
index 13943d0..21666f6 100644
--- a/src/ui/icons/faceup.png
+++ b/src/ui/icons/faceup.png
diff --git a/src/ui/icons/faceup_landscape.png b/src/ui/icons/faceup_landscape.png
new file mode 100644
index 0000000..4229f22
--- /dev/null
+++ b/src/ui/icons/faceup_landscape.png
diff --git a/src/ui/icons/leftup.png b/src/ui/icons/leftup.png
index 9576a82..13c6ba2 100644
--- a/src/ui/icons/leftup.png
+++ b/src/ui/icons/leftup.png
diff --git a/src/ui/icons/leftup_landscape.png b/src/ui/icons/leftup_landscape.png
new file mode 100644
index 0000000..26ddf45
--- /dev/null
+++ b/src/ui/icons/leftup_landscape.png
diff --git a/src/ui/icons/rightup.png b/src/ui/icons/rightup.png
index 186ac37..9a1691d 100644
--- a/src/ui/icons/rightup.png
+++ b/src/ui/icons/rightup.png
diff --git a/src/ui/icons/rightup_landscape.png b/src/ui/icons/rightup_landscape.png
new file mode 100644
index 0000000..7f856a1
--- /dev/null
+++ b/src/ui/icons/rightup_landscape.png
diff --git a/src/ui/icons/topdown.png b/src/ui/icons/topdown.png
index 7846ed4..cca696a 100644
--- a/src/ui/icons/topdown.png
+++ b/src/ui/icons/topdown.png
diff --git a/src/ui/icons/topdown_landscape.png b/src/ui/icons/topdown_landscape.png
new file mode 100644
index 0000000..e0dbebf
--- /dev/null
+++ b/src/ui/icons/topdown_landscape.png
diff --git a/src/ui/icons/topup.png b/src/ui/icons/topup.png
index 343da8c..221cec9 100644
--- a/src/ui/icons/topup.png
+++ b/src/ui/icons/topup.png
diff --git a/src/ui/icons/topup_landscape.png b/src/ui/icons/topup_landscape.png
new file mode 100644
index 0000000..3b6cd31
--- /dev/null
+++ b/src/ui/icons/topup_landscape.png
diff --git a/src/ui/mainwindow.cpp b/src/ui/mainwindow.cpp
index 232e2e3..ad456dc 100644
--- a/src/ui/mainwindow.cpp
+++ b/src/ui/mainwindow.cpp
@@ -185,6 +185,7 @@ MainWindow::MainWindow(QWidget *parent)
     connect(config, SIGNAL(deviceSelectionChanged(const DeviceData &)), deviceItem, SLOT(changeDevice(const DeviceData &)));
     connect(deviceItem, SIGNAL(sizeChanged(const QSize &)), this, SLOT(setSizeToDevice(const QSize &)));
     connect(deviceItem, SIGNAL(orientationChanged(Orientation)), config, SLOT(updateOrientationButtonsState(Orientation)));
+    connect(deviceItem, SIGNAL(deviceChanged(bool)), config, SLOT(updateOrientationsButtonsIcons(bool)));
     connect(config, SIGNAL(closeMainWindow()), this, SLOT(close()));
     connect(config, SIGNAL(orientationChangeRequested(Orientation, bool)),
             deviceItem, SLOT(changeOrientation(Orientation, bool)));
diff --git a/src/ui/sensorsui.cpp b/src/ui/sensorsui.cpp
index cbc1f47..5b7b813 100644
--- a/src/ui/sensorsui.cpp
+++ b/src/ui/sensorsui.cpp
@@ -181,6 +181,7 @@ SensorsUi::SensorsUi(QWidget *parent)
             button->setIcon(QIcon(b.iconPath));
             connect(button, SIGNAL(clicked()), this, b.slot);
             hlayout->addWidget(button);
+            mOrientationButtons.append(button);
         }
         hlayout->setMargin(0);
         hlayout->setSpacing(0);
@@ -624,3 +625,23 @@ QDateTime SensorsScriptInterface::timestamp() const
 {
     return ui->mTimeEdit->dateTime();
 }
+
+void SensorsUi::updateDeviceDefaultOrientation(bool isPortrait)
+{
+    mAccelerometerControl->setDeviceOrientation(isPortrait);
+    if (isPortrait) {
+        mOrientationButtons.at(0)->setIcon(QIcon(":/ui/icons/topup.png"));
+        mOrientationButtons.at(1)->setIcon(QIcon(":/ui/icons/leftup.png"));
+        mOrientationButtons.at(2)->setIcon(QIcon(":/ui/icons/topdown.png"));
+        mOrientationButtons.at(3)->setIcon(QIcon(":/ui/icons/rightup.png"));
+        mOrientationButtons.at(4)->setIcon(QIcon(":/ui/icons/faceup.png"));
+        mOrientationButtons.at(5)->setIcon(QIcon(":/ui/icons/facedown.png"));
+    } else {
+        mOrientationButtons.at(0)->setIcon(QIcon(":/ui/icons/topup_landscape.png"));
+        mOrientationButtons.at(1)->setIcon(QIcon(":/ui/icons/leftup_landscape.png"));
+        mOrientationButtons.at(2)->setIcon(QIcon(":/ui/icons/topdown_landscape.png"));
+        mOrientationButtons.at(3)->setIcon(QIcon(":/ui/icons/rightup_landscape.png"));
+        mOrientationButtons.at(4)->setIcon(QIcon(":/ui/icons/faceup_landscape.png"));
+        mOrientationButtons.at(5)->setIcon(QIcon(":/ui/icons/facedown_landscape.png"));
+    }
+}
diff --git a/src/ui/sensorsui.h b/src/ui/sensorsui.h
index d8a9b6f..f90647e 100644
--- a/src/ui/sensorsui.h
+++ b/src/ui/sensorsui.h
@@ -234,6 +234,7 @@ private:
     SensorDoubleEdit *mCompassAzimuthEdit;
 
     QPushButton *mProximitySensorCloseButton;
+    QList<QPushButton *> mOrientationButtons;
 
     QRadioButton *mCurrentRadio;
     QRadioButton *mOverrideRadio;
diff --git a/src/ui/ui.qrc b/src/ui/ui.qrc
index a4fef16..4c9a842 100644
--- a/src/ui/ui.qrc
+++ b/src/ui/ui.qrc
@@ -7,5 +7,11 @@
         <file>icons/rightup.png</file>
         <file>icons/topdown.png</file>
         <file>icons/topup.png</file>
+        <file>icons/leftup_landscape.png</file>
+        <file>icons/rightup_landscape.png</file>
+        <file>icons/topdown_landscape.png</file>
+        <file>icons/topup_landscape.png</file>
+        <file>icons/facedown_landscape.png</file>
+        <file>icons/faceup_landscape.png</file>
     </qresource>
 </RCC>