Skip to content

Commit 3a6b34f

Browse files
committed
Rename qt5 qml folder
1 parent 6c469f3 commit 3a6b34f

File tree

4 files changed

+6
-6
lines changed

4 files changed

+6
-6
lines changed

MeshTools.py

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -54,14 +54,14 @@ def __init__(self, parent = None) -> None:
5454

5555
self._application = CuraApplication.getInstance()
5656

57-
self._use_controls1 = False
57+
self._use_qt5 = False
5858
try:
5959
if self._application.getAPIVersion() < Version(8) and self._application.getVersion() != "master":
60-
self._use_controls1 = True
60+
self._use_qt5 = True
6161
except AttributeError:
6262
# UM.Application.getAPIVersion was added for API > 6 (Cura 4)
63-
self._use_controls1 = True
64-
self._qml_folder = "qml" if not self._use_controls1 else "qml_controls1"
63+
self._use_qt5 = True
64+
self._qml_folder = "qml" if not self._use_qt5 else "qml_qt5"
6565

6666
self._application.engineCreatedSignal.connect(self._onEngineCreated)
6767
self._application.fileLoaded.connect(self._onFileLoaded)
@@ -119,7 +119,7 @@ def _onEngineCreated(self) -> None:
119119
context_menu = None
120120
for child in main_window.contentItem().children():
121121
try:
122-
if not self._use_controls1:
122+
if not self._use_qt5:
123123
test = child.handleVisibility # With QtQuick Controls 2, ContextMenu is the only item that has a findItemIndex function in the main window root contentitem
124124
else:
125125
test = child.findItemIndex # With QtQuick Controls 1, ContextMenu is the only item that has a findItemIndex function
@@ -138,7 +138,7 @@ def _onEngineCreated(self) -> None:
138138
if not self._additional_menu:
139139
return
140140

141-
if self._use_controls1:
141+
if self._use_qt5:
142142
context_menu.insertSeparator(0)
143143
context_menu.insertMenu(0, catalog.i18nc("@info:title", "Mesh Tools"))
144144

File renamed without changes.
File renamed without changes.
File renamed without changes.

0 commit comments

Comments
 (0)