Changeset 104228 in vbox for trunk

Timestamp:

Apr 8, 2024 12:40:22 PM (10 months ago)

Author:

vboxsync

Message:

FE/Qt. bugref:10622. Using new UITranslationEventListener in file manager table class(es).

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• guestctrl/UIFileManagerGuestTable.cpp (modified) (5 diffs)
• guestctrl/UIFileManagerGuestTable.h (modified) (2 diffs)
• guestctrl/UIFileManagerHostTable.cpp (modified) (3 diffs)
• guestctrl/UIFileManagerHostTable.h (modified) (2 diffs)
• guestctrl/UIFileManagerTable.cpp (modified) (7 diffs)
• guestctrl/UIFileManagerTable.h (modified) (4 diffs)
• medium/viso/UIVisoCreator.cpp (modified) (3 diffs)
• medium/viso/UIVisoCreator.h (modified) (2 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/guestctrl/UIFileManagerGuestTable.cpp

@@ -52 +52 @@
 #include "QILineEdit.h"
 #include "QIToolBar.h"
+#include "UITranslationEventListener.h"
 
 /* COM includes: */
@@ -446 +447 @@
     setStateAndEnableWidgets();
 
-    retranslateUi();
+    sltRetranslateUI();
+
+    connect(&translationEventListener(), &UITranslationEventListener::sigRetranslateUI,
+            this, &UIFileManagerGuestTable::sltRetranslateUI);
 }
 
@@ -463 +467 @@
 }
 
-void UIFileManagerGuestTable::retranslateUi()
+void UIFileManagerGuestTable::sltRetranslateUI()
 {
     if (m_pLocationLabel)
@@ -512 +516 @@
     }
 
-    UIFileManagerTable::retranslateUi();
+    UIFileManagerTable::sltRetranslateUI();
 }
 
@@ -1523 +1527 @@
     setState();
     setSessionDependentWidgetsEnabled();
-    retranslateUi();
+    sltRetranslateUI();
 }
 

trunk/src/VBox/Frontends/VirtualBox/src/guestctrl/UIFileManagerGuestTable.h

@@ -80 +80 @@
 protected:
 
-    void            retranslateUi() RT_OVERRIDE RT_FINAL;
     virtual bool    readDirectory(const QString& strPath, UIFileSystemItem *parent, bool isStartDir = false) RT_OVERRIDE RT_FINAL;
     virtual void    deleteByItem(UIFileSystemItem *item) RT_OVERRIDE RT_FINAL;
@@ -113 +112 @@
     void sltCommitDataSignalReceived();
     void sltAdditionsStateChange();
+    virtual void sltRetranslateUI() RT_OVERRIDE RT_FINAL;
 
 private:

trunk/src/VBox/Frontends/VirtualBox/src/guestctrl/UIFileManagerHostTable.cpp

@@ -41 +41 @@
 #include "UIPathOperations.h"
 #include "QIToolBar.h"
-
+#include "UITranslationEventListener.h"
 
 /*********************************************************************************************************************************
@@ -142 +142 @@
     prepareActionConnections();
     determinePathSeparator();
-    retranslateUi();
+    sltRetranslateUI();
+    connect(&translationEventListener(), &UITranslationEventListener::sigRetranslateUI,
+            this, &UIFileManagerHostTable::sltRetranslateUI);
 }
 
@@ -184 +186 @@
 }
 
-void UIFileManagerHostTable::retranslateUi()
+void UIFileManagerHostTable::sltRetranslateUI()
 {
     if (m_pLocationLabel)
         m_pLocationLabel->setText(UIFileManager::tr("Host File System:"));
     m_strTableName = UIFileManager::tr("Host");
-    UIFileManagerTable::retranslateUi();
+    UIFileManagerTable::sltRetranslateUI();
 }
 

trunk/src/VBox/Frontends/VirtualBox/src/guestctrl/UIFileManagerHostTable.h

@@ -62 +62 @@
     static bool scanDirectory(const QString& strPath, UIFileSystemItem *parent,
                               QMap<QString, UIFileSystemItem*> &fileObjects);
-    void            retranslateUi() override;
     virtual bool    readDirectory(const QString& strPath, UIFileSystemItem *parent, bool isStartDir = false) override final;
     virtual void    deleteByItem(UIFileSystemItem *item) override final;
@@ -83 +82 @@
     /** @} */
 
+protected slots:
+
+    virtual void sltRetranslateUI() RT_OVERRIDE;
+
 private:
 

trunk/src/VBox/Frontends/VirtualBox/src/guestctrl/UIFileManagerTable.cpp

@@ -50 +50 @@
 #include "UIPathOperations.h"
 #include "UITranslator.h"
+#include "UITranslationEventListener.h"
 
 /* COM includes: */
