Updated settings dialog.

svn path=/trunk/netsurf/; revision=13279

3 files changed, 142 insertions, 31 deletions

diff --git a/atari/res/netsurf.rsc b/atari/res/netsurf.rsc
index d2f1dd281..184f760c4 100755
--- a/atari/res/netsurf.rsc
+++ b/atari/res/netsurf.rsc
diff --git a/atari/res/netsurf.rsh b/atari/res/netsurf.rsh
index 28ee3432e..e204608c2 100755
--- a/atari/res/netsurf.rsh
+++ b/atari/res/netsurf.rsh
@@ -82,23 +82,13 @@
 

 #define THROBBER 7  /* form/dial */

 

-#define SLIDER 8  /* form/dial */

-#define SLIDER_BT_SCROLL_L 1  /* BOXCHAR in tree SLIDER */

-#define SLIDER_BOX_H 2  /* BOX in tree SLIDER */

-#define SLIDER_BOX_MOVER_H 3  /* BOX in tree SLIDER */

-#define SLIDER_BT_SCROLL_R 4  /* BOXCHAR in tree SLIDER */

-#define SLIDER_BT_SCROLL_U 5  /* BOXCHAR in tree SLIDER */

-#define SLIDER_BOX_V 6  /* BOX in tree SLIDER */

-#define SLIDER_MOVER_V 8  /* BOX in tree SLIDER */

-#define SLIDER_BT_SCROLL_D 7  /* BOXCHAR in tree SLIDER */

-

-#define TOOLBAR_HOTLIST 9  /* form/dial */

+#define TOOLBAR_HOTLIST 8  /* form/dial */

 #define TOOLBAR_HOTLIST_ADD 1  /* CICON in tree TOOLBAR_HOTLIST */

 #define TOOLBAR_HOTLIST_CREATE_FOLDER 2  /* CICON in tree TOOLBAR_HOTLIST */

 #define TOOLBAR_HOTLIST_DELETE 3  /* CICON in tree TOOLBAR_HOTLIST */

 #define TOOLBAR_HOTLIST_EDIT 4  /* CICON in tree TOOLBAR_HOTLIST */

 

-#define SEARCH 10  /* form/dial */

+#define SEARCH 9  /* form/dial */

 #define SEARCH_TB_SRCH 1  /* FTEXT in tree SEARCH */

 #define SEARCH_LBL_SHOWALL 2  /* STRING in tree SEARCH */

 #define SEARCH_LBL_CASESENSE 3  /* STRING in tree SEARCH */

@@ -108,7 +98,7 @@
 #define SEARCH_CB_SHOWALL 7  /* BUTTON in tree SEARCH */

 #define SEARCH_CB_FWD 8  /* BUTTON in tree SEARCH */

 

-#define DOWNLOAD 11  /* form/dial */

+#define DOWNLOAD 10  /* form/dial */

 /* Width ist 400, code depends on that! If you change it, change it in download.c */

 #define DOWNLOAD_PROGRESS 1  /* BOX in tree DOWNLOAD */

 #define DOWNLOAD_PROGRESS_DONE 2  /* BOX in tree DOWNLOAD */

@@ -120,9 +110,9 @@
 #define DOWNLOAD_LBL_SPEED 8  /* TEXT in tree DOWNLOAD */

 #define DOWNLOAD_CB_CLOSE_RDY 9  /* BUTTON in tree DOWNLOAD */

 

-#define ABOUT 12  /* form/dial */

+#define ABOUT 11  /* form/dial */

 

-#define POP_CTX 13  /* form/dial */

+#define POP_CTX 12  /* form/dial */

 #define POP_CTX_CUT_SEL 1  /* TEXT in tree POP_CTX */

 #define POP_CTX_COPY_SEL 2  /* TEXT in tree POP_CTX */

 #define POP_CTX_PASTE_SEL 3  /* TEXT in tree POP_CTX */

@@ -132,3 +122,69 @@
 #define POP_CTX_COPY_URL 8  /* TEXT in tree POP_CTX */

 #define POP_CTX_SAVE_AS 9  /* TEXT in tree POP_CTX */

 #define POP_CTX_VIEW_SOURCE 10  /* TEXT in tree POP_CTX */

+

+#define CHOICES 13  /* form/dial */

+#define CHOICES_REG_BROWSER 1  /* BUTTON in tree CHOICES */

+#define CHOICES_REG_RENDER 2  /* BUTTON in tree CHOICES */

+#define CHOICES_REG_STYLE 3  /* BUTTON in tree CHOICES */

