From 22b0b3af11e10d28e2e43b7099c017239c2deb67 Mon Sep 17 00:00:00 2001 From: Thomas Leonard Date: Thu, 1 Jan 2009 15:01:22 +0000 Subject: [PATCH] GUI didn't allow an interface to be given properly --- gui.py | 4 ++-- gui_support.py | 10 ++-------- 2 files changed, 4 insertions(+), 10 deletions(-) diff --git a/gui.py b/gui.py index a97114f..25bcdf0 100644 --- a/gui.py +++ b/gui.py @@ -21,9 +21,8 @@ def do_gui(args): try: if len(args) == 0: - buildenv = BuildEnv() + pass elif len(args) == 1: - buildenv = BuildEnv(need_config = False) import setup def get_dir_callback(default_dir): compile_dir = gui_support.choose_dir(_('Create build directory'), default_dir) @@ -34,6 +33,7 @@ def do_gui(args): else: raise __main__.UsageError() + buildenv = BuildEnv() box = gui_support.CompileBox(buildenv.interface) box.connect('destroy', lambda b: gtk.main_quit()) box.show() diff --git a/gui_support.py b/gui_support.py index e2de485..db96ad7 100644 --- a/gui_support.py +++ b/gui_support.py @@ -21,6 +21,7 @@ class CompileBox(gtk.Dialog): child = None def __init__(self, interface): + assert interface gtk.Dialog.__init__(self, _("Compile '%s'") % interface.split('/')[-1]) # No rsplit on Python 2.3 self.set_has_separator(False) self.set_default_size(gtk.gdk.screen_width() / 2, gtk.gdk.screen_height() / 2) @@ -114,14 +115,7 @@ class CompileBox(gtk.Dialog): box.buffer.insert_at_cursor("Registering feed '%s'\n" % feed) iface.extra_feeds.append(model.Feed(feed, arch = None, user_override = True)) writer.save_interface(iface) - print "\nFeed list for interface '%s' is now:" % iface.get_name() - if iface.feeds: - for f in iface.feeds: - print "- " + f.uri - else: - print "(no feeds)" - - box.buffer.insert_at_cursor("You can now close this window.\n") + box.buffer.insert_at_cursor("Done. You can now close this window.\n") elif resp == RESPONSE_PUBLISH: buildenv = BuildEnv() box = PublishBox(self, buildenv) -- 2.11.4.GIT