@@ -406 +407 @@
 
 UIFileManagerTable::UIFileManagerTable(UIActionPool *pActionPool, QWidget *pParent /* = 0 */)
-    :QIWithRetranslateUI<QWidget>(pParent)
+    : QWidget(pParent)
     , m_eFileOperationType(FileOperationType_None)
     , m_pLocationLabel(0)
@@ -542 +543 @@
                 this, &UIFileManagerTable::sltSearchTextChanged);
     }
+
+    connect(&translationEventListener(), &UITranslationEventListener::sigRetranslateUI,
+            this, &UIFileManagerTable::sltRetranslateUI);
+
     optionsUpdated();
 }
@@ -1039 +1044 @@
 }
 
-void UIFileManagerTable::retranslateUi()
+void UIFileManagerTable::sltRetranslateUI()
 {
     UIFileSystemItem *pRootItem = rootItem();
@@ -1056 +1061 @@
     /* Handle only events sent to m_pView: */
     if (pObject != m_pView)
-        return QIWithRetranslateUI<QWidget>::eventFilter(pObject, pEvent);
+        return QWidget::eventFilter(pObject, pEvent);
 
     if (pEvent->type() == QEvent::KeyPress)
@@ -1113 +1118 @@
 
     /* Call to base-class: */
-    return QIWithRetranslateUI<QWidget>::eventFilter(pObject, pEvent);
+    return QWidget::eventFilter(pObject, pEvent);
 }
 
@@ -1202 +1207 @@
 {
     if (pEvent->type() == QEvent::EnabledChange)
-        retranslateUi();
-    return QIWithRetranslateUI<QWidget>::event(pEvent);
+        sltRetranslateUI();
+    return QWidget::event(pEvent);
 }
 

trunk/src/VBox/Frontends/VirtualBox/src/guestctrl/UIFileManagerTable.h

@@ -45 +45 @@
 #include "QIDialog.h"
 #include "QITableView.h"
-#include "QIWithRetranslateUI.h"
 #include "UIGuestControlDefs.h"
 
@@ -139 +138 @@
  *  populates the UIFileSystemModel by scanning the file system
  *  differently. The file structure kept in this class as a tree. */
-class UIFileManagerTable : public QIWithRetranslateUI<QWidget>
+class UIFileManagerTable : public QWidget
 {
     Q_OBJECT;
@@ -208 +207 @@
     };
 
-    void retranslateUi() RT_OVERRIDE;
     void updateCurrentLocationEdit(const QString& strLocation);
     /* @p index is for model not for 'proxy' model */
@@ -275 +273 @@
     /** Contains m_pBreadCrumbsWidget and m_pLocationComboBox. */
     UIFileTableNavigationWidget   *m_pNavigationWidget;
+
+protected slots:
+
+    virtual void sltRetranslateUI();
 
 private slots:

trunk/src/VBox/Frontends/VirtualBox/src/medium/viso/UIVisoCreator.cpp

@@ -52 +52 @@
 #include "UIPaneContainer.h"
 #include "UIShortcutPool.h"
+#include "UITranslationEventListener.h"
 #include "UIVisoCreator.h"
 #include "UIVisoContentBrowser.h"
@@ -105 +106 @@
     :UIFileManagerHostTable(pActionPool, pParent)
 {
+    connect(&translationEventListener(), &UITranslationEventListener::sigRetranslateUI,
+            this, &UIVisoHostBrowser::sltRetranslateUI);
 }
 
@@ -145 +148 @@
 
 
-void UIVisoHostBrowser::retranslateUi()
-{
-    UIFileManagerHostTable::retranslateUi();
+void UIVisoHostBrowser::sltRetranslateUI()
+{
+    UIFileManagerHostTable::sltRetranslateUI();
     if (m_pSubMenu)
         m_pSubMenu->setTitle(QApplication::translate("UIVisoCreatorWidget", "VISO Browser"));
-
-    //setFileTableLabelText(QApplication::translate("UIVisoCreatorWidget","VISO Content"));
 }
 

trunk/src/VBox/Frontends/VirtualBox/src/medium/viso/UIVisoCreator.h

@@ -57 +57 @@
 {
 
+    Q_OBJECT;
+
 public:
 
@@ -62 +64 @@
     void prepareMainMenu(QMenu *pMenu);
 
+private slots:
+
+    virtual void sltRetranslateUI() RT_OVERRIDE RT_FINAL;
+
 private:
 
     virtual void createFileViewContextMenu(const QWidget *pWidget, const QPoint &point) RT_OVERRIDE RT_FINAL;
-    virtual void retranslateUi() RT_OVERRIDE RT_FINAL;
     QPointer<QMenu>        m_pSubMenu;
 };