Merge remote-tracking branch 'origin/4.5'

Change-Id: Iebd340258966aff910fb9ab0e45b5149e8f242f0

16 files changed, 27 insertions, 13 deletions

diff --git a/src/plugins/vcsbase/images/diff.png b/src/plugins/vcsbase/images/diff.png
deleted 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
new 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
new 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
new 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
new 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
deleted 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
deleted 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
new 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
new 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
new 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
new 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 58581ad5b8..77980484c9 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>
@@ -138,7 +140,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/vcsbaseplugin.cpp b/src/plugins/vcsbase/vcsbaseplugin.cpp
index 92b2fb44a3..acc3e312ad 100644
--- a/src/plugins/vcsbase/vcsbaseplugin.cpp
+++ b/src/plugins/vcsbase/vcsbaseplugin.cpp
@@ -269,8 +269,8 @@ void StateListener::slotStateChanged()
 
         if (currentFi.exists()) {
             // Quick check: Does it look like a patch?
-            const bool isPatch = state.currentFile.endsWith(QLatin1String(".patch"))
-                    || state.currentFile.endsWith(QLatin1String(".diff"));
+            const bool isPatch = state.currentFile.endsWith(".patch")
+                    || state.currentFile.endsWith(".diff");
             if (isPatch) {
                 // Patch: Figure out a name to display. If it is a temp file, it could be
                 // Codepaster. Use the display name of the editor.
@@ -787,9 +787,9 @@ void VcsBasePlugin::setProcessEnvironment(QProcessEnvironment *e,
                                           const QString &sshPromptBinary)
 {
     if (forceCLocale)
-        e->insert(QLatin1String("LANG"), QString(QLatin1Char('C')));
+        e->insert("LANG", "C");
     if (!sshPromptBinary.isEmpty())
-        e->insert(QLatin1String("SSH_ASKPASS"), sshPromptBinary);
+        e->insert("SSH_ASKPASS", sshPromptBinary);
 }
 
 // Run a process synchronously, returning Utils::SynchronousProcessResponse
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