From 52e48260d321c3164f00f1f68452a33e91f5f331 Mon Sep 17 00:00:00 2001 From: Chris Young Date: Sun, 31 Aug 2008 11:21:47 +0000 Subject: Menu tidy-up, string correction and swap of Source and Text in the save/export menu svn path=/trunk/netsurf/; revision=5224 --- amiga/gui.c | 14 +++++++------- amiga/menu.c | 14 +++++++------- 2 files changed, 14 insertions(+), 14 deletions(-) (limited to 'amiga') diff --git a/amiga/gui.c b/amiga/gui.c index a6d0eedc0..c6d6cf03c 100755 --- a/amiga/gui.c +++ b/amiga/gui.c @@ -453,7 +453,7 @@ void ami_get_msg(void) break; default: - printf("GADGET: %ld\n",(result & WMHI_GADGETMASK)); +// printf("GADGET: %ld\n",(result & WMHI_GADGETMASK)); break; } break; @@ -494,7 +494,11 @@ void ami_get_msg(void) { strlcpy(&fname,filereq->fr_Drawer,1024); AddPart(&fname,filereq->fr_File,1024); - save_as_text(gwin->bw->current_content,&fname); + if(fh = FOpen(&fname,MODE_NEWFILE,0)) + { + FWrite(fh,gwin->bw->current_content->source_data,1,gwin->bw->current_content->source_size); + FClose(fh); + } } break; @@ -508,11 +512,7 @@ void ami_get_msg(void) { strlcpy(&fname,filereq->fr_Drawer,1024); AddPart(&fname,filereq->fr_File,1024); - if(fh = FOpen(&fname,MODE_NEWFILE,0)) - { - FWrite(fh,gwin->bw->current_content->source_data,1,gwin->bw->current_content->source_size); - FClose(fh); - } + save_as_text(gwin->bw->current_content,&fname); } break; diff --git a/amiga/menu.c b/amiga/menu.c index 8848541ca..bd15e553d 100755 --- a/amiga/menu.c +++ b/amiga/menu.c @@ -35,22 +35,22 @@ void ami_free_menulabs(void) void ami_init_menulabs(void) { menulab[0] = ami_utf8_easy((char *)messages_get("Project")); - menulab[1] = ami_utf8_easy((char *)messages_get("NewWindow")); + menulab[1] = ami_utf8_easy((char *)messages_get("NewWindowNS")); menulab[2] = NM_BARLABEL; menulab[3] = ami_utf8_easy((char *)messages_get("SaveAs")); - menulab[4] = ami_utf8_easy((char *)messages_get("Text")); - menulab[5] = ami_utf8_easy((char *)messages_get("Source")); + menulab[4] = ami_utf8_easy((char *)messages_get("Source")); + menulab[5] = ami_utf8_easy((char *)messages_get("TextNS")); menulab[6] = ami_utf8_easy((char *)messages_get("PDF")); menulab[7] = NM_BARLABEL; menulab[8] = ami_utf8_easy((char *)messages_get("CloseWindow")); menulab[9] = ami_utf8_easy((char *)messages_get("Edit")); menulab[10] = ami_utf8_easy((char *)messages_get("Copy")); menulab[11] = ami_utf8_easy((char *)messages_get("Paste")); - menulab[12] = ami_utf8_easy((char *)messages_get("SelectAll")); - menulab[13] = ami_utf8_easy((char *)messages_get("Clear")); + menulab[12] = ami_utf8_easy((char *)messages_get("SelectAllNS")); + menulab[13] = ami_utf8_easy((char *)messages_get("ClearNS")); menulab[14] = ami_utf8_easy((char *)messages_get("Hotlist")); menulab[15] = ami_utf8_easy((char *)messages_get("HotlistAdd")); - menulab[16] = ami_utf8_easy((char *)messages_get("HotlistShow")); + menulab[16] = ami_utf8_easy((char *)messages_get("HotlistShowNS")); menulab[17] = ami_utf8_easy((char *)messages_get("Settings")); menulab[18] = ami_utf8_easy((char *)messages_get("SnapshotWindow")); menulab[19] = ami_utf8_easy((char *)messages_get("SettingsSave")); @@ -65,8 +65,8 @@ struct NewMenu *ami_create_menu(ULONG type) { NM_ITEM,0,"N",0,0,0,}, // new window { NM_ITEM,NM_BARLABEL,0,0,0,0,}, { NM_ITEM,0,0,0,0,0,}, // save + { NM_SUB,0,"S",0,0,0,}, // save as source { NM_SUB,0,0,0,0,0,}, // save as text - { NM_SUB,0,0,0,0,0,}, // save as source { NM_SUB,0,0,0,0,0,}, // save as pdf { NM_ITEM,NM_BARLABEL,0,0,0,0,}, { NM_ITEM,0,"K",0,0,0,}, // close window -- cgit v1.2.3