[gnome-builder] Revert "drawer: stub out drawer code for workbench sidebar"



commit 8dd2b77b2dee4c8f539ebe69d3f1e2bdfcb8e48f
Author: Christian Hergert <christian hergert me>
Date:   Mon Nov 10 04:33:51 2014 -0800

    Revert "drawer: stub out drawer code for workbench sidebar"
    
    This reverts commit cbc64b9a33730cc1d6dd7031d4310df1a598a77c.

 src/drawer/gb-drawer.c           |  147 --------------------------------------
 src/drawer/gb-drawer.h           |   59 ---------------
 src/gnome-builder.mk             |    3 -
 src/resources/ui/gb-workbench.ui |   76 ++++++++-----------
 src/workbench/gb-workbench.c     |    2 -
 5 files changed, 32 insertions(+), 255 deletions(-)
---
diff --git a/src/gnome-builder.mk b/src/gnome-builder.mk
index 8e4c756..eb2b730 100644
--- a/src/gnome-builder.mk
+++ b/src/gnome-builder.mk
@@ -41,8 +41,6 @@ libgnome_builder_la_SOURCES = \
        src/devhelp/gb-devhelp-tab.h \
        src/devhelp/gb-devhelp-workspace.c \
        src/devhelp/gb-devhelp-workspace.h \
-       src/drawer/gb-drawer.c \
-       src/drawer/gb-drawer.h \
        src/editor/c-parse-helper.c \
        src/editor/c-parse-helper.h \
        src/editor/gb-editor-code-assistant.c \
@@ -191,7 +189,6 @@ libgnome_builder_la_CFLAGS = \
        -I$(top_srcdir)/src/auto-indent \
        -I$(top_srcdir)/src/commands \
        -I$(top_srcdir)/src/devhelp \
-       -I$(top_srcdir)/src/drawer \
        -I$(top_srcdir)/src/editor \
        -I$(top_srcdir)/src/gca \
        -I$(top_srcdir)/src/gd \
diff --git a/src/resources/ui/gb-workbench.ui b/src/resources/ui/gb-workbench.ui
index a2491c7..c6e3a1c 100644
--- a/src/resources/ui/gb-workbench.ui
+++ b/src/resources/ui/gb-workbench.ui
@@ -137,64 +137,52 @@
           </object>
         </child>
         <child>
-          <object class="GtkPaned" id="main_paned">
+          <object class="GtkBox" id="main_hbox">
             <property name="orientation">horizontal</property>
             <property name="visible">True</property>
-            <property name="position">250</property>
             <child>
-              <object class="GbDrawer" id="drawer">
+              <object class="GtkStackSwitcher" id="switcher">
                 <property name="visible">False</property>
+                <property name="stack">stack</property>
+                <property name="orientation">vertical</property>
+                <property name="border_width">4</property>
+                <property name="spacing">4</property>
+                <style>
+                  <class name="gb-workspace-switcher"/>
+                </style>
+              </object>
+            </child>
+            <child>
+              <object class="GtkSeparator" id="sidebar_separator">
+                <property name="visible">False</property>
+                <property name="orientation">vertical</property>
               </object>
             </child>
             <child>
-              <object class="GtkBox" id="main_hbox">
-                <property name="orientation">horizontal</property>
+              <object class="GtkStack" id="stack">
                 <property name="visible">True</property>
+                <property name="transition_type">GTK_STACK_TRANSITION_TYPE_SLIDE_UP_DOWN</property>
                 <child>
-                  <object class="GtkStackSwitcher" id="switcher">
-                    <property name="visible">False</property>
-                    <property name="stack">stack</property>
-                    <property name="orientation">vertical</property>
-                    <property name="border_width">4</property>
-                    <property name="spacing">4</property>
-                    <style>
-                      <class name="gb-workspace-switcher"/>
-                    </style>
-                  </object>
-                </child>
-                <child>
-                  <object class="GtkSeparator" id="sidebar_separator">
-                    <property name="visible">False</property>
-                    <property name="orientation">vertical</property>
+                  <object class="GbEditorWorkspace" id="editor">
+                    <property name="name">editor</property>
+                    <property name="visible">True</property>
                   </object>
+                  <packing>
+                    <property name="icon_name">text-editor-symbolic</property>
+                    <property name="name">editor</property>
+                    <property name="title" translatable="yes">Editor</property>
+                  </packing>
                 </child>
                 <child>
-                  <object class="GtkStack" id="stack">
+                  <object class="GbDevhelpWorkspace" id="devhelp">
+                    <property name="name">devhelp</property>
                     <property name="visible">True</property>
-                    <property name="transition_type">GTK_STACK_TRANSITION_TYPE_SLIDE_UP_DOWN</property>
-                    <child>
-                      <object class="GbEditorWorkspace" id="editor">
-                        <property name="name">editor</property>
-                        <property name="visible">True</property>
-                      </object>
-                      <packing>
-                        <property name="icon_name">text-editor-symbolic</property>
-                        <property name="name">editor</property>
-                        <property name="title" translatable="yes">Editor</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GbDevhelpWorkspace" id="devhelp">
-                        <property name="name">devhelp</property>
-                        <property name="visible">True</property>
-                      </object>
-                      <packing>
-                        <property name="name">devhelp</property>
-                        <property name="icon_name">help-browser-symbolic</property>
-                        <property name="title" translatable="yes">Documentation</property>
-                      </packing>
-                    </child>
                   </object>
+                  <packing>
+                    <property name="name">devhelp</property>
+                    <property name="icon_name">help-browser-symbolic</property>
+                    <property name="title" translatable="yes">Documentation</property>
+                  </packing>
                 </child>
               </object>
             </child>
diff --git a/src/workbench/gb-workbench.c b/src/workbench/gb-workbench.c
index 8ee00b6..adccc99 100644
--- a/src/workbench/gb-workbench.c
+++ b/src/workbench/gb-workbench.c
@@ -25,7 +25,6 @@
 #include "gb-command-manager.h"
 #include "gb-command-vim-provider.h"
 #include "gb-devhelp-workspace.h"
-#include "gb-drawer.h"
 #include "gb-editor-workspace.h"
 #include "gb-log.h"
 #include "gb-widget.h"
@@ -543,7 +542,6 @@ gb_workbench_class_init (GbWorkbenchClass *klass)
 
   g_type_ensure (GB_TYPE_COMMAND_BAR);
   g_type_ensure (GB_TYPE_DEVHELP_WORKSPACE);
-  g_type_ensure (GB_TYPE_DRAWER);
   g_type_ensure (GB_TYPE_EDITOR_WORKSPACE);
   g_type_ensure (GEDIT_TYPE_MENU_STACK_SWITCHER);
 }


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