Fixed rpmdragora icons

11 files changed, 15 insertions, 14 deletions

diff --git a/Changes b/Changes
index 32c003a0..4a567b0b 100644
--- a/Changes
+++ b/Changes
@@ -1,3 +1,4 @@
+        - rpmdragora - fixed icons (removed rpmdrake deps)
         - rpmdragora - Show details on first selected package also
         - rpmdragora - when a new filter is given now packages are shown
 		correctly into selected group
diff --git a/MANIFEST b/MANIFEST
index 2a911bd5..15f4b52a 100644
--- a/MANIFEST
+++ b/MANIFEST
@@ -145,6 +145,7 @@ po/ru.po
 po/sc.po
 po/sk.po
 po/sl.po
+po/sq.po
 po/sr.po
 po/sv.po
 po/th.po
@@ -207,6 +208,13 @@ share/images/rpmdragora/dragora-urpm-sources.png
 share/images/rpmdragora/dragoraUpdate.png
 share/images/rpmdragora/general-update.png
 share/images/rpmdragora/security-update.png
+share/images/rpmdragora/state_backport.png
+share/images/rpmdragora/state_base.png
+share/images/rpmdragora/state_installed.png
+share/images/rpmdragora/state_to_install.png
+share/images/rpmdragora/state_to_remove.png
+share/images/rpmdragora/state_to_update.png
+share/images/rpmdragora/state_uninstalled.png
 share/images/rpmdragora/title-install.png
 share/images/rpmdragora/title-update.png
 share/images/Up.png
diff --git a/lib/ManaTools/Rpmdragora/gui.pm b/lib/ManaTools/Rpmdragora/gui.pm
index 4dd2d56b..bd36d809 100644
--- a/lib/ManaTools/Rpmdragora/gui.pm
+++ b/lib/ManaTools/Rpmdragora/gui.pm
@@ -41,6 +41,7 @@ use MDK::Common::Various qw(chomp_ to_bool);
 use MDK::Common::String qw(formatAlaTeX);
 use MDK::Common::Math qw(sum);
 use MDK::Common::System qw(list_passwd);
+use File::ShareDir ':ALL';
 
 use ManaTools::rpmdragora;
 use ManaTools::Rpmdragora::open_db;
@@ -489,28 +490,22 @@ sub set_node_state {
     my ($tblItem, $state, $detail_list) = @_;
     return if $state eq 'XXX' || !$state;
 
+    my $icon = File::ShareDir::dist_file(ManaTools::Shared::distName(), "images/rpmdragora/state_$state.png");
     if ($detail_list) {
         $detail_list->parent()->parent()->startMultipleChanges();
-        $tblItem->addCell($state,"/usr/share/rpmdrake/icons/state_$state.png") if(ref $tblItem eq "yui::YCBTableItem");
+
+        $tblItem->addCell($state, $icon) if(ref $tblItem eq "yui::YCBTableItem");
         if(to_bool(member($state, qw(base installed to_install)))){
-            # it should be parent()->setChecked(1)
             $detail_list->checkItem($tblItem, 1);
-            # $tblItem->setSelected(1);
         }else{
             $detail_list->checkItem($tblItem, 0);
-            # $tblItem->setSelected(0);
         }
-#         if(!to_bool($state ne 'base')){
-#             #$iter->cell(0)->setLabel('-');
-#             $tblItem->cell(0)->setLabel('-');
-#         }
         $detail_list->parent()->parent()->doneMultipleChanges();
     }
     else {
         # no item list means we use just the item to add state information
-        $tblItem->addCell($state,"/usr/share/rpmdrake/icons/state_$state.png") if(ref $tblItem eq "yui::YCBTableItem");
+        $tblItem->addCell($state, $icon) if(ref $tblItem eq "yui::YCBTableItem");
         $tblItem->check(to_bool(member($state, qw(base installed to_install))));
-#         $tblItem->cell(0)->setLabel('-') if !to_bool($state ne 'base');
     }
 }
 
diff --git a/modules/rpmdragora/rpmdragora b/modules/rpmdragora/rpmdragora
index 178bc036..717d92b2 100755
--- a/modules/rpmdragora/rpmdragora
+++ b/modules/rpmdragora/rpmdragora
@@ -53,10 +53,7 @@ use yui;
 use feature 'state';
 use POSIX qw/uname/;
 
-# OLD $ugtk2::wm_icon = get_icon('installremoverpm', "title-$MODE");
-#TODO fix $wm_resource_path
-my $wm_resource_path="/usr/share/rpmdrake/icons";
-my $wm_icon = "$wm_resource_path"."/title-$MODE.png";
+my $wm_icon = File::ShareDir::dist_file(ManaTools::Shared::distName(), "images/rpmdragora/title-$MODE.png");
 
 # Declarations
 my $my_win;
diff --git a/share/images/rpmdragora/state_backport.png b/share/images/rpmdragora/state_backport.png
new file mode 100644
index 00000000..db11b94e
--- /dev/null
+++ b/share/images/rpmdragora/state_backport.png
diff --git a/share/images/rpmdragora/state_base.png b/share/images/rpmdragora/state_base.png
new file mode 100644
index 00000000..f2b7860a
--- /dev/null
+++ b/share/images/rpmdragora/state_base.png
diff --git a/share/images/rpmdragora/state_installed.png b/share/images/rpmdragora/state_installed.png
new file mode 100644
index 00000000..cf0777cc
--- /dev/null
+++ b/share/images/rpmdragora/state_installed.png
diff --git a/share/images/rpmdragora/state_to_install.png b/share/images/rpmdragora/state_to_install.png
new file mode 100644
index 00000000..94d356d4
--- /dev/null
+++ b/share/images/rpmdragora/state_to_install.png
diff --git a/share/images/rpmdragora/state_to_remove.png b/share/images/rpmdragora/state_to_remove.png
new file mode 100644
index 00000000..50eaf758
--- /dev/null
+++ b/share/images/rpmdragora/state_to_remove.png
diff --git a/share/images/rpmdragora/state_to_update.png b/share/images/rpmdragora/state_to_update.png
new file mode 100644
index 00000000..4fc9de4a
--- /dev/null
+++ b/share/images/rpmdragora/state_to_update.png
diff --git a/share/images/rpmdragora/state_uninstalled.png b/share/images/rpmdragora/state_uninstalled.png
new file mode 100644
index 00000000..ddd2191b
--- /dev/null
+++ b/share/images/rpmdragora/state_uninstalled.png