From 355799ce0bbb078237dfc1ae9874bbc5342acbc4 Mon Sep 17 00:00:00 2001 From: John Mark Bell Date: Thu, 17 Dec 2009 23:55:02 +0000 Subject: Merge branches/MarkieB/gtkmain to trunk. svn path=/trunk/netsurf/; revision=9729 --- !NetSurf/Resources/SearchEngines | 20 + !NetSurf/Resources/de/Messages | 116 ++ !NetSurf/Resources/default.ico | Bin 0 -> 1406 bytes !NetSurf/Resources/en/Messages | 114 ++ !NetSurf/Resources/fr/Messages | 116 ++ !NetSurf/Resources/it/Messages | 143 ++- !NetSurf/Resources/nl/Messages | 116 ++ Docs/BUILDING-AmigaCross | 102 ++ Docs/Doxyfile | 2 + Makefile | 11 + Makefile.sources | 31 +- amiga/download.c | 2 +- amiga/fetch_file.c | 26 +- amiga/gui.c | 19 +- amiga/gui.h | 2 + amiga/menu.c | 2 +- amiga/save_complete.c | 843 ++------------ amiga/search.c | 803 ++++--------- beos/beos_scaffolding.cpp | 16 + beos/beos_search.cpp | 75 ++ content/content.c | 3 + content/fetch.c | 4 +- content/fetch.h | 18 +- content/fetchcache.c | 127 ++- content/fetchers/fetch_curl.c | 50 +- content/fetchers/fetch_data.c | 28 +- desktop/browser.c | 24 +- desktop/browser.h | 3 + desktop/gui.h | 9 +- desktop/options.c | 8 +- desktop/options.h | 2 + desktop/save_complete.c | 755 +++++++++++++ desktop/save_complete.h | 42 + desktop/search.c | 705 ++++++++++++ desktop/search.h | 91 ++ desktop/searchweb.c | 292 +++++ desktop/searchweb.h | 79 ++ framebuffer/fb_search.c | 74 ++ gtk/dialogs/gtk_about.c | 5 +- gtk/dialogs/gtk_options.c | 244 +++- gtk/dialogs/gtk_options.h | 6 +- gtk/dialogs/gtk_source.c | 266 +++-- gtk/gtk_download.c | 32 +- gtk/gtk_gui.c | 115 +- gtk/gtk_gui.h | 14 +- gtk/gtk_history.c | 18 +- gtk/gtk_login.c | 2 +- gtk/gtk_menu.c | 422 +++++++ gtk/gtk_menu.h | 135 +++ gtk/gtk_save.c | 81 ++ gtk/gtk_scaffolding.c | 2049 +++++++++++++++++++++++----------- gtk/gtk_scaffolding.h | 244 +++- gtk/gtk_search.c | 263 +++++ gtk/gtk_search.h | 39 + gtk/gtk_selection.c | 5 +- gtk/gtk_tabs.c | 39 +- gtk/gtk_theme.c | 773 +++++++++++++ gtk/gtk_theme.h | 46 + gtk/gtk_toolbar.c | 1102 ++++++++++++++++++ gtk/gtk_toolbar.h | 90 ++ gtk/gtk_window.c | 151 ++- gtk/gtk_window.h | 46 +- gtk/options.h | 10 +- gtk/res/SearchEngines | 20 + gtk/res/default.ico | Bin 0 -> 1406 bytes gtk/res/html.png | Bin 0 -> 3625 bytes gtk/res/login.glade | 222 ++++ gtk/res/netsurf.glade | 1661 ++------------------------- gtk/res/options.glade | 772 ++++++++----- gtk/res/password.glade | 274 +++++ gtk/res/ssl.glade | 197 ++++ gtk/res/themelist | 2 + gtk/res/themes/Alpha.png | Bin 0 -> 156 bytes gtk/res/themes/gtk+/back.png | Bin 0 -> 915 bytes gtk/res/themes/gtk+/closetab.png | Bin 0 -> 1453 bytes gtk/res/themes/gtk+/closewindow.png | Bin 0 -> 1453 bytes gtk/res/themes/gtk+/copy.png | Bin 0 -> 697 bytes gtk/res/themes/gtk+/cut.png | Bin 0 -> 1032 bytes gtk/res/themes/gtk+/delete.png | Bin 0 -> 1449 bytes gtk/res/themes/gtk+/forward.png | Bin 0 -> 906 bytes gtk/res/themes/gtk+/fullscreen.png | Bin 0 -> 606 bytes gtk/res/themes/gtk+/helpabout.png | Bin 0 -> 982 bytes gtk/res/themes/gtk+/helpcontents.png | Bin 0 -> 1728 bytes gtk/res/themes/gtk+/history.png | Bin 0 -> 285 bytes gtk/res/themes/gtk+/home.png | Bin 0 -> 1050 bytes gtk/res/themes/gtk+/info | 81 ++ gtk/res/themes/gtk+/newtab.png | Bin 0 -> 736 bytes gtk/res/themes/gtk+/newwindow.png | Bin 0 -> 736 bytes gtk/res/themes/gtk+/openfile.png | Bin 0 -> 612 bytes gtk/res/themes/gtk+/paste.png | Bin 0 -> 893 bytes gtk/res/themes/gtk+/preferences.png | Bin 0 -> 1691 bytes gtk/res/themes/gtk+/print.png | Bin 0 -> 818 bytes gtk/res/themes/gtk+/printpreview.png | Bin 0 -> 1244 bytes gtk/res/themes/gtk+/quit.png | Bin 0 -> 967 bytes gtk/res/themes/gtk+/reload.png | Bin 0 -> 1466 bytes gtk/res/themes/gtk+/savepage.png | Bin 0 -> 1206 bytes gtk/res/themes/gtk+/selectall.png | Bin 0 -> 717 bytes gtk/res/themes/gtk+/stop.png | Bin 0 -> 1043 bytes gtk/res/themes/gtk+/viewsource.png | Bin 0 -> 960 bytes gtk/res/themes/gtk+/zoomminus.png | Bin 0 -> 941 bytes gtk/res/themes/gtk+/zoomnormal.png | Bin 0 -> 962 bytes gtk/res/themes/gtk+/zoomplus.png | Bin 0 -> 993 bytes gtk/res/toolbar.glade | 126 +++ gtk/res/warning.glade | 79 ++ gtk/sexy_icon_entry.c | 979 ++++++++++++++++ gtk/sexy_icon_entry.h | 101 ++ image/ico.c | 12 + image/ico.h | 1 + render/favicon.c | 232 ++++ render/favicon.h | 27 + render/html.c | 8 +- render/html.h | 3 + render/html_redraw.c | 9 +- render/layout.c | 2 +- render/textplain.c | 12 +- riscos/gui.c | 2 +- riscos/gui.h | 2 +- riscos/menus.c | 2 +- riscos/save.c | 67 +- riscos/save_complete.c | 759 ------------- riscos/save_complete.h | 32 - riscos/search.c | 813 ++++---------- riscos/searchweb.c | 18 + riscos/window.c | 15 + utils/config.h | 5 + utils/container.c | 183 ++- utils/container.h | 3 + utils/utils.c | 23 + utils/utils.h | 1 + 129 files changed, 12052 insertions(+), 5763 deletions(-) create mode 100644 !NetSurf/Resources/SearchEngines create mode 100644 !NetSurf/Resources/default.ico create mode 100644 Docs/BUILDING-AmigaCross create mode 100644 beos/beos_search.cpp create mode 100644 desktop/save_complete.c create mode 100644 desktop/save_complete.h create mode 100644 desktop/search.c create mode 100644 desktop/search.h create mode 100644 desktop/searchweb.c create mode 100644 desktop/searchweb.h create mode 100644 framebuffer/fb_search.c create mode 100644 gtk/gtk_menu.c create mode 100644 gtk/gtk_menu.h create mode 100644 gtk/gtk_save.c create mode 100644 gtk/gtk_search.c create mode 100644 gtk/gtk_search.h create mode 100644 gtk/gtk_theme.c create mode 100644 gtk/gtk_theme.h create mode 100644 gtk/gtk_toolbar.c create mode 100644 gtk/gtk_toolbar.h create mode 100644 gtk/res/SearchEngines create mode 100644 gtk/res/default.ico create mode 100644 gtk/res/html.png create mode 100644 gtk/res/login.glade create mode 100644 gtk/res/password.glade create mode 100644 gtk/res/ssl.glade create mode 100644 gtk/res/themelist create mode 100644 gtk/res/themes/Alpha.png create mode 100644 gtk/res/themes/gtk+/back.png create mode 100644 gtk/res/themes/gtk+/closetab.png create mode 100644 gtk/res/themes/gtk+/closewindow.png create mode 100644 gtk/res/themes/gtk+/copy.png create mode 100644 gtk/res/themes/gtk+/cut.png create mode 100644 gtk/res/themes/gtk+/delete.png create mode 100644 gtk/res/themes/gtk+/forward.png create mode 100644 gtk/res/themes/gtk+/fullscreen.png create mode 100644 gtk/res/themes/gtk+/helpabout.png create mode 100644 gtk/res/themes/gtk+/helpcontents.png create mode 100644 gtk/res/themes/gtk+/history.png create mode 100644 gtk/res/themes/gtk+/home.png create mode 100644 gtk/res/themes/gtk+/info create mode 100644 gtk/res/themes/gtk+/newtab.png create mode 100644 gtk/res/themes/gtk+/newwindow.png create mode 100644 gtk/res/themes/gtk+/openfile.png create mode 100644 gtk/res/themes/gtk+/paste.png create mode 100644 gtk/res/themes/gtk+/preferences.png create mode 100644 gtk/res/themes/gtk+/print.png create mode 100644 gtk/res/themes/gtk+/printpreview.png create mode 100644 gtk/res/themes/gtk+/quit.png create mode 100644 gtk/res/themes/gtk+/reload.png create mode 100644 gtk/res/themes/gtk+/savepage.png create mode 100644 gtk/res/themes/gtk+/selectall.png create mode 100644 gtk/res/themes/gtk+/stop.png create mode 100644 gtk/res/themes/gtk+/viewsource.png create mode 100644 gtk/res/themes/gtk+/zoomminus.png create mode 100644 gtk/res/themes/gtk+/zoomnormal.png create mode 100644 gtk/res/themes/gtk+/zoomplus.png create mode 100644 gtk/res/toolbar.glade create mode 100644 gtk/res/warning.glade create mode 100644 gtk/sexy_icon_entry.c create mode 100644 gtk/sexy_icon_entry.h create mode 100644 render/favicon.c create mode 100644 render/favicon.h delete mode 100644 riscos/save_complete.c delete mode 100644 riscos/save_complete.h create mode 100644 riscos/searchweb.c diff --git a/!NetSurf/Resources/SearchEngines b/!NetSurf/Resources/SearchEngines new file mode 100644 index 000000000..e9eb466c2 --- /dev/null +++ b/!NetSurf/Resources/SearchEngines @@ -0,0 +1,20 @@ +Google|www.google.com|http://www.google.com/search?q=%s|http://www.google.com/favicon.ico| +Yahoo|search.yahoo.com|http://search.yahoo.com/search?p=%s|http://www.yahoo.com/favicon.ico| +Bing|www.bing.com|http://www.bing.com/search?q=%s|http://www.bing.com/favicon.ico| +Business.com|www.business.com|http://www.business.com/search/rslt_default.asp?query=%s|http://www.business.com/favicon.ico| +Omgili|www.omgili.com|http://www.omgili.com/AAAAA/%s.html|http://www.omgili.com/favicon.ico| +BBC News|search.bbc.co.uk|http://search.bbc.co.uk/search?q=%s&tab=ns|http://news.bbc.co.uk/favicon.ico| +Ubuntu Packages|packages.ubuntu.com|http://packages.ubuntu.com/search?keywords=%s|http://packages.ubuntu.com/favicon.ico| +Creative Commons|creativecommons.org|http://creativecommons.org/?s=%s|http://creativecommons.org/favicon.ico| +Ask.com|www.ask.com|http://www.ask.com/web?q=%s|http://www.ask.com/favicon.ico| +Answers.com|www.answers.com|http://www.answers.com/%s|http://www.answers.com/favicon.ico| +Dictionary.com|dictionary.reference.com|http://dictionary.reference.com/browse/%s?jss=0|http://dictionary.reference.com/favicon.ico| +Youtube|www.youtube.com|http://www.youtube.com/results?search_query=%s|http://www.youtube.com/favicon.ico| +AeroMp3|www.aeromp3.com|http://www.aeromp3.com/search?q=%s|http://www.aeromp3.com/favicon.ico| +AOL|search.aol.com|http://search.aol.com/aol/search?query=%s|http://www.aol.com/favicon.ico| +Baidu|www.baidu.com|http://www.baidu.com/s?wd=%s|http://www.baidu.com/favicon.ico| +Amazon|www.amazon.com|http://www.amazon.com/s/ref=nb_ss_gw?field-keywords=%s|http://www.amazon.com/favicon.ico| +Ebay|shop.ebay.com|http://shop.ebay.com/items/%s|http://www.ebay.com/favicon.ico| +IMDB|www.imdb.com|http://www.imdb.com/find?q=%s|http://www.imdb.com/favicon.ico| +ESPN|search.espn.go.com|http://search.espn.go.com/%s/|http://www.espn.go.com/favicon.ico| +Wikipedia|en.wikipedia.org|http://en.wikipedia.org/w/index.php?title=Special%%3ASearch&search=%s|http://en.wikipedia.org/favicon.ico| diff --git a/!NetSurf/Resources/de/Messages b/!NetSurf/Resources/de/Messages index 0f4722bab..058273ee7 100644 --- a/!NetSurf/Resources/de/Messages +++ b/!NetSurf/Resources/de/Messages @@ -432,10 +432,118 @@ gtkFailed:Download failed gtkFileError:File error: %s gtkInfo:%s from %s is %s in size gtkSave:Save file as... +gtkSourceSave:Save Source +gtkPlainSave:Save as text +gtkFullSave:Save webpage complete - select an empty directory gtkUnknownHost:an unknown host gtkUnknownFile: gtkUnknownSize:unknown +# gtk Menu / Button labels +# + +gtkNewTab:New _Tab +gtkNewTabAccel:t +gtkNewWindow:_New Window +gtkNewWindowAccel:n +gtkOpenFile:_Open File +gtkOpenFileAccel:o +gtkCloseWindow:_Close Window +gtkCloseWindowAccel:w +gtkSavePage:Save Page.. +gtkSavePageAccel:s +gtkExport:Export +gtkPlainText:Plain Text.. +gtkDrawFile:Drawfile.. +gtkPostScript:PostScript.. +gtkPDF:PDF.. +gtkPrintPreview:Print Preview.. +gtkPrintPreviewAccel:p +gtkPrint:Print.. +gtkPrintAccel:p +gtkQuit:_Quit +gtkQuitAccel:q + +gtkCut:Cu_t +gtkCutAccel:x +gtkCopy:_Copy +gtkCopyAccel:c +gtkPaste:_Paste +gtkPasteAccel:v +gtkDelete:_Delete +gtkSelectAll:Select _All +gtkSelectAllAccel:a +gtkFind:_Find.. +gtkFindAccel:f +gtkPreferences:P_references + +gtkStop:_Stop +gtkStopAccel:Escape +gtkReload:_Reload +gtkReloadAccel:F5 +gtkScaleView:_Scale View +gtkZoomPlus:Zoom _in +gtkZoomPlusAccel:plus +gtkZoomMinus:Zoom _out +gtkZoomMinusAccel:minus +gtkZoomNormal:_Normal size +gtkZoomNormalAccel:0 +gtkFullScreen:_Fullscreen +gtkFullScreenAccel:F11 +gtkViewSource:View S_ource +gtkViewSourceAccel:F8 +gtkImages:_Images +gtkForegroundImages:_Foreground Images +gtkBackgroundImages:_Background Images +gtkToolbars:_Toolbars +gtkMenuBar:_Menu Bar +gtkToolBar:_Button Bar +gtkStatusBar:_Status Bar +gtkDownloads:_Downloads +gtkDownloadsAccel:d +gtkSaveWindowSize:S_ave Window Size +gtkDebugging:De_bugging +gtkToggleDebugging:T_oggle debug rendering +gtkSaveBoxTree:_Save box tree +gtkSaveDomTree:Save DOM tree + +gtkBack:_Back +gtkBackAccel:Left +gtkForward:_Forward +gtkForwardAccel:Right +gtkHome:_Home +gtkHomeAccel:Down +gtkLocalHistory:_Local History +gtkLocalHistoryAccel:h +gtkGlobalHistory:_Global History +gtkGlobalHistoryAccel:h +gtkAddBookMarks:_Add to Bookmarks.. +gtkShowBookMarks:_Show Bookmarks.. +gtkShowBookMarksAccel:F6 +gtkOpenLocation:_Open Location.. +gtkOpenLocationAccel:l + +gtkNextTab:_Next tab +gtkNextTabAccel:Right +gtkPrevTab:_Previous tab +gtkPrevTabAccel:Left +gtkCloseTab:_Close tab +gtkCloseTabAccel:w + +gtkContents:_Contents +gtkGuide:User _guide +gtkUserInformation:User _information +gtkAbout:_About + + +gtkToolBarTitle:Toolbar custom button store +gtkAddThemeTitle:Select folder containing theme images + +gtkThemeFolderInstructions:To Install a theme, create a directory full of appropriately-named images as a subdirectory of gtk/res/themes/ +gtkThemeFolderSub:Select a subdirectory of the themes folder +gtkThemeDup:Theme is already included +gtkThemeAdd:Theme added successfully + # Printing user interface tokens # ============================== # @@ -459,6 +567,8 @@ Printing:Printing page NotFound:nichts Next:Next Prev:Previous +ShowAll:Show All +CaseSens:Case Sensitive # 401 login user interface tokens @@ -578,6 +688,9 @@ MiscError:Unerwarteter Fehler: FileError:Datei existiert nicht: PrintError:Ein Fehler trat während des Druckens auf: AWNotSeen:Das Programm AWViewer wurde nicht gefunden. +EncNotRec:Encoding type not recognised. +FileOpenError:could not open file '%s' +DirectoryError:directory '%s' already exists # Specific errors - displayed in a dialog box # @@ -589,11 +702,13 @@ NoDiscSpace:Nicht genug Speicherplatz auf dem Medium vorhanden. Template:Ein Template für ein Fenster fehlt in der Datei Templates. Bitte NetSurf neu installieren. HotlistSaveError:Hotlist konnte nicht korrekt gespeichert werden. HotlistLoadError:Hotlist konnte nicht korrekt geladen werden. +NoDirError:%s is not a directory NoPathError:Symbol in ein Verzeichnisfenster ziehen um zu Speichern. NoNameError:Bitte einen Namen eingeben. NoURLError:Bitte eine URL Adresse eingeben. URIError:NetSurf konnte die URI Datei nicht lesen. Syntax Fehler. EmptyError:Die Datei ist leer. +SearchError:Invalid Search. PrintErrorRO2:Der Drucker scheint beschäftigt zu sein. AWNotSeen:Please locate the AWViewer application and try again. @@ -636,6 +751,7 @@ Done:Dokument fertiggestellt BadRedirect:Falsche URL für Redirect FetchFailed:Kann Dokument nicht fetchen NotCSS:Warnung: Stylesheet ist kein CSS +NotFavIco:Favicon not supported BadObject:Warnung: falscher Objekttyp ObjError:Fehler beim Laden des Objektes: %s ParsingFail:Dokumentparsing ist fehlgeschlagen. diff --git a/!NetSurf/Resources/default.ico b/!NetSurf/Resources/default.ico new file mode 100644 index 000000000..1cb432828 Binary files /dev/null and b/!NetSurf/Resources/default.ico differ diff --git a/!NetSurf/Resources/en/Messages b/!NetSurf/Resources/en/Messages index 55f5b191d..a787eeb3d 100644 --- a/!NetSurf/Resources/en/Messages +++ b/!NetSurf/Resources/en/Messages @@ -434,12 +434,119 @@ gtkFileError:File error: %s gtkInfo:%s from %s is %s in size gtkSave:Save file as... gtkSourceSave:Save source +gtkplainSave:Save plain text +gtkcompleteSave:Save webpage complete - select an empty directory gtkSaveConfirm:File saved gtkSaveCancelled:File not saved gtkUnknownHost:an unknown host gtkUnknownFile: gtkUnknownSize:unknown +# gtk Menu / Button labels +# + +gtkNewTab:New _Tab +gtkNewTabAccel:t +gtkNewWindow:_New Window +gtkNewWindowAccel:n +gtkOpenFile:_Open File +gtkOpenFileAccel:o +gtkCloseWindow:_Close Window +gtkCloseWindowAccel:w +gtkSavePage:Save Page.. +gtkSavePageAccel:s +gtkExport:Export +gtkPlainText:Plain Text.. +gtkDrawFile:Drawfile.. +gtkPostScript:PostScript.. +gtkPDF:PDF.. +gtkPrintPreview:Print Preview.. +gtkPrintPreviewAccel:p +gtkPrint:Print.. +gtkPrintAccel:p +gtkQuitMenu:_Quit +gtkQuitMenuAccel:q + +gtkCut:Cu_t +gtkCutAccel:x +gtkCopy:_Copy +gtkCopyAccel:c +gtkPaste:_Paste +gtkPasteAccel:v +gtkDelete:_Delete +gtkSelectAll:Select _All +gtkSelectAllAccel:a +gtkFind:_Find.. +gtkFindAccel:f +gtkPreferences:P_references + +gtkStop:_Stop +gtkStopAccel:Escape +gtkReload:_Reload +gtkReloadAccel:F5 +gtkScaleView:_Scale View +gtkZoomPlus:Zoom _in +gtkZoomPlusAccel:plus +gtkZoomMinus:Zoom _out +gtkZoomMinusAccel:minus +gtkZoomNormal:_Normal size +gtkZoomNormalAccel:0 +gtkFullScreen:_Fullscreen +gtkFullScreenAccel:F11 +gtkViewSource:View S_ource +gtkViewSourceAccel:F8 +gtkImages:_Images +gtkForegroundImages:_Foreground Images +gtkBackgroundImages:_Background Images +gtkToolbars:_Toolbars +gtkMenuBar:_Menu Bar +gtkToolBar:_Button Bar +gtkStatusBar:_Status Bar +gtkDownloads:_Downloads +gtkDownloadsAccel:d +gtkSaveWindowSize:S_ave Window Size +gtkDebugging:De_bugging +gtkToggleDebugging:T_oggle debug rendering +gtkSaveBoxTree:_Save box tree +gtkSaveDomTree:Save DOM tree + +gtkBack:_Back +gtkBackAccel:Left +gtkForward:_Forward +gtkForwardAccel:Right +gtkHome:_Home +gtkHomeAccel:Down +gtkLocalHistory:_Local History +gtkLocalHistoryAccel:h +gtkGlobalHistory:_Global History +gtkGlobalHistoryAccel:h +gtkAddBookMarks:_Add to Bookmarks.. +gtkShowBookMarks:_Show Bookmarks.. +gtkShowBookMarksAccel:F6 +gtkOpenLocation:_Open Location.. +gtkOpenLocationAccel:l + +gtkNextTab:_Next tab +gtkNextTabAccel:Right +gtkPrevTab:_Previous tab +gtkPrevTabAccel:Left +gtkCloseTab:_Close tab +gtkCloseTabAccel:w + +gtkContents:_Contents +gtkGuide:User _guide +gtkUserInformation:User _information +gtkAbout:_About + + +gtkToolBarTitle:Toolbar custom button store +gtkAddThemeTitle:Select folder containing theme images + +gtkThemeFolderInstructions:To Install a theme, create a directory full of appropriately-named images as a subdirectory of gtk/res/themes/ +gtkThemeFolderSub:Select a subdirectory of the themes folder +gtkThemeDup:Theme is already included +gtkThemeAdd:Theme added successfully + # Printing user interface tokens # ============================== # @@ -463,6 +570,8 @@ Printing:Printing page NotFound:Not found Next:Next Prev:Previous +ShowAll:Show All +CaseSens:Case Sensitive # 401 login user interface tokens @@ -593,14 +702,18 @@ NoDiscSpace:Not enough space available on disc. Template:A window template is missing from the Templates file. Please reinstall NetSurf. HotlistSaveError:The hotlist was unable to be correctly saved. HotlistLoadError:The hotlist was unable to be correctly loaded. +NoDirError:%s is not a directory NoPathError:To save, drag the icon to a directory display NoNameError:Please enter a name NoURLError:Please enter a URL URIError:NetSurf was unable to parse this URI file due to a syntax error. EmptyError:file is empty. +SearchError:Invalid Search. PrintErrorRO2:It appears that the printer is busy. AWNotSeen:Please locate the AWViewer application and try again. EncNotRec:Encoding type not recognised. +FileOpenError:could not open file '%s' +DirectoryError:directory '%s' already exists # Error messages for Amiga version only CompError:Unable to open @@ -641,6 +754,7 @@ Done:Document done BadRedirect:Bad redirect URL FetchFailed:Unable to fetch document NotCSS:Warning: stylesheet is not CSS +NotFavIco:Favicon not supported BadObject:Warning: bad object type ObjError:Error loading object: %s ParsingFail:Parsing the document failed. diff --git a/!NetSurf/Resources/fr/Messages b/!NetSurf/Resources/fr/Messages index 6d8fe304c..c0fc0af5e 100644 --- a/!NetSurf/Resources/fr/Messages +++ b/!NetSurf/Resources/fr/Messages @@ -432,10 +432,118 @@ gtkFailed:Download failed gtkFileError:File error: %s gtkInfo:%s from %s is %s in size gtkSave:Save file as... +gtkSourceSave:Save Source +gtkPlainSave:Save as text +gtkFullSave:Save webpage complete - select an empty directory gtkUnknownHost:an unknown host gtkUnknownFile: gtkUnknownSize:unknown +# gtk Menu / Button labels +# + +gtkNewTab:New _Tab +gtkNewTabAccel:t +gtkNewWindow:_New Window +gtkNewWindowAccel:n +gtkOpenFile:_Open File +gtkOpenFileAccel:o +gtkCloseWindow:_Close Window +gtkCloseWindowAccel:w +gtkSavePage:Save Page.. +gtkSavePageAccel:s +gtkExport:Export +gtkPlainText:Plain Text.. +gtkDrawFile:Drawfile.. +gtkPostScript:PostScript.. +gtkPDF:PDF.. +gtkPrintPreview:Print Preview.. +gtkPrintPreviewAccel:p +gtkPrint:Print.. +gtkPrintAccel:p +gtkQuit:_Quit +gtkQuitAccel:q + +gtkCut:Cu_t +gtkCutAccel:x +gtkCopy:_Copy +gtkCopyAccel:c +gtkPaste:_Paste +gtkPasteAccel:v +gtkDelete:_Delete +gtkSelectAll:Select _All +gtkSelectAllAccel:a +gtkFind:_Find.. +gtkFindAccel:f +gtkPreferences:P_references + +gtkStop:_Stop +gtkStopAccel:Escape +gtkReload:_Reload +gtkReloadAccel:F5 +gtkScaleView:_Scale View +gtkZoomPlus:Zoom _in +gtkZoomPlusAccel:plus +gtkZoomMinus:Zoom _out +gtkZoomMinusAccel:minus +gtkZoomNormal:_Normal size +gtkZoomNormalAccel:0 +gtkFullScreen:_Fullscreen +gtkFullScreenAccel:F11 +gtkViewSource:View S_ource +gtkViewSourceAccel:F8 +gtkImages:_Images +gtkForegroundImages:_Foreground Images +gtkBackgroundImages:_Background Images +gtkToolbars:_Toolbars +gtkMenuBar:_Menu Bar +gtkToolBar:_Button Bar +gtkStatusBar:_Status Bar +gtkDownloads:_Downloads +gtkDownloadsAccel:d +gtkSaveWindowSize:S_ave Window Size +gtkDebugging:De_bugging +gtkToggleDebugging:T_oggle debug rendering +gtkSaveBoxTree:_Save box tree +gtkSaveDomTree:Save DOM tree + +gtkBack:_Back +gtkBackAccel:Left +gtkForward:_Forward +gtkForwardAccel:Right +gtkHome:_Home +gtkHomeAccel:Down +gtkLocalHistory:_Local History +gtkLocalHistoryAccel:h +gtkGlobalHistory:_Global History +gtkGlobalHistoryAccel:h +gtkAddBookMarks:_Add to Bookmarks.. +gtkShowBookMarks:_Show Bookmarks.. +gtkShowBookMarksAccel:F6 +gtkOpenLocation:_Open Location.. +gtkOpenLocationAccel:l + +gtkNextTab:_Next tab +gtkNextTabAccel:Right +gtkPrevTab:_Previous tab +gtkPrevTabAccel:Left +gtkCloseTab:_Close tab +gtkCloseTabAccel:w + +gtkContents:_Contents +gtkGuide:User _guide +gtkUserInformation:User _information +gtkAbout:_About + + +gtkToolBarTitle:Toolbar custom button store +gtkAddThemeTitle:Select folder containing theme images + +gtkThemeFolderInstructions:To Install a theme, create a directory full of appropriately-named images as a subdirectory of gtk/res/themes/ +gtkThemeFolderSub:Select a subdirectory of the themes folder +gtkThemeDup:Theme is already included +gtkThemeAdd:Theme added successfully + # Printing user interface tokens # ============================== # @@ -459,6 +567,8 @@ Printing:Printing page NotFound:Non trouvé Next:Next Prev:Previous +ShowAll:Show All +CaseSens:Case Sensitive # 401 login user interface tokens @@ -578,6 +688,9 @@ MiscError:Une erreur inattendue s'est produite: FileError:Le fichier n'existe pas: PrintError:Une erreur s'est produite lors de l'impression: AWNotSeen:Localisez l'application AMViewer SVP puis réessayez. +EncNotRec:Encoding type not recognised. +FileOpenError:could not open file '%s' +DirectoryError:directory '%s' already exists # Specific errors - displayed in a dialog box # @@ -589,11 +702,13 @@ NoDiscSpace:Pas assez d'espace disque disponible. Template:Un modèle de fenêtre est absent du fichier Templates. Réinstallez NetSurf SVP. HotlistSaveError:Les favoris n'ont pas pu être sauvés correctement. HotlistLoadError:Les favoris n'ont pas pu être chargés correctement. +NoDirError:%s n'est pas un répertoire NoPathError:Pour sauver, lâcher cette icône dans une fenêtre de Filer NoNameError:Entrez un nom SVP NoURLError:Entrez une URL SVP URIError:NetSurf est incapable de traiter ce fichier URI à cause d'une erreur de syntaxe. EmptyError:Le fichier est vide. +SearchError:Recherche Non-Valide. PrintErrorRO2:Il semble que l'imprimante soit occupée. AWNotSeen:Localisez l'application AMViewer SVP puis réessayez. @@ -636,6 +751,7 @@ Done:Document terminé BadRedirect:Mauvais URL de redirection FetchFailed:Récupération du fichier impossible NotCSS:Attention: feuille de style non CSS +NotFavIco:Favicon non-soutenu BadObject:Attention: mauvais type d'objet ObjError:Erreur lors du chargement de: %s ParsingFail:L'analyse syntaxique du document a échoué. diff --git a/!NetSurf/Resources/it/Messages b/!NetSurf/Resources/it/Messages index 86953b34f..e824fbbe7 100755 --- a/!NetSurf/Resources/it/Messages +++ b/!NetSurf/Resources/it/Messages @@ -214,7 +214,7 @@ URLSuggest:URL Recenti Languages:Lingua # # Network pane -ProxyType:Tipo di proxy +ProxyType:Tipo di Proxy ProxyNone:Nessun proxy ProxyNoAuth:Proxy semplice ProxyBasic:Autentificazione di Base @@ -437,12 +437,119 @@ gtkFileError:Errore File: %s gtkInfo:%s da %s è %s come dimensione gtkSave:Salva file come... gtkSourceSave:Salva sorgente +gtkPlainSave:Save as text +gtkFullSave:Save webpage complete - select an empty directory gtkSaveConfirm:File salvato gtkSaveCancelled:File non salvato gtkUnknownHost:un Host sconosciuto gtkUnknownFile: gtkUnknownSize:sconosciuto +# gtk Menu / Button labels +# + +gtkNewTab:New _Tab +gtkNewTabAccel:t +gtkNewWindow:_New Window +gtkNewWindowAccel:n +gtkOpenFile:_Open File +gtkOpenFileAccel:o +gtkCloseWindow:_Close Window +gtkCloseWindowAccel:w +gtkSavePage:Save Page.. +gtkSavePageAccel:s +gtkExport:Export +gtkPlainText:Plain Text.. +gtkDrawFile:Drawfile.. +gtkPostScript:PostScript.. +gtkPDF:PDF.. +gtkPrintPreview:Print Preview.. +gtkPrintPreviewAccel:p +gtkPrint:Print.. +gtkPrintAccel:p +gtkQuit:_Quit +gtkQuitAccel:q + +gtkCut:Cu_t +gtkCutAccel:x +gtkCopy:_Copy +gtkCopyAccel:c +gtkPaste:_Paste +gtkPasteAccel:v +gtkDelete:_Delete +gtkSelectAll:Select _All +gtkSelectAllAccel:a +gtkFind:_Find.. +gtkFindAccel:f +gtkPreferences:P_references + +gtkStop:_Stop +gtkStopAccel:Escape +gtkReload:_Reload +gtkReloadAccel:F5 +gtkScaleView:_Scale View +gtkZoomPlus:Zoom _in +gtkZoomPlusAccel:plus +gtkZoomMinus:Zoom _out +gtkZoomMinusAccel:minus +gtkZoomNormal:_Normal size +gtkZoomNormalAccel:0 +gtkFullScreen:_Fullscreen +gtkFullScreenAccel:F11 +gtkViewSource:View S_ource +gtkViewSourceAccel:F8 +gtkImages:_Images +gtkForegroundImages:_Foreground Images +gtkBackgroundImages:_Background Images +gtkToolbars:_Toolbars +gtkMenuBar:_Menu Bar +gtkToolBar:_Button Bar +gtkStatusBar:_Status Bar +gtkDownloads:_Downloads +gtkDownloadsAccel:d +gtkSaveWindowSize:S_ave Window Size +gtkDebugging:De_bugging +gtkToggleDebugging:T_oggle debug rendering +gtkSaveBoxTree:_Save box tree +gtkSaveDomTree:Save DOM tree + +gtkBack:_Back +gtkBackAccel:Left +gtkForward:_Forward +gtkForwardAccel:Right +gtkHome:_Home +gtkHomeAccel:Down +gtkLocalHistory:_Local History +gtkLocalHistoryAccel:h +gtkGlobalHistory:_Global History +gtkGlobalHistoryAccel:h +gtkAddBookMarks:_Add to Bookmarks.. +gtkShowBookMarks:_Show Bookmarks.. +gtkShowBookMarksAccel:F6 +gtkOpenLocation:_Open Location.. +gtkOpenLocationAccel:l + +gtkNextTab:_Next tab +gtkNextTabAccel:Right +gtkPrevTab:_Previous tab +gtkPrevTabAccel:Left +gtkCloseTab:_Close tab +gtkCloseTabAccel:w + +gtkContents:_Contents +gtkGuide:User _guide +gtkUserInformation:User _information +gtkAbout:_About + + +gtkToolBarTitle:Toolbar custom button store +gtkAddThemeTitle:Select folder containing theme images + +gtkThemeFolderInstructions:To Install a theme, create a directory full of appropriately-named images as a subdirectory of gtk/res/themes/ +gtkThemeFolderSub:Select a subdirectory of the themes folder +gtkThemeDup:Theme is already included +gtkThemeAdd:Theme added successfully + # Printing user interface tokens # ============================== # @@ -466,6 +573,8 @@ Printing:Stampa della pagina NotFound:Non trovato Next:Successivo Prev:Precedente +ShowAll:Show All +CaseSens:Case Sensitive # 401 login user interface tokens # =============================== @@ -487,17 +596,17 @@ Cancel:Annulla # This section contains tokens which are used in the # SSL certificate verification dialog box. # -SSLCerts:Certificati SSL -SSLError:NetSurf non è stato in grado di verificare l'autenticità del certificato SSL. Per favore verifica i dettagli qui sotto elencati. -Subject:Oggetto -Issuer:Depositario -Version:Versione -ValidFrom:Valido da -ValidTo:Valido fino -Type:Tipo -Serial:Seriale -Accept:Accetta -Reject:Rifiuta +SSLCerts:SSL certificates +SSLError:NetSurf failed to verify the authenticity of an SSL certificate. Please verify the details presented below. +Subject:Subject +Issuer:Issuer +Version:Version +ValidFrom:Valid from +ValidTo:Valid until +Type:Type +Serial:Serial +Accept:Accept +Reject:Reject # Content @@ -584,6 +693,9 @@ MiscError:Si è verificato un errore inatteso: FileError:Il file è inesistente: PrintError:Si è verificato un errore durante la stampa: AWNotSeen:Per favore imposta l'applicazione AWViewer e riprova ancora. +EncNotRec:Encoding type not recognised. +FileOpenError:could not open file '%s' +DirectoryError:directory '%s' already exists # Specific errors - displayed in a dialog box # @@ -595,10 +707,12 @@ NoDiscSpace:Spazio insufficiente nel disco. Template:Una finestra di template risulta mancante. Per favore reinstalla NetSurf. HotlistSaveError:Non è stato possibile salvare correttamente i segnalibri. HotlistLoadError:Non è stato possibile caricare correttamente i segnalibri. +NoDirError:%s is not a directory NoPathError:Per salvare, trascinare l'icona in una directory di visualizzazione. NoNameError:Inserisci un nome NoURLError:Inserisci un URL URIError:NetSurf non è stato in grado di processare questo file URI a causa di un errore di sintassi. +SearchError:Invalid Search. EmptyError:Il file è vuoto. PrintErrorRO2:Sembra che la stampante sia occupata. AWNotSeen:Per favore imposta l'applicazione AWViewer e riprova ancora. @@ -642,7 +756,8 @@ Done:Documento completato # BadRedirect:Errata redirezione dell'URL FetchFailed:Impossibile ottenere il documento -NotCSS:Attenzione: la dicitura "Foglio di stile" non ha nulla a che vedere con i CSS +NotCSS:Attenzione: "Foglio di stile" non ha nulla a che spartire con i CSS +NotFavIco:Favicon not supported BadObject:Attenzione: errato tipo di oggetto ObjError:Errore di caricamento dell'oggetto: %s ParsingFail:Analisi del documento fallita. @@ -678,7 +793,7 @@ HTTP404:Non trovato HTTP405:Metodo non permesso HTTP406:Non accettabile HTTP407:Autentificazione Proxy necessaria -HTTP408:Messaggio di TimeOut +HTTP408:Richiesta TimeOut HTTP409:Conflitto HTTP410:Irraggiungibile HTTP411:Lunghezza richiesta diff --git a/!NetSurf/Resources/nl/Messages b/!NetSurf/Resources/nl/Messages index 3c28db983..3916340d6 100644 --- a/!NetSurf/Resources/nl/Messages +++ b/!NetSurf/Resources/nl/Messages @@ -432,10 +432,118 @@ gtkFailed:Download failed gtkFileError:File error: %s gtkInfo:%s from %s is %s in size gtkSave:Save file as... +gtkSourceSave:Save Source +gtkPlainSave:Save as text +gtkFullSave:Save webpage complete - select an empty directory gtkUnknownHost:an unknown host gtkUnknownFile: gtkUnknownSize:unknown +# gtk Menu / Button labels +# + +gtkNewTab:New _Tab +gtkNewTabAccel:t +gtkNewWindow:_New Window +gtkNewWindowAccel:n +gtkOpenFile:_Open File +gtkOpenFileAccel:o +gtkCloseWindow:_Close Window +gtkCloseWindowAccel:w +gtkSavePage:Save Page.. +gtkSavePageAccel:s +gtkExport:Export +gtkPlainText:Plain Text.. +gtkDrawFile:Drawfile.. +gtkPostScript:PostScript.. +gtkPDF:PDF.. +gtkPrintPreview:Print Preview.. +gtkPrintPreviewAccel:p +gtkPrint:Print.. +gtkPrintAccel:p +gtkQuit:_Quit +gtkQuitAccel:q + +gtkCut:Cu_t +gtkCutAccel:x +gtkCopy:_Copy +gtkCopyAccel:c +gtkPaste:_Paste +gtkPasteAccel:v +gtkDelete:_Delete +gtkSelectAll:Select _All +gtkSelectAllAccel:a +gtkFind:_Find.. +gtkFindAccel:f +gtkPreferences:P_references + +gtkStop:_Stop +gtkStopAccel:Escape +gtkReload:_Reload +gtkReloadAccel:F5 +gtkScaleView:_Scale View +gtkZoomPlus:Zoom _in +gtkZoomPlusAccel:plus +gtkZoomMinus:Zoom _out +gtkZoomMinusAccel:minus +gtkZoomNormal:_Normal size +gtkZoomNormalAccel:0 +gtkFullScreen:_Fullscreen +gtkFullScreenAccel:F11 +gtkViewSource:View S_ource +gtkViewSourceAccel:F8 +gtkImages:_Images +gtkForegroundImages:_Foreground Images +gtkBackgroundImages:_Background Images +gtkToolbars:_Toolbars +gtkMenuBar:_Menu Bar +gtkToolBar:_Button Bar +gtkStatusBar:_Status Bar +gtkDownloads:_Downloads +gtkDownloadsAccel:d +gtkSaveWindowSize:S_ave Window Size +gtkDebugging:De_bugging +gtkToggleDebugging:T_oggle debug rendering +gtkSaveBoxTree:_Save box tree +gtkSaveDomTree:Save DOM tree + +gtkBack:_Back +gtkBackAccel:Left +gtkForward:_Forward +gtkForwardAccel:Right +gtkHome:_Home +gtkHomeAccel:Down +gtkLocalHistory:_Local History +gtkLocalHistoryAccel:h +gtkGlobalHistory:_Global History +gtkGlobalHistoryAccel:h +gtkAddBookMarks:_Add to Bookmarks.. +gtkShowBookMarks:_Show Bookmarks.. +gtkShowBookMarksAccel:F6 +gtkOpenLocation:_Open Location.. +gtkOpenLocationAccel:l + +gtkNextTab:_Next tab +gtkNextTabAccel:Right +gtkPrevTab:_Previous tab +gtkPrevTabAccel:Left +gtkCloseTab:_Close tab +gtkCloseTabAccel:w + +gtkContents:_Contents +gtkGuide:User _guide +gtkUserInformation:User _information +gtkAbout:_About + + +gtkToolBarTitle:Toolbar custom button store +gtkAddThemeTitle:Select folder containing theme images + +gtkThemeFolderInstructions:To Install a theme, create a directory full of appropriately-named images as a subdirectory of gtk/res/themes/ +gtkThemeFolderSub:Select a subdirectory of the themes folder +gtkThemeDup:Theme is already included +gtkThemeAdd:Theme added successfully + # Printing user interface tokens # ============================== # @@ -459,6 +567,8 @@ Printing:Printing page NotFound:Niet gevonden Next:Next Prev:Previous +ShowAll:Show All +CaseSens:Case Sensitive # 401 login user interface tokens @@ -578,6 +688,9 @@ MiscError:Er trad een onverwachtte fout op: FileError:Bestand bestaat niet: PrintError:Fout tijdens printen: AWNotSeen:Zoek eerst de AWViewer applicatie en probeer het dan nog eens. +EncNotRec:Encoding type not recognised. +FileOpenError:could not open file '%s' +DirectoryError:directory '%s' already exists # Specific errors - displayed in a dialog box # @@ -589,10 +702,12 @@ NoDiscSpace:Niet genoeg ruimte beschikbaar op disk. Template:Er ontbreekt een venster sjabloon in het Templates bestand. Installeer NetSurf opnieuw. HotlistSaveError:The hotlist was unable to be correctly saved. HotlistLoadError:The hotlist was unable to be correctly loaded. +NoDirError:%s is not a directory NoPathError:Sleep het icoon naar een bestandsvenster om het op te slaan. NoNameError:Geef een naam op NoURLError:Geef een URL op URIError:NetSurf was unable to parse this URI file due to a syntax error. +SearchError:Invalid Search. EmptyError:bestand is leeg. PrintErrorRO2:De printer lijkt al bezig te zijn. AWNotSeen:Please locate the AWViewer application and try again. @@ -636,6 +751,7 @@ Done:klaar BadRedirect:foutief doorverwijzen naar URL FetchFailed:kan dit document niet ophalen NotCSS:melding: stylesheet is geen CSS +NotFavIco:Favicon not supported BadObject:melding: fout object type ObjError:fout bij laden object: %s ParsingFail:fout bij ontleden van dit document. diff --git a/Docs/BUILDING-AmigaCross b/Docs/BUILDING-AmigaCross new file mode 100644 index 000000000..fcd0889c1 --- /dev/null +++ b/Docs/BUILDING-AmigaCross @@ -0,0 +1,102 @@ +to install an Amiga cross-compiler in a Linux distribution, there are instructions at + +http://utilitybase.com/article/show/2007/06/23/231/Installing+an+AmigaOS+4+cross+compiler + +a more Mac-oriented article [though of potentially general utility] is at +http://utilitybase.com/article/show/2006/05/21/188/Building+Amiga+OS+4+GCC+Cross+Compiler+for+UNIX%252FMAC + +more background at +http://cross.zerohero.se/os4.html + +cross-compile additional libs/tools +SDK +http://www.hyperion-entertainment.biz/ + +newlib +http://sources.redhat.com/newlib/ + +clib2 +http://sourceforge.net/projects/clib2/ + +ixemul +http://strohmayer.org/sfs/ + +libnix +http://sourceforge.net/projects/libnix/ + +though newlib / clib2 are apparently already included in the ppc-amigaos-gcc tarball + +lha utility is debian package lha + +then install linked libs in the correct place + +[normally /usr/local/amiga] +so +sudo chmod --recursive 775 /usr/local/amiga +sudo chmod --recursive +s /usr/local/amiga +sudo chown --recursive `whoami` /usr/local/amiga +sudo chgrp --recursive root /usr/local/amiga +[mkdir /usr/local/amiga/include] + +[may need to set ppc-amigaos-gcc libpaths] + +zlib +download tarball from project homepage, untar in a storage directory / +download source from your distribution's repository [zlib1g in Ubuntu] +[cd to top-level directory of zlib containing configure script] +CC=ppc-amigaos-gcc AR=ppc-amigaos-ar RANLIB=ppc-amigaos-ranlib \ +CFLAGS="-DNO_FSEEKO" ./configure --prefix=/usr/local/amiga +make +make install + +libxml +download the tarball from the project's homepage, untar in a storage directory / +download source from your distribution's repository +download the tarball from the project's homepage, untar in a storage directory / +download source from your distribution's repository +cd into the directory containing the configure file +$ ./configure --prefix=/usr/local/amiga --host=ppc-amigaos +$ make +[need glob.h / change logic in runtest.c] +$ make install + +alternative +http://www.aminet.net/dev/lib/libxml.lha + + +regex [pre-compiled] +http://aminet.net/dev/lib/libregex-4.4.3.lha + +libcurl +download the tarball from the project's homepage, untar in a storage directory / +download source from your distribution's repository +cd into the directory containing the configure file +./configure --prefix=/usr/local/amiga --host=ppc-amigaos +$ make +[you MUST have either POSIX or glibc strerror_r if strerror_r is found] +$ make install + +alternative +http://www.aminet.net/dev/lib/libcurl.lha + +libiconv [unnecessary as a non-overridable limited version is included in newlib] + +openssl + +libpng + +libmng +http://www.aminet.net/dev/lib/libmng_so.lha +http://www.aminet.net/dev/lib/libmng.lha + +liblcms +http://www.aminet.net/dev/lib/liblcms_so.lha +http://www.aminet.net/dev/lib/liblcms_so.lha + +libjpeg + +libparserutils +libhubbub +libcss +libnsbmp +libnsgif diff --git a/Docs/Doxyfile b/Docs/Doxyfile index d928c5e0b..862566959 100644 --- a/Docs/Doxyfile +++ b/Docs/Doxyfile @@ -896,6 +896,8 @@ INCLUDE_FILE_PATTERNS = PREDEFINED = riscos CSS_INTERNALS WITH_ARTWORKS WITH_BMP WITH_DRAW WITH_DRAW_EXPORT WITH_GIF WITH_JPEG WITH_MMAP WITH_MNG WITH_NSSPRITE WITH_NS_SVG WITH_PLUGIN WITH_RSVG WITH_SAVE_COMPLETE WITH_SPRITE WITH_THEME_INSTALL WITH_PDF_EXPORT +PREDEFINED = gtk WITH_THEME_INSTALL + # If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then # this tag can be used to specify a list of macro names that should be expanded. # The macro definition that is found in the sources will be used. diff --git a/Makefile b/Makefile index 22d694257..faedb5127 100644 --- a/Makefile +++ b/Makefile @@ -109,6 +109,11 @@ STRIP=strip # Override this only if the host compiler is called something different HOST_CC := gcc +ifeq ($(TARGET),amiga) + ifneq ($(HOST),amiga) + CC := ppc-amigaos-gcc + endif +endif ifeq ($(TARGET),riscos) ifeq ($(HOST),riscos) @@ -550,6 +555,9 @@ else $(Q)$(ELF2AIF) $(EXETARGET:,ff8=,e1f) $(EXETARGET) $(Q)$(RM) $(EXETARGET:,ff8=,e1f) endif +ifeq ($(TARGET),gtk) + $(Q)$(TOUCH) gtk/res/toolbarIndices +endif ifeq ($(NETSURF_STRIP_BINARY),YES) $(VQ)echo " STRIP: $(EXETARGET)" $(Q)$(STRIP) $(EXETARGET) @@ -749,10 +757,13 @@ install-gtk: nsgtk @cp -vRL gtk/res/Aliases $(DESTDIR)$(NETSURF_GTK_RESOURCES) @cp -vrL gtk/res/docs $(DESTDIR)/$(NETSURF_GTK_RESOURCES) gzip -9v < gtk/res/messages > $(DESTDIR)$(NETSURF_GTK_RESOURCES)messages + gzip -9v < gtk/res/SearchEngines > $(DESTDIR)$(NETSURF_GTK_RESOURCES)SearchEngines gzip -9v < gtk/res/downloads.glade > $(DESTDIR)$(NETSURF_GTK_RESOURCES)downloads.glade gzip -9v < gtk/res/netsurf.glade > $(DESTDIR)$(NETSURF_GTK_RESOURCES)netsurf.glade gzip -9v < gtk/res/options.glade > $(DESTDIR)$(NETSURF_GTK_RESOURCES)options.glade gzip -9v < gtk/res/history.glade > $(DESTDIR)$(NETSURF_GTK_RESOURCES)history.glade + gzip -9v < gtk/res/toolbar.glade > + $(DESTDIR)$(NETSURF_GTK_RESOURCES)toolbar.glade gzip -9v < gtk/res/source.glade > $(DESTDIR)$(NETSURF_GTK_RESOURCES)source.glade install-beos: NetSurf diff --git a/Makefile.sources b/Makefile.sources index 938b82716..2a4721850 100644 --- a/Makefile.sources +++ b/Makefile.sources @@ -8,13 +8,13 @@ S_CONTENT := content.c fetch.c fetchcache.c urldb.c \ fetchers/fetch_curl.c fetchers/fetch_data.c S_CSS := css.c dump.c internal.c select.c utils.c -S_RENDER := box.c box_construct.c box_normalise.c directory.c \ +S_RENDER := box.c box_construct.c box_normalise.c directory.c favicon.c \ font.c form.c html.c html_redraw.c hubbub_binding.c imagemap.c \ layout.c list.c table.c textplain.c -S_UTILS := base64.c filename.c hashtable.c locale.c messages.c talloc.c \ - url.c utf8.c utils.c useragent.c -S_DESKTOP := knockout.c options.c print.c tree.c version.c textarea.c \ - plot_style.c scroll.c +S_UTILS := base64.c filename.c hashtable.c locale.c \ + messages.c talloc.c url.c utf8.c utils.c useragent.c +S_DESKTOP := knockout.c options.c plot_style.c print.c search.c \ + searchweb.c scroll.c textarea.c tree.c version.c # S_COMMON are sources common to all builds S_COMMON := $(addprefix content/,$(S_CONTENT)) \ @@ -33,8 +33,8 @@ S_PDF := $(addprefix desktop/save_pdf/,$(S_PDF)) # S_BROWSER are sources related to full browsers but are common # between RISC OS, GTK, BeOS and AmigaOS builds -S_BROWSER := browser.c frames.c history_core.c netsurf.c save_text.c \ - selection.c textinput.c +S_BROWSER := browser.c frames.c history_core.c netsurf.c save_complete.c \ + save_text.c selection.c textinput.c S_BROWSER := $(addprefix desktop/,$(S_BROWSER)) # S_RISCOS are sources purely for the RISC OS build @@ -42,9 +42,9 @@ S_RISCOS := 401login.c artworks.c assert.c awrender.s bitmap.c buffer.c \ cookies.c configure.c debugwin.c dialog.c download.c draw.c \ filetype.c font.c global_history.c gui.c help.c history.c \ hotlist.c image.c menus.c message.c palettes.c plotters.c \ - plugin.c print.c query.c save.c save_complete.c save_draw.c \ - save_pdf.c schedule.c search.c sprite.c sslcert.c textarea.c \ - textselection.c theme.c theme_install.c thumbnail.c \ + plugin.c print.c query.c save.c save_draw.c save_pdf.c \ + schedule.c search.c searchweb.c sprite.c sslcert.c \ + textarea.c textselection.c theme.c theme_install.c thumbnail.c \ treeview.c ucstables.c uri.c url_complete.c url_protocol.c \ wimp.c wimp_event.c window.c gui/progress_bar.c \ gui/status_bar.c \ @@ -60,16 +60,19 @@ S_GTK := font_pango.c gtk_bitmap.c gtk_gui.c gtk_schedule.c \ gtk_thumbnail.c gtk_plotters.c gtk_treeview.c gtk_scaffolding.c \ gtk_completion.c gtk_login.c gtk_throbber.c gtk_selection.c \ gtk_history.c gtk_window.c gtk_filetype.c gtk_download.c \ - gtk_print.c gtk_tabs.c \ + gtk_menu.c gtk_print.c gtk_save.c gtk_search.c gtk_tabs.c \ + gtk_theme.c gtk_toolbar.c sexy_icon_entry.c \ $(addprefix dialogs/,gtk_options.c gtk_about.c gtk_source.c) -S_GTK := $(addprefix gtk/,$(S_GTK)) +S_GTK := $(addprefix gtk/,$(S_GTK)) $(addprefix utils/,container.c) +# code in utils/container.ch is non-universal it seems # S_BEOS are sources purely for the BeOS build S_BEOS := beos_about.cpp beos_bitmap.cpp beos_fetch_rsrc.cpp \ beos_filetype.cpp beos_font.cpp beos_gui.cpp beos_history.cpp \ beos_login.cpp beos_options.cpp beos_plotters.cpp \ - beos_scaffolding.cpp beos_schedule.cpp beos_thumbnail.cpp \ - beos_treeview.cpp beos_throbber.cpp beos_window.cpp + beos_scaffolding.cpp beos_search.cpp beos_schedule.cpp \ + beos_thumbnail.cpp beos_treeview.cpp beos_throbber.cpp \ + beos_window.cpp S_BEOS := $(addprefix beos/,$(S_BEOS)) RDEF_BEOS := beos_res.rdef RDEF_BEOS := $(addprefix beos/,$(RDEF_BEOS)) diff --git a/amiga/download.c b/amiga/download.c index 48f719a60..baba92bd3 100644 --- a/amiga/download.c +++ b/amiga/download.c @@ -29,13 +29,13 @@ #include "amiga/download.h" #include "amiga/object.h" #include "amiga/options.h" -#include "amiga/save_complete.h" #include "amiga/bitmap.h" #include "amiga/iff_dr2d.h" #include "content/fetch.h" #include "desktop/selection.h" +#include "desktop/save_complete.h" #include "utils/messages.h" #include "utils/utils.h" diff --git a/amiga/fetch_file.c b/amiga/fetch_file.c index acc0d4724..953478423 100755 --- a/amiga/fetch_file.c +++ b/amiga/fetch_file.c @@ -215,11 +215,11 @@ void ami_fetch_file_free(void *vf) static void ami_fetch_file_send_callback(fetch_msg msg, struct ami_file_fetch_info *fetch, const void *data, - unsigned long size) + unsigned long size, fetch_error_code errorcode) { fetch->locked = true; /* LOG(("ami file fetcher callback %ld",msg)); */ - fetch_send_callback(msg,fetch->fetch_handle,data,size); + fetch_send_callback(msg,fetch->fetch_handle,data,size,errorcode); fetch->locked = false; } @@ -234,6 +234,7 @@ void ami_fetch_file_poll(const char *scheme_ignored) struct nsObject *node; struct nsObject *nnode; struct ami_file_fetch_info *fetch; + fetch_error_code errorcode; if(IsMinListEmpty(ami_file_fetcher_list)) return; @@ -241,6 +242,7 @@ void ami_fetch_file_poll(const char *scheme_ignored) do { + errorcode = FETCH_ERROR_NO_ERROR; nnode=(struct nsObject *)GetSucc((struct Node *)node); fetch = (struct ami_file_fetch_info *)node->objstruct; @@ -255,13 +257,19 @@ void ami_fetch_file_poll(const char *scheme_ignored) len = FRead(fetch->fh,ami_file_fetcher_buffer,1,1024); - ami_fetch_file_send_callback(FETCH_DATA, - fetch,ami_file_fetcher_buffer,len); + if (len == (ULONG)-1) + errorcode = FETCH_ERROR_MISC; + else if (len > 0) + ami_fetch_file_send_callback( + FETCH_DATA, fetch, + ami_file_fetcher_buffer, + len, errorcode); if((len<1024) && (!fetch->aborted)) { ami_fetch_file_send_callback(FETCH_FINISHED, - fetch, &fetch->cachedata, 0); + fetch, &fetch->cachedata, 0, + errorcode); fetch->aborted = true; } @@ -284,7 +292,8 @@ void ami_fetch_file_poll(const char *scheme_ignored) LOG(("mimetype %s len %ld",fetch->mimetype,fetch->len)); ami_fetch_file_send_callback(FETCH_TYPE, - fetch, fetch->mimetype, (ULONG)fetch->len); + fetch, fetch->mimetype, (ULONG)fetch->len, + errorcode); } else { @@ -292,8 +301,11 @@ void ami_fetch_file_poll(const char *scheme_ignored) errorstring = ASPrintf("%s %s",messages_get("FileError"),fetch->path); fetch_set_http_code(fetch->fetch_handle,404); + + errorcode = FETCH_ERROR_HTTP_NOT2; ami_fetch_file_send_callback(FETCH_ERROR, fetch, - errorstring, 0); + errorstring, 0, + errorcode); fetch->aborted = true; FreeVec(errorstring); } diff --git a/amiga/gui.c b/amiga/gui.c index bd8d4cb28..ebd5d6657 100755 --- a/amiga/gui.c +++ b/amiga/gui.c @@ -47,6 +47,7 @@ #include "amiga/menu.h" #include "amiga/options.h" #include +#include "desktop/save_complete.h" #include "desktop/textinput.h" #include #include @@ -66,7 +67,6 @@ #include "amiga/cookies.h" #include "amiga/clipboard.h" #include -#include "amiga/save_complete.h" #include "amiga/fetch_file.h" #include "amiga/fetch_mailto.h" #include "amiga/search.h" @@ -3410,6 +3410,23 @@ void gui_window_stop_throbber(struct gui_window *g) // g->shared->throbber_frame = 0; } +/** + * function to add retrieved favicon to gui + */ +void gui_window_set_icon(struct gui_window *g, struct content *icon) +{ +} + +/** + * set gui display of a retrieved favicon representing the search + * provider + * \param ico may be NULL for local calls; then access current cache from + * search_web_ico() + */ +void gui_window_set_search_ico(struct content *ico) +{ +} + void ami_update_throbber(struct gui_window_2 *g,bool redraw) { struct IBox *bbox; diff --git a/amiga/gui.h b/amiga/gui.h index ddf1dc9b2..47aace0db 100755 --- a/amiga/gui.h +++ b/amiga/gui.h @@ -56,6 +56,8 @@ enum GID_NEXT, GID_PREV, GID_SEARCHSTRING, + GID_SHOWALL, + GID_CASE, GID_HSCROLL, GID_LAST }; diff --git a/amiga/menu.c b/amiga/menu.c index f80907ccd..7ceb9191d 100755 --- a/amiga/menu.c +++ b/amiga/menu.c @@ -30,13 +30,13 @@ #include "amiga/save_pdf.h" #include "desktop/save_text.h" #include "desktop/save_pdf/pdf_plotters.h" +#include "desktop/save_complete.h" #include #include "amiga/tree.h" #include "amiga/history.h" #include "amiga/cookies.h" #include #include "amiga/arexx.h" -#include "amiga/save_complete.h" #include "utils/url.h" #include #include "desktop/textinput.h" diff --git a/amiga/save_complete.c b/amiga/save_complete.c index 29b58ba3b..1cadc2030 100755 --- a/amiga/save_complete.c +++ b/amiga/save_complete.c @@ -2,6 +2,7 @@ * Copyright 2004 John M Bell * Copyright 2004-2007 James Bursa * Copyright 2008 Chris Young + * Copyright 2009 Mark Benjamin * * This file is part of NetSurf, http://www.netsurf-browser.org/ * @@ -18,807 +19,97 @@ * along with this program. If not, see . */ -/** \file - * Save HTML document with dependencies (implementation). - */ - -#include "utils/config.h" -//#define _GNU_SOURCE /* for strndup */ -#include #include -#include #include #include -#include -#include #include -#include -#include "utils/config.h" -#include "css/css.h" -#include "render/box.h" -#include "amiga/save_complete.h" -#include "utils/log.h" -#include "utils/url.h" +#include "desktop/save_complete.h" #include "utils/utils.h" -#include #include #include - -regex_t save_complete_import_re; - -/** An entry in save_complete_list. */ -struct save_complete_entry { - struct content *content; - struct save_complete_entry *next; /**< Next entry in list */ -}; - -/** List of urls seen and saved so far. */ -static struct save_complete_entry *save_complete_list = 0; - -static bool save_complete_html(struct content *c, const char *path, - bool index); -static bool save_imported_sheets(struct content *c, const char *path); -static char * rewrite_stylesheet_urls(const char *source, unsigned int size, - int *osize, const char *base); -static bool rewrite_document_urls(xmlDoc *doc, const char *base); -static bool rewrite_urls(xmlNode *n, const char *base); -static bool rewrite_url(xmlNode *n, const char *attr, const char *base); -static bool save_complete_list_add(struct content *content); -static struct content * save_complete_list_find(const char *url); -static bool save_complete_list_check(struct content *content); -/* static void save_complete_list_dump(void); */ -static bool save_complete_inventory(const char *path); +#include "content/content.h" /** - * Save an HTML page with all dependencies. - * - * \param c CONTENT_HTML to save - * \param path directory to save to (must exist) - * \return true on success, false on error and error reported - */ - -bool save_complete(struct content *c, const char *path) -{ - bool result; - - result = save_complete_html(c, path, true); - - if (result) - result = save_complete_inventory(path); - - /* free save_complete_list */ - while (save_complete_list) { - struct save_complete_entry *next = save_complete_list->next; - free(save_complete_list); - save_complete_list = next; - } - - return result; -} - - -/** - * Save an HTML page with all dependencies, recursing through imported pages. - * - * \param c CONTENT_HTML to save - * \param path directory to save to (must exist) - * \param index true to save as "index" - * \return true on success, false on error and error reported - */ - -bool save_complete_html(struct content *c, const char *path, bool index) -{ - char spath[256]; - unsigned int i; - htmlParserCtxtPtr parser; - BPTR fh = 0; - - if (c->type != CONTENT_HTML) - return false; - - if (save_complete_list_check(c)) - return true; - - /* save stylesheets, ignoring the base and adblocking sheets */ - for (i = STYLESHEET_START; i != c->data.html.stylesheet_count; i++) { - struct content *css = c->data.html.stylesheets[i].c; - char *source; - int source_len; - bool is_style; - - if (!css) - continue; - if (save_complete_list_check(css)) - continue; - - is_style = (strcmp(css->url, c->data.html.base_url) == 0); - - if (is_style == false) { - if (!save_complete_list_add(css)) { - warn_user("NoMemory", 0); - return false; - } - } - - if (!save_imported_sheets(css, path)) - return false; - - if (is_style) - continue; /* don't save