[PATCH 05/13] Move the BTRFS options to last and remove unsupported options.

David Lehman dlehman at redhat.com
Wed Aug 29 00:00:44 UTC 2012


We use the same indexing/ordering for the various device types
throughout the custom spoke, and BTRFS is always last.

BTRFS does not support raid levels 4,5,6.

BTRFS compression can be enabled at any time, so omit that.
---
 pyanaconda/ui/gui/spokes/custom.glade |  323 +++++++++------------------------
 1 files changed, 83 insertions(+), 240 deletions(-)

diff --git a/pyanaconda/ui/gui/spokes/custom.glade b/pyanaconda/ui/gui/spokes/custom.glade
index c578663..a2e2b64 100644
--- a/pyanaconda/ui/gui/spokes/custom.glade
+++ b/pyanaconda/ui/gui/spokes/custom.glade
@@ -685,16 +685,16 @@ you'll be able to view their details here.</property>
                                         <property name="no_show_all">True</property>
                                         <property name="show_tabs">False</property>
                                         <child>
-                                          <object class="GtkGrid" id="btrfsGrid">
+                                          <object class="GtkGrid" id="lvmGrid">
                                             <property name="visible">True</property>
                                             <property name="can_focus">False</property>
                                             <property name="column_spacing">12</property>
                                             <child>
-                                              <object class="GtkBox" id="box3">
+                                              <object class="GtkBox" id="box8">
                                                 <property name="visible">True</property>
                                                 <property name="can_focus">False</property>
                                                 <child>
-                                                  <object class="GtkCheckButton" id="btrfsRedundancyCheckbox">
+                                                  <object class="GtkCheckButton" id="lvmRedundancyCheckbox">
                                                     <property name="label" translatable="yes">Redundancy (mirror)</property>
                                                     <property name="use_action_appearance">False</property>
                                                     <property name="visible">True</property>
@@ -711,7 +711,7 @@ you'll be able to view their details here.</property>
                                                   </packing>
                                                 </child>
                                                 <child>
-                                                  <object class="GtkLabel" id="btrfsRedundancyLabel">
+                                                  <object class="GtkLabel" id="lvmRedundancyLabel">
                                                     <property name="visible">True</property>
                                                     <property name="can_focus">False</property>
                                                     <property name="ypad">2</property>
@@ -735,11 +735,11 @@ you'll be able to view their details here.</property>
                                               </packing>
                                             </child>
                                             <child>
-                                              <object class="GtkBox" id="box4">
+                                              <object class="GtkBox" id="box9">
                                                 <property name="visible">True</property>
                                                 <property name="can_focus">False</property>
                                                 <child>
-                                                  <object class="GtkCheckButton" id="btrfsPerformanceCheckbox">
+                                                  <object class="GtkCheckButton" id="lvmPerformanceCheckbox">
                                                     <property name="label" translatable="yes">Optimized performance (stripe)</property>
                                                     <property name="use_action_appearance">False</property>
                                                     <property name="visible">True</property>
@@ -756,7 +756,7 @@ you'll be able to view their details here.</property>
                                                   </packing>
                                                 </child>
                                                 <child>
-                                                  <object class="GtkLabel" id="btrfsPerformanceLabel">
+                                                  <object class="GtkLabel" id="lvmPerformanceLabel">
                                                     <property name="visible">True</property>
                                                     <property name="can_focus">False</property>
                                                     <property name="label" translatable="yes">(-0Gb)</property>
@@ -779,12 +779,28 @@ you'll be able to view their details here.</property>
                                               </packing>
                                             </child>
                                             <child>
-                                              <object class="GtkBox" id="box5">
+                                              <placeholder/>
+                                            </child>
+                                            <child>
+                                              <placeholder/>
+                                            </child>
+                                          </object>
+                                        </child>
+                                        <child type="tab">
+                                          <placeholder/>
+                                        </child>
+                                        <child>
+                                          <object class="GtkGrid" id="raidGrid">
+                                            <property name="visible">True</property>
+                                            <property name="can_focus">False</property>
+                                            <property name="column_spacing">12</property>
+                                            <child>
+                                              <object class="GtkBox" id="box12">
                                                 <property name="visible">True</property>
                                                 <property name="can_focus">False</property>
                                                 <child>
-                                                  <object class="GtkCheckButton" id="btrfsErrorCheckbox">
-                                                    <property name="label" translatable="yes">Error detection (parity)</property>
+                                                  <object class="GtkCheckButton" id="raidRedundancyCheckbox">
+                                                    <property name="label" translatable="yes">Redundancy (mirror)</property>
                                                     <property name="use_action_appearance">False</property>
                                                     <property name="visible">True</property>
                                                     <property name="can_focus">True</property>
@@ -800,9 +816,10 @@ you'll be able to view their details here.</property>
                                                   </packing>
                                                 </child>
                                                 <child>
-                                                  <object class="GtkLabel" id="btrfsErrorLabel">
+                                                  <object class="GtkLabel" id="raidRedundancyLabel">
                                                     <property name="visible">True</property>
                                                     <property name="can_focus">False</property>
+                                                    <property name="ypad">2</property>
                                                     <property name="label" translatable="yes">(-0Gb)</property>
                                                     <attributes>
                                                       <attribute name="foreground" value="#ffff00000000"/>
@@ -817,19 +834,18 @@ you'll be able to view their details here.</property>
                                               </object>
                                               <packing>
                                                 <property name="left_attach">0</property>
-                                                <property name="top_attach">2</property>
+                                                <property name="top_attach">0</property>
                                                 <property name="width">1</property>
                                                 <property name="height">1</property>
                                               </packing>
                                             </child>
                                             <child>
-                                              <object class="GtkBox" id="box6">
+                                              <object class="GtkBox" id="box13">
                                                 <property name="visible">True</property>
                                                 <property name="can_focus">False</property>
-                                                <property name="margin_left">12</property>
                                                 <child>
-                                                  <object class="GtkCheckButton" id="btrfsDistErrorCheckbox">
-                                                    <property name="label" translatable="yes">Distributed</property>
+                                                  <object class="GtkCheckButton" id="raidPerformanceCheckbox">
+                                                    <property name="label" translatable="yes">Optimized performance (stripe)</property>
                                                     <property name="use_action_appearance">False</property>
                                                     <property name="visible">True</property>
                                                     <property name="can_focus">True</property>
@@ -845,7 +861,7 @@ you'll be able to view their details here.</property>
                                                   </packing>
                                                 </child>
                                                 <child>
-                                                  <object class="GtkLabel" id="btrfsDistErrorLabel">
+                                                  <object class="GtkLabel" id="raidPerformanceLabel">
                                                     <property name="visible">True</property>
                                                     <property name="can_focus">False</property>
                                                     <property name="label" translatable="yes">(-0Gb)</property>
@@ -859,54 +875,21 @@ you'll be able to view their details here.</property>
                                                     <property name="position">1</property>
                                                   </packing>
                                                 </child>
-                                                <child>
-                                                  <object class="GtkCheckButton" id="btrfsRedundantErrorCheckbox">
-                                                    <property name="label" translatable="yes">Redundant</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="margin_left">6</property>
-                                                    <property name="use_action_appearance">False</property>
-                                                    <property name="xalign">0</property>
-                                                    <property name="draw_indicator">True</property>
-                                                  </object>
-                                                  <packing>
-                                                    <property name="expand">False</property>
-                                                    <property name="fill">True</property>
-                                                    <property name="position">2</property>
-                                                  </packing>
-                                                </child>
-                                                <child>
-                                                  <object class="GtkLabel" id="btrfsRedundantErrorLabel">
-                                                    <property name="visible">True</property>
-                                                    <property name="can_focus">False</property>
-                                                    <property name="label" translatable="yes">(-0Gb)</property>
-                                                    <attributes>
-                                                      <attribute name="foreground" value="#ffff00000000"/>
-                                                    </attributes>
-                                                  </object>
-                                                  <packing>
-                                                    <property name="expand">False</property>
-                                                    <property name="fill">True</property>
-                                                    <property name="position">3</property>
-                                                  </packing>
-                                                </child>
                                               </object>
                                               <packing>
                                                 <property name="left_attach">0</property>
-                                                <property name="top_attach">3</property>
+                                                <property name="top_attach">1</property>
                                                 <property name="width">1</property>
                                                 <property name="height">1</property>
                                               </packing>
                                             </child>
                                             <child>
-                                              <object class="GtkBox" id="box7">
+                                              <object class="GtkBox" id="box14">
                                                 <property name="visible">True</property>
                                                 <property name="can_focus">False</property>
                                                 <child>
-                                                  <object class="GtkCheckButton" id="btrfsCompressionCheckbox">
-                                                    <property name="label" translatable="yes">Compression</property>
+                                                  <object class="GtkCheckButton" id="raidErrorCheckbox">
+                                                    <property name="label" translatable="yes">Error detection (parity)</property>
                                                     <property name="use_action_appearance">False</property>
                                                     <property name="visible">True</property>
                                                     <property name="can_focus">True</property>
