From fe0e2508e62323955df415b45e2ea9b1b7d6373f Mon Sep 17 00:00:00 2001
From: Ole Loots <ole@monochrom.net>
Date: Tue, 27 Nov 2012 02:12:09 +0100
Subject: Refactored a lot of browser window code,... still totally WIP. ...but
 it compiles...

---
 atari/res/netsurf.rsc | Bin 35740 -> 35788 bytes
 atari/res/netsurf.rsh |   3 +++
 atari/res/netsurf.rsm |   9 ++++++---
 3 files changed, 9 insertions(+), 3 deletions(-)

(limited to 'atari/res')

diff --git a/atari/res/netsurf.rsc b/atari/res/netsurf.rsc
index 5a9327ffb..803cb2b7d 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 b0c800dfb..824552688 100755
--- a/atari/res/netsurf.rsh
+++ b/atari/res/netsurf.rsh
@@ -41,11 +41,14 @@
 #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_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_THROBBER_AREA 8  /* BOX in tree TOOLBAR */
 
 #define ICONIFY 2  /* form/dial */
 #define ICONIFY_GLOBE 1  /* CICON in tree ICONIFY */
diff --git a/atari/res/netsurf.rsm b/atari/res/netsurf.rsm
index ade2b1c80..587fefa45 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@1@1@1@1@
-#M 20010100@0@7728@610@
+#M 20010100@0@7728@618@
 #T 0@1@MAINMENU@@62@@
 #O 4@32@T_FILE@@
 #O 5@32@T_EDIT@@
@@ -43,12 +43,15 @@ ResourceMaster v3.65
 #O 58@28@M_CHOICES@@
 #O 59@28@M_VLOG@@
 #O 61@28@M_HELP_CONTENT@@
-#T 1@2@TOOLBAR@@7@@
+#T 1@2@TOOLBAR@@9@@
+#O 1@20@NAVIGATION_AREA@@
 #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 8@20@THROBBER_AREA@@
 #T 2@2@ICONIFY@@3@@
 #O 1@33@GLOBE@@
 #T 3@2@FAVICON@@2@@
@@ -195,4 +198,4 @@ ResourceMaster v3.65
 #O 5@33@BT_DOWN_PIC@@
 #O 6@25@BT_UP@@
 #O 4@33@BT_UP_PIC@@
-#c 2361@
+#c 770@
-- 
cgit v1.2.3