Changeset 103947 in vbox for trunk/src/VBox/Frontends/VirtualBox

Timestamp:

Mar 20, 2024 11:06:21 AM (13 months ago)

Author:

vboxsync

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

162323

Message:

FE/Qt. bugref:10622. Using new UITranslationEventListener in wizard classes. part 1.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• activity/vmactivity/UIVMActivityMonitor.h (modified) (6 diffs)
• wizards/editors/UIUserNamePasswordEditor.cpp (modified) (5 diffs)
• wizards/editors/UIUserNamePasswordEditor.h (modified) (4 diffs)
• wizards/importappliance/UIApplianceUnverifiedCertificateViewer.cpp (modified) (3 diffs)
• wizards/importappliance/UIApplianceUnverifiedCertificateViewer.h (modified) (3 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/activity/vmactivity/UIVMActivityMonitor.h

@@ -168 +168 @@
 protected:
 
-    //virtual bool eventFilter(QObject *pObj, QEvent *pEvent) RT_OVERRIDE;
+    //virtual bool eventFilter(QObject *pObj, QEvent *pEvent) override;
     virtual void obtainDataAndUpdate() = 0;
     virtual QString defaultMachineFolder() const = 0;
@@ -251 +251 @@
     UIVMActivityMonitorLocal(EmbedTo enmEmbedding, QWidget *pParent, const CMachine &machine);
     ~UIVMActivityMonitorLocal();
-    virtual QUuid machineId() const RT_OVERRIDE;
-    virtual QString machineName() const RT_OVERRIDE;
+    virtual QUuid machineId() const override;
+    virtual QString machineName() const override;
 
 public slots:
@@ -267 +267 @@
 protected:
 
-    virtual void obtainDataAndUpdate() RT_OVERRIDE;
-    virtual QString defaultMachineFolder() const RT_OVERRIDE;
-    virtual void reset() RT_OVERRIDE;
-    virtual void start() RT_OVERRIDE;
+    virtual void obtainDataAndUpdate() override;
+    virtual QString defaultMachineFolder() const override;
+    virtual void reset() override;
+    virtual void start() override;
 
 private slots:
@@ -294 +294 @@
     void resetNetworkInfoLabel();
     void resetDiskIOInfoLabel();
-    virtual void prepareWidgets() RT_OVERRIDE;
+    virtual void prepareWidgets() override;
 
     bool m_fGuestAdditionsAvailable;
@@ -318 +318 @@
 
     UIVMActivityMonitorCloud(EmbedTo enmEmbedding, QWidget *pParent, const CCloudMachine &machine);
-    virtual QUuid machineId() const RT_OVERRIDE;
-    virtual QString machineName() const RT_OVERRIDE;
+    virtual QUuid machineId() const override;
+    virtual QString machineName() const override;
     /** According to OCI docs returned time stamp is in RFC3339 format. */
     static QString formatCloudTimeStamp(const QString &strInput);
@@ -336 +336 @@
 private:
     void setMachine(const CCloudMachine &comMachine);
-    virtual void obtainDataAndUpdate() RT_OVERRIDE;
-
-    virtual QString defaultMachineFolder() const RT_OVERRIDE;
-    virtual void reset() RT_OVERRIDE;
-    virtual void start() RT_OVERRIDE;
-    virtual void prepareWidgets() RT_OVERRIDE;
+    virtual void obtainDataAndUpdate() override;
+
+    virtual QString defaultMachineFolder() const override;
+    virtual void reset() override;
+    virtual void start() override;
+    virtual void prepareWidgets() override;
     /** @name The following functions update corresponding metric charts and labels with new values
       * @{ */

trunk/src/VBox/Frontends/VirtualBox/src/wizards/editors/UIUserNamePasswordEditor.cpp

@@ -39 +39 @@
 #include "UIIconPool.h"
 #include "UIUserNamePasswordEditor.h"
+#include "UITranslationEventListener.h"
 
 /* Other VBox includes: */
@@ -181 +182 @@
 
 UIUserNamePasswordEditor::UIUserNamePasswordEditor(QWidget *pParent /*  = 0 */)
-    : QIWithRetranslateUI<QWidget>(pParent)
+    : QWidget(pParent)
     , m_pUserNameLineEdit(0)
     , m_pPasswordLineEdit(0)
@@ -257 +258 @@
         return;
     m_fShowPlaceholderText = fEnabled;
-    retranslateUi();
+    sltRetranslateUI();
 }
 
