diff options
-rwxr-xr-x | images/branch-closed.png (renamed from src/images/branch-closed.png) | bin | 334 -> 334 bytes | |||
-rwxr-xr-x | images/branch-end.png (renamed from src/images/branch-end.png) | bin | 182 -> 182 bytes | |||
-rwxr-xr-x | images/branch-more.png (renamed from src/images/branch-more.png) | bin | 136 -> 136 bytes | |||
-rwxr-xr-x | images/branch-open.png (renamed from src/images/branch-open.png) | bin | 346 -> 346 bytes | |||
-rw-r--r-- | images/closeProject.png (renamed from src/images/closeProject.png) | bin | 43683 -> 43683 bytes | |||
-rw-r--r-- | images/default.png (renamed from src/images/default.png) | bin | 14844 -> 14844 bytes | |||
-rw-r--r-- | images/footprint.png (renamed from src/images/footprint.png) | bin | 46330 -> 46330 bytes | |||
-rw-r--r-- | images/helpProject.png (renamed from src/images/helpProject.png) | bin | 44903 -> 44903 bytes | |||
-rw-r--r-- | images/ki-ng.png (renamed from src/images/ki-ng.png) | bin | 27902 -> 27902 bytes | |||
-rw-r--r-- | images/kicad.png (renamed from src/images/kicad.png) | bin | 46390 -> 46390 bytes | |||
-rw-r--r-- | images/logo.png (renamed from src/images/logo.png) | bin | 39873 -> 39873 bytes | |||
-rw-r--r-- | images/model.png (renamed from src/images/model.png) | bin | 52596 -> 52596 bytes | |||
-rw-r--r-- | images/newProject.png (renamed from src/images/newProject.png) | bin | 53055 -> 53055 bytes | |||
-rw-r--r-- | images/ngspice.png (renamed from src/images/ngspice.png) | bin | 50330 -> 50330 bytes | |||
-rw-r--r-- | images/openProject.png (renamed from src/images/openProject.png) | bin | 49794 -> 49794 bytes | |||
-rw-r--r-- | images/pcb.png (renamed from src/images/pcb.png) | bin | 32011 -> 32011 bytes | |||
-rw-r--r-- | images/splash_screen_esim.png (renamed from src/images/splash_screen_esim.png) | bin | 281329 -> 281329 bytes | |||
-rw-r--r-- | images/subckt.png (renamed from src/images/subckt.png) | bin | 22996 -> 22996 bytes | |||
-rw-r--r-- | images/warning.png (renamed from src/images/warning.png) | bin | 64071 -> 64071 bytes | |||
-rwxr-xr-x | src/frontEnd/Application.py | 24 | ||||
-rw-r--r-- | src/frontEnd/ProjectExplorer.py | 10 |
21 files changed, 17 insertions, 17 deletions
diff --git a/src/images/branch-closed.png b/images/branch-closed.png Binary files differindex 213ffdd8..213ffdd8 100755 --- a/src/images/branch-closed.png +++ b/images/branch-closed.png diff --git a/src/images/branch-end.png b/images/branch-end.png Binary files differindex 54915b3b..54915b3b 100755 --- a/src/images/branch-end.png +++ b/images/branch-end.png diff --git a/src/images/branch-more.png b/images/branch-more.png Binary files differindex 664ad447..664ad447 100755 --- a/src/images/branch-more.png +++ b/images/branch-more.png diff --git a/src/images/branch-open.png b/images/branch-open.png Binary files differindex e8cad95c..e8cad95c 100755 --- a/src/images/branch-open.png +++ b/images/branch-open.png diff --git a/src/images/closeProject.png b/images/closeProject.png Binary files differindex 2aa0dbb4..2aa0dbb4 100644 --- a/src/images/closeProject.png +++ b/images/closeProject.png diff --git a/src/images/default.png b/images/default.png Binary files differindex cf00aafe..cf00aafe 100644 --- a/src/images/default.png +++ b/images/default.png diff --git a/src/images/footprint.png b/images/footprint.png Binary files differindex 30dcb619..30dcb619 100644 --- a/src/images/footprint.png +++ b/images/footprint.png diff --git a/src/images/helpProject.png b/images/helpProject.png Binary files differindex 1be6a7bc..1be6a7bc 100644 --- a/src/images/helpProject.png +++ b/images/helpProject.png diff --git a/src/images/ki-ng.png b/images/ki-ng.png Binary files differindex fc4a5c33..fc4a5c33 100644 --- a/src/images/ki-ng.png +++ b/images/ki-ng.png diff --git a/src/images/kicad.png b/images/kicad.png Binary files differindex 353f6205..353f6205 100644 --- a/src/images/kicad.png +++ b/images/kicad.png diff --git a/src/images/logo.png b/images/logo.png Binary files differindex 48d4c656..48d4c656 100644 --- a/src/images/logo.png +++ b/images/logo.png diff --git a/src/images/model.png b/images/model.png Binary files differindex e411b626..e411b626 100644 --- a/src/images/model.png +++ b/images/model.png diff --git a/src/images/newProject.png b/images/newProject.png Binary files differindex edc9b9bb..edc9b9bb 100644 --- a/src/images/newProject.png +++ b/images/newProject.png diff --git a/src/images/ngspice.png b/images/ngspice.png Binary files differindex 565df98d..565df98d 100644 --- a/src/images/ngspice.png +++ b/images/ngspice.png diff --git a/src/images/openProject.png b/images/openProject.png Binary files differindex c755399a..c755399a 100644 --- a/src/images/openProject.png +++ b/images/openProject.png diff --git a/src/images/pcb.png b/images/pcb.png Binary files differindex 0dc59572..0dc59572 100644 --- a/src/images/pcb.png +++ b/images/pcb.png diff --git a/src/images/splash_screen_esim.png b/images/splash_screen_esim.png Binary files differindex 3b907292..3b907292 100644 --- a/src/images/splash_screen_esim.png +++ b/images/splash_screen_esim.png diff --git a/src/images/subckt.png b/images/subckt.png Binary files differindex 7775f178..7775f178 100644 --- a/src/images/subckt.png +++ b/images/subckt.png diff --git a/src/images/warning.png b/images/warning.png Binary files differindex e3dee87a..e3dee87a 100644 --- a/src/images/warning.png +++ b/images/warning.png diff --git a/src/frontEnd/Application.py b/src/frontEnd/Application.py index f570277c..01e445a9 100755 --- a/src/frontEnd/Application.py +++ b/src/frontEnd/Application.py @@ -24,8 +24,8 @@ from projManagement.openProject import OpenProjectInfo from projManagement.newProject import NewProjectInfo from projManagement.Kicad import Kicad from frontEnd import ProjectExplorer -import Workspace -import DockArea +from frontEnd import Workspace +from frontEnd import DockArea import os import sys import time @@ -67,20 +67,20 @@ class Application(QtGui.QMainWindow): This function initialize Tool Bar """ #Top Tool bar - self.newproj = QtGui.QAction(QtGui.QIcon('../images/newProject.png'),'<b>New Project</b>',self) + self.newproj = QtGui.QAction(QtGui.QIcon('../../images/newProject.png'),'<b>New Project</b>',self) self.newproj.setShortcut('Ctrl+N') self.newproj.triggered.connect(self.new_project) #self.newproj.connect(self.newproj,QtCore.SIGNAL('triggered()'),self,QtCore.SLOT(self.new_project())) - self.openproj = QtGui.QAction(QtGui.QIcon('../images/openProject.png'),'<b>Open Project</b>',self) + self.openproj = QtGui.QAction(QtGui.QIcon('../../images/openProject.png'),'<b>Open Project</b>',self) self.openproj.setShortcut('Ctrl+O') self.openproj.triggered.connect(self.open_project) - self.exitproj = QtGui.QAction(QtGui.QIcon('../images/closeProject.png'),'<b>Exit</b>',self) + self.exitproj = QtGui.QAction(QtGui.QIcon('../../images/closeProject.png'),'<b>Exit</b>',self) self.exitproj.setShortcut('Ctrl+X') self.exitproj.triggered.connect(self.exit_project) - self.helpfile = QtGui.QAction(QtGui.QIcon('../images/helpProject.png'),'<b>Help</b>',self) + self.helpfile = QtGui.QAction(QtGui.QIcon('../../images/helpProject.png'),'<b>Help</b>',self) self.helpfile.setShortcut('Ctrl+H') self.helpfile.triggered.connect(self.help_project) @@ -91,22 +91,22 @@ class Application(QtGui.QMainWindow): self.topToolbar.addAction(self.helpfile) #Left Tool bar Action Widget - self.kicad = QtGui.QAction(QtGui.QIcon('../images/kicad.png'),'<b>Open Schematic</b>',self) + self.kicad = QtGui.QAction(QtGui.QIcon('../../images/kicad.png'),'<b>Open Schematic</b>',self) self.kicad.triggered.connect(self.obj_kicad.openSchematic) - self.conversion = QtGui.QAction(QtGui.QIcon('../images/ki-ng.png'),'<b>Convert Kicad to Ngspice</b>',self) + self.conversion = QtGui.QAction(QtGui.QIcon('../../images/ki-ng.png'),'<b>Convert Kicad to Ngspice</b>',self) self.conversion.triggered.connect(self.obj_kicad.openKicadToNgspice) - self.ngspice = QtGui.QAction(QtGui.QIcon('../images/ngspice.png'), '<b>Simulation</b>', self) + self.ngspice = QtGui.QAction(QtGui.QIcon('../../images/ngspice.png'), '<b>Simulation</b>', self) self.ngspice.triggered.connect(self.open_ngspice) - self.footprint = QtGui.QAction(QtGui.QIcon('../images/footprint.png'),'<b>Footprint Editor</b>',self) + self.footprint = QtGui.QAction(QtGui.QIcon('../../images/footprint.png'),'<b>Footprint Editor</b>',self) self.footprint.triggered.connect(self.obj_kicad.openFootprint) - self.pcb = QtGui.QAction(QtGui.QIcon('../images/pcb.png'),'<b>PCB Layout</b>',self) + self.pcb = QtGui.QAction(QtGui.QIcon('../../images/pcb.png'),'<b>PCB Layout</b>',self) self.pcb.triggered.connect(self.obj_kicad.openLayout) - self.model = QtGui.QAction(QtGui.QIcon('../images/model.png'),'<b>Model Editor</b>',self) + self.model = QtGui.QAction(QtGui.QIcon('../../images/model.png'),'<b>Model Editor</b>',self) self.model.triggered.connect(self.open_modelEditor) #Adding Action Widget to tool bar diff --git a/src/frontEnd/ProjectExplorer.py b/src/frontEnd/ProjectExplorer.py index 0b0ae31d..4cc6db54 100644 --- a/src/frontEnd/ProjectExplorer.py +++ b/src/frontEnd/ProjectExplorer.py @@ -17,13 +17,13 @@ class ProjectExplorer(QtGui.QWidget): #CSS self.treewidget.setStyleSheet(" \ QTreeView { border-radius: 15px; border: 1px solid gray; padding: 5px; width: 200px; height: 150px; } \ - QTreeView::branch:has-siblings:!adjoins-item { border-image: url(../images/vline.png) 0; } \ - QTreeView::branch:has-siblings:adjoins-item { border-image: url(../images/branch-more.png) 0; } \ - QTreeView::branch:!has-children:!has-siblings:adjoins-item { border-image: url(../images/branch-end.png) 0; } \ + QTreeView::branch:has-siblings:!adjoins-item { border-image: url(../../images/vline.png) 0; } \ + QTreeView::branch:has-siblings:adjoins-item { border-image: url(../../images/branch-more.png) 0; } \ + QTreeView::branch:!has-children:!has-siblings:adjoins-item { border-image: url(../../images/branch-end.png) 0; } \ QTreeView::branch:has-children:!has-siblings:closed, \ - QTreeView::branch:closed:has-children:has-siblings { border-image: none; image: url(../images/branch-closed.png); } \ + QTreeView::branch:closed:has-children:has-siblings { border-image: none; image: url(../../images/branch-closed.png); } \ QTreeView::branch:open:has-children:!has-siblings, \ - QTreeView::branch:open:has-children:has-siblings { border-image: none; image: url(../images/branch-open.png); } \ + QTreeView::branch:open:has-children:has-siblings { border-image: none; image: url(../../images/branch-open.png); } \ ") for parents, children in self.obj_appconfig.project_explorer.items(): |