changes sidebar: Make the filter tabpage more vertical to fit better.

Change-Id: I6b982567eab7ed993f23df7ee246fc53c1fd90f0

1 files changed, 308 insertions, 230 deletions

diff --git a/svx/uiconfig/ui/redlinefilterpage.ui b/svx/uiconfig/ui/redlinefilterpage.ui
index d6563d802574..284072975a17 100644
--- a/svx/uiconfig/ui/redlinefilterpage.ui
+++ b/svx/uiconfig/ui/redlinefilterpage.ui
@@ -1,26 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.18.3 -->
 <interface>
-  <requires lib="gtk+" version="3.0"/>
-  <object class="GtkAdjustment" id="adjustment1">
-    <property name="lower">19851231</property>
-    <property name="upper">20501231</property>
-    <property name="value">19851231</property>
-    <property name="step_increment">1</property>
-    <property name="page_increment">10</property>
-  </object>
-  <object class="GtkImage" id="image1">
-    <property name="visible">True</property>
-    <property name="can_focus">False</property>
-    <property name="pixbuf">sc/res/time.png</property>
-  </object>
+  <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkGrid" id="RedlineFilterPage">
     <property name="visible">True</property>
     <property name="can_focus">False</property>
     <property name="valign">start</property>
     <property name="border_width">6</property>
     <property name="row_spacing">6</property>
-    <property name="column_spacing">12</property>
+    <property name="column_spacing">6</property>
     <child>
       <object class="GtkCheckButton" id="date">
         <property name="label" translatable="yes">_Date:</property>
@@ -30,13 +17,12 @@
         <property name="use_underline">True</property>
         <property name="xalign">0</property>
         <property name="draw_indicator">True</property>
-        <accessibility>
-          <relation type="label-for" target="datecond"/>
-        </accessibility>
       </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>
@@ -48,18 +34,17 @@
         <property name="use_underline">True</property>
         <property name="xalign">0</property>
         <property name="draw_indicator">True</property>
-        <accessibility>
-          <relation type="label-for" target="authorlist"/>
-        </accessibility>
       </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>
     <child>
-      <object class="GtkCheckButton" id="action">
-        <property name="label" translatable="yes">A_ction:</property>
+      <object class="GtkCheckButton" id="comment">
+        <property name="label" translatable="yes">C_omment:</property>
         <property name="visible">True</property>
         <property name="can_focus">True</property>
         <property name="receives_default">False</property>
@@ -67,46 +52,48 @@
         <property name="xalign">0</property>
         <property name="draw_indicator">True</property>
         <accessibility>
-          <relation type="label-for" target="actionlist"/>
+          <relation type="label-for" target="commentedit"/>
         </accessibility>
       </object>
       <packing>
         <property name="left_attach">0</property>
-        <property name="top_attach">3</property>
+        <property name="top_attach">8</property>
+        <property name="width">1</property>
+        <property name="height">1</property>
       </packing>
     </child>
     <child>
-      <object class="GtkCheckButton" id="comment">
-        <property name="label" translatable="yes">C_omment:</property>
+      <object class="GtkEntry" id="commentedit">
         <property name="visible">True</property>
+        <property name="sensitive">False</property>
         <property name="can_focus">True</property>
-        <property name="receives_default">False</property>
-        <property name="use_underline">True</property>
-        <property name="xalign">0</property>
-        <property name="draw_indicator">True</property>
-        <accessibility>
-          <relation type="label-for" target="commentedit"/>
-        </accessibility>
+        <property name="margin_left">24</property>
+        <property name="hexpand">True</property>
+        <property name="invisible_char">•</property>
+        <property name="invisible_char_set">True</property>
       </object>
       <packing>
         <property name="left_attach">0</property>
-        <property name="top_attach">5</property>
+        <property name="top_attach">9</property>
+        <property name="width">1</property>
+        <property name="height">1</property>
       </packing>
     </child>
     <child>
-      <object class="GtkComboBoxText" id="authorlist">
+      <object class="GtkCheckButton" id="range">
+        <property name="label" translatable="yes">_Range:</property>
         <property name="visible">True</property>
-        <property name="sensitive">False</property>
-        <property name="can_focus">False</property>
-        <property name="hexpand">True</property>
-        <accessibility>
-          <relation type="labelled-by" target="author"/>
-        </accessibility>
+        <property name="can_focus">True</property>
+        <property name="receives_default">False</property>
+        <property name="use_underline">True</property>
+        <property name="xalign">0</property>
+        <property name="draw_indicator">True</property>
       </object>
       <packing>
