#
#
# add_file "guitone/src/view/DiffStatusView.cpp"
#  content [16c581383793d8294e0568e9e5f2f1c32012b209]
#
# add_file "guitone/src/view/DiffStatusView.h"
#  content [20ff76f2cd2dad267879768b896672cbc66ab964]
#
# patch "guitone/guitone.pro"
#  from [887d92b03fc61fa83d4611baf7f8af26cf0cce14]
#    to [48b6b4edd159d5211be15bdf4cc30754bb91a5e3]
#
# patch "guitone/res/dialogs/file_diff.ui"
#  from [cec958f624f1b2884161a18632baf0ce38ed04e5]
#    to [461cfac4a7157098a892c2ce1f3e5100f5fd6318]
#
# patch "guitone/res/i18n/guitone_de.ts"
#  from [937a8f5b866eb89c76155a55c1c51c5efa2e2e3a]
#    to [8878f9f2068242a95a9fe95838b40260d1a7262a]
#
# patch "guitone/src/view/InventoryView.cpp"
#  from [126de4eea74e374aecc2b2e6871327a2700b6dda]
#    to [e15201e1910e94fc32a8511489dbaf5e9f18669b]
#
# patch "guitone/src/view/dialogs/FileDiff.cpp"
#  from [87b557e1445814d58ace8a28e3ca8cf3b5dd605f]
#    to [c6f55eaf9f12040e496d8c079c9e6ca406eee6a8]
#
============================================================
--- guitone/src/view/DiffStatusView.cpp	16c581383793d8294e0568e9e5f2f1c32012b209
+++ guitone/src/view/DiffStatusView.cpp	16c581383793d8294e0568e9e5f2f1c32012b209
@@ -0,0 +1,144 @@
+/***************************************************************************
+ *   Copyright (C) 2006 by Thomas Keller                                   *
+ *   address@hidden                                                   *
+ *                                                                         *
+ *   This program is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU General Public License as published by  *
+ *   the Free Software Foundation; either version 2 of the License, or     *
+ *   (at your option) any later version.                                   *
+ *                                                                         *
+ *   This program is distributed in the hope that it will be useful,       *
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
+ *   GNU General Public License for more details.                          *
+ *                                                                         *
+ *   You should have received a copy of the GNU General Public License     *
+ *   along with this program; if not, write to the                         *
+ *   Free Software Foundation, Inc.,                                       *
+ *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
+ ***************************************************************************/
+
+#include "DiffStatusView.h"
+#include "../util/Settings.h"
+
+#include <QPainter>
+#include <QBrush>
+#include <math.h>
+
+DiffStatusView::DiffStatusView(QWidget* parent)
+: QWidget(parent)
+{
+    model = 0;
+}
+
+DiffStatusView::~DiffStatusView() {}
+
+QSize DiffStatusView::minimumSizeHint() const
+{
+    return QSize(10, 100);
+}
+
+QSize DiffStatusView::sizeHint() const
+{
+    return QSize(10, 200);
+}
+
+
+void DiffStatusView::paintEvent(QPaintEvent *)
+{
+    if (!model) return;
+
+    float lineHeight = (float) height() / model->rowCount();
+
+    qDebug("Line height: %.2f", lineHeight);
+
+    QVector<QBrush> colorArray;
+
+    for (int i=0, j=model->rowCount(); i<j; i++)
+    {
+        QBrush brush;
+
+        QModelIndex index = model->index(i, 0, QModelIndex());
+        QVariant var = model->data(index, Qt::BackgroundRole);
+
+        if (var.canConvert<QBrush>())
+        {
+            brush = var.value<QBrush>();
+        }
+
+        // one pixel row stands for more than one physical row
+        // we use the color which was present in most of the lines
+        //
+        // FIXME: this still doesn't work properly, but I have no idea how
+        // this could be fixed ATM
+        if (lineHeight < 1.f)
+        {
+            // round down
+            int lookAhead = (int) ceil(1.f/lineHeight);
+
+            // we can't store a QColor directly in a map, so we need
+            // to work around this limitation by using the color's hex value
+            // name as identifier
+            QMap<QString, int> colorLineCount;
+
+            for (int k=i, l=i+lookAhead; k<l; k++)
+            {
+                QModelIndex index = model->index(k, 0, QModelIndex());
+                QVariant var = model->data(index, Qt::BackgroundRole);
+                if (!var.canConvert<QBrush>()) continue;
+
+                QBrush tmpBrush = var.value<QBrush>();
+                QString color = tmpBrush.color().name();
+
+                if (colorLineCount.contains(color))
+                {
+                    int count = colorLineCount.value(color);
+                    colorLineCount.insert(color, ++count);
+                }
+                else
+                {
+                    colorLineCount.insert(color, 1);
+                }
+            }
+
+            QMapIterator<QString, int> it(colorLineCount);
+
+            int maxCount = 0;
+            QString color;
+            while (it.hasNext())
+            {
+                it.next();
+                if (it.value() > maxCount)
+                {
+                    maxCount = it.value();
+                    color = it.key();
+                }
+            }
+
+            QColor markColor;
+            markColor.setNamedColor(color);
+            brush.setColor(markColor);
+
+            i += lookAhead;
+        }
+
+        colorArray.push_back(brush);
+    }
+
+    QPainter painter(this);
+
+    float lastY = 0.f;
+
+    for (int i=0, j=colorArray.size(); i<j; i++)
+    {
+        painter.fillRect(
+            0,
+            (int)ceil(lastY),
+            width(),
+            (int)ceil(lineHeight),
+            colorArray.at(i)
+        );
+        lastY += lineHeight;
+    }
+}
+
============================================================
--- guitone/src/view/DiffStatusView.h	20ff76f2cd2dad267879768b896672cbc66ab964
+++ guitone/src/view/DiffStatusView.h	20ff76f2cd2dad267879768b896672cbc66ab964
@@ -0,0 +1,43 @@
+/***************************************************************************
+ *   Copyright (C) 2006 by Thomas Keller                                   *
+ *   address@hidden                                                   *
+ *                                                                         *
+ *   This program is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU General Public License as published by  *
+ *   the Free Software Foundation; either version 2 of the License, or     *
+ *   (at your option) any later version.                                   *
+ *                                                                         *
+ *   This program is distributed in the hope that it will be useful,       *
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
+ *   GNU General Public License for more details.                          *
+ *                                                                         *
+ *   You should have received a copy of the GNU General Public License     *
+ *   along with this program; if not, write to the                         *
+ *   Free Software Foundation, Inc.,                                       *
+ *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
+ ***************************************************************************/
+
+#ifndef DIFF_STATUS_VIEW_H
+#define DIFF_STATUS_VIEW_H
+
+#include "../model/GetFileProxyModel.h"
+#include <QWidget>
+
+class DiffStatusView : public QWidget
+{
+	Q_OBJECT
+
+public:
+    DiffStatusView(QWidget*);
+	~DiffStatusView();
+    void paintEvent(QPaintEvent*);
+    inline void setModel(GetFileProxyModel * m) { model = m; }
+    QSize minimumSizeHint() const;
+    QSize sizeHint() const;
+
+private:
+    GetFileProxyModel * model;
+};
+
+#endif
============================================================
--- guitone/guitone.pro	887d92b03fc61fa83d4611baf7f8af26cf0cce14
+++ guitone/guitone.pro	48b6b4edd159d5211be15bdf4cc30754bb91a5e3
@@ -11,6 +11,7 @@ HEADERS += src/view/Guitone.h \
            src/view/InventoryView.h \
            src/view/AttributesView.h \
            src/view/DiffView.h \
