diff options
author | GauravSupal | 2015-06-30 14:43:38 +0530 |
---|---|---|
committer | GauravSupal | 2015-06-30 14:43:38 +0530 |
commit | f2201054f1602c2252228adcbc9335d8aa18dbac (patch) | |
tree | 25611e8878b6c0131128eede5916661c71d4aaf9 /src/frontEnd/Workspace.py | |
parent | f7cf0e9a67627ed6ce73892a75445ba84e6b9b21 (diff) | |
parent | 0dfbb704aa843baeb75b1f20acbe72fc57ee7707 (diff) | |
download | eSim-f2201054f1602c2252228adcbc9335d8aa18dbac.tar.gz eSim-f2201054f1602c2252228adcbc9335d8aa18dbac.tar.bz2 eSim-f2201054f1602c2252228adcbc9335d8aa18dbac.zip |
Merge pull request #1 from FOSSEE/master
Update
Diffstat (limited to 'src/frontEnd/Workspace.py')
-rw-r--r-- | src/frontEnd/Workspace.py | 32 |
1 files changed, 29 insertions, 3 deletions
diff --git a/src/frontEnd/Workspace.py b/src/frontEnd/Workspace.py index 035a8688..cd44dd71 100644 --- a/src/frontEnd/Workspace.py +++ b/src/frontEnd/Workspace.py @@ -17,7 +17,7 @@ #=============================================================================== from PyQt4 import QtCore, QtGui from configuration.Appconfig import Appconfig - +import time import os @@ -48,7 +48,7 @@ class Workspace(QtGui.QWidget): self.note.append(self.obj_appconfig.workspace_text) self.workspace_label.setText("Workspace:") self.workspace_loc.setText(self.obj_appconfig.home) - + #Buttons self.browsebtn = QtGui.QPushButton('Browse') self.browsebtn.clicked.connect(self.browseLocation) @@ -76,8 +76,29 @@ class Workspace(QtGui.QWidget): def defaultWorkspace(self): print "Default location selected" + self.imp_var=1 self.obj_appconfig.print_info('Default workspace selected : ' + self.obj_appconfig.default_workspace["workspace"]) self.close() + var_appView.show() + time.sleep(1) + var_appView.splash.close() + + + + + def close(self, *args, **kwargs): + self.window_open_close=1 + self.close_var=1 + #with var_cond: + # var_cond.notify() + return QtGui.QWidget.close(self, *args, **kwargs) + + + def returnWhetherClickedOrNot(self,appView): + global var_appView + var_appView=appView + + def createWorkspace(self): print "Create workspace is called" @@ -91,7 +112,12 @@ class Workspace(QtGui.QWidget): else: os.mkdir(self.create_workspace) self.obj_appconfig.default_workspace["workspace"] = self.create_workspace - self.close() + self.imp_var=1 + self.close() + var_appView.show() + time.sleep(1) + var_appView.splash.close() + def browseLocation(self): print "Browse Location called" |