diff options
| -rw-r--r-- | tagplay.py | 16 | ||||
| -rw-r--r-- | talogo.py | 20 | ||||
| -rw-r--r-- | tawindow.py | 30 |
3 files changed, 30 insertions, 36 deletions
@@ -66,7 +66,7 @@ class Gplay: return True def setFile(self, path): - uri = "file://" + str( path ) + uri = "file://" + str(path) if (self.player.get_property('uri') == uri): self.seek(gst.SECOND*0) return @@ -167,14 +167,14 @@ def play_movie_from_file(lc, filepath, x, y, w, h): if lc.gplay.window == None: gplayWin = PlayVideoWindow() lc.gplay.window = gplayWin - gplayWin.set_type_hint( gtk.gdk.WINDOW_TYPE_HINT_DIALOG ) - gplayWin.set_decorated( False ) - if lc.tw.running_sugar(): - gplayWin.set_transient_for( lc.tw.activity ) + gplayWin.set_type_hint(gtk.gdk.WINDOW_TYPE_HINT_DIALOG) + gplayWin.set_decorated(False) + if lc.tw.running_sugar: + gplayWin.set_transient_for(lc.tw.activity) # y position is too high for some reason (toolbox?) adding offset - gplayWin.move( x, y+108 ) - gplayWin.resize( w, h ) - gplayWin.show_all( ) + gplayWin.move(x, y+108) + gplayWin.resize(w, h) + gplayWin.show_all() def stop_media(lc): @@ -151,7 +151,7 @@ def identity(x): return(x) def start_stack(tw): - if tw.running_sugar(): + if tw.running_sugar: tw.activity.recenter() def display_coordinates(tw, a=-1, b=-1, d=-1): @@ -163,7 +163,7 @@ def display_coordinates(tw, a=-1, b=-1, d=-1): x = a y = b h = d - if tw.running_sugar(): + if tw.running_sugar: tw.activity.coordinates_label.set_text("%s: %d %s: %d %s: %d" % ( _("xcor"), x, _("ycor"), y, _("heading"), h)) tw.activity.coordinates_label.show() @@ -460,7 +460,7 @@ class LogoCode: def start_eval(self, list): self.icall(self.evline, list) yield True - if self.tw.running_sugar(): + if self.tw.running_sugar: self.tw.activity.stop_button.set_icon("stopitoff") yield False @@ -728,7 +728,7 @@ class LogoCode: pass elif media[6:] is not "None": pixbuf = None - if self.tw.running_sugar(): + if self.tw.running_sugar: try: dsobject = datastore.get(media[6:]) except: @@ -755,7 +755,7 @@ class LogoCode: pass elif media[6:] is not "None": text = None - if self.tw.running_sugar(): + if self.tw.running_sugar: try: dsobject = datastore.get(media[6:]) text = str(dsobject.metadata['description']) @@ -800,7 +800,7 @@ class LogoCode: y -= int(self.title_height*2*self.tw.lead) self.tw.canvas.setxy(x, y) self.show(media) - if self.tw.running_sugar(): + if self.tw.running_sugar: x = 0 self.tw.canvas.setxy(x, y) self.show(media.replace("media_","descr_")) @@ -833,7 +833,7 @@ class LogoCode: self.tw.canvas.setxy(x, y) self.show(media2) y = -self.title_height - if self.tw.running_sugar(): + if self.tw.running_sugar: self.tw.canvas.setxy(x, y) self.show(media2.replace("media_","descr_")) x = -(self.tw.canvas.width/2)+xo @@ -886,7 +886,7 @@ class LogoCode: y -= int(self.title_height*2*self.tw.lead) self.tw.canvas.setxy(x, y) self.show(media1) - if self.tw.running_sugar(): + if self.tw.running_sugar: x = 0 self.tw.canvas.setxy(x, y) self.show(media1.replace("media_","descr_")) @@ -1013,7 +1013,7 @@ class LogoCode: def play_sound(self, audio): if audio == "" or audio[6:] == "": raise logoerror("#nomedia") - if self.tw.running_sugar(): + if self.tw.running_sugar: if audio[6:] != "None": try: dsobject = datastore.get(audio[6:]) @@ -1039,7 +1039,7 @@ class LogoCode: # TODO: how do we do this with the new toolbar? #for i in self.tw.selbuttons: # hide(i) - if self.tw.running_sugar(): + if self.tw.running_sugar: self.tw.activity.do_hide() def doevalstep(self): diff --git a/tawindow.py b/tawindow.py index 714ab6e..026b8ec 100644 --- a/tawindow.py +++ b/tawindow.py @@ -84,9 +84,11 @@ class TurtleArtWindow(): # Starting from command line if parent is None: self.window.show_all() + self.running_sugar = False # Starting from Sugar else: parent.show_all() + self.running_sugar = True self._setup_events() @@ -169,14 +171,6 @@ class TurtleArtWindow(): return True """ - Are we running from within Sugar? - """ - def running_sugar(self): - if hasattr(self, 'activity'): - return True - return False - - """ Is the an OLPC XO-1? """ def _OLPC_XO_1(self): @@ -229,12 +223,12 @@ class TurtleArtWindow(): def hideshow_palette(self, state): if state is False: self.palette == False - if self.running_sugar(): + if self.running_sugar: self.activity.do_hidepalette() self._hide_palette() else: self.palette == True - if self.running_sugar(): + if self.running_sugar: self.activity.do_showpalette() self.show_palette() @@ -262,7 +256,7 @@ class TurtleArtWindow(): Run turtle! """ def run_button(self, time): - if self.running_sugar(): + if self.running_sugar: self.activity.recenter() # Look for a 'start' block for blk in self._just_blocks(): @@ -285,7 +279,7 @@ class TurtleArtWindow(): def _setup_misc(self): # media blocks get positioned into other blocks for name in MEDIA_SHAPES: - if name[0:7] == 'journal' and self.running_sugar() is False: + if name[0:7] == 'journal' and not self.running_sugar: filename = 'file'+name[7:] else: filename = name @@ -474,7 +468,7 @@ class TurtleArtWindow(): Is a chattube available for sharing? """ def _sharing(self): - if self.running_sugar() and hasattr(self.activity, 'chattube') and\ + if self.running_sugar and hasattr(self.activity, 'chattube') and\ self.activity.chattube is not None: return True return False @@ -589,7 +583,7 @@ class TurtleArtWindow(): label = block_name_s + ": " + hover_dict[block_name] else: label = block_name_s - if self.running_sugar(): + if self.running_sugar: self.activity.hover_help_label.set_text(label) self.activity.hover_help_label.show() else: @@ -915,7 +909,7 @@ class TurtleArtWindow(): self.canvas.xcor = tx-self.canvas.canvas._width/2+30-cx self.canvas.ycor = self.canvas.canvas._height/2-ty-30+cy self.canvas.move_turtle() - if self.running_sugar(): + if self.running_sugar: display_coordinates(self) self.selected_turtle = None return @@ -1047,7 +1041,7 @@ class TurtleArtWindow(): import from Journal """ def _import_from_journal(self, blk): - if self.running_sugar(): + if self.running_sugar: chooser = ObjectChooser('Choose image', None,\ gtk.DIALOG_MODAL | gtk.DIALOG_DESTROY_WITH_PARENT) try: @@ -1309,7 +1303,7 @@ class TurtleArtWindow(): Import Python code into a block """ def _import_py(self): - if self.running_sugar(): + if self.running_sugar: self.activity.import_py() else: self.load_python_code() @@ -1464,7 +1458,7 @@ class TurtleArtWindow(): if btype == 'audio' or btype == 'description': print "restoring %s to %s block" % (blk.values[0],blk.name) blk.spr.set_image(self.media_shapes[btype+'on'], 1, 37, 6) - elif self.running_sugar(): + elif self.running_sugar: try: if blk.values[0] != 'None': dsobject = datastore.get(blk.values[0]) |