ui/makeconf.glade: Change the vboxes into tables

1 files changed, 127 insertions, 75 deletions

diff --git a/ui/makeconf.glade b/ui/makeconf.glade
index f90643c..b432f3c 100644
--- a/ui/makeconf.glade
+++ b/ui/makeconf.glade
@@ -1,32 +1,37 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <glade-interface>
   <!-- interface-requires gtk+ 2.6 -->
   <!-- interface-naming-policy toplevel-contextual -->
   <widget class="GtkWindow" id="makeconf_window">
+    <property name="can_focus">False</property>
     <property name="border_width">18</property>
     <child>
       <widget class="GtkAlignment" id="makeconf_align">
         <property name="width_request">400</property>
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
         <property name="xalign">0</property>
         <property name="yalign">0</property>
         <child>
           <widget class="GtkVBox" id="makeconf_box">
             <property name="visible">True</property>
+            <property name="can_focus">False</property>
             <property name="border_width">5</property>
-            <property name="orientation">vertical</property>
             <property name="spacing">10</property>
             <child>
               <widget class="GtkVBox" id="vbox2">
                 <property name="visible">True</property>
-                <property name="orientation">vertical</property>
+                <property name="can_focus">False</property>
                 <child>
                   <widget class="GtkLabel" id="label1">
                     <property name="visible">True</property>
+                    <property name="can_focus">False</property>
                     <property name="label" translatable="yes">The CFLAGS and CXXFLAGS variables define the optimization flags for the gcc C and C++ compiler respectively.</property>
                     <property name="justify">center</property>
                   </widget>
                   <packing>
+                    <property name="expand">True</property>
+                    <property name="fill">True</property>
                     <property name="position">0</property>
                   </packing>
                 </child>
@@ -39,53 +44,21 @@
                     <child>
                       <widget class="GtkTable" id="table1">
                         <property name="visible">True</property>
+                        <property name="can_focus">False</property>
                         <property name="n_rows">3</property>
                         <property name="n_columns">2</property>
                         <child>
-                          <widget class="GtkVPaned" id="vpaned3">
-                            <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="orientation">vertical</property>
-                            <child>
-                              <widget class="GtkCheckButton" id="pipe">
-                                <property name="label" translatable="yes">-pipe</property>
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="receives_default">False</property>
-                                <property name="draw_indicator">True</property>
-                              </widget>
-                              <packing>
-                                <property name="resize">False</property>
-                                <property name="shrink">True</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <widget class="GtkLabel" id="label17">
-                                <property name="visible">True</property>
-                                <property name="label" translatable="yes"> </property>
-                              </widget>
-                              <packing>
-                                <property name="resize">True</property>
-                                <property name="shrink">True</property>
-                              </packing>
-                            </child>
-                          </widget>
-                          <packing>
-                            <property name="top_attach">2</property>
-                            <property name="bottom_attach">3</property>
-                          </packing>
-                        </child>
-                        <child>
                           <widget class="GtkHPaned" id="hpaned1">
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <child>
                               <widget class="GtkLabel" id="label4">
                                 <property name="visible">True</property>
+                                <property name="can_focus">False</property>
                                 <property name="xalign">0</property>
                                 <property name="yalign">0</property>
                                 <property name="label" translatable="yes">Specifies the name of the target architecture.
-&#x201C;native&#x201D; will build binaries optimized for this CPU but they won't run on any other CPU.</property>
+“native” will build binaries optimized for this CPU but they won't run on any other CPU.</property>
                               </widget>
                               <packing>
                                 <property name="resize">False</property>
@@ -109,6 +82,7 @@
                             <child>
                               <widget class="GtkLabel" id="label5">
                                 <property name="visible">True</property>
+                                <property name="can_focus">False</property>
                                 <property name="xalign">0</property>
                                 <property name="yalign">0</property>
                                 <property name="label" translatable="yes">Specifies the optimization class.
@@ -140,6 +114,7 @@ Every class has the same optimizations as the one before plus some extras
                             <child>
                               <widget class="GtkLabel" id="label6">
                                 <property name="visible">True</property>
+                                <property name="can_focus">False</property>
                                 <property name="xalign">0</property>
                                 <property name="yalign">0</property>
                                 <property name="label" translatable="yes">Increases the speed at which the compilation runs by using pipes instead of temporary files,
@@ -165,11 +140,13 @@ at the cost of increased memory use.</property>
                         <child>
                           <widget class="GtkTable" id="table3">
                             <property name="visible">True</property>
