[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: lynx-dev lynx2.8.3pre.6 (patch, according to Klaus)
|
From: |
Leonid Pauzner |
|
Subject: |
Re: lynx-dev lynx2.8.3pre.6 (patch, according to Klaus) |
|
Date: |
Tue, 18 Apr 2000 13:29:28 +0400 (MSD) |
17-Apr-2000 07:18 T.E.Dickey wrote:
> I've started work on a release page. (Still have not seen a patch from Klaus)
Well, seems Klaus very busy these days, so I made a patch
to implement his forms-based options menu reorganization
(including help files), before the release come.
Everything is done according to his first draft, except:
- Editor is moved on the top of Keyboad Input section (many votes)
- Headers Transferred to Remote Servers (now capitalized properly)
More comments/suggestions/patches welcome.
* reorganize forms-based options menu: options now groupped by sections
in a more logical way (design by KW). (BTW, it is now more inlined
with htmlized-cfg cattoc.html). Help files changed accordingly.
Few gettext'ed messages were changed (to whom it may concern).
diff -u old/lynx_use.htm ./lynx_use.htm
--- old/lynx_use.htm Tue Apr 18 12:19:32 2000
+++ ./lynx_use.htm Tue Apr 18 13:05:14 2000
@@ -497,41 +497,49 @@
Save options to disk: [_]
(options marked with (!) will not be saved)
- Personal Preferences
+ General Preferences
+ User mode : [Advanced....]
Cookies (!) : [ask user..]
+ Searching type : [Case insensitive]
+
+ Keyboard Input
Editor : __________________________________________
+ Keypad mode : [Links are numbered................]
Emacs keys : [OFF]
- Keypad mode : [Numbers act as arrows.............]
- Personal mail address : __________________________________________
- Searching type : [Case insensitive]
- Show color : [ON....]
- Show cursor : [OFF]
- User mode : [Advanced....]
VI keys : [OFF]
- Visited Pages : [As Visit Tree..........]
- Display character set : [Western (ISO-8859-1)...........]
- X Display (!) : __________________________________________
+ Line edit style : [Bash-like Bindings]
+ Keyboard layout : [YAWERTY Cyrillic, for DEC LK201 kbd]
- Document Layout
+ Display and Character Sets
+ Display character set : [Cyrillic (ISO-8859-5)..........]
Assumed document character set(!): [iso-8859-1......]
- Raw 8-bit (!) : [ON.]
- HTML error recovery (!) : [strict (SortaSGML mode)]
+ Raw 8-bit (!) : [OFF]
+ X Display (!) : __________________________________________
+
+ Document Appearance
+ Show color : [ON....]
+ Show cursor : [OFF]
Popups for select fields : [ON.]
+ HTML error recovery (!) : [strict (SortaSGML mode)]
Show images (!) : [as labels]
- Verbose images : [show filename]
+ Verbose images : [OFF..........]
- Bookmark Options
- Multi-bookmarks : [OFF.....]
- Bookmarks file : __________________________________________
+ Headers Transferred to Remote Servers
+ Personal mail address : __________________________________________
+ Preferred document character set : _________________________________
+ Preferred document language : _________________________________
+ User-Agent header (!) : __________________________________________
- File Management Options
+ Listing and Accessing Files
FTP sort criteria : [By Name]
Local directory sort criteria : [Mixed style......]
+ Show dot files : [ON.]
+ Execution links : [FOR LOCAL FILES ONLY]
- Headers transferred to remote server
- Preferred document character set : _________________________________
- Preferred document language : _________________________________
- User-Agent header (!) : __________________________________________
+ Special Files and Screens
+ Multi-bookmarks : [ADVANCED]
+ Review/edit Bookmarks files : Goto multi-bookmark menu
+ Visited Pages : [As Visit Tree..........]
Check your lynx.cfg here
diff -u old/option_h.htm ./option_h.htm
--- old/option_h.htm Mon Apr 17 03:59:16 2000
+++ ./option_h.htm Tue Apr 18 12:56:58 2000
@@ -12,44 +12,64 @@
compiled in or chosen in `lynx.cfg':
<UL>
-<LI>Personal Preferences
+
+<LI>General Preferences
<UL>
+<LI><A HREF="#UM">User Mode</A>
<LI><A HREF="#CK">Cookies</A>
+<LI><A HREF="#ST">Searching type</A>
+</UL>
+
+<LI>Keyboard Input
+<UL>
<LI><A HREF="#ED">Editor</A>
-<LI><A HREF="#EM">Emacs keys</A>
<LI><A HREF="#KM">Keypad mode</A>
-<LI><A HREF="#LE">Line edit style</A>
-<LI><A HREF="#PM">Personal Mail Address</A>
-<LI><A HREF="#ST">Searching type</A>
-<LI><A HREF="#SC">Show color</A>
-<LI><A HREF="#CL">Show cursor for current link or option</A>
-<LI><A HREF="#UM">User Mode</A>
+<LI><A HREF="#EM">Emacs keys</A>
<LI><A HREF="#VI">VI keys</A>
-<LI><A HREF="#DC">Display Character set</A>
-<LI><A HREF="#DV">X DISPLAY variable</A></UL>
-<LI>Document Layout
+<LI><A HREF="#LE">Line edit style</A>
+</UL>
+
+<LI>Display and Character Set
<UL>
+<LI><A HREF="#DC">Display Character set</A>
<LI><A HREF="#AD">Assumed document character set</A>
<LI><A HREF="#JK">Raw 8-bit or CJK mode</A>
-<LI><A HREF="#tagsoup">HTML error recovery</A>
+<LI><A HREF="#DV">X DISPLAY variable</A>
+</UL>
+
+<LI>Document Appearance
+<UL>
+<LI><A HREF="#SC">Show color</A>
+<LI><A HREF="#CL">Show cursor for current link or option</A>
<LI><A HREF="#PU">Pop-ups for select fields</A>
+<LI><A HREF="#tagsoup">HTML error recovery</A>
<LI><A HREF="#SI">Show Images</A>
-<LI><A HREF="#VB">Verbose Images</A></UL>
-<LI>Bookmark Options
+<LI><A HREF="#VB">Verbose Images</A>
+</UL>
+
+<LI>Headers Transferred to Remote Servers
<UL>
-<LI><A HREF="#MB">Multi-bookmarks</A>
-<LI><A HREF="#BF">Bookmark file</A></UL>
-<LI>File Management Options
+<LI><A HREF="#PM">Personal Mail Address</A>
+<LI><A HREF="#PC">Preferred Document Charset</A>
+<LI><A HREF="#PL">Preferred Document Language</A>
+<LI><A HREF="#UA">User Agent</A>
+</UL>
+
+<LI>Listing and Accessing Files
<UL>
<LI><A HREF="#FT">FTP sort criteria</A>
<LI><A HREF="#LD">Local directory sort criteria</A>
<LI><A HREF="#DF">Show dot files</A>
-<LI><A HREF="#LL">Execution links</A></UL>
-<LI>Headers transferred to remote server
+<LI><A HREF="#LL">Execution links</A>
+</UL>
+
+<LI>Special Files and Screens
<UL>
-<LI><A HREF="#PC">Preferred Document Charset</A>
-<LI><A HREF="#PL">Preferred Document Language</A>
-<LI><A HREF="#UA">User Agent</A></UL>
+<LI><A HREF="#MB">Multi-bookmarks</A>
+<LI><A HREF="#BF">Bookmark file</A>
+<LI><A HREF="#VP">Visited Pages</A> <!-- no text yet -->
+</UL>
+
</UL>
<H1><A NAME="CK">Cookies</A></H1>
diff -u old/lyoption.c ./lyoption.c
--- old/lyoption.c Thu Apr 6 18:18:54 2000
+++ ./lyoption.c Tue Apr 18 12:58:48 2000
@@ -4221,7 +4221,16 @@
* preformatted text follows
*/
fprintf(fp0,"<pre>\n");
- fprintf(fp0,"\n <em>%s</em>\n", gettext("Personal Preferences"));
+
+
+ fprintf(fp0,"\n <em>%s</em>\n", gettext("General Preferences"));
+ /*****************************************************************/
+
+ /* User Mode: SELECT */
+ PutLabel(fp0, gettext("User mode"));
+ BeginSelect(fp0, user_mode_string);
+ PutOptValues(fp0, user_mode, user_mode_values);
+ EndSelect(fp0);
/* Cookies: SELECT */
/* @@@ This is inconsistent - LYAcceptAllCookies gets saved to RC file
@@ -4239,21 +4248,37 @@
cookies_accept_all_string);
EndSelect(fp0);
+ /* Search Type: SELECT */
+ PutLabel(fp0, gettext("Searching type"));
+ BeginSelect(fp0, search_type_string);
+ PutOptValues(fp0, case_sensitive, search_type_values);
+ EndSelect(fp0);
+
+
+ fprintf(fp0,"\n <em>%s</em>\n", gettext("Keyboard Input"));
+ /*****************************************************************/
+
/* Editor: INPUT */
PutLabel(fp0, gettext("Editor"));
PutTextInput(fp0, editor_string, NOTEMPTY(editor), text_len,
DISABLED(no_editor || system_editor));
+ /* Keypad Mode: SELECT */
+ PutLabel(fp0, gettext("Keypad mode"));
+ BeginSelect(fp0, keypad_mode_string);
+ PutOptValues(fp0, keypad_mode, keypad_mode_values);
+ EndSelect(fp0);
+
/* Emacs keys: ON/OFF */
PutLabel(fp0, gettext("Emacs keys"));
BeginSelect(fp0, emacs_keys_string);
PutOptValues(fp0, emacs_keys, bool_values);
EndSelect(fp0);
- /* Keypad Mode: SELECT */
- PutLabel(fp0, gettext("Keypad mode"));
- BeginSelect(fp0, keypad_mode_string);
- PutOptValues(fp0, keypad_mode, keypad_mode_values);
+ /* VI Keys: ON/OFF */
+ PutLabel(fp0, gettext("VI keys"));
+ BeginSelect(fp0, vi_keys_string);
+ PutOptValues(fp0, vi_keys, bool_values);
EndSelect(fp0);
/* Line edit style: SELECT */
@@ -4280,66 +4305,12 @@
EndSelect(fp0);
#endif /* EXP_KEYBOARD_LAYOUT */
- /* Mail Address: INPUT */
- PutLabel(fp0, gettext("Personal mail address"));
- PutTextInput(fp0, mail_address_string,
- NOTEMPTY(personal_mail_address), text_len, "");
-
- /* Search Type: SELECT */
- PutLabel(fp0, gettext("Searching type"));
- BeginSelect(fp0, search_type_string);
- PutOptValues(fp0, case_sensitive, search_type_values);
- EndSelect(fp0);
- /* Show Color: SELECT */
-#if defined(USE_SLANG) || defined(COLOR_CURSES)
- SetupChosenShowColor();
- PutLabel(fp0, gettext("Show color"));
- if (no_option_save) {
- MaybeSelect(fp0, !can_do_colors, show_color_string);
- if (LYShowColor == SHOW_COLOR_NEVER) {
- LYShowColor = SHOW_COLOR_OFF;
- } else if (LYShowColor == SHOW_COLOR_ALWAYS) {
- LYShowColor = SHOW_COLOR_ON;
- }
- PutOptValues(fp0, LYShowColor - SHOW_COLOR_OFF, bool_values);
- } else {
- BeginSelect(fp0, show_color_string);
- if (can_do_colors) {
- show_color_values[2].HtmlName = on_string;
- show_color_values[3].LongName = always_string;
- } else {
- show_color_values[2].HtmlName = NULL; /* suppress "ON" - kw */
- show_color_values[3].LongName = "Always try";
- }
- PutOptValues(fp0, LYChosenShowColor, show_color_values);
- }
- EndSelect(fp0);
-#endif /* USE_SLANG || COLOR_CURSES */
-
- /* Show cursor: ON/OFF */
- PutLabel(fp0, gettext("Show cursor"));
- BeginSelect(fp0, show_cursor_string);
- PutOptValues(fp0, LYShowCursor, bool_values);
- EndSelect(fp0);
-
- /* User Mode: SELECT */
- PutLabel(fp0, gettext("User mode"));
- BeginSelect(fp0, user_mode_string);
- PutOptValues(fp0, user_mode, user_mode_values);
- EndSelect(fp0);
-
- /* VI Keys: ON/OFF */
- PutLabel(fp0, gettext("VI keys"));
- BeginSelect(fp0, vi_keys_string);
- PutOptValues(fp0, vi_keys, bool_values);
- EndSelect(fp0);
-
- /* Visited Pages: SELECT */
- PutLabel(fp0, gettext("Visited Pages"));
- BeginSelect(fp0, visited_pages_type_string);
- PutOptValues(fp0, Visited_Links_As, visited_pages_type_values);
- EndSelect(fp0);
+ /*
+ * Display and Character Set
+ */
+ fprintf(fp0,"\n <em>%s</em>\n", gettext("Display and Character Set"));
+ /*****************************************************************/
/* Display Character Set: SELECT */
PutLabel(fp0, gettext("Display character set"));
@@ -4357,15 +4328,6 @@
}
EndSelect(fp0);
- /* X Display: INPUT */
- PutLabelNotSaved(fp0, gettext("X Display"));
- PutTextInput(fp0, x_display_string, NOTEMPTY(x_display), text_len, "");
-
- /*
- * Document Layout
- */
- fprintf(fp0,"\n <em>%s</em>\n", gettext("Document Layout"));
-
/* Assume Character Set: SELECT */
/* if (user_mode==ADVANCED_MODE) */
{
@@ -4410,13 +4372,48 @@
PutOptValues(fp0, LYRawMode, bool_values);
EndSelect(fp0);
-#ifndef SH_EX /* 1999/01/19 (Tue) */
- /* HTML error recovery: SELECT */
- PutLabelNotSaved(fp0, gettext("HTML error recovery"));
- BeginSelect(fp0, DTD_recovery_string);
- PutOptValues(fp0, Old_DTD, DTD_type_values);
+ /* X Display: INPUT */
+ PutLabelNotSaved(fp0, gettext("X Display"));
+ PutTextInput(fp0, x_display_string, NOTEMPTY(x_display), text_len, "");
+
+
+ /*
+ * Document Appearance
+ */
+ fprintf(fp0,"\n <em>%s</em>\n", gettext("Document Apperance"));
+ /*****************************************************************/
+
+ /* Show Color: SELECT */
+#if defined(USE_SLANG) || defined(COLOR_CURSES)
+ SetupChosenShowColor();
+ PutLabel(fp0, gettext("Show color"));
+ if (no_option_save) {
+ MaybeSelect(fp0, !can_do_colors, show_color_string);
+ if (LYShowColor == SHOW_COLOR_NEVER) {
+ LYShowColor = SHOW_COLOR_OFF;
+ } else if (LYShowColor == SHOW_COLOR_ALWAYS) {
+ LYShowColor = SHOW_COLOR_ON;
+ }
+ PutOptValues(fp0, LYShowColor - SHOW_COLOR_OFF, bool_values);
+ } else {
+ BeginSelect(fp0, show_color_string);
+ if (can_do_colors) {
+ show_color_values[2].HtmlName = on_string;
+ show_color_values[3].LongName = always_string;
+ } else {
+ show_color_values[2].HtmlName = NULL; /* suppress "ON" - kw */
+ show_color_values[3].LongName = "Always try";
+ }
+ PutOptValues(fp0, LYChosenShowColor, show_color_values);
+ }
+ EndSelect(fp0);
+#endif /* USE_SLANG || COLOR_CURSES */
+
+ /* Show cursor: ON/OFF */
+ PutLabel(fp0, gettext("Show cursor"));
+ BeginSelect(fp0, show_cursor_string);
+ PutOptValues(fp0, LYShowCursor, bool_values);
EndSelect(fp0);
-#endif
/* Select Popups: ON/OFF */
PutLabel(fp0, gettext("Popups for select fields"));
@@ -4424,6 +4421,14 @@
PutOptValues(fp0, LYSelectPopups, bool_values);
EndSelect(fp0);
+#ifndef SH_EX /* 1999/01/19 (Tue) */
+ /* HTML error recovery: SELECT */
+ PutLabelNotSaved(fp0, gettext("HTML error recovery"));
+ BeginSelect(fp0, DTD_recovery_string);
+ PutOptValues(fp0, Old_DTD, DTD_type_values);
+ EndSelect(fp0);
+#endif
+
/* Show Images: SELECT */
PutLabelNotSaved(fp0, gettext("Show images"));
BeginSelect(fp0, images_string);
@@ -4444,44 +4449,41 @@
PutOptValues(fp0, verbose_img, verbose_images_type_values);
EndSelect(fp0);
+
/*
- * Bookmark Options
+ * Headers Transferred to Remote Servers
*/
- fprintf(fp0,"\n <em>%s</em>\n", gettext("Bookmark Options"));
+ fprintf(fp0,"\n <em>%s</em>\n", gettext("Headers Transferred to Remote
Servers"));
+ /*****************************************************************/
- /* Multi-Bookmark Mode: SELECT */
- if (!LYMBMBlocked) {
- PutLabel(fp0, gettext("Multi-bookmarks"));
- BeginSelect(fp0, mbm_string);
- PutOption(fp0, !LYMultiBookmarks,
- mbm_off_string,
- mbm_off_string);
- PutOption(fp0, LYMultiBookmarks && !LYMBMAdvanced,
- mbm_standard_string,
- mbm_standard_string);
- PutOption(fp0, LYMultiBookmarks && LYMBMAdvanced,
- mbm_advanced_string,
- mbm_advanced_string);
- EndSelect(fp0);
- }
+ /* Mail Address: INPUT */
+ PutLabel(fp0, gettext("Personal mail address"));
+ PutTextInput(fp0, mail_address_string,
+ NOTEMPTY(personal_mail_address), text_len, "");
- /* Bookmarks File Menu: LINK/INPUT */
- if (LYMultiBookmarks) {
+ /* Preferred Document Character Set: INPUT */
+ PutLabel(fp0, gettext("Preferred document character set"));
+ PutTextInput(fp0, preferred_doc_char_string,
+ NOTEMPTY(pref_charset), cset_len+2, "");
- PutLabel(fp0, gettext("Review/edit Bookmarks files"));
- fprintf(fp0, "<a href=\"LYNXOPTIONS://MBM_MENU\">%s</a>\n",
- gettext("Goto multi-bookmark menu"));
+ /* Preferred Document Language: INPUT */
+ PutLabel(fp0, gettext("Preferred document language"));
+ PutTextInput(fp0, preferred_doc_lang_string,
+ NOTEMPTY(language), cset_len+2, "");
- } else {
- PutLabel(fp0, gettext("Bookmarks file"));
- PutTextInput(fp0, single_bookmark_string,
- NOTEMPTY(bookmark_page), text_len, "");
+ /* User Agent: INPUT */
+ if (!no_useragent) {
+ PutLabelNotSaved(fp0, gettext("User-Agent header"));
+ PutTextInput(fp0, user_agent_string,
+ NOTEMPTY(LYUserAgent), text_len, "");
}
+
/*
- * File Management Options
+ * Listing and Accessing Files
*/
- fprintf(fp0,"\n <em>%s</em>\n", DIRED_MENU_TITLE);
+ fprintf(fp0,"\n <em>%s</em>\n", gettext("Listing and Accessing Files"));
+ /*****************************************************************/
/* FTP sort: SELECT */
PutLabel(fp0, gettext("FTP sort criteria"));
@@ -4525,28 +4527,49 @@
EndSelect(fp0);
#endif /* ENABLE_OPTS_CHANGE_EXEC */
+
/*
- * Headers transferred to remote server
+ * Special Files and Screens
*/
- fprintf(fp0,"\n <em>%s</em>\n", gettext("Headers transferred to remote
server"));
+ fprintf(fp0,"\n <em>%s</em>\n", gettext("Special Files and Screens"));
+ /*****************************************************************/
- /* Preferred Document Character Set: INPUT */
- PutLabel(fp0, gettext("Preferred document character set"));
- PutTextInput(fp0, preferred_doc_char_string,
- NOTEMPTY(pref_charset), cset_len+2, "");
+ /* Multi-Bookmark Mode: SELECT */
+ if (!LYMBMBlocked) {
+ PutLabel(fp0, gettext("Multi-bookmarks"));
+ BeginSelect(fp0, mbm_string);
+ PutOption(fp0, !LYMultiBookmarks,
+ mbm_off_string,
+ mbm_off_string);
+ PutOption(fp0, LYMultiBookmarks && !LYMBMAdvanced,
+ mbm_standard_string,
+ mbm_standard_string);
+ PutOption(fp0, LYMultiBookmarks && LYMBMAdvanced,
+ mbm_advanced_string,
+ mbm_advanced_string);
+ EndSelect(fp0);
+ }
- /* Preferred Document Language: INPUT */
- PutLabel(fp0, gettext("Preferred document language"));
- PutTextInput(fp0, preferred_doc_lang_string,
- NOTEMPTY(language), cset_len+2, "");
+ /* Bookmarks File Menu: LINK/INPUT */
+ if (LYMultiBookmarks) {
- /* User Agent: INPUT */
- if (!no_useragent) {
- PutLabelNotSaved(fp0, gettext("User-Agent header"));
- PutTextInput(fp0, user_agent_string,
- NOTEMPTY(LYUserAgent), text_len, "");
+ PutLabel(fp0, gettext("Review/edit Bookmarks files"));
+ fprintf(fp0, "<a href=\"LYNXOPTIONS://MBM_MENU\">%s</a>\n",
+ gettext("Goto multi-bookmark menu"));
+
+ } else {
+ PutLabel(fp0, gettext("Bookmarks file"));
+ PutTextInput(fp0, single_bookmark_string,
+ NOTEMPTY(bookmark_page), text_len, "");
}
+ /* Visited Pages: SELECT */
+ PutLabel(fp0, gettext("Visited Pages"));
+ BeginSelect(fp0, visited_pages_type_string);
+ PutOptValues(fp0, Visited_Links_As, visited_pages_type_values);
+ EndSelect(fp0);
+
+
if (!no_lynxcfg_info) {
fprintf(fp0,
"\n Check your <a href=\"LYNXCFG:\">lynx.cfg</a> here\n");