Make toolbar height configurable,

started to use extended AES Object types.

1 files changed, 73 insertions, 81 deletions

diff --git a/atari/res/netsurf.rsh b/atari/res/netsurf.rsh
index 39b98ed3b..5ab368212 100755
--- a/atari/res/netsurf.rsh
+++ b/atari/res/netsurf.rsh
@@ -41,25 +41,23 @@
 #define MAINMENU_M_HELP_CONTENT 61  /* STRING in tree MAINMENU */

 

 #define TOOLBAR 1  /* form/dial */

-#define TOOLBAR_AREA_SEARCH 9  /* BOX in tree TOOLBAR */

-#define TOOLBAR_BT_SEARCH 10  /* BUTTON in tree TOOLBAR */

-#define TOOLBAR_BT_SEARCH_BACK 12  /* BUTTON in tree TOOLBAR */

-#define TOOLBAR_CB_CASESENSE 14  /* BOXCHAR in tree TOOLBAR */

-#define TOOLBAR_CB_SHOWALL 15  /* BOXCHAR in tree TOOLBAR */

-#define TOOLBAR_LBL_SHOWALL 16  /* STRING in tree TOOLBAR */

-#define TOOLBAR_LBL_CASESENSE 17  /* TEXT in tree TOOLBAR */

-#define TOOLBAR_TB_SRCH 18  /* FTEXT in tree TOOLBAR */

-#define TOOLBAR_SEARCH_ALIGN_RIGHT 20  /* IBOX in tree TOOLBAR */

-#define TOOLBAR_CLOSE_SEARCH 11  /* BUTTON in tree TOOLBAR */

-#define TOOLBAR_AREA_NAVIGATION 19  /* BOX in tree TOOLBAR */

-#define TOOLBAR_AREA_BUTTONS 1  /* IBOX in tree TOOLBAR */

-#define TOOLBAR_BT_BACK 2  /* CICON in tree TOOLBAR */

-#define TOOLBAR_BT_HOME 3  /* CICON in tree TOOLBAR */

-#define TOOLBAR_BT_FORWARD 4  /* CICON in tree TOOLBAR */

-#define TOOLBAR_BT_STOP 5  /* CICON in tree TOOLBAR */

-#define TOOLBAR_BT_RELOAD 6  /* CICON in tree TOOLBAR */

-#define TOOLBAR_AREA_URL 7  /* BOX in tree TOOLBAR */

-#define TOOLBAR_THROBBER_AREA 8  /* BOX in tree TOOLBAR */

+#define TOOLBAR_AREA_SEARCH 1  /* BOX in tree TOOLBAR */

+#define TOOLBAR_BT_SEARCH 2  /* BUTTON in tree TOOLBAR */

+#define TOOLBAR_BT_SEARCH_BACK 3  /* BUTTON in tree TOOLBAR */

+#define TOOLBAR_CB_CASESENSE 5  /* BUTTON in tree TOOLBAR */

+#define TOOLBAR_CB_SHOWALL 6  /* BUTTON in tree TOOLBAR */

+#define TOOLBAR_TB_SRCH 7  /* FTEXT in tree TOOLBAR */

+#define TOOLBAR_SEARCH_ALIGN_RIGHT 8  /* IBOX in tree TOOLBAR */

+#define TOOLBAR_CLOSE_SEARCH 9  /* BUTTON in tree TOOLBAR */

+#define TOOLBAR_AREA_NAVIGATION 10  /* BOX in tree TOOLBAR */

+#define TOOLBAR_AREA_BUTTONS 11  /* IBOX in tree TOOLBAR */

+#define TOOLBAR_BT_BACK 12  /* CICON in tree TOOLBAR */

+#define TOOLBAR_BT_HOME 13  /* CICON in tree TOOLBAR */

+#define TOOLBAR_BT_FORWARD 14  /* CICON in tree TOOLBAR */

+#define TOOLBAR_BT_STOP 15  /* CICON in tree TOOLBAR */

+#define TOOLBAR_BT_RELOAD 16  /* CICON in tree TOOLBAR */

+#define TOOLBAR_AREA_URL 17  /* BOX in tree TOOLBAR */

+#define TOOLBAR_THROBBER_AREA 18  /* BOX in tree TOOLBAR */

 

 #define ICONIFY 2  /* form/dial */

 #define ICONIFY_GLOBE 1  /* CICON in tree ICONIFY */

@@ -137,69 +135,63 @@
 #define SETTINGS 13  /* form/dial */

 #define SETTINGS_SAVE 1  /* BUTTON in tree SETTINGS */

 #define SETTINGS_ABORT 2  /* BUTTON in tree SETTINGS */