+                            <property name="can_focus">False</property>
                             <property name="n_rows">2</property>
                             <property name="n_columns">2</property>
                             <child>
                               <widget class="GtkComboBox" id="march">
                                 <property name="visible">True</property>
+                                <property name="can_focus">False</property>
                                 <property name="active">0</property>
                                 <property name="items" translatable="yes">native</property>
                               </widget>
@@ -181,6 +158,7 @@ at the cost of increased memory use.</property>
                             <child>
                               <widget class="GtkLabel" id="label2">
                                 <property name="visible">True</property>
+                                <property name="can_focus">False</property>
                                 <property name="xalign">1</property>
                                 <property name="label" translatable="yes">-march=</property>
                                 <property name="justify">right</property>
@@ -189,6 +167,7 @@ at the cost of increased memory use.</property>
                             <child>
                               <widget class="GtkLabel" id="label15">
                                 <property name="visible">True</property>
+                                <property name="can_focus">False</property>
                                 <property name="label" translatable="yes"> </property>
                               </widget>
                               <packing>
@@ -199,6 +178,7 @@ at the cost of increased memory use.</property>
                             <child>
                               <widget class="GtkLabel" id="label16">
                                 <property name="visible">True</property>
+                                <property name="can_focus">False</property>
                                 <property name="label" translatable="yes"> </property>
                               </widget>
                               <packing>
@@ -213,11 +193,13 @@ at the cost of increased memory use.</property>
                         <child>
                           <widget class="GtkTable" id="table4">
                             <property name="visible">True</property>
+                            <property name="can_focus">False</property>
                             <property name="n_rows">2</property>
                             <property name="n_columns">2</property>
                             <child>
                               <widget class="GtkComboBox" id="opt">
                                 <property name="visible">True</property>
+                                <property name="can_focus">False</property>
                                 <property name="active">2</property>
                                 <property name="items" translatable="yes">0
 1
@@ -232,6 +214,7 @@ s</property>
                             <child>
                               <widget class="GtkLabel" id="label3">
                                 <property name="visible">True</property>
+                                <property name="can_focus">False</property>
                                 <property name="xalign">1</property>
                                 <property name="label" translatable="yes">-O</property>
                                 <property name="justify">right</property>
@@ -240,6 +223,7 @@ s</property>
                             <child>
                               <widget class="GtkLabel" id="label13">
                                 <property name="visible">True</property>
+                                <property name="can_focus">False</property>
                                 <property name="label" translatable="yes"> </property>
                               </widget>
                               <packing>
@@ -250,6 +234,7 @@ s</property>
                             <child>
                               <widget class="GtkLabel" id="label14">
                                 <property name="visible">True</property>
+                                <property name="can_focus">False</property>
                                 <property name="label" translatable="yes"> </property>
                               </widget>
                               <packing>
@@ -265,28 +250,70 @@ s</property>
                             <property name="bottom_attach">2</property>
                           </packing>
                         </child>
+                        <child>
+                          <widget class="GtkTable" id="table7">
+                            <property name="visible">True</property>
+                            <property name="can_focus">False</property>
+                            <property name="n_rows">2</property>
+                            <property name="n_columns">2</property>
+                            <child>
+                              <placeholder/>
+                            </child>
+                            <child>
+                              <placeholder/>
+                            </child>
+                            <child>
+                              <placeholder/>
+                            </child>
+                            <child>
+                              <widget class="GtkCheckButton" id="pipe">
+                                <property name="label" translatable="yes">-pipe</property>
+                                <property name="visible">True</property>
+                                <property name="can_focus">True</property>
+                                <property name="receives_default">False</property>
+                                <property name="use_action_appearance">False</property>
+                                <property name="draw_indicator">True</property>
+                              </widget>
+                              <packing>
+                                <property name="left_attach">1</property>
+                                <property name="right_attach">2</property>
+                              </packing>
+                            </child>
+                          </widget>
+                          <packing>
+                            <property name="top_attach">2</property>
+                            <property name="bottom_attach">3</property>
+                          </packing>
+                        </child>
                       </widget>
                     </child>
                   </widget>
                   <packing>
+                    <property name="expand">True</property>
+                    <property name="fill">True</property>
                     <property name="position">1</property>
                   </packing>
                 </child>
               </widget>
               <packing>
