diff --git a/share/qtcreator/templates/wizards/autotest/autotest.png b/share/qtcreator/templates/wizards/autotest/autotest.png index 3045e83a29d..0139c89983d 100644 Binary files a/share/qtcreator/templates/wizards/autotest/autotest.png and b/share/qtcreator/templates/wizards/autotest/autotest.png differ diff --git a/share/qtcreator/templates/wizards/autotest/autotest@2x.png b/share/qtcreator/templates/wizards/autotest/autotest@2x.png index 8a29aa6316c..4c699b7b812 100644 Binary files a/share/qtcreator/templates/wizards/autotest/autotest@2x.png and b/share/qtcreator/templates/wizards/autotest/autotest@2x.png differ diff --git a/share/qtcreator/templates/wizards/autotest/wizard.json b/share/qtcreator/templates/wizards/autotest/wizard.json index 84f3f3d3104..9850079be8c 100644 --- a/share/qtcreator/templates/wizards/autotest/wizard.json +++ b/share/qtcreator/templates/wizards/autotest/wizard.json @@ -7,6 +7,7 @@ "trDisplayName": "Auto Test Project", "trDisplayCategory": "Other Project", "icon": "autotest.png", + "iconKind": "Themed", "featuresRequired": [ "QtSupport.Wizards.FeatureDesktop" ], "enabled": "%{JS: value('Plugins').indexOf('CppEditor') >= 0}", diff --git a/share/qtcreator/templates/wizards/classes/python/wizard.json b/share/qtcreator/templates/wizards/classes/python/wizard.json index 960a99b9fe5..7a86aa341e5 100644 --- a/share/qtcreator/templates/wizards/classes/python/wizard.json +++ b/share/qtcreator/templates/wizards/classes/python/wizard.json @@ -7,6 +7,7 @@ "trDisplayName": "Python Class", "trDisplayCategory": "Python", "icon": "../../files/python/icon.png", + "iconKind": "Themed", "enabled": "%{JS: value('Plugins').indexOf('Python') >= 0}", "options": diff --git a/share/qtcreator/templates/wizards/files/nim/wizard.json b/share/qtcreator/templates/wizards/files/nim/wizard.json index 1baf376aa41..e1957ed3f64 100644 --- a/share/qtcreator/templates/wizards/files/nim/wizard.json +++ b/share/qtcreator/templates/wizards/files/nim/wizard.json @@ -7,6 +7,7 @@ "trDisplayName": "Nim File", "trDisplayCategory": "Nim", "icon": "../../projects/nim/icon.png", + "iconKind": "Themed", "enabled": "%{JS: value('Plugins').indexOf('Nim') >= 0}", "options": { "key": "DefaultSuffix", "value": "nim" }, diff --git a/share/qtcreator/templates/wizards/files/nimscript/wizard.json b/share/qtcreator/templates/wizards/files/nimscript/wizard.json index 94012a7167f..09afa96325d 100644 --- a/share/qtcreator/templates/wizards/files/nimscript/wizard.json +++ b/share/qtcreator/templates/wizards/files/nimscript/wizard.json @@ -7,6 +7,7 @@ "trDisplayName": "Nim Script File", "trDisplayCategory": "Nim", "icon": "../../projects/nim/icon.png", + "iconKind": "Themed", "enabled": "%{JS: value('Plugins').indexOf('Nim') >= 0}", "options": { "key": "DefaultSuffix", "value": "nims" }, diff --git a/share/qtcreator/templates/wizards/files/python/icon.png b/share/qtcreator/templates/wizards/files/python/icon.png index 8ab694fe7af..8eb51c44550 100644 Binary files a/share/qtcreator/templates/wizards/files/python/icon.png and b/share/qtcreator/templates/wizards/files/python/icon.png differ diff --git a/share/qtcreator/templates/wizards/files/python/icon@2x.png b/share/qtcreator/templates/wizards/files/python/icon@2x.png index 8d1f2751860..70464b179f4 100644 Binary files a/share/qtcreator/templates/wizards/files/python/icon@2x.png and b/share/qtcreator/templates/wizards/files/python/icon@2x.png differ diff --git a/share/qtcreator/templates/wizards/files/python/wizard.json b/share/qtcreator/templates/wizards/files/python/wizard.json index a01e32bf4a6..a4398f802bd 100644 --- a/share/qtcreator/templates/wizards/files/python/wizard.json +++ b/share/qtcreator/templates/wizards/files/python/wizard.json @@ -7,6 +7,7 @@ "trDisplayName": "Python File", "trDisplayCategory": "Python", "icon": "icon.png", + "iconKind": "Themed", "enabled": "%{JS: value('Plugins').indexOf('Python') >= 0}", "options": { "key": "DefaultSuffix", "value": "%{JS: Util.preferredSuffix('text/x-python')}" }, diff --git a/share/qtcreator/templates/wizards/global/consoleapplication.png b/share/qtcreator/templates/wizards/global/consoleapplication.png index 36c822d9dc1..3f1f148bd1e 100644 Binary files a/share/qtcreator/templates/wizards/global/consoleapplication.png and b/share/qtcreator/templates/wizards/global/consoleapplication.png differ diff --git a/share/qtcreator/templates/wizards/global/consoleapplication@2x.png b/share/qtcreator/templates/wizards/global/consoleapplication@2x.png index d94451c152b..d3995d28f79 100644 Binary files a/share/qtcreator/templates/wizards/global/consoleapplication@2x.png and b/share/qtcreator/templates/wizards/global/consoleapplication@2x.png differ diff --git a/share/qtcreator/templates/wizards/global/guiapplication.png b/share/qtcreator/templates/wizards/global/guiapplication.png index fba6e608a09..b60008a3c26 100644 Binary files a/share/qtcreator/templates/wizards/global/guiapplication.png and b/share/qtcreator/templates/wizards/global/guiapplication.png differ diff --git a/share/qtcreator/templates/wizards/global/guiapplication@2x.png b/share/qtcreator/templates/wizards/global/guiapplication@2x.png index 1c20ad695b3..1ccd0931eca 100644 Binary files a/share/qtcreator/templates/wizards/global/guiapplication@2x.png and b/share/qtcreator/templates/wizards/global/guiapplication@2x.png differ diff --git a/share/qtcreator/templates/wizards/global/lib.png b/share/qtcreator/templates/wizards/global/lib.png index 52cb73e382e..e163a749cb0 100644 Binary files a/share/qtcreator/templates/wizards/global/lib.png and b/share/qtcreator/templates/wizards/global/lib.png differ diff --git a/share/qtcreator/templates/wizards/global/lib@2x.png b/share/qtcreator/templates/wizards/global/lib@2x.png index c959779b029..946e55a7df3 100644 Binary files a/share/qtcreator/templates/wizards/global/lib@2x.png and b/share/qtcreator/templates/wizards/global/lib@2x.png differ diff --git a/share/qtcreator/templates/wizards/projects/consoleapp/wizard.json b/share/qtcreator/templates/wizards/projects/consoleapp/wizard.json index 1bc8554c8b7..0fac3208cba 100644 --- a/share/qtcreator/templates/wizards/projects/consoleapp/wizard.json +++ b/share/qtcreator/templates/wizards/projects/consoleapp/wizard.json @@ -7,6 +7,7 @@ "trDisplayName": "Qt Console Application", "trDisplayCategory": "Application (Qt)", "icon": "../../global/consoleapplication.png", + "iconKind": "Themed", "featuresRequired": [ "QtSupport.Wizards.FeatureQt" ], "enabled": "%{JS: value('Plugins').indexOf('QmakeProjectManager') >= 0 || value('Plugins').indexOf('QbsProjectManager') >= 0 || value('Plugins').indexOf('CMakeProjectManager') >= 0 || value('Plugins').indexOf('MesonProjectManager') >= 0}", diff --git a/share/qtcreator/templates/wizards/projects/cpplibrary/wizard.json b/share/qtcreator/templates/wizards/projects/cpplibrary/wizard.json index 217a5c1a735..c66dce44b0e 100644 --- a/share/qtcreator/templates/wizards/projects/cpplibrary/wizard.json +++ b/share/qtcreator/templates/wizards/projects/cpplibrary/wizard.json @@ -7,6 +7,7 @@ "trDisplayName": "C++ Library", "trDisplayCategory": "Library", "icon": "../../global/lib.png", + "iconKind": "Themed", "enabled": "%{JS: value('Plugins').indexOf('CppEditor') >= 0 && (value('Plugins').indexOf('QmakeProjectManager') >= 0 || value('Plugins').indexOf('CMakeProjectManager') >= 0 || value('Plugins').indexOf('MesonProjectManager') >= 0)}", "options": diff --git a/share/qtcreator/templates/wizards/projects/nim/icon.png b/share/qtcreator/templates/wizards/projects/nim/icon.png index d3f8575b26b..8fe8c036395 100644 Binary files a/share/qtcreator/templates/wizards/projects/nim/icon.png and b/share/qtcreator/templates/wizards/projects/nim/icon.png differ diff --git a/share/qtcreator/templates/wizards/projects/nim/icon@2x.png b/share/qtcreator/templates/wizards/projects/nim/icon@2x.png index bdc8c57055f..b02a7ed104f 100644 Binary files a/share/qtcreator/templates/wizards/projects/nim/icon@2x.png and b/share/qtcreator/templates/wizards/projects/nim/icon@2x.png differ diff --git a/share/qtcreator/templates/wizards/projects/nim/wizard.json b/share/qtcreator/templates/wizards/projects/nim/wizard.json index 1239e444e91..68970d4d9ac 100644 --- a/share/qtcreator/templates/wizards/projects/nim/wizard.json +++ b/share/qtcreator/templates/wizards/projects/nim/wizard.json @@ -8,6 +8,7 @@ "trDisplayCategory": "Non-Qt Project", "featuresRequired": [ "ToolChain.Nim.NimToolChain" ], "icon": "icon.png", + "iconKind": "Themed", "enabled": "%{JS: value('Plugins').indexOf('Nim') >= 0 }", "options": diff --git a/share/qtcreator/templates/wizards/projects/nimble/wizard.json b/share/qtcreator/templates/wizards/projects/nimble/wizard.json index 4f3ac9d8ea2..8a0a14b8304 100644 --- a/share/qtcreator/templates/wizards/projects/nimble/wizard.json +++ b/share/qtcreator/templates/wizards/projects/nimble/wizard.json @@ -10,6 +10,7 @@ "ToolChain.Nim.NimToolChain" ], "icon":"../nim/icon.png", + "iconKind": "Themed", "enabled":"%{JS: value('Plugins').indexOf('Nim') >= 0 }", "options":[ { diff --git a/share/qtcreator/templates/wizards/projects/plainc/wizard.json b/share/qtcreator/templates/wizards/projects/plainc/wizard.json index 2f6d8bf5ca4..e7885bde6ae 100644 --- a/share/qtcreator/templates/wizards/projects/plainc/wizard.json +++ b/share/qtcreator/templates/wizards/projects/plainc/wizard.json @@ -7,6 +7,7 @@ "trDisplayName": "Plain C Application", "trDisplayCategory": "Non-Qt Project", "icon": "../../global/consoleapplication.png", + "iconKind": "Themed", "enabled": "%{JS: value('Plugins').indexOf('CppEditor') >= 0 && (value('Plugins').indexOf('QmakeProjectManager') >= 0 || value('Plugins').indexOf('QbsProjectManager') >= 0 || value('Plugins').indexOf('CMakeProjectManager') >= 0 || value('Plugins').indexOf('MesonProjectManager') >= 0)}", "options": diff --git a/share/qtcreator/templates/wizards/projects/plaincpp/wizard.json b/share/qtcreator/templates/wizards/projects/plaincpp/wizard.json index 3475d272072..52cb071bee5 100644 --- a/share/qtcreator/templates/wizards/projects/plaincpp/wizard.json +++ b/share/qtcreator/templates/wizards/projects/plaincpp/wizard.json @@ -7,6 +7,7 @@ "trDisplayName": "Plain C++ Application", "trDisplayCategory": "Non-Qt Project", "icon": "../../global/consoleapplication.png", + "iconKind": "Themed", "enabled": "%{JS: value('Plugins').indexOf('CppEditor') >= 0 && (value('Plugins').indexOf('QmakeProjectManager') >= 0 || value('Plugins').indexOf('QbsProjectManager') >= 0 || value('Plugins').indexOf('CMakeProjectManager') >= 0 || value('Plugins').indexOf('MesonProjectManager') >= 0)}", "options": diff --git a/share/qtcreator/templates/wizards/projects/qmake/empty/wizard.json b/share/qtcreator/templates/wizards/projects/qmake/empty/wizard.json index 84f019c222f..1c449e0c0d3 100644 --- a/share/qtcreator/templates/wizards/projects/qmake/empty/wizard.json +++ b/share/qtcreator/templates/wizards/projects/qmake/empty/wizard.json @@ -7,6 +7,7 @@ "trDisplayName": "Empty qmake Project", "trDisplayCategory": "Other Project", "icon": "../../../global/guiapplication.png", + "iconKind": "Themed", "featuresRequired": [ "QtSupport.Wizards.FeatureQt" ], "enabled": "%{JS: value('Plugins').indexOf('QmakeProjectManager') >= 0}", "options": diff --git a/share/qtcreator/templates/wizards/projects/qtforpythonapplication/empty/icon.png b/share/qtcreator/templates/wizards/projects/qtforpythonapplication/empty/icon.png index 483f71196d3..96a00a82ebf 100644 Binary files a/share/qtcreator/templates/wizards/projects/qtforpythonapplication/empty/icon.png and b/share/qtcreator/templates/wizards/projects/qtforpythonapplication/empty/icon.png differ diff --git a/share/qtcreator/templates/wizards/projects/qtforpythonapplication/empty/icon@2x.png b/share/qtcreator/templates/wizards/projects/qtforpythonapplication/empty/icon@2x.png index 81beed5e239..77675b61961 100644 Binary files a/share/qtcreator/templates/wizards/projects/qtforpythonapplication/empty/icon@2x.png and b/share/qtcreator/templates/wizards/projects/qtforpythonapplication/empty/icon@2x.png differ diff --git a/share/qtcreator/templates/wizards/projects/qtforpythonapplication/empty/wizard.json b/share/qtcreator/templates/wizards/projects/qtforpythonapplication/empty/wizard.json index 817ad3609e5..268fc6bd9e6 100644 --- a/share/qtcreator/templates/wizards/projects/qtforpythonapplication/empty/wizard.json +++ b/share/qtcreator/templates/wizards/projects/qtforpythonapplication/empty/wizard.json @@ -7,6 +7,7 @@ "trDisplayName": "Qt for Python - Empty", "trDisplayCategory": "Application (Qt for Python)", "icon": "icon.png", + "iconKind": "Themed", "enabled": "%{JS: value('Plugins').indexOf('Python') >= 0}", "options": diff --git a/share/qtcreator/templates/wizards/projects/qtforpythonapplication/icons/icon.png b/share/qtcreator/templates/wizards/projects/qtforpythonapplication/icons/icon.png index ba97ffd6620..e2a92fb5667 100644 Binary files a/share/qtcreator/templates/wizards/projects/qtforpythonapplication/icons/icon.png and b/share/qtcreator/templates/wizards/projects/qtforpythonapplication/icons/icon.png differ diff --git a/share/qtcreator/templates/wizards/projects/qtforpythonapplication/icons/icon@2x.png b/share/qtcreator/templates/wizards/projects/qtforpythonapplication/icons/icon@2x.png index 4c26be65ba4..8cfe07e1b9f 100644 Binary files a/share/qtcreator/templates/wizards/projects/qtforpythonapplication/icons/icon@2x.png and b/share/qtcreator/templates/wizards/projects/qtforpythonapplication/icons/icon@2x.png differ diff --git a/share/qtcreator/templates/wizards/projects/qtforpythonapplication/mainwindow/wizard.json b/share/qtcreator/templates/wizards/projects/qtforpythonapplication/mainwindow/wizard.json index 47a26438bd3..a16b7fd900a 100644 --- a/share/qtcreator/templates/wizards/projects/qtforpythonapplication/mainwindow/wizard.json +++ b/share/qtcreator/templates/wizards/projects/qtforpythonapplication/mainwindow/wizard.json @@ -7,6 +7,7 @@ "trDisplayName": "Qt for Python - Window", "trDisplayCategory": "Application (Qt for Python)", "icon": "../icons/icon.png", + "iconKind": "Themed", "enabled": "%{JS: value('Plugins').indexOf('Python') >= 0}", "options": diff --git a/share/qtcreator/templates/wizards/projects/qtforpythonapplication/qtquickapplication/wizard.json b/share/qtcreator/templates/wizards/projects/qtforpythonapplication/qtquickapplication/wizard.json index 1967d1666a3..268367d1f6f 100644 --- a/share/qtcreator/templates/wizards/projects/qtforpythonapplication/qtquickapplication/wizard.json +++ b/share/qtcreator/templates/wizards/projects/qtforpythonapplication/qtquickapplication/wizard.json @@ -7,6 +7,7 @@ "trDisplayName": "Qt for Python - Qt Quick Application - Empty", "trDisplayCategory": "Application (Qt for Python)", "icon": "../icons/icon.png", + "iconKind": "Themed", "enabled": "%{JS: value('Plugins').indexOf('Python') >= 0}", "options": diff --git a/share/qtcreator/templates/wizards/projects/qtforpythonapplication/widget/wizard.json b/share/qtcreator/templates/wizards/projects/qtforpythonapplication/widget/wizard.json index de9f36df931..6a068d5fd3c 100644 --- a/share/qtcreator/templates/wizards/projects/qtforpythonapplication/widget/wizard.json +++ b/share/qtcreator/templates/wizards/projects/qtforpythonapplication/widget/wizard.json @@ -7,6 +7,7 @@ "trDisplayName": "Qt for Python - Window (UI file)", "trDisplayCategory": "Application (Qt for Python)", "icon": "../icons/icon.png", + "iconKind": "Themed", "enabled": "%{JS: value('Plugins').indexOf('Python') >= 0}", "options": diff --git a/share/qtcreator/templates/wizards/projects/qtquick2-extension/lib.png b/share/qtcreator/templates/wizards/projects/qtquick2-extension/lib.png index 0566f1d5f12..7e53940e461 100644 Binary files a/share/qtcreator/templates/wizards/projects/qtquick2-extension/lib.png and b/share/qtcreator/templates/wizards/projects/qtquick2-extension/lib.png differ diff --git a/share/qtcreator/templates/wizards/projects/qtquick2-extension/lib@2x.png b/share/qtcreator/templates/wizards/projects/qtquick2-extension/lib@2x.png index 90a842d6e83..262342b2cf1 100644 Binary files a/share/qtcreator/templates/wizards/projects/qtquick2-extension/lib@2x.png and b/share/qtcreator/templates/wizards/projects/qtquick2-extension/lib@2x.png differ diff --git a/share/qtcreator/templates/wizards/projects/qtquick2-extension/wizard.json b/share/qtcreator/templates/wizards/projects/qtquick2-extension/wizard.json index 404fd0951c2..45989fb7de2 100644 --- a/share/qtcreator/templates/wizards/projects/qtquick2-extension/wizard.json +++ b/share/qtcreator/templates/wizards/projects/qtquick2-extension/wizard.json @@ -7,6 +7,7 @@ "trDisplayName": "Qt Quick 2 Extension Plugin", "trDisplayCategory": "Library", "icon": "lib.png", + "iconKind": "Themed", "featuresRequired": [ "QtSupport.Wizards.FeatureQtQuick", "QtSupport.Wizards.FeatureQtQuick.2" ], "enabled": "%{JS: value('Plugins').indexOf('QmakeProjectManager') >= 0}", diff --git a/share/qtcreator/templates/wizards/projects/qtquickapplication/empty/icon.png b/share/qtcreator/templates/wizards/projects/qtquickapplication/empty/icon.png index d9747274a91..8be6c371bed 100644 Binary files a/share/qtcreator/templates/wizards/projects/qtquickapplication/empty/icon.png and b/share/qtcreator/templates/wizards/projects/qtquickapplication/empty/icon.png differ diff --git a/share/qtcreator/templates/wizards/projects/qtquickapplication/empty/icon@2x.png b/share/qtcreator/templates/wizards/projects/qtquickapplication/empty/icon@2x.png index 7d79b412e32..094df34dba0 100644 Binary files a/share/qtcreator/templates/wizards/projects/qtquickapplication/empty/icon@2x.png and b/share/qtcreator/templates/wizards/projects/qtquickapplication/empty/icon@2x.png differ diff --git a/share/qtcreator/templates/wizards/projects/qtquickapplication/empty/wizard.json b/share/qtcreator/templates/wizards/projects/qtquickapplication/empty/wizard.json index 4e4936a77af..401fb21e16c 100644 --- a/share/qtcreator/templates/wizards/projects/qtquickapplication/empty/wizard.json +++ b/share/qtcreator/templates/wizards/projects/qtquickapplication/empty/wizard.json @@ -7,6 +7,7 @@ "trDisplayName": "Qt Quick Application", "trDisplayCategory": "Application (Qt)", "icon": "icon.png", + "iconKind": "Themed", "featuresRequired": [ "QtSupport.Wizards.FeatureQt.5.6" ], "enabled": "%{JS: value('Plugins').indexOf('QmakeProjectManager') >= 0 || value('Plugins').indexOf('QbsProjectManager') >= 0 || value('Plugins').indexOf('CMakeProjectManager') >= 0}", diff --git a/share/qtcreator/templates/wizards/projects/qtquickuiprototype/qtquickuiprototype.png b/share/qtcreator/templates/wizards/projects/qtquickuiprototype/qtquickuiprototype.png index 949b09c8516..3d120b6e30c 100644 Binary files a/share/qtcreator/templates/wizards/projects/qtquickuiprototype/qtquickuiprototype.png and b/share/qtcreator/templates/wizards/projects/qtquickuiprototype/qtquickuiprototype.png differ diff --git a/share/qtcreator/templates/wizards/projects/qtquickuiprototype/qtquickuiprototype@2x.png b/share/qtcreator/templates/wizards/projects/qtquickuiprototype/qtquickuiprototype@2x.png index ab779dca3ea..8667c4d1077 100644 Binary files a/share/qtcreator/templates/wizards/projects/qtquickuiprototype/qtquickuiprototype@2x.png and b/share/qtcreator/templates/wizards/projects/qtquickuiprototype/qtquickuiprototype@2x.png differ diff --git a/share/qtcreator/templates/wizards/projects/qtquickuiprototype/wizard.json b/share/qtcreator/templates/wizards/projects/qtquickuiprototype/wizard.json index 764998e6f80..366ec1e4cd1 100644 --- a/share/qtcreator/templates/wizards/projects/qtquickuiprototype/wizard.json +++ b/share/qtcreator/templates/wizards/projects/qtquickuiprototype/wizard.json @@ -7,6 +7,7 @@ "trDisplayName": "Qt Quick UI Prototype", "trDisplayCategory": "Other Project", "icon": "qtquickuiprototype.png", + "iconKind": "Themed", "enabled": "%{JS: value('Plugins').indexOf('QmlProjectManager') >= 0}", "featuresRequired": [ "QtSupport.Wizards.FeatureQtQuickProject", "QtSupport.Wizards.FeatureQt" ], diff --git a/share/qtcreator/templates/wizards/projects/qtwidgetsapplication/wizard.json b/share/qtcreator/templates/wizards/projects/qtwidgetsapplication/wizard.json index baa5d860e18..2a72449b2c9 100644 --- a/share/qtcreator/templates/wizards/projects/qtwidgetsapplication/wizard.json +++ b/share/qtcreator/templates/wizards/projects/qtwidgetsapplication/wizard.json @@ -7,6 +7,7 @@ "trDisplayName": "Qt Widgets Application", "trDisplayCategory": "Application (Qt)", "icon": "../../global/guiapplication.png", + "iconKind": "Themed", "featuresRequired": [ "QtSupport.Wizards.FeatureQt" ], "enabled": "%{JS: value('Plugins').indexOf('QmakeProjectManager') >= 0 || value('Plugins').indexOf('CMakeProjectManager') >= 0 || value('Plugins').indexOf('QbsProjectManager') >= 0 || value('Plugins').indexOf('MesonProjectManager') >= 0}", diff --git a/share/qtcreator/templates/wizards/projects/vcs/bazaar/icon.png b/share/qtcreator/templates/wizards/projects/vcs/bazaar/icon.png index 4c04cdbad95..256a2008c83 100644 Binary files a/share/qtcreator/templates/wizards/projects/vcs/bazaar/icon.png and b/share/qtcreator/templates/wizards/projects/vcs/bazaar/icon.png differ diff --git a/share/qtcreator/templates/wizards/projects/vcs/bazaar/icon@2x.png b/share/qtcreator/templates/wizards/projects/vcs/bazaar/icon@2x.png index d0ee3bb43b0..9550f6c2209 100644 Binary files a/share/qtcreator/templates/wizards/projects/vcs/bazaar/icon@2x.png and b/share/qtcreator/templates/wizards/projects/vcs/bazaar/icon@2x.png differ diff --git a/share/qtcreator/templates/wizards/projects/vcs/bazaar/wizard.json b/share/qtcreator/templates/wizards/projects/vcs/bazaar/wizard.json index 060b55944a5..8a20a1ef2e8 100644 --- a/share/qtcreator/templates/wizards/projects/vcs/bazaar/wizard.json +++ b/share/qtcreator/templates/wizards/projects/vcs/bazaar/wizard.json @@ -7,6 +7,7 @@ "trDisplayName": "Bazaar Clone (Or Branch)", "trDisplayCategory": "Import Project", "icon": "icon.png", + "iconKind": "Themed", "enabled": "%{JS: value('Plugins').indexOf('Bazaar') >= 0}", "options": diff --git a/share/qtcreator/templates/wizards/projects/vcs/cvs/icon.png b/share/qtcreator/templates/wizards/projects/vcs/cvs/icon.png index bd925b2e984..1f837052dae 100644 Binary files a/share/qtcreator/templates/wizards/projects/vcs/cvs/icon.png and b/share/qtcreator/templates/wizards/projects/vcs/cvs/icon.png differ diff --git a/share/qtcreator/templates/wizards/projects/vcs/cvs/icon@2x.png b/share/qtcreator/templates/wizards/projects/vcs/cvs/icon@2x.png index ec330c9f440..8d4e8921175 100644 Binary files a/share/qtcreator/templates/wizards/projects/vcs/cvs/icon@2x.png and b/share/qtcreator/templates/wizards/projects/vcs/cvs/icon@2x.png differ diff --git a/share/qtcreator/templates/wizards/projects/vcs/cvs/wizard.json b/share/qtcreator/templates/wizards/projects/vcs/cvs/wizard.json index 075a69fdb16..25287a56b07 100644 --- a/share/qtcreator/templates/wizards/projects/vcs/cvs/wizard.json +++ b/share/qtcreator/templates/wizards/projects/vcs/cvs/wizard.json @@ -7,6 +7,7 @@ "trDisplayName": "CVS Checkout", "trDisplayCategory": "Import Project", "icon": "icon.png", + "iconKind": "Themed", "enabled": "%{JS: value('Plugins').indexOf('CVS') >= 0}", "options": diff --git a/share/qtcreator/templates/wizards/projects/vcs/git/icon.png b/share/qtcreator/templates/wizards/projects/vcs/git/icon.png index cfbd0c497ff..df5bb7df518 100644 Binary files a/share/qtcreator/templates/wizards/projects/vcs/git/icon.png and b/share/qtcreator/templates/wizards/projects/vcs/git/icon.png differ diff --git a/share/qtcreator/templates/wizards/projects/vcs/git/icon@2x.png b/share/qtcreator/templates/wizards/projects/vcs/git/icon@2x.png index 2edb04b5a06..7c2d0639329 100644 Binary files a/share/qtcreator/templates/wizards/projects/vcs/git/icon@2x.png and b/share/qtcreator/templates/wizards/projects/vcs/git/icon@2x.png differ diff --git a/share/qtcreator/templates/wizards/projects/vcs/git/wizard.json b/share/qtcreator/templates/wizards/projects/vcs/git/wizard.json index 62bad7ee123..2967a51f31c 100644 --- a/share/qtcreator/templates/wizards/projects/vcs/git/wizard.json +++ b/share/qtcreator/templates/wizards/projects/vcs/git/wizard.json @@ -7,6 +7,7 @@ "trDisplayName": "Git Clone", "trDisplayCategory": "Import Project", "icon": "icon.png", + "iconKind": "Themed", "enabled": "%{JS: value('Plugins').indexOf('Git') >= 0}", "options": diff --git a/share/qtcreator/templates/wizards/projects/vcs/mercurial/icon.png b/share/qtcreator/templates/wizards/projects/vcs/mercurial/icon.png index b60e2df21a9..41c03f4f2dd 100644 Binary files a/share/qtcreator/templates/wizards/projects/vcs/mercurial/icon.png and b/share/qtcreator/templates/wizards/projects/vcs/mercurial/icon.png differ diff --git a/share/qtcreator/templates/wizards/projects/vcs/mercurial/icon@2x.png b/share/qtcreator/templates/wizards/projects/vcs/mercurial/icon@2x.png index 28adac54bcd..6e470773f28 100644 Binary files a/share/qtcreator/templates/wizards/projects/vcs/mercurial/icon@2x.png and b/share/qtcreator/templates/wizards/projects/vcs/mercurial/icon@2x.png differ diff --git a/share/qtcreator/templates/wizards/projects/vcs/mercurial/wizard.json b/share/qtcreator/templates/wizards/projects/vcs/mercurial/wizard.json index 81fa26da041..cb7e5ab4f10 100644 --- a/share/qtcreator/templates/wizards/projects/vcs/mercurial/wizard.json +++ b/share/qtcreator/templates/wizards/projects/vcs/mercurial/wizard.json @@ -7,6 +7,7 @@ "trDisplayName": "Mercurial Clone", "trDisplayCategory": "Import Project", "icon": "icon.png", + "iconKind": "Themed", "enabled": "%{JS: value('Plugins').indexOf('Mercurial') >= 0}", "options": diff --git a/share/qtcreator/templates/wizards/projects/vcs/subversion/icon.png b/share/qtcreator/templates/wizards/projects/vcs/subversion/icon.png index 815b68ed1cf..cd5c5aca206 100644 Binary files a/share/qtcreator/templates/wizards/projects/vcs/subversion/icon.png and b/share/qtcreator/templates/wizards/projects/vcs/subversion/icon.png differ diff --git a/share/qtcreator/templates/wizards/projects/vcs/subversion/icon@2x.png b/share/qtcreator/templates/wizards/projects/vcs/subversion/icon@2x.png index fa986f28937..636b7f8e1f2 100644 Binary files a/share/qtcreator/templates/wizards/projects/vcs/subversion/icon@2x.png and b/share/qtcreator/templates/wizards/projects/vcs/subversion/icon@2x.png differ diff --git a/share/qtcreator/templates/wizards/projects/vcs/subversion/wizard.json b/share/qtcreator/templates/wizards/projects/vcs/subversion/wizard.json index 2e63b12eb4f..1ced38032e0 100644 --- a/share/qtcreator/templates/wizards/projects/vcs/subversion/wizard.json +++ b/share/qtcreator/templates/wizards/projects/vcs/subversion/wizard.json @@ -7,6 +7,7 @@ "trDisplayName": "Subversion Checkout", "trDisplayCategory": "Import Project", "icon": "icon.png", + "iconKind": "Themed", "enabled": "%{JS: value('Plugins').indexOf('Subversion') >= 0}", "options": diff --git a/share/qtcreator/templates/wizards/qtcreatorplugin/qtcreatorplugin.png b/share/qtcreator/templates/wizards/qtcreatorplugin/qtcreatorplugin.png index f4c54981afd..9fa454a498f 100644 Binary files a/share/qtcreator/templates/wizards/qtcreatorplugin/qtcreatorplugin.png and b/share/qtcreator/templates/wizards/qtcreatorplugin/qtcreatorplugin.png differ diff --git a/share/qtcreator/templates/wizards/qtcreatorplugin/qtcreatorplugin@2x.png b/share/qtcreator/templates/wizards/qtcreatorplugin/qtcreatorplugin@2x.png index 3d3bea267f5..df1e5889893 100644 Binary files a/share/qtcreator/templates/wizards/qtcreatorplugin/qtcreatorplugin@2x.png and b/share/qtcreator/templates/wizards/qtcreatorplugin/qtcreatorplugin@2x.png differ diff --git a/share/qtcreator/templates/wizards/qtcreatorplugin/wizard.json b/share/qtcreator/templates/wizards/qtcreatorplugin/wizard.json index 6a629f0d05e..95549b2cd99 100644 --- a/share/qtcreator/templates/wizards/qtcreatorplugin/wizard.json +++ b/share/qtcreator/templates/wizards/qtcreatorplugin/wizard.json @@ -7,6 +7,7 @@ "trDisplayName": "Qt Creator Plugin", "trDisplayCategory": "Library", "icon": "qtcreatorplugin.png", + "iconKind": "Themed", "featuresRequired": [ "QtSupport.Wizards.FeatureQt", "QtSupport.Wizards.FeatureDesktop" ], "enabled": "%{JS: value('Plugins').indexOf('CMakeProjectManager') >= 0}", diff --git a/src/libs/utils/images/wizardicon-file.png b/src/libs/utils/images/wizardicon-file.png index 01df9663193..f476d80db08 100644 Binary files a/src/libs/utils/images/wizardicon-file.png and b/src/libs/utils/images/wizardicon-file.png differ diff --git a/src/libs/utils/images/wizardicon-file@2x.png b/src/libs/utils/images/wizardicon-file@2x.png index ed7c0cbb696..46b58fe757a 100644 Binary files a/src/libs/utils/images/wizardicon-file@2x.png and b/src/libs/utils/images/wizardicon-file@2x.png differ diff --git a/src/plugins/coreplugin/iwizardfactory.cpp b/src/plugins/coreplugin/iwizardfactory.cpp index d7da856b7ea..988c4bdd958 100644 --- a/src/plugins/coreplugin/iwizardfactory.cpp +++ b/src/plugins/coreplugin/iwizardfactory.cpp @@ -433,7 +433,8 @@ void IWizardFactory::initialize() static QIcon iconWithText(const QIcon &icon, const QString &text) { if (icon.isNull()) { - static const QIcon fallBack(":/utils/images/wizardicon-file.png"); + static const QIcon fallBack = + IWizardFactory::themedIcon(":/utils/images/wizardicon-file.png"); return iconWithText(fallBack, text); } diff --git a/src/plugins/mcusupport/wizards/application/wizard.json b/src/plugins/mcusupport/wizards/application/wizard.json index 99888785734..e9caecf4c86 100644 --- a/src/plugins/mcusupport/wizards/application/wizard.json +++ b/src/plugins/mcusupport/wizards/application/wizard.json @@ -7,6 +7,7 @@ "trDisplayName": "Mcu Support Application", "trDisplayCategory": "Application (Qt for MCU)", "icon": "../icon.png", + "iconKind": "Themed", "enabled": true, "options": diff --git a/src/plugins/mcusupport/wizards/icon.png b/src/plugins/mcusupport/wizards/icon.png index ef9160b74cf..9043bb1ae04 100644 Binary files a/src/plugins/mcusupport/wizards/icon.png and b/src/plugins/mcusupport/wizards/icon.png differ diff --git a/src/plugins/mcusupport/wizards/icon@2x.png b/src/plugins/mcusupport/wizards/icon@2x.png index 0b1e6f875a2..10b452daae0 100644 Binary files a/src/plugins/mcusupport/wizards/icon@2x.png and b/src/plugins/mcusupport/wizards/icon@2x.png differ diff --git a/src/plugins/projectexplorer/images/importasproject.png b/src/plugins/projectexplorer/images/importasproject.png index b75e0422f7f..6cee1958256 100644 Binary files a/src/plugins/projectexplorer/images/importasproject.png and b/src/plugins/projectexplorer/images/importasproject.png differ diff --git a/src/plugins/projectexplorer/images/importasproject@2x.png b/src/plugins/projectexplorer/images/importasproject@2x.png index 8c708b52e3b..e352692fc9e 100644 Binary files a/src/plugins/projectexplorer/images/importasproject@2x.png and b/src/plugins/projectexplorer/images/importasproject@2x.png differ diff --git a/src/plugins/projectexplorer/projectexplorericons.cpp b/src/plugins/projectexplorer/projectexplorericons.cpp index dbc92be002a..663e16a9ae4 100644 --- a/src/plugins/projectexplorer/projectexplorericons.cpp +++ b/src/plugins/projectexplorer/projectexplorericons.cpp @@ -64,8 +64,8 @@ const Icon DEVICE_DISCONNECTED_INDICATOR({ {":/utils/images/filledcircle.png", Theme::IconsStopColor}}, Icon::Tint); const Icon DEVICE_DISCONNECTED_INDICATOR_OVERLAY({ {":/projectexplorer/images/devicestatusindicator.png", Theme::IconsStopToolBarColor}}); -const Icon WIZARD_IMPORT_AS_PROJECT( - ":/projectexplorer/images/importasproject.png"); +const Icon WIZARD_IMPORT_AS_PROJECT({ + {":/projectexplorer/images/importasproject.png", Theme::PanelTextColorDark}}, Icon::Tint); const Icon DEBUG_START_FLAT({ {":/projectexplorer/images/run_mask.png", Theme::IconsRunToolBarColor}, diff --git a/src/plugins/projectexplorer/simpleprojectwizard.cpp b/src/plugins/projectexplorer/simpleprojectwizard.cpp index dda273fc754..91cc18ab3f4 100644 --- a/src/plugins/projectexplorer/simpleprojectwizard.cpp +++ b/src/plugins/projectexplorer/simpleprojectwizard.cpp @@ -34,6 +34,7 @@ #include #include +#include #include #include #include @@ -169,7 +170,7 @@ SimpleProjectWizard::SimpleProjectWizard() { setSupportedProjectTypes({QmakeProjectManager::Constants::QMAKEPROJECT_ID, CMakeProjectManager::Constants::CMAKE_PROJECT_ID}); - setIcon(QIcon(QLatin1String(":/projectexplorer/images/importasproject.png"))); + setIcon(ProjectExplorer::Icons::WIZARD_IMPORT_AS_PROJECT.icon()); setDisplayName(tr("Import as qmake or cmake Project (Limited Functionality)")); setId("Z.DummyProFile"); setDescription(tr("Imports existing projects that do not use qmake, CMake, Qbs, Meson, or Autotools.

" diff --git a/src/plugins/qmakeprojectmanager/customwidgetwizard/customwidgetwizard.cpp b/src/plugins/qmakeprojectmanager/customwidgetwizard/customwidgetwizard.cpp index f1cc3b9151e..1675cbe9908 100644 --- a/src/plugins/qmakeprojectmanager/customwidgetwizard/customwidgetwizard.cpp +++ b/src/plugins/qmakeprojectmanager/customwidgetwizard/customwidgetwizard.cpp @@ -48,7 +48,7 @@ CustomWidgetWizard::CustomWidgetWizard() ProjectExplorer::Constants::QT_PROJECT_WIZARD_CATEGORY_DISPLAY)); setDisplayName(tr("Qt Custom Designer Widget")); setDescription(tr("Creates a Qt Custom Designer Widget or a Custom Widget Collection.")); - setIcon(QIcon(QLatin1String(":/wizards/images/gui.png"))); + setIcon(themedIcon(":/wizards/images/gui.png")); setRequiredFeatures({QtSupport::Constants::FEATURE_QWIDGETS}); } diff --git a/src/plugins/qmakeprojectmanager/wizards/images/gui.png b/src/plugins/qmakeprojectmanager/wizards/images/gui.png index fba6e608a09..b60008a3c26 100644 Binary files a/src/plugins/qmakeprojectmanager/wizards/images/gui.png and b/src/plugins/qmakeprojectmanager/wizards/images/gui.png differ diff --git a/src/plugins/qmakeprojectmanager/wizards/images/gui@2x.png b/src/plugins/qmakeprojectmanager/wizards/images/gui@2x.png index 1c20ad695b3..1ccd0931eca 100644 Binary files a/src/plugins/qmakeprojectmanager/wizards/images/gui@2x.png and b/src/plugins/qmakeprojectmanager/wizards/images/gui@2x.png differ diff --git a/src/plugins/qmakeprojectmanager/wizards/subdirsprojectwizard.cpp b/src/plugins/qmakeprojectmanager/wizards/subdirsprojectwizard.cpp index 7c51c471e5d..ca63700cd62 100644 --- a/src/plugins/qmakeprojectmanager/wizards/subdirsprojectwizard.cpp +++ b/src/plugins/qmakeprojectmanager/wizards/subdirsprojectwizard.cpp @@ -48,7 +48,7 @@ SubdirsProjectWizard::SubdirsProjectWizard() setDisplayName(tr("Subdirs Project")); setDescription(tr("Creates a qmake-based subdirs project. This allows you to group " "your projects in a tree structure.")); - setIcon(QIcon(QLatin1String(":/wizards/images/gui.png"))); + setIcon(themedIcon(":/wizards/images/gui.png")); setRequiredFeatures({QtSupport::Constants::FEATURE_QT_PREFIX}); } diff --git a/src/tools/icons/qtcreatoricons.svg b/src/tools/icons/qtcreatoricons.svg index 0791aeb2575..2983146a838 100644 --- a/src/tools/icons/qtcreatoricons.svg +++ b/src/tools/icons/qtcreatoricons.svg @@ -517,90 +517,6 @@ fy="91.5" r="18.5" gradientUnits="userSpaceOnUse" /> - - - - - - - - - - - - - - - - - + style="fill:#000000;stroke-width:0.90625" /> @@ -1762,7 +1678,7 @@ height="100%" /> @@ -1779,7 +1695,7 @@ style="display:inline" x="0" y="0" - xlink:href="#transparentBackgroundRect_60_60" + xlink:href="#backgroundRect_60_60" id="use5906" width="100%" height="100%" @@ -1790,7 +1706,7 @@ height="44" width="44" id="rect9153" - style="fill:#6b7080" /> + style="fill:#000000" /> @@ -1816,13 +1732,13 @@ sodipodi:nodetypes="csccccccccccccccccccc" inkscape:connector-curvature="0" d="m 263.88612,170.56484 c -2.25619,-7.49215 -13.9354,-14.04789 -27.88611,-14.04789 -14.23027,0 -25.62993,6.55574 -27.88613,14.04789 l -2.69076,2.30637 -3.80901,-7.33845 -2.93538,-12.37053 5.03208,2.0967 c 1.376,-1.39235 2.35711,-2.47631 5.87076,-4.40307 l 3.35472,-6.91911 5.66109,4.40307 c 3.80983,-0.90692 7.59785,-1.85747 11.95119,-1.67736 L 236,141.42071 l 5.45142,5.24175 c 4.35334,-0.18011 8.14136,0.77044 11.95119,1.67736 l 5.66109,-4.40307 3.35472,6.91911 c 3.51365,1.92676 4.49476,3.01072 5.87076,4.40307 l 5.03208,-2.0967 -2.93538,12.37053 -3.80901,7.33845 z" - style="fill:#cecfd5" + style="fill:#a0a0a0" id="path3799" /> @@ -1833,7 +1749,7 @@ style="display:inline" x="0" y="0" - xlink:href="#transparentBackgroundRect_60_60" + xlink:href="#backgroundRect_60_60" id="use5906-4" width="100%" height="100%" /> @@ -1842,13 +1758,13 @@ inkscape:connector-curvature="0" id="rect8115-9-7-8-0" d="m 212.99412,157.98972 10,10 v 34 h -34 v -44 z" - style="fill:#dfe0e3;stroke:#6b7080;stroke-width:2;fill-opacity:1" /> + style="fill:#f0f0f0;fill-opacity:1;stroke:#000000;stroke-width:2" /> + style="fill:#000000;fill-opacity:1" /> @@ -1857,7 +1773,7 @@ style="display:inline" x="0" y="0" - xlink:href="#transparentBackgroundRect_60_60" + xlink:href="#backgroundRect_60_60" id="use5906-9" width="100%" height="100%" /> @@ -1887,13 +1803,13 @@ inkscape:connector-curvature="0" id="rect8389-0-7-1-1-30-0" d="m 214.11732,109.89875 -21.5,10.5 19,10.5 21,-12.5 z" - style="fill:#6b7080" /> + style="fill:#606060" /> + style="fill:#000000" /> @@ -1918,19 +1834,19 @@ id="wizardicons_puzzlepiece" transform="translate(93,-57.5)"> + style="display:inline;fill:#000000;fill-opacity:1" /> + style="fill:#000000" /> + style="fill:#a0a0a0" /> + style="fill:#d0d0d0;fill-opacity:1" /> @@ -2048,15 +1964,15 @@ inkscape:connector-curvature="0" id="path3357-6-2" d="m 284.44641,270.8572 c 0,0 -2.27003,-11.36616 3.42782,-15.38049 5.69783,-4.01433 17.08994,-3.43121 28.16377,-12.78788 -7.08902,12.04204 -7.24264,18.00316 -13.84237,24.63796 -6.59973,6.63476 -17.74922,3.53041 -17.74922,3.53041 z" - style="fill:#3a4055" /> + style="fill:#202020" /> + style="fill:#f0f0f0" /> @@ -2084,34 +2000,34 @@ @@ -2195,7 +2111,7 @@ style="display:inline" x="0" y="0" - xlink:href="#transparentBackgroundRect_60_60" + xlink:href="#backgroundRect_60_60" id="use5906-0" width="100%" height="100%" @@ -2204,25 +2120,25 @@ id="g5886" transform="matrix(0.78941483,0,0,0.78941483,101.83171,55.17776)"> @@ -2233,7 +2149,7 @@ style="display:inline" x="0" y="0" - xlink:href="#transparentBackgroundRect_60_60" + xlink:href="#backgroundRect_60_60" id="use5906-0-4" width="100%" height="100%" @@ -2245,30 +2161,29 @@ sodipodi:nodetypes="cccccccccc" inkscape:connector-curvature="0" d="m 591,256 v 1 h 40 v -1 z m 0,-32 v 28 h 40 v -28 z" - style="fill:#848895;fill-opacity:1" + style="fill:#000000;fill-opacity:1" id="path81" /> + transform="translate(0,-60)"> + transform="translate(60)"> + style="fill:#000000" /> + transform="translate(120)"> @@ -2326,7 +2239,7 @@ style="display:inline" x="0" y="0" - xlink:href="#transparentBackgroundRect_60_60" + xlink:href="#backgroundRect_60_60" id="use5906-0-4-3-5-6-5" width="100%" height="100%" @@ -2344,7 +2257,7 @@ x="0" style="display:inline" /> @@ -2401,7 +2314,7 @@ style="display:inline" x="0" y="0" - xlink:href="#transparentBackgroundRect_60_60" + xlink:href="#backgroundRect_60_60" id="use5906-0-4-3-5-6-3" width="100%" height="100%" @@ -2416,7 +2329,7 @@ height="100%" transform="translate(93.5,2)" /> @@ -2458,7 +2371,7 @@