From 1f6f24308e96040962794c5a9ffd81597b5e072a Mon Sep 17 00:00:00 2001 From: Alessandro Ghedini Date: Sat, 3 Nov 2012 16:15:11 +0100 Subject: Imported Upstream version 0.5.4 --- AUTHORS | 2 + resources/locale/bg/LC_MESSAGES/bg.po | 496 ++++++++++++++++++++++++ resources/locale/bg/LC_MESSAGES/gnomepie.mo | Bin 0 -> 11352 bytes resources/locale/zh_CN/LC_MESSAGES/gnomepie.mo | Bin 0 -> 8380 bytes resources/locale/zh_CN/LC_MESSAGES/zh_CN.po | 497 +++++++++++++++++++++++++ src/deamon.vala | 15 +- src/gui/aboutWindow.vala | 4 +- src/gui/newsWindow.vala | 24 +- src/gui/pieList.vala | 24 ++ src/gui/piePreview.vala | 36 +- src/gui/settingsWindow.vala | 6 - src/gui/triggerSelectButton.vala | 1 + src/pies/pieManager.vala | 1 - src/pies/save.vala | 7 - src/renderers/pieRenderer.vala | 9 - src/utilities/bindingManager.vala | 9 +- src/utilities/focusGrabber.vala | 14 +- src/utilities/logger.vala | 41 -- 18 files changed, 1076 insertions(+), 110 deletions(-) create mode 100644 resources/locale/bg/LC_MESSAGES/bg.po create mode 100644 resources/locale/bg/LC_MESSAGES/gnomepie.mo create mode 100644 resources/locale/zh_CN/LC_MESSAGES/gnomepie.mo create mode 100644 resources/locale/zh_CN/LC_MESSAGES/zh_CN.po diff --git a/AUTHORS b/AUTHORS index 4b51e7e..b31cf9f 100644 --- a/AUTHORS +++ b/AUTHORS @@ -12,3 +12,5 @@ Eduardo Anabalon Grégoire Bellon-Gervais Alex Maxime Eugene Roskin +Ting Zhou +Martin Dinov diff --git a/resources/locale/bg/LC_MESSAGES/bg.po b/resources/locale/bg/LC_MESSAGES/bg.po new file mode 100644 index 0000000..8f9167c --- /dev/null +++ b/resources/locale/bg/LC_MESSAGES/bg.po @@ -0,0 +1,496 @@ +# English translations for PACKAGE package. +# Copyright (C) 2012 Simon Schneegans +# This file is distributed under the same license as the PACKAGE package. +# , 2012. +# +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: 2012-09-02 08:05-0400\n" +"Last-Translator: Martin Dinov \n" +"Language-Team: Bulgarian\n" +"Language: bg\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" +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 "Отварете URI" + +#: ../../src/actions/uriAction.vala:36 +msgid "Opens a given location. You may use URL's or files paths." +msgstr "Отваря определена локациа. Може да изпозжате URL или файлови пътеки." + +#: ../../src/actions/actionRegistry.vala:119 +msgid "Trash" +msgstr "Боклук" + +#: ../../src/utilities/trigger.vala:163 +msgid "Button %i" +msgstr "Бутон %i" + +#: ../../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 "" +"Тази клавишна комбинация вече се използва от друг пай \"%s\"! \n" +"\n" +"Моля изберете друга комбиназия или сменете комбиназията." + +#: ../../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 "Показва парче за всеки от включените узтройства, като USB-стикове." + +#: ../../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 "" +"This Pie is empty!\n" +"\n" +"Start adding Slices to it! 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 "" +"This Pie is empty!\n" +"\n" +"Почнете да добавяте парчета към него! Това може да направите като изплъзкате неща към " +"плюс симвулът долу. Може да пробвате различни неша! Примерно апликационни стартери или " +"папки. Даже URLs от вашият сайт са възможни... \n" +"\n" +"За ръчна и напреднала конфигурация натиснете плюсът." + +#: ../ui/preferences.ui:282 +msgid "" +"You have no Pies!\n" +"\n" +"Start by creating one! This can be done by clicking on the tiny little " +"plus sign in the lower left corner." +msgstr "" +"Нямате пайове!\n" +"\n" +"Почнете със създаването на пай! Това може да се направи със кликването на малкият " +"плюс символът в долният ляв край." + +#: ../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 "URI да се отвори" + +#: ../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/bg/LC_MESSAGES/gnomepie.mo b/resources/locale/bg/LC_MESSAGES/gnomepie.mo new file mode 100644 index 0000000..7e25563 Binary files /dev/null and b/resources/locale/bg/LC_MESSAGES/gnomepie.mo differ diff --git a/resources/locale/zh_CN/LC_MESSAGES/gnomepie.mo b/resources/locale/zh_CN/LC_MESSAGES/gnomepie.mo new file mode 100644 index 0000000..b62ad23 Binary files /dev/null and b/resources/locale/zh_CN/LC_MESSAGES/gnomepie.mo differ diff --git a/resources/locale/zh_CN/LC_MESSAGES/zh_CN.po b/resources/locale/zh_CN/LC_MESSAGES/zh_CN.po new file mode 100644 index 0000000..93727c3 --- /dev/null +++ b/resources/locale/zh_CN/LC_MESSAGES/zh_CN.po @@ -0,0 +1,497 @@ +# Chinese translations for gnomepie package. +# Copyright (C) 2012 Simon Schneegans +# This file is distributed under the same license as the gnomepie package. +# Administrator , 2012. +# +msgid "" +msgstr "" +"Project-Id-Version: gnomepie 0.4\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2012-07-02 15:04+0800\n" +"PO-Revision-Date: 2012-07-02 15:05+0800\n" +"Last-Translator: Administrator \n" +"Language-Team: Chinese (simplified)\n" +"Language: zh_CN\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 16bit\n" + +#: ../../src/utilities/trigger.vala:163 +msgid "Button %i" +msgstr "按键 %i" + +#: ../../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:163 +msgid "Not bound" +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/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 "为您每个打开的窗开显示一片切片，效果就像Alt-Tab组合键一样。" + +#: ../../src/actionGroups/menuGroup.vala:35 +msgid "Group: Main menu" +msgstr "群组：主菜单" + +#: ../../src/actionGroups/menuGroup.vala:37 +msgid "Displays your main menu structure." +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/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 "为每一部插入的设备展示一片切片，比如U盘等。" + +#: ../../src/actionGroups/devicesGroup.vala:85 +msgid "Root" +msgstr "根目录" + +#: ../../src/actionGroups/clipboardGroup.vala:64 +msgid "Group: Clipboard" +msgstr "群组：剪贴板" + +#: ../../src/actionGroups/clipboardGroup.vala:66 +msgid "Manages your Clipboard." +msgstr "管理您的剪贴板。" + +#: ../../src/actions/actionRegistry.vala:119 +msgid "Trash" +msgstr "垃圾桶" + +#: ../../src/actions/keyAction.vala:34 +msgid "Press hotkey" +msgstr "按下热键" + +#: ../../src/actions/keyAction.vala:36 +msgid "Simulates the activation of a hotkey." +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 "打开URI" + +#: ../../src/actions/uriAction.vala:36 +msgid "Opens a given location. You may use URL's or files paths." +msgstr "打开一个指定的位置。您可以使用URL或者文件路径。" + +#: ../../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/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/triggerSelectButton.vala:64 +msgid "Press a hotkey ..." +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/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/themeList.vala:62 +msgid "Themes" +msgstr "主题" + +#: ../../src/gui/themeList.vala:99 +msgid "By" +msgstr "创作者：" + +#: ../../src/gui/sliceTypeList.vala:60 +msgid "Slice types" +msgstr "切片类型" + +#: ../../src/gui/newSliceWindow.vala:291 +msgid "Rename me!" +msgstr "给我重命名！" + +#: ../../src/gui/piePreview.vala:152 +msgid "Do you really want to delete this Slice?" +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 "" +"该热键已经被指派给 \"%s\"了！ \n" +"\n" +"请另作选择或者放弃选择。" + +#: ../../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 "点击删除" + +#: ../ui/preferences.ui:8 +msgid "Gnome-Pie Settings" +msgstr "Gnome派设置" + +#: ../ui/preferences.ui:27 ../ui/settings.ui:9 +msgid "General Settings" +msgstr "常规设置" + +#: ../ui/preferences.ui:261 +msgid "" +"This Pie is empty!\n" +"\n" +"Start adding Slices to it! 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 "" +"这张派是空的！\n" +"\n" +"开始向其中添加切片吧！您可以通过将各种元素拖放置" +"下方的+号处添加切片。请尽情尝试！试着添加应用程序加载器" +"或者文件夹等。浏览器适用的超链接也不妨一试哦…… \n" +"\n" +"如果需要指示和进一步的配置，点击“+”号图标。" + +#: ../ui/preferences.ui:282 +msgid "" +"You have no Pies!\n" +"\n" +"Start by creating one! This can be done by clicking on the tiny little " +"plus sign in the lower left corner." +msgstr "" +"您没有新的派！\n" +"\n" +"开始创建您自己的派吧！您可以通过点击窗口左下角的" +"小“+”号创建新的派。" + +#: ../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 "" +"如果选中，派将会在屏幕的中央出现。\n" +"否则将出现在指针位置." + +#: ../ui/trigger_select.ui:181 +msgid "Activation options" +msgstr "激活设置" + +#: ../ui/settings.ui:74 +msgid "Start Gnome-Pie on login" +msgstr "登录时启动Gnome派" + +#: ../ui/settings.ui:79 ../ui/settings.ui:80 +msgid "If checked, Gnome-Pie will start silently everytime you log in." +msgstr "如果选中，Gnome派将会在您每次登录后安静启动。" + +#: ../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 "" +"如果未选中，您可以通过再次打开Gnome派" +"来访问本菜单。" + +#: ../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 "" +"在切片旁显示每一切片的名称。\n" +"当且仅当主题支持时有效。" + +#: ../ui/settings.ui:232 +msgid "Appearance" +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/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 "打开的URI" + +#: ../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 "切片选项" + diff --git a/src/deamon.vala b/src/deamon.vala index 117e872..a987de3 100644 --- a/src/deamon.vala +++ b/src/deamon.vala @@ -36,7 +36,7 @@ public class Deamon : GLib.Object { ///////////////////////////////////////////////////////////////////// public static int main(string[] args) { - version = "0.5.3"; + version = "0.5.4"; Logger.init(); Gdk.threads_init(); @@ -100,8 +100,6 @@ 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; } @@ -121,16 +119,12 @@ public class Deamon : GLib.Object { 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; } @@ -170,17 +164,10 @@ 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); - else if (Config.global.showed_news < NewsWindow.news_count - && Logger.get_statistics_size() > 10000) { - - var b = new NewsWindow(); - b.show(); - } Gtk.main(); diff --git a/src/gui/aboutWindow.vala b/src/gui/aboutWindow.vala index 6c5820b..c6b7453 100644 --- a/src/gui/aboutWindow.vala +++ b/src/gui/aboutWindow.vala @@ -44,7 +44,9 @@ public class AboutWindow: Gtk.AboutDialog { "Eduardo Anabalon (ES)", "Grégoire Bellon-Gervais (FR)", "Alex Maxime (FR)", - "Eugene Roskin (RU)" + "Eugene Roskin (RU)", + "Ting Zhou (ZH-CN)", + "Martin Dinov (BG)" }; // sort translators diff --git a/src/gui/newsWindow.vala b/src/gui/newsWindow.vala index 9212fa6..75de60e 100644 --- a/src/gui/newsWindow.vala +++ b/src/gui/newsWindow.vala @@ -23,7 +23,7 @@ namespace GnomePie { public class NewsWindow: Gtk.Dialog { - public static const int news_count = 1; + public static const int news_count = 2; ///////////////////////////////////////////////////////////////////// /// @@ -42,27 +42,7 @@ public class NewsWindow: Gtk.Dialog { var news = new Gtk.Label(""); news.wrap = true; news.set_width_chars(75); - news.set_markup("Gnome-Pie needs your help!\n\n" + - - "Hey, this is Simon, developer of Gnome-Pie. I’m going to " + - "write my Bachelor thesis on pie menus! In order to improve " + - "Gnome-Pie to the limits, I need some information on how " + - "you use Gnome-Pie.\n\n" + - - "So please help improving this software by sending the " + - "file 'gnome-pie.stats' located in " + Paths.config_directory + - " by email to " + - "pie-stats@simonschneegans.de!\n\n" + - - "There is no personal information in this file. Only " + - "information on your usage frequency, how fast you use " + - "Gnome-Pie and how many Pies with how many Slices you " + - "have configured. If you have any questions regarding " + - "this topic please send an email to " + - "code@simonschneegans.de!\n\n" + - - "Thank you so much! It’s going to be exciting!"); + news.set_markup("Thank you!\n\n"); box.pack_start(news, false, false); diff --git a/src/gui/pieList.vala b/src/gui/pieList.vala index 474e5f5..f9fb54b 100644 --- a/src/gui/pieList.vala +++ b/src/gui/pieList.vala @@ -94,6 +94,7 @@ class PieList : Gtk.TreeView { this.enable_model_drag_source(Gdk.ModifierType.BUTTON1_MASK, entries, Gdk.DragAction.LINK); this.enable_model_drag_dest(entries, Gdk.DragAction.COPY | Gdk.DragAction.MOVE | Gdk.DragAction.LINK); this.drag_data_get.connect(this.on_dnd_source); + this.drag_data_received.connect(this.on_dnd_received); this.drag_begin.connect_after(this.on_start_drag); this.drag_motion.connect(this.on_drag_move); this.drag_leave.connect(() => { @@ -238,6 +239,29 @@ class PieList : Gtk.TreeView { return true; } + + ///////////////////////////////////////////////////////////////////// + /// Called when the user finishes a drag operation on this widget. + /// Only used for external drags. + ///////////////////////////////////////////////////////////////////// + + private void on_dnd_received(Gdk.DragContext context, int x, int y, + Gtk.SelectionData selection_data, uint info, uint time_) { + + Gtk.TreeIter active; + if (this.get_selection().get_selected(null, out active)) { + string id = ""; + this.data.get(active, DataPos.ID, out id); + + var pie = PieManager.all_pies[id]; + + foreach (var uri in selection_data.get_uris()) { + pie.add_action(ActionRegistry.new_for_uri(uri), 0); + } + + this.on_select(id); + } + } } } diff --git a/src/gui/piePreview.vala b/src/gui/piePreview.vala index 5745fcb..3ddf6c8 100644 --- a/src/gui/piePreview.vala +++ b/src/gui/piePreview.vala @@ -68,6 +68,7 @@ class PiePreview : Gtk.DrawingArea { ///////////////////////////////////////////////////////////////////// private int drag_start_index = -1; + private string drag_start_id = ""; ///////////////////////////////////////////////////////////////////// /// C'tor, creates the widget. @@ -174,8 +175,12 @@ class PiePreview : Gtk.DrawingArea { public void set_pie(string id) { this.current_id = id; - this.modify_bg(Gtk.StateType.NORMAL, Gtk.rc_get_style(this).light[0]); + this.modify_bg(Gtk.StateType.NORMAL, Gtk.rc_get_style(this).light[Gtk.StateType.NORMAL]); this.renderer.load_pie(PieManager.all_pies[id]); + + if (id == this.drag_start_id) { + this.renderer.hide_group(this.drag_start_index); + } } ///////////////////////////////////////////////////////////////////// @@ -209,6 +214,7 @@ class PiePreview : Gtk.DrawingArea { Gtk.Allocation allocation; this.get_allocation(out allocation); + ctx.translate((int)(allocation.width*0.5), (int)(allocation.height*0.5)); this.renderer.draw(frame_time, ctx); @@ -278,6 +284,7 @@ class PiePreview : Gtk.DrawingArea { Gtk.Allocation allocation; this.get_allocation(out allocation); this.renderer.on_mouse_move(x-allocation.width*0.5, y-allocation.height*0.5); + return true; } @@ -287,6 +294,7 @@ class PiePreview : Gtk.DrawingArea { private void on_start_drag(Gdk.DragContext ctx) { this.drag_start_index = this.renderer.get_active_slice(); + this.drag_start_id = this.current_id; var icon = this.renderer.get_active_icon(); var pixbuf = icon.to_pixbuf(); @@ -311,11 +319,29 @@ class PiePreview : Gtk.DrawingArea { context.list_targets().foreach((target) => { Gdk.Atom target_type = (Gdk.Atom)target; if (target_type.name() == "text/plain") { - var pie = PieManager.all_pies[this.current_id]; - pie.move_group(this.drag_start_index, target_index); - this.renderer.show_hidden_group_at(target_index); + if (this.current_id == this.drag_start_id) { + var pie = PieManager.all_pies[this.current_id]; + pie.move_group(this.drag_start_index, target_index); + this.renderer.show_hidden_group_at(target_index); + } else { + var src_pie = PieManager.all_pies[this.drag_start_id]; + var dst_pie = PieManager.all_pies[this.current_id]; + dst_pie.add_group(src_pie.action_groups[this.drag_start_index], target_index); + this.renderer.add_group(dst_pie.action_groups[target_index], target_index); + + if (this.renderer.slices.size == 1) + this.on_first_slice_added(); + + if ((context.get_actions() & Gdk.DragAction.COPY) == 0) + src_pie.remove_group(this.drag_start_index); + } + + } }); + + this.drag_start_index = -1; + this.drag_start_id = ""; } } @@ -349,7 +375,7 @@ class PiePreview : Gtk.DrawingArea { this.drag_enabled = true; Gtk.TargetEntry slice_source = {"text/plain", Gtk.TargetFlags.SAME_WIDGET | Gtk.TargetFlags.SAME_APP, 0}; Gtk.TargetEntry[] sources = { slice_source }; - Gtk.drag_source_set(this, Gdk.ModifierType.BUTTON1_MASK, sources, Gdk.DragAction.MOVE); + Gtk.drag_source_set(this, Gdk.ModifierType.BUTTON1_MASK, sources, Gdk.DragAction.MOVE | Gdk.DragAction.COPY); } } diff --git a/src/gui/settingsWindow.vala b/src/gui/settingsWindow.vala index 60bfcf3..81f8f7e 100644 --- a/src/gui/settingsWindow.vala +++ b/src/gui/settingsWindow.vala @@ -138,12 +138,6 @@ 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)); } ///////////////////////////////////////////////////////////////////// diff --git a/src/gui/triggerSelectButton.vala b/src/gui/triggerSelectButton.vala index fd8505a..7132220 100644 --- a/src/gui/triggerSelectButton.vala +++ b/src/gui/triggerSelectButton.vala @@ -48,6 +48,7 @@ public class TriggerSelectButton : Gtk.ToggleButton { ///////////////////////////////////////////////////////////////////// private Gdk.ModifierType lock_modifiers = Gdk.ModifierType.MOD2_MASK + |Gdk.ModifierType.SUPER_MASK |Gdk.ModifierType.LOCK_MASK |Gdk.ModifierType.MOD5_MASK; diff --git a/src/pies/pieManager.vala b/src/pies/pieManager.vala index 85d8a14..f574085 100644 --- a/src/pies/pieManager.vala +++ b/src/pies/pieManager.vala @@ -86,7 +86,6 @@ public class PieManager : GLib.Object { Pie? pie = all_pies[id]; if (pie != null) { - Logger.stats("OPEN " + id); a_pie_is_active = true; diff --git a/src/pies/save.vala b/src/pies/save.vala index aadc7c8..60fc0b2 100644 --- a/src/pies/save.vala +++ b/src/pies/save.vala @@ -32,9 +32,6 @@ 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); @@ -82,14 +79,10 @@ namespace Pies { } } 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 09c5f7a..7135381 100644 --- a/src/renderers/pieRenderer.vala +++ b/src/renderers/pieRenderer.vala @@ -132,13 +132,6 @@ public class PieRenderer : GLib.Object { public void activate() { if (this.active_slice >= 0 && this.active_slice < this.slices.size) { slices[active_slice].activate(); - - 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) @@ -156,8 +149,6 @@ public class PieRenderer : GLib.Object { slice.fade_out(); center.fade_out(); - - Logger.stats("CANCEL"); } ///////////////////////////////////////////////////////////////////// diff --git a/src/utilities/bindingManager.vala b/src/utilities/bindingManager.vala index 669c863..255dbfb 100644 --- a/src/utilities/bindingManager.vala +++ b/src/utilities/bindingManager.vala @@ -227,8 +227,13 @@ public class BindingManager : GLib.Object { ///////////////////////////////////////////////////////////////////// private Gdk.FilterReturn event_filter(Gdk.XEvent gdk_xevent, Gdk.Event gdk_event) { - void* pointer = &gdk_xevent; - X.Event* xevent = (X.Event*) pointer; + + #if VALA_0_16 || VALA_0_17 + X.Event* xevent = (X.Event*) gdk_xevent; + #else + void* pointer = &gdk_xevent; + X.Event* xevent = (X.Event*) pointer; + #endif if(xevent->type == X.EventType.KeyPress) { foreach(var binding in bindings) { diff --git a/src/utilities/focusGrabber.vala b/src/utilities/focusGrabber.vala index 293e103..e5900d6 100644 --- a/src/utilities/focusGrabber.vala +++ b/src/utilities/focusGrabber.vala @@ -53,7 +53,12 @@ public class FocusGrabber : GLib.Object { var display = Gdk.Display.get_default(); var manager = display.get_device_manager(); - unowned GLib.List list = manager.list_devices(Gdk.DeviceType.MASTER); + #if VALA_0_16 || VALA_0_17 + GLib.List list = manager.list_devices(Gdk.DeviceType.MASTER); + #else + unowned GLib.List list = manager.list_devices(Gdk.DeviceType.MASTER); + #endif + foreach(var device in list) { if ((device.input_source == Gdk.InputSource.KEYBOARD && keyboard) || (device.input_source != Gdk.InputSource.KEYBOARD && pointer)) @@ -81,7 +86,12 @@ public class FocusGrabber : GLib.Object { bool grabbed_all = true; - unowned GLib.List list = manager.list_devices(Gdk.DeviceType.MASTER); + #if VALA_0_16 + GLib.List list = manager.list_devices(Gdk.DeviceType.MASTER); + #else + unowned GLib.List list = manager.list_devices(Gdk.DeviceType.MASTER); + #endif + foreach(var device in list) { if ((device.input_source == Gdk.InputSource.KEYBOARD && keyboard) || (device.input_source != Gdk.InputSource.KEYBOARD && pointer)) { diff --git a/src/utilities/logger.vala b/src/utilities/logger.vala index 116cbcd..69310fc 100644 --- a/src/utilities/logger.vala +++ b/src/utilities/logger.vala @@ -68,10 +68,8 @@ public class Logger { ///////////////////////////////////////////////////////////////////// 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. @@ -94,7 +92,6 @@ public class Logger { public static void init() { log_length = -1; - stats_length = -1; try { regex = new Regex("""(.*)\.vala(:\d+): (.*)"""); @@ -103,44 +100,6 @@ public class Logger { GLib.Log.set_handler(null, GLib.LogLevelFlags.LEVEL_MASK, log_func); } - ///////////////////////////////////////////////////////////////////// - /// Appends a line to the statistics file - ///////////////////////////////////////////////////////////////////// - - public static int get_statistics_size() { - if (stats_length == -1) { - var stats = GLib.FileStream.open(Paths.stats, "a"); - stats_length = (int)stats.tell(); - } - - return stats_length; - } - - 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 ///////////////////////////////////////////////////////////////////// -- cgit v1.2.3