Added initial dark mode theme using https://github.com/ColinDuquesnoy/

QDarkStyleSheet

--HG--
branch : develop

src/app/tape/dialogs/configpages/tapepreferencesconfigurationpage.cpp

@@ -53,6 +53,9 @@ TapePreferencesConfigurationPage::TapePreferencesConfigurationPage(QWidget *pare
     //-------------------- Decimal separator setup
     ui->osOptionCheck->setChecked(qApp->TapeSettings()->GetOsSeparator());
 
+    // Theme
+     ui->darkModeCheck->setChecked(qApp->TapeSettings()->GetDarkMode());
+
     //---------------------- Pattern making system
     ui->systemBookValueLabel->setFixedHeight(4 * QFontMetrics(ui->systemBookValueLabel->font()).lineSpacing());
     connect(ui->systemCombo, QOverload<int>::of(&QComboBox::currentIndexChanged), this, [this]()
@@ -122,6 +125,8 @@ void TapePreferencesConfigurationPage::Apply()
 
     settings->SetToolBarStyle(ui->toolBarStyleCheck->isChecked());
 
+    settings->SetDarkMode(ui->darkModeCheck->isChecked());
+
     if (m_langChanged || m_systemChanged)
     {
         const QString locale = qvariant_cast<QString>(ui->langCombo->currentData());

src/app/tape/dialogs/configpages/tapepreferencesconfigurationpage.ui

@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>501</width>
-    <height>550</height>
+    <height>726</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -156,10 +156,10 @@
       <string>Default height and size</string>
      </property>
      <layout class="QGridLayout" name="gridLayout">
-      <item row="0" column="2">
+      <item row="0" column="0">
-       <widget class="QLabel" name="labelHeightUnit">
+       <widget class="QLabel" name="label">
         <property name="text">
-         <string notr="true">Height unit</string>
+         <string>Default height:</string>
         </property>
        </widget>
       </item>
@@ -173,10 +173,10 @@
         </property>
        </widget>
       </item>
-      <item row="0" column="0">
+      <item row="0" column="2">
-       <widget class="QLabel" name="label">
+       <widget class="QLabel" name="labelHeightUnit">
         <property name="text">
-         <string>Default height:</string>
+         <string notr="true">Height unit</string>
         </property>
        </widget>
       </item>
@@ -234,17 +234,24 @@
     </widget>
    </item>
    <item>
-    <spacer name="verticalSpacer">
+    <widget class="QGroupBox" name="groupBox_4">
-     <property name="orientation">
+     <property name="title">
-      <enum>Qt::Vertical</enum>
+      <string>User Interface</string>
      </property>
-     <property name="sizeHint" stdset="0">
+     <widget class="QCheckBox" name="darkModeCheck">
-      <size>
+      <property name="geometry">
-       <width>20</width>
+       <rect>
-       <height>40</height>
+        <x>20</x>
-      </size>
+        <y>30</y>
+        <width>351</width>
+        <height>20</height>
+       </rect>
       </property>
-    </spacer>
+      <property name="text">
+       <string>Activate dark mode(Restart required)</string>
+      </property>
+     </widget>
+    </widget>
    </item>
   </layout>
  </widget>

src/app/tape/main.cpp

@@ -40,6 +40,7 @@ int main(int argc, char *argv[])
     Q_INIT_RESOURCE(icon);
     Q_INIT_RESOURCE(schema);
     Q_INIT_RESOURCE(flags);
+    Q_INIT_RESOURCE(style);
 
     QT_REQUIRE_VERSION(argc, argv, "5.2.0")// clazy:exclude=qstring-arg
 

src/app/tape/mapplication.cpp

@@ -409,9 +409,30 @@ void MApplication::InitOptions()
        //This does not happen under GNOME or KDE
        QIcon::setThemeName("win.icon.theme");
     }
-
+    ActivateDarkMode();
     QResource::registerResource(diagramsPath());
 }
+// Dark mode
+
+void MApplication::ActivateDarkMode()
+{
+    VTapeSettings *settings = qApp->TapeSettings();
+     if (settings->GetDarkMode())
+     {
+         QFile f(":qdarkstyle/style.qss");
+         if (!f.exists())
+         {
+             qDebug()<<"Unable to set stylesheet, file not found\n";
+         }
+         else
+         {
+             f.open(QFile::ReadOnly | QFile::Text);
+             QTextStream ts(&f);
+             qApp->setStyleSheet(ts.readAll());
+         }
+
+     }
+}
 
 //---------------------------------------------------------------------------------------------------------------------
 void MApplication::InitTrVars()

src/app/tape/mapplication.h

@@ -68,6 +68,7 @@ public:
 
     virtual void  OpenSettings() override;
     VTapeSettings *TapeSettings();
+    void               ActivateDarkMode();
 
     QString diagramsPath() const;
 

src/app/valentina/core/vapplication.cpp

@@ -276,7 +276,6 @@ VApplication::VApplication(int &argc, char **argv)
     setOrganizationDomain(VER_COMPANYDOMAIN_STR);
     // Setting the Application version
     setApplicationVersion(APP_VERSION_STR);
-
     // making sure will create new instance...just in case we will ever do 2 objects of VApplication
     VCommandLine::Reset();
     VCommandLine::Get(*this);
@@ -407,6 +406,27 @@ bool VApplication::notify(QObject *receiver, QEvent *event)
     return false;
 }
 
