1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
|
From f5f305267ddc2a1a872183fdf7341fb1ba31675c Mon Sep 17 00:00:00 2001
From: Martin Abente <mabente@paraguayeduca.org>
Date: Wed, 23 Jun 2010 17:12:59 -0400
Subject: [PATCH 20/82] Journal XS backup and restore
Organization: Sugar Labs Foundation
Include a new journal volumes toolbar icon. The icon represents
the schoolserver. The icon palette provides a backup and restore
options.
---
src/jarabe/desktop/favoritesview.py | 2 +
src/jarabe/journal/processdialog.py | 30 ++++++++++++++++++++++++
src/jarabe/journal/volumestoolbar.py | 39 +++++++++++++++++++++++++++++--
src/jarabe/view/palettes.py | 41 +++++++++++++++++++++++++++++++++-
4 files changed, 108 insertions(+), 4 deletions(-)
diff --git a/src/jarabe/desktop/favoritesview.py b/src/jarabe/desktop/favoritesview.py
index 132d14f..75795cd 100644
--- a/src/jarabe/desktop/favoritesview.py
+++ b/src/jarabe/desktop/favoritesview.py
@@ -41,6 +41,7 @@ from jarabe.view.buddymenu import BuddyMenu
from jarabe.model.buddy import get_owner_instance
from jarabe.model import shell
from jarabe.model import bundleregistry
+from jarabe.journal.journalactivity import get_journal
from jarabe.journal import misc
from jarabe.desktop import schoolserver
@@ -342,6 +343,7 @@ class FavoritesView(hippo.Canvas):
alert.props.msg = _('You are now registered ' \
'with your school server.')
self._my_icon.set_registered()
+ get_journal()._volumes_toolbar.setup_xs_button()
ok_icon = Icon(icon_name='dialog-ok')
alert.add_button(gtk.RESPONSE_OK, _('Ok'), ok_icon)
diff --git a/src/jarabe/journal/processdialog.py b/src/jarabe/journal/processdialog.py
index b96abd9..08c6d11 100644
--- a/src/jarabe/journal/processdialog.py
+++ b/src/jarabe/journal/processdialog.py
@@ -246,3 +246,33 @@ class VolumeRestoreDialog(ProcessDialog):
self._message.set_markup('%s %s.\n\n' % (_('Journal content will be restored from'), volume_path) + \
'<big><b>%s</b> %s</big>' % (_('Warning:'), _('Current Journal content will be deleted!')))
+class XSBackupDialog(ProcessDialog):
+
+ def __init__(self, xs_hostname):
+ ProcessDialog.__init__(self, 'journal-backup')
+ self._resetup_information(xs_hostname)
+
+ def _resetup_information(self, xs_hostname):
+ self._start_message = '%s %s.' % (_('Please wait, saving Journal content to'), xs_hostname)
+
+ self._finished_message = _('The journal content has been saved.')
+
+ self._title.set_markup('<big><b>%s</b></big>' % _('Backup'))
+
+ self._message.set_text('%s %s.' % (_('Journal content will be saved to'), xs_hostname))
+
+class XSRestoreDialog(ProcessDialog):
+
+ def __init__(self, xs_hostname):
+ ProcessDialog.__init__(self, 'journal-restore')
+ self._resetup_information(xs_hostname)
+
+ def _resetup_information(self, xs_hostname):
+ self._start_message = '%s %s.' % (_('Please wait, restoring journal content from'), xs_hostname)
+
+ self._finished_message = _('The journal content has been restored.')
+
+ self._title.set_markup('<big><b>%s</b></big>' % _('Restore'))
+
+ self._message.set_text('%s %s.' % (_('Journal content will be restored from'), xs_hostname))
+
diff --git a/src/jarabe/journal/volumestoolbar.py b/src/jarabe/journal/volumestoolbar.py
index 48e25ec..1356099 100644
--- a/src/jarabe/journal/volumestoolbar.py
+++ b/src/jarabe/journal/volumestoolbar.py
@@ -30,13 +30,15 @@ import simplejson
import tempfile
import shutil
+from sugar.graphics.toolbutton import ToolButton
from sugar.graphics.radiotoolbutton import RadioToolButton
+from sugar.graphics.icon import Icon
from sugar.graphics.palette import Palette
from sugar.graphics.xocolor import XoColor
from sugar import env
from jarabe.journal import model
-from jarabe.view.palettes import JournalVolumePalette
+from jarabe.view.palettes import JournalVolumePalette, JournalXSPalette
_JOURNAL_0_METADATA_DIR = '.olpc.store'
@@ -182,6 +184,7 @@ class VolumesToolbar(gtk.Toolbar):
self.connect('destroy', self.__destroy_cb)
+ self.setup_xs_button()
gobject.idle_add(self._set_up_volumes)
def __destroy_cb(self, widget):
@@ -189,6 +192,21 @@ class VolumesToolbar(gtk.Toolbar):
volume_monitor.disconnect(self._mount_added_hid)
volume_monitor.disconnect(self._mount_removed_hid)
+ def setup_xs_button(self):
+ client = gconf.client_get_default()
+ backup_url = client.get_string('/desktop/sugar/backup_url')
+
+ if backup_url:
+ xs_button = XSButton()
+ xs_button.set_palette(JournalXSPalette(backup_url))
+ #xs_button.props.group = self._volume_buttons[0]
+ xs_button.show()
+
+ self._volume_buttons.append(xs_button)
+ position = len(self._volume_buttons) - 1
+ self.insert(xs_button, position)
+ self.show()
+
def _set_up_volumes(self):
self._set_up_documents_button()
@@ -260,8 +278,9 @@ class VolumesToolbar(gtk.Toolbar):
def _get_button_for_mount(self, mount):
mount_point = mount.get_root().get_path()
for button in self.get_children():
- if button.mount_point == mount_point:
- return button
+ if type(button) == VolumeButton and \
+ button.mount_point == mount_point:
+ return button
logging.error('Couldnt find button with mount_point %r', mount_point)
return None
@@ -402,3 +421,17 @@ class DocumentsButton(BaseButton):
client = gconf.client_get_default()
color = XoColor(client.get_string('/desktop/sugar/user/color'))
self.props.xo_color = color
+
+
+class XSButton(ToolButton):
+ def __init__(self):
+ ToolButton.__init__(self)
+ self.set_icon('school-server')
+
+ def set_icon(self, icon_name):
+ client = gconf.client_get_default()
+ color = XoColor(client.get_string('/desktop/sugar/user/color'))
+ icon = Icon(icon_name=icon_name, xo_color=color, icon_size=gtk.ICON_SIZE_LARGE_TOOLBAR)
+ icon.show()
+
+ self.set_icon_widget(icon)
diff --git a/src/jarabe/view/palettes.py b/src/jarabe/view/palettes.py
index a9e3629..02648b7 100644
--- a/src/jarabe/view/palettes.py
+++ b/src/jarabe/view/palettes.py
@@ -33,7 +33,7 @@ from sugar.graphics import style
from sugar.graphics.xocolor import XoColor
from sugar.activity.i18n import pgettext
-from jarabe.journal.processdialog import VolumeBackupDialog, VolumeRestoreDialog
+from jarabe.journal.processdialog import VolumeBackupDialog, VolumeRestoreDialog, XSBackupDialog, XSRestoreDialog
from jarabe.model import shell
from jarabe.view.viewsource import setup_view_source
from jarabe.journal import misc
@@ -297,3 +297,42 @@ class JournalVolumePalette(VolumePalette):
def __journal_restore_activate_cb(self, menu_item, mount_path):
dialog = VolumeRestoreDialog(mount_path)
dialog.show()
+
+
+class JournalXSPalette(Palette):
+ def __init__(self, xs_hostname):
+ Palette.__init__(self, _('School Server'))
+
+ self.props.secondary_text = xs_hostname
+
+ vbox = gtk.VBox()
+ self.set_content(vbox)
+ vbox.show()
+
+ icon = Icon(icon_name='transfer-to', icon_size=gtk.ICON_SIZE_MENU)
+ icon.show()
+
+ menu_item_journal_backup = MenuItem(_('Backup Journal'))
+ menu_item_journal_backup.set_image(icon)
+ menu_item_journal_backup.connect('activate', self.__journal_backup_activate_cb, xs_hostname)
+ menu_item_journal_backup.show()
+
+ self.menu.append(menu_item_journal_backup)
+
+ icon = Icon(icon_name='transfer-from', icon_size=gtk.ICON_SIZE_MENU)
+ icon.show()
+
+ menu_item_journal_restore = MenuItem(_('Restore Journal'))
+ menu_item_journal_restore.set_image(icon)
+ menu_item_journal_restore.connect('activate', self.__journal_restore_activate_cb, xs_hostname)
+ menu_item_journal_restore.show()
+
+ self.menu.append(menu_item_journal_restore)
+
+ def __journal_backup_activate_cb(self, menu_item, xs_hostname):
+ dialog = XSBackupDialog(xs_hostname)
+ dialog.show()
+
+ def __journal_restore_activate_cb(self, menu_item, xs_hostname):
+ dialog = XSRestoreDialog(xs_hostname)
+ dialog.show()
--
1.7.4.4
|
