Merge pull request #39 from FOSSEE-Manipal/master

Splash screen and Workspace window bugs fixed

1 files changed, 45 insertions, 14 deletions

diff --git a/src/frontEnd/Application.py b/src/frontEnd/Application.py
index a90dd1a7..a139a7bd 100755
--- a/src/frontEnd/Application.py
+++ b/src/frontEnd/Application.py
@@ -33,6 +33,7 @@ from PyQt4.Qt import QSize
 
 
 class Application(QtGui.QMainWindow):
+    global project_name	
     """
     Its our main window of application
     """
@@ -59,7 +60,8 @@ class Application(QtGui.QMainWindow):
                          self.obj_appconfig._app_heigth)
         self.setWindowTitle(self.obj_appconfig._APPLICATION) 
         self.showMaximized()
-        self.show()
+        self.setWindowIcon(QtGui.QIcon('../../images/logo.png'))
+        #self.show()
               
         
     def initToolBar(self):
@@ -291,32 +293,61 @@ def main(args):
     """
     print "Starting eSim......"
     app = QtGui.QApplication(args)
-   
-    """
-    splash_pix = QtGui.QPixmap('../images/FreeEDAlogo.jpg')
+    
+    splash_pix = QtGui.QPixmap('../../images/splash_screen_esim.png')
+    splash = QtGui.QSplashScreen(splash_pix,QtCore.Qt.WindowStaysOnTopHint)
+    splash.setMask(splash_pix.mask())
+    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() 
+    sys.exit(app.exec_())
+    #appView.hide()
+    ########################################################################################################################################
+    
+    """splash_pix = QtGui.QPixmap('../images/splash_screen_esim.png')
     splash = QtGui.QSplashScreen(splash_pix,QtCore.Qt.WindowStaysOnTopHint)
-    progressBar = QtGui.QProgressBar(splash)
+    progressBar = QtGui.QProgressBar(splash) 
+    progressBar.setGeometry(0,470,1004,20)
     splash.setMask(splash_pix.mask())
     splash.show()
     
     for i in range(0, 100):
         progressBar.setValue(i)
-        t = time.time()
+        #cond=threading.Condition()
+        if i==50:
+            
+            appView = Application()
+            appView.hide()
+            #appView.obj_workspace.returnWhetherClickedOrNot(appView)
+            appView.obj_workspace.show()            
+            #appView.obj_workspace.show()
+            appView.obj_workspace.calledFromApplicationToAssignSysAndApp(sys,app)#`11    ,cond)
+            #with cond:
+                #cond.wait()
+        
+        t = time.time() 
         while time.time() < t + 0.1:
             app.processEvents()    
     
-    time.sleep(2)
+    #time.sleep(2)
     
-    appView = Application()
-    appView.show()
+    #appView = Application()
+    #appView.hide()
     splash.finish(appView)
-    sys.exit(app.exec_())
-    """
-    appView = Application()
+    #sys.exit(app.exec_())
+    
     #QtGui.QApplication.setStyle(QtGui.QStyleFactory.create("Cleanlooks"))
-    appView.show()
-    sys.exit(app.exec_())
+    #appView.obj_workspace.returnWhetherClickedOrNot(appView)
+    #appView.obj_workspace.show() 
+    #appView.hide()
     
+    appView.show()
+    sys.exit(app.exec_())"""
+######################################################################################################################################################