Hello community, here is the log from the commit of package cantor for openSUSE:Factory checked in at 2014-03-18 16:04:11 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/cantor (Old) and /work/SRC/openSUSE:Factory/.cantor.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "cantor" Changes: -------- --- /work/SRC/openSUSE:Factory/cantor/cantor.changes 2014-02-20 07:55:46.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.cantor.new/cantor.changes 2014-03-18 16:04:12.000000000 +0100 @@ -1,0 +2,14 @@ +Thu Mar 13 20:14:03 UTC 2014 - tittiatc...@gmail.com + +- Update to 4.12.90 + * KDE 4.13 Beta 2 release + * See http://www.kde.org/announcements/announce-4.13-beta2.php + +------------------------------------------------------------------- +Fri Mar 7 10:03:52 UTC 2014 - tittiatc...@gmail.com + +- Update to 4.12.80 + * KDE 4.13 Beta 1 release + * See http://www.kde.org/announcements/announce-4.13-beta1.php + +------------------------------------------------------------------- Old: ---- cantor-4.12.2.tar.xz New: ---- cantor-4.12.90.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ cantor.spec ++++++ --- /var/tmp/diff_new_pack.1rMeba/_old 2014-03-18 16:04:13.000000000 +0100 +++ /var/tmp/diff_new_pack.1rMeba/_new 2014-03-18 16:04:13.000000000 +0100 @@ -19,7 +19,7 @@ %global libMAJOR 1 Name: cantor -Version: 4.12.2 +Version: 4.12.90 Release: 0 Summary: Worksheet GUI for mathematical software License: GPL-2.0+ ++++++ cantor-4.12.2.tar.xz -> cantor-4.12.90.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cantor-4.12.2/doc/index.docbook new/cantor-4.12.90/doc/index.docbook --- old/cantor-4.12.2/doc/index.docbook 2014-01-26 23:14:30.000000000 +0100 +++ new/cantor-4.12.90/doc/index.docbook 2014-03-01 19:01:46.000000000 +0100 @@ -249,7 +249,7 @@ <orderedlist> <listitem><para>The tab bar, where you can switch through the open worksheets.</para></listitem> <listitem><para>A help panel, where help for a specific command is displayed if you enter "? command".</para></listitem> - <listitem><para>A Variable Manager panel where you can see the list of all available variables on the current worksheet. The Help and Variable Manager panels are shown as tabs on a sidebar of a &cantor; window. Variable manager can be used for Maxima (if enabled on <menuchoice><guimenu>Settings</guimenu><guimenuitem>Configure &cantor;...</guimenuitem></menuchoice> <guilabel>Maxima</guilabel> page), &kalgebra;, Octave, Python2, Qualculate, and Scilab backends only.</para></listitem> + <listitem><para>A Variable Manager panel where you can see the list of all available variables on the current worksheet. The Help and Variable Manager panels are shown as tabs on a sidebar of a &cantor; window. Variable manager can be used for Maxima (if enabled on <menuchoice><guimenu>Settings</guimenu><guimenuitem>Configure &cantor;...</guimenuitem></menuchoice> <guilabel>Maxima</guilabel> page), &kalgebra;, Octave, Python2, Qalculate, and Scilab backends only.</para></listitem> <listitem><para>The worksheet itself.</para></listitem> </orderedlist> </para> @@ -600,7 +600,7 @@ <qandaset id="faqlist"> <qandaentry> <question><para>The Menu Item <guimenuitem>Typeset using LaTeX</guimenuitem> is not available</para></question> - <answer><para>Not every backend supports every option. Current version supports &latex; output for Maxima, Qualculate! and Sage backends.</para></answer> + <answer><para>Not every backend supports every option. Current version supports &latex; output for Maxima, Qalculate! and Sage backends.</para></answer> </qandaentry> <qandaentry> <question><para>I have installed Sage/Maxima, but the appropriate backend does not appear.</para></question> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cantor-4.12.2/src/assistants/differentiate/differentiateassistant.desktop new/cantor-4.12.90/src/assistants/differentiate/differentiateassistant.desktop --- old/cantor-4.12.2/src/assistants/differentiate/differentiateassistant.desktop 2014-01-26 23:14:30.000000000 +0100 +++ new/cantor-4.12.90/src/assistants/differentiate/differentiateassistant.desktop 2014-03-01 19:01:46.000000000 +0100 @@ -26,7 +26,7 @@ Name[nds]=Differentschaalreken Name[nl]=Differentiëren Name[nn]=Deriver -Name[pl]=Różnica +Name[pl]=Różniczkowanie Name[pt]=Diferenciar Name[pt_BR]=Derivada Name[ru]=Дифференцирование @@ -69,7 +69,7 @@ Comment[nds]=En Hülpdialoog för't Utreken vun Afledden vun Utdrück Comment[nl]=Een assistentdialoog voor het vereenvoudigen van het berekenen van afgeleiden van expressies Comment[nn]=Eit hjelpevindauge for utrekning av den deriverte av uttrykk -Comment[pl]=Okno dialogowe asystenta pomagające uprościć obliczenia pochodnych z wyrażeń +Comment[pl]=Okno dialogowe pomocnika pomagające uprościć obliczenia pochodnych z wyrażeń Comment[pt]=Uma janela assistente que simplifica o cálculo de derivadas das expressões Comment[pt_BR]=Um diálogo de assistente para simplificar o cálculo de derivadas das expressões Comment[ru]=Диалоговое окно, упрощающее вычисление производных diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cantor-4.12.2/src/assistants/importpackage/importpackageassistant.desktop new/cantor-4.12.90/src/assistants/importpackage/importpackageassistant.desktop --- old/cantor-4.12.2/src/assistants/importpackage/importpackageassistant.desktop 2014-01-26 23:14:30.000000000 +0100 +++ new/cantor-4.12.90/src/assistants/importpackage/importpackageassistant.desktop 2014-03-01 19:01:46.000000000 +0100 @@ -7,6 +7,7 @@ Name[cs]=Importovat balíček Name[da]=Importér pakke Name[de]=Paket importieren +Name[el]=Εισαγωγή πακέτου Name[es]=Importar paquete Name[fi]=Tuo paketti Name[fr]=Importer un paquet @@ -16,6 +17,7 @@ Name[kk]=Дестені импорттау Name[nb]=Importer pakke Name[nl]=Pakket importeren +Name[pl]=Importowanie pakietów Name[pt]=Importar o Pacote Name[pt_BR]=Importar pacote Name[sk]=Importovať balík @@ -36,6 +38,7 @@ Comment[ca@valencia]=Un diàleg d'assistència per importar un paquet específic (o biblioteca o mòdul) a l'espai de treball del Cantor Comment[da]=En hjælpedialog til at importere en specifik pakke (eller bibliotek eller modul) til Cantor-arbejdsområdet Comment[de]=Ein Assistent, um ein angegebenes Paket, Bibliothek oder Modul in den Arbeitsbereich von Cantor zu importieren +Comment[el]=Ένας βοηθητικός διάλογος για να εισάγετε ένα συγκεκριμένο πακέτο (είτε βιβλιοθήκη είτε άρθρωμα) στον χώρο εργασίας του Cantor Comment[es]=Un diálogo de asistente para importar un paquete (o biblioteca o módulo) determinado al espacio de trabajo de Cantor Comment[fi]=Apuikkuna paketin (tai kirjaston tai mobuulin) tuomiseen Cantor-työtilaan Comment[fr]=Boîte de dialogue de l'assistant pour importer un paquet spécifique (ou une librairie ou un module) dans l'espace de travail Cantor @@ -45,6 +48,7 @@ Comment[kk]=Cantor жұмыс орнынын өзінің дестесін (не жиын файлын не модулін) импорттаудың көмекші диалогы Comment[nb]=En assistentdialog for å importere en bestemt pakke (eller bibliotek eller modul) til Cantors arbeidsrom Comment[nl]=Een assistentdialoog voor het importeren van een pakket (of bibliotheek (library) of module) in Cantor +Comment[pl]=Okno dialogowe pomocnika importu określonych pakietów (lub bibliotek lub modułów) do przestrzeni roboczej Cantora Comment[pt]=Uma janela de assistente para importar um pacote específico (ou biblioteca ou módulo) para a área de trabalho do Cantor Comment[pt_BR]=Um assistente para importar um pacote específico (biblioteca ou módulo) para o espaço de trabalho do Cantor Comment[sk]=Dialóg asistenta na import špecifického balíka (alebo knižnice alebo modulu) do pracovnej plochy Cantor diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cantor-4.12.2/src/assistants/integrate/integrateassistant.desktop new/cantor-4.12.90/src/assistants/integrate/integrateassistant.desktop --- old/cantor-4.12.2/src/assistants/integrate/integrateassistant.desktop 2014-01-26 23:14:30.000000000 +0100 +++ new/cantor-4.12.90/src/assistants/integrate/integrateassistant.desktop 2014-03-01 19:01:46.000000000 +0100 @@ -27,7 +27,7 @@ Name[nds]=Integraalreken Name[nl]=Integreren Name[nn]=Integrer -Name[pl]=Łączenie +Name[pl]=Całkowanie Name[pt]=Integração Name[pt_BR]=Integral Name[ru]=Интегрирование diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cantor-4.12.2/src/assistants/linearalgebra/creatematrix/creatematrixassistant.desktop new/cantor-4.12.90/src/assistants/linearalgebra/creatematrix/creatematrixassistant.desktop --- old/cantor-4.12.2/src/assistants/linearalgebra/creatematrix/creatematrixassistant.desktop 2014-01-26 23:14:30.000000000 +0100 +++ new/cantor-4.12.90/src/assistants/linearalgebra/creatematrix/creatematrixassistant.desktop 2014-03-01 19:01:46.000000000 +0100 @@ -73,7 +73,7 @@ Comment[nds]=En Hülpdialoog för de Ingaav vun Matrizen Comment[nl]=Een assistentdialoog voor het vereenvoudigen van het invoeren van matrices Comment[nn]=Eit hjelpevindauge for innskriving av matriser -Comment[pl]=Okno dialogowe asystenta pomagające uprościć wprowadzanie macierzy +Comment[pl]=Okno dialogowe pomocnika pomagające uprościć wprowadzanie macierzy Comment[pt]=Uma janela assistente que simplifica a introdução de matrizes Comment[pt_BR]=Um diálogo assistente para simplificar a digitação de matrizes Comment[ru]=Диалоговое окно, упрощающее ввод матриц diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cantor-4.12.2/src/assistants/runscript/runscriptassistant.desktop new/cantor-4.12.90/src/assistants/runscript/runscriptassistant.desktop --- old/cantor-4.12.2/src/assistants/runscript/runscriptassistant.desktop 2014-01-26 23:14:30.000000000 +0100 +++ new/cantor-4.12.90/src/assistants/runscript/runscriptassistant.desktop 2014-03-01 19:01:46.000000000 +0100 @@ -55,7 +55,7 @@ Comment[ca@valencia]=Un assistent per executar un fitxer d'script extern Comment[cs]=Pomocník pro spouštění externího skriptu Comment[da]=En assistent til at køre en ekstern script-fil -Comment[de]=Ein Assistent zum Ausführen externer Skript-Dateien +Comment[de]=Ein Assistent zum Ausführen externer Skriptdateien Comment[el]=Ένα βοηθός για την εκτέλεση ενός εξωτερικού αρχείου σεναρίου Comment[en_GB]=An Assistant for running an external Script file Comment[es]=Un asistente para ejecutar un archivo de script externo diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cantor-4.12.2/src/backends/R/rexpression.cpp new/cantor-4.12.90/src/backends/R/rexpression.cpp --- old/cantor-4.12.2/src/backends/R/rexpression.cpp 2014-01-26 23:14:30.000000000 +0100 +++ new/cantor-4.12.90/src/backends/R/rexpression.cpp 2014-03-01 19:01:46.000000000 +0100 @@ -119,6 +119,8 @@ QString content=QTextStream(&f).readAll(); if (!type->is("text/html")) { + //Escape whitespace + content.replace( ' ', " "); //replace appearing backspaces, as they mess the whole output up content.remove(QRegExp(".\b")); //Replace < and > with their html code, so they won't be confused as html tags diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cantor-4.12.2/src/backends/R/rextensions.cpp new/cantor-4.12.90/src/backends/R/rextensions.cpp --- old/cantor-4.12.2/src/backends/R/rextensions.cpp 2014-01-26 23:14:30.000000000 +0100 +++ new/cantor-4.12.90/src/backends/R/rextensions.cpp 2014-03-01 19:01:46.000000000 +0100 @@ -42,6 +42,11 @@ return i18n("*.R|R script file"); } +QString RScriptExtension::highlightingMode() +{ + return QString("r script"); +} + RPlotExtension::RPlotExtension(QObject* parent) : Cantor::AdvancedPlotExtension(parent) { } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cantor-4.12.2/src/backends/R/rextensions.h new/cantor-4.12.90/src/backends/R/rextensions.h --- old/cantor-4.12.2/src/backends/R/rextensions.h 2014-01-26 23:14:30.000000000 +0100 +++ new/cantor-4.12.90/src/backends/R/rextensions.h 2014-03-01 19:01:46.000000000 +0100 @@ -32,6 +32,7 @@ public slots: virtual QString runExternalScript(const QString& path); virtual QString scriptFileFilter(); + virtual QString highlightingMode(); }; class RPlotExtension : public Cantor::AdvancedPlotExtension, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cantor-4.12.2/src/backends/maxima/maximaextensions.cpp new/cantor-4.12.90/src/backends/maxima/maximaextensions.cpp --- old/cantor-4.12.2/src/backends/maxima/maximaextensions.cpp 2014-01-26 23:14:30.000000000 +0100 +++ new/cantor-4.12.90/src/backends/maxima/maximaextensions.cpp 2014-03-01 19:01:46.000000000 +0100 @@ -46,6 +46,11 @@ return i18n("*.mac|Maxima batch File"); } +QString MaximaScriptExtension::highlightingMode() +{ + return QString("maxima"); +} + QString MaximaScriptExtension::commentStartingSequence() { return "/* "; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cantor-4.12.2/src/backends/maxima/maximaextensions.h new/cantor-4.12.90/src/backends/maxima/maximaextensions.h --- old/cantor-4.12.2/src/backends/maxima/maximaextensions.h 2014-01-26 23:14:30.000000000 +0100 +++ new/cantor-4.12.90/src/backends/maxima/maximaextensions.h 2014-03-01 19:01:46.000000000 +0100 @@ -40,6 +40,7 @@ public slots: virtual QString runExternalScript(const QString& file); virtual QString scriptFileFilter(); + virtual QString highlightingMode(); QString commentStartingSequence(); QString commentEndingSequence(); }; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cantor-4.12.2/src/backends/octave/octaveexpression.cpp new/cantor-4.12.90/src/backends/octave/octaveexpression.cpp --- old/cantor-4.12.2/src/backends/octave/octaveexpression.cpp 2014-01-26 23:14:30.000000000 +0100 +++ new/cantor-4.12.90/src/backends/octave/octaveexpression.cpp 2014-03-01 19:01:46.000000000 +0100 @@ -109,6 +109,9 @@ { if (command().contains("help")) { + //Escape whitespace + m_resultString.replace( ' ', " "); + setResult(new Cantor::HelpResult(m_resultString)); } else diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cantor-4.12.2/src/backends/octave/octaveextensions.cpp new/cantor-4.12.90/src/backends/octave/octaveextensions.cpp --- old/cantor-4.12.2/src/backends/octave/octaveextensions.cpp 2014-01-26 23:14:30.000000000 +0100 +++ new/cantor-4.12.90/src/backends/octave/octaveextensions.cpp 2014-03-01 19:01:46.000000000 +0100 @@ -47,6 +47,11 @@ return i18n("*.m|Octave script file"); } +QString OctaveScriptExtension::highlightingMode() +{ + return QString("octave"); +} + QString OctaveScriptExtension::commandSeparator() { return QString(';'); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cantor-4.12.2/src/backends/octave/octaveextensions.h new/cantor-4.12.90/src/backends/octave/octaveextensions.h --- old/cantor-4.12.2/src/backends/octave/octaveextensions.h 2014-01-26 23:14:30.000000000 +0100 +++ new/cantor-4.12.90/src/backends/octave/octaveextensions.h 2014-03-01 19:01:46.000000000 +0100 @@ -37,6 +37,7 @@ public: OCTAVE_EXT_CDTOR_DECL(Script) virtual QString scriptFileFilter(); + virtual QString highlightingMode(); virtual QString runExternalScript(const QString& path); virtual QString commandSeparator(); }; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cantor-4.12.2/src/backends/python2/python2backend.cpp new/cantor-4.12.90/src/backends/python2/python2backend.cpp --- old/cantor-4.12.2/src/backends/python2/python2backend.cpp 2014-01-26 23:14:30.000000000 +0100 +++ new/cantor-4.12.90/src/backends/python2/python2backend.cpp 2014-03-01 19:01:46.000000000 +0100 @@ -35,6 +35,7 @@ kDebug()<<"Creating Python2Backend"; new Python2PackagingExtension(this); + new Python2ScriptExtension(this); new Python2VariableManagementExtension(this); setObjectName("python2backend"); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cantor-4.12.2/src/backends/python2/python2backend.desktop new/cantor-4.12.90/src/backends/python2/python2backend.desktop --- old/cantor-4.12.2/src/backends/python2/python2backend.desktop 2014-01-26 23:14:30.000000000 +0100 +++ new/cantor-4.12.90/src/backends/python2/python2backend.desktop 2014-03-01 19:01:46.000000000 +0100 @@ -8,6 +8,7 @@ Name[cs]=Python2 Name[da]=Python2 Name[de]=Python2 +Name[el]=Python2 Name[es]=Python2 Name[fi]=Python2 Name[fr]=Python2 @@ -17,6 +18,7 @@ Name[kk]=Python2 Name[nb]=Python2 Name[nl]=Python2 +Name[pl]=Python2 Name[pt]=Python2 Name[pt_BR]=Python2 Name[sk]=Python2 @@ -39,6 +41,7 @@ Comment[cs]=Podpůrná vrstva pro vědecké programovací v Python 2 Comment[da]=Backend til videnskabelige programmering med Python 2 Comment[de]=Modul für die wissenschaftliche Programmierumgebung Python 2 +Comment[el]=Σύστημα υποστήριξης για το επιστημονικό προγραμματιστικό περιβάλλον Python 2 Comment[es]=Motor para programación científica en Python 2 Comment[fi]=Python2-pohjaisen tieteellisen ohjelmointiympäristön taustajärjestelmä Comment[fr]=Moteur pour la programmation scientifique Python 2 @@ -48,6 +51,7 @@ Comment[kk]=Python 2 ғылыми программалау тетігі Comment[nb]=Bakgrunnsmotor for Python 2 Scientific Programming Comment[nl]=Backend voor wetenschappelijke programmeeromgeving Python 2 +Comment[pl]=Silnika dla naukowego środowiska programistycznego Python 2 Comment[pt]=Infra-Estrutura de Programação Científica com Python 2 Comment[pt_BR]=Infraestrutura de programação científica Python 2 Comment[sk]=Backend pre vedecké programovanie Python 2 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cantor-4.12.2/src/backends/python2/python2extensions.cpp new/cantor-4.12.90/src/backends/python2/python2extensions.cpp --- old/cantor-4.12.2/src/backends/python2/python2extensions.cpp 2014-01-26 23:14:30.000000000 +0100 +++ new/cantor-4.12.90/src/backends/python2/python2extensions.cpp 2014-03-01 19:01:46.000000000 +0100 @@ -32,6 +32,23 @@ return QString("import %1").arg(package); } +PYTHON2_EXT_CDTOR(Script) + +QString Python2ScriptExtension::runExternalScript(const QString& path) +{ + return QString("execfile(\"%1\")").arg(path); +} + +QString Python2ScriptExtension::scriptFileFilter() +{ + return i18n("*.py|Python script file"); +} + +QString Python2ScriptExtension::highlightingMode() +{ + return QString("python"); +} + PYTHON2_EXT_CDTOR(VariableManagement) QString Python2VariableManagementExtension::addVariable(const QString& name, const QString& value) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cantor-4.12.2/src/backends/python2/python2extensions.h new/cantor-4.12.90/src/backends/python2/python2extensions.h --- old/cantor-4.12.2/src/backends/python2/python2extensions.h 2014-01-26 23:14:30.000000000 +0100 +++ new/cantor-4.12.90/src/backends/python2/python2extensions.h 2014-03-01 19:01:46.000000000 +0100 @@ -33,6 +33,15 @@ virtual QString importPackage(const QString& module); }; +class Python2ScriptExtension : public Cantor::ScriptExtension +{ + public: + PYTHON2_EXT_CDTOR_DECL(Script) + virtual QString scriptFileFilter(); + virtual QString highlightingMode(); + virtual QString runExternalScript(const QString& path); +}; + class Python2VariableManagementExtension : public Cantor::VariableManagementExtension { public: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cantor-4.12.2/src/backends/python2/python2session.cpp new/cantor-4.12.90/src/backends/python2/python2session.cpp --- old/cantor-4.12.2/src/backends/python2/python2session.cpp 2014-01-26 23:14:30.000000000 +0100 +++ new/cantor-4.12.90/src/backends/python2/python2session.cpp 2014-03-01 19:01:46.000000000 +0100 @@ -157,6 +157,12 @@ } } + if(firstLineWord.contains("execfile")){ + + commandProcessing += commandLine.at(contLine); + continue; + } + if((!Python2Keywords::instance()->keywords().contains(firstLineWord)) && (!commandLine.at(contLine).contains("=")) && (!commandLine.at(contLine).endsWith(":")) && (!commandLine.at(contLine).startsWith(" "))){ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cantor-4.12.2/src/backends/qalculate/plotassistant/qalculateplotassistant.desktop new/cantor-4.12.90/src/backends/qalculate/plotassistant/qalculateplotassistant.desktop --- old/cantor-4.12.2/src/backends/qalculate/plotassistant/qalculateplotassistant.desktop 2014-01-26 23:14:30.000000000 +0100 +++ new/cantor-4.12.90/src/backends/qalculate/plotassistant/qalculateplotassistant.desktop 2014-03-01 19:01:46.000000000 +0100 @@ -57,7 +57,7 @@ Comment[lv]=Palīgs grafiku veidošanai ar Qalculate aizmuguri. Comment[nb]=En assistent for plotting med Qalculate bakgrunnsmotor. Comment[nl]=Een assistent voor het plotten met de Qalculate-backend. -Comment[pl]=Asystent rysowania wykresów przy użyciu silnika Qalculate. +Comment[pl]=Pomocnik rysowania wykresów przy użyciu silnika Qalculate. Comment[pt]=Um Assistente de gráficos com a infra-estrutura do Qalculate. Comment[pt_BR]=Um assistente de geração de gráficos com a infraestrutura do Qalculate. Comment[ru]=Диалоговое окно, упрощающее построение графиков с использованием Qalculate. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cantor-4.12.2/src/backends/sage/sagecompletionobject.cpp new/cantor-4.12.90/src/backends/sage/sagecompletionobject.cpp --- old/cantor-4.12.2/src/backends/sage/sagecompletionobject.cpp 2014-01-26 23:14:30.000000000 +0100 +++ new/cantor-4.12.90/src/backends/sage/sagecompletionobject.cpp 2014-03-01 19:01:46.000000000 +0100 @@ -63,7 +63,7 @@ void SageCompletionObject::extractCompletions() { SageSession* s=qobject_cast<SageSession*>(session()); - if(s&&s->sageVersion()>SageSession::VersionInfo(5, 7)) + if(s&&s->sageVersion()<SageSession::VersionInfo(5, 7)) extractCompletionsLegacy(); else extractCompletionsNew(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cantor-4.12.2/src/backends/sage/sageexpression.cpp new/cantor-4.12.90/src/backends/sage/sageexpression.cpp --- old/cantor-4.12.2/src/backends/sage/sageexpression.cpp 2014-01-26 23:14:30.000000000 +0100 +++ new/cantor-4.12.90/src/backends/sage/sageexpression.cpp 2014-03-01 19:01:46.000000000 +0100 @@ -203,6 +203,9 @@ if (m_isHelpRequest) { + //Escape whitespace + stripped.replace( ' ', " "); + //make things quoted in `` `` bold stripped.replace(QRegExp("``([^`]*)``"), "<b>\\1</b>"); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cantor-4.12.2/src/backends/sage/sageextensions.cpp new/cantor-4.12.90/src/backends/sage/sageextensions.cpp --- old/cantor-4.12.2/src/backends/sage/sageextensions.cpp 2014-01-26 23:14:30.000000000 +0100 +++ new/cantor-4.12.90/src/backends/sage/sageextensions.cpp 2014-03-01 19:01:46.000000000 +0100 @@ -48,6 +48,11 @@ "*.sage|Sage script file"); } +QString SageScriptExtension::highlightingMode() +{ + return QString("python"); +} + //CAS extension SAGE_EXTENSION_CONSTRUCTORS(CAS) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cantor-4.12.2/src/backends/sage/sageextensions.h new/cantor-4.12.90/src/backends/sage/sageextensions.h --- old/cantor-4.12.2/src/backends/sage/sageextensions.h 2014-01-26 23:14:30.000000000 +0100 +++ new/cantor-4.12.90/src/backends/sage/sageextensions.h 2014-03-01 19:01:46.000000000 +0100 @@ -40,6 +40,7 @@ public slots: virtual QString runExternalScript(const QString& path); virtual QString scriptFileFilter(); + virtual QString highlightingMode(); }; class SageCASExtension : public Cantor::CASExtension @@ -47,7 +48,7 @@ public: SageCASExtension( QObject* parent); ~SageCASExtension(); - + public slots: virtual QString solve(const QStringList& equations, const QStringList& variables); virtual QString simplify(const QString& expression); @@ -65,7 +66,7 @@ QString limit(const QString& expression, const QString& variable, const QString& limit); QString differentiate(const QString& function,const QString& variable, int times); QString integrate(const QString& function, const QString& variable); - QString integrate(const QString& function,const QString& variable, const QString& left, const QString& right); + QString integrate(const QString& function,const QString& variable, const QString& left, const QString& right); }; class SageLinearAlgebraExtension : public Cantor::LinearAlgebraExtension diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cantor-4.12.2/src/backends/scilab/scilabbackend.cpp new/cantor-4.12.90/src/backends/scilab/scilabbackend.cpp --- old/cantor-4.12.2/src/backends/scilab/scilabbackend.cpp 2014-01-26 23:14:30.000000000 +0100 +++ new/cantor-4.12.90/src/backends/scilab/scilabbackend.cpp 2014-03-01 19:01:46.000000000 +0100 @@ -35,6 +35,7 @@ kDebug()<<"Creating ScilabBackend"; new ScilabVariableManagementExtension(this); + new ScilabScriptExtension(this); setObjectName("scilabbackend"); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cantor-4.12.2/src/backends/scilab/scilabextensions.cpp new/cantor-4.12.90/src/backends/scilab/scilabextensions.cpp --- old/cantor-4.12.2/src/backends/scilab/scilabextensions.cpp 2014-01-26 23:14:30.000000000 +0100 +++ new/cantor-4.12.90/src/backends/scilab/scilabextensions.cpp 2014-03-01 19:01:46.000000000 +0100 @@ -25,6 +25,29 @@ #define SCILAB_EXT_CDTOR(name) Scilab##name##Extension::Scilab##name##Extension(QObject* parent) : name##Extension(parent) {} \ Scilab##name##Extension::~Scilab##name##Extension() {} +SCILAB_EXT_CDTOR(Script) + +QString ScilabScriptExtension::runExternalScript(const QString& path) +{ + return QString("exec(\"%1\", -1)").arg(path); +} + +QString ScilabScriptExtension::scriptFileFilter() +{ + return i18n("*.sce|Scilab script file\n"\ + "*.sci|Scilab function file"); +} + +QString ScilabScriptExtension::highlightingMode() +{ + return QString("scilab"); +} + +QString ScilabScriptExtension::commandSeparator() +{ + return QString(';'); +} + SCILAB_EXT_CDTOR(VariableManagement) QString ScilabVariableManagementExtension::addVariable(const QString& name, const QString& value) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cantor-4.12.2/src/backends/scilab/scilabextensions.h new/cantor-4.12.90/src/backends/scilab/scilabextensions.h --- old/cantor-4.12.2/src/backends/scilab/scilabextensions.h 2014-01-26 23:14:30.000000000 +0100 +++ new/cantor-4.12.90/src/backends/scilab/scilabextensions.h 2014-03-01 19:01:46.000000000 +0100 @@ -26,6 +26,16 @@ #define SCILAB_EXT_CDTOR_DECL(name) Scilab##name##Extension(QObject* parent); \ ~Scilab##name##Extension(); +class ScilabScriptExtension : public Cantor::ScriptExtension +{ + public: + SCILAB_EXT_CDTOR_DECL(Script) + virtual QString scriptFileFilter(); + virtual QString highlightingMode(); + virtual QString runExternalScript(const QString& path); + virtual QString commandSeparator(); +}; + class ScilabVariableManagementExtension : public Cantor::VariableManagementExtension { public: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cantor-4.12.2/src/cantor_part.cpp new/cantor-4.12.90/src/cantor_part.cpp --- old/cantor-4.12.2/src/cantor_part.cpp 2014-01-26 23:14:30.000000000 +0100 +++ new/cantor-4.12.90/src/cantor_part.cpp 2014-03-01 19:01:46.000000000 +0100 @@ -730,7 +730,7 @@ { return; } - m_scriptEditor=new ScriptEditorWidget(scriptE->scriptFileFilter(), widget()->window()); + m_scriptEditor=new ScriptEditorWidget(scriptE->scriptFileFilter(), scriptE->highlightingMode(), widget()->window()); connect(m_scriptEditor, SIGNAL(runScript(const QString&)), this, SLOT(runScript(const QString&))); connect(m_scriptEditor, SIGNAL(destroyed()), this, SLOT(scriptEditorClosed())); m_scriptEditor->show(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cantor-4.12.2/src/lib/extension.h new/cantor-4.12.90/src/lib/extension.h --- old/cantor-4.12.2/src/lib/extension.h 2014-01-26 23:14:30.000000000 +0100 +++ new/cantor-4.12.90/src/lib/extension.h 2014-03-01 19:01:46.000000000 +0100 @@ -88,7 +88,13 @@ * @return file filter used for Script Files (e.g. *.py) */ virtual QString scriptFileFilter() = 0; - + /** + * returns the name of the language to use for syntax highlighting + * in the script editor (e.g. python). The value returned must match + * the name attribute from the xml language description in KTexteditor. + * @return name of the language to use for syntax highlighting (e.g. python) + */ + virtual QString highlightingMode() = 0; /** * returns a string used to separate commands (usually ;) * @return a string used to separate commands (usually ;) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cantor-4.12.2/src/lib/test/backendtest.cpp new/cantor-4.12.90/src/lib/test/backendtest.cpp --- old/cantor-4.12.2/src/lib/test/backendtest.cpp 2014-01-26 23:14:30.000000000 +0100 +++ new/cantor-4.12.90/src/lib/test/backendtest.cpp 2014-03-01 19:01:46.000000000 +0100 @@ -23,6 +23,8 @@ #include "backend.h" #include "session.h" +#include <QSignalSpy> + void BackendTest::createSession() { Cantor::Backend* b=Cantor::Backend::createBackend( backendName() ); @@ -33,11 +35,13 @@ } m_session=b->createSession(); + + QSignalSpy spy(m_session, SIGNAL( ready() ) ); m_session->login(); + if(spy.isEmpty()) + waitForSignal(m_session, SIGNAL( ready() ) ); - QEventLoop loop; - connect( m_session, SIGNAL( ready() ), &loop, SLOT( quit() ) ); - loop.exec(); + QVERIFY(!spy.isEmpty()); } Cantor::Expression* BackendTest::evalExp(const QString& exp ) @@ -46,15 +50,7 @@ if(e->status()==Cantor::Expression::Computing) { - //Create a timeout, that kills the eventloop, if the expression doesn't finish - QTimer timeout( this ); - timeout.setSingleShot( true ); - timeout.start( 5000 ); - QEventLoop loop; - connect( &timeout, SIGNAL( timeout() ), &loop, SLOT( quit() ) ); - connect( e, SIGNAL( statusChanged( Cantor::Expression::Status ) ), &loop, SLOT( quit() ) ); - - loop.exec(); + waitForSignal( e, SIGNAL( statusChanged( Cantor::Expression::Status ) ) ); } return e; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cantor-4.12.2/src/panelplugins/helppanel/helppanelplugin.cpp new/cantor-4.12.90/src/panelplugins/helppanel/helppanelplugin.cpp --- old/cantor-4.12.2/src/panelplugins/helppanel/helppanelplugin.cpp 2014-01-26 23:14:30.000000000 +0100 +++ new/cantor-4.12.90/src/panelplugins/helppanel/helppanelplugin.cpp 2014-03-01 19:01:46.000000000 +0100 @@ -39,16 +39,27 @@ if(m_edit==0) { m_edit=new KTextEdit(parentWidget()); - m_edit->setText(i18n("<h1>Cantor</h1>The KDE way to do Mathematics")); + setHelpHtml(i18n("<h1>Cantor</h1>The KDE way to do Mathematics")); m_edit->setTextInteractionFlags(Qt::TextBrowserInteraction); - connect(parent()->parent(), SIGNAL(showHelp(QString)), m_edit, SLOT(setHtml(QString))); + connect(parent()->parent(), SIGNAL(showHelp(QString)), this, SLOT(setHelpHtml(QString))); connect(parent()->parent(), SIGNAL(showHelp(QString)), this, SIGNAL(visibilityRequested())); } return m_edit; } +void HelpPanelPlugin::setHelpHtml(const QString& help) +{ + if(!m_edit) + return; + + m_edit->setHtml(help); + m_edit->selectAll(); + m_edit->setFontFamily("Monospace"); + m_edit->moveCursor(QTextCursor::Start); +} + void HelpPanelPlugin::showHelp(const QString& help) { if(m_edit) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cantor-4.12.2/src/panelplugins/helppanel/helppanelplugin.h new/cantor-4.12.90/src/panelplugins/helppanel/helppanelplugin.h --- old/cantor-4.12.2/src/panelplugins/helppanel/helppanelplugin.h 2014-01-26 23:14:30.000000000 +0100 +++ new/cantor-4.12.90/src/panelplugins/helppanel/helppanelplugin.h 2014-03-01 19:01:46.000000000 +0100 @@ -36,6 +36,7 @@ QWidget* widget(); public slots: + void setHelpHtml(const QString& help); void showHelp(const QString& help); private: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cantor-4.12.2/src/scripteditorwidget.cpp new/cantor-4.12.90/src/scripteditorwidget.cpp --- old/cantor-4.12.2/src/scripteditorwidget.cpp 2014-01-26 23:14:30.000000000 +0100 +++ new/cantor-4.12.90/src/scripteditorwidget.cpp 2014-03-01 19:01:46.000000000 +0100 @@ -35,7 +35,7 @@ #include <KTextEditor/Editor> #include <KTextEditor/EditorChooser> -ScriptEditorWidget::ScriptEditorWidget(const QString& filter, QWidget* parent) : KXmlGuiWindow(parent) +ScriptEditorWidget::ScriptEditorWidget(const QString& filter, const QString& highlightingMode, QWidget* parent) : KXmlGuiWindow(parent) { setObjectName("ScriptEditor"); @@ -61,6 +61,8 @@ m_script=editor->createDocument(0); m_editor=qobject_cast<KTextEditor::View*>(m_script->createView(this)); + m_script->setHighlightingMode(highlightingMode); + KConfigGroup cg(KGlobal::config(), "ScriptEditor"); setAutoSaveSettings(cg, true); @@ -81,7 +83,9 @@ void ScriptEditorWidget::newScript() { + QString highlightingMode = m_script->highlightingMode(); m_script->closeUrl(); + m_script->setHighlightingMode(highlightingMode); } void ScriptEditorWidget::open() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cantor-4.12.2/src/scripteditorwidget.h new/cantor-4.12.90/src/scripteditorwidget.h --- old/cantor-4.12.2/src/scripteditorwidget.h 2014-01-26 23:14:30.000000000 +0100 +++ new/cantor-4.12.90/src/scripteditorwidget.h 2014-03-01 19:01:46.000000000 +0100 @@ -36,7 +36,7 @@ { Q_OBJECT public: - explicit ScriptEditorWidget( const QString& filter, QWidget* parent = 0 ); + explicit ScriptEditorWidget( const QString& filter, const QString& highlightingMode, QWidget* parent = 0 ); ~ScriptEditorWidget(); signals: -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
