Changeset 33958 in vbox

Timestamp:

Nov 11, 2010 9:17:02 AM (14 years ago)

Author:

vboxsync

Message:

FE/Qt: Global settings / Input page refactoring.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/settings/global

Files:

• UIGlobalSettingsGeneral.h (modified) (1 diff)
• UIGlobalSettingsInput.cpp (modified) (4 diffs)
• UIGlobalSettingsInput.h (modified) (3 diffs)
• UIGlobalSettingsInput.ui (modified) (6 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsGeneral.h

@@ -63 +63 @@
 
     /* Navigation stuff: */
-    void setOrderAfter (QWidget *aWidget);
+    void setOrderAfter(QWidget *pWidget);
 
     /* Translation stuff: */

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

@@ -18 +18 @@
  */
 
+/* Local includes */
 #include "UIGlobalSettingsInput.h"
 #include "VBoxGlobalSettings.h"
 
+/* Input page constructor: */
 UIGlobalSettingsInput::UIGlobalSettingsInput()
 {
-    /* Apply UI decorations */
+    /* Apply UI decorations: */
     Ui::UIGlobalSettingsInput::setupUi (this);
 
-    /* Applying language settings */
+    /* Apply language settings: */
     retranslateUi();
 }
@@ -50 +52 @@
 {
     /* Fetch from cache: */
-    mHeHostKey->setKey(m_cache.m_iHostKey);
-    mCbAutoGrab->setChecked(m_cache.m_fAutoCapture);
+    m_pHostKeyEditor->setKey(m_cache.m_iHostKey);
+    m_pEnableAutoGrabCheckbox->setChecked(m_cache.m_fAutoCapture);
 }
 
@@ -59 +61 @@
 {
     /* Upload to cache: */
-    m_cache.m_iHostKey = mHeHostKey->key();
-    m_cache.m_fAutoCapture = mCbAutoGrab->isChecked();
+    m_cache.m_iHostKey = m_pHostKeyEditor->key();
+    m_cache.m_fAutoCapture = m_pEnableAutoGrabCheckbox->isChecked();
 }
 
@@ -78 +80 @@
 }
 
-void UIGlobalSettingsInput::setOrderAfter (QWidget *aWidget)
+/* Navigation stuff: */
+void UIGlobalSettingsInput::setOrderAfter(QWidget *pWidget)
 {
-    setTabOrder (aWidget, mHeHostKey);
-    setTabOrder (mHeHostKey, mTbResetHostKey);
-    setTabOrder (mTbResetHostKey, mCbAutoGrab);
+    setTabOrder(pWidget, m_pHostKeyEditor);
+    setTabOrder(m_pHostKeyEditor, m_pResetHostKeyButton);
+    setTabOrder(m_pResetHostKeyButton, m_pEnableAutoGrabCheckbox);
 }
 
+/* Translation stuff: */
 void UIGlobalSettingsInput::retranslateUi()
 {
-    /* Translate uic generated strings */
+    /* Translate uic generated strings: */
     Ui::UIGlobalSettingsInput::retranslateUi (this);
 }

trunk/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsInput.h

@@ -20 +20 @@
 #define __UIGlobalSettingsInput_h__
 
+/* Local includes */
 #include "UISettingsPage.h"
 #include "UIGlobalSettingsInput.gen.h"
@@ -31 +32 @@
 
 /* Global settings / Input page: */
-class UIGlobalSettingsInput : public UISettingsPageGlobal,
-                            public Ui::UIGlobalSettingsInput
+class UIGlobalSettingsInput : public UISettingsPageGlobal, public Ui::UIGlobalSettingsInput
 {
     Q_OBJECT;
@@ -56 +56 @@
     void saveFromCacheTo(QVariant &data);
 
-    void setOrderAfter (QWidget *aWidget);
+    /* Navigation stuff: */
+    void setOrderAfter(QWidget *pWidget);
 
+    /* Translation stuff: */
     void retranslateUi();
 

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

@@ -1 @@
-<?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
  <comment>
- VBox frontends: Qt4 GUI (&quot;VirtualBox&quot;):
+ VBox frontends: Qt4 GUI ("VirtualBox"):
 
-     Copyright (C) 2008 Oracle Corporation
+     Copyright (C) 2008-2010 Oracle Corporation
 
      This file is part of VirtualBox Open Source Edition (OSE), as
@@ -45 +44 @@
    </item>
    <item row="0" column="1">
-    <widget class="QLabel" name="mLbHostKey">
+    <widget class="QLabel" name="m_pHostKeyLabel">
      <property name="text">
       <string>Host &amp;Key:</string>
      </property>
      <property name="buddy">
-      <cstring>mHeHostKey</cstring>
+      <cstring>m_pHostKeyEditor</cstring>
      </property>
     </widget>
    </item>
    <item row="0" column="2">
-    <widget class="QIHotKeyEdit" name="mHeHostKey">
+    <widget class="QIHotKeyEdit" name="m_pHostKeyEditor">
      <property name="whatsThis">
       <string>Displays the key used as a Host Key in the VM window. Activate the entry field and press a new Host Key. Note that alphanumeric, cursor movement and editing keys cannot be used.</string>
+     </property>
+     <property name="sizePolicy">
+      <sizepolicy hsizetype="MinimumExpanding" vsizetype="Minimum">
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
      </property>
     </widget>
    </item>
    <item row="0" column="3">
-    <widget class="UIResetButton" name="mTbResetHostKey">
+    <widget class="UIResetButton" name="m_pResetHostKeyButton">
      <property name="focusPolicy">
       <enum>Qt::StrongFocus</enum>
@@ -82 +87 @@
       <enum>Qt::Horizontal</enum>
      </property>
+     <property name="sizeType">
+      <enum>QSizePolicy::Fixed</enum>
+     </property>
      <property name="sizeHint" stdset="0">
       <size>
-       <width>0</width>
+       <width>40</width>
        <height>20</height>
       </size>
@@ -91 +99 @@
    </item>
    <item row="1" column="2" colspan="3">
-    <widget class="QCheckBox" name="mCbAutoGrab">
+    <widget class="QCheckBox" name="m_pEnableAutoGrabCheckbox">
      <property name="whatsThis">
       <string>When checked, the keyboard is automatically captured every time the VM window is activated. When the keyboard is captured, all keystrokes (including system ones like Alt-Tab) are directed to the VM.</string>
@@ -107 +115 @@
      <property name="sizeHint" stdset="0">
       <size>
-       <width>121</width>
-       <height>271</height>
+       <width>0</width>
+       <height>0</height>
       </size>
      </property>
@@ -132 +140 @@
  <connections>
   <connection>
-   <sender>mTbResetHostKey</sender>
+   <sender>m_pResetHostKeyButton</sender>
    <signal>clicked(bool)</signal>
-   <receiver>mHeHostKey</receiver>
+   <receiver>m_pHostKeyEditor</receiver>
    <slot>clear()</slot>
    <hints>