+           src/view/DiffStatusView.h \
            src/view/dialogs/SwitchWorkspaceRevision.h \
            src/view/dialogs/Preferences.h \
            src/view/dialogs/AncestryGraph.h \
@@ -39,6 +40,7 @@ SOURCES += src/view/Guitone.cpp \
            src/view/InventoryView.cpp \
            src/view/AttributesView.cpp \
            src/view/DiffView.cpp \
+           src/view/DiffStatusView.cpp \
            src/view/dialogs/SwitchWorkspaceRevision.cpp \
            src/view/dialogs/Preferences.cpp \
            src/view/dialogs/AncestryGraph.cpp \
============================================================
--- guitone/res/dialogs/file_diff.ui	cec958f624f1b2884161a18632baf0ce38ed04e5
+++ guitone/res/dialogs/file_diff.ui	461cfac4a7157098a892c2ce1f3e5100f5fd6318
@@ -28,7 +28,20 @@
       <number>6</number>
      </property>
      <item>
-      <widget class="DiffView" name="diffView" />
+      <layout class="QHBoxLayout" >
+       <property name="margin" >
+        <number>0</number>
+       </property>
+       <property name="spacing" >
+        <number>6</number>
+       </property>
+       <item>
+        <widget class="DiffView" name="diffView" />
+       </item>
+       <item>
+        <widget class="DiffStatusView" native="1" name="diffStatusView" />
+       </item>
+      </layout>
      </item>
      <item>
       <layout class="QHBoxLayout" >
