Changeset 85822 in vbox

Timestamp:

Aug 18, 2020 2:22:24 PM (4 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:9812. Removing UIGlobalSettingsLanguage.ui and UIGlobalSettingsExtension.ui

Location:

trunk/src/VBox/Frontends/VirtualBox

Files:

• VBoxUI.pro (modified) (1 diff)
• src/settings/global/UIGlobalSettingsExtension.cpp (modified) (6 diffs)
• src/settings/global/UIGlobalSettingsExtension.h (modified) (4 diffs)
• src/settings/global/UIGlobalSettingsExtension.ui (deleted)
• src/settings/global/UIGlobalSettingsLanguage.cpp (modified) (5 diffs)
• src/settings/global/UIGlobalSettingsLanguage.h (modified) (3 diffs)
• src/settings/global/UIGlobalSettingsLanguage.ui (deleted)

trunk/src/VBox/Frontends/VirtualBox/VBoxUI.pro

@@ -22 +22 @@
 
 FORMS = \
-    src/settings/UISettingsDialog.ui \
-    src/settings/global/UIGlobalSettingsLanguage.ui \
-    src/settings/global/UIGlobalSettingsExtension.ui
+    src/settings/UISettingsDialog.ui
 
 TRANSLATIONS = \

trunk/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsExtension.cpp

@@ -18 +18 @@
 /* Qt includes: */
 #include <QHeaderView>
+#include <QGridLayout>
 #include <QMenu>
 #ifdef VBOX_WS_WIN
@@ -25 +26 @@
 /* GUI includes: */
 #include "QIFileDialog.h"
+#include "QILabelSeparator.h"
+#include "QITreeWidget.h"
 #include "UICommon.h"
 #include "UIGlobalSettingsExtension.h"
 #include "UIIconPool.h"
 #include "UIMessageCenter.h"
+#include "UIToolBar.h"
 
 /* COM includes: */
@@ -171 +175 @@
     : m_pActionAdd(0), m_pActionRemove(0)
     , m_pCache(0)
+    , m_pPackagesTree(0)
+    , m_pEntensionLabel(0)
+    , m_pPackagesToolbar(0)
 {
     /* Prepare: */
@@ -243 +250 @@
 void UIGlobalSettingsExtension::retranslateUi()
 {
-    /* Translate uic generated strings: */
-    Ui::UIGlobalSettingsExtension::retranslateUi(this);
+    m_pEntensionLabel->setText(tr("&Extension Packages"));
+    QTreeWidgetItem *pTreeWidgetItem = m_pPackagesTree->headerItem();
+    if (pTreeWidgetItem)
+    {
+        pTreeWidgetItem->setText(2, tr("Version"));
+        pTreeWidgetItem->setText(1, tr("Name"));
+        pTreeWidgetItem->setText(0, tr("Active"));
+    }
+    m_pPackagesTree->setWhatsThis(tr("Lists all installed packages."));
 
     /* Translate actions: */
@@ -408 +422 @@
 void UIGlobalSettingsExtension::prepare()
 {
-    /* Apply UI decorations: */
-    Ui::UIGlobalSettingsExtension::setupUi(this);
+    prepareWidgets();
 
     /* Prepare cache: */
@@ -456 +469 @@
 }
 
+void UIGlobalSettingsExtension::prepareWidgets()
+{
+    if (objectName().isEmpty())
+        setObjectName(QStringLiteral("UIGlobalSettingsExtension"));
+    QGridLayout *pMainLayout = new QGridLayout(this);
+    pMainLayout->setContentsMargins(0, 0, 0, 0);
+    pMainLayout->setObjectName(QStringLiteral("pMainLayout"));
+    m_pEntensionLabel = new QILabelSeparator();
+    m_pEntensionLabel->setObjectName(QStringLiteral("m_pEntensionLabel"));
+    pMainLayout->addWidget(m_pEntensionLabel, 0, 0, 1, 1);
+
+    QWidget *pExtensionPackContainer = new QWidget();
+    pExtensionPackContainer->setObjectName(QStringLiteral("pExtensionPackContainer"));
+    QHBoxLayout *pLayout1 = new QHBoxLayout(pExtensionPackContainer);
+    pLayout1->setSpacing(3);
+    pLayout1->setContentsMargins(0, 0, 0, 0);
+    pLayout1->setObjectName(QStringLiteral("pLayout1"));
+    m_pPackagesTree = new QITreeWidget(pExtensionPackContainer);
+    m_pPackagesTree->setObjectName(QStringLiteral("m_pPackagesTree"));
+    QSizePolicy sizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::MinimumExpanding);
+    sizePolicy.setHorizontalStretch(0);
+    sizePolicy.setVerticalStretch(0);
+    sizePolicy.setHeightForWidth(m_pPackagesTree->sizePolicy().hasHeightForWidth());
+    m_pPackagesTree->setSizePolicy(sizePolicy);
+    m_pPackagesTree->setMinimumSize(QSize(0, 150));
+    m_pPackagesTree->setRootIsDecorated(false);
+    pLayout1->addWidget(m_pPackagesTree);
+
+    m_pPackagesToolbar = new UIToolBar(pExtensionPackContainer);
+    m_pPackagesToolbar->setObjectName(QStringLiteral("m_pPackagesToolbar"));
+    pLayout1->addWidget(m_pPackagesToolbar);
+
+    pMainLayout->addWidget(pExtensionPackContainer, 1, 0, 1, 1);
+    m_pEntensionLabel->setBuddy(m_pPackagesTree);
+}
+
 void UIGlobalSettingsExtension::cleanup()
 {

trunk/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsExtension.h

@@ -24 +24 @@
 /* GUI includes: */
 #include "UISettingsPage.h"
-#include "UIGlobalSettingsExtension.gen.h"
 
 /* Forward declarations: */
+class QITreeWidget;
+class QTreeWidgetItem;
+class QILabelSeparator;
+class UIToolBar;
 struct UIDataSettingsGlobalExtension;
 struct UIDataSettingsGlobalExtensionItem;
@@ -32 +35 @@
 
 /** Global settings: Extension page. */
-class SHARED_LIBRARY_STUFF UIGlobalSettingsExtension : public UISettingsPageGlobal,
-                                                       public Ui::UIGlobalSettingsExtension
+class SHARED_LIBRARY_STUFF UIGlobalSettingsExtension : public UISettingsPageGlobal
 {
     Q_OBJECT;
@@ -79 +81 @@
     /** Prepares all. */
     void prepare();
+    /** Prepares widgets. */
+    void prepareWidgets();
     /** Cleanups all. */
     void cleanup();
@@ -92 +96 @@
     /** Holds the page data cache instance. */
     UISettingsCacheGlobalExtension *m_pCache;
+    /** @name Widgets
+     * @{ */
+       QITreeWidget *m_pPackagesTree;
+       QILabelSeparator *m_pEntensionLabel;
+       UIToolBar *m_pPackagesToolbar;
+    /** @} */
 };
 

trunk/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsLanguage.cpp

@@ -19 +19 @@
 #include <QDir>
 #include <QHeaderView>
+#include <QGridLayout>
 #include <QPainter>
 #include <QTranslator>
 
 /* GUI includes: */
+#include "QILabelSeparator.h"
+#include "QIRichTextLabel.h"
+#include "QITreeWidget.h"
 #include "UIGlobalSettingsLanguage.h"
 #include "UIExtraDataManager.h"
@@ -196 +200 @@
     : m_fPolished(false)
     , m_pCache(0)
+    , m_pLanguageTree(0)
+    , m_pLanguageLabel(0)
+    , m_pLanguageInfo(0)
 {
     /* Prepare: */
@@ -266 +273 @@
 void UIGlobalSettingsLanguage::retranslateUi()
 {
-    /* Translate uic generated strings: */
-    Ui::UIGlobalSettingsLanguage::retranslateUi(this);
+    m_pLanguageLabel->setText(tr("&Interface Languages"));
+    QTreeWidgetItem *pTreeWidgetItem = m_pLanguageTree->headerItem();
+    if (pTreeWidgetItem)
+    {
+        pTreeWidgetItem->setText(3, tr("Author"));
+        pTreeWidgetItem->setText(2, tr("Language"));
+        pTreeWidgetItem->setText(1, tr("Id"));
+        pTreeWidgetItem->setText(0, tr("Name"));
+    }
+    m_pLanguageTree->setWhatsThis(tr("Lists all available user interface "
+                                     "languages. The effective language is written in <b>bold</b>. "
+                                     "Select <i>Default</i> to reset to the system default language."));
 
     /* Reload language tree: */
@@ -329 +346 @@
 void UIGlobalSettingsLanguage::prepare()
 {
-    /* Apply UI decorations: */
-    Ui::UIGlobalSettingsLanguage::setupUi(this);
+    prepareWidgets();
 
     /* Prepare cache: */
@@ -366 +382 @@
 }
 
+void UIGlobalSettingsLanguage::prepareWidgets()
+{
+    if (objectName().isEmpty())
+        setObjectName(QStringLiteral("UIGlobalSettingsLanguage"));
+    QGridLayout *pMainLayout = new QGridLayout(this);
+    pMainLayout->setContentsMargins(0, 0, 0, 0);
+    pMainLayout->setObjectName(QStringLiteral("pMainLayout"));
+    m_pLanguageLabel = new QILabelSeparator();
+    m_pLanguageLabel->setObjectName(QStringLiteral("m_pLanguageLabel"));
+    pMainLayout->addWidget(m_pLanguageLabel, 0, 0, 1, 1);
+
+    m_pLanguageTree = new QITreeWidget();
+    m_pLanguageTree->setObjectName(QStringLiteral("m_pLanguageTree"));
+    m_pLanguageTree->setRootIsDecorated(false);
+    pMainLayout->addWidget(m_pLanguageTree, 1, 0, 1, 1);
+
+    m_pLanguageInfo = new QIRichTextLabel();
+    m_pLanguageInfo->setObjectName(QStringLiteral("m_pLanguageInfo"));
+
+    pMainLayout->addWidget(m_pLanguageInfo, 2, 0, 1, 1);
+    m_pLanguageLabel->setBuddy(m_pLanguageTree);
+}
+
 void UIGlobalSettingsLanguage::cleanup()
 {

trunk/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsLanguage.h

@@ -24 +24 @@
 /* GUI includes: */
 #include "UISettingsPage.h"
-#include "UIGlobalSettingsLanguage.gen.h"
 
 /* Forward declartions: */
+class QILabelSeparator;
+class QIRichTextLabel;
+class QITreeWidget;
+class QTreeWidgetItem;
 struct UIDataSettingsGlobalLanguage;
 typedef UISettingsCache<UIDataSettingsGlobalLanguage> UISettingsCacheGlobalLanguage;
 
 /** Global settings: Language page. */
-class SHARED_LIBRARY_STUFF UIGlobalSettingsLanguage : public UISettingsPageGlobal,
-                                                      public Ui::UIGlobalSettingsLanguage
+class SHARED_LIBRARY_STUFF UIGlobalSettingsLanguage : public UISettingsPageGlobal
 {
     Q_OBJECT;
@@ -79 +81 @@
     /** Prepares all. */
     void prepare();
+    /** Prepares widgets. */
+    void prepareWidgets();
     /** Cleanups all. */
     void cleanup();
@@ -93 +97 @@
     /** Holds the page data cache instance. */
     UISettingsCacheGlobalLanguage *m_pCache;
+
+    /** @name Widgets
+     * @{ */
+       QITreeWidget *m_pLanguageTree;
+       QILabelSeparator *m_pLanguageLabel;
+       QIRichTextLabel *m_pLanguageInfo;
+    /** @} */
 };