From be20e206432d2fd91b0d20df4f8b611ea238fa7f Mon Sep 17 00:00:00 2001 From: Tanay Mathur Date: Thu, 25 Jun 2015 16:53:08 +0530 Subject: GUI changes for Dock Area, added FOSSEE logo --- src/frontEnd/Application.py | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) (limited to 'src/frontEnd/Application.py') diff --git a/src/frontEnd/Application.py b/src/frontEnd/Application.py index 9fce17b0..a90dd1a7 100755 --- a/src/frontEnd/Application.py +++ b/src/frontEnd/Application.py @@ -89,7 +89,16 @@ class Application(QtGui.QMainWindow): self.topToolbar.addAction(self.openproj) self.topToolbar.addAction(self.exitproj) self.topToolbar.addAction(self.helpfile) - + + self.spacer = QtGui.QWidget() + self.spacer.setSizePolicy(QtGui.QSizePolicy.Expanding,QtGui.QSizePolicy.Expanding) + self.topToolbar.addWidget(self.spacer) + self.logo = QtGui.QLabel() + self.logopic = QtGui.QPixmap(os.path.join(os.path.abspath('../..'),'images','fosseeLogo.png')) + self.logopic = self.logopic.scaled(QSize(150,150),QtCore.Qt.KeepAspectRatio) + self.logo.setPixmap(self.logopic) + self.topToolbar.addWidget(self.logo) + #Left Tool bar Action Widget self.kicad = QtGui.QAction(QtGui.QIcon('../../images/kicad.png'),'Open Schematic',self) self.kicad.triggered.connect(self.obj_kicad.openSchematic) @@ -246,8 +255,8 @@ class MainView(QtGui.QWidget): self.obj_appconfig.noteArea['Note'].append(' eSim Started......') self.obj_appconfig.noteArea['Note'].append('Project Selected : None') self.obj_appconfig.noteArea['Note'].append('\n') - #CSS + #CSS self.noteArea.setStyleSheet(" \ QWidget { border-radius: 15px; border: 1px solid gray; padding: 5px; } \ ") -- cgit From 0d7dcfcf35e731900ffd6aa3f066d5bf8cbe0191 Mon Sep 17 00:00:00 2001 From: xoher Date: Mon, 29 Jun 2015 12:45:28 +0530 Subject: Workspace window appears before the main window with splash screen in the background --- src/frontEnd/Application.py | 58 ++++++++++++++++++++++++++++++++++----------- 1 file changed, 44 insertions(+), 14 deletions(-) (limited to 'src/frontEnd/Application.py') diff --git a/src/frontEnd/Application.py b/src/frontEnd/Application.py index a90dd1a7..615c3f5f 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,7 @@ class Application(QtGui.QMainWindow): self.obj_appconfig._app_heigth) self.setWindowTitle(self.obj_appconfig._APPLICATION) self.showMaximized() - self.show() + #self.show() def initToolBar(self): @@ -291,32 +292,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.spl=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_())""" +###################################################################################################################################################### -- cgit From 739696c6c2d100b42d147b5451cb67bfc6063923 Mon Sep 17 00:00:00 2001 From: xoher Date: Mon, 29 Jun 2015 12:54:30 +0530 Subject: Code cleanup for Application and Workspace files --- src/frontEnd/Application.py | 1 - 1 file changed, 1 deletion(-) (limited to 'src/frontEnd/Application.py') diff --git a/src/frontEnd/Application.py b/src/frontEnd/Application.py index 615c3f5f..62278f9e 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() -- cgit From ebe5526305045c2b33e0810ef76324c6ae3b2ffb Mon Sep 17 00:00:00 2001 From: xoher Date: Mon, 29 Jun 2015 13:56:34 +0530 Subject: Splash screen closes on closing workspace window --- src/frontEnd/Application.py | 1 + 1 file changed, 1 insertion(+) (limited to 'src/frontEnd/Application.py') diff --git a/src/frontEnd/Application.py b/src/frontEnd/Application.py index 62278f9e..adb81966 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() -- cgit From 6d0631e034026b958437456ae461f21ba8429813 Mon Sep 17 00:00:00 2001 From: xoher Date: Mon, 29 Jun 2015 15:14:04 +0530 Subject: Logo bug fixed,and Splash screen waits for one second after workspace window --- src/frontEnd/Application.py | 1 + 1 file changed, 1 insertion(+) (limited to 'src/frontEnd/Application.py') diff --git a/src/frontEnd/Application.py b/src/frontEnd/Application.py index adb81966..a139a7bd 100755 --- a/src/frontEnd/Application.py +++ b/src/frontEnd/Application.py @@ -60,6 +60,7 @@ class Application(QtGui.QMainWindow): self.obj_appconfig._app_heigth) self.setWindowTitle(self.obj_appconfig._APPLICATION) self.showMaximized() + self.setWindowIcon(QtGui.QIcon('../../images/logo.png')) #self.show() -- cgit