Hello community, here is the log from the commit of package kjobwidgets for openSUSE:Factory checked in at 2014-04-02 17:22:12 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kjobwidgets (Old) and /work/SRC/openSUSE:Factory/.kjobwidgets.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kjobwidgets" Changes: -------- --- /work/SRC/openSUSE:Factory/kjobwidgets/kjobwidgets.changes 2014-03-10 12:17:46.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.kjobwidgets.new/kjobwidgets.changes 2014-04-02 17:22:24.000000000 +0200 @@ -1,0 +2,9 @@ +Sat Mar 29 19:47:44 UTC 2014 - hrvoje.sen...@gmail.com + +- Update to 4.98.0 + * API improvements and cleanups + * Buildsystem fixes + * For more details please see: + http://www.kde.org/announcements/announce-frameworks5-beta1.php + +------------------------------------------------------------------- Old: ---- kjobwidgets-4.97.0.tar.xz New: ---- kjobwidgets-4.98.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kjobwidgets.spec ++++++ --- /var/tmp/diff_new_pack.1Qd408/_old 2014-04-02 17:22:24.000000000 +0200 +++ /var/tmp/diff_new_pack.1Qd408/_new 2014-04-02 17:22:24.000000000 +0200 @@ -18,10 +18,10 @@ %define lname libKF5JobWidgets5 Name: kjobwidgets -Version: 4.97.0 +Version: 4.98.0 Release: 0 BuildRequires: cmake >= 2.8.12 -BuildRequires: extra-cmake-modules >= 0.0.11 +BuildRequires: extra-cmake-modules >= 0.0.12 BuildRequires: fdupes BuildRequires: kcoreaddons-devel >= %{_kf5_version} BuildRequires: kf5-filesystem ++++++ kjobwidgets-4.97.0.tar.xz -> kjobwidgets-4.98.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kjobwidgets-4.97.0/CMakeLists.txt new/kjobwidgets-4.98.0/CMakeLists.txt --- old/kjobwidgets-4.97.0/CMakeLists.txt 2014-03-01 12:51:11.000000000 +0100 +++ new/kjobwidgets-4.98.0/CMakeLists.txt 2014-03-28 19:17:09.000000000 +0100 @@ -2,7 +2,7 @@ project(KJobWidgets) -find_package(ECM 0.0.11 REQUIRED NO_MODULE) +find_package(ECM 0.0.12 REQUIRED NO_MODULE) set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR}) @@ -10,10 +10,10 @@ include(KDEFrameworkCompilerSettings) include(KDECMakeSettings) -set(KF5_VERSION "4.97.0") +set(KF5_VERSION "4.98.0") -set(QT_REQUIRED_VERSION 5.2.0) -find_package(Qt5 ${QT_REQUIRED_VERSION} CONFIG REQUIRED Widgets DBus) +set(REQUIRED_QT_VERSION 5.2.0) +find_package(Qt5 ${REQUIRED_QT_VERSION} CONFIG REQUIRED Widgets DBus) if (NOT APPLE) find_package(X11) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kjobwidgets-4.97.0/KF5JobWidgetsConfig.cmake.in new/kjobwidgets-4.98.0/KF5JobWidgetsConfig.cmake.in --- old/kjobwidgets-4.97.0/KF5JobWidgetsConfig.cmake.in 2014-03-01 12:51:11.000000000 +0100 +++ new/kjobwidgets-4.98.0/KF5JobWidgetsConfig.cmake.in 2014-03-28 19:17:09.000000000 +0100 @@ -2,7 +2,7 @@ set(KJOBWIDGETS_DBUS_INTERFACES_DIR "${PACKAGE_PREFIX_DIR}/@DBUS_INTERFACES_INSTALL_DIR@") -find_dependency(Qt5Widgets @QT_REQUIRED_VERSION@) +find_dependency(Qt5Widgets @REQUIRED_QT_VERSION@) find_dependency(KF5CoreAddons "@KF5_VERSION@") find_dependency(KF5WidgetsAddons "@KF5_VERSION@") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kjobwidgets-4.97.0/src/Messages.sh new/kjobwidgets-4.98.0/src/Messages.sh --- old/kjobwidgets-4.97.0/src/Messages.sh 1970-01-01 01:00:00.000000000 +0100 +++ new/kjobwidgets-4.98.0/src/Messages.sh 2014-03-28 19:17:09.000000000 +0100 @@ -0,0 +1,18 @@ +#!/bin/sh + +# Invoke the extractrc script on all .ui, .rc, and .kcfg files in the sources. +# The results are stored in a pseudo .cpp file to be picked up by xgettext. +lst=`find . -name \*.rc -o -name \*.ui -o -name \*.kcfg` +if [ -n "$lst" ] ; then + $EXTRACTRC $lst >> rc.cpp +fi + +# If your framework contains tips-of-the-day, call preparetips as well. +if [ -f "data/tips" ] ; then + ( cd data && $PREPARETIPS > ../tips.cpp ) +fi + +# Extract strings from all source files. +# If your framework depends on KI18n, use $XGETTEXT. If it uses Qt translation +# system, use $EXTRACT_TR_STRINGS. +$EXTRACT_TR_STRINGS `find . -name \*.cpp -o -name \*.h -name \*.qml` -o $podir/kjobwidgets5.pot diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kjobwidgets-4.97.0/src/kjobtrackerformatters.cpp new/kjobwidgets-4.98.0/src/kjobtrackerformatters.cpp --- old/kjobwidgets-4.97.0/src/kjobtrackerformatters.cpp 2014-03-01 12:51:11.000000000 +0100 +++ new/kjobwidgets-4.98.0/src/kjobtrackerformatters.cpp 2014-03-28 19:17:09.000000000 +0100 @@ -26,23 +26,18 @@ #include <QCoreApplication> -static QString tr(const char *message, const char *disambiguation = 0, int n = -1) -{ - return QCoreApplication::translate("KJobTrackerFormatters", message, disambiguation, n); -} - QString KJobTrackerFormatters::byteSize(double size) { QList<QString> units; - units << tr("%1 B") - << tr("%1 KiB") - << tr("%1 MiB") - << tr("%1 GiB") - << tr("%1 TiB") - << tr("%1 PiB") - << tr("%1 EiB") - << tr("%1 ZiB") - << tr("%1 YiB"); + units << QCoreApplication::translate("KJobTrackerFormatters", "%1 B") + << QCoreApplication::translate("KJobTrackerFormatters", "%1 KiB") + << QCoreApplication::translate("KJobTrackerFormatters", "%1 MiB") + << QCoreApplication::translate("KJobTrackerFormatters", "%1 GiB") + << QCoreApplication::translate("KJobTrackerFormatters", "%1 TiB") + << QCoreApplication::translate("KJobTrackerFormatters", "%1 PiB") + << QCoreApplication::translate("KJobTrackerFormatters", "%1 EiB") + << QCoreApplication::translate("KJobTrackerFormatters", "%1 ZiB") + << QCoreApplication::translate("KJobTrackerFormatters", "%1 YiB"); int unit = 0; // Selects what unit to use const double multiplier = 1024.0; @@ -62,22 +57,22 @@ QString KJobTrackerFormatters::daysDuration(int n) { - return tr("%n day(s)", "@item:intext", n); + return QCoreApplication::translate("KJobTrackerFormatters", "%n day(s)", "@item:intext", n); } QString KJobTrackerFormatters::hoursDuration(int n) { - return tr("%n hour(s)", "@item:intext", n); + return QCoreApplication::translate("KJobTrackerFormatters", "%n hour(s)", "@item:intext", n); } QString KJobTrackerFormatters::minutesDuration(int n) { - return tr("%n minute(s)", "@item:intext", n); + return QCoreApplication::translate("KJobTrackerFormatters", "%n minute(s)", "@item:intext", n); } QString KJobTrackerFormatters::secondsDuration(int n) { - return tr("%n second(s)", "@item:intext", n); + return QCoreApplication::translate("KJobTrackerFormatters", "%n second(s)", "@item:intext", n); } QString KJobTrackerFormatters::duration(unsigned long mSec) @@ -98,15 +93,15 @@ } if (days && hours) { - return tr("%1 and %2", "@item:intext days and hours.").arg(daysDuration(days)).arg(hoursDuration(hours)); + return QCoreApplication::translate("KJobTrackerFormatters", "%1 and %2", "@item:intext days and hours.").arg(daysDuration(days)).arg(hoursDuration(hours)); } else if (days) { return daysDuration(days); } else if (hours && minutes) { - return tr("%1 and %2", "@item:intext hours and minutes.").arg(hoursDuration(hours)).arg(minutesDuration(minutes)); + return QCoreApplication::translate("KJobTrackerFormatters", "%1 and %2", "@item:intext hours and minutes.").arg(hoursDuration(hours)).arg(minutesDuration(minutes)); } else if (hours) { return hoursDuration(hours); } else if (minutes && seconds) { - return tr("%1 and %2", "@item:intext minutes and seconds.").arg(minutesDuration(minutes)).arg(secondsDuration(seconds)); + return QCoreApplication::translate("KJobTrackerFormatters", "%1 and %2", "@item:intext minutes and seconds.").arg(minutesDuration(minutes)).arg(secondsDuration(seconds)); } else if (minutes) { return minutesDuration(minutes); } else { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kjobwidgets-4.97.0/src/kstatusbarjobtracker.cpp new/kjobwidgets-4.98.0/src/kstatusbarjobtracker.cpp --- old/kjobwidgets-4.97.0/src/kstatusbarjobtracker.cpp 2014-03-01 12:51:11.000000000 +0100 +++ new/kjobwidgets-4.98.0/src/kstatusbarjobtracker.cpp 2014-03-28 19:17:09.000000000 +0100 @@ -23,6 +23,7 @@ #include "kstatusbarjobtracker_p.h" #include "kjobtrackerformatters_p.h" +#include <QCoreApplication> #include <QObject> #include <QWidget> #include <QPushButton> @@ -159,7 +160,7 @@ box->addWidget(stack); if (q->d->showStopButton) { - button = new QPushButton(tr("Stop"), widget); + button = new QPushButton(QCoreApplication::translate("KStatusBarJobTracker", "Stop"), widget); box->addWidget(button); connect(button, SIGNAL(clicked(bool)), this, SLOT(killJob())); @@ -240,9 +241,9 @@ void KStatusBarJobTracker::Private::ProgressWidget::speed(unsigned long value) { if (value == 0) { // speed is measured in bytes-per-second - label->setText(tr(" Stalled ")); + label->setText(QCoreApplication::translate("KStatusBarJobTracker", " Stalled ")); } else { - label->setText(tr(" %1/s ").arg(KJobTrackerFormatters::byteSize(value))); + label->setText(QCoreApplication::translate("KStatusBarJobTracker", " %1/s ").arg(KJobTrackerFormatters::byteSize(value))); } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kjobwidgets-4.97.0/src/kwidgetjobtracker.cpp new/kjobwidgets-4.98.0/src/kwidgetjobtracker.cpp --- old/kjobwidgets-4.97.0/src/kwidgetjobtracker.cpp 2014-03-01 12:51:11.000000000 +0100 +++ new/kjobwidgets-4.98.0/src/kwidgetjobtracker.cpp 2014-03-28 19:17:09.000000000 +0100 @@ -24,6 +24,7 @@ #include "kwidgetjobtracker_p.h" #include "kjobtrackerformatters_p.h" +#include <QCoreApplication> #include <QDir> #include <QProcess> #include <QTimer> @@ -265,7 +266,10 @@ { setWindowTitle(title); caption = title; - sourceInvite->setText(tr("%1:", QString("%1 is the label, we add a ':' to it").arg(field1.first).toLatin1().data()).arg(field1.first)); + sourceInvite->setText( + QCoreApplication::translate("KWidgetJobTracker", + "%1:", "%1 is the label, we add a ':' to it" + ).arg(field1.first)); sourceEdit->setText(field1.second); if (field2.first.isEmpty()) { @@ -273,7 +277,10 @@ } else { setDestVisible(true); checkDestination(QUrl(field2.second)); - destInvite->setText(tr("%1:", QString("%1 is the label, we add a ':' to it").arg(field2.first).toLatin1().data()).arg(field2.first)); + destInvite->setText( + QCoreApplication::translate("KWidgetJobTracker", + "%1:", "%1 is the label, we add a ':' to it" + ).arg(field2.first)); destEdit->setText(field2.second); } } @@ -323,7 +330,7 @@ processedSize = amount; if (totalSizeKnown) { - tmp = tr("%1 of %2 complete", "", amount) + tmp = QCoreApplication::translate("KWidgetJobTracker", "%1 of %2 complete", "", amount) .arg(KJobTrackerFormatters::byteSize(amount)) .arg(KJobTrackerFormatters::byteSize(totalSize)); } else { @@ -341,9 +348,9 @@ } processedDirs = amount; - tmp = tr("%1 / %n folder(s)", "", totalDirs).arg(processedDirs); + tmp = QCoreApplication::translate("KWidgetJobTracker", "%1 / %n folder(s)", "", totalDirs).arg(processedDirs); tmp += " "; - tmp += tr("%1 / %n file(s)", "", totalFiles).arg(processedFiles); + tmp += QCoreApplication::translate("KWidgetJobTracker", "%1 / %n file(s)", "", totalFiles).arg(processedFiles); progressLabel->setText(tmp); break; @@ -354,10 +361,10 @@ processedFiles = amount; if (totalDirs > 1) { - tmp = tr("%1 / %n folder(s)", "", totalDirs).arg(processedDirs); + tmp = QCoreApplication::translate("KWidgetJobTracker", "%1 / %n folder(s)", "", totalDirs).arg(processedDirs); tmp += " "; } - tmp += tr("%1 / %n file(s)", "", totalFiles).arg(processedFiles); + tmp += QCoreApplication::translate("KWidgetJobTracker", "%1 / %n file(s)", "", totalFiles).arg(processedFiles); progressLabel->setText(tmp); } } @@ -367,12 +374,12 @@ QString title = caption + " ("; if (totalSizeKnown) { - title += tr("%1% of %2").arg(percent).arg( + title += QCoreApplication::translate("KWidgetJobTracker", "%1% of %2").arg(percent).arg( KJobTrackerFormatters::byteSize(totalSize)); } else if (totalFiles) { - title += tr("%1% of %n file(s)", "", totalFiles).arg(percent); + title += QCoreApplication::translate("KWidgetJobTracker", "%1% of %n file(s)", "", totalFiles).arg(percent); } else { - title += tr("%1%").arg(percent); + title += QCoreApplication::translate("KWidgetJobTracker", "%1%").arg(percent); } title += ')'; @@ -385,15 +392,15 @@ void KWidgetJobTracker::Private::ProgressWidget::speed(unsigned long value) { if (value == 0) { - speedLabel->setText(tr("Stalled")); + speedLabel->setText(QCoreApplication::translate("KWidgetJobTracker", "Stalled")); } else { const QString speedStr = KJobTrackerFormatters::byteSize(value); if (totalSizeKnown) { const int remaining = 1000 * (totalSize - processedSize) / value; - speedLabel->setText(tr("%1/s (%2 remaining)", "", remaining).arg(speedStr).arg( + speedLabel->setText(QCoreApplication::translate("KWidgetJobTracker", "%1/s (%2 remaining)", "", remaining).arg(speedStr).arg( KJobTrackerFormatters::duration(remaining))); } else { // total size is not known (#24228) - speedLabel->setText(tr("%1/s", "speed in bytes per second").arg(speedStr)); + speedLabel->setText(QCoreApplication::translate("KWidgetJobTracker", "%1/s", "speed in bytes per second").arg(speedStr)); } } } @@ -401,9 +408,9 @@ void KWidgetJobTracker::Private::ProgressWidget::slotClean() { percent(100); - cancelClose->setText(tr("&Close")); + cancelClose->setText(QCoreApplication::translate("KWidgetJobTracker", "&Close")); cancelClose->setIcon(QIcon::fromTheme("window-close")); - cancelClose->setToolTip(tr("Close the current window or document")); + cancelClose->setToolTip(QCoreApplication::translate("KWidgetJobTracker", "Close the current window or document")); openFile->setEnabled(true); if (!totalSizeKnown || totalSize < processedSize) { totalSize = processedSize; @@ -416,20 +423,20 @@ if (!s) { s = 1; } - speedLabel->setText(tr("%1/s (done)").arg( + speedLabel->setText(QCoreApplication::translate("KWidgetJobTracker", "%1/s (done)").arg( KJobTrackerFormatters::byteSize(1000 * totalSize / s))); } } void KWidgetJobTracker::Private::ProgressWidget::suspended() { - pauseButton->setText(tr("&Resume")); + pauseButton->setText(QCoreApplication::translate("KWidgetJobTracker", "&Resume")); suspendedProperty = true; } void KWidgetJobTracker::Private::ProgressWidget::resumed() { - pauseButton->setText(tr("&Pause")); + pauseButton->setText(QCoreApplication::translate("KWidgetJobTracker", "&Pause")); suspendedProperty = false; } @@ -453,7 +460,7 @@ const int spacingHint = style()->pixelMetric(QStyle::PM_DefaultLayoutSpacing); grid->addItem(new QSpacerItem(spacingHint, 0), 0, 1); // filenames or action name - sourceInvite = new QLabel(tr("Source:", "The source url of a job"), this); + sourceInvite = new QLabel(QCoreApplication::translate("KWidgetJobTracker", "Source:", "The source url of a job"), this); grid->addWidget(sourceInvite, 0, 0); sourceEdit = new KSqueezedTextLabel(this); @@ -461,7 +468,7 @@ sourceEdit->installEventFilter(this); grid->addWidget(sourceEdit, 0, 2); - destInvite = new QLabel(tr("Destination:", "The destination url of a job"), this); + destInvite = new QLabel(QCoreApplication::translate("KWidgetJobTracker", "Destination:", "The destination url of a job"), this); grid->addWidget(destInvite, 1, 0); destEdit = new KSqueezedTextLabel(this); @@ -485,7 +492,7 @@ arrowButton = new QPushButton(this); arrowButton->setMaximumSize(QSize(32, 25)); arrowButton->setIcon(QIcon::fromTheme("arrow-down")); - arrowButton->setToolTip(tr("Click this to expand the dialog, to show details")); + arrowButton->setToolTip(QCoreApplication::translate("KWidgetJobTracker", "Click this to expand the dialog, to show details")); arrowState = Qt::DownArrow; connect(arrowButton, SIGNAL(clicked()), this, SLOT(_k_arrowToggled())); hBox->addWidget(arrowButton); @@ -500,7 +507,7 @@ resumeLabel = new QLabel(this); hBox->addWidget(resumeLabel); - pauseButton = new QPushButton(tr("&Pause"), this); + pauseButton = new QPushButton(QCoreApplication::translate("KWidgetJobTracker", "&Pause"), this); connect(pauseButton, SIGNAL(clicked()), this, SLOT(_k_pauseResumeClicked())); hBox->addWidget(pauseButton); @@ -519,7 +526,7 @@ hBox->addWidget(progressLabel); progressLabel->hide(); - keepOpenCheck = new QCheckBox(tr("&Keep this window open after transfer is complete"), this); + keepOpenCheck = new QCheckBox(QCoreApplication::translate("KWidgetJobTracker", "&Keep this window open after transfer is complete"), this); connect(keepOpenCheck, SIGNAL(toggled(bool)), this, SLOT(_k_keepOpenToggled(bool))); topLayout->addWidget(keepOpenCheck); keepOpenCheck->hide(); @@ -527,13 +534,13 @@ hBox = new QHBoxLayout(); topLayout->addLayout(hBox); - openFile = new QPushButton(tr("Open &File"), this); + openFile = new QPushButton(QCoreApplication::translate("KWidgetJobTracker", "Open &File"), this); connect(openFile, SIGNAL(clicked()), this, SLOT(_k_openFile())); hBox->addWidget(openFile); openFile->setEnabled(false); openFile->hide(); - openLocation = new QPushButton(tr("Open &Destination"), this); + openLocation = new QPushButton(QCoreApplication::translate("KWidgetJobTracker", "Open &Destination"), this); connect(openLocation, SIGNAL(clicked()), this, SLOT(_k_openLocation())); hBox->addWidget(openLocation); openLocation->hide(); @@ -541,7 +548,7 @@ hBox->addStretch(1); cancelClose = new QPushButton(this); - cancelClose->setText(tr("&Cancel")); + cancelClose->setText(QCoreApplication::translate("KWidgetJobTracker", "&Cancel")); cancelClose->setIcon(QIcon::fromTheme("dialog-cancel")); connect(cancelClose, SIGNAL(clicked()), this, SLOT(_k_stop())); hBox->addWidget(cancelClose); @@ -549,7 +556,7 @@ resize(sizeHint()); setMaximumHeight(sizeHint().height()); - setWindowTitle(tr("Progress Dialog")); // show something better than kuiserver + setWindowTitle(QCoreApplication::translate("KWidgetJobTracker", "Progress Dialog")); // show something better than kuiserver } void KWidgetJobTracker::Private::ProgressWidget::showTotals() @@ -562,9 +569,9 @@ if (totalDirs > 1) // that we have a singular to translate looks weired but is only logical { - tmps = tr("%n folder(s)", "", totalDirs) + " "; + tmps = QCoreApplication::translate("KWidgetJobTracker", "%n folder(s)", "", totalDirs) + " "; } - tmps += tr("%n file(s)", "", totalFiles); + tmps += QCoreApplication::translate("KWidgetJobTracker", "%n file(s)", "", totalFiles); progressLabel->setText(tmps); } } @@ -650,14 +657,14 @@ progressLabel->show(); speedLabel->show(); arrowButton->setIcon(QIcon::fromTheme("arrow-up")); - arrowButton->setToolTip(tr("Click this to collapse the dialog, to hide details")); + arrowButton->setToolTip(QCoreApplication::translate("KWidgetJobTracker", "Click this to collapse the dialog, to hide details")); arrowState = Qt::UpArrow; } else { //Collapse the dialog progressLabel->hide(); speedLabel->hide(); arrowButton->setIcon(QIcon::fromTheme("arrow-down")); - arrowButton->setToolTip(tr("Click this to expand the dialog, to show details")); + arrowButton->setToolTip(QCoreApplication::translate("KWidgetJobTracker", "Click this to expand the dialog, to show details")); arrowState = Qt::DownArrow; } setMaximumHeight(sizeHint().height()); -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
