Merge lp:~thisfred/u1db/cosas-conflict-resolution into lp:u1db

[Eric Casteleijn]

- added UI for conflict resolution

- added UI for conflict resolution

NOTE: right now the only way to resolve a conflicted task is to select it and hit enter. I'd like to have clicking the item do the same thing, but I couldn't figure that out, please advise.

How to test:

PYTHONPATH=. python cosas/ui.py
[ create some tasks if you don't already have any, close the program ]
mv ~/.local/share/cosas/cosas.u1db ~/.local/share/cosas/cosas_copy.u1db
PYTHONPATH=. python cosas/ui.py
[ open sync dialog, sync with ~/.local/share/cosas/cosas_copy.u1db, edit some of the tasks ]
mv ~/.local/share/cosas/cosas.u1db ~/.local/share/cosas/tmp.u1db
mv ~/.local/share/cosas/cosas_copy.u1db ~/.local/share/cosas/cosas.u1db
PYTHONPATH=. python cosas/ui.py
[ edit the same tasks but to have different text and/or done status, open sync dialog, sync with ~/.local/share/cosas/tmp.u1db ]

you should now see conflicts (text is reddish, exclamation point on the right hand side)

[Roberto Alsina (ralsina)]

Clicking the item should emit the currentItemChanged signal and/or the itemClicked signal.

I agree that is a better interaction, so holding until we can try to figure that out on monday.

[Eric Casteleijn (thisfred)]

Added the itemClicked handler, and that works beautifully, thanks!

[Roberto Alsina (ralsina)]

review: Approve

[Ubuntu One Auto Pilot (otto-pilot)]

The prerequisite https://code.launchpad.net/~thisfred/u1db/its-full-of-conflicts has not yet been merged into https://code.launchpad.net/~ubuntuone-hackers/u1db/trunk.

=== added file 'cosas/conflicts.ui'
--- cosas/conflicts.ui	1970-01-01 00:00:00 +0000
+++ cosas/conflicts.ui	2012-08-13 12:53:19 +0000
@@ -0,0 +1,139 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>conflict_dialog</class>
+ <widget class="QDialog" name="conflict_dialog">
+  <property name="windowModality">
+   <enum>Qt::ApplicationModal</enum>
+  </property>
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>329</width>
+    <height>205</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string>conflicts</string>
+  </property>
+  <property name="styleSheet">
+   <string notr="true">QToolButton {
+	background-color: rgb(203,203,203);
+	border: 1px solid rgb(102, 102, 102);
+}
+
+QFrame#drop_frame{
+	border: 0px;
+	border-top: 2px dotted rgb(102,102,102);
+	border-bottom: 2px dotted rgb(102,102,102);
+}
+
+QPushButton {
+	background-color: rgb(61, 133, 198);
+	color: white;
+	border: 2px solid rgb(7, 55, 99);
+	border-radius: 6 6 px;
+	padding: 5 15 5 15 px;
+}
+
+QComboBox {
+	background-color: rgb(204, 204, 204);
+	color: black;
+	border: 2px solid rgb(102,102,102);
+	border-radius: 6 6 px;
+	padding: 5 px;
+}
+
+QFrame#buttons_frame QPushButton {
+	background-color: rgb(204, 204, 204);
+	color: black;
+	border: 2px solid rgb(102,102,102);
+	border-radius: 0px;
+}
+
+QTreeView::item{
+	border: 1px dotted rgb(102, 102, 102);
+	border-top: 0px;
+	background-color: white;
+}
+
+QLineEdit, QTextEdit {
+	background-color: white;
+	border-radius: 0;
+   border: 1px solid rgb(102,102,102);
+}
+
+* {
+	background-color: rgb(239, 239, 239);
+}
+</string>
+  </property>
+  <layout class="QVBoxLayout" name="verticalLayout">
+   <item>
+    <widget class="QGroupBox" name="conflicts">
+     <property name="title">
+      <string>Conflicting versions:</string>
+     </property>
+     <property name="alignment">
+      <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
+     </property>
+     <layout class="QVBoxLayout" name="verticalLayout_3"/>
+    </widget>
+   </item>
+   <item>
+    <widget class="QDialogButtonBox" name="buttonBox">
+     <property name="sizePolicy">
+      <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
+     <property name="orientation">
+      <enum>Qt::Horizontal</enum>
+     </property>
+     <property name="standardButtons">
+      <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
+     </property>
+     <property name="centerButtons">
+      <bool>false</bool>
+     </property>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <resources/>
+ <connections>
+  <connection>
+   <sender>buttonBox</sender>
+   <signal>accepted()</signal>
+   <receiver>conflict_dialog</receiver>
+   <slot>accept()</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>248</x>
+     <y>254</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>157</x>
+     <y>274</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>buttonBox</sender>
+   <signal>rejected()</signal>
+   <receiver>conflict_dialog</receiver>
+   <slot>reject()</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>316</x>
+     <y>260</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>286</x>
+     <y>274</y>
+    </hint>
+   </hints>
+  </connection>
+ </connections>
+</ui>

