#5102 Another batch of new svg icons. Fixed Import/Export dialog with…

… dark themes and made these dialogs unified across platforms, excluding need for side picture.
pawelsalawa · Dec 23, 2024 · af366bd · af366bd
1 parent d941e34
commit af366bd
Show file tree

Hide file tree

Showing 46 changed files with 9,859 additions and 659 deletions.
diff --git a/Plugins/ConfigMigration/configmigrationwizard.cpp b/Plugins/ConfigMigration/configmigrationwizard.cpp
@@ -41,7 +41,6 @@ void ConfigMigrationWizard::accept()
 void ConfigMigrationWizard::init()
 {
     ui->setupUi(this);
-    THEME_TUNER->darkThemeFix(this);
 
 #ifdef Q_OS_MACX
     resize(width() + 150, height());

diff --git a/Plugins/ConfigMigration/configmigrationwizard.ui b/Plugins/ConfigMigration/configmigrationwizard.ui
@@ -16,8 +16,11 @@
   <property name="styleSheet">
    <string notr="true">QTreeView::item {margin-top: 5px;}</string>
   </property>
+  <property name="wizardStyle">
+   <enum>QWizard::WizardStyle::ClassicStyle</enum>
+  </property>
   <property name="options">
-   <set>QWizard::NoDefaultButton</set>
+   <set>QWizard::WizardOption::NoDefaultButton</set>
   </property>
   <widget class="QWizardPage" name="itemsPage">
    <property name="title">
@@ -83,7 +86,7 @@
     <item>
      <spacer name="verticalSpacer">
       <property name="orientation">
-       <enum>Qt::Vertical</enum>
+       <enum>Qt::Orientation::Vertical</enum>
       </property>
       <property name="sizeHint" stdset="0">
        <size>

diff --git a/Plugins/FusionDarkStyle/fusiondarkplugin.cpp b/Plugins/FusionDarkStyle/fusiondarkplugin.cpp
@@ -58,12 +58,10 @@ QPalette FusionDarkStyle::standardPalette() const
 FusionDarkPlugin::FusionDarkPlugin(QObject *parent)
     : QStylePlugin(parent)
 {
-    ThemeTuner::registerQWizardThemeTuneRequired(STYLE_NAME);
 }
 
 FusionDarkPlugin::~FusionDarkPlugin()
 {
-    ThemeTuner::deregisterQWizardThemeTuneRequired(STYLE_NAME);
 }
 
 QStyle *FusionDarkPlugin::create(const QString &key)

diff --git a/SQLiteStudio3/guiSQLiteStudio/dialogs/exportdialog.cpp b/SQLiteStudio3/guiSQLiteStudio/dialogs/exportdialog.cpp
@@ -50,13 +50,11 @@ ExportDialog::~ExportDialog()
 void ExportDialog::init()
 {
     ui->setupUi(this);
-    THEME_TUNER->darkThemeFix(this);
     limitDialogWidth(this);
     DialogSizeHandler::applyFor(this);
 
 #ifdef Q_OS_MACX
     resize(width() + 150, height());
-    setPixmap(QWizard::BackgroundPixmap, addOpacity(ICONS.DATABASE_EXPORT_WIZARD.toQIcon().pixmap(800, 800), 0.3));
 #endif
 
     widgetCover = new WidgetCover(this);
@@ -194,7 +192,7 @@ void ExportDialog::initQueryPage()
 
     connect(ui->queryEdit, SIGNAL(errorsChecked(bool)), ui->queryPage, SIGNAL(completeChanged()));
     connect(ui->queryEdit, SIGNAL(textChanged()), ui->queryPage, SIGNAL(completeChanged()));
-    connect(ui->queryDatabaseCombo, SIGNAL(currentIndexChanged(QString)), this, SLOT(updateQueryEditDb()));
+    connect(ui->queryDatabaseCombo, SIGNAL(currentIndexChanged(int)), this, SLOT(updateQueryEditDb()));
     connect(this, SIGNAL(queryPageCompleteChanged()), ui->queryPage, SIGNAL(completeChanged()));
 }
 
@@ -215,8 +213,8 @@ void ExportDialog::initDbObjectsPage()
         return listOk;
     });
 
