Prechádzať zdrojové kódy

Merge remote-tracking branch 'origin/pr/263'

* origin/pr/263:
  Warn if trying to change layout on unsupported vms in Qube Manager
Marek Marczykowski-Górecki 4 rokov pred
rodič
commit
29da891728
1 zmenil súbory, kde vykonal 11 pridanie a 1 odobranie
  1. 11 1
      qubesmanager/qube_manager.py

+ 11 - 1
qubesmanager/qube_manager.py

@@ -1318,7 +1318,17 @@ class VmManagerWindow(ui_qubemanager.Ui_VmManagerWindow, QMainWindow):
     def action_set_keyboard_layout_triggered(self):
         # pylint: disable=invalid-name
         for vm_info in self.get_selected_vms():
-            vm_info.vm.run('qubes-change-keyboard-layout')
+            if vm_info.vm.features.check_with_template(
+                    "supported-feature.keyboard-layout", False):
+                vm_info.vm.run('qubes-change-keyboard-layout')
+            else:
+                QMessageBox.warning(
+                    self,
+                    self.tr("Keyboard layout change unsupported"),
+                    self.tr(
+                        "Please update the qube {} or its template to the "
+                        "newest version of Qubes tools.").format(
+                        str(vm_info.vm)))
 
     # noinspection PyArgumentList
     @pyqtSlot(name='on_action_editfwrules_triggered')