[epiphany] history-dialog.ui: Kill a level of GtkBox, as headerbar is requested.



commit a2c792ee5fb3f4c59e034ff4e814a97b4aa3df3f
Author: Arnaud Bonatti <arnaud bonatti gmail com>
Date:   Wed Oct 28 05:09:32 2015 +0100

    history-dialog.ui: Kill a level of GtkBox, as headerbar is requested.

 src/resources/history-dialog.ui |  239 +++++++++++++++++++--------------------
 1 files changed, 115 insertions(+), 124 deletions(-)
---
diff --git a/src/resources/history-dialog.ui b/src/resources/history-dialog.ui
index 0ab9393..cab1999 100644
--- a/src/resources/history-dialog.ui
+++ b/src/resources/history-dialog.ui
@@ -40,179 +40,170 @@
     </child>
     <child internal-child="vbox">
       <object class="GtkBox">
-        <property name="visible">True</property>
-        <property name="orientation">vertical</property>
-        <property name="spacing">2</property>
+        <property name="border_width">5</property>
+        <property name="spacing">6</property>
+        <child>
+          <object class="GtkSearchEntry">
+            <property name="visible">True</property>
+            <property name="primary_icon_name">edit-find-symbolic</property>
+            <property name="primary_icon_activatable">False</property>
+            <property name="primary_icon_sensitive">False</property>
+            <property name="placeholder_text" translatable="yes">Search history</property>
+            <signal name="search-changed" handler="on_search_entry_changed"/>
+          </object>
+        </child>
         <child>
           <object class="GtkBox">
             <property name="visible">True</property>
-            <property name="border_width">5</property>
             <property name="orientation">vertical</property>
-            <property name="spacing">6</property>
-            <child>
-              <object class="GtkSearchEntry">
-                <property name="visible">True</property>
-                <property name="primary_icon_name">edit-find-symbolic</property>
-                <property name="primary_icon_activatable">False</property>
-                <property name="primary_icon_sensitive">False</property>
-                <property name="placeholder_text" translatable="yes">Search history</property>
-                <signal name="search-changed" handler="on_search_entry_changed"/>
-              </object>
-            </child>
             <child>
-              <object class="GtkBox">
+              <object class="GtkScrolledWindow">
+                <property name="width_request">400</property>
+                <property name="height_request">300</property>
                 <property name="visible">True</property>
-                <property name="orientation">vertical</property>
+                <property name="expand">True</property>
+                <property name="shadow_type">in</property>
+                <property name="min_content_width">300</property>
+                <property name="min_content_height">300</property>
                 <child>
-                  <object class="GtkScrolledWindow">
-                    <property name="width_request">400</property>
-                    <property name="height_request">300</property>
+                  <object class="GtkTreeView" id="treeview">
                     <property name="visible">True</property>
-                    <property name="expand">True</property>
-                    <property name="shadow_type">in</property>
-                    <property name="min_content_width">300</property>
-                    <property name="min_content_height">300</property>
+                    <property name="model">liststore</property>
+                    <property name="enable_search">False</property>
+                    <property name="search_column">0</property>
+                    <property name="fixed-height-mode">True</property>
+                    <signal name="button-press-event" handler="on_treeview_button_press_event"/>
+                    <signal name="key-press-event" handler="on_treeview_key_press_event"/>
+                    <signal name="row-activated" handler="on_treeview_row_activated"/>
+                    <child internal-child="selection">
+                      <object class="GtkTreeSelection" id="tree_selection">
+                        <property name="mode">multiple</property>
+                        <signal name="changed" handler="on_treeview_selection_changed"/>
+                      </object>
+                    </child>
                     <child>
