Changeset 10780 in vbox for trunk/src/VBox/Frontends/VirtualBox4

Timestamp:

Jul 21, 2008 2:29:49 PM (16 years ago)

Author:

vboxsync

Message:

FE/Qt4: Change the QLineEdit to a QILabel in the classical file selector widget.

Location:

trunk/src/VBox/Frontends/VirtualBox4

Files:

• include/VBoxFilePathSelectorWidget.h (modified) (3 diffs)
• src/QILabel.cpp (modified) (2 diffs)
• src/VBoxFilePathSelectorWidget.cpp (modified) (7 diffs)
• src/VBoxGLSettingsGeneral.cpp (modified) (1 diff)
• src/VBoxVMSettingsGeneral.cpp (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox4/include/VBoxFilePathSelectorWidget.h

@@ -34 +34 @@
 
 class QLabel;
-class QLineEdit;
 class QToolButton;
 class QFileIconProvider;
 class QComboBox;
+class QILabel;
 
 class VBoxFilePathSelectorWidget: public QIWithRetranslateUI<QWidget>
@@ -60 +60 @@
     bool isResetEnabled () const;
 
-    void setLineEditWhatsThis (const QString &aText);
+    void setPathWhatsThis (const QString &aText);
     void setSelectorWhatsThis (const QString &aText);
     void setResetWhatsThis (const QString &aText);
@@ -99 +99 @@
 #else /* VBOX_USE_COMBOBOX_PATH_SELECTOR */
     QLabel      *mLbIcon;
-    QLineEdit   *mLePath;
+    QILabel     *mLbPath;
     QToolButton *mTbSelect;
     QToolButton *mTbReset;

trunk/src/VBox/Frontends/VirtualBox4/src/QILabel.cpp

@@ -268 +268 @@
 /* Some constant predefines */
 const QRegExp QILabelPrivate::mCopyRegExp = QRegExp ("<[^>]*>");
-QRegExp QILabelPrivate::mElideRegExp = QRegExp ("(<compact\\s+elipsis=\"(start|middle|end)\"?>([^<]+)</compact>)");
+QRegExp QILabelPrivate::mElideRegExp = QRegExp ("(<compact\\s+elipsis=\"(start|middle|end)\"?>([^<]*)</compact>)");
 
 #define HOR_PADDING 1
@@ -425 +425 @@
     /* Only set the tooltip if the text is shortened in any way. */
     if (removeHtmlTags (comp) != removeHtmlTags (mText))
-        setToolTip (mText);
+        setToolTip (removeHtmlTags (mText));
     else
         setToolTip ("");

trunk/src/VBox/Frontends/VirtualBox4/src/VBoxFilePathSelectorWidget.cpp

@@ -23 +23 @@
 #include "VBoxFilePathSelectorWidget.h"
 #include "VBoxGlobal.h"
+#include "QILabel.h"
 
 /* Qt includes */
@@ -32 +33 @@
 #else /* VBOX_USE_COMBOBOX_PATH_SELECTOR */
 # include <QLabel>
-# include <QLineEdit>
 # include <QToolButton>
 #endif /* !VBOX_USE_COMBOBOX_PATH_SELECTOR */
@@ -90 +90 @@
 }
 
-void VBoxFilePathSelectorWidget::setLineEditWhatsThis (const QString &aText)
+void VBoxFilePathSelectorWidget::setPathWhatsThis (const QString &aText)
 {
 #ifdef VBOX_USE_COMBOBOX_PATH_SELECTOR
     NOREF (aText);
 #else /* VBOX_USE_COMBOBOX_PATH_SELECTOR */
-    mLePath->setWhatsThis (aText);
+    mLbPath->setWhatsThis (aText);
 #endif /* !VBOX_USE_COMBOBOX_PATH_SELECTOR */
 }
@@ -119 +119 @@
 bool VBoxFilePathSelectorWidget::isModified() const
 {
-#ifdef VBOX_USE_COMBOBOX_PATH_SELECTOR
     return true;
-#else /* VBOX_USE_COMBOBOX_PATH_SELECTOR */
-    return mLePath->isModified();
-#endif /* !VBOX_USE_COMBOBOX_PATH_SELECTOR */
 }
 
@@ -142 +138 @@
     mCbPath->setItemIcon (PathId, icon);
 #else /* VBOX_USE_COMBOBOX_PATH_SELECTOR */