-#define SETTINGS_GROUP_BROWSER 3  /* IBOX in tree SETTINGS */

-#define SETTINGS_EDIT_HOMEPAGE 5  /* FTEXT in tree SETTINGS */

-#define SETTINGS_LBL_CB_HIDE_ADVERTISEMENT 6  /* STRING in tree SETTINGS */

-#define SETTINGS_LBL_CB_DISABLE_POPUP_WINDOWS 7  /* STRING in tree SETTINGS */

-#define SETTINGS_CB_HIDE_ADVERTISEMENT 8  /* BOXCHAR in tree SETTINGS */

-#define SETTINGS_CB_DISABLE_POPUP_WINDOWS 9  /* BOXCHAR in tree SETTINGS */

-#define SETTINGS_LBL_CB_SEND_HTTP_REFERRER 10  /* STRING in tree SETTINGS */

-#define SETTINGS_CB_SEND_HTTP_REFERRER 11  /* BOXCHAR in tree SETTINGS */

-#define SETTINGS_LBL_CB_SEND_DO_NOT_TRACK 12  /* STRING in tree SETTINGS */

-#define SETTINGS_CB_SEND_DO_NOT_TRACK 13  /* BOXCHAR in tree SETTINGS */

-#define SETTINGS_BT_CLEAR_HISTORY 15  /* BUTTON in tree SETTINGS */

-#define SETTINGS_BT_SEL_LOCALE 17  /* BUTTON in tree SETTINGS */

-#define SETTINGS_BT_GUI_LANG 19  /* BUTTON in tree SETTINGS */

-#define SETTINGS_INC_MEM_CACHE 22  /* BOXCHAR in tree SETTINGS */

-#define SETTINGS_DEC_MEM_CACHE 23  /* BOXCHAR in tree SETTINGS */

-#define SETTINGS_STR_MAX_MEM_CACHE 24  /* STRING in tree SETTINGS */

-#define SETTINGS_DEC_HISTORY_AGE 27  /* BOXCHAR in tree SETTINGS */

-#define SETTINGS_EDIT_HISTORY_AGE 28  /* FTEXT in tree SETTINGS */

-#define SETTINGS_INC_HISTORY_AGE 29  /* BOXCHAR in tree SETTINGS */

-#define SETTINGS_GROUP_NETWORK 32  /* IBOX in tree SETTINGS */

-#define SETTINGS_CB_USE_PROXY 34  /* BOXCHAR in tree SETTINGS */

-#define SETTINGS_LBL_USE_PROXY 35  /* STRING in tree SETTINGS */

-#define SETTINGS_EDIT_PROXY_HOST 36  /* FTEXT in tree SETTINGS */

-#define SETTINGS_EDIT_PROXY_PORT 38  /* FTEXT in tree SETTINGS */

-#define SETTINGS_CB_PROXY_AUTH 39  /* BOXCHAR in tree SETTINGS */

-#define SETTINGS_LBL_PROXY_AUTH 40  /* STRING in tree SETTINGS */

-#define SETTINGS_EDIT_PROXY_USERNAME 41  /* FTEXT in tree SETTINGS */

-#define SETTINGS_EDIT_PROXY_PASSWORD 42  /* FTEXT in tree SETTINGS */

-#define SETTINGS_EDIT_MAX_FETCHERS 47  /* FTEXT in tree SETTINGS */

-#define SETTINGS_INC_MAX_FETCHERS 48  /* BOXCHAR in tree SETTINGS */

-#define SETTINGS_DEC_MAX_FETCHERS 49  /* BOXCHAR in tree SETTINGS */

-#define SETTINGS_DEC_MAX_FETCHERS_PER_HOST 51  /* BOXCHAR in tree SETTINGS */

-#define SETTINGS_EDIT_MAX_FETCHERS_PER_HOST 52  /* FTEXT in tree SETTINGS */

-#define SETTINGS_INC_MAX_FETCHERS_PER_HOST 53  /* BOXCHAR in tree SETTINGS */

-#define SETTINGS_DEC_CACHED_CONNECTIONS 55  /* BOXCHAR in tree SETTINGS */

-#define SETTINGS_EDIT_MAX_CACHED_CONNECTIONS 56  /* FTEXT in tree SETTINGS */

-#define SETTINGS_INC_CACHED_CONNECTIONS 57  /* BOXCHAR in tree SETTINGS */

-#define SETTINGS_GROUP_RENDERING 59  /* IBOX in tree SETTINGS */

+#define SETTINGS_EDIT_DOWNLOAD_PATH 5  /* FTEXT in tree SETTINGS */

+#define SETTINGS_EDIT_HOTLIST_FILE 6  /* FTEXT in tree SETTINGS */

