summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xinstall-linux.sh4
-rwxr-xr-xsrc/frontEnd/Application.py5
-rw-r--r--src/projManagement/Kicad.py7
3 files changed, 13 insertions, 3 deletions
diff --git a/install-linux.sh b/install-linux.sh
index 01c6a8c6..6f5f5e3f 100755
--- a/install-linux.sh
+++ b/install-linux.sh
@@ -57,7 +57,9 @@ fi
function addKicadPPA
{
echo "Adding Kicad PPA to install latest Kicad version"
- sudo add-apt-repository ppa:js-reynaud/ppa-kicad
+ #sudo add-apt-repository ppa:js-reynaud/ppa-kicad
+ ##Updating to Kicad-4
+ sudo add-apt-repository --yes ppa:js-reynaud/kicad-4
sudo apt-get update
}
diff --git a/src/frontEnd/Application.py b/src/frontEnd/Application.py
index 6bfbf97e..55c36fb6 100755
--- a/src/frontEnd/Application.py
+++ b/src/frontEnd/Application.py
@@ -128,11 +128,14 @@ class Application(QtGui.QMainWindow):
self.ngspice = QtGui.QAction(QtGui.QIcon('../../images/ngspice.png'), '<b>Simulation</b>', self)
self.ngspice.triggered.connect(self.open_ngspice)
+ """
+ #Removing PCB and Footprint Editor as it will start from eeschema
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.triggered.connect(self.obj_kicad.openLayout)
+ """
self.model = QtGui.QAction(QtGui.QIcon('../../images/model.png'),'<b>Model Editor</b>',self)
self.model.triggered.connect(self.open_modelEditor)
@@ -155,8 +158,10 @@ class Application(QtGui.QMainWindow):
self.lefttoolbar.addAction(self.kicad)
self.lefttoolbar.addAction(self.conversion)
self.lefttoolbar.addAction(self.ngspice)
+ """
self.lefttoolbar.addAction(self.footprint)
self.lefttoolbar.addAction(self.pcb)
+ """
self.lefttoolbar.addAction(self.model)
self.lefttoolbar.addAction(self.subcircuit)
self.lefttoolbar.addAction(self.nghdl)
diff --git a/src/projManagement/Kicad.py b/src/projManagement/Kicad.py
index c2a0c948..41fb8d79 100644
--- a/src/projManagement/Kicad.py
+++ b/src/projManagement/Kicad.py
@@ -29,7 +29,7 @@ class Kicad:
def __init__(self,dockarea):
self.obj_validation = Validation.Validation()
self.obj_appconfig = Appconfig()
- self.obj_dockarea=dockarea
+ self.obj_dockarea= dockarea
def openSchematic(self):
"""
@@ -60,7 +60,8 @@ class Kicad:
self.msg.setWindowTitle("Error Message")
-
+ '''
+ #Commenting as it is no longer needed as PBC and Layout will open from eeschema
def openFootprint(self):
"""
This function create command to open Footprint editor
@@ -115,6 +116,8 @@ class Kicad:
self.msg.showMessage('Please select the project first. You can either create new project or open existing project')
self.obj_appconfig.print_warning('Please select the project first. You can either create new project or open existing project')
self.msg.setWindowTitle("Error Message")
+
+ '''
def openKicadToNgspice(self):
"""