-    /* Do this instead of le->setText (folder) to cause
-     * isModified() return true */
-    mLePath->selectAll();
-    mLePath->insert (filePath (tmpPath, false));
+    mLbPath->setText (QString ("<compact elipsis=\"start\">%1</compact>").arg (tmpPath));
     mLbIcon->setPixmap (icon.pixmap (16, 16));
 #endif /* !VBOX_USE_COMBOBOX_PATH_SELECTOR */
@@ -203 +196 @@
 #else /* VBOX_USE_COMBOBOX_PATH_SELECTOR */
     mLbIcon = new QLabel();
-    mLePath = new QLineEdit();
-    mLePath->setMinimumWidth (180);
-    mLePath->setReadOnly (true);
+    mLbPath = new QILabel();
+    mLbPath->setSizePolicy (QSizePolicy (QSizePolicy::Expanding, QSizePolicy::Fixed));
+    mLbPath->setMinimumWidth (180);
+    mLbPath->setFullSizeSelection (true);
     mTbSelect = new QToolButton();
     mTbSelect->setIcon (QIcon (":/select_file_16px.png"));
@@ -218 +212 @@
     
     layout->addWidget (mLbIcon);
-    layout->addWidget (mLePath);
+    layout->addWidget (mLbPath);
     layout->addWidget (mTbSelect);
     layout->addWidget (mTbReset);

trunk/src/VBox/Frontends/VirtualBox4/src/VBoxGLSettingsGeneral.cpp

@@ -76 +76 @@
     Ui::VBoxGLSettingsGeneral::retranslateUi (this);
 
-    mPsVdi->setLineEditWhatsThis (tr ("Displays the path to the default VDI folder. This folder is used, if not explicitly specified otherwise, when adding existing or creating new virtual hard disks."));
+    mPsVdi->setPathWhatsThis (tr ("Displays the path to the default VDI folder. This folder is used, if not explicitly specified otherwise, when adding existing or creating new virtual hard disks."));
     mPsVdi->setSelectorWhatsThis (tr ("Opens a dialog to select the default VDI folder."));
     mPsVdi->setResetWhatsThis (tr ("Resets the VDI folder path to the default value. The actual default path will be displayed after accepting the changes and opening this dialog again."));
 
-    mPsMach->setLineEditWhatsThis (tr ("Displays the path to the default virtual machine folder. This folder is used, if not explicitly specified otherwise, when creating new virtual machines."));
+    mPsMach->setPathWhatsThis (tr ("Displays the path to the default virtual machine folder. This folder is used, if not explicitly specified otherwise, when creating new virtual machines."));
     mPsMach->setSelectorWhatsThis (tr ("Opens a dialog to select the default virtual machine folder."));
     mPsMach->setResetWhatsThis (tr ("Resets the virtual machine folder path to the default value. The actual default path will be displayed after accepting the changes and opening this dialog again."));
 
-    mPsVRDP->setLineEditWhatsThis (tr ("Displays the path to the library that provides authentication for Remote Display (VRDP) clients."));
+    mPsVRDP->setPathWhatsThis (tr ("Displays the path to the library that provides authentication for Remote Display (VRDP) clients."));
     mPsVRDP->setSelectorWhatsThis (tr ("Opens a dialog to select the VRDP authentication library file."));
     mPsVRDP->setResetWhatsThis (tr ("Resets the authentication library file to the default value. The actual default library file will be displayed after accepting the changes and opening this dialog again."));

trunk/src/VBox/Frontends/VirtualBox4/src/VBoxVMSettingsGeneral.cpp

@@ -377 +377 @@
 
     /* Path selector */
-    mPsSnapshot->setLineEditWhatsThis (tr ("Displays the path where snapshots of this virtual machine will be stored. Note that snapshots can take quite a lot of disk space."));
+    mPsSnapshot->setPathWhatsThis (tr ("Displays the path where snapshots of this virtual machine will be stored. Note that snapshots can take quite a lot of disk space."));
     mPsSnapshot->setSelectorWhatsThis (tr ("Selects the snapshot folder path."));
     mPsSnapshot->setResetWhatsThis (tr ("Resets the snapshot folder path to the default value. The actual default path will be displayed after accepting the changes and opening this dialog again."));