diff --git a/configure.ac.in b/configure.ac.in index dd9672d..dcbb6ce 100644 --- a/configure.ac.in +++ b/configure.ac.in @@ -152,6 +152,8 @@ data/Makefile data/icons/Makefile data/icons/16x16/Makefile data/icons/24x24/Makefile +data/icons/48x48/Makefile +data/icons/128x128/Makefile data/icons/scalable/Makefile po/Makefile.in ]) diff --git a/data/icons/128x128/Makefile.am b/data/icons/128x128/Makefile.am new file mode 100644 index 0000000..6d993ba --- /dev/null +++ b/data/icons/128x128/Makefile.am @@ -0,0 +1,3 @@ +iconsdir = $(datadir)/icons/hicolor/128x128/apps +icons_DATA = org.xfce.taskmanager.png +EXTRA_DIST = $(icons_DATA) diff --git a/data/icons/128x128/org.xfce.taskmanager.png b/data/icons/128x128/org.xfce.taskmanager.png new file mode 100644 index 0000000..a580d6d Binary files /dev/null and b/data/icons/128x128/org.xfce.taskmanager.png differ diff --git a/data/icons/16x16/Makefile.am b/data/icons/16x16/Makefile.am index 24c236e..1a414b2 100644 --- a/data/icons/16x16/Makefile.am +++ b/data/icons/16x16/Makefile.am @@ -1,3 +1,7 @@ iconsdir = $(datadir)/icons/hicolor/16x16/actions icons_DATA = xc_crosshair.png -EXTRA_DIST = $(icons_DATA) + +appicondir = $(datadir)/icons/hicolor/16x16/apps +appicon_DATA = org.xfce.taskmanager.png + +EXTRA_DIST = $(icons_DATA) $(appicon_DATA) diff --git a/data/icons/16x16/org.xfce.taskmanager.png b/data/icons/16x16/org.xfce.taskmanager.png new file mode 100644 index 0000000..c15ac92 Binary files /dev/null and b/data/icons/16x16/org.xfce.taskmanager.png differ diff --git a/data/icons/16x16/org.xfce.taskmanager.svg b/data/icons/16x16/org.xfce.taskmanager.svg new file mode 100644 index 0000000..0f1c6fc --- /dev/null +++ b/data/icons/16x16/org.xfce.taskmanager.svg @@ -0,0 +1,1129 @@ + + + + + + Adwaita Icon Template + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + GNOME Design Team + + + + + Adwaita Icon Template + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/data/icons/48x48/Makefile.am b/data/icons/48x48/Makefile.am new file mode 100644 index 0000000..a8c0c4b --- /dev/null +++ b/data/icons/48x48/Makefile.am @@ -0,0 +1,3 @@ +iconsdir = $(datadir)/icons/hicolor/48x48/apps +icons_DATA = org.xfce.taskmanager.png +EXTRA_DIST = $(icons_DATA) diff --git a/data/icons/48x48/org.xfce.taskmanager.png b/data/icons/48x48/org.xfce.taskmanager.png new file mode 100644 index 0000000..a972d2e Binary files /dev/null and b/data/icons/48x48/org.xfce.taskmanager.png differ diff --git a/data/icons/48x48/org.xfce.taskmanager.svg b/data/icons/48x48/org.xfce.taskmanager.svg new file mode 100644 index 0000000..db645ff --- /dev/null +++ b/data/icons/48x48/org.xfce.taskmanager.svg @@ -0,0 +1,363 @@ + + + + + + + Adwaita Icon Template + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + GNOME Design Team + + + + + Adwaita Icon Template + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/data/icons/Makefile.am b/data/icons/Makefile.am index 967aebb..538e36d 100644 --- a/data/icons/Makefile.am +++ b/data/icons/Makefile.am @@ -1,4 +1,4 @@ -SUBDIRS = 16x16 24x24 scalable +SUBDIRS = 16x16 24x24 48x48 128x128 scalable gtk_update_icon_cache = gtk-update-icon-cache -f -t $(datadir)/icons/hicolor diff --git a/data/icons/scalable/Makefile.am b/data/icons/scalable/Makefile.am index 1985234..5ab0f10 100644 --- a/data/icons/scalable/Makefile.am +++ b/data/icons/scalable/Makefile.am @@ -1,3 +1,7 @@ iconsdir = $(datadir)/icons/hicolor/scalable/actions icons_DATA = xc_crosshair.svg -EXTRA_DIST = $(icons_DATA) + +appicondir = $(datadir)/icons/hicolor/scalable/apps +appicon_DATA = org.xfce.taskmanager.svg + +EXTRA_DIST = $(icons_DATA) $(appicon_DATA) diff --git a/data/icons/scalable/org.xfce.taskmanager.svg b/data/icons/scalable/org.xfce.taskmanager.svg new file mode 100644 index 0000000..68466bd --- /dev/null +++ b/data/icons/scalable/org.xfce.taskmanager.svg @@ -0,0 +1,363 @@ + + + + + + + Adwaita Icon Template + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + GNOME Design Team + + + + + Adwaita Icon Template + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/exec-tool-button.c b/src/exec-tool-button.c index 4e02ff1..0eda205 100644 --- a/src/exec-tool-button.c +++ b/src/exec-tool-button.c @@ -177,7 +177,7 @@ construct_menu (void) /* Run task manager as root */ if (geteuid () != 0) { - GtkWidget *image = gtk_image_new_from_icon_name ("utilities-system-monitor", GTK_ICON_SIZE_MENU); + GtkWidget *image = gtk_image_new_from_icon_name ("org.xfce.taskmanager", GTK_ICON_SIZE_MENU); GtkWidget *mi = gtk_image_menu_item_new_with_label (_("Run Task Manager as root")); gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (mi), image); gtk_menu_shell_append (GTK_MENU_SHELL (menu), mi); @@ -215,4 +215,3 @@ xtm_exec_tool_button_new (void) { return g_object_new (XTM_TYPE_EXEC_TOOL_BUTTON, NULL); } - diff --git a/src/main.c b/src/main.c index 47124b7..f57abe7 100644 --- a/src/main.c +++ b/src/main.c @@ -228,7 +228,7 @@ int main (int argc, char *argv[]) settings = xtm_settings_get_default (); - status_icon = gtk_status_icon_new_from_icon_name ("utilities-system-monitor"); + status_icon = gtk_status_icon_new_from_icon_name ("org.xfce.taskmanager"); show_hide_status_icon (); g_signal_connect (status_icon, "activate", G_CALLBACK (status_icon_activated), NULL); g_signal_connect (status_icon, "popup-menu", G_CALLBACK (status_icon_popup_menu), NULL); @@ -264,4 +264,3 @@ int main (int argc, char *argv[]) return 0; } - diff --git a/src/process-window-gtk3.ui b/src/process-window-gtk3.ui index ca99cf5..42d0e77 100644 --- a/src/process-window-gtk3.ui +++ b/src/process-window-gtk3.ui @@ -7,7 +7,7 @@ Task Manager 490 465 - utilities-system-monitor + org.xfce.taskmanager diff --git a/src/process-window.c b/src/process-window.c index 0f05139..504fcbe 100644 --- a/src/process-window.c +++ b/src/process-window.c @@ -522,7 +522,7 @@ show_about_dialog (XtmProcessWindow *window) "program-name", _("Task Manager"), "version", PACKAGE_VERSION, "copyright", "Copyright \302\251 2005-2019 The Xfce development team", - "logo-icon-name", "utilities-system-monitor", + "logo-icon-name", "org.xfce.taskmanager", #if !GTK_CHECK_VERSION(3, 0, 0) "icon-name", GTK_STOCK_ABOUT, #endif diff --git a/src/process-window.h b/src/process-window.h index b49f592..952f1b5 100644 --- a/src/process-window.h +++ b/src/process-window.h @@ -29,7 +29,7 @@ gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog), message , ## __VA_ARGS__ ); \ gtk_window_set_title (GTK_WINDOW (dialog), _("Task Manager")); \ gtk_window_set_position (GTK_WINDOW (dialog), GTK_WIN_POS_MOUSE); \ - gtk_window_set_icon_name (GTK_WINDOW (dialog), "utilities-system-monitor"); \ + gtk_window_set_icon_name (GTK_WINDOW (dialog), "org.xfce.taskmanager"); \ gtk_dialog_run (GTK_DIALOG (dialog)); \ gtk_widget_destroy (dialog); \ } diff --git a/src/process-window.ui b/src/process-window.ui index beb00c1..4441260 100644 --- a/src/process-window.ui +++ b/src/process-window.ui @@ -7,7 +7,7 @@ Task Manager 490 465 - utilities-system-monitor + org.xfce.taskmanager True diff --git a/xfce4-taskmanager.desktop.in b/xfce4-taskmanager.desktop.in index fcf2a97..dc787c4 100644 --- a/xfce4-taskmanager.desktop.in +++ b/xfce4-taskmanager.desktop.in @@ -3,7 +3,7 @@ _Name=Task Manager _Comment=Easy to use task manager _GenericName=Task Manager Exec=xfce4-taskmanager -Icon=utilities-system-monitor +Icon=org.xfce.taskmanager Terminal=false StartupNotify=true Type=Application