1
0
mirror of https://github.com/gnosygnu/xowa.git synced 2026-03-02 03:49:30 +00:00

fix_cli_for_fsdb_make_v1

This commit is contained in:
gnosygnu
2020-09-07 22:35:02 -04:00
parent 4ea81258a1
commit 52523ced53
214 changed files with 1542 additions and 1349 deletions

View File

@@ -29,7 +29,7 @@
<option value='xowa.app.security' >App - Security</option>
<option value='xowa.app.startup' >App - Startup</option>
<option value='xowa.app.startup' selected='selected'>App - Startup</option>
<option value='xowa.app.dbs' >App - Databases</option>
@@ -47,7 +47,7 @@
<option value='xowa.gui.nightmode' >Gui - Nightmode</option>
<option value='xowa.wiki.hdumps' selected='selected'>Wiki - HTML Databases</option>
<option value='xowa.wiki.hdumps' >Wiki - HTML Databases</option>
<option value='xowa.wiki.edit' >Wiki - Editing</option>
@@ -91,6 +91,8 @@
<option value='xowa.dev.general' >Dev - General</option>
<option value='xowa.app.settings' >App - Settings</option>
</select>
<!-- LINK:cfg_link -->
@@ -108,129 +110,54 @@
<p id='page_help_para'></p>
</div>
<h2>General</h2>
<h2>Window</h2>
<div class="xocfg_row flex_div">
<!-- BTN:help_item -->
<div class='xocfg_itm_help'>
<span class='xoimg_btn_x16 xoimg_help_tip' href='javascript:void(0)' onclick='return xo.help.toggle("xowa.wiki.hdumps.read_preferred")' title='view more info'>&nbsp;</span>
<span class='xoimg_btn_x16 xoimg_help_tip' href='javascript:void(0)' onclick='return xo.help.toggle("xowa.app.startup.window.mode")' title='view more info'>&nbsp;</span>
</div>
<!-- TEXT:key -->
<div id='xowa.wiki.hdumps.read_preferred__name' class='xocfg_itm_name'>Prefer HTML Databases for Read tab</div>
<div id='xowa.app.startup.window.mode__name' class='xocfg_itm_name'>Window Mode</div>
<!-- BTN:undo -->
<div id='xowa.wiki.hdumps.read_preferred__undo' data-xocfg-type='bool' class='xocfg_itm_delete xocfg_itm_hide'>
<span class='xoimg_btn_x16 xoimg_list_undo' onclick='return xo.cfg_edit.delete__send("xowa.wiki.hdumps.read_preferred")' title="reset to &quot;y&quot;">&nbsp;</span>
<div id='xowa.app.startup.window.mode__undo' data-xocfg-type='list:xowa.app.startup.window.mode' class='xocfg_itm_delete xocfg_itm_hide'>
<span class='xoimg_btn_x16 xoimg_list_undo' onclick='return xo.cfg_edit.delete__send("xowa.app.startup.window.mode")' title="reset to &quot;previous&quot;">&nbsp;</span>
</div>
<!-- TEXT:val -->
<div class='xocfg_itm_data'>
<input id="xowa.wiki.hdumps.read_preferred" data-xocfg-key="xowa.wiki.hdumps.read_preferred" data-xocfg-type="bool" accesskey="d" class="xocfg_data__bool" type="checkbox" checked="checked"></input></div>
<!-- HIDDEN:key,ctx -->
<input type='hidden' id='xowa.wiki.hdumps.read_preferred__key_box' value='xowa.wiki.hdumps.read_preferred'></input>
<input type='hidden' id='xowa.wiki.hdumps.read_preferred__ctx_box' value='app'></input>
</div>
<!-- DIV:help -->
<div id='xowa.wiki.hdumps.read_preferred_help_div' class='xohelp_div'>
<div id='xowa.wiki.hdumps.read_preferred_help_msg' class='xohelp_msg'><p>Choose one of the following:
</p>
<ul>
<li> <b>checked</b>: Read tab uses HTML databases. Note that this will be faster, but there may be some inaccuracies. (These inaccuracies are being worked on)
</li>
<li> <b>unchecked</b>: Read tab uses Wikitext. Note that this will be slower, but more accurate.
</li>
</ul>
</div>
</div>
<div class="xocfg_row flex_div">
<!-- BTN:help_item -->
<div class='xocfg_itm_help'>
<span class='xoimg_btn_x16 xoimg_help_tip' href='javascript:void(0)' onclick='return xo.help.toggle("xowa.wiki.hdumps.html_mode")' title='view more info'>&nbsp;</span>
</div>
<!-- TEXT:key -->
<div id='xowa.wiki.hdumps.html_mode__name' class='xocfg_itm_name'>HTML tab mode</div>
<!-- BTN:undo -->
<div id='xowa.wiki.hdumps.html_mode__undo' data-xocfg-type='list:xowa.wiki.hdumps.html_mode' class='xocfg_itm_delete xocfg_itm_hide'>
<span class='xoimg_btn_x16 xoimg_list_undo' onclick='return xo.cfg_edit.delete__send("xowa.wiki.hdumps.html_mode")' title="reset to &quot;shown&quot;">&nbsp;</span>
</div>
<!-- TEXT:val -->
<div class='xocfg_itm_data'>
<select id="xowa.wiki.hdumps.html_mode" data-xocfg-key="xowa.wiki.hdumps.html_mode" data-xocfg-type="list:xowa.wiki.hdumps.html_mode" accesskey="d" class="xocfg_data__list" size="4">
<option value="shown" selected="selected">Shown</option>
<option value="swt_browser">SWT Browser</option>
<option value="hdump_save">Saved for HTML DB</option>
<option value="hdump_load">Loaded by HTML DB</option>
<select id="xowa.app.startup.window.mode" data-xocfg-key="xowa.app.startup.window.mode" data-xocfg-type="list:xowa.app.startup.window.mode" accesskey="d" class="xocfg_data__list" size="5">
<option value="previous" selected="selected">previous</option>
<option value="maximized">maximized</option>
<option value="absolute">absolute</option>
<option value="relative">relative</option>
<option value="default">default</option>
</select>
</div>
<!-- HIDDEN:key,ctx -->
<input type='hidden' id='xowa.wiki.hdumps.html_mode__key_box' value='xowa.wiki.hdumps.html_mode'></input>
<input type='hidden' id='xowa.wiki.hdumps.html_mode__ctx_box' value='app'></input>
<input type='hidden' id='xowa.app.startup.window.mode__key_box' value='xowa.app.startup.window.mode'></input>
<input type='hidden' id='xowa.app.startup.window.mode__ctx_box' value='app'></input>
</div>
<!-- DIV:help -->
<div id='xowa.wiki.hdumps.html_mode_help_div' class='xohelp_div'>
<div id='xowa.wiki.hdumps.html_mode_help_msg' class='xohelp_msg'><p>Choose one of the following to show in HTML tab:
<div id='xowa.app.startup.window.mode_help_div' class='xohelp_div'>
<div id='xowa.app.startup.window.mode_help_msg' class='xohelp_msg'><p>Choose one of the following:
</p>
<ul>
<li> <b>Shown</b>: HTML as generated by XOWA
<li> <b>previous</b>: window starts at same rect as previous session (default)
</li>
<li> <b>SWT browser</b>: HTML as currently shown in SWT browser (useful for Special pages and javascript calls)
<li> <b>maximized</b>: window always starts maximized
</li>
<li> <b>Saved for HTML DB</b>: HTML as saved in the HTML database. Note that this is for developer purposes only.
<li> <b>absolute</b>: window bounds are set to rect below
</li>
<li> <b>Loaded for HTML DB</b>: HTML as saved in the HTML database but post-processed with image urls. Note that this is for developer purposes only.
<li> <b>relative</b>: window starts at full screen, and then adjusted by rect below
</li>
</ul>
</div>
</div>
<h2>Indicators</h2>
<div class="xocfg_row flex_div">
<!-- BTN:help_item -->
<div class='xocfg_itm_help'>
<span class='xoimg_btn_x16 xoimg_help_tip' href='javascript:void(0)' onclick='return xo.help.toggle("xowa.wiki.hdumps.indicators.enabled")' title='view more info'>&nbsp;</span>
</div>
<!-- TEXT:key -->
<div id='xowa.wiki.hdumps.indicators.enabled__name' class='xocfg_itm_name'>Enabled</div>
<!-- BTN:undo -->
<div id='xowa.wiki.hdumps.indicators.enabled__undo' data-xocfg-type='bool' class='xocfg_itm_delete'>
<span class='xoimg_btn_x16 xoimg_list_undo' onclick='return xo.cfg_edit.delete__send("xowa.wiki.hdumps.indicators.enabled")' title="reset to &quot;n&quot;">&nbsp;</span>
</div>
<!-- TEXT:val -->
<div class='xocfg_itm_data'>
<input id="xowa.wiki.hdumps.indicators.enabled" data-xocfg-key="xowa.wiki.hdumps.indicators.enabled" data-xocfg-type="bool" accesskey="d" class="xocfg_data__bool" type="checkbox" checked="checked"></input></div>
<!-- HIDDEN:key,ctx -->
<input type='hidden' id='xowa.wiki.hdumps.indicators.enabled__key_box' value='xowa.wiki.hdumps.indicators.enabled'></input>
<input type='hidden' id='xowa.wiki.hdumps.indicators.enabled__ctx_box' value='app'></input>
</div>
<!-- DIV:help -->
<div id='xowa.wiki.hdumps.indicators.enabled_help_div' class='xohelp_div'>
<div id='xowa.wiki.hdumps.indicators.enabled_help_msg' class='xohelp_msg'><p>Choose one of the following.
</p>
<ul>
<li> <b>checked</b> : Shows indicator in top-right corner if page is coming from wikitext or HTML databases
</li>
<li> <b>unchecked</b> : Shows nothing
<li> <b>default</b>: window starts at default rect (determined by operating system)
</li>
</ul>
</div>
@@ -239,60 +166,222 @@
<div class="xocfg_row flex_div">
<!-- BTN:help_item -->
<div class='xocfg_itm_help'>
<span class='xoimg_btn_x16 xoimg_help_tip' href='javascript:void(0)' onclick='return xo.help.toggle("xowa.wiki.hdumps.indicators.html_if_wtxt")' title='view more info'>&nbsp;</span>
<span class='xoimg_btn_x16 xoimg_help_tip' href='javascript:void(0)' onclick='return xo.help.toggle("xowa.app.startup.window.manual_rect")' title='view more info'>&nbsp;</span>
</div>
<!-- TEXT:key -->
<div id='xowa.wiki.hdumps.indicators.html_if_wtxt__name' class='xocfg_itm_name'>HTML when Wikitext DB</div>
<div id='xowa.app.startup.window.manual_rect__name' class='xocfg_itm_name'>Window Size</div>
<!-- BTN:undo -->
<div id='xowa.wiki.hdumps.indicators.html_if_wtxt__undo' data-xocfg-type='string' class='xocfg_itm_delete'>
<span class='xoimg_btn_x16 xoimg_list_undo' onclick='return xo.cfg_edit.delete__send("xowa.wiki.hdumps.indicators.html_if_wtxt")' title="reset to &quot;<ul><li>WIKITEXT</li></ul>&quot;">&nbsp;</span>
<div id='xowa.app.startup.window.manual_rect__undo' data-xocfg-type='string' class='xocfg_itm_delete xocfg_itm_hide'>
<span class='xoimg_btn_x16 xoimg_list_undo' onclick='return xo.cfg_edit.delete__send("xowa.app.startup.window.manual_rect")' title="reset to &quot;0,0,800,640&quot;">&nbsp;</span>
</div>
<!-- TEXT:val -->
<div class='xocfg_itm_data'>
<input id="xowa.wiki.hdumps.indicators.html_if_wtxt" data-xocfg-key="xowa.wiki.hdumps.indicators.html_if_wtxt" data-xocfg-type="string" accesskey="d" class="xocfg_data__str" type="text" value=""></input></div>
<input id="xowa.app.startup.window.manual_rect" data-xocfg-key="xowa.app.startup.window.manual_rect" data-xocfg-type="string" accesskey="d" class="xocfg_data__str" type="text" value="0,0,800,640"></input></div>
<!-- HIDDEN:key,ctx -->
<input type='hidden' id='xowa.wiki.hdumps.indicators.html_if_wtxt__key_box' value='xowa.wiki.hdumps.indicators.html_if_wtxt'></input>
<input type='hidden' id='xowa.wiki.hdumps.indicators.html_if_wtxt__ctx_box' value='app'></input>
<input type='hidden' id='xowa.app.startup.window.manual_rect__key_box' value='xowa.app.startup.window.manual_rect'></input>
<input type='hidden' id='xowa.app.startup.window.manual_rect__ctx_box' value='app'></input>
</div>
<!-- DIV:help -->
<div id='xowa.wiki.hdumps.indicators.html_if_wtxt_help_div' class='xohelp_div'>
<div id='xowa.wiki.hdumps.indicators.html_if_wtxt_help_msg' class='xohelp_msg'><p>HTML to show for Wikitext databases
<div id='xowa.app.startup.window.manual_rect_help_div' class='xohelp_div'>
<div id='xowa.app.startup.window.manual_rect_help_msg' class='xohelp_msg'><p>Enter 'x,y,w,h' numbers separated by commas. Note that this setting is used in conjunction with 'Window Mode'
</p>
<ul>
<li> <b>absolute</b>: absolute rect of window; EX: 0,0,1280,1024 means x=0 y=0 w=1280 h=1024
</li>
<li> <b>relative</b>: relative adjustment to full screen size; EX: 20,20,-20,-20 on an 1280,1024 screen will yield a rect of x=20 y=20 w=1260 h=1004
</li>
<li> <b>previous</b>, <b>maximized</b>, <b>default</b>: does nothing
</li>
</ul>
</div>
</div>
<div class="xocfg_row flex_div">
<!-- BTN:help_item -->
<div class='xocfg_itm_help'>
<span class='xoimg_btn_x16 xoimg_help_tip' href='javascript:void(0)' onclick='return xo.help.toggle("xowa.wiki.hdumps.indicators.html_if_html")' title='view more info'>&nbsp;</span>
<span class='xoimg_btn_x16 xoimg_help_tip' href='javascript:void(0)' onclick='return xo.help.toggle("xowa.app.startup.window.manual_safe")' title='view more info'>&nbsp;</span>
</div>
<!-- TEXT:key -->
<div id='xowa.wiki.hdumps.indicators.html_if_html__name' class='xocfg_itm_name'>HTML when HTML DB</div>
<div id='xowa.app.startup.window.manual_safe__name' class='xocfg_itm_name'>Safe Mode</div>
<!-- BTN:undo -->
<div id='xowa.wiki.hdumps.indicators.html_if_html__undo' data-xocfg-type='string' class='xocfg_itm_delete'>
<span class='xoimg_btn_x16 xoimg_list_undo' onclick='return xo.cfg_edit.delete__send("xowa.wiki.hdumps.indicators.html_if_html")' title="reset to &quot;<ul><li>HTML</li></ul>&quot;">&nbsp;</span>
<div id='xowa.app.startup.window.manual_safe__undo' data-xocfg-type='bool' class='xocfg_itm_delete xocfg_itm_hide'>
<span class='xoimg_btn_x16 xoimg_list_undo' onclick='return xo.cfg_edit.delete__send("xowa.app.startup.window.manual_safe")' title="reset to &quot;y&quot;">&nbsp;</span>
</div>
<!-- TEXT:val -->
<div class='xocfg_itm_data'>
<input id="xowa.wiki.hdumps.indicators.html_if_html" data-xocfg-key="xowa.wiki.hdumps.indicators.html_if_html" data-xocfg-type="string" accesskey="d" class="xocfg_data__str" type="text" value="<ul><li style=&quot;color:red&quot;>HTML</li></ul>"></input></div>
<input id="xowa.app.startup.window.manual_safe" data-xocfg-key="xowa.app.startup.window.manual_safe" data-xocfg-type="bool" accesskey="d" class="xocfg_data__bool" type="checkbox" checked="checked"></input></div>
<!-- HIDDEN:key,ctx -->
<input type='hidden' id='xowa.wiki.hdumps.indicators.html_if_html__key_box' value='xowa.wiki.hdumps.indicators.html_if_html'></input>
<input type='hidden' id='xowa.wiki.hdumps.indicators.html_if_html__ctx_box' value='app'></input>
<input type='hidden' id='xowa.app.startup.window.manual_safe__key_box' value='xowa.app.startup.window.manual_safe'></input>
<input type='hidden' id='xowa.app.startup.window.manual_safe__ctx_box' value='app'></input>
</div>
<!-- DIV:help -->
<div id='xowa.wiki.hdumps.indicators.html_if_html_help_div' class='xohelp_div'>
<div id='xowa.wiki.hdumps.indicators.html_if_html_help_msg' class='xohelp_msg'><p>HTML to show for HTML databases
<div id='xowa.app.startup.window.manual_safe_help_div' class='xohelp_div'>
<div id='xowa.app.startup.window.manual_safe_help_msg' class='xohelp_msg'><p>Choose one of the following:
</p>
<ul>
<li> <b>checked</b>: prevents window that would be located off screen; EX: x=-9999 or y=9999
</li>
<li> <b>unchecked</b>: allows off-screen rect.<br/>
</li>
</ul>
<p>NOTE: if you create an unviewable rect you will need to edit the options file
</p>
</div>
</div>
<h2>Tabs</h2>
<div class="xocfg_row flex_div">
<!-- BTN:help_item -->
<div class='xocfg_itm_help'>
<span class='xoimg_btn_x16 xoimg_help_tip' href='javascript:void(0)' onclick='return xo.help.toggle("xowa.app.startup.tabs.type")' title='view more info'>&nbsp;</span>
</div>
<!-- TEXT:key -->
<div id='xowa.app.startup.tabs.type__name' class='xocfg_itm_name'>Startup type</div>
<!-- BTN:undo -->
<div id='xowa.app.startup.tabs.type__undo' data-xocfg-type='list:xowa.app.startup.pages.type' class='xocfg_itm_delete xocfg_itm_hide'>
<span class='xoimg_btn_x16 xoimg_list_undo' onclick='return xo.cfg_edit.delete__send("xowa.app.startup.tabs.type")' title="reset to &quot;previous&quot;">&nbsp;</span>
</div>
<!-- TEXT:val -->
<div class='xocfg_itm_data'>
<select id="xowa.app.startup.tabs.type" data-xocfg-key="xowa.app.startup.tabs.type" data-xocfg-type="list:xowa.app.startup.pages.type" accesskey="d" class="xocfg_data__list" size="4">
<option value="blank">blank</option>
<option value="xowa">xowa</option>
<option value="previous" selected="selected">previous</option>
<option value="custom">custom</option>
</select>
</div>
<!-- HIDDEN:key,ctx -->
<input type='hidden' id='xowa.app.startup.tabs.type__key_box' value='xowa.app.startup.tabs.type'></input>
<input type='hidden' id='xowa.app.startup.tabs.type__ctx_box' value='app'></input>
</div>
<!-- DIV:help -->
<div id='xowa.app.startup.tabs.type_help_div' class='xohelp_div'>
<div id='xowa.app.startup.tabs.type_help_msg' class='xohelp_msg'><p>Choose a startup page from one of the following:
</p>
<ul>
<li> <b>blank</b>: one tab loads and it is set to blank (Special:XowaDefaultTab)
</li>
<li> <b>xowa</b> : one tab loads and it is set to the XOWA home page (home/wiki/Main_Page)
</li>
<li> <b>previous</b>: all opened pages from the previous session loads. For example, if &quot;en.w:Earth&quot; and &quot;en.w:Moon&quot; were open when XOWA was last closed, these tabs will be reopened
</li>
<li> <b>custom</b>: all pages specified in the custom box will load
</li>
</ul>
</div>
</div>
<div class="xocfg_row flex_div">
<!-- BTN:help_item -->
<div class='xocfg_itm_help'>
<span class='xoimg_btn_x16 xoimg_help_tip' href='javascript:void(0)' onclick='return xo.help.toggle("xowa.app.startup.tabs.custom")' title='view more info'>&nbsp;</span>
</div>
<!-- TEXT:key -->
<div id='xowa.app.startup.tabs.custom__name' class='xocfg_itm_name'>Custom pages</div>
<!-- BTN:undo -->
<div id='xowa.app.startup.tabs.custom__undo' data-xocfg-type='memo' class='xocfg_itm_delete xocfg_itm_hide'>
<span class='xoimg_btn_x16 xoimg_list_undo' onclick='return xo.cfg_edit.delete__send("xowa.app.startup.tabs.custom")' title="reset to &quot;&quot;">&nbsp;</span>
</div>
<!-- TEXT:val -->
<div class='xocfg_itm_data'>
<textarea id="xowa.app.startup.tabs.custom" data-xocfg-key="xowa.app.startup.tabs.custom" data-xocfg-type="memo" accesskey="d" class="xocfg_data__memo" rows="4"></textarea></div>
<!-- HIDDEN:key,ctx -->
<input type='hidden' id='xowa.app.startup.tabs.custom__key_box' value='xowa.app.startup.tabs.custom'></input>
<input type='hidden' id='xowa.app.startup.tabs.custom__ctx_box' value='app'></input>
</div>
<!-- DIV:help -->
<div id='xowa.app.startup.tabs.custom_help_div' class='xohelp_div'>
<div id='xowa.app.startup.tabs.custom_help_msg' class='xohelp_msg'><p>Specify custom pages to show on startup:
</p>
<ul>
<li> This option only applies if <code>custom</code> is selected for type.<br/>
</li>
</ul>
<p>Also, note the following:
</p>
<ul>
<li> Aliases can be used. For example, &quot;en.w:Earth&quot; is a shortcut for &quot;en.wikipedia.org/wiki/Earth&quot;
</li>
<li> Multiple pages are separated by new lines. For example, the following will load 2 tabs:
</li>
</ul>
<pre>
en.w:Earth
en.w:Moon
</pre>
</div>
</div>
<h2>Advanced</h2>
<div class="xocfg_row flex_div">
<!-- BTN:help_item -->
<div class='xocfg_itm_help'>
<span class='xoimg_btn_x16 xoimg_help_tip' href='javascript:void(0)' onclick='return xo.help.toggle("xowa.app.startup.script")' title='view more info'>&nbsp;</span>
</div>
<!-- TEXT:key -->
<div id='xowa.app.startup.script__name' class='xocfg_itm_name'>Script</div>
<!-- BTN:undo -->
<div id='xowa.app.startup.script__undo' data-xocfg-type='memo' class='xocfg_itm_delete xocfg_itm_hide'>
<span class='xoimg_btn_x16 xoimg_list_undo' onclick='return xo.cfg_edit.delete__send("xowa.app.startup.script")' title="reset to &quot;&quot;">&nbsp;</span>
</div>
<!-- TEXT:val -->
<div class='xocfg_itm_data'>
<textarea id="xowa.app.startup.script" data-xocfg-key="xowa.app.startup.script" data-xocfg-type="memo" accesskey="d" class="xocfg_data__memo" rows="4"></textarea></div>
<!-- HIDDEN:key,ctx -->
<input type='hidden' id='xowa.app.startup.script__key_box' value='xowa.app.startup.script'></input>
<input type='hidden' id='xowa.app.startup.script__ctx_box' value='app'></input>
</div>
<!-- DIV:help -->
<div id='xowa.app.startup.script_help_div' class='xohelp_div'>
<div id='xowa.app.startup.script_help_msg' class='xohelp_msg'><p>Enter custom configuration.
</p>
<ul>
<li> These scripts will run after the application starts up. They will also run whenever you click Save on this page.
</li>
<li> These scripts are intended for advanced users. They are in the format of .gfs statements (for examples, see /xowa/xowa.gfs). Please do not enter scripts unless instructed, or else XOWA may fail to start up.
</li>
<li> These scripts are saved to /xowa/user/anonymous/data/cfg/user_custom_cfg.gfs. If XOWA fails to start up, simply delete the file.
</li>
</ul>
</div>
</div>