Skip to content

GitLab

Commit 7d541185 authored by Andrew Hodgkinson's avatar Andrew Hodgkinson
Browse files

Added 'save current location'. Res files updated appropriately. Version number... 

Added 'save current location'. Res files updated appropriately. Version number taken to Beta-3; next will be 1.21, including K.Bracey's i18n code.
parent 0809bc50
Hide whitespace changes
Inline Side-by-side
Showing with 187 additions and 24 deletions
Resources/UK/Browse/Messages
View file @ 7d541185
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
_TaskName:Browse _TaskName:Browse
_SpriName:!browse _SpriName:!browse
Version:1.20 (12-Sep-97)ß Version:1.20 (12-Sep-97) ß-3
# Errors # Errors
# ====== # ======
......
Resources/UK/Browse/Res,fae
View file @ 7d541185
No preview for this file type
Resources/UK/Browse/User/Hotlist,faf 0 → 100644
View file @ 7d541185
<html>
<head><title>Hotlist</title></head>
<body>
<ul>
<li><a href="http://www.acorn.co.uk/">Acorn Home Page</a>
<li><a href="http://www.altavista.digital.com/">Alta Vista search</a>
<li><a href="http://www.unitedmedia.com/comics/dilbert">Dilbert</a>
<h4>Search engines</h4>
<ul>
<li><a href="http://www.dejanews.com/">DejaNews</a>
<li><a href="http://www.webcrawler.com/">WebCrawler Search</a>
<li><a href="http://www.yahoo.com/">Yahoo search</a>
<li><a href="http://www.infoseek.com/">Infoseek search</a>
<li><a href="http://www.excite.com/">Excite</a>
<li><a href="http://www.lycos.com/">Lycos search</a>
<li><a href="http://www.uktravel.com/index.html">UK Travel Guide</a>
<li><a href="http://www.yell.co.uk/">This is YELL</a>
<li><a href="http://www.whowhere.com/">WhoWhere</a>
</ul>
<h4>Acorn related</h4>
<ul>
<li><a href="http://www.xemplar.co.uk/">Xemplar Home Page</a>
<li><a href="http://www.cybervillage.co.uk/acorn/">The Acorn Cybervillage</a>
<li><a href="http://pink.idg.co.uk/acornuser/index.html">Acorn User Online</a>
<h4>FTP archives</h4>
<ul>
<li><a href="http://www.acorn.co.uk/ftp/">Acorn (WWW interface)</a>
<li><a href="ftp://micros.hensa.ac.uk/micros/arch/riscos/">Hensa Acorn archive</a>
<li><a href="ftp://ftp.uni-stuttgart.de/pub/systems/acorn">Stuttgart Acorn archive</a>
</ul>
</ul>
<h4>Information</h4>
<ul>
<h4>News</h4>
<ul>
<li><a href="http://www.the-telegraph.co.uk/">The Telegraph</a>
<li><a href="http://www.the-times.co.uk/">The Times</a>
<li><a href="http://www.guardian.co.uk/">The Guardian</a>
<li><a href="http://cnn.com/">CNN Interactive</a>
</ul>
<h4>Magazines</h4>
<ul>
<li><a href="http://www.newscientist.com/">New Scientist</a>
<li><a href="http://www.hotwired.com/">HotWired</a>
<li><a href="http://www.shiftcontrol.com/">Shift Control</a>
<li><a href="http://inkpot.com/">The Flying Inkpot</a>
<li><a href="http://www.forteantimes.com/">Fortean Times Online</a>
</ul>
<h4>HTML and the Internet</h4>
<ul>
<li><a href="http://www.w3.org/">World Wide Web consortium</a>
<li><a href="http://www.earth.com/bad-style/">HTML Bad Style Page</a>
<li><a href="http://www.nadn.navy.mil/html.html">HTML Resources</a>
<li><a href="http://www.microsoft.com/workshop/design/colors/X11_Hue.HTM">X11 Colour Names: Sorted by hue</a>
<li><a href="http://www.it.kth.se/docs/rfc/">List of RFCs</a>
</ul>
<h4>Miscellaneous</h4>
<ul>
<li><a href="http://www.inetgames.com/~eyezzz/">The Programming WareHouse</a>
<li><a href="http://www.comlab.ox.ac.uk/archive/other/rowing.html">The World Wide Web Virtual Library: Rowing</a>
<li><a href="http://www.aaa.com.au/A_Z/">Australian A to Z Animal Archive</a>
<li><a href="http://www.man.ac.uk/Geology/pwood/esenet/esintro.htm">Internet resources for Earth and Environmental Scientists</a>
</ul>
</ul>
<h4>Fun</h4>
<ul>
<h4>Film and television</h4>
<ul>
<li><a href="http://mrdata.simplenet.com/midi.htm">The Ultimate Theme Song MIDI Page</a>
<li><a href="http://www.like.it/vertigo/cliches.html">The Movie Cliches List</a>
<li><a href="http://www.users.dircon.co.uk/~bandc/a.wiseman/625/index.htm">6025 Television Room</a>
<li><a href="http://www.scifi.com/">Sci-Fi Channel: The Dominion</a>
<li><a href="http://moose.spesh.com/teletubbies/index.html">Time For Teletubbies</a>
<li><a href="http://www.tangh.demon.co.uk/tubbytoast/index.html">Teletubbies come to play!</a>
</ul>
<h4>Miscellaneous</h4>
<ul>
<li><a href="http://www.fibblesnork.com/lego/guide/">Fibblesnork</a>
<li><a href="http://www.planetquake.com/">Planet Quake</a>
<li><a href="http://www.netaxs.com/~cparker/front/hub.html">Charley Parker's virtual comic book - ARGON ZARK!</a>
<li><a href="http://animeonline.org/">AnimeOnline - Everything Anime</a>
<li><a href="http://www.theonion.com/">The ONION - Number One In News</a>
</ul>
</ul>
<h4>Weird</h4>
<ul>
<li><a href="http://www.mds.mdh.se/~elt94aem/kosida.htm">The Cow Liberation Army Faction</a>
<li><a href="http://iguana.images.com/">Iguana Images</a>
<li><a href="http://www.xmission.com/~grue/whale/">The Infamous Exploding Whale</a>
<li><a href="http://www.beyondweird.com/index.html">The OuterNet</a>
<li><a href="http://www.planet.com/dirtweb/dirt.html">Museum of Dirt</a>
<li><a href="http://www.owlnet.rice.edu/~gouge/twinkies.html">The T.W.I.N.K.I.E.S. Project</a>
<li><a href="http://infobahn.com/pages/anagram.html">Main Sanitary Nag (Anagram Insanity)</a>
<li><a href="http://www.conspire.com/">60 Greatest Conspiracies of All Time</a>
</ul>
</ul>
</body>
</html>
Resources/UK/Phoenix/Messages
View file @ 7d541185
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
_TaskName:Phoenix _TaskName:Phoenix
_SpriName:!phoenix _SpriName:!phoenix
Version:1.20 (12-Sep-97) ß-2 Version:1.20 (12-Sep-97) ß-3
# Errors # Errors
# ====== # ======
......
Resources/UK/Phoenix/Res,fae
View file @ 7d541185
No preview for this file type
Resources/UK/Ursula/Messages
View file @ 7d541185
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
_TaskName:Browse _TaskName:Browse
_SpriName:!browse _SpriName:!browse
Version:1.20 (12-Sep-97)ß Version:1.20 (12-Sep-97) ß-3
# Errors # Errors
# ====== # ======
......
Resources/UK/Ursula/Res,fae
View file @ 7d541185
No preview for this file type
c/Menus
View file @ 7d541185
...@@ -213,6 +213,7 @@ int menus_show_utils(int eventcode, ToolboxEvent * event, IdBlock * idb, void *h ...@@ -213,6 +213,7 @@ int menus_show_utils(int eventcode, ToolboxEvent * event, IdBlock * idb, void *h
int menus_show_file(int eventcode, ToolboxEvent * event, IdBlock * idb, void * handle) int menus_show_file(int eventcode, ToolboxEvent * event, IdBlock * idb, void * handle)
{ {
browser_data * b; browser_data * b;
char * url;
#ifdef TRACE #ifdef TRACE
if (tl & (1u<<4)) Printf("menus_show_file: Called\n"); if (tl & (1u<<4)) Printf("menus_show_file: Called\n");
...@@ -242,6 +243,13 @@ int menus_show_file(int eventcode, ToolboxEvent * event, IdBlock * idb, void * h ...@@ -242,6 +243,13 @@ int menus_show_file(int eventcode, ToolboxEvent * event, IdBlock * idb, void * h
if (b->nchildren) menu_set_fade(0, idb->self_id, FilePrint, 1); if (b->nchildren) menu_set_fade(0, idb->self_id, FilePrint, 1);
else menu_set_fade(0, idb->self_id, FilePrint, 0); else menu_set_fade(0, idb->self_id, FilePrint, 0);
/* Do we have a current location? */
url = browser_current_url(b);
if (url && *url) menu_set_fade(0, idb->self_id, FileSaveCurrentLocation, 0);
else menu_set_fade(0, idb->self_id, FileSaveCurrentLocation, 1);
#ifdef TRACE #ifdef TRACE
if (tl & (1u<<4)) Printf("menus_show_file: Successful\n"); if (tl & (1u<<4)) Printf("menus_show_file: Successful\n");
#endif #endif
......
c/Protocols
View file @ 7d541185
...@@ -555,16 +555,31 @@ _kernel_oserror * protocols_atats_got_ram_fetch(WimpMessage * m) ...@@ -555,16 +555,31 @@ _kernel_oserror * protocols_atats_got_ram_fetch(WimpMessage * m)
} }
else if (m->hdr.your_ref == save_link_reference) else if (m->hdr.your_ref == save_link_reference)
{ {
/* Save a link as a URI file */ if (is_known_browser(save_link_browser))
{
if (save_link_token)
{
/* Save a link as a URI file */
if ( return save_transfer_uri(save_link_token->anchor,
is_known_browser(save_link_browser) && 0,
save_link_token &save_link_transmitted,
) m);
return save_transfer_uri(save_link_token->anchor, }
0, else
&save_link_transmitted, {
m); /* Save the current location as a URI file */
char * url = browser_current_url(save_link_browser);
if (!url) url = " ";
return save_transfer_uri(url,
0,
&save_link_transmitted,
m);
}
}
} }
else if (m->hdr.your_ref == save_location_reference) else if (m->hdr.your_ref == save_location_reference)
{ {
...@@ -797,15 +812,25 @@ static _kernel_oserror * protocols_atats_got_data_save_ack(WimpMessage * m) ...@@ -797,15 +812,25 @@ static _kernel_oserror * protocols_atats_got_data_save_ack(WimpMessage * m)
} }
else if (m->hdr.your_ref == save_link_reference) else if (m->hdr.your_ref == save_link_reference)
{ {
/* Save a link as a URI file */ if (is_known_browser(save_link_browser))
if (
is_known_browser(save_link_browser) &&
save_link_token
)
{ {
e = save_save_uri(path, save_link_token->anchor, 0); if (save_link_token)
if (!e) ok = 1; {
/* Save a link as a URI file */
e = save_save_uri(path, save_link_token->anchor, 0);
if (!e) ok = 1;
}
else
{
/* Save the current location as a URI file */
char * url = browser_current_url(save_link_browser);
if (!url) url = " ";
return save_save_uri(path, url, 0);
}
} }
} }
else if (m->hdr.your_ref == save_location_reference) else if (m->hdr.your_ref == save_location_reference)
......
c/SaveFile
View file @ 7d541185
...@@ -295,6 +295,24 @@ int savefile_to_be_shown(int eventcode, ToolboxEvent * event, IdBlock * idb, voi ...@@ -295,6 +295,24 @@ int savefile_to_be_shown(int eventcode, ToolboxEvent * event, IdBlock * idb, voi
} }
break; break;
/* Save the current location as a URI file */
case FileSaveCurrentLocation:
{
char * url = browser_current_url(b);
if (!url) url = " ";
ChkError(savefile_set_leafname_from_url(idb->self_id, SaveFileWrit, url));
ChkError(savefile_set_filetype(idb->self_id, SaveFileDrag, FileType_URI));
savefile_browser = b;
savefile_token = NULL;
ok = 1;
}
break;
/* Export the link the pointer was over when the menu opened */ /* Export the link the pointer was over when the menu opened */
case ExportLink: case ExportLink:
...@@ -642,6 +660,19 @@ static int savefile_drag_ended(int eventcode, ToolboxEvent * event, IdBlock * id ...@@ -642,6 +660,19 @@ static int savefile_drag_ended(int eventcode, ToolboxEvent * event, IdBlock * id
} }
break; break;
/* Size of a URI file for the current location */
case FileSaveCurrentLocation:
{
char * url = browser_current_url(savefile_browser);
if (!url) url = " ";
saving = protocols_saving_link;
size = save_uri_size(url, 0);
}
break;
/* Size of a URI file */ /* Size of a URI file */
case ExportLink: case ExportLink:
......
h/Menus
View file @ 7d541185
...@@ -65,10 +65,11 @@ ...@@ -65,10 +65,11 @@
/* File menu component IDs */ /* File menu component IDs */
#define FileSaveFrame 0x10600 /* Leading to Save dialogue for saving frame source */ #define FileSaveFrame 0x10600 /* Leading to Save dialogue for saving frame source */
#define FileSaveParent 0x10601 /* Leading to Save dialogue for saving parent source */ #define FileSaveParent 0x10601 /* Leading to Save dialogue for saving parent source */
#define FilePrint 0x10602 /* Item leading to the Print dialogue */ #define FilePrint 0x10602 /* Item leading to the Print dialogue */
#define FileExport 0x10603 /* Item leading to the Export submenu */ #define FileExport 0x10603 /* Item leading to the Export submenu */
#define FileSaveCurrentLocation 0x10604 /* Leading to Save dialogue for saving current location */
/* File menu event codes */ /* File menu event codes */
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment