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

Implemented a way to specify a default folder for downloads

Browse Source
This commit is contained in:
Pierre Pronchery 2011-05-14 18:59:54 +00:00
parent 2c7d2f1695
commit bb108fcf33
7 changed files with 299 additions and 177 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

100
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: 2011-05-14 18:27+0200\n" "POT-Creation-Date: 2011-05-14 20:54+0200\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,8 +16,8 @@ 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:43 ../src/callbacks.c:53 ../src/surfer.c:814 #: ../src/callbacks.c:43 ../src/callbacks.c:53 ../src/surfer.c:820
#: ../src/surfer.c:817 ../src/surfer.c:1260 ../src/surfer.c:1265 #: ../src/surfer.c:823 ../src/surfer.c:1269 ../src/surfer.c:1274
msgid "Question" msgid "Question"
msgstr "" msgstr ""
@ -94,7 +94,7 @@ msgid "Close window when the download is complete"
msgstr "" msgstr ""
#: ../src/download.c:325 ../src/download.c:330 ../src/download.c:719 #: ../src/download.c:325 ../src/download.c:330 ../src/download.c:719
#: ../src/surfer.c:962 ../src/surfer.c:965 #: ../src/surfer.c:971 ../src/surfer.c:974
msgid "Error" msgid "Error"
msgstr "Fehler" msgstr "Fehler"
@ -149,7 +149,7 @@ msgstr ""
msgid "Code " msgid "Code "
msgstr "" msgstr ""
#: ../src/download.c:693 ../src/ghtml-webkit.c:695 ../src/surfer.c:964 #: ../src/download.c:693 ../src/ghtml-webkit.c:695 ../src/surfer.c:973
msgid "Unknown error" msgid "Unknown error"
msgstr "" msgstr ""
@ -345,139 +345,159 @@ msgstr ""
msgid "New window" msgid "New window"
msgstr "" msgstr ""
#: ../src/surfer.c:310 ../src/surfer.c:661 #: ../src/surfer.c:311 ../src/surfer.c:663
msgid "Web surfer" msgid "Web surfer"
msgstr "Web surfer" msgstr "Web surfer"
#: ../src/surfer.c:358 #: ../src/surfer.c:359
msgid " Location: " msgid " Location: "
msgstr "" msgstr ""
#: ../src/surfer.c:395 ../src/surfer.c:1741 ../src/surfer.c:1746 #: ../src/surfer.c:396 ../src/surfer.c:1780 ../src/surfer.c:1785
msgid "Security information" msgid "Security information"
msgstr "" msgstr ""
#: ../src/surfer.c:631 #: ../src/surfer.c:633
msgid "Ready" msgid "Ready"
msgstr "" msgstr ""
#: ../src/surfer.c:674 ../src/surfer.c:1176 #: ../src/surfer.c:676 ../src/surfer.c:1185
msgid "Untitled" msgid "Untitled"
msgstr "" msgstr ""
#: ../src/surfer.c:915 ../src/surfer.c:1343 #: ../src/surfer.c:921 ../src/surfer.c:1352
msgid "Save file as..." msgid "Save file as..."
msgstr "" msgstr ""
#: ../src/surfer.c:993 #: ../src/surfer.c:1002
msgid "Find text" msgid "Find text"
msgstr "Suchen" msgstr "Suchen"
#: ../src/surfer.c:1005 #: ../src/surfer.c:1014
msgid "Text:" msgid "Text:"
msgstr "" msgstr ""
#: ../src/surfer.c:1013 #: ../src/surfer.c:1022
msgid "Case-sensitive" msgid "Case-sensitive"
msgstr "" msgstr ""
#: ../src/surfer.c:1017 #: ../src/surfer.c:1026
msgid "Search backwards" msgid "Search backwards"
msgstr "" msgstr ""
#: ../src/surfer.c:1020 #: ../src/surfer.c:1029
msgid "Wrap" msgid "Wrap"
msgstr "" msgstr ""
#: ../src/surfer.c:1049 #: ../src/surfer.c:1058
msgid "Text not found" msgid "Text not found"
msgstr "" msgstr ""
#: ../src/surfer.c:1137 #: ../src/surfer.c:1146
msgid "Open file..." msgid "Open file..."
msgstr "" msgstr ""
#: ../src/surfer.c:1166 #: ../src/surfer.c:1175
msgid "Could not initialize HTML renderer" msgid "Could not initialize HTML renderer"
msgstr "" msgstr ""
#: ../src/surfer.c:1404 #: ../src/surfer.c:1413
msgid "Javascript console" msgid "Javascript console"
msgstr "" msgstr ""
#: ../src/surfer.c:1409 #: ../src/surfer.c:1418
msgid "Command:" msgid "Command:"
msgstr "" msgstr ""
#: ../src/surfer.c:1428 #: ../src/surfer.c:1437
msgid "Message" msgid "Message"
msgstr "" msgstr ""
#: ../src/surfer.c:1433 #: ../src/surfer.c:1442
msgid "Source" msgid "Source"
msgstr "" msgstr ""
#: ../src/surfer.c:1438 #: ../src/surfer.c:1447
msgid "Line" msgid "Line"
msgstr "Linie" msgstr "Linie"
#: ../src/surfer.c:1568 #: ../src/surfer.c:1579
msgid "Web surfer preferences" msgid "Web surfer preferences"
msgstr "Web surfer Einstellungen" msgstr "Web surfer Einstellungen"
#: ../src/surfer.c:1588 #: ../src/surfer.c:1599
msgid "Homepage:" msgid "Homepage:"
msgstr "" msgstr ""
#: ../src/surfer.c:1596 #: ../src/surfer.c:1605
msgid "Tab handling"
msgstr ""
#: ../src/surfer.c:1610
msgid "Focus new tabs" msgid "Focus new tabs"
msgstr "" msgstr ""
#: ../src/surfer.c:1600 #: ../src/surfer.c:1615
msgid "Downloads"
msgstr ""
#: ../src/surfer.c:1618
msgid "Default download directory:"
msgstr ""
#: ../src/surfer.c:1622
msgid "Choose the default download directory"
msgstr ""
#: ../src/surfer.c:1629
msgid "General" msgid "General"
msgstr "" msgstr ""
#: ../src/surfer.c:1604 #: ../src/surfer.c:1633
msgid "Connectivity:"
msgstr ""
#: ../src/surfer.c:1636
msgid "Direct connection" msgid "Direct connection"
msgstr "" msgstr ""
#: ../src/surfer.c:1608 #: ../src/surfer.c:1640
msgid "HTTP proxy:" msgid "HTTP proxy:"
msgstr "" msgstr ""
#: ../src/surfer.c:1615 #: ../src/surfer.c:1647
msgid "Hostname:" msgid "Hostname:"
msgstr "" msgstr ""
#: ../src/surfer.c:1619 #: ../src/surfer.c:1651
msgid "Port:" msgid "Port:"
msgstr "" msgstr ""
#: ../src/surfer.c:1627 #: ../src/surfer.c:1661
msgid "Network" msgid "Network"
msgstr "" msgstr ""
#: ../src/surfer.c:1727 #: ../src/surfer.c:1766
msgid "This connection is encrypted and trusted." msgid "This connection is encrypted and trusted."
msgstr "" msgstr ""
#: ../src/surfer.c:1730 #: ../src/surfer.c:1769
msgid "This connection is encrypted but not trusted." msgid "This connection is encrypted but not trusted."
msgstr "" msgstr ""
#: ../src/surfer.c:1734 #: ../src/surfer.c:1773
msgid "This connection is not encrypted." msgid "This connection is not encrypted."
msgstr "" msgstr ""
#: ../src/surfer.c:1790 #: ../src/surfer.c:1829
msgid "Web surfer - Source of " msgid "Web surfer - Source of "
msgstr "" msgstr ""
#: ../src/surfer.c:1832 ../src/surfer.c:1835 ../src/surfer.c:1890 #: ../src/surfer.c:1871 ../src/surfer.c:1874 ../src/surfer.c:1929
#: ../src/surfer.c:1895 #: ../src/surfer.c:1934
msgid "Warning" msgid "Warning"
msgstr "Achtung" msgstr "Achtung"
#: ../src/surfer.c:1894 #: ../src/surfer.c:1933
msgid "This file already exists. Overwrite?" msgid "This file already exists. Overwrite?"
msgstr "" msgstr ""

