[med-svn] [aghermann] 17/24: sf.glade: deal with GTK deprecations

andrei zavada hmmr-guest at moszumanska.debian.org
Mon Jun 15 01:48:26 UTC 2015


This is an automated email from the git hooks/post-receive script.

hmmr-guest pushed a commit to branch WIP
in repository aghermann.

commit 501178f6c87849a796ad025f8a56099d9d7c6c3c
Author: Andrei Zavada <hmmr at ra>
Date:   Sun Jun 14 23:02:03 2015 +0300

    sf.glade: deal with GTK deprecations
    
    passed for 3.12 as verified by glade; more warnings still in stdout
---
 upstream/data/sf.glade | 628 ++++++++++++++++++++-----------------------------
 1 file changed, 259 insertions(+), 369 deletions(-)

diff --git a/upstream/data/sf.glade b/upstream/data/sf.glade
index 3aa7afe..fef15fd 100644
--- a/upstream/data/sf.glade
+++ b/upstream/data/sf.glade
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- Generated with glade 3.18.3 -->
 <interface>
-  <!-- interface-requires gtk+ 3.0 -->
+  <requires lib="gtk+" version="3.12"/>
   <object class="GtkMenu" id="iiSFAccept">
     <property name="visible">True</property>
     <property name="can_focus">False</property>
@@ -724,41 +725,6 @@
       </row>
     </data>
   </object>
-  <object class="GtkListStore" id="mSFScoringPageSize">
-    <columns>
-      <!-- column-name PageSize -->
-      <column type="gchararray"/>
-    </columns>
-    <data>
-      <row>
-        <col id="0" translatable="yes">4 sec</col>
-      </row>
-      <row>
-        <col id="0" translatable="yes">5 sec</col>
-      </row>
-      <row>
-        <col id="0" translatable="yes">10 sec</col>
-      </row>
-      <row>
-        <col id="0" translatable="yes">15 sec</col>
-      </row>
-      <row>
-        <col id="0" translatable="yes">20 sec</col>
-      </row>
-      <row>
-        <col id="0" translatable="yes">30 sec</col>
-      </row>
-      <row>
-        <col id="0" translatable="yes">1 min</col>
-      </row>
-      <row>
-        <col id="0" translatable="yes">2 min</col>
-      </row>
-      <row>
-        <col id="0" translatable="yes">5 min</col>
-      </row>
-    </data>
-  </object>
   <object class="GtkWindow" id="wSF">
     <property name="can_focus">False</property>
     <property name="events">GDK_KEY_PRESS_MASK | GDK_STRUCTURE_MASK</property>
@@ -770,13 +736,15 @@
     <property name="icon">aghermann.png</property>
     <property name="gravity">south</property>
     <child>
-      <object class="GtkVBox" id="vbox11">
+      <object class="GtkGrid" id="vbox11">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <child>
           <object class="GtkScrolledWindow" id="scrolledwindow9">
             <property name="visible">True</property>
             <property name="can_focus">True</property>
+            <property name="hexpand">True</property>
+            <property name="vexpand">True</property>
             <child>
               <object class="GtkViewport" id="viewport5">
                 <property name="visible">True</property>
@@ -793,9 +761,8 @@
             </child>
           </object>
           <packing>
-            <property name="expand">True</property>
-            <property name="fill">True</property>
-            <property name="position">0</property>
+            <property name="left_attach">0</property>
+            <property name="top_attach">0</property>
           </packing>
         </child>
         <child>
@@ -822,13 +789,12 @@
             </child>
           </object>
           <packing>
-            <property name="expand">False</property>
-            <property name="fill">True</property>
-            <property name="position">1</property>
+            <property name="left_attach">0</property>
+            <property name="top_attach">1</property>
           </packing>
         </child>
         <child>
-          <object class="GtkHBox" id="cSFControlBar">
+          <object class="GtkGrid" id="cSFControlBar">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="border_width">2</property>
@@ -1026,10 +992,8 @@
                 </child>
               </object>
               <packing>
-                <property name="expand">False</property>
-                <property name="fill">False</property>
-                <property name="padding">3</property>
-                <property name="position">0</property>
+                <property name="left_attach">0</property>
+                <property name="top_attach">0</property>
               </packing>
             </child>
             <child>
@@ -1039,10 +1003,8 @@
                 <property name="orientation">vertical</property>
               </object>
               <packing>
-                <property name="expand">False</property>
-                <property name="fill">True</property>
-                <property name="padding">2</property>
-                <property name="position">1</property>
+                <property name="left_attach">1</property>
+                <property name="top_attach">0</property>
               </packing>
             </child>
             <child>
@@ -1066,8 +1028,6 @@
                   <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>
@@ -1075,18 +1035,16 @@
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="valign">center</property>
-                    <property name="xalign">1</property>
                     <property name="xpad">3</property>
                     <property name="ypad">2</property>
                     <property name="label" translatable="yes">_P </property>
                     <property name="use_underline">True</property>
                     <property name="mnemonic_widget">eSFCurrentPage</property>
+                    <property name="xalign">1</property>
                   </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>
@@ -1100,7 +1058,6 @@
                     <property name="max_length">7</property>
                     <property name="invisible_char">•</property>
                     <property name="xalign">1</property>
