DeforaOS/Surfer
DeforaOS/Surfer
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Nicer preferences windows and WebKit support for HTTP proxies

Browse Source
This commit is contained in:
Pierre Pronchery 2010-12-09 22:32:27 +00:00
parent 065f87637a
commit 8c86a90dd1
13 changed files with 444 additions and 220 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

110
po/de.po
View File

@ -7,7 +7,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: Surfer 0.1.0\n" "Project-Id-Version: Surfer 0.1.0\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2010-12-05 02:15+0100\n" "POT-Creation-Date: 2010-12-09 23:23+0100\n"
"PO-Revision-Date: 2010-04-01 19:40+0200\n" "PO-Revision-Date: 2010-04-01 19:40+0200\n"
"Last-Translator: Pierre Pronchery <khorben@defora.org>\n" "Last-Translator: Pierre Pronchery <khorben@defora.org>\n"
"Language-Team: German\n" "Language-Team: German\n"
@ -16,57 +16,69 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n" "Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n"
#: ../src/callbacks.c:426 #: ../src/callbacks.c:427
msgid "Web surfer preferences" msgid "Web surfer preferences"
msgstr "Web surfer Einstellungen" msgstr "Web surfer Einstellungen"
#: ../src/callbacks.c:446 #: ../src/callbacks.c:447
msgid "Homepage:" msgid "Homepage:"
msgstr "" msgstr ""
#: ../src/callbacks.c:454 #: ../src/callbacks.c:455
msgid "Focus new tabs" msgid "Focus new tabs"
msgstr "" msgstr ""
#: ../src/callbacks.c:458 #: ../src/callbacks.c:459
msgid "General" msgid "General"
msgstr "" msgstr ""
#: ../src/callbacks.c:464 #: ../src/callbacks.c:463
msgid "Direct connection"
msgstr ""
#: ../src/callbacks.c:467
msgid "HTTP proxy:" msgid "HTTP proxy:"
msgstr "" msgstr ""
#: ../src/callbacks.c:470 #: ../src/callbacks.c:474
msgid "Hostname:"
msgstr ""
#: ../src/callbacks.c:478
msgid "Port:"
msgstr ""
#: ../src/callbacks.c:486
msgid "Network" msgid "Network"
msgstr "" msgstr ""
#: ../src/common/conn.c:204 ../src/download.c:185 ../src/ghtml-gtkhtml.c:829 #: ../src/common/conn.c:204 ../src/download.c:185 ../src/ghtml-gtkhtml.c:832
msgid "Resolving..." msgid "Resolving..."
msgstr "" msgstr ""
#: ../src/common/conn.c:253 ../src/download.c:477 ../src/ghtml-gtkhtml.c:879 #: ../src/common/conn.c:253 ../src/download.c:477 ../src/ghtml-gtkhtml.c:882
msgid "Connected" msgid "Connected"
msgstr "" msgstr ""
#: ../src/common/conn.c:280 ../src/ghtml-gtkhtml.c:914 #: ../src/common/conn.c:280 ../src/ghtml-gtkhtml.c:917
#: ../src/ghtml-webkit.c:408 ../src/ghtml-webkit.c:545 #: ../src/ghtml-webkit.c:422 ../src/ghtml-webkit.c:581
#: ../src/ghtml-webkit.c:558 #: ../src/ghtml-webkit.c:594
msgid "Downloading..." msgid "Downloading..."
msgstr "" msgstr ""
#: ../src/common/conn.c:305 ../src/ghtml-gtkhtml.c:960 #: ../src/common/conn.c:305 ../src/ghtml-gtkhtml.c:963
msgid "Unsupported protocol" msgid "Unsupported protocol"
msgstr "" msgstr ""
#: ../src/common/conn.c:309 ../src/ghtml-gtkhtml.c:964 #: ../src/common/conn.c:309 ../src/ghtml-gtkhtml.c:967
msgid "Unknown host" msgid "Unknown host"
msgstr "" msgstr ""
#: ../src/common/conn.c:314 ../src/ghtml-gtkhtml.c:969 #: ../src/common/conn.c:314 ../src/ghtml-gtkhtml.c:972
msgid "Unspecified error" msgid "Unspecified error"
msgstr "" msgstr ""
#: ../src/common/conn.c:348 ../src/download.c:554 ../src/ghtml-gtkhtml.c:1065 #: ../src/common/conn.c:348 ../src/download.c:554 ../src/ghtml-gtkhtml.c:1068
msgid "Timeout" msgid "Timeout"
msgstr "" msgstr ""
@ -103,7 +115,7 @@ msgid "Close window when the download is complete"
msgstr "" msgstr ""
#: ../src/download.c:291 ../src/download.c:296 ../src/download.c:631 #: ../src/download.c:291 ../src/download.c:296 ../src/download.c:631
#: ../src/surfer.c:822 ../src/surfer.c:825 #: ../src/surfer.c:853 ../src/surfer.c:856
msgid "Error" msgid "Error"
msgstr "Fehler" msgstr "Fehler"
@ -158,7 +170,7 @@ msgstr ""
msgid "Code " msgid "Code "
msgstr "" msgstr ""
#: ../src/download.c:605 ../src/ghtml-webkit.c:501 ../src/surfer.c:824 #: ../src/download.c:605 ../src/ghtml-webkit.c:537 ../src/surfer.c:855
msgid "Unknown error" msgid "Unknown error"
msgstr "" msgstr ""
@ -169,32 +181,32 @@ msgid ""
" -U\tuser agent string to send\n" " -U\tuser agent string to send\n"
msgstr "" msgstr ""
#: ../src/ghtml-gtkhtml.c:706 #: ../src/ghtml-gtkhtml.c:709
msgid "Unknown protocol" msgid "Unknown protocol"
msgstr "" msgstr ""
#: ../src/ghtml-gtkhtml.c:772 #: ../src/ghtml-gtkhtml.c:775
msgid "Reading file..." msgid "Reading file..."
msgstr "" msgstr ""
#: ../src/ghtml-gtkhtml.c:984 #: ../src/ghtml-gtkhtml.c:987
msgid "Redirecting..." msgid "Redirecting..."
msgstr "" msgstr ""
#: ../src/ghtml-gtkhtml.c:992 #: ../src/ghtml-gtkhtml.c:995
msgid "Redirecting to " msgid "Redirecting to "
msgstr "" msgstr ""
#: ../src/ghtml-gtkhtml.c:1026 ../src/ghtml-webkit.c:303 #: ../src/ghtml-gtkhtml.c:1029 ../src/ghtml-webkit.c:317
#: ../src/ghtml-webkit.c:406 #: ../src/ghtml-webkit.c:420
msgid "Connecting..." msgid "Connecting..."
msgstr "" msgstr ""
#: ../src/ghtml-gtkhtml.c:1029 #: ../src/ghtml-gtkhtml.c:1032
msgid "Connecting to " msgid "Connecting to "
msgstr "" msgstr ""
#: ../src/ghtml-gtkhtml.c:1187 #: ../src/ghtml-gtkhtml.c:1190
msgid "Unsupported method" msgid "Unsupported method"
msgstr "" msgstr ""
@ -330,88 +342,88 @@ msgstr ""
msgid "Home" msgid "Home"
msgstr "" msgstr ""
#: ../src/surfer.c:286 ../src/surfer.c:571 #: ../src/surfer.c:292 ../src/surfer.c:594
msgid "Web surfer" msgid "Web surfer"
msgstr "Web surfer" msgstr "Web surfer"
#: ../src/surfer.c:334 #: ../src/surfer.c:340
msgid " Location: " msgid " Location: "
msgstr "" msgstr ""
#: ../src/surfer.c:541 #: ../src/surfer.c:564
msgid "Ready" msgid "Ready"
msgstr "" msgstr ""
#: ../src/surfer.c:584 ../src/surfer.c:1021 #: ../src/surfer.c:607 ../src/surfer.c:1053
msgid "Untitled" msgid "Untitled"
msgstr "" msgstr ""
#: ../src/surfer.c:702 ../src/surfer.c:705 ../src/surfer.c:1086 #: ../src/surfer.c:733 ../src/surfer.c:736 ../src/surfer.c:1118
#: ../src/surfer.c:1089 #: ../src/surfer.c:1121
msgid "Question" msgid "Question"
msgstr "" msgstr ""
#: ../src/surfer.c:775 ../src/surfer.c:1152 #: ../src/surfer.c:806 ../src/surfer.c:1184
msgid "Save file as..." msgid "Save file as..."
msgstr "" msgstr ""
#: ../src/surfer.c:853 #: ../src/surfer.c:884
msgid "Find text" msgid "Find text"
msgstr "Suchen" msgstr "Suchen"
#: ../src/surfer.c:860 #: ../src/surfer.c:891
msgid "Text:" msgid "Text:"
msgstr "" msgstr ""
#: ../src/surfer.c:867 #: ../src/surfer.c:898
msgid "Case-sensitive" msgid "Case-sensitive"
msgstr "" msgstr ""
#: ../src/surfer.c:869 #: ../src/surfer.c:900
msgid "Wrap" msgid "Wrap"
msgstr "" msgstr ""
#: ../src/surfer.c:895 #: ../src/surfer.c:926
msgid "Text not found" msgid "Text not found"
msgstr "" msgstr ""
#: ../src/surfer.c:983 #: ../src/surfer.c:1014
msgid "Open file..." msgid "Open file..."
msgstr "" msgstr ""
#: ../src/surfer.c:1012 #: ../src/surfer.c:1043
msgid "Could not initialize HTML renderer" msgid "Could not initialize HTML renderer"
msgstr "" msgstr ""
#: ../src/surfer.c:1213 #: ../src/surfer.c:1245
msgid "Javascript console" msgid "Javascript console"
msgstr "" msgstr ""
#: ../src/surfer.c:1218 #: ../src/surfer.c:1250
msgid "Command:" msgid "Command:"
msgstr "" msgstr ""
#: ../src/surfer.c:1237 #: ../src/surfer.c:1269
msgid "Message" msgid "Message"
msgstr "" msgstr ""
#: ../src/surfer.c:1242 #: ../src/surfer.c:1274
msgid "Source" msgid "Source"
msgstr "" msgstr ""
#: ../src/surfer.c:1247 #: ../src/surfer.c:1279
msgid "Line" msgid "Line"
msgstr "Linie" msgstr "Linie"
#: ../src/surfer.c:1372 #: ../src/surfer.c:1404
msgid "Web surfer - Source of " msgid "Web surfer - Source of "
msgstr "" msgstr ""
#: ../src/surfer.c:1413 ../src/surfer.c:1416 ../src/surfer.c:1471 #: ../src/surfer.c:1445 ../src/surfer.c:1448 ../src/surfer.c:1503
#: ../src/surfer.c:1476 #: ../src/surfer.c:1508
msgid "Warning" msgid "Warning"
msgstr "Achtung" msgstr "Achtung"
#: ../src/surfer.c:1475 #: ../src/surfer.c:1507
msgid "This file already exists. Overwrite?" msgid "This file already exists. Overwrite?"
msgstr "" msgstr ""

