treeview init.

editor/nodesview/zenographseditor.cpp

@@ -4,8 +4,10 @@
 #include <comctrl/ztoolbutton.h>
 #include "zenoapplication.h"
 #include "graphsmanagment.h"
+#include "zenosubnettreeview.h"
 #include <model/graphsmodel.h>
 
+#define USE_LISTVIEW_PANEL
 
 
 ZenoGraphsEditor::ZenoGraphsEditor(QWidget* parent)
@@ -14,6 +16,7 @@ ZenoGraphsEditor::ZenoGraphsEditor(QWidget* parent)
     , m_pSubnetList(nullptr)
     , m_pTabWidget(nullptr)
     , m_pSideBar(nullptr)
+    , m_pSubnetTree(nullptr)
 {
     QHBoxLayout* pLayout = new QHBoxLayout;
 
@@ -47,15 +50,22 @@ ZenoGraphsEditor::ZenoGraphsEditor(QWidget* parent)
 
     QVBoxLayout* pLayout2 = new QVBoxLayout;
 
+#ifdef USE_LISTVIEW_PANEL
     m_pSubnetList = new ZenoSubnetListPanel();
     m_pSubnetList->hide();
     pLayout->addWidget(m_pSubnetList);
+    connect(m_pSubnetList, SIGNAL(clicked(const QModelIndex&)), this, SLOT(onListItemActivated(const QModelIndex&)));
+#else
+    m_pSubnetTree = new ZenoSubnetTreeView;
+    m_pSubnetTree->hide();
+    pLayout->addWidget(m_pSubnetTree);
+    //connect(m_pSubnetTree, SIGNAL(clicked(const QModelIndex&)), this, SLOT(onListItemActivated(const QModelIndex&)));
+#endif
 
     m_pTabWidget = new ZenoGraphsTabWidget();
     pLayout->addWidget(m_pTabWidget);
 
     connect(m_pSubnetBtn, SIGNAL(clicked()), this, SLOT(onSubnetBtnClicked()));
-    connect(m_pSubnetList, SIGNAL(clicked(const QModelIndex&)), this, SLOT(onListItemActivated(const QModelIndex&)));
 
     pLayout->setSpacing(1);
     pLayout->setContentsMargins(0, 0, 0, 0);
@@ -74,17 +84,29 @@ void ZenoGraphsEditor::onListItemActivated(const QModelIndex& index)
 
 void ZenoGraphsEditor::resetModel(GraphsModel* pModel)
 {
+#ifdef USE_LISTVIEW_PANEL
     m_pSubnetList->initModel(pModel);
     m_pTabWidget->resetModel(pModel);
     m_pSideBar->show();
     m_pSubnetBtn->setChecked(true);
     m_pSubnetList->show();
     connect(pModel, SIGNAL(modelReset()), this, SLOT(onCurrentModelClear()));
+#else
+    m_pSubnetTree->initModel(pModel);
+    m_pSideBar->show();
+    m_pSubnetBtn->setChecked(true);
+    m_pSubnetTree->show();
+    connect(pModel, SIGNAL(modelReset()), this, SLOT(onCurrentModelClear()));
+#endif
 }
 
 void ZenoGraphsEditor::onCurrentModelClear()
 {
+#ifdef USE_LISTVIEW_PANEL
     m_pSubnetList->hide();
+#else
+    m_pSubnetTree->hide();
+#endif
     m_pSideBar->hide();
     m_pTabWidget->clear();
 }
@@ -98,6 +120,7 @@ void ZenoGraphsEditor::onSubnetBtnClicked()
     }
     else
     {
+#ifdef USE_LISTVIEW_PANEL
         if (m_pSubnetBtn->isChecked())
         {
             m_pSubnetList->show();
@@ -106,5 +129,8 @@ void ZenoGraphsEditor::onSubnetBtnClicked()
         {
             m_pSubnetList->hide();
         }
+#else
+
+#endif
     }
 }

editor/nodesview/zenographseditor.h

@@ -7,6 +7,7 @@ class ZToolButton;
 class ZenoSubnetListView;
 class ZenoGraphsTabWidget;
 class ZenoSubnetListPanel;
+class ZenoSubnetTreeView;
 class GraphsModel;
 
 class ZenoGraphsEditor : public QWidget
@@ -29,6 +30,7 @@ private slots:
     ZToolButton* m_pSubnetBtn;
     ZenoSubnetListPanel* m_pSubnetList;
     ZenoGraphsTabWidget* m_pTabWidget;
+    ZenoSubnetTreeView* m_pSubnetTree;
 };
 
 #endif

editor/nodesview/zenosubnettreeview.cpp

@@ -0,0 +1,23 @@
+#include "zenosubnettreeview.h"
+#include <model/graphsmodel.h>
+
+
+ZenoSubnetTreeView::ZenoSubnetTreeView(QWidget* parent)
+    : QTreeView(parent)
+{
+    header()->setVisible(false);
+}
+
+ZenoSubnetTreeView::~ZenoSubnetTreeView()
+{
+}
+
+void ZenoSubnetTreeView::initModel(GraphsModel* pModel)
+{
+    setModel(pModel);
+}
+
+void ZenoSubnetTreeView::paintEvent(QPaintEvent* e)
+{
+    QTreeView::paintEvent(e);
+}

