Added bookmark indicator and SSL/crypto indicator to toolbar.

1 files changed, 93 insertions, 86 deletions

diff --git a/atari/res/netsurf.rsh b/atari/res/netsurf.rsh
index f09644417..8dae1774e 100755
--- a/atari/res/netsurf.rsh
+++ b/atari/res/netsurf.rsh
@@ -1,47 +1,6 @@
  /*  Resource C-Header-File v1.97 f�r ResourceMaster ab v2.06 by ARDISOFT  */

 

-#define MAINMENU 0  /* menu */

-#define MAINMENU_T_FILE 4  /* TITLE in tree MAINMENU */

-#define MAINMENU_T_EDIT 5  /* TITLE in tree MAINMENU */

-#define MAINMENU_T_VIEW 6  /* TITLE in tree MAINMENU */

-#define MAINMENU_T_NAVIGATE 7  /* TITLE in tree MAINMENU */

-#define MAINMENU_T_UTIL 8  /* TITLE in tree MAINMENU */

-#define MAINMENU_T_HELP 9  /* TITLE in tree MAINMENU */

-#define MAINMENU_M_ABOUT 12  /* STRING in tree MAINMENU */

-#define MAINMENU_M_NEWWIN 21  /* STRING in tree MAINMENU */

-#define MAINMENU_M_OPENFILE 22  /* STRING in tree MAINMENU */

-#define MAINMENU_M_OPENURL 23  /* STRING in tree MAINMENU */

-#define MAINMENU_M_CLOSEWIN 24  /* STRING in tree MAINMENU */

-#define MAINMENU_SEP0 25  /* STRING in tree MAINMENU */

-#define MAINMENU_M_SAVEPAGE 26  /* STRING in tree MAINMENU */

-#define MAINMENU_SEP1 27  /* STRING in tree MAINMENU */

-#define MAINMENU_M_QUIT 28  /* STRING in tree MAINMENU */

-#define MAINMENU_M_CUT 30  /* STRING in tree MAINMENU */

-#define MAINMENU_M_COPY 31  /* STRING in tree MAINMENU */

-#define MAINMENU_M_PASTE 32  /* STRING in tree MAINMENU */

-#define MAINMENU_SEP3 33  /* STRING in tree MAINMENU */

-#define MAINMENU_M_FIND 34  /* STRING in tree MAINMENU */

-#define MAINMENU_M_STOP 36  /* STRING in tree MAINMENU */

-#define MAINMENU_M_RELOAD 37  /* STRING in tree MAINMENU */

-#define MAINMENU_M_SCALE 39  /* STRING in tree MAINMENU */

-#define MAINMENU_M_TOOLBARS 41  /* STRING in tree MAINMENU */

-#define MAINMENU_M_SAVEWIN 43  /* STRING in tree MAINMENU */

-#define MAINMENU_M_DEBUG_RENDER 44  /* STRING in tree MAINMENU */

-#define MAINMENU_M_BG_IMAGES 45  /* STRING in tree MAINMENU */

-#define MAINMENU_M_FG_IMAGES 46  /* STRING in tree MAINMENU */

-#define MAINMENU_M_BACK 48  /* STRING in tree MAINMENU */

-#define MAINMENU_M_FORWARD 49  /* STRING in tree MAINMENU */

-#define MAINMENU_M_HOME 50  /* STRING in tree MAINMENU */

-#define MAINMENU_M_LHISTORY 52  /* STRING in tree MAINMENU */

-#define MAINMENU_M_GHISTORY 53  /* STRING in tree MAINMENU */

-#define MAINMENU_M_ADD_BOOKMARK 55  /* STRING in tree MAINMENU */

-#define MAINMENU_M_BOOKMARKS 56  /* STRING in tree MAINMENU */

-#define MAINMENU_M_COOKIES 58  /* STRING in tree MAINMENU */

-#define MAINMENU_M_CHOICES 60  /* STRING in tree MAINMENU */

-#define MAINMENU_M_VLOG 61  /* STRING in tree MAINMENU */

