Merge pull request #505 from FreeRDP/Issues/503

Show or hide the icons near the buttons and the menus
FreeRDP · Feb 27, 2015 · cfcd6fb · cfcd6fb
2 parents fe8c79a + e85f5bb
commit cfcd6fb
Show file tree

Hide file tree

Showing 8 changed files with 169 additions and 22 deletions.
diff --git a/remmina/po/en_AU.po b/remmina/po/en_AU.po
@@ -1557,3 +1557,21 @@ msgstr "Disable password storing"
 
 msgid "Appearance"
 msgstr "Appearance"
+
+msgid "Show buttons icons"
+msgstr "Show buttons icons"
+
+msgid "Show menu icons"
+msgstr "Show menu icons"
+
+msgid "Use system theme preferences"
+msgstr "Use system theme preferences"
+
+msgid "Show always"
+msgstr "Show always"
+
+msgid "Hide always"
+msgstr "Hide always"
+
+msgid "This setting will be active after the application restart"
+msgstr "This setting will be active after the application restart"
diff --git a/remmina/po/en_GB.po b/remmina/po/en_GB.po
@@ -1557,3 +1557,21 @@ msgstr "Disable password storing"
 
 msgid "Appearance"
 msgstr "Appearance"
+
+msgid "Show buttons icons"
+msgstr "Show buttons icons"
+
+msgid "Show menu icons"
+msgstr "Show menu icons"
+
+msgid "Use system theme preferences"
+msgstr "Use system theme preferences"
+
+msgid "Show always"
+msgstr "Show always"
+
+msgid "Hide always"
+msgstr "Hide always"
+
+msgid "This setting will be active after the application restart"
+msgstr "This setting will be active after the application restart"
diff --git a/remmina/po/it.po b/remmina/po/it.po
@@ -1570,3 +1570,21 @@ msgstr "Disabilitare la memorizzazione della password"
 
 msgid "Appearance"
 msgstr "Aspetto"
+
+msgid "Show buttons icons"
+msgstr "Mostra icone dei pulsanti"
+
+msgid "Show menu icons"
+msgstr "Mostra icone dei menu"
+
+msgid "Use system theme preferences"
+msgstr "Usa preferenze del tema di sistema"
+
+msgid "Show always"
+msgstr "Mostra sempre"
+
+msgid "Hide always"
+msgstr "Nascondi sempre"
+
+msgid "This setting will be active after the application restart"
+msgstr "Questa impostazione sarà attiva dopo il riavvio dell'applicazione"
diff --git a/remmina/src/remmina_pref.c b/remmina/src/remmina_pref.c
@@ -321,6 +321,28 @@ void remmina_pref_init(void)
 		remmina_pref.tab_mode = g_key_file_get_integer(gkeyfile, "remmina_pref", "tab_mode", NULL);
 	else
 		remmina_pref.tab_mode = 0;
+	/* Show buttons icons */
+	if (g_key_file_has_key(gkeyfile, "remmina_pref", "show_buttons_icons", NULL))
+	{
+		remmina_pref.show_buttons_icons = g_key_file_get_integer(gkeyfile, "remmina_pref", "show_buttons_icons", NULL);
+		if (remmina_pref.show_buttons_icons)
+		{
+			g_object_set(gtk_settings_get_default(), "gtk-button-images", remmina_pref.show_buttons_icons == 1, NULL);
+		}
+	}
+	else
+		remmina_pref.show_buttons_icons = 0;
+	/* Show menu icons */
+	if (g_key_file_has_key(gkeyfile, "remmina_pref", "show_menu_icons", NULL))
+	{
+		remmina_pref.show_menu_icons = g_key_file_get_integer(gkeyfile, "remmina_pref", "show_menu_icons", NULL);
+		if (remmina_pref.show_menu_icons)
+		{
+			g_object_set(gtk_settings_get_default(), "gtk-menu-images", remmina_pref.show_menu_icons == 1, NULL);
+		}
+	}
+	else
+		remmina_pref.show_menu_icons = 0;
 
 	if (g_key_file_has_key(gkeyfile, "remmina_pref", "auto_scroll_step", NULL))
 		remmina_pref.auto_scroll_step = g_key_file_get_integer(gkeyfile, "remmina_pref", "auto_scroll_step", NULL);
@@ -480,6 +502,8 @@ void remmina_pref_save(void)
 	g_key_file_set_integer(gkeyfile, "remmina_pref", "recent_maximum", remmina_pref.recent_maximum);
 	g_key_file_set_integer(gkeyfile, "remmina_pref", "default_mode", remmina_pref.default_mode);
 	g_key_file_set_integer(gkeyfile, "remmina_pref", "tab_mode", remmina_pref.tab_mode);
