From f75e756db6e407762f74c9e6b6d9e513e3251639 Mon Sep 17 00:00:00 2001
From: Marc Maurer <uwog@uwog.net>
Date: Sat, 23 Dec 2006 19:47:52 +0000
Subject: Use the OLPC stock icons on the toolbar, and drop the fill justification (at least for now)

---
diff --git a/toolbar.py b/toolbar.py
index 0db1d06..89ba286 100644
--- a/toolbar.py
+++ b/toolbar.py
@@ -27,13 +27,13 @@ class Toolbar(gtk.Toolbar):
 		self._abiword_canvas = abiword_canvas
 	
 		self._open = gtk.ToolButton()
-		self._open.set_icon_name('gtk-open')
+		self._open.set_icon_name('stock-open')
 		self._open.connect("clicked", self._open_cb)
 		self.insert(self._open, -1)
 		self._open.show()
 
 		self._save = gtk.ToolButton()
-		self._save.set_icon_name('gtk-save')
+		self._save.set_icon_name('stock-save')
 		self._save.connect("clicked", self._save_cb)
 		self.insert(self._save, -1)
 		self._save.show()
@@ -42,14 +42,14 @@ class Toolbar(gtk.Toolbar):
 		self._insert_separator()
 
 		self._undo = gtk.ToolButton()
-		self._undo.set_icon_name('gtk-undo')
+		self._undo.set_icon_name('stock-undo')
 		self._undo.connect("clicked", self._undo_cb)
 		self.insert(self._undo, -1)
 		self._undo.show()
 		self._abiword_canvas.connect("can_undo",self._canUndo_cb)
 
 		self._redo = gtk.ToolButton()
-		self._redo.set_icon_name('gtk-redo')
+		self._redo.set_icon_name('stock-redo')
 		self._redo.connect("clicked", self._redo_cb)
 		self.insert(self._redo, -1)
 		self._redo.show()
@@ -58,14 +58,14 @@ class Toolbar(gtk.Toolbar):
 		self._insert_separator()
 
 		self._underline = gtk.ToggleToolButton()
-		self._underline.set_icon_name('gtk-underline')
+		self._underline.set_icon_name('stock-underline')
 		self._underline_id = self._underline.connect("clicked", self._underline_cb)
 		self.insert(self._underline, -1)
 		self._underline.show()
 		self._abiword_canvas.connect("underline",self._isUnderline_cb)
 
 		self._bold = gtk.ToggleToolButton()
-		self._bold.set_icon_name('gtk-bold')
+		self._bold.set_icon_name('stock-bold')
 		self._bold_id =self._bold.connect("clicked", self._bold_cb)
 		self.insert(self._bold, -1)
 		self._bold.show()
@@ -74,14 +74,14 @@ class Toolbar(gtk.Toolbar):
 		self._insert_separator()
 
 		self._align_left = gtk.ToggleToolButton()
-		self._align_left.set_icon_name('gtk-justify-left')
+		self._align_left.set_icon_name('stock-justify-left')
 		self._align_left_id = self._align_left.connect("clicked", self._align_left_cb)
 		self.insert(self._align_left, -1)
 		self._align_left.show()
 		self._abiword_canvas.connect("left-align",self._isLeftAlign_cb)
 
 		self._align_center = gtk.ToggleToolButton()
-		self._align_center.set_icon_name('gtk-justify-center')
+		self._align_center.set_icon_name('stock-justify-center')
 		self._align_center_id = self._align_center.connect("clicked", self._align_center_cb)
 		self.insert(self._align_center, -1)
 		self._align_center.show()
@@ -89,19 +89,12 @@ class Toolbar(gtk.Toolbar):
 		
 
 		self._align_right = gtk.ToggleToolButton()
-		self._align_right.set_icon_name('gtk-justify-right')
+		self._align_right.set_icon_name('stock-justify-right')
 		self._align_right_id = self._align_right.connect("clicked", self._align_right_cb)
 		self.insert(self._align_right, -1)
 		self._align_right.show()
 		self._abiword_canvas.connect("right-align",self._isRightAlign_cb)
 
-		self._align_fill = gtk.ToggleToolButton()
-		self._align_fill.set_icon_name('gtk-justify-fill')
-		self._align_fill_id = self._align_fill.connect("clicked", self._align_fill_cb)
-		self.insert(self._align_fill, -1)
-		self._align_fill.show()
-		self._abiword_canvas.connect("justify-align",self._isFillAlign_cb)
-
 	def _insert_separator(self):
 		separator = gtk.SeparatorToolItem()
 		separator.set_draw(True)
@@ -166,10 +159,3 @@ class Toolbar(gtk.Toolbar):
 	def _isRightAlign_cb(self,abi,b):
 		self.setToggleButtonState(self._align_right,b,self._align_right_id)
 
-	def _align_fill_cb(self, button):
-		self._abiword_canvas.align_justify()
-
-
-	def _isFillAlign_cb(self,abi,b):
-		self.setToggleButtonState(self._align_fill,b,self._align_fill_id)
-
--
cgit v0.9.1