aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAngelo Naselli <anaselli@linux.it>2015-02-17 16:45:55 +0100
committerAngelo Naselli <anaselli@linux.it>2015-02-17 16:45:55 +0100
commit06ef1ef0c0e76cc2d75ba41ba6ae8ef5eead2a1b (patch)
treea72bb385002899be656f23926e03f78ea5465d5a
parent9abc0b1ed91da75ccb2b718d2165ed7b874aaad1 (diff)
downloadmanatools-06ef1ef0c0e76cc2d75ba41ba6ae8ef5eead2a1b.tar
manatools-06ef1ef0c0e76cc2d75ba41ba6ae8ef5eead2a1b.tar.gz
manatools-06ef1ef0c0e76cc2d75ba41ba6ae8ef5eead2a1b.tar.bz2
manatools-06ef1ef0c0e76cc2d75ba41ba6ae8ef5eead2a1b.tar.xz
manatools-06ef1ef0c0e76cc2d75ba41ba6ae8ef5eead2a1b.zip
Added common shortcut to dialog push button (About, Cancel, Ok, Quit)
-rw-r--r--lib/AdminPanel/Rpmdragora/edit_urpm_sources.pm26
-rw-r--r--lib/AdminPanel/Rpmdragora/gui.pm4
-rw-r--r--lib/AdminPanel/Rpmdragora/pkg.pm2
3 files changed, 16 insertions, 16 deletions
diff --git a/lib/AdminPanel/Rpmdragora/edit_urpm_sources.pm b/lib/AdminPanel/Rpmdragora/edit_urpm_sources.pm
index 68856da9..741525b0 100644
--- a/lib/AdminPanel/Rpmdragora/edit_urpm_sources.pm
+++ b/lib/AdminPanel/Rpmdragora/edit_urpm_sources.pm
@@ -304,9 +304,9 @@ sub add_callback() {
# Last line buttons
$factory->createVSpacing($vbox, 0.5);
$hbox = $factory->createHBox($vbox);
- my $cancelButton = $factory->createPushButton($hbox, $loc->N("Cancel"));
+ my $cancelButton = $factory->createPushButton($hbox, $loc->N("&Cancel"));
$factory->createHSpacing($hbox, 3.0);
- my $okButton = $factory->createPushButton($hbox, $loc->N("Ok"));
+ my $okButton = $factory->createPushButton($hbox, $loc->N("&Ok"));
$cancelButton->setDefaultButton(1);
@@ -522,9 +522,9 @@ sub options_callback() {
### last line buttons
$factory->createVSpacing($vbox, 0.5);
$hbox = $factory->createHBox($vbox);
- my $cancelButton = $factory->createPushButton($hbox, $loc->N("Cancel"));
+ my $cancelButton = $factory->createPushButton($hbox, $loc->N("&Cancel"));
$factory->createHSpacing($hbox, 3.0);
- my $okButton = $factory->createPushButton($hbox, $loc->N("Ok"));
+ my $okButton = $factory->createPushButton($hbox, $loc->N("&Ok"));
$cancelButton->setDefaultButton(1);
@@ -764,11 +764,11 @@ sub edit_callback {
$factory->createVSpacing($vbox, 0.5);
$hbox = $factory->createHBox($vbox);
- my $cancelButton = $factory->createPushButton($hbox, $loc->N("Cancel"));
+ my $cancelButton = $factory->createPushButton($hbox, $loc->N("&Cancel"));
$factory->createHSpacing($hbox, 3.0);
- my $saveButton = $factory->createPushButton($hbox, $loc->N("Save changes"));
+ my $saveButton = $factory->createPushButton($hbox, $loc->N("&OK"));
$factory->createHSpacing($hbox, 3.0);
- my $proxyButton = $factory->createPushButton($hbox, $loc->N("Proxy..."));
+ my $proxyButton = $factory->createPushButton($hbox, $loc->N("&Proxy..."));
$cancelButton->setDefaultButton(1);
@@ -936,9 +936,9 @@ sub proxy_callback {
# dialog low level buttons
$factory->createVSpacing($vbox, 0.5);
$hbox = $factory->createHBox($vbox);
- my $okButton = $factory->createPushButton($hbox, $loc->N("Ok"));
+ my $okButton = $factory->createPushButton($hbox, $loc->N("&Ok"));
$factory->createHSpacing($hbox, 3.0);
- my $cancelButton = $factory->createPushButton($hbox, $loc->N("Cancel"));
+ my $cancelButton = $factory->createPushButton($hbox, $loc->N("&Cancel"));
$cancelButton->setDefaultButton(1);
@@ -1376,7 +1376,7 @@ sub keys_callback() {
$hbox = $factory->createHBox( $vbox );
### Close button
- my $closeButton = $factory->createPushButton($hbox, $loc->N("Ok") );
+ my $closeButton = $factory->createPushButton($hbox, $loc->N("&Quit") );
### dialog event loop
while(1) {
@@ -1581,7 +1581,7 @@ sub mainwindow() {
update => new yui::YMenuItem($loc->N("Update")),
add_media => new yui::YMenuItem($loc->N("Add a specific media mirror")),
custom => new yui::YMenuItem($loc->N("Add a custom medium")),
- quit => new yui::YMenuItem($loc->N("&Close")),
+ quit => new yui::YMenuItem($loc->N("&Quit")),
);
my @ordered_menu_lines = qw(update add_media custom quit);
@@ -1701,7 +1701,7 @@ sub mainwindow() {
$hbox = $factory->createHBox($align);
### Close button
- my $closeButton = $factory->createPushButton($hbox, $loc->N("Ok") );
+ my $closeButton = $factory->createPushButton($hbox, $loc->N("&Quit") );
### dialog event loop
while(1) {
@@ -1727,7 +1727,7 @@ sub mainwindow() {
$translators =~ s/\>/\&gt\;/g;
my $sh_gui = AdminPanel::Shared::GUI->new();
$sh_gui->AboutDialog({ name => "Rpmdragora",
- version => "TODO",
+ version => $VERSION,
credits => $loc->N("Copyright (C) %s Mageia community", '2013-2014'),
license => $loc->N("GPLv2"),
description => $loc->N("Rpmdragora is the Mageia package management tool."),
diff --git a/lib/AdminPanel/Rpmdragora/gui.pm b/lib/AdminPanel/Rpmdragora/gui.pm
index 682b223d..b244c95f 100644
--- a/lib/AdminPanel/Rpmdragora/gui.pm
+++ b/lib/AdminPanel/Rpmdragora/gui.pm
@@ -1277,8 +1277,8 @@ sub deps_msg {
$factory->createVSpacing($vbox, 1);
my $hbox = $factory->createHBox( $vbox );
my $align = $factory->createRight($hbox);
- my $cancelButton = $factory->createPushButton($align, $loc->N("Cancel"));
- my $okButton = $factory->createPushButton($hbox, $loc->N("Ok"));
+ my $cancelButton = $factory->createPushButton($align, $loc->N("&Cancel"));
+ my $okButton = $factory->createPushButton($hbox, $loc->N("&Ok"));
# adding packages to the list
my $itemColl = new yui::YItemCollection;
diff --git a/lib/AdminPanel/Rpmdragora/pkg.pm b/lib/AdminPanel/Rpmdragora/pkg.pm
index 1d26b668..36ee2593 100644
--- a/lib/AdminPanel/Rpmdragora/pkg.pm
+++ b/lib/AdminPanel/Rpmdragora/pkg.pm
@@ -649,7 +649,7 @@ sub _display_READMEs_if_needed {
$factory->createVSpacing($vbox, 1);
my $hbox = $factory->createHBox( $vbox );
my $align = $factory->createHCenter($hbox);
- my $okButton = $factory->createPushButton($align, $loc->N("Ok"));
+ my $okButton = $factory->createPushButton($align, $loc->N("&Ok"));
$okButton->setDefaultButton(1);
# adding packages to the list