Skip to content

Commit 55ef6ef

Browse files
authored
Improve Python Support (#567)
- Reduce requirements for the python build. - Fix version number. - Generate type hints for *.pyi files. - Make functional for sip-build - Reduced the unnecessary depth of the package. NOTE: This is a breaking change for python users, where, `from PyQtAds import QtAds` is changed to `import PyQtAds as QtAds`( or simply `import PyQtAds`)
1 parent c0985f6 commit 55ef6ef

File tree

13 files changed

+23
-19
lines changed

13 files changed

+23
-19
lines changed

demo/status_dialog.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
import sys
33

44
from PyQt5 import uic
5-
from PyQtAds import QtAds
5+
import PyQtAds as QtAds
66

77
UI_FILE = os.path.join(os.path.dirname(__file__), 'StatusDialog.ui')
88
StatusDialogUI, StatusDialogBase = uic.loadUiType(UI_FILE)

examples/autohide/main.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
QTableWidget, QFileSystemModel, QPlainTextEdit, QToolBar,
99
QWidgetAction, QComboBox, QAction, QSizePolicy, QInputDialog)
1010

11-
from PyQtAds import QtAds
11+
import PyQtAds as QtAds
1212

1313
UI_FILE = os.path.join(os.path.dirname(__file__), 'mainwindow.ui')
1414
MainWindowUI, MainWindowBase = uic.loadUiType(UI_FILE)

examples/centralwidget/main.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
QTableWidget, QFileSystemModel, QPlainTextEdit, QToolBar,
99
QWidgetAction, QComboBox, QAction, QSizePolicy, QInputDialog)
1010

11-
from PyQtAds import QtAds
11+
import PyQtAds as QtAds
1212

1313
UI_FILE = os.path.join(os.path.dirname(__file__), 'mainwindow.ui')
1414
MainWindowUI, MainWindowBase = uic.loadUiType(UI_FILE)

examples/deleteonclose/main.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import sys
22

3-
from PyQtAds import QtAds
3+
import PyQtAds as QtAds
44
from PyQt5.QtGui import QCloseEvent
55
from PyQt5.QtCore import (qDebug, pyqtSlot, QObject, pyqtSignal)
66
from PyQt5.QtWidgets import (QMainWindow, QAction, QTextEdit, QApplication,
@@ -70,4 +70,4 @@ def on_action2_triggered():
7070
action.triggered.connect(on_action2_triggered)
7171

7272
w.show()
73-
app.exec_()
73+
app.exec_()

examples/dockindock/dockindock.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
from PyQt5.QtWidgets import (QApplication, QWidget, QVBoxLayout, QMessageBox,
44
QInputDialog, QMenu, QLineEdit)
55
from PyQt5.QtGui import QIcon
6-
from PyQtAds import QtAds
6+
import PyQtAds as QtAds
77

88
from dockindockmanager import DockInDockManager
99
from perspectiveactions import LoadPerspectiveAction, RemovePerspectiveAction
@@ -200,4 +200,4 @@ def dumpStatus(self, echo: callable = print, widget: QtAds.CDockWidget = None, t
200200

201201
for closed in self.getManager().dockWidgetsMap().values():
202202
if not closed in visible_widgets:
203-
self.dumpStatus(widget=closed, tab=tab, suffix=" (closed)")
203+
self.dumpStatus(widget=closed, tab=tab, suffix=" (closed)")

examples/dockindock/dockindockmanager.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
from PyQt5.QtWidgets import QAction, QMenu, QInputDialog, QLineEdit
22
from PyQt5.QtCore import QSettings
33

4-
from PyQtAds import QtAds
4+
import PyQtAds as QtAds
55

66
CHILD_PREFIX = "Child-"
77

@@ -211,4 +211,4 @@ def move(self, widget: QtAds.CDockWidget, move_to: QtAds.CDockManager) -> None:
211211
widget.dockManager().removeDockWidget(widget)
212212
move_to.addDockWidget(QtAds.CenterDockWidgetArea, widget, move_to.getInsertDefaultPos())
213213
else:
214-
assert False
214+
assert False

examples/dockindock/main.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
from PyQt5.QtWidgets import QApplication, QMainWindow, QLabel
66
from PyQt5.QtCore import Qt
7-
from PyQtAds import QtAds
7+
import PyQtAds as QtAds
88

99
from perspectives import PerspectivesManager
1010
from dockindock import DockInDockWidget
@@ -69,4 +69,4 @@ def cleanup(self):
6969

7070
w = MainWindow()
7171
w.show()
72-
app.exec_()
72+
app.exec_()

examples/dockindock/perspectives.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
import atexit
55

66
from PyQt5.QtCore import pyqtSignal, QSettings, QObject
7-
from PyQtAds import QtAds
7+
import PyQtAds as QtAds
88

99
from dockindockmanager import DockInDockManager
1010
from dockindock import DockInDockWidget
@@ -200,4 +200,4 @@ def savePerspectives(self) -> None:
200200
except FileNotFoundError:
201201
pass
202202
if not shutil.copy(settings.fileName(), to_save):
203-
assert False
203+
assert False

examples/emptydockarea/main.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
from PyQt5.QtWidgets import (QApplication, QMainWindow, QLabel, QComboBox, QTableWidget,
77
QAction, QWidgetAction, QSizePolicy, QInputDialog)
88
from PyQt5.QtGui import QCloseEvent
9-
from PyQtAds import QtAds
9+
import PyQtAds as QtAds
1010

1111

1212
UI_FILE = os.path.join(os.path.dirname(__file__), 'mainwindow.ui')
@@ -105,4 +105,4 @@ def closeEvent(self, event: QCloseEvent):
105105

106106
w = CMainWindow()
107107
w.show()
108-
app.exec_()
108+
app.exec_()

examples/sidebar/main.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
from PyQt5.QtCore import Qt, QMargins
66
from PyQt5.QtWidgets import QApplication, QLabel, QVBoxLayout, QPlainTextEdit
77

8-
from PyQtAds import QtAds
8+
import PyQtAds as QtAds
99

1010
UI_FILE = os.path.join(os.path.dirname(__file__), 'MainWindow.ui')
1111
MainWindowUI, MainWindowBase = uic.loadUiType(UI_FILE)

0 commit comments

Comments
 (0)