-                      <object class="GtkTreeView" id="treeview">
-                        <property name="visible">True</property>
-                        <property name="model">liststore</property>
-                        <property name="enable_search">False</property>
-                        <property name="search_column">0</property>
-                        <property name="fixed-height-mode">True</property>
-                        <signal name="button-press-event" handler="on_treeview_button_press_event"/>
-                        <signal name="key-press-event" handler="on_treeview_key_press_event"/>
-                        <signal name="row-activated" handler="on_treeview_row_activated"/>
-                        <child internal-child="selection">
-                          <object class="GtkTreeSelection" id="tree_selection">
-                            <property name="mode">multiple</property>
-                            <signal name="changed" handler="on_treeview_selection_changed"/>
-                          </object>
-                        </child>
+                      <object class="GtkTreeViewColumn" id="date_column">
+                        <property name="sizing">fixed</property>
+                        <property name="fixed-width">150</property>
+                        <property name="title" translatable="yes">Date</property>
+                        <property name="clickable">True</property>
+                        <property name="sort_indicator">True</property>
+                        <property name="sort_order">descending</property>
+                        <signal name="clicked" handler="on_treeview_column_clicked_event"/>
                         <child>
-                          <object class="GtkTreeViewColumn" id="date_column">
-                            <property name="sizing">fixed</property>
-                            <property name="fixed-width">150</property>
-                            <property name="title" translatable="yes">Date</property>
-                            <property name="clickable">True</property>
-                            <property name="sort_indicator">True</property>
-                            <property name="sort_order">descending</property>
-                            <signal name="clicked" handler="on_treeview_column_clicked_event"/>
-                            <child>
-                              <object class="GtkCellRendererText" id="date_renderer"/>
-                              <attributes>
-                                <attribute name="text">0</attribute>
-                              </attributes>
-                            </child>
-                          </object>
+                          <object class="GtkCellRendererText" id="date_renderer"/>
+                          <attributes>
+                            <attribute name="text">0</attribute>
+                          </attributes>
                         </child>
+                      </object>
+                    </child>
+                    <child>
+                      <object class="GtkTreeViewColumn" id="name_column">
+                        <property name="sizing">fixed</property>
+                        <property name="fixed-width">500</property>
+                        <property name="title" translatable="yes">Name</property>
+                        <property name="clickable">True</property>
+                        <signal name="clicked" handler="on_treeview_column_clicked_event"/>
                         <child>
-                          <object class="GtkTreeViewColumn" id="name_column">
-                            <property name="sizing">fixed</property>
-                            <property name="fixed-width">500</property>
-                            <property name="title" translatable="yes">Name</property>
-                            <property name="clickable">True</property>
-                            <signal name="clicked" handler="on_treeview_column_clicked_event"/>
-                            <child>
-                              <object class="GtkCellRendererText" id="cellrenderertext2">
-                                <property name="ellipsize">end</property>
-                              </object>
-                              <attributes>
-                                <attribute name="text">1</attribute>
-                              </attributes>
-                            </child>
+                          <object class="GtkCellRendererText" id="cellrenderertext2">
+                            <property name="ellipsize">end</property>
                           </object>
+                          <attributes>
+                            <attribute name="text">1</attribute>
+                          </attributes>
                         </child>
+                      </object>
+                    </child>
+                    <child>
+                      <object class="GtkTreeViewColumn" id="location_column">
+                        <property name="sizing">fixed</property>
+                        <property name="fixed-width">200</property>
+                        <property name="title" translatable="yes">Location</property>
+                        <property name="clickable">True</property>
+                        <signal name="clicked" handler="on_treeview_column_clicked_event"/>
                         <child>
-                          <object class="GtkTreeViewColumn" id="location_column">
-                            <property name="sizing">fixed</property>
-                            <property name="fixed-width">200</property>
-                            <property name="title" translatable="yes">Location</property>
-                            <property name="clickable">True</property>
-                            <signal name="clicked" handler="on_treeview_column_clicked_event"/>
-                            <child>
-                              <object class="GtkCellRendererText" id="location_renderer">
-                                <property name="ellipsize">end</property>
-                              </object>
-                              <attributes>
-                                <attribute name="text">2</attribute>
-                              </attributes>
-                            </child>
+                          <object class="GtkCellRendererText" id="location_renderer">
+                            <property name="ellipsize">end</property>
                           </object>
