mirrors/netsurf
1
0
Fork 0
mirror of https://github.com/netsurf-browser/netsurf synced 2025-02-23 18:04:48 +03:00
Code Issues Packages Projects Releases Wiki Activity

[project @ 2004-06-06 19:57:16 by bursa]

Browse Source 
Use url_nice() instead of ro_gui_download_leaf().

svn path=/import/netsurf/; revision=932
This commit is contained in:
James Bursa 2004-06-06 19:57:16 +00:00
parent 6879c02a33
commit a6f59ccd76
1 changed files with 8 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
riscos/download.c
View File

@ -16,15 +16,13 @@
#include "netsurf/riscos/gui.h" #include "netsurf/riscos/gui.h"
#include "netsurf/utils/log.h" #include "netsurf/utils/log.h"
#include "netsurf/utils/messages.h" #include "netsurf/utils/messages.h"
#include "netsurf/utils/url.h"
#include "netsurf/utils/utils.h" #include "netsurf/utils/utils.h"
static wimp_window *download_template; static wimp_window *download_template;
static void ro_gui_download_leaf(const char *url, char *leaf);
/** /**
* Load the download window template. * Load the download window template.
*/ */
@ -41,6 +39,7 @@ void ro_gui_download_init(void)
gui_window *gui_create_download_window(struct content *content) gui_window *gui_create_download_window(struct content *content)
{ {
char *nice;
gui_window *g = xcalloc(1, sizeof(gui_window)); gui_window *g = xcalloc(1, sizeof(gui_window));
os_error *e; os_error *e;
@ -65,14 +64,18 @@ gui_window *gui_create_download_window(struct content *content)
g->status; g->status;
download_template->icons[ICON_DOWNLOAD_STATUS].data.indirected_text.size = download_template->icons[ICON_DOWNLOAD_STATUS].data.indirected_text.size =
256; 256;
sprintf(g->data.download.sprite_name, "file_%x", sprintf(g->data.download.sprite_name, "file_%.3x",
g->data.download.file_type); g->data.download.file_type);
e = xwimpspriteop_select_sprite(g->data.download.sprite_name, 0); e = xwimpspriteop_select_sprite(g->data.download.sprite_name, 0);
if (e) if (e)
strcpy(g->data.download.sprite_name, "file_xxx"); strcpy(g->data.download.sprite_name, "file_xxx");
download_template->icons[ICON_DOWNLOAD_ICON].data.indirected_sprite.id = download_template->icons[ICON_DOWNLOAD_ICON].data.indirected_sprite.id =
(osspriteop_id) g->data.download.sprite_name; (osspriteop_id) g->data.download.sprite_name;
ro_gui_download_leaf(content->url, g->data.download.path); strcpy(g->data.download.path, messages_get("SaveObject"));
if ((nice = url_nice(content->url))) {
strcpy(g->data.download.path, nice);
free(nice);
}
download_template->icons[ICON_DOWNLOAD_PATH].data.indirected_text.text = download_template->icons[ICON_DOWNLOAD_PATH].data.indirected_text.text =
g->data.download.path; g->data.download.path;
download_template->icons[ICON_DOWNLOAD_PATH].data.indirected_text.size = download_template->icons[ICON_DOWNLOAD_PATH].data.indirected_text.size =
@ -90,38 +93,6 @@ gui_window *gui_create_download_window(struct content *content)
} }
/**
* Find a friendly RISC OS leaf name for a URL.
*/
void ro_gui_download_leaf(const char *url, char *leaf)
{
char *slash;
size_t len;
unsigned int i;
/* take url from last / to first non-RISC OS character, eg. '.' */
slash = strrchr(url, '/');
if (!slash) {
strcpy(leaf, "download");
return;
}
/*len = strspn(slash + 1, "0123456789" "ABCDEFGHIJKLMNOPQRSTUVWXYZ"
"abcdefghijklmnopqrstuvwxyz");*/ /* over-paranoid */
len = strlen(slash+1);
if (40 < len)
len = 40;
strncpy(leaf, slash + 1, len);
leaf[len] = 0;
/* swap "." for "/" */
for (i=0; i!=len; i++) {
if (leaf[i] == '.') {
leaf[i] = '/';
}
}
}
/** /**
* Refresh the status icon in the download window. * Refresh the status icon in the download window.
*/ */