[gnome-boxes/wip/wizard-n-props-in-dialog2: 6/10] Drop now redundant PropertiesToolbar



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

    Drop now redundant PropertiesToolbar

 data/ui/properties-toolbar.ui |   47 -----------------------------------
 data/ui/topbar.ui             |   12 ---------
 src/Makefile.am               |    1 -
 src/properties-toolbar.vala   |   54 -----------------------------------------
 src/topbar.vala               |    6 +----
 5 files changed, 1 insertions(+), 119 deletions(-)
---
diff --git a/data/ui/topbar.ui b/data/ui/topbar.ui
index cb8f57b..058d809 100644
--- a/data/ui/topbar.ui
+++ b/data/ui/topbar.ui
@@ -28,18 +28,6 @@
       </packing>
     </child>
 
-    <!-- Properties -->
-    <child>
-      <object class="BoxesPropertiesToolbar" id="props_toolbar">
-        <property name="visible">True</property>
-        <property name="show-close-button">True</property>
-      </object>
-
-      <packing>
-        <property name="name">properties</property>
-      </packing>
-    </child>
-
     <!-- Display -->
     <child>
       <object class="BoxesDisplayToolbar" id="display_toolbar">
diff --git a/src/Makefile.am b/src/Makefile.am
index 8f94e1f..831c096 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -124,7 +124,6 @@ gnome_boxes_SOURCES =                               \
        properties.vala                         \
        properties-dialog.vala                  \
        properties-sidebar.vala                 \
-       properties-toolbar.vala                 \
        remote-machine.vala                     \
        searchbar.vala                          \
        selectionbar.vala                       \
diff --git a/src/topbar.vala b/src/topbar.vala
index 9608442..f20156c 100644
--- a/src/topbar.vala
+++ b/src/topbar.vala
@@ -4,13 +4,12 @@ using Gtk;
 public enum Boxes.TopbarPage {
     COLLECTION,
     SELECTION,
-    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", "properties", "display" };
+    private const string[] page_names = { "collection", "selection", "display" };
 
     public UIState previous_ui_state { get; protected set; }
     public UIState ui_state { get; protected set; }
@@ -21,8 +20,6 @@ private class Boxes.Topbar: Gtk.Stack, Boxes.UI {
     private SelectionToolbar selection_toolbar;
     [GtkChild]
     private DisplayToolbar display_toolbar;
-    [GtkChild]
-    private PropertiesToolbar props_toolbar;
 
     private AppWindow window;
 
@@ -90,7 +87,6 @@ private class Boxes.Topbar: Gtk.Stack, Boxes.UI {
         collection_toolbar.setup_ui (window);
         selection_toolbar.setup_ui (window);
         display_toolbar.setup_ui (window);
-        props_toolbar.setup_ui (window);
     }
 
     private void ui_state_changed () {


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