diff options
Diffstat (limited to 'src/frontEnd')
| -rwxr-xr-x | src/frontEnd/DockArea.py | 65 | ||||
| -rw-r--r-- | src/frontEnd/TerminalUi.ui | 2 |
2 files changed, 42 insertions, 25 deletions
diff --git a/src/frontEnd/DockArea.py b/src/frontEnd/DockArea.py index 7037dcfd..e8989e34 100755 --- a/src/frontEnd/DockArea.py +++ b/src/frontEnd/DockArea.py @@ -248,35 +248,52 @@ class DockArea(QtWidgets.QMainWindow): global count projDir = self.obj_appconfig.current_project["ProjectName"] - projName = os.path.basename(projDir) - dockName = f'Subcircuit-{projName}-' - self.subcktWidget = QtWidgets.QWidget() - self.subcktLayout = QtWidgets.QVBoxLayout() - self.subcktLayout.addWidget(Subcircuit(self)) + """ Checks projDir variable has valid value + & is not None before calling os.path.basename """ - self.subcktWidget.setLayout(self.subcktLayout) - dock[dockName + - str(count)] = QtWidgets.QDockWidget(dockName - + str(count)) - dock[dockName + str(count)] \ - .setWidget(self.subcktWidget) - self.addDockWidget(QtCore.Qt.TopDockWidgetArea, - dock[dockName + str(count)]) - self.tabifyDockWidget(dock['Welcome'], - dock[dockName + str(count)]) + if projDir is not None: + projName = os.path.basename(projDir) + dockName = f'Subcircuit-{projName}-' - # CSS - dock[dockName + str(count)].setStyleSheet(" \ - .QWidget { border-radius: 15px; border: 1px solid gray;\ - padding: 5px; width: 200px; height: 150px; } \ - ") + self.subcktWidget = QtWidgets.QWidget() + self.subcktLayout = QtWidgets.QVBoxLayout() + self.subcktLayout.addWidget(Subcircuit(self)) - dock[dockName + str(count)].setVisible(True) - dock[dockName + str(count)].setFocus() - dock[dockName + str(count)].raise_() + self.subcktWidget.setLayout(self.subcktLayout) + dock[dockName + + str(count)] = QtWidgets.QDockWidget(dockName + + str(count)) + dock[dockName + str(count)] \ + .setWidget(self.subcktWidget) + self.addDockWidget(QtCore.Qt.TopDockWidgetArea, + dock[dockName + str(count)]) + self.tabifyDockWidget(dock['Welcome'], + dock[dockName + str(count)]) - count = count + 1 + # CSS + dock[dockName + str(count)].setStyleSheet(" \ + .QWidget { border-radius: 15px; border: 1px solid gray;\ + padding: 5px; width: 200px; height: 150px; } \ + ") + + dock[dockName + str(count)].setVisible(True) + dock[dockName + str(count)].setFocus() + dock[dockName + str(count)].raise_() + + count = count + 1 + + else: + """ when projDir is None that is clicking on subcircuit icon + without any project selection """ + self.msg = QtWidgets.QErrorMessage() + self.msg.setModal(True) + self.msg.setWindowTitle("Error Message") + self.msg.showMessage( + 'Please select the project first.' + ' You can either create new project or open existing project' + ) + self.msg.exec_() def makerchip(self): """This function creates a widget for different subcircuit options.""" diff --git a/src/frontEnd/TerminalUi.ui b/src/frontEnd/TerminalUi.ui index 9039984d..403ac344 100644 --- a/src/frontEnd/TerminalUi.ui +++ b/src/frontEnd/TerminalUi.ui @@ -151,7 +151,7 @@ p, li { white-space: pre-wrap; } <p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><br /></p></body></html></string> </property> <property name="textInteractionFlags"> - <set>Qt::NoTextInteraction</set> + <set>Qt::LinksAccessibleByKeyboard|Qt::LinksAccessibleByMouse|Qt::TextBrowserInteraction|Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse</set> </property> </widget> </item> |