[SCM] GUI front-end for Debian Live. branch, master, updated. 01bfe15e9de19d2543322586f63218907a764f82

Chris Lamb chris at chris-lamb.co.uk
Sat Aug 9 05:29:34 UTC 2008


The following commit has been merged in the master branch:
commit 3717e9c0456b20cd12dbdf5f2121562d400e9759
Author: Chris Lamb <chris at chris-lamb.co.uk>
Date:   Sat Aug 9 02:26:06 2008 +0100

    Move show_about_dialog function and dim the main dialog when it is called.
    
    Signed-off-by: Chris Lamb <chris at chris-lamb.co.uk>

diff --git a/LiveMagic/views/main.py b/LiveMagic/views/main.py
index 557765f..9a704eb 100644
--- a/LiveMagic/views/main.py
+++ b/LiveMagic/views/main.py
@@ -19,8 +19,6 @@
 import gtk
 import gobject
 
-from LiveMagic.utils import find_resource
-
 class MainView(object):
     def __init__(self):
         self.controller.view = self
@@ -51,19 +49,3 @@ class MainView(object):
         filename = dialog.get_filename()
         dialog.destroy()
         return res, filename
-
-    def do_show_about_dialog(self):
-        about = gtk.AboutDialog()
-        about.set_name("Debian Live Magic")
-        about.set_comments("GUI tool to build Debian Live systems.")
-        about.set_copyright("Copyright (C) 2007-2008 Chris Lamb <chris at chris-lamb.co.uk>")
-
-        about.set_website("http://debian-live.alioth.debian.org/")
-        about.set_website_label("Debian Live homepage")
-        about.set_license(file(find_resource('GPL-3')).read())
-
-        logo = gtk.gdk.pixbuf_new_from_file(find_resource('debian_openlogo-nd-100.png'))
-        about.set_logo(logo)
-
-        about.run()
-        about.destroy()
diff --git a/LiveMagic/views/wizard.py b/LiveMagic/views/wizard.py
index 776c4ab..97391bb 100644
--- a/LiveMagic/views/wizard.py
+++ b/LiveMagic/views/wizard.py
@@ -21,6 +21,8 @@ import gtk
 from DebianLive.utils import get_mirror
 from DebianLive.elements import KeyVar
 
+from LiveMagic.utils import find_resource
+
 class WizardView(object):
     def __init__(self):
         self.asst = gtk.Assistant()
@@ -151,3 +153,21 @@ class WizardView(object):
             self['table_netboot_settings'].show()
         else:
             self['table_netboot_settings'].hide()
+
+    def do_show_about_dialog(self):
+        about = gtk.AboutDialog()
+        about.set_name("Debian Live Magic")
+        about.set_comments("GUI tool to build Debian Live systems.")
+        about.set_copyright("Copyright (C) 2007-2008 Chris Lamb <chris at chris-lamb.co.uk>")
+
+        about.set_website("http://debian-live.alioth.debian.org/")
+        about.set_website_label("Debian Live homepage")
+        about.set_license(file(find_resource('GPL-3')).read())
+
+        logo = gtk.gdk.pixbuf_new_from_file(find_resource('debian_openlogo-nd-100.png'))
+        about.set_logo(logo)
+
+        self.asst.set_sensitive(False)
+        about.run()
+        about.destroy()
+        self.asst.set_sensitive(True)

-- 
GUI front-end for Debian Live.



More information about the debian-live-changes mailing list