Thanks to visit codestin.com
Credit goes to github.com

Skip to content

HeaderBar: put find actions in menu #1219

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

Merged
jeremypw merged 3 commits into from
Jan 10, 2023
Merged

HeaderBar: put find actions in menu #1219

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
22931d1
HeaderBar: put find actions in menu
danirabbit Jan 8, 2023
211c818
Scope down search button
danirabbit Jan 8, 2023
7a59716
Merge branch 'master' into find-menu
Jan 10, 2023
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
15 changes: 15 additions & 0 deletions data/icons/find-on-page-symbolic.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions data/io.elementary.code.gresource.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,5 +22,6 @@
<file alias="lang-method-virtual.svg" compressed="true" preprocess="xml-stripblanks">icons/SymbolOutline/virtualmethod.svg</file>
<file alias="lang-property-virtual.svg" compressed="true" preprocess="xml-stripblanks">icons/SymbolOutline/virtualproperty.svg</file>
<file alias="plugin-outline-symbolic.svg" compressed="true" preprocess="xml-stripblanks">icons/SymbolOutline/plugin-outline-symbolic.svg</file>
<file alias="scalable/actions/edit-find-on-page-symbolic.svg" compressed="true" preprocess="xml-stripblanks">icons/find-on-page-symbolic.svg</file>
</gresource>
</gresources>
4 changes: 2 additions & 2 deletions src/MainWindow.vala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -213,8 +213,8 @@ namespace Scratch {
if (name == ACTION_SHOW_FIND) {
if (new_state.get_boolean () == false) {
toolbar.find_button.tooltip_markup = Granite.markup_accel_tooltip (
app.get_accels_for_action (ACTION_PREFIX + ACTION_FIND),
_("Find…")
app.get_accels_for_action (ACTION_PREFIX + ACTION_FIND + "::"),
_("Find on Page…")
);
} else {
toolbar.find_button.tooltip_markup = Granite.markup_accel_tooltip (
Expand Down
51 changes: 38 additions & 13 deletions src/Widgets/HeaderBar.vala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,11 @@ namespace Scratch.Widgets {
public Gtk.Menu share_menu;
public Gtk.MenuButton share_app_menu;
public Gtk.MenuButton app_menu;
public Gtk.ToggleButton find_button;
public Gtk.Button templates_button;
public Code.FormatBar format_bar;

public Gtk.ToggleButton find_button { get; private set; }

private const string STYLE_SCHEME_HIGH_CONTRAST = "classic";
private const string STYLE_SCHEME_LIGHT = "elementary-light";
private const string STYLE_SCHEME_DARK = "elementary-dark";
Expand Down Expand Up @@ -74,14 +75,6 @@ namespace Scratch.Widgets {
_("Restore this file")
);

find_button = new Gtk.ToggleButton ();
find_button.action_name = MainWindow.ACTION_PREFIX + MainWindow.ACTION_SHOW_FIND;
find_button.image = new Gtk.Image.from_icon_name ("edit-find", Gtk.IconSize.LARGE_TOOLBAR);
find_button.tooltip_markup = Granite.markup_accel_tooltip (
app_instance.get_accels_for_action (MainWindow.ACTION_PREFIX + MainWindow.ACTION_FIND),
_("Find…")
);

share_menu = new Gtk.Menu ();
share_app_menu = new Gtk.MenuButton ();
share_app_menu.image = new Gtk.Image.from_icon_name ("document-export", Gtk.IconSize.LARGE_TOOLBAR);
Expand Down Expand Up @@ -110,15 +103,48 @@ namespace Scratch.Widgets {
_("Zoom In")
);

var font_size_grid = new Gtk.Grid ();
var font_size_grid = new Gtk.Grid () {
margin_top = 12,
margin_end = 12,
margin_bottom = 6,
margin_start = 12
};
font_size_grid.column_homogeneous = true;
font_size_grid.hexpand = true;
font_size_grid.margin = 12;
font_size_grid.get_style_context ().add_class (Gtk.STYLE_CLASS_LINKED);
font_size_grid.add (zoom_out_button);
font_size_grid.add (zoom_default_button);
font_size_grid.add (zoom_in_button);

find_button = new Gtk.ToggleButton () {
action_name = MainWindow.ACTION_PREFIX + MainWindow.ACTION_SHOW_FIND,
image = new Gtk.Image.from_icon_name ("edit-find-on-page-symbolic", Gtk.IconSize.MENU)
};
find_button.tooltip_markup = Granite.markup_accel_tooltip (
app_instance.get_accels_for_action (MainWindow.ACTION_PREFIX + MainWindow.ACTION_FIND + "::"),
_("Find on Page…")
);

var search_button = new Gtk.Button.from_icon_name ("edit-find-symbolic", Gtk.IconSize.MENU) {
action_name = MainWindow.ACTION_PREFIX + MainWindow.ACTION_FIND_GLOBAL,
action_target = new Variant.string ("")
};
search_button.tooltip_markup = Granite.markup_accel_tooltip (
app_instance.get_accels_for_action (search_button.action_name + "::"),
_("Find in Project…")
);

var find_box = new Gtk.Box (Gtk.Orientation.HORIZONTAL, 0) {
hexpand = true,
homogeneous = true,
margin_end = 12,
margin_bottom = 12,
margin_start = 12
};
find_box.get_style_context ().add_class (Gtk.STYLE_CLASS_LINKED);
find_box.add (find_button);
find_box.add (search_button);

var follow_system_switchmodelbutton = new Granite.SwitchModelButton (_("Follow System Style")) {
margin_top = 3
};
Expand Down Expand Up @@ -185,6 +211,7 @@ namespace Scratch.Widgets {
width_request = 200
};
menu_box.add (font_size_grid);
menu_box.add (find_box);
menu_box.add (new Gtk.Separator (Gtk.Orientation.HORIZONTAL));
menu_box.add (follow_system_switchmodelbutton);
menu_box.add (color_revealer);
Expand Down Expand Up @@ -216,8 +243,6 @@ namespace Scratch.Widgets {
pack_start (revert_button);
pack_end (app_menu);
pack_end (share_app_menu);
pack_end (new Gtk.Separator (Gtk.Orientation.HORIZONTAL));
pack_end (find_button);

show_all ();

Expand Down