-        <property name="left_attach">1</property>
-        <property name="top_attach">2</property>
-        <property name="width">3</property>
+        <property name="left_attach">0</property>
+        <property name="top_attach">6</property>
+        <property name="width">1</property>
+        <property name="height">1</property>
       </packing>
     </child>
     <child>
@@ -114,7 +101,10 @@
         <property name="visible">True</property>
         <property name="sensitive">False</property>
         <property name="can_focus">False</property>
+        <property name="margin_left">24</property>
         <property name="hexpand">True</property>
+        <property name="entry_text_column">0</property>
+        <property name="id_column">1</property>
         <accessibility>
           <relation type="labelled-by" target="action"/>
         </accessibility>
@@ -125,228 +115,316 @@
         </child>
       </object>
       <packing>
-        <property name="left_attach">1</property>
-        <property name="top_attach">3</property>
-        <property name="width">3</property>
+        <property name="left_attach">0</property>
+        <property name="top_attach">5</property>
+        <property name="width">1</property>
+        <property name="height">1</property>
       </packing>
     </child>
     <child>
-      <object class="GtkEntry" id="commentedit">
+      <object class="GtkCheckButton" id="action">
+        <property name="label" translatable="yes">A_ction:</property>
         <property name="visible">True</property>
-        <property name="sensitive">False</property>
         <property name="can_focus">True</property>
-        <property name="hexpand">True</property>
-        <property name="invisible_char">•</property>
-        <accessibility>
-          <relation type="labelled-by" target="comment"/>
-        </accessibility>
+        <property name="receives_default">False</property>
+        <property name="use_underline">True</property>
+        <property name="xalign">0</property>
+        <property name="draw_indicator">True</property>
       </object>
       <packing>
-        <property name="left_attach">1</property>
-        <property name="top_attach">5</property>
-        <property name="width">3</property>
+        <property name="left_attach">0</property>
+        <property name="top_attach">4</property>
+        <property name="width">1</property>
+        <property name="height">1</property>
       </packing>
     </child>
     <child>
-      <object class="GtkSpinButton" id="starttime:hh:mm">
+      <object class="GtkComboBoxText" id="authorlist">
         <property name="visible">True</property>
         <property name="sensitive">False</property>
-        <property name="can_focus">True</property>
-        <property name="invisible_char">•</property>
-        <child internal-child="accessible">
-          <object class="AtkObject" id="starttime:hh:mm-atkobject">
-            <property name="AtkObject::accessible-name" translatable="yes">Start Time</property>
-          </object>
-        </child>
+        <property name="can_focus">False</property>
+        <property name="margin_left">24</property>
+        <property name="hexpand">True</property>
+        <property name="entry_text_column">0</property>
+        <property name="id_column">1</property>
+        <accessibility>
+          <relation type="labelled-by" target="author"/>
+        </accessibility>
       </object>
       <packing>
-        <property name="left_attach">3</property>
-        <property name="top_attach">0</property>
+        <property name="left_attach">0</property>
+        <property name="top_attach">3</property>
+        <property name="width">1</property>
+        <property name="height">1</property>
       </packing>
     </child>
     <child>
-      <object class="GtkSpinButton" id="endtime:hh:mm">
+      <object class="GtkBox" id="box2">
         <property name="visible">True</property>
-        <property name="sensitive">False</property>
-        <property name="can_focus">True</property>
-        <property name="invisible_char">•</property>
-        <child internal-child="accessible">
-          <object class="AtkObject" id="endtime:hh:mm-atkobject">
-            <property name="AtkObject::accessible-name" translatable="yes">End Time</property>
+        <property name="can_focus">False</property>
+        <property name="margin_left">24</property>
+        <property name="spacing">6</property>
+        <child>
+          <object class="GtkEntry" id="rangeedit">
+            <property name="visible">True</property>
+            <property name="sensitive">False</property>
+            <property name="can_focus">True</property>
+            <property name="hexpand">True</property>
+            <property name="invisible_char">•</property>
+            <property name="invisible_char_set">True</property>
+            <accessibility>
+              <relation type="labelled-by" target="range"/>
+            </accessibility>
           </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">True</property>
+            <property name="position">0</property>
+          </packing>
         </child>
