Hello community,
here is the log from the commit of package kbookmarks for openSUSE:Factory checked in at 2015-09-02 07:43:52
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/kbookmarks (Old)
and /work/SRC/openSUSE:Factory/.kbookmarks.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kbookmarks"
Changes:
--------
--- /work/SRC/openSUSE:Factory/kbookmarks/kbookmarks.changes 2015-07-14 17:21:55.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.kbookmarks.new/kbookmarks.changes 2015-09-02 07:43:55.000000000 +0200
@@ -1,0 +2,13 @@
+Tue Aug 4 19:20:14 UTC 2015 - hrvoje.senjan@gmail.com
+
+- Update to 5.13.0
+ * The Qt version requirement has been bumped from 5.2 to 5.3
+ * Debug output has been ported to categorized output, for less
+ noise by default
+ * Docbook documentation has been reviewed and updated
+ * KBookmarkManager: use KDirWatch instead of QFileSystemWatcher
+ to detect user-places.xbel being created.
+ * For more details please see:
+ https://www.kde.org/announcements/kde-frameworks-5.13.0.php
+
+-------------------------------------------------------------------
Old:
----
kbookmarks-5.12.0.tar.xz
New:
----
kbookmarks-5.13.0.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kbookmarks.spec ++++++
--- /var/tmp/diff_new_pack.p5mTeY/_old 2015-09-02 07:43:55.000000000 +0200
+++ /var/tmp/diff_new_pack.p5mTeY/_new 2015-09-02 07:43:55.000000000 +0200
@@ -18,9 +18,9 @@
%bcond_without lang
%define lname libKF5Bookmarks5
-%define _tar_path 5.12
+%define _tar_path 5.13
Name: kbookmarks
-Version: 5.12.0
+Version: 5.13.0
Release: 0
%define kf5_version %{version}
BuildRequires: cmake >= 2.8.12
@@ -35,11 +35,11 @@
BuildRequires: kwidgetsaddons-devel >= %{_tar_path}
BuildRequires: kxmlgui-devel >= %{_tar_path}
%if %{with lang}
-BuildRequires: libqt5-linguist-devel >= 5.2.0
+BuildRequires: cmake(Qt5LinguistTools) >= 5.3.0
%endif
-Requires: pkgconfig(Qt5DBus) >= 5.2.0
-Requires: pkgconfig(Qt5Widgets) >= 5.2.0
-Requires: pkgconfig(Qt5Xml) >= 5.2.0
+Requires: cmake(Qt5DBus) >= 5.3.0
+Requires: cmake(Qt5Widgets) >= 5.3.0
+Requires: cmake(Qt5Xml) >= 5.3.0
Summary: Lets you access and manipulate bookmarks stored using XBEL format
License: LGPL-2.1+
Group: System/GUI/KDE
@@ -67,8 +67,8 @@
Requires: %lname = %{version}
Requires: extra-cmake-modules
Requires: kwidgetsaddons-devel >= %{_tar_path}
-Requires: pkgconfig(Qt5Widgets) >= 5.2.0
-Requires: pkgconfig(Qt5Xml) >= 5.2.0
+Requires: cmake(Qt5Widgets) >= 5.3.0
+Requires: cmake(Qt5Xml) >= 5.3.0
%description devel
Framework which lets you access and manipulate bookmarks stored using XBEL format.
++++++ kbookmarks-5.12.0.tar.xz -> kbookmarks-5.13.0.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kbookmarks-5.12.0/CMakeLists.txt new/kbookmarks-5.13.0/CMakeLists.txt
--- old/kbookmarks-5.12.0/CMakeLists.txt 2015-07-05 10:52:55.000000000 +0200
+++ new/kbookmarks-5.13.0/CMakeLists.txt 2015-08-04 12:45:31.000000000 +0200
@@ -3,7 +3,7 @@
project(KBookmarks)
include(FeatureSummary)
-find_package(ECM 5.12.0 NO_MODULE)
+find_package(ECM 5.13.0 NO_MODULE)
set_package_properties(ECM PROPERTIES TYPE REQUIRED DESCRIPTION "Extra CMake Modules." URL "https://projects.kde.org/projects/kdesupport/extra-cmake-modules")
feature_summary(WHAT REQUIRED_PACKAGES_NOT_FOUND FATAL_ON_MISSING_REQUIRED_PACKAGES)
@@ -22,8 +22,8 @@
include(ECMPoQmTools)
-set(KF5_VERSION "5.12.0") # handled by release scripts
-set(KF5_DEP_VERSION "5.12.0") # handled by release scripts
+set(KF5_VERSION "5.13.0") # handled by release scripts
+set(KF5_DEP_VERSION "5.13.0") # handled by release scripts
ecm_setup_version(${KF5_VERSION}
VARIABLE_PREFIX KBOOKMARKS
@@ -32,7 +32,7 @@
SOVERSION 5)
# Dependencies
-set(REQUIRED_QT_VERSION 5.2.0)
+set(REQUIRED_QT_VERSION 5.3.0)
find_package(Qt5 ${REQUIRED_QT_VERSION} NO_MODULE REQUIRED Widgets Xml DBus)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kbookmarks-5.12.0/README.md new/kbookmarks-5.13.0/README.md
--- old/kbookmarks-5.12.0/README.md 2015-07-05 10:52:55.000000000 +0200
+++ new/kbookmarks-5.13.0/README.md 2015-08-04 12:45:31.000000000 +0200
@@ -1,5 +1,7 @@
# KBookmarks
+Bookmarks management library
+
## Introduction
KBookmarks lets you access and manipulate bookmarks stored using the
@@ -7,4 +9,6 @@
[1]: http://pyxml.sourceforge.net/topics/xbel/
+The most common use for bookmarks is web browsers, but this can also
+be useful in any application where local files or URLs can be saved as bookmarks.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kbookmarks-5.12.0/autotests/kbookmarktest.cpp new/kbookmarks-5.13.0/autotests/kbookmarktest.cpp
--- old/kbookmarks-5.12.0/autotests/kbookmarktest.cpp 2015-07-05 10:52:55.000000000 +0200
+++ new/kbookmarks-5.13.0/autotests/kbookmarktest.cpp 2015-08-04 12:45:31.000000000 +0200
@@ -16,21 +16,44 @@
Boston, MA 02110-1301, USA.
*/
-#include "kbookmarktest.h"
#include
-QTEST_MAIN(KBookmarkTest)
-
#include
#include
#include <QDebug>
#include
#include
#include
+#include
+
+class KBookmarkTest : public QObject
+{
+ Q_OBJECT
+private Q_SLOTS:
+ void initTestCase();
+ void cleanupTestCase();
+ void testMimeDataOneBookmark();
+ void testMimeDataBookmarkList();
+ void testFileCreatedExternally();
+ void testBookmarkManager();
+};
+
+static const QString placesFile()
+{
+ const QString datadir = QStandardPaths::writableLocation(QStandardPaths::GenericDataLocation);
+ QDir().mkpath(datadir);
+ return datadir + "/user-places.xbel";
+}
void KBookmarkTest::initTestCase()
{
QStandardPaths::setTestModeEnabled(true);
+ QFile::remove(placesFile());
+}
+
+void KBookmarkTest::cleanupTestCase()
+{
+ QFile::remove(placesFile());
}
static void compareBookmarks(const KBookmark &initialBookmark, const KBookmark &decodedBookmark)
@@ -105,17 +128,31 @@
delete mimeData;
}
+void KBookmarkTest::testFileCreatedExternally()
+{
+ KBookmarkManager *sharedBookmarkManager = KBookmarkManager::managerForExternalFile(placesFile());
+ QVERIFY(sharedBookmarkManager->root().first().isNull());
+
+ QFile file(placesFile());
+ QVERIFY(file.open(QIODevice::WriteOnly));
+ file.write("<?xml version=\"1.0\" encoding=\"UTF-8\"?><title>external</title></bookmark></xbel>");
+ file.close();
+
+ QTRY_VERIFY(!sharedBookmarkManager->root().first().isNull());
+ KBookmark bk = sharedBookmarkManager->root().first();
+ QCOMPARE(bk.url().toString(), QString("file:///external"));
+ QCOMPARE(bk.fullText(), QString("external"));
+
+}
+
void KBookmarkTest::testBookmarkManager()
{
- // like kfileplacesmodel.cpp does
+ // like kfileplacesmodel.cpp used to do
const QString placesModelFile = QStandardPaths::writableLocation(QStandardPaths::GenericDataLocation) + "/kfileplaces/bookmarks.xml";
KBookmarkManager *bookmarkManager = KBookmarkManager::managerForFile(placesModelFile, "kfilePlaces");
// like kfileplacessharedbookmarks.cpp does
- const QString datadir = QStandardPaths::writableLocation(QStandardPaths::GenericDataLocation);
- QDir().mkpath(datadir);
- const QString placesFile = datadir + "/user-places.xbel";
- KBookmarkManager *sharedBookmarkManager = KBookmarkManager::managerForExternalFile(placesFile);
+ KBookmarkManager *sharedBookmarkManager = KBookmarkManager::managerForExternalFile(placesFile());
// like kfilebookmarkhandler.cpp does
QString file = QStandardPaths::locate(QStandardPaths::GenericDataLocation, "kfile/bookmarks.xml");
@@ -129,6 +166,8 @@
Q_UNUSED(bookmarkManager);
Q_UNUSED(sharedBookmarkManager);
Q_UNUSED(manager);
-
}
+QTEST_MAIN(KBookmarkTest)
+
+#include "kbookmarktest.moc"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kbookmarks-5.12.0/autotests/kbookmarktest.h new/kbookmarks-5.13.0/autotests/kbookmarktest.h
--- old/kbookmarks-5.12.0/autotests/kbookmarktest.h 2015-07-05 10:52:55.000000000 +0200
+++ new/kbookmarks-5.13.0/autotests/kbookmarktest.h 1970-01-01 01:00:00.000000000 +0100
@@ -1,34 +0,0 @@
-/* This file is part of the KDE libraries
- Copyright (c) 2005 David Faure
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Library General Public
- License version 2 as published by the Free Software Foundation.
-
- 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 Library 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 KBOOKMARKTEST_H
-#define KBOOKMARKTEST_H
-
-#include
-
-class KBookmarkTest : public QObject
-{
- Q_OBJECT
-private Q_SLOTS:
- void initTestCase();
- void testMimeDataOneBookmark();
- void testMimeDataBookmarkList();
- void testBookmarkManager();
-};
-
-#endif
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kbookmarks-5.12.0/po/eo/kbookmarks5_qt.po new/kbookmarks-5.13.0/po/eo/kbookmarks5_qt.po
--- old/kbookmarks-5.12.0/po/eo/kbookmarks5_qt.po 2015-07-05 10:52:55.000000000 +0200
+++ new/kbookmarks-5.13.0/po/eo/kbookmarks5_qt.po 2015-08-04 12:45:31.000000000 +0200
@@ -37,73 +37,52 @@
msgstr "Aldonu legosignon ĉi tie"
#: kbookmarkcontextmenu.cpp:68
-#, fuzzy
-#| msgid "Open Folder in Bookmark Editor"
msgctxt "KBookmarkContextMenu|"
msgid "Open Folder in Bookmark Editor"
msgstr "Malfermi dosierujon en legosigna redaktilo"
#: kbookmarkcontextmenu.cpp:71
-#, fuzzy
-#| msgid "Delete Folder"
msgctxt "KBookmarkContextMenu|"
msgid "Delete Folder"
msgstr "Forigi dosierujon"
#: kbookmarkcontextmenu.cpp:76
-#, fuzzy
-#| msgid "Properties"
msgctxt "KBookmarkContextMenu|"
msgid "Properties"
msgstr "Ecoj"
#: kbookmarkcontextmenu.cpp:81
-#, fuzzy
-#| msgid "Copy Link Address"
msgctxt "KBookmarkContextMenu|"
msgid "Copy Link Address"
msgstr "Kopii adreson de ligilo"
#: kbookmarkcontextmenu.cpp:84
-#, fuzzy
-#| msgid "Delete Bookmark"
msgctxt "KBookmarkContextMenu|"
msgid "Delete Bookmark"
msgstr "Forigi legosignon"
#: kbookmarkcontextmenu.cpp:90
-#, fuzzy
-#| msgid "Open Folder in Tabs"
msgctxt "KBookmarkContextMenu|"
msgid "Open Folder in Tabs"
-msgstr "Malfermi dosierujon en folioj"
+msgstr "Malfermi Dosierujon en Langetoj"
#: kbookmarkcontextmenu.cpp:116
-#, fuzzy
-#| msgid "Cannot add bookmark with empty URL."
msgctxt "KBookmarkContextMenu|"
msgid "Cannot add bookmark with empty URL."
msgstr "Ne eblas aldoni legosignon sen URL."
#: kbookmarkcontextmenu.cpp:146
-#, fuzzy
-#| msgid "Bookmark Folder Deletion"
msgctxt "KBookmarkContextMenu|"
msgid "Bookmark Folder Deletion"
msgstr "Forigo de legosigna dosierujo"
#: kbookmarkcontextmenu.cpp:147
-#, fuzzy
-#| msgid "Bookmark Deletion"
msgctxt "KBookmarkContextMenu|"
msgid "Bookmark Deletion"
msgstr "Forigo de legosigno"
#: kbookmarkcontextmenu.cpp:148
-#, fuzzy, qt-format
-#| msgid ""
-#| "Are you sure you wish to remove the bookmark folder\n"
-#| "\"%1\"?"
+#, qt-format
msgctxt "KBookmarkContextMenu|"
msgid ""
"Are you sure you wish to remove the bookmark folder\n"
@@ -113,10 +92,7 @@
"\"%1\"?"
#: kbookmarkcontextmenu.cpp:149
-#, fuzzy, qt-format
-#| msgid ""
-#| "Are you sure you wish to remove the bookmark\n"
-#| "\"%1\"?"
+#, qt-format
msgctxt "KBookmarkContextMenu|"
msgid ""
"Are you sure you wish to remove the bookmark\n"
@@ -126,120 +102,87 @@
"\"%1\"?"
#: kbookmarkdialog.cpp:70
-#, fuzzy
-#| msgid "Name:"
msgctxt "KBookmarkDialog|@label:textbox"
msgid "Name:"
msgstr "Nomo:"
#: kbookmarkdialog.cpp:75
-#, fuzzy
-#| msgid "Location:"
msgctxt "KBookmarkDialog|@label:textbox"
msgid "Location:"
msgstr "Loko:"
#: kbookmarkdialog.cpp:80
-#, fuzzy
-#| msgid "Comm&ent:"
msgctxt "KBookmarkDialog|@label:textbox"
msgid "Comment:"
-msgstr "Kom&ento:"
+msgstr "Komento:"
#: kbookmarkdialog.cpp:191
-#, fuzzy
-#| msgid "Update"
msgctxt "KBookmarkDialog|@action:button"
msgid "Update"
msgstr "Ĝisdatigo"
#: kbookmarkdialog.cpp:192
-#, fuzzy
-#| msgid "Bookmark Properties"
msgctxt "KBookmarkDialog|@title:window"
msgid "Bookmark Properties"
msgstr "Ecoj de legosignoj"
#: kbookmarkdialog.cpp:223 kbookmarkdialog.cpp:261 kbookmarkdialog.cpp:295
-#, fuzzy
-#| msgid "&New Folder..."
msgctxt "KBookmarkDialog|@action:button"
msgid "&New Folder..."
msgstr "&Nova dosierujo..."
#: kbookmarkdialog.cpp:227 kbookmarkdialog.cpp:265
-#, fuzzy
-#| msgid "Add"
msgctxt "KBookmarkDialog|@action:button"
msgid "Add"
msgstr "Aldoni"
#: kbookmarkdialog.cpp:228
-#, fuzzy
-#| msgid "Add Bookmark"
msgctxt "KBookmarkDialog|@title:window"
msgid "Add Bookmark"
-msgstr "Aldoni al legosignoj"
+msgstr "Aldoni Legosignon"
#: kbookmarkdialog.cpp:266
-#, fuzzy
-#| msgid "Add Bookmarks"
msgctxt "KBookmarkDialog|@title:window"
msgid "Add Bookmarks"
-msgstr "Aldoni al legosignoj"
+msgstr "Aldoni Legosignojn"
#: kbookmarkdialog.cpp:299
-#, fuzzy
-#| msgid "Select Folder"
msgctxt "KBookmarkDialog|@title:window"
msgid "Select Folder"
msgstr "Elekti dosierujon"
#: kbookmarkdialog.cpp:327
-#, fuzzy
-#| msgid "New Folder"
msgctxt "KBookmarkDialog|@title:window"
msgid "New Folder"
msgstr "Nova dosierujo"
#: kbookmarkdialog.cpp:362
-#, fuzzy
-#| msgid "Create New Bookmark Folder"
msgctxt "KBookmarkDialog|@title:window"
msgid "Create New Bookmark Folder"
msgstr "Krei novan legosignujon"
#: kbookmarkdialog.cpp:363
-#, fuzzy, qt-format
-#| msgid "Create New Bookmark Folder in %1"
+#, qt-format
msgctxt "KBookmarkDialog|@title:window"
msgid "Create New Bookmark Folder in %1"
msgstr "Krei novan legosignujon en %1"
#: kbookmarkdialog.cpp:365
-#, fuzzy
-#| msgid "New folder:"
msgctxt "KBookmarkDialog|@label:textbox"
msgid "New folder:"
msgstr "Nova dosierujo:"
#: kbookmarkdialog.cpp:386
-#, fuzzy
-#| msgid "Bookmarks"
msgctxt "KBookmarkDialog|name of the container of all browser bookmarks"
msgid "Bookmarks"
msgstr "Legosignoj"
#: kbookmarkimporter_ns.cpp:115
-#, fuzzy
-#| msgid "*.html|HTML Files (*.html)"
msgctxt "KNSBookmarkImporterImpl|"
msgid "HTML Files (*.html)"
-msgstr "*.html|HTML-dosieroj (*.html)"
+msgstr "HTML-dosieroj (*.html)"
#: kbookmarkimporter_ns.cpp:119
-#, fuzzy
-#| msgid "*.html|HTML Files (*.html)"
msgctxt "KNSBookmarkImporterImpl|"
msgid "*.html|HTML Files (*.html)"
msgstr "*.html|HTML-dosieroj (*.html)"
@@ -257,39 +200,27 @@
msgstr ""
#: kbookmarkimporter_ns.cpp:158
-#, fuzzy
-#| msgid "<!-- This file was generated by Konqueror -->"
msgctxt "KNSBookmarkImporterImpl|"
msgid "<!-- This file was generated by Konqueror -->"
msgstr "<!-- Tiu dosiero estas kreita de Konkeranto -->"
#: kbookmarkimporter_ns.cpp:161 kbookmarkimporter_ns.cpp:162
-#, fuzzy
-#| msgid "Bookmarks"
msgctxt "KNSBookmarkImporterImpl|"
msgid "Bookmarks"
msgstr "Legosignoj"
#: kbookmarkimporter_opera.cpp:119
-#, fuzzy
-#| msgid "*.adr|Opera Bookmark Files (*.adr)"
msgctxt "KOperaBookmarkImporterImpl|"
msgid "Opera Bookmark Files (*.adr)"
-msgstr "*.adr|Opera-legosignaj dosieroj (*.adr)"
+msgstr "Opera-legosignaj dosieroj (*.adr)"
#: kbookmarkimporter_opera.cpp:122
-#, fuzzy
-#| msgid "*.adr|Opera Bookmark Files (*.adr)"
msgctxt "KOperaBookmarkImporterImpl|"
msgid "*.adr|Opera Bookmark Files (*.adr)"
msgstr "*.adr|Opera-legosignaj dosieroj (*.adr)"
#: kbookmarkmanager.cpp:443
-#, fuzzy, qt-format
-#| msgid ""
-#| "Unable to save bookmarks in %1. Reported error was: %2. This error "
-#| "message will only be shown once. The cause of the error needs to be fixed "
-#| "as quickly as possible, which is most likely a full hard drive."
+#, qt-format
msgctxt "KBookmarkManager|"
msgid ""
"Unable to save bookmarks in %1. Reported error was: %2. This error message "
@@ -301,78 +232,56 @@
"eble plej rapide, kaj verŝajne estas plenplena fiksita disko."
#: kbookmarkmenu.cpp:260
-#, fuzzy
-#| msgid "Open Folder in Tabs"
msgctxt "KBookmarkMenu|"
msgid "Open Folder in Tabs"
-msgstr "Malfermi dosierujon en folioj"
+msgstr "Malfermi dosierujon en langetoj"
#: kbookmarkmenu.cpp:264
-#, fuzzy
-#| msgid "Open all bookmarks in this folder as a new tab."
msgctxt "KBookmarkMenu|"
msgid "Open all bookmarks in this folder as a new tab."
-msgstr "Malfermi ĉiujn legosignojn en la dosierujo en novaj folioj"
+msgstr "Malfermi ĉiujn legosignojn en la dosierujo en nova langeto"
#: kbookmarkmenu.cpp:279
-#, fuzzy
-#| msgid "Bookmark Tabs as Folder..."
msgctxt "KBookmarkMenu|"
msgid "Bookmark Tabs as Folder..."
-msgstr "Legosigni foliojn kiel dosierujon..."
+msgstr "Legosigni langetojn kiel dosierujon..."
#: kbookmarkmenu.cpp:283
-#, fuzzy
-#| msgid "Add a folder of bookmarks for all open tabs."
msgctxt "KBookmarkMenu|"
msgid "Add a folder of bookmarks for all open tabs."
-msgstr "Aldoni dosierujon de legosignoj por ĉiuj malfermitaj folioj"
+msgstr "Aldoni dosierujon de legosignoj por ĉiuj malfermitaj langetoj"
#: kbookmarkmenu.cpp:320
-#, fuzzy
-#| msgid "Edit your bookmark collection in a separate window"
msgctxt "KBookmarkMenu|"
msgid "Edit your bookmark collection in a separate window"
msgstr "Redaktu la legosignaron en aparta fenestro"
#: kbookmarkmenu.cpp:331
-#, fuzzy
-#| msgid "New Bookmark Folder..."
msgctxt "KBookmarkMenu|"
msgid "New Bookmark Folder..."
msgstr "Nova legosigna dosierujo..."
#: kbookmarkmenu.cpp:333
-#, fuzzy
-#| msgid "Create a new bookmark folder in this menu"
msgctxt "KBookmarkMenu|"
msgid "Create a new bookmark folder in this menu"
msgstr "Krei novan legosignujon en tiu menuo"
#: konqbookmarkmenu.cpp:59 konqbookmarkmenu.cpp:72
-#, fuzzy
-#| msgid "Hide in toolbar"
msgctxt "KonqBookmarkContextMenu|"
msgid "Hide in toolbar"
msgstr "Kaŝi en ilobreto"
#: konqbookmarkmenu.cpp:59 konqbookmarkmenu.cpp:72
-#, fuzzy
-#| msgid "Show in toolbar"
msgctxt "KonqBookmarkContextMenu|"
msgid "Show in toolbar"
msgstr "Montriĝi en ilobreto"
#: konqbookmarkmenu.cpp:66
-#, fuzzy
-#| msgid "Open in New Window"
msgctxt "KonqBookmarkContextMenu|"
msgid "Open in New Window"
msgstr "Malfermi en nova fenestro"
#: konqbookmarkmenu.cpp:67
-#, fuzzy
-#| msgid "Open in New Tab"
msgctxt "KonqBookmarkContextMenu|"
msgid "Open in New Tab"
msgstr "Malfermi en nova langeto"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kbookmarks-5.12.0/po/fr/kbookmarks5_qt.po new/kbookmarks-5.13.0/po/fr/kbookmarks5_qt.po
--- old/kbookmarks-5.12.0/po/fr/kbookmarks5_qt.po 2015-07-05 10:52:55.000000000 +0200
+++ new/kbookmarks-5.13.0/po/fr/kbookmarks5_qt.po 2015-08-04 12:45:31.000000000 +0200
@@ -21,10 +21,10 @@
"PO-Revision-Date: 2014-08-31 17:40+0200\n"
"Last-Translator: Sebastien Renard \n"
"Language-Team: French \n"
-"Language: fr\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"Language: fr\n"
"Plural-Forms: nplurals=2; plural=(n > 1);\n"
"X-Generator: Lokalize 1.5\n"
"X-Environment: kde\n"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kbookmarks-5.12.0/src/kbookmark.h new/kbookmarks-5.13.0/src/kbookmark.h
--- old/kbookmarks-5.12.0/src/kbookmark.h 2015-07-05 10:52:55.000000000 +0200
+++ new/kbookmarks-5.13.0/src/kbookmark.h 2015-08-04 12:45:31.000000000 +0200
@@ -328,7 +328,7 @@
{
public:
/**
- * Create an invalid group. This is mostly for use in QValueList,
+ * Create an invalid group. This is mostly for use in QList,
* and other places where we need a null group.
* Also used as a parent for a bookmark that doesn't have one
* (e.g. Netscape bookmarks)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kbookmarks-5.12.0/src/kbookmarkmanager.cpp new/kbookmarks-5.13.0/src/kbookmarkmanager.cpp
--- old/kbookmarks-5.12.0/src/kbookmarkmanager.cpp 2015-07-05 10:52:55.000000000 +0200
+++ new/kbookmarks-5.13.0/src/kbookmarkmanager.cpp 2015-08-04 12:45:31.000000000 +0200
@@ -25,7 +25,6 @@
#include
#include
#include
-#include
#include
#include
#include
@@ -40,6 +39,7 @@
#include
#include
#include
+#include <KDirWatch>
#include
#include
@@ -127,12 +127,12 @@
, m_dialogParent(0)
, m_browserEditor(false)
, m_typeExternal(false)
- , m_fsWatch(0)
+ , m_dirWatch(0)
{}
~Private()
{
- delete m_fsWatch;
+ delete m_dirWatch;
}
mutable QDomDocument m_doc;
@@ -148,7 +148,7 @@
QString m_editorCaption;
bool m_typeExternal;
- QFileSystemWatcher *m_fsWatch; // for external bookmark files
+ KDirWatch *m_dirWatch; // for external bookmark files
KBookmarkMap m_map;
};
@@ -271,12 +271,17 @@
}
d->m_docIsLoaded = true;
- // start QFileSystemWatcher
- d->m_fsWatch = new QFileSystemWatcher;
- d->m_fsWatch->addPath(d->m_bookmarksFile);
- QObject::connect(d->m_fsWatch, SIGNAL(fileChanged(QString)),
- this, SLOT(slotFileChanged(QString)));
- // qDebug() << "starting QFileSystemWatcher for " << d->m_bookmarksFile;
+ // start KDirWatch
+ d->m_dirWatch = new KDirWatch;
+ d->m_dirWatch->addFile(d->m_bookmarksFile);
+ QObject::connect(d->m_dirWatch, SIGNAL(dirty(QString)),
+ this, SLOT(slotFileChanged(QString)));
+ QObject::connect(d->m_dirWatch, SIGNAL(created(QString)),
+ this, SLOT(slotFileChanged(QString)));
+ QObject::connect(d->m_dirWatch, SIGNAL(deleted(QString)),
+ this, SLOT(slotFileChanged(QString)));
+
+ // qDebug() << "starting KDirWatch for" << d->m_bookmarksFile;
}
KBookmarkManager::KBookmarkManager()
@@ -306,7 +311,7 @@
void KBookmarkManager::slotFileChanged(const QString &path)
{
if (path == d->m_bookmarksFile) {
- // qDebug() << "file changed (QFileSystemWatcher) " << path ;
+ // qDebug() << "file changed (KDirWatch) " << path ;
// Reparse
parse();
// Tell our GUI