+#define SETTINGS_EDIT_CA_BUNDLE 7  /* FTEXT in tree SETTINGS */

+#define SETTINGS_EDIT_CA_CERTS_PATH 8  /* FTEXT in tree SETTINGS */

+#define SETTINGS_EDIT_EDITOR 9  /* FTEXT in tree SETTINGS */

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

-#define SETTINGS_BT_SEL_FONT_RENDERER 62  /* BUTTON in tree SETTINGS */

-#define SETTINGS_CB_ANTI_ALIASING 63  /* BOXCHAR in tree SETTINGS */

-#define SETTINGS_CB_TRANSPARENCY 65  /* BOXCHAR in tree SETTINGS */

-#define SETTINGS_EDIT_DEF_FONT_SIZE 77  /* FTEXT in tree SETTINGS */

-#define SETTINGS_DEC_DEF_FONT_SIZE 78  /* BOXCHAR in tree SETTINGS */

-#define SETTINGS_INC_DEF_FONT_SIZE 79  /* BOXCHAR in tree SETTINGS */

-#define SETTINGS_EDIT_MIN_FONT_SIZE 81  /* FTEXT in tree SETTINGS */

-#define SETTINGS_DEC_MIN_FONT_SIZE 82  /* BOXCHAR in tree SETTINGS */

-#define SETTINGS_INC_MIN_FONT_SIZE 83  /* BOXCHAR in tree SETTINGS */

-#define SETTINGS_EDIT_MIN_GIF_DELAY 72  /* FTEXT in tree SETTINGS */

-#define SETTINGS_INC_GIF_DELAY 73  /* BOXCHAR in tree SETTINGS */

-#define SETTINGS_DEC_GIF_DELAY 74  /* BOXCHAR in tree SETTINGS */

-#define SETTINGS_CB_ENABLE_ANIMATION 67  /* BOXCHAR in tree SETTINGS */

-#define SETTINGS_CB_BG_IMAGES 102  /* BOXCHAR in tree SETTINGS */

-#define SETTINGS_CB_FG_IMAGES 105  /* BOXCHAR in tree SETTINGS */

-#define SETTINGS_EDIT_MIN_REFLOW_PERIOD 109  /* FTEXT in tree SETTINGS */

-#define SETTINGS_DEC_INCREMENTAL_REFLOW 110  /* BOXCHAR in tree SETTINGS */

-#define SETTINGS_INC_INCREMENTAL_REFLOW 111  /* BOXCHAR in tree SETTINGS */

-#define SETTINGS_GROUP_RENDERING_00 86  /* IBOX in tree SETTINGS */

-#define SETTINGS_EDIT_DOWNLOAD_PATH 90  /* FTEXT in tree SETTINGS */

-#define SETTINGS_EDIT_HOTLIST_FILE 91  /* FTEXT in tree SETTINGS */

-#define SETTINGS_EDIT_CA_BUNDLE 92  /* FTEXT in tree SETTINGS */

-#define SETTINGS_EDIT_CA_CERTS_PATH 93  /* FTEXT in tree SETTINGS */

-#define SETTINGS_EDIT_EDITOR 94  /* FTEXT in tree SETTINGS */

+#define SETTINGS_BT_SEL_FONT_RENDERER 16  /* BUTTON in tree SETTINGS */

+#define SETTINGS_CB_ANTI_ALIASING 17  /* BOXCHAR in tree SETTINGS */

+#define SETTINGS_CB_TRANSPARENCY 19  /* BOXCHAR in tree SETTINGS */

+#define SETTINGS_EDIT_DEF_FONT_SIZE 23  /* FTEXT in tree SETTINGS */

+#define SETTINGS_DEC_DEF_FONT_SIZE 24  /* BOXCHAR in tree SETTINGS */

+#define SETTINGS_INC_DEF_FONT_SIZE 25  /* BOXCHAR in tree SETTINGS */

+#define SETTINGS_EDIT_MIN_FONT_SIZE 27  /* FTEXT in tree SETTINGS */

+#define SETTINGS_DEC_MIN_FONT_SIZE 28  /* BOXCHAR in tree SETTINGS */

+#define SETTINGS_INC_MIN_FONT_SIZE 29  /* BOXCHAR in tree SETTINGS */

+#define SETTINGS_EDIT_MIN_GIF_DELAY 34  /* FTEXT in tree SETTINGS */

+#define SETTINGS_INC_GIF_DELAY 35  /* BOXCHAR in tree SETTINGS */

+#define SETTINGS_DEC_GIF_DELAY 36  /* BOXCHAR in tree SETTINGS */

+#define SETTINGS_CB_ENABLE_ANIMATION 39  /* BOXCHAR in tree SETTINGS */

