Usermode/AxWin3 - Cleaning up, graphics fixes and working on text cursor

[tpg/acess2.git] / Usermode / Applications / axwin3_src / Interface / main.c

diff --git a/Usermode/Applications/axwin3_src/Interface/main.c b/Usermode/Applications/axwin3_src/Interface/main.c
index 61ba4ac..2fcb98f 100644 (file)
--- a/Usermode/Applications/axwin3_src/Interface/main.c
+++ b/Usermode/Applications/axwin3_src/Interface/main.c
@@ -11,9 +11,9 @@
 #include <axwin3/widget.h>
 #include <axwin3/menu.h>
 
-#define SIDEBAR_WIDTH  36
+#define SIDEBAR_WIDTH  40
 #define RUN_WIDTH      200
-#define RUN_HEIGHT     70
+#define RUN_HEIGHT     60
 
 // === PROTOTYPES ===
 void   create_sidebar(void);
@@ -83,7 +83,7 @@ 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 +101,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,6 +116,7 @@ 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);
 }
@@ -132,10 +137,12 @@ int run_close(tAxWin3_Widget *unused)
 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_NOSTRETCH, "_btn");
+       ret = AxWin3_Widget_AddWidget(Parent, ELETYPE_BUTTON, ELEFLAG_ALIGN_CENTER, "_btn");
        AxWin3_Widget_SetFireHandler(ret, handler);
-       txt = AxWin3_Widget_AddWidget(ret, ELETYPE_TEXT, 0, "_txt");
+       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 +152,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);
 }