+                          <attributes>
+                            <attribute name="text">2</attribute>
+                          </attributes>
                         </child>
                       </object>
                     </child>
                   </object>
                 </child>
+              </object>
+            </child>
+            <child>
+              <object class="GtkToolbar">
+                <property name="visible">True</property>
                 <child>
-                  <object class="GtkToolbar">
+                  <object class="GtkToolItem">
                     <property name="visible">True</property>
                     <child>
-                      <object class="GtkToolItem">
+                      <object class="GtkBox">
                         <property name="visible">True</property>
                         <child>
-                          <object class="GtkBox">
+                          <object class="GtkButton" id="remove_button">
                             <property name="visible">True</property>
+                            <property name="sensitive">False</property>
+                            <property name="tooltip_text" translatable="yes">Remove the selected pages from 
history</property>
+                            <signal name="clicked" handler="on_remove_button_clicked"/>
                             <child>
-                              <object class="GtkButton" id="remove_button">
+                              <object class="GtkImage">
                                 <property name="visible">True</property>
-                                <property name="sensitive">False</property>
-                                <property name="tooltip_text" translatable="yes">Remove the selected pages 
from history</property>
-                                <signal name="clicked" handler="on_remove_button_clicked"/>
-                                <child>
-                                  <object class="GtkImage">
-                                    <property name="visible">True</property>
-                                    <property name="icon_name">list-remove-symbolic</property>
-                                  </object>
-                                </child>
+                                <property name="icon_name">list-remove-symbolic</property>
                               </object>
                             </child>
                           </object>
                         </child>
                       </object>
-                      <packing>
-                        <property name="homogeneous">True</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GtkSeparatorToolItem">
-                        <property name="visible">True</property>
-                        <property name="draw">False</property>
-                      </object>
-                      <packing>
-                        <property name="expand">True</property>
-                      </packing>
                     </child>
+                  </object>
+                  <packing>
+                    <property name="homogeneous">True</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkSeparatorToolItem">
+                    <property name="visible">True</property>
+                    <property name="draw">False</property>
+                  </object>
+                  <packing>
+                    <property name="expand">True</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkToolItem">
+                    <property name="visible">True</property>
                     <child>
-                      <object class="GtkToolItem">
+                      <object class="GtkBox">
                         <property name="visible">True</property>
                         <child>
-                          <object class="GtkBox">
+                          <object class="GtkButton" id="open_button">
                             <property name="visible">True</property>
+                            <property name="tooltip_text" translatable="yes">Open the selected pages in new 
tabs</property>
+                            <signal name="clicked" handler="on_open_button_clicked"/>
                             <child>
-                              <object class="GtkButton" id="open_button">
+                              <object class="GtkImage">
                                 <property name="visible">True</property>
-                                <property name="tooltip_text" translatable="yes">Open the selected pages in 
new tabs</property>
-                                <signal name="clicked" handler="on_open_button_clicked"/>
-                                <child>
-                                  <object class="GtkImage">
-                                    <property name="visible">True</property>
-                                    <property name="icon_name">go-jump-symbolic</property>
-                                  </object>
-                                </child>
+                                <property name="icon_name">go-jump-symbolic</property>
                               </object>
                             </child>
                           </object>
                         </child>
                       </object>
-                      <packing>
-                        <property name="homogeneous">True</property>
-                      </packing>
                     </child>
-                    <style>
-                      <class name="inline-toolbar"/>
-                    </style>
                   </object>
+                  <packing>
+                    <property name="homogeneous">True</property>
+                  </packing>
                 </child>
+                <style>
+                  <class name="inline-toolbar"/>
+                </style>
               </object>
             </child>
           </object>


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