VirtualBox

Changeset 12701 in vbox


Ignore:
Timestamp:
Sep 24, 2008 4:45:35 PM (17 years ago)
Author:
vboxsync
svn:sync-xref-src-repo-rev:
37008
Message:

Fe/Qt4: Fixed bugs with icon representation.

  1. "Network" icon (16 px, disabled) which also used for "Seamless mode" icon was not added to VirtualBox.qrc file. As a result it was not displayed at all.
  2. VM Selector / Machine menu / Refresh icon (16 px) was named incorrectly. As a result it was not displayed at all.
  3. There was a bug in the code which forces the application to use scaled 32 px icons instead of 16 px available icons in VM Selector / Machine menu.
Location:
trunk/src/VBox/Frontends/VirtualBox4
Files:
6 edited

Legend:

Unmodified
Added
Removed

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

    r12130 r12701  
    145145    <file alias="sound_disabled_32px.png">images/sound_disabled_32px.png</file>
    146146    <file alias="nw_16px.png">images/nw_16px.png</file>
     147    <file alias="nw_disabled_16px.png">images/nw_disabled_16px.png</file>
    147148    <file alias="nw_32px.png">images/nw_32px.png</file>
    148149    <file alias="nw_disabled_32px.png">images/nw_disabled_32px.png</file>

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

    r12553 r12701  
    571571                          const char *aDisabled = NULL,
    572572                          const char *aActive = NULL);
    573     static QIcon iconSetEx (const char *aNormal, const char *aSmallNormal,
    574                             const char *aDisabled = NULL,
    575                             const char *aSmallDisabled = NULL,
    576                             const char *aActive = NULL,
    577                             const char *aSmallActive = NULL);
     573    static QIcon iconSetFull (const QSize &aNormalSize, const QSize &aSmallSize,
     574                              const char *aNormal, const char *aSmallNormal,
     575                              const char *aDisabled = NULL,
     576                              const char *aSmallDisabled = NULL,
     577                              const char *aActive = NULL,
     578                              const char *aSmallActive = NULL);
    578579
    579580    static QIcon standardIcon (QStyle::StandardPixmap aStandard, QWidget *aWidget = NULL);

  • trunk/src/VBox/Frontends/VirtualBox4/src/VBoxDiskImageManagerDlg.cpp

    r12695 r12701  
    312312             this, SLOT (refreshAll()));
    313313
    314     mNewAction->setIcon (VBoxGlobal::iconSetEx (
     314    mNewAction->setIcon (VBoxGlobal::iconSetFull (
     315        QSize (22, 22), QSize (16, 16),
    315316        ":/vdm_new_22px.png", ":/vdm_new_16px.png",
    316317        ":/vdm_new_disabled_22px.png", ":/vdm_new_disabled_16px.png"));
    317     mAddAction->setIcon (VBoxGlobal::iconSetEx (
     318    mAddAction->setIcon (VBoxGlobal::iconSetFull (
     319        QSize (22, 22), QSize (16, 16),
    318320        ":/vdm_add_22px.png", ":/vdm_add_16px.png",
    319321        ":/vdm_add_disabled_22px.png", ":/vdm_add_disabled_16px.png"));
    320322    // mEditAction->setIcon (VBoxGlobal::iconSet (":/guesttools_16px.png", ":/guesttools_disabled_16px.png"));
    321     mRemoveAction->setIcon (VBoxGlobal::iconSetEx (
     323    mRemoveAction->setIcon (VBoxGlobal::iconSetFull (
     324        QSize (22, 22), QSize (16, 16),
    322325        ":/vdm_remove_22px.png", ":/vdm_remove_16px.png",
    323326        ":/vdm_remove_disabled_22px.png", ":/vdm_remove_disabled_16px.png"));
    324     mReleaseAction->setIcon (VBoxGlobal::iconSetEx (
     327    mReleaseAction->setIcon (VBoxGlobal::iconSetFull (
     328        QSize (22, 22), QSize (16, 16),
    325329        ":/vdm_release_22px.png", ":/vdm_release_16px.png",
    326330        ":/vdm_release_disabled_22px.png", ":/vdm_release_disabled_16px.png"));
    327     mRefreshAction->setIcon (VBoxGlobal::iconSetEx (
     331    mRefreshAction->setIcon (VBoxGlobal::iconSetFull (
     332        QSize (22, 22), QSize (16, 16),
    328333        ":/refresh_22px.png", ":/refresh_16px.png",
    329334        ":/refresh_disabled_22px.png", ":/refresh_disabled_16px.png"));

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

    r12629 r12701  
    29292929    const QString name = "UserManual";
    29302930    const QString suffix = "pdf";
    2931 #endif 
     2931#endif
    29322932    /* Where are the docs located? */
    29332933    char szDocsPath[RTPATH_MAX];
    … …  
    29712971
    29722972/* static */
    2973 QIcon VBoxGlobal::
    2974 iconSetEx (const char *aNormal, const char *aSmallNormal,
    2975            const char *aDisabled /* = NULL */,
    2976            const char *aSmallDisabled /* = NULL */,
    2977            const char *aActive /* = NULL */,
    2978            const char *aSmallActive /* = NULL */)
     2973QIcon VBoxGlobal::iconSetFull (const QSize &aNormalSize, const QSize &aSmallSize,
     2974                               const char *aNormal, const char *aSmallNormal,
     2975                               const char *aDisabled /* = NULL */,
     2976                               const char *aSmallDisabled /* = NULL */,
     2977                               const char *aActive /* = NULL */,
     2978                               const char *aSmallActive /* = NULL */)
    29792979{
    29802980    QIcon iconSet;
    29812981
    2982     iconSet.addFile (aNormal, QSize(), QIcon::Normal);
    2983     iconSet.addFile (aSmallNormal, QSize(), QIcon::Normal);
     2982    iconSet.addFile (aNormal, aNormalSize, QIcon::Normal);
     2983    iconSet.addFile (aSmallNormal, aSmallSize, QIcon::Normal);
    29842984    if (aSmallDisabled != NULL)
    29852985    {
    2986         iconSet.addFile (aDisabled, QSize(), QIcon::Disabled);
    2987         iconSet.addFile (aSmallDisabled, QSize(), QIcon::Disabled);
     2986        iconSet.addFile (aDisabled, aNormalSize, QIcon::Disabled);
     2987        iconSet.addFile (aSmallDisabled, aSmallSize, QIcon::Disabled);
    29882988    }
    29892989    if (aSmallActive != NULL)
    29902990    {
    2991         iconSet.addFile (aActive, QSize(), QIcon::Active);
    2992         iconSet.addFile (aSmallActive, QSize(), QIcon::Active);
     2991        iconSet.addFile (aActive, aNormalSize, QIcon::Active);
     2992        iconSet.addFile (aSmallActive, aSmallSize, QIcon::Active);
    29932993    }
    29942994

  • trunk/src/VBox/Frontends/VirtualBox4/src/VBoxSelectorWnd.cpp

    r12695 r12701  
    408408
    409409    vmNewAction = new QAction (this);
    410     vmNewAction->setIcon (VBoxGlobal::iconSetEx (
     410    vmNewAction->setIcon (VBoxGlobal::iconSetFull (
     411        QSize (32, 32), QSize (16, 16),
    411412        ":/vm_new_32px.png", ":/new_16px.png"));
    412413    vmConfigAction = new QAction (this);
    413     vmConfigAction->setIcon (VBoxGlobal::iconSetEx (
     414    vmConfigAction->setIcon (VBoxGlobal::iconSetFull (
     415        QSize (32, 32), QSize (16, 16),
    414416        ":/vm_settings_32px.png", ":/settings_16px.png",
    415417        ":/vm_settings_disabled_32px.png", ":/settings_dis_16px.png"));
    416418    vmDeleteAction = new QAction (this);
    417     vmDeleteAction->setIcon (VBoxGlobal::iconSetEx (
     419    vmDeleteAction->setIcon (VBoxGlobal::iconSetFull (
     420        QSize (32, 32), QSize (16, 16),
    418421        ":/vm_delete_32px.png", ":/delete_16px.png",
    419422        ":/vm_delete_disabled_32px.png", ":/delete_dis_16px.png"));
    420423    vmStartAction = new QAction (this);
    421     vmStartAction->setIcon (VBoxGlobal::iconSetEx (
     424    vmStartAction->setIcon (VBoxGlobal::iconSetFull (
     425        QSize (32, 32), QSize (16, 16),
    422426        ":/vm_start_32px.png", ":/start_16px.png",
    423427        ":/vm_start_disabled_32px.png", ":/start_dis_16px.png"));
    424428    vmDiscardAction = new QAction (this);
    425     vmDiscardAction->setIcon (VBoxGlobal::iconSetEx (
     429    vmDiscardAction->setIcon (VBoxGlobal::iconSetFull (
     430        QSize (32, 32), QSize (16, 16),
    426431        ":/vm_discard_32px.png", ":/discard_16px.png",
    427432        ":/vm_discard_disabled_32px.png", ":/discard_dis_16px.png"));
    428433    vmPauseAction = new QAction (this);
    429434    vmPauseAction->setCheckable (true);
    430     vmPauseAction->setIcon (VBoxGlobal::iconSetEx (
    431         ":/vm_pause_32px.png", "pause_16px.png",
    432         ":/vm_pause_disabled_32px.png", "pause_disabled_16px.png"));
     435    vmPauseAction->setIcon (VBoxGlobal::iconSetFull (
     436        QSize (32, 32), QSize (16, 16),
     437        ":/vm_pause_32px.png", ":/pause_16px.png",
     438        ":/vm_pause_disabled_32px.png", ":/pause_disabled_16px.png"));
    433439    vmRefreshAction = new QAction (this);
    434     vmRefreshAction->setIcon (VBoxGlobal::iconSetEx (
    435         ":/vm_refresh_32px.png", "refresh_16px.png",
    436         ":/vm_refresh_disabled_32px.png", "refresh_disabled_16px.png"));
     440    vmRefreshAction->setIcon (VBoxGlobal::iconSetFull (
     441        QSize (32, 32), QSize (16, 16),
     442        ":/refresh_32px.png", ":/refresh_16px.png",
     443        ":/refresh_disabled_32px.png", ":/refresh_disabled_16px.png"));
    437444    vmShowLogsAction = new QAction (this);
    438     vmShowLogsAction->setIcon (VBoxGlobal::iconSetEx (
    439         ":/vm_show_logs_32px.png", "show_logs_16px.png",
    440         ":/vm_show_logs_disabled_32px.png", "show_logs_disabled_16px.png"));
     445    vmShowLogsAction->setIcon (VBoxGlobal::iconSetFull (
     446        QSize (32, 32), QSize (16, 16),
     447        ":/vm_show_logs_32px.png", ":/show_logs_16px.png",
     448        ":/vm_show_logs_disabled_32px.png", ":/show_logs_disabled_16px.png"));
    441449
    442450    mHelpActions.setup (this);

  • trunk/src/VBox/Frontends/VirtualBox4/src/VBoxSnapshotsWgt.cpp

    r11782 r12701  
    280280
    281281    /* Setup actions */
    282     mDiscardSnapshotAction->setIcon (VBoxGlobal::iconSetEx (
     282    mDiscardSnapshotAction->setIcon (VBoxGlobal::iconSetFull (
     283        QSize (22, 22), QSize (16, 16),
    283284        ":/discard_snapshot_22px.png", ":/discard_snapshot_16px.png",
    284285        ":/discard_snapshot_dis_22px.png", ":/discard_snapshot_dis_16px.png"));
    285     mTakeSnapshotAction->setIcon (VBoxGlobal::iconSetEx (
     286    mTakeSnapshotAction->setIcon (VBoxGlobal::iconSetFull (
     287        QSize (22, 22), QSize (16, 16),
    286288        ":/take_snapshot_22px.png", ":/take_snapshot_16px.png",
    287289        ":/take_snapshot_dis_22px.png", ":/take_snapshot_dis_16px.png"));
    288     mRevertToCurSnapAction->setIcon (VBoxGlobal::iconSetEx (
     290    mRevertToCurSnapAction->setIcon (VBoxGlobal::iconSetFull (
     291        QSize (22, 22), QSize (16, 16),
    289292        ":/discard_cur_state_22px.png", ":/discard_cur_state_16px.png",
    290293        ":/discard_cur_state_dis_22px.png", ":/discard_cur_state_dis_16px.png"));
    291     mDiscardCurSnapAndStateAction->setIcon (VBoxGlobal::iconSetEx (
     294    mDiscardCurSnapAndStateAction->setIcon (VBoxGlobal::iconSetFull (
     295        QSize (22, 22), QSize (16, 16),
    292296        ":/discard_cur_state_snapshot_22px.png", ":/discard_cur_state_snapshot_16px.png",
    293297        ":/discard_cur_state_snapshot_dis_22px.png", ":/discard_cur_state_snapshot_dis_16px.png"));
    294     mShowSnapshotDetailsAction->setIcon (VBoxGlobal::iconSetEx (
     298    mShowSnapshotDetailsAction->setIcon (VBoxGlobal::iconSetFull (
     299        QSize (22, 22), QSize (16, 16),
    295300        ":/show_snapshot_details_22px.png", ":/show_snapshot_details_16px.png",
    296301        ":/show_snapshot_details_dis_22px.png", ":/show_snapshot_details_dis_16px.png"));
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