110
po/es.po
View File

@ -7,7 +7,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: Surfer 0.1.0\n" "Project-Id-Version: Surfer 0.1.0\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2010-12-05 02:15+0100\n" "POT-Creation-Date: 2010-12-09 23:23+0100\n"
"PO-Revision-Date: 2010-04-01 19:40+0200\n" "PO-Revision-Date: 2010-04-01 19:40+0200\n"
"Last-Translator: Pierre Pronchery <khorben@defora.org>\n" "Last-Translator: Pierre Pronchery <khorben@defora.org>\n"
"Language-Team: Spanish\n" "Language-Team: Spanish\n"
@ -16,57 +16,69 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n" "Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n"
#: ../src/callbacks.c:426 #: ../src/callbacks.c:427
msgid "Web surfer preferences" msgid "Web surfer preferences"
msgstr "Web surfer preferencias" msgstr "Web surfer preferencias"
#: ../src/callbacks.c:446 #: ../src/callbacks.c:447
msgid "Homepage:" msgid "Homepage:"
msgstr "" msgstr ""
#: ../src/callbacks.c:454 #: ../src/callbacks.c:455
msgid "Focus new tabs" msgid "Focus new tabs"
msgstr "" msgstr ""
#: ../src/callbacks.c:458 #: ../src/callbacks.c:459
msgid "General" msgid "General"
msgstr "" msgstr ""
#: ../src/callbacks.c:464 #: ../src/callbacks.c:463
msgid "Direct connection"
msgstr ""
#: ../src/callbacks.c:467
msgid "HTTP proxy:" msgid "HTTP proxy:"
msgstr "" msgstr ""
#: ../src/callbacks.c:470 #: ../src/callbacks.c:474
msgid "Hostname:"
msgstr ""
#: ../src/callbacks.c:478
msgid "Port:"
msgstr ""
#: ../src/callbacks.c:486
msgid "Network" msgid "Network"
msgstr "" msgstr ""
#: ../src/common/conn.c:204 ../src/download.c:185 ../src/ghtml-gtkhtml.c:829 #: ../src/common/conn.c:204 ../src/download.c:185 ../src/ghtml-gtkhtml.c:832
msgid "Resolving..." msgid "Resolving..."
msgstr "" msgstr ""
#: ../src/common/conn.c:253 ../src/download.c:477 ../src/ghtml-gtkhtml.c:879 #: ../src/common/conn.c:253 ../src/download.c:477 ../src/ghtml-gtkhtml.c:882
msgid "Connected" msgid "Connected"
msgstr "" msgstr ""
#: ../src/common/conn.c:280 ../src/ghtml-gtkhtml.c:914 #: ../src/common/conn.c:280 ../src/ghtml-gtkhtml.c:917
#: ../src/ghtml-webkit.c:408 ../src/ghtml-webkit.c:545 #: ../src/ghtml-webkit.c:422 ../src/ghtml-webkit.c:581
#: ../src/ghtml-webkit.c:558 #: ../src/ghtml-webkit.c:594
msgid "Downloading..." msgid "Downloading..."
msgstr "" msgstr ""
#: ../src/common/conn.c:305 ../src/ghtml-gtkhtml.c:960 #: ../src/common/conn.c:305 ../src/ghtml-gtkhtml.c:963
msgid "Unsupported protocol" msgid "Unsupported protocol"
msgstr "" msgstr ""
#: ../src/common/conn.c:309 ../src/ghtml-gtkhtml.c:964 #: ../src/common/conn.c:309 ../src/ghtml-gtkhtml.c:967
msgid "Unknown host" msgid "Unknown host"
msgstr "" msgstr ""
#: ../src/common/conn.c:314 ../src/ghtml-gtkhtml.c:969 #: ../src/common/conn.c:314 ../src/ghtml-gtkhtml.c:972
msgid "Unspecified error" msgid "Unspecified error"
msgstr "" msgstr ""
#: ../src/common/conn.c:348 ../src/download.c:554 ../src/ghtml-gtkhtml.c:1065 #: ../src/common/conn.c:348 ../src/download.c:554 ../src/ghtml-gtkhtml.c:1068
msgid "Timeout" msgid "Timeout"
msgstr "" msgstr ""
@ -103,7 +115,7 @@ msgid "Close window when the download is complete"
msgstr "" msgstr ""
#: ../src/download.c:291 ../src/download.c:296 ../src/download.c:631 #: ../src/download.c:291 ../src/download.c:296 ../src/download.c:631
#: ../src/surfer.c:822 ../src/surfer.c:825 #: ../src/surfer.c:853 ../src/surfer.c:856
msgid "Error" msgid "Error"
msgstr "" msgstr ""
@ -158,7 +170,7 @@ msgstr ""
msgid "Code " msgid "Code "
msgstr "" msgstr ""
#: ../src/download.c:605 ../src/ghtml-webkit.c:501 ../src/surfer.c:824 #: ../src/download.c:605 ../src/ghtml-webkit.c:537 ../src/surfer.c:855
msgid "Unknown error" msgid "Unknown error"
msgstr "" msgstr ""
@ -169,32 +181,32 @@ msgid ""
" -U\tuser agent string to send\n" " -U\tuser agent string to send\n"
msgstr "" msgstr ""
#: ../src/ghtml-gtkhtml.c:706 #: ../src/ghtml-gtkhtml.c:709
msgid "Unknown protocol" msgid "Unknown protocol"
msgstr "" msgstr ""
#: ../src/ghtml-gtkhtml.c:772 #: ../src/ghtml-gtkhtml.c:775
msgid "Reading file..." msgid "Reading file..."
msgstr "" msgstr ""
#: ../src/ghtml-gtkhtml.c:984 #: ../src/ghtml-gtkhtml.c:987
msgid "Redirecting..." msgid "Redirecting..."
msgstr "" msgstr ""
#: ../src/ghtml-gtkhtml.c:992 #: ../src/ghtml-gtkhtml.c:995
msgid "Redirecting to " msgid "Redirecting to "
msgstr "" msgstr ""
#: ../src/ghtml-gtkhtml.c:1026 ../src/ghtml-webkit.c:303 #: ../src/ghtml-gtkhtml.c:1029 ../src/ghtml-webkit.c:317
#: ../src/ghtml-webkit.c:406 #: ../src/ghtml-webkit.c:420
msgid "Connecting..." msgid "Connecting..."
msgstr "" msgstr ""
#: ../src/ghtml-gtkhtml.c:1029 #: ../src/ghtml-gtkhtml.c:1032
msgid "Connecting to " msgid "Connecting to "
msgstr "" msgstr ""
#: ../src/ghtml-gtkhtml.c:1187 #: ../src/ghtml-gtkhtml.c:1190
msgid "Unsupported method" msgid "Unsupported method"
msgstr "" msgstr ""
@ -330,88 +342,88 @@ msgstr ""
msgid "Home" msgid "Home"
msgstr "" msgstr ""
#: ../src/surfer.c:286 ../src/surfer.c:571 #: ../src/surfer.c:292 ../src/surfer.c:594
msgid "Web surfer" msgid "Web surfer"
msgstr "Web surfer" msgstr "Web surfer"
#: ../src/surfer.c:334 #: ../src/surfer.c:340
msgid " Location: " msgid " Location: "
msgstr "" msgstr ""
#: ../src/surfer.c:541 #: ../src/surfer.c:564
msgid "Ready" msgid "Ready"
msgstr "" msgstr ""
#: ../src/surfer.c:584 ../src/surfer.c:1021 #: ../src/surfer.c:607 ../src/surfer.c:1053
msgid "Untitled" msgid "Untitled"
msgstr "" msgstr ""
#: ../src/surfer.c:702 ../src/surfer.c:705 ../src/surfer.c:1086 #: ../src/surfer.c:733 ../src/surfer.c:736 ../src/surfer.c:1118
#: ../src/surfer.c:1089 #: ../src/surfer.c:1121
msgid "Question" msgid "Question"
msgstr "" msgstr ""
#: ../src/surfer.c:775 ../src/surfer.c:1152 #: ../src/surfer.c:806 ../src/surfer.c:1184
msgid "Save file as..." msgid "Save file as..."
msgstr "Guardar como..." msgstr "Guardar como..."
#: ../src/surfer.c:853 #: ../src/surfer.c:884
msgid "Find text" msgid "Find text"
msgstr "Buscar" msgstr "Buscar"
#: ../src/surfer.c:860 #: ../src/surfer.c:891
msgid "Text:" msgid "Text:"
msgstr "" msgstr ""
#: ../src/surfer.c:867 #: ../src/surfer.c:898
msgid "Case-sensitive" msgid "Case-sensitive"
msgstr "" msgstr ""
#: ../src/surfer.c:869 #: ../src/surfer.c:900
msgid "Wrap" msgid "Wrap"
msgstr "" msgstr ""
#: ../src/surfer.c:895 #: ../src/surfer.c:926
msgid "Text not found" msgid "Text not found"
msgstr "" msgstr ""
#: ../src/surfer.c:983 #: ../src/surfer.c:1014
msgid "Open file..." msgid "Open file..."
msgstr "Abrir..." msgstr "Abrir..."
#: ../src/surfer.c:1012 #: ../src/surfer.c:1043
msgid "Could not initialize HTML renderer" msgid "Could not initialize HTML renderer"
msgstr "" msgstr ""
#: ../src/surfer.c:1213 #: ../src/surfer.c:1245
msgid "Javascript console" msgid "Javascript console"
msgstr "" msgstr ""
#: ../src/surfer.c:1218 #: ../src/surfer.c:1250
msgid "Command:" msgid "Command:"
msgstr "" msgstr ""
#: ../src/surfer.c:1237 #: ../src/surfer.c:1269
msgid "Message" msgid "Message"
msgstr "" msgstr ""
#: ../src/surfer.c:1242 #: ../src/surfer.c:1274
msgid "Source" msgid "Source"
msgstr "" msgstr ""
#: ../src/surfer.c:1247 #: ../src/surfer.c:1279
msgid "Line" msgid "Line"
msgstr "" msgstr ""
#: ../src/surfer.c:1372 #: ../src/surfer.c:1404
msgid "Web surfer - Source of " msgid "Web surfer - Source of "
msgstr "" msgstr ""
#: ../src/surfer.c:1413 ../src/surfer.c:1416 ../src/surfer.c:1471 #: ../src/surfer.c:1445 ../src/surfer.c:1448 ../src/surfer.c:1503
#: ../src/surfer.c:1476 #: ../src/surfer.c:1508
msgid "Warning" msgid "Warning"
msgstr "" msgstr ""
#: ../src/surfer.c:1475 #: ../src/surfer.c:1507
msgid "This file already exists. Overwrite?" msgid "This file already exists. Overwrite?"
msgstr "" msgstr ""

