X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Usermode%2FApplications%2Faxwin3_src%2FInterface%2Fmain.c;h=e34968c9df509d1efa822002ce669b4d553f48d3;hb=7378996995784940b371210bf7167628551a3486;hp=b7c06ca8a9d4a67c9a6d9eadfa20c25b86a6ac63;hpb=5469fe753efcaccb07e7666c4b7d9b4a8d003808;p=tpg%2Facess2.git

diff --git a/Usermode/Applications/axwin3_src/Interface/main.c b/Usermode/Applications/axwin3_src/Interface/main.c
index b7c06ca8..e34968c9 100644
--- a/Usermode/Applications/axwin3_src/Interface/main.c
+++ b/Usermode/Applications/axwin3_src/Interface/main.c
@@ -13,7 +13,7 @@
 
 #define SIDEBAR_WIDTH	40
 #define RUN_WIDTH	200
-#define RUN_HEIGHT	70
+#define RUN_HEIGHT	60
 
 // === PROTOTYPES ===
 void	create_sidebar(void);
@@ -83,7 +83,11 @@ void create_sidebar(void)
 	AxWin3_Widget_SetSize(ele, 4);
 
 	// > Version/Time
-	ele = AxWin3_Widget_AddWidget(gSidebarRoot, ELETYPE_BOX, ELEFLAG_VERTICAL|ELEFLAG_NOSTRETCH, "Version/Time");
+	ele = AxWin3_Widget_AddWidget(gSidebarRoot,
+		ELETYPE_BOX,
+		ELEFLAG_VERTICAL|ELEFLAG_ALIGN_CENTER|ELEFLAG_NOSTRETCH,
+		"Version/Time"
+		);
 	txt = AxWin3_Widget_AddWidget(ele, ELETYPE_TEXT, ELEFLAG_NOSTRETCH, "Version String");
 	AxWin3_Widget_SetSize(txt, 20);
 	AxWin3_Widget_SetText(txt, "3.0");
@@ -101,9 +105,13 @@ void mainmenu_app_textedit(void *unused)
 	_SysDebug("TODO: Launch text editor");
 }
 
+void mainmenu_app_terminal(void *unused)
+{
+	_SysDebug("TODO: Launch terminal emulator");
+}
+
 void mainmenu_run_dialog(void *unused)
 {
-	_SysDebug("TODO: Show run dialog");
 	AxWin3_ShowWindow(gRunDialog, 1);
 }
 
@@ -112,19 +120,25 @@ void create_mainmenu(void)
 	gSystemMenu = AxWin3_Menu_Create(NULL);
 	
 	AxWin3_Menu_AddItem(gSystemMenu, "Text &Editor\tWin+E", mainmenu_app_textedit, NULL, 0, NULL);
+	AxWin3_Menu_AddItem(gSystemMenu, "&Terminal Emulator\tWin+T", mainmenu_app_terminal, 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);
+	AxWin3_Menu_AddItem(gSystemMenu, "&Run\tWin+R", mainmenu_run_dialog, NULL, 0, NULL);
 }
 
+// --------------------------------------------------------------------
+// "Run" Dialog box
+// --------------------------------------------------------------------
 int run_dorun(tAxWin3_Widget *unused)
 {
-//	char *cmd = AxWin3_Widget_GetText(gRunInput);
+	char *cmd = AxWin3_Widget_GetText(gRunInput);
+	_SysDebug("Command string '%s'", cmd);
 	AxWin3_ShowWindow(gRunDialog, 0);
 	return 0;
 }
 
 int run_close(tAxWin3_Widget *unused)
 {
+	_SysDebug("Run diaglog closed");
 	AxWin3_ShowWindow(gRunDialog, 0);
 	return 0;
 }
@@ -134,8 +148,10 @@ tAxWin3_Widget *make_textbutton(tAxWin3_Widget *Parent, const char *Label, tAxWi
 	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;
 }
 
@@ -145,14 +161,14 @@ void create_run_dialog(void)
 	
 	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, 0, "Input");
+	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|ELEFLAG_NOSTRETCH, "Button Area");
+	box = AxWin3_Widget_AddWidget(root, ELETYPE_BOX, ELEFLAG_ALIGN_CENTER, "Button Area");
 	make_textbutton(box, "Ok", run_dorun);
 	make_textbutton(box, "Cancel", run_close);
 }