-    connect(ui->dbObjectsDatabaseCombo, SIGNAL(currentIndexChanged(QString)), this, SLOT(updateDbObjTree()));
-    connect(ui->dbObjectsDatabaseCombo, SIGNAL(currentIndexChanged(QString)), ui->databaseObjectsPage, SIGNAL(completeChanged()));
+    connect(ui->dbObjectsDatabaseCombo, SIGNAL(currentIndexChanged(int)), this, SLOT(updateDbObjTree()));
+    connect(ui->dbObjectsDatabaseCombo, SIGNAL(currentIndexChanged(int)), ui->databaseObjectsPage, SIGNAL(completeChanged()));
     connect(selectableDbListModel, SIGNAL(dataChanged(QModelIndex,QModelIndex)), ui->databaseObjectsPage, SIGNAL(completeChanged()));
     connect(ui->objectsSelectAllButton, SIGNAL(clicked()), this, SLOT(dbObjectsSelectAll()));
     connect(ui->objectsDeselectAllButton, SIGNAL(clicked()), this, SLOT(dbObjectsDeselectAll()));

diff --git a/SQLiteStudio3/guiSQLiteStudio/dialogs/exportdialog.ui b/SQLiteStudio3/guiSQLiteStudio/dialogs/exportdialog.ui
@@ -13,8 +13,11 @@
   <property name="windowTitle">
    <string>Export</string>
   </property>
+  <property name="wizardStyle">
+   <enum>QWizard::WizardStyle::ClassicStyle</enum>
+  </property>
   <property name="options">
-   <set>QWizard::CancelButtonOnLeft|QWizard::NoDefaultButton</set>
+   <set>QWizard::WizardOption::CancelButtonOnLeft|QWizard::WizardOption::NoDefaultButton</set>
   </property>
   <widget class="QWizardPage" name="exportSubjectPage">
    <property name="title">
@@ -24,10 +27,10 @@
     <item>
      <widget class="QFrame" name="exportSubjectFrame">
       <property name="frameShape">
-       <enum>QFrame::StyledPanel</enum>
+       <enum>QFrame::Shape::StyledPanel</enum>
       </property>
       <property name="frameShadow">
-       <enum>QFrame::Raised</enum>
+       <enum>QFrame::Shadow::Raised</enum>
       </property>
       <layout class="QVBoxLayout" name="verticalLayout_2">
        <item>
@@ -68,10 +71,10 @@
     <item>
      <widget class="QFrame" name="exportTableFrame">
       <property name="frameShape">
-       <enum>QFrame::StyledPanel</enum>
+       <enum>QFrame::Shape::StyledPanel</enum>
       </property>
       <property name="frameShadow">
-       <enum>QFrame::Raised</enum>
+       <enum>QFrame::Shadow::Raised</enum>
       </property>
       <layout class="QGridLayout" name="gridLayout_4">
        <item row="1" column="2">
@@ -160,7 +163,7 @@
        <item>
         <widget class="Line" name="line">
          <property name="orientation">
-          <enum>Qt::Horizontal</enum>
+          <enum>Qt::Orientation::Horizontal</enum>
          </property>
         </widget>
        </item>
@@ -270,16 +273,16 @@
        <string notr="true">#formatScrollArea { background: transparent; }</string>
       </property>
       <property name="frameShape">
-       <enum>QFrame::NoFrame</enum>
+       <enum>QFrame::Shape::NoFrame</enum>
       </property>
       <property name="frameShadow">
-       <enum>QFrame::Plain</enum>
+       <enum>QFrame::Shadow::Plain</enum>
       </property>
       <property name="lineWidth">
        <number>0</number>
       </property>
       <property name="horizontalScrollBarPolicy">
-       <enum>Qt::ScrollBarAlwaysOff</enum>
+       <enum>Qt::ScrollBarPolicy::ScrollBarAlwaysOff</enum>
       </property>
       <property name="widgetResizable">
        <bool>true</bool>
@@ -289,8 +292,8 @@
         <rect>
          <x>0</x>
          <y>0</y>
-         <width>308</width>
-         <height>267</height>
+         <width>228</width>
+         <height>253</height>
         </rect>
        </property>
        <property name="styleSheet">