-      </object>
-      <packing>
-        <property name="left_attach">3</property>
-        <property name="top_attach">1</property>
-      </packing>
-    </child>
-    <child>
-      <object class="GtkSpinButton" id="enddate:yy:mm:dd">
-        <property name="visible">True</property>
-        <property name="sensitive">False</property>
-        <property name="can_focus">True</property>
-        <property name="invisible_char">•</property>
-        <property name="adjustment">adjustment1</property>
-        <child internal-child="accessible">
-          <object class="AtkObject" id="enddate:yy:mm:dd-atkobject">
-            <property name="AtkObject::accessible-name" translatable="yes">End Date</property>
+        <child>
+          <object class="GtkButton" id="dotdotdot">
+            <property name="label">...</property>
+            <property name="visible">True</property>
+            <property name="sensitive">False</property>
+            <property name="can_focus">True</property>
+            <property name="receives_default">True</property>
+            <property name="has_tooltip">True</property>
+            <property name="tooltip_markup" translatable="yes">Set reference</property>
+            <property name="tooltip_text" translatable="yes">Set reference</property>
           </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">True</property>
+            <property name="position">1</property>
+          </packing>
         </child>
       </object>
       <packing>
-        <property name="left_attach">2</property>
-        <property name="top_attach">1</property>
+        <property name="left_attach">0</property>
+        <property name="top_attach">7</property>
+        <property name="width">1</property>
+        <property name="height">1</property>
       </packing>
     </child>
     <child>
-      <object class="GtkLabel" id="and">
+      <object class="GtkBox" id="box3">
         <property name="visible">True</property>
-        <property name="sensitive">False</property>
         <property name="can_focus">False</property>
-        <property name="xalign">1</property>
-        <property name="label" translatable="yes">a_nd</property>
-        <property name="use_underline">True</property>
-        <property name="ellipsize">end</property>
-      </object>
-      <packing>
-        <property name="left_attach">1</property>
-        <property name="top_attach">1</property>
-      </packing>
-    </child>
-    <child>
-      <object class="GtkSpinButton" id="startdate:yy:mm:dd">
-        <property name="visible">True</property>
-        <property name="sensitive">False</property>
-        <property name="can_focus">True</property>
-        <property name="invisible_char">•</property>
-        <property name="adjustment">adjustment1</property>
-        <child internal-child="accessible">
-          <object class="AtkObject" id="startdate:yy:mm:dd-atkobject">
-            <property name="AtkObject::accessible-name" translatable="yes">Start Date</property>
+        <property name="margin_left">24</property>
+        <property name="orientation">vertical</property>
+        <property name="spacing">6</property>
+        <child>
+          <object class="GtkComboBoxText" id="datecond">
+            <property name="visible">True</property>
+            <property name="sensitive">False</property>
+            <property name="can_focus">False</property>
+            <property name="hexpand">True</property>
+            <property name="entry_text_column">0</property>
+            <property name="id_column">1</property>
+            <accessibility>
+              <relation type="labelled-by" target="date"/>
+            </accessibility>
+            <child internal-child="accessible">
+              <object class="AtkObject" id="datecond-atkobject">
+                <property name="AtkObject::accessible-name" translatable="yes">Date Condition</property>
+              </object>
+            </child>
+            <items>
+              <item translatable="yes">earlier than</item>
+              <item translatable="yes">since</item>
+              <item translatable="yes">equal to</item>
+              <item translatable="yes">not equal to</item>
+              <item translatable="yes">between</item>
+              <item translatable="yes">since saving</item>
+            </items>
           </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">True</property>
+            <property name="position">0</property>
+          </packing>
         </child>
