[gnome-boxes/wip/wizard-n-props-in-win: 7/19] Drop WizardSidebar



commit 5213c9d09d0550ecc19243bc4f0da893004d64ca
Author: Zeeshan Ali (Khattak) <zeeshanak gnome org>
Date:   Fri Nov 21 18:53:30 2014 +0000

    Drop WizardSidebar
    
    Drop the sidebar from wizard. It looks weird now in the wizard window
    and what little functionality it provides has already been replaced by
    previous patches in this series.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=733367

 data/gnome-boxes.gresource.xml |    1 -
 data/ui/wizard-sidebar.ui      |   94 ----------------------------------------
 data/ui/wizard-window.ui       |   37 +---------------
 src/Makefile.am                |    1 -
 src/wizard-sidebar.vala        |   42 ------------------
 src/wizard-window.vala         |    2 -
 src/wizard.vala                |    1 -
 7 files changed, 2 insertions(+), 176 deletions(-)
---
diff --git a/data/gnome-boxes.gresource.xml b/data/gnome-boxes.gresource.xml
index 3eb6111..8d4aae5 100644
--- a/data/gnome-boxes.gresource.xml
+++ b/data/gnome-boxes.gresource.xml
@@ -24,7 +24,6 @@
     <file preprocess="xml-stripblanks">ui/wizard.ui</file>
     <file preprocess="xml-stripblanks">ui/wizard-media-entry.ui</file>
     <file preprocess="xml-stripblanks">ui/wizard-scrolled.ui</file>
-    <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>
diff --git a/data/ui/wizard-window.ui b/data/ui/wizard-window.ui
index 616f6d0..02ee9d4 100644
--- a/data/ui/wizard-window.ui
+++ b/data/ui/wizard-window.ui
@@ -6,13 +6,7 @@
 
      Boxes.WizardWindow : Gtk.Window
         |
-        |-> vbox (internal child)
-        |     |
-        |     |-> hbox = new Gtk.Box (Gtk.Orientation.HORIZONTAL, 0);
-        |     |
-        |     |-> sidebar = new Boxes.WizardSidebar ();
-        |     |
-        |     |-> wizard = new Boxes.Wizard ();
+        |-> wizard = new Boxes.Wizard ();
         |
         |-> topbar = new Boxes.WizardTopbar (); // as titlebar
   -->
@@ -27,35 +21,8 @@
     <signal name="delete-event" handler="on_delete_event"/>
 
     <child>
-      <object class="GtkBox" id="vbox">
+      <object class="BoxesWizard" id="wizard">
         <property name="visible">True</property>
-        <property name="spacing">10</property>
-
-        <child>
-          <object class="GtkBox" id="hbox">
-            <property name="visible">True</property>
-            <property name="orientation">horizontal</property>
-            <property name="halign">fill</property>
-            <property name="valign">fill</property>
-            <property name="hexpand">True</property>
-            <property name="vexpand">True</property>
-            <property name="spacing">10</property>
-
-            <child>
-              <object class="BoxesWizardSidebar" id="sidebar">
-                <property name="visible">True</property>
-              </object>
-            </child>
-
-            <child>
-              <object class="BoxesWizard" id="wizard">
-                <property name="visible">True</property>
-              </object>
-            </child>
-
-          </object>
-        </child>
-
       </object>
     </child>
 
diff --git a/src/Makefile.am b/src/Makefile.am
index 5539fdb..b89484d 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -144,7 +144,6 @@ gnome_boxes_SOURCES =                               \
        libvirt-system-vm-importer.vala         \
        vnc-display.vala                        \
        wizard-window.vala                      \
-       wizard-sidebar.vala                     \
        wizard-source.vala                      \
        wizard-toolbar.vala                     \
        wizard.vala                             \
diff --git a/src/wizard-window.vala b/src/wizard-window.vala
index c419e0d..29e3d65 100644
--- a/src/wizard-window.vala
+++ b/src/wizard-window.vala
@@ -7,8 +7,6 @@ private class Boxes.WizardWindow : Gtk.Window, Boxes.UI {
     public UIState ui_state { get; protected set; }
 
     [GtkChild]
-    public WizardSidebar sidebar;
-    [GtkChild]
     public Wizard wizard;
     [GtkChild]
     public WizardToolbar topbar;
diff --git a/src/wizard.vala b/src/wizard.vala
index c963908..905d9cc 100644
--- a/src/wizard.vala
+++ b/src/wizard.vala
@@ -135,7 +135,6 @@ private class Boxes.Wizard: Gtk.Stack, Boxes.UI {
                 return;
 
             _page = value;
-            window.wizard_window.sidebar.set_page (value);
             window.wizard_window.set_title_for_page (value);
             visible_child_name = page_names[value];
 


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