Rev 535: Merge removal of glade from the olive about dialog. in file:///data/jelmer/bzr-gtk/trunk/

[Jelmer Vernooij]

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

------------------------------------------------------------
revno: 535
revision-id: jelmer at samba.org-20080718102703-z6wef7x9qokf4gsv
parent: jelmer at samba.org-20080718102606-wte9bd24xwrjpe3j
parent: colbrac at xs4all.nl-20080717214136-xgj3hfs9js2jtm1y
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: trunk
timestamp: Fri 2008-07-18 12:27:03 +0200
message:
  Merge removal of glade from the olive about dialog.
modified:
  NEWS                           news-20070325173539-3va57o99cz3o57xe-1
  olive/__init__.py              __init__.py-20060925014013-13wdvwl8vi8gfqi1-2
    ------------------------------------------------------------
    revno: 533.3.1
    revision-id: colbrac at xs4all.nl-20080717214136-xgj3hfs9js2jtm1y
    parent: jelmer at samba.org-20080717115103-djh5sb0pvpse2zkb
    committer: Jasper Groenewegen <colbrac at xs4all.nl>
    branch nick: aboutdialog
    timestamp: Thu 2008-07-17 23:41:36 +0200
    message:
      Replace about dialog with gtk.Dialog version
    modified:
      olive/__init__.py              __init__.py-20060925014013-13wdvwl8vi8gfqi1-2
=== modified file 'NEWS'
--- a/NEWS	2008-07-18 10:26:06 +0000
+++ b/NEWS	2008-07-18 10:27:03 +0000
@@ -53,6 +53,8 @@
 
   * Remove glade from merge dialog. (Jasper Groenewegen)
 
+  * Remove glade from olive about dialog. (Jasper Groenewegen)
+
 0.94.0    2008-05-04
 
  CHANGES

=== modified file 'olive/__init__.py'
--- a/olive/__init__.py	2008-07-17 21:00:10 +0000
+++ b/olive/__init__.py	2008-07-18 10:27:03 +0000
@@ -60,15 +60,18 @@
 
 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
+    from bzrlib.plugins.gtk import __version__, icon_path
+    
+    iconpath = icon_path() + os.sep
+    
+    dialog = gtk.AboutDialog()
+    dialog.set_name("Olive")
     dialog.set_version(__version__)
+    dialog.set_copyright("Copyright (C) 2006 Szilveszter Farkas (Phanatic)")
+    dialog.set_website("https://launchpad.net/products/olive")
+    dialog.set_website_label("https://launchpad.net/products/olive")
+    dialog.set_icon_from_file(iconpath+"oliveicon2.png")
+    dialog.set_logo(gtk.gdk.pixbuf_new_from_file(iconpath+"oliveicon2.png"))
     dialog.set_authors([ _i18n("Lead Developer:"),
 			 "Szilveszter Farkas <szilveszter.farkas at gmail.com>",
 			 _i18n("Contributors:"),