diff --git a/src/plugins/coreplugin/images/Desktop.png b/src/libs/utils/images/Desktop.png similarity index 100% rename from src/plugins/coreplugin/images/Desktop.png rename to src/libs/utils/images/Desktop.png diff --git a/src/plugins/coreplugin/images/arrowdown.png b/src/libs/utils/images/arrowdown.png similarity index 100% rename from src/plugins/coreplugin/images/arrowdown.png rename to src/libs/utils/images/arrowdown.png diff --git a/src/plugins/coreplugin/images/arrowdown@2x.png b/src/libs/utils/images/arrowdown@2x.png similarity index 100% rename from src/plugins/coreplugin/images/arrowdown@2x.png rename to src/libs/utils/images/arrowdown@2x.png diff --git a/src/plugins/coreplugin/images/arrowup.png b/src/libs/utils/images/arrowup.png similarity index 100% rename from src/plugins/coreplugin/images/arrowup.png rename to src/libs/utils/images/arrowup.png diff --git a/src/plugins/coreplugin/images/arrowup@2x.png b/src/libs/utils/images/arrowup@2x.png similarity index 100% rename from src/plugins/coreplugin/images/arrowup@2x.png rename to src/libs/utils/images/arrowup@2x.png diff --git a/src/plugins/coreplugin/images/boundingrect.png b/src/libs/utils/images/boundingrect.png similarity index 100% rename from src/plugins/coreplugin/images/boundingrect.png rename to src/libs/utils/images/boundingrect.png diff --git a/src/plugins/coreplugin/images/boundingrect@2x.png b/src/libs/utils/images/boundingrect@2x.png similarity index 100% rename from src/plugins/coreplugin/images/boundingrect@2x.png rename to src/libs/utils/images/boundingrect@2x.png diff --git a/src/plugins/coreplugin/images/category_core.png b/src/libs/utils/images/category_core.png similarity index 100% rename from src/plugins/coreplugin/images/category_core.png rename to src/libs/utils/images/category_core.png diff --git a/src/plugins/coreplugin/images/category_design.png b/src/libs/utils/images/category_design.png similarity index 100% rename from src/plugins/coreplugin/images/category_design.png rename to src/libs/utils/images/category_design.png diff --git a/src/plugins/coreplugin/images/category_locator.png b/src/libs/utils/images/category_locator.png similarity index 100% rename from src/plugins/coreplugin/images/category_locator.png rename to src/libs/utils/images/category_locator.png diff --git a/src/plugins/coreplugin/images/category_texteditor.png b/src/libs/utils/images/category_texteditor.png similarity index 100% rename from src/plugins/coreplugin/images/category_texteditor.png rename to src/libs/utils/images/category_texteditor.png diff --git a/src/plugins/coreplugin/images/clean_pane_small.png b/src/libs/utils/images/clean_pane_small.png similarity index 100% rename from src/plugins/coreplugin/images/clean_pane_small.png rename to src/libs/utils/images/clean_pane_small.png diff --git a/src/plugins/coreplugin/images/clean_pane_small@2x.png b/src/libs/utils/images/clean_pane_small@2x.png similarity index 100% rename from src/plugins/coreplugin/images/clean_pane_small@2x.png rename to src/libs/utils/images/clean_pane_small@2x.png diff --git a/src/plugins/coreplugin/images/close.png b/src/libs/utils/images/close.png similarity index 100% rename from src/plugins/coreplugin/images/close.png rename to src/libs/utils/images/close.png diff --git a/src/plugins/coreplugin/images/close@2x.png b/src/libs/utils/images/close@2x.png similarity index 100% rename from src/plugins/coreplugin/images/close@2x.png rename to src/libs/utils/images/close@2x.png diff --git a/src/plugins/coreplugin/images/collapse.png b/src/libs/utils/images/collapse.png similarity index 100% rename from src/plugins/coreplugin/images/collapse.png rename to src/libs/utils/images/collapse.png diff --git a/src/plugins/coreplugin/images/collapse@2x.png b/src/libs/utils/images/collapse@2x.png similarity index 100% rename from src/plugins/coreplugin/images/collapse@2x.png rename to src/libs/utils/images/collapse@2x.png diff --git a/src/plugins/coreplugin/images/compile_error_taskbar.png b/src/libs/utils/images/compile_error_taskbar.png similarity index 100% rename from src/plugins/coreplugin/images/compile_error_taskbar.png rename to src/libs/utils/images/compile_error_taskbar.png diff --git a/src/plugins/coreplugin/images/compile_error_taskbar@2x.png b/src/libs/utils/images/compile_error_taskbar@2x.png similarity index 100% rename from src/plugins/coreplugin/images/compile_error_taskbar@2x.png rename to src/libs/utils/images/compile_error_taskbar@2x.png diff --git a/src/plugins/coreplugin/images/dark_fileicon.png b/src/libs/utils/images/dark_fileicon.png similarity index 100% rename from src/plugins/coreplugin/images/dark_fileicon.png rename to src/libs/utils/images/dark_fileicon.png diff --git a/src/plugins/coreplugin/images/dark_foldericon.png b/src/libs/utils/images/dark_foldericon.png similarity index 100% rename from src/plugins/coreplugin/images/dark_foldericon.png rename to src/libs/utils/images/dark_foldericon.png diff --git a/src/plugins/coreplugin/images/desktopdevicesmall.png b/src/libs/utils/images/desktopdevicesmall.png similarity index 100% rename from src/plugins/coreplugin/images/desktopdevicesmall.png rename to src/libs/utils/images/desktopdevicesmall.png diff --git a/src/plugins/coreplugin/images/desktopdevicesmall@2x.png b/src/libs/utils/images/desktopdevicesmall@2x.png similarity index 100% rename from src/plugins/coreplugin/images/desktopdevicesmall@2x.png rename to src/libs/utils/images/desktopdevicesmall@2x.png diff --git a/src/plugins/coreplugin/images/dir.png b/src/libs/utils/images/dir.png similarity index 100% rename from src/plugins/coreplugin/images/dir.png rename to src/libs/utils/images/dir.png diff --git a/src/plugins/coreplugin/images/editclear.png b/src/libs/utils/images/editclear.png similarity index 100% rename from src/plugins/coreplugin/images/editclear.png rename to src/libs/utils/images/editclear.png diff --git a/src/plugins/coreplugin/images/editclear@2x.png b/src/libs/utils/images/editclear@2x.png similarity index 100% rename from src/plugins/coreplugin/images/editclear@2x.png rename to src/libs/utils/images/editclear@2x.png diff --git a/src/plugins/coreplugin/images/editcopy.png b/src/libs/utils/images/editcopy.png similarity index 100% rename from src/plugins/coreplugin/images/editcopy.png rename to src/libs/utils/images/editcopy.png diff --git a/src/plugins/coreplugin/images/editcut.png b/src/libs/utils/images/editcut.png similarity index 100% rename from src/plugins/coreplugin/images/editcut.png rename to src/libs/utils/images/editcut.png diff --git a/src/plugins/coreplugin/images/editpaste.png b/src/libs/utils/images/editpaste.png similarity index 100% rename from src/plugins/coreplugin/images/editpaste.png rename to src/libs/utils/images/editpaste.png diff --git a/src/plugins/coreplugin/images/empty14.png b/src/libs/utils/images/empty14.png similarity index 100% rename from src/plugins/coreplugin/images/empty14.png rename to src/libs/utils/images/empty14.png diff --git a/src/plugins/coreplugin/images/error.png b/src/libs/utils/images/error.png similarity index 100% rename from src/plugins/coreplugin/images/error.png rename to src/libs/utils/images/error.png diff --git a/src/plugins/coreplugin/images/error@2x.png b/src/libs/utils/images/error@2x.png similarity index 100% rename from src/plugins/coreplugin/images/error@2x.png rename to src/libs/utils/images/error@2x.png diff --git a/src/plugins/coreplugin/images/expand.png b/src/libs/utils/images/expand.png similarity index 100% rename from src/plugins/coreplugin/images/expand.png rename to src/libs/utils/images/expand.png diff --git a/src/plugins/coreplugin/images/expand@2x.png b/src/libs/utils/images/expand@2x.png similarity index 100% rename from src/plugins/coreplugin/images/expand@2x.png rename to src/libs/utils/images/expand@2x.png diff --git a/src/plugins/coreplugin/images/extension.png b/src/libs/utils/images/extension.png similarity index 100% rename from src/plugins/coreplugin/images/extension.png rename to src/libs/utils/images/extension.png diff --git a/src/plugins/coreplugin/images/extension@2x.png b/src/libs/utils/images/extension@2x.png similarity index 100% rename from src/plugins/coreplugin/images/extension@2x.png rename to src/libs/utils/images/extension@2x.png diff --git a/src/plugins/coreplugin/images/eye_closed.png b/src/libs/utils/images/eye_closed.png similarity index 100% rename from src/plugins/coreplugin/images/eye_closed.png rename to src/libs/utils/images/eye_closed.png diff --git a/src/plugins/coreplugin/images/eye_closed@2x.png b/src/libs/utils/images/eye_closed@2x.png similarity index 100% rename from src/plugins/coreplugin/images/eye_closed@2x.png rename to src/libs/utils/images/eye_closed@2x.png diff --git a/src/plugins/coreplugin/images/eye_open.png b/src/libs/utils/images/eye_open.png similarity index 100% rename from src/plugins/coreplugin/images/eye_open.png rename to src/libs/utils/images/eye_open.png diff --git a/src/plugins/coreplugin/images/eye_open@2x.png b/src/libs/utils/images/eye_open@2x.png similarity index 100% rename from src/plugins/coreplugin/images/eye_open@2x.png rename to src/libs/utils/images/eye_open@2x.png diff --git a/src/plugins/coreplugin/images/filenew.png b/src/libs/utils/images/filenew.png similarity index 100% rename from src/plugins/coreplugin/images/filenew.png rename to src/libs/utils/images/filenew.png diff --git a/src/plugins/coreplugin/images/fileopen.png b/src/libs/utils/images/fileopen.png similarity index 100% rename from src/plugins/coreplugin/images/fileopen.png rename to src/libs/utils/images/fileopen.png diff --git a/src/plugins/coreplugin/images/filesave.png b/src/libs/utils/images/filesave.png similarity index 100% rename from src/plugins/coreplugin/images/filesave.png rename to src/libs/utils/images/filesave.png diff --git a/src/plugins/coreplugin/images/filesave@2x.png b/src/libs/utils/images/filesave@2x.png similarity index 100% rename from src/plugins/coreplugin/images/filesave@2x.png rename to src/libs/utils/images/filesave@2x.png diff --git a/src/plugins/coreplugin/images/filtericon.png b/src/libs/utils/images/filtericon.png similarity index 100% rename from src/plugins/coreplugin/images/filtericon.png rename to src/libs/utils/images/filtericon.png diff --git a/src/plugins/coreplugin/images/filtericon@2x.png b/src/libs/utils/images/filtericon@2x.png similarity index 100% rename from src/plugins/coreplugin/images/filtericon@2x.png rename to src/libs/utils/images/filtericon@2x.png diff --git a/src/plugins/coreplugin/images/help.png b/src/libs/utils/images/help.png similarity index 100% rename from src/plugins/coreplugin/images/help.png rename to src/libs/utils/images/help.png diff --git a/src/plugins/coreplugin/images/info.png b/src/libs/utils/images/info.png similarity index 100% rename from src/plugins/coreplugin/images/info.png rename to src/libs/utils/images/info.png diff --git a/src/plugins/coreplugin/images/info@2x.png b/src/libs/utils/images/info@2x.png similarity index 100% rename from src/plugins/coreplugin/images/info@2x.png rename to src/libs/utils/images/info@2x.png diff --git a/src/plugins/coreplugin/images/inputfield.png b/src/libs/utils/images/inputfield.png similarity index 100% rename from src/plugins/coreplugin/images/inputfield.png rename to src/libs/utils/images/inputfield.png diff --git a/src/plugins/coreplugin/images/inputfield@2x.png b/src/libs/utils/images/inputfield@2x.png similarity index 100% rename from src/plugins/coreplugin/images/inputfield@2x.png rename to src/libs/utils/images/inputfield@2x.png diff --git a/src/plugins/coreplugin/images/inputfield_disabled.png b/src/libs/utils/images/inputfield_disabled.png similarity index 100% rename from src/plugins/coreplugin/images/inputfield_disabled.png rename to src/libs/utils/images/inputfield_disabled.png diff --git a/src/plugins/coreplugin/images/inputfield_disabled@2x.png b/src/libs/utils/images/inputfield_disabled@2x.png similarity index 100% rename from src/plugins/coreplugin/images/inputfield_disabled@2x.png rename to src/libs/utils/images/inputfield_disabled@2x.png diff --git a/src/plugins/coreplugin/images/interrupt_small.png b/src/libs/utils/images/interrupt_small.png similarity index 100% rename from src/plugins/coreplugin/images/interrupt_small.png rename to src/libs/utils/images/interrupt_small.png diff --git a/src/plugins/coreplugin/images/interrupt_small@2x.png b/src/libs/utils/images/interrupt_small@2x.png similarity index 100% rename from src/plugins/coreplugin/images/interrupt_small@2x.png rename to src/libs/utils/images/interrupt_small@2x.png diff --git a/src/plugins/coreplugin/images/linkicon.png b/src/libs/utils/images/linkicon.png similarity index 100% rename from src/plugins/coreplugin/images/linkicon.png rename to src/libs/utils/images/linkicon.png diff --git a/src/plugins/coreplugin/images/linkicon@2x.png b/src/libs/utils/images/linkicon@2x.png similarity index 100% rename from src/plugins/coreplugin/images/linkicon@2x.png rename to src/libs/utils/images/linkicon@2x.png diff --git a/src/plugins/coreplugin/images/logo/128/QtProject-qtcreator.png b/src/libs/utils/images/logo/128/QtProject-qtcreator.png similarity index 100% rename from src/plugins/coreplugin/images/logo/128/QtProject-qtcreator.png rename to src/libs/utils/images/logo/128/QtProject-qtcreator.png diff --git a/src/plugins/coreplugin/images/logo/16/QtProject-qtcreator.png b/src/libs/utils/images/logo/16/QtProject-qtcreator.png similarity index 100% rename from src/plugins/coreplugin/images/logo/16/QtProject-qtcreator.png rename to src/libs/utils/images/logo/16/QtProject-qtcreator.png diff --git a/src/plugins/coreplugin/images/logo/24/QtProject-qtcreator.png b/src/libs/utils/images/logo/24/QtProject-qtcreator.png similarity index 100% rename from src/plugins/coreplugin/images/logo/24/QtProject-qtcreator.png rename to src/libs/utils/images/logo/24/QtProject-qtcreator.png diff --git a/src/plugins/coreplugin/images/logo/256/QtProject-qtcreator.png b/src/libs/utils/images/logo/256/QtProject-qtcreator.png similarity index 100% rename from src/plugins/coreplugin/images/logo/256/QtProject-qtcreator.png rename to src/libs/utils/images/logo/256/QtProject-qtcreator.png diff --git a/src/plugins/coreplugin/images/logo/32/QtProject-qtcreator.png b/src/libs/utils/images/logo/32/QtProject-qtcreator.png similarity index 100% rename from src/plugins/coreplugin/images/logo/32/QtProject-qtcreator.png rename to src/libs/utils/images/logo/32/QtProject-qtcreator.png diff --git a/src/plugins/coreplugin/images/logo/48/QtProject-qtcreator.png b/src/libs/utils/images/logo/48/QtProject-qtcreator.png similarity index 100% rename from src/plugins/coreplugin/images/logo/48/QtProject-qtcreator.png rename to src/libs/utils/images/logo/48/QtProject-qtcreator.png diff --git a/src/plugins/coreplugin/images/logo/512/QtProject-qtcreator.png b/src/libs/utils/images/logo/512/QtProject-qtcreator.png similarity index 100% rename from src/plugins/coreplugin/images/logo/512/QtProject-qtcreator.png rename to src/libs/utils/images/logo/512/QtProject-qtcreator.png diff --git a/src/plugins/coreplugin/images/logo/64/QtProject-qtcreator.png b/src/libs/utils/images/logo/64/QtProject-qtcreator.png similarity index 100% rename from src/plugins/coreplugin/images/logo/64/QtProject-qtcreator.png rename to src/libs/utils/images/logo/64/QtProject-qtcreator.png diff --git a/src/plugins/coreplugin/images/logo/logo.qbs b/src/libs/utils/images/logo/logo.qbs similarity index 100% rename from src/plugins/coreplugin/images/logo/logo.qbs rename to src/libs/utils/images/logo/logo.qbs diff --git a/src/plugins/coreplugin/images/magnifier.png b/src/libs/utils/images/magnifier.png similarity index 100% rename from src/plugins/coreplugin/images/magnifier.png rename to src/libs/utils/images/magnifier.png diff --git a/src/plugins/coreplugin/images/magnifier@2x.png b/src/libs/utils/images/magnifier@2x.png similarity index 100% rename from src/plugins/coreplugin/images/magnifier@2x.png rename to src/libs/utils/images/magnifier@2x.png diff --git a/src/plugins/coreplugin/images/minus.png b/src/libs/utils/images/minus.png similarity index 100% rename from src/plugins/coreplugin/images/minus.png rename to src/libs/utils/images/minus.png diff --git a/src/plugins/coreplugin/images/minus@2x.png b/src/libs/utils/images/minus@2x.png similarity index 100% rename from src/plugins/coreplugin/images/minus@2x.png rename to src/libs/utils/images/minus@2x.png diff --git a/src/plugins/coreplugin/images/panel_button.png b/src/libs/utils/images/panel_button.png similarity index 100% rename from src/plugins/coreplugin/images/panel_button.png rename to src/libs/utils/images/panel_button.png diff --git a/src/plugins/coreplugin/images/panel_button@2x.png b/src/libs/utils/images/panel_button@2x.png similarity index 100% rename from src/plugins/coreplugin/images/panel_button@2x.png rename to src/libs/utils/images/panel_button@2x.png diff --git a/src/plugins/coreplugin/images/panel_button_checked.png b/src/libs/utils/images/panel_button_checked.png similarity index 100% rename from src/plugins/coreplugin/images/panel_button_checked.png rename to src/libs/utils/images/panel_button_checked.png diff --git a/src/plugins/coreplugin/images/panel_button_checked@2x.png b/src/libs/utils/images/panel_button_checked@2x.png similarity index 100% rename from src/plugins/coreplugin/images/panel_button_checked@2x.png rename to src/libs/utils/images/panel_button_checked@2x.png diff --git a/src/plugins/coreplugin/images/panel_button_checked_hover.png b/src/libs/utils/images/panel_button_checked_hover.png similarity index 100% rename from src/plugins/coreplugin/images/panel_button_checked_hover.png rename to src/libs/utils/images/panel_button_checked_hover.png diff --git a/src/plugins/coreplugin/images/panel_button_checked_hover@2x.png b/src/libs/utils/images/panel_button_checked_hover@2x.png similarity index 100% rename from src/plugins/coreplugin/images/panel_button_checked_hover@2x.png rename to src/libs/utils/images/panel_button_checked_hover@2x.png diff --git a/src/plugins/coreplugin/images/panel_button_hover.png b/src/libs/utils/images/panel_button_hover.png similarity index 100% rename from src/plugins/coreplugin/images/panel_button_hover.png rename to src/libs/utils/images/panel_button_hover.png diff --git a/src/plugins/coreplugin/images/panel_button_hover@2x.png b/src/libs/utils/images/panel_button_hover@2x.png similarity index 100% rename from src/plugins/coreplugin/images/panel_button_hover@2x.png rename to src/libs/utils/images/panel_button_hover@2x.png diff --git a/src/plugins/coreplugin/images/panel_button_pressed.png b/src/libs/utils/images/panel_button_pressed.png similarity index 100% rename from src/plugins/coreplugin/images/panel_button_pressed.png rename to src/libs/utils/images/panel_button_pressed.png diff --git a/src/plugins/coreplugin/images/panel_button_pressed@2x.png b/src/libs/utils/images/panel_button_pressed@2x.png similarity index 100% rename from src/plugins/coreplugin/images/panel_button_pressed@2x.png rename to src/libs/utils/images/panel_button_pressed@2x.png diff --git a/src/plugins/coreplugin/images/panel_manage_button.png b/src/libs/utils/images/panel_manage_button.png similarity index 100% rename from src/plugins/coreplugin/images/panel_manage_button.png rename to src/libs/utils/images/panel_manage_button.png diff --git a/src/plugins/coreplugin/images/panel_manage_button@2x.png b/src/libs/utils/images/panel_manage_button@2x.png similarity index 100% rename from src/plugins/coreplugin/images/panel_manage_button@2x.png rename to src/libs/utils/images/panel_manage_button@2x.png diff --git a/src/plugins/coreplugin/images/plus.png b/src/libs/utils/images/plus.png similarity index 100% rename from src/plugins/coreplugin/images/plus.png rename to src/libs/utils/images/plus.png diff --git a/src/plugins/coreplugin/images/plus@2x.png b/src/libs/utils/images/plus@2x.png similarity index 100% rename from src/plugins/coreplugin/images/plus@2x.png rename to src/libs/utils/images/plus@2x.png diff --git a/src/plugins/coreplugin/images/progressbar.png b/src/libs/utils/images/progressbar.png similarity index 100% rename from src/plugins/coreplugin/images/progressbar.png rename to src/libs/utils/images/progressbar.png diff --git a/src/plugins/coreplugin/images/progressbar@2x.png b/src/libs/utils/images/progressbar@2x.png similarity index 100% rename from src/plugins/coreplugin/images/progressbar@2x.png rename to src/libs/utils/images/progressbar@2x.png diff --git a/src/plugins/coreplugin/images/redo.png b/src/libs/utils/images/redo.png similarity index 100% rename from src/plugins/coreplugin/images/redo.png rename to src/libs/utils/images/redo.png diff --git a/src/plugins/coreplugin/images/reload_gray.png b/src/libs/utils/images/reload_gray.png similarity index 100% rename from src/plugins/coreplugin/images/reload_gray.png rename to src/libs/utils/images/reload_gray.png diff --git a/src/plugins/coreplugin/images/reload_gray@2x.png b/src/libs/utils/images/reload_gray@2x.png similarity index 100% rename from src/plugins/coreplugin/images/reload_gray@2x.png rename to src/libs/utils/images/reload_gray@2x.png diff --git a/src/plugins/coreplugin/images/replace_a.png b/src/libs/utils/images/replace_a.png similarity index 100% rename from src/plugins/coreplugin/images/replace_a.png rename to src/libs/utils/images/replace_a.png diff --git a/src/plugins/coreplugin/images/replace_a@2x.png b/src/libs/utils/images/replace_a@2x.png similarity index 100% rename from src/plugins/coreplugin/images/replace_a@2x.png rename to src/libs/utils/images/replace_a@2x.png diff --git a/src/plugins/coreplugin/images/replace_b.png b/src/libs/utils/images/replace_b.png similarity index 100% rename from src/plugins/coreplugin/images/replace_b.png rename to src/libs/utils/images/replace_b.png diff --git a/src/plugins/coreplugin/images/replace_b@2x.png b/src/libs/utils/images/replace_b@2x.png similarity index 100% rename from src/plugins/coreplugin/images/replace_b@2x.png rename to src/libs/utils/images/replace_b@2x.png diff --git a/src/plugins/coreplugin/images/reset.png b/src/libs/utils/images/reset.png similarity index 100% rename from src/plugins/coreplugin/images/reset.png rename to src/libs/utils/images/reset.png diff --git a/src/plugins/coreplugin/images/reset@2x.png b/src/libs/utils/images/reset@2x.png similarity index 100% rename from src/plugins/coreplugin/images/reset@2x.png rename to src/libs/utils/images/reset@2x.png diff --git a/src/plugins/coreplugin/images/run_small.png b/src/libs/utils/images/run_small.png similarity index 100% rename from src/plugins/coreplugin/images/run_small.png rename to src/libs/utils/images/run_small.png diff --git a/src/plugins/coreplugin/images/run_small@2x.png b/src/libs/utils/images/run_small@2x.png similarity index 100% rename from src/plugins/coreplugin/images/run_small@2x.png rename to src/libs/utils/images/run_small@2x.png diff --git a/src/plugins/coreplugin/images/sidebaricon.png b/src/libs/utils/images/sidebaricon.png similarity index 100% rename from src/plugins/coreplugin/images/sidebaricon.png rename to src/libs/utils/images/sidebaricon.png diff --git a/src/plugins/coreplugin/images/sidebaricon@2x.png b/src/libs/utils/images/sidebaricon@2x.png similarity index 100% rename from src/plugins/coreplugin/images/sidebaricon@2x.png rename to src/libs/utils/images/sidebaricon@2x.png diff --git a/src/plugins/coreplugin/images/splitbutton_closebottom.png b/src/libs/utils/images/splitbutton_closebottom.png similarity index 100% rename from src/plugins/coreplugin/images/splitbutton_closebottom.png rename to src/libs/utils/images/splitbutton_closebottom.png diff --git a/src/plugins/coreplugin/images/splitbutton_closebottom@2x.png b/src/libs/utils/images/splitbutton_closebottom@2x.png similarity index 100% rename from src/plugins/coreplugin/images/splitbutton_closebottom@2x.png rename to src/libs/utils/images/splitbutton_closebottom@2x.png diff --git a/src/plugins/coreplugin/images/splitbutton_closeleft.png b/src/libs/utils/images/splitbutton_closeleft.png similarity index 100% rename from src/plugins/coreplugin/images/splitbutton_closeleft.png rename to src/libs/utils/images/splitbutton_closeleft.png diff --git a/src/plugins/coreplugin/images/splitbutton_closeleft@2x.png b/src/libs/utils/images/splitbutton_closeleft@2x.png similarity index 100% rename from src/plugins/coreplugin/images/splitbutton_closeleft@2x.png rename to src/libs/utils/images/splitbutton_closeleft@2x.png diff --git a/src/plugins/coreplugin/images/splitbutton_closeright.png b/src/libs/utils/images/splitbutton_closeright.png similarity index 100% rename from src/plugins/coreplugin/images/splitbutton_closeright.png rename to src/libs/utils/images/splitbutton_closeright.png diff --git a/src/plugins/coreplugin/images/splitbutton_closeright@2x.png b/src/libs/utils/images/splitbutton_closeright@2x.png similarity index 100% rename from src/plugins/coreplugin/images/splitbutton_closeright@2x.png rename to src/libs/utils/images/splitbutton_closeright@2x.png diff --git a/src/plugins/coreplugin/images/splitbutton_closetop.png b/src/libs/utils/images/splitbutton_closetop.png similarity index 100% rename from src/plugins/coreplugin/images/splitbutton_closetop.png rename to src/libs/utils/images/splitbutton_closetop.png diff --git a/src/plugins/coreplugin/images/splitbutton_closetop@2x.png b/src/libs/utils/images/splitbutton_closetop@2x.png similarity index 100% rename from src/plugins/coreplugin/images/splitbutton_closetop@2x.png rename to src/libs/utils/images/splitbutton_closetop@2x.png diff --git a/src/plugins/coreplugin/images/splitbutton_horizontal.png b/src/libs/utils/images/splitbutton_horizontal.png similarity index 100% rename from src/plugins/coreplugin/images/splitbutton_horizontal.png rename to src/libs/utils/images/splitbutton_horizontal.png diff --git a/src/plugins/coreplugin/images/splitbutton_horizontal@2x.png b/src/libs/utils/images/splitbutton_horizontal@2x.png similarity index 100% rename from src/plugins/coreplugin/images/splitbutton_horizontal@2x.png rename to src/libs/utils/images/splitbutton_horizontal@2x.png diff --git a/src/plugins/coreplugin/images/splitbutton_vertical.png b/src/libs/utils/images/splitbutton_vertical.png similarity index 100% rename from src/plugins/coreplugin/images/splitbutton_vertical.png rename to src/libs/utils/images/splitbutton_vertical.png diff --git a/src/plugins/coreplugin/images/splitbutton_vertical@2x.png b/src/libs/utils/images/splitbutton_vertical@2x.png similarity index 100% rename from src/plugins/coreplugin/images/splitbutton_vertical@2x.png rename to src/libs/utils/images/splitbutton_vertical@2x.png diff --git a/src/plugins/coreplugin/images/stop_small.png b/src/libs/utils/images/stop_small.png similarity index 100% rename from src/plugins/coreplugin/images/stop_small.png rename to src/libs/utils/images/stop_small.png diff --git a/src/plugins/coreplugin/images/stop_small@2x.png b/src/libs/utils/images/stop_small@2x.png similarity index 100% rename from src/plugins/coreplugin/images/stop_small@2x.png rename to src/libs/utils/images/stop_small@2x.png diff --git a/src/plugins/coreplugin/images/undo.png b/src/libs/utils/images/undo.png similarity index 100% rename from src/plugins/coreplugin/images/undo.png rename to src/libs/utils/images/undo.png diff --git a/src/plugins/coreplugin/images/unknownfile.png b/src/libs/utils/images/unknownfile.png similarity index 100% rename from src/plugins/coreplugin/images/unknownfile.png rename to src/libs/utils/images/unknownfile.png diff --git a/src/plugins/coreplugin/images/warning.png b/src/libs/utils/images/warning.png similarity index 100% rename from src/plugins/coreplugin/images/warning.png rename to src/libs/utils/images/warning.png diff --git a/src/plugins/coreplugin/images/warning@2x.png b/src/libs/utils/images/warning@2x.png similarity index 100% rename from src/plugins/coreplugin/images/warning@2x.png rename to src/libs/utils/images/warning@2x.png diff --git a/src/plugins/coreplugin/images/warningfill.png b/src/libs/utils/images/warningfill.png similarity index 100% rename from src/plugins/coreplugin/images/warningfill.png rename to src/libs/utils/images/warningfill.png diff --git a/src/plugins/coreplugin/images/warningfill@2x.png b/src/libs/utils/images/warningfill@2x.png similarity index 100% rename from src/plugins/coreplugin/images/warningfill@2x.png rename to src/libs/utils/images/warningfill@2x.png diff --git a/src/libs/utils/utils.qrc b/src/libs/utils/utils.qrc index 7e18b4e2310..ac3129ec17e 100644 --- a/src/libs/utils/utils.qrc +++ b/src/libs/utils/utils.qrc @@ -31,5 +31,118 @@ images/notloaded@2x.png images/ok.png images/ok@2x.png + + images/clean_pane_small.png + images/clean_pane_small@2x.png + images/compile_error_taskbar.png + images/compile_error_taskbar@2x.png + images/dir.png + images/editcopy.png + images/editcut.png + images/editpaste.png + images/empty14.png + images/filenew.png + images/fileopen.png + images/filesave.png + images/filesave@2x.png + images/logo/128/QtProject-qtcreator.png + images/logo/256/QtProject-qtcreator.png + images/inputfield.png + images/inputfield@2x.png + images/inputfield_disabled.png + images/inputfield_disabled@2x.png + images/close.png + images/close@2x.png + images/linkicon.png + images/linkicon@2x.png + images/magnifier.png + images/magnifier@2x.png + images/minus.png + images/minus@2x.png + images/panel_button.png + images/panel_button@2x.png + images/panel_button_checked.png + images/panel_button_checked@2x.png + images/panel_button_checked_hover.png + images/panel_button_checked_hover@2x.png + images/panel_button_hover.png + images/panel_button_hover@2x.png + images/panel_button_pressed.png + images/panel_button_pressed@2x.png + images/plus.png + images/plus@2x.png + images/redo.png + images/replace_a.png + images/replace_a@2x.png + images/replace_b.png + images/replace_b@2x.png + images/reset.png + images/sidebaricon.png + images/sidebaricon@2x.png + images/splitbutton_horizontal.png + images/splitbutton_horizontal@2x.png + images/undo.png + images/unknownfile.png + images/extension.png + images/extension@2x.png + images/category_core.png + images/category_texteditor.png + images/category_design.png + images/progressbar.png + images/progressbar@2x.png + images/help.png + images/editclear.png + images/editclear@2x.png + images/arrowdown.png + images/arrowdown@2x.png + images/arrowup.png + images/arrowup@2x.png + images/category_locator.png + images/filtericon.png + images/filtericon@2x.png + images/splitbutton_closebottom.png + images/splitbutton_closebottom@2x.png + images/splitbutton_closeleft.png + images/splitbutton_closeleft@2x.png + images/splitbutton_closeright.png + images/splitbutton_closeright@2x.png + images/splitbutton_closetop.png + images/splitbutton_closetop@2x.png + images/splitbutton_vertical.png + images/splitbutton_vertical@2x.png + images/panel_manage_button.png + images/panel_manage_button@2x.png + images/reload_gray.png + images/reload_gray@2x.png + images/error.png + images/error@2x.png + images/warning.png + images/warning@2x.png + images/info.png + images/info@2x.png + images/warningfill.png + images/warningfill@2x.png + images/dark_fileicon.png + images/dark_foldericon.png + images/Desktop.png + images/interrupt_small.png + images/interrupt_small@2x.png + images/run_small.png + images/run_small@2x.png + images/stop_small.png + images/stop_small@2x.png + images/boundingrect.png + images/boundingrect@2x.png + images/eye_closed.png + images/eye_closed@2x.png + images/eye_open.png + images/eye_open@2x.png + images/desktopdevicesmall.png + images/desktopdevicesmall@2x.png + images/reset@2x.png + images/collapse.png + images/collapse@2x.png + images/expand.png + images/expand@2x.png diff --git a/src/libs/utils/utilsicons.h b/src/libs/utils/utilsicons.h index 28f271dff00..b730af00758 100644 --- a/src/libs/utils/utilsicons.h +++ b/src/libs/utils/utilsicons.h @@ -30,32 +30,158 @@ namespace Utils { namespace Icons { -const Utils::Icon EDIT_CLEAR({ - {QLatin1String(":/core/images/editclear.png"), Utils::Theme::PanelTextColorMid}}, Utils::Icon::Tint); -const Utils::Icon LOCKED_TOOLBAR({ +const Icon EDIT_CLEAR({ + {QLatin1String(":/utils/images/editclear.png"), Utils::Theme::PanelTextColorMid}}, Icon::Tint); +const Icon LOCKED_TOOLBAR({ {QLatin1String(":/utils/images/locked.png"), Utils::Theme::IconsBaseColor}}); -const Utils::Icon LOCKED({ +const Icon LOCKED({ {QLatin1String(":/utils/images/locked.png"), Utils::Theme::PanelTextColorDark}}, Icon::Tint); -const Utils::Icon UNLOCKED_TOOLBAR({ +const Icon UNLOCKED_TOOLBAR({ {QLatin1String(":/utils/images/unlocked.png"), Utils::Theme::IconsBaseColor}}); -const Utils::Icon NEXT({ - {QLatin1String(":/utils/images/next.png"), Utils::Theme::IconsWarningColor}}, Utils::Icon::MenuTintedStyle); -const Utils::Icon NEXT_TOOLBAR({ +const Icon NEXT({ + {QLatin1String(":/utils/images/next.png"), Utils::Theme::IconsWarningColor}}, Icon::MenuTintedStyle); +const Icon NEXT_TOOLBAR({ {QLatin1String(":/utils/images/next.png"), Utils::Theme::IconsNavigationArrowsColor}}); -const Utils::Icon PREV({ - {QLatin1String(":/utils/images/prev.png"), Utils::Theme::IconsWarningColor}}, Utils::Icon::MenuTintedStyle); -const Utils::Icon PREV_TOOLBAR({ +const Icon PREV({ + {QLatin1String(":/utils/images/prev.png"), Utils::Theme::IconsWarningColor}}, Icon::MenuTintedStyle); +const Icon PREV_TOOLBAR({ {QLatin1String(":/utils/images/prev.png"), Utils::Theme::IconsNavigationArrowsColor}}); -const Utils::Icon ZOOM({ - {QLatin1String(":/utils/images/zoom.png"), Utils::Theme::PanelTextColorMid}}, Utils::Icon::Tint); -const Utils::Icon ZOOM_TOOLBAR({ +const Icon ZOOM({ + {QLatin1String(":/utils/images/zoom.png"), Utils::Theme::PanelTextColorMid}}, Icon::Tint); +const Icon ZOOM_TOOLBAR({ {QLatin1String(":/utils/images/zoom.png"), Utils::Theme::IconsBaseColor}}); -const Utils::Icon OK({ +const Icon OK({ {QLatin1String(":/utils/images/ok.png"), Utils::Theme::IconsRunToolBarColor}}, Icon::Tint); -const Utils::Icon NOTLOADED({ +const Icon NOTLOADED({ {QLatin1String(":/utils/images/notloaded.png"), Utils::Theme::IconsErrorColor}}, Icon::Tint); const Utils::Icon BROKEN({ {QLatin1String(":/utils/images/broken.png"), Utils::Theme::IconsErrorColor}}, Icon::Tint); +const Icon ERROR({ + {QLatin1String(":/utils/images/warningfill.png"), Theme::BackgroundColorNormal}, + {QLatin1String(":/utils/images/error.png"), Theme::IconsErrorColor}}, Icon::Tint); + +const Icon NEWFILE( + QLatin1String(":/utils/images/filenew.png")); +const Icon OPENFILE( + QLatin1String(":/utils/images/fileopen.png")); +const Icon SAVEFILE({ + {QLatin1String(":/utils/images/filesave.png"), Theme::PanelTextColorMid}}, Icon::Tint); +const Icon SAVEFILE_TOOLBAR({ + {QLatin1String(":/utils/images/filesave.png"), Theme::IconsBaseColor}}); +const Icon UNDO( + QLatin1String(":/utils/images/undo.png")); +const Icon REDO( + QLatin1String(":/utils/images/redo.png")); +const Icon COPY( + QLatin1String(":/utils/images/editcopy.png")); +const Icon PASTE( + QLatin1String(":/utils/images/editpaste.png")); +const Icon CUT( + QLatin1String(":/utils/images/editcut.png")); +const Icon DIR( + QLatin1String(":/utils/images/dir.png")); +const Icon RESET({ + {QLatin1String(":/utils/images/reset.png"), Theme::PanelTextColorMid}}, Icon::Tint); +const Icon RESET_TOOLBAR({ + {QLatin1String(":/utils/images/reset.png"), Theme::IconsBaseColor}}); +const Icon DARK_CLOSE( + QLatin1String(":/utils/images/darkclose.png")); +const Icon QTCREATORLOGO_BIG( + QLatin1String(":/utils/images/qtcreatorlogo-big.png")); + +const Icon ARROW_UP({ + {QLatin1String(":/utils/images/arrowup.png"), Theme::IconsBaseColor}}); +const Icon ARROW_DOWN({ + {QLatin1String(":/utils/images/arrowdown.png"), Theme::IconsBaseColor}}); +const Icon MINUS({ + {QLatin1String(":/utils/images/minus.png"), Theme::IconsBaseColor}}); +const Icon PLUS({ + {QLatin1String(":/utils/images/plus.png"), Theme::IconsBaseColor}}); +const Icon MAGNIFIER({ + {QLatin1String(":/utils/images/magnifier.png"), Theme::PanelTextColorMid}}, Icon::Tint); +const Icon CLEAN({ + {QLatin1String(":/utils/images/clean_pane_small.png"), Theme::PanelTextColorMid}}, Icon::Tint); +const Icon CLEAN_TOOLBAR({ + {QLatin1String(":/utils/images/clean_pane_small.png"), Theme::IconsBaseColor}}); +const Icon RELOAD({ + {QLatin1String(":/utils/images/reload_gray.png"), Theme::IconsBaseColor}}); +const Icon TOGGLE_SIDEBAR({ + {QLatin1String(":/utils/images/sidebaricon.png"), Theme::PanelTextColorMid}}, Icon::MenuTintedStyle); +const Icon TOGGLE_SIDEBAR_TOOLBAR({ + {QLatin1String(":/utils/images/sidebaricon.png"), Theme::IconsBaseColor}}); +const Icon CLOSE_TOOLBAR({ + {QLatin1String(":/utils/images/close.png"), Theme::IconsBaseColor}}); +const Icon CLOSE_FOREGROUND({ + {QLatin1String(":/utils/images/close.png"), Theme::PanelTextColorDark}}, Icon::Tint); +const Icon CLOSE_BACKGROUND({ + {QLatin1String(":/utils/images/close.png"), Theme::PanelTextColorLight}}, Icon::Tint); +const Icon SPLIT_HORIZONTAL({ + {QLatin1String(":/utils/images/splitbutton_horizontal.png"), Theme::PanelTextColorMid}}, Icon::MenuTintedStyle); +const Icon SPLIT_HORIZONTAL_TOOLBAR({ + {QLatin1String(":/utils/images/splitbutton_horizontal.png"), Theme::IconsBaseColor}}); +const Icon SPLIT_VERTICAL({ + {QLatin1String(":/utils/images/splitbutton_vertical.png"), Theme::PanelTextColorMid}}, Icon::MenuTintedStyle); +const Icon SPLIT_VERTICAL_TOOLBAR({ + {QLatin1String(":/utils/images/splitbutton_vertical.png"), Theme::IconsBaseColor}}); +const Icon CLOSE_SPLIT_TOP({ + {QLatin1String(":/utils/images/splitbutton_closetop.png"), Theme::IconsBaseColor}}); +const Icon CLOSE_SPLIT_BOTTOM({ + {QLatin1String(":/utils/images/splitbutton_closebottom.png"), Theme::IconsBaseColor}}); +const Icon CLOSE_SPLIT_LEFT({ + {QLatin1String(":/utils/images/splitbutton_closeleft.png"), Theme::IconsBaseColor}}); +const Icon CLOSE_SPLIT_RIGHT({ + {QLatin1String(":/utils/images/splitbutton_closeright.png"), Theme::IconsBaseColor}}); +const Icon FILTER({ + {QLatin1String(":/utils/images/filtericon.png"), Theme::IconsBaseColor}}); +const Icon LINK({ + {QLatin1String(":/utils/images/linkicon.png"), Theme::IconsBaseColor}}); +const Icon WARNING({ + {QLatin1String(":/utils/images/warningfill.png"), Theme::BackgroundColorNormal}, + {QLatin1String(":/utils/images/warning.png"), Theme::IconsWarningColor}}, Icon::Tint); +const Icon WARNING_TOOLBAR({ + {QLatin1String(":/utils/images/warning.png"), Theme::IconsWarningToolBarColor}}); +const Icon ERROR_TOOLBAR({ + {QLatin1String(":/utils/images/error.png"), Theme::IconsErrorToolBarColor}}); +const Icon ERROR_TASKBAR({ + {QLatin1String(":/utils/images/compile_error_taskbar.png"), Theme::IconsErrorColor}}, Icon::Tint); +const Icon INFO({ + {QLatin1String(":/utils/images/warningfill.png"), Theme::BackgroundColorNormal}, + {QLatin1String(":/utils/images/info.png"), Theme::IconsInfoColor}}, Icon::Tint); +const Icon INFO_TOOLBAR({ + {QLatin1String(":/utils/images/info.png"), Theme::IconsInfoToolBarColor}}); +const Icon EXPAND_ALL_TOOLBAR({ + {QLatin1String(":/find/images/expand.png"), Theme::IconsBaseColor}}); +const Icon TOOLBAR_EXTENSION({ + {QLatin1String(":/utils/images/extension.png"), Theme::IconsBaseColor}}); +const Icon RUN_SMALL({ + {QLatin1String(":/utils/images/run_small.png"), Utils::Theme::IconsRunColor}}, Icon::MenuTintedStyle); +const Icon RUN_SMALL_TOOLBAR({ + {QLatin1String(":/utils/images/run_small.png"), Utils::Theme::IconsRunToolBarColor}}); +const Icon STOP_SMALL({ + {QLatin1String(":/utils/images/stop_small.png"), Utils::Theme::IconsStopColor}}, Icon::MenuTintedStyle); +const Icon STOP_SMALL_TOOLBAR({ + {QLatin1String(":/utils/images/stop_small.png"), Utils::Theme::IconsStopToolBarColor}}); +const Icon INTERRUPT_SMALL({ + {QLatin1String(":/utils/images/interrupt_small.png"), Utils::Theme::IconsInterruptColor}}, Icon::MenuTintedStyle); +const Icon INTERRUPT_SMALL_TOOLBAR({ + {QLatin1String(":/utils/images/interrupt_small.png"), Utils::Theme::IconsInterruptToolBarColor}}); +const Icon BOUNDING_RECT({ + {QLatin1String(":/utils/images/boundingrect.png"), Theme::IconsBaseColor}}); +const Icon EYE_OPEN_TOOLBAR({ + {QLatin1String(":/utils/images/eye_open.png"), Theme::IconsBaseColor}}); +const Icon EYE_CLOSED_TOOLBAR({ + {QLatin1String(":/utils/images/eye_closed.png"), Theme::IconsBaseColor}}); +const Icon REPLACE({ + {QLatin1String(":/utils/images/replace_a.png"), Theme::PanelTextColorMid}, + {QLatin1String(":/utils/images/replace_b.png"), Theme::IconsInfoColor}}, Icon::Tint); +const Icon EXPAND({ + {QLatin1String(":/utils/images/expand.png"), Theme::PanelTextColorMid}}, Icon::Tint); +const Icon EXPAND_TOOLBAR({ + {QLatin1String(":/utils/images/expand.png"), Theme::IconsBaseColor}}); +const Icon COLLAPSE({ + {QLatin1String(":/utils/images/collapse.png"), Theme::PanelTextColorMid}}, Icon::Tint); +const Icon COLLAPSE_TOOLBAR({ + {QLatin1String(":/utils/images/collapse.png"), Theme::IconsBaseColor}}); } // namespace Icons } // namespace Utils diff --git a/src/plugins/android/androidbuildapkwidget.cpp b/src/plugins/android/androidbuildapkwidget.cpp index 28d4b75de94..3f28bf932ea 100644 --- a/src/plugins/android/androidbuildapkwidget.cpp +++ b/src/plugins/android/androidbuildapkwidget.cpp @@ -31,7 +31,6 @@ #include "androidmanager.h" #include "ui_androidbuildapkwidget.h" -#include #include #include #include @@ -39,6 +38,7 @@ #include #include +#include #include @@ -85,10 +85,10 @@ AndroidBuildApkWidget::AndroidBuildApkWidget(AndroidBuildApkStep *step) m_ui->KeystoreLocationPathChooser->setInitialBrowsePathBackup(QDir::homePath()); m_ui->KeystoreLocationPathChooser->setPromptDialogFilter(tr("Keystore files (*.keystore *.jks)")); m_ui->KeystoreLocationPathChooser->setPromptDialogTitle(tr("Select Keystore File")); - m_ui->signingDebugWarningIcon->setPixmap(Core::Icons::WARNING.pixmap()); + m_ui->signingDebugWarningIcon->setPixmap(Utils::Icons::WARNING.pixmap()); m_ui->signingDebugWarningIcon->hide(); m_ui->signingDebugWarningLabel->hide(); - m_ui->signingDebugDeployErrorIcon->setPixmap(Core::Icons::ERROR.pixmap()); + m_ui->signingDebugDeployErrorIcon->setPixmap(Utils::Icons::ERROR.pixmap()); signPackageCheckBoxToggled(m_step->signPackage()); m_ui->useGradleCheckBox->setChecked(m_step->useGradle()); diff --git a/src/plugins/android/androidmanifesteditorwidget.cpp b/src/plugins/android/androidmanifesteditorwidget.cpp index 891bfa4461b..cba5ecab1a2 100644 --- a/src/plugins/android/androidmanifesteditorwidget.cpp +++ b/src/plugins/android/androidmanifesteditorwidget.cpp @@ -30,7 +30,6 @@ #include "androidmanager.h" #include "androidqtsupport.h" -#include #include #include #include @@ -45,6 +44,7 @@ #include #include #include +#include #include #include @@ -162,7 +162,7 @@ void AndroidManifestEditorWidget::initializePage() m_packageNameWarning->setVisible(false); m_packageNameWarningIcon = new QLabel; - m_packageNameWarningIcon->setPixmap(Core::Icons::WARNING.pixmap()); + m_packageNameWarningIcon->setPixmap(Utils::Icons::WARNING.pixmap()); m_packageNameWarningIcon->setVisible(false); m_packageNameWarningIcon->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed); diff --git a/src/plugins/android/androidpotentialkit.cpp b/src/plugins/android/androidpotentialkit.cpp index 17139d3425c..2d8ae41cb65 100644 --- a/src/plugins/android/androidpotentialkit.cpp +++ b/src/plugins/android/androidpotentialkit.cpp @@ -28,6 +28,8 @@ #include "androidconfigurations.h" #include +#include + #include #include #include @@ -87,7 +89,7 @@ AndroidPotentialKitWidget::AndroidPotentialKitWidget(QWidget *parent) : Utils::DetailsWidget(parent) { setSummaryText(QLatin1String("Android has not been configured. Create Android kits.")); - setIcon(Core::Icons::WARNING.icon()); + setIcon(Utils::Icons::WARNING.icon()); //detailsWidget->setState(Utils::DetailsWidget::NoSummary); auto mainWidget = new QWidget(this); setWidget(mainWidget); diff --git a/src/plugins/android/androidruncontrol.cpp b/src/plugins/android/androidruncontrol.cpp index 119b86b17d0..b7d8c92004f 100644 --- a/src/plugins/android/androidruncontrol.cpp +++ b/src/plugins/android/androidruncontrol.cpp @@ -29,7 +29,7 @@ #include "androidrunconfiguration.h" #include "androidrunner.h" -#include +#include #include @@ -44,7 +44,7 @@ AndroidRunControl::AndroidRunControl(AndroidRunConfiguration *rc) , m_running(false) { setRunnable(m_runner->runnable()); - setIcon(Core::Icons::RUN_SMALL_TOOLBAR); + setIcon(Utils::Icons::RUN_SMALL_TOOLBAR); } AndroidRunControl::~AndroidRunControl() diff --git a/src/plugins/android/androidsettingswidget.cpp b/src/plugins/android/androidsettingswidget.cpp index bdd7c0e2673..e313e261521 100644 --- a/src/plugins/android/androidsettingswidget.cpp +++ b/src/plugins/android/androidsettingswidget.cpp @@ -31,11 +31,11 @@ #include "androidconstants.h" #include "androidtoolchain.h" -#include #include #include #include #include +#include #include #include #include @@ -170,11 +170,11 @@ AndroidSettingsWidget::AndroidSettingsWidget(QWidget *parent) m_ui->downloadAntToolButton->setVisible(!Utils::HostOsInfo::isLinuxHost()); m_ui->downloadOpenJDKToolButton->setVisible(!Utils::HostOsInfo::isLinuxHost()); - const QPixmap warningPixmap = Core::Icons::WARNING.pixmap(); + const QPixmap warningPixmap = Utils::Icons::WARNING.pixmap(); m_ui->jdkWarningIconLabel->setPixmap(warningPixmap); m_ui->kitWarningIconLabel->setPixmap(warningPixmap); - const QPixmap errorPixmap = Core::Icons::ERROR.pixmap(); + const QPixmap errorPixmap = Utils::Icons::ERROR.pixmap(); m_ui->sdkWarningIconLabel->setPixmap(errorPixmap); m_ui->gdbWarningIconLabel->setPixmap(errorPixmap); m_ui->ndkWarningIconLabel->setPixmap(errorPixmap); diff --git a/src/plugins/android/avddialog.cpp b/src/plugins/android/avddialog.cpp index 1996560846f..647e1aaf1e4 100644 --- a/src/plugins/android/avddialog.cpp +++ b/src/plugins/android/avddialog.cpp @@ -26,8 +26,8 @@ #include "avddialog.h" #include "androidconfigurations.h" -#include #include +#include #include #include @@ -57,7 +57,7 @@ AvdDialog::AvdDialog(int minApiLevel, const QString &targetArch, const AndroidCo m_avdDialog.nameLineEdit->setValidator(v); m_avdDialog.nameLineEdit->installEventFilter(this); - m_avdDialog.warningIcon->setPixmap(Core::Icons::WARNING.pixmap()); + m_avdDialog.warningIcon->setPixmap(Utils::Icons::WARNING.pixmap()); updateApiLevelComboBox(); diff --git a/src/plugins/autotest/testnavigationwidget.cpp b/src/plugins/autotest/testnavigationwidget.cpp index 2b08551159e..4618520019c 100644 --- a/src/plugins/autotest/testnavigationwidget.cpp +++ b/src/plugins/autotest/testnavigationwidget.cpp @@ -37,10 +37,10 @@ #include #include #include -#include #include #include #include +#include #include #include @@ -204,7 +204,7 @@ QList TestNavigationWidget::createToolButtons() QList list; m_filterButton = new QToolButton(m_view); - m_filterButton->setIcon(Core::Icons::FILTER.icon()); + m_filterButton->setIcon(Utils::Icons::FILTER.icon()); m_filterButton->setToolTip(tr("Filter Test Tree")); m_filterButton->setProperty("noArrow", true); m_filterButton->setAutoRaise(true); @@ -220,11 +220,11 @@ QList TestNavigationWidget::createToolButtons() m_sort->setToolTip(tr("Sort Naturally")); QToolButton *expand = new QToolButton(this); - expand->setIcon(Core::Icons::EXPAND_TOOLBAR.icon()); + expand->setIcon(Utils::Icons::EXPAND_TOOLBAR.icon()); expand->setToolTip(tr("Expand All")); QToolButton *collapse = new QToolButton(this); - collapse->setIcon(Core::Icons::COLLAPSE_TOOLBAR.icon()); + collapse->setIcon(Utils::Icons::COLLAPSE_TOOLBAR.icon()); collapse->setToolTip(tr("Collapse All")); connect(expand, &QToolButton::clicked, m_view, &TestTreeView::expandAll); diff --git a/src/plugins/autotest/testresultspane.cpp b/src/plugins/autotest/testresultspane.cpp index 05168391afa..b027192aa93 100644 --- a/src/plugins/autotest/testresultspane.cpp +++ b/src/plugins/autotest/testresultspane.cpp @@ -34,7 +34,6 @@ #include "testcodeparser.h" #include -#include #include #include #include @@ -45,6 +44,7 @@ #include #include +#include #include #include @@ -146,7 +146,7 @@ TestResultsPane::TestResultsPane(QObject *parent) : void TestResultsPane::createToolButtons() { m_expandCollapse = new QToolButton(m_treeView); - m_expandCollapse->setIcon(Core::Icons::EXPAND_ALL_TOOLBAR.icon()); + m_expandCollapse->setIcon(Utils::Icons::EXPAND_ALL_TOOLBAR.icon()); m_expandCollapse->setToolTip(tr("Expand All")); m_expandCollapse->setCheckable(true); m_expandCollapse->setChecked(false); @@ -158,13 +158,13 @@ void TestResultsPane::createToolButtons() }); m_runAll = new QToolButton(m_treeView); - m_runAll->setIcon(Core::Icons::RUN_SMALL_TOOLBAR.icon()); + m_runAll->setIcon(Utils::Icons::RUN_SMALL_TOOLBAR.icon()); m_runAll->setToolTip(tr("Run All Tests")); m_runAll->setEnabled(false); connect(m_runAll, &QToolButton::clicked, this, &TestResultsPane::onRunAllTriggered); m_runSelected = new QToolButton(m_treeView); - Utils::Icon runSelectedIcon = Core::Icons::RUN_SMALL_TOOLBAR; + Utils::Icon runSelectedIcon = Utils::Icons::RUN_SMALL_TOOLBAR; foreach (const Utils::IconMaskAndColor &maskAndColor, Icons::RUN_SELECTED_OVERLAY) runSelectedIcon.append(maskAndColor); m_runSelected->setIcon(runSelectedIcon.icon()); @@ -173,13 +173,13 @@ void TestResultsPane::createToolButtons() connect(m_runSelected, &QToolButton::clicked, this, &TestResultsPane::onRunSelectedTriggered); m_stopTestRun = new QToolButton(m_treeView); - m_stopTestRun->setIcon(Core::Icons::STOP_SMALL_TOOLBAR.icon()); + m_stopTestRun->setIcon(Utils::Icons::STOP_SMALL_TOOLBAR.icon()); m_stopTestRun->setToolTip(tr("Stop Test Run")); m_stopTestRun->setEnabled(false); connect(m_stopTestRun, &QToolButton::clicked, TestRunner::instance(), &TestRunner::requestStopTestRun); m_filterButton = new QToolButton(m_treeView); - m_filterButton->setIcon(Core::Icons::FILTER.icon()); + m_filterButton->setIcon(Utils::Icons::FILTER.icon()); m_filterButton->setToolTip(tr("Filter Test Results")); m_filterButton->setProperty("noArrow", true); m_filterButton->setAutoRaise(true); diff --git a/src/plugins/autotest/testsettingspage.cpp b/src/plugins/autotest/testsettingspage.cpp index 82d84e1dcd0..c316829430f 100644 --- a/src/plugins/autotest/testsettingspage.cpp +++ b/src/plugins/autotest/testsettingspage.cpp @@ -30,9 +30,9 @@ #include "testtreemodel.h" #include -#include #include +#include namespace Autotest { namespace Internal { @@ -45,7 +45,7 @@ TestSettingsWidget::TestSettingsWidget(QWidget *parent) m_ui.perfRB->setEnabled(Utils::HostOsInfo::isLinuxHost()); // according to docs perf Linux only m_ui.frameworksWarnIcon->setVisible(false); - m_ui.frameworksWarnIcon->setPixmap(Core::Icons::WARNING.pixmap()); + m_ui.frameworksWarnIcon->setPixmap(Utils::Icons::WARNING.pixmap()); m_ui.frameworksWarn->setVisible(false); m_ui.frameworksWarn->setText(tr("No active test frameworks.")); m_ui.frameworksWarn->setToolTip(tr("You will not be able to use the AutoTest plugin without " diff --git a/src/plugins/baremetal/baremetalrunconfigurationwidget.cpp b/src/plugins/baremetal/baremetalrunconfigurationwidget.cpp index e446a53a111..4973ba16a8b 100644 --- a/src/plugins/baremetal/baremetalrunconfigurationwidget.cpp +++ b/src/plugins/baremetal/baremetalrunconfigurationwidget.cpp @@ -26,9 +26,9 @@ #include "baremetalrunconfigurationwidget.h" #include "baremetalrunconfiguration.h" -#include #include #include +#include #include #include @@ -111,7 +111,7 @@ void BareMetalRunConfigurationWidget::addDisabledLabel(QVBoxLayout *topLayout) { QHBoxLayout * const hl = new QHBoxLayout; hl->addStretch(); - d->disabledIcon.setPixmap(Core::Icons::WARNING.pixmap()); + d->disabledIcon.setPixmap(Utils::Icons::WARNING.pixmap()); hl->addWidget(&d->disabledIcon); d->disabledReason.setVisible(false); hl->addWidget(&d->disabledReason); diff --git a/src/plugins/cmakeprojectmanager/cmakebuildsettingswidget.cpp b/src/plugins/cmakeprojectmanager/cmakebuildsettingswidget.cpp index 34a22d6330e..013f2c2bb8e 100644 --- a/src/plugins/cmakeprojectmanager/cmakebuildsettingswidget.cpp +++ b/src/plugins/cmakeprojectmanager/cmakebuildsettingswidget.cpp @@ -29,7 +29,6 @@ #include "cmakeproject.h" #include "cmakebuildconfiguration.h" -#include #include #include #include @@ -39,6 +38,7 @@ #include #include #include +#include #include #include @@ -100,7 +100,7 @@ CMakeBuildSettingsWidget::CMakeBuildSettingsWidget(CMakeBuildConfiguration *bc) ++row; m_errorLabel = new QLabel; - m_errorLabel->setPixmap(Core::Icons::ERROR.pixmap()); + m_errorLabel->setPixmap(Utils::Icons::ERROR.pixmap()); m_errorLabel->setVisible(false); m_errorMessageLabel = new QLabel; m_errorMessageLabel->setVisible(false); @@ -111,7 +111,7 @@ CMakeBuildSettingsWidget::CMakeBuildSettingsWidget(CMakeBuildConfiguration *bc) ++row; m_warningLabel = new QLabel; - m_warningLabel->setPixmap(Core::Icons::WARNING.pixmap()); + m_warningLabel->setPixmap(Utils::Icons::WARNING.pixmap()); m_warningLabel->setVisible(false); m_warningMessageLabel = new QLabel; m_warningMessageLabel->setVisible(false); diff --git a/src/plugins/coreplugin/core.qrc b/src/plugins/coreplugin/core.qrc index e88ca8c6740..c131b817b03 100644 --- a/src/plugins/coreplugin/core.qrc +++ b/src/plugins/coreplugin/core.qrc @@ -1,116 +1,5 @@ - images/clean_pane_small.png - images/clean_pane_small@2x.png - images/compile_error_taskbar.png - images/compile_error_taskbar@2x.png - images/dir.png - images/editcopy.png - images/editcut.png - images/editpaste.png - images/empty14.png - images/filenew.png - images/fileopen.png - images/filesave.png - images/filesave@2x.png - images/logo/128/QtProject-qtcreator.png - images/logo/256/QtProject-qtcreator.png - images/inputfield.png - images/inputfield@2x.png - images/inputfield_disabled.png - images/inputfield_disabled@2x.png - images/close.png - images/close@2x.png - images/linkicon.png - images/linkicon@2x.png - images/magnifier.png - images/magnifier@2x.png - images/minus.png - images/minus@2x.png - images/panel_button.png - images/panel_button@2x.png - images/panel_button_checked.png - images/panel_button_checked@2x.png - images/panel_button_checked_hover.png - images/panel_button_checked_hover@2x.png - images/panel_button_hover.png - images/panel_button_hover@2x.png - images/panel_button_pressed.png - images/panel_button_pressed@2x.png - images/plus.png - images/plus@2x.png - images/redo.png - images/replace_a.png - images/replace_a@2x.png - images/replace_b.png - images/replace_b@2x.png - images/reset.png - images/sidebaricon.png - images/sidebaricon@2x.png - images/splitbutton_horizontal.png - images/splitbutton_horizontal@2x.png - images/undo.png - images/unknownfile.png - images/extension.png - images/extension@2x.png - images/category_core.png - images/category_texteditor.png - images/category_design.png - images/progressbar.png - images/progressbar@2x.png - images/help.png - images/editclear.png - images/editclear@2x.png - images/arrowdown.png - images/arrowdown@2x.png - images/arrowup.png - images/arrowup@2x.png - images/category_locator.png - images/filtericon.png - images/filtericon@2x.png - images/splitbutton_closebottom.png - images/splitbutton_closebottom@2x.png - images/splitbutton_closeleft.png - images/splitbutton_closeleft@2x.png - images/splitbutton_closeright.png - images/splitbutton_closeright@2x.png - images/splitbutton_closetop.png - images/splitbutton_closetop@2x.png - images/splitbutton_vertical.png - images/splitbutton_vertical@2x.png - images/panel_manage_button.png - images/panel_manage_button@2x.png - images/reload_gray.png - images/reload_gray@2x.png - images/error.png - images/error@2x.png - images/warning.png - images/warning@2x.png - images/info.png - images/info@2x.png - images/warningfill.png - images/warningfill@2x.png - images/dark_fileicon.png - images/dark_foldericon.png - images/Desktop.png - images/interrupt_small.png - images/interrupt_small@2x.png - images/run_small.png - images/run_small@2x.png - images/stop_small.png - images/stop_small@2x.png - images/boundingrect.png - images/boundingrect@2x.png - images/eye_closed.png - images/eye_closed@2x.png - images/eye_open.png - images/eye_open@2x.png - images/desktopdevicesmall.png - images/desktopdevicesmall@2x.png - images/reset@2x.png - images/collapse.png - images/collapse@2x.png - images/expand.png - images/expand@2x.png + diff --git a/src/plugins/coreplugin/coreicons.cpp b/src/plugins/coreplugin/coreicons.cpp index 5727821c713..d4b48d90adf 100644 --- a/src/plugins/coreplugin/coreicons.cpp +++ b/src/plugins/coreplugin/coreicons.cpp @@ -30,32 +30,6 @@ using namespace Utils; namespace Core { namespace Icons { -const Icon NEWFILE( - QLatin1String(":/core/images/filenew.png")); -const Icon OPENFILE( - QLatin1String(":/core/images/fileopen.png")); -const Icon SAVEFILE({ - {QLatin1String(":/core/images/filesave.png"), Theme::PanelTextColorMid}}, Icon::Tint); -const Icon SAVEFILE_TOOLBAR({ - {QLatin1String(":/core/images/filesave.png"), Theme::IconsBaseColor}}); -const Icon UNDO( - QLatin1String(":/core/images/undo.png")); -const Icon REDO( - QLatin1String(":/core/images/redo.png")); -const Icon COPY( - QLatin1String(":/core/images/editcopy.png")); -const Icon PASTE( - QLatin1String(":/core/images/editpaste.png")); -const Icon CUT( - QLatin1String(":/core/images/editcut.png")); -const Icon DIR( - QLatin1String(":/core/images/dir.png")); -const Icon RESET({ - {QLatin1String(":/core/images/reset.png"), Theme::PanelTextColorMid}}, Icon::Tint); -const Icon RESET_TOOLBAR({ - {QLatin1String(":/core/images/reset.png"), Theme::IconsBaseColor}}); -const Icon DARK_CLOSE( - QLatin1String(":/core/images/darkclose.png")); const Icon FIND_CASE_INSENSITIVELY( QLatin1String(":/find/images/casesensitively.png")); const Icon FIND_WHOLE_WORD( @@ -64,105 +38,6 @@ const Icon FIND_REGEXP( QLatin1String(":/find/images/regexp.png")); const Icon FIND_PRESERVE_CASE( QLatin1String(":/find/images/preservecase.png")); -const Icon QTCREATORLOGO_BIG( - QLatin1String(":/core/images/qtcreatorlogo-big.png")); - -const Icon ARROW_UP({ - {QLatin1String(":/core/images/arrowup.png"), Theme::IconsBaseColor}}); -const Icon ARROW_DOWN({ - {QLatin1String(":/core/images/arrowdown.png"), Theme::IconsBaseColor}}); -const Icon MINUS({ - {QLatin1String(":/core/images/minus.png"), Theme::IconsBaseColor}}); -const Icon PLUS({ - {QLatin1String(":/core/images/plus.png"), Theme::IconsBaseColor}}); -const Icon MAGNIFIER({ - {QLatin1String(":/core/images/magnifier.png"), Theme::PanelTextColorMid}}, Icon::Tint); -const Icon CLEAN({ - {QLatin1String(":/core/images/clean_pane_small.png"), Theme::PanelTextColorMid}}, Utils::Icon::Tint); -const Icon CLEAN_TOOLBAR({ - {QLatin1String(":/core/images/clean_pane_small.png"), Theme::IconsBaseColor}}); -const Icon RELOAD({ - {QLatin1String(":/core/images/reload_gray.png"), Theme::IconsBaseColor}}); -const Icon TOGGLE_SIDEBAR({ - {QLatin1String(":/core/images/sidebaricon.png"), Theme::PanelTextColorMid}}, Icon::MenuTintedStyle); -const Icon TOGGLE_SIDEBAR_TOOLBAR({ - {QLatin1String(":/core/images/sidebaricon.png"), Theme::IconsBaseColor}}); -const Icon CLOSE_TOOLBAR({ - {QLatin1String(":/core/images/close.png"), Theme::IconsBaseColor}}); -const Icon CLOSE_FOREGROUND({ - {QLatin1String(":/core/images/close.png"), Theme::PanelTextColorDark}}, Icon::Tint); -const Icon CLOSE_BACKGROUND({ - {QLatin1String(":/core/images/close.png"), Theme::PanelTextColorLight}}, Icon::Tint); -const Icon SPLIT_HORIZONTAL({ - {QLatin1String(":/core/images/splitbutton_horizontal.png"), Theme::PanelTextColorMid}}, Icon::MenuTintedStyle); -const Icon SPLIT_HORIZONTAL_TOOLBAR({ - {QLatin1String(":/core/images/splitbutton_horizontal.png"), Theme::IconsBaseColor}}); -const Icon SPLIT_VERTICAL({ - {QLatin1String(":/core/images/splitbutton_vertical.png"), Theme::PanelTextColorMid}}, Icon::MenuTintedStyle); -const Icon SPLIT_VERTICAL_TOOLBAR({ - {QLatin1String(":/core/images/splitbutton_vertical.png"), Theme::IconsBaseColor}}); -const Icon CLOSE_SPLIT_TOP({ - {QLatin1String(":/core/images/splitbutton_closetop.png"), Theme::IconsBaseColor}}); -const Icon CLOSE_SPLIT_BOTTOM({ - {QLatin1String(":/core/images/splitbutton_closebottom.png"), Theme::IconsBaseColor}}); -const Icon CLOSE_SPLIT_LEFT({ - {QLatin1String(":/core/images/splitbutton_closeleft.png"), Theme::IconsBaseColor}}); -const Icon CLOSE_SPLIT_RIGHT({ - {QLatin1String(":/core/images/splitbutton_closeright.png"), Theme::IconsBaseColor}}); -const Icon FILTER({ - {QLatin1String(":/core/images/filtericon.png"), Theme::IconsBaseColor}}); -const Icon LINK({ - {QLatin1String(":/core/images/linkicon.png"), Theme::IconsBaseColor}}); -const Icon WARNING({ - {QLatin1String(":/core/images/warningfill.png"), Theme::BackgroundColorNormal}, - {QLatin1String(":/core/images/warning.png"), Theme::IconsWarningColor}}, Icon::Tint); -const Icon WARNING_TOOLBAR({ - {QLatin1String(":/core/images/warning.png"), Theme::IconsWarningToolBarColor}}); -const Icon ERROR({ - {QLatin1String(":/core/images/warningfill.png"), Theme::BackgroundColorNormal}, - {QLatin1String(":/core/images/error.png"), Theme::IconsErrorColor}}, Icon::Tint); -const Icon ERROR_TOOLBAR({ - {QLatin1String(":/core/images/error.png"), Theme::IconsErrorToolBarColor}}); -const Icon ERROR_TASKBAR({ - {QLatin1String(":/core/images/compile_error_taskbar.png"), Theme::IconsErrorColor}}, Icon::Tint); -const Icon INFO({ - {QLatin1String(":/core/images/warningfill.png"), Theme::BackgroundColorNormal}, - {QLatin1String(":/core/images/info.png"), Theme::IconsInfoColor}}, Icon::Tint); -const Icon INFO_TOOLBAR({ - {QLatin1String(":/core/images/info.png"), Theme::IconsInfoToolBarColor}}); -const Icon EXPAND_ALL_TOOLBAR({ - {QLatin1String(":/find/images/expand.png"), Theme::IconsBaseColor}}); -const Icon TOOLBAR_EXTENSION({ - {QLatin1String(":/core/images/extension.png"), Theme::IconsBaseColor}}); -const Utils::Icon RUN_SMALL({ - {QLatin1String(":/core/images/run_small.png"), Utils::Theme::IconsRunColor}}, Utils::Icon::MenuTintedStyle); -const Utils::Icon RUN_SMALL_TOOLBAR({ - {QLatin1String(":/core/images/run_small.png"), Utils::Theme::IconsRunToolBarColor}}); -const Utils::Icon STOP_SMALL({ - {QLatin1String(":/core/images/stop_small.png"), Utils::Theme::IconsStopColor}}, Utils::Icon::MenuTintedStyle); -const Utils::Icon STOP_SMALL_TOOLBAR({ - {QLatin1String(":/core/images/stop_small.png"), Utils::Theme::IconsStopToolBarColor}}); -const Utils::Icon INTERRUPT_SMALL({ - {QLatin1String(":/core/images/interrupt_small.png"), Utils::Theme::IconsInterruptColor}}, Utils::Icon::MenuTintedStyle); -const Utils::Icon INTERRUPT_SMALL_TOOLBAR({ - {QLatin1String(":/core/images/interrupt_small.png"), Utils::Theme::IconsInterruptToolBarColor}}); -const Icon BOUNDING_RECT({ - {QLatin1String(":/core/images/boundingrect.png"), Theme::IconsBaseColor}}); -const Icon EYE_OPEN_TOOLBAR({ - {QLatin1String(":/core/images/eye_open.png"), Theme::IconsBaseColor}}); -const Icon EYE_CLOSED_TOOLBAR({ - {QLatin1String(":/core/images/eye_closed.png"), Theme::IconsBaseColor}}); -const Icon REPLACE({ - {QLatin1String(":/core/images/replace_a.png"), Theme::PanelTextColorMid}, - {QLatin1String(":/core/images/replace_b.png"), Theme::IconsInfoColor}}, Icon::Tint); -const Icon EXPAND({ - {QLatin1String(":/core/images/expand.png"), Theme::PanelTextColorMid}}, Utils::Icon::Tint); -const Icon EXPAND_TOOLBAR({ - {QLatin1String(":/core/images/expand.png"), Theme::IconsBaseColor}}); -const Icon COLLAPSE({ - {QLatin1String(":/core/images/collapse.png"), Theme::PanelTextColorMid}}, Utils::Icon::Tint); -const Icon COLLAPSE_TOOLBAR({ - {QLatin1String(":/core/images/collapse.png"), Theme::IconsBaseColor}}); const Icon MODE_EDIT_CLASSIC( QLatin1String(":/fancyactionbar/images/mode_Edit.png")); diff --git a/src/plugins/coreplugin/coreicons.h b/src/plugins/coreplugin/coreicons.h index 7882edf5e4e..be6e40cffc7 100644 --- a/src/plugins/coreplugin/coreicons.h +++ b/src/plugins/coreplugin/coreicons.h @@ -32,72 +32,10 @@ namespace Core { namespace Icons { -CORE_EXPORT extern const Utils::Icon NEWFILE; -CORE_EXPORT extern const Utils::Icon OPENFILE; -CORE_EXPORT extern const Utils::Icon SAVEFILE; -CORE_EXPORT extern const Utils::Icon SAVEFILE_TOOLBAR; -CORE_EXPORT extern const Utils::Icon UNDO; -CORE_EXPORT extern const Utils::Icon REDO; -CORE_EXPORT extern const Utils::Icon COPY; -CORE_EXPORT extern const Utils::Icon PASTE; -CORE_EXPORT extern const Utils::Icon CUT; -CORE_EXPORT extern const Utils::Icon DIR; -CORE_EXPORT extern const Utils::Icon RESET; -CORE_EXPORT extern const Utils::Icon RESET_TOOLBAR; -CORE_EXPORT extern const Utils::Icon DARK_CLOSE; CORE_EXPORT extern const Utils::Icon FIND_CASE_INSENSITIVELY; CORE_EXPORT extern const Utils::Icon FIND_WHOLE_WORD; CORE_EXPORT extern const Utils::Icon FIND_REGEXP; CORE_EXPORT extern const Utils::Icon FIND_PRESERVE_CASE; -CORE_EXPORT extern const Utils::Icon QTCREATORLOGO_BIG; - -CORE_EXPORT extern const Utils::Icon ARROW_UP; -CORE_EXPORT extern const Utils::Icon ARROW_DOWN; -CORE_EXPORT extern const Utils::Icon MINUS; -CORE_EXPORT extern const Utils::Icon PLUS; -CORE_EXPORT extern const Utils::Icon MAGNIFIER; -CORE_EXPORT extern const Utils::Icon CLEAN; -CORE_EXPORT extern const Utils::Icon CLEAN_TOOLBAR; -CORE_EXPORT extern const Utils::Icon RELOAD; -CORE_EXPORT extern const Utils::Icon TOGGLE_SIDEBAR; -CORE_EXPORT extern const Utils::Icon TOGGLE_SIDEBAR_TOOLBAR; -CORE_EXPORT extern const Utils::Icon CLOSE_TOOLBAR; -CORE_EXPORT extern const Utils::Icon CLOSE_FOREGROUND; -CORE_EXPORT extern const Utils::Icon CLOSE_BACKGROUND; -CORE_EXPORT extern const Utils::Icon SPLIT_HORIZONTAL; -CORE_EXPORT extern const Utils::Icon SPLIT_HORIZONTAL_TOOLBAR; -CORE_EXPORT extern const Utils::Icon SPLIT_VERTICAL; -CORE_EXPORT extern const Utils::Icon SPLIT_VERTICAL_TOOLBAR; -CORE_EXPORT extern const Utils::Icon CLOSE_SPLIT_TOP; -CORE_EXPORT extern const Utils::Icon CLOSE_SPLIT_BOTTOM; -CORE_EXPORT extern const Utils::Icon CLOSE_SPLIT_LEFT; -CORE_EXPORT extern const Utils::Icon CLOSE_SPLIT_RIGHT; -CORE_EXPORT extern const Utils::Icon FILTER; -CORE_EXPORT extern const Utils::Icon LINK; -CORE_EXPORT extern const Utils::Icon WARNING; -CORE_EXPORT extern const Utils::Icon WARNING_TOOLBAR; -CORE_EXPORT extern const Utils::Icon ERROR; -CORE_EXPORT extern const Utils::Icon ERROR_TOOLBAR; -CORE_EXPORT extern const Utils::Icon ERROR_TASKBAR; -CORE_EXPORT extern const Utils::Icon INFO; -CORE_EXPORT extern const Utils::Icon INFO_TOOLBAR; -CORE_EXPORT extern const Utils::Icon EXPAND_ALL_TOOLBAR; -CORE_EXPORT extern const Utils::Icon TOOLBAR_EXTENSION; -CORE_EXPORT extern const Utils::Icon RUN_SMALL; -CORE_EXPORT extern const Utils::Icon RUN_SMALL_TOOLBAR; -CORE_EXPORT extern const Utils::Icon STOP_SMALL; -CORE_EXPORT extern const Utils::Icon STOP_SMALL_TOOLBAR; -CORE_EXPORT extern const Utils::Icon INTERRUPT_SMALL; -CORE_EXPORT extern const Utils::Icon INTERRUPT_SMALL_TOOLBAR; -CORE_EXPORT extern const Utils::Icon BOUNDING_RECT; -CORE_EXPORT extern const Utils::Icon EYE_OPEN_TOOLBAR; -CORE_EXPORT extern const Utils::Icon EYE_CLOSED_TOOLBAR; -CORE_EXPORT extern const Utils::Icon REPLACE; -CORE_EXPORT extern const Utils::Icon EXPAND; -CORE_EXPORT extern const Utils::Icon EXPAND_TOOLBAR; -CORE_EXPORT extern const Utils::Icon COLLAPSE; -CORE_EXPORT extern const Utils::Icon COLLAPSE_TOOLBAR; - CORE_EXPORT extern const Utils::Icon MODE_EDIT_CLASSIC; CORE_EXPORT extern const Utils::Icon MODE_EDIT_FLAT; CORE_EXPORT extern const Utils::Icon MODE_EDIT_FLAT_ACTIVE; diff --git a/src/plugins/coreplugin/dialogs/newdialog.cpp b/src/plugins/coreplugin/dialogs/newdialog.cpp index 5506b067a1c..15d0511eb4c 100644 --- a/src/plugins/coreplugin/dialogs/newdialog.cpp +++ b/src/plugins/coreplugin/dialogs/newdialog.cpp @@ -26,11 +26,11 @@ #include "newdialog.h" #include "ui_newdialog.h" -#include #include #include #include #include +#include #include #include @@ -267,7 +267,7 @@ void NewDialog::setWizardFactories(QList factories, parentItem->appendRow(filesKindItem); if (m_dummyIcon.isNull()) - m_dummyIcon = Core::Icons::NEWFILE.icon(); + m_dummyIcon = Utils::Icons::NEWFILE.icon(); QSet availablePlatforms = IWizardFactory::allAvailablePlatforms(); m_ui->comboBox->addItem(tr("All Templates"), Id().toSetting()); diff --git a/src/plugins/coreplugin/editormanager/editormanager.cpp b/src/plugins/coreplugin/editormanager/editormanager.cpp index bac887e510f..7201e7d0cfa 100644 --- a/src/plugins/coreplugin/editormanager/editormanager.cpp +++ b/src/plugins/coreplugin/editormanager/editormanager.cpp @@ -37,7 +37,6 @@ #include #include #include -#include #include #include #include @@ -376,13 +375,14 @@ void EditorManagerPrivate::init() connect(m_goForwardAction, &QAction::triggered, m_instance, &EditorManager::goForwardInNavigationHistory); - m_splitAction = new QAction(Icons::SPLIT_HORIZONTAL.icon(), tr("Split"), this); + m_splitAction = new QAction(Utils::Icons::SPLIT_HORIZONTAL.icon(), tr("Split"), this); cmd = ActionManager::registerAction(m_splitAction, Constants::SPLIT, editManagerContext); cmd->setDefaultKeySequence(QKeySequence(UseMacShortcuts ? tr("Meta+E,2") : tr("Ctrl+E,2"))); mwindow->addAction(cmd, Constants::G_WINDOW_SPLIT); connect(m_splitAction, &QAction::triggered, this, [this]() { split(Qt::Vertical); }); - m_splitSideBySideAction = new QAction(Icons::SPLIT_VERTICAL.icon(), tr("Split Side by Side"), this); + m_splitSideBySideAction = new QAction(Utils::Icons::SPLIT_VERTICAL.icon(), + tr("Split Side by Side"), this); cmd = ActionManager::registerAction(m_splitSideBySideAction, Constants::SPLIT_SIDE_BY_SIDE, editManagerContext); cmd->setDefaultKeySequence(QKeySequence(UseMacShortcuts ? tr("Meta+E,3") : tr("Ctrl+E,3"))); mwindow->addAction(cmd, Constants::G_WINDOW_SPLIT); diff --git a/src/plugins/coreplugin/editormanager/editorview.cpp b/src/plugins/coreplugin/editormanager/editorview.cpp index 059bf7cd1ff..4bbad3ff42f 100644 --- a/src/plugins/coreplugin/editormanager/editorview.cpp +++ b/src/plugins/coreplugin/editormanager/editorview.cpp @@ -32,7 +32,6 @@ #include #include -#include #include #include #include @@ -41,6 +40,7 @@ #include #include #include +#include #include @@ -740,11 +740,11 @@ void SplitterOrView::split(Qt::Orientation orientation) view->view()->setCurrentEditor(duplicate); if (orientation == Qt::Horizontal) { - view->view()->setCloseSplitIcon(Icons::CLOSE_SPLIT_LEFT.icon()); - otherView->view()->setCloseSplitIcon(Icons::CLOSE_SPLIT_RIGHT.icon()); + view->view()->setCloseSplitIcon(Utils::Icons::CLOSE_SPLIT_LEFT.icon()); + otherView->view()->setCloseSplitIcon(Utils::Icons::CLOSE_SPLIT_RIGHT.icon()); } else { - view->view()->setCloseSplitIcon(Icons::CLOSE_SPLIT_TOP.icon()); - otherView->view()->setCloseSplitIcon(Icons::CLOSE_SPLIT_BOTTOM.icon()); + view->view()->setCloseSplitIcon(Utils::Icons::CLOSE_SPLIT_TOP.icon()); + otherView->view()->setCloseSplitIcon(Utils::Icons::CLOSE_SPLIT_BOTTOM.icon()); } EditorManagerPrivate::activateView(otherView->view()); @@ -834,12 +834,12 @@ void SplitterOrView::unsplit() if (parentSplitter) { // not the toplevel splitterOrView if (parentSplitter->orientation() == Qt::Horizontal) m_view->setCloseSplitIcon(parentSplitter->widget(0) == this ? - Icons::CLOSE_SPLIT_LEFT.icon() - : Icons::CLOSE_SPLIT_RIGHT.icon()); + Utils::Icons::CLOSE_SPLIT_LEFT.icon() + : Utils::Icons::CLOSE_SPLIT_RIGHT.icon()); else m_view->setCloseSplitIcon(parentSplitter->widget(0) == this ? - Icons::CLOSE_SPLIT_TOP.icon() - : Icons::CLOSE_SPLIT_BOTTOM.icon()); + Utils::Icons::CLOSE_SPLIT_TOP.icon() + : Utils::Icons::CLOSE_SPLIT_BOTTOM.icon()); } } m_layout->setCurrentWidget(m_view); diff --git a/src/plugins/coreplugin/editormanager/openeditorsview.cpp b/src/plugins/coreplugin/editormanager/openeditorsview.cpp index 8277e17e1bf..c85514cae9d 100644 --- a/src/plugins/coreplugin/editormanager/openeditorsview.cpp +++ b/src/plugins/coreplugin/editormanager/openeditorsview.cpp @@ -28,10 +28,11 @@ #include "ieditor.h" #include "documentmodel.h" -#include #include #include +#include + #include #include @@ -45,7 +46,7 @@ using namespace Core::Internal; OpenEditorsWidget::OpenEditorsWidget() { setWindowTitle(tr("Open Documents")); - setWindowIcon(Icons::DIR.icon()); + setWindowIcon(Utils::Icons::DIR.icon()); setDragEnabled(true); setDragDropMode(QAbstractItemView::DragOnly); diff --git a/src/plugins/coreplugin/editortoolbar.cpp b/src/plugins/coreplugin/editortoolbar.cpp index c7425849770..466598129f8 100644 --- a/src/plugins/coreplugin/editortoolbar.cpp +++ b/src/plugins/coreplugin/editortoolbar.cpp @@ -27,7 +27,6 @@ #include #include -#include #include #include #include @@ -100,8 +99,10 @@ EditorToolBarPrivate::EditorToolBarPrivate(QWidget *parent, EditorToolBar *q) : m_backButton(new QToolButton(q)), m_forwardButton(new QToolButton(q)), m_splitButton(new QToolButton(q)), - m_horizontalSplitAction(new QAction(Icons::SPLIT_HORIZONTAL.icon(), EditorManager::tr("Split"), parent)), - m_verticalSplitAction(new QAction(Icons::SPLIT_VERTICAL.icon(), EditorManager::tr("Split Side by Side"), parent)), + m_horizontalSplitAction(new QAction(Utils::Icons::SPLIT_HORIZONTAL.icon(), + EditorManager::tr("Split"), parent)), + m_verticalSplitAction(new QAction(Utils::Icons::SPLIT_VERTICAL.icon(), + EditorManager::tr("Split Side by Side"), parent)), m_splitNewWindowAction(new QAction(EditorManager::tr("Open in New Window"), parent)), m_closeSplitButton(new QToolButton(q)), m_activeToolBar(0), @@ -148,7 +149,7 @@ EditorToolBar::EditorToolBar(QWidget *parent) : d->m_editorList->setContextMenuPolicy(Qt::CustomContextMenu); d->m_closeEditorButton->setAutoRaise(true); - d->m_closeEditorButton->setIcon(Icons::CLOSE_TOOLBAR.icon()); + d->m_closeEditorButton->setIcon(Utils::Icons::CLOSE_TOOLBAR.icon()); d->m_closeEditorButton->setEnabled(false); d->m_closeEditorButton->setProperty("showborder", true); @@ -164,7 +165,7 @@ EditorToolBar::EditorToolBar(QWidget *parent) : d->m_splitNewWindowAction->setIconVisibleInMenu(false); } - d->m_splitButton->setIcon(Icons::SPLIT_HORIZONTAL_TOOLBAR.icon()); + d->m_splitButton->setIcon(Utils::Icons::SPLIT_HORIZONTAL_TOOLBAR.icon()); d->m_splitButton->setToolTip(tr("Split")); d->m_splitButton->setPopupMode(QToolButton::InstantPopup); d->m_splitButton->setProperty("noArrow", true); @@ -175,7 +176,7 @@ EditorToolBar::EditorToolBar(QWidget *parent) : d->m_splitButton->setMenu(splitMenu); d->m_closeSplitButton->setAutoRaise(true); - d->m_closeSplitButton->setIcon(Icons::CLOSE_SPLIT_BOTTOM.icon()); + d->m_closeSplitButton->setIcon(Utils::Icons::CLOSE_SPLIT_BOTTOM.icon()); QHBoxLayout *toplayout = new QHBoxLayout(this); toplayout->setSpacing(0); diff --git a/src/plugins/coreplugin/find/findtoolbar.cpp b/src/plugins/coreplugin/find/findtoolbar.cpp index 3159843f9f1..443c757e97d 100644 --- a/src/plugins/coreplugin/find/findtoolbar.cpp +++ b/src/plugins/coreplugin/find/findtoolbar.cpp @@ -666,7 +666,7 @@ void FindToolBar::updateIcons() bool regexp = effectiveFlags & FindRegularExpression; bool preserveCase = effectiveFlags & FindPreserveCase; if (!casesensitive && !wholewords && !regexp && !preserveCase) { - const QPixmap pixmap = Icons::MAGNIFIER.pixmap(); + const QPixmap pixmap = Utils::Icons::MAGNIFIER.pixmap(); m_ui.findEdit->setButtonPixmap(Utils::FancyLineEdit::Left, pixmap); } else { m_ui.findEdit->setButtonPixmap(Utils::FancyLineEdit::Left, @@ -961,13 +961,13 @@ void FindToolBar::setLightColoredIcon(bool lightColored) m_ui.findNextButton->setArrowType(Qt::RightArrow); m_ui.findPreviousButton->setIcon(QIcon()); m_ui.findPreviousButton->setArrowType(Qt::LeftArrow); - m_ui.close->setIcon(Icons::CLOSE_FOREGROUND.icon()); + m_ui.close->setIcon(Utils::Icons::CLOSE_FOREGROUND.icon()); } else { m_ui.findNextButton->setIcon(Utils::Icons::NEXT_TOOLBAR.icon()); m_ui.findNextButton->setArrowType(Qt::NoArrow); m_ui.findPreviousButton->setIcon(Utils::Icons::PREV_TOOLBAR.icon()); m_ui.findPreviousButton->setArrowType(Qt::NoArrow); - m_ui.close->setIcon(Icons::CLOSE_TOOLBAR.icon()); + m_ui.close->setIcon(Utils::Icons::CLOSE_TOOLBAR.icon()); } } diff --git a/src/plugins/coreplugin/find/searchresultwindow.cpp b/src/plugins/coreplugin/find/searchresultwindow.cpp index abf0f36da17..d639ce272f2 100644 --- a/src/plugins/coreplugin/find/searchresultwindow.cpp +++ b/src/plugins/coreplugin/find/searchresultwindow.cpp @@ -30,10 +30,10 @@ #include #include #include -#include #include #include #include +#include #include #include @@ -136,7 +136,7 @@ namespace Internal { m_expandCollapseButton->setAutoRaise(true); m_expandCollapseAction->setCheckable(true); - m_expandCollapseAction->setIcon(Core::Icons::EXPAND_ALL_TOOLBAR.icon()); + m_expandCollapseAction->setIcon(Utils::Icons::EXPAND_ALL_TOOLBAR.icon()); Command *cmd = ActionManager::registerAction(m_expandCollapseAction, "Find.ExpandAll"); cmd->setAttribute(Command::CA_UpdateText); m_expandCollapseButton->setDefaultAction(cmd->action()); diff --git a/src/plugins/coreplugin/infobar.cpp b/src/plugins/coreplugin/infobar.cpp index ec7cf9b366e..405681c5809 100644 --- a/src/plugins/coreplugin/infobar.cpp +++ b/src/plugins/coreplugin/infobar.cpp @@ -25,10 +25,10 @@ #include "infobar.h" -#include "coreicons.h" #include "icore.h" #include +#include #include #include @@ -246,7 +246,7 @@ void InfoBarDisplay::update() if (info.cancelButtonText.isEmpty()) { infoWidgetCloseButton->setAutoRaise(true); - infoWidgetCloseButton->setIcon(Icons::CLOSE_FOREGROUND.icon()); + infoWidgetCloseButton->setIcon(Utils::Icons::CLOSE_FOREGROUND.icon()); infoWidgetCloseButton->setToolTip(tr("Close")); if (infoWidgetSuppressButton) hbox->addWidget(infoWidgetSuppressButton); diff --git a/src/plugins/coreplugin/locator/locatorwidget.cpp b/src/plugins/coreplugin/locator/locatorwidget.cpp index f7af2296ae2..2456501a3d0 100644 --- a/src/plugins/coreplugin/locator/locatorwidget.cpp +++ b/src/plugins/coreplugin/locator/locatorwidget.cpp @@ -29,7 +29,6 @@ #include "locatorsearchutils.h" #include "ilocatorfilter.h" -#include #include #include #include @@ -250,7 +249,7 @@ LocatorWidget::LocatorWidget(Locator *qop) : layout->addWidget(m_fileLineEdit); setWindowIcon(Utils::Icons::ZOOM.icon()); - const QPixmap pixmap = Icons::MAGNIFIER.pixmap(); + const QPixmap pixmap = Utils::Icons::MAGNIFIER.pixmap(); m_fileLineEdit->setFiltering(true); m_fileLineEdit->setButtonPixmap(Utils::FancyLineEdit::Left, pixmap); m_fileLineEdit->setButtonToolTip(Utils::FancyLineEdit::Left, tr("Options")); diff --git a/src/plugins/coreplugin/mainwindow.cpp b/src/plugins/coreplugin/mainwindow.cpp index fdad8feb019..83efbe06403 100644 --- a/src/plugins/coreplugin/mainwindow.cpp +++ b/src/plugins/coreplugin/mainwindow.cpp @@ -25,7 +25,6 @@ #include "mainwindow.h" #include "icore.h" -#include "coreicons.h" #include "jsexpander.h" #include "toolsettings.h" #include "mimetypesettings.h" @@ -76,6 +75,7 @@ #include #include #include +#include #include #include @@ -147,7 +147,7 @@ MainWindow::MainWindow() : setWindowTitle(tr("Qt Creator")); if (HostOsInfo::isLinuxHost()) - QApplication::setWindowIcon(Icons::QTCREATORLOGO_BIG.icon()); + QApplication::setWindowIcon(Utils::Icons::QTCREATORLOGO_BIG.icon()); QCoreApplication::setApplicationName(QLatin1String("QtCreator")); QCoreApplication::setApplicationVersion(QLatin1String(Constants::IDE_VERSION_LONG)); QCoreApplication::setOrganizationName(QLatin1String(Constants::IDE_SETTINGSVARIANT_STR)); @@ -506,7 +506,7 @@ void MainWindow::registerDefaultActions() connect(m_focusToEditor, &QAction::triggered, this, &MainWindow::setFocusToEditor); // New File Action - QIcon icon = QIcon::fromTheme(QLatin1String("document-new"), Icons::NEWFILE.icon()); + QIcon icon = QIcon::fromTheme(QLatin1String("document-new"), Utils::Icons::NEWFILE.icon()); m_newAction = new QAction(icon, tr("&New File or Project..."), this); cmd = ActionManager::registerAction(m_newAction, Constants::NEW); cmd->setDefaultKeySequence(QKeySequence::New); @@ -520,7 +520,7 @@ void MainWindow::registerDefaultActions() }); // Open Action - icon = QIcon::fromTheme(QLatin1String("document-open"), Icons::OPENFILE.icon()); + icon = QIcon::fromTheme(QLatin1String("document-open"), Utils::Icons::OPENFILE.icon()); m_openAction = new QAction(icon, tr("&Open File or Project..."), this); cmd = ActionManager::registerAction(m_openAction, Constants::OPEN); cmd->setDefaultKeySequence(QKeySequence::Open); @@ -540,7 +540,7 @@ void MainWindow::registerDefaultActions() ac->setOnAllDisabledBehavior(ActionContainer::Show); // Save Action - icon = QIcon::fromTheme(QLatin1String("document-save"), Icons::SAVEFILE.icon()); + icon = QIcon::fromTheme(QLatin1String("document-save"), Utils::Icons::SAVEFILE.icon()); QAction *tmpaction = new QAction(icon, EditorManager::tr("&Save"), this); tmpaction->setEnabled(false); cmd = ActionManager::registerAction(tmpaction, Constants::SAVE); @@ -584,7 +584,7 @@ void MainWindow::registerDefaultActions() connect(m_exitAction, &QAction::triggered, this, &MainWindow::exit); // Undo Action - icon = QIcon::fromTheme(QLatin1String("edit-undo"), Icons::UNDO.icon()); + icon = QIcon::fromTheme(QLatin1String("edit-undo"), Utils::Icons::UNDO.icon()); tmpaction = new QAction(icon, tr("&Undo"), this); cmd = ActionManager::registerAction(tmpaction, Constants::UNDO); cmd->setDefaultKeySequence(QKeySequence::Undo); @@ -594,7 +594,7 @@ void MainWindow::registerDefaultActions() tmpaction->setEnabled(false); // Redo Action - icon = QIcon::fromTheme(QLatin1String("edit-redo"), Icons::REDO.icon()); + icon = QIcon::fromTheme(QLatin1String("edit-redo"), Utils::Icons::REDO.icon()); tmpaction = new QAction(icon, tr("&Redo"), this); cmd = ActionManager::registerAction(tmpaction, Constants::REDO); cmd->setDefaultKeySequence(QKeySequence::Redo); @@ -604,7 +604,7 @@ void MainWindow::registerDefaultActions() tmpaction->setEnabled(false); // Cut Action - icon = QIcon::fromTheme(QLatin1String("edit-cut"), Icons::CUT.icon()); + icon = QIcon::fromTheme(QLatin1String("edit-cut"), Utils::Icons::CUT.icon()); tmpaction = new QAction(icon, tr("Cu&t"), this); cmd = ActionManager::registerAction(tmpaction, Constants::CUT); cmd->setDefaultKeySequence(QKeySequence::Cut); @@ -612,7 +612,7 @@ void MainWindow::registerDefaultActions() tmpaction->setEnabled(false); // Copy Action - icon = QIcon::fromTheme(QLatin1String("edit-copy"), Icons::COPY.icon()); + icon = QIcon::fromTheme(QLatin1String("edit-copy"), Utils::Icons::COPY.icon()); tmpaction = new QAction(icon, tr("&Copy"), this); cmd = ActionManager::registerAction(tmpaction, Constants::COPY); cmd->setDefaultKeySequence(QKeySequence::Copy); @@ -620,7 +620,7 @@ void MainWindow::registerDefaultActions() tmpaction->setEnabled(false); // Paste Action - icon = QIcon::fromTheme(QLatin1String("edit-paste"), Icons::PASTE.icon()); + icon = QIcon::fromTheme(QLatin1String("edit-paste"), Utils::Icons::PASTE.icon()); tmpaction = new QAction(icon, tr("&Paste"), this); cmd = ActionManager::registerAction(tmpaction, Constants::PASTE); cmd->setDefaultKeySequence(QKeySequence::Paste); @@ -694,7 +694,7 @@ void MainWindow::registerDefaultActions() } // Show Sidebar Action - m_toggleSideBarAction = new QAction(Icons::TOGGLE_SIDEBAR.icon(), + m_toggleSideBarAction = new QAction(Utils::Icons::TOGGLE_SIDEBAR.icon(), QCoreApplication::translate("Core", Constants::TR_SHOW_SIDEBAR), this); m_toggleSideBarAction->setCheckable(true); @@ -703,7 +703,8 @@ void MainWindow::registerDefaultActions() cmd->setDefaultKeySequence(QKeySequence(UseMacShortcuts ? tr("Ctrl+0") : tr("Alt+0"))); connect(m_toggleSideBarAction, &QAction::triggered, this, &MainWindow::setSidebarVisible); ProxyAction *toggleSideBarProxyAction = - ProxyAction::proxyActionWithIcon(cmd->action(), Core::Icons::TOGGLE_SIDEBAR_TOOLBAR.icon()); + ProxyAction::proxyActionWithIcon(cmd->action(), + Utils::Icons::TOGGLE_SIDEBAR_TOOLBAR.icon()); m_toggleSideBarButton->setDefaultAction(toggleSideBarProxyAction); mwindow->addAction(cmd, Constants::G_WINDOW_VIEWS); m_toggleSideBarAction->setEnabled(false); diff --git a/src/plugins/coreplugin/manhattanstyle.cpp b/src/plugins/coreplugin/manhattanstyle.cpp index 861962204dd..7f283049a3b 100644 --- a/src/plugins/coreplugin/manhattanstyle.cpp +++ b/src/plugins/coreplugin/manhattanstyle.cpp @@ -27,14 +27,13 @@ #include "styleanimator.h" -#include "coreicons.h" - #include #include #include #include #include +#include #include #include @@ -129,8 +128,8 @@ public: }; ManhattanStylePrivate::ManhattanStylePrivate() : - extButtonPixmap(Core::Icons::TOOLBAR_EXTENSION.pixmap()), - closeButtonPixmap(Core::Icons::CLOSE_FOREGROUND.pixmap()) + extButtonPixmap(Utils::Icons::TOOLBAR_EXTENSION.pixmap()), + closeButtonPixmap(Utils::Icons::CLOSE_FOREGROUND.pixmap()) { } diff --git a/src/plugins/coreplugin/navigationsubwidget.cpp b/src/plugins/coreplugin/navigationsubwidget.cpp index 8f39a16ce7b..25dc44e60c9 100644 --- a/src/plugins/coreplugin/navigationsubwidget.cpp +++ b/src/plugins/coreplugin/navigationsubwidget.cpp @@ -26,12 +26,12 @@ #include "navigationsubwidget.h" #include "navigationwidget.h" -#include "coreicons.h" #include "inavigationwidgetfactory.h" #include "actionmanager/command.h" #include "id.h" #include +#include #include @@ -70,7 +70,7 @@ NavigationSubWidget::NavigationSubWidget(NavigationWidget *parentWidget, int pos toolBarLayout->addWidget(m_navigationComboBox); QToolButton *splitAction = new QToolButton(); - splitAction->setIcon(Icons::SPLIT_HORIZONTAL_TOOLBAR.icon()); + splitAction->setIcon(Utils::Icons::SPLIT_HORIZONTAL_TOOLBAR.icon()); splitAction->setToolTip(tr("Split")); splitAction->setPopupMode(QToolButton::InstantPopup); splitAction->setProperty("noArrow", true); @@ -79,7 +79,7 @@ NavigationSubWidget::NavigationSubWidget(NavigationWidget *parentWidget, int pos connect(m_splitMenu, &QMenu::aboutToShow, this, &NavigationSubWidget::populateSplitMenu); m_closeButton = new QToolButton(); - m_closeButton->setIcon(Icons::CLOSE_SPLIT_BOTTOM.icon()); + m_closeButton->setIcon(Utils::Icons::CLOSE_SPLIT_BOTTOM.icon()); m_closeButton->setToolTip(tr("Close")); toolBarLayout->addWidget(splitAction); diff --git a/src/plugins/coreplugin/navigationwidget.cpp b/src/plugins/coreplugin/navigationwidget.cpp index 8f8f1435c27..287e519872b 100644 --- a/src/plugins/coreplugin/navigationwidget.cpp +++ b/src/plugins/coreplugin/navigationwidget.cpp @@ -27,7 +27,6 @@ #include "navigationsubwidget.h" #include "icontext.h" #include "icore.h" -#include "coreicons.h" #include "inavigationwidgetfactory.h" #include "modemanager.h" #include "actionmanager/actionmanager.h" @@ -35,6 +34,8 @@ #include "id.h" #include "imode.h" +#include + #include #include #include @@ -243,7 +244,7 @@ Internal::NavigationSubWidget *NavigationWidget::insertSubItem(int position,int } if (!d->m_subWidgets.isEmpty()) // Make all icons the bottom icon - d->m_subWidgets.at(0)->setCloseIcon(Icons::CLOSE_SPLIT_BOTTOM.icon()); + d->m_subWidgets.at(0)->setCloseIcon(Utils::Icons::CLOSE_SPLIT_BOTTOM.icon()); Internal::NavigationSubWidget *nsw = new Internal::NavigationSubWidget(this, position, index); connect(nsw, &Internal::NavigationSubWidget::splitMe, @@ -252,8 +253,8 @@ Internal::NavigationSubWidget *NavigationWidget::insertSubItem(int position,int insertWidget(position, nsw); d->m_subWidgets.insert(position, nsw); d->m_subWidgets.at(0)->setCloseIcon(d->m_subWidgets.size() == 1 - ? Icons::CLOSE_SPLIT_LEFT.icon() - : Icons::CLOSE_SPLIT_TOP.icon()); + ? Utils::Icons::CLOSE_SPLIT_LEFT.icon() + : Utils::Icons::CLOSE_SPLIT_TOP.icon()); return nsw; } @@ -296,8 +297,8 @@ void NavigationWidget::closeSubWidget() // update close button of top item if (d->m_subWidgets.size() == 1) d->m_subWidgets.at(0)->setCloseIcon(d->m_subWidgets.size() == 1 - ? Icons::CLOSE_SPLIT_LEFT.icon() - : Icons::CLOSE_SPLIT_TOP.icon()); + ? Utils::Icons::CLOSE_SPLIT_LEFT.icon() + : Utils::Icons::CLOSE_SPLIT_TOP.icon()); } else { setShown(false); } diff --git a/src/plugins/coreplugin/opendocumentstreeview.cpp b/src/plugins/coreplugin/opendocumentstreeview.cpp index b7da6cb0bee..13290846a36 100644 --- a/src/plugins/coreplugin/opendocumentstreeview.cpp +++ b/src/plugins/coreplugin/opendocumentstreeview.cpp @@ -25,7 +25,7 @@ #include "opendocumentstreeview.h" -#include "coreicons.h" +#include #include #include @@ -83,8 +83,8 @@ void OpenDocumentsDelegate::paint(QPainter *painter, const QStyleOptionViewItem if (closeButtonVisible && index.column() == 1 && option.state & QStyle::State_MouseOver) { const QIcon icon = (option.state & QStyle::State_Selected) ? - Icons::CLOSE_BACKGROUND.icon() - : Icons::CLOSE_FOREGROUND.icon(); + Utils::Icons::CLOSE_BACKGROUND.icon() + : Utils::Icons::CLOSE_FOREGROUND.icon(); QRect iconRect(option.rect.right() - option.rect.height(), option.rect.top(), diff --git a/src/plugins/coreplugin/outputpanemanager.cpp b/src/plugins/coreplugin/outputpanemanager.cpp index 289f01279de..6f2adf89d29 100644 --- a/src/plugins/coreplugin/outputpanemanager.cpp +++ b/src/plugins/coreplugin/outputpanemanager.cpp @@ -25,7 +25,6 @@ #include "outputpanemanager.h" #include "outputpane.h" -#include "coreicons.h" #include "findplaceholder.h" #include "icore.h" @@ -133,8 +132,8 @@ OutputPaneManager::OutputPaneManager(QWidget *parent) : m_prevAction(0), m_outputWidgetPane(new QStackedWidget), m_opToolBarWidgets(new QStackedWidget), - m_minimizeIcon(Icons::ARROW_DOWN.icon()), - m_maximizeIcon(Icons::ARROW_UP.icon()), + m_minimizeIcon(Utils::Icons::ARROW_DOWN.icon()), + m_maximizeIcon(Utils::Icons::ARROW_UP.icon()), m_outputPaneHeightSetting(0) { setWindowTitle(tr("Output")); @@ -142,7 +141,7 @@ OutputPaneManager::OutputPaneManager(QWidget *parent) : m_titleLabel->setContentsMargins(5, 0, 5, 0); m_clearAction = new QAction(this); - m_clearAction->setIcon(Icons::CLEAN.icon()); + m_clearAction->setIcon(Utils::Icons::CLEAN.icon()); m_clearAction->setText(tr("Clear")); connect(m_clearAction, &QAction::triggered, this, &OutputPaneManager::clearPage); @@ -229,7 +228,7 @@ void OutputPaneManager::init() cmd = ActionManager::registerAction(m_clearAction, "Coreplugin.OutputPane.clear"); m_clearButton->setDefaultAction(cmd->action()); - m_clearButton->setIcon(Icons::CLEAN_TOOLBAR.icon()); + m_clearButton->setIcon(Utils::Icons::CLEAN_TOOLBAR.icon()); mpanes->addAction(cmd, "Coreplugin.OutputPane.ActionsGroup"); cmd = ActionManager::registerAction(m_prevAction, "Coreplugin.OutputPane.previtem"); diff --git a/src/plugins/coreplugin/progressmanager/progressmanager_win.cpp b/src/plugins/coreplugin/progressmanager/progressmanager_win.cpp index c6d0fa848c5..5286ce007d4 100644 --- a/src/plugins/coreplugin/progressmanager/progressmanager_win.cpp +++ b/src/plugins/coreplugin/progressmanager/progressmanager_win.cpp @@ -35,7 +35,7 @@ #include #include -#include +#include #include "progressmanager_p.h" @@ -109,7 +109,7 @@ void Core::Internal::ProgressManagerPrivate::doSetApplicationLabel(const QString if (text.isEmpty()) { pITask->SetOverlayIcon(winId, NULL, NULL); } else { - QPixmap pix = Core::Icons::ERROR_TASKBAR.pixmap(); + QPixmap pix = Utils::Icons::ERROR_TASKBAR.pixmap(); pix.setDevicePixelRatio(1); // We want device-pixel sized font depending on the pix.height QPainter p(&pix); p.setPen(Qt::white); diff --git a/src/plugins/coreplugin/sidebar.cpp b/src/plugins/coreplugin/sidebar.cpp index 94bec43b82c..36e34f482f4 100644 --- a/src/plugins/coreplugin/sidebar.cpp +++ b/src/plugins/coreplugin/sidebar.cpp @@ -25,11 +25,11 @@ #include "sidebar.h" #include "sidebarwidget.h" -#include "coreicons.h" #include "actionmanager/command.h" #include #include +#include #include #include @@ -199,7 +199,7 @@ SideBarItem *SideBar::item(const QString &id) Internal::SideBarWidget *SideBar::insertSideBarWidget(int position, const QString &id) { if (!d->m_widgets.isEmpty()) - d->m_widgets.at(0)->setCloseIcon(Icons::CLOSE_SPLIT_BOTTOM.icon()); + d->m_widgets.at(0)->setCloseIcon(Utils::Icons::CLOSE_SPLIT_BOTTOM.icon()); Internal::SideBarWidget *item = new Internal::SideBarWidget(this, id); connect(item, &Internal::SideBarWidget::splitMe, this, &SideBar::splitSubWidget); @@ -209,8 +209,8 @@ Internal::SideBarWidget *SideBar::insertSideBarWidget(int position, const QStrin d->m_widgets.insert(position, item); if (d->m_widgets.size() == 1) d->m_widgets.at(0)->setCloseIcon(d->m_widgets.size() == 1 - ? Icons::CLOSE_SPLIT_LEFT.icon() - : Icons::CLOSE_SPLIT_TOP.icon()); + ? Utils::Icons::CLOSE_SPLIT_LEFT.icon() + : Utils::Icons::CLOSE_SPLIT_TOP.icon()); updateWidgets(); return item; } @@ -241,8 +241,8 @@ void SideBar::closeSubWidget() // update close button of top item if (d->m_widgets.size() == 1) d->m_widgets.at(0)->setCloseIcon(d->m_widgets.size() == 1 - ? Icons::CLOSE_SPLIT_LEFT.icon() - : Icons::CLOSE_SPLIT_TOP.icon()); + ? Utils::Icons::CLOSE_SPLIT_LEFT.icon() + : Utils::Icons::CLOSE_SPLIT_TOP.icon()); updateWidgets(); } else { if (d->m_closeWhenEmpty) { diff --git a/src/plugins/coreplugin/sidebarwidget.cpp b/src/plugins/coreplugin/sidebarwidget.cpp index 1a2e0e3716c..82c2e9ff4ad 100644 --- a/src/plugins/coreplugin/sidebarwidget.cpp +++ b/src/plugins/coreplugin/sidebarwidget.cpp @@ -27,9 +27,8 @@ #include "sidebar.h" #include "navigationsubwidget.h" -#include "coreicons.h" - #include +#include #include #include @@ -72,13 +71,13 @@ SideBarWidget::SideBarWidget(SideBar *sideBar, const QString &id) m_splitAction = new QAction(tr("Split"), m_toolbar); m_splitAction->setToolTip(tr("Split")); - m_splitAction->setIcon(Icons::SPLIT_HORIZONTAL_TOOLBAR.icon()); + m_splitAction->setIcon(Utils::Icons::SPLIT_HORIZONTAL_TOOLBAR.icon()); connect(m_splitAction, &QAction::triggered, this, &SideBarWidget::splitMe); m_toolbar->addAction(m_splitAction); m_closeAction = new QAction(tr("Close"), m_toolbar); m_closeAction->setToolTip(tr("Close")); - m_closeAction->setIcon(Icons::CLOSE_SPLIT_BOTTOM.icon()); + m_closeAction->setIcon(Utils::Icons::CLOSE_SPLIT_BOTTOM.icon()); connect(m_closeAction, &QAction::triggered, this, &SideBarWidget::closeMe); m_toolbar->addAction(m_closeAction); diff --git a/src/plugins/coreplugin/variablechooser.cpp b/src/plugins/coreplugin/variablechooser.cpp index 9dc79a15294..fc02e1b21fb 100644 --- a/src/plugins/coreplugin/variablechooser.cpp +++ b/src/plugins/coreplugin/variablechooser.cpp @@ -26,13 +26,12 @@ #include "variablechooser.h" #include "coreconstants.h" -#include - #include // IconButton #include // IconButton #include #include #include +#include #include #include @@ -89,7 +88,7 @@ public: void createIconButton() { m_iconButton = new IconButton; - m_iconButton->setPixmap(Core::Icons::REPLACE.pixmap()); + m_iconButton->setPixmap(Utils::Icons::REPLACE.pixmap()); m_iconButton->setToolTip(VariableChooser::tr("Insert Variable")); m_iconButton->hide(); connect(m_iconButton.data(), static_cast(&QAbstractButton::clicked), diff --git a/src/plugins/coreplugin/versiondialog.cpp b/src/plugins/coreplugin/versiondialog.cpp index 42f5e647daa..b58c53f829f 100644 --- a/src/plugins/coreplugin/versiondialog.cpp +++ b/src/plugins/coreplugin/versiondialog.cpp @@ -31,6 +31,7 @@ #include #include #include +#include #include #include @@ -47,7 +48,7 @@ VersionDialog::VersionDialog(QWidget *parent) // We need to set the window icon explicitly here since for some reason the // application icon isn't used when the size of the dialog is fixed (at least not on X11/GNOME) if (Utils::HostOsInfo::isLinuxHost()) - setWindowIcon(Icons::QTCREATORLOGO_BIG.icon()); + setWindowIcon(Utils::Icons::QTCREATORLOGO_BIG.icon()); setWindowTitle(tr("About Qt Creator")); setWindowFlags(windowFlags() & ~Qt::WindowContextHelpButtonHint); @@ -101,7 +102,7 @@ VersionDialog::VersionDialog(QWidget *parent) connect(buttonBox , &QDialogButtonBox::rejected, this, &QDialog::reject); QLabel *logoLabel = new QLabel; - logoLabel->setPixmap(Icons::QTCREATORLOGO_BIG.pixmap()); + logoLabel->setPixmap(Utils::Icons::QTCREATORLOGO_BIG.pixmap()); layout->addWidget(logoLabel , 0, 0, 1, 1); layout->addWidget(copyRightLabel, 0, 1, 4, 4); layout->addWidget(buttonBox, 4, 0, 1, 5); diff --git a/src/plugins/cppeditor/cppinsertvirtualmethods.cpp b/src/plugins/cppeditor/cppinsertvirtualmethods.cpp index ad496130711..c61e5bc31c5 100644 --- a/src/plugins/cppeditor/cppinsertvirtualmethods.cpp +++ b/src/plugins/cppeditor/cppinsertvirtualmethods.cpp @@ -26,7 +26,6 @@ #include "cppinsertvirtualmethods.h" #include "cppquickfixassistant.h" -#include #include #include #include @@ -39,6 +38,7 @@ #include #include #include +#include #include #include @@ -1021,7 +1021,7 @@ void InsertVirtualMethodsDialog::initGui() m_overrideReplacementComboBox, &QComboBox::setEnabled); QAction *clearUserAddedReplacements = new QAction(this); - clearUserAddedReplacements->setIcon(Core::Icons::CLEAN_TOOLBAR.icon()); + clearUserAddedReplacements->setIcon(Utils::Icons::CLEAN_TOOLBAR.icon()); clearUserAddedReplacements->setText(tr("Clear Added \"override\" Equivalents")); connect(clearUserAddedReplacements, &QAction::triggered, [this]() { m_availableOverrideReplacements = defaultOverrideReplacements(); diff --git a/src/plugins/debugger/analyzer/detailederrorview.cpp b/src/plugins/debugger/analyzer/detailederrorview.cpp index 38ea2f7a245..874e304aaa3 100644 --- a/src/plugins/debugger/analyzer/detailederrorview.cpp +++ b/src/plugins/debugger/analyzer/detailederrorview.cpp @@ -27,10 +27,10 @@ #include "diagnosticlocation.h" -#include #include #include +#include #include #include @@ -127,7 +127,7 @@ DetailedErrorView::DetailedErrorView(QWidget *parent) : setItemDelegateForColumn(LocationColumn, new Internal::DetailedErrorDelegate(this)); m_copyAction->setText(tr("Copy")); - m_copyAction->setIcon(Core::Icons::COPY.icon()); + m_copyAction->setIcon(Utils::Icons::COPY.icon()); m_copyAction->setShortcut(QKeySequence::Copy); m_copyAction->setShortcutContext(Qt::WidgetWithChildrenShortcut); connect(m_copyAction, &QAction::triggered, [this] { diff --git a/src/plugins/debugger/console/console.cpp b/src/plugins/debugger/console/console.cpp index 796809f7b4a..d75e7caa8bd 100644 --- a/src/plugins/debugger/console/console.cpp +++ b/src/plugins/debugger/console/console.cpp @@ -29,10 +29,10 @@ #include "consoleitemdelegate.h" #include -#include #include #include #include +#include #include #include @@ -108,7 +108,7 @@ Console::Console() m_showDebugButtonAction->setToolTip(tr("Show debug, log, and info messages.")); m_showDebugButtonAction->setCheckable(true); m_showDebugButtonAction->setChecked(true); - m_showDebugButtonAction->setIcon(Core::Icons::INFO_TOOLBAR.icon()); + m_showDebugButtonAction->setIcon(Utils::Icons::INFO_TOOLBAR.icon()); connect(m_showDebugButtonAction, &Utils::SavedAction::toggled, proxyModel, &ConsoleProxyModel::setShowLogs); m_showDebugButton->setDefaultAction(m_showDebugButtonAction); @@ -122,7 +122,7 @@ Console::Console() m_showWarningButtonAction->setToolTip(tr("Show warning messages.")); m_showWarningButtonAction->setCheckable(true); m_showWarningButtonAction->setChecked(true); - m_showWarningButtonAction->setIcon(Core::Icons::WARNING_TOOLBAR.icon()); + m_showWarningButtonAction->setIcon(Utils::Icons::WARNING_TOOLBAR.icon()); connect(m_showWarningButtonAction, &Utils::SavedAction::toggled, proxyModel, &ConsoleProxyModel::setShowWarnings); m_showWarningButton->setDefaultAction(m_showWarningButtonAction); @@ -136,7 +136,7 @@ Console::Console() m_showErrorButtonAction->setToolTip(tr("Show error messages.")); m_showErrorButtonAction->setCheckable(true); m_showErrorButtonAction->setChecked(true); - m_showErrorButtonAction->setIcon(Core::Icons::ERROR_TOOLBAR.icon()); + m_showErrorButtonAction->setIcon(Utils::Icons::ERROR_TOOLBAR.icon()); connect(m_showErrorButtonAction, &Utils::SavedAction::toggled, proxyModel, &ConsoleProxyModel::setShowErrors); m_showErrorButton->setDefaultAction(m_showErrorButtonAction); diff --git a/src/plugins/debugger/console/consoleitemdelegate.cpp b/src/plugins/debugger/console/consoleitemdelegate.cpp index 18860fbedad..9bcfecf19b3 100644 --- a/src/plugins/debugger/console/consoleitemdelegate.cpp +++ b/src/plugins/debugger/console/consoleitemdelegate.cpp @@ -27,7 +27,8 @@ #include "consoleedit.h" #include -#include + +#include #include #include @@ -66,11 +67,11 @@ namespace Internal { ConsoleItemDelegate::ConsoleItemDelegate(ConsoleItemModel *model, QObject *parent) : QStyledItemDelegate(parent), m_model(model), - m_logIcon(Core::Icons::INFO.icon()), - m_warningIcon(Core::Icons::WARNING.icon()), - m_errorIcon(Core::Icons::ERROR.icon()), - m_expandIcon(Core::Icons::EXPAND.icon()), - m_collapseIcon(Core::Icons::COLLAPSE.icon()), + m_logIcon(Utils::Icons::INFO.icon()), + m_warningIcon(Utils::Icons::WARNING.icon()), + m_errorIcon(Utils::Icons::ERROR.icon()), + m_expandIcon(Utils::Icons::EXPAND.icon()), + m_collapseIcon(Utils::Icons::COLLAPSE.icon()), m_prompt(QLatin1String(":/qmljstools/images/prompt.png")), m_cachedHeight(0) { diff --git a/src/plugins/debugger/debuggericons.cpp b/src/plugins/debugger/debuggericons.cpp index af974ac38bc..e16fd5cd0f4 100644 --- a/src/plugins/debugger/debuggericons.cpp +++ b/src/plugins/debugger/debuggericons.cpp @@ -40,9 +40,9 @@ const Icon BREAKPOINT_PENDING({ const Icon BREAKPOINTS( ":/debugger/images/debugger_breakpoints.png"); const Icon WATCHPOINT({ - {":/core/images/eye_open.png", Theme::TextColorNormal}}, Icon::Tint); + {":/utils/images/eye_open.png", Theme::TextColorNormal}}, Icon::Tint); const Icon TRACEPOINT({ - {":/core/images/eye_open.png", Theme::TextColorNormal}, + {":/utils/images/eye_open.png", Theme::TextColorNormal}, {":/debugger/images/tracepointoverlay.png", Theme::TextColorNormal}}, Icon::Tint | Icon::PunchEdges); const Icon CONTINUE( ":/debugger/images/debugger_continue.png"); @@ -64,16 +64,16 @@ const Icon INTERRUPT_FLAT({ {":/debugger/images/debugger_interrupt_mask.png", Theme::IconsInterruptToolBarColor}, {":/projectexplorer/images/debugger_beetle_mask.png", Theme::IconsDebugColor}}); const Icon DEBUG_INTERRUPT_SMALL({ - {":/core/images/interrupt_small.png", Theme::IconsInterruptColor}, + {":/utils/images/interrupt_small.png", Theme::IconsInterruptColor}, {":/projectexplorer/images/debugger_overlay_small.png", Theme::PanelTextColorMid}}, Icon::MenuTintedStyle); const Icon DEBUG_INTERRUPT_SMALL_TOOLBAR({ - {":/core/images/interrupt_small.png", Theme::IconsInterruptToolBarColor}, + {":/utils/images/interrupt_small.png", Theme::IconsInterruptToolBarColor}, {":/projectexplorer/images/debugger_overlay_small.png", Theme::IconsDebugColor}}); const Icon DEBUG_EXIT_SMALL({ - {":/core/images/stop_small.png", Theme::IconsStopColor}, + {":/utils/images/stop_small.png", Theme::IconsStopColor}, {":/projectexplorer/images/debugger_overlay_small.png", Theme::PanelTextColorMid}}, Icon::MenuTintedStyle); const Icon DEBUG_EXIT_SMALL_TOOLBAR({ - {":/core/images/stop_small.png", Theme::IconsStopToolBarColor}, + {":/utils/images/stop_small.png", Theme::IconsStopToolBarColor}, {":/projectexplorer/images/debugger_overlay_small.png", Theme::IconsDebugColor}}); const Icon LOCATION({ {":/debugger/images/location_background.png", Theme::IconsCodeModelOverlayForegroundColor}, diff --git a/src/plugins/debugger/debuggeritem.cpp b/src/plugins/debugger/debuggeritem.cpp index 9af62e949e4..647ae8e099c 100644 --- a/src/plugins/debugger/debuggeritem.cpp +++ b/src/plugins/debugger/debuggeritem.cpp @@ -29,7 +29,6 @@ #include "debuggeroptionspage.h" #include "debuggerprotocol.h" -#include #include #include @@ -37,6 +36,7 @@ #include #include #include +#include #include #include @@ -219,11 +219,11 @@ QDateTime DebuggerItem::lastModified() const QIcon DebuggerItem::decoration() const { if (m_engineType == NoEngineType) - return Core::Icons::ERROR.icon(); + return Utils::Icons::ERROR.icon(); if (!m_command.toFileInfo().isExecutable()) - return Core::Icons::WARNING.icon(); + return Utils::Icons::WARNING.icon(); if (!m_workingDirectory.isEmpty() && !m_workingDirectory.toFileInfo().isDir()) - return Core::Icons::WARNING.icon(); + return Utils::Icons::WARNING.icon(); return QIcon(); } diff --git a/src/plugins/debugger/debuggeroptionspage.cpp b/src/plugins/debugger/debuggeroptionspage.cpp index 757a6a44d29..ab02978a26b 100644 --- a/src/plugins/debugger/debuggeroptionspage.cpp +++ b/src/plugins/debugger/debuggeroptionspage.cpp @@ -27,8 +27,6 @@ #include "debuggeritemmanager.h" #include "debuggeritem.h" -#include - #include #include diff --git a/src/plugins/debugger/debuggerplugin.cpp b/src/plugins/debugger/debuggerplugin.cpp index abf5498be0d..2adc7fa3ec3 100644 --- a/src/plugins/debugger/debuggerplugin.cpp +++ b/src/plugins/debugger/debuggerplugin.cpp @@ -74,7 +74,6 @@ #include #include #include -#include #include #include #include @@ -124,6 +123,7 @@ #include #include #include +#include #include #include @@ -3592,7 +3592,7 @@ QAction *createStartAction() QAction *createStopAction() { auto action = new QAction(DebuggerMainWindow::tr("Stop"), DebuggerPlugin::instance()); - action->setIcon(Core::Icons::STOP_SMALL_TOOLBAR.icon()); + action->setIcon(Utils::Icons::STOP_SMALL_TOOLBAR.icon()); action->setEnabled(true); return action; } diff --git a/src/plugins/debugger/debuggertooltipmanager.cpp b/src/plugins/debugger/debuggertooltipmanager.cpp index d3e179f1c9a..c4e9bae6d32 100644 --- a/src/plugins/debugger/debuggertooltipmanager.cpp +++ b/src/plugins/debugger/debuggertooltipmanager.cpp @@ -36,7 +36,6 @@ #include #include -#include #include #include @@ -49,6 +48,7 @@ #include #include #include +#include #include #include @@ -508,7 +508,7 @@ DebuggerToolTipWidget::DebuggerToolTipWidget() auto copyButton = new QToolButton; copyButton->setToolTip(DebuggerToolTipManager::tr("Copy Contents to Clipboard")); - copyButton->setIcon(Core::Icons::COPY.icon()); + copyButton->setIcon(Utils::Icons::COPY.icon()); titleLabel = new DraggableLabel(this); titleLabel->setMinimumWidth(40); // Ensure a draggable area even if text is empty. diff --git a/src/plugins/diffeditor/diffeditor.cpp b/src/plugins/diffeditor/diffeditor.cpp index d01f4d81a79..c2d681c13e1 100644 --- a/src/plugins/diffeditor/diffeditor.cpp +++ b/src/plugins/diffeditor/diffeditor.cpp @@ -30,7 +30,6 @@ #include "diffview.h" #include -#include #include #include @@ -42,6 +41,7 @@ #include #include #include +#include #include #include @@ -282,10 +282,10 @@ DiffEditor::DiffEditor() m_toggleDescriptionAction = m_toolBar->addAction(Icons::TOP_BAR.icon(), QString()); m_toggleDescriptionAction->setCheckable(true); - m_reloadAction = m_toolBar->addAction(Core::Icons::RELOAD.icon(), tr("Reload Diff")); + m_reloadAction = m_toolBar->addAction(Utils::Icons::RELOAD.icon(), tr("Reload Diff")); m_reloadAction->setToolTip(tr("Reload Diff")); - m_toggleSyncAction = m_toolBar->addAction(Core::Icons::LINK.icon(), QString()); + m_toggleSyncAction = m_toolBar->addAction(Utils::Icons::LINK.icon(), QString()); m_toggleSyncAction->setCheckable(true); m_viewSwitcherAction = m_toolBar->addAction(QIcon(), QString()); diff --git a/src/plugins/git/gitplugin.cpp b/src/plugins/git/gitplugin.cpp index 7dcb555cb53..2d478833ab5 100644 --- a/src/plugins/git/gitplugin.cpp +++ b/src/plugins/git/gitplugin.cpp @@ -45,7 +45,6 @@ #include #include -#include #include #include #include @@ -63,6 +62,7 @@ #include #include #include +#include #include #include @@ -743,7 +743,7 @@ class RebaseItemDelegate : public IconItemDelegate { public: RebaseItemDelegate(LogChangeWidget *widget) - : IconItemDelegate(widget, Core::Icons::UNDO.imageFileName()) + : IconItemDelegate(widget, Utils::Icons::UNDO.imageFileName()) { } diff --git a/src/plugins/git/gitsubmiteditorwidget.cpp b/src/plugins/git/gitsubmiteditorwidget.cpp index 196903e342d..7a5d4d49b37 100644 --- a/src/plugins/git/gitsubmiteditorwidget.cpp +++ b/src/plugins/git/gitsubmiteditorwidget.cpp @@ -29,8 +29,8 @@ #include "logchangedialog.h" #include -#include #include +#include #include #include @@ -52,7 +52,7 @@ GitSubmitEditorWidget::GitSubmitEditorWidget() : new GitSubmitHighlighter(descriptionEdit()); m_emailValidator = new QRegExpValidator(QRegExp("[^@ ]+@[^@ ]+\\.[a-zA-Z]+"), this); - const QPixmap error = Core::Icons::ERROR.pixmap(); + const QPixmap error = Utils::Icons::ERROR.pixmap(); m_gitSubmitPanelUi.invalidAuthorLabel->setPixmap(error); m_gitSubmitPanelUi.invalidEmailLabel->setToolTip(tr("Provide a valid email to commit.")); m_gitSubmitPanelUi.invalidEmailLabel->setPixmap(error); diff --git a/src/plugins/help/helpwidget.cpp b/src/plugins/help/helpwidget.cpp index b79c9bfe64d..e04060a9e52 100644 --- a/src/plugins/help/helpwidget.cpp +++ b/src/plugins/help/helpwidget.cpp @@ -41,7 +41,6 @@ #include #include #include -#include #include #include #include @@ -129,7 +128,7 @@ HelpWidget::HelpWidget(const Core::Context &context, WidgetStyle style, QWidget setAttribute(Qt::WA_QuitOnClose, false); // don't prevent Qt Creator from closing } if (style != SideBarWidget) { - m_toggleSideBarAction = new QAction(Core::Icons::TOGGLE_SIDEBAR_TOOLBAR.icon(), + m_toggleSideBarAction = new QAction(Utils::Icons::TOGGLE_SIDEBAR_TOOLBAR.icon(), QCoreApplication::translate("Core", Core::Constants::TR_SHOW_SIDEBAR), toolBar); m_toggleSideBarAction->setCheckable(true); @@ -245,7 +244,7 @@ HelpWidget::HelpWidget(const Core::Context &context, WidgetStyle style, QWidget } if (style != ExternalWindow) { - m_closeAction = new QAction(Core::Icons::CLOSE_TOOLBAR.icon(), QString(), toolBar); + m_closeAction = new QAction(Utils::Icons::CLOSE_TOOLBAR.icon(), QString(), toolBar); connect(m_closeAction, &QAction::triggered, this, &HelpWidget::closeButtonClicked); button = new QToolButton; button->setDefaultAction(m_closeAction); diff --git a/src/plugins/help/searchwidget.cpp b/src/plugins/help/searchwidget.cpp index bae7241a348..c0df8c9beac 100644 --- a/src/plugins/help/searchwidget.cpp +++ b/src/plugins/help/searchwidget.cpp @@ -30,10 +30,10 @@ #include "openpagesmanager.h" #include -#include #include #include #include +#include #include #include @@ -309,7 +309,7 @@ SearchSideBarItem::SearchSideBarItem() QList SearchSideBarItem::createToolBarWidgets() { QToolButton *reindexButton = new QToolButton; - reindexButton->setIcon(Core::Icons::RELOAD.icon()); + reindexButton->setIcon(Utils::Icons::RELOAD.icon()); reindexButton->setToolTip(tr("Regenerate Index")); connect(reindexButton, &QAbstractButton::clicked, static_cast(widget()), &SearchWidget::reindexDocumentation); diff --git a/src/plugins/imageviewer/imageviewer.cpp b/src/plugins/imageviewer/imageviewer.cpp index cb735933a81..0e5f1c4ad89 100644 --- a/src/plugins/imageviewer/imageviewer.cpp +++ b/src/plugins/imageviewer/imageviewer.cpp @@ -30,7 +30,6 @@ #include "imageview.h" #include "ui_imageviewertoolbar.h" -#include #include #include #include @@ -101,16 +100,17 @@ void ImageViewer::ctor() // toolbar d->toolbar = new QWidget(); d->ui_toolbar.setupUi(d->toolbar); - d->ui_toolbar.toolButtonExportImage->setIcon(QIcon::fromTheme(QLatin1String("document-save"), - Core::Icons::SAVEFILE_TOOLBAR.icon())); + d->ui_toolbar.toolButtonExportImage->setIcon( + QIcon::fromTheme(QLatin1String("document-save"), + Utils::Icons::SAVEFILE_TOOLBAR.icon())); const Utils::Icon backgroundIcon({ - {QLatin1String(":/core/images/desktopdevicesmall.png"), Utils::Theme::IconsBaseColor}}); + {QLatin1String(":/utils/images/desktopdevicesmall.png"), Utils::Theme::IconsBaseColor}}); d->ui_toolbar.toolButtonBackground->setIcon(backgroundIcon.icon()); - d->ui_toolbar.toolButtonOutline->setIcon(Core::Icons::BOUNDING_RECT.icon()); - d->ui_toolbar.toolButtonZoomIn->setIcon(Core::Icons::PLUS.icon()); - d->ui_toolbar.toolButtonZoomOut->setIcon(Core::Icons::MINUS.icon()); + d->ui_toolbar.toolButtonOutline->setIcon(Utils::Icons::BOUNDING_RECT.icon()); + d->ui_toolbar.toolButtonZoomIn->setIcon(Utils::Icons::PLUS.icon()); + d->ui_toolbar.toolButtonZoomOut->setIcon(Utils::Icons::MINUS.icon()); d->ui_toolbar.toolButtonFitToScreen->setIcon(Utils::Icons::ZOOM_TOOLBAR.icon()); - d->ui_toolbar.toolButtonOriginalSize->setIcon(Core::Icons::EYE_OPEN_TOOLBAR.icon()); + d->ui_toolbar.toolButtonOriginalSize->setIcon(Utils::Icons::EYE_OPEN_TOOLBAR.icon()); // icons update - try to use system theme updateButtonIconByTheme(d->ui_toolbar.toolButtonZoomIn, QLatin1String("zoom-in")); updateButtonIconByTheme(d->ui_toolbar.toolButtonZoomOut, QLatin1String("zoom-out")); @@ -261,10 +261,10 @@ void ImageViewer::updatePauseAction() bool isMovie = d->file->type() == ImageViewerFile::TypeMovie; if (isMovie && !d->file->isPaused()) { d->ui_toolbar.toolButtonPlayPause->setToolTipBase(tr("Pause Animation")); - d->ui_toolbar.toolButtonPlayPause->setIcon(Core::Icons::INTERRUPT_SMALL_TOOLBAR.icon()); + d->ui_toolbar.toolButtonPlayPause->setIcon(Utils::Icons::INTERRUPT_SMALL_TOOLBAR.icon()); } else { d->ui_toolbar.toolButtonPlayPause->setToolTipBase(tr("Play Animation")); - d->ui_toolbar.toolButtonPlayPause->setIcon(Core::Icons::RUN_SMALL_TOOLBAR.icon()); + d->ui_toolbar.toolButtonPlayPause->setIcon(Utils::Icons::RUN_SMALL_TOOLBAR.icon()); d->ui_toolbar.toolButtonPlayPause->setEnabled(isMovie); } } diff --git a/src/plugins/ios/iosruncontrol.cpp b/src/plugins/ios/iosruncontrol.cpp index d0e2a8f136d..cdfa5cf9ac2 100644 --- a/src/plugins/ios/iosruncontrol.cpp +++ b/src/plugins/ios/iosruncontrol.cpp @@ -28,7 +28,7 @@ #include "iosrunconfiguration.h" #include "iosrunner.h" -#include +#include #include @@ -42,7 +42,7 @@ IosRunControl::IosRunControl(IosRunConfiguration *rc) , m_runner(new IosRunner(this, rc, false, QmlDebug::NoQmlDebugServices)) , m_running(false) { - setIcon(Core::Icons::RUN_SMALL_TOOLBAR); + setIcon(Utils::Icons::RUN_SMALL_TOOLBAR); } IosRunControl::~IosRunControl() diff --git a/src/plugins/projectexplorer/appoutputpane.cpp b/src/plugins/projectexplorer/appoutputpane.cpp index aa3c08d407c..dd715881ea9 100644 --- a/src/plugins/projectexplorer/appoutputpane.cpp +++ b/src/plugins/projectexplorer/appoutputpane.cpp @@ -33,7 +33,6 @@ #include #include -#include #include #include #include @@ -47,6 +46,7 @@ #include #include #include +#include #include #include @@ -157,7 +157,7 @@ AppOutputPane::AppOutputPane() : setObjectName(QLatin1String("AppOutputPane")); // Used in valgrind engine // Rerun - m_reRunButton->setIcon(Core::Icons::RUN_SMALL_TOOLBAR.icon()); + m_reRunButton->setIcon(Utils::Icons::RUN_SMALL_TOOLBAR.icon()); m_reRunButton->setToolTip(tr("Re-run this run-configuration")); m_reRunButton->setAutoRaise(true); m_reRunButton->setEnabled(false); @@ -165,7 +165,7 @@ AppOutputPane::AppOutputPane() : this, &AppOutputPane::reRunRunControl); // Stop - m_stopAction->setIcon(Core::Icons::STOP_SMALL_TOOLBAR.icon()); + m_stopAction->setIcon(Utils::Icons::STOP_SMALL_TOOLBAR.icon()); m_stopAction->setToolTip(tr("Stop")); m_stopAction->setEnabled(false); @@ -187,14 +187,14 @@ AppOutputPane::AppOutputPane() : this, &AppOutputPane::attachToRunControl); m_zoomInButton->setToolTip(tr("Increase Font Size")); - m_zoomInButton->setIcon(Core::Icons::PLUS.icon()); + m_zoomInButton->setIcon(Utils::Icons::PLUS.icon()); m_zoomInButton->setAutoRaise(true); connect(m_zoomInButton, &QToolButton::clicked, this, &AppOutputPane::zoomIn); m_zoomOutButton->setToolTip(tr("Decrease Font Size")); - m_zoomOutButton->setIcon(Core::Icons::MINUS.icon()); + m_zoomOutButton->setIcon(Utils::Icons::MINUS.icon()); m_zoomOutButton->setAutoRaise(true); connect(m_zoomOutButton, &QToolButton::clicked, @@ -638,7 +638,7 @@ void AppOutputPane::enableButtons(const RunControl *rc, bool isRunning) m_zoomOutButton->setEnabled(true); } else { m_reRunButton->setEnabled(false); - m_reRunButton->setIcon(Core::Icons::RUN_SMALL_TOOLBAR.icon()); + m_reRunButton->setIcon(Utils::Icons::RUN_SMALL_TOOLBAR.icon()); m_attachButton->setEnabled(false); m_attachButton->setToolTip(msgAttachDebuggerTooltip()); m_stopAction->setEnabled(false); diff --git a/src/plugins/projectexplorer/buildprogress.cpp b/src/plugins/projectexplorer/buildprogress.cpp index 256ec44d8ac..1eb40912e27 100644 --- a/src/plugins/projectexplorer/buildprogress.cpp +++ b/src/plugins/projectexplorer/buildprogress.cpp @@ -26,8 +26,7 @@ #include "buildprogress.h" #include "projectexplorerconstants.h" -#include - +#include #include #include @@ -85,8 +84,8 @@ BuildProgress::BuildProgress(TaskWindow *taskWindow, Qt::Orientation orientation m_errorIcon->setAlignment(Qt::AlignRight); m_warningIcon->setAlignment(Qt::AlignRight); - m_errorIcon->setPixmap(Core::Icons::ERROR_TOOLBAR.pixmap()); - m_warningIcon->setPixmap(Core::Icons::WARNING_TOOLBAR.pixmap()); + m_errorIcon->setPixmap(Utils::Icons::ERROR_TOOLBAR.pixmap()); + m_warningIcon->setPixmap(Utils::Icons::WARNING_TOOLBAR.pixmap()); m_contentWidget->hide(); diff --git a/src/plugins/projectexplorer/compileoutputwindow.cpp b/src/plugins/projectexplorer/compileoutputwindow.cpp index 61917bfdaf2..6c24826ef12 100644 --- a/src/plugins/projectexplorer/compileoutputwindow.cpp +++ b/src/plugins/projectexplorer/compileoutputwindow.cpp @@ -35,7 +35,6 @@ #include #include #include -#include #include #include #include @@ -43,6 +42,7 @@ #include #include #include +#include #include #include @@ -166,12 +166,13 @@ CompileOutputWindow::CompileOutputWindow(QAction *cancelBuildAction) : m_outputWindow->setPalette(p); Utils::ProxyAction *cancelBuildProxyButton = - Utils::ProxyAction::proxyActionWithIcon(cancelBuildAction, Core::Icons::STOP_SMALL_TOOLBAR.icon()); + Utils::ProxyAction::proxyActionWithIcon(cancelBuildAction, + Utils::Icons::STOP_SMALL_TOOLBAR.icon()); m_cancelBuildButton->setDefaultAction(cancelBuildProxyButton); m_zoomInButton->setToolTip(tr("Increase Font Size")); - m_zoomInButton->setIcon(Core::Icons::PLUS.icon()); + m_zoomInButton->setIcon(Utils::Icons::PLUS.icon()); m_zoomOutButton->setToolTip(tr("Decrease Font Size")); - m_zoomOutButton->setIcon(Core::Icons::MINUS.icon()); + m_zoomOutButton->setIcon(Utils::Icons::MINUS.icon()); updateZoomEnabled(); diff --git a/src/plugins/projectexplorer/devicesupport/desktopdeviceconfigurationwidget.cpp b/src/plugins/projectexplorer/devicesupport/desktopdeviceconfigurationwidget.cpp index 2e901b4fcb0..c791e8ac80d 100644 --- a/src/plugins/projectexplorer/devicesupport/desktopdeviceconfigurationwidget.cpp +++ b/src/plugins/projectexplorer/devicesupport/desktopdeviceconfigurationwidget.cpp @@ -27,7 +27,7 @@ #include "ui_desktopdeviceconfigurationwidget.h" #include -#include +#include #include #include @@ -69,7 +69,7 @@ void DesktopDeviceConfigurationWidget::initGui() m_ui->machineTypeValueLabel->setText(tr("Physical Device")); m_ui->freePortsLineEdit->setPlaceholderText( QString::fromLatin1("eg: %1-%2").arg(DESKTOP_PORT_START).arg(DESKTOP_PORT_END)); - m_ui->portsWarningLabel->setPixmap(Core::Icons::WARNING.pixmap()); + m_ui->portsWarningLabel->setPixmap(Utils::Icons::WARNING.pixmap()); m_ui->portsWarningLabel->setToolTip(QLatin1String("") + tr("You will need at least one port for QML debugging.") + QLatin1String("")); diff --git a/src/plugins/projectexplorer/foldernavigationwidget.cpp b/src/plugins/projectexplorer/foldernavigationwidget.cpp index c6a660ed3f4..56e226a856d 100644 --- a/src/plugins/projectexplorer/foldernavigationwidget.cpp +++ b/src/plugins/projectexplorer/foldernavigationwidget.cpp @@ -34,7 +34,6 @@ #include #include #include -#include #include #include @@ -45,6 +44,7 @@ #include #include #include +#include #include #include @@ -157,7 +157,7 @@ FolderNavigationWidget::FolderNavigationWidget(QWidget *parent) : QWidget(parent layout->setContentsMargins(0, 0, 0, 0); setLayout(layout); - m_toggleSync->setIcon(Core::Icons::LINK.icon()); + m_toggleSync->setIcon(Utils::Icons::LINK.icon()); m_toggleSync->setCheckable(true); m_toggleSync->setToolTip(tr("Synchronize with Editor")); setAutoSynchronization(true); @@ -422,7 +422,7 @@ Core::NavigationView FolderNavigationWidgetFactory::createWidget() auto fnw = new FolderNavigationWidget; n.widget = fnw; auto filter = new QToolButton; - filter->setIcon(Core::Icons::FILTER.icon()); + filter->setIcon(Utils::Icons::FILTER.icon()); filter->setToolTip(tr("Filter Files")); filter->setPopupMode(QToolButton::InstantPopup); filter->setProperty("noArrow", true); diff --git a/src/plugins/projectexplorer/kitmodel.cpp b/src/plugins/projectexplorer/kitmodel.cpp index 6f904f483dd..fbba372e792 100644 --- a/src/plugins/projectexplorer/kitmodel.cpp +++ b/src/plugins/projectexplorer/kitmodel.cpp @@ -29,7 +29,7 @@ #include "kitmanagerconfigwidget.h" #include "kitmanager.h" -#include +#include #include #include @@ -79,11 +79,11 @@ public: } if (role == Qt::DecorationRole) { if (!widget->isValid()) { - static const QIcon errorIcon(Core::Icons::ERROR.icon()); + static const QIcon errorIcon(Utils::Icons::ERROR.icon()); return errorIcon; } if (widget->hasWarning()) { - static const QIcon warningIcon(Core::Icons::WARNING.icon()); + static const QIcon warningIcon(Utils::Icons::WARNING.icon()); return warningIcon; } return QIcon(); diff --git a/src/plugins/projectexplorer/localapplicationruncontrol.cpp b/src/plugins/projectexplorer/localapplicationruncontrol.cpp index 3d8bcc7656f..d6a2357d896 100644 --- a/src/plugins/projectexplorer/localapplicationruncontrol.cpp +++ b/src/plugins/projectexplorer/localapplicationruncontrol.cpp @@ -31,8 +31,7 @@ #include #include -#include - +#include #include #include @@ -63,7 +62,7 @@ LocalApplicationRunControl::LocalApplicationRunControl(RunConfiguration *rc, Cor : RunControl(rc, mode) { setRunnable(rc->runnable()); - setIcon(Core::Icons::RUN_SMALL_TOOLBAR); + setIcon(Utils::Icons::RUN_SMALL_TOOLBAR); connect(&m_applicationLauncher, &ApplicationLauncher::appendMessage, this, static_cast(&RunControl::appendMessage)); connect(&m_applicationLauncher, &ApplicationLauncher::processStarted, diff --git a/src/plugins/projectexplorer/projectexplorer.cpp b/src/plugins/projectexplorer/projectexplorer.cpp index f05060a5cb9..1d47e348b72 100644 --- a/src/plugins/projectexplorer/projectexplorer.cpp +++ b/src/plugins/projectexplorer/projectexplorer.cpp @@ -1,4 +1,4 @@ -/**************************************************************************** +/*************************************************************************** ** ** Copyright (C) 2016 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ @@ -105,7 +105,6 @@ #include #include #include -#include #include #include #include @@ -128,6 +127,7 @@ #include #include #include +#include #include #include @@ -667,7 +667,8 @@ bool ProjectExplorerPlugin::initialize(const QStringList &arguments, QString *er ActionContainer *runMenu = ActionManager::createMenu(Constants::RUNMENUCONTEXTMENU); runMenu->setOnAllDisabledBehavior(ActionContainer::Hide); const QIcon runSideBarIcon = Utils::Icon::sideBarIcon(Icons::RUN, Icons::RUN_FLAT); - const QIcon runIcon = Utils::Icon::combinedIcon({Core::Icons::RUN_SMALL.icon(), runSideBarIcon}); + const QIcon runIcon = Utils::Icon::combinedIcon({Utils::Icons::RUN_SMALL.icon(), + runSideBarIcon}); runMenu->menu()->setIcon(runIcon); runMenu->menu()->setTitle(tr("Run")); msubProjectContextMenu->addMenu(runMenu, ProjectExplorer::Constants::G_PROJECT_RUN); @@ -822,7 +823,7 @@ bool ProjectExplorerPlugin::initialize(const QStringList &arguments, QString *er msessionContextMenu->addAction(cmd, Constants::G_SESSION_REBUILD); // clean session - dd->m_cleanSessionAction = new QAction(Core::Icons::CLEAN.icon(), tr("Clean All"), this); + dd->m_cleanSessionAction = new QAction(Utils::Icons::CLEAN.icon(), tr("Clean All"), this); cmd = ActionManager::registerAction(dd->m_cleanSessionAction, Constants::CLEANSESSION); mbuild->addAction(cmd, Constants::G_BUILD_CLEAN); msessionContextMenu->addAction(cmd, Constants::G_SESSION_REBUILD); @@ -865,7 +866,8 @@ bool ProjectExplorerPlugin::initialize(const QStringList &arguments, QString *er mbuild->addAction(cmd, Constants::G_BUILD_CLEAN); // cancel build action - dd->m_cancelBuildAction = new QAction(Core::Icons::STOP_SMALL.icon(), tr("Cancel Build"), this); + dd->m_cancelBuildAction = new QAction(Utils::Icons::STOP_SMALL.icon(), tr("Cancel Build"), + this); cmd = ActionManager::registerAction(dd->m_cancelBuildAction, Constants::CANCELBUILD); mbuild->addAction(cmd, Constants::G_BUILD_CANCEL); diff --git a/src/plugins/projectexplorer/projectexplorericons.cpp b/src/plugins/projectexplorer/projectexplorericons.cpp index 6b62a423281..133a78849f3 100644 --- a/src/plugins/projectexplorer/projectexplorericons.cpp +++ b/src/plugins/projectexplorer/projectexplorericons.cpp @@ -48,16 +48,16 @@ const Icon DEBUG_START_FLAT({ {":/projectexplorer/images/run_mask.png", Theme::IconsRunToolBarColor}, {":/projectexplorer/images/debugger_beetle_mask.png", Theme::IconsDebugColor}}); const Icon DEBUG_START_SMALL({ - {":/core/images/run_small.png", Theme::IconsRunColor}, + {":/utils/images/run_small.png", Theme::IconsRunColor}, {":/projectexplorer/images/debugger_overlay_small.png", Theme::PanelTextColorMid}}, Icon::MenuTintedStyle); const Icon DEBUG_START_SMALL_TOOLBAR({ - {":/core/images/run_small.png", Theme::IconsRunToolBarColor}, + {":/utils/images/run_small.png", Theme::IconsRunToolBarColor}, {":/projectexplorer/images/debugger_overlay_small.png", Theme::IconsDebugColor}}); const Icon ANALYZER_START_SMALL({ - {":/core/images/run_small.png", Theme::IconsRunColor}, + {":/utils/images/run_small.png", Theme::IconsRunColor}, {":/projectexplorer/images/analyzer_overlay_small.png", Theme::PanelTextColorMid}}, Icon::MenuTintedStyle); const Icon ANALYZER_START_SMALL_TOOLBAR({ - {":/core/images/run_small.png", Theme::IconsRunToolBarColor}, + {":/utils/images/run_small.png", Theme::IconsRunToolBarColor}, {":/projectexplorer/images/analyzer_overlay_small.png", Theme::IconsBaseColor}}); const Icon BUILDSTEP_MOVEUP({ @@ -72,7 +72,7 @@ const Icon BUILDSTEP_REMOVE({ const Icon DESKTOP_DEVICE({ {":/projectexplorer/images/desktopdevice.png", Theme::IconsBaseColor}}); const Icon DESKTOP_DEVICE_SMALL({ - {":/core/images/desktopdevicesmall.png", Theme::PanelTextColorDark}}, Icon::Tint); + {":/utils/images/desktopdevicesmall.png", Theme::PanelTextColorDark}}, Icon::Tint); const Icon MODE_PROJECT_CLASSIC(":/projectexplorer/images/mode_project.png"); const Icon MODE_PROJECT_FLAT({ diff --git a/src/plugins/projectexplorer/projecttreewidget.cpp b/src/plugins/projectexplorer/projecttreewidget.cpp index cfaeee1a045..233b0c95ca0 100644 --- a/src/plugins/projectexplorer/projecttreewidget.cpp +++ b/src/plugins/projectexplorer/projecttreewidget.cpp @@ -33,7 +33,6 @@ #include "projecttree.h" #include -#include #include #include #include @@ -44,6 +43,7 @@ #include #include #include +#include #include #include @@ -223,7 +223,7 @@ ProjectTreeWidget::ProjectTreeWidget(QWidget *parent) : QWidget(parent) this, &ProjectTreeWidget::saveExpandData); m_toggleSync = new QToolButton; - m_toggleSync->setIcon(Core::Icons::LINK.icon()); + m_toggleSync->setIcon(Utils::Icons::LINK.icon()); m_toggleSync->setCheckable(true); m_toggleSync->setChecked(autoSynchronization()); m_toggleSync->setToolTip(tr("Synchronize with Editor")); @@ -578,7 +578,7 @@ NavigationView ProjectTreeWidgetFactory::createWidget() n.widget = ptw; auto filter = new QToolButton; - filter->setIcon(Core::Icons::FILTER.icon()); + filter->setIcon(Utils::Icons::FILTER.icon()); filter->setToolTip(tr("Filter Tree")); filter->setPopupMode(QToolButton::InstantPopup); filter->setProperty("noArrow", true); diff --git a/src/plugins/projectexplorer/runconfigurationaspects.cpp b/src/plugins/projectexplorer/runconfigurationaspects.cpp index 75280682647..4ba7eb35bd7 100644 --- a/src/plugins/projectexplorer/runconfigurationaspects.cpp +++ b/src/plugins/projectexplorer/runconfigurationaspects.cpp @@ -29,8 +29,7 @@ #include "runconfiguration.h" #include "environmentaspect.h" -#include - +#include #include #include @@ -154,7 +153,7 @@ void WorkingDirectoryAspect::addToMainConfigurationWidget(QWidget *parent, QForm QTC_CHECK(!m_chooser); m_resetButton = new QToolButton(parent); m_resetButton->setToolTip(tr("Reset to Default")); - m_resetButton->setIcon(Core::Icons::RESET.icon()); + m_resetButton->setIcon(Utils::Icons::RESET.icon()); connect(m_resetButton.data(), &QAbstractButton::clicked, this, &WorkingDirectoryAspect::resetPath); m_chooser = new PathChooser(parent); diff --git a/src/plugins/projectexplorer/targetsettingspanel.cpp b/src/plugins/projectexplorer/targetsettingspanel.cpp index a5bd9a4bac9..a11a580f387 100644 --- a/src/plugins/projectexplorer/targetsettingspanel.cpp +++ b/src/plugins/projectexplorer/targetsettingspanel.cpp @@ -47,7 +47,6 @@ #include #include -#include #include #include @@ -55,6 +54,7 @@ #include #include #include +#include #include #include @@ -364,9 +364,9 @@ public: Kit *k = KitManager::find(m_kitId); QTC_ASSERT(k, return QVariant()); if (!k->isValid()) - return Core::Icons::ERROR.icon(); + return Utils::Icons::ERROR.icon(); if (k->hasWarning()) - return Core::Icons::WARNING.icon(); + return Utils::Icons::WARNING.icon(); break; } diff --git a/src/plugins/projectexplorer/task.cpp b/src/plugins/projectexplorer/task.cpp index 5849601ca0a..f74e607a11e 100644 --- a/src/plugins/projectexplorer/task.cpp +++ b/src/plugins/projectexplorer/task.cpp @@ -25,7 +25,7 @@ #include "task.h" -#include +#include #include #include "projectexplorerconstants.h" @@ -36,8 +36,8 @@ namespace ProjectExplorer static QIcon taskTypeIcon(Task::TaskType t) { static QIcon icons[3] = { QIcon(), - Core::Icons::ERROR.icon(), - Core::Icons::WARNING.icon()}; + Utils::Icons::ERROR.icon(), + Utils::Icons::WARNING.icon()}; if (t < 0 || t > 2) t = Task::Unknown; diff --git a/src/plugins/projectexplorer/taskwindow.cpp b/src/plugins/projectexplorer/taskwindow.cpp index beb8b58bdce..79032312e1b 100644 --- a/src/plugins/projectexplorer/taskwindow.cpp +++ b/src/plugins/projectexplorer/taskwindow.cpp @@ -35,13 +35,13 @@ #include #include -#include #include #include #include #include #include #include +#include #include #include @@ -257,11 +257,11 @@ TaskWindow::TaskWindow() : d(new TaskWindowPrivate) d->m_listview->setContextMenuPolicy(Qt::ActionsContextMenu); d->m_filterWarningsButton = createFilterButton( - Core::Icons::WARNING_TOOLBAR.icon(), + Utils::Icons::WARNING_TOOLBAR.icon(), tr("Show Warnings"), this, [this](bool show) { setShowWarnings(show); }); d->m_categoriesButton = new QToolButton; - d->m_categoriesButton->setIcon(Core::Icons::FILTER.icon()); + d->m_categoriesButton->setIcon(Utils::Icons::FILTER.icon()); d->m_categoriesButton->setToolTip(tr("Filter by categories")); d->m_categoriesButton->setProperty("noArrow", true); d->m_categoriesButton->setAutoRaise(true); diff --git a/src/plugins/pythoneditor/pythoneditorplugin.cpp b/src/plugins/pythoneditor/pythoneditorplugin.cpp index 50d61adfcce..d5d4f51053f 100644 --- a/src/plugins/pythoneditor/pythoneditorplugin.cpp +++ b/src/plugins/pythoneditor/pythoneditorplugin.cpp @@ -30,7 +30,6 @@ #include #include -#include #include #include #include @@ -55,6 +54,7 @@ #include #include #include +#include #include #include @@ -1058,7 +1058,7 @@ RunControl *PythonRunControlFactory::create(RunConfiguration *runConfiguration, PythonRunControl::PythonRunControl(PythonRunConfiguration *rc, Core::Id mode) : RunControl(rc, mode), m_running(false) { - setIcon(Core::Icons::RUN_SMALL_TOOLBAR); + setIcon(Utils::Icons::RUN_SMALL_TOOLBAR); m_interpreter = rc->interpreter(); m_mainScript = rc->mainScript(); diff --git a/src/plugins/qbsprojectmanager/qbsbuildstep.cpp b/src/plugins/qbsprojectmanager/qbsbuildstep.cpp index 1c12b1aad20..7e25dfc92e5 100644 --- a/src/plugins/qbsprojectmanager/qbsbuildstep.cpp +++ b/src/plugins/qbsprojectmanager/qbsbuildstep.cpp @@ -34,7 +34,6 @@ #include "ui_qbsbuildstepconfigwidget.h" #include -#include #include #include #include @@ -42,6 +41,7 @@ #include #include #include +#include #include @@ -477,7 +477,7 @@ QbsBuildStepConfigWidget::QbsBuildStepConfigWidget(QbsBuildStep *step) : QString *errorMessage) { return validateProperties(edit, errorMessage); }); - m_ui->qmlDebuggingWarningText->setPixmap(Core::Icons::WARNING.pixmap()); + m_ui->qmlDebuggingWarningText->setPixmap(Utils::Icons::WARNING.pixmap()); connect(m_ui->buildVariantComboBox, static_cast(&QComboBox::currentIndexChanged), diff --git a/src/plugins/qbsprojectmanager/qbsrunconfiguration.cpp b/src/plugins/qbsprojectmanager/qbsrunconfiguration.cpp index ada32c370e5..66b6621f4bd 100644 --- a/src/plugins/qbsprojectmanager/qbsrunconfiguration.cpp +++ b/src/plugins/qbsprojectmanager/qbsrunconfiguration.cpp @@ -29,7 +29,6 @@ #include "qbsinstallstep.h" #include "qbsproject.h" -#include #include #include #include @@ -50,6 +49,7 @@ #include #include #include +#include #include "api/runenvironment.h" @@ -342,7 +342,7 @@ QbsRunConfigurationWidget::QbsRunConfigurationWidget(QbsRunConfiguration *rc) auto hl = new QHBoxLayout(); hl->addStretch(); m_disabledIcon = new QLabel(this); - m_disabledIcon->setPixmap(Core::Icons::WARNING.pixmap()); + m_disabledIcon->setPixmap(Utils::Icons::WARNING.pixmap()); hl->addWidget(m_disabledIcon); m_disabledReason = new QLabel(this); m_disabledReason->setVisible(false); diff --git a/src/plugins/qmakeandroidsupport/createandroidmanifestwizard.cpp b/src/plugins/qmakeandroidsupport/createandroidmanifestwizard.cpp index 05feccc678c..3a389bee227 100644 --- a/src/plugins/qmakeandroidsupport/createandroidmanifestwizard.cpp +++ b/src/plugins/qmakeandroidsupport/createandroidmanifestwizard.cpp @@ -31,7 +31,6 @@ #include #include -#include #include @@ -42,6 +41,8 @@ #include +#include + #include #include #include @@ -125,7 +126,7 @@ ChooseDirectoryPage::ChooseDirectoryPage(CreateAndroidManifestWizard *wizard) m_sourceDirectoryWarning->setWordWrap(true); m_warningIcon = new QLabel(this); m_warningIcon->setVisible(false); - m_warningIcon->setPixmap(Core::Icons::ERROR.pixmap()); + m_warningIcon->setPixmap(Utils::Icons::ERROR.pixmap()); m_warningIcon->setWordWrap(true); m_warningIcon->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed); diff --git a/src/plugins/qmakeandroidsupport/qmakeandroidbuildapkwidget.cpp b/src/plugins/qmakeandroidsupport/qmakeandroidbuildapkwidget.cpp index 66f20363fa6..6a577d00b93 100644 --- a/src/plugins/qmakeandroidsupport/qmakeandroidbuildapkwidget.cpp +++ b/src/plugins/qmakeandroidsupport/qmakeandroidbuildapkwidget.cpp @@ -30,10 +30,11 @@ #include #include -#include #include #include +#include + #include #include @@ -60,7 +61,7 @@ QmakeAndroidBuildApkWidget::QmakeAndroidBuildApkWidget(QmakeAndroidBuildApkStep sizePolicy.setVerticalStretch(0); sizePolicy.setHeightForWidth(oldFilesWarningIcon->sizePolicy().hasHeightForWidth()); oldFilesWarningIcon->setSizePolicy(sizePolicy); - oldFilesWarningIcon->setPixmap(Core::Icons::WARNING.pixmap()); + oldFilesWarningIcon->setPixmap(Utils::Icons::WARNING.pixmap()); oldFilesWarningIcon->setAlignment(Qt::Alignment(Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop)); qt51WarningLayout->addWidget(oldFilesWarningIcon); diff --git a/src/plugins/qmakeprojectmanager/customwidgetwizard/customwidgetwidgetswizardpage.cpp b/src/plugins/qmakeprojectmanager/customwidgetwizard/customwidgetwidgetswizardpage.cpp index 097fa39373d..932c8901c3b 100644 --- a/src/plugins/qmakeprojectmanager/customwidgetwizard/customwidgetwidgetswizardpage.cpp +++ b/src/plugins/qmakeprojectmanager/customwidgetwizard/customwidgetwidgetswizardpage.cpp @@ -27,8 +27,7 @@ #include "ui_customwidgetwidgetswizardpage.h" #include "classdefinition.h" -#include - +#include #include #include @@ -47,9 +46,9 @@ CustomWidgetWidgetsWizardPage::CustomWidgetWidgetsWizardPage(QWidget *parent) : { m_ui->setupUi(this); m_ui->tabStackWidget->setLayout(m_tabStackLayout); - m_ui->addButton->setIcon(Core::Icons::PLUS.icon()); + m_ui->addButton->setIcon(Utils::Icons::PLUS.icon()); connect(m_ui->addButton, &QAbstractButton::clicked, m_ui->classList, &ClassList::startEditingNewClassItem); - m_ui->deleteButton->setIcon(Core::Icons::MINUS.icon()); + m_ui->deleteButton->setIcon(Utils::Icons::MINUS.icon()); connect(m_ui->deleteButton, &QAbstractButton::clicked, m_ui->classList, &ClassList::removeCurrentClass); m_ui->deleteButton->setEnabled(false); diff --git a/src/plugins/qmakeprojectmanager/desktopqmakerunconfiguration.cpp b/src/plugins/qmakeprojectmanager/desktopqmakerunconfiguration.cpp index 3a31934d053..ed3dfec6589 100644 --- a/src/plugins/qmakeprojectmanager/desktopqmakerunconfiguration.cpp +++ b/src/plugins/qmakeprojectmanager/desktopqmakerunconfiguration.cpp @@ -29,7 +29,6 @@ #include "qmakeproject.h" #include "qmakebuildconfiguration.h" -#include #include #include #include @@ -46,6 +45,7 @@ #include #include #include +#include #include #include @@ -170,7 +170,7 @@ DesktopQmakeRunConfigurationWidget::DesktopQmakeRunConfigurationWidget(DesktopQm auto hl = new QHBoxLayout(); hl->addStretch(); m_disabledIcon = new QLabel(this); - m_disabledIcon->setPixmap(Core::Icons::WARNING.pixmap()); + m_disabledIcon->setPixmap(Utils::Icons::WARNING.pixmap()); hl->addWidget(m_disabledIcon); m_disabledReason = new QLabel(this); m_disabledReason->setVisible(false); diff --git a/src/plugins/qmakeprojectmanager/qmakeprojectconfigwidget.cpp b/src/plugins/qmakeprojectmanager/qmakeprojectconfigwidget.cpp index e1ce4310ead..c2f52f6284f 100644 --- a/src/plugins/qmakeprojectmanager/qmakeprojectconfigwidget.cpp +++ b/src/plugins/qmakeprojectmanager/qmakeprojectconfigwidget.cpp @@ -36,6 +36,7 @@ #include #include +#include using namespace QmakeProjectManager; using namespace QmakeProjectManager::Internal; @@ -63,7 +64,7 @@ QmakeProjectConfigWidget::QmakeProjectConfigWidget(QmakeBuildConfiguration *bc) m_browseButton = m_ui->shadowBuildDirEdit->buttonAtIndex(0); - m_ui->warningLabel->setPixmap(Core::Icons::WARNING.pixmap()); + m_ui->warningLabel->setPixmap(Utils::Icons::WARNING.pixmap()); m_ui->shadowBuildDirEdit->setPromptDialogTitle(tr("Shadow Build Directory")); m_ui->shadowBuildDirEdit->setExpectedKind(Utils::PathChooser::ExistingDirectory); m_ui->shadowBuildDirEdit->setHistoryCompleter(QLatin1String("Qmake.BuildDir.History")); diff --git a/src/plugins/qmakeprojectmanager/qmakestep.cpp b/src/plugins/qmakeprojectmanager/qmakestep.cpp index 78e53ac0d9d..156c4d20ce7 100644 --- a/src/plugins/qmakeprojectmanager/qmakestep.cpp +++ b/src/plugins/qmakeprojectmanager/qmakestep.cpp @@ -41,7 +41,6 @@ #include #include -#include #include #include #include @@ -50,6 +49,7 @@ #include #include #include +#include #include #include @@ -562,7 +562,7 @@ QMakeStepConfigWidget::QMakeStepConfigWidget(QMakeStep *step) m_ui->qmlDebuggingLibraryCheckBox->setChecked(m_step->linkQmlDebuggingLibrary()); m_ui->qtQuickCompilerCheckBox->setChecked(m_step->useQtQuickCompiler()); m_ui->separateDebugInfoCheckBox->setChecked(m_step->separateDebugInfo()); - const QPixmap warning = Core::Icons::WARNING.pixmap(); + const QPixmap warning = Utils::Icons::WARNING.pixmap(); m_ui->qmlDebuggingWarningIcon->setPixmap(warning); m_ui->qtQuickCompilerWarningIcon->setPixmap(warning); diff --git a/src/plugins/qmldesigner/components/componentcore/qmldesignericonprovider.cpp b/src/plugins/qmldesigner/components/componentcore/qmldesignericonprovider.cpp index 680280d4fb1..b68def76094 100644 --- a/src/plugins/qmldesigner/components/componentcore/qmldesignericonprovider.cpp +++ b/src/plugins/qmldesigner/components/componentcore/qmldesignericonprovider.cpp @@ -26,8 +26,8 @@ #include "qmldesignericonprovider.h" #include +#include -#include #include #include @@ -54,9 +54,9 @@ QPixmap QmlDesignerIconProvider::requestPixmap(const QString &id, QSize *size, c QPixmap result; if (id == "close") - result = Core::Icons::CLOSE_TOOLBAR.pixmap(); + result = Utils::Icons::CLOSE_TOOLBAR.pixmap(); else if (id == "plus") - result = Core::Icons::PLUS.pixmap(); + result = Utils::Icons::PLUS.pixmap(); else if (id == "expression") result = Icon({ { iconPath() + QLatin1String("expression.png"), Theme::IconsBaseColor}}, Icon::Tint).pixmap(); diff --git a/src/plugins/qmldesigner/components/formeditor/formeditorwidget.cpp b/src/plugins/qmldesigner/components/formeditor/formeditorwidget.cpp index a734b7aa5ed..76680edaa01 100644 --- a/src/plugins/qmldesigner/components/formeditor/formeditorwidget.cpp +++ b/src/plugins/qmldesigner/components/formeditor/formeditorwidget.cpp @@ -41,8 +41,8 @@ #include #include -#include #include +#include namespace QmlDesigner { @@ -99,7 +99,7 @@ FormEditorWidget::FormEditorWidget(FormEditorView *view) m_showBoundingRectAction->setShortcutContext(Qt::WidgetWithChildrenShortcut); m_showBoundingRectAction->setCheckable(true); m_showBoundingRectAction->setChecked(true); - m_showBoundingRectAction->setIcon(Core::Icons::BOUNDING_RECT.icon()); + m_showBoundingRectAction->setIcon(Utils::Icons::BOUNDING_RECT.icon()); addAction(m_showBoundingRectAction.data()); upperActions.append(m_showBoundingRectAction.data()); @@ -138,7 +138,7 @@ FormEditorWidget::FormEditorWidget(FormEditorView *view) m_resetAction = new QAction(tr("Reset view (R)."), this); m_resetAction->setShortcut(Qt::Key_R); m_resetAction->setShortcutContext(Qt::WidgetWithChildrenShortcut); - m_resetAction->setIcon(Core::Icons::RESET_TOOLBAR.icon()); + m_resetAction->setIcon(Utils::Icons::RESET_TOOLBAR.icon()); connect(m_resetAction.data(), SIGNAL(triggered(bool)), this, SLOT(resetNodeInstanceView())); addAction(m_resetAction.data()); upperActions.append(m_resetAction.data()); diff --git a/src/plugins/qmldesigner/components/importmanager/importlabel.cpp b/src/plugins/qmldesigner/components/importmanager/importlabel.cpp index bcd17fb2d50..9df2a77c3a9 100644 --- a/src/plugins/qmldesigner/components/importmanager/importlabel.cpp +++ b/src/plugins/qmldesigner/components/importmanager/importlabel.cpp @@ -24,7 +24,7 @@ ****************************************************************************/ #include "importlabel.h" -#include +#include #include #include @@ -40,7 +40,7 @@ ImportLabel::ImportLabel(QWidget *parent) : m_removeButton = new QPushButton(this); - m_removeButton->setIcon(Core::Icons::CLOSE_TOOLBAR.icon()); + m_removeButton->setIcon(Utils::Icons::CLOSE_TOOLBAR.icon()); m_removeButton->setFlat(true); m_removeButton->setMaximumWidth(20); m_removeButton->setMaximumHeight(20); @@ -72,7 +72,7 @@ void ImportLabel::setReadOnly(bool readOnly) const { m_removeButton->setDisabled(readOnly); m_removeButton->setIcon(readOnly ? QIcon() - : Core::Icons::CLOSE_TOOLBAR.icon()); + : Utils::Icons::CLOSE_TOOLBAR.icon()); } void ImportLabel::emitRemoveImport() diff --git a/src/plugins/qmldesigner/components/navigator/navigatortreemodel.cpp b/src/plugins/qmldesigner/components/navigator/navigatortreemodel.cpp index 9b85ba64e68..4b891ce6eee 100644 --- a/src/plugins/qmldesigner/components/navigator/navigatortreemodel.cpp +++ b/src/plugins/qmldesigner/components/navigator/navigatortreemodel.cpp @@ -38,7 +38,8 @@ #include #include -#include + +#include #include #include @@ -365,7 +366,7 @@ void NavigatorTreeModel::updateItemRow(const ModelNode &modelNode, ItemRow items if (currentQmlObjectNode.hasError()) { items.idItem->setData(true, ErrorRole); items.idItem->setToolTip(currentQmlObjectNode.error()); - items.idItem->setIcon(Core::Icons::WARNING.icon()); + items.idItem->setIcon(Utils::Icons::WARNING.icon()); } else { items.idItem->setData(false, ErrorRole); if (modelNode.metaInfo().isValid()) diff --git a/src/plugins/qmldesigner/components/navigator/navigatorview.cpp b/src/plugins/qmldesigner/components/navigator/navigatorview.cpp index 14ac2922a3b..a83cd827ef8 100644 --- a/src/plugins/qmldesigner/components/navigator/navigatorview.cpp +++ b/src/plugins/qmldesigner/components/navigator/navigatorview.cpp @@ -33,9 +33,9 @@ #include #include -#include #include +#include #include #include @@ -87,8 +87,8 @@ NavigatorView::NavigatorView(QObject* parent) : m_treeModel.data()); IconCheckboxItemDelegate *showDelegate = new IconCheckboxItemDelegate(this, - Core::Icons::EYE_OPEN_TOOLBAR.pixmap(), - Core::Icons::EYE_CLOSED_TOOLBAR.pixmap(), + Utils::Icons::EYE_OPEN_TOOLBAR.pixmap(), + Utils::Icons::EYE_CLOSED_TOOLBAR.pixmap(), m_treeModel.data()); IconCheckboxItemDelegate *exportDelegate = diff --git a/src/plugins/qmldesigner/qmldesignerextension/connectioneditor/connectionviewwidget.cpp b/src/plugins/qmldesigner/qmldesignerextension/connectioneditor/connectionviewwidget.cpp index db572f2cf92..b7f9a69fa53 100644 --- a/src/plugins/qmldesigner/qmldesignerextension/connectioneditor/connectionviewwidget.cpp +++ b/src/plugins/qmldesigner/qmldesignerextension/connectioneditor/connectionviewwidget.cpp @@ -34,8 +34,8 @@ #include "theming.h" #include -#include #include +#include #include #include @@ -124,13 +124,13 @@ QList ConnectionViewWidget::createToolBarWidgets() QList buttons; buttons << new QToolButton(); - buttons.last()->setIcon(Core::Icons::PLUS.icon()); + buttons.last()->setIcon(Utils::Icons::PLUS.icon()); buttons.last()->setToolTip(tr("Add binding or connection.")); connect(buttons.last(), SIGNAL(clicked()), this, SLOT(addButtonClicked())); connect(this, SIGNAL(setEnabledAddButton(bool)), buttons.last(), SLOT(setEnabled(bool))); buttons << new QToolButton(); - buttons.last()->setIcon(Core::Icons::MINUS.icon()); + buttons.last()->setIcon(Utils::Icons::MINUS.icon()); buttons.last()->setToolTip(tr("Remove selected binding or connection.")); buttons.last()->setShortcut(QKeySequence(Qt::Key_Delete)); connect(buttons.last(), SIGNAL(clicked()), this, SLOT(removeButtonClicked())); diff --git a/src/plugins/qmlprofiler/qmlprofilertool.cpp b/src/plugins/qmlprofiler/qmlprofilertool.cpp index dd4d84d91d0..18580573e66 100644 --- a/src/plugins/qmlprofiler/qmlprofilertool.cpp +++ b/src/plugins/qmlprofiler/qmlprofilertool.cpp @@ -56,7 +56,6 @@ #include #include -#include #include #include #include @@ -205,7 +204,7 @@ QmlProfilerTool::QmlProfilerTool(QObject *parent) setRecording(d->m_profilerState->clientRecording()); d->m_clearButton = new QToolButton; - d->m_clearButton->setIcon(Core::Icons::CLEAN_TOOLBAR.icon()); + d->m_clearButton->setIcon(Utils::Icons::CLEAN_TOOLBAR.icon()); d->m_clearButton->setToolTip(tr("Discard data")); connect(d->m_clearButton, &QAbstractButton::clicked, [this](){ @@ -220,7 +219,7 @@ QmlProfilerTool::QmlProfilerTool(QObject *parent) connect(d->m_searchButton, &QToolButton::clicked, this, &QmlProfilerTool::showTimeLineSearch); d->m_displayFeaturesButton = new QToolButton; - d->m_displayFeaturesButton->setIcon(Core::Icons::FILTER.icon()); + d->m_displayFeaturesButton->setIcon(Utils::Icons::FILTER.icon()); d->m_displayFeaturesButton->setToolTip(tr("Hide or show event categories.")); d->m_displayFeaturesButton->setPopupMode(QToolButton::InstantPopup); d->m_displayFeaturesButton->setProperty("noArrow", true); diff --git a/src/plugins/qtsupport/qtoptionspage.cpp b/src/plugins/qtsupport/qtoptionspage.cpp index 7bed927f1ff..ab9dc1c6f87 100644 --- a/src/plugins/qtsupport/qtoptionspage.cpp +++ b/src/plugins/qtsupport/qtoptionspage.cpp @@ -34,7 +34,6 @@ #include #include -#include #include #include #include @@ -46,6 +45,7 @@ #include #include #include +#include #include #include @@ -199,8 +199,8 @@ QtOptionsPageWidget::QtOptionsPageWidget(QWidget *parent) , m_ui(new Internal::Ui::QtVersionManager()) , m_versionUi(new Internal::Ui::QtVersionInfo()) , m_infoBrowser(new QTextBrowser) - , m_invalidVersionIcon(Core::Icons::ERROR.icon()) - , m_warningVersionIcon(Core::Icons::WARNING.icon()) + , m_invalidVersionIcon(Utils::Icons::ERROR.icon()) + , m_warningVersionIcon(Utils::Icons::WARNING.icon()) , m_configurationWidget(0) { QWidget *versionInfoWidget = new QWidget(); diff --git a/src/plugins/remotelinux/genericlinuxdeviceconfigurationwidget.cpp b/src/plugins/remotelinux/genericlinuxdeviceconfigurationwidget.cpp index 6b7d9d50650..d7cc2db68dc 100644 --- a/src/plugins/remotelinux/genericlinuxdeviceconfigurationwidget.cpp +++ b/src/plugins/remotelinux/genericlinuxdeviceconfigurationwidget.cpp @@ -27,9 +27,9 @@ #include "ui_genericlinuxdeviceconfigurationwidget.h" #include -#include #include #include +#include #include #include @@ -202,7 +202,7 @@ void GenericLinuxDeviceConfigurationWidget::initGui() m_ui->machineTypeValueLabel->setText(tr("Physical Device")); else m_ui->machineTypeValueLabel->setText(tr("Emulator")); - m_ui->portsWarningLabel->setPixmap(Core::Icons::ERROR.pixmap()); + m_ui->portsWarningLabel->setPixmap(Utils::Icons::ERROR.pixmap()); m_ui->portsWarningLabel->setToolTip(QLatin1String("") + tr("You will need at least one port.") + QLatin1String("")); m_ui->keyFileLineEdit->setExpectedKind(PathChooser::File); diff --git a/src/plugins/remotelinux/remotelinuxrunconfigurationwidget.cpp b/src/plugins/remotelinux/remotelinuxrunconfigurationwidget.cpp index 1c66843fdf9..8e3442efaf8 100644 --- a/src/plugins/remotelinux/remotelinuxrunconfigurationwidget.cpp +++ b/src/plugins/remotelinux/remotelinuxrunconfigurationwidget.cpp @@ -27,8 +27,8 @@ #include "remotelinuxrunconfiguration.h" -#include #include +#include #include #include @@ -106,7 +106,7 @@ void RemoteLinuxRunConfigurationWidget::addDisabledLabel(QVBoxLayout *topLayout) { QHBoxLayout * const hl = new QHBoxLayout; hl->addStretch(); - d->disabledIcon.setPixmap(Core::Icons::WARNING.pixmap()); + d->disabledIcon.setPixmap(Utils::Icons::WARNING.pixmap()); hl->addWidget(&d->disabledIcon); d->disabledReason.setVisible(false); hl->addWidget(&d->disabledReason); diff --git a/src/plugins/remotelinux/remotelinuxruncontrol.cpp b/src/plugins/remotelinux/remotelinuxruncontrol.cpp index b33341a4fcb..7e9c4951800 100644 --- a/src/plugins/remotelinux/remotelinuxruncontrol.cpp +++ b/src/plugins/remotelinux/remotelinuxruncontrol.cpp @@ -25,10 +25,10 @@ #include "remotelinuxruncontrol.h" -#include - #include +#include + using namespace ProjectExplorer; namespace RemoteLinux { @@ -43,7 +43,7 @@ public: RemoteLinuxRunControl::RemoteLinuxRunControl(RunConfiguration *rc) : RunControl(rc, ProjectExplorer::Constants::NORMAL_RUN_MODE), d(new RemoteLinuxRunControlPrivate) { - setIcon(Core::Icons::RUN_SMALL_TOOLBAR); + setIcon(Utils::Icons::RUN_SMALL_TOOLBAR); setRunnable(rc->runnable()); d->running = false; diff --git a/src/plugins/texteditor/circularclipboardassist.cpp b/src/plugins/texteditor/circularclipboardassist.cpp index 16ace243865..6f3e4e43494 100644 --- a/src/plugins/texteditor/circularclipboardassist.cpp +++ b/src/plugins/texteditor/circularclipboardassist.cpp @@ -34,7 +34,8 @@ #include "circularclipboard.h" #include -#include + +#include #include #include @@ -90,7 +91,7 @@ public: return 0; const QScopedPointer AssistInterface(interface); - QIcon icon = QIcon::fromTheme(QLatin1String("edit-paste"), Core::Icons::PASTE.icon()).pixmap(16); + QIcon icon = QIcon::fromTheme(QLatin1String("edit-paste"), Utils::Icons::PASTE.icon()).pixmap(16); CircularClipboard * clipboard = CircularClipboard::instance(); QList items; for (int i = 0; i < clipboard->size(); ++i) { diff --git a/src/plugins/texteditor/outlinefactory.cpp b/src/plugins/texteditor/outlinefactory.cpp index 5afb8441c1f..1a068c3bfa1 100644 --- a/src/plugins/texteditor/outlinefactory.cpp +++ b/src/plugins/texteditor/outlinefactory.cpp @@ -25,11 +25,12 @@ #include "outlinefactory.h" #include -#include #include #include #include +#include + #include #include #include @@ -54,7 +55,7 @@ OutlineWidgetStack::OutlineWidgetStack(OutlineFactory *factory) : addWidget(label); m_toggleSync = new QToolButton; - m_toggleSync->setIcon(Core::Icons::LINK.icon()); + m_toggleSync->setIcon(Utils::Icons::LINK.icon()); m_toggleSync->setCheckable(true); m_toggleSync->setChecked(true); m_toggleSync->setToolTip(tr("Synchronize with Editor")); @@ -62,7 +63,7 @@ OutlineWidgetStack::OutlineWidgetStack(OutlineFactory *factory) : this, &OutlineWidgetStack::toggleCursorSynchronization); m_filterButton = new QToolButton; - m_filterButton->setIcon(Core::Icons::FILTER.icon()); + m_filterButton->setIcon(Utils::Icons::FILTER.icon()); m_filterButton->setToolTip(tr("Filter tree")); m_filterButton->setPopupMode(QToolButton::InstantPopup); m_filterButton->setProperty("noArrow", true); diff --git a/src/plugins/todo/todoicons.cpp b/src/plugins/todo/todoicons.cpp index 41f3ac41986..e2f9613c784 100644 --- a/src/plugins/todo/todoicons.cpp +++ b/src/plugins/todo/todoicons.cpp @@ -25,7 +25,7 @@ ****************************************************************************/ #include #include -#include +#include #include "todoicons.h" @@ -38,11 +38,11 @@ QIcon icon(IconType type) { switch (type) { case IconType::Info: { - const static QIcon icon = Core::Icons::INFO.icon(); + const static QIcon icon = Utils::Icons::INFO.icon(); return icon; } case IconType::Warning: { - const static QIcon icon = Core::Icons::WARNING.icon(); + const static QIcon icon = Utils::Icons::WARNING.icon(); return icon; } case IconType::Bug: { @@ -64,7 +64,7 @@ QIcon icon(IconType type) default: case IconType::Error: { - const static QIcon icon = Core::Icons::ERROR.icon(); + const static QIcon icon = Utils::Icons::ERROR.icon(); return icon; } } diff --git a/src/plugins/valgrind/callgrindtool.cpp b/src/plugins/valgrind/callgrindtool.cpp index 6d708997d6b..59b2b73d3af 100644 --- a/src/plugins/valgrind/callgrindtool.cpp +++ b/src/plugins/valgrind/callgrindtool.cpp @@ -54,7 +54,6 @@ #include #include #include -#include #include #include @@ -72,6 +71,7 @@ #include #include #include +#include #include #include @@ -366,14 +366,14 @@ CallgrindTool::CallgrindTool(QObject *parent) // load external log file auto action = m_loadExternalLogFile = new QAction(this); - action->setIcon(Core::Icons::OPENFILE.icon()); + action->setIcon(Utils::Icons::OPENFILE.icon()); action->setToolTip(tr("Load External Log File")); connect(action, &QAction::triggered, this, &CallgrindTool::loadExternalLogFile); // dump action m_dumpAction = action = new QAction(this); action->setDisabled(true); - action->setIcon(Core::Icons::REDO.icon()); + action->setIcon(Utils::Icons::REDO.icon()); //action->setText(tr("Dump")); action->setToolTip(tr("Request the dumping of profile information. This will update the Callgrind visualization.")); connect(action, &QAction::triggered, this, &CallgrindTool::slotRequestDump); @@ -381,7 +381,7 @@ CallgrindTool::CallgrindTool(QObject *parent) // reset action m_resetAction = action = new QAction(this); action->setDisabled(true); - action->setIcon(Core::Icons::RELOAD.icon()); + action->setIcon(Utils::Icons::RELOAD.icon()); //action->setText(tr("Reset")); action->setToolTip(tr("Reset all event counters.")); connect(action, &QAction::triggered, this, &CallgrindTool::resetRequested); @@ -389,7 +389,7 @@ CallgrindTool::CallgrindTool(QObject *parent) // pause action m_pauseAction = action = new QAction(this); action->setCheckable(true); - action->setIcon(Core::Icons::INTERRUPT_SMALL_TOOLBAR.icon()); + action->setIcon(Utils::Icons::INTERRUPT_SMALL_TOOLBAR.icon()); //action->setText(tr("Ignore")); action->setToolTip(tr("Pause event logging. No events are counted which will speed up program execution during profiling.")); connect(action, &QAction::toggled, this, &CallgrindTool::pauseToggled); @@ -481,7 +481,7 @@ CallgrindTool::CallgrindTool(QObject *parent) // Filtering action = m_filterProjectCosts = new QAction(tr("Show Project Costs Only"), this); - action->setIcon(Core::Icons::FILTER.icon()); + action->setIcon(Utils::Icons::FILTER.icon()); action->setToolTip(tr("Show only profiling info that originated from this project source.")); action->setCheckable(true); connect(action, &QAction::toggled, this, &CallgrindTool::handleFilterProjectCosts); diff --git a/src/plugins/valgrind/memcheckerrorview.cpp b/src/plugins/valgrind/memcheckerrorview.cpp index 19f3b117297..a90cabf07ef 100644 --- a/src/plugins/valgrind/memcheckerrorview.cpp +++ b/src/plugins/valgrind/memcheckerrorview.cpp @@ -58,7 +58,7 @@ MemcheckErrorView::MemcheckErrorView(QWidget *parent) m_suppressAction = new QAction(this); m_suppressAction->setText(tr("Suppress Error")); const QIcon icon = Utils::Icon({ - {QLatin1String(":/core/images/eye_open.png"), Utils::Theme::TextColorNormal}, + {QLatin1String(":/utils/images/eye_open.png"), Utils::Theme::TextColorNormal}, {QLatin1String(":/valgrind/images/suppressoverlay.png"), Utils::Theme::IconsErrorColor}}, Utils::Icon::Tint | Utils::Icon::PunchEdges).icon(); m_suppressAction->setIcon(icon); diff --git a/src/plugins/valgrind/memchecktool.cpp b/src/plugins/valgrind/memchecktool.cpp index 8e4ea368782..89e7c40f6aa 100644 --- a/src/plugins/valgrind/memchecktool.cpp +++ b/src/plugins/valgrind/memchecktool.cpp @@ -60,7 +60,6 @@ #include #include #include -#include #include #include #include @@ -355,7 +354,7 @@ MemcheckTool::MemcheckTool(QObject *parent) // Load external XML log file auto action = new QAction(this); - action->setIcon(Core::Icons::OPENFILE.icon()); + action->setIcon(Utils::Icons::OPENFILE.icon()); action->setToolTip(tr("Load External XML Log File")); connect(action, &QAction::triggered, this, &MemcheckTool::loadExternalXmlLogFile); m_loadExternalLogFile = action; @@ -377,7 +376,7 @@ MemcheckTool::MemcheckTool(QObject *parent) m_goNext = action; auto filterButton = new QToolButton; - filterButton->setIcon(Core::Icons::FILTER.icon()); + filterButton->setIcon(Utils::Icons::FILTER.icon()); filterButton->setText(tr("Error Filter")); filterButton->setPopupMode(QToolButton::InstantPopup); filterButton->setProperty("noArrow", true); diff --git a/src/plugins/winrt/winrtpackagedeploymentstepwidget.cpp b/src/plugins/winrt/winrtpackagedeploymentstepwidget.cpp index 7076cca7f65..c7ef43bda00 100644 --- a/src/plugins/winrt/winrtpackagedeploymentstepwidget.cpp +++ b/src/plugins/winrt/winrtpackagedeploymentstepwidget.cpp @@ -25,7 +25,7 @@ #include "winrtpackagedeploymentstepwidget.h" #include -#include +#include #include namespace WinRt { @@ -37,7 +37,7 @@ WinRtPackageDeploymentStepWidget::WinRtPackageDeploymentStepWidget(WinRtPackageD { m_ui->setupUi(this); m_ui->leArguments->setText(m_step->winDeployQtArguments()); - m_ui->btnRestoreDefaultArgs->setIcon(Core::Icons::RESET.icon()); + m_ui->btnRestoreDefaultArgs->setIcon(Utils::Icons::RESET.icon()); } WinRtPackageDeploymentStepWidget::~WinRtPackageDeploymentStepWidget() diff --git a/src/plugins/winrt/winrtruncontrol.cpp b/src/plugins/winrt/winrtruncontrol.cpp index 9bb06b086a4..2f55773488a 100644 --- a/src/plugins/winrt/winrtruncontrol.cpp +++ b/src/plugins/winrt/winrtruncontrol.cpp @@ -29,7 +29,6 @@ #include "winrtrunconfiguration.h" #include "winrtrunnerhelper.h" -#include #include #include #include @@ -38,6 +37,7 @@ #include #include #include +#include #include @@ -56,7 +56,7 @@ WinRtRunControl::WinRtRunControl(WinRtRunConfiguration *runConfiguration, Core:: , m_state(StoppedState) , m_runner(0) { - setIcon(Core::Icons::RUN_SMALL_TOOLBAR); + setIcon(Utils::Icons::RUN_SMALL_TOOLBAR); } void WinRtRunControl::start() diff --git a/src/tools/icons/qtcreatoricons.svg b/src/tools/icons/qtcreatoricons.svg index 4b6b60ebf16..c1f6c10a06c 100644 --- a/src/tools/icons/qtcreatoricons.svg +++ b/src/tools/icons/qtcreatoricons.svg @@ -585,7 +585,7 @@ id="layer1" style="display:inline"> @@ -1603,7 +1603,7 @@ style="fill:none;stroke:#000000;stroke-width:0.89999998;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" /> @@ -1627,7 +1627,7 @@ style="display:inline;fill:#000000;stroke:none;fill-opacity:1.0" /> @@ -1655,7 +1655,7 @@ id="path4975-0" /> @@ -1679,7 +1679,7 @@ sodipodi:nodetypes="cccc" /> @@ -1704,7 +1704,7 @@ @@ -1787,7 +1787,7 @@ + id="src/libs/utils/images/interrupt_small"> + id="src/libs/utils/images/plus"> + id="src/libs/utils/images/minus"> + id="src/libs/utils/images/clean_pane_small"> + id="src/libs/utils/images/eye_open"> + id="src/libs/utils/images/eye_closed"> + id="src/libs/utils/images/boundingrect"> + id="src/libs/utils/images/reset"> + id="src/libs/utils/images/replace_a"> @@ -4604,7 +4604,7 @@ transform="translate(16.5,0.5)" /> @@ -4869,7 +4869,7 @@ @@ -5576,7 +5576,7 @@ + id="src/libs/utils/images/filesave">