-#define MAINMENU_M_HELP_CONTENT 63  /* STRING in tree MAINMENU */

-

-#define TOOLBAR 1  /* form/dial */

+#define TOOLBAR 0  /* form/dial */

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

 #define TOOLBAR_BT_SEARCH_FWD 2  /* BUTTON in tree TOOLBAR */

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

@@ -51,21 +10,24 @@
 #define TOOLBAR_SEARCH_ALIGN_RIGHT 8  /* IBOX in tree TOOLBAR */

 #define TOOLBAR_BT_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  /* USERDEF in tree TOOLBAR */

-#define TOOLBAR_THROBBER_AREA 18  /* IBOX in tree TOOLBAR */

-

-#define ICONIFY 2  /* form/dial */

+#define TOOLBAR_AREA_URL 11  /* USERDEF in tree TOOLBAR */

+#define TOOLBAR_AREA_RIGHT 12  /* IBOX in tree TOOLBAR */

+#define TOOLBAR_THROBBER_AREA 13  /* IBOX in tree TOOLBAR */

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

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

+#define TOOLBAR_AREA_LEFT 16  /* IBOX in tree TOOLBAR */

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

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

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

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

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

+

+#define ICONIFY 1  /* form/dial */

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

 

-#define FAVICON 3  /* form/dial */

+#define FAVICON 2  /* form/dial */

 

-#define CURSOR 4  /* form/dial */

+#define CURSOR 3  /* form/dial */

 #define CURSOR_HELP 1  /* ICON in tree CURSOR */

 #define CURSOR_NODROP 2  /* ICON in tree CURSOR */

 #define CURSOR_APPSTART 3  /* ICON in tree CURSOR */

@@ -74,21 +36,21 @@
 #define CURSOR_SIZENS 6  /* ICON in tree CURSOR */

 #define CURSOR_MENU 7  /* ICON in tree CURSOR */

 

-#define LOGIN 5  /* form/dial */

+#define LOGIN 4  /* form/dial */

 #define LOGIN_TB_USER 2  /* FTEXT in tree LOGIN */

 #define LOGIN_TB_PASSWORD 4  /* FTEXT in tree LOGIN */

 #define LOGIN_BT_LOGIN 5  /* BUTTON in tree LOGIN */

 #define LOGIN_BT_ABORT 6  /* BUTTON in tree LOGIN */

 

-#define THROBBER 6  /* form/dial */

+#define THROBBER 5  /* form/dial */

 

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

+#define TOOLBAR_HOTLIST 6  /* 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 8  /* form/dial */

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

 #define SEARCH_BT_SEARCH 1  /* BUTTON in tree SEARCH */

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

 #define SEARCH_BT_SEARCH_BACK 3  /* BUTTON in tree SEARCH */

@@ -98,7 +60,7 @@
 #define SEARCH_LBL_CASESENSE 8  /* TEXT in tree SEARCH */

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

 

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

+#define DOWNLOAD 8  /* 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 */

@@ -110,14 +72,14 @@
 #define DOWNLOAD_LBL_SPEED 8  /* TEXT in tree DOWNLOAD */

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

 

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

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

 #define ABOUT_LBL_VERSION 1  /* TEXT in tree ABOUT */

 #define ABOUT_OK 4  /* BUTTON in tree ABOUT */

 #define ABOUT_CONTENT 6  /* USERDEF in tree ABOUT */

 #define ABOUT_CREDITS 7  /* BUTTON in tree ABOUT */

 #define ABOUT_LICENSE 8  /* BUTTON in tree ABOUT */

 

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

+#define POP_CTX 10  /* 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 */

@@ -129,7 +91,7 @@
 #define POP_CTX_VIEW_SOURCE 10  /* TEXT in tree POP_CTX */

 #define POP_CTX_SAVE_LINK_AS 11  /* TEXT in tree POP_CTX */

 

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

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

 #define VSCROLLER_AREA 1  /* BOX in tree VSCROLLER */

 #define VSCROLLER_SLIDER_AREA 2  /* BUTTON in tree VSCROLLER */

 #define VSCROLLER_SLIDER 3  /* BUTTON in tree VSCROLLER */

