on the road to the 0.7.4

1 files changed, 55 insertions, 45 deletions

diff --git a/ui/ui.xml b/ui/ui.xml
index 07401bd..46c15a0 100644
--- a/ui/ui.xml
+++ b/ui/ui.xml
@@ -103,6 +103,17 @@
     <property name="step_increment">1</property>
     <property name="page_increment">10</property>
   </object>
+  <object class="GtkHScale" id="hscalecomprjpeg">
+    <property name="visible">True</property>
+    <property name="can_focus">True</property>
+    <property name="adjustment">adjustment25</property>
+    <property name="digits">0</property>
+  </object>
+  <object class="GtkAdjustment" id="adjustment26">
+    <property name="upper">100</property>
+    <property name="step_increment">1</property>
+    <property name="page_increment">10</property>
+  </object>
   <object class="GtkAdjustment" id="adjustment3">
     <property name="upper">1</property>
     <property name="step_increment">0.10000000000000001</property>
@@ -210,6 +221,7 @@
                       <object class="GtkFrame" id="frame8">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
+                        <property name="valign">end</property>
                         <property name="border_width">4</property>
                         <property name="label_xalign">1</property>
                         <child>
@@ -289,6 +301,8 @@
                             <property name="width_request">320</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
+                            <property name="headers_clickable">False</property>
+                            <property name="enable_search">False</property>
                             <child internal-child="selection">
                               <object class="GtkTreeSelection" id="treeview-selection1"/>
                             </child>
@@ -296,7 +310,7 @@
                         </child>
                       </object>
                       <packing>
-                        <property name="expand">False</property>
+                        <property name="expand">True</property>
                         <property name="fill">True</property>
                         <property name="pack_type">end</property>
                         <property name="position">2</property>
@@ -358,6 +372,8 @@
                                           <object class="GtkBox" id="hbox3">
                                             <property name="visible">True</property>
                                             <property name="can_focus">False</property>
+                                            <property name="border_width">4</property>
+                                            <property name="spacing">8</property>
                                             <child>
                                               <object class="GtkHScale" id="hscaleexp">
                                                 <property name="visible">True</property>
@@ -389,7 +405,6 @@
                                               <packing>
                                                 <property name="expand">False</property>
                                                 <property name="fill">False</property>
-                                                <property name="padding">6</property>
                                                 <property name="position">1</property>
                                               </packing>
                                             </child>
@@ -417,6 +432,8 @@
                                           <object class="GtkBox" id="hbox4">
                                             <property name="visible">True</property>
                                             <property name="can_focus">False</property>
+                                            <property name="border_width">4</property>
+                                            <property name="spacing">8</property>
                                             <child>
                                               <object class="GtkHScale" id="hscalecont">
                                                 <property name="visible">True</property>
@@ -447,7 +464,6 @@
                                               <packing>
                                                 <property name="expand">False</property>
                                                 <property name="fill">False</property>
-                                                <property name="padding">6</property>
                                                 <property name="position">1</property>
                                               </packing>
                                             </child>
@@ -475,6 +491,8 @@
                                           <object class="GtkBox" id="hbox5">
                                             <property name="visible">True</property>
                                             <property name="can_focus">False</property>
+                                            <property name="border_width">4</property>
+                                            <property name="spacing">8</property>
                                             <child>
                                               <object class="GtkHScale" id="hscalesat">
                                                 <property name="visible">True</property>
@@ -505,7 +523,6 @@
                                               <packing>
                                                 <property name="expand">False</property>
                                                 <property name="fill">False</property>
-                                                <property name="padding">6</property>
                                                 <property name="position">1</property>
                                               </packing>
                                             </child>
@@ -533,6 +550,8 @@
                                           <object class="GtkBox" id="hbox6">
                                             <property name="visible">True</property>
                                             <property name="can_focus">False</property>
+                                            <property name="border_width">4</property>
+                                            <property name="spacing">8</property>
                                             <child>
                                               <object class="GtkHScale" id="hscalemu">
                                                 <property name="visible">True</property>
