[PATCH 05/10] Lots of storage spoke font and spacing changes (mizmo).

Chris Lumens clumens at redhat.com
Fri Nov 2 18:05:55 UTC 2012


---
 pyanaconda/ui/gui/spokes/storage.glade | 81 ++++++++++++++++++++++++++--------
 1 file changed, 63 insertions(+), 18 deletions(-)

diff --git a/pyanaconda/ui/gui/spokes/storage.glade b/pyanaconda/ui/gui/spokes/storage.glade
index 5d12c84..45d39c2 100644
--- a/pyanaconda/ui/gui/spokes/storage.glade
+++ b/pyanaconda/ui/gui/spokes/storage.glade
@@ -27,7 +27,7 @@
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
-                <property name="halign">center</property>
+                <property name="halign">start</property>
                 <property name="border_width">6</property>
                 <property name="use_underline">True</property>
                 <signal name="clicked" handler="on_cancel_clicked" swapped="no"/>
@@ -45,7 +45,7 @@
                 <property name="can_focus">True</property>
                 <property name="has_focus">True</property>
                 <property name="receives_default">True</property>
-                <property name="halign">center</property>
+                <property name="halign">end</property>
                 <property name="border_width">6</property>
                 <property name="use_underline">True</property>
                 <signal name="clicked" handler="on_continue_clicked" swapped="no"/>
@@ -78,6 +78,7 @@
                 <property name="xalign">0</property>
                 <property name="label" translatable="yes">INSTALLATION OPTIONS</property>
                 <attributes>
+                  <attribute name="font-desc" value="Cantarell Bold 10"/>
                   <attribute name="weight" value="bold"/>
                 </attributes>
               </object>
@@ -93,7 +94,9 @@
                 <property name="can_focus">False</property>
                 <property name="xalign">0</property>
                 <property name="label" translatable="yes">Here we'll describe what your options are.</property>
-                <property name="use_markup">True</property>
+                <attributes>
+                  <attribute name="font-desc" value="Cantarell 11"/>
+                </attributes>
               </object>
               <packing>
                 <property name="expand">False</property>
@@ -149,6 +152,9 @@
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="label" translatable="yes">Partition scheme configuration</property>
+                    <attributes>
+                      <attribute name="font-desc" value="Cantarell 11"/>
+                    </attributes>
                   </object>
                 </child>
               </object>
@@ -161,11 +167,9 @@
             <child>
               <object class="GtkCheckButton" id="options1_custom_check">
                 <property name="label" translatable="yes">Let me customize the _partitioning of the disks instead.</property>
-                <property name="use_action_appearance">False</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="use_underline">True</property>
                 <property name="xalign">0</property>
                 <property name="draw_indicator">True</property>
@@ -217,7 +221,7 @@
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
-                <property name="halign">center</property>
+                <property name="halign">start</property>
                 <property name="border_width">6</property>
                 <property name="use_underline">True</property>
                 <signal name="clicked" handler="on_cancel_clicked" swapped="no"/>
@@ -254,7 +258,7 @@
                 <property name="can_focus">True</property>
                 <property name="has_focus">True</property>
                 <property name="receives_default">True</property>
-                <property name="halign">center</property>
+                <property name="halign">end</property>
                 <property name="border_width">6</property>
                 <property name="use_underline">True</property>
                 <signal name="clicked" handler="on_reclaim_clicked" swapped="no"/>
@@ -287,6 +291,7 @@
                 <property name="xalign">0</property>
                 <property name="label" translatable="yes">INSTALLATION OPTIONS</property>
                 <attributes>
+                  <attribute name="font-desc" value="Cantarell Bold 10"/>
                   <attribute name="weight" value="bold"/>
                 </attributes>
               </object>
@@ -302,7 +307,9 @@
                 <property name="can_focus">False</property>
                 <property name="xalign">0</property>
                 <property name="label" translatable="yes">Here we'll describe how much space is needed for the current software selection.</property>
-                <property name="use_markup">True</property>
+                <attributes>
+                  <attribute name="font-desc" value="Cantarell 11"/>
+                </attributes>
               </object>
               <packing>
                 <property name="expand">False</property>
@@ -316,7 +323,9 @@
                 <property name="can_focus">False</property>
                 <property name="xalign">0</property>
                 <property name="label" translatable="yes">Here we'll describe what your options are.</property>
