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

Timestamp:

May 4, 2016 1:47:14 PM (9 years ago)

Author:

vboxsync

Message:

FE/Qt: ​​​​​​​​​bugref:6769: Rework/cleanup file-path selector widget (part 05): Refactoring.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/widgets

Files:

• UIFilePathSelector.cpp (modified) (7 diffs)
• UIFilePathSelector.h (modified) (11 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIFilePathSelector.cpp

@@ -20 +20 @@
 #else  /* !VBOX_WITH_PRECOMPILED_HEADERS */
 
-/* GUI includes: */
-# include "QIFileDialog.h"
-# include "QIToolButton.h"
-# include "QILabel.h"
-# include "QILineEdit.h"
-# include "UIIconPool.h"
-# include "UIFilePathSelector.h"
-# include "VBoxGlobal.h"
-
-/* Other VBox includes: */
-# include <iprt/assert.h>
-
 /* Qt includes: */
 # include <QAction>
@@ -42 +30 @@
 # include <QTimer>
 
+/* GUI includes: */
+# include "QIFileDialog.h"
+# include "QILabel.h"
+# include "QILineEdit.h"
+# include "QIToolButton.h"
+# include "UIIconPool.h"
+# include "UIFilePathSelector.h"
+# include "VBoxGlobal.h"
+
+/* Other VBox includes: */
+# include <iprt/assert.h>
+
 #endif /* !VBOX_WITH_PRECOMPILED_HEADERS */
 
@@ -68 +68 @@
 UIFilePathSelector::UIFilePathSelector(QWidget *pParent /* = 0 */)
     : QIWithRetranslateUI<QComboBox>(pParent)
-    , m_pCopyAction(new QAction(this))
     , m_enmMode(Mode_Folder)
     , m_strHomeDir(QDir::current().absolutePath())
     , m_fEditable(true)
+    , m_fModified(false)
     , m_fEditableMode(false)
     , m_fMouseAwaited(false)
-    , m_fModified(false)
+    , m_pCopyAction(new QAction(this))
 {
     /* Populate items: */
@@ -106 +106 @@
 }
 
-UIFilePathSelector::~UIFilePathSelector()
-{
-}
-
-void UIFilePathSelector::setMode(Mode enmMode)
-{
-    m_enmMode = enmMode;
-}
-
-UIFilePathSelector::Mode UIFilePathSelector::mode() const
-{
-    return m_enmMode;
-}
-
 void UIFilePathSelector::setEditable(bool fEditable)
 {
@@ -169 +155 @@
 }
 
-void UIFilePathSelector::resetModified()
-{
-    m_fModified = false;
-}
-
-bool UIFilePathSelector::isModified() const
-{
-    return m_fModified;
-}
-
-void UIFilePathSelector::setFileDialogTitle(const QString& strTitle)
-{
-    m_strFileDialogTitle = strTitle;
-}
-
-QString UIFilePathSelector::fileDialogTitle() const
-{
-    return m_strFileDialogTitle;
-}
-
-void UIFilePathSelector::setFileDialogFilters(const QString& strFilters)
-{
-    m_strFileDialogFilters = strFilters;
-}
-
-QString UIFilePathSelector::fileDialogFilters() const
-{
-    return m_strFileDialogFilters;
-}
-
-void UIFilePathSelector::setFileDialogDefaultSaveExtension(const QString &strDefaultSaveExtension)
-{
-    m_strFileDialogDefaultSaveExtension = strDefaultSaveExtension;
-}
-
-QString UIFilePathSelector::fileDialogDefaultSaveExtension() const
-{
-    return m_strFileDialogDefaultSaveExtension;
-}
-
 bool UIFilePathSelector::isPathSelected() const
 {
@@ -230 +176 @@
 {
     m_strHomeDir = strHomeDir;
+}
+
+bool UIFilePathSelector::eventFilter(QObject *pObject, QEvent *pEvent)
+{
+    if (m_fMouseAwaited && (pEvent->type() == QEvent::MouseButtonPress))
+        QTimer::singleShot(0, this, SLOT(refreshText()));
+
+    return QIWithRetranslateUI<QComboBox>::eventFilter(pObject, pEvent);
 }
 
@@ -260 +214 @@
     }
     QIWithRetranslateUI<QComboBox>::focusOutEvent(pEvent);
-}
-
-bool UIFilePathSelector::eventFilter(QObject *pObject, QEvent *pEvent)
-{
-    if (m_fMouseAwaited && (pEvent->type() == QEvent::MouseButtonPress))
-        QTimer::singleShot(0, this, SLOT(refreshText()));
-
-    return QIWithRetranslateUI<QComboBox>::eventFilter(pObject, pEvent);
 }
 

trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIFilePathSelector.h

@@ -19 +19 @@
 #define ___UIFilePathSelector_h___
 
