summaryrefslogtreecommitdiff
path: root/amiga
diff options
context:
space:
mode:
Diffstat (limited to 'amiga')
-rwxr-xr-xamiga/gui.c32
-rwxr-xr-xamiga/menu.c2
-rwxr-xr-xamiga/resources/Themes/AISS/Theme40
-rwxr-xr-xamiga/resources/Themes/Default/Theme80
4 files changed, 77 insertions, 77 deletions
diff --git a/amiga/gui.c b/amiga/gui.c
index 4dafa9ec7..e9d9ceb83 100755
--- a/amiga/gui.c
+++ b/amiga/gui.c
@@ -224,7 +224,7 @@ void gui_init(int argc, char** argv)
win_destroyed = false;
- options_read("Resources/Options");
+ options_read("PROGDIR:Resources/Options");
verbose_log = option_verbose_log;
@@ -237,17 +237,17 @@ void gui_init(int argc, char** argv)
nsscreentitle = ASPrintf("NetSurf %s",netsurf_version);
- if(lock=Lock("Resources/LangNames",ACCESS_READ))
+ if(lock=Lock("PROGDIR:Resources/LangNames",ACCESS_READ))
{
UnLock(lock);
- messages_load("Resources/LangNames");
+ messages_load("PROGDIR:Resources/LangNames");
}
locale = OpenLocale(NULL);
for(i=0;i<10;i++)
{
- strcpy(lang,"Resources/");
+ strcpy(lang,"PROGDIR:Resources/");
if(locale->loc_PrefLanguages[i])
{
strcat(lang,messages_get(locale->loc_PrefLanguages[i]));
@@ -268,18 +268,18 @@ void gui_init(int argc, char** argv)
if(!found)
{
- strcpy(lang,"Resources/en/messages");
+ strcpy(lang,"PROGDIR:Resources/en/messages");
}
CloseLocale(locale);
messages_load(lang); // check locale language and read appropriate file
- default_stylesheet_url = "file:///Resources/default.css"; //"http://www.unsatisfactorysoftware.co.uk/newlook.css"; //path_to_url(buf);
- adblock_stylesheet_url = "file:///Resources/adblock.css";
+ default_stylesheet_url = "file:///PROGDIR:Resources/default.css"; //"http://www.unsatisfactorysoftware.co.uk/newlook.css"; //path_to_url(buf);
+ adblock_stylesheet_url = "file:///PROGDIR:Resources/adblock.css";
#ifdef WITH_HUBBUB
- if(hubbub_initialise("Resources/Aliases",myrealloc,NULL) != HUBBUB_OK)
+ if(hubbub_initialise("PROGDIR:Resources/Aliases",myrealloc,NULL) != HUBBUB_OK)
{
die(messages_get("NoMemory"));
}
@@ -288,20 +288,20 @@ void gui_init(int argc, char** argv)
css_screen_dpi = 72;
if((!option_cookie_file) || (option_cookie_file[0] == '\0'))
- option_cookie_file = (char *)strdup("Resources/Cookies");
+ option_cookie_file = (char *)strdup("PROGDIR:Resources/Cookies");
if((!option_hotlist_file) || (option_hotlist_file[0] == '\0'))
- option_hotlist_file = (char *)strdup("Resources/Hotlist");
+ option_hotlist_file = (char *)strdup("PROGDIR:Resources/Hotlist");
if((!option_url_file) || (option_url_file[0] == '\0'))
- option_url_file = (char *)strdup("Resources/URLs");
+ option_url_file = (char *)strdup("PROGDIR:Resources/URLs");
if((!option_recent_file) || (option_recent_file[0] == '\0'))
- option_recent_file = (char *)strdup("Resources/Recent");
+ option_recent_file = (char *)strdup("PROGDIR:Resources/Recent");
/*
if((!option_cookie_jar) || (option_cookie_jar[0] == '\0'))
- option_cookie_jar = (char *)strdup("Resources/CookieJar");
+ option_cookie_jar = (char *)strdup("PROGDIR:Resources/CookieJar");
*/
if((!option_ca_bundle) || (option_ca_bundle[0] == '\0'))
@@ -323,7 +323,7 @@ void gui_init(int argc, char** argv)
option_font_fantasy = (char *)strdup("DejaVu Serif");
if((!option_theme) || (option_theme[0] == '\0'))
- option_theme = (char *)strdup("Resources/Themes/Default");
+ option_theme = (char *)strdup("PROGDIR:Resources/Themes/Default");
if((!option_arexx_dir) || (option_arexx_dir[0] == '\0'))
option_arexx_dir = (char *)strdup("Rexx");
@@ -383,9 +383,9 @@ void gui_init(int argc, char** argv)
if(!lock)
{
warn_user("ThemeApplyErr",option_theme);
- strcpy(throbberfile,"Resources/Themes/Default/Theme");
+ strcpy(throbberfile,"PROGDIR:Resources/Themes/Default/Theme");
free(option_theme);
- option_theme = (char *)strdup("Resources/Themes/Default");
+ option_theme = (char *)strdup("PROGDIR:Resources/Themes/Default");
}
else
{
diff --git a/amiga/menu.c b/amiga/menu.c
index 2788ea5db..a8f578b40 100755
--- a/amiga/menu.c
+++ b/amiga/menu.c
@@ -637,7 +637,7 @@ void ami_menupick(ULONG code,struct gui_window_2 *gwin,struct MenuItem *item)
break;
case 1: // save settings
- options_write("Resources/Options");
+ options_write("PROGDIR:Resources/Options");
break;
}
break;
diff --git a/amiga/resources/Themes/AISS/Theme b/amiga/resources/Themes/AISS/Theme
index 6fafb660d..c1d42728c 100755
--- a/amiga/resources/Themes/AISS/Theme
+++ b/amiga/resources/Themes/AISS/Theme
@@ -28,26 +28,26 @@ theme_list_cookie:*TBImages:list_abstract
theme_list_history:*TBImages:list_archive
theme_throbber:Throbber
theme_throbber_frames:13
-ptr_default:*Resources/Pointers/Default
-ptr_point:*Resources/Pointers/Point
-ptr_caret:*Resources/Pointers/Caret
-ptr_menu:*Resources/Pointers/Menu
-ptr_up:*Resources/Pointers/Up
-ptr_down:*Resources/Pointers/Down
-ptr_left:*Resources/Pointers/Left
-ptr_right:*Resources/Pointers/Right
-ptr_rightup:*Resources/Pointers/RightUp
-ptr_leftdown:*Resources/Pointers/LeftDown
-ptr_leftup:*Resources/Pointers/LeftUp
-ptr_rightdown:*Resources/Pointers/RightDown
-ptr_cross:*Resources/Pointers/Cross
-ptr_move:*Resources/Pointers/Move
-ptr_wait:*Resources/Pointers/Wait
-ptr_help:*Resources/Pointers/Help
-ptr_nodrop:*Resources/Pointers/NoDrop
-ptr_notallowed:*Resources/Pointers/NotAllowed
-ptr_progress:*Resources/Pointers/Progress
-ptr_blank:*Resources/Pointers/Blank
+ptr_default:*PROGDIR:Resources/Pointers/Default
+ptr_point:*PROGDIR:Resources/Pointers/Point
+ptr_caret:*PROGDIR:Resources/Pointers/Caret
+ptr_menu:*PROGDIR:Resources/Pointers/Menu
+ptr_up:*PROGDIR:Resources/Pointers/Up
+ptr_down:*PROGDIR:Resources/Pointers/Down
+ptr_left:*PROGDIR:Resources/Pointers/Left
+ptr_right:*PROGDIR:Resources/Pointers/Right
+ptr_rightup:*PROGDIR:Resources/Pointers/RightUp
+ptr_leftdown:*PROGDIR:Resources/Pointers/LeftDown
+ptr_leftup:*PROGDIR:Resources/Pointers/LeftUp
+ptr_rightdown:*PROGDIR:Resources/Pointers/RightDown
+ptr_cross:*PROGDIR:Resources/Pointers/Cross
+ptr_move:*PROGDIR:Resources/Pointers/Move
+ptr_wait:*PROGDIR:Resources/Pointers/Wait
+ptr_help:*PROGDIR:Resources/Pointers/Help
+ptr_nodrop:*PROGDIR:Resources/Pointers/NoDrop
+ptr_notallowed:*PROGDIR:Resources/Pointers/NotAllowed
+ptr_progress:*PROGDIR:Resources/Pointers/Progress
+ptr_blank:*PROGDIR:Resources/Pointers/Blank
ptr32_default:*ENV:Sys/def_pointer
ptr32_point:*ENV:Sys/def_linkpointer
ptr32_caret:*ENV:Sys/def_textpointer
diff --git a/amiga/resources/Themes/Default/Theme b/amiga/resources/Themes/Default/Theme
index 407ea0b12..4757eb3e2 100755
--- a/amiga/resources/Themes/Default/Theme
+++ b/amiga/resources/Themes/Default/Theme
@@ -41,43 +41,43 @@ theme_list_cookie:
theme_list_history:
theme_throbber:Throbber
theme_throbber_frames:9
-ptr_default:*Resources/Pointers/Default
-ptr_point:*Resources/Pointers/Point
-ptr_caret:*Resources/Pointers/Caret
-ptr_menu:*Resources/Pointers/Menu
-ptr_up:*Resources/Pointers/Up
-ptr_down:*Resources/Pointers/Down
-ptr_left:*Resources/Pointers/Left
-ptr_right:*Resources/Pointers/Right
-ptr_rightup:*Resources/Pointers/RightUp
-ptr_leftdown:*Resources/Pointers/LeftDown
-ptr_leftup:*Resources/Pointers/LeftUp
-ptr_rightdown:*Resources/Pointers/RightDown
-ptr_cross:*Resources/Pointers/Cross
-ptr_move:*Resources/Pointers/Move
-ptr_wait:*Resources/Pointers/Wait
-ptr_help:*Resources/Pointers/Help
-ptr_nodrop:*Resources/Pointers/NoDrop
-ptr_notallowed:*Resources/Pointers/NotAllowed
-ptr_progress:*Resources/Pointers/Progress
-ptr_blank:*Resources/Pointers/Blank
-ptr32_default:*Resources/Pointers/Default
-ptr32_point:*Resources/Pointers/Point
-ptr32_caret:*Resources/Pointers/Caret
-ptr32_menu:*Resources/Pointers/Menu
-ptr32_up:*Resources/Pointers/Up
-ptr32_down:*Resources/Pointers/Down
-ptr32_left:*Resources/Pointers/Left
-ptr32_right:*Resources/Pointers/Right
-ptr32_rightup:*Resources/Pointers/RightUp
-ptr32_leftdown:*Resources/Pointers/LeftDown
-ptr32_leftup:*Resources/Pointers/LeftUp
-ptr32_rightdown:*Resources/Pointers/RightDown
-ptr32_cross:*Resources/Pointers/Cross
-ptr32_move:*Resources/Pointers/Move
-ptr32_wait:*Resources/Pointers/Wait
-ptr32_help:*Resources/Pointers/Help
-ptr32_nodrop:*Resources/Pointers/NoDrop
-ptr32_notallowed:*Resources/Pointers/NotAllowed
-ptr32_progress:*Resources/Pointers/Progress
-ptr32_blank:*Resources/Pointers/Blank
+ptr_default:*PROGDIR:Resources/Pointers/Default
+ptr_point:*PROGDIR:Resources/Pointers/Point
+ptr_caret:*PROGDIR:Resources/Pointers/Caret
+ptr_menu:*PROGDIR:Resources/Pointers/Menu
+ptr_up:*PROGDIR:Resources/Pointers/Up
+ptr_down:*PROGDIR:Resources/Pointers/Down
+ptr_left:*PROGDIR:Resources/Pointers/Left
+ptr_right:*PROGDIR:Resources/Pointers/Right
+ptr_rightup:*PROGDIR:Resources/Pointers/RightUp
+ptr_leftdown:*PROGDIR:Resources/Pointers/LeftDown
+ptr_leftup:*PROGDIR:Resources/Pointers/LeftUp
+ptr_rightdown:*PROGDIR:Resources/Pointers/RightDown
+ptr_cross:*PROGDIR:Resources/Pointers/Cross
+ptr_move:*PROGDIR:Resources/Pointers/Move
+ptr_wait:*PROGDIR:Resources/Pointers/Wait
+ptr_help:*PROGDIR:Resources/Pointers/Help
+ptr_nodrop:*PROGDIR:Resources/Pointers/NoDrop
+ptr_notallowed:*PROGDIR:Resources/Pointers/NotAllowed
+ptr_progress:*PROGDIR:Resources/Pointers/Progress
+ptr_blank:*PROGDIR:Resources/Pointers/Blank
+ptr32_default:*PROGDIR:Resources/Pointers/Default
+ptr32_point:*PROGDIR:Resources/Pointers/Point
+ptr32_caret:*PROGDIR:Resources/Pointers/Caret
+ptr32_menu:*PROGDIR:Resources/Pointers/Menu
+ptr32_up:*PROGDIR:Resources/Pointers/Up
+ptr32_down:*PROGDIR:Resources/Pointers/Down
+ptr32_left:*PROGDIR:Resources/Pointers/Left
+ptr32_right:*PROGDIR:Resources/Pointers/Right
+ptr32_rightup:*PROGDIR:Resources/Pointers/RightUp
+ptr32_leftdown:*PROGDIR:Resources/Pointers/LeftDown
+ptr32_leftup:*PROGDIR:Resources/Pointers/LeftUp
+ptr32_rightdown:*PROGDIR:Resources/Pointers/RightDown
+ptr32_cross:*PROGDIR:Resources/Pointers/Cross
+ptr32_move:*PROGDIR:Resources/Pointers/Move
+ptr32_wait:*PROGDIR:Resources/Pointers/Wait
+ptr32_help:*PROGDIR:Resources/Pointers/Help
+ptr32_nodrop:*PROGDIR:Resources/Pointers/NoDrop
+ptr32_notallowed:*PROGDIR:Resources/Pointers/NotAllowed
+ptr32_progress:*PROGDIR:Resources/Pointers/Progress
+ptr32_blank:*PROGDIR:Resources/Pointers/Blank
generated by cgit v1.2.3 (git 2.39.1) at 2024-04-19 03:48:33 +0000