+#define SETTINGS_CB_BG_IMAGES 42  /* BOXCHAR in tree SETTINGS */

+#define SETTINGS_CB_FG_IMAGES 45  /* BOXCHAR in tree SETTINGS */

+#define SETTINGS_EDIT_MIN_REFLOW_PERIOD 49  /* FTEXT in tree SETTINGS */

+#define SETTINGS_DEC_INCREMENTAL_REFLOW 50  /* BOXCHAR in tree SETTINGS */

+#define SETTINGS_INC_INCREMENTAL_REFLOW 51  /* BOXCHAR in tree SETTINGS */

+#define SETTINGS_CB_USE_PROXY 53  /* BOXCHAR in tree SETTINGS */

+#define SETTINGS_LBL_USE_PROXY 54  /* STRING in tree SETTINGS */

+#define SETTINGS_EDIT_PROXY_HOST 55  /* FTEXT in tree SETTINGS */

+#define SETTINGS_EDIT_PROXY_PORT 57  /* FTEXT in tree SETTINGS */

+#define SETTINGS_CB_PROXY_AUTH 58  /* BOXCHAR in tree SETTINGS */

+#define SETTINGS_LBL_PROXY_AUTH 59  /* STRING in tree SETTINGS */

+#define SETTINGS_EDIT_PROXY_USERNAME 60  /* FTEXT in tree SETTINGS */

+#define SETTINGS_EDIT_PROXY_PASSWORD 61  /* FTEXT in tree SETTINGS */

+#define SETTINGS_EDIT_MAX_FETCHERS 66  /* FTEXT in tree SETTINGS */

+#define SETTINGS_INC_MAX_FETCHERS 67  /* BOXCHAR in tree SETTINGS */

+#define SETTINGS_DEC_MAX_FETCHERS 68  /* BOXCHAR in tree SETTINGS */

+#define SETTINGS_DEC_MAX_FETCHERS_PER_HOST 70  /* BOXCHAR in tree SETTINGS */

+#define SETTINGS_EDIT_MAX_FETCHERS_PER_HOST 71  /* FTEXT in tree SETTINGS */

+#define SETTINGS_INC_MAX_FETCHERS_PER_HOST 72  /* BOXCHAR in tree SETTINGS */

+#define SETTINGS_DEC_CACHED_CONNECTIONS 74  /* BOXCHAR in tree SETTINGS */

+#define SETTINGS_EDIT_MAX_CACHED_CONNECTIONS 75  /* FTEXT in tree SETTINGS */

+#define SETTINGS_INC_CACHED_CONNECTIONS 76  /* BOXCHAR in tree SETTINGS */

+#define SETTINGS_EDIT_HOMEPAGE 78  /* FTEXT in tree SETTINGS */

+#define SETTINGS_CB_HIDE_ADVERTISEMENT 79  /* BUTTON in tree SETTINGS */

+#define SETTINGS_CB_DISABLE_POPUP_WINDOWS 80  /* BUTTON in tree SETTINGS */

+#define SETTINGS_LBL_CB_SEND_HTTP_REFERRER 81  /* STRING in tree SETTINGS */

+#define SETTINGS_CB_SEND_HTTP_REFERRER 82  /* BOXCHAR in tree SETTINGS */

+#define SETTINGS_LBL_CB_SEND_DO_NOT_TRACK 83  /* STRING in tree SETTINGS */

+#define SETTINGS_CB_SEND_DO_NOT_TRACK 84  /* BOXCHAR in tree SETTINGS */

+#define SETTINGS_BT_CLEAR_HISTORY 86  /* BUTTON in tree SETTINGS */

+#define SETTINGS_BT_SEL_LOCALE 88  /* BUTTON in tree SETTINGS */

+#define SETTINGS_BT_GUI_LANG 90  /* BUTTON in tree SETTINGS */

+#define SETTINGS_INC_MEM_CACHE 93  /* BOXCHAR in tree SETTINGS */

+#define SETTINGS_DEC_MEM_CACHE 94  /* BOXCHAR in tree SETTINGS */

+#define SETTINGS_STR_MAX_MEM_CACHE 95  /* STRING in tree SETTINGS */

+#define SETTINGS_DEC_HISTORY_AGE 98  /* BOXCHAR in tree SETTINGS */

+#define SETTINGS_EDIT_HISTORY_AGE 99  /* FTEXT in tree SETTINGS */

+#define SETTINGS_INC_HISTORY_AGE 100  /* BOXCHAR in tree SETTINGS */

 

 #define POP_LANGUAGE 14  /* form/dial */

 #define POP_LANGUAGE_CS 1  /* STRING in tree POP_LANGUAGE */