diff options
-rwxr-xr-x | userdrake | 44 |
1 files changed, 22 insertions, 22 deletions
@@ -91,22 +91,22 @@ my %options = ( my %buttorcheck; my ($menu, $factory) = create_factory_menu($::isEmbedded ? $::Plug : $us->{wnd}{rwindow}, ([ N("/_File"), undef, undef, undef, '<Branch>' ], - [ N("/_File") . N("/_Refresh"), undef, sub { Refresh($sysfilter, $stringsearch) }, undef, '<StockItem>', 'gtk-refresh' ], - [ N("/_File") . N("/_Quit"), N("<control>Q"), \&QuitGlobal, undef, '<StockItem>', 'gtk-quit' ], + [ N("/_File") . N("/_Refresh"), undef, sub { Refresh($sysfilter, $stringsearch) }, undef, '<Item>' ], + [ N("/_File") . N("/_Quit"), N("<control>Q"), \&QuitGlobal, undef, '<Item>' ], [ N("/_Actions"), undef, undef, undef, '<Branch>' ], - [ N("/_Actions") . N("/_Add User"), undef, \&AddUser, undef, '<StockItem>', 'gtk-add' ], - [ N("/_Actions") . N("/Add _Group"), undef, \&AddGroup, undef, '<StockItem>', 'gtk-add' ], - [ join('', @{$options{edit}}), undef, \&Edit, undef, '<StockItem>', 'gtk-properties' ], - [ join('', @{$options{delete}}), undef, \&Delete, undef, '<StockItem>', 'gtk-delete' ], + [ N("/_Actions") . N("/_Add User"), undef, \&AddUser, undef, '<Item>' ], + [ N("/_Actions") . N("/Add _Group"), undef, \&AddGroup, undef, '<Item>' ], + [ join('', @{$options{edit}}), undef, \&Edit, undef, '<Item>' ], + [ join('', @{$options{delete}}), undef, \&Delete, undef, '<Item>' ], [ N("/_Options"), undef, undef, undef, '<Branch>' ], [ join('', @{$options{filter}}), undef, sub { $sysfilter = $buttorcheck{filter}->get_active; Refresh($sysfilter, $stringsearch) }, undef, '<CheckItem>' ], [ N("/_Help"), undef, undef, undef, '<Branch>' ], - [ N("/_Help").N("/_Help"), undef, sub { HelpSystem() }, undef, '<StockItem>', 'gtk-help' ], - [ N("/_Help").N("/_Report Bug"), undef, sub { system("$ENV{BROWSER} https://qa.mandrakesoft.com &") }, undef, '<StockItem>', 'gtk-stop' ], - [ N("/_Help").N("/_About..."), undef, \&About, undef, '<StockItem>', 'gtk-preferences' ] + [ N("/_Help").N("/_Help"), undef, sub { HelpSystem() }, undef, '<Item>' ], + [ N("/_Help").N("/_Report Bug"), undef, sub { system("$ENV{BROWSER} https://qa.mandrakesoft.com &") }, undef, '<Item>' ], + [ N("/_Help").N("/_About..."), undef, \&About, undef, '<Item>' ] ) ); %buttorcheck = map { @@ -310,7 +310,7 @@ sub AddUser { 0, gtkpack(Gtk2::HBox->new(1, 20), map { my $r = $_->[1]; - gtksignal_connect(Gtk2::Button->new_from_stock($_->[0]), clicked => sub { + gtksignal_connect(Gtk2::Button->new($_->[0]), clicked => sub { if (!$r) { $u{username} = $us->{o}{login}->get_text; $error = 0; $u{gecos} = $us->{o}{fullname}->get_text; @@ -372,7 +372,7 @@ sub AddUser { } } !$error and $w->destroy; $error = 0 }) - } ([ 'gtk-cancel', 1 ], [ 'gtk-ok', 0 ])), + } ([ N("Cancel"), 1 ], [ N("Ok"), 0 ])), ) ); foreach (qw(privategroup createhomedir)) { $us->{o}{$_}->set_active(1) }; @@ -406,12 +406,12 @@ sub ChooseGroup() { gtkpack(Gtk2::VBox->new(0,0), @radio), Gtk2::HSeparator->new, gtkpack(create_hbox(), - gtksignal_connect(Gtk2::Button->new_from_stock('gtk-ok'), clicked => sub { + gtksignal_connect(Gtk2::Button->new(N("Ok")), clicked => sub { each_index { $_->get_active and $choice = $::i } @radio; $w->destroy; Gtk2->main_quit; }), - gtksignal_connect(Gtk2::Button->new_from_stock('gtk-cancel'), clicked => sub { $error = 1; $w->destroy; Gtk2->main_quit; })))); + gtksignal_connect(Gtk2::Button->new(N("Cancel")), clicked => sub { $error = 1; $w->destroy; Gtk2->main_quit; })))); $w->show_all; Gtk2->main; $choice; @@ -435,7 +435,7 @@ sub AddGroup { 0, gtkpack(Gtk2::HBox->new(1, 20), map { my $r = $_->[1]; - gtksignal_connect(Gtk2::Button->new_from_stock($_->[0]), clicked => sub { + gtksignal_connect(Gtk2::Button->new($_->[0]), clicked => sub { if (!$r) { $g{groupname} = $us->{o}{groupname}->get_text; $error = 0; if (!valid_groupname($g{groupname})) { RaiseError($us->{error}) }; @@ -455,7 +455,7 @@ sub AddGroup { } } !$error and $w->destroy; $error = 0 }) - } ([ 'gtk-cancel', 1 ], [ 'gtk-ok', 0 ])), + } ([ N("Cancel"), 1 ], [ N("Ok"), 0 ])), ) ); $us->{o}{gid} = Gtk2::SpinButton->new(Gtk2::Adjustment->new(500, 1, 65000, 1, 10, 10), 1, 0); @@ -515,7 +515,7 @@ sub Delete { 0, gtkpack(Gtk2::HBox->new(1, 20), map { my $r = $_->[1]; - gtksignal_connect(Gtk2::Button->new_from_stock($_->[0]), clicked => sub { + gtksignal_connect(Gtk2::Button->new($_->[0]), clicked => sub { if (!$r) { log::explanations(N("Removing user: %s", $username)); $ctx->UserDel($userEnt); @@ -534,7 +534,7 @@ sub Delete { Refresh($sysfilter, $stringsearch) } !$error and $w->destroy; $error = 0 }) - } ([ 'gtk-cancel', 1 ], [ 'gtk-delete', 0 ])), + } ([ N("Cancel"), 1 ], [ N("Delete"), 0 ])), ) ); $w->show_all; @@ -549,7 +549,7 @@ sub Delete { 0, gtkpack(Gtk2::HBox->new(1, 20), map { my $r = $_->[1]; - gtksignal_connect(Gtk2::Button->new_from_stock($_->[0]), clicked => sub { + gtksignal_connect(Gtk2::Button->new($_->[0]), clicked => sub { if (!$r) { my $groupEnt = $ctx->LookupGroupByName($groupname); my $members = $ctx->EnumerateUsersByGroup($groupname); @@ -565,7 +565,7 @@ sub Delete { $ctx->GroupDel($groupEnt); Refresh($sysfilter, $stringsearch) } } !$error and $wg->destroy; $error = 0 }) - } ([ 'gtk-cancel', 1 ], [ 'gtk-delete', 0 ])), + } ([ N("Cancel"), 1 ], [ N("Delete"), 0 ])), ) ); $wg->show_all; @@ -787,7 +787,7 @@ sub Edit { 0, gtkpack(Gtk2::HBox->new(1, 20), map { my $retv = $_->[1]; - gtksignal_connect(Gtk2::Button->new_from_stock($_->[0]), clicked => sub { + gtksignal_connect(Gtk2::Button->new($_->[0]), clicked => sub { if (!$retv) { if ($p <= 0) { $error = 0; @@ -902,7 +902,7 @@ sub Edit { } } !$error and $w->destroy; $error = 0 }) - } ([ 'gtk-cancel', 1 ], [ 'gtk-ok', 0 ])), + } ([ N("Cancel"), 1 ], [ N("Ok"), 0 ])), )); $tree->show; $w->show_all; @@ -1038,7 +1038,7 @@ sub RaiseError { gtkpack_(Gtk2::VBox->new, 1, Gtk2::Label->new($_[0]), 0, Gtk2::HSeparator->new, - 0, gtksignal_connect(Gtk2::Button->new_from_stock('gtk-ok'), clicked => sub { $w->destroy }) + 0, gtksignal_connect(Gtk2::Button->new(N("Ok")), clicked => sub { $w->destroy }) ), ); $w->show_all |