100
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: 2011-05-14 18:27+0200\n" "POT-Creation-Date: 2011-05-14 20:54+0200\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,8 +16,8 @@ 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:43 ../src/callbacks.c:53 ../src/surfer.c:814 #: ../src/callbacks.c:43 ../src/callbacks.c:53 ../src/surfer.c:820
#: ../src/surfer.c:817 ../src/surfer.c:1260 ../src/surfer.c:1265 #: ../src/surfer.c:823 ../src/surfer.c:1269 ../src/surfer.c:1274
msgid "Question" msgid "Question"
msgstr "" msgstr ""
@ -94,7 +94,7 @@ msgid "Close window when the download is complete"
msgstr "" msgstr ""
#: ../src/download.c:325 ../src/download.c:330 ../src/download.c:719 #: ../src/download.c:325 ../src/download.c:330 ../src/download.c:719
#: ../src/surfer.c:962 ../src/surfer.c:965 #: ../src/surfer.c:971 ../src/surfer.c:974
msgid "Error" msgid "Error"
msgstr "" msgstr ""
@ -149,7 +149,7 @@ msgstr ""
msgid "Code " msgid "Code "
msgstr "" msgstr ""
#: ../src/download.c:693 ../src/ghtml-webkit.c:695 ../src/surfer.c:964 #: ../src/download.c:693 ../src/ghtml-webkit.c:695 ../src/surfer.c:973
msgid "Unknown error" msgid "Unknown error"
msgstr "" msgstr ""
@ -345,139 +345,159 @@ msgstr ""
msgid "New window" msgid "New window"
msgstr "" msgstr ""
#: ../src/surfer.c:310 ../src/surfer.c:661 #: ../src/surfer.c:311 ../src/surfer.c:663
msgid "Web surfer" msgid "Web surfer"
msgstr "Web surfer" msgstr "Web surfer"
#: ../src/surfer.c:358 #: ../src/surfer.c:359
msgid " Location: " msgid " Location: "
msgstr "" msgstr ""
#: ../src/surfer.c:395 ../src/surfer.c:1741 ../src/surfer.c:1746 #: ../src/surfer.c:396 ../src/surfer.c:1780 ../src/surfer.c:1785
msgid "Security information" msgid "Security information"
msgstr "" msgstr ""
#: ../src/surfer.c:631 #: ../src/surfer.c:633
msgid "Ready" msgid "Ready"
msgstr "" msgstr ""
#: ../src/surfer.c:674 ../src/surfer.c:1176 #: ../src/surfer.c:676 ../src/surfer.c:1185
msgid "Untitled" msgid "Untitled"
msgstr "" msgstr ""
#: ../src/surfer.c:915 ../src/surfer.c:1343 #: ../src/surfer.c:921 ../src/surfer.c:1352
msgid "Save file as..." msgid "Save file as..."
msgstr "Guardar como..." msgstr "Guardar como..."
#: ../src/surfer.c:993 #: ../src/surfer.c:1002
msgid "Find text" msgid "Find text"
msgstr "Buscar" msgstr "Buscar"
#: ../src/surfer.c:1005 #: ../src/surfer.c:1014
msgid "Text:" msgid "Text:"
msgstr "" msgstr ""
#: ../src/surfer.c:1013 #: ../src/surfer.c:1022
msgid "Case-sensitive" msgid "Case-sensitive"
msgstr "" msgstr ""
#: ../src/surfer.c:1017 #: ../src/surfer.c:1026
msgid "Search backwards" msgid "Search backwards"
msgstr "" msgstr ""
#: ../src/surfer.c:1020 #: ../src/surfer.c:1029
msgid "Wrap" msgid "Wrap"
msgstr "" msgstr ""
#: ../src/surfer.c:1049 #: ../src/surfer.c:1058
msgid "Text not found" msgid "Text not found"
msgstr "" msgstr ""
#: ../src/surfer.c:1137 #: ../src/surfer.c:1146
msgid "Open file..." msgid "Open file..."
msgstr "Abrir..." msgstr "Abrir..."
#: ../src/surfer.c:1166 #: ../src/surfer.c:1175
msgid "Could not initialize HTML renderer" msgid "Could not initialize HTML renderer"
msgstr "" msgstr ""
#: ../src/surfer.c:1404 #: ../src/surfer.c:1413
msgid "Javascript console" msgid "Javascript console"
msgstr "" msgstr ""
#: ../src/surfer.c:1409 #: ../src/surfer.c:1418
msgid "Command:" msgid "Command:"
msgstr "" msgstr ""
#: ../src/surfer.c:1428 #: ../src/surfer.c:1437
msgid "Message" msgid "Message"
msgstr "" msgstr ""
#: ../src/surfer.c:1433 #: ../src/surfer.c:1442
msgid "Source" msgid "Source"
msgstr "" msgstr ""
#: ../src/surfer.c:1438 #: ../src/surfer.c:1447
msgid "Line" msgid "Line"
msgstr "" msgstr ""
#: ../src/surfer.c:1568 #: ../src/surfer.c:1579
msgid "Web surfer preferences" msgid "Web surfer preferences"
msgstr "Web surfer preferencias" msgstr "Web surfer preferencias"
#: ../src/surfer.c:1588 #: ../src/surfer.c:1599
msgid "Homepage:" msgid "Homepage:"
msgstr "" msgstr ""
#: ../src/surfer.c:1596 #: ../src/surfer.c:1605
msgid "Tab handling"
msgstr ""
#: ../src/surfer.c:1610
msgid "Focus new tabs" msgid "Focus new tabs"
msgstr "" msgstr ""
#: ../src/surfer.c:1600 #: ../src/surfer.c:1615
msgid "Downloads"
msgstr ""
#: ../src/surfer.c:1618
msgid "Default download directory:"
msgstr ""
#: ../src/surfer.c:1622
msgid "Choose the default download directory"
msgstr ""
#: ../src/surfer.c:1629
msgid "General" msgid "General"
msgstr "" msgstr ""
#: ../src/surfer.c:1604 #: ../src/surfer.c:1633
msgid "Connectivity:"
msgstr ""
#: ../src/surfer.c:1636
msgid "Direct connection" msgid "Direct connection"
msgstr "" msgstr ""
#: ../src/surfer.c:1608 #: ../src/surfer.c:1640
msgid "HTTP proxy:" msgid "HTTP proxy:"
msgstr "" msgstr ""
#: ../src/surfer.c:1615 #: ../src/surfer.c:1647
msgid "Hostname:" msgid "Hostname:"
msgstr "" msgstr ""
#: ../src/surfer.c:1619 #: ../src/surfer.c:1651
msgid "Port:" msgid "Port:"
msgstr "" msgstr ""
#: ../src/surfer.c:1627 #: ../src/surfer.c:1661
msgid "Network" msgid "Network"
msgstr "" msgstr ""
#: ../src/surfer.c:1727 #: ../src/surfer.c:1766
msgid "This connection is encrypted and trusted." msgid "This connection is encrypted and trusted."
msgstr "" msgstr ""
#: ../src/surfer.c:1730 #: ../src/surfer.c:1769
msgid "This connection is encrypted but not trusted." msgid "This connection is encrypted but not trusted."
msgstr "" msgstr ""
#: ../src/surfer.c:1734 #: ../src/surfer.c:1773
msgid "This connection is not encrypted." msgid "This connection is not encrypted."
msgstr "" msgstr ""
#: ../src/surfer.c:1790 #: ../src/surfer.c:1829
msgid "Web surfer - Source of " msgid "Web surfer - Source of "
msgstr "" msgstr ""
#: ../src/surfer.c:1832 ../src/surfer.c:1835 ../src/surfer.c:1890 #: ../src/surfer.c:1871 ../src/surfer.c:1874 ../src/surfer.c:1929
#: ../src/surfer.c:1895 #: ../src/surfer.c:1934
msgid "Warning" msgid "Warning"
msgstr "" msgstr ""
#: ../src/surfer.c:1894 #: ../src/surfer.c:1933
msgid "This file already exists. Overwrite?" msgid "This file already exists. Overwrite?"
msgstr "" msgstr ""

