From a0227890e917681daa771a3b2f8499305fd0136e Mon Sep 17 00:00:00 2001 From: Ole Loots Date: Mon, 14 Jan 2013 01:01:22 +0100 Subject: Further work on search in browser window. --- atari/res/netsurf.rsc | Bin 34858 -> 35238 bytes atari/res/netsurf.rsh | 30 ++++++++++++++++++++---------- atari/res/netsurf.rsm | 38 ++++++++++++++++++++++++-------------- 3 files changed, 44 insertions(+), 24 deletions(-) (limited to 'atari/res') diff --git a/atari/res/netsurf.rsc b/atari/res/netsurf.rsc index d49199d8e..1dbb913a4 100755 Binary files a/atari/res/netsurf.rsc and b/atari/res/netsurf.rsc differ diff --git a/atari/res/netsurf.rsh b/atari/res/netsurf.rsh index 092faa06a..39b98ed3b 100755 --- a/atari/res/netsurf.rsh +++ b/atari/res/netsurf.rsh @@ -41,13 +41,24 @@ #define MAINMENU_M_HELP_CONTENT 61 /* STRING in tree MAINMENU */ #define TOOLBAR 1 /* form/dial */ -#define TOOLBAR_NAVIGATION_AREA 1 /* BOX in tree TOOLBAR */ +#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_URL_AREA 7 /* BOX in tree TOOLBAR */ +#define TOOLBAR_AREA_URL 7 /* BOX in tree TOOLBAR */ #define TOOLBAR_THROBBER_AREA 8 /* BOX in tree TOOLBAR */ #define ICONIFY 2 /* form/dial */ @@ -80,14 +91,13 @@ #define SEARCH 8 /* form/dial */ #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 SEARCH_CB_FWD 2 /* BUTTON in tree SEARCH */ +#define SEARCH_BT_SEARCH_BACK 3 /* BUTTON in tree SEARCH */ +#define SEARCH_CB_CASESENSE 5 /* BOXCHAR in tree SEARCH */ +#define SEARCH_CB_SHOWALL 6 /* BOXCHAR in tree SEARCH */ +#define SEARCH_LBL_SHOWALL 7 /* STRING in tree SEARCH */ +#define SEARCH_LBL_CASESENSE 8 /* TEXT in tree SEARCH */ +#define SEARCH_TB_SRCH 9 /* 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 3993f4ae7..3177c9e0a 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@633@ +#M 20010100@0@7728@635@ #T 0@1@MAINMENU@@62@@ #O 4@32@T_FILE@@ #O 5@32@T_EDIT@@ @@ -43,14 +43,25 @@ ResourceMaster v3.65 #O 58@28@M_CHOICES@@ #O 59@28@M_VLOG@@ #O 61@28@M_HELP_CONTENT@@ -#T 1@2@TOOLBAR@@9@@ -#O 1@20@NAVIGATION_AREA@@ +#T 1@2@TOOLBAR@@21@@ +#O 9@20@AREA_SEARCH@@ +#O 10@26@BT_SEARCH@@ +#O 12@26@BT_SEARCH_BACK@@ +#O 14@27@CB_CASESENSE@@ +#O 15@27@CB_SHOWALL@@ +#O 16@28@LBL_SHOWALL@@ +#O 17@21@LBL_CASESENSE@@ +#O 18@29@TB_SRCH@@ +#O 20@25@SEARCH_ALIGN_RIGHT@@ +#O 11@26@CLOSE_SEARCH@@ +#O 19@20@AREA_NAVIGATION@@ +#O 1@25@AREA_BUTTONS@@ #O 2@33@BT_BACK@@ #O 3@33@BT_HOME@@ #O 4@33@BT_FORWARD@@ #O 5@33@BT_STOP@@ #O 6@33@BT_RELOAD@@ -#O 7@20@URL_AREA@@ +#O 7@20@AREA_URL@@ #O 8@20@THROBBER_AREA@@ #T 2@2@ICONIFY@@3@@ #O 1@33@GLOBE@@ @@ -74,16 +85,15 @@ ResourceMaster v3.65 #O 2@33@CREATE_FOLDER@@ #O 3@33@DELETE@@ #O 4@33@EDIT@@ -#T 8@2@SEARCH@@11@@ +#T 8@2@SEARCH@@10@@ #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@@ +#O 2@26@CB_FWD@@ +#O 3@26@BT_SEARCH_BACK@@ +#O 5@27@CB_CASESENSE@@ +#O 6@27@CB_SHOWALL@@ +#O 7@28@LBL_SHOWALL@@ +#O 8@21@LBL_CASESENSE@@ +#O 9@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@@ @@ -198,4 +208,4 @@ ResourceMaster v3.65 #T 15@2@POP_FONT_RENDERER@@3@@ #O 1@28@INTERNAL@@ #O 2@28@FREETYPE@@ -#c 25055@ +#c 32249@ -- cgit v1.2.3