-                <property name="use_markup">True</property>
+                <attributes>
+                  <attribute name="font-desc" value="Cantarell 11"/>
+                </attributes>
               </object>
               <packing>
                 <property name="expand">False</property>
@@ -340,6 +349,7 @@
                     <property name="xalign">1</property>
                     <property name="label" translatable="yes">disk free</property>
                     <attributes>
+                      <attribute name="font-desc" value="Cantarell Bold 11"/>
                       <attribute name="weight" value="bold"/>
                     </attributes>
                   </object>
@@ -356,6 +366,9 @@
                     <property name="can_focus">False</property>
                     <property name="xalign">0</property>
                     <property name="label" translatable="yes">Free space available for use.</property>
+                    <attributes>
+                      <attribute name="font-desc" value="Cantarell 11"/>
+                    </attributes>
                   </object>
                   <packing>
                     <property name="left_attach">1</property>
@@ -371,6 +384,7 @@
                     <property name="xalign">1</property>
                     <property name="label" translatable="yes">fs free</property>
                     <attributes>
+                      <attribute name="font-desc" value="Cantarell Bold 11"/>
                       <attribute name="weight" value="bold"/>
                     </attributes>
                   </object>
@@ -387,6 +401,9 @@
                     <property name="can_focus">False</property>
                     <property name="xalign">0</property>
                     <property name="label" translatable="yes">Free space unavailable but reclaimable from existing partitions.</property>
+                    <attributes>
+                      <attribute name="font-desc" value="Cantarell 11"/>
+                    </attributes>
                   </object>
                   <packing>
                     <property name="left_attach">1</property>
@@ -402,6 +419,7 @@
                     <property name="xalign">1</property>
                     <property name="label" translatable="yes">disks size</property>
                     <attributes>
+                      <attribute name="font-desc" value="Cantarell Bold 11"/>
                       <attribute name="weight" value="bold"/>
                     </attributes>
                   </object>
@@ -418,6 +436,9 @@
                     <property name="can_focus">False</property>
                     <property name="xalign">0</property>
                     <property name="label" translatable="yes">Space in selected disks reclaimable by deleting existing partitions.</property>
+                    <attributes>
+                      <attribute name="font-desc" value="Cantarell 11"/>
+                    </attributes>
                   </object>
                   <packing>
                     <property name="left_attach">1</property>
@@ -481,6 +502,9 @@
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="label" translatable="yes">Partition scheme configuration</property>
+                    <attributes>
+                      <attribute name="font-desc" value="Cantarell 11"/>
+                    </attributes>
                   </object>
                 </child>
               </object>
@@ -493,11 +517,9 @@
             <child>
               <object class="GtkCheckButton" id="options2_custom_check">
                 <property name="label" translatable="yes">I don't need help; let me customize disk _partitioning.</property>
-                <property name="use_action_appearance">False</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="use_underline">True</property>
                 <property name="xalign">0</property>
                 <property name="draw_indicator">True</property>
@@ -550,7 +572,7 @@
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
-                <property name="halign">center</property>
+                <property name="halign">start</property>
                 <property name="border_width">6</property>
                 <property name="use_underline">True</property>
                 <signal name="clicked" handler="on_quit_clicked" swapped="no"/>
@@ -567,10 +589,10 @@
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
+                <property name="tooltip_text" translatable="yes">Please wait... software metadata still loading.</property>
                 <property name="halign">center</property>
                 <property name="border_width">6</property>
                 <property name="use_underline">True</property>
-                <property name="tooltip_text" translatable="yes">Please wait... software metadata still loading.</property>
                 <signal name="clicked" handler="on_modify_sw_clicked" swapped="no"/>
               </object>
               <packing>
@@ -587,7 +609,7 @@
                 <property name="can_focus">True</property>
                 <property name="has_focus">True</property>
                 <property name="receives_default">True</property>
-                <property name="halign">center</property>
+                <property name="halign">end</property>
                 <property name="border_width">6</property>
                 <property name="use_underline">True</property>
                 <signal name="clicked" handler="on_cancel_clicked" swapped="no"/>
