Added bookmark indicator and SSL/crypto indicator to toolbar.

4 files changed, 333 insertions, 198 deletions

diff --git a/atari/res/netsurf.rsc b/atari/res/netsurf.rsc
index 1a30eef9f..0076e3322 100755
--- a/atari/res/netsurf.rsc
+++ b/atari/res/netsurf.rsc
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 */

diff --git a/atari/res/netsurf.rsm b/atari/res/netsurf.rsm
index 5fc190968..c3a7a64da 100755
--- a/atari/res/netsurf.rsm
+++ b/atari/res/netsurf.rsm
@@ -1,50 +1,10 @@
 ResourceMaster v3.65   

-#C 18@0@0@0@

+#C 19@0@0@0@

 #N 99@32@AZAaza___  _@AZAaza090___  _@@_@

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

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

-#M 20010100@0@7728@656@

-#T 0@1@MAINMENU@@64@@

-#O 4@32@T_FILE@@

-#O 5@32@T_EDIT@@

-#O 6@32@T_VIEW@@

-#O 7@32@T_NAVIGATE@@

-#O 8@32@T_UTIL@@

-#O 9@32@T_HELP@@

-#O 12@28@M_ABOUT@@

-#O 21@28@M_NEWWIN@@

-#O 22@28@M_OPENFILE@@

-#O 23@28@M_OPENURL@@

-#O 24@28@M_CLOSEWIN@@

-#O 25@28@SEP0@@

-#O 26@28@M_SAVEPAGE@@

-#O 27@28@SEP1@@

-#O 28@28@M_QUIT@@

-#O 30@28@M_CUT@@

-#O 31@28@M_COPY@@

-#O 32@28@M_PASTE@@

-#O 33@28@SEP3@@

-#O 34@28@M_FIND@@

-#O 36@28@M_STOP@@

-#O 37@28@M_RELOAD@@

-#O 39@28@M_SCALE@@

-#O 41@28@M_TOOLBARS@@

-#O 43@28@M_SAVEWIN@@

-#O 44@28@M_DEBUG_RENDER@@

-#O 45@28@M_BG_IMAGES@@

-#O 46@28@M_FG_IMAGES@@

-#O 48@28@M_BACK@@

-#O 49@28@M_FORWARD@@

-#O 50@28@M_HOME@@

-#O 52@28@M_LHISTORY@@

-#O 53@28@M_GHISTORY@@

-#O 55@28@M_ADD_BOOKMARK@@

-#O 56@28@M_BOOKMARKS@@

-#O 58@28@M_COOKIES@@

-#O 60@28@M_CHOICES@@

-#O 61@28@M_VLOG@@

-#O 63@28@M_HELP_CONTENT@@

-#T 1@2@TOOLBAR@@19@@

+#M 11100100@0@7728@659@

+#T 0@2@TOOLBAR@@22@@

 #O 1@20@AREA_SEARCH@@

 #O 2@26@BT_SEARCH_FWD@@

 #O 3@26@BT_SEARCH_BACK@@

@@ -54,18 +14,21 @@ ResourceMaster v3.65
 #O 8@25@SEARCH_ALIGN_RIGHT@@

 #O 9@26@BT_CLOSE_SEARCH@@

 #O 10@20@AREA_NAVIGATION@@

-#O 11@25@AREA_BUTTONS@@

-#O 12@33@BT_BACK@@

-#O 13@33@BT_HOME@@

-#O 14@33@BT_FORWARD@@

-#O 15@33@BT_STOP@@

-#O 16@33@BT_RELOAD@@

-#O 17@24@AREA_URL@@

-#O 18@25@THROBBER_AREA@@

-#T 2@2@ICONIFY@@3@@

+#O 11@24@AREA_URL@@

+#O 12@25@AREA_RIGHT@@

+#O 13@25@THROBBER_AREA@@

+#O 14@33@BT_CRYPTO@@

+#O 15@33@BT_FAVORITE@@

+#O 16@25@AREA_LEFT@@

+#O 17@33@BT_BACK@@

+#O 18@33@BT_HOME@@

+#O 19@33@BT_FORWARD@@

+#O 20@33@BT_STOP@@

+#O 21@33@BT_RELOAD@@

+#T 1@2@ICONIFY@@3@@

 #O 1@33@GLOBE@@

-#T 3@2@FAVICON@@2@@

-#T 4@2@CURSOR@@8@@

+#T 2@2@FAVICON@@2@@

+#T 3@2@CURSOR@@8@@

 #O 1@31@HELP@@

 #O 2@31@NODROP@@

 #O 3@31@APPSTART@@

