r6589 tlsa - /trunk/netsurf/framebuffer/fb_plotters.c
by netsurf＠semichrome.net
Author: tlsa
Date: Sat Feb 21 09:06:15 2009
New Revision: 6589
URL: http://source.netsurf-browser.org?rev=6589&view=rev
Log:
Fix framebuffer tiled plot to use x and y coords correctly. Fixes top of bbc news graduated fill extent.
Modified:
trunk/netsurf/framebuffer/fb_plotters.c
Modified: trunk/netsurf/framebuffer/fb_plotters.c
URL: http://source.netsurf-browser.org/trunk/netsurf/framebuffer/fb_plotters.c...
==============================================================================
--- trunk/netsurf/framebuffer/fb_plotters.c (original)
+++ trunk/netsurf/framebuffer/fb_plotters.c Sat Feb 21 09:06:15 2009
@@ -52,14 +52,14 @@
( (x) > (cx2) ? POINT_RIGHTOF_REGION : 0) | \
( (x) < (cx1) ? POINT_LEFTOF_REGION : 0) )
-#define SWAP(a, b) do { int t; t=(a); (a)=(b); (b)=t; } while(0)
+#define SWAP(a, b) do { int t; t=(a); (a)=(b); (b)=t; } while(0)
/* clip a rectangle to another rectangle */
-bool fb_plotters_clip_rect(const bbox_t *clip,
+bool fb_plotters_clip_rect(const bbox_t *clip,
int *x0, int *y0, int *x1, int *y1)
{
- char region1;
- char region2;
+ char region1;
+ char region2;
if (*x1 < *x0) SWAP(*x0, *x1);
@@ -70,7 +70,7 @@
/* area lies entirely outside the clipping rectangle */
if ((region1 | region2) && (region1 & region2))
- return false;
+ return false;
if (*x0 < clip->x0)
*x0 = clip->x0;
@@ -102,7 +102,7 @@
/** Clip a line to a bounding box.
*/
-bool fb_plotters_clip_line(const bbox_t *clip,
+bool fb_plotters_clip_line(const bbox_t *clip,
int *x0, int *y0, int *x1, int *y1)
{
char region1;
@@ -113,27 +113,27 @@
while (region1 | region2) {
if (region1 & region2) {
/* line lies entirely outside the clipping rectangle */
- return false;
+ return false;
}
if (region1) {
/* first point */
- if (region1 & POINT_BELOW_REGION) {
+ if (region1 & POINT_BELOW_REGION) {
/* divide line at bottom */
*x0 = (*x0 + (*x1 - *x0) *
(clip->y1 - 1 - *y0) / (*y1-*y0));
*y0 = clip->y1 - 1;
- } else if (region1 & POINT_ABOVE_REGION) {
+ } else if (region1 & POINT_ABOVE_REGION) {
/* divide line at top */
*x0 = (*x0 + (*x1 - *x0) *
(clip->y0 - *y0) / (*y1-*y0));
*y0 = clip->y0;
- } else if (region1 & POINT_RIGHTOF_REGION) {
+ } else if (region1 & POINT_RIGHTOF_REGION) {
/* divide line at right */
*y0 = (*y0 + (*y1 - *y0) *
(clip->x1 - 1 - *x0) / (*x1-*x0));
*x0 = clip->x1 - 1;
- } else if (region1 & POINT_LEFTOF_REGION) {
+ } else if (region1 & POINT_LEFTOF_REGION) {
/* divide line at right */
*y0 = (*y0 + (*y1 - *y0) *
(clip->x0 - *x0) / (*x1-*x0));
@@ -144,22 +144,22 @@
clip->x0, clip->x1 - 1, clip->y0, clip->y1 - 1);
} else {
/* second point */
- if (region2 & POINT_BELOW_REGION) {
+ if (region2 & POINT_BELOW_REGION) {
/* divide line at bottom*/
*x1 = (*x0 + (*x1 - *x0) *
(clip->y1 - 1 - *y0) / (*y1-*y0));
*y1 = clip->y1 - 1;
- } else if (region2 & POINT_ABOVE_REGION) {
+ } else if (region2 & POINT_ABOVE_REGION) {
/* divide line at top*/
*x1 = (*x0 + (*x1 - *x0) *
(clip->y0 - *y0) / (*y1-*y0));
*y1 = clip->y0;
- } else if (region2 & POINT_RIGHTOF_REGION) {
+ } else if (region2 & POINT_RIGHTOF_REGION) {
/* divide line at right*/
*y1 = (*y0 + (*y1 - *y0) *
(clip->x1 - 1 - *x0) / (*x1 - *x0));
*x1 = clip->x1 - 1;
- } else if (region2 & POINT_LEFTOF_REGION) {
+ } else if (region2 & POINT_LEFTOF_REGION) {
/* divide line at right*/
*y1 = (*y0 + (*y1 - *y0) *
(clip->x0 - *x0) / (*x1 - *x0));
@@ -203,7 +203,7 @@
fb_plot_ctx.y1 = y1;
}
- /*LOG(("%d, %d - %d, %d clipped to %d, %d - %d, %d",
+ /*LOG(("%d, %d - %d, %d clipped to %d, %d - %d, %d",
x0,y0,x1,y1,
fb_plot_ctx.x0, fb_plot_ctx.y0, fb_plot_ctx.x1, fb_plot_ctx.y1)); */
@@ -223,7 +223,7 @@
b = ((((pixel & 0xFF0000) >> 16) * opacity) >> 8) +
((((scrpixel & 0xFF0000) >> 16) * (0xFF - opacity)) >> 8);
-
+
return r | (g << 8) | (b << 16);
}
@@ -231,7 +231,7 @@
typedef struct dcPt_s {
int x;
- int y;
+ int y;
} dcPt;
typedef struct tEdge {
@@ -287,7 +287,7 @@
else
edge->yUpper = upper.y;
- if (!fb_plotters_clip_line_ctx(&lower.x, &lower.y,
+ if (!fb_plotters_clip_line_ctx(&lower.x, &lower.y,
&upper.x, &edge->yUpper)) {
free(edge);
} else {
@@ -340,8 +340,8 @@
LOG(("only one active edge!"));
break;
} else {
- linefn(p1->xIntersect, scan,
- p2->xIntersect, scan,
+ linefn(p1->xIntersect, scan,
+ p2->xIntersect, scan,
1, fill, false, false);
}
p1 = p2->next;
@@ -349,7 +349,7 @@
}
static void deleteAfter(Edge *q)
-{
+{
Edge *p = q->next;
q->next = p->next;
free (p);
@@ -379,7 +379,7 @@
q = p->next;
insertEdge(active, p);
p = q;
- }
+ }
}
@@ -417,22 +417,23 @@
return true;
}
-bool fb_plotters_bitmap_tile(int x, int y,
+bool fb_plotters_bitmap_tile(int x, int y,
int width, int height,
struct bitmap *bitmap, colour bg,
bool repeat_x, bool repeat_y,
struct content *content,
- bool (bitmapfn)(int x, int y,
+ bool (bitmapfn)(int x, int y,
int width, int height,
- struct bitmap *bitmap,
+ struct bitmap *bitmap,
colour bg,
struct content *content))
{
int xf,yf;
- /* x and y define top left hand corner of tile start, the width height
- * are the mage scaling and the bounding box defines teh extent of the
- * repeat
+ /* x and y define coordinate of top left of of the initial explicitly
+ * placed tile. The width and height are the image scaling and the
+ * bounding box defines the extent of the repeat (which may go in all
+ * four directions from the initial tile).
*/
LOG(("x %d, y %d, width %d, height %d, bitmap %p, repx %d repy %d content %p", x,y,width,height,bitmap,repeat_x, repeat_y, content));
@@ -443,27 +444,51 @@
return bitmapfn(x, y, width, height, bitmap, bg,content);
}
+ /* Initial tile and repeat left, right and down */
for (xf = x; xf < fb_plot_ctx.x1; xf += width) {
for (yf = y; yf < fb_plot_ctx.y1; yf += height) {
bitmapfn(xf, yf, width, height, bitmap, bg, content);
if (!repeat_y)
break;
+ }
+ for (yf = y - height; yf + height > fb_plot_ctx.y0;
+ yf -= height) {
+ if (!repeat_y)
+ break;
+ bitmapfn(xf, yf, width, height, bitmap, bg, content);
}
if (!repeat_x)
break;
}
+ /* repeat left and right above */
+ for (xf = x - width; xf + height > fb_plot_ctx.x0; xf -= width) {
+ if (!repeat_x)
+ break;
+ for (yf = y; yf < fb_plot_ctx.y1; yf += height) {
+ bitmapfn(xf, yf, width, height, bitmap, bg, content);
+ if (!repeat_y)
+ break;
+ }
+ for (yf = y - height; yf + height > fb_plot_ctx.y0;
+ yf -= height) {
+ if (!repeat_y)
+ break;
+ bitmapfn(xf, yf, width, height, bitmap, bg, content);
+ }
+ }
+
return true;
}
bool fb_plotters_move_block(int srcx, int srcy, int width, int height, int dstx, int dsty)
{
- uint8_t *srcptr = (framebuffer->ptr +
- (srcy * framebuffer->linelen) +
+ uint8_t *srcptr = (framebuffer->ptr +
+ (srcy * framebuffer->linelen) +
(srcx));
- uint8_t *dstptr = (framebuffer->ptr +
- (dsty * framebuffer->linelen) +
+ uint8_t *dstptr = (framebuffer->ptr +
+ (dsty * framebuffer->linelen) +
(dstx));
bbox_t redrawbox;
@@ -473,7 +498,7 @@
memmove(dstptr, srcptr, (width * height * framebuffer->bpp) / 8);
/* callback to the os specific routine in case it needs to do something
- * explicit to redraw
+ * explicit to redraw
*/
redrawbox.x0 = dstx;
redrawbox.y0 = dsty;
14 years, 3 months
r6588 chris_y - /trunk/netsurf/amiga/dist/Install
by netsurf＠semichrome.net
Author: chris_y
Date: Sat Feb 21 05:09:56 2009
New Revision: 6588
URL: http://source.netsurf-browser.org?rev=6588&view=rev
Log:
Don't show the option for AISS theme is AISS is not installed
Modified:
trunk/netsurf/amiga/dist/Install
Modified: trunk/netsurf/amiga/dist/Install
URL: http://source.netsurf-browser.org/trunk/netsurf/amiga/dist/Install?rev=65...
==============================================================================
--- trunk/netsurf/amiga/dist/Install (original)
+++ trunk/netsurf/amiga/dist/Install Sat Feb 21 05:09:56 2009
@@ -65,14 +65,18 @@
(if (= #options-exist 0)
(
+ (if (exists "TBimages:" (noreq))
+ (set #aiss-theme "AISS")
+ )
+
(set #themename
(askchoice
- (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")
+ (prompt "Please select theme")
+ (help "AISS theme requires AISS (and def_pointers for 32-bit "
+ "pointers), and will only be shown as an option if "
+ "AISS is installed.\n\n"
+ @askchoice-help)
+ (choices "Default" #aiss-theme)
(default 0)
)
)
@@ -121,6 +125,8 @@
(p_setmimetype "bmp" "image/bmp")
(p_setmimetype "ico" "image/ico")
(p_setmimetype "sprite" "image/x-riscos-sprite")
+(p_setmimetype "lha" "application/x-lha")
+(p_setmimetype "zip" "application/x-zip")
(complete 100)
14 years, 3 months
r6587 tlsa - /trunk/netsurf/nsfb
by netsurf＠semichrome.net
Author: tlsa
Date: Sat Feb 21 04:52:24 2009
New Revision: 6587
URL: http://source.netsurf-browser.org?rev=6587&view=rev
Log:
Let nsfb script be able to run nsfb from other directories.
Modified:
trunk/netsurf/nsfb
Modified: trunk/netsurf/nsfb
URL: http://source.netsurf-browser.org/trunk/netsurf/nsfb?rev=6587&r1=6586&r2=...
==============================================================================
--- trunk/netsurf/nsfb (original)
+++ trunk/netsurf/nsfb Sat Feb 21 04:52:24 2009
@@ -12,11 +12,11 @@
LOG=netsurf-log.txt
fi
-if [ -x nsfb-sdl ]; then
+if [ -x $(dirname $0)/nsfb-sdl ]; then
TYPE=-sdl
-elif [ -x nsfb-linux ]; then
+elif [ -x $(dirname $0)/nsfb-linux ]; then
TYPE=-linux
-elif [ -x nsfb-dummy ]; then
+elif [ -x $(dirname $0)/nsfb-dummy ]; then
TYPE=-dummy
fi
14 years, 3 months
r6586 jmb - /trunk/netsurf/content/fetchers/fetch_curl.c
by netsurf＠semichrome.net
Author: jmb
Date: Fri Feb 20 20:46:47 2009
New Revision: 6586
URL: http://source.netsurf-browser.org?rev=6586&view=rev
Log:
Given that the build-time SSL detection can be somewhat inaccurate, attempt to determine whether we can use the SSL_CTX stuff at runtime.
Modified:
trunk/netsurf/content/fetchers/fetch_curl.c
Modified: trunk/netsurf/content/fetchers/fetch_curl.c
URL: http://source.netsurf-browser.org/trunk/netsurf/content/fetchers/fetch_cu...
==============================================================================
--- trunk/netsurf/content/fetchers/fetch_curl.c (original)
+++ trunk/netsurf/content/fetchers/fetch_curl.c Fri Feb 20 20:46:47 2009
@@ -102,6 +102,9 @@
static CURL *fetch_blank_curl;
static struct cache_handle *curl_handle_ring = 0; /**< Ring of cached handles */
static int curl_fetchers_registered = 0;
+#ifdef WITH_SSL
+static bool curl_with_openssl;
+#endif
static char fetch_error_buffer[CURL_ERROR_SIZE]; /**< Error buffer for cURL. */
static char fetch_progress_buffer[256]; /**< Progress buffer for cURL */
@@ -210,6 +213,16 @@
SETOPT(CURLOPT_CAINFO, option_ca_bundle);
if (option_ca_path && strcmp(option_ca_path, ""))
SETOPT(CURLOPT_CAPATH, option_ca_path);
+
+#ifdef WITH_SSL
+ /* Detect whether the SSL CTX function API works */
+ curl_with_openssl = true;
+ code = curl_easy_setopt(fetch_blank_curl,
+ CURLOPT_SSL_CTX_FUNCTION, NULL);
+ if (code != CURLE_OK) {
+ curl_with_openssl = false;
+ }
+#endif
/* cURL initialised okay, register the fetchers */
@@ -595,14 +608,18 @@
/* Disable certificate verification */
SETOPT(CURLOPT_SSL_VERIFYPEER, 0L);
SETOPT(CURLOPT_SSL_VERIFYHOST, 0L);
- SETOPT(CURLOPT_SSL_CTX_FUNCTION, NULL);
- SETOPT(CURLOPT_SSL_CTX_DATA, NULL);
+ if (curl_with_openssl) {
+ SETOPT(CURLOPT_SSL_CTX_FUNCTION, NULL);
+ SETOPT(CURLOPT_SSL_CTX_DATA, NULL);
+ }
} else {
/* do verification */
SETOPT(CURLOPT_SSL_VERIFYPEER, 1L);
SETOPT(CURLOPT_SSL_VERIFYHOST, 2L);
- SETOPT(CURLOPT_SSL_CTX_FUNCTION, fetch_curl_sslctxfun);
- SETOPT(CURLOPT_SSL_CTX_DATA, f);
+ if (curl_with_openssl) {
+ SETOPT(CURLOPT_SSL_CTX_FUNCTION, fetch_curl_sslctxfun);
+ SETOPT(CURLOPT_SSL_CTX_DATA, f);
+ }
}
#endif
14 years, 3 months
r6585 tlsa - in /trunk/netsurf: !NetSurf/Resources/de/Messages !NetSurf/Resources/en/Messages !NetSurf/Resources/fr/Messages !NetSurf/Resources/it/Messages !NetSurf/Resources/nl/Messages desktop/browser.c
by netsurf＠semichrome.net
Author: tlsa
Date: Fri Feb 20 14:48:30 2009
New Revision: 6585
URL: http://source.netsurf-browser.org?rev=6585&view=rev
Log:
Fix button hover assert.
Modified:
trunk/netsurf/!NetSurf/Resources/de/Messages
trunk/netsurf/!NetSurf/Resources/en/Messages
trunk/netsurf/!NetSurf/Resources/fr/Messages
trunk/netsurf/!NetSurf/Resources/it/Messages
trunk/netsurf/!NetSurf/Resources/nl/Messages
trunk/netsurf/desktop/browser.c
Modified: trunk/netsurf/!NetSurf/Resources/de/Messages
URL: http://source.netsurf-browser.org/trunk/netsurf/%21NetSurf/Resources/de/M...
==============================================================================
--- trunk/netsurf/!NetSurf/Resources/de/Messages (original)
+++ trunk/netsurf/!NetSurf/Resources/de/Messages Fri Feb 20 14:48:30 2009
@@ -477,6 +477,7 @@
FormRadio:Anklicken wählt diese Option
FormSubmit:Daten übertragen an %s
FormBadSubmit:Achtung: Daten können nicht gesendet werden
+FormButton:Warning: button can not be activated
FormTextarea:Anklicken zum Editieren
FormTextbox:Anklicken zum Bearbeiten des Feldes
FormReset:Reset form (not implemented)
Modified: trunk/netsurf/!NetSurf/Resources/en/Messages
URL: http://source.netsurf-browser.org/trunk/netsurf/%21NetSurf/Resources/en/M...
==============================================================================
--- trunk/netsurf/!NetSurf/Resources/en/Messages (original)
+++ trunk/netsurf/!NetSurf/Resources/en/Messages Fri Feb 20 14:48:30 2009
@@ -477,6 +477,7 @@
FormRadio:Click to choose this option
FormSubmit:Send form to %s
FormBadSubmit:Warning: form can not be submitted
+FormButton:Warning: button can not be activated
FormTextarea:Click to edit the text
FormTextbox:Click to edit this field
FormReset:Reset form (not implemented)
Modified: trunk/netsurf/!NetSurf/Resources/fr/Messages
URL: http://source.netsurf-browser.org/trunk/netsurf/%21NetSurf/Resources/fr/M...
==============================================================================
--- trunk/netsurf/!NetSurf/Resources/fr/Messages (original)
+++ trunk/netsurf/!NetSurf/Resources/fr/Messages Fri Feb 20 14:48:30 2009
@@ -477,6 +477,7 @@
FormRadio:Cliquer pour choisir cette option
FormSubmit:Envoyer le formulaire à %s
FormBadSubmit:Alerte: le formulaire n'a pas pu être envoyé
+FormButton:Warning: button can not be activated
FormTextarea:Cliquer pour éditer ce texte
FormTextbox:Cliquer pour éditer ce champ
FormReset:RAZ du formulaire (non implémenté)
Modified: trunk/netsurf/!NetSurf/Resources/it/Messages
URL: http://source.netsurf-browser.org/trunk/netsurf/%21NetSurf/Resources/it/M...
==============================================================================
--- trunk/netsurf/!NetSurf/Resources/it/Messages (original)
+++ trunk/netsurf/!NetSurf/Resources/it/Messages Fri Feb 20 14:48:30 2009
@@ -478,6 +478,7 @@
FormRadio:Clicca per scegliere questa opzione
FormSubmit:Invia form a %s
FormBadSubmit:Attenzione: Il form non può essere inviato
+FormButton:Warning: button can not be activated
FormTextarea:Clicca per editare il testo
FormTextbox:Clicca per editare il campo
FormReset:Resetta form (non ancora implementato)
Modified: trunk/netsurf/!NetSurf/Resources/nl/Messages
URL: http://source.netsurf-browser.org/trunk/netsurf/%21NetSurf/Resources/nl/M...
==============================================================================
--- trunk/netsurf/!NetSurf/Resources/nl/Messages (original)
+++ trunk/netsurf/!NetSurf/Resources/nl/Messages Fri Feb 20 14:48:30 2009
@@ -477,6 +477,7 @@
FormRadio:Klikken kiest deze optie
FormSubmit:Verstuur data naar %s
FormBadSubmit:Waarschuwing: data kan niet verzonden worden
+FormButton:Warning: button can not be activated
FormTextarea:Klikken om tekst te bewerken
FormTextbox:Klikken om dit veld te bewerken
FormReset:Reset form (not implemented)
Modified: trunk/netsurf/desktop/browser.c
URL: http://source.netsurf-browser.org/trunk/netsurf/desktop/browser.c?rev=658...
==============================================================================
--- trunk/netsurf/desktop/browser.c (original)
+++ trunk/netsurf/desktop/browser.c Fri Feb 20 14:48:30 2009
@@ -1581,7 +1581,8 @@
status = messages_get("FormFile");
break;
case GADGET_BUTTON:
- /* Do nothing, as this gadget cannot be activated */
+ /* This gadget cannot be activated */
+ status = messages_get("FormButton");
break;
}
14 years, 3 months
r6584 tlsa - /trunk/netsurf/desktop/browser.c
by netsurf＠semichrome.net
Author: tlsa
Date: Fri Feb 20 13:34:40 2009
New Revision: 6584
URL: http://source.netsurf-browser.org?rev=6584&view=rev
Log:
Fix imagemap cursors.
Modified:
trunk/netsurf/desktop/browser.c
Modified: trunk/netsurf/desktop/browser.c
URL: http://source.netsurf-browser.org/trunk/netsurf/desktop/browser.c?rev=658...
==============================================================================
--- trunk/netsurf/desktop/browser.c (original)
+++ trunk/netsurf/desktop/browser.c Fri Feb 20 13:34:40 2009
@@ -116,7 +116,7 @@
int box_x, int box_y, int x, int y);
static void browser_radio_set(struct content *content,
struct form_control *radio);
-static gui_pointer_shape get_pointer_shape(struct box *box);
+static gui_pointer_shape get_pointer_shape(struct box *box, bool imagemap);
static bool browser_window_nearer_text_box(struct box *box, int bx, int by,
int x, int y, int dir, struct box **nearest, int *tx, int *ty,
int *nr_xd, int *nr_yd);
@@ -1345,6 +1345,7 @@
char status_buffer[200];
const char *status = 0;
gui_pointer_shape pointer = GUI_POINTER_DEFAULT;
+ bool imagemap = false;
int box_x = 0, box_y = 0;
int gadget_box_x = 0, gadget_box_y = 0;
int scroll_box_x = 0, scroll_box_y = 0;
@@ -1392,9 +1393,14 @@
url_box = box;
}
- if (box->usemap)
+ if (box->usemap) {
url = imagemap_get(content, box->usemap,
box_x, box_y, x, y, &target);
+ if (url) {
+ imagemap = true;
+ url_box = box;
+ }
+ }
if (box->gadget) {
gadget_content = content;
@@ -1411,7 +1417,7 @@
title = box->title;
if (box->style && box->style->cursor != CSS_CURSOR_UNKNOWN)
- pointer = get_pointer_shape(box);
+ pointer = get_pointer_shape(box, false);
if (box->style && box->type != BOX_BR &&
box->type != BOX_INLINE &&
@@ -1476,7 +1482,7 @@
messages_get("FormSubmit"),
gadget->form->action);
status = status_buffer;
- pointer = get_pointer_shape(gadget_box);
+ pointer = get_pointer_shape(gadget_box, false);
if (mouse & (BROWSER_MOUSE_CLICK_1 |
BROWSER_MOUSE_CLICK_2))
action = ACTION_SUBMIT;
@@ -1486,7 +1492,7 @@
break;
case GADGET_TEXTAREA:
status = messages_get("FormTextarea");
- pointer = get_pointer_shape(gadget_box);
+ pointer = get_pointer_shape(gadget_box, false);
if (mouse & (BROWSER_MOUSE_PRESS_1 |
BROWSER_MOUSE_PRESS_2)) {
@@ -1529,7 +1535,7 @@
case GADGET_TEXTBOX:
case GADGET_PASSWORD:
status = messages_get("FormTextbox");
- pointer = get_pointer_shape(gadget_box);
+ pointer = get_pointer_shape(gadget_box, false);
if ((mouse & BROWSER_MOUSE_PRESS_1) &&
!(mouse & (BROWSER_MOUSE_MOD_1 |
@@ -1599,7 +1605,7 @@
} else
status = url;
- pointer = get_pointer_shape(url_box);
+ pointer = get_pointer_shape(url_box, imagemap);
if (mouse & BROWSER_MOUSE_CLICK_1 &&
mouse & BROWSER_MOUSE_MOD_1) {
@@ -2380,7 +2386,7 @@
}
-gui_pointer_shape get_pointer_shape(struct box *box)
+gui_pointer_shape get_pointer_shape(struct box *box, bool imagemap)
{
gui_pointer_shape pointer;
struct css_style *style;
@@ -2395,7 +2401,8 @@
case CSS_CURSOR_AUTO:
if (box->href || (box->gadget &&
(box->gadget->type == GADGET_IMAGE ||
- box->gadget->type == GADGET_SUBMIT)))
+ box->gadget->type == GADGET_SUBMIT)) ||
+ imagemap)
/* link */
pointer = GUI_POINTER_POINT;
else if (box->gadget &&
14 years, 3 months
r6582 jmb - /trunk/netsurf/!NetSurf/Resources/CSS,f79
by netsurf＠semichrome.net
Author: jmb
Date: Fri Feb 20 09:06:53 2009
New Revision: 6582
URL: http://source.netsurf-browser.org?rev=6582&view=rev
Log:
title { display: none; }
Modified:
trunk/netsurf/!NetSurf/Resources/CSS,f79
Modified: trunk/netsurf/!NetSurf/Resources/CSS,f79
URL: http://source.netsurf-browser.org/trunk/netsurf/%21NetSurf/Resources/CSS%...
==============================================================================
--- trunk/netsurf/!NetSurf/Resources/CSS,f79 (original)
+++ trunk/netsurf/!NetSurf/Resources/CSS,f79 Fri Feb 20 09:06:53 2009
@@ -176,4 +176,4 @@
[align=center] { text-align: center; }
[align=right] { text-align: right; }
-noembed, script, style { display: none; }
+noembed, script, style, title { display: none; }
14 years, 3 months
r6580 tlsa - in /trunk/netsurfweb: documentation/guide.en netsurf.css welcome/index.en welcome/index.ja
by netsurf＠semichrome.net
Author: tlsa
Date: Fri Feb 20 08:54:37 2009
New Revision: 6580
URL: http://source.netsurf-browser.org?rev=6580&view=rev
Log:
Update menu documentation and tweak footer style.
Modified:
trunk/netsurfweb/documentation/guide.en
trunk/netsurfweb/netsurf.css
trunk/netsurfweb/welcome/index.en
trunk/netsurfweb/welcome/index.ja
Modified: trunk/netsurfweb/documentation/guide.en
URL: http://source.netsurf-browser.org/trunk/netsurfweb/documentation/guide.en...
==============================================================================
--- trunk/netsurfweb/documentation/guide.en (original)
+++ trunk/netsurfweb/documentation/guide.en Fri Feb 20 08:54:37 2009
@@ -321,6 +321,7 @@
<tr><th class="menutitle" colspan="2">NetSurf</th></tr>
<tr><td><a href="#BrowserWindowMenuPage">Page</a></td><td class="menuarrow">></td></tr>
<tr><td><a href="#BrowserWindowMenuObject">Object</a></td><td class="menuarrow">></td></tr>
+<tr><td><a href="#BrowserWindowMenuSelection">Selection</a></td><td class="menuarrow">></td></tr>
<tr><td><a href="#BrowserWindowMenuNavigate">Navigate</a></td><td class="menuarrow">></td></tr>
<tr><td><a href="#BrowserWindowMenuDisplay">Display</a></td><td class="menuarrow">></td></tr>
<tr><td><a href="#BrowserWindowMenuUtilities">Utilities</a></td><td class="menuarrow">></td></tr>
@@ -338,8 +339,9 @@
<tr><td><a href="#BrowserWindowMenuPageFullSave">Full save</a></td><td class="menuarrow">></td></tr>
<tr><td><a href="#BrowserWindowMenuPageExport">Export</a></td><td class="menuarrow">></td></tr>
<tr><td><a href="#BrowserWindowMenuPageSaveLocation">Save location</a></td><td class="menuarrow">></td></tr>
-<tr><td><a href="#BrowserWindowMenuPagePrint">Print</a></td><td></td></tr>
+<tr><td><a href="#BrowserWindowMenuPagePrint">Print</a></td><td class="menuarrow">></td></tr>
<tr><td class="menusplit"><a href="#BrowserWindowMenuPageNewwindow">New window</a></td><td class="menusplit"></td></tr>
+<tr><td><a href="#BrowserWindowMenuPageFindText">Find text</a></td><td class="menuarrow">></td></tr>
<tr><td><a href="#BrowserWindowMenuPageViewSource">View source</a></td><td class="menuarrow"></td></tr>
</table>
@@ -358,11 +360,15 @@
<table class="menu">
<tr><th class="menutitle" colspan="2">Export as</th></tr>
<tr><td><a href="#BrowserWindowMenuPageExportDraw">Draw</a></td><td class="menuarrow">></td></tr>
+<tr><td><a href="#BrowserWindowMenuPageExportPDF">PDF</a></td><td class="menuarrow">></td></tr>
<tr><td><a href="#BrowserWindowMenuPageExportText">Text</a></td><td class="menuarrow">></td></tr>
</table>
<p class="menupath" id="BrowserWindowMenuPageExportDraw">Page > Export > Draw</p>
<p class="menuitem">This option opens a save dialogue box, allowing the current page to be saved as a drawfile.</p>
+
+<p class="menupath" id="BrowserWindowMenuPageExportPDF">Page > Export > PDF</p>
+<p class="menuitem">This option opens a save dialogue box, allowing the current page to be saved as a multi-page PDF document.</p>
<p class="menupath" id="BrowserWindowMenuPageExportText">Page > Export > Text</p>
<p class="menuitem">This option opens a save dialogue box, allowing the current page to be saved as a text file.</p>
@@ -392,60 +398,143 @@
<p class="menupath" id="BrowserWindowMenuPageNewwindow">Page > New window</p>
<p class="menuitem">This option opens the current page in a new window.</p>
+<p class="menupath" id="BrowserWindowMenuPageFindText">Page > Find text</p>
+<p class="menuitem">This option allows you to search the current page for a text string. The same function is available on the <a href="#BrowserWindowToolbar">toolbar</a>.</p>
+
<p class="menupath" id="BrowserWindowMenuPageViewSource">Page > View source</p>
<p class="menuitem">This option opens the source code of the current page in a text editor window.</p>
<h4 id="BrowserWindowMenuObject" class="submenu">Object Submenu</h4>
-<p>The Object submenu contains the following options relevant to the current object. This submenu is only available when the pointer is placed over an object such as an image.</p>
+<p>The Object submenu contains the following options relevant to the current object. This submenu is only available when the pointer is placed over an object such as a link or an image.</p>
<table class="menu">
<tr><th class="menutitle" colspan="2">Object</th></tr>
-<tr><td><a href="#BrowserWindowMenuObjectInfo">Info</a></td><td class="menuarrow">></td></tr>
-<tr><td><a href="#BrowserWindowMenuObjectSave">Save</a></td><td class="menuarrow">></td></tr>
-<tr><td><a href="#BrowserWindowMenuObjectExport">Export</a></td><td class="menuarrow">></td></tr>
-<tr><td><a href="#BrowserWindowMenuObjectSaveLocation">Save location</a></td><td class="menuarrow">></td></tr>
-<tr><td class="menusplit"><a href="#BrowserWindowMenuObjectReload">Reload</a></td><td class="menusplit"></td></tr>
-</table>
-
-<p class="menupath" id="BrowserWindowMenuObjectInfo">Object > Info</p>
+<tr><td><a href="#BrowserWindowMenuObjectObject">Object</a></td><td class="menuarrow">></td></tr>
+<tr><td><a href="#BrowserWindowMenuObjectLink">Link</a></td><td class="menuarrow">></td></tr>
+</table>
+
+<p class="menupath" id="BrowserWindowMenuObjectObject">Object > Object</p>
+<p class="menuitem">This submenu contains options relating to the current object – e.g. the image under the pointer where the menu was opened.</p>
+
+<table class="menu">
+<tr><th class="menutitle" colspan="2">Object</th></tr>
+<tr><td><a href="#BrowserWindowMenuObjectObjectInfo">Info</a></td><td class="menuarrow">></td></tr>
+<tr><td><a href="#BrowserWindowMenuObjectObjectSave">Save</a></td><td class="menuarrow">></td></tr>
+<tr><td><a href="#BrowserWindowMenuObjectObjectExport">Export</a></td><td class="menuarrow">></td></tr>
+<tr><td><a href="#BrowserWindowMenuObjectObjectSaveLocation">Save location</a></td><td class="menuarrow">></td></tr>
+<tr><td><a href="#BrowserWindowMenuObjectObjectReload">Reload</a></td><td></td></tr>
+</table>
+
+<p class="menupath" id="BrowserWindowMenuObjectObjectInfo">Object > Object > Info</p>
<p class="menuitem">This option displays information about the current object.</p>
-<p class="menupath" id="BrowserWindowMenuObjectSave">Object > Save</p>
+<p class="menupath" id="BrowserWindowMenuObjectObjectSave">Object > Object > Save</p>
<p class="menuitem">This option opens a save dialogue box, allowing the object under the pointer to be saved in its original format.</p>
-<p class="menupath" id="BrowserWindowMenuObjectExport">Object > Export</p>
+<p class="menupath" id="BrowserWindowMenuObjectObjectExport">Object > Object > Export</p>
<p class="menuitem">This option offers various export options for the current object. The options available are:</p>
<table class="menu">
-<tr><th class="menutitle" colspan="2">Export as</th></tr>
-<tr><td><a href="#BrowserWindowMenuObjectExportSprite">Sprite</a></td><td class="menuarrow">></td></tr>
-</table>
-
-<p class="menupath" id="BrowserWindowMenuObjectExportSprite">Object > Export > Sprite</p>
+<tr><th class="menutitle" colspan="2">Export</th></tr>
+<tr><td><a href="#BrowserWindowMenuObjectObjectExportSprite">Sprite</a></td><td class="menuarrow">></td></tr>
+<tr><td><a href="#BrowserWindowMenuObjectObjectExportDraw">Draw</a></td><td class="menuarrow">></td></tr>
+</table>
+
+<p class="menupath" id="BrowserWindowMenuObjectObjectExportSprite">Object > Object > Export > Sprite</p>
<p class="menuitem">This option opens a save dialogue box, allowing the current object to be saved as a sprite.</p>
-<p class="menupath" id="BrowserWindowMenuObjectSaveLocation">Object > Save location</p>
+<p class="menupath" id="BrowserWindowMenuObjectObjectExportDraw">Object > Object > Export > Draw</p>
+<p class="menuitem">This option opens a save dialogue box, allowing the current object to be saved as a drawfile. This option is only available for vector images, such as SVG.</p>
+
+<p class="menupath" id="BrowserWindowMenuObjectObjectSaveLocation">Object > Object > Save location</p>
<p class="menuitem">This option allows the address of the current object to be saved in various formats. The options available are:</p>
<table class="menu">
+<tr><th class="menutitle" colspan="2">Save location</th></tr>
+<tr><td><a href="#BrowserWindowMenuObjectObjectSaveLocationAcorn">Acorn URI</a></td><td class="menuarrow">></td></tr>
+<tr><td><a href="#BrowserWindowMenuObjectObjectSaveLocationAnt">Ant URL</a></td><td class="menuarrow">></td></tr>
+<tr><td><a href="#BrowserWindowMenuObjectObjectSaveLocationText">Text</a></td><td class="menuarrow">></td></tr>
+</table>
+
+<p class="menupath" id="BrowserWindowMenuObjectObjectSaveLocationAcorn">Object > Object > Save location > Acorn URI</p>
+<p class="menuitem">This option opens a save dialogue box, allowing the address of the current object to be saved to disc in Acorn URI format.</p>
+
+<p class="menupath" id="BrowserWindowMenuObjectObjectSaveLocationAnt">Object > Object > Save location > Ant URL</p>
+<p class="menuitem">This option opens a save dialogue box, allowing the address of the current object to be saved to disc in Ant URL format.</p>
+
+<p class="menupath" id="BrowserWindowMenuObjectObjectSaveLocationText">Object > Object > Save location > Text</p>
+<p class="menuitem">This option opens a save dialogue box, allowing the address of the current object to be saved to disc in plain text format.</p>
+
+<p class="menupath" id="BrowserWindowMenuObjectObjectReload">Object > Object > Reload</p>
+<p class="menuitem">This option reloads the current page and any objects that the page contains.</p>
+
+<p class="menupath" id="BrowserWindowMenuObjectLink">Object > Link</p>
+<p class="menuitem">This submenu contains options relating to the current link – i.e. the link under the pointer where the menu was opened.</p>
+
+<table class="menu">
<tr><th class="menutitle" colspan="2">Link</th></tr>
-<tr><td><a href="#BrowserWindowMenuObjectSaveLocationAcorn">Acorn URI</a></td><td class="menuarrow">></td></tr>
-<tr><td><a href="#BrowserWindowMenuObjectSaveLocationAnt">Ant URL</a></td><td class="menuarrow">></td></tr>
-<tr><td><a href="#BrowserWindowMenuObjectSaveLocationText">Text</a></td><td class="menuarrow">></td></tr>
-</table>
-
-<p class="menupath" id="BrowserWindowMenuObjectSaveLocationAcorn">Object > Save location > Acorn URI</p>
-<p class="menuitem">This option opens a save dialogue box, allowing the address of the current object to be saved to disc in Acorn URI format.</p>
-
-<p class="menupath" id="BrowserWindowMenuObjectSaveLocationAnt">Object > Save location > Ant URL</p>
-<p class="menuitem">This option opens a save dialogue box, allowing the address of the current object to be saved to disc in Ant URL format.</p>
-
-<p class="menupath" id="BrowserWindowMenuObjectSaveLocationText">Object > Save location > Text</p>
-<p class="menuitem">This option opens a save dialogue box, allowing the address of the current object to be saved to disc in plain text format.</p>
-
-<p class="menupath" id="BrowserWindowMenuObjectReload">Object > Reload</p>
-<p class="menuitem">This option reloads the current page and any objects that the page contains.</p>
+<tr><td><a href="#BrowserWindowMenuObjectLinkSave">Save</a></td><td class="menuarrow">></td></tr>
+<tr><td><a href="#BrowserWindowMenuObjectLinkDownloadtarget">Download target</a></td><td></td></tr>
+<tr><td class="menusplit"><a href="#BrowserWindowMenuObjectLinkNewwindow">New window</a></td><td class="menusplit"></td></tr>
+</table>
+
+<p class="menupath" id="BrowserWindowMenuObjectLinkSave">Object > Link > Save</p>
+<p class="menuitem">This option allows the address of the current link to be saved in various formats. The options available are:</p>
+
+<table class="menu">
+<tr><th class="menutitle" colspan="2">Save</th></tr>
+<tr><td><a href="#BrowserWindowMenuObjectLinkSaveAcorn">Acorn URI</a></td><td class="menuarrow">></td></tr>
+<tr><td><a href="#BrowserWindowMenuObjectLinkSaveAnt">Ant URL</a></td><td class="menuarrow">></td></tr>
+<tr><td><a href="#BrowserWindowMenuObjectLinkSaveText">Text</a></td><td class="menuarrow">></td></tr>
+</table>
+
+<p class="menupath" id="BrowserWindowMenuObjectLinkSaveAcorn">Object > Link > Save > Acorn URI</p>
+<p class="menuitem">This option opens a save dialogue box, allowing the address of the current link to be saved to disc in Acorn URI format.</p>
+
+<p class="menupath" id="BrowserWindowMenuObjectLinkSaveAnt">Object > Link > Save > Ant URL</p>
+<p class="menuitem">This option opens a save dialogue box, allowing the address of the current link to be saved to disc in Ant URL format.</p>
+
+<p class="menupath" id="BrowserWindowMenuObjectLinkSaveText">Object > Link > Save > Text</p>
+<p class="menuitem">This option opens a save dialogue box, allowing the address of the current link to be saved to disc in plain text format.</p>
+
+<p class="menupath" id="BrowserWindowMenuObjectLinkDownloadtarget">Object > Link > Download target</p>
+<p class="menuitem">This option starts a download of the file pointed to by the current link. It is the same as <span class="action">shift + clicking</span> on the link.</p>
+
+<p class="menupath" id="BrowserWindowMenuObjectLinkNewwindow">Object > Link > New window</p>
+<p class="menuitem">This option opens the page pointed to by the current link in a new window. It is the same as following a link with <span class="action">adjust</span>.</p>
+
+<h4 id="BrowserWindowMenuSelection" class="submenu">Selection Submenu</h4>
+
+<p>The selection submenu contains the following options, for manipulating the current selection and performing clipboard actions.</p>
+
+<table class="menu">
+<tr><th class="menutitle" colspan="2">Selection</th></tr>
+<tr><td><a href="#BrowserWindowMenuSelectionSave">Save</a></td><td class="menuarrow">></td></tr>
+<tr><td class="menusplit"><a href="#BrowserWindowMenuSelectionCopytoclipboard">Copy to clipboard</a></td><td class="menusplit"></td></tr>
+<tr><td><a href="#BrowserWindowMenuSelectionCuttoclipboard">Cut to clipboard</a></td><td class="menuarrow"></td></tr>
+<tr><td><a href="#BrowserWindowMenuSelectionPastefromclipboard">Paste from clipboard</a></td><td></td></tr>
+<tr><td class="menusplit"><a href="#BrowserWindowMenuSelectionClearselection">Clear selection</a></td><td class="menusplit"></td></tr>
+<tr><td><a href="#BrowserWindowMenuSelectionSelectall">Select all</a></td><td class="menuarrow"></td></tr>
+</table>
+
+<p class="menupath" id="BrowserWindowMenuSelectionSave">Selection > Save</p>
+<p class="menuitem">This option opens a save dialogue box, allowing the current selection page to be saved to disc as a text file.</p>
+
+<p class="menupath" id="BrowserWindowMenuSelectionCopytoclipboard">Selection > Copy to clipboard</p>
+<p class="menuitem">This option copies the current selection to the clipboard, allowing it to be pasted into other applications or elsewhere in NetSurf.</p>
+
+<p class="menupath" id="BrowserWindowMenuSelectionCuttoclipboard">Selection > Cut to clipboard</p>
+<p class="menuitem">This option cuts the current selection to the clipboard. It is only available when the current selection is editable, such as selections within a form's text area.</p>
+
+<p class="menupath" id="BrowserWindowMenuSelectionPastefromclipboard">Selection > Paste from clipboard</p>
+<p class="menuitem">This option pastes the current clipboard contents at the postman of the caret.</p>
+
+<p class="menupath" id="BrowserWindowMenuSelectionClearselection">Selection > Clear selection</p>
+<p class="menuitem">This option deselects any selected text on the current page.</p>
+
+<p class="menupath" id="BrowserWindowMenuSelectionSelectall">Selection > Select all</p>
+<p class="menuitem">This option selects all the text on the current page.</p>
<h4 id="BrowserWindowMenuNavigate" class="submenu">Navigate Submenu</h4>
@@ -456,7 +545,8 @@
<tr><td><a href="#BrowserWindowMenuNavigateHome">Home page</a></td><td class="menuarrow"></td></tr>
<tr><td><a href="#BrowserWindowMenuNavigateBack">Back one page</a></td><td class="menuarrow"></td></tr>
<tr><td><a href="#BrowserWindowMenuNavigateForward">Forward one page</a></td><td class="menuarrow"></td></tr>
-<tr><td class="menusplit"><a href="#BrowserWindowMenuNavigateReload">Reload this page</a></td><td></td></tr>
+<tr><td><a href="#BrowserWindowMenuNavigateUponelevel">Up one level</a></td><td class="menuarrow"></td></tr>
+<tr><td class="menusplit"><a href="#BrowserWindowMenuNavigateReload">Reload this page</a></td><td class="menusplit"></td></tr>
<tr><td><a href="#BrowserWindowMenuNavigateStop">Stop loading this page</a></td><td class="menuarrow"></td></tr>
</table>
@@ -469,11 +559,14 @@
<p class="menupath" id="BrowserWindowMenuNavigateForward">Navigate > Forward one page</p>
<p class="menuitem">This option takes you forward one page in the local history. Any form information will not be resubmitted. The same function is available on the <a href="#BrowserWindowToolbar">toolbar</a>.</p>
+<p class="menupath" id="BrowserWindowMenuNavigateUponelevel">Navigate > Up one level</p>
+<p class="menuitem">This option moves up the directory tree. For example, if you are looking at http://www.domain.com/directory/page.html, clicking on the up icon takes you to http://www.domain.com/directory/ and a further click would result in a location of http://www.domain.com/. The same function is available on the <a href="#BrowserWindowToolbar">toolbar</a>.</p>
+
<p class="menupath" id="BrowserWindowMenuNavigateReload">Navigate > Reload this page</p>
-<p class="menuitem"> This fetches and displays the current page again. Any copy of the page that exists in the local cache will be overwritten. The same function is available on the <a href="#BrowserWindowToolbar">toolbar</a>.</p>
+<p class="menuitem">This fetches and displays the current page again. Any copy of the page that exists in the local cache will be overwritten. The same function is available on the <a href="#BrowserWindowToolbar">toolbar</a>.</p>
<p class="menupath" id="BrowserWindowMenuNavigateStop">Navigate > Stop loading this page</p>
-<p class="menuitem"> This stops the current page from continuing to load. The same function is available on the <a href="#BrowserWindowToolbar">toolbar</a>.</p>
+<p class="menuitem">This stops the current page from continuing to load. The same function is available on the <a href="#BrowserWindowToolbar">toolbar</a>.</p>
<h4 id="BrowserWindowMenuDisplay" class="submenu">Display Submenu</h4>
@@ -485,7 +578,8 @@
<tr><td><a href="#BrowserWindowMenuDisplayImages">Images</a></td><td class="menuarrow">></td></tr>
<tr><td><a href="#BrowserWindowMenuDisplayToolbars">Toolbars</a></td><td class="menuarrow">></td></tr>
<tr><td><a href="#BrowserWindowMenuDisplayRender">Render</a></td><td class="menuarrow">></td></tr>
-<tr><td class="menusplit"><a href="#BrowserWindowMenuDisplaySaveDefault">Save as default</a></td><td></td></tr>
+<tr><td class="menusplit"><a href="#BrowserWindowMenuDisplaySaveDefault">Save as default</a></td><td class="menusplit"></td></tr>
+<tr><td class="menusplit"><a href="#BrowserWindowMenuDisplayWindow">Window</a></td><td class="menusplit">></td></tr>
</table>
<p class="menupath" id="BrowserWindowMenuDisplayScale">Display > Scale View</p>
@@ -553,6 +647,29 @@
<p class="menupath" id="BrowserWindowMenuDisplaySetDefault">Display > Save as default</p>
<p class="menuitem">This option makes NetSurf use the display options you have set up for the current window as the default options.</p>
+<p class="menupath" id="BrowserWindowMenuDisplayWindow">Display > Window</p>
+<p class="menuitem">The Window submenu allows you to control the size and positioning of new windows.</p>
+
+<table class="menu">
+<tr><th class="menutitle" colspan="2">Window</th></tr>
+<tr><td><a href="#BrowserWindowMenuDisplayWindowSetdefault">Set as default position</a></td><td class="menuarrow"></td></tr>
+<tr><td><a href="#BrowserWindowMenuDisplayWindowStagger">Stagger window position</a></td><td class="menuarrow"></td></tr>
+<tr><td><a href="#BrowserWindowMenuDisplayWindowCopyposition">Copy window position</a></td><td class="menuarrow"></td></tr>
+<tr><td class="menusplit"><a href="#BrowserWindowMenuDisplayWindowResetdefault">Reset default position</a></td><td></td></tr>
+</table>
+
+<p class="menupath" id="BrowserWindowMenuDisplayWindowSetdefault">Display > Window > Set as default position</p>
+<p class="menuitem">This option sets the size and position of the current window to be the default size and position for new browser windows. If no default position is set, NetSurf opens new windows in the centre of the screen.</p>
+
+<p class="menupath" id="BrowserWindowMenuDisplayWindowStagger">Display > Window > Stagger window position</p>
+<p class="menuitem">This option toggles staggered window opening positions for new windows. When turned on, this option means that new windows will open with a small offset from the position of the previously opened window. This option is only available when a user defined default window position has been set.</p>
+
+<p class="menupath" id="BrowserWindowMenuDisplayWindowCopyposition">Display > Window > Copy window position</p>
+<p class="menuitem">This option toggles the copy window position feature. When the feature is turned off, all newly opened windows open at the default position. With this feature enabled, browser windows opened from other browser windows (by adjust clicking on a link), will inherit the size and position of the parent window, rather than use the default position.</p>
+
+<p class="menupath" id="BrowserWindowMenuDisplayWindowResetdefault">Display > Window > Reset default position</p>
+<p class="menuitem">This option removes any user defined default window position. The option is only available when a user defined default window position has been set.</p>
+
<h4 id="BrowserWindowMenuUtilities" class="submenu">Utilities Submenu</h4>
<p>The Utilities submenu allows you to access some of NetSurf's extra features.</p>
@@ -561,8 +678,7 @@
<tr><th class="menutitle" colspan="2">Utilities</th></tr>
<tr><td><a href="#BrowserWindowMenuUtilitiesHotlist">Hotlist</a></td><td class="menuarrow">></td></tr>
<tr><td><a href="#BrowserWindowMenuUtilitiesHistory">History</a></td><td class="menuarrow">></td></tr>
-<tr><td><a href="#BrowserWindowMenuUtilitiesFindText">Find text</a></td><td class="menuarrow">></td></tr>
-<tr><td><a href="#BrowserWindowMenuUtilitiesWindow">Window</a></td><td class="menuarrow">></td></tr>
+<tr><td><a href="#BrowserWindowMenuUtilitiesCookies">Cookies</a></td><td class="menuarrow">></td></tr>
</table>
<p class="menupath" id="BrowserWindowMenuUtilitiesHotlist">Utilities > Hotlist</p>
@@ -595,31 +711,20 @@
<p class="menupath" id="BrowserWindowMenuUtilitiesHistoryGlobal">Utilities > History > Show global History</p>
<p class="menuitem">This option opens the <a href="#HistoryGlobal">global history window</a>. The same function is available on the <a href="#BrowserWindowToolbar">toolbar</a>.</p>
-<p class="menupath" id="BrowserWindowMenuUtilitiesFindText">Utilities > Find text</p>
-<p class="menuitem">This option allows you to search the current page for a text string. The same function is available on the <a href="#BrowserWindowToolbar">toolbar</a>.</p>
-
-<p class="menupath" id="BrowserWindowMenuUtilitiesWindow">Utilities > Window</p>
-<p class="menuitem">The Window submenu allows you to control the size and positioning of new windows.</p>
-
-<table class="menu">
-<tr><th class="menutitle" colspan="2">Window</th></tr>
-<tr><td><a href="#BrowserWindowMenuUtilitiesWindowSetdefault">Set as default position</a></td><td class="menuarrow"></td></tr>
-<tr><td><a href="#BrowserWindowMenuUtilitiesWindowStagger">Stagger window position</a></td><td class="menuarrow"></td></tr>
-<tr><td><a href="#BrowserWindowMenuUtilitiesWindowCopyposition">Copy window position</a></td><td class="menuarrow"></td></tr>
-<tr><td class="menusplit"><a href="#BrowserWindowMenuUtilitiesWindowResetdefault">Reset default position</a></td><td></td></tr>
-</table>
-
-<p class="menupath" id="BrowserWindowMenuUtilitiesWindowSetdefault">Utilities > Window > Set as default position</p>
-<p class="menuitem">This option sets the size and position of the current window to be the default size and position for new browser windows. If no default position is set, NetSurf opens new windows in the centre of the screen.</p>
-
-<p class="menupath" id="BrowserWindowMenuUtilitiesWindowStagger">Utilities > Window > Stagger window position</p>
-<p class="menuitem">This option toggles staggered window opening positions for new windows. When turned on, this option means that new windows will open with a small offset from the position of the previously opened window. This option is only available when a user defined default window position has been set.</p>
-
-<p class="menupath" id="BrowserWindowMenuUtilitiesWindowCopyposition">Utilities > Window > Copy window position</p>
-<p class="menuitem">This option toggles the copy window position feature. When the feature is turned off, all newly opened windows open at the default position. With this feature enabled, browser windows opened from other browser windows (by adjust clicking on a link), will inherit the size and position of the parent window, rather than use the default position.</p>
-
-<p class="menupath" id="BrowserWindowMenuUtilitiesWindowResetdefault">Utilities > Window > Reset default position</p>
-<p class="menuitem">This option removes any user defined default window position. The option is only available when a user defined default window position has been set.</p>
+<p class="menupath" id="BrowserWindowMenuUtilitiesHistory">Utilities > Cookies</p>
+<p class="menuitem">The Cookies submenu allows you to perform actions on the cookies stored by NetSurf.</p>
+
+<table class="menu">
+<tr><th class="menutitle" colspan="2">Cookies</th></tr>
+<tr><td><a href="#BrowserWindowMenuUtilitiesCookiesShowcookies">Show cookies</a></td><td class="menuarrow"></td></tr>
+<tr><td><a href="#BrowserWindowMenuUtilitiesCookiesDeleteallcookies">Delete all cookies</a></td><td class="menuarrow"></td></tr>
+</table>
+
+<p class="menupath" id="BrowserWindowMenuUtilitiesCookiesShowcookies">Utilities > Cookies > Show cookies</p>
+<p class="menuitem">This option opens the cookie management window.</p>
+
+<p class="menupath" id="BrowserWindowMenuUtilitiesCookiesDeleteallcookies">Utilities > Cookies > Delete all cookies</p>
+<p class="menuitem">This option deletes all the cookies currently stored by NetSurf.</p>
<h4 id="BrowserWindowMenuHelp" class="submenu">Help Submenu</h4>
Modified: trunk/netsurfweb/netsurf.css
URL: http://source.netsurf-browser.org/trunk/netsurfweb/netsurf.css?rev=6580&r...
==============================================================================
--- trunk/netsurfweb/netsurf.css (original)
+++ trunk/netsurfweb/netsurf.css Fri Feb 20 08:54:37 2009
@@ -479,6 +479,7 @@
.footer {
clear: both;
font-style: italic;
+ color:#666;
text-align: right; }
.footer p {
Modified: trunk/netsurfweb/welcome/index.en
URL: http://source.netsurf-browser.org/trunk/netsurfweb/welcome/index.en?rev=6...
==============================================================================
--- trunk/netsurfweb/welcome/index.en (original)
+++ trunk/netsurfweb/welcome/index.en Fri Feb 20 08:54:37 2009
@@ -2,7 +2,7 @@
<html>
<head>
<title>Welcome to NetSurf</title>
-<style type="text/css">html,body{margin:0;padding:0;}body{color:#000;background:#fff;font-family:sans-serif;margin:0 auto;}a:link{text-decoration:underline;color:#00f;}a:visited{text-decoration:underline;color:#60a;}a:hover{text-decoration:none;}a:active{text-decoration:underline;color:#f00;}.banner{margin:0;padding:0;background:#94adff;text-align:left;}.banner img{border:none;color:#000;height:86px;width:308px;display:block;}.onlycontent{margin:0 1em;}.nslinks{display:table;width:100%;margin:0;border-spacing:0;padding:0;background:#ccd8ff;font-size:94%;}.nslinks li{display:table-cell;text-align:center;padding:0.2em 0.3em 0.3em;vertical-align:middle;}.nslinks li+li{border-left:2px solid #b1c3ff;}.version{padding:0;margin:1.2em auto 0;width:90%;color:#444;font-size:160%;}.intro{width: 90%;margin:1em auto;color:#666;}.websearch{margin:1.5em auto;padding:1.2em 0.3em;background:#d8e2ff;border:2px solid #c5d3ff;width:80%;text-align:center;}input[type=text]{border:2px solid #b6c7ff;background:#f9faff;color:#000;margin:2px;}input[type=submit]{border:2px outset #cedaff;color:#000;background:#cedaff;margin:2px;}.links{display:table;width:80%;margin:0 auto 3em;font-size:94%;}.links ul{display:table-cell;padding-left:2.5em;}.links ul+ul{padding-left:1em;}.footer{font-style:italic;text-align:right;}.footer p{margin-top:1.5em;padding-top:0.4em;border-top:2px solid #94adff;}</style>
+<style type="text/css">html,body{margin:0;padding:0;}body{color:#000;background:#fff;font-family:sans-serif;margin:0 auto;}a:link{text-decoration:underline;color:#00f;}a:visited{text-decoration:underline;color:#60a;}a:hover{text-decoration:none;}a:active{text-decoration:underline;color:#f00;}.banner{margin:0;padding:0;background:#94adff;text-align:left;}.banner img{border:none;color:#000;height:86px;width:308px;display:block;}.onlycontent{margin:0 1em;}.nslinks{display:table;width:100%;margin:0;border-spacing:0;padding:0;background:#ccd8ff;font-size:94%;}.nslinks li{display:table-cell;text-align:center;padding:0.2em 0.3em 0.3em;vertical-align:middle;}.nslinks li+li{border-left:2px solid #b1c3ff;}.version{padding:0;margin:1.2em auto 0;width:90%;color:#444;font-size:160%;}.intro{width: 90%;margin:1em auto;color:#666;}.websearch{margin:1.5em auto;padding:1.2em 0.3em;background:#d8e2ff;border:2px solid #c5d3ff;width:80%;text-align:center;}input[type=text]{border:2px solid #b6c7ff;background:#f9faff;color:#000;margin:2px;}input[type=submit]{border:2px outset #cedaff;color:#000;background:#cedaff;margin:2px;}.links{display:table;width:80%;margin:0 auto 3em;font-size:94%;}.links ul{display:table-cell;padding-left:2.5em;}.links ul+ul{padding-left:1em;}.footer{font-style:italic;color:#666;text-align:right;}.footer p{margin-top:1.5em;padding-top:0.4em;border-top:2px solid #94adff;}</style>
<link rel="icon" type="image/png" href="/webimages/favicon.png">
</head>
Modified: trunk/netsurfweb/welcome/index.ja
URL: http://source.netsurf-browser.org/trunk/netsurfweb/welcome/index.ja?rev=6...
==============================================================================
--- trunk/netsurfweb/welcome/index.ja (original)
+++ trunk/netsurfweb/welcome/index.ja Fri Feb 20 08:54:37 2009
@@ -2,7 +2,7 @@
<html>
<head>
<title>NetSurfã¸ãããã</title>
-<style type="text/css">html,body{margin:0;padding:0;}body{color:#000;background:#fff;font-family:sans-serif;margin:0 auto;}a:link{text-decoration:underline;color:#00f;}a:visited{text-decoration:underline;color:#60a;}a:hover{text-decoration:none;}a:active{text-decoration:underline;color:#f00;}.banner{margin:0;padding:0;background:#94adff;text-align:left;}.banner img{border:none;color:#000;height:86px;width:308px;display:block;}.onlycontent{margin:0 1em;}.nslinks{display:table;width:100%;margin:0;border-spacing:0;padding:0;background:#ccd8ff;font-size:94%;}.nslinks li{display:table-cell;text-align:center;padding:0.2em 0.3em 0.3em;vertical-align:middle;}.nslinks li+li{border-left:2px solid #b1c3ff;}.version{padding:0;margin:1.2em auto 0;width:90%;color:#444;font-size:160%;}.intro{width: 90%;margin:1em auto;color:#666;}.websearch{margin:1.5em auto;padding:1.2em 0.3em;background:#d8e2ff;border:2px solid #c5d3ff;width:80%;text-align:center;}input[type=text]{border:2px solid #b6c7ff;background:#f9faff;color:#000;margin:2px;}input[type=submit]{border:2px outset #cedaff;color:#000;background:#cedaff;margin:2px;}.links{display:table;width:80%;margin:0 auto 3em;font-size:94%;}.links ul{display:table-cell;padding-left:2.5em;}.links ul+ul{padding-left:1em;}.footer{font-style:italic;text-align:right;}.footer p{margin-top:1.5em;padding-top:0.4em;border-top:2px solid #94adff;}</style>
+<style type="text/css">html,body{margin:0;padding:0;}body{color:#000;background:#fff;font-family:sans-serif;margin:0 auto;}a:link{text-decoration:underline;color:#00f;}a:visited{text-decoration:underline;color:#60a;}a:hover{text-decoration:none;}a:active{text-decoration:underline;color:#f00;}.banner{margin:0;padding:0;background:#94adff;text-align:left;}.banner img{border:none;color:#000;height:86px;width:308px;display:block;}.onlycontent{margin:0 1em;}.nslinks{display:table;width:100%;margin:0;border-spacing:0;padding:0;background:#ccd8ff;font-size:94%;}.nslinks li{display:table-cell;text-align:center;padding:0.2em 0.3em 0.3em;vertical-align:middle;}.nslinks li+li{border-left:2px solid #b1c3ff;}.version{padding:0;margin:1.2em auto 0;width:90%;color:#444;font-size:160%;}.intro{width: 90%;margin:1em auto;color:#666;}.websearch{margin:1.5em auto;padding:1.2em 0.3em;background:#d8e2ff;border:2px solid #c5d3ff;width:80%;text-align:center;}input[type=text]{border:2px solid #b6c7ff;background:#f9faff;color:#000;margin:2px;}input[type=submit]{border:2px outset #cedaff;color:#000;background:#cedaff;margin:2px;}.links{display:table;width:80%;margin:0 auto 3em;font-size:94%;}.links ul{display:table-cell;padding-left:2.5em;}.links ul+ul{padding-left:1em;}.footer{font-style:italic;color:#666;text-align:right;}.footer p{margin-top:1.5em;padding-top:0.4em;border-top:2px solid #94adff;}</style>
<link rel="icon" type="image/png" href="/webimages/favicon.png">
</head>
14 years, 3 months