110
po/fr.po
View File

@ -7,7 +7,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: Surfer 0.1.0\n" "Project-Id-Version: Surfer 0.1.0\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2010-12-05 02:15+0100\n" "POT-Creation-Date: 2010-12-09 23:23+0100\n"
"PO-Revision-Date: 2010-04-01 19:40+0200\n" "PO-Revision-Date: 2010-04-01 19:40+0200\n"
"Last-Translator: Calimero <calimeroteknik@free.fr>\n" "Last-Translator: Calimero <calimeroteknik@free.fr>\n"
"Language-Team: French\n" "Language-Team: French\n"
@ -16,57 +16,69 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n" "Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n > 1);\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n"
#: ../src/callbacks.c:426 #: ../src/callbacks.c:427
msgid "Web surfer preferences" msgid "Web surfer preferences"
msgstr "Préférences de Web surfer" msgstr "Préférences de Web surfer"
#: ../src/callbacks.c:446 #: ../src/callbacks.c:447
msgid "Homepage:" msgid "Homepage:"
msgstr "Page d'accueil :" msgstr "Page d'accueil :"
#: ../src/callbacks.c:454 #: ../src/callbacks.c:455
msgid "Focus new tabs" msgid "Focus new tabs"
msgstr "Focaliser les nouveaux onglets" msgstr "Focaliser les nouveaux onglets"
#: ../src/callbacks.c:458 #: ../src/callbacks.c:459
msgid "General" msgid "General"
msgstr "Général" msgstr "Général"
#: ../src/callbacks.c:464 #: ../src/callbacks.c:463
msgid "Direct connection"
msgstr "Connexion directe"
#: ../src/callbacks.c:467
msgid "HTTP proxy:" msgid "HTTP proxy:"
msgstr "Proxy HTTP :" msgstr "Proxy HTTP :"
#: ../src/callbacks.c:470 #: ../src/callbacks.c:474
msgid "Hostname:"
msgstr "Hôte :"
#: ../src/callbacks.c:478
msgid "Port:"
msgstr "Port :"
#: ../src/callbacks.c:486
msgid "Network" msgid "Network"
msgstr "Réseau" msgstr "Réseau"
#: ../src/common/conn.c:204 ../src/download.c:185 ../src/ghtml-gtkhtml.c:829 #: ../src/common/conn.c:204 ../src/download.c:185 ../src/ghtml-gtkhtml.c:832
msgid "Resolving..." msgid "Resolving..."
msgstr "Résolution du domaine..." msgstr "Résolution du domaine..."
#: ../src/common/conn.c:253 ../src/download.c:477 ../src/ghtml-gtkhtml.c:879 #: ../src/common/conn.c:253 ../src/download.c:477 ../src/ghtml-gtkhtml.c:882
msgid "Connected" msgid "Connected"
msgstr "Connecté" msgstr "Connecté"
#: ../src/common/conn.c:280 ../src/ghtml-gtkhtml.c:914 #: ../src/common/conn.c:280 ../src/ghtml-gtkhtml.c:917
#: ../src/ghtml-webkit.c:408 ../src/ghtml-webkit.c:545 #: ../src/ghtml-webkit.c:422 ../src/ghtml-webkit.c:581
#: ../src/ghtml-webkit.c:558 #: ../src/ghtml-webkit.c:594
msgid "Downloading..." msgid "Downloading..."
msgstr "Téléchargement..." msgstr "Téléchargement..."
#: ../src/common/conn.c:305 ../src/ghtml-gtkhtml.c:960 #: ../src/common/conn.c:305 ../src/ghtml-gtkhtml.c:963
msgid "Unsupported protocol" msgid "Unsupported protocol"
msgstr "Protocole non supporté" msgstr "Protocole non supporté"
#: ../src/common/conn.c:309 ../src/ghtml-gtkhtml.c:964 #: ../src/common/conn.c:309 ../src/ghtml-gtkhtml.c:967
msgid "Unknown host" msgid "Unknown host"
msgstr "Hôte inconnu" msgstr "Hôte inconnu"
#: ../src/common/conn.c:314 ../src/ghtml-gtkhtml.c:969 #: ../src/common/conn.c:314 ../src/ghtml-gtkhtml.c:972
msgid "Unspecified error" msgid "Unspecified error"
msgstr "Erreur non spécifiée" msgstr "Erreur non spécifiée"
#: ../src/common/conn.c:348 ../src/download.c:554 ../src/ghtml-gtkhtml.c:1065 #: ../src/common/conn.c:348 ../src/download.c:554 ../src/ghtml-gtkhtml.c:1068
msgid "Timeout" msgid "Timeout"
msgstr "Délai dépassé" msgstr "Délai dépassé"
@ -103,7 +115,7 @@ msgid "Close window when the download is complete"
msgstr "Fermer la fenêtre à la fin du téléchargement" msgstr "Fermer la fenêtre à la fin du téléchargement"
#: ../src/download.c:291 ../src/download.c:296 ../src/download.c:631 #: ../src/download.c:291 ../src/download.c:296 ../src/download.c:631
#: ../src/surfer.c:822 ../src/surfer.c:825 #: ../src/surfer.c:853 ../src/surfer.c:856
msgid "Error" msgid "Error"
msgstr "Erreur" msgstr "Erreur"
@ -158,7 +170,7 @@ msgstr "Résolu"
msgid "Code " msgid "Code "
msgstr "Code " msgstr "Code "
#: ../src/download.c:605 ../src/ghtml-webkit.c:501 ../src/surfer.c:824 #: ../src/download.c:605 ../src/ghtml-webkit.c:537 ../src/surfer.c:855
msgid "Unknown error" msgid "Unknown error"
msgstr "Erreur inconnue" msgstr "Erreur inconnue"
@ -172,32 +184,32 @@ msgstr ""
" -O\tfichier de destination\n" " -O\tfichier de destination\n"
" -U\tuser-agent à utiliser\n" " -U\tuser-agent à utiliser\n"
#: ../src/ghtml-gtkhtml.c:706 #: ../src/ghtml-gtkhtml.c:709
msgid "Unknown protocol" msgid "Unknown protocol"
msgstr "Protocole inconnu" msgstr "Protocole inconnu"
#: ../src/ghtml-gtkhtml.c:772 #: ../src/ghtml-gtkhtml.c:775
msgid "Reading file..." msgid "Reading file..."
msgstr "Lecture du fichier..." msgstr "Lecture du fichier..."
#: ../src/ghtml-gtkhtml.c:984 #: ../src/ghtml-gtkhtml.c:987
msgid "Redirecting..." msgid "Redirecting..."
msgstr "Redirection..." msgstr "Redirection..."
#: ../src/ghtml-gtkhtml.c:992 #: ../src/ghtml-gtkhtml.c:995
msgid "Redirecting to " msgid "Redirecting to "
msgstr "Redirection vers " msgstr "Redirection vers "
#: ../src/ghtml-gtkhtml.c:1026 ../src/ghtml-webkit.c:303 #: ../src/ghtml-gtkhtml.c:1029 ../src/ghtml-webkit.c:317
#: ../src/ghtml-webkit.c:406 #: ../src/ghtml-webkit.c:420
msgid "Connecting..." msgid "Connecting..."
msgstr "Connexion..." msgstr "Connexion..."
#: ../src/ghtml-gtkhtml.c:1029 #: ../src/ghtml-gtkhtml.c:1032
msgid "Connecting to " msgid "Connecting to "
msgstr "Connexion à " msgstr "Connexion à "
#: ../src/ghtml-gtkhtml.c:1187 #: ../src/ghtml-gtkhtml.c:1190
msgid "Unsupported method" msgid "Unsupported method"
msgstr "Méthode non supportée" msgstr "Méthode non supportée"
@ -333,88 +345,88 @@ msgstr "Actualiser"
msgid "Home" msgid "Home"
msgstr "Page d'accueil" msgstr "Page d'accueil"
#: ../src/surfer.c:286 ../src/surfer.c:571 #: ../src/surfer.c:292 ../src/surfer.c:594
msgid "Web surfer" msgid "Web surfer"
msgstr "Web surfer" msgstr "Web surfer"
#: ../src/surfer.c:334 #: ../src/surfer.c:340
msgid " Location: " msgid " Location: "
msgstr " Adresse: " msgstr " Adresse: "
#: ../src/surfer.c:541 #: ../src/surfer.c:564
msgid "Ready" msgid "Ready"
msgstr "Prêt" msgstr "Prêt"
#: ../src/surfer.c:584 ../src/surfer.c:1021 #: ../src/surfer.c:607 ../src/surfer.c:1053
msgid "Untitled" msgid "Untitled"
msgstr "Sans titre" msgstr "Sans titre"
#: ../src/surfer.c:702 ../src/surfer.c:705 ../src/surfer.c:1086 #: ../src/surfer.c:733 ../src/surfer.c:736 ../src/surfer.c:1118
#: ../src/surfer.c:1089 #: ../src/surfer.c:1121
msgid "Question" msgid "Question"
msgstr "Question" msgstr "Question"
#: ../src/surfer.c:775 ../src/surfer.c:1152 #: ../src/surfer.c:806 ../src/surfer.c:1184
msgid "Save file as..." msgid "Save file as..."
msgstr "Enregistrer sous..." msgstr "Enregistrer sous..."
#: ../src/surfer.c:853 #: ../src/surfer.c:884
msgid "Find text" msgid "Find text"
msgstr "Chercher du texte" msgstr "Chercher du texte"
#: ../src/surfer.c:860 #: ../src/surfer.c:891
msgid "Text:" msgid "Text:"
msgstr "Texte: " msgstr "Texte: "
#: ../src/surfer.c:867 #: ../src/surfer.c:898
msgid "Case-sensitive" msgid "Case-sensitive"
msgstr "Sensible à la casse" msgstr "Sensible à la casse"
#: ../src/surfer.c:869 #: ../src/surfer.c:900
msgid "Wrap" msgid "Wrap"
msgstr "Chercher en boucle" msgstr "Chercher en boucle"
#: ../src/surfer.c:895 #: ../src/surfer.c:926
msgid "Text not found" msgid "Text not found"
msgstr "Texte non trouvé" msgstr "Texte non trouvé"
#: ../src/surfer.c:983 #: ../src/surfer.c:1014
msgid "Open file..." msgid "Open file..."
msgstr "Ouvrir un fichier..." msgstr "Ouvrir un fichier..."
#: ../src/surfer.c:1012 #: ../src/surfer.c:1043
msgid "Could not initialize HTML renderer" msgid "Could not initialize HTML renderer"
msgstr "Ne peut charger le moteur de rendu HTML" msgstr "Ne peut charger le moteur de rendu HTML"
#: ../src/surfer.c:1213 #: ../src/surfer.c:1245
msgid "Javascript console" msgid "Javascript console"
msgstr "Console Javascript" msgstr "Console Javascript"
#: ../src/surfer.c:1218 #: ../src/surfer.c:1250
msgid "Command:" msgid "Command:"
msgstr "Commande :" msgstr "Commande :"
#: ../src/surfer.c:1237 #: ../src/surfer.c:1269
msgid "Message" msgid "Message"
msgstr "Message" msgstr "Message"
#: ../src/surfer.c:1242 #: ../src/surfer.c:1274
msgid "Source" msgid "Source"
msgstr "Source" msgstr "Source"
#: ../src/surfer.c:1247 #: ../src/surfer.c:1279
msgid "Line" msgid "Line"
msgstr "Ligne" msgstr "Ligne"
#: ../src/surfer.c:1372 #: ../src/surfer.c:1404
msgid "Web surfer - Source of " msgid "Web surfer - Source of "
msgstr "Web surfer - Source de " msgstr "Web surfer - Source de "
#: ../src/surfer.c:1413 ../src/surfer.c:1416 ../src/surfer.c:1471 #: ../src/surfer.c:1445 ../src/surfer.c:1448 ../src/surfer.c:1503
#: ../src/surfer.c:1476 #: ../src/surfer.c:1508
msgid "Warning" msgid "Warning"
msgstr "Avertissement" msgstr "Avertissement"
#: ../src/surfer.c:1475 #: ../src/surfer.c:1507
msgid "This file already exists. Overwrite?" msgid "This file already exists. Overwrite?"
msgstr "Le fichier existe déjà. L'écraser ?" msgstr "Le fichier existe déjà. L'écraser ?"

