Changeset 85679 in vbox for trunk/src/VBox

Timestamp:

Aug 11, 2020 6:47:35 AM (4 years ago)

Author:

vboxsync

Message:

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

Location:

trunk/src/VBox/Frontends/VirtualBox

Files:

• VBoxUI.pro (modified) (1 diff)
• src/settings/machine/UIMachineSettingsInterface.cpp (modified) (3 diffs)
• src/settings/machine/UIMachineSettingsInterface.h (modified) (3 diffs)
• src/settings/machine/UIMachineSettingsInterface.ui (deleted)
• src/settings/machine/UIMachineSettingsSFDetails.cpp (modified) (1 diff)

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

@@ -40 +40 @@
     src/settings/machine/UIMachineSettingsSerial.ui \
     src/settings/machine/UIMachineSettingsUSB.ui \
-    src/settings/machine/UIMachineSettingsUSBFilterDetails.ui \
-    src/settings/machine/UIMachineSettingsInterface.ui
+    src/settings/machine/UIMachineSettingsUSBFilterDetails.ui
+
 
 TRANSLATIONS = \

trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsInterface.cpp

@@ -16 +16 @@
  */
 
+/* Qt includes: */
+#include <QCheckBox>
+#include <QGridLayout>
+#include <QLabel>
+
 /* GUI includes: */
 #include "UIActionPool.h"
 #include "UIExtraDataManager.h"
 #include "UIMachineSettingsInterface.h"
-
+#include "UIStatusBarEditorWindow.h"
+#include "UIMenuBarEditorWindow.h"
+#include "UIVisualStateEditor.h"
 
 /** Machine settings: User Interface page data structure. */
@@ -285 +292 @@
 void UIMachineSettingsInterface::retranslateUi()
 {
-    /* Translate uic generated strings: */
-    Ui::UIMachineSettingsInterface::retranslateUi(this);
+    m_pMenuBarEditor->setWhatsThis(tr("Allows to modify VM menu-bar contents."));
+    m_pLabelVisualState->setText(tr("Visual State:"));
+    m_pVisualStateEditor->setWhatsThis(tr("Selects the visual state. If machine is running it will be applied as soon as possible, otherwise desired one will be defined."));
+    m_pLabelMiniToolBar->setText(tr("Mini ToolBar:"));
+    m_pCheckBoxShowMiniToolBar->setWhatsThis(tr("When checked, show the Mini ToolBar in full-screen and seamless modes."));
+    m_pCheckBoxShowMiniToolBar->setText(tr("Show in &Full-screen/Seamless"));
+    m_pComboToolBarAlignment->setWhatsThis(tr("When checked, show the Mini ToolBar at the top of the screen, rather than in its default position at the bottom of the screen."));
+    m_pComboToolBarAlignment->setText(tr("Show at &Top of Screen"));
+    m_pStatusBarEditor->setWhatsThis(tr("Allows to modify VM status-bar contents."));
 }
 
@@ -305 +319 @@
 }
 