@@ -138,7 +100,35 @@
 #define VSCROLLER_BT_UP 6  /* IBOX in tree VSCROLLER */

 #define VSCROLLER_BT_UP_PIC 4  /* CICON in tree VSCROLLER */

 

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

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

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

+#define POP_LANGUAGE_DE 2  /* STRING in tree POP_LANGUAGE */

+#define POP_LANGUAGE_EN 3  /* STRING in tree POP_LANGUAGE */

+#define POP_LANGUAGE_EN_GB 4  /* STRING in tree POP_LANGUAGE */

+#define POP_LANGUAGE_DE_DE 5  /* STRING in tree POP_LANGUAGE */

+#define POP_LANGUAGE_EN_US 6  /* STRING in tree POP_LANGUAGE */

+#define POP_LANGUAGE_ES 7  /* STRING in tree POP_LANGUAGE */

+#define POP_LANGUAGE_FR 8  /* STRING in tree POP_LANGUAGE */

+#define POP_LANGUAGE_IT 9  /* STRING in tree POP_LANGUAGE */

+#define POP_LANGUAGE_NL 10  /* STRING in tree POP_LANGUAGE */

+#define POP_LANGUAGE_NO 11  /* STRING in tree POP_LANGUAGE */

+#define POP_LANGUAGE_PL 12  /* STRING in tree POP_LANGUAGE */

+#define POP_LANGUAGE_RU 13  /* STRING in tree POP_LANGUAGE */

+#define POP_LANGUAGE_SK 14  /* STRING in tree POP_LANGUAGE */

+#define POP_LANGUAGE_SV 15  /* STRING in tree POP_LANGUAGE */

+

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

+#define POP_FONT_RENDERER_INTERNAL 1  /* STRING in tree POP_FONT_RENDERER */

+#define POP_FONT_RENDERER_FREETYPE 2  /* STRING in tree POP_FONT_RENDERER */

+

+#define TOOLBAR_COOKIES 14  /* form/dial */

+

+#define TOOLBAR_HISTORY 15  /* form/dial */

+

+#define TOOLBAR_SSL_CERT 16  /* form/dial */

+#define TOOLBAR_SSL_CERT_TRUSTED 1  /* BUTTON in tree TOOLBAR_SSL_CERT */

+

+#define SETTINGS 17  /* form/dial */

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

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

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

@@ -196,26 +186,43 @@
 #define SETTINGS_INC_HISTORY_AGE 91  /* BOXCHAR in tree SETTINGS */

 #define SETTINGS_BT_GUI_TOUT 94  /* BUTTON in tree SETTINGS */

 

-#define POP_LANGUAGE 14  /* form/dial */

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

-#define POP_LANGUAGE_DE 2  /* STRING in tree POP_LANGUAGE */

-#define POP_LANGUAGE_EN 3  /* STRING in tree POP_LANGUAGE */

-#define POP_LANGUAGE_EN_GB 4  /* STRING in tree POP_LANGUAGE */

-#define POP_LANGUAGE_DE_DE 5  /* STRING in tree POP_LANGUAGE */

-#define POP_LANGUAGE_EN_US 6  /* STRING in tree POP_LANGUAGE */

-#define POP_LANGUAGE_ES 7  /* STRING in tree POP_LANGUAGE */

-#define POP_LANGUAGE_FR 8  /* STRING in tree POP_LANGUAGE */

-#define POP_LANGUAGE_IT 9  /* STRING in tree POP_LANGUAGE */

-#define POP_LANGUAGE_NL 10  /* STRING in tree POP_LANGUAGE */

-#define POP_LANGUAGE_NO 11  /* STRING in tree POP_LANGUAGE */

-#define POP_LANGUAGE_PL 12  /* STRING in tree POP_LANGUAGE */

-#define POP_LANGUAGE_RU 13  /* STRING in tree POP_LANGUAGE */

-#define POP_LANGUAGE_SK 14  /* STRING in tree POP_LANGUAGE */