+#define CHOICES_REG_NETWORK 4  /* BUTTON in tree CHOICES */

+#define CHOICES_REG_PATH 5  /* BUTTON in tree CHOICES */

+#define CHOICES_REG_CACHE 6  /* BUTTON in tree CHOICES */

+#define CHOICES_TAB_STYLE 7  /* BUTTON in tree CHOICES */

+#define CHOICES_EDIT_DEF_FONT_SIZE 10  /* FTEXT in tree CHOICES */

+#define CHOICES_DEC_DEF_FONT_SIZE 11  /* BOXCHAR in tree CHOICES */

+#define CHOICES_INC_DEF_FONT_SIZE 12  /* BOXCHAR in tree CHOICES */

+#define CHOICES_EDIT_MIN_FONT_SIZE 16  /* FTEXT in tree CHOICES */

+#define CHOICES_DEC_MIN_FONT_SIZE 17  /* BOXCHAR in tree CHOICES */

+#define CHOICES_INC_MIN_FONT_SIZE 18  /* BOXCHAR in tree CHOICES */

+#define CHOICES_TAB_RENDER 19  /* BUTTON in tree CHOICES */

+/* Make sure that initial value is large enough! */

+#define CHOICES_BT_SEL_FONT_RENDERER 20  /* BUTTON in tree CHOICES */

+#define CHOICES_CB_TRANSPARENCY 22  /* BUTTON in tree CHOICES */

+#define CHOICES_CB_ENABLE_ANIMATION 24  /* BUTTON in tree CHOICES */

+#define CHOICES_EDIT_MIN_GIF_DELAY 27  /* FTEXT in tree CHOICES */

+#define CHOICES_DEC_GIF_DELAY 28  /* BOXCHAR in tree CHOICES */

+#define CHOICES_INC_GIF_DELAY 29  /* BOXCHAR in tree CHOICES */

+#define CHOICES_CB_INCREMENTAL_REFLOW 31  /* BUTTON in tree CHOICES */

+#define CHOICES_EDIT_MIN_REFLOW_PERIOD 33  /* FTEXT in tree CHOICES */

+#define CHOICES_DEC_INCREMENTAL_REFLOW 34  /* BOXCHAR in tree CHOICES */

+#define CHOICES_INC_INCREMENTAL_REFLOW 35  /* BOXCHAR in tree CHOICES */

+#define CHOICES_TAB_PATH 37  /* BUTTON in tree CHOICES */

+#define CHOICES_EDIT_CA_CERTS_PATH 42  /* FTEXT in tree CHOICES */

+#define CHOICES_EDIT_DOWNLOAD_PATH 43  /* FTEXT in tree CHOICES */

+#define CHOICES_EDIT_HOTLIST_FILE 44  /* FTEXT in tree CHOICES */

+#define CHOICES_EDIT_CA_BUNDLE 45  /* FTEXT in tree CHOICES */

+#define CHOICES_EDIT_EDITOR 46  /* FTEXT in tree CHOICES */

+#define CHOICES_TAB_CACHE 48  /* BUTTON in tree CHOICES */

+#define CHOICES_INC_MEM_CACHE 52  /* BOXCHAR in tree CHOICES */

+#define CHOICES_DEC_MEM_CACHE 53  /* BOXCHAR in tree CHOICES */

+#define CHOICES_STR_MAX_MEM_CACHE 54  /* STRING in tree CHOICES */

+#define CHOICES_TAB_BROWSER 55  /* BUTTON in tree CHOICES */

+#define CHOICES_CB_HIDE_ADVERTISEMENT 57  /* BUTTON in tree CHOICES */

+#define CHOICES_CB_DISABLE_POPUP_WINDOWS 58  /* BUTTON in tree CHOICES */

+#define CHOICES_BT_SEL_LOCALE 60  /* BUTTON in tree CHOICES */

+#define CHOICES_BT_GUI_LANG 63  /* BUTTON in tree CHOICES */

+#define CHOICES_EDIT_HISTORY_AGE 66  /* FTEXT in tree CHOICES */

+#define CHOICES_DEC_HISTORY_AGE 67  /* BOXCHAR in tree CHOICES */

+#define CHOICES_INC_HISTORY_AGE 68  /* BOXCHAR in tree CHOICES */

+#define CHOICES_CB_SEND_HTTP_REFERRER 72  /* BUTTON in tree CHOICES */

+#define CHOICES_EDIT_HOMEPAGE 73  /* FTEXT in tree CHOICES */

+#define CHOICES_BT_CLEAR_HISTORY 74  /* BUTTON in tree CHOICES */

