From 0015f96f14facf95803003bfb20e6df41ea3e120 Mon Sep 17 00:00:00 2001
From: werner <werner@99fdad57-331a-0410-800a-d7fa5415bdb3>
Date: Tue, 4 Aug 2009 07:24:13 +0000
Subject: [PATCH] - renamed gui_icons to gui_tools

git-svn-id: http://svn.openmoko.org/trunk/eda/fped@5383 99fdad57-331a-0410-800a-d7fa5415bdb3
---
 Makefile                   |  4 ++--
 gui.c                      |  8 ++++----
 gui_icons.c => gui_tools.c | 26 +++++++++++++-------------
 gui_icons.h => gui_tools.h | 10 +++++-----
 4 files changed, 24 insertions(+), 24 deletions(-)
 rename gui_icons.c => gui_tools.c (72%)
 rename gui_icons.h => gui_tools.h (71%)

diff --git a/Makefile b/Makefile
index a82dbe3..6173637 100644
--- a/Makefile
+++ b/Makefile
@@ -14,7 +14,7 @@ OBJS = fped.o expr.o coord.o obj.o inst.o util.o error.o \
        unparse.o \
        cpp.o lex.yy.o y.tab.o \
        gui.o gui_util.o gui_style.o gui_inst.o gui_status.o gui_canvas.o \
-       gui_icons.o
+       gui_tools.o
 
 XPMS = point.xpm vec.xpm frame.xpm \
        line.xpm rect.xpm pad.xpm circ.xpm arc.xpm meas.xpm
@@ -95,7 +95,7 @@ y.tab.c y.tab.h: fpd.y
 y.tab.o:	y.tab.c
 		$(CC) -c $(CFLAGS) $(SLOPPY) y.tab.c
 
-gui_icons.o:	$(XPMS:%=icons/%)
+gui_tools.o:	$(XPMS:%=icons/%)
 
 # ----- Dependencies ----------------------------------------------------------
 
diff --git a/gui.c b/gui.c
index daab3cb..00145cc 100644
--- a/gui.c
+++ b/gui.c
@@ -24,7 +24,7 @@
 #include "gui_style.h"
 #include "gui_status.h"
 #include "gui_canvas.h"
-#include "gui_icons.h"
+#include "gui_tools.h"
 #include "gui.h"
 
 
@@ -610,7 +610,7 @@ static void build_frames(GtkWidget *vbox)
 static void make_center_area(GtkWidget *vbox)
 {
 	GtkWidget *hbox, *frames_area, *paned;
-	GtkWidget *icons;
+	GtkWidget *tools;
 
 	hbox = gtk_hbox_new(FALSE, 0);
 	gtk_box_pack_start(GTK_BOX(vbox), hbox, TRUE, TRUE, 0);
@@ -638,8 +638,8 @@ static void make_center_area(GtkWidget *vbox)
 
 	/* Icon bar */
 
-	icons = gui_setup_icons(root->window);
-	gtk_box_pack_end(GTK_BOX(hbox), icons, FALSE, FALSE, 0);
+	tools = gui_setup_tools(root->window);
+	gtk_box_pack_end(GTK_BOX(hbox), tools, FALSE, FALSE, 0);
 }
 
 
diff --git a/gui_icons.c b/gui_tools.c
similarity index 72%
rename from gui_icons.c
rename to gui_tools.c
index 7fb2d98..8986ca4 100644
--- a/gui_icons.c
+++ b/gui_tools.c
@@ -1,5 +1,5 @@
 /*
- * gui_icons.c - GUI, icon bar
+ * gui_tools.c - GUI, tool bar
  *
  * Written 2009 by Werner Almesberger
  * Copyright 2009 by Werner Almesberger
@@ -14,7 +14,7 @@
 #include <gtk/gtk.h>
 
 #include "gui_util.h"
-#include "gui_icons.h"
+#include "gui_tools.h"
 
 
 #include "icons/arc.xpm"
@@ -28,7 +28,7 @@
 #include "icons/vec.xpm"
 
 
-static GtkToolItem *icon_button(GtkWidget *bar, GdkDrawable *drawable,
+static GtkToolItem *tool_button(GtkWidget *bar, GdkDrawable *drawable,
      char **xpm, GtkToolItem *last)
 {
 	GdkPixmap *pixmap;
@@ -62,7 +62,7 @@ static GtkToolItem *icon_button(GtkWidget *bar, GdkDrawable *drawable,
 }
 
 
-GtkWidget *gui_setup_icons(GdkDrawable *drawable)
+GtkWidget *gui_setup_tools(GdkDrawable *drawable)
 {
 	GtkWidget *bar;
 	GtkToolItem *last;
@@ -73,15 +73,15 @@ GtkWidget *gui_setup_icons(GdkDrawable *drawable)
 	    GTK_ORIENTATION_VERTICAL);
 //gtk_container_set_border_width(GTK_CONTAINER(bar), 5);
 
-	last = icon_button(bar, drawable, xpm_point, NULL);
-	last = icon_button(bar, drawable, xpm_vec, last);
-	last = icon_button(bar, drawable, xpm_frame, last);
-	last = icon_button(bar, drawable, xpm_pad, last);
-	last = icon_button(bar, drawable, xpm_line, last);
-	last = icon_button(bar, drawable, xpm_rect, last);
-	last = icon_button(bar, drawable, xpm_circ, last);
-	last = icon_button(bar, drawable, xpm_arc, last);
-	last = icon_button(bar, drawable, xpm_meas, last);
+	last = tool_button(bar, drawable, xpm_point, NULL);
+	last = tool_button(bar, drawable, xpm_vec, last);
+	last = tool_button(bar, drawable, xpm_frame, last);
+	last = tool_button(bar, drawable, xpm_pad, last);
+	last = tool_button(bar, drawable, xpm_line, last);
+	last = tool_button(bar, drawable, xpm_rect, last);
+	last = tool_button(bar, drawable, xpm_circ, last);
+	last = tool_button(bar, drawable, xpm_arc, last);
+	last = tool_button(bar, drawable, xpm_meas, last);
 
 	return bar;
 }
diff --git a/gui_icons.h b/gui_tools.h
similarity index 71%
rename from gui_icons.h
rename to gui_tools.h
index 6d5a45f..5099801 100644
--- a/gui_icons.h
+++ b/gui_tools.h
@@ -1,5 +1,5 @@
 /*
- * gui_icons.h - GUI, icon bar
+ * gui_tools.h - GUI, tool bar
  *
  * Written 2009 by Werner Almesberger
  * Copyright 2009 by Werner Almesberger
@@ -11,12 +11,12 @@
  */
 
 
-#ifndef GUI_ICONS_H
-#define	GUI_ICONS_H
+#ifndef GUI_TOOLS_H
+#define	GUI_TOOLS_H
 
 #include <gtk/gtk.h>
 
 
-GtkWidget *gui_setup_icons(GdkDrawable *drawable);
+GtkWidget *gui_setup_tools(GdkDrawable *drawable);
 
-#endif /* !GUI_ICONS_H */
+#endif /* !GUI_TOOLS_H */