- Revision
- 16016
- Author
- morgen
- Date
- 2007-12-03 10:55:48 -0800 (Mon, 03 Dec 2007)
Log Message
Fixes for bugs 11471 (focus problems in sync manager) and 11494 (It's possible to have a collection be subscribed but not appear in the sidebar), r=heikki,vajda
Modified Paths
Diff
Modified: trunk/chandler/application/dialogs/RestoreShares.py (16015 => 16016)
--- trunk/chandler/application/dialogs/RestoreShares.py 2007-12-03 18:54:13 UTC (rev 16015) +++ trunk/chandler/application/dialogs/RestoreShares.py 2007-12-03 18:55:48 UTC (rev 16016) @@ -135,6 +135,7 @@ firstAccountName = account.displayName + self.buttonSizer = wx.BoxSizer(wx.HORIZONTAL) if len(self.checkBoxes) == 0: @@ -180,6 +181,11 @@ self.sizer.Add(self.buttonSizer, 0, wx.ALIGN_RIGHT|wx.ALL, 5) + for cb in self.checkBoxes: + # Check account-wide checkbox by default + cb.SetValue(True) + self.OnAccountCheck(None, control=cb) + self._resize() self.CenterOnParent() @@ -189,8 +195,11 @@ self.UpdateSyncButton() - def OnAccountCheck(self, evt): - checkbox = evt.GetEventObject() + def OnAccountCheck(self, evt, control=None): + if control is None: + checkbox = evt.GetEventObject() + else: + checkbox = control index = self.checkBoxes.index(checkbox) if checkbox.GetValue(): for i in range(len(self.checkListBoxes[index].GetItems())): @@ -303,11 +312,13 @@ def error(task, err): if restoreDialog: + sharing.releaseView(self.taskView) self.restoring = False self._restoreError(err) def success(task, result): if restoreDialog: + sharing.releaseView(self.taskView) self.restoring = False self._restoreSuccess(result)
Modified: trunk/chandler/application/dialogs/SubscribeCollection.py (16015 => 16016)
--- trunk/chandler/application/dialogs/SubscribeCollection.py 2007-12-03 18:54:13 UTC (rev 16015) +++ trunk/chandler/application/dialogs/SubscribeCollection.py 2007-12-03 18:55:48 UTC (rev 16016) @@ -189,7 +189,7 @@ sharing.releaseView(self.taskView) if isinstance(err, ActivityAborted): - if self.modal: + if self.IsModal(): self.EndModal(False) self.Destroy() return
Modified: trunk/chandler/util/task.py (16015 => 16016)
--- trunk/chandler/util/task.py 2007-12-03 18:54:13 UTC (rev 16015) +++ trunk/chandler/util/task.py 2007-12-03 18:55:48 UTC (rev 16016) @@ -90,12 +90,7 @@ wx.GetApp().PostAsyncEvent(mainCallback, arg) def _error(self, arg): - if self.view is not None: - self.view.cancel() self.callInMainThread(self.error, arg, done=True) def _success(self, result): - - if self.view is not None: - self.view.commit(sharing.mergeFunction) self.callInMainThread(self.success, result, done=True)
_______________________________________________ Commits mailing list [email protected] http://lists.osafoundation.org/mailman/listinfo/commits
