diff options
-rwxr-xr-x | src/frontEnd/Application.py | 6 | ||||
-rw-r--r-- | src/frontEnd/Workspace.py | 1 | ||||
-rw-r--r-- | src/frontEnd/Workspace.pyc | bin | 3466 -> 3466 bytes | |||
-rw-r--r-- | src/images/closeProject.svg | 135 | ||||
-rw-r--r-- | src/images/newProject.svg | 209 | ||||
-rw-r--r-- | src/images/openProject.svg | 157 | ||||
-rw-r--r-- | src/projManagement/Validation.py | 25 | ||||
-rw-r--r-- | src/projManagement/newProject.py | 29 | ||||
-rw-r--r-- | src/projManagement/openProject.py | 9 |
9 files changed, 558 insertions, 13 deletions
diff --git a/src/frontEnd/Application.py b/src/frontEnd/Application.py index 0ef5b8b4..c454f6cc 100755 --- a/src/frontEnd/Application.py +++ b/src/frontEnd/Application.py @@ -58,15 +58,15 @@ class Application(QtGui.QMainWindow): def initActions(self): - self.newproj = QtGui.QAction(QtGui.QIcon('../images/default.png'),'<b>New Project</b>',self) + self.newproj = QtGui.QAction(QtGui.QIcon('../images/newProject.svg'),'<b>New Project</b>',self) self.newproj.setShortcut('Ctrl+N') self.newproj.triggered.connect(self.new_project) - self.openproj = QtGui.QAction(QtGui.QIcon('../images/default.png'),'<b>Open Project</b>',self) + self.openproj = QtGui.QAction(QtGui.QIcon('../images/openProject.svg'),'<b>Open Project</b>',self) self.openproj.setShortcut('Ctrl+O') self.openproj.triggered.connect(self.open_project) - self.exitproj = QtGui.QAction(QtGui.QIcon('../images/default.png'),'<b>Exit</b>',self) + self.exitproj = QtGui.QAction(QtGui.QIcon('../images/closeProject.svg'),'<b>Exit</b>',self) self.exitproj.setShortcut('Ctrl+X') self.exitproj.triggered.connect(self.exit_project) diff --git a/src/frontEnd/Workspace.py b/src/frontEnd/Workspace.py index 921e0a56..e52801e7 100644 --- a/src/frontEnd/Workspace.py +++ b/src/frontEnd/Workspace.py @@ -96,7 +96,6 @@ class Workspace(QtGui.QWidget): self.create_workspace = str(self.worspace_loc.text()) if os.path.isdir(self.create_workspace): - pass print "Already present" self.obj.default_workspace["workspace"] = self.create_workspace diff --git a/src/frontEnd/Workspace.pyc b/src/frontEnd/Workspace.pyc Binary files differindex d2010c9f..a1d59398 100644 --- a/src/frontEnd/Workspace.pyc +++ b/src/frontEnd/Workspace.pyc diff --git a/src/images/closeProject.svg b/src/images/closeProject.svg new file mode 100644 index 00000000..bbb88abd --- /dev/null +++ b/src/images/closeProject.svg @@ -0,0 +1,135 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<!-- Created with Inkscape (http://www.inkscape.org/) --> + +<svg + xmlns:dc="http://purl.org/dc/elements/1.1/" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns="http://www.w3.org/2000/svg" + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" + width="60" + height="60" + id="svg6517" + version="1.1" + inkscape:version="0.48.3.1 r9886" + sodipodi:docname="Open_project.svg"> + <defs + id="defs6519" /> + <sodipodi:namedview + id="base" + pagecolor="#ffffff" + bordercolor="#666666" + borderopacity="1.0" + inkscape:pageopacity="0.0" + inkscape:pageshadow="2" + inkscape:zoom="5.3172361" + inkscape:cx="36.473992" + inkscape:cy="29.966184" + inkscape:document-units="px" + inkscape:current-layer="layer1" + showgrid="false" + inkscape:window-width="1366" + inkscape:window-height="690" + inkscape:window-x="0" + inkscape:window-y="25" + inkscape:window-maximized="1" /> + <metadata + id="metadata6522"> + <rdf:RDF> + <cc:Work + rdf:about=""> + <dc:format>image/svg+xml</dc:format> + <dc:type + rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> + <dc:title></dc:title> + </cc:Work> + </rdf:RDF> + </metadata> + <g + inkscape:label="Layer 1" + inkscape:groupmode="layer" + id="layer1" + transform="translate(0,-992.36218)"> + <g + transform="translate(-287.7881,815.08771)" + id="g6467"> + <rect + ry="3.901917" + rx="3.9370589" + y="182.08542" + x="288.90564" + height="50.378098" + width="57.764912" + id="rect13967" + style="fill:#b7bec8;fill-opacity:1;stroke:none" /> + <path + style="fill:#808000;stroke:#000000;stroke-width:1.43124235px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" + d="m 305.29932,205.74585 14.54069,4.03363 c 1.74148,0.54188 3.84788,0.36793 5.04492,-0.97784 l 6.97573,-8.0926 c 3.84227,-4.81215 6.19695,-5.9165 4.89051,-6.92602 l -16.30615,-2.79287 c -3.72892,-0.63186 -3.73528,-0.75989 -5.78853,1.48112 l -10.30341,10.23319 c -1.88658,1.63675 -2.60695,2.35152 0.94624,3.04139 z" + id="path13997" + inkscape:connector-curvature="0" + sodipodi:nodetypes="ccccccccc" /> + <path + style="fill:none;stroke:#000000;stroke-width:1.43124235px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" + d="m 302.96421,204.39807 c -1.7962,4.64693 -1.52218,7.45364 0.73864,8.49432 l 0,0 19.20457,5.53978 13.29547,-15.51139 0,0 c 0.5231,-1.53904 1.0038,-3.16287 0.36933,-7.01705 l -0.36933,1.10795" + id="path13999" + inkscape:connector-curvature="0" + sodipodi:nodetypes="cccccccc" /> + <path + style="fill:none;stroke:#000000;stroke-width:1.43124235px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" + d="m 303.10203,212.58553 c -1.60566,2.43652 -0.63209,5.01275 0.60082,6.9546 l 0,0 20.31252,7.01705 0,0 12.18752,-14.03411 0,0 c 0.7925,-3.01322 0.98164,-6.17727 0.20027,-9.58395" + id="path14001" + inkscape:connector-curvature="0" + sodipodi:nodetypes="cccccccc" /> + <path + style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" + d="m 322.00798,210.20431 0.516,8.35036" + id="path14003" + inkscape:connector-curvature="0" + sodipodi:nodetypes="cc" /> + <path + style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" + d="m 323.59452,218.07289 0.55456,8.16407" + id="path14005" + inkscape:connector-curvature="0" + sodipodi:nodetypes="cc" /> + <path + style="fill:#e3dbdb;fill-opacity:1;stroke:none" + d="m 324.59378,224.08854 c -0.0451,-0.28526 -0.15736,-1.72966 -0.24937,-3.20978 l -0.16729,-2.69113 5.85757,-6.83017 5.85757,-6.83018 0.10455,0.6972 c 0.16631,1.10902 -0.0494,4.88726 -0.34307,6.00857 -0.26032,0.99401 -0.29236,1.03509 -5.30028,6.79513 -2.77111,3.18729 -5.18221,5.97146 -5.35799,6.18705 l -0.31961,0.39197 -0.0821,-0.51866 z" + id="path14007" + inkscape:connector-curvature="0" /> + <path + style="fill:#e3dbdb;fill-opacity:1;stroke:none" + d="m 322.96743,216.2106 c -0.0485,-0.43507 -0.12632,-1.62459 -0.17298,-2.64338 -0.0467,-1.01879 -0.11525,-2.0524 -0.15241,-2.29691 -0.0652,-0.42894 -0.0374,-0.45345 0.79252,-0.69735 0.47305,-0.13903 1.10461,-0.44711 1.40348,-0.68462 0.29886,-0.23751 2.08537,-2.22431 3.97001,-4.41512 6.95386,-8.08353 6.98402,-8.11661 7.14257,-7.83331 0.20702,0.36993 0.0373,3.25936 -0.24416,4.15573 -0.19986,0.63659 -1.14746,1.81546 -6.25358,7.77985 -3.30991,3.86627 -6.10336,7.1188 -6.20766,7.22786 -0.15548,0.16256 -0.20552,0.0558 -0.27779,-0.59275 l 0,0 z" + id="path14009" + inkscape:connector-curvature="0" /> + <path + style="fill:#6c5353;fill-opacity:1;stroke:none" + d="m 312.71913,214.67674 c -8.59551,-2.49035 -8.90698,-2.59315 -9.36395,-3.09047 -0.61756,-0.67208 -0.84513,-1.54262 -0.72178,-2.76105 0.1466,-1.44816 0.54867,-2.8392 0.7935,-2.74525 0.11109,0.0426 0.74379,0.21584 1.406,0.38492 0.6622,0.16907 4.0412,1.09679 7.50887,2.06159 6.56488,1.82652 7.72699,2.13499 8.61673,2.28721 l 0.53362,0.0913 0.0991,1.81273 c 0.0545,0.997 0.14098,2.42956 0.19215,3.18347 0.0531,0.78187 0.0359,1.36662 -0.04,1.36116 -0.0732,-0.005 -4.13408,-1.16879 -9.02427,-2.5856 z" + id="path14011" + inkscape:connector-curvature="0" /> + <path + style="fill:#6c5353;fill-opacity:1;stroke:none" + d="m 316.27563,223.04794 c -3.74915,-1.29821 -8.00091,-2.77061 -9.44837,-3.27199 l -2.63174,-0.91159 -0.42867,-0.90737 c -0.60025,-1.27053 -0.79659,-2.34655 -0.60884,-3.33658 0.0832,-0.4385 0.1512,-0.82151 0.1512,-0.85113 0,-0.14514 1.05298,0.1415 10.07917,2.74368 l 9.70388,2.79755 0.1722,2.27788 c 0.23685,3.13316 0.23924,3.83538 0.013,3.82689 -0.10188,-0.004 -3.25272,-1.06912 -7.00187,-2.36734 l 0,0 z" + id="path14013" + inkscape:connector-curvature="0" /> + <path + style="fill:#aaeeff;stroke:#000000;stroke-width:1px;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1" + d="m 317.22279,194.12723 -2.35714,2.35714 13.17227,2.35714 3.18908,-2.91176 z" + id="path14015" + inkscape:connector-curvature="0" /> + <path + inkscape:connector-curvature="0" + id="path14063" + d="m 329.37152,212.52774 c -0.3515,-3.86189 -0.71526,-7.09194 -0.80837,-7.1779 -0.0931,-0.0859 -4.73334,-1.36502 -10.31161,-2.84238 -5.57828,-1.47735 -10.26051,-2.74879 -10.40494,-2.82542 -0.17829,-0.0946 0.20311,-0.55325 1.18783,-1.42841 l 1.45046,-1.28908 10.27298,2.80748 c 5.65015,1.5441 10.32097,2.87821 10.37959,2.96468 0.0586,0.0864 0.36389,3.15162 0.67836,6.81145 0.31447,3.65982 0.61799,6.85676 0.67448,7.1043 0.0786,0.3441 -0.17206,0.73816 -1.06422,1.67348 -0.64181,0.67288 -1.22286,1.22341 -1.29121,1.22341 -0.0683,0 -0.41186,-3.15972 -0.76335,-7.02161 l 0,0 z" + style="fill:#d40000;fill-opacity:1;stroke:#bb000b;stroke-width:0.40569299;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" /> + <path + sodipodi:nodetypes="ccscccscsccc" + style="fill:#d40000;fill-opacity:1;stroke:#bb000b;stroke-width:0.40569299;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" + d="m 311.72027,216.03845 c 0.3515,-4.15267 0.71526,-7.68364 0.80837,-7.84663 0.0931,-0.16292 4.73334,-5.28074 10.31161,-11.37279 5.57828,-6.09205 5.74076,-4.89003 5.88519,-5.08615 0.17829,-0.24209 -0.20311,-0.38522 -1.18783,-0.44576 l -1.45046,-0.0892 -5.75323,4.95904 c -6.36399,5.48549 -10.32097,11.41637 -10.37959,11.55133 -0.0586,0.13488 -0.36389,3.45265 -0.67836,7.37263 -0.31447,3.91997 0.34366,5.7332 0.28717,7.46994 l 3.02858,0.85217 c -0.92733,-4.33612 -1.84099,-1.31065 -0.87145,-7.36458 z" + id="path14065" + inkscape:connector-curvature="0" /> + </g> + </g> +</svg> diff --git a/src/images/newProject.svg b/src/images/newProject.svg new file mode 100644 index 00000000..74b69c40 --- /dev/null +++ b/src/images/newProject.svg @@ -0,0 +1,209 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<!-- Created with Inkscape (http://www.inkscape.org/) --> + +<svg + xmlns:dc="http://purl.org/dc/elements/1.1/" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns="http://www.w3.org/2000/svg" + xmlns:xlink="http://www.w3.org/1999/xlink" + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" + width="60" + height="60" + id="svg6517" + version="1.1" + inkscape:version="0.48.3.1 r9886" + sodipodi:docname="New document 37"> + <defs + id="defs6519"> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient13671" + id="linearGradient14124" + gradientUnits="userSpaceOnUse" + x1="-1023.1367" + y1="239.39217" + x2="-1010.869" + y2="228.60242" /> + <linearGradient + inkscape:collect="always" + id="linearGradient13671"> + <stop + style="stop-color:#ffff00;stop-opacity:1;" + offset="0" + id="stop13673" /> + <stop + style="stop-color:#ffff00;stop-opacity:0;" + offset="1" + id="stop13675" /> + </linearGradient> + </defs> + <sodipodi:namedview + id="base" + pagecolor="#ffffff" + bordercolor="#666666" + borderopacity="1.0" + inkscape:pageopacity="0.0" + inkscape:pageshadow="2" + inkscape:zoom="5.3172361" + inkscape:cx="36.473992" + inkscape:cy="29.966184" + inkscape:document-units="px" + inkscape:current-layer="layer1" + showgrid="false" + inkscape:window-width="1366" + inkscape:window-height="690" + inkscape:window-x="0" + inkscape:window-y="25" + inkscape:window-maximized="1" /> + <metadata + id="metadata6522"> + <rdf:RDF> + <cc:Work + rdf:about=""> + <dc:format>image/svg+xml</dc:format> + <dc:type + rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> + <dc:title></dc:title> + </cc:Work> + </rdf:RDF> + </metadata> + <g + inkscape:label="Layer 1" + inkscape:groupmode="layer" + id="layer1" + transform="translate(0,-992.36218)"> + <g + transform="translate(-99.876802,810.52356)" + id="g6431"> + <rect + ry="3.901917" + rx="3.9370589" + y="186.64957" + x="100.99435" + height="50.378098" + width="57.764912" + id="rect13831" + style="fill:#b7bec8;fill-opacity:1;stroke:none" /> + <g + transform="translate(-38.570504,44.965759)" + id="g13849"> + <path + style="fill:#808000;stroke:#000000;stroke-width:1.43124235px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" + d="m 158.52793,164.04502 14.54069,4.03363 c 1.74148,0.54188 3.84788,0.36793 5.04492,-0.97784 l 6.97573,-8.0926 c 3.84227,-4.81215 6.19695,-5.9165 4.89051,-6.92602 l -16.30615,-2.79287 c -3.72892,-0.63186 -3.73528,-0.75989 -5.78853,1.48112 l -10.30341,10.23319 c -1.88658,1.63675 -2.60695,2.35152 0.94624,3.04139 z" + id="path13821" + inkscape:connector-curvature="0" + sodipodi:nodetypes="ccccccccc" /> + <path + style="fill:none;stroke:#000000;stroke-width:1.43124235px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" + d="m 156.19282,162.69724 c -1.7962,4.64693 -1.52218,7.45364 0.73864,8.49432 l 0,0 19.20457,5.53978 13.29547,-15.51139 0,0 c 0.5231,-1.53904 1.0038,-3.16287 0.36933,-7.01705 l -0.36933,1.10795" + id="path13823" + inkscape:connector-curvature="0" + sodipodi:nodetypes="cccccccc" /> + <path + style="fill:none;stroke:#000000;stroke-width:1.43124235px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" + d="m 156.33064,170.8847 c -1.60566,2.43652 -0.63209,5.01275 0.60082,6.9546 l 0,0 20.31252,7.01705 0,0 12.18752,-14.03411 0,0 c 0.7925,-3.01322 0.98164,-6.17727 0.20027,-9.58395" + id="path13825" + inkscape:connector-curvature="0" + sodipodi:nodetypes="cccccccc" /> + <path + style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" + d="m 175.23659,168.50348 0.516,8.35036" + id="path13827" + inkscape:connector-curvature="0" + sodipodi:nodetypes="cc" /> + <path + style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" + d="m 176.82313,176.37206 0.55456,8.16407" + id="path13829" + inkscape:connector-curvature="0" + sodipodi:nodetypes="cc" /> + <path + style="fill:#e3dbdb;fill-opacity:1;stroke:none" + d="m 177.82239,182.38771 c -0.0451,-0.28526 -0.15736,-1.72966 -0.24937,-3.20978 l -0.16729,-2.69113 5.85757,-6.83017 5.85757,-6.83018 0.10455,0.6972 c 0.16631,1.10902 -0.0494,4.88726 -0.34307,6.00857 -0.26032,0.99401 -0.29236,1.03509 -5.30028,6.79513 -2.77111,3.18729 -5.18221,5.97146 -5.35799,6.18705 l -0.31961,0.39197 -0.0821,-0.51866 z" + id="path13839" + inkscape:connector-curvature="0" /> + <path + style="fill:#e3dbdb;fill-opacity:1;stroke:none" + d="m 176.19604,174.50977 c -0.0485,-0.43507 -0.12632,-1.62459 -0.17298,-2.64338 -0.0467,-1.01879 -0.11525,-2.0524 -0.15241,-2.29691 -0.0652,-0.42894 -0.0374,-0.45345 0.79252,-0.69735 0.47305,-0.13903 1.10461,-0.44711 1.40348,-0.68462 0.29886,-0.23751 2.08537,-2.22431 3.97001,-4.41512 6.95386,-8.08353 6.98402,-8.11661 7.14257,-7.83331 0.20702,0.36993 0.0373,3.25936 -0.24416,4.15573 -0.19986,0.63659 -1.14746,1.81546 -6.25358,7.77985 -3.30991,3.86627 -6.10336,7.1188 -6.20766,7.22786 -0.15548,0.16256 -0.20552,0.0558 -0.27779,-0.59275 l 0,0 z" + id="path13841" + inkscape:connector-curvature="0" /> + <path + style="fill:#6c5353;fill-opacity:1;stroke:none" + d="m 165.94774,172.97591 c -8.59551,-2.49035 -8.90698,-2.59315 -9.36395,-3.09047 -0.61756,-0.67208 -0.84513,-1.54262 -0.72178,-2.76105 0.1466,-1.44816 0.54867,-2.8392 0.7935,-2.74525 0.11109,0.0426 0.74379,0.21584 1.406,0.38492 0.6622,0.16907 4.0412,1.09679 7.50887,2.06159 6.56488,1.82652 7.72699,2.13499 8.61673,2.28721 l 0.53362,0.0913 0.0991,1.81273 c 0.0545,0.997 0.14098,2.42956 0.19215,3.18347 0.0531,0.78187 0.0359,1.36662 -0.04,1.36116 -0.0732,-0.005 -4.13408,-1.16879 -9.02427,-2.5856 z" + id="path13843" + inkscape:connector-curvature="0" /> + <path + style="fill:#6c5353;fill-opacity:1;stroke:none" + d="m 169.50424,181.34711 c -3.74915,-1.29821 -8.00091,-2.77061 -9.44837,-3.27199 l -2.63174,-0.91159 -0.42867,-0.90737 c -0.60025,-1.27053 -0.79659,-2.34655 -0.60884,-3.33658 0.0832,-0.4385 0.1512,-0.82151 0.1512,-0.85113 0,-0.14514 1.05298,0.1415 10.07917,2.74368 l 9.70388,2.79755 0.1722,2.27788 c 0.23685,3.13316 0.23924,3.83538 0.013,3.82689 -0.10188,-0.004 -3.25272,-1.06912 -7.00187,-2.36734 l 0,0 z" + id="path13845" + inkscape:connector-curvature="0" /> + <path + style="fill:#aaeeff;stroke:#000000;stroke-width:1px;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1" + d="m 170.4514,152.4264 -2.35714,2.35714 13.17227,2.35714 3.18908,-2.91176 z" + id="path13847" + inkscape:connector-curvature="0" /> + <g + transform="matrix(1.2655206,0,0,1.2655206,15.837959,23.851019)" + id="g13704"> + <path + transform="matrix(0.78386214,0,0,0.78386214,908.43667,-75.275943)" + d="m -1007.035,235.07721 c 0,5.66783 -4.5947,10.26251 -10.2625,10.26251 -5.6678,0 -10.2625,-4.59468 -10.2625,-10.26251 0,-5.66783 4.5947,-10.26251 10.2625,-10.26251 5.6678,0 10.2625,4.59468 10.2625,10.26251 z" + sodipodi:ry="10.262513" + sodipodi:rx="10.262513" + sodipodi:cy="235.07721" + sodipodi:cx="-1017.2975" + id="path13706" + style="fill:#ffffff;fill-opacity:1;stroke:none" + sodipodi:type="arc" /> + <path + transform="matrix(0.72543762,0,0,0.72543762,848.80169,-61.541671)" + d="m -1007.035,235.07721 c 0,5.66783 -4.5947,10.26251 -10.2625,10.26251 -5.6678,0 -10.2625,-4.59468 -10.2625,-10.26251 0,-5.66783 4.5947,-10.26251 10.2625,-10.26251 5.6678,0 10.2625,4.59468 10.2625,10.26251 z" + sodipodi:ry="10.262513" + sodipodi:rx="10.262513" + sodipodi:cy="235.07721" + sodipodi:cx="-1017.2975" + id="path13708" + style="fill:#d45500;fill-opacity:1;stroke:none" + sodipodi:type="arc" /> + <path + sodipodi:type="arc" + style="fill:url(#linearGradient14124);fill-opacity:1;stroke:none" + id="path13710" + sodipodi:cx="-1017.2975" + sodipodi:cy="235.07721" + sodipodi:rx="10.262513" + sodipodi:ry="10.262513" + d="m -1007.035,235.07721 c 0,5.66783 -4.5947,10.26251 -10.2625,10.26251 -5.6678,0 -10.2625,-4.59468 -10.2625,-10.26251 0,-5.66783 4.5947,-10.26251 10.2625,-10.26251 5.6678,0 10.2625,4.59468 10.2625,10.26251 z" + transform="matrix(0.72543762,0,0,0.72543762,848.80169,-61.541671)" /> + <g + transform="matrix(0.72543762,0,0,0.72543762,753.60342,-62.115604)" + id="g13712"> + <path + inkscape:connector-curvature="0" + id="path13714" + d="m -893.90378,235.63639 16.05206,0" + style="fill:#0000ff;stroke:#0000ff;stroke-width:2.01052642;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" /> + <path + style="fill:#0000ff;stroke:#0000ff;stroke-width:2.02110839;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" + d="m -885.87775,227.61036 0,16.05206" + id="path13716" + inkscape:connector-curvature="0" /> + </g> + <path + transform="matrix(0.78114787,0,0,0.78114787,905.78997,-74.808572)" + d="m -1007.035,235.07721 c 0,5.66783 -4.5947,10.26251 -10.2625,10.26251 -5.6678,0 -10.2625,-4.59468 -10.2625,-10.26251 0,-5.66783 4.5947,-10.26251 10.2625,-10.26251 5.6678,0 10.2625,4.59468 10.2625,10.26251 z" + sodipodi:ry="10.262513" + sodipodi:rx="10.262513" + sodipodi:cy="235.07721" + sodipodi:cx="-1017.2975" + id="path13718" + style="fill:none;stroke:#510b0b;stroke-opacity:0.8244681" + sodipodi:type="arc" /> + </g> + </g> + </g> + </g> +</svg> diff --git a/src/images/openProject.svg b/src/images/openProject.svg new file mode 100644 index 00000000..f36ee982 --- /dev/null +++ b/src/images/openProject.svg @@ -0,0 +1,157 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<!-- Created with Inkscape (http://www.inkscape.org/) --> + +<svg + xmlns:dc="http://purl.org/dc/elements/1.1/" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns="http://www.w3.org/2000/svg" + xmlns:xlink="http://www.w3.org/1999/xlink" + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" + width="60" + height="60" + id="svg6517" + version="1.1" + inkscape:version="0.48.3.1 r9886" + sodipodi:docname="New_project.svg"> + <defs + id="defs6519"> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient13671" + id="linearGradient14124" + gradientUnits="userSpaceOnUse" + x1="-1023.1367" + y1="239.39217" + x2="-1010.869" + y2="228.60242" /> + <linearGradient + inkscape:collect="always" + id="linearGradient13671"> + <stop + style="stop-color:#ffff00;stop-opacity:1;" + offset="0" + id="stop13673" /> + <stop + style="stop-color:#ffff00;stop-opacity:0;" + offset="1" + id="stop13675" /> + </linearGradient> + </defs> + <sodipodi:namedview + id="base" + pagecolor="#ffffff" + bordercolor="#666666" + borderopacity="1.0" + inkscape:pageopacity="0.0" + inkscape:pageshadow="2" + inkscape:zoom="5.3172361" + inkscape:cx="36.473992" + inkscape:cy="29.966184" + inkscape:document-units="px" + inkscape:current-layer="layer1" + showgrid="false" + inkscape:window-width="1366" + inkscape:window-height="690" + inkscape:window-x="0" + inkscape:window-y="25" + inkscape:window-maximized="1" /> + <metadata + id="metadata6522"> + <rdf:RDF> + <cc:Work + rdf:about=""> + <dc:format>image/svg+xml</dc:format> + <dc:type + rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> + <dc:title></dc:title> + </cc:Work> + </rdf:RDF> + </metadata> + <g + inkscape:label="Layer 1" + inkscape:groupmode="layer" + id="layer1" + transform="translate(0,-992.36218)"> + <g + id="g6653" + transform="translate(-16.452709,14.007824)"> + <g + id="g6453" + transform="translate(-177.52246,798.31105)"> + <rect + ry="3.901917" + rx="3.9370589" + y="184.29005" + x="195.09271" + height="50.378098" + width="57.764912" + id="rect13871" + style="fill:#b7bec8;fill-opacity:1;stroke:none" /> + <path + style="fill:#d7f4ee;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" + d="m 206.94328,209.10051 18.96836,4.93697 14.42116,-14.94084 -6.75586,-0.6496 -15.85028,-0.25984 z" + id="path13933" + inkscape:connector-curvature="0" /> + <path + sodipodi:nodetypes="ccccccccc" + inkscape:connector-curvature="0" + id="path13875" + d="m 208.62907,208.68 12.72169,-1.12241 c 2.48842,-0.28361 4.14946,-0.84985 5.55971,-2.08439 l 7.60293,-7.82636 c 4.33434,-4.95945 6.37718,-6.02297 6.08731,-6.42709 l -17.47554,2.96439 c -3.72892,0.53742 -3.99512,0.79915 -4.87909,1.3512 l -10.30341,10.23319 c -1.88658,1.63675 -2.86679,2.2216 0.6864,2.91147 z" + style="fill:#808000;stroke:#000000;stroke-width:1.43124235px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" /> + <path + sodipodi:nodetypes="cccccccc" + inkscape:connector-curvature="0" + id="path13877" + d="m 206.5538,207.46214 c -1.7962,4.64693 -1.52218,7.45364 0.73864,8.49432 l 0,0 19.20457,5.53978 13.29547,-15.51139 0,0 c 0.5231,-1.53904 1.0038,-3.16287 0.36933,-7.01705 l -0.36933,1.10795" + style="fill:none;stroke:#000000;stroke-width:1.43124235px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" /> + <path + sodipodi:nodetypes="cccccccc" + inkscape:connector-curvature="0" + id="path13879" + d="m 206.69162,215.6496 c -1.60566,2.43652 -0.63209,5.01275 0.60082,6.9546 l 0,0 20.31252,7.01705 0,0 12.18752,-14.03411 0,0 c 0.7925,-3.01322 0.98164,-6.17727 0.20027,-9.58395" + style="fill:none;stroke:#000000;stroke-width:1.43124235px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" /> + <path + sodipodi:nodetypes="cc" + inkscape:connector-curvature="0" + id="path13881" + d="m 225.59757,213.26838 0.516,8.35036" + style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" /> + <path + sodipodi:nodetypes="cc" + inkscape:connector-curvature="0" + id="path13883" + d="m 227.18411,221.13696 0.55456,8.16407" + style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" /> + <path + inkscape:connector-curvature="0" + id="path13885" + d="m 228.18337,227.15261 c -0.0451,-0.28526 -0.15736,-1.72966 -0.24937,-3.20978 l -0.16729,-2.69113 5.85757,-6.83017 5.85757,-6.83018 0.10455,0.6972 c 0.16631,1.10902 -0.0494,4.88726 -0.34307,6.00857 -0.26032,0.99401 -0.29236,1.03509 -5.30028,6.79513 -2.77111,3.18729 -5.18221,5.97146 -5.35799,6.18705 l -0.31961,0.39197 -0.0821,-0.51866 z" + style="fill:#e3dbdb;fill-opacity:1;stroke:none" /> + <path + inkscape:connector-curvature="0" + id="path13887" + d="m 226.55702,219.27467 c -0.0485,-0.43507 -0.12632,-1.62459 -0.17298,-2.64338 -0.0467,-1.01879 -0.11525,-2.0524 -0.15241,-2.29691 -0.0652,-0.42894 -0.0374,-0.45345 0.79252,-0.69735 0.47305,-0.13903 1.10461,-0.44711 1.40348,-0.68462 0.29886,-0.23751 2.08537,-2.22431 3.97001,-4.41512 6.95386,-8.08353 6.98402,-8.11661 7.14257,-7.83331 0.20702,0.36993 0.0373,3.25936 -0.24416,4.15573 -0.19986,0.63659 -1.14746,1.81546 -6.25358,7.77985 -3.30991,3.86627 -6.10336,7.1188 -6.20766,7.22786 -0.15548,0.16256 -0.20552,0.0558 -0.27779,-0.59275 l 0,0 z" + style="fill:#e3dbdb;fill-opacity:1;stroke:none" /> + <path + inkscape:connector-curvature="0" + id="path13889" + d="m 216.30872,217.74081 c -8.59551,-2.49035 -8.90698,-2.59315 -9.36395,-3.09047 -0.61756,-0.67208 -0.84513,-1.54262 -0.72178,-2.76105 0.1466,-1.44816 0.54867,-2.8392 0.7935,-2.74525 0.11109,0.0426 0.74379,0.21584 1.406,0.38492 0.6622,0.16907 4.0412,1.09679 7.50887,2.06159 6.56488,1.82652 7.72699,2.13499 8.61673,2.28721 l 0.53362,0.0913 0.0991,1.81273 c 0.0545,0.997 0.14098,2.42956 0.19215,3.18347 0.0531,0.78187 0.0359,1.36662 -0.04,1.36116 -0.0732,-0.005 -4.13408,-1.16879 -9.02427,-2.5856 z" + style="fill:#6c5353;fill-opacity:1;stroke:none" /> + <path + inkscape:connector-curvature="0" + id="path13891" + d="m 219.86522,226.11201 c -3.74915,-1.29821 -8.00091,-2.77061 -9.44837,-3.27199 l -2.63174,-0.91159 -0.42867,-0.90737 c -0.60025,-1.27053 -0.79659,-2.34655 -0.60884,-3.33658 0.0832,-0.4385 0.1512,-0.82151 0.1512,-0.85113 0,-0.14514 1.05298,0.1415 10.07917,2.74368 l 9.70388,2.79755 0.1722,2.27788 c 0.23685,3.13316 0.23924,3.83538 0.013,3.82689 -0.10188,-0.004 -3.25272,-1.06912 -7.00187,-2.36734 l 0,0 z" + style="fill:#6c5353;fill-opacity:1;stroke:none" /> + <path + inkscape:connector-curvature="0" + id="path13893" + d="m 220.81238,197.1913 -2.35714,2.35714 12.00299,-1.28063 3.18908,-2.91176 z" + style="fill:#aaeeff;stroke:#000000;stroke-width:1px;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1" + sodipodi:nodetypes="ccccc" /> + </g> + </g> + </g> +</svg> diff --git a/src/projManagement/Validation.py b/src/projManagement/Validation.py index 70b29ab5..864ac448 100644 --- a/src/projManagement/Validation.py +++ b/src/projManagement/Validation.py @@ -17,6 +17,7 @@ # REVISION: --- #=============================================================================== import os +import re class Validation: @@ -24,17 +25,35 @@ class Validation: pass def validateOpenproj(self,proj_directory): - print "Valid open Proj called" + print "Validate openProj called" projName = os.path.basename(str(proj_directory)) lookProj = os.path.join(str(proj_directory),projName+".proj") + #Check existence of project if os.path.exists(lookProj): return True else: return False + + - def validateNewproj(self): - print "Valid new Proj called" + def validateNewproj(self,project_dir): + print "Validate newProj called" + print "Project Directory : ",project_dir + #Checking existence of project with same name + + if os.path.exists(project_dir): + return "CHECKEXIST" #Project with name already exist + else: + + #Check Proper name for project. It should not have space + + if re.search(r"\s",project_dir ): + return "CHECKNAME" + else: + return "VALID" + +
\ No newline at end of file diff --git a/src/projManagement/newProject.py b/src/projManagement/newProject.py index f7670033..146b0080 100644 --- a/src/projManagement/newProject.py +++ b/src/projManagement/newProject.py @@ -17,7 +17,9 @@ # REVISION: --- #=============================================================================== from PyQt4 import QtGui,QtCore - +from Validation import Validation +from configuration.Appconfig import Appconfig +import os class NewProjectInfo(QtGui.QWidget): """ @@ -26,6 +28,8 @@ class NewProjectInfo(QtGui.QWidget): def __init__(self): super(NewProjectInfo, self).__init__() + self.obj_validation = Validation() + self.obj_appconfig = Appconfig() def body(self): @@ -79,6 +83,29 @@ class NewProjectInfo(QtGui.QWidget): def createProject(self): print "Create Project Called" + self.workspace = self.obj_appconfig.default_workspace['workspace'] + self.projName = self.projEdit.text() + self.projName = str(self.projName).rstrip().lstrip() #Remove leading and trailing space + + self.project_dir = os.path.join(self.workspace,str(self.projName)) + + self.reply = self.obj_validation.validateNewproj(str(self.project_dir)) + + if self.reply == "VALID": + print "Validated : Creating project directory" + #create project directory + print "Check : ",self.project_dir + try: + os.mkdir(self.project_dir) + self.close() + except: + print "Some Thing Wrong" + + elif self.reply == "CHECKEXIST": + print "Project already exist" + + elif self.reply == "CHECKNAME": + print "Name is not proper" def cancelProject(self): self.close() diff --git a/src/projManagement/openProject.py b/src/projManagement/openProject.py index 6972b1ed..3bbdfc37 100644 --- a/src/projManagement/openProject.py +++ b/src/projManagement/openProject.py @@ -23,19 +23,18 @@ from configuration.Appconfig import Appconfig -class ProjectInfo: +class ProjectInfo(QtGui.QWidget): """ Class ProjectInfo accept model information from user """ def __init__(self): - pass + super(ProjectInfo, self).__init__() + self.obj_validation = Validation() def body(self): self.proj_directory = QtGui.QFileDialog.getExistingDirectory() - self.obj_validation = Validation() - - + if self.obj_validation.validateOpenproj(self.proj_directory) == True: print "Pass open project test" self.obj_Appconfig = Appconfig() |