From 2f4ecf3b6acad46a30c0fa73e58b34291f3e7322 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9mi=20Verschelde?= <rverschelde@gmail.com>
Date: Fri, 3 Mar 2017 22:46:28 +0100
Subject: Install and use SVG icons by default

Move the mgaonline icon in the hicolor theme with the proper SVG
variant installed too.
Also fixed a typo in a rpmdrake icon and updated copyright year.
---
 mgaapplet | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'mgaapplet')

diff --git a/mgaapplet b/mgaapplet
index f979b61d..4b7d3a47 100755
--- a/mgaapplet
+++ b/mgaapplet
@@ -42,7 +42,7 @@ use Net::DBus qw(:typing);
 use Rpmdrake::open_db;
 use Glib::Object::Introspection;
 
-use constant IMAGE_FOLDER => '/usr/share/mgaonline/pixmaps/';
+use constant IMAGE_FOLDER => '/usr/share/mgaonline/icons/';
 
 Glib::Object::Introspection->setup(
     basename => 'StatusNotifier',
@@ -177,7 +177,7 @@ my %actions = (
 	       'upgrade_distro' => { name => N("Upgrade the system"), launch => \&upgrade },
 	      );
 
-my $icon = StatusNotifier::Notifier->new_from_icon_name('mgaapplet', 'STATUS_NOTIFIER_CATEGORY_APPLICATION_STATUS', '/usr/share/icons/mgaonline.png');
+my $icon = StatusNotifier::Notifier->new_from_icon_name('mgaapplet', 'STATUS_NOTIFIER_CATEGORY_APPLICATION_STATUS', '/usr/share/icons/hicolor/scalable/apps/mgaonline.svg');
 $icon->set_title('mgaapplet');
 $icon->set_status('STATUS_NOTIFIER_STATUS_ACTIVE');
 $icon->register;
@@ -241,7 +241,7 @@ Gtk3->main;
 ugtk3::exit(0);
 
 sub img {
-    my $file = IMAGE_FOLDER . $_[0] . '.png';
+    my $file = IMAGE_FOLDER . $_[0] . '.svg';
     warn "File $file not found.\n" unless -f $file;
     return $file;
 }
@@ -648,9 +648,9 @@ sub about_dialog() {
     $url =~ s/^https:/http:/;
     my $w = gtknew('AboutDialog', name => N("Mageia Online %s", $ver),
                    copyright => N("Copyright (C) %s by %s", 'Mandriva', '2001-2010') . "\n" .
-                     N("Copyright (C) %s by %s", 'Mageia', '2010-2016'),
+                     N("Copyright (C) %s by %s", 'Mageia', '2010-2017'),
                    license => join('', cat_('/usr/share/common-licenses/GPL')),
-                   icon => '/usr/share/icons/mini/mgaonline.png',
+                   icon => '/usr/share/icons/hicolor/48x48/apps/mgaonline.png',
                    comments => N("Mageia Online gives access to Mageia web services."),
                    website => $url,
                    website_label => N("Online WebSite"),
@@ -692,7 +692,7 @@ sub setState {
     if ($state{$state}{tt}[0] && !$state{$state}{do_not_use_bubble}) {
         $bubble->clear_actions;
         $bubble->update(N("Warning"), formatAlaTeX(translate($state{$state}{tt}[0])) . "\n",
-                                                        '/usr/share/icons/mgaonline.png');
+                                                        '/usr/share/icons/hicolor/scalable/apps/mgaonline.svg');
         if ($state eq 'new_distribution') {
             $bubble->add_action('upgrade', N("More Information"), sub { upgrade() });
             if ($sub_state eq 'updates') {
-- 
cgit v1.2.1