-                    <property name="invisible_char_set">True</property>
                     <property name="primary_icon_activatable">False</property>
                     <property name="secondary_icon_activatable">False</property>
                     <property name="input_purpose">number</property>
@@ -1110,8 +1067,6 @@
                   <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>
@@ -1120,15 +1075,13 @@
                     <property name="can_focus">False</property>
                     <property name="valign">center</property>
                     <property name="margin_right">2</property>
-                    <property name="xalign">0</property>
                     <property name="xpad">3</property>
                     <property name="label" translatable="yes">of</property>
+                    <property name="xalign">0</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>
@@ -1147,8 +1100,6 @@
                   <packing>
                     <property name="left_attach">4</property>
                     <property name="top_attach">0</property>
-                    <property name="width">1</property>
-                    <property name="height">1</property>
                   </packing>
                 </child>
                 <child>
@@ -1226,15 +1177,12 @@
                     <property name="left_attach">0</property>
                     <property name="top_attach">1</property>
                     <property name="width">5</property>
-                    <property name="height">1</property>
                   </packing>
                 </child>
               </object>
               <packing>
-                <property name="expand">False</property>
-                <property name="fill">True</property>
-                <property name="padding">3</property>
-                <property name="position">2</property>
+                <property name="left_attach">2</property>
+                <property name="top_attach">0</property>
               </packing>
             </child>
             <child>
@@ -1244,10 +1192,8 @@
                 <property name="orientation">vertical</property>
               </object>
               <packing>
-                <property name="expand">False</property>
-                <property name="fill">True</property>
-                <property name="padding">2</property>
-                <property name="position">4</property>
+                <property name="left_attach">3</property>
+                <property name="top_attach">0</property>
               </packing>
             </child>
             <child>
@@ -1282,8 +1228,6 @@
                           <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>
@@ -1298,8 +1242,6 @@
                           <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>
@@ -1314,11 +1256,11 @@
                       </packing>
                     </child>
                     <child>
-                      <object class="GtkTable" id="cSFPageNavContainer">
+                      <object class="GtkGrid" id="cSFPageNavContainer">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="n_rows">2</property>
-                        <property name="n_columns">7</property>
+                        <property name="row_spacing">5</property>
+                        <property name="column_spacing">5</property>
                         <child>
                           <object class="GtkButton" id="bSFGotoPrevUnscored">
                             <property name="label" translatable="yes">◁</property>
@@ -1331,6 +1273,10 @@
                             <property name="focus_on_click">False</property>
                             <accelerator key="n" signal="activate" modifiers="GDK_SHIFT_MASK"/>
                           </object>
+                          <packing>
+                            <property name="left_attach">0</property>
+                            <property name="top_attach">0</property>
+                          </packing>
                         </child>
                         <child>
                           <object class="GtkButton" id="bSFGotoNextUnscored">
@@ -1345,7 +1291,7 @@
                           </object>
                           <packing>
                             <property name="left_attach">1</property>
-                            <property name="right_attach">2</property>
+                            <property name="top_attach">0</property>
                           </packing>
                         </child>
                         <child>
@@ -1361,8 +1307,8 @@
                             <accelerator key="bracketleft" signal="activate"/>
                           </object>
                           <packing>
+                            <property name="left_attach">0</property>
                             <property name="top_attach">1</property>
-                            <property name="bottom_attach">2</property>
                           </packing>
                         </child>
                         <child>
@@ -1379,9 +1325,7 @@
                           </object>
                           <packing>
                             <property name="left_attach">1</property>
-                            <property name="right_attach">2</property>
                             <property name="top_attach">1</property>
-                            <property name="bottom_attach">2</property>
                           </packing>
                         </child>
                         <child>
@@ -1399,7 +1343,7 @@
                           </object>
                           <packing>
                             <property name="left_attach">3</property>
-                            <property name="right_attach">4</property>
+                            <property name="top_attach">0</property>
                           </packing>
                         </child>
                         <child>
@@ -1417,7 +1361,7 @@
                           </object>
                           <packing>
                             <property name="left_attach">4</property>
-                            <property name="right_attach">5</property>
+                            <property name="top_attach">0</property>
                           </packing>
                         </child>
                         <child>
@@ -1435,9 +1379,7 @@
                           </object>
                           <packing>
                             <property name="left_attach">3</property>
-                            <property name="right_attach">4</property>
                             <property name="top_attach">1</property>
-                            <property name="bottom_attach">2</property>
                           </packing>
                         </child>
                         <child>
@@ -1455,9 +1397,7 @@
                           </object>
                           <packing>
                             <property name="left_attach">4</property>
-                            <property name="right_attach">5</property>
                             <property name="top_attach">1</property>
-                            <property name="bottom_attach">2</property>
                           </packing>
                         </child>
                         <child>
@@ -1475,9 +1415,7 @@
                           </object>
                           <packing>
                             <property name="left_attach">5</property>
-                            <property name="right_attach">6</property>
                             <property name="top_attach">1</property>
-                            <property name="bottom_attach">2</property>
                           </packing>
                         </child>
                         <child>
@@ -1495,9 +1433,7 @@
                           </object>
                           <packing>
                             <property name="left_attach">6</property>
-                            <property name="right_attach">7</property>
                             <property name="top_attach">1</property>
-                            <property name="bottom_attach">2</property>
                           </packing>
                         </child>
                         <child>