+void UIMachineSettingsInterface::prepareWidgets()
+{
+    if (objectName().isEmpty())
+        setObjectName(QStringLiteral("UIMachineSettingsInterface"));
+    resize(350, 300);
+    QGridLayout *pLayoutMain = new QGridLayout(this);
+    pLayoutMain->setObjectName(QStringLiteral("pLayoutMain"));
+    m_pMenuBarEditor = new UIMenuBarEditorWidget(this);
+    m_pMenuBarEditor->setObjectName(QStringLiteral("m_pMenuBarEditor"));
+    QSizePolicy sizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::Fixed);
+    sizePolicy.setHorizontalStretch(0);
+    sizePolicy.setVerticalStretch(0);
+    sizePolicy.setHeightForWidth(m_pMenuBarEditor->sizePolicy().hasHeightForWidth());
+    m_pMenuBarEditor->setSizePolicy(sizePolicy);
+    pLayoutMain->addWidget(m_pMenuBarEditor, 0, 0, 1, 3);
+
+    m_pLabelVisualState = new QLabel;
+    m_pLabelVisualState->setObjectName(QStringLiteral("m_pLabelVisualState"));
+    m_pLabelVisualState->setAlignment(Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter);
+    pLayoutMain->addWidget(m_pLabelVisualState, 1, 0, 1, 1);
+
+    m_pVisualStateEditor = new UIVisualStateEditor;
+    m_pVisualStateEditor->setObjectName(QStringLiteral("m_pVisualStateEditor"));
+    pLayoutMain->addWidget(m_pVisualStateEditor, 1, 1, 1, 2);
+
+    m_pLabelMiniToolBar = new QLabel;
+    m_pLabelMiniToolBar->setObjectName(QStringLiteral("m_pLabelMiniToolBar"));
+    m_pLabelMiniToolBar->setAlignment(Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter);
+    pLayoutMain->addWidget(m_pLabelMiniToolBar, 2, 0, 1, 1);
+
+    m_pCheckBoxShowMiniToolBar = new QCheckBox;
+    m_pCheckBoxShowMiniToolBar->setObjectName(QStringLiteral("m_pCheckBoxShowMiniToolBar"));
+    sizePolicy.setHeightForWidth(m_pCheckBoxShowMiniToolBar->sizePolicy().hasHeightForWidth());
+    m_pCheckBoxShowMiniToolBar->setSizePolicy(sizePolicy);
+    m_pCheckBoxShowMiniToolBar->setChecked(true);
+    pLayoutMain->addWidget(m_pCheckBoxShowMiniToolBar, 2, 1, 1, 2);
+
+    m_pComboToolBarAlignment = new QCheckBox;
+    m_pComboToolBarAlignment->setObjectName(QStringLiteral("m_pComboToolBarAlignment"));
+    sizePolicy.setHeightForWidth(m_pComboToolBarAlignment->sizePolicy().hasHeightForWidth());
+    m_pComboToolBarAlignment->setSizePolicy(sizePolicy);
+    m_pComboToolBarAlignment->setChecked(false);
+    pLayoutMain->addWidget(m_pComboToolBarAlignment, 3, 1, 1, 2);
+
+    QSpacerItem *pSpacer = new QSpacerItem(0, 0, QSizePolicy::Minimum, QSizePolicy::Expanding);
+    pLayoutMain->addItem(pSpacer, 4, 0, 1, 3);
+
+    m_pStatusBarEditor = new UIStatusBarEditorWidget(this);
+    m_pStatusBarEditor->setObjectName(QStringLiteral("m_pStatusBarEditor"));
+    sizePolicy.setHeightForWidth(m_pStatusBarEditor->sizePolicy().hasHeightForWidth());
+    m_pStatusBarEditor->setSizePolicy(sizePolicy);
+    pLayoutMain->addWidget(m_pStatusBarEditor, 5, 0, 1, 3);
+
+    QObject::connect(m_pCheckBoxShowMiniToolBar, &QCheckBox::toggled,
+                     m_pComboToolBarAlignment, &UIMachineSettingsInterface::setEnabled);
+}
+
 void UIMachineSettingsInterface::prepare()
 {
-    /* Apply UI decorations: */
-    Ui::UIMachineSettingsInterface::setupUi(this);
+    prepareWidgets();
 
     /* Prepare cache: */

trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsInterface.h

@@ -24 +24 @@
 /* GUI includes: */
 #include "UISettingsPage.h"
-#include "UIMachineSettingsInterface.gen.h"
 
 /* Forward declarations: */
+class QCheckBox;
+class QLabel;
 class UIActionPool;
+class UIMenuBarEditorWidget;
+class UIStatusBarEditorWidget;
+class UIVisualStateEditor;
 struct UIDataSettingsMachineInterface;
 typedef UISettingsCache<UIDataSettingsMachineInterface> UISettingsCacheMachineInterface;
 
 /** Machine settings: User Interface page. */
-class SHARED_LIBRARY_STUFF UIMachineSettingsInterface : public UISettingsPageMachine,
-                                                        public Ui::UIMachineSettingsInterface
+class SHARED_LIBRARY_STUFF UIMachineSettingsInterface : public UISettingsPageMachine
 {
     Q_OBJECT;
@@ -73 +76 @@
     /** Prepares all. */
     void prepare();
+    /** Prepares widgets. */
+    void prepareWidgets();
     /** Cleanups all. */
     void cleanup();
@@ -94 +99 @@
     /** Holds the page data cache instance. */
     UISettingsCacheMachineInterface *m_pCache;
+
+    /** @name Widgets
+     * @{ */
+        UIStatusBarEditorWidget *m_pStatusBarEditor;
+        UIMenuBarEditorWidget *m_pMenuBarEditor;
+        QCheckBox *m_pCheckBoxShowMiniToolBar;
+        QCheckBox *m_pComboToolBarAlignment;
+        QLabel *m_pLabelVisualState;
+        UIVisualStateEditor *m_pVisualStateEditor;
+        QLabel *m_pLabelMiniToolBar;
+    /** @} */
 };
 

trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsSFDetails.cpp

@@ -203 +203 @@
 void UIMachineSettingsSFDetails::retranslateUi()
 {
-    m_pPathLabel->setText(QApplication::translate("UIMachineSettingsSFDetails", "Folder Path:"));
-    m_pNameLabel->setText(QApplication::translate("UIMachineSettingsSFDetails", "Folder Name:"));
-    m_pNameLineEdit->setToolTip(QApplication::translate("UIMachineSettingsSFDetails", "Holds the name of the shared folder (as it will be seen by the guest OS)."));
-    m_pReadonlyCheckBox->setToolTip(QApplication::translate("UIMachineSettingsSFDetails", "When checked, the guest OS will not be able to write to the specified shared folder."));
-    m_pReadonlyCheckBox->setText(QApplication::translate("UIMachineSettingsSFDetails", "&Read-only"));
-    m_pAutoMountCheckBox->setToolTip(QApplication::translate("UIMachineSettingsSFDetails", "When checked, the guest OS will try to automatically mount the shared folder on startup."));
-    m_pAutoMountCheckBox->setText(QApplication::translate("UIMachineSettingsSFDetails", "&Auto-mount"));
-    m_pAutoMountPointLabel->setText(QApplication::translate("UIMachineSettingsSFDetails", "Mount point:"));
-    m_pAutoMountPointLineEdit->setToolTip(QApplication::translate("UIMachineSettingsSFDetails", "Where to automatically mount the folder in the guest.  A drive letter (e.g. 'G:') for Windows and OS/2 guests, path for the others.  If left empty the guest will pick something fitting."));
-    m_pPermanentCheckBox->setToolTip(QApplication::translate("UIMachineSettingsSFDetails", "When checked, this shared folder will be permanent."));
-    m_pPermanentCheckBox->setText(QApplication::translate("UIMachineSettingsSFDetails", "&Make Permanent"));
+    m_pPathLabel->setText(tr("Folder Path:"));
+    m_pNameLabel->setText(tr("Folder Name:"));
+    m_pNameLineEdit->setToolTip(tr("Holds the name of the shared folder (as it will be seen by the guest OS)."));
+    m_pReadonlyCheckBox->setToolTip(tr("When checked, the guest OS will not be able to write to the specified shared folder."));
+    m_pReadonlyCheckBox->setText(tr("&Read-only"));
+    m_pAutoMountCheckBox->setToolTip(tr("When checked, the guest OS will try to automatically mount the shared folder on startup."));
+    m_pAutoMountCheckBox->setText(tr("&Auto-mount"));
+    m_pAutoMountPointLabel->setText(tr("Mount point:"));
+    m_pAutoMountPointLineEdit->setToolTip(tr("Where to automatically mount the folder in the guest.  A drive letter (e.g. 'G:') for Windows and OS/2 guests, path for the others.  If left empty the guest will pick something fitting."));
+    m_pPermanentCheckBox->setToolTip(tr("When checked, this shared folder will be permanent."));
+    m_pPermanentCheckBox->setText(tr("&Make Permanent"));
 
     switch (m_type)