Author: kmachalkova
Date: Wed Aug 8 10:25:26 2007
New Revision: 40079
URL: http://svn.opensuse.org/viewcvs/yast?rev=40079&view=rev
Log:
Added text referring to whereabouts of the license text to
license agreement popup (FaTE #302018)
Modified:
trunk/qt/VERSION
trunk/qt/package/yast2-qt.changes
trunk/qt/src/pkg/YQPkgTextDialog.cc
trunk/qt/src/pkg/YQPkgTextDialog.h
Modified: trunk/qt/VERSION
URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt/VERSION?rev=40079&r1=40078&r2=40079&view=diff
==============================================================================
--- trunk/qt/VERSION (original)
+++ trunk/qt/VERSION Wed Aug 8 10:25:26 2007
@@ -1 +1 @@
-2.15.9
+2.15.10
Modified: trunk/qt/package/yast2-qt.changes
URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt/package/yast2-qt.changes?rev=40079&r1=40078&r2=40079&view=diff
==============================================================================
--- trunk/qt/package/yast2-qt.changes (original)
+++ trunk/qt/package/yast2-qt.changes Wed Aug 8 10:25:26 2007
@@ -1,4 +1,11 @@
-------------------------------------------------------------------
+Wed Aug 8 09:27:30 CEST 2007 - kmachalkova@suse.cz
+
+- Added text referring to whereabouts of the license text to
+ license agreement popup (FaTE #302018)
+- V 2.15.10
+
+-------------------------------------------------------------------
Fri Aug 3 12:42:01 CEST 2007 - sh@suse.de
- Fixed bug #295485: Text cut off in MultiSelectionBox
Modified: trunk/qt/src/pkg/YQPkgTextDialog.cc
URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt/src/pkg/YQPkgTextDialog.cc?rev=40079&r1=40078&r2=40079&view=diff
==============================================================================
--- trunk/qt/src/pkg/YQPkgTextDialog.cc (original)
+++ trunk/qt/src/pkg/YQPkgTextDialog.cc Wed Aug 8 10:25:26 2007
@@ -52,10 +52,11 @@
YQPkgTextDialog::YQPkgTextDialog( const QString & text,
QWidget * parent,
const QString & acceptButtonLabel,
- const QString & rejectButtonLabel )
+ const QString & rejectButtonLabel,
+ const QString & printLicenseText )
: QDialog( parent )
{
- buildDialog( text, parent, acceptButtonLabel, rejectButtonLabel );
+ buildDialog( text, parent, acceptButtonLabel, rejectButtonLabel, printLicenseText );
}
@@ -68,7 +69,8 @@
void YQPkgTextDialog::buildDialog( const QString & text,
QWidget * parent,
const QString & acceptButtonLabel,
- const QString & rejectButtonLabel )
+ const QString & rejectButtonLabel,
+ const QString & printLicenseText )
{
// Enable dialog resizing even without window manager
setSizeGripEnabled( true );
@@ -92,6 +94,14 @@
_textBrowser->setTextFormat( Qt::RichText );
_textBrowser->installEventFilter( this );
+ if ( ! printLicenseText.isEmpty() )
+ {
+ QLabel * printLabel = new QLabel( printLicenseText, this);
+ CHECK_PTR( printLabel);
+ printLabel->setAlignment( AlignHCenter );
+ layout->addWidget( printLabel );
+// layout->addSpacing(8);
+ }
// Button box
@@ -210,12 +220,14 @@
bool YQPkgTextDialog::confirmText( QWidget * parent,
const QString & text,
const QString & acceptButtonLabel,
- const QString & rejectButtonLabel )
+ const QString & rejectButtonLabel,
+ const QString & printLicenseText )
{
YQPkgTextDialog * dia = new YQPkgTextDialog( text,
parent,
acceptButtonLabel,
- rejectButtonLabel );
+ rejectButtonLabel,
+ printLicenseText );
CHECK_PTR( dia );
bool confirmed = ( dia->exec() == QDialog::Accepted );
delete dia;
@@ -226,8 +238,9 @@
bool YQPkgTextDialog::confirmText( QWidget * parent, const QString & text )
{
+ const QString printText = _("If you would like to print this license, check the EULA.txt file on the first media");
// Translators: "Accept" here refers to licenses or similar
- return confirmText( parent, text, _( "&Accept" ), _( "&Cancel" ) );
+ return confirmText( parent, text, _( "&Accept" ), _( "&Cancel" ), printText );
}
Modified: trunk/qt/src/pkg/YQPkgTextDialog.h
URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt/src/pkg/YQPkgTextDialog.h?rev=40079&r1=40078&r2=40079&view=diff
==============================================================================
--- trunk/qt/src/pkg/YQPkgTextDialog.h (original)
+++ trunk/qt/src/pkg/YQPkgTextDialog.h Wed Aug 8 10:25:26 2007
@@ -23,8 +23,10 @@
#include "YQZypp.h"
#include