Remove default theme's dependency on AISS

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

amiga/dist/Install

@@ -23,7 +23,7 @@
 
 (set @default-dest
 	(askdir
-    		(prompt "Where would you like to install NetSurf?")
+		(prompt "Where would you like to install NetSurf?")
 		(help @askdir-help)
 		(default @default-dest)
 	)
@@ -31,6 +31,11 @@
 
 (set #icon-exists (exists (tackon @default-dest "NetSurf.info")))
 
+; *****************************************************
+; TODO: Check OS version/existing build and provide
+; option to select graphics.library or part-Cairo build.
+; ****************************************************
+
 (copylib
 	(prompt "Please check the version of NetSurf you are copying against "
 			"any which might already be installed.")
@@ -62,7 +67,10 @@
 	(
 		(set #themename
    			(askchoice
-  				(prompt "Please select theme")
+  				(prompt "Please select theme\n"
+					"AISS theme requires AISS and def_pointers packages "
+					"to be installed.")
+; perhaps we should be detecting these?
  	      		(help @askchoice-help)
 				(choices "Default" "AISS")
        			(default 0)

amiga/dist/NetSurf.guide

@@ -32,7 +32,7 @@ The options file is stored in @{"Resources/Options" link Resources/Options/Main}
 @{b}hotlist_file@{ub} Path to Hotlist file
 @{b}use_pubscreen@{ub} Open NetSurf on the named public screen
 @{b}screen_modeid@{ub} Mode ID for NetSurf's custom screen.  If not specified, NetSurf will prompt on startup.  Choose Settings=>Save settings to make permanent.
-@{b}theme@{ub} Path to theme (default is Resources/Themes/Default - an alternative included theme is Resources/Themes/AISS)
+@{b}theme@{ub} Path to @{"theme" link Themes} (default is Resources/Themes/Default)
 @{b}no_iframes@{ub} Disable IFrames
 @{b}clipboard_write_utf8@{ub} Write UTF-8 strings to the clipboard along with a charset identifier (when this option is 0, NetSurf will convert copied strings to local charset)
 @{b}context_menu@{ub} Enable context menus
@@ -50,6 +50,17 @@ The options file is stored in @{"Resources/Options" link Resources/Options/Main}
 
 @endnode
 
+@node Themes
+AmigaOS NetSurf supports basic theming of gadget imagery.  Themes live in the Resources/Themes directory, and two are included by default:
+
+Default - default theme with no external dependencies.
+AISS - theme using Mason's AISS images for buttons, and the def_pointers package for 32-bit pointer images.
+
+The file "Theme" in the theme directory contains the files used for that theme.  See @{"Default Theme file" link Resources/Themes/Default/Theme/Main} for more details.
+
+Theme directories should be copied and renamed if themes are modified, as update installation of NetSurf will overwrite any changes.  AmigaOS NetSurf themes are not compatible with NetSurf for other platforms.
+@endnode
+
 @node arexx "ARexx port"
 NetSurf's ARexx port is called NETSURF.
 

amiga/dist/netsurf.readme

@@ -4,7 +4,6 @@ Author:       NetSurf contributors (OS4 port by Chris Young)
 Type:         comm/www
 Version:      2.0 development (SVN 5911)
 Architecture: ppc-amigaos >= 4.0.0
-Requires:     AISS
 
 This is a preview release of the OS4 native port of NetSurf.
 It is beta software, which means it is unstable and missing
@@ -14,9 +13,6 @@ This is provided for testing purposes only, to gain feedback
 in order to fix bugs for the real release and to prioritise
 features.
 
-IF YOU UPDATE AN OLDER VERSION YOU MAY NEED TO ADD
-screen_depth:32 TO YOUR RESOURCES/OPTIONS FILE
-
 Please report bugs to chris@unsatisfactorysoftware.co.uk,
 on the Amigans.net forums or in the bug tracker at
 http://www.unsatisfactorysoftware.co.uk/bugs (the bug tracker

amiga/gui.c

@@ -1507,7 +1507,7 @@ struct gui_window *gui_create_browser_window(struct browser_window *bw,
 	char stop[100],stop_s[100],stop_g[100];
 	char reload[100],reload_s[100],reload_g[100];
 	char home[100],home_s[100],home_g[100];
-	char closetab[100];
+	char closetab[100],closetab_s[100],closetab_g[100];
 
 	if((bw->browser_window_type == BROWSER_WINDOW_IFRAME) && option_no_iframes) return NULL;
 
@@ -1678,6 +1678,8 @@ struct gui_window *gui_create_browser_window(struct browser_window *bw,
 				ami_get_theme_filename(home_s,"theme_home_s");
 				ami_get_theme_filename(home_g,"theme_home_g");
 				ami_get_theme_filename(closetab,"theme_closetab");
+				ami_get_theme_filename(closetab_s,"theme_closetab_s");
+				ami_get_theme_filename(closetab_g,"theme_closetab_g");
 
 				gwin->shared->objects[OID_MAIN] = WindowObject,
 		       	    WA_ScreenTitle,nsscreentitle,
@@ -1808,6 +1810,8 @@ struct gui_window *gui_create_browser_window(struct browser_window *bw,
 								BUTTON_Transparent,TRUE,
 								BUTTON_RenderImage,BitMapObject,
 									BITMAP_SourceFile,closetab,
+									BITMAP_SelectSourceFile,closetab_s,
+									BITMAP_DisabledSourceFile,closetab_g,
 									BITMAP_Screen,scrn,
 									BITMAP_Masking,TRUE,
 								BitMapEnd,

amiga/resources/Themes/AISS/Theme

@@ -19,6 +19,8 @@ theme_home:*TBImages:home
 theme_home_s:*TBImages:home_s
 theme_home_g:*TBImages:home_g
 theme_closetab:*TBImages:list_cancel
+theme_closetab_s:*TBImages:list_cancel
+theme_closetab_g:*TBImages:list_cancel
 theme_list_folder_closed:*TBImages:list_folderfold
 theme_list_folder_open:*TBImages:list_folderunfold
 theme_list_bookmark:*TBImages:list_bookmark

amiga/resources/Themes/Default/Theme

@@ -5,7 +5,7 @@
 # is stored.
 #
 # If filename is prefixed by an asterisk, it will be treated as
-# a full path to a file.
+# a full path to a file (relative to PROGDIR:)
 #
 # Where theme_image is suffixed by _s or _g, these are the selected
 # and ghosted version of the image.
@@ -16,22 +16,24 @@
 # theme_throbber is a film strip of theme_throbber_frames frames
 # The first frame must be the inactive image.
 #
-theme_nav_west:*TBImages:nav_west
-theme_nav_west_s:*TBImages:nav_west_s
-theme_nav_west_g:*TBImages:nav_west_g
-theme_nav_east:*TBImages:nav_east
-theme_nav_east_s:*TBImages:nav_east_s
-theme_nav_east_g:*TBImages:nav_east_g
-theme_stop:*TBImages:stop
-theme_stop_s:*TBImages:stop_s
-theme_stop_g:*TBImages:stop_g
-theme_reload:*TBImages:reload
-theme_reload_s:*TBImages:reload_s
-theme_reload_g:*TBImages:reload_g
-theme_home:*TBImages:home
-theme_home_s:*TBImages:home_s
-theme_home_g:*TBImages:home_g
-theme_closetab:*TBImages:list_cancel
+theme_nav_west:back.png
+theme_nav_west_s:back.png
+theme_nav_west_g:back_g.png
+theme_nav_east:forward.png
+theme_nav_east_s:forward.png
+theme_nav_east_g:forward_g.png
+theme_stop:stop.png
+theme_stop_s:stop.png
+theme_stop_g:stop_g.png
+theme_reload:reload.png
+theme_reload_s:reload.png
+theme_reload_g:reload_g.png
+theme_home:home.png
+theme_home_s:home.png
+theme_home_g:home_g.png
+theme_closetab:closetab.png
+theme_closetab_s:closetab.png
+theme_closetab_g:closetab_g.png
 theme_list_folder_closed:
 theme_list_folder_open:
 theme_list_bookmark: