Hello community, here is the log from the commit of package kalgebra for openSUSE:Factory checked in at 2013-07-08 07:33:05 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 2013-06-11 09:28:32.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.kalgebra.new/kalgebra.changes 2013-07-08 07:33:06.000000000 +0200 @@ -1,0 +2,14 @@ +Thu Jun 27 18:15:15 UTC 2013 - [email protected] + +- Update to 4.10.90 + * KDE 4.11 Beta 1 release + * See http://www.kde.org/announcements/announce-4.11-beta2.php + +------------------------------------------------------------------- +Thu Jun 13 19:19:06 UTC 2013 - [email protected] + +- Update to 4.10.80 + * KDE 4.11 Beta 1 release + * See http://www.kde.org/announcements/announce-4.11-beta1.php + +------------------------------------------------------------------- Old: ---- kalgebra-4.10.4.tar.xz New: ---- kalgebra-4.10.90.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kalgebra.spec ++++++ --- /var/tmp/diff_new_pack.Jz9rq2/_old 2013-07-08 07:33:07.000000000 +0200 +++ /var/tmp/diff_new_pack.Jz9rq2/_new 2013-07-08 07:33:07.000000000 +0200 @@ -21,7 +21,7 @@ License: GPL-2.0+ Group: Productivity/Scientific/Math Url: http://edu.kde.org -Version: 4.10.4 +Version: 4.10.90 Release: 0 Source0: %{name}-%{version}.tar.xz BuildRequires: analitza-devel ++++++ kalgebra-4.10.4.tar.xz -> kalgebra-4.10.90.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kalgebra-4.10.4/cmake/FindAnalitza.cmake new/kalgebra-4.10.90/cmake/FindAnalitza.cmake --- old/kalgebra-4.10.4/cmake/FindAnalitza.cmake 2013-05-28 20:44:30.000000000 +0200 +++ new/kalgebra-4.10.90/cmake/FindAnalitza.cmake 2013-06-10 20:52:03.000000000 +0200 @@ -23,6 +23,6 @@ endif(ANALITZA_INCLUDE_DIR AND ANALITZA_LIBRARY) include(FindPackageHandleStandardArgs) -find_package_handle_standard_args(Analitza DEFAULT_MSG ANALITZA_INCLUDE_DIR ANALITZA_LIBRARY) +find_package_handle_standard_args(Analitza DEFAULT_MSG ANALITZA_INCLUDE_DIR ANALITZA_LIBRARY) -mark_as_advanced(ANALITZA_INCLUDE_DIR ANALITZA_LIBRARY) +mark_as_advanced(ANALITZA_INCLUDE_DIR ANALITZA_LIBRARY ANALITZAPLOT_LIBRARY ANALITZAGUI_LIBRARY) Files old/kalgebra-4.10.4/doc/index.cache.bz2 and new/kalgebra-4.10.90/doc/index.cache.bz2 differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kalgebra-4.10.4/doc/index.docbook new/kalgebra-4.10.90/doc/index.docbook --- old/kalgebra-4.10.4/doc/index.docbook 2013-05-28 20:44:30.000000000 +0200 +++ new/kalgebra-4.10.90/doc/index.docbook 2013-06-26 21:24:10.000000000 +0200 @@ -67,7 +67,7 @@ program was MathML oriented. Now it can be used by anyone with a little mathematical knowledge to solve simple and advanced problems alike. </para> - +<!--FIXME http://swiftscythe.blogspot.de/2011/02/how-to-work-with-complex-numbers-in.html--> <para> It includes such features as: </para> @@ -140,7 +140,7 @@ </menuchoice></term> <listitem><para>Opens a new &kalgebra; window.</para></listitem> </varlistentry> - +<!--FIXME Full Screen Mode Ctrl+Shift+F--> <varlistentry> <term><menuchoice> <shortcut><keycombo action="simul">&Ctrl; @@ -223,7 +223,7 @@ or <guimenu>Evaluate</guimenu> mode, depending on the <guimenu>Console</guimenu> menu selection. </para> - +<!--FIXME explain Calculate + Evaluate mode --> <para> In addition to displaying the user entered equations and results in the console display, all variables that are declared are displayed in a @@ -336,7 +336,8 @@ of the mouse and this area will be zoomed in. Move the view with the arrow keys.</para> <para>In the <guilabel>List</guilabel> tab, you can open a context menu with a &RMB; click on a function and hide or remove it.</para> - +<!--FIXME no context menu + check box to hide/display, how to remove a function? --> <para>In the <guimenu>2D Graph</guimenu> menu you find these options:</para> <itemizedlist> <listitem><para>Show or hide the grid</para></listitem> @@ -349,7 +350,7 @@ <listitem><para>Reset the view to the original zoom</para></listitem> <listitem><para>Select a resolution for the graphs</para></listitem> </itemizedlist> - +<!--FIXME Viewport missing--> <para> Below is a screenshot of a user who's cursor is at the rightmost root @@ -398,10 +399,11 @@ you can zoom in and out. Hold the &LMB; and move the mouse to rotate the graph.</para> <para>The left and right arrow keys rotate the graph around the z axis, the up and down arrow keys rotate around the horizontal axis of the view.</para> - +<!--FIXME not possible to do it with cursor keys --> <para>In the <guimenu>3D Graph</guimenu> menu you find these options:</para> <itemizedlist> <listitem><para>Enable or disable transparency in the 3D graph menu</para></listitem> +<!--FIXME not in master--> <listitem><para>Save (<keycombo action="simul">&Ctrl; <keycap>S</keycap></keycombo>) the graph as image file</para></listitem> <listitem><para>Reset the view to the original zoom in the 3D graph menu</para></listitem> @@ -456,7 +458,7 @@ </chapter> &commands; - + <!--FIXME ask maintainer if it needs to be regenerated from the code--> <chapter id="credits"> <title>Credits and License</title> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kalgebra-4.10.4/mobile/CMakeLists.txt new/kalgebra-4.10.90/mobile/CMakeLists.txt --- old/kalgebra-4.10.4/mobile/CMakeLists.txt 2013-05-30 23:47:03.000000000 +0200 +++ new/kalgebra-4.10.90/mobile/CMakeLists.txt 2013-06-10 20:52:03.000000000 +0200 @@ -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.10.4/mobile/declarative/graph2dmobile.cpp new/kalgebra-4.10.90/mobile/declarative/graph2dmobile.cpp --- old/kalgebra-4.10.4/mobile/declarative/graph2dmobile.cpp 2013-05-28 20:44:30.000000000 +0200 +++ new/kalgebra-4.10.90/mobile/declarative/graph2dmobile.cpp 2013-06-10 20:52:03.000000000 +0200 @@ -115,9 +115,9 @@ QColor fcolor = randomFunctionColor(); QStringList err; - PlotBuilder req = PlotsFactory::self()->requestPlot(e, Dim2D); + PlotBuilder req = PlotsFactory::self()->requestPlot(e, Dim2D, vars); if(req.canDraw()) { - PlaneCurve* it = static_cast<PlaneCurve*>(req.create(fcolor, fname, vars)); + PlaneCurve* it = static_cast<PlaneCurve*>(req.create(fcolor, fname)); if(it->isCorrect()) plotsmodel->addPlot(it); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kalgebra-4.10.4/mobile/kalgebramobile.desktop new/kalgebra-4.10.90/mobile/kalgebramobile.desktop --- old/kalgebra-4.10.4/mobile/kalgebramobile.desktop 2013-05-30 11:14:40.000000000 +0200 +++ new/kalgebra-4.10.90/mobile/kalgebramobile.desktop 2013-06-10 20:52:03.000000000 +0200 @@ -36,6 +36,7 @@ Name[sk]=KAlgebra Mobile Name[sl]=KAlgebra Mobile Name[sv]=Kalgebra för mobil +Name[tr]=KAlgebra Mobil Name[ug]=كۆچمە ئۈسكۈنىلەر ئۈچۈن KAlgebra Name[uk]=Мобільна KAlgebra Name[x-test]=xxKAlgebra Mobilexx @@ -79,6 +80,7 @@ GenericName[sk]=Vrecková grafická kalkulačka GenericName[sl]=Žepno računalo z grafi GenericName[sv]=Grafminiräknare +GenericName[tr]=Cep Grafik Hesap Makinesi GenericName[uk]=Кишеньковий графічний калькулятор GenericName[x-test]=xxPocket Graph Calculatorxx GenericName[zh_CN]=口袋图形计算器 @@ -118,6 +120,7 @@ Comment[sk]=Vreckový riešiteľ a zapisovač matematických výrazov Comment[sl]=Žepni reševalnik matematičnih enačb in risalnik grafov Comment[sv]=Lösning och uppritning av matematiska uttryck i fickformat +Comment[tr]=Cep Matematiksel İfade Çözücü ve Çizici Comment[ug]=كۆچمە ئۈسكۈنىلەر ئۈچۈن ماتېماتىكىلىق ئىپادىلەرنى يېشىش ۋە سىزىش قورالى Comment[uk]=Кишеньковий розв’язувач математичних рівнянь та графопобудовник Comment[x-test]=xxPocket Math Expression Solver and Plotterxx diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kalgebra-4.10.4/mobile/kalgebramobileharmattan.desktop new/kalgebra-4.10.90/mobile/kalgebramobileharmattan.desktop --- old/kalgebra-4.10.4/mobile/kalgebramobileharmattan.desktop 2013-05-30 11:14:40.000000000 +0200 +++ new/kalgebra-4.10.90/mobile/kalgebramobileharmattan.desktop 2013-06-10 20:52:03.000000000 +0200 @@ -94,6 +94,7 @@ GenericName[sk]=Vrecková grafická kalkulačka GenericName[sl]=Žepno računalo z grafi GenericName[sv]=Grafminiräknare +GenericName[tr]=Cep Grafik Hesap Makinesi GenericName[uk]=Кишеньковий графічний калькулятор GenericName[x-test]=xxPocket Graph Calculatorxx GenericName[zh_CN]=口袋图形计算器 @@ -133,6 +134,7 @@ Comment[sk]=Vreckový riešiteľ a zapisovač matematických výrazov Comment[sl]=Žepni reševalnik matematičnih enačb in risalnik grafov Comment[sv]=Lösning och uppritning av matematiska uttryck i fickformat +Comment[tr]=Cep Matematiksel İfade Çözücü ve Çizici Comment[ug]=كۆچمە ئۈسكۈنىلەر ئۈچۈن ماتېماتىكىلىق ئىپادىلەرنى يېشىش ۋە سىزىش قورالى Comment[uk]=Кишеньковий розв’язувач математичних рівнянь та графопобудовник Comment[x-test]=xxPocket Math Expression Solver and Plotterxx diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kalgebra-4.10.4/mobile/plugins/kalgebraabout.desktop new/kalgebra-4.10.90/mobile/plugins/kalgebraabout.desktop --- old/kalgebra-4.10.4/mobile/plugins/kalgebraabout.desktop 2013-05-30 11:14:40.000000000 +0200 +++ new/kalgebra-4.10.90/mobile/plugins/kalgebraabout.desktop 2013-06-10 20:52:03.000000000 +0200 @@ -33,6 +33,7 @@ Name[sk]=O programe KAlgebra Name[sl]=O KAlgebri Name[sv]=Om Kalgebra +Name[tr]=KAlgebra Hakkında Name[uk]=Про KAlgebra Name[x-test]=xxAbout KAlgebraxx Name[zh_CN]=关于 KAlgebra diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kalgebra-4.10.4/mobile/plugins/kalgebraconsole.desktop new/kalgebra-4.10.90/mobile/plugins/kalgebraconsole.desktop --- old/kalgebra-4.10.4/mobile/plugins/kalgebraconsole.desktop 2013-05-30 11:14:40.000000000 +0200 +++ new/kalgebra-4.10.90/mobile/plugins/kalgebraconsole.desktop 2013-06-10 20:52:03.000000000 +0200 @@ -40,6 +40,7 @@ Name[sk]=Konzola Name[sl]=Konzola Name[sv]=Terminal +Name[tr]=Konsol Name[ug]=تىزگىن سۇپا Name[uk]=Консоль Name[x-test]=xxConsolexx @@ -78,6 +79,7 @@ Comment[sk]=Vedecká kalkulačka Comment[sl]=Znanstveno računalo Comment[sv]=Vetenskaplig miniräknare +Comment[tr]=Bilimsel hesap makinesi Comment[uk]=Калькулятор для науковців Comment[x-test]=xxScientific calculatorxx Comment[zh_CN]=科学计算器 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kalgebra-4.10.4/mobile/plugins/kalgebraplot2d.desktop new/kalgebra-4.10.90/mobile/plugins/kalgebraplot2d.desktop --- old/kalgebra-4.10.4/mobile/plugins/kalgebraplot2d.desktop 2013-05-30 11:14:40.000000000 +0200 +++ new/kalgebra-4.10.90/mobile/plugins/kalgebraplot2d.desktop 2013-06-10 20:52:03.000000000 +0200 @@ -24,7 +24,7 @@ Name[it]=Grafico 2D Name[ja]=グラフ 2D Name[kk]=2D график -Name[km]=ក្រាហ្វត្រីមាត្រ +Name[km]=ក្រាហ្វិកទ្វេមាត្រ Name[ko]=2차원 그래프 Name[lv]=Grafiks 2D Name[mr]=आलेख 2D @@ -39,6 +39,7 @@ Name[sk]=2D Graf Name[sl]=2D graf Name[sv]=Graf-2D +Name[tr]=Graph 2D Name[uk]=Двовимірний графік Name[x-test]=xxGraph 2Dxx Name[zh_CN]=二维图 @@ -75,6 +76,7 @@ Comment[sk]=Nakreslí ľubovoľný 2D graf Comment[sl]=Nariše poljuben 2D graf Comment[sv]=Ritar vilken tvådimensionell graf som helst +Comment[tr]=İstediğiniz herhangi bir 2D grafiği çizer Comment[uk]=Креслить будь-які двовимірні графіки Comment[x-test]=xxDraws any 2D graph you wantxx Comment[zh_CN]=绘制想要的二维图 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kalgebra-4.10.4/mobile/plugins/kalgebratables.desktop new/kalgebra-4.10.90/mobile/plugins/kalgebratables.desktop --- old/kalgebra-4.10.4/mobile/plugins/kalgebratables.desktop 2013-05-30 11:14:40.000000000 +0200 +++ new/kalgebra-4.10.90/mobile/plugins/kalgebratables.desktop 2013-06-10 20:52:03.000000000 +0200 @@ -37,6 +37,7 @@ Name[sk]=Tabuľky hodnôt Name[sl]=Razpredelnice vrednosti Name[sv]=Värdetabeller +Name[tr]=Değer Tabloları Name[uk]=Таблиці значень Name[x-test]=xxValue Tablesxx Name[zh_CN]=数值表 @@ -71,6 +72,7 @@ Comment[sk]=Jednoducho vytvoriť tabuľky hodnôt Comment[sl]=Enostavno ustvarite razpredelnice vrednosti Comment[sv]=Skapa enkelt värdetabeller +Comment[tr]=Kolayca değer tabloları oluşturun Comment[uk]=Спрощує створення таблиць значень Comment[x-test]=xxEasily create value tablesxx Comment[zh_CN]=方便的创建数值表 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kalgebra-4.10.4/mobile/plugins/kalgebravariables.desktop new/kalgebra-4.10.90/mobile/plugins/kalgebravariables.desktop --- old/kalgebra-4.10.4/mobile/plugins/kalgebravariables.desktop 2013-05-30 11:14:40.000000000 +0200 +++ new/kalgebra-4.10.90/mobile/plugins/kalgebravariables.desktop 2013-06-10 20:52:03.000000000 +0200 @@ -36,6 +36,7 @@ Name[sk]=Premenné Name[sl]=Spremenljivke Name[sv]=Variabler +Name[tr]=Değişkenler Name[ug]=ئۆزگەرگۈچىلەر Name[uk]=Змінні Name[x-test]=xxVariablesxx @@ -67,6 +68,7 @@ Comment[sk]=Zobrazí uložené hodnoty Comment[sl]=Prikaže shranjene vrednosti Comment[sv]=Visar de lagrade värdena +Comment[tr]=Saklanan değerleri görüntüler Comment[uk]=Показує збережені значення Comment[x-test]=xxDisplays the stored valuesxx Comment[zh_CN]=显示存储的值 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kalgebra-4.10.4/plasmoids/graphsplasmoid/contents/ui/main.qml new/kalgebra-4.10.90/plasmoids/graphsplasmoid/contents/ui/main.qml --- old/kalgebra-4.10.4/plasmoids/graphsplasmoid/contents/ui/main.qml 2013-05-28 20:44:30.000000000 +0200 +++ new/kalgebra-4.10.90/plasmoids/graphsplasmoid/contents/ui/main.qml 2013-06-10 20:52:03.000000000 +0200 @@ -50,6 +50,7 @@ Component.onCompleted: { plasmoid.addEventListener('ConfigChanged', function() { displayedFunction = plasmoid.readConfig("function") + input.text = displayedFunction }); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kalgebra-4.10.4/plasmoids/graphsplasmoid/metadata.desktop new/kalgebra-4.10.90/plasmoids/graphsplasmoid/metadata.desktop --- old/kalgebra-4.10.4/plasmoids/graphsplasmoid/metadata.desktop 2013-05-30 11:14:40.000000000 +0200 +++ new/kalgebra-4.10.90/plasmoids/graphsplasmoid/metadata.desktop 2013-06-10 20:52:03.000000000 +0200 @@ -3,7 +3,6 @@ Type=Service ServiceTypes=Plasma/Applet Name=2D Plots -Name[bs]=2D crtanje Name[ca]=Gràfiques 2D Name[ca@valencia]=Gràfiques 2D Name[cs]=2D grafy @@ -18,7 +17,7 @@ Name[hu]=2D görbék Name[it]=Grafici 2D Name[kk]=2D графиктер -Name[km]=2D Plots +Name[km]=ការគ្រោងធ្វេមាត្រ Name[nb]=2D-plott Name[nl]=2d-plots Name[pa]=2ਡੀ ਪਲਾਟ @@ -29,11 +28,11 @@ Name[sk]=2D zákresy Name[sl]=2D grafi Name[sv]=Tvådimensionella diagram +Name[tr]=2D Çizimler Name[uk]=Плоскі графіки Name[x-test]=xx2D Plotsxx Name[zh_TW]=2D 繪圖 Comment=Put the weirdest plots on your desktop! -Comment[bs]=Stavite divlje crteže na vaš desktop! Comment[ca]=Poseu les gràfiques més estranyes al vostre escriptori! Comment[ca@valencia]=Poseu les gràfiques més estranyes al vostre escriptori! Comment[da]=Sæt de særeste plot på dit skrivebord! @@ -57,6 +56,7 @@ Comment[sk]=Vložte najpodivnejšie zákresy na vašu plochu! Comment[sl]=Na namizje postavite čudaške grafe! Comment[sv]=Rita riktigt konstiga diagram på skrivbordet. +Comment[tr]=Masaüstünüzde en tuhaf çizimleri koyun! Comment[uk]=Розташуйте на вашій стільниці найвигадливіше креслення! Comment[x-test]=xxPut the weirdest plots on your desktop!xx Comment[zh_TW]=在您的桌面上放最詭異的繪圖！ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kalgebra-4.10.4/src/dictionary.cpp new/kalgebra-4.10.90/src/dictionary.cpp --- old/kalgebra-4.10.4/src/dictionary.cpp 2013-05-28 20:44:30.000000000 +0200 +++ new/kalgebra-4.10.90/src/dictionary.cpp 2013-06-10 20:52:03.000000000 +0200 @@ -120,7 +120,7 @@ if(!error.isEmpty()) qDebug() << "dict formula error: " << error << e.toMathMLPresentation(); - m_funcs->addPlot(Analitza::PlotsFactory::self()->requestPlot(e, Analitza::Dim2D).create(QColor(0,150,0), "dict", m_vars)); + m_funcs->addPlot(Analitza::PlotsFactory::self()->requestPlot(e, Analitza::Dim2D, m_vars).create(QColor(0,150,0), "dict")); } else { QString error; m_name->setText(QString()); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kalgebra-4.10.4/src/functionedit.cpp new/kalgebra-4.10.90/src/functionedit.cpp --- old/kalgebra-4.10.4/src/functionedit.cpp 2013-05-28 20:44:30.000000000 +0200 +++ new/kalgebra-4.10.90/src/functionedit.cpp 2013-06-10 20:52:03.000000000 +0200 @@ -131,6 +131,10 @@ m_func->setFocus(); m_ok->setEnabled(false); + + QFont errorFont=m_valid->font(); + errorFont.setBold(true); + m_valid->setFont(errorFont); } FunctionEdit::~FunctionEdit() @@ -204,24 +208,9 @@ void FunctionEdit::setState(const QString& text, bool negative) { - QFont errorFont=m_valid->font(); - errorFont.setBold(true); - m_valid->setFont(errorFont); - - QString errorm=text, error=text; - QFontMetrics fm(errorFont); - - if(fm.width(errorm)>m_valid->width()) { - for(int i=3; i<errorm.size(); ++i) { - QString aux=i18nc("text ellipsis", "%1...", errorm.mid(0,i)); - - if(fm.width(aux) <= m_valid->width()) - error=aux; - else - break; - } - } - m_valid->setText(error); + QFontMetrics fm(m_valid->font()); + m_valid->setText(fm.elidedText(text, Qt::ElideRight, m_valid->width())); + m_valid->setToolTip(text); KColorScheme scheme(QPalette::Normal); KColorScheme::ForegroundRole role = negative? KColorScheme::NegativeText : KColorScheme::PositiveText; @@ -304,8 +293,8 @@ PlaneCurve* FunctionEdit::createFunction() const { - PlotBuilder req = PlotsFactory::self()->requestPlot(expression(), Dim2D); - PlaneCurve* curve = static_cast<PlaneCurve*>(req.create(color(), name(), m_vars)); + PlotBuilder req = PlotsFactory::self()->requestPlot(expression(), Dim2D, m_vars); + PlaneCurve* curve = static_cast<PlaneCurve*>(req.create(color(), name())); curve->setResolution(resolution); if(m_calcUplimit != m_calcDownlimit) { foreach(const QString& var, curve->parameters()) @@ -329,4 +318,8 @@ m_viewTabs->setVisible(shown); } -#include "functionedit.moc" +void FunctionEdit::resizeEvent(QResizeEvent*) +{ + QFontMetrics fm(m_valid->font()); + m_valid->setText(fm.elidedText(m_valid->toolTip(), Qt::ElideRight, m_valid->width())); +} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kalgebra-4.10.4/src/functionedit.h new/kalgebra-4.10.90/src/functionedit.h --- old/kalgebra-4.10.4/src/functionedit.h 2013-05-28 20:44:30.000000000 +0200 +++ new/kalgebra-4.10.90/src/functionedit.h 2013-06-10 20:52:03.000000000 +0200 @@ -89,6 +89,8 @@ void setOptionsShown(bool shown); + virtual void resizeEvent(QResizeEvent* ev); + public slots: /** Clears the dialog. */ void clear(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kalgebra-4.10.4/src/kalgebra.cpp new/kalgebra-4.10.90/src/kalgebra.cpp --- old/kalgebra-4.10.4/src/kalgebra.cpp 2013-05-28 20:44:30.000000000 +0200 +++ new/kalgebra-4.10.90/src/kalgebra.cpp 2013-06-25 20:22:28.000000000 +0200 @@ -54,6 +54,7 @@ #include <KProcess> #include <KRecentFilesAction> #include <KApplication> +#include <KToggleFullScreenAction> #include <kabstractfilewidget.h> #include <analitzaplot/plotsfactory.h> @@ -106,16 +107,23 @@ { resize(900, 500); - m_tabs = new QTabWidget(this); + m_tabs = new QTabWidget; setCentralWidget(m_tabs); setStatusBar(new KStatusBar(this)); setMenuBar(new KMenuBar(this)); + KToggleFullScreenAction* fullScreenAction = KStandardAction::fullScreen(this, SLOT(fullScreen(bool)), this, this); + QMenu* g_menu = menuBar()->addMenu(i18n("Session")); g_menu->addAction(KStandardAction::openNew(this, SLOT(newInstance()), this)); + g_menu->addAction(fullScreenAction); g_menu->addAction(KStandardAction::quit(this, SLOT(close()), this)); + QToolButton* fullScreenButton = new QToolButton(this); + fullScreenButton->setDefaultAction(fullScreenAction); + m_tabs->setCornerWidget(fullScreenButton); + m_status = new QLabel(this); statusBar()->insertWidget(0, m_status); menuBar()->addMenu("|")->setEnabled(false); @@ -351,9 +359,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)), @@ -394,8 +400,8 @@ { qDebug() << "adding" << exp.toString(); - Analitza::PlotItem* curve = Analitza::PlotsFactory::self()->requestPlot(exp, Analitza::Dim2D).create(randomFunctionColor(), b_funcsModel->freeId(), - c_results->analitza()->variables()); + Analitza::PlotBuilder req = Analitza::PlotsFactory::self()->requestPlot(exp, Analitza::Dim2D, c_results->analitza()->variables()); + Analitza::PlotItem* curve = req.create(randomFunctionColor(), b_funcsModel->freeId()); b_funcsModel->addPlot(curve); m_tabs->setCurrentIndex(1); @@ -519,10 +525,10 @@ { #ifdef HAVE_OPENGL Analitza::Expression exp = t_exp->expression(); - Analitza::PlotBuilder plot = Analitza::PlotsFactory::self()->requestPlot(exp, Analitza::Dim3D); + Analitza::PlotBuilder plot = Analitza::PlotsFactory::self()->requestPlot(exp, Analitza::Dim3D, c_results->analitza()->variables()); if(plot.canDraw()) { t_model3d->clear(); - t_model3d->addPlot(plot.create(Qt::yellow, "func3d", c_results->analitza()->variables())); + t_model3d->addPlot(plot.create(Qt::yellow, "func3d")); } else changeStatusBar(i18n("Errors: %1", plot.errors().join(i18n(", ")))); #endif @@ -587,28 +593,34 @@ delete dialog; } +void menuEnabledHelper(QMenu* m, bool enabled) +{ + m->setEnabled(enabled); + foreach(QAction* action, m->actions()) { + action->setEnabled(enabled); + } +} + void KAlgebra::tabChanged(int n) { c_dock_vars->hide(); b_dock_funcs->hide(); d_dock->hide(); - c_menu->setEnabled(false); - b_menu->setEnabled(false); + menuEnabledHelper(c_menu, n==0); + menuEnabledHelper(b_menu, n==1); #ifdef HAVE_OPENGL - t_menu->setEnabled(false); + menuEnabledHelper(t_menu, n==2); #endif m_status->clear(); switch(n) { case 0: - c_menu->setEnabled(true); c_dock_vars->show(); c_dock_vars->raise(); c_exp->setFocus(); break; case 1: - b_menu->setEnabled(true); b_dock_funcs->show(); b_dock_funcs->raise(); @@ -618,7 +630,6 @@ break; #ifdef HAVE_OPENGL case 2: - t_menu->setEnabled(true); t_exp->setFocus(); break; #endif @@ -680,7 +691,8 @@ { #ifdef HAVE_OPENGL t_model3d->clear(); - t_model3d->addPlot(Analitza::PlotsFactory::self()->requestPlot(exp, Analitza::Dim3D).create(Qt::yellow, "func3d_console", c_results->analitza()->variables())); + t_model3d->addPlot(Analitza::PlotsFactory::self()->requestPlot(exp, Analitza::Dim3D, c_results->analitza()->variables()) + .create(Qt::yellow, "func3d_console")); m_tabs->setCurrentIndex(2); #endif } @@ -691,4 +703,17 @@ d_list->setCurrentIndex(d_list->model()->index(0,0)); } -#include "kalgebra.moc" +void KAlgebra::fullScreen(bool isFull) +{ + m_tabs->setDocumentMode(isFull); + m_tabs->setTabEnabled(3, !isFull); + if(isFull) { + hide(); + m_tabs->setParent(0); + setCentralWidget(0); + m_tabs->showFullScreen(); + } else { + setCentralWidget(m_tabs); + show(); + } +} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kalgebra-4.10.4/src/kalgebra.h new/kalgebra-4.10.90/src/kalgebra.h --- old/kalgebra-4.10.4/src/kalgebra.h 2013-05-28 20:44:30.000000000 +0200 +++ new/kalgebra-4.10.90/src/kalgebra.h 2013-06-25 20:22:28.000000000 +0200 @@ -88,6 +88,7 @@ private slots: void newInstance(); + void fullScreen(bool isFull); void initializeRecentScripts(); void operate(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kalgebra-4.10.4/src/varedit.cpp new/kalgebra-4.10.90/src/varedit.cpp --- old/kalgebra-4.10.4/src/varedit.cpp 2013-05-28 20:44:30.000000000 +0200 +++ new/kalgebra-4.10.90/src/varedit.cpp 2013-06-10 20:52:03.000000000 +0200 @@ -36,13 +36,18 @@ QWidget *widget = new QWidget( this ); setCaption(i18n("Add/Edit a variable")); setModal(modal); - setButtons(KDialog::Ok | KDialog::Cancel); + setButtons(KDialog::User1 | KDialog::Ok | KDialog::Cancel); enableButtonApply( false ); setMainWidget( widget ); + setButtonText(KDialog::User1, i18n("Remove Variable")); + + setButtonIcon(KDialog::User1, KIcon("edit-table-delete-row")); setButtonIcon(KDialog::Ok, KIcon("dialog-ok")); setButtonIcon(KDialog::Cancel, KIcon("dialog-cancel")); + connect(button(KDialog::User1), SIGNAL(clicked(bool)), SLOT(removeVariable())); + connect( this, SIGNAL(applyClicked()), this, SLOT(accept()) ); connect( this, SIGNAL(okClicked()), this, SLOT(reject()) ); @@ -68,6 +73,20 @@ else { m_exp->setExpression(Analitza::Expression(vars->value(newVar)->copy())); } + + button(KDialog::User1)->setEnabled(canRemove(newVar)); +} + +bool VarEdit::canRemove(const QString& name) const +{ + QHash<QString, Analitza::Object*>::const_iterator it = vars->constBegin(), itEnd = vars->constEnd(); + for(; it!=itEnd; ++it) { + QStringList deps = AnalitzaUtils::dependencies(*it, QStringList()); + if(deps.contains(name)) { + return false; + } + } + return true; } Analitza::Expression VarEdit::val() @@ -113,5 +132,8 @@ m_exp->setAnalitza(na); } -#include "varedit.moc" - +void VarEdit::removeVariable() +{ + vars->remove(m_var); + close(); +} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kalgebra-4.10.4/src/varedit.h new/kalgebra-4.10.90/src/varedit.h --- old/kalgebra-4.10.4/src/varedit.h 2013-05-28 20:44:30.000000000 +0200 +++ new/kalgebra-4.10.90/src/varedit.h 2013-06-10 20:52:03.000000000 +0200 @@ -47,7 +47,7 @@ explicit VarEdit(QWidget *parent = 0, bool modal = false); /** Sets the editing variable name */ - void setName(const QString& newVar); //This should edit the variable name + void setName(const QString& newVar); /** Sets an Analitza which will evaluate it. It may be interesting because variables can change. */ void setAnalitza(Analitza::Analyzer *na); @@ -56,6 +56,8 @@ Analitza::Expression val(); private: + bool canRemove(const QString& name) const; + Analitza::ExpressionEdit *m_exp; QLabel *m_valid; @@ -66,6 +68,7 @@ private slots: void edit(); void ok(); + void removeVariable(); }; #endif -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
