Started to move the search form into the browser window.

3 files changed, 21 insertions, 19 deletions

diff --git a/atari/res/netsurf.rsc b/atari/res/netsurf.rsc
index b57214a6f..d49199d8e 100755
--- a/atari/res/netsurf.rsc
+++ b/atari/res/netsurf.rsc
diff --git a/atari/res/netsurf.rsh b/atari/res/netsurf.rsh
index 1b6ac16cc..092faa06a 100755
--- a/atari/res/netsurf.rsh
+++ b/atari/res/netsurf.rsh
@@ -79,14 +79,15 @@
 #define TOOLBAR_HOTLIST_EDIT 4  /* CICON in tree TOOLBAR_HOTLIST */

 

 #define SEARCH 8  /* form/dial */

-#define SEARCH_TB_SRCH 1  /* FTEXT in tree SEARCH */

-#define SEARCH_LBL_SHOWALL 2  /* STRING in tree SEARCH */

-#define SEARCH_LBL_CASESENSE 3  /* STRING in tree SEARCH */

-#define SEARCH_BT_SEARCH 4  /* BUTTON in tree SEARCH */

-#define SEARCH_LBL_FWD 5  /* STRING in tree SEARCH */

-#define SEARCH_CB_CASESENSE 6  /* BUTTON in tree SEARCH */

-#define SEARCH_CB_SHOWALL 7  /* BUTTON in tree SEARCH */

-#define SEARCH_CB_FWD 8  /* BUTTON in tree SEARCH */

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

+#define SEARCH_LBL_FWD 2  /* STRING in tree SEARCH */

+#define SEARCH_CB_FWD 3  /* BUTTON in tree SEARCH */

+#define SEARCH_BT_SEARCH_BACK 4  /* BUTTON in tree SEARCH */

+#define SEARCH_CB_CASESENSE 6  /* BOXCHAR in tree SEARCH */

+#define SEARCH_CB_SHOWALL 7  /* BOXCHAR in tree SEARCH */

+#define SEARCH_LBL_SHOWALL 8  /* STRING in tree SEARCH */

+#define SEARCH_LBL_CASESENSE 9  /* TEXT in tree SEARCH */

+#define SEARCH_TB_SRCH 10  /* FTEXT in tree SEARCH */

 

 #define DOWNLOAD 9  /* form/dial */

 /* Width ist 400, code depends on that! If you change it, change it in download.c */

diff --git a/atari/res/netsurf.rsm b/atari/res/netsurf.rsm
index 32b6696dd..3993f4ae7 100755
--- a/atari/res/netsurf.rsm
+++ b/atari/res/netsurf.rsm
@@ -3,7 +3,7 @@ ResourceMaster v3.65
 #N 99@32@AZAaza___  _@AZAaza090___  _@@_@

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

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

-#M 20010100@0@7728@632@

+#M 20010100@0@7728@633@

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

 #O 4@32@T_FILE@@

 #O 5@32@T_EDIT@@

@@ -74,15 +74,16 @@ ResourceMaster v3.65
 #O 2@33@CREATE_FOLDER@@

 #O 3@33@DELETE@@

 #O 4@33@EDIT@@

-#T 8@2@SEARCH@@9@@

-#O 1@29@TB_SRCH@@

-#O 2@28@LBL_SHOWALL@@

-#O 3@28@LBL_CASESENSE@@

-#O 4@26@BT_SEARCH@@

-#O 5@28@LBL_FWD@@

-#O 6@26@CB_CASESENSE@@

-#O 7@26@CB_SHOWALL@@

-#O 8@26@CB_FWD@@

+#T 8@2@SEARCH@@11@@

+#O 1@26@BT_SEARCH@@

+#O 2@28@LBL_FWD@@

+#O 3@26@CB_FWD@@

+#O 4@26@BT_SEARCH_BACK@@

+#O 6@27@CB_CASESENSE@@

+#O 7@27@CB_SHOWALL@@

+#O 8@28@LBL_SHOWALL@@

+#O 9@21@LBL_CASESENSE@@

+#O 10@29@TB_SRCH@@

 #T 9@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@@

@@ -197,4 +198,4 @@ ResourceMaster v3.65
 #T 15@2@POP_FONT_RENDERER@@3@@

 #O 1@28@INTERNAL@@

 #O 2@28@FREETYPE@@

-#c 27079@

+#c 25055@