From db70e104c84369d3a7de2e297fb9882f1b0c0778 Mon Sep 17 00:00:00 2001
From: Caolán McNamara <caolanm@redhat.com>
Date: Mon, 18 Feb 2013 15:00:37 +0000
Subject: migrate the textflow NumericField settings to GtkAdjustments

Change-Id: I751071365b8aaa0d22364ed0ca74b3954839c126
---
 cui/uiconfig/ui/textflowpage.ui | 40 +++++++++++++++++++++++++++++++++++-----
 1 file changed, 35 insertions(+), 5 deletions(-)

(limited to 'cui/uiconfig')

diff --git a/cui/uiconfig/ui/textflowpage.ui b/cui/uiconfig/ui/textflowpage.ui
index a61bac0355d3..59748deecb8b 100644
--- a/cui/uiconfig/ui/textflowpage.ui
+++ b/cui/uiconfig/ui/textflowpage.ui
@@ -1,6 +1,23 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <!-- interface-requires gtk+ 3.0 -->
+  <object class="GtkAdjustment" id="adjustment1">
+    <property name="lower">2</property>
+    <property name="upper">9</property>
+    <property name="value">2</property>
+    <property name="step_increment">1</property>
+    <property name="page_increment">10</property>
+  </object>
+  <object class="GtkAdjustment" id="adjustment2">
+    <property name="upper">99</property>
+    <property name="step_increment">1</property>
+    <property name="page_increment">10</property>
+  </object>
+  <object class="GtkAdjustment" id="adjustment3">
+    <property name="upper">9999</property>
+    <property name="step_increment">1</property>
+    <property name="page_increment">10</property>
+  </object>
   <object class="GtkGrid" id="TextFlowPage">
     <property name="visible">True</property>
     <property name="can_focus">False</property>
@@ -32,7 +49,7 @@
                 <property name="column_spacing">12</property>
                 <child>
                   <object class="GtkCheckButton" id="checkAuto">
-                    <property name="label" translatable="yes">Automatically</property>
+                    <property name="label" translatable="yes">A_utomatically</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
@@ -46,7 +63,7 @@
                   <packing>
                     <property name="left_attach">0</property>
                     <property name="top_attach">0</property>
-                    <property name="width">1</property>
+                    <property name="width">2</property>
                     <property name="height">1</property>
                   </packing>
                 </child>
@@ -57,6 +74,7 @@
                     <property name="halign">start</property>
                     <property name="margin_left">25</property>
                     <property name="invisible_char">•</property>
+                    <property name="adjustment">adjustment2</property>
                   </object>
                   <packing>
                     <property name="left_attach">0</property>
@@ -72,6 +90,7 @@
                     <property name="halign">start</property>
                     <property name="margin_left">25</property>
                     <property name="invisible_char">•</property>
+                    <property name="adjustment">adjustment1</property>
                   </object>
                   <packing>
                     <property name="left_attach">0</property>
@@ -88,6 +107,7 @@
                     <property name="margin_left">25</property>
                     <property name="invisible_char">•</property>
                     <property name="input_purpose">number</property>
+                    <property name="adjustment">adjustment1</property>
                   </object>
                   <packing>
                     <property name="left_attach">0</property>
@@ -141,9 +161,6 @@
                     <property name="height">1</property>
                   </packing>
                 </child>
-                <child>
-                  <placeholder/>
-                </child>
               </object>
             </child>
           </object>
@@ -226,8 +243,10 @@
                   <object class="GtkLabel" id="labelType">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
+                    <property name="xalign">0</property>
                     <property name="label" translatable="yes">_Type</property>
                     <property name="use_underline">True</property>
+                    <property name="mnemonic_widget">comboBreakType</property>
                   </object>
                   <packing>
                     <property name="left_attach">1</property>
@@ -241,6 +260,7 @@
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="invisible_char">•</property>
+                    <property name="adjustment">adjustment3</property>
                   </object>
                   <packing>
                     <property name="left_attach">4</property>
@@ -253,9 +273,11 @@
                   <object class="GtkLabel" id="labelPageNum">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
+                    <property name="xalign">1</property>
                     <property name="label" translatable="yes">Page _number</property>
                     <property name="use_underline">True</property>
                     <property name="justify">right</property>
+                    <property name="mnemonic_widget">spinPageNumber</property>
                   </object>
                   <packing>
                     <property name="left_attach">3</property>
@@ -268,8 +290,11 @@
                   <object class="GtkLabel" id="labelPosition">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
+                    <property name="xalign">1</property>
                     <property name="label" translatable="yes">Position</property>
+                    <property name="use_underline">True</property>
                     <property name="justify">right</property>
+                    <property name="mnemonic_widget">comboBreakPosition</property>
                   </object>
                   <packing>
                     <property name="left_attach">3</property>
@@ -361,6 +386,7 @@
           <object class="GtkAlignment" id="alignment2">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
+            <property name="top_padding">6</property>
             <property name="left_padding">12</property>
             <child>
               <object class="GtkGrid" id="gridOptions">
@@ -445,6 +471,7 @@
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="invisible_char">•</property>
+                    <property name="adjustment">adjustment1</property>
                   </object>
                   <packing>
                     <property name="left_attach">1</property>
@@ -458,6 +485,7 @@
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="invisible_char">•</property>
+                    <property name="adjustment">adjustment1</property>
                     <property name="climb_rate">1</property>
                     <property name="numeric">True</property>
                   </object>
@@ -472,6 +500,7 @@
                   <object class="GtkLabel" id="labelOrphan">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
+                    <property name="xalign">0</property>
                     <property name="label" translatable="yes">Lines</property>
                   </object>
                   <packing>
@@ -485,6 +514,7 @@
                   <object class="GtkLabel" id="labelWidow">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
+                    <property name="xalign">0</property>
                     <property name="label" translatable="yes">Lines</property>
                   </object>
                   <packing>
-- 
cgit