From 176ac30b0e975401170854bead7cbc1a1123b6e6 Mon Sep 17 00:00:00 2001 From: gnosygnu Date: Sun, 26 Mar 2017 11:00:03 -0400 Subject: [PATCH] Full-text search: Add menu options for XowaSearch and AllPages --- .../gplx/xowa/apps/apis/xowa/navs/Xoapi_nav_wiki.java | 11 +++++------ 400_xowa/src/gplx/xowa/guis/bnds/Xog_bnd_mgr.java | 4 ++++ 400_xowa/src/gplx/xowa/guis/cmds/Xog_cmd_itm_.java | 2 ++ 3 files changed, 11 insertions(+), 6 deletions(-) diff --git a/400_xowa/src/gplx/xowa/apps/apis/xowa/navs/Xoapi_nav_wiki.java b/400_xowa/src/gplx/xowa/apps/apis/xowa/navs/Xoapi_nav_wiki.java index 65efb8b62..2a2b2b7bf 100644 --- a/400_xowa/src/gplx/xowa/apps/apis/xowa/navs/Xoapi_nav_wiki.java +++ b/400_xowa/src/gplx/xowa/apps/apis/xowa/navs/Xoapi_nav_wiki.java @@ -21,18 +21,17 @@ public class Xoapi_nav_wiki implements Gfo_invk { public void Init_by_kit(Xoae_app app) { win = app.Gui_mgr().Browser_win(); } - public void Random() {win.Page__navigate_by_url_bar("Special:Random");} - public void Sandbox() {win.Page__navigate_by_url_bar("Project:Sandbox");} public void Main_page() { win.Tab_mgr().Active_tab_assert(); // force an active tab in case all tabs are closed; needed for win.Active_page() below; DATE:2014-09-17 win.Page__navigate_by_url_bar(win.Active_tab().Wiki().Domain_str() + Xoh_href_.Str__wiki); // NOTE: add "/wiki/" to generate non-page like url; EX: "home" -> "home/wiki/" which will be interpreted as a url, as opposed to "home" which will be intrepretted as page; DATE:2014-04-14 } public Object Invk(GfsCtx ctx, int ikey, String k, GfoMsg m) { - if (ctx.Match(k, Invk_main_page)) this.Main_page(); - else if (ctx.Match(k, Invk_random)) this.Random(); - else if (ctx.Match(k, Invk_sandbox)) this.Sandbox(); + if (ctx.Match(k, "main_page")) this.Main_page(); + else if (ctx.Match(k, "random")) win.Page__navigate_by_url_bar("Special:Random"); + else if (ctx.Match(k, "sandbox")) win.Page__navigate_by_url_bar("Project:Sandbox"); + else if (ctx.Match(k, "allpages")) win.Page__navigate_by_url_bar("Special:AllPages?from=!"); // NOTE: for menu, default to ! else empty page + else if (ctx.Match(k, "search")) win.Page__navigate_by_url_bar("Special:XowaSearch"); else return Gfo_invk_.Rv_unhandled; return this; } - private static final String Invk_main_page = "main_page", Invk_random = "random", Invk_sandbox = "sandbox"; } diff --git a/400_xowa/src/gplx/xowa/guis/bnds/Xog_bnd_mgr.java b/400_xowa/src/gplx/xowa/guis/bnds/Xog_bnd_mgr.java index 06b5c22b8..95ef16770 100644 --- a/400_xowa/src/gplx/xowa/guis/bnds/Xog_bnd_mgr.java +++ b/400_xowa/src/gplx/xowa/guis/bnds/Xog_bnd_mgr.java @@ -43,6 +43,8 @@ public class Xog_bnd_mgr implements Gfo_invk { , "xowa.gui.shortcuts.xowa.nav.wiki.sandbox-1" , "xowa.gui.shortcuts.xowa.nav.wiki.sandbox-2" , "xowa.gui.shortcuts.xowa.nav.wiki.random-1" + , "xowa.gui.shortcuts.xowa.nav.wiki.allpages-1" + , "xowa.gui.shortcuts.xowa.nav.wiki.search-1" , "xowa.gui.shortcuts.xowa.nav.help.help-1" , "xowa.gui.shortcuts.xowa.nav.help.about-1" , "xowa.gui.shortcuts.xowa.nav.help.change_log-1" @@ -225,6 +227,8 @@ public class Xog_bnd_mgr implements Gfo_invk { Init_itm(Xog_cmd_itm_.Key_nav_cfg_menu , Xog_bnd_box_.Tid_browser , ""); Init_itm(Xog_cmd_itm_.Key_nav_wiki_main_page , Xog_bnd_box_.Tid_browser , ""); Init_itm(Xog_cmd_itm_.Key_nav_wiki_random , Xog_bnd_box_.Tid_browser , "mod.cs+key.r"); + Init_itm(Xog_cmd_itm_.Key_nav_wiki_allpages , Xog_bnd_box_.Tid_browser , ""); + Init_itm(Xog_cmd_itm_.Key_nav_wiki_search , Xog_bnd_box_.Tid_browser , ""); Init_itm(Xog_cmd_itm_.Key_nav_wiki_sandbox , Xog_bnd_box_.Tid_browser , "mod.cs+key.g,mod.cs+key.s", "mod.c+key.f1"); Init_itm(Xog_cmd_itm_.Key_nav_help_help , Xog_bnd_box_.Tid_browser , "key.f1"); Init_itm(Xog_cmd_itm_.Key_nav_help_change_log , Xog_bnd_box_.Tid_browser , ""); diff --git a/400_xowa/src/gplx/xowa/guis/cmds/Xog_cmd_itm_.java b/400_xowa/src/gplx/xowa/guis/cmds/Xog_cmd_itm_.java index dad50e562..000e8a7ee 100644 --- a/400_xowa/src/gplx/xowa/guis/cmds/Xog_cmd_itm_.java +++ b/400_xowa/src/gplx/xowa/guis/cmds/Xog_cmd_itm_.java @@ -28,6 +28,8 @@ public class Xog_cmd_itm_ { , Key_nav_wiki_main_page = new_dflt_(Xog_ctg_itm_.Tid_nav , "xowa.nav.wiki.main_page") , Key_nav_wiki_sandbox = new_dflt_(Xog_ctg_itm_.Tid_nav , "xowa.nav.wiki.sandbox") , Key_nav_wiki_random = new_dflt_(Xog_ctg_itm_.Tid_nav , "xowa.nav.wiki.random") + , Key_nav_wiki_allpages = new_dflt_(Xog_ctg_itm_.Tid_nav , "xowa.nav.wiki.allpages") + , Key_nav_wiki_search = new_dflt_(Xog_ctg_itm_.Tid_nav , "xowa.nav.wiki.search") , Key_nav_help_help = new_page_(Xog_ctg_itm_.Tid_nav_pages , "xowa.nav.help.help" , "home/wiki/Help/Contents") // HOME , Key_nav_help_about = new_page_(Xog_ctg_itm_.Tid_nav_pages , "xowa.nav.help.about" , "home/wiki/Help/About") // HOME