Changeset 71869 in vbox for trunk

Timestamp:

Apr 17, 2018 10:34:38 AM (7 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:9049: Full cleanup for QILineEdit and move it to VBoxGlobal library.

Location:

trunk/src/VBox/Frontends/VirtualBox

Files:

• Makefile.kmk (modified) (5 diffs)
• src/extensions/QILineEdit.cpp (modified) (2 diffs)
• src/extensions/QILineEdit.h (modified) (2 diffs)

trunk/src/VBox/Frontends/VirtualBox/Makefile.kmk

@@ -658 +658 @@
         src/extensions/QILabel.h \
         src/extensions/QILabelSeparator.h \
+        src/extensions/QILineEdit.h \
         src/extensions/QIMainWindow.h \
         src/extensions/QIMessageBox.h \
@@ -733 +734 @@
         src/extensions/QILabel.h \
         src/extensions/QILabelSeparator.h \
+        src/extensions/QILineEdit.h \
         src/extensions/QIMainWindow.h \
         src/extensions/QIMessageBox.h \
@@ -907 +909 @@
         src/UITakeSnapshotDialog.cpp \
         src/extensions/QIFlowLayout.cpp \
-        src/extensions/QILineEdit.cpp \
         src/extensions/QIMainDialog.cpp \
         src/extensions/QIManagerDialog.cpp \
@@ -1157 +1158 @@
         src/extensions/QILabel.cpp \
         src/extensions/QILabelSeparator.cpp \
+        src/extensions/QILineEdit.cpp \
         src/extensions/QIMainWindow.cpp \
         src/extensions/QIMessageBox.cpp \
@@ -1259 +1261 @@
         src/extensions/QILabel.cpp \
         src/extensions/QILabelSeparator.cpp \
+        src/extensions/QILineEdit.cpp \
         src/extensions/QIMainWindow.cpp \
         src/extensions/QIMessageBox.cpp \

trunk/src/VBox/Frontends/VirtualBox/src/extensions/QILineEdit.cpp

@@ -1 +1 @@
 /* $Id$ */
 /** @file
- * VirtualBox Qt GUI - QILineEdit class implementation.
+ * VBox Qt GUI - Qt extensions: QILineEdit class implementation.
  */
 
 /*
- * Copyright (C) 2008-2017 Oracle Corporation
+ * Copyright (C) 2008-2018 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -29 +29 @@
 
 
-void QILineEdit::setMinimumWidthByText (const QString &aText)
+void QILineEdit::setMinimumWidthByText(const QString &strText)
 {
-    setMinimumWidth (featTextWidth (aText).width());
+    setMinimumWidth(featTextWidth(strText).width());
 }
 
-void QILineEdit::setFixedWidthByText (const QString &aText)
+void QILineEdit::setFixedWidthByText(const QString &strText)
 {
-    setFixedWidth (featTextWidth (aText).width());
+    setFixedWidth(featTextWidth(strText).width());
 }
 
-QSize QILineEdit::featTextWidth (const QString &aText) const
+QSize QILineEdit::featTextWidth(const QString &strText) const
 {
     QStyleOptionFrame sof;
-    sof.initFrom (this);
+    sof.initFrom(this);
     sof.rect = contentsRect();
-    sof.lineWidth = hasFrame() ? style()->pixelMetric (QStyle::PM_DefaultFrameWidth) : 0;
+    sof.lineWidth = hasFrame() ? style()->pixelMetric(QStyle::PM_DefaultFrameWidth) : 0;
     sof.midLineWidth = 0;
     sof.state |= QStyle::State_Sunken;
 
-    /* The margins are based on qlineedit.cpp of Qt. Maybe they where changed
-     * at some time in the future. */
-    QSize sc (fontMetrics().width (aText) + 2*2,
-              fontMetrics().xHeight()     + 2*1);
-    QSize sa = style()->sizeFromContents (QStyle::CT_LineEdit, &sof, sc, this);
+    /** @todo make it wise.. */
+    // WORKAROUND:
+    // The margins are based on qlineedit.cpp of Qt.
+    // Maybe they where changed at some time in the future.
+    QSize sc(fontMetrics().width(strText) + 2 * 2,
+             fontMetrics().xHeight()     + 2 * 1);
+    const QSize sa = style()->sizeFromContents(QStyle::CT_LineEdit, &sof, sc, this);
 
     return sa;
 }
-

trunk/src/VBox/Frontends/VirtualBox/src/extensions/QILineEdit.h

@@ -1 +1 @@
 /* $Id$ */
 /** @file
- * VBox Qt GUI - QILineEdit class declarations.
+ * VBox Qt GUI - Qt extensions: QILineEdit class declaration.
  */
 
 /*
- * Copyright (C) 2008-2017 Oracle Corporation
+ * Copyright (C) 2008-2018 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -16 +16 @@
  */
 
-#ifndef __QILineEdit_h__
-#define __QILineEdit_h__
+#ifndef ___QILineEdit_h___
+#define ___QILineEdit_h___
 
 /* Qt includes */
 #include <QLineEdit>
 
-class QILineEdit: public QLineEdit
+/* GUI includes: */
+#include "UILibraryDefs.h"
+
+/** QLineEdit extension with advanced functionality. */
+class SHARED_LIBRARY_STUFF QILineEdit : public QLineEdit
 {
+    Q_OBJECT;
+
 public:
 
-    QILineEdit (QWidget *aParent = 0)
-        :QLineEdit (aParent) {}
-    QILineEdit (const QString &aContents, QWidget *aParent = 0)
-        :QLineEdit (aContents, aParent) {}
+    /** Constructs label-separator passing @a pParent to the base-class. */
+    QILineEdit(QWidget *pParent = 0)
+        : QLineEdit(pParent) {}
+    /** Constructs label-separator passing @a pParent to the base-class.
+      * @param  strContents  Brings the line-edit text. */
+    QILineEdit(const QString &strContents, QWidget *pParent = 0)
+        : QLineEdit(strContents, pParent) {}
 
-    void setMinimumWidthByText (const QString &aText);
-    void setFixedWidthByText (const QString &aText);
+    /** Forces line-edit to adjust minimum width acording to passed @a strText. */
+    void setMinimumWidthByText(const QString &strText);
+    /** Forces line-edit to adjust fixed width acording to passed @a strText. */
+    void setFixedWidthByText(const QString &strText);
 
 private:
 
-    QSize featTextWidth (const QString &aText) const;
+    /** Calculates suitable @a strText size. */
+    QSize featTextWidth(const QString &strText) const;
 };
 
-#endif /* __QILineEdit_h__ */
-
+#endif /* !___QILineEdit_h___ */