+                <property name="expand">True</property>
+                <property name="fill">True</property>
                 <property name="position">0</property>
               </packing>
             </child>
             <child>
               <widget class="GtkVBox" id="vbox3">
                 <property name="visible">True</property>
-                <property name="orientation">vertical</property>
+                <property name="can_focus">False</property>
                 <child>
                   <widget class="GtkLabel" id="label7">
                     <property name="visible">True</property>
+                    <property name="can_focus">False</property>
                     <property name="label" translatable="yes">The MAKEOPTS let you define various options passed to make when compiling.</property>
                   </widget>
                   <packing>
+                    <property name="expand">True</property>
+                    <property name="fill">True</property>
                     <property name="position">0</property>
                   </packing>
                 </child>
@@ -299,49 +326,17 @@ s</property>
                     <child>
                       <widget class="GtkTable" id="table2">
                         <property name="visible">True</property>
+                        <property name="can_focus">False</property>
                         <property name="n_rows">3</property>
                         <property name="n_columns">2</property>
                         <child>
-                          <widget class="GtkVPaned" id="vpaned6">
-                            <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="orientation">vertical</property>
-                            <child>
-                              <widget class="GtkCheckButton" id="silent">
-                                <property name="label" translatable="yes">-s</property>
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="receives_default">False</property>
-                                <property name="draw_indicator">True</property>
-                              </widget>
-                              <packing>
-                                <property name="resize">False</property>
-                                <property name="shrink">True</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <widget class="GtkLabel" id="label22">
-                                <property name="visible">True</property>
-                                <property name="label" translatable="yes"> </property>
-                              </widget>
-                              <packing>
-                                <property name="resize">True</property>
-                                <property name="shrink">True</property>
-                              </packing>
-                            </child>
-                          </widget>
-                          <packing>
-                            <property name="top_attach">2</property>
-                            <property name="bottom_attach">3</property>
-                          </packing>
-                        </child>
-                        <child>
                           <widget class="GtkHPaned" id="hpaned9">
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <child>
                               <widget class="GtkLabel" id="label10">
                                 <property name="visible">True</property>
+                                <property name="can_focus">False</property>
                                 <property name="xalign">0</property>
                                 <property name="yalign">0</property>
                                 <property name="label" translatable="yes">Allow this many jobs (e.g. parallel compilations) at once; infinite jobs with 0.
@@ -370,6 +365,7 @@ but this guideline isn't always perfect. </property>
                             <child>
                               <widget class="GtkLabel" id="label11">
                                 <property name="visible">True</property>
+                                <property name="can_focus">False</property>
                                 <property name="xalign">0</property>
                                 <property name="yalign">0</property>
                                 <property name="label" translatable="yes">Don't start multiple jobs unless load is below this much.
@@ -400,6 +396,7 @@ Do not set both -j and -l to zero.</property>
                             <child>
                               <widget class="GtkLabel" id="label12">
                                 <property name="visible">True</property>
+                                <property name="can_focus">False</property>
                                 <property name="xalign">0</property>
                                 <property name="yalign">0</property>
                                 <property name="label" translatable="yes">Don't echo recipes, resulting in a quieter output (errors will still be printed).</property>
@@ -424,6 +421,7 @@ Do not set both -j and -l to zero.</property>
                         <child>
                           <widget class="GtkTable" id="table5">
                             <property name="visible">True</property>
+                            <property name="can_focus">False</property>
                             <property name="n_rows">2</property>
                             <property name="n_columns">2</property>
                             <child>
@@ -433,7 +431,11 @@ Do not set both -j and -l to zero.</property>
                                 <property name="max_length">2</property>
                                 <property name="width_chars">2</property>
                                 <property name="xalign">1</property>
-                                <property name="adjustment">1 0 99 1 10 10</property>
+                                <property name="primary_icon_activatable">False</property>
+                                <property name="secondary_icon_activatable">False</property>
+                                <property name="primary_icon_sensitive">True</property>
+                                <property name="secondary_icon_sensitive">True</property>
+                                <property name="adjustment">1 0 99 1 10 0</property>
                                 <property name="snap_to_ticks">True</property>
                                 <property name="numeric">True</property>
                               </widget>
@@ -445,6 +447,7 @@ Do not set both -j and -l to zero.</property>
                             <child>
                               <widget class="GtkLabel" id="label8">
                                 <property name="visible">True</property>