@@ -1515,7 +1451,7 @@
                           </object>
                           <packing>
                             <property name="left_attach">5</property>
-                            <property name="right_attach">7</property>
+                            <property name="top_attach">0</property>
                           </packing>
                         </child>
                         <child>
@@ -1525,11 +1461,13 @@
                           </object>
                           <packing>
                             <property name="left_attach">2</property>
-                            <property name="right_attach">3</property>
-                            <property name="bottom_attach">2</property>
-                            <property name="x_padding">2</property>
+                            <property name="top_attach">0</property>
+                            <property name="height">2</property>
                           </packing>
                         </child>
+                        <child>
+                          <placeholder/>
+                        </child>
                       </object>
                       <packing>
                         <property name="expand">False</property>
@@ -1539,122 +1477,104 @@
                       </packing>
                     </child>
                     <child>
-                      <object class="GtkTable" id="cSFSleepStageStats">
+                      <object class="GtkGrid" id="cSFSleepStageStats">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="halign">start</property>
                         <property name="valign">center</property>
                         <property name="margin_left">10</property>
                         <property name="margin_right">10</property>
-                        <property name="n_rows">2</property>
-                        <property name="n_columns">5</property>
-                        <property name="column_spacing">4</property>
+                        <property name="column_spacing">5</property>
                         <child>
-                          <object class="GtkLabel" id="label202">
+                          <object class="GtkLabel" id="lScoreStatsREMPercent">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
-                            <property name="xalign">0</property>
-                            <property name="label" translatable="yes"><small>NREM</small></property>
+                            <property name="label" translatable="yes">%%</property>
                             <property name="use_markup">True</property>
+                            <property name="xalign">1</property>
                           </object>
                           <packing>
-                            <property name="left_attach">1</property>
-                            <property name="right_attach">2</property>
-                            <property name="top_attach">1</property>
-                            <property name="bottom_attach">2</property>
-                            <property name="x_options">GTK_FILL</property>
-                            <property name="y_options">GTK_FILL</property>
+                            <property name="left_attach">2</property>
+                            <property name="top_attach">0</property>
                           </packing>
                         </child>
                         <child>
                           <object class="GtkLabel" id="label203">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
-                            <property name="xalign">0</property>
                             <property name="label" translatable="yes"><small>REM</small></property>
                             <property name="use_markup">True</property>
+                            <property name="xalign">0</property>
                           </object>
                           <packing>
                             <property name="left_attach">1</property>
-                            <property name="right_attach">2</property>
-                            <property name="x_options">GTK_FILL</property>
-                            <property name="y_options">GTK_FILL</property>
+                            <property name="top_attach">0</property>
                           </packing>
                         </child>
                         <child>
-                          <object class="GtkLabel" id="label204">
+                          <object class="GtkLabel" id="lScoreStatsWakePercent">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
-                            <property name="xalign">0</property>
-                            <property name="label" translatable="yes"><small>Wake</small></property>
+                            <property name="halign">end</property>
+                            <property name="label" translatable="yes">%%</property>
                             <property name="use_markup">True</property>
+                            <property name="xalign">1</property>
                           </object>
                           <packing>
-                            <property name="left_attach">4</property>
-                            <property name="right_attach">5</property>
-                            <property name="x_options">GTK_FILL</property>
-                            <property name="y_options">GTK_FILL</property>
+                            <property name="left_attach">2</property>
+                            <property name="top_attach">1</property>
                           </packing>
                         </child>
                         <child>
-                          <object class="GtkLabel" id="lScoreStatsNREMPercent">
+                          <object class="GtkLabel" id="label204">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
-                            <property name="xalign">1</property>
-                            <property name="label" translatable="yes">%%</property>
+                            <property name="label" translatable="yes"><small>Wake</small></property>
+                            <property name="use_markup">True</property>
+                            <property name="xalign">0</property>
                           </object>
                           <packing>
+                            <property name="left_attach">1</property>
                             <property name="top_attach">1</property>
-                            <property name="bottom_attach">2</property>
-                            <property name="x_options">GTK_FILL</property>
-                            <property name="y_options">GTK_FILL</property>
                           </packing>
                         </child>
                         <child>
-                          <object class="GtkLabel" id="lScoreStatsREMPercent">
+                          <object class="GtkLabel" id="lSFPercentScored">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
-                            <property name="xalign">1</property>
-                            <property name="label" translatable="yes">%%</property>
+                            <property name="halign">start</property>
+                            <property name="label" translatable="yes">percent scored</property>
                             <property name="use_markup">True</property>
+                            <property name="xalign">0</property>
                           </object>
                           <packing>
-                            <property name="x_options">GTK_FILL</property>
-                            <property name="y_options">GTK_FILL</property>
+                            <property name="left_attach">0</property>
+                            <property name="top_attach">2</property>
                           </packing>
                         </child>
                         <child>
-                          <object class="GtkLabel" id="lScoreStatsWakePercent">
+                          <object class="GtkLabel" id="lScoreStatsNREMPercent">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
-                            <property name="halign">end</property>
-                            <property name="xalign">1</property>
                             <property name="label" translatable="yes">%%</property>
-                            <property name="use_markup">True</property>
+                            <property name="xalign">1</property>
                           </object>
                           <packing>