@@ -111,6 +124,11 @@
    <extends>QTreeView</extends>
    <header>../DiffView.h</header>
   </customwidget>
+  <customwidget>
+   <class>DiffStatusView</class>
+   <extends>QWidget</extends>
+   <header>../DiffStatusView.h</header>
+  </customwidget>
  </customwidgets>
  <resources/>
  <connections>
============================================================
--- guitone/res/i18n/guitone_de.ts	937a8f5b866eb89c76155a55c1c51c5efa2e2e3a
+++ guitone/res/i18n/guitone_de.ts	8878f9f2068242a95a9fe95838b40260d1a7262a
@@ -113,6 +113,57 @@
     </message>
 </context>
 <context>
+    <name>FileDiffDialog</name>
+    <message>
+        <location filename="../dialogs/file_diff.ui" line="13"/>
+        <source>File differences of &quot;%1&quot;</source>
+        <translation>Unterschiede in der Datei &quot;%1&quot;</translation>
+    </message>
+    <message>
+        <location filename="../dialogs/file_diff.ui" line="57"/>
+        <source>Show Version</source>
+        <translation>Zeige Version</translation>
+    </message>
+    <message>
+        <location filename="../dialogs/file_diff.ui" line="72"/>
+        <source>Left</source>
+        <translation>links</translation>
+    </message>
+    <message>
+        <location filename="../dialogs/file_diff.ui" line="79"/>
+        <source>Right</source>
+        <translation>rechts</translation>
+    </message>
+    <message>
+        <location filename="../dialogs/file_diff.ui" line="86"/>
+        <source>Both</source>
+        <translation>beide</translation>
+    </message>
+    <message>
+        <location filename="../dialogs/file_diff.ui" line="111"/>
+        <source>Close</source>
+        <translation>Schliessen</translation>
+    </message>
+</context>
+<context>
+    <name>GetFile</name>
+    <message>
+        <location filename="../../src/model/GetFile.cpp" line="89"/>
+        <source>File is binary.</source>
+        <translation>Datei ist eine Binärdatei.</translation>
+    </message>
+    <message>
+        <location filename="../../src/model/GetFile.cpp" line="211"/>
+        <source>Line</source>
+        <translation>Zeile</translation>
+    </message>
+    <message>
+        <location filename="../../src/model/GetFile.cpp" line="212"/>
+        <source>Content</source>
+        <translation>Inhalt</translation>
+    </message>
+</context>
+<context>
     <name>Guitone</name>
     <message>
         <location filename="../../src/view/Guitone.cpp" line="46"/>
@@ -294,12 +345,12 @@
 <context>
     <name>InventoryItem</name>
     <message>
-        <location filename="../../src/model/InventoryItem.cpp" line="174"/>
+        <location filename="../../src/model/InventoryItem.cpp" line="191"/>
         <source>File</source>
         <translation>Datei</translation>
     </message>
     <message>
-        <location filename="../../src/model/InventoryItem.cpp" line="175"/>
+        <location filename="../../src/model/InventoryItem.cpp" line="192"/>
         <source>Status</source>
         <translation>Status</translation>
     </message>
