aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAngelo Naselli <anaselli@linux.it>2013-11-23 13:14:38 +0100
committerAngelo Naselli <anaselli@linux.it>2013-11-23 13:14:38 +0100
commit3ef5f72e383689e2908428af36e4d7e02c1ace30 (patch)
tree099f1c654cccaed4205b17e71522cdf0e8e977d7
parent719c6fda759bfbc491a03ed40c5713d483c72dc1 (diff)
downloadmanatools-3ef5f72e383689e2908428af36e4d7e02c1ace30.tar
manatools-3ef5f72e383689e2908428af36e4d7e02c1ace30.tar.gz
manatools-3ef5f72e383689e2908428af36e4d7e02c1ace30.tar.bz2
manatools-3ef5f72e383689e2908428af36e4d7e02c1ace30.tar.xz
manatools-3ef5f72e383689e2908428af36e4d7e02c1ace30.zip
Fixed text layout
-rw-r--r--AdminPanel/Shared.pm12
-rwxr-xr-xmodules/rpmdragora/rpmdragora5
2 files changed, 8 insertions, 9 deletions
diff --git a/AdminPanel/Shared.pm b/AdminPanel/Shared.pm
index 77f1d1b1..8027d2a8 100644
--- a/AdminPanel/Shared.pm
+++ b/AdminPanel/Shared.pm
@@ -155,8 +155,8 @@ sub AboutDialog {
my $factory = yui::YUI::widgetFactory;
my $optional = yui::YUI::optionalWidgetFactory;
- my $licensedlg = $factory->createPopupDialog();
- my $layout = $factory->createVBox($licensedlg);
+ my $creditsdlg = $factory->createPopupDialog();
+ my $layout = $factory->createVBox($creditsdlg);
# header
$factory->createHBox($layout);
@@ -192,7 +192,7 @@ sub AboutDialog {
my $vbox = $factory->createVBox($dumptab);
$align = $factory->createLeft($vbox);
$factory->createVSpacing($vbox, 1.0);
- my $label = $factory->createRichText( $align, "***", 1);
+ my $label = $factory->createLabel( $align, "***", 0);
$factory->createVSpacing($vbox, 1.0);
# start value for first Item
@@ -204,7 +204,7 @@ sub AboutDialog {
# manage Credits dialog events
while(1) {
- my $event = $licensedlg->waitForEvent();
+ my $event = $creditsdlg->waitForEvent();
my $eventType = $event->eventType();
#event type checking
@@ -241,7 +241,7 @@ sub AboutDialog {
else {
print "No tab widgets available!\n";
}
- destroy $licensedlg;
+ destroy $creditsdlg;
}
# License dialog
@@ -262,7 +262,7 @@ sub AboutDialog {
# license
$hbox = $factory->createHBox($layout);
$align = $factory->createAlignment($hbox, 3, 0);
- $factory->createRichText( $align, $license, 1);
+ $factory->createLabel( $align, $license);
$align = $factory->createRight($layout);
my $closeButton = $factory->createPushButton($align, N("Close"));
diff --git a/modules/rpmdragora/rpmdragora b/modules/rpmdragora/rpmdragora
index 6585d72f..ae8bcff6 100755
--- a/modules/rpmdragora/rpmdragora
+++ b/modules/rpmdragora/rpmdragora
@@ -1087,8 +1087,7 @@ sub run_treeview_dialog {
last;
}
elsif ($itemLabel eq N("About")) {
- my $license = formatAlaTeX(translate($::license));
- $license =~ s/\n/\n\n/sg; # nicer formatting
+ my $license = translate($::license);
AboutDialog({ name => N("Rpmdragora"),
version => $Rpmdragora::init::version,
copyright => N("Copyright (C) %s by Mandriva", '2002-2009'),
@@ -1096,7 +1095,7 @@ sub run_treeview_dialog {
comments => N("Rpmdragora is the Mageia package management tool."),
website => 'http://www.mageia.org',
website_label => N("Mageia"),
- authors => 'Thierry Vignaud <vignaud@mandriva.com>\nAngelo Naselli <anaselli@linux.it>\nMatteo Pasotti <matteo.pasotti@gmail.com>',
+ authors => "Thierry Vignaud <vignaud\@mandriva.com>\nAngelo Naselli <anaselli\@linux.it>\nMatteo Pasotti <matteo.pasotti\@gmail.com>",
artists => 'Hélène Durosini <ln@mandriva.com>',
translator_credits =>
#-PO: put here name(s) and email(s) of translator(s) (eg: "John Smith <jsmith@nowhere.com>")