From 21cac5760b35dc51f201f6bebd5083a6073128c7 Mon Sep 17 00:00:00 2001 From: Simon Steinbeiss Date: Mon, 25 May 2020 21:04:53 +0200 Subject: [PATCH] Add application icon (Issue #23) --- configure.ac.in | 2 + data/icons/128x128/Makefile.am | 3 + data/icons/128x128/org.xfce.taskmanager.png | Bin 0 -> 3271 bytes data/icons/16x16/Makefile.am | 6 +- data/icons/16x16/org.xfce.taskmanager.png | Bin 0 -> 694 bytes data/icons/16x16/org.xfce.taskmanager.svg | 1129 ++++++++++++++++++ data/icons/48x48/Makefile.am | 3 + data/icons/48x48/org.xfce.taskmanager.png | Bin 0 -> 1504 bytes data/icons/48x48/org.xfce.taskmanager.svg | 363 ++++++ data/icons/Makefile.am | 2 +- data/icons/scalable/Makefile.am | 6 +- data/icons/scalable/org.xfce.taskmanager.svg | 363 ++++++ src/exec-tool-button.c | 3 +- src/main.c | 3 +- src/process-window-gtk3.ui | 2 +- src/process-window.c | 2 +- src/process-window.h | 2 +- src/process-window.ui | 2 +- xfce4-taskmanager.desktop.in | 2 +- 19 files changed, 1881 insertions(+), 12 deletions(-) create mode 100644 data/icons/128x128/Makefile.am create mode 100644 data/icons/128x128/org.xfce.taskmanager.png create mode 100644 data/icons/16x16/org.xfce.taskmanager.png create mode 100644 data/icons/16x16/org.xfce.taskmanager.svg create mode 100644 data/icons/48x48/Makefile.am create mode 100644 data/icons/48x48/org.xfce.taskmanager.png create mode 100644 data/icons/48x48/org.xfce.taskmanager.svg create mode 100644 data/icons/scalable/org.xfce.taskmanager.svg 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 0000000000000000000000000000000000000000..a580d6dd468238639e0abc41caba71b31f547e19 GIT binary patch literal 3271 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 literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..a972d2e58b93cb83ff1f3e559d8353c53131c0f5 GIT binary patch literal 1504 zcmeAS@N?(olHy`uVBq!ia0y~yU@!n-4mJh`hH$2z?FK!(+$o@ zEJ}6E$;?hw$S5f(u+rC0E=o--$t+7v&d<%w&npHwNkRtcE2r4JNGg1=2G6< zOXtoF3a~qAbLQsHzjgQDTNdkW{xD_vpZ$WL^Y>YPz3iuWH1O#vHr{7hou^tE+`VqT z-1X{l`S*P{t=8L~?VP;4Tw>XueY-X(33avzIz92(5|y!b<}ANU)&?fMo67fYPXBH> zgsX67y0waMm^xj_ZX4K@X1 ze$Ay)iyjIv%$NJ!G;yNm79;uY?23w}!^iuW1$tWoylm%R)P4V3WZHz6wE#N{etWoNc^)2{cfm5@dLEmDtM|o;N%1VY)0=p9h;ChA%CRBa zOjrBb%6kzWFLmbeuE^kAwS(pLwfo;$a^s5D#D16Qtd+0Q-OF&EZBADdL(}wI0>zqd zPTf*Hu2#OUH8`+&@59LTPd8VX2gLPyoK4{SlF-BZDC~-k?z&CWcIxUg7<~RD9d|nY zW7>f&0ZUV7Fxxg9lX&GUYTw*7&BnxJXEA?9ujQT7cdn_GSiJIdV)JL46QRn{c=b0w z!?Odq3~zS*+Ee)Mmc`1ozAU?Lan85xG}BFsiu7{;p`&Y^<7~08`tOHaoNFzfUgf?el)r!e zJ#7ZjzC~*p9$w4eyuba{Iit6Pk_U-c( zb7qEPA9Ck(Nrhzcl;_Sl(7U>B+4;`(Y-|2SzX)iV86L;3$Wij|W%{ok+7X66x^zj$kQ+4qD zmhMePu}^ntPcjql&s!7TF^4Vb^(ncneeFWsPp_GrZ`dY0nUjG}_J+SrT+@Ve$%RKx zd;fTHz@0%wh|?i``;RwTDy?sJT&UZ*u`*g&_pI-nAD=!?eQ}~`#;jS-l76Q?+W0AZ z=C(DAYv(pU40v&7W_(olq?1oxY1D8`ESNEC)vL&*R}T8zZu)QRH^*kLv(%>**Gw|j zu3-;eBj@B1?RD|tjdKUTe|!6@bn91}r}l^UPe^(6tjN`7B?AKkgQu&X%Q~loCIFid BugU-b literal 0 HcmV?d00001 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