From baf65b68a50c2f4ee093610baf3faa7fd4b401ba Mon Sep 17 00:00:00 2001
From: Aleksey Lim <alsroot@member.fsf.org>
Date: Wed, 23 Sep 2009 10:53:22 +0000
Subject: Error while deleting non-ds objects from Journal #1415
diff --git a/src/jarabe/journal/model.py b/src/jarabe/journal/model.py
index 1b4e236..de2e685 100644
a
|
b
|
def delete(object_id): |
460 | 460 | """ |
461 | 461 | if os.path.exists(object_id): |
462 | 462 | os.unlink(object_id) |
| 463 | deleted.send(None, object_id=object_id) |
463 | 464 | else: |
464 | 465 | _get_datastore().delete(object_id) |
465 | 466 | |
… |
… |
def write(metadata, file_path='', update_mtime=True): |
504 | 505 | destination_path = os.path.join(metadata['mountpoint'], file_name) |
505 | 506 | shutil.copy(file_path, destination_path) |
506 | 507 | object_id = destination_path |
| 508 | created.send(None, object_id=object_id) |
507 | 509 | |
508 | 510 | return object_id |
509 | 511 | |
--
1.6.5.3
From 5bab18825264f4c2a28ca0c8df258259fdc3b659 Mon Sep 17 00:00:00 2001
From: Aleksey Lim <alsroot@member.fsf.org>
Date: Tue, 29 Dec 2009 15:29:13 +0000
Subject: Partial revert "Process non-ds object in the right way in Journal #1262"
This reverts commit f93c9de3ff6b7d7f1730c5056b0b4fae9f00a201.
diff --git a/src/jarabe/journal/collapsedentry.py b/src/jarabe/journal/collapsedentry.py
index c3c45a3..d3c94a1 100644
a
|
b
|
class BaseCollapsedEntry(hippo.CanvasBox): |
211 | 211 | |
212 | 212 | def __keep_icon_button_release_event_cb(self, button, event): |
213 | 213 | logging.debug('__keep_icon_button_release_event_cb') |
214 | | if not model.is_editable(metadata): |
215 | | return |
216 | 214 | metadata = model.get(self._metadata['uid']) |
217 | 215 | if self.get_keep(): |
218 | 216 | metadata['keep'] = 0 |
diff --git a/src/jarabe/journal/expandedentry.py b/src/jarabe/journal/expandedentry.py
index 34f08d9..b996649 100644
a
|
b
|
class ExpandedEntry(hippo.CanvasBox): |
154 | 154 | return icon |
155 | 155 | |
156 | 156 | def _create_title(self): |
157 | | entry = gtk.Entry() |
158 | | entry.props.text = self._metadata.get('title', _('Untitled')) |
159 | | |
160 | | bg_color = style.COLOR_WHITE.get_gdk_color() |
161 | | entry.modify_bg(gtk.STATE_INSENSITIVE, bg_color) |
162 | | entry.modify_base(gtk.STATE_INSENSITIVE, bg_color) |
163 | | |
164 | | entry.props.editable = model.is_editable(self._metadata) |
165 | | if entry.props.editable: |
166 | | entry.connect('focus-out-event', self._title_focus_out_event_cb) |
167 | | |
168 | | return hippo.CanvasWidget(widget=entry) |
| 157 | title = CanvasEntry() |
| 158 | title.set_background(style.COLOR_WHITE.get_html()) |
| 159 | title.props.text = self._metadata.get('title', _('Untitled')) |
| 160 | title.props.widget.connect('focus-out-event', |
| 161 | self._title_focus_out_event_cb) |
| 162 | return title |
169 | 163 | |
170 | 164 | def _create_date(self): |
171 | 165 | date = hippo.CanvasText(xalign=hippo.ALIGNMENT_START, |
… |
… |
class ExpandedEntry(hippo.CanvasBox): |
267 | 261 | vbox.append(text_view, hippo.PACK_EXPAND) |
268 | 262 | |
269 | 263 | text_view.text_view_widget.props.accepts_tab = False |
270 | | editable = model.is_editable(self._metadata) |
271 | | if editable: |
272 | | text_view.text_view_widget.connect('focus-out-event', |
273 | | self._description_focus_out_event_cb) |
274 | | text_view.text_view_widget.props.editable = editable |
| 264 | text_view.text_view_widget.connect('focus-out-event', |
| 265 | self._description_focus_out_event_cb) |
275 | 266 | |
276 | 267 | return vbox, text_view |
277 | 268 | |
… |
… |
class ExpandedEntry(hippo.CanvasBox): |
295 | 286 | vbox.append(text_view, hippo.PACK_EXPAND) |
296 | 287 | |
297 | 288 | text_view.text_view_widget.props.accepts_tab = False |
298 | | editable = model.is_editable(self._metadata) |
299 | | if editable: |
300 | | text_view.text_view_widget.connect('focus-out-event', |
301 | | self._tags_focus_out_event_cb) |
302 | | text_view.text_view_widget.props.editable = editable |
| 289 | text_view.text_view_widget.connect('focus-out-event', |
| 290 | self._tags_focus_out_event_cb) |
303 | 291 | |
304 | 292 | return vbox, text_view |
305 | 293 | |
… |
… |
class ExpandedEntry(hippo.CanvasBox): |
321 | 309 | needs_update = False |
322 | 310 | |
323 | 311 | old_title = self._metadata.get('title', None) |
324 | | new_title = self._title.props.widget.props.text |
325 | | if old_title != new_title: |
326 | | self._icon.palette.props.primary_text = new_title |
327 | | self._metadata['title'] = new_title |
| 312 | if old_title != self._title.props.text: |
| 313 | self._icon.palette.props.primary_text = self._title.props.text |
| 314 | self._metadata['title'] = self._title.props.text |
328 | 315 | self._metadata['title_set_by_user'] = '1' |
329 | 316 | needs_update = True |
330 | 317 | |
… |
… |
class ExpandedEntry(hippo.CanvasBox): |
350 | 337 | return int(self._metadata.get('keep', 0)) == 1 |
351 | 338 | |
352 | 339 | def _keep_icon_activated_cb(self, keep_icon): |
353 | | if not model.is_editable(self._metadata): |
354 | | return |
355 | 340 | if self.get_keep(): |
356 | 341 | self._metadata['keep'] = 0 |
357 | 342 | else: |
diff --git a/src/jarabe/journal/model.py b/src/jarabe/journal/model.py
index de2e685..9521456 100644
a
|
b
|
def _get_unique_file_name(mount_point, file_name): |
543 | 543 | |
544 | 544 | return file_name |
545 | 545 | |
546 | | def is_editable(metadata): |
547 | | mountpoint = metadata.get('mountpoint', '/') |
548 | | return mountpoint == '/' |
549 | | |
550 | 546 | created = dispatch.Signal() |
551 | 547 | updated = dispatch.Signal() |
552 | 548 | deleted = dispatch.Signal() |
| 549 | |
--
1.6.5.3
From 7c520d0b4683fc8e9fe1cec62133499ee1459ed6 Mon Sep 17 00:00:00 2001
From: Aleksey Lim <alsroot@member.fsf.org>
Date: Tue, 29 Dec 2009 15:33:42 +0000
Subject: Do not fail while chaning visibility of home window
diff --git a/src/jarabe/desktop/homewindow.py b/src/jarabe/desktop/homewindow.py
index bbb0db1..19cc5a2 100644
a
|
b
|
class HomeWindow(gtk.Window): |
82 | 82 | |
83 | 83 | def _visibility_notify_event_cb(self, window, event): |
84 | 84 | if event.state == gtk.gdk.VISIBILITY_FULLY_OBSCURED: |
85 | | self._deactivate_view() |
| 85 | self._deactivate_view(shell.get_model().zoom_level) |
86 | 86 | else: |
87 | | self._activate_view() |
| 87 | self._activate_view(shell.get_model().zoom_level) |
88 | 88 | |
89 | 89 | def __zoom_level_changed_cb(self, **kwargs): |
90 | 90 | old_level = kwargs['old_level'] |