Skip to content

Commit

Permalink
Merge pull request #19 from jsrain/master
Browse files Browse the repository at this point in the history
added possibility to show release notes button in dialog heading
  • Loading branch information
tgoettlicher committed Oct 17, 2013
2 parents fda6ae4 + ec48461 commit a7daf1f
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 14 deletions.
6 changes: 6 additions & 0 deletions ChangeLog
@@ -1,3 +1,9 @@
-------------------------------------------------------------------
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

Expand Down
23 changes: 9 additions & 14 deletions src/YQWizard.cc
Expand Up @@ -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
}

Expand Down Expand Up @@ -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)
Expand Down Expand Up @@ -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;
Expand Down

0 comments on commit a7daf1f

Please sign in to comment.