Merge lp:~thisfred/u1db/colored-squares into lp:u1db

[Eric Casteleijn]

Used colored squares rather than row background colors for tag indicators.

Used colored squares rather than row background colors for tag indicators.

[lp:~thisfred/u1db/colored-squares]

375. By Eric Casteleijn on 2012-08-13

merged trunk

[Roberto Alsina (ralsina)]

I would really like this better if we drew a small round-cornered image instead of just using a full color square, but that's not code that belongs in an example application.

review: Approve

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

=== modified file 'cosas/ui.py'
--- cosas/ui.py	2012-08-13 14:28:46 +0000
+++ cosas/ui.py	2012-08-13 16:11:19 +0000
@@ -58,7 +58,7 @@
         self._bg_color = color
 
     def setData(self, column, role, value):
-        if column == 0:
+        if column == 1:
             if role == QtCore.Qt.CheckStateRole:
                 if value == QtCore.Qt.Checked:
                     self.task.done = True
@@ -74,13 +74,13 @@
         super(UITask, self).setData(column, role, value)
 
     def data(self, column, role):
-        if role == QtCore.Qt.BackgroundRole:
+        if role == QtCore.Qt.BackgroundRole and column == 0:
             return self._bg_color
         if role == QtCore.Qt.ForegroundRole:
             if self.task.has_conflicts:
                 return CONFLICT_COLOR
             return DONE if self.task.done else FOREGROUND
-        if column == 0:
+        if column == 1:
             if role == QtCore.Qt.FontRole:
                 font = self._font
                 font.setStrikeOut(self.task.done)
@@ -93,7 +93,7 @@
                 return (
                     QtCore.Qt.Checked if self.task.done else
                     QtCore.Qt.Unchecked)
-        elif column == 1:
+        elif column == 2:
             if role == QtCore.Qt.DisplayRole:
                 return '!' if self.task.has_conflicts else ''
         return super(UITask, self).data(column, role)
@@ -245,8 +245,9 @@
         self.store.initialize_db()
         # hook up the delegate
         header = self.todo_list.header()
-        header.setResizeMode(0, 1)  # stretch first column
-        header.setResizeMode(1, 2)  # second column fixed
+        header.setResizeMode(0, 2)  # first column fixed
+        header.setResizeMode(1, 1)  # stretch second column
+        header.setResizeMode(2, 2)  # third column fixed
         header.setDefaultSectionSize(20)
 
         header.setStretchLastSection(False)