Hello community, here is the log from the commit of package kalgebra for openSUSE:Factory checked in at 2014-03-18 16:07:58 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 2014-02-20 07:55:47.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.kalgebra.new/kalgebra.changes 2014-03-18 16:07:58.000000000 +0100 @@ -1,0 +2,14 @@ +Thu Mar 13 20:14:12 UTC 2014 - [email protected] + +- 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:59 UTC 2014 - [email protected] + +- Update to 4.12.80 + * KDE 4.13 Beta 1 release + * See http://www.kde.org/announcements/announce-4.13-beta1.php + +------------------------------------------------------------------- Old: ---- kalgebra-4.12.2.tar.xz New: ---- kalgebra-4.12.90.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kalgebra.spec ++++++ --- /var/tmp/diff_new_pack.WAAx8B/_old 2014-03-18 16:07:59.000000000 +0100 +++ /var/tmp/diff_new_pack.WAAx8B/_new 2014-03-18 16:07:59.000000000 +0100 @@ -21,7 +21,7 @@ License: GPL-2.0+ Group: Productivity/Scientific/Math Url: http://edu.kde.org -Version: 4.12.2 +Version: 4.12.90 Release: 0 Source0: %{name}-%{version}.tar.xz BuildRequires: analitza-devel @@ -56,22 +56,13 @@ %files %defattr(-,root,root) -%_kde4_htmldir/en/kalgebra/ -%_kde4_bindir/kalgebra -%_kde4_applicationsdir/kalgebra.desktop %_kde4_applicationsdir/kalgebramobile.desktop -%_kde4_appsdir/katepart/ %_kde4_iconsdir/hicolor/*/apps/kalgebra.* -%_kde4_modulesdir/plasma_applet_kalgebra.so -%_kde4_servicesdir/kalgebraplasmoid.desktop %_kde4_bindir/kalgebramobile -%_kde4_appsdir/katepart/syntax/kalgebra.xml %_kde4_appsdir/kalgebramobile/ -%_kde4_appsdir/plasma/ %dir %_kde4_modulesdir/imports/ %dir %_kde4_modulesdir/imports/org/ %dir %_kde4_modulesdir/imports/org/kde/ %_kde4_modulesdir/imports/org/kde/analitza -%_kde4_servicesdir/graphsplasmoid.desktop %changelog ++++++ kalgebra-4.12.2.tar.xz -> kalgebra-4.12.90.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kalgebra-4.12.2/CMakeLists.txt new/kalgebra-4.12.90/CMakeLists.txt --- old/kalgebra-4.12.2/CMakeLists.txt 2013-11-27 22:27:59.000000000 +0100 +++ new/kalgebra-4.12.90/CMakeLists.txt 2014-03-11 01:37:22.000000000 +0100 @@ -5,8 +5,6 @@ set(CMAKE_MODULE_PATH ${kalgebra_SOURCE_DIR}/cmake ${CMAKE_MODULE_PATH}) find_package(Analitza REQUIRED) -macro_optional_find_package(LibKdeEdu) -find_library(QTMML_LIBRARY qtmmlwidget) find_package(Qt4 COMPONENTS QtWebKit REQUIRED) @@ -16,8 +14,6 @@ macro_bool_to_01(OPENGL_FOUND HAVE_OPENGL) macro_log_feature(OPENGL_FOUND "OpenGL" "Support for 3D graphs in KAlgebra" "http://mesa3d.sourceforge.net"; FALSE "" "") -macro_log_feature(QTMML_LIBRARY "QtMathML Widget" "Supports displaying some formulas in a mathematic form" "http://doc.qt.nokia.com/solutions/4/qtmmlwidget/qtmmlwidget.html"; FALSE "" "") - CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/config-kalgebra.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/src/config-kalgebra.h) include_directories(.) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kalgebra-4.12.2/mobile/CMakeLists.txt new/kalgebra-4.12.90/mobile/CMakeLists.txt --- old/kalgebra-4.12.2/mobile/CMakeLists.txt 2013-11-27 22:27:59.000000000 +0100 +++ new/kalgebra-4.12.90/mobile/CMakeLists.txt 2014-03-11 01:37:22.000000000 +0100 @@ -6,7 +6,6 @@ endif(${MOBILE_BACKEND} STREQUAL "kde") qt4_add_resources(KALGEBRAMOBILE_SRCS resources.qrc) -kde4_add_app_icon(KALGEBRAMOBILE_SRCS "${CMAKE_CURRENT_SOURCE_DIR}/../icons/hi*-app-kalgebra.png") kde4_add_executable(kalgebramobile pluginsmodel.cpp kalgebramobile.cpp main.cpp ${KALGEBRAMOBILE_SRCS}) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kalgebra-4.12.2/mobile/declarative/graph2dmobile.cpp new/kalgebra-4.12.90/mobile/declarative/graph2dmobile.cpp --- old/kalgebra-4.12.2/mobile/declarative/graph2dmobile.cpp 2013-11-27 22:27:59.000000000 +0100 +++ new/kalgebra-4.12.90/mobile/declarative/graph2dmobile.cpp 2014-03-11 01:37:22.000000000 +0100 @@ -35,7 +35,7 @@ setSize(QSizeF(100,100)); setFlag(QGraphicsItem::ItemHasNoContents, false); - defViewport = QRectF(QPointF(-12., 10.), QSizeF(24., -20.)); + defViewport = QRectF(QPointF(-10.0, 10.0), QSizeF(20.0, -20.0)); resetViewport(); } @@ -54,7 +54,8 @@ if(m_dirty) { m_buffer.fill(Qt::transparent); - drawFunctions(&m_buffer); + drawGrid(&m_buffer); + drawFunctions(&m_buffer); m_dirty=false; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kalgebra-4.12.2/mobile/declarative/graph2dmobile.h new/kalgebra-4.12.90/mobile/declarative/graph2dmobile.h --- old/kalgebra-4.12.2/mobile/declarative/graph2dmobile.h 2013-11-27 22:27:59.000000000 +0100 +++ new/kalgebra-4.12.90/mobile/declarative/graph2dmobile.h 2014-03-11 01:37:22.000000000 +0100 @@ -32,7 +32,7 @@ Q_OBJECT Q_PROPERTY(QAbstractItemModel* model READ model WRITE setModel) Q_PROPERTY(QRectF viewport READ lastViewport WRITE setViewport) - Q_PROPERTY(bool squares READ squares WRITE setSquares) + Q_PROPERTY(bool showGrid READ showGrid WRITE setShowGrid) Q_PROPERTY(bool keepAspectRatio READ keepAspectRatio WRITE setKeepAspectRatio) Q_PROPERTY(bool currentFunction READ currentFunction WRITE setCurrentFunction) Q_PROPERTY(bool ticksShown READ ticksShownAtAll WRITE setTicksShownAtAll) @@ -48,7 +48,7 @@ void setCurrentFunction(int f) { m_currentFunction = f; } bool ticksShownAtAll() const { return ticksShown()!=0; } - void setTicksShownAtAll(bool shown) { setTicksShown(shown ? Qt::Vertical|Qt::Horizontal : Qt::Orientations(0));} + void setTicksShownAtAll(bool shown) { setShowTickLabels(shown ? Qt::Vertical|Qt::Horizontal : Qt::Orientations(0));} public slots: void translate(qreal x, qreal y); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kalgebra-4.12.2/mobile/declarative/qml/Graph2D.qml new/kalgebra-4.12.90/mobile/declarative/qml/Graph2D.qml --- old/kalgebra-4.12.2/mobile/declarative/qml/Graph2D.qml 2013-11-27 22:27:59.000000000 +0100 +++ new/kalgebra-4.12.90/mobile/declarative/qml/Graph2D.qml 2014-03-11 01:37:22.000000000 +0100 @@ -5,7 +5,7 @@ id: view anchors.fill: parent - squares: true + showGrid: true PinchArea { anchors.fill: parent diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kalgebra-4.12.2/mobile/plugins/kalgebraabout.desktop new/kalgebra-4.12.90/mobile/plugins/kalgebraabout.desktop --- old/kalgebra-4.12.2/mobile/plugins/kalgebraabout.desktop 2013-11-27 22:27:59.000000000 +0100 +++ new/kalgebra-4.12.90/mobile/plugins/kalgebraabout.desktop 2014-03-11 01:37:22.000000000 +0100 @@ -22,6 +22,7 @@ Name[it]=Informazioni su KAlgebra Name[kk]=KAlgebra туралы Name[km]=អំពី KAlgebra +Name[lt]=Apie KAlgebrą Name[mr]=के-एल्जिब्रा बद्दल Name[nb]=Om KAlgebra Name[nl]=Over KAlgebra diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kalgebra-4.12.2/mobile/plugins/kalgebraconsole.desktop new/kalgebra-4.12.90/mobile/plugins/kalgebraconsole.desktop --- old/kalgebra-4.12.2/mobile/plugins/kalgebraconsole.desktop 2013-11-27 22:27:59.000000000 +0100 +++ new/kalgebra-4.12.90/mobile/plugins/kalgebraconsole.desktop 2014-03-11 01:37:22.000000000 +0100 @@ -66,6 +66,7 @@ Comment[it]=Calcolatrice scientifica Comment[kk]=Ғылыми калькулятор Comment[km]=ម៉ាស៊ីនគិតលេខបែបវិទ្យាសាស្ត្រ +Comment[lt]=Mokslinis skaičiuotuvas Comment[lv]=Zinātniskais kalkulators Comment[mr]=शास्त्रीय गणकयंत्र Comment[nb]=Vitenskapelig kalkulator diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kalgebra-4.12.2/mobile/plugins/kalgebravariables.desktop new/kalgebra-4.12.90/mobile/plugins/kalgebravariables.desktop --- old/kalgebra-4.12.2/mobile/plugins/kalgebravariables.desktop 2013-11-27 22:27:59.000000000 +0100 +++ new/kalgebra-4.12.90/mobile/plugins/kalgebravariables.desktop 2014-03-11 01:37:22.000000000 +0100 @@ -23,6 +23,7 @@ Name[kk]=Айнымалылар Name[km]=អថេរ Name[ko]=변수 +Name[lt]=Kintamieji Name[lv]=Mainīgie Name[mr]=व्हेरिएबल्स Name[nb]=Variabler diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kalgebra-4.12.2/plasmoids/graphsplasmoid/metadata.desktop new/kalgebra-4.12.90/plasmoids/graphsplasmoid/metadata.desktop --- old/kalgebra-4.12.2/plasmoids/graphsplasmoid/metadata.desktop 2013-11-27 22:27:59.000000000 +0100 +++ new/kalgebra-4.12.90/plasmoids/graphsplasmoid/metadata.desktop 2014-03-11 01:37:22.000000000 +0100 @@ -19,6 +19,7 @@ Name[it]=Grafici 2D Name[kk]=2D графиктер Name[km]=ការគ្រោងធ្វេមាត្រ +Name[lt]=2D grafikai Name[nb]=2D-plott Name[nl]=2d-plots Name[pa]=2ਡੀ ਪਲਾਟ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kalgebra-4.12.2/src/CMakeLists.txt new/kalgebra-4.12.90/src/CMakeLists.txt --- old/kalgebra-4.12.2/src/CMakeLists.txt 2013-11-27 22:27:59.000000000 +0100 +++ new/kalgebra-4.12.90/src/CMakeLists.txt 2014-03-11 01:37:22.000000000 +0100 @@ -23,7 +23,6 @@ ${QT_QTGUI_LIBRARY} ${QT_QTCORE_LIBRARY} ${QT_QTXML_LIBRARY} ${QT_QTWEBKIT_LIBRARY} ${KDE4_KPARTS_LIBS} ${ANALITZA_LIBRARY} ${ANALITZAGUI_LIBRARY} ${ANALITZAPLOT_LIBRARY} - ${QTMML_LIBRARY} ) if(OPENGL_FOUND) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kalgebra-4.12.2/src/dictionary.cpp new/kalgebra-4.12.90/src/dictionary.cpp --- old/kalgebra-4.12.2/src/dictionary.cpp 2013-11-27 22:27:59.000000000 +0100 +++ new/kalgebra-4.12.90/src/dictionary.cpp 2014-03-11 01:37:22.000000000 +0100 @@ -31,7 +31,6 @@ #include <QHBoxLayout> #include <QFormLayout> #include <KLocale> -#include <QtMmlWidget> Dictionary::Dictionary(QWidget *p) : QWidget(p) { @@ -51,10 +50,6 @@ m_descr=new QLabel(descr); m_sample=new QLabel(descr); m_example=new QLabel(descr); - m_formula=new QtMmlWidget(descr); -// m_formula->setFrameStyle(2); - m_formula->setBaseFontPointSize(10); - m_formula->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding); m_funcs=new Analitza::PlotsModel(descr); m_graph=new Analitza::PlotsView2D(descr); m_graph->setTicksShown(0); @@ -74,15 +69,12 @@ descrLayo->addRow(i18n("<b>%1</b>", m_ops->headerData(1, Qt::Horizontal).toString()), m_descr); descrLayo->addRow(i18n("<b>%1</b>", m_ops->headerData(2, Qt::Horizontal).toString()), m_sample); descrLayo->addRow(i18n("<b>%1</b>", m_ops->headerData(3, Qt::Horizontal).toString()), m_example); - descrLayo->addRow(i18n("<b>Formula</b>"), m_formula); descrLayo->setFieldGrowthPolicy(QFormLayout::ExpandingFieldsGrow); graphLayo->addWidget(descr); -// graphLayo->addWidget(m_formula); graphLayo->addWidget(m_graph); descr->setLayout(descrLayo); m_funcs->clear(); - m_formula->setContent("<math />"); // connect(m_list, SIGNAL(clicked(QModelIndex)), this, SLOT(activated(QModelIndex))); } @@ -116,7 +108,6 @@ m_example->setText(example); QString error; - m_formula->setContent(e.toMathMLPresentation(), &error); if(!error.isEmpty()) qDebug() << "dict formula error: " << error << e.toMathMLPresentation(); @@ -127,7 +118,6 @@ m_descr->setText(QString()); m_sample->setText(QString()); m_example->setText(QString()); - m_formula->setContent("<math />", &error); } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kalgebra-4.12.2/src/dictionary.h new/kalgebra-4.12.90/src/dictionary.h --- old/kalgebra-4.12.2/src/dictionary.h 2013-11-27 22:27:59.000000000 +0100 +++ new/kalgebra-4.12.90/src/dictionary.h 2014-03-11 01:37:22.000000000 +0100 @@ -32,7 +32,6 @@ class QLabel; class QModelIndex; class OperatorsModel; -class QtMmlWidget; /** @author Aleix Pol @@ -56,7 +55,6 @@ QLabel *m_sample; QLabel *m_example; - QtMmlWidget* m_formula; Analitza::PlotsView2D *m_graph; Analitza::PlotsModel *m_funcs; OperatorsModel *m_ops; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kalgebra-4.12.2/src/functionedit.cpp new/kalgebra-4.12.90/src/functionedit.cpp --- old/kalgebra-4.12.2/src/functionedit.cpp 2013-11-27 22:27:59.000000000 +0100 +++ new/kalgebra-4.12.90/src/functionedit.cpp 2014-03-11 01:37:22.000000000 +0100 @@ -85,12 +85,12 @@ m_graph = new PlotsView2D(m_viewTabs); m_graph->setModel(m_funcsModel); - m_graph->setViewport(QRect(QPoint(-5, 7), QPoint(5, -7))); + m_graph->setViewport(QRectF(QPointF(-10.0, 10.0), QSizeF(20.0, -20.0))); m_graph->setFocusPolicy(Qt::NoFocus); m_graph->setMouseTracking(false); m_graph->setFramed(true); m_graph->setReadOnly(true); - m_graph->setSquares(false); + m_graph->setShowGrid(false); m_graph->setTicksShown(Qt::Orientation(0)); m_viewTabs->addTab(m_graph, QIcon::fromTheme("document-preview"), i18n("Preview")); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kalgebra-4.12.2/src/kalgebra.cpp new/kalgebra-4.12.90/src/kalgebra.cpp --- old/kalgebra-4.12.2/src/kalgebra.cpp 2013-11-27 22:27:59.000000000 +0100 +++ new/kalgebra-4.12.90/src/kalgebra.cpp 2014-03-11 01:37:22.000000000 +0100 @@ -361,9 +361,7 @@ KHelpMenu* help = new KHelpMenu(this, KGlobal::mainComponent().aboutData()); menuBar()->addMenu(help->menu()); -#ifdef __GNUC__ #warning TODO: Port to PlotsModel -#endif // connect(b_funcsModel, SIGNAL(functionModified(QString,Analitza::Expression)), // c_results, SLOT(modifyVariable(QString,Analitza::Expression))); // connect(b_funcsModel, SIGNAL(functionRemoved(QString)), @@ -596,7 +594,7 @@ void KAlgebra::toggleSquares() { - m_graph2d->setSquares(!m_graph2d->squares()); + m_graph2d->setShowGrid(!m_graph2d->showGrid()); } void KAlgebra::toggleKeepAspect() @@ -719,8 +717,9 @@ { #ifdef HAVE_OPENGL t_model3d->clear(); - t_model3d->addPlot(Analitza::PlotsFactory::self()->requestPlot(exp, Analitza::Dim3D, c_results->analitza()->variables()) - .create(Qt::yellow, "func3d_console")); + Analitza::PlotBuilder plot = Analitza::PlotsFactory::self()->requestPlot(exp, Analitza::Dim3D, c_results->analitza()->variables()); + Q_ASSERT(plot.canDraw()); + t_model3d->addPlot(plot.create(Qt::yellow, "func3d_console")); m_tabs->setCurrentIndex(2); #endif } -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
