Updated resources ( mainmenu and settings dialog updated for background_images, foreground_images, font_monochrom )

svn path=/trunk/netsurf/; revision=13389

3 files changed, 58 insertions, 48 deletions

diff --git a/atari/res/netsurf.rsc b/atari/res/netsurf.rsc
index 987be3d85..b7ad81b15 100755
--- a/atari/res/netsurf.rsc
+++ b/atari/res/netsurf.rsc
diff --git a/atari/res/netsurf.rsh b/atari/res/netsurf.rsh
index e204608c2..648b53d88 100755
--- a/atari/res/netsurf.rsh
+++ b/atari/res/netsurf.rsh
@@ -27,16 +27,18 @@
 #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_BACK 46  /* STRING in tree MAINMENU */

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

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

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

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

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

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

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

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

-#define MAINMENU_M_HELP_CONTENT 59  /* 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_CHOICES 58  /* STRING in tree MAINMENU */

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

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

 

 #define TOOLBAR 1  /* form/dial */

 #define TOOLBAR_BT_BACK 2  /* CICON in tree TOOLBAR */

@@ -149,6 +151,7 @@
 #define CHOICES_EDIT_MIN_REFLOW_PERIOD 33  /* FTEXT in tree CHOICES */

 #define CHOICES_DEC_INCREMENTAL_REFLOW 34  /* BOXCHAR in tree CHOICES */

 #define CHOICES_INC_INCREMENTAL_REFLOW 35  /* BOXCHAR in tree CHOICES */

+#define CHOICES_CB_ANTI_ALIASING 102  /* BUTTON in tree CHOICES */

 #define CHOICES_TAB_PATH 37  /* BUTTON in tree CHOICES */

 #define CHOICES_EDIT_CA_CERTS_PATH 42  /* FTEXT in tree CHOICES */

 #define CHOICES_EDIT_DOWNLOAD_PATH 43  /* FTEXT in tree CHOICES */

@@ -176,15 +179,17 @@
 #define CHOICES_CB_PROXY_AUTH 79  /* BUTTON in tree CHOICES */

 #define CHOICES_EDIT_PROXY_USERNAME 80  /* FTEXT in tree CHOICES */

 #define CHOICES_EDIT_PROXY_PASSWORD 81  /* FTEXT in tree CHOICES */

-#define CHOICES_EDIT_PROXY_PORT 99  /* FTEXT in tree CHOICES */

-#define CHOICES_INC_MAX_FETCHERS_PER_HOST 87  /* BOXCHAR in tree CHOICES */

-#define CHOICES_INC_CACHED_CONNECTIONS 88  /* BOXCHAR in tree CHOICES */

-#define CHOICES_DEC_MAX_FETCHERS_PER_HOST 89  /* BOXCHAR in tree CHOICES */

-#define CHOICES_DEC_CACHED_CONNECTIONS 90  /* BOXCHAR in tree CHOICES */

-#define CHOICES_EDIT_MAX_FETCHERS_PER_HOST 91  /* FTEXT in tree CHOICES */

-#define CHOICES_EDIT_MAX_CACHED_CONNECTIONS 92  /* FTEXT in tree CHOICES */

-#define CHOICES_EDIT_MAX_FETCHERS 94  /* FTEXT in tree CHOICES */

-#define CHOICES_DEC_MAX_FETCHERS 95  /* BOXCHAR in tree CHOICES */

-#define CHOICES_INC_MAX_FETCHERS 96  /* BOXCHAR in tree CHOICES */

-#define CHOICES_ABORT 97  /* BUTTON in tree CHOICES */

-#define CHOICES_OK 98  /* BUTTON in tree CHOICES */

+#define CHOICES_EDIT_PROXY_PORT 83  /* FTEXT in tree CHOICES */

+#define CHOICES_INC_MAX_FETCHERS_PER_HOST 88  /* BOXCHAR in tree CHOICES */

+#define CHOICES_INC_CACHED_CONNECTIONS 89  /* BOXCHAR in tree CHOICES */

+#define CHOICES_DEC_MAX_FETCHERS_PER_HOST 90  /* BOXCHAR in tree CHOICES */

+#define CHOICES_DEC_CACHED_CONNECTIONS 91  /* BOXCHAR in tree CHOICES */

+#define CHOICES_EDIT_MAX_FETCHERS_PER_HOST 92  /* FTEXT in tree CHOICES */

+#define CHOICES_EDIT_MAX_CACHED_CONNECTIONS 93  /* FTEXT in tree CHOICES */

+#define CHOICES_EDIT_MAX_FETCHERS 95  /* FTEXT in tree CHOICES */

+#define CHOICES_DEC_MAX_FETCHERS 96  /* BOXCHAR in tree CHOICES */

+#define CHOICES_INC_MAX_FETCHERS 97  /* BOXCHAR in tree CHOICES */