+#define CHOICES_TAB_NETWORK 75  /* BUTTON in tree CHOICES */

+#define CHOICES_CB_USE_PROXY 77  /* BUTTON in tree CHOICES */

+#define CHOICES_EDIT_PROXY_HOST 78  /* FTEXT in tree CHOICES */

+#define CHOICES_CB_PROXY_AUTH 79  /* BUTTON in tree CHOICES */

+#define CHOICES_EDIT_PROXY_USERNAME 80  /* FTEXT in tree CHOICES */

+#define CHOICES_EDIT_PROXY_PASSWORD 81  /* FTEXT in tree CHOICES */

+#define CHOICES_EDIT_PROXY_PORT 99  /* FTEXT in tree CHOICES */

+#define CHOICES_INC_MAX_FETCHERS_PER_HOST 87  /* BOXCHAR in tree CHOICES */

+#define CHOICES_INC_CACHED_CONNECTIONS 88  /* BOXCHAR in tree CHOICES */

+#define CHOICES_DEC_MAX_FETCHERS_PER_HOST 89  /* BOXCHAR in tree CHOICES */

+#define CHOICES_DEC_CACHED_CONNECTIONS 90  /* BOXCHAR in tree CHOICES */

+#define CHOICES_EDIT_MAX_FETCHERS_PER_HOST 91  /* FTEXT in tree CHOICES */

+#define CHOICES_EDIT_MAX_CACHED_CONNECTIONS 92  /* FTEXT in tree CHOICES */

+#define CHOICES_EDIT_MAX_FETCHERS 94  /* FTEXT in tree CHOICES */

+#define CHOICES_DEC_MAX_FETCHERS 95  /* BOXCHAR in tree CHOICES */

+#define CHOICES_INC_MAX_FETCHERS 96  /* BOXCHAR in tree CHOICES */

+#define CHOICES_ABORT 97  /* BUTTON in tree CHOICES */

+#define CHOICES_OK 98  /* BUTTON in tree CHOICES */

diff --git a/atari/res/netsurf.rsm b/atari/res/netsurf.rsm
index 4d5e28188..e34137ea1 100755
--- a/atari/res/netsurf.rsm
+++ b/atari/res/netsurf.rsm
@@ -3,7 +3,7 @@ ResourceMaster v3.65
 #N 99@32@AZAaza___  _@AZAaza090___  _@@_@

 #FoC-Header@rsm2out@C-Header@rsh@@@[C-Header@0@

 #R 0@0@1@1@1@1@

-#M 20010100@17741@7728@575@

+#M 20010100@0@7728@593@

 #T 0@1@MAINMENU@@60@@

 #O 4@32@T_FILE@@

 #O 5@32@T_EDIT@@

@@ -79,21 +79,12 @@ ResourceMaster v3.65
 #O 15@20@BOX_V@@

 #O 16@20@MOVER_V@@

 #T 7@2@THROBBER@@14@@

-#T 8@2@SLIDER@@9@@

-#O 1@27@BT_SCROLL_L@@

-#O 2@20@BOX_H@@

-#O 3@20@BOX_MOVER_H@@

-#O 4@27@BT_SCROLL_R@@

-#O 5@27@BT_SCROLL_U@@

-#O 6@20@BOX_V@@

-#O 8@20@MOVER_V@@

-#O 7@27@BT_SCROLL_D@@

-#T 9@2@TOOLBAR_HOTLIST@@5@@

+#T 8@2@TOOLBAR_HOTLIST@@5@@

 #O 1@33@ADD@@

 #O 2@33@CREATE_FOLDER@@

 #O 3@33@DELETE@@

 #O 4@33@EDIT@@

-#T 10@2@SEARCH@@9@@

+#T 9@2@SEARCH@@9@@

 #O 1@29@TB_SRCH@@

 #O 2@28@LBL_SHOWALL@@

 #O 3@28@LBL_CASESENSE@@

@@ -102,7 +93,7 @@ ResourceMaster v3.65
 #O 6@26@CB_CASESENSE@@

 #O 7@26@CB_SHOWALL@@

 #O 8@26@CB_FWD@@

-#T 11@2@DOWNLOAD@@10@@

+#T 10@2@DOWNLOAD@@10@@

 #O 1@20@PROGRESS@Width ist 400, code depends on that! If you change it, change it in download.c@

 #O 2@20@PROGRESS_DONE@@

 #O 3@21@FILENAME@@

@@ -112,8 +103,8 @@ ResourceMaster v3.65
 #O 7@21@LBL_PERCENT@@

 #O 8@21@LBL_SPEED@@

 #O 9@26@CB_CLOSE_RDY@@

