Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
path: root/gui
diff options
context:
space:
mode:
authorAntoine van Gelder <antoine@g7.org.za>2007-10-29 09:21:06 (GMT)
committer Antoine van Gelder <antoine@g7.org.za>2007-10-29 09:21:06 (GMT)
commit420f73b64979f4a695c780f080c8873229260f27 (patch)
tree82aca565218aaf445ffb0f556c5f5c91024d119c /gui
parent05d7e0283b978bb4836a1ddf8833b039ae55f130 (diff)
JokeMachine-3.xo
* Feature: Put alerts up when joke submitted and approved over mesh * Feature: Put alert up advising patience when joining a shared jokebook * Feature: Made Lesson Plans button work * Feature: Safe fallback for builds without sugar.alert * Feature: Hooked LanguageCombo up * i18n: Created (a rough!) Afrikaans translation * Fixed: Prepended Cover on preview * Fixed: Don't hardcode JokeEditor delete button position * Fixed: On read jokebook & empty -> "Edit My Jokes" -> Go to edit my jokes tab * Updated :Mesh code for dbus tubes changes
Diffstat (limited to 'gui')
-rw-r--r--gui/frame.py112
-rw-r--r--gui/lessonplanwidget.py8
-rw-r--r--gui/page.py2
3 files changed, 76 insertions, 46 deletions
diff --git a/gui/frame.py b/gui/frame.py
index fcbd0de..7da5540 100644
--- a/gui/frame.py
+++ b/gui/frame.py
@@ -30,6 +30,7 @@ import pages.choose
import pages.edit
from persistence.jokebook import Jokebook
+from gui.lessonplanwidget import LessonPlanWidget
class Frame(hippo.Canvas):
@@ -49,28 +50,25 @@ class Frame(hippo.Canvas):
# Page Container ###########################################################
# Holds: The currently open UI page
- self.__container = hippo.CanvasBox(
- border=theme.BORDER_WIDTH,
- border_color=theme.COLOR_FRAME.get_int(),
- background_color=theme.COLOR_BACKGROUND.get_int(),
- spacing=4,
- padding_top=20,
- padding_left=40,
- padding_right=40,
- padding_bottom=20,
- orientation=hippo.ORIENTATION_VERTICAL)
+ self.__container = hippo.CanvasBox(border=theme.BORDER_WIDTH,
+ border_color=theme.COLOR_FRAME.get_int(),
+ background_color=theme.COLOR_BACKGROUND.get_int(),
+ spacing=4,
+ padding_top=20,
+ padding_left=40,
+ padding_right=40,
+ padding_bottom=20,
+ orientation=hippo.ORIENTATION_VERTICAL)
self.__root.append(self.__container, hippo.PACK_EXPAND)
- self.__page = hippo.CanvasBox(
- box_height=theme.PAGE_HEIGHT, # TODO -> Pull width/height from theme - and make sure all
- # children pull their sizes relative to this box
- background_color=theme.COLOR_PAGE.get_int(),
- border=4,
- border_color=theme.COLOR_PAGE_BORDER.get_int(),
- spacing=8,
- padding=20,
- xalign=hippo.ALIGNMENT_CENTER,
- orientation=hippo.ORIENTATION_VERTICAL)
+ self.__page = hippo.CanvasBox(box_height=theme.PAGE_HEIGHT,
+ background_color=theme.COLOR_PAGE.get_int(),
+ border=4,
+ border_color=theme.COLOR_PAGE_BORDER.get_int(),
+ spacing=8,
+ padding=20,
+ xalign=hippo.ALIGNMENT_CENTER,
+ orientation=hippo.ORIENTATION_VERTICAL)
self.__container.append(self.__page)
self.__page_class = None
@@ -92,37 +90,38 @@ class Frame(hippo.Canvas):
ret.append(hippo.CanvasWidget(widget=logo))
# language selection box
- language = hippo.CanvasWidget(
- background_color=theme.COLOR_BACKGROUND.get_int(),
- border_top=theme.BORDER_WIDTH,
- border_left=theme.BORDER_WIDTH,
- border_color=theme.COLOR_FRAME.get_int(),
- padding_top=12,
- padding_bottom=12,
- padding_left=100,
- padding_right=100,
- yalign=hippo.ALIGNMENT_CENTER,
- orientation=hippo.ORIENTATION_VERTICAL)
+ language = hippo.CanvasWidget(background_color=theme.COLOR_BACKGROUND.get_int(),
+ border_top=theme.BORDER_WIDTH,
+ border_left=theme.BORDER_WIDTH,
+ border_color=theme.COLOR_FRAME.get_int(),
+ padding_top=12,
+ padding_bottom=12,
+ padding_left=100,
+ padding_right=100,
+ yalign=hippo.ALIGNMENT_CENTER,
+ orientation=hippo.ORIENTATION_VERTICAL)
button = LanguageComboBox()
button.install()
+ button.set_name('fubar')
language.props.widget = button
- button.set_name('Fubar')
ret.append(language, hippo.PACK_EXPAND)
# lesson plans
- lesson_plans = hippo.CanvasWidget(
- background_color=theme.COLOR_BACKGROUND.get_int(),
- border_top=theme.BORDER_WIDTH,
- border_left=theme.BORDER_WIDTH,
- border_right=theme.BORDER_WIDTH,
- border_color=theme.COLOR_FRAME.get_int(),
- padding_top=12,
- padding_bottom=12,
- padding_left=30,
- padding_right=30,
- yalign=hippo.ALIGNMENT_CENTER,
- orientation=hippo.ORIENTATION_VERTICAL)
+ lesson_plans = hippo.CanvasWidget(background_color=theme.COLOR_BACKGROUND.get_int(),
+ border_top=theme.BORDER_WIDTH,
+ border_left=theme.BORDER_WIDTH,
+ border_right=theme.BORDER_WIDTH,
+ border_color=theme.COLOR_FRAME.get_int(),
+ padding_top=12,
+ padding_bottom=12,
+ padding_left=30,
+ padding_right=30,
+ yalign=hippo.ALIGNMENT_CENTER,
+ orientation=hippo.ORIENTATION_VERTICAL)
button = gtk.Button(_('Lesson Plans'))
+ button.set_size_request(200, -1)
+ button.active = False
+ button.connect('clicked', self.__do_clicked_lessonplans)
lesson_plans.props.widget = theme.theme_widget(button)
ret.append(lesson_plans, hippo.PACK_EXPAND)
@@ -202,4 +201,27 @@ class Frame(hippo.Canvas):
jokebook.owner = Globals.nickname
Globals.JokeMachineState.jokebooks.append(jokebook)
Globals.JokeMachineActivity.set_page(pages.edit.Edit, jokebook)
- \ No newline at end of file
+
+
+ def __do_clicked_lessonplans(self, button):
+ if button.active:
+ button.set_label(_('Lesson Plans'))
+ button.active = False
+ Globals.JokeMachineActivity.set_page(pages.choose.Choose)
+ else:
+ button.set_label(_('Close Lessons'))
+ button.active = True
+ widget_box = hippo.CanvasBox(border=0,
+ border_color=theme.COLOR_BLUE.get_int())
+ widget_box.append(hippo.CanvasText(text= _('Lesson Plans:'),
+ xalign=hippo.ALIGNMENT_START,
+ padding=10,
+ font_desc=theme.FONT_BODY.get_pango_desc()))
+ lesson_plans = LessonPlanWidget(Globals.pwd)
+ lesson_plans.set_size_request(1050, 500)
+ widget_box.append(hippo.CanvasWidget(widget=lesson_plans,
+ border=0,
+ border_color=theme.COLOR_DARK_GREEN.get_int()))
+ self.page = widget_box
+ self.__button_read.set_visible(False)
+ self.__button_make.set_visible(False)
diff --git a/gui/lessonplanwidget.py b/gui/lessonplanwidget.py
index b9a1a62..5b6e021 100644
--- a/gui/lessonplanwidget.py
+++ b/gui/lessonplanwidget.py
@@ -13,8 +13,10 @@
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#
+import os
import locale
import gtk
+import logging
from abiword import Canvas as AbiCanvas
@@ -42,6 +44,10 @@ class LessonPlanWidget(gtk.Notebook):
lesson -- string, name of lesson
"""
code, encoding = locale.getdefaultlocale()
+ logging.debug('Locale code: %r' % code)
+ if code is None or encoding is None:
+ locale.setlocale(locale.LC_ALL, 'en_US')
+ code, encoding = locale.getlocale()
canvas = AbiCanvas()
canvas.show()
files = map(lambda x: os.path.join(path, '%s.abw' % x),
@@ -57,3 +63,5 @@ class LessonPlanWidget(gtk.Notebook):
canvas.zoom_width()
canvas.set_show_margin(False)
self.append_page(canvas, gtk.Label(name))
+
+
diff --git a/gui/page.py b/gui/page.py
index 54dd596..74ac506 100644
--- a/gui/page.py
+++ b/gui/page.py
@@ -73,7 +73,7 @@ class Page(hippo.CanvasBox):
list_row = RoundBox()
list_row.props.border = 0 # properties not being set properly by constructor
list_row.props.padding = theme.DEFAULT_PADDING
- list_row.props.padding_right=0
+ #list_row.props.padding_right=0
list_row.props.background_color = self.color_listrow
if contents is not None:
list_row.append(contents)