102
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: 2011-05-14 18:27+0200\n" "POT-Creation-Date: 2011-05-14 20:54+0200\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,8 +16,8 @@ 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:43 ../src/callbacks.c:53 ../src/surfer.c:814 #: ../src/callbacks.c:43 ../src/callbacks.c:53 ../src/surfer.c:820
#: ../src/surfer.c:817 ../src/surfer.c:1260 ../src/surfer.c:1265 #: ../src/surfer.c:823 ../src/surfer.c:1269 ../src/surfer.c:1274
msgid "Question" msgid "Question"
msgstr "Question" msgstr "Question"
@ -96,7 +96,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:325 ../src/download.c:330 ../src/download.c:719 #: ../src/download.c:325 ../src/download.c:330 ../src/download.c:719
#: ../src/surfer.c:962 ../src/surfer.c:965 #: ../src/surfer.c:971 ../src/surfer.c:974
msgid "Error" msgid "Error"
msgstr "Erreur" msgstr "Erreur"
@ -151,7 +151,7 @@ msgstr "Résolu"
msgid "Code " msgid "Code "
msgstr "Code " msgstr "Code "
#: ../src/download.c:693 ../src/ghtml-webkit.c:695 ../src/surfer.c:964 #: ../src/download.c:693 ../src/ghtml-webkit.c:695 ../src/surfer.c:973
msgid "Unknown error" msgid "Unknown error"
msgstr "Erreur inconnue" msgstr "Erreur inconnue"
@ -351,139 +351,161 @@ msgstr "Nouvel onglet"
msgid "New window" msgid "New window"
msgstr "Nouvelle fenêtre" msgstr "Nouvelle fenêtre"
#: ../src/surfer.c:310 ../src/surfer.c:661 #: ../src/surfer.c:311 ../src/surfer.c:663
msgid "Web surfer" msgid "Web surfer"
msgstr "Web surfer" msgstr "Web surfer"
#: ../src/surfer.c:358 #: ../src/surfer.c:359
msgid " Location: " msgid " Location: "
msgstr " Adresse: " msgstr " Adresse: "
#: ../src/surfer.c:395 ../src/surfer.c:1741 ../src/surfer.c:1746 #: ../src/surfer.c:396 ../src/surfer.c:1780 ../src/surfer.c:1785
msgid "Security information" msgid "Security information"
msgstr "Informations de sécurité" msgstr "Informations de sécurité"
#: ../src/surfer.c:631 #: ../src/surfer.c:633
msgid "Ready" msgid "Ready"
msgstr "Prêt" msgstr "Prêt"
#: ../src/surfer.c:674 ../src/surfer.c:1176 #: ../src/surfer.c:676 ../src/surfer.c:1185
msgid "Untitled" msgid "Untitled"
msgstr "Sans titre" msgstr "Sans titre"
#: ../src/surfer.c:915 ../src/surfer.c:1343 #: ../src/surfer.c:921 ../src/surfer.c:1352
msgid "Save file as..." msgid "Save file as..."
msgstr "Enregistrer sous..." msgstr "Enregistrer sous..."
#: ../src/surfer.c:993 #: ../src/surfer.c:1002
msgid "Find text" msgid "Find text"
msgstr "Chercher du texte" msgstr "Chercher du texte"
#: ../src/surfer.c:1005 #: ../src/surfer.c:1014
msgid "Text:" msgid "Text:"
msgstr "Texte: " msgstr "Texte: "
#: ../src/surfer.c:1013 #: ../src/surfer.c:1022
msgid "Case-sensitive" msgid "Case-sensitive"
msgstr "Sensible à la casse" msgstr "Sensible à la casse"
#: ../src/surfer.c:1017 #: ../src/surfer.c:1026
msgid "Search backwards" msgid "Search backwards"
msgstr "Inverser le sens de la recherche" msgstr "Inverser le sens de la recherche"
#: ../src/surfer.c:1020 #: ../src/surfer.c:1029
msgid "Wrap" msgid "Wrap"
msgstr "Chercher en boucle" msgstr "Chercher en boucle"
#: ../src/surfer.c:1049 #: ../src/surfer.c:1058
msgid "Text not found" msgid "Text not found"
msgstr "Texte non trouvé" msgstr "Texte non trouvé"
#: ../src/surfer.c:1137 #: ../src/surfer.c:1146
msgid "Open file..." msgid "Open file..."
msgstr "Ouvrir un fichier..." msgstr "Ouvrir un fichier..."
#: ../src/surfer.c:1166 #: ../src/surfer.c:1175
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:1404 #: ../src/surfer.c:1413
msgid "Javascript console" msgid "Javascript console"
msgstr "Console Javascript" msgstr "Console Javascript"
#: ../src/surfer.c:1409 #: ../src/surfer.c:1418
msgid "Command:" msgid "Command:"
msgstr "Commande :" msgstr "Commande :"
#: ../src/surfer.c:1428 #: ../src/surfer.c:1437
msgid "Message" msgid "Message"
msgstr "Message" msgstr "Message"
#: ../src/surfer.c:1433 #: ../src/surfer.c:1442
msgid "Source" msgid "Source"
msgstr "Source" msgstr "Source"
#: ../src/surfer.c:1438 #: ../src/surfer.c:1447
msgid "Line" msgid "Line"
msgstr "Ligne" msgstr "Ligne"
#: ../src/surfer.c:1568 #: ../src/surfer.c:1579
msgid "Web surfer preferences" msgid "Web surfer preferences"
msgstr "Préférences de Web surfer" msgstr "Préférences de Web surfer"
#: ../src/surfer.c:1588 #: ../src/surfer.c:1599
msgid "Homepage:" msgid "Homepage:"
msgstr "Page d'accueil :" msgstr "Page d'accueil :"
#: ../src/surfer.c:1596 #: ../src/surfer.c:1605
msgid "Tab handling"
msgstr ""
#: ../src/surfer.c:1610
msgid "Focus new tabs" msgid "Focus new tabs"
msgstr "Focaliser les nouveaux onglets" msgstr "Focaliser les nouveaux onglets"
#: ../src/surfer.c:1600 #: ../src/surfer.c:1615
#, fuzzy
msgid "Downloads"
msgstr "Téléchargement"
#: ../src/surfer.c:1618
msgid "Default download directory:"
msgstr ""
#: ../src/surfer.c:1622
msgid "Choose the default download directory"
msgstr ""
#: ../src/surfer.c:1629
msgid "General" msgid "General"
msgstr "Général" msgstr "Général"
#: ../src/surfer.c:1604 #: ../src/surfer.c:1633
#, fuzzy
msgid "Connectivity:"
msgstr "Connexion à "
#: ../src/surfer.c:1636
msgid "Direct connection" msgid "Direct connection"
msgstr "Connexion directe" msgstr "Connexion directe"
#: ../src/surfer.c:1608 #: ../src/surfer.c:1640
msgid "HTTP proxy:" msgid "HTTP proxy:"
msgstr "Proxy HTTP :" msgstr "Proxy HTTP :"
#: ../src/surfer.c:1615 #: ../src/surfer.c:1647
msgid "Hostname:" msgid "Hostname:"
msgstr "Hôte :" msgstr "Hôte :"
#: ../src/surfer.c:1619 #: ../src/surfer.c:1651
msgid "Port:" msgid "Port:"
msgstr "Port :" msgstr "Port :"
#: ../src/surfer.c:1627 #: ../src/surfer.c:1661
msgid "Network" msgid "Network"
msgstr "Réseau" msgstr "Réseau"
#: ../src/surfer.c:1727 #: ../src/surfer.c:1766
msgid "This connection is encrypted and trusted." msgid "This connection is encrypted and trusted."
msgstr "Cette connexion est chiffrée et de confiance." msgstr "Cette connexion est chiffrée et de confiance."
#: ../src/surfer.c:1730 #: ../src/surfer.c:1769
msgid "This connection is encrypted but not trusted." msgid "This connection is encrypted but not trusted."
msgstr "Cette connexion est chiffrée mais pas de confiance." msgstr "Cette connexion est chiffrée mais pas de confiance."
#: ../src/surfer.c:1734 #: ../src/surfer.c:1773
msgid "This connection is not encrypted." msgid "This connection is not encrypted."
msgstr "Cette connexion n'est pas chiffrée." msgstr "Cette connexion n'est pas chiffrée."
#: ../src/surfer.c:1790 #: ../src/surfer.c:1829
msgid "Web surfer - Source of " msgid "Web surfer - Source of "
msgstr "Web surfer - Source de " msgstr "Web surfer - Source de "
#: ../src/surfer.c:1832 ../src/surfer.c:1835 ../src/surfer.c:1890 #: ../src/surfer.c:1871 ../src/surfer.c:1874 ../src/surfer.c:1929
#: ../src/surfer.c:1895 #: ../src/surfer.c:1934
msgid "Warning" msgid "Warning"
msgstr "Avertissement" msgstr "Avertissement"
#: ../src/surfer.c:1894 #: ../src/surfer.c:1933
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 ?"

