From 7dd5d060156177b0ee05c81c96c709767aca1989 Mon Sep 17 00:00:00 2001 From: fahim Date: Wed, 17 Jun 2015 14:36:42 +0530 Subject: Subject: Changes location of image directory just to make it easy during packaging Description: Did the neccessary changes in python file to read the images from new location --- src/frontEnd/Application.py | 24 ++++++++++++------------ src/frontEnd/ProjectExplorer.py | 10 +++++----- src/images/branch-closed.png | Bin 334 -> 0 bytes src/images/branch-end.png | Bin 182 -> 0 bytes src/images/branch-more.png | Bin 136 -> 0 bytes src/images/branch-open.png | Bin 346 -> 0 bytes src/images/closeProject.png | Bin 43683 -> 0 bytes src/images/default.png | Bin 14844 -> 0 bytes src/images/footprint.png | Bin 46330 -> 0 bytes src/images/helpProject.png | Bin 44903 -> 0 bytes src/images/ki-ng.png | Bin 27902 -> 0 bytes src/images/kicad.png | Bin 46390 -> 0 bytes src/images/logo.png | Bin 39873 -> 0 bytes src/images/model.png | Bin 52596 -> 0 bytes src/images/newProject.png | Bin 53055 -> 0 bytes src/images/ngspice.png | Bin 50330 -> 0 bytes src/images/openProject.png | Bin 49794 -> 0 bytes src/images/pcb.png | Bin 32011 -> 0 bytes src/images/splash_screen_esim.png | Bin 281329 -> 0 bytes src/images/subckt.png | Bin 22996 -> 0 bytes src/images/warning.png | Bin 64071 -> 0 bytes 21 files changed, 17 insertions(+), 17 deletions(-) delete mode 100755 src/images/branch-closed.png delete mode 100755 src/images/branch-end.png delete mode 100755 src/images/branch-more.png delete mode 100755 src/images/branch-open.png delete mode 100644 src/images/closeProject.png delete mode 100644 src/images/default.png delete mode 100644 src/images/footprint.png delete mode 100644 src/images/helpProject.png delete mode 100644 src/images/ki-ng.png delete mode 100644 src/images/kicad.png delete mode 100644 src/images/logo.png delete mode 100644 src/images/model.png delete mode 100644 src/images/newProject.png delete mode 100644 src/images/ngspice.png delete mode 100644 src/images/openProject.png delete mode 100644 src/images/pcb.png delete mode 100644 src/images/splash_screen_esim.png delete mode 100644 src/images/subckt.png delete mode 100644 src/images/warning.png (limited to 'src') 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'),'New Project',self) + self.newproj = QtGui.QAction(QtGui.QIcon('../../images/newProject.png'),'New Project',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'),'Open Project',self) + self.openproj = QtGui.QAction(QtGui.QIcon('../../images/openProject.png'),'Open Project',self) self.openproj.setShortcut('Ctrl+O') self.openproj.triggered.connect(self.open_project) - self.exitproj = QtGui.QAction(QtGui.QIcon('../images/closeProject.png'),'Exit',self) + self.exitproj = QtGui.QAction(QtGui.QIcon('../../images/closeProject.png'),'Exit',self) self.exitproj.setShortcut('Ctrl+X') self.exitproj.triggered.connect(self.exit_project) - self.helpfile = QtGui.QAction(QtGui.QIcon('../images/helpProject.png'),'Help',self) + self.helpfile = QtGui.QAction(QtGui.QIcon('../../images/helpProject.png'),'Help',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'),'Open Schematic',self) + self.kicad = QtGui.QAction(QtGui.QIcon('../../images/kicad.png'),'Open Schematic',self) self.kicad.triggered.connect(self.obj_kicad.openSchematic) - self.conversion = QtGui.QAction(QtGui.QIcon('../images/ki-ng.png'),'Convert Kicad to Ngspice',self) + self.conversion = QtGui.QAction(QtGui.QIcon('../../images/ki-ng.png'),'Convert Kicad to Ngspice',self) self.conversion.triggered.connect(self.obj_kicad.openKicadToNgspice) - self.ngspice = QtGui.QAction(QtGui.QIcon('../images/ngspice.png'), 'Simulation', self) + self.ngspice = QtGui.QAction(QtGui.QIcon('../../images/ngspice.png'), 'Simulation', self) self.ngspice.triggered.connect(self.open_ngspice) - self.footprint = QtGui.QAction(QtGui.QIcon('../images/footprint.png'),'Footprint Editor',self) + self.footprint = QtGui.QAction(QtGui.QIcon('../../images/footprint.png'),'Footprint Editor',self) self.footprint.triggered.connect(self.obj_kicad.openFootprint) - self.pcb = QtGui.QAction(QtGui.QIcon('../images/pcb.png'),'PCB Layout',self) + self.pcb = QtGui.QAction(QtGui.QIcon('../../images/pcb.png'),'PCB Layout',self) self.pcb.triggered.connect(self.obj_kicad.openLayout) - self.model = QtGui.QAction(QtGui.QIcon('../images/model.png'),'Model Editor',self) + self.model = QtGui.QAction(QtGui.QIcon('../../images/model.png'),'Model Editor',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(): diff --git a/src/images/branch-closed.png b/src/images/branch-closed.png deleted file mode 100755 index 213ffdd8..00000000 Binary files a/src/images/branch-closed.png and /dev/null differ diff --git a/src/images/branch-end.png b/src/images/branch-end.png deleted file mode 100755 index 54915b3b..00000000 Binary files a/src/images/branch-end.png and /dev/null differ diff --git a/src/images/branch-more.png b/src/images/branch-more.png deleted file mode 100755 index 664ad447..00000000 Binary files a/src/images/branch-more.png and /dev/null differ diff --git a/src/images/branch-open.png b/src/images/branch-open.png deleted file mode 100755 index e8cad95c..00000000 Binary files a/src/images/branch-open.png and /dev/null differ diff --git a/src/images/closeProject.png b/src/images/closeProject.png deleted file mode 100644 index 2aa0dbb4..00000000 Binary files a/src/images/closeProject.png and /dev/null differ diff --git a/src/images/default.png b/src/images/default.png deleted file mode 100644 index cf00aafe..00000000 Binary files a/src/images/default.png and /dev/null differ diff --git a/src/images/footprint.png b/src/images/footprint.png deleted file mode 100644 index 30dcb619..00000000 Binary files a/src/images/footprint.png and /dev/null differ diff --git a/src/images/helpProject.png b/src/images/helpProject.png deleted file mode 100644 index 1be6a7bc..00000000 Binary files a/src/images/helpProject.png and /dev/null differ diff --git a/src/images/ki-ng.png b/src/images/ki-ng.png deleted file mode 100644 index fc4a5c33..00000000 Binary files a/src/images/ki-ng.png and /dev/null differ diff --git a/src/images/kicad.png b/src/images/kicad.png deleted file mode 100644 index 353f6205..00000000 Binary files a/src/images/kicad.png and /dev/null differ diff --git a/src/images/logo.png b/src/images/logo.png deleted file mode 100644 index 48d4c656..00000000 Binary files a/src/images/logo.png and /dev/null differ diff --git a/src/images/model.png b/src/images/model.png deleted file mode 100644 index e411b626..00000000 Binary files a/src/images/model.png and /dev/null differ diff --git a/src/images/newProject.png b/src/images/newProject.png deleted file mode 100644 index edc9b9bb..00000000 Binary files a/src/images/newProject.png and /dev/null differ diff --git a/src/images/ngspice.png b/src/images/ngspice.png deleted file mode 100644 index 565df98d..00000000 Binary files a/src/images/ngspice.png and /dev/null differ diff --git a/src/images/openProject.png b/src/images/openProject.png deleted file mode 100644 index c755399a..00000000 Binary files a/src/images/openProject.png and /dev/null differ diff --git a/src/images/pcb.png b/src/images/pcb.png deleted file mode 100644 index 0dc59572..00000000 Binary files a/src/images/pcb.png and /dev/null differ diff --git a/src/images/splash_screen_esim.png b/src/images/splash_screen_esim.png deleted file mode 100644 index 3b907292..00000000 Binary files a/src/images/splash_screen_esim.png and /dev/null differ diff --git a/src/images/subckt.png b/src/images/subckt.png deleted file mode 100644 index 7775f178..00000000 Binary files a/src/images/subckt.png and /dev/null differ diff --git a/src/images/warning.png b/src/images/warning.png deleted file mode 100644 index e3dee87a..00000000 Binary files a/src/images/warning.png and /dev/null differ -- cgit