Changeset 27632 in vbox for trunk/src/VBox/Frontends

Timestamp:

Mar 23, 2010 2:18:15 PM (15 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

59192

Message:

FE/Qt4: 4674: Allow hostkey "None".

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• VBoxGlobalSettings.cpp (modified) (1 diff)
• extensions/QIHotKeyEdit.cpp (modified) (2 diffs)
• settings/global/VBoxGLSettingsInput.cpp (modified) (1 diff)
• settings/global/VBoxGLSettingsInput.ui (modified) (3 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/VBoxGlobalSettings.cpp

@@ -121 +121 @@
 gPropertyMap[] =
 {
-    { "GUI/Input/HostKey",                         "hostKey",                 "\\d*[1-9]\\d*", true },
+    { "GUI/Input/HostKey",                         "hostKey",                 "0|\\d*[1-9]\\d*", true },
     { "GUI/Input/AutoCapture",                     "autoCapture",             "true|false", true },
     { "GUI/Customizations",                        "guiFeatures",             "\\S+", true },

trunk/src/VBox/Frontends/VirtualBox/src/extensions/QIHotKeyEdit.cpp

@@ -114 +114 @@
  */
 
-const char *QIHotKeyEdit::kNoneSymbName = "<none>";
+const char *QIHotKeyEdit::kNoneSymbName = "None";
 
 QIHotKeyEdit::QIHotKeyEdit (QWidget *aParent) :
@@ -494 +494 @@
 bool QIHotKeyEdit::isValidKey (int aKeyVal)
 {
+    /* Empty value is correct: */
+    if (aKeyVal == 0)
+        return true;
 #if defined(Q_WS_WIN32)
     return (

trunk/src/VBox/Frontends/VirtualBox/src/settings/global/VBoxGLSettingsInput.cpp

@@ -51 +51 @@
 {
     setTabOrder (aWidget, mHeHostKey);
-    setTabOrder (mHeHostKey, mCbAutoGrab);
+    setTabOrder (mHeHostKey, mTbResetHostKey);
+    setTabOrder (mTbResetHostKey, mCbAutoGrab);
 }
 

trunk/src/VBox/Frontends/VirtualBox/src/settings/global/VBoxGLSettingsInput.ui

@@ -74 +74 @@
    </item>
    <item row="0" column="3" >
+    <widget class="QIToolButton" name="mTbResetHostKey" >
+     <property name="focusPolicy">
+      <enum>Qt::StrongFocus</enum>
+     </property>
+     <property name="toolTip">
+      <string>Reset Host Key</string>
+     </property>
+     <property name="whatsThis" >
+      <string>Resets the key used as a Host Key in the VM window.</string>
+     </property>
+     <property name="icon">
+      <iconset resource="../VirtualBox1.qrc" >:/delete_16px.png</iconset>
+     </property>
+     <property name="autoRaise">
+      <bool>true</bool>
+     </property>
+    </widget>
+   </item>
+   <item row="0" column="4" >
     <spacer>
      <property name="orientation" >
@@ -86 +105 @@
     </spacer>
    </item>
-   <item row="1" column="2" colspan="2" >
+   <item row="1" column="2" colspan="3" >
     <widget class="QCheckBox" name="mCbAutoGrab" >
      <property name="whatsThis" >
@@ -117 +136 @@
    <header>QIHotKeyEdit.h</header>
   </customwidget>
+  <customwidget>
+   <class>QIToolButton</class>
+   <extends>QToolButton</extends>
+   <header>QIToolButton.h</header>
+  </customwidget>
  </customwidgets>
  <resources/>
- <connections/>
+ <connections>
+  <connection>
+   <sender>mTbResetHostKey</sender>
+   <signal>clicked(bool)</signal>
+   <receiver>mHeHostKey</receiver>
+   <slot>clear()</slot>
+   <hints>
+    <hint type="sourcelabel" >
+     <x>111</x>
+     <y>19</y>
+    </hint>
+    <hint type="destinationlabel" >
+     <x>124</x>
+     <y>61</y>
+    </hint>
+   </hints>
+  </connection>
+ </connections>
 </ui>