Hello community, here is the log from the commit of package rocs for openSUSE:Factory checked in at 2016-05-29 03:08:01 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/rocs (Old) and /work/SRC/openSUSE:Factory/.rocs.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "rocs" Changes: -------- --- /work/SRC/openSUSE:Factory/rocs/rocs.changes 2016-03-29 10:38:03.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.rocs.new/rocs.changes 2016-05-29 03:08:03.000000000 +0200 @@ -1,0 +2,24 @@ +Sat May 7 10:45:23 UTC 2016 - [email protected] + +- Update to KDE Applications 16.04.1 + * KDE Applications 16.04.1 + * https://www.kde.org/announcements/announce-applications-16.04.1.php + + +------------------------------------------------------------------- +Sun Apr 17 06:21:25 UTC 2016 - [email protected] + +- Update to KDE Applications 16.04.0 + * KDE Applications 16.04.0 + * https://www.kde.org/announcements/announce-applications-16.04.0.php + + +------------------------------------------------------------------- +Mon Apr 11 06:56:16 UTC 2016 - [email protected] + +- Update to KDE Applications 16.03.90 + * KDE Applications 16.04.0 RC + * https://www.kde.org/announcements/announce-applications-16.04-rc.php + + +------------------------------------------------------------------- Old: ---- rocs-15.12.3.tar.xz New: ---- rocs-16.04.1.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ rocs.spec ++++++ --- /var/tmp/diff_new_pack.xllYGh/_old 2016-05-29 03:08:03.000000000 +0200 +++ /var/tmp/diff_new_pack.xllYGh/_new 2016-05-29 03:08:03.000000000 +0200 @@ -17,7 +17,7 @@ Name: rocs -Version: 15.12.3 +Version: 16.04.1 Release: 0 Summary: Graph Theory IDE License: GPL-3.0+ @@ -101,7 +101,6 @@ %doc %lang(en) %{_kf5_htmldir}/en/rocs/ %{_kf5_applicationsdir}/org.kde.rocs.desktop %{_kf5_sharedir}/rocs/ -%{_kf5_sharedir}/rocsgraphtheory/ %{_kf5_bindir}/rocs %{_kf5_configkcfgdir}/ %dir %{_kf5_sharedir}/appdata ++++++ rocs-15.12.3.tar.xz -> rocs-16.04.1.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rocs-15.12.3/CMakeLists.txt new/rocs-16.04.1/CMakeLists.txt --- old/rocs-15.12.3/CMakeLists.txt 2016-01-24 13:10:42.000000000 +0100 +++ new/rocs-16.04.1/CMakeLists.txt 2016-04-18 21:26:08.000000000 +0200 @@ -20,11 +20,8 @@ project(rocs) cmake_minimum_required(VERSION 3.0.0) -if (POLICY CMP0063) - cmake_policy(SET CMP0063 NEW) -endif() -find_package(ECM 1.7.0 REQUIRED NO_MODULE) +find_package(ECM 5.15.0 REQUIRED NO_MODULE) find_package(KF5DocTools) find_package(Boost "1.49" REQUIRED) find_package(Grantlee5 "5.0.0" REQUIRED) @@ -36,7 +33,7 @@ include(ECMOptionalAddSubdirectory) include(ECMSetupVersion) include(KDEInstallDirs) -include(KDECompilerSettings) +include(KDECompilerSettings NO_POLICY_SCOPE) include(KDECMakeSettings) include(FeatureSummary) include(GenerateExportHeader) @@ -54,13 +51,12 @@ Test XmlPatterns ) -find_package(KF5 5.7 REQUIRED COMPONENTS +find_package(KF5 5.15 REQUIRED COMPONENTS Archive Config CoreAddons Crash Declarative - DocTools I18n ItemViews TextEditor @@ -83,9 +79,11 @@ ecm_optional_add_subdirectory(libgraphtheory) ecm_optional_add_subdirectory(src) ecm_optional_add_subdirectory(icons) -ecm_optional_add_subdirectory(doc) +if(KF5DocTools_FOUND) + ecm_optional_add_subdirectory(doc) +endif() set_package_info(Boost "Boost C++ Libraries" "http://www.boost.org";) feature_summary(WHAT ALL) -install(FILES org.kde.rocs.appdata.xml DESTINATION ${SHARE_INSTALL_PREFIX}/appdata/) +install(FILES org.kde.rocs.appdata.xml DESTINATION ${CMAKE_INSTALL_METAINFODIR}) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rocs-15.12.3/libgraphtheory/CMakeLists.txt new/rocs-16.04.1/libgraphtheory/CMakeLists.txt --- old/rocs-15.12.3/libgraphtheory/CMakeLists.txt 2016-01-24 13:10:42.000000000 +0100 +++ new/rocs-16.04.1/libgraphtheory/CMakeLists.txt 2016-04-18 21:26:08.000000000 +0200 @@ -68,6 +68,7 @@ qtquickitems/qsgarrowheadnode.cpp qtquickitems/qsglinenode.cpp ) +qt5_add_resources(graphtheory_SRCS qml/rocs.qrc) ki18n_wrap_ui(graphtheory_SRCS dialogs/nodeproperties.ui diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rocs-15.12.3/libgraphtheory/Messages.sh new/rocs-16.04.1/libgraphtheory/Messages.sh --- old/rocs-15.12.3/libgraphtheory/Messages.sh 2016-01-24 13:10:42.000000000 +0100 +++ new/rocs-16.04.1/libgraphtheory/Messages.sh 2016-04-18 21:26:08.000000000 +0200 @@ -1,4 +1,5 @@ #! /usr/bin/env bash $EXTRACTRC `find . -name \*.ui` >> rc.cpp +$EXTRACTRC --context="Scripting API" --tag-group=none --tag=para --tag=info `find kernel/modules/* -iname '*.xml'` >> rc.cpp $XGETTEXT `find . -name \*.cpp -o -name \*.qml` -o $podir/libgraphtheory.pot rm -f rc.cpp diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rocs-15.12.3/libgraphtheory/editorplugins/generategraph/generategraphplugin.json new/rocs-16.04.1/libgraphtheory/editorplugins/generategraph/generategraphplugin.json --- old/rocs-15.12.3/libgraphtheory/editorplugins/generategraph/generategraphplugin.json 2016-01-24 13:10:42.000000000 +0100 +++ new/rocs-16.04.1/libgraphtheory/editorplugins/generategraph/generategraphplugin.json 2016-04-18 21:26:08.000000000 +0200 @@ -3,6 +3,7 @@ "KPlugin": { "Category": "Plugins", "Description": "This generates a new graph by a pattern.", + "Description[ast]": "Esto xenera un grafu nuevu por un patrón.", "Description[ca@valencia]": "Això genera un nou graf segons un patró.", "Description[ca]": "Això genera un nou graf segons un patró.", "Description[de]": "Erstellt anhand eines Musters einen neuen Graphen.", diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rocs-15.12.3/libgraphtheory/editorplugins/transformedges/transformedgesplugin.json new/rocs-16.04.1/libgraphtheory/editorplugins/transformedges/transformedgesplugin.json --- old/rocs-15.12.3/libgraphtheory/editorplugins/transformedges/transformedgesplugin.json 2016-01-24 13:10:42.000000000 +0100 +++ new/rocs-16.04.1/libgraphtheory/editorplugins/transformedges/transformedgesplugin.json 2016-04-18 21:26:08.000000000 +0200 @@ -3,6 +3,7 @@ "KPlugin": { "Category": "Plugins", "Description": "Transform graph edges by a transformation rule.", + "Description[ast]": "Tresforma los berbesos del grafu pente una regla de tresformación.", "Description[ca@valencia]": "Transforma les arestes del graf seguint una regla de transformació.", "Description[ca]": "Transforma les arestes del graf seguint una regla de transformació.", "Description[de]": "Graphenkanten mittels Transformationsregel umformen.", diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rocs-15.12.3/libgraphtheory/fileformats/dot/dotfileformat.json new/rocs-16.04.1/libgraphtheory/fileformats/dot/dotfileformat.json --- old/rocs-15.12.3/libgraphtheory/fileformats/dot/dotfileformat.json 2016-01-24 13:10:42.000000000 +0100 +++ new/rocs-16.04.1/libgraphtheory/fileformats/dot/dotfileformat.json 2016-04-18 21:26:08.000000000 +0200 @@ -3,6 +3,7 @@ "KPlugin": { "Category": "Plugins", "Description": "Read and write Graphviz graph documents (DOT)", + "Description[ast]": "Llee y escribe documentos (DOT) de grafos Graphviz", "Description[ca@valencia]": "Llig i escriu documents gràfics del Graphviz (DOT).", "Description[ca]": "Llegeix i escriu documents gràfics del Graphviz (DOT).", "Description[cs]": "Čte a ukládá soubory grafů Graphviz (DOT)", diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rocs-15.12.3/libgraphtheory/fileformats/gml/gmlfileformat.json new/rocs-16.04.1/libgraphtheory/fileformats/gml/gmlfileformat.json --- old/rocs-15.12.3/libgraphtheory/fileformats/gml/gmlfileformat.json 2016-01-24 13:10:42.000000000 +0100 +++ new/rocs-16.04.1/libgraphtheory/fileformats/gml/gmlfileformat.json 2016-04-18 21:26:08.000000000 +0200 @@ -3,6 +3,7 @@ "KPlugin": { "Category": "Plugins", "Description": "Read and write Graph Markup Language documents (GML)", + "Description[ast]": "Llee y escribe documentos del llinguax de marques de grafos (GML)", "Description[ca@valencia]": "Llig i escriu fitxers escrits en Llenguatge de Marcatge de Gràfics (GML)", "Description[ca]": "Llegeix i escriu fitxers escrits en Llenguatge de Marcatge de Gràfics (GML)", "Description[cs]": "Číst a ukládat dokumenty Graph Markup Language (GML)", diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rocs-15.12.3/libgraphtheory/fileformats/rocs1/rocs1fileformat.json new/rocs-16.04.1/libgraphtheory/fileformats/rocs1/rocs1fileformat.json --- old/rocs-15.12.3/libgraphtheory/fileformats/rocs1/rocs1fileformat.json 2016-01-24 13:10:42.000000000 +0100 +++ new/rocs-16.04.1/libgraphtheory/fileformats/rocs1/rocs1fileformat.json 2016-04-18 21:26:08.000000000 +0200 @@ -3,6 +3,7 @@ "KPlugin": { "Category": "Plugins", "Description": "Rocs Graph File Format (old)", + "Description[ast]": "Formatu de ficheru de grafos Rocs (vieyu)", "Description[ca@valencia]": "Format de fitxers de grafs del Rocs (antic)", "Description[ca]": "Format de fitxers de grafs del Rocs (antic)", "Description[cs]": "Formát souborů grafů Rocs (starý)", diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rocs-15.12.3/libgraphtheory/fileformats/rocs2/rocs2fileformat.json new/rocs-16.04.1/libgraphtheory/fileformats/rocs2/rocs2fileformat.json --- old/rocs-15.12.3/libgraphtheory/fileformats/rocs2/rocs2fileformat.json 2016-01-24 13:10:42.000000000 +0100 +++ new/rocs-16.04.1/libgraphtheory/fileformats/rocs2/rocs2fileformat.json 2016-04-18 21:26:08.000000000 +0200 @@ -3,6 +3,7 @@ "KPlugin": { "Category": "Plugins", "Description": "Rocs Graph File Format", + "Description[ast]": "Formatu de ficheru de grafos Rocs", "Description[ca@valencia]": "Format de fitxers de graf del Rocs", "Description[ca]": "Format de fitxers de graf del Rocs", "Description[cs]": "Formát souborů grafů Rocs", diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rocs-15.12.3/libgraphtheory/fileformats/tgf/tgffileformat.json new/rocs-16.04.1/libgraphtheory/fileformats/tgf/tgffileformat.json --- old/rocs-15.12.3/libgraphtheory/fileformats/tgf/tgffileformat.json 2016-01-24 13:10:42.000000000 +0100 +++ new/rocs-16.04.1/libgraphtheory/fileformats/tgf/tgffileformat.json 2016-04-18 21:26:08.000000000 +0200 @@ -3,6 +3,7 @@ "KPlugin": { "Category": "Plugins", "Description": "Read and write graph documents in Trivial Graph Format (TGF)", + "Description[ast]": "Llee y escribe documentos nel formatu de grafos triviales (TGF)", "Description[ca@valencia]": "Llig i escriu fitxers escrits en Format Gràfic Trivial (TGF)", "Description[ca]": "Llegeix i escriu fitxers escrits en Format Gràfic Trivial (TGF)", "Description[de]": "Dokumente im Format „Trivial Graph“ (TGF) lesen und schreiben", diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rocs-15.12.3/libgraphtheory/fileformats/tikz/tikzfileformat.cpp new/rocs-16.04.1/libgraphtheory/fileformats/tikz/tikzfileformat.cpp --- old/rocs-15.12.3/libgraphtheory/fileformats/tikz/tikzfileformat.cpp 2016-01-24 13:10:42.000000000 +0100 +++ new/rocs-16.04.1/libgraphtheory/fileformats/tikz/tikzfileformat.cpp 2016-04-18 21:26:08.000000000 +0200 @@ -38,7 +38,7 @@ registerPlugin<TikzFileFormat>();) TikzFileFormat::TikzFileFormat(QObject* parent, const QList< QVariant >&) - : FileFormatInterface("rocs_tgffileformat", parent) + : FileFormatInterface("rocs_tikzfileformat", parent) { } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rocs-15.12.3/libgraphtheory/fileformats/tikz/tikzfileformat.json new/rocs-16.04.1/libgraphtheory/fileformats/tikz/tikzfileformat.json --- old/rocs-15.12.3/libgraphtheory/fileformats/tikz/tikzfileformat.json 2016-01-24 13:10:42.000000000 +0100 +++ new/rocs-16.04.1/libgraphtheory/fileformats/tikz/tikzfileformat.json 2016-04-18 21:26:08.000000000 +0200 @@ -3,6 +3,7 @@ "KPlugin": { "Category": "Plugins", "Description": "Writes graph documents in PGF/TikZ format for use in LaTeX documents", + "Description[ast]": "Escribe documentos de grafos nel formatu PGF/TikZ pal so usu en documentos LaTeX", "Description[ca@valencia]": "Escriu documents gràfics en format PGF/TikZ per utilitzar-los en documents LaTeX", "Description[ca]": "Escriu documents gràfics en format PGF/TikZ per utilitzar-los en documents LaTeX", "Description[de]": "Exportiert Graphendokumente im Format PGF/TikZ zur Verwendung in LaTeX-Dokumenten", diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rocs-15.12.3/libgraphtheory/kernel/modules/document/document.xml new/rocs-16.04.1/libgraphtheory/kernel/modules/document/document.xml --- old/rocs-15.12.3/libgraphtheory/kernel/modules/document/document.xml 2016-01-24 13:10:42.000000000 +0100 +++ new/rocs-16.04.1/libgraphtheory/kernel/modules/document/document.xml 2016-04-18 21:26:08.000000000 +0200 @@ -121,7 +121,7 @@ <parameter> <name>node</name> <type>Node</type> - <info>The to be deleted node.</info> + <info>The node to be deleted.</info> </parameter> </parameters> </method> @@ -135,7 +135,7 @@ <parameter> <name>edge</name> <type>Edge</type> - <info>The to be deleted edge.</info> + <info>The edge to be deleted.</info> </parameter> </parameters> </method> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rocs-15.12.3/libgraphtheory/kernel/modules/document/node.xml new/rocs-16.04.1/libgraphtheory/kernel/modules/document/node.xml --- old/rocs-15.12.3/libgraphtheory/kernel/modules/document/node.xml 2016-01-24 13:10:42.000000000 +0100 +++ new/rocs-16.04.1/libgraphtheory/kernel/modules/document/node.xml 2016-04-18 21:26:08.000000000 +0200 @@ -44,7 +44,7 @@ <property> <name>type</name> <description> - <para>Read at set the identifier of the node's type. If setting, the node type identifier must exist.</para> + <para>Read and set the identifier of the node's type. If setting, the node type identifier must exist.</para> </description> <type>string</type> </property> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rocs-15.12.3/libgraphtheory/qml/CMakeLists.txt new/rocs-16.04.1/libgraphtheory/qml/CMakeLists.txt --- old/rocs-15.12.3/libgraphtheory/qml/CMakeLists.txt 2016-01-24 13:10:42.000000000 +0100 +++ new/rocs-16.04.1/libgraphtheory/qml/CMakeLists.txt 1970-01-01 01:00:00.000000000 +0100 @@ -1,38 +0,0 @@ -### -# Copyright 2014 Andreas Cord-Landwehr <[email protected]> -# -# Redistribution and use in source and binary forms, with or without -# modification, are permitted provided that the following conditions -# are met: -# -# 1. Redistributions of source code must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# 2. Redistributions in binary form must reproduce the above copyright -# notice, this list of conditions and the following disclaimer in the -# documentation and/or other materials provided with the distribution. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR -# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES -# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. -# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, -# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT -# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF -# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -### - -set(graphtheory_qml_files - Scene.qml - AddNodeAction.qml - AddEdgeAction.qml - DeleteAction.qml - SelectMoveAction.qml - Line.qml - NodePropertyItem.qml - EdgePropertyItem.qml - SelectionRectangle.qml -) - -install(FILES ${graphtheory_qml_files} DESTINATION ${DATA_INSTALL_DIR}/rocsgraphtheory/qml) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rocs-15.12.3/libgraphtheory/qml/rocs.qrc new/rocs-16.04.1/libgraphtheory/qml/rocs.qrc --- old/rocs-15.12.3/libgraphtheory/qml/rocs.qrc 1970-01-01 01:00:00.000000000 +0100 +++ new/rocs-16.04.1/libgraphtheory/qml/rocs.qrc 2016-04-18 21:26:08.000000000 +0200 @@ -0,0 +1,13 @@ +<RCC> + <qresource prefix="/libgraphtheory/qml"> + <file>AddEdgeAction.qml</file> + <file>AddNodeAction.qml</file> + <file>DeleteAction.qml</file> + <file>EdgePropertyItem.qml</file> + <file>Line.qml</file> + <file>NodePropertyItem.qml</file> + <file>Scene.qml</file> + <file>SelectionRectangle.qml</file> + <file>SelectMoveAction.qml</file> + </qresource> +</RCC> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rocs-15.12.3/libgraphtheory/view.cpp new/rocs-16.04.1/libgraphtheory/view.cpp --- old/rocs-15.12.3/libgraphtheory/view.cpp 2016-01-24 13:10:42.000000000 +0100 +++ new/rocs-16.04.1/libgraphtheory/view.cpp 2016-04-18 21:26:08.000000000 +0200 @@ -100,8 +100,7 @@ qmlRegisterType<GraphTheory::NodeTypeModel>("org.kde.rocs.graphtheory", 1, 0, "NodeTypeModel"); qmlRegisterType<GraphTheory::EdgeTypeModel>("org.kde.rocs.graphtheory", 1, 0, "EdgeTypeModel"); - QUrl path = QUrl::fromLocalFile( - QStandardPaths::locate(QStandardPaths::GenericDataLocation, "rocsgraphtheory/qml/Scene.qml")); + QUrl path = QUrl("qrc:/libgraphtheory/qml/Scene.qml"); QQmlComponent *component = new QQmlComponent(engine()); component->loadUrl(path); if (!component->isReady() ) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rocs-15.12.3/src/autotests/test_project.cpp new/rocs-16.04.1/src/autotests/test_project.cpp --- old/rocs-15.12.3/src/autotests/test_project.cpp 2016-01-24 13:10:42.000000000 +0100 +++ new/rocs-16.04.1/src/autotests/test_project.cpp 2016-04-18 21:26:08.000000000 +0200 @@ -158,8 +158,8 @@ Project loadedProject(QUrl::fromLocalFile(projectFile.fileName()), graphEditor); QCOMPARE(loadedProject.codeDocuments().count(), 2); QCOMPARE(loadedProject.documentName(loadedProject.codeDocuments().at(0)), QString("A")); - QCOMPARE(loadedProject.codeDocuments().at(0)->text(), QString("1")); - QCOMPARE(loadedProject.codeDocuments().at(1)->text(), QString("2")); + QCOMPARE(loadedProject.codeDocuments().at(0)->text().trimmed(), QString("1")); + QCOMPARE(loadedProject.codeDocuments().at(1)->text().trimmed(), QString("2")); graphEditor->deleteLater(); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rocs-15.12.3/src/main.cpp new/rocs-16.04.1/src/main.cpp --- old/rocs-15.12.3/src/main.cpp 2016-01-24 13:10:42.000000000 +0100 +++ new/rocs-16.04.1/src/main.cpp 2016-04-18 21:26:08.000000000 +0200 @@ -27,7 +27,6 @@ #include <QDir> #include "rocsversion.h" -#include "logging_p.h" #include "ui/mainwindow.h" int main(int argc, char *argv[]) @@ -42,7 +41,7 @@ aboutData.setShortDescription(ki18nc("@title Short program description", "Graph Theory Simulator").toString()); // credits and authors (in alphabetical list) - aboutData.addCredit(ki18nc("@info:credit", "(c) 2008-2015 Rocs Developers").toString()); + aboutData.addCredit(ki18nc("@info:credit", "(c) 2008-2016 Rocs Developers").toString()); aboutData.addAuthor(ki18nc("@info:credit Developer name", "Andreas Cord-Landwehr").toString(), ki18nc("@info:credit Role", "Maintainer").toString(), "[email protected]", @@ -56,12 +55,11 @@ "[email protected]", "http://wiglot.wordpress.com";); - // TODO: for >=KF5.15 use KCrash::initialize(); - KCrash::setCrashHandler(KCrash::defaultCrashHandler); - QApplication app(argc, argv); app.setApplicationVersion(aboutData.version()); + KCrash::initialize(); + /** * Create command line parser and feed it with known options */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rocs-15.12.3/src/rocsui.rc new/rocs-16.04.1/src/rocsui.rc --- old/rocs-15.12.3/src/rocsui.rc 2016-01-24 13:10:42.000000000 +0100 +++ new/rocs-16.04.1/src/rocsui.rc 2016-04-18 21:26:08.000000000 +0200 @@ -62,25 +62,5 @@ </Menu> </Menu> </MenuBar> - - <ToolBar name="main" > - <text>Main Toolbar</text> - <Action name="selectmove" /> - <Action name="add_node" /> - <Action name="add_edge" /> - <Action name="delete" /> - <Action name="zoom" /> - </ToolBar> - <ToolBar name="align"> - <text>Align Toolbar</text> - <Action name="align-htop"/> - <Action name="align-hcenter"/> - <Action name="align-hbottom"/> - <Action name="align-vleft"/> - <Action name="align-vcenter"/> - <Action name="align-vright" /> - <Action name="align-circle" /> - <Action name="align-tree" /> - </ToolBar> </gui> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rocs-15.12.3/src/ui/edgetypesdelegate.cpp new/rocs-16.04.1/src/ui/edgetypesdelegate.cpp --- old/rocs-15.12.3/src/ui/edgetypesdelegate.cpp 2016-01-24 13:10:42.000000000 +0100 +++ new/rocs-16.04.1/src/ui/edgetypesdelegate.cpp 2016-04-18 21:26:08.000000000 +0200 @@ -24,6 +24,7 @@ #include "libgraphtheory/models/edgetypemodel.h" #include <KColorButton> #include <KLocalizedString> +#include <QAbstractItemView> #include <QToolButton> #include <QLabel> #include <QLineEdit> @@ -35,7 +36,7 @@ using namespace GraphTheory; EdgeTypesDelegate::EdgeTypesDelegate(QAbstractItemView* parent) - : KWidgetItemDelegate(parent) + : KWidgetItemDelegate(parent, parent->viewport()) { } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rocs-15.12.3/src/ui/mainwindow.cpp new/rocs-16.04.1/src/ui/mainwindow.cpp --- old/rocs-15.12.3/src/ui/mainwindow.cpp 2016-01-24 13:10:42.000000000 +0100 +++ new/rocs-16.04.1/src/ui/mainwindow.cpp 2016-04-18 21:26:08.000000000 +0200 @@ -83,7 +83,7 @@ setupWidgets(); setupActions(); - setupGUI(ToolBar | Keys | Save | Create); + setupGUI(Keys | Save | Create); setupToolsPluginsAction(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rocs-15.12.3/src/ui/nodetypesdelegate.cpp new/rocs-16.04.1/src/ui/nodetypesdelegate.cpp --- old/rocs-15.12.3/src/ui/nodetypesdelegate.cpp 2016-01-24 13:10:42.000000000 +0100 +++ new/rocs-16.04.1/src/ui/nodetypesdelegate.cpp 2016-04-18 21:26:08.000000000 +0200 @@ -25,6 +25,7 @@ #include <KColorButton> #include <KLocalizedString> #include <QApplication> +#include <QAbstractItemView> #include <QDebug> #include <QLabel> #include <QLineEdit> @@ -36,7 +37,7 @@ using namespace GraphTheory; NodeTypesDelegate::NodeTypesDelegate(QAbstractItemView* parent) - : KWidgetItemDelegate(parent) + : KWidgetItemDelegate(parent, parent->viewport()) { }
