From 739696c6c2d100b42d147b5451cb67bfc6063923 Mon Sep 17 00:00:00 2001
From: xoher <saiabishek1@gmail.com>
Date: Mon, 29 Jun 2015 12:54:30 +0530
Subject: [PATCH 1/2] Code cleanup for Application and Workspace files

---
 src/frontEnd/Application.py |  1 -
 src/frontEnd/Workspace.py   | 22 +++-------------------
 2 files changed, 3 insertions(+), 20 deletions(-)

diff --git a/src/frontEnd/Application.py b/src/frontEnd/Application.py
index 615c3f5f7..62278f9e0 100755
--- a/src/frontEnd/Application.py
+++ b/src/frontEnd/Application.py
@@ -299,7 +299,6 @@ def main(args):
     splash.show()
     #QtGui.QApplication.setStyle(QtGui.QStyleFactory.create("Cleanlooks"))
     appView = Application()
-    appView.spl=splash
     appView.obj_workspace.returnWhetherClickedOrNot(appView)
     appView.hide()
     appView.obj_workspace.show() 
diff --git a/src/frontEnd/Workspace.py b/src/frontEnd/Workspace.py
index aceac6a59..f2dbc1b46 100644
--- a/src/frontEnd/Workspace.py
+++ b/src/frontEnd/Workspace.py
@@ -48,9 +48,7 @@ def initWorkspace(self):
         self.note.append(self.obj_appconfig.workspace_text)
         self.workspace_label.setText("Workspace:")
         self.workspace_loc.setText(self.obj_appconfig.home)
-        self.imp_var=0  
-        self.close_var=0
-        self.window_open_close=0
+        
         #Buttons
         self.browsebtn = QtGui.QPushButton('Browse')
         self.browsebtn.clicked.connect(self.browseLocation)
@@ -82,19 +80,8 @@ def defaultWorkspace(self):
         self.obj_appconfig.print_info('Default workspace selected : ' + self.obj_appconfig.default_workspace["workspace"]) 
         self.close()
         var_appView.show()
-    def calledFromApplicationToAssignSysAndApp(self,sys,app):
-        global var_sys,var_app
-        var_sys=sys
-        var_app=app
-
+ 
 
-    #var_sys.exit(var_app.exec_())
-    """def closeEvent(self, event):
-        if self.imp_var==0:
-            self.close_var=1
-            self.destroy()
-            event.accept()
-            self.window_open_close=1"""
 
         
     def close(self, *args, **kwargs):
@@ -126,10 +113,7 @@ def createWorkspace(self):
         self.imp_var=1
         self.close()  
         var_appView.show()
-        """var_appView.obj_Mainview.setVisible(True)
-        var_appView.obj_appconfig.setVisible(True)
-        super.topToolbar.setVisible(True)
-        super.lefttoolbar.setVisible(True)"""     
+        
             
     def browseLocation(self):
         print "Browse Location called"

From ebe5526305045c2b33e0810ef76324c6ae3b2ffb Mon Sep 17 00:00:00 2001
From: xoher <saiabishek1@gmail.com>
Date: Mon, 29 Jun 2015 13:56:34 +0530
Subject: [PATCH 2/2] Splash screen closes on closing workspace window

---
 src/frontEnd/Application.py | 1 +
 src/frontEnd/Workspace.py   | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/src/frontEnd/Application.py b/src/frontEnd/Application.py
index 62278f9e0..adb81966e 100755
--- a/src/frontEnd/Application.py
+++ b/src/frontEnd/Application.py
@@ -299,6 +299,7 @@ def main(args):
     splash.show()
     #QtGui.QApplication.setStyle(QtGui.QStyleFactory.create("Cleanlooks"))
     appView = Application()
+    appView.splash=splash
     appView.obj_workspace.returnWhetherClickedOrNot(appView)
     appView.hide()
     appView.obj_workspace.show() 
diff --git a/src/frontEnd/Workspace.py b/src/frontEnd/Workspace.py
index f2dbc1b46..8f2b6c963 100644
--- a/src/frontEnd/Workspace.py
+++ b/src/frontEnd/Workspace.py
@@ -80,6 +80,7 @@ def defaultWorkspace(self):
         self.obj_appconfig.print_info('Default workspace selected : ' + self.obj_appconfig.default_workspace["workspace"]) 
         self.close()
         var_appView.show()
+        var_appView.splash.close()
  
 
 
@@ -113,6 +114,7 @@ def createWorkspace(self):
         self.imp_var=1
         self.close()  
         var_appView.show()
+        var_appView.splash.close()
         
             
     def browseLocation(self):