[med-svn] [aghermann] 64/85: size-group for profile mgmt buttons

andrei zavada hmmr-guest at alioth.debian.org
Thu Sep 26 23:46:33 UTC 2013


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

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

commit 8351c4f934bf0be1782eddb03f59f0b0eeb0622e
Author: Andrei Zavada <johnhommer at gmail.com>
Date:   Sat Sep 21 14:51:56 2013 +0300

    size-group for profile mgmt buttons
---
 upstream/data/sf-artifacts.glade |    7 ++
 upstream/data/sf-patterns.glade  |  159 +++++++++++++++++++++-----------------
 upstream/data/sf-rk1968.glade    |   24 ++++--
 3 files changed, 110 insertions(+), 80 deletions(-)

diff --git a/upstream/data/sf-artifacts.glade b/upstream/data/sf-artifacts.glade
index b1470e9..c04e12b 100644
--- a/upstream/data/sf-artifacts.glade
+++ b/upstream/data/sf-artifacts.glade
@@ -1178,4 +1178,11 @@
       <widget name="eSFADLowerThr"/>
     </widgets>
   </object>
+  <object class="GtkSizeGroup" id="zSFADProfileManageButtons">
+    <widgets>
+      <widget name="bSFADProfileRevert"/>
+      <widget name="bSFADProfileSave"/>
+      <widget name="bSFADProfileDelete"/>
+    </widgets>
+  </object>
 </interface>
diff --git a/upstream/data/sf-patterns.glade b/upstream/data/sf-patterns.glade
index 3b4dc57..718841f 100644
--- a/upstream/data/sf-patterns.glade
+++ b/upstream/data/sf-patterns.glade
@@ -1,72 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <!-- interface-requires gtk+ 3.0 -->
-  <object class="GtkAdjustment" id="jSFFDBandPassUpto">
-    <property name="upper">50</property>
-    <property name="value">1.5</property>
-    <property name="step_increment">0.25</property>
-    <property name="page_increment">1</property>
-  </object>
-  <object class="GtkAdjustment" id="jSFFDCriterionA">
-    <property name="lower">0.01</property>
-    <property name="upper">100</property>
-    <property name="value">0.10000000000000001</property>
-    <property name="step_increment">0.01</property>
-    <property name="page_increment">1</property>
-  </object>
-  <object class="GtkAdjustment" id="jSFFDCriterionB">
-    <property name="lower">0.01</property>
-    <property name="upper">100</property>
-    <property name="value">0.10000000000000001</property>
-    <property name="step_increment">0.01</property>
-    <property name="page_increment">1</property>
-  </object>
-  <object class="GtkAdjustment" id="jSFFDCriterionC">
-    <property name="lower">0.01</property>
-    <property name="upper">100</property>
-    <property name="value">0.10000000000000001</property>
-    <property name="step_increment">0.010000003501772881</property>
-    <property name="page_increment">1</property>
-  </object>
-  <object class="GtkAdjustment" id="jSFFDCriterionD">
-    <property name="lower">0.01</property>
-    <property name="upper">2</property>
-    <property name="value">0.10000000000000001</property>
-    <property name="step_increment">0.01</property>
-    <property name="page_increment">0.10000000000000001</property>
-  </object>
-  <object class="GtkAdjustment" id="jSFFDDZCDFSigma">
-    <property name="lower">0.01</property>
-    <property name="upper">10</property>
-    <property name="step_increment">0.01</property>
-    <property name="page_increment">10</property>
-  </object>
-  <object class="GtkAdjustment" id="jSFFDDZCDFSmooth">
-    <property name="upper">12</property>
-    <property name="value">1</property>
-    <property name="step_increment">1</property>
-    <property name="page_increment">3</property>
-  </object>
-  <object class="GtkAdjustment" id="jSFFDDZCDFStep">
-    <property name="lower">0.10000000000000001</property>
-    <property name="upper">5</property>
-    <property name="step_increment">0.10000000000000001</property>
-    <property name="page_increment">10</property>
-  </object>
-  <object class="GtkAdjustment" id="jSFFDEnvTightness">
-    <property name="lower">0.050000000000000003</property>
-    <property name="upper">20</property>
-    <property name="value">0.25</property>
-    <property name="step_increment">0.01</property>
-    <property name="page_increment">5</property>
-  </object>
-  <object class="GtkAdjustment" id="jSFFDIncrement">
-    <property name="lower">0.01</property>
-    <property name="upper">0.5</property>
-    <property name="value">0.050000000000000003</property>
-    <property name="step_increment">0.01</property>
-    <property name="page_increment">0.10000000000000001</property>
-  </object>
   <object class="GtkMenu" id="iiSFFDField">
     <property name="visible">True</property>
     <property name="can_focus">False</property>
