- don't use compssUsers anymore, use compssUsers.pl

- code to display compssUsers choices is now in compssUsers.pl
- {compssUsers} is now a list instead of a hash, and so drop {compssUsersSorted}
- rename {compssUsersChoice} to {rpmsrate_flags_chosen} (better name)
- i18n_compssUsers is no more needed, add share/compssUsers.pl* to ALLPMS

4 files changed, 136 insertions, 132 deletions

diff --git a/perl-install/share/compssUsers b/perl-install/share/compssUsers
deleted file mode 100644
index f6171b4a3..000000000
--- a/perl-install/share/compssUsers
+++ /dev/null
@@ -1,89 +0,0 @@
-     # --- Workstation
-
-Office Workstation [icon=office] [path=Workstation] [selected=all] [descr=Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, gnumeric), pdf viewers, etc]
-	OFFICE
-	SPELLCHECK
-	PUBLISHING
-	PIM
-	ARCHIVING
-	PRINTER
-
-Game station [icon=arcade] [path=Workstation] [descr=Amusement programs: arcade, boards, strategy, etc]
-	GAMES
-
-Multimedia station [icon=multimedia] [path=Workstation] [selected=all] [descr=Sound and video playing/editing programs]
-	AUDIO
-	VIDEO
-	GRAPHICS
-
-Internet station [icon=networking] [path=Workstation] [selected=all] [descr=Set of tools to read and send mail and news (mutt, tin..) and to browse the Web]
-	NETWORKING_WWW
-	NETWORKING_MAIL
-	NETWORKING_NEWS
-	COMMUNICATIONS
-	NETWORKING_CHAT
-	NETWORKING_FILE_TRANSFER
-	NETWORKING_IRC
-	NETWORKING_INSTANT_MESSAGING
-	NETWORKING_DNS
-
-Network Computer (client) [icon=terminals] [path=Workstation] [descr=Clients for different protocols including ssh]
-	NETWORKING_REMOTE_ACCESS
-	NETWORKING_FILE
-
-Configuration [icon=configuration] [path=Workstation] [selected=all] [descr=Tools to ease the configuration of your computer]
-	CONFIG
-
-Console Tools [icon=terminals] [path=Workstation] [selected=all] [descr=Editors, shells, file tools, terminals]
-	EDITORS
-	TERMINALS
-	TEXT_TOOLS
-	SHELLS
-	FILE_TOOLS
-
-     # --- Graphical Environment
-
-KDE Workstation [icon=kde] [path=Graphical Environment] [selected=all] [descr=The K Desktop Environment, the basic graphical environment with a collection of accompanying tools]
-	KDE
-	X
-
-GNOME Workstation [icon=gnome] [path=Graphical Environment] [descr=A graphical environment with user-friendly set of applications and desktop tools]
-	GNOME
-	X
-
-Other Graphical Desktops [icon=windowmanager] [path=Graphical Environment] [descr=Icewm, Window Maker, Enlightenment, Fvwm, etc]
-	GRAPHICAL_DESKTOP
-	X
-
-
-     # --- Development
-
-Development [icon=editors] [path=Development] [descr=C and C++ development libraries, programs and include files]
-	DEVELOPMENT
-	EDITORS
-
-Documentation [icon=documentation] [path=Development] [descr=Books and Howto's on Linux and Free Software]
-	BOOKS
-
-LSB [icon=documentation] [path=Development] [descr=Linux Standard Base. Third party applications support]
-	LSB
-
-     # --- Server
-
-Web/FTP  [icon=file_transfer] [path=Server] [descr=Apache, Pro-ftpd]
-	NETWORKING_WWW_SERVER
-	NETWORKING_FILE_TRANSFER_SERVER
-
-Mail [icon=mail] [path=Server] [descr=Postfix mail server]
-	NETWORKING_MAIL_SERVER
-
-Database [icon=archiving] [path=Server] [descr=PostgreSQL or MySQL database server]
-	DATABASES
-	DATABASES_SERVER
-
-Firewall/Router [icon=networking] [path=Server] [descr=Internet gateway]
-	NETWORKING_FIREWALLING_SERVER
-
-Network Computer server [icon=networking] [path=Server] [descr=NFS server, SMB server, Proxy server, ssh server]
-	NETWORKING_FILE_SERVER
-	NETWORKING_REMOTE_ACCESS_SERVER
diff --git a/perl-install/share/compssUsers.pl b/perl-install/share/compssUsers.pl
new file mode 100644
index 000000000..f0830ae76
--- /dev/null
+++ b/perl-install/share/compssUsers.pl
@@ -0,0 +1,136 @@
+package tmp::compssUsers;
+
+use common;
+use ugtk2 qw(:helpers :wrappers :create);
+
+my $h = {
+
+N_("Server") => 
+[
+  { label => N_("Web/FTP"),
+    descr => N_("Apache, Pro-ftpd"),
+    flags => [ qw(NETWORKING_WWW_SERVER NETWORKING_FILE_TRANSFER_SERVER) ], 
+  },
+  { label => N_("Mail"),
+    descr => N_("Postfix mail server"),
+    flags => [ qw(NETWORKING_MAIL_SERVER) ], 
+  },
+  { label => N_("Database"),
+    descr => N_("PostgreSQL or MySQL database server"),
+    flags => [ qw(DATABASES DATABASES_SERVER) ], 
+  },
+  { label => N_("Firewall/Router"),
+    descr => N_("Internet gateway"),
+    flags => [ qw(NETWORKING_FIREWALLING_SERVER) ], 
+  },
+  { label => N_("Network Computer server"),
+    descr => N_("NFS server, SMB server, Proxy server, ssh server"),
+    flags => [ qw(NETWORKING_FILE_SERVER NETWORKING_REMOTE_ACCESS_SERVER) ], 
+  },
+],
+
+N_("Development") => 
+[
+  { label => N_("Development"),
+    descr => N_("C and C++ development libraries, programs and include files"),
+    flags => [ qw(DEVELOPMENT EDITORS) ], 
+  },
+  { label => N_("Documentation"),
+    descr => N_("Books and Howto's on Linux and Free Software"),
+    flags => [ qw(BOOKS) ], 
+  },
+  { label => N_("LSB"),
+    descr => N_("Linux Standard Base. Third party applications support"),
+    flags => [ qw(LSB) ], 
+  },
+],
+
+N_("Workstation") => 
+[
+  { label => N_("Office Workstation"),
+    descr => N_("Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, gnumeric), pdf viewers, etc"),
+    flags => [ qw(OFFICE SPELLCHECK PUBLISHING PIM ARCHIVING PRINTER) ],
+    selected => 1,
+  },
+  { label => N_("Game station"),
+    descr => N_("Amusement programs: arcade, boards, strategy, etc"),
+    flags => [ qw(GAMES) ], 
+  },
+  { label => N_("Multimedia station"),
+    descr => N_("Sound and video playing/editing programs"),
+    flags => [ qw(AUDIO VIDEO GRAPHICS) ],
+    selected => 1,
+  },
+  { label => N_("Internet station"),
+    descr => N_("Set of tools to read and send mail and news (mutt, tin..) and to browse the Web"),
+    flags => [ qw(NETWORKING_WWW NETWORKING_MAIL NETWORKING_NEWS COMMUNICATIONS NETWORKING_CHAT NETWORKING_FILE_TRANSFER NETWORKING_IRC NETWORKING_INSTANT_MESSAGING NETWORKING_DNS) ],
+    selected => 1,
+  },
+  { label => N_("Network Computer (client)"),
+    descr => N_("Clients for different protocols including ssh"),
+    flags => [ qw(NETWORKING_REMOTE_ACCESS NETWORKING_FILE) ], 
+  },
+  { label => N_("Configuration"),
+    descr => N_("Tools to ease the configuration of your computer"),
+    flags => [ qw(CONFIG) ],
+    selected => 1,
+  },
+  { label => N_("Console Tools"),
+    descr => N_("Editors, shells, file tools, terminals"),
+    flags => [ qw(EDITORS TERMINALS TEXT_TOOLS SHELLS FILE_TOOLS) ],
+    selected => 1,
+  },
+],
+
+N_("Graphical Environment") => 
+[
+  { label => N_("KDE Workstation"),
+    descr => N_("The K Desktop Environment, the basic graphical environment with a collection of accompanying tools"),
+    flags => [ qw(KDE X) ],
+    selected => 1,
+  },
+  { label => N_("GNOME Workstation"),
+    descr => N_("A graphical environment with user-friendly set of applications and desktop tools"),
+    flags => [ qw(GNOME X) ], 
+  },
+  { label => N_("Other Graphical Desktops"),
+    descr => N_("Icewm, Window Maker, Enlightenment, Fvwm, etc"),
+    flags => [ qw(GRAPHICAL_DESKTOP X) ], 
+  },
+],
+};
+
+foreach my $path (keys %$h) {
+    foreach (@{$h->{$path}}) {
+	$_->{path} = $path;
+	$_->{uid} = join('|', $path, $_->{label});
+    }
+}
+
+my $compssUsers = [ map { @$_ } values %$h ];
+
+my $gtk_display_compssUsers = sub {
+    my ($entry) = @_;
+
+    my $entries_in_path = sub {
+	my ($path) = @_;
+	translate($path), map { $entry->($_) } @{$h->{$path}};
+    };
+
+    gtkpack_(Gtk2::VBox->new(0, 0),
+	     1, gtkpack_(Gtk2::HBox->new(0, 0),
+			 1, gtkpack(Gtk2::VBox->new(0, 0), 
+				    $entries_in_path->('Workstation'),
+				    '',
+				    map { $entry->($_) } @{$h->{'Development'}},
+				   ),
+			 0, gtkpack(Gtk2::VBox->new(0, 0), 
+				    $entries_in_path->('Server'),
+				    '',
+				    $entries_in_path->('Graphical Environment'),
+				   ),
+			),
+	    );
+};
+
+$compssUsers, $gtk_display_compssUsers;
diff --git a/perl-install/share/po/Makefile b/perl-install/share/po/Makefile
index 92b6613af..6c4342ba3 100644
--- a/perl-install/share/po/Makefile
+++ b/perl-install/share/po/Makefile
@@ -37,7 +37,6 @@ $(POFILES): DrakX.pot
 
 DrakX.pot: $(PMSFILES_HERE)
 	cd ../.. ; perl_checker -q --generate-pot share/po/$@ $(PMSFILES)
-	perl i18n_compssUsers 2>/dev/null >> $@
 
 install:
 	for l in $(LANGS); do \
diff --git a/perl-install/share/po/i18n_compssUsers b/perl-install/share/po/i18n_compssUsers
deleted file mode 100644
index 9d4fc7b84..000000000
--- a/perl-install/share/po/i18n_compssUsers
+++ /dev/null
@@ -1,42 +0,0 @@
-#!/usr/bin/perl
-
-use MDK::Common;
-
-sub get {
-    my ($meta_class) = @_;
-    my @l;
-
-    local *F;
-    open F, "../compssUsers$meta_class" or return; #die "can't open file ../compssUsers$meta_class";
-    foreach (<F>) {
-	/^\s*$/ || /^#/ and next;
-
-	if (/^(\S.*)/) {
-	    my ($icon, $path, $descr, $selected);
-	    /^(.*?)\s*\[icon=(.*?)\](.*)/  and $_ = "$1$3", $icon  = $2;
-	    /^(.*?)\s*\[path=(.*?)\](.*)/  and $_ = "$1$3", $path  = $2;
-	    /^(.*?)\s*\[descr=(.*?)\](.*)/ and $_ = "$1$3", $descr = $2;
-	    /^(.*?)\s*\[selected=(.*?)\](.*)/ and $_ = "$1$3", $selected = $2;
-	    push @l, $_, $descr, $path;
-	}
-    }
-    close F;
-
-    @l;
-}
-
-my @l = map { if_(/msgid "(.*)"/, $1) } cat_("DrakX.pot");
-my %l; @l{@l} = ();
-
-foreach (uniq(get(''), get('.desktop'))) {
-    if ($_) {
-        s/"/\"/g;
-        s/\n//g;
-	next if exists $l{$_};
-        print qq(
-#: ../../share/compssUsers:999
-msgid "$_"
-msgstr ""
-);
-    }
-}