commit libyui-qt for openSUSE:Factory
Hello community, here is the log from the commit of package libyui-qt for openSUSE:Factory checked in at 2014-05-06 13:40:26 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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-13 13:13:25.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.libyui-qt.new/libyui-qt.changes 2014-05-06 13:40:29.000000000 +0200 @@ -1,0 +2,12 @@ +Thu Apr 17 07:13:17 UTC 2014 - jsrain@suse.cz + +- added title bar with product logo (bnc#868722) +- 2.46.7 + +------------------------------------------------------------------- +Mon Apr 14 15:11:09 CEST 2014 - tgoettlicher@suse.de + +- Improve styleability of dialog heading +- 2.46.6 + +------------------------------------------------------------------- Old: ---- libyui-qt-2.46.5.tar.bz2 New: ---- libyui-qt-2.46.7.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libyui-qt-doc.spec ++++++ --- /var/tmp/diff_new_pack.jtB6fG/_old 2014-05-06 13:40:30.000000000 +0200 +++ /var/tmp/diff_new_pack.jtB6fG/_new 2014-05-06 13:40:30.000000000 +0200 @@ -17,7 +17,7 @@ Name: libyui-qt-doc -Version: 2.46.5 +Version: 2.46.7 Release: 0 Source: libyui-qt-%{version}.tar.bz2 ++++++ libyui-qt.spec ++++++ --- /var/tmp/diff_new_pack.jtB6fG/_old 2014-05-06 13:40:30.000000000 +0200 +++ /var/tmp/diff_new_pack.jtB6fG/_new 2014-05-06 13:40:30.000000000 +0200 @@ -17,7 +17,7 @@ Name: libyui-qt -Version: 2.46.5 +Version: 2.46.7 Release: 0 Source: libyui-qt-%{version}.tar.bz2 @@ -26,7 +26,7 @@ BuildRequires: gcc-c++ BuildRequires: pkg-config -%define libyui_devel_version libyui-devel >= 3.0.4 +%define libyui_devel_version libyui-devel >= 3.1.2 BuildRequires: %{libyui_devel_version} BuildRequires: fontconfig-devel BuildRequires: pkgconfig(Qt5Core) ++++++ libyui-qt-2.46.5.tar.bz2 -> libyui-qt-2.46.7.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-qt-2.46.5/ChangeLog new/libyui-qt-2.46.7/ChangeLog --- old/libyui-qt-2.46.5/ChangeLog 2014-04-10 11:25:37.000000000 +0200 +++ new/libyui-qt-2.46.7/ChangeLog 2014-04-18 13:40:41.000000000 +0200 @@ -1,4 +1,16 @@ ------------------------------------------------------------------- +Thu Apr 17 07:13:17 UTC 2014 - jsrain@suse.cz + +- added title bar with product logo (bnc#868722) +- 2.46.7 + +------------------------------------------------------------------- +Mon Apr 14 15:11:09 CEST 2014 - tgoettlicher@suse.de + +- Improve styleability of dialog heading +- 2.46.6 + +------------------------------------------------------------------- Tue Apr 8 13:17:38 UTC 2014 - mvidner@suse.com - Enable wizard title on the left instead of on top (bnc#868859). diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-qt-2.46.5/VERSION.cmake new/libyui-qt-2.46.7/VERSION.cmake --- old/libyui-qt-2.46.5/VERSION.cmake 2014-04-10 11:25:37.000000000 +0200 +++ new/libyui-qt-2.46.7/VERSION.cmake 2014-04-18 13:40:41.000000000 +0200 @@ -1,6 +1,6 @@ SET(VERSION_MAJOR "2") SET(VERSION_MINOR "46") -SET(VERSION_PATCH "5") +SET(VERSION_PATCH "7") 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.5/libyui-qt.spec.in new/libyui-qt-2.46.7/libyui-qt.spec.in --- old/libyui-qt-2.46.5/libyui-qt.spec.in 2014-03-12 16:11:26.000000000 +0100 +++ new/libyui-qt-2.46.7/libyui-qt.spec.in 2014-04-18 13:40:41.000000000 +0200 @@ -26,7 +26,7 @@ BuildRequires: gcc-c++ BuildRequires: pkg-config -%define libyui_devel_version libyui-devel >= 3.0.4 +%define libyui_devel_version libyui-devel >= 3.1.2 BuildRequires: %{libyui_devel_version} BuildRequires: fontconfig-devel BuildRequires: pkgconfig(Qt5Core) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-qt-2.46.5/src/YQWizard.cc new/libyui-qt-2.46.7/src/YQWizard.cc --- old/libyui-qt-2.46.5/src/YQWizard.cc 2014-04-10 11:25:37.000000000 +0200 +++ new/libyui-qt-2.46.7/src/YQWizard.cc 2014-04-18 13:40:41.000000000 +0200 @@ -128,6 +128,7 @@ _clientArea = 0; _menuBar = 0; _dialogIcon = 0; + _dialogLogo = 0; _dialogHeading = 0; _contents = 0; _backButton = 0; @@ -682,13 +683,33 @@ QWidget *YQWizard::layoutWorkArea( QWidget * parent ) { _workArea = new QFrame( parent ); - _workArea->setObjectName( "work_area" ); - - QY2Styler::styler()->registerChildWidget( this, _workArea ); QVBoxLayout *vbox = new QVBoxLayout( _workArea ); YUI_CHECK_NEW( vbox ); + // add the logo on the top + if (YUI::application()->showProductLogo()) + { + QWidget * logoWidget = new QWidget; + logoWidget->setSizePolicy( QSizePolicy( QSizePolicy::Expanding, QSizePolicy::Fixed ) ); // hor/vert + logoWidget->setObjectName("LogoHBox"); + vbox->addWidget( logoWidget ); + + QHBoxLayout * logoHBox = new QHBoxLayout(logoWidget); + YUI_CHECK_NEW( logoHBox ); + + _dialogLogo = new QLabel( _workArea ); + YUI_CHECK_NEW( _dialogLogo ); + logoHBox->addWidget( _dialogLogo ); + _dialogLogo->setObjectName( "DialogLogo" ); + _dialogLogo->setAlignment( Qt::AlignLeft ); + QY2Styler::styler()->registerChildWidget( this, _dialogLogo ); + _dialogLogo->setSizePolicy( QSizePolicy( QSizePolicy::Fixed, QSizePolicy::Fixed ) ); // hor/vert + _dialogLogo->setMinimumHeight(59); // FIXME: control size via stylesheet, did not find how + _dialogLogo->setMinimumWidth(100); + logoHBox->addStretch(); + } + // // Menu bar // @@ -699,6 +720,13 @@ _menuBar->hide(); // will be made visible when menus are added vbox->addWidget( _menuBar ); + QWidget * dialog_inner_area = new QWidget (_workArea); + dialog_inner_area->setObjectName( "work_area" ); + + QY2Styler::styler()->registerChildWidget( this, dialog_inner_area ); + QVBoxLayout * inner_vbox = new QVBoxLayout(dialog_inner_area); + YUI_CHECK_NEW( inner_vbox ); + vbox->addWidget (dialog_inner_area); QVBoxLayout *innerbox = new QVBoxLayout( _workArea ); QVBoxLayout *leftInnerBox = innerbox; @@ -707,7 +735,7 @@ innerbox->setMargin ( YQWidgetMargin ); - vbox->addLayout(innerbox); + inner_vbox->addLayout(innerbox); vbox->setMargin( 0 ); @@ -744,11 +772,10 @@ _dialogHeading = new QLabel( _workArea ); YUI_CHECK_NEW( _dialogHeading ); headingHBox->addWidget( _dialogHeading ); - _dialogHeading->setAlignment( Qt::AlignLeft ); _dialogHeading->setWordWrap( true ); _dialogHeading->setTextFormat( Qt::PlainText ); _dialogHeading->setSizePolicy( QSizePolicy( QSizePolicy::Expanding, QSizePolicy::Minimum ) ); // hor/vert - _dialogHeading->setObjectName( "DialogHeading" ); + _dialogHeading->setObjectName( (titleIsOnTheLeft())? "DialogHeadingLeft" : "DialogHeadingTop" ) ; // // Client area (the part that belongs to the YCP application) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-qt-2.46.5/src/YQWizard.h new/libyui-qt-2.46.7/src/YQWizard.h --- old/libyui-qt-2.46.5/src/YQWizard.h 2014-04-10 11:25:38.000000000 +0200 +++ new/libyui-qt-2.46.7/src/YQWizard.h 2014-04-18 13:40:41.000000000 +0200 @@ -585,6 +585,7 @@ QWidget * _clientArea; QMenuBar * _menuBar; QLabel * _dialogIcon; + QLabel * _dialogLogo; QLabel * _dialogHeading; YQAlignment * _contents; YQWizardButton * _backButton; -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org
participants (1)
-
root＠hilbert.suse.de