summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--resources/locale/de/LC_MESSAGES/de.po67
-rw-r--r--resources/locale/de/LC_MESSAGES/gnomepie.mobin10277 -> 10800 bytes
-rw-r--r--resources/locale/fr/LC_MESSAGES/fr.po1108
-rw-r--r--resources/locale/fr/LC_MESSAGES/gnomepie.mobin9033 -> 10697 bytes
-rw-r--r--resources/locale/gnomepie.pot59
-rw-r--r--resources/ui/preferences.ui82
-rw-r--r--src/deamon.vala2
-rw-r--r--src/gui/preferencesWindow.vala14
-rw-r--r--src/images/themedIcon.vala8
-rw-r--r--src/renderers/pieRenderer.vala62
-rwxr-xr-xsrc/renderers/pieWindow.vala45
-rw-r--r--src/renderers/sliceRenderer.vala17
-rw-r--r--src/themes/sliceLayer.vala16
-rw-r--r--src/themes/theme.vala12
-rw-r--r--src/utilities/config.vala5
15 files changed, 860 insertions, 637 deletions
diff --git a/resources/locale/de/LC_MESSAGES/de.po b/resources/locale/de/LC_MESSAGES/de.po
index b942915..b22212f 100644
--- a/resources/locale/de/LC_MESSAGES/de.po
+++ b/resources/locale/de/LC_MESSAGES/de.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: gnomepie 0.1\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-05-02 14:39+0200\n"
+"POT-Creation-Date: 2015-08-06 12:43+0200\n"
"PO-Revision-Date: 2011-08-25 21:04+0200\n"
"Last-Translator: Simon Schneegans <code@simonschneegans.de>\n"
"Language-Team: German\n"
@@ -152,23 +152,23 @@ msgstr "Symbolthema"
msgid "Custom Icon"
msgstr "Benutzerdefiniertes Symbol"
-#: ../ui/preferences.ui:7 ../../src/gui/preferencesWindow.vala:76
+#: ../ui/preferences.ui:7 ../../src/gui/preferencesWindow.vala:77
msgid "Gnome-Pie Settings"
msgstr "Gnome-Pie - Einstellungen"
-#: ../ui/preferences.ui:73
+#: ../ui/preferences.ui:72
msgid "Start Gnome-Pie on login"
msgstr "Beim Anmelden automatisch ausführen"
-#: ../ui/preferences.ui:79 ../ui/preferences.ui:80
+#: ../ui/preferences.ui:78 ../ui/preferences.ui:79
msgid "If checked, Gnome-Pie will start silently everytime you log in."
msgstr "Wenn aktiviert, startet Gnome-Pie im Hintergrund beim Anmelden."
-#: ../ui/preferences.ui:92
+#: ../ui/preferences.ui:91
msgid "Display panel icon "
msgstr "Zeige ein Symbol im Panel"
-#: ../ui/preferences.ui:98 ../ui/preferences.ui:99
+#: ../ui/preferences.ui:97 ../ui/preferences.ui:98
msgid ""
"If not checked, you can access this menu by launching Gnome-Pie a second "
"time."
@@ -176,19 +176,29 @@ msgstr ""
"Falls nicht aktiviert, kann dieses Menü durch ein nochmaliges starten von "
"Gnome-Pie geöffnet werden."
-#: ../ui/preferences.ui:119
-msgid "Activation radius"
-msgstr "Aktivierungsentfernung"
+#: ../ui/preferences.ui:110
+msgid "Select Slices by typing their names"
+msgstr "Tippe den Namen von Slices um Sie auszuwählen"
+
+#: ../ui/preferences.ui:116 ../ui/preferences.ui:117
+msgid ""
+"If checked, you can select items in a Pie by typing their names. Otherwise "
+"you can activate them with a hotkey (which can be displayed by pressing ALT "
+"when a Pie is openened)."
+msgstr ""
+"Wenn aktiviert, kannst du Einträge wählen indem du ihre Namen tippst. Anderenfalls "
+"kannst du alle Einträge durch drücken der Zifferntasten auswählen (halte ALT "
+"gedrückt um diese Hotkeys anzuzeigen wenn ein Pie geöffnet ist)."
-#: ../ui/preferences.ui:157
+#: ../ui/preferences.ui:136
msgid "Behavior"
msgstr "Verhalten"
-#: ../ui/preferences.ui:192
+#: ../ui/preferences.ui:171
msgid "Display Slice labels"
msgstr "Zeige Namen der Slices"
-#: ../ui/preferences.ui:198 ../ui/preferences.ui:199
+#: ../ui/preferences.ui:177 ../ui/preferences.ui:178
msgid ""
"Displays the name of each Slice next to it. Only available if supported by "
"the theme."
@@ -196,23 +206,27 @@ msgstr ""
"Zeigt den Name jeder Slice an. Nur möglich, wenn durch das aktuelle Thema "
"unterstützt."
-#: ../ui/preferences.ui:219
+#: ../ui/preferences.ui:198
msgid "Global scale"
msgstr "Skalierungsfaktor"
-#: ../ui/preferences.ui:259
+#: ../ui/preferences.ui:238
msgid "Maximum slices per pie"
msgstr "Maximale Zahl von Einträgen pro Pie"
-#: ../ui/preferences.ui:297
+#: ../ui/preferences.ui:278
+msgid "Activation radius"
+msgstr "Aktivierungsentfernung"
+
+#: ../ui/preferences.ui:316
msgid "Appearance"
msgstr "Erscheinungsbild"
-#: ../ui/preferences.ui:326 ../../src/gui/preferencesWindow.vala:107
+#: ../ui/preferences.ui:345 ../../src/gui/preferencesWindow.vala:108
msgid "General Settings"
msgstr "Allgemeine Einstellungen"
-#: ../ui/preferences.ui:518
+#: ../ui/preferences.ui:537
msgid ""
"<b><big>This Pie is empty!</big>\n"
"\n"
@@ -230,7 +244,7 @@ msgstr ""
"\n"
"Zur manuellen und fortgeschrittenen Konfiguration klicke auf das Symbol."
-#: ../ui/preferences.ui:539
+#: ../ui/preferences.ui:558
msgid ""
"<b><big>You have no Pies!</big>\n"
"\n"
@@ -242,7 +256,7 @@ msgstr ""
"Erstelle einen neuen! </b> Klicke dazu einfach auf das kleine Pluszeichen "
"unter der leeren Liste auf der linken Seite."
-#: ../ui/preferences.ui:606 ../../src/gui/preferencesWindow.vala:108
+#: ../ui/preferences.ui:625 ../../src/gui/preferencesWindow.vala:109
msgid "Pie Settings"
msgstr "Pie-Einstellungen"
@@ -283,15 +297,15 @@ msgid "Opens another Pie of Gnome-Pie. You may create sub menus this way."
msgstr ""
"Öffnet einen anderen Pie. Auf diese Art können Submenüs erstellt werden."
-#: ../../src/gui/preferencesWindow.vala:77
+#: ../../src/gui/preferencesWindow.vala:78
msgid "bake your pies!"
msgstr "mach schöne Kuchen!"
-#: ../../src/gui/preferencesWindow.vala:350
+#: ../../src/gui/preferencesWindow.vala:364
msgid "New Pie"
msgstr "Neuer Pie"
-#: ../../src/gui/preferencesWindow.vala:365
+#: ../../src/gui/preferencesWindow.vala:379
msgid ""
"Do you really want to delete the selected Pie with all contained Slices?"
msgstr "Soll dieser Pie wirklich mit allen Slices gelöscht werden?"
@@ -387,15 +401,15 @@ msgstr "Themen"
msgid "By"
msgstr "Von"
-#: ../../src/gui/indicator.vala:114
+#: ../../src/gui/indicator.vala:126
msgid "_Preferences"
msgstr "Einstellungen"
-#: ../../src/gui/indicator.vala:123
+#: ../../src/gui/indicator.vala:135
msgid "_About"
msgstr "Über"
-#: ../../src/gui/indicator.vala:138
+#: ../../src/gui/indicator.vala:150
msgid "_Quit"
msgstr "Beenden"
@@ -500,7 +514,8 @@ msgstr "Gruppe: Fensterliste für aktive Arbeitsfläche"
#: ../../src/actionGroups/workspaceWindowListGroup.vala:37
msgid "Shows a Slice for each of your opened windows on the current workspace."
-msgstr "Zeigt eine Slice für jedes geöffnete Fenster der aktiven Arbeitsfläche an."
+msgstr ""
+"Zeigt eine Slice für jedes geöffnete Fenster der aktiven Arbeitsfläche an."
#: ../../src/actionGroups/sessionGroup.vala:35
msgid "Group: Session Control"
diff --git a/resources/locale/de/LC_MESSAGES/gnomepie.mo b/resources/locale/de/LC_MESSAGES/gnomepie.mo
index cfdb11f..d615822 100644
--- a/resources/locale/de/LC_MESSAGES/gnomepie.mo
+++ b/resources/locale/de/LC_MESSAGES/gnomepie.mo
Binary files differ
diff --git a/resources/locale/fr/LC_MESSAGES/fr.po b/resources/locale/fr/LC_MESSAGES/fr.po
index 08cd711..cafd19e 100644
--- a/resources/locale/fr/LC_MESSAGES/fr.po
+++ b/resources/locale/fr/LC_MESSAGES/fr.po
@@ -1,505 +1,603 @@
-# French translations for gnomepie package
-# Traductions françaises du paquet gnomepie.
-# Copyright (C) 2012 Simon Schneegans <code@simonschneegans.de>
-# This file is distributed under the same license as the gnomepie package.
-# Grégoire BELLON-GERVAIS <greggbg@gmail.com>, 2012.
-# Alex Maxime <cad.maxime@gmail.com>, 2012.
-# Mathilde Simeon <titi@positon.org> 2012.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: gnomepie 0.5\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-05-15 20:14+0200\n"
-"PO-Revision-Date: 2012-05-15 22:41+0100\n"
-"Last-Translator: mathilde simeon <titi@positon.org>\n"
-"Language-Team: French\n"
-"Language: fr\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n > 1);\n"
-
-#: ../../src/gui/iconSelectWindow.vala:186
-msgid "All icons"
-msgstr "Toutes les icônes"
-
-#: ../../src/gui/iconSelectWindow.vala:187
-#: ../../src/pies/defaultConfig.vala:36
-msgid "Applications"
-msgstr "Applications"
-
-#: ../../src/gui/iconSelectWindow.vala:188
-msgid "Actions"
-msgstr "Actions"
-
-#: ../../src/gui/iconSelectWindow.vala:189
-msgid "Places"
-msgstr "Dossiers"
-
-#: ../../src/gui/iconSelectWindow.vala:190
-msgid "File types"
-msgstr "Types de fichiers"
-
-#: ../../src/gui/iconSelectWindow.vala:191
-msgid "Emotes"
-msgstr "Émoticones"
-
-#: ../../src/gui/iconSelectWindow.vala:192
-msgid "Miscellaneous"
-msgstr "Divers"
-
-#: ../../src/gui/iconSelectWindow.vala:267
-#: ../../src/gui/iconSelectWindow.vala:269
-msgid "All supported image formats"
-msgstr "Tous les formats d'images supportés"
-
-#: ../../src/gui/triggerSelectButton.vala:63
-msgid "Press a hotkey ..."
-msgstr "Faites un raccourci clavier"
-
-#: ../../src/gui/themeList.vala:62
-msgid "Themes"
-msgstr "Thèmes"
-
-#: ../../src/gui/themeList.vala:99
-msgid "By"
-msgstr "Par"
-
-#: ../../src/gui/piePreviewRenderer.vala:412
-msgid "Click to edit"
-msgstr "Cliquez pour éditer"
-
-#: ../../src/gui/piePreviewRenderer.vala:412
-#: ../../src/gui/piePreviewRenderer.vala:427
-msgid "Drag to move"
-msgstr "Faites glisser pour déplacer"
-
-#: ../../src/gui/piePreviewRenderer.vala:415
-msgid "Click to add a new Slice"
-msgstr ""
-"Cliquez pour ajouter \n"
-" une nouvelle Part"
-
-#: ../../src/gui/piePreviewRenderer.vala:419
-msgid "Drop to add as new Slice"
-msgstr ""
-"Déposez pour ajouter \n"
-" une nouvelle Part"
-
-#: ../../src/gui/piePreviewRenderer.vala:422
-msgid "Drop to move Slice"
-msgstr ""
-"Déposez pour \n"
-" déplacer la Part"
-
-#: ../../src/gui/piePreviewRenderer.vala:427
-msgid "Click to delete"
-msgstr "Cliquez pour supprimer"
-
-#: ../../src/gui/newSliceWindow.vala:291
-msgid "Rename me!"
-msgstr "Renommez-moi!"
-
-#: ../../src/gui/piePreview.vala:152
-msgid "Do you really want to delete this Slice?"
-msgstr "Voulez-vous supprimer cette Part ?"
-
-#: ../../src/gui/triggerSelectWindow.vala:166
-msgid ""
-"This hotkey is already assigned to the pie \"%s\"! \n"
-"\n"
-"Please select another one or cancel your selection."
-msgstr ""
-"Ce raccourci clavier est déja défini pour la Tarte \"%s\"! \n"
-"\n"
-"Merci d'en choisir un autre ou d'annuler votre choix."
-
-#: ../../src/gui/sliceTypeList.vala:60
-msgid "Slice types"
-msgstr "Types de Part"
-
-#: ../../src/gui/preferencesWindow.vala:175
-msgid "No Pie selected."
-msgstr "Aucune Tarte sélectionnée"
-
-#: ../../src/gui/preferencesWindow.vala:215
-msgid "New Pie"
-msgstr "Nouvelle Tarte"
-
-#: ../../src/gui/preferencesWindow.vala:228
-msgid "Do you really want to delete the selected Pie with all contained Slices?"
-msgstr "Voulez-vous supprimer la Tarte sélectionnée et son contenu ?"
-
-#: ../../src/utilities/trigger.vala:163
-msgid "Button %i"
-msgstr "Bouton %i"
-
-#: ../../src/utilities/trigger.vala:166
-msgid "LeftButton"
-msgstr "Bouton Gauche"
-
-#: ../../src/utilities/trigger.vala:168
-msgid "RightButton"
-msgstr "Bouton Droit"
-
-#: ../../src/utilities/trigger.vala:170
-msgid "MiddleButton"
-msgstr "Bouton Central"
-
-#: ../../src/utilities/trigger.vala:188
-#: ../../src/utilities/trigger.vala:190
-#: ../../src/utilities/trigger.vala:192
-#: ../../src/utilities/trigger.vala:196
-msgid "Turbo"
-msgstr "Turbo"
-
-#: ../../src/utilities/trigger.vala:188
-#: ../../src/utilities/trigger.vala:192
-#: ../../src/utilities/trigger.vala:194
-#: ../../src/utilities/trigger.vala:198
-msgid "Delayed"
-msgstr "Différé"
-
-#: ../../src/utilities/trigger.vala:188
-#: ../../src/utilities/trigger.vala:190
-#: ../../src/utilities/trigger.vala:194
-#: ../../src/utilities/trigger.vala:200
-msgid "Centered"
-msgstr "Centré"
-
-#: ../../src/utilities/trigger.vala:212
-#: ../../src/utilities/trigger.vala:213
-#: ../../src/utilities/bindingManager.vala:161
-#: ../../src/utilities/key.vala:65
-msgid "Not bound"
-msgstr "Aucun raccourci"
-
-#: ../../src/actions/appAction.vala:34
-msgid "Launch application"
-msgstr "Lancer l'application"
-
-#: ../../src/actions/appAction.vala:36
-msgid "Executes the given command."
-msgstr "Exécute la commande définie"
-
-#: ../../src/actions/uriAction.vala:34
-msgid "Open URI"
-msgstr "Ouvrir une URL"
-
-#: ../../src/actions/uriAction.vala:36
-msgid "Opens a given location. You may use URL's or files paths."
-msgstr "Ouvre un emplacement défini. Vous pouvez utiliser une URL ou un emplacementde fichier"
-
-#: ../../src/actions/pieAction.vala:34
-msgid "Open Pie"
-msgstr "Ouvrir une Tarte"
-
-#: ../../src/actions/pieAction.vala:36
-msgid "Opens another Pie of Gnome-Pie. You may create sub menus this way."
-msgstr "Ouvre une autre Part de Tarte. Vous pouvez ainsi créer des sous-menus."
-
-#: ../../src/actions/actionRegistry.vala:119
-msgid "Trash"
-msgstr "Poubelle"
-
-#: ../../src/actions/keyAction.vala:34
-msgid "Press hotkey"
-msgstr "Appuyez sur le raccourci clavier"
-
-#: ../../src/actions/keyAction.vala:36
-msgid "Simulates the activation of a hotkey."
-msgstr "Simule l'activation d'un raccourci clavier"
-
-#: ../../src/pies/defaultConfig.vala:29
-msgid "Multimedia"
-msgstr "Multimédia"
-
-#: ../../src/pies/defaultConfig.vala:30
-msgid "Next Track"
-msgstr "Piste suivante"
-
-#: ../../src/pies/defaultConfig.vala:31
-msgid "Stop"
-msgstr "Stop"
-
-#: ../../src/pies/defaultConfig.vala:32
-msgid "Previous Track"
-msgstr "Piste précédente"
-
-#: ../../src/pies/defaultConfig.vala:33
-msgid "Play/Pause"
-msgstr "Lecture/Pause"
-
-#: ../../src/pies/defaultConfig.vala:45
-msgid "Bookmarks"
-msgstr "Favoris"
-
-#: ../../src/pies/defaultConfig.vala:50
-msgid "Session"
-msgstr "Session"
-
-#: ../../src/pies/defaultConfig.vala:54
-msgid "Main Menu"
-msgstr "Menu Principal"
-
-#: ../../src/pies/defaultConfig.vala:58
-msgid "Window"
-msgstr "Fenêtre"
-
-#: ../../src/pies/defaultConfig.vala:59
-msgid "Scale"
-msgstr "Échelle"
-
-#: ../../src/pies/defaultConfig.vala:60
-msgid "Minimize"
-msgstr "Minimiser"
-
-#: ../../src/pies/defaultConfig.vala:61
-msgid "Close"
-msgstr "Fermer"
-
-#: ../../src/pies/defaultConfig.vala:62
-msgid "Maximize"
-msgstr "Agrandir"
-
-#: ../../src/pies/defaultConfig.vala:63
-msgid "Restore"
-msgstr "Restaurer"
-
-#: ../../src/actionGroups/menuGroup.vala:35
-msgid "Group: Main menu"
-msgstr "Groupe : Menu principal"
-
-#: ../../src/actionGroups/menuGroup.vala:37
-msgid "Displays your main menu structure."
-msgstr "Affiche la structure du menu principal"
-
-#: ../../src/actionGroups/windowListGroup.vala:34
-msgid "Group: Window List"
-msgstr "Groupe : Liste de fenêtres"
-
-#: ../../src/actionGroups/windowListGroup.vala:36
-msgid "Shows a Slice for each of your opened Windows. Almost like Alt-Tab."
-msgstr "Affiche une Part pour chacune des fenêtres ouvertes. Fonctionne comme Alt-Tab."
-
-#: ../../src/actionGroups/sessionGroup.vala:35
-msgid "Group: Session Control"
-msgstr "Groupe : Gestion de la Session"
-
-#: ../../src/actionGroups/sessionGroup.vala:37
-msgid "Shows a Slice for Shutdown, Reboot, and Hibernate."
-msgstr "Affiche une Part pour Éteindre, Redémarrer, et Hiberner"
-
-#: ../../src/actionGroups/sessionGroup.vala:60
-msgid "Shutdown"
-msgstr "Éteindre"
-
-#: ../../src/actionGroups/sessionGroup.vala:63
-msgid "Logout"
-msgstr "Déconnexion"
-
-#: ../../src/actionGroups/sessionGroup.vala:66
-msgid "Reboot"
-msgstr "Redémarrer"
-
-#: ../../src/actionGroups/clipboardGroup.vala:64
-msgid "Group: Clipboard"
-msgstr "Groupe : Presse-papier"
-
-#: ../../src/actionGroups/clipboardGroup.vala:66
-msgid "Manages your Clipboard."
-msgstr "Gère votre Presse-papier"
-
-#: ../../src/actionGroups/devicesGroup.vala:35
-msgid "Group: Devices"
-msgstr "Groupe : Périphériques"
-
-#: ../../src/actionGroups/devicesGroup.vala:37
-msgid "Shows a Slice for each plugged in devices, like USB-Sticks."
-msgstr "Affiche une Part pour chaque périphérique branché, par exemple une clé USB"
-
-#: ../../src/actionGroups/devicesGroup.vala:85
-msgid "Root"
-msgstr "Racine"
-
-#: ../../src/actionGroups/bookmarkGroup.vala:36
-msgid "Group: Bookmarks"
-msgstr "Groupe : Favoris"
-
-#: ../../src/actionGroups/bookmarkGroup.vala:38
-msgid "Shows a Slice for each of your directory Bookmarks."
-msgstr "Affiche une Part pour chacun des répertoires en Favoris"
-
-#: ../ui/rename_pie.ui:8
-msgid "Rename a Pie"
-msgstr "Renommer la Tarte"
-
-#: ../ui/settings.ui:9
-#: ../ui/preferences.ui:27
-msgid "General Settings"
-msgstr "Paramètres généraux"
-
-#: ../ui/settings.ui:74
-msgid "Start Gnome-Pie on login"
-msgstr "Lancer Gnome-Pie au démarrage"
-
-#: ../ui/settings.ui:79
-#: ../ui/settings.ui:80
-msgid "If checked, Gnome-Pie will start silently everytime you log in."
-msgstr "Si coché, Gnome-Pie se lancera à chaque connexion"
-
-#: ../ui/settings.ui:93
-msgid "Display panel icon "
-msgstr "Affiche l'icône dans la zone de notification "
-
-#: ../ui/settings.ui:98
-#: ../ui/settings.ui:99
-msgid "If not checked, you can access this menu by launching Gnome-Pie a second time."
-msgstr "Si non coché, vous pouvez accéder à ce menu en lançant Gnome-Pie une seconde fois "
-
-#: ../ui/settings.ui:118
-msgid "Behavior"
-msgstr "Comportement"
-
-#: ../ui/settings.ui:175
-msgid "Global scale"
-msgstr "Échelle globale"
-
-#: ../ui/settings.ui:207
-msgid "Display Slice labels"
-msgstr "Afficher le nom des Parts"
-
-#: ../ui/settings.ui:212
-#: ../ui/settings.ui:213
-msgid "Displays the name of each Slice next to it. Only available if supported by the theme."
-msgstr ""
-"Afficher le nom à côté de chaque Part.\n"
-"(disponbile uniquement pour les thèmes compatibles)"
-
-#: ../ui/settings.ui:232
-msgid "Appearance"
-msgstr "Apparence"
-
-#: ../ui/icon_select.ui:8
-msgid "Select an icon"
-msgstr "Choisir une icône"
-
-#: ../ui/icon_select.ui:85
-msgid "Icon Theme"
-msgstr "Thème d'icônes"
-
-#: ../ui/icon_select.ui:105
-msgid "Custom Icon"
-msgstr "Icône personnalisée"
-
-#: ../ui/slice_select.ui:9
-msgid "Slice Options"
-msgstr "Options de la Part"
-
-#: ../ui/slice_select.ui:139
-msgid "There are no options for this Slice type."
-msgstr "Il n'y a pas d'options pour ce type de Part"
-
-#: ../ui/slice_select.ui:165
-msgid "Name of the Slice "
-msgstr "Nom de la Part"
-
-#: ../ui/slice_select.ui:204
-msgid "URI to open"
-msgstr "Liens web à ouvrir"
-
-#: ../ui/slice_select.ui:243
-msgid "Command to execute"
-msgstr "Commande à exécuter"
-
-#: ../ui/slice_select.ui:282
-msgid "Hotkey to press"
-msgstr "Raccourci clavier à effectuer"
-
-#: ../ui/slice_select.ui:311
-msgid "Pie to open"
-msgstr "Tarte à ouvrir"
-
-#: ../ui/slice_select.ui:340
-msgid "Is Quick Action"
-msgstr "Action rapide"
-
-#: ../ui/slice_select.ui:354
-#: ../ui/slice_select.ui:355
-msgid "This Slice will be executed when you click in the middle of the Pie."
-msgstr "Cette Part sera exécutée quand vous cliquerez au milieu de la Tarte."
-
-#: ../ui/slice_select.ui:388
-msgid "Slice options"
-msgstr "Options de la Part"
-
-#: ../ui/preferences.ui:8
-msgid "Gnome-Pie Settings"
-msgstr "Paramètres de Gnome-Pie"
-
-#: ../ui/preferences.ui:261
-msgid ""
-"<b><big>This Pie is empty!</big>\n"
-"\n"
-"Start adding Slices to it!</b> This can be done by dragging stuff to the plus sign below. You can try a lot! For example application launchers or folders. Even URLs from your browser are possible... \n"
-"\n"
-"For manual and advanced configuration click on the plus sign."
-msgstr ""
-"<b><big>Cette Tarte est vide !</big>\n"
-"\n"
-"Commencez par lui ajouter des Parts !</b>\n"
-"Pour cela, vous pouvez déplacer des éléments sur le signe plus. Vous pouvez essayer plein de choses ! Par exemple, des lanceurs d'application ou des dossiers. Même les liens de votre navigateur sont supportés...\n"
-"\n"
-"Pour un ajout manuel ou avancé, cliquez sur le signe plus."
-
-#: ../ui/preferences.ui:282
-msgid ""
-"<b><big>You have no Pies!</big>\n"
-"\n"
-"Start by creating one! </b> This can be done by clicking on the tiny little plus sign in the lower left corner."
-msgstr ""
-"<b><big>Vous n'avez aucune Tarte !</big>\n"
-"\n"
-"Commencez par en créer une !</b> Vous pouvez le faire en cliquant sur le petit signe plus dans le coin en bas à gauche."
-
-#: ../ui/trigger_select.ui:8
-msgid "Activation Settings"
-msgstr "Paramètres d'activation"
-
-#: ../ui/trigger_select.ui:86
-msgid "It's possible to bind mouse buttons as well!"
-msgstr "Il est également possible d'assigner des boutons de souris !"
-
-#: ../ui/trigger_select.ui:118
-msgid "Turbo mode"
-msgstr "Mode Turbo"
-
-#: ../ui/trigger_select.ui:123
-#: ../ui/trigger_select.ui:124
-msgid "If checked, the Pie will close when you release the chosen hot key."
-msgstr "Si coché, la Tarte se ferme quand vous relâchez le raccourci clavier"
-
-#: ../ui/trigger_select.ui:137
-msgid "Long press for activation"
-msgstr "Appui prolongé pour activer"
-
-#: ../ui/trigger_select.ui:142
-#: ../ui/trigger_select.ui:143
-msgid "If checked, the Pie will only open if you press this hot key a bit longer."
-msgstr "Si coché, la Tarte s'ouvrira seulement si vous maintenez le raccourci clavier"
-
-#: ../ui/trigger_select.ui:156
-msgid "Open Pie centered on the screen"
-msgstr "Ouvrir la Tarte au centre de l'écran"
-
-#: ../ui/trigger_select.ui:161
-#: ../ui/trigger_select.ui:162
-msgid "If checked, the Pie will open in the middle of your screen. Else it will pop up at your pointer."
-msgstr "Si coché, la Tarte s'ouvrira au centre de l'écran. Sinon elle apparaîtra sous la souris"
-
-#: ../ui/trigger_select.ui:181
-msgid "Activation options"
-msgstr "Options d'activation"
-
-
+# French translations for gnomepie package
+# Traductions françaises du paquet gnomepie.
+# Copyright (C) 2012 Simon Schneegans <code@simonschneegans.de>
+# This file is distributed under the same license as the gnomepie package.
+# Grégoire BELLON-GERVAIS <greggbg@gmail.com>, 2012.
+# Alex Maxime <cad.maxime@gmail.com>, 2012.
+# Mathilde Simeon <titi@positon.org> 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: gnomepie 0.5\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2015-07-29 23:09+0200\n"
+"PO-Revision-Date: 2015-07-29 23:19+0200\n"
+"Last-Translator: Raphael Rochet <raphael@rri.fr>\n"
+"Language-Team: French\n"
+"Language: fr\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+"X-Generator: Poedit 1.8.2\n"
+
+#: ../ui/icon_select.ui:9
+msgid "Select an icon"
+msgstr "Choisir une icône"
+
+#: ../ui/icon_select.ui:103
+msgid "Icon Theme"
+msgstr "Thème d'icônes"
+
+#: ../ui/icon_select.ui:123
+msgid "Custom Icon"
+msgstr "Icône personnalisée"
+
+#: ../ui/slice_select.ui:8
+msgid "Slice Options"
+msgstr "Options de la Part"
+
+#: ../ui/slice_select.ui:140
+msgid "There are no options for this Slice type."
+msgstr "Il n'y a pas d'options pour ce type de Part"
+
+#: ../ui/slice_select.ui:166
+msgid "Name of the Slice "
+msgstr "Nom de la Part"
+
+#: ../ui/slice_select.ui:204
+msgid "URI to open"
+msgstr "Liens web à ouvrir"
+
+#: ../ui/slice_select.ui:242
+msgid "Command to execute"
+msgstr "Commande à exécuter"
+
+#: ../ui/slice_select.ui:280
+msgid "Hotkey to press"
+msgstr "Raccourci clavier à effectuer"
+
+#: ../ui/slice_select.ui:309
+msgid "Pie to open"
+msgstr "Tarte à ouvrir"
+
+#: ../ui/slice_select.ui:338
+msgid "Is Quick Action"
+msgstr "Action rapide"
+
+#: ../ui/slice_select.ui:353 ../ui/slice_select.ui:354
+msgid "This Slice will be executed when you click in the middle of the Pie."
+msgstr "Cette Part sera exécutée quand vous cliquerez au milieu de la Tarte."
+
+#: ../ui/slice_select.ui:386
+msgid "Slice options"
+msgstr "Options de la Part"
+
+#: ../ui/preferences.ui:7 ../../src/gui/preferencesWindow.vala:76
+msgid "Gnome-Pie Settings"
+msgstr "Paramètres de Gnome-Pie"
+
+#: ../ui/preferences.ui:72
+msgid "Start Gnome-Pie on login"
+msgstr "Lancer Gnome-Pie au démarrage"
+
+#: ../ui/preferences.ui:78 ../ui/preferences.ui:79
+msgid "If checked, Gnome-Pie will start silently everytime you log in."
+msgstr "Si coché, Gnome-Pie se lancera à chaque connexion"
+
+#: ../ui/preferences.ui:91
+msgid "Display panel icon "
+msgstr "Affiche l'icône dans la zone de notification "
+
+#: ../ui/preferences.ui:97 ../ui/preferences.ui:98
+msgid ""
+"If not checked, you can access this menu by launching Gnome-Pie a second "
+"time."
+msgstr ""
+"Si non coché, vous pouvez accéder à ce menu en lançant Gnome-Pie une seconde "
+"fois "
+
+#: ../ui/preferences.ui:118
+msgid "Activation radius"
+msgstr "Rayon d'activation"
+
+#: ../ui/preferences.ui:156
+msgid "Behavior"
+msgstr "Comportement"
+
+#: ../ui/preferences.ui:191
+msgid "Display Slice labels"
+msgstr "Afficher le nom des Parts"
+
+#: ../ui/preferences.ui:197 ../ui/preferences.ui:198
+msgid ""
+"Displays the name of each Slice next to it. Only available if supported by "
+"the theme."
+msgstr ""
+"Afficher le nom à côté de chaque Part.\n"
+"(disponbile uniquement pour les thèmes compatibles)"
+
+#: ../ui/preferences.ui:218
+msgid "Global scale"
+msgstr "Échelle globale"
+
+#: ../ui/preferences.ui:258
+msgid "Maximum slices per pie"
+msgstr "Nombre max de parts par tarte"
+
+#: ../ui/preferences.ui:296
+msgid "Appearance"
+msgstr "Apparence"
+
+#: ../ui/preferences.ui:325 ../../src/gui/preferencesWindow.vala:107
+msgid "General Settings"
+msgstr "Paramètres généraux"
+
+#: ../ui/preferences.ui:517
+msgid ""
+"<b><big>This Pie is empty!</big>\n"
+"\n"
+"Start adding Slices to it!</b> This can be done by dragging stuff to the "
+"plus sign below. You can try a lot! For example application launchers or "
+"folders. Even URLs from your browser are possible...\n"
+"\n"
+"For manual and advanced configuration click on the plus sign."
+msgstr ""
+"<b><big>Cette Tarte est vide !</big>\n"
+"\n"
+"Commencez par lui ajouter des Parts !</b>\n"
+"Pour cela, vous pouvez déplacer des éléments sur le signe plus. Vous pouvez "
+"essayer plein de choses ! Par exemple, des lanceurs d'application ou des "
+"dossiers. Même les liens de votre navigateur sont supportés...\n"
+"\n"
+"Pour un ajout manuel ou avancé, cliquez sur le signe plus."
+
+#: ../ui/preferences.ui:538
+msgid ""
+"<b><big>You have no Pies!</big>\n"
+"\n"
+"Start by creating one! </b> This can be done by clicking on the tiny little "
+"plus sign in the lower left corner."
+msgstr ""
+"<b><big>Vous n'avez aucune Tarte !</big>\n"
+"\n"
+"Commencez par en créer une !</b> Vous pouvez le faire en cliquant sur le "
+"petit signe plus dans le coin en bas à gauche."
+
+#: ../ui/preferences.ui:605 ../../src/gui/preferencesWindow.vala:108
+msgid "Pie Settings"
+msgstr "Paramètres de la tarte"
+
+#: ../ui/pie_options.ui:53
+msgid "Activation Settings"
+msgstr "Paramètres d'activation"
+
+#: ../ui/pie_options.ui:153
+msgid "Unamed Pie"
+msgstr "Tarte sans nom"
+
+#: ../ui/pie_options.ui:216
+msgid "ID:"
+msgstr "ID:"
+
+#: ../ui/pie_options.ui:234
+msgid "It's possible to bind mouse buttons as well!"
+msgstr "Il est également possible d'assigner des boutons de souris !"
+
+#: ../ui/pie_options.ui:274
+msgid "Turbo mode"
+msgstr "Mode Turbo"
+
+#: ../ui/pie_options.ui:280 ../ui/pie_options.ui:281
+msgid "If checked, the Pie will close when you release the chosen hot key."
+msgstr "Si coché, la Tarte se ferme quand vous relâchez le raccourci clavier"
+
+#: ../ui/pie_options.ui:293
+msgid "Long press for activation"
+msgstr "Appui prolongé pour activer"
+
+#: ../ui/pie_options.ui:299 ../ui/pie_options.ui:300
+msgid ""
+"If checked, the Pie will only open if you press this hot key a bit longer."
+msgstr ""
+"Si coché, la Tarte s'ouvrira seulement si vous maintenez le raccourci clavier"
+
+#: ../ui/pie_options.ui:312
+msgid "Open Pie centered on the screen"
+msgstr "Ouvrir la Tarte au centre de l'écran"
+
+#: ../ui/pie_options.ui:318 ../ui/pie_options.ui:319
+msgid ""
+"If checked, the Pie will open in the middle of your screen. Else it will pop "
+"up at your pointer."
+msgstr ""
+"Si coché, la Tarte s'ouvrira au centre de l'écran. Sinon elle apparaîtra "
+"sous la souris"
+
+#: ../ui/pie_options.ui:331
+msgid "Warp mouse pointer to center of Pie"
+msgstr "Déplacer la souris au centre de la Tarte"
+
+#: ../ui/pie_options.ui:337 ../ui/pie_options.ui:338
+msgid ""
+"If checked, the mouse pointer will be warped to the center of the Pie. This "
+"allows for quick selections even if the Pie is opened at the screen's "
+"boundary."
+msgstr ""
+"Si coché, le pointeur de la souris sera déplacé au centre de la Tarte. Cela "
+"permet une sélection rapide même si la Tarte est ouverte au bord de l'écran."
+
+#: ../ui/pie_options.ui:356
+msgid "Activation options"
+msgstr "Options d'activation"
+
+#: ../ui/pie_options.ui:547
+msgid "Automatically select the best pie shape"
+msgstr "Sélectionner automatiquement la meilleure forme"
+
+#: ../ui/pie_options.ui:551
+msgid ""
+"If checked, the shape will be automatically selected to minimize mouse "
+"travelling."
+msgstr ""
+"Si coché, la forme sera choisie automatiquement pour minimiser les "
+"déplacement de souris."
+
+#: ../ui/pie_options.ui:571
+msgid "Pie shape"
+msgstr "Forme de la tarte"
+
+#: ../../src/pies/defaultConfig.vala:29
+msgid "Multimedia"
+msgstr "Multimédia"
+
+#: ../../src/pies/defaultConfig.vala:30
+msgid "Next Track"
+msgstr "Piste suivante"
+
+#: ../../src/pies/defaultConfig.vala:31
+msgid "Stop"
+msgstr "Stop"
+
+#: ../../src/pies/defaultConfig.vala:32
+msgid "Previous Track"
+msgstr "Piste précédente"
+
+#: ../../src/pies/defaultConfig.vala:33
+msgid "Play/Pause"
+msgstr "Lecture/Pause"
+
+#: ../../src/pies/defaultConfig.vala:36
+#: ../../src/gui/iconSelectWindow.vala:183
+msgid "Applications"
+msgstr "Applications"
+
+#: ../../src/pies/defaultConfig.vala:45
+msgid "Bookmarks"
+msgstr "Favoris"
+
+#: ../../src/pies/defaultConfig.vala:50
+msgid "Session"
+msgstr "Session"
+
+#: ../../src/pies/defaultConfig.vala:54
+msgid "Main Menu"
+msgstr "Menu Principal"
+
+#: ../../src/pies/defaultConfig.vala:58
+msgid "Window"
+msgstr "Fenêtre"
+
+#: ../../src/pies/defaultConfig.vala:59
+msgid "Scale"
+msgstr "Échelle"
+
+#: ../../src/pies/defaultConfig.vala:60
+msgid "Minimize"
+msgstr "Minimiser"
+
+#: ../../src/pies/defaultConfig.vala:61
+msgid "Close"
+msgstr "Fermer"
+
+#: ../../src/pies/defaultConfig.vala:62
+msgid "Maximize"
+msgstr "Agrandir"
+
+#: ../../src/pies/defaultConfig.vala:63
+msgid "Restore"
+msgstr "Restaurer"
+
+#: ../../src/actions/keyAction.vala:34
+msgid "Press hotkey"
+msgstr "Appuyez sur le raccourci clavier"
+
+#: ../../src/actions/keyAction.vala:36
+msgid "Simulates the activation of a hotkey."
+msgstr "Simule l'activation d'un raccourci clavier"
+
+#: ../../src/actions/actionRegistry.vala:119
+msgid "Trash"
+msgstr "Poubelle"
+
+#: ../../src/actions/pieAction.vala:34
+msgid "Open Pie"
+msgstr "Ouvrir une Tarte"
+
+#: ../../src/actions/pieAction.vala:36
+msgid "Opens another Pie of Gnome-Pie. You may create sub menus this way."
+msgstr "Ouvre une autre Part de Tarte. Vous pouvez ainsi créer des sous-menus."
+
+#: ../../src/actions/appAction.vala:34
+msgid "Launch application"
+msgstr "Lancer l'application"
+
+#: ../../src/actions/appAction.vala:36
+msgid "Executes the given command."
+msgstr "Exécute la commande définie"
+
+#: ../../src/actions/uriAction.vala:34
+msgid "Open URI"
+msgstr "Ouvrir une URL"
+
+#: ../../src/actions/uriAction.vala:36
+msgid "Opens a given location. You may use URL's or files paths."
+msgstr ""
+"Ouvre un emplacement défini. Vous pouvez utiliser une URL ou un "
+"emplacementde fichier"
+
+#: ../../src/actionGroups/sessionGroup.vala:35
+msgid "Group: Session Control"
+msgstr "Groupe : Gestion de la Session"
+
+#: ../../src/actionGroups/sessionGroup.vala:37
+msgid "Shows a Slice for Shutdown, Reboot, and Hibernate."
+msgstr "Affiche une Part pour Éteindre, Redémarrer, et Hiberner"
+
+#: ../../src/actionGroups/sessionGroup.vala:60
+msgid "Shutdown"
+msgstr "Éteindre"
+
+#: ../../src/actionGroups/sessionGroup.vala:63
+msgid "Logout"
+msgstr "Déconnexion"
+
+#: ../../src/actionGroups/sessionGroup.vala:66
+msgid "Reboot"
+msgstr "Redémarrer"
+
+#: ../../src/actionGroups/menuGroup.vala:35
+msgid "Group: Main menu"
+msgstr "Groupe : Menu principal"
+
+#: ../../src/actionGroups/menuGroup.vala:37
+msgid "Displays your main menu structure."
+msgstr "Affiche la structure du menu principal"
+
+#: ../../src/actionGroups/bookmarkGroup.vala:36
+msgid "Group: Bookmarks"
+msgstr "Groupe : Favoris"
+
+#: ../../src/actionGroups/bookmarkGroup.vala:38
+msgid "Shows a Slice for each of your directory Bookmarks."
+msgstr "Affiche une Part pour chacun des répertoires en Favoris"
+
+#: ../../src/actionGroups/windowListGroup.vala:34
+msgid "Group: Window List"
+msgstr "Groupe : Liste de fenêtres"
+
+#: ../../src/actionGroups/windowListGroup.vala:36
+msgid "Shows a Slice for each of your opened Windows. Almost like Alt-Tab."
+msgstr ""
+"Affiche une Part pour chacune des fenêtres ouvertes. Fonctionne comme Alt-"
+"Tab."
+
+#: ../../src/actionGroups/clipboardGroup.vala:64
+msgid "Group: Clipboard"
+msgstr "Groupe : Presse-papier"
+
+#: ../../src/actionGroups/clipboardGroup.vala:66
+msgid "Manages your Clipboard."
+msgstr "Gère votre Presse-papier"
+
+#: ../../src/actionGroups/workspaceWindowListGroup.vala:35
+msgid "Group: Window List for current workspace"
+msgstr "Groupe : Liste des fenêtres de l'espace de travail"
+
+#: ../../src/actionGroups/workspaceWindowListGroup.vala:37
+msgid "Shows a Slice for each of your opened windows on the current workspace."
+msgstr ""
+"Affiche une Part pour chacune des fenêtres ouvertes. Fonctionne comme Alt-"
+"Tab."
+
+#: ../../src/actionGroups/devicesGroup.vala:35
+msgid "Group: Devices"
+msgstr "Groupe : Périphériques"
+
+#: ../../src/actionGroups/devicesGroup.vala:37
+msgid "Shows a Slice for each plugged in devices, like USB-Sticks."
+msgstr ""
+"Affiche une Part pour chaque périphérique branché, par exemple une clé USB"
+
+#: ../../src/actionGroups/devicesGroup.vala:85
+msgid "Root"
+msgstr "Racine"
+
+#: ../../src/gui/preferencesWindow.vala:77
+msgid "bake your pies!"
+msgstr "Préparez vos tartes !"
+
+#: ../../src/gui/preferencesWindow.vala:350
+msgid "New Pie"
+msgstr "Nouvelle Tarte"
+
+#: ../../src/gui/preferencesWindow.vala:365
+msgid ""
+"Do you really want to delete the selected Pie with all contained Slices?"
+msgstr "Voulez-vous supprimer la Tarte sélectionnée et son contenu ?"
+
+#: ../../src/gui/sliceTypeList.vala:60
+msgid "Slice types"
+msgstr "Types de Part"
+
+#: ../../src/gui/indicator.vala:126
+msgid "_Preferences"
+msgstr "_Préférences"
+
+#: ../../src/gui/indicator.vala:135
+msgid "_About"
+msgstr "_A propos"
+
+#: ../../src/gui/indicator.vala:150
+msgid "_Quit"
+msgstr "_Quitter"
+
+#: ../../src/gui/newSliceWindow.vala:292
+msgid "Rename me!"
+msgstr "Renommez-moi!"
+
+#: ../../src/gui/piePreviewRenderer.vala:419
+msgid "Click to edit"
+msgstr "Cliquez pour éditer"
+
+#: ../../src/gui/piePreviewRenderer.vala:419
+#: ../../src/gui/piePreviewRenderer.vala:434
+msgid "Drag to move"
+msgstr "Faites glisser pour déplacer"
+
+#: ../../src/gui/piePreviewRenderer.vala:422
+msgid "Click to add a new Slice"
+msgstr ""
+"Cliquez pour ajouter \n"
+" une nouvelle Part"
+
+#: ../../src/gui/piePreviewRenderer.vala:426
+msgid "Drop to add as new Slice"
+msgstr ""
+"Déposez pour ajouter \n"
+" une nouvelle Part"
+
+#: ../../src/gui/piePreviewRenderer.vala:429
+msgid "Drop to move Slice"
+msgstr ""
+"Déposez pour \n"
+" déplacer la Part"
+
+#: ../../src/gui/piePreviewRenderer.vala:434
+msgid "Click to delete"
+msgstr "Cliquez pour supprimer"
+
+#: ../../src/gui/newsWindow.vala:64
+msgid "_Close"
+msgstr "_Fermer"
+
+#: ../../src/gui/iconSelectWindow.vala:182
+msgid "All icons"
+msgstr "Toutes les icônes"
+
+#: ../../src/gui/iconSelectWindow.vala:184
+msgid "Actions"
+msgstr "Actions"
+
+#: ../../src/gui/iconSelectWindow.vala:185
+msgid "Places"
+msgstr "Dossiers"
+
+#: ../../src/gui/iconSelectWindow.vala:186
+msgid "File types"
+msgstr "Types de fichiers"
+
+#: ../../src/gui/iconSelectWindow.vala:187
+msgid "Emotes"
+msgstr "Émoticones"
+
+#: ../../src/gui/iconSelectWindow.vala:188
+msgid "Miscellaneous"
+msgstr "Divers"
+
+#: ../../src/gui/iconSelectWindow.vala:261
+msgid "All supported image formats"
+msgstr "Tous les formats d'images supportés"
+
+#: ../../src/gui/themeList.vala:62
+msgid "Themes"
+msgstr "Thèmes"
+
+#: ../../src/gui/themeList.vala:102
+msgid "By"
+msgstr "Par"
+
+#: ../../src/gui/pieOptionsWindow.vala:274
+msgid ""
+"This hotkey is already assigned to the pie \"%s\"! \n"
+"\n"
+"Please select another one or cancel your selection."
+msgstr ""
+"Ce raccourci clavier est déja défini pour la Tarte \"%s\"! \n"
+"\n"
+"Merci d'en choisir un autre ou d'annuler votre choix."
+
+#: ../../src/gui/triggerSelectButton.vala:64
+msgid "Press a hotkey ..."
+msgstr "Faites un raccourci clavier"
+
+#: ../../src/gui/piePreview.vala:148
+msgid "Do you really want to delete this Slice?"
+msgstr "Voulez-vous supprimer cette Part ?"
+
+#: ../../src/gui/pieList.vala:77
+msgid "Pies"
+msgstr "Tartes"
+
+#: ../../src/utilities/key.vala:65 ../../src/utilities/trigger.vala:195
+#: ../../src/utilities/trigger.vala:280 ../../src/utilities/trigger.vala:281
+#: ../../src/utilities/bindingManager.vala:186
+msgid "Not bound"
+msgstr "Aucun raccourci"
+
+#: ../../src/utilities/trigger.vala:182
+msgid "Button %i"
+msgstr "Bouton %i"
+
+#: ../../src/utilities/trigger.vala:185
+msgid "LeftButton"
+msgstr "Bouton Gauche"
+
+#: ../../src/utilities/trigger.vala:187
+msgid "RightButton"
+msgstr "Bouton Droit"
+
+#: ../../src/utilities/trigger.vala:189
+msgid "MiddleButton"
+msgstr "Bouton Central"
+
+#: ../../src/utilities/trigger.vala:216
+msgid "Turbo"
+msgstr "Turbo"
+
+#: ../../src/utilities/trigger.vala:220 ../../src/utilities/trigger.vala:222
+msgid "Delayed"
+msgstr "Différé"
+
+#: ../../src/utilities/trigger.vala:226 ../../src/utilities/trigger.vala:228
+msgid "Centered"
+msgstr "Centré"
+
+#: ../../src/utilities/trigger.vala:232 ../../src/utilities/trigger.vala:234
+msgid "Warp"
+msgstr "Centrer"
+
+#: ../../src/utilities/trigger.vala:238 ../../src/utilities/trigger.vala:240
+msgid "Auto-shaped"
+msgstr "Forme auto"
+
+#: ../../src/utilities/trigger.vala:243 ../../src/utilities/trigger.vala:245
+msgid "Quarter pie"
+msgstr "Quart de tarte"
+
+#: ../../src/utilities/trigger.vala:249 ../../src/utilities/trigger.vala:251
+msgid "Half pie"
+msgstr "Demie tarte"
+
+#~ msgid "No Pie selected."
+#~ msgstr "Aucune Tarte sélectionnée"
diff --git a/resources/locale/fr/LC_MESSAGES/gnomepie.mo b/resources/locale/fr/LC_MESSAGES/gnomepie.mo
index f5b523a..e15b548 100644
--- a/resources/locale/fr/LC_MESSAGES/gnomepie.mo
+++ b/resources/locale/fr/LC_MESSAGES/gnomepie.mo
Binary files differ
diff --git a/resources/locale/gnomepie.pot b/resources/locale/gnomepie.pot
index f3231ac..0b62280 100644
--- a/resources/locale/gnomepie.pot
+++ b/resources/locale/gnomepie.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: gnomepie 0.4\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-05-02 14:39+0200\n"
+"POT-Creation-Date: 2015-08-06 12:43+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -141,63 +141,74 @@ msgstr ""
msgid "Custom Icon"
msgstr ""
-#: ../ui/preferences.ui:7 ../../src/gui/preferencesWindow.vala:76
+#: ../ui/preferences.ui:7 ../../src/gui/preferencesWindow.vala:77
msgid "Gnome-Pie Settings"
msgstr ""
-#: ../ui/preferences.ui:73
+#: ../ui/preferences.ui:72
msgid "Start Gnome-Pie on login"
msgstr ""
-#: ../ui/preferences.ui:79 ../ui/preferences.ui:80
+#: ../ui/preferences.ui:78 ../ui/preferences.ui:79
msgid "If checked, Gnome-Pie will start silently everytime you log in."
msgstr ""
-#: ../ui/preferences.ui:92
+#: ../ui/preferences.ui:91
msgid "Display panel icon "
msgstr ""
-#: ../ui/preferences.ui:98 ../ui/preferences.ui:99
+#: ../ui/preferences.ui:97 ../ui/preferences.ui:98
msgid ""
"If not checked, you can access this menu by launching Gnome-Pie a second "
"time."
msgstr ""
-#: ../ui/preferences.ui:119
-msgid "Activation radius"
+#: ../ui/preferences.ui:110
+msgid "Select Slices by typing their names"
+msgstr ""
+
+#: ../ui/preferences.ui:116 ../ui/preferences.ui:117
+msgid ""
+"If checked, you can select items in a Pie by typing their names. Otherwise "
+"you can activate them with a hotkey (which can be displayed by pressing ALT "
+"when a Pie is openened)."
msgstr ""
-#: ../ui/preferences.ui:157
+#: ../ui/preferences.ui:136
msgid "Behavior"
msgstr ""
-#: ../ui/preferences.ui:192
+#: ../ui/preferences.ui:171
msgid "Display Slice labels"
msgstr ""
-#: ../ui/preferences.ui:198 ../ui/preferences.ui:199
+#: ../ui/preferences.ui:177 ../ui/preferences.ui:178
msgid ""
"Displays the name of each Slice next to it. Only available if supported by "
"the theme."
msgstr ""
-#: ../ui/preferences.ui:219
+#: ../ui/preferences.ui:198
msgid "Global scale"
msgstr ""
-#: ../ui/preferences.ui:259
+#: ../ui/preferences.ui:238
msgid "Maximum slices per pie"
msgstr ""
-#: ../ui/preferences.ui:297
+#: ../ui/preferences.ui:278
+msgid "Activation radius"
+msgstr ""
+
+#: ../ui/preferences.ui:316
msgid "Appearance"
msgstr ""
-#: ../ui/preferences.ui:326 ../../src/gui/preferencesWindow.vala:107
+#: ../ui/preferences.ui:345 ../../src/gui/preferencesWindow.vala:108
msgid "General Settings"
msgstr ""
-#: ../ui/preferences.ui:518
+#: ../ui/preferences.ui:537
msgid ""
"<b><big>This Pie is empty!</big>\n"
"\n"
@@ -208,7 +219,7 @@ msgid ""
"For manual and advanced configuration click on the plus sign."
msgstr ""
-#: ../ui/preferences.ui:539
+#: ../ui/preferences.ui:558
msgid ""
"<b><big>You have no Pies!</big>\n"
"\n"
@@ -216,7 +227,7 @@ msgid ""
"plus sign in the lower left corner."
msgstr ""
-#: ../ui/preferences.ui:606 ../../src/gui/preferencesWindow.vala:108
+#: ../ui/preferences.ui:625 ../../src/gui/preferencesWindow.vala:109
msgid "Pie Settings"
msgstr ""
@@ -256,15 +267,15 @@ msgstr ""
msgid "Opens another Pie of Gnome-Pie. You may create sub menus this way."
msgstr ""
-#: ../../src/gui/preferencesWindow.vala:77
+#: ../../src/gui/preferencesWindow.vala:78
msgid "bake your pies!"
msgstr ""
-#: ../../src/gui/preferencesWindow.vala:350
+#: ../../src/gui/preferencesWindow.vala:364
msgid "New Pie"
msgstr ""
-#: ../../src/gui/preferencesWindow.vala:365
+#: ../../src/gui/preferencesWindow.vala:379
msgid ""
"Do you really want to delete the selected Pie with all contained Slices?"
msgstr ""
@@ -358,15 +369,15 @@ msgstr ""
msgid "By"
msgstr ""
-#: ../../src/gui/indicator.vala:114
+#: ../../src/gui/indicator.vala:126
msgid "_Preferences"
msgstr ""
-#: ../../src/gui/indicator.vala:123
+#: ../../src/gui/indicator.vala:135
msgid "_About"
msgstr ""
-#: ../../src/gui/indicator.vala:138
+#: ../../src/gui/indicator.vala:150
msgid "_Quit"
msgstr ""
diff --git a/resources/ui/preferences.ui b/resources/ui/preferences.ui
index 4ef781d..948bc00 100644
--- a/resources/ui/preferences.ui
+++ b/resources/ui/preferences.ui
@@ -106,38 +106,17 @@
</packing>
</child>
<child>
- <object class="GtkBox" id="hbox4">
+ <object class="GtkCheckButton" id="select-by-string-checkbox">
+ <property name="label" translatable="yes">Select Slices by typing their names</property>
+ <property name="use_action_appearance">False</property>
<property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="homogeneous">True</property>
- <child>
- <object class="GtkLabel" id="label4">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="halign">start</property>
- <property name="label" translatable="yes">Activation radius</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkScale" id="range-hscale">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="fill_level">2000</property>
- <property name="round_digits">0</property>
- <property name="digits">0</property>
- <property name="value_pos">right</property>
- </object>
- <packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
- <property name="position">1</property>
- </packing>
- </child>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="has_tooltip">True</property>
+ <property name="tooltip_markup" translatable="yes">If checked, you can select items in a Pie by typing their names. Otherwise you can activate them with a hotkey (which can be displayed by pressing ALT when a Pie is openened).</property>
+ <property name="tooltip_text" translatable="yes">If checked, you can select items in a Pie by typing their names. Otherwise you can activate them with a hotkey (which can be displayed by pressing ALT when a Pie is openened).</property>
+ <property name="xalign">0</property>
+ <property name="draw_indicator">True</property>
</object>
<packing>
<property name="expand">False</property>
@@ -145,6 +124,7 @@
<property name="position">2</property>
</packing>
</child>
+
</object>
</child>
</object>
@@ -285,6 +265,46 @@
<property name="position">3</property>
</packing>
</child>
+ <child>
+ <object class="GtkBox" id="hbox4">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="homogeneous">True</property>
+ <child>
+ <object class="GtkLabel" id="label4">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="halign">start</property>
+ <property name="label" translatable="yes">Activation radius</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkScale" id="range-hscale">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="fill_level">2000</property>
+ <property name="round_digits">0</property>
+ <property name="digits">0</property>
+ <property name="value_pos">right</property>
+ </object>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
</object>
</child>
</object>
diff --git a/src/deamon.vala b/src/deamon.vala
index 24bc451..8c84f3a 100644
--- a/src/deamon.vala
+++ b/src/deamon.vala
@@ -43,7 +43,7 @@ public class Deamon : GLib.Application {
/////////////////////////////////////////////////////////////////////
public static int main(string[] args) {
- version = "0.6.4";
+ version = "0.6.5";
// disable overlay scrollbar --- hacky workaround for black /
// transparent background
diff --git a/src/gui/preferencesWindow.vala b/src/gui/preferencesWindow.vala
index fe3eeb0..5d22d6b 100644
--- a/src/gui/preferencesWindow.vala
+++ b/src/gui/preferencesWindow.vala
@@ -46,6 +46,7 @@ public class PreferencesWindow : GLib.Object {
private ThemeList? theme_list = null;
private Gtk.ToggleButton? indicator = null;
+ private Gtk.ToggleButton? search_by_string = null;
private Gtk.ToggleButton? autostart = null;
private Gtk.ToggleButton? captions = null;
@@ -159,6 +160,9 @@ public class PreferencesWindow : GLib.Object {
this.indicator = (builder.get_object("indicator-checkbox") as Gtk.ToggleButton);
this.indicator.toggled.connect(on_indicator_toggled);
+ this.search_by_string = (builder.get_object("select-by-string-checkbox") as Gtk.ToggleButton);
+ this.search_by_string.toggled.connect(on_search_by_string_toggled);
+
this.captions = (builder.get_object("captions-checkbox") as Gtk.ToggleButton);
this.captions.toggled.connect(on_captions_toggled);
@@ -234,6 +238,7 @@ public class PreferencesWindow : GLib.Object {
this.indicator.active = Config.global.show_indicator;
this.autostart.active = Config.global.auto_start;
this.captions.active = Config.global.show_captions;
+ this.search_by_string.active = Config.global.search_by_string;
if (Config.global.theme.has_slice_captions) {
this.captions.sensitive = true;
@@ -312,6 +317,15 @@ public class PreferencesWindow : GLib.Object {
}
/////////////////////////////////////////////////////////////////////
+ /// Enables or disables Slice selection by typing.
+ /////////////////////////////////////////////////////////////////////
+
+ private void on_search_by_string_toggled(Gtk.ToggleButton check_box) {
+ var check = check_box as Gtk.CheckButton;
+ Config.global.search_by_string = check.active;
+ }
+
+ /////////////////////////////////////////////////////////////////////
/// Called when a new Pie is selected in the PieList.
/////////////////////////////////////////////////////////////////////
diff --git a/src/images/themedIcon.vala b/src/images/themedIcon.vala
index b7b6f74..9f4ca8a 100644
--- a/src/images/themedIcon.vala
+++ b/src/images/themedIcon.vala
@@ -74,6 +74,7 @@ public class ThemedIcon : Image {
if (layer.layer_type == SliceLayer.Type.ICON) {
ctx.push_group();
+ ctx.translate(layer.x, layer.y);
layer.image.paint_on(ctx);
ctx.set_operator(Cairo.Operator.IN);
@@ -86,6 +87,7 @@ public class ThemedIcon : Image {
}
icon.paint_on(ctx);
+ ctx.translate(-layer.x, -layer.y);
ctx.pop_group_to_source();
ctx.paint();
@@ -93,11 +95,13 @@ public class ThemedIcon : Image {
} else if (layer.layer_type == SliceLayer.Type.CAPTION) {
Image text = new RenderedText(caption, layer.width, layer.height, layer.font, layer.color, Config.global.global_scale);
- ctx.translate(0, layer.position);
+ ctx.translate(layer.x, layer.y);
text.paint_on(ctx);
- ctx.translate(0, -layer.position);
+ ctx.translate(-layer.x, -layer.y);
} else if (layer.layer_type == SliceLayer.Type.FILE) {
+ ctx.translate(layer.x, layer.y);
layer.image.paint_on(ctx);
+ ctx.translate(-layer.x, -layer.y);
}
// colorize the whole layer if neccasary
diff --git a/src/renderers/pieRenderer.vala b/src/renderers/pieRenderer.vala
index cd50644..1ff2b3e 100644
--- a/src/renderers/pieRenderer.vala
+++ b/src/renderers/pieRenderer.vala
@@ -221,7 +221,7 @@ public class PieRenderer : GLib.Object {
}
}
- this.set_highlighted_slice(this.quickaction);
+ this.select_by_index(this.quickaction);
ShowPieMode showpie= ShowPieMode.FULL_PIE;
@@ -500,19 +500,19 @@ public class PieRenderer : GLib.Object {
if (this.first_slice_idx+this.visible_slice_count >= slices.size) {
this.visible_slice_count= slices.size - this.first_slice_idx;
}
- this.reset_sclice_anim();
- this.set_highlighted_slice(-1);
+ this.reset_slice_anim();
+ this.select_by_index(-1);
calc_key_navigation_pos();
this.key_board_control = true;
} else if (this.first_slice_idx > 0) {
//go to first page
this.first_slice_idx= 0;
- this.reset_sclice_anim();
+ this.reset_slice_anim();
//recover the original value
this.visible_slice_count= this.original_visible_slice_count;
- this.reset_sclice_anim();
- this.set_highlighted_slice(-1);
+ this.reset_slice_anim();
+ this.select_by_index(-1);
calc_key_navigation_pos();
this.key_board_control = true;
}
@@ -532,8 +532,8 @@ public class PieRenderer : GLib.Object {
if (this.first_slice_idx < 0) {
this.first_slice_idx= 0;
}
- this.reset_sclice_anim();
- this.set_highlighted_slice(-1);
+ this.reset_slice_anim();
+ this.select_by_index(-1);
calc_key_navigation_pos();
this.key_board_control = true;
@@ -547,20 +547,54 @@ public class PieRenderer : GLib.Object {
//last page has less slices than previous
this.visible_slice_count= n;
this.first_slice_idx= slices.size - this.visible_slice_count;
- this.reset_sclice_anim();
- this.set_highlighted_slice(-1);
+ this.reset_slice_anim();
+ this.select_by_index(-1);
calc_key_navigation_pos();
this.key_board_control = true;
}
}
- private void reset_sclice_anim() {
+ private void reset_slice_anim() {
//reset animation values in all the new visible slices
for (int i= 0; i < this.visible_slice_count; ++i)
this.slices[ i+this.first_slice_idx ].reset_anim();
}
/////////////////////////////////////////////////////////////////////
+ /// Selects a slice based on a search string.
+ /////////////////////////////////////////////////////////////////////
+
+ public void select_by_string(string search) {
+ float max_similarity = 0;
+ int index = -1;
+
+ for (int i=0; i<this.visible_slice_count; ++i) {
+ float similarity = 0;
+ int cur_pos = 0;
+ var name = slices[this.first_slice_idx+i].action.name.down();
+
+ for (int j=0; j<search.length; ++j) {
+ int next_pos = name.index_of(search.substring(j, 1), cur_pos);
+
+ if (next_pos != -1) {
+ cur_pos = next_pos;
+ similarity += (float)(name.length-next_pos)/name.length + 2;
+ }
+ }
+
+ if (similarity > max_similarity) {
+ index = this.first_slice_idx+i;
+ max_similarity = similarity;
+ }
+ }
+
+ if (index >= 0 && index < slice_count()) {
+ key_board_control = true;
+ select_by_index(index);
+ }
+ }
+
+ /////////////////////////////////////////////////////////////////////
/// Returns the amount of slices in this pie.
/////////////////////////////////////////////////////////////////////
@@ -616,7 +650,7 @@ public class PieRenderer : GLib.Object {
next_active_slice = -1;
}
- this.set_highlighted_slice(next_active_slice);
+ this.select_by_index(next_active_slice);
}
center.draw(frame_time, ctx, angle, slice_track);
@@ -639,7 +673,7 @@ public class PieRenderer : GLib.Object {
/// Called when the currently active slice changes.
/////////////////////////////////////////////////////////////////////
- public void set_highlighted_slice(int index) {
+ public void select_by_index(int index) {
if (index != this.active_slice) {
if (index >= this.first_slice_idx && index < this.first_slice_idx+this.visible_slice_count)
this.active_slice = index;
@@ -847,7 +881,7 @@ public class PieRenderer : GLib.Object {
pos= this.first_slice_idx;
}
- this.set_highlighted_slice(pos);
+ this.select_by_index(pos);
this.key_board_control = true;
}
diff --git a/src/renderers/pieWindow.vala b/src/renderers/pieWindow.vala
index 95432c5..a49813a 100755
--- a/src/renderers/pieWindow.vala
+++ b/src/renderers/pieWindow.vala
@@ -95,6 +95,13 @@ public class PieWindow : Gtk.Window {
private bool has_compositing = false;
/////////////////////////////////////////////////////////////////////
+ /// When a Pie is opened, pressed buttons are accumulated and
+ /// matches are searched in all slices.
+ /////////////////////////////////////////////////////////////////////
+
+ private string search_string = "";
+
+ /////////////////////////////////////////////////////////////////////
/// C'tor, sets up the window.
/////////////////////////////////////////////////////////////////////
@@ -145,7 +152,7 @@ public class PieWindow : Gtk.Window {
this.key_press_event.connect((e) => {
if (e.keyval != last_key) {
last_key = e.keyval;
- this.handle_key_press(e.keyval, e.time);
+ this.handle_key_press(e.keyval, e.time, e.str);
}
return true;
});
@@ -429,7 +436,7 @@ public class PieWindow : Gtk.Window {
/// Do some useful stuff when keys are pressed.
/////////////////////////////////////////////////////////////////////
- private void handle_key_press(uint key, uint32 time_stamp) {
+ private void handle_key_press(uint key, uint32 time_stamp, string text) {
if (Gdk.keyval_name(key) == "Escape") this.cancel();
else if (Gdk.keyval_name(key) == "Return") this.activate_slice(time_stamp);
else if (!PieManager.get_is_turbo(this.renderer.id)) {
@@ -441,23 +448,31 @@ public class PieWindow : Gtk.Window {
else if (Gdk.keyval_name(key) == "Page_Up") this.renderer.select_prevpage();
else if (Gdk.keyval_name(key) == "Tab") this.renderer.select_nextpage();
else if (Gdk.keyval_name(key) == "ISO_Left_Tab") this.renderer.select_prevpage();
- else if (Gdk.keyval_name(key) == "Alt_L") this.renderer.show_hotkeys = true;
+ else if (Gdk.keyval_name(key) == "Alt_L" && !Config.global.search_by_string) this.renderer.show_hotkeys = true;
else {
- int index = -1;
- if (key >= 48 && key <= 57) index = ((int)key - 39)%10;
- else if (key >= 97 && key <= 122) index = (int)key - 87;
- else if (key >= 65 && key <= 90) index = (int)key - 55;
+ if (Config.global.search_by_string) {
+ this.search_string += text;
+ this.renderer.select_by_string(search_string.down());
+
+ } else {
+
+ int index = -1;
+
+ if (key >= 48 && key <= 57) index = ((int)key - 39)%10;
+ else if (key >= 97 && key <= 122) index = (int)key - 87;
+ else if (key >= 65 && key <= 90) index = (int)key - 55;
- if (index >= 0 && index < this.renderer.slice_count()) {
- this.renderer.key_board_control = true;
- this.renderer.set_highlighted_slice(index);
+ if (index >= 0 && index < this.renderer.slice_count()) {
+ this.renderer.key_board_control = true;
+ this.renderer.select_by_index(index);
- if (this.renderer.active_slice == index) {
- GLib.Timeout.add((uint)(Config.global.theme.transition_time*1000.0), ()=> {
- this.activate_slice(time_stamp);
- return false;
- });
+ if (this.renderer.active_slice == index) {
+ GLib.Timeout.add((uint)(Config.global.theme.transition_time*1000.0), ()=> {
+ this.activate_slice(time_stamp);
+ return false;
+ });
+ }
}
}
}
diff --git a/src/renderers/sliceRenderer.vala b/src/renderers/sliceRenderer.vala
index dfcf512..591fbdd 100644
--- a/src/renderers/sliceRenderer.vala
+++ b/src/renderers/sliceRenderer.vala
@@ -46,6 +46,12 @@ public class SliceRenderer : GLib.Object {
public Color color {get; private set;}
/////////////////////////////////////////////////////////////////////
+ /// The Action which is rendered by this SliceRenderer.
+ /////////////////////////////////////////////////////////////////////
+
+ public Action action;
+
+ /////////////////////////////////////////////////////////////////////
/// The two Images used, when this slice is active or not.
/////////////////////////////////////////////////////////////////////
@@ -59,12 +65,6 @@ public class SliceRenderer : GLib.Object {
private Image hotkey;
/////////////////////////////////////////////////////////////////////
- /// The Action which is rendered by this SliceRenderer.
- /////////////////////////////////////////////////////////////////////
-
- private Action action;
-
- /////////////////////////////////////////////////////////////////////
/// The PieRenderer which owns this SliceRenderer.
/////////////////////////////////////////////////////////////////////
@@ -150,7 +150,7 @@ public class SliceRenderer : GLib.Object {
this.hotkey = new RenderedText(hotkey_label, (int)Config.global.theme.slice_radius*2,
(int)Config.global.theme.slice_radius*2, "sans 20",
- Config.global.theme.caption_color, Config.global.global_scale);
+ new Color(), Config.global.global_scale);
}
/////////////////////////////////////////////////////////////////////
@@ -284,8 +284,9 @@ public class SliceRenderer : GLib.Object {
ctx.paint();
// draw hotkeys if necassary
- if (this.parent.show_hotkeys)
+ if (this.parent.show_hotkeys) {
this.hotkey.paint_on(ctx, 1.0);
+ }
ctx.restore();
}
diff --git a/src/themes/sliceLayer.vala b/src/themes/sliceLayer.vala
index 17ac3bb..bd9e98b 100644
--- a/src/themes/sliceLayer.vala
+++ b/src/themes/sliceLayer.vala
@@ -48,35 +48,41 @@ public class SliceLayer : GLib.Object {
public string font {get; private set; default="";}
public int width {get; private set; default=0;}
public int height {get; private set; default=0;}
- public int position {get; private set; default=0;}
+ public int x {get; private set; default=0;}
+ public int y {get; private set; default=0;}
public Color color {get; private set; default=new Color();}
/////////////////////////////////////////////////////////////////////
/// C'tor, initializes all members of the layer.
/////////////////////////////////////////////////////////////////////
- public SliceLayer.file(string icon_file, int icon_size, bool colorize, Visibility visibility) {
+ public SliceLayer.file(string icon_file, int icon_size, int x, int y, bool colorize, Visibility visibility) {
this.layer_type = Type.FILE;
this.icon_file = icon_file;
this.colorize = colorize;
this.icon_size = icon_size;
+ this.x = x;
+ this.y = y;
this.visibility = visibility;
}
- public SliceLayer.icon(string icon_file, int icon_size, bool colorize, Visibility visibility) {
+ public SliceLayer.icon(string icon_file, int icon_size, int x, int y, bool colorize, Visibility visibility) {
this.layer_type = Type.ICON;
this.icon_file = icon_file;
this.colorize = colorize;
this.icon_size = icon_size;
+ this.x = x;
+ this.y = y;
this.visibility = visibility;
}
- public SliceLayer.caption(string font, int width, int height, int position, Color color, bool colorize, Visibility visibility) {
+ public SliceLayer.caption(string font, int width, int height, int x, int y, Color color, bool colorize, Visibility visibility) {
this.layer_type = Type.CAPTION;
this.font = font;
this.width = width;
this.height = height;
- this.position = position;
+ this.x = x;
+ this.y = y;
this.color = color;
this.visibility = visibility;
this.colorize = colorize;
diff --git a/src/themes/theme.vala b/src/themes/theme.vala
index e068b9e..a7dd4f8 100644
--- a/src/themes/theme.vala
+++ b/src/themes/theme.vala
@@ -486,17 +486,17 @@ public class Theme : GLib.Object {
this.visible_slice_radius = Math.fmax(slice_radius*scale, this.visible_slice_radius);
if (slice->name.down() == "activeslice") {
- if (type == SliceLayer.Type.ICON) active_slice_layers.add(new SliceLayer.icon(file, size, colorize, visibility));
+ if (type == SliceLayer.Type.ICON) active_slice_layers.add(new SliceLayer.icon(file, size, pos_x, pos_y, colorize, visibility));
else if (type == SliceLayer.Type.CAPTION) active_slice_layers.add(new SliceLayer.caption(slice_caption_font,
slice_caption_width, slice_caption_height,
- pos_y, slice_caption_color, colorize, visibility));
- else active_slice_layers.add(new SliceLayer.file(file, size, colorize, visibility));
+ pos_x, pos_y, slice_caption_color, colorize, visibility));
+ else active_slice_layers.add(new SliceLayer.file(file, size, pos_x, pos_y, colorize, visibility));
} else {
- if (type == SliceLayer.Type.ICON) inactive_slice_layers.add(new SliceLayer.icon(file, size, colorize, visibility));
+ if (type == SliceLayer.Type.ICON) inactive_slice_layers.add(new SliceLayer.icon(file, size, pos_x, pos_y, colorize, visibility));
else if (type == SliceLayer.Type.CAPTION) inactive_slice_layers.add(new SliceLayer.caption(slice_caption_font,
slice_caption_width, slice_caption_height,
- pos_y, slice_caption_color, colorize, visibility));
- else inactive_slice_layers.add(new SliceLayer.file(file, size, colorize, visibility));
+ pos_x, pos_y, slice_caption_color, colorize, visibility));
+ else inactive_slice_layers.add(new SliceLayer.file(file, size, pos_x, pos_y, colorize, visibility));
}
} else {
diff --git a/src/utilities/config.vala b/src/utilities/config.vala
index dd31885..538602d 100644
--- a/src/utilities/config.vala
+++ b/src/utilities/config.vala
@@ -58,6 +58,7 @@ public class Config : GLib.Object {
public int max_visible_slices { get; set; default = 24; }
public bool show_indicator { get; set; default = true; }
public bool show_captions { get; set; default = true; }
+ public bool search_by_string { get; set; default = true; }
public bool auto_start { get; set; default = false; }
public int showed_news { get; set; default = 0; }
public Gee.ArrayList<Theme?> themes { get; private set; }
@@ -77,6 +78,7 @@ public class Config : GLib.Object {
writer.write_attribute("max_visible_slices", max_visible_slices.to_string());
writer.write_attribute("show_indicator", show_indicator ? "true" : "false");
writer.write_attribute("show_captions", show_captions ? "true" : "false");
+ writer.write_attribute("search_by_string", search_by_string ? "true" : "false");
writer.write_attribute("showed_news", showed_news.to_string());
writer.end_element();
writer.end_document();
@@ -131,6 +133,9 @@ public class Config : GLib.Object {
case "show_captions":
show_captions = bool.parse(attr_content);
break;
+ case "search_by_string":
+ search_by_string = bool.parse(attr_content);
+ break;
case "showed_news":
showed_news = int.parse(attr_content);
break;
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-03 22:41:19 +0000