diff options
Diffstat (limited to 'amiga')
| -rw-r--r-- | amiga/Makefile.target | 2 | ||||
| -rw-r--r-- | amiga/download.c | 1 | ||||
| -rwxr-xr-x | amiga/font.c | 6 | ||||
| -rw-r--r-- | amiga/gui.c | 25 | ||||
| -rw-r--r-- | amiga/menu.c | 2 |
5 files changed, 9 insertions, 27 deletions
diff --git a/amiga/Makefile.target b/amiga/Makefile.target index 33ce41e62..1820a90bb 100644 --- a/amiga/Makefile.target +++ b/amiga/Makefile.target @@ -120,7 +120,6 @@ netsurf.lha: $(EXETARGET) $(Q)mkdir -p $(AMIGA_INSTALL_TARGET_DIR)/NetSurf $(Q)cp -p $(EXETARGET) $(AMIGA_INSTALL_TARGET_DIR)/NetSurf $(Q)mkdir $(AMIGA_INSTALL_TARGET_DIR)/NetSurf/Resources - $(call split_install_messages, ami, $(AMIGA_INSTALL_TARGET_DIR)/NetSurf/Resources/) $(Q)cp -r $(AMIGA_RESOURCES) $(AMIGA_INSTALL_TARGET_DIR)/NetSurf/Resources $(Q)cp -r $(AMIGA_DISTRIBUTION_FILES) $(AMIGA_INSTALL_TARGET_DIR)/NetSurf $(Q)cp \!NetSurf/Resources/AdBlock,f79 $(AMIGA_INSTALL_TARGET_DIR)/NetSurf/Resources/adblock.css @@ -137,6 +136,7 @@ netsurf.lha: $(EXETARGET) # $(Q)mkdir $(AMIGA_INSTALL_TARGET_DIR)/NetSurf/SObjs # $(Q)cp --preserve=timestamps $(AMIGA_SOBJS) $(AMIGA_INSTALL_TARGET_DIR)/NetSurf/SObjs endif + $(call split_install_messages, ami, $(AMIGA_INSTALL_TARGET_DIR)/NetSurf/Resources/) $(Q)cd $(AMIGA_INSTALL_TARGET_DIR); \ lha a netsurf.lha NetSurf NetSurf.info AutoInstall diff --git a/amiga/download.c b/amiga/download.c index 6b0e3c8a0..fc68e2a89 100644 --- a/amiga/download.c +++ b/amiga/download.c @@ -295,7 +295,6 @@ void gui_download_window_done(struct gui_download_window *dw) nsurl_unref(url); } } - } BOOL ami_download_window_event(struct gui_download_window *dw) diff --git a/amiga/font.c b/amiga/font.c index 21f26358f..310d8bec3 100755 --- a/amiga/font.c +++ b/amiga/font.c @@ -327,8 +327,6 @@ bool nsfont_split(const plot_font_style_t *fstyle, utf16next, emwidth); } - tx += tempx; - /* Check whether we have a space */ if (*(string + utf8_pos) == ' ') { /* Got a space */ @@ -343,6 +341,8 @@ bool nsfont_split(const plot_font_style_t *fstyle, } } + tx += tempx; + if ((x < tx) && (*char_offset != 0)) { /* Reached available width, and a space was found; * split there. */ @@ -352,7 +352,7 @@ bool nsfont_split(const plot_font_style_t *fstyle, utf16 = utf16next; utf8_pos = utf8_next(string, length, utf8_pos); - }; + } free(outf16); diff --git a/amiga/gui.c b/amiga/gui.c index c41df4288..bb919c61e 100644 --- a/amiga/gui.c +++ b/amiga/gui.c @@ -957,7 +957,7 @@ static void gui_init2(int argc, char** argv) REGAPP_HasPrefsWindow, TRUE, REGAPP_CanCreateNewDocs, TRUE, REGAPP_UniqueApplication, TRUE, - desc, "Small as a mouse, fast as a cheetah and available for free. NetSurf is a multi-platform web browser.", + desc, messages_get("NetSurfDesc"), TAG_DONE); } else @@ -970,7 +970,7 @@ static void gui_init2(int argc, char** argv) REGAPP_HasPrefsWindow, TRUE, REGAPP_CanCreateNewDocs, TRUE, REGAPP_UniqueApplication, TRUE, - desc, "Small as a mouse, fast as a cheetah and available for free. NetSurf is a multi-platform web browser.", + desc, messages_get("NetSurfDesc"), TAG_DONE); } @@ -2477,24 +2477,6 @@ void ami_handle_applib(void) WindowToFront(curbw->window->shared->win); ActivateWindow(curbw->window->shared->win); } - else - { - error = nsurl_create(nsoption_charp(homepage_url), &url); - if (error == NSERROR_OK) { - error = browser_window_create(BROWSER_WINDOW_VERIFIABLE | - BROWSER_WINDOW_HISTORY, - url, - NULL, - NULL, - &bw); - nsurl_unref(url); - } - if (error != NSERROR_OK) { - warn_user(messages_get_errorcode(error), 0); - } - - - } break; case APPLIBMT_OpenPrefs: @@ -2705,7 +2687,8 @@ void ami_quit_netsurf(void) break; case AMINS_WINDOW: - ami_close_all_tabs(gwin); + ShowWindow(gwin->win, WINDOW_BACKMOST); + ami_close_all_tabs(gwin); break; } diff --git a/amiga/menu.c b/amiga/menu.c index 4f2e1556d..bfd010d58 100644 --- a/amiga/menu.c +++ b/amiga/menu.c @@ -235,7 +235,7 @@ void ami_init_menulabs(struct gui_window_2 *gwin) ami_menu_alloc_item(gwin, M_HISTGLBL, NM_ITEM, "HistGlobalNS", 0, NULL, ami_menu_item_browser_globalhistory, NULL); ami_menu_alloc_item(gwin, M_BAR_B2, NM_ITEM, NM_BARLABEL, 0, NULL, NULL, NULL); - ami_menu_alloc_item(gwin, M_COOKIES, NM_ITEM, "ShowCookies", 0, NULL, + ami_menu_alloc_item(gwin, M_COOKIES, NM_ITEM, "ShowCookiesNS", 0, NULL, ami_menu_item_browser_cookies, NULL); ami_menu_alloc_item(gwin, M_BAR_B3, NM_ITEM, NM_BARLABEL, 0, NULL, NULL, NULL); ami_menu_alloc_item(gwin, M_SCALE, NM_ITEM, "ScaleNS", 0, NULL, NULL, NULL); |