@@ -922,7 +905,7 @@ you'll be able to view their details here.</property>
                                                   </packing>
                                                 </child>
                                                 <child>
-                                                  <object class="GtkLabel" id="btrfsCompressionLabel">
+                                                  <object class="GtkLabel" id="raidErrorLabel">
                                                     <property name="visible">True</property>
                                                     <property name="can_focus">False</property>
                                                     <property name="label" translatable="yes">(-0Gb)</property>
@@ -939,43 +922,19 @@ you'll be able to view their details here.</property>
                                               </object>
                                               <packing>
                                                 <property name="left_attach">0</property>
-                                                <property name="top_attach">4</property>
+                                                <property name="top_attach">2</property>
                                                 <property name="width">1</property>
                                                 <property name="height">1</property>
                                               </packing>
                                             </child>
                                             <child>
-                                              <placeholder/>
-                                            </child>
-                                            <child>
-                                              <placeholder/>
-                                            </child>
-                                            <child>
-                                              <placeholder/>
-                                            </child>
-                                            <child>
-                                              <placeholder/>
-                                            </child>
-                                            <child>
-                                              <placeholder/>
-                                            </child>
-                                          </object>
-                                        </child>
-                                        <child type="tab">
-                                          <placeholder/>
-                                        </child>
-                                        <child>
-                                          <object class="GtkGrid" id="lvmGrid">
-                                            <property name="visible">True</property>
-                                            <property name="can_focus">False</property>
-                                            <property name="column_spacing">12</property>
-                                            <child>
-                                              <object class="GtkBox" id="box8">
+                                              <object class="GtkBox" id="box15">
                                                 <property name="visible">True</property>
                                                 <property name="can_focus">False</property>
+                                                <property name="margin_left">12</property>
                                                 <child>
-                                                  <object class="GtkCheckButton" id="lvmRedundancyCheckbox">
-                                                    <property name="label" translatable="yes">Redundancy (mirror)</property>
+                                                  <object class="GtkCheckButton" id="raidDistErrorCheckbox">
+                                                    <property name="label" translatable="yes">Distributed</property>
                                                     <property name="use_action_appearance">False</property>
                                                     <property name="visible">True</property>
                                                     <property name="can_focus">True</property>
@@ -991,10 +950,9 @@ you'll be able to view their details here.</property>
                                                   </packing>
                                                 </child>
                                                 <child>
-                                                  <object class="GtkLabel" id="lvmRedundancyLabel">
+                                                  <object class="GtkLabel" id="raidDistErrorLabel">
                                                     <property name="visible">True</property>
                                                     <property name="can_focus">False</property>
-                                                    <property name="ypad">2</property>
                                                     <property name="label" translatable="yes">(-0Gb)</property>
                                                     <attributes>
                                                       <attribute name="foreground" value="#ffff00000000"/>
@@ -1006,25 +964,14 @@ you'll be able to view their details here.</property>
                                                     <property name="position">1</property>
                                                   </packing>
                                                 </child>
-                                              </object>
-                                              <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>
-                                              <object class="GtkBox" id="box9">
-                                                <property name="visible">True</property>
-                                                <property name="can_focus">False</property>
                                                 <child>
-                                                  <object class="GtkCheckButton" id="lvmPerformanceCheckbox">
-                                                    <property name="label" translatable="yes">Optimized performance (stripe)</property>
+                                                  <object class="GtkCheckButton" id="raidRedundantErrorCheckbox">
+                                                    <property name="label" translatable="yes">Redundant</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="margin_left">6</property>
                                                     <property name="use_action_appearance">False</property>
                                                     <property name="xalign">0</property>
                                                     <property name="draw_indicator">True</property>
@@ -1032,11 +979,11 @@ you'll be able to view their details here.</property>
                                                   <packing>
                                                     <property name="expand">False</property>
                                                     <property name="fill">True</property>
-                                                    <property name="position">0</property>
+                                                    <property name="position">2</property>
                                                   </packing>
                                                 </child>
                                                 <child>
-                                                  <object class="GtkLabel" id="lvmPerformanceLabel">
+                                                  <object class="GtkLabel" id="raidRedundantErrorLabel">
                                                     <property name="visible">True</property>
                                                     <property name="can_focus">False</property>
                                                     <property name="label" translatable="yes">(-0Gb)</property>