+/* Qt includes: */
+#include <QComboBox>
+
 /* GUI includes: */
 #include "QIWithRetranslateUI.h"
 
-/* Qt includes: */
-#include <QComboBox>
-
 /* Forward declarations: */
+class QAction;
+class QHBoxLayout;
 class QILabel;
 class QILineEdit;
-class QHBoxLayout;
-class QAction;
 class QIToolButton;
 
@@ -38 +38 @@
 {
     Q_OBJECT;
+
+signals:
+
+    /** Notify listeners about @a strPath changed. */
+    void pathChanged(const QString &strPath);
 
 public:
@@ -51 +56 @@
     /** Constructs file-path selector passing @a pParent to QComboBox base-class. */
     UIFilePathSelector(QWidget *pParent = 0);
-    /** Destructs file-path selector. */
-    ~UIFilePathSelector();
 
     /** Defines the @a enmMode to operate in. */
-    void setMode(Mode enmMode);
+    void setMode(Mode enmMode) { m_enmMode = enmMode; }
     /** Returns the mode to operate in. */
-    Mode mode() const;
+    Mode mode() const { return m_enmMode; }
 
     /** Defines whether the path is @a fEditable. */
@@ -70 +73 @@
 
     /** Defines the file-dialog @a strTitle. */
-    void setFileDialogTitle(const QString &strTitle);
+    void setFileDialogTitle(const QString &strTitle) { m_strFileDialogTitle = strTitle; }
     /** Returns the file-dialog title. */
-    QString fileDialogTitle() const;
+    QString fileDialogTitle() const { return m_strFileDialogTitle; }
 
     /** Defines the file-dialog @a strFilters. */
-    void setFileDialogFilters(const QString &strFilters);
+    void setFileDialogFilters(const QString &strFilters) { m_strFileDialogFilters = strFilters; }
     /** Returns the file-dialog filters. */
-    QString fileDialogFilters() const;
+    QString fileDialogFilters() const { return m_strFileDialogFilters; }
 
     /** Defines the file-dialog @a strDefaultSaveExtension. */
-    void setFileDialogDefaultSaveExtension(const QString &strDefaultSaveExtension);
+    void setFileDialogDefaultSaveExtension(const QString &strDefaultSaveExtension) { m_strFileDialogDefaultSaveExtension = strDefaultSaveExtension; }
     /** Returns the file-dialog default save extension. */
-    QString fileDialogDefaultSaveExtension() const;
+    QString fileDialogDefaultSaveExtension() const { return m_strFileDialogDefaultSaveExtension; }
 
     /** Resets path modified state to false. */
-    void resetModified();
+    void resetModified() { m_fModified = false; }
     /** Returns whether the path is modified. */
-    bool isModified() const;
+    bool isModified() const { return m_fModified; }
     /** Returns whether the path is selected. */
     bool isPathSelected() const;
@@ -93 +96 @@
     /** Returns the path. */
     QString path() const;
-
-signals:
-
-    /** Notify listeners about @a strPath changed. */
-    void pathChanged(const QString &strPath);
 
 public slots:
@@ -109 +107 @@
 protected:
 
+    /** Preprocesses every @a pEvent sent to @a pObject. */
+    bool eventFilter(QObject *pObject, QEvent *pEvent);
+
     /** Handles resize @a pEvent. */
     void resizeEvent(QResizeEvent *pEvent);
@@ -116 +117 @@
     /** Handles focus-out @a pEvent. */
     void focusOutEvent(QFocusEvent *pEvent);
-
-    /** Preprocesses every @a pEvent sent to @a pObject. */
-    bool eventFilter(QObject *pObject, QEvent *pEvent);
 
     /** Handles translation event. */
@@ -154 +152 @@
     QString shrinkText(int iWidth) const;
 
-    /** Holds the copy action instance. */
-    QAction *m_pCopyAction;
-
     /** Holds the mode to operate in. */
     Mode     m_enmMode;
@@ -165 +160 @@
     QString  m_strHomeDir;
 
+    /** Holds the file-dialog title. */
+    QString  m_strFileDialogTitle;
     /** Holds the file-dialog filters. */
     QString  m_strFileDialogFilters;
     /** Holds the file-dialog default save extension. */
     QString  m_strFileDialogDefaultSaveExtension;
-    /** Holds the file-dialog title. */
-    QString  m_strFileDialogTitle;
 
     /** Holds the cached text for empty path. */
@@ -179 +174 @@
     /** Holds whether the path is editable. */
     bool     m_fEditable;
+    /** Holds whether the path is modified. */
+    bool     m_fModified;
 
     /** Holds whether we are in editable mode. */
@@ -185 +182 @@
     bool     m_fMouseAwaited;
 
-    /** Holds whether the path is modified. */
-    bool     m_fModified;
+    /** Holds the copy action instance. */
+    QAction *m_pCopyAction;
 };