Move hide desktop to options, hide web live if not configured (#345)

Author: leplatrem

src/configeditor.cpp

@@ -38,9 +38,6 @@ ConfigEditor::ConfigEditor(QWidget *parent)
   connect(m_styleEditor, SIGNAL(styleOverriden(bool)), this,
           SIGNAL(styleOverriden(bool)));
   connect(m_styleEditor, SIGNAL(styleChanged()), this, SLOT(enableButtonBox()));
-  connect(ui->hideDesktop, SIGNAL(toggled(bool)), this,
-          SIGNAL(hideDesktop(bool)));
-
   connect(ui->enableWeblive, SIGNAL(toggled(bool)), this,
           SIGNAL(webliveEnabled(bool)));
 
@@ -54,7 +51,6 @@ ConfigEditor::ConfigEditor(QWidget *parent)
                                                                           " ");
     ui->screens->addItem(QString(tr("Monitor %1")).arg(screenName));
   }
-  ui->hideDesktop->setEnabled(screens.size() > 1);
 
   // Load known presets.
   QSettings settings;
@@ -187,6 +183,7 @@ void ConfigEditor::setColor(QPushButton *button, const QColor &c) {
 }
 
 void ConfigEditor::enableWeblive(bool p_state) {
+  ui->groupWebLive->setVisible(p_state);
   ui->iconWeblive->setVisible(p_state);
   ui->urlWeblive->setVisible(p_state);
   ui->enableWeblive->setEnabled(p_state);

src/configeditor.h

@@ -48,7 +48,6 @@ class ConfigEditor : public QWidget {
   bool eventFilter(QObject *object, QEvent *event);
 signals:
   // Live options
-  void hideDesktop(bool);
   void webliveEnabled(bool);
 
   // Presets

src/configeditor.ui

@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>468</width>
-    <height>537</height>
+    <height>562</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -19,7 +19,7 @@
      <item row="3" column="0">
       <widget class="QDialogButtonBox" name="buttonBox">
        <property name="standardButtons">
-        <set>QDialogButtonBox::Cancel|QDialogButtonBox::RestoreDefaults|QDialogButtonBox::Save</set>
+        <set>QDialogButtonBox::StandardButton::Cancel|QDialogButtonBox::StandardButton::RestoreDefaults|QDialogButtonBox::StandardButton::Save</set>
        </property>
       </widget>
      </item>
@@ -45,7 +45,7 @@
      <item row="4" column="0">
       <spacer name="verticalSpacer_2">
        <property name="orientation">
-        <enum>Qt::Vertical</enum>
+        <enum>Qt::Orientation::Vertical</enum>
        </property>
        <property name="sizeHint" stdset="0">
         <size>
@@ -104,7 +104,7 @@
          <item row="2" column="4">
           <spacer name="horizontalSpacer_2">
            <property name="orientation">
-            <enum>Qt::Horizontal</enum>
+            <enum>Qt::Orientation::Horizontal</enum>
            </property>
            <property name="sizeHint" stdset="0">
             <size>
@@ -127,7 +127,7 @@
          <item row="1" column="4">
           <spacer name="horizontalSpacer">
            <property name="orientation">
-            <enum>Qt::Horizontal</enum>
+            <enum>Qt::Orientation::Horizontal</enum>
            </property>
            <property name="sizeHint" stdset="0">
             <size>
@@ -178,7 +178,7 @@
          <item row="7" column="4">
           <spacer name="verticalSpacer">
            <property name="orientation">
-            <enum>Qt::Vertical</enum>
+            <enum>Qt::Orientation::Vertical</enum>
            </property>
            <property name="sizeHint" stdset="0">
             <size>
@@ -350,19 +350,19 @@ p, li { white-space: pre-wrap; }
       </widget>
      </item>
      <item row="0" column="0">
-      <widget class="QGroupBox" name="groupBox_hideDesktop">
+      <widget class="QGroupBox" name="groupWebLive">
        <property name="title">
         <string>Live options:</string>
        </property>
        <layout class="QGridLayout" name="gridLayout_hideDesktop">
-        <item row="3" column="0">
+        <item row="2" column="0">
          <widget class="QCheckBox" name="enableWeblive">
           <property name="text">
            <string>Web live</string>
           </property>
          </widget>
         </item>
-        <item row="3" column="3">
+        <item row="2" column="3">
          <widget class="QLabel" name="iconWeblive">
           <property name="maximumSize">
            <size>
@@ -378,20 +378,13 @@ p, li { white-space: pre-wrap; }
           </property>
          </widget>
         </item>
-        <item row="0" column="0" colspan="4">
-         <widget class="QCheckBox" name="hideDesktop">
-          <property name="text">
-           <string>Hide desktop</string>
-          </property>
-         </widget>
-        </item>
-        <item row="3" column="1" colspan="2">
+        <item row="2" column="1" colspan="2">
          <widget class="QLabel" name="urlWeblive">
           <property name="text">
            <string/>
           </property>
           <property name="alignment">
-           <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+           <set>Qt::AlignmentFlag::AlignRight|Qt::AlignmentFlag::AlignTrailing|Qt::AlignmentFlag::AlignVCenter</set>
           </property>
           <property name="openExternalLinks">
            <bool>true</bool>

src/main.cpp

@@ -121,12 +121,12 @@ int main(int argc, char *argv[]) {
   QObject::connect(&w, SIGNAL(toggleHide(bool)), &f, SLOT(toggleHide(bool)));
   QObject::connect(&w, SIGNAL(screenResizable(bool)), &f,
                    SLOT(screenResizable(bool)));
+  QObject::connect(&w, SIGNAL(hideDesktop(bool)), &f,
+                   SLOT(toggleHideDesktop(bool)));
   QObject::connect(&f, SIGNAL(geometryChanged(QRect)), w.configEditor(),
                    SLOT(screenChanged(QRect)));
   QObject::connect(w.configEditor(), SIGNAL(changeScreen(int, QRect)), &f,
                    SLOT(changeGeometry(int, QRect)));
-  QObject::connect(w.configEditor(), SIGNAL(hideDesktop(bool)), &f,
-                   SLOT(toggleHideDesktop(bool)));
   QObject::connect(w.configEditor(), SIGNAL(rotate(double)), &f,
                    SLOT(rotate(double)));
   QObject::connect(w.configEditor(), SIGNAL(color(QColor)), &f,

src/mainwindow.cpp

@@ -157,13 +157,18 @@ MainWindow::MainWindow(QWidget *parent)
           SLOT(disableActionNext()));
   connect(m_player, SIGNAL(autoHide()), this, SLOT(actionToggleHide()));
 
+  connect(ui->actionHideDesktop, SIGNAL(toggled(bool)), this,
+          SIGNAL(hideDesktop(bool)));
   connect(ui->actionAddDelay, SIGNAL(triggered()), m_player, SLOT(addDelay()));
   connect(ui->actionSubDelay, SIGNAL(triggered()), m_player, SLOT(subDelay()));
   connect(ui->enableSpeedFactor, SIGNAL(toggled(bool)), m_player,
           SLOT(enableSpeedFactor(bool)));
   connect(ui->speedFactor, SIGNAL(valueChanged(double)), m_player,
           SLOT(setSpeedFactor(double)));
 
+  // Prevent hiding desktop if only one screen!
+  ui->actionHideDesktop->setEnabled(QGuiApplication::screens().size() > 1);
+
   setState(NODATA);
   ui->tableWidget->setFocus();
   setAcceptDrops(true);

src/mainwindow.h

@@ -64,6 +64,7 @@ class MainWindow : public QMainWindow {
   ConfigEditor *configEditor();
   const Player *player();
 signals:
+  void hideDesktop(bool state);
   void toggleHide(bool state);
   void screenResizable(bool state);
 public slots:

src/mainwindow.ui

@@ -279,6 +279,7 @@
     <addaction name="actionShowMilliseconds"/>
     <addaction name="actionPersistentHide"/>
     <addaction name="actionDarkMode"/>
+    <addaction name="actionHideDesktop"/>
     <addaction name="actionEditShortcuts"/>
     <addaction name="actionAdvancedSettings"/>
    </widget>
@@ -675,6 +676,17 @@
     <string>Force dark mode</string>
    </property>
   </action>
+   <action name="actionHideDesktop">
+   <property name="checkable">
+    <bool>true</bool>
+   </property>
+   <property name="text">
+    <string>Hide desktop</string>
+   </property>
+   <property name="toolTip">
+    <string>Fill screen with color</string>
+   </property>
+  </action>
  </widget>
  <layoutdefault spacing="6" margin="11"/>
  <resources>