@@ -1047,13 +994,26 @@ you'll be able to view their details here.</property>
                                                   <packing>
                                                     <property name="expand">False</property>
                                                     <property name="fill">True</property>
-                                                    <property name="position">1</property>
+                                                    <property name="position">3</property>
                                                   </packing>
                                                 </child>
                                               </object>
                                               <packing>
                                                 <property name="left_attach">0</property>
-                                                <property name="top_attach">1</property>
+                                                <property name="top_attach">3</property>
+                                                <property name="width">1</property>
+                                                <property name="height">1</property>
+                                              </packing>
+                                            </child>
+                                            <child>
+                                              <object class="GtkLabel" id="raidLevelLabel">
+                                                <property name="visible">True</property>
+                                                <property name="can_focus">False</property>
+                                                <property name="xalign">0</property>
+                                              </object>
+                                              <packing>
+                                                <property name="left_attach">1</property>
+                                                <property name="top_attach">2</property>
                                                 <property name="width">1</property>
                                                 <property name="height">1</property>
                                               </packing>
@@ -1064,6 +1024,9 @@ you'll be able to view their details here.</property>
                                             <child>
                                               <placeholder/>
                                             </child>
+                                            <child>
+                                              <placeholder/>
+                                            </child>
                                           </object>
                                           <packing>
                                             <property name="position">1</property>
@@ -1073,16 +1036,16 @@ you'll be able to view their details here.</property>
                                           <placeholder/>
                                         </child>
                                         <child>
-                                          <object class="GtkGrid" id="raidGrid">
+                                          <object class="GtkGrid" id="btrfsGrid">
                                             <property name="visible">True</property>
                                             <property name="can_focus">False</property>
                                             <property name="column_spacing">12</property>
                                             <child>
-                                              <object class="GtkBox" id="box12">
+                                              <object class="GtkBox" id="box3">
                                                 <property name="visible">True</property>
                                                 <property name="can_focus">False</property>
                                                 <child>
-                                                  <object class="GtkCheckButton" id="raidRedundancyCheckbox">
+                                                  <object class="GtkCheckButton" id="btrfsRedundancyCheckbox">
                                                     <property name="label" translatable="yes">Redundancy (mirror)</property>
                                                     <property name="use_action_appearance">False</property>
                                                     <property name="visible">True</property>
@@ -1099,7 +1062,7 @@ you'll be able to view their details here.</property>
                                                   </packing>
                                                 </child>
                                                 <child>
-                                                  <object class="GtkLabel" id="raidRedundancyLabel">
+                                                  <object class="GtkLabel" id="btrfsRedundancyLabel">
                                                     <property name="visible">True</property>
                                                     <property name="can_focus">False</property>
                                                     <property name="ypad">2</property>
@@ -1123,11 +1086,11 @@ you'll be able to view their details here.</property>
                                               </packing>
                                             </child>
                                             <child>
-                                              <object class="GtkBox" id="box13">
+                                              <object class="GtkBox" id="box4">
                                                 <property name="visible">True</property>
                                                 <property name="can_focus">False</property>
                                                 <child>
-                                                  <object class="GtkCheckButton" id="raidPerformanceCheckbox">
+                                                  <object class="GtkCheckButton" id="btrfsPerformanceCheckbox">
                                                     <property name="label" translatable="yes">Optimized performance (stripe)</property>
                                                     <property name="use_action_appearance">False</property>
                                                     <property name="visible">True</property>
@@ -1144,7 +1107,7 @@ you'll be able to view their details here.</property>
                                                   </packing>
                                                 </child>
                                                 <child>
-                                                  <object class="GtkLabel" id="raidPerformanceLabel">
+                                                  <object class="GtkLabel" id="btrfsPerformanceLabel">
                                                     <property name="visible">True</property>
                                                     <property name="can_focus">False</property>
                                                     <property name="label" translatable="yes">(-0Gb)</property>
@@ -1167,139 +1130,19 @@ you'll be able to view their details here.</property>
                                               </packing>
                                             </child>
                                             <child>