-#T 12@2@ABOUT@@2@@

-#T 13@2@POP_CTX@@11@@

+#T 11@2@ABOUT@@2@@

+#T 12@2@POP_CTX@@11@@

 #O 1@21@CUT_SEL@@

 #O 2@21@COPY_SEL@@

 #O 3@21@PASTE_SEL@@

@@ -123,4 +114,68 @@ ResourceMaster v3.65
 #O 8@21@COPY_URL@@

 #O 9@21@SAVE_AS@@

 #O 10@21@VIEW_SOURCE@@

-#c 18476@

+#T 13@2@CHOICES@@100@@

+#O 1@26@REG_BROWSER@@

+#O 2@26@REG_RENDER@@

+#O 3@26@REG_STYLE@@

+#O 4@26@REG_NETWORK@@

+#O 5@26@REG_PATH@@

+#O 6@26@REG_CACHE@@

+#O 7@26@TAB_STYLE@@

+#O 10@29@EDIT_DEF_FONT_SIZE@@

+#O 11@27@DEC_DEF_FONT_SIZE@@

+#O 12@27@INC_DEF_FONT_SIZE@@

+#O 16@29@EDIT_MIN_FONT_SIZE@@

+#O 17@27@DEC_MIN_FONT_SIZE@@

+#O 18@27@INC_MIN_FONT_SIZE@@

+#O 19@26@TAB_RENDER@@

+#O 20@26@BT_SEL_FONT_RENDERER@Make sure that initial value is large enough!@

+#O 22@26@CB_TRANSPARENCY@@

+#O 24@26@CB_ENABLE_ANIMATION@@

+#O 27@29@EDIT_MIN_GIF_DELAY@@

+#O 28@27@DEC_GIF_DELAY@@

+#O 29@27@INC_GIF_DELAY@@

+#O 31@26@CB_INCREMENTAL_REFLOW@@

+#O 33@29@EDIT_MIN_REFLOW_PERIOD@@

+#O 34@27@DEC_INCREMENTAL_REFLOW@@

+#O 35@27@INC_INCREMENTAL_REFLOW@@

+#O 37@26@TAB_PATH@@

+#O 42@29@EDIT_CA_CERTS_PATH@@

+#O 43@29@EDIT_DOWNLOAD_PATH@@

+#O 44@29@EDIT_HOTLIST_FILE@@

+#O 45@29@EDIT_CA_BUNDLE@@

+#O 46@29@EDIT_EDITOR@@

+#O 48@26@TAB_CACHE@@

+#O 52@27@INC_MEM_CACHE@@

+#O 53@27@DEC_MEM_CACHE@@

+#O 54@28@STR_MAX_MEM_CACHE@@

+#O 55@26@TAB_BROWSER@@

+#O 57@26@CB_HIDE_ADVERTISEMENT@@

+#O 58@26@CB_DISABLE_POPUP_WINDOWS@@

+#O 60@26@BT_SEL_LOCALE@@

+#O 63@26@BT_GUI_LANG@@

+#O 66@29@EDIT_HISTORY_AGE@@

+#O 67@27@DEC_HISTORY_AGE@@

+#O 68@27@INC_HISTORY_AGE@@

+#O 72@26@CB_SEND_HTTP_REFERRER@@

+#O 73@29@EDIT_HOMEPAGE@@

+#O 74@26@BT_CLEAR_HISTORY@@

+#O 75@26@TAB_NETWORK@@

+#O 77@26@CB_USE_PROXY@@

+#O 78@29@EDIT_PROXY_HOST@@

+#O 79@26@CB_PROXY_AUTH@@

+#O 80@29@EDIT_PROXY_USERNAME@@

+#O 81@29@EDIT_PROXY_PASSWORD@@

+#O 99@29@EDIT_PROXY_PORT@@

+#O 87@27@INC_MAX_FETCHERS_PER_HOST@@

+#O 88@27@INC_CACHED_CONNECTIONS@@

+#O 89@27@DEC_MAX_FETCHERS_PER_HOST@@

+#O 90@27@DEC_CACHED_CONNECTIONS@@

+#O 91@29@EDIT_MAX_FETCHERS_PER_HOST@@

+#O 92@29@EDIT_MAX_CACHED_CONNECTIONS@@

+#O 94@29@EDIT_MAX_FETCHERS@@

+#O 95@27@DEC_MAX_FETCHERS@@

+#O 96@27@INC_MAX_FETCHERS@@

+#O 97@26@ABORT@@

+#O 98@26@OK@@

+#c 8251@