-      </object>
-      <packing>
-        <property name="left_attach">2</property>
-        <property name="top_attach">0</property>
-      </packing>
-    </child>
-    <child>
-      <object class="GtkComboBoxText" id="datecond">
-        <property name="visible">True</property>
-        <property name="sensitive">False</property>
-        <property name="can_focus">False</property>
-        <items>
-          <item translatable="yes">earlier than</item>
-          <item translatable="yes">since</item>
-          <item translatable="yes">equal to</item>
-          <item translatable="yes">not equal to</item>
-          <item translatable="yes">between</item>
-          <item translatable="yes">since saving</item>
-        </items>
-        <accessibility>
-          <relation type="labelled-by" target="date"/>
-        </accessibility>
-        <child internal-child="accessible">
-          <object class="AtkObject" id="datecond-atkobject">
-            <property name="AtkObject::accessible-name" translatable="yes">Date Condition</property>
+        <child>
+          <object class="GtkGrid" id="grid3">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="hexpand">True</property>
+            <property name="row_spacing">6</property>
+            <property name="column_spacing">6</property>
+            <child>
+              <object class="GtkLabel" id="and">
+                <property name="visible">True</property>
+                <property name="sensitive">False</property>
+                <property name="can_focus">False</property>
+                <property name="xalign">1</property>
+                <property name="label" translatable="yes">a_nd</property>
+                <property name="use_underline">True</property>
+                <property name="ellipsize">end</property>
+              </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="GtkSpinButton" id="startdate:yy:mm:dd">
+                <property name="visible">True</property>
+                <property name="sensitive">False</property>
+                <property name="can_focus">True</property>
+                <property name="hexpand">True</property>
+                <property name="invisible_char">•</property>
+                <property name="invisible_char_set">True</property>
+                <property name="adjustment">adjustment1</property>
+                <child internal-child="accessible">
+                  <object class="AtkObject" id="startdate:yy:mm:dd-atkobject">
+                    <property name="AtkObject::accessible-name" translatable="yes">Start Date</property>
+                  </object>
+                </child>
+              </object>
+              <packing>
+                <property name="left_attach">1</property>
+                <property name="top_attach">0</property>
+                <property name="width">1</property>
+                <property name="height">1</property>
+              </packing>
+            </child>
+            <child>
+              <placeholder/>
+            </child>
+            <child>
+              <object class="GtkSpinButton" id="starttime:hh:mm">
+                <property name="visible">True</property>
+                <property name="sensitive">False</property>
+                <property name="can_focus">True</property>
+                <property name="hexpand">True</property>
+                <property name="invisible_char">•</property>
+                <property name="invisible_char_set">True</property>
+                <child internal-child="accessible">
+                  <object class="AtkObject" id="starttime:hh:mm-atkobject">
+                    <property name="AtkObject::accessible-name" translatable="yes">Start Time</property>
+                  </object>
+                </child>
+              </object>
+              <packing>
+                <property name="left_attach">2</property>
+                <property name="top_attach">0</property>
+                <property name="width">1</property>
+                <property name="height">1</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkButton" id="startclock">
+                <property name="visible">True</property>
+                <property name="sensitive">False</property>
+                <property name="can_focus">True</property>
+                <property name="receives_default">True</property>
+                <property name="has_tooltip">True</property>
+                <property name="tooltip_markup" translatable="yes">Set current time and date</property>
+                <property name="tooltip_text" translatable="yes">Set current time and date</property>
+                <property name="image">image1</property>
+              </object>
+              <packing>
+                <property name="left_attach">3</property>
+                <property name="top_attach">0</property>
+                <property name="width">1</property>
+                <property name="height">1</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkSpinButton" id="enddate:yy:mm:dd">
+                <property name="visible">True</property>
+                <property name="sensitive">False</property>
+                <property name="can_focus">True</property>
+                <property name="hexpand">True</property>
+                <property name="invisible_char">•</property>
+                <property name="invisible_char_set">True</property>
+                <property name="adjustment">adjustment1</property>
+                <child internal-child="accessible">
+                  <object class="AtkObject" id="enddate:yy:mm:dd-atkobject">
+                    <property name="AtkObject::accessible-name" translatable="yes">End Date</property>
+                  </object>
+                </child>
+              </object>
+              <packing>
+                <property name="left_attach">1</property>
+                <property name="top_attach">1</property>
+                <property name="width">1</property>
+                <property name="height">1</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkSpinButton" id="endtime:hh:mm">
+                <property name="visible">True</property>
+                <property name="sensitive">False</property>
+                <property name="can_focus">True</property>
+                <property name="hexpand">True</property>
+                <property name="invisible_char">•</property>
+                <property name="invisible_char_set">True</property>
+                <child internal-child="accessible">
+                  <object class="AtkObject" id="endtime:hh:mm-atkobject">
+                    <property name="AtkObject::accessible-name" translatable="yes">End Time</property>
+                  </object>
+                </child>
+              </object>
+              <packing>
+                <property name="left_attach">2</property>
+                <property name="top_attach">1</property>
+                <property name="width">1</property>
+                <property name="height">1</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkButton" id="endclock">
+                <property name="visible">True</property>
+                <property name="sensitive">False</property>
+                <property name="can_focus">True</property>
+                <property name="receives_default">True</property>
+                <property name="has_tooltip">True</property>
+                <property name="tooltip_markup" translatable="yes">Set current time and date</property>
+                <property name="tooltip_text" translatable="yes">Set current time and date</property>
+                <property name="image">image2</property>
+              </object>
+              <packing>
+                <property name="left_attach">3</property>
+                <property name="top_attach">1</property>
+                <property name="width">1</property>
+                <property name="height">1</property>
+              </packing>
+            </child>
           </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">True</property>
