From 2db6ea519c0b27c11f394fe192775163bf7524c7 Mon Sep 17 00:00:00 2001 From: Gonzalo Odiard Date: Fri, 27 Sep 2013 19:49:13 +0000 Subject: Add buttons to show different text levels Signed-off-by: Gonzalo Odiard --- diff --git a/activity.py b/activity.py index c483b07..5909573 100644 --- a/activity.py +++ b/activity.py @@ -67,19 +67,38 @@ class MyEcoTvActivity(activity.Activity): toolbar_box.toolbar.insert(Gtk.SeparatorToolItem(), -1) self._world_bt = ToolButton('world-map-au') + self._world_bt.set_tooltip(_('Map')) self._world_bt.connect('clicked', self.__show_world_map_cb) toolbar_box.toolbar.insert(self._world_bt, -1) self._play_bt = ToolButton('player_play') + self._play_bt.set_tooltip(_('Video')) self._play_bt.connect('clicked', self.__play_video_cb) toolbar_box.toolbar.insert(self._play_bt, -1) - self._info_bt = ToolButton('toolbar-help') - self._info_bt.connect('clicked', - self.__show_info_cb) - toolbar_box.toolbar.insert(self._info_bt, -1) + toolbar_box.toolbar.insert(Gtk.SeparatorToolItem(), -1) + + self._text_level = 'text_easy' + + self._text_easy_bt = ToolButton('easy') + self._text_easy_bt.set_tooltip(_('Easy text')) + self._text_easy_bt.connect('clicked', + self.__show_info_cb, 'text_easy') + toolbar_box.toolbar.insert(self._text_easy_bt, -1) + + self._text_medium_bt = ToolButton('medium') + self._text_medium_bt.set_tooltip(_('Medium text')) + self._text_medium_bt.connect('clicked', + self.__show_info_cb, 'text_medium') + toolbar_box.toolbar.insert(self._text_medium_bt, -1) + + self._text_hard_bt = ToolButton('hard') + self._text_hard_bt.set_tooltip(_('Hard text')) + self._text_hard_bt.connect('clicked', + self.__show_info_cb, 'text_hard') + toolbar_box.toolbar.insert(self._text_hard_bt, -1) separator = Gtk.SeparatorToolItem() separator.props.draw = False @@ -141,7 +160,8 @@ class MyEcoTvActivity(activity.Activity): if data is not None and data['video'] is not None: self.show_video(data['video']) - def __show_info_cb(self, button): + def __show_info_cb(self, button, text_level): + self._text_level = text_level if self._icon_selected is None: return data = self.get_data_icon(self._icon_selected) @@ -151,7 +171,7 @@ class MyEcoTvActivity(activity.Activity): self._notebook.remove_page(-1) info_box = InformationBox(data['icon_name'], _('Did you know?'), - data['text_easy']) + data[text_level]) self._notebook.append_page(info_box, None) self.set_current_page(INFO_PAGE) @@ -164,7 +184,9 @@ class MyEcoTvActivity(activity.Activity): def set_current_page(self, page): self._notebook.set_current_page(page) self._world_bt.set_sensitive(page != MAP_PAGE) - self._info_bt.set_sensitive(page == VIDEO_PAGE) + self._text_easy_bt.set_sensitive(page in (VIDEO_PAGE, INFO_PAGE)) + self._text_medium_bt.set_sensitive(page in (VIDEO_PAGE, INFO_PAGE)) + self._text_hard_bt.set_sensitive(page in (VIDEO_PAGE, INFO_PAGE)) self._play_bt.set_sensitive(page == INFO_PAGE) if page != VIDEO_PAGE: self._videoplayer.stop() diff --git a/data.py b/data.py index 27fddf8..ec7e2f9 100644 --- a/data.py +++ b/data.py @@ -23,7 +23,7 @@ DAT_DIC = ({'name': 'Butterfly', 'icon_name': 'butterflies', 'nests in trees.'), _('Chimpanzees live about 40 years in the forest.'), _('Chimpanzees are very noisy creatures.')], - 'text_middle': [ + 'text_medium': [ _('Chimpanzees are great apes that live in western and ' 'central Africa. They are under threat from deforestation, ' 'human diseases and hunting as a food source.'), diff --git a/icons/easy.svg b/icons/easy.svg new file mode 100644 index 0000000..d2afab6 --- /dev/null +++ b/icons/easy.svg @@ -0,0 +1,40 @@ + + + +image/svg+xml diff --git a/icons/hard.svg b/icons/hard.svg new file mode 100644 index 0000000..6c843e3 --- /dev/null +++ b/icons/hard.svg @@ -0,0 +1,111 @@ + + + +image/svg+xml diff --git a/icons/medium.svg b/icons/medium.svg new file mode 100644 index 0000000..0202db5 --- /dev/null +++ b/icons/medium.svg @@ -0,0 +1,65 @@ + + + +image/svg+xml -- cgit v0.9.1