+void VApplication::ActivateDarkMode()
+{
+     VSettings *settings = qApp->ValentinaSettings();
+     if (settings->GetDarkMode())
+     {
+         QFile f(":qdarkstyle/style.qss");
+         if (!f.exists())
+         {
+             qDebug()<<"Unable to set stylesheet, file not found\n";
+         }
+         else
+         {
+             f.open(QFile::ReadOnly | QFile::Text);
+             QTextStream ts(&f);
+             qApp->setStyleSheet(ts.readAll());
+         }
+
+     }
+}
+
+
 //---------------------------------------------------------------------------------------------------------------------
 QString VApplication::TapeFilePath() const
 {
@@ -596,6 +616,7 @@ void VApplication::InitOptions()
         //This does not happen under GNOME or KDE
         QIcon::setThemeName("win.icon.theme");
     }
+    ActivateDarkMode();
 }
 
 //---------------------------------------------------------------------------------------------------------------------

src/app/valentina/core/vapplication.h

@@ -66,6 +66,7 @@ public:
     static QStringList LabelLanguages();
 
     void               StartLogging();
+    void               ActivateDarkMode();
     QTextStream       *LogFile();
 
     virtual const VTranslateVars *TrVars() override;

src/app/valentina/dialogs/configpages/preferencesconfigurationpage.cpp

@@ -124,6 +124,9 @@ PreferencesConfigurationPage::PreferencesConfigurationPage(QWidget *parent)
     //----------------------- Toolbar
     ui->toolBarStyleCheck->setChecked(settings->GetToolBarStyle());
 
+    // Theme
+    ui->darkModeCheck->setChecked(settings->GetDarkMode());
+
     // Tab Scrolling
     ui->spinBoxDuration->setMinimum(VSettings::scrollingDurationMin);
     ui->spinBoxDuration->setMaximum(VSettings::scrollingDurationMax);
@@ -168,6 +171,7 @@ QStringList PreferencesConfigurationPage::Apply()
 
     settings->SetOsSeparator(ui->osOptionCheck->isChecked());
     settings->SetToolBarStyle(ui->toolBarStyleCheck->isChecked());
+    settings->SetDarkMode(ui->darkModeCheck->isChecked());
     settings->SetFreeCurveMode(ui->checkBoxFreeCurve->isChecked());
     settings->SetDoubleClickZoomFitBestCurrentPP(ui->checkBoxZoomFitBestCurrentPP->isChecked());
 

src/app/valentina/dialogs/configpages/preferencesconfigurationpage.ui

@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>516</width>
-    <height>691</height>
+    <height>751</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -23,9 +23,15 @@
       <attribute name="title">
        <string>General</string>
       </attribute>
-      <layout class="QVBoxLayout" name="verticalLayout">
-       <item>
       <widget class="QGroupBox" name="saveGroup">
+       <property name="geometry">
+        <rect>
+         <x>20</x>
+         <y>0</y>
+         <width>441</width>
+         <height>70</height>
+        </rect>
+       </property>
        <property name="title">
         <string>Save</string>
        </property>
