diff --git a/epplets/E-Cpu.ABOUT/MAIN b/epplets/E-Cpu.ABOUT/MAIN new file mode 100644 index 0000000..333cf73 --- /dev/null +++ b/epplets/E-Cpu.ABOUT/MAIN @@ -0,0 +1,6 @@ + + +

+E-Cpu + +

diff --git a/epplets/E-Cpu.ABOUT/aircut3.ttf b/epplets/E-Cpu.ABOUT/aircut3.ttf new file mode 100644 index 0000000..c244ec9 Binary files /dev/null and b/epplets/E-Cpu.ABOUT/aircut3.ttf differ diff --git a/epplets/E-Cpu.ABOUT/bg.png b/epplets/E-Cpu.ABOUT/bg.png new file mode 100644 index 0000000..3ca990a Binary files /dev/null and b/epplets/E-Cpu.ABOUT/bg.png differ diff --git a/epplets/E-Cpu.c b/epplets/E-Cpu.c index cde724b..2796906 100644 --- a/epplets/E-Cpu.c +++ b/epplets/E-Cpu.c @@ -5,7 +5,7 @@ double *prev_val = NULL; int *load_val = NULL; Window win; RGB_buf buf; -Epplet_gadget da, b_close, b_config, pop; +Epplet_gadget da, b_close, b_config, b_help, pop; int *flame = NULL; int *vspread, *hspread, *residual; unsigned char rm[255], gm[255], bm[255]; @@ -49,6 +49,7 @@ static void cb_out(void *data, Window w); static void cb_timer(void *data); static void cb_close(void *data); static void cb_config(void *data); +static void cb_help(void *data); static int count_cpus(void); static void draw_flame(void); static void flame_col(int r1, int g1, int b1, int r2, int g2, int b2, int r3, int g3, int b3); @@ -244,11 +245,18 @@ cb_config(void *data) Epplet_gadget_show(pop); } +static void +cb_help(void *data) +{ + Epplet_show_about("E-Cpu"); +} + static void cb_in(void *data, Window w) { Epplet_gadget_show(b_close); Epplet_gadget_show(b_config); + Epplet_gadget_show(b_help); } static void @@ -256,6 +264,7 @@ cb_out(void *data, Window w) { Epplet_gadget_hide(b_close); Epplet_gadget_hide(b_config); + Epplet_gadget_hide(b_help); } static int @@ -351,6 +360,9 @@ main(int argc, char **argv) b_config = Epplet_create_button(NULL, NULL, 28, 0, 0, 0, "CONFIGURE", win, NULL, cb_config, NULL); + b_help = Epplet_create_button(NULL, NULL, + 14, 0, 0, 0, "HELP", win, NULL, + cb_help, NULL); p = Epplet_create_popup(); Epplet_add_popup_entry(p, "Turquoise", NULL, cb_color, (void *)(&(colors[0 * 9]))); Epplet_add_popup_entry(p, "Fire", NULL, cb_color, (void *)(&(colors[1 * 9]))); diff --git a/epplets/Makefile.am b/epplets/Makefile.am index 3291de1..db59761 100644 --- a/epplets/Makefile.am +++ b/epplets/Makefile.am @@ -27,12 +27,25 @@ EppletTest_epplet_LDFLAGS = -rpath $(libdir):$(pkglibdir) INCLUDES = -DEBIN=\"$(EBIN)\" -DEROOT=\"$(EROOT)\" -I. -I$(top_srcdir)/api -I$(top_srcdir) -I.. -I$(includedir) -I$(prefix)/include $(X_CFLAGS) LDADD = $(top_builddir)/api/libepplet.la -L$(libdir) -L$(prefix)/lib $(LIBS) $(X_LIBS) -EXTRA_DIST = E-Load.icon E-Clock.icon E-Net.icon E-Cpu.icon EppletTest.icon \ -E-Clock-Image.png +ABOUT_DOCS = E-Cpu.ABOUT/MAIN E-Cpu.ABOUT/bg.png E-Cpu.ABOUT/aircut3.ttf +ICONS = E-Load.icon E-Clock.icon E-Net.icon E-Cpu.icon +DATA =E-Clock-Image.png + +EXTRA_DIST = ${ICONS} ${ABOUT_DOCS} ${DATA} + + install-data-hook: $(mkinstalldirs) $(EROOT)/epplet_icons - @for i in $(srcdir)/*.icon ; do \ + @for i in ${ICONS}; do \ echo $(INSTALL_DATA) $$i $(EROOT)/epplet_icons/ ; \ $(INSTALL_DATA) $$i $(EROOT)/epplet_icons/ ; \ done + @for i in ${DATA}; do \ + echo $(INSTALL_DATA) $$i $(EROOT)/epplet_icons/ ; \ + $(INSTALL_DATA) $$i $(EROOT)/epplet_icons/ ; \ + done + @for i in ${ABOUT_DOCS}; do \ + echo $(INSTALL_DATA) -D $$i $(EROOT)/epplet_icons/$$i ; \ + $(INSTALL_DATA) -D $$i $(EROOT)/epplet_icons/$$i ; \ + done