diff options
| -rw-r--r-- | src/configuration/Appconfig.py | 2 | ||||
| -rw-r--r-- | src/configuration/Appconfig.pyc | bin | 1557 -> 1577 bytes | |||
| -rw-r--r-- | src/configuration/__init__.pyc | bin | 144 -> 143 bytes | |||
| -rwxr-xr-x | src/frontEnd/Application.py | 19 | ||||
| -rw-r--r-- | src/frontEnd/ProjectExplorer.py | 11 | ||||
| -rw-r--r-- | src/frontEnd/ProjectExplorer.pyc | bin | 10541 -> 10274 bytes | |||
| -rw-r--r-- | src/frontEnd/ViewManagement.pyc | bin | 2875 -> 2869 bytes | |||
| -rw-r--r-- | src/frontEnd/Workspace.pyc | bin | 3533 -> 3526 bytes | |||
| -rw-r--r-- | src/frontEnd/__init__.pyc | bin | 139 -> 138 bytes | |||
| -rw-r--r-- | src/projManagement/Kicad.pyc | bin | 4309 -> 4302 bytes | |||
| -rw-r--r-- | src/projManagement/Validation.pyc | bin | 2404 -> 2397 bytes | |||
| -rw-r--r-- | src/projManagement/Worker.pyc | bin | 1507 -> 1501 bytes | |||
| -rw-r--r-- | src/projManagement/__init__.pyc | bin | 145 -> 144 bytes | |||
| -rw-r--r-- | src/projManagement/newProject.pyc | bin | 2971 -> 2966 bytes | |||
| -rw-r--r-- | src/projManagement/openProject.pyc | bin | 1771 -> 1767 bytes |
15 files changed, 12 insertions, 20 deletions
diff --git a/src/configuration/Appconfig.py b/src/configuration/Appconfig.py index f00ac984..957634c2 100644 --- a/src/configuration/Appconfig.py +++ b/src/configuration/Appconfig.py @@ -36,7 +36,7 @@ class Appconfig(QtGui.QWidget): #Workspace detail workspace_text = '''eSim stores your project in a folder called a eSim-Workspace. You can choose a different workspace folder to use for this session.''' procThread_list = [] - dictPath = os.path.join(home, ".text.txt") + dictPath = os.path.join(os.path.expanduser("~"), ".projectExplorer.txt") try: project_explorer = json.load(open(dictPath)) except: diff --git a/src/configuration/Appconfig.pyc b/src/configuration/Appconfig.pyc Binary files differindex e08ffda4..23489e4b 100644 --- a/src/configuration/Appconfig.pyc +++ b/src/configuration/Appconfig.pyc diff --git a/src/configuration/__init__.pyc b/src/configuration/__init__.pyc Binary files differindex 58bf9549..4997c274 100644 --- a/src/configuration/__init__.pyc +++ b/src/configuration/__init__.pyc diff --git a/src/frontEnd/Application.py b/src/frontEnd/Application.py index 56e3276b..296525c4 100755 --- a/src/frontEnd/Application.py +++ b/src/frontEnd/Application.py @@ -30,7 +30,7 @@ import sys import time import subprocess from frontEnd import ProjectExplorer - +import DockArea class Application(QtGui.QMainWindow): @@ -50,6 +50,9 @@ class Application(QtGui.QMainWindow): #Creating object of Kicad.py self.obj_kicad = Kicad() + #Creating object of DockArea + self.obj_dockarea = DockArea.DockArea() + #Creating Application configuration object self.obj_appconfig = Appconfig() self.setGeometry(self.obj_appconfig._app_xpos, @@ -77,7 +80,7 @@ class Application(QtGui.QMainWindow): self.projectExplorer = ProjectExplorer.ProjectExplorer() self.mainArea = QtGui.QTextEdit() self.noteArea = QtGui.QTextEdit() - self.browserArea = QtGui.QTextEdit() + self.mainLayout = QtGui.QVBoxLayout() @@ -85,9 +88,9 @@ class Application(QtGui.QMainWindow): self.middleContainer = QtGui.QWidget() self.middleContainerLayout = QtGui.QVBoxLayout() - #Adding content to middle Split whichis vertical + #Adding content to vertical middle Split. self.middleSplit.setOrientation(QtCore.Qt.Vertical) - self.middleSplit.addWidget(self.mainArea) + self.middleSplit.addWidget(self.obj_dockarea.createDockArea()) self.middleSplit.addWidget(self.noteArea) #Adding middle split to Middle Container Widget self.middleContainerLayout.addWidget(self.middleSplit) @@ -131,7 +134,7 @@ class Application(QtGui.QMainWindow): self.topToolbar.addAction(self.exitproj) self.topToolbar.addAction(self.helpfile) - #Left Tool bar Start + #Left Tool bar self.kicad = QtGui.QAction(QtGui.QIcon('../images/default.png'),'<b>Open Schematic</b>',self) self.kicad.triggered.connect(self.obj_kicad.openSchematic) @@ -167,15 +170,13 @@ class Application(QtGui.QMainWindow): """ This function call New Project Info class. """ - print "New Project called" - text, ok = QtGui.QInputDialog.getText(self, 'Input Dialog', - 'Enter Project Name:') + text, ok = QtGui.QInputDialog.getText(self, 'New Project Info','Enter Project Name:') if ok: self.projname = (str(text)) - self.project = NewProjectInfo() self.project.createProject(self.projname) self.setCentralWidget(self.initMainView()) + def open_project(self): """ diff --git a/src/frontEnd/ProjectExplorer.py b/src/frontEnd/ProjectExplorer.py index a95986b1..4b6e0c70 100644 --- a/src/frontEnd/ProjectExplorer.py +++ b/src/frontEnd/ProjectExplorer.py @@ -80,16 +80,7 @@ class SceneGraphModel(QtCore.QAbstractItemModel): else: return node.typeInfo() - if role == QtCore.Qt.DecorationRole: - if index.column() == 0: - typeInfo = node.typeInfo() - - if typeInfo == "DIRECTORY": - return QtGui.QIcon(QtGui.QPixmap("../images/default.png")) - - if typeInfo == "FILE": - return QtGui.QIcon(QtGui.QPixmap("../images/default.png")) - + """INPUTS: QModelIndex, QVariant, int (flag)""" def setData(self, index, value, role=QtCore.Qt.EditRole): diff --git a/src/frontEnd/ProjectExplorer.pyc b/src/frontEnd/ProjectExplorer.pyc Binary files differindex e87d977d..b7c470ad 100644 --- a/src/frontEnd/ProjectExplorer.pyc +++ b/src/frontEnd/ProjectExplorer.pyc diff --git a/src/frontEnd/ViewManagement.pyc b/src/frontEnd/ViewManagement.pyc Binary files differindex 93901e11..245aae44 100644 --- a/src/frontEnd/ViewManagement.pyc +++ b/src/frontEnd/ViewManagement.pyc diff --git a/src/frontEnd/Workspace.pyc b/src/frontEnd/Workspace.pyc Binary files differindex a60ebd37..935ed8d5 100644 --- a/src/frontEnd/Workspace.pyc +++ b/src/frontEnd/Workspace.pyc diff --git a/src/frontEnd/__init__.pyc b/src/frontEnd/__init__.pyc Binary files differindex d878c583..107c0b45 100644 --- a/src/frontEnd/__init__.pyc +++ b/src/frontEnd/__init__.pyc diff --git a/src/projManagement/Kicad.pyc b/src/projManagement/Kicad.pyc Binary files differindex 1a1c7183..3cb015de 100644 --- a/src/projManagement/Kicad.pyc +++ b/src/projManagement/Kicad.pyc diff --git a/src/projManagement/Validation.pyc b/src/projManagement/Validation.pyc Binary files differindex b66bd3af..a1bbf393 100644 --- a/src/projManagement/Validation.pyc +++ b/src/projManagement/Validation.pyc diff --git a/src/projManagement/Worker.pyc b/src/projManagement/Worker.pyc Binary files differindex 28b7afff..4f8652b7 100644 --- a/src/projManagement/Worker.pyc +++ b/src/projManagement/Worker.pyc diff --git a/src/projManagement/__init__.pyc b/src/projManagement/__init__.pyc Binary files differindex 87910074..2f39d337 100644 --- a/src/projManagement/__init__.pyc +++ b/src/projManagement/__init__.pyc diff --git a/src/projManagement/newProject.pyc b/src/projManagement/newProject.pyc Binary files differindex ad569488..2672dd49 100644 --- a/src/projManagement/newProject.pyc +++ b/src/projManagement/newProject.pyc diff --git a/src/projManagement/openProject.pyc b/src/projManagement/openProject.pyc Binary files differindex d9c25b77..49ac9b28 100644 --- a/src/projManagement/openProject.pyc +++ b/src/projManagement/openProject.pyc |