summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorfahim2015-06-17 14:36:42 +0530
committerfahim2015-06-17 14:36:42 +0530
commit7dd5d060156177b0ee05c81c96c709767aca1989 (patch)
tree88cfd628ab33f4f38583f35766d670cd51c682cd
parent968b8a727cc4c4f2249f5f9bd47af015286deb28 (diff)
downloadeSim-7dd5d060156177b0ee05c81c96c709767aca1989.tar.gz
eSim-7dd5d060156177b0ee05c81c96c709767aca1989.tar.bz2
eSim-7dd5d060156177b0ee05c81c96c709767aca1989.zip
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
-rwxr-xr-ximages/branch-closed.png (renamed from src/images/branch-closed.png)bin334 -> 334 bytes
-rwxr-xr-ximages/branch-end.png (renamed from src/images/branch-end.png)bin182 -> 182 bytes
-rwxr-xr-ximages/branch-more.png (renamed from src/images/branch-more.png)bin136 -> 136 bytes
-rwxr-xr-ximages/branch-open.png (renamed from src/images/branch-open.png)bin346 -> 346 bytes
-rw-r--r--images/closeProject.png (renamed from src/images/closeProject.png)bin43683 -> 43683 bytes
-rw-r--r--images/default.png (renamed from src/images/default.png)bin14844 -> 14844 bytes
-rw-r--r--images/footprint.png (renamed from src/images/footprint.png)bin46330 -> 46330 bytes
-rw-r--r--images/helpProject.png (renamed from src/images/helpProject.png)bin44903 -> 44903 bytes
-rw-r--r--images/ki-ng.png (renamed from src/images/ki-ng.png)bin27902 -> 27902 bytes
-rw-r--r--images/kicad.png (renamed from src/images/kicad.png)bin46390 -> 46390 bytes
-rw-r--r--images/logo.png (renamed from src/images/logo.png)bin39873 -> 39873 bytes
-rw-r--r--images/model.png (renamed from src/images/model.png)bin52596 -> 52596 bytes
-rw-r--r--images/newProject.png (renamed from src/images/newProject.png)bin53055 -> 53055 bytes
-rw-r--r--images/ngspice.png (renamed from src/images/ngspice.png)bin50330 -> 50330 bytes
-rw-r--r--images/openProject.png (renamed from src/images/openProject.png)bin49794 -> 49794 bytes
-rw-r--r--images/pcb.png (renamed from src/images/pcb.png)bin32011 -> 32011 bytes
-rw-r--r--images/splash_screen_esim.png (renamed from src/images/splash_screen_esim.png)bin281329 -> 281329 bytes
-rw-r--r--images/subckt.png (renamed from src/images/subckt.png)bin22996 -> 22996 bytes
-rw-r--r--images/warning.png (renamed from src/images/warning.png)bin64071 -> 64071 bytes
-rwxr-xr-xsrc/frontEnd/Application.py24
-rw-r--r--src/frontEnd/ProjectExplorer.py10
21 files changed, 17 insertions, 17 deletions
diff --git a/src/images/branch-closed.png b/images/branch-closed.png
index 213ffdd8..213ffdd8 100755
--- a/src/images/branch-closed.png
+++ b/images/branch-closed.png
Binary files differ
diff --git a/src/images/branch-end.png b/images/branch-end.png
index 54915b3b..54915b3b 100755
--- a/src/images/branch-end.png
+++ b/images/branch-end.png
Binary files differ
diff --git a/src/images/branch-more.png b/images/branch-more.png
index 664ad447..664ad447 100755
--- a/src/images/branch-more.png
+++ b/images/branch-more.png
Binary files differ
diff --git a/src/images/branch-open.png b/images/branch-open.png
index e8cad95c..e8cad95c 100755
--- a/src/images/branch-open.png
+++ b/images/branch-open.png
Binary files differ
diff --git a/src/images/closeProject.png b/images/closeProject.png
index 2aa0dbb4..2aa0dbb4 100644
--- a/src/images/closeProject.png
+++ b/images/closeProject.png
Binary files differ
diff --git a/src/images/default.png b/images/default.png
index cf00aafe..cf00aafe 100644
--- a/src/images/default.png
+++ b/images/default.png
Binary files differ
diff --git a/src/images/footprint.png b/images/footprint.png
index 30dcb619..30dcb619 100644
--- a/src/images/footprint.png
+++ b/images/footprint.png
Binary files differ
diff --git a/src/images/helpProject.png b/images/helpProject.png
index 1be6a7bc..1be6a7bc 100644
--- a/src/images/helpProject.png
+++ b/images/helpProject.png
Binary files differ
diff --git a/src/images/ki-ng.png b/images/ki-ng.png
index fc4a5c33..fc4a5c33 100644
--- a/src/images/ki-ng.png
+++ b/images/ki-ng.png
Binary files differ
diff --git a/src/images/kicad.png b/images/kicad.png
index 353f6205..353f6205 100644
--- a/src/images/kicad.png
+++ b/images/kicad.png
Binary files differ
diff --git a/src/images/logo.png b/images/logo.png
index 48d4c656..48d4c656 100644
--- a/src/images/logo.png
+++ b/images/logo.png
Binary files differ
diff --git a/src/images/model.png b/images/model.png
index e411b626..e411b626 100644
--- a/src/images/model.png
+++ b/images/model.png
Binary files differ
diff --git a/src/images/newProject.png b/images/newProject.png
index edc9b9bb..edc9b9bb 100644
--- a/src/images/newProject.png
+++ b/images/newProject.png
Binary files differ
diff --git a/src/images/ngspice.png b/images/ngspice.png
index 565df98d..565df98d 100644
--- a/src/images/ngspice.png
+++ b/images/ngspice.png
Binary files differ
diff --git a/src/images/openProject.png b/images/openProject.png
index c755399a..c755399a 100644
--- a/src/images/openProject.png
+++ b/images/openProject.png
Binary files differ
diff --git a/src/images/pcb.png b/images/pcb.png
index 0dc59572..0dc59572 100644
--- a/src/images/pcb.png
+++ b/images/pcb.png
Binary files differ
diff --git a/src/images/splash_screen_esim.png b/images/splash_screen_esim.png
index 3b907292..3b907292 100644
--- a/src/images/splash_screen_esim.png
+++ b/images/splash_screen_esim.png
Binary files differ
diff --git a/src/images/subckt.png b/images/subckt.png
index 7775f178..7775f178 100644
--- a/src/images/subckt.png
+++ b/images/subckt.png
Binary files differ
diff --git a/src/images/warning.png b/images/warning.png
index e3dee87a..e3dee87a 100644
--- a/src/images/warning.png
+++ b/images/warning.png
Binary files differ
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():