@@ -309,27 +360,27 @@
         <translation type="obsolete">ein Verzeichnis höher</translation>
     </message>
     <message>
-        <location filename="../../src/model/InventoryItem.cpp" line="229"/>
+        <location filename="../../src/model/InventoryItem.cpp" line="275"/>
         <source>Rename Source</source>
         <translation>Quelle für Umbenennen</translation>
     </message>
     <message>
-        <location filename="../../src/model/InventoryItem.cpp" line="233"/>
+        <location filename="../../src/model/InventoryItem.cpp" line="279"/>
         <source>Rename Target</source>
         <translation>Ziel für Umbenennen</translation>
     </message>
     <message>
-        <location filename="../../src/model/InventoryItem.cpp" line="237"/>
+        <location filename="../../src/model/InventoryItem.cpp" line="283"/>
         <source>Added</source>
         <translation>hinzugefügt</translation>
     </message>
     <message>
-        <location filename="../../src/model/InventoryItem.cpp" line="241"/>
+        <location filename="../../src/model/InventoryItem.cpp" line="287"/>
         <source>Dropped</source>
         <translation>entfernt</translation>
     </message>
     <message>
-        <location filename="../../src/model/InventoryItem.cpp" line="245"/>
+        <location filename="../../src/model/InventoryItem.cpp" line="291"/>
         <source>Missing</source>
         <translation>fehlend</translation>
     </message>
@@ -339,22 +390,22 @@
         <translation type="obsolete">verändert</translation>
     </message>
     <message>
-        <location filename="../../src/model/InventoryItem.cpp" line="253"/>
+        <location filename="../../src/model/InventoryItem.cpp" line="299"/>
         <source>Unchanged</source>
         <translation>unverändert</translation>
     </message>
     <message>
-        <location filename="../../src/model/InventoryItem.cpp" line="257"/>
+        <location filename="../../src/model/InventoryItem.cpp" line="303"/>
         <source>Unknown</source>
         <translation>unbekannt</translation>
     </message>
     <message>
-        <location filename="../../src/model/InventoryItem.cpp" line="261"/>
+        <location filename="../../src/model/InventoryItem.cpp" line="307"/>
         <source>Ignored</source>
         <translation>ignoriert</translation>
     </message>
     <message>
-        <location filename="../../src/model/InventoryItem.cpp" line="249"/>
+        <location filename="../../src/model/InventoryItem.cpp" line="295"/>
         <source>Modified</source>
         <translation>Verändert</translation>
     </message>
@@ -362,117 +413,133 @@
 <context>
     <name>InventoryView</name>
     <message>
-        <location filename="../../src/view/InventoryView.cpp" line="141"/>
+        <location filename="../../src/view/InventoryView.cpp" line="160"/>
         <source>&amp;Add</source>
         <translation>&amp;Hinzufügen</translation>
     </message>
     <message>
-        <location filename="../../src/view/InventoryView.cpp" line="142"/>
+        <location filename="../../src/view/InventoryView.cpp" line="161"/>
         <source>Ctrl+A</source>
         <comment>Add</comment>
         <translation></translation>
     </message>
     <message>
-        <location filename="../../src/view/InventoryView.cpp" line="143"/>
+        <location filename="../../src/view/InventoryView.cpp" line="162"/>
         <source>Add to workspace</source>
         <translation>Zum Arbeitsbereich hinzufügen</translation>
     </message>
     <message>
-        <location filename="../../src/view/InventoryView.cpp" line="146"/>
+        <location filename="../../src/view/InventoryView.cpp" line="165"/>
         <source>&amp;Remove</source>
         <translation>En&amp;tfernen</translation>
     </message>
     <message>
-        <location filename="../../src/view/InventoryView.cpp" line="147"/>
+        <location filename="../../src/view/InventoryView.cpp" line="166"/>
         <source>Ctrl+R</source>
         <comment>Remove</comment>
         <translation></translation>
     </message>
     <message>