+            <property name="position">1</property>
+          </packing>
         </child>
       </object>
       <packing>
-        <property name="left_attach">1</property>
-        <property name="top_attach">0</property>
-      </packing>
-    </child>
-    <child>
-      <object class="GtkButton" id="startclock">
-        <property name="visible">True</property>
-        <property name="sensitive">False</property>
-        <property name="can_focus">True</property>
-        <property name="receives_default">True</property>
-        <property name="tooltip_text" translatable="yes">Set current time and date</property>
-        <property name="image">image1</property>
-      </object>
-      <packing>
-        <property name="left_attach">4</property>
-        <property name="top_attach">0</property>
-      </packing>
-    </child>
-    <child>
-      <object class="GtkButton" id="endclock">
-        <property name="visible">True</property>
-        <property name="sensitive">False</property>
-        <property name="can_focus">True</property>
-        <property name="receives_default">True</property>
-        <property name="tooltip_text" translatable="yes">Set current time and date</property>
-        <property name="image">image1</property>
-      </object>
-      <packing>
-        <property name="left_attach">4</property>
-        <property name="top_attach">1</property>
-      </packing>
-    </child>
-    <child>
-      <object class="GtkCheckButton" id="range">
-        <property name="label" translatable="yes">_Range:</property>
-        <property name="visible">True</property>
-        <property name="can_focus">True</property>
-        <property name="receives_default">False</property>
-        <property name="use_underline">True</property>
-        <property name="xalign">0</property>
-        <property name="draw_indicator">True</property>
-        <accessibility>
-          <relation type="label-for" target="rangeedit"/>
-        </accessibility>
-      </object>
-      <packing>
         <property name="left_attach">0</property>
-        <property name="top_attach">4</property>
-      </packing>
-    </child>
-    <child>
-      <object class="GtkButton" id="dotdotdot">
-        <property name="label">...</property>
-        <property name="visible">True</property>
-        <property name="sensitive">False</property>
-        <property name="can_focus">True</property>
-        <property name="receives_default">True</property>
-        <property name="tooltip_text" translatable="yes">Set reference</property>
-      </object>
-      <packing>
-        <property name="left_attach">4</property>
-        <property name="top_attach">4</property>
-      </packing>
-    </child>
-    <child>
-      <object class="GtkEntry" id="rangeedit">
-        <property name="visible">True</property>
-        <property name="sensitive">False</property>
-        <property name="can_focus">True</property>
-        <property name="hexpand">True</property>
-        <property name="invisible_char">•</property>
-        <accessibility>
-          <relation type="labelled-by" target="range"/>
-        </accessibility>
-      </object>
-      <packing>
-        <property name="left_attach">1</property>
-        <property name="top_attach">4</property>
-        <property name="width">3</property>
+        <property name="top_attach">1</property>
+        <property name="width">1</property>
+        <property name="height">1</property>
       </packing>
     </child>
-    <child>
-      <placeholder/>
-    </child>
-    <child>
-      <placeholder/>
-    </child>
-    <child>
-      <placeholder/>
-    </child>
-    <child>
-      <placeholder/>
-    </child>
+  </object>
+  <object class="GtkAdjustment" id="adjustment1">
+    <property name="lower">19851231</property>
+    <property name="upper">20501231</property>
+    <property name="value">19851231</property>
+    <property name="step_increment">1</property>
+    <property name="page_increment">10</property>
+  </object>
+  <object class="GtkImage" id="image1">
+    <property name="visible">True</property>
+    <property name="can_focus">False</property>
+    <property name="pixbuf">sc/res/time.png</property>
+  </object>
+  <object class="GtkImage" id="image2">
+    <property name="visible">True</property>
+    <property name="can_focus">False</property>
+    <property name="pixbuf">sc/res/time.png</property>
   </object>
 </interface>