+	g_key_file_set_integer(gkeyfile, "remmina_pref", "show_buttons_icons", remmina_pref.show_buttons_icons);
+	g_key_file_set_integer(gkeyfile, "remmina_pref", "show_menu_icons", remmina_pref.show_menu_icons);
 	g_key_file_set_integer(gkeyfile, "remmina_pref", "auto_scroll_step", remmina_pref.auto_scroll_step);
 	g_key_file_set_integer(gkeyfile, "remmina_pref", "hostkey", remmina_pref.hostkey);
 	g_key_file_set_integer(gkeyfile, "remmina_pref", "shortcutkey_fullscreen", remmina_pref.shortcutkey_fullscreen);

diff --git a/remmina/src/remmina_pref.h b/remmina/src/remmina_pref.h
@@ -73,45 +73,56 @@ enum
 
 typedef struct _RemminaPref
 {
-	/* In RemminaPrefDialog */
+	/* In RemminaPrefDialog options tab */
 	gboolean save_view_mode;
 	gboolean save_when_connect;
-	gboolean invisible_toolbar;
-	gboolean always_show_tab;
-	gboolean hide_connection_toolbar;
 	gint default_action;
 	gint scale_quality;
-	gchar *resolutions;
 	gint sshtunnel_port;
+	gint auto_scroll_step;
 	gint recent_maximum;
+	gchar *resolutions;
+	/* In RemminaPrefDialog appearance tab */
+	gboolean invisible_toolbar;
+	gboolean always_show_tab;
+	gboolean hide_connection_toolbar;
 	gint default_mode;
 	gint tab_mode;
-	gint auto_scroll_step;
-
+	gint show_buttons_icons;
+	gint show_menu_icons;
+	/* In RemminaPrefDialog applet tab */
 	gboolean applet_new_ontop;
 	gboolean applet_hide_count;
-	gboolean applet_enable_avahi;
 	gboolean disable_tray_icon;
-
+	/* In RemminaPrefDialog keyboard tab */
 	guint hostkey;
 	guint shortcutkey_fullscreen;
 	guint shortcutkey_autofit;
-	guint shortcutkey_nexttab;
 	guint shortcutkey_prevtab;
+	guint shortcutkey_nexttab;
 	guint shortcutkey_scale;
 	guint shortcutkey_grab;
 	guint shortcutkey_minimize;
 	guint shortcutkey_disconnect;
 	guint shortcutkey_toolbar;
-
+	/* In RemminaPrefDialog terminal tab */
+	gchar *vte_font;
+	gboolean vte_allow_bold_text;
+	gboolean vte_system_colors;
+	gchar *vte_foreground_color;
+	gchar *vte_background_color;
+	gint vte_lines;
+	guint vte_shortcutkey_copy;
+	guint vte_shortcutkey_paste;
 	/* In View menu */
 	gboolean hide_toolbar;
 	gboolean hide_statusbar;
 	gboolean show_quick_search;
 	gboolean hide_quick_connect;
 	gboolean small_toolbutton;
 	gint view_file_mode;
-
+	/* In tray icon */
+	gboolean applet_enable_avahi;
 	/* Auto */
 	gint main_width;
 	gint main_height;
@@ -123,16 +134,6 @@ typedef struct _RemminaPref
 
 	/* Crypto */
 	gchar *secret;
-
-	/* VTE */
-	gchar *vte_font;
-	gboolean vte_allow_bold_text;
-	gboolean vte_system_colors;
-	gchar *vte_foreground_color;
-	gchar *vte_background_color;
-	gint vte_lines;
-	guint vte_shortcutkey_copy;
-	guint vte_shortcutkey_paste;
 } RemminaPref;
 
 #define DEFAULT_SSHTUNNEL_PORT 4732

diff --git a/remmina/src/remmina_pref_dialog.c b/remmina/src/remmina_pref_dialog.c
@@ -162,6 +162,8 @@ void remmina_pref_on_dialog_destroy(GtkWidget *widget, gpointer user_data)
 	remmina_pref.default_action = gtk_combo_box_get_active(remmina_pref_dialog->comboboxtext_options_double_click);
 	remmina_pref.default_mode = gtk_combo_box_get_active(remmina_pref_dialog->comboboxtext_appearance_view_mode);
 	remmina_pref.tab_mode = gtk_combo_box_get_active(remmina_pref_dialog->comboboxtext_appearance_tab_interface);
+	remmina_pref.show_buttons_icons = gtk_combo_box_get_active(remmina_pref_dialog->comboboxtext_appearance_show_buttons_icons);
+	remmina_pref.show_menu_icons = gtk_combo_box_get_active(remmina_pref_dialog->comboboxtext_appearance_show_menu_icons);
 	remmina_pref.scale_quality = gtk_combo_box_get_active(remmina_pref_dialog->comboboxtext_options_scale_quality);
 
 	remmina_pref.sshtunnel_port = atoi(gtk_entry_get_text(remmina_pref_dialog->entry_options_ssh_port));
@@ -363,6 +365,8 @@ static void remmina_pref_dialog_init(void)
 	gtk_combo_box_set_active(remmina_pref_dialog->comboboxtext_options_double_click, remmina_pref.default_action);
 	gtk_combo_box_set_active(remmina_pref_dialog->comboboxtext_appearance_view_mode, remmina_pref.default_mode);
 	gtk_combo_box_set_active(remmina_pref_dialog->comboboxtext_appearance_tab_interface, remmina_pref.tab_mode);
