@@ -1,7 +1,7 | |||||
1 | #!/usr/bin/python |
|
1 | #!/usr/bin/python | |
2 | # -*- coding: utf-8 -*-' |
|
2 | # -*- coding: utf-8 -*-' | |
3 |
|
3 | import sys | ||
4 |
|
|
4 | from PyQt4 import QtCore, QtGui | |
5 | from PyQt4.QtGui import QApplication |
|
5 | from PyQt4.QtGui import QApplication | |
6 | #from PyQt4.QtCore import pyqtSignature |
|
6 | #from PyQt4.QtCore import pyqtSignature | |
7 |
|
7 | |||
@@ -13,23 +13,22 from viewcontroller.workspace import Workspace | |||||
13 |
|
13 | |||
14 | def main(): |
|
14 | def main(): | |
15 | import sys |
|
15 | import sys | |
16 | app = QApplication(sys.argv) |
|
16 | app = QtGui.QApplication(sys.argv) | |
17 |
|
17 | |||
18 | Welcome=InitWindow() |
|
18 | Welcome=InitWindow() | |
19 |
Welcome. |
|
19 | if not Welcome.exec_(): | |
20 | # |
|
20 | sys.exit(-1) | |
|
21 | ||||
21 | WorkPathspace=Workspace() |
|
22 | WorkPathspace=Workspace() | |
22 |
|
|
23 | if not WorkPathspace.exec_(): | |
23 | Welcome.ContinueBtn.clicked.connect(WorkPathspace.show) |
|
24 | sys.exit(-1) | |
24 | # |
|
|||
25 | # if self.isBasic(): |
|
25 | # if self.isBasic(): | |
26 | # MainGUI = BasicWindow() |
|
26 | # MainGUI = BasicWindow() | |
27 | # else: |
|
27 | # else: | |
28 | # MainGUI = AdvancedWindow() |
|
28 | # MainGUI = AdvancedWindow() | |
29 |
|
||||
30 | MainGUI=BasicWindow() |
|
29 | MainGUI=BasicWindow() | |
31 | WorkPathspace.closed.connect(MainGUI.show) |
|
30 | MainGUI.setWorkSpaceGUI(WorkPathspace.dirComBox.currentText()) | |
32 |
|
|
31 | MainGUI.show() | |
33 | sys.exit(app.exec_()) |
|
32 | sys.exit(app.exec_()) | |
34 |
|
33 | |||
35 | if __name__ == "__main__": |
|
34 | if __name__ == "__main__": |
General Comments 0
You need to be logged in to leave comments.
Login now