=== modified file 'cosas/cosas.ui'
--- cosas/cosas.ui	2012-08-06 16:58:26 +0000
+++ cosas/cosas.ui	2012-08-13 12:53:19 +0000
@@ -174,7 +174,7 @@
           <bool>true</bool>
          </property>
          <property name="columnCount">
-          <number>1</number>
+          <number>2</number>
          </property>
          <property name="topLevelItemCount" stdset="0">
           <number>0</number>
@@ -187,6 +187,11 @@
            <string>title</string>
           </property>
          </column>
+         <column>
+          <property name="text">
+           <string notr="true">2</string>
+          </property>
+         </column>
         </widget>
        </item>
       </layout>

=== modified file 'cosas/ui.py'
--- cosas/ui.py	2012-08-06 18:49:20 +0000
+++ cosas/ui.py	2012-08-13 12:53:19 +0000
@@ -30,20 +30,14 @@
 from u1db.remote.http_database import HTTPDatabase
 from ubuntuone.platform.credentials import CredentialsManagementTool
 
-DONE_COLOR = QtGui.QColor(183, 183, 183)
-NOT_DONE_COLOR = QtGui.QColor(0, 0, 0)
-WHITE = QtGui.QColor(255, 255, 255)
+FOREGROUND = QtGui.QColor('#1d1f21')
+DONE = QtGui.QColor('#969896')
+BACKGROUND = '#FFFFFF'
+CONFLICT_COLOR = QtGui.QColor('#A54242')
 TAG_COLORS = [
-    (234, 153, 153),
-    (249, 203, 156),
-    (255, 229, 153),
-    (182, 215, 168),
-    (162, 196, 201),
-    (164, 194, 244),
-    (221, 126, 107),
-    (159, 197, 232),
-    (180, 167, 214),
-    (213, 166, 189)]
+    '#8C9440', '#de935f', '#5F819D', '#85678F',
+    '#5E8D87', '#cc6666', '#b5bd68', '#f0c674',
+    '#81a2be', '#b294bb']
 U1_URL = 'https://u1db.one.ubuntu.com/~/cosas'
 TIMEOUT = 1000 * 0.5 * 60 * 60  # 30 minutes
 
@@ -56,7 +50,7 @@
         self.task = task
         # If the task is done, check off the list item.
         self.store = store
-        self._bg_color = WHITE
+        self._bg_color = BACKGROUND
         self._font = font
         self.main_window = main_window
 
@@ -64,35 +58,44 @@
         self._bg_color = color
 
     def setData(self, column, role, value):
-        if role == QtCore.Qt.CheckStateRole:
-            if value == QtCore.Qt.Checked:
-                self.task.done = True
-            else:
-                self.task.done = False
-            self.store.save_task(self.task)
-        if role == QtCore.Qt.EditRole:
-            text = unicode(value.toString(), 'utf-8')
-            if not text:
-                # There was no text in the edit field so do nothing.
-                return
-            self.update_task_text(text)
+        if column == 0:
+            if role == QtCore.Qt.CheckStateRole:
+                if value == QtCore.Qt.Checked:
+                    self.task.done = True
+                else:
+                    self.task.done = False
+                self.store.save_task(self.task)
+            if role == QtCore.Qt.EditRole:
+                text = unicode(value.toString(), 'utf-8')
+                if not text:
+                    # There was no text in the edit field so do nothing.
+                    return
+                self.update_task_text(text)
         super(UITask, self).setData(column, role, value)
 
     def data(self, column, role):
