diff options
| author | Jeremy Katz <katzj@redhat.com> | 2005-10-04 15:59:16 +0000 |
|---|---|---|
| committer | Jeremy Katz <katzj@redhat.com> | 2005-10-04 15:59:16 +0000 |
| commit | 7df372a396c46e0193a6e329ed3d7c9da7bd82da (patch) | |
| tree | 320715fa8015c533c50a5a3f8f23aac6d3474ff6 | |
| parent | 07b8e9a05d89e806650a88a27050e5d200d32b94 (diff) | |
| download | anaconda-7df372a396c46e0193a6e329ed3d7c9da7bd82da.tar.gz anaconda-7df372a396c46e0193a6e329ed3d7c9da7bd82da.tar.xz anaconda-7df372a396c46e0193a6e329ed3d7c9da7bd82da.zip | |
2005-10-04 Jeremy Katz <katzj@redhat.com>
* iw/autopart_type.py (PartitionTypeWindow.getNext): Don't skip
manual partitioning if we're doing custom partitions (#169001)
(PartitionTypeWindow.comboChanged): Also make it obvious what's
going on with custom partitioning + review checkbox
* ui/autopart.glade: Add callback.
* textw/partition_text.py (PartitionTypeWindow.__call__): Properly
shut down UI if custom partitioning selected.
| -rw-r--r-- | ChangeLog | 11 | ||||
| -rw-r--r-- | iw/autopart_type.py | 20 | ||||
| -rw-r--r-- | textw/partition_text.py | 18 | ||||
| -rw-r--r-- | ui/autopart.glade | 2 |
4 files changed, 41 insertions, 10 deletions
@@ -1,3 +1,14 @@ +2005-10-04 Jeremy Katz <katzj@redhat.com> + + * iw/autopart_type.py (PartitionTypeWindow.getNext): Don't skip + manual partitioning if we're doing custom partitions (#169001) + (PartitionTypeWindow.comboChanged): Also make it obvious what's + going on with custom partitioning + review checkbox + * ui/autopart.glade: Add callback. + + * textw/partition_text.py (PartitionTypeWindow.__call__): Properly + shut down UI if custom partitioning selected. + 2005-10-03 Jeremy Katz <katzj@redhat.com> * anaconda (traceOnly): Add yuminstall to what we suck in (#169228) diff --git a/iw/autopart_type.py b/iw/autopart_type.py index eaeb67db0..f4587da04 100644 --- a/iw/autopart_type.py +++ b/iw/autopart_type.py @@ -38,6 +38,7 @@ class PartitionTypeWindow(InstallWindow): if val == -1: self.dispatch.skipStep("autopartitionexecute", skip = 1) + self.dispatch.skipStep("partition", skip = 0) else: self.dispatch.skipStep("autopartitionexecute", skip = 0) @@ -66,7 +67,18 @@ class PartitionTypeWindow(InstallWindow): self.dispatch.skipStep("partition") return None - + + def comboChanged(self, *args): + active = self.combo.get_active_iter() + val = self.combo.get_model().get_value(active, 1) + + if val == -1: + self.review = self.xml.get_widget("reviewButton").get_active() + self.xml.get_widget("reviewButton").set_active(True) + self.xml.get_widget("reviewButton").set_sensitive(False) + else: + self.xml.get_widget("reviewButton").set_active(self.review) + self.xml.get_widget("reviewButton").set_sensitive(True) def getScreen(self, diskset, partitions, intf, dispatch): self.diskset = diskset @@ -105,7 +117,11 @@ class PartitionTypeWindow(InstallWindow): self.xml.get_widget("driveScroll").add(self.drivelist) - self.xml.get_widget("reviewButton").set_active(not dispatch.stepInSkipList("partition")) + self.review = not dispatch.stepInSkipList("partition") + self.xml.get_widget("reviewButton").set_active(self.review) + + sigs = { "on_partitionTypeCombo_changed": self.comboChanged } + self.xml.signal_autoconnect(sigs) return vbox diff --git a/textw/partition_text.py b/textw/partition_text.py index 3e01c3bfe..a2196409c 100644 --- a/textw/partition_text.py +++ b/textw/partition_text.py @@ -1684,6 +1684,7 @@ class PartitionTypeWindow: cur = typebox.current() if cur == -1: dispatch.skipStep("autopartitionexecute", skip = 1) + break else: dispatch.skipStep("autopartitionexecute", skip = 0) @@ -1691,14 +1692,15 @@ class PartitionTypeWindow: partitions.autoClearPartDrives = self.drivelist.getSelection() if queryAutoPartitionOK(intf, diskset, partitions): - self.shutdownUI() - screen.popWindow() + break - # XXX we always unskip disk druid in tui right now since - # we don't ask if you want to review amd if you're using - # text mode, we hope you're smart enough to deal (#82474) - dispatch.skipStep("partition", skip = 0) - - return INSTALL_OK + self.shutdownUI() + screen.popWindow() + + # XXX we always unskip disk druid in tui right now since + # we don't ask if you want to review amd if you're using + # text mode, we hope you're smart enough to deal (#82474) + dispatch.skipStep("partition", skip = 0) + return INSTALL_OK diff --git a/ui/autopart.glade b/ui/autopart.glade index e8be57e0c..cbef9725f 100644 --- a/ui/autopart.glade +++ b/ui/autopart.glade @@ -18,6 +18,7 @@ <property name="type_hint">GDK_WINDOW_TYPE_HINT_NORMAL</property> <property name="gravity">GDK_GRAVITY_NORTH_WEST</property> <property name="focus_on_map">True</property> + <property name="urgency_hint">False</property> <child> <widget class="GtkVBox" id="parttypeBox"> @@ -65,6 +66,7 @@ <widget class="GtkComboBox" id="partitionTypeCombo"> <property name="add_tearoffs">False</property> <property name="focus_on_click">True</property> + <signal name="changed" handler="on_partitionTypeCombo_changed" last_modification_time="Tue, 04 Oct 2005 15:46:17 GMT"/> </widget> </child> </widget> |