Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--TurtleArtActivity.py18
-rw-r--r--talogo.py2
-rw-r--r--tawindow.py6
3 files changed, 16 insertions, 10 deletions
diff --git a/TurtleArtActivity.py b/TurtleArtActivity.py
index 2877025..e3b4171 100644
--- a/TurtleArtActivity.py
+++ b/TurtleArtActivity.py
@@ -98,7 +98,10 @@ class TurtleArtActivity(activity.Activity):
view_toolbar = gtk.Toolbar()
fullscreen_button = ToolButton('view-fullscreen')
fullscreen_button.set_tooltip(_("Fullscreen"))
- fullscreen_button.props.accelerator = '<Alt>Enter'
+ try:
+ fullscreen_button.props.accelerator = '<Alt>Enter'
+ except:
+ pass
fullscreen_button.connect('clicked', self.__fullscreen_cb)
view_toolbar.insert(fullscreen_button, -1)
fullscreen_button.show()
@@ -110,14 +113,14 @@ class TurtleArtActivity(activity.Activity):
toolbar_box.toolbar.insert(view_toolbar_button, -1)
view_toolbar_button.show()
- project_toolbar = ProjectToolbar(self)
+ self.project_toolbar = ProjectToolbar(self)
bundle = ActivityBundle(activity.get_bundle_path())
icon = Icon(file=bundle.get_icon())
project_toolbar_button = ToolbarButton(
- page=project_toolbar)
+ page=self.project_toolbar)
project_toolbar_button.set_icon_widget(icon)
icon.show()
- project_toolbar.show()
+ self.project_toolbar.show()
toolbar_box.toolbar.insert(project_toolbar_button, -1)
project_toolbar_button.show()
@@ -136,7 +139,10 @@ class TurtleArtActivity(activity.Activity):
separator.show()
stop_button = StopButton(self)
- stop_button.props.accelerator = '<Ctrl><Shift>Q'
+ try:
+ stop_button.props.accelerator = '<Ctrl><Shift>Q'
+ except:
+ pass
toolbar_box.toolbar.insert(stop_button, -1)
stop_button.show()
@@ -400,7 +406,7 @@ class TurtleArtActivity(activity.Activity):
"""
def __visibility_notify_cb(self, window, event):
if event.state == gtk.gdk.VISIBILITY_FULLY_OBSCURED:
-# _logger.debug("I am not visible so I should free the audio")
+ # _logger.debug("I am not visible so I should free the audio")
self.tw.lc.ag = None
elif event.state in \
[gtk.gdk.VISIBILITY_UNOBSCURED, gtk.gdk.VISIBILITY_PARTIAL]:
diff --git a/talogo.py b/talogo.py
index c4bda61..d803ddb 100644
--- a/talogo.py
+++ b/talogo.py
@@ -937,7 +937,7 @@ def hideblocks(lc):
hideshow_button(lc.tw)
for i in lc.tw.selbuttons:
hide(i)
- lc.tw.activity.projectToolbar.do_hide()
+ lc.tw.activity.project_toolbar.do_hide()
def doevalstep(lc):
starttime = millis()
diff --git a/tawindow.py b/tawindow.py
index b4b7ad8..842d044 100644
--- a/tawindow.py
+++ b/tawindow.py
@@ -98,7 +98,7 @@ def twNew(win, path, lang, parent=None):
tw.window = win
tw.path = os.path.join(path,'images')
tw.path_lang = os.path.join(path,'images',lang)
- tw.load_save_folder = os.path.join(path,'samples',lang)
+ tw.load_save_folder = os.path.join(path,'samples')
tw.save_folder = None
tw.save_file_name = None
win.set_flags(gtk.CAN_FOCUS)
@@ -213,12 +213,12 @@ def hideshow_palette(tw,state):
if state is False:
tw.palette == False
if hasattr(tw,'activity'):
- tw.activity.projectToolbar.do_hidepalette()
+ tw.activity.project_toolbar.do_hidepalette()
hide_palette(tw)
else:
tw.palette == True
if hasattr(tw,'activity'):
- tw.activity.projectToolbar.do_showpalette()
+ tw.activity.project_toolbar.do_showpalette()
show_palette(tw)
def show_palette(tw):