Hello community,
here is the log from the commit of package frameworkintegration for
openSUSE:Factory checked in at 2015-12-29 12:50:25
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/frameworkintegration (Old)
and /work/SRC/openSUSE:Factory/.frameworkintegration.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "frameworkintegration"
Changes:
--------
---
/work/SRC/openSUSE:Factory/frameworkintegration/frameworkintegration.changes
2015-11-24 22:21:48.000000000 +0100
+++
/work/SRC/openSUSE:Factory/.frameworkintegration.new/frameworkintegration.changes
2015-12-29 12:51:27.000000000 +0100
@@ -1,0 +2,9 @@
+Thu Dec 10 23:02:17 UTC 2015 - [email protected]
+
+- Update to 5.17.0
+ * Add plasmoid installation failed to plasma_workspace.notifyrc
+ * For more details please see:
+ https://www.kde.org/announcements/kde-frameworks-5.17.0.php
+- Drop upstreamed
0001-Don-t-add-extra-KDE-SNI-actions-in-our-systemtray-qp.patch
+
+-------------------------------------------------------------------
Old:
----
0001-Don-t-add-extra-KDE-SNI-actions-in-our-systemtray-qp.patch
frameworkintegration-5.16.0.tar.xz
New:
----
frameworkintegration-5.17.0.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ frameworkintegration.spec ++++++
--- /var/tmp/diff_new_pack.0z6D4R/_old 2015-12-29 12:51:27.000000000 +0100
+++ /var/tmp/diff_new_pack.0z6D4R/_new 2015-12-29 12:51:27.000000000 +0100
@@ -18,9 +18,9 @@
%bcond_without lang
%define lname libKF5Style5
-%define _tar_path 5.16
+%define _tar_path 5.17
Name: frameworkintegration
-Version: 5.16.0
+Version: 5.17.0
Release: 0
%define kf5_version %{version}
BuildRequires: cmake >= 2.8.12
@@ -47,8 +47,6 @@
Url: http://www.kde.org
Source:
http://download.kde.org/stable/frameworks/%{_tar_path}/%{name}-%{version}.tar.xz
Source1: baselibs.conf
-# PATCH-FIX-UPSTREAM
0001-Don-t-add-extra-KDE-SNI-actions-in-our-systemtray-qp.patch
-Patch0: 0001-Don-t-add-extra-KDE-SNI-actions-in-our-systemtray-qp.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
@@ -106,7 +104,6 @@
%lang_package -n %lname
%prep
%setup -q
-%patch0 -p1
%build
%cmake_kf5 -d build
++++++ frameworkintegration-5.16.0.tar.xz -> frameworkintegration-5.17.0.tar.xz
++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/frameworkintegration-5.16.0/CMakeLists.txt
new/frameworkintegration-5.17.0/CMakeLists.txt
--- old/frameworkintegration-5.16.0/CMakeLists.txt 2015-11-08
13:09:49.000000000 +0100
+++ new/frameworkintegration-5.17.0/CMakeLists.txt 2015-12-06
22:15:09.000000000 +0100
@@ -3,7 +3,7 @@
project(FrameworkIntegration)
include(FeatureSummary)
-find_package(ECM 5.16.0 NO_MODULE)
+find_package(ECM 5.17.0 NO_MODULE)
set_package_properties(ECM PROPERTIES TYPE REQUIRED DESCRIPTION "Extra CMake
Modules." URL
"https://projects.kde.org/projects/kdesupport/extra-cmake-modules";)
feature_summary(WHAT REQUIRED_PACKAGES_NOT_FOUND
FATAL_ON_MISSING_REQUIRED_PACKAGES)
@@ -23,8 +23,8 @@
set(REQUIRED_QT_VERSION 5.3.0)
find_package(Qt5 ${REQUIRED_QT_VERSION} CONFIG REQUIRED Widgets DBus)
-set(KF5_VERSION "5.16.0") # handled by release scripts
-set(KF5_DEP_VERSION "5.16.0") # handled by release scripts
+set(KF5_VERSION "5.17.0") # handled by release scripts
+set(KF5_DEP_VERSION "5.17.0") # handled by release scripts
ecm_setup_version(${KF5_VERSION} VARIABLE_PREFIX FRAMEWORKINTEGRATION
VERSION_HEADER
"${CMAKE_CURRENT_BINARY_DIR}/frameworkintegration_version.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/frameworkintegration-5.16.0/autotests/CMakeLists.txt
new/frameworkintegration-5.17.0/autotests/CMakeLists.txt
--- old/frameworkintegration-5.16.0/autotests/CMakeLists.txt 2015-11-08
13:09:49.000000000 +0100
+++ new/frameworkintegration-5.17.0/autotests/CMakeLists.txt 2015-12-06
22:15:09.000000000 +0100
@@ -1,4 +1,5 @@
include(ECMMarkAsTest)
+include(ECMMarkNonGuiExecutable)
find_package(Qt5Test ${REQUIRED_QT_VERSION} CONFIG QUIET)
find_package(Qt5Qml ${REQUIRED_QT_VERSION} CONFIG QUIET)
@@ -25,6 +26,7 @@
set_target_properties(${_testname} PROPERTIES COMPILE_FLAGS "-DUNIT_TEST")
add_test(frameworkintegration-${_testname} ${_testname})
ecm_mark_as_test(${_testname})
+ ecm_mark_nongui_executable(${_testname})
target_link_libraries(${_testname} Qt5::Test Qt5::DBus KF5::ConfigWidgets
KF5::ConfigCore KF5::IconThemes KF5::Style KF5::KIOFileWidgets KF5::I18n
KF5::Notifications)
endmacro()
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/frameworkintegration-5.16.0/autotests/kdeplatformtheme_unittest.cpp
new/frameworkintegration-5.17.0/autotests/kdeplatformtheme_unittest.cpp
--- old/frameworkintegration-5.16.0/autotests/kdeplatformtheme_unittest.cpp
2015-11-08 13:09:49.000000000 +0100
+++ new/frameworkintegration-5.17.0/autotests/kdeplatformtheme_unittest.cpp
2015-12-06 22:15:09.000000000 +0100
@@ -47,7 +47,7 @@
QString configPath =
QStandardPaths::writableLocation(QStandardPaths::GenericConfigLocation);
- if(!QDir(configPath).mkpath(".")) {
+ if(!QDir(configPath).mkpath(QStringLiteral("."))) {
qFatal("Failed to create test configuration directory.");
}
@@ -93,7 +93,7 @@
private:
void sendNotifyChange(KHintsSettings::ChangeType type, int arg = -1)
{
- QDBusMessage message = QDBusMessage::createSignal("/KGlobalSettings",
"org.kde.KGlobalSettings", "notifyChange");
+ QDBusMessage message =
QDBusMessage::createSignal(QStringLiteral("/KGlobalSettings"),
QStringLiteral("org.kde.KGlobalSettings"), QStringLiteral("notifyChange"));
QList<QVariant> args;
args.append(static_cast<int>(type));
if (arg >= 0) {
@@ -110,8 +110,8 @@
void initTestCase()
{
m_qpa = new KdePlatformTheme();
- QDBusConnection::sessionBus().connect(QString(), "/KGlobalSettings",
"org.kde.KGlobalSettings",
- "notifyChange", &m_loop,
SLOT(quit()));
+ QDBusConnection::sessionBus().connect(QString(),
QStringLiteral("/KGlobalSettings"), QStringLiteral("org.kde.KGlobalSettings"),
+ QStringLiteral("notifyChange"),
&m_loop, SLOT(quit()));
}
void cleanupTestCase()
@@ -143,7 +143,7 @@
QVERIFY(!iconThemeSearchPaths.isEmpty());
QStringList styles;
- styles << "non-existent-widget-style" << "breeze" << "oxygen" <<
"fusion" << "windows";
+ styles << QStringLiteral("non-existent-widget-style") <<
QStringLiteral("breeze") << QStringLiteral("oxygen") <<
QStringLiteral("fusion") << QStringLiteral("windows");
QCOMPARE(m_qpa->themeHint(QPlatformTheme::StyleNames).toStringList(),
styles);
QCOMPARE(m_qpa->themeHint(QPlatformTheme::DialogButtonBoxLayout).toInt(), (int)
QDialogButtonBox::KdeLayout);
QCOMPARE(m_qpa->themeHint(QPlatformTheme::DialogButtonBoxButtonsHaveIcons).toBool(),
false);
@@ -202,10 +202,10 @@
QFile::remove(configPath);
QFile::copy(CHANGED_CONFIGFILE, configPath);
- QDBusConnection::sessionBus().connect(QString(), "/KIconLoader",
"org.kde.KIconLoader",
- "iconChanged", &m_loop,
SLOT(quit()));
+ QDBusConnection::sessionBus().connect(QString(),
QStringLiteral("/KIconLoader"), QStringLiteral("org.kde.KIconLoader"),
+ QStringLiteral("iconChanged"),
&m_loop, SLOT(quit()));
- QDBusMessage message = QDBusMessage::createSignal("/KIconLoader",
"org.kde.KIconLoader", "iconChanged");
+ QDBusMessage message =
QDBusMessage::createSignal(QStringLiteral("/KIconLoader"),
QStringLiteral("org.kde.KIconLoader"), QStringLiteral("iconChanged"));
message.setArguments(QList<QVariant>() <<
int(KIconLoader::MainToolbar));
QDBusConnection::sessionBus().send(message);
m_loop.exec();
@@ -242,7 +242,7 @@
m_loop.exec();
QStringList styles;
- styles << "another-non-existent-widget-style" << "breeze" << "oxygen"
<< "fusion" << "windows";
+ styles << QStringLiteral("another-non-existent-widget-style") <<
QStringLiteral("breeze") << QStringLiteral("oxygen") <<
QStringLiteral("fusion") << QStringLiteral("windows");
QCOMPARE(m_qpa->themeHint(QPlatformTheme::StyleNames).toStringList(),
styles);
sendNotifyChange(KHintsSettings::SettingsChanged,
KHintsSettings::SETTINGS_STYLE);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/frameworkintegration-5.16.0/autotests/kdirselectdialog_unittest.cpp
new/frameworkintegration-5.17.0/autotests/kdirselectdialog_unittest.cpp
--- old/frameworkintegration-5.16.0/autotests/kdirselectdialog_unittest.cpp
2015-11-08 13:09:49.000000000 +0100
+++ new/frameworkintegration-5.17.0/autotests/kdirselectdialog_unittest.cpp
2015-12-06 22:15:09.000000000 +0100
@@ -31,9 +31,9 @@
QTest::addColumn<QUrl>("url");
QTest::addColumn<QUrl>("expectedUrl");
- QTest::newRow("only_scheme") << QUrl("trash:") << QUrl("trash:/");
- QTest::newRow("with_no_host") << QUrl("trash://") << QUrl("trash://");
- QTest::newRow("with_root_path") << QUrl("trash:///") <<
QUrl("trash:///");
+ QTest::newRow("only_scheme") << QUrl(QStringLiteral("trash:")) <<
QUrl(QStringLiteral("trash:/"));
+ QTest::newRow("with_no_host") << QUrl(QStringLiteral("trash://")) <<
QUrl(QStringLiteral("trash://"));
+ QTest::newRow("with_root_path") << QUrl(QStringLiteral("trash:///"))
<< QUrl(QStringLiteral("trash:///"));
}
void testSetCurrentUrl()
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/frameworkintegration-5.16.0/autotests/kfiledialog_unittest.cpp
new/frameworkintegration-5.17.0/autotests/kfiledialog_unittest.cpp
--- old/frameworkintegration-5.16.0/autotests/kfiledialog_unittest.cpp
2015-11-08 13:09:49.000000000 +0100
+++ new/frameworkintegration-5.17.0/autotests/kfiledialog_unittest.cpp
2015-12-06 22:15:09.000000000 +0100
@@ -45,7 +45,7 @@
{
QFileDialog dialog;
- QStringList nameFilterList = QStringList() << "c (*.cpp)" << "h (*.h)";
+ QStringList nameFilterList = QStringList() << QStringLiteral("c
(*.cpp)") << QStringLiteral("h (*.h)");
dialog.setNameFilters(nameFilterList);
QCOMPARE(dialog.nameFilters(), nameFilterList);
}
@@ -54,11 +54,11 @@
{
QFileDialog dialog;
- QStringList nameFilterList = QStringList() << "c (*.cpp)" << "h (*.h)";
+ QStringList nameFilterList = QStringList() << QStringLiteral("c
(*.cpp)") << QStringLiteral("h (*.h)");
dialog.setNameFilters(nameFilterList);
QCOMPARE(dialog.nameFilters(), nameFilterList);
- QString selectNameFilter("h (*.h)");
+ QString selectNameFilter(QStringLiteral("h (*.h)"));
dialog.selectNameFilter(selectNameFilter);
QEXPECT_FAIL("", "Does currently not work. Works, once the dialog gets
shown, though.", Continue);
QCOMPARE(dialog.selectedNameFilter(), selectNameFilter);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/frameworkintegration-5.16.0/autotests/kfontsettingsdata_unittest.cpp
new/frameworkintegration-5.17.0/autotests/kfontsettingsdata_unittest.cpp
--- old/frameworkintegration-5.16.0/autotests/kfontsettingsdata_unittest.cpp
2015-11-08 13:09:49.000000000 +0100
+++ new/frameworkintegration-5.17.0/autotests/kfontsettingsdata_unittest.cpp
2015-12-06 22:15:09.000000000 +0100
@@ -96,10 +96,10 @@
QFile::copy(CHANGED_CONFIGFILE, configPath);
QEventLoop loop;
- QDBusConnection::sessionBus().connect(QString(), "/KDEPlatformTheme",
"org.kde.KDEPlatformTheme",
- "refreshFonts", &loop,
SLOT(quit()));
+ QDBusConnection::sessionBus().connect(QString(),
QStringLiteral("/KDEPlatformTheme"), QStringLiteral("org.kde.KDEPlatformTheme"),
+ QStringLiteral("refreshFonts"),
&loop, SLOT(quit()));
- QDBusMessage message = QDBusMessage::createSignal("/KDEPlatformTheme",
"org.kde.KDEPlatformTheme", "refreshFonts");
+ QDBusMessage message =
QDBusMessage::createSignal(QStringLiteral("/KDEPlatformTheme"),
QStringLiteral("org.kde.KDEPlatformTheme"), QStringLiteral("refreshFonts"));
QDBusConnection::sessionBus().send(message);
loop.exec();
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/frameworkintegration-5.16.0/autotests/kstyle_unittest.cpp
new/frameworkintegration-5.17.0/autotests/kstyle_unittest.cpp
--- old/frameworkintegration-5.16.0/autotests/kstyle_unittest.cpp
2015-11-08 13:09:49.000000000 +0100
+++ new/frameworkintegration-5.17.0/autotests/kstyle_unittest.cpp
2015-12-06 22:15:09.000000000 +0100
@@ -37,7 +37,7 @@
QString configPath =
QStandardPaths::writableLocation(QStandardPaths::GenericConfigLocation);
- if(!QDir(configPath).mkpath(".")) {
+ if(!QDir(configPath).mkpath(QStringLiteral("."))) {
qFatal("Failed to create test configuration directory.");
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/frameworkintegration-5.16.0/plasma_workspace.notifyrc
new/frameworkintegration-5.17.0/plasma_workspace.notifyrc
--- old/frameworkintegration-5.16.0/plasma_workspace.notifyrc 2015-11-08
13:09:49.000000000 +0100
+++ new/frameworkintegration-5.17.0/plasma_workspace.notifyrc 2015-12-06
22:15:09.000000000 +0100
@@ -457,6 +457,7 @@
[Event/notification]
Name=Notification
Name[ar]=إخطار
+Name[ast]=Avisu
Name[bs]=Obavještenje
Name[ca]=Notificació
Name[ca@valencia]=Notificació
@@ -1452,6 +1453,53 @@
Action=Sound
Sound=Oxygen-Sys-App-Message.ogg
+[Event/plasmoidInstallationFailed]
+Name=Widget failed to install
+Name[ca]=Ha fallat en instal·lar l'estri
+Name[ca@valencia]=Ha fallat en instal·lar l'estri
+Name[da]=Widget kunne ikke installeres
+Name[en_GB]=Widget failed to install
+Name[es]=La instalación del elemento gráfico ha fallado
+Name[fi]=Sovelman asennus epäonnistui
+Name[gl]=Fallo de instalación dun trebello
+Name[it]=Installazione dell'oggetto non riuscita
+Name[nl]=Widget kan niet geïnstalleerd worden
+Name[pl]=Niepowodzenie wgrywania elementu interfejsu
+Name[pt]=Não foi possível instalar o elemento
+Name[pt_BR]=Ocorreu uma falha ao instalar o widget
+Name[sk]=Zlyhala inštalácia widgetu
+Name[sl]=Gradnik ni bil nameščen
+Name[sr]=Пропало инсталирање виџета
+Name[sr@ijekavian]=Пропало инсталирање виџета
+Name[sr@ijekavianlatin]=Propalo instaliranje vidžeta
+Name[sr@latin]=Propalo instaliranje vidžeta
+Name[sv]=Installation av grafisk komponent misslyckades
+Name[uk]=Не вдалося встановити віджет
+Name[x-test]=xxWidget failed to installxx
+Comment=A widget could not be installed
+Comment[ca]=No s'ha pogut instal·lar un estri
+Comment[ca@valencia]=No s'ha pogut instal·lar un estri
+Comment[da]=En widget kunne ikke installeres
+Comment[en_GB]=A widget could not be installed
+Comment[es]=No se ha podido instalar un elemento gráfico
+Comment[fi]=Sovelmaa ei voitu asentaa
+Comment[gl]=Non foi posíbel instalar un trebello.
+Comment[it]=Un oggetto non può essere installato
+Comment[nl]=Een widget kon niet geïnstalleerd worden
+Comment[pl]=Nie udało się wgrać elementu interfejsu
+Comment[pt]=Não foi possível instalar um elemento
+Comment[pt_BR]=Não foi possível instalar um widget
+Comment[sk]=Widget nemohol byť nainštalovaný
+Comment[sl]=Gradnika ni bilo mogoče namestiti
+Comment[sr]=Виџет не може да се инсталира
+Comment[sr@ijekavian]=Виџет не може да се инсталира
+Comment[sr@ijekavianlatin]=Vidžet ne može da se instalira
+Comment[sr@latin]=Vidžet ne može da se instalira
+Comment[sv]=En grafisk komponent kunde inte installeras
+Comment[uk]=Не вдалося встановити віджет
+Comment[x-test]=xxA widget could not be installedxx
+Action=Popup
+
[Event/plasmoidDeleted]
Name=Widget deleted
Name[ar]=حُذفت ودجة
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/frameworkintegration-5.16.0/po/ast/frameworkintegration5.po
new/frameworkintegration-5.17.0/po/ast/frameworkintegration5.po
--- old/frameworkintegration-5.16.0/po/ast/frameworkintegration5.po
2015-11-08 13:09:49.000000000 +0100
+++ new/frameworkintegration-5.17.0/po/ast/frameworkintegration5.po
2015-12-06 22:15:09.000000000 +0100
@@ -7,9 +7,9 @@
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: http://bugs.kde.org\n";
"POT-Creation-Date: 2015-10-01 08:25+0000\n"
-"PO-Revision-Date: 2015-07-11 16:23+0100\n"
+"PO-Revision-Date: 2015-11-10 23:51+0100\n"
"Last-Translator: enolp <[email protected]>\n"
-"Language-Team: Asturian <[email protected]>\n"
+"Language-Team: Asturian <[email protected]>\n"
"Language: ast\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -76,7 +76,7 @@
"%1"
#: platformtheme/kdirselectdialog.cpp:168
-#, fuzzy, kde-format
+#, kde-format
msgid "A file or folder named %1 already exists."
msgstr "Yá esiste un ficheru o carpeta nomáu %1."
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/frameworkintegration-5.16.0/po/nb/frameworkintegration5.po
new/frameworkintegration-5.17.0/po/nb/frameworkintegration5.po
--- old/frameworkintegration-5.16.0/po/nb/frameworkintegration5.po
2015-11-08 13:09:49.000000000 +0100
+++ new/frameworkintegration-5.17.0/po/nb/frameworkintegration5.po
2015-12-06 22:15:09.000000000 +0100
@@ -1,3 +1,5 @@
+# Translation of frameworkintegration5 to Norwegian Bokmål
+#
# Bjørn Steensrud <[email protected]>, 2014, 2015.
msgid ""
msgstr ""
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/frameworkintegration-5.16.0/src/kstyle/kstyle.cpp
new/frameworkintegration-5.17.0/src/kstyle/kstyle.cpp
--- old/frameworkintegration-5.16.0/src/kstyle/kstyle.cpp 2015-11-08
13:09:49.000000000 +0100
+++ new/frameworkintegration-5.17.0/src/kstyle/kstyle.cpp 2015-12-06
22:15:09.000000000 +0100
@@ -297,116 +297,116 @@
{
switch (standardIcon) {
case QStyle::SP_DesktopIcon:
- return QIcon::fromTheme("user-desktop");
+ return QIcon::fromTheme(QStringLiteral("user-desktop"));
case QStyle::SP_TrashIcon:
- return QIcon::fromTheme("user-trash");
+ return QIcon::fromTheme(QStringLiteral("user-trash"));
case QStyle::SP_ComputerIcon:
- return QIcon::fromTheme("computer");
+ return QIcon::fromTheme(QStringLiteral("computer"));
case QStyle::SP_DriveFDIcon:
- return QIcon::fromTheme("media-floppy");
+ return QIcon::fromTheme(QStringLiteral("media-floppy"));
case QStyle::SP_DriveHDIcon:
- return QIcon::fromTheme("drive-harddisk");
+ return QIcon::fromTheme(QStringLiteral("drive-harddisk"));
case QStyle::SP_DriveCDIcon:
case QStyle::SP_DriveDVDIcon:
- return QIcon::fromTheme("drive-optical");
+ return QIcon::fromTheme(QStringLiteral("drive-optical"));
case QStyle::SP_DriveNetIcon:
- return QIcon::fromTheme("folder-remote");
+ return QIcon::fromTheme(QStringLiteral("folder-remote"));
case QStyle::SP_DirHomeIcon:
- return QIcon::fromTheme("user-home");
+ return QIcon::fromTheme(QStringLiteral("user-home"));
case QStyle::SP_DirOpenIcon:
- return QIcon::fromTheme("document-open-folder");
+ return QIcon::fromTheme(QStringLiteral("document-open-folder"));
case QStyle::SP_DirClosedIcon:
- return QIcon::fromTheme("folder");
+ return QIcon::fromTheme(QStringLiteral("folder"));
case QStyle::SP_DirIcon:
- return QIcon::fromTheme("folder");
+ return QIcon::fromTheme(QStringLiteral("folder"));
case QStyle::SP_DirLinkIcon:
- return QIcon::fromTheme("folder"); //TODO: generate (!?) folder with
link emblem
+ return QIcon::fromTheme(QStringLiteral("folder")); //TODO: generate
(!?) folder with link emblem
case QStyle::SP_FileIcon:
- return QIcon::fromTheme("text-plain"); //TODO: look for a better icon
+ return QIcon::fromTheme(QStringLiteral("text-plain")); //TODO: look
for a better icon
case QStyle::SP_FileLinkIcon:
- return QIcon::fromTheme("text-plain"); //TODO: generate (!?) file with
link emblem
+ return QIcon::fromTheme(QStringLiteral("text-plain")); //TODO:
generate (!?) file with link emblem
case QStyle::SP_FileDialogStart:
- return QIcon::fromTheme("media-playback-start"); //TODO: find correct
icon
+ return QIcon::fromTheme(QStringLiteral("media-playback-start"));
//TODO: find correct icon
case QStyle::SP_FileDialogEnd:
- return QIcon::fromTheme("media-playback-stop"); //TODO: find correct
icon
+ return QIcon::fromTheme(QStringLiteral("media-playback-stop"));
//TODO: find correct icon
case QStyle::SP_FileDialogToParent:
- return QIcon::fromTheme("go-up");
+ return QIcon::fromTheme(QStringLiteral("go-up"));
case QStyle::SP_FileDialogNewFolder:
- return QIcon::fromTheme("folder-new");
+ return QIcon::fromTheme(QStringLiteral("folder-new"));
case QStyle::SP_FileDialogDetailedView:
- return QIcon::fromTheme("view-list-details");
+ return QIcon::fromTheme(QStringLiteral("view-list-details"));
case QStyle::SP_FileDialogInfoView:
- return QIcon::fromTheme("document-properties");
+ return QIcon::fromTheme(QStringLiteral("document-properties"));
case QStyle::SP_FileDialogContentsView:
- return QIcon::fromTheme("view-list-icons");
+ return QIcon::fromTheme(QStringLiteral("view-list-icons"));
case QStyle::SP_FileDialogListView:
- return QIcon::fromTheme("view-list-text");
+ return QIcon::fromTheme(QStringLiteral("view-list-text"));
case QStyle::SP_FileDialogBack:
- return QIcon::fromTheme("go-previous");
+ return QIcon::fromTheme(QStringLiteral("go-previous"));
case QStyle::SP_MessageBoxInformation:
- return QIcon::fromTheme("dialog-information");
+ return QIcon::fromTheme(QStringLiteral("dialog-information"));
case QStyle::SP_MessageBoxWarning:
- return QIcon::fromTheme("dialog-warning");
+ return QIcon::fromTheme(QStringLiteral("dialog-warning"));
case QStyle::SP_MessageBoxCritical:
- return QIcon::fromTheme("dialog-error");
+ return QIcon::fromTheme(QStringLiteral("dialog-error"));
case QStyle::SP_MessageBoxQuestion:
- return QIcon::fromTheme("dialog-information");
+ return QIcon::fromTheme(QStringLiteral("dialog-information"));
case QStyle::SP_DialogOkButton:
- return QIcon::fromTheme("dialog-ok");
+ return QIcon::fromTheme(QStringLiteral("dialog-ok"));
case QStyle::SP_DialogCancelButton:
- return QIcon::fromTheme("dialog-cancel");
+ return QIcon::fromTheme(QStringLiteral("dialog-cancel"));
case QStyle::SP_DialogHelpButton:
- return QIcon::fromTheme("help-contents");
+ return QIcon::fromTheme(QStringLiteral("help-contents"));
case QStyle::SP_DialogOpenButton:
- return QIcon::fromTheme("document-open");
+ return QIcon::fromTheme(QStringLiteral("document-open"));
case QStyle::SP_DialogSaveButton:
- return QIcon::fromTheme("document-save");
+ return QIcon::fromTheme(QStringLiteral("document-save"));
case QStyle::SP_DialogCloseButton:
- return QIcon::fromTheme("dialog-close");
+ return QIcon::fromTheme(QStringLiteral("dialog-close"));
case QStyle::SP_DialogApplyButton:
- return QIcon::fromTheme("dialog-ok-apply");
+ return QIcon::fromTheme(QStringLiteral("dialog-ok-apply"));
case QStyle::SP_DialogResetButton:
- return QIcon::fromTheme("document-revert");
+ return QIcon::fromTheme(QStringLiteral("document-revert"));
case QStyle::SP_DialogDiscardButton:
- return QIcon::fromTheme("dialog-cancel");
+ return QIcon::fromTheme(QStringLiteral("dialog-cancel"));
case QStyle::SP_DialogYesButton:
- return QIcon::fromTheme("dialog-ok-apply");
+ return QIcon::fromTheme(QStringLiteral("dialog-ok-apply"));
case QStyle::SP_DialogNoButton:
- return QIcon::fromTheme("dialog-cancel");
+ return QIcon::fromTheme(QStringLiteral("dialog-cancel"));
case QStyle::SP_ArrowUp:
- return QIcon::fromTheme("go-up");
+ return QIcon::fromTheme(QStringLiteral("go-up"));
case QStyle::SP_ArrowDown:
- return QIcon::fromTheme("go-down");
+ return QIcon::fromTheme(QStringLiteral("go-down"));
case QStyle::SP_ArrowLeft:
- return QIcon::fromTheme("go-previous-view");
+ return QIcon::fromTheme(QStringLiteral("go-previous-view"));
case QStyle::SP_ArrowRight:
- return QIcon::fromTheme("go-next-view");
+ return QIcon::fromTheme(QStringLiteral("go-next-view"));
case QStyle::SP_ArrowBack:
- return QIcon::fromTheme("go-previous");
+ return QIcon::fromTheme(QStringLiteral("go-previous"));
case QStyle::SP_ArrowForward:
- return QIcon::fromTheme("go-next");
+ return QIcon::fromTheme(QStringLiteral("go-next"));
case QStyle::SP_BrowserReload:
- return QIcon::fromTheme("view-refresh");
+ return QIcon::fromTheme(QStringLiteral("view-refresh"));
case QStyle::SP_BrowserStop:
- return QIcon::fromTheme("process-stop");
+ return QIcon::fromTheme(QStringLiteral("process-stop"));
case QStyle::SP_MediaPlay:
- return QIcon::fromTheme("media-playback-start");
+ return QIcon::fromTheme(QStringLiteral("media-playback-start"));
case QStyle::SP_MediaStop:
- return QIcon::fromTheme("media-playback-stop");
+ return QIcon::fromTheme(QStringLiteral("media-playback-stop"));
case QStyle::SP_MediaPause:
- return QIcon::fromTheme("media-playback-pause");
+ return QIcon::fromTheme(QStringLiteral("media-playback-pause"));
case QStyle::SP_MediaSkipForward:
- return QIcon::fromTheme("media-skip-forward");
+ return QIcon::fromTheme(QStringLiteral("media-skip-forward"));
case QStyle::SP_MediaSkipBackward:
- return QIcon::fromTheme("media-skip-backward");
+ return QIcon::fromTheme(QStringLiteral("media-skip-backward"));
case QStyle::SP_MediaSeekForward:
- return QIcon::fromTheme("media-seek-forward");
+ return QIcon::fromTheme(QStringLiteral("media-seek-forward"));
case QStyle::SP_MediaSeekBackward:
- return QIcon::fromTheme("media-seek-backward");
+ return QIcon::fromTheme(QStringLiteral("media-seek-backward"));
case QStyle::SP_MediaVolume:
- return QIcon::fromTheme("audio-volume-medium");
+ return QIcon::fromTheme(QStringLiteral("audio-volume-medium"));
case QStyle::SP_MediaVolumeMuted:
- return QIcon::fromTheme("audio-volume-muted");
+ return QIcon::fromTheme(QStringLiteral("audio-volume-muted"));
default:
return QIcon();
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/frameworkintegration-5.16.0/src/platformtheme/kdeplatformsystemtrayicon.cpp
new/frameworkintegration-5.17.0/src/platformtheme/kdeplatformsystemtrayicon.cpp
---
old/frameworkintegration-5.16.0/src/platformtheme/kdeplatformsystemtrayicon.cpp
2015-11-08 13:09:49.000000000 +0100
+++
new/frameworkintegration-5.17.0/src/platformtheme/kdeplatformsystemtrayicon.cpp
2015-12-06 22:15:09.000000000 +0100
@@ -268,6 +268,7 @@
{
if (!m_sni) {
m_sni = new KStatusNotifierItem();
+ m_sni->setStandardActionsEnabled(false);
m_sni->setTitle(QApplication::applicationDisplayName());
connect(m_sni, &KStatusNotifierItem::activateRequested, [this](bool
active, const QPoint &pos) {
Q_UNUSED(active)
@@ -348,7 +349,7 @@
bool KDEPlatformSystemTrayIcon::isSystemTrayAvailable() const
{
- QDBusInterface systrayHost("org.kde.StatusNotifierWatcher",
"/StatusNotifierWatcher", "org.kde.StatusNotifierWatcher");
+ QDBusInterface
systrayHost(QStringLiteral("org.kde.StatusNotifierWatcher"),
QStringLiteral("/StatusNotifierWatcher"),
QStringLiteral("org.kde.StatusNotifierWatcher"));
if (systrayHost.isValid()) {
return systrayHost.property("IsStatusNotifierHostRegistered").toBool();
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/frameworkintegration-5.16.0/src/platformtheme/kdirselectdialog.cpp
new/frameworkintegration-5.17.0/src/platformtheme/kdirselectdialog.cpp
--- old/frameworkintegration-5.16.0/src/platformtheme/kdirselectdialog.cpp
2015-11-08 13:09:49.000000000 +0100
+++ new/frameworkintegration-5.17.0/src/platformtheme/kdirselectdialog.cpp
2015-12-06 22:15:09.000000000 +0100
@@ -291,7 +291,7 @@
topLayout->addWidget(page);
QPushButton *folderButton = new QPushButton;
- KGuiItem::assign(folderButton, KGuiItem(i18nc("@action:button", "New
Folder..."), "folder-new"));
+ KGuiItem::assign(folderButton, KGuiItem(i18nc("@action:button", "New
Folder..."), QStringLiteral("folder-new")));
connect(folderButton, SIGNAL(clicked()), this, SLOT(slotNewFolder()));
m_buttons = new QDialogButtonBox(this);
@@ -308,7 +308,7 @@
d->m_actions->addAssociatedWidget(this);
d->m_placesView = new KFilePlacesView(page);
d->m_placesView->setModel(new KFilePlacesModel(d->m_placesView));
- d->m_placesView->setObjectName(QLatin1String("speedbar"));
+ d->m_placesView->setObjectName(QStringLiteral("speedbar"));
d->m_placesView->setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
d->m_placesView->setSizePolicy(QSizePolicy::Minimum, QSizePolicy::Minimum);
connect(d->m_placesView, SIGNAL(urlChanged(QUrl)),
@@ -339,21 +339,21 @@
QAction *newFolder = new QAction(i18nc("@action:inmenu", "New Folder..."),
this);
d->m_actions->addAction(newFolder->objectName(), newFolder);
- newFolder->setIcon(QIcon::fromTheme("folder-new"));
+ newFolder->setIcon(QIcon::fromTheme(QStringLiteral("folder-new")));
newFolder->setShortcut(Qt::Key_F10);
connect(newFolder, SIGNAL(triggered(bool)), this, SLOT(slotNewFolder()));
d->m_contextMenu->addAction(newFolder);
d->moveToTrash = new QAction(i18nc("@action:inmenu", "Move to Trash"),
this);
d->m_actions->addAction(d->moveToTrash->objectName(), d->moveToTrash);
- d->moveToTrash->setIcon(QIcon::fromTheme("user-trash"));
+ d->moveToTrash->setIcon(QIcon::fromTheme(QStringLiteral("user-trash")));
d->moveToTrash->setShortcut(Qt::Key_Delete);
connect(d->moveToTrash, SIGNAL(triggered(bool)), this,
SLOT(slotMoveToTrash()));
d->m_contextMenu->addAction(d->moveToTrash);
d->deleteAction = new QAction(i18nc("@action:inmenu", "Delete"), this);
d->m_actions->addAction(d->deleteAction->objectName(), d->deleteAction);
- d->deleteAction->setIcon(QIcon::fromTheme("edit-delete"));
+ d->deleteAction->setIcon(QIcon::fromTheme(QStringLiteral("edit-delete")));
d->deleteAction->setShortcut(Qt::SHIFT + Qt::Key_Delete);
connect(d->deleteAction, SIGNAL(triggered(bool)), this,
SLOT(slotDelete()));
d->m_contextMenu->addAction(d->deleteAction);
@@ -369,7 +369,7 @@
QAction *propertiesAction = new QAction(i18nc("@action:inmenu",
"Properties"), this);
d->m_actions->addAction(propertiesAction->objectName(), propertiesAction);
- propertiesAction->setIcon(QIcon::fromTheme("document-properties"));
+
propertiesAction->setIcon(QIcon::fromTheme(QStringLiteral("document-properties")));
propertiesAction->setShortcut(Qt::ALT + Qt::Key_Return);
connect(propertiesAction, SIGNAL(triggered(bool)), this,
SLOT(slotProperties()));
d->m_contextMenu->addAction(propertiesAction);
@@ -387,7 +387,7 @@
d->m_startDir = d->m_startURL;
d->m_rootUrl = d->m_treeView->rootUrl();
- d->readConfig(KSharedConfig::openConfig(), "DirSelect Dialog");
+ d->readConfig(KSharedConfig::openConfig(), QStringLiteral("DirSelect
Dialog"));
mainLayout->addWidget(d->m_treeView, 1);
mainLayout->addWidget(d->m_urlCombo, 0);
@@ -463,7 +463,7 @@
//to find the / separator. It can happen that a valid url like smb:
does not have
//one so we should add it.
if (!u.toString().endsWith(QChar('/'))) {
- u.setPath("/");
+ u.setPath(QStringLiteral("/"));
}
d->m_treeView->setRootUrl(u);
@@ -503,7 +503,7 @@
void KDirSelectDialog::hideEvent(QHideEvent *event)
{
- d->saveConfig(KSharedConfig::openConfig(), "DirSelect Dialog");
+ d->saveConfig(KSharedConfig::openConfig(), QStringLiteral("DirSelect
Dialog"));
QDialog::hideEvent(event);
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/frameworkintegration-5.16.0/src/platformtheme/kfontsettingsdata.cpp
new/frameworkintegration-5.17.0/src/platformtheme/kfontsettingsdata.cpp
--- old/frameworkintegration-5.16.0/src/platformtheme/kfontsettingsdata.cpp
2015-11-08 13:09:49.000000000 +0100
+++ new/frameworkintegration-5.17.0/src/platformtheme/kfontsettingsdata.cpp
2015-12-06 22:15:09.000000000 +0100
@@ -71,7 +71,7 @@
cachedFont->setStyleHint(fontData.StyleHint);
if (!mKdeGlobals) {
- mKdeGlobals = KSharedConfig::openConfig("kdeglobals",
KConfig::NoGlobals);
+ mKdeGlobals =
KSharedConfig::openConfig(QStringLiteral("kdeglobals"), KConfig::NoGlobals);
}
const KConfigGroup configGroup(mKdeGlobals, fontData.ConfigGroupKey);
QString fontInfo = configGroup.readEntry(fontData.ConfigKey,
QString());
@@ -109,6 +109,6 @@
void KFontSettingsData::delayedDBusConnects()
{
- QDBusConnection::sessionBus().connect(QString(), "/KDEPlatformTheme",
"org.kde.KDEPlatformTheme",
- "refreshFonts", this,
SLOT(dropFontSettingsCache()));
+ QDBusConnection::sessionBus().connect(QString(),
QStringLiteral("/KDEPlatformTheme"), QStringLiteral("org.kde.KDEPlatformTheme"),
+ QStringLiteral("refreshFonts"),
this, SLOT(dropFontSettingsCache()));
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/frameworkintegration-5.16.0/src/platformtheme/khintssettings.cpp
new/frameworkintegration-5.17.0/src/platformtheme/khintssettings.cpp
--- old/frameworkintegration-5.16.0/src/platformtheme/khintssettings.cpp
2015-11-08 13:09:49.000000000 +0100
+++ new/frameworkintegration-5.17.0/src/platformtheme/khintssettings.cpp
2015-12-06 22:15:09.000000000 +0100
@@ -53,11 +53,11 @@
#include <X11/Xcursor/Xcursor.h>
#endif
-static const QString defaultLookAndFeelPackage = "org.kde.breeze.desktop";
+static const QString defaultLookAndFeelPackage =
QStringLiteral("org.kde.breeze.desktop");
KHintsSettings::KHintsSettings() : QObject(0)
{
- mKdeGlobals = KSharedConfig::openConfig("kdeglobals", KConfig::NoGlobals);
+ mKdeGlobals = KSharedConfig::openConfig(QStringLiteral("kdeglobals"),
KConfig::NoGlobals);
KConfigGroup cg(mKdeGlobals, "KDE");
// try to extract the proper defaults file from a lookandfeel package
@@ -81,18 +81,18 @@
m_hints[QPlatformTheme::ItemViewActivateItemOnSingleClick] =
cg.readEntry("SingleClick", true);
- m_hints[QPlatformTheme::SystemIconThemeName] = readConfigValue("Icons",
"Theme", "breeze");
+ m_hints[QPlatformTheme::SystemIconThemeName] =
readConfigValue(QStringLiteral("Icons"), QStringLiteral("Theme"), "breeze");
m_hints[QPlatformTheme::SystemIconFallbackThemeName] = "hicolor";
m_hints[QPlatformTheme::IconThemeSearchPaths] = xdgIconThemePaths();
QStringList styleNames;
styleNames << cg.readEntry("widgetStyle", QString())
- << "breeze"
- << "oxygen"
- << "fusion"
- << "windows";
- const QString lnfStyle = readConfigValue("KDE", "widgetStyle",
QString()).toString();
+ << QStringLiteral("breeze")
+ << QStringLiteral("oxygen")
+ << QStringLiteral("fusion")
+ << QStringLiteral("windows");
+ const QString lnfStyle = readConfigValue(QStringLiteral("KDE"),
QStringLiteral("widgetStyle"), QString()).toString();
if (!lnfStyle.isEmpty()) {
styleNames.removeOne(lnfStyle);
styleNames.prepend(lnfStyle);
@@ -168,7 +168,7 @@
QString xdgDirString = QFile::decodeName(qgetenv("XDG_DATA_DIRS"));
if (xdgDirString.isEmpty()) {
- xdgDirString = QLatin1String("/usr/local/share:/usr/share");
+ xdgDirString = QStringLiteral("/usr/local/share:/usr/share");
}
foreach (const QString &xdgDir, xdgDirString.split(QLatin1Char(':'))) {
@@ -263,11 +263,11 @@
QStringList styleNames;
styleNames << cg.readEntry("widgetStyle", QString())
- << "breeze"
- << "oxygen"
- << "fusion"
- << "windows";
- const QString lnfStyle = readConfigValue("KDE", "widgetStyle",
QString()).toString();
+ << QStringLiteral("breeze")
+ << QStringLiteral("oxygen")
+ << QStringLiteral("fusion")
+ << QStringLiteral("windows");
+ const QString lnfStyle = readConfigValue(QStringLiteral("KDE"),
QStringLiteral("widgetStyle"), QString()).toString();
if (!lnfStyle.isEmpty() && !styleNames.contains(lnfStyle)) {
styleNames.prepend(lnfStyle);
}
@@ -286,7 +286,7 @@
{
KIconLoader::Group iconGroup = (KIconLoader::Group) group;
if (iconGroup != KIconLoader::MainToolbar) {
- m_hints[QPlatformTheme::SystemIconThemeName] =
readConfigValue("Icons", "Theme", "breeze");
+ m_hints[QPlatformTheme::SystemIconThemeName] =
readConfigValue(QStringLiteral("Icons"), QStringLiteral("Theme"), "breeze");
return;
}
@@ -344,11 +344,11 @@
Qt::ToolButtonStyle KHintsSettings::toolButtonStyle(const KConfigGroup &cg)
const
{
const QString buttonStyle = cg.readEntry("ToolButtonStyle",
"TextBesideIcon").toLower();
- return buttonStyle == "textbesideicon" ? Qt::ToolButtonTextBesideIcon
- : buttonStyle == "icontextright" ? Qt::ToolButtonTextBesideIcon
- : buttonStyle == "textundericon" ? Qt::ToolButtonTextUnderIcon
- : buttonStyle == "icontextbottom" ? Qt::ToolButtonTextUnderIcon
- : buttonStyle == "textonly" ? Qt::ToolButtonTextOnly
+ return buttonStyle == QLatin1String("textbesideicon") ?
Qt::ToolButtonTextBesideIcon
+ : buttonStyle == QLatin1String("icontextright") ?
Qt::ToolButtonTextBesideIcon
+ : buttonStyle == QLatin1String("textundericon") ?
Qt::ToolButtonTextUnderIcon
+ : buttonStyle == QLatin1String("icontextbottom") ?
Qt::ToolButtonTextUnderIcon
+ : buttonStyle == QLatin1String("textonly") ? Qt::ToolButtonTextOnly
: Qt::ToolButtonIconOnly;
}
@@ -369,13 +369,13 @@
return;
}
- path = QStandardPaths::locate(QStandardPaths::GenericDataLocation,
"plasma/look-and-feel/org.kde.loonandfeel/contents/colors");
+ path = QStandardPaths::locate(QStandardPaths::GenericDataLocation,
QStringLiteral("plasma/look-and-feel/org.kde.loonandfeel/contents/colors"));
if (!path.isEmpty()) {
m_palettes[QPlatformTheme::SystemPalette] = new
QPalette(KColorScheme::createApplicationPalette(KSharedConfig::openConfig(path)));
return;
}
- const QString scheme = readConfigValue("General", "ColorScheme",
"Breeze").toString();
+ const QString scheme = readConfigValue(QStringLiteral("General"),
QStringLiteral("ColorScheme"), "Breeze").toString();
path = QStandardPaths::locate(QStandardPaths::GenericDataLocation,
"color-schemes/" + scheme + ".colors");
if (!path.isEmpty()) {
@@ -386,7 +386,7 @@
void KHintsSettings::updateCursorTheme()
{
- KConfig config("kcminputrc");
+ KConfig config(QStringLiteral("kcminputrc"));
KConfigGroup g(&config, "Mouse");
QString theme = g.readEntry("cursorTheme", QString());
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/frameworkintegration-5.16.0/tests/kstyletest.cpp
new/frameworkintegration-5.17.0/tests/kstyletest.cpp
--- old/frameworkintegration-5.16.0/tests/kstyletest.cpp 2015-11-08
13:09:49.000000000 +0100
+++ new/frameworkintegration-5.17.0/tests/kstyletest.cpp 2015-12-06
22:15:09.000000000 +0100
@@ -63,7 +63,7 @@
QWidget w;
w.setLayout(new QVBoxLayout);
- QPushButton *showDialogButton = new QPushButton(QLatin1Literal("Dialog"),
&w);
+ QPushButton *showDialogButton = new QPushButton(QStringLiteral("Dialog"),
&w);
QObject::connect(showDialogButton, &QPushButton::clicked, &showDialog);
w.layout()->addWidget(showDialogButton);
w.resize(200, 200);
