Remove tool images

Changed files (11)

• deleted icons/add_new_grid.png
• deleted icons/available_characters.png
• deleted icons/custom_character_set.png
• deleted icons/delete_background.png
• deleted icons/delete_button.png
• deleted icons/delete_selected_glyph.png
• deleted icons/insert_background.png
• modified libbirdfont/DrawingTools.vala
• modified libbirdfont/Glyph.vala
• modified libbirdfont/TabBar.vala
• modified libbirdfont/Tool.vala

Diff

diff --git a/icons/add_new_grid.png b/icons/add_new_grid.pngdeleted file mode 100644index f36b1cf..0000000Binary files a/icons/add_new_grid.png and /dev/null differdiff --git a/icons/available_characters.png b/icons/available_characters.pngdeleted file mode 100644index 5a47657..0000000Binary files a/icons/available_characters.png and /dev/null differdiff --git a/icons/custom_character_set.png b/icons/custom_character_set.pngdeleted file mode 100644index 9fa9da7..0000000Binary files a/icons/custom_character_set.png and /dev/null differdiff --git a/icons/delete_background.png b/icons/delete_background.pngdeleted file mode 100644index e52efcc..0000000Binary files a/icons/delete_background.png and /dev/null differdiff --git a/icons/delete_button.png b/icons/delete_button.pngdeleted file mode 100644index 709f158..0000000Binary files a/icons/delete_button.png and /dev/null differdiff --git a/icons/delete_selected_glyph.png b/icons/delete_selected_glyph.pngdeleted file mode 100644index e6008a1..0000000Binary files a/icons/delete_selected_glyph.png and /dev/null differdiff --git a/icons/insert_background.png b/icons/insert_background.pngdeleted file mode 100644index 457e0f2..0000000Binary files a/icons/insert_background.png and /dev/null differdiff --git a/libbirdfont/DrawingTools.vala b/libbirdfont/DrawingTools.valaindex fdef510..ca5ecd4 100644--- a/libbirdfont/DrawingTools.vala+++ b/libbirdfont/DrawingTools.vala@@ -100,7 +100,7 @@ public class DrawingTools : ToolCollection  { 		background_scale = new SpinButton (); 		 		draw_tools = new Expander (t_("Drawing Tools"));-		draw_tool_modifiers = new Expander (t_("Control Point Tools"));+		draw_tool_modifiers = new Expander (t_("Control Point")); 		shape_tools = new Expander (t_("Geometrical Shapes")); 		zoombar_tool = new Expander (t_("Zoom")); 		view_tools = new Expander ();diff --git a/libbirdfont/Glyph.vala b/libbirdfont/Glyph.valaindex bae1811..bf4d454 100644--- a/libbirdfont/Glyph.vala+++ b/libbirdfont/Glyph.vala@@ -1532,7 +1532,7 @@ public class Glyph : FontDisplay { 	private void draw_zoom_area(Context cr) { 		cr.save (); 		cr.set_line_width (2.0);-		Theme.color (cr, "Foreground 3");+		Theme.color (cr, "Foreground 4"); 		cr.rectangle (Math.fmin (zoom_x1, zoom_x2), Math.fmin (zoom_y1, zoom_y2), Math.fabs (zoom_x1 - zoom_x2), Math.fabs (zoom_y1 - zoom_y2)); 		cr.stroke (); 		cr.restore ();diff --git a/libbirdfont/TabBar.vala b/libbirdfont/TabBar.valaindex 7cea816..57b6f71 100644--- a/libbirdfont/TabBar.vala+++ b/libbirdfont/TabBar.vala@@ -737,7 +737,7 @@ public class TabBar : GLib.Object { 				cr.restore ();				 			} else if (tab_index == over) { 				cr.save ();-				Theme.color (cr, "Backgrund 7");+				Theme.color (cr, "Background 7"); 				cr.rectangle (0, 0, tab_width, h); 				cr.fill (); 				cr.restore ();			diff --git a/libbirdfont/Tool.vala b/libbirdfont/Tool.valaindex 3682a24..cec3e11 100644--- a/libbirdfont/Tool.vala+++ b/libbirdfont/Tool.vala@@ -70,11 +70,6 @@ public class Tool : Widget { 	public uint modifier_flag; 	public unichar key; 	-	private static ImageSurface? selected_button = null;-	private static ImageSurface? active_selected_button = null;-	private static ImageSurface? deselected_button = null;-	private static ImageSurface? active_deselected_button = null;-	 	public bool persistent = false; 	public bool editor_events = false; 	@@ -90,13 +85,6 @@ public class Tool : Widget { 		 		scale = w / 111.0; // scale to 320 dpi 		-		if (selected_button == null) {-			selected_button = Icons.get_icon ("tool_button_selected.png");-			active_selected_button = Icons.get_icon ("tool_button_selected_active.png");-			deselected_button = Icons.get_icon ("tool_button_deselected.png");-			active_deselected_button = Icons.get_icon ("tool_button_deselected_active.png");-		}-		 		if (name != null) { 			set_icon ((!) name); 			this.name = (!) name;@@ -251,8 +239,8 @@ public class Tool : Widget { 		double bgx, bgy; 		double iconx, icony; 		-		string border = "Foreground 1";-		string background = "Background 1";+		string border = "Tool Border 3";+		string background = "Tool Border 3"; 		 		cr.save (); 		@@ -267,22 +255,22 @@ public class Tool : Widget { 		bgy = yt / scale;  		// Button in four states-		if (selected && selected_button != null) {+		if (selected) { 			border = "Tool Border 1"; 			background = "Tool Background 1"; 		} -		if (selected && active && active_selected_button != null) {+		if (selected && active) { 			border = "Tool Border 2"; 			background = "Tool Background 2"; 		} -		if (!selected && deselected_button != null) {+		if (!selected) { 			border = "Tool Border 3"; 			background = "Tool Background 3"; 		} -		if (!selected && active && active_deselected_button != null) {+		if (!selected && active) { 			border = "Tool Border 4"; 			background = "Tool Background 4"; 		}