summaryrefslogtreecommitdiff
path: root/src/frontEnd
diff options
context:
space:
mode:
authorfahim2015-07-31 11:59:21 +0530
committerfahim2015-07-31 11:59:21 +0530
commita240b67affd00ac162329f736a430f35cc38baba (patch)
tree225ef1886c6fc83d3a67b8a3e9543e41e5dad785 /src/frontEnd
parent81543e3a4c4e3a845507ee38308f52a8198204c3 (diff)
downloadeSim-a240b67affd00ac162329f736a430f35cc38baba.tar.gz
eSim-a240b67affd00ac162329f736a430f35cc38baba.tar.bz2
eSim-a240b67affd00ac162329f736a430f35cc38baba.zip
Subject: Updated Welcome page of eSim.
Description: Updated Welcome page of eSim.
Diffstat (limited to 'src/frontEnd')
-rwxr-xr-xsrc/frontEnd/Application.py12
-rw-r--r--src/frontEnd/DockArea.py25
2 files changed, 31 insertions, 6 deletions
diff --git a/src/frontEnd/Application.py b/src/frontEnd/Application.py
index 7f105cfe..e977df23 100755
--- a/src/frontEnd/Application.py
+++ b/src/frontEnd/Application.py
@@ -16,7 +16,12 @@
# CREATED: Wednesday 21 January 2015
# REVISION: ---
#===============================================================================
-
+import os
+import sys
+#Setting PYTHONPATH
+cwd = os.getcwd()
+(setPath,fronEnd) = os.path.split(cwd)
+sys.path.append(setPath)
from PyQt4 import QtGui, QtCore
from configuration.Appconfig import Appconfig
@@ -26,8 +31,6 @@ from projManagement.Kicad import Kicad
from frontEnd import ProjectExplorer
from frontEnd import Workspace
from frontEnd import DockArea
-import os
-import sys
import time
from PyQt4.Qt import QSize
@@ -221,8 +224,7 @@ class Application(QtGui.QMainWindow):
print "Help is called"
self.obj_appconfig.print_info('Help is called')
print "Current Project : ",self.obj_appconfig.current_project
- #self.obj_appconfig.print_info('Current Project : ' + self.obj_appconfig.current_project['ProjectName'])
- #self.obj_Mainview.obj_dockarea.plottingEditor()
+ self.obj_Mainview.obj_dockarea.createTestEditor()
def open_modelEditor(self):
diff --git a/src/frontEnd/DockArea.py b/src/frontEnd/DockArea.py
index c1a0b34d..1c155787 100644
--- a/src/frontEnd/DockArea.py
+++ b/src/frontEnd/DockArea.py
@@ -5,6 +5,7 @@ from configuration.Appconfig import Appconfig
from modelEditor.ModelEditor import ModelEditorclass
from subcircuit.Subcircuit import Subcircuit
from kicadtoNgspice.KicadtoNgspice import MainWindow
+from browser.Welcome import Welcome
import os
dockList = ['Welcome']
@@ -13,7 +14,29 @@ dock = {}
class DockArea(QtGui.QMainWindow):
+ def __init__(self):
+ QtGui.QMainWindow.__init__(self)
+ self.obj_appconfig = Appconfig()
+
+ for dockName in dockList:
+ dock[dockName] = QtGui.QDockWidget(dockName)
+ self.welcomeWidget = QtGui.QWidget()
+ self.welcomeLayout = QtGui.QVBoxLayout()
+ self.welcomeLayout.addWidget(Welcome()) ##Call browser
+
+ #Adding to main Layout
+ self.welcomeWidget.setLayout(self.welcomeLayout)
+ dock[dockName].setWidget(self.welcomeWidget)
+ #CSS
+ dock[dockName].setStyleSheet(" \
+ QWidget { border-radius: 15px; border: 1px solid gray; padding: 5px; width: 200px; height: 150px; } \
+ ")
+ self.addDockWidget(QtCore.Qt.TopDockWidgetArea, dock[dockName])
+
+ #self.tabifyDockWidget(dock['Notes'],dock['Blank'])
+ self.show()
+ '''
def __init__(self):
QtGui.QMainWindow.__init__(self)
self.obj_appconfig = Appconfig()
@@ -31,7 +54,7 @@ class DockArea(QtGui.QMainWindow):
#self.tabifyDockWidget(dock['Notes'],dock['Blank'])
self.show()
-
+ '''
def createTestEditor(self):
"""