[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [khipu] /: Remove QtMmlWidget dependency
From:       Percy_Camilo_Triveño_Aucahuasi <percy.camilo.ta () gmail ! com>
Date:       2014-01-28 8:12:32
Message-ID: E1W83ma-0005fB-T0 () scm ! kde ! org
[Download RAW message or body]

Git commit db2a89e4a61f315435456d4653076c394d1c83cc by Percy Camilo Triveño \
Aucahuasi. Committed on 28/01/2014 at 08:12.
Pushed by aucahuasi into branch 'master'.

Remove QtMmlWidget dependency

M  +0    -3    CMakeLists.txt
M  +0    -4    src/CMakeLists.txt
M  +0    -51   src/plotsbuilder.cpp
M  +0    -4    src/plotsbuilder.h
M  +11   -29   src/plotsbuilder.ui
M  +61   -197  src/plotseditor.cpp
M  +1    -17   src/plotseditor.h
M  +12   -17   src/plotseditor.ui

http://commits.kde.org/khipu/db2a89e4a61f315435456d4653076c394d1c83cc

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 488693b..d5eba69 100755
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -8,9 +8,6 @@ find_package ( Analitza REQUIRED )
 find_package ( QJSON REQUIRED)
 
 find_package(LibKdeEdu)
-find_library(QTMML_LIBRARY qtmmlwidget)
-
-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 "" "")  
 add_definitions (${QT_DEFINITIONS} ${KDE4_DEFINITIONS}  ${QJSON_DEFINITIONS} \
${qjson_DEFINITIONS} -DQT_USE_FAST_CONCATENATION -DQT_USE_FAST_OPERATOR_PLUS)  
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 7f37f95..c6da147 100755
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -53,8 +53,6 @@ target_link_libraries( khipu
   ${OPENGL_gl_LIBRARY}
   ${OPENGL_glu_LIBRARY}
   ${QT_QTOPENGL_LIBRARY}
-  ${QT_QTXML_LIBRARY}
-  ${QTMML_LIBRARY}
   libkhipu
 )
 
@@ -69,8 +67,6 @@ target_link_libraries( libkhipu
   ${OPENGL_gl_LIBRARY}
   ${OPENGL_glu_LIBRARY}
   ${QT_QTOPENGL_LIBRARY}
-  ${QT_QTXML_LIBRARY}
-  ${QTMML_LIBRARY}
 )
 
 install (TARGETS khipu ${INSTALL_TARGETS_DEFAULT_ARGS} )
diff --git a/src/plotsbuilder.cpp b/src/plotsbuilder.cpp
index f540d3e..4713bd3 100644
--- a/src/plotsbuilder.cpp
+++ b/src/plotsbuilder.cpp
@@ -107,11 +107,9 @@ bool PlotsBuilder::eventFilter(QObject *object, QEvent *event)
 
         else {
             m_currentTyppe=None;
-            clearInfoWidget();
             return false;
         }
     }
-    setupInfo();
     return false;
 }
 
@@ -200,55 +198,6 @@ void PlotsBuilder::hideAllTypes()
     m_widget->sphericalSurfacesLinks->hide();
 }
 