-                            <property name="left_attach">3</property>
-                            <property name="right_attach">4</property>
-                            <property name="x_options">GTK_FILL</property>
-                            <property name="y_options">GTK_FILL</property>
+                            <property name="left_attach">2</property>
+                            <property name="top_attach">2</property>
                           </packing>
                         </child>
                         <child>
-                          <object class="GtkLabel" id="lSFPercentScored">
+                          <object class="GtkLabel" id="label202">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
-                            <property name="halign">start</property>
-                            <property name="xalign">0</property>
-                            <property name="label" translatable="yes">percent scored</property>
+                            <property name="label" translatable="yes"><small>NREM</small></property>
                             <property name="use_markup">True</property>
+                            <property name="xalign">0</property>
                           </object>
                           <packing>
-                            <property name="left_attach">3</property>
-                            <property name="right_attach">5</property>
-                            <property name="top_attach">1</property>
-                            <property name="bottom_attach">2</property>
-                            <property name="x_options">GTK_FILL</property>
-                            <property name="y_options">GTK_FILL</property>
+                            <property name="left_attach">1</property>
+                            <property name="top_attach">2</property>
                           </packing>
                         </child>
                         <child>
@@ -1694,8 +1614,8 @@
                             <property name="halign">end</property>
                             <property name="margin_left">5</property>
                             <property name="margin_right">2</property>
-                            <property name="xalign">1</property>
                             <property name="label" translatable="yes"># of ICs:</property>
+                            <property name="xalign">1</property>
                             <attributes>
                               <attribute name="scale" value="0.80000000000000004"/>
                             </attributes>
@@ -1703,8 +1623,6 @@
                           <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>
@@ -1717,7 +1635,6 @@
                             <property name="has_frame">False</property>
                             <property name="invisible_char">•</property>
                             <property name="xalign">1</property>
-                            <property name="invisible_char_set">True</property>
                             <property name="input_purpose">number</property>
                             <property name="adjustment">jSFICANofICs</property>
                             <property name="snap_to_ticks">True</property>
@@ -1726,8 +1643,6 @@
                           <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>
@@ -1736,9 +1651,9 @@
                             <property name="can_focus">False</property>
                             <property name="margin_left">5</property>
                             <property name="margin_right">2</property>
+                            <property name="label" translatable="yes">Keep eigenv:</property>
                             <property name="xalign">0</property>
                             <property name="yalign">1</property>
-                            <property name="label" translatable="yes">Keep eigenv:</property>
                             <attributes>
                               <attribute name="scale" value="0.80000000000000004"/>
                             </attributes>
@@ -1747,7 +1662,6 @@
                             <property name="left_attach">0</property>
                             <property name="top_attach">1</property>
                             <property name="width">2</property>
-                            <property name="height">1</property>
                           </packing>
                         </child>
                         <child>
@@ -1761,7 +1675,6 @@
                                 <property name="has_frame">False</property>
                                 <property name="invisible_char">•</property>
                                 <property name="xalign">1</property>
-                                <property name="invisible_char_set">True</property>
                                 <property name="input_purpose">number</property>
                                 <property name="adjustment">jSFICAEigVecFirst</property>
                                 <property name="snap_to_ticks">True</property>
@@ -1792,7 +1705,6 @@
                                 <property name="has_frame">False</property>
                                 <property name="invisible_char">•</property>
                                 <property name="xalign">1</property>
-                                <property name="invisible_char_set">True</property>
                                 <property name="input_purpose">number</property>
                                 <property name="adjustment">jSFICAEigVecLast</property>
                                 <property name="snap_to_ticks">True</property>
@@ -1809,7 +1721,6 @@
                             <property name="left_attach">0</property>
                             <property name="top_attach">2</property>
                             <property name="width">2</property>
-                            <property name="height">1</property>
                           </packing>
                         </child>
                         <child>
@@ -1819,8 +1730,8 @@
                             <property name="halign">end</property>
                             <property name="margin_left">5</property>
                             <property name="margin_right">2</property>
-                            <property name="xalign">1</property>
                             <property name="label" translatable="yes">% samples:</property>
+                            <property name="xalign">1</property>
                             <attributes>
                               <attribute name="scale" value="0.80000000000000004"/>
                             </attributes>
@@ -1828,8 +1739,6 @@
                           <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>
@@ -1845,7 +1754,6 @@
                             <property name="has_frame">False</property>
                             <property name="invisible_char">•</property>
                             <property name="xalign">1</property>
-                            <property name="invisible_char_set">True</property>
                             <property name="input_purpose">number</property>
                             <property name="adjustment">jSFICASampleSizePercent</property>
                             <property name="digits">1</property>
@@ -1854,8 +1762,6 @@
                           <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>
@@ -1865,8 +1771,8 @@
                             <property name="halign">end</property>
                             <property name="margin_left">5</property>
                             <property name="margin_right">2</property>
-                            <property name="xalign">1</property>
                             <property name="label" translatable="yes">Max iters:</property>
+                            <property name="xalign">1</property>
                             <attributes>
                               <attribute name="scale" value="0.80000000000000004"/>
                             </attributes>
@@ -1874,8 +1780,6 @@
                           <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>
@@ -1891,7 +1795,6 @@
                             <property name="has_frame">False</property>
                             <property name="invisible_char">•</property>
                             <property name="xalign">1</property>
-                            <property name="invisible_char_set">True</property>
                             <property name="input_purpose">number</property>
                             <property name="adjustment">jSFICAMaxIterations</property>
                             <property name="numeric">True</property>
