Use Material style consistently in Qt Quick GUI

* Avoid deployment of all style plugins when building APK (not tested yet) * Allow QML compiler to generate more efficient code for bindings, see https://doc.qt.io/qt-6/qtquickcontrols-styles.html#compile-time-style-selection * Avoid a mix of different styles as the Material theme is already used in some parts * Not sure how to integrate these components later into e.g. the wizard, maybe this needs to be partially reverted when refactoring code later
Martchus · Jan 5, 2025 · 8a39118 · 8a39118
1 parent b25e461
commit 8a39118
Show file tree

Hide file tree

Showing 44 changed files with 42 additions and 44 deletions.
diff --git a/tray/application/main.cpp b/tray/application/main.cpp
@@ -301,7 +301,6 @@ static int runApplication(int argc, const char *const *argv)
 #endif
 #endif
         qtConfigArgs.applySettings(true);
-        qtConfigArgs.applySettingsForQuickGui();
         networkAccessManager().setParent(&app);
 
         auto quickApp = App(insecureArg.isPresent());

diff --git a/tray/gui/qml/AboutDialog.qml b/tray/gui/qml/AboutDialog.qml
@@ -1,6 +1,6 @@
 import QtQuick
 import QtQuick.Layouts
-import QtQuick.Controls
+import QtQuick.Controls.Material
 
 import Main
 

diff --git a/tray/gui/qml/AdvancedConfigPage.qml b/tray/gui/qml/AdvancedConfigPage.qml
@@ -1,6 +1,6 @@
 import QtQuick
 import QtQuick.Layouts
-import QtQuick.Controls
+import QtQuick.Controls.Material
 import QtQuick.Dialogs
 
 import Main

diff --git a/tray/gui/qml/AdvancedPage.qml b/tray/gui/qml/AdvancedPage.qml
@@ -1,6 +1,6 @@
 import QtQuick
 import QtQuick.Layouts
-import QtQuick.Controls
+import QtQuick.Controls.Material
 
 import Main
 

diff --git a/tray/gui/qml/ArrayElementButtons.qml b/tray/gui/qml/ArrayElementButtons.qml
@@ -1,6 +1,6 @@
 import QtQuick
 import QtQuick.Layouts
-import QtQuick.Controls
+import QtQuick.Controls.Material
 
 import Main
 

diff --git a/tray/gui/qml/ChangesPage.qml b/tray/gui/qml/ChangesPage.qml
@@ -1,6 +1,6 @@
 import QtQuick
 import QtQuick.Layouts
-import QtQuick.Controls
+import QtQuick.Controls.Material
 
 import Main
 

diff --git a/tray/gui/qml/CopyPasteButtons.qml b/tray/gui/qml/CopyPasteButtons.qml
@@ -1,6 +1,6 @@
 import QtQuick
 import QtQuick.Layouts
-import QtQuick.Controls
+import QtQuick.Controls.Material
 
 import Main
 

diff --git a/tray/gui/qml/CustomDialog.qml b/tray/gui/qml/CustomDialog.qml
@@ -1,5 +1,5 @@
 import QtQuick
-import QtQuick.Controls
+import QtQuick.Controls.Material
 
 import Main
 

diff --git a/tray/gui/qml/CustomFlickable.qml b/tray/gui/qml/CustomFlickable.qml
@@ -1,5 +1,5 @@
 import QtQuick
