Changeset 85800 in vbox

Timestamp:

Aug 17, 2020 1:04:27 PM (5 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

139957

Message:

FE/Qt: bugref:9812. Removing UIGlobalSettingsUpdate.ui

Location:

trunk/src/VBox/Frontends/VirtualBox

Files:

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

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

@@ -24 +24 @@
     src/settings/UISettingsDialog.ui \
     src/settings/global/UIGlobalSettingsGeneral.ui \
-    src/settings/global/UIGlobalSettingsUpdate.ui \
     src/settings/global/UIGlobalSettingsLanguage.ui \
     src/settings/global/UIGlobalSettingsDisplay.ui \

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

@@ -16 +16 @@
  */
 
+/* Qt includes: */
+#include <QCheckBox>
+#include <QComboBox>
+#include <QGridLayout>
+#include <QLabel>
+#include <QRadioButton>
+
 /* GUI includes: */
 #include "UIGlobalSettingsUpdate.h"
@@ -64 +71 @@
     : m_pLastChosenRadio(0)
     , m_pCache(0)
+    , m_pUpdateDateText(0)
+    , m_pUpdateDateLabel(0)
+    , m_pUpdatePeriodLabel(0)
+    , m_pUpdateFilterLabel(0)
+    , m_pCheckBoxUpdate(0)
+    , m_pComboBoxUpdatePeriod(0)
+    , m_pRadioUpdateFilterBetas(0)
+    , m_pRadioUpdateFilterEvery(0)
+    , m_pRadioUpdateFilterStable(0)
+    , m_pContainerUpdate(0)
 {
     /* Prepare: */
@@ -158 +175 @@
 void UIGlobalSettingsUpdate::retranslateUi()
 {
-    /* Translate uic generated strings: */
-    Ui::UIGlobalSettingsUpdate::retranslateUi(this);
+    m_pCheckBoxUpdate->setWhatsThis(tr("When checked, the application will "
+                                       "periodically connect to the VirtualBox website and check whether a "
+                                       "new VirtualBox version is available."));
+    m_pCheckBoxUpdate->setText(tr("&Check for Updates"));
+    m_pUpdatePeriodLabel->setText(tr("&Once per:"));
+    m_pComboBoxUpdatePeriod->setWhatsThis(tr("Selects how often the new version "
+                                             "check should be performed. Note that if you want to completely "
+                                             "disable this check, just clear the above check box."));
+    m_pUpdateDateLabel->setText(tr("Next Check:"));
+    m_pUpdateFilterLabel->setText(tr("Check for:"));
+    m_pRadioUpdateFilterStable->setWhatsThis(tr("<p>Choose this if you only wish to "
+                                                "be notified about stable updates to VirtualBox.</p>"));
+    m_pRadioUpdateFilterStable->setText(tr("&Stable Release Versions"));
+    m_pRadioUpdateFilterEvery->setWhatsThis(tr("<p>Choose this if you wish to be "
+                                               "notified about all new VirtualBox releases.</p>"));
+    m_pRadioUpdateFilterEvery->setText(tr("&All New Releases"));
+    m_pRadioUpdateFilterBetas->setWhatsThis(tr("<p>Choose this to be notified about "
+                                               "all new VirtualBox releases and pre-release versions of VirtualBox.</p>"));
+    m_pRadioUpdateFilterBetas->setText(tr("All New Releases and &Pre-Releases"));
 
     /* Retranslate m_pComboBoxUpdatePeriod combobox: */
@@ -197 +231 @@
 void UIGlobalSettingsUpdate::prepare()
 {
-    /* Apply UI decorations: */
-    Ui::UIGlobalSettingsUpdate::setupUi(this);
+    prepareWidgets();
 
     /* Prepare cache: */
@@ -216 +249 @@
     /* Apply language settings: */
     retranslateUi();
+}
+
+void UIGlobalSettingsUpdate::prepareWidgets()
+{
+    if (objectName().isEmpty())
+        setObjectName(QStringLiteral("UIGlobalSettingsUpdate"));
+    QGridLayout *pMainLayout = new QGridLayout(this);
+    pMainLayout->setContentsMargins(0, 0, 0, 0);
+    pMainLayout->setObjectName(QStringLiteral("gridLayout"));
+    m_pCheckBoxUpdate = new QCheckBox();
+    m_pCheckBoxUpdate->setObjectName(QStringLiteral("m_pCheckBoxUpdate"));
+    pMainLayout->addWidget(m_pCheckBoxUpdate, 0, 0, 1, 2);
+
+    QSpacerItem *pSpacerItem = new QSpacerItem(20, 0, QSizePolicy::Fixed, QSizePolicy::Minimum);
+    pMainLayout->addItem(pSpacerItem, 1, 0, 1, 1);
+
+    m_pContainerUpdate = new QWidget();
+    m_pContainerUpdate->setObjectName(QStringLiteral("m_pContainerUpdate"));
+    QGridLayout *pContainerLayoutUpdate = new QGridLayout(m_pContainerUpdate);
+    pContainerLayoutUpdate->setContentsMargins(0, 0, 0, 0);
+    pContainerLayoutUpdate->setObjectName(QStringLiteral("pContainerLayoutUpdate"));
+    pContainerLayoutUpdate->setContentsMargins(0, 0, 0, 0);
+    m_pUpdatePeriodLabel = new QLabel(m_pContainerUpdate);
+    m_pUpdatePeriodLabel->setObjectName(QStringLiteral("m_pUpdatePeriodLabel"));
+    m_pUpdatePeriodLabel->setAlignment(Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter);
+    pContainerLayoutUpdate->addWidget(m_pUpdatePeriodLabel, 0, 0, 1, 1);
+
+    QHBoxLayout *pHBoxLayout = new QHBoxLayout();
+    pHBoxLayout->setObjectName(QStringLiteral("pHBoxLayout"));
+    m_pComboBoxUpdatePeriod = new QComboBox(m_pContainerUpdate);
+    m_pComboBoxUpdatePeriod->setObjectName(QStringLiteral("m_pComboBoxUpdatePeriod"));
+    QSizePolicy sizePolicy(QSizePolicy::Minimum, QSizePolicy::Fixed);
+    sizePolicy.setHorizontalStretch(0);
+    sizePolicy.setVerticalStretch(0);
+    sizePolicy.setHeightForWidth(m_pComboBoxUpdatePeriod->sizePolicy().hasHeightForWidth());
+    m_pComboBoxUpdatePeriod->setSizePolicy(sizePolicy);
+    pHBoxLayout->addWidget(m_pComboBoxUpdatePeriod);
+
+    QSpacerItem *pSpacerItem1 = new QSpacerItem(0, 0, QSizePolicy::Expanding, QSizePolicy::Minimum);
+    pHBoxLayout->addItem(pSpacerItem1);
+
+    pContainerLayoutUpdate->addLayout(pHBoxLayout, 0, 1, 1, 1);
+
+    m_pUpdateDateLabel = new QLabel(m_pContainerUpdate);
+    m_pUpdateDateLabel->setObjectName(QStringLiteral("m_pUpdateDateLabel"));
+    m_pUpdateDateLabel->setAlignment(Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter);
+    pContainerLayoutUpdate->addWidget(m_pUpdateDateLabel, 1, 0, 1, 1);
+
+    m_pUpdateDateText = new QLabel(m_pContainerUpdate);
+    m_pUpdateDateText->setObjectName(QStringLiteral("m_pUpdateDateText"));
+    pContainerLayoutUpdate->addWidget(m_pUpdateDateText, 1, 1, 1, 1);
+
+    m_pUpdateFilterLabel = new QLabel(m_pContainerUpdate);
+    m_pUpdateFilterLabel->setObjectName(QStringLiteral("m_pUpdateFilterLabel"));
+    m_pUpdateFilterLabel->setAlignment(Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter);
+    pContainerLayoutUpdate->addWidget(m_pUpdateFilterLabel, 2, 0, 1, 1);
+
+    m_pRadioUpdateFilterStable = new QRadioButton(m_pContainerUpdate);
+    m_pRadioUpdateFilterStable->setObjectName(QStringLiteral("m_pRadioUpdateFilterStable"));
+    pContainerLayoutUpdate->addWidget(m_pRadioUpdateFilterStable, 2, 1, 1, 1);
+
+    m_pRadioUpdateFilterEvery = new QRadioButton(m_pContainerUpdate);
+    m_pRadioUpdateFilterEvery->setObjectName(QStringLiteral("m_pRadioUpdateFilterEvery"));
+    pContainerLayoutUpdate->addWidget(m_pRadioUpdateFilterEvery, 3, 1, 1, 1);
+
+    m_pRadioUpdateFilterBetas = new QRadioButton(m_pContainerUpdate);
+    m_pRadioUpdateFilterBetas->setObjectName(QStringLiteral("m_pRadioUpdateFilterBetas"));
+    pContainerLayoutUpdate->addWidget(m_pRadioUpdateFilterBetas, 4, 1, 1, 1);
+
+    pMainLayout->addWidget(m_pContainerUpdate, 1, 1, 1, 1);
+
+    QSpacerItem *pSpacerItem2 = new QSpacerItem(0, 0, QSizePolicy::Minimum, QSizePolicy::Expanding);
+    pMainLayout->addItem(pSpacerItem2, 2, 0, 1, 2);
+
+    m_pUpdatePeriodLabel->setBuddy(m_pComboBoxUpdatePeriod);
 }
 

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

@@ -24 +24 @@
 /* GUI includes: */
 #include "UISettingsPage.h"
-#include "UIGlobalSettingsUpdate.gen.h"
 #include "UIUpdateDefs.h"
 
 /* Forward declarations: */
+class QCheckBox;
+class QComboBox;
+class QLabel;
+class QRadioButton;
 struct UIDataSettingsGlobalUpdate;
 typedef UISettingsCache<UIDataSettingsGlobalUpdate> UISettingsCacheGlobalUpdate;
 
 /** Global settings: Update page. */
-class SHARED_LIBRARY_STUFF UIGlobalSettingsUpdate : public UISettingsPageGlobal,
-                                                    public Ui::UIGlobalSettingsUpdate
+class SHARED_LIBRARY_STUFF UIGlobalSettingsUpdate : public UISettingsPageGlobal
 {
     Q_OBJECT;
@@ -77 +79 @@
     /** Prepares all. */
     void prepare();
+    /** Prepares widgets. */
+    void prepareWidgets();
     /** Cleanups all. */
     void cleanup();
@@ -93 +97 @@
     /** Holds the page data cache instance. */
     UISettingsCacheGlobalUpdate *m_pCache;
+
+    /** @name Widgets
+     * @{ */
+       QLabel *m_pUpdateDateText;
+       QLabel *m_pUpdateDateLabel;
+       QLabel *m_pUpdatePeriodLabel;
+       QLabel *m_pUpdateFilterLabel;
+       QCheckBox *m_pCheckBoxUpdate;
+       QComboBox *m_pComboBoxUpdatePeriod;
+       QRadioButton *m_pRadioUpdateFilterBetas;
+       QRadioButton *m_pRadioUpdateFilterEvery;
+       QRadioButton *m_pRadioUpdateFilterStable;
+       QWidget *m_pContainerUpdate;
+    /** @} */
 };