110
po/it.po
View File

@ -7,7 +7,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: Surfer 0.1.0\n" "Project-Id-Version: Surfer 0.1.0\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2010-12-05 02:15+0100\n" "POT-Creation-Date: 2010-12-09 23:23+0100\n"
"PO-Revision-Date: 2010-04-11 12:06+0200\n" "PO-Revision-Date: 2010-04-11 12:06+0200\n"
"Last-Translator: Pierre Pronchery <khorben@defora.org>\n" "Last-Translator: Pierre Pronchery <khorben@defora.org>\n"
"Language-Team: Italian\n" "Language-Team: Italian\n"
@ -16,57 +16,69 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n" "Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n"
#: ../src/callbacks.c:426 #: ../src/callbacks.c:427
msgid "Web surfer preferences" msgid "Web surfer preferences"
msgstr "" msgstr ""
#: ../src/callbacks.c:446 #: ../src/callbacks.c:447
msgid "Homepage:" msgid "Homepage:"
msgstr "" msgstr ""
#: ../src/callbacks.c:454 #: ../src/callbacks.c:455
msgid "Focus new tabs" msgid "Focus new tabs"
msgstr "" msgstr ""
#: ../src/callbacks.c:458 #: ../src/callbacks.c:459
msgid "General" msgid "General"
msgstr "" msgstr ""
#: ../src/callbacks.c:464 #: ../src/callbacks.c:463
msgid "Direct connection"
msgstr ""
#: ../src/callbacks.c:467
msgid "HTTP proxy:" msgid "HTTP proxy:"
msgstr "" msgstr ""
#: ../src/callbacks.c:470 #: ../src/callbacks.c:474
msgid "Hostname:"
msgstr ""
#: ../src/callbacks.c:478
msgid "Port:"
msgstr ""
#: ../src/callbacks.c:486
msgid "Network" msgid "Network"
msgstr "" msgstr ""
#: ../src/common/conn.c:204 ../src/download.c:185 ../src/ghtml-gtkhtml.c:829 #: ../src/common/conn.c:204 ../src/download.c:185 ../src/ghtml-gtkhtml.c:832
msgid "Resolving..." msgid "Resolving..."
msgstr "" msgstr ""
#: ../src/common/conn.c:253 ../src/download.c:477 ../src/ghtml-gtkhtml.c:879 #: ../src/common/conn.c:253 ../src/download.c:477 ../src/ghtml-gtkhtml.c:882
msgid "Connected" msgid "Connected"
msgstr "" msgstr ""
#: ../src/common/conn.c:280 ../src/ghtml-gtkhtml.c:914 #: ../src/common/conn.c:280 ../src/ghtml-gtkhtml.c:917
#: ../src/ghtml-webkit.c:408 ../src/ghtml-webkit.c:545 #: ../src/ghtml-webkit.c:422 ../src/ghtml-webkit.c:581
#: ../src/ghtml-webkit.c:558 #: ../src/ghtml-webkit.c:594
msgid "Downloading..." msgid "Downloading..."
msgstr "" msgstr ""
#: ../src/common/conn.c:305 ../src/ghtml-gtkhtml.c:960 #: ../src/common/conn.c:305 ../src/ghtml-gtkhtml.c:963
msgid "Unsupported protocol" msgid "Unsupported protocol"
msgstr "" msgstr ""
#: ../src/common/conn.c:309 ../src/ghtml-gtkhtml.c:964 #: ../src/common/conn.c:309 ../src/ghtml-gtkhtml.c:967
msgid "Unknown host" msgid "Unknown host"
msgstr "" msgstr ""
#: ../src/common/conn.c:314 ../src/ghtml-gtkhtml.c:969 #: ../src/common/conn.c:314 ../src/ghtml-gtkhtml.c:972
msgid "Unspecified error" msgid "Unspecified error"
msgstr "" msgstr ""
#: ../src/common/conn.c:348 ../src/download.c:554 ../src/ghtml-gtkhtml.c:1065 #: ../src/common/conn.c:348 ../src/download.c:554 ../src/ghtml-gtkhtml.c:1068
msgid "Timeout" msgid "Timeout"
msgstr "" msgstr ""
@ -103,7 +115,7 @@ msgid "Close window when the download is complete"
msgstr "" msgstr ""
#: ../src/download.c:291 ../src/download.c:296 ../src/download.c:631 #: ../src/download.c:291 ../src/download.c:296 ../src/download.c:631
#: ../src/surfer.c:822 ../src/surfer.c:825 #: ../src/surfer.c:853 ../src/surfer.c:856
msgid "Error" msgid "Error"
msgstr "" msgstr ""
@ -158,7 +170,7 @@ msgstr ""
msgid "Code " msgid "Code "
msgstr "" msgstr ""
#: ../src/download.c:605 ../src/ghtml-webkit.c:501 ../src/surfer.c:824 #: ../src/download.c:605 ../src/ghtml-webkit.c:537 ../src/surfer.c:855
msgid "Unknown error" msgid "Unknown error"
msgstr "" msgstr ""
@ -169,32 +181,32 @@ msgid ""
" -U\tuser agent string to send\n" " -U\tuser agent string to send\n"
msgstr "" msgstr ""
#: ../src/ghtml-gtkhtml.c:706 #: ../src/ghtml-gtkhtml.c:709
msgid "Unknown protocol" msgid "Unknown protocol"
msgstr "" msgstr ""
#: ../src/ghtml-gtkhtml.c:772 #: ../src/ghtml-gtkhtml.c:775
msgid "Reading file..." msgid "Reading file..."
msgstr "" msgstr ""
#: ../src/ghtml-gtkhtml.c:984 #: ../src/ghtml-gtkhtml.c:987
msgid "Redirecting..." msgid "Redirecting..."
msgstr "" msgstr ""
#: ../src/ghtml-gtkhtml.c:992 #: ../src/ghtml-gtkhtml.c:995
msgid "Redirecting to " msgid "Redirecting to "
msgstr "" msgstr ""
#: ../src/ghtml-gtkhtml.c:1026 ../src/ghtml-webkit.c:303 #: ../src/ghtml-gtkhtml.c:1029 ../src/ghtml-webkit.c:317
#: ../src/ghtml-webkit.c:406 #: ../src/ghtml-webkit.c:420
msgid "Connecting..." msgid "Connecting..."
msgstr "" msgstr ""
#: ../src/ghtml-gtkhtml.c:1029 #: ../src/ghtml-gtkhtml.c:1032
msgid "Connecting to " msgid "Connecting to "
msgstr "" msgstr ""
#: ../src/ghtml-gtkhtml.c:1187 #: ../src/ghtml-gtkhtml.c:1190
msgid "Unsupported method" msgid "Unsupported method"
msgstr "" msgstr ""
@ -330,88 +342,88 @@ msgstr ""
msgid "Home" msgid "Home"
msgstr "" msgstr ""
#: ../src/surfer.c:286 ../src/surfer.c:571 #: ../src/surfer.c:292 ../src/surfer.c:594
msgid "Web surfer" msgid "Web surfer"
msgstr "" msgstr ""
#: ../src/surfer.c:334 #: ../src/surfer.c:340
msgid " Location: " msgid " Location: "
msgstr "" msgstr ""
#: ../src/surfer.c:541 #: ../src/surfer.c:564
msgid "Ready" msgid "Ready"
msgstr "" msgstr ""
#: ../src/surfer.c:584 ../src/surfer.c:1021 #: ../src/surfer.c:607 ../src/surfer.c:1053
msgid "Untitled" msgid "Untitled"
msgstr "" msgstr ""
#: ../src/surfer.c:702 ../src/surfer.c:705 ../src/surfer.c:1086 #: ../src/surfer.c:733 ../src/surfer.c:736 ../src/surfer.c:1118
#: ../src/surfer.c:1089 #: ../src/surfer.c:1121
msgid "Question" msgid "Question"
msgstr "" msgstr ""
#: ../src/surfer.c:775 ../src/surfer.c:1152 #: ../src/surfer.c:806 ../src/surfer.c:1184
msgid "Save file as..." msgid "Save file as..."
msgstr "" msgstr ""
#: ../src/surfer.c:853 #: ../src/surfer.c:884
msgid "Find text" msgid "Find text"
msgstr "" msgstr ""
#: ../src/surfer.c:860 #: ../src/surfer.c:891
msgid "Text:" msgid "Text:"
msgstr "" msgstr ""
#: ../src/surfer.c:867 #: ../src/surfer.c:898
msgid "Case-sensitive" msgid "Case-sensitive"
msgstr "" msgstr ""
#: ../src/surfer.c:869 #: ../src/surfer.c:900
msgid "Wrap" msgid "Wrap"
msgstr "" msgstr ""
#: ../src/surfer.c:895 #: ../src/surfer.c:926
msgid "Text not found" msgid "Text not found"
msgstr "" msgstr ""
#: ../src/surfer.c:983 #: ../src/surfer.c:1014
msgid "Open file..." msgid "Open file..."
msgstr "" msgstr ""
#: ../src/surfer.c:1012 #: ../src/surfer.c:1043
msgid "Could not initialize HTML renderer" msgid "Could not initialize HTML renderer"
msgstr "" msgstr ""
#: ../src/surfer.c:1213 #: ../src/surfer.c:1245
msgid "Javascript console" msgid "Javascript console"
msgstr "" msgstr ""
#: ../src/surfer.c:1218 #: ../src/surfer.c:1250
msgid "Command:" msgid "Command:"
msgstr "" msgstr ""
#: ../src/surfer.c:1237 #: ../src/surfer.c:1269
msgid "Message" msgid "Message"
msgstr "" msgstr ""
#: ../src/surfer.c:1242 #: ../src/surfer.c:1274
msgid "Source" msgid "Source"
msgstr "" msgstr ""
#: ../src/surfer.c:1247 #: ../src/surfer.c:1279
msgid "Line" msgid "Line"
msgstr "" msgstr ""
#: ../src/surfer.c:1372 #: ../src/surfer.c:1404
msgid "Web surfer - Source of " msgid "Web surfer - Source of "
msgstr "" msgstr ""
#: ../src/surfer.c:1413 ../src/surfer.c:1416 ../src/surfer.c:1471 #: ../src/surfer.c:1445 ../src/surfer.c:1448 ../src/surfer.c:1503
#: ../src/surfer.c:1476 #: ../src/surfer.c:1508
msgid "Warning" msgid "Warning"
msgstr "" msgstr ""
#: ../src/surfer.c:1475 #: ../src/surfer.c:1507
msgid "This file already exists. Overwrite?" msgid "This file already exists. Overwrite?"
msgstr "" msgstr ""

