We're not going to have this done in time for F18 anyway. --- pyanaconda/ui/gui/spokes/software.glade | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/pyanaconda/ui/gui/spokes/software.glade b/pyanaconda/ui/gui/spokes/software.glade index 201e246..4f049fb 100644 --- a/pyanaconda/ui/gui/spokes/software.glade +++ b/pyanaconda/ui/gui/spokes/software.glade @@ -260,12 +260,14 @@ <child> <object class="GtkButton" id="addAddonButton"> <property name="label" translatable="yes">_Add custom add-on...</property> - <property name="visible">True</property> + <property name="use_action_appearance">False</property> <property name="can_focus">True</property> <property name="receives_default">True</property> + <property name="no_show_all">True</property> <property name="halign">end</property> <property name="valign">start</property> <property name="margin_top">6</property> + <property name="use_action_appearance">False</property> <property name="use_underline">True</property> <signal name="clicked" handler="on_custom_clicked" swapped="no"/> </object>
These may not fix anything we've got right now, but it's the more correct way to do it. --- pyanaconda/ui/gui/spokes/storage.py | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-)
diff --git a/pyanaconda/ui/gui/spokes/storage.py b/pyanaconda/ui/gui/spokes/storage.py index c5b7fcf..f78100b 100644 --- a/pyanaconda/ui/gui/spokes/storage.py +++ b/pyanaconda/ui/gui/spokes/storage.py @@ -706,14 +706,14 @@ class StorageSpoke(NormalSpoke, StorageChecker):
self.passphrase = dialog.passphrase
- self.on_back_clicked(self.window) + GLib.idle_add(self._leave_spoke) elif rc == dialog.RESPONSE_CANCEL: # stay on this spoke print "user chose to continue disk selection" elif rc == dialog.RESPONSE_MODIFY_SW: # go to software spoke self.skipTo = "SoftwareSelectionSpoke" - self.on_back_clicked(self.window) + GLib.idle_add(self._leave_spoke) elif rc == dialog.RESPONSE_RECLAIM: self.autopart = not dialog.custom self.autoPartType = dialog.autoPartType @@ -725,7 +725,7 @@ class StorageSpoke(NormalSpoke, StorageChecker):
if dialog.custom: self.skipTo = "CustomPartitioningSpoke" - self.on_back_clicked(self.window) + GLib.idle_add(self._leave_spoke) else: if self.encrypted: dialog = PassphraseDialog(self.data) @@ -747,6 +747,10 @@ class StorageSpoke(NormalSpoke, StorageChecker): # resizeDialog handles okay/cancel on its own, so we can throw out the # return value. self.run_lightbox_dialog(resizeDialog) + GLib.idle_add(self._leave_spoke) + return False + + def _leave_spoke(self): self.window.emit("button-clicked") return False
On Thu, Nov 15, 2012 at 05:16:18PM -0500, Chris Lumens wrote:
We're not going to have this done in time for F18 anyway.
pyanaconda/ui/gui/spokes/software.glade | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
On Thu, Nov 15, 2012 at 05:16:19PM -0500, Chris Lumens wrote:
These may not fix anything we've got right now, but it's the more correct way to do it.
pyanaconda/ui/gui/spokes/storage.py | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-)
Take solace in the possibility that you could have just prevented a future bug by doing things the more correct way.
Both of these changes look sane to me.
Samantha
On Thu, 2012-11-15 at 17:16 -0500, Chris Lumens wrote:
These may not fix anything we've got right now, but it's the more correct way to do it.
pyanaconda/ui/gui/spokes/storage.py | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-)
diff --git a/pyanaconda/ui/gui/spokes/storage.py b/pyanaconda/ui/gui/spokes/storage.py index c5b7fcf..f78100b 100644 --- a/pyanaconda/ui/gui/spokes/storage.py +++ b/pyanaconda/ui/gui/spokes/storage.py @@ -706,14 +706,14 @@ class StorageSpoke(NormalSpoke, StorageChecker):
self.passphrase = dialog.passphrase
self.on_back_clicked(self.window)
GLib.idle_add(self._leave_spoke) elif rc == dialog.RESPONSE_CANCEL: # stay on this spoke print "user chose to continue disk selection" elif rc == dialog.RESPONSE_MODIFY_SW: # go to software spoke self.skipTo = "SoftwareSelectionSpoke"
self.on_back_clicked(self.window)
GLib.idle_add(self._leave_spoke) elif rc == dialog.RESPONSE_RECLAIM: self.autopart = not dialog.custom self.autoPartType = dialog.autoPartType
@@ -725,7 +725,7 @@ class StorageSpoke(NormalSpoke, StorageChecker):
if dialog.custom: self.skipTo = "CustomPartitioningSpoke"
self.on_back_clicked(self.window)
GLib.idle_add(self._leave_spoke) else: if self.encrypted: dialog = PassphraseDialog(self.data)
@@ -747,6 +747,10 @@ class StorageSpoke(NormalSpoke, StorageChecker): # resizeDialog handles okay/cancel on its own, so we can throw out the # return value. self.run_lightbox_dialog(resizeDialog)
GLib.idle_add(self._leave_spoke)
return False
- def _leave_spoke(self): self.window.emit("button-clicked") return False
Could you please replace GLib.idle_add with gtk_call_once? I know it does the same with the function always returning False, but we never know what happens to _leave_spoke or GLib.idle_add in the future. Otherwise it looks good to me.
These may not fix anything we've got right now, but it's the more correct way to do it. --- pyanaconda/ui/gui/spokes/storage.py | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-)
diff --git a/pyanaconda/ui/gui/spokes/storage.py b/pyanaconda/ui/gui/spokes/storage.py index c5b7fcf..8dc6b7b 100644 --- a/pyanaconda/ui/gui/spokes/storage.py +++ b/pyanaconda/ui/gui/spokes/storage.py @@ -47,7 +47,7 @@ from pyanaconda.ui.gui.spokes.lib.passphrase import PassphraseDialog from pyanaconda.ui.gui.spokes.lib.detailederror import DetailedErrorDialog from pyanaconda.ui.gui.spokes.lib.resize import ResizeDialog from pyanaconda.ui.gui.categories.storage import StorageCategory -from pyanaconda.ui.gui.utils import enlightbox, gtk_thread_wait +from pyanaconda.ui.gui.utils import enlightbox, gtk_call_once, gtk_thread_wait
from pyanaconda.kickstart import doKickstartStorage from pyanaconda.storage.size import Size @@ -706,14 +706,14 @@ class StorageSpoke(NormalSpoke, StorageChecker):
self.passphrase = dialog.passphrase
- self.on_back_clicked(self.window) + gtk_call_once(self.window.emit, "button-clicked") elif rc == dialog.RESPONSE_CANCEL: # stay on this spoke print "user chose to continue disk selection" elif rc == dialog.RESPONSE_MODIFY_SW: # go to software spoke self.skipTo = "SoftwareSelectionSpoke" - self.on_back_clicked(self.window) + gtk_call_once(self.window.emit, "button-clicked") elif rc == dialog.RESPONSE_RECLAIM: self.autopart = not dialog.custom self.autoPartType = dialog.autoPartType @@ -725,7 +725,7 @@ class StorageSpoke(NormalSpoke, StorageChecker):
if dialog.custom: self.skipTo = "CustomPartitioningSpoke" - self.on_back_clicked(self.window) + gtk_call_once(self.window.emit, "button-clicked") else: if self.encrypted: dialog = PassphraseDialog(self.data) @@ -736,7 +736,7 @@ class StorageSpoke(NormalSpoke, StorageChecker): self.passphrase = dialog.passphrase
self.apply() - GLib.idle_add(self._show_resize_dialog, disks) + gtk_call_once(self._show_resize_dialog, disks) elif rc == dialog.RESPONSE_QUIT: raise SystemExit("user-selected exit")
@@ -747,8 +747,7 @@ class StorageSpoke(NormalSpoke, StorageChecker): # resizeDialog handles okay/cancel on its own, so we can throw out the # return value. self.run_lightbox_dialog(resizeDialog) - self.window.emit("button-clicked") - return False + gtk_call_once(self.window.emit, "button-clicked")
def on_add_disk_clicked(self, button): print "ADD DISK CLICKED"
On Fri, 2012-11-16 at 09:15 -0500, Chris Lumens wrote:
These may not fix anything we've got right now, but it's the more correct way to do it.
pyanaconda/ui/gui/spokes/storage.py | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-)
diff --git a/pyanaconda/ui/gui/spokes/storage.py b/pyanaconda/ui/gui/spokes/storage.py index c5b7fcf..8dc6b7b 100644 --- a/pyanaconda/ui/gui/spokes/storage.py +++ b/pyanaconda/ui/gui/spokes/storage.py @@ -47,7 +47,7 @@ from pyanaconda.ui.gui.spokes.lib.passphrase import PassphraseDialog from pyanaconda.ui.gui.spokes.lib.detailederror import DetailedErrorDialog from pyanaconda.ui.gui.spokes.lib.resize import ResizeDialog from pyanaconda.ui.gui.categories.storage import StorageCategory -from pyanaconda.ui.gui.utils import enlightbox, gtk_thread_wait +from pyanaconda.ui.gui.utils import enlightbox, gtk_call_once, gtk_thread_wait
from pyanaconda.kickstart import doKickstartStorage from pyanaconda.storage.size import Size @@ -706,14 +706,14 @@ class StorageSpoke(NormalSpoke, StorageChecker):
self.passphrase = dialog.passphrase
self.on_back_clicked(self.window)
gtk_call_once(self.window.emit, "button-clicked") elif rc == dialog.RESPONSE_CANCEL: # stay on this spoke print "user chose to continue disk selection" elif rc == dialog.RESPONSE_MODIFY_SW: # go to software spoke self.skipTo = "SoftwareSelectionSpoke"
self.on_back_clicked(self.window)
gtk_call_once(self.window.emit, "button-clicked") elif rc == dialog.RESPONSE_RECLAIM: self.autopart = not dialog.custom self.autoPartType = dialog.autoPartType
@@ -725,7 +725,7 @@ class StorageSpoke(NormalSpoke, StorageChecker):
if dialog.custom: self.skipTo = "CustomPartitioningSpoke"
self.on_back_clicked(self.window)
gtk_call_once(self.window.emit, "button-clicked") else: if self.encrypted: dialog = PassphraseDialog(self.data)
@@ -736,7 +736,7 @@ class StorageSpoke(NormalSpoke, StorageChecker): self.passphrase = dialog.passphrase
self.apply()
GLib.idle_add(self._show_resize_dialog, disks)
gtk_call_once(self._show_resize_dialog, disks) elif rc == dialog.RESPONSE_QUIT: raise SystemExit("user-selected exit")
@@ -747,8 +747,7 @@ class StorageSpoke(NormalSpoke, StorageChecker): # resizeDialog handles okay/cancel on its own, so we can throw out the # return value. self.run_lightbox_dialog(resizeDialog)
self.window.emit("button-clicked")
return False
gtk_call_once(self.window.emit, "button-clicked")
def on_add_disk_clicked(self, button): print "ADD DISK CLICKED"
As per: < halfline> the thing to remember about signals are they are completely synchronous < halfline> basically a glorified function call
ACK.
anaconda-patches@lists.fedorahosted.org