-        <location filename="../../src/view/InventoryView.cpp" line="148"/>
+        <location filename="../../src/view/InventoryView.cpp" line="167"/>
         <source>Remove from workspace</source>
         <translation>Vom Arbeitsbereich entfernen</translation>
     </message>
     <message>
-        <location filename="../../src/view/InventoryView.cpp" line="151"/>
+        <location filename="../../src/view/InventoryView.cpp" line="170"/>
         <source>&amp;Commit</source>
         <translation>&amp;Einpflegen</translation>
     </message>
     <message>
-        <location filename="../../src/view/InventoryView.cpp" line="152"/>
+        <location filename="../../src/view/InventoryView.cpp" line="171"/>
         <source>Ctrl+C</source>
         <comment>Commit</comment>
         <translation></translation>
     </message>
     <message>
-        <location filename="../../src/view/InventoryView.cpp" line="153"/>
+        <location filename="../../src/view/InventoryView.cpp" line="172"/>
         <source>Commit</source>
         <translation>Einpflegen</translation>
     </message>
     <message>
-        <location filename="../../src/view/InventoryView.cpp" line="156"/>
+        <location filename="../../src/view/InventoryView.cpp" line="175"/>
         <source>I&amp;gnore</source>
         <translation>Datei &amp;ignorieren</translation>
     </message>
     <message>
-        <location filename="../../src/view/InventoryView.cpp" line="157"/>
+        <location filename="../../src/view/InventoryView.cpp" line="176"/>
         <source>Ctrl+G</source>
         <comment>Ignore</comment>
         <translation></translation>
     </message>
     <message>
-        <location filename="../../src/view/InventoryView.cpp" line="158"/>
+        <location filename="../../src/view/InventoryView.cpp" line="177"/>
         <source>Ignore file</source>
         <translation>Datei ignorieren</translation>
     </message>
     <message>
-        <location filename="../../src/view/InventoryView.cpp" line="161"/>
+        <location filename="../../src/view/InventoryView.cpp" line="180"/>
         <source>&amp;Unignore</source>
         <translation>Datei nicht ign&amp;orieren</translation>
     </message>
     <message>
-        <location filename="../../src/view/InventoryView.cpp" line="162"/>
+        <location filename="../../src/view/InventoryView.cpp" line="181"/>
         <source>Ctrl+U</source>
         <comment>Unignore</comment>
         <translation></translation>
     </message>
     <message>
-        <location filename="../../src/view/InventoryView.cpp" line="163"/>
+        <location filename="../../src/view/InventoryView.cpp" line="182"/>
         <source>Unignore file</source>
         <translation>Datei nicht mehr ignorieren</translation>
     </message>
     <message>
-        <location filename="../../src/view/InventoryView.cpp" line="166"/>
+        <location filename="../../src/view/InventoryView.cpp" line="185"/>
         <source>R&amp;evert</source>
         <translation>&amp;Zurücksetzen</translation>
     </message>
     <message>
-        <location filename="../../src/view/InventoryView.cpp" line="167"/>
+        <location filename="../../src/view/InventoryView.cpp" line="186"/>
         <source>Ctrl+E</source>
         <comment>Revert</comment>
         <translation></translation>
     </message>
     <message>
-        <location filename="../../src/view/InventoryView.cpp" line="168"/>
+        <location filename="../../src/view/InventoryView.cpp" line="187"/>
         <source>Revert uncommitted changes</source>
         <translation>Nicht eingepflegte Änderungen verwerfen</translation>
     </message>
     <message>
-        <location filename="../../src/view/InventoryView.cpp" line="171"/>
+        <location filename="../../src/view/InventoryView.cpp" line="195"/>
         <source>Rena&amp;me</source>
         <translation>Um&amp;benennen</translation>
     </message>
     <message>
-        <location filename="../../src/view/InventoryView.cpp" line="172"/>
+        <location filename="../../src/view/InventoryView.cpp" line="196"/>
         <source>Ctrl+M</source>
         <comment>Rename</comment>
         <translation></translation>
     </message>
     <message>
-        <location filename="../../src/view/InventoryView.cpp" line="173"/>
+        <location filename="../../src/view/InventoryView.cpp" line="197"/>
         <source>Rename file</source>
         <translation>Datei umbenennen</translation>
     </message>
