Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion po/POTFILES
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ src/App.vala
src/AppWindow.vala
src/DesktopIntegration.vala
src/Launcher.vala
src/LauncherManager.vala
src/ItemManager.vala
src/MainWindow.vala
src/PoofPopover.vala
src/DBus/ItemInterface.vala
Expand Down
2 changes: 1 addition & 1 deletion src/App.vala
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@ public class Dock.App : Object {
notify["pinned"].connect (() => {
pinned_action.set_state (pinned);
check_remove ();
LauncherManager.get_default ().sync_pinned ();
ItemManager.get_default ().sync_pinned ();
});
}

Expand Down
2 changes: 1 addition & 1 deletion src/DBus/ShellKeyGrabber.vala
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ public interface ShellKeyGrabber : GLib.Object {
return;
}

Dock.LauncherManager.get_default ().launch (saved_action_ids[action]);
Dock.ItemManager.get_default ().launch (saved_action_ids[action]);
}

private static void ungrab_keybindings () requires (instance != null) {
Expand Down
8 changes: 4 additions & 4 deletions src/LauncherManager.vala → src/ItemManager.vala
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,12 @@
* SPDX-FileCopyrightText: 2023 elementary, Inc. (https://elementary.io)
*/

public class Dock.LauncherManager : Gtk.Fixed {
public class Dock.ItemManager : Gtk.Fixed {
private static Settings settings;

private static GLib.Once<LauncherManager> instance;
public static unowned LauncherManager get_default () {
return instance.once (() => { return new LauncherManager (); });
private static GLib.Once<ItemManager> instance;
public static unowned ItemManager get_default () {
return instance.once (() => { return new ItemManager (); });
}

public Launcher? added_launcher { get; set; default = null; }
Expand Down
8 changes: 4 additions & 4 deletions src/Launcher.vala
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,7 @@ public class Dock.Launcher : Gtk.Box {
orientation = VERTICAL;
tooltip_text = app.app_info.get_display_name ();

var launcher_manager = LauncherManager.get_default ();
var launcher_manager = ItemManager.get_default ();

insert_action_group (ACTION_GROUP_PREFIX, app.action_group);

Expand Down Expand Up @@ -271,15 +271,15 @@ public class Dock.Launcher : Gtk.Box {
add_controller (drop_target_file);

drop_target_file.enter.connect ((x, y) => {
var _launcher_manager = LauncherManager.get_default ();
var _launcher_manager = ItemManager.get_default ();
if (_launcher_manager.added_launcher != null) {
calculate_dnd_move (_launcher_manager.added_launcher, x, y);
}
return COPY;
});

drop_target_file.drop.connect (() => {
var _launcher_manager = LauncherManager.get_default ();
var _launcher_manager = ItemManager.get_default ();
if (_launcher_manager.added_launcher != null) {
_launcher_manager.added_launcher.moving = false;
_launcher_manager.added_launcher = null;
Expand Down Expand Up @@ -476,7 +476,7 @@ public class Dock.Launcher : Gtk.Box {
* @param y pointer y position
*/
private void calculate_dnd_move (Launcher source, double x, double y) {
var launcher_manager = LauncherManager.get_default ();
var launcher_manager = ItemManager.get_default ();

int target_index = launcher_manager.get_index_for_launcher (this);
int source_index = launcher_manager.get_index_for_launcher (source);
Expand Down
2 changes: 1 addition & 1 deletion src/MainWindow.vala
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ public class Dock.MainWindow : Gtk.ApplicationWindow {
}

construct {
var launcher_manager = LauncherManager.get_default ();
var launcher_manager = ItemManager.get_default ();

overflow = VISIBLE;
resizable = false;
Expand Down
2 changes: 1 addition & 1 deletion src/meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ sources = [
'Application.vala',
'AppWindow.vala',
'DesktopIntegration.vala',
'ItemManager.vala',
'Launcher.vala',
'LauncherManager.vala',
'MainWindow.vala',
'PoofPopover.vala',
'DBus' / 'ItemInterface.vala',
Expand Down