r12077 chris_y - in /trunk/netsurf/amiga: context_menu.c gui.c
by netsurf＠semichrome.net
Author: chris_y
Date: Wed Mar 16 13:53:58 2011
New Revision: 12077
URL: http://source.netsurf-browser.org?rev=12077&view=rev
Log:
Move remaining popupmenu.class stuff to context_menu.c, and #ifdef it for
__amigaos4__ only.
Modified:
trunk/netsurf/amiga/context_menu.c
trunk/netsurf/amiga/gui.c
Modified: trunk/netsurf/amiga/context_menu.c
URL: http://source.netsurf-browser.org/trunk/netsurf/amiga/context_menu.c?rev=...
==============================================================================
--- trunk/netsurf/amiga/context_menu.c (original)
+++ trunk/netsurf/amiga/context_menu.c Wed Mar 16 13:53:58 2011
@@ -17,20 +17,24 @@
*/
#ifdef __amigaos4__
+
#include <proto/popupmenu.h>
-#endif
#include <proto/intuition.h>
#include <proto/asl.h>
#include <proto/dos.h>
#include <proto/exec.h>
+#include <reaction/reaction_macros.h>
+
#include "amiga/context_menu.h"
-#include "amiga/utf8.h"
-#include "amiga/options.h"
#include "amiga/clipboard.h"
#include "amiga/bitmap.h"
+#include "amiga/gui.h"
#include "amiga/history_local.h"
#include "amiga/iff_dr2d.h"
+#include "amiga/options.h"
+#include "amiga/theme.h"
+#include "amiga/utf8.h"
#include "desktop/textinput.h"
#include "desktop/selection.h"
#include "desktop/searchweb.h"
@@ -49,6 +53,8 @@
size_t whitespace_length);
static bool ami_context_menu_history(const struct history *history, int x0, int y0,
int x1, int y1, const struct history_entry *entry, void *user_data);
+
+uint32 ami_popup_hook(struct Hook *hook,Object *item,APTR reserved);
enum {
CMID_SELECTFILE,
@@ -74,6 +80,8 @@
CMID_LAST
};
+struct Library *PopupMenuBase = NULL;
+struct PopupMenuIFace *IPopupMenu = NULL;
char *ctxmenulab[CMID_LAST];
struct ami_context_menu_selection
@@ -84,6 +92,11 @@
void ami_context_menu_init(void)
{
+ if(PopupMenuBase = OpenLibrary("popupmenu.class",0))
+ {
+ IPopupMenu = (struct PopupMenuIFace *)GetInterface(PopupMenuBase,"main",1,NULL);
+ }
+
ctxmenulab[CMID_SELECTFILE] = ami_utf8_easy((char *)messages_get("SelectFile"));
ctxmenulab[CMID_COPYURL] = ami_utf8_easy((char *)messages_get("CopyURL"));
ctxmenulab[CMID_SHOWOBJ] = ami_utf8_easy((char *)messages_get("ObjShow"));
@@ -119,6 +132,9 @@
{
ami_utf8_free(ctxmenulab[i]);
}
+
+ if(IPopupMenu) DropInterface((struct Interface *)IPopupMenu);
+ if(PopupMenuBase) CloseLibrary(PopupMenuBase);
}
BOOL ami_context_menu_mouse_trap(struct gui_window_2 *gwin, BOOL trap)
@@ -623,3 +639,83 @@
return true;
}
+
+uint32 ami_popup_hook(struct Hook *hook,Object *item,APTR reserved)
+{
+ int32 itemid = 0;
+ struct gui_window *gwin = hook->h_Data;
+
+ if(GetAttr(PMIA_ID, item, &itemid))
+ {
+ form_select_process_selection(gwin->shared->bw->current_content,gwin->shared->control,itemid);
+ }
+
+ return itemid;
+}
+
+void gui_create_form_select_menu(struct browser_window *bw,
+ struct form_control *control)
+{
+ /* TODO: PMIA_Title memory leaks as we don't free the strings.
+ * We use the core menu anyway, but in future when popupmenu.class
+ * improves we will probably start using this again.
+ */
+
+ struct gui_window *gwin = bw->window;
+ struct form_option *opt = control->data.select.items;
+ ULONG i = 0;
+
+ if(gwin->shared->objects[OID_MENU]) DisposeObject(gwin->shared->objects[OID_MENU]);
+
+ gwin->shared->popuphook.h_Entry = ami_popup_hook;
+ gwin->shared->popuphook.h_Data = gwin;
+
+ gwin->shared->control = control;
+
+ gwin->shared->objects[OID_MENU] = PMMENU(ami_utf8_easy(control->name)),
+ PMA_MenuHandler, &gwin->shared->popuphook, End;
+
+ while(opt)
+ {
+ IDoMethod(gwin->shared->objects[OID_MENU], PM_INSERT,
+ NewObject( POPUPMENU_GetItemClass(), NULL,
+ PMIA_Title, (ULONG)ami_utf8_easy(opt->text),
+ PMIA_ID, i,
+ PMIA_CheckIt, TRUE,
+ PMIA_Checked, opt->selected,
+ TAG_DONE),
+ ~0);
+
+ opt = opt->next;
+ i++;
+ }
+
+ gui_window_set_pointer(gwin, GUI_POINTER_DEFAULT); // Clear the menu-style pointer
+
+ IDoMethod(gwin->shared->objects[OID_MENU], PM_OPEN, gwin->shared->win);
+}
+
+#else
+
+void ami_context_menu_init(void)
+{
+}
+
+void ami_context_menu_free(void)
+{
+}
+
+BOOL ami_context_menu_mouse_trap(struct gui_window_2 *gwin, BOOL trap)
+{
+ return FALSE;
+}
+
+void ami_context_menu_show(struct gui_window_2 *gwin, int x, int y)
+{
+}
+
+void gui_create_form_select_menu(struct browser_window *bw,
+ struct form_control *control)
+{
+}
+#endif
Modified: trunk/netsurf/amiga/gui.c
URL: http://source.netsurf-browser.org/trunk/netsurf/amiga/gui.c?rev=12077&r1=...
==============================================================================
--- trunk/netsurf/amiga/gui.c (original)
+++ trunk/netsurf/amiga/gui.c Wed Mar 16 13:53:58 2011
@@ -102,16 +102,10 @@
#include <proto/button.h>
#include <proto/clicktab.h>
#include <proto/layout.h>
-#ifdef __amigaos4__
-#include <proto/popupmenu.h>
-#endif
#include <proto/space.h>
#include <proto/string.h>
#include <proto/window.h>
-#ifdef __amigaos4__
-#include <classes/popupmenu.h>
-#endif
#include <classes/window.h>
#include <gadgets/button.h>
#include <gadgets/clicktab.h>
@@ -133,8 +127,6 @@
char *adblock_stylesheet_url;
struct MsgPort *appport;
-struct Library *PopupMenuBase = NULL;
-struct PopupMenuIFace *IPopupMenu = NULL;
struct Library *KeymapBase = NULL;
struct KeymapIFace *IKeymap = NULL;
struct Library *ApplicationBase=NULL;
@@ -157,7 +149,6 @@
void ami_update_buttons(struct gui_window_2 *);
void ami_scroller_hook(struct Hook *,Object *,struct IntuiMessage *);
-uint32 ami_popup_hook(struct Hook *hook,Object *item,APTR reserved);
void ami_switch_tab(struct gui_window_2 *gwin,bool redraw);
void ami_change_tab(struct gui_window_2 *gwin, int direction);
void ami_get_hscroll_pos(struct gui_window_2 *gwin, ULONG *xs);
@@ -281,11 +272,6 @@
void ami_open_resources(void)
{
/* Allocate ports/ASL and open libraries and devices */
-
- if(PopupMenuBase = OpenLibrary("popupmenu.class",0))
- {
- IPopupMenu = (struct PopupMenuIFace *)GetInterface(PopupMenuBase,"main",1,NULL);
- }
if(KeymapBase = OpenLibrary("keymap.library",37))
{
@@ -2163,9 +2149,6 @@
if(IApplication) DropInterface((struct Interface *)IApplication);
if(ApplicationBase) CloseLibrary(ApplicationBase);
-
- if(IPopupMenu) DropInterface((struct Interface *)IPopupMenu);
- if(PopupMenuBase) CloseLibrary(PopupMenuBase);
if(IKeymap) DropInterface((struct Interface *)IKeymap);
if(KeymapBase) CloseLibrary(KeymapBase);
@@ -3862,37 +3845,6 @@
g->shared->redraw_required = true;
}
-void gui_create_form_select_menu(struct browser_window *bw,
- struct form_control *control)
-{
- struct gui_window *gwin = bw->window;
- struct form_option *opt = control->data.select.items;
- ULONG i = 0;
-
- if(gwin->shared->objects[OID_MENU]) DisposeObject(gwin->shared->objects[OID_MENU]);
-
- gwin->shared->popuphook.h_Entry = ami_popup_hook;
- gwin->shared->popuphook.h_Data = gwin;
-
- gwin->shared->control = control;
-
- gwin->shared->objects[OID_MENU] = PMMENU(ami_utf8_easy(control->name)),
- PMA_MenuHandler, &gwin->shared->popuphook,End;
-
- while(opt)
- {
- IDoMethod(gwin->shared->objects[OID_MENU],PM_INSERT,NewObject( POPUPMENU_GetItemClass(), NULL, PMIA_Title, (ULONG)ami_utf8_easy(opt->text),PMIA_ID,i,PMIA_CheckIt,TRUE,PMIA_Checked,opt->selected,TAG_DONE),~0);
-
- opt = opt->next;
- i++;
- }
-
- gui_window_set_pointer(gwin,GUI_POINTER_DEFAULT); // Clear the menu-style pointer
-
- IDoMethod(gwin->shared->objects[OID_MENU],PM_OPEN,gwin->shared->win);
-
-}
-
void ami_scroller_hook(struct Hook *hook,Object *object,struct IntuiMessage *msg)
{
ULONG gid,x,y;
@@ -3947,19 +3899,6 @@
}
// ReplyMsg((struct Message *)msg);
}
-
-uint32 ami_popup_hook(struct Hook *hook,Object *item,APTR reserved)
-{
- int32 itemid = 0;
- struct gui_window *gwin = hook->h_Data;
-
- if(GetAttr(PMIA_ID, item, &itemid))
- {
- form_select_process_selection(gwin->shared->bw->current_content,gwin->shared->control,itemid);
- }
-
- return itemid;
-}
/* return the text box at posn x,y in window coordinates
x,y are updated to be document co-ordinates */
12 years, 8 months
r12076 tlsa - /trunk/netsurf/content/fetchers/about.c
by netsurf＠semichrome.net
Author: tlsa
Date: Wed Mar 16 09:17:22 2011
New Revision: 12076
URL: http://source.netsurf-browser.org?rev=12076&view=rev
Log:
Add about:license --> about:licence redirect.
Modified:
trunk/netsurf/content/fetchers/about.c
Modified: trunk/netsurf/content/fetchers/about.c
URL: http://source.netsurf-browser.org/trunk/netsurf/content/fetchers/about.c?...
==============================================================================
--- trunk/netsurf/content/fetchers/about.c (original)
+++ trunk/netsurf/content/fetchers/about.c Wed Mar 16 09:17:22 2011
@@ -146,6 +146,17 @@
fetch_set_http_code(ctx->fetchh, 302);
fetch_about_send_callback(FETCH_REDIRECT, ctx, "resource:licence.html",
+ 0, FETCH_ERROR_NO_ERROR);
+
+ return true;
+}
+
+static bool fetch_about_license_handler(struct fetch_about_context *ctx)
+{
+ /* content is going to return redirect to the noun */
+ fetch_set_http_code(ctx->fetchh, 302);
+
+ fetch_about_send_callback(FETCH_REDIRECT, ctx, "about:licence",
0, FETCH_ERROR_NO_ERROR);
return true;
@@ -381,6 +392,7 @@
struct about_handlers about_handler_list[] = {
{ "credits", fetch_about_credits_handler },
{ "licence", fetch_about_licence_handler },
+ { "license", fetch_about_license_handler },
{ "config", fetch_about_config_handler },
{ "Choices", fetch_about_choices_handler },
{ "testament", fetch_about_testament_handler },
12 years, 8 months
r12075 tlsa - /trunk/netsurf/!NetSurf/Resources/en/licence.html, faf
by netsurf＠semichrome.net
Author: tlsa
Date: Wed Mar 16 08:50:10 2011
New Revision: 12075
URL: http://source.netsurf-browser.org?rev=12075&view=rev
Log:
Update copyright dates for some NetSurf project components.
Modified:
trunk/netsurf/!NetSurf/Resources/en/licence.html,faf
Modified: trunk/netsurf/!NetSurf/Resources/en/licence.html,faf
URL: http://source.netsurf-browser.org/trunk/netsurf/%21NetSurf/Resources/en/l...
==============================================================================
--- trunk/netsurf/!NetSurf/Resources/en/licence.html,faf (original)
+++ trunk/netsurf/!NetSurf/Resources/en/licence.html,faf Wed Mar 16 08:50:10 2011
@@ -51,25 +51,25 @@
<dl class="components">
<dt><a href="http://www.netsurf-browser.org/">NetSurf</a></dt>
<dd>
-<span>© 2002–2010 The NetSurf Developers</span>
+<span>© 2002–2011 The NetSurf Developers</span>
<span><a href="#gplv2">GPLv2</a></span>
</dd>
<dt><a href="http://www.netsurf-browser.org/projects/libcss/">LibCSS</a></dt>
<dd>
-<span>© 2007–2010 John-Mark Bell</span>
+<span>© 2007–2011 John-Mark Bell</span>
<span><a href="#mit">MIT</a></span>
</dd>
<dt><a href="http://www.netsurf-browser.org/projects/hubbub/">Hubbub</a></dt>
<dd>
-<span>© 2007–2010 John-Mark Bell<br />© 2008–2009 Andrew Sidwell</span>
+<span>© 2007–2011 John-Mark Bell<br />© 2008–2009 Andrew Sidwell</span>
<span><a href="#mit">MIT</a></span>
</dd>
<dt><a href="http://www.netsurf-browser.org/projects/libparserutils/">LibParserUtils</a></dt>
<dd>
-<span>© 2007–2009 John-Mark Bell</span>
+<span>© 2007–2011 John-Mark Bell</span>
<span><a href="#mit">MIT</a></span>
</dd>
@@ -105,7 +105,7 @@
<dt><a href="http://source.netsurf-browser.org/trunk/libnsfb/">Libnsfb</a></dt>
<dd>
-<span>© 2009–2010 Vincent Sanders</span>
+<span>© 2009–2011 Vincent Sanders</span>
<span><a href="#mit">MIT</a></span>
</dd>
@@ -117,7 +117,7 @@
<dt><a href="http://www.netsurf-browser.org/projects/libwapcaplet">LibWapcaplet</a></dt>
<dd>
-<span>© 2009–2010 NetSurf Browser Project, Daniel Silverstone</span>
+<span>© 2009–2011 NetSurf Browser Project, Daniel Silverstone</span>
<span><a href="#mit">MIT</a></span>
</dd>
</dl>
12 years, 8 months
r12074 tlsa - /trunk/netsurf/!NetSurf/Resources/en/credits.html, faf
by netsurf＠semichrome.net
Author: tlsa
Date: Wed Mar 16 08:46:58 2011
New Revision: 12074
URL: http://source.netsurf-browser.org?rev=12074&view=rev
Log:
Remove extraneous markup.
Modified:
trunk/netsurf/!NetSurf/Resources/en/credits.html,faf
Modified: trunk/netsurf/!NetSurf/Resources/en/credits.html,faf
URL: http://source.netsurf-browser.org/trunk/netsurf/%21NetSurf/Resources/en/c...
==============================================================================
--- trunk/netsurf/!NetSurf/Resources/en/credits.html,faf (original)
+++ trunk/netsurf/!NetSurf/Resources/en/credits.html,faf Wed Mar 16 08:46:58 2011
@@ -21,7 +21,7 @@
<p>NetSurf was brought to you by the following people:</p>
<div id="DevList">
-<div>
+
<h2>Code</h2>
<ul>
<li>Kevin Bagust</li>
@@ -59,8 +59,7 @@
<li>Bo Yang</li>
<li>Chris Young</li>
</ul>
-</div>
-<div>
+
<h2>Documentation</h2>
<ul>
<li>John-Mark Bell</li>
@@ -70,8 +69,7 @@
<li>James Shaw</li>
<li>Richard Wilson</li>
</ul>
-</div>
-<div>
+
<h2>Graphics</h2>
<ul>
<li>Michael Drake</li>
@@ -80,8 +78,7 @@
<li>Richard Hallas</li>
<li>Phil Mellor</li>
</ul>
-</div>
-<div>
+
<h2>Translations</h2>
<ul>
<li>Sebastian Barthel</li>
@@ -91,7 +88,7 @@
<li>Jérôme Mathevet</li>
<li>Simon Voortman</li>
</ul>
-</div>
+
</div>
<div class="footer">
12 years, 8 months
r12073 tlsa - /trunk/netsurf/!NetSurf/ReadMe
by netsurf＠semichrome.net
Author: tlsa
Date: Wed Mar 16 07:29:52 2011
New Revision: 12073
URL: http://source.netsurf-browser.org?rev=12073&view=rev
Log:
Licence info has moved.
Modified:
trunk/netsurf/!NetSurf/ReadMe
Modified: trunk/netsurf/!NetSurf/ReadMe
URL: http://source.netsurf-browser.org/trunk/netsurf/%21NetSurf/ReadMe?rev=120...
==============================================================================
--- trunk/netsurf/!NetSurf/ReadMe (original)
+++ trunk/netsurf/!NetSurf/ReadMe Wed Mar 16 07:29:52 2011
@@ -39,9 +39,9 @@
Licences
--------
-NetSurf is provided under the GPL, as well as several other
-licences for different components it uses.
-See !NetSurf.Docs.about.index_en for details.
+NetSurf is provided under the GPL, as well as several other licences
+for different components it uses. Visit NetSurf's about:licence URL
+for details.
The !Boot and !System directories contain items provided produced
12 years, 8 months
r12071 tlsa - in /trunk/netsurf: !NetSurf/Resources/de/Messages !NetSurf/Resources/en/Messages !NetSurf/Resources/fr/Messages !NetSurf/Resources/it/Messages !NetSurf/Resources/nl/Messages riscos/menus.h riscos/window.c
by netsurf＠semichrome.net
Author: tlsa
Date: Wed Mar 16 07:24:01 2011
New Revision: 12071
URL: http://source.netsurf-browser.org?rev=12071&view=rev
Log:
Help menu options for about:credits and about:licence to replace old about NetSurf entry.
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/riscos/menus.h
trunk/netsurf/riscos/window.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 Wed Mar 16 07:24:01 2011
@@ -160,7 +160,8 @@
HelpContent:Inhalt F1
HelpGuide:Handbuch
HelpInfo:Nutzerinformation
-HelpAbout:Ãber NetSurf
+HelpCredits:Credits
+HelpLicence:Licence
HelpInter:interaktive Hilfe
# Toolbar menu
@@ -1016,8 +1017,9 @@
HelpBrowserMenu6-0:Ãffnet die NetSurf Dokumentation in einem neuen Browserfenster.
HelpBrowserMenu6-1:Ãffnet das NetSurf Handbuch in einem neuen Browserfenster.
HelpBrowserMenu6-2:Ãffnet eine Seite mit allgemeinen Informationen zu NetSurf in einem neuen Browserfenster.
-HelpBrowserMenu6-3:Ãffnet eine Seite mit Informationen zu Entwicklerteam und bei der Entwicklung genutzter Software in einem neuen Browserfenster.
-HelpBrowserMenu6-4:Lädt die interaktive Hilfe.
+HelpBrowserMenu6-3:\Sopen the about:credits page in a new \w.
+HelpBrowserMenu6-4:\Sopen the about:licence page in a new \w.
+HelpBrowserMenu6-5:Lädt die interaktive Hilfe.
HelpBrowser-1:Das ist ein Browserfenster.|MEinen Link mit AUSWAHL anklicken, um ihm zu folgen.|MEinen Link mit SPEZIAL anklicken, um ihn in einem neuen Fenster zu öffnen.|MShift+AUSWAHL über einem Verweis lädt den verlinkten Inhalt herunter.|MShift+SPEZIAL über einem Link klicken zum Speichern der Adresse des Verweises.
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 Wed Mar 16 07:24:01 2011
@@ -160,7 +160,8 @@
HelpContent:Contents F1
HelpGuide:User guide
HelpInfo:User information
-HelpAbout:About NetSurf
+HelpCredits:Credits
+HelpLicence:Licence
HelpInter:Interactive help
# Toolbar menu
@@ -1035,8 +1036,9 @@
HelpBrowserMenu6-0:\Sopen the documentation contents page in a new \w.
HelpBrowserMenu6-1:\Sopen the user guide in a new \w.
HelpBrowserMenu6-2:\Sopen the user information page in a new \w.
-HelpBrowserMenu6-3:\Sopen the NetSurf about page in a new \w.
-HelpBrowserMenu6-4:\Srun Help.
+HelpBrowserMenu6-3:\Sopen the about:credits page in a new \w.
+HelpBrowserMenu6-4:\Sopen the about:licence page in a new \w.
+HelpBrowserMenu6-5:\Srun Help.
HelpBrowser-1:Click \s on a link to follow it.|MClick \a on a link to open it in a new \w.|MShift+\s click on a link to download the link target contents.|MShift+\a click to save the link target address.
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 Wed Mar 16 07:24:01 2011
@@ -160,7 +160,8 @@
HelpContent:Contenus F1
HelpGuide:Guide de l'utilisateur
HelpInfo:Information utilisateur
-HelpAbout:Ã propos de NetSurf
+HelpCredits:Credits
+HelpLicence:Licence
HelpInter:Aide interactive
# Toolbar menu
@@ -1022,8 +1023,9 @@
HelpBrowserMenu6-0:\Souvrir la page de documentation dans une nouvelle fenêtre.
HelpBrowserMenu6-1:\Souvrir le guide de l'utilisateur dans une nouvelle fenêtre.
HelpBrowserMenu6-2:\Souvrir la page d'information de l'utilisateur dans une nouvelle fenêtre.
-HelpBrowserMenu6-3:\Souvrir la page "à propos de" de NetSurf dans une nouvelle fenêtre.
-HelpBrowserMenu6-4:\Slancer Help.
+HelpBrowserMenu6-3:\Sopen the about:credits page in a new \w.
+HelpBrowserMenu6-4:\Sopen the about:licence page in a new \w.
+HelpBrowserMenu6-5:\Slancer Help.
HelpBrowser-1:Cliquer \s sur un lien pour le suivre.|MCliquer \a sur un lien pour l'ouvrir dans une nouvelle \w.|MShift+\s click on a link to download the link target contents.|MShift+\a click to save the link target address.
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 Wed Mar 16 07:24:01 2011
@@ -162,7 +162,8 @@
HelpContent:Contenuti F1
HelpGuide:Guida in linea
HelpInfo:Informazioni utente
-HelpAbout:Informazioni su NetSurf
+HelpCredits:Credits
+HelpLicence:Licence
HelpInter:Aiuto interattivo
# Toolbar menu
@@ -1022,8 +1023,9 @@
HelpBrowserMenu6-0:\Sapri i contenuti della documentazione in una nuova finestra
HelpBrowserMenu6-1:\Sapri la guida in linea in una nuova finestra
HelpBrowserMenu6-2:\Sapri la pagina delle informazioni utente in una nuova finestra
-HelpBrowserMenu6-3:\Sapri la pagina delle informazioni di NetSurf in una nuova finestra
-HelpBrowserMenu6-4:\Savvia la guida in linea
+HelpBrowserMenu6-3:\Sopen the about:credits page in a new \w.
+HelpBrowserMenu6-4:\Sopen the about:licence page in a new \w.
+HelpBrowserMenu6-5:\Savvia la guida in linea
HelpBrowser-1:Clicca \s sul link per procedere.|MClicca \a in un link per aprirlo in una nuova finestra|MShift+\s clicca sul link per scaricarne i contenuti.|MShift+\a clicca per salvare l'indirizzo del link.
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 Wed Mar 16 07:24:01 2011
@@ -160,7 +160,8 @@
HelpContent:Inhoud F1
HelpGuide:Handboek
HelpInfo:Gebruikers informatie
-HelpAbout:Over NetSurf
+HelpCredits:Credits
+HelpLicence:Licence
HelpInter:Interactieve hulp
# Toolbar menu
@@ -1017,8 +1018,9 @@
HelpBrowserMenu6-0:\Sopen the documentation contents page in a new \w.
HelpBrowserMenu6-1:\Sopen the user guide in a new \w.
HelpBrowserMenu6-2:\Sopen the user information page in a new \w.
-HelpBrowserMenu6-3:\Sopen the NetSurf about page in a new \w.
-HelpBrowserMenu6-4:\Srun Help.
+HelpBrowserMenu6-3:\Sopen the about:credits page in a new \w.
+HelpBrowserMenu6-4:\Sopen the about:licence page in a new \w.
+HelpBrowserMenu6-5:\Srun Help.
HelpBrowser-1:Click \s on a link to follow it.|MClick \a on a link to open it in a new \w.|MShift+\s click on a link to download the link target contents.|MShift+\a click to save the link target address.
Modified: trunk/netsurf/riscos/menus.h
URL: http://source.netsurf-browser.org/trunk/netsurf/riscos/menus.h?rev=12071&...
==============================================================================
--- trunk/netsurf/riscos/menus.h (original)
+++ trunk/netsurf/riscos/menus.h Wed Mar 16 07:24:01 2011
@@ -36,7 +36,8 @@
HELP_OPEN_CONTENTS,
HELP_OPEN_GUIDE,
HELP_OPEN_INFORMATION,
- HELP_OPEN_ABOUT,
+ HELP_OPEN_CREDITS,
+ HELP_OPEN_LICENCE,
HELP_LAUNCH_INTERACTIVE,
/* history actions */
Modified: trunk/netsurf/riscos/window.c
URL: http://source.netsurf-browser.org/trunk/netsurf/riscos/window.c?rev=12071...
==============================================================================
--- trunk/netsurf/riscos/window.c (original)
+++ trunk/netsurf/riscos/window.c Wed Mar 16 07:24:01 2011
@@ -342,7 +342,8 @@
{ "Help.HelpContent", HELP_OPEN_CONTENTS, 0 },
{ "Help.HelpGuide", HELP_OPEN_GUIDE, 0 },
{ "_Help.HelpInfo", HELP_OPEN_INFORMATION, 0 },
- { "_Help.HelpAbout", HELP_OPEN_ABOUT, 0 },
+ { "Help.HelpCredits", HELP_OPEN_CREDITS, 0 },
+ { "_Help.HelpLicence", HELP_OPEN_LICENCE, 0 },
{ "Help.HelpInter", HELP_LAUNCH_INTERACTIVE, 0 },
{NULL, 0, 0}
}
@@ -2927,8 +2928,11 @@
case HELP_OPEN_INFORMATION:
ro_gui_open_help_page("documentation/info");
break;
- case HELP_OPEN_ABOUT:
- ro_gui_open_help_page("about/index");
+ case HELP_OPEN_CREDITS:
+ browser_window_create("about:credits", NULL, 0, true, false);
+ break;
+ case HELP_OPEN_LICENCE:
+ browser_window_create("about:licence", NULL, 0, true, false);
break;
case HELP_LAUNCH_INTERACTIVE:
if (!ro_gui_interactive_help_available()) {
12 years, 8 months
r12070 tlsa - /trunk/netsurf/riscos/gui.c
by netsurf＠semichrome.net
Author: tlsa
Date: Wed Mar 16 07:22:02 2011
New Revision: 12070
URL: http://source.netsurf-browser.org?rev=12070&view=rev
Log:
Pedantic wrap.
Modified:
trunk/netsurf/riscos/gui.c
Modified: trunk/netsurf/riscos/gui.c
URL: http://source.netsurf-browser.org/trunk/netsurf/riscos/gui.c?rev=12070&r1...
==============================================================================
--- trunk/netsurf/riscos/gui.c (original)
+++ trunk/netsurf/riscos/gui.c Wed Mar 16 07:22:02 2011
@@ -2177,7 +2177,8 @@
if ((length = snprintf(url, sizeof url,
"file:///<NetSurf$Dir>/Docs/%s_%s",
- page, option_language)) >= 0 && length < (int)sizeof(url))
+ page, option_language)) >= 0 &&
+ length < (int)sizeof(url))
browser_window_create(url, NULL, 0, true, false);
}
12 years, 8 months
r12069 tlsa - /trunk/netsurf/riscos/gui.c
by netsurf＠semichrome.net
Author: tlsa
Date: Tue Mar 15 18:23:27 2011
New Revision: 12069
URL: http://source.netsurf-browser.org?rev=12069&view=rev
Log:
Simple language directory handling.
Modified:
trunk/netsurf/riscos/gui.c
Modified: trunk/netsurf/riscos/gui.c
URL: http://source.netsurf-browser.org/trunk/netsurf/riscos/gui.c?rev=12069&r1...
==============================================================================
--- trunk/netsurf/riscos/gui.c (original)
+++ trunk/netsurf/riscos/gui.c Tue Mar 15 18:23:27 2011
@@ -283,15 +283,26 @@
char* gui_find_resource(const char *filename)
{
- /* TODO: handle language directories */
- size_t length = strlen(filename) +
- SLEN("file:///NetSurf:/Resources/") + 1;
-
+ /* Find max URL length */
+ size_t length = SLEN("file:///NetSurf:/Resources/") + SLEN("xx/") +
+ strlen(filename) + 1;
+
+ /* Allocate memory for URL (freed by the core) */
char *resource_url = malloc(length);
if (resource_url == NULL)
return NULL;
+ /* Insert base URL */
resource_url = strcpy(resource_url, "file:///NetSurf:/Resources/");
+
+ /* Add language directory to URL, for translated files */
+ /* TODO: handle non-en langauages
+ * handle non-html translated files */
+ if (strncmp(filename + strlen(filename) - 5, ".html", 5) == 0) {
+ resource_url = strcat(resource_url, "en/");
+ }
+
+ /* Add filename to URL */
return strcat(resource_url, filename);
}
12 years, 8 months
r12068 vince - in /trunk/netsurf: content/hlcache.c content/hlcache.h desktop/print.c gtk/print.c utils/errors.h
by netsurf＠semichrome.net
Author: vince
Date: Tue Mar 15 17:02:06 2011
New Revision: 12068
URL: http://source.netsurf-browser.org?rev=12068&view=rev
Log:
Stop gtk printing from exploding if its unable to initialise the job
add interface to clone a high level cache handle
make generic printing core call new hlcache interface
Modified:
trunk/netsurf/content/hlcache.c
trunk/netsurf/content/hlcache.h
trunk/netsurf/desktop/print.c
trunk/netsurf/gtk/print.c
trunk/netsurf/utils/errors.h
Modified: trunk/netsurf/content/hlcache.c
URL: http://source.netsurf-browser.org/trunk/netsurf/content/hlcache.c?rev=120...
==============================================================================
--- trunk/netsurf/content/hlcache.c (original)
+++ trunk/netsurf/content/hlcache.c Tue Mar 15 17:02:06 2011
@@ -370,6 +370,12 @@
return NSERROR_OK;
}
+nserror hlcache_handle_clone(hlcache_handle *handle, hlcache_handle **result)
+{
+ *result = NULL;
+ return NSERROR_CLONE_FAILED;
+}
+
/******************************************************************************
* High-level cache internals *
******************************************************************************/
Modified: trunk/netsurf/content/hlcache.h
URL: http://source.netsurf-browser.org/trunk/netsurf/content/hlcache.h?rev=120...
==============================================================================
--- trunk/netsurf/content/hlcache.h (original)
+++ trunk/netsurf/content/hlcache.h Tue Mar 15 17:02:06 2011
@@ -165,4 +165,14 @@
*/
struct content *hlcache_handle_get_content(const hlcache_handle *handle);
+/**
+ * Clone a high level cache handle.
+ *
+ * \param handle The handle to clone.
+ * \param result The cloned handle.
+ * \return NSERROR_OK on success, appropriate error otherwise
+ *
+ */
+nserror hlcache_handle_clone(hlcache_handle *handle, hlcache_handle **result);
+
#endif
Modified: trunk/netsurf/desktop/print.c
URL: http://source.netsurf-browser.org/trunk/netsurf/desktop/print.c?rev=12068...
==============================================================================
--- trunk/netsurf/desktop/print.c (original)
+++ trunk/netsurf/desktop/print.c Tue Mar 15 17:02:06 2011
@@ -159,43 +159,11 @@
hlcache_handle *print_init(hlcache_handle *content,
struct print_settings *settings)
{
-#ifdef FIX_CORE_PRINTING
hlcache_handle* printed_content;
- hlcache_handle_user *user_sentinel;
-
- content_add_user(content, NULL, (intptr_t) print_init, 0);
-
- printed_content = talloc_memdup(content, content, sizeof *content);
-
- if (!printed_content)
- return NULL;
-
- printed_content->data.html.bw = 0;
-
- user_sentinel = talloc(printed_content, hlcache_handle_user);
- user_sentinel->callback = 0;
- user_sentinel->p1 = user_sentinel->p2 = 0;
- user_sentinel->next = 0;
- printed_content->user_list = user_sentinel;
- content_add_user(printed_content, NULL, (intptr_t)print_init, 0);
-
- printed_content->data.html.layout =
- box_duplicate_tree(content->data.html.layout,
- printed_content);
-
- if (!printed_content->data.html.layout) {
- talloc_free(printed_content);
- return NULL;
- }
-
- assert(settings->font_func != NULL);
-
- printed_content->data.html.font_func = settings->font_func;
-
+
+ hlcache_handle_clone(content, &printed_content);
+
return printed_content;
-#else
- return NULL;
-#endif
}
/**
@@ -240,21 +208,16 @@
bool print_cleanup(hlcache_handle *content, const struct printer *printer,
struct print_settings *settings)
{
-#ifdef FIX_CORE_PRINTING
printer->print_end();
html_redraw_printing = false;
if (printed_content) {
- content_remove_user(printed_content, NULL, print_init);
- talloc_free(printed_content);
+ hlcache_handle_release(printed_content);
}
-
- content_remove_user(content, NULL, print_init);
free((void *)settings->output);
free(settings);
-#endif
return true;
}
Modified: trunk/netsurf/gtk/print.c
URL: http://source.netsurf-browser.org/trunk/netsurf/gtk/print.c?rev=12068&r1=...
==============================================================================
--- trunk/netsurf/gtk/print.c (original)
+++ trunk/netsurf/gtk/print.c Tue Mar 15 17:02:06 2011
@@ -497,24 +497,29 @@
settings->scale = 0.7;/*at 0.7 the pages look the best*/
settings->font_func = &nsfont;
- print_set_up(content_to_print, >k_printer,
- settings, &height_to_print);
-
- LOG(("page_width: %f ;page_height: %f; content height: %lf",
- settings->page_width, settings->page_height, height_to_print));
-
- height_on_page = settings->page_height;
- height_on_page = height_on_page -
+ if (print_set_up(content_to_print, >k_printer,
+ settings, &height_to_print) == false) {
+ gtk_print_operation_cancel(operation);
+
+ } else {
+
+ LOG(("page_width: %f ;page_height: %f; content height: %lf",
+ settings->page_width, settings->page_height,
+ height_to_print));
+
+ height_on_page = settings->page_height;
+ height_on_page = height_on_page -
FIXTOFLT(FSUB(settings->margins[MARGINTOP],
- settings->margins[MARGINBOTTOM]));
- height_to_print *= settings->scale;
-
- page_number = height_to_print / height_on_page;
-
- if (height_to_print - page_number * height_on_page > 0)
- page_number += 1;
+ settings->margins[MARGINBOTTOM]));
+ height_to_print *= settings->scale;
+
+ page_number = height_to_print / height_on_page;
+
+ if (height_to_print - page_number * height_on_page > 0)
+ page_number += 1;
- gtk_print_operation_set_n_pages(operation, page_number);
+ gtk_print_operation_set_n_pages(operation, page_number);
+ }
}
/**
Modified: trunk/netsurf/utils/errors.h
URL: http://source.netsurf-browser.org/trunk/netsurf/utils/errors.h?rev=12068&...
==============================================================================
--- trunk/netsurf/utils/errors.h (original)
+++ trunk/netsurf/utils/errors.h Tue Mar 15 17:02:06 2011
@@ -35,7 +35,9 @@
NSERROR_NOT_FOUND, /**< Requested item not found */
- NSERROR_SAVE_FAILED /**< Failed to save data */
+ NSERROR_SAVE_FAILED, /**< Failed to save data */
+
+ NSERROR_CLONE_FAILED /**< Failed to clone handle */
} nserror;
#endif
12 years, 8 months