Changeset 47193 in vbox for trunk/src/VBox/Frontends/VirtualBox

Timestamp:

Jul 16, 2013 2:16:44 PM (12 years ago)

Author:

vboxsync

Message:

FE/Qt: Global properties: Extension page: Fixing MacOS X layout bug.

Location:

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

Files:

• UIGlobalSettingsExtension.cpp (modified) (8 diffs)
• UIGlobalSettingsExtension.h (modified) (2 diffs)
• UIGlobalSettingsExtension.ui (modified) (6 diffs)
• UIGlobalSettingsNetwork.ui (modified) (1 diff)

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

@@ -1 +1 @@
 /* $Id$ */
 /** @file
- * VBox Qt GUI - UIGlobalSettingsExtension class implementation.
+ *
+ * VBox frontends: Qt4 GUI ("VirtualBox"):
+ * UIGlobalSettingsExtension class implementation
  */
 
@@ -114 +116 @@
 }
 
-/**
- * Attempt the actual installation.
- *
- * This code is shared by UIGlobalSettingsExtension::sltInstallPackage and UISelectorWindow::sltOpenUrls.
- *
- * @param   strFilePath     The path to the tarball.
- * @param   strDigest       The digest of the file (SHA-256). Empty string if no
- *                          digest was performed.
- * @param   pParent         The parent widget.
- * @param   pstrExtPackName Where to return the extension pack name. Optional.
- */
-/*static*/ void UIGlobalSettingsExtension::doInstallation(QString const &strFilePath, QString const &strDigest,
-                                                          QWidget *pParent, QString *pstrExtPackName)
+/* static */
+void UIGlobalSettingsExtension::doInstallation(QString const &strFilePath, QString const &strDigest,
+                                               QWidget *pParent, QString *pstrExtPackName)
 {
     /*
@@ -272 +264 @@
 }
 
-/* Navigation stuff: */
 void UIGlobalSettingsExtension::setOrderAfter(QWidget *pWidget)
 {
@@ -279 +270 @@
 }
 
-/* Translation stuff: */
 void UIGlobalSettingsExtension::retranslateUi()
 {
@@ -290 +280 @@
 }
 
-/* Handle current-item change fact: */
 void UIGlobalSettingsExtension::sltHandleCurrentItemChange(QTreeWidgetItem *pCurrentItem)
 {
@@ -298 +287 @@
 }
 
-/* Invoke context menu: */
 void UIGlobalSettingsExtension::sltShowContextMenu(const QPoint &position)
 {
@@ -314 +302 @@
 }
 
-/* Package add procedure: */
 void UIGlobalSettingsExtension::sltInstallPackage()
 {
@@ -391 +378 @@
 }
 
-/* Package remove procedure: */
 void UIGlobalSettingsExtension::sltRemovePackage()
 {

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

@@ -69 +69 @@
     void saveFromCacheTo(QVariant &data);
 
-    /* Navigation stuff: */
+    /* Helper: Navigation stuff: */
     void setOrderAfter(QWidget *pWidget);
 
-    /* Translation stuff: */
+    /* Helper: Translation stuff: */
     void retranslateUi();
 
 private slots:
 
-    /* Tree-widget slots: */
+    /* Handlers: Tree-widget stuff: */
     void sltHandleCurrentItemChange(QTreeWidgetItem *pCurrentItem);
     void sltShowContextMenu(const QPoint &position);
 
-    /* Package add/remove procedures: */
+    /* Handlers: Package stuff: */
     void sltInstallPackage();
     void sltRemovePackage();
@@ -90 +90 @@
     UISettingsCacheGlobalExtensionItem fetchData(const CExtPack &package) const;
 
-    /* Actions: */
+    /* Variables: Actions: */
     QAction *m_pActionAdd;
     QAction *m_pActionRemove;

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

@@ -3 +3 @@
  VBox frontends: Qt4 GUI ("VirtualBox"):
 
- Copyright (C) 2010-2012 Oracle Corporation
+ Copyright (C) 2010-2013 Oracle Corporation
 
  This file is part of VirtualBox Open Source Edition (OSE), as
@@ -15 +15 @@
  <class>UIGlobalSettingsExtension</class>
  <widget class="QWidget" name="UIGlobalSettingsExtension">
-  <property name="geometry">
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>350</width>
-    <height>250</height>
-   </rect>
-  </property>
   <layout class="QGridLayout">
    <property name="margin">
@@ -28 +20 @@
    </property>
    <item row="0" column="0">
-    <spacer>
-     <property name="orientation">
-      <enum>Qt::Horizontal</enum>
-     </property>
-     <property name="sizeType">
-      <enum>QSizePolicy::Fixed</enum>
-     </property>
-     <property name="sizeHint">
-      <size>
-       <width>40</width>
-       <height>20</height>
-      </size>
-     </property>
-    </spacer>
-   </item>
-   <item row="0" column="1" colspan="2">
-    <widget class="QLabel" name="m_pLanguageLabel">
+    <widget class="QILabelSeparator" native="1" name="m_pEntensionLabel">
      <property name="text">
-      <string>&amp;Extension Packages:</string>
+     <string>&amp;Extension Packages</string>
      </property>
      <property name="buddy">
@@ -53 +29 @@
     </widget>
    </item>
-   <item row="1" column="1">
-    <spacer>
-     <property name="orientation">
-      <enum>Qt::Horizontal</enum>
-     </property>
-     <property name="sizeType">
-      <enum>QSizePolicy::Fixed</enum>
-     </property>
-     <property name="sizeHint">
-      <size>
-       <width>20</width>
-       <height>0</height>
-      </size>
-     </property>
-    </spacer>
-   </item>
-   <item row="1" column="2">
+   <item row="1" column="0">
     <widget class="QWidget" native="1" name="m_pExtensionPackContainer" >
      <layout class="QHBoxLayout" name="m_pLayout1">
@@ -81 +41 @@
        <widget class="QTreeWidget" name="m_pPackagesTree">
         <property name="sizePolicy">
-         <sizepolicy vsizetype="Expanding" hsizetype="Expanding">
+         <sizepolicy vsizetype="MinimumExpanding" hsizetype="MinimumExpanding">
           <horstretch>0</horstretch>
           <verstretch>0</verstretch>
@@ -125 +85 @@
  <customwidgets>
   <customwidget>
+   <class>QILabelSeparator</class>
+   <extends>QLabel</extends>
+   <header>QILabelSeparator.h</header>
+  </customwidget>
+  <customwidget>
    <class>UIToolBar</class>
    <extends>QToolBar</extends>

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

@@ -20 +20 @@
    </property>
    <item row="0" column="0">
-    <widget class="QILabelSeparator" native="1" name="m_pLanguageLabel">
+    <widget class="QILabelSeparator" native="1" name="m_pNetworkLabel">
      <property name="text">
      <string>&amp;Host-only Networks</string>