@@ -153,6 +87,72 @@
     <property name="step_increment">1</property>
     <property name="page_increment">10</property>
   </object>
+  <object class="GtkAdjustment" id="jSFFDBandPassUpto">
+    <property name="upper">50</property>
+    <property name="value">1.5</property>
+    <property name="step_increment">0.25</property>
+    <property name="page_increment">1</property>
+  </object>
+  <object class="GtkAdjustment" id="jSFFDCriterionA">
+    <property name="lower">0.01</property>
+    <property name="upper">100</property>
+    <property name="value">0.10000000000000001</property>
+    <property name="step_increment">0.01</property>
+    <property name="page_increment">1</property>
+  </object>
+  <object class="GtkAdjustment" id="jSFFDCriterionB">
+    <property name="lower">0.01</property>
+    <property name="upper">100</property>
+    <property name="value">0.10000000000000001</property>
+    <property name="step_increment">0.01</property>
+    <property name="page_increment">1</property>
+  </object>
+  <object class="GtkAdjustment" id="jSFFDCriterionC">
+    <property name="lower">0.01</property>
+    <property name="upper">100</property>
+    <property name="value">0.10000000000000001</property>
+    <property name="step_increment">0.010000003501772881</property>
+    <property name="page_increment">1</property>
+  </object>
+  <object class="GtkAdjustment" id="jSFFDCriterionD">
+    <property name="lower">0.01</property>
+    <property name="upper">2</property>
+    <property name="value">0.10000000000000001</property>
+    <property name="step_increment">0.01</property>
+    <property name="page_increment">0.10000000000000001</property>
+  </object>
+  <object class="GtkAdjustment" id="jSFFDDZCDFSigma">
+    <property name="lower">0.01</property>
+    <property name="upper">10</property>
+    <property name="step_increment">0.01</property>
+    <property name="page_increment">10</property>
+  </object>
+  <object class="GtkAdjustment" id="jSFFDDZCDFSmooth">
+    <property name="upper">12</property>
+    <property name="value">1</property>
+    <property name="step_increment">1</property>
+    <property name="page_increment">3</property>
+  </object>
+  <object class="GtkAdjustment" id="jSFFDDZCDFStep">
+    <property name="lower">0.10000000000000001</property>
+    <property name="upper">5</property>
+    <property name="step_increment">0.10000000000000001</property>
+    <property name="page_increment">10</property>
+  </object>
+  <object class="GtkAdjustment" id="jSFFDEnvTightness">
+    <property name="lower">0.050000000000000003</property>
+    <property name="upper">20</property>
+    <property name="value">0.25</property>
+    <property name="step_increment">0.01</property>
+    <property name="page_increment">5</property>
+  </object>
+  <object class="GtkAdjustment" id="jSFFDIncrement">
+    <property name="lower">0.01</property>
+    <property name="upper">0.5</property>
+    <property name="value">0.050000000000000003</property>
+    <property name="step_increment">0.01</property>
+    <property name="page_increment">0.10000000000000001</property>
+  </object>
   <object class="GtkMenu" id="menu2">
     <property name="visible">True</property>
     <property name="can_focus">False</property>
