Hello community, here is the log from the commit of package libyui-qt for openSUSE:Factory checked in at 2015-02-12 10:21:19 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libyui-qt (Old) and /work/SRC/openSUSE:Factory/.libyui-qt.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "libyui-qt" Changes: -------- --- /work/SRC/openSUSE:Factory/libyui-qt/libyui-qt.changes 2015-02-10 10:46:13.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.libyui-qt.new/libyui-qt.changes 2015-02-12 10:21:22.000000000 +0100 @@ -1,0 +2,14 @@ +Tue Feb 10 11:54:04 UTC 2015 - jsrain@suse.cz + +- fix layout of Help and Release Notes buttons (bsc#916814) + (credits to tgoettlicher) +- 2.46.17 + +------------------------------------------------------------------- +Tue Feb 3 12:38:23 UTC 2015 - jsrain@suse.cz + +- include Help and Release notes buttons in keyboard shortcut + resolution (bsc#880983) +- 2.46.16 + +------------------------------------------------------------------- Old: ---- libyui-qt-2.46.15.tar.bz2 New: ---- libyui-qt-2.46.17.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libyui-qt-doc.spec ++++++ --- /var/tmp/diff_new_pack.GNPe2G/_old 2015-02-12 10:21:22.000000000 +0100 +++ /var/tmp/diff_new_pack.GNPe2G/_new 2015-02-12 10:21:22.000000000 +0100 @@ -17,7 +17,7 @@ Name: libyui-qt-doc -Version: 2.46.15 +Version: 2.46.17 Release: 0 Source: libyui-qt-%{version}.tar.bz2 ++++++ libyui-qt.spec ++++++ --- /var/tmp/diff_new_pack.GNPe2G/_old 2015-02-12 10:21:22.000000000 +0100 +++ /var/tmp/diff_new_pack.GNPe2G/_new 2015-02-12 10:21:22.000000000 +0100 @@ -17,7 +17,7 @@ Name: libyui-qt -Version: 2.46.15 +Version: 2.46.17 Release: 0 Source: libyui-qt-%{version}.tar.bz2 ++++++ libyui-qt-2.46.15.tar.bz2 -> libyui-qt-2.46.17.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-qt-2.46.15/ChangeLog new/libyui-qt-2.46.17/ChangeLog --- old/libyui-qt-2.46.15/ChangeLog 2015-01-30 14:34:12.000000000 +0100 +++ new/libyui-qt-2.46.17/ChangeLog 2015-02-10 14:59:11.000000000 +0100 @@ -1,4 +1,18 @@ ------------------------------------------------------------------- +Tue Feb 10 11:54:04 UTC 2015 - jsrain@suse.cz + +- fix layout of Help and Release Notes buttons (bsc#916814) + (credits to tgoettlicher) +- 2.46.17 + +------------------------------------------------------------------- +Tue Feb 3 12:38:23 UTC 2015 - jsrain@suse.cz + +- include Help and Release notes buttons in keyboard shortcut + resolution (bsc#880983) +- 2.46.16 + +------------------------------------------------------------------- Fri Jan 30 13:52:57 UTC 2015 - jsrain@suse.cz - added keyboard shortcuts to Help and Release Notes buttons diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-qt-2.46.15/VERSION.cmake new/libyui-qt-2.46.17/VERSION.cmake --- old/libyui-qt-2.46.15/VERSION.cmake 2015-01-30 14:34:12.000000000 +0100 +++ new/libyui-qt-2.46.17/VERSION.cmake 2015-02-10 14:59:11.000000000 +0100 @@ -1,6 +1,6 @@ SET(VERSION_MAJOR "2") SET(VERSION_MINOR "46") -SET(VERSION_PATCH "15") +SET(VERSION_PATCH "17") SET( VERSION "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}${GIT_SHA1_VERSION}" ) ##### This is need for the libyui core, ONLY. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-qt-2.46.15/src/YQGenericButton.cc new/libyui-qt-2.46.17/src/YQGenericButton.cc --- old/libyui-qt-2.46.15/src/YQGenericButton.cc 2014-02-21 15:05:58.000000000 +0100 +++ new/libyui-qt-2.46.17/src/YQGenericButton.cc 2015-02-04 12:49:12.000000000 +0100 @@ -233,5 +233,9 @@ return true; } +void YQGenericButton::setShortcut ( const QKeySequence & key ) +{ + _qPushButton->setShortcut (key ); +} #include "YQGenericButton.moc" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-qt-2.46.15/src/YQGenericButton.h new/libyui-qt-2.46.17/src/YQGenericButton.h --- old/libyui-qt-2.46.15/src/YQGenericButton.h 2014-02-21 15:05:58.000000000 +0100 +++ new/libyui-qt-2.46.17/src/YQGenericButton.h 2015-02-04 12:49:12.000000000 +0100 @@ -128,6 +128,10 @@ **/ YQDialog * yQDialog() const { return _dialog; } + /** + * Set the keyboard shortcut (e.g. F1 for help) + */ + void setShortcut ( const QKeySequence & key ); public slots: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-qt-2.46.15/src/YQWizard.cc new/libyui-qt-2.46.17/src/YQWizard.cc --- old/libyui-qt-2.46.15/src/YQWizard.cc 2015-01-30 14:34:12.000000000 +0100 +++ new/libyui-qt-2.46.17/src/YQWizard.cc 2015-02-10 14:59:11.000000000 +0100 @@ -419,7 +419,7 @@ _stepsVBox->addStretch( 99 ); QVBoxLayout *rbl = new QVBoxLayout(); - rbl->addWidget( _releaseNotesButton, 0, Qt::AlignCenter ); + rbl->addWidget( (QWidget *) _releaseNotesButton->widgetRep(), 0, Qt::AlignCenter ); _stepsVBox->addLayout( rbl ); _stepsVBox->addStretch( 29 ); @@ -854,14 +854,14 @@ // Help button // QT handles duplicate shortcuts, it can be kept (bnc#880983) - _helpButton = new QPushButton( _( "&Help" ), parent ); + _helpButton = new YQWizardButton( this, parent, _( "&Help" ).toStdString()); YUI_CHECK_NEW( _helpButton ); _helpButton->setShortcut( Qt::Key_F1 ); connect( _helpButton, &pclass(_helpButton)::clicked, this, &pclass(this)::showHelp ); - hbox->addWidget( _helpButton ); + hbox->addWidget( (QWidget *) _helpButton->widgetRep() ); hbox->addSpacing( 10 ); @@ -871,9 +871,9 @@ // Release Notes button // QT handles duplicate shortcuts, it can be kept (bnc#880983) - _releaseNotesButton = new QPushButton( _( "&Release Notes" ), parent ); + _releaseNotesButton = new YQWizardButton( this, parent, _( "&Release Notes" ).toStdString ()); YUI_CHECK_NEW( _releaseNotesButton ); - hbox->addWidget( _releaseNotesButton ); + hbox->addWidget( (QWidget *) _releaseNotesButton->widgetRep() ); connect( _releaseNotesButton, &pclass(_releaseNotesButton)::clicked, this, &pclass(this)::showReleaseNotes ); @@ -1311,7 +1311,7 @@ } // QT handles duplicate shortcuts, it can be kept - _releaseNotesButton->setText( fromUTF8( label ) ); + _releaseNotesButton->setLabel( fromUTF8( label ) ); _releaseNotesButtonId = id; _releaseNotesButtonLabel = label; @@ -1337,7 +1337,7 @@ if ( _helpButton ) // "Help" button // QT handles duplicate shortcuts, it can be kept (bnc#880983) - _helpButton->setText( _( "&Help" ) ); + _helpButton->setLabel( _( "&Help" ) ); if ( _stepsButton ) // "Steps" button @@ -1352,7 +1352,7 @@ if ( _releaseNotesButton ) // "Release Notes" button // QT handles duplicate shortcuts, it can be kept (bnc#880983) - _releaseNotesButton->setText( _( "&Release Notes" ) ); + _releaseNotesButton->setLabel( _( "&Release Notes" ) ); if ( _helpDlg ) _helpDlg->retranslate(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-qt-2.46.15/src/YQWizard.h new/libyui-qt-2.46.17/src/YQWizard.h --- old/libyui-qt-2.46.15/src/YQWizard.h 2015-01-30 14:34:12.000000000 +0100 +++ new/libyui-qt-2.46.17/src/YQWizard.h 2015-02-04 12:49:12.000000000 +0100 @@ -575,10 +575,10 @@ QStackedWidget * _sideBar; QWidget * _stepsPanel; - QPushButton * _releaseNotesButton; + YQWizardButton * _releaseNotesButton; static std::string _releaseNotesButtonId; static std::string _releaseNotesButtonLabel; - QPushButton * _helpButton; + YQWizardButton * _helpButton; QPushButton * _stepsButton; QPushButton * _treeButton; QFrame * _treePanel; -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org