|
4 | 4 | from qtpy.QtWidgets import QApplication, QMainWindow, QFileDialog, QAction, QMessageBox
|
5 | 5 | from qtpy.QtCore import Qt, QTimer, Slot, QSize, QLibraryInfo, QCoreApplication
|
6 | 6 | from qtpy.QtGui import QKeySequence
|
7 |
| -from .utilities import IconFont, find_file, establish_widget_connections, close_widget_connections |
| 7 | +from .utilities import ( |
| 8 | + IconFont, |
| 9 | + find_file, |
| 10 | + establish_widget_connections, |
| 11 | + close_widget_connections, |
| 12 | + ACTIVE_QT_WRAPPER, |
| 13 | + QtWrapperTypes, |
| 14 | +) |
8 | 15 | from .pydm_ui import Ui_MainWindow
|
9 | 16 | from .display import Display, ScreenTarget, load_file, clear_compiled_ui_file_cache
|
10 | 17 | from .connection_inspector import ConnectionInspector
|
@@ -108,11 +115,13 @@ def __init__(
|
108 | 115 | QLibraryInfo.location(QLibraryInfo.BinariesPath),
|
109 | 116 | QLibraryInfo.location(QLibraryInfo.LibraryExecutablesPath),
|
110 | 117 | )
|
| 118 | + |
| 119 | + executable_name = "designer" if ACTIVE_QT_WRAPPER == QtWrapperTypes.PYQT5 else "pyside6-designer" |
111 | 120 | for bin_path in possible_designer_bin_paths:
|
112 | 121 | if platform.system() == "Darwin":
|
113 | 122 | designer_path = os.path.join(bin_path, "Designer.app/Contents/MacOS/Designer")
|
114 | 123 | elif platform.system() == "Linux":
|
115 |
| - designer_path = os.path.join(bin_path, "designer") |
| 124 | + designer_path = os.path.join(bin_path, executable_name) |
116 | 125 | else:
|
117 | 126 | designer_path = os.path.join(bin_path, "designer.exe")
|
118 | 127 | if os.path.isfile(designer_path):
|
|
0 commit comments