Gitweb links: ...log http://git.netsurf-browser.org/netsurf.git/shortlog/083b7c0233635959f1944... ...commit http://git.netsurf-browser.org/netsurf.git/commit/083b7c0233635959f1944c2... ...tree http://git.netsurf-browser.org/netsurf.git/tree/083b7c0233635959f1944c215... The branch, master has been updated via 083b7c0233635959f1944c2150abbb923c5e0481 (commit) via 0c54f2a90260127f7a96b798afc08c691ddebadf (commit) via 24e1aff974499e7e2cb0996a946a6a2d34fd851d (commit) via 388ddc6dbd11e28740538a4d39d04f086e16c0c0 (commit) from 3ef843fcb420c94665981519dacdd8d8c03b8ed0 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commitdiff http://git.netsurf-browser.org/netsurf.git/commitdiff/083b7c0233635959f19... commit 083b7c0233635959f1944c2150abbb923c5e0481 Author: Chris Young <chris(a)unsatisfactorysoftware.co.uk&gt; Commit: Chris Young <chris(a)unsatisfactorysoftware.co.uk&gt; Enable persistent tab bar through tab_always_show option diff --git a/amiga/gui.c b/amiga/gui.c index 06d8356..60d9d31 100755 --- a/amiga/gui.c +++ b/amiga/gui.c @@ -3428,7 +3428,7 @@ void gui_window_destroy(struct gui_window *g) g->shared->tabs--; ami_switch_tab(g->shared,true); - if((g->shared->tabs == 1) && (nsoption_bool(tab_always_show))) + if((g->shared->tabs == 1) && (nsoption_bool(tab_always_show) == false)) ami_toggletabbar(g->shared, false); ami_utf8_free(g->tabtitle); commitdiff http://git.netsurf-browser.org/netsurf.git/commitdiff/0c54f2a90260127f7a9... commit 0c54f2a90260127f7a96b798afc08c691ddebadf Author: Chris Young <chris(a)unsatisfactorysoftware.co.uk&gt; Commit: Chris Young <chris(a)unsatisfactorysoftware.co.uk&gt; Prevent multiple tabbars diff --git a/amiga/gui.c b/amiga/gui.c index bace205..06d8356 100755 --- a/amiga/gui.c +++ b/amiga/gui.c @@ -2751,7 +2751,7 @@ struct gui_window *gui_create_browser_window(struct browser_window *bw, g->shared = clone->window->shared; g->tab = g->shared->next_tab; - if(g->shared->tabs == 1) + if((g->shared->tabs == 1) && (nsoption_bool(tab_always_show) == false)) ami_toggletabbar(g->shared, true); SetGadgetAttrs((struct Gadget *)g->shared->objects[GID_TABS], commitdiff http://git.netsurf-browser.org/netsurf.git/commitdiff/24e1aff974499e7e2cb... commit 24e1aff974499e7e2cb0996a946a6a2d34fd851d Author: Chris Young <chris(a)unsatisfactorysoftware.co.uk&gt; Commit: Chris Young <chris(a)unsatisfactorysoftware.co.uk&gt; Reverse the logic as well as the req text diff --git a/amiga/download.c b/amiga/download.c index 4243e6d..c0c88bb 100644 --- a/amiga/download.c +++ b/amiga/download.c @@ -421,6 +421,6 @@ BOOL ami_download_check_overwrite(const char *file, struct Window *win, ULONG si } else return TRUE; - if(res == 0) return TRUE; + if(res == 1) return TRUE; else return FALSE; } diff --git a/amiga/gui.c b/amiga/gui.c index e2728c2..bace205 100755 --- a/amiga/gui.c +++ b/amiga/gui.c @@ -3352,7 +3352,7 @@ void ami_close_all_tabs(struct gui_window_2 *gwin) int32 res = ami_warn_user_multi(req_body, "Yes", "No", gwin->win); free(req_body); - if(res == 1) return; + if(res == 0) return; } if(gwin->tabs) commitdiff http://git.netsurf-browser.org/netsurf.git/commitdiff/388ddc6dbd11e287405... commit 388ddc6dbd11e28740538a4d39d04f086e16c0c0 Author: Chris Young <chris(a)unsatisfactorysoftware.co.uk&gt; Commit: Chris Young <chris(a)unsatisfactorysoftware.co.uk&gt; non-working "always show tabbar" option diff --git a/amiga/gui.c b/amiga/gui.c index c30489e..e2728c2 100755 --- a/amiga/gui.c +++ b/amiga/gui.c @@ -2318,7 +2318,7 @@ void ami_quit_netsurf_delayed(void) DisplayBeep(NULL); - int32 res = TimedDosRequesterTags(TDR_ImageType, TDRIMAGE_INFO, + res = TimedDosRequesterTags(TDR_ImageType, TDRIMAGE_INFO, TDR_TitleString, messages_get("NetSurf"), TDR_FormatString, utf8text, TDR_GadgetString, utf8gadgets, @@ -2697,8 +2697,10 @@ void ami_toggletabbar(struct gui_window_2 *gwin, bool show) RethinkLayout((struct Gadget *)gwin->objects[GID_MAIN], gwin->win, NULL, TRUE); - gwin->redraw_required = true; - gwin->bw->reformat_pending = true; + if(gwin->bw) { + gwin->redraw_required = true; + gwin->bw->reformat_pending = true; + } } struct gui_window *gui_create_browser_window(struct browser_window *bw, @@ -3264,6 +3266,7 @@ struct gui_window *gui_create_browser_window(struct browser_window *bw, g->shared->win, NULL); ami_gui_hotlist_toolbar_add(g->shared); /* is this the right place for this? */ + if(nsoption_bool(tab_always_show)) ami_toggletabbar(g->shared, true); } else { @@ -3425,7 +3428,7 @@ void gui_window_destroy(struct gui_window *g) g->shared->tabs--; ami_switch_tab(g->shared,true); - if(g->shared->tabs == 1) + if((g->shared->tabs == 1) && (nsoption_bool(tab_always_show))) ami_toggletabbar(g->shared, false); ami_utf8_free(g->tabtitle); diff --git a/amiga/options.h b/amiga/options.h index 4b477b6..dc0274d 100644 --- a/amiga/options.h +++ b/amiga/options.h @@ -40,6 +40,7 @@ bool new_tab_active; \ bool new_tab_last; \ bool tab_close_warn; \ + bool tab_always_show; \ bool kiosk_mode; \ char *search_engines_file; \ char *arexx_dir; \ @@ -104,6 +105,7 @@ .new_tab_active = false, \ .new_tab_last = false, \ .tab_close_warn = true, \ + .tab_always_show = false, \ .kiosk_mode = false, \ .search_engines_file = NULL, \ .arexx_dir = NULL, \ @@ -167,6 +169,7 @@ { "new_tab_is_active", OPTION_BOOL, &nsoptions.new_tab_active}, \ { "new_tab_last", OPTION_BOOL, &nsoptions.new_tab_last}, \ { "tab_close_warn", OPTION_BOOL, &nsoptions.tab_close_warn}, \ +{ "tab_always_show", OPTION_BOOL, &nsoptions.tab_always_show}, \ { "kiosk_mode", OPTION_BOOL, &nsoptions.kiosk_mode}, \ { "search_engines_file",OPTION_STRING, &nsoptions.search_engines_file }, \ { "arexx_dir", OPTION_STRING, &nsoptions.arexx_dir }, \ ----------------------------------------------------------------------- Summary of changes: amiga/download.c | 2 +- amiga/gui.c | 15 +++++++++------ amiga/options.h | 3 +++ 3 files changed, 13 insertions(+), 7 deletions(-) diff --git a/amiga/download.c b/amiga/download.c index 4243e6d..c0c88bb 100644 --- a/amiga/download.c +++ b/amiga/download.c @@ -421,6 +421,6 @@ BOOL ami_download_check_overwrite(const char *file, struct Window *win, ULONG si } else return TRUE; - if(res == 0) return TRUE; + if(res == 1) return TRUE; else return FALSE; } diff --git a/amiga/gui.c b/amiga/gui.c index c30489e..60d9d31 100755 --- a/amiga/gui.c +++ b/amiga/gui.c @@ -2318,7 +2318,7 @@ void ami_quit_netsurf_delayed(void) DisplayBeep(NULL); - int32 res = TimedDosRequesterTags(TDR_ImageType, TDRIMAGE_INFO, + res = TimedDosRequesterTags(TDR_ImageType, TDRIMAGE_INFO, TDR_TitleString, messages_get("NetSurf"), TDR_FormatString, utf8text, TDR_GadgetString, utf8gadgets, @@ -2697,8 +2697,10 @@ void ami_toggletabbar(struct gui_window_2 *gwin, bool show) RethinkLayout((struct Gadget *)gwin->objects[GID_MAIN], gwin->win, NULL, TRUE); - gwin->redraw_required = true; - gwin->bw->reformat_pending = true; + if(gwin->bw) { + gwin->redraw_required = true; + gwin->bw->reformat_pending = true; + } } struct gui_window *gui_create_browser_window(struct browser_window *bw, @@ -2749,7 +2751,7 @@ struct gui_window *gui_create_browser_window(struct browser_window *bw, g->shared = clone->window->shared; g->tab = g->shared->next_tab; - if(g->shared->tabs == 1) + if((g->shared->tabs == 1) && (nsoption_bool(tab_always_show) == false)) ami_toggletabbar(g->shared, true); SetGadgetAttrs((struct Gadget *)g->shared->objects[GID_TABS], @@ -3264,6 +3266,7 @@ struct gui_window *gui_create_browser_window(struct browser_window *bw, g->shared->win, NULL); ami_gui_hotlist_toolbar_add(g->shared); /* is this the right place for this? */ + if(nsoption_bool(tab_always_show)) ami_toggletabbar(g->shared, true); } else { @@ -3349,7 +3352,7 @@ void ami_close_all_tabs(struct gui_window_2 *gwin) int32 res = ami_warn_user_multi(req_body, "Yes", "No", gwin->win); free(req_body); - if(res == 1) return; + if(res == 0) return; } if(gwin->tabs) @@ -3425,7 +3428,7 @@ void gui_window_destroy(struct gui_window *g) g->shared->tabs--; ami_switch_tab(g->shared,true); - if(g->shared->tabs == 1) + if((g->shared->tabs == 1) && (nsoption_bool(tab_always_show) == false)) ami_toggletabbar(g->shared, false); ami_utf8_free(g->tabtitle); diff --git a/amiga/options.h b/amiga/options.h index 4b477b6..dc0274d 100644 --- a/amiga/options.h +++ b/amiga/options.h @@ -40,6 +40,7 @@ bool new_tab_active; \ bool new_tab_last; \ bool tab_close_warn; \ + bool tab_always_show; \ bool kiosk_mode; \ char *search_engines_file; \ char *arexx_dir; \ @@ -104,6 +105,7 @@ .new_tab_active = false, \ .new_tab_last = false, \ .tab_close_warn = true, \ + .tab_always_show = false, \ .kiosk_mode = false, \ .search_engines_file = NULL, \ .arexx_dir = NULL, \ @@ -167,6 +169,7 @@ { "new_tab_is_active", OPTION_BOOL, &nsoptions.new_tab_active}, \ { "new_tab_last", OPTION_BOOL, &nsoptions.new_tab_last}, \ { "tab_close_warn", OPTION_BOOL, &nsoptions.tab_close_warn}, \ +{ "tab_always_show", OPTION_BOOL, &nsoptions.tab_always_show}, \ { "kiosk_mode", OPTION_BOOL, &nsoptions.kiosk_mode}, \ { "search_engines_file",OPTION_STRING, &nsoptions.search_engines_file }, \ { "arexx_dir", OPTION_STRING, &nsoptions.arexx_dir }, \ -- NetSurf Browser