From: John Hodge <tpg@mutabah.net>
Date: Mon, 18 Feb 2013 15:49:44 +0000 (+0800)
Subject: Usermode/AxWin3 - resources and bugfixes
X-Git-Tag: rel0.15~559
X-Git-Url: https://git.ucc.asn.au/?a=commitdiff_plain;ds=sidebyside;h=6457e97e47fa29a23975daf853a3c032ce6650ef;p=tpg%2Facess2.git

Usermode/AxWin3 - resources and bugfixes
---

diff --git a/Usermode/Applications/axwin3_src/WM/Makefile b/Usermode/Applications/axwin3_src/WM/Makefile
index 1112ffea..4150e945 100644
--- a/Usermode/Applications/axwin3_src/WM/Makefile
+++ b/Usermode/Applications/axwin3_src/WM/Makefile
@@ -23,13 +23,31 @@ OBJ += renderers/widget/textinput.o
 OBJ += renderers/widget/spacer.o
 OBJ += renderers/widget/subwin.o
 
+PNGIMAGES := toolbar_new.png
+
 LDFLAGS += -limage_sif -luri -lnet -lunicode
 
+IMG2SIF = ../../../../Tools/img2sif
+
 -include ../../Makefile.tpl
 
+.PHONY: install_resources
+
+install: install_resources
+
 #all: resources/LogoSmall.sif.res.h
 
 %.res.h: % Makefile
 	echo "#define RESOURCE_$(notdir $<) \\"| sed -e 's/\./_/g' > $@
 	base64 $< | sed -e 's/.*/"&"\\/' >> $@
 	echo "" >> $@
+
+$(IMG2SIF):
+	$(MAKE) -C $(dir $(IMG2SIF)) img2sif
+
+install_%.sif: resources/%.png
+	@echo img2sif resources/$*.png
+	@$(IMG2SIF) resources/$*.png resources/.$*.sif
+	@$(xCP) resources/.$*.sif $(DISTROOT)/$(DIR)/$*.sif
+
+install_resources: $(IMG2SIF) $(addprefix install_,$(PNGIMAGES:%.png=%.sif))
diff --git a/Usermode/Applications/axwin3_src/WM/renderers/richtext.c b/Usermode/Applications/axwin3_src/WM/renderers/richtext.c
index a72cac3f..8f69c9ca 100644
--- a/Usermode/Applications/axwin3_src/WM/renderers/richtext.c
+++ b/Usermode/Applications/axwin3_src/WM/renderers/richtext.c
@@ -87,7 +87,7 @@ tWindow *Renderer_RichText_Create(int Flags)
 
 void Renderer_RichText_Destroy(tWindow *Window)
 {
-	tRichText_Window	*info = ret->RendererInfo;
+	tRichText_Window	*info = Window->RendererInfo;
 
 	// TODO: Is locking needed? WM_Destroy should have taken us off the render tree
 	while( info->FirstLine )
diff --git a/Usermode/Applications/axwin3_src/WM/resources/toolbar_new.png b/Usermode/Applications/axwin3_src/WM/resources/toolbar_new.png
new file mode 100755
index 00000000..86443447
Binary files /dev/null and b/Usermode/Applications/axwin3_src/WM/resources/toolbar_new.png differ
diff --git a/Usermode/Applications/gui_ate_src/main.c b/Usermode/Applications/gui_ate_src/main.c
index 3a929c2a..a6bbee64 100644
--- a/Usermode/Applications/gui_ate_src/main.c
+++ b/Usermode/Applications/gui_ate_src/main.c
@@ -108,9 +108,18 @@ int TextArea_MouseHandler(tHWND Window, int bPress, int Button, int Row, int Col
 void add_toolbar_button(tAxWin3_Widget *Toolbar, const char *Ident, tAxWin3_Widget_FireCb Callback)
 {
 	tAxWin3_Widget *btn = AxWin3_Widget_AddWidget(Toolbar, ELETYPE_BUTTON, ELEFLAG_NOSTRETCH, Ident);
-	tAxWin3_Widget *txt = AxWin3_Widget_AddWidget(btn, ELETYPE_TEXT, 0, Ident);
-	// TODO: Get image / text using `Ident` as a lookup key
-	AxWin3_Widget_SetText(txt, getstr(Ident));
+	const char *img = getimg(Ident);
+	if( img )
+	{
+		tAxWin3_Widget *txt = AxWin3_Widget_AddWidget(btn, ELETYPE_IMAGE, 0, Ident);
+		AxWin3_Widget_SetText(txt, img);
+		// TODO: tooltip?
+	}
+	else
+	{
+		tAxWin3_Widget *txt = AxWin3_Widget_AddWidget(btn, ELETYPE_TEXT, 0, Ident);
+		AxWin3_Widget_SetText(txt, getstr(Ident));
+	}
 	AxWin3_Widget_SetFireHandler(btn, Callback);
 }
 
diff --git a/Usermode/Applications/gui_ate_src/strings.c b/Usermode/Applications/gui_ate_src/strings.c
index a6999934..96b6c0e9 100644
--- a/Usermode/Applications/gui_ate_src/strings.c
+++ b/Usermode/Applications/gui_ate_src/strings.c
@@ -28,6 +28,10 @@ const struct keyval_str	gaDisplayStrings[] = {
 	{"BtnReplace", "Replace"},
 	};
 const int	ciNumDisplayStrings = sizeof(gaDisplayStrings)/sizeof(gaDisplayStrings[0]);
+const struct keyval_str	gaImageStrings[] = {
+	{"BtnNew", "file:///Acess/Apps/AxWin/3.0/toolbar_new.sif"}
+	};
+const int	ciNumImageStrings = sizeof(gaImageStrings)/sizeof(gaImageStrings[0]);
 
 const char *getstr(const char *key)
 {
@@ -42,5 +46,11 @@ const char *getstr(const char *key)
 
 const char *getimg(const char *key)
 {
-	return "";
+	 int	i;
+	for(i = 0; i < ciNumImageStrings; i ++)
+	{
+		if( strcmp(key, gaImageStrings[i].key) == 0 )
+			return gaImageStrings[i].val;
+	}
+	return NULL;
 }