Index: trunk/src/VBox/Frontends/VirtualBox/Makefile.kmk
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/Makefile.kmk	(revision 101010)
+++ trunk/src/VBox/Frontends/VirtualBox/Makefile.kmk	(revision 101011)
@@ -901,4 +901,5 @@
 	src/settings/editors/UIDisplayScreenFeaturesEditor.h \
 	src/settings/editors/UIDragAndDropEditor.h \
+	src/settings/editors/UIEditor.h \
 	src/settings/editors/UIExecutionCapEditor.h \
 	src/settings/editors/UIFontScaleEditor.h \
@@ -1487,4 +1488,5 @@
 	src/settings/editors/UIDisplayScreenFeaturesEditor.cpp \
 	src/settings/editors/UIDragAndDropEditor.cpp \
+	src/settings/editors/UIEditor.cpp \
 	src/settings/editors/UIExecutionCapEditor.cpp \
 	src/settings/editors/UIFontScaleEditor.cpp \
Index: trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UIAccelerationFeaturesEditor.cpp
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UIAccelerationFeaturesEditor.cpp	(revision 101010)
+++ trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UIAccelerationFeaturesEditor.cpp	(revision 101011)
@@ -37,5 +37,5 @@
 
 UIAccelerationFeaturesEditor::UIAccelerationFeaturesEditor(QWidget *pParent /* = 0 */)
-    : QIWithRetranslateUI<QWidget>(pParent)
+    : UIEditor(pParent)
     , m_fEnableNestedPaging(false)
     , m_pLabel(0)
Index: trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UIAccelerationFeaturesEditor.h
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UIAccelerationFeaturesEditor.h	(revision 101010)
+++ trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UIAccelerationFeaturesEditor.h	(revision 101011)
@@ -33,5 +33,5 @@
 
 /* GUI includes: */
-#include "QIWithRetranslateUI.h"
+#include "UIEditor.h"
 
 /* Forward declarations: */
@@ -40,6 +40,6 @@
 class QLabel;
 
