From d6ef5f78e9412819658289d1df0d753d0c4ccc63 Mon Sep 17 00:00:00 2001
From: Kshitij Kumar <kshitijakumar@gmail.com>
Date: Sat, 12 Jan 2013 15:41:06 +0000
Subject: removing old toolbar

---
diff --git a/moon.py b/moon.py
index 58908b8..56eb04e 100755
--- a/moon.py
+++ b/moon.py
@@ -74,10 +74,8 @@ class MoonActivity(activity.Activity):
         self.activity_state['hemisphereView'] = self.hemisphere_view
         self.activity_state['showGrid'] = self.show_grid
         self.read_and_parse_prefs(os.environ['SUGAR_ACTIVITY_ROOT'] + '/data/defaults')
-                
-        # Toolbox
-        try:
-            # Use new >= 0.86 toolbar design
+
+# Use new >= 0.86 toolbar design
             self.max_participants = 1
             toolbar_box = ToolbarBox()
             activity_button = ActivityToolbarButton(self)
@@ -106,29 +104,7 @@ class MoonActivity(activity.Activity):
             self.set_toolbar_box(toolbar_box)
             toolbar_box.show()
 
-        except NameError:
-            # Use old <= 0.84 toolbar design
-            toolbox = activity.ActivityToolbox(self)
-            view_tool_bar = Gtk.Toolbar()
-            self.toggle_grid_button = ToggleToolButton('grid-icon')
-            self.toggle_grid_button.set_tooltip(_("Toggle Grid View"))
-            self.toggle_grid_button.set_active(self.show_grid)
-            self.toggle_grid_handler_id = self.toggle_grid_button.connect('clicked', self.toggle_grid_clicked)
-            view_tool_bar.insert(self.toggle_grid_button, -1)
-            self.toggle_grid_button.show()
-            self.toggle_hemisphere_button = ToggleToolButton('hemi-icon')
-            self.toggle_hemisphere_button.set_tooltip(_("Toggle Hemisphere View"))
-            self.toggle_hemisphere_button.set_active(self.hemisphere_view == 'south')
-            self.toggle_hemisphere_handler_id = self.toggle_hemisphere_button.connect('clicked', self.toggle_hemisphere_clicked)
-            view_tool_bar.insert(self.toggle_hemisphere_button, -1)
-            self.toggle_hemisphere_button.show()
-            view_tool_bar.show()
-            toolbox.add_toolbar(_('View'), view_tool_bar)
-            self.set_toolbar_box(toolbox)
-            toolbox.show()
-            activity_toolbar = toolbox.get_activity_toolbar()
-            activity_toolbar.share.props.visible = False
-
+       
         # Items we don't have to do every redraw
         #Gdk.Color = Gdk.Color_get_system()
         self.black_alloc_color = Gdk.color_parse('black')
--
cgit v0.9.1