Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

app: Add back help overlay #677

Merged
merged 2 commits into from
Jul 18, 2024
Merged

app: Add back help overlay #677

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
392127d
icons: Remove zoom symbolics
oscfdezdz Feb 9, 2024
e53d977
app: Add back help overlay
oscfdezdz Feb 4, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions data/icons/hicolor/scalable/actions/zoom-in-symbolic.svg
View file
Open in desktop

This file was deleted.

3 changes: 0 additions & 3 deletions data/icons/hicolor/scalable/actions/zoom-out-symbolic.svg
View file
Open in desktop

This file was deleted.

68 changes: 68 additions & 0 deletions src/exm-help-overlay.blp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,68 @@
using Gtk 4.0;

ShortcutsWindow help_overlay {
modal: true;

ShortcutsSection {
section-name: "shortcuts";
max-height: 12;

ShortcutsGroup {
title: C_("shortcut window", "General");

ShortcutsShortcut {
title: C_("shortcut window", "Show Installed Page");
accelerator: "<Alt>1";
}

ShortcutsShortcut {
title: C_("shortcut window", "Show Browse Page");
accelerator: "<Alt>2";
}

ShortcutsShortcut {
title: C_("shortcut window", "Show Keyboard Shortcuts");
action-name: "win.show-help-overlay";
}

ShortcutsShortcut {
title: C_("shortcut window", "Close Window");
action-name: "window.close";
}

ShortcutsShortcut {
title: C_("shortcut window", "Quit");
action-name: "app.quit";
}
}

ShortcutsGroup {
title: C_("shortcut window", "Screenshot View");

ShortcutsShortcut {
title: C_("shortcut window", "Zoom In");
accelerator: "<Primary>plus";
}

ShortcutsShortcut {
title: C_("shortcut window", "Zoom Out");
accelerator: "<Primary>minus";
}

ShortcutsShortcut {
title: C_("shortcut window", "Reset Zoom");
accelerator: "<Primary>0";
}

ShortcutsShortcut {
title: C_("shortcut window", "Zoom In");
shortcut-type: gesture_stretch;
}

ShortcutsShortcut {
title: C_("shortcut window", "Zoom Out");
shortcut-type: gesture_pinch;
}
}
}
}
1 change: 1 addition & 0 deletions src/exm-window.blp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,6 +108,7 @@ menu primary_menu {
}
section {
item (_("_Upgrade Assistant"), "win.show-upgrade-assistant")
item (_("_Keyboard Shortcuts"), "win.show-help-overlay")
item (_("_About Extension Manager"), "app.about")
}
}
Expand Down
5 changes: 5 additions & 0 deletions src/exm.gresource.xml.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,16 @@
<file>exm-info-bar.ui</file>
<file>exm-info-bar-item.ui</file>
<file>exm-screenshot-view.ui</file>
<file alias="gtk/help-overlay.ui">exm-help-overlay.ui</file>
<file alias="suggestions.txt">res/suggestions.txt</file>
<file preprocess="xml-stripblanks" alias="com.mattjakeman.ExtensionManager.metainfo.xml">../data/@appstream_file@</file>
<file>style.css</file>
</gresource>

<gresource prefix="/com/mattjakeman/ExtensionManager/Devel">
<file alias="gtk/help-overlay.ui">exm-help-overlay.ui</file>
</gresource>
oscfdezdz marked this conversation as resolved.
Show resolved Hide resolved

<gresource prefix="/com/mattjakeman/ExtensionManager/icons/scalable/actions">
<file preprocess="xml-stripblanks" alias="clock-alt-symbolic.svg">../data/icons/hicolor/scalable/actions/clock-alt-symbolic.svg</file>
<file preprocess="xml-stripblanks" alias="dialog-error-symbolic.svg">../data/icons/hicolor/scalable/actions/dialog-error-symbolic.svg</file>
Expand Down
3 changes: 2 additions & 1 deletion src/meson.build
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,8 @@ blueprints = custom_target('blueprints',
'exm-error-dialog.blp',
'exm-info-bar.blp',
'exm-info-bar-item.blp',
'exm-screenshot-view.blp'
'exm-screenshot-view.blp',
'exm-help-overlay.blp'
),
output: '.',
command: [find_program('blueprint-compiler'), 'batch-compile', '@OUTPUT@', '@CURRENT_SOURCE_DIR@', '@INPUT@'],
Expand Down