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

Consistency improvement with dock menu item #622

Merged
merged 11 commits into from
Jan 29, 2025
Merged

Consistency improvement with dock menu item #622

Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
f264a99
Keep In Dock like the dock
teamcons Jan 1, 2025
d62adce
less to keep in sync: remove the docked variable
teamcons Jan 1, 2025
b9e4111
Make the linter happy
teamcons Jan 1, 2025
6106b50
Consistency: have add to dock always present
teamcons Jan 1, 2025
ca61bb6
Update AppContextMenu.vala
teamcons Jan 1, 2025
d48e853
Removed comments
teamcons Jan 19, 2025
f548fef
Update AppContextMenu.vala
teamcons Jan 22, 2025
f51d898
Update AppContextMenu.vala
teamcons Jan 22, 2025
2a4ea91
Update AppContextMenu.vala
teamcons Jan 22, 2025
29dbb3e
RyoNakano's proposal for testing
teamcons Jan 22, 2025
bf465d2
clean a newline
teamcons Jan 22, 2025
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
32 changes: 16 additions & 16 deletions src/Widgets/AppContextMenu.vala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,7 @@ public class Slingshot.AppContextMenu : Gtk.Menu {
private Slingshot.Backend.SwitcherooControl switcheroo_control;
private Gtk.MenuItem uninstall_menuitem;
private Gtk.MenuItem appcenter_menuitem;
private Gtk.MenuItem dock_menuitem;

private bool docked = false;
private Gtk.CheckMenuItem dock_menuitem;

public AppContextMenu (string desktop_id, string desktop_path) {
Object (
Expand Down Expand Up @@ -82,18 +80,21 @@ public class Slingshot.AppContextMenu : Gtk.Menu {
});
}

var dock = Backend.Dock.get_default ();
if (dock.dbus != null) {
if (Environment.find_program_in_path ("io.elementary.dock") != null) {
if (get_children ().length () > 0) {
add (new Gtk.SeparatorMenuItem ());
}

ryonakano marked this conversation as resolved.
Show resolved Hide resolved
has_system_item = true;

dock_menuitem = new Gtk.MenuItem () {
var dock = Backend.Dock.get_default ();

dock_menuitem = new Gtk.CheckMenuItem () {
label = _("Add to _Dock"),
use_underline = true
use_underline = true,
sensitive = false
};

dock_menuitem.activate.connect (dock_menuitem_activate);

add (dock_menuitem);
Expand Down Expand Up @@ -183,16 +184,15 @@ public class Slingshot.AppContextMenu : Gtk.Menu {

private void on_dock_dbus_changed (Backend.Dock dock) {
if (dock.dbus != null) {
dock_menuitem.sensitive = true;

try {
docked = desktop_id in dock.dbus.list_launchers ();
if (docked) {
dock_menuitem.label = _("Remove from _Dock");
} else {
dock_menuitem.label = _("Add to _Dock");
}
dock_menuitem.active = desktop_id in dock.dbus.list_launchers ();
} catch (GLib.Error e) {
critical (e.message);
}
} else {
dock_menuitem.sensitive = false;
}
}

Expand All @@ -203,10 +203,10 @@ public class Slingshot.AppContextMenu : Gtk.Menu {
}

teamcons marked this conversation as resolved.
Show resolved Hide resolved
try {
if (docked) {
dock.dbus.remove_launcher (desktop_id);
} else {
if (dock_menuitem.active) {
dock.dbus.add_launcher (desktop_id);
} else {
dock.dbus.remove_launcher (desktop_id);
}
} catch (GLib.Error e) {
critical (e.message);
Expand Down
Loading