#define SIDEBAR_WIDTH 40
#define RUN_WIDTH 200
-#define RUN_HEIGHT 70
+#define RUN_HEIGHT 60
// === PROTOTYPES ===
void create_sidebar(void);
void create_mainmenu(void);
void create_run_dialog(void);
+void mainmenu_run_dialog(void *unused);
// === GLOBALS ===
tHWND gSidebar;
create_mainmenu();
create_run_dialog();
+ AxWin3_RegisterAction(gSidebar, "Interface>Run", (tAxWin3_HotkeyCallback)mainmenu_run_dialog);
+// AxWin3_RegisterAction(gSidebar, "Interface>Terminal", mainmenu_app_terminal);
+// AxWin3_RegisterAction(gSidebar, "Interface>TextEdit", mainmenu_app_textedit);
+
// Idle loop
AxWin3_MainLoop();
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");
_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);
+ AxWin3_FocusWindow(gRunDialog);
}
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);
+ _SysDebug("DoRun pressed");
+ 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;
}
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;
}
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);
}