@@ -68,9 +74,15 @@
         </item>
        </layout>
       </widget>
-       </item>
-       <item>
       <widget class="QGroupBox" name="groupBox_2">
+       <property name="geometry">
+        <rect>
+         <x>20</x>
+         <y>70</y>
+         <width>441</width>
+         <height>173</height>
+        </rect>
+       </property>
        <property name="title">
         <string>Language</string>
        </property>
@@ -127,9 +139,15 @@
         </item>
        </layout>
       </widget>
-       </item>
-       <item>
       <widget class="QGroupBox" name="groupBox_3">
+       <property name="geometry">
+        <rect>
+         <x>20</x>
+         <y>243</y>
+         <width>446</width>
+         <height>185</height>
+        </rect>
+       </property>
        <property name="title">
         <string>Pattern making system</string>
        </property>
@@ -177,9 +195,15 @@
         </item>
        </layout>
       </widget>
-       </item>
-       <item>
       <widget class="QGroupBox" name="groupBox_5">
+       <property name="geometry">
+        <rect>
+         <x>20</x>
+         <y>428</y>
+         <width>451</width>
+         <height>131</height>
+        </rect>
+       </property>
        <property name="title">
         <string>Pattern editing</string>
        </property>
@@ -222,9 +246,15 @@
         </item>
        </layout>
       </widget>
-       </item>
-       <item>
       <widget class="QGroupBox" name="groupBox_6">
+       <property name="geometry">
+        <rect>
+         <x>20</x>
+         <y>560</y>
+         <width>451</width>
+         <height>71</height>
+        </rect>
+       </property>
        <property name="title">
         <string>Toolbar</string>
        </property>
@@ -241,22 +271,32 @@
         </item>
        </layout>
       </widget>
-       </item>
+      <widget class="QGroupBox" name="groupBox_8">
+       <property name="geometry">
+        <rect>
+         <x>20</x>
+         <y>630</y>
+         <width>446</width>
+         <height>71</height>
+        </rect>
+       </property>
+       <property name="title">
+        <string>User Interface</string>
+       </property>
+       <layout class="QVBoxLayout" name="verticalLayout_7">
         <item>
-        <spacer name="verticalSpacer">
+         <widget class="QCheckBox" name="darkModeCheck">
-         <property name="orientation">
+          <property name="text">
-          <enum>Qt::Vertical</enum>
+           <string>Activate dark mode(Restart required)</string>
           </property>
-         <property name="sizeHint" stdset="0">
+          <property name="checked">
-          <size>
+           <bool>true</bool>
-           <width>20</width>
-           <height>40</height>
-          </size>
           </property>
-        </spacer>
+         </widget>
         </item>
        </layout>
       </widget>
+     </widget>
      <widget class="QWidget" name="tabScrolling">
       <attribute name="title">
        <string>Scrolling</string>

src/app/valentina/main.cpp

@@ -45,6 +45,7 @@ int main(int argc, char *argv[])
     Q_INIT_RESOURCE(flags);
     Q_INIT_RESOURCE(icons);
     Q_INIT_RESOURCE(toolicon);
+    Q_INIT_RESOURCE(style);
 
     QT_REQUIRE_VERSION(argc, argv, "5.2.0")// clazy:exclude=qstring-arg,qstring-allocations
 

src/libs/vmisc/share/resources/qdarkstyle/style.qrc

