heic2jpg

commit 667a641e68d365a07d5d816f82f012498a60d762
parent df1da446fab1c4e33d56258b9caa7397680d0b94
Author: Marcel <MTRNord@users.noreply.github.com>
Date:   Mon, 11 Nov 2024 17:26:38 +0100

Merge pull request #2 from FineFindus/feat/HIG-design

feat: adjust design to follow GNOME HIG
Diffstat:
M
build-aux/dev.nordgedanken.heic2jpg.Devel.json
 | 
6
+++---
M
src/app.rs
 | 
10
++++++----
M
src/select_folder.rs
 | 
2
++

3 files changed, 11 insertions(+), 7 deletions(-)
diff --git a/build-aux/dev.nordgedanken.heic2jpg.Devel.json b/build-aux/dev.nordgedanken.heic2jpg.Devel.json
@@ -1,11 +1,11 @@
 {
     "id": "dev.nordgedanken.heic2jpg.Devel",
     "runtime": "org.gnome.Platform",
-    "runtime-version": "46",
+    "runtime-version": "47",
     "sdk": "org.gnome.Sdk",
     "sdk-extensions": [
         "org.freedesktop.Sdk.Extension.rust-stable",
-        "org.freedesktop.Sdk.Extension.llvm16"
+        "org.freedesktop.Sdk.Extension.llvm18"
     ],
     "command": "heic2jpg",
     "finish-args": [
@@ -19,7 +19,7 @@
         "--env=RUST_BACKTRACE=1"
     ],
     "build-options": {
-        "append-path": "/usr/lib/sdk/rust-stable/bin:/usr/lib/sdk/llvm16/bin",
+        "append-path": "/usr/lib/sdk/rust-stable/bin:/usr/lib/sdk/llvm18/bin",
         "build-args": [
             "--share=network"
         ],
diff --git a/src/app.rs b/src/app.rs
@@ -96,11 +96,9 @@ impl SimpleComponent for App {
                     None
                 },
 
-            gtk::Box {
-                set_orientation: gtk::Orientation::Vertical,
-                set_vexpand: true,
+            adw::ToolbarView {
 
-                adw::HeaderBar {
+               add_top_bar = &adw::HeaderBar {
                     #[wrap(Some)]
                     set_title_widget = &adw::WindowTitle {
                         set_title: &gettext("Convert Heic to JPG"),
@@ -155,6 +153,8 @@ impl SimpleComponent for App {
 
                                 gtk::Button {
                                     set_label: "Close",
+                                    add_css_class: "suggested-action",
+                                    add_css_class: "pill",
                                     connect_clicked[sender] => move |_| {
                                         sender.input(AppMsg::Quit);
                                     }
@@ -210,6 +210,8 @@ impl SimpleComponent for App {
                                 set_spacing: 24,
                                 gtk::Button {
                                     set_label: &gettext("Convert"),
+                                    add_css_class: "suggested-action",
+                                    add_css_class: "pill",
                                     connect_clicked[sender] => move |_| {
                                         sender.input(AppMsg::Convert);
                                     }
diff --git a/src/select_folder.rs b/src/select_folder.rs
@@ -56,6 +56,8 @@ impl SimpleComponent for SelectFolder {
                 gtk::Button {
                     set_halign: gtk::Align::Center,
                     set_label: &model.button_label,
+                    add_css_class: "suggested-action",
+                    add_css_class: "pill",
                     connect_clicked[sender] => move |_| {
                         sender.input(SelectFolderMsg::OpenRequest);
                     }