@@ -271 +272 @@
 }
 
-void UIUserNamePasswordEditor::retranslateUi()
+void UIUserNamePasswordEditor::sltRetranslateUI()
 {
     QString strPassword = tr("Pass&word");
@@ -359 +360 @@
             this, &UIUserNamePasswordEditor::sltUserNameChanged);
 
-    retranslateUi();
+    sltRetranslateUI();
+    connect(&translationEventListener(), &UITranslationEventListener::sigRetranslateUI,
+            this, &UIUserNamePasswordEditor::sltRetranslateUI);
 }
 

trunk/src/VBox/Frontends/VirtualBox/src/wizards/editors/UIUserNamePasswordEditor.h

@@ -37 +37 @@
 #include <QWidget>
 
-/* Local includes: */
-#include "QIWithRetranslateUI.h"
+/* GUI includes: */
+#include "UILibraryDefs.h"
 
 /* Forward declarations: */
@@ -83 +83 @@
 };
 
-class SHARED_LIBRARY_STUFF UIUserNamePasswordEditor : public QIWithRetranslateUI<QWidget>
+class SHARED_LIBRARY_STUFF UIUserNamePasswordEditor : public QWidget
 {
 
@@ -110 +110 @@
     void setLabelsVisible(bool fVisible);
 
-protected:
-
-    void retranslateUi();
-
 private slots:
 
@@ -119 +115 @@
     void sltUserNameChanged();
     void sltPasswordChanged();
+    void sltRetranslateUI();
 
 private:

trunk/src/VBox/Frontends/VirtualBox/src/wizards/importappliance/UIApplianceUnverifiedCertificateViewer.cpp

@@ -35 +35 @@
 #include "QIDialogButtonBox.h"
 #include "UIApplianceUnverifiedCertificateViewer.h"
+#include "UITranslationEventListener.h"
 
 /* COM includes: */
@@ -42 +43 @@
 UIApplianceUnverifiedCertificateViewer::UIApplianceUnverifiedCertificateViewer(QWidget *pParent,
                                                                                const CCertificate &comCertificate)
-    : QIWithRetranslateUI<QIDialog>(pParent)
+    : QIDialog(pParent)
     , m_comCertificate(comCertificate)
     , m_pTextLabel(0)
@@ -92 +93 @@
 
     /* Translate UI: */
-    retranslateUi();
+    sltRetranslateUI();
+    connect(&translationEventListener(), &UITranslationEventListener::sigRetranslateUI,
+            this, &UIApplianceUnverifiedCertificateViewer::sltRetranslateUI);
 }
 
-void UIApplianceUnverifiedCertificateViewer::retranslateUi()
+void UIApplianceUnverifiedCertificateViewer::sltRetranslateUI()
 {
     /* Translate dialog title: */

trunk/src/VBox/Frontends/VirtualBox/src/wizards/importappliance/UIApplianceUnverifiedCertificateViewer.h

@@ -34 +34 @@
 /* GUI includes: */
 #include "QIDialog.h"
-#include "QIWithRetranslateUI.h"
 
 /* Forward declarations: */
@@ -43 +42 @@
 /** QIDialog extension
   * asking for consent to continue with unverifiable certificate. */
-class UIApplianceUnverifiedCertificateViewer : public QIWithRetranslateUI<QIDialog>
+class UIApplianceUnverifiedCertificateViewer : public QIDialog
 {
     Q_OBJECT;
@@ -57 +56 @@
     void prepare();
 
+private slots:
+
     /** Handles translation event. */
-    virtual void retranslateUi() /* override final */;
+    void sltRetranslateUI();
 
 private: