openSUSE Commits
Threads by month
- ----- 2025 -----
- January
- ----- 2024 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2023 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2022 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2021 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2020 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2019 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2018 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2017 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2016 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2015 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2014 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2013 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2012 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2011 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2010 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2009 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2008 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2007 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2006 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
April 2014
- 1 participants
- 1084 discussions
Hello community,
here is the log from the commit of package kxmlgui for openSUSE:Factory checked in at 2014-04-02 17:22:32
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/kxmlgui (Old)
and /work/SRC/openSUSE:Factory/.kxmlgui.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kxmlgui"
Changes:
--------
--- /work/SRC/openSUSE:Factory/kxmlgui/kxmlgui.changes 2014-03-10 12:18:27.…
[View More]000000000 +0100
+++ /work/SRC/openSUSE:Factory/.kxmlgui.new/kxmlgui.changes 2014-04-02 17:22:46.000000000 +0200
@@ -1,0 +2,9 @@
+Sat Mar 29 19:47:54 UTC 2014 - hrvoje.senjan(a)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:
----
kxmlgui-4.97.0.tar.xz
New:
----
kxmlgui-4.98.0.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kxmlgui.spec ++++++
--- /var/tmp/diff_new_pack.tZIdcH/_old 2014-04-02 17:22:46.000000000 +0200
+++ /var/tmp/diff_new_pack.tZIdcH/_new 2014-04-02 17:22:46.000000000 +0200
@@ -18,11 +18,11 @@
%define lname libKF5XmlGui5
Name: kxmlgui
-Version: 4.97.0
+Version: 4.98.0
Release: 0
BuildRequires: attica-qt5-devel >= %{_kf5_version}
BuildRequires: cmake >= 2.8.12
-BuildRequires: extra-cmake-modules >= 0.0.11
+BuildRequires: extra-cmake-modules >= 0.0.12
BuildRequires: fdupes
BuildRequires: kconfig-devel >= %{_kf5_version}
BuildRequires: kconfigwidgets-devel >= %{_kf5_version}
@@ -109,8 +109,7 @@
%defattr(-,root,root)
%doc COPYING* README*
%{_kf5_libdir}/libKF5XmlGui.so.*
-%dir %{_kf5_configdir}/ui
-%{_kf5_configdir}/ui/ui_standards.rc
+%{_kf5_configdir}/ui/
%{_kf5_libexecdir}/ksendbugmail
%dir %{_kf5_datadir}/kxmlgui
%dir %{_kf5_datadir}/kxmlgui/pics
++++++ kxmlgui-4.97.0.tar.xz -> kxmlgui-4.98.0.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kxmlgui-4.97.0/CMakeLists.txt new/kxmlgui-4.98.0/CMakeLists.txt
--- old/kxmlgui-4.97.0/CMakeLists.txt 2014-03-01 12:51:50.000000000 +0100
+++ new/kxmlgui-4.98.0/CMakeLists.txt 2014-03-28 20:26:01.000000000 +0100
@@ -3,7 +3,7 @@
project(KXmlGui)
# ECM setup
-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})
@@ -16,7 +16,7 @@
include(KDEFrameworkCompilerSettings)
include(KDECMakeSettings)
-set(KF5_VERSION "4.97.0")
+set(KF5_VERSION "4.98.0")
ecm_setup_version(${KF5_VERSION}
VARIABLE_PREFIX KXMLGUI
@@ -25,8 +25,8 @@
SOVERSION 5)
# Dependencies
-set(QT_REQUIRED_VERSION 5.2.0)
-find_package(Qt5 ${QT_REQUIRED_VERSION} CONFIG REQUIRED Widgets DBus Xml Network PrintSupport)
+set(REQUIRED_QT_VERSION 5.2.0)
+find_package(Qt5 ${REQUIRED_QT_VERSION} CONFIG REQUIRED Widgets DBus Xml Network PrintSupport)
find_package(KF5ItemViews ${KF5_VERSION} REQUIRED)
find_package(KF5Config ${KF5_VERSION} REQUIRED)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kxmlgui-4.97.0/KF5XmlGuiConfig.cmake.in new/kxmlgui-4.98.0/KF5XmlGuiConfig.cmake.in
--- old/kxmlgui-4.97.0/KF5XmlGuiConfig.cmake.in 2014-03-01 12:51:50.000000000 +0100
+++ new/kxmlgui-4.98.0/KF5XmlGuiConfig.cmake.in 2014-03-28 20:26:01.000000000 +0100
@@ -10,8 +10,8 @@
find_dependency(KF5TextWidgets "@KF5_VERSION@")
find_dependency(KF5WindowSystem "@KF5_VERSION@")
-find_dependency(Qt5DBus @QT_REQUIRED_VERSION@)
-find_dependency(Qt5Xml @QT_REQUIRED_VERSION@)
+find_dependency(Qt5DBus @REQUIRED_QT_VERSION@)
+find_dependency(Qt5Xml @REQUIRED_QT_VERSION@)
include("${CMAKE_CURRENT_LIST_DIR}/KF5XmlGuiTargets.cmake")
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kxmlgui-4.97.0/autotests/icons/oxygen/index.theme new/kxmlgui-4.98.0/autotests/icons/oxygen/index.theme
--- old/kxmlgui-4.97.0/autotests/icons/oxygen/index.theme 2014-03-01 12:51:50.000000000 +0100
+++ new/kxmlgui-4.98.0/autotests/icons/oxygen/index.theme 2014-03-28 20:26:01.000000000 +0100
@@ -2,6 +2,7 @@
Name=Oxygen
Name[bs]=Oxygen
Name[ca]=Oxygen
+Name[ca@valencia]=Oxygen
Name[cs]=Oxygen
Name[da]=Oxygen
Name[de]=Oxygen
@@ -12,13 +13,17 @@
Name[ga]=Oxygen
Name[hu]=Oxygen
Name[ia]=Oxygen
+Name[ko]=Oxygen
Name[nb]=Oxygen
Name[nds]=Oxygen
Name[nl]=Oxygen
Name[nn]=Oksygen
+Name[pa]=ਆਕਸੀਜਨ
Name[pl]=Oxygen
Name[pt]=Oxygen
Name[pt_BR]=Oxygen
+Name[ro]=Oxygen
+Name[ru]=Oxygen
Name[se]=Oksygena
Name[sk]=Oxygen
Name[sl]=Kisik
@@ -30,11 +35,13 @@
Name[uk]=Oxygen
Name[vi]=Oxy
Name[x-test]=xxOxygenxx
+Name[zh_CN]=Oxygen
Name[zh_TW]=Oxygen
Comment=Oxygen Team
Comment[bs]=Oxygen tim
Comment[ca]=Equip de l'Oxygen
+Comment[ca@valencia]=Equip de l'Oxygen
Comment[cs]=Tým Oxygen
Comment[da]=Oxygen-holdet
Comment[de]=Oxygen-Team
@@ -43,12 +50,16 @@
Comment[fi]=Oxygenin kehitysryhmä
Comment[hu]=Oxygen csapat
Comment[ia]=Equipa de Oxygen
+Comment[ko]=Oxygen 팀
Comment[nb]=Oxygen-laget
Comment[nds]=Oxygen-Koppel
Comment[nl]=Oxygen-team
+Comment[pa]=ਆਕਸੀਜਨ ਟੀਮ
Comment[pl]=Zespół Oxygen
Comment[pt]=Equipa do Oxygen
Comment[pt_BR]=Equipe do Oxygen
+Comment[ro]=Echipa Oxygen
+Comment[ru]=Команда Oxygen
Comment[sk]=Tím Oxygen
Comment[sl]=Ekipa Kisika
Comment[sr]=Тим Кисеоника
@@ -58,6 +69,7 @@
Comment[sv]=Oxygen-gruppen
Comment[uk]=Команда Oxygen
Comment[x-test]=xxOxygen Teamxx
+Comment[zh_CN]=Oxygen 团队
Comment[zh_TW]=Oxygen 開發團隊
DisplayDepth=32
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kxmlgui-4.97.0/autotests/kmainwindow_unittest.cpp new/kxmlgui-4.98.0/autotests/kmainwindow_unittest.cpp
--- old/kxmlgui-4.97.0/autotests/kmainwindow_unittest.cpp 2014-03-01 12:51:50.000000000 +0100
+++ new/kxmlgui-4.98.0/autotests/kmainwindow_unittest.cpp 2014-03-28 20:26:01.000000000 +0100
@@ -32,6 +32,12 @@
void KMainWindow_UnitTest::initTestCase()
{
QStandardPaths::enableTestMode(true);
+ QFile::remove(QStandardPaths::writableLocation(QStandardPaths::ConfigLocation) + QStringLiteral("/kmainwindow_unittestrc"));
+}
+
+void KMainWindow_UnitTest::cleanupTestCase()
+{
+ QFile::remove(QStandardPaths::writableLocation(QStandardPaths::ConfigLocation) + QStringLiteral("/kmainwindow_unittestrc"));
}
void KMainWindow_UnitTest::testDefaultName()
@@ -128,6 +134,9 @@
// Send the pending resize event (resize() only sets Qt::WA_PendingResizeEvent)
QResizeEvent e(size(), oldSize);
QApplication::sendEvent(this, &e);
+
+ QCOMPARE(this->width(), width);
+ QCOMPARE(this->height(), height);
}
};
@@ -159,7 +168,8 @@
KToolBar *tb = new KToolBar(&mw); // we need a toolbar to trigger an old bug in saveMainWindowSettings
tb->setObjectName("testtb");
mw.reallyResize(800, 600);
- QTest::qWait(200);
+ QTRY_COMPARE(mw.size(), QSize(800, 600));
+ QTRY_COMPARE(mw.windowHandle()->size(), QSize(800, 600));
mw.saveMainWindowSettings(cfg);
mw.close();
}
@@ -170,8 +180,8 @@
tb->setObjectName("testtb");
mw2.resize(500, 500);
mw2.applyMainWindowSettings(cfg);
- QTest::qWait(200);
- QCOMPARE(mw2.size(), QSize(800, 600));
+
+ QTRY_COMPARE(mw2.size(), QSize(800, 600));
}
void KMainWindow_UnitTest::testAutoSaveSettings()
@@ -185,7 +195,6 @@
tb->setObjectName("testtb");
mw.setAutoSaveSettings(group);
mw.reallyResize(800, 600);
- QTest::qWait(200);
mw.close();
}
@@ -194,8 +203,7 @@
KToolBar *tb = new KToolBar(&mw2);
tb->setObjectName("testtb");
mw2.setAutoSaveSettings(group);
- QTest::qWait(200);
- QCOMPARE(mw2.size(), QSize(800, 600));
+ QTRY_COMPARE(mw2.size(), QSize(800, 600));
}
void KMainWindow_UnitTest::testNoAutoSave()
@@ -208,7 +216,6 @@
mw.show();
mw.setAutoSaveSettings(group, false);
mw.reallyResize(750, 550);
- QTest::qWait(200);
mw.close();
}
@@ -216,8 +223,7 @@
mw2.show();
mw2.setAutoSaveSettings(group, false);
// NOT 750, 550! (the 800,600 comes from testAutoSaveSettings)
- QTest::qWait(200);
- QCOMPARE(mw2.size(), QSize(800, 600));
+ QTRY_COMPARE(mw2.size(), QSize(800, 600));
}
void KMainWindow_UnitTest::testWidgetWithStatusBar()
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kxmlgui-4.97.0/autotests/kmainwindow_unittest.h new/kxmlgui-4.98.0/autotests/kmainwindow_unittest.h
--- old/kxmlgui-4.97.0/autotests/kmainwindow_unittest.h 2014-03-01 12:51:50.000000000 +0100
+++ new/kxmlgui-4.98.0/autotests/kmainwindow_unittest.h 2014-03-28 20:26:01.000000000 +0100
@@ -28,6 +28,7 @@
private Q_SLOTS:
void initTestCase();
+ void cleanupTestCase();
void testDefaultName();
void testFixedName();
void testNameWithSpecialChars();
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kxmlgui-4.97.0/autotests/ktoolbar_unittest.cpp new/kxmlgui-4.98.0/autotests/ktoolbar_unittest.cpp
--- old/kxmlgui-4.97.0/autotests/ktoolbar_unittest.cpp 2014-03-01 12:51:50.000000000 +0100
+++ new/kxmlgui-4.98.0/autotests/ktoolbar_unittest.cpp 2014-03-28 20:26:01.000000000 +0100
@@ -217,11 +217,12 @@
// Save settings
kmw.saveMainWindowSettings(group);
- QCOMPARE(group.groupList().count(), 2); // two subgroups (one for each toolbar)
// was it the default value?
if (iconSize == KIconLoader::global()->currentSize(KIconLoader::MainToolbar)) {
+ QCOMPARE(group.groupList().count(), 0); // nothing to save
QVERIFY(!group.group("Toolbar mainToolBar").hasKey("IconSize"));
} else {
+ QCOMPARE(group.groupList().count(), 2); // two subgroups (one for each toolbar)
QVERIFY(group.group("Toolbar mainToolBar").hasKey("IconSize"));
}
}
@@ -315,10 +316,10 @@
// Save settings
kmw.saveMainWindowSettings(group);
- QVERIFY(group.groupList().count() >= 6); // one subgroup for each toolbar
// was it the default size? (for the main toolbar, we only check that one)
const bool usingDefaultSize = iconSize == KIconLoader::global()->currentSize(KIconLoader::MainToolbar);
if (usingDefaultSize) {
+ QVERIFY(!group.groupList().contains("Toolbar mainToolBar"));
QVERIFY(!group.group("Toolbar mainToolBar").hasKey("IconSize"));
} else {
QVERIFY(group.group("Toolbar mainToolBar").hasKey("IconSize"));
@@ -402,10 +403,11 @@
// Save settings
kmw.saveMainWindowSettings(group);
- QCOMPARE(group.groupList().count(), 2); // two subgroups (one for each toolbar)
if (selectedDefaultForMainToolbar) {
+ QCOMPARE(group.groupList().count(), 0); // nothing to save
QVERIFY(!group.group("Toolbar mainToolBar").hasKey("ToolButtonStyle"));
} else {
+ QCOMPARE(group.groupList().count(), 2); // two subgroups (one for each toolbar)
QVERIFY(group.group("Toolbar mainToolBar").hasKey("ToolButtonStyle"));
}
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kxmlgui-4.97.0/src/CMakeLists.txt new/kxmlgui-4.98.0/src/CMakeLists.txt
--- old/kxmlgui-4.97.0/src/CMakeLists.txt 2014-03-01 12:51:50.000000000 +0100
+++ new/kxmlgui-4.98.0/src/CMakeLists.txt 2014-03-28 20:26:01.000000000 +0100
@@ -52,7 +52,6 @@
kxmlguiwindow.cpp
kundoactions.cpp
kcheckaccelerators.cpp
- khelpclient.cpp
)
set(kxmlgui_UI
@@ -113,7 +112,6 @@
KXMLGUIFactory
KXmlGuiWindow
KUndoActions
- KHelpClient
REQUIRED_HEADERS KXmlGui_HEADERS
)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kxmlgui-4.97.0/src/Messages.sh new/kxmlgui-4.98.0/src/Messages.sh
--- old/kxmlgui-4.97.0/src/Messages.sh 1970-01-01 01:00:00.000000000 +0100
+++ new/kxmlgui-4.98.0/src/Messages.sh 2014-03-28 20:26:01.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.
+$XGETTEXT `find . -name \*.cpp -o -name \*.h -name \*.qml` -o $podir/kxmlgui5.pot
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kxmlgui-4.97.0/src/kcheckaccelerators.h new/kxmlgui-4.98.0/src/kcheckaccelerators.h
--- old/kxmlgui-4.97.0/src/kcheckaccelerators.h 2014-03-01 12:51:50.000000000 +0100
+++ new/kxmlgui-4.98.0/src/kcheckaccelerators.h 2014-03-28 20:26:01.000000000 +0100
@@ -63,7 +63,7 @@
COPY WIDGET TEXT:
You can copy widgets' texts to find them in translation files faster by middle-clicking them.
- Put the following lines in ~/.kde4/share/config/kdeglobals (or in rc file for specific app):
+ Put the following lines in ~/.config/kdeglobals (or in rc file for specific app):
\code
[Development]
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kxmlgui-4.97.0/src/khelpclient.cpp new/kxmlgui-4.98.0/src/khelpclient.cpp
--- old/kxmlgui-4.97.0/src/khelpclient.cpp 2014-03-01 12:51:50.000000000 +0100
+++ new/kxmlgui-4.98.0/src/khelpclient.cpp 1970-01-01 01:00:00.000000000 +0100
@@ -1,78 +0,0 @@
-/* This file is part of the KDE libraries
- * Copyright 2012 David Faure <faure(a)kde.org>
- *
- * This library is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation; either version 2 of the License or ( at
- * your option ) version 3 or, at the discretion of KDE e.V. ( which shall
- * act as a proxy as in section 14 of the GPLv3 ), any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this library; see the file COPYING.LIB. If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- * Boston, MA 02110-1301, USA.
- */
-
-#include "khelpclient.h"
-
-#include "kdesktopfile.h"
-
-#include <QCoreApplication>
-#include <QUrl>
-#include <QDirIterator>
-#include <QUrlQuery>
-#include <QDesktopServices>
-
-void KHelpClient::invokeHelp(const QString &anchor, const QString &_appname)
-{
- QString appname;
- if (_appname.isEmpty()) {
- appname = QCoreApplication::instance()->applicationName();
- } else {
- appname = _appname;
- }
-
- // Look for the .desktop file of the application
-
- // was:
- //KService::Ptr service(KService::serviceByDesktopName(appname));
- //if (service)
- // docPath = service->docPath();
- // but we don't want to depend on KService here.
-
- QString docPath;
- const QStringList desktopDirs = QStandardPaths::standardLocations(QStandardPaths::ApplicationsLocation);
- Q_FOREACH (const QString &dir, desktopDirs) {
- QDirIterator it(dir, QStringList() << appname + QLatin1String(".desktop"), QDir::NoFilter, QDirIterator::Subdirectories);
- while (it.hasNext()) {
- const QString desktopPath(it.next());
- KDesktopFile desktopFile(desktopPath);
- docPath = desktopFile.readDocPath();
- break;
- }
- }
-
- // docPath could be a path or a full URL, I think.
-
- QUrl url;
- if (!docPath.isEmpty()) {
- url = QUrl(QLatin1String("help:/")).resolved(QUrl::fromUserInput(docPath));
- } else {
- url = QUrl(QString::fromLatin1("help:/%1/index.html").arg(appname));
- }
-
- if (!anchor.isEmpty()) {
- QUrlQuery query(url);
- query.addQueryItem(QString::fromLatin1("anchor"), anchor);
- url.setQuery(query);
- }
-
- // launch khelpcenter, or a browser for URIs not handled by khelpcenter
- QDesktopServices::openUrl(url);
-}
-
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kxmlgui-4.97.0/src/khelpclient.h new/kxmlgui-4.98.0/src/khelpclient.h
--- old/kxmlgui-4.97.0/src/khelpclient.h 2014-03-01 12:51:50.000000000 +0100
+++ new/kxmlgui-4.98.0/src/khelpclient.h 1970-01-01 01:00:00.000000000 +0100
@@ -1,47 +0,0 @@
-/* This file is part of the KDE libraries
- * Copyright 2012 David Faure <faure(a)kde.org>
- *
- * This library is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation; either version 2 of the License or ( at
- * your option ) version 3 or, at the discretion of KDE e.V. ( which shall
- * act as a proxy as in section 14 of the GPLv3 ), any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this library; see the file COPYING.LIB. If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- * Boston, MA 02110-1301, USA.
- */
-
-#ifndef KHELPCLIENT_H
-#define KHELPCLIENT_H
-
-#include "kxmlgui_export.h"
-#include <QtCore/QString>
-#include <QtCore/QByteArray>
-
-namespace KHelpClient
-{
-/**
- * Invokes the KHelpCenter HTML help viewer from docbook sources.
- *
- * @param anchor This has to be a defined anchor in your
- * docbook sources. If empty the main index
- * is loaded
- * @param appname This allows you to show the help of another
- * application. If empty the current name() is
- * used
- * @param startup_id for app startup notification, "0" for none,
- * "" ( empty string ) is the default
- * @since 5.0
- */
-KXMLGUI_EXPORT void invokeHelp(const QString &anchor = QString(), const QString &appname = QString());
-}
-
-#endif /* KHELPCLIENT_H */
-
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kxmlgui-4.97.0/src/kmainwindow.cpp new/kxmlgui-4.98.0/src/kmainwindow.cpp
--- old/kxmlgui-4.97.0/src/kmainwindow.cpp 2014-03-01 12:51:50.000000000 +0100
+++ new/kxmlgui-4.98.0/src/kmainwindow.cpp 2014-03-28 20:26:01.000000000 +0100
@@ -618,7 +618,7 @@
return true;
}
-void KMainWindow::applyMainWindowSettings(const KConfigGroup &cg, bool force)
+void KMainWindow::applyMainWindowSettings(const KConfigGroup &cg)
{
K_D(KMainWindow);
//qDebug(200) << "KMainWindow::applyMainWindowSettings " << cg.name();
@@ -670,7 +670,7 @@
group += (toolbar->objectName().isEmpty() ? QString::number(n) : QLatin1Char(' ') + toolbar->objectName());
KConfigGroup toolbarGroup(&cg, group);
- toolbar->applySettings(toolbarGroup, force);
+ toolbar->applySettings(toolbarGroup);
n++;
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kxmlgui-4.97.0/src/kmainwindow.h new/kxmlgui-4.98.0/src/kmainwindow.h
--- old/kxmlgui-4.97.0/src/kmainwindow.h 2014-03-01 12:51:50.000000000 +0100
+++ new/kxmlgui-4.98.0/src/kmainwindow.h 2014-03-28 20:26:01.000000000 +0100
@@ -371,9 +371,10 @@
* groups in the config file and apply them.
*
* @param config Config group to read the settings from.
- * @param forceGlobal see the same argument in KToolBar::applySettings
+ * KF5 porting note: the unused bool argument was removed, make sure to remove it from your
+ * reimplementations too! And add a Q_DECL_OVERRIDE for good measure.
*/
- virtual void applyMainWindowSettings(const KConfigGroup &config, bool forceGlobal = false);
+ virtual void applyMainWindowSettings(const KConfigGroup &config);
/**
* Save settings for statusbar, menubar and toolbar to their respective
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kxmlgui-4.97.0/src/kshortcuteditwidget.cpp new/kxmlgui-4.98.0/src/kshortcuteditwidget.cpp
--- old/kxmlgui-4.97.0/src/kshortcuteditwidget.cpp 2014-03-01 12:51:50.000000000 +0100
+++ new/kxmlgui-4.98.0/src/kshortcuteditwidget.cpp 2014-03-28 20:26:01.000000000 +0100
@@ -81,8 +81,8 @@
this, SLOT(defaultToggled(bool)));
connect(m_customEditor, SIGNAL(keySequenceChanged(QKeySequence)),
this, SLOT(setCustom(QKeySequence)));
- connect(m_customEditor, SIGNAL(stealShortcut(QKeySequence,KAction*)),
- this, SIGNAL(stealShortcut(QKeySequence,KAction*)));
+ connect(m_customEditor, SIGNAL(stealShortcut(QKeySequence,QAction*)),
+ this, SIGNAL(stealShortcut(QKeySequence,QAction*)));
}
KKeySequenceWidget::ShortcutTypes ShortcutEditWidget::checkForConflictsAgainst() const
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kxmlgui-4.97.0/src/kshortcutsdialog.cpp new/kxmlgui-4.98.0/src/kshortcutsdialog.cpp
--- old/kxmlgui-4.97.0/src/kshortcutsdialog.cpp 2014-03-01 12:51:50.000000000 +0100
+++ new/kxmlgui-4.98.0/src/kshortcutsdialog.cpp 2014-03-28 20:26:01.000000000 +0100
@@ -72,7 +72,8 @@
: q(q),
m_keyChooser(0),
m_schemeEditor(0),
- m_detailsButton(0)
+ m_detailsButton(0),
+ m_saveSettings(false)
{
}
@@ -139,6 +140,7 @@
KShortcutsEditor *m_keyChooser; // ### move
KShortcutSchemesEditor *m_schemeEditor;
QPushButton *m_detailsButton;
+ bool m_saveSettings;
};
KShortcutsDialog::KShortcutsDialog(KShortcutsEditor::ActionTypes types, KShortcutsEditor::LetterShortcuts allowLetterShortcuts, QWidget *parent)
@@ -207,10 +209,7 @@
//FIXME should there be a setSaveSettings method?
bool KShortcutsDialog::configure(bool saveSettings)
{
- disconnect(this, SIGNAL(okClicked()), this, SLOT(save()));
- if (saveSettings) {
- connect(this, SIGNAL(okClicked()), this, SLOT(save()));
- }
+ d->m_saveSettings = saveSettings;
if (isModal()) {
int retcode = exec();
return retcode;
@@ -220,6 +219,14 @@
}
}
+void KShortcutsDialog::accept()
+{
+ if (d->m_saveSettings) {
+ d->save();
+ }
+ QDialog::accept();
+}
+
QSize KShortcutsDialog::sizeHint() const
{
return QSize(600, 480);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kxmlgui-4.97.0/src/kshortcutsdialog.h new/kxmlgui-4.98.0/src/kshortcutsdialog.h
--- old/kxmlgui-4.97.0/src/kshortcutsdialog.h 2014-03-01 12:51:50.000000000 +0100
+++ new/kxmlgui-4.98.0/src/kshortcutsdialog.h 2014-03-28 20:26:01.000000000 +0100
@@ -125,6 +125,12 @@
static int configure(KActionCollection *collection, KShortcutsEditor::LetterShortcuts allowLetterShortcuts =
KShortcutsEditor::LetterShortcutsAllowed, QWidget *parent = 0, bool bSaveSettings = true);
+public Q_SLOTS:
+ /**
+ * @reimp
+ */
+ void accept() Q_DECL_OVERRIDE;
+
Q_SIGNALS:
/**
* emitted after ok is clicked and settings are saved
@@ -133,7 +139,6 @@
private:
Q_PRIVATE_SLOT(d, void changeShortcutScheme(const QString &))
- Q_PRIVATE_SLOT(d, void save())
Q_PRIVATE_SLOT(d, void undoChanges())
Q_PRIVATE_SLOT(d, void toggleDetails())
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kxmlgui-4.97.0/src/ktoolbar.cpp new/kxmlgui-4.98.0/src/ktoolbar.cpp
--- old/kxmlgui-4.97.0/src/ktoolbar.cpp 2014-03-01 12:51:50.000000000 +0100
+++ new/kxmlgui-4.98.0/src/ktoolbar.cpp 2014-03-28 20:26:01.000000000 +0100
@@ -146,6 +146,7 @@
static Qt::ToolButtonStyle toolButtonStyleFromString(const QString &style);
static QString toolButtonStyleToString(Qt::ToolButtonStyle);
static Qt::ToolBarArea positionFromString(const QString &position);
+ static Qt::ToolButtonStyle toolButtonStyleSetting();
KToolBar *q;
bool isMainToolBar : 1;
@@ -242,7 +243,6 @@
loadKDESettings();
// also read in our configurable settings (for non-xmlgui toolbars)
- // KDE5: we can probably remove this, if people save settings then they load them too, e.g. using KMainWindow's autosave.
if (readConfig) {
KConfigGroup cg(KSharedConfig::openConfig(), QString());
q->applySettings(cg);
@@ -514,12 +514,19 @@
applyCurrentSettings();
}
+Qt::ToolButtonStyle KToolBar::Private::toolButtonStyleSetting()
+{
+ KConfigGroup group(KSharedConfig::openConfig(), "Toolbar style");
+ const QString fallback = KToolBar::Private::toolButtonStyleToString(Qt::ToolButtonTextBesideIcon);
+ return KToolBar::Private::toolButtonStyleFromString(group.readEntry("ToolButtonStyle", fallback));
+}
+
void KToolBar::Private::loadKDESettings()
{
iconSizeSettings[Level_KDEDefault] = q->iconSizeDefault();
if (isMainToolBar) {
- toolButtonStyleSettings[Level_KDEDefault] = q->toolButtonStyleSetting();
+ toolButtonStyleSettings[Level_KDEDefault] = toolButtonStyleSetting();
} else {
const QString fallBack = toolButtonStyleToString(Qt::ToolButtonTextBesideIcon);
/**
@@ -849,8 +856,6 @@
{
Q_ASSERT(!cg.name().isEmpty());
- cg.deleteEntry("Hidden"); // remove old key to avoid bugs from the compat code in applySettings. KDE5: remove.
-
const int currentIconSize = iconSize().width();
//qDebug() << objectName() << currentIconSize << d->iconSizeSettings.toString() << "defaultValue=" << d->iconSizeSettings.defaultValue();
if (!cg.hasDefault("IconSize") && currentIconSize == d->iconSizeSettings.defaultValue()) {
@@ -908,13 +913,6 @@
QToolBar::contextMenuEvent(event);
}
-Qt::ToolButtonStyle KToolBar::toolButtonStyleSetting()
-{
- KConfigGroup group(KSharedConfig::openConfig(), "Toolbar style");
- const QString fallback = Private::toolButtonStyleToString(Qt::ToolButtonTextBesideIcon);
- return KToolBar::Private::toolButtonStyleFromString(group.readEntry("ToolButtonStyle", fallback));
-}
-
void KToolBar::loadState(const QDomElement &element)
{
QMainWindow *mw = mainWindow();
@@ -1065,22 +1063,9 @@
}
// called by KMainWindow::applyMainWindowSettings to read from the user settings
-void KToolBar::applySettings(const KConfigGroup &cg, bool forceGlobal)
+void KToolBar::applySettings(const KConfigGroup &cg)
{
Q_ASSERT(!cg.name().isEmpty());
- Q_UNUSED(forceGlobal); // KDE5: remove
-
- // a small leftover from kde3: separate bool for hidden/shown. But it's also part of saveMainWindowSettings,
- // it is not really useful anymore, except in the unlikely case where someone would call this by hand.
- // KDE5: remove the block below
- if (cg.hasKey("Hidden")) {
- const bool hidden = cg.readEntry("Hidden", false);
- if (hidden) {
- hide();
- } else {
- show();
- }
- }
if (cg.hasKey("IconSize")) {
d->iconSizeSettings[Level_UserSettings] = cg.readEntry("IconSize", 0);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kxmlgui-4.97.0/src/ktoolbar.h new/kxmlgui-4.98.0/src/ktoolbar.h
--- old/kxmlgui-4.97.0/src/ktoolbar.h 2014-03-01 12:51:50.000000000 +0100
+++ new/kxmlgui-4.98.0/src/ktoolbar.h 2014-03-28 20:26:01.000000000 +0100
@@ -158,12 +158,8 @@
/**
* Read the toolbar settings from group @p configGroup in @p config
* and apply them.
- *
- * @param forceGlobal is deprecated. In kde3 it used to mean
- * "force global settings, i.e. ignore @p cg", but only for visibility/position/index,
- * not for icon size etc. Only visibility is still controlled by this.
*/
- void applySettings(const KConfigGroup &cg, bool forceGlobal = false);
+ void applySettings(const KConfigGroup &cg);
/**
* Sets the XML gui client.
@@ -201,12 +197,6 @@
bool eventFilter(QObject *watched, QEvent *event);
/**
- * Returns the global setting for "Icon Text" for the main toolbar
- * @return global setting for "Icon Text" for the main toolbar
- */
- static Qt::ToolButtonStyle toolButtonStyleSetting(); // KDE5: make private and file-static, nobody is calling this
-
- /**
* Returns whether the toolbars are currently editable (drag & drop of actions).
*/
static bool toolBarsEditable();
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kxmlgui-4.97.0/src/kxmlguiwindow.cpp new/kxmlgui-4.98.0/src/kxmlguiwindow.cpp
--- old/kxmlgui-4.97.0/src/kxmlguiwindow.cpp 2014-03-01 12:51:50.000000000 +0100
+++ new/kxmlgui-4.98.0/src/kxmlguiwindow.cpp 2014-03-28 20:26:01.000000000 +0100
@@ -368,10 +368,10 @@
}
}
-void KXmlGuiWindow::applyMainWindowSettings(const KConfigGroup &config, bool force)
+void KXmlGuiWindow::applyMainWindowSettings(const KConfigGroup &config)
{
K_D(KXmlGuiWindow);
- KMainWindow::applyMainWindowSettings(config, force);
+ KMainWindow::applyMainWindowSettings(config);
QStatusBar *sb = findChild<QStatusBar *>();
if (sb && d->showStatusBarAction) {
d->showStatusBarAction->setChecked(!sb->isHidden());
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kxmlgui-4.97.0/src/kxmlguiwindow.h new/kxmlgui-4.98.0/src/kxmlguiwindow.h
--- old/kxmlgui-4.97.0/src/kxmlguiwindow.h 2014-03-01 12:51:50.000000000 +0100
+++ new/kxmlgui-4.98.0/src/kxmlguiwindow.h 2014-03-28 20:26:01.000000000 +0100
@@ -292,7 +292,7 @@
void finalizeGUI(bool force);
// reimplemented for internal reasons
- virtual void applyMainWindowSettings(const KConfigGroup &config, bool force = false);
+ void applyMainWindowSettings(const KConfigGroup &config) Q_DECL_OVERRIDE;
public Q_SLOTS:
/**
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
[View Less]
1
0
Hello community,
here is the log from the commit of package gnucash for openSUSE:Factory checked in at 2014-04-02 17:22:30
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/gnucash (Old)
and /work/SRC/openSUSE:Factory/.gnucash.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "gnucash"
Changes:
--------
--- /work/SRC/openSUSE:Factory/gnucash/gnucash.changes 2014-03-15 17:36:36.…
[View More]000000000 +0100
+++ /work/SRC/openSUSE:Factory/.gnucash.new/gnucash.changes 2014-04-02 17:22:44.000000000 +0200
@@ -1,0 +2,16 @@
+Mon Mar 31 21:03:12 UTC 2014 - mgorse(a)suse.com
+
+- Update to version 2.6.3:
+ + Fix resizing of columns in budget view.
+ + Fix guile 2 stack overflow errors for large reports.
+ + Fix basis calculation for FIFO or LIFO when less than one lot
+ is sold.
+ + Update Window and Menu item from "Preconfigured-" to "Saved-"
+ Report and add lables to the dialog with help texts.
+ + Aqbanking: SEPA transfer improvements - fix origin labels and
+ add possibility to edit sender's name.
+ + Bugs fixed: bgo#721196, bgo#721654, bgo#723975, bgo#724995,
+ bgo#711567, bgo#726430, bgo#726891.
+ + Updated translations.
+
+-------------------------------------------------------------------
Old:
----
gnucash-2.6.2.tar.bz2
New:
----
gnucash-2.6.3.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ gnucash.spec ++++++
--- /var/tmp/diff_new_pack.iT93e4/_old 2014-04-02 17:22:45.000000000 +0200
+++ /var/tmp/diff_new_pack.iT93e4/_new 2014-04-02 17:22:45.000000000 +0200
@@ -17,13 +17,13 @@
Name: gnucash
-Version: 2.6.2
+Version: 2.6.3
Release: 0
Summary: Personal Finance Manager
License: SUSE-GPL-2.0-with-openssl-exception or SUSE-GPL-3.0-with-openssl-exception
Group: Productivity/Office/Finance
Url: http://www.gnucash.org/
-Source: http://downloads.sourceforge.net/project/gnucash/gnucash%20%28stable%29/2.6…
+Source: http://downloads.sourceforge.net/project/gnucash/gnucash%20%28stable%29/2.6…
Source1: %{name}-rpmlintrc
# PATCH-MISSING-TAG -- See http://wiki.opensuse.org/Packaging/Patches
Patch0: gnucash-cpan-warning.patch
++++++ gnucash-2.6.2.tar.bz2 -> gnucash-2.6.3.tar.bz2 ++++++
/work/SRC/openSUSE:Factory/gnucash/gnucash-2.6.2.tar.bz2 /work/SRC/openSUSE:Factory/.gnucash.new/gnucash-2.6.3.tar.bz2 differ: char 11, line 1
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
[View Less]
1
0
Hello community,
here is the log from the commit of package kwindowsystem for openSUSE:Factory checked in at 2014-04-02 17:22:30
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/kwindowsystem (Old)
and /work/SRC/openSUSE:Factory/.kwindowsystem.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kwindowsystem"
Changes:
--------
--- /work/SRC/openSUSE:Factory/kwindowsystem/…
[View More]kwindowsystem.changes 2014-03-10 12:17:36.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.kwindowsystem.new/kwindowsystem.changes 2014-04-02 17:22:43.000000000 +0200
@@ -1,0 +2,9 @@
+Sat Mar 29 19:47:54 UTC 2014 - hrvoje.senjan(a)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:
----
kwindowsystem-4.97.0.tar.xz
New:
----
kwindowsystem-4.98.0.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kwindowsystem.spec ++++++
--- /var/tmp/diff_new_pack.gWRXCw/_old 2014-04-02 17:22:44.000000000 +0200
+++ /var/tmp/diff_new_pack.gWRXCw/_new 2014-04-02 17:22:44.000000000 +0200
@@ -18,10 +18,10 @@
%define lname libKF5WindowSystem5
Name: kwindowsystem
-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: kf5-filesystem
BuildRequires: pkgconfig(Qt5Test) >= 5.2.0
++++++ kwindowsystem-4.97.0.tar.xz -> kwindowsystem-4.98.0.tar.xz ++++++
++++ 3149 lines of diff (skipped)
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
[View Less]
1
0
Hello community,
here is the log from the commit of package kwidgetsaddons for openSUSE:Factory checked in at 2014-04-02 17:22:29
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/kwidgetsaddons (Old)
and /work/SRC/openSUSE:Factory/.kwidgetsaddons.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kwidgetsaddons"
Changes:
--------
--- /work/SRC/openSUSE:Factory/kwidgetsaddons/…
[View More]kwidgetsaddons.changes 2014-03-10 12:17:34.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.kwidgetsaddons.new/kwidgetsaddons.changes 2014-04-02 17:22:42.000000000 +0200
@@ -1,0 +2,9 @@
+Sat Mar 29 19:47:53 UTC 2014 - hrvoje.senjan(a)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:
----
kwidgetsaddons-4.97.0.tar.xz
New:
----
kwidgetsaddons-4.98.0.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kwidgetsaddons.spec ++++++
--- /var/tmp/diff_new_pack.PQVf86/_old 2014-04-02 17:22:43.000000000 +0200
+++ /var/tmp/diff_new_pack.PQVf86/_new 2014-04-02 17:22:43.000000000 +0200
@@ -18,10 +18,10 @@
%define lname libKF5WidgetsAddons5
Name: kwidgetsaddons
-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: kf5-filesystem
BuildRequires: pkgconfig(Qt5Test) >= 5.2.0
++++++ kwidgetsaddons-4.97.0.tar.xz -> kwidgetsaddons-4.98.0.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwidgetsaddons-4.97.0/CMakeLists.txt new/kwidgetsaddons-4.98.0/CMakeLists.txt
--- old/kwidgetsaddons-4.97.0/CMakeLists.txt 2014-03-01 12:51:46.000000000 +0100
+++ new/kwidgetsaddons-4.98.0/CMakeLists.txt 2014-03-29 08:00:08.000000000 +0100
@@ -2,7 +2,7 @@
project(KWidgetsAddons)
-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})
@@ -18,7 +18,7 @@
include(ECMSetupVersion)
include(ECMGenerateHeaders)
-set(KF5_VERSION "4.97.0")
+set(KF5_VERSION "4.98.0")
ecm_setup_version(${KF5_VERSION} VARIABLE_PREFIX KWIDGETSADDONS
VERSION_HEADER "${CMAKE_CURRENT_BINARY_DIR}/kwidgetsaddons_version.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwidgetsaddons-4.97.0/README.md new/kwidgetsaddons-4.98.0/README.md
--- old/kwidgetsaddons-4.97.0/README.md 2014-03-01 12:51:46.000000000 +0100
+++ new/kwidgetsaddons-4.98.0/README.md 2014-03-29 08:00:08.000000000 +0100
@@ -18,7 +18,7 @@
## Links
-- Home page: <https://projects.kde.org/projects/frameworks/kwidgetsaddon>
+- Home page: <https://projects.kde.org/projects/frameworks/kwidgetsaddons>
- 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/kwidgetsaddons/repository>
Files old/kwidgetsaddons-4.97.0/docs/pics/kled.png and new/kwidgetsaddons-4.98.0/docs/pics/kled.png differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwidgetsaddons-4.97.0/src/Messages.sh new/kwidgetsaddons-4.98.0/src/Messages.sh
--- old/kwidgetsaddons-4.97.0/src/Messages.sh 1970-01-01 01:00:00.000000000 +0100
+++ new/kwidgetsaddons-4.98.0/src/Messages.sh 2014-03-29 08:00:08.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/kwidgetsaddons5.pot
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwidgetsaddons-4.97.0/src/kassistantdialog.cpp new/kwidgetsaddons-4.98.0/src/kassistantdialog.cpp
--- old/kwidgetsaddons-4.97.0/src/kassistantdialog.cpp 2014-03-01 12:51:46.000000000 +0100
+++ new/kwidgetsaddons-4.98.0/src/kassistantdialog.cpp 2014-03-29 08:00:08.000000000 +0100
@@ -188,4 +188,19 @@
return d->appropriate.value(page, true);
}
+QPushButton* KAssistantDialog::backButton() const
+{
+ return d->backButton;
+}
+
+QPushButton* KAssistantDialog::nextButton() const
+{
+ return d->nextButton;
+}
+
+QPushButton* KAssistantDialog::finishButton() const
+{
+ return d->finishButton;
+}
+
#include "moc_kassistantdialog.cpp"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwidgetsaddons-4.97.0/src/kassistantdialog.h new/kwidgetsaddons-4.98.0/src/kassistantdialog.h
--- old/kwidgetsaddons-4.97.0/src/kassistantdialog.h 2014-03-01 12:51:46.000000000 +0100
+++ new/kwidgetsaddons-4.98.0/src/kassistantdialog.h 2014-03-29 08:00:08.000000000 +0100
@@ -26,22 +26,12 @@
/**
* This class provides a framework for assistant dialogs.
*
- * The use of this class is the same as KWizard in KDE3.
- * You should use the word "assistant" instead of "wizard" both in the source
- * and translatable strings.
- *
* An assistant dialog consists of a sequence of pages.
* Its purpose is to guide the user (assist) through a process step by step.
* Assistant dialogs are useful for complex or infrequently occurring tasks
* that people may find difficult to learn or do.
* Sometimes a task requires too many input fields to fit them on a single dialog.
*
- * KAssistantDialog provides page titles and displays Next, Back, Finish, Cancel,
- * and Help push buttons, as appropriate to the current position in the page sequence.
- * The Finish Button has the code KDialog::User1, The Next button is KDialog::User2
- * and the Back button is KDialog::User3.
- * The help button may be hidden using showButton(KDialog::Help, false)
- *
* Create and populate dialog pages that inherit from QWidget and add them
* to the assistant dialog using addPage().
*
@@ -106,6 +96,21 @@
*/
bool isAppropriate(KPageWidgetItem *page) const;
+ /**
+ * @returns the next button
+ */
+ QPushButton* nextButton() const;
+
+ /**
+ * @returns the finish button
+ */
+ QPushButton* backButton() const;
+
+ /**
+ * @returns the finish button
+ */
+ QPushButton* finishButton() const;
+
public Q_SLOTS:
/**
* Called when the user clicks the Back button.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwidgetsaddons-4.97.0/src/kcharselectdata.cpp new/kwidgetsaddons-4.98.0/src/kcharselectdata.cpp
--- old/kwidgetsaddons-4.97.0/src/kcharselectdata.cpp 2014-03-01 12:51:46.000000000 +0100
+++ new/kwidgetsaddons-4.98.0/src/kcharselectdata.cpp 2014-03-29 08:00:08.000000000 +0100
@@ -71,11 +71,6 @@
QByteArray m_dataFile;
};
-inline QString tr(const char *s, const char *c = 0, int n = -1)
-{
- return QCoreApplication::translate("KCharSelectData", s, c, n);
-}
-
static const char JAMO_L_TABLE[][4] = {
"G", "GG", "N", "D", "DD", "R", "M", "B", "BB",
"S", "SS", "", "J", "JJ", "C", "K", "T", "P", "H"
@@ -232,7 +227,11 @@
QStringList list;
quint32 i = stringBegin;
while (i < stringEnd) {
- list.append(tr(data + 1, "KCharSelect section name"));
+ // FIXME: Is the content of data already marked as translatable,
+ // using "KCharSelectData" as context and "KCharSelct section name" as
+ // disambiguation string?
+ // If it is not then QCoreApplication::translate() will return it as is.
+ list.append(QCoreApplication::translate("KCharSelectData", data + 1, "KCharSelect section name"));
i += strlen(data + i) + 1;
}
@@ -276,13 +275,13 @@
return QLatin1String("HANGUL SYLLABLE ") + QLatin1String(JAMO_L_TABLE[LIndex])
+ QLatin1String(JAMO_V_TABLE[VIndex]) + QLatin1String(JAMO_T_TABLE[TIndex]);
} else if (unicode >= 0xD800 && unicode <= 0xDB7F) {
- return tr("<Non Private Use High Surrogate>");
+ return QCoreApplication::translate("KCharSelectData", "<Non Private Use High Surrogate>");
} else if (unicode >= 0xDB80 && unicode <= 0xDBFF) {
- return tr("<Private Use High Surrogate>");
+ return QCoreApplication::translate("KCharSelectData", "<Private Use High Surrogate>");
} else if (unicode >= 0xDC00 && unicode <= 0xDFFF) {
- return tr("<Low Surrogate>");
+ return QCoreApplication::translate("KCharSelectData", "<Low Surrogate>");
} else if (unicode >= 0xE000 && unicode <= 0xF8FF) {
- return tr("<Private Use>");
+ return QCoreApplication::translate("KCharSelectData", "<Private Use>");
}
// else if (unicode >= 0xF0000 && unicode <= 0xFFFFD) // 16 bit!
// return tr("<Plane 15 Private Use>");
@@ -313,7 +312,7 @@
}
if (s.isNull()) {
- return tr("<not assigned>");
+ return QCoreApplication::translate("KCharSelectData", "<not assigned>");
} else {
return s;
}
@@ -382,7 +381,7 @@
currIndex++;
}
- return tr(data + i, "KCharselect unicode block name");
+ return QCoreApplication::translate("KCharSelectData", data + i, "KCharselect unicode block name");
}
QString KCharSelectData::sectionName(int index)
@@ -404,7 +403,7 @@
currIndex++;
}
- return tr(data + i, "KCharselect unicode section name");
+ return QCoreApplication::translate("KCharSelectData", data + i, "KCharselect unicode section name");
}
QStringList KCharSelectData::aliases(const QChar &c)
@@ -649,7 +648,7 @@
bool KCharSelectData::isCombining(const QChar &c)
{
- return section(c) == tr("Combining Diacritical Marks", "KCharSelect section name");
+ return section(c) == QCoreApplication::translate("KCharSelectData", "Combining Diacritical Marks", "KCharSelect section name");
//FIXME: this is an imperfect test. There are many combining characters
// that are outside of this section. See Grapheme_Extend in
// http://www.unicode.org/Public/UNIDATA/DerivedCoreProperties.txt
@@ -658,7 +657,7 @@
QString KCharSelectData::display(const QChar &c, const QFont &font)
{
if (!isDisplayable(c)) {
- return QStringLiteral("<b>") + tr("Non-printable") + QStringLiteral("</b>");
+ return QStringLiteral("<b>") + QCoreApplication::translate("KCharSelectData", "Non-printable") + QStringLiteral("</b>");
} else {
QString s = QStringLiteral("<font size=\"+4\" face=\"") + font.family() + QStringLiteral("\">");
if (isCombining(c)) {
@@ -691,37 +690,37 @@
QString KCharSelectData::categoryText(QChar::Category category)
{
switch (category) {
- case QChar::Other_Control: return tr("Other, Control");
- case QChar::Other_Format: return tr("Other, Format");
- case QChar::Other_NotAssigned: return tr("Other, Not Assigned");
- case QChar::Other_PrivateUse: return tr("Other, Private Use");
- case QChar::Other_Surrogate: return tr("Other, Surrogate");
- case QChar::Letter_Lowercase: return tr("Letter, Lowercase");
- case QChar::Letter_Modifier: return tr("Letter, Modifier");
- case QChar::Letter_Other: return tr("Letter, Other");
- case QChar::Letter_Titlecase: return tr("Letter, Titlecase");
- case QChar::Letter_Uppercase: return tr("Letter, Uppercase");
- case QChar::Mark_SpacingCombining: return tr("Mark, Spacing Combining");
- case QChar::Mark_Enclosing: return tr("Mark, Enclosing");
- case QChar::Mark_NonSpacing: return tr("Mark, Non-Spacing");
- case QChar::Number_DecimalDigit: return tr("Number, Decimal Digit");
- case QChar::Number_Letter: return tr("Number, Letter");
- case QChar::Number_Other: return tr("Number, Other");
- case QChar::Punctuation_Connector: return tr("Punctuation, Connector");
- case QChar::Punctuation_Dash: return tr("Punctuation, Dash");
- case QChar::Punctuation_Close: return tr("Punctuation, Close");
- case QChar::Punctuation_FinalQuote: return tr("Punctuation, Final Quote");
- case QChar::Punctuation_InitialQuote: return tr("Punctuation, Initial Quote");
- case QChar::Punctuation_Other: return tr("Punctuation, Other");
- case QChar::Punctuation_Open: return tr("Punctuation, Open");
- case QChar::Symbol_Currency: return tr("Symbol, Currency");
- case QChar::Symbol_Modifier: return tr("Symbol, Modifier");
- case QChar::Symbol_Math: return tr("Symbol, Math");
- case QChar::Symbol_Other: return tr("Symbol, Other");
- case QChar::Separator_Line: return tr("Separator, Line");
- case QChar::Separator_Paragraph: return tr("Separator, Paragraph");
- case QChar::Separator_Space: return tr("Separator, Space");
- default: return tr("Unknown");
+ case QChar::Other_Control: return QCoreApplication::translate("KCharSelectData", "Other, Control");
+ case QChar::Other_Format: return QCoreApplication::translate("KCharSelectData", "Other, Format");
+ case QChar::Other_NotAssigned: return QCoreApplication::translate("KCharSelectData", "Other, Not Assigned");
+ case QChar::Other_PrivateUse: return QCoreApplication::translate("KCharSelectData", "Other, Private Use");
+ case QChar::Other_Surrogate: return QCoreApplication::translate("KCharSelectData", "Other, Surrogate");
+ case QChar::Letter_Lowercase: return QCoreApplication::translate("KCharSelectData", "Letter, Lowercase");
+ case QChar::Letter_Modifier: return QCoreApplication::translate("KCharSelectData", "Letter, Modifier");
+ case QChar::Letter_Other: return QCoreApplication::translate("KCharSelectData", "Letter, Other");
+ case QChar::Letter_Titlecase: return QCoreApplication::translate("KCharSelectData", "Letter, Titlecase");
+ case QChar::Letter_Uppercase: return QCoreApplication::translate("KCharSelectData", "Letter, Uppercase");
+ case QChar::Mark_SpacingCombining: return QCoreApplication::translate("KCharSelectData", "Mark, Spacing Combining");
+ case QChar::Mark_Enclosing: return QCoreApplication::translate("KCharSelectData", "Mark, Enclosing");
+ case QChar::Mark_NonSpacing: return QCoreApplication::translate("KCharSelectData", "Mark, Non-Spacing");
+ case QChar::Number_DecimalDigit: return QCoreApplication::translate("KCharSelectData", "Number, Decimal Digit");
+ case QChar::Number_Letter: return QCoreApplication::translate("KCharSelectData", "Number, Letter");
+ case QChar::Number_Other: return QCoreApplication::translate("KCharSelectData", "Number, Other");
+ case QChar::Punctuation_Connector: return QCoreApplication::translate("KCharSelectData", "Punctuation, Connector");
+ case QChar::Punctuation_Dash: return QCoreApplication::translate("KCharSelectData", "Punctuation, Dash");
+ case QChar::Punctuation_Close: return QCoreApplication::translate("KCharSelectData", "Punctuation, Close");
+ case QChar::Punctuation_FinalQuote: return QCoreApplication::translate("KCharSelectData", "Punctuation, Final Quote");
+ case QChar::Punctuation_InitialQuote: return QCoreApplication::translate("KCharSelectData", "Punctuation, Initial Quote");
+ case QChar::Punctuation_Other: return QCoreApplication::translate("KCharSelectData", "Punctuation, Other");
+ case QChar::Punctuation_Open: return QCoreApplication::translate("KCharSelectData", "Punctuation, Open");
+ case QChar::Symbol_Currency: return QCoreApplication::translate("KCharSelectData", "Symbol, Currency");
+ case QChar::Symbol_Modifier: return QCoreApplication::translate("KCharSelectData", "Symbol, Modifier");
+ case QChar::Symbol_Math: return QCoreApplication::translate("KCharSelectData", "Symbol, Math");
+ case QChar::Symbol_Other: return QCoreApplication::translate("KCharSelectData", "Symbol, Other");
+ case QChar::Separator_Line: return QCoreApplication::translate("KCharSelectData", "Separator, Line");
+ case QChar::Separator_Paragraph: return QCoreApplication::translate("KCharSelectData", "Separator, Paragraph");
+ case QChar::Separator_Space: return QCoreApplication::translate("KCharSelectData", "Separator, Space");
+ default: return QCoreApplication::translate("KCharSelectData", "Unknown");
}
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwidgetsaddons-4.97.0/src/kcolorcombo.cpp new/kwidgetsaddons-4.98.0/src/kcolorcombo.cpp
--- old/kwidgetsaddons-4.97.0/src/kcolorcombo.cpp 2014-03-01 12:51:46.000000000 +0100
+++ new/kwidgetsaddons-4.98.0/src/kcolorcombo.cpp 2014-03-29 08:00:08.000000000 +0100
@@ -336,7 +336,7 @@
void KColorComboPrivate::addColors()
{
- q->addItem(q->tr("Custom...", "Custom color"));
+ q->addItem(KColorCombo::tr("Custom...", "Custom color"));
if (colorList.isEmpty()) {
for (int i = 0; i < STANDARD_PALETTE_SIZE; ++i) {
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwidgetsaddons-4.97.0/src/kdatecombobox.cpp new/kwidgetsaddons-4.98.0/src/kdatecombobox.cpp
--- old/kwidgetsaddons-4.97.0/src/kdatecombobox.cpp 2014-03-01 12:51:46.000000000 +0100
+++ new/kwidgetsaddons-4.98.0/src/kdatecombobox.cpp 2014-03-29 08:00:08.000000000 +0100
@@ -161,17 +161,18 @@
if ((m_options & KDateComboBox::DateKeywords) == KDateComboBox::DateKeywords) {
if (m_dateMap.isEmpty()) {
- addMenuAction(q->tr("Next Year", "@option next year"), m_date.addYears(1));
- addMenuAction(q->tr("Next Month", "@option next month"), m_date.addMonths(1));
- addMenuAction(q->tr("Next Week", "@option next week"), m_date.addDays(7));
- addMenuAction(q->tr("Tomorrow", "@option tomorrow"), m_date.addDays(1));
- addMenuAction(q->tr("Today", "@option today"), m_date);
- addMenuAction(q->tr("Yesterday", "@option yesterday"), m_date.addDays(-1));
- addMenuAction(q->tr("Last Week", "@option last week"), m_date.addDays(-7));
- addMenuAction(q->tr("Last Month", "@option last month"), m_date.addMonths(-1));
- addMenuAction(q->tr("Last Year", "@option last year"), m_date.addYears(-1));
+ addMenuAction(KDateComboBox::tr("Next Year", "@option next year"), m_date.addYears(1));
+ addMenuAction(KDateComboBox::tr("Next Month", "@option next month"), m_date.addMonths(1));
+ addMenuAction(KDateComboBox::tr("Next Week", "@option next week"), m_date.addDays(7));
+ addMenuAction(KDateComboBox::tr("Tomorrow", "@option tomorrow"), m_date.addDays(1));
+ addMenuAction(KDateComboBox::tr("Today", "@option today"), m_date);
+ addMenuAction(KDateComboBox::tr("Yesterday", "@option yesterday"), m_date.addDays(-1));
+ addMenuAction(KDateComboBox::tr("Last Week", "@option last week"), m_date.addDays(-7));
+ addMenuAction(KDateComboBox::tr("Last Month", "@option last month"), m_date.addMonths(-1));
+ addMenuAction(KDateComboBox::tr("Last Year", "@option last year"), m_date.addYears(-1));
m_dateMenu->addSeparator();
- addMenuAction(q->tr("No Date", "@option do not specify a date"), QDate());
+ addMenuAction(KDateComboBox::tr("No Date", "@option do not specify a date"), QDate());
+
} else {
QMapIterator<QDate, QString> i(m_dateMap);
while (i.hasNext()) {
@@ -268,17 +269,17 @@
(m_options & KDateComboBox::WarnOnInvalid) == KDateComboBox::WarnOnInvalid) {
QString warnMsg;
if (!m_date.isValid()) {
- warnMsg = q->tr("The date you entered is invalid", "@info");
+ warnMsg = KDateComboBox::tr("The date you entered is invalid", "@info");
} else if (m_minDate.isValid() && m_date < m_minDate) {
if (m_minWarnMsg.isEmpty()) {
- warnMsg = q->tr("Date cannot be earlier than %1", "@info").arg(formatDate(m_minDate));
+ warnMsg = KDateComboBox::tr("Date cannot be earlier than %1", "@info").arg(formatDate(m_minDate));
} else {
warnMsg = m_minWarnMsg;
warnMsg.replace(QStringLiteral("%1"), formatDate(m_minDate));
}
} else if (m_maxDate.isValid() && m_date > m_maxDate) {
if (m_maxWarnMsg.isEmpty()) {
- warnMsg = q->tr("Date cannot be later than %1", "@info").arg(formatDate(m_maxDate));
+ warnMsg = KDateComboBox::tr("Date cannot be later than %1", "@info").arg(formatDate(m_maxDate));
} else {
warnMsg = m_maxWarnMsg;
warnMsg.replace(QStringLiteral("%1"), formatDate(m_maxDate));
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwidgetsaddons-4.97.0/src/kdatetimeedit.cpp new/kwidgetsaddons-4.98.0/src/kdatetimeedit.cpp
--- old/kwidgetsaddons-4.97.0/src/kdatetimeedit.cpp 2014-03-01 12:51:46.000000000 +0100
+++ new/kwidgetsaddons-4.98.0/src/kdatetimeedit.cpp 2014-03-29 08:00:08.000000000 +0100
@@ -186,8 +186,8 @@
{
ui.m_timeZoneCombo->blockSignals(true);
ui.m_timeZoneCombo->clear();
- ui.m_timeZoneCombo->addItem(q->tr("UTC", "UTC time zone"), QByteArray("UTC"));
- ui.m_timeZoneCombo->addItem(q->tr("Floating", "No specific time zone"), QByteArray());
+ ui.m_timeZoneCombo->addItem(KDateTimeEdit::tr("UTC", "UTC time zone"), QByteArray("UTC"));
+ ui.m_timeZoneCombo->addItem(KDateTimeEdit::tr("Floating", "No specific time zone"), QByteArray());
foreach (const QTimeZone &zone, m_zones) {
ui.m_timeZoneCombo->addItem(QString::fromUtf8(zone.id()), zone.id());
}
@@ -227,7 +227,7 @@
if (m_minWarnMsg.isEmpty()) {
//TODO Add datetime to string
//warnMsg = q->tr("Date and time cannot be earlier than %1", "@info").arg(formatDate(m_minDate));
- warnMsg = q->tr("The entered date and time is before the minimum allowed date and time.", "@info");
+ warnMsg = KDateTimeEdit::tr("The entered date and time is before the minimum allowed date and time.", "@info");
} else {
warnMsg = m_minWarnMsg;
//TODO localize properly
@@ -237,7 +237,7 @@
if (m_maxWarnMsg.isEmpty()) {
//TODO Add datetime to string
//warnMsg = q->tr("Date cannot be later than %1", "@info").arg(formatDate(m_maxDate));
- warnMsg = q->tr("The entered date and time is after the maximum allowed date and time.", "@info");
+ warnMsg = KDateTimeEdit::tr("The entered date and time is after the maximum allowed date and time.", "@info");
} else {
warnMsg = m_maxWarnMsg;
warnMsg.replace(QStringLiteral("%1"), q->locale().toString(m_maxDateTime));
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwidgetsaddons-4.97.0/src/kfontchooser.cpp new/kwidgetsaddons-4.98.0/src/kfontchooser.cpp
--- old/kwidgetsaddons-4.97.0/src/kfontchooser.cpp 2014-03-01 12:51:46.000000000 +0100
+++ new/kwidgetsaddons-4.98.0/src/kfontchooser.cpp 2014-03-29 08:00:08.000000000 +0100
@@ -156,7 +156,7 @@
d(new KFontChooser::Private(this))
{
d->usingFixed = flags & FixedFontsOnly;
- setWhatsThis(tr("Here you can choose the font to be used.", "@info:whatsthis"));
+ setWhatsThis(KFontChooser::tr("Here you can choose the font to be used.", "@info:whatsthis"));
// The top layout is divided vertically into a splitter with font
// attribute widgets and preview on the top, and XLFD data at the bottom.
@@ -178,7 +178,7 @@
QGridLayout *gridLayout;
int row = 0;
if (flags & DisplayFrame) {
- page = new QGroupBox(tr("Requested Font"), this);
+ page = new QGroupBox(KFontChooser::tr("Requested Font"), this);
splitter->addWidget(page);
gridLayout = new QGridLayout(page);
row = 1;
@@ -195,32 +195,32 @@
QHBoxLayout *familyLayout = new QHBoxLayout();
familyLayout->addSpacing(checkBoxGap);
if (flags & ShowDifferences) {
- d->familyCheckbox = new QCheckBox(tr("Font", "@option:check"), page);
+ d->familyCheckbox = new QCheckBox(KFontChooser::tr("Font", "@option:check"), page);
connect(d->familyCheckbox, SIGNAL(toggled(bool)),
this, SLOT(_k_toggled_checkbox()));
familyLayout->addWidget(d->familyCheckbox, 0, Qt::AlignLeft);
- d->familyCheckbox->setWhatsThis(tr("Enable this checkbox to change the font family settings.", "@info:whatsthis"));
- d->familyCheckbox->setToolTip(tr("Change font family?", "@info:tooltip"));
+ d->familyCheckbox->setWhatsThis(KFontChooser::tr("Enable this checkbox to change the font family settings.", "@info:whatsthis"));
+ d->familyCheckbox->setToolTip(KFontChooser::tr("Change font family?", "@info:tooltip"));
d->familyLabel = 0;
} else {
d->familyCheckbox = 0;
- d->familyLabel = new QLabel(tr("Font:", "@label"), page);
+ d->familyLabel = new QLabel(KFontChooser::tr("Font:", "@label"), page);
familyLayout->addWidget(d->familyLabel, 1, Qt::AlignLeft);
}
gridLayout->addLayout(familyLayout, row, 0);
QHBoxLayout *styleLayout = new QHBoxLayout();
if (flags & ShowDifferences) {
- d->styleCheckbox = new QCheckBox(tr("Font style", "@option:check"), page);
+ d->styleCheckbox = new QCheckBox(KFontChooser::tr("Font style", "@option:check"), page);
connect(d->styleCheckbox, SIGNAL(toggled(bool)),
this, SLOT(_k_toggled_checkbox()));
styleLayout->addWidget(d->styleCheckbox, 0, Qt::AlignLeft);
- d->styleCheckbox->setWhatsThis(tr("Enable this checkbox to change the font style settings.", "@info:whatsthis"));
- d->styleCheckbox->setToolTip(tr("Change font style?", "@info:tooltip"));
+ d->styleCheckbox->setWhatsThis(KFontChooser::tr("Enable this checkbox to change the font style settings.", "@info:whatsthis"));
+ d->styleCheckbox->setToolTip(KFontChooser::tr("Change font style?", "@info:tooltip"));
d->styleLabel = 0;
} else {
d->styleCheckbox = 0;
- d->styleLabel = new QLabel(tr("Font style:"), page);
+ d->styleLabel = new QLabel(KFontChooser::tr("Font style:"), page);
styleLayout->addWidget(d->styleLabel, 1, Qt::AlignLeft);
}
styleLayout->addSpacing(checkBoxGap);
@@ -228,16 +228,16 @@
QHBoxLayout *sizeLayout = new QHBoxLayout();
if (flags & ShowDifferences) {
- d->sizeCheckbox = new QCheckBox(tr("Size", "@option:check"), page);
+ d->sizeCheckbox = new QCheckBox(KFontChooser::tr("Size", "@option:check"), page);
connect(d->sizeCheckbox, SIGNAL(toggled(bool)),
this, SLOT(_k_toggled_checkbox()));
sizeLayout->addWidget(d->sizeCheckbox, 0, Qt::AlignLeft);
- d->sizeCheckbox->setWhatsThis(tr("Enable this checkbox to change the font size settings.", "@info:whatsthis"));
- d->sizeCheckbox->setToolTip(tr("Change font size?", "@info:tooltip"));
+ d->sizeCheckbox->setWhatsThis(KFontChooser::tr("Enable this checkbox to change the font size settings.", "@info:whatsthis"));
+ d->sizeCheckbox->setToolTip(KFontChooser::tr("Change font size?", "@info:tooltip"));
d->sizeLabel = 0;
} else {
d->sizeCheckbox = 0;
- d->sizeLabel = new QLabel(tr("Size:", "@label:listbox Font size"), page);
+ d->sizeLabel = new QLabel(KFontChooser::tr("Size:", "@label:listbox Font size"), page);
sizeLayout->addWidget(d->sizeLabel, 1, Qt::AlignLeft);
}
sizeLayout->addSpacing(checkBoxGap);
@@ -253,7 +253,7 @@
d->familyListBox->setEnabled(flags ^ ShowDifferences);
gridLayout->addWidget(d->familyListBox, row, 0);
QString fontFamilyWhatsThisText(
- tr("Here you can choose the font family to be used.", "@info:whatsthis"));
+ KFontChooser::tr("Here you can choose the font family to be used.", "@info:whatsthis"));
d->familyListBox->setWhatsThis(fontFamilyWhatsThisText);
if (flags & ShowDifferences) {
@@ -277,7 +277,7 @@
d->styleListBox = new QListWidget(page);
d->styleListBox->setEnabled(flags ^ ShowDifferences);
gridLayout->addWidget(d->styleListBox, row, 1);
- d->styleListBox->setWhatsThis(tr("Here you can choose the font style to be used.", "@info:whatsthis"));
+ d->styleListBox->setWhatsThis(KFontChooser::tr("Here you can choose the font style to be used.", "@info:whatsthis"));
if (flags & ShowDifferences) {
((QWidget *)d->styleCheckbox)->setWhatsThis(fontFamilyWhatsThisText);
} else {
@@ -285,11 +285,11 @@
}
// Populate usual styles, to determine minimum list width;
// will be replaced later with correct styles.
- d->styleListBox->addItem(TR_NOX("Normal", "QFontDatabase"));
- d->styleListBox->addItem(tr("Italic", "@item font"));
- d->styleListBox->addItem(tr("Oblique", "@item font"));
- d->styleListBox->addItem(tr("Bold", "@item font"));
- d->styleListBox->addItem(tr("Bold Italic", "@item font"));
+ d->styleListBox->addItem(KFontChooser::tr("Normal", "QFontDatabase"));
+ d->styleListBox->addItem(KFontChooser::tr("Italic", "@item font"));
+ d->styleListBox->addItem(KFontChooser::tr("Oblique", "@item font"));
+ d->styleListBox->addItem(KFontChooser::tr("Bold", "@item font"));
+ d->styleListBox->addItem(KFontChooser::tr("Bold Italic", "@item font"));
d->styleListBox->setMinimumWidth(minimumListWidth(d->styleListBox));
d->styleListBox->setMinimumHeight(
minimumListHeight(d->styleListBox, visibleListSize));
@@ -308,11 +308,11 @@
d->sizeOfFont->setEnabled(flags ^ ShowDifferences);
if (sizeIsRelativeState) {
QString sizeIsRelativeCBText =
- tr("Relative", "@item font size");
+ KFontChooser::tr("Relative", "@item font size");
QString sizeIsRelativeCBToolTipText =
- tr("Font size<br /><i>fixed</i> or <i>relative</i><br />to environment");
+ KFontChooser::tr("Font size<br /><i>fixed</i> or <i>relative</i><br />to environment");
QString sizeIsRelativeCBWhatsThisText =
- tr("Here you can switch between fixed font size and font size "
+ KFontChooser::tr("Here you can switch between fixed font size and font size "
"to be calculated dynamically and adjusted to changing "
"environment (e.g. widget dimensions, paper size).");
d->sizeIsRelativeCheckBox = new QCheckBox(sizeIsRelativeCBText,
@@ -336,7 +336,7 @@
sizeLayout2->addWidget(d->sizeListBox, 1, 0);
}
QString fontSizeWhatsThisText =
- tr("Here you can choose the font size to be used.");
+ KFontChooser::tr("Here you can choose the font size to be used.");
d->sizeListBox->setWhatsThis(fontSizeWhatsThisText);
if (flags & ShowDifferences) {
@@ -374,10 +374,10 @@
// Replace it with a sample text in your language, such that it is
// representative of language's writing system.
// If you wish, you can input several lines of text separated by \n.
- setSampleText(tr("The Quick Brown Fox Jumps Over The Lazy Dog"));
+ setSampleText(KFontChooser::tr("The Quick Brown Fox Jumps Over The Lazy Dog"));
d->sampleEdit->setTextCursor(QTextCursor(d->sampleEdit->document()));
QString sampleEditWhatsThisText =
- tr("This sample text illustrates the current settings. "
+ KFontChooser::tr("This sample text illustrates the current settings. "
"You may edit it to test special characters.");
d->sampleEdit->setWhatsThis(sampleEditWhatsThisText);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwidgetsaddons-4.97.0/src/kled.cpp new/kwidgetsaddons-4.98.0/src/kled.cpp
--- old/kwidgetsaddons-4.97.0/src/kled.cpp 2014-03-01 12:51:46.000000000 +0100
+++ new/kwidgetsaddons-4.98.0/src/kled.cpp 2014-03-29 08:00:08.000000000 +0100
@@ -41,8 +41,6 @@
Shape shape;
QPixmap cachedPixmap[2]; // for both states
- QStyle::ControlElement ce_indicatorLedCircular;
- QStyle::ControlElement ce_indicatorLedRectangular;
};
KLed::KLed(QWidget *parent)
@@ -76,84 +74,6 @@
delete d;
}
-void KLed::paintEvent(QPaintEvent *)
-{
- switch (d->shape) {
- case Rectangular:
- switch (d->look) {
- case Sunken:
- paintRectFrame(false);
- break;
- case Raised:
- paintRectFrame(true);
- break;
- case Flat:
- paintRect();
- break;
- }
- break;
- case Circular:
- switch (d->look) {
- case Flat:
- paintFlat();
- break;
- case Raised:
- paintRaised();
- break;
- case Sunken:
- paintSunken();
- break;
- }
- break;
- }
-}
-
-int KLed::ledWidth() const
-{
- // Make sure the LED is round!
- int size = qMin(width(), height());
-
- // leave one pixel border
- size -= 2;
-
- return qMax(0, size);
-}
-
-bool KLed::paintCachedPixmap()
-{
- if (d->cachedPixmap[d->state].isNull()) {
- return false;
- }
- QPainter painter(this);
- painter.drawPixmap(1, 1, d->cachedPixmap[d->state]);
- return true;
-}
-
-void KLed::paintFlat()
-{
- paintLed(Circular, Flat);
-}
-
-void KLed::paintRaised()
-{
- paintLed(Circular, Raised);
-}
-
-void KLed::paintSunken()
-{
- paintLed(Circular, Sunken);
-}
-
-void KLed::paintRect()
-{
- paintLed(Rectangular, Flat);
-}
-
-void KLed::paintRectFrame(bool raised)
-{
- paintLed(Rectangular, raised ? Raised : Sunken);
-}
-
KLed::State KLed::state() const
{
return d->state;
@@ -270,16 +190,19 @@
update();
}
-void KLed::paintLed(Shape shape, Look look)
+void KLed::paintEvent(QPaintEvent *)
{
- if (paintCachedPixmap()) {
+ if (!d->cachedPixmap[d->state].isNull()) {
+ QPainter painter(this);
+ painter.drawPixmap(1, 1, d->cachedPixmap[d->state]);
return;
}
QSize size(width() - 2, height() - 2);
- if (shape == Circular) {
- const int width = ledWidth();
- size = QSize(width, width);
+ if (d->shape == Circular) {
+ // Make sure the LED is round
+ const int dim = qMin(width(), height()) - 2;
+ size = QSize(dim, dim);
}
QPointF center(size.width() / 2.0, size.height() / 2.0);
const int smallestSize = qMin(size.width(), size.height());
@@ -294,7 +217,7 @@
fillGradient.setColorAt(0.5, fillColor.light(130));
fillGradient.setColorAt(1.0, fillColor);
- QConicalGradient borderGradient(center, look == Sunken ? 90 : -90);
+ QConicalGradient borderGradient(center, d->look == Sunken ? 90 : -90);
QColor borderColor = palette().color(QPalette::Dark);
if (d->state == On) {
QColor glowOverlay = fillColor;
@@ -319,12 +242,12 @@
painter.begin(&image);
painter.setRenderHint(QPainter::Antialiasing);
- painter.setBrush(look == Flat ? QBrush(fillColor) : QBrush(fillGradient));
- const QBrush penBrush = (look == Flat) ? QBrush(borderColor) : QBrush(borderGradient);
+ painter.setBrush(d->look == Flat ? QBrush(fillColor) : QBrush(fillGradient));
+ const QBrush penBrush = (d->look == Flat) ? QBrush(borderColor) : QBrush(borderGradient);
const qreal penWidth = smallestSize / 8.0;
painter.setPen(QPen(penBrush, penWidth));
QRectF r(penWidth / 2.0, penWidth / 2.0, size.width() - penWidth, size.height() - penWidth);
- if (shape == Rectangular) {
+ if (d->shape == Rectangular) {
painter.drawRect(r);
} else {
painter.drawEllipse(r);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwidgetsaddons-4.97.0/src/kled.h new/kwidgetsaddons-4.98.0/src/kled.h
--- old/kwidgetsaddons-4.97.0/src/kled.h 2014-03-01 12:51:46.000000000 +0100
+++ new/kwidgetsaddons-4.98.0/src/kled.h 2014-03-29 08:00:08.000000000 +0100
@@ -261,57 +261,15 @@
void off();
protected:
- /**
- * Returns the width of the led.
- */
- virtual int ledWidth() const;
-
- /**
- * Paints a circular, flat LED.
- */
- virtual void paintFlat();
-
- /**
- * Paints a circular, raised LED.
- */
- virtual void paintRaised();
-
- /**
- * Paints a circular, sunken LED.
- */
- virtual void paintSunken();
-
- /**
- * Paints a rectangular, flat LED.
- */
- virtual void paintRect();
-
- /**
- * Paints a rectangular LED, either raised or
- * sunken, depending on its argument.
- */
- virtual void paintRectFrame(bool raised);
-
void paintEvent(QPaintEvent *);
void resizeEvent(QResizeEvent *);
/**
- * Paint the cached antialiased pixmap corresponding to the state if any
- * @return true if the pixmap was painted, false if it hasn't been created yet
- */
- bool paintCachedPixmap();
-
- /**
* @internal
* invalidates caches after property changes and calls update()
*/
void updateCachedPixmap();
- /**
- * @internal
- */
- void paintLed(Shape shape, Look look);
-
private:
class Private;
Private *const d;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwidgetsaddons-4.97.0/src/kmessagebox.h new/kwidgetsaddons-4.98.0/src/kmessagebox.h
--- old/kwidgetsaddons-4.97.0/src/kmessagebox.h 2014-03-01 12:51:46.000000000 +0100
+++ new/kwidgetsaddons-4.98.0/src/kmessagebox.h 2014-03-29 08:00:08.000000000 +0100
@@ -48,19 +48,6 @@
* be plaintext or richtext. If the text is plaintext, a newline-character
* may be used to indicate the end of a paragraph.
*
- * @port4 Where applicable, the functions now take an additional
- * argument to specify the cancel button. Since a default argument is
- * provided, this will affect your code only, if you specified
- * dontAskAgainName and/or options. In those cases, adding an additional
- * parameter KStandardGuiItem::cancel() leads to the old behavior. The
- * following functions are affected (omitting function arguments in the
- * list): questionYesNoCancel(), questionYesNoCancelWId(),
- * warningContinueCancel(), warningContinueCancelWId(),
- * warningContinueCancelList(), warningContinueCancelListWId(),
- * warningYesNoCancel(), warningYesNoCancelWId(),
- * warningYesNoCancelList(), warningYesNoCancelListWId(), messageBox(),
- * messageBoxWId().
- *
* \image html kmessagebox.png "KDE Message Box (using questionYesNo())"
*
* @author Waldo Bastian (bastian(a)kde.org)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwidgetsaddons-4.97.0/src/kmessagewidget.cpp new/kwidgetsaddons-4.98.0/src/kmessagewidget.cpp
--- old/kwidgetsaddons-4.97.0/src/kmessagewidget.cpp 2014-03-01 12:51:46.000000000 +0100
+++ new/kwidgetsaddons-4.98.0/src/kmessagewidget.cpp 2014-03-29 08:00:08.000000000 +0100
@@ -87,8 +87,8 @@
QObject::connect(textLabel, SIGNAL(linkHovered(QString)), q, SIGNAL(linkHovered(QString)));
QAction *closeAction = new QAction(q);
- closeAction->setText(q->tr("&Close"));
- closeAction->setToolTip(q->tr("Close message"));
+ closeAction->setText(KMessageWidget::tr("&Close"));
+ closeAction->setToolTip(KMessageWidget::tr("Close message"));
closeAction->setIcon(q->style()->standardIcon(QStyle::SP_DialogCloseButton));
QObject::connect(closeAction, SIGNAL(triggered(bool)), q, SLOT(animatedHide()));
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwidgetsaddons-4.97.0/src/knewpassworddialog.cpp new/kwidgetsaddons-4.98.0/src/knewpassworddialog.cpp
--- old/kwidgetsaddons-4.97.0/src/knewpassworddialog.cpp 2014-03-01 12:51:46.000000000 +0100
+++ new/kwidgetsaddons-4.98.0/src/knewpassworddialog.cpp 2014-03-29 08:00:08.000000000 +0100
@@ -158,7 +158,7 @@
} else {
if (ui.linePassword->text().length() < minPasswordLength) {
ui.labelMatch->setPixmap(QIcon::fromTheme(QStringLiteral("dialog-error")));
- ui.labelMatch->setText(tr("Password must be at least %1 character(s) long").arg(minimumPasswordLength));
+ ui.labelMatch->setText(tr("Password must be at least %n character(s) long", "", minimumPasswordLength));
} else {
ui.labelMatch->setPixmap(match ? QIcon::fromTheme(QStringLiteral("dialog-ok")) : QIcon::fromTheme(QStringLiteral("dialog-error")));
ui.labelMatch->setText(match ? tr("Passwords match")
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwidgetsaddons-4.97.0/src/kpassworddialog.cpp new/kwidgetsaddons-4.98.0/src/kpassworddialog.cpp
--- old/kwidgetsaddons-4.97.0/src/kpassworddialog.cpp 2014-03-01 12:51:46.000000000 +0100
+++ new/kwidgetsaddons-4.98.0/src/kpassworddialog.cpp 2014-03-29 08:00:08.000000000 +0100
@@ -401,4 +401,9 @@
return true;
}
+QDialogButtonBox *KPasswordDialog::buttonBox() const
+{
+ return d->ui.buttonBox;
+}
+
#include "moc_kpassworddialog.cpp"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwidgetsaddons-4.97.0/src/kpassworddialog.h new/kwidgetsaddons-4.98.0/src/kpassworddialog.h
--- old/kwidgetsaddons-4.97.0/src/kpassworddialog.h 2014-03-01 12:51:46.000000000 +0100
+++ new/kwidgetsaddons-4.98.0/src/kpassworddialog.h 2014-03-29 08:00:08.000000000 +0100
@@ -267,6 +267,16 @@
*/
void accept();
+ /**
+ * Returns the button box used in the dialog.
+ * This can be used to add new buttons.
+ *
+ * @return the button box
+ *
+ * @since 5.0
+ */
+ QDialogButtonBox *buttonBox() const;
+
Q_SIGNALS:
/**
* emitted when the dialog has been accepted
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwidgetsaddons-4.97.0/src/kpopupframe.cpp new/kwidgetsaddons-4.98.0/src/kpopupframe.cpp
--- old/kwidgetsaddons-4.97.0/src/kpopupframe.cpp 2014-03-01 12:51:46.000000000 +0100
+++ new/kwidgetsaddons-4.98.0/src/kpopupframe.cpp 2014-03-29 08:00:08.000000000 +0100
@@ -115,6 +115,11 @@
}
}
+void KPopupFrame::hideEvent(QHideEvent *e)
+{
+ QFrame::hideEvent(e);
+}
+
void KPopupFrame::close(int r)
{
d->result = r;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwidgetsaddons-4.97.0/src/kpopupframe.h new/kwidgetsaddons-4.98.0/src/kpopupframe.h
--- old/kwidgetsaddons-4.97.0/src/kpopupframe.h 2014-03-01 12:51:46.000000000 +0100
+++ new/kwidgetsaddons-4.98.0/src/kpopupframe.h 2014-03-29 08:00:08.000000000 +0100
@@ -39,6 +39,11 @@
*/
virtual void keyPressEvent(QKeyEvent *e);
+ /**
+ * Catch hide events.
+ */
+ virtual void hideEvent(QHideEvent *e);
+
public Q_SLOTS:
/**
* Close the popup window. This is called from the main widget, usually.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwidgetsaddons-4.97.0/src/kselectaction.h new/kwidgetsaddons-4.98.0/src/kselectaction.h
--- old/kwidgetsaddons-4.97.0/src/kselectaction.h 2014-03-01 12:51:46.000000000 +0100
+++ new/kwidgetsaddons-4.98.0/src/kselectaction.h 2014-03-29 08:00:08.000000000 +0100
@@ -296,12 +296,19 @@
void setMaxComboViewCount(int n);
/**
- * Clears up all the items in this action.
- * \warning The actions will be deleted for backwards compatibility with KDE3.
- * If you just want to remove all actions, use removeAllActions()
+ * Remove and delete all the items in this action.
+ *
+ * @see removeAllActions()
*/
void clear();
+ /**
+ * Remove all the items in this action.
+ *
+ * Unlike clear(), this will not delete the actions.
+ *
+ * @see clear()
+ */
void removeAllActions();
/**
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwidgetsaddons-4.97.0/src/ktimecombobox.cpp new/kwidgetsaddons-4.98.0/src/ktimecombobox.cpp
--- old/kwidgetsaddons-4.97.0/src/ktimecombobox.cpp 2014-03-01 12:51:46.000000000 +0100
+++ new/kwidgetsaddons-4.98.0/src/ktimecombobox.cpp 2014-03-29 08:00:08.000000000 +0100
@@ -249,17 +249,17 @@
(m_options & KTimeComboBox::WarnOnInvalid) == KTimeComboBox::WarnOnInvalid) {
QString warnMsg;
if (!m_time.isValid()) {
- warnMsg = q->tr("The time you entered is invalid", "@info");
+ warnMsg = KTimeComboBox::tr("The time you entered is invalid", "@info");
} else if (m_time < m_minTime) {
if (m_minWarnMsg.isEmpty()) {
- warnMsg = q->tr("Time cannot be earlier than %1", "@info").arg(formatTime(m_minTime));
+ warnMsg = KTimeComboBox::tr("Time cannot be earlier than %1", "@info").arg(formatTime(m_minTime));
} else {
warnMsg = m_minWarnMsg;
warnMsg.replace(QStringLiteral("%1"), formatTime(m_minTime));
}
} else if (m_time > m_maxTime) {
if (m_maxWarnMsg.isEmpty()) {
- warnMsg = q->tr("Time cannot be later than %1", "@info").arg(formatTime(m_maxTime));
+ warnMsg = KTimeComboBox::tr("Time cannot be later than %1", "@info").arg(formatTime(m_maxTime));
} else {
warnMsg = m_maxWarnMsg;
warnMsg.replace(QStringLiteral("%1"), formatTime(m_maxTime));
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwidgetsaddons-4.97.0/src/ktoolbarlabelaction.h new/kwidgetsaddons-4.98.0/src/ktoolbarlabelaction.h
--- old/kwidgetsaddons-4.97.0/src/ktoolbarlabelaction.h 2014-03-01 12:51:46.000000000 +0100
+++ new/kwidgetsaddons-4.98.0/src/ktoolbarlabelaction.h 2014-03-29 08:00:08.000000000 +0100
@@ -34,15 +34,15 @@
*
* \code
*
- * KHistoryCombo* findCombo = new KHistoryCombo( true, this );
+ * KHistoryComboBox *findCombo = new KHistoryComboBox(true, this);
*
- * KWidgetAction* action = new KWidgetAction( findCombo, i18n("Find Combo"),
- * Qt::Key_F6, this, SLOT( slotFocus() ),
+ * KWidgetAction *action = new KWidgetAction(findCombo, i18n("Find Combo"),
+ * Qt::Key_F6, this, SLOT( slotFocus()),
* actionCollection(), "find_combo");
*
- * QAction *action = new KToolBarLabelAction( action, i18n( "Find "), "find_label" );
- * action->setShortcut( Qt::Key_F6 );
- * connect( action, SIGNAL( triggered() ), this, SLOT( slotFocus() ) );
+ * QAction *action = new KToolBarLabelAction(action, i18n("Find "), "find_label");
+ * action->setShortcut(Qt::Key_F6);
+ * connect(action, SIGNAL(triggered()), this, SLOT(slotFocus()));
*
* \endcode
*
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwidgetsaddons-4.97.0/src/lineediturldropeventfilter.cpp new/kwidgetsaddons-4.98.0/src/lineediturldropeventfilter.cpp
--- old/kwidgetsaddons-4.97.0/src/lineediturldropeventfilter.cpp 2014-03-01 12:51:46.000000000 +0100
+++ new/kwidgetsaddons-4.98.0/src/lineediturldropeventfilter.cpp 2014-03-29 08:00:08.000000000 +0100
@@ -25,7 +25,7 @@
#include <qmimedata.h>
#include <QDropEvent>
-static const char s_kdeUriListMime[] = "application/x-kde4-urilist";
+static const char s_kdeUriListMime[] = "application/x-kde4-urilist"; // keep this name "kde4" for compat.
LineEditUrlDropEventFilter::LineEditUrlDropEventFilter(QObject *parent)
: QObject(parent)
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
[View Less]
1
0
Hello community,
here is the log from the commit of package kwallet for openSUSE:Factory checked in at 2014-04-02 17:22:28
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/kwallet (Old)
and /work/SRC/openSUSE:Factory/.kwallet.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kwallet"
Changes:
--------
--- /work/SRC/openSUSE:Factory/kwallet/kwallet.changes 2014-03-10 12:17:53.…
[View More]000000000 +0100
+++ /work/SRC/openSUSE:Factory/.kwallet.new/kwallet.changes 2014-04-02 17:22:40.000000000 +0200
@@ -1,0 +2,10 @@
+Sat Mar 29 19:47:53 UTC 2014 - hrvoje.senjan(a)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
+- Added libgcrypt-devel >= 1.5.0 BuildRequires
+
+-------------------------------------------------------------------
Old:
----
kwallet-4.97.0.tar.xz
New:
----
kwallet-4.98.0.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kwallet.spec ++++++
--- /var/tmp/diff_new_pack.QW1Cgc/_old 2014-04-02 17:22:41.000000000 +0200
+++ /var/tmp/diff_new_pack.QW1Cgc/_new 2014-04-02 17:22:41.000000000 +0200
@@ -18,10 +18,10 @@
%define lname libKF5Wallet5
Name: kwallet
-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: kconfig-devel >= %{_kf5_version}
BuildRequires: kcoreaddons-devel >= %{_kf5_version}
@@ -33,6 +33,7 @@
BuildRequires: kservice-devel >= %{_kf5_version}
BuildRequires: kwidgetsaddons-devel >= %{_kf5_version}
BuildRequires: kwindowsystem-devel >= %{_kf5_version}
+BuildRequires: libgcrypt-devel >= 1.5.0
BuildRequires: pkgconfig(Qt5DBus) >= 5.2.0
BuildRequires: pkgconfig(Qt5Test) >= 5.2.0
BuildRequires: pkgconfig(Qt5Widgets) >= 5.2.0
@@ -120,6 +121,7 @@
%{_kf5_servicesdir}/kwalletd5.desktop
%{_kf5_datadir}/kwalletd/
%{_kf5_datadir}/dbus-1/services/org.kde.kwalletd5.service
+%{_kf5_datadir}/kconf_update/
%files -n %lname
%defattr(-,root,root)
++++++ kwallet-4.97.0.tar.xz -> kwallet-4.98.0.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwallet-4.97.0/.reviewboardrc new/kwallet-4.98.0/.reviewboardrc
--- old/kwallet-4.97.0/.reviewboardrc 2014-03-01 12:51:44.000000000 +0100
+++ new/kwallet-4.98.0/.reviewboardrc 2014-03-29 08:12:43.000000000 +0100
@@ -1,4 +1,4 @@
REVIEWBOARD_URL = "https://git.reviewboard.kde.org"
-REPOSITORY = 'git://anongit.kde.org/kwallet-framework'
+REPOSITORY = 'git://anongit.kde.org/kwallet'
BRANCH = 'master'
TARGET_GROUPS = 'kdeframeworks'
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwallet-4.97.0/CMakeLists.txt new/kwallet-4.98.0/CMakeLists.txt
--- old/kwallet-4.97.0/CMakeLists.txt 2014-03-01 12:51:44.000000000 +0100
+++ new/kwallet-4.98.0/CMakeLists.txt 2014-03-29 08:12:43.000000000 +0100
@@ -1,23 +1,29 @@
cmake_minimum_required(VERSION 2.8.12)
-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})
+set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/cmake)
set(REQUIRED_QT_VERSION 5.2.0)
find_package(Qt5 ${REQUIRED_QT_VERSION} CONFIG REQUIRED Widgets DBus)
-set(KF5_VERSION "4.97.0")
+set(KF5_VERSION "4.98.0")
include(KDEInstallDirs)
include(KDEFrameworkCompilerSettings)
include(KDECMakeSettings)
+include(FeatureSummary)
option(BUILD_KWALLETD "Build the kwallet daemon" ON)
+find_package(LibGcrypt 1.5.0 REQUIRED QUIET)
+set_package_properties(LibGcrypt PROPERTIES DESCRIPTION "Libgcrypt is a general purpose cryptographic library based on the code from GnuPG."
+ URL "http://www.gnu.org/software/libgcrypt/"
+ TYPE REQUIRED
+ PURPOSE "kwalletd needs libgcrypt to perform PBKDF2-SHA512 hashing"
+ )
+
add_subdirectory(src)
add_subdirectory(autotests)
add_subdirectory(tests)
-if ("${CMAKE_BINARY_DIR}" STREQUAL "${CMAKE_CURRENT_BINARY_DIR}")
- feature_summary(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES)
-endif()
+feature_summary(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwallet-4.97.0/cmake/FindLibGcrypt.cmake new/kwallet-4.98.0/cmake/FindLibGcrypt.cmake
--- old/kwallet-4.97.0/cmake/FindLibGcrypt.cmake 1970-01-01 01:00:00.000000000 +0100
+++ new/kwallet-4.98.0/cmake/FindLibGcrypt.cmake 2014-03-29 08:12:43.000000000 +0100
@@ -0,0 +1,61 @@
+
+# - Try to find the Gcrypt library
+# Once run this will define
+#
+# LIBGCRYPT_FOUND - set if the system has the gcrypt library
+# LIBGCRYPT_CFLAGS - the required gcrypt compilation flags
+# LIBGCRYPT_LIBRARIES - the linker libraries needed to use the gcrypt library
+#
+# Copyright (c) 2006 Brad Hards <bradh(a)kde.org>
+#
+# Redistribution and use is allowed according to the terms of the BSD license.
+# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
+
+# libgcrypt is moving to pkg-config, but earlier version don't have it
+
+if(NOT LibGcrypt_FIND_VERSION)
+ set(LibGcrypt_FIND_VERSION "1.5.0")
+endif()
+
+#search in typical paths for libgcrypt-config
+FIND_PROGRAM(LIBGCRYPTCONFIG_EXECUTABLE NAMES libgcrypt-config)
+
+#reset variables
+set(LIBGCRYPT_LIBRARIES)
+set(LIBGCRYPT_CFLAGS)
+
+# if libgcrypt-config has been found
+IF(LIBGCRYPTCONFIG_EXECUTABLE)
+
+ # workaround for MinGW/MSYS
+ # CMake can't starts shell scripts on windows so it need to use sh.exe
+ EXECUTE_PROCESS(COMMAND sh ${LIBGCRYPTCONFIG_EXECUTABLE} --libs RESULT_VARIABLE _return_VALUE OUTPUT_VARIABLE LIBGCRYPT_LIBRARIES OUTPUT_STRIP_TRAILING_WHITESPACE)
+ EXECUTE_PROCESS(COMMAND sh ${LIBGCRYPTCONFIG_EXECUTABLE} --cflags RESULT_VARIABLE _return_VALUE OUTPUT_VARIABLE LIBGCRYPT_CFLAGS OUTPUT_STRIP_TRAILING_WHITESPACE)
+ EXECUTE_PROCESS(COMMAND sh ${LIBGCRYPTCONFIG_EXECUTABLE} --version RESULT_VARIABLE _return_VALUEVersion OUTPUT_VARIABLE LIBGCRYPT_VERSION OUTPUT_STRIP_TRAILING_WHITESPACE)
+
+ IF(NOT LIBGCRYPT_CFLAGS AND NOT _return_VALUE)
+ SET(LIBGCRYPT_CFLAGS " ")
+ ENDIF(NOT LIBGCRYPT_CFLAGS AND NOT _return_VALUE)
+
+ IF(LIBGCRYPT_LIBRARIES AND LIBGCRYPT_CFLAGS)
+ SET(LIBGCRYPT_FOUND TRUE)
+ ENDIF(LIBGCRYPT_LIBRARIES AND LIBGCRYPT_CFLAGS)
+
+ if(LIBGCRYPT_VERSION VERSION_LESS ${LibGcrypt_FIND_VERSION})
+ message(WARNING "libgcrypt found but version is less than required, Found ${LIBGCRYPT_VERSION} Required ${LibGcrypt_FIND_VERSION}")
+ SET(LIBGCRYPT_FOUND FALSE)
+ endif()
+
+ENDIF(LIBGCRYPTCONFIG_EXECUTABLE)
+
+if (LIBGCRYPT_FOUND)
+ if (NOT LibGcrypt_FIND_QUIETLY)
+ message(STATUS "Found libgcrypt: ${LIBGCRYPT_LIBRARIES}")
+ endif (NOT LibGcrypt_FIND_QUIETLY)
+else (LIBGCRYPT_FOUND)
+ if (LibGcrypt_FIND_REQUIRED)
+ message(WARNING "Could not find libgcrypt libraries")
+ endif (LibGcrypt_FIND_REQUIRED)
+endif (LIBGCRYPT_FOUND)
+
+MARK_AS_ADVANCED(LIBGCRYPT_CFLAGS LIBGCRYPT_LIBRARIES)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwallet-4.97.0/src/api/KWallet/KF5WalletConfig.cmake.in new/kwallet-4.98.0/src/api/KWallet/KF5WalletConfig.cmake.in
--- old/kwallet-4.97.0/src/api/KWallet/KF5WalletConfig.cmake.in 2014-03-01 12:51:44.000000000 +0100
+++ new/kwallet-4.98.0/src/api/KWallet/KF5WalletConfig.cmake.in 2014-03-29 08:12:43.000000000 +0100
@@ -5,6 +5,7 @@
find_dependency(Qt5Core @REQUIRED_QT_VERSION@)
+set(KWALLET_DBUS_INTERFACES_DIR "${PACKAGE_PREFIX_DIR}/@DBUS_INTERFACES_INSTALL_DIR@")
include("${CMAKE_CURRENT_LIST_DIR}/KF5WalletTargets.cmake")
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwallet-4.97.0/src/api/KWallet/kwallet.h new/kwallet-4.98.0/src/api/KWallet/kwallet.h
--- old/kwallet-4.97.0/src/api/KWallet/kwallet.h 2014-03-01 12:51:44.000000000 +0100
+++ new/kwallet-4.98.0/src/api/KWallet/kwallet.h 2014-03-29 08:12:43.000000000 +0100
@@ -189,7 +189,7 @@
/**
* Request to the wallet service to change the password of
* the wallet @p name.
- * @param name The the wallet to change the password of.
+ * @param name The wallet to change the password of.
* @param w The window id to associate any dialogs with. You can pass
* 0 if you don't have a window the password dialog should
* associate with.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwallet-4.97.0/src/runtime/kwalletd/CMakeLists.txt new/kwallet-4.98.0/src/runtime/kwalletd/CMakeLists.txt
--- old/kwallet-4.97.0/src/runtime/kwalletd/CMakeLists.txt 2014-03-01 12:51:44.000000000 +0100
+++ new/kwallet-4.98.0/src/runtime/kwalletd/CMakeLists.txt 2014-03-29 08:12:43.000000000 +0100
@@ -102,4 +102,5 @@
install( FILES kwalletd5.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
install( FILES kwalletd.notifyrc DESTINATION ${DATA_INSTALL_DIR}/kwalletd )
+install( FILES kwallet-4.13.upd DESTINATION ${DATA_INSTALL_DIR}/kconf_update)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwallet-4.97.0/src/runtime/kwalletd/Messages.sh new/kwallet-4.98.0/src/runtime/kwalletd/Messages.sh
--- old/kwallet-4.97.0/src/runtime/kwalletd/Messages.sh 2014-03-01 12:51:44.000000000 +0100
+++ new/kwallet-4.98.0/src/runtime/kwalletd/Messages.sh 2014-03-29 08:12:43.000000000 +0100
@@ -1,3 +1,3 @@
#! /usr/bin/env bash
$EXTRACTRC `find . -name \*.ui` >> rc.cpp || exit 11
-$XGETTEXT `find . -name "*.cpp" -o -name "*.cc" | grep -v "/tests"` -o $podir/kwalletd.pot
+$XGETTEXT `find . -name "*.cpp" -o -name "*.cc" | grep -v "/tests"` -o $podir/kwalletd5.pot
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwallet-4.97.0/src/runtime/kwalletd/backend/CMakeLists.txt new/kwallet-4.98.0/src/runtime/kwalletd/backend/CMakeLists.txt
--- old/kwallet-4.97.0/src/runtime/kwalletd/backend/CMakeLists.txt 2014-03-01 12:51:44.000000000 +0100
+++ new/kwallet-4.98.0/src/runtime/kwalletd/backend/CMakeLists.txt 2014-03-29 08:12:43.000000000 +0100
@@ -41,7 +41,7 @@
ecm_setup_version(${KF5_VERSION} VARIABLE_PREFIX KWALLETBACKEND SOVERSION 5)
-target_link_libraries(kwalletbackend5 Qt5::Widgets KF5::WidgetsAddons KF5::CoreAddons KF5::Notifications KF5::I18n)
+target_link_libraries(kwalletbackend5 Qt5::Widgets KF5::WidgetsAddons KF5::CoreAddons KF5::Notifications KF5::I18n ${LIBGCRYPT_LIBRARIES})
if(QGPGME_FOUND)
target_link_libraries(kwalletbackend5 ${QGPGME_LIBRARIES} )
endif(QGPGME_FOUND)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwallet-4.97.0/src/runtime/kwalletd/backend/backendpersisthandler.cpp new/kwallet-4.98.0/src/runtime/kwalletd/backend/backendpersisthandler.cpp
--- old/kwallet-4.97.0/src/runtime/kwalletd/backend/backendpersisthandler.cpp 2014-03-01 12:51:44.000000000 +0100
+++ new/kwallet-4.98.0/src/runtime/kwalletd/backend/backendpersisthandler.cpp 2014-03-29 08:12:43.000000000 +0100
@@ -51,6 +51,7 @@
#define KWALLET_HASH_SHA1 0
#define KWALLET_HASH_MD5 1 // unsupported
+#define KWALLET_HASH_PBKDF2_SHA512 2 // used when using kwallet with pam or since 4.13 version
namespace KWallet {
@@ -169,7 +170,7 @@
BackendPersistHandler *BackendPersistHandler::getPersistHandler(char magicBuf[12])
{
if (magicBuf[2] == KWALLET_CIPHER_BLOWFISH_CBC &&
- magicBuf[3] == KWALLET_HASH_SHA1) {
+ (magicBuf[3] == KWALLET_HASH_SHA1 || magicBuf[3] == KWALLET_HASH_PBKDF2_SHA512)) {
if (0 == blowfishHandler)
blowfishHandler = new BlowfishPersistHandler;
return blowfishHandler;
@@ -190,7 +191,12 @@
assert(wb->_cipherType == BACKEND_CIPHER_BLOWFISH);
version[2] = KWALLET_CIPHER_BLOWFISH_CBC;
- version[3] = KWALLET_HASH_SHA1;
+ if(!wb->_useNewHash) {
+ version[3] = KWALLET_HASH_SHA1;
+ } else {
+ version[3] = KWALLET_HASH_PBKDF2_SHA512;//Since 4.13 we always use PBKDF2_SHA512
+ }
+
if (sf.write(version) != 4) {
sf.cancelWriting();
return -4; // write error
@@ -497,14 +503,14 @@
qDebug() << "initGpgME returned " << err.code();
KMessageBox::errorWId( w, i18n("<qt>Error when attempting to initialize OpenPGP while attempting to save the wallet <b>%1</b>. Error code is <b>%2</b>. Please fix your system configuration, then try again!</qt>", Qt::escape(wb->_name), err.code()));
sf.cancelWriting();
- return -1;
+ return -5;
}
boost::shared_ptr< GpgME::Context > ctx( GpgME::Context::createForProtocol(GpgME::OpenPGP) );
if (0 == ctx) {
qDebug() << "Cannot setup OpenPGP context!";
KMessageBox::errorWId(w, i18n("<qt>Error when attempting to initialize OpenPGP while attempting to save the wallet <b>%1</b>. Please fix your system configuration, then try again!</qt>"), Qt::escape(wb->_name));
- return -1;
+ return -6;
}
assert(wb->_cipherType == BACKEND_CIPHER_GPG);
@@ -558,7 +564,7 @@
Qt::escape(wb->_name), gpgerr, gpgme_strerror(gpgerr)));
qDebug() << "GpgME encryption error: " << res.error().code();
sf.cancelWriting();
- return -1;
+ return -7;
}
char buffer[4096];
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwallet-4.97.0/src/runtime/kwalletd/backend/kwalletbackend.cc new/kwallet-4.98.0/src/runtime/kwalletd/backend/kwalletbackend.cc
--- old/kwallet-4.97.0/src/runtime/kwalletd/backend/kwalletbackend.cc 2014-03-01 12:51:44.000000000 +0100
+++ new/kwallet-4.98.0/src/runtime/kwalletd/backend/kwalletbackend.cc 2014-03-29 08:12:43.000000000 +0100
@@ -23,10 +23,10 @@
#include <stdlib.h>
#include <QSaveFile>
-//#include <kstandarddirs.h>
#ifdef HAVE_QGPGME
#include <gpgme++/key.h>
#endif
+#include <gcrypt.h>
#include <KNotification>
#include <KLocalizedString>
@@ -52,8 +52,7 @@
#endif
#define KWALLET_VERSION_MAJOR 0
-#define KWALLET_VERSION_MINOR 0
-
+#define KWALLET_VERSION_MINOR 1
using namespace KWallet;
@@ -68,7 +67,12 @@
// KGlobal::dirs()->addResourceType("kwallet", 0, "share/apps/kwallet");
// }
-Backend::Backend(const QString& name, bool isPath) : d(0), _name(name), _ref(0), _cipherType(KWallet::BACKEND_CIPHER_UNKNOWN) {
+Backend::Backend(const QString& name, bool isPath)
+ : d(0),
+ _name(name),
+ _useNewHash(false),
+ _ref(0),
+ _cipherType(KWallet::BACKEND_CIPHER_UNKNOWN) {
// initKWalletDir();
if (isPath) {
_path = name;
@@ -109,6 +113,34 @@
_cipherType = ct;
}
+static int password2PBKDF2_SHA512(const QByteArray &password, QByteArray& hash, const QByteArray &salt)
+{
+ if (!gcry_check_version("1.5.0")) {
+ printf("libcrypt version is too old \n");
+ return GPG_ERR_USER_2;
+ }
+
+ gcry_error_t error;
+ bool static gcry_secmem_init = false;
+ if (!gcry_secmem_init) {
+ error = gcry_control(GCRYCTL_INIT_SECMEM, 32768, 0);
+ if (error != 0) {
+ qWarning() << "Can't get secure memory:" << error;
+ return error;
+ }
+ gcry_secmem_init = true;
+ }
+
+ gcry_control (GCRYCTL_INITIALIZATION_FINISHED, 0);
+
+ error = gcry_kdf_derive(password.constData(), password.size(),
+ GCRY_KDF_PBKDF2, GCRY_MD_SHA512,
+ salt.data(), salt.size(),
+ PBKDF2_SHA512_ITERATIONS, PBKDF2_SHA512_KEYSIZE, hash.data());
+
+ return error;
+}
+
// this should be SHA-512 for release probably
static int password2hash(const QByteArray& password, QByteArray& hash) {
SHA1 sha;
@@ -279,6 +311,9 @@
}
_passhash = passwordHash;
+ _newPassHash = passwordHash;
+ _useNewHash = true;//Only new hash is supported
+
return openInternal();
}
@@ -294,10 +329,8 @@
}
newfile.close();
_open = true;
- if (sync(w)) {
+ if (sync(w) != 0) {
return -2;
- } else {
- return 1; // new file opened, but OK
}
}
@@ -320,9 +353,14 @@
return -4; // unknown version
}
- if (magicBuf[1] != KWALLET_VERSION_MINOR) {
- return -4; // unknown version
- }
+ //0 has been the MINOR version until 4.13, from that point we use it to upgrade the hash
+ if (magicBuf[1] == 1) {
+ qDebug() << "Wallet new enough, using new hash";
+ swapToNewHash();
+ } else if (magicBuf[1] != 0){
+ qDebug() << "Wallet is old, sad panda :(";
+ return -4; // unknown version
+ }
BackendPersistHandler *phandler = BackendPersistHandler::getPersistHandler(magicBuf);
if (0 == phandler){
@@ -331,6 +369,38 @@
return phandler->read(this, db, w);
}
+void Backend::swapToNewHash()
+{
+ //Runtime error happened and we can't use the new hash
+ if (!_useNewHash) {
+ qDebug() << "Runtime error on the new hash";
+ return;
+ }
+ _passhash.fill(0);//Making sure the old passhash is not around in memory
+ _passhash = _newPassHash;//Use the new hash, means the wallet is modern enough
+}
+
+QByteArray Backend::createAndSaveSalt(const QString& path) const
+{
+ QFile saltFile(path);
+ saltFile.remove();
+
+ if (!saltFile.open(QIODevice::WriteOnly)) {
+ return QByteArray();
+ }
+
+ char *randomData = (char*) gcry_random_bytes(PBKDF2_SHA512_SALTSIZE, GCRY_STRONG_RANDOM);
+ QByteArray salt(randomData, PBKDF2_SHA512_SALTSIZE);
+ free(randomData);
+
+ if (saltFile.write(salt) != PBKDF2_SHA512_SALTSIZE) {
+ return QByteArray();
+ }
+
+ saltFile.close();
+
+ return salt;
+}
int Backend::sync(WId w) {
if (!_open) {
@@ -352,7 +422,14 @@
// Write the version number
QByteArray version(4, 0);
version[0] = KWALLET_VERSION_MAJOR;
- version[1] = KWALLET_VERSION_MINOR;
+ if (_useNewHash) {
+ version[1] = KWALLET_VERSION_MINOR;
+ //Use the sync to update the hash to PBKDF2_SHA512
+ swapToNewHash();
+ } else {
+ version[1] = 0; //was KWALLET_VERSION_MINOR before the new hash
+ }
+
BackendPersistHandler *phandler = BackendPersistHandler::getPersistHandler(_cipherType);
if (0 == phandler) {
@@ -389,6 +466,7 @@
// empty the password hash
_passhash.fill(0);
+ _newPassHash.fill(0);
_open = false;
@@ -593,7 +671,27 @@
BlowFish _bf;
CipherBlockChain bf(&_bf);
_passhash.resize(bf.keyLen()/8);
+ _newPassHash.resize(bf.keyLen()/8);
+ _newPassHash.fill(0);
+
password2hash(password, _passhash);
+
+ QByteArray salt;
+ QFile saltFile(getSaveLocation() + QDir::separator() + _name + ".salt");
+ if (!saltFile.exists() || saltFile.size() == 0) {
+ salt = createAndSaveSalt(saltFile.fileName());
+ } else {
+ if (!saltFile.open(QIODevice::ReadOnly)) {
+ salt = createAndSaveSalt(saltFile.fileName());
+ } else {
+ salt = saltFile.readAll();
+ }
+ }
+
+ if (!salt.isEmpty() && password2PBKDF2_SHA512(password, _newPassHash, salt) == 0) {
+ qDebug() << "Setting useNewHash to true";
+ _useNewHash = true;
+ }
}
#ifdef HAVE_QGPGME
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwallet-4.97.0/src/runtime/kwalletd/backend/kwalletbackend.h new/kwallet-4.98.0/src/runtime/kwalletd/backend/kwalletbackend.h
--- old/kwallet-4.97.0/src/runtime/kwalletd/backend/kwalletbackend.h 2014-03-01 12:51:44.000000000 +0100
+++ new/kwallet-4.98.0/src/runtime/kwalletd/backend/kwalletbackend.h 2014-03-29 08:12:43.000000000 +0100
@@ -33,6 +33,10 @@
#include <gpgme++/key.h>
#endif // HAVE_QGPGME
+#define PBKDF2_SHA512_KEYSIZE 56
+#define PBKDF2_SHA512_SALTSIZE 56
+#define PBKDF2_SHA512_ITERATIONS 50000
+
namespace KWallet {
/**
@@ -169,6 +173,7 @@
QString _name;
QString _path;
bool _open;
+ bool _useNewHash;
QString _folder;
int _ref;
// Map Folder->Entries
@@ -178,6 +183,7 @@
typedef QMap<MD5Digest, QList<MD5Digest> > HashMap;
HashMap _hashes;
QByteArray _passhash; // password hash used for saving the wallet
+ QByteArray _newPassHash; //Modern hash using KWALLET_HASH_PBKDF2_SHA512
BackendCipherType _cipherType; // the kind of encryption used for this wallet
#ifdef HAVE_QGPGME
GpgME::Key _gpgKey;
@@ -188,6 +194,8 @@
// open the wallet with the password already set. This is
// called internally by both open and openPreHashed.
int openInternal(WId w=0);
+ void swapToNewHash();
+ QByteArray createAndSaveSalt(const QString &path) const;
};
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwallet-4.97.0/src/runtime/kwalletd/kbetterthankdialog.cpp new/kwallet-4.98.0/src/runtime/kwalletd/kbetterthankdialog.cpp
--- old/kwallet-4.97.0/src/runtime/kwalletd/kbetterthankdialog.cpp 2014-03-01 12:51:44.000000000 +0100
+++ new/kwallet-4.98.0/src/runtime/kwalletd/kbetterthankdialog.cpp 2014-03-29 08:12:43.000000000 +0100
@@ -1,19 +1,18 @@
/* This file is part of the KDE libraries
Copyright (C) 2004 George Staikos <staikos(a)kde.org>
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
+ This library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2.1 of the License, or (at your option) any later version.
- This program is distributed in the hope that it will be useful,
+ This library is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Lesser General Public License for more details.
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ You should have received a copy of the GNU Lesser General Public
+ License along with this library. If not, see <http://www.gnu.org/licenses/>.
*/
#include "kbetterthankdialog.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwallet-4.97.0/src/runtime/kwalletd/kbetterthankdialog.h new/kwallet-4.98.0/src/runtime/kwalletd/kbetterthankdialog.h
--- old/kwallet-4.97.0/src/runtime/kwalletd/kbetterthankdialog.h 2014-03-01 12:51:44.000000000 +0100
+++ new/kwallet-4.98.0/src/runtime/kwalletd/kbetterthankdialog.h 2014-03-29 08:12:43.000000000 +0100
@@ -1,19 +1,18 @@
/* This file is part of the KDE libraries
Copyright (C) 2004 George Staikos <staikos(a)kde.org>
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
+ This library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2.1 of the License, or (at your option) any later version.
- This program is distributed in the hope that it will be useful,
+ This library is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Lesser General Public License for more details.
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ You should have received a copy of the GNU Lesser General Public
+ License along with this library. If not, see <http://www.gnu.org/licenses/>.
*/
#ifndef KBETTERTHANKDIALOG_H
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwallet-4.97.0/src/runtime/kwalletd/knewwalletdialog.cpp new/kwallet-4.98.0/src/runtime/kwalletd/knewwalletdialog.cpp
--- old/kwallet-4.97.0/src/runtime/kwalletd/knewwalletdialog.cpp 2014-03-01 12:51:44.000000000 +0100
+++ new/kwallet-4.98.0/src/runtime/kwalletd/knewwalletdialog.cpp 2014-03-29 08:12:43.000000000 +0100
@@ -143,7 +143,7 @@
GpgME::Key k = _ctx->nextKey(err);
if (err)
break;
- if (!k.isInvalid() && k.canEncrypt()) {
+ if (!k.isInvalid() && k.canEncrypt() && (k.ownerTrust() == GpgME::Key::Ultimate)) {
keys.push_back(k);
}
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwallet-4.97.0/src/runtime/kwalletd/knewwalletdialoggpg.ui new/kwallet-4.98.0/src/runtime/kwalletd/knewwalletdialoggpg.ui
--- old/kwallet-4.97.0/src/runtime/kwalletd/knewwalletdialoggpg.ui 2014-03-01 12:51:44.000000000 +0100
+++ new/kwallet-4.98.0/src/runtime/kwalletd/knewwalletdialoggpg.ui 2014-03-29 08:12:43.000000000 +0100
@@ -19,6 +19,13 @@
</widget>
</item>
<item>
+ <widget class="QLabel" name="label_2">
+ <property name="text">
+ <string><html><head/><body><p><span style=" font-weight:600;">NOTE:</span> this list shows only &quot;ultimate-level&quot; trusted keys</p></body></html></string>
+ </property>
+ </widget>
+ </item>
+ <item>
<widget class="QTableWidget" name="listCertificates">
<property name="showDropIndicator" stdset="0">
<bool>false</bool>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwallet-4.97.0/src/runtime/kwalletd/kwallet-4.13.upd new/kwallet-4.98.0/src/runtime/kwalletd/kwallet-4.13.upd
--- old/kwallet-4.97.0/src/runtime/kwalletd/kwallet-4.13.upd 1970-01-01 01:00:00.000000000 +0100
+++ new/kwallet-4.98.0/src/runtime/kwalletd/kwallet-4.13.upd 2014-03-29 08:12:43.000000000 +0100
@@ -0,0 +1,5 @@
+# We changed the default in 4.13
+Id=kde4.13
+File=kwalletrc
+Group=Wallet
+RemoveKey=Launch Manager
\ No newline at end of file
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwallet-4.97.0/src/runtime/kwalletd/kwalletd.cpp new/kwallet-4.98.0/src/runtime/kwalletd/kwalletd.cpp
--- old/kwallet-4.97.0/src/runtime/kwalletd/kwalletd.cpp 2014-03-01 12:51:44.000000000 +0100
+++ new/kwallet-4.98.0/src/runtime/kwalletd/kwalletd.cpp 2014-03-29 08:12:43.000000000 +0100
@@ -33,6 +33,7 @@
#include <ktoolinvocation.h>
#include <kconfig.h>
+#include <ksharedconfig.h>
#include <kconfiggroup.h>
#include <kdirwatch.h>
#include <kmessagebox.h>
@@ -1453,7 +1454,7 @@
KConfigGroup walletGroup(&cfg, "Wallet");
_firstUse = walletGroup.readEntry("First Use", true);
_enabled = walletGroup.readEntry("Enabled", true);
- _launchManager = walletGroup.readEntry("Launch Manager", true);
+ _launchManager = walletGroup.readEntry("Launch Manager", false);
_leaveOpen = walletGroup.readEntry("Leave Open", false);
bool idleSave = _closeIdle;
_closeIdle = walletGroup.readEntry("Close When Idle", false);
@@ -1619,50 +1620,59 @@
int KWalletD::pamOpen(const QString &wallet, const QByteArray &passwordHash, int sessionTimeout)
{
- // don't do anything if transactions are already being processed!
- if (_processing) {
- return -1;
- }
-
- // check if the wallet is already open
- QPair<int, KWallet::Backend*> walletInfo = findWallet(wallet);
- int rc = walletInfo.first;
- if (rc == -1) {
- if (_wallets.count() > 20) {
- qDebug() << "Too many wallets open.";
- return -1;
- }
-
- if (!QRegExp("^[\\w\\^\\&\\'\\(a)\\{\\}\\[\\]\\,\\$\\=\\!\\-\\#\\(\\)\\%\\.\\+\\_\\s]+$").exactMatch(wallet) ||
- !KWallet::Backend::exists(wallet)) {
- return -1;
- }
-
- KWallet::Backend *b = new KWallet::Backend(wallet);
- int openrc = b->openPreHashed(passwordHash);
- if (openrc == 0 && b->isOpen()) {
- // opening the wallet was successful
- int handle = generateHandle();
- _wallets.insert(handle, b);
- _syncTimers.addTimer(handle, _syncTime);
-
- // don't reference the wallet or add a session so it
- // can be reclosed easily.
-
- if (sessionTimeout > 0) {
- _closeTimers.addTimer(handle, sessionTimeout);
- } else if (_closeIdle) {
- _closeTimers.addTimer(handle, _idleTime);
- }
- emit walletOpened(wallet);
- if (_wallets.count() == 1 && _launchManager) {
- KToolInvocation::startServiceByDesktopName("kwalletmanager-kwalletd");
- }
- return handle;
- }
- }
+ if (_processing) {
+ return -1;
+ }
+
+ if (!QRegExp("^[\\w\\^\\&\\'\\(a)\\{\\}\\[\\]\\,\\$\\=\\!\\-\\#\\(\\)\\%\\.\\+\\_\\s]+$").exactMatch(wallet)) {
+ return -1;
+ }
+
+ // check if the wallet is already open
+ QPair<int, KWallet::Backend*> walletInfo = findWallet(wallet);
+ int rc = walletInfo.first;
+ if (rc != -1) {
+ return rc;//Wallet already opened, return handle
+ }
+
+ KWallet::Backend *b = 0;
+ //If the wallet we want to open does not exists. create it and set pam hash
+ if (!wallets().contains(wallet)) {
+ b = new KWallet::Backend(wallet);
+ b->setCipherType(KWallet::BACKEND_CIPHER_BLOWFISH);
+ } else {
+ b = new KWallet::Backend(wallet);
+ }
+
+ if (_wallets.count() > 20) {
+ return -1;
+ }
+
+ int openrc = b->openPreHashed(passwordHash);
+ if (openrc != 0 || !b->isOpen()) {
+ return -1;
+ }
+
+ // opening the wallet was successful
+ int handle = generateHandle();
+ _wallets.insert(handle, b);
+ _syncTimers.addTimer(handle, _syncTime);
+
+ // don't reference the wallet or add a session so it
+ // can be reclosed easily.
+
+ if (sessionTimeout > 0) {
+ _closeTimers.addTimer(handle, sessionTimeout);
+ } else if (_closeIdle) {
+ _closeTimers.addTimer(handle, _idleTime);
+ }
+ emit walletOpened(wallet);
+
+ if (_wallets.count() == 1 && _launchManager) {
+ KToolInvocation::startServiceByDesktopName("kwalletmanager-kwalletd");
+ }
- return -1;
+ return handle;
}
#include "kwalletd.moc"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwallet-4.97.0/src/runtime/kwalletd/kwalletd.notifyrc new/kwallet-4.98.0/src/runtime/kwalletd/kwalletd.notifyrc
--- old/kwallet-4.97.0/src/runtime/kwalletd/kwalletd.notifyrc 2014-03-01 12:51:44.000000000 +0100
+++ new/kwallet-4.98.0/src/runtime/kwalletd/kwalletd.notifyrc 2014-03-29 08:12:43.000000000 +0100
@@ -306,15 +306,18 @@
Name[hu]=A szinkronizálás meghiúsult
Name[ia]=Il falleva synchronisar
Name[kk]=Қадамдастыру жаңылды
+Name[ko]=동기화 실패
Name[lt]=Sinchronizavimas nepavyko
Name[nb]=Synkronisering mislyktes
Name[nds]=Synkroniseren is fehlslaan
Name[nl]=Synchronisatie mislukt
Name[nn]=Feil ved synkronisering
+Name[pa]=ਸਿੰਕ ਫੇਲ੍ਹ ਹੈ
Name[pl]=Nieudana synchronizacja
Name[pt]=A Sincronização Falhou
Name[pt_BR]=Falha na sincronização
Name[ro]=Sincronizare eșuată
+Name[ru]=Ошибка синхронизации бумажника
Name[sk]=Synchronizácia zlyhala
Name[sl]=Uskladitev spodletela
Name[sr]=Синхронизација пропала
@@ -342,14 +345,17 @@
Comment[hu]=A KDE jelszókezelő rendszer nem tudta szinkronizálni a jelszófájlt a lemezre
Comment[ia]=Le sistema de portafolio de KDE (KDE Wallet System) falleva synchronisar un file de portafolio con le disco
Comment[kk]=KDE әмиян жүйесінің дискідегі әмиян файлымен қадамдастыру жаңылысы
+Comment[ko]=KDE 지갑 시스템에서 지갑 파일을 디스크에 동기화할 수 없음
Comment[nb]=KDE Wallet System klarte ikke å synkronisere en lommebokfil til disk
Comment[nds]=Binnen KDE sien Knippsystem lett sik en Knipp nich mit de Datei op de Fastplaat synkroniseren
Comment[nl]=Het lukte het KDE portefeuillesysteem niet om een portefeuillebestand naar schijf te synchroniseren
Comment[nn]=Lommeboktenesta klarte ikkje synkronisera lommebokfila til disken
+Comment[pa]=ਕੇਡੀਈ ਵਾਲਿਟ ਸਿਸਟਮ ਵਾਲਿਟ ਫਾਇਲ ਨੂੰ ਡਿਸਕ ਉੱਤੇ ਸਿੰਕ ਕਰਨ ਲਈ ਫੇਲ੍ਹ ਹੈ
Comment[pl]=Synchronizacja pliku portfela na dysku przez System portfela KDE zakończyła się niepowodzeniem
Comment[pt]=O sistema da Carteira do KDE não conseguiu sincronizar um ficheiro da carteira para o disco
Comment[pt_BR]=O Sistema da Carteiras do KDE não conseguiu sincronizar um arquivo de carteira com o disco
Comment[ro]=Sistemul de portofele KDE nu a putut sincroniza fișierul unui portofel cu discul
+Comment[ru]=Не удалось сохранить бумажник в соответствующий ему файл на диске
Comment[sk]=Systému KDE peňaženky sa nepodarilo synchronizovať súbor peňaženky na disk
Comment[sl]=Sistem listnic za KDE ni uspel uskladiti datoteke z listnico na disku
Comment[sr]=К‑новчаник не може да синхронизује фајл новчаника на диск
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwallet-4.97.0/src/runtime/kwalletd/kwalletwizard.cpp new/kwallet-4.98.0/src/runtime/kwalletd/kwalletwizard.cpp
--- old/kwallet-4.97.0/src/runtime/kwalletd/kwalletwizard.cpp 2014-03-01 12:51:44.000000000 +0100
+++ new/kwallet-4.98.0/src/runtime/kwalletd/kwalletwizard.cpp 2014-03-29 08:12:43.000000000 +0100
@@ -1,19 +1,18 @@
/* This file is part of the KDE libraries
Copyright (C) 2004 George Staikos <staikos(a)kde.org>
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
+ This library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2.1 of the License, or (at your option) any later version.
- This program is distributed in the hope that it will be useful,
+ This library is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Lesser General Public License for more details.
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ You should have received a copy of the GNU Lesser General Public
+ License along with this library. If not, see <http://www.gnu.org/licenses/>.
*/
#include "kwalletwizard.h"
@@ -172,7 +171,7 @@
GpgME::Key k = ctx->nextKey(err);
if (err)
break;
- if (!k.isInvalid() && k.canEncrypt()) {
+ if (!k.isInvalid() && k.canEncrypt() && (k.ownerTrust() == GpgME::Key::Ultimate)) {
keys.push_back(k);
}
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwallet-4.97.0/src/runtime/kwalletd/kwalletwizard.h new/kwallet-4.98.0/src/runtime/kwalletd/kwalletwizard.h
--- old/kwallet-4.97.0/src/runtime/kwalletd/kwalletwizard.h 2014-03-01 12:51:44.000000000 +0100
+++ new/kwallet-4.98.0/src/runtime/kwalletd/kwalletwizard.h 2014-03-29 08:12:43.000000000 +0100
@@ -1,19 +1,18 @@
/* This file is part of the KDE libraries
Copyright (C) 2004 George Staikos <staikos(a)kde.org>
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
+ This library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2.1 of the License, or (at your option) any later version.
- This program is distributed in the hope that it will be useful,
+ This library is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Lesser General Public License for more details.
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ You should have received a copy of the GNU Lesser General Public
+ License along with this library. If not, see <http://www.gnu.org/licenses/>.
*/
#ifndef KWALLETWIZARD_H
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwallet-4.97.0/src/runtime/kwalletd/kwalletwizardpagegpgkey.ui new/kwallet-4.98.0/src/runtime/kwalletd/kwalletwizardpagegpgkey.ui
--- old/kwallet-4.97.0/src/runtime/kwalletd/kwalletwizardpagegpgkey.ui 2014-03-01 12:51:44.000000000 +0100
+++ new/kwallet-4.98.0/src/runtime/kwalletd/kwalletwizardpagegpgkey.ui 2014-03-29 08:12:43.000000000 +0100
@@ -21,7 +21,10 @@
<item>
<widget class="QLabel" name="label_3">
<property name="text">
- <string><html><head/><body><p>The GPG-based wallet use a GPG encryption key to securely encrypt data on disk. The key must be available when decrypting is needed or your wallet will not be accessible. For example, if you choose a SmartCard-based encryption key, the GPG system will prompt you to enter it and its associated PIN when attempting to open the wallet.</p></body></html></string>
+ <string><html><head/><body><p>The GPG-based wallet use a GPG encryption key to securely encrypt data on disk. The key must be available when decrypting is needed or your wallet will not be accessible. For example, if you choose a SmartCard-based encryption key, the GPG system will prompt you to enter it and its associated PIN when attempting to open the wallet. <span style=" font-weight:600;">NOTE:</span> this list contains only &quot;ultimate-level&quot; trusted keys.</p></body></html></string>
+ </property>
+ <property name="textFormat">
+ <enum>Qt::AutoText</enum>
</property>
<property name="wordWrap">
<bool>true</bool>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwallet-4.97.0/tests/kwalletd/CMakeLists.txt new/kwallet-4.98.0/tests/kwalletd/CMakeLists.txt
--- old/kwallet-4.97.0/tests/kwalletd/CMakeLists.txt 2014-03-01 12:51:44.000000000 +0100
+++ new/kwallet-4.98.0/tests/kwalletd/CMakeLists.txt 2014-03-29 08:12:43.000000000 +0100
@@ -28,7 +28,7 @@
)
if (QGPGME_FOUND)
- kde4_add_ui_files(kwalletwizardtest_SRCS
+ qt5_wrap_ui(kwalletwizardtest_SRCS
../../src/runtime/kwalletd/kwalletwizardpagepasswordgpg.ui)
endif(QGPGME_FOUND)
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
[View Less]
1
0
Hello community,
here is the log from the commit of package kunitconversion for openSUSE:Factory checked in at 2014-04-02 17:22:27
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/kunitconversion (Old)
and /work/SRC/openSUSE:Factory/.kunitconversion.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kunitconversion"
Changes:
--------
--- /work/SRC/openSUSE:Factory/kunitconversion/…
[View More]kunitconversion.changes 2014-03-10 12:17:48.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.kunitconversion.new/kunitconversion.changes 2014-04-02 17:22:39.000000000 +0200
@@ -1,0 +2,9 @@
+Sat Mar 29 19:47:52 UTC 2014 - hrvoje.senjan(a)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:
----
kunitconversion-4.97.0.tar.xz
New:
----
kunitconversion-4.98.0.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kunitconversion.spec ++++++
--- /var/tmp/diff_new_pack.uhaTcb/_old 2014-04-02 17:22:40.000000000 +0200
+++ /var/tmp/diff_new_pack.uhaTcb/_new 2014-04-02 17:22:40.000000000 +0200
@@ -18,10 +18,10 @@
%define lname libKF5UnitConversion5
Name: kunitconversion
-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: kconfig-devel >= %{_kf5_version}
BuildRequires: kf5-filesystem
++++++ kunitconversion-4.97.0.tar.xz -> kunitconversion-4.98.0.tar.xz ++++++
++++ 10068 lines of diff (skipped)
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
[View Less]
1
0
Hello community,
here is the log from the commit of package ktextwidgets for openSUSE:Factory checked in at 2014-04-02 17:22:26
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/ktextwidgets (Old)
and /work/SRC/openSUSE:Factory/.ktextwidgets.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ktextwidgets"
Changes:
--------
--- /work/SRC/openSUSE:Factory/ktextwidgets/ktextwidgets.…
[View More]changes 2014-03-10 12:18:17.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.ktextwidgets.new/ktextwidgets.changes 2014-04-02 17:22:38.000000000 +0200
@@ -1,0 +2,9 @@
+Sat Mar 29 19:47:52 UTC 2014 - hrvoje.senjan(a)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:
----
ktextwidgets-4.97.0.tar.xz
New:
----
ktextwidgets-4.98.0.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ ktextwidgets.spec ++++++
--- /var/tmp/diff_new_pack.ioZXoX/_old 2014-04-02 17:22:39.000000000 +0200
+++ /var/tmp/diff_new_pack.ioZXoX/_new 2014-04-02 17:22:39.000000000 +0200
@@ -18,10 +18,10 @@
%define lname libKF5TextWidgets5
Name: ktextwidgets
-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: kcompletion-devel >= %{_kf5_version}
BuildRequires: kconfig-devel >= %{_kf5_version}
++++++ ktextwidgets-4.97.0.tar.xz -> ktextwidgets-4.98.0.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ktextwidgets-4.97.0/CMakeLists.txt new/ktextwidgets-4.98.0/CMakeLists.txt
--- old/ktextwidgets-4.97.0/CMakeLists.txt 2014-03-01 12:51:40.000000000 +0100
+++ new/ktextwidgets-4.98.0/CMakeLists.txt 2014-03-28 19:17:34.000000000 +0100
@@ -3,7 +3,7 @@
project(KTextWidgets)
# ECM setup
-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})
include(KDEInstallDirs)
@@ -15,7 +15,7 @@
include(ECMGenerateHeaders)
include(ECMPackageConfigHelpers)
-set(KF5_VERSION "4.97.0")
+set(KF5_VERSION "4.98.0")
ecm_setup_version(${KF5_VERSION}
VARIABLE_PREFIX KTEXTWIDGETS
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ktextwidgets-4.97.0/src/Messages.sh new/ktextwidgets-4.98.0/src/Messages.sh
--- old/ktextwidgets-4.97.0/src/Messages.sh 1970-01-01 01:00:00.000000000 +0100
+++ new/ktextwidgets-4.98.0/src/Messages.sh 2014-03-28 19:17:34.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.
+$XGETTEXT `find . -name \*.cpp -o -name \*.h -name \*.qml` -o $podir/ktextwidgets5.pot
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ktextwidgets-4.97.0/src/findreplace/kfind.h new/ktextwidgets-4.98.0/src/findreplace/kfind.h
--- old/ktextwidgets-4.97.0/src/findreplace/kfind.h 2014-03-01 12:51:40.000000000 +0100
+++ new/ktextwidgets-4.98.0/src/findreplace/kfind.h 2014-03-28 19:17:34.000000000 +0100
@@ -59,8 +59,8 @@
* this, SLOT( slotFindNext() ) );
* \endcode
*
- * If you are using a non-modal find dialog (the recommended new way
- * in KDE-3.2), you should call right away m_find->closeFindNextDialog().
+ * If you are using a non-modal find dialog (recommended),
+ * you should call right away m_find->closeFindNextDialog().
*
* Then initialize the variables determining the "current position"
* (to the cursor, if the option FromCursor is set,
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ktextwidgets-4.97.0/src/kregexpeditor/kregexpeditorinterface.h new/ktextwidgets-4.98.0/src/kregexpeditor/kregexpeditorinterface.h
--- old/ktextwidgets-4.97.0/src/kregexpeditor/kregexpeditorinterface.h 2014-03-01 12:51:40.000000000 +0100
+++ new/ktextwidgets-4.98.0/src/kregexpeditor/kregexpeditorinterface.h 2014-03-28 19:17:34.000000000 +0100
@@ -148,13 +148,7 @@
* This method allows for future changes that will not break binary
* compatibility. DO NOT USE!
*
- * KDE has a policy of keeping binary compatibility for all major
- * version of KDE. This means that new methods can not be added to this
- * API before KDE version 4.0.
- *
- * This method is an escape door for that.
- *
- * Conclusion: You should not use this method in this version of KDE!
+ * See http://techbase.kde.org/Policies/Binary_Compatibility_Issues_With_C++
*/
virtual void doSomething(const QString& method, void *arguments) = 0;
};
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ktextwidgets-4.97.0/src/widgets/ktextedit.cpp new/ktextwidgets-4.98.0/src/widgets/ktextedit.cpp
--- old/ktextwidgets-4.97.0/src/widgets/ktextedit.cpp 2014-03-01 12:51:40.000000000 +0100
+++ new/ktextwidgets-4.98.0/src/widgets/ktextedit.cpp 2014-03-28 19:17:34.000000000 +0100
@@ -80,14 +80,6 @@
KConfig sonnetKConfig(QLatin1String("sonnetrc"));
KConfigGroup group(&sonnetKConfig, "Spelling");
checkSpellingEnabled = group.readEntry("checkerEnabledByDefault", false);
-
- // i18n: Placeholder text in text edit widgets is the text appearing
- // before any user input, briefly explaining to the user what to type
- // (e.g. "Enter message").
- // By default the text is set in italic, which may not be appropriate
- // for some languages and scripts (e.g. for CJK ideographs).
- QString metaMsg = i18nc("Italic placeholder text in line edits: 0 no, 1 yes", "1");
- italicizePlaceholder = (metaMsg.trimmed() != QString(QLatin1Char('0')));
}
~Private()
@@ -129,8 +121,6 @@
void slotAllowTab();
void menuActivated(QAction *action);
- QRect clickMessageRect() const;
-
void init();
void checkSpelling(bool force);
@@ -138,8 +128,6 @@
QAction *autoSpellCheckAction;
QAction *allowTab;
QAction *spellCheckAction;
- QString clickMessage;
- bool italicizePlaceholder : 1;
bool customPalette : 1;
bool checkSpellingEnabled : 1;
@@ -303,13 +291,6 @@
lastReplacedPosition = replacementIndex;
}
-QRect KTextEdit::Private::clickMessageRect() const
-{
- int margin = int(parent->document()->documentMargin());
- QRect rect = parent->viewport()->rect().adjusted(margin, margin, -margin, -margin);
- return parent->fontMetrics().boundingRect(rect, Qt::AlignTop | Qt::TextWordWrap, clickMessage);
-}
-
void KTextEdit::Private::init()
{
KCursor::setAutoHideCursor(parent, true, false);
@@ -1004,49 +985,6 @@
}
}
-void KTextEdit::setClickMessage(const QString &msg)
-{
- if (msg != d->clickMessage) {
- if (!d->clickMessage.isEmpty()) {
- viewport()->update(d->clickMessageRect());
- }
- d->clickMessage = msg;
- if (!d->clickMessage.isEmpty()) {
- viewport()->update(d->clickMessageRect());
- }
- }
-}
-
-QString KTextEdit::clickMessage() const
-{
- return d->clickMessage;
-}
-
-void KTextEdit::paintEvent(QPaintEvent *ev)
-{
- QTextEdit::paintEvent(ev);
-
- if (!d->clickMessage.isEmpty() && document()->isEmpty()) {
- QPainter p(viewport());
-
- QFont f = font();
- f.setItalic(d->italicizePlaceholder);
- p.setFont(f);
-
- QColor color(palette().color(viewport()->foregroundRole()));
- color.setAlphaF(0.5);
- p.setPen(color);
-
- QRect cr = d->clickMessageRect();
- p.drawText(cr, Qt::AlignTop | Qt::TextWordWrap, d->clickMessage);
- }
-}
-
-void KTextEdit::focusOutEvent(QFocusEvent *ev)
-{
- QTextEdit::focusOutEvent(ev);
-}
-
void KTextEdit::showAutoCorrectButton(bool show)
{
d->showAutoCorrectionButton = show;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ktextwidgets-4.97.0/src/widgets/ktextedit.h new/ktextwidgets-4.98.0/src/widgets/ktextedit.h
--- old/ktextwidgets-4.97.0/src/widgets/ktextedit.h 2014-03-01 12:51:40.000000000 +0100
+++ new/ktextwidgets-4.98.0/src/widgets/ktextedit.h 2014-03-28 19:17:34.000000000 +0100
@@ -48,7 +48,9 @@
class KTEXTWIDGETS_EXPORT KTextEdit : public QTextEdit //krazy:exclude=qclasses
{
Q_OBJECT
+ #ifndef KTEXTWIDGETS_NO_DEPRECATED
Q_PROPERTY(QString clickMessage READ clickMessage WRITE setClickMessage)
+ #endif
Q_PROPERTY(bool checkSpellingEnabled READ checkSpellingEnabled WRITE setCheckSpellingEnabled)
Q_PROPERTY(QString spellCheckingLanguage READ spellCheckingLanguage WRITE setSpellCheckingLanguage)
@@ -186,15 +188,19 @@
* This makes the text edit display a grayed-out hinting text as long as
* the user didn't enter any text. It is often used as indication about
* the purpose of the text edit.
- * @since 4.4
+ * @deprecated since 5.0, use QTextEdit::setPlaceholderText instead
*/
- void setClickMessage(const QString &msg);
+#ifndef KTEXTWIDGETS_NO_DEPRECATED
+ inline KTEXTWIDGETS_DEPRECATED void setClickMessage(const QString &msg) {setPlaceholderText(msg);}
+#endif
/**
* @return the message set with setClickMessage
- * @since 4.4
+ * @deprecated since 5.0, use QTextEdit::placeholderText instead
*/
- QString clickMessage() const;
+#ifndef KTEXTWIDGETS_NO_DEPRECATED
+ inline KTEXTWIDGETS_DEPRECATED QString clickMessage() const {return placeholderText();}
+#endif
/**
* @since 4.10
@@ -329,12 +335,6 @@
virtual bool event(QEvent *);
/**
- * Reimplemented to paint clickMessage.
- */
- virtual void paintEvent(QPaintEvent *);
- virtual void focusOutEvent(QFocusEvent *);
-
- /**
* Reimplemented for internal reasons
*/
virtual void keyPressEvent(QKeyEvent *);
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
[View Less]
1
0
Hello community,
here is the log from the commit of package kservice for openSUSE:Factory checked in at 2014-04-02 17:22:23
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/kservice (Old)
and /work/SRC/openSUSE:Factory/.kservice.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kservice"
Changes:
--------
--- /work/SRC/openSUSE:Factory/kservice/kservice.changes 2014-03-10 12:18:16.…
[View More]000000000 +0100
+++ /work/SRC/openSUSE:Factory/.kservice.new/kservice.changes 2014-04-02 17:22:36.000000000 +0200
@@ -1,0 +2,9 @@
+Sat Mar 29 19:47:51 UTC 2014 - hrvoje.senjan(a)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:
----
kservice-4.97.0.tar.xz
New:
----
kservice-4.98.0.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kservice.spec ++++++
--- /var/tmp/diff_new_pack.2Bs4k1/_old 2014-04-02 17:22:37.000000000 +0200
+++ /var/tmp/diff_new_pack.2Bs4k1/_new 2014-04-02 17:22:37.000000000 +0200
@@ -17,10 +17,10 @@
Name: kservice
-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: kconfig-devel >= %{_kf5_version}
BuildRequires: kcoreaddons-devel >= %{_kf5_version}
++++++ kservice-4.97.0.tar.xz -> kservice-4.98.0.tar.xz ++++++
++++ 3408 lines of diff (skipped)
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
[View Less]
1
0
Hello community,
here is the log from the commit of package kross for openSUSE:Factory checked in at 2014-04-02 17:22:20
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/kross (Old)
and /work/SRC/openSUSE:Factory/.kross.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kross"
Changes:
--------
--- /work/SRC/openSUSE:Factory/kross/kross.changes 2014-03-10 12:18:15.000000000 +0100
+++…
[View More] /work/SRC/openSUSE:Factory/.kross.new/kross.changes 2014-04-02 17:22:34.000000000 +0200
@@ -1,0 +2,9 @@
+Sat Mar 29 19:47:49 UTC 2014 - hrvoje.senjan(a)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:
----
kross-4.97.0.tar.xz
New:
----
kross-4.98.0.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kross.spec ++++++
--- /var/tmp/diff_new_pack.CaPcMM/_old 2014-04-02 17:22:35.000000000 +0200
+++ /var/tmp/diff_new_pack.CaPcMM/_new 2014-04-02 17:22:35.000000000 +0200
@@ -17,10 +17,10 @@
Name: kross
-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: kcompletion-devel >= %{_kf5_version}
BuildRequires: kdoctools-devel >= %{_kf5_version}
++++++ kross-4.97.0.tar.xz -> kross-4.98.0.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kross-4.97.0/CMakeLists.txt new/kross-4.98.0/CMakeLists.txt
--- old/kross-4.97.0/CMakeLists.txt 2014-03-01 12:51:33.000000000 +0100
+++ new/kross-4.98.0/CMakeLists.txt 2014-03-28 19:17:27.000000000 +0100
@@ -2,7 +2,7 @@
project(Kross)
-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})
@@ -16,7 +16,7 @@
include(KDEFrameworkCompilerSettings)
include(KDECMakeSettings)
-set(KF5_VERSION "4.97.0")
+set(KF5_VERSION "4.98.0")
ecm_setup_version(${KF5_VERSION} VARIABLE_PREFIX KROSS
VERSION_HEADER "${CMAKE_CURRENT_BINARY_DIR}/kross_version.h"
PACKAGE_VERSION_FILE "${CMAKE_CURRENT_BINARY_DIR}/KF5KrossConfigVersion.cmake"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kross-4.97.0/docs/kross/man-kf5kross.1.docbook new/kross-4.98.0/docs/kross/man-kf5kross.1.docbook
--- old/kross-4.97.0/docs/kross/man-kf5kross.1.docbook 2014-03-01 12:51:33.000000000 +0100
+++ new/kross-4.98.0/docs/kross/man-kf5kross.1.docbook 2014-03-28 19:17:27.000000000 +0100
@@ -1,5 +1,5 @@
<?xml version="1.0" ?>
-<!DOCTYPE refentry PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [
+<!DOCTYPE refentry PUBLIC "-//KDE//DTD DocBook XML V4.5-Based Variant V1.1//EN" "dtd/kdedbx45.dtd" [
<!ENTITY % English "INCLUDE"><!-- change language only here -->
]>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kross-4.97.0/src/Messages.sh new/kross-4.98.0/src/Messages.sh
--- old/kross-4.97.0/src/Messages.sh 1970-01-01 01:00:00.000000000 +0100
+++ new/kross-4.98.0/src/Messages.sh 2014-03-28 19:17:27.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.
+$XGETTEXT `find . -name \*.cpp -o -name \*.h -name \*.qml` -o $podir/kross5.pot
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
[View Less]
1
0
Hello community,
here is the log from the commit of package kpty for openSUSE:Factory checked in at 2014-04-02 17:22:19
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/kpty (Old)
and /work/SRC/openSUSE:Factory/.kpty.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kpty"
Changes:
--------
--- /work/SRC/openSUSE:Factory/kpty/kpty.changes 2014-03-10 12:17:49.000000000 +0100
+++ /…
[View More]work/SRC/openSUSE:Factory/.kpty.new/kpty.changes 2014-04-02 17:22:33.000000000 +0200
@@ -1,0 +2,9 @@
+Sat Mar 29 19:47:49 UTC 2014 - hrvoje.senjan(a)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:
----
kpty-4.97.0.tar.xz
New:
----
kpty-4.98.0.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kpty.spec ++++++
--- /var/tmp/diff_new_pack.HxuzPT/_old 2014-04-02 17:22:34.000000000 +0200
+++ /var/tmp/diff_new_pack.HxuzPT/_new 2014-04-02 17:22:34.000000000 +0200
@@ -18,10 +18,10 @@
%define lname libKF5Pty5
Name: kpty
-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
++++++ kpty-4.97.0.tar.xz -> kpty-4.98.0.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kpty-4.97.0/CMakeLists.txt new/kpty-4.98.0/CMakeLists.txt
--- old/kpty-4.97.0/CMakeLists.txt 2014-03-01 12:51:31.000000000 +0100
+++ new/kpty-4.98.0/CMakeLists.txt 2014-03-28 19:17:25.000000000 +0100
@@ -2,11 +2,11 @@
project(KPty)
-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})
set(REQUIRED_QT_VERSION 5.2)
-set(KF5_VERSION "4.97.0")
+set(KF5_VERSION "4.98.0")
include(KDEInstallDirs)
include(KDEFrameworkCompilerSettings)
include(KDECMakeSettings)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kpty-4.97.0/autotests/kptyprocesstest.cpp new/kpty-4.98.0/autotests/kptyprocesstest.cpp
--- old/kpty-4.97.0/autotests/kptyprocesstest.cpp 2014-03-01 12:51:31.000000000 +0100
+++ new/kpty-4.98.0/autotests/kptyprocesstest.cpp 2014-03-28 19:17:25.000000000 +0100
@@ -75,12 +75,11 @@
p2.start();
// read the second processes greeting from the first process' pty
- QVERIFY(p.pty()->waitForReadyRead(1500));
for (int i = 0; i < 5; ++i) {
+ QVERIFY(p.pty()->waitForReadyRead(500));
if (p.pty()->canReadLine()) {
break;
}
- QThread::msleep(500);
}
QCOMPARE(p.pty()->readAll(), QByteArray("hello from me\r\n"));
@@ -89,12 +88,11 @@
QVERIFY(p2.pty()->waitForBytesWritten(1000));
// read the result back from the first process' pty
- QVERIFY(p.pty()->waitForReadyRead(1500));
for (int i = 0; i < 5; ++i) {
+ QVERIFY(p.pty()->waitForReadyRead(500));
if (p.pty()->canReadLine()) {
break;
}
- QThread::msleep(500);
}
QCOMPARE(p.pty()->readAll(), QByteArray("hello from process 2\r\n"));
@@ -103,12 +101,11 @@
QVERIFY(p.pty()->waitForBytesWritten(1000));
// read the result back from the second process' pty
- QVERIFY(p2.pty()->waitForReadyRead(1500));
for (int i = 0; i < 5; ++i) {
- if (p.pty()->canReadLine()) {
+ QVERIFY(p2.pty()->waitForReadyRead(500));
+ if (p2.pty()->canReadLine()) {
break;
}
- QThread::msleep(500);
}
QCOMPARE(p2.pty()->readAll(), QByteArray("hi from process 1\r\n"));
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kpty-4.97.0/src/Messages.sh new/kpty-4.98.0/src/Messages.sh
--- old/kpty-4.97.0/src/Messages.sh 1970-01-01 01:00:00.000000000 +0100
+++ new/kpty-4.98.0/src/Messages.sh 2014-03-28 19:17:25.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.
+$XGETTEXT `find . -name \*.cpp -o -name \*.h -name \*.qml` -o $podir/kpty5.pot
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
[View Less]
1
0