-                                              <object class="GtkBox" id="box14">
-                                                <property name="visible">True</property>
-                                                <property name="can_focus">False</property>
-                                                <child>
-                                                  <object class="GtkCheckButton" id="raidErrorCheckbox">
-                                                    <property name="label" translatable="yes">Error detection (parity)</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="xalign">0</property>
-                                                    <property name="draw_indicator">True</property>
-                                                  </object>
-                                                  <packing>
-                                                    <property name="expand">False</property>
-                                                    <property name="fill">True</property>
-                                                    <property name="position">0</property>
-                                                  </packing>
-                                                </child>
-                                                <child>
-                                                  <object class="GtkLabel" id="raidErrorLabel">
-                                                    <property name="visible">True</property>
-                                                    <property name="can_focus">False</property>
-                                                    <property name="label" translatable="yes">(-0Gb)</property>
-                                                    <attributes>
-                                                      <attribute name="foreground" value="#ffff00000000"/>
-                                                    </attributes>
-                                                  </object>
-                                                  <packing>
-                                                    <property name="expand">False</property>
-                                                    <property name="fill">True</property>
-                                                    <property name="position">1</property>
-                                                  </packing>
-                                                </child>
-                                              </object>
-                                              <packing>
-                                                <property name="left_attach">0</property>
-                                                <property name="top_attach">2</property>
-                                                <property name="width">1</property>
-                                                <property name="height">1</property>
-                                              </packing>
+                                              <placeholder/>
                                             </child>
                                             <child>
-                                              <object class="GtkBox" id="box15">
-                                                <property name="visible">True</property>
-                                                <property name="can_focus">False</property>
-                                                <property name="margin_left">12</property>
-                                                <child>
-                                                  <object class="GtkCheckButton" id="raidDistErrorCheckbox">
-                                                    <property name="label" translatable="yes">Distributed</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="xalign">0</property>
-                                                    <property name="draw_indicator">True</property>
-                                                  </object>
-                                                  <packing>
-                                                    <property name="expand">False</property>
-                                                    <property name="fill">True</property>
-                                                    <property name="position">0</property>
-                                                  </packing>
-                                                </child>
-                                                <child>
-                                                  <object class="GtkLabel" id="raidDistErrorLabel">
-                                                    <property name="visible">True</property>
-                                                    <property name="can_focus">False</property>
-                                                    <property name="label" translatable="yes">(-0Gb)</property>
-                                                    <attributes>
-                                                      <attribute name="foreground" value="#ffff00000000"/>
-                                                    </attributes>
-                                                  </object>
-                                                  <packing>
-                                                    <property name="expand">False</property>
-                                                    <property name="fill">True</property>
-                                                    <property name="position">1</property>
-                                                  </packing>
-                                                </child>
-                                                <child>
-                                                  <object class="GtkCheckButton" id="raidRedundantErrorCheckbox">
-                                                    <property name="label" translatable="yes">Redundant</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="margin_left">6</property>
-                                                    <property name="use_action_appearance">False</property>
-                                                    <property name="xalign">0</property>
-                                                    <property name="draw_indicator">True</property>
-                                                  </object>
-                                                  <packing>
-                                                    <property name="expand">False</property>
-                                                    <property name="fill">True</property>
-                                                    <property name="position">2</property>
-                                                  </packing>
-                                                </child>
-                                                <child>
-                                                  <object class="GtkLabel" id="raidRedundantErrorLabel">
-                                                    <property name="visible">True</property>
-                                                    <property name="can_focus">False</property>
-                                                    <property name="label" translatable="yes">(-0Gb)</property>
-                                                    <attributes>
-                                                      <attribute name="foreground" value="#ffff00000000"/>
-                                                    </attributes>
-                                                  </object>
-                                                  <packing>
-                                                    <property name="expand">False</property>
-                                                    <property name="fill">True</property>
-                                                    <property name="position">3</property>
-                                                  </packing>
-                                                </child>
-                                              </object>
-                                              <packing>
-                                                <property name="left_attach">0</property>
-                                                <property name="top_attach">3</property>
-                                                <property name="width">1</property>
-                                                <property name="height">1</property>
-                                              </packing>
+                                              <placeholder/>
                                             </child>
                                             <child>
-                                              <object class="GtkLabel" id="raidLevelLabel">
-                                                <property name="visible">True</property>
-                                                <property name="can_focus">False</property>
-                                                <property name="xalign">0</property>
-                                              </object>
-                                              <packing>
-                                                <property name="left_attach">1</property>
-                                                <property name="top_attach">2</property>
-                                                <property name="width">1</property>
-                                                <property name="height">1</property>
-                                              </packing>
+                                              <placeholder/>
+                                            </child>
+                                            <child>
+                                              <placeholder/>
+                                            </child>
+                                            <child>
+                                              <placeholder/>
                                             </child>
                                             <child>
                                               <placeholder/>
-- 
1.7.7.6



More information about the anaconda-patches mailing list