@@ -563,7 +582,6 @@
                                               <packing>
                                                 <property name="expand">False</property>
                                                 <property name="fill">False</property>
-                                                <property name="padding">6</property>
                                                 <property name="position">1</property>
                                               </packing>
                                             </child>
@@ -592,6 +610,8 @@
                                             <property name="visible">True</property>
                                             <property name="can_focus">False</property>
                                             <property name="margin_bottom">4</property>
+                                            <property name="border_width">4</property>
+                                            <property name="spacing">8</property>
                                             <child>
                                               <object class="GtkHScale" id="hscalesigma">
                                                 <property name="visible">True</property>
@@ -622,7 +642,6 @@
                                               <packing>
                                                 <property name="expand">False</property>
                                                 <property name="fill">False</property>
-                                                <property name="padding">6</property>
                                                 <property name="position">1</property>
                                               </packing>
                                             </child>
@@ -831,7 +850,6 @@ Useful for aligning focus stacks with slightly different magnification.
                                           <packing>
                                             <property name="expand">False</property>
                                             <property name="fill">False</property>
-                                            <property name="padding">6</property>
                                             <property name="pack_type">end</property>
                                             <property name="position">1</property>
                                           </packing>
@@ -933,7 +951,6 @@ set window SIZE for local-contrast analysis.
                                           <packing>
                                             <property name="expand">False</property>
                                             <property name="fill">False</property>
-                                            <property name="padding">6</property>
                                             <property name="pack_type">end</property>
                                             <property name="position">1</property>
                                           </packing>
@@ -1013,7 +1030,6 @@ minimum CURVATURE for an edge to qualify.
                                           <packing>
                                             <property name="expand">False</property>
                                             <property name="fill">False</property>
-                                            <property name="padding">6</property>
                                             <property name="pack_type">end</property>
                                             <property name="position">3</property>
                                           </packing>
@@ -1351,7 +1367,6 @@ use CIECAM02 to blend colors.
                                           <packing>
                                             <property name="expand">False</property>
                                             <property name="fill">False</property>
-                                            <property name="padding">6</property>
                                             <property name="pack_type">end</property>
                                             <property name="position">1</property>
                                           </packing>
@@ -1547,7 +1562,6 @@ or contrast weighing, where OPERATOR is one of
                                               <packing>
                                                 <property name="expand">False</property>
                                                 <property name="fill">False</property>
-                                                <property name="padding">6</property>
                                                 <property name="pack_type">end</property>
                                                 <property name="position">1</property>
                                               </packing>
@@ -1622,7 +1636,6 @@ or contrast weighing, where OPERATOR is one of
                                               <packing>
                                                 <property name="expand">False</property>
                                                 <property name="fill">False</property>
-                                                <property name="padding">6</property>
                                                 <property name="pack_type">end</property>
                                                 <property name="position">1</property>
                                               </packing>
@@ -1697,7 +1710,6 @@ or contrast weighing, where OPERATOR is one of
                                               <packing>
                                                 <property name="expand">False</property>
                                                 <property name="fill">False</property>
-                                                <property name="padding">6</property>
                                                 <property name="pack_type">end</property>
                                                 <property name="position">1</property>
                                               </packing>
@@ -1773,6 +1785,7 @@ or contrast weighing, where OPERATOR is one of
                                             <property name="margin_left">4</property>
                                             <property name="margin_right">4</property>
                                             <property name="margin_bottom">4</property>
+                                            <property name="spacing">1</property>
                                             <child>
                                               <object class="GtkBox" id="vbox9">
                                                 <property name="visible">True</property>
@@ -1956,28 +1969,22 @@ or contrast weighing, where OPERATOR is one of
                                           </packing>
                                         </child>
                                         <child>
