mirrors/netsurf
1
0
Fork 0
mirror of https://github.com/netsurf-browser/netsurf synced 2024-12-23 12:36:51 +03:00
Code Issues Packages Projects Releases Wiki Activity

Convert find window messages to local charset

Browse Source
This commit is contained in:
Chris Young 2018-09-27 00:12:17 +01:00
parent 64bc2a7931
commit b097455772
1 changed files with 52 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

82
frontends/amiga/search.c
View File

@ -81,11 +81,21 @@ enum
GID_S_LAST GID_S_LAST
}; };
enum {
SSTR_TITLE = 0,
SSTR_CASE,
SSTR_SHOWALL,
SSTR_PREV,
SSTR_NEXT,
SSTR_LAST
};
struct find_window { struct find_window {
struct ami_generic_window w; struct ami_generic_window w;
struct Window *win; struct Window *win;
Object *objects[GID_S_LAST]; Object *objects[GID_S_LAST];
struct gui_window *gwin; struct gui_window *gwin;
char *message[SSTR_LAST];
}; };
static struct find_window *fwin = NULL; static struct find_window *fwin = NULL;
@ -144,57 +154,63 @@ void ami_search_open(struct gui_window *gwin)
fwin = calloc(1, sizeof(struct find_window)); fwin = calloc(1, sizeof(struct find_window));
/* Get local charset messages. If any of these are NULL it doesn't matter */
fwin->message[SSTR_TITLE] = ami_utf8_easy(messages_get("FindTextNS"));
fwin->message[SSTR_CASE] = ami_utf8_easy(messages_get("CaseSens"));
fwin->message[SSTR_SHOWALL] = ami_utf8_easy(messages_get("ShowAll"));
fwin->message[SSTR_PREV] = ami_utf8_easy(messages_get("Prev"));
fwin->message[SSTR_NEXT] = ami_utf8_easy(messages_get("Next"));
fwin->objects[OID_S_MAIN] = WindowObj, fwin->objects[OID_S_MAIN] = WindowObj,
WA_ScreenTitle, ami_gui_get_screen_title(), WA_ScreenTitle, ami_gui_get_screen_title(),
WA_Title,messages_get("FindTextNS"), WA_Title, fwin->message[SSTR_TITLE],
WA_Activate, TRUE, WA_Activate, TRUE,
WA_DepthGadget, TRUE, WA_DepthGadget, TRUE,
WA_DragBar, TRUE, WA_DragBar, TRUE,
WA_CloseGadget, TRUE, WA_CloseGadget, TRUE,
WA_SizeGadget, TRUE, WA_SizeGadget, TRUE,
WA_PubScreen,scrn, WA_PubScreen, scrn,
WINDOW_SharedPort,sport, WINDOW_SharedPort, sport,
WINDOW_UserData,fwin, WINDOW_UserData, fwin,
WINDOW_IconifyGadget, FALSE, WINDOW_IconifyGadget, FALSE,
WINDOW_LockHeight,TRUE, WINDOW_LockHeight, TRUE,
WINDOW_Position, WPOS_CENTERSCREEN, WINDOW_Position, WPOS_CENTERSCREEN,
WINDOW_ParentGroup, fwin->objects[GID_S_MAIN] = LayoutVObj, WINDOW_ParentGroup, fwin->objects[GID_S_MAIN] = LayoutVObj,
LAYOUT_AddChild, fwin->objects[GID_S_SEARCHSTRING] = StringObj, LAYOUT_AddChild, fwin->objects[GID_S_SEARCHSTRING] = StringObj,
GA_ID,GID_S_SEARCHSTRING, GA_ID, GID_S_SEARCHSTRING,
GA_TabCycle,TRUE, GA_TabCycle, TRUE,
GA_RelVerify,TRUE, GA_RelVerify, TRUE,
StringEnd, StringEnd,
CHILD_WeightedHeight,0, CHILD_WeightedHeight, 0,
LAYOUT_AddChild, fwin->objects[GID_S_CASE] = CheckBoxObj, LAYOUT_AddChild, fwin->objects[GID_S_CASE] = CheckBoxObj,
GA_ID,GID_S_CASE, GA_ID, GID_S_CASE,
GA_Text,messages_get("CaseSens"), GA_Text, fwin->message[SSTR_CASE],
GA_Selected,FALSE, GA_Selected, FALSE,
GA_TabCycle,TRUE, GA_TabCycle, TRUE,
GA_RelVerify,TRUE, GA_RelVerify, TRUE,
CheckBoxEnd, CheckBoxEnd,
LAYOUT_AddChild, fwin->objects[GID_S_SHOWALL] = CheckBoxObj, LAYOUT_AddChild, fwin->objects[GID_S_SHOWALL] = CheckBoxObj,
GA_ID,GID_S_SHOWALL, GA_ID,GID_S_SHOWALL,
GA_Text,messages_get("ShowAll"), GA_Text, fwin->message[SSTR_SHOWALL],
GA_Selected,FALSE, GA_Selected, FALSE,
GA_TabCycle,TRUE, GA_TabCycle, TRUE,
GA_RelVerify,TRUE, GA_RelVerify, TRUE,
CheckBoxEnd, CheckBoxEnd,
LAYOUT_AddChild, LayoutHObj, LAYOUT_AddChild, LayoutHObj,
LAYOUT_AddChild, fwin->objects[GID_S_PREV] = ButtonObj, LAYOUT_AddChild, fwin->objects[GID_S_PREV] = ButtonObj,
GA_ID,GID_S_PREV, GA_ID, GID_S_PREV,
GA_RelVerify,TRUE, GA_RelVerify, TRUE,
GA_Text,messages_get("Prev"), GA_Text, fwin->message[SSTR_PREV],
GA_TabCycle,TRUE, GA_TabCycle, TRUE,
GA_Disabled,TRUE, GA_Disabled, TRUE,
ButtonEnd, ButtonEnd,
CHILD_WeightedHeight,0, CHILD_WeightedHeight, 0,
LAYOUT_AddChild, fwin->objects[GID_S_NEXT] = ButtonObj, LAYOUT_AddChild, fwin->objects[GID_S_NEXT] = ButtonObj,
GA_ID,GID_S_NEXT, GA_ID, GID_S_NEXT,
GA_RelVerify,TRUE, GA_RelVerify, TRUE,
GA_Text,messages_get("Next"), GA_Text, fwin->message[SSTR_NEXT],
GA_TabCycle,TRUE, GA_TabCycle, TRUE,
GA_Disabled,TRUE, GA_Disabled, TRUE,
ButtonEnd, ButtonEnd,
LayoutEnd, LayoutEnd,
CHILD_WeightedHeight,0, CHILD_WeightedHeight,0,
@ -215,6 +231,12 @@ void ami_search_close(void)
browser_window_search_clear(fwin->gwin->bw); browser_window_search_clear(fwin->gwin->bw);
fwin->gwin->shared->searchwin = NULL; fwin->gwin->shared->searchwin = NULL;
DisposeObject(fwin->objects[OID_S_MAIN]); DisposeObject(fwin->objects[OID_S_MAIN]);
/* Free local charset version of messages */
for(int i = 0; i < SSTR_LAST; i++) {
ami_utf8_free(fwin->message[i]);
}
ami_gui_win_list_remove(fwin); ami_gui_win_list_remove(fwin);
fwin = NULL; fwin = NULL;
} }