-/** QWidget subclass used as acceleration features editor. */
-class SHARED_LIBRARY_STUFF UIAccelerationFeaturesEditor : public QIWithRetranslateUI<QWidget>
+/** UIEditor sub-class used as acceleration features editor. */
+class SHARED_LIBRARY_STUFF UIAccelerationFeaturesEditor : public UIEditor
 {
     Q_OBJECT;
Index: trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UIAudioControllerEditor.cpp
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UIAudioControllerEditor.cpp	(revision 101010)
+++ trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UIAudioControllerEditor.cpp	(revision 101011)
@@ -42,5 +42,5 @@
 
 UIAudioControllerEditor::UIAudioControllerEditor(QWidget *pParent /* = 0 */)
-    : QIWithRetranslateUI<QWidget>(pParent)
+    : UIEditor(pParent)
     , m_enmValue(KAudioControllerType_Max)
     , m_pLabel(0)
Index: trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UIAudioControllerEditor.h
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UIAudioControllerEditor.h	(revision 101010)
+++ trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UIAudioControllerEditor.h	(revision 101011)
@@ -32,10 +32,6 @@
 #endif
 
-/* Qt includes: */
-#include <QWidget>
-
 /* GUI includes: */
-#include "QIWithRetranslateUI.h"
-#include "UILibraryDefs.h"
+#include "UIEditor.h"
 
 /* COM includes: */
@@ -47,6 +43,6 @@
 class QLabel;
 
-/** QWidget subclass used as an audio controller editor. */
-class SHARED_LIBRARY_STUFF UIAudioControllerEditor : public QIWithRetranslateUI<QWidget>
+/** UIEditor sub-class used as an audio controller editor. */
+class SHARED_LIBRARY_STUFF UIAudioControllerEditor : public UIEditor
 {
     Q_OBJECT;
Index: trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UIAudioFeaturesEditor.cpp
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UIAudioFeaturesEditor.cpp	(revision 101010)
+++ trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UIAudioFeaturesEditor.cpp	(revision 101011)
@@ -36,5 +36,5 @@
 
 UIAudioFeaturesEditor::UIAudioFeaturesEditor(QWidget *pParent /* = 0 */)
-    : QIWithRetranslateUI<QWidget>(pParent)
+    : UIEditor(pParent)
     , m_fEnableOutput(false)
     , m_fEnableInput(false)
Index: trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UIAudioFeaturesEditor.h
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UIAudioFeaturesEditor.h	(revision 101010)
+++ trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UIAudioFeaturesEditor.h	(revision 101011)
@@ -33,5 +33,5 @@
 
 /* GUI includes: */
-#include "QIWithRetranslateUI.h"
+#include "UIEditor.h"
 
 /* Forward declarations: */
@@ -40,6 +40,6 @@
 class QLabel;
 
-/** QWidget subclass used as audio features editor. */
-class SHARED_LIBRARY_STUFF UIAudioFeaturesEditor : public QIWithRetranslateUI<QWidget>
+/** UIEditor sub-class used as audio features editor. */
+class SHARED_LIBRARY_STUFF UIAudioFeaturesEditor : public UIEditor
 {
     Q_OBJECT;
Index: trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UIAudioHostDriverEditor.cpp
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UIAudioHostDriverEditor.cpp	(revision 101010)
+++ trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UIAudioHostDriverEditor.cpp	(revision 101011)
@@ -42,5 +42,5 @@
 
 UIAudioHostDriverEditor::UIAudioHostDriverEditor(QWidget *pParent /* = 0 */)
-    : QIWithRetranslateUI<QWidget>(pParent)
+    : UIEditor(pParent)
     , m_enmValue(KAudioDriverType_Max)
     , m_pLabel(0)
Index: trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UIAudioHostDriverEditor.h
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UIAudioHostDriverEditor.h	(revision 101010)
+++ trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UIAudioHostDriverEditor.h	(revision 101011)
@@ -32,10 +32,6 @@
 #endif
 
-/* Qt includes: */
-#include <QWidget>
-
 /* GUI includes: */
-#include "QIWithRetranslateUI.h"
-#include "UILibraryDefs.h"
+#include "UIEditor.h"
 
 /* COM includes: */
@@ -47,6 +43,6 @@
 class QLabel;
 
-/** QWidget subclass used as an audio host driver editor. */
-class SHARED_LIBRARY_STUFF UIAudioHostDriverEditor : public QIWithRetranslateUI<QWidget>
+/** UIEditor sub-class used as an audio host driver editor. */
+class SHARED_LIBRARY_STUFF UIAudioHostDriverEditor : public UIEditor
 {
     Q_OBJECT;
Index: trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UIAudioSettingsEditor.cpp
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UIAudioSettingsEditor.cpp	(revision 101010)
+++ trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UIAudioSettingsEditor.cpp	(revision 101011)
@@ -39,5 +39,5 @@
 
 UIAudioSettingsEditor::UIAudioSettingsEditor(QWidget *pParent /* = 0 */)
-    : QIWithRetranslateUI<QWidget>(pParent)
+    : UIEditor(pParent)
     , m_fFeatureEnabled(false)
     , m_pCheckboxFeature(0)
Index: trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UIAudioSettingsEditor.h
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UIAudioSettingsEditor.h	(revision 101010)
+++ trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UIAudioSettingsEditor.h	(revision 101011)
@@ -32,10 +32,6 @@
 #endif
 
-/* Qt includes: */
-#include <QWidget>
-
 /* GUI includes: */
-#include "QIWithRetranslateUI.h"
-#include "UILibraryDefs.h"
+#include "UIEditor.h"
 #include "UIPortForwardingTable.h"
 
@@ -49,6 +45,6 @@
 class UIAudioHostDriverEditor;
 
-/** QWidget subclass used as a audio settings editor. */
-class SHARED_LIBRARY_STUFF UIAudioSettingsEditor : public QIWithRetranslateUI<QWidget>
+/** UIEditor sub-class used as a audio settings editor. */
+class SHARED_LIBRARY_STUFF UIAudioSettingsEditor : public UIEditor
 {
     Q_OBJECT;
Index: trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UIAutoCaptureKeyboardEditor.cpp
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UIAutoCaptureKeyboardEditor.cpp	(revision 101010)
+++ trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UIAutoCaptureKeyboardEditor.cpp	(revision 101011)
@@ -36,5 +36,5 @@
 
 UIAutoCaptureKeyboardEditor::UIAutoCaptureKeyboardEditor(QWidget *pParent /* = 0 */)
-    : QIWithRetranslateUI<QWidget>(pParent)
+    : UIEditor(pParent)
     , m_fValue(false)
     , m_pLabel(0)
Index: trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UIAutoCaptureKeyboardEditor.h
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UIAutoCaptureKeyboardEditor.h	(revision 101010)
+++ trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UIAutoCaptureKeyboardEditor.h	(revision 101011)
@@ -33,5 +33,5 @@
 
 /* GUI includes: */
-#include "QIWithRetranslateUI.h"
+#include "UIEditor.h"
 
 /* Forward declarations: */
@@ -39,6 +39,6 @@
 class QLabel;
 
-/** QWidget subclass used as an auto capture keyboard editor. */
-class SHARED_LIBRARY_STUFF UIAutoCaptureKeyboardEditor : public QIWithRetranslateUI<QWidget>
+/** UIEditor sub-class used as an auto capture keyboard editor. */
+class SHARED_LIBRARY_STUFF UIAutoCaptureKeyboardEditor : public UIEditor
 {
     Q_OBJECT;
Index: trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UIBaseMemoryEditor.cpp
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UIBaseMemoryEditor.cpp	(revision 101010)
+++ trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UIBaseMemoryEditor.cpp	(revision 101011)
@@ -249,5 +249,5 @@
 
 UIBaseMemoryEditor::UIBaseMemoryEditor(QWidget *pParent /* = 0 */)
-    : QIWithRetranslateUI<QWidget>(pParent)
+    : UIEditor(pParent)
     , m_iValue(0)
     , m_pLayout(0)
Index: trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UIBaseMemoryEditor.h
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UIBaseMemoryEditor.h	(revision 101010)
+++ trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UIBaseMemoryEditor.h	(revision 101011)
@@ -32,10 +32,6 @@
 #endif
 
-/* Qt includes: */
-#include <QWidget>
-
 /* GUI includes: */
-#include "QIWithRetranslateUI.h"
-#include "UILibraryDefs.h"
+#include "UIEditor.h"
 
 /* Forward declarations: */
@@ -45,6 +41,6 @@
 class UIBaseMemorySlider;
 
-/** QWidget subclass used as a base memory editor. */
-class SHARED_LIBRARY_STUFF UIBaseMemoryEditor : public QIWithRetranslateUI<QWidget>
+/** UIEditor sub-class used as a base memory editor. */
+class SHARED_LIBRARY_STUFF UIBaseMemoryEditor : public UIEditor
 {
     Q_OBJECT;
Index: trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UIBootOrderEditor.cpp
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UIBootOrderEditor.cpp	(revision 101010)
+++ trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UIBootOrderEditor.cpp	(revision 101011)
@@ -444,5 +444,5 @@
 
 UIBootOrderEditor::UIBootOrderEditor(QWidget *pParent /* = 0 */)
-    : QIWithRetranslateUI<QWidget>(pParent)
+    : UIEditor(pParent)
     , m_pLayout(0)
     , m_pLabel(0)
@@ -481,5 +481,5 @@
     /* Skip events sent to unrelated objects: */
     if (m_pTable && pObject != m_pTable)
-        return QIWithRetranslateUI<QWidget>::eventFilter(pObject, pEvent);
+        return UIEditor::eventFilter(pObject, pEvent);
 
     /* Handle only required event types: */
@@ -499,5 +499,5 @@
 
     /* Call to base-class: */
-    return QIWithRetranslateUI<QWidget>::eventFilter(pObject, pEvent);
+    return UIEditor::eventFilter(pObject, pEvent);
 }
 
Index: trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UIBootOrderEditor.h
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UIBootOrderEditor.h	(revision 101010)
+++ trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UIBootOrderEditor.h	(revision 101011)
@@ -33,6 +33,5 @@
 
 /* GUI includes: */
-#include "QIWithRetranslateUI.h"
-#include "UILibraryDefs.h"
+#include "UIEditor.h"
 
 /* COM includes: */
@@ -93,6 +92,6 @@
 
 
-/** QWidget subclass used as boot order editor. */
-class SHARED_LIBRARY_STUFF UIBootOrderEditor : public QIWithRetranslateUI<QWidget>
+/** UIEditor sub-class used as boot order editor. */
+class SHARED_LIBRARY_STUFF UIBootOrderEditor : public UIEditor
 {
     Q_OBJECT;
Index: trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UIChipsetEditor.cpp
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UIChipsetEditor.cpp	(revision 101010)
+++ trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UIChipsetEditor.cpp	(revision 101011)
@@ -42,5 +42,5 @@
 
 UIChipsetEditor::UIChipsetEditor(QWidget *pParent /* = 0 */)
-    : QIWithRetranslateUI<QWidget>(pParent)
+    : UIEditor(pParent)
     , m_enmValue(KChipsetType_Max)
     , m_pLabel(0)
Index: trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UIChipsetEditor.h
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UIChipsetEditor.h	(revision 101010)
+++ trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UIChipsetEditor.h	(revision 101011)
@@ -32,10 +32,6 @@
 #endif
 
-/* Qt includes: */
-#include <QWidget>
-
 /* GUI includes: */
-#include "QIWithRetranslateUI.h"
-#include "UILibraryDefs.h"
+#include "UIEditor.h"
 
 /* COM includes: */
@@ -47,6 +43,6 @@
 class QLabel;
 
-/** QWidget subclass used as a chipset editor. */
-class SHARED_LIBRARY_STUFF UIChipsetEditor : public QIWithRetranslateUI<QWidget>
+/** UIEditor sub-class used as a chipset editor. */
+class SHARED_LIBRARY_STUFF UIChipsetEditor : public UIEditor
 {
     Q_OBJECT;
Index: trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UIColorThemeEditor.cpp
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UIColorThemeEditor.cpp	(revision 101010)
+++ trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UIColorThemeEditor.cpp	(revision 101011)
@@ -38,5 +38,5 @@
 
 UIColorThemeEditor::UIColorThemeEditor(QWidget *pParent /* = 0 */)
-    : QIWithRetranslateUI<QWidget>(pParent)
+    : UIEditor(pParent)
     , m_enmValue(UIColorThemeType_Auto)
     , m_pLabel(0)
Index: trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UIColorThemeEditor.h
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UIColorThemeEditor.h	(revision 101010)
+++ trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UIColorThemeEditor.h	(revision 101011)
@@ -32,11 +32,7 @@
 #endif
 
-/* Qt includes: */
-#include <QWidget>
-
 /* GUI includes: */
-#include "QIWithRetranslateUI.h"
+#include "UIEditor.h"
 #include "UIExtraDataDefs.h"
-#include "UILibraryDefs.h"
 
 /* Forward declarations: */
@@ -44,6 +40,6 @@
 class QLabel;
 
-/** QWidget subclass used as a color theme editor. */
-class SHARED_LIBRARY_STUFF UIColorThemeEditor : public QIWithRetranslateUI<QWidget>
+/** UIEditor sub-class used as a color theme editor. */
+class SHARED_LIBRARY_STUFF UIColorThemeEditor : public UIEditor
 {
     Q_OBJECT;
Index: trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UIDefaultMachineFolderEditor.cpp
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UIDefaultMachineFolderEditor.cpp	(revision 101010)
+++ trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UIDefaultMachineFolderEditor.cpp	(revision 101011)
@@ -37,5 +37,5 @@
 
 UIDefaultMachineFolderEditor::UIDefaultMachineFolderEditor(QWidget *pParent /* = 0 */)
-    : QIWithRetranslateUI<QWidget>(pParent)
+    : UIEditor(pParent)
     , m_strValue(QString())
     , m_pLayout(0)
Index: trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UIDefaultMachineFolderEditor.h
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UIDefaultMachineFolderEditor.h	(revision 101010)
+++ trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UIDefaultMachineFolderEditor.h	(revision 101011)
@@ -32,10 +32,6 @@
 #endif
 
-/* Qt includes: */
-#include <QWidget>
-
 /* GUI includes: */
-#include "QIWithRetranslateUI.h"
-#include "UILibraryDefs.h"
+#include "UIEditor.h"
 
 /* Forward declarations: */
@@ -44,6 +40,6 @@
 class UIFilePathSelector;
 
-/** QWidget subclass used as a default machine folder editor. */
-class SHARED_LIBRARY_STUFF UIDefaultMachineFolderEditor : public QIWithRetranslateUI<QWidget>
+/** UIEditor sub-class used as a default machine folder editor. */
+class SHARED_LIBRARY_STUFF UIDefaultMachineFolderEditor : public UIEditor
 {
     Q_OBJECT;
Index: trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UIDescriptionEditor.cpp
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UIDescriptionEditor.cpp	(revision 101010)
+++ trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UIDescriptionEditor.cpp	(revision 101011)
@@ -35,5 +35,5 @@
 
 UIDescriptionEditor::UIDescriptionEditor(QWidget *pParent /* = 0 */)
-    : QIWithRetranslateUI<QWidget>(pParent)
+    : UIEditor(pParent)
     , m_pTextEdit(0)
 {
Index: trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UIDescriptionEditor.h
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UIDescriptionEditor.h	(revision 101010)
+++ trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UIDescriptionEditor.h	(revision 101011)
@@ -33,11 +33,11 @@
 
 /* GUI includes: */
-#include "QIWithRetranslateUI.h"
+#include "UIEditor.h"
 
 /* Forward declarations: */
 class QTextEdit;
 
-/** QWidget subclass used as machine description editor. */
-class SHARED_LIBRARY_STUFF UIDescriptionEditor : public QIWithRetranslateUI<QWidget>
+/** UIEditor sub-class used as machine description editor. */
+class SHARED_LIBRARY_STUFF UIDescriptionEditor : public UIEditor
 {
     Q_OBJECT;
Index: trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UIDiskEncryptionSettingsEditor.cpp
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UIDiskEncryptionSettingsEditor.cpp	(revision 101010)
+++ trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UIDiskEncryptionSettingsEditor.cpp	(revision 101011)
@@ -39,5 +39,5 @@
 
 UIDiskEncryptionSettingsEditor::UIDiskEncryptionSettingsEditor(QWidget *pParent /* = 0 */)
-    : QIWithRetranslateUI<QWidget>(pParent)
+    : UIEditor(pParent)
     , m_fFeatureEnabled(false)
     , m_enmCipherType(UIDiskEncryptionCipherType_Max)
Index: trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UIDiskEncryptionSettingsEditor.h
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UIDiskEncryptionSettingsEditor.h	(revision 101010)
+++ trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UIDiskEncryptionSettingsEditor.h	(revision 101011)
@@ -33,5 +33,5 @@
 
 /* GUI includes: */
-#include "QIWithRetranslateUI.h"
+#include "UIEditor.h"
 
 /* COM includes: */
@@ -43,8 +43,7 @@
 class QLabel;
 class QLineEdit;
-class QWidget;
 
-/** QWidget subclass used as a disk encryption settings editor. */
-class SHARED_LIBRARY_STUFF UIDiskEncryptionSettingsEditor : public QIWithRetranslateUI<QWidget>
+/** UIEditor sub-class used as a disk encryption settings editor. */
+class SHARED_LIBRARY_STUFF UIDiskEncryptionSettingsEditor : public UIEditor
 {
     Q_OBJECT;
Index: trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UIDisplayFeaturesEditor.cpp
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UIDisplayFeaturesEditor.cpp	(revision 101010)
+++ trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UIDisplayFeaturesEditor.cpp	(revision 101011)
@@ -39,5 +39,5 @@
 
 UIDisplayFeaturesEditor::UIDisplayFeaturesEditor(QWidget *pParent /* = 0 */)
-    : QIWithRetranslateUI<QWidget>(pParent)
+    : UIEditor(pParent)
     , m_fActivateOnMouseHover(false)
     , m_fDisableHostScreenSaver(false)
Index: trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UIDisplayFeaturesEditor.h
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UIDisplayFeaturesEditor.h	(revision 101010)
+++ trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UIDisplayFeaturesEditor.h	(revision 101011)
@@ -33,5 +33,5 @@
 
 /* GUI includes: */
-#include "QIWithRetranslateUI.h"
+#include "UIEditor.h"
 
 /* Forward declarations: */
@@ -40,6 +40,6 @@
 class QLabel;
 
-/** QWidget subclass used as display features editor. */
-class SHARED_LIBRARY_STUFF UIDisplayFeaturesEditor : public QIWithRetranslateUI<QWidget>
+/** UIEditor sub-class used as display features editor. */
+class SHARED_LIBRARY_STUFF UIDisplayFeaturesEditor : public UIEditor
 {
     Q_OBJECT;
Index: trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UIDisplayScreenFeaturesEditor.cpp
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UIDisplayScreenFeaturesEditor.cpp	(revision 101010)
+++ trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UIDisplayScreenFeaturesEditor.cpp	(revision 101011)
@@ -36,5 +36,5 @@
 
 UIDisplayScreenFeaturesEditor::UIDisplayScreenFeaturesEditor(QWidget *pParent /* = 0 */)
-    : QIWithRetranslateUI<QWidget>(pParent)
+    : UIEditor(pParent)
     , m_fEnable3DAcceleration(false)
     , m_pLabel(0)
Index: trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UIDisplayScreenFeaturesEditor.h
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UIDisplayScreenFeaturesEditor.h	(revision 101010)
+++ trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UIDisplayScreenFeaturesEditor.h	(revision 101011)
@@ -33,5 +33,5 @@
 
 /* GUI includes: */
-#include "QIWithRetranslateUI.h"
+#include "UIEditor.h"
 
 /* Forward declarations: */
@@ -40,6 +40,6 @@
 class QLabel;
 
-/** QWidget subclass used as machine display screen features editor. */
-class SHARED_LIBRARY_STUFF UIDisplayScreenFeaturesEditor : public QIWithRetranslateUI<QWidget>
+/** UIEditor sub-class used as machine display screen features editor. */
+class SHARED_LIBRARY_STUFF UIDisplayScreenFeaturesEditor : public UIEditor
 {
     Q_OBJECT;
Index: trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UIDragAndDropEditor.cpp
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UIDragAndDropEditor.cpp	(revision 101010)
+++ trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UIDragAndDropEditor.cpp	(revision 101011)
@@ -42,5 +42,5 @@
 
 UIDragAndDropEditor::UIDragAndDropEditor(QWidget *pParent /* = 0 */)
-    : QIWithRetranslateUI<QWidget>(pParent)
+    : UIEditor(pParent)
     , m_enmValue(KDnDMode_Max)
     , m_pLabel(0)
Index: trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UIDragAndDropEditor.h
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UIDragAndDropEditor.h	(revision 101010)
+++ trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UIDragAndDropEditor.h	(revision 101011)
@@ -32,10 +32,6 @@
 #endif
 
-/* Qt includes: */
-#include <QWidget>
-
 /* GUI includes: */
-#include "QIWithRetranslateUI.h"
-#include "UILibraryDefs.h"
+#include "UIEditor.h"
 
 /* COM includes: */
@@ -47,6 +43,6 @@
 class QLabel;
 
-/** QWidget subclass used as a drag&drop editor. */
-class SHARED_LIBRARY_STUFF UIDragAndDropEditor : public QIWithRetranslateUI<QWidget>
+/** UIEditor sub-class used as a drag&drop editor. */
+class SHARED_LIBRARY_STUFF UIDragAndDropEditor : public UIEditor
 {
     Q_OBJECT;
Index: trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UIEditor.cpp
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UIEditor.cpp	(revision 101011)
+++ trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UIEditor.cpp	(revision 101011)
@@ -0,0 +1,35 @@
+/* $Id$ */
+/** @file
+ * VBox Qt GUI - UIEditor class implementation.
+ */
+
+/*
+ * Copyright (C) 2006-2023 Oracle and/or its affiliates.
+ *
+ * This file is part of VirtualBox base platform packages, as
+ * available from https://www.virtualbox.org.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation, in version 3 of the
+ * License.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, see <https://www.gnu.org/licenses>.
+ *
+ * SPDX-License-Identifier: GPL-3.0-only
+ */
+
+/* GUI includes: */
+#include "UIEditor.h"
+
+
+UIEditor::UIEditor(QWidget *pParent /* = 0 */)
+    : QIWithRetranslateUI<QWidget>(pParent)
+{
+}
Index: trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UIEditor.h
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UIEditor.h	(revision 101011)
+++ trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UIEditor.h	(revision 101011)
@@ -0,0 +1,53 @@
+/* $Id$ */
+/** @file
+ * VBox Qt GUI - UIEditor class declaration.
+ */
+
+/*
+ * Copyright (C) 2006-2023 Oracle and/or its affiliates.
+ *
+ * This file is part of VirtualBox base platform packages, as
+ * available from https://www.virtualbox.org.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation, in version 3 of the
+ * License.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, see <https://www.gnu.org/licenses>.
+ *
+ * SPDX-License-Identifier: GPL-3.0-only
+ */
+
+#ifndef FEQT_INCLUDED_SRC_settings_editors_UIEditor_h
+#define FEQT_INCLUDED_SRC_settings_editors_UIEditor_h
+#ifndef RT_WITHOUT_PRAGMA_ONCE
+# pragma once
+#endif
+
+/* GUI includes: */
+#include "QIWithRetranslateUI.h"
+
+/** QWidget sub-class used as editor interface. */
+class SHARED_LIBRARY_STUFF UIEditor : public QIWithRetranslateUI<QWidget>
+{
+    Q_OBJECT;
+
+public:
+
+    /** Constructs editor passing @a pParent to the base-class. */
+    UIEditor(QWidget *pParent = 0);
+
+protected:
+
+    /** Holds the list of sub-editors. */
+    QList<UIEditor*> m_editors;
+};
+
+#endif /* !FEQT_INCLUDED_SRC_settings_editors_UIEditor_h */
Index: trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UIExecutionCapEditor.cpp
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UIExecutionCapEditor.cpp	(revision 101010)
+++ trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UIExecutionCapEditor.cpp	(revision 101011)
@@ -39,5 +39,5 @@
 
 UIExecutionCapEditor::UIExecutionCapEditor(QWidget *pParent /* = 0 */)
-    : QIWithRetranslateUI<QWidget>(pParent)
+    : UIEditor(pParent)
     , m_uMinExecCap(1)
     , m_uMedExecCap(40)
Index: trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UIExecutionCapEditor.h
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UIExecutionCapEditor.h	(revision 101010)
+++ trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UIExecutionCapEditor.h	(revision 101011)
@@ -32,9 +32,6 @@
 #endif
 
-/* Qt includes: */
-#include <QWidget>
-
 /* GUI includes: */
-#include "QIWithRetranslateUI.h"
+#include "UIEditor.h"
 
 /* Forward declarations: */
@@ -44,6 +41,6 @@
 class QIAdvancedSlider;
 
-/** QWidget subclass used as a execution cap editor. */
-class SHARED_LIBRARY_STUFF UIExecutionCapEditor : public QIWithRetranslateUI<QWidget>
+/** UIEditor sub-class used as a execution cap editor. */
+class SHARED_LIBRARY_STUFF UIExecutionCapEditor : public UIEditor
 {
     Q_OBJECT;
Index: trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UIFontScaleEditor.cpp
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UIFontScaleEditor.cpp	(revision 101010)
+++ trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UIFontScaleEditor.cpp	(revision 101011)
@@ -61,5 +61,5 @@
 
 UIFontScaleEditor::UIFontScaleEditor(QWidget *pParent)
-    : QIWithRetranslateUI<QWidget>(pParent)
+    : UIEditor(pParent)
     , m_pLayout(0)
     , m_pLabel(0)
Index: trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UIFontScaleEditor.h
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UIFontScaleEditor.h	(revision 101010)
+++ trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UIFontScaleEditor.h	(revision 101011)
@@ -33,19 +33,16 @@
 
 /* GUI includes: */
-#include "QIWithRetranslateUI.h"
-#include "UILibraryDefs.h"
+#include "UIEditor.h"
 
 /* Forward declarations: */
 class QGridLayout;
 class QLabel;
-class QSpinBox;
-class QWidget;
 class QIAdvancedSlider;
 class UIFontScaleFactorSpinBox;
 
-/** QWidget reimplementation providing GUI with monitor scale factor editing functionality.
+/** UIEditor sub-class providing GUI with monitor scale factor editing functionality.
   * It includes a combo box to select a monitor, a slider, and a spinbox to display/modify values.
   * The first item in the combo box is used to change the scale factor of all monitors. */
-class SHARED_LIBRARY_STUFF UIFontScaleEditor : public QIWithRetranslateUI<QWidget>
+class SHARED_LIBRARY_STUFF UIFontScaleEditor : public UIEditor
 {
     Q_OBJECT;
@@ -93,14 +90,14 @@
     void setSpinBoxValue(int iValue);
 
-
     /** @name Member widgets.
       * @{ */
-        QGridLayout      *m_pLayout;
-        QLabel           *m_pLabel;
-        QIAdvancedSlider *m_pScaleSlider;
-        UIFontScaleFactorSpinBox         *m_pScaleSpinBox;
-        QLabel           *m_pMinScaleLabel;
-        QLabel           *m_pMaxScaleLabel;
+        QGridLayout              *m_pLayout;
+        QLabel                   *m_pLabel;
+        QIAdvancedSlider         *m_pScaleSlider;
+        UIFontScaleFactorSpinBox *m_pScaleSpinBox;
+        QLabel                   *m_pMinScaleLabel;
+        QLabel                   *m_pMaxScaleLabel;
     /** @} */
+
     /** Hold the factor by which we divided spinbox's @a range to set slider's range to make slider mouse move stop on ticks. */
     const int m_iSliderRangeDivisor;
Index: trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UIGraphicsControllerEditor.cpp
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UIGraphicsControllerEditor.cpp	(revision 101010)
+++ trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UIGraphicsControllerEditor.cpp	(revision 101011)
@@ -42,5 +42,5 @@
 
 UIGraphicsControllerEditor::UIGraphicsControllerEditor(QWidget *pParent /* = 0 */)
-    : QIWithRetranslateUI<QWidget>(pParent)
+    : UIEditor(pParent)
     , m_enmValue(KGraphicsControllerType_Max)
     , m_pLayout(0)
Index: trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UIGraphicsControllerEditor.h
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UIGraphicsControllerEditor.h	(revision 101010)
+++ trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UIGraphicsControllerEditor.h	(revision 101011)
@@ -32,10 +32,6 @@
 #endif
 
-/* Qt includes: */
-#include <QWidget>
-
 /* GUI includes: */
-#include "QIWithRetranslateUI.h"
-#include "UILibraryDefs.h"
+#include "UIEditor.h"
 
 /* COM includes: */
@@ -47,6 +43,6 @@
 class QLabel;
 
-/** QWidget subclass used as a graphics controller editor. */
-class SHARED_LIBRARY_STUFF UIGraphicsControllerEditor : public QIWithRetranslateUI<QWidget>
+/** UIEditor sub-class used as a graphics controller editor. */
+class SHARED_LIBRARY_STUFF UIGraphicsControllerEditor : public UIEditor
 {
     Q_OBJECT;
Index: trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UILanguageSettingsEditor.cpp
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UILanguageSettingsEditor.cpp	(revision 101010)
+++ trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UILanguageSettingsEditor.cpp	(revision 101011)
@@ -211,5 +211,5 @@
 
 UILanguageSettingsEditor::UILanguageSettingsEditor(QWidget *pParent /* = 0 */)
-    : QIWithRetranslateUI<QWidget>(pParent)
+    : UIEditor(pParent)
     , m_fPolished(false)
     , m_pLabelSeparator(0)
@@ -268,5 +268,5 @@
 {
     /* Call to base-class: */
-    QIWithRetranslateUI<QWidget>::showEvent(pEvent);
+    UIEditor::showEvent(pEvent);
 
     /* Polish if necessary: */
Index: trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UILanguageSettingsEditor.h
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UILanguageSettingsEditor.h	(revision 101010)
+++ trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UILanguageSettingsEditor.h	(revision 101011)
@@ -33,5 +33,5 @@
 
 /* GUI includes: */
-#include "QIWithRetranslateUI.h"
+#include "UIEditor.h"
 
 /* Forward declartions: */
@@ -41,6 +41,6 @@
 class QITreeWidget;
 
-/** QWidget subclass used as a language settings editor. */
-class SHARED_LIBRARY_STUFF UILanguageSettingsEditor : public QIWithRetranslateUI<QWidget>
+/** UIEditor sub-class used as a language settings editor. */
+class SHARED_LIBRARY_STUFF UILanguageSettingsEditor : public UIEditor
 {
     Q_OBJECT;
Index: trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UIMaximumGuestScreenSizeEditor.cpp
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UIMaximumGuestScreenSizeEditor.cpp	(revision 101010)
+++ trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UIMaximumGuestScreenSizeEditor.cpp	(revision 101011)
@@ -67,5 +67,5 @@
 
 UIMaximumGuestScreenSizeEditor::UIMaximumGuestScreenSizeEditor(QWidget *pParent /* = 0 */)
-    : QIWithRetranslateUI<QWidget>(pParent)
+    : UIEditor(pParent)
     , m_pLayout(0)
     , m_pLabelPolicy(0)
Index: trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UIMaximumGuestScreenSizeEditor.h
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UIMaximumGuestScreenSizeEditor.h	(revision 101010)
+++ trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UIMaximumGuestScreenSizeEditor.h	(revision 101011)
@@ -32,11 +32,7 @@
 #endif
 
-/* Qt includes: */
-#include <QWidget>
-
 /* GUI includes: */
-#include "QIWithRetranslateUI.h"
+#include "UIEditor.h"
 #include "UIExtraDataDefs.h"
-#include "UILibraryDefs.h"
 
 /* Forward declarations: */
@@ -69,6 +65,6 @@
 
 
-/** QWidget subclass used as a maximum guest screen size editor. */
-class SHARED_LIBRARY_STUFF UIMaximumGuestScreenSizeEditor : public QIWithRetranslateUI<QWidget>
+/** UIEditor sub-class used as a maximum guest screen size editor. */
+class SHARED_LIBRARY_STUFF UIMaximumGuestScreenSizeEditor : public UIEditor
 {
     Q_OBJECT;
Index: trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UIMiniToolbarSettingsEditor.cpp
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UIMiniToolbarSettingsEditor.cpp	(revision 101010)
+++ trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UIMiniToolbarSettingsEditor.cpp	(revision 101011)
@@ -36,5 +36,5 @@
 
 UIMiniToolbarSettingsEditor::UIMiniToolbarSettingsEditor(QWidget *pParent /* = 0 */)
-    : QIWithRetranslateUI<QWidget>(pParent)
+    : UIEditor(pParent)
     , m_fShowMiniToolbar(false)
     , m_fMiniToolbarAtTop(false)
Index: trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UIMiniToolbarSettingsEditor.h
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UIMiniToolbarSettingsEditor.h	(revision 101010)
+++ trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UIMiniToolbarSettingsEditor.h	(revision 101011)
@@ -33,5 +33,5 @@
 
 /* GUI includes: */
-#include "QIWithRetranslateUI.h"
+#include "UIEditor.h"
 
 /* Forward declarations: */
@@ -40,6 +40,6 @@
 class QLabel;
 
-/** QWidget subclass used as mini-toolbar editor. */
-class SHARED_LIBRARY_STUFF UIMiniToolbarSettingsEditor : public QIWithRetranslateUI<QWidget>
+/** UIEditor sub-class used as mini-toolbar editor. */
+class SHARED_LIBRARY_STUFF UIMiniToolbarSettingsEditor : public UIEditor
 {
     Q_OBJECT;
Index: trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UIMonitorCountEditor.cpp
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UIMonitorCountEditor.cpp	(revision 101010)
+++ trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UIMonitorCountEditor.cpp	(revision 101011)
@@ -43,5 +43,5 @@
 
 UIMonitorCountEditor::UIMonitorCountEditor(QWidget *pParent /* = 0 */)
-    : QIWithRetranslateUI<QWidget>(pParent)
+    : UIEditor(pParent)
     , m_iValue(1)
     , m_pLayout(0)
Index: trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UIMonitorCountEditor.h
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UIMonitorCountEditor.h	(revision 101010)
+++ trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UIMonitorCountEditor.h	(revision 101011)
@@ -32,10 +32,6 @@
 #endif
 
-/* Qt includes: */
-#include <QWidget>
-
 /* GUI includes: */
-#include "QIWithRetranslateUI.h"
-#include "UILibraryDefs.h"
+#include "UIEditor.h"
 
 /* Forward declarations: */
@@ -45,6 +41,6 @@
 class QIAdvancedSlider;
 
-/** QWidget subclass used as a monitor count editor. */
-class SHARED_LIBRARY_STUFF UIMonitorCountEditor : public QIWithRetranslateUI<QWidget>
+/** UIEditor sub-class used as a monitor count editor. */
+class SHARED_LIBRARY_STUFF UIMonitorCountEditor : public UIEditor
 {
     Q_OBJECT;
Index: trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UIMotherboardFeaturesEditor.cpp
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UIMotherboardFeaturesEditor.cpp	(revision 101010)
+++ trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UIMotherboardFeaturesEditor.cpp	(revision 101011)
@@ -39,5 +39,5 @@
 
 UIMotherboardFeaturesEditor::UIMotherboardFeaturesEditor(QWidget *pParent /* = 0 */)
-    : QIWithRetranslateUI<QWidget>(pParent)
+    : UIEditor(pParent)
     , m_fEnableIoApic(false)
     , m_fEnableUtcTime(false)
Index: trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UIMotherboardFeaturesEditor.h
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UIMotherboardFeaturesEditor.h	(revision 101010)
+++ trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UIMotherboardFeaturesEditor.h	(revision 101011)
@@ -33,5 +33,5 @@
 
 /* GUI includes: */
-#include "QIWithRetranslateUI.h"
+#include "UIEditor.h"
 
 /* Forward declarations: */
@@ -41,6 +41,6 @@
 class QPushButton;
 
-/** QWidget subclass used as motherboard features editor. */
-class SHARED_LIBRARY_STUFF UIMotherboardFeaturesEditor : public QIWithRetranslateUI<QWidget>
+/** UIEditor sub-class used as motherboard features editor. */
+class SHARED_LIBRARY_STUFF UIMotherboardFeaturesEditor : public UIEditor
 {
     Q_OBJECT;
Index: trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UINameAndSystemEditor.cpp
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UINameAndSystemEditor.cpp	(revision 101010)
+++ trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UINameAndSystemEditor.cpp	(revision 101011)
@@ -56,5 +56,5 @@
                                              bool fChooseEdition /* = false */,
                                              bool fChooseType /* = true */)
-    : QIWithRetranslateUI<QWidget>(pParent)
+    : UIEditor(pParent)
     , m_fChooseName(fChooseName)
     , m_fChoosePath(fChoosePath)
Index: trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UINameAndSystemEditor.h
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UINameAndSystemEditor.h	(revision 101010)
+++ trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UINameAndSystemEditor.h	(revision 101011)
@@ -32,10 +32,6 @@
 #endif
 
-/* Qt includes: */
-#include <QWidget>
-
 /* GUI includes: */
-#include "QIWithRetranslateUI.h"
-#include "UILibraryDefs.h"
+#include "UIEditor.h"
 
 /* COM includes: */
@@ -52,6 +48,6 @@
 class UIMarkableLineEdit;
 
-/** QWidget subclass providing complex editor for basic VM parameters. */
-class SHARED_LIBRARY_STUFF UINameAndSystemEditor : public QIWithRetranslateUI<QWidget>
+/** UIEditor sub-class providing complex editor for basic VM parameters. */
+class SHARED_LIBRARY_STUFF UINameAndSystemEditor : public UIEditor
 {
     Q_OBJECT;
Index: trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UINetworkAttachmentEditor.cpp
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UINetworkAttachmentEditor.cpp	(revision 101010)
+++ trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UINetworkAttachmentEditor.cpp	(revision 101011)
@@ -54,5 +54,5 @@
 
 UINetworkAttachmentEditor::UINetworkAttachmentEditor(QWidget *pParent /* = 0 */)
-    : QIWithRetranslateUI<QWidget>(pParent)
+    : UIEditor(pParent)
     , m_enmRestrictedNetworkAttachmentTypes(UIExtraDataMetaDefs::DetailsElementOptionTypeNetwork_Invalid)
     , m_enmType(KNetworkAttachmentType_Max)
Index: trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UINetworkAttachmentEditor.h
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UINetworkAttachmentEditor.h	(revision 101010)
+++ trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UINetworkAttachmentEditor.h	(revision 101011)
@@ -32,11 +32,7 @@
 #endif
 
-/* Qt includes: */
-#include <QWidget>
-
 /* GUI includes: */
-#include "QIWithRetranslateUI.h"
+#include "UIEditor.h"
 #include "UIExtraDataDefs.h"
-#include "UILibraryDefs.h"
 
 /* COM includes: */
@@ -48,6 +44,6 @@
 class QLabel;
 
-/** QWidget subclass used as a network attachment editor. */
-class SHARED_LIBRARY_STUFF UINetworkAttachmentEditor : public QIWithRetranslateUI<QWidget>
+/** UIEditor sub-class used as a network attachment editor. */
+class SHARED_LIBRARY_STUFF UINetworkAttachmentEditor : public UIEditor
 {
     Q_OBJECT;
Index: trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UINetworkFeaturesEditor.cpp
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UINetworkFeaturesEditor.cpp	(revision 101010)
+++ trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UINetworkFeaturesEditor.cpp	(revision 101011)
@@ -49,5 +49,5 @@
 
 UINetworkFeaturesEditor::UINetworkFeaturesEditor(QWidget *pParent /* = 0 */)
-    : QIWithRetranslateUI<QWidget>(pParent)
+    : UIEditor(pParent)
     , m_fAdvancedButtonExpanded(false)
     , m_enmAdapterType(KNetworkAdapterType_Null)
Index: trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UINetworkFeaturesEditor.h
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UINetworkFeaturesEditor.h	(revision 101010)
+++ trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UINetworkFeaturesEditor.h	(revision 101011)
@@ -33,5 +33,5 @@
 
 /* GUI includes: */
-#include "QIWithRetranslateUI.h"
+#include "UIEditor.h"
 #include "UIMachineSettingsPortForwardingDlg.h"
 
@@ -49,6 +49,6 @@
 class QIToolButton;
 
-/** QWidget subclass used as a network features editor. */
-class SHARED_LIBRARY_STUFF UINetworkFeaturesEditor : public QIWithRetranslateUI<QWidget>
+/** UIEditor sub-class used as a network features editor. */
+class SHARED_LIBRARY_STUFF UINetworkFeaturesEditor : public UIEditor
 {
     Q_OBJECT;
Index: trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UINetworkSettingsEditor.cpp
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UINetworkSettingsEditor.cpp	(revision 101010)
+++ trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UINetworkSettingsEditor.cpp	(revision 101011)
@@ -38,5 +38,5 @@
 
 UINetworkSettingsEditor::UINetworkSettingsEditor(QWidget *pParent /* = 0 */)
-    : QIWithRetranslateUI<QWidget>(pParent)
+    : UIEditor(pParent)
     , m_fFeatureEnabled(false)
     , m_pCheckboxFeature(0)
Index: trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UINetworkSettingsEditor.h
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UINetworkSettingsEditor.h	(revision 101010)
+++ trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UINetworkSettingsEditor.h	(revision 101011)
@@ -32,10 +32,6 @@
 #endif
 
-/* Qt includes: */
-#include <QWidget>
-
 /* GUI includes: */
-#include "QIWithRetranslateUI.h"
-#include "UILibraryDefs.h"
+#include "UIEditor.h"
 #include "UIPortForwardingTable.h"
 
@@ -48,6 +44,6 @@
 class UINetworkFeaturesEditor;
 
-/** QWidget subclass used as a network settings editor. */
-class SHARED_LIBRARY_STUFF UINetworkSettingsEditor : public QIWithRetranslateUI<QWidget>
+/** UIEditor sub-class used as a network settings editor. */
+class SHARED_LIBRARY_STUFF UINetworkSettingsEditor : public UIEditor
 {
     Q_OBJECT;
Index: trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UIParavirtProviderEditor.cpp
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UIParavirtProviderEditor.cpp	(revision 101010)
+++ trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UIParavirtProviderEditor.cpp	(revision 101011)
@@ -42,5 +42,5 @@
 
 UIParavirtProviderEditor::UIParavirtProviderEditor(QWidget *pParent /* = 0 */)
-    : QIWithRetranslateUI<QWidget>(pParent)
+    : UIEditor(pParent)
     , m_enmValue(KParavirtProvider_Max)
     , m_pLabel(0)
Index: trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UIParavirtProviderEditor.h
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UIParavirtProviderEditor.h	(revision 101010)
+++ trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UIParavirtProviderEditor.h	(revision 101011)
@@ -32,10 +32,6 @@
 #endif
 
-/* Qt includes: */
-#include <QWidget>
-
 /* GUI includes: */
-#include "QIWithRetranslateUI.h"
-#include "UILibraryDefs.h"
+#include "UIEditor.h"
 
 /* COM includes: */
@@ -47,6 +43,6 @@
 class QLabel;
 
-/** QWidget subclass used as an paravirtualization provider editor. */
-class SHARED_LIBRARY_STUFF UIParavirtProviderEditor : public QIWithRetranslateUI<QWidget>
+/** UIEditor sub-class used as an paravirtualization provider editor. */
+class SHARED_LIBRARY_STUFF UIParavirtProviderEditor : public UIEditor
 {
     Q_OBJECT;
Index: trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UIPointingHIDEditor.cpp
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UIPointingHIDEditor.cpp	(revision 101010)
+++ trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UIPointingHIDEditor.cpp	(revision 101011)
@@ -42,5 +42,5 @@
 
 UIPointingHIDEditor::UIPointingHIDEditor(QWidget *pParent /* = 0 */)
-    : QIWithRetranslateUI<QWidget>(pParent)
+    : UIEditor(pParent)
     , m_enmValue(KPointingHIDType_Max)
     , m_pLabel(0)
Index: trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UIPointingHIDEditor.h
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UIPointingHIDEditor.h	(revision 101010)
+++ trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UIPointingHIDEditor.h	(revision 101011)
@@ -32,10 +32,6 @@
 #endif
 
-/* Qt includes: */
-#include <QWidget>
-
 /* GUI includes: */
-#include "QIWithRetranslateUI.h"
-#include "UILibraryDefs.h"
+#include "UIEditor.h"
 
 /* COM includes: */
@@ -47,6 +43,6 @@
 class QLabel;
 
-/** QWidget subclass used as a pointing HID editor. */
-class SHARED_LIBRARY_STUFF UIPointingHIDEditor : public QIWithRetranslateUI<QWidget>
+/** UIEditor sub-class used as a pointing HID editor. */
+class SHARED_LIBRARY_STUFF UIPointingHIDEditor : public UIEditor
 {
     Q_OBJECT;
Index: trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UIProcessorFeaturesEditor.cpp
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UIProcessorFeaturesEditor.cpp	(revision 101010)
+++ trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UIProcessorFeaturesEditor.cpp	(revision 101011)
@@ -36,5 +36,5 @@
 
 UIProcessorFeaturesEditor::UIProcessorFeaturesEditor(QWidget *pParent /* = 0 */)
-    : QIWithRetranslateUI<QWidget>(pParent)
+    : UIEditor(pParent)
     , m_fEnablePae(false)
     , m_fEnableNestedVirtualization(false)
Index: trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UIProcessorFeaturesEditor.h
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UIProcessorFeaturesEditor.h	(revision 101010)
+++ trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UIProcessorFeaturesEditor.h	(revision 101011)
@@ -33,5 +33,5 @@
 
 /* GUI includes: */
-#include "QIWithRetranslateUI.h"
+#include "UIEditor.h"
 
 /* Forward declarations: */
@@ -40,6 +40,6 @@
 class QLabel;
 
-/** QWidget subclass used as processor features editor. */
-class SHARED_LIBRARY_STUFF UIProcessorFeaturesEditor : public QIWithRetranslateUI<QWidget>
+/** UIEditor sub-class used as processor features editor. */
+class SHARED_LIBRARY_STUFF UIProcessorFeaturesEditor : public UIEditor
 {
     Q_OBJECT;
Index: trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UIProxyFeaturesEditor.cpp
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UIProxyFeaturesEditor.cpp	(revision 101010)
+++ trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UIProxyFeaturesEditor.cpp	(revision 101011)
@@ -39,5 +39,5 @@
 
 UIProxyFeaturesEditor::UIProxyFeaturesEditor(QWidget *pParent /* = 0 */)
-    : QIWithRetranslateUI<QWidget>(pParent)
+    : UIEditor(pParent)
     , m_enmProxyMode(KProxyMode_Max)
     , m_pButtonGroup(0)
Index: trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UIProxyFeaturesEditor.h
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UIProxyFeaturesEditor.h	(revision 101010)
+++ trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UIProxyFeaturesEditor.h	(revision 101011)
@@ -33,5 +33,5 @@
 
 /* GUI includes: */
-#include "QIWithRetranslateUI.h"
+#include "UIEditor.h"
 
 /* COM includes: */
@@ -44,6 +44,6 @@
 class QILineEdit;
 
-/** QWidget subclass used as global proxy features editor. */
-class SHARED_LIBRARY_STUFF UIProxyFeaturesEditor : public QIWithRetranslateUI<QWidget>
+/** UIEditor sub-class used as global proxy features editor. */
+class SHARED_LIBRARY_STUFF UIProxyFeaturesEditor : public UIEditor
 {
     Q_OBJECT;
Index: trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UIRecordingSettingsEditor.cpp
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UIRecordingSettingsEditor.cpp	(revision 101010)
+++ trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UIRecordingSettingsEditor.cpp	(revision 101011)
@@ -51,5 +51,5 @@
 
 UIRecordingSettingsEditor::UIRecordingSettingsEditor(QWidget *pParent /* = 0 */)
-    : QIWithRetranslateUI<QWidget>(pParent)
+    : UIEditor(pParent)
     , m_fFeatureEnabled(false)
     , m_fOptionsAvailable(false)
Index: trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UIRecordingSettingsEditor.h
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UIRecordingSettingsEditor.h	(revision 101010)
+++ trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UIRecordingSettingsEditor.h	(revision 101011)
@@ -33,12 +33,9 @@
 
 /* GUI includes: */
-#include "QIWithRetranslateUI.h"
+#include "UIEditor.h"
 #include "UISettingsDefs.h"
 
 /* COM includes: */
 #include "COMEnums.h"
-
-/* Other VBox includes: */
-#include <VBox/com/com.h>
 
 /* Forward declarations: */
@@ -52,6 +49,6 @@
 class UIFilmContainer;
 
-/** QWidget subclass used as a recording settings editor. */
-class SHARED_LIBRARY_STUFF UIRecordingSettingsEditor : public QIWithRetranslateUI<QWidget>
+/** UIEditor sub-class used as a recording settings editor. */
+class SHARED_LIBRARY_STUFF UIRecordingSettingsEditor : public UIEditor
 {
     Q_OBJECT;
Index: trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UIScaleFactorEditor.cpp
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UIScaleFactorEditor.cpp	(revision 101010)
+++ trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UIScaleFactorEditor.cpp	(revision 101011)
@@ -44,5 +44,5 @@
 
 UIScaleFactorEditor::UIScaleFactorEditor(QWidget *pParent)
-    : QIWithRetranslateUI<QWidget>(pParent)
+    : UIEditor(pParent)
     , m_pLayout(0)
     , m_pLabel(0)
Index: trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UIScaleFactorEditor.h
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UIScaleFactorEditor.h	(revision 101010)
+++ trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UIScaleFactorEditor.h	(revision 101011)
@@ -33,6 +33,5 @@
 
 /* GUI includes: */
-#include "QIWithRetranslateUI.h"
-#include "UILibraryDefs.h"
+#include "UIEditor.h"
 
 /* Forward declarations: */
@@ -41,11 +40,10 @@
 class QLabel;
 class QSpinBox;
-class QWidget;
 class QIAdvancedSlider;
 
-/** QWidget reimplementation providing GUI with monitor scale factor editing functionality.
+/** UIEditor sub-class providing GUI with monitor scale factor editing functionality.
   * It includes a combo box to select a monitor, a slider, and a spinbox to display/modify values.
   * The first item in the combo box is used to change the scale factor of all monitors. */
-class SHARED_LIBRARY_STUFF UIScaleFactorEditor : public QIWithRetranslateUI<QWidget>
+class SHARED_LIBRARY_STUFF UIScaleFactorEditor : public UIEditor
 {
     Q_OBJECT;
Index: trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UISharedClipboardEditor.cpp
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UISharedClipboardEditor.cpp	(revision 101010)
+++ trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UISharedClipboardEditor.cpp	(revision 101011)
@@ -42,5 +42,5 @@
 
 UISharedClipboardEditor::UISharedClipboardEditor(QWidget *pParent /* = 0 */)
-    : QIWithRetranslateUI<QWidget>(pParent)
+    : UIEditor(pParent)
     , m_enmValue(KClipboardMode_Max)
     , m_pLabel(0)
Index: trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UISharedClipboardEditor.h
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UISharedClipboardEditor.h	(revision 101010)
+++ trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UISharedClipboardEditor.h	(revision 101011)
@@ -32,10 +32,6 @@
 #endif
 
-/* Qt includes: */
-#include <QWidget>
-
 /* GUI includes: */
-#include "QIWithRetranslateUI.h"
-#include "UILibraryDefs.h"
+#include "UIEditor.h"
 
 /* COM includes: */
@@ -47,6 +43,6 @@
 class QLabel;
 
-/** QWidget subclass used as a shared clipboard editor. */
-class SHARED_LIBRARY_STUFF UISharedClipboardEditor : public QIWithRetranslateUI<QWidget>
+/** UIEditor sub-class used as a shared clipboard editor. */
+class SHARED_LIBRARY_STUFF UISharedClipboardEditor : public UIEditor
 {
     Q_OBJECT;
Index: trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UISharedFoldersEditor.cpp
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UISharedFoldersEditor.cpp	(revision 101010)
+++ trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UISharedFoldersEditor.cpp	(revision 101011)
@@ -277,5 +277,5 @@
 
 UISharedFoldersEditor::UISharedFoldersEditor(QWidget *pParent /* = 0 */)
-    : QIWithRetranslateUI<QWidget>(pParent)
+    : UIEditor(pParent)
     , m_pLabelSeparator(0)
     , m_pLayoutTree(0)
@@ -394,5 +394,5 @@
 {
     /* Call to base-class: */
-    QIWithRetranslateUI<QWidget>::showEvent(pEvent);
+    UIEditor::showEvent(pEvent);
 
     /* Connect header-resize signal just before widget is shown
Index: trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UISharedFoldersEditor.h
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UISharedFoldersEditor.h	(revision 101010)
+++ trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UISharedFoldersEditor.h	(revision 101011)
@@ -33,5 +33,5 @@
 
 /* GUI includes: */
-#include "QIWithRetranslateUI.h"
+#include "UIEditor.h"
 #include "UIExtraDataDefs.h"
 
@@ -90,6 +90,6 @@
 };
 
-/** QWidget subclass used as a shared folders editor. */
-class SHARED_LIBRARY_STUFF UISharedFoldersEditor : public QIWithRetranslateUI<QWidget>
+/** UIEditor sub-class used as a shared folders editor. */
+class SHARED_LIBRARY_STUFF UISharedFoldersEditor : public UIEditor
 {
     Q_OBJECT;
Index: trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UIShortcutConfigurationEditor.cpp
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UIShortcutConfigurationEditor.cpp	(revision 101010)
+++ trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UIShortcutConfigurationEditor.cpp	(revision 101011)
@@ -820,5 +820,5 @@
 
 UIShortcutConfigurationEditor::UIShortcutConfigurationEditor(QWidget *pParent /* = 0 */)
-    : QIWithRetranslateUI<QWidget>(pParent)
+    : UIEditor(pParent)
     , m_pModelManager(0)
     , m_pModelRuntime(0)
Index: trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UIShortcutConfigurationEditor.h
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UIShortcutConfigurationEditor.h	(revision 101010)
+++ trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UIShortcutConfigurationEditor.h	(revision 101011)
@@ -33,5 +33,5 @@
 
 /* GUI includes: */
-#include "QIWithRetranslateUI.h"
+#include "UIEditor.h"
 
 /* Forward declartions: */
@@ -152,6 +152,6 @@
 typedef QList<UIShortcutConfigurationItem> UIShortcutConfigurationList;
 
-/** QWidget subclass used as a shortcut configuration editor. */
-class SHARED_LIBRARY_STUFF UIShortcutConfigurationEditor : public QIWithRetranslateUI<QWidget>
+/** UIEditor sub-class used as a shortcut configuration editor. */
+class SHARED_LIBRARY_STUFF UIShortcutConfigurationEditor : public UIEditor
 {
     Q_OBJECT;
Index: trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UISnapshotFolderEditor.cpp
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UISnapshotFolderEditor.cpp	(revision 101010)
+++ trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UISnapshotFolderEditor.cpp	(revision 101011)
@@ -37,5 +37,5 @@
 
 UISnapshotFolderEditor::UISnapshotFolderEditor(QWidget *pParent /* = 0 */)
-    : QIWithRetranslateUI<QWidget>(pParent)
+    : UIEditor(pParent)
     , m_pLabel(0)
     , m_pSelector(0)
Index: trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UISnapshotFolderEditor.h
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UISnapshotFolderEditor.h	(revision 101010)
+++ trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UISnapshotFolderEditor.h	(revision 101011)
@@ -32,10 +32,6 @@
 #endif
 
-/* Qt includes: */
-#include <QWidget>
-
 /* GUI includes: */
-#include "QIWithRetranslateUI.h"
-#include "UILibraryDefs.h"
+#include "UIEditor.h"
 
 /* Forward declarations: */
@@ -44,6 +40,6 @@
 class UIFilePathSelector;
 
-/** QWidget subclass used as a snapshot folder editor. */
-class SHARED_LIBRARY_STUFF UISnapshotFolderEditor : public QIWithRetranslateUI<QWidget>
+/** UIEditor sub-class used as a snapshot folder editor. */
+class SHARED_LIBRARY_STUFF UISnapshotFolderEditor : public UIEditor
 {
     Q_OBJECT;
Index: trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UIStorageSettingsEditor.cpp
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UIStorageSettingsEditor.cpp	(revision 101010)
+++ trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UIStorageSettingsEditor.cpp	(revision 101011)
@@ -2825,5 +2825,5 @@
 
 UIStorageSettingsEditor::UIStorageSettingsEditor(QWidget *pParent /* = 0 */)
-    : QIWithRetranslateUI<QWidget>(pParent)
+    : UIEditor(pParent)
     , m_fLoadingInProgress(0)
     , m_enmConfigurationAccessLevel(ConfigurationAccessLevel_Null)
@@ -3213,5 +3213,5 @@
 
     /* Call to base-class: */
-    QIWithRetranslateUI<QWidget>::showEvent(pEvent);
+    UIEditor::showEvent(pEvent);
 }
 
Index: trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UIStorageSettingsEditor.h
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UIStorageSettingsEditor.h	(revision 101010)
+++ trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UIStorageSettingsEditor.h	(revision 101011)
@@ -33,5 +33,5 @@
 
 /* GUI includes: */
-#include "QIWithRetranslateUI.h"
+#include "UIEditor.h"
 #include "UIMediumDefs.h"
 #include "UISettingsDefs.h"
@@ -164,6 +164,6 @@
 };
 
-/** QWidget subclass used as acceleration features editor. */
-class SHARED_LIBRARY_STUFF UIStorageSettingsEditor : public QIWithRetranslateUI<QWidget>
+/** UIEditor sub-class used as acceleration features editor. */
+class SHARED_LIBRARY_STUFF UIStorageSettingsEditor : public UIEditor
 {
     Q_OBJECT;
Index: trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UITpmEditor.cpp
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UITpmEditor.cpp	(revision 101010)
+++ trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UITpmEditor.cpp	(revision 101011)
@@ -42,5 +42,5 @@
 
 UITpmEditor::UITpmEditor(QWidget *pParent /* = 0 */)
-    : QIWithRetranslateUI<QWidget>(pParent)
+    : UIEditor(pParent)
     , m_enmValue(KTpmType_Max)
     , m_pLabel(0)
Index: trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UITpmEditor.h
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UITpmEditor.h	(revision 101010)
+++ trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UITpmEditor.h	(revision 101011)
@@ -32,10 +32,6 @@
 #endif
 
-/* Qt includes: */
-#include <QWidget>
-
 /* GUI includes: */
-#include "QIWithRetranslateUI.h"
-#include "UILibraryDefs.h"
+#include "UIEditor.h"
 
 /* COM includes: */
@@ -47,6 +43,6 @@
 class QLabel;
 
-/** QWidget subclass used as a TPM editor. */
-class SHARED_LIBRARY_STUFF UITpmEditor : public QIWithRetranslateUI<QWidget>
+/** UIEditor sub-class used as a TPM editor. */
+class SHARED_LIBRARY_STUFF UITpmEditor : public UIEditor
 {
     Q_OBJECT;
Index: trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UIUSBControllerEditor.cpp
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UIUSBControllerEditor.cpp	(revision 101010)
+++ trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UIUSBControllerEditor.cpp	(revision 101011)
@@ -40,5 +40,5 @@
 
 UIUSBControllerEditor::UIUSBControllerEditor(QWidget *pParent /* = 0 */)
-    : QIWithRetranslateUI<QWidget>(pParent)
+    : UIEditor(pParent)
     , m_enmValue(KUSBControllerType_Max)
     , m_pRadioButtonUSB1(0)
Index: trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UIUSBControllerEditor.h
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UIUSBControllerEditor.h	(revision 101010)
+++ trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UIUSBControllerEditor.h	(revision 101011)
@@ -32,10 +32,6 @@
 #endif
 
-/* Qt includes: */
-#include <QWidget>
-
 /* GUI includes: */
-#include "QIWithRetranslateUI.h"
-#include "UILibraryDefs.h"
+#include "UIEditor.h"
 
 /* COM includes: */
@@ -45,6 +41,6 @@
 class QRadioButton;
 
-/** QWidget subclass used as a USB controller editor. */
-class SHARED_LIBRARY_STUFF UIUSBControllerEditor : public QIWithRetranslateUI<QWidget>
+/** UIEditor sub-class used as a USB controller editor. */
+class SHARED_LIBRARY_STUFF UIUSBControllerEditor : public UIEditor
 {
     Q_OBJECT;
@@ -88,9 +84,9 @@
 
     /** Holds the USB1 radio-button instance. */
-    QRadioButton     *m_pRadioButtonUSB1;
+    QRadioButton *m_pRadioButtonUSB1;
     /** Holds the USB2 radio-button instance. */
-    QRadioButton     *m_pRadioButtonUSB2;
+    QRadioButton *m_pRadioButtonUSB2;
     /** Holds the USB3 radio-button instance. */
-    QRadioButton     *m_pRadioButtonUSB3;
+    QRadioButton *m_pRadioButtonUSB3;
 };
 
Index: trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UIUSBFiltersEditor.cpp
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UIUSBFiltersEditor.cpp	(revision 101010)
+++ trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UIUSBFiltersEditor.cpp	(revision 101011)
@@ -213,5 +213,5 @@
 
 UIUSBFiltersEditor::UIUSBFiltersEditor(QWidget *pParent /* = 0 */)
-    : QIWithRetranslateUI<QWidget>(pParent)
+    : UIEditor(pParent)
     , m_pLabelSeparator(0)
     , m_pLayoutTree(0)
Index: trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UIUSBFiltersEditor.h
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UIUSBFiltersEditor.h	(revision 101010)
+++ trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UIUSBFiltersEditor.h	(revision 101011)
@@ -33,5 +33,5 @@
 
 /* GUI includes: */
-#include "QIWithRetranslateUI.h"
+#include "UIEditor.h"
 #include "UIExtraDataDefs.h"
 
@@ -97,6 +97,6 @@
 };
 
-/** QWidget subclass used as a USB filters editor. */
-class SHARED_LIBRARY_STUFF UIUSBFiltersEditor : public QIWithRetranslateUI<QWidget>
+/** UIEditor sub-class used as a USB filters editor. */
+class SHARED_LIBRARY_STUFF UIUSBFiltersEditor : public UIEditor
 {
     Q_OBJECT;
Index: trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UIUSBSettingsEditor.cpp
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UIUSBSettingsEditor.cpp	(revision 101010)
+++ trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UIUSBSettingsEditor.cpp	(revision 101011)
@@ -37,5 +37,5 @@
 
 UIUSBSettingsEditor::UIUSBSettingsEditor(QWidget *pParent /* = 0 */)
-    : QIWithRetranslateUI<QWidget>(pParent)
+    : UIEditor(pParent)
     , m_fFeatureEnabled(false)
     , m_pCheckboxFeature(0)
Index: trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UIUSBSettingsEditor.h
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UIUSBSettingsEditor.h	(revision 101010)
+++ trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UIUSBSettingsEditor.h	(revision 101011)
@@ -32,10 +32,6 @@
 #endif
 
-/* Qt includes: */
-#include <QWidget>
-
 /* GUI includes: */
-#include "QIWithRetranslateUI.h"
-#include "UILibraryDefs.h"
+#include "UIEditor.h"
 #include "UIUSBFiltersEditor.h"
 
@@ -47,6 +43,6 @@
 class UIUSBControllerEditor;
 
-/** QWidget subclass used as a USB settings editor. */
-class SHARED_LIBRARY_STUFF UIUSBSettingsEditor : public QIWithRetranslateUI<QWidget>
+/** UIEditor sub-class used as a USB settings editor. */
+class SHARED_LIBRARY_STUFF UIUSBSettingsEditor : public UIEditor
 {
     Q_OBJECT;
Index: trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UIUpdateSettingsEditor.cpp
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UIUpdateSettingsEditor.cpp	(revision 101010)
+++ trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UIUpdateSettingsEditor.cpp	(revision 101011)
@@ -39,5 +39,5 @@
 
 UIUpdateSettingsEditor::UIUpdateSettingsEditor(QWidget *pParent /* = 0 */)
-    : QIWithRetranslateUI<QWidget>(pParent)
+    : UIEditor(pParent)
     , m_pCheckBox(0)
     , m_pWidgetUpdateSettings(0)
Index: trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UIUpdateSettingsEditor.h
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UIUpdateSettingsEditor.h	(revision 101010)
+++ trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UIUpdateSettingsEditor.h	(revision 101011)
@@ -36,5 +36,5 @@
 
 /* GUI includes: */
-#include "QIWithRetranslateUI.h"
+#include "UIEditor.h"
 #include "UIUpdateDefs.h"
 
@@ -46,6 +46,6 @@
 class QLabel;
 
-/** QWidget subclass used as a update settings editor. */
-class SHARED_LIBRARY_STUFF UIUpdateSettingsEditor : public QIWithRetranslateUI<QWidget>
+/** UIEditor sub-class used as a update settings editor. */
+class SHARED_LIBRARY_STUFF UIUpdateSettingsEditor : public UIEditor
 {
     Q_OBJECT;
Index: trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UIVRDEAuthLibraryEditor.cpp
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UIVRDEAuthLibraryEditor.cpp	(revision 101010)
+++ trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UIVRDEAuthLibraryEditor.cpp	(revision 101011)
@@ -37,5 +37,5 @@
 
 UIVRDEAuthLibraryEditor::UIVRDEAuthLibraryEditor(QWidget *pParent /* = 0 */)
-    : QIWithRetranslateUI<QWidget>(pParent)
+    : UIEditor(pParent)
     , m_strValue(QString())
     , m_pLabel(0)
Index: trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UIVRDEAuthLibraryEditor.h
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UIVRDEAuthLibraryEditor.h	(revision 101010)
+++ trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UIVRDEAuthLibraryEditor.h	(revision 101011)
@@ -32,10 +32,6 @@
 #endif
 
-/* Qt includes: */
-#include <QWidget>
-
 /* GUI includes: */
-#include "QIWithRetranslateUI.h"
-#include "UILibraryDefs.h"
+#include "UIEditor.h"
 
 /* Forward declarations: */
@@ -44,6 +40,6 @@
 class UIFilePathSelector;
 
-/** QWidget subclass used as a VRDE auth library editor. */
-class SHARED_LIBRARY_STUFF UIVRDEAuthLibraryEditor : public QIWithRetranslateUI<QWidget>
+/** UIEditor sub-class used as a VRDE auth library editor. */
+class SHARED_LIBRARY_STUFF UIVRDEAuthLibraryEditor : public UIEditor
 {
     Q_OBJECT;
Index: trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UIVRDESettingsEditor.cpp
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UIVRDESettingsEditor.cpp	(revision 101010)
+++ trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UIVRDESettingsEditor.cpp	(revision 101011)
@@ -39,5 +39,5 @@
 
 UIVRDESettingsEditor::UIVRDESettingsEditor(QWidget *pParent /* = 0 */)
-    : QIWithRetranslateUI<QWidget>(pParent)
+    : UIEditor(pParent)
     , m_fFeatureEnabled(false)
     , m_enmAuthType(KAuthType_Max)
Index: trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UIVRDESettingsEditor.h
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UIVRDESettingsEditor.h	(revision 101010)
+++ trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UIVRDESettingsEditor.h	(revision 101011)
@@ -33,5 +33,5 @@
 
 /* GUI includes: */
-#include "QIWithRetranslateUI.h"
+#include "UIEditor.h"
 
 /* COM includes: */
@@ -45,6 +45,6 @@
 class QWidget;
 
-/** QWidget subclass used as a VRDE settings editor. */
-class SHARED_LIBRARY_STUFF UIVRDESettingsEditor : public QIWithRetranslateUI<QWidget>
+/** UIEditor sub-class used as a VRDE settings editor. */
+class SHARED_LIBRARY_STUFF UIVRDESettingsEditor : public UIEditor
 {
     Q_OBJECT;
Index: trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UIVideoMemoryEditor.cpp
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UIVideoMemoryEditor.cpp	(revision 101010)
+++ trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UIVideoMemoryEditor.cpp	(revision 101011)
@@ -43,5 +43,5 @@
 
 UIVideoMemoryEditor::UIVideoMemoryEditor(QWidget *pParent /* = 0 */)
-    : QIWithRetranslateUI<QWidget>(pParent)
+    : UIEditor(pParent)
     , m_iValue(0)
     , m_comGuestOSType(CGuestOSType())
Index: trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UIVideoMemoryEditor.h
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UIVideoMemoryEditor.h	(revision 101010)
+++ trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UIVideoMemoryEditor.h	(revision 101011)
@@ -32,10 +32,6 @@
 #endif
 
-/* Qt includes: */
-#include <QWidget>
-
 /* GUI includes: */
-#include "QIWithRetranslateUI.h"
-#include "UILibraryDefs.h"
+#include "UIEditor.h"
 
 /* COM includes: */
@@ -49,6 +45,6 @@
 class QIAdvancedSlider;
 
-/** QWidget subclass used as a video memory editor. */
-class SHARED_LIBRARY_STUFF UIVideoMemoryEditor : public QIWithRetranslateUI<QWidget>
+/** UIEditor sub-class used as a video memory editor. */
+class SHARED_LIBRARY_STUFF UIVideoMemoryEditor : public UIEditor
 {
     Q_OBJECT;
Index: trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UIVirtualCPUEditor.cpp
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UIVirtualCPUEditor.cpp	(revision 101010)
+++ trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UIVirtualCPUEditor.cpp	(revision 101011)
@@ -43,5 +43,5 @@
 
 UIVirtualCPUEditor::UIVirtualCPUEditor(QWidget *pParent /* = 0 */)
-    : QIWithRetranslateUI<QWidget>(pParent)
+    : UIEditor(pParent)
     , m_uMinVCPUCount(1)
     , m_uMaxVCPUCount(1)
Index: trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UIVirtualCPUEditor.h
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UIVirtualCPUEditor.h	(revision 101010)
+++ trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UIVirtualCPUEditor.h	(revision 101011)
@@ -32,9 +32,6 @@
 #endif
 
-/* Qt includes: */
-#include <QWidget>
-
 /* GUI includes: */
-#include "QIWithRetranslateUI.h"
+#include "UIEditor.h"
 
 /* Forward declarations: */
@@ -44,6 +41,6 @@
 class QIAdvancedSlider;
 
-/** QWidget subclass used as a virtual CPU editor. */
-class SHARED_LIBRARY_STUFF UIVirtualCPUEditor : public QIWithRetranslateUI<QWidget>
+/** UIEditor sub-class used as a virtual CPU editor. */
+class SHARED_LIBRARY_STUFF UIVirtualCPUEditor : public UIEditor
 {
     Q_OBJECT;
Index: trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UIVisualStateEditor.cpp
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UIVisualStateEditor.cpp	(revision 101010)
+++ trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UIVisualStateEditor.cpp	(revision 101011)
@@ -40,5 +40,5 @@
 
 UIVisualStateEditor::UIVisualStateEditor(QWidget *pParent /* = 0 */)
-    : QIWithRetranslateUI<QWidget>(pParent)
+    : UIEditor(pParent)
     , m_enmValue(UIVisualStateType_Invalid)
     , m_pLayout(0)
Index: trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UIVisualStateEditor.h
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UIVisualStateEditor.h	(revision 101010)
+++ trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UIVisualStateEditor.h	(revision 101011)
@@ -34,10 +34,8 @@
 /* Qt includes: */
 #include <QUuid>
-#include <QWidget>
 
 /* GUI includes: */
-#include "QIWithRetranslateUI.h"
+#include "UIEditor.h"
 #include "UIExtraDataDefs.h"
-#include "UILibraryDefs.h"
 
 /* Forward declarations: */
@@ -46,6 +44,6 @@
 class QLabel;
 
-/** QWidget subclass used as a visual state editor. */
-class SHARED_LIBRARY_STUFF UIVisualStateEditor : public QIWithRetranslateUI<QWidget>
+/** UIEditor sub-class used as a visual state editor. */
+class SHARED_LIBRARY_STUFF UIVisualStateEditor : public UIEditor
 {
     Q_OBJECT;
Index: trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIMenuBarEditorWindow.cpp
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIMenuBarEditorWindow.cpp	(revision 101010)
+++ trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIMenuBarEditorWindow.cpp	(revision 101011)
@@ -333,5 +333,5 @@
                                              const QUuid &uMachineID /* = QUuid() */,
                                              UIActionPool *pActionPool /* = 0 */)
-    : QIWithRetranslateUI2<QWidget>(pParent)
+    : UIEditor(pParent)
     , m_fPrepared(false)
     , m_fStartedFromVMSettings(fStartedFromVMSettings)
Index: trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIMenuBarEditorWindow.h
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIMenuBarEditorWindow.h	(revision 101010)
+++ trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIMenuBarEditorWindow.h	(revision 101011)
@@ -37,7 +37,6 @@
 
 /* GUI includes: */
-#include "QIWithRetranslateUI.h"
+#include "UIEditor.h"
 #include "UIExtraDataDefs.h"
-#include "UILibraryDefs.h"
 #include "UISlidingToolBar.h"
 
@@ -72,7 +71,7 @@
 
 
-/** QWidget subclass
+/** UIEditor sub-class
   * used as menu-bar editor widget. */
-class SHARED_LIBRARY_STUFF UIMenuBarEditorWidget : public QIWithRetranslateUI2<QWidget>
+class SHARED_LIBRARY_STUFF UIMenuBarEditorWidget : public UIEditor
 {
     Q_OBJECT;
Index: trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIStatusBarEditorWindow.cpp
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIStatusBarEditorWindow.cpp	(revision 101010)
+++ trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIStatusBarEditorWindow.cpp	(revision 101011)
@@ -443,5 +443,5 @@
                                                  bool fStartedFromVMSettings /* = true */,
                                                  const QUuid &uMachineID /* = QString() */)
-    : QIWithRetranslateUI2<QWidget>(pParent)
+    : UIEditor(pParent)
     , m_fPrepared(false)
     , m_fStartedFromVMSettings(fStartedFromVMSettings)
Index: trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIStatusBarEditorWindow.h
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIStatusBarEditorWindow.h	(revision 101010)
+++ trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIStatusBarEditorWindow.h	(revision 101011)
@@ -38,7 +38,6 @@
 
 /* GUI includes: */
-#include "QIWithRetranslateUI.h"
+#include "UIEditor.h"
 #include "UIExtraDataDefs.h"
-#include "UILibraryDefs.h"
 #include "UISlidingToolBar.h"
 
@@ -71,7 +70,7 @@
 
 
-/** QWidget subclass
+/** UIEditor sub-class
   * used as status-bar editor widget. */
-class SHARED_LIBRARY_STUFF UIStatusBarEditorWidget : public QIWithRetranslateUI2<QWidget>
+class SHARED_LIBRARY_STUFF UIStatusBarEditorWidget : public UIEditor
 {
     Q_OBJECT;