@@ -636,7 +658,9 @@
                 <property name="can_focus">False</property>
                 <property name="xalign">0</property>
                 <property name="label" translatable="yes">Here we'll describe how much space is needed for the current software selection.</property>
-                <property name="use_markup">True</property>
+                <attributes>
+                  <attribute name="font-desc" value="Cantarell 11"/>
+                </attributes>
               </object>
               <packing>
                 <property name="expand">False</property>
@@ -676,6 +700,9 @@
                     <property name="can_focus">False</property>
                     <property name="xalign">0</property>
                     <property name="label" translatable="yes">Free space available for use.</property>
+                    <attributes>
+                      <attribute name="font-desc" value="Cantarell 11"/>
+                    </attributes>
                   </object>
                   <packing>
                     <property name="left_attach">1</property>
@@ -691,6 +718,7 @@
                     <property name="xalign">1</property>
                     <property name="label" translatable="yes">fs free</property>
                     <attributes>
+                      <attribute name="font-desc" value="Cantarell 11"/>
                       <attribute name="weight" value="bold"/>
                     </attributes>
                   </object>
@@ -707,6 +735,9 @@
                     <property name="can_focus">False</property>
                     <property name="xalign">0</property>
                     <property name="label" translatable="yes">Free space unavailable but reclaimable from existing partitions.</property>
+                    <attributes>
+                      <attribute name="font-desc" value="Cantarell 11"/>
+                    </attributes>
                   </object>
                   <packing>
                     <property name="left_attach">1</property>
@@ -722,6 +753,7 @@
                     <property name="xalign">1</property>
                     <property name="label" translatable="yes">disks size</property>
                     <attributes>
+                      <attribute name="font-desc" value="Cantarell Bold 11"/>
                       <attribute name="weight" value="bold"/>
                     </attributes>
                   </object>
@@ -738,6 +770,9 @@
                     <property name="can_focus">False</property>
                     <property name="xalign">0</property>
                     <property name="label" translatable="yes">Space in selected disks reclaimable by deleting existing partitions.</property>
+                    <attributes>
+                      <attribute name="font-desc" value="Cantarell 11"/>
+                    </attributes>
                   </object>
                   <packing>
                     <property name="left_attach">1</property>
@@ -759,7 +794,9 @@
                 <property name="can_focus">False</property>
                 <property name="xalign">0</property>
                 <property name="label" translatable="yes">Here we'll describe what your options are.</property>
-                <property name="use_markup">True</property>
+                <attributes>
+                  <attribute name="font-desc" value="Cantarell 11"/>
+                </attributes>
               </object>
               <packing>
                 <property name="expand">False</property>
@@ -814,9 +851,12 @@
         <child internal-child="alignment">
           <object class="GtkAlignment" id="AnacondaSpokeWindow-alignment1">
             <property name="can_focus">False</property>
+            <property name="xalign">0</property>
             <property name="yalign">0</property>
-            <property name="xscale">0.89999997615814209</property>
+            <property name="xscale">1</property>
             <property name="yscale">0.5</property>
+            <property name="left_padding">24</property>
+            <property name="right_padding">24</property>
             <child internal-child="action_area">
               <object class="GtkBox" id="storageWindow-action_area1">
                 <property name="can_focus">False</property>
@@ -830,6 +870,7 @@
                     <property name="label" translatable="yes">LOCAL STANDARD DISKS</property>
                     <property name="track_visited_links">False</property>
                     <attributes>
+                      <attribute name="font-desc" value="Cantarell Bold 10"/>
                       <attribute name="weight" value="bold"/>
                     </attributes>
                   </object>
@@ -854,7 +895,8 @@
                           <object class="GtkBox" id="local_disks_box">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
-                            <property name="border_width">6</property>
+                            <property name="margin_left">6</property>
+                            <property name="margin_right">6</property>
                             <property name="spacing">30</property>
                             <child>
                               <placeholder/>
@@ -935,6 +977,9 @@
                 <property name="halign">start</property>
                 <property name="margin_left">6</property>
                 <property name="label" translatable="yes">summary</property>
+                <attributes>
+                  <attribute name="font-desc" value="Cantarell 10"/>
+                </attributes>
               </object>
               <packing>
                 <property name="left_attach">0</property>
-- 
1.7.11.2



More information about the anaconda-patches mailing list