-        if role == QtCore.Qt.EditRole:
-            return self.task.title
-        if role == QtCore.Qt.DisplayRole:
-            return self.task.title
-        if role == QtCore.Qt.FontRole:
-            font = self._font
-            font.setStrikeOut(self.task.done)
-            return font
         if role == QtCore.Qt.BackgroundRole:
             return self._bg_color
         if role == QtCore.Qt.ForegroundRole:
-            return DONE_COLOR if self.task.done else NOT_DONE_COLOR
-        if role == QtCore.Qt.CheckStateRole:
-            return QtCore.Qt.Checked if self.task.done else QtCore.Qt.Unchecked
+            if self.task.has_conflicts:
+                return CONFLICT_COLOR
+            return DONE if self.task.done else FOREGROUND
+        if column == 0:
+            if role == QtCore.Qt.FontRole:
+                font = self._font
+                font.setStrikeOut(self.task.done)
+                return font
+            if role == QtCore.Qt.EditRole:
+                return self.task.title
+            if role == QtCore.Qt.DisplayRole:
+                return self.task.title
+            if role == QtCore.Qt.CheckStateRole:
+                return (
+                    QtCore.Qt.Checked if self.task.done else
+                    QtCore.Qt.Unchecked)
+        elif column == 1:
+            if role == QtCore.Qt.DisplayRole:
+                return '!' if self.task.has_conflicts else ''
         return super(UITask, self).data(column, role)
 
     def update_task_text(self, text):
@@ -111,19 +114,39 @@
         self.store.save_task(self.task)
 
 
-class TaskDelegate(QtGui.QStyledItemDelegate):
-    """Delegate for rendering tasks."""
-
-    pen = QtGui.QPen(QtGui.QColor(102, 102, 102), 2, style=QtCore.Qt.DotLine)
-
-    def paint(self, painter, option, index):
-        # Save current state of painter before we modify anything.
-        painter.save()
-        painter.setPen(self.pen)
-        painter.drawRect(option.rect)
-        # Return painter to original stats.
-        painter.restore()
-        super(TaskDelegate, self).paint(painter, option, index)
+class Conflicts(QtGui.QDialog):
+
+    def __init__(self, other, conflicts):
+        super(Conflicts, self).__init__()
+        self.selected_doc = None
+        uifile = os.path.join(
+            os.path.abspath(os.path.dirname(__file__)), 'conflicts.ui')
+        uic.loadUi(uifile, self)
+        self.other = other
+        self.revs = []
+        for conflict in conflicts:
+
+            self.revs.append(conflict.rev)
+
+            # XXX: this does not deserve any prizes, but it was the quickest
+            # way I could figure out to use loop variables in a 'closure' and
+            # not just get the last value everywhere.
+            def toggled(value, doc=conflict):
+                if value:
+                    self.selected_doc = doc
+
+            radio = QtGui.QRadioButton(conflict.title)
+            self.conflicts.layout().addWidget(radio)
+            if conflict.done:
+                font = radio.font()
+                font.setStrikeOut(True)
+                radio.setFont(font)
+            radio.toggled.connect(toggled)
+
+    def accept(self):
+        if self.selected_doc:
+            self.other.resolve(self.selected_doc, self.revs)
+        super(Conflicts, self).accept()
 
 
 class Sync(QtGui.QDialog):
@@ -221,7 +244,12 @@
         # create or update the indexes if they are not up-to-date
         self.store.initialize_db()
         # hook up the delegate
-        self.todo_list.setItemDelegate(TaskDelegate())
+        header = self.todo_list.header()
+        header.setResizeMode(0, 1)  # stretch first column
+        header.setResizeMode(1, 2)  # second column fixed
+        header.setDefaultSectionSize(20)
+
+        header.setStretchLastSection(False)
         # Initialize some variables we will use to keep track of the tags.
         self._tag_docs = defaultdict(list)
         self._tag_buttons = {}
