From a66e409974eb1e55d9c05a68afd95e33b5657941 Mon Sep 17 00:00:00 2001 From: Pierre Pronchery Date: Fri, 4 Nov 2011 14:28:38 +0000 Subject: [PATCH] Largely extended the possibilities of the "desktopctl" tool --- po/de.po | 66 ++++++++++++++++++++++-------------------- po/es.po | 66 ++++++++++++++++++++++-------------------- po/fr.po | 75 ++++++++++++++++++++++++++++-------------------- po/it.po | 66 ++++++++++++++++++++++-------------------- src/desktop.c | 13 ++++++--- src/desktop.h | 9 +++--- src/desktopctl.c | 46 +++++++++++++++++++++++++---- 7 files changed, 203 insertions(+), 138 deletions(-) diff --git a/po/de.po b/po/de.po index 4e4701f..d311ff7 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-11-04 14:50+0100\n" +"POT-Creation-Date: 2011-11-04 15:28+0100\n" "PO-Revision-Date: 2010-03-29 23:28+0200\n" "Last-Translator: Pierre Pronchery \n" "Language-Team: English\n" @@ -113,7 +113,7 @@ msgstr "" msgid "_Help" msgstr "_Hilfe" -#: ../src/browser.c:184 ../src/desktop.c:637 ../src/desktop.c:658 +#: ../src/browser.c:184 ../src/desktop.c:642 ../src/desktop.c:663 msgid "Back" msgstr "Zurück" @@ -129,7 +129,7 @@ msgstr "" msgid "Refresh" msgstr "" -#: ../src/browser.c:192 ../src/desktop.c:719 +#: ../src/browser.c:192 ../src/desktop.c:724 msgid "Home" msgstr "Persönlicher Ordner" @@ -191,7 +191,7 @@ msgstr "" #: ../src/browser.c:746 ../src/browser.c:750 ../src/copy.c:674 #: ../src/copy.c:678 ../src/delete.c:421 ../src/delete.c:426 -#: ../src/desktop.c:1320 ../src/desktop.c:1325 ../src/move.c:452 +#: ../src/desktop.c:1325 ../src/desktop.c:1330 ../src/move.c:452 #: ../src/move.c:456 ../src/properties.c:336 ../src/properties.c:340 #: ../src/view.c:367 ../src/view.c:372 msgid "Error" @@ -210,7 +210,7 @@ msgstr "" msgid "Shell scripts" msgstr "" -#: ../src/browser.c:968 ../src/desktop.c:1717 ../src/view.c:436 +#: ../src/browser.c:968 ../src/desktop.c:1722 ../src/view.c:436 msgid "All files" msgstr "Alle Dateien" @@ -344,7 +344,7 @@ msgstr "" msgid "Refreshing folder..." msgstr "Aktualisierung..." -#: ../src/callbacks.c:116 ../src/desktop.c:425 +#: ../src/callbacks.c:116 ../src/desktop.c:430 msgid "New folder" msgstr "Neu Ordner" @@ -375,7 +375,7 @@ msgstr "" msgid "Text file" msgstr "" -#: ../src/callbacks.c:823 ../src/desktop.c:444 +#: ../src/callbacks.c:823 ../src/desktop.c:449 msgid "New text file.txt" msgstr "" @@ -424,7 +424,7 @@ msgstr "" msgid "Copying: " msgstr "" -#: ../src/copy.c:152 ../src/desktop.c:1700 +#: ../src/copy.c:152 ../src/desktop.c:1705 msgid "Filename: " msgstr "" @@ -509,98 +509,98 @@ msgid "" " -r\tEquivalent to -R\n" msgstr "" -#: ../src/desktop.c:750 +#: ../src/desktop.c:755 msgid "Applications" msgstr "" -#: ../src/desktop.c:1368 +#: ../src/desktop.c:1373 msgid "Could not load preferences" msgstr "" -#: ../src/desktop.c:1655 +#: ../src/desktop.c:1660 msgid "Desktop preferences" msgstr "Desktop Einstellungen" -#: ../src/desktop.c:1692 +#: ../src/desktop.c:1697 msgid "Default color: " msgstr "" -#: ../src/desktop.c:1704 ../src/desktop.c:1750 +#: ../src/desktop.c:1709 ../src/desktop.c:1755 msgid "Background" msgstr "Hintergrund" -#: ../src/desktop.c:1707 +#: ../src/desktop.c:1712 msgid "Picture files" msgstr "Bilder" -#: ../src/desktop.c:1729 +#: ../src/desktop.c:1734 msgid "Position: " msgstr "" -#: ../src/desktop.c:1735 +#: ../src/desktop.c:1740 msgid "Centered" msgstr "" -#: ../src/desktop.c:1737 +#: ../src/desktop.c:1742 msgid "Scaled" msgstr "" -#: ../src/desktop.c:1739 +#: ../src/desktop.c:1744 msgid "Scaled (keep ratio)" msgstr "" -#: ../src/desktop.c:1741 +#: ../src/desktop.c:1746 msgid "Tiled" msgstr "" -#: ../src/desktop.c:1746 +#: ../src/desktop.c:1751 msgid "E_xtend background to all monitors" msgstr "" -#: ../src/desktop.c:1766 +#: ../src/desktop.c:1771 msgid "Monitor: " msgstr "Bildschirm: " -#: ../src/desktop.c:1775 +#: ../src/desktop.c:1780 msgid "Resolution: " msgstr "Auflösung: " -#: ../src/desktop.c:1786 +#: ../src/desktop.c:1791 msgid "Size: " msgstr "Größe: " -#: ../src/desktop.c:1810 +#: ../src/desktop.c:1815 msgid "Monitors" msgstr "Bildschirme" -#: ../src/desktop.c:1824 +#: ../src/desktop.c:1829 msgid "Desktop font: " msgstr "" -#: ../src/desktop.c:1833 +#: ../src/desktop.c:1838 msgid "Theme" msgstr "" -#: ../src/desktop.c:1869 +#: ../src/desktop.c:1874 #, c-format msgid "%dx%d (at %d,%d)" msgstr "" -#: ../src/desktop.c:1872 +#: ../src/desktop.c:1877 #, c-format msgid "%dx%d mm (%.0lfx%.0lf DPI)" msgstr "" -#: ../src/desktop.c:1892 +#: ../src/desktop.c:1897 msgid "Whole screen" msgstr "" -#: ../src/desktop.c:1897 +#: ../src/desktop.c:1902 #, c-format msgid "Monitor %d" msgstr "Bildschirm %d" -#: ../src/desktop.c:2051 +#: ../src/desktop.c:2056 msgid "" "Usage: desktop [-H|-V][-a|-c|-f|-h|-n][-m monitor]\n" " -H\tPlace icons horizontally\n" @@ -616,6 +616,10 @@ msgstr "" msgid "" "Usage: desktopctl -S\n" " -S\tDisplay or change settings\n" +" -a\tDisplay the applications registered\n" +" -c\tSort the applications registered by category\n" +" -f\tDisplay contents of the desktop folder\n" +" -h\tDisplay the homescreen\n" msgstr "" #: ../src/desktopicon.c:693 ../src/desktopicon.c:744 diff --git a/po/es.po b/po/es.po index d86d29b..b954778 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-11-04 14:50+0100\n" +"POT-Creation-Date: 2011-11-04 15:28+0100\n" "PO-Revision-Date: 2010-03-30 01:04+0200\n" "Last-Translator: Pierre Pronchery \n" "Language-Team: Spanish\n" @@ -113,7 +113,7 @@ msgstr "" msgid "_Help" msgstr "" -#: ../src/browser.c:184 ../src/desktop.c:637 ../src/desktop.c:658 +#: ../src/browser.c:184 ../src/desktop.c:642 ../src/desktop.c:663 msgid "Back" msgstr "" @@ -129,7 +129,7 @@ msgstr "" msgid "Refresh" msgstr "" -#: ../src/browser.c:192 ../src/desktop.c:719 +#: ../src/browser.c:192 ../src/desktop.c:724 msgid "Home" msgstr "Inicio" @@ -191,7 +191,7 @@ msgstr "" #: ../src/browser.c:746 ../src/browser.c:750 ../src/copy.c:674 #: ../src/copy.c:678 ../src/delete.c:421 ../src/delete.c:426 -#: ../src/desktop.c:1320 ../src/desktop.c:1325 ../src/move.c:452 +#: ../src/desktop.c:1325 ../src/desktop.c:1330 ../src/move.c:452 #: ../src/move.c:456 ../src/properties.c:336 ../src/properties.c:340 #: ../src/view.c:367 ../src/view.c:372 msgid "Error" @@ -210,7 +210,7 @@ msgstr "" msgid "Shell scripts" msgstr "" -#: ../src/browser.c:968 ../src/desktop.c:1717 ../src/view.c:436 +#: ../src/browser.c:968 ../src/desktop.c:1722 ../src/view.c:436 msgid "All files" msgstr "" @@ -344,7 +344,7 @@ msgstr "" msgid "Refreshing folder..." msgstr "" -#: ../src/callbacks.c:116 ../src/desktop.c:425 +#: ../src/callbacks.c:116 ../src/desktop.c:430 msgid "New folder" msgstr "" @@ -375,7 +375,7 @@ msgstr "" msgid "Text file" msgstr "" -#: ../src/callbacks.c:823 ../src/desktop.c:444 +#: ../src/callbacks.c:823 ../src/desktop.c:449 msgid "New text file.txt" msgstr "" @@ -424,7 +424,7 @@ msgstr "" msgid "Copying: " msgstr "" -#: ../src/copy.c:152 ../src/desktop.c:1700 +#: ../src/copy.c:152 ../src/desktop.c:1705 msgid "Filename: " msgstr "" @@ -509,98 +509,98 @@ msgid "" " -r\tEquivalent to -R\n" msgstr "" -#: ../src/desktop.c:750 +#: ../src/desktop.c:755 msgid "Applications" msgstr "" -#: ../src/desktop.c:1368 +#: ../src/desktop.c:1373 msgid "Could not load preferences" msgstr "" -#: ../src/desktop.c:1655 +#: ../src/desktop.c:1660 msgid "Desktop preferences" msgstr "Desktop preferencias" -#: ../src/desktop.c:1692 +#: ../src/desktop.c:1697 msgid "Default color: " msgstr "" -#: ../src/desktop.c:1704 ../src/desktop.c:1750 +#: ../src/desktop.c:1709 ../src/desktop.c:1755 msgid "Background" msgstr "" -#: ../src/desktop.c:1707 +#: ../src/desktop.c:1712 msgid "Picture files" msgstr "" -#: ../src/desktop.c:1729 +#: ../src/desktop.c:1734 msgid "Position: " msgstr "" -#: ../src/desktop.c:1735 +#: ../src/desktop.c:1740 msgid "Centered" msgstr "" -#: ../src/desktop.c:1737 +#: ../src/desktop.c:1742 msgid "Scaled" msgstr "" -#: ../src/desktop.c:1739 +#: ../src/desktop.c:1744 msgid "Scaled (keep ratio)" msgstr "" -#: ../src/desktop.c:1741 +#: ../src/desktop.c:1746 msgid "Tiled" msgstr "" -#: ../src/desktop.c:1746 +#: ../src/desktop.c:1751 msgid "E_xtend background to all monitors" msgstr "" -#: ../src/desktop.c:1766 +#: ../src/desktop.c:1771 msgid "Monitor: " msgstr "" -#: ../src/desktop.c:1775 +#: ../src/desktop.c:1780 msgid "Resolution: " msgstr "" -#: ../src/desktop.c:1786 +#: ../src/desktop.c:1791 msgid "Size: " msgstr "" -#: ../src/desktop.c:1810 +#: ../src/desktop.c:1815 msgid "Monitors" msgstr "" -#: ../src/desktop.c:1824 +#: ../src/desktop.c:1829 msgid "Desktop font: " msgstr "" -#: ../src/desktop.c:1833 +#: ../src/desktop.c:1838 msgid "Theme" msgstr "" -#: ../src/desktop.c:1869 +#: ../src/desktop.c:1874 #, c-format msgid "%dx%d (at %d,%d)" msgstr "" -#: ../src/desktop.c:1872 +#: ../src/desktop.c:1877 #, c-format msgid "%dx%d mm (%.0lfx%.0lf DPI)" msgstr "" -#: ../src/desktop.c:1892 +#: ../src/desktop.c:1897 msgid "Whole screen" msgstr "" -#: ../src/desktop.c:1897 +#: ../src/desktop.c:1902 #, c-format msgid "Monitor %d" msgstr "" -#: ../src/desktop.c:2051 +#: ../src/desktop.c:2056 msgid "" "Usage: desktop [-H|-V][-a|-c|-f|-h|-n][-m monitor]\n" " -H\tPlace icons horizontally\n" @@ -616,6 +616,10 @@ msgstr "" msgid "" "Usage: desktopctl -S\n" " -S\tDisplay or change settings\n" +" -a\tDisplay the applications registered\n" +" -c\tSort the applications registered by category\n" +" -f\tDisplay contents of the desktop folder\n" +" -h\tDisplay the homescreen\n" msgstr "" #: ../src/desktopicon.c:693 ../src/desktopicon.c:744 diff --git a/po/fr.po b/po/fr.po index 15ddea6..4ea2a57 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-11-04 14:50+0100\n" +"POT-Creation-Date: 2011-11-04 15:28+0100\n" "PO-Revision-Date: 2010-03-29 23:28+0200\n" "Last-Translator: Pierre Pronchery \n" "Language-Team: French\n" @@ -113,7 +113,7 @@ msgstr "_Vue" msgid "_Help" msgstr "_Aide" -#: ../src/browser.c:184 ../src/desktop.c:637 ../src/desktop.c:658 +#: ../src/browser.c:184 ../src/desktop.c:642 ../src/desktop.c:663 msgid "Back" msgstr "Retour" @@ -129,7 +129,7 @@ msgstr "Suivant" msgid "Refresh" msgstr "Rafraîchir" -#: ../src/browser.c:192 ../src/desktop.c:719 +#: ../src/browser.c:192 ../src/desktop.c:724 msgid "Home" msgstr "Dossier personnel" @@ -193,7 +193,7 @@ msgstr "" #: ../src/browser.c:746 ../src/browser.c:750 ../src/copy.c:674 #: ../src/copy.c:678 ../src/delete.c:421 ../src/delete.c:426 -#: ../src/desktop.c:1320 ../src/desktop.c:1325 ../src/move.c:452 +#: ../src/desktop.c:1325 ../src/desktop.c:1330 ../src/move.c:452 #: ../src/move.c:456 ../src/properties.c:336 ../src/properties.c:340 #: ../src/view.c:367 ../src/view.c:372 msgid "Error" @@ -212,7 +212,7 @@ msgstr "Fichiers exécutables" msgid "Shell scripts" msgstr "Scripts shell" -#: ../src/browser.c:968 ../src/desktop.c:1717 ../src/view.c:436 +#: ../src/browser.c:968 ../src/desktop.c:1722 ../src/view.c:436 msgid "All files" msgstr "Tous les fichiers" @@ -346,7 +346,7 @@ msgstr "Modifier avec :" msgid "Refreshing folder..." msgstr "Actualisation du dossier..." -#: ../src/callbacks.c:116 ../src/desktop.c:425 +#: ../src/callbacks.c:116 ../src/desktop.c:430 msgid "New folder" msgstr "Nouveau dossier" @@ -377,7 +377,7 @@ msgstr "Lien symbolique..." msgid "Text file" msgstr "Fichier texte" -#: ../src/callbacks.c:823 ../src/desktop.c:444 +#: ../src/callbacks.c:823 ../src/desktop.c:449 msgid "New text file.txt" msgstr "Nouveau fichier texte.txt" @@ -426,7 +426,7 @@ msgstr "Copie de fichier(s)" msgid "Copying: " msgstr "Copie de : " -#: ../src/copy.c:152 ../src/desktop.c:1700 +#: ../src/copy.c:152 ../src/desktop.c:1705 msgid "Filename: " msgstr "Nom de fichier : " @@ -531,98 +531,98 @@ msgstr "" " -R\tSupprimer récursivement\n" " -r\tÉquivalent à -R\n" -#: ../src/desktop.c:750 +#: ../src/desktop.c:755 msgid "Applications" msgstr "Applications" -#: ../src/desktop.c:1368 +#: ../src/desktop.c:1373 msgid "Could not load preferences" msgstr "Impossible de charger les préférences" -#: ../src/desktop.c:1655 +#: ../src/desktop.c:1660 msgid "Desktop preferences" msgstr "Préférences du bureau" -#: ../src/desktop.c:1692 +#: ../src/desktop.c:1697 msgid "Default color: " msgstr "Couleur par défaut :" -#: ../src/desktop.c:1704 ../src/desktop.c:1750 +#: ../src/desktop.c:1709 ../src/desktop.c:1755 msgid "Background" msgstr "Arrière-plan" -#: ../src/desktop.c:1707 +#: ../src/desktop.c:1712 msgid "Picture files" msgstr "Images" -#: ../src/desktop.c:1729 +#: ../src/desktop.c:1734 msgid "Position: " msgstr "Position : " -#: ../src/desktop.c:1735 +#: ../src/desktop.c:1740 msgid "Centered" msgstr "Centré" -#: ../src/desktop.c:1737 +#: ../src/desktop.c:1742 msgid "Scaled" msgstr "Étiré" -#: ../src/desktop.c:1739 +#: ../src/desktop.c:1744 msgid "Scaled (keep ratio)" msgstr "Étiré (sans déformer)" -#: ../src/desktop.c:1741 +#: ../src/desktop.c:1746 msgid "Tiled" msgstr "Mosaïque" -#: ../src/desktop.c:1746 +#: ../src/desktop.c:1751 msgid "E_xtend background to all monitors" msgstr "Étendre l'arrière-plan à tous les moniteurs" -#: ../src/desktop.c:1766 +#: ../src/desktop.c:1771 msgid "Monitor: " msgstr "Moniteur : " -#: ../src/desktop.c:1775 +#: ../src/desktop.c:1780 msgid "Resolution: " msgstr "Résolution : " -#: ../src/desktop.c:1786 +#: ../src/desktop.c:1791 msgid "Size: " msgstr "Taille: " -#: ../src/desktop.c:1810 +#: ../src/desktop.c:1815 msgid "Monitors" msgstr "Moniteurs" -#: ../src/desktop.c:1824 +#: ../src/desktop.c:1829 msgid "Desktop font: " msgstr "Police du bureau : " -#: ../src/desktop.c:1833 +#: ../src/desktop.c:1838 msgid "Theme" msgstr "Thème" -#: ../src/desktop.c:1869 +#: ../src/desktop.c:1874 #, c-format msgid "%dx%d (at %d,%d)" msgstr "%dx%d (à %d,%d)" -#: ../src/desktop.c:1872 +#: ../src/desktop.c:1877 #, c-format msgid "%dx%d mm (%.0lfx%.0lf DPI)" msgstr "%dx%d mm (%.0lfx%.0lf DPI)" -#: ../src/desktop.c:1892 +#: ../src/desktop.c:1897 msgid "Whole screen" msgstr "Écran complet" -#: ../src/desktop.c:1897 +#: ../src/desktop.c:1902 #, c-format msgid "Monitor %d" msgstr "Moniteur %d" -#: ../src/desktop.c:2051 +#: ../src/desktop.c:2056 msgid "" "Usage: desktop [-H|-V][-a|-c|-f|-h|-n][-m monitor]\n" " -H\tPlace icons horizontally\n" @@ -643,10 +643,23 @@ msgstr "" " -m\tMoniteur où afficher le bureau\n" #: ../src/desktopctl.c:44 +#, fuzzy msgid "" "Usage: desktopctl -S\n" " -S\tDisplay or change settings\n" +" -a\tDisplay the applications registered\n" +" -c\tSort the applications registered by category\n" +" -f\tDisplay contents of the desktop folder\n" +" -h\tDisplay the homescreen\n" msgstr "" +"Usage: desktop [-H|-V][-a|-c|-f|-h|-n][-m moniteur]\n" +" -H\tPlacer les icônes horizontalement\n" +" -V\tPlacer les icônes verticalement\n" +" -a\tAfficher les applications connues\n" +" -c\tTrier les applications connues par catégorie\n" +" -f\tAfficher le contenu du répertoire bureau (par défaut)\n" +" -h\tAfficher l'écran d'accueil\n" +" -m\tMoniteur où afficher le bureau\n" #: ../src/desktopicon.c:693 ../src/desktopicon.c:744 msgid "_Rename..." diff --git a/po/it.po b/po/it.po index 9de0e47..ba6e622 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-11-04 14:50+0100\n" +"POT-Creation-Date: 2011-11-04 15:28+0100\n" "PO-Revision-Date: 2010-04-07 23:18+0200\n" "Last-Translator: Pierre Pronchery \n" "Language-Team: Italian\n" @@ -113,7 +113,7 @@ msgstr "" msgid "_Help" msgstr "" -#: ../src/browser.c:184 ../src/desktop.c:637 ../src/desktop.c:658 +#: ../src/browser.c:184 ../src/desktop.c:642 ../src/desktop.c:663 msgid "Back" msgstr "" @@ -129,7 +129,7 @@ msgstr "" msgid "Refresh" msgstr "" -#: ../src/browser.c:192 ../src/desktop.c:719 +#: ../src/browser.c:192 ../src/desktop.c:724 msgid "Home" msgstr "" @@ -191,7 +191,7 @@ msgstr "" #: ../src/browser.c:746 ../src/browser.c:750 ../src/copy.c:674 #: ../src/copy.c:678 ../src/delete.c:421 ../src/delete.c:426 -#: ../src/desktop.c:1320 ../src/desktop.c:1325 ../src/move.c:452 +#: ../src/desktop.c:1325 ../src/desktop.c:1330 ../src/move.c:452 #: ../src/move.c:456 ../src/properties.c:336 ../src/properties.c:340 #: ../src/view.c:367 ../src/view.c:372 msgid "Error" @@ -210,7 +210,7 @@ msgstr "" msgid "Shell scripts" msgstr "" -#: ../src/browser.c:968 ../src/desktop.c:1717 ../src/view.c:436 +#: ../src/browser.c:968 ../src/desktop.c:1722 ../src/view.c:436 msgid "All files" msgstr "" @@ -344,7 +344,7 @@ msgstr "" msgid "Refreshing folder..." msgstr "" -#: ../src/callbacks.c:116 ../src/desktop.c:425 +#: ../src/callbacks.c:116 ../src/desktop.c:430 msgid "New folder" msgstr "" @@ -375,7 +375,7 @@ msgstr "" msgid "Text file" msgstr "" -#: ../src/callbacks.c:823 ../src/desktop.c:444 +#: ../src/callbacks.c:823 ../src/desktop.c:449 msgid "New text file.txt" msgstr "" @@ -424,7 +424,7 @@ msgstr "" msgid "Copying: " msgstr "" -#: ../src/copy.c:152 ../src/desktop.c:1700 +#: ../src/copy.c:152 ../src/desktop.c:1705 msgid "Filename: " msgstr "" @@ -509,98 +509,98 @@ msgid "" " -r\tEquivalent to -R\n" msgstr "" -#: ../src/desktop.c:750 +#: ../src/desktop.c:755 msgid "Applications" msgstr "" -#: ../src/desktop.c:1368 +#: ../src/desktop.c:1373 msgid "Could not load preferences" msgstr "" -#: ../src/desktop.c:1655 +#: ../src/desktop.c:1660 msgid "Desktop preferences" msgstr "" -#: ../src/desktop.c:1692 +#: ../src/desktop.c:1697 msgid "Default color: " msgstr "" -#: ../src/desktop.c:1704 ../src/desktop.c:1750 +#: ../src/desktop.c:1709 ../src/desktop.c:1755 msgid "Background" msgstr "" -#: ../src/desktop.c:1707 +#: ../src/desktop.c:1712 msgid "Picture files" msgstr "" -#: ../src/desktop.c:1729 +#: ../src/desktop.c:1734 msgid "Position: " msgstr "" -#: ../src/desktop.c:1735 +#: ../src/desktop.c:1740 msgid "Centered" msgstr "" -#: ../src/desktop.c:1737 +#: ../src/desktop.c:1742 msgid "Scaled" msgstr "" -#: ../src/desktop.c:1739 +#: ../src/desktop.c:1744 msgid "Scaled (keep ratio)" msgstr "" -#: ../src/desktop.c:1741 +#: ../src/desktop.c:1746 msgid "Tiled" msgstr "" -#: ../src/desktop.c:1746 +#: ../src/desktop.c:1751 msgid "E_xtend background to all monitors" msgstr "" -#: ../src/desktop.c:1766 +#: ../src/desktop.c:1771 msgid "Monitor: " msgstr "" -#: ../src/desktop.c:1775 +#: ../src/desktop.c:1780 msgid "Resolution: " msgstr "" -#: ../src/desktop.c:1786 +#: ../src/desktop.c:1791 msgid "Size: " msgstr "" -#: ../src/desktop.c:1810 +#: ../src/desktop.c:1815 msgid "Monitors" msgstr "" -#: ../src/desktop.c:1824 +#: ../src/desktop.c:1829 msgid "Desktop font: " msgstr "" -#: ../src/desktop.c:1833 +#: ../src/desktop.c:1838 msgid "Theme" msgstr "" -#: ../src/desktop.c:1869 +#: ../src/desktop.c:1874 #, c-format msgid "%dx%d (at %d,%d)" msgstr "" -#: ../src/desktop.c:1872 +#: ../src/desktop.c:1877 #, c-format msgid "%dx%d mm (%.0lfx%.0lf DPI)" msgstr "" -#: ../src/desktop.c:1892 +#: ../src/desktop.c:1897 msgid "Whole screen" msgstr "" -#: ../src/desktop.c:1897 +#: ../src/desktop.c:1902 #, c-format msgid "Monitor %d" msgstr "" -#: ../src/desktop.c:2051 +#: ../src/desktop.c:2056 msgid "" "Usage: desktop [-H|-V][-a|-c|-f|-h|-n][-m monitor]\n" " -H\tPlace icons horizontally\n" @@ -616,6 +616,10 @@ msgstr "" msgid "" "Usage: desktopctl -S\n" " -S\tDisplay or change settings\n" +" -a\tDisplay the applications registered\n" +" -c\tSort the applications registered by category\n" +" -f\tDisplay contents of the desktop folder\n" +" -h\tDisplay the homescreen\n" msgstr "" #: ../src/desktopicon.c:693 ../src/desktopicon.c:744 diff --git a/src/desktop.c b/src/desktop.c index bcb6133..cff013b 100644 --- a/src/desktop.c +++ b/src/desktop.c @@ -377,6 +377,7 @@ static GdkFilterReturn _event_client_message(XClientMessageEvent * xevent, Desktop * desktop) { DesktopMessage message; + DesktopLayout layout; if(xevent->message_type != gdk_x11_get_xatom_by_name( DESKTOP_CLIENT_MESSAGE)) @@ -384,8 +385,12 @@ static GdkFilterReturn _event_client_message(XClientMessageEvent * xevent, message = xevent->data.b[0]; switch(message) { + case DESKTOP_MESSAGE_SET_LAYOUT: + layout = xevent->data.b[1]; + desktop_set_layout(desktop, layout); + break; case DESKTOP_MESSAGE_SHOW: - if(xevent->data.b[1] == DESKTOP_MESSAGE_SHOW_SETTINGS) + if(xevent->data.b[1] == DESKTOP_SHOW_SETTINGS) _on_popup_preferences(desktop); /* XXX */ break; } @@ -594,7 +599,7 @@ void desktop_set_layout(Desktop * desktop, DesktopLayout layout) case DESKTOP_LAYOUT_HOMESCREEN: _layout_homescreen(desktop); break; - case DESKTOP_LAYOUT_NULL: + case DESKTOP_LAYOUT_NONE: /* nothing to do */ break; } @@ -866,7 +871,7 @@ static int _current_loop(Desktop * desktop) case DESKTOP_LAYOUT_FILES: return _current_loop_files(desktop); case DESKTOP_LAYOUT_HOMESCREEN: - case DESKTOP_LAYOUT_NULL: + case DESKTOP_LAYOUT_NONE: break; /* nothing to do */ } return -1; @@ -2103,7 +2108,7 @@ int main(int argc, char * argv[]) return _usage(); break; case 'n': - prefs.layout = DESKTOP_LAYOUT_NULL; + prefs.layout = DESKTOP_LAYOUT_NONE; break; default: return _usage(); diff --git a/src/desktop.h b/src/desktop.h index b758898..107e83b 100644 --- a/src/desktop.h +++ b/src/desktop.h @@ -43,7 +43,7 @@ typedef enum _DesktopAlignment typedef enum _DesktopLayout { - DESKTOP_LAYOUT_NULL = 0, + DESKTOP_LAYOUT_NONE = 0, DESKTOP_LAYOUT_APPLICATIONS, DESKTOP_LAYOUT_CATEGORIES, DESKTOP_LAYOUT_FILES, @@ -52,12 +52,13 @@ typedef enum _DesktopLayout typedef enum _DesktopMessage { - DESKTOP_MESSAGE_SHOW = 0 + DESKTOP_MESSAGE_SET_LAYOUT = 0, + DESKTOP_MESSAGE_SHOW } DesktopMessage; -typedef enum _DesktopMessageShow +typedef enum _DesktopShow { - DESKTOP_MESSAGE_SHOW_SETTINGS = 0 + DESKTOP_SHOW_SETTINGS = 0 } DesktopMessageShow; typedef struct _DesktopPrefs diff --git a/src/desktopctl.c b/src/desktopctl.c index a5aa47c..5c64e50 100644 --- a/src/desktopctl.c +++ b/src/desktopctl.c @@ -42,7 +42,11 @@ static int _usage(void) { fputs(_("Usage: desktopctl -S\n" -" -S Display or change settings\n"), stderr); +" -S Display or change settings\n" +" -a Display the applications registered\n" +" -c Sort the applications registered by category\n" +" -f Display contents of the desktop folder\n" +" -h Display the homescreen\n"), stderr); return 1; } @@ -52,7 +56,7 @@ int main(int argc, char * argv[]) { int o; int action = -1; - int show; + int what = 0; GdkEvent event; GdkEventClient * client = &event.client; @@ -60,14 +64,44 @@ int main(int argc, char * argv[]) bindtextdomain(PACKAGE, LOCALEDIR); textdomain(PACKAGE); gtk_init(&argc, &argv); - while((o = getopt(argc, argv, "")) != -1) + while((o = getopt(argc, argv, "Sacfhn")) != -1) switch(o) { + case 'a': + if(action != -1) + return _usage(); + action = DESKTOP_MESSAGE_SET_LAYOUT; + what = DESKTOP_LAYOUT_APPLICATIONS; + break; + case 'c': + if(action != -1) + return _usage(); + action = DESKTOP_MESSAGE_SET_LAYOUT; + what = DESKTOP_LAYOUT_CATEGORIES; + break; + case 'f': + if(action != -1) + return _usage(); + action = DESKTOP_MESSAGE_SET_LAYOUT; + what = DESKTOP_LAYOUT_FILES; + break; + case 'h': + if(action != -1) + return _usage(); + action = DESKTOP_MESSAGE_SET_LAYOUT; + what = DESKTOP_LAYOUT_HOMESCREEN; + break; + case 'n': + if(action != -1) + return _usage(); + action = DESKTOP_MESSAGE_SET_LAYOUT; + what = DESKTOP_LAYOUT_NONE; + break; case 'S': - if(show != -1) + if(action != -1) return _usage(); action = DESKTOP_MESSAGE_SHOW; - show = DESKTOP_MESSAGE_SHOW_SETTINGS; + what = DESKTOP_SHOW_SETTINGS; break; default: return _usage(); @@ -81,7 +115,7 @@ int main(int argc, char * argv[]) client->message_type = gdk_atom_intern(DESKTOP_CLIENT_MESSAGE, FALSE); client->data_format = 8; client->data.b[0] = action; - client->data.b[1] = show; + client->data.b[1] = what; client->data.b[2] = TRUE; gdk_event_send_clientmessage_toall(&event); return 0;