100
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: 2011-05-14 18:27+0200\n" "POT-Creation-Date: 2011-05-14 20:54+0200\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,8 +16,8 @@ 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:43 ../src/callbacks.c:53 ../src/surfer.c:814 #: ../src/callbacks.c:43 ../src/callbacks.c:53 ../src/surfer.c:820
#: ../src/surfer.c:817 ../src/surfer.c:1260 ../src/surfer.c:1265 #: ../src/surfer.c:823 ../src/surfer.c:1269 ../src/surfer.c:1274
msgid "Question" msgid "Question"
msgstr "" msgstr ""
@ -94,7 +94,7 @@ msgid "Close window when the download is complete"
msgstr "" msgstr ""
#: ../src/download.c:325 ../src/download.c:330 ../src/download.c:719 #: ../src/download.c:325 ../src/download.c:330 ../src/download.c:719
#: ../src/surfer.c:962 ../src/surfer.c:965 #: ../src/surfer.c:971 ../src/surfer.c:974
msgid "Error" msgid "Error"
msgstr "" msgstr ""
@ -149,7 +149,7 @@ msgstr ""
msgid "Code " msgid "Code "
msgstr "" msgstr ""
#: ../src/download.c:693 ../src/ghtml-webkit.c:695 ../src/surfer.c:964 #: ../src/download.c:693 ../src/ghtml-webkit.c:695 ../src/surfer.c:973
msgid "Unknown error" msgid "Unknown error"
msgstr "" msgstr ""
@ -345,139 +345,159 @@ msgstr ""
msgid "New window" msgid "New window"
msgstr "" msgstr ""
#: ../src/surfer.c:310 ../src/surfer.c:661 #: ../src/surfer.c:311 ../src/surfer.c:663
msgid "Web surfer" msgid "Web surfer"
msgstr "" msgstr ""
#: ../src/surfer.c:358 #: ../src/surfer.c:359
msgid " Location: " msgid " Location: "
msgstr "" msgstr ""
#: ../src/surfer.c:395 ../src/surfer.c:1741 ../src/surfer.c:1746 #: ../src/surfer.c:396 ../src/surfer.c:1780 ../src/surfer.c:1785
msgid "Security information" msgid "Security information"
msgstr "" msgstr ""
#: ../src/surfer.c:631 #: ../src/surfer.c:633
msgid "Ready" msgid "Ready"
msgstr "" msgstr ""
#: ../src/surfer.c:674 ../src/surfer.c:1176 #: ../src/surfer.c:676 ../src/surfer.c:1185
msgid "Untitled" msgid "Untitled"
msgstr "" msgstr ""
#: ../src/surfer.c:915 ../src/surfer.c:1343 #: ../src/surfer.c:921 ../src/surfer.c:1352
msgid "Save file as..." msgid "Save file as..."
msgstr "" msgstr ""
#: ../src/surfer.c:993 #: ../src/surfer.c:1002
msgid "Find text" msgid "Find text"
msgstr "" msgstr ""
#: ../src/surfer.c:1005 #: ../src/surfer.c:1014
msgid "Text:" msgid "Text:"
msgstr "" msgstr ""
#: ../src/surfer.c:1013 #: ../src/surfer.c:1022
msgid "Case-sensitive" msgid "Case-sensitive"
msgstr "" msgstr ""
#: ../src/surfer.c:1017 #: ../src/surfer.c:1026
msgid "Search backwards" msgid "Search backwards"
msgstr "" msgstr ""
#: ../src/surfer.c:1020 #: ../src/surfer.c:1029
msgid "Wrap" msgid "Wrap"
msgstr "" msgstr ""
#: ../src/surfer.c:1049 #: ../src/surfer.c:1058
msgid "Text not found" msgid "Text not found"
msgstr "" msgstr ""
#: ../src/surfer.c:1137 #: ../src/surfer.c:1146
msgid "Open file..." msgid "Open file..."
msgstr "" msgstr ""
#: ../src/surfer.c:1166 #: ../src/surfer.c:1175
msgid "Could not initialize HTML renderer" msgid "Could not initialize HTML renderer"
msgstr "" msgstr ""
#: ../src/surfer.c:1404 #: ../src/surfer.c:1413
msgid "Javascript console" msgid "Javascript console"
msgstr "" msgstr ""
#: ../src/surfer.c:1409 #: ../src/surfer.c:1418
msgid "Command:" msgid "Command:"
msgstr "" msgstr ""
#: ../src/surfer.c:1428 #: ../src/surfer.c:1437
msgid "Message" msgid "Message"
msgstr "" msgstr ""
#: ../src/surfer.c:1433 #: ../src/surfer.c:1442
msgid "Source" msgid "Source"
msgstr "" msgstr ""
#: ../src/surfer.c:1438 #: ../src/surfer.c:1447
msgid "Line" msgid "Line"
msgstr "" msgstr ""
#: ../src/surfer.c:1568 #: ../src/surfer.c:1579
msgid "Web surfer preferences" msgid "Web surfer preferences"
msgstr "" msgstr ""
#: ../src/surfer.c:1588 #: ../src/surfer.c:1599
msgid "Homepage:" msgid "Homepage:"
msgstr "" msgstr ""
#: ../src/surfer.c:1596 #: ../src/surfer.c:1605
msgid "Tab handling"
msgstr ""
#: ../src/surfer.c:1610
msgid "Focus new tabs" msgid "Focus new tabs"
msgstr "" msgstr ""
#: ../src/surfer.c:1600 #: ../src/surfer.c:1615
msgid "Downloads"
msgstr ""
#: ../src/surfer.c:1618
msgid "Default download directory:"
msgstr ""
#: ../src/surfer.c:1622
msgid "Choose the default download directory"
msgstr ""
#: ../src/surfer.c:1629
msgid "General" msgid "General"
msgstr "" msgstr ""
#: ../src/surfer.c:1604 #: ../src/surfer.c:1633
msgid "Connectivity:"
msgstr ""
#: ../src/surfer.c:1636
msgid "Direct connection" msgid "Direct connection"
msgstr "" msgstr ""
#: ../src/surfer.c:1608 #: ../src/surfer.c:1640
msgid "HTTP proxy:" msgid "HTTP proxy:"
msgstr "" msgstr ""
#: ../src/surfer.c:1615 #: ../src/surfer.c:1647
msgid "Hostname:" msgid "Hostname:"
msgstr "" msgstr ""
#: ../src/surfer.c:1619 #: ../src/surfer.c:1651
msgid "Port:" msgid "Port:"
msgstr "" msgstr ""
#: ../src/surfer.c:1627 #: ../src/surfer.c:1661
msgid "Network" msgid "Network"
msgstr "" msgstr ""
#: ../src/surfer.c:1727 #: ../src/surfer.c:1766
msgid "This connection is encrypted and trusted." msgid "This connection is encrypted and trusted."
msgstr "" msgstr ""
#: ../src/surfer.c:1730 #: ../src/surfer.c:1769
msgid "This connection is encrypted but not trusted." msgid "This connection is encrypted but not trusted."
msgstr "" msgstr ""
#: ../src/surfer.c:1734 #: ../src/surfer.c:1773
msgid "This connection is not encrypted." msgid "This connection is not encrypted."
msgstr "" msgstr ""
#: ../src/surfer.c:1790 #: ../src/surfer.c:1829
msgid "Web surfer - Source of " msgid "Web surfer - Source of "
msgstr "" msgstr ""
#: ../src/surfer.c:1832 ../src/surfer.c:1835 ../src/surfer.c:1890 #: ../src/surfer.c:1871 ../src/surfer.c:1874 ../src/surfer.c:1929
#: ../src/surfer.c:1895 #: ../src/surfer.c:1934
msgid "Warning" msgid "Warning"
msgstr "" msgstr ""
#: ../src/surfer.c:1894 #: ../src/surfer.c:1933
msgid "This file already exists. Overwrite?" msgid "This file already exists. Overwrite?"
msgstr "" msgstr ""

