diff options
| -rw-r--r-- | src/jarabe/desktop/activitieslist.py | 4 | ||||
| -rw-r--r-- | src/jarabe/desktop/favoritesview.py | 18 | ||||
| -rw-r--r-- | src/jarabe/desktop/homebox.py | 4 | ||||
| -rw-r--r-- | src/jarabe/desktop/viewtoolbar.py | 8 | ||||
| -rw-r--r-- | src/jarabe/model/bundleregistry.py | 19 |
5 files changed, 25 insertions, 28 deletions
diff --git a/src/jarabe/desktop/activitieslist.py b/src/jarabe/desktop/activitieslist.py index ff29433..90c731d 100644 --- a/src/jarabe/desktop/activitieslist.py +++ b/src/jarabe/desktop/activitieslist.py @@ -202,7 +202,8 @@ class ListModel(Gtk.TreeModelSort): COLUMN_DATE_TEXT = 8 def __init__(self): - self._model = Gtk.ListStore(str, bool, bool, str, str, str, str, int, str) + self._model = Gtk.ListStore(str, bool, bool, str, + str, str, str, int, str) self._model_filter = self._model.filter_new() Gtk.TreeModelSort.__init__(self, model=self._model_filter) self.set_sort_column_id(ListModel.COLUMN_TITLE, Gtk.SortType.ASCENDING) @@ -600,4 +601,3 @@ class ActivityListPalette(ActivityPalette): def __erase_activate_cb(self, menu_item): self.emit('erase-activated', self._bundle_id) - diff --git a/src/jarabe/desktop/favoritesview.py b/src/jarabe/desktop/favoritesview.py index 5a414ef..9c2ef99 100644 --- a/src/jarabe/desktop/favoritesview.py +++ b/src/jarabe/desktop/favoritesview.py @@ -76,12 +76,12 @@ class FavoritesBox(Gtk.VBox): __gtype_name__ = 'SugarFavoritesBox' def __init__(self, favorites): - """ - If the argument is True, it will load the activities marked as favorites. - Else, it will load the activities marked for school. - """ + """ + If the argument is True, it will load the activities marked as favorites. + Else, it will load the activities marked for school. + """ Gtk.VBox.__init__(self) - self.load_favorites = favorites + self.load_favorites = favorites self._view = FavoritesView(self) self.pack_start(self._view, True, True, 0) @@ -171,11 +171,11 @@ class FavoritesView(ViewContainer): for info in registry: if self._box.load_favorites: if registry.is_bundle_favorite(info.get_bundle_id(), - info.get_activity_version()): + info.get_activity_version()): self._add_activity(info) else: if registry.is_bundle_for_school(info.get_bundle_id(), - info.get_activity_version()): + info.get_activity_version()): self._add_activity(info) def _set_layout(self, layout): @@ -363,11 +363,11 @@ class FavoritesView(ViewContainer): registry = bundleregistry.get_registry() if self._box.load_favorites: if registry.is_bundle_favorite(activity_info.get_bundle_id(), - activity_info.get_activity_version()): + activity_info.get_activity_version()): self._add_activity(activity_info) else: if registry.is_bundle_for_school(activity_info.get_bundle_id(), - activity_info.get_activity_version()): + activity_info.get_activity_version()): self._add_activity(activity_info) def set_filter(self, query): diff --git a/src/jarabe/desktop/homebox.py b/src/jarabe/desktop/homebox.py index 2af711f..d7c0b2a 100644 --- a/src/jarabe/desktop/homebox.py +++ b/src/jarabe/desktop/homebox.py @@ -139,7 +139,7 @@ class HomeBox(Gtk.VBox): self.add(self._favorites_box) self._favorites_box.show() self._favorites_box.grab_focus() - + elif view == _SCHOOL_VIEW: if self._list_view in self.get_children(): self.remove(self._list_view) @@ -150,7 +150,7 @@ class HomeBox(Gtk.VBox): self.add(self._school_box) self._school_box.show() self._school_box.grab_focus() - + elif view == _LIST_VIEW: if self._favorites_box in self.get_children(): self.remove(self._favorites_box) diff --git a/src/jarabe/desktop/viewtoolbar.py b/src/jarabe/desktop/viewtoolbar.py index 99e7187..b2dec88 100644 --- a/src/jarabe/desktop/viewtoolbar.py +++ b/src/jarabe/desktop/viewtoolbar.py @@ -157,7 +157,7 @@ class FavoritesButton(RadioToolButton): def __init__(self): RadioToolButton.__init__(self) - self.props.tooltip = _('Favorites view') + self.props.tooltip = _('Favorite activities') self.props.accelerator = _('<Ctrl>1') self.props.group = None self.props.icon_name = 'gtk-home' @@ -200,7 +200,7 @@ class FavoritesButton(RadioToolButton): def _update_icon(self): pass - # self.props.icon_name = favoritesview.LAYOUT_MAP[self._layout].icon_name + # self.props.icon_name = favoritesview.LAYOUT_MAP[self._layout].icon_name class SchoolButton(RadioToolButton): @@ -209,7 +209,7 @@ class SchoolButton(RadioToolButton): def __init__(self): RadioToolButton.__init__(self) self.props.icon_name = 'school-server' - self.props.tooltip = _('School favorites') + self.props.tooltip = _('Activities for school') self.props.accelerator = _('<Ctrl>I') self.props.group = None @@ -251,4 +251,4 @@ class SchoolButton(RadioToolButton): def _update_icon(self): pass - #self.props.icon_name = favoritesview.LAYOUT_MAP[self._layout].icon_name + #self.props.icon_name = favoritesview.LAYOUT_MAP[self._layout].icon_name diff --git a/src/jarabe/model/bundleregistry.py b/src/jarabe/model/bundleregistry.py index 3fa9d8a..1e5c3b4 100644 --- a/src/jarabe/model/bundleregistry.py +++ b/src/jarabe/model/bundleregistry.py @@ -171,7 +171,8 @@ class BundleRegistry(GObject.GObject): not isinstance(first_value, dict): raise ValueError('Invalid format in %s.' % school_path) - self._last_school_defaults_mtime = float(school_data['defaults-mtime']) + self._last_school_defaults_mtime = float(school_data[ + 'defaults-mtime']) self._school_bundles = school_bundles def _merge_default_favorites(self): @@ -209,18 +210,14 @@ class BundleRegistry(GObject.GObject): self._write_favorites_file() def _merge_default_school(self): - print "Merging default school activities" default_school_activities = [] - print "Defaults", default_school_activities - defaults_school_path = os.path.join(config.data_path, 'schoolactivities.defaults') - print defaults_school_path + defaults_school_path = os.path.join(config.data_path, + 'schoolactivities.defaults') if os.path.exists(defaults_school_path): - print "It exists" file_mtime = os.stat(defaults_school_path).st_mtime if file_mtime > self._last_school_defaults_mtime: f = open(defaults_school_path, 'r') for line in f.readlines(): - print line line = line.strip() if line and not line.startswith('#'): default_school_activities.append(line) @@ -228,7 +225,6 @@ class BundleRegistry(GObject.GObject): self._last_school_defaults_mtime = file_mtime if not default_school_activities: - print "Not default school activities" return print default_school_activities @@ -250,7 +246,6 @@ class BundleRegistry(GObject.GObject): self._write_school_file() - def get_bundle(self, bundle_id): """Returns an bundle given his service name""" for bundle in self._bundles: @@ -417,8 +412,10 @@ class BundleRegistry(GObject.GObject): def set_bundle_position(self, bundle_id, version, x, y): key = self._get_favorite_key(bundle_id, version) - if key not in self._favorite_bundles and key not in self._school_activities: - raise ValueError('Bundle %s %s not favorite' % (bundle_id, version)) + if key not in self._favorite_bundles and\ + key not in self._school_activities: + raise ValueError('Bundle %s %s not favorite' % (bundle_id, + version)) if key in self._favorite_bundles: if self._favorite_bundles[key] is None: |