Changeset 71883 in vbox

Timestamp:

Apr 17, 2018 5:31:30 PM (6 years ago)

Author:

vboxsync

Message:

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

Location:

trunk/src/VBox/Frontends/VirtualBox

Files:

• Makefile.kmk (modified) (5 diffs)
• src/extensions/QITabWidget.cpp (copied) (copied from trunk/src/VBox/Frontends/VirtualBox/src/extensions/QITabWidget.h ) (2 diffs)
• src/extensions/QITabWidget.h (modified) (3 diffs)

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

@@ -443 +443 @@
         src/extensions/QIMenu.h \
         src/extensions/QIStatusBar.h \
-        src/extensions/QITabWidget.h \
         src/extensions/QITreeView.h \
         src/extensions/QITreeWidget.h \
@@ -665 +664 @@
         src/extensions/QIStatusBarIndicator.h \
         src/extensions/QIStyledItemDelegate.h \
+        src/extensions/QITabWidget.h \
         src/extensions/QIToolButton.h \
         src/extensions/QITableView.h \
@@ -745 +745 @@
         src/extensions/QIStatusBarIndicator.h \
         src/extensions/QIStyledItemDelegate.h \
+        src/extensions/QITabWidget.h \
         src/extensions/QIToolButton.h \
         src/extensions/QITableView.h \
@@ -1170 +1171 @@
         src/extensions/QIStatusBarIndicator.cpp \
         src/extensions/QIStyledItemDelegate.cpp \
+        src/extensions/QITabWidget.cpp \
         src/extensions/QIToolButton.cpp \
         src/extensions/QITableView.cpp \
@@ -1277 +1279 @@
         src/extensions/QIStatusBarIndicator.cpp \
         src/extensions/QIStyledItemDelegate.cpp \
+        src/extensions/QITabWidget.cpp \
         src/extensions/QIToolButton.cpp \
         src/extensions/QITableView.cpp \

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

@@ -1 +1 @@
 /* $Id$ */
 /** @file
- * VBox Qt GUI - Qt extensions: QITabWidget class declaration/implementation.
+ * VBox Qt GUI - Qt extensions: QITabWidget class implementation.
  */
 
 /*
- * Copyright (C) 2010-2017 Oracle Corporation
+ * Copyright (C) 2010-2018 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -16 +16 @@
  */
 
-#ifndef __QITabWidget_h__
-#define __QITabWidget_h__
+/* GUI includes: */
+#include "QITabWidget.h"
 
-/* Qt includes: */
-#include <QTabWidget>
 
-/* QTabWidget reimplementation with MacOS X bug-fix. */
-class QITabWidget: public QTabWidget
+QITabWidget::QITabWidget(QWidget *pParent /* = 0 */)
+    : QTabWidget(pParent)
 {
-    Q_OBJECT;
-
-public:
-
-    /* Constructor: */
-    QITabWidget(QWidget *pParent = 0)
-        :QTabWidget(pParent)
-    {
 #ifdef VBOX_WS_MAC
-        /* I don't know why, but for some languages there is ElideRight the
-           default on Mac OS X. Fix this. */
-        setElideMode(Qt::ElideNone);
-#endif /* VBOX_WS_MAC */
-    }
-};
-
-#endif /* __QITabWidget_h__ */
-
+    // WORKAROUND:
+    // I don't know why, but for some languages there is
+    // ElideRight the default on Mac OS X. Fix this.
+    setElideMode(Qt::ElideNone);
+#endif
+}

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

@@ -1 +1 @@
 /* $Id$ */
 /** @file
- * VBox Qt GUI - Qt extensions: QITabWidget class declaration/implementation.
+ * VBox Qt GUI - Qt extensions: QITabWidget class declaration.
  */
 
 /*
- * Copyright (C) 2010-2017 Oracle Corporation
+ * Copyright (C) 2010-2018 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -16 +16 @@
  */
 
-#ifndef __QITabWidget_h__
-#define __QITabWidget_h__
+#ifndef ___QITabWidget_h___
+#define ___QITabWidget_h___
 
 /* Qt includes: */
 #include <QTabWidget>
 
-/* QTabWidget reimplementation with MacOS X bug-fix. */
-class QITabWidget: public QTabWidget
+/* GUI includes: */
+#include "UILibraryDefs.h"
+
+/** QTabWidget extension with advanced functionality. */
+class SHARED_LIBRARY_STUFF QITabWidget : public QTabWidget
 {
     Q_OBJECT;
@@ -29 +32 @@
 public:
 
-    /* Constructor: */
-    QITabWidget(QWidget *pParent = 0)
-        :QTabWidget(pParent)
-    {
-#ifdef VBOX_WS_MAC
-        /* I don't know why, but for some languages there is ElideRight the
-           default on Mac OS X. Fix this. */
-        setElideMode(Qt::ElideNone);
-#endif /* VBOX_WS_MAC */
-    }
+    /** Constructs tab-widget passing @a pParent to the base-class. */
+    QITabWidget(QWidget *pParent = 0);
 };
 
-#endif /* __QITabWidget_h__ */
-
+#endif /* !___QITabWidget_h___ */