@@ -1899,8 +1802,6 @@
                           <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>
                         <child>
@@ -1910,16 +1811,14 @@
                             <property name="halign">end</property>
                             <property name="margin_left">5</property>
                             <property name="margin_right">2</property>
-                            <property name="xalign">1</property>
                             <property name="xpad">1</property>
                             <property name="label" translatable="yes">𝜀</property>
                             <property name="use_markup">True</property>
+                            <property name="xalign">1</property>
                           </object>
                           <packing>
                             <property name="left_attach">4</property>
                             <property name="top_attach">0</property>
-                            <property name="width">1</property>
-                            <property name="height">1</property>
                           </packing>
                         </child>
                         <child>
@@ -1934,7 +1833,6 @@
                             <property name="has_frame">False</property>
                             <property name="invisible_char">•</property>
                             <property name="xalign">1</property>
-                            <property name="invisible_char_set">True</property>
                             <property name="input_purpose">number</property>
                             <property name="adjustment">jSFICAepsilon</property>
                             <property name="digits">5</property>
@@ -1943,8 +1841,6 @@
                           <packing>
                             <property name="left_attach">5</property>
                             <property name="top_attach">0</property>
-                            <property name="width">1</property>
-                            <property name="height">1</property>
                           </packing>
                         </child>
                         <child>
@@ -1954,16 +1850,14 @@
                             <property name="halign">end</property>
                             <property name="margin_left">5</property>
                             <property name="margin_right">2</property>
-                            <property name="xalign">1</property>
                             <property name="xpad">1</property>
                             <property name="label" translatable="yes">𝜇</property>
                             <property name="use_markup">True</property>
+                            <property name="xalign">1</property>
                           </object>
                           <packing>
                             <property name="left_attach">4</property>
                             <property name="top_attach">1</property>
-                            <property name="width">1</property>
-                            <property name="height">1</property>
                           </packing>
                         </child>
                         <child>
@@ -1980,7 +1874,6 @@ the stabilized version of the algorithm</property>
                             <property name="has_frame">False</property>
                             <property name="invisible_char">•</property>
                             <property name="xalign">1</property>
-                            <property name="invisible_char_set">True</property>
                             <property name="input_purpose">number</property>
                             <property name="adjustment">jSFICAmu</property>
                             <property name="digits">2</property>
@@ -1989,8 +1882,6 @@ the stabilized version of the algorithm</property>
                           <packing>
                             <property name="left_attach">5</property>
                             <property name="top_attach">1</property>
-                            <property name="width">1</property>
-                            <property name="height">1</property>
                           </packing>
                         </child>
                         <child>
@@ -2023,8 +1914,6 @@ for the rest of the rounds.</property>
                           <packing>
                             <property name="left_attach">6</property>
                             <property name="top_attach">0</property>
-                            <property name="width">1</property>
-                            <property name="height">1</property>
                           </packing>
                         </child>
                         <child>
@@ -2044,8 +1933,6 @@ for the rest of the rounds.</property>
                           <packing>
                             <property name="left_attach">6</property>
                             <property name="top_attach">1</property>
-                            <property name="width">1</property>
-                            <property name="height">1</property>
                           </packing>
                         </child>
                         <child>
@@ -2055,8 +1942,8 @@ for the rest of the rounds.</property>
                             <property name="halign">end</property>
                             <property name="margin_left">10</property>
                             <property name="margin_right">2</property>
-                            <property name="xalign">0</property>
                             <property name="label" translatable="yes">Approach:</property>
+                            <property name="xalign">0</property>
                             <attributes>
                               <attribute name="scale" value="0.80000000000000004"/>
                             </attributes>
@@ -2064,8 +1951,6 @@ for the rest of the rounds.</property>
                           <packing>
                             <property name="left_attach">2</property>
                             <property name="top_attach">2</property>
-                            <property name="width">1</property>
-                            <property name="height">1</property>
                           </packing>
                         </child>
                         <child>
@@ -2084,8 +1969,6 @@ for the rest of the rounds.</property>
                           <packing>
                             <property name="left_attach">3</property>
                             <property name="top_attach">2</property>
-                            <property name="width">1</property>
-                            <property name="height">1</property>
                           </packing>
                         </child>
                         <child>
@@ -2103,8 +1986,6 @@ for the rest of the rounds.</property>
                           <packing>
                             <property name="left_attach">6</property>
                             <property name="top_attach">2</property>
-                            <property name="width">1</property>
-                            <property name="height">1</property>
                           </packing>
                         </child>
                         <child>
@@ -2131,7 +2012,6 @@ skew:	𝑔(𝑢) = 𝑢2</property>
                             <property name="left_attach">7</property>
                             <property name="top_attach">2</property>
                             <property name="width">2</property>
-                            <property name="height">1</property>
                           </packing>
                         </child>
                         <child>
@@ -2141,15 +2021,13 @@ skew:	𝑔(𝑢) = 𝑢2</property>
                             <property name="halign">end</property>
                             <property name="margin_left">10</property>
                             <property name="margin_right">2</property>
-                            <property name="xalign">1</property>
                             <property name="label" translatable="yes">𝑎₁</property>
                             <property name="use_markup">True</property>
