[gnome-boxes] wizard: Move to 'Preparation' once file/media is selected



commit 594c3d3bdbff89fbc600b48bb367fdaec9714dce
Author: Zeeshan Ali (Khattak) <zeeshanak gnome org>
Date:   Thu Feb 9 21:30:52 2012 +0200

    wizard: Move to 'Preparation' once file/media is selected
    
    We were just going to URI page when user chose a file or media and had
    to click 'Continue'. Not only there was an unneeded click required,
    there is also no need to show URI to user.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=669771

 src/wizard-source.vala |    4 ++--
 src/wizard.vala        |   21 ++++++++++-----------
 2 files changed, 12 insertions(+), 13 deletions(-)
---
diff --git a/src/wizard-source.vala b/src/wizard-source.vala
index b5f3802..0f6c15c 100644
--- a/src/wizard-source.vala
+++ b/src/wizard-source.vala
@@ -138,7 +138,7 @@ private class Boxes.WizardSource: GLib.Object {
         var hbox = add_entry (main_menubox, () => {
             install_media = media;
             uri = media.device_file;
-            page = SourcePage.URL;
+            url_entry.activate ();
         }, 5, 10, true, media.device_file + "-item");
 
         var image = new Gtk.Image.from_icon_name ("media-optical", 0);
@@ -203,7 +203,7 @@ private class Boxes.WizardSource: GLib.Object {
         dialog.local_only = true;
         if (dialog.run () == Gtk.ResponseType.ACCEPT) {
             uri = dialog.get_uri ();
-            page = SourcePage.URL;
+            url_entry.activate ();
         }
 
         dialog.hide ();
diff --git a/src/wizard.vala b/src/wizard.vala
index 2f6325c..dc1f753 100644
--- a/src/wizard.vala
+++ b/src/wizard.vala
@@ -228,17 +228,16 @@ private class Boxes.Wizard: Boxes.UI {
     }
 
     private void prepare () throws GLib.Error {
-        if (this.wizard_source.page == Boxes.SourcePage.URL)
-            if (this.wizard_source.install_media != null) {
-                install_media = this.wizard_source.install_media;
-                prep_progress.fraction = 1.0;
-                Idle.add (() => {
-                    page = page + 1;
-
-                    return false;
-                });
-            } else
-                prepare_for_location (this.wizard_source.uri);
+        if (this.wizard_source.install_media != null) {
+            install_media = this.wizard_source.install_media;
+            prep_progress.fraction = 1.0;
+            Idle.add (() => {
+                page = page + 1;
+
+                return false;
+            });
+        } else
+            prepare_for_location (this.wizard_source.uri);
     }
 
     private bool setup () {



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]