From a35df11fe3405fca786cb35bdf4d74f25d7bc4b0 Mon Sep 17 00:00:00 2001 From: komalsheth236 Date: Wed, 13 May 2015 17:23:20 +0530 Subject: [PATCH] Workspace.py modified --- src/frontEnd/Workspace.py | 58 ++++++++++++++----------------------- src/frontEnd/Workspace.pyc | Bin 3533 -> 3401 bytes 2 files changed, 22 insertions(+), 36 deletions(-) diff --git a/src/frontEnd/Workspace.py b/src/frontEnd/Workspace.py index d759cff60..8ba6c60fb 100644 --- a/src/frontEnd/Workspace.py +++ b/src/frontEnd/Workspace.py @@ -36,14 +36,19 @@ def __init__(self): def initWorkspace(self): #print "Calling workspace" + + self.mainwindow = QtGui.QVBoxLayout() + self.split = QtGui.QSplitter() + self.split.setOrientation(QtCore.Qt.Vertical) + + self.grid = QtGui.QGridLayout() self.note = QtGui.QTextEdit(self) self.workspace_label = QtGui.QLabel(self) - self.worspace_loc = QtGui.QLineEdit(self) - - #Add text to text edit,label and line edit + self.workspace_loc = QtGui.QLineEdit(self) + self.note.append(self.obj_appconfig.workspace_text) self.workspace_label.setText("Workspace:") - self.worspace_loc.setText(self.obj_appconfig.home) + self.workspace_loc.setText(self.obj_appconfig.home) #Buttons self.browsebtn = QtGui.QPushButton('Browse') @@ -52,38 +57,21 @@ def initWorkspace(self): self.okbtn.clicked.connect(self.createWorkspace) self.cancelbtn = QtGui.QPushButton('Cancel') self.cancelbtn.clicked.connect(self.defaultWorkspace) - - #Set Geometry - #Need to set Geometry properly - self.note.setGeometry(QtCore.QRect(0, 0, 400, 100)) - self.workspace_label.setGeometry(QtCore.QRect(10, 130, 81, 17)) - self.worspace_loc.setGeometry(QtCore.QRect(100, 150, 200, 100)) - self.browsebtn.setGeometry(QtCore.QRect(290, 120, 98, 27)) - self.okbtn.setGeometry(QtCore.QRect(290, 250, 98, 27)) - self.cancelbtn.setGeometry(QtCore.QRect(180, 250, 98, 27)) - - - #Layout - self.hbox = QtGui.QHBoxLayout() - self.hbox.addWidget(self.note) - - self.grid = QtGui.QGridLayout() - self.grid.addChildLayout(self.hbox) - - - self.grid.addWidget(self.workspace_label,2,0) - self.grid.addWidget(self.worspace_loc, 2, 1) - self.grid.addWidget(self.browsebtn, 2, 2) - self.grid.addWidget(self.okbtn,3,2) - self.grid.addWidget(self.cancelbtn,3,3) - self.setLayout(self.grid) - - self.setGeometry(QtCore.QRect(200,200,400,400)) + self.grid.addWidget(self.note, 0,0,1,15) + self.grid.addWidget(self.workspace_label, 2,1) + self.grid.addWidget(self.workspace_loc,2,2,2,12) + self.grid.addWidget(self.browsebtn, 2,14) + self.grid.addWidget(self.okbtn, 4,13) + self.grid.addWidget(self.cancelbtn, 4,14) + + self.setGeometry(QtCore.QRect(400,200,400,400)) + self.setMaximumSize(4000, 200) self.setWindowTitle("Workspace Launcher") #self.setWindowIcon(QtGui.QIcon('logo.png')) self.setWindowFlags(QtCore.Qt.WindowStaysOnTopHint) self.note.setReadOnly(True) + self.setLayout(self.grid) self.show() @@ -93,7 +81,7 @@ def defaultWorkspace(self): def createWorkspace(self): print "Create workspace is called" - self.create_workspace = str(self.worspace_loc.text()) + self.create_workspace = str(self.workspace_loc.text()) #Checking if Workspace already exist or not if os.path.isdir(self.create_workspace): print "Already present" @@ -102,13 +90,11 @@ def createWorkspace(self): else: os.mkdir(self.create_workspace) self.obj_appconfig.default_workspace["workspace"] = self.create_workspace - self.close() - - + self.close() def browseLocation(self): print "Browse Location called" self.workspace_directory = QtGui.QFileDialog.getExistingDirectory(self, "Browse Location",os.path.expanduser("~")) print "Path file :", self.workspace_directory - self.worspace_loc.setText(self.workspace_directory) + self.workspace_loc.setText(self.workspace_directory) \ No newline at end of file diff --git a/src/frontEnd/Workspace.pyc b/src/frontEnd/Workspace.pyc index 7a5776b8dc97d48f9a75fe1702bef408d2b2f780..e1072b0e4dc649e590c6db6aac87ca1db058f9e3 100644 GIT binary patch delta 1098 zcmZWnPfrt35TCd0cH8Z4yA&+YQb7?Ynt0HJAjFG_fdfit4IIg)Z-cwimTVsZjIoDa zJ(#?^@e`Q%Ei}=1GRBi1!gw>$ndu)J%y3YSy7`^9A?}xCdW*EjPWq< zLgYX+L2OijXp+|^kb`InBu<6B2z!JFt}CMniXe?)%W0OUA)0|`mh;lM4|mibt;|}v z@9Q#{8#gA0#tLhdu?4TPkEXC8nrGPoY4V){X+h8IPdk!xAk!dI&`VqrJQmVje&L6_ zTsX~w{eNK@WEQ0JzffV}U&R6+*fo$YNE`#B3q9T(f6(h7^C0(g&@=j@ErRq$`@1nb z?WGZg=d=uJWrVA|f9y9np;h`DgaoKpC-iM|tt$W^%u~RB3_^!OjzW@xOW`$o!Vi?a zMPsLc*+Dyg);aMT!NQJz+G;!v;_6MLYqXlmV%Xb%&_3VsFWRR{*@&Bd*g6YavVEp9 zB-c-lL#2XvSD6SqjHqoVP`hy$w3M&HcB_UAC>m@}sWiU!gII+P|G3{{D-PwL2Tgl~ zP=7ZcrfKRkoKP>NK5bAtU&@0}9tDc)u*X)=ZU!p8;O=|1prO>D`y>B6Y@Rmj;qySB zSS$LCb;qS8u&Cckf3f_{4P+pZ7kN=M@}fYOQ52piCJLg6h#zBK%nEw&!rT+CF)2LV zNxw5!u>7%J&ioQ3J!kvku6}9P%q3)N`m6mrwNBYR{VjVdRid=Q`XZ)>`q0_-sJ_N_ c;;Nv3SljxKGi9!3k{MUexSL{KKXEVq0<|K~4FCWD delta 1218 zcmZuwOKTHR6h3#JnLL_z+C1zdY870#uw96_X(@J5s+ledE-a}xm>Df2$(1G|1kE21 zu86pF;YJVye}sa9dsl+sN?eE=b>TTT$#h8N&U~D6zVDoS&$%=2D<7-2{xcO{x_Ir4 zeOViP)c^#5&)@;TP~o1YB6=iZsE8SfSY-Pe__i`);5(GgC~ANo2hKv@BA*CUB~+Al zOaj+nFy1ny_!Rgv;HQHC)p8m9iZZltF4c*mridE&C&tnt8;ouYW1}nsc!4G|)TaoX5E8}X z1h$O?PIo#Z3%vAS0{cLsq%sC{A@k#NO}?M7W2}u2Zf!-!wg7xKyv#*)lS|;&!w`Oy zCqbMF{nOMx;{ZEn=Kx^48%Nv?I=8!boARZx>^^1y9`fK3<2@p15M&9S61*d*ldebB zK0%e>H^Ey1{E@&z1$a8hKSsq_M%$%;d~R;oNi+_Fj{IhR*hrw=ZHX(b;GiWseHUF2 zCPKq)-4uf8#^zek+iLcMdqNoKxA%jdaL{OSzU%Q@Eg>J8mBpD+WWDX(;bS$4u=vQ6 z->owiova~b-o6l{Qr&iND7Rx*