Merge branch 'master' of https://github.com/antenore/Remmina into antenore-master

2 files changed, 14 insertions, 11 deletions

diff --git a/remmina/src/remmina_file_editor.c b/remmina/src/remmina_file_editor.c
index cbcd6a00e..95b2bb843 100644
--- a/remmina/src/remmina_file_editor.c
+++ b/remmina/src/remmina_file_editor.c
@@ -387,7 +387,7 @@ static void remmina_file_editor_create_server(RemminaFileEditor* gfe, const Remm
 		gtk_box_pack_start (GTK_BOX (hbox), widget, FALSE, FALSE, 0);
 		g_signal_connect(G_OBJECT(widget), "clicked", G_CALLBACK(remmina_file_editor_browse_avahi), gfe);
 
-		gtk_grid_attach (GTK_GRID(table), hbox, 1, row + 2, 1, 1);
+		gtk_grid_attach (GTK_GRID(table), hbox, 1, row , 1, 1);
 	}
 	else
 #endif
@@ -555,7 +555,7 @@ static GtkWidget* remmina_file_editor_create_check(RemminaFileEditor* gfe, GtkGr
 	widget = gtk_check_button_new_with_label(label);
 	gtk_widget_show(widget);
 	gtk_grid_set_row_spacing(GTK_GRID(table), 1);
-	gtk_grid_attach(GTK_GRID(table), widget, 0, row , 1, 1);
+	gtk_grid_attach(GTK_GRID(table), widget, 0, row , 2, 1);
 
 	return widget;
 }
@@ -809,7 +809,7 @@ static void remmina_file_editor_create_ssh_tab(RemminaFileEditor* gfe, RemminaPr
 		gtk_widget_show(widget);
 		gtk_entry_set_max_length (GTK_ENTRY(widget), 100);
 		gtk_widget_set_tooltip_markup (widget, _(server_tips2));
-		gtk_grid_attach (GTK_GRID(table), widget, 0, row, 3, 1);
+		gtk_grid_attach (GTK_GRID(table), widget, 1, row, 2, 1);
 		priv->ssh_server_entry = widget;
 		row++;
 		break;
@@ -1204,15 +1204,21 @@ static void remmina_file_editor_init(RemminaFileEditor* gfe)
 	/* Create the editor dialog */
 	gtk_window_set_title(GTK_WINDOW(gfe), _("Remote Desktop Preference"));
 
-	widget = gtk_dialog_add_button(GTK_DIALOG(gfe), "_Save", GTK_RESPONSE_APPLY);
+	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));
+	gtk_button_box_set_child_secondary(GTK_BUTTON_BOX(gtk_dialog_get_action_area(GTK_DIALOG(gfe))), widget, TRUE);
 	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), "_Cancel", GTK_RESPONSE_CANCEL);
+	widget = gtk_dialog_add_button(GTK_DIALOG(gfe), (_("Cancel")), GTK_RESPONSE_CANCEL);
+	gtk_button_set_image(GTK_BUTTON(widget), gtk_image_new_from_icon_name("gtk-cancel", GTK_ICON_SIZE_BUTTON));
+	gtk_button_box_set_child_secondary(GTK_BUTTON_BOX(gtk_dialog_get_action_area(GTK_DIALOG(gfe))), widget, TRUE);
 	g_signal_connect(G_OBJECT(widget), "clicked", G_CALLBACK(remmina_file_editor_on_cancel), gfe);
 
-	widget = gtk_dialog_add_button(GTK_DIALOG(gfe), "_Connect", GTK_RESPONSE_OK);
+	widget = gtk_dialog_add_button(GTK_DIALOG(gfe), (_("Connect")), GTK_RESPONSE_OK);
+	gtk_button_set_image(GTK_BUTTON(widget), gtk_image_new_from_icon_name("gtk-connect", GTK_ICON_SIZE_BUTTON));
+	gtk_button_box_set_child_secondary(GTK_BUTTON_BOX(gtk_dialog_get_action_area(GTK_DIALOG(gfe))), widget, TRUE);
 	g_signal_connect(G_OBJECT(widget), "clicked", G_CALLBACK(remmina_file_editor_on_connect), gfe);
 
 	gtk_dialog_set_alternative_button_order(GTK_DIALOG(gfe), GTK_RESPONSE_OK, GTK_RESPONSE_APPLY, GTK_RESPONSE_CANCEL, -1);
@@ -1223,9 +1229,9 @@ static void remmina_file_editor_init(RemminaFileEditor* gfe)
 	g_signal_connect(G_OBJECT(gfe), "realize", G_CALLBACK(remmina_file_editor_on_realize), NULL);
 
 	/* Default button */
-	widget = gtk_button_new_with_label("Default");
+	widget = gtk_button_new_with_label(_("Default"));
 	gtk_widget_show(widget);
-	gtk_button_set_image(GTK_BUTTON(widget), gtk_image_new_from_icon_name("_Preferences", GTK_ICON_SIZE_BUTTON));
+	gtk_button_set_image(GTK_BUTTON(widget), gtk_image_new_from_icon_name("preferences-system", GTK_ICON_SIZE_BUTTON));
 	gtk_box_pack_start(GTK_BOX(gtk_dialog_get_action_area(GTK_DIALOG(gfe))), widget, FALSE, TRUE, 0);
 	gtk_button_box_set_child_secondary(GTK_BUTTON_BOX(gtk_dialog_get_action_area(GTK_DIALOG(gfe))), widget, TRUE);
 
diff --git a/remmina/src/remmina_public.c b/remmina/src/remmina_public.c
index 6a0fc0c29..2d5ef66b4 100644
--- a/remmina/src/remmina_public.c
+++ b/remmina/src/remmina_public.c
@@ -251,7 +251,6 @@ remmina_public_create_combo_mapint(const gpointer *key_value_list, gint def, gbo
 }
 
 void remmina_public_create_group(GtkGrid *table, const gchar *group, gint row, gint rows, gint cols)
-                //gtk_grid_attach (GtkGrid *grid, GtkWidget *child, gint left, gint top, gint width, gint height);
 {
 	GtkWidget *widget;
 	gchar *str;
@@ -266,8 +265,6 @@ void remmina_public_create_group(GtkGrid *table, const gchar *group, gint row, g
 
 	widget = gtk_label_new(NULL);
 	gtk_widget_show(widget);
-	//gtk_widget_set_size_request(widget, 15, -1);
-	//gtk_grid_attach(GTK_GRID(table), widget, 0, row + 1, 1, 2);
 	gtk_grid_attach(GTK_GRID(table), widget, 0, row + 1, 1, 1);
 }