Hello community, here is the log from the commit of package kalgebra for openSUSE:Factory checked in at 2016-05-29 03:08:42 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kalgebra (Old) and /work/SRC/openSUSE:Factory/.kalgebra.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kalgebra" Changes: -------- --- /work/SRC/openSUSE:Factory/kalgebra/kalgebra.changes 2016-03-29 09:57:23.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.kalgebra.new/kalgebra.changes 2016-05-29 03:08:47.000000000 +0200 @@ -1,0 +2,24 @@ +Sat May 7 10:15:14 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 05:55:30 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:33:14 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: ---- kalgebra-15.12.3.tar.xz New: ---- kalgebra-16.04.1.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kalgebra.spec ++++++ --- /var/tmp/diff_new_pack.2k2mJH/_old 2016-05-29 03:08:49.000000000 +0200 +++ /var/tmp/diff_new_pack.2k2mJH/_new 2016-05-29 03:08:49.000000000 +0200 @@ -21,7 +21,7 @@ License: GPL-2.0+ Group: Productivity/Scientific/Math Url: http://edu.kde.org -Version: 15.12.3 +Version: 16.04.1 Release: 0 Source0: %{name}-%{version}.tar.xz BuildRequires: analitza-devel ++++++ kalgebra-15.12.3.tar.xz -> kalgebra-16.04.1.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kalgebra-15.12.3/CMakeLists.txt new/kalgebra-16.04.1/CMakeLists.txt --- old/kalgebra-15.12.3/CMakeLists.txt 2016-01-14 23:03:30.000000000 +0100 +++ new/kalgebra-16.04.1/CMakeLists.txt 2016-04-06 19:57:19.000000000 +0200 @@ -6,7 +6,7 @@ find_package(Qt5 5.2 REQUIRED NO_MODULE COMPONENTS Qml Quick Xml Svg OpenGL PrintSupport Test) include(KDEInstallDirs) -include(KDECompilerSettings) +include(KDECompilerSettings NO_POLICY_SCOPE) include(KDECMakeSettings) include(ECMInstallIcons) include(FeatureSummary) @@ -43,8 +43,8 @@ find_package(KF5ConfigWidgets ${KF5_VERSION} REQUIRED) find_package(KF5WidgetsAddons ${KF5_VERSION} REQUIRED) find_package(KF5KIO REQUIRED) - find_package(KF5DocTools REQUIRED) find_package(Qt5WebKitWidgets REQUIRED) + find_package(KF5DocTools) add_subdirectory(src) add_subdirectory(plasmoids) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kalgebra-15.12.3/mobile/CMakeLists.txt new/kalgebra-16.04.1/mobile/CMakeLists.txt --- old/kalgebra-15.12.3/mobile/CMakeLists.txt 2016-01-14 23:03:30.000000000 +0100 +++ new/kalgebra-16.04.1/mobile/CMakeLists.txt 2016-04-06 19:57:19.000000000 +0200 @@ -1,6 +1,6 @@ add_subdirectory(plugins) -if(KDeclarative_FOUND) +if(KF5I18n_FOUND) add_definitions(-DKDECOMPONENTS) endif() @@ -19,8 +19,8 @@ # if we don't link it here explicitly, androiddeployqt doesn't bring it find_package(Qt5Svg REQUIRED) target_link_libraries(kalgebramobile Qt5::Svg) -elseif(KDeclarative_FOUND) - target_link_libraries(kalgebramobile KF5::KDeclarative) +elseif(KF5I18n_FOUND) + target_link_libraries(kalgebramobile KF5::I18n) endif() set(DESKTOPFILE kalgebramobile.desktop) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kalgebra-15.12.3/mobile/main.cpp new/kalgebra-16.04.1/mobile/main.cpp --- old/kalgebra-15.12.3/mobile/main.cpp 2016-01-14 23:03:30.000000000 +0100 +++ new/kalgebra-16.04.1/mobile/main.cpp 2016-04-06 19:57:19.000000000 +0200 @@ -19,7 +19,7 @@ #include <QGuiApplication> #ifdef KDECOMPONENTS -#include <kdeclarative/kdeclarative.h> +#include <KLocalizedContext> #endif #include <QDebug> @@ -47,14 +47,6 @@ KAlgebraMobile widget; -#ifdef KDECOMPONENTS - KDeclarative kdeclarative; -// kdeclarative.setDeclarativeEngine(view.engine()); -// kdeclarative.initialize(); - //binds things like kconfig and icons -// kdeclarative.setupBindings(); -#endif - QString main = PluginsModel::pluginsDirectoryPath()+"/widgets/KAlgebraMobile.qml"; QDir dir = QFileInfo(main).dir(); @@ -63,7 +55,11 @@ QQmlApplicationEngine engine; engine.rootContext()->setContextProperty(QStringLiteral("app"), &widget); engine.addImportPath(dir.path()); + +#ifdef KDECOMPONENTS + engine.rootContext()->setContextObject(new KLocalizedContext(&engine)); +#endif + engine.load(QUrl::fromLocalFile(main)); - return app.exec(); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kalgebra-15.12.3/mobile/plugins/CMakeLists.txt new/kalgebra-16.04.1/mobile/plugins/CMakeLists.txt --- old/kalgebra-15.12.3/mobile/plugins/CMakeLists.txt 2016-01-14 23:03:30.000000000 +0100 +++ new/kalgebra-16.04.1/mobile/plugins/CMakeLists.txt 2016-04-06 19:57:19.000000000 +0200 @@ -1,9 +1,9 @@ add_subdirectory(widgets) install( FILES - Console.qml Plot2D.qml Plot3D.qml Tables.qml + Console.qml Plot2D.qml Plot3D.qml Tables.qml Dictionary.qml About.qml VariablesView.qml kalgebraabout.json - kalgebraconsole.json kalgebraplot2d.json kalgebraplot3d.json kalgebratables.json kalgebravariables.json + kalgebraconsole.json kalgebraplot2d.json kalgebraplot3d.json kalgebratables.json kalgebravariables.json kalgebradictionary.json DESTINATION ${KDE_INSTALL_DATADIR}/kalgebramobile/plugins/ ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kalgebra-15.12.3/mobile/plugins/Dictionary.qml new/kalgebra-16.04.1/mobile/plugins/Dictionary.qml --- old/kalgebra-15.12.3/mobile/plugins/Dictionary.qml 1970-01-01 01:00:00.000000000 +0100 +++ new/kalgebra-16.04.1/mobile/plugins/Dictionary.qml 2016-04-06 19:57:19.000000000 +0200 @@ -0,0 +1,71 @@ +import QtQuick 2.0 +import QtQuick.Layouts 1.0 +import org.kde.analitza 1.0 +import widgets 1.0 + +KAlgebraPage +{ + id: page + anchors.margins: 0 + + function updateGraph() { + view.model.clear(); + view.resetViewport(); + view.addFunction(operators.data(operators.index(chosebox.currentIndex,3)), app.variables); + } + + ColumnLayout { + id: descriptioncol + + anchors.fill: parent + spacing: 10 + + ComboBox { + id: chosebox + Layout.fillWidth: true + textRole: "display" + + model: OperatorsModel { + id: operators + } + + onCurrentIndexChanged: { + page.updateGraph(); + } + } + + GridLayout { + id: descgrid + columns: 2 + Layout.fillWidth: true + + Label { text: operators.headerData(0,Qt.Horizontal) } + Label { text: operators.data(operators.index(chosebox.currentIndex,0)) } + Label { text: operators.headerData(1,Qt.Horizontal) } + Label { text: operators.data(operators.index(chosebox.currentIndex,1)) } + Label { text: operators.headerData(2,Qt.Horizontal) } + Label { text: operators.data(operators.index(chosebox.currentIndex,2)) } + Label { text: operators.headerData(3,Qt.Horizontal) } + Label { text: operators.data(operators.index(chosebox.currentIndex,3)) } + } + + Rectangle { + color: 'white' + Layout.fillWidth: true + Layout.fillHeight: true + + Graph2D { + id: view + anchors { + fill: parent + } + model: PlotsModel { + id: plotsModel + } + Component.onCompleted: { + page.updateGraph(); + } + } + } + } +} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kalgebra-15.12.3/mobile/plugins/kalgebradictionary.json new/kalgebra-16.04.1/mobile/plugins/kalgebradictionary.json --- old/kalgebra-15.12.3/mobile/plugins/kalgebradictionary.json 1970-01-01 01:00:00.000000000 +0100 +++ new/kalgebra-16.04.1/mobile/plugins/kalgebradictionary.json 2016-04-06 19:57:19.000000000 +0200 @@ -0,0 +1,13 @@ +{ + "Comment": "List of available functions", + "Icon": "documentation", + "Name": "Dictionary", + "ServiceTypes": "KAlgebra/Script", + "Type": "Service", + "X-KAlgebra-Priority": "100", + "X-KDE-PluginInfo-Author": "Artur Puzio", + "X-KDE-PluginInfo-Email": "[email protected]", + "X-KDE-PluginInfo-License": "GPL", + "X-KDE-PluginInfo-Name": "Dictionary.qml", + "X-KDE-PluginInfo-Version": "1.0" +} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kalgebra-15.12.3/mobile/plugins/widgets/material/CMakeLists.txt new/kalgebra-16.04.1/mobile/plugins/widgets/material/CMakeLists.txt --- old/kalgebra-15.12.3/mobile/plugins/widgets/material/CMakeLists.txt 2016-01-14 23:03:30.000000000 +0100 +++ new/kalgebra-16.04.1/mobile/plugins/widgets/material/CMakeLists.txt 2016-04-06 19:57:19.000000000 +0200 @@ -1,7 +1,7 @@ install( FILES Label.qml Button.qml CalcButton.qml ExpressionInput.qml RealInput.qml SimpleListView.qml - AddButton.qml Dialog.qml + AddButton.qml Dialog.qml ComboBox.qml KAlgebraPage.qml KAlgebraMobile.qml DESTINATION ${KDE_INSTALL_DATADIR}/kalgebramobile/plugins/widgets/ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kalgebra-15.12.3/mobile/plugins/widgets/material/ComboBox.qml new/kalgebra-16.04.1/mobile/plugins/widgets/material/ComboBox.qml --- old/kalgebra-15.12.3/mobile/plugins/widgets/material/ComboBox.qml 1970-01-01 01:00:00.000000000 +0100 +++ new/kalgebra-16.04.1/mobile/plugins/widgets/material/ComboBox.qml 2016-04-06 19:57:19.000000000 +0200 @@ -0,0 +1,6 @@ +import Material 0.1 + +MenuField { + id: root + property alias currentIndex: root.selectedIndex +} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kalgebra-15.12.3/mobile/plugins/widgets/qmldir new/kalgebra-16.04.1/mobile/plugins/widgets/qmldir --- old/kalgebra-15.12.3/mobile/plugins/widgets/qmldir 2016-01-14 23:03:30.000000000 +0100 +++ new/kalgebra-16.04.1/mobile/plugins/widgets/qmldir 2016-04-06 19:57:19.000000000 +0200 @@ -9,3 +9,4 @@ KAlgebraMobile 1.0 KAlgebraMobile.qml AddButton 1.0 AddButton.qml Dialog 1.0 Dialog.qml +ComboBox 1.0 ComboBox.qml diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kalgebra-15.12.3/mobile/plugins/widgets/qtcontrols/CMakeLists.txt new/kalgebra-16.04.1/mobile/plugins/widgets/qtcontrols/CMakeLists.txt --- old/kalgebra-15.12.3/mobile/plugins/widgets/qtcontrols/CMakeLists.txt 2016-01-14 23:03:30.000000000 +0100 +++ new/kalgebra-16.04.1/mobile/plugins/widgets/qtcontrols/CMakeLists.txt 2016-04-06 19:57:19.000000000 +0200 @@ -2,6 +2,6 @@ Label.qml Button.qml CalcButton.qml ExpressionInput.qml RealInput.qml SimpleListView.qml - KAlgebraPage.qml KAlgebraMobile.qml AddButton.qml Dialog.qml + KAlgebraPage.qml KAlgebraMobile.qml AddButton.qml Dialog.qml ComboBox.qml DESTINATION ${KDE_INSTALL_DATADIR}/kalgebramobile/plugins/widgets/ ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kalgebra-15.12.3/mobile/plugins/widgets/qtcontrols/ComboBox.qml new/kalgebra-16.04.1/mobile/plugins/widgets/qtcontrols/ComboBox.qml --- old/kalgebra-15.12.3/mobile/plugins/widgets/qtcontrols/ComboBox.qml 1970-01-01 01:00:00.000000000 +0100 +++ new/kalgebra-16.04.1/mobile/plugins/widgets/qtcontrols/ComboBox.qml 2016-04-06 19:57:19.000000000 +0200 @@ -0,0 +1,4 @@ +import QtQuick.Controls 1.3 + +ComboBox +{} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kalgebra-15.12.3/org.kde.kalgebra.appdata.xml new/kalgebra-16.04.1/org.kde.kalgebra.appdata.xml --- old/kalgebra-15.12.3/org.kde.kalgebra.appdata.xml 2016-01-14 23:03:30.000000000 +0100 +++ new/kalgebra-16.04.1/org.kde.kalgebra.appdata.xml 2016-04-06 19:57:19.000000000 +0200 @@ -69,11 +69,11 @@ <description> <p>KAlgebra is an application that can replace your graphing calculator. It has numerical, logical, symbolic, and analysis features that let you calculate mathematical expressions on the console and graphically plot the results in 2D or 3D. KAlgebra is rooted in the Mathematical Markup Language (MathML); however, one does not need to know MathML to use KAlgebra.</p> <p xml:lang="ast">KAlgebra ye una aplicación que pue trocar la to calculadora gráfica. Tien carauterístiques numbériques, llóxiques, simbóliques y d'analís que te permiten calcular espresiones matemátiques na consola y trazar gráficamente los resultaos en 2D ó 3D. KAlgebra ta arraigonáu nel llinguax matemáticu d'etiquetes (MathML); por embargu, naide necesita saber MathML pa usar KAlgebra</p> - <p xml:lang="ca">El KAlgebra és una aplicació que pot substituir la calculadora gràfica. Té característiques numèriques, lògiques, simbòliques i d'anàlisi que us permetran calcular expressions matemàtiques a la consola i traçar gràfics dels resultats en 2D o 3D. El KAlgebra té les seves arrels en el llenguatge de marques matemàtic (Mathematical Markup Language -MathML-). Però un no us caldrà saber MathML per utilitzar el KAlgebra.</p> - <p xml:lang="ca-valencia">El KAlgebra és una aplicació que pot substituir la calculadora gràfica. Té característiques numèriques, lògiques, simbòliques i d'anàlisi que vos permetran calcular expressions matemàtiques a la consola i traçar gràfics dels resultats en 2D o 3D. El KAlgebra té les seues arrels en el llenguatge de marques matemàtic (Mathematical Markup Language -MathML-). Però un no vos caldrà saber MathML per utilitzar el KAlgebra.</p> + <p xml:lang="ca">KAlgebra és una aplicació que pot reemplaçar la vostra calculadora gràfica. Té capacitats numèriques, lògiques i d'anàlisi que us permetran calcular expressions matemàtiques en una consola i dibuixar una gràfica dels resultats en 2D o 3D. KAlgebra té les seves arrels en el Llenguatge de Marcat Matemàtic (MathML); tanmateix, no us caldrà tenir coneixements de MathML per emprar el KAlgebra.</p> + <p xml:lang="ca-valencia">KAlgebra és una aplicació que pot reemplaçar la vostra calculadora gràfica. Té capacitats numèriques, lògiques i d'anàlisi que vos permetran calcular expressions matemàtiques en una consola i dibuixar una gràfica dels resultats en 2D o 3D. KAlgebra té les seues arrels en el Llenguatge de Marcat Matemàtic (MathML); tanmateix, no vos caldrà tindre coneixements de MathML per emprar el KAlgebra.</p> <p xml:lang="de">KAlgebra ist eine Anwendung, die Ihren grafischen Taschenrechner ersetzt. KAlgebra hat numerische, logische, symbolische und analytische Fähigkeiten, mit denen Sie mathematische Ausdrücke in der Konsole auswerten und die Ergebnisse zwei- oder dreidimensional darstellen können. KAlgebra basiert auf der Sprache „Mathematical Markup Language“ (MathML), es sind jedoch keine Kenntnisse von MathML erforderlich, um KAlgebra erfolgreich einsetzen zu können.</p> <p xml:lang="en-GB">KAlgebra is an application that can replace your graphing calculator. It has numerical, logical, symbolic, and analysis features that let you calculate mathematical expressions on the console and graphically plot the results in 2D or 3D. KAlgebra is rooted in the Mathematical Markup Language (MathML); however, one does not need to know MathML to use KAlgebra.</p> - <p xml:lang="es">KAlgebra es una aplicación que puede sustituir a su calculadora gráfica. Tiene funciones numéricas, lógicas, simbólicas y analíticas que le permiten calcular expresiones matemáticas en la consola y dibujar gráficamente el resultado en 2D o 3D. KAlgebra tiene su origen en el «Lenguaje de marcas matemático» (MathML); no obstante, no es necesario conocer MathML para usar KAlgebra.</p> + <p xml:lang="es">KAlgebra es una aplicación que puede sustituir su calculadora gráfica. Contiene funciones numéricas, lógicas, simbólicas y de análisis que le permiten calcular expresiones matemáticas en la consola y dibujar gráficamente su resultado en dos o tres dimensiones. KAlgebra se basa fuertemente en el «lenguaje de marcado matemático» (MathML); sin embargo, no es necesario saber MathML para usar KAlgebra.</p> <p xml:lang="et">KAlgebra on rakendus, mis võib asendada su senist graafikalkulaatorit Sel on arvulisi, loogilisi, sümbolilisi ja analüüsiomadusi, mis võimaldavad arvutada matemaatilisi avaldisi konsoolis ja lasta tulemusi kujutada graafiliselt nii tasapinnaliselt (2D) kui ka ruumiliselt (3D). KAlgebra juured on matemaatilises märkekeeles (MathML), kuid KAlgebra kasutamiseks ei ole MathML-i tundmine sugugi vajalik.</p> <p xml:lang="fi">KAlgebralla voi korvata graafisen laskimen. Siinä on numeeriset, loogiset, symboliset ja analyysiominaisuudet, jotka tarvitaan matemaattisten lausekkeiden laskemiseen sekä tulosten piirtämiseen kaksi- tai kolmiulotteisesti. KAlgebra perustuu MathML:ään (Mathematical Markup Language), mutta sitä ei tarvitse osata käyttääkseen KAlgebraa.</p> <p xml:lang="fr">KAlgebra est une application qui peut remplacer votre calculatrice graphique. Elle fournit des fonctions pour le calcul numérique, logique, symbolique et l'analyse qui vous permettent de calculer des expressions mathématiques dans la console et tracer graphiquement les résultats en 2D ou 3D. KAlgebra repose sur MathML, le langage de balise pour les mathématiques ; cependant, il n'est pas nécessaire de connaître MathML pour utiliser KAlgebra.</p> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kalgebra-15.12.3/src/CMakeLists.txt new/kalgebra-16.04.1/src/CMakeLists.txt --- old/kalgebra-15.12.3/src/CMakeLists.txt 2016-01-14 23:03:30.000000000 +0100 +++ new/kalgebra-16.04.1/src/CMakeLists.txt 2016-04-06 19:57:19.000000000 +0200 @@ -1,7 +1,3 @@ -if(OPENGL_FOUND) - include_directories(${OPENGL_INCLUDE_DIR}) -endif(OPENGL_FOUND) - set(kalgebra_SRCS kalgebra.cpp dictionary.cpp @@ -26,10 +22,6 @@ KF5::I18n KF5::Analitza KF5::AnalitzaWidgets KF5::AnalitzaGui KF5::AnalitzaPlot) -if(OPENGL_FOUND) - target_link_libraries(kalgebra Qt5::OpenGL ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY}) -endif(OPENGL_FOUND) - install(TARGETS kalgebra ${KDE_INSTALL_TARGETS_DEFAULT_ARGS}) install(PROGRAMS org.kde.kalgebra.desktop DESTINATION ${KDE_INSTALL_APPDIR} ) install(FILES kalgebra.xml DESTINATION ${KDE_INSTALL_DATADIR}/katepart5/syntax ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kalgebra-15.12.3/src/functionedit.cpp new/kalgebra-16.04.1/src/functionedit.cpp --- old/kalgebra-15.12.3/src/functionedit.cpp 2016-01-14 23:03:30.000000000 +0100 +++ new/kalgebra-16.04.1/src/functionedit.cpp 2016-04-06 19:57:19.000000000 +0200 @@ -44,7 +44,7 @@ } FunctionEdit::FunctionEdit(QWidget *parent) - : QWidget(parent), m_calcUplimit(0), m_calcDownlimit(0) + : QWidget(parent), m_calcUplimit(0), m_calcDownlimit(0), m_modmode(false) { setWindowTitle(i18n("Add/Edit a function")); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kalgebra-15.12.3/src/functionedit.h new/kalgebra-16.04.1/src/functionedit.h --- old/kalgebra-15.12.3/src/functionedit.h 2016-01-14 23:03:30.000000000 +0100 +++ new/kalgebra-16.04.1/src/functionedit.h 2016-04-06 19:57:19.000000000 +0200 @@ -119,7 +119,7 @@ Analitza::PlotsView2D *m_graph; KColorCombo *m_color; Analitza::PlotsModel *m_funcsModel; - Analitza::Variables* m_vars; + Analitza::Variables* m_vars = nullptr; bool m_modmode; QTabWidget* m_viewTabs; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kalgebra-15.12.3/src/main.cpp new/kalgebra-16.04.1/src/main.cpp --- old/kalgebra-15.12.3/src/main.cpp 2016-01-14 23:03:30.000000000 +0100 +++ new/kalgebra-16.04.1/src/main.cpp 2016-04-06 19:57:19.000000000 +0200 @@ -17,20 +17,25 @@ *************************************************************************************/ #include <QApplication> +#include <QCommandLineParser> #include <KAboutData> +#include <KLocalizedString> #include "kalgebra.h" -#include <klocalizedstring.h> int main(int argc, char *argv[]) { QApplication app(argc, argv); + KLocalizedString::setApplicationDomain("kalgebra"); KAboutData about("kalgebra", "KAlgebra", "0.10", i18n("A portable calculator"), KAboutLicense::GPL, i18n("(C) 2006-2016 Aleix Pol i Gonzalez")); about.addAuthor( "Aleix Pol i Gonzalez", QString(), "[email protected]" ); about.setTranslator(i18nc("NAME OF TRANSLATORS", "Your names"), i18nc("EMAIL OF TRANSLATORS", "Your emails")); KAboutData::setApplicationData(about); - KLocalizedString::setApplicationDomain("kalgebra"); + QCommandLineParser parser; + about.setupCommandLine(&parser); + parser.process(app); + about.processCommandLine(&parser); KAlgebra widget; widget.show(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kalgebra-15.12.3/src/varedit.cpp new/kalgebra-16.04.1/src/varedit.cpp --- old/kalgebra-15.12.3/src/varedit.cpp 2016-01-14 23:03:30.000000000 +0100 +++ new/kalgebra-16.04.1/src/varedit.cpp 2016-04-06 19:57:19.000000000 +0200 @@ -67,8 +67,7 @@ else { m_exp->setExpression(Analitza::Expression(vars->value(newVar)->copy())); } - - m_removeBtn->setEnabled(canRemove(newVar)); + m_removeBtn->setEnabled(vars && canRemove(newVar)); } bool VarEdit::canRemove(const QString& name) const
