summaryrefslogtreecommitdiff
path: root/src/frontEnd
diff options
context:
space:
mode:
Diffstat (limited to 'src/frontEnd')
-rwxr-xr-xsrc/frontEnd/Application.py19
-rwxr-xr-xsrc/frontEnd/ViewManagement.py7
-rw-r--r--src/frontEnd/ViewManagement.pycbin3042 -> 3038 bytes
-rw-r--r--src/frontEnd/Workspace.py12
-rw-r--r--src/frontEnd/Workspace.pycbin3466 -> 3476 bytes
5 files changed, 19 insertions, 19 deletions
diff --git a/src/frontEnd/Application.py b/src/frontEnd/Application.py
index c454f6cc..ff1ffb2a 100755
--- a/src/frontEnd/Application.py
+++ b/src/frontEnd/Application.py
@@ -20,7 +20,7 @@
from PyQt4 import QtGui, QtCore
from configuration.Appconfig import Appconfig
-from projManagement.openProject import ProjectInfo
+from projManagement.openProject import OpenProjectInfo
from projManagement.newProject import NewProjectInfo
import os
import ViewManagement
@@ -42,14 +42,14 @@ class Application(QtGui.QMainWindow):
#Creating Application configuration object
- self.confObj = Appconfig()
- self.setGeometry(self.confObj._app_xpos,
- self.confObj._app_ypos,
- self.confObj._app_width,
- self.confObj._app_heigth)
- self.setWindowTitle(self.confObj._APPLICATION)
+ self.obj_appconfig = Appconfig()
+ self.setGeometry(self.obj_appconfig._app_xpos,
+ self.obj_appconfig._app_ypos,
+ self.obj_appconfig._app_width,
+ self.obj_appconfig._app_heigth)
+ self.setWindowTitle(self.obj_appconfig._APPLICATION)
#Init Workspace
- self.work_space = Workspace.Workspace()
+ self.obj_workspace = Workspace.Workspace()
#Init necessary components in sequence
self.initActions()
@@ -96,7 +96,7 @@ class Application(QtGui.QMainWindow):
def open_project(self):
print "Open Project called"
- self.project = ProjectInfo()
+ self.project = OpenProjectInfo()
self.project.body()
def exit_project(self):
@@ -105,6 +105,7 @@ class Application(QtGui.QMainWindow):
def help_project(self):
print "Help is called"
+ print "Current Project : ",self.obj_appconfig.current_project
def testing(self):
print "Sucess hit kicad button"
diff --git a/src/frontEnd/ViewManagement.py b/src/frontEnd/ViewManagement.py
index 5b7dc262..e1d91d21 100755
--- a/src/frontEnd/ViewManagement.py
+++ b/src/frontEnd/ViewManagement.py
@@ -21,7 +21,7 @@
from PyQt4 import QtCore
from PyQt4 import QtGui
-from projManagement.openKicad import Kicad
+from projManagement.Kicad import Kicad
class ViewManagement(QtGui.QSplitter):
@@ -32,8 +32,7 @@ class ViewManagement(QtGui.QSplitter):
# Creating dictionary which hold all the views
self.views = {}
- #Creating object of openKicad.py
-
+ #Creating object of Kicad.py
self.obj_kicad = Kicad()
# define the basic framework of view areas for the
@@ -57,7 +56,7 @@ class ViewManagement(QtGui.QSplitter):
self.grid = QtGui.QGridLayout()
- #Button for QFrame
+ #Button for Project Tool Bar
self.kicad_btn = QtGui.QPushButton()
self.kicad_btn.setIcon(QtGui.QIcon('../images/default.png'))
self.kicad_btn.setIconSize(QtCore.QSize(50,50))
diff --git a/src/frontEnd/ViewManagement.pyc b/src/frontEnd/ViewManagement.pyc
index cec8f36d..7e3b4a15 100644
--- a/src/frontEnd/ViewManagement.pyc
+++ b/src/frontEnd/ViewManagement.pyc
Binary files differ
diff --git a/src/frontEnd/Workspace.py b/src/frontEnd/Workspace.py
index e52801e7..3b3ef37d 100644
--- a/src/frontEnd/Workspace.py
+++ b/src/frontEnd/Workspace.py
@@ -28,7 +28,7 @@ class Workspace(QtGui.QWidget):
def __init__(self):
super(Workspace, self).__init__()
- self.obj = Appconfig()
+ self.obj_appconfig = Appconfig()
#Initializing Workspace directory for project
self.initWorkspace()
@@ -41,9 +41,9 @@ class Workspace(QtGui.QWidget):
self.worspace_loc = QtGui.QLineEdit(self)
#Add text to text edit,label and line edit
- self.note.append(self.obj.workspace_text)
+ self.note.append(self.obj_appconfig.workspace_text)
self.workspace_label.setText("Workspace:")
- self.worspace_loc.setText(self.obj.home)
+ self.worspace_loc.setText(self.obj_appconfig.home)
#Buttons
self.browsebtn = QtGui.QPushButton('Browse')
@@ -94,14 +94,14 @@ class Workspace(QtGui.QWidget):
def createWorkspace(self):
print "Create workspace is called"
self.create_workspace = str(self.worspace_loc.text())
-
+ #Checking if Workspace already exist or not
if os.path.isdir(self.create_workspace):
print "Already present"
- self.obj.default_workspace["workspace"] = self.create_workspace
+ self.obj_appconfig.default_workspace["workspace"] = self.create_workspace
else:
os.mkdir(self.create_workspace)
- self.obj.default_workspace["workspace"] = self.create_workspace
+ self.obj_appconfig.default_workspace["workspace"] = self.create_workspace
self.close()
diff --git a/src/frontEnd/Workspace.pyc b/src/frontEnd/Workspace.pyc
index a1d59398..72024da5 100644
--- a/src/frontEnd/Workspace.pyc
+++ b/src/frontEnd/Workspace.pyc
Binary files differ