From bb108fcf3308b41630ef2b90d9a27e33869bc0ce Mon Sep 17 00:00:00 2001 From: Pierre Pronchery Date: Sat, 14 May 2011 18:59:54 +0000 Subject: [PATCH] Implemented a way to specify a default folder for downloads --- po/de.po | 100 ++++++++++++++++++++++++++++++-------------------- po/es.po | 100 ++++++++++++++++++++++++++++++-------------------- po/fr.po | 102 +++++++++++++++++++++++++++++++-------------------- po/it.po | 100 ++++++++++++++++++++++++++++++-------------------- src/common.h | 2 + src/surfer.c | 71 +++++++++++++++++++++++++++-------- src/surfer.h | 1 - 7 files changed, 299 insertions(+), 177 deletions(-) diff --git a/po/de.po b/po/de.po index 4b63261..67819d6 100644 --- a/po/de.po +++ b/po/de.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Surfer 0.1.0\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" "Last-Translator: Pierre Pronchery \n" "Language-Team: German\n" @@ -16,8 +16,8 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: ../src/callbacks.c:43 ../src/callbacks.c:53 ../src/surfer.c:814 -#: ../src/surfer.c:817 ../src/surfer.c:1260 ../src/surfer.c:1265 +#: ../src/callbacks.c:43 ../src/callbacks.c:53 ../src/surfer.c:820 +#: ../src/surfer.c:823 ../src/surfer.c:1269 ../src/surfer.c:1274 msgid "Question" msgstr "" @@ -94,7 +94,7 @@ msgid "Close window when the download is complete" msgstr "" #: ../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" msgstr "Fehler" @@ -149,7 +149,7 @@ msgstr "" msgid "Code " 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" msgstr "" @@ -345,139 +345,159 @@ msgstr "" msgid "New window" msgstr "" -#: ../src/surfer.c:310 ../src/surfer.c:661 +#: ../src/surfer.c:311 ../src/surfer.c:663 msgid "Web surfer" msgstr "Web surfer" -#: ../src/surfer.c:358 +#: ../src/surfer.c:359 msgid " Location: " 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" msgstr "" -#: ../src/surfer.c:631 +#: ../src/surfer.c:633 msgid "Ready" msgstr "" -#: ../src/surfer.c:674 ../src/surfer.c:1176 +#: ../src/surfer.c:676 ../src/surfer.c:1185 msgid "Untitled" msgstr "" -#: ../src/surfer.c:915 ../src/surfer.c:1343 +#: ../src/surfer.c:921 ../src/surfer.c:1352 msgid "Save file as..." msgstr "" -#: ../src/surfer.c:993 +#: ../src/surfer.c:1002 msgid "Find text" msgstr "Suchen" -#: ../src/surfer.c:1005 +#: ../src/surfer.c:1014 msgid "Text:" msgstr "" -#: ../src/surfer.c:1013 +#: ../src/surfer.c:1022 msgid "Case-sensitive" msgstr "" -#: ../src/surfer.c:1017 +#: ../src/surfer.c:1026 msgid "Search backwards" msgstr "" -#: ../src/surfer.c:1020 +#: ../src/surfer.c:1029 msgid "Wrap" msgstr "" -#: ../src/surfer.c:1049 +#: ../src/surfer.c:1058 msgid "Text not found" msgstr "" -#: ../src/surfer.c:1137 +#: ../src/surfer.c:1146 msgid "Open file..." msgstr "" -#: ../src/surfer.c:1166 +#: ../src/surfer.c:1175 msgid "Could not initialize HTML renderer" msgstr "" -#: ../src/surfer.c:1404 +#: ../src/surfer.c:1413 msgid "Javascript console" msgstr "" -#: ../src/surfer.c:1409 +#: ../src/surfer.c:1418 msgid "Command:" msgstr "" -#: ../src/surfer.c:1428 +#: ../src/surfer.c:1437 msgid "Message" msgstr "" -#: ../src/surfer.c:1433 +#: ../src/surfer.c:1442 msgid "Source" msgstr "" -#: ../src/surfer.c:1438 +#: ../src/surfer.c:1447 msgid "Line" msgstr "Linie" -#: ../src/surfer.c:1568 +#: ../src/surfer.c:1579 msgid "Web surfer preferences" msgstr "Web surfer Einstellungen" -#: ../src/surfer.c:1588 +#: ../src/surfer.c:1599 msgid "Homepage:" msgstr "" -#: ../src/surfer.c:1596 +#: ../src/surfer.c:1605 +msgid "Tab handling" +msgstr "" + +#: ../src/surfer.c:1610 msgid "Focus new tabs" 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" msgstr "" -#: ../src/surfer.c:1604 +#: ../src/surfer.c:1633 +msgid "Connectivity:" +msgstr "" + +#: ../src/surfer.c:1636 msgid "Direct connection" msgstr "" -#: ../src/surfer.c:1608 +#: ../src/surfer.c:1640 msgid "HTTP proxy:" msgstr "" -#: ../src/surfer.c:1615 +#: ../src/surfer.c:1647 msgid "Hostname:" msgstr "" -#: ../src/surfer.c:1619 +#: ../src/surfer.c:1651 msgid "Port:" msgstr "" -#: ../src/surfer.c:1627 +#: ../src/surfer.c:1661 msgid "Network" msgstr "" -#: ../src/surfer.c:1727 +#: ../src/surfer.c:1766 msgid "This connection is encrypted and trusted." msgstr "" -#: ../src/surfer.c:1730 +#: ../src/surfer.c:1769 msgid "This connection is encrypted but not trusted." msgstr "" -#: ../src/surfer.c:1734 +#: ../src/surfer.c:1773 msgid "This connection is not encrypted." msgstr "" -#: ../src/surfer.c:1790 +#: ../src/surfer.c:1829 msgid "Web surfer - Source of " msgstr "" -#: ../src/surfer.c:1832 ../src/surfer.c:1835 ../src/surfer.c:1890 -#: ../src/surfer.c:1895 +#: ../src/surfer.c:1871 ../src/surfer.c:1874 ../src/surfer.c:1929 +#: ../src/surfer.c:1934 msgid "Warning" msgstr "Achtung" -#: ../src/surfer.c:1894 +#: ../src/surfer.c:1933 msgid "This file already exists. Overwrite?" msgstr "" diff --git a/po/es.po b/po/es.po index 97ae93b..cffbffb 100644 --- a/po/es.po +++ b/po/es.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Surfer 0.1.0\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" "Last-Translator: Pierre Pronchery \n" "Language-Team: Spanish\n" @@ -16,8 +16,8 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: ../src/callbacks.c:43 ../src/callbacks.c:53 ../src/surfer.c:814 -#: ../src/surfer.c:817 ../src/surfer.c:1260 ../src/surfer.c:1265 +#: ../src/callbacks.c:43 ../src/callbacks.c:53 ../src/surfer.c:820 +#: ../src/surfer.c:823 ../src/surfer.c:1269 ../src/surfer.c:1274 msgid "Question" msgstr "" @@ -94,7 +94,7 @@ msgid "Close window when the download is complete" msgstr "" #: ../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" msgstr "" @@ -149,7 +149,7 @@ msgstr "" msgid "Code " 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" msgstr "" @@ -345,139 +345,159 @@ msgstr "" msgid "New window" msgstr "" -#: ../src/surfer.c:310 ../src/surfer.c:661 +#: ../src/surfer.c:311 ../src/surfer.c:663 msgid "Web surfer" msgstr "Web surfer" -#: ../src/surfer.c:358 +#: ../src/surfer.c:359 msgid " Location: " 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" msgstr "" -#: ../src/surfer.c:631 +#: ../src/surfer.c:633 msgid "Ready" msgstr "" -#: ../src/surfer.c:674 ../src/surfer.c:1176 +#: ../src/surfer.c:676 ../src/surfer.c:1185 msgid "Untitled" msgstr "" -#: ../src/surfer.c:915 ../src/surfer.c:1343 +#: ../src/surfer.c:921 ../src/surfer.c:1352 msgid "Save file as..." msgstr "Guardar como..." -#: ../src/surfer.c:993 +#: ../src/surfer.c:1002 msgid "Find text" msgstr "Buscar" -#: ../src/surfer.c:1005 +#: ../src/surfer.c:1014 msgid "Text:" msgstr "" -#: ../src/surfer.c:1013 +#: ../src/surfer.c:1022 msgid "Case-sensitive" msgstr "" -#: ../src/surfer.c:1017 +#: ../src/surfer.c:1026 msgid "Search backwards" msgstr "" -#: ../src/surfer.c:1020 +#: ../src/surfer.c:1029 msgid "Wrap" msgstr "" -#: ../src/surfer.c:1049 +#: ../src/surfer.c:1058 msgid "Text not found" msgstr "" -#: ../src/surfer.c:1137 +#: ../src/surfer.c:1146 msgid "Open file..." msgstr "Abrir..." -#: ../src/surfer.c:1166 +#: ../src/surfer.c:1175 msgid "Could not initialize HTML renderer" msgstr "" -#: ../src/surfer.c:1404 +#: ../src/surfer.c:1413 msgid "Javascript console" msgstr "" -#: ../src/surfer.c:1409 +#: ../src/surfer.c:1418 msgid "Command:" msgstr "" -#: ../src/surfer.c:1428 +#: ../src/surfer.c:1437 msgid "Message" msgstr "" -#: ../src/surfer.c:1433 +#: ../src/surfer.c:1442 msgid "Source" msgstr "" -#: ../src/surfer.c:1438 +#: ../src/surfer.c:1447 msgid "Line" msgstr "" -#: ../src/surfer.c:1568 +#: ../src/surfer.c:1579 msgid "Web surfer preferences" msgstr "Web surfer preferencias" -#: ../src/surfer.c:1588 +#: ../src/surfer.c:1599 msgid "Homepage:" msgstr "" -#: ../src/surfer.c:1596 +#: ../src/surfer.c:1605 +msgid "Tab handling" +msgstr "" + +#: ../src/surfer.c:1610 msgid "Focus new tabs" 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" msgstr "" -#: ../src/surfer.c:1604 +#: ../src/surfer.c:1633 +msgid "Connectivity:" +msgstr "" + +#: ../src/surfer.c:1636 msgid "Direct connection" msgstr "" -#: ../src/surfer.c:1608 +#: ../src/surfer.c:1640 msgid "HTTP proxy:" msgstr "" -#: ../src/surfer.c:1615 +#: ../src/surfer.c:1647 msgid "Hostname:" msgstr "" -#: ../src/surfer.c:1619 +#: ../src/surfer.c:1651 msgid "Port:" msgstr "" -#: ../src/surfer.c:1627 +#: ../src/surfer.c:1661 msgid "Network" msgstr "" -#: ../src/surfer.c:1727 +#: ../src/surfer.c:1766 msgid "This connection is encrypted and trusted." msgstr "" -#: ../src/surfer.c:1730 +#: ../src/surfer.c:1769 msgid "This connection is encrypted but not trusted." msgstr "" -#: ../src/surfer.c:1734 +#: ../src/surfer.c:1773 msgid "This connection is not encrypted." msgstr "" -#: ../src/surfer.c:1790 +#: ../src/surfer.c:1829 msgid "Web surfer - Source of " msgstr "" -#: ../src/surfer.c:1832 ../src/surfer.c:1835 ../src/surfer.c:1890 -#: ../src/surfer.c:1895 +#: ../src/surfer.c:1871 ../src/surfer.c:1874 ../src/surfer.c:1929 +#: ../src/surfer.c:1934 msgid "Warning" msgstr "" -#: ../src/surfer.c:1894 +#: ../src/surfer.c:1933 msgid "This file already exists. Overwrite?" msgstr "" diff --git a/po/fr.po b/po/fr.po index 783a110..889d15f 100644 --- a/po/fr.po +++ b/po/fr.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Surfer 0.1.0\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" "Last-Translator: Calimero \n" "Language-Team: French\n" @@ -16,8 +16,8 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" -#: ../src/callbacks.c:43 ../src/callbacks.c:53 ../src/surfer.c:814 -#: ../src/surfer.c:817 ../src/surfer.c:1260 ../src/surfer.c:1265 +#: ../src/callbacks.c:43 ../src/callbacks.c:53 ../src/surfer.c:820 +#: ../src/surfer.c:823 ../src/surfer.c:1269 ../src/surfer.c:1274 msgid "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" #: ../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" msgstr "Erreur" @@ -151,7 +151,7 @@ msgstr "Résolu" msgid "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" msgstr "Erreur inconnue" @@ -351,139 +351,161 @@ msgstr "Nouvel onglet" msgid "New window" msgstr "Nouvelle fenêtre" -#: ../src/surfer.c:310 ../src/surfer.c:661 +#: ../src/surfer.c:311 ../src/surfer.c:663 msgid "Web surfer" msgstr "Web surfer" -#: ../src/surfer.c:358 +#: ../src/surfer.c:359 msgid " Location: " 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" msgstr "Informations de sécurité" -#: ../src/surfer.c:631 +#: ../src/surfer.c:633 msgid "Ready" msgstr "Prêt" -#: ../src/surfer.c:674 ../src/surfer.c:1176 +#: ../src/surfer.c:676 ../src/surfer.c:1185 msgid "Untitled" msgstr "Sans titre" -#: ../src/surfer.c:915 ../src/surfer.c:1343 +#: ../src/surfer.c:921 ../src/surfer.c:1352 msgid "Save file as..." msgstr "Enregistrer sous..." -#: ../src/surfer.c:993 +#: ../src/surfer.c:1002 msgid "Find text" msgstr "Chercher du texte" -#: ../src/surfer.c:1005 +#: ../src/surfer.c:1014 msgid "Text:" msgstr "Texte: " -#: ../src/surfer.c:1013 +#: ../src/surfer.c:1022 msgid "Case-sensitive" msgstr "Sensible à la casse" -#: ../src/surfer.c:1017 +#: ../src/surfer.c:1026 msgid "Search backwards" msgstr "Inverser le sens de la recherche" -#: ../src/surfer.c:1020 +#: ../src/surfer.c:1029 msgid "Wrap" msgstr "Chercher en boucle" -#: ../src/surfer.c:1049 +#: ../src/surfer.c:1058 msgid "Text not found" msgstr "Texte non trouvé" -#: ../src/surfer.c:1137 +#: ../src/surfer.c:1146 msgid "Open file..." msgstr "Ouvrir un fichier..." -#: ../src/surfer.c:1166 +#: ../src/surfer.c:1175 msgid "Could not initialize HTML renderer" msgstr "Ne peut charger le moteur de rendu HTML" -#: ../src/surfer.c:1404 +#: ../src/surfer.c:1413 msgid "Javascript console" msgstr "Console Javascript" -#: ../src/surfer.c:1409 +#: ../src/surfer.c:1418 msgid "Command:" msgstr "Commande :" -#: ../src/surfer.c:1428 +#: ../src/surfer.c:1437 msgid "Message" msgstr "Message" -#: ../src/surfer.c:1433 +#: ../src/surfer.c:1442 msgid "Source" msgstr "Source" -#: ../src/surfer.c:1438 +#: ../src/surfer.c:1447 msgid "Line" msgstr "Ligne" -#: ../src/surfer.c:1568 +#: ../src/surfer.c:1579 msgid "Web surfer preferences" msgstr "Préférences de Web surfer" -#: ../src/surfer.c:1588 +#: ../src/surfer.c:1599 msgid "Homepage:" msgstr "Page d'accueil :" -#: ../src/surfer.c:1596 +#: ../src/surfer.c:1605 +msgid "Tab handling" +msgstr "" + +#: ../src/surfer.c:1610 msgid "Focus new tabs" 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" msgstr "Général" -#: ../src/surfer.c:1604 +#: ../src/surfer.c:1633 +#, fuzzy +msgid "Connectivity:" +msgstr "Connexion à " + +#: ../src/surfer.c:1636 msgid "Direct connection" msgstr "Connexion directe" -#: ../src/surfer.c:1608 +#: ../src/surfer.c:1640 msgid "HTTP proxy:" msgstr "Proxy HTTP :" -#: ../src/surfer.c:1615 +#: ../src/surfer.c:1647 msgid "Hostname:" msgstr "Hôte :" -#: ../src/surfer.c:1619 +#: ../src/surfer.c:1651 msgid "Port:" msgstr "Port :" -#: ../src/surfer.c:1627 +#: ../src/surfer.c:1661 msgid "Network" msgstr "Réseau" -#: ../src/surfer.c:1727 +#: ../src/surfer.c:1766 msgid "This connection is encrypted and trusted." 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." msgstr "Cette connexion est chiffrée mais pas de confiance." -#: ../src/surfer.c:1734 +#: ../src/surfer.c:1773 msgid "This connection is not encrypted." msgstr "Cette connexion n'est pas chiffrée." -#: ../src/surfer.c:1790 +#: ../src/surfer.c:1829 msgid "Web surfer - Source of " msgstr "Web surfer - Source de " -#: ../src/surfer.c:1832 ../src/surfer.c:1835 ../src/surfer.c:1890 -#: ../src/surfer.c:1895 +#: ../src/surfer.c:1871 ../src/surfer.c:1874 ../src/surfer.c:1929 +#: ../src/surfer.c:1934 msgid "Warning" msgstr "Avertissement" -#: ../src/surfer.c:1894 +#: ../src/surfer.c:1933 msgid "This file already exists. Overwrite?" msgstr "Le fichier existe déjà. L'écraser ?" diff --git a/po/it.po b/po/it.po index 2f6b555..8f2b733 100644 --- a/po/it.po +++ b/po/it.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Surfer 0.1.0\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" "Last-Translator: Pierre Pronchery \n" "Language-Team: Italian\n" @@ -16,8 +16,8 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: ../src/callbacks.c:43 ../src/callbacks.c:53 ../src/surfer.c:814 -#: ../src/surfer.c:817 ../src/surfer.c:1260 ../src/surfer.c:1265 +#: ../src/callbacks.c:43 ../src/callbacks.c:53 ../src/surfer.c:820 +#: ../src/surfer.c:823 ../src/surfer.c:1269 ../src/surfer.c:1274 msgid "Question" msgstr "" @@ -94,7 +94,7 @@ msgid "Close window when the download is complete" msgstr "" #: ../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" msgstr "" @@ -149,7 +149,7 @@ msgstr "" msgid "Code " 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" msgstr "" @@ -345,139 +345,159 @@ msgstr "" msgid "New window" msgstr "" -#: ../src/surfer.c:310 ../src/surfer.c:661 +#: ../src/surfer.c:311 ../src/surfer.c:663 msgid "Web surfer" msgstr "" -#: ../src/surfer.c:358 +#: ../src/surfer.c:359 msgid " Location: " 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" msgstr "" -#: ../src/surfer.c:631 +#: ../src/surfer.c:633 msgid "Ready" msgstr "" -#: ../src/surfer.c:674 ../src/surfer.c:1176 +#: ../src/surfer.c:676 ../src/surfer.c:1185 msgid "Untitled" msgstr "" -#: ../src/surfer.c:915 ../src/surfer.c:1343 +#: ../src/surfer.c:921 ../src/surfer.c:1352 msgid "Save file as..." msgstr "" -#: ../src/surfer.c:993 +#: ../src/surfer.c:1002 msgid "Find text" msgstr "" -#: ../src/surfer.c:1005 +#: ../src/surfer.c:1014 msgid "Text:" msgstr "" -#: ../src/surfer.c:1013 +#: ../src/surfer.c:1022 msgid "Case-sensitive" msgstr "" -#: ../src/surfer.c:1017 +#: ../src/surfer.c:1026 msgid "Search backwards" msgstr "" -#: ../src/surfer.c:1020 +#: ../src/surfer.c:1029 msgid "Wrap" msgstr "" -#: ../src/surfer.c:1049 +#: ../src/surfer.c:1058 msgid "Text not found" msgstr "" -#: ../src/surfer.c:1137 +#: ../src/surfer.c:1146 msgid "Open file..." msgstr "" -#: ../src/surfer.c:1166 +#: ../src/surfer.c:1175 msgid "Could not initialize HTML renderer" msgstr "" -#: ../src/surfer.c:1404 +#: ../src/surfer.c:1413 msgid "Javascript console" msgstr "" -#: ../src/surfer.c:1409 +#: ../src/surfer.c:1418 msgid "Command:" msgstr "" -#: ../src/surfer.c:1428 +#: ../src/surfer.c:1437 msgid "Message" msgstr "" -#: ../src/surfer.c:1433 +#: ../src/surfer.c:1442 msgid "Source" msgstr "" -#: ../src/surfer.c:1438 +#: ../src/surfer.c:1447 msgid "Line" msgstr "" -#: ../src/surfer.c:1568 +#: ../src/surfer.c:1579 msgid "Web surfer preferences" msgstr "" -#: ../src/surfer.c:1588 +#: ../src/surfer.c:1599 msgid "Homepage:" msgstr "" -#: ../src/surfer.c:1596 +#: ../src/surfer.c:1605 +msgid "Tab handling" +msgstr "" + +#: ../src/surfer.c:1610 msgid "Focus new tabs" 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" msgstr "" -#: ../src/surfer.c:1604 +#: ../src/surfer.c:1633 +msgid "Connectivity:" +msgstr "" + +#: ../src/surfer.c:1636 msgid "Direct connection" msgstr "" -#: ../src/surfer.c:1608 +#: ../src/surfer.c:1640 msgid "HTTP proxy:" msgstr "" -#: ../src/surfer.c:1615 +#: ../src/surfer.c:1647 msgid "Hostname:" msgstr "" -#: ../src/surfer.c:1619 +#: ../src/surfer.c:1651 msgid "Port:" msgstr "" -#: ../src/surfer.c:1627 +#: ../src/surfer.c:1661 msgid "Network" msgstr "" -#: ../src/surfer.c:1727 +#: ../src/surfer.c:1766 msgid "This connection is encrypted and trusted." msgstr "" -#: ../src/surfer.c:1730 +#: ../src/surfer.c:1769 msgid "This connection is encrypted but not trusted." msgstr "" -#: ../src/surfer.c:1734 +#: ../src/surfer.c:1773 msgid "This connection is not encrypted." msgstr "" -#: ../src/surfer.c:1790 +#: ../src/surfer.c:1829 msgid "Web surfer - Source of " msgstr "" -#: ../src/surfer.c:1832 ../src/surfer.c:1835 ../src/surfer.c:1890 -#: ../src/surfer.c:1895 +#: ../src/surfer.c:1871 ../src/surfer.c:1874 ../src/surfer.c:1929 +#: ../src/surfer.c:1934 msgid "Warning" msgstr "" -#: ../src/surfer.c:1894 +#: ../src/surfer.c:1933 msgid "This file already exists. Overwrite?" msgstr "" diff --git a/src/common.h b/src/common.h index 169f600..acb0ed8 100644 --- a/src/common.h +++ b/src/common.h @@ -30,6 +30,7 @@ struct _Surfer /* preferences */ char * homepage; + char * download_dir; SurferProxyType proxy_type; char * proxy_http; unsigned int proxy_http_port; @@ -59,6 +60,7 @@ struct _Surfer GtkWidget * pr_window; GtkWidget * pr_homepage; GtkWidget * pr_focus_tabs; + GtkWidget * pr_download_dir; GtkWidget * pr_proxy_radio_direct; GtkWidget * pr_proxy_radio_http; GtkWidget * pr_proxy_http; diff --git a/src/surfer.c b/src/surfer.c index 141dd0a..53407e8 100644 --- a/src/surfer.c +++ b/src/surfer.c @@ -235,7 +235,7 @@ static DesktopToolbar _surfer_toolbar[] = static gboolean _surfer_filename_confirm(Surfer * surfer, 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, char const * variable, unsigned int * value); 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) return NULL; surfer->homepage = NULL; + surfer->download_dir = NULL; surfer->proxy_type = SPT_NONE; surfer->proxy_http = NULL; surfer->proxy_http_port = 0; @@ -461,6 +462,7 @@ void surfer_delete(Surfer * surfer) gtk_widget_destroy(surfer->window); config_delete(surfer->config); free(surfer->proxy_http); + free(surfer->download_dir); free(surfer->homepage); free(surfer); if(--_surfer_cnt == 0) @@ -747,12 +749,14 @@ int surfer_config_load(Surfer * surfer) char buf[256]; unsigned int port; - if((filename = _config_get_filename()) == NULL) + if((filename = _config_get_filename(SURFER_CONFIG_FILE)) == NULL) return 1; config_load(surfer->config, filename); /* XXX ignore errors */ free(filename); _config_load_string(surfer->config, NULL, "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", buf, &port) == 2) { @@ -780,10 +784,12 @@ int surfer_config_save(Surfer * surfer) int ret = 0; char * filename; - if((filename = _config_get_filename()) == NULL) + if((filename = _config_get_filename(SURFER_CONFIG_FILE)) == NULL) return 1; ret |= _config_save_string(surfer->config, NULL, "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", gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON( 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_RESPONSE_CANCEL, GTK_STOCK_SAVE, 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 */ gtk_file_chooser_set_current_name(GTK_FILE_CHOOSER(dialog), suggested); @@ -1100,7 +1109,7 @@ void surfer_go_home(Surfer * surfer) char const * homepage; if((homepage = config_get(surfer->config, NULL, "homepage")) == NULL) - homepage = SURFER_DEFAULT_HOME; + return; surfer_open(surfer, homepage); } @@ -1557,6 +1566,8 @@ void surfer_view_preferences(Surfer * surfer) GtkWidget * widget; GtkWidget * notebook; GtkWidget * page; + GtkWidget * frame; + GtkWidget * vbox2; GtkWidget * hbox; if(surfer->pr_window != NULL) @@ -1590,26 +1601,47 @@ void surfer_view_preferences(Surfer * surfer) 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(page), hbox, FALSE, TRUE, 0); + /* tabs */ + frame = gtk_frame_new(_("Tab handling")); /* focus new tabs */ 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( _("Focus new tabs")); 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_label_new(_("General"))); /* network tab */ page = gtk_vbox_new(FALSE, 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")); 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), _("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); + gtk_box_pack_start(GTK_BOX(vbox2), widget, FALSE, TRUE, 0); /* http proxy */ hbox = gtk_hbox_new(FALSE, 4); widget = gtk_label_new(_("Hostname:")); @@ -1622,7 +1654,9 @@ void surfer_view_preferences(Surfer * surfer) 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_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_label_new(_("Network"))); gtk_box_pack_start(GTK_BOX(vbox), notebook, TRUE, TRUE, 0); @@ -1634,8 +1668,8 @@ static void _preferences_set(Surfer * surfer) { char const * p; - gtk_entry_set_text(GTK_ENTRY(surfer->pr_homepage), surfer->homepage - != NULL ? surfer->homepage : ""); + gtk_entry_set_text(GTK_ENTRY(surfer->pr_homepage), + (surfer->homepage != NULL) ? surfer->homepage : ""); if((p = config_get(surfer->config, "", "focus_new_tabs")) != NULL && strcmp(p, "1") == 0) gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON( @@ -1643,6 +1677,11 @@ static void _preferences_set(Surfer * surfer) else gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON( 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( surfer->pr_proxy_radio_http), surfer->proxy_type == SPT_HTTP); @@ -1902,19 +1941,19 @@ static gboolean _surfer_filename_confirm(Surfer * surfer, /* config_get_filename */ -static char * _config_get_filename(void) +static char * _config_get_filename(char const * filename) { + char * ret; char const * homedir; size_t len; - char * filename; if((homedir = getenv("HOME")) == NULL) homedir = g_get_home_dir(); - len = strlen(homedir) + 1 + sizeof(SURFER_CONFIG_FILE); - if((filename = malloc(len)) == NULL) + len = strlen(homedir) + 1 + strlen(filename) + 1; + if((ret = malloc(len)) == NULL) return NULL; - snprintf(filename, len, "%s/%s", homedir, SURFER_CONFIG_FILE); - return filename; + snprintf(ret, len, "%s/%s", homedir, filename); + return ret; } diff --git a/src/surfer.h b/src/surfer.h index 8ac9300..880cd98 100644 --- a/src/surfer.h +++ b/src/surfer.h @@ -30,7 +30,6 @@ # define SURFER_DEFAULT_FONT_SIZE 12.0 # define SURFER_DEFAULT_FIXED_FONT_SIZE 12.0 # define SURFER_DEFAULT_ENCODING "ISO-8859-1" -# define SURFER_DEFAULT_HOME "http://www.defora.org/" # define SURFER_DEFAULT_SERIF_FONT "Serif" # define SURFER_DEFAULT_SANS_FONT "Sans" # define SURFER_DEFAULT_STANDARD_FONT SURFER_DEFAULT_SANS_FONT