[gnome-boxes/wip/wizard-n-props-in-win: 4/19] topbar: Remove wizard_toolbar property

[Zeeshan Ali Khattak <zeeshanak src gnome org>]

commit 1577c813fa3e41ea307cb335c35f50e6127ce00f
Author: Zeeshan Ali (Khattak) <zeeshanak gnome org>
Date:   Mon Nov 24 14:43:58 2014 +0000

    topbar: Remove wizard_toolbar property
    
    Wizard is now in its own window where it has a dedicated topbar of its
    own so WizardToolbar is not needed in main window's topbar anymore.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=733367

 data/ui/topbar.ui |   11 -----------
 src/topbar.vala   |   28 +++-------------------------
 2 files changed, 3 insertions(+), 36 deletions(-)
---
diff --git a/data/ui/topbar.ui b/data/ui/topbar.ui
index 7b70cff..cb8f57b 100644
--- a/data/ui/topbar.ui
+++ b/data/ui/topbar.ui
@@ -28,17 +28,6 @@
       </packing>
     </child>
 
-    <!-- Wizard -->
-    <child>
-      <object class="BoxesWizardToolbar" id="wizard_toolbar">
-        <property name="visible">True</property>
-      </object>
-
-      <packing>
-        <property name="name">wizard</property>
-      </packing>
-    </child>
-
     <!-- Properties -->
     <child>
       <object class="BoxesPropertiesToolbar" id="props_toolbar">
diff --git a/src/topbar.vala b/src/topbar.vala
index 52cbc10..bd66130 100644
--- a/src/topbar.vala
+++ b/src/topbar.vala
@@ -4,14 +4,13 @@ using Gtk;
 public enum Boxes.TopbarPage {
     COLLECTION,
     SELECTION,
-    WIZARD,
     PROPERTIES,
     DISPLAY
 }
 
 [GtkTemplate (ui = "/org/gnome/Boxes/ui/topbar.ui")]
 private class Boxes.Topbar: Gtk.Stack, Boxes.UI {
-    private const string[] page_names = { "collection", "selection", "wizard", "properties", "display" };
+    private const string[] page_names = { "collection", "selection", "properties", "display" };
 
     public UIState previous_ui_state { get; protected set; }
     public UIState ui_state { get; protected set; }
@@ -24,8 +23,6 @@ private class Boxes.Topbar: Gtk.Stack, Boxes.UI {
     private SelectionToolbar selection_toolbar;
     [GtkChild]
     private DisplayToolbar display_toolbar;
-    [GtkChild]
-    public WizardToolbar wizard_toolbar;
 
     private AppWindow window;
 
@@ -37,28 +34,13 @@ private class Boxes.Topbar: Gtk.Stack, Boxes.UI {
         case UIState.CREDS:
             collection_toolbar.click_back_button ();
             break;
-        case UIState.WIZARD:
-            wizard_toolbar.click_back_button ();
-            break;
         }
     }
 
-    // Clicks the appropriate forward button dependent on the ui state.
-    public void click_forward_button () {
-        wizard_toolbar.click_forward_button ();
-    }
-
     // Clicks the appropriate cancel button dependent on the ui state.
     public void click_cancel_button () {
-        switch (window.ui_state) {
-        case UIState.COLLECTION:
-            if (window.selection_mode)
-                window.selection_mode = false;
-            return;
-        case UIState.WIZARD:
-            wizard_toolbar.cancel_btn.clicked ();
-            return;
-        }
+        if (window.ui_state == UIState.COLLECTION && window.selection_mode)
+            window.selection_mode = false;
     }
 
     public void click_new_button () {
@@ -133,10 +115,6 @@ private class Boxes.Topbar: Gtk.Stack, Boxes.UI {
             page = TopbarPage.PROPERTIES;
             break;
 
-        case UIState.WIZARD:
-            page = TopbarPage.WIZARD;
-            break;
-
         default:
             break;
         }