From a7633eaac5afd96a7662cabec330ba25b2b26b43 Mon Sep 17 00:00:00 2001 From: Angelo Naselli Date: Sat, 3 Jan 2015 14:07:08 +0100 Subject: Fixed icon buttons in rpmdragora --- Changes | 12 ++++++++++++ MANIFEST | 1 + README.md | 3 +++ modules/rpmdragora/rpmdragora | 8 ++++++-- share/images/rpmdragora/clear_22x22.png | Bin 0 -> 1060 bytes 5 files changed, 22 insertions(+), 2 deletions(-) create mode 100644 share/images/rpmdragora/clear_22x22.png diff --git a/Changes b/Changes index 1d9838a..156c6fb 100644 --- a/Changes +++ b/Changes @@ -1,3 +1,15 @@ +1.0.0-7 + - rpmdragora: fixed button icons search and clear + - rpmdragora: config file saved keys are sorted first + - rpmdragora: search button as default + +1.0.0-6 27/12/2014 17:48 + - AdminPanel::Shared::Service now works using dbus systemd1 + - AdminPanel::Shared::Service as a Moose Module + - Added colored diff in rpmnew dialog + - Added bash completion for mana + - fixed add mirror functionality + 1.0.0-5 11/12/2014 20:30 - improved package information view - fixed rpmdragora pacakge installation diff --git a/MANIFEST b/MANIFEST index 279340f..4dd184e 100644 --- a/MANIFEST +++ b/MANIFEST @@ -107,6 +107,7 @@ share/images/manauser.png share/images/mpan.png share/images/quit.png share/images/rpmdragora/bugfix-update.png +share/images/rpmdragora/clear_22x22.png share/images/rpmdragora/general-update.png share/images/rpmdragora/security-update.png share/images/rpmdragora/title-update.png diff --git a/README.md b/README.md index b07210d..4fbd86b 100644 --- a/README.md +++ b/README.md @@ -113,3 +113,6 @@ service-mdk -> manaservice userdrake -> manauser drakconf -> mpan +NOTE 2: +clear22x22 icon is got from gnome gtk-clear + diff --git a/modules/rpmdragora/rpmdragora b/modules/rpmdragora/rpmdragora index 996b36a..e24b386 100755 --- a/modules/rpmdragora/rpmdragora +++ b/modules/rpmdragora/rpmdragora @@ -26,6 +26,7 @@ # # $Id: rpmdragora 267936 2010-04-26 16:40:21Z jvictor $ +use File::ShareDir ':ALL'; use MDK::Common::Func qw(any if_); use utf8; @@ -673,11 +674,14 @@ sub run_treeview_dialog { } $find_entry = $factory->createInputField($hbox_top, ""); - my $find_button = $factory->createIconButton($hbox_top, "/usr/share/mcc/themes/default/logdrake-mdk.png", $loc->N("Search")); + + my $icon_file = File::ShareDir::dist_file(AdminPanel::Shared::distName(), "images/manalog.png"); + my $find_button = $factory->createIconButton($hbox_top, $icon_file, $loc->N("Search")); $find_button->setWeight(0,6); $my_win->setDefaultButton($find_button); - my $reset_search_button = $factory->createIconButton($hbox_top, "/usr/share/icons/gnome/22x22/actions/gtk-clear.png", $loc->N("Reset")); + $icon_file = File::ShareDir::dist_file(AdminPanel::Shared::distName(), "images/rpmdragora/clear_22x22.png"); + my $reset_search_button = $factory->createIconButton($hbox_top, $icon_file, $loc->N("Reset")); $reset_search_button->setWeight(0,7); $find_entry->setWeight(0,10); diff --git a/share/images/rpmdragora/clear_22x22.png b/share/images/rpmdragora/clear_22x22.png new file mode 100644 index 0000000..3b0a5e9 Binary files /dev/null and b/share/images/rpmdragora/clear_22x22.png differ -- cgit v1.2.1