summaryrefslogtreecommitdiff
path: root/src/frontEnd
diff options
context:
space:
mode:
Diffstat (limited to 'src/frontEnd')
-rwxr-xr-xsrc/frontEnd/Application.py72
-rw-r--r--src/frontEnd/DockArea.py24
-rw-r--r--src/frontEnd/Workspace.py32
3 files changed, 99 insertions, 29 deletions
diff --git a/src/frontEnd/Application.py b/src/frontEnd/Application.py
index 9fce17b0..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):
@@ -89,7 +91,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'),'<b>Open Schematic</b>',self)
self.kicad.triggered.connect(self.obj_kicad.openSchematic)
@@ -246,8 +257,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; } \
")
@@ -282,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_())"""
+######################################################################################################################################################
diff --git a/src/frontEnd/DockArea.py b/src/frontEnd/DockArea.py
index e87fea99..fcaf1f0f 100644
--- a/src/frontEnd/DockArea.py
+++ b/src/frontEnd/DockArea.py
@@ -51,7 +51,7 @@ class DockArea(QtGui.QMainWindow):
"""
#CSS
dock['Tips-'+str(count)].setStyleSheet(" \
- QWidget { border-radius: 15px; border: 1px solid gray; padding: 5px; width: 200px; height: 150px; } \
+ .QWidget { border-radius: 15px; border: 1px solid gray; padding: 5px; width: 200px; height: 150px; } \
")
"""
@@ -86,7 +86,7 @@ class DockArea(QtGui.QMainWindow):
"""
#CSS
dock['Plotting-'+str(count)].setStyleSheet(" \
- QWidget { border-radius: 15px; border: 1px solid gray; padding: 5px; width: 200px; height: 150px; } \
+ .QWidget { border-radius: 15px; border: 1px solid gray; padding: 5px; width: 200px; height: 150px; } \
")
"""
dock['Plotting-'+str(count)].setVisible(True)
@@ -119,13 +119,12 @@ class DockArea(QtGui.QMainWindow):
dock['NgSpice-'+str(count)].setWidget(self.ngspiceWidget)
self.addDockWidget(QtCore.Qt.TopDockWidgetArea, dock['NgSpice-'+str(count)])
self.tabifyDockWidget(dock['Welcome'],dock['NgSpice-'+str(count)])
-
- """
+
#CSS
dock['NgSpice-'+str(count)].setStyleSheet(" \
- QWidget { border-radius: 15px; border: 1px solid gray; padding: 0px; width: 200px; height: 150px; } \
+ .QWidget { border-radius: 15px; border: 1px solid gray; padding: 0px; width: 200px; height: 150px; } \
")
- """
+
dock['NgSpice-'+str(count)].setVisible(True)
dock['NgSpice-'+str(count)].setFocus()
dock['NgSpice-'+str(count)].raise_()
@@ -148,6 +147,11 @@ class DockArea(QtGui.QMainWindow):
self.addDockWidget(QtCore.Qt.TopDockWidgetArea, dock['Model Editor-'+str(count)])
self.tabifyDockWidget(dock['Welcome'],dock['Model Editor-'+str(count)])
+ #CSS
+ dock['Model Editor-'+str(count)].setStyleSheet(" \
+ .QWidget { border-radius: 15px; border: 1px solid gray; padding: 5px; width: 200px; height: 150px; } \
+ ")
+
dock['Model Editor-'+str(count)].setVisible(True)
dock['Model Editor-'+str(count)].setFocus()
dock['Model Editor-'+str(count)].raise_()
@@ -169,12 +173,12 @@ class DockArea(QtGui.QMainWindow):
dock['Subcircuit-'+str(count)].setWidget(self.subcktWidget)
self.addDockWidget(QtCore.Qt.TopDockWidgetArea, dock['Subcircuit-'+str(count)])
self.tabifyDockWidget(dock['Welcome'],dock['Subcircuit-'+str(count)])
- """
+
#CSS
- dock['Plotting-'+str(count)].setStyleSheet(" \
- QWidget { border-radius: 15px; border: 1px solid gray; padding: 5px; width: 200px; height: 150px; } \
+ dock['Subcircuit-'+str(count)].setStyleSheet(" \
+ .QWidget { border-radius: 15px; border: 1px solid gray; padding: 5px; width: 200px; height: 150px; } \
")
- """
+
dock['Subcircuit-'+str(count)].setVisible(True)
dock['Subcircuit-'+str(count)].setFocus()
dock['Subcircuit-'+str(count)].raise_()
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"
generated by cgit (git 2.34.1) at 2025-02-05 01:26:04 +0000