Implemented a new colour picker.

This colour picker allows to select the 216 web colors
plus 15 shades of gray. Removed the color popup from
the resource file.

3 files changed, 115 insertions, 150 deletions

diff --git a/atari/res/netsurf.rsc b/atari/res/netsurf.rsc
index 9f3963080..de493636b 100755
--- a/atari/res/netsurf.rsc
+++ b/atari/res/netsurf.rsc
diff --git a/atari/res/netsurf.rsh b/atari/res/netsurf.rsh
index e099c953f..3c2353ede 100755
--- a/atari/res/netsurf.rsh
+++ b/atari/res/netsurf.rsh
@@ -140,78 +140,60 @@
 #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_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 */

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

+#define CHOICES_INPUT_TOOLBAR_BGCOLOR 24  /* FTEXT in tree CHOICES */

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

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

-#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 */

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

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

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

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

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

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

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

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

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

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

+#define CHOICES_CB_ANTI_ALIASING 43  /* BUTTON in tree CHOICES */

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

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

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

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

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

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

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

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

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

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

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

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

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

+#define CHOICES_CB_SEND_DO_NOT_TRACK 66  /* BUTTON in tree CHOICES */

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

+#define CHOICES_CB_FG_IMAGES 106  /* BUTTON in tree CHOICES */

+#define CHOICES_CB_BG_IMAGES 107  /* BUTTON in tree CHOICES */

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

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

diff --git a/atari/res/netsurf.rsm b/atari/res/netsurf.rsm
index cfbb152cb..67af68f5c 100755
--- a/atari/res/netsurf.rsm
+++ b/atari/res/netsurf.rsm
@@ -1,9 +1,9 @@
 ResourceMaster v3.65   

-#C 15@0@0@0@

+#C 14@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@602@

+#M 20010100@0@7728@603@

 #T 0@1@MAINMENU@@62@@

 #O 4@32@T_FILE@@

 #O 5@32@T_EDIT@@

@@ -131,77 +131,60 @@ 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 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@

+#O 22@26@BT_TOOLBAR_ICONSET@@

+#O 24@29@INPUT_TOOLBAR_BGCOLOR@@

+#O 25@26@TAB_RENDER@@

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

+#O 28@26@CB_TRANSPARENCY@@

+#O 30@26@CB_ENABLE_ANIMATION@@

+#O 33@29@EDIT_MIN_GIF_DELAY@@

+#O 34@27@DEC_GIF_DELAY@@

+#O 35@27@INC_GIF_DELAY@@

+#O 37@26@CB_INCREMENTAL_REFLOW@@

+#O 39@29@EDIT_MIN_REFLOW_PERIOD@@

+#O 40@27@DEC_INCREMENTAL_REFLOW@@

+#O 41@27@INC_INCREMENTAL_REFLOW@@

+#O 43@26@CB_ANTI_ALIASING@@

+#O 44@26@TAB_PATH@@

+#O 49@29@EDIT_CA_CERTS_PATH@@

+#O 50@29@EDIT_DOWNLOAD_PATH@@

+#O 51@29@EDIT_HOTLIST_FILE@@

+#O 52@29@EDIT_CA_BUNDLE@@

+#O 53@29@EDIT_EDITOR@@

+#O 55@26@TAB_CACHE@@

+#O 59@27@INC_MEM_CACHE@@

+#O 60@27@DEC_MEM_CACHE@@

+#O 61@28@STR_MAX_MEM_CACHE@@

+#O 62@26@TAB_BROWSER@@

+#O 64@26@CB_HIDE_ADVERTISEMENT@@

+#O 65@26@CB_DISABLE_POPUP_WINDOWS@@

+#O 66@26@CB_SEND_DO_NOT_TRACK@@

+#O 68@26@BT_SEL_LOCALE@@

+#O 71@26@BT_GUI_LANG@@

+#O 74@29@EDIT_HISTORY_AGE@@

+#O 75@27@DEC_HISTORY_AGE@@

+#O 76@27@INC_HISTORY_AGE@@

+#O 80@26@CB_SEND_HTTP_REFERRER@@

+#O 81@29@EDIT_HOMEPAGE@@

+#O 82@26@BT_CLEAR_HISTORY@@

+#O 83@26@TAB_NETWORK@@

+#O 85@26@CB_USE_PROXY@@

+#O 86@29@EDIT_PROXY_HOST@@

+#O 87@26@CB_PROXY_AUTH@@

+#O 88@29@EDIT_PROXY_USERNAME@@

+#O 89@29@EDIT_PROXY_PASSWORD@@

+#O 91@29@EDIT_PROXY_PORT@@

+#O 96@27@INC_MAX_FETCHERS_PER_HOST@@

+#O 97@27@INC_CACHED_CONNECTIONS@@

+#O 98@27@DEC_MAX_FETCHERS_PER_HOST@@

+#O 99@27@DEC_CACHED_CONNECTIONS@@

+#O 100@29@EDIT_MAX_FETCHERS_PER_HOST@@

+#O 101@29@EDIT_MAX_CACHED_CONNECTIONS@@

+#O 103@29@EDIT_MAX_FETCHERS@@

+#O 104@27@DEC_MAX_FETCHERS@@

+#O 105@27@INC_MAX_FETCHERS@@

+#O 106@26@CB_FG_IMAGES@@

+#O 107@26@CB_BG_IMAGES@@

+#O 108@26@ABORT@@

+#O 109@26@OK@@

+#c 31683@