Changeset 80048 in vbox
- Timestamp:
- Jul 29, 2019 7:23:22 PM (5 years ago)
- Location:
- trunk/src/VBox/Frontends/VirtualBox
- Files:
-
- 6 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/VBox/Frontends/VirtualBox/VirtualBox1.qrc
r79305 r80048 417 417 <file alias="log_viewer_options_16px.png">images/log_viewer_options_16px.png</file> 418 418 <file alias="log_viewer_options_32px.png">images/log_viewer_options_32px.png</file> 419 <file alias="log_viewer_options_disabled_16px.png">images/log_viewer_options_disabled_16px.png</file> 420 <file alias="log_viewer_options_disabled_32px.png">images/log_viewer_options_disabled_32px.png</file> 421 <file alias="log_viewer_refresh_16px.png">images/log_viewer_refresh_16px.png</file> 422 <file alias="log_viewer_refresh_32px.png">images/log_viewer_refresh_32px.png</file> 423 <file alias="log_viewer_refresh_disabled_16px.png">images/log_viewer_refresh_disabled_16px.png</file> 424 <file alias="log_viewer_refresh_disabled_32px.png">images/log_viewer_refresh_disabled_32px.png</file> 425 <file alias="log_viewer_reset_font_16px.png">images/log_viewer_reset_font_16px.png</file> 419 426 </qresource> 420 427 </RCC> -
trunk/src/VBox/Frontends/VirtualBox/VirtualBox1_x2.qrc
r79312 r80048 411 411 <file alias="log_viewer_goto_previous_bookmark_16px_x2.png">images/x2/log_viewer_goto_previous_bookmark_16px_x2.png</file> 412 412 <file alias="log_viewer_goto_selected_bookmark_16px_x2.png">images/x2/log_viewer_goto_selected_bookmark_16px_x2.png</file> 413 <file alias="log_viewer_options_16px_x2.png">images/x2/log_viewer_options_16px_x2.png</file> 414 <file alias="log_viewer_options_32px_x2.png">images/x2/log_viewer_options_32px_x2.png</file> 415 <file alias="log_viewer_options_disabled_16px_x2.png">images/x2/log_viewer_options_disabled_16px_x2.png</file> 416 <file alias="log_viewer_options_disabled_32px_x2.png">images/x2/log_viewer_options_disabled_32px_x2.png</file> 417 <file alias="log_viewer_refresh_16px_x2.png">images/x2/log_viewer_refresh_16px_x2.png</file> 418 <file alias="log_viewer_refresh_32px_x2.png">images/x2/log_viewer_refresh_32px_x2.png</file> 413 419 </qresource> 414 420 </RCC> -
trunk/src/VBox/Frontends/VirtualBox/VirtualBox2.qrc
r79312 r80048 1 1 <RCC> 2 2 <qresource suffix="/"> 3 <file alias="log_viewer_options_disabled_16px.png">images/log_viewer_options_disabled_16px.png</file>4 <file alias="log_viewer_options_disabled_32px.png">images/log_viewer_options_disabled_32px.png</file>5 <file alias="log_viewer_refresh_16px.png">images/log_viewer_refresh_16px.png</file>6 <file alias="log_viewer_refresh_32px.png">images/log_viewer_refresh_32px.png</file>7 <file alias="log_viewer_refresh_disabled_16px.png">images/log_viewer_refresh_disabled_16px.png</file>8 <file alias="log_viewer_refresh_disabled_32px.png">images/log_viewer_refresh_disabled_32px.png</file>9 <file alias="log_viewer_reset_font_16px.png">images/log_viewer_reset_font_16px.png</file>10 3 <file alias="log_viewer_save_16px.png">images/log_viewer_save_16px.png</file> 11 4 <file alias="log_viewer_save_32px.png">images/log_viewer_save_32px.png</file> … … 266 259 <file alias="snapshot_take_disabled_16px.png">images/snapshot_take_disabled_16px.png</file> 267 260 <file alias="snapshot_take_disabled_32px.png">images/snapshot_take_disabled_32px.png</file> 261 <file alias="soft_keyboard_16px.png">images/soft_keyboard_16px.png</file> 262 <file alias="soft_keyboard_32px.png">images/soft_keyboard_32px.png</file> 263 <file alias="soft_keyboard_layout_copy_16px.png">images/soft_keyboard_layout_copy_16px.png</file> 264 <file alias="soft_keyboard_layout_copy_disabled_16px.png">images/soft_keyboard_layout_copy_disabled_16px.png</file> 265 <file alias="soft_keyboard_layout_edit_16px.png">images/soft_keyboard_layout_edit_16px.png</file> 266 <file alias="soft_keyboard_layout_edit_disabled_16px.png">images/soft_keyboard_layout_edit_disabled_16px.png</file> 267 <file alias="soft_keyboard_layout_list_16px.png">images/soft_keyboard_layout_list_16px.png</file> 268 <file alias="soft_keyboard_layout_remove_16px.png">images/soft_keyboard_layout_remove_16px.png</file> 269 <file alias="soft_keyboard_layout_remove_disabled_16px.png">images/soft_keyboard_layout_remove_disabled_16px.png</file> 270 <file alias="soft_keyboard_layout_save_16px.png">images/soft_keyboard_layout_save_16px.png</file> 271 <file alias="soft_keyboard_layout_save_disabled_16px.png">images/soft_keyboard_layout_save_disabled_16px.png</file> 272 <file alias="soft_keyboard_reset_16px.png">images/soft_keyboard_reset_16px.png</file> 273 <file alias="soft_keyboard_settings_16px.png">images/soft_keyboard_settings_16px.png</file> 268 274 <file alias="sort_16px.png">images/sort_16px.png</file> 269 275 <file alias="sort_disabled_16px.png">images/sort_disabled_16px.png</file> -
trunk/src/VBox/Frontends/VirtualBox/VirtualBox2_x2.qrc
r79312 r80048 1 1 <RCC> 2 2 <qresource suffix="/"> 3 <file alias="log_viewer_options_16px_x2.png">images/x2/log_viewer_options_16px_x2.png</file>4 <file alias="log_viewer_options_32px_x2.png">images/x2/log_viewer_options_32px_x2.png</file>5 <file alias="log_viewer_options_disabled_16px_x2.png">images/x2/log_viewer_options_disabled_16px_x2.png</file>6 <file alias="log_viewer_options_disabled_32px_x2.png">images/x2/log_viewer_options_disabled_32px_x2.png</file>7 <file alias="log_viewer_refresh_16px_x2.png">images/x2/log_viewer_refresh_16px_x2.png</file>8 <file alias="log_viewer_refresh_32px_x2.png">images/x2/log_viewer_refresh_32px_x2.png</file>9 3 <file alias="log_viewer_refresh_disabled_16px_x2.png">images/x2/log_viewer_refresh_disabled_16px_x2.png</file> 10 4 <file alias="log_viewer_refresh_disabled_32px_x2.png">images/x2/log_viewer_refresh_disabled_32px_x2.png</file> … … 266 260 <file alias="snapshot_take_disabled_16px_x2.png">images/x2/snapshot_take_disabled_16px_x2.png</file> 267 261 <file alias="snapshot_take_disabled_32px_x2.png">images/x2/snapshot_take_disabled_32px_x2.png</file> 262 <file alias="soft_keyboard_16px_x2.png">images/x2/soft_keyboard_16px_x2.png</file> 263 <file alias="soft_keyboard_32px_x2.png">images/x2/soft_keyboard_32px_x2.png</file> 264 <file alias="soft_keyboard_layout_copy_16px_x2.png">images/x2/soft_keyboard_layout_copy_16px_x2.png</file> 265 <file alias="soft_keyboard_layout_copy_disabled_16px_x2.png">images/x2/soft_keyboard_layout_copy_disabled_16px_x2.png</file> 266 <file alias="soft_keyboard_layout_edit_16px_x2.png">images/x2/soft_keyboard_layout_edit_16px_x2.png</file> 267 <file alias="soft_keyboard_layout_edit_disabled_16px_x2.png">images/x2/soft_keyboard_layout_edit_disabled_16px_x2.png</file> 268 <file alias="soft_keyboard_layout_list_16px_x2.png">images/x2/soft_keyboard_layout_list_16px_x2.png</file> 269 <file alias="soft_keyboard_layout_remove_16px_x2.png">images/x2/soft_keyboard_layout_remove_16px_x2.png</file> 270 <file alias="soft_keyboard_layout_remove_disabled_16px_x2.png">images/x2/soft_keyboard_layout_remove_disabled_16px_x2.png</file> 271 <file alias="soft_keyboard_layout_save_16px_x2.png">images/x2/soft_keyboard_layout_save_16px_x2.png</file> 272 <file alias="soft_keyboard_layout_save_disabled_16px_x2.png">images/x2/soft_keyboard_layout_save_disabled_16px_x2.png</file> 273 <file alias="soft_keyboard_reset_16px_x2.png">images/x2/soft_keyboard_reset_16px_x2.png</file> 274 <file alias="soft_keyboard_settings_16px_x2.png">images/x2/soft_keyboard_settings_16px_x2.png</file> 268 275 <file alias="sort_16px_x2.png">images/x2/sort_16px_x2.png</file> 269 276 <file alias="sort_disabled_16px_x2.png">images/x2/sort_disabled_16px_x2.png</file> -
trunk/src/VBox/Frontends/VirtualBox/src/globals/UIActionPoolRuntime.cpp
r79365 r80048 1553 1553 /** Constructs action passing @a pParent to the base-class. */ 1554 1554 UIActionSimpleRuntimeShowSoftKeyboard(UIActionPool *pParent) 1555 : UIActionSimple(pParent, ":/keyboard_settings_16px.png", ":/keyboard_settings_disabled_16px.png", true)1555 : UIActionSimple(pParent, UIIconPool::iconSet(":/soft_keyboard_16px.png"), true) 1556 1556 {} 1557 1557 -
trunk/src/VBox/Frontends/VirtualBox/src/softkeyboard/UISoftKeyboard.cpp
r79921 r80048 1339 1339 1340 1340 m_pEditLayoutButton = new QToolButton; 1341 m_pEditLayoutButton->setIcon(UIIconPool::iconSet(":/ keyboard_settings_16px.png"));1341 m_pEditLayoutButton->setIcon(UIIconPool::iconSet(":/soft_keyboard_layout_edit_16px.png", ":/soft_keyboard_layout_edit_disabled_16px.png")); 1342 1342 pButtonsLayout->addWidget(m_pEditLayoutButton); 1343 1343 connect(m_pEditLayoutButton, &QToolButton::clicked, this, &UILayoutSelector::sigShowLayoutEditor); 1344 1344 1345 1345 m_pCopyLayoutButton = new QToolButton; 1346 m_pCopyLayoutButton->setIcon(UIIconPool::iconSet(":/ vm_clone_16px.png"));1346 m_pCopyLayoutButton->setIcon(UIIconPool::iconSet(":/soft_keyboard_layout_copy_16px.png", ":/soft_keyboard_layout_copy_disabled_16px.png")); 1347 1347 pButtonsLayout->addWidget(m_pCopyLayoutButton); 1348 1348 connect(m_pCopyLayoutButton, &QToolButton::clicked, this, &UILayoutSelector::sigCopyLayout); 1349 1349 1350 1350 m_pSaveLayoutButton = new QToolButton; 1351 m_pSaveLayoutButton->setIcon(UIIconPool::iconSet(":/ vm_save_state_16px.png"));1351 m_pSaveLayoutButton->setIcon(UIIconPool::iconSet(":/soft_keyboard_layout_save_16px.png", ":/soft_keyboard_layout_save_disabled_16px.png")); 1352 1352 pButtonsLayout->addWidget(m_pSaveLayoutButton); 1353 1353 connect(m_pSaveLayoutButton, &QToolButton::clicked, this, &UILayoutSelector::sigSaveLayout); 1354 1354 1355 1355 m_pDeleteLayoutButton = new QToolButton; 1356 m_pDeleteLayoutButton->setIcon(UIIconPool::iconSet(":/ file_manager_delete_16px.png"));1356 m_pDeleteLayoutButton->setIcon(UIIconPool::iconSet(":/soft_keyboard_layout_remove_16px.png", ":/soft_keyboard_layout_remove_disabled_16px.png")); 1357 1357 pButtonsLayout->addWidget(m_pDeleteLayoutButton); 1358 1358 connect(m_pDeleteLayoutButton, &QToolButton::clicked, this, &UILayoutSelector::sigDeleteLayout); … … 3282 3282 if (m_pLayoutListButton) 3283 3283 { 3284 m_pLayoutListButton->setIcon(UIIconPool::iconSet(":/ file_manager_properties_24px.png"));3284 m_pLayoutListButton->setIcon(UIIconPool::iconSet(":/soft_keyboard_layout_list_16px.png", ":/soft_keyboard_layout_list_disabled_16px.png")); 3285 3285 m_pLayoutListButton->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed); 3286 3286 const int iIconMetric = QApplication::style()->pixelMetric(QStyle::PM_SmallIconSize); … … 3294 3294 if (m_pSettingsButton) 3295 3295 { 3296 m_pSettingsButton->setIcon(UIIconPool::iconSet(":/ vm_settings_16px.png"));3296 m_pSettingsButton->setIcon(UIIconPool::iconSet(":/soft_keyboard_settings_16px.png", ":/soft_keyboard_settings_disabled_16px.png")); 3297 3297 m_pSettingsButton->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed); 3298 3298 const int iIconMetric = QApplication::style()->pixelMetric(QStyle::PM_SmallIconSize); … … 3306 3306 if (m_pResetButton) 3307 3307 { 3308 m_pResetButton->setIcon(UIIconPool::iconSet(":/ hd_release_16px.png"));3308 m_pResetButton->setIcon(UIIconPool::iconSet(":/soft_keyboard_reset_16px.png")); 3309 3309 m_pResetButton->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed); 3310 3310 const int iIconMetric = QApplication::style()->pixelMetric(QStyle::PM_SmallIconSize); … … 3840 3840 void UISoftKeyboard::configure() 3841 3841 { 3842 setWindowIcon(UIIconPool::iconSet(":/ keyboard_24px.png"));3842 setWindowIcon(UIIconPool::iconSet(":/soft_keyboard_16px.png")); 3843 3843 if (m_pKeyboardWidget && m_pSettingsWidget) 3844 3844 {
Note:
See TracChangeset
for help on using the changeset viewer.