diff options
author | Thierry Vignaud <thierry.vignaud@gmail.com> | 2013-11-25 02:33:08 +0100 |
---|---|---|
committer | Thierry Vignaud <thierry.vignaud@gmail.com> | 2013-12-05 14:16:07 +0100 |
commit | eba0f6447a998febdc1e7424b0c8434e8c32b272 (patch) | |
tree | 1ac6c0bc59f6b1d439511b9723a084485c06278d | |
parent | 7ee50d8b855a8fbacd6aecb8ef2c4e9fd4c96c93 (diff) | |
download | rpmdrake-eba0f6447a998febdc1e7424b0c8434e8c32b272.tar rpmdrake-eba0f6447a998febdc1e7424b0c8434e8c32b272.tar.gz rpmdrake-eba0f6447a998febdc1e7424b0c8434e8c32b272.tar.bz2 rpmdrake-eba0f6447a998febdc1e7424b0c8434e8c32b272.tar.xz rpmdrake-eba0f6447a998febdc1e7424b0c8434e8c32b272.zip |
drop "/" from menu pathes
(needed for next commit)
-rwxr-xr-x | rpmdrake | 46 |
1 files changed, 23 insertions, 23 deletions
@@ -557,24 +557,24 @@ sub run_treeview_dialog { my $checkbox_show_autoselect; my %check_boxes; my $auto_select_string = - N("/_Options") . N("/_Select dependencies without asking"); + N("_Options") . N("_Select dependencies without asking"); my $clean_cache_string = - N("/_Options") . "/" . + N("_Options") . "/" . N("Clear download cache after successful install"); - my $updates_string = N("/_Options") . N("/_Compute updates on startup"); - my $NVR_string = N("/_Options") . "/" . N("Search in _full package names"); - my $regexp_search_string = N("/_Options") . "/" . N("Use _regular expressions in searches"); + my $updates_string = N("_Options") . N("_Compute updates on startup"); + my $NVR_string = N("_Options") . "/" . N("Search in _full package names"); + my $regexp_search_string = N("_Options") . "/" . N("Use _regular expressions in searches"); my ($menu, $factory) = create_factory_menu( $w->{real_window}, - [ N("/_File"), undef, undef, undef, '<Branch>' ], + [ N("_File"), undef, undef, undef, '<Branch>' ], if_( ! $>, - [ N("/_File") . N("/_Update media"), undef, sub { + [ N("_File") . N("_Update media"), undef, sub { update_sources_interactive($urpm, transient => $w->{real_window}) and $reload_db_and_clear_all->(); }, undef, '<Item>' ] ), - [ N("/_File") . N("/_Reset the selection"), undef, sub { + [ N("_File") . N("_Reset the selection"), undef, sub { if ($MODE ne 'remove') { my $db = eval { open_rpm_db() }; if (!ref($db)) { @@ -594,11 +594,11 @@ sub run_treeview_dialog { $tree_selection->select_path(Gtk3::TreePath->new_from_string('0')) if !$tree_selection->get_selected; $tree_selection->signal_emit('changed'); }, undef, '<Item>' ], - [ N("/_File") . N("/Reload the _packages list"), undef, $reload_db_and_clear_all, undef, '<Item>' ], - [ N("/_File") . N("/_Quit"), N("<control>Q"), \&quit, undef, '<Item>', ], - #[ N("/_View"), undef, undef, undef, '<Branch>' ], + [ N("_File") . N("Reload the _packages list"), undef, $reload_db_and_clear_all, undef, '<Item>' ], + [ N("_File") . N("_Quit"), N("<control>Q"), \&quit, undef, '<Item>', ], + #[ N("_View"), undef, undef, undef, '<Branch>' ], if_(!$>, - [ N("/_Options"), undef, undef, undef, '<Branch>' ], + [ N("_Options"), undef, undef, undef, '<Branch>' ], [ $auto_select_string, undef, sub { my $box = $check_boxes{$auto_select_string}; @@ -614,11 +614,11 @@ sub run_treeview_dialog { $::noclean = !$clean_cache->[0]; }, undef, '<CheckItem>' ], - [ N("/_Options") . N("/_Media Manager"), undef, sub { + [ N("_Options") . N("_Media Manager"), undef, sub { require Rpmdrake::edit_urpm_sources; Rpmdrake::edit_urpm_sources::run() && $reload_db_and_clear_all->(); }, undef, '<Item>' ], - [ N("/_Options") . N("/_Show automatically selected packages"), undef, sub { + [ N("_Options") . N("_Show automatically selected packages"), undef, sub { $dont_show_selections->[0] = !$checkbox_show_autoselect->get_active; }, undef, '<CheckItem>' ], @@ -632,20 +632,20 @@ sub run_treeview_dialog { $use_regexp->[0] = $check_boxes{$regexp_search_string}->get_active; }, undef, '<CheckItem>' ], ), - [ N("/_View"), undef, undef, undef, '<Branch>' ], + [ N("_View"), undef, undef, undef, '<Branch>' ], (map { state ($idx, $previous); - my $type = $idx ? join('/', N("/_View"), $previous) : '<RadioItem>'; + my $type = $idx ? join('/', N("_View"), $previous) : '<RadioItem>'; $type =~ s/_//g; # gtk+ retrieve widgets by their path w/o any shortcut marks $previous = $modes{$_}; $idx++; my $val = $_; - [ N("/_View") . '/' . $modes{$_}, undef, sub { $view_callback->($val) }, 0, $type ]; + [ N("_View") . '/' . $modes{$_}, undef, sub { $view_callback->($val) }, 0, $type ]; } qw(flat by_group by_leaves by_presence by_selection by_size by_source)), - [ N("/_Help"), undef, undef, undef, '<Branch>' ], - [ N("/_Help") . N("/_Report Bug"), undef, sub { run_drakbug('rpmdrake') }, undef, '<Item>' ], - [ N("/_Help") . N("/_Help"), undef, sub { rpmdrake::open_help('') }, undef, '<Item>' ], - [ N("/_Help") . N("/_About..."), undef, \&show_about_dlg, undef, '<Item>' + [ N("_Help"), undef, undef, undef, '<Branch>' ], + [ N("_Help") . N("_Report Bug"), undef, sub { run_drakbug('rpmdrake') }, undef, '<Item>' ], + [ N("_Help") . N("_Help"), undef, sub { rpmdrake::open_help('') }, undef, '<Item>' ], + [ N("_Help") . N("_About..."), undef, \&show_about_dlg, undef, '<Item>' ] ); @@ -653,7 +653,7 @@ sub run_treeview_dialog { # to retrieve a path, one must prevent "accelerators completion": my $get_path = sub { return join('', map { my $i = $_; $i =~ s/_//g; $i } @_) }; - if (my $widget = $factory->get_item('<main>' . $get_path->(N("/_View") . '/' . $modes{$mode->[0]}))) { + if (my $widget = $factory->get_item('<main>' . $get_path->(N("_View") . '/' . $modes{$mode->[0]}))) { $widget->set_active(1); } else { warn "Impossible to set $mode->[0] view as default\n"; @@ -675,7 +675,7 @@ sub run_treeview_dialog { $check_boxes{$clean_cache_string}->set_active($clean_cache->[0]); } - $checkbox_show_autoselect = $factory->get_widget("<main>" . strip_first_underscore(N("/_Options"), N("/_Show automatically selected packages"))) + $checkbox_show_autoselect = $factory->get_widget("<main>" . strip_first_underscore(N("_Options"), N("_Show automatically selected packages"))) and $checkbox_show_autoselect->set_active(!$dont_show_selections->[0]); my $accel = Gtk3::AccelGroup->new; |