Skip to content

Commit

Permalink
Merge pull request #1535 from FreeRDP/redesign
Browse files Browse the repository at this point in the history 
Redesign - Removed icons where not needed
  • Loading branch information
@antenore
antenore committed Mar 23, 2018
2 parents 9d411f0 + 7cfe957 commit 48beaf5
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 28 deletions.
10 changes: 3 additions & 7 deletions remmina/src/remmina_file_editor.c
View file
Expand Up @@ -796,7 +796,7 @@ static void remmina_file_editor_create_ssh_tab(RemminaFileEditor* gfe, RemminaPr
if (ssh_setting == REMMINA_PROTOCOL_SSH_SETTING_NONE) return;

/* The SSH tab (implementation) */
grid = remmina_file_editor_create_notebook_tab(gfe, "dialog-password",
grid = remmina_file_editor_create_notebook_tab(gfe, NULL,
"SSH Tunnel", 9, 3);

hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0);
Expand Down Expand Up @@ -965,13 +965,13 @@ static void remmina_file_editor_create_all_settings(RemminaFileEditor* gfe)

/* The Basic tab */
if (priv->plugin->basic_settings) {
grid = remmina_file_editor_create_notebook_tab(gfe, "dialog-information", _("Basic"), 20, 2);
grid = remmina_file_editor_create_notebook_tab(gfe, NULL, _("Basic"), 20, 2);
remmina_file_editor_create_settings(gfe, grid, priv->plugin->basic_settings);
}

/* The Advanced tab */
if (priv->plugin->advanced_settings) {
grid = remmina_file_editor_create_notebook_tab(gfe, "dialog-warning", _("Advanced"), 20, 2);
grid = remmina_file_editor_create_notebook_tab(gfe, NULL, _("Advanced"), 20, 2);
remmina_file_editor_create_settings(gfe, grid, priv->plugin->advanced_settings);
}

Expand Down Expand Up @@ -1253,21 +1253,17 @@ static void remmina_file_editor_init(RemminaFileEditor* gfe)

/* Default button */
widget = gtk_dialog_add_button(GTK_DIALOG(gfe), (_("Save as Default")), GTK_RESPONSE_OK);
gtk_button_set_image(GTK_BUTTON(widget), gtk_image_new_from_icon_name("preferences-system", GTK_ICON_SIZE_BUTTON));
g_signal_connect(G_OBJECT(widget), "clicked", G_CALLBACK(remmina_file_editor_on_default), gfe);

widget = gtk_dialog_add_button(GTK_DIALOG(gfe), (_("_Save")), GTK_RESPONSE_APPLY);
gtk_button_set_image(GTK_BUTTON(widget), gtk_image_new_from_icon_name("document-save", GTK_ICON_SIZE_BUTTON));
g_signal_connect(G_OBJECT(widget), "clicked", G_CALLBACK(remmina_file_editor_on_save), gfe);
gtk_widget_set_sensitive(widget, FALSE);
priv->save_button = widget;

widget = gtk_dialog_add_button(GTK_DIALOG(gfe), (_("Connect")), GTK_RESPONSE_ACCEPT);
gtk_button_set_image(GTK_BUTTON(widget), gtk_image_new_from_icon_name("gtk-connect", GTK_ICON_SIZE_BUTTON));
g_signal_connect(G_OBJECT(widget), "clicked", G_CALLBACK(remmina_file_editor_on_connect), gfe);

widget = gtk_dialog_add_button(GTK_DIALOG(gfe), (_("_Save and Connect")), GTK_RESPONSE_OK);
gtk_button_set_image(GTK_BUTTON(widget), gtk_image_new_from_icon_name("document-save-as", GTK_ICON_SIZE_BUTTON));
gtk_widget_set_can_default(widget, TRUE);
g_signal_connect(G_OBJECT(widget), "clicked", G_CALLBACK(remmina_file_editor_on_save_connect), gfe);

Expand Down
22 changes: 1 addition & 21 deletions remmina/ui/remmina_main.glade
View file
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- Generated with glade 3.20.0
<!-- Generated with glade 3.20.4
Remmina - The GTK+ Remmina Remote Desktop Client
Copyright (C) Antenore Gatta & Giovanni Panozzo 2014-2018
Expand Down Expand Up @@ -51,7 +51,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
<object class="GtkAction" id="action_application_about">
<property name="label" translatable="yes">_About</property>
<property name="short_label" translatable="yes">_About</property>
<property name="icon_name">help-about</property>
<signal name="activate" handler="remmina_main_on_action_application_about" swapped="no"/>
</object>
<accelerator key="F1"/>
Expand All @@ -78,7 +77,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
<property name="label" translatable="yes">Connect</property>
<property name="short_label" translatable="yes">Connect</property>
<property name="tooltip" translatable="yes">Open the connection to the selected remote desktop file</property>
<property name="stock_id">gtk-connect</property>
<property name="is_important">True</property>
<signal name="activate" handler="remmina_main_on_action_connection_connect" swapped="no"/>
</object>
Expand Down Expand Up @@ -118,7 +116,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
<object class="GtkAction" id="action_connection_external_tools">
<property name="label" translatable="yes">External Tools</property>
<property name="short_label" translatable="yes">External Tools</property>
<property name="icon_name">system-run</property>
<signal name="activate" handler="remmina_main_on_action_connection_external_tools" swapped="no"/>
</object>
<accelerator key="t" modifiers="GDK_CONTROL_MASK"/>
Expand Down Expand Up @@ -151,7 +148,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
<object class="GtkAction" id="action_help_wiki">
<property name="label" translatable="yes">Online Wiki</property>
<property name="short_label" translatable="yes">Online Wiki</property>
<property name="icon_name">help-contents</property>
<signal name="activate" handler="remmina_main_on_action_help_wiki" swapped="no"/>
</object>
</child>
Expand All @@ -173,7 +169,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
<object class="GtkAction" id="action_help_debug">
<property name="label" translatable="yes">Debug Window</property>
<property name="short_label" translatable="yes">Debug Window</property>
<property name="icon_name">text-x-generic</property>
<signal name="activate" handler="remmina_main_on_action_help_debug" swapped="no"/>
</object>
</child>
Expand Down Expand Up @@ -369,7 +364,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
<property name="can_focus">False</property>
<child>
<object class="GtkImageMenuItem" id="menuitem_popup_connect">
<property name="use_action_appearance">True</property>
<property name="related_action">action_connection_connect</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
Expand All @@ -385,7 +379,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
</child>
<child>
<object class="GtkImageMenuItem" id="menuitem_popup_copy">
<property name="use_action_appearance">True</property>
<property name="related_action">action_connection_copy</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
Expand All @@ -395,7 +388,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
</child>
<child>
<object class="GtkImageMenuItem" id="menuitem_popup_edit">
<property name="use_action_appearance">True</property>
<property name="related_action">action_connection_edit</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
Expand All @@ -405,7 +397,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
</child>
<child>
<object class="GtkImageMenuItem" id="menuitem_popup_delete">
<property name="use_action_appearance">True</property>
<property name="related_action">action_connection_delete</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
Expand All @@ -415,7 +406,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
</child>
<child>
<object class="GtkImageMenuItem" id="menuitem_popup_externaltools">
<property name="use_action_appearance">True</property>
<property name="related_action">action_connection_external_tools</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
Expand All @@ -437,7 +427,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
<property name="can_focus">False</property>
<child>
<object class="GtkMenuItem" id="menuitem_tools_import">
<property name="use_action_appearance">True</property>
<property name="related_action">action_tools_import</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
Expand All @@ -447,7 +436,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
</child>
<child>
<object class="GtkMenuItem" id="menuitem_tools_export">
<property name="use_action_appearance">True</property>
<property name="related_action">action_tools_export</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
Expand All @@ -457,7 +445,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
</child>
<child>
<object class="GtkMenuItem" id="menuitem_tools_plugins">
<property name="use_action_appearance">True</property>
<property name="related_action">action_application_plugins</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
Expand All @@ -467,7 +454,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
</child>
<child>
<object class="GtkMenuItem" id="menuitem_tools_mpchange">
<property name="use_action_appearance">True</property>
<property name="related_action">action_application_mpchange</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
Expand Down Expand Up @@ -523,7 +509,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
</child>
<child>
<object class="GtkImageMenuItem" id="menuitem_edit_preferences">
<property name="use_action_appearance">True</property>
<property name="related_action">action_application_preferences</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
Expand All @@ -539,7 +524,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
</child>
<child>
<object class="GtkMenuItem" id="menuitem_help_homepage">
<property name="use_action_appearance">True</property>
<property name="related_action">action_help_homepage</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
Expand All @@ -549,7 +533,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
</child>
<child>
<object class="GtkMenuItem" id="menuitem_help_wiki">
<property name="use_action_appearance">True</property>
<property name="related_action">action_help_wiki</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
Expand Down Expand Up @@ -577,7 +560,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
</child>
<child>
<object class="GtkMenuItem" id="menuitem_help_debug">
<property name="use_action_appearance">True</property>
<property name="related_action">action_help_debug</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
Expand All @@ -587,7 +569,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
</child>
<child>
<object class="GtkImageMenuItem" id="menuitem_help_about">
<property name="use_action_appearance">True</property>
<property name="related_action">action_application_about</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
Expand All @@ -603,7 +584,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
</child>
<child>
<object class="GtkImageMenuItem" id="menuitem_connection_quit">
<property name="use_action_appearance">True</property>
<property name="related_action">action_application_quit</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
Expand Down

0 comments on commit 48beaf5

Please sign in to comment.