← Back to branch summary

~bkidwell/zim/pyzim-win-installer

« back to all changes in this revision

Viewing changes to zim/plugins/tasklist.py

  • Committer: Jaap Karssenberg
  • Date: 2011-01-08 17:32:04 UTC
  • mfrom: (327.1.1 zim)
  • Revision ID: pardus@cpan.org-20110108173204-6f2xsmhbs4lljckl
Various small fixes:
* Bug fix for remove_link with selection
* Bug fix preferenes dialog (broke in refactoring)
* Small fix attachment browser
* Fix in www for url encode file names
* Added scrollbars to image generator dialog
* Fix in tasklist parsing of labels for checkbox lists
* Added some shortcut codes for inserting symbols

Show diffs side-by-side

added added

removed removed

Lines of Context:
zim/plugins/tasklist.py
144
144
        def _set_preferences(self):
145
145
                self._current_preferences = self._serialize_rebuild_on_preferences()
146
146
 
147
 
                self.all_checkboxes = self.preferences['all_checkboxes']
148
147
                string = self.preferences['labels'].strip(' ,')
149
148
                if string:
150
149
                        self.task_labels = [s.strip() for s in self.preferences['labels'].split(',')]
225
224
                for node in parsetree.findall('p'):
226
225
                        lines = self._flatten_para(node)
227
226
                        # Check first line for task list header
 
227
                        istasklist = False
228
228
                        globaltags = []
229
229
                        if len(lines) >= 2 \
230
230
                        and isinstance(lines[0], basestring) \
240
240
                                else:
241
241
                                        # no break occured - all OK
242
242
                                        lines.pop(0)
 
243
                                        istasklist = True
243
244
 
244
245
                        # Check line by line
245
246
                        for item in lines:
246
247
                                if isinstance(item, tuple):
247
248
                                        # checkbox
248
 
                                        if self.all_checkboxes \
 
249
                                        if istasklist or self.preferences['all_checkboxes'] \
249
250
                                        or (self.task_labels and self.task_label_re.match(item[2])):
250
251
                                                open = item[0] == UNCHECKED_BOX
251
252
                                                tasks.append(self._parse_task(item[2], level=item[1], open=open, tags=globaltags))