Hello community, here is the log from the commit of package kjots for openSUSE:Factory checked in at 2016-09-14 23:18:05 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kjots (Old) and /work/SRC/openSUSE:Factory/.kjots.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kjots" Changes: -------- --- /work/SRC/openSUSE:Factory/kjots/kjots.changes 2016-08-29 14:53:18.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.kjots.new/kjots.changes 2016-09-14 23:18:09.000000000 +0200 @@ -1,0 +2,14 @@ +Sat Sep 10 13:37:49 UTC 2016 - [email protected] + +- Add fix-appstream.diff patch from upstream instead of moving + files around after build + +- Add add-kontact-plugin.diff (bko#359380). Now Kjots also shows up + in kontact + +- Add enable-image-insert.patch from upstream so that images can be + included in the created notes + +- Add fix-icons.diff to fix build with newer Frameworks. + +------------------------------------------------------------------- New: ---- add-kontact-plugin.diff enable-image-insert.patch fix-appstream.diff fix-icons.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kjots.spec ++++++ --- /var/tmp/diff_new_pack.hD9GCH/_old 2016-09-14 23:18:11.000000000 +0200 +++ /var/tmp/diff_new_pack.hD9GCH/_new 2016-09-14 23:18:11.000000000 +0200 @@ -28,11 +28,19 @@ Patch0: fix-desktop-file.patch # PATCH-FIX-UPSTREAM fix-build.patch -- Fix build with KDE Applications 16.08 Patch1: fix-build.patch +# PATCH-FIX-UPSTREAM fix-icons.diff -- Fix build by moving KDE4_ADD_APP_ICON to ecm_add_app_icon +Patch2: fix-icons.diff +# PATCH-FIX-UPSTREAM fix-appstream.diff -- Fix the appdata filename +Patch3: fix-appstream.diff +# PATCH-FEATURE-UPSTREAM add-kontact-plugin.diff -- Add a plugin so that kjots shows up in kontact +Patch4: add-kontact-plugin.diff +# PATCH-FEATURE-UPSTREAM enable-image-insert.patch -- Allow an image to be inserted in the notes +Patch5: enable-image-insert.patch +BuildRequires: akonadi-server-devel BuildRequires: extra-cmake-modules BuildRequires: grantlee5-devel BuildRequires: libxslt-tools BuildRequires: update-desktop-files -BuildRequires: cmake(KF5Akonadi) BuildRequires: cmake(KF5AkonadiNotes) BuildRequires: cmake(KF5Bookmarks) BuildRequires: cmake(KF5Config) @@ -45,7 +53,8 @@ BuildRequires: cmake(KF5PimTextEdit) BuildRequires: cmake(KF5TextWidgets) BuildRequires: cmake(KF5XmlGui) -Requires: akonadi_resources +BuildRequires: pkgconfig(Qt5DBus) +BuildRequires: pkgconfig(Qt5PrintSupport) Recommends: %{name}-lang = %{version} BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -58,6 +67,10 @@ %setup -q %patch0 -p1 %patch1 -p1 +%patch2 -p1 +%patch3 -p1 +%patch5 -p1 +%patch4 -p1 %build %cmake_kf5 -d build @@ -67,13 +80,6 @@ %install %kf5_makeinstall -C build %suse_update_desktop_file -C "Note Taker" org.kde.kjots Utility DesktopUtility -# Fixup the .appdata file: it needs to: -# * have the same basename as the .desktop file -# * reference the name of the .desktop file correctly -sed "s|<id>Kjots.desktop</id>|<id>org.kde.kjots.desktop</id>|" \ - %{buildroot}%{_kf5_appstreamdir}/Kjots.appdata.xml > \ - %{buildroot}%{_kf5_appstreamdir}/org.kde.kjots.appdata.xml -rm %{buildroot}%{_kf5_appstreamdir}/Kjots.appdata.xml %find_lang %{name} %post -p /sbin/ldconfig @@ -95,6 +101,9 @@ %_kf5_sharedir/kjots/ %_kf5_iconsdir/hicolor/*/apps/kjots.* %_kf5_iconsdir/oxygen/*/actions/edit-delete-page.* +%{_kf5_plugindir}/kontact_kjotsplugin.so +%{_datadir}/kontact/ +%{_kf5_servicesdir}/kontact/ %files lang -f kjots.lang %defattr(-,root,root) ++++++ add-kontact-plugin.diff ++++++ >From b79b87feb090eb50a2831552c27b67366792f6fc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Vr=C3=A1til?= <[email protected]> Date: Tue, 2 Aug 2016 21:06:51 +0200 Subject: Add Kontact plugin for KJots BUG: 359380 FIXED-IN: 5.1.0 diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 9a03097..b1e8bcf 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -7,6 +7,8 @@ add_subdirectory(noteshared) # it that were used by KJots. We could eventually move this to Akonadi Note add_subdirectory(akonadi_next) +add_subdirectory(kontact_plugin) + add_definitions(-DTRANSLATION_DOMAIN=\"kjots\") configure_file(kjots-version.h.in diff --git a/src/kjotspart.cpp b/src/kjotspart.cpp index fd1e815..606c69a 100644 --- a/src/kjotspart.cpp +++ b/src/kjotspart.cpp @@ -66,7 +66,8 @@ KJotsPart::KJotsPart(QWidget *parentWidget, QObject *parent, const QVariantList initAction(); // set our XML-UI resource file - setXMLFile(QStandardPaths::locate(QStandardPaths::GenericDataLocation, QLatin1String("kjots/kjotspartui.rc"))); + setComponentName(QStringLiteral("kjots"), QStringLiteral("kjots")); + setXMLFile(QStringLiteral("kjotspartui.rc")); QTimer::singleShot(0, this, SLOT(delayedInitialization())); } diff --git a/src/kjotspartui.rc b/src/kjotspartui.rc index e732c33..f295706 100644 --- a/src/kjotspartui.rc +++ b/src/kjotspartui.rc @@ -1,5 +1,5 @@ <!DOCTYPE kpartgui> -<kpartgui version="12" name="kjots" > +<kpartgui version="13" name="kjots" > <MenuBar> <Menu name="file"> @@ -56,15 +56,17 @@ <Action name="copyIntoTitle"/> <Action name="linkify"/> </Menu> - + <Action name="bookmarks"/> <Menu noMerge="1" name="settings"> <text>&Settings</text> - <Action name="kjots_configure" group="settings_configure" /> + <DefineGroup append="top_merge" group="top_merge" /> + <Action name="kjots_configure" group="settings_configure" /> </Menu> - <Menu name="help"></Menu> + <Menu name="help"> + </Menu> </MenuBar> <ToolBar name="mainToolBar" fullWidth="true" noMerge="1" iconText="icononly"> diff --git a/src/kjotsui.rc b/src/kjotsui.rc index 298a5fb..cd84aa6 100644 --- a/src/kjotsui.rc +++ b/src/kjotsui.rc @@ -53,12 +53,13 @@ <Action name="insert_image"/> <Action name="copyIntoTitle"/> </Menu> - + <Action name="bookmarks"/> <Menu name="settings"></Menu> - <Menu name="help"></Menu> + <Menu name="help"> + </Menu> </MenuBar> <ToolBar name="mainToolBar" fullWidth="true" noMerge="1" iconText="icononly"> diff --git a/src/kontact_plugin/CMakeLists.txt b/src/kontact_plugin/CMakeLists.txt new file mode 100644 index 0000000..8a6b5e1 --- /dev/null +++ b/src/kontact_plugin/CMakeLists.txt @@ -0,0 +1,14 @@ +include_directories(${kjots_SOURCE_DIR}/src) + +set(kontact_kjots_PART_SRCS + kjots_plugin.cpp +) + +add_library(kontact_kjotsplugin MODULE ${kontact_kjots_PART_SRCS}) +target_link_libraries(kontact_kjotsplugin KF5::KontactInterface) + +install(TARGETS kontact_kjotsplugin DESTINATION ${KDE_INSTALL_PLUGINDIR}) +install(FILES kjotsplugin.desktop DESTINATION ${KDE_INSTALL_KSERVICES5DIR}/kontact) +install(FILES kjots.setdlg DESTINATION ${KDE_INSTALL_DATADIR}/kontact/ksettingsdialog) + +#qt5_add_dbus_interfaces(kontact_akregator_PART_SRCS ${akregator_SOURCE_DIR}/src/org.kde.akregator.part.xml) diff --git a/src/kontact_plugin/kjots.setdlg b/src/kontact_plugin/kjots.setdlg new file mode 100644 index 0000000..7abc381 --- /dev/null +++ b/src/kontact_plugin/kjots.setdlg @@ -0,0 +1,6 @@ +[Notes] +Name=Notes +Comment=Notes +Weight=475 +Icon=kjots + diff --git a/src/kontact_plugin/kjots_plugin.cpp b/src/kontact_plugin/kjots_plugin.cpp new file mode 100644 index 0000000..8e7cc53 --- /dev/null +++ b/src/kontact_plugin/kjots_plugin.cpp @@ -0,0 +1,102 @@ +/* + Copyright (C) 2016 Daniel Vrátil <[email protected]> + + 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 program 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. + + 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. + + As a special exception, permission is given to link this program + with any edition of Qt, and distribute the resulting executable, + without including the source code for Qt in the source distribution. +*/ + +#include "kjots_plugin.h" +#include "kjotspart.h" +//#include "akregator_options.h" +//#include "partinterface.h" + +#include <KontactInterface/Core> + +#include <QAction> +#include <KActionCollection> +#include <KLocalizedString> +#include <QIcon> +#include <QStandardPaths> + +EXPORT_KONTACT_PLUGIN(KJotsPlugin, kjots) + +KJotsPlugin::KJotsPlugin(KontactInterface::Core *core, const QVariantList &) + : KontactInterface::Plugin(core, core, "kjots") +{ + setComponentName(QStringLiteral("kjots"), QStringLiteral("kjots")); + + mUniqueAppWatcher = new KontactInterface::UniqueAppWatcher( + new KontactInterface::UniqueAppHandlerFactory<KJotsUniqueAppHandler>(), this); +} + +KJotsPlugin::~KJotsPlugin() +{ +} + +void KJotsPlugin::setHelpText(QAction *action, const QString &text) +{ + action->setStatusTip(text); + action->setToolTip(text); + if (action->whatsThis().isEmpty()) { + action->setWhatsThis(text); + } +} + +bool KJotsPlugin::isRunningStandalone() const +{ + return mUniqueAppWatcher->isRunningStandalone(); +} + +QStringList KJotsPlugin::invisibleToolbarActions() const +{ + return { QStringLiteral("new_page"), QStringLiteral("new_book") }; +} + +KParts::ReadOnlyPart *KJotsPlugin::createPart() +{ + KParts::ReadOnlyPart *part = loadPart(); + if (!part) { + return Q_NULLPTR; + } + + return part; +} + +QStringList KJotsPlugin::configModules() const +{ + QStringList modules; + modules << QStringLiteral("PIM/kjots.desktop"); + return modules; +} + + +void KJotsUniqueAppHandler::loadCommandLineOptions(QCommandLineParser *parser) +{ + Q_UNUSED(parser); +} + + +int KJotsUniqueAppHandler::activate(const QStringList &args, const QString &workingDir) +{ + // Ensure part is loaded + (void)plugin()->part(); + + return KontactInterface::UniqueAppHandler::activate(args, workingDir); +} +#include "kjots_plugin.moc" + diff --git a/src/kontact_plugin/kjots_plugin.h b/src/kontact_plugin/kjots_plugin.h new file mode 100644 index 0000000..7c94128 --- /dev/null +++ b/src/kontact_plugin/kjots_plugin.h @@ -0,0 +1,74 @@ +/* + Copyright (C) 2016 Daniel Vrátil <[email protected]> + + 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 program 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. + + You should have received a copy of the GNU General Public Licensea along + with this program; if not, write to the Free Software Foundation, Inc., + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + + As a special exception, permission is given to link this program + with any edition of Qt, and distribute the resulting executable, + without including the source code for Qt in the source distribution. +*/ + +#ifndef KJOTS_PLUGIN_H +#define KJOTS_PLUGIN_H + +#include <KontactInterface/UniqueAppHandler> + +namespace KontactInterface +{ +class Plugin; +} + +class KJotsUniqueAppHandler : public KontactInterface::UniqueAppHandler +{ + Q_OBJECT +public: + explicit KJotsUniqueAppHandler(KontactInterface::Plugin *plugin) + : KontactInterface::UniqueAppHandler(plugin) + { + } + + int activate(const QStringList &args, const QString &workingDir) Q_DECL_OVERRIDE; + void loadCommandLineOptions(QCommandLineParser *parser) Q_DECL_OVERRIDE; + +}; + +class KJotsPlugin : public KontactInterface::Plugin +{ + Q_OBJECT + +public: + KJotsPlugin(KontactInterface::Core *core, const QVariantList &); + ~KJotsPlugin(); + + int weight() const Q_DECL_OVERRIDE + { + return 475; + } + + virtual QStringList configModules() const; + bool isRunningStandalone() const Q_DECL_OVERRIDE; + + QStringList invisibleToolbarActions() const Q_DECL_OVERRIDE; + +protected: + KParts::ReadOnlyPart *createPart() Q_DECL_OVERRIDE; + KontactInterface::UniqueAppWatcher *mUniqueAppWatcher; + +private: + void setHelpText(QAction *action, const QString &text); +}; + +#endif + diff --git a/src/kontact_plugin/kjotsplugin.desktop b/src/kontact_plugin/kjotsplugin.desktop new file mode 100644 index 0000000..274489f --- /dev/null +++ b/src/kontact_plugin/kjotsplugin.desktop @@ -0,0 +1,18 @@ +[Desktop Entry] +Type=Service +Icon=kjots +X-KDE-ServiceTypes=Kontact/Plugin,KPluginInfo + +X-KDE-Library=kontact_kjotsplugin +X-KDE-KontactPluginVersion=10 +X-KDE-KontactPartLibraryName=kjotspart +X-KDE-KontactPartExecutableName=kjots +X-KDE-KontactPartLoadOnStart=false + +X-KDE-PluginInfo-Name=kontact_kjotsplugin +X-KDE-PluginInfo-Version=1.0b2 +X-KDE-PluginInfo-License=GPL +X-KDE-PluginInfo-EnabledByDefault=true + +Comment=KJots Plugin +Name=Notes ++++++ enable-image-insert.patch ++++++ >From 362b0cb67711ab4a16247138a04165a8e90fa8e8 Mon Sep 17 00:00:00 2001 From: Spencer Brown <[email protected]> Date: Tue, 2 Aug 2016 16:52:30 +0200 Subject: Image insert for KJots Add image insert feature to KJots. REVIEW: 128568 diff --git a/src/kjotsedit.cpp b/src/kjotsedit.cpp index 3e63d91..2b9dddf 100644 --- a/src/kjotsedit.cpp +++ b/src/kjotsedit.cpp @@ -114,6 +114,7 @@ void KJotsEdit::delayedInitialization(KActionCollection *collection) connect(actionCollection->action(QLatin1String("insert_checkmark")), SIGNAL(triggered()), SLOT(addCheckmark())); connect(actionCollection->action(QLatin1String("manual_save")), SIGNAL(triggered()), SLOT(savePage())); connect(actionCollection->action(QLatin1String("insert_date")), SIGNAL(triggered()), SLOT(insertDate())); + connect(actionCollection->action(QLatin1String("insert_image")), SIGNAL(triggered()), SLOT(insertImage())); } void KJotsEdit::insertDate() @@ -121,6 +122,12 @@ void KJotsEdit::insertDate() NoteShared::NoteEditorUtils().insertDate(this); } +void KJotsEdit::insertImage() +{ + QTextCursor cursor = textCursor(); + NoteShared::NoteEditorUtils().insertImage(document(), cursor, this); +} + void KJotsEdit::selectionChanged(const QItemSelection &selected, const QItemSelection &deselected) { Q_UNUSED(selected) diff --git a/src/kjotsedit.h b/src/kjotsedit.h index 0273283..39b5128 100644 --- a/src/kjotsedit.h +++ b/src/kjotsedit.h @@ -65,6 +65,7 @@ public slots: void savePage(); void insertDate(); + void insertImage(); private: void createAutoDecimalList(); diff --git a/src/kjotspartui.rc b/src/kjotspartui.rc index e565732..e732c33 100644 --- a/src/kjotspartui.rc +++ b/src/kjotspartui.rc @@ -1,5 +1,5 @@ <!DOCTYPE kpartgui> -<kpartgui version="11" name="kjots" > +<kpartgui version="12" name="kjots" > <MenuBar> <Menu name="file"> @@ -52,6 +52,7 @@ <Menu name="tools"> <text>&Tools</text> <Action name="insert_date"/> + <Action name="insert_image"/> <Action name="copyIntoTitle"/> <Action name="linkify"/> </Menu> diff --git a/src/kjotsui.rc b/src/kjotsui.rc index e6eea8d..298a5fb 100644 --- a/src/kjotsui.rc +++ b/src/kjotsui.rc @@ -1,5 +1,5 @@ <!DOCTYPE kpartgui> -<kpartgui version="11" name="kjots" > +<kpartgui version="12" name="kjots" > <MenuBar> <Menu name="file"> @@ -50,6 +50,7 @@ <Menu name="tools"> <Action name="insert_date"/> + <Action name="insert_image"/> <Action name="copyIntoTitle"/> </Menu> diff --git a/src/kjotswidget.cpp b/src/kjotswidget.cpp index 0d0dad8..865129b 100644 --- a/src/kjotswidget.cpp +++ b/src/kjotswidget.cpp @@ -277,6 +277,10 @@ KJotsWidget::KJotsWidget(QWidget *parent, KXMLGUIClient *xmlGuiClient, Qt::Windo action->setText(i18n("Link")); action->setIcon(QIcon::fromTheme(QLatin1String("insert-link"))); + action = actionCollection->addAction(QLatin1String("insert_image")); + action->setText(i18n("Insert Image")); + action->setIcon(QIcon::fromTheme(QLatin1String("insert-image"))); + action = actionCollection->addAction(QLatin1String("insert_checkmark")); action->setText(i18n("Insert Checkmark")); action->setIcon(QIcon::fromTheme(QLatin1String("checkmark"))); diff --git a/src/noteshared/noteeditorutils.cpp b/src/noteshared/noteeditorutils.cpp index b30a495..661bfa5 100644 --- a/src/noteshared/noteeditorutils.cpp +++ b/src/noteshared/noteeditorutils.cpp @@ -18,11 +18,15 @@ #include "noteeditorutils.h" #include <QLocale> - +#include <QMimeDatabase> +#include <QFileDialog> +#include <KLocalizedString> +#include <QBuffer> #include <QChar> #include <QTextCursor> #include <QTextEdit> #include <QDateTime> +#include <QFileInfo> using namespace NoteShared; NoteEditorUtils::NoteEditorUtils() @@ -45,3 +49,26 @@ void NoteEditorUtils::insertDate(QTextEdit *editor) { editor->insertPlainText(QLocale().toString(QDateTime::currentDateTime(), QLocale::ShortFormat) + QLatin1Char(' ')); } + +void NoteEditorUtils::insertImage(QTextDocument *doc, QTextCursor &cursor, QTextEdit *par) +{ + QString imageFileName = QFileDialog::getOpenFileName(par, i18n("Select image file"), QLatin1String("."), QLatin1String("Images (*.png *.bmp *.jpg *.jpeg *.jpe)")); + if (!imageFileName.isEmpty()) { + QFileInfo qfio = QFileInfo(imageFileName); + QImage imgRes(imageFileName); + if (!imgRes.isNull()) { + QMimeDatabase mimedb; + QByteArray imageData; + QBuffer buffer(&imageData); + QMimeType filemime = mimedb.mimeTypeForFile(qfio); + QString filetype = filemime.name(); + QByteArray formatChars = filemime.preferredSuffix().toUpper().toLatin1(); + + buffer.open(QIODevice::WriteOnly); + imgRes.save(&buffer, formatChars.data()); + QString Base64Image = QString::fromLatin1(imageData.toBase64().data());//is null + par->insertHtml(QLatin1String("<img src=\"data:") + filetype + QLatin1String(";base64,") + Base64Image + QLatin1String("\" />")); + + } + } +} diff --git a/src/noteshared/noteeditorutils.h b/src/noteshared/noteeditorutils.h index 149a308..5be91fd 100644 --- a/src/noteshared/noteeditorutils.h +++ b/src/noteshared/noteeditorutils.h @@ -20,6 +20,8 @@ class QTextCursor; class QTextEdit; +class QTextDocument; +class QWidget; namespace NoteShared { @@ -29,6 +31,7 @@ public: NoteEditorUtils(); void addCheckmark(QTextCursor &cursor); void insertDate(QTextEdit *editor); + void insertImage(QTextDocument *doc, QTextCursor &cursor, QTextEdit *par); }; } #endif // NOTEEDITORUTILS_H ++++++ fix-appstream.diff ++++++ >From 472b683c6c499cbe1808b73cfd0144f21e652cbb Mon Sep 17 00:00:00 2001 From: Luigi Toscano <[email protected]> Date: Fri, 11 Mar 2016 18:24:55 +0100 Subject: Rename appdata file to match the desktop file diff --git a/CMakeLists.txt b/CMakeLists.txt index 150bf05..136eded 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -55,7 +55,7 @@ install(DIRECTORY themes PATTERN *.svn EXCLUDE ) -install(FILES data/Kjots.appdata.xml +install(FILES data/org.kde.kjots.appdata.xml DESTINATION ${CMAKE_INSTALL_METAINFODIR} ) install(FILES data/org.kde.kjots.desktop diff -urNB a/data/Kjots.appdata.xml b/data/Kjots.appdata.xml --- a/data/Kjots.appdata.xml 2016-01-27 19:08:12.000000000 +0100 +++ b/data/Kjots.appdata.xml 1970-01-01 01:00:00.000000000 +0100 @@ -1,147 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<component type="desktop"> - <id>Kjots.desktop</id> - <metadata_license>CC0-1.0</metadata_license> - <name>KJots</name> - <name xml:lang="ca">KJots</name> - <name xml:lang="ca-valencia">KJots</name> - <name xml:lang="da">KJots</name> - <name xml:lang="de">KJots</name> - <name xml:lang="es">KJots</name> - <name xml:lang="fi">KJots</name> - <name xml:lang="gl">KJots</name> - <name xml:lang="it">KJots</name> - <name xml:lang="nl">KJots</name> - <name xml:lang="pl">KJots</name> - <name xml:lang="pt">KJots</name> - <name xml:lang="pt-BR">KJots</name> - <name xml:lang="sk">KJots</name> - <name xml:lang="sv">Kjots</name> - <name xml:lang="uk">KJots</name> - <name xml:lang="x-test">xxKJotsxx</name> - <name xml:lang="zh-CN">KJots</name> - <description> - <p> - KJots organises all of your notes into separate books - </p> - <p xml:lang="ca">El KJots organitza totes les vostres notes en llibres separats</p> - <p xml:lang="ca-valencia">El KJots organitza totes les vostres notes en llibres separats</p> - <p xml:lang="de">KJots sortiert alle Ihre Notizen in getrennte Bücher</p> - <p xml:lang="es">KJots organiza todas sus notas en libros separados</p> - <p xml:lang="fi">KJots järjestää muistiinpanosi erillisiksi kirjoiksi</p> - <p xml:lang="gl">KJots organiza todas as súas notas en cadernos separados.</p> - <p xml:lang="it">KJots organizza tutte le tue note in libri separati</p> - <p xml:lang="nl">KJots organiseert al uw notities in gescheiden boeken</p> - <p xml:lang="pl">KJots porządkuje twoje notatki w osobnych notesach</p> - <p xml:lang="pt">O KJots organiza todas as suas notas em livros separados</p> - <p xml:lang="pt-BR">O KJots organiza todas as suas notas em livros separados</p> - <p xml:lang="sv">KJots organiserar alla anteckningar i separata böcker</p> - <p xml:lang="uk">KJots — програма для упорядковування ваших нотаток за окремими записниками.</p> - <p xml:lang="x-test">xxKJots organises all of your notes into separate booksxx</p> - <p>Features:</p> - <p xml:lang="ca">Característiques:</p> - <p xml:lang="ca-valencia">Característiques:</p> - <p xml:lang="da">Funktioner:</p> - <p xml:lang="de">Funktionen:</p> - <p xml:lang="es">Funciones:</p> - <p xml:lang="fi">Ominaisuuksia:</p> - <p xml:lang="gl">Funcionalidades:</p> - <p xml:lang="it">Funzionalità:</p> - <p xml:lang="nl">Mogelijkheden:</p> - <p xml:lang="pl">Możliwości:</p> - <p xml:lang="pt">Funcionalidades:</p> - <p xml:lang="pt-BR">Funcionalidades:</p> - <p xml:lang="sk">Funkcie:</p> - <p xml:lang="sv">Funktioner:</p> - <p xml:lang="uk">Можливості:</p> - <p xml:lang="x-test">xxFeatures:xx</p> - <p xml:lang="zh-CN">功能：</p> - <ul> - <li>Multiple books handled</li> - <li xml:lang="ca">Maneja múltiples llibres</li> - <li xml:lang="ca-valencia">Maneja múltiples llibres</li> - <li xml:lang="es">Manejo de múltiples libros</li> - <li xml:lang="fi">Hallitsee useampia muistikirjoja</li> - <li xml:lang="gl">Xestiona varios cadernos.</li> - <li xml:lang="it">Più libri gestiti</li> - <li xml:lang="nl">Meerdere boeken worden behandeld</li> - <li xml:lang="pl">Obsługa wielu notesów</li> - <li xml:lang="pt">Tratamento de múltiplos livros</li> - <li xml:lang="pt-BR">Manipulação de múltiplos livros</li> - <li xml:lang="sv">Flera böcker hanteras</li> - <li xml:lang="uk">можливість роботи з декількома записниками одночасно;</li> - <li xml:lang="x-test">xxMultiple books handledxx</li> - <li>Each book has many named pages</li> - <li xml:lang="ca">Cada llibre conté moltes pàgines amb nom</li> - <li xml:lang="ca-valencia">Cada llibre conté moltes pàgines amb nom</li> - <li xml:lang="de">Jedes Buch hat viele benannte Seiten</li> - <li xml:lang="es">Cada libro puede contener numerosas páginas con nombre</li> - <li xml:lang="fi">Kussakin kirjassa on useampia nimettyjä sivuja</li> - <li xml:lang="gl">Cada caderno ten varias páxinas con nome de seu.</li> - <li xml:lang="it">Ogni libro ha molte pagine con nome</li> - <li xml:lang="nl">Elk boek heeft veel genoemde pagina's</li> - <li xml:lang="pl">Każdy notes ma wiele stron z nazwami</li> - <li xml:lang="pt">Cada livro tem várias páginas com nome</li> - <li xml:lang="pt-BR">Cada livro possui várias páginas com nome</li> - <li xml:lang="sv">Varje bok har många namngivna sidor</li> - <li xml:lang="uk">можливість використання довільної кількості іменованих сторінок;</li> - <li xml:lang="x-test">xxEach book has many named pagesxx</li> - <li>Books and pages can be rearranged by drag-and-drop</li> - <li xml:lang="ca">Els llibres i les pàgines es poden tornar a ordenar fent un arrossega i deixa</li> - <li xml:lang="ca-valencia">Els llibres i les pàgines es poden tornar a ordenar fent un arrossega i deixa</li> - <li xml:lang="de">Bücher und Seiten können per Ziehen und Ablegen sortiert werden</li> - <li xml:lang="es">Los libros y las páginas se pueden organizar y arrastrar</li> - <li xml:lang="fi">Kirjoja ja sivuja voi järjestää uudelleen vetämällä ja pudottamalla</li> - <li xml:lang="gl">Pode arrastrar e soltar para organizar os cadernos e páxinas.</li> - <li xml:lang="it">Libri e pagine possono essere riorganizzati con il trascinamento e rilascio</li> - <li xml:lang="nl">Boeken en pagina's kunnen opnieuw gerangschikt worden met slepen-en-loslaten</li> - <li xml:lang="pl">Notesy i strony można dowolnie ustawiać poprzez przeciąganie i upuszczanie</li> - <li xml:lang="pt">Os livros e páginas podem ser reorganizadas por arrastamento</li> - <li xml:lang="pt-BR">Os livros e páginas podem ser reorganizados com arrastar e soltar</li> - <li xml:lang="sv">Böcker och sidor kan arrangeras med drag och släpp.</li> - <li xml:lang="uk">можливість перевпорядковування записників і сторінок перетягуванням зі скиданням;</li> - <li xml:lang="x-test">xxBooks and pages can be rearranged by drag-and-dropxx</li> - <li>Keyboard shortcuts are available for many functions</li> - <li xml:lang="ca">Hi ha disponibles dreceres de teclat per a moltes funcions</li> - <li xml:lang="ca-valencia">Hi ha disponibles dreceres de teclat per a moltes funcions</li> - <li xml:lang="de">Für viele Funktionen stehen Tastenkürzel zur Verfügung</li> - <li xml:lang="es">Dispone de accesos rápidos de teclado para muchas funciones</li> - <li xml:lang="fi">Moniin toimintoihin on pikanäppäimet</li> - <li xml:lang="gl">Moitas funcionalidades contan con atallos de teclado.</li> - <li xml:lang="it">Scorciatoie da tastiera sono disponibili per molte funzioni</li> - <li xml:lang="nl">Sneltoetsen zijn beschikbaar voor veel functies</li> - <li xml:lang="pl">Skróty klawiaturowe są dostępne dla wielu funkcji</li> - <li xml:lang="pt">Estão disponíveis atalhos de teclado para diversas funções</li> - <li xml:lang="pt-BR">Estão disponíveis atalhos de teclado para diversas funções</li> - <li xml:lang="sv">Snabbtangenter är tillgängliga för många funktioner</li> - <li xml:lang="uk">доступ до багатьох функціональних можливостей програми за допомогою натискання комбінацій клавіш;</li> - <li xml:lang="x-test">xxKeyboard shortcuts are available for many functionsxx</li> - <li>Automatic saving means your notes are safe from loss</li> - <li xml:lang="ca">El desat automàtic significa que les vostres notes estaran fora de perill d'una pèrdua</li> - <li xml:lang="ca-valencia">El guardat automàtic significa que les vostres notes estaran fora de perill d'una pèrdua</li> - <li xml:lang="de">Automatisches Speichern verhindert den Verlust von Notizen</li> - <li xml:lang="es">Las notas se guardan automáticamente para evitar que se pierdan</li> - <li xml:lang="fi">Automaattitallennuksen ansiosta muistiinpanosi on turvassa</li> - <li xml:lang="gl">Os datos gárdanse automaticamente para evitar a perda de datos.</li> - <li xml:lang="it">Salvataggio automatico significa che le tue note sono al sicuro da perdite</li> - <li xml:lang="nl">Automatisch opslaan betekend dat uw notities veilig zijn voor verlies</li> - <li xml:lang="pl">Samoczynne zapisywanie oznacza, że twoje notatki są zabezpieczone od utraty</li> - <li xml:lang="pt">A gravação automática significa que as suas notas estão seguras contra perdas</li> - <li xml:lang="pt-BR">A gravação automática mantém suas notas seguras contra perda de dados</li> - <li xml:lang="sv">Anteckningarna är säkrade från förlust genom att spara automatiskt</li> - <li xml:lang="uk">автоматичне збереження даних, що забезпечує надійне зберігання ваших даних без втрат.</li> - <li xml:lang="x-test">xxAutomatic saving means your notes are safe from lossxx</li> - </ul> - </description> - <url type="bugtracker">https://bugs.kde.org/enter_bug.cgi?format=guided&product=kjots</url> - <url type="help">http://docs.kde.org/stable/en/kdepim/kjots/index.html</url> - <screenshots> - <screenshot type="default"> - <image>http://kde.org/images/screenshots/kjots.png</image> - </screenshot> - </screenshots> - <project_group>KDE</project_group> - <provides> - <binary>kjots</binary> - </provides> -</component> diff -urNB a/data/org.kde.kjots.appdata.xml b/data/org.kde.kjots.appdata.xml --- a/data/org.kde.kjots.appdata.xml 1970-01-01 01:00:00.000000000 +0100 +++ b/data/org.kde.kjots.appdata.xml 2016-09-10 16:00:17.773880549 +0200 @@ -0,0 +1,147 @@ +<?xml version="1.0" encoding="utf-8"?> +<component type="desktop"> + <id>org.kde.kjots.desktop</id> + <metadata_license>CC0-1.0</metadata_license> + <name>KJots</name> + <name xml:lang="ca">KJots</name> + <name xml:lang="ca-valencia">KJots</name> + <name xml:lang="da">KJots</name> + <name xml:lang="de">KJots</name> + <name xml:lang="es">KJots</name> + <name xml:lang="fi">KJots</name> + <name xml:lang="gl">KJots</name> + <name xml:lang="it">KJots</name> + <name xml:lang="nl">KJots</name> + <name xml:lang="pl">KJots</name> + <name xml:lang="pt">KJots</name> + <name xml:lang="pt-BR">KJots</name> + <name xml:lang="sk">KJots</name> + <name xml:lang="sv">Kjots</name> + <name xml:lang="uk">KJots</name> + <name xml:lang="x-test">xxKJotsxx</name> + <name xml:lang="zh-CN">KJots</name> + <description> + <p> + KJots organises all of your notes into separate books + </p> + <p xml:lang="ca">El KJots organitza totes les vostres notes en llibres separats</p> + <p xml:lang="ca-valencia">El KJots organitza totes les vostres notes en llibres separats</p> + <p xml:lang="de">KJots sortiert alle Ihre Notizen in getrennte Bücher</p> + <p xml:lang="es">KJots organiza todas sus notas en libros separados</p> + <p xml:lang="fi">KJots järjestää muistiinpanosi erillisiksi kirjoiksi</p> + <p xml:lang="gl">KJots organiza todas as súas notas en cadernos separados.</p> + <p xml:lang="it">KJots organizza tutte le tue note in libri separati</p> + <p xml:lang="nl">KJots organiseert al uw notities in gescheiden boeken</p> + <p xml:lang="pl">KJots porządkuje twoje notatki w osobnych notesach</p> + <p xml:lang="pt">O KJots organiza todas as suas notas em livros separados</p> + <p xml:lang="pt-BR">O KJots organiza todas as suas notas em livros separados</p> + <p xml:lang="sv">KJots organiserar alla anteckningar i separata böcker</p> + <p xml:lang="uk">KJots — програма для упорядковування ваших нотаток за окремими записниками.</p> + <p xml:lang="x-test">xxKJots organises all of your notes into separate booksxx</p> + <p>Features:</p> + <p xml:lang="ca">Característiques:</p> + <p xml:lang="ca-valencia">Característiques:</p> + <p xml:lang="da">Funktioner:</p> + <p xml:lang="de">Funktionen:</p> + <p xml:lang="es">Funciones:</p> + <p xml:lang="fi">Ominaisuuksia:</p> + <p xml:lang="gl">Funcionalidades:</p> + <p xml:lang="it">Funzionalità:</p> + <p xml:lang="nl">Mogelijkheden:</p> + <p xml:lang="pl">Możliwości:</p> + <p xml:lang="pt">Funcionalidades:</p> + <p xml:lang="pt-BR">Funcionalidades:</p> + <p xml:lang="sk">Funkcie:</p> + <p xml:lang="sv">Funktioner:</p> + <p xml:lang="uk">Можливості:</p> + <p xml:lang="x-test">xxFeatures:xx</p> + <p xml:lang="zh-CN">功能：</p> + <ul> + <li>Multiple books handled</li> + <li xml:lang="ca">Maneja múltiples llibres</li> + <li xml:lang="ca-valencia">Maneja múltiples llibres</li> + <li xml:lang="es">Manejo de múltiples libros</li> + <li xml:lang="fi">Hallitsee useampia muistikirjoja</li> + <li xml:lang="gl">Xestiona varios cadernos.</li> + <li xml:lang="it">Più libri gestiti</li> + <li xml:lang="nl">Meerdere boeken worden behandeld</li> + <li xml:lang="pl">Obsługa wielu notesów</li> + <li xml:lang="pt">Tratamento de múltiplos livros</li> + <li xml:lang="pt-BR">Manipulação de múltiplos livros</li> + <li xml:lang="sv">Flera böcker hanteras</li> + <li xml:lang="uk">можливість роботи з декількома записниками одночасно;</li> + <li xml:lang="x-test">xxMultiple books handledxx</li> + <li>Each book has many named pages</li> + <li xml:lang="ca">Cada llibre conté moltes pàgines amb nom</li> + <li xml:lang="ca-valencia">Cada llibre conté moltes pàgines amb nom</li> + <li xml:lang="de">Jedes Buch hat viele benannte Seiten</li> + <li xml:lang="es">Cada libro puede contener numerosas páginas con nombre</li> + <li xml:lang="fi">Kussakin kirjassa on useampia nimettyjä sivuja</li> + <li xml:lang="gl">Cada caderno ten varias páxinas con nome de seu.</li> + <li xml:lang="it">Ogni libro ha molte pagine con nome</li> + <li xml:lang="nl">Elk boek heeft veel genoemde pagina's</li> + <li xml:lang="pl">Każdy notes ma wiele stron z nazwami</li> + <li xml:lang="pt">Cada livro tem várias páginas com nome</li> + <li xml:lang="pt-BR">Cada livro possui várias páginas com nome</li> + <li xml:lang="sv">Varje bok har många namngivna sidor</li> + <li xml:lang="uk">можливість використання довільної кількості іменованих сторінок;</li> + <li xml:lang="x-test">xxEach book has many named pagesxx</li> + <li>Books and pages can be rearranged by drag-and-drop</li> + <li xml:lang="ca">Els llibres i les pàgines es poden tornar a ordenar fent un arrossega i deixa</li> + <li xml:lang="ca-valencia">Els llibres i les pàgines es poden tornar a ordenar fent un arrossega i deixa</li> + <li xml:lang="de">Bücher und Seiten können per Ziehen und Ablegen sortiert werden</li> + <li xml:lang="es">Los libros y las páginas se pueden organizar y arrastrar</li> + <li xml:lang="fi">Kirjoja ja sivuja voi järjestää uudelleen vetämällä ja pudottamalla</li> + <li xml:lang="gl">Pode arrastrar e soltar para organizar os cadernos e páxinas.</li> + <li xml:lang="it">Libri e pagine possono essere riorganizzati con il trascinamento e rilascio</li> + <li xml:lang="nl">Boeken en pagina's kunnen opnieuw gerangschikt worden met slepen-en-loslaten</li> + <li xml:lang="pl">Notesy i strony można dowolnie ustawiać poprzez przeciąganie i upuszczanie</li> + <li xml:lang="pt">Os livros e páginas podem ser reorganizadas por arrastamento</li> + <li xml:lang="pt-BR">Os livros e páginas podem ser reorganizados com arrastar e soltar</li> + <li xml:lang="sv">Böcker och sidor kan arrangeras med drag och släpp.</li> + <li xml:lang="uk">можливість перевпорядковування записників і сторінок перетягуванням зі скиданням;</li> + <li xml:lang="x-test">xxBooks and pages can be rearranged by drag-and-dropxx</li> + <li>Keyboard shortcuts are available for many functions</li> + <li xml:lang="ca">Hi ha disponibles dreceres de teclat per a moltes funcions</li> + <li xml:lang="ca-valencia">Hi ha disponibles dreceres de teclat per a moltes funcions</li> + <li xml:lang="de">Für viele Funktionen stehen Tastenkürzel zur Verfügung</li> + <li xml:lang="es">Dispone de accesos rápidos de teclado para muchas funciones</li> + <li xml:lang="fi">Moniin toimintoihin on pikanäppäimet</li> + <li xml:lang="gl">Moitas funcionalidades contan con atallos de teclado.</li> + <li xml:lang="it">Scorciatoie da tastiera sono disponibili per molte funzioni</li> + <li xml:lang="nl">Sneltoetsen zijn beschikbaar voor veel functies</li> + <li xml:lang="pl">Skróty klawiaturowe są dostępne dla wielu funkcji</li> + <li xml:lang="pt">Estão disponíveis atalhos de teclado para diversas funções</li> + <li xml:lang="pt-BR">Estão disponíveis atalhos de teclado para diversas funções</li> + <li xml:lang="sv">Snabbtangenter är tillgängliga för många funktioner</li> + <li xml:lang="uk">доступ до багатьох функціональних можливостей програми за допомогою натискання комбінацій клавіш;</li> + <li xml:lang="x-test">xxKeyboard shortcuts are available for many functionsxx</li> + <li>Automatic saving means your notes are safe from loss</li> + <li xml:lang="ca">El desat automàtic significa que les vostres notes estaran fora de perill d'una pèrdua</li> + <li xml:lang="ca-valencia">El guardat automàtic significa que les vostres notes estaran fora de perill d'una pèrdua</li> + <li xml:lang="de">Automatisches Speichern verhindert den Verlust von Notizen</li> + <li xml:lang="es">Las notas se guardan automáticamente para evitar que se pierdan</li> + <li xml:lang="fi">Automaattitallennuksen ansiosta muistiinpanosi on turvassa</li> + <li xml:lang="gl">Os datos gárdanse automaticamente para evitar a perda de datos.</li> + <li xml:lang="it">Salvataggio automatico significa che le tue note sono al sicuro da perdite</li> + <li xml:lang="nl">Automatisch opslaan betekend dat uw notities veilig zijn voor verlies</li> + <li xml:lang="pl">Samoczynne zapisywanie oznacza, że twoje notatki są zabezpieczone od utraty</li> + <li xml:lang="pt">A gravação automática significa que as suas notas estão seguras contra perdas</li> + <li xml:lang="pt-BR">A gravação automática mantém suas notas seguras contra perda de dados</li> + <li xml:lang="sv">Anteckningarna är säkrade från förlust genom att spara automatiskt</li> + <li xml:lang="uk">автоматичне збереження даних, що забезпечує надійне зберігання ваших даних без втрат.</li> + <li xml:lang="x-test">xxAutomatic saving means your notes are safe from lossxx</li> + </ul> + </description> + <url type="bugtracker">https://bugs.kde.org/enter_bug.cgi?format=guided&product=kjots</url> + <url type="help">http://docs.kde.org/stable/en/kdepim/kjots/index.html</url> + <screenshots> + <screenshot type="default"> + <image>http://kde.org/images/screenshots/kjots.png</image> + </screenshot> + </screenshots> + <project_group>KDE</project_group> + <provides> + <binary>kjots</binary> + </provides> +</component> ++++++ fix-icons.diff ++++++ >From 71673cd981ceba831818151346270c178bcbcafa Mon Sep 17 00:00:00 2001 From: Raymond Wooninck <[email protected]> Date: Sat, 10 Sep 2016 11:03:56 +0200 Subject: Fix build with newer Frameworks and port kde4_add_app_icon to ecm_add_app_icon CCMAIL: [email protected] diff --git a/CMakeLists.txt b/CMakeLists.txt index d1dcb85..7541ccd 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -13,6 +13,7 @@ include(KDECMakeSettings) include(KDECompilerSettings) include(ECMInstallIcons) include(ECMQtDeclareLoggingCategory) +include(ECMAddAppIcon) set(KJOTS_VERSION "5.0.1") @@ -23,6 +24,10 @@ set(KMIME_LIB_VERSION "4.87.0") set(PIMTEXTEDIT_LIB_VERSION "4.91.0") set(KONTACTINTERFACE_LIB_VERSION "4.82.0") +#Qt Packages +set(QT_REQUIRED_VERSION "5.6.0") +find_package(Qt5 ${QT_REQUIRED_VERSION} CONFIG REQUIRED DBus PrintSupport) + # KF5 Packages find_package(KF5KCMUtils ${KF5_VERSION} CONFIG REQUIRED) find_package(KF5KIO ${KF5_VERSION} CONFIG REQUIRED) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index b1e8bcf..e10fcb8 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -81,8 +81,9 @@ set(kjots_SRCS main.cpp KJotsMain.cpp ) -kde4_add_app_icon(kjots_SRCS "${CMAKE_CURRENT_SOURCE_DIR}/icons/hi*-apps-kjots.png") -# TODO: ECM_ADD_APP_ICON? + +file(GLOB ICONS_SRCS "${CMAKE_SOURCE_DIR}/icons/*-apps-kjots.png") +ecm_add_app_icon(kjots_SRCS ICONS ${ICONS_SRCS}) add_executable(kjots ${kjots_SRCS})
