aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--AdminPanel/Rpmdragora/gui.pm11
-rw-r--r--AdminPanel/Rpmdragora/icon.pm121
-rw-r--r--AdminPanel/Rpmdragora/pkg.pm1
-rwxr-xr-xmodules/rpmdragora/rpmdragora4
4 files changed, 64 insertions, 73 deletions
diff --git a/AdminPanel/Rpmdragora/gui.pm b/AdminPanel/Rpmdragora/gui.pm
index dd25235..424614a 100644
--- a/AdminPanel/Rpmdragora/gui.pm
+++ b/AdminPanel/Rpmdragora/gui.pm
@@ -409,11 +409,15 @@ sub set_node_state {
#$model->set($iter, $pkg_columns{selectable} => to_bool($state ne 'base'));
$iter->addCell($state,"/usr/share/rpmdrake/icons/state_$state.png");
if(to_bool(member($state, qw(base installed to_install)))){
- $iter->cell(0)->setLabel('x');
+ #$iter->cell(0)->setLabel('x');
+ # it should be parent()->setChecked(1)
+ $iter->cell(0)->parent()->setSelected(1);
}else{
- $iter->cell(0)->setLabel('');
+ #$iter->cell(0)->setLabel('');
+ $iter->cell(0)->parent()->setSelected(0);
}
if(!to_bool($state ne 'base')){
+ #$iter->cell(0)->setLabel('-');
$iter->cell(0)->setLabel('-');
}
}
@@ -479,8 +483,7 @@ sub add_node {
$release = "" if(!defined($release));
$arch = "" if(!defined($arch));
#my $newTableItem = new yui::YTableItem(format_name_n_summary($name, get_summary($leaf)),
- my $newTableItem = new yui::YTableItem($state,
- $name."\n".get_summary($leaf),
+ my $newTableItem = new yui::YTableItem($name."\n".get_summary($leaf),
$version,
$release,
$arch);
diff --git a/AdminPanel/Rpmdragora/icon.pm b/AdminPanel/Rpmdragora/icon.pm
index d9ba2b1..1dee4e5 100644
--- a/AdminPanel/Rpmdragora/icon.pm
+++ b/AdminPanel/Rpmdragora/icon.pm
@@ -44,14 +44,13 @@ my %group_icons = (
join('|', N("Archiving"), N("Compression")) => 'compression_section',
join('|', N("Archiving"), N("Other")) => 'other_archiving',
N("Communications") => 'communications_section',
- join('|', N("Communications"), N("Bluetooth")) => 'communications_section',
- join('|', N("Communications"), N("Bluetooth")) => 'communications_section',
- join('|', N("Communications"), N("Dial-Up")) => 'communications_section',
- join('|', N("Communications"), N("Fax")) => 'communications_section',
- join('|', N("Communications"), N("Mobile")) => 'communications_section',
- join('|', N("Communications"), N("Radio")) => 'communications_section',
- join('|', N("Communications"), N("Serial")) => 'communications_section',
- join('|', N("Communications"), N("Telephony")) => 'communications_section',
+ join('|', N("Communications"), N("Bluetooth")) => 'communications_bluetooth_section',
+ join('|', N("Communications"), N("Dial-Up")) => 'communications_dialup_section',
+ join('|', N("Communications"), N("Fax")) => 'communications_fax_section',
+ join('|', N("Communications"), N("Mobile")) => 'communications_mobile_section',
+ join('|', N("Communications"), N("Radio")) => 'communications_radio_section',
+ join('|', N("Communications"), N("Serial")) => 'communications_serial_section',
+ join('|', N("Communications"), N("Telephony")) => 'communications_phone_section',
N("Databases") => 'databases_section',
N("Development") => 'development_section',
join('|', N("Development"), N("Basic")) => '',
@@ -59,20 +58,21 @@ my %group_icons = (
join('|', N("Development"), N("C++")) => '',
join('|', N("Development"), N("C#")) => '',
join('|', N("Development"), N("Databases")) => 'databases_section',
+ join('|', N("Development"), N("Debug")) => '',
join('|', N("Development"), N("Erlang")) => '',
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("Kernel")) => '',
join('|', N("Development"), N("OCaml")) => '',
- join('|', N("Development"), N("Other")) => 'development_tools_section',
+ join('|', N("Development"), N("Other")) => '',
join('|', N("Development"), N("Perl")) => '',
join('|', N("Development"), N("PHP")) => '',
join('|', N("Development"), N("Python")) => '',
- join('|', N("Development"), N("Tools")) => '',
- join('|', N("Development"), N("X11")) => 'office_section',
+ join('|', N("Development"), N("Tools")) => 'development_tools_section',
+ join('|', N("Development"), N("X11")) => '',
N("Documentation") => 'documentation_section',
- N("Editors") => 'emulators_section',
+ N("Editors") => 'editors_section',
N("Education") => 'education_section',
N("Emulators") => 'emulators_section',
N("File tools") => 'file_tools_section',
@@ -83,46 +83,40 @@ my %group_icons = (
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("Shooter")) => 'other_amusement',
+ join('|', N("Games"), N("Shooter")) => 'shooter_section',
+ join('|', N("Games"), N("Simulation")) => 'simulation_section',
join('|', N("Games"), N("Sports")) => 'sport_section',
join('|', N("Games"), N("Strategy")) => 'strategy_section',
- N("Geography") => 'geosciences_section',
- N("Graphical desktop") => 'office_section',
+ N("Geography") => 'geography_section',
+ N("Graphical desktop") => 'graphical_desktop_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")) => '',
+ N("Enlightenment")) => 'enlightment_section',
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")) => '',
+ N("Icewm")) => 'icewm_section',
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")) => '',
+ N("WindowMaker")) => 'windowmaker_section',
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("Xfce")) => 'xfce_section',
N("Graphics") => 'graphics_section',
- join('|', N("Graphics"), N("3D")) => '',
- join('|', N("Graphics"), N("Editors")) => '',
- join('|', N("Graphics"), N("Other")) => '',
- join('|', N("Graphics"), N("Photography")) => '',
- join('|', N("Graphics"), N("Scanning")) => '',
- join('|', N("Graphics"), N("Viewers")) => '',
+ join('|', N("Graphics"), N("3D")) => 'graphics_3d_section',
+ join('|', N("Graphics"), N("Editors and Converters")) => 'graphics_editors_section',
+ join('|', N("Graphics"), N("Utilities")) => 'graphics_utilities_section',
+ join('|', N("Graphics"), N("Photography")) => 'graphics_photography_section',
+ join('|', N("Graphics"), N("Scanning")) => 'graphics_scanning_section',
+ join('|', N("Graphics"), N("Viewers")) => 'graphics_viewers_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',
@@ -132,17 +126,15 @@ my %group_icons = (
join('|', N("Networking"), N("Remote access")) => 'remote_access_section',
join('|', N("Networking"), N("WWW")) => 'networking_www_section',
N("Office") => 'office_section',
- join('|', N("Office"), N("Dictionary")) => '',
- join('|', N("Office"), N("Finance")) => '',
- join('|', N("Office"), N("Management")) => '',
- join('|', N("Office"), N("Organizer")) => '',
- join('|', N("Office"), N("Other")) => '',
- join('|', N("Office"), N("Spreadsheet")) => '',
- join('|', N("Office"), N("Suite")) => '',
- join('|', N("Office"), N("Word processor")) => '',
- N("Public Keys") => 'packaging_section',
+ join('|', N("Office"), N("Dictionary")) => 'office_dictionary_section',
+ join('|', N("Office"), N("Finance")) => 'finances_section',
+ join('|', N("Office"), N("Management")) => 'timemanagement_section',
+ join('|', N("Office"), N("Organizer")) => 'timemanagement_section',
+ join('|', N("Office"), N("Utilities")) => 'office_accessories_section',
+ join('|', N("Office"), N("Spreadsheet")) => 'spreadsheet_section',
+ join('|', N("Office"), N("Suite")) => 'office_suite',
+ join('|', N("Office"), N("Word processor")) => 'wordprocessor_section',
N("Publishing") => 'publishing_section',
- N("Security") => 'packaging_section',
N("Sciences") => 'sciences_section',
join('|', N("Sciences"), N("Astronomy")) => 'astronomy_section',
join('|', N("Sciences"), N("Biology")) => 'biology_section',
@@ -152,47 +144,44 @@ my %group_icons = (
join('|', N("Sciences"), N("Mathematics")) => 'mathematics_section',
join('|', N("Sciences"), N("Other")) => 'other_sciences',
join('|', N("Sciences"), N("Physics")) => 'physics_section',
+ N("Security") => 'security_section',
N("Shells") => 'shells_section',
N("Sound") => 'sound_section',
- join('|', N("Sound"), N("Editors and Converters")) => '',
- join('|', N("Sound"), N("Midi")) => '',
- join('|', N("Sound"), N("Mixers")) => '',
- join('|', N("Sound"), N("Players")) => '',
- join('|', N("Sound"), N("Utilities")) => '',
- join('|', N("Sound"), N("Visualization")) => '',
+ join('|', N("Sound"), N("Editors and Converters")) => 'sound_editors_section',
+ join('|', N("Sound"), N("Midi")) => 'sound_midi_section',
+ join('|', N("Sound"), N("Mixers")) => 'sound_mixers_section',
+ join('|', N("Sound"), N("Players")) => 'sound_players_section',
+ join('|', N("Sound"), N("Utilities")) => 'sound_utilities_section',
N("System") => 'system_section',
join('|', N("System"), N("Base")) => 'system_section',
+ join('|', N("System"), N("Boot and Init")) => 'boot_init_section',
join('|', N("System"), N("Cluster")) => 'parallel_computing_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("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("Libraries")) => 'system_section',
+ join('|', N("System"), N("Networking")) => 'networking_configuration_section',
+ join('|', N("System"), N("Packaging")) => 'packaging_section',
join('|', N("System"), N("Printing")) => 'printing_section',
- join('|', N("System"), N("Servers")) => '',
+ join('|', N("System"), N("Servers")) => 'servers_section',
join('|', N("System"),
#-PO: This is a package/product name. Only translate it if needed:
- N("X11")) => 'office_section',
+ N("X11")) => 'x11_section',
N("Terminals") => 'terminals_section',
N("Text tools") => 'text_tools_section',
N("Toys") => 'toys_section',
N("Video") => 'video_section',
- join('|', N("Video"), N("Editors and Converters")) => '',
- join('|', N("Video"), N("Players")) => '',
- join('|', N("Video"), N("Utilities")) => '',
+ join('|', N("Video"), N("Editors and Converters")) => 'video_editors_section',
+ join('|', N("Video"), N("Players")) => 'video_players_section',
+ join('|', N("Video"), N("Television")) => 'video_television_section',
+ join('|', N("Video"), N("Utilities")) => 'video_utilities_section',
# for Mageia Choice:
- N("Workstation") => 'office_section',
+ N("Workstation") => 'system_section',
join('|', N("Workstation"), N("Configuration")) => 'configuration_section',
join('|', N("Workstation"), N("Console Tools")) => 'interpreters_section',
join('|', N("Workstation"), N("Documentation")) => 'documentation_section',
@@ -202,16 +191,16 @@ my %group_icons = (
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',
+ N("Graphical Environment") => 'graphical_desktop_section',
join('|', N("Graphical Environment"), N("GNOME Workstation")) => 'gnome_section',
- join('|', N("Graphical Environment"), N("IceWm Desktop")) => 'icewm',
+ join('|', N("Graphical Environment"), N("IceWm Desktop")) => 'icewm_section',
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',
+ N("Server") => 'servers_section',
join('|', N("Server"), N("DNS/NIS")) => 'networking_section',
join('|', N("Server"), N("Database")) => 'databases_section',
join('|', N("Server"), N("Firewall/Router")) => 'networking_section',
diff --git a/AdminPanel/Rpmdragora/pkg.pm b/AdminPanel/Rpmdragora/pkg.pm
index 67cf8aa..1a4cc7c 100644
--- a/AdminPanel/Rpmdragora/pkg.pm
+++ b/AdminPanel/Rpmdragora/pkg.pm
@@ -190,6 +190,7 @@ sub extract_header {
sub find_installed_version {
my ($p) = @_;
my $version;
+ print "EVR: ".$_[0]->EVR."\n";
open_rpm_db()->traverse_tag_find('name', $p->name, sub { $version = $_[0]->EVR });
$version || N("(none)");
}
diff --git a/modules/rpmdragora/rpmdragora b/modules/rpmdragora/rpmdragora
index 337bfdb..64baac9 100755
--- a/modules/rpmdragora/rpmdragora
+++ b/modules/rpmdragora/rpmdragora
@@ -411,8 +411,6 @@ sub run_treeview_dialog {
#$col_sel->set_sizing('fixed');
#$col_sel->set_sort_column_id($pkg_columns{selected});
- $detail_list_header->addColumn('', 3);
-
my $display_arch_col = to_bool(arch() =~ /64/);
my @columns = (qw(name version release), if_($display_arch_col, 'arch'));
@@ -470,7 +468,7 @@ sub run_treeview_dialog {
#$pixcolumn->set_sort_column_id($pkg_columns{state});
$detail_list_header->addColumn(N("Status"));
- $detail_list = $factory->createTable($hbox_middle,$detail_list_header);
+ $detail_list = $factory->createTable($hbox_middle,$detail_list_header,1);
$detail_list->setWeight(0,50);
$detail_list->setNotify(1);
#OLD compute_main_window_size($w);
generated by cgit v1.2.1 (git 2.21.0) at 2024-06-14 18:22:02 +0000