+#define CHOICES_CB_FG_IMAGES 100  /* BUTTON in tree CHOICES */

+#define CHOICES_CB_BG_IMAGES 101  /* BUTTON in tree CHOICES */

+#define CHOICES_ABORT 98  /* BUTTON in tree CHOICES */

+#define CHOICES_OK 99  /* BUTTON in tree CHOICES */

diff --git a/atari/res/netsurf.rsm b/atari/res/netsurf.rsm
index 364ff23e0..086165d43 100755
--- a/atari/res/netsurf.rsm
+++ b/atari/res/netsurf.rsm
@@ -3,8 +3,8 @@ 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@594@

-#T 0@1@MAINMENU@@60@@

+#M 20010100@0@7728@596@

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

 #O 4@32@T_FILE@@

 #O 5@32@T_EDIT@@

 #O 6@32@T_VIEW@@

@@ -31,16 +31,18 @@ ResourceMaster v3.65
 #O 41@28@M_TOOLBARS@@

 #O 43@28@M_SAVEWIN@@

 #O 44@28@M_DEBUG_RENDER@@

-#O 46@28@M_BACK@@

-#O 47@28@M_FORWARD@@

-#O 48@28@M_HOME@@

-#O 50@28@M_LHISTORY@@

-#O 51@28@M_GHISTORY@@

-#O 53@28@M_ADD_BOOKMARK@@

-#O 54@28@M_BOOKMARKS@@

-#O 56@28@M_CHOICES@@

-#O 57@28@M_VLOG@@

-#O 59@28@M_HELP_CONTENT@@

+#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_CHOICES@@

+#O 59@28@M_VLOG@@

+#O 61@28@M_HELP_CONTENT@@

 #T 1@2@TOOLBAR@@7@@

 #O 2@33@BT_BACK@@

 #O 3@33@BT_HOME@@

@@ -114,7 +116,7 @@ ResourceMaster v3.65
 #O 8@21@COPY_URL@@

 #O 9@21@SAVE_AS@@

 #O 10@21@VIEW_SOURCE@@

-#T 13@2@CHOICES@@100@@

+#T 13@2@CHOICES@@103@@

 #O 1@26@REG_BROWSER@@

 #O 2@26@REG_RENDER@@

 #O 3@26@REG_STYLE@@

@@ -139,6 +141,7 @@ ResourceMaster v3.65
 #O 33@29@EDIT_MIN_REFLOW_PERIOD@@

 #O 34@27@DEC_INCREMENTAL_REFLOW@@

 #O 35@27@INC_INCREMENTAL_REFLOW@@

+#O 102@26@CB_ANTI_ALIASING@@

 #O 37@26@TAB_PATH@@

 #O 42@29@EDIT_CA_CERTS_PATH@@

 #O 43@29@EDIT_DOWNLOAD_PATH@@

@@ -166,16 +169,18 @@ ResourceMaster v3.65
 #O 79@26@CB_PROXY_AUTH@@

 #O 80@29@EDIT_PROXY_USERNAME@@

 #O 81@29@EDIT_PROXY_PASSWORD@@

-#O 99@29@EDIT_PROXY_PORT@@

-#O 87@27@INC_MAX_FETCHERS_PER_HOST@@

-#O 88@27@INC_CACHED_CONNECTIONS@@

-#O 89@27@DEC_MAX_FETCHERS_PER_HOST@@

-#O 90@27@DEC_CACHED_CONNECTIONS@@

-#O 91@29@EDIT_MAX_FETCHERS_PER_HOST@@

-#O 92@29@EDIT_MAX_CACHED_CONNECTIONS@@

-#O 94@29@EDIT_MAX_FETCHERS@@

-#O 95@27@DEC_MAX_FETCHERS@@

-#O 96@27@INC_MAX_FETCHERS@@

-#O 97@26@ABORT@@

-#O 98@26@OK@@

-#c 8157@

+#O 83@29@EDIT_PROXY_PORT@@

+#O 88@27@INC_MAX_FETCHERS_PER_HOST@@

+#O 89@27@INC_CACHED_CONNECTIONS@@

+#O 90@27@DEC_MAX_FETCHERS_PER_HOST@@

+#O 91@27@DEC_CACHED_CONNECTIONS@@

+#O 92@29@EDIT_MAX_FETCHERS_PER_HOST@@

+#O 93@29@EDIT_MAX_CACHED_CONNECTIONS@@

+#O 95@29@EDIT_MAX_FETCHERS@@

+#O 96@27@DEC_MAX_FETCHERS@@

+#O 97@27@INC_MAX_FETCHERS@@

+#O 100@26@CB_FG_IMAGES@@

+#O 101@26@CB_BG_IMAGES@@

+#O 98@26@ABORT@@

+#O 99@26@OK@@

+#c 18899@