@@ -73,18 +36,18 @@ ResourceMaster v3.65
 #O 5@31@SIZEWE@@

 #O 6@31@SIZENS@@

 #O 7@31@MENU@@

-#T 5@2@LOGIN@@7@@

+#T 4@2@LOGIN@@7@@

 #O 2@29@TB_USER@@

 #O 4@29@TB_PASSWORD@@

 #O 5@26@BT_LOGIN@@

 #O 6@26@BT_ABORT@@

-#T 6@2@THROBBER@@14@@

-#T 7@2@TOOLBAR_HOTLIST@@5@@

+#T 5@2@THROBBER@@14@@

+#T 6@2@TOOLBAR_HOTLIST@@5@@

 #O 1@33@ADD@@

 #O 2@33@CREATE_FOLDER@@

 #O 3@33@DELETE@@

 #O 4@33@EDIT@@

-#T 8@2@SEARCH@@10@@

+#T 7@2@SEARCH@@10@@

 #O 1@26@BT_SEARCH@@

 #O 2@26@CB_FWD@@

 #O 3@26@BT_SEARCH_BACK@@

@@ -93,7 +56,7 @@ ResourceMaster v3.65
 #O 7@28@LBL_SHOWALL@@

 #O 8@21@LBL_CASESENSE@@

 #O 9@29@TB_SRCH@@

-#T 9@2@DOWNLOAD@@10@@

+#T 8@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@@

@@ -103,13 +66,13 @@ ResourceMaster v3.65
 #O 7@21@LBL_PERCENT@@

 #O 8@21@LBL_SPEED@@

 #O 9@27@CB_CLOSE_RDY@@

-#T 10@2@ABOUT@@9@@

+#T 9@2@ABOUT@@9@@

 #O 1@21@LBL_VERSION@@

 #O 4@26@OK@@

 #O 6@24@CONTENT@@

 #O 7@26@CREDITS@@

 #O 8@26@LICENSE@@

-#T 11@2@POP_CTX@@12@@

+#T 10@2@POP_CTX@@12@@

 #O 1@21@CUT_SEL@@

 #O 2@21@COPY_SEL@@

 #O 3@21@PASTE_SEL@@

@@ -120,7 +83,7 @@ ResourceMaster v3.65
 #O 9@21@SAVE_AS@@

 #O 10@21@VIEW_SOURCE@@

 #O 11@21@SAVE_LINK_AS@@

-#T 12@2@VSCROLLER@@8@@

+#T 11@2@VSCROLLER@@8@@

 #O 1@20@AREA@@

 #O 2@26@SLIDER_AREA@@

 #O 3@26@SLIDER@@

@@ -128,7 +91,30 @@ ResourceMaster v3.65
 #O 5@33@BT_DOWN_PIC@@

 #O 6@25@BT_UP@@

 #O 4@33@BT_UP_PIC@@

-#T 13@2@SETTINGS@@96@@

+#T 12@2@POP_LANGUAGE@@16@@

+#O 1@28@CS@@

+#O 2@28@DE@@

+#O 3@28@EN@@

+#O 4@28@EN_GB@@

+#O 5@28@DE_DE@@

+#O 6@28@EN_US@@

+#O 7@28@ES@@

+#O 8@28@FR@@

+#O 9@28@IT@@

+#O 10@28@NL@@

+#O 11@28@NO@@

+#O 12@28@PL@@

+#O 13@28@RU@@

+#O 14@28@SK@@

+#O 15@28@SV@@

+#T 13@2@POP_FONT_RENDERER@@3@@

+#O 1@28@INTERNAL@@

+#O 2@28@FREETYPE@@

+#T 14@2@TOOLBAR_COOKIES@@1@@

+#T 15@2@TOOLBAR_HISTORY@@1@@

+#T 16@2@TOOLBAR_SSL_CERT@@2@@

+#O 1@26@TRUSTED@@

+#T 17@2@SETTINGS@@96@@

 #O 1@26@SAVE@@

 #O 2@26@ABORT@@

 #O 5@29@EDIT_DOWNLOAD_PATH@@

@@ -184,24 +170,44 @@ ResourceMaster v3.65
 #O 90@29@EDIT_HISTORY_AGE@@

 #O 91@27@INC_HISTORY_AGE@@

 #O 94@26@BT_GUI_TOUT@@

-#T 14@2@POP_LANGUAGE@@16@@

-#O 1@28@CS@@

-#O 2@28@DE@@

-#O 3@28@EN@@

-#O 4@28@EN_GB@@

-#O 5@28@DE_DE@@

