Merge branch 'master' of ssh://git.mageia.org/software/adminpanel

1 files changed, 28 insertions, 8 deletions

diff --git a/modules/rpmdragora/rpmdragora b/modules/rpmdragora/rpmdragora
index 5494f89a..f11c2f73 100755
--- a/modules/rpmdragora/rpmdragora
+++ b/modules/rpmdragora/rpmdragora
@@ -38,6 +38,7 @@ use AdminPanel::Rpmdragora::localization;
 use AdminPanel::Rpmdragora::init;
 use standalone;  #- standalone must be loaded very first, for 'explanations', but after rpmdragora::init
 use AdminPanel::rpmdragora;
+use AdminPanel::Shared;
 use AdminPanel::Rpmdragora::open_db;
 use AdminPanel::Rpmdragora::gui;
 use AdminPanel::Rpmdragora::rpmnew;
@@ -51,7 +52,9 @@ use AdminPanel::Rpmdragora::widgets;
 use feature 'state';
 
 # OLD $ugtk2::wm_icon = get_icon('installremoverpm', "title-$MODE");
-my $wm_icon = "/usr/share/mcc/themes/default/installremoverpm.png";
+#TODO fix $wm_resource_path
+my $wm_resource_path="/usr/share/rpmdrake/icons";
+my $wm_icon = "$wm_resource_path"."/title-$MODE.png";
 
 # Declarations
 my $my_win;
@@ -374,10 +377,9 @@ sub run_treeview_dialog {
     my $hbox_iconbar  = $factory->createHBox($vbox);
     $head_align_left  = $factory->createLeft($hbox_iconbar);
     $hbox_iconbar     = $factory->createHBox($head_align_left);
-    # TODO manage MODE for title and icon
-    $factory->createImage($hbox_iconbar, "/usr/share/rpmdrake/icons/title-install.png");
-    $factory->createHeading($hbox_iconbar, N("Software Management"));
-#    Gtk2::Banner->new($ugtk2::wm_icon, $::MODE eq 'update' ? N("Software Packages Update") : N("Software Management"))
+    $factory->createImage($hbox_iconbar, $wm_icon);
+    
+    $factory->createHeading($hbox_iconbar, $::MODE eq 'update' ? N("Software Packages Update") : N("Software Management"));
 
     my $hbox_top = $factory->createHBox($vbox);
     my $hbox_middle = $factory->createHBox($vbox);
@@ -1076,14 +1078,32 @@ sub run_treeview_dialog {
         else {
         ### any other events
             if ($event->item()) {
-                # print $event->item()->label() . "\n";
                 # items
-                if ($event->item()->label() eq $mnuItemExit->label()) {
+                my $itemLabel = $event->item()->label();
+                #print "----- " . $itemLabel . "\n";
+                if ($itemLabel eq $mnuItemExit->label()) {
                     #menu File->Quit
                     quit();
                     last;
                 }
-            }
+                elsif ($itemLabel eq N("About")) {
+                    my $license = formatAlaTeX(translate($::license));
+                    $license =~ s/\n/\n\n/sg; # nicer formatting
+                    AboutDialog({ name => N("Rpmdragora"),
+                        version => $Rpmdragora::init::version,
+                        copyright => N("Copyright (C) %s by Mandriva", '2002-2009'),
+                        license => $license, 
+                        comments => N("Rpmdragora is the Mageia package management tool."),
+                        website => 'http://www.mageia.org',
+                        website_label => N("Mageia"),
+                        authors => 'Thierry Vignaud <vignaud@mandriva.com>\nAngelo Naselli <anaselli@linux.it>\nMatteo Pasotti <matteo.pasotti@gmail.com>',
+                        artists => 'Hélène Durosini <ln@mandriva.com>',
+                        translator_credits =>
+                          #-PO: put here name(s) and email(s) of translator(s) (eg: "John Smith <jsmith@nowhere.com>")
+                          N("_: Translator(s) name(s) & email(s)\n")}
+                    );
+                }
+            } 
         }
     }