2.diff (3179B)
1 diff --git a/build-aux/dev.nordgedanken.heic2jpg.Devel.json b/build-aux/dev.nordgedanken.heic2jpg.Devel.json 2 index 2303ddf..6994e61 100644 3 --- a/build-aux/dev.nordgedanken.heic2jpg.Devel.json 4 +++ b/build-aux/dev.nordgedanken.heic2jpg.Devel.json 5 @@ -1,11 +1,11 @@ 6 { 7 "id": "dev.nordgedanken.heic2jpg.Devel", 8 "runtime": "org.gnome.Platform", 9 - "runtime-version": "46", 10 + "runtime-version": "47", 11 "sdk": "org.gnome.Sdk", 12 "sdk-extensions": [ 13 "org.freedesktop.Sdk.Extension.rust-stable", 14 - "org.freedesktop.Sdk.Extension.llvm16" 15 + "org.freedesktop.Sdk.Extension.llvm18" 16 ], 17 "command": "heic2jpg", 18 "finish-args": [ 19 @@ -19,7 +19,7 @@ 20 "--env=RUST_BACKTRACE=1" 21 ], 22 "build-options": { 23 - "append-path": "/usr/lib/sdk/rust-stable/bin:/usr/lib/sdk/llvm16/bin", 24 + "append-path": "/usr/lib/sdk/rust-stable/bin:/usr/lib/sdk/llvm18/bin", 25 "build-args": [ 26 "--share=network" 27 ], 28 diff --git a/src/app.rs b/src/app.rs 29 index 402b326..cf66933 100644 30 --- a/src/app.rs 31 +++ b/src/app.rs 32 @@ -96,11 +96,9 @@ impl SimpleComponent for App { 33 None 34 }, 35 36 - gtk::Box { 37 - set_orientation: gtk::Orientation::Vertical, 38 - set_vexpand: true, 39 + adw::ToolbarView { 40 41 - adw::HeaderBar { 42 + add_top_bar = &adw::HeaderBar { 43 #[wrap(Some)] 44 set_title_widget = &adw::WindowTitle { 45 set_title: &gettext("Convert Heic to JPG"), 46 @@ -155,6 +153,8 @@ impl SimpleComponent for App { 47 48 gtk::Button { 49 set_label: "Close", 50 + add_css_class: "suggested-action", 51 + add_css_class: "pill", 52 connect_clicked[sender] => move |_| { 53 sender.input(AppMsg::Quit); 54 } 55 @@ -210,6 +210,8 @@ impl SimpleComponent for App { 56 set_spacing: 24, 57 gtk::Button { 58 set_label: &gettext("Convert"), 59 + add_css_class: "suggested-action", 60 + add_css_class: "pill", 61 connect_clicked[sender] => move |_| { 62 sender.input(AppMsg::Convert); 63 } 64 diff --git a/src/select_folder.rs b/src/select_folder.rs 65 index 81e3011..a6397e6 100644 66 --- a/src/select_folder.rs 67 +++ b/src/select_folder.rs 68 @@ -56,6 +56,8 @@ impl SimpleComponent for SelectFolder { 69 gtk::Button { 70 set_halign: gtk::Align::Center, 71 set_label: &model.button_label, 72 + add_css_class: "suggested-action", 73 + add_css_class: "pill", 74 connect_clicked[sender] => move |_| { 75 sender.input(SelectFolderMsg::OpenRequest); 76 }