-import QtQuick.Controls
+import QtQuick.Controls.Material
 
 Flickable {
     id: flickable

diff --git a/tray/gui/qml/CustomListView.qml b/tray/gui/qml/CustomListView.qml
@@ -1,5 +1,5 @@
 import QtQuick
-import QtQuick.Controls
+import QtQuick.Controls.Material
 
 ListView {
     id: listView

diff --git a/tray/gui/qml/CustomToolButton.qml b/tray/gui/qml/CustomToolButton.qml
@@ -1,5 +1,5 @@
 import QtQuick
-import QtQuick.Controls
+import QtQuick.Controls.Material
 
 import Main
 

diff --git a/tray/gui/qml/DetailsListView.qml b/tray/gui/qml/DetailsListView.qml
@@ -1,6 +1,6 @@
 import QtQuick
 import QtQuick.Layouts
-import QtQuick.Controls
+import QtQuick.Controls.Material
 
 import Main
 

diff --git a/tray/gui/qml/DevDelegate.qml b/tray/gui/qml/DevDelegate.qml
@@ -1,6 +1,6 @@
 import QtQuick
 import QtQuick.Layouts
-import QtQuick.Controls
+import QtQuick.Controls.Material
 
 import Main
 

diff --git a/tray/gui/qml/DevListView.qml b/tray/gui/qml/DevListView.qml
@@ -1,6 +1,6 @@
 import QtQuick
 import QtQuick.Layouts
-import QtQuick.Controls
+import QtQuick.Controls.Material
 
 ExpandableListView {
     id: mainView

diff --git a/tray/gui/qml/DevsPage.qml b/tray/gui/qml/DevsPage.qml
@@ -1,6 +1,6 @@
 import QtQuick
 import QtQuick.Layouts
-import QtQuick.Controls
+import QtQuick.Controls.Material
 
 import Main
 

diff --git a/tray/gui/qml/DirDelegate.qml b/tray/gui/qml/DirDelegate.qml
@@ -1,6 +1,6 @@
 import QtQuick
 import QtQuick.Layouts
-import QtQuick.Controls
+import QtQuick.Controls.Material
 import Qt.labs.qmlmodels
 
 import Main

diff --git a/tray/gui/qml/DirErrorsPage.qml b/tray/gui/qml/DirErrorsPage.qml
@@ -1,6 +1,6 @@
 import QtQuick
 import QtQuick.Layouts
-import QtQuick.Controls
+import QtQuick.Controls.Material
 
 import Main
 

diff --git a/tray/gui/qml/DirListView.qml b/tray/gui/qml/DirListView.qml
@@ -1,6 +1,6 @@
 import QtQuick
 import QtQuick.Layouts
-import QtQuick.Controls
+import QtQuick.Controls.Material
 
 ExpandableListView {
     id: mainView

diff --git a/tray/gui/qml/DirsPage.qml b/tray/gui/qml/DirsPage.qml
@@ -1,6 +1,6 @@
 import QtQuick
 import QtQuick.Layouts
-import QtQuick.Controls
+import QtQuick.Controls.Material
 
 import Main
 

diff --git a/tray/gui/qml/ErrorsDelegate.qml b/tray/gui/qml/ErrorsDelegate.qml
@@ -1,6 +1,6 @@
 import QtQuick
 import QtQuick.Layouts
-import QtQuick.Controls
+import QtQuick.Controls.Material
 
 import Main
 

diff --git a/tray/gui/qml/ErrorsPage.qml b/tray/gui/qml/ErrorsPage.qml
@@ -1,6 +1,6 @@
 import QtQuick
 import QtQuick.Layouts
-import QtQuick.Controls
+import QtQuick.Controls.Material
 
 import Main
 

diff --git a/tray/gui/qml/ExpandableDelegate.qml b/tray/gui/qml/ExpandableDelegate.qml
@@ -1,5 +1,5 @@
 import QtQuick
-import QtQuick.Controls
+import QtQuick.Controls.Material
 
 DelegateModel {
     id: mainDelegateModel

diff --git a/tray/gui/qml/ExpandableItemDelegate.qml b/tray/gui/qml/ExpandableItemDelegate.qml
@@ -1,7 +1,7 @@
 import QtQml
 import QtQuick
 import QtQuick.Layouts
-import QtQuick.Controls
+import QtQuick.Controls.Material
 
 import Main
 

diff --git a/tray/gui/qml/ExpandableListView.qml b/tray/gui/qml/ExpandableListView.qml
@@ -1,5 +1,5 @@
 import QtQuick
-import QtQuick.Controls
+import QtQuick.Controls.Material
 
 CustomListView {
     id: mainView

diff --git a/tray/gui/qml/FilesPage.qml b/tray/gui/qml/FilesPage.qml
@@ -1,6 +1,6 @@
 import QtQuick
 import QtQuick.Layouts
-import QtQuick.Controls
+import QtQuick.Controls.Material
 
 import Main
 

diff --git a/tray/gui/qml/HelpButton.qml b/tray/gui/qml/HelpButton.qml
@@ -1,5 +1,5 @@
 import QtQuick
-import QtQuick.Controls
+import QtQuick.Controls.Material
 import QtQuick.Layouts
 
 import Main

diff --git a/tray/gui/qml/IconOnlyButton.qml b/tray/gui/qml/IconOnlyButton.qml
@@ -1,6 +1,6 @@
 import QtQuick
 import QtQuick.Layouts
-import QtQuick.Controls
+import QtQuick.Controls.Material
 
 RoundButton {
     Layout.preferredWidth: 36

diff --git a/tray/gui/qml/IgnorePatternPage.qml b/tray/gui/qml/IgnorePatternPage.qml
@@ -1,6 +1,6 @@
 import QtQuick
 import QtQuick.Layouts
-import QtQuick.Controls
+import QtQuick.Controls.Material
 
 import Main
 

diff --git a/tray/gui/qml/ImportPage.qml b/tray/gui/qml/ImportPage.qml
@@ -1,6 +1,6 @@
 import QtQuick
 import QtQuick.Layouts
-import QtQuick.Controls
+import QtQuick.Controls.Material
 import QtQuick.Dialogs
 
 import Main

diff --git a/tray/gui/qml/InternalErrorsPage.qml b/tray/gui/qml/InternalErrorsPage.qml
@@ -1,6 +1,6 @@
 import QtQuick
 import QtQuick.Layouts
-import QtQuick.Controls
+import QtQuick.Controls.Material
 
 import Main
 

diff --git a/tray/gui/qml/LoadingPane.qml b/tray/gui/qml/LoadingPane.qml
@@ -1,6 +1,6 @@
 import QtQuick
 import QtQuick.Layouts
-import QtQuick.Controls
+import QtQuick.Controls.Material
 
 import Main
 

diff --git a/tray/gui/qml/LogPage.qml b/tray/gui/qml/LogPage.qml
@@ -1,6 +1,6 @@
 import QtQuick
 import QtQuick.Layouts
-import QtQuick.Controls
+import QtQuick.Controls.Material
 
 import Main
 

diff --git a/tray/gui/qml/Main.qml b/tray/gui/qml/Main.qml
@@ -1,6 +1,5 @@
 import QtQuick
 import QtQuick.Layouts
-import QtQuick.Controls
 import QtQuick.Controls.Material
 import QtQuick.Dialogs
 import Qt.labs.qmlmodels

diff --git a/tray/gui/qml/MainTabButton.qml b/tray/gui/qml/MainTabButton.qml
@@ -1,5 +1,5 @@
 import QtQuick
-import QtQuick.Controls
+import QtQuick.Controls.Material
 
 import Main
 

diff --git a/tray/gui/qml/MenuItemInstantiator.qml b/tray/gui/qml/MenuItemInstantiator.qml
@@ -1,6 +1,6 @@
 import QtQml
 import QtQuick
-import QtQuick.Controls
+import QtQuick.Controls.Material
 
 Instantiator {
     onObjectAdded: (index, object) => menu.insertItem(index, object)

diff --git a/tray/gui/qml/NeededPage.qml b/tray/gui/qml/NeededPage.qml
@@ -1,6 +1,6 @@
 import QtQuick
 import QtQuick.Layouts
-import QtQuick.Controls
+import QtQuick.Controls.Material
 
 import Main
 

diff --git a/tray/gui/qml/ObjectConfigDelegate.qml b/tray/gui/qml/ObjectConfigDelegate.qml
@@ -1,6 +1,6 @@
 import QtQuick
 import QtQuick.Layouts
-import QtQuick.Controls
+import QtQuick.Controls.Material
 import QtQuick.Dialogs
 import Qt.labs.qmlmodels
 

diff --git a/tray/gui/qml/ObjectConfigPage.qml b/tray/gui/qml/ObjectConfigPage.qml
@@ -1,6 +1,6 @@
 import QtQuick
 import QtQuick.Layouts
-import QtQuick.Controls
+import QtQuick.Controls.Material
 import QtQuick.Dialogs
 
 import Main

diff --git a/tray/gui/qml/OutOfSyncDirs.qml b/tray/gui/qml/OutOfSyncDirs.qml
@@ -1,6 +1,6 @@
 import QtQuick
 import QtQuick.Layouts
-import QtQuick.Controls
+import QtQuick.Controls.Material
 
 import Main
 

diff --git a/tray/gui/qml/SelectiveImportDelegate.qml b/tray/gui/qml/SelectiveImportDelegate.qml
@@ -1,6 +1,6 @@
 import QtQuick
 import QtQuick.Layouts
-import QtQuick.Controls
+import QtQuick.Controls.Material
 import QtQuick.Dialogs
 
 import Main

diff --git a/tray/gui/qml/SettingsPage.qml b/tray/gui/qml/SettingsPage.qml
@@ -1,6 +1,6 @@
 import QtQuick
 import QtQuick.Layouts
-import QtQuick.Controls
+import QtQuick.Controls.Material
 import QtQuick.Dialogs
 
 import Main

diff --git a/tray/gui/qml/StartPage.qml b/tray/gui/qml/StartPage.qml
@@ -1,6 +1,6 @@
 import QtQuick
 import QtQuick.Layouts
-import QtQuick.Controls
+import QtQuick.Controls.Material
 import QtQuick.Dialogs
 
 import Main

diff --git a/tray/gui/qml/Statistics.qml b/tray/gui/qml/Statistics.qml
@@ -1,6 +1,6 @@
 import QtQuick
 import QtQuick.Layouts
-import QtQuick.Controls
+import QtQuick.Controls.Material
 
 ItemDelegate {
     id: itemDelegate

diff --git a/tray/gui/qml/StatisticsPage.qml b/tray/gui/qml/StatisticsPage.qml
@@ -1,5 +1,5 @@
 import QtQuick
-import QtQuick.Controls
+import QtQuick.Controls.Material
 
 import Main