commit 325a6438954a49ea0cd0f4761ce1ada97e2cf099
Author: Álvaro Peña <alvaropg gmail com>
Date: Sun Aug 30 17:06:35 2015 +0200
UI: Removed unnecesary GtkVBox in main window
src/ui/almanah.ui | 270 ++++++++++++++++++++++++++---------------------------
1 files changed, 133 insertions(+), 137 deletions(-)
---
diff --git a/src/ui/almanah.ui b/src/ui/almanah.ui
index 1576059..d1b76d4 100644
--- a/src/ui/almanah.ui
+++ b/src/ui/almanah.ui
@@ -70,182 +70,178 @@
<object class="AlmanahMainWindow" id="almanah_main_window">
<property name="hide-titlebar-when-maximized">True</property>
- <property name="default-width">640</property>
- <property name="default-height">480</property>
+ <property name="default-width">640</property>
+ <property name="default-height">480</property>
<child>
- <object class="GtkVBox" id="vbox1">
+ <object class="GtkVBox" id="vbox3">
+ <property name="spacing">6</property>
<child>
- <object class="GtkVBox" id="vbox3">
- <property name="spacing">6</property>
+ <object class="GtkGrid" id="content_grid">
+ <property
name="orientation">GTK_ORIENTATION_VERTICAL</property>
+ <property name="row_spacing">0</property>
+ <style>
+ <class name="almanah-mw-main-content"/>
+ </style>
<child>
- <object class="GtkGrid" id="content_grid">
- <property
name="orientation">GTK_ORIENTATION_VERTICAL</property>
- <property name="row_spacing">0</property>
+ <object class="AlmanahEntryTagsArea"
id="almanah_mw_entry_tags_area">
+ <property name="visible">False</property>
+ <property name="no-show-all">True</property>
+ <property name="vexpand">False</property>
+ <property name="hexpand">True</property>
+ <property
name="horizontal-spacing">6</property>
+ <property name="vertical-spacing">6</property>
+ <property name="margin_top">0</property>
+ <property name="margin_start">0</property>
+ <property name="margin_end">0</property>
+ <property name="margin_bottom">0</property>
+ <property name="border-width">6</property>
+ </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="almanah_mw_main_content_scrolled_window">
+ <property name="can-focus">True</property>
+ <property
name="hscrollbar-policy">GTK_POLICY_AUTOMATIC</property>
+ <property
name="vscrollbar-policy">GTK_POLICY_AUTOMATIC</property>
+ <property
name="shadow-type">GTK_SHADOW_IN</property>
+ <property name="hexpand">True</property>
+ <property name="vexpand">True</property>
<style>
- <class
name="almanah-mw-main-content"/>
+ <class
name="almanah-main-content-scrolled"/>
</style>
<child>
- <object class="AlmanahEntryTagsArea"
id="almanah_mw_entry_tags_area">
- <property
name="visible">False</property>
- <property
name="no-show-all">True</property>
- <property
name="vexpand">False</property>
- <property
name="hexpand">True</property>
- <property
name="horizontal-spacing">6</property>
- <property
name="vertical-spacing">6</property>
- <property
name="margin_top">0</property>
- <property
name="margin_start">0</property>
- <property
name="margin_end">0</property>
- <property
name="margin_bottom">0</property>
- <property
name="border-width">6</property>
+ <object class="GtkTextView"
id="almanah_mw_entry_view">
+ <property
name="width-request">300</property>
+ <property
name="height-request">300</property>
+ <property
name="can-focus">True</property>
+ <property
name="has-focus">True</property>
+ <property
name="wrap-mode">GTK_WRAP_WORD</property>
+ <property
name="margin_top">6</property>
+ <property
name="margin_start">10</property>
+ <property
name="margin_end">10</property>
+ <property
name="margin_top">4</property>
+ <child
internal-child="accessible">
+ <object
class="AtkObject" id="a11y-almanah_mw_entry_view">
+ <property
name="AtkObject::accessible-name" translatable="yes">Entry editing area</property>
+ </object>
+ </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>
+ </object>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkExpander" id="almanah_mw_events_expander">
+ <child type="label">
+ <object class="GtkHBox"
id="almanah_mw_events_expander_label_box">
+ <property name="spacing">6</property>
+ <child>
+ <object class="GtkLabel"
id="almanah_mw_events_label">
+ <property name="label"
translatable="yes">Past events</property>
+ <accessibility>
+ <relation
target="almanah_mw_events_tree_view" type="label-for"/>
+ </accessibility>
+ <attributes>
+ <attribute
name="weight" value="PANGO_WEIGHT_BOLD"/>
+ </attributes>
</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="fill">True</property>
</packing>
</child>
<child>
- <object class="GtkScrolledWindow"
id="almanah_mw_main_content_scrolled_window">
- <property
name="can-focus">True</property>
- <property
name="hscrollbar-policy">GTK_POLICY_AUTOMATIC</property>
- <property
name="vscrollbar-policy">GTK_POLICY_AUTOMATIC</property>
- <property
name="shadow-type">GTK_SHADOW_IN</property>
- <property
name="hexpand">True</property>
- <property
name="vexpand">True</property>
- <style>
- <class
name="almanah-main-content-scrolled"/>
- </style>
- <child>
- <object
class="GtkTextView" id="almanah_mw_entry_view">
- <property
name="width-request">300</property>
- <property
name="height-request">300</property>
- <property
name="can-focus">True</property>
- <property
name="has-focus">True</property>
- <property
name="wrap-mode">GTK_WRAP_WORD</property>
- <property
name="margin_top">6</property>
- <property
name="margin_start">10</property>
- <property
name="margin_end">10</property>
- <property
name="margin_top">4</property>
- <child
internal-child="accessible">
-
<object class="AtkObject" id="a11y-almanah_mw_entry_view">
-
<property name="AtkObject::accessible-name" translatable="yes">Entry editing area</property>
-
</object>
- </child>
- </object>
- </child>
+ <object class="GtkLabel"
id="almanah_mw_events_count_label">
</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="expand">False</property>
+ <property
name="fill">True</property>
</packing>
</child>
</object>
- <packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
- </packing>
</child>
<child>
- <object class="GtkExpander"
id="almanah_mw_events_expander">
- <child type="label">
- <object class="GtkHBox"
id="almanah_mw_events_expander_label_box">
- <property
name="spacing">6</property>
- <child>
- <object
class="GtkLabel" id="almanah_mw_events_label">
- <property
name="label" translatable="yes">Past events</property>
-
<accessibility>
-
<relation target="almanah_mw_events_tree_view" type="label-for"/>
-
</accessibility>
- <attributes>
-
<attribute name="weight" value="PANGO_WEIGHT_BOLD"/>
- </attributes>
+ <object class="GtkScrolledWindow"
id="scrolledwindow2">
+ <property name="can-focus">True</property>
+ <property
name="hscrollbar-policy">GTK_POLICY_AUTOMATIC</property>
+ <property
name="vscrollbar-policy">GTK_POLICY_AUTOMATIC</property>
+ <property
name="shadow-type">GTK_SHADOW_IN</property>
+ <child>
+ <object class="GtkTreeView"
id="almanah_mw_events_tree_view">
+ <property
name="model">almanah_mw_event_store</property>
+ <property
name="can-focus">True</property>
+ <property
name="headers-visible">False</property>
+ <signal name="row-activated"
handler="mw_events_tree_view_row_activated_cb"/>
+ <accessibility>
+ <relation
target="almanah_mw_events_label" type="labelled-by"/>
+ </accessibility>
+ <child
internal-child="accessible">
+ <object
class="AtkObject" id="a11y-almanah_mw_events_tree_view">
+ <property
name="AtkObject::accessible-name" translatable="yes">Past Event List</property>
</object>
- <packing>
- <property
name="expand">False</property>
- <property
name="fill">True</property>
- </packing>
</child>
<child>
- <object
class="GtkLabel" id="almanah_mw_events_count_label">
+ <object
class="GtkTreeViewColumn" id="column3">
+ <child>
+
<object class="GtkCellRendererPixbuf" id="renderer3"/>
+
<attributes>
+
<attribute name="icon-name">1</attribute>
+
</attributes>
+ </child>
</object>
- <packing>
- <property
name="expand">False</property>
- <property
name="fill">True</property>
- </packing>
</child>
- </object>
- </child>
- <child>
- <object class="GtkScrolledWindow"
id="scrolledwindow2">
- <property
name="can-focus">True</property>
- <property
name="hscrollbar-policy">GTK_POLICY_AUTOMATIC</property>
- <property
name="vscrollbar-policy">GTK_POLICY_AUTOMATIC</property>
- <property
name="shadow-type">GTK_SHADOW_IN</property>
<child>
- <object
class="GtkTreeView" id="almanah_mw_events_tree_view">
- <property
name="model">almanah_mw_event_store</property>
- <property
name="can-focus">True</property>
- <property
name="headers-visible">False</property>
- <signal
name="row-activated" handler="mw_events_tree_view_row_activated_cb"/>
-
<accessibility>
-
<relation target="almanah_mw_events_label" type="labelled-by"/>
-
</accessibility>
- <child
internal-child="accessible">
-
<object class="AtkObject" id="a11y-almanah_mw_events_tree_view">
-
<property name="AtkObject::accessible-name" translatable="yes">Past Event List</property>
-
</object>
- </child>
- <child>
-
<object class="GtkTreeViewColumn" id="column3">
-
<child>
-
<object class="GtkCellRendererPixbuf" id="renderer3"/>
-
<attributes>
-
<attribute name="icon-name">1</attribute>
-
</attributes>
-
</child>
-
</object>
- </child>
+ <object
class="GtkTreeViewColumn" id="almanah_mw_event_value_column">
+ <property
name="expand">True</property>
<child>
-
<object class="GtkTreeViewColumn" id="almanah_mw_event_value_column">
-
<property name="expand">True</property>
-
<child>
-
<object class="GtkCellRendererText" id="almanah_mw_event_value_renderer"/>
-
<attributes>
-
<attribute name="text">3</attribute>
-
</attributes>
-
</child>
-
</object>
+
<object class="GtkCellRendererText" id="almanah_mw_event_value_renderer"/>
+
<attributes>
+
<attribute name="text">3</attribute>
+
</attributes>
</child>
+ </object>
+ </child>
+ <child>
+ <object
class="GtkTreeViewColumn" id="almanah_mw_event_source_column">
<child>
-
<object class="GtkTreeViewColumn" id="almanah_mw_event_source_column">
-
<child>
-
<object class="GtkCellRendererText" id="almanah_mw_event_source_renderer"/>
-
<attributes>
-
<attribute name="markup">4</attribute>
-
</attributes>
-
</child>
-
</object>
+
<object class="GtkCellRendererText" id="almanah_mw_event_source_renderer"/>
+
<attributes>
+
<attribute name="markup">4</attribute>
+
</attributes>
</child>
</object>
</child>
</object>
</child>
</object>
- <packing>
- <property name="fill">False</property>
- <property name="expand">False</property>
- </packing>
</child>
</object>
<packing>
- <property name="fill">True</property>
- <property name="expand">True</property>
+ <property name="fill">False</property>
+ <property name="expand">False</property>
</packing>
</child>
</object>
+ <packing>
+ <property name="fill">True</property>
+ <property name="expand">True</property>
+ </packing>
</child>
</object>