diff --git a/po/de.po b/po/de.po index 76a7f5d..c8d6c96 100644 --- a/po/de.po +++ b/po/de.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Browser 0.1.4\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-12-05 10:43+0100\n" +"POT-Creation-Date: 2011-12-05 11:43+0100\n" "PO-Revision-Date: 2010-03-29 23:28+0200\n" "Last-Translator: Pierre Pronchery \n" "Language-Team: English\n" @@ -101,7 +101,7 @@ msgstr "_Info" msgid "_File" msgstr "_Datei" -#: ../src/browser.c:183 ../src/desktopicon.c:722 ../src/view.c:110 +#: ../src/browser.c:183 ../src/desktopicon.c:736 ../src/view.c:110 msgid "_Edit" msgstr "" @@ -113,7 +113,7 @@ msgstr "" msgid "_Help" msgstr "_Hilfe" -#: ../src/browser.c:193 ../src/desktop.c:708 ../src/desktop.c:729 +#: ../src/browser.c:193 ../src/desktop.c:737 ../src/desktop.c:757 msgid "Back" msgstr "Zurück" @@ -129,7 +129,7 @@ msgstr "" msgid "Refresh" msgstr "" -#: ../src/browser.c:201 ../src/desktop.c:790 +#: ../src/browser.c:201 ../src/desktop.c:817 msgid "Home" msgstr "Persönlicher Ordner" @@ -170,6 +170,7 @@ msgid "Details" msgstr "" #: ../src/browser.c:354 ../src/browser.c:2048 ../src/browser.c:2056 +#: ../src/desktop.c:1836 msgid "Icons" msgstr "" @@ -191,7 +192,7 @@ msgstr "" #: ../src/browser.c:759 ../src/browser.c:763 ../src/copy.c:674 #: ../src/copy.c:678 ../src/delete.c:421 ../src/delete.c:426 -#: ../src/desktop.c:1349 ../src/desktop.c:1354 ../src/move.c:452 +#: ../src/desktop.c:1364 ../src/desktop.c:1369 ../src/move.c:452 #: ../src/move.c:456 ../src/properties.c:284 ../src/properties.c:288 #: ../src/view.c:367 ../src/view.c:372 msgid "Error" @@ -201,7 +202,7 @@ msgstr "Fehler" msgid "Open file..." msgstr "Offnen..." -#: ../src/browser.c:975 ../src/desktopicon.c:860 ../src/view.c:145 +#: ../src/browser.c:975 ../src/desktopicon.c:874 ../src/view.c:145 #: ../src/view.c:421 msgid "Open with..." msgstr "Offnen mit..." @@ -214,7 +215,7 @@ msgstr "" msgid "Shell scripts" msgstr "" -#: ../src/browser.c:990 ../src/desktop.c:1746 ../src/view.c:436 +#: ../src/browser.c:990 ../src/desktop.c:1764 ../src/view.c:436 msgid "All files" msgstr "Alle Dateien" @@ -343,13 +344,13 @@ msgstr "" msgid "Refreshing folder..." msgstr "Aktualisierung..." -#: ../src/callbacks.c:116 ../src/desktop.c:440 +#: ../src/callbacks.c:116 ../src/desktop.c:469 msgid "New folder" msgstr "Neu Ordner" #: ../src/callbacks.c:196 ../src/callbacks.c:202 ../src/callbacks.c:1039 -#: ../src/callbacks.c:1043 ../src/desktopicon.c:840 ../src/desktopicon.c:845 -#: ../src/desktopicon.c:963 ../src/desktopicon.c:968 +#: ../src/callbacks.c:1043 ../src/desktopicon.c:854 ../src/desktopicon.c:859 +#: ../src/desktopicon.c:977 ../src/desktopicon.c:982 msgid "Warning" msgstr "Achtung" @@ -362,19 +363,19 @@ msgstr "" msgid "New" msgstr "Neu" -#: ../src/callbacks.c:773 ../src/callbacks.c:777 ../src/desktop.c:341 +#: ../src/callbacks.c:773 ../src/callbacks.c:777 ../src/desktop.c:370 msgid "Folder" msgstr "Ordner" -#: ../src/callbacks.c:784 ../src/desktop.c:349 +#: ../src/callbacks.c:784 ../src/desktop.c:378 msgid "Symbolic link..." msgstr "" -#: ../src/callbacks.c:788 ../src/desktop.c:353 +#: ../src/callbacks.c:788 ../src/desktop.c:382 msgid "Text file" msgstr "" -#: ../src/callbacks.c:823 ../src/desktop.c:459 +#: ../src/callbacks.c:823 ../src/desktop.c:488 msgid "New text file.txt" msgstr "" @@ -386,12 +387,12 @@ msgstr "Offnen in neue Fenster" msgid "_Unmount" msgstr "" -#: ../src/callbacks.c:933 ../src/desktopicon.c:735 ../src/view.c:101 +#: ../src/callbacks.c:933 ../src/desktopicon.c:749 ../src/view.c:101 #: ../src/view.c:112 msgid "Open _with..." msgstr "Offnen _mit..." -#: ../src/callbacks.c:1042 ../src/desktopicon.c:844 +#: ../src/callbacks.c:1042 ../src/desktopicon.c:858 msgid "Are you sure you want to execute this file?" msgstr "" @@ -423,7 +424,7 @@ msgstr "" msgid "Copying: " msgstr "" -#: ../src/copy.c:152 ../src/desktop.c:1729 +#: ../src/copy.c:152 ../src/desktop.c:1747 msgid "Filename: " msgstr "" @@ -508,98 +509,102 @@ msgid "" " -r\tEquivalent to -R\n" msgstr "" -#: ../src/desktop.c:821 +#: ../src/desktop.c:847 msgid "Applications" msgstr "" -#: ../src/desktop.c:1397 +#: ../src/desktop.c:1412 msgid "Could not load preferences" msgstr "" -#: ../src/desktop.c:1684 +#: ../src/desktop.c:1702 msgid "Desktop preferences" msgstr "Desktop Einstellungen" -#: ../src/desktop.c:1721 +#: ../src/desktop.c:1739 msgid "Default color: " msgstr "" -#: ../src/desktop.c:1733 ../src/desktop.c:1779 +#: ../src/desktop.c:1751 ../src/desktop.c:1797 msgid "Background" msgstr "Hintergrund" -#: ../src/desktop.c:1736 +#: ../src/desktop.c:1754 msgid "Picture files" msgstr "Bilder" -#: ../src/desktop.c:1758 +#: ../src/desktop.c:1776 msgid "Position: " msgstr "" -#: ../src/desktop.c:1764 +#: ../src/desktop.c:1782 msgid "Centered" msgstr "" -#: ../src/desktop.c:1766 +#: ../src/desktop.c:1784 msgid "Scaled" msgstr "" -#: ../src/desktop.c:1768 +#: ../src/desktop.c:1786 msgid "Scaled (keep ratio)" msgstr "" -#: ../src/desktop.c:1770 +#: ../src/desktop.c:1788 msgid "Tiled" msgstr "" -#: ../src/desktop.c:1775 +#: ../src/desktop.c:1793 msgid "E_xtend background to all monitors" msgstr "" -#: ../src/desktop.c:1795 +#: ../src/desktop.c:1811 +msgid "Background color: " +msgstr "" + +#: ../src/desktop.c:1819 +msgid "Foreground color: " +msgstr "" + +#: ../src/desktop.c:1827 +msgid "Font: " +msgstr "" + +#: ../src/desktop.c:1852 msgid "Monitor: " msgstr "Bildschirm: " -#: ../src/desktop.c:1804 +#: ../src/desktop.c:1861 msgid "Resolution: " msgstr "Auflösung: " -#: ../src/desktop.c:1815 +#: ../src/desktop.c:1872 msgid "Size: " msgstr "Größe: " -#: ../src/desktop.c:1839 +#: ../src/desktop.c:1896 msgid "Monitors" msgstr "Bildschirme" -#: ../src/desktop.c:1853 -msgid "Desktop font: " -msgstr "" - -#: ../src/desktop.c:1862 -msgid "Theme" -msgstr "" - -#: ../src/desktop.c:1898 +#: ../src/desktop.c:1932 #, c-format msgid "%dx%d (at %d,%d)" msgstr "" -#: ../src/desktop.c:1901 +#: ../src/desktop.c:1935 #, c-format msgid "%dx%d mm (%.0lfx%.0lf DPI)" msgstr "" -#: ../src/desktop.c:1921 +#: ../src/desktop.c:1955 msgid "Whole screen" msgstr "" -#: ../src/desktop.c:1926 +#: ../src/desktop.c:1960 #, c-format msgid "Monitor %d" msgstr "Bildschirm %d" -#: ../src/desktop.c:2084 +#: ../src/desktop.c:2140 msgid "" "Usage: desktop [-H|-V][-a|-c|-f|-h|-n][-m monitor]\n" " -H\tPlace icons horizontally\n" @@ -625,27 +630,27 @@ msgid "" " -n\tDo not display icons on the desktop\n" msgstr "" -#: ../src/desktopicon.c:693 ../src/desktopicon.c:744 +#: ../src/desktopicon.c:707 ../src/desktopicon.c:758 msgid "_Rename..." msgstr "" -#: ../src/desktopicon.c:893 ../src/desktopicon.c:894 +#: ../src/desktopicon.c:907 ../src/desktopicon.c:908 msgid "Rename" msgstr "" -#: ../src/desktopicon.c:903 +#: ../src/desktopicon.c:917 msgid "Rename: " msgstr "" -#: ../src/desktopicon.c:914 +#: ../src/desktopicon.c:928 msgid "To: " msgstr "" -#: ../src/desktopicon.c:966 +#: ../src/desktopicon.c:980 msgid "Are you sure you want to delete " msgstr "" -#: ../src/desktopicon.c:967 +#: ../src/desktopicon.c:981 msgid " file(s)?" msgstr "" diff --git a/po/es.po b/po/es.po index d2f420b..a1aa331 100644 --- a/po/es.po +++ b/po/es.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Browser 0.1.4\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-12-05 10:43+0100\n" +"POT-Creation-Date: 2011-12-05 11:43+0100\n" "PO-Revision-Date: 2010-03-30 01:04+0200\n" "Last-Translator: Pierre Pronchery \n" "Language-Team: Spanish\n" @@ -101,7 +101,7 @@ msgstr "" msgid "_File" msgstr "" -#: ../src/browser.c:183 ../src/desktopicon.c:722 ../src/view.c:110 +#: ../src/browser.c:183 ../src/desktopicon.c:736 ../src/view.c:110 msgid "_Edit" msgstr "" @@ -113,7 +113,7 @@ msgstr "" msgid "_Help" msgstr "" -#: ../src/browser.c:193 ../src/desktop.c:708 ../src/desktop.c:729 +#: ../src/browser.c:193 ../src/desktop.c:737 ../src/desktop.c:757 msgid "Back" msgstr "" @@ -129,7 +129,7 @@ msgstr "" msgid "Refresh" msgstr "" -#: ../src/browser.c:201 ../src/desktop.c:790 +#: ../src/browser.c:201 ../src/desktop.c:817 msgid "Home" msgstr "Inicio" @@ -170,6 +170,7 @@ msgid "Details" msgstr "" #: ../src/browser.c:354 ../src/browser.c:2048 ../src/browser.c:2056 +#: ../src/desktop.c:1836 msgid "Icons" msgstr "" @@ -191,7 +192,7 @@ msgstr "" #: ../src/browser.c:759 ../src/browser.c:763 ../src/copy.c:674 #: ../src/copy.c:678 ../src/delete.c:421 ../src/delete.c:426 -#: ../src/desktop.c:1349 ../src/desktop.c:1354 ../src/move.c:452 +#: ../src/desktop.c:1364 ../src/desktop.c:1369 ../src/move.c:452 #: ../src/move.c:456 ../src/properties.c:284 ../src/properties.c:288 #: ../src/view.c:367 ../src/view.c:372 msgid "Error" @@ -201,7 +202,7 @@ msgstr "" msgid "Open file..." msgstr "" -#: ../src/browser.c:975 ../src/desktopicon.c:860 ../src/view.c:145 +#: ../src/browser.c:975 ../src/desktopicon.c:874 ../src/view.c:145 #: ../src/view.c:421 msgid "Open with..." msgstr "" @@ -214,7 +215,7 @@ msgstr "" msgid "Shell scripts" msgstr "" -#: ../src/browser.c:990 ../src/desktop.c:1746 ../src/view.c:436 +#: ../src/browser.c:990 ../src/desktop.c:1764 ../src/view.c:436 msgid "All files" msgstr "" @@ -343,13 +344,13 @@ msgstr "" msgid "Refreshing folder..." msgstr "" -#: ../src/callbacks.c:116 ../src/desktop.c:440 +#: ../src/callbacks.c:116 ../src/desktop.c:469 msgid "New folder" msgstr "" #: ../src/callbacks.c:196 ../src/callbacks.c:202 ../src/callbacks.c:1039 -#: ../src/callbacks.c:1043 ../src/desktopicon.c:840 ../src/desktopicon.c:845 -#: ../src/desktopicon.c:963 ../src/desktopicon.c:968 +#: ../src/callbacks.c:1043 ../src/desktopicon.c:854 ../src/desktopicon.c:859 +#: ../src/desktopicon.c:977 ../src/desktopicon.c:982 msgid "Warning" msgstr "" @@ -362,19 +363,19 @@ msgstr "" msgid "New" msgstr "" -#: ../src/callbacks.c:773 ../src/callbacks.c:777 ../src/desktop.c:341 +#: ../src/callbacks.c:773 ../src/callbacks.c:777 ../src/desktop.c:370 msgid "Folder" msgstr "" -#: ../src/callbacks.c:784 ../src/desktop.c:349 +#: ../src/callbacks.c:784 ../src/desktop.c:378 msgid "Symbolic link..." msgstr "" -#: ../src/callbacks.c:788 ../src/desktop.c:353 +#: ../src/callbacks.c:788 ../src/desktop.c:382 msgid "Text file" msgstr "" -#: ../src/callbacks.c:823 ../src/desktop.c:459 +#: ../src/callbacks.c:823 ../src/desktop.c:488 msgid "New text file.txt" msgstr "" @@ -386,12 +387,12 @@ msgstr "" msgid "_Unmount" msgstr "" -#: ../src/callbacks.c:933 ../src/desktopicon.c:735 ../src/view.c:101 +#: ../src/callbacks.c:933 ../src/desktopicon.c:749 ../src/view.c:101 #: ../src/view.c:112 msgid "Open _with..." msgstr "" -#: ../src/callbacks.c:1042 ../src/desktopicon.c:844 +#: ../src/callbacks.c:1042 ../src/desktopicon.c:858 msgid "Are you sure you want to execute this file?" msgstr "" @@ -423,7 +424,7 @@ msgstr "" msgid "Copying: " msgstr "" -#: ../src/copy.c:152 ../src/desktop.c:1729 +#: ../src/copy.c:152 ../src/desktop.c:1747 msgid "Filename: " msgstr "" @@ -508,98 +509,102 @@ msgid "" " -r\tEquivalent to -R\n" msgstr "" -#: ../src/desktop.c:821 +#: ../src/desktop.c:847 msgid "Applications" msgstr "" -#: ../src/desktop.c:1397 +#: ../src/desktop.c:1412 msgid "Could not load preferences" msgstr "" -#: ../src/desktop.c:1684 +#: ../src/desktop.c:1702 msgid "Desktop preferences" msgstr "Desktop preferencias" -#: ../src/desktop.c:1721 +#: ../src/desktop.c:1739 msgid "Default color: " msgstr "" -#: ../src/desktop.c:1733 ../src/desktop.c:1779 +#: ../src/desktop.c:1751 ../src/desktop.c:1797 msgid "Background" msgstr "" -#: ../src/desktop.c:1736 +#: ../src/desktop.c:1754 msgid "Picture files" msgstr "" -#: ../src/desktop.c:1758 +#: ../src/desktop.c:1776 msgid "Position: " msgstr "" -#: ../src/desktop.c:1764 +#: ../src/desktop.c:1782 msgid "Centered" msgstr "" -#: ../src/desktop.c:1766 +#: ../src/desktop.c:1784 msgid "Scaled" msgstr "" -#: ../src/desktop.c:1768 +#: ../src/desktop.c:1786 msgid "Scaled (keep ratio)" msgstr "" -#: ../src/desktop.c:1770 +#: ../src/desktop.c:1788 msgid "Tiled" msgstr "" -#: ../src/desktop.c:1775 +#: ../src/desktop.c:1793 msgid "E_xtend background to all monitors" msgstr "" -#: ../src/desktop.c:1795 +#: ../src/desktop.c:1811 +msgid "Background color: " +msgstr "" + +#: ../src/desktop.c:1819 +msgid "Foreground color: " +msgstr "" + +#: ../src/desktop.c:1827 +msgid "Font: " +msgstr "" + +#: ../src/desktop.c:1852 msgid "Monitor: " msgstr "" -#: ../src/desktop.c:1804 +#: ../src/desktop.c:1861 msgid "Resolution: " msgstr "" -#: ../src/desktop.c:1815 +#: ../src/desktop.c:1872 msgid "Size: " msgstr "" -#: ../src/desktop.c:1839 +#: ../src/desktop.c:1896 msgid "Monitors" msgstr "" -#: ../src/desktop.c:1853 -msgid "Desktop font: " -msgstr "" - -#: ../src/desktop.c:1862 -msgid "Theme" -msgstr "" - -#: ../src/desktop.c:1898 +#: ../src/desktop.c:1932 #, c-format msgid "%dx%d (at %d,%d)" msgstr "" -#: ../src/desktop.c:1901 +#: ../src/desktop.c:1935 #, c-format msgid "%dx%d mm (%.0lfx%.0lf DPI)" msgstr "" -#: ../src/desktop.c:1921 +#: ../src/desktop.c:1955 msgid "Whole screen" msgstr "" -#: ../src/desktop.c:1926 +#: ../src/desktop.c:1960 #, c-format msgid "Monitor %d" msgstr "" -#: ../src/desktop.c:2084 +#: ../src/desktop.c:2140 msgid "" "Usage: desktop [-H|-V][-a|-c|-f|-h|-n][-m monitor]\n" " -H\tPlace icons horizontally\n" @@ -625,27 +630,27 @@ msgid "" " -n\tDo not display icons on the desktop\n" msgstr "" -#: ../src/desktopicon.c:693 ../src/desktopicon.c:744 +#: ../src/desktopicon.c:707 ../src/desktopicon.c:758 msgid "_Rename..." msgstr "" -#: ../src/desktopicon.c:893 ../src/desktopicon.c:894 +#: ../src/desktopicon.c:907 ../src/desktopicon.c:908 msgid "Rename" msgstr "" -#: ../src/desktopicon.c:903 +#: ../src/desktopicon.c:917 msgid "Rename: " msgstr "" -#: ../src/desktopicon.c:914 +#: ../src/desktopicon.c:928 msgid "To: " msgstr "" -#: ../src/desktopicon.c:966 +#: ../src/desktopicon.c:980 msgid "Are you sure you want to delete " msgstr "" -#: ../src/desktopicon.c:967 +#: ../src/desktopicon.c:981 msgid " file(s)?" msgstr "" diff --git a/po/fr.po b/po/fr.po index b493a3c..ad892aa 100644 --- a/po/fr.po +++ b/po/fr.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Browser 0.1.4\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-12-05 10:43+0100\n" +"POT-Creation-Date: 2011-12-05 11:43+0100\n" "PO-Revision-Date: 2010-03-29 23:28+0200\n" "Last-Translator: Pierre Pronchery \n" "Language-Team: French\n" @@ -101,7 +101,7 @@ msgstr "À _propos" msgid "_File" msgstr "_Fichier" -#: ../src/browser.c:183 ../src/desktopicon.c:722 ../src/view.c:110 +#: ../src/browser.c:183 ../src/desktopicon.c:736 ../src/view.c:110 msgid "_Edit" msgstr "É_dition" @@ -113,7 +113,7 @@ msgstr "_Vue" msgid "_Help" msgstr "_Aide" -#: ../src/browser.c:193 ../src/desktop.c:708 ../src/desktop.c:729 +#: ../src/browser.c:193 ../src/desktop.c:737 ../src/desktop.c:757 msgid "Back" msgstr "Retour" @@ -129,7 +129,7 @@ msgstr "Suivant" msgid "Refresh" msgstr "Rafraîchir" -#: ../src/browser.c:201 ../src/desktop.c:790 +#: ../src/browser.c:201 ../src/desktop.c:817 msgid "Home" msgstr "Dossier personnel" @@ -170,6 +170,7 @@ msgid "Details" msgstr "Détails" #: ../src/browser.c:354 ../src/browser.c:2048 ../src/browser.c:2056 +#: ../src/desktop.c:1836 msgid "Icons" msgstr "Icônes" @@ -193,7 +194,7 @@ msgstr "" #: ../src/browser.c:759 ../src/browser.c:763 ../src/copy.c:674 #: ../src/copy.c:678 ../src/delete.c:421 ../src/delete.c:426 -#: ../src/desktop.c:1349 ../src/desktop.c:1354 ../src/move.c:452 +#: ../src/desktop.c:1364 ../src/desktop.c:1369 ../src/move.c:452 #: ../src/move.c:456 ../src/properties.c:284 ../src/properties.c:288 #: ../src/view.c:367 ../src/view.c:372 msgid "Error" @@ -203,7 +204,7 @@ msgstr "Erreur" msgid "Open file..." msgstr "Ouvrir..." -#: ../src/browser.c:975 ../src/desktopicon.c:860 ../src/view.c:145 +#: ../src/browser.c:975 ../src/desktopicon.c:874 ../src/view.c:145 #: ../src/view.c:421 msgid "Open with..." msgstr "Ouvrir avec..." @@ -216,7 +217,7 @@ msgstr "Fichiers exécutables" msgid "Shell scripts" msgstr "Scripts shell" -#: ../src/browser.c:990 ../src/desktop.c:1746 ../src/view.c:436 +#: ../src/browser.c:990 ../src/desktop.c:1764 ../src/view.c:436 msgid "All files" msgstr "Tous les fichiers" @@ -345,13 +346,13 @@ msgstr "Modifier avec :" msgid "Refreshing folder..." msgstr "Actualisation du dossier..." -#: ../src/callbacks.c:116 ../src/desktop.c:440 +#: ../src/callbacks.c:116 ../src/desktop.c:469 msgid "New folder" msgstr "Nouveau dossier" #: ../src/callbacks.c:196 ../src/callbacks.c:202 ../src/callbacks.c:1039 -#: ../src/callbacks.c:1043 ../src/desktopicon.c:840 ../src/desktopicon.c:845 -#: ../src/desktopicon.c:963 ../src/desktopicon.c:968 +#: ../src/callbacks.c:1043 ../src/desktopicon.c:854 ../src/desktopicon.c:859 +#: ../src/desktopicon.c:977 ../src/desktopicon.c:982 msgid "Warning" msgstr "Avertissement" @@ -364,19 +365,19 @@ msgstr "Voulez-vous vraiment effacer %lu fichier(s)?" msgid "New" msgstr "Nouveau" -#: ../src/callbacks.c:773 ../src/callbacks.c:777 ../src/desktop.c:341 +#: ../src/callbacks.c:773 ../src/callbacks.c:777 ../src/desktop.c:370 msgid "Folder" msgstr "Dossier" -#: ../src/callbacks.c:784 ../src/desktop.c:349 +#: ../src/callbacks.c:784 ../src/desktop.c:378 msgid "Symbolic link..." msgstr "Lien symbolique..." -#: ../src/callbacks.c:788 ../src/desktop.c:353 +#: ../src/callbacks.c:788 ../src/desktop.c:382 msgid "Text file" msgstr "Fichier texte" -#: ../src/callbacks.c:823 ../src/desktop.c:459 +#: ../src/callbacks.c:823 ../src/desktop.c:488 msgid "New text file.txt" msgstr "Nouveau fichier texte.txt" @@ -388,12 +389,12 @@ msgstr "Ouvrir dans une _nouvelle fenêtre" msgid "_Unmount" msgstr "Démonter" -#: ../src/callbacks.c:933 ../src/desktopicon.c:735 ../src/view.c:101 +#: ../src/callbacks.c:933 ../src/desktopicon.c:749 ../src/view.c:101 #: ../src/view.c:112 msgid "Open _with..." msgstr "Ouvrir _avec..." -#: ../src/callbacks.c:1042 ../src/desktopicon.c:844 +#: ../src/callbacks.c:1042 ../src/desktopicon.c:858 msgid "Are you sure you want to execute this file?" msgstr "Voulez-vous vraiment exécuter ce fichier ?" @@ -425,7 +426,7 @@ msgstr "Copie de fichier(s)" msgid "Copying: " msgstr "Copie de : " -#: ../src/copy.c:152 ../src/desktop.c:1729 +#: ../src/copy.c:152 ../src/desktop.c:1747 msgid "Filename: " msgstr "Nom de fichier : " @@ -530,98 +531,102 @@ msgstr "" " -R\tSupprimer récursivement\n" " -r\tÉquivalent à -R\n" -#: ../src/desktop.c:821 +#: ../src/desktop.c:847 msgid "Applications" msgstr "Applications" -#: ../src/desktop.c:1397 +#: ../src/desktop.c:1412 msgid "Could not load preferences" msgstr "Impossible de charger les préférences" -#: ../src/desktop.c:1684 +#: ../src/desktop.c:1702 msgid "Desktop preferences" msgstr "Préférences du bureau" -#: ../src/desktop.c:1721 +#: ../src/desktop.c:1739 msgid "Default color: " msgstr "Couleur par défaut :" -#: ../src/desktop.c:1733 ../src/desktop.c:1779 +#: ../src/desktop.c:1751 ../src/desktop.c:1797 msgid "Background" msgstr "Arrière-plan" -#: ../src/desktop.c:1736 +#: ../src/desktop.c:1754 msgid "Picture files" msgstr "Images" -#: ../src/desktop.c:1758 +#: ../src/desktop.c:1776 msgid "Position: " msgstr "Position : " -#: ../src/desktop.c:1764 +#: ../src/desktop.c:1782 msgid "Centered" msgstr "Centré" -#: ../src/desktop.c:1766 +#: ../src/desktop.c:1784 msgid "Scaled" msgstr "Étiré" -#: ../src/desktop.c:1768 +#: ../src/desktop.c:1786 msgid "Scaled (keep ratio)" msgstr "Étiré (sans déformer)" -#: ../src/desktop.c:1770 +#: ../src/desktop.c:1788 msgid "Tiled" msgstr "Mosaïque" -#: ../src/desktop.c:1775 +#: ../src/desktop.c:1793 msgid "E_xtend background to all monitors" msgstr "Étendre l'arrière-plan à tous les moniteurs" -#: ../src/desktop.c:1795 +#: ../src/desktop.c:1811 +msgid "Background color: " +msgstr "" + +#: ../src/desktop.c:1819 +msgid "Foreground color: " +msgstr "" + +#: ../src/desktop.c:1827 +msgid "Font: " +msgstr "Police : " + +#: ../src/desktop.c:1852 msgid "Monitor: " msgstr "Moniteur : " -#: ../src/desktop.c:1804 +#: ../src/desktop.c:1861 msgid "Resolution: " msgstr "Résolution : " -#: ../src/desktop.c:1815 +#: ../src/desktop.c:1872 msgid "Size: " msgstr "Taille: " -#: ../src/desktop.c:1839 +#: ../src/desktop.c:1896 msgid "Monitors" msgstr "Moniteurs" -#: ../src/desktop.c:1853 -msgid "Desktop font: " -msgstr "Police du bureau : " - -#: ../src/desktop.c:1862 -msgid "Theme" -msgstr "Thème" - -#: ../src/desktop.c:1898 +#: ../src/desktop.c:1932 #, c-format msgid "%dx%d (at %d,%d)" msgstr "%dx%d (à %d,%d)" -#: ../src/desktop.c:1901 +#: ../src/desktop.c:1935 #, c-format msgid "%dx%d mm (%.0lfx%.0lf DPI)" msgstr "%dx%d mm (%.0lfx%.0lf DPI)" -#: ../src/desktop.c:1921 +#: ../src/desktop.c:1955 msgid "Whole screen" msgstr "Écran complet" -#: ../src/desktop.c:1926 +#: ../src/desktop.c:1960 #, c-format msgid "Monitor %d" msgstr "Moniteur %d" -#: ../src/desktop.c:2084 +#: ../src/desktop.c:2140 msgid "" "Usage: desktop [-H|-V][-a|-c|-f|-h|-n][-m monitor]\n" " -H\tPlace icons horizontally\n" @@ -666,27 +671,27 @@ msgstr "" " -m\tMoniteur où afficher le bureau\n" " -n\tNe pas afficher d'icônes sur le bureau\n" -#: ../src/desktopicon.c:693 ../src/desktopicon.c:744 +#: ../src/desktopicon.c:707 ../src/desktopicon.c:758 msgid "_Rename..." msgstr "_Renommer..." -#: ../src/desktopicon.c:893 ../src/desktopicon.c:894 +#: ../src/desktopicon.c:907 ../src/desktopicon.c:908 msgid "Rename" msgstr "Renommer" -#: ../src/desktopicon.c:903 +#: ../src/desktopicon.c:917 msgid "Rename: " msgstr "Renommer : " -#: ../src/desktopicon.c:914 +#: ../src/desktopicon.c:928 msgid "To: " msgstr "Vers : " -#: ../src/desktopicon.c:966 +#: ../src/desktopicon.c:980 msgid "Are you sure you want to delete " msgstr "Voulez-vous vraiment effacer " -#: ../src/desktopicon.c:967 +#: ../src/desktopicon.c:981 msgid " file(s)?" msgstr " fichier(s) ?" diff --git a/po/it.po b/po/it.po index fb10e9c..b221d15 100644 --- a/po/it.po +++ b/po/it.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Browser 0.1.4\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-12-05 10:43+0100\n" +"POT-Creation-Date: 2011-12-05 11:43+0100\n" "PO-Revision-Date: 2010-04-07 23:18+0200\n" "Last-Translator: Pierre Pronchery \n" "Language-Team: Italian\n" @@ -101,7 +101,7 @@ msgstr "" msgid "_File" msgstr "" -#: ../src/browser.c:183 ../src/desktopicon.c:722 ../src/view.c:110 +#: ../src/browser.c:183 ../src/desktopicon.c:736 ../src/view.c:110 msgid "_Edit" msgstr "" @@ -113,7 +113,7 @@ msgstr "" msgid "_Help" msgstr "" -#: ../src/browser.c:193 ../src/desktop.c:708 ../src/desktop.c:729 +#: ../src/browser.c:193 ../src/desktop.c:737 ../src/desktop.c:757 msgid "Back" msgstr "" @@ -129,7 +129,7 @@ msgstr "" msgid "Refresh" msgstr "" -#: ../src/browser.c:201 ../src/desktop.c:790 +#: ../src/browser.c:201 ../src/desktop.c:817 msgid "Home" msgstr "" @@ -170,6 +170,7 @@ msgid "Details" msgstr "" #: ../src/browser.c:354 ../src/browser.c:2048 ../src/browser.c:2056 +#: ../src/desktop.c:1836 msgid "Icons" msgstr "" @@ -191,7 +192,7 @@ msgstr "" #: ../src/browser.c:759 ../src/browser.c:763 ../src/copy.c:674 #: ../src/copy.c:678 ../src/delete.c:421 ../src/delete.c:426 -#: ../src/desktop.c:1349 ../src/desktop.c:1354 ../src/move.c:452 +#: ../src/desktop.c:1364 ../src/desktop.c:1369 ../src/move.c:452 #: ../src/move.c:456 ../src/properties.c:284 ../src/properties.c:288 #: ../src/view.c:367 ../src/view.c:372 msgid "Error" @@ -201,7 +202,7 @@ msgstr "" msgid "Open file..." msgstr "" -#: ../src/browser.c:975 ../src/desktopicon.c:860 ../src/view.c:145 +#: ../src/browser.c:975 ../src/desktopicon.c:874 ../src/view.c:145 #: ../src/view.c:421 msgid "Open with..." msgstr "" @@ -214,7 +215,7 @@ msgstr "" msgid "Shell scripts" msgstr "" -#: ../src/browser.c:990 ../src/desktop.c:1746 ../src/view.c:436 +#: ../src/browser.c:990 ../src/desktop.c:1764 ../src/view.c:436 msgid "All files" msgstr "" @@ -343,13 +344,13 @@ msgstr "" msgid "Refreshing folder..." msgstr "" -#: ../src/callbacks.c:116 ../src/desktop.c:440 +#: ../src/callbacks.c:116 ../src/desktop.c:469 msgid "New folder" msgstr "" #: ../src/callbacks.c:196 ../src/callbacks.c:202 ../src/callbacks.c:1039 -#: ../src/callbacks.c:1043 ../src/desktopicon.c:840 ../src/desktopicon.c:845 -#: ../src/desktopicon.c:963 ../src/desktopicon.c:968 +#: ../src/callbacks.c:1043 ../src/desktopicon.c:854 ../src/desktopicon.c:859 +#: ../src/desktopicon.c:977 ../src/desktopicon.c:982 msgid "Warning" msgstr "" @@ -362,19 +363,19 @@ msgstr "" msgid "New" msgstr "" -#: ../src/callbacks.c:773 ../src/callbacks.c:777 ../src/desktop.c:341 +#: ../src/callbacks.c:773 ../src/callbacks.c:777 ../src/desktop.c:370 msgid "Folder" msgstr "" -#: ../src/callbacks.c:784 ../src/desktop.c:349 +#: ../src/callbacks.c:784 ../src/desktop.c:378 msgid "Symbolic link..." msgstr "" -#: ../src/callbacks.c:788 ../src/desktop.c:353 +#: ../src/callbacks.c:788 ../src/desktop.c:382 msgid "Text file" msgstr "" -#: ../src/callbacks.c:823 ../src/desktop.c:459 +#: ../src/callbacks.c:823 ../src/desktop.c:488 msgid "New text file.txt" msgstr "" @@ -386,12 +387,12 @@ msgstr "" msgid "_Unmount" msgstr "" -#: ../src/callbacks.c:933 ../src/desktopicon.c:735 ../src/view.c:101 +#: ../src/callbacks.c:933 ../src/desktopicon.c:749 ../src/view.c:101 #: ../src/view.c:112 msgid "Open _with..." msgstr "" -#: ../src/callbacks.c:1042 ../src/desktopicon.c:844 +#: ../src/callbacks.c:1042 ../src/desktopicon.c:858 msgid "Are you sure you want to execute this file?" msgstr "" @@ -423,7 +424,7 @@ msgstr "" msgid "Copying: " msgstr "" -#: ../src/copy.c:152 ../src/desktop.c:1729 +#: ../src/copy.c:152 ../src/desktop.c:1747 msgid "Filename: " msgstr "" @@ -508,98 +509,102 @@ msgid "" " -r\tEquivalent to -R\n" msgstr "" -#: ../src/desktop.c:821 +#: ../src/desktop.c:847 msgid "Applications" msgstr "" -#: ../src/desktop.c:1397 +#: ../src/desktop.c:1412 msgid "Could not load preferences" msgstr "" -#: ../src/desktop.c:1684 +#: ../src/desktop.c:1702 msgid "Desktop preferences" msgstr "" -#: ../src/desktop.c:1721 +#: ../src/desktop.c:1739 msgid "Default color: " msgstr "" -#: ../src/desktop.c:1733 ../src/desktop.c:1779 +#: ../src/desktop.c:1751 ../src/desktop.c:1797 msgid "Background" msgstr "" -#: ../src/desktop.c:1736 +#: ../src/desktop.c:1754 msgid "Picture files" msgstr "" -#: ../src/desktop.c:1758 +#: ../src/desktop.c:1776 msgid "Position: " msgstr "" -#: ../src/desktop.c:1764 +#: ../src/desktop.c:1782 msgid "Centered" msgstr "" -#: ../src/desktop.c:1766 +#: ../src/desktop.c:1784 msgid "Scaled" msgstr "" -#: ../src/desktop.c:1768 +#: ../src/desktop.c:1786 msgid "Scaled (keep ratio)" msgstr "" -#: ../src/desktop.c:1770 +#: ../src/desktop.c:1788 msgid "Tiled" msgstr "" -#: ../src/desktop.c:1775 +#: ../src/desktop.c:1793 msgid "E_xtend background to all monitors" msgstr "" -#: ../src/desktop.c:1795 +#: ../src/desktop.c:1811 +msgid "Background color: " +msgstr "" + +#: ../src/desktop.c:1819 +msgid "Foreground color: " +msgstr "" + +#: ../src/desktop.c:1827 +msgid "Font: " +msgstr "" + +#: ../src/desktop.c:1852 msgid "Monitor: " msgstr "" -#: ../src/desktop.c:1804 +#: ../src/desktop.c:1861 msgid "Resolution: " msgstr "" -#: ../src/desktop.c:1815 +#: ../src/desktop.c:1872 msgid "Size: " msgstr "" -#: ../src/desktop.c:1839 +#: ../src/desktop.c:1896 msgid "Monitors" msgstr "" -#: ../src/desktop.c:1853 -msgid "Desktop font: " -msgstr "" - -#: ../src/desktop.c:1862 -msgid "Theme" -msgstr "" - -#: ../src/desktop.c:1898 +#: ../src/desktop.c:1932 #, c-format msgid "%dx%d (at %d,%d)" msgstr "" -#: ../src/desktop.c:1901 +#: ../src/desktop.c:1935 #, c-format msgid "%dx%d mm (%.0lfx%.0lf DPI)" msgstr "" -#: ../src/desktop.c:1921 +#: ../src/desktop.c:1955 msgid "Whole screen" msgstr "" -#: ../src/desktop.c:1926 +#: ../src/desktop.c:1960 #, c-format msgid "Monitor %d" msgstr "" -#: ../src/desktop.c:2084 +#: ../src/desktop.c:2140 msgid "" "Usage: desktop [-H|-V][-a|-c|-f|-h|-n][-m monitor]\n" " -H\tPlace icons horizontally\n" @@ -625,27 +630,27 @@ msgid "" " -n\tDo not display icons on the desktop\n" msgstr "" -#: ../src/desktopicon.c:693 ../src/desktopicon.c:744 +#: ../src/desktopicon.c:707 ../src/desktopicon.c:758 msgid "_Rename..." msgstr "" -#: ../src/desktopicon.c:893 ../src/desktopicon.c:894 +#: ../src/desktopicon.c:907 ../src/desktopicon.c:908 msgid "Rename" msgstr "" -#: ../src/desktopicon.c:903 +#: ../src/desktopicon.c:917 msgid "Rename: " msgstr "" -#: ../src/desktopicon.c:914 +#: ../src/desktopicon.c:928 msgid "To: " msgstr "" -#: ../src/desktopicon.c:966 +#: ../src/desktopicon.c:980 msgid "Are you sure you want to delete " msgstr "" -#: ../src/desktopicon.c:967 +#: ../src/desktopicon.c:981 msgid " file(s)?" msgstr "" diff --git a/src/desktop.c b/src/desktop.c index 99642cb..222157d 100644 --- a/src/desktop.c +++ b/src/desktop.c @@ -65,6 +65,8 @@ struct _Desktop { DesktopPrefs prefs; PangoFontDescription * font; + GdkColor background; + GdkColor foreground; /* workarea */ GdkRectangle window; @@ -92,11 +94,13 @@ struct _Desktop /* preferences */ GtkWidget * pr_window; - GtkWidget * pr_font; GtkWidget * pr_color; GtkWidget * pr_background; GtkWidget * pr_background_how; GtkWidget * pr_background_extend; + GtkWidget * pr_ibcolor; + GtkWidget * pr_ifcolor; + GtkWidget * pr_ifont; GtkWidget * pr_monitors; GtkWidget * pr_monitors_res; GtkWidget * pr_monitors_size; @@ -184,6 +188,7 @@ static void _desktop_show_preferences(Desktop * desktop); /* callbacks */ static gboolean _new_idle(gpointer data); static void _idle_background(Desktop * desktop, Config * config); +static void _idle_icons(Desktop * desktop, Config * config); static GdkFilterReturn _on_root_event(GdkXEvent * xevent, GdkEvent * event, gpointer data); @@ -195,6 +200,8 @@ Desktop * desktop_new(DesktopPrefs * prefs) if((desktop = object_new(sizeof(*desktop))) == NULL) return NULL; memset(desktop, 0, sizeof(*desktop)); + /* set default foreground to white */ + memset(&desktop->foreground, 0xff, sizeof(desktop->foreground)); desktop->prefs.alignment = DESKTOP_ALIGNMENT_VERTICAL; desktop->prefs.layout = DESKTOP_LAYOUT_FILES; desktop->prefs.monitor = -1; @@ -230,7 +237,6 @@ static gboolean _new_idle(gpointer data) Desktop * desktop = data; Config * config; char const * p; - size_t i; char * q; #ifdef DEBUG @@ -239,14 +245,9 @@ static gboolean _new_idle(gpointer data) if((config = _desktop_get_config(desktop)) == NULL) return FALSE; _idle_background(desktop, config); - if((p = config_get(config, NULL, "font")) != NULL) - { - desktop->font = pango_font_description_from_string(p); - for(i = 0; i < desktop->icon_cnt; i++) - desktopicon_set_font(desktop->icon[i], desktop->font); - } - if(desktop->prefs.monitor < 0 && (p = config_get(config, NULL, - "monitor")) != NULL) + _idle_icons(desktop, config); + if(desktop->prefs.monitor < 0 + && (p = config_get(config, NULL, "monitor")) != NULL) { desktop->prefs.monitor = strtol(p, &q, 10); if(p[0] == '\0' || *q != '\0') @@ -279,6 +280,34 @@ static void _idle_background(Desktop * desktop, Config * config) _desktop_draw_background(desktop, &color, filename, how, extend); } +static void _idle_icons(Desktop * desktop, Config * config) +{ + GdkColor color; + char const * p; + size_t i; + + if((p = config_get(config, "icons", "background")) != NULL) + { + gdk_color_parse(p, &color); + desktop->background = color; + } + if((p = config_get(config, "icons", "foreground")) != NULL) + { + gdk_color_parse(p, &color); + desktop->foreground = color; + } + if((p = config_get(config, "icons", "font")) != NULL) + desktop->font = pango_font_description_from_string(p); + for(i = 0; i < desktop->icon_cnt; i++) + { + desktopicon_set_background(desktop->icon[i], + &desktop->background); + desktopicon_set_font(desktop->icon[i], desktop->font); + desktopicon_set_foreground(desktop->icon[i], + &desktop->foreground); + } +} + static GdkFilterReturn _event_button_press(XButtonEvent * xbev, Desktop * desktop); static GdkFilterReturn _event_client_message(XClientMessageEvent * xevent, @@ -708,7 +737,6 @@ static int _layout_applications(Desktop * desktop) desktopicon = desktopicon_new(desktop, _("Back"), NULL); desktopicon_set_callback(desktopicon, _layout_set_categories, NULL); - desktopicon_set_font(desktopicon, desktop->font); desktopicon_set_immutable(desktopicon, TRUE); icon = gtk_icon_theme_load_icon(desktop->theme, "back", DESKTOPICON_ICON_SIZE, 0, NULL); @@ -729,7 +757,6 @@ static int _layout_categories(Desktop * desktop) desktopicon = desktopicon_new(desktop, _("Back"), NULL); desktopicon_set_callback(desktopicon, _layout_set_homescreen, NULL); desktopicon_set_first(desktopicon, TRUE); - desktopicon_set_font(desktopicon, desktop->font); desktopicon_set_immutable(desktopicon, TRUE); icon = gtk_icon_theme_load_icon(desktop->theme, "back", DESKTOPICON_ICON_SIZE, 0, NULL); @@ -791,7 +818,6 @@ static void _layout_files_add_home(Desktop * desktop) == NULL) return; desktopicon_set_first(desktopicon, TRUE); - desktopicon_set_font(desktopicon, desktop->font); desktopicon_set_immutable(desktopicon, TRUE); desktop_icon_add(desktop, desktopicon); icon = gtk_icon_theme_load_icon(desktop->theme, "gnome-home", @@ -822,7 +848,6 @@ static int _layout_homescreen(Desktop * desktop) == NULL) return desktop_error(NULL, error_get(), 1); desktopicon_set_callback(desktopicon, _layout_set_categories, NULL); - desktopicon_set_font(desktopicon, desktop->font); desktopicon_set_immutable(desktopicon, TRUE); icon = gtk_icon_theme_load_icon(desktop->theme, "gnome-applications", DESKTOPICON_ICON_SIZE, 0, NULL); @@ -834,10 +859,7 @@ static int _layout_homescreen(Desktop * desktop) if(access(*p, R_OK) == 0 && (desktopicon = desktopicon_new_application( desktop, *p)) != NULL) - { - desktopicon_set_font(desktopicon, desktop->font); _desktop_icon_add(desktop, desktopicon); - } #endif return 0; } @@ -990,7 +1012,6 @@ static int _current_loop_applications(Desktop * desktop) continue; if((icon = desktopicon_new_application(desktop, path)) == NULL) continue; - desktopicon_set_font(icon, desktop->font); _desktop_icon_add(desktop, icon); free(path); config_delete(config); @@ -1096,10 +1117,7 @@ static int _current_loop_files(Desktop * desktop) == NULL) return -_desktop_serror(NULL, de->d_name, 1); if((desktopicon = desktopicon_new(desktop, de->d_name, p)) != NULL) - { desktop_icon_add(desktop, desktopicon); - desktopicon_set_font(desktopicon, desktop->font); - } string_delete(p); return 0; } @@ -1180,7 +1198,6 @@ static void _done_categories(Desktop * desktop) if((q = config_get(config, section, "Categories")) == NULL) { icon = desktopicon_new_application(desktop, path); - desktopicon_set_font(icon, desktop->font); _desktop_icon_add(desktop, icon); continue; } @@ -1191,7 +1208,6 @@ static void _done_categories(Desktop * desktop) if(dc->category == NULL) { icon = desktopicon_new_application(desktop, path); - desktopicon_set_font(icon, desktop->font); _desktop_icon_add(desktop, icon); continue; } @@ -1199,7 +1215,6 @@ static void _done_categories(Desktop * desktop) continue; dc->show = TRUE; icon = desktopicon_new_category(desktop, dc->name, dc->icon); - desktopicon_set_font(icon, desktop->font); desktopicon_set_callback(icon, _done_categories_open, dc); _desktop_icon_add(desktop, icon); } @@ -1622,6 +1637,9 @@ static int _desktop_icon_add(Desktop * desktop, DesktopIcon * icon) } desktop->icon = p; desktop->icon[desktop->icon_cnt++] = icon; + desktopicon_set_background(icon, &desktop->background); + desktopicon_set_font(icon, desktop->font); + desktopicon_set_foreground(icon, &desktop->foreground); desktopicon_show(icon); return 0; } @@ -1653,8 +1671,8 @@ static int _desktop_icon_remove(Desktop * desktop, DesktopIcon * icon) /* desktop_show_preferences */ static void _preferences_background(Desktop * desktop, GtkWidget * notebook); +static void _preferences_icons(Desktop * desktop, GtkWidget * notebook); static void _preferences_monitors(Desktop * desktop, GtkWidget * notebook); -static void _preferences_theme(Desktop * desktop, GtkWidget * notebook); static void _preferences_set(Desktop * desktop); static gboolean _on_preferences_closex(gpointer data); static void _on_preferences_monitors_changed(gpointer data); @@ -1698,8 +1716,8 @@ static void _desktop_show_preferences(Desktop * desktop) /* notebook */ notebook = gtk_notebook_new(); _preferences_background(desktop, notebook); + _preferences_icons(desktop, notebook); _preferences_monitors(desktop, notebook); - _preferences_theme(desktop, notebook); gtk_box_pack_start(GTK_BOX(vbox), notebook, TRUE, TRUE, 0); /* container */ _preferences_set(desktop); @@ -1779,6 +1797,45 @@ static void _preferences_background(Desktop * desktop, GtkWidget * notebook) _("Background"))); } +static void _preferences_icons(Desktop * desktop, GtkWidget * notebook) +{ + GtkSizeGroup * group; + GtkWidget * vbox2; + GtkWidget * hbox; + GtkWidget * label; + + vbox2 = gtk_vbox_new(FALSE, 4); + gtk_container_set_border_width(GTK_CONTAINER(vbox2), 4); + group = gtk_size_group_new(GTK_SIZE_GROUP_HORIZONTAL); + hbox = gtk_hbox_new(FALSE, 0); + label = gtk_label_new(_("Background color: ")); + gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.5); + gtk_size_group_add_widget(group, label); + gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, TRUE, 0); + desktop->pr_ibcolor = gtk_color_button_new(); + gtk_box_pack_start(GTK_BOX(hbox), desktop->pr_ibcolor, TRUE, TRUE, 0); + gtk_box_pack_start(GTK_BOX(vbox2), hbox, FALSE, TRUE, 0); + hbox = gtk_hbox_new(FALSE, 0); + label = gtk_label_new(_("Foreground color: ")); + gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.5); + gtk_size_group_add_widget(group, label); + gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, TRUE, 0); + desktop->pr_ifcolor = gtk_color_button_new(); + gtk_box_pack_start(GTK_BOX(hbox), desktop->pr_ifcolor, TRUE, TRUE, 0); + gtk_box_pack_start(GTK_BOX(vbox2), hbox, FALSE, TRUE, 0); + hbox = gtk_hbox_new(FALSE, 0); + label = gtk_label_new(_("Font: ")); + gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.5); + gtk_size_group_add_widget(group, label); + gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, TRUE, 0); + desktop->pr_ifont = gtk_font_button_new(); + gtk_font_button_set_use_font(GTK_FONT_BUTTON(desktop->pr_ifont), TRUE); + gtk_box_pack_start(GTK_BOX(hbox), desktop->pr_ifont, TRUE, TRUE, 0); + gtk_box_pack_start(GTK_BOX(vbox2), hbox, FALSE, TRUE, 0); + gtk_notebook_append_page(GTK_NOTEBOOK(notebook), vbox2, gtk_label_new( + _("Icons"))); +} + static void _preferences_monitors(Desktop * desktop, GtkWidget * notebook) { GtkSizeGroup * group; @@ -1839,29 +1896,6 @@ static void _preferences_monitors(Desktop * desktop, GtkWidget * notebook) _("Monitors"))); } -static void _preferences_theme(Desktop * desktop, GtkWidget * notebook) -{ - GtkSizeGroup * group; - GtkWidget * vbox2; - GtkWidget * hbox; - GtkWidget * label; - - vbox2 = gtk_vbox_new(FALSE, 4); - gtk_container_set_border_width(GTK_CONTAINER(vbox2), 4); - group = gtk_size_group_new(GTK_SIZE_GROUP_HORIZONTAL); - hbox = gtk_hbox_new(FALSE, 0); - label = gtk_label_new(_("Desktop font: ")); - gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.5); - gtk_size_group_add_widget(group, label); - gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, TRUE, 0); - desktop->pr_font = gtk_font_button_new(); - gtk_font_button_set_use_font(GTK_FONT_BUTTON(desktop->pr_font), TRUE); - gtk_box_pack_start(GTK_BOX(hbox), desktop->pr_font, TRUE, TRUE, 0); - gtk_box_pack_start(GTK_BOX(vbox2), hbox, FALSE, TRUE, 0); - gtk_notebook_append_page(GTK_NOTEBOOK(notebook), vbox2, gtk_label_new( - _("Theme"))); -} - static gboolean _on_preferences_closex(gpointer data) { _on_preferences_cancel(data); @@ -1965,8 +1999,7 @@ static void _on_preferences_apply(gpointer data) g_idle_add(_new_idle, desktop); if((config = _desktop_get_config(desktop)) == NULL) return; - q = gtk_font_button_get_font_name(GTK_FONT_BUTTON(desktop->pr_font)); - config_set(config, NULL, "font", q); + /* background */ p = gtk_file_chooser_get_filename(GTK_FILE_CHOOSER( desktop->pr_background)); config_set(config, NULL, "background", p); @@ -1981,6 +2014,19 @@ static void _on_preferences_apply(gpointer data) p = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON( desktop->pr_background_extend)) ? "1" : "0"; config_set(config, NULL, "background_extend", p); + /* icons */ + gtk_color_button_get_color(GTK_COLOR_BUTTON(desktop->pr_ibcolor), + &color); + p = gdk_color_to_string(&color); + config_set(config, "icons", "background", p); + g_free(p); + gtk_color_button_get_color(GTK_COLOR_BUTTON(desktop->pr_ifcolor), + &color); + p = gdk_color_to_string(&color); + config_set(config, "icons", "foreground", p); + g_free(p); + q = gtk_font_button_get_font_name(GTK_FONT_BUTTON(desktop->pr_ifont)); + config_set(config, "icons", "font", q); /* XXX code duplication */ if((p = string_new_append(desktop->home, "/" DESKTOPRC, NULL)) != NULL) { @@ -2049,9 +2095,7 @@ static void _preferences_set(Desktop * desktop) if((config = _desktop_get_config(desktop)) != NULL) { - if((p = config_get(config, NULL, "font")) != NULL) - gtk_font_button_set_font_name(GTK_FONT_BUTTON( - desktop->pr_font), p); + /* background */ filename = config_get(config, NULL, "background"); if((p = config_get(config, NULL, "background_color")) != NULL && gdk_color_parse(p, &color) == TRUE) @@ -2063,6 +2107,18 @@ static void _preferences_set(Desktop * desktop) how = i; if((p = config_get(config, NULL, "background_extend")) != NULL) extend = strtol(p, NULL, 10) ? TRUE : FALSE; + /* icons */ + if((p = config_get(config, "icons", "background")) != NULL + && gdk_color_parse(p, &color) == TRUE) + gtk_color_button_set_color(GTK_COLOR_BUTTON( + desktop->pr_ibcolor), &color); + if((p = config_get(config, "icons", "foreground")) != NULL + && gdk_color_parse(p, &color) == TRUE) + gtk_color_button_set_color(GTK_COLOR_BUTTON( + desktop->pr_ifcolor), &color); + if((p = config_get(config, "icons", "font")) != NULL) + gtk_font_button_set_font_name(GTK_FONT_BUTTON( + desktop->pr_ifont), p); config_delete(config); } if(filename != NULL) diff --git a/src/desktopicon.c b/src/desktopicon.c index b1e6c23..5450a9d 100644 --- a/src/desktopicon.c +++ b/src/desktopicon.c @@ -333,6 +333,13 @@ gboolean desktopicon_get_updated(DesktopIcon * desktopicon) } +/* desktopicon_set_background */ +void desktopicon_set_background(DesktopIcon * desktopicon, GdkColor * color) +{ + gtk_widget_modify_bg(desktopicon->event, GTK_STATE_NORMAL, color); +} + + /* desktopicon_set_callback */ void desktopicon_set_callback(DesktopIcon * desktopicon, DesktopIconCallback callback, gpointer data) @@ -371,6 +378,13 @@ void desktopicon_set_font(DesktopIcon * desktopicon, } +/* desktopicon_set_foreground */ +void desktopicon_set_foreground(DesktopIcon * desktopicon, GdkColor * color) +{ + gtk_widget_modify_fg(desktopicon->label, GTK_STATE_NORMAL, color); +} + + /* desktopicon_set_icon */ void desktopicon_set_icon(DesktopIcon * desktopicon, GdkPixbuf * icon) { diff --git a/src/desktopicon.h b/src/desktopicon.h index 6259504..ca4af5f 100644 --- a/src/desktopicon.h +++ b/src/desktopicon.h @@ -60,6 +60,7 @@ char const * desktopicon_get_path(DesktopIcon * desktopicon); gboolean desktopicon_get_selected(DesktopIcon * desktopicon); gboolean desktopicon_get_updated(DesktopIcon * desktopicon); +void desktopicon_set_background(DesktopIcon * desktopicon, GdkColor * color); void desktopicon_set_callback(DesktopIcon * desktopicon, DesktopIconCallback callback, gpointer data); void desktopicon_set_confirm(DesktopIcon * desktopicon, gboolean confirm); @@ -67,6 +68,7 @@ void desktopicon_set_executable(DesktopIcon * desktopicon, gboolean executable); void desktopicon_set_first(DesktopIcon * desktopicon, gboolean first); void desktopicon_set_font(DesktopIcon * desktopicon, PangoFontDescription * font); +void desktopicon_set_foreground(DesktopIcon * desktopicon, GdkColor * color); void desktopicon_set_icon(DesktopIcon * desktopicon, GdkPixbuf * icon); void desktopicon_set_immutable(DesktopIcon * desktopicon, gboolean immutable); void desktopicon_set_selected(DesktopIcon * desktopicon, gboolean selected);