+	gtk_combo_box_set_active(remmina_pref_dialog->comboboxtext_appearance_show_buttons_icons, remmina_pref.show_buttons_icons);
+	gtk_combo_box_set_active(remmina_pref_dialog->comboboxtext_appearance_show_menu_icons, remmina_pref.show_menu_icons);
 	gtk_combo_box_set_active(remmina_pref_dialog->comboboxtext_options_scale_quality, remmina_pref.scale_quality);
 
 	gtk_button_set_label(remmina_pref_dialog->button_keyboard_copy, remmina_key_chooser_get_value(remmina_pref.vte_shortcutkey_copy, 0));
@@ -395,6 +399,8 @@ GtkDialog* remmina_pref_dialog_new(gint default_tab, GtkWindow *parent)
 	remmina_pref_dialog->comboboxtext_options_double_click = GTK_COMBO_BOX(GET_OBJECT("comboboxtext_options_double_click"));
 	remmina_pref_dialog->comboboxtext_appearance_view_mode = GTK_COMBO_BOX(GET_OBJECT("comboboxtext_appearance_view_mode"));
 	remmina_pref_dialog->comboboxtext_appearance_tab_interface = GTK_COMBO_BOX(GET_OBJECT("comboboxtext_appearance_tab_interface"));
+	remmina_pref_dialog->comboboxtext_appearance_show_buttons_icons = GTK_COMBO_BOX(GET_OBJECT("comboboxtext_appearance_show_buttons_icons"));
+	remmina_pref_dialog->comboboxtext_appearance_show_menu_icons = GTK_COMBO_BOX(GET_OBJECT("comboboxtext_appearance_show_menu_icons"));
 	remmina_pref_dialog->comboboxtext_options_scale_quality = GTK_COMBO_BOX(GET_OBJECT("comboboxtext_options_scale_quality"));
 	remmina_pref_dialog->entry_options_ssh_port = GTK_ENTRY(GET_OBJECT("entry_options_ssh_port"));
 	remmina_pref_dialog->entry_options_scroll = GTK_ENTRY(GET_OBJECT("entry_options_scroll"));

diff --git a/remmina/src/remmina_pref_dialog.h b/remmina/src/remmina_pref_dialog.h
@@ -58,6 +58,8 @@ typedef struct _RemminaPrefDialog
 	GtkComboBox *comboboxtext_options_double_click;
 	GtkComboBox *comboboxtext_appearance_view_mode;
 	GtkComboBox *comboboxtext_appearance_tab_interface;
+	GtkComboBox *comboboxtext_appearance_show_buttons_icons;
+	GtkComboBox *comboboxtext_appearance_show_menu_icons;
 	GtkComboBox *comboboxtext_options_scale_quality;
 	GtkEntry *entry_options_ssh_port;
 	GtkEntry *entry_options_scroll;

diff --git a/remmina/ui/remmina_preferences.glade b/remmina/ui/remmina_preferences.glade
@@ -397,6 +397,66 @@
                         <property name="width">2</property>
                       </packing>
                     </child>
+                    <child>
+                      <object class="GtkLabel" id="label_appearance_show_buttons_icons">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="xalign">0</property>
+                        <property name="label" translatable="yes">Show buttons icons</property>
+                      </object>
+                      <packing>
+                        <property name="left_attach">0</property>
+                        <property name="top_attach">5</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkComboBoxText" id="comboboxtext_appearance_show_buttons_icons">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="tooltip_text" translatable="yes">This setting will be active after the application restart</property>
+                        <property name="hexpand">True</property>
+                        <items>
+                          <item translatable="yes">Use system theme preferences</item>
+                          <item translatable="yes">Show always</item>
+                          <item translatable="yes">Hide always</item>
+                        </items>
+                      </object>
+                      <packing>
+                        <property name="left_attach">1</property>
+                        <property name="top_attach">5</property>
+                        <property name="width">2</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkLabel" id="label_appearance_show_menu_icons">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="xalign">0</property>
+                        <property name="label" translatable="yes">Show menu icons</property>
+                      </object>
+                      <packing>
+                        <property name="left_attach">0</property>
+                        <property name="top_attach">6</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkComboBoxText" id="comboboxtext_appearance_show_menu_icons">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="tooltip_text" translatable="yes">This setting will be active after the application restart</property>
+                        <property name="hexpand">True</property>
+                        <items>
+                          <item translatable="yes">Use system theme preferences</item>
+                          <item translatable="yes">Show always</item>
+                          <item translatable="yes">Hide always</item>
+                        </items>
+                      </object>
+                      <packing>
+                        <property name="left_attach">1</property>
+                        <property name="top_attach">6</property>
+                        <property name="width">2</property>
+                      </packing>
+                    </child>
                   </object>
                 </child>
               </object>