qi-hardware/fped
1
0
Fork 0
mirror of git://projects.qi-hardware.com/fped.git synced 2024-11-22 19:31:53 +02:00
Code

- renamed gui_icons to gui_tools

Browse Source 
git-svn-id: http://svn.openmoko.org/trunk/eda/fped@5383 99fdad57-331a-0410-800a-d7fa5415bdb3
This commit is contained in:
werner 2009-08-04 07:24:13 +00:00
parent 3d2748a623
commit 0015f96f14
4 changed files with 24 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile
View File

@ -14,7 +14,7 @@ OBJS = fped.o expr.o coord.o obj.o inst.o util.o error.o \
unparse.o \ unparse.o \
cpp.o lex.yy.o y.tab.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.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 \ XPMS = point.xpm vec.xpm frame.xpm \
line.xpm rect.xpm pad.xpm circ.xpm arc.xpm meas.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 y.tab.o: y.tab.c
$(CC) -c $(CFLAGS) $(SLOPPY) y.tab.c $(CC) -c $(CFLAGS) $(SLOPPY) y.tab.c
gui_icons.o: $(XPMS:%=icons/%) gui_tools.o: $(XPMS:%=icons/%)
# ----- Dependencies ---------------------------------------------------------- # ----- Dependencies ----------------------------------------------------------

8
gui.c
View File

@ -24,7 +24,7 @@
#include "gui_style.h" #include "gui_style.h"
#include "gui_status.h" #include "gui_status.h"
#include "gui_canvas.h" #include "gui_canvas.h"
#include "gui_icons.h" #include "gui_tools.h"
#include "gui.h" #include "gui.h"
@ -610,7 +610,7 @@ static void build_frames(GtkWidget *vbox)
static void make_center_area(GtkWidget *vbox) static void make_center_area(GtkWidget *vbox)
{ {
GtkWidget *hbox, *frames_area, *paned; GtkWidget *hbox, *frames_area, *paned;
GtkWidget *icons; GtkWidget *tools;
hbox = gtk_hbox_new(FALSE, 0); hbox = gtk_hbox_new(FALSE, 0);
gtk_box_pack_start(GTK_BOX(vbox), hbox, TRUE, TRUE, 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 */ /* Icon bar */
icons = gui_setup_icons(root->window); tools = gui_setup_tools(root->window);
gtk_box_pack_end(GTK_BOX(hbox), icons, FALSE, FALSE, 0); gtk_box_pack_end(GTK_BOX(hbox), tools, FALSE, FALSE, 0);
} }

26
gui_icons.c → gui_tools.c
View File

@ -1,5 +1,5 @@
/* /*
* gui_icons.c - GUI, icon bar * gui_tools.c - GUI, tool bar
* *
* Written 2009 by Werner Almesberger * Written 2009 by Werner Almesberger
* Copyright 2009 by Werner Almesberger * Copyright 2009 by Werner Almesberger
@ -14,7 +14,7 @@
#include <gtk/gtk.h> #include <gtk/gtk.h>
#include "gui_util.h" #include "gui_util.h"
#include "gui_icons.h" #include "gui_tools.h"
#include "icons/arc.xpm" #include "icons/arc.xpm"
@ -28,7 +28,7 @@
#include "icons/vec.xpm" #include "icons/vec.xpm"
static GtkToolItem *icon_button(GtkWidget *bar, GdkDrawable *drawable, static GtkToolItem *tool_button(GtkWidget *bar, GdkDrawable *drawable,
char **xpm, GtkToolItem *last) char **xpm, GtkToolItem *last)
{ {
GdkPixmap *pixmap; 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; GtkWidget *bar;
GtkToolItem *last; GtkToolItem *last;
@ -73,15 +73,15 @@ GtkWidget *gui_setup_icons(GdkDrawable *drawable)
GTK_ORIENTATION_VERTICAL); GTK_ORIENTATION_VERTICAL);
//gtk_container_set_border_width(GTK_CONTAINER(bar), 5); //gtk_container_set_border_width(GTK_CONTAINER(bar), 5);
last = icon_button(bar, drawable, xpm_point, NULL); last = tool_button(bar, drawable, xpm_point, NULL);
last = icon_button(bar, drawable, xpm_vec, last); last = tool_button(bar, drawable, xpm_vec, last);
last = icon_button(bar, drawable, xpm_frame, last); last = tool_button(bar, drawable, xpm_frame, last);
last = icon_button(bar, drawable, xpm_pad, last); last = tool_button(bar, drawable, xpm_pad, last);
last = icon_button(bar, drawable, xpm_line, last); last = tool_button(bar, drawable, xpm_line, last);
last = icon_button(bar, drawable, xpm_rect, last); last = tool_button(bar, drawable, xpm_rect, last);
last = icon_button(bar, drawable, xpm_circ, last); last = tool_button(bar, drawable, xpm_circ, last);
last = icon_button(bar, drawable, xpm_arc, last); last = tool_button(bar, drawable, xpm_arc, last);
last = icon_button(bar, drawable, xpm_meas, last); last = tool_button(bar, drawable, xpm_meas, last);
return bar; return bar;
} }

10
gui_icons.h → gui_tools.h
View File

@ -1,5 +1,5 @@
/* /*
* gui_icons.h - GUI, icon bar * gui_tools.h - GUI, tool bar
* *
* Written 2009 by Werner Almesberger * Written 2009 by Werner Almesberger
* Copyright 2009 by Werner Almesberger * Copyright 2009 by Werner Almesberger
@ -11,12 +11,12 @@
*/ */
#ifndef GUI_ICONS_H #ifndef GUI_TOOLS_H
#define GUI_ICONS_H #define GUI_TOOLS_H
#include <gtk/gtk.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 */