X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Usermode%2FApplications%2Faxwin3_src%2FInterface%2Fmain.c;h=8764b8b55df77e602e8e745828ee492e51c9fd7d;hb=e62ce4c06895976eeabd6f91803f5a4194ccc902;hp=0065686b50b83f89bda883314c68ba9932d291e6;hpb=637cd82c20678638c93d7ee0b8ce81a597e8f8d2;p=tpg%2Facess2.git

diff --git a/Usermode/Applications/axwin3_src/Interface/main.c b/Usermode/Applications/axwin3_src/Interface/main.c
index 0065686b..8764b8b5 100644
--- a/Usermode/Applications/axwin3_src/Interface/main.c
+++ b/Usermode/Applications/axwin3_src/Interface/main.c
@@ -11,16 +11,21 @@
 #include <axwin3/widget.h>
 #include <axwin3/menu.h>
 
-#define SIDEBAR_WIDTH	36
+#define SIDEBAR_WIDTH	40
+#define RUN_WIDTH	200
+#define RUN_HEIGHT	60
 
 // === PROTOTYPES ===
 void	create_sidebar(void);
 void	create_mainmenu(void);
+void	create_run_dialog(void);
 
 // === GLOBALS ===
 tHWND	gSidebar;
-tHWND	gSystemMenu;
 tAxWin3_Widget	*gSidebarRoot;
+tHWND	gSystemMenu;
+tHWND	gRunDialog;
+tAxWin3_Widget	*gRunInput;
  int	giScreenWidth;
  int	giScreenHeight;
 
@@ -36,9 +41,13 @@ int main(int argc, char *argv[])
 {
 	// Connect to AxWin3 Server
 	AxWin3_Connect(NULL);
+
+	// TODO: Register to be told when the display layout changes
+	AxWin3_GetDisplayDims(0, NULL, NULL, &giScreenWidth, &giScreenHeight);
 	
 	create_sidebar();
 	create_mainmenu();
+	create_run_dialog();
 	
 	// Idle loop
 	AxWin3_MainLoop();
@@ -50,9 +59,6 @@ void create_sidebar(void)
 {
 	tAxWin3_Widget	*btn, *txt, *ele;
 
-	// TODO: Register to be told when the display layout changes
-	AxWin3_GetDisplayDims(0, NULL, NULL, &giScreenWidth, &giScreenHeight);
-
 	// Create sidebar
 	gSidebar = AxWin3_Widget_CreateWindow(NULL, SIDEBAR_WIDTH, giScreenHeight, ELEFLAG_VERTICAL);
 	AxWin3_MoveWindow(gSidebar, 0, 0);
@@ -82,6 +88,9 @@ void create_sidebar(void)
 	AxWin3_Widget_SetSize(txt, 20);
 	AxWin3_Widget_SetText(txt, "3.0");
 
+	// Turn off decorations
+	AxWin3_DecorateWindow(gSidebar, 0);
+
 	// Show!
 	AxWin3_ShowWindow(gSidebar, 1);	
 	
@@ -94,15 +103,58 @@ void mainmenu_app_textedit(void *unused)
 
 void mainmenu_run_dialog(void *unused)
 {
-	_SysDebug("TODO: Show run dialog");
+	AxWin3_ShowWindow(gRunDialog, 1);
 }
 
 void create_mainmenu(void)
 {
-	gSystemMenu = AxWin3_Menu_Create(gSidebar);
+	gSystemMenu = AxWin3_Menu_Create(NULL);
 	
 	AxWin3_Menu_AddItem(gSystemMenu, "Text &Editor\tWin+E", mainmenu_app_textedit, NULL, 0, NULL);
 	AxWin3_Menu_AddItem(gSystemMenu, NULL, NULL, NULL, 0, NULL);
 	AxWin3_Menu_AddItem(gSystemMenu, "Run\tWin+R", mainmenu_run_dialog, NULL, 0, NULL);
 }
 
+int run_dorun(tAxWin3_Widget *unused)
+{
+//	char *cmd = AxWin3_Widget_GetText(gRunInput);
+	AxWin3_ShowWindow(gRunDialog, 0);
+	return 0;
+}
+
+int run_close(tAxWin3_Widget *unused)
+{
+	AxWin3_ShowWindow(gRunDialog, 0);
+	return 0;
+}
+
+tAxWin3_Widget *make_textbutton(tAxWin3_Widget *Parent, const char *Label, tAxWin3_Widget_FireCb handler)
+{
+	tAxWin3_Widget	*ret, *txt;
+	ret = AxWin3_Widget_AddWidget(Parent, ELETYPE_BUTTON, ELEFLAG_ALIGN_CENTER, "_btn");
+	AxWin3_Widget_SetFireHandler(ret, handler);
+	AxWin3_Widget_AddWidget(ret, ELETYPE_NONE, 0, "_spacer1");
+	txt = AxWin3_Widget_AddWidget(ret, ELETYPE_TEXT, ELEFLAG_NOSTRETCH|ELEFLAG_NOEXPAND, "_txt");
+	AxWin3_Widget_SetText(txt, Label);
+	AxWin3_Widget_AddWidget(ret, ELETYPE_NONE, 0, "_spacer2");
+	return ret;
+}
+
+void create_run_dialog(void)
+{
+	tAxWin3_Widget	*root, *box;
+	
+	gRunDialog = AxWin3_Widget_CreateWindow(NULL, RUN_WIDTH, RUN_HEIGHT, ELEFLAG_VERTICAL);
+	AxWin3_SetWindowTitle(gRunDialog, "Run Program...");
+	AxWin3_MoveWindow(gRunDialog, giScreenWidth/2-RUN_WIDTH/2, giScreenHeight/2-RUN_HEIGHT/2);
+
+	root = AxWin3_Widget_GetRoot(gRunDialog);
+
+	gRunInput = AxWin3_Widget_AddWidget(root, ELETYPE_TEXTINPUT, ELEFLAG_NOSTRETCH, "Input");
+	AxWin3_Widget_SetFireHandler(gRunInput, run_dorun);
+	
+	box = AxWin3_Widget_AddWidget(root, ELETYPE_BOX, ELEFLAG_ALIGN_CENTER, "Button Area");
+	make_textbutton(box, "Ok", run_dorun);
+	make_textbutton(box, "Cancel", run_close);
+}
+