diff options
| author | Pootle daemon <pootle@pootle.sugarlabs.org> | 2013-03-07 05:31:16 (GMT) |
|---|---|---|
| committer | Pootle daemon <pootle@pootle.sugarlabs.org> | 2013-03-07 05:31:16 (GMT) |
| commit | 66eaf19fb25f8755b5c2deebfff2e17edc98c017 (patch) | |
| tree | c96838feaa6632da8fd576a83f6009016cc05891 | |
| parent | 39e4296c52bcfa133abbf353409ca3a272c89de2 (diff) | |
| parent | b4d2485aab669696585e974d65aaae08aac09802 (diff) | |
Merge branch 'master' of git.sugarlabs.org:turtleart/mainline
| -rw-r--r-- | TurtleArt/tawindow.py | 2 | ||||
| -rw-r--r-- | TurtleArtActivity.py | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/TurtleArt/tawindow.py b/TurtleArt/tawindow.py index 105bf52..9b70c5c 100644 --- a/TurtleArt/tawindow.py +++ b/TurtleArt/tawindow.py @@ -3474,6 +3474,8 @@ may not terminate.', False) self.new_project() self.process_data(data_from_file(ta_file)) self._loaded_project = ta_file + # Always start on the Turtle palette + self.show_toolbar_palette(palette_name_to_index('turtle')) def load_file_from_chooser(self, create_new_project=True): ''' Load a project from file chooser ''' diff --git a/TurtleArtActivity.py b/TurtleArtActivity.py index 539d8fd..65b176c 100644 --- a/TurtleArtActivity.py +++ b/TurtleArtActivity.py @@ -1058,7 +1058,7 @@ class TurtleArtActivity(activity.Activity): self.hadj_value = self.sw.get_hadjustment().get_value() self.vadj_value = self.sw.get_vadjustment().get_value() if not self._defer_palette_move: - gobject.idle_add(self.adjust_palettes) + gobject.idle_add(self.adjust_palette) def _setup_canvas(self, canvas_window): ''' Initialize the turtle art canvas. ''' |