Rev 218: Move olive about dialog into olive. in file:///data/jelmer/bzr-gtk/trunk/

[Jelmer Vernooij]

At file:///data/jelmer/bzr-gtk/trunk/

------------------------------------------------------------
revno: 218
revision-id: jelmer at samba.org-20070713230947-0bngzxibg52vhmjo
parent: jelmer at samba.org-20070713221709-c1glq7uh0e3azvwc
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: trunk
timestamp: Sat 2007-07-14 02:09:47 +0300
message:
  Move olive about dialog into olive.
modified:
  dialog.py                      dialog.py-20060717135918-egb4rf35n4b9trom-2
  olive/__init__.py              __init__.py-20060925014013-13wdvwl8vi8gfqi1-2
=== modified file 'dialog.py'
--- a/dialog.py	2007-02-04 12:11:31 +0000
+++ b/dialog.py	2007-07-13 23:09:47 +0000
@@ -24,22 +24,6 @@
 import gtk.glade
 
 
-def about():
-    """ Display the AboutDialog. """
-    from bzrlib.plugins.gtk import __version__
-    from bzrlib.plugins.gtk.olive.guifiles import GLADEFILENAME
-
-    # Load AboutDialog description
-    dglade = gtk.glade.XML(GLADEFILENAME, 'aboutdialog')
-    dialog = dglade.get_widget('aboutdialog')
-
-    # Set version
-    dialog.set_version(__version__)
-
-    dialog.run()
-    # Destroy the dialog
-    dialog.destroy()
-
 def _message_dialog(type, primary, secondary, buttons=gtk.BUTTONS_OK):
     """ Display a given type of MessageDialog with the given message.
     

=== modified file 'olive/__init__.py'
--- a/olive/__init__.py	2007-06-10 15:44:44 +0000
+++ b/olive/__init__.py	2007-07-13 23:09:47 +0000
@@ -55,6 +55,22 @@
 from bzrlib.plugins.gtk.push import PushDialog
 from bzrlib.plugins.gtk.revbrowser import RevisionBrowser
 
+def about():
+    """ Display the AboutDialog. """
+    from bzrlib.plugins.gtk import __version__
+    from bzrlib.plugins.gtk.olive.guifiles import GLADEFILENAME
+
+    # Load AboutDialog description
+    dglade = gtk.glade.XML(GLADEFILENAME, 'aboutdialog')
+    dialog = dglade.get_widget('aboutdialog')
+
+    # Set version
+    dialog.set_version(__version__)
+
+    dialog.run()
+    # Destroy the dialog
+    dialog.destroy()
+
 class OliveGtk:
     """ The main Olive GTK frontend class. This is called when launching the
     program. """
@@ -354,9 +370,7 @@
                 return self.remote_branch.base
    
     def on_about_activate(self, widget):
-        from bzrlib.plugins.gtk.dialog import about
         about()
-        
     
     def on_button_history_browse_clicked(self, widget):
         """ Browse for revision button handler. """