summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--AUTHORS1
-rw-r--r--resources/locale/de/LC_MESSAGES/de.po148
-rw-r--r--resources/locale/de/LC_MESSAGES/gnomepie.mobin8399 -> 8658 bytes
-rw-r--r--resources/locale/es/LC_MESSAGES/es.po484
-rw-r--r--resources/locale/es/LC_MESSAGES/gnomepie.mobin8605 -> 8420 bytes
-rw-r--r--resources/locale/fr/LC_MESSAGES/fr.po508
-rw-r--r--resources/locale/fr/LC_MESSAGES/gnomepie.mobin7270 -> 8959 bytes
-rwxr-xr-xresources/locale/gen-pot.sh2
-rw-r--r--resources/locale/gnomepie.pot475
-rw-r--r--resources/locale/it/LC_MESSAGES/gnomepie.mobin3185 -> 3224 bytes
-rw-r--r--resources/locale/it/LC_MESSAGES/it.po151
-rw-r--r--resources/locale/ko/LC_MESSAGES/gnomepie.mobin3153 -> 8994 bytes
-rw-r--r--resources/locale/ko/LC_MESSAGES/ko.po626
-rw-r--r--resources/locale/pt-br/LC_MESSAGES/gnomepie.mobin3063 -> 0 bytes
-rw-r--r--resources/locale/pt_BR/LC_MESSAGES/gnomepie.mobin0 -> 8892 bytes
-rw-r--r--resources/locale/pt_BR/LC_MESSAGES/pt_BR.po (renamed from resources/locale/pt-br/LC_MESSAGES/pt-br.po)655
-rw-r--r--resources/locale/ru/LC_MESSAGES/gnomepie.mobin9727 -> 9455 bytes
-rw-r--r--resources/locale/ru/LC_MESSAGES/ru.po204
-rw-r--r--resources/themes/adwaita/caption_mask.svg153
-rw-r--r--resources/themes/adwaita/theme.xml8
-rw-r--r--resources/themes/bright/caption.svg161
-rw-r--r--resources/themes/bright/caption_mask.svg153
-rw-r--r--resources/themes/bright/theme.xml10
-rw-r--r--resources/themes/elementary/slice_caption.svg130
-rw-r--r--resources/themes/elementary/theme.xml8
-rw-r--r--resources/themes/funky/slice_caption.svg130
-rw-r--r--resources/themes/funky/theme.xml10
-rw-r--r--resources/themes/gloss/slice_caption.svg210
-rw-r--r--resources/themes/gloss/theme.xml20
-rw-r--r--resources/themes/minimalistic_text/bg.svg179
-rw-r--r--resources/themes/minimalistic_text/fg.svg179
-rw-r--r--resources/themes/minimalistic_text/preview.pngbin0 -> 1478 bytes
-rw-r--r--resources/themes/minimalistic_text/theme.xml23
-rw-r--r--resources/themes/o-pie/caption1.svg178
-rw-r--r--resources/themes/o-pie/caption2.svg178
-rw-r--r--resources/themes/o-pie/theme.xml14
-rw-r--r--resources/themes/slim/slice_caption.svg130
-rw-r--r--resources/themes/slim/theme.xml12
-rw-r--r--resources/themes/unity/caption.svg161
-rw-r--r--resources/themes/unity/caption_mask.svg153
-rw-r--r--resources/themes/unity/theme.xml6
-rw-r--r--resources/ui/settings.ui99
-rw-r--r--src/actionGroups/devicesGroup.vala12
-rw-r--r--src/actionGroups/menuGroup.vala15
-rw-r--r--src/actions/actionRegistry.vala27
-rw-r--r--src/actions/pieAction.vala10
-rw-r--r--src/deamon.vala21
-rw-r--r--src/gui/aboutWindow.vala5
-rw-r--r--src/gui/newSliceWindow.vala1
-rw-r--r--src/gui/piePreview.vala3
-rw-r--r--src/gui/settingsWindow.vala38
-rw-r--r--src/gui/themeList.vala12
-rw-r--r--src/gui/triggerSelectButton.vala4
-rw-r--r--src/images/icon.vala18
-rw-r--r--src/images/renderedText.vala81
-rw-r--r--src/images/themedIcon.vala129
-rw-r--r--src/pies/load.vala2
-rw-r--r--src/pies/pieManager.vala21
-rw-r--r--src/pies/save.vala15
-rw-r--r--src/renderers/pieRenderer.vala42
-rw-r--r--src/renderers/pieWindow.vala23
-rw-r--r--src/renderers/sliceRenderer.vala32
-rw-r--r--src/themes/sliceLayer.vala50
-rw-r--r--src/themes/theme.vala61
-rw-r--r--src/utilities/config.vala5
-rw-r--r--src/utilities/logger.vala168
-rw-r--r--src/utilities/paths.vala44
67 files changed, 4715 insertions, 1683 deletions
diff --git a/AUTHORS b/AUTHORS
index fcb98b2..4b51e7e 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -10,4 +10,5 @@ Magnun Leno <magnun@codecommunity.org>
Kim Boram <Boramism@gmail.com>
Eduardo Anabalon <lalo1412@gmail.com>
Grégoire Bellon-Gervais <greggbg@gmail.com>
+Alex Maxime <cad.maxime@gmail.com>
Eugene Roskin <pams@imail.ru>
diff --git a/resources/locale/de/LC_MESSAGES/de.po b/resources/locale/de/LC_MESSAGES/de.po
index 9a43a67..5012a3b 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: 2012-01-19 20:25+0100\n"
+"POT-Creation-Date: 2012-02-29 15:58+0100\n"
"PO-Revision-Date: 2011-08-25 21:04+0200\n"
"Last-Translator: Simon Schneegans <code@simonschneegans.de>\n"
"Language-Team: German\n"
@@ -41,7 +41,7 @@ msgstr "URI öffnen"
msgid "Opens a given location. You may use URL's or files paths."
msgstr "Öffnet URLs oder Dateipfade."
-#: ../../src/actions/actionRegistry.vala:111
+#: ../../src/actions/actionRegistry.vala:119
msgid "Trash"
msgstr "Müll"
@@ -54,7 +54,7 @@ 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/triggerSelectWindow.vala:144
+#: ../../src/gui/triggerSelectWindow.vala:166
msgid ""
"This hotkey is already assigned to the pie \"%s\"! \n"
"\n"
@@ -63,98 +63,99 @@ msgstr ""
"Dieser Hotkey ist schon dem Pie \"%s\" zugeordnet!\n"
" Bitte wähle einen anderen!"
-#: ../../src/gui/preferencesWindow.vala:145
+#: ../../src/gui/preferencesWindow.vala:175
msgid "No Pie selected."
msgstr "Kein Pie gewählt."
-#: ../../src/gui/preferencesWindow.vala:181
+#: ../../src/gui/preferencesWindow.vala:215
msgid "New Pie"
msgstr "Neuer Pie"
-#: ../../src/gui/preferencesWindow.vala:190
+#: ../../src/gui/preferencesWindow.vala:228
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?"
-#: ../../src/gui/newSliceWindow.vala:229
+#: ../../src/gui/newSliceWindow.vala:291
msgid "Rename me!"
msgstr "Benenne mich!"
-#: ../../src/gui/piePreviewRenderer.vala:292
+#: ../../src/gui/piePreviewRenderer.vala:412
msgid "Click to edit"
msgstr "Editieren durch klicken"
-#: ../../src/gui/piePreviewRenderer.vala:292
-#: ../../src/gui/piePreviewRenderer.vala:307
+#: ../../src/gui/piePreviewRenderer.vala:412
+#: ../../src/gui/piePreviewRenderer.vala:427
msgid "Drag to move"
msgstr "Verschieben durch ziehen"
-#: ../../src/gui/piePreviewRenderer.vala:295
+#: ../../src/gui/piePreviewRenderer.vala:415
msgid "Click to add a new Slice"
msgstr "Neue Slice durch Klicken hinzufügen"
-#: ../../src/gui/piePreviewRenderer.vala:299
+#: ../../src/gui/piePreviewRenderer.vala:419
msgid "Drop to add as new Slice"
msgstr "Als neue Slice hinzuzufügen"
-#: ../../src/gui/piePreviewRenderer.vala:302
+#: ../../src/gui/piePreviewRenderer.vala:422
msgid "Drop to move Slice"
msgstr "Slice verschieben"
-#: ../../src/gui/piePreviewRenderer.vala:307
+#: ../../src/gui/piePreviewRenderer.vala:427
msgid "Click to delete"
msgstr "Löschen durch klicken"
-#: ../../src/gui/triggerSelectButton.vala:59
+#: ../../src/gui/triggerSelectButton.vala:63
msgid "Press a hotkey ..."
msgstr "Wählen..."
-#: ../../src/gui/piePreview.vala:120
+#: ../../src/gui/piePreview.vala:155
msgid "Do you really want to delete this Slice?"
msgstr "Soll die ausgewählte Slice wirklich gelöscht werden?"
-#: ../../src/gui/themeList.vala:48
+#: ../../src/gui/themeList.vala:62
msgid "Themes"
msgstr "Themen"
-#: ../../src/gui/themeList.vala:80
+#: ../../src/gui/themeList.vala:99
msgid "By"
msgstr "Von"
-#: ../../src/gui/sliceTypeList.vala:56
+#: ../../src/gui/sliceTypeList.vala:60
msgid "Slice types"
msgstr "Slice-Typen"
-#: ../../src/gui/iconSelectWindow.vala:178
+#: ../../src/gui/iconSelectWindow.vala:186
msgid "All icons"
msgstr "Alle Symbole"
-#: ../../src/gui/iconSelectWindow.vala:179
+#: ../../src/gui/iconSelectWindow.vala:187
#: ../../src/pies/defaultConfig.vala:36
msgid "Applications"
msgstr "Anwendungen"
-#: ../../src/gui/iconSelectWindow.vala:180
+#: ../../src/gui/iconSelectWindow.vala:188
msgid "Actions"
msgstr "Aktionen"
-#: ../../src/gui/iconSelectWindow.vala:181
+#: ../../src/gui/iconSelectWindow.vala:189
msgid "Places"
msgstr "Orte"
-#: ../../src/gui/iconSelectWindow.vala:182
+#: ../../src/gui/iconSelectWindow.vala:190
msgid "File types"
msgstr "Dateitypen"
-#: ../../src/gui/iconSelectWindow.vala:183
+#: ../../src/gui/iconSelectWindow.vala:191
msgid "Emotes"
msgstr "Smilies"
-#: ../../src/gui/iconSelectWindow.vala:184
+#: ../../src/gui/iconSelectWindow.vala:192
msgid "Miscellaneous"
msgstr "Sonstige"
-#: ../../src/gui/iconSelectWindow.vala:257
+#: ../../src/gui/iconSelectWindow.vala:267
+#: ../../src/gui/iconSelectWindow.vala:269
msgid "All supported image formats"
msgstr "Alle unterstützten Bildformate"
@@ -224,8 +225,8 @@ msgstr ""
msgid "Root"
msgstr "Dateisystem"
-#: ../../src/utilities/bindingManager.vala:155 ../../src/utilities/key.vala:65
-#: ../../src/utilities/trigger.vala:216 ../../src/utilities/trigger.vala:217
+#: ../../src/utilities/bindingManager.vala:161 ../../src/utilities/key.vala:65
+#: ../../src/utilities/trigger.vala:212 ../../src/utilities/trigger.vala:213
msgid "Not bound"
msgstr "Nicht zugewiesen"
@@ -245,18 +246,18 @@ msgstr "MausRechts"
msgid "MiddleButton"
msgstr "Mausrad"
-#: ../../src/utilities/trigger.vala:192 ../../src/utilities/trigger.vala:194
-#: ../../src/utilities/trigger.vala:196 ../../src/utilities/trigger.vala:200
+#: ../../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:192 ../../src/utilities/trigger.vala:196
-#: ../../src/utilities/trigger.vala:198 ../../src/utilities/trigger.vala:202
+#: ../../src/utilities/trigger.vala:188 ../../src/utilities/trigger.vala:192
+#: ../../src/utilities/trigger.vala:194 ../../src/utilities/trigger.vala:198
msgid "Delayed"
msgstr "Verzögert"
-#: ../../src/utilities/trigger.vala:192 ../../src/utilities/trigger.vala:194
-#: ../../src/utilities/trigger.vala:198 ../../src/utilities/trigger.vala:204
+#: ../../src/utilities/trigger.vala:188 ../../src/utilities/trigger.vala:190
+#: ../../src/utilities/trigger.vala:194 ../../src/utilities/trigger.vala:200
msgid "Centered"
msgstr "Zentriert"
@@ -320,7 +321,7 @@ msgstr "Wiederherstellen"
msgid "Select an icon"
msgstr "Wähle ein Symbol"
-#: ../ui/icon_select.ui:84
+#: ../ui/icon_select.ui:85
msgid "Icon Theme"
msgstr "Symbolthema"
@@ -332,36 +333,36 @@ msgstr "Benutzerdefiniertes Symbol"
msgid "Activation Settings"
msgstr "Aktivierungsoptionen"
-#: ../ui/trigger_select.ui:44
+#: ../ui/trigger_select.ui:86
msgid "It's possible to bind mouse buttons as well!"
msgstr "Es ist auch möglich, Maustasten zu binden!"
-#: ../ui/trigger_select.ui:76
+#: ../ui/trigger_select.ui:118
msgid "Turbo mode"
msgstr "Turbo-Mode"
-#: ../ui/trigger_select.ui:80
+#: ../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 ""
"Falls aktiviert schließt sich der Pie wieder automatisch, wenn der Hotkey "
"losgelassen wird."
-#: ../ui/trigger_select.ui:93
+#: ../ui/trigger_select.ui:137
msgid "Long press for activation"
msgstr "Verzögerte Aktivierung"
-#: ../ui/trigger_select.ui:97
+#: ../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 ""
"Falls aktiviert, wird sich der Pie erst öffnen, wenn der Hotkey länger "
"gedrückt gehalten wird."
-#: ../ui/trigger_select.ui:110
+#: ../ui/trigger_select.ui:156
msgid "Open Pie centered on the screen"
msgstr "Zentriert auf dem Bildschirm öffnen"
-#: ../ui/trigger_select.ui:114
+#: ../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."
@@ -369,27 +370,27 @@ msgstr ""
"Falls aktiviert, wird sich der Pie nicht an der Maus, sondern in der Mitte "
"des Bildschirms öffnen."
-#: ../ui/trigger_select.ui:133
+#: ../ui/trigger_select.ui:181
msgid "Activation options"
msgstr "Aktivierungsoptionen"
-#: ../ui/settings.ui:8 ../ui/preferences.ui:27
+#: ../ui/settings.ui:9 ../ui/preferences.ui:27
msgid "General Settings"
msgstr "Allgemeine Einstellungen"
-#: ../ui/settings.ui:47
+#: ../ui/settings.ui:74
msgid "Start Gnome-Pie on login"
msgstr "Beim Anmelden automatisch ausführen"
-#: ../ui/settings.ui:52 ../ui/settings.ui:53
+#: ../ui/settings.ui:79 ../ui/settings.ui:80
msgid "If checked, Gnome-Pie will start silently everytime you log in."
msgstr "Wenn aktiviert, startet Gnome-Pie im Hintergrund beim Anmelden."
-#: ../ui/settings.ui:66
+#: ../ui/settings.ui:93
msgid "Display panel icon "
msgstr "Zeige ein Symbol im Panel"
-#: ../ui/settings.ui:71 ../ui/settings.ui:72
+#: ../ui/settings.ui:98 ../ui/settings.ui:99
msgid ""
"If not checked, you can access this menu by launching Gnome-Pie a second "
"time."
@@ -397,51 +398,67 @@ msgstr ""
"Falls nicht aktiviert, kann dieses Menü durch ein nochmaliges starten von "
"Gnome-Pie geöffnet werden."
-#: ../ui/settings.ui:92
+#: ../ui/settings.ui:118
+msgid "Behavior"
+msgstr "Verhalten"
+
+#: ../ui/settings.ui:175
msgid "Global scale"
msgstr "Skalierungsfaktor"
-#: ../ui/settings.ui:130
-msgid "Appearance and behavior"
-msgstr "Erscheinungsbild and Verhalten"
+#: ../ui/settings.ui:207
+msgid "Display Slice labels"
+msgstr "Zeige Namen der Slices"
+
+#: ../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 ""
+"Zeigt den Name jeder Slice an. Nur möglich, wenn durch das aktuelle Thema "
+"unterstützt."
-#: ../ui/slice_select.ui:8
+#: ../ui/settings.ui:232
+msgid "Appearance"
+msgstr "Erscheinungsbild"
+
+#: ../ui/slice_select.ui:9
msgid "Slice Options"
msgstr "Slice-Optionen"
-#: ../ui/slice_select.ui:95
+#: ../ui/slice_select.ui:139
msgid "There are no options for this Slice type."
msgstr "Es gibt keine Otionen für diesen Slice-Typ."
-#: ../ui/slice_select.ui:121
+#: ../ui/slice_select.ui:165
msgid "Name of the Slice "
msgstr "Name"
-#: ../ui/slice_select.ui:159
+#: ../ui/slice_select.ui:204
msgid "URI to open"
msgstr "URI"
-#: ../ui/slice_select.ui:197
+#: ../ui/slice_select.ui:243
msgid "Command to execute"
msgstr "Befehl"
-#: ../ui/slice_select.ui:235
+#: ../ui/slice_select.ui:282
msgid "Hotkey to press"
msgstr "Tastenkomination"
-#: ../ui/slice_select.ui:264
+#: ../ui/slice_select.ui:311
msgid "Pie to open"
msgstr "Pie"
-#: ../ui/slice_select.ui:293
+#: ../ui/slice_select.ui:340
msgid "Is Quick Action"
msgstr "Ist Quick Action"
-#: ../ui/slice_select.ui:306
+#: ../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 "Diese Slice wird aktiviert, falls du in die Mitte des Pies klickst."
-#: ../ui/slice_select.ui:339
+#: ../ui/slice_select.ui:388
msgid "Slice options"
msgstr "Slice-Optionen"
@@ -479,9 +496,6 @@ msgstr ""
"Erstelle einen neuen! </b> Klicke dazu einfach auf das kleine Pluszeichen "
"unter der leeren Liste auf der linken Seite."
-#: ../ui/rename_pie.ui:6
+#: ../ui/rename_pie.ui:8
msgid "Rename a Pie"
msgstr "Pie umbenennen"
-
-#~ msgid "Appearance Options"
-#~ msgstr "Erscheinungsbild"
diff --git a/resources/locale/de/LC_MESSAGES/gnomepie.mo b/resources/locale/de/LC_MESSAGES/gnomepie.mo
index f2c36f1..1701aa6 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/es/LC_MESSAGES/es.po b/resources/locale/es/LC_MESSAGES/es.po
index 8e82a87..c52ac16 100644
--- a/resources/locale/es/LC_MESSAGES/es.po
+++ b/resources/locale/es/LC_MESSAGES/es.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: gnomepie 0.4\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-01-22 15:28-0300\n"
+"POT-Creation-Date: 2012-02-29 15:58+0100\n"
"PO-Revision-Date: 2012-01-22 15:30-0300\n"
"Last-Translator: Eduardo Anabalon <lalo1412@gmail.com>\n"
"Language-Team: Spanish\n"
@@ -17,70 +17,21 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: ../../src/pies/defaultConfig.vala:29
-msgid "Multimedia"
-msgstr "Multimedia"
-
-#: ../../src/pies/defaultConfig.vala:30
-msgid "Next Track"
-msgstr "Pista Siguiente"
-
-#: ../../src/pies/defaultConfig.vala:31
-msgid "Stop"
-msgstr "Parar"
-
-#: ../../src/pies/defaultConfig.vala:32
-msgid "Previous Track"
-msgstr "Pista Anterior"
-
-#: ../../src/pies/defaultConfig.vala:33
-msgid "Play/Pause"
-msgstr "Reproducir/Pausa"
-
-#: ../../src/pies/defaultConfig.vala:36
-#: ../../src/gui/iconSelectWindow.vala:187
-msgid "Applications"
-msgstr "Aplicaciones"
-
-#: ../../src/pies/defaultConfig.vala:45
-msgid "Bookmarks"
-msgstr "Marcadores"
-
-#: ../../src/pies/defaultConfig.vala:50
-msgid "Session"
-msgstr "Sesión"
-
-#: ../../src/pies/defaultConfig.vala:54
-msgid "Main Menu"
-msgstr "Menú Principal"
-
-#: ../../src/pies/defaultConfig.vala:58
-msgid "Window"
-msgstr "Ventana"
-
-#: ../../src/pies/defaultConfig.vala:59
-msgid "Scale"
-msgstr "Escalar"
-
-#: ../../src/pies/defaultConfig.vala:60
-msgid "Minimize"
-msgstr "Minimizar"
-
-#: ../../src/pies/defaultConfig.vala:61
-msgid "Close"
-msgstr "Cerrar"
+#: ../../src/actions/keyAction.vala:34
+msgid "Press hotkey"
+msgstr "Presiona un atajo."
-#: ../../src/pies/defaultConfig.vala:62
-msgid "Maximize"
-msgstr "Maximizar"
+#: ../../src/actions/keyAction.vala:36
+msgid "Simulates the activation of a hotkey."
+msgstr "Simula la activación de un atajo."
-#: ../../src/pies/defaultConfig.vala:63
-msgid "Restore"
-msgstr "Restaurar"
+#: ../../src/actions/appAction.vala:34
+msgid "Launch application"
+msgstr "Lanzar una aplicación"
-#: ../../src/actions/actionRegistry.vala:119
-msgid "Trash"
-msgstr "Borrar"
+#: ../../src/actions/appAction.vala:36
+msgid "Executes the given command."
+msgstr "Ejecutar un comando dado."
#: ../../src/actions/uriAction.vala:34
msgid "Open URI"
@@ -90,6 +41,10 @@ msgstr "Abrir URI"
msgid "Opens a given location. You may use URL's or files paths."
msgstr "Abre un lugar determinado. Puedes usar URI's o ruta de archivos."
+#: ../../src/actions/actionRegistry.vala:119
+msgid "Trash"
+msgstr "Borrar"
+
#: ../../src/actions/pieAction.vala:34
msgid "Open Pie"
msgstr "Abrir Pastel"
@@ -98,30 +53,6 @@ msgstr "Abrir Pastel"
msgid "Opens another Pie of Gnome-Pie. You may create sub menus this way."
msgstr "Abre otro Pastel de Gnome-Pie. De esta manera puedes crear submenús."
-#: ../../src/actions/keyAction.vala:34
-msgid "Press hotkey"
-msgstr "Presiona un atajo."
-
-#: ../../src/actions/keyAction.vala:36
-msgid "Simulates the activation of a hotkey."
-msgstr "Simula la activación de un atajo."
-
-#: ../../src/actions/appAction.vala:34
-msgid "Launch application"
-msgstr "Lanzar una aplicación"
-
-#: ../../src/actions/appAction.vala:36
-msgid "Executes the given command."
-msgstr "Ejecutar un comando dado."
-
-#: ../../src/gui/newSliceWindow.vala:290
-msgid "Rename me!"
-msgstr "Renombrame!"
-
-#: ../../src/gui/triggerSelectButton.vala:63
-msgid "Press a hotkey ..."
-msgstr "Presiona un atajo ..."
-
#: ../../src/gui/triggerSelectWindow.vala:166
msgid ""
"This hotkey is already assigned to the pie \"%s\"! \n"
@@ -132,56 +63,24 @@ msgstr ""
"\n"
"Por favor selecciona otro atajo o cancela tu selección."
-#: ../../src/gui/iconSelectWindow.vala:186
-msgid "All icons"
-msgstr "Todos los iconos"
-
-#: ../../src/gui/iconSelectWindow.vala:188
-msgid "Actions"
-msgstr "Acciones"
-
-#: ../../src/gui/iconSelectWindow.vala:189
-msgid "Places"
-msgstr "Lugares"
-
-#: ../../src/gui/iconSelectWindow.vala:190
-msgid "File types"
-msgstr "Tipos de archivo"
-
-#: ../../src/gui/iconSelectWindow.vala:191
-msgid "Emotes"
-msgstr "Emotes"
-
-#: ../../src/gui/iconSelectWindow.vala:192
-msgid "Miscellaneous"
-msgstr "Misceláneos"
-
-#: ../../src/gui/iconSelectWindow.vala:267
-#: ../../src/gui/iconSelectWindow.vala:269
-msgid "All supported image formats"
-msgstr "Todos los formatos de imágenes soportados"
-
-#: ../../src/gui/piePreview.vala:152
-msgid "Do you really want to delete this Slice?"
-msgstr "Realmente quieres borrar ésta Rebanada?"
-
-#: ../../src/gui/sliceTypeList.vala:60
-msgid "Slice types"
-msgstr "Tipos de Rebanada"
-
-#: ../../src/gui/preferencesWindow.vala:170
+#: ../../src/gui/preferencesWindow.vala:175
msgid "No Pie selected."
msgstr "Pastel no seleccionado."
-#: ../../src/gui/preferencesWindow.vala:212
+#: ../../src/gui/preferencesWindow.vala:215
msgid "New Pie"
msgstr "Nuevo Pastel"
-#: ../../src/gui/preferencesWindow.vala:225
+#: ../../src/gui/preferencesWindow.vala:228
msgid ""
"Do you really want to delete the selected Pie with all contained Slices?"
msgstr ""
-"Realmente quieres borrar el Pastel seleccionado incluyendo todas sus Rebanadas?"
+"Realmente quieres borrar el Pastel seleccionado incluyendo todas sus "
+"Rebanadas?"
+
+#: ../../src/gui/newSliceWindow.vala:291
+msgid "Rename me!"
+msgstr "Renombrame!"
#: ../../src/gui/piePreviewRenderer.vala:412
msgid "Click to edit"
@@ -208,14 +107,86 @@ msgstr "Suelta para mover la Rebanada"
msgid "Click to delete"
msgstr "Click para borrar"
-#: ../../src/gui/themeList.vala:53
+#: ../../src/gui/triggerSelectButton.vala:63
+msgid "Press a hotkey ..."
+msgstr "Presiona un atajo ..."
+
+#: ../../src/gui/piePreview.vala:155
+msgid "Do you really want to delete this Slice?"
+msgstr "Realmente quieres borrar ésta Rebanada?"
+
+#: ../../src/gui/themeList.vala:62
msgid "Themes"
msgstr "Temas"
-#: ../../src/gui/themeList.vala:86
+#: ../../src/gui/themeList.vala:99
msgid "By"
msgstr "Por"
+#: ../../src/gui/sliceTypeList.vala:60
+msgid "Slice types"
+msgstr "Tipos de Rebanada"
+
+#: ../../src/gui/iconSelectWindow.vala:186
+msgid "All icons"
+msgstr "Todos los iconos"
+
+#: ../../src/gui/iconSelectWindow.vala:187
+#: ../../src/pies/defaultConfig.vala:36
+msgid "Applications"
+msgstr "Aplicaciones"
+
+#: ../../src/gui/iconSelectWindow.vala:188
+msgid "Actions"
+msgstr "Acciones"
+
+#: ../../src/gui/iconSelectWindow.vala:189
+msgid "Places"
+msgstr "Lugares"
+
+#: ../../src/gui/iconSelectWindow.vala:190
+msgid "File types"
+msgstr "Tipos de archivo"
+
+#: ../../src/gui/iconSelectWindow.vala:191
+msgid "Emotes"
+msgstr "Emotes"
+
+#: ../../src/gui/iconSelectWindow.vala:192
+msgid "Miscellaneous"
+msgstr "Misceláneos"
+
+#: ../../src/gui/iconSelectWindow.vala:267
+#: ../../src/gui/iconSelectWindow.vala:269
+msgid "All supported image formats"
+msgstr "Todos los formatos de imágenes soportados"
+
+#: ../../src/actionGroups/windowListGroup.vala:34
+msgid "Group: Window List"
+msgstr "Grupo: Lista de Ventanas"
+
+#: ../../src/actionGroups/windowListGroup.vala:36
+msgid "Shows a Slice for each of your opened Windows. Almost like Alt-Tab."
+msgstr ""
+"Muestra una Rebanada para cada uno de tus Ventanas abiertas. Casi como Alt-"
+"Tab."
+
+#: ../../src/actionGroups/menuGroup.vala:35
+msgid "Group: Main menu"
+msgstr "Grupo: Menú Principal"
+
+#: ../../src/actionGroups/menuGroup.vala:37
+msgid "Displays your main menu structure."
+msgstr "Muestra la estructura de tu Menú Principal."
+
+#: ../../src/actionGroups/clipboardGroup.vala:64
+msgid "Group: Clipboard"
+msgstr "Grupo: Portapapeles"
+
+#: ../../src/actionGroups/clipboardGroup.vala:66
+msgid "Manages your Clipboard."
+msgstr "Gestiona tus Portapapeles."
+
#: ../../src/actionGroups/sessionGroup.vala:35
msgid "Group: Session Control"
msgstr "Grupo: Control de Sesión"
@@ -229,16 +200,21 @@ msgid "Shutdown"
msgstr "Apagar"
#: ../../src/actionGroups/sessionGroup.vala:63
+msgid "Logout"
+msgstr ""
+
+#: ../../src/actionGroups/sessionGroup.vala:66
msgid "Reboot"
msgstr "Reiniciar"
-#: ../../src/actionGroups/sessionGroup.vala:66
-msgid "Suspend"
-msgstr "Suspender"
+#: ../../src/actionGroups/bookmarkGroup.vala:36
+msgid "Group: Bookmarks"
+msgstr "Grupo: Marcadores"
-#: ../../src/actionGroups/sessionGroup.vala:69
-msgid "Hibernate"
-msgstr "Hibernar"
+#: ../../src/actionGroups/bookmarkGroup.vala:38
+msgid "Shows a Slice for each of your directory Bookmarks."
+msgstr ""
+"Muestra una Rebanada por cada uno de los directorios en los Marcadores."
#: ../../src/actionGroups/devicesGroup.vala:35
msgid "Group: Devices"
@@ -252,41 +228,8 @@ msgstr "Muestra una Rebanada por cada dispositivo conectado, como USB-Sticks."
msgid "Root"
msgstr "Root"
-#: ../../src/actionGroups/bookmarkGroup.vala:36
-msgid "Group: Bookmarks"
-msgstr "Grupo: Marcadores"
-
-#: ../../src/actionGroups/bookmarkGroup.vala:38
-msgid "Shows a Slice for each of your directory Bookmarks."
-msgstr "Muestra una Rebanada por cada uno de los directorios en los Marcadores."
-
-#: ../../src/actionGroups/clipboardGroup.vala:64
-msgid "Group: Clipboard"
-msgstr "Grupo: Portapapeles"
-
-#: ../../src/actionGroups/clipboardGroup.vala:66
-msgid "Manages your Clipboard."
-msgstr "Gestiona tus Portapapeles."
-
-#: ../../src/actionGroups/menuGroup.vala:35
-msgid "Group: Main menu"
-msgstr "Grupo: Menú Principal"
-
-#: ../../src/actionGroups/menuGroup.vala:37
-msgid "Displays your main menu structure."
-msgstr "Muestra la estructura de tu Menú Principal."
-
-#: ../../src/actionGroups/windowListGroup.vala:34
-msgid "Group: Window List"
-msgstr "Grupo: Lista de Ventanas"
-
-#: ../../src/actionGroups/windowListGroup.vala:36
-msgid "Shows a Slice for each of your opened Windows. Almost like Alt-Tab."
-msgstr "Muestra una Rebanada para cada uno de tus Ventanas abiertas. Casi como Alt-Tab."
-
-#: ../../src/utilities/bindingManager.vala:161
-#: ../../src/utilities/trigger.vala:216 ../../src/utilities/trigger.vala:217
-#: ../../src/utilities/key.vala:65
+#: ../../src/utilities/bindingManager.vala:161 ../../src/utilities/key.vala:65
+#: ../../src/utilities/trigger.vala:212 ../../src/utilities/trigger.vala:213
msgid "Not bound"
msgstr "No encontrado"
@@ -306,52 +249,76 @@ msgstr "BotónDerecho"
msgid "MiddleButton"
msgstr "BotónCentral"
-#: ../../src/utilities/trigger.vala:192 ../../src/utilities/trigger.vala:194
-#: ../../src/utilities/trigger.vala:196 ../../src/utilities/trigger.vala:200
+#: ../../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:192 ../../src/utilities/trigger.vala:196
-#: ../../src/utilities/trigger.vala:198 ../../src/utilities/trigger.vala:202
+#: ../../src/utilities/trigger.vala:188 ../../src/utilities/trigger.vala:192
+#: ../../src/utilities/trigger.vala:194 ../../src/utilities/trigger.vala:198
msgid "Delayed"
msgstr "Retrasado"
-#: ../../src/utilities/trigger.vala:192 ../../src/utilities/trigger.vala:194
-#: ../../src/utilities/trigger.vala:198 ../../src/utilities/trigger.vala:204
+#: ../../src/utilities/trigger.vala:188 ../../src/utilities/trigger.vala:190
+#: ../../src/utilities/trigger.vala:194 ../../src/utilities/trigger.vala:200
msgid "Centered"
msgstr "Centrado"
-#: ../ui/settings.ui:9 ../ui/preferences.ui:27
-msgid "General Settings"
-msgstr "Configuraciones Generales"
+#: ../../src/pies/defaultConfig.vala:29
+msgid "Multimedia"
+msgstr "Multimedia"
-#: ../ui/settings.ui:74
-msgid "Start Gnome-Pie on login"
-msgstr "Arrancar Gnome-Pie al inicio"
+#: ../../src/pies/defaultConfig.vala:30
+msgid "Next Track"
+msgstr "Pista Siguiente"
-#: ../ui/settings.ui:79 ../ui/settings.ui:80
-msgid "If checked, Gnome-Pie will start silently everytime you log in."
-msgstr "Gnome-Pie se iniciará en silencio cada vez que inicies sesión."
+#: ../../src/pies/defaultConfig.vala:31
+msgid "Stop"
+msgstr "Parar"
-#: ../ui/settings.ui:93
-msgid "Display panel icon "
-msgstr "Mostrar panel de íconos"
+#: ../../src/pies/defaultConfig.vala:32
+msgid "Previous Track"
+msgstr "Pista Anterior"
-#: ../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 ""
-"Puedes acceder a este menú lanzando Gnome-Pie por segunda"
-"vez."
+#: ../../src/pies/defaultConfig.vala:33
+msgid "Play/Pause"
+msgstr "Reproducir/Pausa"
-#: ../ui/settings.ui:119
-msgid "Global scale"
-msgstr "Escala Global"
+#: ../../src/pies/defaultConfig.vala:45
+msgid "Bookmarks"
+msgstr "Marcadores"
-#: ../ui/settings.ui:157
-msgid "Appearance and behavior"
-msgstr "Apariencia y comportamiento"
+#: ../../src/pies/defaultConfig.vala:50
+msgid "Session"
+msgstr "Sesión"
+
+#: ../../src/pies/defaultConfig.vala:54
+msgid "Main Menu"
+msgstr "Menú Principal"
+
+#: ../../src/pies/defaultConfig.vala:58
+msgid "Window"
+msgstr "Ventana"
+
+#: ../../src/pies/defaultConfig.vala:59
+msgid "Scale"
+msgstr "Escalar"
+
+#: ../../src/pies/defaultConfig.vala:60
+msgid "Minimize"
+msgstr "Minimizar"
+
+#: ../../src/pies/defaultConfig.vala:61
+msgid "Close"
+msgstr "Cerrar"
+
+#: ../../src/pies/defaultConfig.vala:62
+msgid "Maximize"
+msgstr "Maximizar"
+
+#: ../../src/pies/defaultConfig.vala:63
+msgid "Restore"
+msgstr "Restaurar"
#: ../ui/icon_select.ui:8
msgid "Select an icon"
@@ -388,8 +355,7 @@ msgstr "Larga pulsación para la activación"
#: ../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 ""
-"el Pastel solo se abrirá si presionas el atajo un poco más."
+msgstr "el Pastel solo se abrirá si presionas el atajo un poco más."
#: ../ui/trigger_select.ui:156
msgid "Open Pie centered on the screen"
@@ -407,43 +373,51 @@ msgstr ""
msgid "Activation options"
msgstr "Opciones de activación"
-#: ../ui/rename_pie.ui:8
-msgid "Rename a Pie"
-msgstr "Renombrar un Pastel"
+#: ../ui/settings.ui:9 ../ui/preferences.ui:27
+msgid "General Settings"
+msgstr "Configuraciones Generales"
-#: ../ui/preferences.ui:8
-msgid "Gnome-Pie Settings"
-msgstr "Configuraciones de Gnome-Pie"
+#: ../ui/settings.ui:74
+msgid "Start Gnome-Pie on login"
+msgstr "Arrancar Gnome-Pie al inicio"
-#: ../ui/preferences.ui:261
+#: ../ui/settings.ui:79 ../ui/settings.ui:80
+msgid "If checked, Gnome-Pie will start silently everytime you log in."
+msgstr "Gnome-Pie se iniciará en silencio cada vez que inicies sesión."
+
+#: ../ui/settings.ui:93
+msgid "Display panel icon "
+msgstr "Mostrar panel de íconos"
+
+#: ../ui/settings.ui:98 ../ui/settings.ui:99
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."
+"If not checked, you can access this menu by launching Gnome-Pie a second "
+"time."
+msgstr "Puedes acceder a este menú lanzando Gnome-Pie por segundavez."
+
+#: ../ui/settings.ui:118
+msgid "Behavior"
msgstr ""
-"<b><big>Un Pastel vacío!</big>\n"
-"\n"
-"Empieza añadiendo Rebanadas!</b> Puedes hacerlo añadiendo cosas al "
-"signo más. Puedes intentar muchas cosas! Por ejemplo lanzadores de aplicaciones o "
-"directorios. Incluso puedes añadir URLs desde tu navegador... \n"
-"\n"
-"Para configuración manual y avanzada, click en el signo más."
-#: ../ui/preferences.ui:282
+#: ../ui/settings.ui:175
+msgid "Global scale"
+msgstr "Escala Global"
+
+#: ../ui/settings.ui:207
+#, fuzzy
+msgid "Display Slice labels"
+msgstr "Mostrar panel de íconos"
+
+#: ../ui/settings.ui:212 ../ui/settings.ui:213
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."
+"Displays the name of each Slice next to it. Only available if supported by "
+"the theme."
msgstr ""
-"<b><big>No tienes Pasteles!</big>\n"
-"\n"
-"Empieza por crear uno! </b> Puedes hacerlo haciendo click en el pequeño "
-"signo más en la esquina inferior izquierda."
+
+#: ../ui/settings.ui:232
+#, fuzzy
+msgid "Appearance"
+msgstr "Apariencia y comportamiento"
#: ../ui/slice_select.ui:9
msgid "Slice Options"
@@ -484,3 +458,47 @@ msgstr "Esta Rebanada se ejecutará cuando hagas click en el medio del Pastel."
#: ../ui/slice_select.ui:388
msgid "Slice options"
msgstr "Opciones de Rebanadas"
+
+#: ../ui/preferences.ui:8
+msgid "Gnome-Pie Settings"
+msgstr "Configuraciones 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>Un Pastel vacío!</big>\n"
+"\n"
+"Empieza añadiendo Rebanadas!</b> Puedes hacerlo añadiendo cosas al signo "
+"más. Puedes intentar muchas cosas! Por ejemplo lanzadores de aplicaciones o "
+"directorios. Incluso puedes añadir URLs desde tu navegador... \n"
+"\n"
+"Para configuración manual y avanzada, click en el signo más."
+
+#: ../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>No tienes Pasteles!</big>\n"
+"\n"
+"Empieza por crear uno! </b> Puedes hacerlo haciendo click en el pequeño "
+"signo más en la esquina inferior izquierda."
+
+#: ../ui/rename_pie.ui:8
+msgid "Rename a Pie"
+msgstr "Renombrar un Pastel"
+
+#~ msgid "Suspend"
+#~ msgstr "Suspender"
+
+#~ msgid "Hibernate"
+#~ msgstr "Hibernar"
diff --git a/resources/locale/es/LC_MESSAGES/gnomepie.mo b/resources/locale/es/LC_MESSAGES/gnomepie.mo
index 436242e..d3a0e7d 100644
--- a/resources/locale/es/LC_MESSAGES/gnomepie.mo
+++ b/resources/locale/es/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 ef93ffb..09a3ce0 100644
--- a/resources/locale/fr/LC_MESSAGES/fr.po
+++ b/resources/locale/fr/LC_MESSAGES/fr.po
@@ -1,14 +1,17 @@
-# French translations for gnomepie package.
-# Copyright (C) 2011 Simon Schneegans <code@simonschneegans.de>
+# 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.
+#
#
msgid ""
msgstr ""
-"Project-Id-Version: gnomepie 0.4\n"
+"Project-Id-Version: gnomepie 0.5\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-01-19 20:25+0100\n"
-"PO-Revision-Date: 2012-23-01 14:29+0100\n"
+"POT-Creation-Date: 2012-02-29 15:58+0100\n"
+"PO-Revision-Date: 2012-01-27 22:15+0100\n"
"Last-Translator: Grégoire BELLON-GERVAIS <greggbg@gmail.com>\n"
"Language-Team: French\n"
"Language: fr\n"
@@ -19,254 +22,255 @@ msgstr ""
#: ../../src/actions/keyAction.vala:34
msgid "Press hotkey"
-msgstr "Exécute le raccourcis"
+msgstr "Appuyez sur le raccourci clavier"
#: ../../src/actions/keyAction.vala:36
msgid "Simulates the activation of a hotkey."
-msgstr "Simule l'activation du raccourcis"
+msgstr "Simule l'activation d'un raccourci clavier"
#: ../../src/actions/appAction.vala:34
msgid "Launch application"
-msgstr "Lance une application"
+msgstr "Lancer l'application"
#: ../../src/actions/appAction.vala:36
msgid "Executes the given command."
-msgstr "Exécute la commande définie"
+msgstr "Execute la commande définie"
#: ../../src/actions/uriAction.vala:34
msgid "Open URI"
-msgstr "Ouvre une 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 donné. Vous pouvez entrer une URL ou le chemin d'un fichier."
+msgstr ""
+"Ouvre un emplacement définie. Vous pouvez entrer une URL ou le chemin d'un "
+"fichier"
-#: ../../src/actions/actionRegistry.vala:111
+#: ../../src/actions/actionRegistry.vala:119
msgid "Trash"
msgstr "Poubelle"
#: ../../src/actions/pieAction.vala:34
msgid "Open Pie"
-msgstr "Ouvre la Tarte"
+msgstr "Ouvrir une Part"
#: ../../src/actions/pieAction.vala:36
msgid "Opens another Pie of Gnome-Pie. You may create sub menus this way."
-msgstr "Ouvre une autre instance de Gnome-Pie. Vous pouvez ainsi créer des sous-menus."
+msgstr ""
+"Ouvre une autre Part de Gnome-Pie. Vous pouvez ainsi créer des sous-menus."
-#: ../../src/gui/triggerSelectWindow.vala:144
+#: ../../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 raccourcis est déjà assigné à la Tarte \"%s\" ! \n"
+"Ce raccourci clavier est déja déninie pour la Part \"%s\"! \n"
"\n"
"Merci d'en choisir un autre ou d'annuler votre choix."
-#: ../../src/gui/preferencesWindow.vala:145
+#: ../../src/gui/preferencesWindow.vala:175
msgid "No Pie selected."
-msgstr "Aucune Tarte sélectionnée."
+msgstr "Aucune Part sélectionnée"
-#: ../../src/gui/preferencesWindow.vala:181
+#: ../../src/gui/preferencesWindow.vala:215
msgid "New Pie"
-msgstr "Nouvelle Tarte"
+msgstr "Nouvelle Part"
-#: ../../src/gui/preferencesWindow.vala:190
+#: ../../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 ainsi que toutes les Parts contenues ?"
+"Voulez-vous supprimer la Part sélectionnée et son contenu ?"
-#: ../../src/gui/newSliceWindow.vala:229
+#: ../../src/gui/newSliceWindow.vala:291
msgid "Rename me!"
-msgstr "Renomme moi !"
+msgstr "Renome moi!"
-#: ../../src/gui/piePreviewRenderer.vala:292
+#: ../../src/gui/piePreviewRenderer.vala:412
msgid "Click to edit"
-msgstr "Clic pour éditer"
+msgstr "Cliquez pour éditer"
-#: ../../src/gui/piePreviewRenderer.vala:292
-#: ../../src/gui/piePreviewRenderer.vala:307
+#: ../../src/gui/piePreviewRenderer.vala:412
+#: ../../src/gui/piePreviewRenderer.vala:427
msgid "Drag to move"
-msgstr "Glisse pour déplacer"
+msgstr "Faites glisser pour déplacer"
-#: ../../src/gui/piePreviewRenderer.vala:295
-#, fuzzy
+#: ../../src/gui/piePreviewRenderer.vala:415
msgid "Click to add a new Slice"
-msgstr "Clic pour ajouter une Part"
+msgstr "Cliquez pour ajouter \n"
+" une nouvelle Tranche"
-#: ../../src/gui/piePreviewRenderer.vala:299
-#, fuzzy
+#: ../../src/gui/piePreviewRenderer.vala:419
msgid "Drop to add as new Slice"
-msgstr "Glisse pour ajouter une Part"
+msgstr ""
+"Déposez pour ajouter \n"
+" une nouvelle Tranche"
-#: ../../src/gui/piePreviewRenderer.vala:302
+#: ../../src/gui/piePreviewRenderer.vala:422
msgid "Drop to move Slice"
-msgstr "Dépose pour déplacer une Part"
+msgstr ""
+"Déposez pour \n"
+" deplacer la Tranche"
-#: ../../src/gui/piePreviewRenderer.vala:307
+#: ../../src/gui/piePreviewRenderer.vala:427
msgid "Click to delete"
-msgstr "Clic pour effacer"
+msgstr "Cliquez pour supprimer"
-#: ../../src/gui/triggerSelectButton.vala:59
-#, fuzzy
+#: ../../src/gui/triggerSelectButton.vala:63
msgid "Press a hotkey ..."
-msgstr "Exécute le raccourcis"
+msgstr "Faites un raccourci clavier"
-#: ../../src/gui/piePreview.vala:120
-#, fuzzy
+#: ../../src/gui/piePreview.vala:155
msgid "Do you really want to delete this Slice?"
-msgstr "Voulez-vous supprimer la Part sélectionnée ?"
+msgstr "Voulez-vous supprimer cette Tranche"
-#: ../../src/gui/themeList.vala:48
+#: ../../src/gui/themeList.vala:62
msgid "Themes"
msgstr "Thèmes"
-#: ../../src/gui/themeList.vala:80
+#: ../../src/gui/themeList.vala:99
msgid "By"
msgstr "Par"
-#: ../../src/gui/sliceTypeList.vala:56
-#, fuzzy
+#: ../../src/gui/sliceTypeList.vala:60
msgid "Slice types"
-msgstr "Types de fichier"
+msgstr "Types de Tranche"
-#: ../../src/gui/iconSelectWindow.vala:178
+#: ../../src/gui/iconSelectWindow.vala:186
msgid "All icons"
-msgstr "Tous les icones"
+msgstr "Tous les icônes"
-#: ../../src/gui/iconSelectWindow.vala:179
+#: ../../src/gui/iconSelectWindow.vala:187
#: ../../src/pies/defaultConfig.vala:36
msgid "Applications"
msgstr "Applications"
-#: ../../src/gui/iconSelectWindow.vala:180
+#: ../../src/gui/iconSelectWindow.vala:188
msgid "Actions"
msgstr "Actions"
-#: ../../src/gui/iconSelectWindow.vala:181
+#: ../../src/gui/iconSelectWindow.vala:189
msgid "Places"
msgstr "Dossiers"
-#: ../../src/gui/iconSelectWindow.vala:182
+#: ../../src/gui/iconSelectWindow.vala:190
msgid "File types"
msgstr "Types de fichier"
-#: ../../src/gui/iconSelectWindow.vala:183
+#: ../../src/gui/iconSelectWindow.vala:191
msgid "Emotes"
-msgstr "Emoticones"
+msgstr "Émoticones"
-#: ../../src/gui/iconSelectWindow.vala:184
+#: ../../src/gui/iconSelectWindow.vala:192
msgid "Miscellaneous"
msgstr "Divers"
-#: ../../src/gui/iconSelectWindow.vala:257
+#: ../../src/gui/iconSelectWindow.vala:267
+#: ../../src/gui/iconSelectWindow.vala:269
msgid "All supported image formats"
-msgstr "Tous formats d'images supportés"
+msgstr "Tous les formats d'images supportés"
#: ../../src/actionGroups/windowListGroup.vala:34
-#, fuzzy
msgid "Group: Window List"
-msgstr "Groupe : Liste de Fenêtre"
+msgstr "Groupe : Liste de fenêtre"
#: ../../src/actionGroups/windowListGroup.vala:36
msgid "Shows a Slice for each of your opened Windows. Almost like Alt-Tab."
-msgstr "Affiche une Part pour chaque fenêtre ouverte. Ressemble à Alt-Tab."
+msgstr ""
+"Affiche une Tranche pour chacune des fenêtres ouvertes. Fonctionne comme Alt-"
+"Tab."
#: ../../src/actionGroups/menuGroup.vala:35
-#, fuzzy
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."
+msgstr "Affiche la structure de menu principal"
#: ../../src/actionGroups/clipboardGroup.vala:64
-#, fuzzy
msgid "Group: Clipboard"
msgstr "Groupe : Presse-papier"
#: ../../src/actionGroups/clipboardGroup.vala:66
msgid "Manages your Clipboard."
-msgstr "Gère le presse-papier"
+msgstr "Gère votre Presse-papier"
#: ../../src/actionGroups/sessionGroup.vala:35
-#, fuzzy
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 Eteindre, Redémarrer et Hiberner."
+msgstr "Affiche une Tranche pour Éteindre, Redemarrer, et Hiberner"
#: ../../src/actionGroups/sessionGroup.vala:60
msgid "Shutdown"
-msgstr "Arrêter"
+msgstr "Éteindre"
#: ../../src/actionGroups/sessionGroup.vala:63
msgid "Logout"
-msgstr "Déconnecter"
+msgstr "Déconnexion"
#: ../../src/actionGroups/sessionGroup.vala:66
msgid "Reboot"
msgstr "Redémarrer"
#: ../../src/actionGroups/bookmarkGroup.vala:36
-#, fuzzy
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 de Favoris"
+msgstr "Affiche une Tranche pour chacun des répertoires en Favoris"
#: ../../src/actionGroups/devicesGroup.vala:35
-#, fuzzy
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 connecté, comme une clé USB."
+msgstr ""
+"Affiche une Tranche pour chaque périphériques branchés, comme une clé USB"
#: ../../src/actionGroups/devicesGroup.vala:85
msgid "Root"
msgstr "Racine"
-#: ../../src/utilities/bindingManager.vala:155 ../../src/utilities/key.vala:65
-#: ../../src/utilities/trigger.vala:216 ../../src/utilities/trigger.vala:217
+#: ../../src/utilities/bindingManager.vala:161 ../../src/utilities/key.vala:65
+#: ../../src/utilities/trigger.vala:212 ../../src/utilities/trigger.vala:213
msgid "Not bound"
-msgstr "Non assigné"
+msgstr "Aucun raccourci"
#: ../../src/utilities/trigger.vala:163
msgid "Button %i"
-msgstr "Bouton %i"
+msgstr "Bouton"
#: ../../src/utilities/trigger.vala:166
msgid "LeftButton"
-msgstr "BoutonGauche"
+msgstr "Bouton Gauche"
#: ../../src/utilities/trigger.vala:168
msgid "RightButton"
-msgstr "BoutonDroit"
+msgstr "Bouton Droit"
#: ../../src/utilities/trigger.vala:170
msgid "MiddleButton"
-msgstr "BoutonMilieu"
+msgstr "Bouton Central"
-#: ../../src/utilities/trigger.vala:192 ../../src/utilities/trigger.vala:194
-#: ../../src/utilities/trigger.vala:196 ../../src/utilities/trigger.vala:200
+#: ../../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:192 ../../src/utilities/trigger.vala:196
-#: ../../src/utilities/trigger.vala:198 ../../src/utilities/trigger.vala:202
+#: ../../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:192 ../../src/utilities/trigger.vala:194
-#: ../../src/utilities/trigger.vala:198 ../../src/utilities/trigger.vala:204
+#: ../../src/utilities/trigger.vala:188 ../../src/utilities/trigger.vala:190
+#: ../../src/utilities/trigger.vala:194 ../../src/utilities/trigger.vala:200
msgid "Centered"
msgstr "Centré"
@@ -276,7 +280,7 @@ msgstr "Multimédia"
#: ../../src/pies/defaultConfig.vala:30
msgid "Next Track"
-msgstr "Piste Suivante"
+msgstr "Piste suivante"
#: ../../src/pies/defaultConfig.vala:31
msgid "Stop"
@@ -284,7 +288,7 @@ msgstr "Stop"
#: ../../src/pies/defaultConfig.vala:32
msgid "Previous Track"
-msgstr "Piste Précédente"
+msgstr "Piste précédente"
#: ../../src/pies/defaultConfig.vala:33
msgid "Play/Pause"
@@ -300,7 +304,7 @@ msgstr "Session"
#: ../../src/pies/defaultConfig.vala:54
msgid "Main Menu"
-msgstr "Menu Principal"
+msgstr "Menu Pricipal"
#: ../../src/pies/defaultConfig.vala:58
msgid "Window"
@@ -308,11 +312,11 @@ msgstr "Fenêtre"
#: ../../src/pies/defaultConfig.vala:59
msgid "Scale"
-msgstr "Echelle"
+msgstr "Échelle"
#: ../../src/pies/defaultConfig.vala:60
msgid "Minimize"
-msgstr "Réduire"
+msgstr "Minimiser"
#: ../../src/pies/defaultConfig.vala:61
msgid "Close"
@@ -328,139 +332,152 @@ msgstr "Restaurer"
#: ../ui/icon_select.ui:8
msgid "Select an icon"
-msgstr "Selectionne un icone"
+msgstr "Choisir un icône"
-#: ../ui/icon_select.ui:84
+#: ../ui/icon_select.ui:85
msgid "Icon Theme"
-msgstr "Thème d'icone"
+msgstr "Thème d'icône"
#: ../ui/icon_select.ui:105
msgid "Custom Icon"
-msgstr "Icone Personnalisé"
+msgstr "Icône personnalisé"
#: ../ui/trigger_select.ui:8
msgid "Activation Settings"
-msgstr "Paramêtres d'activation"
+msgstr "Paramètres d'activation"
-#: ../ui/trigger_select.ui:44
+#: ../ui/trigger_select.ui:86
msgid "It's possible to bind mouse buttons as well!"
-msgstr "Il est possible d'assigner les boutons de la souris également !"
+msgstr "Il est également possible d'assigner les boutons de la souris !"
-#: ../ui/trigger_select.ui:76
+#: ../ui/trigger_select.ui:118
msgid "Turbo mode"
-msgstr "Mode turbo"
+msgstr "Mode Turbo"
-#: ../ui/trigger_select.ui:80
+#: ../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 relachez le raccourcis clavier."
+msgstr "Si coché, la Part se ferme quand vous relâchez le raccourci clavier"
-#: ../ui/trigger_select.ui:93
+#: ../ui/trigger_select.ui:137
msgid "Long press for activation"
-msgstr "Appuyer longuement pour activer"
+msgstr "Appuyez longtemps pour activer"
-#: ../ui/trigger_select.ui:97
+#: ../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 uniquement si vous appuyez sur le raccourcis longtemps."
+"Si coché, la Part s'ouvrira seulement si vous appuyez longtemps le raccourci "
+"clavier"
-#: ../ui/trigger_select.ui:110
+#: ../ui/trigger_select.ui:156
msgid "Open Pie centered on the screen"
-msgstr "Ouvre la Part centré à l'écran"
+msgstr "Ouvrir la Part au centre de l'écran"
-#: ../ui/trigger_select.ui:114
-#, fuzzy
+#: ../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 au "
-"niveau du pointeur de la souris."
+"Si Coché, la Part s'ouvrira au centre de l'écran. Sinon elle apparaîtra sous "
+"la souris"
-#: ../ui/trigger_select.ui:133
-msgid "<b>Activation options</b>"
-msgstr "<b>Options d'activation</b>"
+#: ../ui/trigger_select.ui:181
+msgid "Activation options"
+msgstr "Options d'activations"
-#: ../ui/settings.ui:8 ../ui/preferences.ui:27
-#, fuzzy
+#: ../ui/settings.ui:9 ../ui/preferences.ui:27
msgid "General Settings"
-msgstr "Paramêtres généraux"
+msgstr "Paramètres généraux"
-#: ../ui/settings.ui:47
-#, fuzzy
+#: ../ui/settings.ui:74
msgid "Start Gnome-Pie on login"
-msgstr "Démarrer à la Connexion"
+msgstr "Lancer Gnome-pie au démarrage"
-#: ../ui/settings.ui:52 ../ui/settings.ui:53
-#, fuzzy
+#: ../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 démarrera quand vous ouvrez la session."
+msgstr "Si vous cochez, Gnome-Pie se lancera à chaque connexions"
-#: ../ui/settings.ui:66
+#: ../ui/settings.ui:93
msgid "Display panel icon "
-msgstr "Affiche le panneau d'icones "
+msgstr "Affiche le panneau d'icône"
-#: ../ui/settings.ui:71 ../ui/settings.ui:72
+#: ../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 utiliser ce menu pour lancer Gnome-Pie une deuxième "
-"fois."
+msgstr ""
+"Si non coché, vous pouvez utiliser ce menu pour lancer Gnome-Pie une "
+"deuxième fois."
-#: ../ui/settings.ui:92
-#, fuzzy
+#: ../ui/settings.ui:118
+msgid "Behavior"
+msgstr "Comportement"
+
+#: ../ui/settings.ui:175
msgid "Global scale"
-msgstr "Echelle Globale"
+msgstr "Échelle globale"
-#: ../ui/settings.ui:130
-msgid "<b>Appearance and behavior</b>"
-msgstr "<b>Apparence et comportement</b>"
+#: ../ui/settings.ui:207
+#, fuzzy
+msgid "Display Slice labels"
+msgstr "Affiche le panneau d'icône"
-#: ../ui/slice_select.ui:8
+#: ../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 de chaque Tranche sur le côté. Supporté uniquement pas les "
+"thèmes compatibles."
+
+#: ../ui/settings.ui:232
#, fuzzy
+msgid "Appearance"
+msgstr "Apparence"
+
+#: ../ui/slice_select.ui:9
msgid "Slice Options"
-msgstr "Options de Part"
+msgstr "Options de la Tranche"
-#: ../ui/slice_select.ui:95
+#: ../ui/slice_select.ui:139
msgid "There are no options for this Slice type."
-msgstr "Il n'y a pas d'option pour ce type de Part."
+msgstr "Il n'y a pas d'option pour ce type de Tranche"
-#: ../ui/slice_select.ui:121
+#: ../ui/slice_select.ui:165
msgid "Name of the Slice "
-msgstr "Nom de la Part"
+msgstr "Nom de la Tranche"
-#: ../ui/slice_select.ui:159
+#: ../ui/slice_select.ui:204
msgid "URI to open"
-msgstr "URI à ouvrir"
+msgstr "Liens web à ouvrir"
-#: ../ui/slice_select.ui:197
+#: ../ui/slice_select.ui:243
msgid "Command to execute"
-msgstr "Commande à exécuter"
+msgstr "Commande à éxécuter"
-#: ../ui/slice_select.ui:235
+#: ../ui/slice_select.ui:282
msgid "Hotkey to press"
-msgstr "Raccourcis à appuyer"
+msgstr "Raccourci clavier à appuyer"
-#: ../ui/slice_select.ui:264
+#: ../ui/slice_select.ui:311
msgid "Pie to open"
msgstr "Part à ouvrir"
-#: ../ui/slice_select.ui:293
+#: ../ui/slice_select.ui:340
msgid "Is Quick Action"
-msgstr "Est une Action Rapide"
+msgstr "Action rapide"
-#: ../ui/slice_select.ui:306
+#: ../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 Part."
+msgstr "Cette Tranche sera exécutée quand vous cliquerez au milieu de la Part."
-#: ../ui/slice_select.ui:339
-msgid "<b>Slice options</b>"
-msgstr "<b>Options de Part</b>"
+#: ../ui/slice_select.ui:388
+msgid "Slice options"
+msgstr "Options de la Tranche"
#: ../ui/preferences.ui:8
-#, fuzzy
msgid "Gnome-Pie Settings"
-msgstr "Paramêtres de Gnome-Pie"
+msgstr "Paramètres de Gnome-Pie"
#: ../ui/preferences.ui:261
msgid ""
@@ -472,13 +489,14 @@ msgid ""
"\n"
"For manual and advanced configuration click on the plus sign."
msgstr ""
-"<b><big>Cette part est vide !</big>\n"
+"<b><big>Cette Part est vide !</big>\n"
"\n"
-"Commencer en lui ajoutant des Parts !</b> Pour cela, vous pouvez déplacer des éléments "
-"sur le signe plus. Vous pouvez en essayer plein ! Par exemple, des lanceurs d'application "
-"ou de dossiers. Même les URL de votre navigateur sont supportées ...\n"
+"Commencez en lui ajoutant des Tranches !</b> Pour cela, vous pouvez déplacer "
+"des éléments sur le signe plus. Vous pouvez en essayer plein ! Par exemple, "
+"des lanceurs d'application ou des dossiers. Même les liens de votre "
+"navigateur sont supportés ...\n"
"\n"
-"Pour des ajouts manuels ou plus avancés, cliquer sur le signe plus."
+"Pour des ajouts manuels ou plus avancés, cliquez sur le signe plus."
#: ../ui/preferences.ui:282
msgid ""
@@ -487,161 +505,11 @@ msgid ""
"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"
+"<b><big>Vous n'avez aucune Part !</big>\n"
"\n"
-"Commencer par en créer une !</b> Cela peut être fait en cliquant sur le petit signe "
-"plus dans le coin en bas à gauche."
+"Commencer par en créer une !</b> Cela peut être fait en cliquant sur le "
+"petit signe plus dans le coin en bas à gauche."
-#: ../ui/rename_pie.ui:6
-#, fuzzy
+#: ../ui/rename_pie.ui:8
msgid "Rename a Pie"
-msgstr "Renomme la Tarte"
-
-#~ msgid "Define an open-command"
-#~ msgstr "Définir une commande d'ouverture"
-
-#~ msgid "Click here if you want to bind a mouse button!"
-#~ msgstr "Clic ici pour assigner un bouton de la souris"
-
-#~ msgid ""
-#~ "It possible to make your system unusable if you bind a Pie to your left "
-#~ "mouse button. Do you really want to do this?"
-#~ msgstr ""
-#~ "Vous pouvez rendre votre système inutilisable en assignant le clic gauche "
-#~ "de la souris. Voulez-vous vraiment continuer ?"
-
-#~ msgid "Choose an Icon"
-#~ msgstr "Choisir un Icone"
-
-#~ msgid "Slice group"
-#~ msgstr "Groupe de Parts"
-
-#~ msgid "Icon"
-#~ msgstr "Icone"
-
-#~ msgid "Command"
-#~ msgstr "Commande"
-
-#~ msgid "Pie-ID / Action type"
-#~ msgstr "Tarte-ID / Type d'action"
-
-#~ msgid "Name"
-#~ msgstr "Nom"
-
-#~ msgid "Add new Pie"
-#~ msgstr "Ajouter une Tarte"
-
-#~ msgid "Delete"
-#~ msgstr "Effacer"
-
-#~ msgid "New Action"
-#~ msgstr "Nouvelle Action"
-
-#~ msgid "You have to select a Pie to add a Slice to!"
-#~ msgstr "Sélectionner d'abord une Tarte pour ajouter une Part !"
-
-#~ msgid "You have to select a Pie or a Slice to delete!"
-#~ msgstr "Sélectionner une Tarte ou une Part pour la supprimer !"
-
-#~ msgid "Behavior"
-#~ msgstr "Comportement"
-
-#~ msgid "Show Indicator"
-#~ msgstr "Afficher l'Indicateur"
-
-#~ msgid ""
-#~ "If checked, an indicator for easy access of the settings menu is shown in "
-#~ "your panel."
-#~ msgstr ""
-#~ "Si coché, un indicateur apparaîtra dans la zone de notification afin d'accéder "
-#~ "rapidement aux réglages de Gnome-Pie."
-
-#~ msgid "Open Pies at Mouse"
-#~ msgstr "Ouvre les Tartes sous la Souris"
-
-#~ msgid ""
-#~ "If checked, pies will open at your pointer. Otherwise they'll pop up in "
-#~ "the middle of the screen."
-#~ msgstr ""
-#~ "Si coché, les Tartes apparaîtront sous le pointeur. Sinon, elles s'ouvriront "
-#~ "au centre de l'écran."
-
-#~ msgid "General"
-#~ msgstr "Général"
-
-#~ msgid "Pies"
-#~ msgstr "Tartes"
-
-#~ msgid "You can right-click in the list for adding or removing entries."
-#~ msgstr "Le clic-droit permet d'ajouter ou de supprimer des entrées."
-
-#~ msgid ""
-#~ "You can reset Gnome-Pie to its default options with the terminal command "
-#~ "\"gnome-pie --reset\"."
-#~ msgstr ""
-#~ "Vous pouvez restaurer les paramètres par défaut avec la commande \"gnome-"
-#~ "pie --reset\"."
-
-#~ msgid ""
-#~ "The radiobutton at the beginning of each slice-line indicates the "
-#~ "QuickAction of the pie."
-#~ msgstr ""
-#~ "Le bouton radio au début de chaque ligne de Part indique l'Action Rapide "
-#~ "de la Tarte."
-
-#~ msgid ""
-#~ "Pies can be opened with the terminal command \"gnome-pie --open=ID\"."
-#~ msgstr ""
-#~ "Les Tartes peuvent être lancées avec la commande \"gnome-pie --open=ID\"."
-
-#~ msgid "Feel free to visit Gnome-Pie's homepage at %s!"
-#~ msgstr "N'hésiter pas à visiter la page web de Gnome-Pie at %s !"
-
-#~ msgid ""
-#~ "You can drag'n'drop applications from your main menu to the list above."
-#~ msgstr ""
-#~ "Vous pouvez glisser-déposer des applications depuis le menu principal "
-#~ "dans la liste ci-dessus."
-
-#~ msgid "If you want to give some feedback, please write an e-mail to %s!"
-#~ msgstr "Pour envoyer vos remarques, vous pouvez écrire à l'adresse %s !"
-
-#~ msgid ""
-#~ "You may drag'n'drop URLs and bookmarks from your internet browser to the "
-#~ "list above."
-#~ msgstr ""
-#~ "Vous pouvez glisser-déposer des URLs et des favoris depuis votre "
-#~ "navigateur dans la liste ci-dessus."
-
-#~ msgid "Bugs can be reported at %s!"
-#~ msgstr "Les Bugs peuvent être envoyés à %s !"
-
-#~ msgid ""
-#~ "It's possible to drag'n'drop files and folders from your file browser to "
-#~ "the list above."
-#~ msgstr ""
-#~ "Vous pouvez glisser-déposer des fichiers et des dossiers depuis l'explorateur"
-#~ "dans la liste ci-dessus."
-
-#~ msgid ""
-#~ "It's recommended to keep your Pies small (at most 6-8 Slices). Else they "
-#~ "will become hard to navigate."
-#~ msgstr ""
-#~ "Il est recommandé de garder les Tartes petites (pas plus de 6-8 Parts) afin "
-#~ "de leur conserver leur facilité de navigation."
-
-#~ msgid ""
-#~ "In order to create a launcher for a Pie, drag the Pie from the list to "
-#~ "your desktop!"
-#~ msgstr ""
-#~ "Afin de créer un lanceur pour une Tarte, vous pouvez déposer la Tarte directement "
-#~ "sur votre bureau !"
-
-#~ msgid "Moves the selected Slice down"
-#~ msgstr "Déplace la Part sélectionnée vers le bas"
-
-#~ msgid "Moves the selected Slice up"
-#~ msgstr "Déplace la Part sélectionnée vers le haut"
-
-#~ msgid "by"
-#~ msgstr "par"
+msgstr "Renommer la Part"
diff --git a/resources/locale/fr/LC_MESSAGES/gnomepie.mo b/resources/locale/fr/LC_MESSAGES/gnomepie.mo
index 1153580..d94144c 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/gen-pot.sh b/resources/locale/gen-pot.sh
index 7b7f156..3938b63 100755
--- a/resources/locale/gen-pot.sh
+++ b/resources/locale/gen-pot.sh
@@ -13,6 +13,7 @@ xgettext --package-name $domain \
--default-domain $domain \
--output $domain.pot.tmp \
--copyright-holder="$copyright" \
+ --from-code utf-8 \
-k_ \
-L Glade \
$filelist
@@ -23,6 +24,7 @@ xgettext --package-name $domain \
--default-domain $domain \
--output $domain.pot \
--copyright-holder="$copyright" \
+ --from-code utf-8 \
-k_ \
-L C# \
$filelist
diff --git a/resources/locale/gnomepie.pot b/resources/locale/gnomepie.pot
new file mode 100644
index 0000000..9684268
--- /dev/null
+++ b/resources/locale/gnomepie.pot
@@ -0,0 +1,475 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR Simon Schneegans <code@simonschneegans.de>
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: gnomepie 0.4\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-02-29 16:07-0300\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"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: ../../src/actions/keyAction.vala:34
+msgid "Press hotkey"
+msgstr ""
+
+#: ../../src/actions/keyAction.vala:36
+msgid "Simulates the activation of a hotkey."
+msgstr ""
+
+#: ../../src/actions/pieAction.vala:34
+msgid "Open Pie"
+msgstr ""
+
+#: ../../src/actions/pieAction.vala:36
+msgid "Opens another Pie of Gnome-Pie. You may create sub menus this way."
+msgstr ""
+
+#: ../../src/actions/appAction.vala:34
+msgid "Launch application"
+msgstr ""
+
+#: ../../src/actions/appAction.vala:36
+msgid "Executes the given command."
+msgstr ""
+
+#: ../../src/actions/uriAction.vala:34
+msgid "Open URI"
+msgstr ""
+
+#: ../../src/actions/uriAction.vala:36
+msgid "Opens a given location. You may use URL's or files paths."
+msgstr ""
+
+#: ../../src/actions/actionRegistry.vala:119
+msgid "Trash"
+msgstr ""
+
+#: ../../src/utilities/trigger.vala:163
+msgid "Button %i"
+msgstr ""
+
+#: ../../src/utilities/trigger.vala:166
+msgid "LeftButton"
+msgstr ""
+
+#: ../../src/utilities/trigger.vala:168
+msgid "RightButton"
+msgstr ""
+
+#: ../../src/utilities/trigger.vala:170
+msgid "MiddleButton"
+msgstr ""
+
+#: ../../src/utilities/trigger.vala:188 ../../src/utilities/trigger.vala:190
+#: ../../src/utilities/trigger.vala:192 ../../src/utilities/trigger.vala:196
+msgid "Turbo"
+msgstr ""
+
+#: ../../src/utilities/trigger.vala:188 ../../src/utilities/trigger.vala:192
+#: ../../src/utilities/trigger.vala:194 ../../src/utilities/trigger.vala:198
+msgid "Delayed"
+msgstr ""
+
+#: ../../src/utilities/trigger.vala:188 ../../src/utilities/trigger.vala:190
+#: ../../src/utilities/trigger.vala:194 ../../src/utilities/trigger.vala:200
+msgid "Centered"
+msgstr ""
+
+#: ../../src/utilities/trigger.vala:212 ../../src/utilities/trigger.vala:213
+#: ../../src/utilities/key.vala:65 ../../src/utilities/bindingManager.vala:161
+msgid "Not bound"
+msgstr ""
+
+#: ../../src/pies/defaultConfig.vala:29
+msgid "Multimedia"
+msgstr ""
+
+#: ../../src/pies/defaultConfig.vala:30
+msgid "Next Track"
+msgstr ""
+
+#: ../../src/pies/defaultConfig.vala:31
+msgid "Stop"
+msgstr ""
+
+#: ../../src/pies/defaultConfig.vala:32
+msgid "Previous Track"
+msgstr ""
+
+#: ../../src/pies/defaultConfig.vala:33
+msgid "Play/Pause"
+msgstr ""
+
+#: ../../src/pies/defaultConfig.vala:36
+#: ../../src/gui/iconSelectWindow.vala:187
+msgid "Applications"
+msgstr ""
+
+#: ../../src/pies/defaultConfig.vala:45
+msgid "Bookmarks"
+msgstr ""
+
+#: ../../src/pies/defaultConfig.vala:50
+msgid "Session"
+msgstr ""
+
+#: ../../src/pies/defaultConfig.vala:54
+msgid "Main Menu"
+msgstr ""
+
+#: ../../src/pies/defaultConfig.vala:58
+msgid "Window"
+msgstr ""
+
+#: ../../src/pies/defaultConfig.vala:59
+msgid "Scale"
+msgstr ""
+
+#: ../../src/pies/defaultConfig.vala:60
+msgid "Minimize"
+msgstr ""
+
+#: ../../src/pies/defaultConfig.vala:61
+msgid "Close"
+msgstr ""
+
+#: ../../src/pies/defaultConfig.vala:62
+msgid "Maximize"
+msgstr ""
+
+#: ../../src/pies/defaultConfig.vala:63
+msgid "Restore"
+msgstr ""
+
+#: ../../src/gui/piePreview.vala:155
+msgid "Do you really want to delete this Slice?"
+msgstr ""
+
+#: ../../src/gui/themeList.vala:62
+msgid "Themes"
+msgstr ""
+
+#: ../../src/gui/themeList.vala:99
+msgid "By"
+msgstr ""
+
+#: ../../src/gui/newSliceWindow.vala:291
+msgid "Rename me!"
+msgstr ""
+
+#: ../../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 ""
+
+#: ../../src/gui/piePreviewRenderer.vala:412
+msgid "Click to edit"
+msgstr ""
+
+#: ../../src/gui/piePreviewRenderer.vala:412
+#: ../../src/gui/piePreviewRenderer.vala:427
+msgid "Drag to move"
+msgstr ""
+
+#: ../../src/gui/piePreviewRenderer.vala:415
+msgid "Click to add a new Slice"
+msgstr ""
+
+#: ../../src/gui/piePreviewRenderer.vala:419
+msgid "Drop to add as new Slice"
+msgstr ""
+
+#: ../../src/gui/piePreviewRenderer.vala:422
+msgid "Drop to move Slice"
+msgstr ""
+
+#: ../../src/gui/piePreviewRenderer.vala:427
+msgid "Click to delete"
+msgstr ""
+
+#: ../../src/gui/preferencesWindow.vala:175
+msgid "No Pie selected."
+msgstr ""
+
+#: ../../src/gui/preferencesWindow.vala:215
+msgid "New Pie"
+msgstr ""
+
+#: ../../src/gui/preferencesWindow.vala:228
+msgid ""
+"Do you really want to delete the selected Pie with all contained Slices?"
+msgstr ""
+
+#: ../../src/gui/triggerSelectButton.vala:63
+msgid "Press a hotkey ..."
+msgstr ""
+
+#: ../../src/gui/sliceTypeList.vala:60
+msgid "Slice types"
+msgstr ""
+
+#: ../../src/gui/iconSelectWindow.vala:186
+msgid "All icons"
+msgstr ""
+
+#: ../../src/gui/iconSelectWindow.vala:188
+msgid "Actions"
+msgstr ""
+
+#: ../../src/gui/iconSelectWindow.vala:189
+msgid "Places"
+msgstr ""
+
+#: ../../src/gui/iconSelectWindow.vala:190
+msgid "File types"
+msgstr ""
+
+#: ../../src/gui/iconSelectWindow.vala:191
+msgid "Emotes"
+msgstr ""
+
+#: ../../src/gui/iconSelectWindow.vala:192
+msgid "Miscellaneous"
+msgstr ""
+
+#: ../../src/gui/iconSelectWindow.vala:267
+#: ../../src/gui/iconSelectWindow.vala:269
+msgid "All supported image formats"
+msgstr ""
+
+#: ../../src/actionGroups/windowListGroup.vala:34
+msgid "Group: Window List"
+msgstr ""
+
+#: ../../src/actionGroups/windowListGroup.vala:36
+msgid "Shows a Slice for each of your opened Windows. Almost like Alt-Tab."
+msgstr ""
+
+#: ../../src/actionGroups/devicesGroup.vala:35
+msgid "Group: Devices"
+msgstr ""
+
+#: ../../src/actionGroups/devicesGroup.vala:37
+msgid "Shows a Slice for each plugged in devices, like USB-Sticks."
+msgstr ""
+
+#: ../../src/actionGroups/devicesGroup.vala:85
+msgid "Root"
+msgstr ""
+
+#: ../../src/actionGroups/bookmarkGroup.vala:36
+msgid "Group: Bookmarks"
+msgstr ""
+
+#: ../../src/actionGroups/bookmarkGroup.vala:38
+msgid "Shows a Slice for each of your directory Bookmarks."
+msgstr ""
+
+#: ../../src/actionGroups/sessionGroup.vala:35
+msgid "Group: Session Control"
+msgstr ""
+
+#: ../../src/actionGroups/sessionGroup.vala:37
+msgid "Shows a Slice for Shutdown, Reboot, and Hibernate."
+msgstr ""
+
+#: ../../src/actionGroups/sessionGroup.vala:60
+msgid "Shutdown"
+msgstr ""
+
+#: ../../src/actionGroups/sessionGroup.vala:63
+msgid "Logout"
+msgstr ""
+
+#: ../../src/actionGroups/sessionGroup.vala:66
+msgid "Reboot"
+msgstr ""
+
+#: ../../src/actionGroups/menuGroup.vala:35
+msgid "Group: Main menu"
+msgstr ""
+
+#: ../../src/actionGroups/menuGroup.vala:37
+msgid "Displays your main menu structure."
+msgstr ""
+
+#: ../../src/actionGroups/clipboardGroup.vala:64
+msgid "Group: Clipboard"
+msgstr ""
+
+#: ../../src/actionGroups/clipboardGroup.vala:66
+msgid "Manages your Clipboard."
+msgstr ""
+
+#: ../ui/icon_select.ui:8
+msgid "Select an icon"
+msgstr ""
+
+#: ../ui/icon_select.ui:85
+msgid "Icon Theme"
+msgstr ""
+
+#: ../ui/icon_select.ui:105
+msgid "Custom Icon"
+msgstr ""
+
+#: ../ui/rename_pie.ui:8
+msgid "Rename a Pie"
+msgstr ""
+
+#: ../ui/preferences.ui:8
+msgid "Gnome-Pie Settings"
+msgstr ""
+
+#: ../ui/preferences.ui:27 ../ui/settings.ui:9
+msgid "General Settings"
+msgstr ""
+
+#: ../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 ""
+
+#: ../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 ""
+
+#: ../ui/slice_select.ui:9
+msgid "Slice Options"
+msgstr ""
+
+#: ../ui/slice_select.ui:139
+msgid "There are no options for this Slice type."
+msgstr ""
+
+#: ../ui/slice_select.ui:165
+msgid "Name of the Slice "
+msgstr ""
+
+#: ../ui/slice_select.ui:204
+msgid "URI to open"
+msgstr ""
+
+#: ../ui/slice_select.ui:243
+msgid "Command to execute"
+msgstr ""
+
+#: ../ui/slice_select.ui:282
+msgid "Hotkey to press"
+msgstr ""
+
+#: ../ui/slice_select.ui:311
+msgid "Pie to open"
+msgstr ""
+
+#: ../ui/slice_select.ui:340
+msgid "Is Quick Action"
+msgstr ""
+
+#: ../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 ""
+
+#: ../ui/slice_select.ui:388
+msgid "Slice options"
+msgstr ""
+
+#: ../ui/settings.ui:74
+msgid "Start Gnome-Pie on login"
+msgstr ""
+
+#: ../ui/settings.ui:79 ../ui/settings.ui:80
+msgid "If checked, Gnome-Pie will start silently everytime you log in."
+msgstr ""
+
+#: ../ui/settings.ui:93
+msgid "Display panel icon "
+msgstr ""
+
+#: ../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 ""
+
+#: ../ui/settings.ui:118
+msgid "Behavior"
+msgstr ""
+
+#: ../ui/settings.ui:175
+msgid "Global scale"
+msgstr ""
+
+#: ../ui/settings.ui:207
+msgid "Display Slice labels"
+msgstr ""
+
+#: ../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 ""
+
+#: ../ui/settings.ui:232
+msgid "Appearance"
+msgstr ""
+
+#: ../ui/trigger_select.ui:8
+msgid "Activation Settings"
+msgstr ""
+
+#: ../ui/trigger_select.ui:86
+msgid "It's possible to bind mouse buttons as well!"
+msgstr ""
+
+#: ../ui/trigger_select.ui:118
+msgid "Turbo mode"
+msgstr ""
+
+#: ../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 ""
+
+#: ../ui/trigger_select.ui:137
+msgid "Long press for activation"
+msgstr ""
+
+#: ../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 ""
+
+#: ../ui/trigger_select.ui:156
+msgid "Open Pie centered on the screen"
+msgstr ""
+
+#: ../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 ""
+
+#: ../ui/trigger_select.ui:181
+msgid "Activation options"
+msgstr ""
diff --git a/resources/locale/it/LC_MESSAGES/gnomepie.mo b/resources/locale/it/LC_MESSAGES/gnomepie.mo
index f7b33cc..63548fc 100644
--- a/resources/locale/it/LC_MESSAGES/gnomepie.mo
+++ b/resources/locale/it/LC_MESSAGES/gnomepie.mo
Binary files differ
diff --git a/resources/locale/it/LC_MESSAGES/it.po b/resources/locale/it/LC_MESSAGES/it.po
index ab67977..c40acca 100644
--- a/resources/locale/it/LC_MESSAGES/it.po
+++ b/resources/locale/it/LC_MESSAGES/it.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: gnomepie 0.1\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-01-19 20:25+0100\n"
+"POT-Creation-Date: 2012-02-29 15:58+0100\n"
"PO-Revision-Date: 2011-11-09 12:52+0100\n"
"Last-Translator: Riccardo Traverso <gr3yfox.fw@gmail.com>\n"
"Language-Team: Italian\n"
@@ -42,7 +42,7 @@ msgstr "Apri URI"
msgid "Opens a given location. You may use URL's or files paths."
msgstr ""
-#: ../../src/actions/actionRegistry.vala:111
+#: ../../src/actions/actionRegistry.vala:119
msgid "Trash"
msgstr "Cestino"
@@ -54,7 +54,7 @@ msgstr "Apri una Torta"
msgid "Opens another Pie of Gnome-Pie. You may create sub menus this way."
msgstr ""
-#: ../../src/gui/triggerSelectWindow.vala:144
+#: ../../src/gui/triggerSelectWindow.vala:166
msgid ""
"This hotkey is already assigned to the pie \"%s\"! \n"
"\n"
@@ -64,104 +64,105 @@ msgstr ""
"\n"
"Selezionane un'altra oppure annulla la tua selezione per favore."
-#: ../../src/gui/preferencesWindow.vala:145
+#: ../../src/gui/preferencesWindow.vala:175
msgid "No Pie selected."
msgstr ""
-#: ../../src/gui/preferencesWindow.vala:181
+#: ../../src/gui/preferencesWindow.vala:215
msgid "New Pie"
msgstr "Nuova Torta"
-#: ../../src/gui/preferencesWindow.vala:190
+#: ../../src/gui/preferencesWindow.vala:228
msgid ""
"Do you really want to delete the selected Pie with all contained Slices?"
msgstr ""
"Vuoi davvero eliminare la Torta selezionata e tutte le Fette che contiene?"
-#: ../../src/gui/newSliceWindow.vala:229
+#: ../../src/gui/newSliceWindow.vala:291
msgid "Rename me!"
msgstr ""
-#: ../../src/gui/piePreviewRenderer.vala:292
+#: ../../src/gui/piePreviewRenderer.vala:412
msgid "Click to edit"
msgstr ""
-#: ../../src/gui/piePreviewRenderer.vala:292
-#: ../../src/gui/piePreviewRenderer.vala:307
+#: ../../src/gui/piePreviewRenderer.vala:412
+#: ../../src/gui/piePreviewRenderer.vala:427
msgid "Drag to move"
msgstr ""
-#: ../../src/gui/piePreviewRenderer.vala:295
+#: ../../src/gui/piePreviewRenderer.vala:415
#, fuzzy
msgid "Click to add a new Slice"
msgstr "Aggiungi nuova Fetta"
-#: ../../src/gui/piePreviewRenderer.vala:299
+#: ../../src/gui/piePreviewRenderer.vala:419
#, fuzzy
msgid "Drop to add as new Slice"
msgstr "Aggiungi nuova Fetta"
-#: ../../src/gui/piePreviewRenderer.vala:302
+#: ../../src/gui/piePreviewRenderer.vala:422
msgid "Drop to move Slice"
msgstr ""
-#: ../../src/gui/piePreviewRenderer.vala:307
+#: ../../src/gui/piePreviewRenderer.vala:427
msgid "Click to delete"
msgstr ""
-#: ../../src/gui/triggerSelectButton.vala:59
+#: ../../src/gui/triggerSelectButton.vala:63
#, fuzzy
msgid "Press a hotkey ..."
msgstr "Pressione di tasti"
-#: ../../src/gui/piePreview.vala:120
+#: ../../src/gui/piePreview.vala:155
#, fuzzy
msgid "Do you really want to delete this Slice?"
msgstr "Vuoi davvero eliminare la Fetta selezionata?"
-#: ../../src/gui/themeList.vala:48
+#: ../../src/gui/themeList.vala:62
msgid "Themes"
msgstr "Temi"
-#: ../../src/gui/themeList.vala:80
+#: ../../src/gui/themeList.vala:99
msgid "By"
msgstr ""
-#: ../../src/gui/sliceTypeList.vala:56
+#: ../../src/gui/sliceTypeList.vala:60
#, fuzzy
msgid "Slice types"
msgstr "Tipi di file"
-#: ../../src/gui/iconSelectWindow.vala:178
+#: ../../src/gui/iconSelectWindow.vala:186
msgid "All icons"
msgstr "Tutte le icone"
-#: ../../src/gui/iconSelectWindow.vala:179
+#: ../../src/gui/iconSelectWindow.vala:187
#: ../../src/pies/defaultConfig.vala:36
msgid "Applications"
msgstr "Applicazioni"
-#: ../../src/gui/iconSelectWindow.vala:180
+#: ../../src/gui/iconSelectWindow.vala:188
msgid "Actions"
msgstr "Azioni"
-#: ../../src/gui/iconSelectWindow.vala:181
+#: ../../src/gui/iconSelectWindow.vala:189
msgid "Places"
msgstr "Luoghi"
-#: ../../src/gui/iconSelectWindow.vala:182
+#: ../../src/gui/iconSelectWindow.vala:190
msgid "File types"
msgstr "Tipi di file"
-#: ../../src/gui/iconSelectWindow.vala:183
+#: ../../src/gui/iconSelectWindow.vala:191
msgid "Emotes"
msgstr ""
-#: ../../src/gui/iconSelectWindow.vala:184
+#: ../../src/gui/iconSelectWindow.vala:192
msgid "Miscellaneous"
msgstr "Varie"
-#: ../../src/gui/iconSelectWindow.vala:257
+#: ../../src/gui/iconSelectWindow.vala:267
+#: ../../src/gui/iconSelectWindow.vala:269
msgid "All supported image formats"
msgstr "Tutti i formati immagine supportati"
@@ -235,8 +236,8 @@ msgstr ""
msgid "Root"
msgstr "Root"
-#: ../../src/utilities/bindingManager.vala:155 ../../src/utilities/key.vala:65
-#: ../../src/utilities/trigger.vala:216 ../../src/utilities/trigger.vala:217
+#: ../../src/utilities/bindingManager.vala:161 ../../src/utilities/key.vala:65
+#: ../../src/utilities/trigger.vala:212 ../../src/utilities/trigger.vala:213
msgid "Not bound"
msgstr "Non assegnato"
@@ -256,18 +257,18 @@ msgstr "Tasto destro"
msgid "MiddleButton"
msgstr "Tasto centrale"
-#: ../../src/utilities/trigger.vala:192 ../../src/utilities/trigger.vala:194
-#: ../../src/utilities/trigger.vala:196 ../../src/utilities/trigger.vala:200
+#: ../../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:192 ../../src/utilities/trigger.vala:196
-#: ../../src/utilities/trigger.vala:198 ../../src/utilities/trigger.vala:202
+#: ../../src/utilities/trigger.vala:188 ../../src/utilities/trigger.vala:192
+#: ../../src/utilities/trigger.vala:194 ../../src/utilities/trigger.vala:198
msgid "Delayed"
msgstr "Ritardato"
-#: ../../src/utilities/trigger.vala:192 ../../src/utilities/trigger.vala:194
-#: ../../src/utilities/trigger.vala:198 ../../src/utilities/trigger.vala:204
+#: ../../src/utilities/trigger.vala:188 ../../src/utilities/trigger.vala:190
+#: ../../src/utilities/trigger.vala:194 ../../src/utilities/trigger.vala:200
msgid "Centered"
msgstr ""
@@ -331,7 +332,7 @@ msgstr "Ripristina"
msgid "Select an icon"
msgstr ""
-#: ../ui/icon_select.ui:84
+#: ../ui/icon_select.ui:85
msgid "Icon Theme"
msgstr "Tema di icone"
@@ -343,36 +344,36 @@ msgstr "Icona personalizzata"
msgid "Activation Settings"
msgstr ""
-#: ../ui/trigger_select.ui:44
+#: ../ui/trigger_select.ui:86
msgid "It's possible to bind mouse buttons as well!"
msgstr ""
-#: ../ui/trigger_select.ui:76
+#: ../ui/trigger_select.ui:118
msgid "Turbo mode"
msgstr "Modalità turbo"
-#: ../ui/trigger_select.ui:80
+#: ../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 ""
"Se selezionato, la Torta si chiuderà al rilascio della combinazione di tasti "
"assegnata."
-#: ../ui/trigger_select.ui:93
+#: ../ui/trigger_select.ui:137
msgid "Long press for activation"
msgstr "Pressione prolungata per l'attivazione"
-#: ../ui/trigger_select.ui:97
+#: ../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 ""
"Se selezionato, la Torta si aprirà soltanto se si preme la combinazione di "
"tasti un po' più a lungo."
-#: ../ui/trigger_select.ui:110
+#: ../ui/trigger_select.ui:156
msgid "Open Pie centered on the screen"
msgstr ""
-#: ../ui/trigger_select.ui:114
+#: ../ui/trigger_select.ui:161 ../ui/trigger_select.ui:162
#, fuzzy
msgid ""
"If checked, the Pie will open in the middle of your screen. Else it will pop "
@@ -381,84 +382,99 @@ msgstr ""
"Se selezionato, la Torta si aprirà soltanto se si preme la combinazione di "
"tasti un po' più a lungo."
-#: ../ui/trigger_select.ui:133
-msgid "<b>Activation options</b>"
+#: ../ui/trigger_select.ui:181
+msgid "Activation options"
msgstr ""
-#: ../ui/settings.ui:8 ../ui/preferences.ui:27
+#: ../ui/settings.ui:9 ../ui/preferences.ui:27
#, fuzzy
msgid "General Settings"
msgstr "Gnome-Pie - Impostazioni"
-#: ../ui/settings.ui:47
+#: ../ui/settings.ui:74
#, fuzzy
msgid "Start Gnome-Pie on login"
msgstr "Avvia al Login"
-#: ../ui/settings.ui:52 ../ui/settings.ui:53
+#: ../ui/settings.ui:79 ../ui/settings.ui:80
#, fuzzy
msgid "If checked, Gnome-Pie will start silently everytime you log in."
msgstr "Se selezionato, Gnome-Pie si avvierà all'accesso."
-#: ../ui/settings.ui:66
+#: ../ui/settings.ui:93
msgid "Display panel icon "
msgstr ""
-#: ../ui/settings.ui:71 ../ui/settings.ui:72
+#: ../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 ""
-#: ../ui/settings.ui:92
+#: ../ui/settings.ui:118
+msgid "Behavior"
+msgstr "Comportamento"
+
+#: ../ui/settings.ui:175
#, fuzzy
msgid "Global scale"
msgstr "Scala globale"
-#: ../ui/settings.ui:130
-msgid "<b>Appearance and behavior</b>"
+#: ../ui/settings.ui:207
+msgid "Display Slice labels"
+msgstr ""
+
+#: ../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 ""
+
+#: ../ui/settings.ui:232
+msgid "Appearance"
msgstr ""
-#: ../ui/slice_select.ui:8
+#: ../ui/slice_select.ui:9
#, fuzzy
msgid "Slice Options"
msgstr "Applicazioni"
-#: ../ui/slice_select.ui:95
+#: ../ui/slice_select.ui:139
msgid "There are no options for this Slice type."
msgstr ""
-#: ../ui/slice_select.ui:121
+#: ../ui/slice_select.ui:165
msgid "Name of the Slice "
msgstr ""
-#: ../ui/slice_select.ui:159
+#: ../ui/slice_select.ui:204
msgid "URI to open"
msgstr ""
-#: ../ui/slice_select.ui:197
+#: ../ui/slice_select.ui:243
msgid "Command to execute"
msgstr ""
-#: ../ui/slice_select.ui:235
+#: ../ui/slice_select.ui:282
msgid "Hotkey to press"
msgstr ""
-#: ../ui/slice_select.ui:264
+#: ../ui/slice_select.ui:311
msgid "Pie to open"
msgstr ""
-#: ../ui/slice_select.ui:293
+#: ../ui/slice_select.ui:340
msgid "Is Quick Action"
msgstr ""
-#: ../ui/slice_select.ui:306
+#: ../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 ""
-#: ../ui/slice_select.ui:339
-msgid "<b>Slice options</b>"
-msgstr ""
+#: ../ui/slice_select.ui:388
+#, fuzzy
+msgid "Slice options"
+msgstr "Applicazioni"
#: ../ui/preferences.ui:8
#, fuzzy
@@ -484,7 +500,7 @@ msgid ""
"plus sign in the lower left corner."
msgstr ""
-#: ../ui/rename_pie.ui:6
+#: ../ui/rename_pie.ui:8
#, fuzzy
msgid "Rename a Pie"
msgstr "Apri una Torta"
@@ -538,9 +554,6 @@ msgstr "Apri una Torta"
#~ msgid "You have to select a Pie or a Slice to delete!"
#~ msgstr "Devi selezionare una Torta o una Fetta da eliminare!"
-#~ msgid "Behavior"
-#~ msgstr "Comportamento"
-
#~ msgid "Show Indicator"
#~ msgstr "Mostra indicatore"
diff --git a/resources/locale/ko/LC_MESSAGES/gnomepie.mo b/resources/locale/ko/LC_MESSAGES/gnomepie.mo
index 69e64b8..c7d1044 100644
--- a/resources/locale/ko/LC_MESSAGES/gnomepie.mo
+++ b/resources/locale/ko/LC_MESSAGES/gnomepie.mo
Binary files differ
diff --git a/resources/locale/ko/LC_MESSAGES/ko.po b/resources/locale/ko/LC_MESSAGES/ko.po
index 7339372..40c4dca 100644
--- a/resources/locale/ko/LC_MESSAGES/ko.po
+++ b/resources/locale/ko/LC_MESSAGES/ko.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: gnomepie 0.2\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-01-19 20:25+0100\n"
-"PO-Revision-Date: 2011-11-15 03:15+0900\n"
+"POT-Creation-Date: 2012-02-29 16:07-0300\n"
+"PO-Revision-Date: 2012-01-23 00:08+0900\n"
"Last-Translator: Kim Boram <Boramism@gmail.com>\n"
"Language-Team: Korean\n"
"Language: ko\n"
@@ -23,7 +23,15 @@ msgstr "단축키를 누르세요"
#: ../../src/actions/keyAction.vala:36
msgid "Simulates the activation of a hotkey."
-msgstr ""
+msgstr "키보드 바로 가기로 활성화를 시뮬레이트합니다."
+
+#: ../../src/actions/pieAction.vala:34
+msgid "Open Pie"
+msgstr "파이 열기"
+
+#: ../../src/actions/pieAction.vala:36
+msgid "Opens another Pie of Gnome-Pie. You may create sub menus this way."
+msgstr "그놈 파이를 하나 더 엽니다. 이 방법으로 하위 메뉴를 만들 수 있습니다."
#: ../../src/actions/appAction.vala:34
msgid "Launch application"
@@ -31,7 +39,7 @@ msgstr "프로그램 실행"
#: ../../src/actions/appAction.vala:36
msgid "Executes the given command."
-msgstr ""
+msgstr "주어진 명령을 실행합니다."
#: ../../src/actions/uriAction.vala:34
msgid "Open URI"
@@ -39,205 +47,12 @@ msgstr "주소 열기"
#: ../../src/actions/uriAction.vala:36
msgid "Opens a given location. You may use URL's or files paths."
-msgstr ""
+msgstr "주어진 위치를 엽니다. 인터넷 주소나 파일 주소를 이용할 수 있습니다."
-#: ../../src/actions/actionRegistry.vala:111
+#: ../../src/actions/actionRegistry.vala:119
msgid "Trash"
msgstr "휴지통"
-#: ../../src/actions/pieAction.vala:34
-msgid "Open Pie"
-msgstr "파이 열기"
-
-#: ../../src/actions/pieAction.vala:36
-msgid "Opens another Pie of Gnome-Pie. You may create sub menus this way."
-msgstr ""
-
-#: ../../src/gui/triggerSelectWindow.vala:144
-msgid ""
-"This hotkey is already assigned to the pie \"%s\"! \n"
-"\n"
-"Please select another one or cancel your selection."
-msgstr ""
-"이 단축키는 이미 \"%s\" 파이에 할당했습니다!\n"
-"\n"
-"다른 것을 선택하거나 선택을 취소하십시오."
-
-#: ../../src/gui/preferencesWindow.vala:145
-msgid "No Pie selected."
-msgstr ""
-
-#: ../../src/gui/preferencesWindow.vala:181
-msgid "New Pie"
-msgstr "새 파이"
-
-#: ../../src/gui/preferencesWindow.vala:190
-msgid ""
-"Do you really want to delete the selected Pie with all contained Slices?"
-msgstr "선택한 파이와 파이 안의 모든 조각을 삭제하시겠습니까?"
-
-#: ../../src/gui/newSliceWindow.vala:229
-msgid "Rename me!"
-msgstr ""
-
-#: ../../src/gui/piePreviewRenderer.vala:292
-msgid "Click to edit"
-msgstr ""
-
-#: ../../src/gui/piePreviewRenderer.vala:292
-#: ../../src/gui/piePreviewRenderer.vala:307
-msgid "Drag to move"
-msgstr ""
-
-#: ../../src/gui/piePreviewRenderer.vala:295
-#, fuzzy
-msgid "Click to add a new Slice"
-msgstr "새 조각 추가"
-
-#: ../../src/gui/piePreviewRenderer.vala:299
-#, fuzzy
-msgid "Drop to add as new Slice"
-msgstr "새 조각 추가"
-
-#: ../../src/gui/piePreviewRenderer.vala:302
-msgid "Drop to move Slice"
-msgstr ""
-
-#: ../../src/gui/piePreviewRenderer.vala:307
-msgid "Click to delete"
-msgstr ""
-
-#: ../../src/gui/triggerSelectButton.vala:59
-#, fuzzy
-msgid "Press a hotkey ..."
-msgstr "단축키를 누르세요"
-
-#: ../../src/gui/piePreview.vala:120
-#, fuzzy
-msgid "Do you really want to delete this Slice?"
-msgstr "정말 선택한 조각을 삭제하시겠습니까?"
-
-#: ../../src/gui/themeList.vala:48
-msgid "Themes"
-msgstr "테마"
-
-#: ../../src/gui/themeList.vala:80
-msgid "By"
-msgstr ""
-
-#: ../../src/gui/sliceTypeList.vala:56
-#, fuzzy
-msgid "Slice types"
-msgstr "파일 형식"
-
-#: ../../src/gui/iconSelectWindow.vala:178
-msgid "All icons"
-msgstr "모든 아이콘"
-
-#: ../../src/gui/iconSelectWindow.vala:179
-#: ../../src/pies/defaultConfig.vala:36
-msgid "Applications"
-msgstr "프로그램"
-
-#: ../../src/gui/iconSelectWindow.vala:180
-msgid "Actions"
-msgstr "동작"
-
-#: ../../src/gui/iconSelectWindow.vala:181
-msgid "Places"
-msgstr "위치"
-
-#: ../../src/gui/iconSelectWindow.vala:182
-msgid "File types"
-msgstr "파일 형식"
-
-#: ../../src/gui/iconSelectWindow.vala:183
-msgid "Emotes"
-msgstr "감정"
-
-#: ../../src/gui/iconSelectWindow.vala:184
-msgid "Miscellaneous"
-msgstr "기타"
-
-#: ../../src/gui/iconSelectWindow.vala:257
-msgid "All supported image formats"
-msgstr "지원하는 모든 이미지 형식"
-
-#: ../../src/actionGroups/windowListGroup.vala:34
-#, fuzzy
-msgid "Group: Window List"
-msgstr "창 목록"
-
-#: ../../src/actionGroups/windowListGroup.vala:36
-msgid "Shows a Slice for each of your opened Windows. Almost like Alt-Tab."
-msgstr ""
-
-#: ../../src/actionGroups/menuGroup.vala:35
-#, fuzzy
-msgid "Group: Main menu"
-msgstr "주 메뉴"
-
-#: ../../src/actionGroups/menuGroup.vala:37
-msgid "Displays your main menu structure."
-msgstr ""
-
-#: ../../src/actionGroups/clipboardGroup.vala:64
-#, fuzzy
-msgid "Group: Clipboard"
-msgstr "클립보드"
-
-#: ../../src/actionGroups/clipboardGroup.vala:66
-msgid "Manages your Clipboard."
-msgstr ""
-
-#: ../../src/actionGroups/sessionGroup.vala:35
-#, fuzzy
-msgid "Group: Session Control"
-msgstr "세션 컨트롤"
-
-#: ../../src/actionGroups/sessionGroup.vala:37
-msgid "Shows a Slice for Shutdown, Reboot, and Hibernate."
-msgstr ""
-
-#: ../../src/actionGroups/sessionGroup.vala:60
-msgid "Shutdown"
-msgstr "시스템 끄기"
-
-#: ../../src/actionGroups/sessionGroup.vala:63
-msgid "Logout"
-msgstr "로그아웃"
-
-#: ../../src/actionGroups/sessionGroup.vala:66
-msgid "Reboot"
-msgstr "다시 시작"
-
-#: ../../src/actionGroups/bookmarkGroup.vala:36
-#, fuzzy
-msgid "Group: Bookmarks"
-msgstr "책갈피"
-
-#: ../../src/actionGroups/bookmarkGroup.vala:38
-msgid "Shows a Slice for each of your directory Bookmarks."
-msgstr ""
-
-#: ../../src/actionGroups/devicesGroup.vala:35
-#, fuzzy
-msgid "Group: Devices"
-msgstr "장치"
-
-#: ../../src/actionGroups/devicesGroup.vala:37
-msgid "Shows a Slice for each plugged in devices, like USB-Sticks."
-msgstr ""
-
-#: ../../src/actionGroups/devicesGroup.vala:85
-msgid "Root"
-msgstr "루트"
-
-#: ../../src/utilities/bindingManager.vala:155 ../../src/utilities/key.vala:65
-#: ../../src/utilities/trigger.vala:216 ../../src/utilities/trigger.vala:217
-msgid "Not bound"
-msgstr "연결하지 않음"
-
#: ../../src/utilities/trigger.vala:163
msgid "Button %i"
msgstr "%i 단추"
@@ -254,20 +69,25 @@ msgstr "오른쪽 단추"
msgid "MiddleButton"
msgstr "가운데 단추"
-#: ../../src/utilities/trigger.vala:192 ../../src/utilities/trigger.vala:194
-#: ../../src/utilities/trigger.vala:196 ../../src/utilities/trigger.vala:200
+#: ../../src/utilities/trigger.vala:188 ../../src/utilities/trigger.vala:190
+#: ../../src/utilities/trigger.vala:192 ../../src/utilities/trigger.vala:196
msgid "Turbo"
msgstr "터보"
-#: ../../src/utilities/trigger.vala:192 ../../src/utilities/trigger.vala:196
-#: ../../src/utilities/trigger.vala:198 ../../src/utilities/trigger.vala:202
+#: ../../src/utilities/trigger.vala:188 ../../src/utilities/trigger.vala:192
+#: ../../src/utilities/trigger.vala:194 ../../src/utilities/trigger.vala:198
msgid "Delayed"
msgstr "시간 지연"
-#: ../../src/utilities/trigger.vala:192 ../../src/utilities/trigger.vala:194
-#: ../../src/utilities/trigger.vala:198 ../../src/utilities/trigger.vala:204
+#: ../../src/utilities/trigger.vala:188 ../../src/utilities/trigger.vala:190
+#: ../../src/utilities/trigger.vala:194 ../../src/utilities/trigger.vala:200
msgid "Centered"
-msgstr ""
+msgstr "가운데"
+
+#: ../../src/utilities/trigger.vala:212 ../../src/utilities/trigger.vala:213
+#: ../../src/utilities/key.vala:65 ../../src/utilities/bindingManager.vala:161
+msgid "Not bound"
+msgstr "연결하지 않음"
#: ../../src/pies/defaultConfig.vala:29
msgid "Multimedia"
@@ -289,6 +109,11 @@ msgstr "이전 트랙"
msgid "Play/Pause"
msgstr "재생/일시 정지"
+#: ../../src/pies/defaultConfig.vala:36
+#: ../../src/gui/iconSelectWindow.vala:187
+msgid "Applications"
+msgstr "프로그램"
+
#: ../../src/pies/defaultConfig.vala:45
msgid "Bookmarks"
msgstr "책갈피"
@@ -325,138 +150,196 @@ msgstr "최대화"
msgid "Restore"
msgstr "복구"
-#: ../ui/icon_select.ui:8
-msgid "Select an icon"
-msgstr ""
+#: ../../src/gui/piePreview.vala:155
+msgid "Do you really want to delete this Slice?"
+msgstr "정말 이 조각을 삭제하시겠습니까?"
-#: ../ui/icon_select.ui:84
-msgid "Icon Theme"
-msgstr "아이콘 테마"
+#: ../../src/gui/themeList.vala:62
+msgid "Themes"
+msgstr "테마"
-#: ../ui/icon_select.ui:105
-msgid "Custom Icon"
-msgstr "사용자 설정 아이콘"
+#: ../../src/gui/themeList.vala:99
+msgid "By"
+msgstr "만든 사람"
-#: ../ui/trigger_select.ui:8
-msgid "Activation Settings"
-msgstr ""
+#: ../../src/gui/newSliceWindow.vala:291
+msgid "Rename me!"
+msgstr "이름을 바꿔주세요!"
-#: ../ui/trigger_select.ui:44
-msgid "It's possible to bind mouse buttons as well!"
+#: ../../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 ""
+"이 단축키는 이미 \"%s\" 파이에 할당했습니다!\n"
+"\n"
+"다른 것을 선택하거나 선택을 취소하십시오."
-#: ../ui/trigger_select.ui:76
-msgid "Turbo mode"
-msgstr "터보 모드"
+#: ../../src/gui/piePreviewRenderer.vala:412
+msgid "Click to edit"
+msgstr "클릭하여 편집"
-#: ../ui/trigger_select.ui:80
-msgid "If checked, the Pie will close when you release the chosen hot key."
-msgstr "선택하면 누른 키보드 바로가기를 떼면 파이를 닫습니다."
+#: ../../src/gui/piePreviewRenderer.vala:412
+#: ../../src/gui/piePreviewRenderer.vala:427
+msgid "Drag to move"
+msgstr "이동하려면 끌기"
-#: ../ui/trigger_select.ui:93
-msgid "Long press for activation"
-msgstr "활성화 하려면 길게 누르세요"
+#: ../../src/gui/piePreviewRenderer.vala:415
+msgid "Click to add a new Slice"
+msgstr "새 조각을 추가하려면 클릭"
-#: ../ui/trigger_select.ui:97
-msgid ""
-"If checked, the Pie will only open if you press this hot key a bit longer."
-msgstr "선택하면 파이를 단축키를 길게 누를 때만 엽니다."
+#: ../../src/gui/piePreviewRenderer.vala:419
+msgid "Drop to add as new Slice"
+msgstr "새 조각을 추가하려면 떨어트리기"
-#: ../ui/trigger_select.ui:110
-msgid "Open Pie centered on the screen"
-msgstr ""
+#: ../../src/gui/piePreviewRenderer.vala:422
+msgid "Drop to move Slice"
+msgstr "조각을 이동하려면 떨어트리기"
-#: ../ui/trigger_select.ui:114
-#, fuzzy
+#: ../../src/gui/piePreviewRenderer.vala:427
+msgid "Click to delete"
+msgstr "삭제하려면 클릭하세요"
+
+#: ../../src/gui/preferencesWindow.vala:175
+msgid "No Pie selected."
+msgstr "선택한 파이가 없습니다."
+
+#: ../../src/gui/preferencesWindow.vala:215
+msgid "New Pie"
+msgstr "새 파이"
+
+#: ../../src/gui/preferencesWindow.vala:228
msgid ""
-"If checked, the Pie will open in the middle of your screen. Else it will pop "
-"up at your pointer."
-msgstr "선택하면 파이를 단축키를 길게 누를 때만 엽니다."
+"Do you really want to delete the selected Pie with all contained Slices?"
+msgstr "선택한 파이와 파이 안의 모든 조각을 삭제하시겠습니까?"
-#: ../ui/trigger_select.ui:133
-msgid "<b>Activation options</b>"
-msgstr ""
+#: ../../src/gui/triggerSelectButton.vala:63
+msgid "Press a hotkey ..."
+msgstr "바로 가기 키를 누르세요..."
-#: ../ui/settings.ui:8 ../ui/preferences.ui:27
-#, fuzzy
-msgid "General Settings"
-msgstr "그놈 파이 설정"
+#: ../../src/gui/sliceTypeList.vala:60
+msgid "Slice types"
+msgstr "조각 형식"
-#: ../ui/settings.ui:47
-#, fuzzy
-msgid "Start Gnome-Pie on login"
-msgstr "로그인할 때 시작"
+#: ../../src/gui/iconSelectWindow.vala:186
+msgid "All icons"
+msgstr "모든 아이콘"
-#: ../ui/settings.ui:52 ../ui/settings.ui:53
-#, fuzzy
-msgid "If checked, Gnome-Pie will start silently everytime you log in."
-msgstr "선택하면 그놈 파이가 로그인할 때 자동으로 시작합니다."
+#: ../../src/gui/iconSelectWindow.vala:188
+msgid "Actions"
+msgstr "동작"
-#: ../ui/settings.ui:66
-msgid "Display panel icon "
-msgstr ""
+#: ../../src/gui/iconSelectWindow.vala:189
+msgid "Places"
+msgstr "위치"
-#: ../ui/settings.ui:71 ../ui/settings.ui:72
-msgid ""
-"If not checked, you can access this menu by launching Gnome-Pie a second "
-"time."
-msgstr ""
+#: ../../src/gui/iconSelectWindow.vala:190
+msgid "File types"
+msgstr "파일 형식"
-#: ../ui/settings.ui:92
-#, fuzzy
-msgid "Global scale"
-msgstr "전체 크기 조정"
+#: ../../src/gui/iconSelectWindow.vala:191
+msgid "Emotes"
+msgstr "감정"
-#: ../ui/settings.ui:130
-msgid "<b>Appearance and behavior</b>"
-msgstr ""
+#: ../../src/gui/iconSelectWindow.vala:192
+msgid "Miscellaneous"
+msgstr "기타"
-#: ../ui/slice_select.ui:8
-#, fuzzy
-msgid "Slice Options"
-msgstr "프로그램"
+#: ../../src/gui/iconSelectWindow.vala:267
+#: ../../src/gui/iconSelectWindow.vala:269
+msgid "All supported image formats"
+msgstr "지원하는 모든 이미지 형식"
-#: ../ui/slice_select.ui:95
-msgid "There are no options for this Slice type."
-msgstr ""
+#: ../../src/actionGroups/windowListGroup.vala:34
+msgid "Group: Window List"
+msgstr "그룹: 창 목록"
-#: ../ui/slice_select.ui:121
-msgid "Name of the Slice "
+#: ../../src/actionGroups/windowListGroup.vala:36
+msgid "Shows a Slice for each of your opened Windows. Almost like Alt-Tab."
msgstr ""
+"열린 각 창의 조각을 표시합니다. 알트 키와 탭 키를 누르는 것과 거의 같습니다."
-#: ../ui/slice_select.ui:159
-msgid "URI to open"
-msgstr ""
+#: ../../src/actionGroups/devicesGroup.vala:35
+msgid "Group: Devices"
+msgstr "그룹: 장치"
-#: ../ui/slice_select.ui:197
-msgid "Command to execute"
-msgstr ""
+#: ../../src/actionGroups/devicesGroup.vala:37
+msgid "Shows a Slice for each plugged in devices, like USB-Sticks."
+msgstr "연결한 USB 메모리와 같은 각 장치의 조각을 표시합니다."
-#: ../ui/slice_select.ui:235
-msgid "Hotkey to press"
-msgstr ""
+#: ../../src/actionGroups/devicesGroup.vala:85
+msgid "Root"
+msgstr "루트"
-#: ../ui/slice_select.ui:264
-msgid "Pie to open"
-msgstr ""
+#: ../../src/actionGroups/bookmarkGroup.vala:36
+msgid "Group: Bookmarks"
+msgstr "그룹: 책갈피"
-#: ../ui/slice_select.ui:293
-msgid "Is Quick Action"
-msgstr ""
+#: ../../src/actionGroups/bookmarkGroup.vala:38
+msgid "Shows a Slice for each of your directory Bookmarks."
+msgstr "각 디렉터리 책갈피의 조각을 표시합니다."
-#: ../ui/slice_select.ui:306
-msgid "This Slice will be executed when you click in the middle of the Pie."
-msgstr ""
+#: ../../src/actionGroups/sessionGroup.vala:35
+msgid "Group: Session Control"
+msgstr "그룹: 세션 조정"
-#: ../ui/slice_select.ui:339
-msgid "<b>Slice options</b>"
-msgstr ""
+#: ../../src/actionGroups/sessionGroup.vala:37
+msgid "Shows a Slice for Shutdown, Reboot, and Hibernate."
+msgstr "시스템 끝내기, 다시 시작, 최대 절전 조각을 표시합니다."
+
+#: ../../src/actionGroups/sessionGroup.vala:60
+msgid "Shutdown"
+msgstr "시스템 끄기"
+
+#: ../../src/actionGroups/sessionGroup.vala:63
+msgid "Logout"
+msgstr "로그아웃"
+
+#: ../../src/actionGroups/sessionGroup.vala:66
+msgid "Reboot"
+msgstr "다시 시작"
+
+#: ../../src/actionGroups/menuGroup.vala:35
+msgid "Group: Main menu"
+msgstr "그룹: 주 메뉴"
+
+#: ../../src/actionGroups/menuGroup.vala:37
+msgid "Displays your main menu structure."
+msgstr "주 메뉴 구조를 표시합니다."
+
+#: ../../src/actionGroups/clipboardGroup.vala:64
+msgid "Group: Clipboard"
+msgstr "그룹: 클립보드"
+
+#: ../../src/actionGroups/clipboardGroup.vala:66
+msgid "Manages your Clipboard."
+msgstr "클립보드를 관리합니다."
+
+#: ../ui/icon_select.ui:8
+msgid "Select an icon"
+msgstr "아이콘 선택"
+
+#: ../ui/icon_select.ui:85
+msgid "Icon Theme"
+msgstr "아이콘 테마"
+
+#: ../ui/icon_select.ui:105
+msgid "Custom Icon"
+msgstr "사용자 설정 아이콘"
+
+#: ../ui/rename_pie.ui:8
+msgid "Rename a Pie"
+msgstr "파이 이름 바꾸기"
#: ../ui/preferences.ui:8
-#, fuzzy
msgid "Gnome-Pie Settings"
msgstr "그놈 파이 설정"
+#: ../ui/preferences.ui:27 ../ui/settings.ui:9
+msgid "General Settings"
+msgstr "일반 설정"
+
#: ../ui/preferences.ui:261
msgid ""
"<b><big>This Pie is empty!</big>\n"
@@ -467,6 +350,13 @@ msgid ""
"\n"
"For manual and advanced configuration click on the plus sign."
msgstr ""
+"<b><big>파이가 비었습니다!</big>\n"
+"\n"
+"조각을 추가하십시오!</b> 하단의 더하기 기호에 항목을 끌어다 놓으면 추가할 수 "
+"있습니다. 다양한 것을 추가할 수 있습니다! 프로그램 바로 가기나 폴더 뿐이 아니"
+"라 웹 브라우저의 주소도 추가할 수 있습니다... \n"
+"\n"
+"직접 추가하거나 고급 설정에 접근하려면 더하기 기호를 눌러주십시오."
#: ../ui/preferences.ui:282
msgid ""
@@ -475,18 +365,138 @@ msgid ""
"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>파이가 없습니다!</big>\n"
+"\n"
+"하나 만드는 것부터 시작하십시오! </b> 왼쪽 하단 모서리의 작은 더하기 기호를 "
+"누르면 만들 수 있습니다."
+
+#: ../ui/slice_select.ui:9
+msgid "Slice Options"
+msgstr "조각 옵션"
+
+#: ../ui/slice_select.ui:139
+msgid "There are no options for this Slice type."
+msgstr "이 형식의 조각은 옵션이 없습니다."
-#: ../ui/rename_pie.ui:6
+#: ../ui/slice_select.ui:165
+msgid "Name of the Slice "
+msgstr "조각 이름"
+
+#: ../ui/slice_select.ui:204
+msgid "URI to open"
+msgstr "열 주소"
+
+#: ../ui/slice_select.ui:243
+msgid "Command to execute"
+msgstr "실행할 명령"
+
+#: ../ui/slice_select.ui:282
+msgid "Hotkey to press"
+msgstr "누를 바로 가기 키"
+
+#: ../ui/slice_select.ui:311
+msgid "Pie to open"
+msgstr "열 파이"
+
+#: ../ui/slice_select.ui:340
+msgid "Is Quick Action"
+msgstr "빠른 동작입니다"
+
+#: ../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 "파이의 가운데를 클릭해야 조각을 실행합니다."
+
+#: ../ui/slice_select.ui:388
+msgid "Slice options"
+msgstr "조각 옵션"
+
+#: ../ui/settings.ui:74
+msgid "Start Gnome-Pie on login"
+msgstr "그놈 파이 로그인할 때 시작"
+
+#: ../ui/settings.ui:79 ../ui/settings.ui:80
+msgid "If checked, Gnome-Pie will start silently everytime you log in."
+msgstr "선택하면 그놈 파이가 로그인할 때 조용하게 시작합니다."
+
+#: ../ui/settings.ui:93
+msgid "Display panel icon "
+msgstr "패널 아이콘 표시"
+
+#: ../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 ""
+"선택하지 않으면 그놈 파이를 두 번째 실행했을 때 이 메뉴에 접근할 수 있습니다."
+
+#: ../ui/settings.ui:118
+msgid "Behavior"
+msgstr "행동"
+
+#: ../ui/settings.ui:175
+msgid "Global scale"
+msgstr "전체 크기 조정"
+
+#: ../ui/settings.ui:207
#, fuzzy
-msgid "Rename a Pie"
-msgstr "파이 열기"
+msgid "Display Slice labels"
+msgstr "패널 아이콘 표시"
+
+#: ../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 ""
+
+#: ../ui/settings.ui:232
+#, fuzzy
+msgid "Appearance"
+msgstr "모양과 동작"
+
+#: ../ui/trigger_select.ui:8
+msgid "Activation Settings"
+msgstr "활성화 설정"
+
+#: ../ui/trigger_select.ui:86
+msgid "It's possible to bind mouse buttons as well!"
+msgstr "마우스 단추를 함께 묶을 수 없습니다!"
+
+#: ../ui/trigger_select.ui:118
+msgid "Turbo mode"
+msgstr "터보 모드"
+
+#: ../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 "선택하면 누른 키보드 바로가기를 떼면 파이를 닫습니다."
+
+#: ../ui/trigger_select.ui:137
+msgid "Long press for activation"
+msgstr "활성화 하려면 길게 누르세요"
+
+#: ../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 "선택하면 파이를 단축키를 길게 누를 때만 엽니다."
+
+#: ../ui/trigger_select.ui:156
+msgid "Open Pie centered on the screen"
+msgstr "파이를 화면의 가운데에서 엽니다"
+
+#: ../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 ""
+"선택하면 파이를 화면의 한 가운데에서 실행합니다. 선택하지 않으면 마우스 포인"
+"터에 나타납니다."
+
+#: ../ui/trigger_select.ui:181
+msgid "Activation options"
+msgstr "활성화 옵션"
#~ msgid "Choose an Icon"
#~ msgstr "아이콘 선택"
-#~ msgid "Behavior"
-#~ msgstr "행동"
-
#~ msgid "Show Indicator"
#~ msgstr "알리미 보이기"
diff --git a/resources/locale/pt-br/LC_MESSAGES/gnomepie.mo b/resources/locale/pt-br/LC_MESSAGES/gnomepie.mo
deleted file mode 100644
index 7a60d1e..0000000
--- a/resources/locale/pt-br/LC_MESSAGES/gnomepie.mo
+++ /dev/null
Binary files differ
diff --git a/resources/locale/pt_BR/LC_MESSAGES/gnomepie.mo b/resources/locale/pt_BR/LC_MESSAGES/gnomepie.mo
new file mode 100644
index 0000000..cb2872f
--- /dev/null
+++ b/resources/locale/pt_BR/LC_MESSAGES/gnomepie.mo
Binary files differ
diff --git a/resources/locale/pt-br/LC_MESSAGES/pt-br.po b/resources/locale/pt_BR/LC_MESSAGES/pt_BR.po
index 82faec4..b9f35a9 100644
--- a/resources/locale/pt-br/LC_MESSAGES/pt-br.po
+++ b/resources/locale/pt_BR/LC_MESSAGES/pt_BR.po
@@ -1,20 +1,21 @@
-# Language pt-br translations for gnomepie package.
-# Copyright (C) 2011 Simon Schneegans <simon.schneegans@uni-weimar.de>
+# Portuguese translations for gnomepie package.
+# Copyright (C) 2012 Simon Schneegans <code@simonschneegans.de>
# This file is distributed under the same license as the gnomepie package.
-# Magnun Leno <magnun@codecommunity.org>, 2011.
+# Magnun Leno <magnun@codecommunity.org>, 2012.
#
msgid ""
msgstr ""
-"Project-Id-Version: gnomepie 0.1\n"
+"Project-Id-Version: gnomepie 0.5\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-01-19 20:25+0100\n"
-"PO-Revision-Date: 2011-11-08 21:49-0300\n"
-"Last-Translator: Magnun Leno da Silva <magnun@codecommunity.org>\n"
-"Language-Team: Language pt-br\n"
-"Language: pt-br\n"
+"POT-Creation-Date: 2012-02-29 16:07-0300\n"
+"PO-Revision-Date: 2012-02-29 15:41-0300\n"
+"Last-Translator: Magnun Leno <magnun@codecommunity.org>\n"
+"Language-Team: Brazilian Portuguese\n"
+"Language: pt_BR\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/actions/keyAction.vala:34
msgid "Press hotkey"
@@ -22,7 +23,15 @@ msgstr "Pressione a tecla de atalho"
#: ../../src/actions/keyAction.vala:36
msgid "Simulates the activation of a hotkey."
-msgstr ""
+msgstr "Simula a ativação de uma atalho de teclado."
+
+#: ../../src/actions/pieAction.vala:34
+msgid "Open Pie"
+msgstr "Abrir Menu"
+
+#: ../../src/actions/pieAction.vala:36
+msgid "Opens another Pie of Gnome-Pie. You may create sub menus this way."
+msgstr "Abre outro Menu do Gnome-Pie. Desta forma você pode criar submenus."
#: ../../src/actions/appAction.vala:34
msgid "Launch application"
@@ -30,7 +39,7 @@ msgstr "Lançar aplicação"
#: ../../src/actions/appAction.vala:36
msgid "Executes the given command."
-msgstr ""
+msgstr "Executa um dado comando."
#: ../../src/actions/uriAction.vala:34
msgid "Open URI"
@@ -38,21 +47,126 @@ msgstr "Abrir URL"
#: ../../src/actions/uriAction.vala:36
msgid "Opens a given location. You may use URL's or files paths."
-msgstr ""
+msgstr "Abre um local escolhido. Você pode usar URLs ou caminhos de arquivos."
-#: ../../src/actions/actionRegistry.vala:111
+#: ../../src/actions/actionRegistry.vala:119
msgid "Trash"
-msgstr "Remover"
+msgstr "Lixeira"
-#: ../../src/actions/pieAction.vala:34
-msgid "Open Pie"
-msgstr "Abrir menu"
+#: ../../src/utilities/trigger.vala:163
+msgid "Button %i"
+msgstr "Botão %i"
-#: ../../src/actions/pieAction.vala:36
-msgid "Opens another Pie of Gnome-Pie. You may create sub menus this way."
-msgstr ""
+#: ../../src/utilities/trigger.vala:166
+msgid "LeftButton"
+msgstr "Botão Esquerdo"
+
+#: ../../src/utilities/trigger.vala:168
+msgid "RightButton"
+msgstr "Botão Direito"
+
+#: ../../src/utilities/trigger.vala:170
+msgid "MiddleButton"
+msgstr "Botão do Meio"
+
+#: ../../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/gui/triggerSelectWindow.vala:144
+#: ../../src/utilities/trigger.vala:188 ../../src/utilities/trigger.vala:192
+#: ../../src/utilities/trigger.vala:194 ../../src/utilities/trigger.vala:198
+msgid "Delayed"
+msgstr "Atrasado"
+
+#: ../../src/utilities/trigger.vala:188 ../../src/utilities/trigger.vala:190
+#: ../../src/utilities/trigger.vala:194 ../../src/utilities/trigger.vala:200
+msgid "Centered"
+msgstr "Centralizado"
+
+#: ../../src/utilities/trigger.vala:212 ../../src/utilities/trigger.vala:213
+#: ../../src/utilities/key.vala:65 ../../src/utilities/bindingManager.vala:161
+msgid "Not bound"
+msgstr "Sem vinculações"
+
+#: ../../src/pies/defaultConfig.vala:29
+msgid "Multimedia"
+msgstr "Multimídia"
+
+#: ../../src/pies/defaultConfig.vala:30
+msgid "Next Track"
+msgstr "Próxima Faixa"
+
+#: ../../src/pies/defaultConfig.vala:31
+msgid "Stop"
+msgstr "Stop"
+
+#: ../../src/pies/defaultConfig.vala:32
+msgid "Previous Track"
+msgstr "Faixa Anterior"
+
+#: ../../src/pies/defaultConfig.vala:33
+msgid "Play/Pause"
+msgstr "Play/Pausa"
+
+#: ../../src/pies/defaultConfig.vala:36
+#: ../../src/gui/iconSelectWindow.vala:187
+msgid "Applications"
+msgstr "Aplicações"
+
+#: ../../src/pies/defaultConfig.vala:45
+msgid "Bookmarks"
+msgstr "Favoritos"
+
+#: ../../src/pies/defaultConfig.vala:50
+msgid "Session"
+msgstr "Sessão"
+
+#: ../../src/pies/defaultConfig.vala:54
+msgid "Main Menu"
+msgstr "Menu Principal"
+
+#: ../../src/pies/defaultConfig.vala:58
+msgid "Window"
+msgstr "Janela"
+
+#: ../../src/pies/defaultConfig.vala:59
+msgid "Scale"
+msgstr "Redimensionar"
+
+#: ../../src/pies/defaultConfig.vala:60
+msgid "Minimize"
+msgstr "Minimizar"
+
+#: ../../src/pies/defaultConfig.vala:61
+msgid "Close"
+msgstr "Fechar"
+
+#: ../../src/pies/defaultConfig.vala:62
+msgid "Maximize"
+msgstr "Maximizar"
+
+#: ../../src/pies/defaultConfig.vala:63
+msgid "Restore"
+msgstr "Restaurar"
+
+#: ../../src/gui/piePreview.vala:155
+msgid "Do you really want to delete this Slice?"
+msgstr "Você realmente deseja excluir esta Fatia?"
+
+#: ../../src/gui/themeList.vala:62
+msgid "Themes"
+msgstr "Temas"
+
+#: ../../src/gui/themeList.vala:99
+msgid "By"
+msgstr "Por"
+
+#: ../../src/gui/newSliceWindow.vala:291
+msgid "Rename me!"
+msgstr "Renomeie-me!"
+
+#: ../../src/gui/triggerSelectWindow.vala:166
msgid ""
"This hotkey is already assigned to the pie \"%s\"! \n"
"\n"
@@ -62,142 +176,119 @@ msgstr ""
"\n"
"Por favor escolha outro ou cancele sua seleção."
-#: ../../src/gui/preferencesWindow.vala:145
-msgid "No Pie selected."
-msgstr ""
-
-#: ../../src/gui/preferencesWindow.vala:181
-msgid "New Pie"
-msgstr "Novo Menu"
-
-#: ../../src/gui/preferencesWindow.vala:190
-msgid ""
-"Do you really want to delete the selected Pie with all contained Slices?"
-msgstr ""
-"Você realmente deseja excluir o Menu selecionado e todas as suas Opções?"
-
-#: ../../src/gui/newSliceWindow.vala:229
-msgid "Rename me!"
-msgstr ""
-
-#: ../../src/gui/piePreviewRenderer.vala:292
+#: ../../src/gui/piePreviewRenderer.vala:412
msgid "Click to edit"
-msgstr ""
+msgstr "Clique para editar"
-#: ../../src/gui/piePreviewRenderer.vala:292
-#: ../../src/gui/piePreviewRenderer.vala:307
+#: ../../src/gui/piePreviewRenderer.vala:412
+#: ../../src/gui/piePreviewRenderer.vala:427
msgid "Drag to move"
-msgstr ""
+msgstr "Arraste para mover"
-#: ../../src/gui/piePreviewRenderer.vala:295
-#, fuzzy
+#: ../../src/gui/piePreviewRenderer.vala:415
msgid "Click to add a new Slice"
-msgstr "Adicionar nova Opção"
+msgstr "Clique para adicionar uma nova Fatia"
-#: ../../src/gui/piePreviewRenderer.vala:299
-#, fuzzy
+#: ../../src/gui/piePreviewRenderer.vala:419
msgid "Drop to add as new Slice"
-msgstr "Adicionar nova Opção"
+msgstr "Solte para adicionar uma nova Fatia"
-#: ../../src/gui/piePreviewRenderer.vala:302
+#: ../../src/gui/piePreviewRenderer.vala:422
msgid "Drop to move Slice"
-msgstr ""
+msgstr "Solte para mover a Fatia"
-#: ../../src/gui/piePreviewRenderer.vala:307
+#: ../../src/gui/piePreviewRenderer.vala:427
msgid "Click to delete"
-msgstr ""
-
-#: ../../src/gui/triggerSelectButton.vala:59
-#, fuzzy
-msgid "Press a hotkey ..."
-msgstr "Pressione a tecla de atalho"
+msgstr "Clique para deletar"
-#: ../../src/gui/piePreview.vala:120
-#, fuzzy
-msgid "Do you really want to delete this Slice?"
-msgstr "Você realmente deseja excluir a Opção selecionada?"
+#: ../../src/gui/preferencesWindow.vala:175
+msgid "No Pie selected."
+msgstr "Nenhum Menu selecionado."
-#: ../../src/gui/themeList.vala:48
-msgid "Themes"
-msgstr "Temas"
+#: ../../src/gui/preferencesWindow.vala:215
+msgid "New Pie"
+msgstr "Novo Menu"
-#: ../../src/gui/themeList.vala:80
-msgid "By"
+#: ../../src/gui/preferencesWindow.vala:228
+msgid ""
+"Do you really want to delete the selected Pie with all contained Slices?"
msgstr ""
+"Você realmente deseja excluir o Menu selecionado e todas as suas Opções?"
+
+#: ../../src/gui/triggerSelectButton.vala:63
+msgid "Press a hotkey ..."
+msgstr "Pressione uma tecla de atalho ..."
-#: ../../src/gui/sliceTypeList.vala:56
-#, fuzzy
+#: ../../src/gui/sliceTypeList.vala:60
msgid "Slice types"
-msgstr "Tipos de arquivos"
+msgstr "Tipos de Fatias"
-#: ../../src/gui/iconSelectWindow.vala:178
+#: ../../src/gui/iconSelectWindow.vala:186
msgid "All icons"
msgstr "Todos os ícones"
-#: ../../src/gui/iconSelectWindow.vala:179
-#: ../../src/pies/defaultConfig.vala:36
-msgid "Applications"
-msgstr "Aplicações"
-
-#: ../../src/gui/iconSelectWindow.vala:180
+#: ../../src/gui/iconSelectWindow.vala:188
msgid "Actions"
msgstr "Ações"
-#: ../../src/gui/iconSelectWindow.vala:181
+#: ../../src/gui/iconSelectWindow.vala:189
msgid "Places"
msgstr "Lugares"
-#: ../../src/gui/iconSelectWindow.vala:182
+#: ../../src/gui/iconSelectWindow.vala:190
msgid "File types"
msgstr "Tipos de arquivos"
-#: ../../src/gui/iconSelectWindow.vala:183
+#: ../../src/gui/iconSelectWindow.vala:191
msgid "Emotes"
msgstr "Emotes"
-#: ../../src/gui/iconSelectWindow.vala:184
+#: ../../src/gui/iconSelectWindow.vala:192
msgid "Miscellaneous"
msgstr "Diversos"
-#: ../../src/gui/iconSelectWindow.vala:257
+#: ../../src/gui/iconSelectWindow.vala:267
+#: ../../src/gui/iconSelectWindow.vala:269
msgid "All supported image formats"
msgstr "Todos os tipos de imagem suportados"
#: ../../src/actionGroups/windowListGroup.vala:34
-#, fuzzy
msgid "Group: Window List"
-msgstr "Lista de Janelas"
+msgstr "Grupo: Lista de Janelas"
#: ../../src/actionGroups/windowListGroup.vala:36
msgid "Shows a Slice for each of your opened Windows. Almost like Alt-Tab."
msgstr ""
+"Mostra uma Fatia para cada uma de suas janelas abertas. Praticamente igual a "
+"o Alt-Tab."
-#: ../../src/actionGroups/menuGroup.vala:35
-#, fuzzy
-msgid "Group: Main menu"
-msgstr "Menu Principal"
+#: ../../src/actionGroups/devicesGroup.vala:35
+msgid "Group: Devices"
+msgstr "Grupo: Dispositivos"
-#: ../../src/actionGroups/menuGroup.vala:37
-msgid "Displays your main menu structure."
-msgstr ""
+#: ../../src/actionGroups/devicesGroup.vala:37
+msgid "Shows a Slice for each plugged in devices, like USB-Sticks."
+msgstr "Mostra uma Fatia para cada dispositivo conectado, como pen-drives."
-#: ../../src/actionGroups/clipboardGroup.vala:64
-#, fuzzy
-msgid "Group: Clipboard"
-msgstr "Clipboard"
+#: ../../src/actionGroups/devicesGroup.vala:85
+msgid "Root"
+msgstr "Raiz"
-#: ../../src/actionGroups/clipboardGroup.vala:66
-msgid "Manages your Clipboard."
-msgstr ""
+#: ../../src/actionGroups/bookmarkGroup.vala:36
+msgid "Group: Bookmarks"
+msgstr "Grupo: Favoritos"
+
+#: ../../src/actionGroups/bookmarkGroup.vala:38
+msgid "Shows a Slice for each of your directory Bookmarks."
+msgstr "Mostra uma Fatia para cada um de seus diretórios favoritos."
#: ../../src/actionGroups/sessionGroup.vala:35
-#, fuzzy
msgid "Group: Session Control"
-msgstr "Controle de Sessão"
+msgstr "Grupo: Controle de Sessão"
#: ../../src/actionGroups/sessionGroup.vala:37
msgid "Shows a Slice for Shutdown, Reboot, and Hibernate."
-msgstr ""
+msgstr "Mostra uma Fatia para Desligar, Reiniciar, e Hibernar."
#: ../../src/actionGroups/sessionGroup.vala:60
msgid "Shutdown"
@@ -211,279 +302,204 @@ msgstr "Logout"
msgid "Reboot"
msgstr "Reboot"
-#: ../../src/actionGroups/bookmarkGroup.vala:36
-#, fuzzy
-msgid "Group: Bookmarks"
-msgstr "Favoritos"
-
-#: ../../src/actionGroups/bookmarkGroup.vala:38
-msgid "Shows a Slice for each of your directory Bookmarks."
-msgstr ""
-
-#: ../../src/actionGroups/devicesGroup.vala:35
-#, fuzzy
-msgid "Group: Devices"
-msgstr "Dispositivos"
+#: ../../src/actionGroups/menuGroup.vala:35
+msgid "Group: Main menu"
+msgstr "Grupo: Menu Principal"
-#: ../../src/actionGroups/devicesGroup.vala:37
-msgid "Shows a Slice for each plugged in devices, like USB-Sticks."
-msgstr ""
+#: ../../src/actionGroups/menuGroup.vala:37
+msgid "Displays your main menu structure."
+msgstr "Mostra a estrutura do seu Menu Principal."
-#: ../../src/actionGroups/devicesGroup.vala:85
-msgid "Root"
-msgstr "Raiz"
+#: ../../src/actionGroups/clipboardGroup.vala:64
+msgid "Group: Clipboard"
+msgstr "Grupo: Clipboard"
-#: ../../src/utilities/bindingManager.vala:155 ../../src/utilities/key.vala:65
-#: ../../src/utilities/trigger.vala:216 ../../src/utilities/trigger.vala:217
-msgid "Not bound"
-msgstr "Sem vinculações"
+#: ../../src/actionGroups/clipboardGroup.vala:66
+msgid "Manages your Clipboard."
+msgstr "Gerencia seu Clipboard."
-#: ../../src/utilities/trigger.vala:163
-msgid "Button %i"
-msgstr "Botão %i"
+#: ../ui/icon_select.ui:8
+msgid "Select an icon"
+msgstr "Seleciona um icone"
-#: ../../src/utilities/trigger.vala:166
-msgid "LeftButton"
-msgstr "Botão Esquerdo"
+#: ../ui/icon_select.ui:85
+msgid "Icon Theme"
+msgstr "Tema de Ícones"
-#: ../../src/utilities/trigger.vala:168
-msgid "RightButton"
-msgstr "Botão Direito"
+#: ../ui/icon_select.ui:105
+msgid "Custom Icon"
+msgstr "Outros Ícones"
-#: ../../src/utilities/trigger.vala:170
-msgid "MiddleButton"
-msgstr "Botão do Meio"
+#: ../ui/rename_pie.ui:8
+msgid "Rename a Pie"
+msgstr "Renomeia um Menu"
-#: ../../src/utilities/trigger.vala:192 ../../src/utilities/trigger.vala:194
-#: ../../src/utilities/trigger.vala:196 ../../src/utilities/trigger.vala:200
-msgid "Turbo"
-msgstr "Turbo"
+#: ../ui/preferences.ui:8
+msgid "Gnome-Pie Settings"
+msgstr "Configurações do Gnome-Pie"
-#: ../../src/utilities/trigger.vala:192 ../../src/utilities/trigger.vala:196
-#: ../../src/utilities/trigger.vala:198 ../../src/utilities/trigger.vala:202
-msgid "Delayed"
-msgstr "Atrasado"
+#: ../ui/preferences.ui:27 ../ui/settings.ui:9
+msgid "General Settings"
+msgstr "Configurações Gerais"
-#: ../../src/utilities/trigger.vala:192 ../../src/utilities/trigger.vala:194
-#: ../../src/utilities/trigger.vala:198 ../../src/utilities/trigger.vala:204
-msgid "Centered"
+#: ../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>Este Menu está vazio!!</big>\n"
+"\n"
+"Comece adicionando algumas Fatias a ele!</b> Isto pode ser feito ao arrastar "
+"coisas para o sinal de mais abaixo. Você pode tentar várias coisas! Por "
+"exemplo, o lançador de uma aplicação ou pastas. Até mesmo URLs do seu "
+"browser... \n"
+"\n"
+"Para configurações manuais e mais avançadas clique no sinal de mais."
-#: ../../src/pies/defaultConfig.vala:29
-msgid "Multimedia"
-msgstr "Multimídia"
+#: ../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>Você não tem Menus!</big>\n"
+"\n"
+"Comece criando um! </b> Isto pode ser feito ao clicar no pequeno sinal de "
+"mais no canto inferior esquerdo."
-#: ../../src/pies/defaultConfig.vala:30
-msgid "Next Track"
-msgstr "Próxima Faixa"
+#: ../ui/slice_select.ui:9
+msgid "Slice Options"
+msgstr "Opções da Fatia"
-#: ../../src/pies/defaultConfig.vala:31
-msgid "Stop"
-msgstr "Stop"
+#: ../ui/slice_select.ui:139
+msgid "There are no options for this Slice type."
+msgstr "Não há opções para este tipo de Fatia."
-#: ../../src/pies/defaultConfig.vala:32
-msgid "Previous Track"
-msgstr "Faixa Anterior"
+#: ../ui/slice_select.ui:165
+msgid "Name of the Slice "
+msgstr "Nome da Fatia "
-#: ../../src/pies/defaultConfig.vala:33
-msgid "Play/Pause"
-msgstr "Play/Pausa"
+#: ../ui/slice_select.ui:204
+msgid "URI to open"
+msgstr "URI a ser aberta"
-#: ../../src/pies/defaultConfig.vala:45
-msgid "Bookmarks"
-msgstr "Favoritos"
+#: ../ui/slice_select.ui:243
+msgid "Command to execute"
+msgstr "Comando a ser executado"
-#: ../../src/pies/defaultConfig.vala:50
-msgid "Session"
-msgstr "Sessão"
+#: ../ui/slice_select.ui:282
+msgid "Hotkey to press"
+msgstr "Tecla de Atalho a ser pressionada"
-#: ../../src/pies/defaultConfig.vala:54
-msgid "Main Menu"
-msgstr "Menu Principal"
+#: ../ui/slice_select.ui:311
+msgid "Pie to open"
+msgstr "Menu a ser aberto"
-#: ../../src/pies/defaultConfig.vala:58
-msgid "Window"
-msgstr "Janela"
+#: ../ui/slice_select.ui:340
+msgid "Is Quick Action"
+msgstr "É uma ação rápida"
-#: ../../src/pies/defaultConfig.vala:59
-msgid "Scale"
-msgstr "Redimensionar"
+#: ../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 "Esta fatia será executada quando você clicar no meio do Menu."
-#: ../../src/pies/defaultConfig.vala:60
-msgid "Minimize"
-msgstr "Minimizar"
+#: ../ui/slice_select.ui:388
+msgid "Slice options"
+msgstr "Opções da Fatia"
-#: ../../src/pies/defaultConfig.vala:61
-msgid "Close"
-msgstr "Fechar"
+#: ../ui/settings.ui:74
+msgid "Start Gnome-Pie on login"
+msgstr "Iniciar o Gnome-Pie ao logar"
-#: ../../src/pies/defaultConfig.vala:62
-msgid "Maximize"
-msgstr "Maximizar"
+#: ../ui/settings.ui:79 ../ui/settings.ui:80
+msgid "If checked, Gnome-Pie will start silently everytime you log in."
+msgstr ""
+"Se marcado, o Gnome-Pie irá iniciar silenciosamente sempre que você logar."
-#: ../../src/pies/defaultConfig.vala:63
-msgid "Restore"
-msgstr "Restaurar"
+#: ../ui/settings.ui:93
+msgid "Display panel icon "
+msgstr "Mostrar painel de ícone "
-#: ../ui/icon_select.ui:8
-msgid "Select an icon"
+#: ../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 ""
+"Se desmarcado, você pode acessar este menu ao lançar o Gnome-Pie pela "
+"segunda vez."
-#: ../ui/icon_select.ui:84
-msgid "Icon Theme"
-msgstr "Tema de Ícones"
+#: ../ui/settings.ui:118
+msgid "Behavior"
+msgstr "Comportamento"
-#: ../ui/icon_select.ui:105
-msgid "Custom Icon"
-msgstr "Outros Ícones"
+#: ../ui/settings.ui:175
+msgid "Global scale"
+msgstr "Escala global"
+
+#: ../ui/settings.ui:207
+msgid "Display Slice labels"
+msgstr "Mostrar rótulos da Fatia."
+
+#: ../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 ""
+"Mostra ao lado de cada Fatia o seu nome. Disponível apenas se o tema "
+"suportar."
+
+#: ../ui/settings.ui:232
+msgid "Appearance"
+msgstr "Aparência"
#: ../ui/trigger_select.ui:8
msgid "Activation Settings"
-msgstr ""
+msgstr "Configurações de Ativação"
-#: ../ui/trigger_select.ui:44
+#: ../ui/trigger_select.ui:86
msgid "It's possible to bind mouse buttons as well!"
-msgstr ""
+msgstr "Também é possível vincular os botões do mouse!"
-#: ../ui/trigger_select.ui:76
+#: ../ui/trigger_select.ui:118
msgid "Turbo mode"
msgstr "Modo Turbo"
-#: ../ui/trigger_select.ui:80
+#: ../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 "Se marcado, o Menu irá fechar quando o atalho for liberado."
-#: ../ui/trigger_select.ui:93
+#: ../ui/trigger_select.ui:137
msgid "Long press for activation"
msgstr "Clique longo para ativação"
-#: ../ui/trigger_select.ui:97
+#: ../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 ""
"Se marcador, o Menu irá abrir somente se você pressionar este atalho por "
"mais um tempo."
-#: ../ui/trigger_select.ui:110
+#: ../ui/trigger_select.ui:156
msgid "Open Pie centered on the screen"
-msgstr ""
+msgstr "Abre o Menu no centro da tela"
-#: ../ui/trigger_select.ui:114
-#, fuzzy
+#: ../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 ""
-"Se marcador, o Menu irá abrir somente se você pressionar este atalho por "
-"mais um tempo."
-
-#: ../ui/trigger_select.ui:133
-msgid "<b>Activation options</b>"
-msgstr ""
-
-#: ../ui/settings.ui:8 ../ui/preferences.ui:27
-#, fuzzy
-msgid "General Settings"
-msgstr "Gnome-Pie - Configurações"
-
-#: ../ui/settings.ui:47
-#, fuzzy
-msgid "Start Gnome-Pie on login"
-msgstr "Iniciar durante o Login"
-
-#: ../ui/settings.ui:52 ../ui/settings.ui:53
-#, fuzzy
-msgid "If checked, Gnome-Pie will start silently everytime you log in."
-msgstr "Se marcado, o Gnome-Pie irá iniciar durante o login."
-
-#: ../ui/settings.ui:66
-msgid "Display panel icon "
-msgstr ""
-
-#: ../ui/settings.ui:71 ../ui/settings.ui:72
-msgid ""
-"If not checked, you can access this menu by launching Gnome-Pie a second "
-"time."
-msgstr ""
-
-#: ../ui/settings.ui:92
-#, fuzzy
-msgid "Global scale"
-msgstr "Escalonamento Global"
-
-#: ../ui/settings.ui:130
-msgid "<b>Appearance and behavior</b>"
-msgstr ""
-
-#: ../ui/slice_select.ui:8
-#, fuzzy
-msgid "Slice Options"
-msgstr "Aplicações"
-
-#: ../ui/slice_select.ui:95
-msgid "There are no options for this Slice type."
-msgstr ""
+"Se marcador, o Menu irá abrir no meio da sua tela. Caso contrário aparecerá "
+"sobre o cursor."
-#: ../ui/slice_select.ui:121
-msgid "Name of the Slice "
-msgstr ""
-
-#: ../ui/slice_select.ui:159
-msgid "URI to open"
-msgstr ""
-
-#: ../ui/slice_select.ui:197
-msgid "Command to execute"
-msgstr ""
-
-#: ../ui/slice_select.ui:235
-msgid "Hotkey to press"
-msgstr ""
-
-#: ../ui/slice_select.ui:264
-msgid "Pie to open"
-msgstr ""
-
-#: ../ui/slice_select.ui:293
-msgid "Is Quick Action"
-msgstr ""
-
-#: ../ui/slice_select.ui:306
-msgid "This Slice will be executed when you click in the middle of the Pie."
-msgstr ""
-
-#: ../ui/slice_select.ui:339
-msgid "<b>Slice options</b>"
-msgstr ""
-
-#: ../ui/preferences.ui:8
-#, fuzzy
-msgid "Gnome-Pie Settings"
-msgstr "Gnome-Pie - Configurações"
-
-#: ../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 ""
-
-#: ../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 ""
-
-#: ../ui/rename_pie.ui:6
-#, fuzzy
-msgid "Rename a Pie"
-msgstr "Abrir menu"
+#: ../ui/trigger_select.ui:181
+msgid "Activation options"
+msgstr "Opções de ativação"
#~ msgid "by"
#~ msgstr "por"
@@ -501,9 +517,6 @@ msgstr "Abrir menu"
#~ "É possível tornar seu sistema inútil caso você vincule um Menu ao botão "
#~ "esquerdo do mouse. Você realmente quer fazer isso?"
-#~ msgid "Behavior"
-#~ msgstr "Comportamento"
-
#~ msgid "Show Indicator"
#~ msgstr "Mostrar Indicador"
diff --git a/resources/locale/ru/LC_MESSAGES/gnomepie.mo b/resources/locale/ru/LC_MESSAGES/gnomepie.mo
index 9a51f6c..5104a78 100644
--- a/resources/locale/ru/LC_MESSAGES/gnomepie.mo
+++ b/resources/locale/ru/LC_MESSAGES/gnomepie.mo
Binary files differ
diff --git a/resources/locale/ru/LC_MESSAGES/ru.po b/resources/locale/ru/LC_MESSAGES/ru.po
index 3020341..538cdf4 100644
--- a/resources/locale/ru/LC_MESSAGES/ru.po
+++ b/resources/locale/ru/LC_MESSAGES/ru.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: gnomepie 0.2\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-01-19 20:25+0100\n"
+"POT-Creation-Date: 2012-02-29 15:58+0100\n"
"PO-Revision-Date: 2012-01-14 17:15+0400\n"
"Last-Translator: Eugene Roskin <pams@imail.ru>\n"
"Language-Team: Russian\n"
@@ -41,9 +41,11 @@ msgstr "Открытие URI"
#: ../../src/actions/uriAction.vala:36
msgid "Opens a given location. You may use URL's or files paths."
-msgstr "Открывает заданный адрес. Вы можете использовать адресные ссылки или адреса файлов."
+msgstr ""
+"Открывает заданный адрес. Вы можете использовать адресные ссылки или адреса "
+"файлов."
-#: ../../src/actions/actionRegistry.vala:111
+#: ../../src/actions/actionRegistry.vala:119
msgid "Trash"
msgstr "Корзина"
@@ -53,9 +55,10 @@ msgstr "Открытие пая"
#: ../../src/actions/pieAction.vala:36
msgid "Opens another Pie of Gnome-Pie. You may create sub menus this way."
-msgstr "Oткрывает ещё один пай Gnome-Pie. Таким образом вы можете создавать подменю."
+msgstr ""
+"Oткрывает ещё один пай Gnome-Pie. Таким образом вы можете создавать подменю."
-#: ../../src/gui/triggerSelectWindow.vala:144
+#: ../../src/gui/triggerSelectWindow.vala:166
msgid ""
"This hotkey is already assigned to the pie \"%s\"! \n"
"\n"
@@ -65,105 +68,106 @@ msgstr ""
"\n"
"Пожалуйста, выберите другую или выполните отмену выбора."
-#: ../../src/gui/preferencesWindow.vala:145
+#: ../../src/gui/preferencesWindow.vala:175
msgid "No Pie selected."
msgstr "Пай не выбран"
-#: ../../src/gui/preferencesWindow.vala:181
+#: ../../src/gui/preferencesWindow.vala:215
msgid "New Pie"
msgstr "Новый пай"
-#: ../../src/gui/preferencesWindow.vala:190
+#: ../../src/gui/preferencesWindow.vala:228
msgid ""
"Do you really want to delete the selected Pie with all contained Slices?"
msgstr ""
"Вы действительно хотите удалить выделенный пай, со всеми содержащимися в нём "
"порциями?"
-#: ../../src/gui/newSliceWindow.vala:229
+#: ../../src/gui/newSliceWindow.vala:291
msgid "Rename me!"
msgstr "Переименуйте меня!"
-#: ../../src/gui/piePreviewRenderer.vala:292
+#: ../../src/gui/piePreviewRenderer.vala:412
msgid "Click to edit"
msgstr "Щёлкните для выполнения изменений"
-#: ../../src/gui/piePreviewRenderer.vala:292
-#: ../../src/gui/piePreviewRenderer.vala:307
+#: ../../src/gui/piePreviewRenderer.vala:412
+#: ../../src/gui/piePreviewRenderer.vala:427
msgid "Drag to move"
msgstr "Перетаскивайте для выполнения перемещения"
-#: ../../src/gui/piePreviewRenderer.vala:295
+#: ../../src/gui/piePreviewRenderer.vala:415
#, fuzzy
msgid "Click to add a new Slice"
msgstr "Щёлкните для добавления новой порции"
-#: ../../src/gui/piePreviewRenderer.vala:299
+#: ../../src/gui/piePreviewRenderer.vala:419
#, fuzzy
msgid "Drop to add as new Slice"
msgstr "Перетаскивайте для выполнения добавления в качастве новой порции"
-#: ../../src/gui/piePreviewRenderer.vala:302
+#: ../../src/gui/piePreviewRenderer.vala:422
msgid "Drop to move Slice"
msgstr "Перетаскивайте для выполнения перемещения порции"
-#: ../../src/gui/piePreviewRenderer.vala:307
+#: ../../src/gui/piePreviewRenderer.vala:427
msgid "Click to delete"
msgstr "Щёлкните для выполнения удаления"
-#: ../../src/gui/triggerSelectButton.vala:59
+#: ../../src/gui/triggerSelectButton.vala:63
#, fuzzy
msgid "Press a hotkey ..."
msgstr "Нажмите сочетание клавиш быстрого доступа"
-#: ../../src/gui/piePreview.vala:120
+#: ../../src/gui/piePreview.vala:155
#, fuzzy
msgid "Do you really want to delete this Slice?"
msgstr "Вы действительно хотите удалить эту порцию?"
-#: ../../src/gui/themeList.vala:48
+#: ../../src/gui/themeList.vala:62
msgid "Themes"
msgstr "Темы"
-#: ../../src/gui/themeList.vala:80
+#: ../../src/gui/themeList.vala:99
msgid "By"
msgstr "-"
-#: ../../src/gui/sliceTypeList.vala:56
+#: ../../src/gui/sliceTypeList.vala:60
#, fuzzy
msgid "Slice types"
msgstr "Типы порций"
-#: ../../src/gui/iconSelectWindow.vala:178
+#: ../../src/gui/iconSelectWindow.vala:186
msgid "All icons"
msgstr "Все значки"
-#: ../../src/gui/iconSelectWindow.vala:179
+#: ../../src/gui/iconSelectWindow.vala:187
#: ../../src/pies/defaultConfig.vala:36
msgid "Applications"
msgstr "Приложения"
-#: ../../src/gui/iconSelectWindow.vala:180
+#: ../../src/gui/iconSelectWindow.vala:188
msgid "Actions"
msgstr "Действия"
-#: ../../src/gui/iconSelectWindow.vala:181
+#: ../../src/gui/iconSelectWindow.vala:189
msgid "Places"
msgstr "Переходы"
-#: ../../src/gui/iconSelectWindow.vala:182
+#: ../../src/gui/iconSelectWindow.vala:190
msgid "File types"
msgstr "Типы файлов"
-#: ../../src/gui/iconSelectWindow.vala:183
+#: ../../src/gui/iconSelectWindow.vala:191
msgid "Emotes"
msgstr "Эмоции"
-#: ../../src/gui/iconSelectWindow.vala:184
+#: ../../src/gui/iconSelectWindow.vala:192
msgid "Miscellaneous"
msgstr "Дополнительно"
-#: ../../src/gui/iconSelectWindow.vala:257
+#: ../../src/gui/iconSelectWindow.vala:267
+#: ../../src/gui/iconSelectWindow.vala:269
msgid "All supported image formats"
msgstr "Все поддерживаемые форматы изображений"
@@ -174,7 +178,8 @@ msgstr "Группа: Список окон"
#: ../../src/actionGroups/windowListGroup.vala:36
msgid "Shows a Slice for each of your opened Windows. Almost like Alt-Tab."
-msgstr "Показывает порцию для каждого из открытых окон. Как это делает Alt-Tab."
+msgstr ""
+"Показывает порцию для каждого из открытых окон. Как это делает Alt-Tab."
#: ../../src/actionGroups/menuGroup.vala:35
#, fuzzy
@@ -201,7 +206,8 @@ msgstr "Группа: Управление сеансом"
#: ../../src/actionGroups/sessionGroup.vala:37
msgid "Shows a Slice for Shutdown, Reboot, and Hibernate."
-msgstr "Показывает порцию для операций выключения, перезагрузки и спящего режима."
+msgstr ""
+"Показывает порцию для операций выключения, перезагрузки и спящего режима."
#: ../../src/actionGroups/sessionGroup.vala:60
msgid "Shutdown"
@@ -237,8 +243,8 @@ msgstr "Показывает порцию подключённых устрой
msgid "Root"
msgstr "Файловая система"
-#: ../../src/utilities/bindingManager.vala:155 ../../src/utilities/key.vala:65
-#: ../../src/utilities/trigger.vala:216 ../../src/utilities/trigger.vala:217
+#: ../../src/utilities/bindingManager.vala:161 ../../src/utilities/key.vala:65
+#: ../../src/utilities/trigger.vala:212 ../../src/utilities/trigger.vala:213
msgid "Not bound"
msgstr "Нет привязки"
@@ -258,18 +264,18 @@ msgstr "ПраваяКнопка"
msgid "MiddleButton"
msgstr "СредняяКнопка"
-#: ../../src/utilities/trigger.vala:192 ../../src/utilities/trigger.vala:194
-#: ../../src/utilities/trigger.vala:196 ../../src/utilities/trigger.vala:200
+#: ../../src/utilities/trigger.vala:188 ../../src/utilities/trigger.vala:190
+#: ../../src/utilities/trigger.vala:192 ../../src/utilities/trigger.vala:196
msgid "Turbo"
msgstr "Турбо"
-#: ../../src/utilities/trigger.vala:192 ../../src/utilities/trigger.vala:196
-#: ../../src/utilities/trigger.vala:198 ../../src/utilities/trigger.vala:202
+#: ../../src/utilities/trigger.vala:188 ../../src/utilities/trigger.vala:192
+#: ../../src/utilities/trigger.vala:194 ../../src/utilities/trigger.vala:198
msgid "Delayed"
msgstr "Задержка"
-#: ../../src/utilities/trigger.vala:192 ../../src/utilities/trigger.vala:194
-#: ../../src/utilities/trigger.vala:198 ../../src/utilities/trigger.vala:204
+#: ../../src/utilities/trigger.vala:188 ../../src/utilities/trigger.vala:190
+#: ../../src/utilities/trigger.vala:194 ../../src/utilities/trigger.vala:200
msgid "Centered"
msgstr "По центру"
@@ -333,7 +339,7 @@ msgstr "Восстановить"
msgid "Select an icon"
msgstr "Выберите значок"
-#: ../ui/icon_select.ui:84
+#: ../ui/icon_select.ui:85
msgid "Icon Theme"
msgstr "Тема значков"
@@ -345,125 +351,143 @@ msgstr "Настроить значок"
msgid "Activation Settings"
msgstr "Настройки активации"
-#: ../ui/trigger_select.ui:44
+#: ../ui/trigger_select.ui:86
msgid "It's possible to bind mouse buttons as well!"
msgstr "Также возможно назначать кнопки мыши!"
-#: ../ui/trigger_select.ui:76
+#: ../ui/trigger_select.ui:118
msgid "Turbo mode"
msgstr "Турбо-режим"
-#: ../ui/trigger_select.ui:80
+#: ../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 ""
-"Если выбрана эта возможность, пай закроется после того, как вы отпустите "
-" клавиши быстрого доступа"
+"Если выбрана эта возможность, пай закроется после того, как вы отпустите "
+"клавиши быстрого доступа"
-#: ../ui/trigger_select.ui:93
+#: ../ui/trigger_select.ui:137
msgid "Long press for activation"
msgstr "Продолжительное нажатие для активации"
-#: ../ui/trigger_select.ui:97
+#: ../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 ""
-"Если выбрана эта возможность, пай откроется только, если вы "
-"продолжительно зажмёте эту клавишу быстрого доступа."
+"Если выбрана эта возможность, пай откроется только, если вы продолжительно "
+"зажмёте эту клавишу быстрого доступа."
-#: ../ui/trigger_select.ui:110
+#: ../ui/trigger_select.ui:156
msgid "Open Pie centered on the screen"
msgstr "Открыть пай по центру экрана"
-#: ../ui/trigger_select.ui:114
+#: ../ui/trigger_select.ui:161 ../ui/trigger_select.ui:162
#, fuzzy
msgid ""
"If checked, the Pie will open in the middle of your screen. Else it will pop "
"up at your pointer."
msgstr ""
-"Если выбрана эта возможность, пай откроется в центре вашего экрана."
-"А также может открываться чуть выше вашего курсора."
+"Если выбрана эта возможность, пай откроется в центре вашего экрана.А также "
+"может открываться чуть выше вашего курсора."
-#: ../ui/trigger_select.ui:133
-msgid "<b>Activation options</b>"
+#: ../ui/trigger_select.ui:181
+#, fuzzy
+msgid "Activation options"
msgstr "<b>Параметры активации</b>"
-#: ../ui/settings.ui:8 ../ui/preferences.ui:27
+#: ../ui/settings.ui:9 ../ui/preferences.ui:27
#, fuzzy
msgid "General Settings"
msgstr "Основные настройки"
-#: ../ui/settings.ui:47
+#: ../ui/settings.ui:74
#, fuzzy
msgid "Start Gnome-Pie on login"
msgstr "Запускать Gnome-Pie при загрузке системы"
-#: ../ui/settings.ui:52 ../ui/settings.ui:53
+#: ../ui/settings.ui:79 ../ui/settings.ui:80
#, fuzzy
msgid "If checked, Gnome-Pie will start silently everytime you log in."
msgstr ""
-"Если выбрана эта возможность, Gnome-Pie будет фоново запускаться после входа в систему."
+"Если выбрана эта возможность, Gnome-Pie будет фоново запускаться после входа "
+"в систему."
-#: ../ui/settings.ui:66
+#: ../ui/settings.ui:93
msgid "Display panel icon "
msgstr "Показывать значок на панели "
-#: ../ui/settings.ui:71 ../ui/settings.ui:72
+#: ../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 ""
-"Если эта возможность не выбрана, вы можете получить доступ к этому меню запустив "
-"Gnome-Pie второй раз."
+"Если эта возможность не выбрана, вы можете получить доступ к этому меню "
+"запустив Gnome-Pie второй раз."
-#: ../ui/settings.ui:92
+#: ../ui/settings.ui:118
+msgid "Behavior"
+msgstr "Поведение"
+
+#: ../ui/settings.ui:175
#, fuzzy
msgid "Global scale"
msgstr "Общий масштаб"
-#: ../ui/settings.ui:130
-msgid "<b>Appearance and behavior</b>"
-msgstr "<b>Оформление и поведение</b>"
+#: ../ui/settings.ui:207
+#, fuzzy
+msgid "Display Slice labels"
+msgstr "Показывать значок на панели "
+
+#: ../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 ""
-#: ../ui/slice_select.ui:8
+#: ../ui/settings.ui:232
+msgid "Appearance"
+msgstr ""
+
+#: ../ui/slice_select.ui:9
#, fuzzy
msgid "Slice Options"
msgstr "Параметры порции"
-#: ../ui/slice_select.ui:95
+#: ../ui/slice_select.ui:139
msgid "There are no options for this Slice type."
msgstr "Отсутствуют параметры для этого типа порции"
-#: ../ui/slice_select.ui:121
+#: ../ui/slice_select.ui:165
msgid "Name of the Slice "
msgstr "Название порции"
-#: ../ui/slice_select.ui:159
+#: ../ui/slice_select.ui:204
msgid "URI to open"
msgstr "URI для открытия"
-#: ../ui/slice_select.ui:197
+#: ../ui/slice_select.ui:243
msgid "Command to execute"
msgstr "Командая для выполнения"
-#: ../ui/slice_select.ui:235
+#: ../ui/slice_select.ui:282
msgid "Hotkey to press"
msgstr "Клавиша быстрого доступа для нажатия"
-#: ../ui/slice_select.ui:264
+#: ../ui/slice_select.ui:311
msgid "Pie to open"
msgstr "Пай для открытия"
-#: ../ui/slice_select.ui:293
+#: ../ui/slice_select.ui:340
msgid "Is Quick Action"
msgstr "Это быстрое действие"
-#: ../ui/slice_select.ui:306
+#: ../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 "Эта порция будет выполнена, после нажатия в центре пая"
-#: ../ui/slice_select.ui:339
-msgid "<b>Slice options</b>"
-msgstr "<b>Параметры порции</b>"
+#: ../ui/slice_select.ui:388
+#, fuzzy
+msgid "Slice options"
+msgstr "Параметры порции"
#: ../ui/preferences.ui:8
#, fuzzy
@@ -482,11 +506,12 @@ msgid ""
msgstr ""
"<b><big>Этот пай пуст!</big>\n"
"\n"
-"Начните добавлять в него порции!</b> Выполните это перетаскивая элементы в значок "
-"плюса ниже. Делайте многое! Например ярлыки запуска программ или папки."
-"А также адресные ссылки из вашего обозревателя... \n"
+"Начните добавлять в него порции!</b> Выполните это перетаскивая элементы в "
+"значок плюса ниже. Делайте многое! Например ярлыки запуска программ или "
+"папки.А также адресные ссылки из вашего обозревателя... \n"
"\n"
-"Для выполнения самостоятельной и подробной настройки, щёлкните на знаке плюса."
+"Для выполнения самостоятельной и подробной настройки, щёлкните на знаке "
+"плюса."
#: ../ui/preferences.ui:282
msgid ""
@@ -497,16 +522,19 @@ msgid ""
msgstr ""
"<b><big>Отсутствуют паи!</big>\n"
"\n"
-"Начните с создания пая! </b> Выполните это щёлкнув на небольшом значке плюса"
-"в нижнем левом углу."
+"Начните с создания пая! </b> Выполните это щёлкнув на небольшом значке "
+"плюсав нижнем левом углу."
-#: ../ui/rename_pie.ui:6
+#: ../ui/rename_pie.ui:8
#, fuzzy
msgid "Rename a Pie"
msgstr "Переименовать пай"
-#~ msgid "Behavior"
-#~ msgstr "Поведение"
+#~ msgid "<b>Appearance and behavior</b>"
+#~ msgstr "<b>Оформление и поведение</b>"
+
+#~ msgid "<b>Slice options</b>"
+#~ msgstr "<b>Параметры порции</b>"
#~ msgid "Show Indicator"
#~ msgstr "Показать индикатор"
diff --git a/resources/themes/adwaita/caption_mask.svg b/resources/themes/adwaita/caption_mask.svg
new file mode 100644
index 0000000..59d4801
--- /dev/null
+++ b/resources/themes/adwaita/caption_mask.svg
@@ -0,0 +1,153 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+ xmlns:dc="http://purl.org/dc/elements/1.1/"
+ xmlns:cc="http://creativecommons.org/ns#"
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+ xmlns:svg="http://www.w3.org/2000/svg"
+ xmlns="http://www.w3.org/2000/svg"
+ xmlns:xlink="http://www.w3.org/1999/xlink"
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+ width="100"
+ height="100"
+ id="svg2"
+ version="1.1"
+ inkscape:version="0.48.2 r9819"
+ sodipodi:docname="caption_mask.svg">
+ <defs
+ id="defs4">
+ <linearGradient
+ inkscape:collect="always"
+ id="linearGradient2997">
+ <stop
+ style="stop-color:#000000;stop-opacity:0"
+ offset="0"
+ id="stop2999" />
+ <stop
+ style="stop-color:#000000;stop-opacity:1"
+ offset="1"
+ id="stop3001" />
+ </linearGradient>
+ <linearGradient
+ inkscape:collect="always"
+ id="linearGradient3785">
+ <stop
+ style="stop-color:#abab9f;stop-opacity:1"
+ offset="0"
+ id="stop3787" />
+ <stop
+ id="stop3797"
+ offset="0.29400957"
+ style="stop-color:#c2c2bb;stop-opacity:1" />
+ <stop
+ style="stop-color:#d3d3d2;stop-opacity:1"
+ offset="1"
+ id="stop3789" />
+ </linearGradient>
+ <linearGradient
+ inkscape:collect="always"
+ id="linearGradient3009">
+ <stop
+ style="stop-color:#fafcfc;stop-opacity:1"
+ offset="0"
+ id="stop3011" />
+ <stop
+ id="stop3795"
+ offset="0.95082122"
+ style="stop-color:#e5e8e8;stop-opacity:1;" />
+ <stop
+ style="stop-color:#d2d6d6;stop-opacity:1"
+ offset="1"
+ id="stop3013" />
+ </linearGradient>
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient3785"
+ id="linearGradient3791"
+ x1="44.385059"
+ y1="958.93121"
+ x2="44.385059"
+ y2="1045.9142"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(0.59160385,0,0,0.59160385,20.456735,409.35291)" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient3009"
+ id="linearGradient3793"
+ x1="51.33149"
+ y1="958.94989"
+ x2="51.33149"
+ y2="1045.7374"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(0.59160385,0,0,0.59160385,20.456735,409.35291)" />
+ <filter
+ inkscape:collect="always"
+ id="filter3921"
+ x="-0.28370607"
+ width="1.5674121"
+ y="-0.28370607"
+ height="1.5674121">
+ <feGaussianBlur
+ inkscape:collect="always"
+ stdDeviation="9.4292716"
+ id="feGaussianBlur3923" />
+ </filter>
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient2997"
+ id="linearGradient3773"
+ x1="52.830833"
+ y1="1031.3591"
+ x2="52.830833"
+ y2="1010.1867"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="translate(-7.1765038e-7,-5.2013983e-6)" />
+ </defs>
+ <sodipodi:namedview
+ id="base"
+ pagecolor="#000000"
+ bordercolor="#666666"
+ borderopacity="1.0"
+ inkscape:pageopacity="0"
+ inkscape:pageshadow="2"
+ inkscape:zoom="5.6"
+ inkscape:cx="20.693791"
+ inkscape:cy="49.374216"
+ inkscape:document-units="px"
+ inkscape:current-layer="layer1"
+ showgrid="false"
+ inkscape:showpageshadow="false"
+ inkscape:window-width="1517"
+ inkscape:window-height="834"
+ inkscape:window-x="335"
+ inkscape:window-y="111"
+ inkscape:window-maximized="0" />
+ <metadata
+ id="metadata7">
+ <rdf:RDF>
+ <cc:Work
+ rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+ <dc:title />
+ </cc:Work>
+ </rdf:RDF>
+ </metadata>
+ <g
+ inkscape:label="Ebene 1"
+ inkscape:groupmode="layer"
+ id="layer1"
+ transform="translate(0,-952.36218)"
+ style="display:inline">
+ <rect
+ y="952.63806"
+ x="0.38571933"
+ height="99.409401"
+ width="99.409401"
+ id="rect3799"
+ style="fill:url(#linearGradient3773);fill-opacity:1;stroke:none" />
+ </g>
+</svg>
diff --git a/resources/themes/adwaita/theme.xml b/resources/themes/adwaita/theme.xml
index d238b68..d7e2d04 100644
--- a/resources/themes/adwaita/theme.xml
+++ b/resources/themes/adwaita/theme.xml
@@ -14,11 +14,15 @@
<slices radius="30">
<activeSlice>
<slice_layer type="file" file="icon_active.svg" scale="1.8" />
- <slice_layer type="icon" scale="0.9" />
+ <slice_layer type="icon" scale="0.9" file="caption_mask.svg" visibility="with_caption" />
+ <slice_layer type="icon" scale="0.9" visibility="without_caption" />
+ <slice_layer type="caption" y="22" font="sans 9" width="60" color="#000" height="20" visibility="with_caption" />
</activeSlice>
<inactiveSlice>
<slice_layer type="file" file="icon_inactive.svg" scale="1.8" />
- <slice_layer type="icon" scale="0.9" />
+ <slice_layer type="icon" scale="0.9" file="caption_mask.svg" visibility="with_caption" />
+ <slice_layer type="icon" scale="0.9" visibility="without_caption" />
+ <slice_layer type="caption" y="22" font="sans 9" width="60" color="#000" height="20" visibility="with_caption" />
</inactiveSlice>
</slices>
<caption position="0" font="sans 10" width="100" height="100" color="#000"/>
diff --git a/resources/themes/bright/caption.svg b/resources/themes/bright/caption.svg
new file mode 100644
index 0000000..382efda
--- /dev/null
+++ b/resources/themes/bright/caption.svg
@@ -0,0 +1,161 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+ xmlns:dc="http://purl.org/dc/elements/1.1/"
+ xmlns:cc="http://creativecommons.org/ns#"
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+ xmlns:svg="http://www.w3.org/2000/svg"
+ xmlns="http://www.w3.org/2000/svg"
+ xmlns:xlink="http://www.w3.org/1999/xlink"
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+ width="100"
+ height="100"
+ id="svg2"
+ version="1.1"
+ inkscape:version="0.48.2 r9819"
+ sodipodi:docname="caption.svg">
+ <defs
+ id="defs4">
+ <linearGradient
+ inkscape:collect="always"
+ id="linearGradient2998">
+ <stop
+ style="stop-color:#ffffff;stop-opacity:0"
+ offset="0"
+ id="stop3000" />
+ <stop
+ style="stop-color:#ffffff;stop-opacity:0.74257426"
+ offset="1"
+ id="stop3002" />
+ </linearGradient>
+ <linearGradient
+ id="linearGradient3786"
+ inkscape:collect="always">
+ <stop
+ id="stop3788"
+ offset="0"
+ style="stop-color:#ffffff;stop-opacity:0.59649123" />
+ <stop
+ id="stop3790"
+ offset="1"
+ style="stop-color:#ffffff;stop-opacity:0" />
+ </linearGradient>
+ <linearGradient
+ inkscape:collect="always"
+ id="linearGradient3772">
+ <stop
+ style="stop-color:#ffffff;stop-opacity:0.64912281"
+ offset="0"
+ id="stop3774" />
+ <stop
+ id="stop3804"
+ offset="0.33709621"
+ style="stop-color:#ffffff;stop-opacity:0.30980392;" />
+ <stop
+ id="stop3802"
+ offset="0.41556084"
+ style="stop-color:#ffffff;stop-opacity:0.25882353;" />
+ <stop
+ id="stop3800"
+ offset="0.50963062"
+ style="stop-color:#ffffff;stop-opacity:0.21568627;" />
+ <stop
+ id="stop3798"
+ offset="0.61938298"
+ style="stop-color:#ffffff;stop-opacity:0.15294118;" />
+ <stop
+ id="stop3796"
+ offset="0.75001973"
+ style="stop-color:#ffffff;stop-opacity:0.09019608;" />
+ <stop
+ id="stop3794"
+ offset="0.83893943"
+ style="stop-color:#ffffff;stop-opacity:0.05490196;" />
+ <stop
+ id="stop3792"
+ offset="0.91730076"
+ style="stop-color:#ffffff;stop-opacity:0.02745098;" />
+ <stop
+ style="stop-color:#ffffff;stop-opacity:0"
+ offset="1"
+ id="stop3776" />
+ </linearGradient>
+ <radialGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient3772"
+ id="radialGradient3778"
+ cx="49.10873"
+ cy="-14.628683"
+ fx="49.10873"
+ fy="-14.628683"
+ r="48.035713"
+ gradientTransform="matrix(-1.156153,0.00571083,-0.00496751,-1.0056696,106.16882,941.03082)"
+ gradientUnits="userSpaceOnUse" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient3786"
+ id="linearGradient3784"
+ x1="48.214287"
+ y1="1050.13"
+ x2="48.214287"
+ y2="994.57111"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="translate(0,2.9263432e-6)" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient2998"
+ id="linearGradient3774"
+ x1="55.794643"
+ y1="53.993038"
+ x2="55.794643"
+ y2="71.561378"
+ gradientUnits="userSpaceOnUse" />
+ </defs>
+ <sodipodi:namedview
+ id="base"
+ pagecolor="#000000"
+ bordercolor="#666666"
+ borderopacity="1.0"
+ inkscape:pageopacity="0"
+ inkscape:pageshadow="2"
+ inkscape:zoom="11.2"
+ inkscape:cx="10.91174"
+ inkscape:cy="27.435478"
+ inkscape:document-units="px"
+ inkscape:current-layer="layer1"
+ showgrid="false"
+ inkscape:showpageshadow="false"
+ inkscape:window-width="960"
+ inkscape:window-height="1033"
+ inkscape:window-x="960"
+ inkscape:window-y="24"
+ inkscape:window-maximized="0" />
+ <metadata
+ id="metadata7">
+ <rdf:RDF>
+ <cc:Work
+ rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+ <dc:title />
+ </cc:Work>
+ </rdf:RDF>
+ </metadata>
+ <g
+ inkscape:label="Ebene 1"
+ inkscape:groupmode="layer"
+ id="layer1"
+ transform="translate(0,-952.36218)"
+ style="display:inline">
+ <path
+ style="fill:url(#linearGradient3774);fill-opacity:1;stroke:none"
+ d="m 2.875,53.84375 0,37.03125 c 0,3.497653 2.8148472,6.34375 6.3125,6.34375 l 81.8125,0 c 3.497653,0 6.3125,-2.846097 6.3125,-6.34375 l 0,-37.03125 z"
+ id="rect3000"
+ transform="translate(0,952.36218)"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="csssscc" />
+ </g>
+</svg>
diff --git a/resources/themes/bright/caption_mask.svg b/resources/themes/bright/caption_mask.svg
new file mode 100644
index 0000000..59d4801
--- /dev/null
+++ b/resources/themes/bright/caption_mask.svg
@@ -0,0 +1,153 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+ xmlns:dc="http://purl.org/dc/elements/1.1/"
+ xmlns:cc="http://creativecommons.org/ns#"
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+ xmlns:svg="http://www.w3.org/2000/svg"
+ xmlns="http://www.w3.org/2000/svg"
+ xmlns:xlink="http://www.w3.org/1999/xlink"
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+ width="100"
+ height="100"
+ id="svg2"
+ version="1.1"
+ inkscape:version="0.48.2 r9819"
+ sodipodi:docname="caption_mask.svg">
+ <defs
+ id="defs4">
+ <linearGradient
+ inkscape:collect="always"
+ id="linearGradient2997">
+ <stop
+ style="stop-color:#000000;stop-opacity:0"
+ offset="0"
+ id="stop2999" />
+ <stop
+ style="stop-color:#000000;stop-opacity:1"
+ offset="1"
+ id="stop3001" />
+ </linearGradient>
+ <linearGradient
+ inkscape:collect="always"
+ id="linearGradient3785">
+ <stop
+ style="stop-color:#abab9f;stop-opacity:1"
+ offset="0"
+ id="stop3787" />
+ <stop
+ id="stop3797"
+ offset="0.29400957"
+ style="stop-color:#c2c2bb;stop-opacity:1" />
+ <stop
+ style="stop-color:#d3d3d2;stop-opacity:1"
+ offset="1"
+ id="stop3789" />
+ </linearGradient>
+ <linearGradient
+ inkscape:collect="always"
+ id="linearGradient3009">
+ <stop
+ style="stop-color:#fafcfc;stop-opacity:1"
+ offset="0"
+ id="stop3011" />
+ <stop
+ id="stop3795"
+ offset="0.95082122"
+ style="stop-color:#e5e8e8;stop-opacity:1;" />
+ <stop
+ style="stop-color:#d2d6d6;stop-opacity:1"
+ offset="1"
+ id="stop3013" />
+ </linearGradient>
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient3785"
+ id="linearGradient3791"
+ x1="44.385059"
+ y1="958.93121"
+ x2="44.385059"
+ y2="1045.9142"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(0.59160385,0,0,0.59160385,20.456735,409.35291)" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient3009"
+ id="linearGradient3793"
+ x1="51.33149"
+ y1="958.94989"
+ x2="51.33149"
+ y2="1045.7374"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(0.59160385,0,0,0.59160385,20.456735,409.35291)" />
+ <filter
+ inkscape:collect="always"
+ id="filter3921"
+ x="-0.28370607"
+ width="1.5674121"
+ y="-0.28370607"
+ height="1.5674121">
+ <feGaussianBlur
+ inkscape:collect="always"
+ stdDeviation="9.4292716"
+ id="feGaussianBlur3923" />
+ </filter>
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient2997"
+ id="linearGradient3773"
+ x1="52.830833"
+ y1="1031.3591"
+ x2="52.830833"
+ y2="1010.1867"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="translate(-7.1765038e-7,-5.2013983e-6)" />
+ </defs>
+ <sodipodi:namedview
+ id="base"
+ pagecolor="#000000"
+ bordercolor="#666666"
+ borderopacity="1.0"
+ inkscape:pageopacity="0"
+ inkscape:pageshadow="2"
+ inkscape:zoom="5.6"
+ inkscape:cx="20.693791"
+ inkscape:cy="49.374216"
+ inkscape:document-units="px"
+ inkscape:current-layer="layer1"
+ showgrid="false"
+ inkscape:showpageshadow="false"
+ inkscape:window-width="1517"
+ inkscape:window-height="834"
+ inkscape:window-x="335"
+ inkscape:window-y="111"
+ inkscape:window-maximized="0" />
+ <metadata
+ id="metadata7">
+ <rdf:RDF>
+ <cc:Work
+ rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+ <dc:title />
+ </cc:Work>
+ </rdf:RDF>
+ </metadata>
+ <g
+ inkscape:label="Ebene 1"
+ inkscape:groupmode="layer"
+ id="layer1"
+ transform="translate(0,-952.36218)"
+ style="display:inline">
+ <rect
+ y="952.63806"
+ x="0.38571933"
+ height="99.409401"
+ width="99.409401"
+ id="rect3799"
+ style="fill:url(#linearGradient3773);fill-opacity:1;stroke:none" />
+ </g>
+</svg>
diff --git a/resources/themes/bright/theme.xml b/resources/themes/bright/theme.xml
index 9ea3606..c1db9a9 100644
--- a/resources/themes/bright/theme.xml
+++ b/resources/themes/bright/theme.xml
@@ -11,16 +11,20 @@
active_scale="1.0" active_rotationMode="turn_to_mouse" active_rotationSpeed="15.0" active_colorize="true" active_alpha="1.0"
inactive_scale="1.0" inactive_rotationMode="auto" inactive_rotationSpeed="0.0" inactive_colorize="true" inactive_alpha="0.0" />
</center>
- <slices radius="26">
+ <slices radius="28" minGap="14">
<activeSlice>
<slice_layer type="file" file="icon_active.svg" scale="1" colorize="true" />
<slice_layer type="file" file="gloss.svg" scale="1" colorize="false" />
- <slice_layer type="icon" scale="0.9" colorize="false" />
+ <slice_layer type="icon" scale="0.9" colorize="false" visibility="without_caption" />
+ <slice_layer type="icon" scale="0.9" colorize="false" file="caption_mask.svg" visibility="with_caption"/>
+ <slice_layer type="caption" y="21" font="sans 9" color="#000" width="55" height="20" visibility="with_caption" />
</activeSlice>
<inactiveSlice>
<slice_layer type="file" file="icon_inactive.svg" scale="1" colorize="false" />
<slice_layer type="file" file="gloss.svg" scale="1" colorize="false" />
- <slice_layer type="icon" scale="0.9" colorize="false" />
+ <slice_layer type="icon" scale="0.9" colorize="false" visibility="without_caption"/>
+ <slice_layer type="icon" scale="0.9" colorize="false" file="caption_mask.svg" visibility="with_caption"/>
+ <slice_layer type="caption" y="21" font="sans 9" color="#000" width="55" height="20" visibility="with_caption" />
</inactiveSlice>
</slices>
<caption position="0" font="sans 10" width="90" height="90" color="#000"/>
diff --git a/resources/themes/elementary/slice_caption.svg b/resources/themes/elementary/slice_caption.svg
new file mode 100644
index 0000000..d2aa2cb
--- /dev/null
+++ b/resources/themes/elementary/slice_caption.svg
@@ -0,0 +1,130 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+ xmlns:dc="http://purl.org/dc/elements/1.1/"
+ xmlns:cc="http://creativecommons.org/ns#"
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+ xmlns:svg="http://www.w3.org/2000/svg"
+ xmlns="http://www.w3.org/2000/svg"
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+ width="100"
+ height="100"
+ id="svg2"
+ version="1.1"
+ inkscape:version="0.48.2 r9819"
+ sodipodi:docname="slice_caption.svg">
+ <defs
+ id="defs4">
+ <linearGradient
+ id="linearGradient3767">
+ <stop
+ style="stop-color:#ffffff;stop-opacity:0"
+ offset="0"
+ id="stop3769" />
+ <stop
+ id="stop4739"
+ offset="0.39852998"
+ style="stop-color:#ffffff;stop-opacity:0;" />
+ <stop
+ style="stop-color:#ffffff;stop-opacity:0.7605178"
+ offset="0.58575326"
+ id="stop4703" />
+ <stop
+ id="stop4713"
+ offset="0.66058904"
+ style="stop-color:#ffffff;stop-opacity:0.45490196;" />
+ <stop
+ id="stop4711"
+ offset="0.70194155"
+ style="stop-color:#ffffff;stop-opacity:0.34901961;" />
+ <stop
+ id="stop4709"
+ offset="0.74285865"
+ style="stop-color:#ffffff;stop-opacity:0.25490196;" />
+ <stop
+ id="stop4707"
+ offset="0.8251282"
+ style="stop-color:#ffffff;stop-opacity:0.1254902;" />
+ <stop
+ id="stop4705"
+ offset="0.90009141"
+ style="stop-color:#ffffff;stop-opacity:0.05490196;" />
+ <stop
+ style="stop-color:#ffffff;stop-opacity:0"
+ offset="1"
+ id="stop3771" />
+ </linearGradient>
+ <filter
+ inkscape:collect="always"
+ id="filter3780"
+ x="-0.19497946"
+ width="1.3899589"
+ y="-1.3648562"
+ height="3.7297125">
+ <feGaussianBlur
+ inkscape:collect="always"
+ stdDeviation="5.1182109"
+ id="feGaussianBlur3782" />
+ </filter>
+ </defs>
+ <sodipodi:namedview
+ id="base"
+ pagecolor="#6e6e6e"
+ bordercolor="#666666"
+ borderopacity="1.0"
+ inkscape:pageopacity="0.61176471"
+ inkscape:pageshadow="2"
+ inkscape:zoom="4"
+ inkscape:cx="-41.757409"
+ inkscape:cy="36.683022"
+ inkscape:document-units="px"
+ inkscape:current-layer="layer1"
+ showgrid="false"
+ inkscape:showpageshadow="false"
+ showguides="true"
+ inkscape:guide-bbox="true"
+ inkscape:window-width="1920"
+ inkscape:window-height="1033"
+ inkscape:window-x="0"
+ inkscape:window-y="24"
+ inkscape:window-maximized="1">
+ <sodipodi:guide
+ orientation="0,1"
+ position="50,49.75"
+ id="guide3916" />
+ <sodipodi:guide
+ orientation="1,0"
+ position="50,43.125"
+ id="guide3918" />
+ </sodipodi:namedview>
+ <metadata
+ id="metadata7">
+ <rdf:RDF>
+ <cc:Work
+ rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+ <dc:title />
+ </cc:Work>
+ </rdf:RDF>
+ </metadata>
+ <g
+ inkscape:label="Ebene 1"
+ inkscape:groupmode="layer"
+ id="layer1"
+ transform="translate(0,-952.36218)">
+ <rect
+ style="fill:#000000;fill-opacity:1;stroke:none;filter:url(#filter3780)"
+ id="rect2998"
+ width="63"
+ height="9"
+ x="18.5"
+ y="960.36218"
+ rx="5.9261422"
+ ry="3.2917278"
+ transform="matrix(1.2461533,0,0,-2.080723,-12.774861,3038.7488)" />
+ </g>
+</svg>
diff --git a/resources/themes/elementary/theme.xml b/resources/themes/elementary/theme.xml
index 9282ba6..0667707 100644
--- a/resources/themes/elementary/theme.xml
+++ b/resources/themes/elementary/theme.xml
@@ -1,20 +1,24 @@
<?xml version="1.0" encoding="UTF-8"?>
<theme name="Elementary" description="Inspired by the style of Elementary OS" author="Simon Schneegans" email="code@simonschneegans.de">
- <pie radius="120" maxZoom="1.2" zoomRange="0.1" transitionTime="0.15" springiness="1.3"
+ <pie radius="120" maxZoom="1.2" zoomRange="0.1" wobble="0.1" transitionTime="0.15" springiness="1.3"
fadeInTime="0.2" fadeOutTime="0.2" fadeInZoom="0.7" fadeOutZoom="0.8" fadeInRotation="0.2" fadeOutRotation="-0.2">
<center radius="70" activeRadius="35">
<center_layer file="ring.svg"
active_scale="1.0" active_rotationMode="auto" active_rotationSpeed="0" active_colorize="false" active_alpha="1.0"
inactive_scale="1.0" inactive_rotationMode="auto" inactive_rotationSpeed="0" inactive_colorize="false" inactive_alpha="1.0" />
</center>
- <slices radius="40" minGap="-10" >
+ <slices radius="40" minGap="-5" >
<activeSlice>
<slice_layer type="file" file="icon_bg.svg" scale="1" colorize="true" />
<slice_layer type="icon" scale="0.5" />
+ <slice_layer type="file" file="slice_caption.svg" scale="1" colorize="true" visibility="with_caption" />
+ <slice_layer type="caption" y="30" font="sans 10" width="85" color="#000" height="20" visibility="with_caption" />
</activeSlice>
<inactiveSlice>
<slice_layer type="icon" scale="0.5" />
+ <slice_layer type="file" file="slice_caption.svg" scale="1" colorize="true" visibility="with_caption" />
+ <slice_layer type="caption" y="30" font="sans 10" width="85" color="#000" height="20" visibility="with_caption" />
</inactiveSlice>
</slices>
<caption position="0" font="sans 10" width="90" height="90" />
diff --git a/resources/themes/funky/slice_caption.svg b/resources/themes/funky/slice_caption.svg
new file mode 100644
index 0000000..d2aa2cb
--- /dev/null
+++ b/resources/themes/funky/slice_caption.svg
@@ -0,0 +1,130 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+ xmlns:dc="http://purl.org/dc/elements/1.1/"
+ xmlns:cc="http://creativecommons.org/ns#"
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+ xmlns:svg="http://www.w3.org/2000/svg"
+ xmlns="http://www.w3.org/2000/svg"
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+ width="100"
+ height="100"
+ id="svg2"
+ version="1.1"
+ inkscape:version="0.48.2 r9819"
+ sodipodi:docname="slice_caption.svg">
+ <defs
+ id="defs4">
+ <linearGradient
+ id="linearGradient3767">
+ <stop
+ style="stop-color:#ffffff;stop-opacity:0"
+ offset="0"
+ id="stop3769" />
+ <stop
+ id="stop4739"
+ offset="0.39852998"
+ style="stop-color:#ffffff;stop-opacity:0;" />
+ <stop
+ style="stop-color:#ffffff;stop-opacity:0.7605178"
+ offset="0.58575326"
+ id="stop4703" />
+ <stop
+ id="stop4713"
+ offset="0.66058904"
+ style="stop-color:#ffffff;stop-opacity:0.45490196;" />
+ <stop
+ id="stop4711"
+ offset="0.70194155"
+ style="stop-color:#ffffff;stop-opacity:0.34901961;" />
+ <stop
+ id="stop4709"
+ offset="0.74285865"
+ style="stop-color:#ffffff;stop-opacity:0.25490196;" />
+ <stop
+ id="stop4707"
+ offset="0.8251282"
+ style="stop-color:#ffffff;stop-opacity:0.1254902;" />
+ <stop
+ id="stop4705"
+ offset="0.90009141"
+ style="stop-color:#ffffff;stop-opacity:0.05490196;" />
+ <stop
+ style="stop-color:#ffffff;stop-opacity:0"
+ offset="1"
+ id="stop3771" />
+ </linearGradient>
+ <filter
+ inkscape:collect="always"
+ id="filter3780"
+ x="-0.19497946"
+ width="1.3899589"
+ y="-1.3648562"
+ height="3.7297125">
+ <feGaussianBlur
+ inkscape:collect="always"
+ stdDeviation="5.1182109"
+ id="feGaussianBlur3782" />
+ </filter>
+ </defs>
+ <sodipodi:namedview
+ id="base"
+ pagecolor="#6e6e6e"
+ bordercolor="#666666"
+ borderopacity="1.0"
+ inkscape:pageopacity="0.61176471"
+ inkscape:pageshadow="2"
+ inkscape:zoom="4"
+ inkscape:cx="-41.757409"
+ inkscape:cy="36.683022"
+ inkscape:document-units="px"
+ inkscape:current-layer="layer1"
+ showgrid="false"
+ inkscape:showpageshadow="false"
+ showguides="true"
+ inkscape:guide-bbox="true"
+ inkscape:window-width="1920"
+ inkscape:window-height="1033"
+ inkscape:window-x="0"
+ inkscape:window-y="24"
+ inkscape:window-maximized="1">
+ <sodipodi:guide
+ orientation="0,1"
+ position="50,49.75"
+ id="guide3916" />
+ <sodipodi:guide
+ orientation="1,0"
+ position="50,43.125"
+ id="guide3918" />
+ </sodipodi:namedview>
+ <metadata
+ id="metadata7">
+ <rdf:RDF>
+ <cc:Work
+ rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+ <dc:title />
+ </cc:Work>
+ </rdf:RDF>
+ </metadata>
+ <g
+ inkscape:label="Ebene 1"
+ inkscape:groupmode="layer"
+ id="layer1"
+ transform="translate(0,-952.36218)">
+ <rect
+ style="fill:#000000;fill-opacity:1;stroke:none;filter:url(#filter3780)"
+ id="rect2998"
+ width="63"
+ height="9"
+ x="18.5"
+ y="960.36218"
+ rx="5.9261422"
+ ry="3.2917278"
+ transform="matrix(1.2461533,0,0,-2.080723,-12.774861,3038.7488)" />
+ </g>
+</svg>
diff --git a/resources/themes/funky/theme.xml b/resources/themes/funky/theme.xml
index 7a86ecc..edf841b 100644
--- a/resources/themes/funky/theme.xml
+++ b/resources/themes/funky/theme.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<theme name="Funky" description="Just testing what these themes can do..." author="Simon Schneegans" email="code@simonschneegans.de">
- <pie radius="80" maxZoom="1.3" zoomRange="0.3" transitionTime="0.2" springiness="2.5"
+ <pie radius="120" maxZoom="1.3" zoomRange="0.3" wobble="0.5" transitionTime="0.2" springiness="2.5"
fadeInTime="0.3" fadeOutTime="0.3" fadeInZoom="1.5" fadeOutZoom="0.4" fadeInRotation="0.5" fadeOutRotation="-0.7">
<center radius="100" activeRadius="40">
<center_layer file="bg.svg"
@@ -20,19 +20,23 @@
active_scale="1.0" active_rotationMode="auto" active_rotationSpeed="0" active_colorize="false" active_alpha="0.8"
inactive_scale="1.0" inactive_rotationMode="auto" inactive_rotationSpeed="0" inactive_colorize="false" inactive_alpha="0.0" />
</center>
- <slices radius="30" minGap="0">
+ <slices radius="35" minGap="0">
<activeSlice>
<slice_layer type="file" file="icon_bg.svg" scale="1" colorize="false" />
<slice_layer type="file" file="icon_fg.svg" scale="1" colorize="true" />
<slice_layer type="icon" scale="0.7"/>
+ <slice_layer type="file" file="slice_caption.svg" scale="1" colorize="false" visibility="with_caption" />
+ <slice_layer type="caption" y="28" font="sans bold 10" width="85" height="20" visibility="with_caption" />
</activeSlice>
<inactiveSlice>
<slice_layer type="file" file="icon_bg.svg" scale="0.7" colorize="false" />
<slice_layer type="file" file="icon_fg.svg" scale="0.65" colorize="false" />
<slice_layer type="icon" scale="0.5"/>
+ <slice_layer type="file" file="slice_caption.svg" scale="1" colorize="false" visibility="with_caption" />
+ <slice_layer type="caption" y="28" font="sans bold 10" width="85" height="20" visibility="with_caption" />
</inactiveSlice>
</slices>
- <caption position="-35" font="sans bold 10" width="100" height="30" />
+ <caption position="-35" font="sans bold 10" width="100" height="20" />
</pie>
</theme>
diff --git a/resources/themes/gloss/slice_caption.svg b/resources/themes/gloss/slice_caption.svg
new file mode 100644
index 0000000..644b007
--- /dev/null
+++ b/resources/themes/gloss/slice_caption.svg
@@ -0,0 +1,210 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+ xmlns:dc="http://purl.org/dc/elements/1.1/"
+ xmlns:cc="http://creativecommons.org/ns#"
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+ xmlns:svg="http://www.w3.org/2000/svg"
+ xmlns="http://www.w3.org/2000/svg"
+ xmlns:xlink="http://www.w3.org/1999/xlink"
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+ width="100"
+ height="100"
+ id="svg2"
+ version="1.1"
+ inkscape:version="0.48.2 r9819"
+ sodipodi:docname="slice_caption.svg">
+ <defs
+ id="defs4">
+ <linearGradient
+ inkscape:collect="always"
+ id="linearGradient3776">
+ <stop
+ style="stop-color:#000000;stop-opacity:1"
+ offset="0"
+ id="stop3778" />
+ <stop
+ style="stop-color:#000000;stop-opacity:0"
+ offset="1"
+ id="stop3780" />
+ </linearGradient>
+ <linearGradient
+ inkscape:collect="always"
+ id="linearGradient3784">
+ <stop
+ style="stop-color:#ffffff;stop-opacity:0.64102566"
+ offset="0"
+ id="stop3786" />
+ <stop
+ style="stop-color:#ffffff;stop-opacity:0"
+ offset="1"
+ id="stop3788" />
+ </linearGradient>
+ <linearGradient
+ inkscape:collect="always"
+ id="linearGradient3765">
+ <stop
+ style="stop-color:#f1f1f1;stop-opacity:1"
+ offset="0"
+ id="stop3767" />
+ <stop
+ id="stop3774"
+ offset="0.22916844"
+ style="stop-color:#b1b1b1;stop-opacity:1;" />
+ <stop
+ style="stop-color:#afafaf;stop-opacity:1;"
+ offset="0.83556658"
+ id="stop3776" />
+ <stop
+ style="stop-color:#767676;stop-opacity:1"
+ offset="1"
+ id="stop3770" />
+ </linearGradient>
+ <linearGradient
+ id="linearGradient3767">
+ <stop
+ style="stop-color:#ffffff;stop-opacity:0"
+ offset="0"
+ id="stop3769" />
+ <stop
+ id="stop4739"
+ offset="0.39852998"
+ style="stop-color:#ffffff;stop-opacity:0;" />
+ <stop
+ style="stop-color:#ffffff;stop-opacity:0.7605178"
+ offset="0.58575326"
+ id="stop4703" />
+ <stop
+ id="stop4713"
+ offset="0.66058904"
+ style="stop-color:#ffffff;stop-opacity:0.45490196;" />
+ <stop
+ id="stop4711"
+ offset="0.70194155"
+ style="stop-color:#ffffff;stop-opacity:0.34901961;" />
+ <stop
+ id="stop4709"
+ offset="0.74285865"
+ style="stop-color:#ffffff;stop-opacity:0.25490196;" />
+ <stop
+ id="stop4707"
+ offset="0.8251282"
+ style="stop-color:#ffffff;stop-opacity:0.1254902;" />
+ <stop
+ id="stop4705"
+ offset="0.90009141"
+ style="stop-color:#ffffff;stop-opacity:0.05490196;" />
+ <stop
+ style="stop-color:#ffffff;stop-opacity:0"
+ offset="1"
+ id="stop3771" />
+ </linearGradient>
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient3765"
+ id="linearGradient3772"
+ x1="-1.7210249"
+ y1="-1025.2629"
+ x2="50"
+ y2="-1082.3879"
+ gradientUnits="userSpaceOnUse" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient3784"
+ id="linearGradient3790"
+ x1="5.1685033"
+ y1="-1027.9504"
+ x2="7.5220947"
+ y2="-1044.0754"
+ gradientUnits="userSpaceOnUse" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient3776"
+ id="linearGradient3785"
+ x1="50"
+ y1="75.839279"
+ x2="50"
+ y2="65.125"
+ gradientUnits="userSpaceOnUse" />
+ </defs>
+ <sodipodi:namedview
+ id="base"
+ pagecolor="#6e6e6e"
+ bordercolor="#666666"
+ borderopacity="1.0"
+ inkscape:pageopacity="0.61176471"
+ inkscape:pageshadow="2"
+ inkscape:zoom="9.3333333"
+ inkscape:cx="42.374479"
+ inkscape:cy="18.149039"
+ inkscape:document-units="px"
+ inkscape:current-layer="layer1"
+ showgrid="false"
+ inkscape:showpageshadow="false"
+ showguides="true"
+ inkscape:guide-bbox="true"
+ inkscape:window-width="1920"
+ inkscape:window-height="1033"
+ inkscape:window-x="0"
+ inkscape:window-y="24"
+ inkscape:window-maximized="1">
+ <sodipodi:guide
+ orientation="0,1"
+ position="50,49.75"
+ id="guide3916" />
+ <sodipodi:guide
+ orientation="1,0"
+ position="50,43.125"
+ id="guide3918" />
+ </sodipodi:namedview>
+ <metadata
+ id="metadata7">
+ <rdf:RDF>
+ <cc:Work
+ rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+ <dc:title />
+ </cc:Work>
+ </rdf:RDF>
+ </metadata>
+ <g
+ inkscape:label="Ebene 1"
+ inkscape:groupmode="layer"
+ id="layer1"
+ transform="translate(0,-952.36218)">
+ <path
+ sodipodi:type="arc"
+ style="fill:url(#linearGradient3785);fill-opacity:1;stroke:none"
+ id="path3774"
+ sodipodi:cx="50.464287"
+ sodipodi:cy="49.642857"
+ sodipodi:rx="46.17857"
+ sodipodi:ry="45.42857"
+ d="m 96.642857,49.642857 a 46.17857,45.42857 0 1 1 -92.35714,0 46.17857,45.42857 0 1 1 92.35714,0 z"
+ transform="translate(0,952.36218)" />
+ <rect
+ style="fill:#000000;fill-opacity:1;stroke:url(#linearGradient3772);stroke-width:4.69999981;stroke-miterlimit:4;stroke-dasharray:none"
+ id="rect2998"
+ width="94.13266"
+ height="24.252857"
+ x="2.9039752"
+ y="-1049.2018"
+ rx="7.384882"
+ ry="6.8491745"
+ transform="scale(1,-1)" />
+ <rect
+ transform="scale(1,-1)"
+ ry="5.1182818"
+ rx="5.6644635"
+ y="-1047.0768"
+ x="6.4185033"
+ height="18.502861"
+ width="89.103592"
+ id="rect3778"
+ style="fill:url(#linearGradient3790);fill-opacity:1;stroke:none" />
+ </g>
+</svg>
diff --git a/resources/themes/gloss/theme.xml b/resources/themes/gloss/theme.xml
index 760b9b6..1097b02 100644
--- a/resources/themes/gloss/theme.xml
+++ b/resources/themes/gloss/theme.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<theme name="Glossy" description="A shiny theme for Gnome-Pie" author="Simon Schneegans" email="code@simonschneegans.de">
- <pie radius="100" maxZoom="1.3" zoomRange="0.2" transitionTime="0.1" fadeInTime="0.2" fadeOutTime="0.2" fadeInZoom="0.7" fadeOutZoom="0.7">
+ <pie radius="100" maxZoom="1.3" zoomRange="0.2" wobble="0.1" transitionTime="0.1" fadeInTime="0.2" fadeOutTime="0.2" fadeInZoom="0.7" fadeOutZoom="0.7">
<center radius="65" activeRadius="40">
<center_layer file="icon_bg.svg"
active_scale="1" active_rotationMode="auto" active_rotationSpeed="0" active_colorize="false" active_alpha="1.0"
@@ -16,16 +16,20 @@
active_scale="1" active_rotationMode="turn_to_mouse" active_rotationSpeed="10.0" active_colorize="false" active_alpha="1.0"
inactive_scale="0.6" inactive_rotationMode="auto" inactive_rotationSpeed="0.0" inactive_colorize="false" inactive_alpha="0.0" />
</center>
- <slices radius="26" minGap="0">
+ <slices radius="33" minGap="4">
<activeSlice>
- <slice_layer type="file" file="icon_bg.svg" scale="1" colorize="false" />
- <slice_layer type="icon" file="icon_mask.svg" scale="0.9" colorize="false" />
- <slice_layer type="file" file="icon_fg_active.svg" scale="1" colorize="false" />
+ <slice_layer type="file" file="icon_bg.svg" scale="0.9" colorize="false" />
+ <slice_layer type="icon" file="icon_mask.svg" scale="0.81" colorize="false" />
+ <slice_layer type="file" file="icon_fg_active.svg" scale="0.9" colorize="false" />
+ <slice_layer type="file" file="slice_caption.svg" scale="1" colorize="false" visibility="with_caption" />
+ <slice_layer type="caption" y="31" font="sans bold 9" width="75" height="20" visibility="with_caption" />
</activeSlice>
<inactiveSlice>
- <slice_layer type="file" file="icon_bg.svg" scale="1" colorize="false" />
- <slice_layer type="icon" file="icon_mask.svg" scale="0.9" colorize="false" />
- <slice_layer type="file" file="icon_fg.svg" scale="1" colorize="false" />
+ <slice_layer type="file" file="icon_bg.svg" scale="0.9" colorize="false" />
+ <slice_layer type="icon" file="icon_mask.svg" scale="0.81" colorize="false" />
+ <slice_layer type="file" file="icon_fg.svg" scale="0.9" colorize="false" />
+ <slice_layer type="file" file="slice_caption.svg" scale="1" colorize="false" visibility="with_caption" />
+ <slice_layer type="caption" y="31" font="sans bold 9" width="75" height="20" visibility="with_caption" />
</inactiveSlice>
</slices>
<caption position="0" font="sans 10" width="100" height="100" />
diff --git a/resources/themes/minimalistic_text/bg.svg b/resources/themes/minimalistic_text/bg.svg
new file mode 100644
index 0000000..4dd1293
--- /dev/null
+++ b/resources/themes/minimalistic_text/bg.svg
@@ -0,0 +1,179 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+ xmlns:dc="http://purl.org/dc/elements/1.1/"
+ xmlns:cc="http://creativecommons.org/ns#"
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+ xmlns:svg="http://www.w3.org/2000/svg"
+ xmlns="http://www.w3.org/2000/svg"
+ xmlns:xlink="http://www.w3.org/1999/xlink"
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+ width="100"
+ height="100"
+ id="svg2"
+ version="1.1"
+ inkscape:version="0.48.2 r9819"
+ sodipodi:docname="bg.svg">
+ <defs
+ id="defs4">
+ <linearGradient
+ id="linearGradient3007">
+ <stop
+ id="stop3009"
+ offset="0"
+ style="stop-color:#b4b4b4;stop-opacity:0;" />
+ <stop
+ style="stop-color:#b4b4b4;stop-opacity:0;"
+ offset="0.3680203"
+ id="stop3011" />
+ <stop
+ id="stop3013"
+ offset="0.57677984"
+ style="stop-color:#b4b4b4;stop-opacity:0.66666669;" />
+ <stop
+ style="stop-color:#b4b4b4;stop-opacity:0.45490196;"
+ offset="0.66058904"
+ id="stop3015" />
+ <stop
+ style="stop-color:#b4b4b4;stop-opacity:0.34901962;"
+ offset="0.70194155"
+ id="stop3017" />
+ <stop
+ style="stop-color:#b4b4b4;stop-opacity:0.25490195;"
+ offset="0.74285865"
+ id="stop3019" />
+ <stop
+ style="stop-color:#b4b4b4;stop-opacity:0.1254902;"
+ offset="0.8251282"
+ id="stop3021" />
+ <stop
+ style="stop-color:#b4b4b4;stop-opacity:0.05490196;"
+ offset="0.90009141"
+ id="stop3023" />
+ <stop
+ id="stop3025"
+ offset="1"
+ style="stop-color:#b4b4b4;stop-opacity:0;" />
+ </linearGradient>
+ <linearGradient
+ id="linearGradient3767">
+ <stop
+ style="stop-color:#ffffff;stop-opacity:0"
+ offset="0"
+ id="stop3769" />
+ <stop
+ id="stop4739"
+ offset="0.3680203"
+ style="stop-color:#ffffff;stop-opacity:0;" />
+ <stop
+ style="stop-color:#ffffff;stop-opacity:0.66666667;"
+ offset="0.59831607"
+ id="stop4703" />
+ <stop
+ id="stop4713"
+ offset="0.66058904"
+ style="stop-color:#ffffff;stop-opacity:0.45490196;" />
+ <stop
+ id="stop4711"
+ offset="0.70194155"
+ style="stop-color:#ffffff;stop-opacity:0.34901961;" />
+ <stop
+ id="stop4709"
+ offset="0.74285865"
+ style="stop-color:#ffffff;stop-opacity:0.25490196;" />
+ <stop
+ id="stop4707"
+ offset="0.8251282"
+ style="stop-color:#ffffff;stop-opacity:0.1254902;" />
+ <stop
+ id="stop4705"
+ offset="0.90009141"
+ style="stop-color:#ffffff;stop-opacity:0.05490196;" />
+ <stop
+ style="stop-color:#ffffff;stop-opacity:0"
+ offset="1"
+ id="stop3771" />
+ </linearGradient>
+ <radialGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient3767"
+ id="radialGradient3775"
+ cx="50.002552"
+ cy="49.744911"
+ fx="50.002552"
+ fy="49.744911"
+ r="49.750011"
+ gradientUnits="userSpaceOnUse" />
+ <radialGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient3007"
+ id="radialGradient3005"
+ gradientUnits="userSpaceOnUse"
+ cx="50.002552"
+ cy="49.744911"
+ fx="50.002552"
+ fy="49.744911"
+ r="49.750011"
+ gradientTransform="translate(0,952.36218)" />
+ </defs>
+ <sodipodi:namedview
+ id="base"
+ pagecolor="#1d1d1d"
+ bordercolor="#666666"
+ borderopacity="1.0"
+ inkscape:pageopacity="0"
+ inkscape:pageshadow="2"
+ inkscape:zoom="4"
+ inkscape:cx="7.990744"
+ inkscape:cy="74.271276"
+ inkscape:document-units="px"
+ inkscape:current-layer="layer1"
+ showgrid="false"
+ inkscape:showpageshadow="false"
+ showguides="true"
+ inkscape:guide-bbox="true"
+ inkscape:window-width="1920"
+ inkscape:window-height="1033"
+ inkscape:window-x="0"
+ inkscape:window-y="24"
+ inkscape:window-maximized="1">
+ <sodipodi:guide
+ orientation="0,1"
+ position="14.9375,50"
+ id="guide3006" />
+ <sodipodi:guide
+ orientation="1,0"
+ position="50,78.171875"
+ id="guide3008" />
+ </sodipodi:namedview>
+ <metadata
+ id="metadata7">
+ <rdf:RDF>
+ <cc:Work
+ rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+ <dc:title />
+ </cc:Work>
+ </rdf:RDF>
+ </metadata>
+ <g
+ inkscape:label="Ebene 1"
+ inkscape:groupmode="layer"
+ id="layer1"
+ transform="translate(0,-952.36218)">
+ <path
+ sodipodi:type="arc"
+ style="fill:#000000;fill-opacity:1;stroke:none"
+ id="path3008"
+ sodipodi:cx="50"
+ sodipodi:cy="50"
+ sodipodi:rx="49.5"
+ sodipodi:ry="49.5"
+ d="m 99.5,50 a 49.5,49.5 0 1 1 -99,0 49.5,49.5 0 1 1 99,0 z"
+ transform="matrix(0.96969697,0,0,0.96969697,1.5151515,953.87733)" />
+ </g>
+</svg>
diff --git a/resources/themes/minimalistic_text/fg.svg b/resources/themes/minimalistic_text/fg.svg
new file mode 100644
index 0000000..c0f41bc
--- /dev/null
+++ b/resources/themes/minimalistic_text/fg.svg
@@ -0,0 +1,179 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+ xmlns:dc="http://purl.org/dc/elements/1.1/"
+ xmlns:cc="http://creativecommons.org/ns#"
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+ xmlns:svg="http://www.w3.org/2000/svg"
+ xmlns="http://www.w3.org/2000/svg"
+ xmlns:xlink="http://www.w3.org/1999/xlink"
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+ width="100"
+ height="100"
+ id="svg2"
+ version="1.1"
+ inkscape:version="0.48.2 r9819"
+ sodipodi:docname="fg.svg">
+ <defs
+ id="defs4">
+ <linearGradient
+ id="linearGradient3007">
+ <stop
+ id="stop3009"
+ offset="0"
+ style="stop-color:#b4b4b4;stop-opacity:0;" />
+ <stop
+ style="stop-color:#b4b4b4;stop-opacity:0;"
+ offset="0.3680203"
+ id="stop3011" />
+ <stop
+ id="stop3013"
+ offset="0.57677984"
+ style="stop-color:#b4b4b4;stop-opacity:0.66666669;" />
+ <stop
+ style="stop-color:#b4b4b4;stop-opacity:0.45490196;"
+ offset="0.66058904"
+ id="stop3015" />
+ <stop
+ style="stop-color:#b4b4b4;stop-opacity:0.34901962;"
+ offset="0.70194155"
+ id="stop3017" />
+ <stop
+ style="stop-color:#b4b4b4;stop-opacity:0.25490195;"
+ offset="0.74285865"
+ id="stop3019" />
+ <stop
+ style="stop-color:#b4b4b4;stop-opacity:0.1254902;"
+ offset="0.8251282"
+ id="stop3021" />
+ <stop
+ style="stop-color:#b4b4b4;stop-opacity:0.05490196;"
+ offset="0.90009141"
+ id="stop3023" />
+ <stop
+ id="stop3025"
+ offset="1"
+ style="stop-color:#b4b4b4;stop-opacity:0;" />
+ </linearGradient>
+ <linearGradient
+ id="linearGradient3767">
+ <stop
+ style="stop-color:#ffffff;stop-opacity:0"
+ offset="0"
+ id="stop3769" />
+ <stop
+ id="stop4739"
+ offset="0.3680203"
+ style="stop-color:#ffffff;stop-opacity:0;" />
+ <stop
+ style="stop-color:#ffffff;stop-opacity:0.66666667;"
+ offset="0.59831607"
+ id="stop4703" />
+ <stop
+ id="stop4713"
+ offset="0.66058904"
+ style="stop-color:#ffffff;stop-opacity:0.45490196;" />
+ <stop
+ id="stop4711"
+ offset="0.70194155"
+ style="stop-color:#ffffff;stop-opacity:0.34901961;" />
+ <stop
+ id="stop4709"
+ offset="0.74285865"
+ style="stop-color:#ffffff;stop-opacity:0.25490196;" />
+ <stop
+ id="stop4707"
+ offset="0.8251282"
+ style="stop-color:#ffffff;stop-opacity:0.1254902;" />
+ <stop
+ id="stop4705"
+ offset="0.90009141"
+ style="stop-color:#ffffff;stop-opacity:0.05490196;" />
+ <stop
+ style="stop-color:#ffffff;stop-opacity:0"
+ offset="1"
+ id="stop3771" />
+ </linearGradient>
+ <radialGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient3767"
+ id="radialGradient3775"
+ cx="50.002552"
+ cy="49.744911"
+ fx="50.002552"
+ fy="49.744911"
+ r="49.750011"
+ gradientUnits="userSpaceOnUse" />
+ <radialGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient3007"
+ id="radialGradient3005"
+ gradientUnits="userSpaceOnUse"
+ cx="50.002552"
+ cy="49.744911"
+ fx="50.002552"
+ fy="49.744911"
+ r="49.750011"
+ gradientTransform="translate(0,952.36218)" />
+ </defs>
+ <sodipodi:namedview
+ id="base"
+ pagecolor="#1d1d1d"
+ bordercolor="#666666"
+ borderopacity="1.0"
+ inkscape:pageopacity="0"
+ inkscape:pageshadow="2"
+ inkscape:zoom="4"
+ inkscape:cx="-42.134256"
+ inkscape:cy="74.271276"
+ inkscape:document-units="px"
+ inkscape:current-layer="layer1"
+ showgrid="false"
+ inkscape:showpageshadow="false"
+ showguides="true"
+ inkscape:guide-bbox="true"
+ inkscape:window-width="1920"
+ inkscape:window-height="1033"
+ inkscape:window-x="0"
+ inkscape:window-y="24"
+ inkscape:window-maximized="1">
+ <sodipodi:guide
+ orientation="0,1"
+ position="14.9375,50"
+ id="guide3006" />
+ <sodipodi:guide
+ orientation="1,0"
+ position="50,78.171875"
+ id="guide3008" />
+ </sodipodi:namedview>
+ <metadata
+ id="metadata7">
+ <rdf:RDF>
+ <cc:Work
+ rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+ <dc:title />
+ </cc:Work>
+ </rdf:RDF>
+ </metadata>
+ <g
+ inkscape:label="Ebene 1"
+ inkscape:groupmode="layer"
+ id="layer1"
+ transform="translate(0,-952.36218)">
+ <path
+ sodipodi:type="arc"
+ style="opacity:0.24579127;fill:#000000;fill-opacity:1;stroke:none"
+ id="path3008"
+ sodipodi:cx="50"
+ sodipodi:cy="50"
+ sodipodi:rx="49.5"
+ sodipodi:ry="49.5"
+ d="m 99.5,50 a 49.5,49.5 0 1 1 -99,0 49.5,49.5 0 1 1 99,0 z"
+ transform="matrix(0.89898989,0,0,0.89898989,5.0505051,957.41269)" />
+ </g>
+</svg>
diff --git a/resources/themes/minimalistic_text/preview.png b/resources/themes/minimalistic_text/preview.png
new file mode 100644
index 0000000..7bfe82c
--- /dev/null
+++ b/resources/themes/minimalistic_text/preview.png
Binary files differ
diff --git a/resources/themes/minimalistic_text/theme.xml b/resources/themes/minimalistic_text/theme.xml
new file mode 100644
index 0000000..f93c5da
--- /dev/null
+++ b/resources/themes/minimalistic_text/theme.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<theme name="Minimalistic Text" description="A text-only theme" author="Simon Schneegans" email="code@simonschneegans.de">
+ <pie radius="120" maxZoom="1.3" zoomRange="0.3" wobble="0.4" transitionTime="0.3" springiness="1.2"
+ fadeInTime="0.3" fadeOutTime="0.3" fadeInZoom="0.7" fadeOutZoom="1.2" fadeInRotation="0.2" fadeOutRotation="-0.2">
+ <slices radius="35" minGap="0">
+ <activeSlice>
+ <slice_layer type="icon" scale="0.1" />
+ <slice_layer type="file" file="bg.svg" scale="1" colorize="true" />
+ <slice_layer type="file" file="bg.svg" scale="0.95" colorize="false" />
+ <slice_layer type="file" file="fg.svg" scale="0.95" colorize="true" />
+ <slice_layer type="caption" y="0" font="sans bold 10" color="#fff" width="70" height="70" />
+ </activeSlice>
+ <inactiveSlice>
+ <slice_layer type="icon" scale="0.1" />
+ <slice_layer type="file" file="bg.svg" scale="1" colorize="true" />
+ <slice_layer type="file" file="bg.svg" scale="0.95" colorize="false" />
+ <slice_layer type="caption" y="0" font="sans bold 10" colorize="true" width="70" height="70" />
+ </inactiveSlice>
+ </slices>
+ </pie>
+</theme>
+
diff --git a/resources/themes/o-pie/caption1.svg b/resources/themes/o-pie/caption1.svg
new file mode 100644
index 0000000..2d7eb7a
--- /dev/null
+++ b/resources/themes/o-pie/caption1.svg
@@ -0,0 +1,178 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+ xmlns:dc="http://purl.org/dc/elements/1.1/"
+ xmlns:cc="http://creativecommons.org/ns#"
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+ xmlns:svg="http://www.w3.org/2000/svg"
+ xmlns="http://www.w3.org/2000/svg"
+ xmlns:xlink="http://www.w3.org/1999/xlink"
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+ width="100"
+ height="100"
+ id="svg2"
+ version="1.1"
+ inkscape:version="0.48.2 r9819"
+ sodipodi:docname="caption1.svg">
+ <defs
+ id="defs4">
+ <linearGradient
+ id="linearGradient3007">
+ <stop
+ id="stop3009"
+ offset="0"
+ style="stop-color:#b4b4b4;stop-opacity:0;" />
+ <stop
+ style="stop-color:#b4b4b4;stop-opacity:0;"
+ offset="0.3680203"
+ id="stop3011" />
+ <stop
+ id="stop3013"
+ offset="0.57677984"
+ style="stop-color:#b4b4b4;stop-opacity:0.66666669;" />
+ <stop
+ style="stop-color:#b4b4b4;stop-opacity:0.45490196;"
+ offset="0.66058904"
+ id="stop3015" />
+ <stop
+ style="stop-color:#b4b4b4;stop-opacity:0.34901962;"
+ offset="0.70194155"
+ id="stop3017" />
+ <stop
+ style="stop-color:#b4b4b4;stop-opacity:0.25490195;"
+ offset="0.74285865"
+ id="stop3019" />
+ <stop
+ style="stop-color:#b4b4b4;stop-opacity:0.1254902;"
+ offset="0.8251282"
+ id="stop3021" />
+ <stop
+ style="stop-color:#b4b4b4;stop-opacity:0.05490196;"
+ offset="0.90009141"
+ id="stop3023" />
+ <stop
+ id="stop3025"
+ offset="1"
+ style="stop-color:#b4b4b4;stop-opacity:0;" />
+ </linearGradient>
+ <linearGradient
+ id="linearGradient3767">
+ <stop
+ style="stop-color:#ffffff;stop-opacity:0"
+ offset="0"
+ id="stop3769" />
+ <stop
+ id="stop4739"
+ offset="0.3680203"
+ style="stop-color:#ffffff;stop-opacity:0;" />
+ <stop
+ style="stop-color:#ffffff;stop-opacity:0.66666667;"
+ offset="0.59831607"
+ id="stop4703" />
+ <stop
+ id="stop4713"
+ offset="0.66058904"
+ style="stop-color:#ffffff;stop-opacity:0.45490196;" />
+ <stop
+ id="stop4711"
+ offset="0.70194155"
+ style="stop-color:#ffffff;stop-opacity:0.34901961;" />
+ <stop
+ id="stop4709"
+ offset="0.74285865"
+ style="stop-color:#ffffff;stop-opacity:0.25490196;" />
+ <stop
+ id="stop4707"
+ offset="0.8251282"
+ style="stop-color:#ffffff;stop-opacity:0.1254902;" />
+ <stop
+ id="stop4705"
+ offset="0.90009141"
+ style="stop-color:#ffffff;stop-opacity:0.05490196;" />
+ <stop
+ style="stop-color:#ffffff;stop-opacity:0"
+ offset="1"
+ id="stop3771" />
+ </linearGradient>
+ <radialGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient3767"
+ id="radialGradient3775"
+ cx="50.002552"
+ cy="49.744911"
+ fx="50.002552"
+ fy="49.744911"
+ r="49.750011"
+ gradientUnits="userSpaceOnUse" />
+ <radialGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient3007"
+ id="radialGradient3005"
+ gradientUnits="userSpaceOnUse"
+ cx="50.002552"
+ cy="49.744911"
+ fx="50.002552"
+ fy="49.744911"
+ r="49.750011"
+ gradientTransform="translate(0,952.36218)" />
+ </defs>
+ <sodipodi:namedview
+ id="base"
+ pagecolor="#1d1d1d"
+ bordercolor="#666666"
+ borderopacity="1.0"
+ inkscape:pageopacity="0"
+ inkscape:pageshadow="2"
+ inkscape:zoom="16"
+ inkscape:cx="54.415989"
+ inkscape:cy="11.010654"
+ inkscape:document-units="px"
+ inkscape:current-layer="layer1"
+ showgrid="false"
+ inkscape:showpageshadow="false"
+ showguides="true"
+ inkscape:guide-bbox="true"
+ inkscape:window-width="1920"
+ inkscape:window-height="1033"
+ inkscape:window-x="0"
+ inkscape:window-y="24"
+ inkscape:window-maximized="1">
+ <sodipodi:guide
+ orientation="0,1"
+ position="14.9375,50"
+ id="guide3006" />
+ <sodipodi:guide
+ orientation="1,0"
+ position="50,78.171875"
+ id="guide3008" />
+ </sodipodi:namedview>
+ <metadata
+ id="metadata7">
+ <rdf:RDF>
+ <cc:Work
+ rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+ <dc:title />
+ </cc:Work>
+ </rdf:RDF>
+ </metadata>
+ <g
+ inkscape:label="Ebene 1"
+ inkscape:groupmode="layer"
+ id="layer1"
+ transform="translate(0,-952.36218)">
+ <rect
+ style="opacity:0.46127948;fill:#000000;fill-opacity:1;stroke:none"
+ id="rect3010"
+ width="97.536011"
+ height="26.062504"
+ x="1.2944963"
+ y="1025.0497"
+ rx="3.8134537"
+ ry="3.8134766" />
+ </g>
+</svg>
diff --git a/resources/themes/o-pie/caption2.svg b/resources/themes/o-pie/caption2.svg
new file mode 100644
index 0000000..7a3d84d
--- /dev/null
+++ b/resources/themes/o-pie/caption2.svg
@@ -0,0 +1,178 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+ xmlns:dc="http://purl.org/dc/elements/1.1/"
+ xmlns:cc="http://creativecommons.org/ns#"
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+ xmlns:svg="http://www.w3.org/2000/svg"
+ xmlns="http://www.w3.org/2000/svg"
+ xmlns:xlink="http://www.w3.org/1999/xlink"
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+ width="100"
+ height="100"
+ id="svg2"
+ version="1.1"
+ inkscape:version="0.48.2 r9819"
+ sodipodi:docname="caption2.svg">
+ <defs
+ id="defs4">
+ <linearGradient
+ id="linearGradient3007">
+ <stop
+ id="stop3009"
+ offset="0"
+ style="stop-color:#b4b4b4;stop-opacity:0;" />
+ <stop
+ style="stop-color:#b4b4b4;stop-opacity:0;"
+ offset="0.3680203"
+ id="stop3011" />
+ <stop
+ id="stop3013"
+ offset="0.57677984"
+ style="stop-color:#b4b4b4;stop-opacity:0.66666669;" />
+ <stop
+ style="stop-color:#b4b4b4;stop-opacity:0.45490196;"
+ offset="0.66058904"
+ id="stop3015" />
+ <stop
+ style="stop-color:#b4b4b4;stop-opacity:0.34901962;"
+ offset="0.70194155"
+ id="stop3017" />
+ <stop
+ style="stop-color:#b4b4b4;stop-opacity:0.25490195;"
+ offset="0.74285865"
+ id="stop3019" />
+ <stop
+ style="stop-color:#b4b4b4;stop-opacity:0.1254902;"
+ offset="0.8251282"
+ id="stop3021" />
+ <stop
+ style="stop-color:#b4b4b4;stop-opacity:0.05490196;"
+ offset="0.90009141"
+ id="stop3023" />
+ <stop
+ id="stop3025"
+ offset="1"
+ style="stop-color:#b4b4b4;stop-opacity:0;" />
+ </linearGradient>
+ <linearGradient
+ id="linearGradient3767">
+ <stop
+ style="stop-color:#ffffff;stop-opacity:0"
+ offset="0"
+ id="stop3769" />
+ <stop
+ id="stop4739"
+ offset="0.3680203"
+ style="stop-color:#ffffff;stop-opacity:0;" />
+ <stop
+ style="stop-color:#ffffff;stop-opacity:0.66666667;"
+ offset="0.59831607"
+ id="stop4703" />
+ <stop
+ id="stop4713"
+ offset="0.66058904"
+ style="stop-color:#ffffff;stop-opacity:0.45490196;" />
+ <stop
+ id="stop4711"
+ offset="0.70194155"
+ style="stop-color:#ffffff;stop-opacity:0.34901961;" />
+ <stop
+ id="stop4709"
+ offset="0.74285865"
+ style="stop-color:#ffffff;stop-opacity:0.25490196;" />
+ <stop
+ id="stop4707"
+ offset="0.8251282"
+ style="stop-color:#ffffff;stop-opacity:0.1254902;" />
+ <stop
+ id="stop4705"
+ offset="0.90009141"
+ style="stop-color:#ffffff;stop-opacity:0.05490196;" />
+ <stop
+ style="stop-color:#ffffff;stop-opacity:0"
+ offset="1"
+ id="stop3771" />
+ </linearGradient>
+ <radialGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient3767"
+ id="radialGradient3775"
+ cx="50.002552"
+ cy="49.744911"
+ fx="50.002552"
+ fy="49.744911"
+ r="49.750011"
+ gradientUnits="userSpaceOnUse" />
+ <radialGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient3007"
+ id="radialGradient3005"
+ gradientUnits="userSpaceOnUse"
+ cx="50.002552"
+ cy="49.744911"
+ fx="50.002552"
+ fy="49.744911"
+ r="49.750011"
+ gradientTransform="translate(0,952.36218)" />
+ </defs>
+ <sodipodi:namedview
+ id="base"
+ pagecolor="#1d1d1d"
+ bordercolor="#666666"
+ borderopacity="1.0"
+ inkscape:pageopacity="0"
+ inkscape:pageshadow="2"
+ inkscape:zoom="16"
+ inkscape:cx="53.947239"
+ inkscape:cy="15.948154"
+ inkscape:document-units="px"
+ inkscape:current-layer="layer1"
+ showgrid="false"
+ inkscape:showpageshadow="false"
+ showguides="true"
+ inkscape:guide-bbox="true"
+ inkscape:window-width="1920"
+ inkscape:window-height="1033"
+ inkscape:window-x="0"
+ inkscape:window-y="24"
+ inkscape:window-maximized="1">
+ <sodipodi:guide
+ orientation="0,1"
+ position="14.9375,50"
+ id="guide3006" />
+ <sodipodi:guide
+ orientation="1,0"
+ position="50,78.171875"
+ id="guide3008" />
+ </sodipodi:namedview>
+ <metadata
+ id="metadata7">
+ <rdf:RDF>
+ <cc:Work
+ rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+ <dc:title />
+ </cc:Work>
+ </rdf:RDF>
+ </metadata>
+ <g
+ inkscape:label="Ebene 1"
+ inkscape:groupmode="layer"
+ id="layer1"
+ transform="translate(0,-952.36218)">
+ <rect
+ ry="3.8134766"
+ rx="3.8134534"
+ y="1027.1747"
+ x="3.8781495"
+ height="22.437504"
+ width="92.368698"
+ id="rect3007"
+ style="fill:#000000;fill-opacity:1;stroke:none" />
+ </g>
+</svg>
diff --git a/resources/themes/o-pie/theme.xml b/resources/themes/o-pie/theme.xml
index 7381d25..862c3f4 100644
--- a/resources/themes/o-pie/theme.xml
+++ b/resources/themes/o-pie/theme.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<theme name="O-Pie" description="Inspired by the original O-Pie theme" author="Simon Schneegans" email="code@simonschneegans.de">
- <pie radius="120" maxZoom="1.3" zoomRange="0.2" transitionTime="0.1" springiness="1.5"
+ <pie radius="120" maxZoom="1.3" zoomRange="0.2" wobble="0.4" transitionTime="0.1" springiness="1.5"
fadeInTime="0.2" fadeOutTime="0.2" fadeInZoom="0.7" fadeOutZoom="0.8" fadeInRotation="0.2" fadeOutRotation="-0.2">
<center radius="70" activeRadius="35">
<center_layer file="ring.svg"
@@ -11,12 +11,18 @@
active_scale="1.0" active_rotationMode="turn_to_mouse" active_rotationSpeed="15.0" active_colorize="true" active_alpha="1.0"
inactive_scale="0.8" inactive_rotationMode="turn_to_mouse" inactive_rotationSpeed="5.0" inactive_colorize="false" inactive_alpha="0.0" />
</center>
- <slices radius="24">
+ <slices radius="32" minGap="10">
<activeSlice>
- <slice_layer type="icon" />
+ <slice_layer type="icon" scale="0.7" />
+ <slice_layer type="file" file="caption1.svg" scale="1" colorize="false" visibility="with_caption" />
+ <slice_layer type="file" file="caption2.svg" scale="1" colorize="true" visibility="with_caption" />
+ <slice_layer type="caption" y="33" font="sans 10" color="#000" width="66" height="20" visibility="with_caption" />
</activeSlice>
<inactiveSlice>
- <slice_layer type="icon" />
+ <slice_layer type="icon" scale="0.7" />
+ <slice_layer type="file" file="caption1.svg" scale="1" colorize="false" visibility="with_caption" />
+ <slice_layer type="file" file="caption2.svg" scale="1" colorize="true" visibility="with_caption" />
+ <slice_layer type="caption" y="33" font="sans 10" color="#000" width="66" height="20" visibility="with_caption" />
</inactiveSlice>
</slices>
</pie>
diff --git a/resources/themes/slim/slice_caption.svg b/resources/themes/slim/slice_caption.svg
new file mode 100644
index 0000000..d2aa2cb
--- /dev/null
+++ b/resources/themes/slim/slice_caption.svg
@@ -0,0 +1,130 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+ xmlns:dc="http://purl.org/dc/elements/1.1/"
+ xmlns:cc="http://creativecommons.org/ns#"
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+ xmlns:svg="http://www.w3.org/2000/svg"
+ xmlns="http://www.w3.org/2000/svg"
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+ width="100"
+ height="100"
+ id="svg2"
+ version="1.1"
+ inkscape:version="0.48.2 r9819"
+ sodipodi:docname="slice_caption.svg">
+ <defs
+ id="defs4">
+ <linearGradient
+ id="linearGradient3767">
+ <stop
+ style="stop-color:#ffffff;stop-opacity:0"
+ offset="0"
+ id="stop3769" />
+ <stop
+ id="stop4739"
+ offset="0.39852998"
+ style="stop-color:#ffffff;stop-opacity:0;" />
+ <stop
+ style="stop-color:#ffffff;stop-opacity:0.7605178"
+ offset="0.58575326"
+ id="stop4703" />
+ <stop
+ id="stop4713"
+ offset="0.66058904"
+ style="stop-color:#ffffff;stop-opacity:0.45490196;" />
+ <stop
+ id="stop4711"
+ offset="0.70194155"
+ style="stop-color:#ffffff;stop-opacity:0.34901961;" />
+ <stop
+ id="stop4709"
+ offset="0.74285865"
+ style="stop-color:#ffffff;stop-opacity:0.25490196;" />
+ <stop
+ id="stop4707"
+ offset="0.8251282"
+ style="stop-color:#ffffff;stop-opacity:0.1254902;" />
+ <stop
+ id="stop4705"
+ offset="0.90009141"
+ style="stop-color:#ffffff;stop-opacity:0.05490196;" />
+ <stop
+ style="stop-color:#ffffff;stop-opacity:0"
+ offset="1"
+ id="stop3771" />
+ </linearGradient>
+ <filter
+ inkscape:collect="always"
+ id="filter3780"
+ x="-0.19497946"
+ width="1.3899589"
+ y="-1.3648562"
+ height="3.7297125">
+ <feGaussianBlur
+ inkscape:collect="always"
+ stdDeviation="5.1182109"
+ id="feGaussianBlur3782" />
+ </filter>
+ </defs>
+ <sodipodi:namedview
+ id="base"
+ pagecolor="#6e6e6e"
+ bordercolor="#666666"
+ borderopacity="1.0"
+ inkscape:pageopacity="0.61176471"
+ inkscape:pageshadow="2"
+ inkscape:zoom="4"
+ inkscape:cx="-41.757409"
+ inkscape:cy="36.683022"
+ inkscape:document-units="px"
+ inkscape:current-layer="layer1"
+ showgrid="false"
+ inkscape:showpageshadow="false"
+ showguides="true"
+ inkscape:guide-bbox="true"
+ inkscape:window-width="1920"
+ inkscape:window-height="1033"
+ inkscape:window-x="0"
+ inkscape:window-y="24"
+ inkscape:window-maximized="1">
+ <sodipodi:guide
+ orientation="0,1"
+ position="50,49.75"
+ id="guide3916" />
+ <sodipodi:guide
+ orientation="1,0"
+ position="50,43.125"
+ id="guide3918" />
+ </sodipodi:namedview>
+ <metadata
+ id="metadata7">
+ <rdf:RDF>
+ <cc:Work
+ rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+ <dc:title />
+ </cc:Work>
+ </rdf:RDF>
+ </metadata>
+ <g
+ inkscape:label="Ebene 1"
+ inkscape:groupmode="layer"
+ id="layer1"
+ transform="translate(0,-952.36218)">
+ <rect
+ style="fill:#000000;fill-opacity:1;stroke:none;filter:url(#filter3780)"
+ id="rect2998"
+ width="63"
+ height="9"
+ x="18.5"
+ y="960.36218"
+ rx="5.9261422"
+ ry="3.2917278"
+ transform="matrix(1.2461533,0,0,-2.080723,-12.774861,3038.7488)" />
+ </g>
+</svg>
diff --git a/resources/themes/slim/theme.xml b/resources/themes/slim/theme.xml
index 07eaafc..97c8c42 100644
--- a/resources/themes/slim/theme.xml
+++ b/resources/themes/slim/theme.xml
@@ -2,7 +2,7 @@
<theme name="Slim" description="Well... quite simplistic" author="Simon Schneegans" email="code@simonschneegans.de">
<pie radius="120" maxZoom="1.3" zoomRange="0.2" transitionTime="0.2" springiness="1.5"
- fadeInTime="0.3" fadeOutTime="0.3" fadeInZoom="0.8" fadeOutZoom="0.8" fadeInRotation="0.3" fadeOutRotation="-0.3">
+ fadeInTime="0.3" fadeOutTime="0.3" fadeInZoom="0.8" wobble="0.1" fadeOutZoom="0.8" fadeInRotation="0.3" fadeOutRotation="-0.3">
<center radius="120" activeRadius="35">
<center_layer file="bg.svg"
active_scale="1.0" active_rotationMode="auto" active_rotationSpeed="0" active_colorize="false" active_alpha="1"
@@ -23,12 +23,16 @@
active_scale="0.7" active_rotationMode="turn_to_mouse" active_rotationSpeed="9.0" active_colorize="true" active_alpha="1.0"
inactive_scale="0.5" inactive_rotationMode="auto" inactive_rotationSpeed="1.0" inactive_colorize="false" inactive_alpha="1.0" />
</center>
- <slices radius="24">
+ <slices radius="35" minGap="0">
<activeSlice>
- <slice_layer type="icon" />
+ <slice_layer type="icon" scale="0.7" />
+ <slice_layer type="file" file="slice_caption.svg" scale="1" colorize="false" visibility="with_caption" />
+ <slice_layer type="caption" y="28" font="sans bold 10" width="85" height="20" visibility="with_caption" />
</activeSlice>
<inactiveSlice>
- <slice_layer type="icon" />
+ <slice_layer type="icon" scale="0.7" />
+ <slice_layer type="file" file="slice_caption.svg" scale="1" colorize="false" visibility="with_caption" />
+ <slice_layer type="caption" y="28" font="sans bold 10" width="85" height="20" visibility="with_caption" />
</inactiveSlice>
</slices>
</pie>
diff --git a/resources/themes/unity/caption.svg b/resources/themes/unity/caption.svg
new file mode 100644
index 0000000..1e133b6
--- /dev/null
+++ b/resources/themes/unity/caption.svg
@@ -0,0 +1,161 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+ xmlns:dc="http://purl.org/dc/elements/1.1/"
+ xmlns:cc="http://creativecommons.org/ns#"
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+ xmlns:svg="http://www.w3.org/2000/svg"
+ xmlns="http://www.w3.org/2000/svg"
+ xmlns:xlink="http://www.w3.org/1999/xlink"
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+ width="100"
+ height="100"
+ id="svg2"
+ version="1.1"
+ inkscape:version="0.48.2 r9819"
+ sodipodi:docname="caption.svg">
+ <defs
+ id="defs4">
+ <linearGradient
+ inkscape:collect="always"
+ id="linearGradient2998">
+ <stop
+ style="stop-color:#000000;stop-opacity:0"
+ offset="0"
+ id="stop3000" />
+ <stop
+ style="stop-color:#000000;stop-opacity:0.37373737"
+ offset="1"
+ id="stop3002" />
+ </linearGradient>
+ <linearGradient
+ id="linearGradient3786"
+ inkscape:collect="always">
+ <stop
+ id="stop3788"
+ offset="0"
+ style="stop-color:#ffffff;stop-opacity:0.59649123" />
+ <stop
+ id="stop3790"
+ offset="1"
+ style="stop-color:#ffffff;stop-opacity:0" />
+ </linearGradient>
+ <linearGradient
+ inkscape:collect="always"
+ id="linearGradient3772">
+ <stop
+ style="stop-color:#ffffff;stop-opacity:0.64912281"
+ offset="0"
+ id="stop3774" />
+ <stop
+ id="stop3804"
+ offset="0.33709621"
+ style="stop-color:#ffffff;stop-opacity:0.30980392;" />
+ <stop
+ id="stop3802"
+ offset="0.41556084"
+ style="stop-color:#ffffff;stop-opacity:0.25882353;" />
+ <stop
+ id="stop3800"
+ offset="0.50963062"
+ style="stop-color:#ffffff;stop-opacity:0.21568627;" />
+ <stop
+ id="stop3798"
+ offset="0.61938298"
+ style="stop-color:#ffffff;stop-opacity:0.15294118;" />
+ <stop
+ id="stop3796"
+ offset="0.75001973"
+ style="stop-color:#ffffff;stop-opacity:0.09019608;" />
+ <stop
+ id="stop3794"
+ offset="0.83893943"
+ style="stop-color:#ffffff;stop-opacity:0.05490196;" />
+ <stop
+ id="stop3792"
+ offset="0.91730076"
+ style="stop-color:#ffffff;stop-opacity:0.02745098;" />
+ <stop
+ style="stop-color:#ffffff;stop-opacity:0"
+ offset="1"
+ id="stop3776" />
+ </linearGradient>
+ <radialGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient3772"
+ id="radialGradient3778"
+ cx="49.10873"
+ cy="-14.628683"
+ fx="49.10873"
+ fy="-14.628683"
+ r="48.035713"
+ gradientTransform="matrix(-1.156153,0.00571083,-0.00496751,-1.0056696,106.16882,941.03082)"
+ gradientUnits="userSpaceOnUse" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient3786"
+ id="linearGradient3784"
+ x1="48.214287"
+ y1="1050.13"
+ x2="48.214287"
+ y2="994.57111"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="translate(0,2.9263432e-6)" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient2998"
+ id="linearGradient3774"
+ x1="55.794643"
+ y1="53.993038"
+ x2="55.794643"
+ y2="71.561378"
+ gradientUnits="userSpaceOnUse" />
+ </defs>
+ <sodipodi:namedview
+ id="base"
+ pagecolor="#000000"
+ bordercolor="#666666"
+ borderopacity="1.0"
+ inkscape:pageopacity="0"
+ inkscape:pageshadow="2"
+ inkscape:zoom="11.2"
+ inkscape:cx="47.072454"
+ inkscape:cy="27.435478"
+ inkscape:document-units="px"
+ inkscape:current-layer="layer1"
+ showgrid="false"
+ inkscape:showpageshadow="false"
+ inkscape:window-width="1920"
+ inkscape:window-height="1033"
+ inkscape:window-x="0"
+ inkscape:window-y="24"
+ inkscape:window-maximized="1" />
+ <metadata
+ id="metadata7">
+ <rdf:RDF>
+ <cc:Work
+ rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+ <dc:title />
+ </cc:Work>
+ </rdf:RDF>
+ </metadata>
+ <g
+ inkscape:label="Ebene 1"
+ inkscape:groupmode="layer"
+ id="layer1"
+ transform="translate(0,-952.36218)"
+ style="display:inline">
+ <path
+ style="fill:url(#linearGradient3774);fill-opacity:1;stroke:none"
+ d="m 2.875,53.84375 0,37.03125 c 0,3.497653 2.8148472,6.34375 6.3125,6.34375 l 81.8125,0 c 3.497653,0 6.3125,-2.846097 6.3125,-6.34375 l 0,-37.03125 z"
+ id="rect3000"
+ transform="translate(0,952.36218)"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="csssscc" />
+ </g>
+</svg>
diff --git a/resources/themes/unity/caption_mask.svg b/resources/themes/unity/caption_mask.svg
new file mode 100644
index 0000000..59d4801
--- /dev/null
+++ b/resources/themes/unity/caption_mask.svg
@@ -0,0 +1,153 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+ xmlns:dc="http://purl.org/dc/elements/1.1/"
+ xmlns:cc="http://creativecommons.org/ns#"
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+ xmlns:svg="http://www.w3.org/2000/svg"
+ xmlns="http://www.w3.org/2000/svg"
+ xmlns:xlink="http://www.w3.org/1999/xlink"
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+ width="100"
+ height="100"
+ id="svg2"
+ version="1.1"
+ inkscape:version="0.48.2 r9819"
+ sodipodi:docname="caption_mask.svg">
+ <defs
+ id="defs4">
+ <linearGradient
+ inkscape:collect="always"
+ id="linearGradient2997">
+ <stop
+ style="stop-color:#000000;stop-opacity:0"
+ offset="0"
+ id="stop2999" />
+ <stop
+ style="stop-color:#000000;stop-opacity:1"
+ offset="1"
+ id="stop3001" />
+ </linearGradient>
+ <linearGradient
+ inkscape:collect="always"
+ id="linearGradient3785">
+ <stop
+ style="stop-color:#abab9f;stop-opacity:1"
+ offset="0"
+ id="stop3787" />
+ <stop
+ id="stop3797"
+ offset="0.29400957"
+ style="stop-color:#c2c2bb;stop-opacity:1" />
+ <stop
+ style="stop-color:#d3d3d2;stop-opacity:1"
+ offset="1"
+ id="stop3789" />
+ </linearGradient>
+ <linearGradient
+ inkscape:collect="always"
+ id="linearGradient3009">
+ <stop
+ style="stop-color:#fafcfc;stop-opacity:1"
+ offset="0"
+ id="stop3011" />
+ <stop
+ id="stop3795"
+ offset="0.95082122"
+ style="stop-color:#e5e8e8;stop-opacity:1;" />
+ <stop
+ style="stop-color:#d2d6d6;stop-opacity:1"
+ offset="1"
+ id="stop3013" />
+ </linearGradient>
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient3785"
+ id="linearGradient3791"
+ x1="44.385059"
+ y1="958.93121"
+ x2="44.385059"
+ y2="1045.9142"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(0.59160385,0,0,0.59160385,20.456735,409.35291)" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient3009"
+ id="linearGradient3793"
+ x1="51.33149"
+ y1="958.94989"
+ x2="51.33149"
+ y2="1045.7374"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(0.59160385,0,0,0.59160385,20.456735,409.35291)" />
+ <filter
+ inkscape:collect="always"
+ id="filter3921"
+ x="-0.28370607"
+ width="1.5674121"
+ y="-0.28370607"
+ height="1.5674121">
+ <feGaussianBlur
+ inkscape:collect="always"
+ stdDeviation="9.4292716"
+ id="feGaussianBlur3923" />
+ </filter>
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient2997"
+ id="linearGradient3773"
+ x1="52.830833"
+ y1="1031.3591"
+ x2="52.830833"
+ y2="1010.1867"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="translate(-7.1765038e-7,-5.2013983e-6)" />
+ </defs>
+ <sodipodi:namedview
+ id="base"
+ pagecolor="#000000"
+ bordercolor="#666666"
+ borderopacity="1.0"
+ inkscape:pageopacity="0"
+ inkscape:pageshadow="2"
+ inkscape:zoom="5.6"
+ inkscape:cx="20.693791"
+ inkscape:cy="49.374216"
+ inkscape:document-units="px"
+ inkscape:current-layer="layer1"
+ showgrid="false"
+ inkscape:showpageshadow="false"
+ inkscape:window-width="1517"
+ inkscape:window-height="834"
+ inkscape:window-x="335"
+ inkscape:window-y="111"
+ inkscape:window-maximized="0" />
+ <metadata
+ id="metadata7">
+ <rdf:RDF>
+ <cc:Work
+ rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+ <dc:title />
+ </cc:Work>
+ </rdf:RDF>
+ </metadata>
+ <g
+ inkscape:label="Ebene 1"
+ inkscape:groupmode="layer"
+ id="layer1"
+ transform="translate(0,-952.36218)"
+ style="display:inline">
+ <rect
+ y="952.63806"
+ x="0.38571933"
+ height="99.409401"
+ width="99.409401"
+ id="rect3799"
+ style="fill:url(#linearGradient3773);fill-opacity:1;stroke:none" />
+ </g>
+</svg>
diff --git a/resources/themes/unity/theme.xml b/resources/themes/unity/theme.xml
index a38c815..3e9f3d1 100644
--- a/resources/themes/unity/theme.xml
+++ b/resources/themes/unity/theme.xml
@@ -15,12 +15,16 @@
<activeSlice>
<slice_layer type="file" file="icon_active.svg" scale="1" colorize="true" />
<slice_layer type="file" file="gloss.svg" scale="1" colorize="false" />
- <slice_layer type="icon" scale="0.9" colorize="false" />
+ <slice_layer type="icon" scale="0.9" colorize="false" file="caption_mask.svg" visibility="with_caption" />
+ <slice_layer type="icon" scale="0.9" colorize="false" visibility="without_caption" />
+ <slice_layer type="caption" y="21" font="sans 9" color="#000" width="55" height="20" visibility="with_caption" />
</activeSlice>
<inactiveSlice>
<slice_layer type="file" file="icon_inactive.svg" scale="1" colorize="false" />
<slice_layer type="file" file="gloss.svg" scale="1" colorize="false" />
<slice_layer type="icon" scale="0.9" colorize="false" />
+ <slice_layer type="file" file="caption.svg" scale="1" colorize="false" visibility="with_caption" />
+ <slice_layer type="caption" y="21" font="sans 9" color="#fff" width="55" height="20" visibility="with_caption" />
</inactiveSlice>
</slices>
<caption position="0" font="sans 10" width="90" height="90" />
diff --git a/resources/ui/settings.ui b/resources/ui/settings.ui
index 889124a..77e3403 100644
--- a/resources/ui/settings.ui
+++ b/resources/ui/settings.ui
@@ -107,6 +107,62 @@
<property name="position">1</property>
</packing>
</child>
+ </object>
+ </child>
+ </object>
+ </child>
+ <child type="label">
+ <object class="GtkLabel" id="label3">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Behavior</property>
+ <attributes>
+ <attribute name="weight" value="bold"/>
+ </attributes>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkFrame" id="frame1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label_xalign">0</property>
+ <property name="shadow_type">in</property>
+ <child>
+ <object class="GtkAlignment" id="alignment1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="top_padding">6</property>
+ <property name="bottom_padding">6</property>
+ <property name="left_padding">6</property>
+ <property name="right_padding">6</property>
+ <child>
+ <object class="GtkVBox" id="vbox1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">6</property>
+ <child>
+ <object class="GtkScrolledWindow" id="theme-scrolledwindow">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="hscrollbar_policy">never</property>
+ <property name="shadow_type">in</property>
+ <child>
+ <placeholder/>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
<child>
<object class="GtkHBox" id="hbox1">
<property name="visible">True</property>
@@ -143,7 +199,26 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">3</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkCheckButton" id="captions-checkbox">
+ <property name="label" translatable="yes">Display Slice labels</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="has_tooltip">True</property>
+ <property name="tooltip_markup" translatable="yes">Displays the name of each Slice next to it. Only available if supported by the theme.</property>
+ <property name="tooltip_text" translatable="yes">Displays the name of each Slice next to it. Only available if supported by the theme.</property>
+ <property name="use_action_appearance">False</property>
+ <property name="xalign">0</property>
+ <property name="draw_indicator">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">2</property>
</packing>
</child>
</object>
@@ -151,10 +226,10 @@
</object>
</child>
<child type="label">
- <object class="GtkLabel" id="label3">
+ <object class="GtkLabel" id="label2">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Appearance and behavior</property>
+ <property name="label" translatable="yes">Appearance</property>
<attributes>
<attribute name="weight" value="bold"/>
</attributes>
@@ -162,25 +237,9 @@
</child>
</object>
<packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkScrolledWindow" id="theme-scrolledwindow">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="hscrollbar_policy">never</property>
- <property name="shadow_type">in</property>
- <child>
- <placeholder/>
- </child>
- </object>
- <packing>
<property name="expand">True</property>
<property name="fill">True</property>
- <property name="position">1</property>
+ <property name="position">4</property>
</packing>
</child>
</object>
diff --git a/src/actionGroups/devicesGroup.vala b/src/actionGroups/devicesGroup.vala
index dee6a6e..d3892fe 100644
--- a/src/actionGroups/devicesGroup.vala
+++ b/src/actionGroups/devicesGroup.vala
@@ -87,17 +87,9 @@ public class DevicesGroup : ActionGroup {
// add all other devices
foreach(var mount in this.monitor.get_mounts()) {
// get icon
- var icon_names = mount.get_icon().to_string().split(" ");
+ var icon = mount.get_icon();
- string icon = "";
- foreach (var icon_name in icon_names) {
- if (Gtk.IconTheme.get_default().has_icon(icon_name)) {
- icon = icon_name;
- break;
- }
- }
-
- this.add_action(new UriAction(mount.get_name(), icon, mount.get_root().get_uri()));
+ this.add_action(new UriAction(mount.get_name(), Icon.get_icon_name(icon), mount.get_root().get_uri()));
}
}
diff --git a/src/actionGroups/menuGroup.vala b/src/actionGroups/menuGroup.vala
index 247376d..26a2662 100644
--- a/src/actionGroups/menuGroup.vala
+++ b/src/actionGroups/menuGroup.vala
@@ -131,18 +131,11 @@ public class MenuGroup : ActionGroup {
if (type == GMenu.TreeItemType.DIRECTORY && !item.get_directory().get_is_nodisplay()) {
// create a MenuGroup for sub menus
- string[] icons = item.get_directory().get_icon().to_string().split(" ");
- string final_icon = "application-default-icon";
- // search for available icons
- foreach (var icon in icons) {
- if (Gtk.IconTheme.get_default().has_icon(icon)) {
- final_icon = icon;
- break;
- }
- }
-
- var sub_menu = PieManager.create_dynamic_pie(item.get_directory().get_name(), final_icon);
+ // get icon
+ var icon = item.get_directory().get_icon();
+
+ var sub_menu = PieManager.create_dynamic_pie(item.get_directory().get_name(), Icon.get_icon_name(icon));
var group = new MenuGroup.sub_menu(sub_menu.id);
group.add_action(new PieAction(parent_id, true));
group.load_contents(item.get_directory(), sub_menu.id);
diff --git a/src/actions/actionRegistry.vala b/src/actions/actionRegistry.vala
index 135e90c..705c06c 100644
--- a/src/actions/actionRegistry.vala
+++ b/src/actions/actionRegistry.vala
@@ -137,15 +137,8 @@ public class ActionRegistry : GLib.Object {
return new_for_desktop_file(file.get_parse_name());
// search for an appropriate icon
- var gicon = info.get_icon();
- string[] icons = gicon.to_string().split(" ");
-
- foreach (var icon in icons) {
- if (Gtk.IconTheme.get_default().has_icon(icon)) {
- final_icon = icon;
- break;
- }
- }
+ var icon = info.get_icon();
+ final_icon = Icon.get_icon_name(icon);
} catch (GLib.Error e) {
warning(e.message);
@@ -167,19 +160,11 @@ public class ActionRegistry : GLib.Object {
/// A helper method which creates an AppAction for given AppInfo.
/////////////////////////////////////////////////////////////////////
- public static Action? new_for_app_info(GLib.AppInfo info) {
- string[] icons = info.get_icon().to_string().split(" ");
- string final_icon = "application-default-icon";
-
- // search for available icons
- foreach (var icon in icons) {
- if (Gtk.IconTheme.get_default().has_icon(icon)) {
- final_icon = icon;
- break;
- }
- }
+ public static Action? new_for_app_info(GLib.AppInfo info) {
+ // get icon
+ var icon = info.get_icon();
- return new AppAction(info.get_display_name() , final_icon, info.get_commandline());
+ return new AppAction(info.get_display_name(), Icon.get_icon_name(icon), info.get_commandline());
}
/////////////////////////////////////////////////////////////////////
diff --git a/src/actions/pieAction.vala b/src/actions/pieAction.vala
index 5b2c81d..faf7aca 100644
--- a/src/actions/pieAction.vala
+++ b/src/actions/pieAction.vala
@@ -58,13 +58,17 @@ public class PieAction : Action {
public override string name {
get {
var referee = PieManager.all_pies[real_command];
- if (referee != null)
- return referee.name;
+ if (referee != null) {
+ owned_name = "↪" + referee.name;
+ return owned_name;
+ }
return "";
}
protected set {}
}
+ private string owned_name;
+
/////////////////////////////////////////////////////////////////////
/// Returns the icon of the referenced Pie.
/////////////////////////////////////////////////////////////////////
@@ -92,7 +96,7 @@ public class PieAction : Action {
/////////////////////////////////////////////////////////////////////
public override void activate() {
- PieManager.open_pie(real_command);
+ PieManager.open_pie(real_command, true);
}
}
diff --git a/src/deamon.vala b/src/deamon.vala
index ceecf1b..b622028 100644
--- a/src/deamon.vala
+++ b/src/deamon.vala
@@ -24,16 +24,26 @@ namespace GnomePie {
/////////////////////////////////////////////////////////////////////////
public class Deamon : GLib.Object {
+
+ /////////////////////////////////////////////////////////////////////
+ /// The current version of Gnome-Pie
+ /////////////////////////////////////////////////////////////////////
+
+ public static string version;
/////////////////////////////////////////////////////////////////////
/// The beginning of everything.
/////////////////////////////////////////////////////////////////////
public static int main(string[] args) {
+ version = "0.5.1";
+
Logger.init();
Gdk.threads_init();
Gtk.init(ref args);
Paths.init();
+
+ message("Welcome to Gnome-Pie " + version + "!");
// create the Deamon and run it
var deamon = new GnomePie.Deamon();
@@ -90,6 +100,9 @@ public class Deamon : GLib.Object {
message("Removed file \"%s\"", Paths.pie_config);
if (GLib.FileUtils.remove(Paths.settings) == 0)
message("Removed file \"%s\"", Paths.settings);
+
+ Logger.stats("LAUNCH RESET");
+
return;
}
@@ -107,11 +120,17 @@ public class Deamon : GLib.Object {
var data = new Unique.MessageData();
data.set_text(open_pie, open_pie.length);
app.send_message(Unique.Command.ACTIVATE, data);
+
+ Logger.stats("LAUNCH PIE " + open_pie);
+
return;
}
message("Gnome-Pie is already running. Sending request to open config menu.");
app.send_message(Unique.Command.ACTIVATE, null);
+
+ Logger.stats("LAUNCH CONFIG");
+
return;
}
@@ -139,7 +158,6 @@ public class Deamon : GLib.Object {
PieManager.init();
Icon.init();
- ThemedIcon.init();
// launch the indicator
this.indicator = new Indicator();
@@ -150,6 +168,7 @@ public class Deamon : GLib.Object {
// finished loading... so run the prog!
message("Started happily...");
+ Logger.stats("LAUNCH " + version);
// open pie if neccessary
if (open_pie != null) PieManager.open_pie(open_pie);
diff --git a/src/gui/aboutWindow.vala b/src/gui/aboutWindow.vala
index 2df8c46..6c5820b 100644
--- a/src/gui/aboutWindow.vala
+++ b/src/gui/aboutWindow.vala
@@ -42,7 +42,8 @@ public class AboutWindow: Gtk.AboutDialog {
"Magnun Leno <magnun@codecommunity.org> (PT-BR)",
"Kim Boram <Boramism@gmail.com> (KO)",
"Eduardo Anabalon <lalo1412@gmail.com> (ES)",
- "Gregoire Bellon-Gervais <greggbg@gmail.com> (FR)",
+ "Grégoire Bellon-Gervais <greggbg@gmail.com> (FR)",
+ "Alex Maxime <cad.maxime@gmail.com> (FR)",
"Eugene Roskin <pams@imail.ru> (RU)"
};
@@ -68,7 +69,7 @@ public class AboutWindow: Gtk.AboutDialog {
logo_icon_name: "gnome-pie",
website: "http://www.simonschneegans.de/?page_id=12",
website_label: "www.gnome-pie.simonschneegans.de",
- version: "0.4.2"
+ version: Deamon.version
);
}
}
diff --git a/src/gui/newSliceWindow.vala b/src/gui/newSliceWindow.vala
index 7bd6340..ade6432 100644
--- a/src/gui/newSliceWindow.vala
+++ b/src/gui/newSliceWindow.vala
@@ -258,6 +258,7 @@ public class NewSliceWindow : GLib.Object {
break;
case "key":
this.current_custom_icon = action.icon;
+ this.current_hotkey = action.real_command;
this.key_select.set_trigger(new Trigger.from_string(action.real_command));
break;
case "pie":
diff --git a/src/gui/piePreview.vala b/src/gui/piePreview.vala
index 5745fcb..4963bb2 100644
--- a/src/gui/piePreview.vala
+++ b/src/gui/piePreview.vala
@@ -111,6 +111,9 @@ class PiePreview : Gtk.DrawingArea {
this.new_slice_window.on_select.connect((new_action, as_new_slice, at_position) => {
var pie = PieManager.all_pies[this.current_id];
+ debug(new_action.actions[0].name);
+ debug(new_action.actions[0].real_command);
+
if (new_action.has_quickaction())
renderer.disable_quickactions();
diff --git a/src/gui/settingsWindow.vala b/src/gui/settingsWindow.vala
index 1eaa0b4..0e7af20 100644
--- a/src/gui/settingsWindow.vala
+++ b/src/gui/settingsWindow.vala
@@ -32,6 +32,7 @@ public class SettingsWindow : GLib.Object {
private ThemeList? theme_list = null;
private Gtk.ToggleButton? indicator = null;
private Gtk.ToggleButton? autostart = null;
+ private Gtk.ToggleButton? captions = null;
/////////////////////////////////////////////////////////////////////
/// C'tor creates, the dialog.
@@ -47,6 +48,14 @@ public class SettingsWindow : GLib.Object {
this.window = builder.get_object("window") as Gtk.Dialog;
this.theme_list = new ThemeList();
+ this.theme_list.on_select_new.connect(() => {
+ this.captions.active = Config.global.show_captions;
+ if (Config.global.theme.has_slice_captions) {
+ this.captions.sensitive = true;
+ } else {
+ this.captions.sensitive = false;
+ }
+ });
var scroll_area = builder.get_object("theme-scrolledwindow") as Gtk.ScrolledWindow;
scroll_area.add(this.theme_list);
@@ -59,6 +68,9 @@ public class SettingsWindow : GLib.Object {
this.indicator = (builder.get_object("indicator-checkbox") as Gtk.ToggleButton);
this.indicator.toggled.connect(on_indicator_toggled);
+ this.captions = (builder.get_object("captions-checkbox") as Gtk.ToggleButton);
+ this.captions.toggled.connect(on_captions_toggled);
+
var scale_slider = (builder.get_object("scale-hscale") as Gtk.HScale);
scale_slider.set_range(0.5, 2.0);
scale_slider.set_increments(0.05, 0.25);
@@ -108,8 +120,15 @@ public class SettingsWindow : GLib.Object {
public void show() {
this.indicator.active = Config.global.show_indicator;
- this.autostart.active = Config.global.auto_start;
-
+ this.autostart.active = Config.global.auto_start;
+ this.captions.active = Config.global.show_captions;
+
+ if (Config.global.theme.has_slice_captions) {
+ this.captions.sensitive = true;
+ } else {
+ this.captions.sensitive = false;
+ }
+
this.window.show_all();
}
@@ -119,6 +138,12 @@ public class SettingsWindow : GLib.Object {
private void on_close_button_clicked() {
this.window.hide();
+
+ Logger.stats("SETTINGS " + Config.global.theme.name +
+ (this.indicator.active ? " INDICATOR" : "") +
+ (this.autostart.active ? " AUTOSTART" : "") +
+ (this.captions.active ? " CAPTIONS" : "") +
+ " %f".printf(Config.global.global_scale));
}
/////////////////////////////////////////////////////////////////////
@@ -169,6 +194,15 @@ public class SettingsWindow : GLib.Object {
var check = check_box as Gtk.CheckButton;
Config.global.show_indicator = check.active;
}
+
+ /////////////////////////////////////////////////////////////////////
+ /// Shows or hides the captions of Slices.
+ /////////////////////////////////////////////////////////////////////
+
+ private void on_captions_toggled(Gtk.ToggleButton check_box) {
+ var check = check_box as Gtk.CheckButton;
+ Config.global.show_captions = check.active;
+ }
}
}
diff --git a/src/gui/themeList.vala b/src/gui/themeList.vala
index 7aaecc6..1c038a9 100644
--- a/src/gui/themeList.vala
+++ b/src/gui/themeList.vala
@@ -24,6 +24,15 @@ namespace GnomePie {
class ThemeList : Gtk.TreeView {
/////////////////////////////////////////////////////////////////////
+ /// This signal gets emitted, when a new theme is selected by the
+ /// user. This new theme is applied automatically, with this signal
+ /// actions may be triggered which should be executed AFTER the
+ /// change to a new theme.
+ /////////////////////////////////////////////////////////////////////
+
+ public signal void on_select_new();
+
+ /////////////////////////////////////////////////////////////////////
/// The currently selected row.
/////////////////////////////////////////////////////////////////////
@@ -69,6 +78,9 @@ class ThemeList : Gtk.TreeView {
Timeout.add(10, () => {
int index = int.parse(data.get_path(active).to_string());
Config.global.theme = Config.global.themes[index];
+
+ this.on_select_new();
+
Config.global.theme.load();
Config.global.theme.load_images();
return false;
diff --git a/src/gui/triggerSelectButton.vala b/src/gui/triggerSelectButton.vala
index eeb37e2..fd8505a 100644
--- a/src/gui/triggerSelectButton.vala
+++ b/src/gui/triggerSelectButton.vala
@@ -132,8 +132,8 @@ public class TriggerSelectButton : Gtk.ToggleButton {
if (this.active) {
Gtk.Allocation rect;
this.get_allocation(out rect);
- if (event.x < rect.x || event.x > rect.x + rect.width
- || event.y < rect.y || event.y > rect.y + rect.height) {
+ if (event.x < 0 || event.x > rect.width
+ || event.y < 0 || event.y > rect.height) {
this.cancel();
return true;
diff --git a/src/images/icon.vala b/src/images/icon.vala
index 81eb2d9..e942e7c 100644
--- a/src/images/icon.vala
+++ b/src/images/icon.vala
@@ -75,6 +75,24 @@ public class Icon : Image {
}
/////////////////////////////////////////////////////////////////////
+ /// Returns the icon name for a given GLib.Icon.
+ /////////////////////////////////////////////////////////////////////
+
+ public static string get_icon_name(GLib.Icon? icon) {
+ if (icon != null) {
+ var icon_names = icon.to_string().split(" ");
+
+ foreach (var icon_name in icon_names) {
+ if (Gtk.IconTheme.get_default().has_icon(icon_name)) {
+ return icon_name;
+ }
+ }
+ }
+
+ return "";
+ }
+
+ /////////////////////////////////////////////////////////////////////
/// Returns the filename for a given system icon.
/////////////////////////////////////////////////////////////////////
diff --git a/src/images/renderedText.vala b/src/images/renderedText.vala
index 41146d6..e99d26a 100644
--- a/src/images/renderedText.vala
+++ b/src/images/renderedText.vala
@@ -50,39 +50,60 @@ public class RenderedText : Image {
public void render_text(string text, int width, int height, string font,
Color color, double scale) {
-
+
this.surface = new Cairo.ImageSurface(Cairo.Format.ARGB32, width, height);
- var ctx = this.context();
-
- // set the color
- ctx.set_source_rgb(color.r, color.g, color.g);
-
- var layout = Pango.cairo_create_layout(ctx);
- layout.set_width(Pango.units_from_double(width));
-
- var font_description = Pango.FontDescription.from_string(font);
- font_description.set_size((int)(font_description.get_size() * scale));
-
- layout.set_font_description(font_description);
- layout.set_text(text, -1);
-
- // add newlines at the end of each line, in order to allow ellipsizing
- string broken_string = "";
- foreach (var line in layout.get_lines()) {
- broken_string = broken_string.concat(text.substring(line.start_index, line.length), "\n");
+ if (text != "") {
+
+ var ctx = this.context();
+
+ // set the color
+ ctx.set_source_rgb(color.r, color.g, color.g);
+
+ var layout = Pango.cairo_create_layout(ctx);
+ layout.set_width(Pango.units_from_double(width));
+
+ var font_description = Pango.FontDescription.from_string(font);
+ font_description.set_size((int)(font_description.get_size() * scale));
+
+ layout.set_font_description(font_description);
+ layout.set_text(text, -1);
+
+ // add newlines at the end of each line, in order to allow ellipsizing
+ string broken_string = "";
+ var lines = layout.get_lines().copy();
+
+ foreach (var line in lines) {
+
+ string next_line = text.substring(line.start_index, line.length);
+
+ if (broken_string == "") {
+ broken_string = next_line;
+ } else if (next_line != "") {
+ // test whether the addition of a line would cause the height to become too large
+ string broken_string_tmp = broken_string + "\n" + next_line;
+
+ layout.set_text(broken_string_tmp, -1);
+ Pango.Rectangle extents;
+ layout.get_pixel_extents(null, out extents);
+
+ if (extents.height > height) broken_string = broken_string + next_line;
+ else broken_string = broken_string_tmp;
+ }
+ }
+
+ layout.set_text(broken_string, -1);
+
+ layout.set_ellipsize(Pango.EllipsizeMode.END);
+ layout.set_alignment(Pango.Alignment.CENTER);
+
+ Pango.Rectangle extents;
+ layout.get_pixel_extents(null, out extents);
+ ctx.move_to(0, (int)(0.5*(height - extents.height)));
+
+ Pango.cairo_update_layout(ctx, layout);
+ Pango.cairo_show_layout(ctx, layout);
}
- layout.set_text(broken_string, broken_string.length-1);
-
- layout.set_ellipsize(Pango.EllipsizeMode.END);
- layout.set_alignment(Pango.Alignment.CENTER);
-
- Pango.Rectangle extents;
- layout.get_pixel_extents(null, out extents);
- ctx.move_to(0, (int)(0.5*(height - extents.height)));
-
- Pango.cairo_update_layout(ctx, layout);
- Pango.cairo_show_layout(ctx, layout);
}
/////////////////////////////////////////////////////////////////////
diff --git a/src/images/themedIcon.vala b/src/images/themedIcon.vala
index 6c904a6..f816e0f 100644
--- a/src/images/themedIcon.vala
+++ b/src/images/themedIcon.vala
@@ -23,54 +23,12 @@ namespace GnomePie {
/////////////////////////////////////////////////////////////////////////
public class ThemedIcon : Image {
-
- /////////////////////////////////////////////////////////////////////
- /// A cache which stores loaded icon. The key is the icon name. When
- /// the users icon theme or the theme of Gnome-Pie changes, these
- /// cahces are cleared.
- /////////////////////////////////////////////////////////////////////
-
- private static Gee.HashMap<string, Cairo.ImageSurface?> active_cache { private get; private set; }
- private static Gee.HashMap<string, Cairo.ImageSurface?> inactive_cache { private get; private set; }
-
- /////////////////////////////////////////////////////////////////////
- /// Initializes the caches.
- /////////////////////////////////////////////////////////////////////
-
- public static void init() {
- clear_cache();
-
- Config.global.notify["theme"].connect(() => {
- clear_cache();
- });
-
- Gtk.IconTheme.get_default().changed.connect(() => {
- clear_cache();
- });
- }
-
- /////////////////////////////////////////////////////////////////////
- /// Clears the cache.
- /////////////////////////////////////////////////////////////////////
-
- public static void clear_cache() {
- active_cache = new Gee.HashMap<string, Cairo.ImageSurface?>();
- inactive_cache = new Gee.HashMap<string, Cairo.ImageSurface?>();
- }
/////////////////////////////////////////////////////////////////////
/// Paint a slice icon according to the current theme.
/////////////////////////////////////////////////////////////////////
- public ThemedIcon(string icon_name, bool active) {
- // check cache
- var current_cache = active ? active_cache : inactive_cache;
- var cached = current_cache.get(icon_name);
-
- if (cached != null) {
- this.surface = cached;
- return;
- }
+ public ThemedIcon(string caption, string icon_name, bool active) {
// get layers for the desired slice type
var layers = active ? Config.global.theme.active_slice_layers : Config.global.theme.inactive_slice_layers;
@@ -78,7 +36,8 @@ public class ThemedIcon : Image {
// get max size
int size = 1;
foreach (var layer in layers) {
- if (layer.image.width() > size) size = layer.image.width();
+ if (layer.image != null && layer.image.width() > size)
+ size = layer.image.width();
}
this.surface = new Cairo.ImageSurface(Cairo.Format.ARGB32, size, size);
@@ -86,7 +45,8 @@ public class ThemedIcon : Image {
// get size of icon layer
int icon_size = size;
foreach (var layer in layers) {
- if (layer.is_icon) icon_size = layer.image.width();
+ if (layer.image != null && layer.layer_type == SliceLayer.Type.ICON)
+ icon_size = layer.image.width();
}
Image icon;
@@ -104,49 +64,54 @@ public class ThemedIcon : Image {
// now render all layers on top of each other
foreach (var layer in layers) {
- if (layer.colorize) {
- ctx.push_group();
- }
-
- if (layer.is_icon) {
+ if (layer.visibility == SliceLayer.Visibility.ANY ||
+ (Config.global.show_captions == (layer.visibility == SliceLayer.Visibility.WITH_CAPTION))) {
- ctx.push_group();
-
- layer.image.paint_on(ctx);
-
- ctx.set_operator(Cairo.Operator.IN);
-
- if (layer.image.width() != icon_size) {
- if (icon_name.contains("/"))
- icon = new Image.from_file_at_size(icon_name, layer.image.width(), layer.image.width());
- else
- icon = new Icon(icon_name,layer.image.width());
+ if (layer.colorize) {
+ ctx.push_group();
}
-
- icon.paint_on(ctx);
+
+ if (layer.layer_type == SliceLayer.Type.ICON) {
+ ctx.push_group();
+
+ layer.image.paint_on(ctx);
+
+ ctx.set_operator(Cairo.Operator.IN);
+
+ if (layer.image.width() != icon_size) {
+ if (icon_name.contains("/"))
+ icon = new Image.from_file_at_size(icon_name, layer.image.width(), layer.image.width());
+ else
+ icon = new Icon(icon_name,layer.image.width());
+ }
+
+ icon.paint_on(ctx);
- ctx.pop_group_to_source();
- ctx.paint();
- ctx.set_operator(Cairo.Operator.OVER);
-
- } else {
- layer.image.paint_on(ctx);
- }
-
- // colorize the whole layer if neccasary
- if (layer.colorize) {
- ctx.set_operator(Cairo.Operator.ATOP);
- ctx.set_source_rgb(color.r, color.g, color.b);
- ctx.paint();
+ ctx.pop_group_to_source();
+ ctx.paint();
+ ctx.set_operator(Cairo.Operator.OVER);
+
+ } 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);
+ text.paint_on(ctx);
+ ctx.translate(0, -layer.position);
+ } else if (layer.layer_type == SliceLayer.Type.FILE) {
+ layer.image.paint_on(ctx);
+ }
- ctx.set_operator(Cairo.Operator.OVER);
- ctx.pop_group_to_source();
- ctx.paint();
+ // colorize the whole layer if neccasary
+ if (layer.colorize) {
+ ctx.set_operator(Cairo.Operator.ATOP);
+ ctx.set_source_rgb(color.r, color.g, color.b);
+ ctx.paint();
+
+ ctx.set_operator(Cairo.Operator.OVER);
+ ctx.pop_group_to_source();
+ ctx.paint();
+ }
}
}
-
- // store the surface in cache
- current_cache.set(icon_name, this.surface);
}
/////////////////////////////////////////////////////////////////////
diff --git a/src/pies/load.vala b/src/pies/load.vala
index b606cf5..4a9274d 100644
--- a/src/pies/load.vala
+++ b/src/pies/load.vala
@@ -36,6 +36,8 @@ namespace Pies {
Pies.create_default_config();
return;
}
+
+ message("Loading Pies from \"" + Paths.pie_config + "\".");
// load the settings file
Xml.Parser.init();
diff --git a/src/pies/pieManager.vala b/src/pies/pieManager.vala
index 162a61f..85d8a14 100644
--- a/src/pies/pieManager.vala
+++ b/src/pies/pieManager.vala
@@ -52,6 +52,14 @@ public class PieManager : GLib.Object {
private static bool a_pie_is_active = false;
/////////////////////////////////////////////////////////////////////
+ /// Storing the position of the last Pie. Used for subpies, which are
+ /// opened at their parents location.
+ /////////////////////////////////////////////////////////////////////
+
+ private static int last_x = 0;
+ private static int last_y = 0;
+
+ /////////////////////////////////////////////////////////////////////
/// Initializes all Pies. They are loaded from the pies.conf file.
/////////////////////////////////////////////////////////////////////
@@ -73,28 +81,35 @@ public class PieManager : GLib.Object {
/// Opens the Pie with the given ID, if it exists.
/////////////////////////////////////////////////////////////////////
- public static void open_pie(string id) {
+ public static void open_pie(string id, bool at_last_position = false) {
if (!a_pie_is_active) {
Pie? pie = all_pies[id];
if (pie != null) {
+ Logger.stats("OPEN " + id);
+
a_pie_is_active = true;
var window = new PieWindow();
window.load_pie(pie);
- window.open();
+
+ if (at_last_position) {
+ window.open_at(last_x, last_y);
+ } else {
+ window.open();
+ }
opened_windows.add(window);
window.on_closed.connect(() => {
opened_windows.remove(window);
if (opened_windows.size == 0) {
- ThemedIcon.clear_cache();
Icon.clear_cache();
}
});
window.on_closing.connect(() => {
+ window.get_center_pos(out last_x, out last_y);
a_pie_is_active = false;
});
diff --git a/src/pies/save.vala b/src/pies/save.vala
index c940e5a..aadc7c8 100644
--- a/src/pies/save.vala
+++ b/src/pies/save.vala
@@ -30,6 +30,11 @@ namespace Pies {
/////////////////////////////////////////////////////////////////////
public void save() {
+ message("Saving Pies to \"" + Paths.pie_config + "\".");
+
+ // log pie statistics
+ string pie_line = "PIES";
+
// initializes the XML-Writer
var writer = new Xml.TextWriter.filename(Paths.pie_config);
writer.set_indent(true);
@@ -42,6 +47,8 @@ namespace Pies {
// if it's no dynamically created Pie
if (pie.id.length == 3) {
+ int slice_count = 0;
+
// write all attributes of the Pie
writer.start_element("pie");
writer.write_attribute("name", pie.name);
@@ -63,18 +70,26 @@ namespace Pies {
writer.write_attribute("command", action.real_command);
writer.write_attribute("quickAction", action.is_quickaction ? "true" : "false");
writer.end_element();
+
+ ++ slice_count;
}
} else {
writer.start_element("group");
writer.write_attribute("type", GroupRegistry.descriptions[group.get_type().name()].id);
writer.end_element();
+
+ slice_count += group.actions.size;
}
}
writer.end_element();
+
+ pie_line += " " + pie.id + "(%d)".printf(slice_count);
}
}
writer.end_element();
writer.end_document();
+
+ Logger.stats(pie_line);
}
}
diff --git a/src/renderers/pieRenderer.vala b/src/renderers/pieRenderer.vala
index 67a6b56..09c5f7a 100644
--- a/src/renderers/pieRenderer.vala
+++ b/src/renderers/pieRenderer.vala
@@ -58,23 +58,23 @@ public class PieRenderer : GLib.Object {
public bool turbo_mode { get; private set; default=false; }
/////////////////////////////////////////////////////////////////////
- /// All SliceRenderers used to draw this Pie.
+ /// True if the pie is currently navigated with the keyboard. This is
+ /// set to false as soon as the mouse moves.
/////////////////////////////////////////////////////////////////////
- private Gee.ArrayList<SliceRenderer?> slices;
+ public bool key_board_control { get; set; default=false; }
/////////////////////////////////////////////////////////////////////
- /// The renderer for the center of this pie.
+ /// All SliceRenderers used to draw this Pie.
/////////////////////////////////////////////////////////////////////
- private CenterRenderer center;
+ private Gee.ArrayList<SliceRenderer?> slices;
/////////////////////////////////////////////////////////////////////
- /// True if the pie is currently navigated with the keyboard. This is
- /// set to false as soon as the mouse moves.
+ /// The renderer for the center of this pie.
/////////////////////////////////////////////////////////////////////
- private bool key_board_control = false;
+ private CenterRenderer center;
/////////////////////////////////////////////////////////////////////
/// C'tor, initializes members.
@@ -130,9 +130,21 @@ public class PieRenderer : GLib.Object {
/////////////////////////////////////////////////////////////////////
public void activate() {
- if (this.active_slice >= 0 && this.active_slice < this.slices.size)
+ if (this.active_slice >= 0 && this.active_slice < this.slices.size) {
slices[active_slice].activate();
- this.cancel();
+
+ if (this.active_slice == this.quickaction)
+ Logger.stats("ACTIVATE QUICKACTION %d".printf(this.active_slice));
+ else
+ Logger.stats("ACTIVATE %d".printf(this.active_slice));
+ } else {
+ Logger.stats("CANCEL");
+ }
+
+ foreach (var slice in this.slices)
+ slice.fade_out();
+
+ center.fade_out();
}
/////////////////////////////////////////////////////////////////////
@@ -144,6 +156,8 @@ public class PieRenderer : GLib.Object {
slice.fade_out();
center.fade_out();
+
+ Logger.stats("CANCEL");
}
/////////////////////////////////////////////////////////////////////
@@ -161,6 +175,8 @@ public class PieRenderer : GLib.Object {
this.set_highlighted_slice(this.active_slice+1);
else if (this.active_slice != top)
this.set_highlighted_slice((this.active_slice-1+this.slice_count())%this.slice_count());
+
+ this.key_board_control = true;
}
/////////////////////////////////////////////////////////////////////
@@ -178,6 +194,8 @@ public class PieRenderer : GLib.Object {
this.set_highlighted_slice(this.active_slice-1);
else if (this.active_slice != bottom)
this.set_highlighted_slice((this.active_slice+1)%this.slice_count());
+
+ this.key_board_control = true;
}
/////////////////////////////////////////////////////////////////////
@@ -195,6 +213,8 @@ public class PieRenderer : GLib.Object {
this.set_highlighted_slice(this.active_slice-1);
else if (this.active_slice < left)
this.set_highlighted_slice(this.active_slice+1);
+
+ this.key_board_control = true;
}
/////////////////////////////////////////////////////////////////////
@@ -212,6 +232,8 @@ public class PieRenderer : GLib.Object {
this.set_highlighted_slice((this.active_slice+1)%this.slice_count());
else if (this.active_slice < left && this.active_slice != right)
this.set_highlighted_slice((this.active_slice-1+this.slice_count())%this.slice_count());
+
+ this.key_board_control = true;
}
/////////////////////////////////////////////////////////////////////
@@ -292,8 +314,6 @@ public class PieRenderer : GLib.Object {
foreach (var slice in this.slices)
slice.set_active_slice(active);
-
- this.key_board_control = true;
}
}
}
diff --git a/src/renderers/pieWindow.vala b/src/renderers/pieWindow.vala
index 54dd691..852a739 100644
--- a/src/renderers/pieWindow.vala
+++ b/src/renderers/pieWindow.vala
@@ -193,6 +193,28 @@ public class PieWindow : Gtk.Window {
}
/////////////////////////////////////////////////////////////////////
+ /// Opens the window at a given location.
+ /////////////////////////////////////////////////////////////////////
+
+ public void open_at(int at_x, int at_y) {
+ this.open();
+ this.move(at_x-this.width_request/2, at_y-this.height_request/2);
+ }
+
+ /////////////////////////////////////////////////////////////////////
+ /// Gets the center position of the window.
+ /////////////////////////////////////////////////////////////////////
+
+ public void get_center_pos(out int out_x, out int out_y) {
+ int x=0, y=0, width=0, height=0;
+ this.get_position(out x, out y);
+ this.get_size(out width, out height);
+
+ out_x = x + width/2;
+ out_y = y + height/2;
+ }
+
+ /////////////////////////////////////////////////////////////////////
/// Draw the Pie.
/////////////////////////////////////////////////////////////////////
@@ -303,6 +325,7 @@ public class PieWindow : Gtk.Window {
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 (this.renderer.active_slice == index) {
diff --git a/src/renderers/sliceRenderer.vala b/src/renderers/sliceRenderer.vala
index 4803070..743f13e 100644
--- a/src/renderers/sliceRenderer.vala
+++ b/src/renderers/sliceRenderer.vala
@@ -86,6 +86,7 @@ public class SliceRenderer : GLib.Object {
private AnimatedValue alpha; // for fading in/out
private AnimatedValue fade_rotation; // for fading in/out
private AnimatedValue fade_scale; // for fading in/out
+ private AnimatedValue wobble; // for organic wobbling
/////////////////////////////////////////////////////////////////////
/// C'tor, initializes all AnimatedValues.
@@ -94,9 +95,10 @@ public class SliceRenderer : GLib.Object {
public SliceRenderer(PieRenderer parent) {
this.parent = parent;
- this.fade = new AnimatedValue.linear(0.0, 0.0, Config.global.theme.transition_time);
- this.alpha = new AnimatedValue.linear(0.0, 1.0, Config.global.theme.fade_in_time);
- this.scale = new AnimatedValue.cubic(AnimatedValue.Direction.OUT,
+ this.fade = new AnimatedValue.linear(0.0, 0.0, Config.global.theme.transition_time);
+ this.wobble = new AnimatedValue.linear(0.0, 0.0, Config.global.theme.transition_time);
+ this.alpha = new AnimatedValue.linear(0.0, 1.0, Config.global.theme.fade_in_time);
+ this.scale = new AnimatedValue.cubic(AnimatedValue.Direction.OUT,
1.0/Config.global.theme.max_zoom,
1.0/Config.global.theme.max_zoom,
Config.global.theme.transition_time,
@@ -127,8 +129,8 @@ public class SliceRenderer : GLib.Object {
Config.global.theme.caption_color,
Config.global.global_scale);
- this.active_icon = new ThemedIcon(action.icon, true);
- this.inactive_icon = new ThemedIcon(action.icon, false);
+ this.active_icon = new ThemedIcon(action.name, action.icon, true);
+ this.inactive_icon = new ThemedIcon(action.name, action.icon, false);
this.color = new Color.from_icon(this.active_icon);
@@ -195,20 +197,36 @@ public class SliceRenderer : GLib.Object {
this.fade.update(frame_time);
this.fade_scale.update(frame_time);
this.fade_rotation.update(frame_time);
+ this.wobble.update(frame_time);
double direction = 2.0 * PI * position/parent.slice_count() + this.fade_rotation.val;
double max_scale = 1.0/Config.global.theme.max_zoom;
double diff = fabs(angle-direction);
-
+
if (diff > PI)
diff = 2 * PI - diff;
+
+ active = ((parent.active_slice >= 0) && (diff < PI/parent.slice_count()));
+
+ if (parent.active_slice >= 0) {
+ double wobble = Config.global.theme.wobble*diff/PI*(1-diff/PI);
+ if ((direction < angle && direction > angle - PI) || direction > PI+angle) {
+ this.wobble.reset_target(-wobble, Config.global.theme.transition_time*0.5);
+ } else {
+ this.wobble.reset_target(wobble, Config.global.theme.transition_time*0.5);
+ }
+ } else {
+ this.wobble.reset_target(0, Config.global.theme.transition_time*0.5);
+ }
+
+ direction += this.wobble.val;
if (diff < 2 * PI * Config.global.theme.zoom_range)
max_scale = (Config.global.theme.max_zoom/(diff * (Config.global.theme.max_zoom - 1)
/(2 * PI * Config.global.theme.zoom_range) + 1))
/Config.global.theme.max_zoom;
- active = ((parent.active_slice >= 0) && (diff < PI/parent.slice_count()));
+
max_scale = (parent.active_slice >= 0 ? max_scale : 1.0/Config.global.theme.max_zoom);
diff --git a/src/themes/sliceLayer.vala b/src/themes/sliceLayer.vala
index 2620912..3c650c0 100644
--- a/src/themes/sliceLayer.vala
+++ b/src/themes/sliceLayer.vala
@@ -23,31 +23,63 @@ namespace GnomePie {
/////////////////////////////////////////////////////////////////////////
public class SliceLayer : GLib.Object {
+
+ public enum Type { FILE, ICON, CAPTION }
+ public enum Visibility { ANY, WITH_CAPTION, WITHOUT_CAPTION }
+
+ public Type layer_type { get; private set; }
+ public Visibility visibility { get; private set; }
/////////////////////////////////////////////////////////////////////
/// Information on the contained image.
/////////////////////////////////////////////////////////////////////
public Image image {get; set;}
- public string icon_file {get; private set;}
+
/////////////////////////////////////////////////////////////////////
/// Properties of this layer.
/////////////////////////////////////////////////////////////////////
- public bool colorize {get; private set; }
- public bool is_icon {get; private set;}
- public int icon_size {get; private set;}
+ public string icon_file {get; private set; default="";}
+ public bool colorize {get; private set; default=false;}
+ public int icon_size {get; private set; default=1;}
+
+ 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 Color color {get; private set; default=new Color();}
/////////////////////////////////////////////////////////////////////
/// C'tor, initializes all members of the layer.
/////////////////////////////////////////////////////////////////////
- public SliceLayer(string icon_file, int icon_size, bool colorize, bool is_icon) {
+ public SliceLayer.file(string icon_file, int icon_size, bool colorize, Visibility visibility) {
+ this.layer_type = Type.FILE;
this.icon_file = icon_file;
this.colorize = colorize;
- this.is_icon = is_icon;
this.icon_size = icon_size;
+ this.visibility = visibility;
+ }
+
+ public SliceLayer.icon(string icon_file, int icon_size, bool colorize, Visibility visibility) {
+ this.layer_type = Type.ICON;
+ this.icon_file = icon_file;
+ this.colorize = colorize;
+ this.icon_size = icon_size;
+ this.visibility = visibility;
+ }
+
+ public SliceLayer.caption(string font, int width, int height, int position, Color color, bool colorize, Visibility visibility) {
+ this.layer_type = Type.CAPTION;
+ this.font = font;
+ this.width = width;
+ this.height = height;
+ this.position = position;
+ this.color = color;
+ this.visibility = visibility;
+ this.colorize = colorize;
}
/////////////////////////////////////////////////////////////////////
@@ -55,9 +87,11 @@ public class SliceLayer : GLib.Object {
/////////////////////////////////////////////////////////////////////
public void load_image() {
- if (this.icon_file == "" && this.is_icon == true)
+ this.image = null;
+
+ if (this.icon_file == "" && this.layer_type == Type.ICON)
this.image = new Image.empty(this.icon_size, this.icon_size, new Color.from_rgb(1, 1, 1));
- else
+ else if (this.icon_file != "")
this.image = new Image.from_file_at_size(this.icon_file, this.icon_size, this.icon_size);
}
}
diff --git a/src/themes/theme.vala b/src/themes/theme.vala
index 269a574..1956046 100644
--- a/src/themes/theme.vala
+++ b/src/themes/theme.vala
@@ -38,6 +38,7 @@ public class Theme : GLib.Object {
public double max_zoom {get; private set; default=1.2;}
public double zoom_range {get; private set; default=0.2;}
public double transition_time {get; private set; default=0.5;}
+ public double wobble {get; private set; default=0.0;}
public double fade_in_time {get; private set; default=0.2;}
public double fade_out_time {get; private set; default=0.1;}
public double fade_in_zoom {get; private set; default=1.0;}
@@ -49,6 +50,7 @@ public class Theme : GLib.Object {
public double active_radius {get; private set; default=45.0;}
public double slice_radius {get; private set; default=32.0;}
public double slice_gap {get; private set; default=14.0;}
+ public bool has_slice_captions {get; private set; default=false;}
public bool caption {get; private set; default=false;}
public string caption_font {get; private set; default="sans 12";}
public int caption_width {get; private set; default=100;}
@@ -182,6 +184,9 @@ public class Theme : GLib.Object {
case "transitiontime":
transition_time = double.parse(attr_content);
break;
+ case "wobble":
+ wobble = double.parse(attr_content);
+ break;
case "fadeintime":
fade_in_time = double.parse(attr_content);
break;
@@ -403,8 +408,15 @@ public class Theme : GLib.Object {
if (element_name == "slice_layer") {
string file = "";
double scale = 1.0;
- bool is_icon = false;
+ SliceLayer.Type type = SliceLayer.Type.FILE;
+ SliceLayer.Visibility visibility = SliceLayer.Visibility.ANY;
bool colorize = false;
+ string slice_caption_font = "sans 8";
+ int slice_caption_width = 50;
+ int slice_caption_height = 20;
+ int pos_x = 0;
+ int pos_y = 0;
+ Color slice_caption_color = new Color.from_rgb(1.0f, 1.0f, 1.0f);
for (Xml.Attr* attribute = layer->properties; attribute != null; attribute = attribute->next) {
string attr_name = attribute->name.down();
@@ -419,13 +431,46 @@ public class Theme : GLib.Object {
break;
case "type":
if (attr_content == "icon")
- is_icon = true;
+ type = SliceLayer.Type.ICON;
+ else if (attr_content == "caption")
+ type = SliceLayer.Type.CAPTION;
else if (attr_content != "file")
warning("Invalid attribute content " + attr_content + " for attribute " + attr_name + " in <slice_layer> element!");
break;
case "colorize":
colorize = bool.parse(attr_content);
break;
+ case "font":
+ slice_caption_font = attr_content;
+ break;
+ case "width":
+ slice_caption_width = (int)(int.parse(attr_content) * Config.global.global_scale);
+ if (slice_caption_width % 2 == 1)
+ --slice_caption_width;
+ break;
+ case "height":
+ slice_caption_height = (int)(int.parse(attr_content) * Config.global.global_scale);
+ if (slice_caption_height % 2 == 1)
+ --slice_caption_height;
+ break;
+ case "x":
+ pos_x = (int)(double.parse(attr_content) * Config.global.global_scale);
+ break;
+ case "y":
+ pos_y = (int)(double.parse(attr_content) * Config.global.global_scale);
+ break;
+ case "color":
+ slice_caption_color = new Color.from_string(attr_content);
+ break;
+ case "visibility":
+ if (attr_content == "without_caption")
+ visibility = SliceLayer.Visibility.WITHOUT_CAPTION;
+ else if (attr_content == "with_caption") {
+ this.has_slice_captions = true;
+ visibility = SliceLayer.Visibility.WITH_CAPTION;
+ } else if (attr_content != "any")
+ warning("Invalid attribute content " + attr_content + " for attribute " + attr_name + " in <slice_layer> element!");
+ break;
default:
warning("Invalid attribute \"" + attr_name + "\" in <slice_layer> element!");
break;
@@ -438,9 +483,17 @@ public class Theme : GLib.Object {
int size = 2*(int)(slice_radius*scale*max_zoom);
if (slice->name.down() == "activeslice") {
- active_slice_layers.add(new SliceLayer(file, size, colorize, is_icon));
+ if (type == SliceLayer.Type.ICON) active_slice_layers.add(new SliceLayer.icon(file, size, 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));
} else {
- inactive_slice_layers.add(new SliceLayer(file, size, colorize, is_icon));
+ if (type == SliceLayer.Type.ICON) inactive_slice_layers.add(new SliceLayer.icon(file, size, 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));
}
} else {
diff --git a/src/utilities/config.vala b/src/utilities/config.vala
index 5790eef..cc776d5 100644
--- a/src/utilities/config.vala
+++ b/src/utilities/config.vala
@@ -55,6 +55,7 @@ public class Config : GLib.Object {
public double refresh_rate { get; set; default = 60.0; }
public double global_scale { get; set; default = 1.0; }
public bool show_indicator { get; set; default = true; }
+ public bool show_captions { get; set; default = true; }
public bool auto_start { get; set; default = false; }
public Gee.ArrayList<Theme?> themes { get; private set; }
@@ -70,6 +71,7 @@ public class Config : GLib.Object {
writer.write_attribute("refresh_rate", refresh_rate.to_string());
writer.write_attribute("global_scale", global_scale.to_string());
writer.write_attribute("show_indicator", show_indicator ? "true" : "false");
+ writer.write_attribute("show_captions", show_captions ? "true" : "false");
writer.end_element();
writer.end_document();
}
@@ -112,6 +114,9 @@ public class Config : GLib.Object {
case "show_indicator":
show_indicator = bool.parse(attr_content);
break;
+ case "show_captions":
+ show_captions = bool.parse(attr_content);
+ break;
default:
warning("Invalid setting \"" + attr_name + "\" in gnome-pie.conf!");
break;
diff --git a/src/utilities/logger.vala b/src/utilities/logger.vala
index 3108ba3..5334920 100644
--- a/src/utilities/logger.vala
+++ b/src/utilities/logger.vala
@@ -17,7 +17,7 @@ this program. If not, see <http://www.gnu.org/licenses/>.
namespace GnomePie {
-/////////////////////////////////////////////////////////////////////////
+/////////////////////////////////////////////////////////////////////////
/// A static class which beautifies the messages of the default logger.
/// Some of this code is inspired by plank's written by Robert Dyer.
/// Thanks a lot for this project!
@@ -29,22 +29,33 @@ public class Logger {
/// If these are set to false, the according messages are not shown
/////////////////////////////////////////////////////////////////////
- public static bool display_info { get; set; default = true; }
- public static bool display_debug { get; set; default = true; }
- public static bool display_warning { get; set; default = true; }
- public static bool display_error { get; set; default = true; }
+ private static const bool display_debug = true;
+ private static const bool display_warning = true;
+ private static const bool display_error = true;
+ private static const bool display_message = true;
+
+ /////////////////////////////////////////////////////////////////////
+ /// If these are set to false, the according messages are not logged
+ /////////////////////////////////////////////////////////////////////
+
+ private static const bool log_debug = false;
+ private static const bool log_warning = true;
+ private static const bool log_error = true;
+ private static const bool log_message = true;
/////////////////////////////////////////////////////////////////////
/// If true, a time stamp is shown in each message.
/////////////////////////////////////////////////////////////////////
- public static bool display_time { get; set; default = true; }
+ private static const bool display_time = false;
+ private static const bool log_time = true;
/////////////////////////////////////////////////////////////////////
/// If true, the origin of the message is shown. In form file:line
/////////////////////////////////////////////////////////////////////
- public static bool display_file { get; set; default = false; }
+ private static const bool display_file = false;
+ private static const bool log_file = false;
/////////////////////////////////////////////////////////////////////
/// A regex, used to format the standard message.
@@ -53,6 +64,16 @@ public class Logger {
private static Regex regex = null;
/////////////////////////////////////////////////////////////////////
+ /// Limit log and statistics size to roughly 1 MB.
+ /////////////////////////////////////////////////////////////////////
+
+ private static const int max_log_length = 1000000;
+ private static const int max_stats_length = 1000000;
+
+ private static int log_length;
+ private static int stats_length;
+
+ /////////////////////////////////////////////////////////////////////
/// Possible terminal colors.
/////////////////////////////////////////////////////////////////////
@@ -72,20 +93,84 @@ public class Logger {
/////////////////////////////////////////////////////////////////////
public static void init() {
+ log_length = -1;
+ stats_length = -1;
+
try {
regex = new Regex("""(.*)\.vala(:\d+): (.*)""");
} catch {}
- GLib.Log.set_default_handler(log_func);
+ GLib.Log.set_handler(null, GLib.LogLevelFlags.LEVEL_MASK, log_func);
+ }
+
+ /////////////////////////////////////////////////////////////////////
+ /// Appends a line to the statistics file
+ /////////////////////////////////////////////////////////////////////
+
+ public static void stats(string line) {
+ var stats = GLib.FileStream.open(Paths.stats, "a");
+
+ if (stats != null) {
+ if (stats_length == -1)
+ stats_length = (int)stats.tell();
+
+ string final_line = "[" + get_time() + "] " + line + "\n";
+ stats.puts(final_line);
+ stats_length += final_line.length;
+ }
+
+ if (stats_length > max_stats_length) {
+ string content = "";
+
+ try {
+ GLib.FileUtils.get_contents(Paths.stats, out content);
+ int split_index = content.index_of_char('\n', stats_length - (int)(max_stats_length*0.9));
+ GLib.FileUtils.set_contents(Paths.stats, content.substring(split_index+1));
+
+ stats_length -= (split_index+1);
+ } catch (GLib.FileError e) {}
+ }
+ }
+
+ /////////////////////////////////////////////////////////////////////
+ /// Appends a line to the log file
+ /////////////////////////////////////////////////////////////////////
+
+ private static void write_log_line(string line) {
+ var log = GLib.FileStream.open(Paths.log, "a");
+
+ if (log != null) {
+ if (log_length == -1)
+ log_length = (int)log.tell();
+
+ log.puts(line);
+ log_length += line.length;
+ }
+
+ if (log_length > max_log_length) {
+ string content = "";
+
+ try {
+ GLib.FileUtils.get_contents(Paths.log, out content);
+ int split_index = content.index_of_char('\n', log_length - (int)(max_log_length*0.9));
+ GLib.FileUtils.set_contents(Paths.log, content.substring(split_index+1));
+
+ log_length -= (split_index+1);
+ } catch (GLib.FileError e) {}
+ }
}
/////////////////////////////////////////////////////////////////////
- /// Displays an Info message.
+ /// Displays a message.
/////////////////////////////////////////////////////////////////////
- private static void info(string message) {
- if (display_info) {
- stdout.printf(set_color(Color.GREEN, false) + "[" + get_time() + "MESSAGE]" + message);
+ private static void message(string message, string message_log) {
+ if (display_message) {
+ stdout.printf(set_color(Color.GREEN, false) + "[" + (display_time ? get_time() + " " : "") + "MESSAGE]" + message);
+ }
+
+ if (log_message) {
+ write_log_line("[" + (log_time ? get_time() + " " : "") + "MESSAGE]" + message_log);
}
}
@@ -93,9 +178,13 @@ public class Logger {
/// Displays a Debug message.
/////////////////////////////////////////////////////////////////////
- private static void debug(string message) {
+ private static void debug(string message, string message_log) {
if (display_debug) {
- stdout.printf(set_color(Color.BLUE, false) + "[" + get_time() + " DEBUG ]" + message);
+ stdout.printf(set_color(Color.BLUE, false) + "[" + (display_time ? get_time() + " " : "") + " DEBUG ]" + message);
+ }
+
+ if (log_debug) {
+ write_log_line("[" + (log_time ? get_time() + " " : "") + " DEBUG ]" + message_log);
}
}
@@ -103,9 +192,13 @@ public class Logger {
/// Displays a Warning message.
/////////////////////////////////////////////////////////////////////
- private static void warning(string message) {
+ private static void warning(string message, string message_log) {
if (display_warning) {
- stdout.printf(set_color(Color.YELLOW, false) + "[" + get_time() + "WARNING]" + message);
+ stdout.printf(set_color(Color.YELLOW, false) + "[" + (display_time ? get_time() + " " : "") + "WARNING]" + message);
+ }
+
+ if (log_warning) {
+ write_log_line("[" + (log_time ? get_time() + " " : "") + "WARNING]" + message_log);
}
}
@@ -113,9 +206,13 @@ public class Logger {
/// Displays a Error message.
/////////////////////////////////////////////////////////////////////
- private static void error(string message) {
+ private static void error(string message, string message_log) {
if (display_error) {
- stdout.printf(set_color(Color.RED, false) + "[" + get_time() + " ERROR ]" + message);
+ stdout.printf(set_color(Color.RED, false) + "[" + (display_time ? get_time() + " " : "") + " ERROR ]" + message);
+ }
+
+ if (log_error) {
+ write_log_line("[" + (log_time ? get_time() + " " : "") + " ERROR ]" + message_log);
}
}
@@ -141,12 +238,8 @@ public class Logger {
/////////////////////////////////////////////////////////////////////
private static string get_time() {
- if (display_time) {
- var now = new DateTime.now_local ();
- return "%.2d:%.2d:%.2d:%.6d ".printf (now.get_hour (), now.get_minute (), now.get_second (), now.get_microsecond ());
- } else {
- return "";
- }
+ var now = new DateTime.now_local();
+ return "%.4d:%.2d:%.2d:%.2d:%.2d:%.2d:%.6d".printf(now.get_year(), now.get_month(), now.get_day_of_month(), now.get_hour(), now.get_minute(), now.get_second(), now.get_microsecond());
}
/////////////////////////////////////////////////////////////////////
@@ -166,26 +259,41 @@ public class Logger {
}
/////////////////////////////////////////////////////////////////////
+ /// Helper method to format the message for logging.
+ /////////////////////////////////////////////////////////////////////
+
+ private static string create_log_message(string message) {
+ if (log_file && regex != null && regex.match(message)) {
+ var parts = regex.split(message);
+ return " [%s%s] %s\n".printf(parts[1], parts[2], parts[3]);
+ } else if (regex != null && regex.match(message)) {
+ var parts = regex.split(message);
+ return " %s\n".printf(parts[3]);
+ } else {
+ return " " + message + "\n";
+ }
+ }
+
+ /////////////////////////////////////////////////////////////////////
/// The handler function.
/////////////////////////////////////////////////////////////////////
- private static void log_func(string? d, LogLevelFlags flags, string message) {
-
+ private static void log_func(string? d, LogLevelFlags flags, string text) {
switch (flags) {
case LogLevelFlags.LEVEL_ERROR:
case LogLevelFlags.LEVEL_CRITICAL:
- error(create_message(message));
+ error(create_message(text), create_log_message(text));
break;
case LogLevelFlags.LEVEL_INFO:
case LogLevelFlags.LEVEL_MESSAGE:
- info(create_message(message));
+ message(create_message(text), create_log_message(text));
break;
case LogLevelFlags.LEVEL_DEBUG:
- debug(create_message(message));
+ debug(create_message(text), create_log_message(text));
break;
case LogLevelFlags.LEVEL_WARNING:
default:
- warning(create_message(message));
+ warning(create_message(text), create_log_message(text));
break;
}
}
diff --git a/src/utilities/paths.vala b/src/utilities/paths.vala
index 589cc36..bc3e9b1 100644
--- a/src/utilities/paths.vala
+++ b/src/utilities/paths.vala
@@ -23,16 +23,30 @@ namespace GnomePie {
/////////////////////////////////////////////////////////////////////////
public class Paths : GLib.Object {
+
+ /////////////////////////////////////////////////////////////////////
+ /// The log file,
+ /// usually ~/.config/gnome-pie/gnome-pie.log.
+ /////////////////////////////////////////////////////////////////////
+
+ public static string log { get; private set; default=""; }
+
+ /////////////////////////////////////////////////////////////////////
+ /// The statistics file,
+ /// usually ~/.config/gnome-pie/gnome-pie.stats.
+ /////////////////////////////////////////////////////////////////////
+
+ public static string stats { get; private set; default=""; }
/////////////////////////////////////////////////////////////////////
- /// The file settings file,
+ /// The settings file,
/// usually ~/.config/gnome-pie/gnome-pie.conf.
/////////////////////////////////////////////////////////////////////
public static string settings { get; private set; default=""; }
/////////////////////////////////////////////////////////////////////
- /// The file pie configuration file
+ /// The pie configuration file
/// usually ~/.config/gnome-pie/pies.conf.
/////////////////////////////////////////////////////////////////////
@@ -186,6 +200,24 @@ public class Paths : GLib.Object {
pie_config = config_file.get_path();
settings = config_dir.get_path() + "/gnome-pie.conf";
+ log = config_dir.get_path() + "/gnome-pie.log";
+ stats = config_dir.get_path() + "/gnome-pie.stats";
+
+ if (!GLib.File.new_for_path(log).query_exists()) {
+ try {
+ FileUtils.set_contents(log, "");
+ } catch (GLib.FileError e) {
+ error(e.message);
+ }
+ }
+
+ if (!GLib.File.new_for_path(stats).query_exists()) {
+ try {
+ FileUtils.set_contents(stats, "");
+ } catch (GLib.FileError e) {
+ error(e.message);
+ }
+ }
// autostart file name
autostart = GLib.Path.build_filename(GLib.Environment.get_user_config_dir(),
@@ -196,7 +228,13 @@ public class Paths : GLib.Object {
warning("Failed to find pie configuration file \"pies.conf\"! (This should only happen when Gnome-Pie is started for the first time...)");
if (!GLib.File.new_for_path(settings).query_exists())
- warning("Failed to find settings file \"gnome-pie.conf\"!");
+ warning("Failed to find settings file \"gnome-pie.conf\"! (This should only happen when Gnome-Pie is started for the first time...)");
+
+ if (!GLib.File.new_for_path(log).query_exists())
+ warning("Failed to find log file \"gnome-pie.log\"!");
+
+ if (!GLib.File.new_for_path(stats).query_exists())
+ warning("Failed to find statistics file \"gnome-pie.stats\"!");
if (!GLib.File.new_for_path(local_themes).query_exists())
warning("Failed to find local themes directory!");