Fixing FTP UI, closes 2450

1 files changed, 4 insertions, 20 deletions

diff --git a/src/remmina_ftp_client.c b/src/remmina_ftp_client.c
index 60d70c28a..3d5ab914e 100644
--- a/src/remmina_ftp_client.c
+++ b/src/remmina_ftp_client.c
@@ -200,10 +200,10 @@ static void remmina_ftp_client_cell_data_filetype_pixbuf(GtkTreeViewColumn *col,
 
 	switch (type) {
 	case REMMINA_FTP_FILE_TYPE_DIR:
-		g_object_set(renderer, "stock-id", "folder", NULL);
+		g_object_set(renderer, "icon-name", "folder", NULL);
 		break;
 	default:
-		g_object_set(renderer, "stock-id", "text-x-generic", NULL);
+		g_object_set(renderer, "icon-name", "text-x-generic", NULL);
 		break;
 	}
 }
@@ -739,63 +739,46 @@ static GtkWidget* remmina_ftp_client_create_toolbar(RemminaFTPClient *client)
 	TRACE_CALL(__func__);
 	GtkWidget *box;
 	GtkWidget *button;
-	GtkWidget *image;
 	gint i = 0;
 
 	box = gtk_button_box_new(GTK_ORIENTATION_HORIZONTAL);
-	gtk_widget_show(box);
 	gtk_button_box_set_layout(GTK_BUTTON_BOX(box), GTK_BUTTONBOX_START);
 	gtk_grid_attach(GTK_GRID(client), box, 0, 0, 1, 1);
 
 	button = gtk_button_new_with_label(_("Home"));
-	gtk_widget_show(button);
 	gtk_widget_set_tooltip_text(button, _("Go to home folder"));
-	gtk_button_set_relief(GTK_BUTTON(button), GTK_RELIEF_NONE);
 	gtk_box_pack_start(GTK_BOX(box), button, FALSE, FALSE, 0);
 	g_signal_connect(G_OBJECT(button), "clicked", G_CALLBACK(remmina_ftp_client_action_home), client);
 
 	button = gtk_button_new_with_label(_("Up"));
-	gtk_widget_show(button);
 	gtk_widget_set_tooltip_text(button, _("Go to parent folder"));
-	gtk_button_set_relief(GTK_BUTTON(button), GTK_RELIEF_NONE);
 	gtk_box_pack_start(GTK_BOX(box), button, FALSE, FALSE, 0);
 	g_signal_connect(G_OBJECT(button), "clicked", G_CALLBACK(remmina_ftp_client_action_parent), client);
 
 	button = gtk_button_new_with_label(_("Refresh"));
-	gtk_widget_show(button);
 	gtk_widget_set_tooltip_text(button, _("Refresh current folder"));
-	gtk_button_set_relief(GTK_BUTTON(button), GTK_RELIEF_NONE);
 	gtk_box_pack_start(GTK_BOX(box), button, FALSE, FALSE, 0);
 	g_signal_connect(G_OBJECT(button), "clicked", G_CALLBACK(remmina_ftp_client_action_refresh), client);
 
 	button = gtk_button_new_with_label(_("Download"));
-	gtk_widget_show(button);
 	gtk_widget_set_tooltip_text(button, _("Download from server"));
-	gtk_button_set_relief(GTK_BUTTON(button), GTK_RELIEF_NONE);
-	image = gtk_image_new_from_icon_name("remmina-document-save-symbolic", GTK_ICON_SIZE_BUTTON);
-	gtk_button_set_image(GTK_BUTTON(button), image);
 	gtk_box_pack_start(GTK_BOX(box), button, FALSE, FALSE, 0);
 	g_signal_connect(G_OBJECT(button), "clicked", G_CALLBACK(remmina_ftp_client_action_download), client);
 
 	client->priv->file_action_widgets[i++] = button;
 
 	button = gtk_button_new_with_label(_("Upload"));
-	gtk_widget_show(button);
 	gtk_widget_set_tooltip_text(button, _("Upload to server"));
-	gtk_button_set_relief(GTK_BUTTON(button), GTK_RELIEF_NONE);
-	image = gtk_image_new_from_icon_name("remmina-document-send-symbolic", GTK_ICON_SIZE_BUTTON);
-	gtk_button_set_image(GTK_BUTTON(button), image);
 	gtk_box_pack_start(GTK_BOX(box), button, FALSE, FALSE, 0);
 	g_signal_connect(G_OBJECT(button), "clicked", G_CALLBACK(remmina_ftp_client_action_upload), client);
 
 	button = gtk_button_new_with_label(_("Delete"));
-	gtk_widget_show(button);
 	gtk_widget_set_tooltip_text(button, _("Delete files on server"));
-	gtk_button_set_relief(GTK_BUTTON(button), GTK_RELIEF_NONE);
 	gtk_box_pack_start(GTK_BOX(box), button, FALSE, FALSE, 0);
 	g_signal_connect(G_OBJECT(button), "clicked", G_CALLBACK(remmina_ftp_client_action_delete), client);
 
 	client->priv->file_action_widgets[i++] = button;
+	gtk_widget_show_all(box);
 
 	return box;
 }
@@ -879,6 +862,7 @@ static void remmina_ftp_client_init(RemminaFTPClient *client)
 
 	/* Toolbar */
 	toolbar = remmina_ftp_client_create_toolbar(client);
+	gtk_widget_set_hexpand(toolbar, TRUE);
 
 	/* The Paned to separate File List and Task List */
 	vpaned = gtk_paned_new(GTK_ORIENTATION_VERTICAL);