Mercurial Repositories > Flask Project / file comparison
comparison: ProjectFlask/Project.py
ProjectFlask/Project.py
- changeset 6
- d491ccab7343
- parent 4
- e164b9ad3819
- child 7
- a140b2a8ba93
equal
deleted
inserted
replaced
| 5:550e5ea385cb | 6:d491ccab7343 |
|---|---|
| 83 """<p>Starts the Flask Web server.</p>""" | 83 """<p>Starts the Flask Web server.</p>""" |
| 84 )) | 84 )) |
| 85 self.runServerAct.triggered.connect(self.__runServer) | 85 self.runServerAct.triggered.connect(self.__runServer) |
| 86 self.actions.append(self.runServerAct) | 86 self.actions.append(self.runServerAct) |
| 87 | 87 |
| 88 self.runDevServerAct = E5Action( | |
| 89 self.tr('Run Development Server'), | |
| 90 self.tr('Run &Development Server'), | |
| 91 0, 0, | |
| 92 self, 'flask_run_dev_server') | |
| 93 self.runDevServerAct.setStatusTip(self.tr( | |
| 94 'Starts the Flask Web server in development mode')) | |
| 95 self.runDevServerAct.setWhatsThis(self.tr( | |
| 96 """<b>Run Development Server</b>""" | |
| 97 """<p>Starts the Flask Web server in development mode.</p>""" | |
| 98 )) | |
| 99 self.runDevServerAct.triggered.connect(self.__runDevelopmentServer) | |
| 100 self.actions.append(self.runDevServerAct) | |
| 101 | |
| 88 ################################## | 102 ################################## |
| 89 ## documentation action below ## | 103 ## documentation action below ## |
| 90 ################################## | 104 ################################## |
| 91 | 105 |
| 92 self.documentationAct = E5Action( | 106 self.documentationAct = E5Action( |
| 132 | 146 |
| 133 menu = QMenu(self.tr('&Flask'), self.__ui) | 147 menu = QMenu(self.tr('&Flask'), self.__ui) |
| 134 menu.setTearOffEnabled(True) | 148 menu.setTearOffEnabled(True) |
| 135 | 149 |
| 136 menu.addAction(self.runServerAct) | 150 menu.addAction(self.runServerAct) |
| 151 menu.addAction(self.runDevServerAct) | |
| 137 menu.addSeparator() | 152 menu.addSeparator() |
| 138 menu.addAction(self.documentationAct) | 153 menu.addAction(self.documentationAct) |
| 139 menu.addSeparator() | 154 menu.addSeparator() |
| 140 menu.addAction(self.aboutFlaskAct) | 155 menu.addAction(self.aboutFlaskAct) |
| 141 | 156 |
| 173 | 188 |
| 174 def projectClosed(self): | 189 def projectClosed(self): |
| 175 """ | 190 """ |
| 176 Public method to handle the closing of a project. | 191 Public method to handle the closing of a project. |
| 177 """ | 192 """ |
| 193 if self.__serverDialog is not None: | |
| 194 self.__serverDialog.close() | |
| 178 ## if self.__serverProc is not None: | 195 ## if self.__serverProc is not None: |
| 179 ## self.__serverProcFinished() | 196 ## self.__serverProcFinished() |
| 180 | 197 |
| 181 def supportedPythonVariants(self): | 198 def supportedPythonVariants(self): |
| 182 """ | 199 """ |
| 382 | 399 |
| 383 ################################################################## | 400 ################################################################## |
| 384 ## slots below implement run functions | 401 ## slots below implement run functions |
| 385 ################################################################## | 402 ################################################################## |
| 386 | 403 |
| 387 # TODO: does the flask server support logging? | 404 @pyqtSlot() |
| 388 def __runServer(self, logging=False): | 405 def __runServer(self, development=False): |
| 389 """ | 406 """ |
| 390 Private slot to start the Flask Web server. | 407 Private slot to start the Flask Web server. |
| 391 | 408 |
| 392 @param logging flag indicating to enable logging | 409 @param development flag indicating development mode |
| 393 @type bool | 410 @type bool |
| 394 """ | 411 """ |
| 395 # TODO: implement this (flask run) | 412 if self.__serverDialog is not None: |
| 396 workdir, env = self.prepareRuntimeEnvironment() | 413 self.__serverDialog.close() |
| 397 if env is not None: | 414 |
| 398 cmd = self.getFlaskCommand() | 415 dlg = RunServerDialog(self.__plugin) |
| 399 | 416 if dlg.startServer(self, development=development): |
| 400 dlg = RunServerDialog() | 417 dlg.show() |
| 401 if dlg.startServer(cmd, workdir, env): | 418 self.__serverDialog = dlg |
| 402 dlg.show() | 419 |
| 403 self.__serverDialog = dlg | 420 @pyqtSlot() |
| 404 | 421 def __runDevelopmentServer(self): |
| 405 def __runDevelopmentServer(self, logging=False): | |
| 406 """ | 422 """ |
| 407 Private slot to start the Flask Web server in development mode. | 423 Private slot to start the Flask Web server in development mode. |
| 408 | 424 """ |
| 409 @param logging flag indicating to enable logging | 425 self.__runServer(development=True) |
| 410 @type bool | 426 |
| 411 """ | 427 # TODO: add method to start a server with parameters |
| 412 # TODO: implement this (flask run with FLASK_ENV=development) | |
| 413 | 428 |
| 414 ## def __serverProcFinished(self): | 429 ## def __serverProcFinished(self): |
| 415 ## """ | 430 ## """ |
| 416 ## Private slot connected to the finished signal. | 431 ## Private slot connected to the finished signal. |
| 417 ## """ | 432 ## """ |
