diff --git a/src/plugins/vcsbase/images/diff.png b/src/plugins/vcsbase/images/diff.png deleted file mode 100644 index b3597f9ff85..00000000000 Binary files a/src/plugins/vcsbase/images/diff.png and /dev/null differ diff --git a/src/plugins/vcsbase/images/diff_arrows.png b/src/plugins/vcsbase/images/diff_arrows.png new file mode 100644 index 00000000000..f3c89ca292d Binary files /dev/null and b/src/plugins/vcsbase/images/diff_arrows.png differ diff --git a/src/plugins/vcsbase/images/diff_arrows@2x.png b/src/plugins/vcsbase/images/diff_arrows@2x.png new file mode 100644 index 00000000000..d2fa19278f6 Binary files /dev/null and b/src/plugins/vcsbase/images/diff_arrows@2x.png differ diff --git a/src/plugins/vcsbase/images/diff_documents.png b/src/plugins/vcsbase/images/diff_documents.png new file mode 100644 index 00000000000..5db2b6ccbfd Binary files /dev/null and b/src/plugins/vcsbase/images/diff_documents.png differ diff --git a/src/plugins/vcsbase/images/diff_documents@2x.png b/src/plugins/vcsbase/images/diff_documents@2x.png new file mode 100644 index 00000000000..cf5d2ce5517 Binary files /dev/null and b/src/plugins/vcsbase/images/diff_documents@2x.png differ diff --git a/src/plugins/vcsbase/images/removesubmitfield.png b/src/plugins/vcsbase/images/removesubmitfield.png deleted file mode 100644 index e4139afc552..00000000000 Binary files a/src/plugins/vcsbase/images/removesubmitfield.png and /dev/null differ diff --git a/src/plugins/vcsbase/images/submit.png b/src/plugins/vcsbase/images/submit.png deleted file mode 100644 index 4f302302b9e..00000000000 Binary files a/src/plugins/vcsbase/images/submit.png and /dev/null differ diff --git a/src/plugins/vcsbase/images/submit_arrow.png b/src/plugins/vcsbase/images/submit_arrow.png new file mode 100644 index 00000000000..5d849210c35 Binary files /dev/null and b/src/plugins/vcsbase/images/submit_arrow.png differ diff --git a/src/plugins/vcsbase/images/submit_arrow@2x.png b/src/plugins/vcsbase/images/submit_arrow@2x.png new file mode 100644 index 00000000000..78064174dbd Binary files /dev/null and b/src/plugins/vcsbase/images/submit_arrow@2x.png differ diff --git a/src/plugins/vcsbase/images/submit_db.png b/src/plugins/vcsbase/images/submit_db.png new file mode 100644 index 00000000000..2796c6576f8 Binary files /dev/null and b/src/plugins/vcsbase/images/submit_db.png differ diff --git a/src/plugins/vcsbase/images/submit_db@2x.png b/src/plugins/vcsbase/images/submit_db@2x.png new file mode 100644 index 00000000000..2bc79f0847a Binary files /dev/null and b/src/plugins/vcsbase/images/submit_db@2x.png differ diff --git a/src/plugins/vcsbase/submitfieldwidget.cpp b/src/plugins/vcsbase/submitfieldwidget.cpp index 201f260e6b1..95127f7357b 100644 --- a/src/plugins/vcsbase/submitfieldwidget.cpp +++ b/src/plugins/vcsbase/submitfieldwidget.cpp @@ -25,6 +25,8 @@ #include "submitfieldwidget.h" +#include + #include #include #include @@ -139,7 +141,7 @@ struct SubmitFieldWidgetPrivate { }; SubmitFieldWidgetPrivate::SubmitFieldWidgetPrivate() : - removeFieldIcon(QLatin1String(":/vcsbase/images/removesubmitfield.png")), + removeFieldIcon(Utils::Icons::BROKEN.icon()), completer(0), hasBrowseButton(false), allowDuplicateFields(false), diff --git a/src/plugins/vcsbase/vcsbase.qbs b/src/plugins/vcsbase/vcsbase.qbs index db5c5a37393..bfaf329f6e4 100644 --- a/src/plugins/vcsbase/vcsbase.qbs +++ b/src/plugins/vcsbase/vcsbase.qbs @@ -74,9 +74,6 @@ QtcPlugin { "vcsplugin.h", "vcsprojectcache.cpp", "vcsprojectcache.h", - "images/diff.png", - "images/removesubmitfield.png", - "images/submit.png", "wizard/vcsconfigurationpage.cpp", "wizard/vcsconfigurationpage.h", "wizard/vcscommandpage.cpp", diff --git a/src/plugins/vcsbase/vcsbase.qrc b/src/plugins/vcsbase/vcsbase.qrc index 4234890c3a5..101764d9f21 100644 --- a/src/plugins/vcsbase/vcsbase.qrc +++ b/src/plugins/vcsbase/vcsbase.qrc @@ -1,8 +1,13 @@ images/category_vcs.png - images/diff.png - images/removesubmitfield.png - images/submit.png + images/diff_arrows.png + images/diff_arrows@2x.png + images/diff_documents.png + images/diff_documents@2x.png + images/submit_arrow.png + images/submit_arrow@2x.png + images/submit_db.png + images/submit_db@2x.png diff --git a/src/plugins/vcsbase/vcsbasesubmiteditor.cpp b/src/plugins/vcsbase/vcsbasesubmiteditor.cpp index a1c01d7a96e..02a4b4783fd 100644 --- a/src/plugins/vcsbase/vcsbasesubmiteditor.cpp +++ b/src/plugins/vcsbase/vcsbasesubmiteditor.cpp @@ -43,6 +43,8 @@ #include #include #include +#include +#include #include #include #include @@ -715,12 +717,20 @@ bool VcsBaseSubmitEditor::runSubmitMessageCheckScript(const QString &checkScript QIcon VcsBaseSubmitEditor::diffIcon() { - return QIcon(QLatin1String(":/vcsbase/images/diff.png")); + using namespace Utils; + return Icon({ + {":/vcsbase/images/diff_documents.png", Theme::PanelTextColorDark}, + {":/vcsbase/images/diff_arrows.png", Theme::IconsStopColor} + }, Icon::Tint).icon(); } QIcon VcsBaseSubmitEditor::submitIcon() { - return QIcon(QLatin1String(":/vcsbase/images/submit.png")); + using namespace Utils; + return Icon({ + {":/vcsbase/images/submit_db.png", Theme::PanelTextColorDark}, + {":/vcsbase/images/submit_arrow.png", Theme::IconsRunColor} + }, Icon::Tint | Icon::PunchEdges).icon(); } // Reduce a list of untracked files reported by a VCS down to the files diff --git a/src/tools/icons/qtcreatoricons.svg b/src/tools/icons/qtcreatoricons.svg index 1703885bc5b..86c713da25e 100644 --- a/src/tools/icons/qtcreatoricons.svg +++ b/src/tools/icons/qtcreatoricons.svg @@ -8754,4 +8754,115 @@ x="0" /> + + + + + + + + + + + + + + + + + + + + + + + +