From af8c3ef0c359a4c86531755659af7688e8b3f08e Mon Sep 17 00:00:00 2001 From: Chris Young Date: Sun, 9 Dec 2012 20:29:01 +0000 Subject: Add options for always showing tabbar and warning on closing multiple tabs --- amiga/gui_options.c | 30 ++++++++++++++++++++++++++++++ resources/FatMessages | 51 +++++++++++++++++++++++++++++++++++---------------- 2 files changed, 65 insertions(+), 16 deletions(-) diff --git a/amiga/gui_options.c b/amiga/gui_options.c index 613ffff8e..d4c119844 100755 --- a/amiga/gui_options.c +++ b/amiga/gui_options.c @@ -117,6 +117,8 @@ enum GID_OPTS_TAB_ACTIVE, GID_OPTS_TAB_2, GID_OPTS_TAB_LAST, + GID_OPTS_TAB_ALWAYS, + GID_OPTS_TAB_CLOSE, GID_OPTS_SEARCH_PROV, GID_OPTS_CLIPBOARD, GID_OPTS_CONTEXTMENU, @@ -286,6 +288,8 @@ void ami_gui_opts_setup(void) gadlab[GID_OPTS_TAB_ACTIVE] = (char *)ami_utf8_easy((char *)messages_get("TabActive")); gadlab[GID_OPTS_TAB_2] = (char *)ami_utf8_easy((char *)messages_get("TabMiddle")); gadlab[GID_OPTS_TAB_LAST] = (char *)ami_utf8_easy((char *)messages_get("TabLast")); + gadlab[GID_OPTS_TAB_ALWAYS] = (char *)ami_utf8_easy((char *)messages_get("TabAlways")); + gadlab[GID_OPTS_TAB_CLOSE] = (char *)ami_utf8_easy((char *)messages_get("TabClose")); gadlab[GID_OPTS_SEARCH_PROV] = (char *)ami_utf8_easy((char *)messages_get("SearchProvider")); gadlab[GID_OPTS_CLIPBOARD] = (char *)ami_utf8_easy((char *)messages_get("ClipboardUTF8")); gadlab[GID_OPTS_CONTEXTMENU] = (char *)ami_utf8_easy((char *)messages_get("ContextMenu")); @@ -1116,6 +1120,18 @@ void ami_gui_opts_open(void) GA_RelVerify, TRUE, GA_Text, gadlab[GID_OPTS_TAB_2], GA_Selected, nsoption_bool(button_2_tab), + CheckBoxEnd, + LAYOUT_AddChild, gow->objects[GID_OPTS_TAB_ALWAYS] = CheckBoxObject, + GA_ID, GID_OPTS_TAB_ALWAYS, + GA_RelVerify, TRUE, + GA_Text, gadlab[GID_OPTS_TAB_ALWAYS], + GA_Selected, nsoption_bool(tab_always_show), + CheckBoxEnd, + LAYOUT_AddChild, gow->objects[GID_OPTS_TAB_CLOSE] = CheckBoxObject, + GA_ID, GID_OPTS_TAB_CLOSE, + GA_RelVerify, TRUE, + GA_Text, gadlab[GID_OPTS_TAB_CLOSE], + GA_Selected, nsoption_bool(tab_close_warn), CheckBoxEnd, LayoutEnd, // tabbed browsing LayoutEnd, @@ -1665,6 +1681,20 @@ void ami_gui_opts_use(bool save) nsoption_set_bool(button_2_tab, false); } + GetAttr(GA_Selected,gow->objects[GID_OPTS_TAB_CLOSE],(ULONG *)&data); + if (data) { + nsoption_set_bool(tab_close_warn, true); + } else { + nsoption_set_bool(tab_close_warn, false); + } + + GetAttr(GA_Selected,gow->objects[GID_OPTS_TAB_ALWAYS],(ULONG *)&data); + if (data) { + nsoption_set_bool(tab_always_show, true); + } else { + nsoption_set_bool(tab_always_show, false); + } + GetAttr(CHOOSER_Selected,gow->objects[GID_OPTS_SEARCH_PROV],(ULONG *)&nsoption_int(search_provider)); search_web_provider_details(nsoption_int(search_provider)); search_web_retrieve_ico(false); diff --git a/resources/FatMessages b/resources/FatMessages index 6f7bf0dc3..c391a4191 100644 --- a/resources/FatMessages +++ b/resources/FatMessages @@ -5512,24 +5512,14 @@ fr.all.Duration:Duration it.all.Duration:Durata nl.all.Duration:Duration -# Advanced +# Tabs # -en.all.Downloads:Downloads -de.all.Downloads:Downloads -fr.all.Downloads:Downloads -it.all.Downloads:Trasferimenti -nl.all.Downloads:Downloads -en.all.ConfirmOverwrite:Request confirmation when overwriting -de.all.ConfirmOverwrite:vor Überschreiben nachfragen -fr.all.ConfirmOverwrite:Request confirmation when overwriting -it.all.ConfirmOverwrite:Richiedi conferma prima di sovrascrivere -nl.all.ConfirmOverwrite:Request confirmation when overwriting -en.all.DownloadDir:Initial download location -de.all.DownloadDir:Downloadverzeichnis -fr.all.DownloadDir:Initial download location -it.all.DownloadDir:Percorso predefinito -nl.all.DownloadDir:Initial download location +en.ami.Tabs:Tabs +de.ami.Tabs:Tabs +fr.ami.Tabs:Tabs +it.ami.Tabs:Tabs +nl.ami.Tabs:Tabs en.all.TabbedBrowsing:Tabbed browsing de.all.TabbedBrowsing:Registernavigation (Tabs) fr.all.TabbedBrowsing:Tabbed browsing @@ -5550,6 +5540,35 @@ de.all.TabLast:Open new tabs after all existing tabs fr.all.TabLast:Open new tabs after all existing tabs it.all.TabLast:Apri le nuove schede dopo quella corrente nl.all.TabLast:Open new tabs after all existing tabs +en.ami.TabClose:Warn when closing multiple tabs +de.ami.TabClose:Warn when closing multiple tabs +fr.ami.TabClose:Warn when closing multiple tabs +it.ami.TabClose:Warn when closing multiple tabs +nl.ami.TabClose:Warn when closing multiple tabs +en.ami.TabAlways:Always show tabs +de.ami.TabAlways:Always show tabs +fr.ami.TabAlways:Always show tabs +it.ami.TabAlways:Always show tabs +nl.ami.TabAlways:Always show tabs + +# Advanced +# + +en.all.Downloads:Downloads +de.all.Downloads:Downloads +fr.all.Downloads:Downloads +it.all.Downloads:Trasferimenti +nl.all.Downloads:Downloads +en.all.ConfirmOverwrite:Request confirmation when overwriting +de.all.ConfirmOverwrite:vor Überschreiben nachfragen +fr.all.ConfirmOverwrite:Request confirmation when overwriting +it.all.ConfirmOverwrite:Richiedi conferma prima di sovrascrivere +nl.all.ConfirmOverwrite:Request confirmation when overwriting +en.all.DownloadDir:Initial download location +de.all.DownloadDir:Downloadverzeichnis +fr.all.DownloadDir:Initial download location +it.all.DownloadDir:Percorso predefinito +nl.all.DownloadDir:Initial download location en.all.DownloadNotify:Notify on completion de.all.DownloadNotify:Downloadende melden fr.all.DownloadNotify:Notify on completion -- cgit v1.2.3