60
src/callbacks.c
View File

@ -407,6 +407,7 @@ static void _preferences_on_response(GtkWidget * widget, gint response,
gpointer data); gpointer data);
static void _preferences_on_cancel(gpointer data); static void _preferences_on_cancel(gpointer data);
static void _preferences_on_ok(gpointer data); static void _preferences_on_ok(gpointer data);
static void _preferences_on_proxy_http_toggled(gpointer data);
void on_preferences(gpointer data) void on_preferences(gpointer data)
{ {
@ -447,25 +448,40 @@ void on_preferences(gpointer data)
gtk_box_pack_start(GTK_BOX(hbox), widget, FALSE, TRUE, 0); gtk_box_pack_start(GTK_BOX(hbox), widget, FALSE, TRUE, 0);
surfer->pr_homepage = gtk_entry_new(); surfer->pr_homepage = gtk_entry_new();
gtk_box_pack_start(GTK_BOX(hbox), surfer->pr_homepage, TRUE, TRUE, 0); gtk_box_pack_start(GTK_BOX(hbox), surfer->pr_homepage, TRUE, TRUE, 0);
gtk_box_pack_start(GTK_BOX(page), hbox, TRUE, TRUE, 0); gtk_box_pack_start(GTK_BOX(page), hbox, FALSE, TRUE, 0);
/* focus new tabs */ /* focus new tabs */
hbox = gtk_hbox_new(FALSE, 4); hbox = gtk_hbox_new(FALSE, 4);
surfer->pr_focus_tabs = gtk_check_button_new_with_label( surfer->pr_focus_tabs = gtk_check_button_new_with_label(
_("Focus new tabs")); _("Focus new tabs"));
gtk_box_pack_start(GTK_BOX(hbox), surfer->pr_focus_tabs, TRUE, TRUE, 0); gtk_box_pack_start(GTK_BOX(hbox), surfer->pr_focus_tabs, TRUE, TRUE, 0);
gtk_box_pack_start(GTK_BOX(page), hbox, TRUE, TRUE, 0); gtk_box_pack_start(GTK_BOX(page), hbox, FALSE, TRUE, 0);
gtk_notebook_append_page(GTK_NOTEBOOK(notebook), page, gtk_notebook_append_page(GTK_NOTEBOOK(notebook), page,
gtk_label_new(_("General"))); gtk_label_new(_("General")));
/* network tab */ /* network tab */
page = gtk_vbox_new(FALSE, 4); page = gtk_vbox_new(FALSE, 4);
gtk_container_set_border_width(GTK_CONTAINER(page), 4); gtk_container_set_border_width(GTK_CONTAINER(page), 4);
widget = gtk_radio_button_new_with_label(NULL, _("Direct connection"));
surfer->pr_proxy_radio_direct = widget;
gtk_box_pack_start(GTK_BOX(page), widget, FALSE, TRUE, 0);
widget = gtk_radio_button_new_with_label_from_widget(GTK_RADIO_BUTTON(
widget), _("HTTP proxy:"));
surfer->pr_proxy_radio_http = widget;
g_signal_connect_swapped(G_OBJECT(widget), "toggled", G_CALLBACK(
_preferences_on_proxy_http_toggled), surfer);
gtk_box_pack_start(GTK_BOX(page), widget, FALSE, TRUE, 0);
/* http proxy */ /* http proxy */
hbox = gtk_hbox_new(FALSE, 4); hbox = gtk_hbox_new(FALSE, 4);
widget = gtk_label_new(_("HTTP proxy:")); widget = gtk_label_new(_("Hostname:"));
gtk_box_pack_start(GTK_BOX(hbox), widget, FALSE, TRUE, 0); gtk_box_pack_start(GTK_BOX(hbox), widget, FALSE, TRUE, 0);
surfer->pr_proxy_http = gtk_entry_new(); surfer->pr_proxy_http = gtk_entry_new();
gtk_box_pack_start(GTK_BOX(hbox), surfer->pr_proxy_http, TRUE, TRUE, 0); gtk_box_pack_start(GTK_BOX(hbox), surfer->pr_proxy_http, TRUE, TRUE, 0);
gtk_box_pack_start(GTK_BOX(page), hbox, TRUE, TRUE, 0); widget = gtk_label_new(_("Port:"));
gtk_box_pack_start(GTK_BOX(hbox), widget, FALSE, TRUE, 0);
surfer->pr_proxy_http_port = gtk_spin_button_new_with_range(0, 65535,
1.0);
gtk_box_pack_start(GTK_BOX(hbox), surfer->pr_proxy_http_port, FALSE,
TRUE, 0);
gtk_box_pack_start(GTK_BOX(page), hbox, FALSE, TRUE, 0);
gtk_notebook_append_page(GTK_NOTEBOOK(notebook), page, gtk_notebook_append_page(GTK_NOTEBOOK(notebook), page,
gtk_label_new(_("Network"))); gtk_label_new(_("Network")));
gtk_box_pack_start(GTK_BOX(vbox), notebook, TRUE, TRUE, 0); gtk_box_pack_start(GTK_BOX(vbox), notebook, TRUE, TRUE, 0);
@ -476,6 +492,8 @@ void on_preferences(gpointer data)
static void _preferences_set(Surfer * surfer) static void _preferences_set(Surfer * surfer)
{ {
char const * p; char const * p;
unsigned long port;
char * q = NULL;
gtk_entry_set_text(GTK_ENTRY(surfer->pr_homepage), surfer->homepage gtk_entry_set_text(GTK_ENTRY(surfer->pr_homepage), surfer->homepage
!= NULL ? surfer->homepage : ""); != NULL ? surfer->homepage : "");
@ -486,8 +504,21 @@ static void _preferences_set(Surfer * surfer)
else else
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON( gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(
surfer->pr_focus_tabs), FALSE); surfer->pr_focus_tabs), FALSE);
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(
surfer->pr_proxy_radio_http),
surfer->proxy_type == SPT_HTTP);
_preferences_on_proxy_http_toggled(surfer);
if((p = config_get(surfer->config, "proxy", "http")) != NULL) if((p = config_get(surfer->config, "proxy", "http")) != NULL)
gtk_entry_set_text(GTK_ENTRY(surfer->pr_proxy_http), p); gtk_entry_set_text(GTK_ENTRY(surfer->pr_proxy_http), p);
if((p = config_get(surfer->config, "proxy", "http_port")) != NULL
&& p[0] != '\0')
{
port = strtoul(p, &q, 10);
if(q != NULL && *q == '\0')
gtk_spin_button_set_value(GTK_SPIN_BUTTON(
surfer->pr_proxy_http_port),
port);
}
} }
static gboolean _preferences_on_closex(gpointer data) static gboolean _preferences_on_closex(gpointer data)
@ -519,15 +550,32 @@ static void _preferences_on_cancel(gpointer data)
static void _preferences_on_ok(gpointer data) static void _preferences_on_ok(gpointer data)
{ {
Surfer * surfer = data; Surfer * surfer = data;
SurferProxyType type = SPT_NONE;
gtk_widget_hide(surfer->pr_window); gtk_widget_hide(surfer->pr_window);
surfer_set_homepage(surfer, gtk_entry_get_text(GTK_ENTRY( surfer_set_homepage(surfer, gtk_entry_get_text(GTK_ENTRY(
surfer->pr_homepage))); surfer->pr_homepage)));
surfer_set_proxy(surfer, gtk_entry_get_text(GTK_ENTRY( if(gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(
surfer->pr_proxy_http))); surfer->pr_proxy_radio_http)))
type = SPT_HTTP;
surfer_set_proxy(surfer, type, gtk_entry_get_text(GTK_ENTRY(
surfer->pr_proxy_http)),
gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(
surfer->pr_proxy_http_port)));
surfer_config_save(surfer); surfer_config_save(surfer);
} }
static void _preferences_on_proxy_http_toggled(gpointer data)
{
Surfer * surfer = data;
gboolean active;
active = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(
surfer->pr_proxy_radio_http));
gtk_widget_set_sensitive(surfer->pr_proxy_http, active);
gtk_widget_set_sensitive(surfer->pr_proxy_http_port, active);
}
/* on_refresh */ /* on_refresh */
void on_refresh(gpointer data) void on_refresh(gpointer data)

5
src/common.h
View File

@ -30,7 +30,9 @@ struct _Surfer
/* preferences */ /* preferences */
char * homepage; char * homepage;
SurferProxyType proxy_type;
char * proxy_http; char * proxy_http;
unsigned int proxy_http_port;
/* widgets */ /* widgets */
/* main window */ /* main window */
@ -56,7 +58,10 @@ struct _Surfer
GtkWidget * pr_window; GtkWidget * pr_window;
GtkWidget * pr_homepage; GtkWidget * pr_homepage;
GtkWidget * pr_focus_tabs; GtkWidget * pr_focus_tabs;
GtkWidget * pr_proxy_radio_direct;
GtkWidget * pr_proxy_radio_http;
GtkWidget * pr_proxy_http; GtkWidget * pr_proxy_http;
GtkWidget * pr_proxy_http_port;
/* find */ /* find */
GtkWidget * fi_dialog; GtkWidget * fi_dialog;

7
src/ghtml-gtkhtml.c
View File

@ -272,10 +272,13 @@ char const * ghtml_get_title(GtkWidget * widget)
/* ghtml_set_proxy */ /* ghtml_set_proxy */
int ghtml_set_proxy(GtkWidget * ghtml, char const * http) int ghtml_set_proxy(GtkWidget * ghtml, SurferProxyType type, char const * http,
unsigned int http_port)
{ {
if(type == SPT_NONE)
return 0;
/* FIXME really implement */ /* FIXME really implement */
return -1; return -error_set_code(1, "%s", strerror(ENOSYS));;
} }

7
src/ghtml-gtkmozembed.c
View File

@ -393,10 +393,13 @@ char const * ghtml_get_title(GtkWidget * ghtml)
/* ghtml_set_proxy */ /* ghtml_set_proxy */
int ghtml_set_proxy(GtkWidget * ghtml, char const * http) int ghtml_set_proxy(GtkWidget * ghtml, SurferProxyType type, char const * http,
unsigned int http_port)
{ {
if(type == SPT_NONE)
return 0;
/* FIXME really implement */ /* FIXME really implement */
return -1; return -error_set_code(1, "%s", strerror(ENOSYS));;
} }

7
src/ghtml-gtktextview.c
View File

@ -424,10 +424,13 @@ char const * ghtml_get_title(GtkWidget * widget)
/* ghtml_set_proxy */ /* ghtml_set_proxy */
int ghtml_set_proxy(GtkWidget * ghtml, char const * http) int ghtml_set_proxy(GtkWidget * ghtml, SurferProxyType type, char const * http,
unsigned int http_port)
{ {
if(type == SPT_NONE)
return 0;
/* FIXME really implement */ /* FIXME really implement */
return -1; return -error_set_code(1, "%s", strerror(ENOSYS));;
} }

44
src/ghtml-webkit.c
View File

@ -19,6 +19,8 @@
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include <netdb.h>
#include <arpa/inet.h>
#include <libintl.h> #include <libintl.h>
#include <webkit/webkit.h> #include <webkit/webkit.h>
#include "ghtml.h" #include "ghtml.h"
@ -223,19 +225,31 @@ char const * ghtml_get_title(GtkWidget * ghtml)
/* ghtml_set_proxy */ /* ghtml_set_proxy */
int ghtml_set_proxy(GtkWidget * ghtml, char const * http) int ghtml_set_proxy(GtkWidget * ghtml, SurferProxyType type, char const * http,
unsigned int http_port)
{ {
#if WEBKIT_CHECK_VERSION(1, 1, 0) #if WEBKIT_CHECK_VERSION(1, 1, 0)
SoupSession * session; SoupSession * session;
SoupURI * uri; char buf[32];
struct hostent * he;
struct in_addr addr;
SoupURI * uri = NULL;
session = webkit_get_default_session(); session = webkit_get_default_session();
uri = soup_uri_new(http); if(type == SPT_HTTP && http != NULL && strlen(http) > 0)
{
if((he = gethostbyname(http)) == NULL)
return -error_set_code(1, "%s", hstrerror(h_errno));
memcpy(&addr.s_addr, he->h_addr, sizeof(addr.s_addr));
snprintf(buf, sizeof(buf), "http://%s:%u/", inet_ntoa(addr),
http_port);
uri = soup_uri_new(buf);
}
g_object_set(session, "proxy-uri", uri, NULL); g_object_set(session, "proxy-uri", uri, NULL);
return 0; return 0;
#else #else
/* FIXME really implement */ /* FIXME really implement */
return -1; return -error_set_code(1, "%s", strerror(ENOSYS));
#endif #endif
} }
@ -479,11 +493,33 @@ static void _on_load_committed(WebKitWebView * view, WebKitWebFrame * frame,
{ {
Surfer * surfer; Surfer * surfer;
char const * location; char const * location;
SurferSecurity security = SS_NONE;
#if WEBKIT_CHECK_VERSION(1, 1, 0)
WebKitWebDataSource *source;
WebKitNetworkRequest *request;
SoupMessage *message;
#endif
surfer = g_object_get_data(G_OBJECT(data), "surfer"); surfer = g_object_get_data(G_OBJECT(data), "surfer");
if(frame == webkit_web_view_get_main_frame(view) if(frame == webkit_web_view_get_main_frame(view)
&& (location = webkit_web_frame_get_uri(frame)) != NULL) && (location = webkit_web_frame_get_uri(frame)) != NULL)
{
surfer_set_location(surfer, location); surfer_set_location(surfer, location);
#if WEBKIT_CHECK_VERSION(1, 1, 0)
if(strncmp(location, "https://", 8) == 0)
{
security = SS_UNTRUSTED;
source = webkit_web_frame_get_data_source(frame);
request = webkit_web_data_source_get_request(source);
message = webkit_network_request_get_message(request);
/* FIXME trusts even if hostname does not match?!? */
if(message != NULL && soup_message_get_flags(message)
& SOUP_MESSAGE_CERTIFICATE_TRUSTED)
security = SS_TRUSTED;
}
#endif
}
surfer_set_security(surfer, security);
} }

3
src/ghtml.h
View File

@ -38,7 +38,8 @@ char const * ghtml_get_source(GtkWidget * ghtml);
char const * ghtml_get_status(GtkWidget * ghtml); char const * ghtml_get_status(GtkWidget * ghtml);
char const * ghtml_get_title(GtkWidget * ghtml); char const * ghtml_get_title(GtkWidget * ghtml);
int ghtml_set_proxy(GtkWidget * ghtml, char const * http); int ghtml_set_proxy(GtkWidget * ghtml, SurferProxyType type, char const * http,
unsigned int http_port);
/* useful */ /* useful */
gboolean ghtml_go_back(GtkWidget * ghtml); gboolean ghtml_go_back(GtkWidget * ghtml);

73
src/surfer.c
View File

@ -218,10 +218,14 @@ static gboolean _surfer_filename_confirm(Surfer * surfer,
char const * filename); char const * filename);
static char * _config_get_filename(void); static char * _config_get_filename(void);
static int _config_load_integer(Config * config, char const * section,
char const * variable, unsigned int * value);
static int _config_load_string(Config * config, char const * section, static int _config_load_string(Config * config, char const * section,
char const * variable, char ** value); char const * variable, char ** value);
static int _config_save_boolean(Config * config, char const * section, static int _config_save_boolean(Config * config, char const * section,
char const * variable, gboolean value); char const * variable, gboolean value);
static int _config_save_integer(Config * config, char const * section,
char const * variable, unsigned int value);
static int _config_save_string(Config * config, char const * section, static int _config_save_string(Config * config, char const * section,
char const * variable, char const * value); char const * variable, char const * value);
@ -267,7 +271,9 @@ Surfer * _new_do(char const * url)
if((surfer = malloc(sizeof(*surfer))) == NULL) if((surfer = malloc(sizeof(*surfer))) == NULL)
return NULL; return NULL;
surfer->homepage = NULL; surfer->homepage = NULL;
surfer->proxy_type = SPT_NONE;
surfer->proxy_http = NULL; surfer->proxy_http = NULL;
surfer->proxy_http_port = 0;
if((surfer->config = config_new()) == NULL if((surfer->config = config_new()) == NULL
|| surfer_config_load(surfer) != 0) || surfer_config_load(surfer) != 0)
{ {
@ -504,21 +510,38 @@ void surfer_set_progress(Surfer * surfer, gdouble fraction)
/* surfer_set_proxy */ /* surfer_set_proxy */
void surfer_set_proxy(Surfer * surfer, char const * http) void surfer_set_proxy(Surfer * surfer, SurferProxyType type, char const * http,
unsigned int http_port)
{ {
GtkWidget * view; GtkWidget * view;
gint n; gint n;
gint i; gint i;
surfer->proxy_type = type;
free(surfer->proxy_http); free(surfer->proxy_http);
if((surfer->proxy_http = strdup(http)) == NULL) if(http == NULL)
surfer->proxy_http = NULL;
else if((surfer->proxy_http = strdup(http)) == NULL)
return; /* XXX report error */ return; /* XXX report error */
surfer->proxy_http_port = http_port;
n = gtk_notebook_get_n_pages(GTK_NOTEBOOK(surfer->notebook)); n = gtk_notebook_get_n_pages(GTK_NOTEBOOK(surfer->notebook));
for(i = 0; i < n; i++) for(i = 0; i < n; i++)
{ {
view = gtk_notebook_get_nth_page(GTK_NOTEBOOK(surfer->notebook), view = gtk_notebook_get_nth_page(GTK_NOTEBOOK(surfer->notebook),
i); i);
ghtml_set_proxy(view, http); ghtml_set_proxy(view, type, http, http_port);
}
}
/* surfer_set_security */
void surfer_set_security(Surfer * surfer, SurferSecurity security)
{
/* FIXME would need a context per tab to work... */
switch(security)
{
default:
break;
} }
} }
@ -660,8 +683,12 @@ int surfer_config_load(Surfer * surfer)
free(filename); free(filename);
_config_load_string(surfer->config, NULL, "homepage", _config_load_string(surfer->config, NULL, "homepage",
&surfer->homepage); &surfer->homepage);
_config_load_integer(surfer->config, "proxy", "type",
&surfer->proxy_type);
_config_load_string(surfer->config, "proxy", "http", _config_load_string(surfer->config, "proxy", "http",
&surfer->proxy_http); &surfer->proxy_http);
_config_load_integer(surfer->config, "proxy", "http_port",
&surfer->proxy_http_port);
return 0; return 0;
} }
@ -679,8 +706,12 @@ int surfer_config_save(Surfer * surfer)
ret |= _config_save_boolean(surfer->config, NULL, "focus_new_tabs", ret |= _config_save_boolean(surfer->config, NULL, "focus_new_tabs",
gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON( gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(
surfer->pr_focus_tabs))); surfer->pr_focus_tabs)));
ret |= _config_save_integer(surfer->config, "proxy", "type",
surfer->proxy_type);
ret |= _config_save_string(surfer->config, "proxy", "http", ret |= _config_save_string(surfer->config, "proxy", "http",
surfer->proxy_http); surfer->proxy_http);
ret |= _config_save_integer(surfer->config, "proxy", "http_port",
surfer->proxy_http_port);
if(ret == 0) if(ret == 0)
ret |= config_save(surfer->config, filename); ret |= config_save(surfer->config, filename);
free(filename); free(filename);
@ -1013,7 +1044,8 @@ void surfer_open_tab(Surfer * surfer, char const * url)
return; return;
} }
if(surfer->proxy_http != NULL) if(surfer->proxy_http != NULL)
ghtml_set_proxy(widget, surfer->proxy_http); ghtml_set_proxy(widget, surfer->proxy_type, surfer->proxy_http,
surfer->proxy_http_port);
gtk_widget_show_all(widget); /* must be before set_current_page() */ gtk_widget_show_all(widget); /* must be before set_current_page() */
if(url != NULL) if(url != NULL)
ghtml_load_url(widget, url); ghtml_load_url(widget, url);
@ -1499,6 +1531,24 @@ static char * _config_get_filename(void)
} }
/* config_load_integer */
static int _config_load_integer(Config * config, char const * section,
char const * variable, unsigned int * value)
{
unsigned int u;
char const * p;
char * q;
if((p = config_get(config, section, variable)) == NULL || p[0] == '\0')
return -1;
u = strtoul(p, &q, 10);
if(*q != '\0')
return -1;
*value = u;
return 0;
}
/* config_load_string */ /* config_load_string */
static int _config_load_string(Config * config, char const * section, static int _config_load_string(Config * config, char const * section,
char const * variable, char ** value) char const * variable, char ** value)
@ -1507,9 +1557,9 @@ static int _config_load_string(Config * config, char const * section,
char * p; char * p;
if((str = config_get(config, section, variable)) == NULL) if((str = config_get(config, section, variable)) == NULL)
return 0; return -1;
if((p = strdup(str)) == NULL) if((p = strdup(str)) == NULL)
return 1; return -1;
free(*value); free(*value);
*value = p; *value = p;
return 0; return 0;
@ -1524,6 +1574,17 @@ static int _config_save_boolean(Config * config, char const * section,
} }
/* config_save_integer */
static int _config_save_integer(Config * config, char const * section,
char const * variable, unsigned int value)
{
char buf[32];
snprintf(buf, sizeof(buf), "%u", value);
return config_set(config, section, variable, buf);
}
/* config_save_string */ /* config_save_string */
static int _config_save_string(Config * config, char const * section, static int _config_save_string(Config * config, char const * section,
char const * variable, char const * value) char const * variable, char const * value)

