From d2e7e3546c799f2d8bfbc589cd63042a390051e1 Mon Sep 17 00:00:00 2001 From: Ole Loots Date: Sat, 23 Jun 2012 00:14:17 +0000 Subject: Added new toolbar options. svn path=/trunk/netsurf/; revision=13983 --- atari/res/netsurf.rsc | Bin 34096 -> 34730 bytes atari/res/netsurf.rsh | 128 +++++++++++++++++++++++++++-------------------- atari/res/netsurf.rsm | 135 ++++++++++++++++++++++++++++---------------------- 3 files changed, 151 insertions(+), 112 deletions(-) diff --git a/atari/res/netsurf.rsc b/atari/res/netsurf.rsc index 7eda5d6c6..9f3963080 100755 Binary files a/atari/res/netsurf.rsc and b/atari/res/netsurf.rsc differ diff --git a/atari/res/netsurf.rsh b/atari/res/netsurf.rsh index 0c9e54086..e099c953f 100755 --- a/atari/res/netsurf.rsh +++ b/atari/res/netsurf.rsh @@ -140,58 +140,78 @@ #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 */ +#define CHOICES_BT_TOOLBAR_BGCOLOR 21 /* BOXTEXT in tree CHOICES */ +#define CHOICES_BT_TOOLBAR_ICONSET 109 /* BUTTON in tree CHOICES */ +#define CHOICES_TAB_RENDER 24 /* 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_CB_ANTI_ALIASING 102 /* BUTTON 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_CB_SEND_DO_NOT_TRACK 103 /* 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 83 /* FTEXT in tree CHOICES */ -#define CHOICES_INC_MAX_FETCHERS_PER_HOST 88 /* BOXCHAR in tree CHOICES */ -#define CHOICES_INC_CACHED_CONNECTIONS 89 /* BOXCHAR in tree CHOICES */ -#define CHOICES_DEC_MAX_FETCHERS_PER_HOST 90 /* BOXCHAR in tree CHOICES */ -#define CHOICES_DEC_CACHED_CONNECTIONS 91 /* BOXCHAR in tree CHOICES */ -#define CHOICES_EDIT_MAX_FETCHERS_PER_HOST 92 /* FTEXT in tree CHOICES */ -#define CHOICES_EDIT_MAX_CACHED_CONNECTIONS 93 /* FTEXT in tree CHOICES */ -#define CHOICES_EDIT_MAX_FETCHERS 95 /* FTEXT in tree CHOICES */ -#define CHOICES_DEC_MAX_FETCHERS 96 /* BOXCHAR in tree CHOICES */ -#define CHOICES_INC_MAX_FETCHERS 97 /* BOXCHAR in tree CHOICES */ -#define CHOICES_CB_FG_IMAGES 100 /* BUTTON in tree CHOICES */ -#define CHOICES_CB_BG_IMAGES 101 /* BUTTON in tree CHOICES */ -#define CHOICES_ABORT 98 /* BUTTON in tree CHOICES */ -#define CHOICES_OK 99 /* BUTTON in tree CHOICES */ +#define CHOICES_BT_SEL_FONT_RENDERER 25 /* BUTTON in tree CHOICES */ +#define CHOICES_CB_TRANSPARENCY 27 /* BUTTON in tree CHOICES */ +#define CHOICES_CB_ENABLE_ANIMATION 29 /* BUTTON in tree CHOICES */ +#define CHOICES_EDIT_MIN_GIF_DELAY 32 /* FTEXT in tree CHOICES */ +#define CHOICES_DEC_GIF_DELAY 33 /* BOXCHAR in tree CHOICES */ +#define CHOICES_INC_GIF_DELAY 34 /* BOXCHAR in tree CHOICES */ +#define CHOICES_CB_INCREMENTAL_REFLOW 36 /* BUTTON in tree CHOICES */ +#define CHOICES_EDIT_MIN_REFLOW_PERIOD 38 /* FTEXT in tree CHOICES */ +#define CHOICES_DEC_INCREMENTAL_REFLOW 39 /* BOXCHAR in tree CHOICES */ +#define CHOICES_INC_INCREMENTAL_REFLOW 40 /* BOXCHAR in tree CHOICES */ +#define CHOICES_CB_ANTI_ALIASING 42 /* BUTTON in tree CHOICES */ +#define CHOICES_TAB_PATH 43 /* BUTTON in tree CHOICES */ +#define CHOICES_EDIT_CA_CERTS_PATH 48 /* FTEXT in tree CHOICES */ +#define CHOICES_EDIT_DOWNLOAD_PATH 49 /* FTEXT in tree CHOICES */ +#define CHOICES_EDIT_HOTLIST_FILE 50 /* FTEXT in tree CHOICES */ +#define CHOICES_EDIT_CA_BUNDLE 51 /* FTEXT in tree CHOICES */ +#define CHOICES_EDIT_EDITOR 52 /* FTEXT in tree CHOICES */ +#define CHOICES_TAB_CACHE 54 /* BUTTON in tree CHOICES */ +#define CHOICES_INC_MEM_CACHE 58 /* BOXCHAR in tree CHOICES */ +#define CHOICES_DEC_MEM_CACHE 59 /* BOXCHAR in tree CHOICES */ +#define CHOICES_STR_MAX_MEM_CACHE 60 /* STRING in tree CHOICES */ +#define CHOICES_TAB_BROWSER 61 /* BUTTON in tree CHOICES */ +#define CHOICES_CB_HIDE_ADVERTISEMENT 63 /* BUTTON in tree CHOICES */ +#define CHOICES_CB_DISABLE_POPUP_WINDOWS 64 /* BUTTON in tree CHOICES */ +#define CHOICES_CB_SEND_DO_NOT_TRACK 65 /* BUTTON in tree CHOICES */ +#define CHOICES_BT_SEL_LOCALE 67 /* BUTTON in tree CHOICES */ +#define CHOICES_BT_GUI_LANG 70 /* BUTTON in tree CHOICES */ +#define CHOICES_EDIT_HISTORY_AGE 73 /* FTEXT in tree CHOICES */ +#define CHOICES_DEC_HISTORY_AGE 74 /* BOXCHAR in tree CHOICES */ +#define CHOICES_INC_HISTORY_AGE 75 /* BOXCHAR in tree CHOICES */ +#define CHOICES_CB_SEND_HTTP_REFERRER 79 /* BUTTON in tree CHOICES */ +#define CHOICES_EDIT_HOMEPAGE 80 /* FTEXT in tree CHOICES */ +#define CHOICES_BT_CLEAR_HISTORY 81 /* BUTTON in tree CHOICES */ +#define CHOICES_TAB_NETWORK 82 /* BUTTON in tree CHOICES */ +#define CHOICES_CB_USE_PROXY 84 /* BUTTON in tree CHOICES */ +#define CHOICES_EDIT_PROXY_HOST 85 /* FTEXT in tree CHOICES */ +#define CHOICES_CB_PROXY_AUTH 86 /* BUTTON in tree CHOICES */ +#define CHOICES_EDIT_PROXY_USERNAME 87 /* FTEXT in tree CHOICES */ +#define CHOICES_EDIT_PROXY_PASSWORD 88 /* FTEXT in tree CHOICES */ +#define CHOICES_EDIT_PROXY_PORT 90 /* FTEXT in tree CHOICES */ +#define CHOICES_INC_MAX_FETCHERS_PER_HOST 95 /* BOXCHAR in tree CHOICES */ +#define CHOICES_INC_CACHED_CONNECTIONS 96 /* BOXCHAR in tree CHOICES */ +#define CHOICES_DEC_MAX_FETCHERS_PER_HOST 97 /* BOXCHAR in tree CHOICES */ +#define CHOICES_DEC_CACHED_CONNECTIONS 98 /* BOXCHAR in tree CHOICES */ +#define CHOICES_EDIT_MAX_FETCHERS_PER_HOST 99 /* FTEXT in tree CHOICES */ +#define CHOICES_EDIT_MAX_CACHED_CONNECTIONS 100 /* FTEXT in tree CHOICES */ +#define CHOICES_EDIT_MAX_FETCHERS 102 /* FTEXT in tree CHOICES */ +#define CHOICES_DEC_MAX_FETCHERS 103 /* BOXCHAR in tree CHOICES */ +#define CHOICES_INC_MAX_FETCHERS 104 /* BOXCHAR in tree CHOICES */ +#define CHOICES_CB_FG_IMAGES 105 /* BUTTON in tree CHOICES */ +#define CHOICES_CB_BG_IMAGES 106 /* BUTTON in tree CHOICES */ +#define CHOICES_ABORT 107 /* BUTTON in tree CHOICES */ +#define CHOICES_OK 108 /* BUTTON in tree CHOICES */ + +#define POP_COLOR 14 /* form/dial */ +#define POP_COLOR_WHITE 1 /* BOXCHAR in tree POP_COLOR */ +#define POP_COLOR_BLACK 2 /* BOXCHAR in tree POP_COLOR */ +#define POP_COLOR_RED 3 /* BOXCHAR in tree POP_COLOR */ +#define POP_COLOR_GREEN 4 /* BOXCHAR in tree POP_COLOR */ +#define POP_COLOR_BLUE 5 /* BOXCHAR in tree POP_COLOR */ +#define POP_COLOR_CYAN 6 /* BOXCHAR in tree POP_COLOR */ +#define POP_COLOR_YELLOW 7 /* BOXCHAR in tree POP_COLOR */ +#define POP_COLOR_MAGENTA 8 /* BOXCHAR in tree POP_COLOR */ +#define POP_COLOR_LWHITE 9 /* BOXCHAR in tree POP_COLOR */ +#define POP_COLOR_DWHITE 10 /* BOXCHAR in tree POP_COLOR */ +#define POP_COLOR_DRED 11 /* BOXCHAR in tree POP_COLOR */ +#define POP_COLOR_DGREEN 12 /* BOXCHAR in tree POP_COLOR */ +#define POP_COLOR_DBLUE 13 /* BOXCHAR in tree POP_COLOR */ +#define POP_COLOR_DCYAN 14 /* BOXCHAR in tree POP_COLOR */ +#define POP_COLOR_DYELLOW 15 /* BOXCHAR in tree POP_COLOR */ +#define POP_COLOR_DMAGENTA 16 /* BOXCHAR in tree POP_COLOR */ diff --git a/atari/res/netsurf.rsm b/atari/res/netsurf.rsm index 4cd4d73bc..cfbb152cb 100755 --- a/atari/res/netsurf.rsm +++ b/atari/res/netsurf.rsm @@ -1,9 +1,9 @@ ResourceMaster v3.65 -#C 14@0@0@0@ +#C 15@0@0@0@ #N 99@32@AZAaza___ _@AZAaza090___ _@@_@ #FoC-Header@rsm2out@C-Header@rsh@@@[C-Header@0@ #R 0@0@1@1@1@1@ -#M 20010100@0@7728@601@ +#M 20010100@0@7728@602@ #T 0@1@MAINMENU@@62@@ #O 4@32@T_FILE@@ #O 5@32@T_EDIT@@ @@ -117,7 +117,7 @@ ResourceMaster v3.65 #O 9@21@SAVE_AS@@ #O 10@21@VIEW_SOURCE@@ #O 11@21@SAVE_LINK_AS@@ -#T 13@2@CHOICES@@104@@ +#T 13@2@CHOICES@@110@@ #O 1@26@REG_BROWSER@@ #O 2@26@REG_RENDER@@ #O 3@26@REG_STYLE@@ @@ -131,58 +131,77 @@ ResourceMaster v3.65 #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 102@26@CB_ANTI_ALIASING@@ -#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 103@26@CB_SEND_DO_NOT_TRACK@@ -#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 83@29@EDIT_PROXY_PORT@@ -#O 88@27@INC_MAX_FETCHERS_PER_HOST@@ -#O 89@27@INC_CACHED_CONNECTIONS@@ -#O 90@27@DEC_MAX_FETCHERS_PER_HOST@@ -#O 91@27@DEC_CACHED_CONNECTIONS@@ -#O 92@29@EDIT_MAX_FETCHERS_PER_HOST@@ -#O 93@29@EDIT_MAX_CACHED_CONNECTIONS@@ -#O 95@29@EDIT_MAX_FETCHERS@@ -#O 96@27@DEC_MAX_FETCHERS@@ -#O 97@27@INC_MAX_FETCHERS@@ -#O 100@26@CB_FG_IMAGES@@ -#O 101@26@CB_BG_IMAGES@@ -#O 98@26@ABORT@@ -#O 99@26@OK@@ -#c 27495@ +#O 21@22@BT_TOOLBAR_BGCOLOR@@ +#O 109@26@BT_TOOLBAR_ICONSET@@ +#O 24@26@TAB_RENDER@@ +#O 25@26@BT_SEL_FONT_RENDERER@Make sure that initial value is large enough!@ +#O 27@26@CB_TRANSPARENCY@@ +#O 29@26@CB_ENABLE_ANIMATION@@ +#O 32@29@EDIT_MIN_GIF_DELAY@@ +#O 33@27@DEC_GIF_DELAY@@ +#O 34@27@INC_GIF_DELAY@@ +#O 36@26@CB_INCREMENTAL_REFLOW@@ +#O 38@29@EDIT_MIN_REFLOW_PERIOD@@ +#O 39@27@DEC_INCREMENTAL_REFLOW@@ +#O 40@27@INC_INCREMENTAL_REFLOW@@ +#O 42@26@CB_ANTI_ALIASING@@ +#O 43@26@TAB_PATH@@ +#O 48@29@EDIT_CA_CERTS_PATH@@ +#O 49@29@EDIT_DOWNLOAD_PATH@@ +#O 50@29@EDIT_HOTLIST_FILE@@ +#O 51@29@EDIT_CA_BUNDLE@@ +#O 52@29@EDIT_EDITOR@@ +#O 54@26@TAB_CACHE@@ +#O 58@27@INC_MEM_CACHE@@ +#O 59@27@DEC_MEM_CACHE@@ +#O 60@28@STR_MAX_MEM_CACHE@@ +#O 61@26@TAB_BROWSER@@ +#O 63@26@CB_HIDE_ADVERTISEMENT@@ +#O 64@26@CB_DISABLE_POPUP_WINDOWS@@ +#O 65@26@CB_SEND_DO_NOT_TRACK@@ +#O 67@26@BT_SEL_LOCALE@@ +#O 70@26@BT_GUI_LANG@@ +#O 73@29@EDIT_HISTORY_AGE@@ +#O 74@27@DEC_HISTORY_AGE@@ +#O 75@27@INC_HISTORY_AGE@@ +#O 79@26@CB_SEND_HTTP_REFERRER@@ +#O 80@29@EDIT_HOMEPAGE@@ +#O 81@26@BT_CLEAR_HISTORY@@ +#O 82@26@TAB_NETWORK@@ +#O 84@26@CB_USE_PROXY@@ +#O 85@29@EDIT_PROXY_HOST@@ +#O 86@26@CB_PROXY_AUTH@@ +#O 87@29@EDIT_PROXY_USERNAME@@ +#O 88@29@EDIT_PROXY_PASSWORD@@ +#O 90@29@EDIT_PROXY_PORT@@ +#O 95@27@INC_MAX_FETCHERS_PER_HOST@@ +#O 96@27@INC_CACHED_CONNECTIONS@@ +#O 97@27@DEC_MAX_FETCHERS_PER_HOST@@ +#O 98@27@DEC_CACHED_CONNECTIONS@@ +#O 99@29@EDIT_MAX_FETCHERS_PER_HOST@@ +#O 100@29@EDIT_MAX_CACHED_CONNECTIONS@@ +#O 102@29@EDIT_MAX_FETCHERS@@ +#O 103@27@DEC_MAX_FETCHERS@@ +#O 104@27@INC_MAX_FETCHERS@@ +#O 105@26@CB_FG_IMAGES@@ +#O 106@26@CB_BG_IMAGES@@ +#O 107@26@ABORT@@ +#O 108@26@OK@@ +#T 14@2@POP_COLOR@@17@@ +#O 1@27@WHITE@@ +#O 2@27@BLACK@@ +#O 3@27@RED@@ +#O 4@27@GREEN@@ +#O 5@27@BLUE@@ +#O 6@27@CYAN@@ +#O 7@27@YELLOW@@ +#O 8@27@MAGENTA@@ +#O 9@27@LWHITE@@ +#O 10@27@DWHITE@@ +#O 11@27@DRED@@ +#O 12@27@DGREEN@@ +#O 13@27@DBLUE@@ +#O 14@27@DCYAN@@ +#O 15@27@DYELLOW@@ +#O 16@27@DMAGENTA@@ +#c 4056@ -- cgit v1.2.3