Hello community, here is the log from the commit of package gwenview for openSUSE:Factory checked in at 2014-01-27 11:15:09 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/gwenview (Old) and /work/SRC/openSUSE:Factory/.gwenview.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "gwenview" Changes: -------- --- /work/SRC/openSUSE:Factory/gwenview/gwenview.changes 2013-12-19 13:16:05.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.gwenview.new/gwenview.changes 2014-01-27 11:15:11.000000000 +0100 @@ -1,0 +2,7 @@ +Sat Jan 11 15:36:40 UTC 2014 - [email protected] + +- Update to 4.12.1 + * KDE 4.12.1 release + * See http://www.kde.org/announcements/announce-4.12.1.php + +------------------------------------------------------------------- Old: ---- gwenview-4.12.0.tar.xz New: ---- gwenview-4.12.1.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gwenview.spec ++++++ --- /var/tmp/diff_new_pack.CEq74E/_old 2014-01-27 11:15:12.000000000 +0100 +++ /var/tmp/diff_new_pack.CEq74E/_new 2014-01-27 11:15:12.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package gwenview # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,7 +17,7 @@ Name: gwenview -Version: 4.12.0 +Version: 4.12.1 Release: 0 Summary: Simple Image Viewer for KDE License: GPL-2.0+ ++++++ gwenview-4.12.0.tar.xz -> gwenview-4.12.1.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gwenview-4.12.0/app/infocontextmanageritem.cpp new/gwenview-4.12.1/app/infocontextmanageritem.cpp --- old/gwenview-4.12.0/app/infocontextmanageritem.cpp 2013-12-10 16:02:30.000000000 +0100 +++ new/gwenview-4.12.1/app/infocontextmanageritem.cpp 2013-12-12 17:21:21.000000000 +0100 @@ -27,6 +27,7 @@ #include <QPainter> #include <QPointer> #include <QPushButton> +#include <QScrollArea> #include <QTextBrowser> #include <QToolTip> #include <QVBoxLayout> @@ -116,7 +117,7 @@ QLabel* valueLabel; }; public: - KeyValueWidget(QWidget* parent) + KeyValueWidget(QWidget* parent = 0) : QWidget(parent) { QSizePolicy policy(QSizePolicy::Preferred, QSizePolicy::Fixed); @@ -155,6 +156,16 @@ "%1:", key)); row->valueLabel->setText(value); mRows << row; + } + + static bool rowsLessThan(const Row* row1, const Row* row2) + { + return row1->keyLabel->text() < row2->keyLabel->text(); + } + + void finishAddRows() + { + qSort(mRows.begin(), mRows.end(), KeyValueWidget::rowsLessThan); updateGeometry(); } @@ -193,7 +204,7 @@ SideBarGroup* mGroup; // One selection fields - QWidget* mOneFileWidget; + QScrollArea* mOneFileWidget; KeyValueWidget* mKeyValueWidget; Document::Ptr mDocument; @@ -213,20 +224,25 @@ void setupGroup() { - mOneFileWidget = new QWidget(); + mOneFileWidget = new QScrollArea(); + mOneFileWidget->setFrameStyle(QFrame::NoFrame); + mOneFileWidget->setWidgetResizable(true); - mKeyValueWidget = new KeyValueWidget(mOneFileWidget); + mKeyValueWidget = new KeyValueWidget; QLabel* moreLabel = new QLabel(mOneFileWidget); moreLabel->setText(QString("<a href='#'>%1</a>").arg(i18nc("@action show more image meta info", "More..."))); moreLabel->setAlignment(Qt::AlignRight); - QVBoxLayout* layout = new QVBoxLayout(mOneFileWidget); + QWidget* content = new QWidget; + QVBoxLayout* layout = new QVBoxLayout(content); layout->setMargin(2); layout->setSpacing(2); layout->addWidget(mKeyValueWidget); layout->addWidget(moreLabel); + mOneFileWidget->setWidget(content); + mMultipleFilesLabel = new QLabel(); mGroup = new SideBarGroup(i18nc("@title:group", "Meta Information")); @@ -349,6 +365,7 @@ d->mKeyValueWidget->addRow(label, value); } } + d->mKeyValueWidget->finishAddRows(); d->mKeyValueWidget->layoutRows(); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gwenview-4.12.0/app/mainwindow.cpp new/gwenview-4.12.1/app/mainwindow.cpp --- old/gwenview-4.12.0/app/mainwindow.cpp 2013-12-10 16:02:30.000000000 +0100 +++ new/gwenview-4.12.1/app/mainwindow.cpp 2013-12-12 17:21:21.000000000 +0100 @@ -544,7 +544,6 @@ page->addWidget(semanticInfoItem->widget()); } #endif - page->addStretch(); mSideBar->addPage(page); page = new SideBarPage(i18n("Operations")); -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