@@ -249,22 +277,25 @@
             self.delete()
             return
         if event.key() == QtCore.Qt.Key_Return:
+            current = self.todo_list.currentItem()
+            if current.task.has_conflicts:
+                self.open_conflicts_window(current.task.doc_id)
+                return
             if not self.editing:
                 self.editing = True
-                self.todo_list.openPersistentEditor(
-                    self.todo_list.currentItem())
+                self.todo_list.openPersistentEditor(current)
                 return
             else:
-                self.todo_list.closePersistentEditor(
-                    self.todo_list.currentItem())
+                self.todo_list.closePersistentEditor(current)
                 self.editing = False
+                return
         super(Main, self).keyPressEvent(event)
 
     def get_tag_color(self):
         """Get a color number to use for a new tag."""
         # Remove a color from the list of available ones and return it.
         if not self.colors:
-            return WHITE
+            return BACKGROUND
         return self.colors.pop(0)
 
     def connect_events(self):
@@ -273,11 +304,22 @@
         self.title_edit.returnPressed.connect(self.update)
         self.action_synchronize.triggered.connect(self.open_sync_window)
         self.buttons_toggle.clicked.connect(self.show_buttons)
+        self.todo_list.itemClicked.connect(self.maybe_open_conflicts)
+
+    def maybe_open_conflicts(self, item, column):
+        if not item.task.has_conflicts:
+            return
+        self.open_conflicts_window(item.task.doc_id)
 
     def open_sync_window(self):
         window = Sync(self)
         window.exec_()
 
+    def open_conflicts_window(self, doc_id):
+        conflicts = self.store.db.get_doc_conflicts(doc_id)
+        window = Conflicts(self, conflicts)
+        window.exec_()
+
     def show_buttons(self):
         """Show the frame with the tag buttons."""
         self.buttons_toggle.clicked.disconnect(self.show_buttons)
@@ -334,7 +376,8 @@
         # Wrap the task in a UITask object.
         item = UITask(
             task, self.todo_list, self.store, self.todo_list.font(), self)
-        item.setFlags(item.flags() | QtCore.Qt.ItemIsEditable)
+        if not task.has_conflicts:
+            item.setFlags(item.flags() | QtCore.Qt.ItemIsEditable)
         self.todo_list.addTopLevelItem(item)
         if not task.tags:
             return
@@ -345,7 +388,7 @@
         if task.tags:
             item.set_color(self._tag_colors[task.tags[0]]['qcolor'])
         else:
-            item.set_color(WHITE)
+            item.set_color(BACKGROUND)
 
     def add_tag(self, doc_id, tag):
         """Create a link between the task with id doc_id and the tag, and
@@ -361,11 +404,11 @@
         # Add a tag filter button for this tag to the UI.
         button = QtGui.QPushButton(tag)
         color = self.get_tag_color()
-        qcolor = QtGui.QColor(*color)
+        qcolor = QtGui.QColor(color)
         self._tag_colors[tag] = {
             'color_tuple': color,
             'qcolor': qcolor}
-        button.setStyleSheet('background-color: rgb(%d, %d, %d)' % color)
+        button.setStyleSheet('background-color: %s' % color)
         button._todo_tag = tag
         # Make the button an on/off button.
         button.setCheckable(True)
@@ -426,7 +469,7 @@
         if new_tags:
             item.set_color(self._tag_colors[list(new_tags)[0]]['qcolor'])
             return
-        item.set_color(WHITE)
+        item.set_color(BACKGROUND)
 
     def get_ubuntuone_credentials(self):
         cmt = CredentialsManagementTool()
@@ -483,6 +526,10 @@
         self.refresh_filter()
         self.update_status_bar("last synced: %s" % (datetime.now(),))
 
+    def resolve(self, doc, revs):
+        self.store.db.resolve_doc(doc, revs)
+        self.refresh_filter()
+
 
 if __name__ == "__main__":
     # TODO: Unfortunately, to be able to use ubuntuone.platform.credentials on