Changeset 47160 in vbox for trunk/src/VBox/Frontends
- Timestamp:
- Jul 15, 2013 1:50:13 PM (12 years ago)
- Location:
- trunk/src/VBox/Frontends/VirtualBox
- Files:
-
- 20 edited
- 21 moved
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/VBox/Frontends/VirtualBox/VirtualBox1.qrc
r47149 r47160 49 49 <file alias="register_32px.png">images/register_32px.png</file> 50 50 <file alias="register_disabled_16px.png">images/register_disabled_16px.png</file> 51 <file alias=" reset_16px.png">images/reset_16px.png</file>52 <file alias=" reset_disabled_16px.png">images/reset_disabled_16px.png</file>53 <file alias=" pause_16px.png">images/pause_16px.png</file>54 <file alias=" pause_on_16px.png">images/pause_on_16px.png</file>55 <file alias=" pause_disabled_16px.png">images/pause_disabled_16px.png</file>56 <file alias=" pause_on_disabled_16px.png">images/pause_on_disabled_16px.png</file>57 <file alias=" acpi_16px.png">images/acpi_16px.png</file>58 <file alias=" acpi_disabled_16px.png">images/acpi_disabled_16px.png</file>51 <file alias="vm_reset_16px.png">images/vm_reset_16px.png</file> 52 <file alias="vm_reset_disabled_16px.png">images/vm_reset_disabled_16px.png</file> 53 <file alias="vm_pause_16px.png">images/vm_pause_16px.png</file> 54 <file alias="vm_pause_on_16px.png">images/vm_pause_on_16px.png</file> 55 <file alias="vm_pause_disabled_16px.png">images/vm_pause_disabled_16px.png</file> 56 <file alias="vm_pause_on_disabled_16px.png">images/vm_pause_on_disabled_16px.png</file> 57 <file alias="vm_shutdown_16px.png">images/vm_shutdown_16px.png</file> 58 <file alias="vm_shutdown_disabled_16px.png">images/vm_shutdown_disabled_16px.png</file> 59 59 <file alias="adjust_win_size_16px.png">images/adjust_win_size_16px.png</file> 60 60 <file alias="adjust_win_size_disabled_16px.png">images/adjust_win_size_disabled_16px.png</file> … … 66 66 <file alias="auto_resize_off_disabled_16px.png">images/auto_resize_off_disabled_16px.png</file> 67 67 <file alias="exit_16px.png">images/exit_16px.png</file> 68 <file alias=" poweroff_16px.png">images/poweroff_16px.png</file>69 <file alias=" poweroff_disabled_16px.png">images/poweroff_disabled_16px.png</file>68 <file alias="vm_poweroff_16px.png">images/vm_poweroff_16px.png</file> 69 <file alias="vm_poweroff_disabled_16px.png">images/vm_poweroff_disabled_16px.png</file> 70 70 <file alias="guesttools_16px.png">images/guesttools_16px.png</file> 71 71 <file alias="guesttools_disabled_16px.png">images/guesttools_disabled_16px.png</file> … … 73 73 <file alias="diskimage_32px.png">images/diskimage_32px.png</file> 74 74 <file alias="diskimage_disabled_32px.png">images/diskimage_disabled_32px.png</file> 75 <file alias=" settings_16px.png">images/settings_16px.png</file>76 <file alias=" delete_16px.png">images/delete_16px.png</file>77 <file alias=" new_16px.png">images/new_16px.png</file>78 <file alias=" start_16px.png">images/start_16px.png</file>79 <file alias=" start_dis_16px.png">images/start_dis_16px.png</file>80 <file alias=" discard_16px.png">images/discard_16px.png</file>81 <file alias=" discard_dis_16px.png">images/discard_dis_16px.png</file>82 <file alias=" settings_dis_16px.png">images/settings_dis_16px.png</file>83 <file alias=" delete_dis_16px.png">images/delete_dis_16px.png</file>75 <file alias="vm_settings_16px.png">images/vm_settings_16px.png</file> 76 <file alias="vm_settings_disabled_16px.png">images/vm_settings_disabled_16px.png</file> 77 <file alias="vm_delete_16px.png">images/vm_delete_16px.png</file> 78 <file alias="vm_delete_disabled_16px.png">images/vm_delete_disabled_16px.png</file> 79 <file alias="vm_new_16px.png">images/vm_new_16px.png</file> 80 <file alias="vm_start_16px.png">images/vm_start_16px.png</file> 81 <file alias="vm_start_disabled_16px.png">images/vm_start_disabled_16px.png</file> 82 <file alias="vm_discard_16px.png">images/vm_discard_16px.png</file> 83 <file alias="vm_discard_disabled_16px.png">images/vm_discard_disabled_16px.png</file> 84 84 <file alias="sound_16px.png">images/sound_16px.png</file> 85 85 <file alias="sound_32px.png">images/sound_32px.png</file> … … 245 245 <file alias="ok_16px.png">images/ok_16px.png</file> 246 246 <file alias="cancel_16px.png">images/cancel_16px.png</file> 247 <file alias=" save_state_16px.png">images/save_state_16px.png</file>248 <file alias=" save_state_disabled_16px.png">images/save_state_disabled_16px.png</file>247 <file alias="vm_save_state_16px.png">images/vm_save_state_16px.png</file> 248 <file alias="vm_save_state_disabled_16px.png">images/vm_save_state_disabled_16px.png</file> 249 249 <file alias="video_capture_16px.png">images/video_capture_16px.png</file> 250 250 <file alias="video_capture_disabled_16px.png">images/video_capture_disabled_16px.png</file> -
trunk/src/VBox/Frontends/VirtualBox/src/VBoxSnapshotDetailsDlg.ui
r43106 r47160 24 24 </property> 25 25 <property name="windowIcon"> 26 <iconset resource="../VirtualBox1.qrc">:/s ettings_16px.png</iconset>26 <iconset resource="../VirtualBox1.qrc">:/show_snapshot_details_16px.png</iconset> 27 27 </property> 28 28 <layout class="QGridLayout"> -
trunk/src/VBox/Frontends/VirtualBox/src/converter/UIConverterBackendCOM.cpp
r42526 r47160 111 111 case KMachineState_RestoringSnapshot: return QPixmap(":/state_discarding_16px.png"); 112 112 case KMachineState_DeletingSnapshot: return QPixmap(":/state_discarding_16px.png"); 113 case KMachineState_SettingUp: return QPixmap(":/ settings_16px.png");113 case KMachineState_SettingUp: return QPixmap(":/vm_settings_16px.png"); // TODO: Change icon! 114 114 // case KMachineState_FirstOnline: 115 115 // case KMachineState_LastOnline: -
trunk/src/VBox/Frontends/VirtualBox/src/globals/UIActionPool.cpp
r46846 r47160 413 413 414 414 UIActionSimpleResetWarnings(UIActionPool *pParent) 415 : UIActionSimple(pParent, ":/ reset_16px.png")415 : UIActionSimple(pParent, ":/vm_reset_16px.png") // TODO: Change icon! 416 416 { 417 417 retranslateUi(); -
trunk/src/VBox/Frontends/VirtualBox/src/net/UINetworkRequestWidget.cpp
r43710 r47160 76 76 m_pCancelButton->removeBorder(); 77 77 m_pCancelButton->setFocusPolicy(Qt::NoFocus); 78 m_pCancelButton->setIcon(UIIconPool::iconSet(":/ delete_16px.png"));78 m_pCancelButton->setIcon(UIIconPool::iconSet(":/cancel_16px.png")); 79 79 connect(m_pCancelButton, SIGNAL(clicked(bool)), this, SIGNAL(sigCancel())); 80 80 -
trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIActionPoolRuntime.cpp
r46777 r47160 50 50 51 51 UIActionSimpleShowSettingsDialog(UIActionPool *pParent) 52 : UIActionSimple(pParent, ":/ settings_16px.png", ":/settings_dis_16px.png")52 : UIActionSimple(pParent, ":/vm_settings_16px.png", ":/vm_settings_disabled_16px.png") 53 53 { 54 54 retranslateUi(); … … 289 289 UIActionTogglePause(UIActionPool *pParent) 290 290 : UIActionToggle(pParent, 291 ":/ pause_on_16px.png", ":/pause_16px.png",292 ":/ pause_on_disabled_16px.png", ":/pause_disabled_16px.png")291 ":/vm_pause_on_16px.png", ":/vm_pause_16px.png", 292 ":/vm_pause_on_disabled_16px.png", ":/vm_pause_disabled_16px.png") 293 293 { 294 294 retranslateUi(); … … 321 321 322 322 UIActionSimplePerformReset(UIActionPool *pParent) 323 : UIActionSimple(pParent, ":/ reset_16px.png", ":/reset_disabled_16px.png")323 : UIActionSimple(pParent, ":/vm_reset_16px.png", ":/vm_reset_disabled_16px.png") 324 324 { 325 325 retranslateUi(); … … 352 352 353 353 UIActionSimplePerformSave(UIActionPool *pParent) 354 : UIActionSimple(pParent, ":/ save_state_16px.png", ":/save_state_disabled_16px.png")354 : UIActionSimple(pParent, ":/vm_save_state_16px.png", ":/vm_save_state_disabled_16px.png") 355 355 { 356 356 retranslateUi(); … … 378 378 379 379 UIActionSimplePerformShutdown(UIActionPool *pParent) 380 : UIActionSimple(pParent, ":/ acpi_16px.png", ":/acpi_disabled_16px.png")380 : UIActionSimple(pParent, ":/vm_shutdown_16px.png", ":/vm_shutdown_disabled_16px.png") 381 381 { 382 382 retranslateUi(); … … 413 413 414 414 UIActionSimplePerformPowerOff(UIActionPool *pParent) 415 : UIActionSimple(pParent, ":/ poweroff_16px.png", ":/poweroff_disabled_16px.png")415 : UIActionSimple(pParent, ":/vm_poweroff_16px.png", ":/vm_poweroff_disabled_16px.png") 416 416 { 417 417 retranslateUi(); -
trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineLogic.cpp
r47154 r47160 1729 1729 pEmptyMenuAction->setText(tr("No USB Devices Connected")); 1730 1730 pEmptyMenuAction->setToolTip(tr("No supported devices connected to the host PC")); 1731 pEmptyMenuAction->setIcon(UIIconPool::iconSet(":/ delete_16px.png", ":/delete_dis_16px.png"));1731 pEmptyMenuAction->setIcon(UIIconPool::iconSet(":/vm_delete_16px.png", ":/vm_delete_disabled_16px.png")); // TODO: Change icon! 1732 1732 pMenu->addAction(pEmptyMenuAction); 1733 1733 } -
trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIVMCloseDialog.cpp
r46898 r47160 183 183 /* Configure icon: */ 184 184 m_pSaveIcon->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed); 185 m_pSaveIcon->setPixmap(QPixmap(":/ save_state_16px.png"));185 m_pSaveIcon->setPixmap(QPixmap(":/vm_save_state_16px.png")); 186 186 } 187 187 /* Prepare 'save' radio-button: */ … … 196 196 /* Configure icon: */ 197 197 m_pShutdownIcon->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed); 198 m_pShutdownIcon->setPixmap(QPixmap(":/ acpi_16px.png"));198 m_pShutdownIcon->setPixmap(QPixmap(":/vm_shutdown_16px.png")); 199 199 } 200 200 /* Prepare 'shutdown' radio-button: */ … … 209 209 /* Configure icon: */ 210 210 m_pPowerOffIcon->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed); 211 m_pPowerOffIcon->setPixmap(QPixmap(":/ poweroff_16px.png"));211 m_pPowerOffIcon->setPixmap(QPixmap(":/vm_poweroff_16px.png")); 212 212 } 213 213 /* Prepare 'shutdown' radio-button: */ -
trunk/src/VBox/Frontends/VirtualBox/src/selector/UIActionPoolSelector.cpp
r47149 r47160 232 232 233 233 UIActionSimpleGroupNew(UIActionPool *pParent) 234 : UIActionSimple(pParent, QSize(32, 32), QSize(16, 16), ":/vm_new_32px.png", ":/ new_16px.png")234 : UIActionSimple(pParent, QSize(32, 32), QSize(16, 16), ":/vm_new_32px.png", ":/vm_new_16px.png") 235 235 { 236 236 retranslateUi(); … … 328 328 UIActionSimpleGroupRemove(UIActionPool *pParent) 329 329 : UIActionSimple(pParent, QSize(32, 32), QSize(16, 16), 330 ":/vm_delete_32px.png", ":/ delete_16px.png",331 ":/vm_delete_disabled_32px.png", ":/ delete_dis_16px.png")330 ":/vm_delete_32px.png", ":/vm_delete_16px.png", 331 ":/vm_delete_disabled_32px.png", ":/vm_delete_disabled_16px.png") 332 332 { 333 333 retranslateUi(); … … 360 360 361 361 UIActionSimpleGroupSort(UIActionPool *pParent) 362 : UIActionSimple(pParent /*, ":/settings_16px.png", ":/settings_dis_16px.png"*/)362 : UIActionSimple(pParent) 363 363 { 364 364 retranslateUi(); … … 407 407 408 408 UIActionSimpleMachineNew(UIActionPool *pParent) 409 : UIActionSimple(pParent, QSize(32, 32), QSize(16, 16), ":/vm_new_32px.png", ":/ new_16px.png")409 : UIActionSimple(pParent, QSize(32, 32), QSize(16, 16), ":/vm_new_32px.png", ":/vm_new_16px.png") 410 410 { 411 411 retranslateUi(); … … 471 471 472 472 UIActionSimpleMachineAddGroup(UIActionPool *pParent) 473 : UIActionSimple(pParent, ":/sf_add_16px.png") 473 : UIActionSimple(pParent, ":/sf_add_16px.png") // TODO: Change icon! 474 474 { 475 475 retranslateUi(); … … 503 503 UIActionSimpleMachineSettings(UIActionPool *pParent) 504 504 : UIActionSimple(pParent, QSize(32, 32), QSize(16, 16), 505 ":/vm_settings_32px.png", ":/ settings_16px.png",506 ":/vm_settings_disabled_32px.png", ":/ settings_dis_16px.png")505 ":/vm_settings_32px.png", ":/vm_settings_16px.png", 506 ":/vm_settings_disabled_32px.png", ":/vm_settings_disabled_16px.png") 507 507 { 508 508 retranslateUi(); … … 569 569 UIActionSimpleMachineRemove(UIActionPool *pParent) 570 570 : UIActionSimple(pParent, QSize(32, 32), QSize(16, 16), 571 ":/vm_delete_32px.png", ":/ delete_16px.png",572 ":/vm_delete_disabled_32px.png", ":/ delete_dis_16px.png")571 ":/vm_delete_32px.png", ":/vm_delete_16px.png", 572 ":/vm_delete_disabled_32px.png", ":/vm_delete_disabled_16px.png") 573 573 { 574 574 retranslateUi(); … … 603 603 UIActionStateCommonStartOrShow(UIActionPool *pParent) 604 604 : UIActionState(pParent, QSize(32, 32), QSize(16, 16), 605 ":/vm_start_32px.png", ":/ start_16px.png",606 ":/vm_start_disabled_32px.png", ":/ start_dis_16px.png")605 ":/vm_start_32px.png", ":/vm_start_16px.png", 606 ":/vm_start_disabled_32px.png", ":/vm_start_disabled_16px.png") 607 607 { 608 608 retranslateUi(); … … 650 650 UIActionToggleCommonPauseAndResume(UIActionPool *pParent) 651 651 : UIActionToggle(pParent, QSize(32, 32), QSize(16, 16), 652 ":/vm_pause_32px.png", ":/ pause_16px.png",653 ":/vm_pause_disabled_32px.png", ":/ pause_disabled_16px.png")652 ":/vm_pause_32px.png", ":/vm_pause_16px.png", 653 ":/vm_pause_disabled_32px.png", ":/vm_pause_disabled_16px.png") 654 654 { 655 655 retranslateUi(); … … 682 682 683 683 UIActionSimpleCommonReset(UIActionPool *pParent) 684 : UIActionSimple(pParent, ":/ reset_16px.png", ":/reset_disabled_16px.png")684 : UIActionSimple(pParent, ":/vm_reset_16px.png", ":/vm_reset_disabled_16px.png") 685 685 { 686 686 retranslateUi(); … … 714 714 UIActionSimpleCommonDiscard(UIActionPool *pParent) 715 715 : UIActionSimple(pParent, QSize(32, 32), QSize(16, 16), 716 ":/vm_discard_32px.png", ":/ discard_16px.png",717 ":/vm_discard_disabled_32px.png", ":/ discard_dis_16px.png")716 ":/vm_discard_32px.png", ":/vm_discard_16px.png", 717 ":/vm_discard_disabled_32px.png", ":/vm_discard_disabled_16px.png") 718 718 { 719 719 retranslateUi(); … … 842 842 843 843 UIActionSimpleMachineSortParent(UIActionPool *pParent) 844 : UIActionSimple(pParent /*, ":/settings_16px.png", ":/settings_dis_16px.png"*/)844 : UIActionSimple(pParent) 845 845 { 846 846 retranslateUi(); … … 889 889 890 890 UIActionSimpleSave(UIActionPool *pParent) 891 : UIActionSimple(pParent, ":/ save_state_16px.png", ":/save_state_disabled_16px.png")891 : UIActionSimple(pParent, ":/vm_save_state_16px.png", ":/vm_save_state_disabled_16px.png") 892 892 { 893 893 retranslateUi(); … … 920 920 921 921 UIActionSimpleACPIShutdown(UIActionPool *pParent) 922 : UIActionSimple(pParent, ":/ acpi_16px.png", ":/acpi_disabled_16px.png")922 : UIActionSimple(pParent, ":/vm_shutdown_16px.png", ":/vm_shutdown_disabled_16px.png") 923 923 { 924 924 retranslateUi(); … … 951 951 952 952 UIActionSimplePowerOff(UIActionPool *pParent) 953 : UIActionSimple(pParent, ":/ poweroff_16px.png", ":/poweroff_disabled_16px.png")953 : UIActionSimple(pParent, ":/vm_poweroff_16px.png", ":/vm_poweroff_disabled_16px.png") 954 954 { 955 955 retranslateUi(); -
trunk/src/VBox/Frontends/VirtualBox/src/selector/UIVMDesktop.cpp
r46193 r47160 226 226 /* Prepare buttons: */ 227 227 m_pHeaderBtn = new UITexturedSegmentedButton(2); 228 m_pHeaderBtn->setIcon(Dtls, UIIconPool::iconSet(":/ settings_16px.png"));228 m_pHeaderBtn->setIcon(Dtls, UIIconPool::iconSet(":/vm_settings_16px.png")); 229 229 m_pHeaderBtn->setIcon(Snap, UIIconPool::iconSet(":/take_snapshot_16px.png", 230 230 ":/take_snapshot_dis_16px.png")); -
trunk/src/VBox/Frontends/VirtualBox/src/selector/graphics/chooser/UIGChooserItemMachine.cpp
r45283 r47160 190 190 191 191 /* Pixmaps: */ 192 case MachineItemData_SettingsButtonPixmap: return UIIconPool::iconSet(":/ settings_16px.png");193 case MachineItemData_StartButtonPixmap: return UIIconPool::iconSet(":/ start_16px.png");194 case MachineItemData_PauseButtonPixmap: return UIIconPool::iconSet(":/ pause_16px.png");192 case MachineItemData_SettingsButtonPixmap: return UIIconPool::iconSet(":/vm_settings_16px.png"); 193 case MachineItemData_StartButtonPixmap: return UIIconPool::iconSet(":/vm_start_16px.png"); 194 case MachineItemData_PauseButtonPixmap: return UIIconPool::iconSet(":/vm_pause_16px.png"); 195 195 case MachineItemData_CloseButtonPixmap: return UIIconPool::iconSet(":/exit_16px.png"); 196 196 -
trunk/src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialogSpecific.cpp
r47149 r47160 570 570 /* Window icon: */ 571 571 #ifndef Q_WS_MAC 572 setWindowIcon(QIcon(":/ settings_16px.png"));572 setWindowIcon(QIcon(":/vm_settings_16px.png")); 573 573 #endif /* Q_WS_MAC */ 574 574 -
trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIHotKeyEditor.cpp
r44753 r47160 137 137 connect(m_pResetButton, SIGNAL(clicked(bool)), this, SLOT(sltReset())); 138 138 m_pClearButton->removeBorder(); 139 m_pClearButton->setIcon(UIIconPool::iconSet(":/ delete_16px.png"));139 m_pClearButton->setIcon(UIIconPool::iconSet(":/eraser_16px.png")); 140 140 connect(m_pClearButton, SIGNAL(clicked(bool)), this, SLOT(sltClear())); 141 141
Note:
See TracChangeset
for help on using the changeset viewer.