[gitg/wip/repositoryprop: 2/5] Just one main toolbar instead of one per tab
- From: Jesse van den Kieboom <jessevdk src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gitg/wip/repositoryprop: 2/5] Just one main toolbar instead of one per tab
- Date: Mon, 25 Feb 2013 18:09:31 +0000 (UTC)
commit 38e63e6201af86e75fc9672c8d37e5be12071219
Author: Ignacio Casal Quinteiro <icq gnome org>
Date: Mon Oct 22 09:35:09 2012 +0200
Just one main toolbar instead of one per tab
gitg/resources/ui/gitg-window.ui | 407 ++++++++++++++++----------------------
1 files changed, 170 insertions(+), 237 deletions(-)
---
diff --git a/gitg/resources/ui/gitg-window.ui b/gitg/resources/ui/gitg-window.ui
index e9080b7..310eec3 100644
--- a/gitg/resources/ui/gitg-window.ui
+++ b/gitg/resources/ui/gitg-window.ui
@@ -21,81 +21,81 @@
<property name="default_height">600</property>
<property name="hide_titlebar_when_maximized">True</property>
<child>
- <object class="GtkNotebook" id="notebook">
+ <object class="GtkGrid" id="grid1">
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="show_tabs">False</property>
+ <property name="can_focus">False</property>
<child>
- <object class="GtkGrid" id="grid1">
+ <object class="GtkToolbar" id="toolbar1">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="hexpand">True</property>
+ <property name="toolbar_style">icons</property>
+ <property name="icon_size">2</property>
+ <style>
+ <class name="menubar"/>
+ </style>
<child>
- <object class="GtkToolbar" id="toolbar1">
+ <object class="GtkToolItem" id="toolbutton1">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="hexpand">True</property>
- <property name="toolbar_style">icons</property>
- <property name="icon_size">2</property>
<style>
- <class name="menubar"/>
+ <class name="raised"/>
</style>
<child>
- <object class="GtkToolItem" id="toolbutton1">
+ <object class="GtkAlignment" id="entry-alignment">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <style>
- <class name="raised"/>
- </style>
+ <property name="xalign">1</property>
+ <property name="xscale">0</property>
<child>
- <object class="GtkAlignment" id="entry-alignment">
+ <object class="GtkSearchEntry" id="search-entry">
+ <property name="width_request">210</property>
<property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="xalign">1</property>
- <property name="xscale">0</property>
- <child>
- <object class="GtkSearchEntry" id="search-entry">
- <property name="width_request">210</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="invisible_char">●</property>
- <property name="invisible_char_set">True</property>
- </object>
- </child>
+ <property name="can_focus">True</property>
+ <property name="invisible_char">●</property>
+ <property name="invisible_char_set">True</property>
</object>
</child>
</object>
- <packing>
- <property name="expand">True</property>
- <property name="homogeneous">True</property>
- </packing>
</child>
+ </object>
+ <packing>
+ <property name="expand">True</property>
+ <property name="homogeneous">True</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkToolItem" id="toolbutton2">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
<child>
- <object class="GtkToolItem" id="toolbutton2">
+ <object class="GtkMenuButton" id="button_config">
+ <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
- <child>
- <object class="GtkMenuButton" id="button_config">
- <property name="use_action_appearance">False</property>
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="margin_left">6</property>
- <property name="image">image_config</property>
- </object>
- </child>
+ <property name="margin_left">6</property>
+ <property name="image">image_config</property>
</object>
- <packing>
- <property name="expand">False</property>
- <property name="homogeneous">True</property>
- </packing>
</child>
</object>
<packing>
- <property name="left_attach">0</property>
- <property name="top_attach">0</property>
- <property name="width">1</property>
- <property name="height">1</property>
+ <property name="expand">False</property>
+ <property name="homogeneous">True</property>
</packing>
</child>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">0</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkNotebook" id="notebook">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="show_tabs">False</property>
<child>
<object class="GtkScrolledWindow" id="scrolled_window_dash">
<property name="visible">True</property>
@@ -118,193 +118,135 @@
</object>
</child>
</object>
- <packing>
- <property name="left_attach">0</property>
- <property name="top_attach">1</property>
- <property name="width">1</property>
- <property name="height">1</property>
- </packing>
</child>
- </object>
- </child>
- <child type="tab">
- <placeholder/>
- </child>
- <child>
- <object class="GtkGrid" id="grid2">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
+ <child type="tab">
+ <placeholder/>
+ </child>
<child>
- <object class="GtkToolbar" id="toolbar2">
+ <object class="GtkGrid" id="grid2">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="hexpand">True</property>
- <property name="toolbar_style">icons</property>
- <property name="icon_size">2</property>
- <style>
- <class name="menubar"/>
- </style>
<child>
- <object class="GtkToolItem" id="toolbutton3">
+ <object class="GtkPaned" id="paned_views">
<property name="visible">True</property>
- <property name="can_focus">False</property>
- <style>
- <class name="raised"/>
- </style>
+ <property name="can_focus">True</property>
+ <property name="hexpand">True</property>
+ <property name="vexpand">True</property>
+ <property name="position">200</property>
+ <property name="position_set">True</property>
<child>
- <object class="GtkAlignment" id="entry-alignment2">
+ <object class="GtkEventBox" id="navigation_background">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="xalign">1</property>
- <property name="xscale">0</property>
+ <style>
+ <class name="sidebar"/>
+ </style>
<child>
- <object class="GtkSearchEntry" id="search-entry2">
- <property name="width_request">210</property>
+ <object class="GtkGrid" id="grid_navigation">
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="invisible_char">●</property>
- <property name="invisible_char_set">True</property>
+ <property name="can_focus">False</property>
+ <property name="hexpand">True</property>
+ <child>
+ <object class="GtkToolbar" id="toolbar_views">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="hexpand">True</property>
+ <property name="toolbar_style">icons</property>
+ <property name="show_arrow">False</property>
+ <property name="icon_size">1</property>
+ <style>
+ <class name="inline-toolbar"/>
+ </style>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">0</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkScrolledWindow" id="scrolled_window_navigation">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="hexpand">True</property>
+ <property name="vexpand">True</property>
+ <property name="hscrollbar_policy">never</property>
+ <property name="name">scrolled_window_navigation</property>
+ <child>
+ <object class="GitgExtNavigationTreeView" id="tree_view_navigation">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="headers_visible">False</property>
+ <property name="name">tree_view_navigation</property>
+ <child internal-child="selection">
+ <object class="GtkTreeSelection"
id="gitgextnavigationtreeView-selection"/>
+ </child>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">1</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkToolbar" id="toolbar_panels">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="hexpand">True</property>
+ <property name="toolbar_style">icons</property>
+ <property name="icon_size">2</property>
+ <style>
+ <class name="inline-toolbar"/>
+ </style>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">2</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
</object>
</child>
</object>
+ <packing>
+ <property name="resize">False</property>
+ <property name="shrink">True</property>
+ </packing>
</child>
- </object>
- <packing>
- <property name="expand">True</property>
- <property name="homogeneous">True</property>
- </packing>
- </child>
- <child>
- <object class="GtkToolItem" id="toolbutton4">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <child>
- <object class="GtkMenuButton" id="button_config2">
- <property name="use_action_appearance">False</property>
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="margin_left">6</property>
- <property name="image">image_config2</property>
- </object>
- </child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="homogeneous">True</property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="left_attach">0</property>
- <property name="top_attach">0</property>
- <property name="width">1</property>
- <property name="height">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkPaned" id="paned_views">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="hexpand">True</property>
- <property name="vexpand">True</property>
- <property name="position">200</property>
- <property name="position_set">True</property>
- <child>
- <object class="GtkEventBox" id="navigation_background">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <style>
- <class name="sidebar"/>
- </style>
<child>
- <object class="GtkGrid" id="grid_navigation">
+ <object class="GtkPaned" id="paned_panels">
<property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="hexpand">True</property>
+ <property name="can_focus">True</property>
+ <property name="orientation">vertical</property>
+ <property name="position">300</property>
<child>
- <object class="GtkToolbar" id="toolbar_views">
+ <object class="GtkEventBox" id="frame_background">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="hexpand">True</property>
- <property name="toolbar_style">icons</property>
- <property name="show_arrow">False</property>
- <property name="icon_size">1</property>
- <style>
- <class name="inline-toolbar"/>
- </style>
- </object>
- <packing>
- <property name="left_attach">0</property>
- <property name="top_attach">0</property>
- <property name="width">1</property>
- <property name="height">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkScrolledWindow" id="scrolled_window_navigation">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="hexpand">True</property>
- <property name="vexpand">True</property>
- <property name="hscrollbar_policy">never</property>
- <property name="name">scrolled_window_navigation</property>
<child>
- <object class="GitgExtNavigationTreeView" id="tree_view_navigation">
+ <object class="GitgAutohideFrame" id="frame_view">
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="headers_visible">False</property>
- <property name="name">tree_view_navigation</property>
- <child internal-child="selection">
- <object class="GtkTreeSelection" id="gitgextnavigationtreeView-selection"/>
+ <property name="can_focus">False</property>
+ <property name="label_xalign">0</property>
+ <property name="shadow_type">in</property>
+ <child>
+ <placeholder/>
</child>
</object>
</child>
</object>
<packing>
- <property name="left_attach">0</property>
- <property name="top_attach">1</property>
- <property name="width">1</property>
- <property name="height">1</property>
+ <property name="resize">True</property>
+ <property name="shrink">True</property>
</packing>
</child>
<child>
- <object class="GtkToolbar" id="toolbar_panels">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="hexpand">True</property>
- <property name="toolbar_style">icons</property>
- <property name="icon_size">2</property>
- <style>
- <class name="inline-toolbar"/>
- </style>
- </object>
- <packing>
- <property name="left_attach">0</property>
- <property name="top_attach">2</property>
- <property name="width">1</property>
- <property name="height">1</property>
- </packing>
- </child>
- </object>
- </child>
- </object>
- <packing>
- <property name="resize">False</property>
- <property name="shrink">True</property>
- </packing>
- </child>
- <child>
- <object class="GtkPaned" id="paned_panels">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="orientation">vertical</property>
- <property name="position">300</property>
- <child>
- <object class="GtkEventBox" id="frame_background">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <child>
- <object class="GitgAutohideFrame" id="frame_view">
+ <object class="GitgAutohideFrame" id="frame_panel">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label_xalign">0</property>
@@ -313,6 +255,10 @@
<placeholder/>
</child>
</object>
+ <packing>
+ <property name="resize">False</property>
+ <property name="shrink">True</property>
+ </packing>
</child>
</object>
<packing>
@@ -320,45 +266,32 @@
<property name="shrink">True</property>
</packing>
</child>
- <child>
- <object class="GitgAutohideFrame" id="frame_panel">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label_xalign">0</property>
- <property name="shadow_type">in</property>
- <child>
- <placeholder/>
- </child>
- </object>
- <packing>
- <property name="resize">False</property>
- <property name="shrink">True</property>
- </packing>
- </child>
</object>
<packing>
- <property name="resize">True</property>
- <property name="shrink">True</property>
+ <property name="left_attach">0</property>
+ <property name="top_attach">1</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
</packing>
</child>
</object>
- <packing>
- <property name="left_attach">0</property>
- <property name="top_attach">1</property>
- <property name="width">1</property>
- <property name="height">1</property>
- </packing>
+ </child>
+ <child type="tab">
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child type="tab">
+ <placeholder/>
</child>
</object>
- </child>
- <child type="tab">
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child type="tab">
- <placeholder/>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">1</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
</child>
</object>
</child>
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
