[gnome-boxes/wip/wizard-n-props-in-dialog2: 229/233] Drop now redundant WizardToolbar

[Zeeshan Ali Khattak <zeeshanak src gnome org>]

commit 9e5723a995a16a041d62fe429a779bd521a218b7
Author: Zeeshan Ali (Khattak) <zeeshanak gnome org>
Date:   Thu Aug 28 19:11:40 2014 +0100

    Drop now redundant WizardToolbar
    
    https://bugzilla.gnome.org/show_bug.cgi?id=733367

 data/gnome-boxes.gresource.xml |    1 -
 data/ui/topbar.ui              |   11 -----
 data/ui/wizard-toolbar.ui      |   95 ----------------------------------------
 src/Makefile.am                |    1 -
 src/topbar.vala                |   35 ++-------------
 src/wizard-toolbar.vala        |   24 ----------
 6 files changed, 4 insertions(+), 163 deletions(-)
---
diff --git a/data/gnome-boxes.gresource.xml b/data/gnome-boxes.gresource.xml
index 4d518f5..96c9a15 100644
--- a/data/gnome-boxes.gresource.xml
+++ b/data/gnome-boxes.gresource.xml
@@ -27,7 +27,6 @@
     <file preprocess="xml-stripblanks">ui/wizard-sidebar.ui</file>
     <file preprocess="xml-stripblanks">ui/wizard-source.ui</file>
     <file preprocess="xml-stripblanks">ui/wizard-summary.ui</file>
-    <file preprocess="xml-stripblanks">ui/wizard-toolbar.ui</file>
     <file preprocess="xml-stripblanks">ui/wizard-dialog.ui</file>
     <file preprocess="xml-stripblanks">ui/snapshot-list-row.ui</file>
   </gresource>
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/Makefile.am b/src/Makefile.am
index d33607a..9cca2aa 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -146,7 +146,6 @@ gnome_boxes_SOURCES =                               \
        wizard-dialog.vala                      \
        wizard-sidebar.vala                     \
        wizard-source.vala                      \
-       wizard-toolbar.vala                     \
        wizard.vala                             \
        downloader.vala                         \
        empty-boxes.vala                        \
diff --git a/src/topbar.vala b/src/topbar.vala
index 52cbc10..197be43 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,41 +23,19 @@ 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;
 
     // Clicks the appropriate back button depending on the ui state.
     public void click_back_button () {
-        switch (window.ui_state) {
-        case UIState.PROPERTIES:
-            break;
-        case UIState.CREDS:
+        if (window.ui_state == 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 +110,6 @@ private class Boxes.Topbar: Gtk.Stack, Boxes.UI {
             page = TopbarPage.PROPERTIES;
             break;
 
-        case UIState.WIZARD:
-            page = TopbarPage.WIZARD;
-            break;
-
         default:
             break;
         }