Hello community, here is the log from the commit of package libyui-qt for openSUSE:Factory checked in at 2014-04-13 13:13: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 2014-04-05 14:42:57.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.libyui-qt.new/libyui-qt.changes 2014-04-13 13:13:25.000000000 +0200 @@ -1,0 +2,6 @@ +Tue Apr 8 13:17:38 UTC 2014 - mvidner@suse.com + +- Enable wizard title on the left instead of on top (bnc#868859). +- 2.46.5 + +------------------------------------------------------------------- Old: ---- libyui-qt-2.46.4.tar.bz2 New: ---- libyui-qt-2.46.5.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libyui-qt-doc.spec ++++++ --- /var/tmp/diff_new_pack.z1W9IM/_old 2014-04-13 13:13:27.000000000 +0200 +++ /var/tmp/diff_new_pack.z1W9IM/_new 2014-04-13 13:13:27.000000000 +0200 @@ -17,7 +17,7 @@ Name: libyui-qt-doc -Version: 2.46.4 +Version: 2.46.5 Release: 0 Source: libyui-qt-%{version}.tar.bz2 ++++++ libyui-qt.spec ++++++ --- /var/tmp/diff_new_pack.z1W9IM/_old 2014-04-13 13:13:27.000000000 +0200 +++ /var/tmp/diff_new_pack.z1W9IM/_new 2014-04-13 13:13:27.000000000 +0200 @@ -17,7 +17,7 @@ Name: libyui-qt -Version: 2.46.4 +Version: 2.46.5 Release: 0 Source: libyui-qt-%{version}.tar.bz2 ++++++ libyui-qt-2.46.4.tar.bz2 -> libyui-qt-2.46.5.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-qt-2.46.4/ChangeLog new/libyui-qt-2.46.5/ChangeLog --- old/libyui-qt-2.46.4/ChangeLog 2014-03-31 14:39:50.000000000 +0200 +++ new/libyui-qt-2.46.5/ChangeLog 2014-04-10 11:25:37.000000000 +0200 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Tue Apr 8 13:17:38 UTC 2014 - mvidner@suse.com + +- Enable wizard title on the left instead of on top (bnc#868859). +- 2.46.5 + +------------------------------------------------------------------- Mon Mar 31 14:31:28 CEST 2014 - tgoettlicher@suse.de - Made BarGraph segment colors stylable (bnc#868268) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-qt-2.46.4/VERSION.cmake new/libyui-qt-2.46.5/VERSION.cmake --- old/libyui-qt-2.46.4/VERSION.cmake 2014-03-31 14:39:50.000000000 +0200 +++ new/libyui-qt-2.46.5/VERSION.cmake 2014-04-10 11:25:37.000000000 +0200 @@ -1,6 +1,6 @@ SET(VERSION_MAJOR "2") SET(VERSION_MINOR "46") -SET(VERSION_PATCH "4") +SET(VERSION_PATCH "5") 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.4/src/YQWizard.cc new/libyui-qt-2.46.5/src/YQWizard.cc --- old/libyui-qt-2.46.4/src/YQWizard.cc 2014-03-11 11:22:35.000000000 +0100 +++ new/libyui-qt-2.46.5/src/YQWizard.cc 2014-04-10 11:25:37.000000000 +0200 @@ -701,6 +701,8 @@ QVBoxLayout *innerbox = new QVBoxLayout( _workArea ); + QVBoxLayout *leftInnerBox = innerbox; + QVBoxLayout *rightInnerBox = innerbox; YUI_CHECK_NEW( innerbox ); innerbox->setMargin ( YQWidgetMargin ); @@ -713,10 +715,25 @@ // Dialog icon and heading // + if (titleIsOnTheLeft()) { + QHBoxLayout *bigHBox = new QHBoxLayout(); + innerbox->addLayout( bigHBox ); + + leftInnerBox = new QVBoxLayout(); + leftInnerBox->setObjectName( "LeftInnerBox" ); + bigHBox->addLayout( leftInnerBox ); + bigHBox->setStretchFactor( leftInnerBox, 1 ); + + rightInnerBox = new QVBoxLayout(); + rightInnerBox->setObjectName( "RightInnerBox" ); + bigHBox->addLayout( rightInnerBox ); + bigHBox->setStretchFactor( rightInnerBox, 2 ); + } + QHBoxLayout * headingHBox = new QHBoxLayout(); YUI_CHECK_NEW( headingHBox ); //headingHBox->setSizePolicy( QSizePolicy( QSizePolicy::Expanding, QSizePolicy::Minimum ) ); // hor/vert - innerbox->addLayout( headingHBox ); + leftInnerBox->addLayout( headingHBox ); _dialogIcon = new QLabel( _workArea ); YUI_CHECK_NEW( _dialogIcon ); @@ -733,22 +750,12 @@ _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, &pclass(_releaseNotesButton)::clicked, - this, &pclass(this)::showReleaseNotes ); - - _releaseNotesButton->hide(); // hidden until showReleaseNotesButton() is called - // // Client area (the part that belongs to the YCP application) // layoutClientArea( _workArea ); - innerbox->addWidget( _clientArea ); + rightInnerBox->addWidget( _clientArea ); // // Button box @@ -823,6 +830,21 @@ hbox->addWidget( _helpButton ); + hbox->addSpacing( 10 ); + + // + // "Release Notes" button + // + + // Help button - intentionally without keyboard shortcut + _releaseNotesButton = new QPushButton( _( "Release Notes" ), parent ); + YUI_CHECK_NEW( _releaseNotesButton ); + hbox->addWidget( _releaseNotesButton ); + connect( _releaseNotesButton, &pclass(_releaseNotesButton)::clicked, + this, &pclass(this)::showReleaseNotes ); + + _releaseNotesButton->hide(); // hidden until showReleaseNotesButton() is called + hbox->addStretch( 10 ); // @@ -868,6 +890,10 @@ return hbox; } +bool YQWizard::titleIsOnTheLeft() +{ + return wizardMode() == YWizardMode_TitleOnLeft; +} void YQWizard::destroyButtons() { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-qt-2.46.4/src/YQWizard.h new/libyui-qt-2.46.5/src/YQWizard.h --- old/libyui-qt-2.46.4/src/YQWizard.h 2014-02-21 15:05:58.000000000 +0100 +++ new/libyui-qt-2.46.5/src/YQWizard.h 2014-04-10 11:25:38.000000000 +0200 @@ -491,6 +491,7 @@ QWidget *layoutWorkArea ( QWidget * parent ); void layoutClientArea ( QWidget * parent ); QLayout *layoutButtonBox ( QWidget * parent ); + bool titleIsOnTheLeft(); /** * Destroy the button box's buttons -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org