Updated icon name for acctions

4 files changed, 128 insertions, 20 deletions

diff --git a/data/icons/CMakeLists.txt b/data/icons/CMakeLists.txt
index dd791297c..cc59b9846 100644
--- a/data/icons/CMakeLists.txt
+++ b/data/icons/CMakeLists.txt
@@ -33,18 +33,35 @@
 
 
 set(APPICON16_ACTIONS_DIR "${REMMINA_DATADIR}/icons/hicolor/16x16/actions")
-set(APPICON16_EMBLEMS_DIR "${REMMINA_DATADIR}/icons/hicolor/16x16/emblems")
 set(APPICON22_ACTIONS_DIR "${REMMINA_DATADIR}/icons/hicolor/22x22/actions")
+set(APPICON24_ACTIONS_DIR "${REMMINA_DATADIR}/icons/hicolor/24x24/actions")
+set(APPICON32_ACTIONS_DIR "${REMMINA_DATADIR}/icons/hicolor/32x32/actions")
+set(APPICON48_ACTIONS_DIR "${REMMINA_DATADIR}/icons/hicolor/48x48/actions")
+set(APPICON16_EMBLEMS_DIR "${REMMINA_DATADIR}/icons/hicolor/16x16/emblems")
 set(APPICON22_EMBLEMS_DIR "${REMMINA_DATADIR}/icons/hicolor/22x22/emblems")