2
src/common.h
View File

@ -30,6 +30,7 @@ struct _Surfer
/* preferences */ /* preferences */
char * homepage; char * homepage;
char * download_dir;
SurferProxyType proxy_type; SurferProxyType proxy_type;
char * proxy_http; char * proxy_http;
unsigned int proxy_http_port; unsigned int proxy_http_port;
@ -59,6 +60,7 @@ struct _Surfer
GtkWidget * pr_window; GtkWidget * pr_window;
GtkWidget * pr_homepage; GtkWidget * pr_homepage;
GtkWidget * pr_focus_tabs; GtkWidget * pr_focus_tabs;
GtkWidget * pr_download_dir;
GtkWidget * pr_proxy_radio_direct; GtkWidget * pr_proxy_radio_direct;
GtkWidget * pr_proxy_radio_http; GtkWidget * pr_proxy_radio_http;
GtkWidget * pr_proxy_http; GtkWidget * pr_proxy_http;

71
src/surfer.c
View File

@ -235,7 +235,7 @@ static DesktopToolbar _surfer_toolbar[] =
static gboolean _surfer_filename_confirm(Surfer * surfer, static gboolean _surfer_filename_confirm(Surfer * surfer,
char const * filename); char const * filename);
static char * _config_get_filename(void); static char * _config_get_filename(char const * filename);
static int _config_load_integer(Config * config, char const * section, static int _config_load_integer(Config * config, char const * section,
char const * variable, unsigned int * value); 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,
@ -289,6 +289,7 @@ 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->download_dir = NULL;
surfer->proxy_type = SPT_NONE; surfer->proxy_type = SPT_NONE;
surfer->proxy_http = NULL; surfer->proxy_http = NULL;
surfer->proxy_http_port = 0; surfer->proxy_http_port = 0;
@ -461,6 +462,7 @@ void surfer_delete(Surfer * surfer)
gtk_widget_destroy(surfer->window); gtk_widget_destroy(surfer->window);
config_delete(surfer->config); config_delete(surfer->config);
free(surfer->proxy_http); free(surfer->proxy_http);
free(surfer->download_dir);
free(surfer->homepage); free(surfer->homepage);
free(surfer); free(surfer);
if(--_surfer_cnt == 0) if(--_surfer_cnt == 0)
@ -747,12 +749,14 @@ int surfer_config_load(Surfer * surfer)
char buf[256]; char buf[256];
unsigned int port; unsigned int port;
if((filename = _config_get_filename()) == NULL) if((filename = _config_get_filename(SURFER_CONFIG_FILE)) == NULL)
return 1; return 1;
config_load(surfer->config, filename); /* XXX ignore errors */ config_load(surfer->config, filename); /* XXX ignore errors */
free(filename); free(filename);
_config_load_string(surfer->config, NULL, "homepage", _config_load_string(surfer->config, NULL, "homepage",
&surfer->homepage); &surfer->homepage);
_config_load_string(surfer->config, NULL, "download_directory",
&surfer->download_dir);
if((p = getenv("http_proxy")) != NULL && sscanf(p, "http://%255[^:]:%u", if((p = getenv("http_proxy")) != NULL && sscanf(p, "http://%255[^:]:%u",
buf, &port) == 2) buf, &port) == 2)
{ {
@ -780,10 +784,12 @@ int surfer_config_save(Surfer * surfer)
int ret = 0; int ret = 0;
char * filename; char * filename;
if((filename = _config_get_filename()) == NULL) if((filename = _config_get_filename(SURFER_CONFIG_FILE)) == NULL)
return 1; return 1;
ret |= _config_save_string(surfer->config, NULL, "homepage", ret |= _config_save_string(surfer->config, NULL, "homepage",
surfer->homepage); surfer->homepage);
ret |= _config_save_string(surfer->config, NULL, "download_directory",
surfer->download_dir);
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)));
@ -917,6 +923,9 @@ int surfer_download(Surfer * surfer, char const * url, char const * suggested)
GTK_FILE_CHOOSER_ACTION_SAVE, GTK_STOCK_CANCEL, GTK_FILE_CHOOSER_ACTION_SAVE, GTK_STOCK_CANCEL,
GTK_RESPONSE_CANCEL, GTK_STOCK_SAVE, GTK_RESPONSE_CANCEL, GTK_STOCK_SAVE,
GTK_RESPONSE_ACCEPT, NULL); GTK_RESPONSE_ACCEPT, NULL);
if(surfer->download_dir != NULL)
gtk_file_chooser_set_current_folder(GTK_FILE_CHOOSER(dialog),
surfer->download_dir);
if(suggested != NULL) /* XXX also suggest a name otherwise */ if(suggested != NULL) /* XXX also suggest a name otherwise */
gtk_file_chooser_set_current_name(GTK_FILE_CHOOSER(dialog), gtk_file_chooser_set_current_name(GTK_FILE_CHOOSER(dialog),
suggested); suggested);
@ -1100,7 +1109,7 @@ void surfer_go_home(Surfer * surfer)
char const * homepage; char const * homepage;
if((homepage = config_get(surfer->config, NULL, "homepage")) == NULL) if((homepage = config_get(surfer->config, NULL, "homepage")) == NULL)
homepage = SURFER_DEFAULT_HOME; return;
surfer_open(surfer, homepage); surfer_open(surfer, homepage);
} }
@ -1557,6 +1566,8 @@ void surfer_view_preferences(Surfer * surfer)
GtkWidget * widget; GtkWidget * widget;
GtkWidget * notebook; GtkWidget * notebook;
GtkWidget * page; GtkWidget * page;
GtkWidget * frame;
GtkWidget * vbox2;
GtkWidget * hbox; GtkWidget * hbox;
if(surfer->pr_window != NULL) if(surfer->pr_window != NULL)
@ -1590,26 +1601,47 @@ void surfer_view_preferences(Surfer * surfer)
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, FALSE, TRUE, 0); gtk_box_pack_start(GTK_BOX(page), hbox, FALSE, TRUE, 0);
/* tabs */
frame = gtk_frame_new(_("Tab handling"));
/* focus new tabs */ /* focus new tabs */
hbox = gtk_hbox_new(FALSE, 4); hbox = gtk_hbox_new(FALSE, 4);
gtk_container_set_border_width(GTK_CONTAINER(hbox), 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, FALSE, TRUE, 0); gtk_container_add(GTK_CONTAINER(frame), hbox);
gtk_box_pack_start(GTK_BOX(page), frame, FALSE, TRUE, 0);
/* downloads */
frame = gtk_frame_new(_("Downloads"));
hbox = gtk_vbox_new(FALSE, 4);
gtk_container_set_border_width(GTK_CONTAINER(hbox), 4);
widget = gtk_label_new(_("Default download directory:"));
gtk_misc_set_alignment(GTK_MISC(widget), 0.0, 0.5);
gtk_box_pack_start(GTK_BOX(hbox), widget, TRUE, TRUE, 0);
surfer->pr_download_dir = gtk_file_chooser_button_new(
_("Choose the default download directory"),
GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER);
gtk_box_pack_start(GTK_BOX(hbox), surfer->pr_download_dir, TRUE, TRUE,
0);
gtk_container_add(GTK_CONTAINER(frame), hbox);
gtk_box_pack_start(GTK_BOX(page), frame, 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);
frame = gtk_frame_new(_("Connectivity:"));
vbox2 = gtk_vbox_new(FALSE, 4);
gtk_container_set_border_width(GTK_CONTAINER(vbox2), 4);
widget = gtk_radio_button_new_with_label(NULL, _("Direct connection")); widget = gtk_radio_button_new_with_label(NULL, _("Direct connection"));
surfer->pr_proxy_radio_direct = widget; surfer->pr_proxy_radio_direct = widget;
gtk_box_pack_start(GTK_BOX(page), widget, FALSE, TRUE, 0); gtk_box_pack_start(GTK_BOX(vbox2), widget, FALSE, TRUE, 0);
widget = gtk_radio_button_new_with_label_from_widget(GTK_RADIO_BUTTON( widget = gtk_radio_button_new_with_label_from_widget(GTK_RADIO_BUTTON(
widget), _("HTTP proxy:")); widget), _("HTTP proxy:"));
surfer->pr_proxy_radio_http = widget; surfer->pr_proxy_radio_http = widget;
g_signal_connect_swapped(G_OBJECT(widget), "toggled", G_CALLBACK( g_signal_connect_swapped(G_OBJECT(widget), "toggled", G_CALLBACK(
_preferences_on_proxy_http_toggled), surfer); _preferences_on_proxy_http_toggled), surfer);
gtk_box_pack_start(GTK_BOX(page), widget, FALSE, TRUE, 0); gtk_box_pack_start(GTK_BOX(vbox2), widget, FALSE, TRUE, 0);
/* http proxy */ /* http proxy */
hbox = gtk_hbox_new(FALSE, 4); hbox = gtk_hbox_new(FALSE, 4);
widget = gtk_label_new(_("Hostname:")); widget = gtk_label_new(_("Hostname:"));
@ -1622,7 +1654,9 @@ void surfer_view_preferences(Surfer * surfer)
1.0); 1.0);
gtk_box_pack_start(GTK_BOX(hbox), surfer->pr_proxy_http_port, FALSE, gtk_box_pack_start(GTK_BOX(hbox), surfer->pr_proxy_http_port, FALSE,
TRUE, 0); TRUE, 0);
gtk_box_pack_start(GTK_BOX(page), hbox, FALSE, TRUE, 0); gtk_box_pack_start(GTK_BOX(vbox2), hbox, FALSE, TRUE, 0);
gtk_container_add(GTK_CONTAINER(frame), vbox2);
gtk_box_pack_start(GTK_BOX(page), frame, 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);
@ -1634,8 +1668,8 @@ static void _preferences_set(Surfer * surfer)
{ {
char const * p; char const * p;
gtk_entry_set_text(GTK_ENTRY(surfer->pr_homepage), surfer->homepage gtk_entry_set_text(GTK_ENTRY(surfer->pr_homepage),
!= NULL ? surfer->homepage : ""); (surfer->homepage != NULL) ? surfer->homepage : "");
if((p = config_get(surfer->config, "", "focus_new_tabs")) != NULL if((p = config_get(surfer->config, "", "focus_new_tabs")) != NULL
&& strcmp(p, "1") == 0) && strcmp(p, "1") == 0)
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON( gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(
@ -1643,6 +1677,11 @@ 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);
if(surfer->download_dir == NULL)
surfer->download_dir = _config_get_filename("Downloads");
gtk_file_chooser_set_filename(GTK_FILE_CHOOSER(surfer->pr_download_dir),
(surfer->download_dir != NULL) ? surfer->download_dir
: g_get_home_dir());
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON( gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(
surfer->pr_proxy_radio_http), surfer->pr_proxy_radio_http),
surfer->proxy_type == SPT_HTTP); surfer->proxy_type == SPT_HTTP);
@ -1902,19 +1941,19 @@ static gboolean _surfer_filename_confirm(Surfer * surfer,
/* config_get_filename */ /* config_get_filename */
static char * _config_get_filename(void) static char * _config_get_filename(char const * filename)
{ {
char * ret;
char const * homedir; char const * homedir;
size_t len; size_t len;
char * filename;
if((homedir = getenv("HOME")) == NULL) if((homedir = getenv("HOME")) == NULL)
homedir = g_get_home_dir(); homedir = g_get_home_dir();
len = strlen(homedir) + 1 + sizeof(SURFER_CONFIG_FILE); len = strlen(homedir) + 1 + strlen(filename) + 1;
if((filename = malloc(len)) == NULL) if((ret = malloc(len)) == NULL)
return NULL; return NULL;
snprintf(filename, len, "%s/%s", homedir, SURFER_CONFIG_FILE); snprintf(ret, len, "%s/%s", homedir, filename);
return filename; return ret;
} }

1
src/surfer.h
View File

@ -30,7 +30,6 @@
# define SURFER_DEFAULT_FONT_SIZE 12.0 # define SURFER_DEFAULT_FONT_SIZE 12.0
# define SURFER_DEFAULT_FIXED_FONT_SIZE 12.0 # define SURFER_DEFAULT_FIXED_FONT_SIZE 12.0
# define SURFER_DEFAULT_ENCODING "ISO-8859-1" # define SURFER_DEFAULT_ENCODING "ISO-8859-1"
# define SURFER_DEFAULT_HOME "http://www.defora.org/"
# define SURFER_DEFAULT_SERIF_FONT "Serif" # define SURFER_DEFAULT_SERIF_FONT "Serif"
# define SURFER_DEFAULT_SANS_FONT "Sans" # define SURFER_DEFAULT_SANS_FONT "Sans"
# define SURFER_DEFAULT_STANDARD_FONT SURFER_DEFAULT_SANS_FONT # define SURFER_DEFAULT_STANDARD_FONT SURFER_DEFAULT_SANS_FONT