+                            <property name="xalign">1</property>
                           </object>
                           <packing>
                             <property name="left_attach">7</property>
                             <property name="top_attach">0</property>
-                            <property name="width">1</property>
-                            <property name="height">1</property>
                           </packing>
                         </child>
                         <child>
@@ -2159,15 +2037,13 @@ skew:	𝑔(𝑢) = 𝑢2</property>
                             <property name="halign">end</property>
                             <property name="margin_left">10</property>
                             <property name="margin_right">2</property>
-                            <property name="xalign">1</property>
                             <property name="label" translatable="yes">𝑎₂</property>
                             <property name="use_markup">True</property>
+                            <property name="xalign">1</property>
                           </object>
                           <packing>
                             <property name="left_attach">7</property>
                             <property name="top_attach">1</property>
-                            <property name="width">1</property>
-                            <property name="height">1</property>
                           </packing>
                         </child>
                         <child>
@@ -2183,7 +2059,6 @@ skew:	𝑔(𝑢) = 𝑢2</property>
                             <property name="has_frame">False</property>
                             <property name="invisible_char">•</property>
                             <property name="xalign">1</property>
-                            <property name="invisible_char_set">True</property>
                             <property name="input_purpose">number</property>
                             <property name="adjustment">jSFICAa1</property>
                             <property name="digits">2</property>
@@ -2192,8 +2067,6 @@ skew:	𝑔(𝑢) = 𝑢2</property>
                           <packing>
                             <property name="left_attach">8</property>
                             <property name="top_attach">0</property>
-                            <property name="width">1</property>
-                            <property name="height">1</property>
                           </packing>
                         </child>
                         <child>
@@ -2209,7 +2082,6 @@ skew:	𝑔(𝑢) = 𝑢2</property>
                             <property name="has_frame">False</property>
                             <property name="invisible_char">•</property>
                             <property name="xalign">1</property>
-                            <property name="invisible_char_set">True</property>
                             <property name="input_purpose">number</property>
                             <property name="adjustment">jSFICAa2</property>
                             <property name="digits">2</property>
@@ -2218,8 +2090,6 @@ skew:	𝑔(𝑢) = 𝑢2</property>
                           <packing>
                             <property name="left_attach">8</property>
                             <property name="top_attach">1</property>
-                            <property name="width">1</property>
-                            <property name="height">1</property>
                           </packing>
                         </child>
                         <child>
@@ -2235,8 +2105,6 @@ skew:	𝑔(𝑢) = 𝑢2</property>
                           <packing>
                             <property name="left_attach">11</property>
                             <property name="top_attach">0</property>
-                            <property name="width">1</property>
-                            <property name="height">1</property>
                           </packing>
                         </child>
                         <child>
@@ -2251,8 +2119,6 @@ skew:	𝑔(𝑢) = 𝑢2</property>
                           <packing>
                             <property name="left_attach">11</property>
                             <property name="top_attach">1</property>
-                            <property name="width">1</property>
-                            <property name="height">1</property>
                           </packing>
                         </child>
                         <child>
@@ -2270,7 +2136,6 @@ skew:	𝑔(𝑢) = 𝑢2</property>
                             <property name="left_attach">9</property>
                             <property name="top_attach">2</property>
                             <property name="width">3</property>
-                            <property name="height">1</property>
                           </packing>
                         </child>
                         <child>
@@ -2281,8 +2146,8 @@ skew:	𝑔(𝑢) = 𝑢2</property>
                             <property name="valign">end</property>
                             <property name="margin_left">5</property>
                             <property name="margin_right">5</property>
-                            <property name="xalign">0</property>
                             <property name="label" translatable="yes">Remix mode:</property>
+                            <property name="xalign">0</property>
                             <attributes>
                               <attribute name="scale" value="0.80000000000000004"/>
                             </attributes>
@@ -2290,8 +2155,6 @@ skew:	𝑔(𝑢) = 𝑢2</property>
                           <packing>
                             <property name="left_attach">9</property>
                             <property name="top_attach">0</property>
-                            <property name="width">1</property>
-                            <property name="height">1</property>
                           </packing>
                         </child>
                         <child>
@@ -2312,8 +2175,6 @@ skew:	𝑔(𝑢) = 𝑢2</property>
                           <packing>
                             <property name="left_attach">9</property>
                             <property name="top_attach">1</property>
-                            <property name="width">1</property>
-                            <property name="height">1</property>
                           </packing>
                         </child>
                         <child>
@@ -2328,8 +2189,6 @@ skew:	𝑔(𝑢) = 𝑢2</property>
                           <packing>
                             <property name="left_attach">10</property>
                             <property name="top_attach">0</property>
-                            <property name="width">1</property>
-                            <property name="height">1</property>
                           </packing>
                         </child>
                         <child>
@@ -2413,70 +2272,187 @@ skew:	𝑔(𝑢) = 𝑢2</property>
                 </child>
               </object>
               <packing>
-                <property name="expand">True</property>
-                <property name="fill">True</property>
-                <property name="position">5</property>
+                <property name="left_attach">4</property>
+                <property name="top_attach">0</property>
               </packing>
             </child>
           </object>
           <packing>
-            <property name="expand">False</property>
-            <property name="fill">True</property>
-            <property name="padding">3</property>
-            <property name="position">2</property>
+            <property name="left_attach">0</property>
+            <property name="top_attach">2</property>
           </packing>
         </child>
       </object>
     </child>
   </object>
