Changeset 42830 in vbox for trunk/src

Timestamp:

Aug 15, 2012 5:48:49 PM (12 years ago)

Author:

vboxsync

Message:

FE/Qt: 6234: Support for VM groups: Restrict group-rename keyboard-shortcut while corresponding action is restricted.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/selector/graphics/chooser

Files:

• UIGChooserHandlerKeyboard.cpp (modified) (1 diff)
• UIGChooserModel.cpp (modified) (2 diffs)
• UIGChooserModel.h (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/selector/graphics/chooser/UIGChooserHandlerKeyboard.cpp

@@ -299 +299 @@
             {
                 /* Start embedded editing focus item: */
-                model()->focusItem()->startEditing();
+                model()->startEditing();
                 /* Filter that event out: */
                 return true;

trunk/src/VBox/Frontends/VirtualBox/src/selector/graphics/chooser/UIGChooserModel.cpp

@@ -454 +454 @@
     /* Notify listener about root-item relayouted: */
     emit sigRootItemResized(root()->geometry().size(), root()->minimumWidthHint());
+}
+
+void UIGChooserModel::startEditing()
+{
+    sltStartEditingSelectedGroup();
 }
 
@@ -778 +783 @@
 void UIGChooserModel::sltStartEditingSelectedGroup()
 {
+    /* Check if action is enabled: */
+    if (!gActionPool->action(UIActionIndexSelector_Simple_Group_Rename)->isEnabled())
+        return;
+
     /* Only for single selected group: */
     if (!singleGroupSelected())

trunk/src/VBox/Frontends/VirtualBox/src/selector/graphics/chooser/UIGChooserModel.h

@@ -139 +139 @@
     /* API: Layout stuff: */
     void updateLayout();
+
+    /* API: Editing stuff: */
+    void startEditing();
 
     /* API: Drag and drop stuff: */