We're better off just displaying all these fields to begin with.
---
pyanaconda/ui/gui/spokes/custom.glade | 38 +++++++++++--------------------
pyanaconda/ui/gui/spokes/custom.py | 11 ---------
pyanaconda/ui/gui/spokes/lib/accordion.py | 1 -
3 files changed, 13 insertions(+), 37 deletions(-)
diff --git a/pyanaconda/ui/gui/spokes/custom.glade
b/pyanaconda/ui/gui/spokes/custom.glade
index d0d25db..5d96be9 100644
--- a/pyanaconda/ui/gui/spokes/custom.glade
+++ b/pyanaconda/ui/gui/spokes/custom.glade
@@ -680,7 +680,7 @@ use. Try something else?</property>
<object class="GtkSpinButton"
id="sizeSpinner">
<property
name="visible">True</property>
<property
name="can_focus">True</property>
- <property
name="halign">end</property>
+ <property
name="halign">start</property>
<property
name="invisible_char">●</property>
<property
name="width_chars">7</property>
<property
name="invisible_char_set">True</property>
@@ -694,24 +694,10 @@ use. Try something else?</property>
<property
name="height">1</property>
</packing>
</child>
- </object>
- <packing>
- <property
name="expand">False</property>
- <property
name="fill">True</property>
- <property
name="position">2</property>
- </packing>
- </child>
- <child>
- <object class="GtkExpander"
id="customizeExpander">
- <property
name="visible">True</property>
- <property
name="can_focus">True</property>
- <property
name="use_underline">True</property>
- <signal name="activate"
handler="on_customize_activated" swapped="no"/>
<child>
<object class="GtkGrid"
id="grid3">
<property
name="visible">True</property>
<property
name="can_focus">False</property>
- <property
name="margin_left">30</property>
<property
name="row_spacing">6</property>
<property
name="column_spacing">6</property>
<child>
@@ -753,6 +739,8 @@ use. Try something else?</property>
<property
name="visible">True</property>
<property
name="can_focus">False</property>
<property
name="hexpand">True</property>
+ <property
name="entry_text_column">0</property>
+ <property
name="id_column">1</property>
<items>
<item
translatable="yes">Standard Partition</item>
<item
translatable="yes">BTRFS</item>
@@ -773,6 +761,8 @@ use. Try something else?</property>
<property
name="visible">True</property>
<property
name="can_focus">False</property>
<property
name="hexpand">True</property>
+ <property
name="entry_text_column">0</property>
+ <property
name="id_column">1</property>
<signal name="changed"
handler="on_fs_type_changed" swapped="no"/>
</object>
<packing>
@@ -909,20 +899,18 @@ use. Try something else?</property>
<placeholder/>
</child>
</object>
- </child>
- <child type="label">
- <object class="GtkLabel"
id="label3">
- <property
name="visible">True</property>
- <property
name="can_focus">False</property>
- <property name="label"
translatable="yes">Device and file system _options...</property>
- <property
name="use_underline">True</property>
- </object>
+ <packing>
+ <property
name="left_attach">0</property>
+ <property
name="top_attach">4</property>
+ <property
name="width">2</property>
+ <property
name="height">1</property>
+ </packing>
</child>
</object>
<packing>
<property
name="expand">False</property>
<property
name="fill">True</property>
- <property
name="position">3</property>
+ <property
name="position">2</property>
</packing>
</child>
<child>
@@ -940,7 +928,7 @@ use. Try something else?</property>
<packing>
<property
name="expand">False</property>
<property
name="fill">True</property>
- <property
name="position">4</property>
+ <property
name="position">3</property>
</packing>
</child>
</object>
diff --git a/pyanaconda/ui/gui/spokes/custom.py b/pyanaconda/ui/gui/spokes/custom.py
index 9d9bd14..6fa2f95 100644
--- a/pyanaconda/ui/gui/spokes/custom.py
+++ b/pyanaconda/ui/gui/spokes/custom.py
@@ -1393,11 +1393,6 @@ class CustomPartitioningSpoke(NormalSpoke, StorageChecker):
sizeSpinner = self.builder.get_object("sizeSpinner")
typeCombo = self.builder.get_object("deviceTypeCombo")
fsCombo = self.builder.get_object("fileSystemTypeCombo")
- expander = self.builder.get_object("customizeExpander")
-
- # We want to preserve the state of the customize expander so that it's
- # open should you open it and then look at some other device instead.
- expander.set_expanded(selector._customizeIsOpen)
device = selector._device
if device.type == "luks/dm-crypt":
@@ -1643,12 +1638,6 @@ class CustomPartitioningSpoke(NormalSpoke, StorageChecker):
NormalSpoke.on_back_clicked(self, button)
- def on_customize_activated(self, expander):
- if not self._current_selector:
- return
-
- self._current_selector._customizeIsOpen = not
self._current_selector._customizeIsOpen
-
def on_add_clicked(self, button):
self._save_right_side(self._current_selector)
diff --git a/pyanaconda/ui/gui/spokes/lib/accordion.py
b/pyanaconda/ui/gui/spokes/lib/accordion.py
index 3daf6e8..5f7c21d 100644
--- a/pyanaconda/ui/gui/spokes/lib/accordion.py
+++ b/pyanaconda/ui/gui/spokes/lib/accordion.py
@@ -84,7 +84,6 @@ def selectorFromDevice(device, selector=None, mountpoint=""):
if not selector:
selector = MountpointSelector(name, str(size).upper(), mp)
selector._root = None
- selector._customizeIsOpen = False
else:
selector.props.name = name
selector.props.size = str(size).upper()
--
1.8.1.2