diff --git a/Cargo.toml b/Cargo.toml index 4d44f20..89ff68f 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -13,7 +13,7 @@ codegen-units = 1 x11 = ["ashpd/gtk4_x11"] [dependencies] -adw = { package = "libadwaita", version = "0.8.0", features = ["v1_6"] } +adw = { package = "libadwaita", version = "0.8.0", features = ["v1_8"] } anyhow = { version = "1.0.66" } arc-swap = "1.6.0" ashpd = { version = "0.12.0", default-features = false, features = [ diff --git a/data/resources/gtk/help-overlay.ui b/data/resources/gtk/help-overlay.ui deleted file mode 100644 index 695a33c..0000000 --- a/data/resources/gtk/help-overlay.ui +++ /dev/null @@ -1,348 +0,0 @@ - - - - True - - - shortcuts - 12 - - - General Shortcuts - - - Copy Image or Selected Text to Clipboard - <Ctrl>C - - - - - Move Image to Trash - Delete - - - - - Permanently Delete Image - <Shift>Delete - - - - - Open Image with Other App - <Ctrl><Shift>O - - - - - Set as Background - <Ctrl>F8 - - - - - New Window - app.new-window - - - - - Open Help - app.help - - - - - Show Keyboard Shortcuts - win.show-help-overlay - - - - - Close Window - window.close - - - - - Quit - app.quit - - - - - - - Navigate Images - - - GTK_TEXT_DIR_LTR - Next Image - Right - - - - - GTK_TEXT_DIR_LTR - Previous Image - Left - - - - - GTK_TEXT_DIR_RTL - Next Image - Left - - - - - GTK_TEXT_DIR_RTL - Previous Image - Right - - - - - First Image - Home - - - - - Last Image - End - - - - - - - Rotate Image - - - Rotate Clockwise - <Ctrl>R - - - - - Rotate Counterclockwise - <Ctrl><Shift>R - - - - - - - Zoom Image - - - Zoom In - <Ctrl>plus plus - - - - - Zoom Out - <Ctrl>minus minus - - - - - Best Fit - <Ctrl>0 0 - - - - - Original Scale - <Ctrl>1 1 - - - - - 200% Scale - <Ctrl>2 2 - - - - - - - Pan View - - - Pan Left - win.pan-left - - - - - Pan Right - win.pan-right - - - - - Pan Up - win.pan-up - - - - - Pan Down - win.pan-down - - - - - - - View - - - Toggle Fullscreen - F11 - - - - - Leave Fullscreen - Escape - - - - - Toggle Image Properties - <Alt>Return F9 - - - - - Show Main Menu - F10 - - - - - - - Gestures - - - GTK_TEXT_DIR_LTR - Next Image - gesture-two-finger-swipe-left - - - - - GTK_TEXT_DIR_LTR - Previous Image - gesture-two-finger-swipe-right - - - - - GTK_TEXT_DIR_RTL - Next Image - gesture-two-finger-swipe-right - - - - - GTK_TEXT_DIR_RTL - Previous Image - gesture-two-finger-swipe-left - - - - - Zoom In - gesture-stretch - - - - - Zoom Out - gesture-pinch - - - - - Rotate Clockwise - gesture-rotate-clockwise - - - - - Rotate Counterclockwise - gesture-rotate-counterclockwise - - - - - - - Editing - - - Open Editing View - E - - - - - Replace Original - <Ctrl>S - - - - - Save As - <Ctrl><Shift>S - - - - - Cancel - Escape - - - - - Rotate Clockwise - <Ctrl>R - - - - - Rotate Counterclockwise - <Ctrl><Shift>R - - - - - Mirror Horizontally - H - - - - - Mirror Vertically - V - - - - - Apply Crop - <Ctrl>Return - - - - - - - - diff --git a/data/resources/shortcuts-dialog.ui b/data/resources/shortcuts-dialog.ui new file mode 100644 index 0000000..ee0cfe2 --- /dev/null +++ b/data/resources/shortcuts-dialog.ui @@ -0,0 +1,284 @@ + + + + + + General Shortcuts + + + Copy Image or Selected Text to Clipboard + <Ctrl>C + + + + + Move Image to Trash + Delete + + + + + Permanently Delete Image + <Shift>Delete + + + + + Open Image with Other App + <Ctrl><Shift>O + + + + + Set as Background + <Ctrl>F8 + + + + + New Window + app.new-window + + + + + Open Help + app.help + + + + + Show Keyboard Shortcuts + app.shortcuts + + + + + Close Window + window.close + + + + + Quit + app.quit + + + + + + + Navigate Images + + + GTK_TEXT_DIR_LTR + Next Image + Right + + + + + GTK_TEXT_DIR_LTR + Previous Image + Left + + + + + GTK_TEXT_DIR_RTL + Next Image + Left + + + + + GTK_TEXT_DIR_RTL + Previous Image + Right + + + + + First Image + Home + + + + + Last Image + End + + + + + + + Rotate Image + + + Rotate Clockwise + <Ctrl>R + + + + + Rotate Counterclockwise + <Ctrl><Shift>R + + + + + + + Zoom Image + + + Zoom In + <Ctrl>plus plus + + + + + Zoom Out + <Ctrl>minus minus + + + + + Best Fit + <Ctrl>0 0 + + + + + Original Scale + <Ctrl>1 1 + + + + + 200% Scale + <Ctrl>2 2 + + + + + + + Pan View + + + Pan Left + <Ctrl>Left + + + + + Pan Right + <Ctrl>Right + + + + + Pan Up + <Ctrl>Up + + + + + Pan Down + <Ctrl>Down + + + + + + + View + + + Toggle Fullscreen + F11 + + + + + Leave Fullscreen + Escape + + + + + Toggle Image Properties + <Alt>Return F9 + + + + + Show Main Menu + F10 + + + + + + + Editing + + + Open Editing View + E + + + + + Replace Original + <Ctrl>S + + + + + Save As + <Ctrl><Shift>S + + + + + Cancel + Escape + + + + + Rotate Clockwise + <Ctrl>R + + + + + Rotate Counterclockwise + <Ctrl><Shift>R + + + + + Mirror Horizontally + H + + + + + Mirror Vertically + V + + + + + Apply Crop + <Ctrl>Return + + + + + + diff --git a/meson.build b/meson.build index 620fa94..fccb420 100644 --- a/meson.build +++ b/meson.build @@ -12,7 +12,7 @@ i18n = import('i18n') gnome = import('gnome') dependency('gtk4', version: '>=4.16.0') -dependency('libadwaita-1', version: '>=1.7.0') +dependency('libadwaita-1', version: '>=1.8.0') dependency('gweather4', version: '>=4.0.0') # Required by glycin crate dependency('lcms2', version: '>=2.12.0') diff --git a/news.d/50.beta/changed-use-adw-shortcuts-dialog b/news.d/50.beta/changed-use-adw-shortcuts-dialog new file mode 100644 index 0000000..a441071 --- /dev/null +++ b/news.d/50.beta/changed-use-adw-shortcuts-dialog @@ -0,0 +1 @@ +Use AdwShortcutsDialog diff --git a/po/POTFILES.in b/po/POTFILES.in index bcef182..cdbe198 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -1,7 +1,7 @@ data/org.gnome.Loupe.desktop.in.in data/org.gnome.Loupe.gschema.xml.in data/org.gnome.Loupe.metainfo.xml.in.in -data/resources/gtk/help-overlay.ui +data/resources/shortcuts-dialog.ui src/about.rs src/application.rs src/config.rs diff --git a/src/widgets/image_window.rs b/src/widgets/image_window.rs index d2e8a83..b62986c 100644 --- a/src/widgets/image_window.rs +++ b/src/widgets/image_window.rs @@ -141,7 +141,7 @@ mod imp { klass.add_binding_action( gdk::Key::question, gdk::ModifierType::CONTROL_MASK, - "win.show-help-overlay", + "app.shortcuts", ); // Set up actions diff --git a/src/widgets/image_window.ui b/src/widgets/image_window.ui index d8469bc..50a1677 100644 --- a/src/widgets/image_window.ui +++ b/src/widgets/image_window.ui @@ -48,7 +48,7 @@ _Keyboard Shortcuts - win.show-help-overlay + app.shortcuts _About Image Viewer diff --git a/src/widgets/window.rs b/src/widgets/window.rs index 52bf516..fe10ed5 100644 --- a/src/widgets/window.rs +++ b/src/widgets/window.rs @@ -88,7 +88,7 @@ mod imp { klass.add_binding_action( gdk::Key::question, gdk::ModifierType::CONTROL_MASK, - "win.show-help-overlay", + "app.shortcts", ); WindowAction::init_actions_and_bindings(klass);