VirtualBox

Changeset 104358 in vbox for trunk/src


Ignore:
Timestamp:
Apr 18, 2024 5:33:40 AM (13 months ago)
Author:
vboxsync
svn:sync-xref-src-repo-rev:
162846
Message:

FE/Qt. bugref:10622. More refactoring around the retranslation functionality.

Location:
trunk/src/VBox/Frontends/VirtualBox/src
Files:
84 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/VBox/Frontends/VirtualBox/src/UITakeSnapshotDialog.cpp

    r103578 r104358  
    2727
    2828/* Qt includes: */
     29#include <QApplication>
    2930#include <QGridLayout>
    3031#include <QLabel>
    … …  
    4344#include "UIShortcutPool.h"
    4445#include "UITakeSnapshotDialog.h"
    45 
     46#include "UITranslationEventListener.h"
    4647
    4748UITakeSnapshotDialog::UITakeSnapshotDialog(QWidget *pParent, ulong cImmutableMedia)
    48     : QIWithRetranslateUI<QIDialog>(pParent)
     49    : QIDialog(pParent)
    4950    , m_cImmutableMedia(cImmutableMedia)
    5051    , m_pLabelIcon(0)
    … …  
    9596
    9697    /* Call to base-class: */
    97     return QIWithRetranslateUI<QIDialog>::event(pEvent);
    98 }
    99 
    100 void UITakeSnapshotDialog::retranslateUi()
     98    return QIDialog::event(pEvent);
     99}
     100
     101void UITakeSnapshotDialog::sltRetranslateUI()
    101102{
    102103    setWindowTitle(tr("Take Snapshot of Virtual Machine"));
    … …  
    150151
    151152    /* Apply language settings: */
    152     retranslateUi();
     153    sltRetranslateUI();
     154    connect(&translationEventListener(), &UITranslationEventListener::sigRetranslateUI,
     155        this, &UITakeSnapshotDialog::sltRetranslateUI);
    153156
    154157    /* Invent minimum size: */

  • trunk/src/VBox/Frontends/VirtualBox/src/UITakeSnapshotDialog.h

    r98779 r104358  
    3737/* GUI includes: */
    3838#include "QIDialog.h"
    39 #include "QIWithRetranslateUI.h"
    4039#include "UILibraryDefs.h"
    4140
    … …  
    4847
    4948/** QIDialog subclass for taking snapshot name/description. */
    50 class SHARED_LIBRARY_STUFF UITakeSnapshotDialog : public QIWithRetranslateUI<QIDialog>
     49class SHARED_LIBRARY_STUFF UITakeSnapshotDialog : public QIDialog
    5150{
    5251    Q_OBJECT;
    … …  
    7473    virtual bool event(QEvent *pEvent) RT_OVERRIDE;
    7574
    76     /** Handles translation event. */
    77     virtual void retranslateUi() RT_OVERRIDE;
    78 
    7975private slots:
    8076
    8177    /** Handles @a strName change signal. */
    8278    void sltHandleNameChanged(const QString &strName);
     79
     80    /** Handles translation event. */
     81    void sltRetranslateUI();
    8382
    8483private:

  • trunk/src/VBox/Frontends/VirtualBox/src/VBoxAboutDlg.cpp

    r103793 r104358  
    3737#include "QIDialogButtonBox.h"
    3838#include "UIIconPool.h"
     39#include "UITranslationEventListener.h"
    3940#include "UIVersion.h"
    4041#include "VBoxAboutDlg.h"
    … …  
    5455    // it according to screen instead, we should do it as well.  Besides that since About dialog is not modal, it will be in
    5556    // conflict with modal dialogs if there will be a parent passed, because the dialog will not have own event-loop in that case.
    56     : QIWithRetranslateUI2<QDialog>(0)
     57    : QDialog(0)
    5758    , m_pPseudoParent(pParent)
    5859#else
    … …  
    6061    // First of all it's quite difficult to find native (Metro UI) Windows app which have About dialog at all.  But non-native
    6162    // cross-platform apps (Qt Creator, VLC) centers About dialog according the app exactly.
    62     : QIWithRetranslateUI2<QDialog>(pParent)
     63    : QDialog(pParent)
    6364    , m_pPseudoParent(0)
    6465#endif
    … …  
    9798}
    9899
    99 void VBoxAboutDlg::retranslateUi()
     100void VBoxAboutDlg::sltRetranslateUI()
    100101{
    101102    setWindowTitle(tr("VirtualBox - About"));
    … …  
    159160
    160161    /* Translate: */
    161     retranslateUi();
     162    sltRetranslateUI();
     163    connect(&translationEventListener(), &UITranslationEventListener::sigRetranslateUI,
     164        this, &VBoxAboutDlg::sltRetranslateUI);
    162165}
    163166

  • trunk/src/VBox/Frontends/VirtualBox/src/VBoxAboutDlg.h

    r100070 r104358  
    3737
    3838/* GUI includes: */
    39 #include "QIWithRetranslateUI.h"
    4039#include "UILibraryDefs.h"
    4140
    … …  
    4645/** QDialog extension
    4746  * used to show the About-VirtualBox dialog. */
    48 class SHARED_LIBRARY_STUFF VBoxAboutDlg : public QIWithRetranslateUI2<QDialog>
     47class SHARED_LIBRARY_STUFF VBoxAboutDlg : public QDialog
    4948{
    5049    Q_OBJECT;
    … …  
    6463    virtual void paintEvent(QPaintEvent *pEvent) RT_OVERRIDE;
    6564
     65private slots:
     66
    6667    /** Handles translation event. */
    67     virtual void retranslateUi() RT_OVERRIDE;
     68    void sltRetranslateUI();
    6869
    6970private:

  • trunk/src/VBox/Frontends/VirtualBox/src/VBoxLicenseViewer.cpp

    r103243 r104358  
    2727
    2828/* Qt includes: */
     29#include <QEvent>
    2930#include <QFile>
    3031#include <QPushButton>
    … …  
    3940#include "UIMessageCenter.h"
    4041#include "UINotificationCenter.h"
    41 
     42#include "UITranslationEventListener.h"
    4243
    4344VBoxLicenseViewer::VBoxLicenseViewer(QWidget *pParent /* = 0 */)
    44     : QIWithRetranslateUI2<QDialog>(pParent)
     45    : QDialog(pParent)
    4546    , m_pLicenseBrowser(0)
    4647    , m_pButtonAgree(0)
    … …  
    105106
    106107    /* Apply language settings: */
    107     retranslateUi();
     108    sltRetranslateUI();
     109    connect(&translationEventListener(), &UITranslationEventListener::sigRetranslateUI,
     110        this, &VBoxLicenseViewer::sltRetranslateUI);
    108111}
    109112
    … …  
    160163}
    161164
    162 void VBoxLicenseViewer::retranslateUi()
     165void VBoxLicenseViewer::sltRetranslateUI()
    163166{
    164167    /* Translate dialog title: */
    … …  
    187190    m_pButtonDisagree->setEnabled(true);
    188191}
    189 

  • trunk/src/VBox/Frontends/VirtualBox/src/VBoxLicenseViewer.h

    r103977 r104358  
    3636
    3737/* GUI includes: */
    38 #include "QIWithRetranslateUI.h"
    3938#include "UILibraryDefs.h"
    4039
    … …  
    4443
    4544/** QDialog subclass used to show a user license under linux. */
    46 class SHARED_LIBRARY_STUFF VBoxLicenseViewer : public QIWithRetranslateUI2<QDialog>
     45class SHARED_LIBRARY_STUFF VBoxLicenseViewer : public QDialog
    4746{
    4847    Q_OBJECT;
    … …  
    6665    virtual void showEvent(QShowEvent *pEvent) RT_OVERRIDE;
    6766
    68     /** Handles translation event. */
    69     virtual void retranslateUi() RT_OVERRIDE;
    70 
    7167private slots:
    7268
    … …  
    7975    /** Uplocks buttons. */
    8076    void sltUnlockButtons();
     77
     78    /** Handles translation event. */
     79    void sltRetranslateUI();
    8180
    8281private:
    … …  
    9291
    9392#endif /* !FEQT_INCLUDED_SRC_VBoxLicenseViewer_h */
    94 

  • trunk/src/VBox/Frontends/VirtualBox/src/cloud/consolemanager/UICloudConsoleDetailsWidget.cpp

    r104273 r104358  
    2727
    2828/* Qt includes: */
     29#include <QApplication>
    2930#include <QGridLayout>
    3031#include <QLabel>

  • trunk/src/VBox/Frontends/VirtualBox/src/cloud/machinesettings/UICloudMachineSettingsDialog.cpp

    r104273 r104358  
    2727
    2828/* Qt includes: */
     29#include <QCloseEvent>
    2930#include <QPushButton>
    3031#include <QVBoxLayout>

  • trunk/src/VBox/Frontends/VirtualBox/src/cloud/profilemanager/UICloudProfileDetailsWidget.cpp

    r104273 r104358  
    2727
    2828/* Qt includes: */
     29#include <QApplication>
    2930#include <QGridLayout>
    3031#include <QHeaderView>

  • trunk/src/VBox/Frontends/VirtualBox/src/extensions/QIArrowButtonPress.cpp

    r98103 r104358  
    3131/* GUI includes: */
    3232#include "QIArrowButtonPress.h"
    33 
     33#include "UITranslationEventListener.h"
    3434
    3535QIArrowButtonPress::QIArrowButtonPress(QIArrowButtonPress::ButtonType enmButtonType,
    3636                                       QWidget *pParent /* = 0 */)
    37     : QIWithRetranslateUI<QIRichToolButton>(pParent)
     37    : QIRichToolButton(pParent)
    3838    , m_enmButtonType(enmButtonType)
    3939{
    4040    /* Retranslate UI: */
    41     retranslateUi();
     41    sltRetranslateUI();
     42    connect(&translationEventListener(), &UITranslationEventListener::sigRetranslateUI,
     43        this, &QIArrowButtonPress::sltRetranslateUI);
    4244}
    4345
    44 void QIArrowButtonPress::retranslateUi()
     46void QIArrowButtonPress::sltRetranslateUI()
    4547{
    4648    /* Retranslate: */
    … …  
    6466    }
    6567    /* Call to base-class: */
    66     QIWithRetranslateUI<QIRichToolButton>::keyPressEvent(pEvent);
     68    QIRichToolButton::keyPressEvent(pEvent);
    6769}

  • trunk/src/VBox/Frontends/VirtualBox/src/extensions/QIArrowButtonPress.h

    r98103 r104358  
    3434/* GUI includes: */
    3535#include "QIRichToolButton.h"
    36 #include "QIWithRetranslateUI.h"
    3736#include "UILibraryDefs.h"
    3837
    … …  
    4039  * representing arrow tool-button with text-label,
    4140  * can be used as back/next buttons in various places. */
    42 class SHARED_LIBRARY_STUFF QIArrowButtonPress : public QIWithRetranslateUI<QIRichToolButton>
     41class SHARED_LIBRARY_STUFF QIArrowButtonPress : public QIRichToolButton
    4342{
    4443    Q_OBJECT;
    … …  
    5554protected:
    5655
    57     /** Handles translation event. */
    58     virtual void retranslateUi() RT_OVERRIDE;
    59 
    6056    /** Handles key-press @a pEvent. */
    6157    virtual void keyPressEvent(QKeyEvent *pEvent) RT_OVERRIDE;
     58
     59private slots:
     60
     61    /** Handles translation event. */
     62    void sltRetranslateUI();
    6263
    6364private:

  • trunk/src/VBox/Frontends/VirtualBox/src/extensions/QIArrowSplitter.cpp

    r103988 r104358  
    3838#include "UIDesktopWidgetWatchdog.h"
    3939#include "UIIconPool.h"
     40#include "UITranslationEventListener.h"
    4041
    4142/* Other VBox includes: */
    … …  
    131132
    132133QIArrowSplitter::QIArrowSplitter(QWidget *pParent /* = 0 */)
    133     : QIWithRetranslateUI<QWidget>(pParent)
     134    : QWidget(pParent)
    134135    , m_pMainLayout(0)
    135136    , m_pSwitchButton(0)
    … …  
    240241}
    241242
    242 void QIArrowSplitter::retranslateUi()
     243void QIArrowSplitter::sltRetranslateUI()
    243244{
    244245    /* Update details: */
    … …  
    329330    /* Apply size-policy finally: */
    330331    setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::MinimumExpanding);
     332    connect(&translationEventListener(), &UITranslationEventListener::sigRetranslateUI,
     333            this, &QIArrowSplitter::sltRetranslateUI);
    331334}
    332335

  • trunk/src/VBox/Frontends/VirtualBox/src/extensions/QIArrowSplitter.h

    r103977 r104358  
    3636
    3737/* GUI includes: */
    38 #include "QIWithRetranslateUI.h"
    3938#include "UILibraryDefs.h"
    4039
    … …  
    5150/** QWidget extension
    5251  * allowing to toggle visibility for any other child widget. */
    53 class SHARED_LIBRARY_STUFF QIArrowSplitter : public QIWithRetranslateUI<QWidget>
     52class SHARED_LIBRARY_STUFF QIArrowSplitter : public QWidget
    5453{
    5554    Q_OBJECT;
    … …  
    9190    void sltSwitchDetailsPageNext();
    9291
    93 protected:
     92private slots:
    9493
    9594    /** Handles translation event. */
    96     virtual void retranslateUi() RT_OVERRIDE;
     95    void sltRetranslateUI();
    9796
    9897private:

  • trunk/src/VBox/Frontends/VirtualBox/src/extensions/QIDialogButtonBox.cpp

    r99947 r104358  
    3535#include "UIHelpBrowserDialog.h"
    3636#include "UISpecialControls.h"
     37#include "UITranslationEventListener.h"
    3738
    3839/* Other VBox includes: */
    … …  
    4142
    4243QIDialogButtonBox::QIDialogButtonBox(QWidget *pParent /* = 0 */)
    43     : QIWithRetranslateUI<QDialogButtonBox>(pParent)
     44    : QDialogButtonBox(pParent)
    4445    , m_fDoNotPickDefaultButton(false)
    4546{
     47    connect(&translationEventListener(), &UITranslationEventListener::sigRetranslateUI,
     48            this, &QIDialogButtonBox::sltRetranslateUI);
    4649}
    4750
    4851QIDialogButtonBox::QIDialogButtonBox(Qt::Orientation enmOrientation, QWidget *pParent /* = 0 */)
    49     : QIWithRetranslateUI<QDialogButtonBox>(pParent)
     52    : QDialogButtonBox(pParent)
    5053    , m_fDoNotPickDefaultButton(false)
    5154{
     55    connect(&translationEventListener(), &UITranslationEventListener::sigRetranslateUI,
     56            this, &QIDialogButtonBox::sltRetranslateUI);
    5257    setOrientation(enmOrientation);
    5358}
    5459
    5560QIDialogButtonBox::QIDialogButtonBox(StandardButtons enmButtonTypes, Qt::Orientation enmOrientation, QWidget *pParent)
    56     : QIWithRetranslateUI<QDialogButtonBox>(pParent)
     61    : QDialogButtonBox(pParent)
    5762    , m_fDoNotPickDefaultButton(false)
    5863{
    5964    setOrientation(enmOrientation);
    6065    setStandardButtons(enmButtonTypes);
    61     retranslateUi();
     66    sltRetranslateUI();
     67    connect(&translationEventListener(), &UITranslationEventListener::sigRetranslateUI,
     68            this, &QIDialogButtonBox::sltRetranslateUI);
    6269}
    6370
    … …  
    7481{
    7582    QPushButton *pButton = QDialogButtonBox::addButton(strText, enmRole);
    76     retranslateUi();
     83    sltRetranslateUI();
    7784    return pButton;
    7885}
    … …  
    8188{
    8289    QPushButton *pButton = QDialogButtonBox::addButton(enmButtonType);
    83     retranslateUi();
     90    sltRetranslateUI();
    8491    return pButton;
    8592}
    … …  
    8895{
    8996    QDialogButtonBox::setStandardButtons(enmButtonTypes);
    90     retranslateUi();
     97    sltRetranslateUI();
    9198}
    9299
    … …  
    118125}
    119126
    120 void QIDialogButtonBox::retranslateUi()
     127void QIDialogButtonBox::sltRetranslateUI()
    121128{
    122129    QPushButton *pButton = QDialogButtonBox::button(QDialogButtonBox::Help);
    … …  
    148155
    149156    /* Call to base-class: */
    150     return QIWithRetranslateUI<QDialogButtonBox>::showEvent(pEvent);
     157    return QDialogButtonBox::showEvent(pEvent);
    151158}
    152159

  • trunk/src/VBox/Frontends/VirtualBox/src/extensions/QIDialogButtonBox.h

    r99946 r104358  
    3737
    3838/* GUI includes: */
    39 #include "QIWithRetranslateUI.h"
    4039#include "UILibraryDefs.h"
    4140
    … …  
    4645
    4746/** QDialogButtonBox subclass extending standard functionality. */
    48 class SHARED_LIBRARY_STUFF QIDialogButtonBox : public QIWithRetranslateUI<QDialogButtonBox>
     47class SHARED_LIBRARY_STUFF QIDialogButtonBox : public QDialogButtonBox
    4948{
    5049    Q_OBJECT;
    … …  
    8887protected:
    8988
    90     /** Handles translation event. */
    91     virtual void retranslateUi() RT_OVERRIDE;
    92 
    9389    /** Handles show @a pEvent. */
    9490    virtual void showEvent(QShowEvent *pEvent) RT_OVERRIDE;
    … …  
    9995    /** Searchs for empty @a pLayout space. */
    10096    int findEmptySpace(QBoxLayout *pLayout) const;
     97
     98private slots:
     99
     100    /** Handles translation event. */
     101    void sltRetranslateUI();
    101102
    102103private:

  • trunk/src/VBox/Frontends/VirtualBox/src/extensions/QIDialogContainer.cpp

    r98103 r104358  
    3535#include "QIDialogButtonBox.h"
    3636#include "QIDialogContainer.h"
     37#include "UITranslationEventListener.h"
    3738
    3839/* Other VBox includes: */
    … …  
    4142
    4243QIDialogContainer::QIDialogContainer(QWidget *pParent /* = 0 */, Qt::WindowFlags enmFlags /* = Qt::WindowFlags() */)
    43     : QIWithRetranslateUI2<QDialog>(pParent, enmFlags)
     44    : QDialog(pParent, enmFlags)
    4445    , m_pLayout(0)
    4546    , m_pWidget(0)
    … …  
    7475}
    7576
    76 void QIDialogContainer::retranslateUi()
     77void QIDialogContainer::sltRetranslateUI()
    7778{
    7879    m_pProgressLabel->setText(tr("Loading"));
    … …  
    133134
    134135    /* Apply language settings: */
    135     retranslateUi();
     136    sltRetranslateUI();
     137    connect(&translationEventListener(), &UITranslationEventListener::sigRetranslateUI,
     138            this, &QIDialogContainer::sltRetranslateUI);
    136139}

  • trunk/src/VBox/Frontends/VirtualBox/src/extensions/QIDialogContainer.h

    r98103 r104358  
    3636
    3737/* GUI includes: */
    38 #include "QIWithRetranslateUI.h"
    3938#include "UILibraryDefs.h"
    4039
    … …  
    4847/** QDialog sub-class used as executable input container for passed widget.
    4948  * Should be used as popup or modal dialog wrapping functionality of the passed widget. */
    50 class SHARED_LIBRARY_STUFF QIDialogContainer : public QIWithRetranslateUI2<QDialog>
     49class SHARED_LIBRARY_STUFF QIDialogContainer : public QDialog
    5150{
    5251    Q_OBJECT;
    … …  
    7170    void setOkButtonEnabled(bool fEnabled);
    7271
    73 protected:
     72private slots:
    7473
    7574    /** Handles translation event. */
    76     virtual void retranslateUi() RT_OVERRIDE;
     75    void sltRetranslateUI();
    7776
    7877private:

  • trunk/src/VBox/Frontends/VirtualBox/src/extensions/QIInputDialog.h

    r98103 r104358  
    3737
    3838/* GUI includes: */
    39 #include "QIWithRetranslateUI.h"
    4039#include "UILibraryDefs.h"
    4140

  • trunk/src/VBox/Frontends/VirtualBox/src/extensions/QIManagerDialog.cpp

    r103578 r104358  
    2727
    2828/* Qt includes: */
     29#include <QApplication>
    2930#include <QMenuBar>
    3031#include <QPushButton>

  • trunk/src/VBox/Frontends/VirtualBox/src/extensions/QIMessageBox.cpp

    r103362 r104358  
    2727
    2828/* Qt includes: */
     29#include <QApplication>
    2930#include <QCheckBox>
    3031#include <QClipboard>

  • trunk/src/VBox/Frontends/VirtualBox/src/extensions/QIRichTextLabel.cpp

    r98312 r104358  
    3737/* GUI includes: */
    3838#include "QIRichTextLabel.h"
     39#include "UITranslationEventListener.h"
    3940
    4041/* Other VBox includes: */
    … …  
    104105
    105106QIRichTextLabel::QIRichTextLabel(QWidget *pParent)
    106     : QIWithRetranslateUI<QWidget>(pParent)
     107    : QWidget(pParent)
    107108    , m_pTextBrowser()
    108109    , m_pActionCopy(0)
    … …  
    164165
    165166    /* Apply language settings: */
    166     retranslateUi();
     167    sltRetranslateUI();
     168    connect(&translationEventListener(), &UITranslationEventListener::sigRetranslateUI,
     169        this, &QIRichTextLabel::sltRetranslateUI);
    167170}
    168171
    … …  
    286289}
    287290
    288 void QIRichTextLabel::retranslateUi()
     291void QIRichTextLabel::sltRetranslateUI()
    289292{
    290293    if (m_pActionCopy)

  • trunk/src/VBox/Frontends/VirtualBox/src/extensions/QIRichTextLabel.h

    r98312 r104358  
    3636
    3737/* GUI includes: */
    38 #include "QIWithRetranslateUI.h"
    3938#include "UILibraryDefs.h"
    4039
    … …  
    4443/** QLabel analog to reflect rich-text,
    4544 ** based on private QTextBrowser functionality. */
    46 class SHARED_LIBRARY_STUFF QIRichTextLabel : public QIWithRetranslateUI<QWidget>
     45class SHARED_LIBRARY_STUFF QIRichTextLabel : public QWidget
    4746{
    4847    Q_OBJECT;
    … …  
    9594    void copy();
    9695
    97 protected:
    98 
    99     /** Handles translation event. */
    100     virtual void retranslateUi() RT_OVERRIDE;
    101 
    10296private slots:
    10397
    … …  
    106100      *               be copied directly by QTextBrowser::copy() call. */
    107101    void sltHandleCopyAvailable(bool fYes) { m_fCopyAvailable = fYes; }
     102    /** Handles translation event. */
     103    void sltRetranslateUI();
    108104
    109105private:

  • trunk/src/VBox/Frontends/VirtualBox/src/globals/UICommon.cpp

    r104158 r104358  
    2727
    2828/* Qt includes: */
     29#include <QApplication>
    2930#include <QDesktopServices>
    3031#include <QDir>

  • trunk/src/VBox/Frontends/VirtualBox/src/globals/UIMessageCenter.cpp

    r103793 r104358  
    2828/* Qt includes: */
    2929#include <QAbstractButton>
     30#include <QApplication>
    3031#include <QDir>
    3132#include <QFileInfo>

  • trunk/src/VBox/Frontends/VirtualBox/src/globals/UIShortcutPool.cpp

    r103771 r104358  
    3131#include "UIGlobalSession.h"
    3232#include "UIShortcutPool.h"
    33 
     33#include "UITranslationEventListener.h"
    3434
    3535/* Namespaces: */
    … …  
    254254}
    255255
    256 void UIShortcutPool::retranslateUi()
     256void UIShortcutPool::sltRetranslateUI()
    257257{
    258258    /* Translate own defaults: */
    … …  
    327327    connect(gEDataManager, &UIExtraDataManager::sigRuntimeUIShortcutChange,
    328328            this, &UIShortcutPool::sltReloadMachineShortcuts);
     329    connect(&translationEventListener(), &UITranslationEventListener::sigRetranslateUI,
     330            this, &UIShortcutPool::sltRetranslateUI);
    329331}
    330332
    … …  
    453455    return m_shortcuts[strShortcutKey];
    454456}
    455 

  • trunk/src/VBox/Frontends/VirtualBox/src/globals/UIShortcutPool.h

    r103987 r104358  
    3333
    3434/* Qt includes: */
     35#include <QKeySequence>
     36#include <QObject>
    3537#include <QMap>
    3638
    3739/* GUI includes: */
    38 #include "QIWithRetranslateUI.h"
    3940#include "UIDefs.h"
    4041#include "UILibraryDefs.h"
    … …  
    124125
    125126/** QObject extension used as shortcut pool singleton. */
    126 class SHARED_LIBRARY_STUFF UIShortcutPool : public QIWithRetranslateUI3<QObject>
     127class SHARED_LIBRARY_STUFF UIShortcutPool : public QObject
    127128{
    128129    Q_OBJECT;
    … …  
    159160    static QKeySequence standardSequence(QKeySequence::StandardKey enmKey);
    160161
    161 protected:
     162private slots:
    162163
    163164    /** Handles translation event. */
    164     virtual void retranslateUi() RT_OVERRIDE RT_FINAL;
    165 
    166 private slots:
    167 
     165    void sltRetranslateUI();
    168166    /** Reloads Selector UI shortcuts. */
    169167    void sltReloadSelectorShortcuts();
    … …  
    220218
    221219#endif /* !FEQT_INCLUDED_SRC_globals_UIShortcutPool_h */
    222 

  • trunk/src/VBox/Frontends/VirtualBox/src/helpbrowser/UIHelpBrowserDialog.cpp

    r103771 r104358  
    4343#include "UIHelpBrowserWidget.h"
    4444#include "UINotificationObjects.h"
     45#include "UITranslationEventListener.h"
    4546#ifdef VBOX_WS_MAC
    4647# include "VBoxUtils-darwin.h"
    … …  
    5859
    5960UIHelpBrowserDialog::UIHelpBrowserDialog(QWidget *pParent, QWidget *pCenterWidget, const QString &strHelpFilePath)
    60     : QIWithRetranslateUI<QIWithRestorableGeometry<QMainWindow> >(pParent)
     61    : QIWithRestorableGeometry<QMainWindow>(pParent)
    6162    , m_strHelpFilePath(strHelpFilePath)
    6263    , m_pWidget(0)
    … …  
    7778    prepareCentralWidget();
    7879    loadSettings();
    79     retranslateUi();
     80    sltRetranslateUI();
     81    connect(&translationEventListener(), &UITranslationEventListener::sigRetranslateUI,
     82        this, &UIHelpBrowserDialog::sltRetranslateUI);
    8083}
    8184
    … …  
    8689}
    8790
    88 void UIHelpBrowserDialog::retranslateUi()
     91void UIHelpBrowserDialog::sltRetranslateUI()
    8992{
    9093    setWindowTitle(UIHelpBrowserWidget::tr("Oracle VM VirtualBox User Manual"));
    … …  
    117120            break;
    118121    }
    119     return QIWithRetranslateUI<QIWithRestorableGeometry<QMainWindow> >::event(pEvent);
    120 }
    121 
     122    return QIWithRestorableGeometry<QMainWindow>::event(pEvent);
     123}
    122124
    123125void UIHelpBrowserDialog::prepareCentralWidget()

  • trunk/src/VBox/Frontends/VirtualBox/src/helpbrowser/UIHelpBrowserDialog.h

    r99973 r104358  
    3737/* GUI includes: */
    3838#include "QIWithRestorableGeometry.h"
    39 #include "QIWithRetranslateUI.h"
    40 
    4139
    4240/* Forward declarations: */
    … …  
    4442class UIHelpBrowserWidget;
    4543
    46 class SHARED_LIBRARY_STUFF UIHelpBrowserDialog : public QIWithRetranslateUI<QIWithRestorableGeometry<QMainWindow> >
     44class SHARED_LIBRARY_STUFF UIHelpBrowserDialog : public QIWithRestorableGeometry<QMainWindow>
    4745{
    4846    Q_OBJECT;
    … …  
    6159protected:
    6260
    63     /** Handles translation event. */
    64     virtual void retranslateUi() RT_OVERRIDE;
    6561    virtual bool event(QEvent *pEvent) RT_OVERRIDE;
    6662
    … …  
    8076    void sltStatusBarVisibilityChange(bool fVisible);
    8177    void sltZoomPercentageChanged(int iPercentage);
     78    void sltRetranslateUI();
    8279
    8380private:

  • trunk/src/VBox/Frontends/VirtualBox/src/helpbrowser/UIHelpBrowserWidget.cpp

    r103803 r104358  
    6363#include "UIHelpBrowserWidget.h"
    6464#include "UIIconPool.h"
    65 
     65#include "UITranslationEventListener.h"
    6666
    6767/* COM includes: */
    … …  
    8888*   UIZoomMenuAction definition.                                                                                                 *
    8989*********************************************************************************************************************************/
    90 class UIZoomMenuAction : public QIWithRetranslateUI<QWidgetAction>
     90class UIZoomMenuAction : public QWidgetAction
    9191{
    9292
    … …  
    102102    void setZoomPercentage(int iZoomPercentage);
    103103
    104 protected:
    105 
    106     void retranslateUi() RT_OVERRIDE;
    107 
    108104private slots:
    109105
    110106    void sltZoomOperation();
     107    void sltRetranslateUI();
    111108
    112109private:
    … …  
    148145*   UIBookmarksListContainer definition.                                                                                         *
    149146*********************************************************************************************************************************/
    150 class UIBookmarksListContainer : public QIWithRetranslateUI<QWidget>
     147class UIBookmarksListContainer : public QWidget
    151148{
    152149
    … …  
    171168    void sltDeleteAllBookmarks();
    172169
    173 protected:
    174 
    175     void retranslateUi() RT_OVERRIDE;
    176 
    177 private slots:
    178 
    179170private:
    180171
    … …  
    190181*********************************************************************************************************************************/
    191182
    192 class UIHelpBrowserTab : public QIWithRetranslateUI<QWidget>
     183class UIHelpBrowserTab : public QWidget
    193184{
    194185    Q_OBJECT;
    … …  
    240231    void sltAnchorClicked(const QUrl &link);
    241232    void sltFindInPageWidgetVisibilityChanged(bool  fVisible);
     233    void sltRetranslateUI();
    242234
    243235private:
    … …  
    246238    void prepareWidgets(const QUrl &initialUrl);
    247239    void prepareToolBarAndAddressBar();
    248     virtual void retranslateUi() RT_OVERRIDE;
    249240    void setActionTextAndToolTip(QAction *pAction, const QString &strText, const QString &strToolTip);
    250241
    … …  
    363354*********************************************************************************************************************************/
    364355UIZoomMenuAction::UIZoomMenuAction(QWidget *pParent /* = 0 */)
    365     :QIWithRetranslateUI<QWidgetAction>(pParent)
     356    : QWidgetAction(pParent)
    366357    , m_pMinusButton(0)
    367358    , m_pResetButton(0)
    … …  
    371362{
    372363    prepare();
    373     retranslateUi();
     364    sltRetranslateUI();
     365    connect(&translationEventListener(), &UITranslationEventListener::sigRetranslateUI,
     366        this, &UIZoomMenuAction::sltRetranslateUI);
    374367}
    375368
    … …  
    380373}
    381374
    382 void UIZoomMenuAction::retranslateUi()
     375void UIZoomMenuAction::sltRetranslateUI()
    383376{
    384377    if (m_pLabel)
    … …  
    472465
    473466UIBookmarksListContainer::UIBookmarksListContainer(QWidget *pParent /* = 0 */)
    474     :QIWithRetranslateUI<QWidget>(pParent)
     467    : QWidget(pParent)
    475468    , m_pMainLayout(0)
    476469    , m_pListWidget(0)
    … …  
    524517    if (m_pListWidget)
    525518        m_pListWidget->clear();
    526 }
    527 
    528 void UIBookmarksListContainer::retranslateUi()
    529 {
    530519}
    531520
    … …  
    564553UIHelpBrowserTab::UIHelpBrowserTab(const QHelpEngine  *pHelpEngine, const QUrl &homeUrl,
    565554                                   const QUrl &initialUrl, QWidget *pParent /* = 0 */)
    566     : QIWithRetranslateUI<QWidget>(pParent)
     555    : QWidget(pParent)
    567556    , m_pHomeAction(0)
    568557    , m_pForwardAction(0)
    … …  
    674663    prepareToolBarAndAddressBar();
    675664    prepareWidgets(initialUrl);
    676     retranslateUi();
     665    sltRetranslateUI();
     666    connect(&translationEventListener(), &UITranslationEventListener::sigRetranslateUI,
     667        this, &UIHelpBrowserTab::sltRetranslateUI);
    677668}
    678669
    … …  
    781772}
    782773
    783 void UIHelpBrowserTab::retranslateUi()
     774void UIHelpBrowserTab::sltRetranslateUI()
    784775{
    785776    setActionTextAndToolTip(m_pHomeAction, UIHelpBrowserWidget::tr("Home"), UIHelpBrowserWidget::tr("Return to Start Page"));
    … …  
    13431334
    13441335UIHelpBrowserWidget::UIHelpBrowserWidget(EmbedTo enmEmbedding, const QString &strHelpFilePath, QWidget *pParent /* = 0 */)
    1345     : QIWithRetranslateUI<QWidget>(pParent)
     1336    : QWidget(pParent)
    13461337    , m_enmEmbedding(enmEmbedding)
    13471338    , m_fIsPolished(false)
    … …  
    14421433    prepareSearchWidgets();
    14431434    loadBookmarks();
    1444     retranslateUi();
     1435    sltRetranslateUI();
     1436    connect(&translationEventListener(), &UITranslationEventListener::sigRetranslateUI,
     1437        this, &UIHelpBrowserWidget::sltRetranslateUI);
    14451438}
    14461439
    … …  
    18071800}
    18081801
    1809 void UIHelpBrowserWidget::retranslateUi()
     1802void UIHelpBrowserWidget::sltRetranslateUI()
    18101803{
    18111804    if (m_pTabWidget)

  • trunk/src/VBox/Frontends/VirtualBox/src/helpbrowser/UIHelpBrowserWidget.h

    r99910 r104358  
    3838/* GUI includes: */
    3939#include "QIManagerDialog.h"
    40 #include "QIWithRetranslateUI.h"
    4140
    4241/* Forward declarations: */
    … …  
    5857class UIZoomMenuAction;
    5958
    60 class SHARED_LIBRARY_STUFF UIHelpBrowserWidget  : public QIWithRetranslateUI<QWidget>
     59class SHARED_LIBRARY_STUFF UIHelpBrowserWidget  : public QWidget
    6160{
    6261    Q_OBJECT;
    … …  
    122121    void sltLinkHighlighted(const QUrl &url);
    123122    void sltMouseOverImage(const QString &strImageName);
     123    void sltRetranslateUI();
    124124
    125125private:
    … …  
    148148    /** @name Event handling stuff.
    149149     * @{ */
    150     /** Handles translation event. */
    151        virtual void retranslateUi() RT_OVERRIDE;
    152 
    153150       /** Handles Qt show @a pEvent. */
    154151       virtual void showEvent(QShowEvent *pEvent) RT_OVERRIDE;

  • trunk/src/VBox/Frontends/VirtualBox/src/helpbrowser/UIHelpViewer.cpp

    r103977 r104358  
    2727
    2828/* Qt includes: */
     29#include <QApplication>
    2930#include <QClipboard>
    3031#include <QtGlobal>
    … …  
    104105*   UIFindInPageWidget definition.                                                                                        *
    105106*********************************************************************************************************************************/
    106 class UIFindInPageWidget : public QIWithRetranslateUI<QWidget>
     107class UIFindInPageWidget : public QWidget
    107108{
    108109
    … …  
    131132
    132133    void prepare();
    133     virtual void retranslateUi() RT_OVERRIDE;
    134134    UISearchLineEdit  *m_pSearchLineEdit;
    135135    QIToolButton      *m_pNextButton;
    … …  
    255255*********************************************************************************************************************************/
    256256UIFindInPageWidget::UIFindInPageWidget(QWidget *pParent /* = 0 */)
    257     : QIWithRetranslateUI<QWidget>(pParent)
     257    : QWidget(pParent)
    258258    , m_pSearchLineEdit(0)
    259259    , m_pNextButton(0)
    … …  
    311311        }
    312312    }
    313     return QIWithRetranslateUI<QWidget>::eventFilter(pObject, pEvent);
     313    return QWidget::eventFilter(pObject, pEvent);
    314314}
    315315
    … …  
    331331            break;
    332332        default:
    333             QIWithRetranslateUI<QWidget>::keyPressEvent(pEvent);
     333            QWidget::keyPressEvent(pEvent);
    334334            break;
    335335    }
    … …  
    388388}
    389389
    390 void UIFindInPageWidget::retranslateUi()
    391 {
    392 }
    393 
    394 
    395390/*********************************************************************************************************************************
    396391*   UIHelpViewer implementation.                                                                                          *
    … …  
    398393
    399394UIHelpViewer::UIHelpViewer(const QHelpEngine *pHelpEngine, QWidget *pParent /* = 0 */)
    400     :QIWithRetranslateUI<QTextBrowser>(pParent)
     395    : QTextBrowser(pParent)
    401396    , m_pHelpEngine(pHelpEngine)
    402397    , m_pFindInPageWidget(new UIFindInPageWidget(this))
    … …  
    439434        m_pOverlayBlurEffect->setBlurRadius(8);
    440435    }
    441     retranslateUi();
    442436}
    443437
    … …  
    523517void UIHelpViewer::setFont(const QFont &font)
    524518{
    525     QIWithRetranslateUI<QTextBrowser>::setFont(font);
     519    QTextBrowser::setFont(font);
    526520    /* Make sure the font size of the find in widget stays constant: */
    527521    if (m_pFindInPageWidget)
    … …  
    641635            moveFindWidgetIn(m_iMarginForFindWidget);
    642636    }
    643     QIWithRetranslateUI<QTextBrowser>::resizeEvent(pEvent);
     637    QTextBrowser::resizeEvent(pEvent);
    644638}
    645639
    … …  
    694688        }
    695689    }
    696     QIWithRetranslateUI<QTextBrowser>::mousePressEvent(pEvent);
     690    QTextBrowser::mousePressEvent(pEvent);
    697691}
    698692
    699693void UIHelpViewer::mousePressEvent(QMouseEvent *pEvent)
    700694{
    701     QIWithRetranslateUI<QTextBrowser>::mousePressEvent(pEvent);
     695    QTextBrowser::mousePressEvent(pEvent);
    702696}
    703697
    … …  
    706700    /*if (m_fOverlayMode)
    707701        return;*/
    708     QIWithRetranslateUI<QTextBrowser>::mouseMoveEvent(pEvent);
     702    QTextBrowser::mouseMoveEvent(pEvent);
    709703}
    710704
    … …  
    712706{
    713707    clearOverlay();
    714     QIWithRetranslateUI<QTextBrowser>::mouseDoubleClickEvent(pEvent);
     708    QTextBrowser::mouseDoubleClickEvent(pEvent);
    715709}
    716710
    717711void UIHelpViewer::paintEvent(QPaintEvent *pEvent)
    718712{
    719     QIWithRetranslateUI<QTextBrowser>::paintEvent(pEvent);
     713    QTextBrowser::paintEvent(pEvent);
    720714    QPainter painter(viewport());
    721715    foreach(const DocumentImage &image, m_imageMap)
    … …  
    742736            clearOverlay();
    743737    }
    744     return QIWithRetranslateUI<QTextBrowser>::eventFilter(pObject, pEvent);
     738    return QTextBrowser::eventFilter(pObject, pEvent);
    745739}
    746740
    … …  
    766760        }
    767761    }
    768     QIWithRetranslateUI<QTextBrowser>::keyPressEvent(pEvent);
    769 }
    770 
    771 void UIHelpViewer::retranslateUi()
    772 {
     762    QTextBrowser::keyPressEvent(pEvent);
    773763}
    774764

  • trunk/src/VBox/Frontends/VirtualBox/src/helpbrowser/UIHelpViewer.h

    r103977 r104358  
    3636
    3737/* GUI includes: */
    38 #include "QIWithRetranslateUI.h"
     38#include "UILibraryDefs.h"
    3939
    4040/* Forward declarations: */
    … …  
    4949  * for a zoom-in-image functionality. This extension can also scale the images while scaling the document. In contrast,
    5050  * QTextBrowser scales only fonts. */
    51 class UIHelpViewer : public QIWithRetranslateUI<QTextBrowser>
     51class UIHelpViewer : public QTextBrowser
    5252{
    5353
    … …  
    130130    };
    131131
    132     virtual void retranslateUi() RT_OVERRIDE;
    133132    bool isRectInside(const QRect &rect, int iMargin) const;
    134133    void moveFindWidgetIn(int iMargin);

  • trunk/src/VBox/Frontends/VirtualBox/src/manager/UIWelcomePane.cpp

    r104251 r104358  
    2727
    2828/* Qt includes: */
     29#include <QApplication>
    2930#include <QButtonGroup>
    3031#include <QGridLayout>

  • trunk/src/VBox/Frontends/VirtualBox/src/medium/UIMediumDetailsWidget.cpp

    r104226 r104358  
    2727
    2828/* Qt includes: */
     29#include <QApplication>
    2930#include <QComboBox>
    3031#include <QLabel>

  • trunk/src/VBox/Frontends/VirtualBox/src/networkmanager/UIDetailsWidgetCloudNetwork.h

    r104223 r104358  
    3333
    3434/* Qt includes: */
    35 #include <QWidget>
     35#include <QDialog>
    3636
    3737/* GUI includes: */

  • trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIBootFailureDialog.cpp

    r104290 r104358  
    2727
    2828/* Qt includes: */
     29#include <QApplication>
    2930#include <QAction>
    3031#include <QCheckBox>

  • trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIIndicatorsPool.cpp

    r104290 r104358  
    2727
    2828/* Qt includes: */
     29#include <QApplication>
    2930#include <QAccessibleWidget>
    3031#include <QHBoxLayout>

  • trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMouseHandler.cpp

    r103803 r104358  
    2727
    2828/* Qt includes: */
     29#include <QApplication>
    2930#include <QtMath>
    3031#include <QMouseEvent>

  • trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIVMCloseDialog.cpp

    r104290 r104358  
    2727
    2828/* Qt includes: */
     29#include <QApplication>
    2930#include <QButtonGroup>
    3031#include <QCheckBox>

  • trunk/src/VBox/Frontends/VirtualBox/src/runtime/seamless/UIMachineViewSeamless.cpp

    r103538 r104358  
    2929#include <QApplication>
    3030#include <QMainWindow>
     31#include <QResizeEvent>
    3132#include <QTimer>
    3233#ifdef VBOX_WS_MAC

  • trunk/src/VBox/Frontends/VirtualBox/src/settings/UIAdvancedSettingsDialog.cpp

    r104313 r104358  
    3030#include <QAbstractScrollArea>
    3131#include <QAbstractSpinBox>
     32#include <QApplication>
    3233#include <QCheckBox>
    3334#include <QCloseEvent>
    … …  
    3637#include <QGridLayout>
    3738#include <QPainter>
     39#include <QPainterPath>
    3840#include <QProgressBar>
    3941#include <QPropertyAnimation>

  • trunk/src/VBox/Frontends/VirtualBox/src/settings/UIAdvancedSettingsDialogSpecific.cpp

    r104313 r104358  
    2727
    2828/* Qt includes: */
     29#include <QApplication>
    2930#include <QStackedWidget>
    3031

  • trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UIEditor.h

    r104352 r104358  
    3535#include <QWidget>
    3636#include <QMap>
     37#include <QVariant>
    3738
    3839/* GUI includes: */

  • trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsNetwork.cpp

    r104313 r104358  
    2727
    2828/* Qt includes: */
     29#include <QApplication>
    2930#include <QRegularExpression>
    3031#include <QVBoxLayout>

  • trunk/src/VBox/Frontends/VirtualBox/src/snapshots/UISnapshotDetailsWidget.cpp

    r103977 r104358  
    2828/* Qt includes: */
    2929#include <QAccessibleWidget>
     30#include <QApplication>
    3031#include <QHBoxLayout>
    3132#include <QDateTime>
    … …  
    5758#include "UIMessageCenter.h"
    5859#include "UITranslator.h"
     60#include "UITranslationEventListener.h"
    5961#include "VBoxUtils.h"
    6062
    … …  
    174176
    175177/** QWiget extension providing GUI with snapshot screenshot viewer widget. */
    176 class UIScreenshotViewer : public QIWithRetranslateUI2<QWidget>
     178class UIScreenshotViewer : public QWidget
    177179{
    178180    Q_OBJECT;
    … …  
    191193protected:
    192194
    193     /** Handles translation event. */
    194     virtual void retranslateUi() RT_OVERRIDE;
    195 
    196195    /** Handles show @a pEvent. */
    197196    virtual void showEvent(QShowEvent *pEvent) RT_OVERRIDE;
    … …  
    206205    /** Handles key press @a pEvent. */
    207206    virtual void keyPressEvent(QKeyEvent *pEvent) RT_OVERRIDE;
     207
     208private slots:
     209
     210    /** Handles translation event. */
     211    void sltRetranslateUI();
    208212
    209213private:
    … …  
    469473                                       const QString &strMachineName,
    470474                                       QWidget *pParent /* = 0 */)
    471     : QIWithRetranslateUI2<QWidget>(pParent, Qt::Tool)
     475    : QWidget(pParent, Qt::Tool)
    472476    , m_fPolished(false)
    473477    , m_pixmapScreenshot(pixmapScreenshot)
    … …  
    482486}
    483487
    484 void UIScreenshotViewer::retranslateUi()
     488void UIScreenshotViewer::sltRetranslateUI()
    485489{
    486490    /* Translate window title: */
    … …  
    491495{
    492496    /* Call to base-class: */
    493     QIWithRetranslateUI2<QWidget>::showEvent(pEvent);
     497    QWidget::showEvent(pEvent);
    494498
    495499    /* Make sure we should polish dialog: */
    … …  
    513517{
    514518    /* Call to base-class: */
    515     QIWithRetranslateUI2<QWidget>::resizeEvent(pEvent);
     519    QWidget::resizeEvent(pEvent);
    516520
    517521    /* Adjust the picture: */
    … …  
    530534
    531535    /* Call to base-class: */
    532     QIWithRetranslateUI2<QWidget>::mousePressEvent(pEvent);
     536    QWidget::mousePressEvent(pEvent);
    533537}
    534538
    … …  
    540544
    541545    /* Call to base-class: */
    542     QIWithRetranslateUI2<QWidget>::keyPressEvent(pEvent);
     546    QWidget::keyPressEvent(pEvent);
    543547}
    544548
    … …  
    580584
    581585    /* Apply language settings: */
    582     retranslateUi();
     586    sltRetranslateUI();
     587    connect(&translationEventListener(), &UITranslationEventListener::sigRetranslateUI,
     588        this, &UIScreenshotViewer::sltRetranslateUI);
    583589
    584590    /* Adjust window size: */
    … …  
    644650
    645651UISnapshotDetailsWidget::UISnapshotDetailsWidget(QWidget *pParent /* = 0 */)
    646     : QIWithRetranslateUI<QWidget>(pParent)
     652    : QWidget(pParent)
    647653    , m_pTabWidget(0)
    648654    , m_pLayoutOptions(0)
    … …  
    705711}
    706712
    707 void UISnapshotDetailsWidget::retranslateUi()
     713void UISnapshotDetailsWidget::sltRetranslateUI()
    708714{
    709715    /* Translate labels: */
    … …  
    11941200
    11951201    /* Retranslate: */
    1196     retranslateUi();
     1202    sltRetranslateUI();
     1203    connect(&translationEventListener(), &UITranslationEventListener::sigRetranslateUI,
     1204        this, &UISnapshotDetailsWidget::sltRetranslateUI);
    11971205
    11981206    /* Update button states finally: */

  • trunk/src/VBox/Frontends/VirtualBox/src/snapshots/UISnapshotDetailsWidget.h

    r103803 r104358  
    3636
    3737/* GUI includes: */
    38 #include "QIWithRetranslateUI.h"
    3938#include "UIExtraDataDefs.h"
    4039
    … …  
    103102
    104103/** QWidget extension providing GUI with snapshot details-widget. */
    105 class UISnapshotDetailsWidget : public QIWithRetranslateUI<QWidget>
     104class UISnapshotDetailsWidget : public QWidget
    106105{
    107106    Q_OBJECT;
    … …  
    128127protected:
    129128
    130     /** Handles translation event. */
    131     virtual void retranslateUi() RT_OVERRIDE;
    132129    /** Handles buttons translation. */
    133130    void retranslateButtons();
    … …  
    147144    /** Handles snapshot details change rejecting. */
    148145    void sltHandleChangeRejected();
     146    /** Handles translation event. */
     147    void sltRetranslateUI();
    149148
    150149private:
    … …  
    257256
    258257#endif /* !FEQT_INCLUDED_SRC_snapshots_UISnapshotDetailsWidget_h */
    259 

  • trunk/src/VBox/Frontends/VirtualBox/src/snapshots/UISnapshotPane.cpp

    r103550 r104358  
    5858#include "UITakeSnapshotDialog.h"
    5959#include "UITranslator.h"
     60#include "UITranslationEventListener.h"
    6061#include "UIVirtualBoxEventHandler.h"
    6162#include "UIVirtualMachineItem.h"
    … …  
    588589
    589590UISnapshotPane::UISnapshotPane(UIActionPool *pActionPool, bool fShowToolbar /* = true */, QWidget *pParent /* = 0 */)
    590     : QIWithRetranslateUI<QWidget>(pParent)
     591    : QWidget(pParent)
    591592    , m_pActionPool(pActionPool)
    592593    , m_fShowToolbar(fShowToolbar)
    … …  
    656657}
    657658
    658 void UISnapshotPane::retranslateUi()
     659void UISnapshotPane::sltRetranslateUI()
    659660{
    660661    /* Translate snapshot tree: */
    … …  
    674675{
    675676    /* Call to base-class: */
    676     QIWithRetranslateUI<QWidget>::resizeEvent(pEvent);
     677    QWidget::resizeEvent(pEvent);
    677678
    678679    /* Adjust snapshot tree: */
    … …  
    683684{
    684685    /* Call to base-class: */
    685     QIWithRetranslateUI<QWidget>::showEvent(pEvent);
     686    QWidget::showEvent(pEvent);
    686687
    687688    /* Adjust snapshot tree: */
    … …  
    13301331
    13311332    /* Apply language settings: */
    1332     retranslateUi();
     1333    sltRetranslateUI();
     1334    connect(&translationEventListener(), &UITranslationEventListener::sigRetranslateUI,
     1335        this, &UISnapshotPane::sltRetranslateUI);
    13331336}
    13341337

  • trunk/src/VBox/Frontends/VirtualBox/src/snapshots/UISnapshotPane.h

    r103803 r104358  
    3434/* Qt includes: */
    3535#include <QUuid>
     36#include <QWidget>
    3637
    3738/* GUI includes: */
    38 #include "QIWithRetranslateUI.h"
     39#include "UILibraryDefs.h"
    3940
    4041/* COM includes: */
    … …  
    6970
    7071/** QWidget extension providing GUI with the pane to control snapshot related functionality. */
    71 class UISnapshotPane : public QIWithRetranslateUI<QWidget>
     72class UISnapshotPane : public QWidget
    7273{
    7374    Q_OBJECT;
    … …  
    101102    /** @name Qt event handlers.
    102103      * @{ */
    103         /** Handles translation event. */
    104         virtual void retranslateUi() RT_OVERRIDE;
    105 
    106104        /** Handles resize @a pEvent. */
    107105        virtual void resizeEvent(QResizeEvent *pEvent) RT_OVERRIDE;
    … …  
    165163        /** Handles tree-widget's scroll-bar visibility change. */
    166164        void sltHandleScrollBarVisibilityChange();
     165    /** @} */
     166
     167    /** @name Qt event handlers.
     168      * @{ */
     169        /** Handles translation event. */
     170        void sltRetranslateUI();
    167171    /** @} */
    168172
    … …  
    273277
    274278#endif /* !FEQT_INCLUDED_SRC_snapshots_UISnapshotPane_h */
    275 

  • trunk/src/VBox/Frontends/VirtualBox/src/softkeyboard/UISoftKeyboard.cpp

    r103982 r104358  
    4040#include <QListWidget>
    4141#include <QPainter>
     42#include <QPainterPath>
    4243#include <QPicture>
    4344#include <QPushButton>

  • trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIAddDiskEncryptionPasswordDialog.cpp

    r103988 r104358  
    3030#include <QHeaderView>
    3131#include <QItemEditorFactory>
     32#include <QKeyEvent>
    3233#include <QLabel>
    3334#include <QLineEdit>
    … …  
    4041#include "QIDialogButtonBox.h"
    4142#include "QIStyledItemDelegate.h"
    42 #include "QIWithRetranslateUI.h"
    4343#include "UICommon.h"
    4444#include "UIAddDiskEncryptionPasswordDialog.h"
    … …  
    4646#include "UIMedium.h"
    4747#include "UINotificationCenter.h"
     48#include "UITranslationEventListener.h"
    4849
    4950/* Other VBox includes: */
    … …  
    335336        case Qt::ToolTipRole:
    336337        {
    337             /* We are generating tool-tip here and not in retranslateUi() because of the tricky plural form handling,
     338            /* We are generating tool-tip here and not in sltRetranslateUI() because of the tricky plural form handling,
    338339             * but be quiet, it's safe enough because the tool-tip being re-acquired every time on mouse-hovering. */
    339340            const QList<QUuid> encryptedMedia = m_encryptedMedia.values(m_encryptionPasswords.keys().at(index.row()));
    … …  
    490491                                                                     const QString &strMachineName,
    491492                                                                     const EncryptedMediumMap &encryptedMedia)
    492     : QIWithRetranslateUI<QDialog>(pParent)
     493    : QDialog(pParent)
    493494    , m_strMachineName(strMachineName)
    494495    , m_encryptedMedia(encryptedMedia)
    … …  
    500501    prepare();
    501502    /* Apply language settings: */
    502     retranslateUi();
     503    sltRetranslateUI();
     504    connect(&translationEventListener(), &UITranslationEventListener::sigRetranslateUI,
     505            this, &UIAddDiskEncryptionPasswordDialog::sltRetranslateUI);
     506
    503507}
    504508
    … …  
    509513}
    510514
    511 void UIAddDiskEncryptionPasswordDialog::retranslateUi()
     515void UIAddDiskEncryptionPasswordDialog::sltRetranslateUI()
    512516{
    513517    /* Translate the dialog title: */
    … …  
    543547    }
    544548    /* Call to base-class: */
    545     QIWithRetranslateUI<QDialog>::accept();
     549    QDialog::accept();
    546550}
    547551

  • trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIAddDiskEncryptionPasswordDialog.h

    r103977 r104358  
    3838
    3939/* GUI includes: */
    40 #include "QIWithRetranslateUI.h"
    4140#include "UILibraryDefs.h"
    4241
    … …  
    5352/** QDialog subclass used to
    5453  * allow the user to enter disk encryption passwords for particular password IDs. */
    55 class SHARED_LIBRARY_STUFF UIAddDiskEncryptionPasswordDialog : public QIWithRetranslateUI<QDialog>
     54class SHARED_LIBRARY_STUFF UIAddDiskEncryptionPasswordDialog : public QDialog
    5655{
    5756    Q_OBJECT;
    … …  
    6867    EncryptionPasswordMap encryptionPasswords() const;
    6968
    70 protected:
     69private slots:
    7170
    7271    /** Translation routine. */
    73     virtual void retranslateUi() RT_OVERRIDE;
    74 
    75 private slots:
     72    void sltRetranslateUI();
    7673
    7774    /** Handles editor's Enter/Return key triggering. */

  • trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIApplianceEditorWidget.cpp

    r103771 r104358  
    2727
    2828/* Qt includes: */
     29#include <QApplication>
    2930#include <QCheckBox>
    3031#include <QComboBox>
    … …  
    17961797
    17971798UIApplianceEditorWidget::UIApplianceEditorWidget(QWidget *pParent /* = 0 */)
    1798     : QIWithRetranslateUI<QWidget>(pParent)
     1799    : QWidget(pParent)
    17991800    , m_pModel(0)
    18001801{
    … …  
    18781879
    18791880    /* Translate finally: */
    1880     retranslateUi();
     1881    sltRetranslateUI();
    18811882}
    18821883
    … …  
    19201921}
    19211922
    1922 void UIApplianceEditorWidget::retranslateUi()
     1923void UIApplianceEditorWidget::sltRetranslateUI()
    19231924{
    19241925    /* Translate information pane tree-view: */

  • trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIApplianceEditorWidget.h

    r103803 r104358  
    3939
    4040/* GUI includes: */
    41 #include "QIWithRetranslateUI.h"
    4241#include "UIExtraDataDefs.h"
    4342
    … …  
    295294
    296295/** QWidget subclass used as the Appliance Editor widget. */
    297 class UIApplianceEditorWidget : public QIWithRetranslateUI<QWidget>
     296class UIApplianceEditorWidget : public QWidget
    298297{
    299298    Q_OBJECT;
    … …  
    332331protected:
    333332
    334     /** Handles translation event. */
    335     virtual void retranslateUi() RT_OVERRIDE;
    336 
    337333    /** Holds the currently set appliance reference. */
    338334    CAppliance  m_comAppliance;
    … …  
    357353    /** Holds the warning browser instance. */
    358354    QTextEdit *m_pTextEditWarning;
     355
     356private slots:
     357
     358    /** Handles translation event. */
     359    void sltRetranslateUI();
    359360
    360361private:

  • trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIEmptyFilePathSelector.cpp

    r103711 r104358  
    4343#include "UIEmptyFilePathSelector.h"
    4444#include "UIIconPool.h"
    45 
     45#include "UITranslationEventListener.h"
    4646
    4747UIEmptyFilePathSelector::UIEmptyFilePathSelector (QWidget *aParent /* = NULL */)
    48     : QIWithRetranslateUI<QWidget> (aParent)
     48    : QWidget(aParent)
    4949    , mPathWgt (NULL)
    5050    , mLabel (NULL)
    … …  
    7575    setEditable (false);
    7676
    77     retranslateUi();
     77    sltRetranslateUI();
     78    connect(&translationEventListener(), &UITranslationEventListener::sigRetranslateUI,
     79            this, &UIEmptyFilePathSelector::sltRetranslateUI);
    7880}
    7981
    … …  
    215217}
    216218
    217 void UIEmptyFilePathSelector::retranslateUi()
     219void UIEmptyFilePathSelector::sltRetranslateUI()
    218220{
    219221    if (!m_fButtonToolTipSet)

  • trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIEmptyFilePathSelector.h

    r103977 r104358  
    3232#endif
    3333
    34 /* VBox includes */
    35 #include "QIWithRetranslateUI.h"
    36 
    3734/* Qt includes */
    3835#include <QComboBox>
    … …  
    4845
    4946
    50 class UIEmptyFilePathSelector: public QIWithRetranslateUI<QWidget>
     47class UIEmptyFilePathSelector: public QWidget
    5148{
    5249    Q_OBJECT;
    … …  
    107104    void setPath (const QString& aPath);
    108105
    109 protected:
    110     virtual void retranslateUi() RT_OVERRIDE;
     106private slots:
    111107
    112 private slots:
     108    void sltRetranslateUI();
    113109    void choose();
    114110    void textChanged (const QString& aPath);
    … …  
    132128
    133129#endif /* !FEQT_INCLUDED_SRC_widgets_UIEmptyFilePathSelector_h */
    134 

  • trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIFilePathSelector.cpp

    r103362 r104358  
    4848#include "UIIconPool.h"
    4949#include "UIFilePathSelector.h"
     50#include "UITranslationEventListener.h"
    5051
    5152/* Other VBox includes: */
    … …  
    6869
    6970UIFilePathSelector::UIFilePathSelector(QWidget *pParent /* = 0 */)
    70     : QIWithRetranslateUI<QIComboBox>(pParent)
     71    : QIComboBox(pParent)
    7172    , m_enmMode(Mode_Folder)
    7273    , m_strInitialPath(QDir::current().absolutePath())
    … …  
    119120
    120121    /* Applying language settings: */
    121     retranslateUi();
     122    sltRetranslateUI();
     123    connect(&translationEventListener(), &UITranslationEventListener::sigRetranslateUI,
     124        this, &UIFilePathSelector::sltRetranslateUI);
    122125}
    123126
    … …  
    126129    m_enmMode = enmMode;
    127130
    128     retranslateUi();
     131    sltRetranslateUI();
    129132}
    130133
    … …  
    182185
    183186    sltRecentMediaListUpdated(m_enmRecentMediaListType);
    184     retranslateUi();
     187    sltRetranslateUI();
    185188}
    186189
    … …  
    259262
    260263    /* Call to base-class: */
    261     return QIWithRetranslateUI<QIComboBox>::eventFilter(pObject, pEvent);
     264    return QIComboBox::eventFilter(pObject, pEvent);
    262265}
    263266
    264267void UIFilePathSelector::resizeEvent(QResizeEvent *pEvent)
    265268{
    266     QIWithRetranslateUI<QIComboBox>::resizeEvent(pEvent);
     269    QIComboBox::resizeEvent(pEvent);
    267270    refreshText();
    268271}
    … …  
    279282            refreshText();
    280283    }
    281     QIWithRetranslateUI<QIComboBox>::focusInEvent(pEvent);
     284    QIComboBox::focusInEvent(pEvent);
    282285}
    283286
    … …  
    289292        refreshText();
    290293    }
    291     QIWithRetranslateUI<QIComboBox>::focusOutEvent(pEvent);
    292 }
    293 
    294 void UIFilePathSelector::retranslateUi()
     294    QIComboBox::focusOutEvent(pEvent);
     295}
     296
     297void UIFilePathSelector::sltRetranslateUI()
    295298{
    296299    /* Retranslate copy action: */

  • trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIFilePathSelector.h

    r103987 r104358  
    3434/* GUI includes: */
    3535#include "QIComboBox.h"
    36 #include "QIWithRetranslateUI.h"
    3736#include "UILibraryDefs.h"
    3837#include "UIMediumDefs.h"
    … …  
    5251/** QIComboBox subclass providing GUI with the
    5352  * possibility to choose/reflect file/folder path. */
    54 class SHARED_LIBRARY_STUFF UIFilePathSelector : public QIWithRetranslateUI<QIComboBox>
     53class SHARED_LIBRARY_STUFF UIFilePathSelector : public QIComboBox
    5554{
    5655    Q_OBJECT;
    … …  
    158157    void focusOutEvent(QFocusEvent *pEvent) RT_OVERRIDE RT_FINAL;
    159158
    160     /** Handles translation event. */
    161     virtual void retranslateUi() RT_OVERRIDE RT_FINAL;
    162 
    163159private slots:
    164160
    … …  
    176172
    177173    void sltRecentMediaListUpdated(UIMediumDeviceType enmMediumType);
     174
     175    /** Handles translation event. */
     176    void sltRetranslateUI();
    178177
    179178private:

  • trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIFilmContainer.cpp

    r103315 r104358  
    2727
    2828/* Qt includes: */
     29#include <QApplication>
    2930#include <QCheckBox>
    3031#include <QHBoxLayout>
    3132#include <QPainter>
     33#include <QPainterPath>
    3234#include <QScrollArea>
    3335#include <QVBoxLayout>
    … …  
    3739
    3840/* GUI includes: */
    39 #include "QIWithRetranslateUI.h"
    4041#include "UIFilmContainer.h"
    41 
     42#include "UITranslationEventListener.h"
    4243
    4344/** QWidget subclass providing GUI with UIFilmContainer item prototype.
    4445  * @todo Rename to something more suitable like UIScreenThumbnail. */
    45 class UIFilm : public QIWithRetranslateUI<QWidget>
     46class UIFilm : public QWidget
    4647{
    4748    Q_OBJECT;
    … …  
    5960protected:
    6061
    61     /** Handles translation event. */
    62     virtual void retranslateUi() RT_OVERRIDE;
    63 
    6462    /** Handles paint @a pEvent. */
    6563    virtual void paintEvent(QPaintEvent *pEvent) RT_OVERRIDE;
    … …  
    6765    /** Returns minimum size-hint. */
    6866    virtual QSize minimumSizeHint() const RT_OVERRIDE;
     67
     68private slots:
     69
     70    /** Handles translation event. */
     71    void sltRetranslateUI();
    6972
    7073private:
    … …  
    9497
    9598UIFilm::UIFilm(int iScreenIndex, bool fEnabled, QWidget *pParent /* = 0*/)
    96     : QIWithRetranslateUI<QWidget>(pParent)
     99    : QWidget(pParent)
    97100    , m_iScreenIndex(iScreenIndex)
    98101    , m_fWasEnabled(fEnabled)
    … …  
    109112}
    110113
    111 void UIFilm::retranslateUi()
     114void UIFilm::sltRetranslateUI()
    112115{
    113116    /* Translate check-box: */
    … …  
    172175
    173176    /* Apply language settings: */
    174     retranslateUi();
     177    sltRetranslateUI();
     178    connect(&translationEventListener(), &UITranslationEventListener::sigRetranslateUI,
     179        this, &UIFilm::sltRetranslateUI);
    175180}
    176181

  • trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIFormEditorWidget.cpp

    r103771 r104358  
    2727
    2828/* Qt includes: */
     29#include <QApplication>
    2930#include <QComboBox>
    3031#include <QEvent>
    … …  
    4445#include "QIStyledItemDelegate.h"
    4546#include "QITableView.h"
    46 #include "QIWithRetranslateUI.h"
    4747#include "UIFormEditorWidget.h"
    4848#include "UIGlobalSession.h"
    4949#include "UIIconPool.h"
    5050#include "UINotificationCenter.h"
     51#include "UITranslationEventListener.h"
    5152
    5253/* COM includes: */
    … …  
    266267  * It's not actually an editor, but Edit... button instead which opens
    267268  * real editor passing stored model index received from TextData value. */
    268 class TextEditor : public QIWithRetranslateUI<QWidget>
     269class TextEditor : public QWidget
    269270{
    270271    Q_OBJECT;
    … …  
    276277    TextEditor(QWidget *pParent = 0);
    277278
    278 protected:
     279private slots:
    279280
    280281    /** Handles translation event. */
    281     virtual void retranslateUi() RT_OVERRIDE;
    282 
    283 private slots:
    284 
     282    void sltRetranslateUI();
    285283    /** Handles button click. */
    286284    void sltHandleButtonClick();
    … …  
    637635
    638636TextEditor::TextEditor(QWidget *pParent /* = 0 */)
    639     : QIWithRetranslateUI<QWidget>(pParent)
     637    : QWidget(pParent)
    640638    , m_pButton(0)
    641639{
    … …  
    643641}
    644642
    645 void TextEditor::retranslateUi()
     643void TextEditor::sltRetranslateUI()
    646644{
    647645    m_pButton->setText(UIFormEditorWidget::tr("Edit..."));
    … …  
    696694
    697695    /* Apply language settings: */
    698     retranslateUi();
     696    sltRetranslateUI();
     697    connect(&translationEventListener(), &UITranslationEventListener::sigRetranslateUI,
     698        this, &TextEditor::sltRetranslateUI);
    699699}
    700700

  • trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIGuestOSTypeSelectionButton.cpp

    r103893 r104358  
    2727
    2828/* Qt includes */
     29#include <QApplication>
    2930#include <QMenu>
    3031#include <QSignalMapper>
    … …  
    3637#include "UIGuestOSTypeSelectionButton.h"
    3738#include "UIIconPool.h"
    38 
     39#include "UITranslationEventListener.h"
    3940
    4041UIGuestOSTypeSelectionButton::UIGuestOSTypeSelectionButton(QWidget *pParent)
    41     : QIWithRetranslateUI<QPushButton>(pParent)
     42    : QPushButton(pParent)
    4243{
    4344    /* Determine icon metric: */
    … …  
    6263
    6364    /* Apply language settings: */
    64     retranslateUi();
     65    sltRetranslateUI();
     66    connect(&translationEventListener(), &UITranslationEventListener::sigRetranslateUI,
     67            this, &UIGuestOSTypeSelectionButton::sltRetranslateUI);
    6568}
    6669
    … …  
    8487}
    8588
    86 void UIGuestOSTypeSelectionButton::retranslateUi()
     89void UIGuestOSTypeSelectionButton::sltRetranslateUI()
    8790{
    8891    populateMenu();

  • trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIGuestOSTypeSelectionButton.h

    r101285 r104358  
    3535#include <QPushButton>
    3636
    37 /* GUI includes: */
    38 #include "QIWithRetranslateUI.h"
    39 
    4037/* Forward declarations: */
    4138class QMenu;
    … …  
    4340
    4441/** QPushButton sub-class for choosing guest OS family/type inside appliance editor widget. */
    45 class UIGuestOSTypeSelectionButton : public QIWithRetranslateUI<QPushButton>
     42class UIGuestOSTypeSelectionButton : public QPushButton
    4643{
    4744    Q_OBJECT;
    … …  
    6360    void setOSTypeId(const QString &strOSTypeId);
    6461
    65 protected:
     62private:
    6663
    6764    /** Handles translation event. */
    68     virtual void retranslateUi() RT_OVERRIDE;
    69 
    70 private:
    71 
     65    void sltRetranslateUI();
    7266    /** Populates menu. */
    7367    void populateMenu();

  • trunk/src/VBox/Frontends/VirtualBox/src/widgets/UILineTextEdit.cpp

    r98103 r104358  
    3939#include "UICommon.h"
    4040#include "UILineTextEdit.h"
    41 
     41#include "UITranslationEventListener.h"
    4242
    4343////////////////////////////////////////////////////////////////////////////////
    … …  
    4545
    4646UITextEditor::UITextEditor(QWidget *pParent /* = NULL */)
    47   : QIWithRetranslateUI<QIDialog>(pParent)
     47  : QIDialog(pParent)
    4848{
    4949    QVBoxLayout *pMainLayout = new QVBoxLayout(this);
    … …  
    6767
    6868    /* Applying language settings */
    69     retranslateUi();
     69    sltRetranslateUI();
     70    connect(&translationEventListener(), &UITranslationEventListener::sigRetranslateUI,
     71            this, &UITextEditor::sltRetranslateUI);
    7072}
    7173
    … …  
    8082}
    8183
    82 void UITextEditor::retranslateUi()
     84void UITextEditor::sltRetranslateUI()
    8385{
    8486    setWindowTitle(tr("Edit text"));
    … …  
    106108
    107109UILineTextEdit::UILineTextEdit(QWidget *pParent /* = NULL */)
    108   : QIWithRetranslateUI<QPushButton>(pParent)
     110  : QPushButton(pParent)
    109111{
    110112    connect(this, &UILineTextEdit::clicked,
    … …  
    116118
    117119    setFocusPolicy(Qt::StrongFocus);
    118     retranslateUi();
     120    sltRetranslateUI();
     121    connect(&translationEventListener(), &UITranslationEventListener::sigRetranslateUI,
     122        this, &UILineTextEdit::sltRetranslateUI);
    119123}
    120124
    121 void UILineTextEdit::retranslateUi()
     125void UILineTextEdit::sltRetranslateUI()
    122126{
    123127    QPushButton::setText(tr("&Edit"));

  • trunk/src/VBox/Frontends/VirtualBox/src/widgets/UILineTextEdit.h

    r103977 r104358  
    3434/* VBox includes */
    3535#include "QIDialog.h"
    36 #include "QIWithRetranslateUI.h"
    3736
    3837/* Qt includes */
    … …  
    4645// UITextEditor
    4746
    48 class UITextEditor: public QIWithRetranslateUI<QIDialog>
     47class UITextEditor: public QIDialog
    4948{
    5049    Q_OBJECT;
    … …  
    5655    QString text() const;
    5756
    58 protected:
    59     virtual void retranslateUi() RT_OVERRIDE;
     57private slots:
    6058
    61 private slots:
     59    void sltRetranslateUI();
    6260    void open() RT_OVERRIDE;
    6361
    … …  
    7270// UILineTextEdit
    7371
    74 class UILineTextEdit: public QIWithRetranslateUI<QPushButton>
     72class UILineTextEdit: public QPushButton
    7573{
    7674    Q_OBJECT;
    … …  
    8785    QString text() const { return m_strText; }
    8886
    89 protected:
    90     virtual void retranslateUi() RT_OVERRIDE;
     87private slots:
    9188
    92 private slots:
     89    void sltRetranslateUI();
    9390    void edit();
    9491
    … …  
    9996
    10097#endif /* !FEQT_INCLUDED_SRC_widgets_UILineTextEdit_h */
    101 

  • trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIMediumSizeEditor.cpp

    r103771 r104358  
    3838#include "UIMediumSizeEditor.h"
    3939#include "UITranslator.h"
     40#include "UITranslationEventListener.h"
    4041
    4142/* COM includes: */
    … …  
    4647
    4748UIMediumSizeEditor::UIMediumSizeEditor(QWidget *pParent, qulonglong uMinimumSize /* = _4M */)
    48     : QIWithRetranslateUI<QWidget>(pParent)
     49    : QWidget(pParent)
    4950    , m_uSizeMin(uMinimumSize)
    5051    , m_uSizeMax(gpGlobalSession->virtualBox().GetSystemProperties().GetInfoVDSize())
    … …  
    7778}
    7879
    79 void UIMediumSizeEditor::retranslateUi()
     80void UIMediumSizeEditor::sltRetranslateUI()
    8081{
    8182    /* Translate labels: */
    … …  
    210211
    211212    /* Apply language settings: */
    212     retranslateUi();
     213    sltRetranslateUI();
     214    connect(&translationEventListener(), &UITranslationEventListener::sigRetranslateUI,
     215            this, &UIMediumSizeEditor::sltRetranslateUI);
    213216}
    214217

  • trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIMediumSizeEditor.h

    r103320 r104358  
    3737
    3838/* GUI includes: */
    39 #include "QIWithRetranslateUI.h"
    4039#include "UILibraryDefs.h"
    4140
    … …  
    4847
    4948/** Medium size editor widget. */
    50 class SHARED_LIBRARY_STUFF UIMediumSizeEditor : public QIWithRetranslateUI<QWidget>
     49class SHARED_LIBRARY_STUFF UIMediumSizeEditor : public QWidget
    5150{
    5251    Q_OBJECT;
    … …  
    6766    void setMediumSize(qulonglong uSize);
    6867
    69 protected:
     68private slots:
    7069
    7170    /** Handles translation event. */
    72     virtual void retranslateUi() RT_OVERRIDE;
    73 
    74 private slots:
    75 
     71    void sltRetranslateUI();
    7672    /** Handles size slider change. */
    7773    void sltSizeSliderChanged(int iValue);

  • trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIPaneContainer.cpp

    r103923 r104358  
    2727
    2828/* Qt includes: */
     29#include <QApplication>
    2930#include <QAbstractButton>
    3031#include <QComboBox>

  • trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIPopupPane.cpp

    r98103 r104358  
    2727
    2828/* Qt includes: */
     29#include <QApplication>
    2930#include <QPainter>
     31#include <QPainterPath>
    3032#include <QTextEdit>
    3133
    3234/* GUI includes: */
     35#include "QIMessageBox.h"
     36#include "UIAnimationFramework.h"
    3337#include "UIPopupPane.h"
    3438#include "UIPopupPaneMessage.h"
    3539#include "UIPopupPaneDetails.h"
    3640#include "UIPopupPaneButtonPane.h"
    37 #include "UIAnimationFramework.h"
    38 #include "QIMessageBox.h"
     41#include "UITranslationEventListener.h"
    3942
    4043/* Other VBox includes: */
    … …  
    4548                         const QString &strMessage, const QString &strDetails,
    4649                         const QMap<int, QString> &buttonDescriptions)
    47     : QIWithRetranslateUI<QWidget>(pParent)
     50    : QWidget(pParent)
    4851    , m_fPolished(false)
    4952    , m_iLayoutMargin(10), m_iLayoutSpacing(5)
    … …  
    295298
    296299    /* Translate UI finally: */
    297     retranslateUi();
     300    sltRetranslateUI();
     301    connect(&translationEventListener(), &UITranslationEventListener::sigRetranslateUI,
     302            this, &UIPopupPane::sltRetranslateUI);
    298303}
    299304
    … …  
    311316}
    312317
    313 void UIPopupPane::retranslateUi()
     318void UIPopupPane::sltRetranslateUI()
    314319{
    315320    /* Translate tool-tips: */
    … …  
    339344        && pObject != m_pButtonPane
    340345        && pObject != m_pDetailsPane)
    341         return QIWithRetranslateUI<QWidget>::eventFilter(pObject, pEvent);
     346        return QWidget::eventFilter(pObject, pEvent);
    342347
    343348    /* Depending on event-type: */
    … …  
    410415
    411416    /* Call to base-class: */
    412     return QIWithRetranslateUI<QWidget>::eventFilter(pObject, pEvent);
     417    return QWidget::eventFilter(pObject, pEvent);
    413418}
    414419

  • trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIPopupPane.h

    r103977 r104358  
    3737
    3838/* GUI includes: */
    39 #include "QIWithRetranslateUI.h"
    4039#include "UILibraryDefs.h"
    4140
    … …  
    5655
    5756/** QWidget extension used as popup-center pane prototype. */
    58 class SHARED_LIBRARY_STUFF UIPopupPane : public QIWithRetranslateUI<QWidget>
     57class SHARED_LIBRARY_STUFF UIPopupPane : public QWidget
    5958{
    6059    Q_OBJECT;
    … …  
    139138    void sltButtonClicked(int iButtonID);
    140139
     140    /** Handles translation event. */
     141    void sltRetranslateUI();
     142
    141143private:
    142144
    … …  
    155157    void prepareAnimation();
    156158
    157     /** Handles translation event. */
    158     virtual void retranslateUi() RT_OVERRIDE;
    159159    /** Translats tool-tips. */
    160160    void retranslateToolTips();
    … …  
    254254
    255255#endif /* !FEQT_INCLUDED_SRC_widgets_UIPopupPane_h */
    256 

  • trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIPortForwardingTable.cpp

    r103988 r104358  
    2828/* Qt includes: */
    2929#include <QAction>
     30#include <QApplication>
    3031#include <QComboBox>
     32#include <QEvent>
    3133#include <QHBoxLayout>
    3234#include <QHeaderView>
    … …  
    4547#include "UIPortForwardingTable.h"
    4648#include "QIToolBar.h"
     49#include "UITranslationEventListener.h"
    4750
    4851/* Other VBox includes: */
    … …  
    960963    }
    961964    /* Call to base-class: */
    962     return QIWithRetranslateUI<QWidget>::eventFilter(pObject, pEvent);
    963 }
    964 
    965 void UIPortForwardingTable::retranslateUi()
     965    return QWidget::eventFilter(pObject, pEvent);
     966}
     967
     968void UIPortForwardingTable::sltRetranslateUI()
    966969{
    967970    /* Table translations: */
    … …  
    10691072
    10701073    /* Apply language settings: */
    1071     retranslateUi();
     1074    sltRetranslateUI();
     1075    connect(&translationEventListener(), &UITranslationEventListener::sigRetranslateUI,
     1076            this, &UIPortForwardingTable::sltRetranslateUI);
    10721077}
    10731078

  • trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIPortForwardingTable.h

    r103803 r104358  
    3737
    3838/* GUI includes: */
    39 #include "QIWithRetranslateUI.h"
    4039#include "UILibraryDefs.h"
    4140
    … …  
    205204
    206205/** QWidget subclass representig Port Forwarding table. */
    207 class SHARED_LIBRARY_STUFF UIPortForwardingTable : public QIWithRetranslateUI<QWidget>
     206class SHARED_LIBRARY_STUFF UIPortForwardingTable : public QWidget
    208207{
    209208    Q_OBJECT;
    … …  
    248247    virtual bool eventFilter(QObject *pObject, QEvent *pEvent) RT_OVERRIDE;
    249248
     249private slots:
     250
    250251    /** Handles translation event. */
    251     virtual void retranslateUi() RT_OVERRIDE;
    252 
    253 private slots:
    254 
     252    void sltRetranslateUI();
    255253    /** Adds the rule. */
    256254    void sltAddRule();

  • trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIProgressDialog.cpp

    r98103 r104358  
    2727
    2828/* Qt includes: */
     29#include <QApplication>
    2930#include <QCloseEvent>
    3031#include <QEventLoop>
    … …  
    4546#include "UISpecialControls.h"
    4647#include "UITranslator.h"
     48#include "UITranslationEventListener.h"
    4749#ifdef VBOX_WS_MAC
    4850# include "VBoxUtils-darwin.h"
    … …  
    6264                                   int cMinDuration /* = 2000 */,
    6365                                   QWidget *pParent /* = 0 */)
    64     : QIWithRetranslateUI2<QIDialog>(pParent, Qt::MSWindowsFixedSizeDialogHint | Qt::WindowTitleHint)
     66    : QIDialog(pParent, Qt::MSWindowsFixedSizeDialogHint | Qt::WindowTitleHint)
    6567    , m_comProgress(comProgress)
    6668    , m_strTitle(strTitle)
    … …  
    9092}
    9193
    92 void UIProgressDialog::retranslateUi()
     94void UIProgressDialog::sltRetranslateUI()
    9395{
    9496    m_pButtonCancel->setText(tr("&Cancel"));
    … …  
    376378
    377379    /* Translate finally: */
    378     retranslateUi();
     380    sltRetranslateUI();
     381    connect(&translationEventListener(), &UITranslationEventListener::sigRetranslateUI,
     382        this, &UIProgressDialog::sltRetranslateUI);
    379383
    380384    /* The progress dialog will be shown automatically after

  • trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIProgressDialog.h

    r98103 r104358  
    3434/* GUI includes: */
    3535#include "QIDialog.h"
    36 #include "QIWithRetranslateUI.h"
    3736#include "UILibraryDefs.h"
    3837
    … …  
    5150  * @note The CProgress instance is passed as a non-const reference to the constructor (to memorize COM errors if they happen),
    5251  *       and therefore must not be destroyed before the created UIProgressDialog instance is destroyed. */
    53 class SHARED_LIBRARY_STUFF UIProgressDialog : public QIWithRetranslateUI2<QIDialog>
     52class SHARED_LIBRARY_STUFF UIProgressDialog : public QIDialog
    5453{
    5554    Q_OBJECT;
    … …  
    8786protected:
    8887
    89     /** Handles translation event. */
    90     virtual void retranslateUi() RT_OVERRIDE;
    91 
    9288    /** Rejects dialog. */
    9389    virtual void reject() RT_OVERRIDE;
    … …  
    110106    /** Handles request to cancel operation. */
    111107    void sltCancelOperation();
     108
     109    /** Handles translation event. */
     110    void sltRetranslateUI();
    112111
    113112private:
    … …  
    179178
    180179#endif /* !FEQT_INCLUDED_SRC_widgets_UIProgressDialog_h */
    181 

  • trunk/src/VBox/Frontends/VirtualBox/src/widgets/UISpecialControls.cpp

    r103578 r104358  
    3939#include "UIShortcutPool.h"
    4040#include "UISpecialControls.h"
    41 
     41#include "UITranslationEventListener.h"
    4242
    4343#ifdef VBOX_DARWIN_USE_NATIVE_CONTROLS
    … …  
    5555    connect(m_pButton, SIGNAL(clicked()), this, SIGNAL(clicked()));
    5656    setFixedSize(m_pButton->size());
     57    connect(&translationEventListener(), &UITranslationEventListener::sigRetranslateUI,
     58        this, &UIMiniCancelButton::sltRetranslateUI);
    5759}
    5860
    … …  
    8587
    8688UIMiniCancelButton::UIMiniCancelButton(QWidget *pParent /* = 0 */)
    87     : QIWithRetranslateUI<QIToolButton>(pParent)
     89    : QIToolButton(pParent)
    8890{
    8991    setAutoRaise(true);
    … …  
    105107
    106108UIHelpButton::UIHelpButton(QWidget *pParent /* = 0 */)
    107     : QIWithRetranslateUI<QPushButton>(pParent)
     109    : QPushButton(pParent)
    108110{
    109111# ifdef VBOX_WS_MAC
    … …  
    120122
    121123    /* Apply language settings: */
    122     retranslateUi();
     124    sltRetranslateUI();
     125    connect(&translationEventListener(), &UITranslationEventListener::sigRetranslateUI,
     126        this, &UIHelpButton::sltRetranslateUI);
    123127}
    124128
    … …  
    134138
    135139    /* Apply language settings: */
    136     retranslateUi();
    137 }
    138 
    139 void UIHelpButton::retranslateUi()
     140    sltRetranslateUI();
     141}
     142
     143void UIHelpButton::sltRetranslateUI()
    140144{
    141145    QPushButton::setText(tr("&Help"));
    … …  
    198202
    199203#endif /* !VBOX_DARWIN_USE_NATIVE_CONTROLS */
    200 

  • trunk/src/VBox/Frontends/VirtualBox/src/widgets/UISpecialControls.h

    r103977 r104358  
    3939
    4040/* GUI includes: */
    41 #include "QIWithRetranslateUI.h"
    4241#include "UILibraryDefs.h"
    4342#ifdef VBOX_DARWIN_USE_NATIVE_CONTROLS
    … …  
    116115
    117116/** QAbstractButton subclass, used as mini cancel button. */
    118 class SHARED_LIBRARY_STUFF UIMiniCancelButton : public QIWithRetranslateUI<QIToolButton>
     117class SHARED_LIBRARY_STUFF UIMiniCancelButton : public QIToolButton
    119118{
    120119    Q_OBJECT;
    … …  
    125124    UIMiniCancelButton(QWidget *pParent = 0);
    126125
    127 protected:
     126private slots:
    128127
    129128    /** Handles translation event. */
    130     virtual void retranslateUi() RT_OVERRIDE {};
     129    void sltRetranslateUI() {};
    131130};
    132131
    133132
    134133/** QAbstractButton subclass, used as mini cancel button. */
    135 class SHARED_LIBRARY_STUFF UIHelpButton : public QIWithRetranslateUI<QPushButton>
     134class SHARED_LIBRARY_STUFF UIHelpButton : public QPushButton
    136135{
    137136    Q_OBJECT;
    … …  
    154153
    155154protected:
    156 
    157     /** Handles translation event. */
    158     virtual void retranslateUi() RT_OVERRIDE;
    159155
    160156# ifdef VBOX_WS_MAC
    … …  
    191187    QRect m_BRect;
    192188# endif /* VBOX_WS_MAC */
     189
     190private slots:
     191
     192    /** Handles translation event. */
     193    void sltRetranslateUI();
    193194};
    194195
    … …  
    197198
    198199#endif /* !FEQT_INCLUDED_SRC_widgets_UISpecialControls_h */
    199 

  • trunk/src/VBox/Frontends/VirtualBox/src/widgets/UITabBar.cpp

    r101562 r104358  
    4040#include <QStyleOption>
    4141#include <QPainter>
     42#include <QPainterPath>
    4243#include <QStyle>
    4344#include <QToolButton>
    … …  
    4849
    4950/* GUI includes: */
    50 #include "QIWithRetranslateUI.h"
    5151#include "UIIconPool.h"
    5252#include "UITabBar.h"
     53#include "UITranslationEventListener.h"
    5354
    5455/* Other VBox includes: */
    … …  
    7273
    7374/** Our own skinnable implementation of tabs for tab-bar. */
    74 class UITabBarItem : public QIWithRetranslateUI<QWidget>
     75class UITabBarItem : public QWidget
    7576{
    7677    Q_OBJECT;
    … …  
    111112    /** Handles any Qt @a pEvent. */
    112113    virtual bool event(QEvent *pEvent) RT_OVERRIDE;
    113 
    114     /** Handles translation event. */
    115     virtual void retranslateUi() RT_OVERRIDE;
    116114
    117115    /** Handles paint @a pEvent. */
    … …  
    134132    void sltCloseClicked() { emit sigCloseClicked(this); }
    135133
     134    /** Handles translation event. */
     135    void sltRetranslateUI();
     136
    136137private:
    137138
    … …  
    241242
    242243    /* Call to base-class: */
    243     return QIWithRetranslateUI<QWidget>::event(pEvent);
    244 }
    245 
    246 void UITabBarItem::retranslateUi()
     244    return QWidget::event(pEvent);
     245}
     246
     247void UITabBarItem::sltRetranslateUI()
    247248{
    248249    /* Translate label: */
    … …  
    712713
    713714    /* Apply language settings: */
    714     retranslateUi();
     715    sltRetranslateUI();
     716    connect(&translationEventListener(), &UITranslationEventListener::sigRetranslateUI,
     717        this, &UITabBarItem::sltRetranslateUI);
    715718}
    716719
    … …  
    10771080
    10781081#include "UITabBar.moc"
    1079 

  • trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIToolBox.cpp

    r103977 r104358  
    2727
    2828/* Qt includes: */
     29#include <QApplication>
    2930#include <QCheckBox>
    3031#include <QLabel>
    … …  
    3940#include "UIIconPool.h"
    4041#include "UIToolBox.h"
     42#include "UITranslationEventListener.h"
    4143
    4244
    … …  
    7678*********************************************************************************************************************************/
    7779
    78 class UIToolBoxPage : public QIWithRetranslateUI<QWidget>
     80class UIToolBoxPage : public QWidget
    7981{
    8082
    … …  
    101103
    102104    virtual bool eventFilter(QObject *pWatched, QEvent *pEvent) RT_OVERRIDE;
    103     virtual void retranslateUi() RT_OVERRIDE RT_FINAL;
    104105
    105106private slots:
    106107
    107108    void sltHandleEnableToggle(int iState);
     109    void sltRetranslateUI();
    108110
    109111private:
    … …  
    174176
    175177UIToolBoxPage::UIToolBoxPage(bool fEnableCheckBoxEnabled /* = false */, QWidget *pParent /* = 0 */)
    176     :QIWithRetranslateUI<QWidget>(pParent)
     178    : QWidget(pParent)
    177179    , m_fExpanded(false)
    178180    , m_pLayout(0)
    … …  
    195197        return;
    196198    m_pTitleLabel->setText(strTitle);
    197     retranslateUi();
     199    sltRetranslateUI();
    198200}
    199201
    … …  
    237239
    238240    setExpandCollapseIcon();
    239     retranslateUi();
     241    sltRetranslateUI();
     242    connect(&translationEventListener(), &UITranslationEventListener::sigRetranslateUI,
     243        this, &UIToolBoxPage::sltRetranslateUI);
    240244}
    241245
    … …  
    354358}
    355359
    356 void UIToolBoxPage::retranslateUi()
     360void UIToolBoxPage::sltRetranslateUI()
    357361{
    358362    if (m_pTitleButton)
    … …  
    366370
    367371UIToolBox::UIToolBox(QWidget *pParent /*  = 0 */)
    368     : QIWithRetranslateUI<QFrame>(pParent)
     372    : QFrame(pParent)
    369373    , m_iCurrentPageIndex(-1)
    370374    , m_iPageCount(0)
    … …  
    457461}
    458462
    459 void UIToolBox::retranslateUi()
    460 {
    461 }
    462 
    463463void UIToolBox::prepare()
    464464{
    465465    m_pMainLayout = new QVBoxLayout(this);
    466466    m_pMainLayout->addStretch();
    467 
    468     retranslateUi();
    469467}
    470468

  • trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIToolBox.h

    r103977 r104358  
    3737
    3838/* Local includes: */
    39 #include "QIWithRetranslateUI.h"
     39#include "UILibraryDefs.h"
    4040
    4141/* Forward declarations: */
    … …  
    4646/** A Qframe extension with similar API and functionality like QToolBox. I needed some for
    4747  * flexibility (like a second icon at the right hand side of the title etc.). */
    48 class  SHARED_LIBRARY_STUFF UIToolBox : public QIWithRetranslateUI<QFrame>
     48class  SHARED_LIBRARY_STUFF UIToolBox : public QFrame
    4949{
    5050
    … …  
    6464    virtual QSize minimumSizeHint() const RT_OVERRIDE;
    6565
    66 protected:
    67 
    68     virtual void retranslateUi() RT_OVERRIDE RT_FINAL;
    69 
    7066private slots:
    7167

  • trunk/src/VBox/Frontends/VirtualBox/src/wizards/UINativeWizard.cpp

    r103961 r104358  
    2727
    2828/* Qt includes: */
     29#include <QApplication>
    2930#include <QHBoxLayout>
    3031#include <QLabel>

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

    r103947 r104358  
    2727
    2828/* Qt includes: */
     29#include <QApplication>
    2930#include <QGridLayout>
    3031#include <QLabel>

  • trunk/src/VBox/Frontends/VirtualBox/src/wizards/editors/UIWizardDiskEditors.cpp

    r103948 r104358  
    2727
    2828/* Qt includes: */
     29#include <QApplication>
    2930#include <QButtonGroup>
    3031#include <QCheckBox>

  • trunk/src/VBox/Frontends/VirtualBox/src/wizards/exportappliance/UIWizardExportAppPageFormat.cpp

    r103957 r104358  
    2727
    2828/* Qt includes: */
     29#include <QApplication>
    2930#include <QButtonGroup>
    3031#include <QCheckBox>

  • trunk/src/VBox/Frontends/VirtualBox/src/wizards/exportappliance/UIWizardExportAppPageVMs.cpp

    r103988 r104358  
    2727
    2828/* Qt includes: */
     29#include <QApplication>
    2930#include <QListWidget>
    3031#include <QVBoxLayout>

  • trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMNameOSTypePage.cpp

    r103957 r104358  
    2727
    2828/* Qt includes: */
     29#include <QApplication>
    2930#include <QCheckBox>
    3031#include <QDir>

  • trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMSummaryPage.cpp

    r103982 r104358  
    2727
    2828/* Qt includes: */
     29#include <QApplication>
    2930#include <QHeaderView>
    3031#include <QList>
Note: See TracChangeset for help on using the changeset viewer.

© 2025 Oracle Support Privacy / Do Not Sell My Info Terms of Use Trademark Policy Automated Access Etiquette