From 39ce94926e9b8aa04f22ccce04687df64fe608a3 Mon Sep 17 00:00:00 2001 From: Jiri Srain Date: Wed, 16 Oct 2013 11:24:29 +0200 Subject: [PATCH 1/2] added possibility to show release notes button in dialog heading --- ChangeLog | 5 +++++ src/YQWizard.cc | 23 +++++++++-------------- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/ChangeLog b/ChangeLog index 9f65d691..ffe79b5a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Oct 16 09:23:40 UTC 2013 - jsrain@suse.cz + +- added possibility to show release notes button in dialog heading + ------------------------------------------------------------------- Tue Aug 6 14:46:19 CEST 2013 - tgoettlicher@suse.de diff --git a/src/YQWizard.cc b/src/YQWizard.cc index 2f63e28d..08bf3d83 100644 --- a/src/YQWizard.cc +++ b/src/YQWizard.cc @@ -275,18 +275,6 @@ void YQWizard::layoutStepsPanel() QY2Styler::styler()->registerChildWidget( this, _stepsPanel ); _stepsPanel->setProperty( "class", "steps QFrame" ); - // Steps panel bottom buttons ("Help", "Release Notes") - - // Layouts for the buttons - - _releaseNotesButton = new QPushButton( _( "Release Notes..." ), _stepsPanel ); - _releaseNotesButton->setSizePolicy( QSizePolicy( QSizePolicy::Preferred, QSizePolicy::Minimum ) ); // hor/vert - - connect( _releaseNotesButton, SIGNAL( clicked() ), - this, SLOT ( releaseNotesClicked() ) ); - - _releaseNotesButton->hide(); // hidden until showReleaseNotesButton() is called - _stepsDirty = true; // no layout yet } @@ -746,6 +734,15 @@ QWidget *YQWizard::layoutWorkArea( QWidget * parent ) _dialogHeading->setSizePolicy( QSizePolicy( QSizePolicy::Expanding, QSizePolicy::Minimum ) ); // hor/vert _dialogHeading->setObjectName( "DialogHeading" ); + _releaseNotesButton = new QPushButton( _( "Release Notes..." ), _workArea ); + YUI_CHECK_NEW( _workArea ); + headingHBox->addWidget( _releaseNotesButton ); + _releaseNotesButton->setSizePolicy( QSizePolicy( QSizePolicy::Preferred, QSizePolicy::Minimum ) ); // hor/vert + + connect( _releaseNotesButton, SIGNAL( clicked() ), + this, SLOT ( releaseNotesClicked() ) ); + + _releaseNotesButton->hide(); // hidden until showReleaseNotesButton() is called // // Client area (the part that belongs to the YCP application) @@ -1227,8 +1224,6 @@ void YQWizard::setButtonLabel( YPushButton * button, const std::string & newLabe void YQWizard::showReleaseNotesButton( const std::string & label, const std::string & id ) { - return; // no longer supported! - if ( ! _releaseNotesButton ) { yuiError() << "NULL Release Notes button" << std::endl; From ec48461be580506dcb9e0763487a4882fddafcd1 Mon Sep 17 00:00:00 2001 From: Jiri Srain Date: Wed, 16 Oct 2013 11:32:14 +0200 Subject: [PATCH 2/2] added fate# --- ChangeLog | 1 + 1 file changed, 1 insertion(+) diff --git a/ChangeLog b/ChangeLog index ffe79b5a..0872a1eb 100644 --- a/ChangeLog +++ b/ChangeLog @@ -2,6 +2,7 @@ Wed Oct 16 09:23:40 UTC 2013 - jsrain@suse.cz - added possibility to show release notes button in dialog heading + (fate#314695) ------------------------------------------------------------------- Tue Aug 6 14:46:19 CEST 2013 - tgoettlicher@suse.de