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

Timestamp:

Aug 15, 2013 2:37:10 PM (11 years ago)

Author:

vboxsync

Message:

FE/Qt: Settings Dialog: Removing whats-this pane; Moving whats-this tags to tool-tips.

Location:

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

Files:

• UISettingsDialog.cpp (modified) (4 diffs)
• UISettingsDialog.ui (modified) (2 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialog.cpp

@@ -89 +89 @@
     /* No page-title with tool-bar: */
     m_pLbTitle->hide();
-    /* No whats-this with tool-bar: */
-    m_pLbWhatsThis->hide();
     /* Create modern tool-bar selector: */
     m_pSelector = new VBoxSettingsToolBarSelector(this);
@@ -101 +99 @@
     /* Create classical tree-view selector: */
     m_pSelector = new VBoxSettingsTreeViewSelector(this);
-    pMainLayout->addWidget(m_pSelector->widget(), 0, 0, 3, 1);
+    pMainLayout->addWidget(m_pSelector->widget(), 0, 0, 2, 1);
     m_pSelector->widget()->setFocus();
     pMainLayout->setSpacing(10);
@@ -129 +127 @@
     m_pWhatsThisTimer->setSingleShot(true);
     connect(m_pWhatsThisTimer, SIGNAL(timeout()), this, SLOT(sltUpdateWhatsThis()));
-    m_pLbWhatsThis->setAutoFillBackground(true);
-    QPalette whatsThisPalette = m_pLbWhatsThis->palette();
-    whatsThisPalette.setBrush(QPalette::Window, whatsThisPalette.brush(QPalette::Midlight));
-    m_pLbWhatsThis->setPalette(whatsThisPalette);
-    m_pLbWhatsThis->setFixedHeight(m_pLbWhatsThis->frameWidth() * 2 +
-                                   m_pLbWhatsThis->margin() * 2 +
-                                   m_pLbWhatsThis->fontMetrics().lineSpacing() * 4);
 
     /* Set the default button: */
@@ -464 +455 @@
     }
 
-#ifndef Q_WS_MAC
-    if (strWhatsThisText.isEmpty())
-        strWhatsThisText = whatsThis();
-    m_pLbWhatsThis->setText(strWhatsThisText);
-#else /* !Q_WS_MAC */
     if (pWhatsThisWidget && !strWhatsThisText.isEmpty())
         pWhatsThisWidget->setToolTip(QString("<qt>%1</qt>").arg(strWhatsThisText));
-#endif /* Q_WS_MAC */
 }
 

trunk/src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialog.ui

@@ -108 +108 @@
      </widget>
     </item>
-    <item row="2" column="1" >
-     <widget class="QILabel" name="m_pLbWhatsThis" >
-      <property name="frameShape" >
-       <enum>QFrame::Box</enum>
-      </property>
-      <property name="frameShadow" >
-       <enum>QFrame::Sunken</enum>
-      </property>
-      <property name="alignment" >
-       <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
-      </property>
-      <property name="wordWrap" >
-       <bool>true</bool>
-      </property>
-      <property name="margin" >
-       <number>7</number>
-      </property>
-     </widget>
-    </item>
-    <item row="3" column="0" colspan="2" >
+    <item row="2" column="0" colspan="2" >
      <widget class="QIDialogButtonBox" name="m_pButtonBox" >
       <property name="standardButtons" >
@@ -142 +123 @@
    <extends>QDialogButtonBox</extends>
    <header>QIDialogButtonBox.h</header>
-  </customwidget>
-  <customwidget>
-   <class>QILabel</class>
-   <extends>QLabel</extends>
-   <header>QILabel.h</header>
   </customwidget>
  </customwidgets>