Hello community, here is the log from the commit of package kfourinline for openSUSE:Factory checked in at 2016-01-28 17:21:13 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kfourinline (Old) and /work/SRC/openSUSE:Factory/.kfourinline.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kfourinline" Changes: -------- --- /work/SRC/openSUSE:Factory/kfourinline/kfourinline.changes 2016-01-10 13:05:14.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.kfourinline.new/kfourinline.changes 2016-01-28 17:21:14.000000000 +0100 @@ -1,0 +2,9 @@ +Sat Jan 9 18:19:09 UTC 2016 - tittiatc...@gmail.com + +- Update to KDE Applications 15.12.1 + * KDE Applications 15.12.1 + * https://www.kde.org/announcements/announce-applications-15.12.1.php + * boo#961265 + + +------------------------------------------------------------------- Old: ---- kfourinline-15.12.0.tar.xz New: ---- kfourinline-15.12.1.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kfourinline.spec ++++++ --- /var/tmp/diff_new_pack.XhaaSX/_old 2016-01-28 17:21:15.000000000 +0100 +++ /var/tmp/diff_new_pack.XhaaSX/_new 2016-01-28 17:21:15.000000000 +0100 @@ -45,7 +45,7 @@ License: LGPL-2.0+ Group: Amusements/Toys/Other Url: http://www.kde.org -Version: 15.12.0 +Version: 15.12.1 Release: 0 Source0: kfourinline-%{version}.tar.xz Obsoletes: %{name}5 < %{version} ++++++ kfourinline-15.12.0.tar.xz -> kfourinline-15.12.1.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kfourinline-15.12.0/src/kwin4.cpp new/kfourinline-15.12.1/src/kwin4.cpp --- old/kfourinline-15.12.0/src/kwin4.cpp 2015-11-11 10:43:54.000000000 +0100 +++ new/kfourinline-15.12.1/src/kwin4.cpp 2015-12-22 20:30:42.000000000 +0100 @@ -75,7 +75,7 @@ // Construct the main application window KWin4App::KWin4App(QWidget *parent) - : KXmlGuiWindow(parent), mView(0), mDoc(0), mMyChatDlg(0) + : KXmlGuiWindow(parent), mView(0), mDoc(0), mMyChatDlg(0), mStatusMsg(nullptr), mStatusMover(nullptr) { // default names for players (void)I18N_NOOP2("default name of first player", "Player 1"); @@ -381,13 +381,11 @@ // Create the status bar with the message part, the player part. void KWin4App::initStatusBar() { - //QT5 statusBar()->insertItem(i18n("Ready"), ID_STATUS_MSG,1); - //QT5 statusBar()->insertPermanentItem(i18n("This leaves space for the mover"),ID_STATUS_MOVER,0); - //QT5 statusBar()->setItemAlignment(ID_STATUS_MOVER, Qt::AlignLeft | Qt::AlignVCenter); - //QT5 statusBar()->setItemAlignment(ID_STATUS_MSG, Qt::AlignLeft | Qt::AlignVCenter); + mStatusMsg = new QLabel(); + mStatusMover = new QLabel(); + statusBar()->addWidget(mStatusMsg); + statusBar()->addPermanentWidget(mStatusMover); - - displayStatusbarMover(QLatin1String("")); displayStatusMessage(i18n("Welcome to Four Wins")); } @@ -665,8 +663,7 @@ // Set the given text into the statusbar change status message permanently void KWin4App::displayStatusMessage(const QString &text) { - //QT5 statusBar()->clearMessage(); - //QT5 statusBar()->changeItem(text, ID_STATUS_MSG); + mStatusMsg->setText(text); } @@ -674,8 +671,7 @@ // the player currently moving change status mover permanently void KWin4App::displayStatusbarMover(const QString& text) { - //QT5 statusBar()->clearMessage(); - //QT5 statusBar()->changeItem(text, ID_STATUS_MOVER); + mStatusMover->setText(text); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kfourinline-15.12.0/src/kwin4.h new/kfourinline-15.12.1/src/kwin4.h --- old/kfourinline-15.12.0/src/kwin4.h 2015-11-11 10:43:54.000000000 +0100 +++ new/kfourinline-15.12.1/src/kwin4.h 2015-12-22 20:30:42.000000000 +0100 @@ -31,6 +31,8 @@ #include "kwin4global.h" #include "thememanager.h" +#include <QLabel> + class KWin4Doc; class KWin4View; class KButtonGroup; @@ -276,6 +278,9 @@ // The chat dialog ChatDlg *mMyChatDlg; + // Status bar texts. + QLabel *mStatusMsg; + QLabel *mStatusMover; }; #endif // KWIN4_H diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kfourinline-15.12.0/src/main.cpp new/kfourinline-15.12.1/src/main.cpp --- old/kfourinline-15.12.0/src/main.cpp 2015-11-11 10:43:54.000000000 +0100 +++ new/kfourinline-15.12.1/src/main.cpp 2015-12-22 20:30:42.000000000 +0100 @@ -47,7 +47,7 @@ #include <Kdelibs4ConfigMigrator> #include "kwin4.h" -#define KWIN4_VERSION "v1.40" +#define KWIN4_VERSION "v1.41" // Debug level for the program
