Reorganise, reinstate default action

Author: jeremypw

src/Dialogs/CloneRepositoryDialog.vala

@@ -6,16 +6,13 @@
  */
 
 public class Scratch.Dialogs.CloneRepositoryDialog : Granite.MessageDialog {
-    public bool can_clone { get; private set; default = false; }
-
-
     // Git project name rules according to GitLab
     // - Must start and end with a letter ( a-zA-Z ) or digit ( 0-9 ).
     // - Can contain only letters ( a-zA-Z ), digits ( 0-9 ), underscores ( _ ), dots ( . ), or dashes ( - ).
     // - Must not contain consecutive special characters.
     // - Cannot end in . git or . atom .
-
     private const string NAME_REGEX = """^[0-9a-zA-Z].([-_.]?[0-9a-zA-Z])*$"""; //TODO additional validation required
+
     private Regex name_regex;
     private Gtk.Label projects_folder_label;
     private Granite.ValidatedEntry remote_repository_uri_entry;
@@ -25,6 +22,7 @@ public class Scratch.Dialogs.CloneRepositoryDialog : Granite.MessageDialog {
     private Gtk.Spinner spinner;
     private Gtk.Revealer revealer;
 
+    public bool can_clone { get; private set; default = false; }
     public string suggested_local_folder { get; construct; }
     public string suggested_remote { get; construct; }
 
@@ -51,24 +49,27 @@ public class Scratch.Dialogs.CloneRepositoryDialog : Granite.MessageDialog {
     construct {
         transient_for = ((Gtk.Application)(GLib.Application.get_default ())).get_active_window ();
         image_icon = new ThemedIcon ("git");
+        badge_icon = new ThemedIcon ("emblem-downloads");
         modal = true;
 
+        ///TRANSLATORS "Git" is a proper name and must not be translated
+        primary_text = _("Create a local clone of a Git repository");
+        secondary_text = _("The source repository and local folder must exist and have the required read and write permissions");
+
+        var cancel_button = add_button (_("Cancel"), Gtk.ResponseType.CANCEL);
+        clone_button = (Gtk.Button)add_button (_("Clone Repository"), Gtk.ResponseType.APPLY);
+        set_default (clone_button);
+
         try {
             name_regex = new Regex (NAME_REGEX, OPTIMIZE, ANCHORED | NOTEMPTY);
         } catch (RegexError e) {
             warning ("%s\n", e.message);
         }
 
-        var cancel_button = add_button (_("Cancel"), Gtk.ResponseType.CANCEL);
-
-        ///TRANSLATORS "Git" is a proper name and must not be translated
-        primary_text = _("Create a local clone of a Git repository");
-        secondary_text = _("The source repository and local folder must exist and have the required read and write permissions");
-        badge_icon = new ThemedIcon ("emblem-downloads");
-
         remote_repository_uri_entry = new Granite.ValidatedEntry () {
             placeholder_text = _("https://example.com/username/projectname.git"),
-            input_purpose = URL
+            input_purpose = URL,
+            activates_default = true
         };
         remote_repository_uri_entry.changed.connect (on_remote_uri_changed);
         remote_repository_uri_entry.text = suggested_remote;
@@ -109,7 +110,9 @@ public class Scratch.Dialogs.CloneRepositoryDialog : Granite.MessageDialog {
 
         });
 
-        local_project_name_entry = new Granite.ValidatedEntry ();
+        local_project_name_entry = new Granite.ValidatedEntry () {
+            activates_default = true
+        };
         local_project_name_entry.changed.connect (validate_local_name);
 
         var content_box = new Gtk.Grid ();
@@ -135,12 +138,9 @@ public class Scratch.Dialogs.CloneRepositoryDialog : Granite.MessageDialog {
         custom_bin.add (stack);
         custom_bin.show_all ();
 
-        clone_button = (Gtk.Button)add_button (_("Clone Repository"), Gtk.ResponseType.APPLY);
         bind_property ("can-clone", clone_button, "sensitive", DEFAULT | SYNC_CREATE);
         spinner.bind_property ("active", clone_button, "visible", INVERT_BOOLEAN);
         spinner.bind_property ("active", cancel_button, "visible", INVERT_BOOLEAN);
-        //Do not want to connect to "is-valid" property notification as this gets changed to "true" every time the entry
-        //text changed. So call explicitly after we validate the text.
         can_clone = false;
 
         // Focus cancel button so that entry placeholder text shows