-#define POP_LANGUAGE_SV 15  /* STRING in tree POP_LANGUAGE */

-

-#define TOOLBAR_COOKIES 15  /* form/dial */

-

-#define TOOLBAR_HISTORY 16  /* form/dial */

-

-#define TOOLBAR_SSL_CERT 17  /* form/dial */

-#define TOOLBAR_SSL_CERT_TRUSTED 1  /* BUTTON in tree TOOLBAR_SSL_CERT */

+#define MAINMENU 18  /* menu */

+#define MAINMENU_T_FILE 4  /* TITLE in tree MAINMENU */

+#define MAINMENU_T_EDIT 5  /* TITLE in tree MAINMENU */

+#define MAINMENU_T_VIEW 6  /* TITLE in tree MAINMENU */

+#define MAINMENU_T_NAVIGATE 7  /* TITLE in tree MAINMENU */

+#define MAINMENU_T_UTIL 8  /* TITLE in tree MAINMENU */

+#define MAINMENU_T_HELP 9  /* TITLE in tree MAINMENU */

+#define MAINMENU_M_ABOUT 12  /* STRING in tree MAINMENU */

+#define MAINMENU_M_NEWWIN 21  /* STRING in tree MAINMENU */

+#define MAINMENU_M_OPENFILE 22  /* STRING in tree MAINMENU */

+#define MAINMENU_M_OPENURL 23  /* STRING in tree MAINMENU */

+#define MAINMENU_M_CLOSEWIN 24  /* STRING in tree MAINMENU */

+#define MAINMENU_SEP0 25  /* STRING in tree MAINMENU */

+#define MAINMENU_M_SAVEPAGE 26  /* STRING in tree MAINMENU */

+#define MAINMENU_SEP1 27  /* STRING in tree MAINMENU */

+#define MAINMENU_M_QUIT 28  /* STRING in tree MAINMENU */

+#define MAINMENU_M_CUT 30  /* STRING in tree MAINMENU */

+#define MAINMENU_M_COPY 31  /* STRING in tree MAINMENU */

+#define MAINMENU_M_PASTE 32  /* STRING in tree MAINMENU */

+#define MAINMENU_SEP3 33  /* STRING in tree MAINMENU */

+#define MAINMENU_M_FIND 34  /* STRING in tree MAINMENU */

+#define MAINMENU_M_STOP 36  /* STRING in tree MAINMENU */

+#define MAINMENU_M_RELOAD 37  /* STRING in tree MAINMENU */

+#define MAINMENU_M_SCALE 39  /* STRING in tree MAINMENU */

+#define MAINMENU_M_TOOLBARS 41  /* STRING in tree MAINMENU */

+#define MAINMENU_M_SAVEWIN 43  /* STRING in tree MAINMENU */

+#define MAINMENU_M_DEBUG_RENDER 44  /* STRING in tree MAINMENU */

+#define MAINMENU_M_BG_IMAGES 45  /* STRING in tree MAINMENU */

+#define MAINMENU_M_FG_IMAGES 46  /* STRING in tree MAINMENU */

+#define MAINMENU_M_BACK 48  /* STRING in tree MAINMENU */

+#define MAINMENU_M_FORWARD 49  /* STRING in tree MAINMENU */

+#define MAINMENU_M_HOME 50  /* STRING in tree MAINMENU */

+#define MAINMENU_M_LHISTORY 52  /* STRING in tree MAINMENU */

+#define MAINMENU_M_GHISTORY 53  /* STRING in tree MAINMENU */

+#define MAINMENU_M_ADD_BOOKMARK 55  /* STRING in tree MAINMENU */

+#define MAINMENU_M_BOOKMARKS 56  /* STRING in tree MAINMENU */

+#define MAINMENU_M_COOKIES 58  /* STRING in tree MAINMENU */

+#define MAINMENU_M_CHOICES 60  /* STRING in tree MAINMENU */

+#define MAINMENU_M_VLOG 61  /* STRING in tree MAINMENU */

+#define MAINMENU_M_HELP_CONTENT 63  /* STRING in tree MAINMENU */