Mercurial > code > home > repos > light9

changeset 1057:2448ebc38a6f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
curvecalc.glade upgrade VBox/HBox, make subterms hidden (on the way to removal) Ignore-this: 62e123296a37ce6927441dac79c8e1ac
author Drew Perttula <drewp@bigasterisk.com>
date Sun, 01 Jun 2014 20:58:33 +0000
parents 547d65ea9902
children 2d2be076754f
files light9/curvecalc/curvecalc.glade
diffstat 1 files changed, 49 insertions(+), 23 deletions(-) [+]
line wrap: on
line diff
--- a/light9/curvecalc/curvecalc.glade	Sun Jun 01 20:35:38 2014 +0000
+++ b/light9/curvecalc/curvecalc.glade	Sun Jun 01 20:58:33 2014 +0000
@@ -18,9 +18,10 @@
   <object class="GtkWindow" id="MainWindow">
     <property name="can_focus">False</property>
     <child>
-      <object class="GtkVBox" id="vbox1">
+      <object class="GtkBox" id="vbox1">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
+        <property name="orientation">vertical</property>
         <child>
           <object class="GtkMenuBar" id="menubar1">
             <property name="visible">True</property>
@@ -317,11 +318,11 @@
           </packing>
         </child>
         <child>
-          <object class="GtkHBox" id="hbox3">
+          <object class="GtkBox" id="songRow">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <child>
-              <object class="GtkHBox" id="currentSongEditChoice">
+              <object class="GtkBox" id="currentSongEditChoice">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <child>
@@ -394,10 +395,11 @@
           </packing>
         </child>
         <child>
-          <object class="GtkVPaned" id="paned1">
+          <object class="GtkPaned" id="paned1">
             <property name="height_request">600</property>
             <property name="visible">True</property>
             <property name="can_focus">True</property>
+            <property name="orientation">vertical</property>
             <property name="position">600</property>
             <child>
               <object class="GtkExpander" id="expander2">
@@ -406,12 +408,13 @@
                 <property name="can_focus">True</property>
                 <property name="expanded">True</property>
                 <child>
-                  <object class="GtkVBox" id="vbox4">
+                  <object class="GtkBox" id="vbox4">
                     <property name="height_request">100</property>
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
+                    <property name="orientation">vertical</property>
                     <child>
-                      <object class="GtkHBox" id="hbox2">
+                      <object class="GtkBox" id="curveTools">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="spacing">7</property>
@@ -502,10 +505,7 @@
                       </packing>
                     </child>
                     <child>
-                      <placeholder/>
-                    </child>
-                    <child>
-                      <object class="GtkScrolledWindow" id="scrolledwindow1">
+                      <object class="GtkScrolledWindow" id="scrolledwindowCurves">
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="hscrollbar_policy">never</property>
@@ -518,9 +518,10 @@
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
                                 <child>
-                                  <object class="GtkVBox" id="curves">
+                                  <object class="GtkBox" id="curves">
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
+                                    <property name="orientation">vertical</property>
                                     <child>
                                       <placeholder/>
                                     </child>
@@ -540,7 +541,7 @@
                       <packing>
                         <property name="expand">True</property>
                         <property name="fill">True</property>
-                        <property name="position">3</property>
+                        <property name="position">2</property>
                       </packing>
                     </child>
                   </object>
@@ -554,20 +555,19 @@
                 </child>
               </object>
               <packing>
-                <property name="resize">False</property>
-                <property name="shrink">True</property>
+                <property name="resize">True</property>
+                <property name="shrink">False</property>
               </packing>
             </child>
             <child>
               <object class="GtkExpander" id="expander1">
-                <property name="height_request">120</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
-                <property name="expanded">True</property>
                 <child>
-                  <object class="GtkVBox" id="box1">
+                  <object class="GtkBox" id="box1">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
+                    <property name="orientation">vertical</property>
                     <child>
                       <object class="GtkScrolledWindow" id="scrolledwindow2">
                         <property name="visible">True</property>
@@ -605,6 +605,18 @@
                                 <child>
                                   <placeholder/>
                                 </child>
+                                <child>
+                                  <placeholder/>
+                                </child>
+                                <child>
+                                  <placeholder/>
+                                </child>
+                                <child>
+                                  <placeholder/>
+                                </child>
+                                <child>
+                                  <placeholder/>
+                                </child>
                               </object>
                             </child>
                           </object>
@@ -631,7 +643,7 @@
                       </packing>
                     </child>
                     <child>
-                      <object class="GtkHBox" id="box2">
+                      <object class="GtkBox" id="box2">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <child>
@@ -674,8 +686,8 @@
                 </child>
               </object>
               <packing>
-                <property name="resize">True</property>
-                <property name="shrink">True</property>
+                <property name="resize">False</property>
+                <property name="shrink">False</property>
               </packing>
             </child>
           </object>
@@ -686,7 +698,7 @@
           </packing>
         </child>
         <child>
-          <object class="GtkHBox" id="hbox1">
+          <object class="GtkBox" id="statusRow">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <child>
@@ -718,6 +730,18 @@
                     <child>
                       <placeholder/>
                     </child>
+                    <child>
+                      <placeholder/>
+                    </child>
+                    <child>
+                      <placeholder/>
+                    </child>
+                    <child>
+                      <placeholder/>
+                    </child>
+                    <child>
+                      <placeholder/>
+                    </child>
                   </object>
                 </child>
                 <child type="label">
@@ -837,9 +861,10 @@
           </packing>
         </child>
         <child>
-          <object class="GtkVBox" id="vbox11">
+          <object class="GtkBox" id="vbox11">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
+            <property name="orientation">vertical</property>
             <child>
               <object class="GtkComboBox" id="newSubtermName">
                 <property name="visible">True</property>
@@ -991,9 +1016,10 @@
   <object class="GtkTextBuffer" id="textbuffer1">
     <property name="text" translatable="yes">song01(t)</property>
   </object>
-  <object class="GtkVBox" id="vbox2">
+  <object class="GtkBox" id="vbox2">
     <property name="visible">True</property>
     <property name="can_focus">False</property>
+    <property name="orientation">vertical</property>
     <child>
       <object class="GtkImage" id="image1">
         <property name="width_request">289</property>