Merge lp:~evfool/pantheon-files/lp1400735-hide-smb-port into lp:~elementary-apps/pantheon-files/trunk

[Robert Roth]

Hide the port label and entry on the connect to server dialog in case they are not needed for the given protocol (lp:1400735).

[Jeremy Wootten (jeremywootten)]

Tested after merging current trunk and fix-network-browsing branch.

The port choice widget is hidden when "Windows share" is chosen, but this results in a significant change in the width of the window, which is not ideal. I think the design team would need to comment on that.

I think it would be better if the window width stayed the same.

In my opinion the port choice widget should appear below the connection type now as its appearance depends on the connection type. By the same logic the folder field, which is fixed, should appear above it, together with server. Again, design team input is needed on this.

[Jeremy Wootten (jeremywootten)]

This branch conflicts with lp:~alek900/pantheon-files/server-dialog-vala, which converts the server dialog code into Vala. It would be better to wait until this branch is merged before fixing this and other server dialog bugs.

review: Disapprove

Unmerged revisions

1702. By Robert Roth on 2014-12-29

Do not show disabled port entry for samba (lp:1400735)

=== modified file 'src/marlin-connect-server-dialog.c'
--- src/marlin-connect-server-dialog.c	2013-09-12 01:59:24 +0000
+++ src/marlin-connect-server-dialog.c	2014-12-29 17:38:44 +0000
@@ -37,6 +37,7 @@
     GtkWidget *primary_grid;
     GtkWidget *user_details;
     GtkWidget *port_spinbutton;
+    GtkWidget *port_label;
 
     GtkWidget *info_bar;
     GtkWidget *info_bar_content;
@@ -812,8 +813,13 @@
                   (meth->flags & SHOW_SHARE) != 0,
                   NULL);
 
+    g_object_set (dialog->details->port_label,
+                  "visible",
+                  (meth->flags & SHOW_PORT) != 0,
+                  NULL);
+
     g_object_set (dialog->details->port_spinbutton,
-                  "sensitive",
+                  "visible",
                   (meth->flags & SHOW_PORT) != 0,
                   "value", (gdouble) meth->default_port,
                   NULL);
@@ -939,7 +945,7 @@
 
     dialog->details->server_entry = gtk_entry_new ();
     gtk_entry_set_activates_default (GTK_ENTRY (dialog->details->server_entry), TRUE);
-    gtk_box_pack_start (GTK_BOX (hbox), dialog->details->server_entry, FALSE, FALSE, 0);
+    gtk_box_pack_start (GTK_BOX (hbox), dialog->details->server_entry, TRUE, TRUE, 0);
     gtk_label_set_mnemonic_widget (GTK_LABEL (label), dialog->details->server_entry);
     gtk_widget_show (dialog->details->server_entry);
 
@@ -948,6 +954,7 @@
     gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
     gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0);
     gtk_widget_show (label);
+    dialog->details->port_label = label;
 
     dialog->details->port_spinbutton =
         gtk_spin_button_new_with_range (0.0, 65535.0, 1.0);