editor/nodesview/zenosubnettreeview.h

@@ -0,0 +1,27 @@
+#ifndef __ZENO_SUBNET_TREEVIEW_H__
+#define __ZENO_SUBNET_TREEVIEW_H__
+
+#include <QtWidgets>
+
+class GraphsModel;
+
+class ZenoSubnetTreePanel : public QWidget
+{
+    Q_OBJECT
+public:
+
+};
+
+class ZenoSubnetTreeView : public QTreeView
+{
+    Q_OBJECT
+public:
+    ZenoSubnetTreeView(QWidget* parent = nullptr);
+    ~ZenoSubnetTreeView();
+    void initModel(GraphsModel* pModel);
+
+private:
+    void paintEvent(QPaintEvent* e) override;
+};
+
+#endif

zenoui/model/graphsmodel.cpp

@@ -120,6 +120,21 @@ void GraphsModel::renameSubGraph(const QString& oldName, const QString& newName)
     emit graphRenamed(oldName, newName);
 }
 
+QModelIndex GraphsModel::index(int row, int column, const QModelIndex& parent) const
+{
+    return QStandardItemModel::index(row, column, parent);
+}
+
+QModelIndex GraphsModel::parent(const QModelIndex& child) const
+{
+    return QStandardItemModel::parent(child);
+}
+
+QVariant GraphsModel::data(const QModelIndex& index, int role) const
+{
+    return QStandardItemModel::data(index, role);
+}
+
 bool GraphsModel::setData(const QModelIndex& index, const QVariant& value, int role)
 {
     if (role == Qt::EditRole)

zenoui/model/graphsmodel.h

@@ -37,7 +37,10 @@ class GraphsModel : public QStandardItemModel
     NODE_CATES getCates();
     QString filePath() const;
     QString fileName() const;
+    QModelIndex index(int row, int column, const QModelIndex& parent = QModelIndex()) const override;
+    QModelIndex parent(const QModelIndex& child) const override;
     bool setData(const QModelIndex& index, const QVariant& value, int role = Qt::EditRole) override;
+    QVariant data(const QModelIndex& index, int role = Qt::DisplayRole) const override;
 
 signals:
     void graphRenamed(const QString& oldName, const QString& newName);

zenoui/nodesys/zenonode.cpp

@@ -485,7 +485,7 @@ QGraphicsLayout* ZenoNode::initParams()
                 }
                 case CONTROL_MULTILINE_STRING:
                 {
-                    ZenoParamMultilineStr *pMultiStrEdit = new ZenoParamMultilineStr(value);
+                    ZenoParamMultilineStr *pMultiStrEdit = new ZenoParamMultilineStr(value, m_renderParams.lineEditParam);
                     pParamLayout->addItem(pMultiStrEdit);
                     connect(pMultiStrEdit, &ZenoParamMultilineStr::editingFinished, this, [=]() {
                         QString textValue = pMultiStrEdit->text();

zenoui/nodesys/zenoparamwidget.cpp

@@ -228,7 +228,7 @@ ZenoParamOpenPath::ZenoParamOpenPath(const QString &filename, QGraphicsItem *par
 
 
 //////////////////////////////////////////////////////////////////////////////////////
-ZenoParamMultilineStr::ZenoParamMultilineStr(const QString &value, QGraphicsItem *parent)
+ZenoParamMultilineStr::ZenoParamMultilineStr(const QString &value, LineEditParam param, QGraphicsItem *parent)
     : ZenoParamWidget(parent)
     , m_value(value)
     , m_pTextEdit(nullptr)
@@ -238,6 +238,12 @@ ZenoParamMultilineStr::ZenoParamMultilineStr(const QString &value, QGraphicsItem
     setWidget(m_pTextEdit);
     connect(m_pTextEdit, SIGNAL(textChanged()), this, SIGNAL(textChanged()));
     m_pTextEdit->installEventFilter(this);
+    m_pTextEdit->setFrameShape(QFrame::NoFrame);
+    m_pTextEdit->setFont(param.font);
+
+    QPalette pal = param.palette;
+    pal.setColor(QPalette::Base, QColor(37, 37, 37));
+    m_pTextEdit->setPalette(pal);
 }
 
 void ZenoParamMultilineStr::setText(const QString& text)

zenoui/nodesys/zenoparamwidget.h

@@ -144,7 +144,7 @@ class ZenoParamMultilineStr : public ZenoParamWidget
 {
     Q_OBJECT
 public:
-    ZenoParamMultilineStr(const QString &value, QGraphicsItem *parent = nullptr);
+    ZenoParamMultilineStr(const QString &value, LineEditParam param, QGraphicsItem *parent = nullptr);
     QString text() const;
     void setText(const QString &text);