Changeset 50890 in vbox for trunk/src/VBox/Frontends/VirtualBox
- Timestamp:
- Mar 26, 2014 1:42:44 PM (11 years ago)
- Location:
- trunk/src/VBox/Frontends/VirtualBox
- Files:
-
- 7 edited
- 15 copied
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/VBox/Frontends/VirtualBox/VirtualBox1.qrc
r50885 r50890 44 44 <file alias="snapshot_online_16px.png">images/snapshot_online_16px.png</file> 45 45 <file alias="machine_16px.png">images/machine_16px.png</file> 46 <file alias="machine_24px.png">images/machine_24px.png</file> 46 47 <file alias="machine_32px.png">images/machine_32px.png</file> 47 48 <file alias="machine_disabled_16px.png">images/machine_disabled_16px.png</file> … … 51 52 <file alias="help_button_pressed_mac_22px.png">images/help_button_pressed_mac_22px.png</file> 52 53 <file alias="site_16px.png">images/site_16px.png</file> 54 <file alias="site_24px.png">images/site_24px.png</file> 53 55 <file alias="site_32px.png">images/site_32px.png</file> 54 56 <file alias="site_disabled_16px.png">images/site_disabled_16px.png</file> … … 91 93 <file alias="vm_discard_disabled_16px.png">images/vm_discard_disabled_16px.png</file> 92 94 <file alias="sound_16px.png">images/sound_16px.png</file> 95 <file alias="sound_24px.png">images/sound_24px.png</file> 93 96 <file alias="sound_32px.png">images/sound_32px.png</file> 94 97 <file alias="sound_disabled_32px.png">images/sound_disabled_32px.png</file> 95 98 <file alias="nw_16px.png">images/nw_16px.png</file> 99 <file alias="nw_24px.png">images/nw_24px.png</file> 100 <file alias="nw_32px.png">images/nw_32px.png</file> 96 101 <file alias="nw_disabled_16px.png">images/nw_disabled_16px.png</file> 97 <file alias="nw_32px.png">images/nw_32px.png</file>98 102 <file alias="nw_disabled_32px.png">images/nw_disabled_32px.png</file> 99 103 <file alias="nw_read_16px.png">images/nw_read_16px.png</file> 100 104 <file alias="nw_write_16px.png">images/nw_write_16px.png</file> 101 105 <file alias="usb_16px.png">images/usb_16px.png</file> 106 <file alias="usb_24px.png">images/usb_24px.png</file> 107 <file alias="usb_32px.png">images/usb_32px.png</file> 102 108 <file alias="usb_disabled_16px.png">images/usb_disabled_16px.png</file> 103 <file alias="usb_32px.png">images/usb_32px.png</file>104 109 <file alias="usb_disabled_32px.png">images/usb_disabled_32px.png</file> 105 110 <file alias="usb_new_16px.png">images/usb_new_16px.png</file> … … 122 127 <file alias="usb_expand_16px.png">images/usb_expand_16px.png</file> 123 128 <file alias="parallel_port_16px.png">images/parallel_port_16px.png</file> 129 <file alias="parallel_port_24px.png">images/parallel_port_24px.png</file> 130 <file alias="parallel_port_32px.png">images/parallel_port_32px.png</file> 124 131 <file alias="parallel_port_disabled_16px.png">images/parallel_port_disabled_16px.png</file> 125 <file alias="parallel_port_32px.png">images/parallel_port_32px.png</file>126 132 <file alias="parallel_port_disabled_32px.png">images/parallel_port_disabled_32px.png</file> 127 133 <file alias="parallel_port_read_16px.png">images/parallel_port_read_16px.png</file> 128 134 <file alias="parallel_port_write_16px.png">images/parallel_port_write_16px.png</file> 129 135 <file alias="serial_port_16px.png">images/serial_port_16px.png</file> 136 <file alias="serial_port_24px.png">images/serial_port_24px.png</file> 137 <file alias="serial_port_32px.png">images/serial_port_32px.png</file> 130 138 <file alias="serial_port_disabled_16px.png">images/serial_port_disabled_16px.png</file> 131 <file alias="serial_port_32px.png">images/serial_port_32px.png</file>132 139 <file alias="serial_port_disabled_32px.png">images/serial_port_disabled_32px.png</file> 133 140 <file alias="serial_port_read_16px.png">images/serial_port_read_16px.png</file> … … 176 183 <file alias="sf_remove_disabled_16px.png">images/sf_remove_disabled_16px.png</file> 177 184 <file alias="sf_16px.png">images/sf_16px.png</file> 185 <file alias="sf_24px.png">images/sf_24px.png</file> 186 <file alias="sf_32px.png">images/sf_32px.png</file> 178 187 <file alias="sf_disabled_16px.png">images/sf_disabled_16px.png</file> 179 <file alias="sf_32px.png">images/sf_32px.png</file>180 188 <file alias="sf_disabled_32px.png">images/sf_disabled_32px.png</file> 181 189 <file alias="sf_read_16px.png">images/sf_read_16px.png</file> … … 190 198 <file alias="eraser_disabled_16px.png">images/eraser_disabled_16px.png</file> 191 199 <file alias="refresh_16px.png">images/refresh_16px.png</file> 200 <file alias="refresh_22px.png">images/refresh_22px.png</file> 201 <file alias="refresh_24px.png">images/refresh_24px.png</file> 202 <file alias="refresh_32px.png">images/refresh_32px.png</file> 192 203 <file alias="refresh_disabled_16px.png">images/refresh_disabled_16px.png</file> 193 <file alias="refresh_22px.png">images/refresh_22px.png</file>194 204 <file alias="refresh_disabled_22px.png">images/refresh_disabled_22px.png</file> 195 <file alias="refresh_32px.png">images/refresh_32px.png</file>196 205 <file alias="refresh_disabled_32px.png">images/refresh_disabled_32px.png</file> 197 206 <file alias="vm_show_logs_16px.png">images/vm_show_logs_16px.png</file> … … 212 221 <file alias="global_settings_disabled_16px.png">images/global_settings_disabled_16px.png</file> 213 222 <file alias="vrdp_16px.png">images/vrdp_16px.png</file> 223 <file alias="vrdp_24px.png">images/vrdp_24px.png</file> 224 <file alias="vrdp_32px.png">images/vrdp_32px.png</file> 225 <file alias="vrdp_disabled_16px.png">images/vrdp_disabled_16px.png</file> 226 <file alias="vrdp_disabled_32px.png">images/vrdp_disabled_32px.png</file> 214 227 <file alias="vrdp_on_16px.png">images/vrdp_on_16px.png</file> 215 <file alias="vrdp_disabled_16px.png">images/vrdp_disabled_16px.png</file>216 228 <file alias="vrdp_on_disabled_16px.png">images/vrdp_on_disabled_16px.png</file> 217 <file alias="vrdp_32px.png">images/vrdp_32px.png</file>218 <file alias="vrdp_disabled_32px.png">images/vrdp_disabled_32px.png</file>219 229 <file alias="meditation_32px.png">images/meditation_32px.png</file> 220 230 <file alias="welcome.png">images/welcome.png</file> … … 252 262 <file alias="disconnect_16px.png">images/disconnect_16px.png</file> 253 263 <file alias="chipset_16px.png">images/chipset_16px.png</file> 264 <file alias="chipset_24px.png">images/chipset_24px.png</file> 254 265 <file alias="chipset_32px.png">images/chipset_32px.png</file> 255 266 <file alias="chipset_disabled_16px.png">images/chipset_disabled_16px.png</file> -
trunk/src/VBox/Frontends/VirtualBox/VirtualBox2.qrc
r50886 r50890 74 74 <file alias="os_macosx_64.png">images/os_macosx_64.png</file> 75 75 <file alias="hd_16px.png">images/hd_16px.png</file> 76 <file alias="hd_24px.png">images/hd_24px.png</file> 77 <file alias="hd_32px.png">images/hd_32px.png</file> 76 78 <file alias="hd_disabled_16px.png">images/hd_disabled_16px.png</file> 79 <file alias="hd_disabled_32px.png">images/hd_disabled_32px.png</file> 77 80 <file alias="hd_settings_16px.png">images/hd_settings_16px.png</file> 78 81 <file alias="hd_settings_disabled_16px.png">images/hd_settings_disabled_16px.png</file> 79 <file alias="hd_32px.png">images/hd_32px.png</file>80 <file alias="hd_disabled_32px.png">images/hd_disabled_32px.png</file>81 82 <file alias="hd_read_16px.png">images/hd_read_16px.png</file> 82 83 <file alias="hd_write_16px.png">images/hd_write_16px.png</file> … … 134 135 <file alias="mouse_can_seamless_uncaptured_16px.png">images/mouse_can_seamless_uncaptured_16px.png</file> 135 136 <file alias="hostkey_16px.png">images/hostkey_16px.png</file> 137 <file alias="hostkey_24px.png">images/hostkey_24px.png</file> 138 <file alias="hostkey_32px.png">images/hostkey_32px.png</file> 136 139 <file alias="hostkey_disabled_16px.png">images/hostkey_disabled_16px.png</file> 137 <file alias="hostkey_32px.png">images/hostkey_32px.png</file>138 140 <file alias="hostkey_disabled_32px.png">images/hostkey_disabled_32px.png</file> 139 141 <file alias="hostkey_pressed_16px.png">images/hostkey_pressed_16px.png</file> … … 186 188 <file alias="status_error_32px.png">images/status_error_32px.png</file> 187 189 <file alias="extension_pack_16px.png">images/extension_pack_16px.png</file> 190 <file alias="extension_pack_24px.png">images/extension_pack_24px.png</file> 191 <file alias="extension_pack_32px.png">images/extension_pack_32px.png</file> 188 192 <file alias="extension_pack_disabled_16px.png">images/extension_pack_disabled_16px.png</file> 189 <file alias="extension_pack_32px.png">images/extension_pack_32px.png</file>190 193 <file alias="extension_pack_disabled_32px.png">images/extension_pack_disabled_32px.png</file> 191 194 <file alias="extension_pack_install_16px.png">images/extension_pack_install_16px.png</file> … … 198 201 <file alias="extension_pack_uninstall_disabled_32px.png">images/extension_pack_uninstall_disabled_32px.png</file> 199 202 <file alias="proxy_16px.png">images/proxy_16px.png</file> 203 <file alias="proxy_24px.png">images/proxy_24px.png</file> 204 <file alias="proxy_32px.png">images/proxy_32px.png</file> 200 205 <file alias="proxy_disabled_16px.png">images/proxy_disabled_16px.png</file> 201 <file alias="proxy_32px.png">images/proxy_32px.png</file>202 206 <file alias="proxy_disabled_32px.png">images/proxy_disabled_32px.png</file> 203 207 <file alias="nw_error_16px.png">images/nw_error_16px.png</file> -
trunk/src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialog.cpp
r49050 r50890 266 266 267 267 void UISettingsDialog::addItem(const QString &strBigIcon, 268 const QString &strBigIconDisabled,269 268 const QString &strSmallIcon, 270 const QString &strSmallIconDisabled,271 269 int cId, 272 270 const QString &strLink, … … 275 273 { 276 274 /* Add new selector item: */ 277 if (QWidget *pPage = m_pSelector->addItem(strBigIcon, strBigIconDisabled, 278 strSmallIcon, strSmallIconDisabled, 275 if (QWidget *pPage = m_pSelector->addItem(strBigIcon, strSmallIcon, 279 276 cId, strLink, pSettingsPage, iParentId)) 280 277 { -
trunk/src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialog.h
r47846 r50890 84 84 85 85 /* Add settings page: */ 86 void addItem(const QString &strBigIcon, const QString &strBigIconDisabled, 87 const QString &strSmallIcon, const QString &strSmallIconDisabled, 86 void addItem(const QString &strBigIcon, const QString &strSmallIcon, 88 87 int cId, const QString &strLink, 89 88 UISettingsPage* pSettingsPage = 0, int iParentId = -1); -
trunk/src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialogSpecific.cpp
r49596 r50890 345 345 { 346 346 pSettingsPage = new UIGlobalSettingsGeneral; 347 addItem(":/machine_32px.png", ":/machine_disabled_32px.png", 348 ":/machine_16px.png", ":/machine_disabled_16px.png", 347 addItem(":/machine_32px.png", ":/machine_24px.png", 349 348 iPageIndex, "#general", pSettingsPage); 350 349 break; … … 354 353 { 355 354 pSettingsPage = new UIGlobalSettingsInput; 356 addItem(":/hostkey_32px.png", ":/hostkey_disabled_32px.png", 357 ":/hostkey_16px.png", ":/hostkey_disabled_16px.png", 355 addItem(":/hostkey_32px.png", ":/hostkey_24px.png", 358 356 iPageIndex, "#input", pSettingsPage); 359 357 break; … … 364 362 { 365 363 pSettingsPage = new UIGlobalSettingsUpdate; 366 addItem(":/refresh_32px.png", ":/refresh_disabled_32px.png", 367 ":/refresh_16px.png", ":/refresh_disabled_16px.png", 364 addItem(":/refresh_32px.png", ":/refresh_24px.png", 368 365 iPageIndex, "#update", pSettingsPage); 369 366 break; … … 374 371 { 375 372 pSettingsPage = new UIGlobalSettingsLanguage; 376 addItem(":/site_32px.png", ":/site_disabled_32px.png", 377 ":/site_16px.png", ":/site_disabled_16px.png", 373 addItem(":/site_32px.png", ":/site_24px.png", 378 374 iPageIndex, "#language", pSettingsPage); 379 375 break; … … 383 379 { 384 380 pSettingsPage = new UIGlobalSettingsDisplay; 385 addItem(":/vrdp_32px.png", ":/vrdp_disabled_32px.png", 386 ":/vrdp_16px.png", ":/vrdp_disabled_16px.png", 381 addItem(":/vrdp_32px.png", ":/vrdp_24px.png", 387 382 iPageIndex, "#display", pSettingsPage); 388 383 break; … … 392 387 { 393 388 pSettingsPage = new UIGlobalSettingsNetwork; 394 addItem(":/nw_32px.png", ":/nw_disabled_32px.png", 395 ":/nw_16px.png", ":/nw_disabled_16px.png", 389 addItem(":/nw_32px.png", ":/nw_24px.png", 396 390 iPageIndex, "#network", pSettingsPage); 397 391 break; … … 401 395 { 402 396 pSettingsPage = new UIGlobalSettingsExtension; 403 addItem(":/extension_pack_32px.png", ":/extension_pack_disabled_32px.png", 404 ":/extension_pack_16px.png", ":/extension_pack_disabled_16px.png", 397 addItem(":/extension_pack_32px.png", ":/extension_pack_24px.png", 405 398 iPageIndex, "#extensions", pSettingsPage); 406 399 break; … … 411 404 { 412 405 pSettingsPage = new UIGlobalSettingsProxy; 413 addItem(":/proxy_32px.png", ":/proxy_disabled_32px.png", 414 ":/proxy_16px.png", ":/proxy_disabled_16px.png", 406 addItem(":/proxy_32px.png", ":/proxy_24px.png", 415 407 iPageIndex, "#proxy", pSettingsPage); 416 408 break; … … 593 585 { 594 586 pSettingsPage = new UIMachineSettingsGeneral; 595 addItem(":/machine_32px.png", ":/machine_disabled_32px.png", 596 ":/machine_16px.png", ":/machine_disabled_16px.png", 587 addItem(":/machine_32px.png", ":/machine_24px.png", 597 588 iPageIndex, "#general", pSettingsPage); 598 589 break; … … 602 593 { 603 594 pSettingsPage = new UIMachineSettingsSystem; 604 addItem(":/chipset_32px.png", ":/chipset_disabled_32px.png", 605 ":/chipset_16px.png", ":/chipset_disabled_16px.png", 595 addItem(":/chipset_32px.png", ":/chipset_24px.png", 606 596 iPageIndex, "#system", pSettingsPage); 607 597 break; … … 611 601 { 612 602 pSettingsPage = new UIMachineSettingsDisplay; 613 addItem(":/vrdp_32px.png", ":/vrdp_disabled_32px.png", 614 ":/vrdp_16px.png", ":/vrdp_disabled_16px.png", 603 addItem(":/vrdp_32px.png", ":/vrdp_24px.png", 615 604 iPageIndex, "#display", pSettingsPage); 616 605 break; … … 621 610 pSettingsPage = new UIMachineSettingsStorage; 622 611 connect(pSettingsPage, SIGNAL(storageChanged()), this, SLOT(sltResetFirstRunFlag())); 623 addItem(":/hd_32px.png", ":/hd_disabled_32px.png", 624 ":/hd_16px.png", ":/hd_disabled_16px.png", 612 addItem(":/hd_32px.png", ":/hd_24px.png", 625 613 iPageIndex, "#storage", pSettingsPage); 626 614 break; … … 630 618 { 631 619 pSettingsPage = new UIMachineSettingsAudio; 632 addItem(":/sound_32px.png", ":/sound_disabled_32px.png", 633 ":/sound_16px.png", ":/sound_disabled_16px.png", 620 addItem(":/sound_32px.png", ":/sound_24px.png", 634 621 iPageIndex, "#audio", pSettingsPage); 635 622 break; … … 639 626 { 640 627 pSettingsPage = new UIMachineSettingsNetworkPage; 641 addItem(":/nw_32px.png", ":/nw_disabled_32px.png", 642 ":/nw_16px.png", ":/nw_disabled_16px.png", 628 addItem(":/nw_32px.png", ":/nw_24px.png", 643 629 iPageIndex, "#network", pSettingsPage); 644 630 break; … … 647 633 case MachineSettingsPageType_Ports: 648 634 { 649 addItem(":/serial_port_32px.png", ":/serial_port_disabled_32px.png", 650 ":/serial_port_16px.png", ":/serial_port_disabled_16px.png", 635 addItem(":/serial_port_32px.png", ":/serial_port_24px.png", 651 636 iPageIndex, "#ports"); 652 637 break; … … 656 641 { 657 642 pSettingsPage = new UIMachineSettingsSerialPage; 658 addItem(":/serial_port_32px.png", ":/serial_port_disabled_32px.png", 659 ":/serial_port_16px.png", ":/serial_port_disabled_16px.png", 643 addItem(":/serial_port_32px.png", ":/serial_port_24px.png", 660 644 iPageIndex, "#serialPorts", pSettingsPage, MachineSettingsPageType_Ports); 661 645 break; … … 665 649 { 666 650 pSettingsPage = new UIMachineSettingsParallelPage; 667 addItem(":/parallel_port_32px.png", ":/parallel_port_disabled_32px.png", 668 ":/parallel_port_16px.png", ":/parallel_port_disabled_16px.png", 651 addItem(":/parallel_port_32px.png", ":/parallel_port_24px.png", 669 652 iPageIndex, "#parallelPorts", pSettingsPage, MachineSettingsPageType_Ports); 670 653 break; … … 674 657 { 675 658 pSettingsPage = new UIMachineSettingsUSB; 676 addItem(":/usb_32px.png", ":/usb_disabled_32px.png", 677 ":/usb_16px.png", ":/usb_disabled_16px.png", 659 addItem(":/usb_32px.png", ":/usb_24px.png", 678 660 iPageIndex, "#usb", pSettingsPage, MachineSettingsPageType_Ports); 679 661 break; … … 683 665 { 684 666 pSettingsPage = new UIMachineSettingsSF; 685 addItem(":/sf_32px.png", ":/sf_disabled_32px.png", 686 ":/sf_16px.png", ":/sf_disabled_16px.png", 667 addItem(":/sf_32px.png", ":/sf_24px.png", 687 668 iPageIndex, "#sharedFolders", pSettingsPage); 688 669 break; -
trunk/src/VBox/Frontends/VirtualBox/src/settings/VBoxSettingsSelector.cpp
r48577 r50890 190 190 mTwSelector->setRootIsDecorated (false); 191 191 mTwSelector->setUniformRowHeights (true); 192 mTwSelector->setIconSize(QSize(24, 24)); 192 193 /* Add the columns */ 193 194 mTwSelector->headerItem()->setText (treeWidget_Category, "Category"); … … 209 210 210 211 QWidget *VBoxSettingsTreeViewSelector::addItem (const QString & /* aBigIcon */, 211 const QString & /* aBigIconDisabled */,212 212 const QString &aSmallIcon, 213 const QString &aSmallIconDisabled,214 213 int aId, 215 214 const QString &aLink, … … 221 220 { 222 221 QIcon icon (aSmallIcon); 223 if (aSmallIconDisabled.isEmpty())224 icon.addFile (aSmallIconDisabled, QSize(), QIcon::Disabled);225 222 226 223 SelectorItem *item = new SelectorItem (icon, "", aId, aLink, aPage, aParentId); … … 288 285 /* Get recommended size hint: */ 289 286 int iItemWidth = static_cast<QAbstractItemView*>(mTwSelector)->sizeHintForColumn(treeWidget_Category); 290 int iItemHeight = qMax( 16/* icon height */, mTwSelector->fontMetrics().height() /* text height */);287 int iItemHeight = qMax(24 /* icon height */, mTwSelector->fontMetrics().height() /* text height */); 291 288 /* Add some margin to every item in the tree: */ 292 289 iItemHeight += 4 /* margin itself */ * 2 /* margin count */; … … 403 400 404 401 QWidget *VBoxSettingsToolBarSelector::addItem (const QString &aBigIcon, 405 const QString &aBigIconDisabled,406 402 const QString &aSmallIcon, 407 const QString &aSmallIconDisabled,408 403 int aId, 409 404 const QString &aLink, … … 412 407 { 413 408 QIcon icon (aBigIcon); 414 if (!aBigIconDisabled.isEmpty())415 icon.addFile (aBigIconDisabled, QSize(), QIcon::Disabled);416 409 417 410 QWidget *result = NULL; … … 449 442 aPage->layout()->setContentsMargins(0, 0, 0, 0); 450 443 QIcon icon1 (aSmallIcon); 451 if (!aSmallIconDisabled.isEmpty())452 icon1.addFile (aSmallIconDisabled, QSize(), QIcon::Disabled);453 444 if (tabWidget) 454 445 tabWidget->addTab (aPage, icon1, ""); -
trunk/src/VBox/Frontends/VirtualBox/src/settings/VBoxSettingsSelector.h
r44529 r50890 48 48 virtual QWidget *widget() const = 0; 49 49 50 virtual QWidget *addItem (const QString &aBigIcon, const QString &a BigIconDisabled, const QString &aSmallIcon, const QString &aSmallIconDisabled, int aId, const QString &aLink, UISettingsPage* aPage = NULL, int aParentId = -1) = 0;50 virtual QWidget *addItem (const QString &aBigIcon, const QString &aSmallIcon, int aId, const QString &aLink, UISettingsPage* aPage = NULL, int aParentId = -1) = 0; 51 51 52 52 virtual void setItemText (int aId, const QString &aText); … … 97 97 virtual QWidget *widget() const; 98 98 99 virtual QWidget *addItem (const QString &aBigIcon, const QString &a BigIconDisabled, const QString &aSmallIcon, const QString &aSmallIconDisabled, int aId, const QString &aLink, UISettingsPage* aPage = NULL, int aParentId = -1);99 virtual QWidget *addItem (const QString &aBigIcon, const QString &aSmallIcon, int aId, const QString &aLink, UISettingsPage* aPage = NULL, int aParentId = -1); 100 100 virtual void setItemText (int aId, const QString &aText); 101 101 virtual QString itemText (int aId) const; … … 137 137 virtual QWidget *widget() const; 138 138 139 virtual QWidget *addItem (const QString &aBigIcon, const QString &a BigIconDisabled, const QString &aSmallIcon, const QString &aSmallIconDisabled, int aId, const QString &aLink, UISettingsPage* aPage = NULL, int aParentId = -1);139 virtual QWidget *addItem (const QString &aBigIcon, const QString &aSmallIcon, int aId, const QString &aLink, UISettingsPage* aPage = NULL, int aParentId = -1); 140 140 virtual void setItemText (int aId, const QString &aText); 141 141 virtual QString itemText (int aId) const;
Note:
See TracChangeset
for help on using the changeset viewer.