-  <object class="GtkDialog" id="wSFAnnotationLabel">
+  <object class="GtkDialog" id="wSFICAMatrix">
     <property name="can_focus">False</property>
     <property name="border_width">5</property>
-    <property name="title" translatable="yes">New annotation</property>
+    <property name="title" translatable="yes">Matrix</property>
+    <property name="resizable">False</property>
     <property name="modal">True</property>
     <property name="window_position">mouse</property>
     <property name="destroy_with_parent">True</property>
     <property name="type_hint">dialog</property>
+    <property name="skip_taskbar_hint">True</property>
+    <property name="skip_pager_hint">True</property>
+    <property name="decorated">False</property>
+    <property name="gravity">north-east</property>
+    <property name="transient_for">wSF</property>
     <signal name="close" handler="gtk_widget_hide_on_delete" swapped="no"/>
     <signal name="response" handler="gtk_widget_hide_on_delete" swapped="no"/>
     <child internal-child="vbox">
-      <object class="GtkBox" id="dialog-vbox4">
+      <object class="GtkBox" id="dialog-vbox8">
         <property name="can_focus">False</property>
         <property name="orientation">vertical</property>
-        <property name="spacing">10</property>
+        <property name="spacing">2</property>
+        <child internal-child="action_area">
+          <object class="GtkButtonBox" id="dialog-action_area8">
+            <property name="can_focus">False</property>
+            <property name="layout_style">end</property>
+            <child>
+              <placeholder/>
+            </child>
+            <child>
+              <object class="GtkButton" id="button7">
+                <property name="label" translatable="yes">_Dismiss</property>
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="receives_default">True</property>
+                <property name="use_underline">True</property>
+                <property name="focus_on_click">False</property>
+                <signal name="clicked" handler="gtk_widget_hide" swapped="no"/>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">True</property>
+                <property name="position">1</property>
+                <property name="secondary">True</property>
+              </packing>
+            </child>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">True</property>
+            <property name="pack_type">end</property>
+            <property name="position">0</property>
+          </packing>
+        </child>
         <child>
-          <object class="GtkFrame" id="frame1">
+          <object class="GtkBox" id="box4">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="label_xalign">0</property>
-            <property name="shadow_type">none</property>
+            <property name="border_width">5</property>
+            <property name="orientation">vertical</property>
             <child>
-              <object class="GtkEntry" id="eSFAnnotationLabel">
+              <object class="GtkLabel" id="label13">
                 <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="margin_top">5</property>
-                <property name="margin_bottom">5</property>
-                <property name="max_length">120</property>
-                <property name="invisible_char">•</property>
-                <property name="activates_default">True</property>
-                <property name="invisible_char_set">True</property>
+                <property name="can_focus">False</property>
+                <property name="label" translatable="yes">Separating matrix</property>
+                <property name="xalign">0</property>
               </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">True</property>
+                <property name="position">0</property>
+              </packing>
             </child>
-            <child type="label">
-              <object class="GtkLabel" id="label1">
+            <child>
+              <object class="GtkSeparator" id="separator11">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes"><b>Annotation name</b></property>
-                <property name="use_markup">True</property>
               </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">True</property>
+                <property name="position">1</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkTextView" id="tSFICAMatrix">
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="pixels_above_lines">5</property>
+                <property name="pixels_below_lines">5</property>
+                <property name="editable">False</property>
+                <property name="left_margin">6</property>
+                <property name="right_margin">6</property>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">True</property>
+                <property name="position">2</property>
+              </packing>
             </child>
           </object>
           <packing>
             <property name="expand">False</property>
             <property name="fill">True</property>
-            <property name="position">0</property>
+            <property name="position">1</property>
           </packing>
         </child>
+      </object>
+    </child>
+    <action-widgets>
+      <action-widget response="-1">button7</action-widget>
+    </action-widgets>
+  </object>
+  <object class="GtkSizeGroup" id="zModeContainers">
+    <widgets>
+      <widget name="cSFICAModeContainer"/>
+      <widget name="cSFScoringModeContainer"/>
+    </widgets>
+  </object>
+  <object class="GtkListStore" id="mSFScoringPageSize">
+    <columns>
+      <!-- column-name PageSize -->
+      <column type="gchararray"/>
+    </columns>
+    <data>
+      <row>
+        <col id="0" translatable="yes">4 sec</col>
+      </row>
+      <row>
+        <col id="0" translatable="yes">5 sec</col>
+      </row>
+      <row>
+        <col id="0" translatable="yes">10 sec</col>
+      </row>
+      <row>
+        <col id="0" translatable="yes">15 sec</col>
+      </row>
+      <row>
+        <col id="0" translatable="yes">20 sec</col>
+      </row>
+      <row>
+        <col id="0" translatable="yes">30 sec</col>
+      </row>
+      <row>
+        <col id="0" translatable="yes">1 min</col>
+      </row>
+      <row>
+        <col id="0" translatable="yes">2 min</col>
+      </row>
+      <row>
+        <col id="0" translatable="yes">5 min</col>
+      </row>
+    </data>
+  </object>
+  <object class="GtkDialog" id="wSFAnnotationLabel">
+    <property name="can_focus">False</property>
+    <property name="border_width">5</property>
+    <property name="title" translatable="yes">New annotation</property>
+    <property name="modal">True</property>
+    <property name="window_position">mouse</property>
+    <property name="destroy_with_parent">True</property>
+    <property name="type_hint">dialog</property>
+    <signal name="close" handler="gtk_widget_hide_on_delete" swapped="no"/>
+    <signal name="response" handler="gtk_widget_hide_on_delete" swapped="no"/>
+    <child internal-child="vbox">
+      <object class="GtkBox" id="dialog-vbox4">
+        <property name="can_focus">False</property>
+        <property name="orientation">vertical</property>
+        <property name="spacing">10</property>
         <child internal-child="action_area">
           <object class="GtkButtonBox" id="dialog-action_area4">
             <property name="can_focus">False</property>