-#O 6@28@EN_US@@

-#O 7@28@ES@@

-#O 8@28@FR@@

-#O 9@28@IT@@

-#O 10@28@NL@@

-#O 11@28@NO@@

-#O 12@28@PL@@

-#O 13@28@RU@@

-#O 14@28@SK@@

-#O 15@28@SV@@

-#T 15@2@TOOLBAR_COOKIES@@1@@

-#T 16@2@TOOLBAR_HISTORY@@1@@

-#T 17@2@TOOLBAR_SSL_CERT@@2@@

-#O 1@26@TRUSTED@@

-#c 29167@

+#T 18@1@MAINMENU@@64@@

+#O 4@32@T_FILE@@

+#O 5@32@T_EDIT@@

+#O 6@32@T_VIEW@@

+#O 7@32@T_NAVIGATE@@

+#O 8@32@T_UTIL@@

+#O 9@32@T_HELP@@

+#O 12@28@M_ABOUT@@

+#O 21@28@M_NEWWIN@@

+#O 22@28@M_OPENFILE@@

+#O 23@28@M_OPENURL@@

+#O 24@28@M_CLOSEWIN@@

+#O 25@28@SEP0@@

+#O 26@28@M_SAVEPAGE@@

+#O 27@28@SEP1@@

+#O 28@28@M_QUIT@@

+#O 30@28@M_CUT@@

+#O 31@28@M_COPY@@

+#O 32@28@M_PASTE@@

+#O 33@28@SEP3@@

+#O 34@28@M_FIND@@

+#O 36@28@M_STOP@@

+#O 37@28@M_RELOAD@@

+#O 39@28@M_SCALE@@

+#O 41@28@M_TOOLBARS@@

+#O 43@28@M_SAVEWIN@@

+#O 44@28@M_DEBUG_RENDER@@

+#O 45@28@M_BG_IMAGES@@

+#O 46@28@M_FG_IMAGES@@

+#O 48@28@M_BACK@@

+#O 49@28@M_FORWARD@@

+#O 50@28@M_HOME@@

+#O 52@28@M_LHISTORY@@

+#O 53@28@M_GHISTORY@@

+#O 55@28@M_ADD_BOOKMARK@@

+#O 56@28@M_BOOKMARKS@@

+#O 58@28@M_COOKIES@@

+#O 60@28@M_CHOICES@@

+#O 61@28@M_VLOG@@

+#O 63@28@M_HELP_CONTENT@@

+#c 20589@

diff --git a/atari/toolbar.c b/atari/toolbar.c
index 4a63787ec..9a3412ebd 100644
--- a/atari/toolbar.c
+++ b/atari/toolbar.c
@@ -37,7 +37,9 @@
 #include "desktop/plot_style.h"

 #include "desktop/plotters.h"
 #include "desktop/tree.h"
+#include "desktop/hotlist.h"
 #include "utils/nsoption.h"
+#include "utils/nsurl.h"
 #include "utils/utf8.h"

 #include "atari/clipboard.h"

 #include "atari/gui.h"

@@ -139,6 +141,18 @@ static struct s_tb_button tb_buttons[] =
         toolbar_reload_click,

         {0,0},
         0, 0, 0, {0,0,0,0}

+    },
+	{

+        TOOLBAR_BT_FAVORITE,

+        toolbar_favorite_click,

+        {0,0},
+        0, 0, 0, {0,0,0,0}

+    },
+	{

+        TOOLBAR_BT_CRYPTO,

+        toolbar_crypto_click,

+        {0,0},
+        0, 0, 0, {0,0,0,0}

     },

 	{ 0, 0, {0,0}, 0, -1, 0, {0,0,0,0}}

 };
@@ -371,6 +385,7 @@ static int toolbar_calculate_height(struct s_toolbar *tb)
 static void toolbar_reflow(struct s_toolbar *tb)
 {
     int i;
+    short offx, offy;
 
     // position toolbar areas:
     tb->form->ob_x = tb->area.g_x;
@@ -389,32 +404,39 @@ static void toolbar_reflow(struct s_toolbar *tb)
 
     }
 
-	// align the throbber area at right edge:
-    tb->form[TOOLBAR_THROBBER_AREA].ob_x = tb->area.g_w
-        - tb->form[TOOLBAR_THROBBER_AREA].ob_width;
-
-	// align the search button:
-	tb->form[TOOLBAR_SEARCH_ALIGN_RIGHT].ob_x = tb->area.g_w
-        - tb->form[TOOLBAR_SEARCH_ALIGN_RIGHT].ob_width;
+	// align TOOLBAR_AREA_RIGHT IBOX at right edge:
+    tb->form[TOOLBAR_AREA_RIGHT].ob_x = tb->area.g_w
+        - tb->form[TOOLBAR_AREA_RIGHT].ob_width;
 
 	// center the URL area:
     tb->form[TOOLBAR_AREA_URL].ob_width = tb->area.g_w
