Adding both reveal and conceal icons to resources

to avoid using any theme. These icons don't exist
in standard GTK.

4 files changed, 30 insertions, 21 deletions

diff --git a/data/icons/CMakeLists.txt b/data/icons/CMakeLists.txt
index 6b9079dcf..8b43f00c8 100644
--- a/data/icons/CMakeLists.txt
+++ b/data/icons/CMakeLists.txt
@@ -56,6 +56,8 @@ set(APPICONSCALE_ACTIONS_DATA
     scalable/actions/org.remmina.Remmina-scale-symbolic.svg
     scalable/actions/org.remmina.Remmina-switch-page-symbolic.svg
     scalable/actions/org.remmina.Remmina-system-run-symbolic.svg
+    scalable/actions/org.remmina.Remmina-view-reveal-symbolic.svg
+    scalable/actions/org.remmina.Remmina-view-conceal-symbolic.svg
     )
 
 set(APPICONSCALE_EMBLEMS_DATA
diff --git a/data/icons/scalable/actions/org.remmina.Remmina-view-conceal-symbolic.svg b/data/icons/scalable/actions/org.remmina.Remmina-view-conceal-symbolic.svg
new file mode 100644
index 000000000..172b73ed3
--- /dev/null
+++ b/data/icons/scalable/actions/org.remmina.Remmina-view-conceal-symbolic.svg
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg height="16px" viewBox="0 0 16 16" width="16px" xmlns="http://www.w3.org/2000/svg">
+    <path d="m 1.53125 0.46875 l -1.0625 1.0625 l 14 14 l 1.0625 -1.0625 l -2.382812 -2.382812 c 1.265624 -1.0625 2.171874 -2.496094 2.589843 -4.097657 c -0.914062 -3.523437 -4.097656 -5.984375 -7.738281 -5.988281 c -1.367188 0.011719 -2.707031 0.371094 -3.894531 1.042969 z m 6.46875 3.53125 c 2.210938 0 4 1.789062 4 4 c -0.003906 0.800781 -0.246094 1.578125 -0.699219 2.238281 l -1.46875 -1.46875 c 0.105469 -0.242187 0.164063 -0.503906 0.167969 -0.769531 c 0 -1.105469 -0.894531 -2 -2 -2 c -0.265625 0.003906 -0.527344 0.0625 -0.769531 0.167969 l -1.46875 -1.46875 c 0.660156 -0.453125 1.4375 -0.695313 2.238281 -0.699219 z m -6.144531 0.917969 c -0.753907 0.898437 -1.296875 1.957031 -1.59375 3.09375 c 0.914062 3.523437 4.097656 5.984375 7.738281 5.988281 c 0.855469 -0.007812 1.703125 -0.152344 2.511719 -0.425781 l -1.667969 -1.667969 c -0.277344 0.058594 -0.5625 0.089844 -0.84375 0.09375 c -2.210938 0 -4 -1.789062 -4 -4 c 0.003906 -0.28125 0.035156 -0.566406 0.09375 -0.84375 z m 0 0" fill="#2e3436"/>
+</svg>
diff --git a/data/icons/scalable/actions/org.remmina.Remmina-view-reveal-symbolic.svg b/data/icons/scalable/actions/org.remmina.Remmina-view-reveal-symbolic.svg
new file mode 100644
index 000000000..41ae3733a
--- /dev/null
+++ b/data/icons/scalable/actions/org.remmina.Remmina-view-reveal-symbolic.svg
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg height="16px" viewBox="0 0 16 16" width="16px" xmlns="http://www.w3.org/2000/svg">
+    <path d="m 8 2 c -3.648438 0.003906 -6.832031 2.476562 -7.738281 6.007812 c 0.914062 3.527344 4.097656 5.988282 7.738281 5.992188 c 3.648438 -0.003906 6.832031 -2.476562 7.738281 -6.011719 c -0.914062 -3.523437 -4.097656 -5.984375 -7.738281 -5.988281 z m 0 2 c 2.210938 0 4 1.789062 4 4 s -1.789062 4 -4 4 s -4 -1.789062 -4 -4 s 1.789062 -4 4 -4 z m 0 2 c -1.105469 0 -2 0.894531 -2 2 s 0.894531 2 2 2 s 2 -0.894531 2 -2 s -0.894531 -2 -2 -2 z m 0 0" fill="#2e3436"/>
+</svg>
diff --git a/src/remmina_file_editor.c b/src/remmina_file_editor.c
index 29344e955..fe8c3bb34 100644
--- a/src/remmina_file_editor.c
+++ b/src/remmina_file_editor.c
@@ -55,7 +55,6 @@
 #include "remmina_unlock.h"
 #include "remmina_widget_pool.h"
 
-
 G_DEFINE_TYPE(RemminaFileEditor, remmina_file_editor, GTK_TYPE_DIALOG)
 
 static const gchar *server_tips = N_("<big>"
@@ -490,27 +489,28 @@ static void remmina_file_editor_create_server(RemminaFileEditor *gfe, const Remm
 		gtk_grid_attach(GTK_GRID(grid), widget, 1, row, 1, 1);
 	}
 }
-static void remmina_file_toggle_password_view(GtkWidget *widget, gpointer data) { 
-	GtkWindow *mainwindow;  
-    gboolean visible = gtk_entry_get_visibility(GTK_ENTRY(widget));
+static void remmina_file_toggle_password_view(GtkWidget *widget, gpointer data)
+{
+	GtkWindow *mainwindow;
+	gboolean visible = gtk_entry_get_visibility(GTK_ENTRY(widget));
 	mainwindow = remmina_main_get_window();
-	if (remmina_pref_get_boolean("use_primary_password")
-			&& remmina_pref_get_boolean("lock_view_passwords")
-			&& remmina_unlock_new(mainwindow) == 0)
+	if (remmina_pref_get_boolean("use_primary_password") && remmina_pref_get_boolean("lock_view_passwords") && remmina_unlock_new(mainwindow) == 0)
 		return;
 
-   
-    if (visible) {
-        gtk_entry_set_visibility(GTK_ENTRY(widget), FALSE);
-        gtk_entry_set_icon_from_icon_name(GTK_ENTRY(widget), 
-                                          GTK_ENTRY_ICON_SECONDARY, 
-                                          "view-reveal-symbolic.symbolic");
-    } else {
-        gtk_entry_set_visibility(GTK_ENTRY(widget), TRUE);
-        gtk_entry_set_icon_from_icon_name(GTK_ENTRY(widget), 
-                                          GTK_ENTRY_ICON_SECONDARY, 
-                                          "view-conceal-symbolic.symbolic");
-    }
+	if (visible)
+	{
+		gtk_entry_set_visibility(GTK_ENTRY(widget), FALSE);
+		gtk_entry_set_icon_from_icon_name(GTK_ENTRY(widget),
+										  GTK_ENTRY_ICON_SECONDARY,
+										  "org.remmina.Remmina-view-reveal-symbolic");
+	}
+	else
+	{
+		gtk_entry_set_visibility(GTK_ENTRY(widget), TRUE);
+		gtk_entry_set_icon_from_icon_name(GTK_ENTRY(widget),
+										  GTK_ENTRY_ICON_SECONDARY,
+										  "org.remmina.Remmina-view-conceal-symbolic");
+	}
 }
 static GtkWidget *remmina_file_editor_create_password(RemminaFileEditor *gfe, GtkWidget *grid,
 													  gint row, gint col, const gchar *label, const gchar *value,
@@ -547,7 +547,7 @@ static GtkWidget *remmina_file_editor_create_password(RemminaFileEditor *gfe, Gt
 	{
 		gtk_entry_set_icon_from_icon_name(GTK_ENTRY(widget),
 										  GTK_ENTRY_ICON_SECONDARY,
-										  "view-reveal-symbolic.symbolic");
+										  "org.remmina.Remmina-view-reveal-symbolic");
 		gtk_entry_set_icon_activatable(GTK_ENTRY(widget), GTK_ENTRY_ICON_SECONDARY, TRUE);
 		g_signal_connect(widget, "icon-press", G_CALLBACK(remmina_file_toggle_password_view), NULL);
 	}
@@ -968,7 +968,6 @@ gdouble remmina_file_get_double(RemminaFile *remminafile,
 								const gchar *setting,
 								gfloat default_value);
 
-
 static void remmina_file_editor_create_settings(RemminaFileEditor *gfe, GtkWidget *grid,
 												const RemminaProtocolSetting *settings)
 {