From 0bbccaa9359b3cedf9f37cd8e322edc90240a7bc Mon Sep 17 00:00:00 2001 From: Ole Loots Date: Mon, 7 Jan 2013 20:04:44 +0100 Subject: Finally it compiles without WinDom - still some things to bring back: - Serch window - Pop Menus in the settings dialog --- atari/settings.c | 45 +++++++++++++-------------------------------- 1 file changed, 13 insertions(+), 32 deletions(-) (limited to 'atari/settings.c') diff --git a/atari/settings.c b/atari/settings.c index c5cc3ae52..cee3ec9f2 100644 --- a/atari/settings.c +++ b/atari/settings.c @@ -95,33 +95,7 @@ static void set_text( short idx, char * text, int len ) set_string( dlgtree, idx, spare); } - - -static char *get_text(OBJECT * tree, short idx) -{ - static char p[]=""; - USERBLK *user; - char *retval; - - switch (tree[idx].ob_type & 0x00FF) { - case G_BUTTON: - case G_STRING: - case G_TITLE: - return( tree[idx].ob_spec.free_string); - case G_TEXT: - case G_BOXTEXT: - case G_FTEXT: - case G_FBOXTEXT: - return (tree[idx].ob_spec.tedinfo->te_ptext); - case G_ICON: - case G_CICON: - return (tree[idx].ob_spec.iconblk->ib_ptext); - break; - - default: break; - } - return (p); -} + /** @@ -297,7 +271,8 @@ static void form_event(int index, int external) const char *locales[] = { "cs", "de", "de-de" , "en", "en-gb", "en-us", "es", "fr", "it", "nl", "no", "pl", "ru", "sk", "sv" - }; + }; + int num_locales = (sizeof(locales)/sizeof(char*)); short x, y; int choice; @@ -351,17 +326,20 @@ static void form_event(int index, int external) case SETTINGS_BT_SEL_FONT_RENDERER: if( external ){ - objc_offset(dlgtree, SETTINGS_BT_SEL_FONT_RENDERER, &x, &y); + objc_offset(dlgtree, SETTINGS_BT_SEL_FONT_RENDERER, &x, &y); + // TODO: add menu popup + /* choice = MenuPopUp (font_driver_items, x, y, num_font_drivers, - -1, -1, P_LIST + P_WNDW + P_CHCK ); + -1, -1, P_LIST + P_WNDW + P_CHCK); if( choice > 0 && choice <= num_font_drivers ){ set_text(SETTINGS_BT_SEL_FONT_RENDERER, (char*)font_driver_items[choice-1], LABEL_FONT_RENDERER_MAX_LEN); OBJ_REDRAW(SETTINGS_BT_SEL_FONT_RENDERER); - } + } + */ } tmp = get_text(dlgtree, SETTINGS_BT_SEL_FONT_RENDERER); if( strcmp(tmp, "freetype") == 0 ){ @@ -372,13 +350,16 @@ static void form_event(int index, int external) break; case SETTINGS_BT_SEL_LOCALE: - objc_offset(dlgtree, SETTINGS_BT_SEL_LOCALE, &x, &y); + objc_offset(dlgtree, SETTINGS_BT_SEL_LOCALE, &x, &y); + // TODO: open locales popup + /* choice = MenuPopUp ( locales, x, y, num_locales, -1, -1, P_LIST + P_WNDW + P_CHCK ); if( choice > 0 && choice <= num_locales ){ set_text(SETTINGS_BT_SEL_LOCALE, (char*)locales[choice-1], 5); } + */ OBJ_REDRAW(SETTINGS_BT_SEL_LOCALE); break; -- cgit v1.2.3