-       - (tb->form[TOOLBAR_AREA_BUTTONS].ob_width
-       + tb->form[TOOLBAR_THROBBER_AREA].ob_width + 1);
+       - (tb->form[TOOLBAR_AREA_LEFT].ob_width
+       + tb->form[TOOLBAR_AREA_RIGHT].ob_width);
 
+    // position throbber image above IBOX:
+    objc_offset(tb->form, TOOLBAR_THROBBER_AREA, &offx, &offy);
+    throbber_form[tb->throbber.index].ob_x = offx;
+    throbber_form[tb->throbber.index].ob_y = offy;
 
-    // position throbber image:
-    throbber_form[tb->throbber.index].ob_x = tb->area.g_x +
-        tb->form[TOOLBAR_THROBBER_AREA].ob_x;
+    /*throbber_form[tb->throbber.index].ob_x = tb->area.g_x
+        + tb->form[TOOLBAR_AREA_RIGHT].ob_x
+        + tb->form[TOOLBAR_THROBBER_AREA].ob_x;*/
 
+/*
     throbber_form[tb->throbber.index].ob_x = tb->area.g_x
-        + tb->form[TOOLBAR_THROBBER_AREA].ob_x +
-        ((tb->form[TOOLBAR_THROBBER_AREA].ob_width
+        + tb->form[TOOLBAR_AREA_RIGHT].ob_x
+        + tb->form[TOOLBAR_THROBBER_AREA].ob_x
+        + ((tb->form[TOOLBAR_THROBBER_AREA].ob_width
         - throbber_form[tb->throbber.index].ob_width) >> 1);
 
-    throbber_form[tb->throbber.index].ob_y = tb->area.g_y +
-        ((tb->form[TOOLBAR_THROBBER_AREA].ob_height
+    throbber_form[tb->throbber.index].ob_y = tb->area.g_y
+        + ((tb->form[TOOLBAR_THROBBER_AREA].ob_height
         - throbber_form[tb->throbber.index].ob_height) >> 1);
+        */
+
+	// align the search button:
+	tb->form[TOOLBAR_SEARCH_ALIGN_RIGHT].ob_x = tb->area.g_w
+        - tb->form[TOOLBAR_SEARCH_ALIGN_RIGHT].ob_width;
 
     // set button states:
     for (i=0; i < tb->btcnt; i++ ) {
@@ -440,8 +462,6 @@ void toolbar_redraw(struct s_toolbar *tb, GRECT *clip)
     if(tb->reflow == true)
         toolbar_reflow(tb);
 
-	//TODO: fix redraw under popup menu ... that not handled correctly somehow.
-
 	//dbg_grect("toolbar redraw clip", clip);
 
 	/* Redraw the AES objects: */
@@ -476,6 +496,9 @@ void toolbar_update_buttons(struct s_toolbar *tb, struct browser_window *bw,
 	struct s_tb_button * bt;

 	bool enable = false;
 	GRECT area;
+	nsurl * ns_url;
+	char * c_url;
+	size_t c_url_len;
 
 	assert(bw != NULL);
 
@@ -523,13 +546,56 @@ void toolbar_update_buttons(struct s_toolbar *tb, struct browser_window *bw,
         }
 	}
 
+	if (button == TOOLBAR_BT_FAVORITE || button <= 0) {
+	    bt = find_button(tb, TOOLBAR_BT_FAVORITE);
+	    ns_url = toolbar_get_nsurl(tb);
+	    if (ns_url != NULL) {
+            if (hotlist_has_url(ns_url)) {
+                bt->state = button_on;
+                tb->form[TOOLBAR_BT_FAVORITE].ob_state |= OS_SELECTED;
+            }
+            else {
+                bt->state = button_on;
+                tb->form[TOOLBAR_BT_FAVORITE].ob_state &= ~OS_SELECTED;
+            }
+	    }
+	    nsurl_unref(ns_url);
+	}
+
+	if (button == TOOLBAR_BT_CRYPTO|| button <= 0) {
+	    bt = find_button(tb, TOOLBAR_BT_CRYPTO);
+	    ns_url = toolbar_get_nsurl(tb);
+	    if (ns_url != NULL &&
+            nsurl_get(ns_url, NSURL_SCHEME, &c_url, &c_url_len) == NSERROR_OK) {
+	        if (strncasecmp("https", c_url, 5) == 0) {
+                bt->state = button_on;
+                // TODO: this check actually doesn't work - why?
+                if (urldb_get_cert_permissions(ns_url) == true) {
+                    tb->form[TOOLBAR_BT_CRYPTO].ob_state &= ~OS_SELECTED;
+                }
+                else {
+                    tb->form[TOOLBAR_BT_CRYPTO].ob_state |= OS_SELECTED;
+                }
+            }
+            else {
+                bt->state = button_off;
+                tb->form[TOOLBAR_BT_CRYPTO].ob_state &= ~OS_SELECTED;
+            }
+            nsurl_unref(ns_url);
+            free(c_url);
+        }
+    }
+
     if (tb->attached) {
         if (button > 0) {
             toolbar_get_grect(tb, button, &area);
             window_schedule_redraw_grect(tb->owner, &area);
         }
         else {
-            toolbar_get_grect(tb, TOOLBAR_AREA_BUTTONS, &area);
+            toolbar_get_grect(tb, TOOLBAR_AREA_LEFT, &area);
+            window_schedule_redraw_grect(tb->owner, &area);
+
+            toolbar_get_grect(tb, TOOLBAR_AREA_RIGHT, &area);
             window_schedule_redraw_grect(tb->owner, &area);
         }
     }
@@ -707,18 +773,12 @@ bool toolbar_key_input(struct s_toolbar *tb, short nkc)
 		char tmp_url[PATH_MAX];

 		if ( textarea_get_text( tb->url.textarea, tmp_url, PATH_MAX) > 0 ) {

 			window_set_focus(tb->owner, BROWSER, gw->browser);

-

 			if (nsurl_create((const char*)&tmp_url, &url) != NSERROR_OK) {

 				warn_user("NoMemory", 0);

 			} else {

-				browser_window_navigate(gw->browser->bw,

-					url,

-					NULL,

-					BROWSER_WINDOW_HISTORY |

-					BROWSER_WINDOW_VERIFIABLE,

-					NULL,

-					NULL,

-					NULL);

+				browser_window_navigate(gw->browser->bw, url, NULL,

+					BROWSER_WINDOW_HISTORY | BROWSER_WINDOW_VERIFIABLE,

+					NULL, NULL, NULL);

 				nsurl_unref(url);

 			}

 

@@ -902,6 +962,36 @@ struct textarea *toolbar_get_textarea(struct s_toolbar *tb,
     return(tb->url.textarea);
 }
 
+char *toolbar_get_url(struct s_toolbar *tb)
+{
+    char * c_url = NULL;
+    int c_url_len = 0;
+
+    c_url_len = textarea_get_text(tb->url.textarea, NULL, 0);
+
+    if (c_url_len > -1) {
+        c_url = malloc(c_url_len+1);
+        textarea_get_text(tb->url.textarea, c_url, c_url_len+1);
+    }
+
+    return(c_url);
+}
+
+nsurl * toolbar_get_nsurl(struct s_toolbar * tb)
+{
+
+    nsurl * ns_url = NULL;
+    char * c_url;
+
+    c_url = toolbar_get_url(tb);
+    if (c_url) {
+        nsurl_create(c_url, &ns_url);
+    }
+
+    return(ns_url);
+}
+
+
 OBJECT *toolbar_get_form(struct s_toolbar *tb)
 {
 	return(tb->form);
@@ -997,3 +1087,35 @@ void toolbar_stop_click(struct s_toolbar *tb)
 	browser_window_stop(bw);

 }
 
+void toolbar_favorite_click(struct s_toolbar *tb)

+{
+    nsurl * ns_url = NULL;
+    char * c_url;
+    int c_url_len = 0;
+
+    c_url = toolbar_get_url(tb);
+    c_url_len = strlen(c_url);
+
+    nsurl_create(c_url, &ns_url);
+
+    if (hotlist_has_url(ns_url)) {
+        char msg[c_url_len+100];
+        snprintf(msg, c_url_len+100, "Really delete from favorites: \"%s\"",
+                c_url);
+        if(gemtk_msg_box_show(GEMTK_MSG_BOX_CONFIRM, msg)) {
+            hotlist_remove_url(ns_url);
+        }
+    }
+    else {
+        hotlist_add_url(ns_url);
+    }
+
+    nsurl_unref(ns_url);
+    free(c_url);
+}
+
+void toolbar_crypto_click(struct s_toolbar *tb)

+{
+
+}
+