18
src/surfer.h
View File

@ -42,6 +42,20 @@
/* types */ /* types */
typedef struct _Surfer Surfer; typedef struct _Surfer Surfer;
typedef enum _SurferSecurity
{
SS_NONE = 0,
SS_TRUSTED,
SS_UNTRUSTED
}
SurferSecurity;
typedef enum _SurferProxyType
{
SPT_NONE = 0,
SPT_HTTP
} SurferProxyType;
/* functions */ /* functions */
Surfer * surfer_new(char const * url); Surfer * surfer_new(char const * url);
@ -56,7 +70,9 @@ void surfer_set_fullscreen(Surfer * surfer, gboolean fullscreen);
void surfer_set_homepage(Surfer * surfer, char const * homepage); void surfer_set_homepage(Surfer * surfer, char const * homepage);
void surfer_set_location(Surfer * surfer, char const * url); void surfer_set_location(Surfer * surfer, char const * url);
void surfer_set_progress(Surfer * surfer, gdouble fraction); void surfer_set_progress(Surfer * surfer, gdouble fraction);
void surfer_set_proxy(Surfer * surfer, char const * http); void surfer_set_proxy(Surfer * surfer, SurferProxyType type, char const * http,
unsigned int http_port);
void surfer_set_security(Surfer * surfer, SurferSecurity security);
void surfer_set_status(Surfer * surfer, char const * status); void surfer_set_status(Surfer * surfer, char const * status);
void surfer_set_title(Surfer * surfer, char const * title); void surfer_set_title(Surfer * surfer, char const * title);