Merge remote-tracking branch 'refs/remotes/origin/main'

glaumar · Aug 19, 2024 · 9f46b56 · 9f46b56
2 parents c46eefa + 00f0784
commit 9f46b56
Show file tree

Hide file tree

Showing 2 changed files with 104 additions and 83 deletions.
diff --git a/.vscode/c_cpp_properties.json b/.vscode/c_cpp_properties.json
@@ -17,6 +17,20 @@
             "cppStandard": "c++20",
             "intelliSenseMode": "linux-clang-x64",
             "configurationProvider": "ms-vscode.cmake-tools"
+        },
+        {
+            "name": "Mac",
+            "includePath": [
+                "${workspaceFolder}/**",
+                "${workspaceFolder}/src",
+                "/usr/local/Cellar/qt/*/include/**"
+            ],
+            "defines": [],
+            "compilerPath": "/usr/bin/clang",
+            "cStandard": "c17",
+            "cppStandard": "c++20",
+            "intelliSenseMode": "macos-clang-x64",
+            "configurationProvider": "ms-vscode.cmake-tools"
         }
     ],
     "version": 4

diff --git a/content/Tabs/Games/Games.qml b/content/Tabs/Games/Games.qml
@@ -23,105 +23,113 @@ import org.kde.kirigami as Kirigami
 
 ColumnLayout {
     Kirigami.Card {
-        //TODO: use Kirigami.ActionToolBar
-
-        id: toolbar
-
-        Layout.fillWidth: true
         Layout.rightMargin: 10
         Layout.bottomMargin: 10
         height: 50
-        Component.onCompleted: {
-            filter_field.forceActiveFocus();
-        }
-
-        RowLayout {
-            anchors.fill: parent
-
-            Button {
-                id: sort_button
-
-                property int sortOrder: Qt.AscendingOrder
 
-                flat: true
-                Layout.fillHeight: true
-                icon.name: "view-sort-ascending"
-                onClicked: {
-                    if (sortOrder === Qt.AscendingOrder) {
-                        icon.name = "view-sort-descending";
-                        sortOrder = Qt.DescendingOrder;
-                    } else {
-                        icon.name = "view-sort-ascending";
-                        sortOrder = Qt.AscendingOrder;
+        Kirigami.ActionToolBar {
+            id: toolbar
+
+            anchors.left: parent.left
+            anchors.right: parent.right
+            Layout.rightMargin: 10
+            Layout.bottomMargin: 10
+            height: 50
+
+            actions: [
+                Kirigami.Action {
+                    id: sort_button
+
+                    property int sortOrder: Qt.AscendingOrder
+
+                    icon.name: "view-sort-ascending"
+                    onTriggered: {
+                        if (sortOrder === Qt.AscendingOrder) {
+                            icon.name = "view-sort-descending";
+                            sortOrder = Qt.DescendingOrder;
+                        } else {
+                            icon.name = "view-sort-ascending";
+                            sortOrder = Qt.AscendingOrder;
+                        }
+                        app.vrp.sortGames(sort_field.currentIndex, sortOrder);
                     }
-                    app.vrp.sortGames(sort_field.currentIndex, sortOrder);
-                }
-            }
-
-            ComboBox {
-                id: sort_field
+                },
 
-                flat: true
-                Layout.fillHeight: true
-                onActivated: app.vrp.sortGames(currentIndex, sort_button.sortOrder)
-                model: ["Update Date", "Name", "Size"]
-            }
+                Kirigami.Action {
+                    id: sort_field
 
-            TextField {
-                id: filter_field
-
-                Layout.fillWidth: true
-                Layout.fillHeight: true
-                placeholderText: qsTr("Filter by name...")
-                onTextChanged: app.vrp.filterGamesByName(text)
-                Button {
-                    height: parent.height
-                    anchors.right: parent.right
-                    flat: true
-                    icon.name: "search"
-                }
+                    displayComponent: ComboBox {
+                        onActivated: app.vrp.sortGames(currentIndex, sort_button.sortOrder)
+                        model: ["Update Date", "Name", "Size"]
+                    }
+                },
+
+                Kirigami.Action {
+                    displayComponent: Kirigami.SearchField {
+                        id: filter_field
+
+                        placeholderText: qsTr("Filter by name...")
+                        implicitWidth: Math.max(200, toolbar.width / 3)
+                        focusSequence: StandardKey.Find
+                        onAccepted: app.vrp.filterGamesByName(text)
+                        Component.onCompleted: {
+                            forceActiveFocus();
+                        }
+                    }
+                },
 
-            }
+                Kirigami.Action {
+                    displayComponent: RadioButton {
+                        checked: true
+                        text: qsTr("All")
+                        onClicked: app.vrp.filterGamesByStatus(VrpManager.Unknown)
+                    }
+                },
 
-            RadioButton {
-                checked: true
-                text: qsTr("All")
-                onClicked: app.vrp.filterGamesByStatus(VrpManager.Unknown)
-            }
+                Kirigami.Action {
+                    displayComponent: RadioButton {
+                        text: qsTr("Downloading")
+                        onClicked: app.vrp.filterGamesByStatus(VrpManager.Downloading | VrpManager.Queued | VrpManager.DownloadError | VrpManager.Decompressing | VrpManager.DecompressionError)
+                    }
+                },
 
-            RadioButton {
-                text: qsTr("Downloading")
-                onClicked: app.vrp.filterGamesByStatus(VrpManager.Downloading | VrpManager.Queued | VrpManager.DownloadError | VrpManager.Decompressing | VrpManager.DecompressionError)
-            }
+                Kirigami.Action {
+                    displayComponent: RadioButton {
+                        text: qsTr("Local")
+                        onClicked: app.vrp.filterGamesByStatus(VrpManager.Local | VrpManager.Installable | VrpManager.UpdatableLocally | VrpManager.Installing | VrpManager.InstallError | VrpManager.InstalledAndLocally)
+                    }
+                },
 
-            RadioButton {
-                text: qsTr("Local")
-                onClicked: app.vrp.filterGamesByStatus(VrpManager.Local | VrpManager.Installable | VrpManager.UpdatableLocally | VrpManager.Installing | VrpManager.InstallError | VrpManager.InstalledAndLocally)
-            }
+                Kirigami.Action {
+                    displayComponent: RadioButton {
+                        text: qsTr("Updatable")
+                        onClicked: app.vrp.filterGamesByStatus(VrpManager.UpdatableLocally | VrpManager.UpdatableRemotely)
+                        enabled: app.deviceManager.connectedDevice.length > 0
+                    }
+                },
 
-            RadioButton {
-                text: qsTr("Updatable")
-                onClicked: app.vrp.filterGamesByStatus(VrpManager.UpdatableLocally | VrpManager.UpdatableRemotely)
-                enabled: app.deviceManager.connectedDevice.length > 0
-            }
+                Kirigami.Action {
+                    displayComponent: RadioButton {
+                        text: qsTr("Installed")
 
-            RadioButton {
-                text: qsTr("Installed")
-                onClicked: app.vrp.filterGamesByStatus(VrpManager.InstalledAndLocally | VrpManager.InstalledAndRemotely)
-                enabled: app.deviceManager.connectedDevice.length > 0
-            }
+                        onClicked: app.vrp.filterGamesByStatus(VrpManager.InstalledAndLocally | VrpManager.InstalledAndRemotely)
+                        enabled: app.deviceManager.connectedDevice.length > 0
+                    }
+                },
 
-            Button {
-                id: settings_button
+                Kirigami.Action {
+                    displayComponent: Button {
+                        id: settings_button
 
-                flat: true
-                Layout.fillHeight: true
-                icon.name: "settings-configure"
-                onClicked: settings_sheet.open()
-            }
+                        flat: true
+                        anchors.right: parent.right
+                        icon.name: "settings-configure"
+                        onClicked: settings_sheet.open()
+                    }
+                }
+            ]
 
         }
-
     }
 
     Kirigami.OverlaySheet {
@@ -235,5 +243,4 @@ ColumnLayout {
         }
 
     }
-
 }