Merge pull request #1692 from 1445643474/master

remove QScintilla
zenustech · Jan 5, 2024 · 03468ed · 03468ed
2 parents 0db847b + 42429af
commit 03468ed
Show file tree

Hide file tree

Showing 173 changed files with 30 additions and 97,685 deletions.
diff --git a/ui/zenoedit/CMakeLists.txt b/ui/zenoedit/CMakeLists.txt
@@ -64,7 +64,7 @@ if (WIN32)
 endif()
 target_link_libraries(zenoedit PRIVATE zenoui zenoio zenomodel zenovis)
 target_link_libraries(zenoedit PRIVATE zeno)
-target_include_directories(zenoedit PRIVATE . .. ../zenoui ../zenoui/QScintilla/src ../include)
+target_include_directories(zenoedit PRIVATE . .. ../zenoui ../include)
 target_include_directories(zenoedit PRIVATE ${Qt5Widgets_PRIVATE_INCLUDE_DIRS})
 if(ZENO_LIVESYNC)
     find_package(Crow CONFIG REQUIRED)

diff --git a/ui/zenoedit/panel/zenoproppanel.cpp b/ui/zenoedit/panel/zenoproppanel.cpp
@@ -28,7 +28,6 @@
 #include "zenoblackboardpropwidget.h"
 #include "timeline/ztimeline.h"
 #include "util/apphelper.h"
-#include <zenoui/comctrl/zpythoneditor.h>
 
 
 class RetryScope
@@ -702,10 +701,6 @@ void ZenoPropPanel::onViewParamDataChanged(const QModelIndex& topLeft, const QMo
                     }
                 }
             }
-            else if (ZPythonEditor* pEditor = qobject_cast<ZPythonEditor*>(ctrl.pControl))
-            {
-                pEditor->setText(value.toString());
-            }
             //...
         }
 		else if (role == ROLE_VPARAM_CTRL_PROPERTIES)

diff --git a/ui/zenomodel/src/globalcontrolmgr.cpp b/ui/zenomodel/src/globalcontrolmgr.cpp
@@ -61,7 +61,7 @@ CONTROL_INFO GlobalControlMgr::controlInfo(const QString& nodeCls, PARAM_CLASS c
     }
     if (nodeCls == "PythonNode" && coreParam == "script")
     {
-        return CONTROL_INFO(CONTROL_PYTHON_EDITOR, QVariant());
+        return CONTROL_INFO(CONTROL_MULTILINE_STRING, QVariant());
     }
     return CONTROL_INFO(UiHelper::getControlByType(coreType), QVariant());
 }
diff --git a/ui/zenomodel/src/nodeparammodel.cpp b/ui/zenomodel/src/nodeparammodel.cpp
@@ -893,7 +893,10 @@ bool NodeParamModel::setData(const QModelIndex& index, const QVariant& value, in
             {
                 onLinkAdded(pItem);
             }
-            markNodeChanged();
+            if (pItem->getParamClass() == PARAM_INPUT)
+            {
+                markNodeChanged();
+            }
             break;
         }
         case ROLE_PARAM_CTRL: {

diff --git a/ui/zenoui/CMakeLists.txt b/ui/zenoui/CMakeLists.txt
@@ -18,6 +18,4 @@ target_link_libraries(zenoui PUBLIC Qt5::Widgets Qt5::Svg Qt5::Network)
 target_link_libraries(zenoui PUBLIC zeno)
 
 target_include_directories(zenoui PRIVATE ${Qt5Widgets_PRIVATE_INCLUDE_DIRS})
-target_include_directories(zenoui PRIVATE . .. ../include QScintilla QScintilla/src QScintilla/scintilla/include QScintilla/scintilla/lexlib QScintilla/scintilla/src)
-
-target_compile_definitions(zenoui PRIVATE -DSCINTILLA_QT -DSCI_LEXER -DINCLUDE_DEPRECATED_FEATURES)
+target_include_directories(zenoui PRIVATE . .. ../include)