Hello community,
here is the log from the commit of package frameworkintegration for
openSUSE:Factory checked in at 2015-11-24 22:21:47
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
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-10-19 22:21:34.000000000 +0200
+++
/work/SRC/openSUSE:Factory/.frameworkintegration.new/frameworkintegration.changes
2015-11-24 22:21:48.000000000 +0100
@@ -1,0 +2,12 @@
+Sun Nov 8 16:57:02 UTC 2015 - [email protected]
+
+- Update to 5.16.0 (boo#955067)
+ * Set default value for WheelScrollLines
+ * Fix WheelScrollLines settings with Qt >= 5.5 (kde#291144)
+ * Switch to Noto font for Plasma 5.5
+ * For more details please see:
+ https://www.kde.org/announcements/kde-frameworks-5.16.0.php
+- Added 0001-Don-t-add-extra-KDE-SNI-actions-in-our-systemtray-qp.patch
+ (kde#354991)
+
+-------------------------------------------------------------------
Old:
----
frameworkintegration-5.15.0.tar.xz
New:
----
0001-Don-t-add-extra-KDE-SNI-actions-in-our-systemtray-qp.patch
frameworkintegration-5.16.0.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ frameworkintegration.spec ++++++
--- /var/tmp/diff_new_pack.MZHTSP/_old 2015-11-24 22:21:49.000000000 +0100
+++ /var/tmp/diff_new_pack.MZHTSP/_new 2015-11-24 22:21:49.000000000 +0100
@@ -18,9 +18,9 @@
%bcond_without lang
%define lname libKF5Style5
-%define _tar_path 5.15
+%define _tar_path 5.16
Name: frameworkintegration
-Version: 5.15.0
+Version: 5.16.0
Release: 0
%define kf5_version %{version}
BuildRequires: cmake >= 2.8.12
@@ -47,6 +47,8 @@
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
@@ -75,6 +77,7 @@
Summary: Plugins responsible for better integration of Qt applications
in KDE Workspace
Group: System/GUI/KDE
Requires: kde-oxygen-fonts
+Requires: noto-sans
Conflicts: %lname < 5.6.0
%requires_eq libQt5Gui5
@@ -103,6 +106,7 @@
%lang_package -n %lname
%prep
%setup -q
+%patch0 -p1
%build
%cmake_kf5 -d build
@@ -135,6 +139,7 @@
%{_kf5_datadir}/infopage/
%{_kf5_plugindir}/
%{_kf5_notifydir}/
+%{_kf5_sharedir}/kconf_update/
%files devel
%defattr(-,root,root)
++++++ 0001-Don-t-add-extra-KDE-SNI-actions-in-our-systemtray-qp.patch ++++++
>From 6e9c03a79e4702e57cb3164233ac2b71f18626a9 Mon Sep 17 00:00:00 2001
From: David Edmundson <[email protected]>
Date: Thu, 12 Nov 2015 19:22:40 +0000
Subject: [PATCH 1/1] Don't add extra KDE SNI actions in our systemtray qpt
plugin
If any app is written using QSystemTrayIcon they'll have to provide
their own quit action in order to work on other platforms. If we add
our own entry apps end up with two quit entries.
BUG: 354991
REVIEW: 126047
---
src/platformtheme/kdeplatformsystemtrayicon.cpp | 1 +
1 file changed, 1 insertion(+)
diff --git a/src/platformtheme/kdeplatformsystemtrayicon.cpp
b/src/platformtheme/kdeplatformsystemtrayicon.cpp
index
7536697d59ed2b2f11aa10180e87d003b5579a16..8f0ce7b9a95ae4b8c2fba302966166adfc5f59f8
100644
--- a/src/platformtheme/kdeplatformsystemtrayicon.cpp
+++ b/src/platformtheme/kdeplatformsystemtrayicon.cpp
@@ -268,6 +268,7 @@ void KDEPlatformSystemTrayIcon::init()
{
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)
--
2.6.2
++++++ frameworkintegration-5.15.0.tar.xz -> frameworkintegration-5.16.0.tar.xz
++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/frameworkintegration-5.15.0/CMakeLists.txt
new/frameworkintegration-5.16.0/CMakeLists.txt
--- old/frameworkintegration-5.15.0/CMakeLists.txt 2015-10-05
09:51:29.000000000 +0200
+++ new/frameworkintegration-5.16.0/CMakeLists.txt 2015-11-08
13:09:49.000000000 +0100
@@ -3,7 +3,7 @@
project(FrameworkIntegration)
include(FeatureSummary)
-find_package(ECM 5.15.0 NO_MODULE)
+find_package(ECM 5.16.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.15.0") # handled by release scripts
-set(KF5_DEP_VERSION "5.15.0") # handled by release scripts
+set(KF5_VERSION "5.16.0") # handled by release scripts
+set(KF5_DEP_VERSION "5.16.0") # handled by release scripts
ecm_setup_version(${KF5_VERSION} VARIABLE_PREFIX FRAMEWORKINTEGRATION
VERSION_HEADER
"${CMAKE_CURRENT_BINARY_DIR}/frameworkintegration_version.h"
@@ -39,13 +39,6 @@
find_package(KF5Notifications ${KF5_DEP_VERSION} REQUIRED)
find_package(KF5WidgetsAddons ${KF5_DEP_VERSION} REQUIRED)
-find_package(OxygenFont 0.4)
-
-set_package_properties(OxygenFont PROPERTIES
- PURPOSE "Default font for KDE Applications"
- TYPE RUNTIME
-)
-
add_definitions(-DTRANSLATION_DOMAIN=\"frameworkintegration5\")
if (IS_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/po")
ki18n_install(po)
@@ -76,3 +69,4 @@
feature_summary(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES)
+message("** frameworkintegration uses Noto Sans
(https://www.google.com/get/noto/) and Oxygen Mono
(http://download.kde.org/stable/plasma/5.4.0/oxygen-fonts-5.4.0.tar.xz) fonts,
ensure these are installed for use at runtime")
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/frameworkintegration-5.15.0/README.md
new/frameworkintegration-5.16.0/README.md
--- old/frameworkintegration-5.15.0/README.md 2015-10-05 09:51:29.000000000
+0200
+++ new/frameworkintegration-5.16.0/README.md 2015-11-08 13:09:49.000000000
+0100
@@ -39,9 +39,3 @@
The plugin KDEPlatformTheme provides KDE integration for
QPlatformThemePlugin.
-## Links
-
-- Home page:
<https://projects.kde.org/projects/frameworks/frameworkintegration>
-- Mailing list: <https://mail.kde.org/mailman/listinfo/kde-frameworks-devel>
-- IRC channel: #kde-devel on Freenode
-- Git repository:
<https://projects.kde.org/projects/frameworks/frameworkintegration/repository>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/frameworkintegration-5.15.0/autotests/kdeplatformtheme_unittest.cpp
new/frameworkintegration-5.16.0/autotests/kdeplatformtheme_unittest.cpp
--- old/frameworkintegration-5.15.0/autotests/kdeplatformtheme_unittest.cpp
2015-10-05 09:51:29.000000000 +0200
+++ new/frameworkintegration-5.16.0/autotests/kdeplatformtheme_unittest.cpp
2015-11-08 13:09:49.000000000 +0100
@@ -59,7 +59,7 @@
}
}
-Q_COREAPP_STARTUP_FUNCTION(prepareEnvironment);
+Q_CONSTRUCTOR_FUNCTION(prepareEnvironment)
class EventTest : public QObject
{
@@ -124,10 +124,10 @@
void testPlatformHints()
{
- QCOMPARE(m_qpa->themeHint(QPlatformTheme::CursorFlashTime).toInt(),
1042);
-
QCOMPARE(m_qpa->themeHint(QPlatformTheme::MouseDoubleClickInterval).toInt(),
4343);
- QCOMPARE(m_qpa->themeHint(QPlatformTheme::StartDragDistance).toInt(),
15);
- QCOMPARE(m_qpa->themeHint(QPlatformTheme::StartDragTime).toInt(), 555);
+ QCOMPARE(qApp->cursorFlashTime(), 1042);
+ QCOMPARE(qApp->doubleClickInterval(), 4343);
+ QCOMPARE(qApp->startDragDistance(), 15);
+ QCOMPARE(qApp->startDragTime(), 555);
QCOMPARE(m_qpa->themeHint(QPlatformTheme::ToolButtonStyle).toInt(),
(int) Qt::ToolButtonTextOnly);
QCOMPARE(m_qpa->themeHint(QPlatformTheme::ToolBarIconSize).toInt(), 2);
QCOMPARE(m_qpa->themeHint(QPlatformTheme::ItemViewActivateItemOnSingleClick).toBool(),
false);
@@ -158,34 +158,34 @@
void testPlatformPalette()
{
- const QPalette *palette = m_qpa->palette();
+ const QPalette palette = qApp->palette();
QPalette::ColorGroup states[3] = {QPalette::Active,
QPalette::Inactive, QPalette::Disabled};
QColor greenColor(QColor(0, 128, 0));
QBrush greenBrush(greenColor);
for (int i = 0; i < 3; i++) {
- QCOMPARE(palette->brush(states[i], QPalette::ButtonText),
greenBrush);
- QCOMPARE(palette->brush(states[i], QPalette::WindowText),
greenBrush);
- QCOMPARE(palette->brush(states[i], QPalette::Window), greenBrush);
- QCOMPARE(palette->brush(states[i], QPalette::Base), greenBrush);
- QCOMPARE(palette->brush(states[i], QPalette::Text), greenBrush);
- QCOMPARE(palette->brush(states[i], QPalette::Button), greenBrush);
- QCOMPARE(palette->brush(states[i], QPalette::ButtonText),
greenBrush);
- QCOMPARE(palette->brush(states[i], QPalette::Highlight),
greenBrush);
- QCOMPARE(palette->brush(states[i], QPalette::HighlightedText),
greenBrush);
- QCOMPARE(palette->brush(states[i], QPalette::ToolTipBase),
greenBrush);
- QCOMPARE(palette->brush(states[i], QPalette::ToolTipText),
greenBrush);
+ QCOMPARE(palette.brush(states[i], QPalette::ButtonText),
greenBrush);
+ QCOMPARE(palette.brush(states[i], QPalette::WindowText),
greenBrush);
+ QCOMPARE(palette.brush(states[i], QPalette::Window), greenBrush);
+ QCOMPARE(palette.brush(states[i], QPalette::Base), greenBrush);
+ QCOMPARE(palette.brush(states[i], QPalette::Text), greenBrush);
+ QCOMPARE(palette.brush(states[i], QPalette::Button), greenBrush);
+ QCOMPARE(palette.brush(states[i], QPalette::ButtonText),
greenBrush);
+ QCOMPARE(palette.brush(states[i], QPalette::Highlight),
greenBrush);
+ QCOMPARE(palette.brush(states[i], QPalette::HighlightedText),
greenBrush);
+ QCOMPARE(palette.brush(states[i], QPalette::ToolTipBase),
greenBrush);
+ QCOMPARE(palette.brush(states[i], QPalette::ToolTipText),
greenBrush);
//KColorScheme applies modifications and we can't disable them, so
I extracted
//the values and blindly compare them.
- QCOMPARE(palette->color(states[i], QPalette::Light).green(), 162);
- QCOMPARE(palette->color(states[i], QPalette::Midlight).green(),
144);
- QCOMPARE(palette->color(states[i], QPalette::Mid).green(), 109);
- QCOMPARE(palette->color(states[i], QPalette::Dark).green(), 62);
- QCOMPARE(palette->color(states[i], QPalette::Shadow).green(), 43);
-
- QCOMPARE(palette->brush(states[i], QPalette::AlternateBase),
greenBrush);
- QCOMPARE(palette->brush(states[i], QPalette::Link), greenBrush);
- QCOMPARE(palette->brush(states[i], QPalette::LinkVisited),
greenBrush);
+ QCOMPARE(palette.color(states[i], QPalette::Light).green(), 162);
+ QCOMPARE(palette.color(states[i], QPalette::Midlight).green(),
144);
+ QCOMPARE(palette.color(states[i], QPalette::Mid).green(), 109);
+ QCOMPARE(palette.color(states[i], QPalette::Dark).green(), 62);
+ QCOMPARE(palette.color(states[i], QPalette::Shadow).green(), 43);
+
+ QCOMPARE(palette.brush(states[i], QPalette::AlternateBase),
greenBrush);
+ QCOMPARE(palette.brush(states[i], QPalette::Link), greenBrush);
+ QCOMPARE(palette.brush(states[i], QPalette::LinkVisited),
greenBrush);
}
}
@@ -219,15 +219,15 @@
sendNotifyChange(KHintsSettings::SettingsChanged,
KHintsSettings::SETTINGS_QT);
m_loop.exec();
- QCOMPARE(m_qpa->themeHint(QPlatformTheme::CursorFlashTime).toInt(),
1022);
+ QCOMPARE(qApp->cursorFlashTime(), 1022);
sendNotifyChange(KHintsSettings::SettingsChanged,
KHintsSettings::SETTINGS_MOUSE);
m_loop.exec();
QCOMPARE(m_qpa->themeHint(QPlatformTheme::ItemViewActivateItemOnSingleClick).toBool(),
true);
-
QCOMPARE(m_qpa->themeHint(QPlatformTheme::MouseDoubleClickInterval).toInt(),
401);
- QCOMPARE(m_qpa->themeHint(QPlatformTheme::StartDragDistance).toInt(),
35);
- QCOMPARE(m_qpa->themeHint(QPlatformTheme::StartDragTime).toInt(), 501);
+ QCOMPARE(qApp->doubleClickInterval(), 401);
+ QCOMPARE(qApp->startDragDistance(), 35);
+ QCOMPARE(qApp->startDragTime(), 501);
QCOMPARE(qApp->wheelScrollLines(), 122);
QCOMPARE(qApp->testAttribute(Qt::AA_DontShowIconsInMenus), true);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/frameworkintegration-5.15.0/autotests/kstyle_unittest.cpp
new/frameworkintegration-5.16.0/autotests/kstyle_unittest.cpp
--- old/frameworkintegration-5.15.0/autotests/kstyle_unittest.cpp
2015-10-05 09:51:29.000000000 +0200
+++ new/frameworkintegration-5.16.0/autotests/kstyle_unittest.cpp
2015-11-08 13:09:49.000000000 +0100
@@ -49,7 +49,7 @@
}
}
-Q_COREAPP_STARTUP_FUNCTION(prepareEnvironment);
+Q_COREAPP_STARTUP_FUNCTION(prepareEnvironment)
class KStyle_UnitTest : public QObject
{
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/frameworkintegration-5.15.0/plasma_workspace.notifyrc
new/frameworkintegration-5.16.0/plasma_workspace.notifyrc
--- old/frameworkintegration-5.15.0/plasma_workspace.notifyrc 2015-10-05
09:51:29.000000000 +0200
+++ new/frameworkintegration-5.16.0/plasma_workspace.notifyrc 2015-11-08
13:09:49.000000000 +0100
@@ -4,6 +4,7 @@
Comment[ar]=مساحة عمل بلازما
Comment[bs]=Plazma radni prostor
Comment[ca]=Espai de treball del Plasma
+Comment[ca@valencia]=Espai de treball del Plasma
Comment[cs]=Pracovní plocha Plasma
Comment[da]=Plasma arbejdsområde
Comment[de]=KDE-Plasma-Arbeitsbereich
@@ -45,6 +46,7 @@
Name[ar]=المهملات: أُفرغت
Name[bs]=Smeće: ispražnjeno
Name[ca]=Paperera: s'ha buidat
+Name[ca@valencia]=Paperera: s'ha buidat
Name[cs]=Koš: vyprázdněn
Name[da]=Affald: Tømt
Name[de]=Papierkorb: geleert
@@ -84,6 +86,7 @@
Comment[ar]=أُفرغت المهملات
Comment[bs]=Smeće je ispražnjeno
Comment[ca]=S'ha buidat la paperera
+Comment[ca@valencia]=S'ha buidat la paperera
Comment[cs]=Koš byl vyprázdněn
Comment[da]=Affaldet er blevet tømt
Comment[de]=Der Papierkorb ist geleert worden
@@ -126,7 +129,8 @@
Name=Textcompletion: Rotation
Name[ar]=إكمال النصّ: دوران
Name[bs]=Dopuna teksta: rotacija
-Name[ca]=Compleció de text: rotació
+Name[ca]=Compleció del text: rotació
+Name[ca@valencia]=Compleció del text: rotació
Name[cs]=Doplňování textu: rotace
Name[da]=Tekstfuldførelse: Rotation
Name[de]=Textvervollständigung: Drehung
@@ -165,6 +169,7 @@
Comment[ar]=وصلتُ إلى نهاية قائمة التّطابقات
Comment[bs]=Dostignut je kraj spiska poklapanja
Comment[ca]=S'ha arribat al final de la llista de coincidències
+Comment[ca@valencia]=S'ha arribat al final de la llista de coincidències
Comment[cs]=Bylo dosaženo konce seznamu shod
Comment[da]=Afslutningen på listen over matches er blevet nået
Comment[de]=Das Ende der Liste der Übereinstimmungen ist erreicht worden
@@ -206,7 +211,8 @@
Name=Textcompletion: No Match
Name[ar]=إكمال النصّ: لا تطابق
Name[bs]=Dopuna teksta: nema poklapanja
-Name[ca]=Compleció de text: sense coincidència
+Name[ca]=Compleció del text: sense coincidència
+Name[ca@valencia]=Compleció del text: sense coincidència
Name[cs]=Doplňování textu: žádná shoda
Name[da]=Tekstfuldførelse: Ingen match
Name[de]=Textvervollständigung: keine Übereinstimmung
@@ -245,6 +251,7 @@
Comment[ar]=لم تُعثر على تطابقات
Comment[bs]=Nije nađeno nijedno poklapanje za dopunu
Comment[ca]=No s'ha trobat cap compleció coincident
+Comment[ca@valencia]=No s'ha trobat cap compleció coincident
Comment[cs]=Nebyla nalezena žádná shoda
Comment[da]=Ingen matchende fuldstændiggørelse blev fundet
Comment[de]=Es ist keine mögliche Vervollständigung gefunden worden
@@ -286,7 +293,8 @@
Name=Textcompletion: Partial Match
Name[ar]=إكمال النصّ: تطابق جزئيّ
Name[bs]=Dopuna teksta: delimično poklapanje
-Name[ca]=Compleció de text: coincidència parcial
+Name[ca]=Compleció del text: coincidència parcial
+Name[ca@valencia]=Compleció del text: coincidència parcial
Name[cs]=Doplňování textu: částčná shoda
Name[da]=Tekstfuldførelse: Delvis match
Name[de]=Textvervollständigung: teilweise Übereinstimmung
@@ -325,6 +333,7 @@
Comment[ar]=هناك أكثر من تطابق واحد ممكن
Comment[bs]=Postoji više od jednog mogućeg poklapanja
Comment[ca]=Hi ha més d'una possible coincidència
+Comment[ca@valencia]=Hi ha més d'una possible coincidència
Comment[cs]=Existuje více než jedna shoda
Comment[da]=Der er mere end et mulig match
Comment[de]=Es gibt mehr als eine mögliche Übereinstimmung
@@ -367,6 +376,7 @@
Name[ar]=خطأ فادح
Name[bs]=Kobna greška
Name[ca]=Error fatal
+Name[ca@valencia]=Error fatal
Name[cs]=Kritická chyba
Name[da]=Fatal fejl
Name[de]=Schwerer Fehler
@@ -405,6 +415,7 @@
Comment[ar]=حدث خطأ جادّ سببّ للبرنامج بإغلاقه
Comment[bs]=Došlo je do ozbiljne greške zbog koje je program obustavljen
Comment[ca]=S'ha produït un error seriós que ha provocat la sortida del
programa
+Comment[ca@valencia]=S'ha produït un error seriós que ha provocat l'eixida del
programa
Comment[cs]=Nastala závažná chyba, v důsledku které byl program ukončen
Comment[da]=Der var en alvorlig fejl som forårsagede at programmet afsluttede
Comment[de]=Es ist ein schwerer Fehler aufgetreten, woraufhin das Programm
beendet wurde.
@@ -448,6 +459,7 @@
Name[ar]=إخطار
Name[bs]=Obavještenje
Name[ca]=Notificació
+Name[ca@valencia]=Notificació
Name[cs]=Upozornění
Name[da]=Bekendtgørelse
Name[de]=Benachrichtigung
@@ -487,6 +499,7 @@
Comment[ar]=حدث شيء خاصّ في البرنامج
Comment[bs]=Nešto posebno se dogodilo u programu
Comment[ca]=Quelcom especial ha passat en el programa
+Comment[ca@valencia]=Quelcom especial ha passat en el programa
Comment[cs]=Něco zvláštního se stalo s programem
Comment[da]=Noget specielt skete i programmet
Comment[de]=Im Programm ist ein besonderes Ereignis eingetreten
@@ -529,6 +542,7 @@
Name[ar]=تحذير
Name[bs]=Upozorenje
Name[ca]=Avís
+Name[ca@valencia]=Avís
Name[cs]=Varování
Name[da]=Advarsel
Name[de]=Warnung
@@ -568,6 +582,7 @@
Comment[ar]=حدث خطأ في البرنامج مما تسبّب بمشاكل
Comment[bs]=Došlo je do greške u programu koja može izazvati probleme
Comment[ca]=S'ha produït un error en el programa que pot provocar problemes
+Comment[ca@valencia]=S'ha produït un error en el programa que pot provocar
problemes
Comment[cs]=V programu nastala chyba, která může způsobit problémy
Comment[da]=Der var en fejl i program som kan volde problemer
Comment[de]=Im Programm ist ein Fehler aufgetreten, der Probleme verursachen
könnte
@@ -610,6 +625,7 @@
Name[ar]=كارثة
Name[bs]=Katastrofa
Name[ca]=Catàstrofe
+Name[ca@valencia]=Catàstrofe
Name[cs]=Katastrofa
Name[da]=Katastrofe
Name[de]=Katastrophe
@@ -648,6 +664,7 @@
Comment[ar]=حدث خطأ جادّ جدًّا، تسبّب للبرنامج بإنهائه على أقلّ تقدير
Comment[bs]=Došlo je do vrlo ozbiljne greške, zbog koje je bar program
obustavljen
Comment[ca]=S'ha produït un error molt seriós, com a mínim ha provocat la
sortida del programa
+Comment[ca@valencia]=S'ha produït un error molt seriós, com a mínim ha
provocat l'eixida del programa
Comment[cs]=Nastala velmi závažná chyba, která má za následek minimálně
ukončení programu
Comment[da]=En meget alvorlig fejl opstod, som mindst forårsagede at
programmet afsluttede
Comment[de]=Ein sehr schwerer Fehler ist aufgetreten, der wenigstens das
Programm zum Beenden bringt
@@ -691,6 +708,7 @@
Name[ar]=ولوج
Name[bs]=Prijava
Name[ca]=Entrada
+Name[ca@valencia]=Entrada
Name[cs]=Přihlášení
Name[da]=Login
Name[de]=Anmeldung
@@ -730,6 +748,7 @@
Comment[ar]=جلسة جديدة تبدأ
Comment[bs]=Nova sesija započinje
Comment[ca]=S'està iniciat una sessió nova
+Comment[ca@valencia]=S'està iniciat una sessió nova
Comment[cs]=Spouští se nové sezení
Comment[da]=En ny session er ved at starte
Comment[de]=Eine neue Sitzung wurde gestartet
@@ -772,6 +791,7 @@
Name[ar]=خروج
Name[bs]=Odjavi se
Name[ca]=Sortida
+Name[ca@valencia]=Eixida
Name[cs]=Odhlášení
Name[da]=Log ud
Name[de]=Abmeldung
@@ -811,6 +831,7 @@
Comment[ar]=الجلسة تخرج
Comment[bs]=Izlaz iz sesije
Comment[ca]=La sessió està finalitzant
+Comment[ca@valencia]=La sessió està finalitzant
Comment[cs]=Sezení se ukončuje
Comment[da]=Sessionen er ved at afslutte
Comment[de]=Die Sitzung wird beendet
@@ -854,6 +875,7 @@
Name[ar]=أُلغِيَ الخروج
Name[bs]=Odjava otkazana
Name[ca]=S'ha cancel·lat la sortida
+Name[ca@valencia]=S'ha cancel·lat l'eixida
Name[cs]=Odhlášení přerušeno
Name[da]=Log ud annulleret
Name[de]=Abmeldung abgebrochen
@@ -893,6 +915,7 @@
Comment[ar]=أُلغِيَ الخروج من بلازما
Comment[bs]=Plazma odjava je prekinuta
Comment[ca]=S'ha cancel·lat la sortida del Plasma
+Comment[ca@valencia]=S'ha cancel·lat l'eixida del Plasma
Comment[cs]=Odhlášení z Plazmy bylo zrušeno
Comment[da]=Plasma log ud blev annulleret
Comment[de]=Der Abmeldevorgang aus Plasma ist abgebrochen worden
@@ -934,7 +957,8 @@
Name=Print Error
Name[ar]=خطأ طباعة
Name[bs]=Greška štampanja
-Name[ca]=Error d'impressió
+Name[ca]=Error en imprimir
+Name[ca@valencia]=Error en imprimir
Name[cs]=Chyba tisku
Name[da]=Udskriftsfejl
Name[de]=Druckfehler
@@ -973,7 +997,8 @@
Comment=A print error has occurred
Comment[ar]=حدث خطأ في الطباعة
Comment[bs]=Došlo je do greške pri štampanju
-Comment[ca]=S'ha produït un error d'impressió
+Comment[ca]=S'ha produït un error en imprimir
+Comment[ca@valencia]=S'ha produït un error en imprimir
Comment[cs]=Nastala chyba v tisku
Comment[da]=En udskriftsfejl opstod
Comment[de]=Ein Fehler beim Drucken ist aufgetreten
@@ -1015,7 +1040,8 @@
Name=Information Message
Name[ar]=رسالة معلومات
Name[bs]=Informativna poruka
-Name[ca]=Missatge d'informació
+Name[ca]=Missatge informatiu
+Name[ca@valencia]=Missatge informatiu
Name[cs]=Informační zpráva
Name[da]=Informationsbesked
Name[de]=Informationsmeldung
@@ -1055,6 +1081,7 @@
Comment[ar]=رسالة معلومات تظهر
Comment[bs]=Prikazana je informativna poruka
Comment[ca]=Es mostra un missatge d'informació
+Comment[ca@valencia]=Es mostra un missatge d'informació
Comment[cs]=Je zobrazována informační zpráva
Comment[da]=En informationsbesked vises
Comment[de]=Eine Informationsmeldung wird angezeigt
@@ -1097,6 +1124,7 @@
Name[ar]=رسالة تحذيريّة
Name[bs]=Upozoravajuća poruka
Name[ca]=Missatge d'avís
+Name[ca@valencia]=Missatge d'avís
Name[cs]=Varovná zpráva
Name[da]=Advarselsbesked
Name[de]=Warnmeldung
@@ -1136,6 +1164,7 @@
Comment[ar]=رسالة تحذير تظهر
Comment[bs]=Prikazana je upozoravajuća poruka
Comment[ca]=Es mostra un missatge d'avís
+Comment[ca@valencia]=Es mostra un missatge d'avís
Comment[cs]=Je zobrazována výstražná zpráva
Comment[da]=En advarselsbesked vises
Comment[de]=Eine Warnmeldung wird angezeigt
@@ -1178,6 +1207,7 @@
Name[ar]=رسالة حرِجة
Name[bs]=Kritična poruka
Name[ca]=Missatge crític
+Name[ca@valencia]=Missatge crític
Name[cs]=Kritická zpráva
Name[da]=Kritisk besked
Name[de]=Kritische Meldung
@@ -1217,6 +1247,7 @@
Comment[ar]=رسالة حرِجة تظهر
Comment[bs]=Prikazana je kritična poruka
Comment[ca]=Es mostra un missatge crític
+Comment[ca@valencia]=Es mostra un missatge crític
Comment[cs]=Je zobrazována kritická zpráva
Comment[da]=En kritisk besked vises
Comment[de]=Eine kritische Fehlermeldung wird angezeigt
@@ -1259,6 +1290,7 @@
Name[ar]=سؤال
Name[bs]=Pitanje
Name[ca]=Pregunta
+Name[ca@valencia]=Pregunta
Name[cs]=Dotaz
Name[da]=Spørgsmål
Name[de]=Frage
@@ -1298,6 +1330,7 @@
Comment[ar]=سؤال يُسأل
Comment[bs]=Nešto ste upitani
Comment[ca]=Es pregunta una qüestió
+Comment[ca@valencia]=Es pregunta una qüestió
Comment[cs]=Je položen dotaz
Comment[da]=Et spørgsmål stilles
Comment[de]=Eine Frage wird gestellt
@@ -1341,6 +1374,7 @@
Name[ar]=جرس
Name[bs]=Bip
Name[ca]=Timbre
+Name[ca@valencia]=Timbre
Name[cs]=Pípnutí
Name[da]=Bip
Name[de]=Signalton
@@ -1380,6 +1414,7 @@
Comment[ar]=جرس صوت
Comment[bs]=Zvučno zvono
Comment[ca]=So de campana
+Comment[ca@valencia]=So de campana
Comment[cs]=Zvonek
Comment[da]=Lad klokke lyde
Comment[de]=Signalton
@@ -1421,6 +1456,7 @@
Name=Widget deleted
Name[ar]=حُذفت ودجة
Name[ca]=Estri suprimit
+Name[ca@valencia]=Estri suprimit
Name[cs]=Widget byl smazán
Name[da]=Widget slettet
Name[de]=Miniprogramm wurde gelöscht
@@ -1428,6 +1464,7 @@
Name[en_GB]=Widget deleted
Name[es]=Elemento gráfico borrado
Name[fi]=Sovelma poistettu
+Name[gd]=Chaidh widget a sguabadh às
Name[gl]=Eliminouse o trebello
Name[he]=וידג'ט נמחק
Name[hu]=Widget törölve
@@ -1455,6 +1492,7 @@
Comment=A widget has been deleted
Comment[ar]=حُذفت ودجة ما
Comment[ca]=S'ha suprimit un estri
+Comment[ca@valencia]=S'ha suprimit un estri
Comment[cs]=Widget byl smazán
Comment[da]=En widget er blevet slettet
Comment[de]=Ein Miniprogramm wurde gelöscht
@@ -1462,6 +1500,7 @@
Comment[en_GB]=A widget has been deleted
Comment[es]=Se ha borrado un elemento gráfico
Comment[fi]=Sovelma on poistettu
+Comment[gd]=Chaidh widget a sguabadh às
Comment[gl]=Eliminouse un trebello.
Comment[he]=וידג'ט נמחק
Comment[hu]=Egy widgetet töröltek
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/frameworkintegration-5.15.0/po/ca@valencia/frameworkintegration5.po
new/frameworkintegration-5.16.0/po/ca@valencia/frameworkintegration5.po
--- old/frameworkintegration-5.15.0/po/ca@valencia/frameworkintegration5.po
1970-01-01 01:00:00.000000000 +0100
+++ new/frameworkintegration-5.16.0/po/ca@valencia/frameworkintegration5.po
2015-11-08 13:09:49.000000000 +0100
@@ -0,0 +1,130 @@
+# Translation of frameworkintegration5.po to Catalan (Valencian)
+# Copyright (C) 2014-2015 This_file_is_part_of_KDE
+# This file is distributed under the license LGPL version 2.1 or
+# version 3 or later versions approved by the membership of KDE e.V.
+#
+# Josep Ma. Ferrer <[email protected]>, 2014.
+# Antoni Bella Pérez <[email protected]>, 2014, 2015.
+msgid ""
+msgstr ""
+"Project-Id-Version: frameworkintegration5\n"
+"Report-Msgid-Bugs-To: http://bugs.kde.org\n";
+"POT-Creation-Date: 2015-10-01 08:25+0000\n"
+"PO-Revision-Date: 2015-05-10 19:43+0100\n"
+"Last-Translator: Antoni Bella Pérez <[email protected]>\n"
+"Language-Team: Catalan <[email protected]>\n"
+"Language: ca@valencia\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-Accelerator-Marker: &\n"
+"X-Generator: Lokalize 2.0\n"
+
+# Nota: «title:window»
+#: platformtheme/kdeplatformfiledialoghelper.cpp:240
+msgid "Opening..."
+msgstr "Obri..."
+
+# Nota: «title:window»
+#: platformtheme/kdeplatformfiledialoghelper.cpp:240
+msgid "Saving..."
+msgstr "Guarda..."
+
+#: platformtheme/kdeplatformtheme.cpp:227
+msgctxt "@action:button"
+msgid "Save All"
+msgstr "Guarda-ho tot"
+
+#: platformtheme/kdeplatformtheme.cpp:233
+msgctxt "@action:button"
+msgid "Yes to All"
+msgstr "Sí a tot"
+
+#: platformtheme/kdeplatformtheme.cpp:237
+msgctxt "@action:button"
+msgid "No to All"
+msgstr "No a tot"
+
+#: platformtheme/kdeplatformtheme.cpp:240
+msgctxt "@action:button"
+msgid "Abort"
+msgstr "Interromp"
+
+#: platformtheme/kdeplatformtheme.cpp:242
+msgctxt "@action:button"
+msgid "Retry"
+msgstr "Reintenta"
+
+#: platformtheme/kdeplatformtheme.cpp:244
+msgctxt "@action:button"
+msgid "Ignore"
+msgstr "Ignora"
+
+#: platformtheme/kdirselectdialog.cpp:132
+msgctxt "folder name"
+msgid "New Folder"
+msgstr "Carpeta nova"
+
+#: platformtheme/kdirselectdialog.cpp:137
+msgctxt "@title:window"
+msgid "New Folder"
+msgstr "Carpeta nova"
+
+#: platformtheme/kdirselectdialog.cpp:138
+#, kde-format
+msgctxt "@label:textbox"
+msgid ""
+"Create new folder in:\n"
+"%1"
+msgstr ""
+"Crea una carpeta nova a:\n"
+"%1"
+
+#: platformtheme/kdirselectdialog.cpp:168
+#, kde-format
+msgid "A file or folder named %1 already exists."
+msgstr "Ja existeix un fitxer o una carpeta anomenat %1."
+
+#: platformtheme/kdirselectdialog.cpp:171
+msgid "You do not have permission to create that folder."
+msgstr "No teniu permís per crear esta carpeta."
+
+#: platformtheme/kdirselectdialog.cpp:285
+msgctxt "@title:window"
+msgid "Select Folder"
+msgstr "Selecció de carpeta"
+
+#: platformtheme/kdirselectdialog.cpp:294
+msgctxt "@action:button"
+msgid "New Folder..."
+msgstr "Carpeta nova..."
+
+#: platformtheme/kdirselectdialog.cpp:340
+msgctxt "@action:inmenu"
+msgid "New Folder..."
+msgstr "Carpeta nova..."
+
+#: platformtheme/kdirselectdialog.cpp:347
+msgctxt "@action:inmenu"
+msgid "Move to Trash"
+msgstr "Llença a la paperera"
+
+#: platformtheme/kdirselectdialog.cpp:354
+msgctxt "@action:inmenu"
+msgid "Delete"
+msgstr "Suprimeix"
+
+#: platformtheme/kdirselectdialog.cpp:363
+msgctxt "@option:check"
+msgid "Show Hidden Folders"
+msgstr "Mostra les carpetes ocultes"
+
+#: platformtheme/kdirselectdialog.cpp:370
+msgctxt "@action:inmenu"
+msgid "Properties"
+msgstr "Propietats"
+
+#: platformtheme/kfiletreeview.cpp:192
+msgid "Show Hidden Folders"
+msgstr "Mostra les carpetes ocultes"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/frameworkintegration-5.15.0/po/de/frameworkintegration5.po
new/frameworkintegration-5.16.0/po/de/frameworkintegration5.po
--- old/frameworkintegration-5.15.0/po/de/frameworkintegration5.po
2015-10-05 09:51:29.000000000 +0200
+++ new/frameworkintegration-5.16.0/po/de/frameworkintegration5.po
2015-11-08 13:09:49.000000000 +0100
@@ -1,6 +1,3 @@
-# Copyright (C) YEAR This_file_is_part_of_KDE
-# This file is distributed under the same license as the PACKAGE package.
-#
# Burkhard Lück <[email protected]>, 2014.
msgid ""
msgstr ""
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/frameworkintegration-5.15.0/po/el/frameworkintegration5.po
new/frameworkintegration-5.16.0/po/el/frameworkintegration5.po
--- old/frameworkintegration-5.15.0/po/el/frameworkintegration5.po
1970-01-01 01:00:00.000000000 +0100
+++ new/frameworkintegration-5.16.0/po/el/frameworkintegration5.po
2015-11-08 13:09:49.000000000 +0100
@@ -0,0 +1,124 @@
+# Copyright (C) YEAR This_file_is_part_of_KDE
+# This file is distributed under the same license as the PACKAGE package.
+#
+# Dimitris Kardarakos <[email protected]>, 2015.
+msgid ""
+msgstr ""
+"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-11-03 20:18+0200\n"
+"Last-Translator: Dimitris Kardarakos <[email protected]>\n"
+"Language-Team: Greek <[email protected]>\n"
+"Language: el\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-Generator: Lokalize 2.0\n"
+
+#: platformtheme/kdeplatformfiledialoghelper.cpp:240
+msgid "Opening..."
+msgstr "Άνοιγμα..."
+
+#: platformtheme/kdeplatformfiledialoghelper.cpp:240
+msgid "Saving..."
+msgstr "Αποθήκευση..."
+
+#: platformtheme/kdeplatformtheme.cpp:227
+msgctxt "@action:button"
+msgid "Save All"
+msgstr "Αποθήκευση όλων"
+
+#: platformtheme/kdeplatformtheme.cpp:233
+msgctxt "@action:button"
+msgid "Yes to All"
+msgstr "Ναι σε Όλα"
+
+#: platformtheme/kdeplatformtheme.cpp:237
+msgctxt "@action:button"
+msgid "No to All"
+msgstr "Όχι σε όλα"
+
+#: platformtheme/kdeplatformtheme.cpp:240
+msgctxt "@action:button"
+msgid "Abort"
+msgstr "Εγκατάλειψη"
+
+#: platformtheme/kdeplatformtheme.cpp:242
+msgctxt "@action:button"
+msgid "Retry"
+msgstr "Επανάληψη"
+
+#: platformtheme/kdeplatformtheme.cpp:244
+msgctxt "@action:button"
+msgid "Ignore"
+msgstr "Αγνόηση"
+
+#: platformtheme/kdirselectdialog.cpp:132
+msgctxt "folder name"
+msgid "New Folder"
+msgstr "Νέος φάκελος"
+
+#: platformtheme/kdirselectdialog.cpp:137
+msgctxt "@title:window"
+msgid "New Folder"
+msgstr "Νέος φάκελος"
+
+#: platformtheme/kdirselectdialog.cpp:138
+#, kde-format
+msgctxt "@label:textbox"
+msgid ""
+"Create new folder in:\n"
+"%1"
+msgstr ""
+"Δημιουργία νέου φακέλου στο:\n"
+"%1"
+
+#: platformtheme/kdirselectdialog.cpp:168
+#, kde-format
+msgid "A file or folder named %1 already exists."
+msgstr "Ένα αρχείο ή φάκελος με όνομα %1 υπάρχει ήδη."
+
+#: platformtheme/kdirselectdialog.cpp:171
+msgid "You do not have permission to create that folder."
+msgstr "Δεν έχετε άδεια να δημιουργήσετε αυτόν τον φάκελο."
+
+#: platformtheme/kdirselectdialog.cpp:285
+msgctxt "@title:window"
+msgid "Select Folder"
+msgstr "Επιλογή φακέλου"
+
+#: platformtheme/kdirselectdialog.cpp:294
+msgctxt "@action:button"
+msgid "New Folder..."
+msgstr "Νέος φάκελος..."
+
+#: platformtheme/kdirselectdialog.cpp:340
+msgctxt "@action:inmenu"
+msgid "New Folder..."
+msgstr "Νέος φάκελος..."
+
+#: platformtheme/kdirselectdialog.cpp:347
+msgctxt "@action:inmenu"
+msgid "Move to Trash"
+msgstr "Μετακίνηση στα απορρίμματα"
+
+#: platformtheme/kdirselectdialog.cpp:354
+msgctxt "@action:inmenu"
+msgid "Delete"
+msgstr "Διαγραφή"
+
+#: platformtheme/kdirselectdialog.cpp:363
+msgctxt "@option:check"
+msgid "Show Hidden Folders"
+msgstr "Εμφάνιση κρυφών φακέλων"
+
+#: platformtheme/kdirselectdialog.cpp:370
+msgctxt "@action:inmenu"
+msgid "Properties"
+msgstr "Ιδιότητες"
+
+#: platformtheme/kfiletreeview.cpp:192
+msgid "Show Hidden Folders"
+msgstr "Εμφάνιση κρυφών φακέλων"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/frameworkintegration-5.15.0/po/gd/frameworkintegration5.po
new/frameworkintegration-5.16.0/po/gd/frameworkintegration5.po
--- old/frameworkintegration-5.15.0/po/gd/frameworkintegration5.po
2015-10-05 09:51:29.000000000 +0200
+++ new/frameworkintegration-5.16.0/po/gd/frameworkintegration5.po
2015-11-08 13:09:49.000000000 +0100
@@ -4,11 +4,11 @@
# GunChleoc <[email protected]>, 2014.
msgid ""
msgstr ""
-"Project-Id-Version: frameworkintegration5\n"
+"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: 2014-12-07 14:59+0100\n"
-"Last-Translator: GunChleoc <[email protected]>\n"
+"PO-Revision-Date: 2015-11-04 15:11+0000\n"
+"Last-Translator: Michael Bauer <[email protected]>\n"
"Language-Team: Fòram na Gàidhlig\n"
"Language: gd\n"
"MIME-Version: 1.0\n"
@@ -16,7 +16,7 @@
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=4; plural=(n==1 || n==11) ? 0 : (n==2 || n==12) ? 1 : "
"(n > 2 && n < 20) ? 2 : 3;\n"
-"X-Generator: Virtaal 0.7.1\n"
+"X-Generator: Poedit 1.8.4\n"
"X-Project-Style: kde\n"
#: platformtheme/kdeplatformfiledialoghelper.cpp:240
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/frameworkintegration-5.15.0/src/platformtheme/CMakeLists.txt
new/frameworkintegration-5.16.0/src/platformtheme/CMakeLists.txt
--- old/frameworkintegration-5.15.0/src/platformtheme/CMakeLists.txt
2015-10-05 09:51:29.000000000 +0200
+++ new/frameworkintegration-5.16.0/src/platformtheme/CMakeLists.txt
2015-11-08 13:09:49.000000000 +0100
@@ -56,3 +56,10 @@
endif()
install(TARGETS KDEPlatformTheme DESTINATION
${KDE_INSTALL_QTPLUGINDIR}/platformthemes)
+
+install(FILES frameworksintegration-5.16-font.upd
+ DESTINATION ${KDE_INSTALL_KCONFUPDATEDIR}
+ )
+install(PROGRAMS frameworksintegration-5.16-font.sh
+ DESTINATION ${KDE_INSTALL_KCONFUPDATEDIR}
+ )
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/frameworkintegration-5.15.0/src/platformtheme/frameworksintegration-5.16-font.sh
new/frameworkintegration-5.16.0/src/platformtheme/frameworksintegration-5.16-font.sh
---
old/frameworkintegration-5.15.0/src/platformtheme/frameworksintegration-5.16-font.sh
1970-01-01 01:00:00.000000000 +0100
+++
new/frameworkintegration-5.16.0/src/platformtheme/frameworksintegration-5.16-font.sh
2015-11-08 13:09:49.000000000 +0100
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+sed -i "s/Oxygen-Sans/Noto Sans/" `kf5-config --path config --locate
kdeglobals`
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/frameworkintegration-5.15.0/src/platformtheme/frameworksintegration-5.16-font.upd
new/frameworkintegration-5.16.0/src/platformtheme/frameworksintegration-5.16-font.upd
---
old/frameworkintegration-5.15.0/src/platformtheme/frameworksintegration-5.16-font.upd
1970-01-01 01:00:00.000000000 +0100
+++
new/frameworkintegration-5.16.0/src/platformtheme/frameworksintegration-5.16-font.upd
2015-11-08 13:09:49.000000000 +0100
@@ -0,0 +1,5 @@
+Version=5
+
+# Update entry in kdeglobals for new font requested by VDG
+Id=frameworksintegration-5.16-font.sh
+Script=frameworksintegration-5.16-font.sh,sh
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/frameworkintegration-5.15.0/src/platformtheme/kfontsettingsdata.cpp
new/frameworkintegration-5.16.0/src/platformtheme/kfontsettingsdata.cpp
--- old/frameworkintegration-5.15.0/src/platformtheme/kfontsettingsdata.cpp
2015-10-05 09:51:29.000000000 +0200
+++ new/frameworkintegration-5.16.0/src/platformtheme/kfontsettingsdata.cpp
2015-11-08 13:09:49.000000000 +0100
@@ -49,7 +49,7 @@
// NOTE: keep in sync with plasma-desktop/kcms/fonts/fonts.cpp
static const char GeneralId[] = "General";
-static const char DefaultFont[] = "Oxygen-Sans";
+static const char DefaultFont[] = "Noto Sans";
static const KFontData DefaultFontData[KFontSettingsData::FontTypesCount] = {
{ GeneralId, "font", DefaultFont, 10, -1,
QFont::SansSerif },
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/frameworkintegration-5.15.0/src/platformtheme/khintssettings.cpp
new/frameworkintegration-5.16.0/src/platformtheme/khintssettings.cpp
--- old/frameworkintegration-5.15.0/src/platformtheme/khintssettings.cpp
2015-10-05 09:51:29.000000000 +0200
+++ new/frameworkintegration-5.16.0/src/platformtheme/khintssettings.cpp
2015-11-08 13:09:49.000000000 +0100
@@ -106,9 +106,11 @@
m_hints[QPlatformTheme::UiEffects] = cg.readEntry("GraphicEffectsLevel",
0) != 0 ? QPlatformTheme::GeneralUiEffect : 0;
m_hints[QPlatformTheme::IconPixmapSizes] =
QVariant::fromValue(QList<int>() << 512 << 256 << 128 << 64 << 32 << 22 << 16
<< 8);
- //TODO Check if we can add themeHints for these two options
+#if (QT_VERSION >= QT_VERSION_CHECK(5, 5, 0))
+ m_hints[QPlatformTheme::WheelScrollLines] =
cg.readEntry("WheelScrollLines", 3);
+#endif
if (qobject_cast<QApplication *>(QCoreApplication::instance())) {
- QApplication::setWheelScrollLines(cg.readEntry("WheelScrollLines",
QApplication::wheelScrollLines()));
+ QApplication::setWheelScrollLines(cg.readEntry("WheelScrollLines", 3));
}
bool showIcons = cg.readEntry("ShowIconsInMenuItems",
!QApplication::testAttribute(Qt::AA_DontShowIconsInMenus));
@@ -329,9 +331,13 @@
bool showIcons = cg.readEntry("ShowIconsInMenuItems",
!QApplication::testAttribute(Qt::AA_DontShowIconsInMenus));
QCoreApplication::setAttribute(Qt::AA_DontShowIconsInMenus, !showIcons);
+#if (QT_VERSION >= QT_VERSION_CHECK(5, 5, 0))
+ int wheelScrollLines = cg.readEntry("WheelScrollLines", 3);
+ m_hints[QPlatformTheme::WheelScrollLines] = wheelScrollLines;
+#endif
QApplication *app = qobject_cast<QApplication
*>(QCoreApplication::instance());
if (app) {
- QApplication::setWheelScrollLines(cg.readEntry("WheelScrollLines",
QApplication::wheelScrollLines()));
+ QApplication::setWheelScrollLines(cg.readEntry("WheelScrollLines", 3));
}
}
