Fixes: Move icons into VCSBase, use buttons for submit

6 files changed, 46 insertions, 16 deletions

diff --git a/src/plugins/vcsbase/images/diff.png b/src/plugins/vcsbase/images/diff.png
new file mode 100644
index 0000000000..b3597f9ff8
--- /dev/null
+++ b/src/plugins/vcsbase/images/diff.png
diff --git a/src/plugins/vcsbase/images/submit.png b/src/plugins/vcsbase/images/submit.png
new file mode 100644
index 0000000000..4f302302b9
--- /dev/null
+++ b/src/plugins/vcsbase/images/submit.png
diff --git a/src/plugins/vcsbase/vcsbase.qrc b/src/plugins/vcsbase/vcsbase.qrc
index 648425980a..f4fa641bf5 100644
--- a/src/plugins/vcsbase/vcsbase.qrc
+++ b/src/plugins/vcsbase/vcsbase.qrc
@@ -1,5 +1,7 @@
 <RCC>
-    <qresource prefix="/trolltech.vcsbase" >
+    <qresource prefix="/vcsbase" >
         <file>VCSBase.mimetypes.xml</file>
+        <file>images/diff.png</file>
+        <file>images/submit.png</file>
     </qresource>
 </RCC>
diff --git a/src/plugins/vcsbase/vcsbaseplugin.cpp b/src/plugins/vcsbase/vcsbaseplugin.cpp
index f8a89c1eca..f5a480126e 100644
--- a/src/plugins/vcsbase/vcsbaseplugin.cpp
+++ b/src/plugins/vcsbase/vcsbaseplugin.cpp
@@ -61,7 +61,7 @@ bool VCSBasePlugin::initialize(const QStringList & /*arguments*/, QString *error
 {
     Core::ICore *core = ExtensionSystem::PluginManager::instance()->getObject<Core::ICore>();
 
-    if (!core->mimeDatabase()->addMimeTypes(QLatin1String(":/trolltech.vcsbase/VCSBase.mimetypes.xml"), errorMessage))
+    if (!core->mimeDatabase()->addMimeTypes(QLatin1String(":/vcsbase/VCSBase.mimetypes.xml"), errorMessage))
         return false;
 
     return true;
@@ -70,7 +70,7 @@ bool VCSBasePlugin::initialize(const QStringList & /*arguments*/, QString *error
 void VCSBasePlugin::extensionsInitialized()
 {
 }
-    
+
 VCSBasePlugin *VCSBasePlugin::instance()
 {
     return m_instance;
diff --git a/src/plugins/vcsbase/vcsbasesubmiteditor.cpp b/src/plugins/vcsbase/vcsbasesubmiteditor.cpp
index 3960ca6c75..3ac864f9ab 100644
--- a/src/plugins/vcsbase/vcsbasesubmiteditor.cpp
+++ b/src/plugins/vcsbase/vcsbasesubmiteditor.cpp
@@ -51,6 +51,7 @@
 #include <QtCore/QDebug>
 
 enum { debug = 0 };
+enum { wantToolBar = 0 };
 
 static inline QAction *actionFromId(const Core::ICore *core, const char *id)
 {
@@ -187,8 +188,27 @@ const char *VCSBaseSubmitEditor::kind() const
     return m_d->m_parameters->kind;
 }
 
+static QToolBar *createToolBar(const QWidget *someWidget, QAction *submitAction, QAction *diffAction)
+{
+    // Create
+    QToolBar *toolBar = new QToolBar;
+    toolBar->setToolButtonStyle(Qt::ToolButtonTextBesideIcon);
+    const int size = someWidget->style()->pixelMetric(QStyle::PM_SmallIconSize);
+    toolBar->setIconSize(QSize(size, size));
+    toolBar->addSeparator();
+
+    if (submitAction)
+        toolBar->addAction(submitAction);
+    if (diffAction)
+        toolBar->addAction(diffAction);
+    return toolBar;
+}
+
 QToolBar *VCSBaseSubmitEditor::toolBar()
 {
+    if (!wantToolBar)
+        return 0;
+
     if (m_d->m_toolWidget)
         return m_d->m_toolWidget;
 
@@ -196,18 +216,8 @@ QToolBar *VCSBaseSubmitEditor::toolBar()
         return 0;
 
     // Create
-    QToolBar *toolBar = new QToolBar;
-    toolBar->setToolButtonStyle(Qt::ToolButtonTextBesideIcon);
-    const int size = m_d->m_widget->style()->pixelMetric(QStyle::PM_SmallIconSize);
-    toolBar->setIconSize(QSize(size, size));
-    toolBar->addSeparator();
-
-    if (m_d->m_submitAction)
-        toolBar->addAction(m_d->m_submitAction);
-    if (m_d->m_diffAction)
-        toolBar->addAction(m_d->m_diffAction);
-    m_d->m_toolWidget = toolBar;
-    return toolBar;
+    m_d->m_toolWidget = createToolBar(m_d->m_widget, m_d->m_submitAction, m_d->m_diffAction);
+    return m_d->m_toolWidget;
 }
 
 QList<int> VCSBaseSubmitEditor::context() const
@@ -279,4 +289,14 @@ bool VCSBaseSubmitEditor::setFileContents(const QString &contents)
     return true;
 }
 
-} // namespace VCSBase
+QIcon VCSBaseSubmitEditor::diffIcon()
+{
+    return QIcon(QLatin1String(":/vcsbase/images/diff.png"));
+}
+
+QIcon VCSBaseSubmitEditor::submitIcon()
+{
+    return QIcon(QLatin1String(":/vcsbase/images/submit.png"));
+}
+
+}
diff --git a/src/plugins/vcsbase/vcsbasesubmiteditor.h b/src/plugins/vcsbase/vcsbasesubmiteditor.h
index 796f5c6129..dcaf7cf89d 100644
--- a/src/plugins/vcsbase/vcsbasesubmiteditor.h
+++ b/src/plugins/vcsbase/vcsbasesubmiteditor.h
@@ -40,6 +40,10 @@
 
 #include <QtCore/QList>
 
+QT_BEGIN_NAMESPACE
+class QIcon;
+QT_END_NAMESPACE
+
 namespace Core {
     namespace Utils {
         class SubmitEditorWidget;
@@ -118,6 +122,10 @@ public:
     void setFileList(const QStringList&);
     void addFiles(const QStringList&, bool checked = true, bool userCheckable = true);
 
+    // Utilities returning some predefined icons for actions
+    static QIcon diffIcon();
+    static QIcon submitIcon();
+
 signals:
     void diffSelectedFiles(const QStringList &files);