+                                <property name="can_focus">False</property>
                                 <property name="xalign">1</property>
                                 <property name="label" translatable="yes">-j</property>
                                 <property name="justify">right</property>
@@ -453,6 +456,7 @@ Do not set both -j and -l to zero.</property>
                             <child>
                               <widget class="GtkLabel" id="label18">
                                 <property name="visible">True</property>
+                                <property name="can_focus">False</property>
                                 <property name="label" translatable="yes"> </property>
                               </widget>
                               <packing>
@@ -463,6 +467,7 @@ Do not set both -j and -l to zero.</property>
                             <child>
                               <widget class="GtkLabel" id="label19">
                                 <property name="visible">True</property>
+                                <property name="can_focus">False</property>
                                 <property name="label" translatable="yes"> </property>
                               </widget>
                               <packing>
@@ -477,6 +482,7 @@ Do not set both -j and -l to zero.</property>
                         <child>
                           <widget class="GtkTable" id="table6">
                             <property name="visible">True</property>
+                            <property name="can_focus">False</property>
                             <property name="n_rows">2</property>
                             <property name="n_columns">2</property>
                             <child>
@@ -486,7 +492,11 @@ Do not set both -j and -l to zero.</property>
                                 <property name="max_length">2</property>
                                 <property name="width_chars">2</property>
                                 <property name="xalign">1</property>
-                                <property name="adjustment">0 0 99 1 10 10</property>
+                                <property name="primary_icon_activatable">False</property>
+                                <property name="secondary_icon_activatable">False</property>
+                                <property name="primary_icon_sensitive">True</property>
+                                <property name="secondary_icon_sensitive">True</property>
+                                <property name="adjustment">0 0 99 1 10 0</property>
                                 <property name="snap_to_ticks">True</property>
                                 <property name="numeric">True</property>
                               </widget>
@@ -498,6 +508,7 @@ Do not set both -j and -l to zero.</property>
                             <child>
                               <widget class="GtkLabel" id="label9">
                                 <property name="visible">True</property>
+                                <property name="can_focus">False</property>
                                 <property name="xalign">0.89999997615814209</property>
                                 <property name="label" translatable="yes">-l</property>
                                 <property name="justify">right</property>
@@ -506,6 +517,7 @@ Do not set both -j and -l to zero.</property>
                             <child>
                               <widget class="GtkLabel" id="label20">
                                 <property name="visible">True</property>
+                                <property name="can_focus">False</property>
                                 <property name="label" translatable="yes"> </property>
                               </widget>
                               <packing>
@@ -516,6 +528,7 @@ Do not set both -j and -l to zero.</property>
                             <child>
                               <widget class="GtkLabel" id="label21">
                                 <property name="visible">True</property>
+                                <property name="can_focus">False</property>
                                 <property name="label" translatable="yes"> </property>
                               </widget>
                               <packing>
@@ -531,15 +544,54 @@ Do not set both -j and -l to zero.</property>
                             <property name="bottom_attach">2</property>
                           </packing>
                         </child>
+                        <child>
+                          <widget class="GtkTable" id="table8">
+                            <property name="visible">True</property>
+                            <property name="can_focus">False</property>
+                            <property name="n_rows">2</property>
+                            <property name="n_columns">2</property>
+                            <child>
+                              <placeholder/>
+                            </child>
+                            <child>
+                              <placeholder/>
+                            </child>
+                            <child>
+                              <placeholder/>
+                            </child>
+                            <child>
+                              <widget class="GtkCheckButton" id="silent">
+                                <property name="label" translatable="yes">-s</property>
+                                <property name="visible">True</property>
+                                <property name="can_focus">True</property>
+                                <property name="receives_default">False</property>
+                                <property name="use_action_appearance">False</property>
+                                <property name="draw_indicator">True</property>
+                              </widget>
+                              <packing>
+                                <property name="left_attach">1</property>
+                                <property name="right_attach">2</property>
+                              </packing>
+                            </child>
+                          </widget>
+                          <packing>
+                            <property name="top_attach">2</property>
+                            <property name="bottom_attach">3</property>
+                          </packing>
+                        </child>
                       </widget>
                     </child>
                   </widget>
                   <packing>
+                    <property name="expand">True</property>
+                    <property name="fill">True</property>
                     <property name="position">1</property>
                   </packing>
                 </child>
               </widget>
               <packing>
+                <property name="expand">True</property>
+                <property name="fill">True</property>
                 <property name="position">1</property>
               </packing>
             </child>