diff options
Diffstat (limited to 'src/plugins')
-rw-r--r-- | src/plugins/vcsbase/images/diff.png | bin | 204 -> 0 bytes | |||
-rw-r--r-- | src/plugins/vcsbase/images/diff_arrows.png | bin | 0 -> 155 bytes | |||
-rw-r--r-- | src/plugins/vcsbase/images/diff_arrows@2x.png | bin | 0 -> 232 bytes | |||
-rw-r--r-- | src/plugins/vcsbase/images/diff_documents.png | bin | 0 -> 159 bytes | |||
-rw-r--r-- | src/plugins/vcsbase/images/diff_documents@2x.png | bin | 0 -> 192 bytes | |||
-rw-r--r-- | src/plugins/vcsbase/images/removesubmitfield.png | bin | 578 -> 0 bytes | |||
-rw-r--r-- | src/plugins/vcsbase/images/submit.png | bin | 309 -> 0 bytes | |||
-rw-r--r-- | src/plugins/vcsbase/images/submit_arrow.png | bin | 0 -> 123 bytes | |||
-rw-r--r-- | src/plugins/vcsbase/images/submit_arrow@2x.png | bin | 0 -> 155 bytes | |||
-rw-r--r-- | src/plugins/vcsbase/images/submit_db.png | bin | 0 -> 167 bytes | |||
-rw-r--r-- | src/plugins/vcsbase/images/submit_db@2x.png | bin | 0 -> 292 bytes | |||
-rw-r--r-- | src/plugins/vcsbase/submitfieldwidget.cpp | 4 | ||||
-rw-r--r-- | src/plugins/vcsbase/vcsbase.qbs | 3 | ||||
-rw-r--r-- | src/plugins/vcsbase/vcsbase.qrc | 11 | ||||
-rw-r--r-- | src/plugins/vcsbase/vcsbasesubmiteditor.cpp | 14 |
15 files changed, 23 insertions, 9 deletions
diff --git a/src/plugins/vcsbase/images/diff.png b/src/plugins/vcsbase/images/diff.png Binary files differdeleted file mode 100644 index b3597f9ff8..0000000000 --- a/src/plugins/vcsbase/images/diff.png +++ /dev/null diff --git a/src/plugins/vcsbase/images/diff_arrows.png b/src/plugins/vcsbase/images/diff_arrows.png Binary files differnew file mode 100644 index 0000000000..f3c89ca292 --- /dev/null +++ b/src/plugins/vcsbase/images/diff_arrows.png diff --git a/src/plugins/vcsbase/images/diff_arrows@2x.png b/src/plugins/vcsbase/images/diff_arrows@2x.png Binary files differnew file mode 100644 index 0000000000..d2fa19278f --- /dev/null +++ b/src/plugins/vcsbase/images/diff_arrows@2x.png diff --git a/src/plugins/vcsbase/images/diff_documents.png b/src/plugins/vcsbase/images/diff_documents.png Binary files differnew file mode 100644 index 0000000000..5db2b6ccbf --- /dev/null +++ b/src/plugins/vcsbase/images/diff_documents.png diff --git a/src/plugins/vcsbase/images/diff_documents@2x.png b/src/plugins/vcsbase/images/diff_documents@2x.png Binary files differnew file mode 100644 index 0000000000..cf5d2ce551 --- /dev/null +++ b/src/plugins/vcsbase/images/diff_documents@2x.png diff --git a/src/plugins/vcsbase/images/removesubmitfield.png b/src/plugins/vcsbase/images/removesubmitfield.png Binary files differdeleted file mode 100644 index e4139afc55..0000000000 --- a/src/plugins/vcsbase/images/removesubmitfield.png +++ /dev/null diff --git a/src/plugins/vcsbase/images/submit.png b/src/plugins/vcsbase/images/submit.png Binary files differdeleted file mode 100644 index 4f302302b9..0000000000 --- a/src/plugins/vcsbase/images/submit.png +++ /dev/null diff --git a/src/plugins/vcsbase/images/submit_arrow.png b/src/plugins/vcsbase/images/submit_arrow.png Binary files differnew file mode 100644 index 0000000000..5d849210c3 --- /dev/null +++ b/src/plugins/vcsbase/images/submit_arrow.png diff --git a/src/plugins/vcsbase/images/submit_arrow@2x.png b/src/plugins/vcsbase/images/submit_arrow@2x.png Binary files differnew file mode 100644 index 0000000000..78064174db --- /dev/null +++ b/src/plugins/vcsbase/images/submit_arrow@2x.png diff --git a/src/plugins/vcsbase/images/submit_db.png b/src/plugins/vcsbase/images/submit_db.png Binary files differnew file mode 100644 index 0000000000..2796c6576f --- /dev/null +++ b/src/plugins/vcsbase/images/submit_db.png diff --git a/src/plugins/vcsbase/images/submit_db@2x.png b/src/plugins/vcsbase/images/submit_db@2x.png Binary files differnew file mode 100644 index 0000000000..2bc79f0847 --- /dev/null +++ b/src/plugins/vcsbase/images/submit_db@2x.png diff --git a/src/plugins/vcsbase/submitfieldwidget.cpp b/src/plugins/vcsbase/submitfieldwidget.cpp index 201f260e6b..95127f7357 100644 --- a/src/plugins/vcsbase/submitfieldwidget.cpp +++ b/src/plugins/vcsbase/submitfieldwidget.cpp @@ -25,6 +25,8 @@ #include "submitfieldwidget.h" +#include <utils/utilsicons.h> + #include <QComboBox> #include <QHBoxLayout> #include <QVBoxLayout> @@ -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 db5c5a3739..bfaf329f6e 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 4234890c3a..101764d9f2 100644 --- a/src/plugins/vcsbase/vcsbase.qrc +++ b/src/plugins/vcsbase/vcsbase.qrc @@ -1,8 +1,13 @@ <RCC> <qresource prefix="/vcsbase"> <file>images/category_vcs.png</file> - <file>images/diff.png</file> - <file>images/removesubmitfield.png</file> - <file>images/submit.png</file> + <file>images/diff_arrows.png</file> + <file>images/diff_arrows@2x.png</file> + <file>images/diff_documents.png</file> + <file>images/diff_documents@2x.png</file> + <file>images/submit_arrow.png</file> + <file>images/submit_arrow@2x.png</file> + <file>images/submit_db.png</file> + <file>images/submit_db@2x.png</file> </qresource> </RCC> diff --git a/src/plugins/vcsbase/vcsbasesubmiteditor.cpp b/src/plugins/vcsbase/vcsbasesubmiteditor.cpp index a1c01d7a96..02a4b4783f 100644 --- a/src/plugins/vcsbase/vcsbasesubmiteditor.cpp +++ b/src/plugins/vcsbase/vcsbasesubmiteditor.cpp @@ -43,6 +43,8 @@ #include <utils/completingtextedit.h> #include <utils/synchronousprocess.h> #include <utils/fileutils.h> +#include <utils/icon.h> +#include <utils/theme/theme.h> #include <utils/qtcassert.h> #include <utils/temporarydirectory.h> #include <coreplugin/find/basetextfind.h> @@ -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 |