split out icon stuff into Rpmdrake::icon

1 files changed, 2 insertions, 164 deletions

diff --git a/rpmdrake b/rpmdrake
index 2667b0f3..e63e728c 100755
--- a/rpmdrake
+++ b/rpmdrake
@@ -34,6 +34,7 @@ use standalone;
 
 use Rpmdrake::init;
 use rpmdrake;
+use Rpmdrake::icon;
 use Rpmdrake::gui;
 use Rpmdrake::rpmnew;
 use Rpmdrake::formatting;
@@ -57,161 +58,6 @@ warn_about_user_mode();
 
 my $dont_show_selections = $> ? 1 : 0;
 
-#- /usr/share/rpmlint/config (duplicates are normal, so that we are not too far away from .py)
-my %group_icons = (
-	N("Accessibility") => 'accessibility_section',
-	N("Archiving") => 'archiving_section',
-	join('|', N("Archiving"), N("Backup")) => 'backup_section',
-	join('|', N("Archiving"), N("Cd burning")) => 'cd_burning_section',
-	join('|', N("Archiving"), N("Compression")) => 'compression_section',
-	join('|', N("Archiving"), N("Other")) => 'other_archiving',
-	N("Books") => 'documentation_section',
-	join('|', N("Books"), N("Computer books")) => 'documentation_section',
-	join('|', N("Books"), N("Faqs")) => 'documentation_section',
-	join('|', N("Books"), N("Howtos")) => 'documentation_section',
-	join('|', N("Books"), N("Literature")) => 'documentation_section',
-	join('|', N("Books"), N("Other")) => 'education_other_section',
-     N("Cluster") => 'parallel_computing_section',
-	join('|', N("Cluster"), N("Message Passing")) => '',
-	join('|', N("Cluster"), N("Queueing Services")) => '',
-	N("Communications") => 'communications_section',
-	N("Databases") => 'databases_section',
-	N("Development") => 'development_section',
-	join('|', N("Development"), N("C")) => '',
-	join('|', N("Development"), N("C++")) => '',
-	join('|', N("Development"), N("Databases")) => 'databases_section',
-	join('|', N("Development"), N("GNOME and GTK+")) => 'gnome_section',
-	join('|', N("Development"), N("Java")) => '',
-	join('|', N("Development"), N("KDE and Qt")) => 'kde_section',
-	join('|', N("Development"), N("Kernel")) => 'hardware_configuration_section',
-	join('|', N("Development"), N("Other")) => 'development_tools_section',
-	join('|', N("Development"), N("Perl")) => '',
-	join('|', N("Development"), N("PHP")) => '',
-	join('|', N("Development"), N("Python")) => '',
-	N("Editors") => 'emulators_section',
-	N("Education") => 'education_section',
-	N("Emulators") => 'emulators_section',
-	N("File tools") => 'file_tools_section',
-	N("Games") => 'amusement_section',
-	join('|', N("Games"), N("Adventure")) => 'adventure_section',
-	join('|', N("Games"), N("Arcade")) => 'arcade_section',
-	join('|', N("Games"), N("Boards")) => 'boards_section',
-	join('|', N("Games"), N("Cards")) => 'cards_section',
-	join('|', N("Games"), N("Other")) => 'other_amusement',
-	join('|', N("Games"), N("Puzzles")) => 'puzzle_section',
-	join('|', N("Games"), N("Sports")) => 'sport_section',
-	join('|', N("Games"), N("Strategy")) => 'strategy_section',
-	N("Graphical desktop") => 'office_section',
-	join('|', N("Graphical desktop"),
-          #-PO: This is a package/product name. Only translate it if needed:
-          N("Enlightenment")) => '',
-	join('|', N("Graphical desktop"), N("FVWM based")) => '',
-	join('|', N("Graphical desktop"),
-          #-PO: This is a package/product name. Only translate it if needed:
-          N("GNOME")) => 'gnome_section',
-	join('|', N("Graphical desktop"),
-          #-PO: This is a package/product name. Only translate it if needed:
-          N("Icewm")) => '',
-	join('|', N("Graphical desktop"),
-          #-PO: This is a package/product name. Only translate it if needed:
-          N("KDE")) => 'kde_section',
-	join('|', N("Graphical desktop"), N("Other")) => 'more_applications_other_section',
-	join('|', N("Graphical desktop"),
-          #-PO: This is a package/product name. Only translate it if needed:
-          N("Sawfish")) => '',
-	join('|', N("Graphical desktop"),
-          #-PO: This is a package/product name. Only translate it if needed:
-          N("WindowMaker")) => '',
-	join('|', N("Graphical desktop"),
-          #-PO: This is a package/product name. Only translate it if needed:
-          N("Xfce")) => '',
-	N("Graphics") => 'graphics_section',
-	N("Monitoring") => 'monitoring_section',
-	N("Multimedia") => 'multimedia_section',
-	join('|', N("Multimedia"), N("Video")) => 'video_section',
-	N("Networking") => 'networking_section',
-	join('|', N("Networking"), N("Chat")) => 'chat_section',
-	join('|', N("Networking"), N("File transfer")) => 'file_transfer_section',
-	join('|', N("Networking"), N("IRC")) => 'irc_section',
-	join('|', N("Networking"), N("Instant messaging")) => 'instant_messaging_section',
-	join('|', N("Networking"), N("Mail")) => 'mail_section',
-	join('|', N("Networking"), N("News")) => 'news_section',
-	join('|', N("Networking"), N("Other")) => 'other_networking',
-	join('|', N("Networking"), N("Remote access")) => 'remote_access_section',
-	join('|', N("Networking"), N("WWW")) => 'networking_www_section',
-	N("Office") => 'office_section',
-	N("Public Keys") => 'packaging_section',
-	N("Publishing") => 'publishing_section',
-	N("Sciences") => 'sciences_section',
-	join('|', N("Sciences"), N("Astronomy")) => 'astronomy_section',
-	join('|', N("Sciences"), N("Biology")) => 'biology_section',
-	join('|', N("Sciences"), N("Chemistry")) => 'chemistry_section',
-	join('|', N("Sciences"), N("Computer science")) => 'computer_science_section',
-	join('|', N("Sciences"), N("Geosciences")) => 'geosciences_section',
-	join('|', N("Sciences"), N("Mathematics")) => 'mathematics_section',
-	join('|', N("Sciences"), N("Other")) => 'other_sciences',
-	join('|', N("Sciences"), N("Physics")) => 'physics_section',
-	N("Shells") => 'shells_section',
-	N("Sound") => 'sound_section',
-	N("System") => 'system_section',
-	join('|', N("System"), N("Base")) => 'system_section',
-	join('|', N("System"), N("Configuration")) => 'configuration_section',
-	join('|', N("System"), N("Configuration"), N("Boot and Init")) => 'boot_init_section',
-	join('|', N("System"), N("Configuration"), N("Hardware")) => 'hardware_configuration_section',
-	join('|', N("System"), N("Configuration"), N("Networking")) => 'networking_configuration_section',
-	join('|', N("System"), N("Configuration"), N("Other")) => 'system_other_section',
-	join('|', N("System"), N("Configuration"), N("Packaging")) => 'packaging_section',
-	join('|', N("System"), N("Configuration"), N("Printing")) => 'printing_section',
-	join('|', N("System"), N("Deploiement")) => '',
-	join('|', N("System"), N("Deployment")) => '',
-	join('|', N("System"), N("Fonts")) => 'chinese_section',
-	join('|', N("System"), N("Fonts"), N("Console")) => 'interpreters_section',
-	join('|', N("System"), N("Fonts"), N("True type")) => '',
-	join('|', N("System"), N("Fonts"), N("Type1")) => '',
-	join('|', N("System"), N("Fonts"), N("X11 bitmap")) => '',
-	join('|', N("System"), N("Internationalization")) => 'chinese_section',
-	join('|', N("System"), N("Kernel and hardware")) => 'hardware_configuration_section',
-	join('|', N("System"), N("Libraries")) => '',
-	join('|', N("System"), N("Servers")) => '',
-	join('|', N("System"),
-          #-PO: This is a package/product name. Only translate it if needed:
-          N("X11")) => '',
-	N("Terminals") => 'terminals_section',
-	N("Text tools") => 'text_tools_section',
-	N("Toys") => 'toys_section',
-	N("Video") => 'video_section',
-
-     # for Mandriva Choice:
-	N("Workstation") => 'office_section',
-	join('|', N("Workstation"), N("Configuration")) => 'configuration_section',
-	join('|', N("Workstation"), N("Console Tools")) => 'interpreters_section',
-	join('|', N("Workstation"), N("Documentation")) => 'documentation_section',
-	join('|', N("Workstation"), N("Game station")) => 'amusement_section',
-	join('|', N("Workstation"), N("Internet station")) => 'networking_section',
-	join('|', N("Workstation"), N("Multimedia station")) => 'multimedia_section',
-	join('|', N("Workstation"), N("Network Computer (client)")) => 'other_networking',
-	join('|', N("Workstation"), N("Office Workstation")) => 'office_section',
-	join('|', N("Workstation"), N("Scientific Workstation")) => 'sciences_section',
-	N("Graphical Environment") => 'office_section',
-
-	join('|', N("Graphical Environment"), N("GNOME Workstation")) => 'gnome_section',
-	join('|', N("Graphical Environment"), N("IceWm Desktop")) => 'icewm',
-	join('|', N("Graphical Environment"), N("KDE Workstation")) => 'kde_section',
-	join('|', N("Graphical Environment"), N("Other Graphical Desktops")) => 'more_applications_other_section',
-	N("Development") => 'development_section',
-	join('|', N("Development"), N("Development")) => 'development_section',
-	join('|', N("Development"), N("Documentation")) => 'documentation_section',
-	N("Server") => 'archiving_section',
-	join('|', N("Server"), N("DNS/NIS")) => 'networking_section',
-	join('|', N("Server"), N("Database")) => 'databases_section',
-	join('|', N("Server"), N("Firewall/Router")) => 'networking_section',
-	join('|', N("Server"), N("Mail")) => 'mail_section',
-	join('|', N("Server"), N("Mail/Groupware/News")) => 'mail_section',
-	join('|', N("Server"), N("Network Computer server")) => 'networking_section',
-	join('|', N("Server"), N("Web/FTP")) => 'networking_www_section',
-
-    );
-
 
 sub ctreefy {
     join('|', map { translate($_) } split m|/|, $_[0]);
@@ -510,15 +356,7 @@ sub run_treeview_dialog {
          my ($pkg) = @_;
          return exists $pkgs->{$pkg};
      },
-	get_icon => sub {
-         my ($group, $parent) = @_;
-         my $pixbuf;
-         my $path = $group =~ /\|/ ? '/usr/share/icons/mini/' : '/usr/share/icons/';
-         my $create_pixbuf = sub { gtknew('Pixbuf', file => join('', $path, $_[0], '.png')) };
-         eval { $pixbuf = $create_pixbuf->($group_icons{$group}) };
-         eval { $pixbuf ||= $create_pixbuf->($group_icons{$parent}) } if $parent;
-         $pixbuf ||= $create_pixbuf->('applications_section');
-     },
+	get_icon => \&get_icon,
 	node_state => sub {
          my $pkg = $pkgs->{$_[0]};
          my $urpm_obj = $pkg->{pkg};