VirtualBox

Changeset 16256 in vbox


Ignore:
Timestamp:
Jan 27, 2009 10:23:56 AM (16 years ago)
Author:
vboxsync
Message:

FE/Qt4: Add OFF icons for toggle actions to make them more distinguishable from ON icons (#3455).

Location:
trunk/src/VBox/Frontends/VirtualBox
Files:
14 added
5 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/VBox/Frontends/VirtualBox/Makefile.kmk

    r16174 r16256  
    149149endif
    150150
    151 VirtualBox_DEFS           = VBOX_GUI_SEPARATE_VM_PROCESS
     151VirtualBox_DEFS           = VBOX_GUI_SEPARATE_VM_PROCESS VBOX_GUI_WITH_SYSTRAY
    152152VirtualBox_DEFS.debug     = VBOX_CHECK_STATE # QT_FATAL_ASSERT
    153153VirtualBox_DEFS.darwin    = VBOX_GUI_USE_QUARTZ2D VBOX_GUI_USE_QIMAGE VBOX_WITHOUT_QHTTP

  • trunk/src/VBox/Frontends/VirtualBox/VirtualBox.qrc

    r15969 r16256  
    116116    <file alias="mouse_seamless_16px.png">images/mouse_seamless_16px.png</file>
    117117    <file alias="mouse_can_seamless_16px.png">images/mouse_can_seamless_16px.png</file>
     118    <file alias="mouse_can_seamless_transparent_16px.png">images/mouse_can_seamless_transparent_16px.png</file>
    118119    <file alias="mouse_can_seamless_disabled_16px.png">images/mouse_can_seamless_disabled_16px.png</file>
     120    <file alias="mouse_can_seamless_disabled_transparent_16px.png">images/mouse_can_seamless_disabled_transparent_16px.png</file>
    119121    <file alias="mouse_can_seamless_uncaptured_16px.png">images/mouse_can_seamless_uncaptured_16px.png</file>
    120122    <file alias="hostkey_16px.png">images/hostkey_16px.png</file>
    … …  
    140142    <file alias="reset_disabled_16px.png">images/reset_disabled_16px.png</file>
    141143    <file alias="pause_16px.png">images/pause_16px.png</file>
     144    <file alias="pause_transparent_16px.png">images/pause_transparent_16px.png</file>
    142145    <file alias="pause_disabled_16px.png">images/pause_disabled_16px.png</file>
     146    <file alias="pause_disabled_transparent_16px.png">images/pause_disabled_transparent_16px.png</file>
    143147    <file alias="fullscreen_16px.png">images/fullscreen_16px.png</file>
     148    <file alias="fullscreen_transparent_16px.png.png">images/fullscreen_transparent_16px.png</file>
    144149    <file alias="fullscreen_disabled_16px.png">images/fullscreen_disabled_16px.png</file>
     150    <file alias="fullscreen_disabled_transparent_16px.png">images/fullscreen_disabled_transparent_16px.png</file>
     151    <file alias="seamless_16px.png">images/seamless_16px.png</file>
     152    <file alias="seamless_transparent_16px.png">images/seamless_transparent_16px.png</file>
     153    <file alias="seamless_disabled_16px.png">images/seamless_disabled_16px.png</file>
     154    <file alias="seamless_disabled_transparent_16px.png">images/seamless_disabled_transparent_16px.png</file>
    145155    <file alias="acpi_16px.png">images/acpi_16px.png</file>
    146156    <file alias="acpi_disabled_16px.png">images/acpi_disabled_16px.png</file>
    … …  
    148158    <file alias="adjust_win_size_disabled_16px.png">images/adjust_win_size_disabled_16px.png</file>
    149159    <file alias="auto_resize_on_16px.png">images/auto_resize_on_16px.png</file>
     160    <file alias="auto_resize_on_transparent_16px.png">images/auto_resize_on_transparent_16px.png</file>
    150161    <file alias="auto_resize_on_disabled_16px.png">images/auto_resize_on_disabled_16px.png</file>
     162    <file alias="auto_resize_on_disabled_transparent_16px.png">images/auto_resize_on_disabled_transparent_16px.png</file>
    151163    <file alias="auto_resize_off_16px.png">images/auto_resize_off_16px.png</file>
    152164    <file alias="auto_resize_off_disabled_16px.png">images/auto_resize_off_disabled_16px.png</file>
    … …  
    282294    <file alias="global_settings_disabled_16px.png">images/global_settings_disabled_16px.png</file>
    283295    <file alias="vrdp_16px.png">images/vrdp_16px.png</file>
     296    <file alias="vrdp_transparent_16px.png">images/vrdp_transparent_16px.png</file>
    284297    <file alias="vrdp_disabled_16px.png">images/vrdp_disabled_16px.png</file>
     298    <file alias="vrdp_disabled_transparent_16px.png">images/vrdp_disabled_transparent_16px.png</file>
    285299    <file alias="vrdp_32px.png">images/vrdp_32px.png</file>
    286300    <file alias="vrdp_disabled_32px.png">images/vrdp_disabled_32px.png</file>

  • trunk/src/VBox/Frontends/VirtualBox/include/VBoxGlobal.h

    r16176 r16256  
    889889                          const char *aDisabled = NULL,
    890890                          const char *aActive = NULL);
     891    static QIcon iconSetOnOff (const char *aNormal, const char *aNormalOff,
     892                               const char *aDisabled = NULL,
     893                               const char *aDisabledOff = NULL,
     894                               const char *aActive = NULL,
     895                               const char *aActiveOff = NULL);
    891896    static QIcon iconSetFull (const QSize &aNormalSize, const QSize &aSmallSize,
    892897                              const char *aNormal, const char *aSmallNormal,

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

    r16176 r16256  
    273273    mVmFullscreenAction = new QAction (this);
    274274    mVmFullscreenAction->setIcon (
    275         VBoxGlobal::iconSet (":/fullscreen_16px.png", ":/fullscreen_disabled_16px.png"));
     275        VBoxGlobal::iconSetOnOff (
     276            ":/fullscreen_16px.png", ":/fullscreen_transparent_16px.png",
     277            ":/fullscreen_disabled_16px.png", ":/fullscreen_disabled_transparent_16px.png"));
    276278    mVmFullscreenAction->setCheckable (true);
    277279
    278280    mVmSeamlessAction = new QAction (this);
    279281    mVmSeamlessAction->setIcon (
    280         VBoxGlobal::iconSet (":/nw_16px.png", ":/nw_disabled_16px.png"));
     282        VBoxGlobal::iconSetOnOff (
     283            ":/seamless_16px.png", ":/seamless_transparent_16px.png",
     284            ":/seamless_disabled_16px.png", ":/seamless_disabled_transparent_16px.png"));
    281285    mVmSeamlessAction->setCheckable (true);
    282286
    283287    mVmAutoresizeGuestAction = new QAction (mRunningActions);
    284288    mVmAutoresizeGuestAction->setIcon (
    285         VBoxGlobal::iconSet (":/auto_resize_on_16px.png", ":/auto_resize_on_disabled_16px.png"));
     289        VBoxGlobal::iconSetOnOff (
     290            ":/auto_resize_on_16px.png", ":/auto_resize_on_transparent_16px.png",
     291            ":/auto_resize_on_disabled_16px.png", ":/auto_resize_on_disabled_transparent_16px.png"));
    286292    mVmAutoresizeGuestAction->setCheckable (true);
    287293    mVmAutoresizeGuestAction->setEnabled (false);
    … …  
    307313
    308314    mVmPauseAction = new QAction (this);
    309     mVmPauseAction->setIcon (VBoxGlobal::iconSet (":/pause_16px.png"));
     315    mVmPauseAction->setIcon (
     316        VBoxGlobal::iconSetOnOff (
     317            ":/pause_16px.png", ":/pause_transparent_16px.png",
     318            ":/pause_disabled_16px.png", ":/pause_disabled_transparent_16px.png"));
    310319    mVmPauseAction->setCheckable (true);
    311320
    … …  
    327336
    328337    mVmDisableMouseIntegrAction = new QAction (this);
    329     mVmDisableMouseIntegrAction->setIcon (VBoxGlobal::iconSet (
    330         ":/mouse_can_seamless_16px.png", ":/mouse_can_seamless_disabled_16px.png"));
     338    mVmDisableMouseIntegrAction->setIcon (
     339        VBoxGlobal::iconSetOnOff (
     340            ":/mouse_can_seamless_16px.png", ":/mouse_can_seamless_transparent_16px.png",
     341            ":/mouse_can_seamless_disabled_16px.png", ":/mouse_can_seamless_disabled_transparent_16px.png"));
    331342    mVmDisableMouseIntegrAction->setCheckable (true);
    332343
    … …  
    350361
    351362    mDevicesSwitchVrdpAction = new QAction (mRunningOrPausedActions);
    352     mDevicesSwitchVrdpAction->setIcon (VBoxGlobal::iconSet (":/vrdp_16px.png",
    353                                                               ":/vrdp_disabled_16px.png"));
     363    mDevicesSwitchVrdpAction->setIcon (
     364        VBoxGlobal::iconSetOnOff (
     365            ":/vrdp_16px.png", ":/vrdp_transparent_16px.png",
     366            ":/vrdp_disabled_16px.png", ":/vrdp_disabled_transparent_16px.png"));
    354367    mDevicesSwitchVrdpAction->setCheckable (true);
    355368
    … …  
    399412    mVMMenu->addAction (mVmFullscreenAction);
    400413    mVMMenu->addAction (mVmSeamlessAction);
     414    mVMMenu->addAction (mVmAutoresizeGuestAction);
    401415    mVMMenu->addAction (mVmAdjustWindowAction);
    402     mVMMenu->addAction (mVmAutoresizeGuestAction);
    403416    mVMMenu->addSeparator();
    404417    mVMMenu->addAction (mVmDisableMouseIntegrAction);

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

    r16179 r16256  
    37373737    QIcon iconSet;
    37383738
     3739    Assert (aNormal != NULL);
    37393740    iconSet.addFile (aNormal, QSize(),
    37403741                     QIcon::Normal);
    … …  
    37493750
    37503751/* static */
     3752QIcon VBoxGlobal::iconSetOnOff (const char *aNormal, const char *aNormalOff,
     3753                                const char *aDisabled /* = NULL */,
     3754                                const char *aDisabledOff /* = NULL */,
     3755                                const char *aActive /* = NULL */,
     3756                                const char *aActiveOff /* = NULL */)
     3757{
     3758    QIcon iconSet;
     3759
     3760    Assert (aNormal != NULL);
     3761    iconSet.addFile (aNormal, QSize(), QIcon::Normal, QIcon::On);
     3762    if (aNormalOff != NULL)
     3763        iconSet.addFile (aNormalOff, QSize(), QIcon::Normal, QIcon::Off);
     3764
     3765    if (aDisabled != NULL)
     3766        iconSet.addFile (aDisabled, QSize(), QIcon::Disabled, QIcon::On);
     3767    if (aDisabledOff != NULL)
     3768        iconSet.addFile (aDisabledOff, QSize(), QIcon::Disabled, QIcon::Off);
     3769
     3770    if (aActive != NULL)
     3771        iconSet.addFile (aActive, QSize(), QIcon::Active, QIcon::On);
     3772    if (aActiveOff != NULL)
     3773        iconSet.addFile (aActive, QSize(), QIcon::Active, QIcon::Off);
     3774
     3775    return iconSet;
     3776}
     3777
     3778/* static */
    37513779QIcon VBoxGlobal::iconSetFull (const QSize &aNormalSize, const QSize &aSmallSize,
    37523780                               const char *aNormal, const char *aSmallNormal,
    … …  
    37583786    QIcon iconSet;
    37593787
     3788    Assert (aNormal != NULL);
     3789    Assert (aSmallNormal != NULL);
    37603790    iconSet.addFile (aNormal, aNormalSize, QIcon::Normal);
    37613791    iconSet.addFile (aSmallNormal, aSmallSize, QIcon::Normal);
     3792
    37623793    if (aSmallDisabled != NULL)
    37633794    {
    … …  
    37653796        iconSet.addFile (aSmallDisabled, aSmallSize, QIcon::Disabled);
    37663797    }
     3798
    37673799    if (aSmallActive != NULL)
    37683800    {
Note: See TracChangeset for help on using the changeset viewer.

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