@@ -0,0 +1,46 @@
+<RCC>
+  <qresource prefix="qss_icons">
+    <file>rc/up_arrow_disabled.png</file>
+    <file>rc/Hmovetoolbar.png</file>
+    <file>rc/stylesheet-branch-end.png</file>
+    <file>rc/branch_closed-on.png</file>
+    <file>rc/stylesheet-vline.png</file>
+    <file>rc/branch_closed.png</file>
+    <file>rc/branch_open-on.png</file>
+    <file>rc/transparent.png</file>
+    <file>rc/right_arrow_disabled.png</file>
+    <file>rc/sizegrip.png</file>
+    <file>rc/close.png</file>
+    <file>rc/close-hover.png</file>
+    <file>rc/close-pressed.png</file>
+    <file>rc/down_arrow.png</file>
+    <file>rc/Vmovetoolbar.png</file>
+    <file>rc/left_arrow.png</file>
+    <file>rc/stylesheet-branch-more.png</file>
+    <file>rc/up_arrow.png</file>
+    <file>rc/right_arrow.png</file>
+    <file>rc/left_arrow_disabled.png</file>
+    <file>rc/Hsepartoolbar.png</file>
+    <file>rc/branch_open.png</file>
+    <file>rc/Vsepartoolbar.png</file>
+    <file>rc/down_arrow_disabled.png</file>
+    <file>rc/undock.png</file>
+    <file>rc/checkbox_checked_disabled.png</file>
+    <file>rc/checkbox_checked_focus.png</file>
+    <file>rc/checkbox_checked.png</file>
+    <file>rc/checkbox_indeterminate.png</file>
+    <file>rc/checkbox_indeterminate_focus.png</file>
+    <file>rc/checkbox_unchecked_disabled.png</file>
+    <file>rc/checkbox_unchecked_focus.png</file>
+    <file>rc/checkbox_unchecked.png</file>
+    <file>rc/radio_checked_disabled.png</file>
+    <file>rc/radio_checked_focus.png</file>
+    <file>rc/radio_checked.png</file>
+    <file>rc/radio_unchecked_disabled.png</file>
+    <file>rc/radio_unchecked_focus.png</file>
+    <file>rc/radio_unchecked.png</file>
+  </qresource>
+  <qresource prefix="qdarkstyle">
+      <file>style.qss</file>
+  </qresource>
+</RCC>

src/libs/vmisc/vcommonsettings.cpp

@@ -81,6 +81,7 @@ Q_GLOBAL_STATIC_WITH_ARGS(const QString, settingGeneralRestoreFileList, (QLatin1
 Q_GLOBAL_STATIC_WITH_ARGS(const QString, settingGeneralGeometry, (QLatin1String("geometry")))
 Q_GLOBAL_STATIC_WITH_ARGS(const QString, settingGeneralWindowState, (QLatin1String("windowState")))
 Q_GLOBAL_STATIC_WITH_ARGS(const QString, settingGeneralToolbarsState, (QLatin1String("toolbarsState")))
+Q_GLOBAL_STATIC_WITH_ARGS(const QString, settingConfigurationDarkMode, (QLatin1String("configuration/dark_mode")))
 Q_GLOBAL_STATIC_WITH_ARGS(const QString, settingPreferenceDialogSize, (QLatin1String("preferenceDialogSize")))
 Q_GLOBAL_STATIC_WITH_ARGS(const QString, settingToolSeamAllowanceDialogSize, (QLatin1String("toolSeamAllowanceDialogSize")))
 Q_GLOBAL_STATIC_WITH_ARGS(const QString, settingIncrementsDialogSize, (QLatin1String("toolIncrementsDialogSize")))
@@ -513,6 +514,19 @@ void VCommonSettings::SetToolBarStyle(const bool &value)
     setValue(*settingConfigurationToolBarStyle, value);
 }
 
+//---------------------------------------------------------------------------------------------------------------------
+bool VCommonSettings::GetDarkMode() const
+{
+    return value(*settingConfigurationDarkMode, 1).toBool();
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void VCommonSettings::SetDarkMode(const bool &value)
+{
+    setValue(*settingConfigurationDarkMode, value);
+}
+
+
 //---------------------------------------------------------------------------------------------------------------------
 bool VCommonSettings::IsFreeCurveMode() const
 {

src/libs/vmisc/vcommonsettings.h

@@ -99,6 +99,9 @@ public:
     bool GetToolBarStyle() const;
     void SetToolBarStyle(const bool &value);
 
+    bool GetDarkMode() const;
+    void SetDarkMode(const bool &value);
+
     bool IsFreeCurveMode() const;
     void SetFreeCurveMode(bool value);
 

src/libs/vmisc/vmisc.pro

@@ -49,7 +49,8 @@ include(vmisc.pri)
 RESOURCES += \
     share/resources/theme.qrc \ # Windows theme icons.
     share/resources/icon.qrc \ # All other icons except cursors and Windows theme.
-    share/resources/flags.qrc
+    share/resources/flags.qrc \
+    share/resources/qdarkstyle/style.qrc
 
 # This is static library so no need in "make install"