-                                          <object class="GtkLabel" id="label7">
-                                            <property name="visible">True</property>
-                                            <property name="can_focus">False</property>
-                                            <property name="margin_left">4</property>
-                                            <property name="margin_right">4</property>
-                                            <property name="margin_top">4</property>
-                                            <property name="xalign">0</property>
-                                            <property name="label" translatable="yes">Jpeg compression:</property>
-                                          </object>
-                                          <packing>
-                                            <property name="expand">False</property>
-                                            <property name="fill">True</property>
-                                            <property name="position">11</property>
-                                          </packing>
-                                        </child>
-                                        <child>
                                           <object class="GtkBox" id="hbox18">
                                             <property name="visible">True</property>
                                             <property name="can_focus">False</property>
-                                            <property name="margin_left">4</property>
-                                            <property name="margin_right">4</property>
-                                            <property name="margin_bottom">4</property>
+                                            <property name="border_width">4</property>
+                                            <child>
+                                              <object class="GtkLabel" id="label5">
+                                                <property name="visible">True</property>
+                                                <property name="can_focus">False</property>
+                                                <property name="label" translatable="yes">Jpeg quality: </property>
+                                              </object>
+                                              <packing>
+                                                <property name="expand">False</property>
+                                                <property name="fill">True</property>
+                                                <property name="position">0</property>
+                                              </packing>
+                                            </child>
                                             <child>
                                               <object class="GtkCheckButton" id="checkbuttonjpegorig">
                                                 <property name="label" translatable="yes">Default</property>
@@ -1992,28 +1999,31 @@ or contrast weighing, where OPERATOR is one of
                                               <packing>
                                                 <property name="expand">False</property>
                                                 <property name="fill">False</property>
-                                                <property name="position">0</property>
+                                                <property name="position">1</property>
                                               </packing>
                                             </child>
                                             <child>
-                                              <object class="GtkHScale" id="hscalecomprjpeg">
+                                              <object class="GtkSpinButton" id="hscalecomprjpg">
                                                 <property name="visible">True</property>
                                                 <property name="can_focus">True</property>
-                                                <property name="adjustment">adjustment25</property>
-                                                <property name="digits">0</property>
+                                                <property name="max_length">100</property>
+                                                <property name="width_chars">3</property>
+                                                <property name="adjustment">adjustment26</property>
+                                                <property name="climb_rate">1</property>
+                                                <property name="value">85</property>
                                               </object>
                                               <packing>
-                                                <property name="expand">True</property>
+                                                <property name="expand">False</property>
                                                 <property name="fill">True</property>
-                                                <property name="padding">6</property>
-                                                <property name="position">1</property>
+                                                <property name="pack_type">end</property>
+                                                <property name="position">2</property>
                                               </packing>
                                             </child>
                                           </object>
                                           <packing>
                                             <property name="expand">False</property>
                                             <property name="fill">True</property>
-                                            <property name="position">12</property>
+                                            <property name="position">11</property>
                                           </packing>
                                         </child>
                                         <child>
@@ -2058,9 +2068,9 @@ or contrast weighing, where OPERATOR is one of
                                                 </child>
                                               </object>
                                               <packing>
-                                                <property name="expand">True</property>
+                                                <property name="expand">False</property>
                                                 <property name="fill">True</property>
-                                                <property name="padding">6</property>
+                                                <property name="pack_type">end</property>
                                                 <property name="position">1</property>
                                               </packing>
                                             </child>
@@ -2117,9 +2127,8 @@ Enter name of graphics editor to edit images
                                                 <signal name="activate" handler="on_entry_editor_activate" swapped="no"/>
                                               </object>
                                               <packing>
-                                                <property name="expand">True</property>
+                                                <property name="expand">False</property>
                                                 <property name="fill">True</property>
-                                                <property name="padding">6</property>
                                                 <property name="pack_type">end</property>
                                                 <property name="position">1</property>
                                               </packing>
@@ -2265,7 +2274,8 @@ Enter name of graphics editor to edit images
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
                             <property name="margin_bottom">4</property>
-                            <property name="layout_style">spread</property>
+                            <property name="spacing">2</property>
+                            <property name="layout_style">center</property>
                             <child>
                               <object class="GtkButton" id="buttonabout">
                                 <property name="label">gtk-about</property>