+    <message>
+        <location filename="../../src/view/InventoryView.cpp" line="190"/>
+        <source>D&amp;iff</source>
+        <translation>U&amp;nterschiede anzeigen</translation>
+    </message>
+    <message>
+        <location filename="../../src/view/InventoryView.cpp" line="191"/>
+        <source>Ctrl+D</source>
+        <comment>Diff</comment>
+        <translation></translation>
+    </message>
+    <message>
+        <location filename="../../src/view/InventoryView.cpp" line="192"/>
+        <source>Diff against base revision</source>
+        <translation>Unterschiede im Vergleich zur Basisrevision anzeigen</translation>
+    </message>
 </context>
 <context>
     <name>KeyManagment</name>
@@ -580,17 +647,17 @@ korrekt installiert?</translation>
 korrekt installiert?</translation>
     </message>
     <message>
-        <location filename="../../src/monotone/Monotone.cpp" line="260"/>
+        <location filename="../../src/monotone/Monotone.cpp" line="284"/>
         <source>Unable to process command &apos;%1&apos;: %2</source>
         <translation>Das Kommando &apos;%1&apos; konnte nicht abgearbeitet werden: %2</translation>
     </message>
     <message>
-        <location filename="../../src/monotone/Monotone.cpp" line="108"/>
+        <location filename="../../src/monotone/Monotone.cpp" line="106"/>
         <source>Monotone failed to start (Code %1). Please configure the path in the Preferences dialog.</source>
         <translation>Monotone konnte nicht gestartet werden (Code %1). Bitte konfigurieren Sie den Pfad im Eintellungsdialog.</translation>
     </message>
     <message>
-        <location filename="../../src/monotone/Monotone.cpp" line="115"/>
+        <location filename="../../src/monotone/Monotone.cpp" line="113"/>
         <source>The connection to the monotone process was terminated (Code %1). Check your configuration and reload the current workspace afterwards.</source>
         <translation>Die Verbindung zum monotone-Prozess wurde beendet (Code %1). Prüfen Sie Ihre Konfiguration und laden Sie ggf. den Arbeitsbereich danach neu. </translation>
     </message>
============================================================
--- guitone/src/view/InventoryView.cpp	126de4eea74e374aecc2b2e6871327a2700b6dda
+++ guitone/src/view/InventoryView.cpp	e15201e1910e94fc32a8511489dbaf5e9f18669b
@@ -116,8 +116,9 @@ void InventoryView::contextMenuEvent(QCo
             {
                 menu.addAction(actRevert);

-                // added files can't be diffed
-                if (item->hasNotStatus(InventoryItem::Added))
+                // added files and directories can't be diffed
+                if (item->hasNotStatus(InventoryItem::Added) &&
+                    !item->isDirectory())
                 {
                     menu.addAction(actDiff);
                 }
============================================================
--- guitone/src/view/dialogs/FileDiff.cpp	87b557e1445814d58ace8a28e3ca8cf3b5dd605f
+++ guitone/src/view/dialogs/FileDiff.cpp	c6f55eaf9f12040e496d8c079c9e6ca406eee6a8
@@ -62,6 +62,7 @@ void FileDiff::init(QString fileName)
     fileProxyModel->setSourceModel(fileModel);

     diffView->setModel(fileProxyModel);
+    diffStatusView->setModel(fileProxyModel);

     // make the line number col a little smaller
     diffView->header()->resizeSection(0, 40);
@@ -78,6 +79,7 @@ void FileDiff::init(QString fileName)
         if (diffWaiter.wait())
         {
             fileModel->applyDiff(diffModel->getDiff(fileName));
+            diffStatusView->update();
         }
         else
         {
@@ -100,5 +102,7 @@ void FileDiff::versionToggled(bool dummy
         fileProxyModel->setFileVersion(GetFileProxyModel::Right);
     if (showVersionBoth->isChecked())
         fileProxyModel->setFileVersion(GetFileProxyModel::Both);
+
+    diffStatusView->update();
 }