Changeset 75070 in vbox
- Timestamp:
- Oct 25, 2018 1:42:42 PM (6 years ago)
- Location:
- trunk/src/VBox/Frontends/VirtualBox
- Files:
-
- 12 edited
- 22 copied
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/VBox/Frontends/VirtualBox/VirtualBox1.qrc
r75060 r75070 68 68 <file alias="cloud_profile_edit_disabled_16px.png">images/cloud_profile_edit_disabled_16px.png</file> 69 69 <file alias="cloud_profile_edit_disabled_32px.png">images/cloud_profile_edit_disabled_32px.png</file> 70 <file alias="cloud_profile_help_16px.png">images/cloud_profile_help_16px.png</file> 71 <file alias="cloud_profile_help_32px.png">images/cloud_profile_help_32px.png</file> 70 72 <file alias="cloud_profile_help_disabled_16px.png">images/cloud_profile_help_disabled_16px.png</file> 71 73 <file alias="cloud_profile_help_disabled_32px.png">images/cloud_profile_help_disabled_32px.png</file> 72 <file alias="cloud_profile_help_16px.png">images/cloud_profile_help_16px.png</file>73 <file alias="cloud_profile_help_32px.png">images/cloud_profile_help_32px.png</file>74 74 <file alias="cloud_profile_manager_16px.png">images/cloud_profile_manager_16px.png</file> 75 75 <file alias="cloud_profile_manager_24px.png">images/cloud_profile_manager_24px.png</file> 76 76 <file alias="cloud_profile_manager_32px.png">images/cloud_profile_manager_32px.png</file> 77 <file alias="cloud_profile_manager_disabled_16px.png">images/cloud_profile_manager_disabled_16px.png</file> 78 <file alias="cloud_profile_manager_disabled_24px.png">images/cloud_profile_manager_disabled_24px.png</file> 77 79 <file alias="cloud_profile_remove_16px.png">images/cloud_profile_remove_16px.png</file> 78 80 <file alias="cloud_profile_remove_32px.png">images/cloud_profile_remove_32px.png</file> … … 225 227 <file alias="host_iface_manager_24px.png">images/host_iface_manager_24px.png</file> 226 228 <file alias="host_iface_manager_32px.png">images/host_iface_manager_32px.png</file> 229 <file alias="host_iface_manager_disabled_16px.png">images/host_iface_manager_disabled_16px.png</file> 230 <file alias="host_iface_manager_disabled_24px.png">images/host_iface_manager_disabled_24px.png</file> 227 231 <file alias="host_iface_remove_16px.png">images/host_iface_remove_16px.png</file> 228 232 <file alias="host_iface_remove_32px.png">images/host_iface_remove_32px.png</file> … … 290 294 <file alias="machine_details_manager_16px.png">images/machine_details_manager_16px.png</file> 291 295 <file alias="machine_details_manager_24px.png">images/machine_details_manager_24px.png</file> 296 <file alias="machine_details_manager_disabled_16px.png">images/machine_details_manager_disabled_16px.png</file> 297 <file alias="machine_details_manager_disabled_24px.png">images/machine_details_manager_disabled_24px.png</file> 292 298 <file alias="machine_warning_16px.png">images/machine_warning_16px.png</file> 293 299 <file alias="media_manager_16px.png">images/media_manager_16px.png</file> 294 300 <file alias="media_manager_24px.png">images/media_manager_24px.png</file> 295 301 <file alias="media_manager_32px.png">images/media_manager_32px.png</file> 302 <file alias="media_manager_disabled_16px.png">images/media_manager_disabled_16px.png</file> 303 <file alias="media_manager_disabled_24px.png">images/media_manager_disabled_24px.png</file> 296 304 <file alias="meditation_32px.png">images/meditation_32px.png</file> 297 305 <file alias="menubar_16px.png">images/menubar_16px.png</file> … … 333 341 <file alias="os_fedora_64.png">images/os_fedora_64.png</file> 334 342 <file alias="os_freebsd.png">images/os_freebsd.png</file> 335 <file alias="os_freebsd_64.png">images/os_freebsd_64.png</file>336 <file alias="os_gentoo.png">images/os_gentoo.png</file>337 <file alias="os_gentoo_64.png">images/os_gentoo_64.png</file>338 <file alias="os_jrockitve.png">images/os_jrockitve.png</file>339 <file alias="os_l4.png">images/os_l4.png</file>340 <file alias="os_linux.png">images/os_linux.png</file>341 <file alias="os_linux22.png">images/os_linux22.png</file>342 <file alias="os_linux24.png">images/os_linux24.png</file>343 <file alias="os_linux24_64.png">images/os_linux24_64.png</file>344 <file alias="os_linux26.png">images/os_linux26.png</file>345 <file alias="os_linux26_64.png">images/os_linux26_64.png</file>346 <file alias="os_linux_64.png">images/os_linux_64.png</file>347 <file alias="os_macosx.png">images/os_macosx.png</file>348 <file alias="os_macosx_64.png">images/os_macosx_64.png</file>349 <file alias="os_mandriva.png">images/os_mandriva.png</file>350 343 </qresource> 351 344 </RCC> -
trunk/src/VBox/Frontends/VirtualBox/VirtualBox1_x2.qrc
r75060 r75070 75 75 <file alias="cloud_profile_manager_24px_x2.png">images/x2/cloud_profile_manager_24px_x2.png</file> 76 76 <file alias="cloud_profile_manager_32px_x2.png">images/x2/cloud_profile_manager_32px_x2.png</file> 77 <file alias="cloud_profile_manager_disabled_16px_x2.png">images/x2/cloud_profile_manager_disabled_16px_x2.png</file> 78 <file alias="cloud_profile_manager_disabled_24px_x2.png">images/x2/cloud_profile_manager_disabled_24px_x2.png</file> 77 79 <file alias="cloud_profile_remove_16px_x2.png">images/x2/cloud_profile_remove_16px_x2.png</file> 78 80 <file alias="cloud_profile_remove_32px_x2.png">images/x2/cloud_profile_remove_32px_x2.png</file> … … 225 227 <file alias="host_iface_manager_24px_x2.png">images/x2/host_iface_manager_24px_x2.png</file> 226 228 <file alias="host_iface_manager_32px_x2.png">images/x2/host_iface_manager_32px_x2.png</file> 229 <file alias="host_iface_manager_disabled_16px_x2.png">images/x2/host_iface_manager_disabled_16px_x2.png</file> 230 <file alias="host_iface_manager_disabled_24px_x2.png">images/x2/host_iface_manager_disabled_24px_x2.png</file> 227 231 <file alias="host_iface_remove_16px_x2.png">images/x2/host_iface_remove_16px_x2.png</file> 228 232 <file alias="host_iface_remove_32px_x2.png">images/x2/host_iface_remove_32px_x2.png</file> … … 286 290 <file alias="machine_details_manager_16px_x2.png">images/x2/machine_details_manager_16px_x2.png</file> 287 291 <file alias="machine_details_manager_24px_x2.png">images/x2/machine_details_manager_24px_x2.png</file> 292 <file alias="machine_details_manager_disabled_16px_x2.png">images/x2/machine_details_manager_disabled_16px_x2.png</file> 293 <file alias="machine_details_manager_disabled_24px_x2.png">images/x2/machine_details_manager_disabled_24px_x2.png</file> 288 294 <file alias="machine_warning_16px_x2.png">images/x2/machine_warning_16px_x2.png</file> 289 295 <file alias="media_manager_16px_x2.png">images/x2/media_manager_16px_x2.png</file> 290 296 <file alias="media_manager_24px_x2.png">images/x2/media_manager_24px_x2.png</file> 291 297 <file alias="media_manager_32px_x2.png">images/x2/media_manager_32px_x2.png</file> 298 <file alias="media_manager_disabled_16px_x2.png">images/x2/media_manager_disabled_16px_x2.png</file> 299 <file alias="media_manager_disabled_24px_x2.png">images/x2/media_manager_disabled_24px_x2.png</file> 292 300 <file alias="meditation_32px_x2.png">images/x2/meditation_32px_x2.png</file> 293 301 <file alias="menubar_16px_x2.png">images/x2/menubar_16px_x2.png</file> … … 327 335 <file alias="os_fedora_x2.png">images/x2/os_fedora_x2.png</file> 328 336 <file alias="os_freebsd_64_x2.png">images/x2/os_freebsd_64_x2.png</file> 329 <file alias="os_freebsd_x2.png">images/x2/os_freebsd_x2.png</file>330 <file alias="os_gentoo_64_x2.png">images/x2/os_gentoo_64_x2.png</file>331 <file alias="os_gentoo_x2.png">images/x2/os_gentoo_x2.png</file>332 <file alias="os_jrockitve_x2.png">images/x2/os_jrockitve_x2.png</file>333 <file alias="os_l4_x2.png">images/x2/os_l4_x2.png</file>334 <file alias="os_linux22_x2.png">images/x2/os_linux22_x2.png</file>335 <file alias="os_linux24_64_x2.png">images/x2/os_linux24_64_x2.png</file>336 <file alias="os_linux24_x2.png">images/x2/os_linux24_x2.png</file>337 <file alias="os_linux26_64_x2.png">images/x2/os_linux26_64_x2.png</file>338 <file alias="os_linux26_x2.png">images/x2/os_linux26_x2.png</file>339 <file alias="os_linux_64_x2.png">images/x2/os_linux_64_x2.png</file>340 <file alias="os_linux_x2.png">images/x2/os_linux_x2.png</file>341 <file alias="os_macosx_64_x2.png">images/x2/os_macosx_64_x2.png</file>342 337 </qresource> 343 338 </RCC> -
trunk/src/VBox/Frontends/VirtualBox/VirtualBox2.qrc
r75060 r75070 1 1 <RCC> 2 2 <qresource suffix="/"> 3 <file alias="os_freebsd_64.png">images/os_freebsd_64.png</file> 4 <file alias="os_gentoo.png">images/os_gentoo.png</file> 5 <file alias="os_gentoo_64.png">images/os_gentoo_64.png</file> 6 <file alias="os_jrockitve.png">images/os_jrockitve.png</file> 7 <file alias="os_l4.png">images/os_l4.png</file> 8 <file alias="os_linux.png">images/os_linux.png</file> 9 <file alias="os_linux22.png">images/os_linux22.png</file> 10 <file alias="os_linux24.png">images/os_linux24.png</file> 11 <file alias="os_linux24_64.png">images/os_linux24_64.png</file> 12 <file alias="os_linux26.png">images/os_linux26.png</file> 13 <file alias="os_linux26_64.png">images/os_linux26_64.png</file> 14 <file alias="os_linux_64.png">images/os_linux_64.png</file> 15 <file alias="os_macosx.png">images/os_macosx.png</file> 16 <file alias="os_macosx_64.png">images/os_macosx_64.png</file> 17 <file alias="os_mandriva.png">images/os_mandriva.png</file> 3 18 <file alias="os_mandriva_64.png">images/os_mandriva_64.png</file> 4 19 <file alias="os_netbsd.png">images/os_netbsd.png</file> … … 166 181 <file alias="snapshot_manager_16px.png">images/snapshot_manager_16px.png</file> 167 182 <file alias="snapshot_manager_24px.png">images/snapshot_manager_24px.png</file> 183 <file alias="snapshot_manager_disabled_16px.png">images/snapshot_manager_disabled_16px.png</file> 184 <file alias="snapshot_manager_disabled_24px.png">images/snapshot_manager_disabled_24px.png</file> 168 185 <file alias="snapshot_offline_16px.png">images/snapshot_offline_16px.png</file> 169 186 <file alias="snapshot_online_16px.png">images/snapshot_online_16px.png</file> … … 287 304 <file alias="vm_show_logs_32px.png">images/vm_show_logs_32px.png</file> 288 305 <file alias="vm_show_logs_disabled_16px.png">images/vm_show_logs_disabled_16px.png</file> 306 <file alias="vm_show_logs_disabled_24px.png">images/vm_show_logs_disabled_24px.png</file> 289 307 <file alias="vm_show_logs_disabled_32px.png">images/vm_show_logs_disabled_32px.png</file> 290 308 <file alias="vm_shutdown_16px.png">images/vm_shutdown_16px.png</file> -
trunk/src/VBox/Frontends/VirtualBox/VirtualBox2_x2.qrc
r75060 r75070 1 1 <RCC> 2 2 <qresource suffix="/"> 3 <file alias="os_freebsd_x2.png">images/x2/os_freebsd_x2.png</file> 4 <file alias="os_gentoo_64_x2.png">images/x2/os_gentoo_64_x2.png</file> 5 <file alias="os_gentoo_x2.png">images/x2/os_gentoo_x2.png</file> 6 <file alias="os_jrockitve_x2.png">images/x2/os_jrockitve_x2.png</file> 7 <file alias="os_l4_x2.png">images/x2/os_l4_x2.png</file> 8 <file alias="os_linux22_x2.png">images/x2/os_linux22_x2.png</file> 9 <file alias="os_linux24_64_x2.png">images/x2/os_linux24_64_x2.png</file> 10 <file alias="os_linux24_x2.png">images/x2/os_linux24_x2.png</file> 11 <file alias="os_linux26_64_x2.png">images/x2/os_linux26_64_x2.png</file> 12 <file alias="os_linux26_x2.png">images/x2/os_linux26_x2.png</file> 13 <file alias="os_linux_64_x2.png">images/x2/os_linux_64_x2.png</file> 14 <file alias="os_linux_x2.png">images/x2/os_linux_x2.png</file> 15 <file alias="os_macosx_64_x2.png">images/x2/os_macosx_64_x2.png</file> 3 16 <file alias="os_macosx_x2.png">images/x2/os_macosx_x2.png</file> 4 17 <file alias="os_mandriva_64_x2.png">images/x2/os_mandriva_64_x2.png</file> … … 168 181 <file alias="snapshot_manager_16px_x2.png">images/x2/snapshot_manager_16px_x2.png</file> 169 182 <file alias="snapshot_manager_24px_x2.png">images/x2/snapshot_manager_24px_x2.png</file> 183 <file alias="snapshot_manager_disabled_16px_x2.png">images/x2/snapshot_manager_disabled_16px_x2.png</file> 184 <file alias="snapshot_manager_disabled_24px_x2.png">images/x2/snapshot_manager_disabled_24px_x2.png</file> 170 185 <file alias="snapshot_offline_16px_x2.png">images/x2/snapshot_offline_16px_x2.png</file> 171 186 <file alias="snapshot_online_16px_x2.png">images/x2/snapshot_online_16px_x2.png</file> … … 289 304 <file alias="vm_show_logs_32px_x2.png">images/x2/vm_show_logs_32px_x2.png</file> 290 305 <file alias="vm_show_logs_disabled_16px_x2.png">images/x2/vm_show_logs_disabled_16px_x2.png</file> 306 <file alias="vm_show_logs_disabled_24px_x2.png">images/x2/vm_show_logs_disabled_24px_x2.png</file> 291 307 <file alias="vm_show_logs_disabled_32px_x2.png">images/x2/vm_show_logs_disabled_32px_x2.png</file> 292 308 <file alias="vm_shutdown_16px_x2.png">images/x2/vm_shutdown_16px_x2.png</file> -
trunk/src/VBox/Frontends/VirtualBox/src/globals/UIActionPoolSelector.cpp
r75060 r75070 72 72 /** Constructs action passing @a pParent to the base-class. */ 73 73 UIActionSimpleSelectorFileShowVirtualMediaManager(UIActionPool *pParent) 74 : UIActionSimple(pParent, ":/media_manager_16px.png", ":/media_manager_ 16px.png")74 : UIActionSimple(pParent, ":/media_manager_16px.png", ":/media_manager_disabled_16px.png") 75 75 {} 76 76 … … 106 106 /** Constructs action passing @a pParent to the base-class. */ 107 107 UIActionSimpleSelectorFileShowHostNetworkManager(UIActionPool *pParent) 108 : UIActionSimple(pParent, ":/host_iface_manager_16px.png", ":/host_iface_manager_ 16px.png")108 : UIActionSimple(pParent, ":/host_iface_manager_16px.png", ":/host_iface_manager_disabled_16px.png") 109 109 {} 110 110 … … 140 140 /** Constructs action passing @a pParent to the base-class. */ 141 141 UIActionSimpleSelectorFileShowCloudProfileManager(UIActionPool *pParent) 142 : UIActionSimple(pParent, ":/cloud_profile_manager_16px.png", ":/cloud_profile_manager_ 16px.png")142 : UIActionSimple(pParent, ":/cloud_profile_manager_16px.png", ":/cloud_profile_manager_disabled_16px.png") 143 143 {} 144 144 … … 1401 1401 : UIActionSimple(pParent, 1402 1402 ":/machine_details_manager_24px.png", ":/machine_details_manager_16px.png", 1403 ":/machine_details_manager_ 24px.png", ":/machine_details_manager_16px.png")1403 ":/machine_details_manager_disabled_24px.png", ":/machine_details_manager_disabled_16px.png") 1404 1404 {} 1405 1405 … … 1431 1431 : UIActionSimple(pParent, 1432 1432 ":/snapshot_manager_24px.png", ":/snapshot_manager_16px.png", 1433 ":/snapshot_manager_ 24px.png", ":/snapshot_manager_16px.png")1433 ":/snapshot_manager_disabled_24px.png", ":/snapshot_manager_disabled_16px.png") 1434 1434 {} 1435 1435 … … 1460 1460 UIActionSimpleSelectorToolsMachineShowLogs(UIActionPool *pParent) 1461 1461 : UIActionSimple(pParent, 1462 ":/vm_show_logs_32px.png", ":/vm_show_logs_ 32px.png",1463 ":/vm_show_logs_ 32px.png", ":/vm_show_logs_32px.png")1462 ":/vm_show_logs_32px.png", ":/vm_show_logs_16px.png", 1463 ":/vm_show_logs_disabled_32px.png", ":/vm_show_logs_disabled_16px.png") 1464 1464 {} 1465 1465 … … 1548 1548 : UIActionSimple(pParent, 1549 1549 ":/media_manager_24px.png", ":/media_manager_16px.png", 1550 ":/media_manager_ 24px.png", ":/media_manager_16px.png")1550 ":/media_manager_disabled_24px.png", ":/media_manager_disabled_16px.png") 1551 1551 {} 1552 1552 … … 1578 1578 : UIActionSimple(pParent, 1579 1579 ":/host_iface_manager_24px.png", ":/host_iface_manager_16px.png", 1580 ":/host_iface_manager_ 24px.png", ":/host_iface_manager_16px.png")1580 ":/host_iface_manager_disabled_24px.png", ":/host_iface_manager_disabled_16px.png") 1581 1581 {} 1582 1582 … … 1608 1608 : UIActionSimple(pParent, 1609 1609 ":/cloud_profile_manager_24px.png", ":/cloud_profile_manager_16px.png", 1610 ":/cloud_profile_manager_ 24px.png", ":/cloud_profile_manager_16px.png")1610 ":/cloud_profile_manager_disabled_24px.png", ":/cloud_profile_manager_disabled_16px.png") 1611 1611 {} 1612 1612 -
trunk/src/VBox/Frontends/VirtualBox/src/manager/tools/UIToolsItem.cpp
r75028 r75070 273 273 } 274 274 275 void UIToolsItem::setEnabled(bool fEnabled) 276 { 277 /* Call to base-class: */ 278 QIGraphicsWidget::setEnabled(fEnabled); 279 280 /* Update linked values: */ 281 updatePixmap(); 282 } 283 275 284 void UIToolsItem::setHovered(bool fHovered) 276 285 { … … 593 602 /* Prepare new pixmap size: */ 594 603 const QSize pixmapSize = QSize(iIconMetric, iIconMetric); 595 const QPixmap pixmap = m_icon.pixmap(gpManager->windowHandle(), pixmapSize );604 const QPixmap pixmap = m_icon.pixmap(gpManager->windowHandle(), pixmapSize, isEnabled() ? QIcon::Normal : QIcon::Disabled); 596 605 /* Update linked values: */ 597 606 if (m_pixmapSize != pixmapSize) … … 884 893 int iPixmapY = (iFullHeight - m_pixmap.height() / m_pixmap.devicePixelRatio()) / 2; 885 894 /* Paint pixmap: */ 886 // WORKAROUND: 887 // We have no disabled tool icons for now. 888 // So we will emulate that functionality. 889 // Maybe one day we should do that everywhere? 890 /// @todo just use proper icons! 891 if (!isEnabled()) 892 paintPixmap(/* Painter: */ 893 pPainter, 894 /* Point to paint in: */ 895 QPoint(iPixmapX, iPixmapY), 896 /* Pixmap to paint: */ 897 QPixmap::fromImage(toGray(m_pixmap.toImage()))); 898 else 899 paintPixmap(/* Painter: */ 900 pPainter, 901 /* Point to paint in: */ 902 QPoint(iPixmapX, iPixmapY), 903 /* Pixmap to paint: */ 904 m_pixmap); 895 paintPixmap(/* Painter: */ 896 pPainter, 897 /* Point to paint in: */ 898 QPoint(iPixmapX, iPixmapY), 899 /* Pixmap to paint: */ 900 m_pixmap); 905 901 } 906 902 -
trunk/src/VBox/Frontends/VirtualBox/src/manager/tools/UIToolsItem.h
r75016 r75070 100 100 /** Returns item name. */ 101 101 const QString &name() const; 102 103 /** Defines whether item is @a fEnabled. */ 104 void setEnabled(bool fEnabled); 102 105 103 106 /** Defines whether item is @a fHovered. */ -
trunk/src/VBox/Frontends/VirtualBox/src/manager/tools/UIToolsModel.cpp
r75017 r75070 463 463 /* Prepare icons: */ 464 464 QList<QIcon> icons; 465 icons << UIIconPool::iconSet(":/welcome_screen_24px.png" );466 icons << UIIconPool::iconSet(":/media_manager_24px.png" );467 icons << UIIconPool::iconSet(":/host_iface_manager_24px.png" );468 icons << UIIconPool::iconSet(":/cloud_profile_manager_24px.png" );469 icons << UIIconPool::iconSet(":/machine_details_manager_24px.png" );470 icons << UIIconPool::iconSet(":/snapshot_manager_24px.png" );471 icons << UIIconPool::iconSet(":/vm_show_logs_24px.png" );465 icons << UIIconPool::iconSet(":/welcome_screen_24px.png", ":/welcome_screen_24px.png"); /// @todo fix icon! 466 icons << UIIconPool::iconSet(":/media_manager_24px.png", ":/media_manager_disabled_24px.png"); 467 icons << UIIconPool::iconSet(":/host_iface_manager_24px.png", ":/host_iface_manager_disabled_24px.png"); 468 icons << UIIconPool::iconSet(":/cloud_profile_manager_24px.png", ":/cloud_profile_manager_disabled_24px.png"); 469 icons << UIIconPool::iconSet(":/machine_details_manager_24px.png", ":/machine_details_manager_disabled_24px.png"); 470 icons << UIIconPool::iconSet(":/snapshot_manager_24px.png", ":/snapshot_manager_disabled_24px.png"); 471 icons << UIIconPool::iconSet(":/vm_show_logs_24px.png", ":/vm_show_logs_disabled_24px.png"); 472 472 473 473 /* Prepare names: */ -
trunk/src/VBox/Frontends/VirtualBox/src/wizards/exportappliance/UIWizardExportAppPageBasic2.cpp
r75055 r75070 676 676 if (m_pAccountToolButton) 677 677 { 678 m_pAccountToolButton->setIcon(UIIconPool::iconSet(":/cloud_profile_manager_16px.png")); 678 m_pAccountToolButton->setIcon(UIIconPool::iconSet(":/cloud_profile_manager_16px.png", 679 ":/cloud_profile_manager_disabled_16px.png")); 679 680 680 681 /* Add into layout: */ -
trunk/src/VBox/Frontends/VirtualBox/src/wizards/exportappliance/UIWizardExportAppPageExpert.cpp
r75055 r75070 297 297 if (m_pAccountToolButton) 298 298 { 299 m_pAccountToolButton->setIcon(UIIconPool::iconSet(":/cloud_profile_manager_16px.png")); 299 m_pAccountToolButton->setIcon(UIIconPool::iconSet(":/cloud_profile_manager_16px.png", 300 ":/cloud_profile_manager_disabled_16px.png")); 300 301 301 302 /* Add into layout: */
Note:
See TracChangeset
for help on using the changeset viewer.