From fe5af49b397a3ca54437f611a82432432179927d Mon Sep 17 00:00:00 2001
From: Josh Holtrop <jholtrop+git@gmail.com>
Date: Thu, 8 Sep 2011 15:21:35 -0400
Subject: [PATCH] create temporary addButton() method for text-based toolbar
 items

---
 Window.py | 31 ++++++++++++-------------------
 1 file changed, 12 insertions(+), 19 deletions(-)

diff --git a/Window.py b/Window.py
index bdec0ab..2471afb 100644
--- a/Window.py
+++ b/Window.py
@@ -22,25 +22,18 @@ class Window:
 
         self.toolbar = gtk.Toolbar()
         self.toolbar.set_style(gtk.TOOLBAR_BOTH)
-        ttb = gtk.ToggleToolButton()
-        self.mode_buttons_to_names[ttb] = 'select'
-        self.mode_names_to_buttons['select'] = ttb
-        ttb.set_label('Select')
-        ttb.connect('toggled', self.mode_toggle_event)
-        ttb.set_active(True)
-        self.toolbar.insert(ttb, -1)
-        ttb = gtk.ToggleToolButton()
-        self.mode_buttons_to_names[ttb] = 'line'
-        self.mode_names_to_buttons['line'] = ttb
-        ttb.set_label('Line')
-        ttb.connect('toggled', self.mode_toggle_event)
-        self.toolbar.insert(ttb, -1)
-        ttb = gtk.ToggleToolButton()
-        self.mode_buttons_to_names[ttb] = 'circle'
-        self.mode_names_to_buttons['circle'] = ttb
-        ttb.set_label('Circle')
-        ttb.connect('toggled', self.mode_toggle_event)
-        self.toolbar.insert(ttb, -1)
+        def addButton(name, caption, active=False):
+            ttb = gtk.ToggleToolButton()
+            self.mode_buttons_to_names[ttb] = name
+            self.mode_names_to_buttons[name] = ttb
+            ttb.set_label(caption)
+            ttb.connect('toggled', self.mode_toggle_event)
+            ttb.set_active(active)
+            self.toolbar.insert(ttb, -1)
+        addButton('select', 'Select')
+        addButton('line', 'Line')
+        addButton('circle', 'Circle')
+        addButton('connect', 'Connect')
 
         self.status_lbl = gtk.Label()
         self.status_lbl.set_alignment(0.0, 0.5)