VirtualBox

Changeset 100896 in vbox for trunk/src/VBox


Ignore:
Timestamp:
Aug 17, 2023 12:18:19 PM (19 months ago)
Author:
vboxsync
svn:sync-xref-src-repo-rev:
158831
Message:

FE/Qt: bugref:10506: Suitable HiDPI icon sets for all dialogs using QWidget::setWindowIcon.

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

Legend:

Unmodified
Added
Removed

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

    r98103 r100896  
    3636#include "QIDialogButtonBox.h"
    3737#include "VBoxLicenseViewer.h"
     38#include "UIIconPool.h"
    3839#include "UIMessageCenter.h"
    3940#include "UINotificationCenter.h"
    … …  
    4647    , m_pButtonDisagree(0)
    4748{
    48 #if !(defined(VBOX_WS_WIN) || defined(VBOX_WS_MAC))
    49     /* Assign application icon: */
    50     setWindowIcon(QIcon(":/VirtualBox_48px.png"));
     49#ifndef VBOX_WS_MAC
     50    /* Assign window icon: */
     51    setWindowIcon(UIIconPool::iconSetFull(":/log_viewer_find_32px.png", ":/log_viewer_find_16px.png"));
    5152#endif
    5253

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

    r98103 r100896  
    291291void UIInputDialogCloudConsoleApplication::prepare()
    292292{
    293     /* Configure self: */
    294     setWindowIcon(UIIconPool::iconSet(":/cloud_console_application_add_16px.png"));
     293#ifndef VBOX_WS_MAC
     294    /* Assign window icon: */
     295    setWindowIcon(UIIconPool::iconSetFull(":/cloud_console_application_add_32px.png" ,":/cloud_console_application_add_16px.png"));
     296#endif
    295297
    296298    /* Prepare main layout: */
    … …  
    399401void UIInputDialogCloudConsoleProfile::prepare()
    400402{
    401     /* Configure self: */
    402     setWindowIcon(UIIconPool::iconSet(":/cloud_console_profile_add_16px.png"));
     403#ifndef VBOX_WS_MAC
     404    /* Assign window icon: */
     405    setWindowIcon(UIIconPool::iconSetFull(":/cloud_console_profile_add_32px.png", ":/cloud_console_profile_add_16px.png"));
     406#endif
    403407
    404408    /* Prepare main layout: */
    … …  
    12041208void UICloudConsoleManager::configure()
    12051209{
    1206     /* Apply window icons: */
     1210#ifndef VBOX_WS_MAC
     1211    /* Assign window icon: */
    12071212    setWindowIcon(UIIconPool::iconSetFull(":/cloud_console_manager_32px.png", ":/cloud_console_manager_16px.png"));
     1213#endif
    12081214}
    12091215

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

    r98103 r100896  
    349349        if (pDialog)
    350350        {
    351             pDialog->setWindowIcon(UIIconPool::iconSet(":/cloud_profile_add_16px.png"));
     351#ifndef VBOX_WS_MAC
     352            pDialog->setWindowIcon(UIIconPool::iconSetFull(":/cloud_profile_add_32px.png", ":/cloud_profile_add_16px.png"));
     353#endif
    352354            pDialog->setWindowTitle(UICloudProfileManager::tr("Add Profile"));
    353355            if (pDialog->exec() == QDialog::Accepted)
    … …  
    984986void UICloudProfileManager::configure()
    985987{
    986     /* Apply window icons: */
     988#ifndef VBOX_WS_MAC
     989    /* Assign window icon: */
    987990    setWindowIcon(UIIconPool::iconSetFull(":/cloud_profile_manager_32px.png", ":/cloud_profile_manager_16px.png"));
     991#endif
    988992}
    989993

  • trunk/src/VBox/Frontends/VirtualBox/src/extensionpackmanager/UIExtensionPackManager.cpp

    r100738 r100896  
    633633void UIExtensionPackManager::configure()
    634634{
    635     /* Apply window icons: */
    636     setWindowIcon(UIIconPool::iconSetFull(":/extension_pack_manager_32px.png", ":/extension_pack_manager_16px.png"));
     635#ifndef VBOX_WS_MAC
     636    /* Assign window icon: */
     637    setWindowIcon(UIIconPool::iconSetFull(":/extension_pack_manager_24px.png", ":/extension_pack_manager_16px.png"));
     638#endif
    637639}
    638640

  • trunk/src/VBox/Frontends/VirtualBox/src/extradata/UIExtraDataManager.cpp

    r100352 r100896  
    13711371{
    13721372#ifndef VBOX_WS_MAC
    1373     /* Apply window icons: */
    1374     setWindowIcon(UIIconPool::iconSetFull(":/edata_manager_32px.png",
    1375                                           ":/edata_manager_16px.png"));
    1376 #endif /* !VBOX_WS_MAC */
     1373    /* Assign window icon: */
     1374    setWindowIcon(UIIconPool::iconSetFull(":/edata_manager_32px.png", ":/edata_manager_16px.png"));
     1375#endif
    13771376
    13781377    /* Apply window title: */

  • trunk/src/VBox/Frontends/VirtualBox/src/guestctrl/UIFileManagerDialog.cpp

    r98103 r100896  
    115115void UIFileManagerDialog::configure()
    116116{
    117     /* Apply window icons: */
     117#ifndef VBOX_WS_MAC
     118    /* Assign window icon: */
    118119    setWindowIcon(UIIconPool::iconSetFull(":/file_manager_32px.png", ":/file_manager_16px.png"));
     120#endif
    119121}
    120122

  • trunk/src/VBox/Frontends/VirtualBox/src/guestctrl/UIGuestProcessControlDialog.cpp

    r98876 r100896  
    7676void UIGuestProcessControlDialog::configure()
    7777{
    78     /* Apply window icons: */
    79     setWindowIcon(UIIconPool::iconSetFull(":/vm_show_logs_32px.png", ":/vm_show_logs_16px.png"));
     78#ifndef VBOX_WS_MAC
     79    /* Assign window icon: */
     80    setWindowIcon(UIIconPool::iconSetFull(":/performance_monitor_32px.png" ,":/performance_monitor_16px.png"));
     81#endif
    8082}
    8183

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

    r100300 r100896  
    6363    , m_pZoomLabel(0)
    6464{
     65#ifndef VBOX_WS_MAC
     66    /* Assign window icon: */
     67    setWindowIcon(UIIconPool::iconSetFull(":/log_viewer_find_32px.png", ":/log_viewer_find_16px.png"));
     68#endif
     69
    6570    setAttribute(Qt::WA_DeleteOnClose);
    66     setWindowIcon(UIIconPool::iconSetFull(":/vm_show_logs_32px.png", ":/vm_show_logs_16px.png"));
    6771    statusBar()->show();
    6872    m_pZoomLabel = new QLabel;

  • trunk/src/VBox/Frontends/VirtualBox/src/logviewer/UIVMLogViewerDialog.cpp

    r98844 r100896  
    149149void UIVMLogViewerDialog::configure()
    150150{
    151     /* Apply window icons: */
     151#ifndef VBOX_WS_MAC
     152    /* Assign window icon: */
    152153    setWindowIcon(UIIconPool::iconSetFull(":/vm_show_logs_32px.png", ":/vm_show_logs_16px.png"));
     154#endif
    153155}
    154156

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

    r99946 r100896  
    3838#include "UIFDCreationDialog.h"
    3939#include "UIFilePathSelector.h"
     40#include "UIIconPool.h"
    4041#include "UIMedium.h"
    4142#include "UIMessageCenter.h"
    … …  
    198199{
    199200#ifndef VBOX_WS_MAC
    200     setWindowIcon(QIcon(":/fd_add_32px.png"));
     201    /* Assign window icon: */
     202    setWindowIcon(UIIconPool::iconSetFull(":/fd_add_32px.png", ":/fd_add_16px.png"));
    201203#endif
    202204

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

    r99390 r100896  
    17591759void UIMediumManager::configure()
    17601760{
    1761     /* Apply window icons: */
     1761#ifndef VBOX_WS_MAC
     1762    /* Assign window icon: */
    17621763    setWindowIcon(UIIconPool::iconSetFull(":/media_manager_32px.png", ":/media_manager_16px.png"));
     1764#endif
    17631765}
    17641766

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

    r98103 r100896  
    220220{
    221221#ifndef VBOX_WS_MAC
    222     /* Apply window icon, not for macOS, since in Qt 5.6.x applying
    223      * icon for non-top-level modal window (macOS Sheet) may cause crash: */
     222    /* Assign window icon: */
    224223    setWindowIcon(UIIconPool::iconSetFull(":/media_manager_32px.png", ":/media_manager_16px.png"));
    225 #endif /* !VBOX_WS_MAC */
     224#endif
     225
    226226    setTitle();
    227227    prepareWidgets();

  • trunk/src/VBox/Frontends/VirtualBox/src/networkmanager/UINetworkManager.cpp

    r98103 r100896  
    25862586void UINetworkManager::configure()
    25872587{
    2588     /* Apply window icons: */
     2588#ifndef VBOX_WS_MAC
     2589    /* Assign window icon: */
    25892590    setWindowIcon(UIIconPool::iconSetFull(":/host_iface_manager_32px.png", ":/host_iface_manager_16px.png"));
     2591#endif
    25902592}
    25912593

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

    r98805 r100896  
    119119void UIBootFailureDialog::configure()
    120120{
     121#ifndef VBOX_WS_MAC
     122    /* Assign window icon: */
    121123    setWindowIcon(UIIconPool::iconSetFull(":/media_manager_32px.png", ":/media_manager_16px.png"));
     124#endif
     125
    122126    setTitle();
    123127    prepareWidgets();

  • trunk/src/VBox/Frontends/VirtualBox/src/runtime/information/UIVMInformationDialog.cpp

    r99946 r100896  
    155155void UIVMInformationDialog::prepare()
    156156{
     157#ifndef VBOX_WS_MAC
     158    /* Assign window icon: */
     159    setWindowIcon(UIIconPool::iconSetFull(":/session_info_32px.png", ":/session_info_16px.png"));
     160#endif
     161
    157162    m_uMachineId = uiCommon().managedVMUuid();
    158163    m_strMachineName = gpMachine->machineName();
    159 #ifdef VBOX_WS_MAC
    160     /* No window-icon on Mac OS X, because it acts as proxy icon which isn't necessary here. */
    161     setWindowIcon(QIcon());
    162 #else
    163     /* Assign window-icons: */
    164     setWindowIcon(UIIconPool::iconSetFull(":/session_info_32px.png", ":/session_info_16px.png"));
    165 #endif
    166164
    167165    /* Prepare stuff: */

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

    r98103 r100896  
    3333#include "UICommon.h"
    3434#include "UIExtraDataManager.h"
     35#include "UIIconPool.h"
    3536#include "UIMessageCenter.h"
    3637#include "UISettingsDefs.h"
    … …  
    188189void UISettingsDialogGlobal::prepare()
    189190{
    190     /* Window icon: */
    191191#ifndef VBOX_WS_MAC
    192     setWindowIcon(QIcon(":/global_settings_16px.png"));
     192    /* Assign window icon: */
     193    setWindowIcon(UIIconPool::iconSetFull(":/global_settings_32px.png", ":/global_settings_16px.png"));
    193194#endif
    194195
    … …  
    642643void UISettingsDialogMachine::prepare()
    643644{
    644     /* Window icon: */
    645645#ifndef VBOX_WS_MAC
    646     setWindowIcon(QIcon(":/vm_settings_16px.png"));
     646    /* Assign window icon: */
     647    setWindowIcon(UIIconPool::iconSetFull(":/vm_settings_32px.png", ":/vm_settings_16px.png"));
    647648#endif
    648649

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

    r98103 r100896  
    4444    , m_pButtonBox(0)
    4545{
    46     /* Set dialog icon: */
     46#ifndef VBOX_WS_MAC
     47    /* Assign window icon: */
    4748    setWindowIcon(UIIconPool::iconSetFull(":/nw_32px.png", ":/nw_16px.png"));
     49#endif
    4850
    4951    /* Create layout: */

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

    r100344 r100896  
    44234423void UISoftKeyboard::configure()
    44244424{
    4425     setWindowIcon(UIIconPool::iconSet(":/soft_keyboard_16px.png"));
     4425#ifndef VBOX_WS_MAC
     4426    /* Assign window icon: */
     4427    setWindowIcon(UIIconPool::iconSetFull(":/soft_keyboard_32px.png", ":/soft_keyboard_16px.png"));
     4428#endif
     4429
    44264430    if (m_pKeyboardWidget && m_pSettingsWidget)
    44274431    {
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