Skip to content

Commit 48beaf5

Browse files
antenoreantenore
authored
Merge pull request #1535 from FreeRDP/redesign
Redesign - Removed icons where not needed
2 parents 9d411f0 + 7cfe957 commit 48beaf5

2 files changed

Lines changed: 4 additions & 28 deletions

File tree

‎remmina/src/remmina_file_editor.c‎

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -796,7 +796,7 @@ static void remmina_file_editor_create_ssh_tab(RemminaFileEditor* gfe, RemminaPr
796796
if (ssh_setting == REMMINA_PROTOCOL_SSH_SETTING_NONE) return;
797797

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

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

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

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

@@ -1253,21 +1253,17 @@ static void remmina_file_editor_init(RemminaFileEditor* gfe)
12531253

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

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

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

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

‎remmina/ui/remmina_main.glade‎

Lines changed: 1 addition & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<!-- Generated with glade 3.20.0
2+
<!-- Generated with glade 3.20.4
33
44
Remmina - The GTK+ Remmina Remote Desktop Client
55
Copyright (C) Antenore Gatta & Giovanni Panozzo 2014-2018
@@ -51,7 +51,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
5151
<object class="GtkAction" id="action_application_about">
5252
<property name="label" translatable="yes">_About</property>
5353
<property name="short_label" translatable="yes">_About</property>
54-
<property name="icon_name">help-about</property>
5554
<signal name="activate" handler="remmina_main_on_action_application_about" swapped="no"/>
5655
</object>
5756
<accelerator key="F1"/>
@@ -78,7 +77,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
7877
<property name="label" translatable="yes">Connect</property>
7978
<property name="short_label" translatable="yes">Connect</property>
8079
<property name="tooltip" translatable="yes">Open the connection to the selected remote desktop file</property>
81-
<property name="stock_id">gtk-connect</property>
8280
<property name="is_important">True</property>
8381
<signal name="activate" handler="remmina_main_on_action_connection_connect" swapped="no"/>
8482
</object>
@@ -118,7 +116,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
118116
<object class="GtkAction" id="action_connection_external_tools">
119117
<property name="label" translatable="yes">External Tools</property>
120118
<property name="short_label" translatable="yes">External Tools</property>
121-
<property name="icon_name">system-run</property>
122119
<signal name="activate" handler="remmina_main_on_action_connection_external_tools" swapped="no"/>
123120
</object>
124121
<accelerator key="t" modifiers="GDK_CONTROL_MASK"/>
@@ -151,7 +148,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
151148
<object class="GtkAction" id="action_help_wiki">
152149
<property name="label" translatable="yes">Online Wiki</property>
153150
<property name="short_label" translatable="yes">Online Wiki</property>
154-
<property name="icon_name">help-contents</property>
155151
<signal name="activate" handler="remmina_main_on_action_help_wiki" swapped="no"/>
156152
</object>
157153
</child>
@@ -173,7 +169,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
173169
<object class="GtkAction" id="action_help_debug">
174170
<property name="label" translatable="yes">Debug Window</property>
175171
<property name="short_label" translatable="yes">Debug Window</property>
176-
<property name="icon_name">text-x-generic</property>
177172
<signal name="activate" handler="remmina_main_on_action_help_debug" swapped="no"/>
178173
</object>
179174
</child>
@@ -369,7 +364,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
369364
<property name="can_focus">False</property>
370365
<child>
371366
<object class="GtkImageMenuItem" id="menuitem_popup_connect">
372-
<property name="use_action_appearance">True</property>
373367
<property name="related_action">action_connection_connect</property>
374368
<property name="visible">True</property>
375369
<property name="can_focus">False</property>
@@ -385,7 +379,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
385379
</child>
386380
<child>
387381
<object class="GtkImageMenuItem" id="menuitem_popup_copy">
388-
<property name="use_action_appearance">True</property>
389382
<property name="related_action">action_connection_copy</property>
390383
<property name="visible">True</property>
391384
<property name="can_focus">False</property>
@@ -395,7 +388,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
395388
</child>
396389
<child>
397390
<object class="GtkImageMenuItem" id="menuitem_popup_edit">
398-
<property name="use_action_appearance">True</property>
399391
<property name="related_action">action_connection_edit</property>
400392
<property name="visible">True</property>
401393
<property name="can_focus">False</property>
@@ -405,7 +397,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
405397
</child>
406398
<child>
407399
<object class="GtkImageMenuItem" id="menuitem_popup_delete">
408-
<property name="use_action_appearance">True</property>
409400
<property name="related_action">action_connection_delete</property>
410401
<property name="visible">True</property>
411402
<property name="can_focus">False</property>
@@ -415,7 +406,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
415406
</child>
416407
<child>
417408
<object class="GtkImageMenuItem" id="menuitem_popup_externaltools">
418-
<property name="use_action_appearance">True</property>
419409
<property name="related_action">action_connection_external_tools</property>
420410
<property name="visible">True</property>
421411
<property name="can_focus">False</property>
@@ -437,7 +427,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
437427
<property name="can_focus">False</property>
438428
<child>
439429
<object class="GtkMenuItem" id="menuitem_tools_import">
440-
<property name="use_action_appearance">True</property>
441430
<property name="related_action">action_tools_import</property>
442431
<property name="visible">True</property>
443432
<property name="can_focus">False</property>
@@ -447,7 +436,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
447436
</child>
448437
<child>
449438
<object class="GtkMenuItem" id="menuitem_tools_export">
450-
<property name="use_action_appearance">True</property>
451439
<property name="related_action">action_tools_export</property>
452440
<property name="visible">True</property>
453441
<property name="can_focus">False</property>
@@ -457,7 +445,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
457445
</child>
458446
<child>
459447
<object class="GtkMenuItem" id="menuitem_tools_plugins">
460-
<property name="use_action_appearance">True</property>
461448
<property name="related_action">action_application_plugins</property>
462449
<property name="visible">True</property>
463450
<property name="can_focus">False</property>
@@ -467,7 +454,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
467454
</child>
468455
<child>
469456
<object class="GtkMenuItem" id="menuitem_tools_mpchange">
470-
<property name="use_action_appearance">True</property>
471457
<property name="related_action">action_application_mpchange</property>
472458
<property name="visible">True</property>
473459
<property name="can_focus">False</property>
@@ -523,7 +509,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
523509
</child>
524510
<child>
525511
<object class="GtkImageMenuItem" id="menuitem_edit_preferences">
526-
<property name="use_action_appearance">True</property>
527512
<property name="related_action">action_application_preferences</property>
528513
<property name="visible">True</property>
529514
<property name="can_focus">False</property>
@@ -539,7 +524,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
539524
</child>
540525
<child>
541526
<object class="GtkMenuItem" id="menuitem_help_homepage">
542-
<property name="use_action_appearance">True</property>
543527
<property name="related_action">action_help_homepage</property>
544528
<property name="visible">True</property>
545529
<property name="can_focus">False</property>
@@ -549,7 +533,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
549533
</child>
550534
<child>
551535
<object class="GtkMenuItem" id="menuitem_help_wiki">
552-
<property name="use_action_appearance">True</property>
553536
<property name="related_action">action_help_wiki</property>
554537
<property name="visible">True</property>
555538
<property name="can_focus">False</property>
@@ -577,7 +560,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
577560
</child>
578561
<child>
579562
<object class="GtkMenuItem" id="menuitem_help_debug">
580-
<property name="use_action_appearance">True</property>
581563
<property name="related_action">action_help_debug</property>
582564
<property name="visible">True</property>
583565
<property name="can_focus">False</property>
@@ -587,7 +569,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
587569
</child>
588570
<child>
589571
<object class="GtkImageMenuItem" id="menuitem_help_about">
590-
<property name="use_action_appearance">True</property>
591572
<property name="related_action">action_application_about</property>
592573
<property name="visible">True</property>
593574
<property name="can_focus">False</property>
@@ -603,7 +584,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
603584
</child>
604585
<child>
605586
<object class="GtkImageMenuItem" id="menuitem_connection_quit">
606-
<property name="use_action_appearance">True</property>
607587
<property name="related_action">action_application_quit</property>
608588
<property name="visible">True</property>
609589
<property name="can_focus">False</property>

0 commit comments

Comments
 (0)