diff --git a/b_asic/GUI/about_window.py b/b_asic/GUI/about_window.py index 0cb5fa7e3ee73eac015995592db86f4f8c3972c4..699e1b7cbbd8e1b1929ad7fe44df7b88238526ae 100644 --- a/b_asic/GUI/about_window.py +++ b/b_asic/GUI/about_window.py @@ -7,7 +7,7 @@ QUESTIONS = { "Moving operations": "To drag an operation, select the operation on the workspace and drag it around.", "Selecting operations": "To select one operation just press it once, it will then turn grey.", "Selecting multiple operations using dragging": "To select multiple operations using your mouse, \ndrag the mouse while pressing left mouse button, any operation under the selection box will then be selected.", - "Selecting multiple operations using without dragging": "To select mutliple operations using without dragging, \npress 'Ctrl+LMouseButton' on any operation. Alternatively press 'Ctrl+A' to select all operations.", + "Selecting multiple operations using without dragging": "To select mutliple operations using without dragging, \npress 'Ctrl+LMouseButton' on any operation.", "Remove operations": "To remove an operation, select the operation to be deleted, \nfinally press RMouseButton to bring up the context menu, then press 'Delete'.", "Remove multiple operations": "To remove multiple operations, \nselect all operations to be deleted and press 'Delete' on your keyboard.", "Connecting operations": "To connect operations, select the ports on the operation to connect from, \nthen select the next port by pressing 'Ctrl+LMouseButton' on the destination port. Tip: You can chain connection by selecting the ports in the order they should be connected.", @@ -41,7 +41,6 @@ class KeybindsWindow(QDialog): self.dialog_layout.addWidget(frame) keybinds_label = QLabel( - "'Ctrl+A' - Select all operations on the workspace.\n" "'Ctrl+R' - Reload the operation list to add any new operations created.\n" "'Ctrl+Q' - Quit the application.\n" "'Ctrl+LMouseButton' - On a operation will select the operation, without deselecting the other operations.\n" diff --git a/b_asic/GUI/main_window.py b/b_asic/GUI/main_window.py index b9841b319a2d688dfa2b58b13b6c587bcf8443e1..d9ff7e22d8914542c65382f8c1979df0fe42b779 100644 --- a/b_asic/GUI/main_window.py +++ b/b_asic/GUI/main_window.py @@ -72,8 +72,6 @@ class MainWindow(QMainWindow): self.shortcut_core = QShortcut(QKeySequence("Ctrl+R"), self.ui.operation_box) self.shortcut_core.activated.connect(self._refresh_operations_list_from_namespace) - self.shortcut_select_all = QShortcut(QKeySequence("Ctrl+A"), self.graphic_view) - self.shortcut_select_all.activated.connect(self._select_all_operations) self.scene.selectionChanged.connect(self._select_operations) self.move_button_index = 0 @@ -389,7 +387,7 @@ class MainWindow(QMainWindow): self._create_operation_item(item) def keyPressEvent(self, event): - if event.key() == Qt.Key_Delete: + if event.key() == Qt.Key_Delete or event.key() == Qt.Key_Control: for pressed_op in self.pressed_operations: pressed_op.remove() self.move_button_index -= 1 @@ -429,13 +427,6 @@ class MainWindow(QMainWindow): for signal in self.signalPortDict.keys(): signal.moveLine() - def _select_all_operations(self): - self.logger.info("Selecting all operations in the workspace.") - self.pressed_operations.clear() - for button in self.dragOperationSceneDict.keys(): - button._toggle_button(pressed=False) - self.pressed_operations.append(button) - def _select_operations(self): selected = [button.widget() for button in self.scene.selectedItems()] for button in selected: