X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Usermode%2FApplications%2Fgui_ate_src%2Fmain.c;h=eafd4c12558668272287bd2a91ad2fc8ea88231e;hb=HEAD;hp=a6ed8aa7ade8dfd92122782bc74494e65287af61;hpb=f194730e75d6d3681e5f99a4efed1616fd1ea738;p=tpg%2Facess2.git

diff --git a/Usermode/Applications/gui_ate_src/main.c b/Usermode/Applications/gui_ate_src/main.c
index a6ed8aa7..eafd4c12 100644
--- a/Usermode/Applications/gui_ate_src/main.c
+++ b/Usermode/Applications/gui_ate_src/main.c
@@ -10,15 +10,13 @@
 #include <axwin3/menu.h>
 #include <axwin3/richtext.h>
 #include <stdio.h>
+#include "include/common.h"
+#include "strings.h"
 
 // === PROTOTYPES ===
  int	main(int argc, char *argv[]);
  int	TextArea_KeyHandler(tHWND Window, int bPress, uint32_t KeySym, uint32_t Translated);
  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);
- int	Toolbar_New(tAxWin3_Widget *Widget);
- int	Toolbar_Open(tAxWin3_Widget *Widget);
- int	Toolbar_Save(tAxWin3_Widget *Widget);
 
 // === GLOBALS ===
 tHWND	gMainWindow;
@@ -33,7 +31,7 @@ int main(int argc, char *argv[])
 	AxWin3_Connect(NULL);
 	
 	// --- Build up window
-	gMainWindow = AxWin3_Widget_CreateWindow(NULL, 700, 400, ELEFLAG_VERTICAL);
+	gMainWindow = AxWin3_Widget_CreateWindow(NULL, 500, 400, ELEFLAG_VERTICAL);
 	AxWin3_SetWindowTitle(gMainWindow, "Acess Text Editor");	// TODO: Update title with other info
 	gMainWindow_Root = AxWin3_Widget_GetRoot(gMainWindow);
 
@@ -42,25 +40,13 @@ int main(int argc, char *argv[])
 	// TODO: Populate menu	
 
 	// Create toolbar
-	gMainWindow_Toolbar = AxWin3_Widget_AddWidget(gMainWindow_Root, ELETYPE_TOOLBAR, ELEFLAG_NOSTRETCH, "Toolbar");
-	add_toolbar_button(gMainWindow_Toolbar, "BtnNew", Toolbar_New);
-	add_toolbar_button(gMainWindow_Toolbar, "BtnOpen", Toolbar_Open);
-	add_toolbar_button(gMainWindow_Toolbar, "BtnSave", Toolbar_Save);
-	AxWin3_Widget_AddWidget(gMainWindow_Toolbar, ELETYPE_SPACER, 0, "");
-	add_toolbar_button(gMainWindow_Toolbar, "BtnUndo", NULL);
-	add_toolbar_button(gMainWindow_Toolbar, "BtnRedo", NULL);
-	AxWin3_Widget_AddWidget(gMainWindow_Toolbar, ELETYPE_SPACER, 0, "");
-	add_toolbar_button(gMainWindow_Toolbar, "BtnCut", NULL);
-	add_toolbar_button(gMainWindow_Toolbar, "BtnCopy", NULL);
-	add_toolbar_button(gMainWindow_Toolbar, "BtnPaste", NULL);
-	AxWin3_Widget_AddWidget(gMainWindow_Toolbar, ELETYPE_SPACER, 0, "");
-	add_toolbar_button(gMainWindow_Toolbar, "BtnSearch", NULL);
-	add_toolbar_button(gMainWindow_Toolbar, "BtnReplace", NULL);
+	gMainWindow_Toolbar = AxWin3_Widget_AddWidget(gMainWindow_Root,
+		ELETYPE_TOOLBAR, ELEFLAG_NOSTRETCH, "Toolbar");
+	Toolbar_Init(gMainWindow_Toolbar);
 
 	// TODO: Tab control?	
 
 	gMainWindow_TextArea = AxWin3_RichText_CreateWindow(gMainWindow, 0);
-	AxWin3_Widget_AddWidget_SubWindow(gMainWindow_Root, gMainWindow_TextArea, 0, "TextArea");
 	AxWin3_RichText_SetKeyHandler	(gMainWindow_TextArea, TextArea_KeyHandler);
 	AxWin3_RichText_SetMouseHandler	(gMainWindow_TextArea, TextArea_MouseHandler);
 	AxWin3_RichText_SetBackground	(gMainWindow_TextArea, 0xFFFFFF);
@@ -73,19 +59,23 @@ int main(int argc, char *argv[])
 	// <testing>
 	AxWin3_RichText_SetLineCount(gMainWindow_TextArea, 3);
 	AxWin3_RichText_SendLine(gMainWindow_TextArea, 0, "First line!");
-	AxWin3_RichText_SendLine(gMainWindow_TextArea, 2, "Third line! \x01""ff0000A red");
+	AxWin3_RichText_SendLine(gMainWindow_TextArea, 2, "Third line! \001ff0000red\00100ff00green");
 	// </testing>
 
+	AxWin3_Widget_AddWidget_SubWindow(gMainWindow_Root, gMainWindow_TextArea, 0, "TextArea");
 	AxWin3_ShowWindow(gMainWindow_TextArea, 1);
 	// TODO: Status Bar?
 
 	AxWin3_MoveWindow(gMainWindow, 50, 50);
 	AxWin3_ShowWindow(gMainWindow, 1);
 	AxWin3_FocusWindow(gMainWindow);
+	AxWin3_FocusWindow(gMainWindow_TextArea);
 	
 	// Main loop
 	AxWin3_MainLoop();
 
+	AxWin3_DestroyWindow(gMainWindow);
+
 	return 0;
 }
 
@@ -99,25 +89,3 @@ int TextArea_MouseHandler(tHWND Window, int bPress, int Button, int Row, int Col
 	return 0;
 }
 
-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, Ident);
-	AxWin3_Widget_SetFireHandler(btn, Callback);
-}
-
-int Toolbar_New(tAxWin3_Widget *Widget)
-{
-	return 0;
-}
-int Toolbar_Open(tAxWin3_Widget *Widget)
-{
-	return 0;
-}
-int Toolbar_Save(tAxWin3_Widget *Widget)
-{
-	return 0;
-}
-