@@ -2520,6 +2496,38 @@ skew:	𝑔(𝑢) = 𝑢2</property>
           </packing>
         </child>
         <child>
+          <object class="GtkFrame" id="frame1">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="label_xalign">0</property>
+            <property name="shadow_type">none</property>
+            <child>
+              <object class="GtkEntry" id="eSFAnnotationLabel">
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="margin_top">5</property>
+                <property name="margin_bottom">5</property>
+                <property name="max_length">120</property>
+                <property name="invisible_char">•</property>
+                <property name="activates_default">True</property>
+              </object>
+            </child>
+            <child type="label">
+              <object class="GtkLabel" id="label1">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="label" translatable="yes"><b>Annotation name</b></property>
+                <property name="use_markup">True</property>
+              </object>
+            </child>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">True</property>
+            <property name="position">0</property>
+          </packing>
+        </child>
+        <child>
           <object class="GtkFrame" id="frame2">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
@@ -2695,9 +2703,9 @@ skew:	𝑔(𝑢) = 𝑢2</property>
               <object class="GtkLabel" id="label2">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="xalign">0.0099999997764825821</property>
                 <property name="label" translatable="yes">_Annotations under pointer:</property>
                 <property name="use_underline">True</property>
+                <property name="xalign">0.0099999997764825821</property>
               </object>
               <packing>
                 <property name="expand">False</property>
@@ -2730,122 +2738,4 @@ skew:	𝑔(𝑢) = 𝑢2</property>
       <action-widget response="-5">button6</action-widget>
     </action-widgets>
   </object>
-  <object class="GtkDialog" id="wSFICAMatrix">
-    <property name="can_focus">False</property>
-    <property name="border_width">5</property>
-    <property name="title" translatable="yes">Matrix</property>
-    <property name="resizable">False</property>
-    <property name="modal">True</property>
-    <property name="window_position">mouse</property>
-    <property name="destroy_with_parent">True</property>
-    <property name="type_hint">dialog</property>
-    <property name="skip_taskbar_hint">True</property>
-    <property name="skip_pager_hint">True</property>
-    <property name="decorated">False</property>
-    <property name="gravity">north-east</property>
-    <property name="transient_for">wSF</property>
-    <signal name="close" handler="gtk_widget_hide_on_delete" swapped="no"/>
-    <signal name="response" handler="gtk_widget_hide_on_delete" swapped="no"/>
-    <child internal-child="vbox">
-      <object class="GtkBox" id="dialog-vbox8">
-        <property name="can_focus">False</property>
-        <property name="orientation">vertical</property>
-        <property name="spacing">2</property>
-        <child internal-child="action_area">
-          <object class="GtkButtonBox" id="dialog-action_area8">
-            <property name="can_focus">False</property>
-            <property name="layout_style">end</property>
-            <child>
-              <placeholder/>
-            </child>
-            <child>
-              <object class="GtkButton" id="button7">
-                <property name="label" translatable="yes">_Dismiss</property>
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="receives_default">True</property>
-                <property name="use_underline">True</property>
-                <property name="focus_on_click">False</property>
-                <signal name="clicked" handler="gtk_widget_hide" swapped="no"/>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">True</property>
-                <property name="position">1</property>
-                <property name="secondary">True</property>
-              </packing>
-            </child>
-          </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="fill">True</property>
-            <property name="pack_type">end</property>
-            <property name="position">0</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkBox" id="box4">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="border_width">5</property>
-            <property name="orientation">vertical</property>
-            <child>
-              <object class="GtkLabel" id="label13">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="xalign">0</property>
-                <property name="label" translatable="yes">Separating matrix</property>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">True</property>
-                <property name="position">0</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkSeparator" id="separator11">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">True</property>
-                <property name="position">1</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkTextView" id="tSFICAMatrix">
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="pixels_above_lines">5</property>
-                <property name="pixels_below_lines">5</property>
-                <property name="editable">False</property>
-                <property name="left_margin">6</property>
-                <property name="right_margin">6</property>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">True</property>
-                <property name="position">2</property>
-              </packing>
-            </child>
-          </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="fill">True</property>
-            <property name="position">1</property>
-          </packing>
-        </child>
-      </object>
-    </child>
-    <action-widgets>
-      <action-widget response="-1">button7</action-widget>
-    </action-widgets>
-  </object>
-  <object class="GtkSizeGroup" id="zModeContainers">
-    <widgets>
-      <widget name="cSFICAModeContainer"/>
-      <widget name="cSFScoringModeContainer"/>
-    </widgets>
-  </object>
 </interface>

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/aghermann.git



More information about the debian-med-commit mailing list