[gnome-builder/wip/chergert/headerbar] editor: remove titlebar



commit 217db7dea63c51a55579a687b45bb1add8c2e6ad
Author: Christian Hergert <christian hergert me>
Date:   Fri Jun 24 20:16:13 2016 -0700

    editor: remove titlebar
    
    We are using a shared titlebar now, so this can go away.

 libide/editor/ide-editor-perspective.c  |   22 ----------
 libide/editor/ide-editor-perspective.ui |   67 -------------------------------
 2 files changed, 0 insertions(+), 89 deletions(-)
---
diff --git a/libide/editor/ide-editor-perspective.c b/libide/editor/ide-editor-perspective.c
index e66000a..68953ed 100644
--- a/libide/editor/ide-editor-perspective.c
+++ b/libide/editor/ide-editor-perspective.c
@@ -38,7 +38,6 @@ struct _IdeEditorPerspective
   IdeLayout              parent_instance;
 
   IdeLayoutGrid         *grid;
-  IdeWorkbenchHeaderBar *titlebar;
   GSimpleActionGroup    *actions;
 
   EggSignalGroup        *buffer_manager_signals;
@@ -272,18 +271,6 @@ ide_editor_perspective_notify_focus_buffer (IdeEditorPerspective *self,
 }
 
 static void
-global_search_activate (GSimpleAction *action,
-                        GVariant      *param,
-                        gpointer       user_data)
-{
-  IdeEditorPerspective *self = user_data;
-
-  g_assert (IDE_IS_EDITOR_PERSPECTIVE (self));
-
-  ide_workbench_header_bar_focus_search (self->titlebar);
-}
-
-static void
 new_file_activate (GSimpleAction *action,
                    GVariant      *param,
                    gpointer       user_data)
@@ -376,7 +363,6 @@ ide_editor_perspective_class_init (IdeEditorPerspectiveClass *klass)
   gtk_widget_class_set_template_from_resource (widget_class, 
"/org/gnome/builder/ui/ide-editor-perspective.ui");
   gtk_widget_class_bind_template_child (widget_class, IdeEditorPerspective, actions);
   gtk_widget_class_bind_template_child (widget_class, IdeEditorPerspective, grid);
-  gtk_widget_class_bind_template_child (widget_class, IdeEditorPerspective, titlebar);
 
   signals[VIEW_ADDED] =
     g_signal_new ("view-added",
@@ -410,7 +396,6 @@ ide_editor_perspective_init (IdeEditorPerspective *self)
   };
   static const GActionEntry entries[] = {
     { "new-file", new_file_activate },
-    { "global-search", global_search_activate },
   };
 
   GActionGroup *actions;
@@ -463,12 +448,6 @@ ide_editor_perspective_get_title (IdePerspective *perspective)
   return g_strdup (_("Editor"));
 }
 
-static GtkWidget *
-ide_editor_perspective_get_titlebar (IdePerspective *perspective)
-{
-  return GTK_WIDGET (IDE_EDITOR_PERSPECTIVE (perspective)->titlebar);
-}
-
 static gchar *
 ide_editor_perspective_get_icon_name (IdePerspective *perspective)
 {
@@ -523,7 +502,6 @@ ide_perspective_iface_init (IdePerspectiveInterface *iface)
   iface->get_icon_name = ide_editor_perspective_get_icon_name;
   iface->get_id = ide_editor_perspective_get_id;
   iface->get_title = ide_editor_perspective_get_title;
-  iface->get_titlebar = ide_editor_perspective_get_titlebar;
   iface->views_foreach = ide_editor_perspective_views_foreach;
 }
 
diff --git a/libide/editor/ide-editor-perspective.ui b/libide/editor/ide-editor-perspective.ui
index 55bb06b..e506ae5 100644
--- a/libide/editor/ide-editor-perspective.ui
+++ b/libide/editor/ide-editor-perspective.ui
@@ -61,73 +61,6 @@
       </object>
     </child>
   </template>
-  <object class="IdeWorkbenchHeaderBar" id="titlebar">
-    <property name="visible">true</property>
-    <child>
-      <object class="GtkBox">
-        <property name="orientation">horizontal</property>
-        <property name="visible">true</property>
-        <style>
-          <class name="linked"/>
-        </style>
-        <child>
-          <object class="GtkToggleButton">
-            <property name="action-name">dockbin.left-visible</property>
-            <property name="tooltip-text" translatable="yes">Enable / Disable left panel. Shortcut: 
F9</property>
-            <property name="focus-on-click">false</property>
-            <property name="visible">true</property>
-            <style>
-              <class name="image-button"/>
-            </style>
-            <child>
-              <object class="GtkImage">
-                <property name="icon-name">builder-view-left-pane-symbolic</property>
-                <property name="visible">true</property>
-              </object>
-            </child>
-          </object>
-        </child>
-        <child>
-          <object class="GtkToggleButton">
-            <property name="action-name">dockbin.bottom-visible</property>
-            <property name="tooltip-text" translatable="yes">Enable / Disable bottom panel. Shortcut: Ctrl + 
F9</property>
-            <property name="focus-on-click">false</property>
-            <property name="visible">true</property>
-            <style>
-              <class name="image-button"/>
-            </style>
-            <child>
-              <object class="GtkImage">
-                <property name="icon-name">builder-view-bottom-pane-symbolic</property>
-                <property name="visible">true</property>
-              </object>
-            </child>
-          </object>
-        </child>
-        <child>
-          <object class="GtkToggleButton">
-            <property name="action-name">dockbin.right-visible</property>
-            <property name="tooltip-text" translatable="yes">Enable / Disable right panel. Shortcut: Shift + 
F9</property>
-            <property name="focus-on-click">false</property>
-            <property name="visible">true</property>
-            <style>
-              <class name="image-button"/>
-            </style>
-            <child>
-              <object class="GtkImage">
-                <property name="icon-name">builder-view-right-pane-symbolic</property>
-                <property name="visible">true</property>
-              </object>
-            </child>
-          </object>
-        </child>
-      </object>
-      <packing>
-        <property name="position">1</property>
-        <property name="pack-type">end</property>
-      </packing>
-    </child>
-  </object>
   <object class="GSimpleActionGroup" id="actions">
   </object>
 </interface>


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