Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

remove QScintilla #1692

Merged
merged 2 commits into from
Jan 5, 2024
Merged

remove QScintilla #1692

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
958eafe
input sockets mark dirty
1445643474 Jan 4, 2024
42429af
remove QScintilla
1445643474 Jan 4, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ui/zenoedit/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
5 changes: 0 additions & 5 deletions ui/zenoedit/panel/zenoproppanel.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@
#include "zenoblackboardpropwidget.h"
#include "timeline/ztimeline.h"
#include "util/apphelper.h"
#include <zenoui/comctrl/zpythoneditor.h>


class RetryScope
Expand Down Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion ui/zenomodel/src/globalcontrolmgr.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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());
}
5 changes: 4 additions & 1 deletion ui/zenomodel/src/nodeparammodel.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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: {
Expand Down
4 changes: 1 addition & 3 deletions ui/zenoui/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Loading
Loading