@@ -403,7 +406,7 @@
         <item>
          <spacer name="verticalSpacer">
           <property name="orientation">
-           <enum>Qt::Vertical</enum>
+           <enum>Qt::Orientation::Vertical</enum>
           </property>
           <property name="sizeHint" stdset="0">
            <size>

diff --git a/SQLiteStudio3/guiSQLiteStudio/dialogs/importdialog.cpp b/SQLiteStudio3/guiSQLiteStudio/dialogs/importdialog.cpp
@@ -101,13 +101,11 @@ void ImportDialog::readStdConfig()
 void ImportDialog::init()
 {
     ui->setupUi(this);
-    THEME_TUNER->darkThemeFix(this);
     limitDialogWidth(this);
     DialogSizeHandler::applyFor(this);
 
 #ifdef Q_OS_MACX
     resize(width() + 150, height());
-    setPixmap(QWizard::BackgroundPixmap, addOpacity(ICONS.DATABASE_IMPORT_WIZARD.toQIcon().pixmap(800, 800), 0.3));
 #endif
 
     initTablePage();

diff --git a/SQLiteStudio3/guiSQLiteStudio/dialogs/importdialog.ui b/SQLiteStudio3/guiSQLiteStudio/dialogs/importdialog.ui
@@ -13,8 +13,11 @@
   <property name="windowTitle">
    <string>Import data</string>
   </property>
+  <property name="wizardStyle">
+   <enum>QWizard::WizardStyle::ClassicStyle</enum>
+  </property>
   <property name="options">
-   <set>QWizard::CancelButtonOnLeft|QWizard::NoDefaultButton</set>
+   <set>QWizard::WizardOption::CancelButtonOnLeft|QWizard::WizardOption::NoDefaultButton</set>
   </property>
   <widget class="VerifiableWizardPage" name="tablePage">
    <property name="title">
@@ -24,10 +27,10 @@
     <item>
      <widget class="QFrame" name="existingTableFrame">
       <property name="frameShape">
-       <enum>QFrame::StyledPanel</enum>
+       <enum>QFrame::Shape::StyledPanel</enum>
       </property>
       <property name="frameShadow">
-       <enum>QFrame::Raised</enum>
+       <enum>QFrame::Shadow::Raised</enum>
       </property>
       <layout class="QGridLayout" name="gridLayout_4">
        <item row="0" column="3">
@@ -90,10 +93,10 @@
        <string notr="true">#scrollArea { background: transparent; }</string>
       </property>
       <property name="frameShape">
-       <enum>QFrame::NoFrame</enum>
+       <enum>QFrame::Shape::NoFrame</enum>
       </property>
       <property name="horizontalScrollBarPolicy">
-       <enum>Qt::ScrollBarAlwaysOff</enum>
+       <enum>Qt::ScrollBarPolicy::ScrollBarAlwaysOff</enum>
       </property>
       <property name="widgetResizable">
        <bool>true</bool>
@@ -103,8 +106,8 @@
         <rect>
          <x>0</x>
          <y>0</y>
-         <width>269</width>
-         <height>280</height>
+         <width>179</width>
+         <height>253</height>
         </rect>
        </property>
        <property name="styleSheet">
@@ -210,7 +213,7 @@
         <item>
          <spacer name="verticalSpacer">
           <property name="orientation">
-           <enum>Qt::Vertical</enum>
+           <enum>Qt::Orientation::Vertical</enum>
           </property>
           <property name="sizeHint" stdset="0">
            <size>

diff --git a/SQLiteStudio3/guiSQLiteStudio/iconmanager.h b/SQLiteStudio3/guiSQLiteStudio/iconmanager.h
@@ -53,7 +53,7 @@ class GUI_API_EXPORT IconManager : public QObject
             DEF_ICON(COMPLETER_NO_VALUE,                "completer_no_value")
             DEF_ICON(COMPLETER_NUMBER,                  "completer_number")
             DEF_ICON(COMPLETER_OPERATOR,                "completer_operator")
-            DEF_ICON(COMPLETER_OTHER,                   "completer_other")
+            DEF_ICO3(COMPLETER_OTHER,                   COMPLETER_NO_VALUE)
             DEF_ICON(COMPLETER_PRAGMA,                  "completer_pragma")
             DEF_ICON(COMPLETER_STRING,                  "completer_string")
             DEF_ICON(CONFIGURE,                         "configure")
@@ -84,8 +84,7 @@ class GUI_API_EXPORT IconManager : public QObject
             DEF_ICON(DATABASE_DISCONNECT,               "database_disconnect")
             DEF_ICON(DATABASE_EDIT,                     "database_edit")
             DEF_ICON(DATABASE_EXPORT,                   "database_export")
-            DEF_ICON(DATABASE_EXPORT_WIZARD,            "database_export_wizard")
-            DEF_ICON(DATABASE_IMPORT_WIZARD,            "database_import_wizard")
+            DEF_ICON(DATABASE_IMPORT,                   "database_import")
             DEF_ICON(DATABASE_OFFLINE,                  "database_offline")
             DEF_ICO2(DATABASE_INVALID,                  DATABASE_OFFLINE, WARNING)
             DEF_ICO3(DATABASE_ONLINE,                   DATABASE)

diff --git a/SQLiteStudio3/guiSQLiteStudio/icons.qrc b/SQLiteStudio3/guiSQLiteStudio/icons.qrc
@@ -1,21 +1,8 @@
 <RCC>
     <qresource prefix="/icons">
         <file>img/check.png</file>
-        <file>img/complete.png</file>
-        <file>img/completer_blob.png</file>
-        <file>img/completer_no_value.png</file>
-        <file>img/completer_number.png</file>
-        <file>img/completer_operator.png</file>
-        <file>img/completer_other.png</file>
-        <file>img/completer_pragma.png</file>
-        <file>img/completer_string.png</file>
         <file>img/configure.png</file>
-        <file>img/database_connect.png</file>
-        <file>img/database_disconnect.png</file>
-        <file>img/database_export.png</file>
-        <file>img/database_reload.png</file>
         <file>img/default.png</file>
-        <file>img/delete_row.png</file>
         <file>img/delete_selected.png</file>
         <file>img/delete_small.png</file>
         <file>img/denied_small.png</file>
@@ -41,7 +28,6 @@
         <file>img/indicator_info.png</file>
         <file>img/indicator_warn.png</file>
         <file>img/info_small.png</file>
-        <file>img/insert_row.png</file>
         <file>img/insert_rows.png</file>
         <file>img/keyword.png</file>
         <file>img/loading.gif</file>
@@ -58,7 +44,6 @@
         <file>img/pk.png</file>
         <file>img/plus_small.png</file>
         <file>img/question_small.png</file>
-        <file>img/reload.png</file>
         <file>img/rename_fn_arg.png</file>
         <file>img/results_below.png</file>
         <file>img/results_in_tab.png</file>
@@ -141,9 +126,6 @@
         <file>img/config_style.png</file>
         <file>img/plugin.png</file>
         <file>img/config_data_editors.png</file>
-        <file>img/database_export_wizard.svg</file>
-        <file>img/database_import_wizard.svg</file>
-        <file>img/database_offline.png</file>
         <file>img/go_back.png</file>
         <file>img/reset_autoincrement.png</file>
         <file>img/erase_table_data.png</file>
@@ -219,5 +201,21 @@
         <file>img/function.png</file>
         <file>img/brick.svg</file>
         <file>img/extensions.svg</file>
+        <file>img/delete_row.svg</file>
+        <file>img/insert_row.svg</file>
+        <file>img/database_connect.svg</file>
+        <file>img/database_disconnect.svg</file>
+        <file>img/database_export.svg</file>
+        <file>img/database_import.svg</file>
+        <file>img/database_offline.svg</file>
+        <file>img/database_reload.svg</file>
+        <file>img/reload.svg</file>
+        <file>img/complete.svg</file>
+        <file>img/completer_blob.svg</file>
+        <file>img/completer_number.svg</file>
+        <file>img/completer_operator.svg</file>
+        <file>img/completer_pragma.svg</file>
+        <file>img/completer_string.svg</file>
+        <file>img/completer_no_value.svg</file>
     </qresource>
 </RCC>