-void PlotsBuilder::setupInfo()
-{
-    switch (m_currentTyppe)
-    {
-    //2D
-    case(CartesianGraphCurve):
-        m_example = Analitza::Expression("x->sin(x)");
-        break;
-    case(CartesianImplicitCurve):
-        m_example = Analitza::Expression("(x*x+y*y=1)");
-        break;
-    case(CartesianParametricCurve2D):
-        m_example = Analitza::Expression("t->vector{t,t**2}");
-        break;
-    case(PolarGraphCurve):
-        m_example = Analitza::Expression("q->sin(q)");
-        break;
-
-    //3D
-    case(CartesianParametricCurve3D):
-        m_example = Analitza::Expression("t->vector{t, t, t}");
-        break;
-    case(CartesianGraphSurface):
-        m_example = Analitza::Expression("(x,y)->(x*x-y*y)/8");
-        break;
-    case(CartesianImplicitSurface):
-        m_example = Analitza::Expression("(x*x+y*y)-z*z=1/2");
-        break;
-    case(CartesianParametricSurface):
-        m_example = Analitza::Expression("(u,v)->vector{u,u+v,v}");
-        break;
-    case(CylindricalGraphSurface):
-        m_example = Analitza::Expression("(r,p)->p");
-        break;
-    case(SphericalGraphSurface):
-        m_example = Analitza::Expression("(t,p)->2");
-        break;
-    default:
-        return;
-    }
-    m_widget->plotExample->setContent(m_example.toMathMLPresentation());
-}
-
-void PlotsBuilder::clearInfoWidget()
-{
-    m_widget->plotExample->clear();
-    m_widget->plotExample->update();
-}
-
 void PlotsBuilder::setupTypes()
 {
     #define testType(tname) if (m_types.testFlag( tname )) \
                m_widget->build##tname->show(); else m_widget->build##tname->hide();
diff --git a/src/plotsbuilder.h b/src/plotsbuilder.h
index 4d7644e..a537cac 100644
--- a/src/plotsbuilder.h
+++ b/src/plotsbuilder.h
@@ -72,10 +72,6 @@ public slots:
     void showAllTypes(); // show all types
     void hideAllTypes(); // hide all types
     
-private slots: // better names
-    void setupInfo();
-    void clearInfoWidget();
-    
 private:
     void setupTypes();
     bool eventFilter(QObject *object, QEvent *event);
diff --git a/src/plotsbuilder.ui b/src/plotsbuilder.ui
index d00baeb..869ce5f 100644
--- a/src/plotsbuilder.ui
+++ b/src/plotsbuilder.ui
@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>473</width>
-    <height>537</height>
+    <width>307</width>
+    <height>464</height>
    </rect>
   </property>
   <layout class="QVBoxLayout" name="verticalLayout">
@@ -288,38 +288,20 @@
     </widget>
    </item>
    <item>
-    <widget class="QLabel" name="label_4">
-     <property name="text">
-      <string>Hover to see the description:</string>
+    <spacer name="verticalSpacer">
+     <property name="orientation">
+      <enum>Qt::Vertical</enum>
      </property>
-    </widget>
-   </item>
-   <item>
-    <widget class="QtMmlWidget" name="plotExample">
-     <property name="sizePolicy">
-      <sizepolicy hsizetype="Preferred" vsizetype="Expanding">
-       <horstretch>0</horstretch>
-       <verstretch>0</verstretch>
-      </sizepolicy>
+     <property name="sizeHint" stdset="0">
+      <size>
+       <width>20</width>
+       <height>40</height>
+      </size>
      </property>
-     <property name="frameShape">
-      <enum>QFrame::StyledPanel</enum>
-     </property>
-     <property name="frameShadow">
-      <enum>QFrame::Raised</enum>
-     </property>
-    </widget>
+    </spacer>
    </item>
   </layout>
  </widget>
- <customwidgets>
-  <customwidget>
-   <class>QtMmlWidget</class>
-   <extends>QFrame</extends>
-   <header>QtMmlWidget</header>
-   <container>1</container>
-  </customwidget>
- </customwidgets>
  <resources/>
  <connections/>
 </ui>
diff --git a/src/plotseditor.cpp b/src/plotseditor.cpp
index b09febb..29772f3 100644
--- a/src/plotseditor.cpp
+++ b/src/plotseditor.cpp
@@ -1,5 +1,5 @@
 /*************************************************************************************
                
- *  Copyright (C) 2010-2012 by Percy Camilo T. Aucahuasi <percy.camilo.ta@gmail.com> \
* + *  Copyright (C) 2010-2014 by Percy Camilo T. Aucahuasi \
                <percy.camilo.ta@gmail.com> *
  *                                                                                   \
                *
  *  This program is free software; you can redistribute it and/or                    \
                *
  *  modify it under the terms of the GNU General Public License                      \
* @@ -44,11 +44,7 @@
 #include <KLocale>
 #include <KRandom>
 
-//C includes
-#include <math.h>
-
-//libkdeedu includes
-#include <libkdeedu/qtmml/QtMmlWidget>
+#include <cmath>
 
 //local includes
 #include "datastore.h"
@@ -60,138 +56,6 @@ using namespace Analitza;
 
 Q_DECLARE_METATYPE(PlotItem*);
 
-ComboBox::ComboBox(QWidget* parent): QComboBox(parent)
-{
-    connect(this, SIGNAL(currentIndexChanged(QString)), SLOT(setupCache(QString)));
-}
-
-QSize ComboBox::sizeHint() const
-{
-
-    QStringList funcs = m_cacheText.split(',');
-    QString mmlhelper;
-
-    foreach(const QString &func, funcs)
-    {
-        mmlhelper.append("<mi>"+func+"</mi>");
-
-        if (func != funcs.last())
-            mmlhelper.append("<mtext>,</mtext>");
-    }
-
-    QtMmlDocument mathMLRenderer;
-    mathMLRenderer.setContent("<math \
                display='block'><mrow>"+mmlhelper+"</mrow></math>");
-//     qDebug() << mathMLRenderer.size() << funcs << m_cacheText;
-    return QSize(mathMLRenderer.size().width()+24, \
                mathMLRenderer.size().height()+8);
-}
-
-void ComboBox::paintEvent(QPaintEvent* e)
-{
-    //Drawing the combo-box
-    QString itemtext = currentText();
-    m_cacheText = itemtext;
-    setItemText(currentIndex(), "");
-    QComboBox::paintEvent(e);
-    setItemText(currentIndex(), itemtext);
-
-
-    QPainter p(this);
-
-    QStringList funcs = currentText().split(',');
-    QString mmlhelper;
-
-    foreach(const QString &func, funcs)
-    {
-        mmlhelper.append("<mi>"+func+"</mi>");
-
-        if (func != funcs.last())
-            mmlhelper.append("<mtext>,</mtext>");
-    }
-
-    QtMmlDocument mathMLRenderer;
-    mathMLRenderer.setContent("<math \
                display='block'><mrow>"+mmlhelper+"</mrow></math>");
-
-    QStyleOptionComboBox opt;
-    opt.initFrom(this);
-
-    mathMLRenderer.paint(&p, opt.rect.topLeft()+QPoint(4,4));
-}
-
-void ComboBox::setupCache(const QString& currtext)
-{
-    m_cacheText = currtext;
-//     qDebug() << m_cacheText;
-    setMinimumSize(sizeHint());
-    update();
-}
-
-class FunctionDelegate : public QStyledItemDelegate
-{
-public:
-    FunctionDelegate(ComboBox *parent = 0);
-    QSize sizeHint(const QStyleOptionViewItem& option, const QModelIndex& index) \
                const;
-    void paint(QPainter *painter, const QStyleOptionViewItem &option, const \
                QModelIndex &index) const;
-};
-
-FunctionDelegate::FunctionDelegate(ComboBox* parent): QStyledItemDelegate(parent)
-{
-}
-QSize FunctionDelegate::sizeHint(const QStyleOptionViewItem& option, const \
                QModelIndex& index) const
-{
-    Q_UNUSED(option);
-    QStringList funcs = index.data().toString().split(',');
-    QString mmlhelper;
-
-    foreach(const QString &func, funcs)
-    {
-        mmlhelper.append("<mi>"+func+"</mi>");
-        if (func != funcs.last())
-            mmlhelper.append("<mtext>,</mtext>");
-    }
-
-    QtMmlDocument mathMLRenderer;
-    mathMLRenderer.setContent("<math \
                display='block'><mrow>"+mmlhelper+"</mrow></math>");
-
-    return QSize(258, 32);
-    return QSize(mathMLRenderer.size().width(), mathMLRenderer.size().height()+8);
-}
-
-void FunctionDelegate::paint(QPainter* painter, const QStyleOptionViewItem& option, \
                const QModelIndex& index) const
-{
-    QStringList funcs = index.data().toString().split(',');
-    QString mmlhelper;
-
-    foreach(const QString &func, funcs)
-    {
-        mmlhelper.append("<mi>"+func+"</mi>");
-
-        if (func != funcs.last())
-            mmlhelper.append("<mtext>,</mtext>");
-    }
-
-    if (option.state & QStyle::State_Selected)
-    {
-        painter->save();
-        painter->setPen(option.palette.highlight().color());
-        painter->setBrush(option.palette.highlight());
-
-        QRect selRect = static_cast<ComboBox*>(parent())->view()->visualRect(index);
-        selRect.setHeight(selRect.height() - 1); //TODO see above
-        painter->drawRect(selRect);
-        painter->restore();
-        painter->setPen(option.palette.highlightedText().color());
-    }
-    else
-    {
-        painter->setPen(option.palette.text().color());
-        painter->setBrush(option.palette.text());
-    }
-
-    QtMmlDocument mathMLRenderer;
-    mathMLRenderer.setContent("<math \
                display='block'><mrow>"+mmlhelper+"</mrow></math>");
-    mathMLRenderer.paint(painter, QPoint(option.rect.left()+2, \
                option.rect.top()+4));
-}
-
 PlotsEditor::PlotsEditor(QWidget * parent)
     : QDockWidget(parent), isEditing(false), plotnumber(1)
 {
@@ -199,8 +63,6 @@ PlotsEditor::PlotsEditor(QWidget * parent)
     m_widget->setupUi(this);
     setObjectName("adasdds");
 
-    m_widget->fnameForGraphs->setItemDelegate(new \
                FunctionDelegate(m_widget->fnameForGraphs));
-
     // random coloring of the plots
     m_widget->plotColor->setColor(randomFunctionColor());
 
@@ -215,9 +77,9 @@ PlotsEditor::PlotsEditor(QWidget * parent)
 
     connect(m_widget->fnameForGraphs, SIGNAL(currentIndexChanged(QString)), \
SLOT(setCurrentFunctionGraphs(QString)));  
-    m_widget->farrow->setContent("<math display='block'> <mrow> <mo>&rarr;</mo> \
                </mrow> </math>");
-    m_widget->garrow->setContent("<math display='block'> <mrow> <mo>=</mo> </mrow> \
                </math>");
-    m_widget->harrow->setContent("<math display='block'> <mrow> <mo>=</mo> </mrow> \
</math>"); +    m_widget->farrow->setText("=");
+    m_widget->garrow->setText("=");
+    m_widget->harrow->setText("=");
 
     connect(m_widget->builderDialogBox->button(QDialogButtonBox::Cancel), \
                SIGNAL(pressed()), SLOT(showList()));
     connect(m_widget->editorDialogBox->button(QDialogButtonBox::Cancel), \
SIGNAL(pressed()), SLOT(cancelEditor())); @@ -441,7 +303,7 @@ void \
PlotsEditor::editPlot(const QModelIndex &)  {
                         m_currentVars = QStringList() << "x";
                         m_widget->fnameForGraphs->hide();
-                        setupFuncName(1, "", QStringList() << "x", false);
+                        setupFuncName(1, "y", QStringList() << "x");
                         setupVarName(1, "x");
                         m_widget->fname->show();
                     }
@@ -449,7 +311,7 @@ void PlotsEditor::editPlot(const QModelIndex &)
                     {
                         m_currentVars = QStringList() << "y";
                         m_widget->fnameForGraphs->hide();
-                        setupFuncName(1, "", QStringList() << "y", false);
+                        setupFuncName(1, "x", QStringList() << "y");
                         setupVarName(1, "y");
                         m_widget->fname->show();
                     }
@@ -525,7 +387,7 @@ void PlotsEditor::editPlot(const QModelIndex &)
                     {
                         m_currentVars = QStringList() << "x" << "y";
                         m_widget->fnameForGraphs->hide();
-                        setupFuncName(1, "", QStringList() << "x" << "y", false);
+                        setupFuncName(1, "z", QStringList() << "x" << "y");
                         setupVarName(1, "x");
                         setupVarName(2, "y");
                         m_widget->fname->show();
@@ -534,7 +396,7 @@ void PlotsEditor::editPlot(const QModelIndex &)
                     {
                         m_currentVars = QStringList() << "x" << "z";
                         m_widget->fnameForGraphs->hide();
-                        setupFuncName(1, "", QStringList() << "x" << "z", false);
+                        setupFuncName(1, "y", QStringList() << "x" << "z");
                         setupVarName(1, "x");
                         setupVarName(2, "z");
                         m_widget->fname->show();
@@ -543,7 +405,7 @@ void PlotsEditor::editPlot(const QModelIndex &)
                     {
                         m_currentVars = QStringList() << "y" << "z";
                         m_widget->fnameForGraphs->hide();
-                        setupFuncName(1, "", QStringList() << "y" << "z", false);
+                        setupFuncName(1, "x", QStringList() << "y" << "z");
                         setupVarName(1, "y");
                         setupVarName(2, "z");
                         m_widget->fname->show();
@@ -787,9 +649,7 @@ void PlotsEditor::savePlot()
                 item = req.create(m_widget->plotColor->color(), \
m_widget->plotName->text());  if (m_widget->intervals->isChecked())
                 {
-
                     item->setInterval(item->parameters().first(), \
                m_widget->minx->expression(), m_widget->maxx->expression());
-
                 }
                 else
                     item->clearIntervals();
@@ -1026,67 +886,66 @@ void PlotsEditor::setupVarName(int var, const QString &vvalue)
 {
     switch (var)
     {
-    case 1:
-    {
-        m_widget->x->setContent("<math display='block'> <mrow> <mo>&#x02264;</mo> \
                <mi>"+vvalue+"</mi> <mo>&#x02264;</mo> </mrow> </math>");
-        break;
-    }
-    case 2:
-    {
-        m_widget->yinterval->show();
-        m_widget->y->setContent("<math display='block'> <mrow> <mo>&#x02264;</mo> \
                <mi>"+vvalue+"</mi> <mo>&#x02264;</mo> </mrow> </math>");
-        break;
-    }
-    case 3:
-    {
-        m_widget->zinterval->show();
-        m_widget->z->setContent("<math display='block'> <mrow> <mo>&#x02264;</mo> \
                <mi>"+vvalue+"</mi> <mo>&#x02264;</mo> </mrow> </math>");
-        break;
-    }
+        case 1:
+        {
+            m_widget->x->setText("< "+vvalue+" <");
+            break;
+        }
+        case 2:
+        {
+            m_widget->yinterval->show();
+            m_widget->y->setText("< "+vvalue+" <");
+            break;
+        }
+        case 3:
+        {
+            m_widget->zinterval->show();
+            m_widget->z->setText("< "+vvalue+" <");
+            break;
+        }
     }
 }
 
 void PlotsEditor::setupFuncName(int var, const QString& vvalue, const QStringList& \
vars, bool withparenthesis)  {
-    QString mmlhelper;
-    mmlhelper.append("<mi>"+vvalue+"</mi>");
+    QString mmlhelper = vvalue;
 
     if (withparenthesis)
-        mmlhelper.append("<mo>(</mo>");
+        mmlhelper.append("(");
 
     foreach(const QString &v, vars)
     {
-        mmlhelper.append("<mi>"+v+"</mi>");
+        mmlhelper.append(v);
 
         if (v != vars.last())
-            mmlhelper.append("<mtext>,</mtext>");
+            mmlhelper.append(",");
     }
 
     if (withparenthesis)
-        mmlhelper.append("<mo>)</mo>");
+        mmlhelper.append(")");
 
     switch (var)
     {
-    case 1:
-    {
-        m_widget->fname->setContent("<math \
                display='block'><mrow>"+mmlhelper+"</mrow></math>");
-        m_widget->gexpression->hide();
-        m_widget->hexpression->hide();
-        break;
-    }
-    case 2:
-    {
-        m_widget->gname->setContent("<math \
                display='block'><mrow>"+mmlhelper+"</mrow></math>");
-        m_widget->gexpression->show();
-        m_widget->hexpression->hide();
-        break;
-    }
-    case 3:
-    {
-        m_widget->hname->setContent("<math \
                display='block'><mrow>"+mmlhelper+"</mrow></math>");
-        m_widget->hexpression->show();
-        break;
-    }
+        case 1:
+        {
+            m_widget->fname->setText(mmlhelper);
+            m_widget->gexpression->hide();
+            m_widget->hexpression->hide();
+            break;
+        }
+        case 2:
+        {
+            m_widget->gname->setText(mmlhelper);
+            m_widget->gexpression->show();
+            m_widget->hexpression->hide();
+            break;
+        }
+        case 3:
+        {
+            m_widget->hname->setText(mmlhelper);
+            m_widget->hexpression->show();
+            break;
+        }
     }
 }
 
@@ -1106,7 +965,9 @@ void PlotsEditor::setupExpressionType(const QStringList \
&fvalues, const QStringL  m_widget->fname->hide();
         m_widget->fnameForGraphs->clear();
         m_widget->fnameForGraphs->addItems(fvalues);
-    } else {
+    } 
+    else 
+    {
         m_widget->fnameForGraphs->hide();
         m_widget->fname->show();
     }
@@ -1134,18 +995,21 @@ void PlotsEditor::setupExpressionType(const QStringList \
&fvalues, const QStringL  {
         m_widget->fnameForGraphs->hide();
 
-        m_widget->farrow->setContent("<math display='block'> <mrow> <mo>=</mo> \
</mrow> </math>"); +        m_widget->farrow->setText("=");
 
         for (int func = 1; func <= fvalues.size(); ++func)
         {
             setupFuncName(func, fvalues[func-1], vvalues);
         }
-    } else {
+    }
+    else
+    {
         if (!isimplicit)
         {
-            m_widget->farrow->setContent("<math display='block'> <mrow> \
<mo>&rarr;</mo> </mrow> </math>"); +            m_widget->farrow->setText("=");
         }
     }
+    
     showEditor();
 }
 
diff --git a/src/plotseditor.h b/src/plotseditor.h
index f5ec09f..33513c3 100644
--- a/src/plotseditor.h
+++ b/src/plotseditor.h
@@ -1,5 +1,5 @@
 /*************************************************************************************
                
- *  Copyright (C) 2010-2012 by Percy Camilo T. Aucahuasi <percy.camilo.ta@gmail.com> \
* + *  Copyright (C) 2010-2014 by Percy Camilo T. Aucahuasi \
                <percy.camilo.ta@gmail.com> *
  *                                                                                   \
                *
  *  This program is free software; you can redistribute it and/or                    \
                *
  *  modify it under the terms of the GNU General Public License                      \
* @@ -135,20 +135,4 @@ private:
     int plotnumber;
 };
 
-class ComboBox : public QComboBox
-{
-Q_OBJECT
-
-public:
-    explicit ComboBox(QWidget* parent = 0);
-    
-    QSize sizeHint() const;
-    void paintEvent(QPaintEvent* e);
-private slots:
-    void setupCache(const QString &currtext);
-    
-private:
-    QString m_cacheText;
-};
-
 #endif 
diff --git a/src/plotseditor.ui b/src/plotseditor.ui
index a1ad559..518aa6e 100755
--- a/src/plotseditor.ui
+++ b/src/plotseditor.ui
@@ -173,7 +173,7 @@
          <widget class="QWidget" name="fexpression" native="true">
           <layout class="QHBoxLayout" name="horizontalLayout_4">
            <item>
-            <widget class="ComboBox" name="fnameForGraphs">
+            <widget class="QComboBox" name="fnameForGraphs">
              <property name="minimumSize">
               <size>
                <width>32</width>
@@ -192,7 +192,7 @@
             </widget>
            </item>
            <item>
-            <widget class="QtMmlWidget" name="fname">
+            <widget class="QLabel" name="fname">
              <property name="minimumSize">
               <size>
                <width>58</width>
@@ -217,7 +217,7 @@
             </widget>
            </item>
            <item>
-            <widget class="QtMmlWidget" name="farrow">
+            <widget class="QLabel" name="farrow">
              <property name="minimumSize">
               <size>
                <width>24</width>
@@ -258,7 +258,7 @@
          <widget class="QWidget" name="gexpression" native="true">
           <layout class="QHBoxLayout" name="horizontalLayout_8">
            <item>
-            <widget class="QtMmlWidget" name="gname">
+            <widget class="QLabel" name="gname">
              <property name="minimumSize">
               <size>
                <width>58</width>
@@ -283,7 +283,7 @@
             </widget>
            </item>
            <item>
-            <widget class="QtMmlWidget" name="garrow">
+            <widget class="QLabel" name="garrow">
              <property name="minimumSize">
               <size>
                <width>24</width>
@@ -324,7 +324,7 @@
          <widget class="QWidget" name="hexpression" native="true">
           <layout class="QHBoxLayout" name="horizontalLayout_11">
            <item>
-            <widget class="QtMmlWidget" name="hname">
+            <widget class="QLabel" name="hname">
              <property name="minimumSize">
               <size>
                <width>58</width>
@@ -349,7 +349,7 @@
             </widget>
            </item>
            <item>
-            <widget class="QtMmlWidget" name="harrow">
+            <widget class="QLabel" name="harrow">
              <property name="minimumSize">
               <size>
                <width>24</width>
@@ -483,7 +483,7 @@
                   </widget>
                  </item>
                  <item>
-                  <widget class="QtMmlWidget" name="x">
+                  <widget class="QLabel" name="x">
                    <property name="sizePolicy">
                     <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
                      <horstretch>0</horstretch>
@@ -534,7 +534,7 @@
                   </widget>
                  </item>
                  <item>
-                  <widget class="QtMmlWidget" name="y">
+                  <widget class="QLabel" name="y">
                    <property name="sizePolicy">
                     <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
                      <horstretch>0</horstretch>
@@ -585,7 +585,7 @@
                   </widget>
                  </item>
                  <item>
-                  <widget class="QtMmlWidget" name="z">
+                  <widget class="QLabel" name="z">
                    <property name="sizePolicy">
                     <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
                      <horstretch>0</horstretch>
@@ -680,9 +680,9 @@
    <header>analitzagui/expressionedit.h</header>
   </customwidget>
   <customwidget>
-   <class>QtMmlWidget</class>
+   <class>QLabel</class>
    <extends>QFrame</extends>
-   <header>QtMmlWidget</header>
+   <header>QLabel</header>
    <container>1</container>
   </customwidget>
   <customwidget>
@@ -691,11 +691,6 @@
    <header>plotsbuilder.h</header>
    <container>1</container>
   </customwidget>
-  <customwidget>
-   <class>ComboBox</class>
-   <extends>QComboBox</extends>
-   <header>plotseditor.h</header>
-  </customwidget>
  </customwidgets>
  <resources/>
  <connections>


[prev in list] [next in list] [prev in thread] [next in thread] 

Configure | About | News | Add a list | Sponsored by KoreLogic