Small UI bug fixes to MSUI/MSCOlab UI

* Only one flighttrack/operation/inactive operation can be selected. * "Activate operation" is now disablked by default * Only one flighttrack/operation can be displayed in bold Fix #1756, #1755, #1752
Open-MSS · Apr 27, 2023 · b0c8a09 · b0c8a09
1 parent babb2ca
commit b0c8a09
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 18 deletions.
diff --git a/mslib/msui/mscolab.py b/mslib/msui/mscolab.py
@@ -448,6 +448,7 @@ def __init__(self, parent=None, data_dir=None):
         self.ui.usernameLabel.hide()
         self.ui.userOptionsTb.hide()
         self.ui.actionAddOperation.setEnabled(False)
+        self.ui.actionActivateOperation.setEnabled(False)
         self.hide_operation_options()
         self.ui.activeOperationDesc.setHidden(True)
 
@@ -1482,7 +1483,7 @@ def add_operations_to_ui(self):
                     self.ui.listOperationsMSC.setCurrentItem(selectedOperation)
                     self.ui.listOperationsMSC.itemActivated.emit(selectedOperation)
                 self.ui.listOperationsMSC.itemActivated.connect(self.set_active_op_id)
-                self.ui.listInactiveOperationsMSC.itemActivated.connect(self.select_inactive_operation)
+                self.ui.listInactiveOperationsMSC.itemClicked.connect(self.select_inactive_operation)
             else:
                 show_popup(self.ui, "Error", "Session expired, new login required")
                 self.logout()
@@ -1492,23 +1493,9 @@ def add_operations_to_ui(self):
 
     def select_inactive_operation(self, item):
         self.inactive_op_id = item.op_id
-        self.active_op_id = None
-        font = QtGui.QFont()
-        for i in range(self.ui.listInactiveOperationsMSC.count()):
-            self.ui.listInactiveOperationsMSC.item(i).setFont(font)
-        font.setBold(True)
-        item.setFont(font)
         self.show_operation_options_in_inactivated_state(item.access_level)
 
     def show_operation_options_in_inactivated_state(self, access_level):
-        self.ui.actionChat.setEnabled(False)
-        self.ui.actionVersionHistory.setEnabled(False)
-        self.ui.actionManageUsers.setEnabled(False)
-        self.ui.menuProperties.setEnabled(False)
-        self.ui.actionRenameOperation.setEnabled(False)
-        self.ui.actionLeaveOperation.setEnabled(False)
-        self.ui.actionDeleteOperation.setEnabled(False)
-        self.ui.actionUpdateOperationDesc.setEnabled(False)
         self.ui.actionActivateOperation.setEnabled(False)
         if access_level == "creator":
             self.ui.actionActivateOperation.setEnabled(True)

diff --git a/mslib/msui/msui.py b/mslib/msui/msui.py
@@ -457,9 +457,20 @@ def __init__(self, mscolab_data_dir=None, *args):
 
         self.shortcuts_dlg = None
 
-        # deactivate vice versa selection of Operation or Flight Track
-        self.listFlightTracks.itemClicked.connect(lambda: self.listOperationsMSC.setCurrentItem(None))
-        self.listOperationsMSC.itemClicked.connect(lambda: self.listFlightTracks.setCurrentItem(None))
+        # deactivate vice versa selection of Operation, inactive operation or Flight Track
+
+        def deselecter(list_a, list_b, disable):
+            list_a.setCurrentItem(None)
+            list_b.setCurrentItem(None)
+            if disable:
+                self.mscolab.ui.actionActivateOperation.setEnabled(False)
+
+        self.listFlightTracks.itemClicked.connect(
+            lambda: deselecter(self.listOperationsMSC, self.listInactiveOperationsMSC, True))
+        self.listOperationsMSC.itemClicked.connect(
+            lambda: deselecter(self.listFlightTracks, self.listInactiveOperationsMSC, True))
+        self.listInactiveOperationsMSC.itemClicked.connect(
+            lambda: deselecter(self.listFlightTracks, self.listOperationsMSC, False))
 
         # disable category until connected/login into mscolab
         self.filterCategoryCb.setEnabled(False)