VirtualBox

Changeset 12130 in vbox


Ignore:
Timestamp:
Sep 5, 2008 1:09:38 PM (17 years ago)
Author:
vboxsync
svn:sync-xref-src-repo-rev:
36083
Message:

FE/Qt4: new icons

Location:
trunk/src/VBox/Frontends/VirtualBox4
Files:
14 added
208 edited
2 moved

Legend:

Unmodified
Added
Removed

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

    r11120 r12130  
    1111    <file alias="vm_pause_32px.png">images/vm_pause_32px.png</file>
    1212    <file alias="vm_pause_disabled_32px.png">images/vm_pause_disabled_32px.png</file>
    13     <file alias="vm_refresh_32px.png">images/vm_refresh_32px.png</file>
    14     <file alias="vm_refresh_disabled_32px.png">images/vm_refresh_disabled_32px.png</file>
    1513    <file alias="vm_settings_32px.png">images/vm_settings_32px.png</file>
    1614    <file alias="vm_settings_disabled_32px.png">images/vm_settings_disabled_32px.png</file>
    … …  
    6967    <file alias="vmw_new_user.png">images/vmw_new_user.png</file>
    7068    <file alias="fd_16px.png">images/fd_16px.png</file>
     69    <file alias="fd_disabled_16px.png">images/fd_disabled_16px.png</file>
    7170    <file alias="fd_32px.png">images/fd_32px.png</file>
     71    <file alias="fd_disabled_32px.png">images/fd_disabled_32px.png</file>
    7272    <file alias="fd_read_16px.png">images/fd_read_16px.png</file>
    7373    <file alias="fd_write_16px.png">images/fd_write_16px.png</file>
    74     <file alias="fd_disabled_16px.png">images/fd_disabled_16px.png</file>
    7574    <file alias="cd_16px.png">images/cd_16px.png</file>
     75    <file alias="cd_disabled_16px.png">images/cd_disabled_16px.png</file>
    7676    <file alias="cd_32px.png">images/cd_32px.png</file>
     77    <file alias="cd_disabled_32px.png">images/cd_disabled_32px.png</file>
    7778    <file alias="cd_read_16px.png">images/cd_read_16px.png</file>
    7879    <file alias="cd_write_16px.png">images/cd_write_16px.png</file>
    79     <file alias="cd_disabled_16px.png">images/cd_disabled_16px.png</file>
    8080    <file alias="cd_unmount_16px.png">images/cd_unmount_16px.png</file>
    8181    <file alias="cd_unmount_dis_16px.png">images/cd_unmount_dis_16px.png</file>
    8282    <file alias="hd_16px.png">images/hd_16px.png</file>
     83    <file alias="hd_disabled_16px.png">images/hd_disabled_16px.png</file>
    8384    <file alias="hd_32px.png">images/hd_32px.png</file>
     85    <file alias="hd_disabled_32px.png">images/hd_disabled_32px.png</file>
    8486    <file alias="hd_read_16px.png">images/hd_read_16px.png</file>
    8587    <file alias="hd_write_16px.png">images/hd_write_16px.png</file>
    86     <file alias="hd_disabled_16px.png">images/hd_disabled_16px.png</file>
    8788    <file alias="mouse_16px.png">images/mouse_16px.png</file>
    8889    <file alias="mouse_disabled_16px.png">images/mouse_disabled_16px.png</file>
    … …  
    9293    <file alias="mouse_can_seamless_uncaptured_16px.png">images/mouse_can_seamless_uncaptured_16px.png</file>
    9394    <file alias="hostkey_16px.png">images/hostkey_16px.png</file>
     95    <file alias="hostkey_disabled_16px.png">images/hostkey_disabled_16px.png</file>
    9496    <file alias="hostkey_32px.png">images/hostkey_32px.png</file>
     97    <file alias="hostkey_disabled_32px.png">images/hostkey_disabled_32px.png</file>
    9598    <file alias="hostkey_pressed_16px.png">images/hostkey_pressed_16px.png</file>
    9699    <file alias="hostkey_captured_16px.png">images/hostkey_captured_16px.png</file>
    97100    <file alias="hostkey_captured_pressed_16px.png">images/hostkey_captured_pressed_16px.png</file>
    98     <file alias="hostkey_disabled_16px.png">images/hostkey_disabled_16px.png</file>
    99101    <file alias="machine_16px.png">images/machine_16px.png</file>
    100102    <file alias="machine_32px.png">images/machine_32px.png</file>
     103    <file alias="machine_disabled_32px.png">images/machine_disabled_32px.png</file>
    101104    <file alias="help_16px.png">images/help_16px.png</file>
    102105    <file alias="help_button_normal_mac_22px.png">images/help_button_normal_mac_22px.png</file>
    … …  
    104107    <file alias="site_16px.png">images/site_16px.png</file>
    105108    <file alias="site_32px.png">images/site_32px.png</file>
     109    <file alias="site_disabled_32px.png">images/site_disabled_32px.png</file>
    106110    <file alias="register_16px.png">images/register_16px.png</file>
    107111    <file alias="register_disabled_16px.png">images/register_disabled_16px.png</file>
    … …  
    139143    <file alias="sound_16px.png">images/sound_16px.png</file>
    140144    <file alias="sound_32px.png">images/sound_32px.png</file>
     145    <file alias="sound_disabled_32px.png">images/sound_disabled_32px.png</file>
    141146    <file alias="nw_16px.png">images/nw_16px.png</file>
    142147    <file alias="nw_32px.png">images/nw_32px.png</file>
     148    <file alias="nw_disabled_32px.png">images/nw_disabled_32px.png</file>
    143149    <file alias="nw_read_16px.png">images/nw_read_16px.png</file>
    144150    <file alias="nw_write_16px.png">images/nw_write_16px.png</file>
    145     <file alias="nw_disabled_16px.png">images/nw_disabled_16px.png</file>
    146151    <file alias="usb_16px.png">images/usb_16px.png</file>
    147     <file alias="usb_32px.png">images/usb_16px.png</file>
     152    <file alias="usb_disabled_16px.png">images/usb_disabled_16px.png</file>
     153    <file alias="usb_32px.png">images/usb_32px.png</file>
     154    <file alias="usb_disabled_32px.png">images/usb_disabled_32px.png</file>
    148155    <file alias="usb_new_16px.png">images/usb_new_16px.png</file>
    149156    <file alias="usb_new_disabled_16px.png">images/usb_new_disabled_16px.png</file>
    150     <file alias="usb_disabled_16px.png">images/usb_disabled_16px.png</file>
    151157    <file alias="usb_read_16px.png">images/usb_read_16px.png</file>
    152158    <file alias="usb_write_16px.png">images/usb_write_16px.png</file>
    … …  
    164170    <file alias="usb_unavailable_disabled_16px.png">images/usb_unavailable_disabled_16px.png</file>
    165171    <file alias="parallel_port_16px.png">images/parallel_port_16px.png</file>
     172    <file alias="parallel_port_disabled_16px.png">images/parallel_port_disabled_16px.png</file>
    166173    <file alias="parallel_port_32px.png">images/parallel_port_32px.png</file>
    167     <file alias="parallel_port_disabled_16px.png">images/parallel_port_disabled_16px.png</file>
     174    <file alias="parallel_port_disabled_32px.png">images/parallel_port_disabled_32px.png</file>
    168175    <file alias="parallel_port_read_16px.png">images/parallel_port_read_16px.png</file>
    169176    <file alias="parallel_port_write_16px.png">images/parallel_port_write_16px.png</file>
    170177    <file alias="serial_port_16px.png">images/serial_port_16px.png</file>
     178    <file alias="serial_port_disabled_16px.png">images/serial_port_disabled_16px.png</file>
    171179    <file alias="serial_port_32px.png">images/serial_port_32px.png</file>
    172     <file alias="serial_port_disabled_16px.png">images/serial_port_disabled_16px.png</file>
     180    <file alias="serial_port_disabled_32px.png">images/serial_port_disabled_32px.png</file>
    173181    <file alias="serial_port_read_16px.png">images/serial_port_read_16px.png</file>
    174182    <file alias="serial_port_write_16px.png">images/serial_port_write_16px.png</file>
    … …  
    210218    <file alias="revome_shared_folder_disabled_16px.png">images/revome_shared_folder_disabled_16px.png</file>
    211219    <file alias="shared_folder_16px.png">images/shared_folder_16px.png</file>
     220    <file alias="shared_folder_disabled_16px.png">images/shared_folder_disabled_16px.png</file>
    212221    <file alias="shared_folder_32px.png">images/shared_folder_32px.png</file>
    213     <file alias="shared_folder_disabled_16px.png">images/shared_folder_disabled_16px.png</file>
     222    <file alias="shared_folder_disabled_32px.png">images/shared_folder_disabled_32px.png</file>
    214223    <file alias="shared_folder_read_16px.png">images/shared_folder_read_16px.png</file>
    215224    <file alias="shared_folder_write_16px.png">images/shared_folder_write_16px.png</file>
    … …  
    224233    <file alias="refresh_22px.png">images/refresh_22px.png</file>
    225234    <file alias="refresh_disabled_22px.png">images/refresh_disabled_22px.png</file>
     235    <file alias="refresh_32px.png">images/refresh_32px.png</file>
     236    <file alias="refresh_disabled_32px.png">images/refresh_disabled_32px.png</file>
    226237    <file alias="show_logs_16px.png">images/show_logs_16px.png</file>
     238    <file alias="show_logs_disabled_16px.png">images/show_logs_disabled_16px.png</file>
    227239    <file alias="show_logs_22px.png">images/show_logs_22px.png</file>
    228     <file alias="show_logs_disabled_16px.png">images/show_logs_disabled_16px.png</file>
    229240    <file alias="show_logs_disabled_22px.png">images/show_logs_disabled_22px.png</file>
    230241    <file alias="description_16px.png">images/description_16px.png</file>
    … …  
    235246    <file alias="global_settings_disabled_16px.png">images/global_settings_disabled_16px.png</file>
    236247    <file alias="vrdp_16px.png">images/vrdp_16px.png</file>
     248    <file alias="vrdp_disabled_16px.png">images/vrdp_disabled_16px.png</file>
    237249    <file alias="vrdp_32px.png">images/vrdp_32px.png</file>
    238     <file alias="vrdp_disabled_16px.png">images/vrdp_disabled_16px.png</file>
     250    <file alias="vrdp_disabled_32px.png">images/vrdp_disabled_32px.png</file>
    239251    <file alias="vdm_add_16px.png">images/vdm_add_16px.png</file>
    240252    <file alias="vdm_add_disabled_16px.png">images/vdm_add_disabled_16px.png</file>

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

    r10769 r12130  
    115115private:
    116116
    117     void addItem (const QString &aBigIcon, const QString &aSmallIcon, int aId, const QString &aLink, VBoxSettingsPage* aPrefPage = NULL, int aParentId = -1);
     117    void addItem (const QString &aBigIcon, const QString &aBigIconDisabled, const QString &aSmallIcon, const QString &aSmallIconDisabled, int aId, const QString &aLink, VBoxSettingsPage* aPrefPage = NULL, int aParentId = -1);
    118118    void updateAvailability();
    119119    VBoxSettingsPage* attachValidator (VBoxSettingsPage *aPage);

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

    r10769 r12130  
    5151    virtual QWidget *widget() const = 0;
    5252
    53     virtual QWidget *addItem (const QString &aBigIcon, const QString &aSmallIcon, int aId, const QString &aLink, VBoxSettingsPage* aPage = NULL, int aParentId = -1) = 0;
     53    virtual QWidget *addItem (const QString &aBigIcon, const QString &aBigIconDisabled, const QString &aSmallIcon, const QString &aSmallIconDisabled, int aId, const QString &aLink, VBoxSettingsPage* aPage = NULL, int aParentId = -1) = 0;
    5454
    5555    virtual void setItemText (int aId, const QString &aText);
    … …  
    100100    virtual QWidget *widget() const;
    101101
    102     virtual QWidget *addItem (const QString &aBigIcon, const QString &aSmallIcon, int aId, const QString &aLink, VBoxSettingsPage* aPage = NULL, int aParentId = -1);
     102    virtual QWidget *addItem (const QString &aBigIcon, const QString &aBigIconDisabled, const QString &aSmallIcon, const QString &aSmallIconDisabled, int aId, const QString &aLink, VBoxSettingsPage* aPage = NULL, int aParentId = -1);
    103103    virtual void setItemText (int aId, const QString &aText);
    104104    virtual QString itemText (int aId) const;
    … …  
    140140    virtual QWidget *widget() const;
    141141
    142     virtual QWidget *addItem (const QString &aBigIcon, const QString &aSmallIcon, int aId, const QString &aLink, VBoxSettingsPage* aPage = NULL, int aParentId = -1);
     142    virtual QWidget *addItem (const QString &aBigIcon, const QString &aBigIconDisabled, const QString &aSmallIcon, const QString &aSmallIconDisabled, int aId, const QString &aLink, VBoxSettingsPage* aPage = NULL, int aParentId = -1);
    143143    virtual void setItemText (int aId, const QString &aText);
    144144    virtual QString itemText (int aId) const;

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

    r11003 r12130  
    6262    /* General page */
    6363    prefPage = new VBoxGLSettingsGeneral();
    64     page = mSelector->addItem (":/machine_32px.png", ":/machine_16px.png",
     64    page = mSelector->addItem (":/machine_32px.png", ":/machine_disabled_32px.png", ":/machine_16px.png", "",
    6565                               GeneralId, "#general",
    6666                               prefPage);
    … …  
    7171    /* Input page */
    7272    prefPage = new VBoxGLSettingsInput();
    73     page = mSelector->addItem (":/hostkey_32px.png", ":/hostkey_16px.png",
     73    page = mSelector->addItem (":/hostkey_32px.png", ":/hostkey_disabled_32px.png", ":/hostkey_16px.png", ":/hostkey_disabled_16px.png",
    7474                               InputId, "#input",
    7575                               prefPage);
    … …  
    8080    /* Update page */
    8181    prefPage = new VBoxGLSettingsUpdate();
    82     page = mSelector->addItem (":/vm_refresh_32px.png", ":/refresh_16px.png",
     82    page = mSelector->addItem (":/refresh_32px.png", ":/refresh_disabled_32px.png", ":/refresh_16px.png", ":/refresh_disabled_16px.png",
    8383                               UpdateId, "#update",
    8484                               prefPage);
    … …  
    8989    /* Language page */
    9090    prefPage = new VBoxGLSettingsLanguage();
    91     page = mSelector->addItem (":/site_32px.png", ":/site_16px.png",
     91    page = mSelector->addItem (":/site_32px.png", ":/site_disabled_32px.png", ":/site_16px.png", "",
    9292                               LanguageId, "#language",
    9393                               prefPage);
    … …  
    9999    /* USB page */
    100100    prefPage = VBoxVMSettingsUSB (VBoxVMSettingsUSB::HostType);
    101     page = mSelector->addItem (":/usb_32px.png", ":/usb_16px.png",
     101    page = mSelector->addItem (":/usb_32px.png", ":/usb_disabled_32px.png", ":/usb_16px.png", ":/usb_disabled_16px.png"
    102102                               USBId, "#usb",
    103103                               prefPage);
    … …  
    224224    prefPage = new VBoxVMSettingsGeneral();
    225225    connect (prefPage, SIGNAL (tableChanged()), this, SLOT (resetFirstRunFlag()));
    226     addItem (":/machine_32px.png", ":/machine_16px.png",
     226    addItem (":/machine_32px.png", ":/machine_disabled_32px.png", ":/machine_16px.png", "",
    227227             GeneralId, "#general",
    228228             prefPage);
    229229
    230230    /* Storage page */
    231     addItem (":/hd_32px.png", ":/hd_16px.png",
     231    addItem (":/hd_32px.png", ":/hd_disabled_32px.png", ":/hd_16px.png", ":/hd_disabled_16px.png",
    232232             StorageId, "#storage");
    233233
    … …  
    235235    prefPage = new VBoxVMSettingsHD();
    236236    connect (prefPage, SIGNAL (hdChanged()), this, SLOT (resetFirstRunFlag()));
    237     addItem (":/hd_32px.png", ":/hd_16px.png",
     237    addItem (":/hd_32px.png", ":/hd_disabled_32px.png", ":/hd_16px.png", ":/hd_disabled_16px.png",
    238238             HDId, "#hdds",
    239239             prefPage, StorageId);
    … …  
    242242    prefPage = new VBoxVMSettingsCD();
    243243    connect (prefPage, SIGNAL (cdChanged()), this, SLOT (resetFirstRunFlag()));
    244     addItem (":/cd_32px.png", ":/cd_16px.png",
     244    addItem (":/cd_32px.png", ":/cd_disabled_32px.png", ":/cd_16px.png", ":/cd_disabled_16px.png",
    245245             CDId, "#dvd",
    246246             prefPage, StorageId);
    … …  
    249249    prefPage = new VBoxVMSettingsFD();
    250250    connect (prefPage, SIGNAL (fdChanged()), this, SLOT (resetFirstRunFlag()));
    251     addItem (":/fd_32px.png", ":/fd_16px.png",
     251    addItem (":/fd_32px.png", ":/fd_disabled_32px.png", ":/fd_16px.png", ":/fd_disabled_16px.png",
    252252             FDId, "#floppy",
    253253             prefPage, StorageId);
    … …  
    255255    /* Audio page */
    256256    prefPage = new VBoxVMSettingsAudio();
    257     addItem (":/sound_32px.png", ":/sound_16px.png",
     257    addItem (":/sound_32px.png", ":/sound_disabled_32px.png", ":/sound_16px.png", "",
    258258             AudioId, "#audio",
    259259             prefPage);
    … …  
    261261    /* Network page */
    262262    prefPage = new VBoxVMSettingsNetworkPage();
    263     addItem (":/nw_32px.png", ":/nw_16px.png",
     263    addItem (":/nw_32px.png", ":/nw_disabled_32px.png", ":/nw_16px.png", ":/nw_disabled_16px.png",
    264264             NetworkId, "#network",
    265265             prefPage);
    266266
    267267    /* Ports page */
    268     addItem (":/serial_port_32px.png", ":/serial_port_16px.png",
     268    addItem (":/serial_port_32px.png", ":/serial_port_disabled_32px.png", ":/serial_port_16px.png", ":/serial_port_disabled_16px.png",
    269269             PortsId, "#ports");
    270270
    271271    /* USB page */
    272272    prefPage = new VBoxVMSettingsUSB (VBoxVMSettingsUSB::MachineType);
    273     addItem (":/usb_32px.png", ":/usb_16px.png",
     273    addItem (":/usb_32px.png", ":/usb_disabled_32px.png", ":/usb_16px.png", ":/usb_disabled_16px.png",
    274274             USBId, "#usb",
    275275             prefPage, PortsId);
    … …  
    277277    /* Serial page */
    278278    prefPage = new VBoxVMSettingsSerialPage();
    279     addItem (":/serial_port_32px.png", ":/serial_port_16px.png",
     279    addItem (":/serial_port_32px.png", ":/serial_port_disabled_32px.png", ":/serial_port_16px.png", ":/serial_port_disabled_16px.png",
    280280             SerialId, "#serialPorts",
    281281             prefPage, PortsId);
    … …  
    283283    /* Parallel page */
    284284    prefPage = new VBoxVMSettingsParallelPage();
    285     addItem (":/parallel_port_32px.png", ":/parallel_port_16px.png",
     285    addItem (":/parallel_port_32px.png", ":/parallel_port_disabled_32px.png", ":/parallel_port_16px.png", ":/parallel_port_disabled_16px.png",
    286286             ParallelId, "#parallelPorts",
    287287             prefPage, PortsId);
    … …  
    289289    /* SFolders page */
    290290    prefPage = new VBoxVMSettingsSF (MachineType);
    291     addItem (":/shared_folder_32px.png", ":/shared_folder_16px.png",
     291    addItem (":/shared_folder_32px.png", ":/shared_folder_disabled_32px.png", ":/shared_folder_16px.png", ":/shared_folder_disabled_16px.png",
    292292             SFId, "#sfolders",
    293293             prefPage);
    … …  
    295295    /* VRDP page */
    296296    prefPage = new VBoxVMSettingsVRDP();
    297     addItem (":/vrdp_32px.png", ":/vrdp_16px.png",
     297    addItem (":/vrdp_32px.png", ":/vrdp_disabled_32px.png", ":/vrdp_16px.png", ":/vrdp_disabled_16px.png",
    298298             VRDPId, "#vrdp",
    299299             prefPage);
    … …  
    338338
    339339void VBoxVMSettingsDlg::addItem (const QString &aBigIcon,
     340                                 const QString &aBigIconDisabled,
    340341                                 const QString &aSmallIcon,
     342                                 const QString &aSmallIconDisabled,
    341343                                 int aId,
    342344                                 const QString &aLink,
    … …  
    344346                                 int aParentId /* = -1 */)
    345347{
    346     QWidget *page = mSelector->addItem (aBigIcon, aSmallIcon,
     348    QWidget *page = mSelector->addItem (aBigIcon, aBigIconDisabled, aSmallIcon, aSmallIconDisabled,
    347349                                        aId, aLink,
    348350                                        aPrefPage, aParentId);

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

    r11530 r12130  
    201201}
    202202
    203 QWidget *VBoxSettingsTreeViewSelector::addItem (const QString &aBigIcon,
     203QWidget *VBoxSettingsTreeViewSelector::addItem (const QString & /* aBigIcon */,
     204                                                const QString & /* aBigIconDisabled */,
    204205                                                const QString &aSmallIcon,
     206                                                const QString &aSmallIconDisabled,
    205207                                                int aId,
    206208                                                const QString &aLink,
    … …  
    208210                                                int aParentId /* = -1 */)
    209211{
    210     NOREF (aBigIcon);
    211212    QWidget *result = NULL;
    212213    if (aPage != NULL)
    213214    {
    214         SelectorItem *item = new SelectorItem (QIcon (aSmallIcon), "", aId, aLink, aPage, aParentId);
     215        QIcon icon (aSmallIcon);
     216        if (aSmallIconDisabled.isEmpty())
     217            icon.addFile (aSmallIconDisabled, QSize(), QIcon::Disabled);
     218
     219        SelectorItem *item = new SelectorItem (icon, "", aId, aLink, aPage, aParentId);
    215220        mItemList.append (item);
    216221
    … …  
    380385
    381386QWidget *VBoxSettingsToolBarSelector::addItem (const QString &aBigIcon,
     387                                               const QString &aBigIconDisabled,
    382388                                               const QString &aSmallIcon,
     389                                               const QString &aSmallIconDisabled,
    383390                                               int aId,
    384391                                               const QString &aLink,
    … …  
    386393                                               int aParentId /* = -1 */)
    387394{
     395    QIcon icon (aBigIcon);
     396    if (!aBigIconDisabled.isEmpty())
     397        icon.addFile (aBigIconDisabled, QSize(), QIcon::Disabled);
     398   
    388399    QWidget *result = NULL;
    389     SelectorActionItem *item = new SelectorActionItem (QIcon (aBigIcon), "", aId, aLink, aPage, aParentId, this);
     400    SelectorActionItem *item = new SelectorActionItem (icon, "", aId, aLink, aPage, aParentId, this);
    390401    mItemList.append (item);
    391402
    … …  
    418429            aPage->setContentsMargins (9, 5, 9, 9);
    419430            VBoxGlobal::setLayoutMargin (aPage->layout(), 0);
     431            QIcon icon1 (aSmallIcon);
     432            if (!aSmallIconDisabled.isEmpty())
     433                icon1.addFile (aSmallIconDisabled, QSize(), QIcon::Disabled);
    420434            if (tabWidget)
    421                 tabWidget->addTab (aPage, QIcon (aSmallIcon), "");
     435                tabWidget->addTab (aPage, icon1, "");
    422436        }
    423437    }
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