@@ -457,24 +457,24 @@
                   <object class="GtkHBox" id="cSFFDLabelBox">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
+                    <property name="spacing">5</property>
                     <child>
-                      <object class="GtkComboBox" id="eSFFDProfileList">
+                      <object class="GtkButton" id="bSFFDProfileRevert">
+                        <property name="label" translatable="yes">Revert</property>
                         <property name="visible">True</property>
-                        <property name="can_focus">False</property>
+                        <property name="can_focus">True</property>
+                        <property name="receives_default">True</property>
                       </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="GtkButton" id="bSFFDProfileRevert">
-                        <property name="label" translatable="yes">Revert</property>
+                      <object class="GtkComboBox" id="eSFFDProfileList">
                         <property name="visible">True</property>
-                        <property name="can_focus">True</property>
-                        <property name="receives_default">True</property>
+                        <property name="can_focus">False</property>
                       </object>
                       <packing>
                         <property name="expand">False</property>
@@ -1240,6 +1240,12 @@ on individual parameters</property>
                         <child>
                           <placeholder/>
                         </child>
+                        <child>
+                          <placeholder/>
+                        </child>
+                        <child>
+                          <placeholder/>
+                        </child>
                       </object>
                       <packing>
                         <property name="top_attach">1</property>
@@ -1603,4 +1609,11 @@ on individual parameters</property>
     </widgets>
   </object>
   <object class="GtkSizeGroup" id="zSFFDControls"/>
+  <object class="GtkSizeGroup" id="zSFFDProfileManageButtons">
+    <widgets>
+      <widget name="bSFFDProfileRevert"/>
+      <widget name="bSFFDProfileSave"/>
+      <widget name="bSFFDProfileDiscard"/>
+    </widgets>
+  </object>
 </interface>
diff --git a/upstream/data/sf-rk1968.glade b/upstream/data/sf-rk1968.glade
index fedafaa..8cdcb1c 100644
--- a/upstream/data/sf-rk1968.glade
+++ b/upstream/data/sf-rk1968.glade
@@ -147,24 +147,24 @@
                   <object class="GtkHBox" id="cSFRKLabelBox">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
+                    <property name="spacing">5</property>
                     <child>
-                      <object class="GtkComboBox" id="eSFRKProfileList">
+                      <object class="GtkButton" id="bSFRKProfileRevert">
+                        <property name="label" translatable="yes">Revert</property>
                         <property name="visible">True</property>
-                        <property name="can_focus">False</property>
+                        <property name="can_focus">True</property>
+                        <property name="receives_default">True</property>
                       </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="GtkButton" id="bSFRKProfileRevert">
-                        <property name="label" translatable="yes">Revert</property>
+                      <object class="GtkComboBox" id="eSFRKProfileList">
                         <property name="visible">True</property>
-                        <property name="can_focus">True</property>
-                        <property name="receives_default">True</property>
+                        <property name="can_focus">False</property>
                       </object>
                       <packing>
                         <property name="expand">False</property>
@@ -262,6 +262,9 @@
                       <placeholder/>
                     </child>
                     <child>
+                      <placeholder/>
+                    </child>
+                    <child>
                       <object class="GtkSpinButton" id="eSFRKNremThetaDeltaRatio">
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
@@ -524,4 +527,11 @@
       <action-widget response="-5">bSFRKProfileSaveOK</action-widget>
     </action-widgets>
   </object>
+  <object class="GtkSizeGroup" id="zSFRKProfileManageButtons">
+    <widgets>
+      <widget name="bSFRKProfileRevert"/>
+      <widget name="bSFRKProfileSave"/>
+      <widget name="bSFRKProfileDiscard"/>
+    </widgets>
+  </object>
 </interface>

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



More information about the debian-med-commit mailing list