mirrors/netsurf
1
0
Fork 0
mirror of https://github.com/netsurf-browser/netsurf synced 2024-11-26 16:29:36 +03:00
Code Issues Packages Projects Releases Wiki Activity

Report fetching of 1 object/stylesheet correctly in status bar

Browse Source 
svn path=/trunk/netsurf/; revision=2609
This commit is contained in:
Adrian Lees 2006-05-29 00:55:43 +00:00
parent c2f54bca82
commit 8f7eeb9e58
5 changed files with 44 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
!NetSurf/Resources/de/Messages
View File

@ -424,11 +424,11 @@ Complete:Page complete (%gs)
Redirecting:Redirecting...
Processing:Processing document
Formatting:Formatting document
FetchObjs:Loading %u objects
FetchObjs2:Loading %u objects: %s
FetchObjs:Loading %u %s
FetchObjs2:Loading %u %s: %s
Done:Document done
FetchStyle:Loading %u stylesheets
FetchStyle2:Loading %u stylesheets: %s
FetchStyle:Loading %u %s
FetchStyle2:Loading %u %s: %s
# Fetch warning/error messages - displayed in status bar
#
@ -509,6 +509,10 @@ Yes:Ja
No:Nein
Replace:Replace file
DontReplace:Don't replace
obj:object
objs:objects
styl:stylesheet
styls:stylesheets
# Interactive help
# ================

12
!NetSurf/Resources/en/Messages
View File

@ -424,11 +424,11 @@ Complete:Page complete (%gs)
Redirecting:Redirecting...
Processing:Processing document
Formatting:Formatting document
FetchObjs:Loading %u objects
FetchObjs2:Loading %u objects: %s
FetchObjs:Loading %u %s
FetchObjs2:Loading %u %s: %s
Done:Document done
FetchStyle:Loading %u stylesheets
FetchStyle2:Loading %u stylesheets: %s
FetchStyle:Loading %u %s
FetchStyle2:Loading %u %s: %s
# Fetch warning/error messages - displayed in status bar
#
@ -509,6 +509,10 @@ Yes:Yes
No:No
Replace:Replace file
DontReplace:Don't replace
obj:object
objs:objects
styl:stylesheet
styls:stylesheets
# Interactive help
# ================

12
!NetSurf/Resources/fr/Messages
View File

@ -424,11 +424,11 @@ Complete:Page terminée (%gs)
Redirecting:Redirection en cours...
Processing:Traitement du document
Formatting:Formatage du document
FetchObjs:Chargement de %u objets
FetchObjs2:Chargement de %u objets: %s
FetchObjs:Chargement de %u %s
FetchObjs2:Chargement de %u %s: %s
Done:Document terminé
FetchStyle:Chargement de %u feuilles de styles
FetchStyle2:Chargement de %u feuilles de styles: %s
FetchStyle:Chargement de %u %s
FetchStyle2:Chargement de %u %s: %s
# Fetch warning/error messages - displayed in status bar
#
@ -509,6 +509,10 @@ Yes:Oui
No:Non
Replace:Replace file
DontReplace:Don't replace
obj:objet
objs:objets
styl:feuille de styles
styls:feuilles de styles
# Interactive help
# ================

12
!NetSurf/Resources/nl/Messages
View File

@ -424,11 +424,11 @@ Complete:pagina verwerkt (%gs)
Redirecting:doorverwijzen...
Processing:verwerking van document
Formatting:document opmaken
FetchObjs:laden van %u objecten
FetchObjs2:laden van %u objecten: %s
FetchObjs:laden van %u %s
FetchObjs2:laden van %u %s: %s
Done:klaar
FetchStyle:laden van %u stylesheets
FetchStyle2:laden van %u stylesheets: %s
FetchStyle:laden van %u %s
FetchStyle2:laden van %u %s: %s
# Fetch warning/error messages - displayed in status bar
#
@ -509,6 +509,10 @@ Yes:Ja
No:Nee
Replace:Replace file
DontReplace:Don't replace
obj:object
objs:objecten
styl:stylesheet
styls:stylesheets
# Interactive help
# ================

17
render/html.c
View File

@ -362,7 +362,8 @@ bool html_convert(struct content *c, int width, int height)
content_set_status(c, messages_get("Done"));
} else {
c->status = CONTENT_STATUS_READY;
content_set_status(c, messages_get("FetchObjs"), c->active);
content_set_status(c, messages_get("FetchObjs"), c->active,
messages_get((c->active == 1) ? "obj" : "objs"));
}
return true;
@ -730,7 +731,8 @@ bool html_find_stylesheets(struct content *c, xmlNode *head)
while (c->active != 0) {
if (c->active != last_active) {
content_set_status(c, messages_get("FetchStyle"),
c->active);
c->active,
messages_get((c->active == 1) ? "styl" : "styls"));
content_broadcast(c, CONTENT_MSG_STATUS, msg_data);
last_active = c->active;
}
@ -821,7 +823,9 @@ void html_convert_css_callback(content_msg msg, struct content *css,
case CONTENT_MSG_STATUS:
content_set_status(c, messages_get("FetchStyle2"),
c->active, css->status_message);
c->active,
messages_get((c->active == 1) ? "styl" : "styls"),
css->status_message);
content_broadcast(c, CONTENT_MSG_STATUS, data);
break;
@ -1069,7 +1073,9 @@ void html_object_callback(content_msg msg, struct content *object,
case CONTENT_MSG_STATUS:
content_set_status(c, messages_get("FetchObjs2"),
c->active, object->status_message);
c->active,
messages_get((c->active == 1) ? "obj" : "objs"),
object->status_message);
/* content_broadcast(c, CONTENT_MSG_STATUS, 0); */
break;
@ -1169,7 +1175,8 @@ void html_object_callback(content_msg msg, struct content *object,
content_broadcast(c, CONTENT_MSG_DONE, data);
}
if (c->status == CONTENT_STATUS_READY)
content_set_status(c, messages_get("FetchObjs"), c->active);
content_set_status(c, messages_get("FetchObjs"), c->active,
messages_get((c->active == 1) ? "obj" : "objs"));
}