summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorrahulp132020-07-24 01:57:19 +0530
committerrahulp132020-07-24 01:57:19 +0530
commitcde494dc77c0d48cffa1e9aca77121fec0e94cf0 (patch)
treefeec084c3df01ad0f79a3dca19d29878ed5ef019
parent8173e49d1a2d01d706dc8159aff507f7fc021964 (diff)
downloadeSim-cde494dc77c0d48cffa1e9aca77121fec0e94cf0.tar.gz
eSim-cde494dc77c0d48cffa1e9aca77121fec0e94cf0.tar.bz2
eSim-cde494dc77c0d48cffa1e9aca77121fec0e94cf0.zip
fixed modality of workspace dialog with splash screen
-rw-r--r--src/frontEnd/Application.py12
-rw-r--r--src/frontEnd/Workspace.py13
2 files changed, 15 insertions, 10 deletions
diff --git a/src/frontEnd/Application.py b/src/frontEnd/Application.py
index 6eaf4c9c..cb7a7527 100644
--- a/src/frontEnd/Application.py
+++ b/src/frontEnd/Application.py
@@ -19,8 +19,8 @@
import os
if os.name == 'nt': # noqa
- init_path = ''
from frontEnd import pathmagic # noqa:F401
+ init_path = ''
else:
import pathmagic # noqa:F401
init_path = '../../'
@@ -814,11 +814,15 @@ def main(args):
print("Starting eSim......")
app = QtGui.QApplication(args)
+ appView = Application()
+ appView.hide()
+
splash_pix = QtGui.QPixmap(init_path + 'images/splash_screen_esim.png')
- splash = QtGui.QSplashScreen(splash_pix, QtCore.Qt.WindowStaysOnTopHint)
+ splash = QtGui.QSplashScreen(appView, splash_pix, QtCore.Qt.WindowStaysOnTopHint)
splash.setMask(splash_pix.mask())
+ splash.setDisabled(True)
splash.show()
- appView = Application()
+
appView.splash = splash
appView.obj_workspace.returnWhetherClickedOrNot(appView)
@@ -830,10 +834,10 @@ def main(args):
file.close()
except IOError:
work = 0
+
if work != 0:
appView.obj_workspace.defaultWorkspace()
else:
- appView.hide()
appView.obj_workspace.show()
sys.exit(app.exec_())
diff --git a/src/frontEnd/Workspace.py b/src/frontEnd/Workspace.py
index ee3a49f3..85dafdf3 100644
--- a/src/frontEnd/Workspace.py
+++ b/src/frontEnd/Workspace.py
@@ -49,11 +49,12 @@ class Workspace(QtGui.QWidget):
self.grid = QtGui.QGridLayout()
self.note = QtGui.QTextEdit(self)
- self.workspace_label = QtGui.QLabel(self)
- self.workspace_loc = QtGui.QLineEdit(self)
-
self.note.append(self.obj_appconfig.workspace_text)
+ self.note.setReadOnly(True)
+
+ self.workspace_label = QtGui.QLabel(self)
self.workspace_label.setText("Workspace:")
+ self.workspace_loc = QtGui.QLineEdit(self)
self.workspace_loc.setText(self.obj_appconfig.home)
# Buttons
@@ -81,7 +82,7 @@ class Workspace(QtGui.QWidget):
self.setMaximumSize(4000, 200)
self.setWindowTitle("eSim")
self.setWindowFlags(QtCore.Qt.WindowStaysOnTopHint)
- self.note.setReadOnly(True)
+ self.setWindowModality(2)
init_path = '../../'
if os.name == 'nt':
@@ -106,7 +107,7 @@ class Workspace(QtGui.QWidget):
)
var_appView.show()
- time.sleep(1)
+ time.sleep(1.5)
var_appView.splash.close()
def close(self, *args, **kwargs):
@@ -166,7 +167,7 @@ class Workspace(QtGui.QWidget):
)
var_appView.show()
- time.sleep(1)
+ time.sleep(1.5)
var_appView.splash.close()
def browseLocation(self):