+set(APPICON24_EMBLEMS_DIR "${REMMINA_DATADIR}/icons/hicolor/24x24/emblems")
+set(APPICON32_EMBLEMS_DIR "${REMMINA_DATADIR}/icons/hicolor/32x32/emblems")
+set(APPICON48_EMBLEMS_DIR "${REMMINA_DATADIR}/icons/hicolor/48x48/emblems")
 
 set(APPICON16_ACTIONS_DATA
+    16x16/actions/remmina-camera-photo.png
+    16x16/actions/remmina-connect.png
+    16x16/actions/remmina-disconnect.png
+    16x16/actions/remmina-document-save.png
+    16x16/actions/remmina-document-send.png
     16x16/actions/remmina-dynres.png
     16x16/actions/remmina-fit-window.png
-    16x16/actions/remmina-switch-page.png
-    16x16/actions/remmina-pin-down.png
     16x16/actions/remmina-fullscreen.png
-    16x16/actions/remmina-scale.png
+    16x16/actions/remmina-go-bottom.png
+    16x16/actions/remmina-keyboard.png
+    16x16/actions/remmina-pan-down-symbolic.png
+    16x16/actions/remmina-pan-up-symbolic.png
+    16x16/actions/remmina-pin-down.png
     16x16/actions/remmina-pin-up.png
+    16x16/actions/remmina-preferences-system.png
+    16x16/actions/remmina-scale.png
+    16x16/actions/remmina-switch-page.png
+    16x16/actions/remmina-system-run.png
     )
 
 set(APPICON16_EMBLEMS_DATA
@@ -52,19 +69,110 @@ set(APPICON16_EMBLEMS_DATA
     )
 
 set(APPICON22_ACTIONS_DATA
-    22x22/actions/remmina-fit-window.png
-    22x22/actions/remmina-scale.png
+    22x22/actions/remmina-camera-photo.png
+    22x22/actions/remmina-connect.png
+    22x22/actions/remmina-disconnect.png
+    22x22/actions/remmina-document-save.png
+    22x22/actions/remmina-document-send.png
     22x22/actions/remmina-dynres.png
+    22x22/actions/remmina-fit-window.png
     22x22/actions/remmina-fullscreen.png
+    22x22/actions/remmina-go-bottom.png
+    22x22/actions/remmina-keyboard.png
+    22x22/actions/remmina-pan-down-symbolic.png
+    22x22/actions/remmina-pan-up-symbolic.png
+    22x22/actions/remmina-pin-down.png
+    22x22/actions/remmina-pin-up.png
+    22x22/actions/remmina-preferences-system.png
+    22x22/actions/remmina-scale.png
     22x22/actions/remmina-switch-page.png
+    22x22/actions/remmina-system-run.png
+    )
+
+set(APPICON24_ACTIONS_DATA
+    24x24/actions/remmina-camera-photo.png
+    24x24/actions/remmina-connect.png
+    24x24/actions/remmina-disconnect.png
+    24x24/actions/remmina-document-save.png
+    24x24/actions/remmina-document-send.png
+    24x24/actions/remmina-dynres.png
+    24x24/actions/remmina-fit-window.png
+    24x24/actions/remmina-fullscreen.png
+    24x24/actions/remmina-go-bottom.png
+    24x24/actions/remmina-keyboard.png
+    24x24/actions/remmina-pan-down-symbolic.png
+    24x24/actions/remmina-pan-up-symbolic.png
+    24x24/actions/remmina-pin-down.png
+    24x24/actions/remmina-pin-up.png
+    24x24/actions/remmina-preferences-system.png
+    24x24/actions/remmina-scale.png
+    24x24/actions/remmina-switch-page.png
+    24x24/actions/remmina-system-run.png
+    )
+
+set(APPICON32_ACTIONS_DATA
+    32x32/actions/remmina-camera-photo.png
+    32x32/actions/remmina-connect.png
+    32x32/actions/remmina-disconnect.png
+    32x32/actions/remmina-document-save.png
+    32x32/actions/remmina-document-send.png
+    32x32/actions/remmina-dynres.png
+    32x32/actions/remmina-fit-window.png
+    32x32/actions/remmina-fullscreen.png
+    32x32/actions/remmina-go-bottom.png
+    32x32/actions/remmina-keyboard.png
+    32x32/actions/remmina-pan-down-symbolic.png
+    32x32/actions/remmina-pan-up-symbolic.png
+    32x32/actions/remmina-pin-down.png
+    32x32/actions/remmina-pin-up.png
+    32x32/actions/remmina-preferences-system.png
+    32x32/actions/remmina-scale.png
+    32x32/actions/remmina-switch-page.png
+    32x32/actions/remmina-system-run.png
+    )
+
+set(APPICON48_ACTIONS_DATA
+    48x48/actions/remmina-camera-photo.png
+    48x48/actions/remmina-connect.png
+    48x48/actions/remmina-disconnect.png
+    48x48/actions/remmina-document-save.png
+    48x48/actions/remmina-document-send.png
+    48x48/actions/remmina-dynres.png
+    48x48/actions/remmina-fit-window.png
+    48x48/actions/remmina-fullscreen.png
+    48x48/actions/remmina-go-bottom.png
+    48x48/actions/remmina-keyboard.png
+    48x48/actions/remmina-pan-down-symbolic.png
+    48x48/actions/remmina-pan-up-symbolic.png
+    48x48/actions/remmina-pin-down.png
+    48x48/actions/remmina-pin-up.png
+    48x48/actions/remmina-preferences-system.png
+    48x48/actions/remmina-scale.png
+    48x48/actions/remmina-switch-page.png
+    48x48/actions/remmina-system-run.png
     )
 
 set(APPICON22_EMBLEMS_DATA
     22x22/emblems/remmina-sftp.png
     )
+set(APPICON24_EMBLEMS_DATA
+    24x24/emblems/remmina-sftp.png
+    )
+set(APPICON32_EMBLEMS_DATA
+    32x32/emblems/remmina-sftp.png
+    )
+set(APPICON48_EMBLEMS_DATA
+    48x48/emblems/remmina-sftp.png
+    )
 
 install(FILES ${APPICON16_ACTIONS_DATA} DESTINATION ${APPICON16_ACTIONS_DIR})
-install(FILES ${APPICON16_EMBLEMS_DATA} DESTINATION ${APPICON16_EMBLEMS_DIR})
 install(FILES ${APPICON22_ACTIONS_DATA} DESTINATION ${APPICON22_ACTIONS_DIR})
+install(FILES ${APPICON24_ACTIONS_DATA} DESTINATION ${APPICON24_ACTIONS_DIR})
+install(FILES ${APPICON32_ACTIONS_DATA} DESTINATION ${APPICON32_ACTIONS_DIR})
+install(FILES ${APPICON48_ACTIONS_DATA} DESTINATION ${APPICON48_ACTIONS_DIR})
+install(FILES ${APPICON16_EMBLEMS_DATA} DESTINATION ${APPICON16_EMBLEMS_DIR})
 install(FILES ${APPICON22_EMBLEMS_DATA} DESTINATION ${APPICON22_EMBLEMS_DIR})
+install(FILES ${APPICON24_EMBLEMS_DATA} DESTINATION ${APPICON24_EMBLEMS_DIR})
+install(FILES ${APPICON32_EMBLEMS_DATA} DESTINATION ${APPICON32_EMBLEMS_DIR})
+install(FILES ${APPICON48_EMBLEMS_DATA} DESTINATION ${APPICON48_EMBLEMS_DIR})
 
diff --git a/src/remmina_chat_window.c b/src/remmina_chat_window.c
index 212929603..dd869f1ff 100644
--- a/src/remmina_chat_window.c
+++ b/src/remmina_chat_window.c
@@ -224,7 +224,7 @@ remmina_chat_window_new(GtkWindow* parent, const gchar* chat_with)
 	window->send_text = widget;
 
 	/* Send button */
-	image = gtk_image_new_from_icon_name("document-send", GTK_ICON_SIZE_BUTTON);
+	image = gtk_image_new_from_icon_name("remmina-document-send", GTK_ICON_SIZE_BUTTON);
 	gtk_widget_show(image);
 
 	widget = gtk_button_new_with_mnemonic(_("_Send"));
diff --git a/src/remmina_connection_window.c b/src/remmina_connection_window.c
index 1bb2a8583..6e2de3c04 100644
--- a/src/remmina_connection_window.c
+++ b/src/remmina_connection_window.c
@@ -1917,7 +1917,7 @@ remmina_connection_holder_create_toolbar(RemminaConnectionHolder* cnnhld, gint m
 	gtk_container_add(GTK_CONTAINER(toolitem), widget);
 
 #if GTK_CHECK_VERSION(3, 14, 0)
-	arrow = gtk_image_new_from_icon_name("pan-down-symbolic", GTK_ICON_SIZE_BUTTON);
+	arrow = gtk_image_new_from_icon_name("remmina-pan-down-symbolic", GTK_ICON_SIZE_BUTTON);
 #else
 	arrow = gtk_arrow_new(GTK_ARROW_DOWN, GTK_SHADOW_NONE);
 #endif
@@ -1980,7 +1980,7 @@ remmina_connection_holder_create_toolbar(RemminaConnectionHolder* cnnhld, gint m
 	}
 	gtk_container_add(GTK_CONTAINER(toolitem), widget);
 #if GTK_CHECK_VERSION(3, 14, 0)
-	arrow = gtk_image_new_from_icon_name("pan-down-symbolic", GTK_ICON_SIZE_BUTTON);
+	arrow = gtk_image_new_from_icon_name("remmina-pan-down-symbolic", GTK_ICON_SIZE_BUTTON);
 #else
 	arrow = gtk_arrow_new(GTK_ARROW_DOWN, GTK_SHADOW_NONE);
 #endif
@@ -1991,7 +1991,7 @@ remmina_connection_holder_create_toolbar(RemminaConnectionHolder* cnnhld, gint m
 
 	/* Grab keyboard button */
 	toolitem = gtk_toggle_tool_button_new();
-	gtk_tool_button_set_icon_name(GTK_TOOL_BUTTON(toolitem), "input-keyboard");
+	gtk_tool_button_set_icon_name(GTK_TOOL_BUTTON(toolitem), "remmina-keyboard");
 	remmina_connection_holder_set_tooltip(GTK_WIDGET(toolitem), _("Grab all keyboard events"),
 		remmina_pref.shortcutkey_grab, 0);
 	gtk_toolbar_insert(GTK_TOOLBAR(toolbar), toolitem, -1);
@@ -2000,7 +2000,7 @@ remmina_connection_holder_create_toolbar(RemminaConnectionHolder* cnnhld, gint m
 	priv->toolitem_grab = toolitem;
 
 	toolitem = gtk_toggle_tool_button_new();
-	gtk_tool_button_set_icon_name(GTK_TOOL_BUTTON(toolitem), "preferences-system");
+	gtk_tool_button_set_icon_name(GTK_TOOL_BUTTON(toolitem), "remmina-preferences-system");
 	gtk_tool_item_set_tooltip_text(toolitem, _("Preferences"));
 	gtk_toolbar_insert(GTK_TOOLBAR(toolbar), toolitem, -1);
 	gtk_widget_show(GTK_WIDGET(toolitem));
@@ -2008,7 +2008,7 @@ remmina_connection_holder_create_toolbar(RemminaConnectionHolder* cnnhld, gint m
 	priv->toolitem_preferences = toolitem;
 
 	toolitem = gtk_toggle_tool_button_new();
-	gtk_tool_button_set_icon_name(GTK_TOOL_BUTTON(toolitem), "system-run");
+	gtk_tool_button_set_icon_name(GTK_TOOL_BUTTON(toolitem), "remmina-system-run");
 	gtk_tool_button_set_label(GTK_TOOL_BUTTON(toolitem), _("Tools"));
 	gtk_tool_item_set_tooltip_text(toolitem, _("Tools"));
 	gtk_toolbar_insert(GTK_TOOLBAR(toolbar), toolitem, -1);
@@ -2021,21 +2021,21 @@ remmina_connection_holder_create_toolbar(RemminaConnectionHolder* cnnhld, gint m
 	gtk_widget_show(GTK_WIDGET(toolitem));
 
 	toolitem = gtk_tool_button_new(NULL, "_Screenshot");
-	gtk_tool_button_set_icon_name(GTK_TOOL_BUTTON(toolitem), "camera-photo");
+	gtk_tool_button_set_icon_name(GTK_TOOL_BUTTON(toolitem), "remmina-camera-photo");
 	remmina_connection_holder_set_tooltip(GTK_WIDGET(toolitem), _("Screenshot"), remmina_pref.shortcutkey_screenshot, 0);
 	gtk_toolbar_insert(GTK_TOOLBAR(toolbar), toolitem, -1);
 	gtk_widget_show(GTK_WIDGET(toolitem));
 	g_signal_connect(G_OBJECT(toolitem), "clicked", G_CALLBACK(remmina_connection_holder_toolbar_screenshot), cnnhld);
 
 	toolitem = gtk_tool_button_new(NULL, "_Bottom");
-	gtk_tool_button_set_icon_name(GTK_TOOL_BUTTON(toolitem), "go-bottom");
+	gtk_tool_button_set_icon_name(GTK_TOOL_BUTTON(toolitem), "remmina-go-bottom");
 	remmina_connection_holder_set_tooltip(GTK_WIDGET(toolitem), _("Minimize window"), remmina_pref.shortcutkey_minimize, 0);
 	gtk_toolbar_insert(GTK_TOOLBAR(toolbar), toolitem, -1);
 	gtk_widget_show(GTK_WIDGET(toolitem));
 	g_signal_connect(G_OBJECT(toolitem), "clicked", G_CALLBACK(remmina_connection_holder_toolbar_minimize), cnnhld);
 
 	toolitem = gtk_tool_button_new(NULL, "_Disconnect");
-	gtk_tool_button_set_icon_name(GTK_TOOL_BUTTON(toolitem), "gtk-disconnect");
+	gtk_tool_button_set_icon_name(GTK_TOOL_BUTTON(toolitem), "remmina-disconnect");
 	remmina_connection_holder_set_tooltip(GTK_WIDGET(toolitem), _("Disconnect"), remmina_pref.shortcutkey_disconnect, 0);
 	gtk_toolbar_insert(GTK_TOOLBAR(toolbar), toolitem, -1);
 	gtk_widget_show(GTK_WIDGET(toolitem));
diff --git a/src/remmina_ftp_client.c b/src/remmina_ftp_client.c
index 630bc06eb..e50efc175 100644
--- a/src/remmina_ftp_client.c
+++ b/src/remmina_ftp_client.c
@@ -657,14 +657,14 @@ static void remmina_ftp_client_popup_menu(RemminaFTPClient *client, GdkEventButt
 
 	menuitem = gtk_menu_item_new_with_label(_("Download"));
 	gtk_widget_show(menuitem);
-	image = gtk_image_new_from_icon_name("document-save", GTK_ICON_SIZE_MENU);
+	image = gtk_image_new_from_icon_name("remmina-document-save", GTK_ICON_SIZE_MENU);
 	gtk_widget_show(image);
 	gtk_menu_shell_append(GTK_MENU_SHELL(menu), menuitem);
 	g_signal_connect(G_OBJECT(menuitem), "activate", G_CALLBACK(remmina_ftp_client_action_download), client);
 
 	menuitem = gtk_menu_item_new_with_label(_("Upload"));
 	gtk_widget_show(menuitem);
-	image = gtk_image_new_from_icon_name("document-send", GTK_ICON_SIZE_MENU);
+	image = gtk_image_new_from_icon_name("remmina-document-send", GTK_ICON_SIZE_MENU);
 	gtk_widget_show(image);
 	gtk_menu_shell_append(GTK_MENU_SHELL(menu), menuitem);
 	g_signal_connect(G_OBJECT(menuitem), "activate", G_CALLBACK(remmina_ftp_client_action_upload), client);
@@ -781,7 +781,7 @@ static GtkWidget* remmina_ftp_client_create_toolbar(RemminaFTPClient *client)
 	gtk_widget_show(button);
 	gtk_widget_set_tooltip_text(button, _("Download from server"));
 	gtk_button_set_relief(GTK_BUTTON(button), GTK_RELIEF_NONE);
-	image = gtk_image_new_from_icon_name("document-save", GTK_ICON_SIZE_BUTTON);
+	image = gtk_image_new_from_icon_name("remmina-document-save", GTK_ICON_SIZE_BUTTON);
 	gtk_button_set_image(GTK_BUTTON(button), image);
 	gtk_box_pack_start(GTK_BOX(box), button, FALSE, FALSE, 0);
 	g_signal_connect(G_OBJECT(button), "clicked", G_CALLBACK(remmina_ftp_client_action_download), client);
@@ -792,7 +792,7 @@ static GtkWidget* remmina_ftp_client_create_toolbar(RemminaFTPClient *client)
 	gtk_widget_show(button);
 	gtk_widget_set_tooltip_text(button, _("Upload to server"));
 	gtk_button_set_relief(GTK_BUTTON(button), GTK_RELIEF_NONE);
-	image = gtk_image_new_from_icon_name("document-send", GTK_ICON_SIZE_BUTTON);
+	image = gtk_image_new_from_icon_name("remmina-document-send", GTK_ICON_SIZE_BUTTON);
 	gtk_button_set_image(GTK_BUTTON(button), image);
 	gtk_box_pack_start(GTK_BOX(box), button, FALSE, FALSE, 0);
 	g_signal_connect(G_OBJECT(button), "clicked", G_CALLBACK(remmina_ftp_client_action_upload), client);