[Xfce4-commits] xfce4-time-out-plugin:master l10n: Updated Kazakh (kk) translation to 100%
Updating branch refs/heads/master to 299636e6662606a66b86bc06ddaba4525118076b (commit) from 26c512b4eb37acc5de2a04726d6345665ac17495 (commit) commit 299636e6662606a66b86bc06ddaba4525118076b Author: Bauzhan Muftakhidinov baurthefi...@gmail.com Date: Tue Dec 21 11:11:25 2010 +0100 l10n: Updated Kazakh (kk) translation to 100% New status: 31 messages complete with 0 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/kk.po | 21 ++--- 1 files changed, 10 insertions(+), 11 deletions(-) diff --git a/po/kk.po b/po/kk.po index c517703..00fdb2f 100644 --- a/po/kk.po +++ b/po/kk.po @@ -7,14 +7,14 @@ msgid msgstr Project-Id-Version: master\n Report-Msgid-Bugs-To: \n -POT-Creation-Date: 2010-12-12 00:01+0900\n -PO-Revision-Date: 2010-09-01 14:31+0600\n +POT-Creation-Date: 2010-12-21 05:13+\n +PO-Revision-Date: 2010-12-21 16:11+0600\n Last-Translator: Baurzhan Muftakhidinov baurthefi...@gmail.com\n Language-Team: Kazakh kk...@googlegroups.com\n -Language: kk\n MIME-Version: 1.0\n Content-Type: text/plain; charset=UTF-8\n Content-Transfer-Encoding: 8bit\n +Language: kk\n Plural-Forms: nplurals=1; plural=0;\n X-Poedit-Language: Kazakh\n X-Poedit-Country: KAZAKHSTAN\n @@ -35,8 +35,7 @@ msgid Enabled msgstr Қосулы #: ../panel-plugin/time-out.c:422 -msgid -Xfce Panel plugin for taking a break from computer work every now and then. +msgid Xfce Panel plugin for taking a break from computer work every now and then. msgstr Компьютерден демалу үшін үзілістерді жасайтын Xfce панелінің плагині. #: ../panel-plugin/time-out.c:431 @@ -142,7 +141,7 @@ msgid %02d:%02d msgstr %02d:%02d #: ../panel-plugin/time-out-countdown.c:424 -#, fuzzy, c-format +#, c-format msgid %d hour msgid_plural %d hours msgstr[0] %d сағат @@ -152,13 +151,13 @@ msgstr[0] %d сағат #: ../panel-plugin/time-out-countdown.c:485 #: ../panel-plugin/time-out-countdown.c:503 #: ../panel-plugin/time-out-countdown.c:542 -#, fuzzy, c-format +#, c-format msgid %d minute msgid_plural %d minutes msgstr[0] %d минут #: ../panel-plugin/time-out-countdown.c:426 -#, fuzzy, c-format +#, c-format msgid %d second msgid_plural %d seconds msgstr[0] %d секунд @@ -173,7 +172,7 @@ msgstr[0] %d секунд #: ../panel-plugin/time-out-countdown.c:524 #: ../panel-plugin/time-out-countdown.c:538 #: ../panel-plugin/time-out-countdown.c:543 -#, fuzzy, c-format +#, c-format msgid Time left: %s msgstr Қалған уақыты: %s @@ -187,13 +186,13 @@ msgstr Қалған уақыты: %s #: ../panel-plugin/time-out-countdown.c:499 #: ../panel-plugin/time-out-countdown.c:505 #: ../panel-plugin/time-out-countdown.c:527 -#, fuzzy, c-format +#, c-format msgid Time left: %s %s msgstr Қалған уақыты: %s %s #. Translators: this is %s hours, %s minutes, %s seconds #: ../panel-plugin/time-out-countdown.c:467 -#, fuzzy, c-format +#, c-format msgid Time left: %s %s %s msgstr Қалған уақыты: %s %s %s ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfce4-panel:master l10n: Updated Ukrainian (uk) translation to 100%
Updating branch refs/heads/master to 295841f8050728a3c0644dd66fe2ca5abe3f8e9a (commit) from 2f363bed9e32a1cfce46ce6b97648c7c8394f58d (commit) commit 295841f8050728a3c0644dd66fe2ca5abe3f8e9a Author: Dmitry Nikitin luckas...@mail.ru Date: Tue Dec 21 11:30:10 2010 +0100 l10n: Updated Ukrainian (uk) translation to 100% New status: 345 messages complete with 0 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/uk.po | 92 - 1 files changed, 48 insertions(+), 44 deletions(-) diff --git a/po/uk.po b/po/uk.po index f2f442f..de31da9 100644 --- a/po/uk.po +++ b/po/uk.po @@ -8,7 +8,7 @@ msgid msgstr Project-Id-Version: xfce4-panel 4.7.0\n Report-Msgid-Bugs-To: \n -POT-Creation-Date: 2010-12-07 17:08+\n +POT-Creation-Date: 2010-12-21 05:09+\n PO-Revision-Date: 2009-01-26 15:54+0200\n Last-Translator: Dmitry Nikitin luckas...@mail.ru\n Language-Team: Ukrainian xfce4-...@xfce.org\n @@ -21,7 +21,7 @@ msgstr #: ../panel-desktop-handler.desktop.in.h:1 msgid Add a new launcher to the panel based on the information of this desktop file -msgstr +msgstr Додати новий запускач до панелі на основі інформації з його desktop файлу #: ../panel-desktop-handler.desktop.in.h:2 msgid Create Launcher on the panel @@ -32,7 +32,7 @@ msgid Customize the panel msgstr Упорядкувати панель #: ../panel-preferences.desktop.in.h:2 -#: ../panel/panel-preferences-dialog.glade.h:24 ../panel/panel-window.c:2198 +#: ../panel/panel-preferences-dialog.glade.h:24 ../panel/panel-window.c:2200 #: ../migrate/main.c:84 msgid Panel msgstr Панель @@ -55,38 +55,38 @@ msgid Failed to open the documentation browser msgstr Не вдалось відкрити переглядач документації #. I18N: %s is the name of the plugin -#: ../libxfce4panel/xfce-panel-plugin.c:873 -#: ../panel/panel-preferences-dialog.c:1029 +#: ../libxfce4panel/xfce-panel-plugin.c:887 +#: ../panel/panel-preferences-dialog.c:1048 #, c-format msgid Are you sure that you want to remove \%s\? msgstr Дійсно бажаєте видалити \%s\? -#: ../libxfce4panel/xfce-panel-plugin.c:878 -#: ../panel/panel-preferences-dialog.c:1032 +#: ../libxfce4panel/xfce-panel-plugin.c:892 +#: ../panel/panel-preferences-dialog.c:1051 msgid If you remove the item from the panel, it is permanently lost. msgstr Якщо Ви видалите цей елемент з панелі, він буде повністю втрачений. #. move item -#: ../libxfce4panel/xfce-panel-plugin.c:1038 +#: ../libxfce4panel/xfce-panel-plugin.c:1052 msgid _Move msgstr Пере_містити -#: ../libxfce4panel/xfce-panel-plugin.c:1072 +#: ../libxfce4panel/xfce-panel-plugin.c:1086 msgid Pane_l msgstr Пане_ль #. add new items -#: ../libxfce4panel/xfce-panel-plugin.c:1080 ../panel/panel-window.c:2210 +#: ../libxfce4panel/xfce-panel-plugin.c:1094 ../panel/panel-window.c:2212 msgid Add _New Items... msgstr Дода_ти нові елементи... #. customize panel -#: ../libxfce4panel/xfce-panel-plugin.c:1091 ../panel/panel-window.c:2221 +#: ../libxfce4panel/xfce-panel-plugin.c:1105 ../panel/panel-window.c:2223 msgid Panel Pr_eferences... msgstr Налашт_ування панелі... #. logout item -#: ../libxfce4panel/xfce-panel-plugin.c:1108 ../panel/panel-window.c:2237 +#: ../libxfce4panel/xfce-panel-plugin.c:1122 ../panel/panel-window.c:2239 msgid Log _Out msgstr Вийти з _сеансу @@ -194,19 +194,19 @@ msgstr Ви бажаєте запустити панель? Якщо так, т msgid No running instance of %s was found msgstr Не знайдено запущених екземплярів %s -#: ../panel/panel-application.c:197 +#: ../panel/panel-application.c:196 msgid Failed to launch the migration application msgstr Не вдалось запустити програму міграції -#: ../panel/panel-application.c:1429 ../plugins/actions/actions.c:413 +#: ../panel/panel-application.c:1423 ../plugins/actions/actions.c:413 msgid You have started X without session manager. Clicking Quit will close the X server. msgstr Ви запустили X без менеджера сесії. Натискання на кнопку виходу закриє X-сервер. -#: ../panel/panel-application.c:1430 ../plugins/actions/actions.c:414 +#: ../panel/panel-application.c:1424 ../plugins/actions/actions.c:414 msgid Are you sure you want to quit the panel? msgstr Ви впевнені, що бажаєте закрити панель? -#: ../panel/panel-application.c:1438 ../plugins/actions/actions.c:422 +#: ../panel/panel-application.c:1432 ../plugins/actions/actions.c:422 #, c-format msgid Failed to execute command \%s\ msgstr Не вдалось виконати команду \%s\ @@ -238,7 +238,7 @@ msgid Please choose a panel for the new plugin: msgstr Будь-ласка виберіть панель для нового розширення: #. I18N: panel combo box in the preferences dialog -#: ../panel/panel-dialogs.c:147 ../panel/panel-preferences-dialog.c:754 +#: ../panel/panel-dialogs.c:147 ../panel/panel-preferences-dialog.c:767 #, c-format msgid Panel %d msgstr Панель %d @@ -278,41 +278,41 @@ msgstr Розширення \%s\ раптово зникло з панелі, msgid The plugin
[Xfce4-commits] xfwm4:master l10n: Updated Ukrainian (uk) translation to 100%
Updating branch refs/heads/master to b139b2993e87ce6356404f0f71d325ed658c246e (commit) from 0285c85f3604de33550741ea3eb15b0985b5c34d (commit) commit b139b2993e87ce6356404f0f71d325ed658c246e Author: Dmitry Nikitin luckas...@mail.ru Date: Tue Dec 21 11:33:44 2010 +0100 l10n: Updated Ukrainian (uk) translation to 100% New status: 230 messages complete with 0 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/uk.po | 12 ++-- 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/po/uk.po b/po/uk.po index 4bc1c7b..d0c114d 100644 --- a/po/uk.po +++ b/po/uk.po @@ -8,7 +8,7 @@ msgid msgstr Project-Id-Version: xfwm4\n Report-Msgid-Bugs-To: \n -POT-Creation-Date: 2010-12-07 17:10+\n +POT-Creation-Date: 2010-12-21 05:11+\n PO-Revision-Date: 2009-02-24 20:24+0200\n Last-Translator: Dmitry Nikitin luckas...@mail.ru\n Language-Team: Ukrainian xfce-i...@xfce.org\n @@ -845,19 +845,19 @@ msgstr %s: помилка сегментації #: ../src/main.c:534 msgid Fork to the background -msgstr +msgstr Перевести у фоновий режим #: ../src/main.c:536 msgid Fork to the background (not supported) -msgstr +msgstr Перевести у фоновий режим (не підтримується) #: ../src/main.c:539 msgid Set the compositor mode -msgstr +msgstr Призначити композитний режим #: ../src/main.c:541 msgid Set the compositor mode (not supported) -msgstr +msgstr Призначити композитний режим (не підтримується) #: ../src/main.c:543 msgid Replace the existing window manager @@ -869,7 +869,7 @@ msgstr Показати інформацію про версію і вийти #: ../src/main.c:552 msgid [ARGUMENTS...] -msgstr +msgstr [АРГУМЕНТИ...] #: ../src/main.c:559 #, c-format ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfce4-notifyd:master l10n: Updated Ukrainian (uk) translation to 96%
Updating branch refs/heads/master to 96fac7eb0cc9c0f4152ee17f44fa184b02677337 (commit) from fe7e0b8a28c805e76f37c073c30540c79fb86f40 (commit) commit 96fac7eb0cc9c0f4152ee17f44fa184b02677337 Author: Dmitry Nikitin luckas...@mail.ru Date: Tue Dec 21 11:41:16 2010 +0100 l10n: Updated Ukrainian (uk) translation to 96% New status: 28 messages complete with 0 fuzzies and 1 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/uk.po | 68 +++-- 1 files changed, 39 insertions(+), 29 deletions(-) diff --git a/po/uk.po b/po/uk.po index f9e51c1..8de107d 100644 --- a/po/uk.po +++ b/po/uk.po @@ -2,28 +2,27 @@ # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. # FIRST AUTHOR em...@address, YEAR. -# +# msgid msgstr Project-Id-Version: xfce4-notify\n Report-Msgid-Bugs-To: \n -POT-Creation-Date: 2010-11-07 18:14+0100\n +POT-Creation-Date: 2010-12-21 05:05+\n PO-Revision-Date: 2010-05-24 00:21+0100\n Last-Translator: Yarema aka Knedlyk yupad...@gmail.com\n Language-Team: UKRAINIAN transl...@linux.org.ua\n -Language: \n MIME-Version: 1.0\n Content-Type: text/plain; charset=UTF-8\n Content-Transfer-Encoding: 8bit\n -Plural-Forms: nplurals=3; plural=(n%10==1 n%100!=11 ? 0 : n%10=2 n -%10=4 (n%10010 || n%100=20) ? 1 : 2);\n +Language: \n +Plural-Forms: nplurals=3; plural=(n%10==1 n%100!=11 ? 0 : n%10=2 n%10=4 (n%10010 || n%100=20) ? 1 : 2);\n X-Poedit-Language: Ukrainian\n X-Poedit-SourceCharset: utf-8\n X-Poedit-Country: UKRAINE\n X-Generator: Pootle 1.1.0\n #: ../xfce4-notifyd/main.c:50 ../xfce4-notifyd/main.c:60 -#: ../xfce4-notifyd-config/main.c:229 +#: ../xfce4-notifyd-config/main.c:257 msgid Xfce Notify Daemon msgstr Демон повідомлень Xfce @@ -36,22 +35,17 @@ msgstr Невідомий параметр \%s\\n msgid Unable to start notification daemon msgstr Не можу запустити демон повідомлень -#: ../xfce4-notifyd/xfce-notify-daemon.c:1073 +#: ../xfce4-notifyd/xfce-notify-daemon.c:1134 #, c-format msgid Unable to connect to D-Bus session bus msgstr Не можу з’єднатися до буфера сесії D-Bus -#: ../xfce4-notifyd/xfce-notify-daemon.c:1090 -#, fuzzy, c-format -msgid Another notification xndaemon is already running -msgstr Інший демон повідомлень вже запущено - -#: ../xfce4-notifyd/xfce-notify-window.c:756 +#: ../xfce4-notifyd/xfce-notify-daemon.c:1151 #, c-format -msgid %s could not be launched -msgstr +msgid Another notification xndaemon is already running +msgstr Інший демон повідомлень xndaemon вже працює -#: ../xfce4-notifyd/xfce-notify-window.c:857 +#: ../xfce4-notifyd/xfce-notify-window.c:809 msgid image: msgstr малюнок: @@ -59,44 +53,52 @@ msgstr малюнок: msgid Theme msgstr Тема -#: ../xfce4-notifyd-config/main.c:231 +#: ../xfce4-notifyd-config/main.c:223 +msgid notify-send \Notification Preview\ \This is how notifications will look like\ +msgstr + +#: ../xfce4-notifyd-config/main.c:227 +msgid Notification preview failed +msgstr Попередній перегляд повідомлення не вдався + +#: ../xfce4-notifyd-config/main.c:259 msgid Settings daemon is unavailable msgstr Демон налаштувань не доступний -#: ../xfce4-notifyd-config/main.c:286 +#: ../xfce4-notifyd-config/main.c:314 msgid Display version information msgstr Показати інформацію про версію -#: ../xfce4-notifyd-config/main.c:287 +#: ../xfce4-notifyd-config/main.c:315 msgid Settings manager socket msgstr Сокет менеджера налаштувань -#: ../xfce4-notifyd-config/main.c:287 +#: ../xfce4-notifyd-config/main.c:315 msgid SOCKET_ID msgstr SOCKET_ID -#: ../xfce4-notifyd-config/main.c:297 +#: ../xfce4-notifyd-config/main.c:325 #, c-format msgid Type '%s --help' for usage. msgstr Напишіть '%s --help' для допомоги по використанню. -#: ../xfce4-notifyd-config/main.c:309 +#: ../xfce4-notifyd-config/main.c:338 #, c-format msgid Released under the terms of the GNU General Public License, version 2\n msgstr Розроблено згідно умов GNU General Public License, 2-га версія\n -#: ../xfce4-notifyd-config/main.c:310 +#: ../xfce4-notifyd-config/main.c:339 #, c-format msgid Please report bugs to %s.\n msgstr Будь-ласка, повідомте про помилку до %s.\n #: ../xfce4-notifyd-config/xfce4-notifyd-config.glade.h:1 msgid Bottom left -msgstr +msgstr Внизу зліва #: ../xfce4-notifyd-config/xfce4-notifyd-config.glade.h:2 msgid Bottom right -msgstr +msgstr Внизу зправа #: ../xfce4-notifyd-config/xfce4-notifyd-config.glade.h:3 #: ../xfce4-notifyd-config/xfce4-notifyd-config.desktop.in.h:1 @@ -114,25 +116,33 @@ msgstr Повідомлення #: ../xfce4-notifyd-config/xfce4-notifyd-config.glade.h:6 msgid Top left -msgstr +msgstr Зверху зліва #: ../xfce4-notifyd-config/xfce4-notifyd-config.glade.h:7 msgid Top right -msgstr +msgstr Зверху зправа #: ../xfce4-notifyd-config/xfce4-notifyd-config.glade.h:8 msgid _Disappear after: msgstr _Зникати
[Xfce4-commits] xfce4-notifyd:master l10n: Updated Ukrainian (uk) translation to 100%
Updating branch refs/heads/master to fb78c0cfadc8132e61b023ab99a508142db45ef0 (commit) from 96fac7eb0cc9c0f4152ee17f44fa184b02677337 (commit) commit fb78c0cfadc8132e61b023ab99a508142db45ef0 Author: Dmitry Nikitin luckas...@mail.ru Date: Tue Dec 21 11:45:23 2010 +0100 l10n: Updated Ukrainian (uk) translation to 100% New status: 29 messages complete with 0 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/uk.po |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/po/uk.po b/po/uk.po index 8de107d..0259965 100644 --- a/po/uk.po +++ b/po/uk.po @@ -55,7 +55,7 @@ msgstr Тема #: ../xfce4-notifyd-config/main.c:223 msgid notify-send \Notification Preview\ \This is how notifications will look like\ -msgstr +msgstr notify-send \Попередній перегляд повідомлення\ \Так будуть виглядати повідомлення\ #: ../xfce4-notifyd-config/main.c:227 msgid Notification preview failed ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] orage:master l10n: Updated Ukrainian (uk) translation to 100%
Updating branch refs/heads/master to 22855ddf807808454fe86b7528579fcf3ffe1300 (commit) from 25ec93e5b15a97aab857c7f122e0a33eda042b90 (commit) commit 22855ddf807808454fe86b7528579fcf3ffe1300 Author: Dmitry Nikitin luckas...@mail.ru Date: Tue Dec 21 11:52:04 2010 +0100 l10n: Updated Ukrainian (uk) translation to 100% New status: 797 messages complete with 0 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/uk.po | 199 ++ 1 files changed, 58 insertions(+), 141 deletions(-) diff --git a/po/uk.po b/po/uk.po index 971a6ee..c7683f4 100644 --- a/po/uk.po +++ b/po/uk.po @@ -2,7 +2,7 @@ # Copyright (C) 2003-2006 The Xfce development team. # This file is distributed under the same license as the orage package. # Maxim V. Dziumanenko m...@mylinux.com.ua. -# +# # Dmitry Nikitin luckas...@mail.ru, 2008. msgid msgstr @@ -52,11 +52,8 @@ msgid adjust to change hour msgstr змінити години #: ../globaltime/globaltime.c:496 -msgid -adjust to change minute. Click arrows with button 2 to change only 1 minute. -msgstr -уточнити на одну хвилину. Натисніть кнопку зі стрілкою 2 щоб змінити тільки -на 1 хвилину. +msgid adjust to change minute. Click arrows with button 2 to change only 1 minute. +msgstr уточнити на одну хвилину. Натисніть кнопку зі стрілкою 2 щоб змінити тільки на 1 хвилину. #: ../globaltime/gt_prefs.c:265 ../globaltime/gt_prefs.c:266 msgid NEW @@ -205,8 +202,7 @@ msgstr Клацніть щоб вибрати типовий колір тла #: ../globaltime/gt_prefs.c:877 ../globaltime/gt_prefs.c:910 msgid Cross this to use system default instead of selected color -msgstr -Перейшовши сюди використовуєте типовий системний колір замість вибраного +msgstr Перейшовши сюди використовуєте типовий системний колір замість вибраного #: ../globaltime/gt_prefs.c:896 msgid Click to change default text colour for clocks @@ -218,8 +214,7 @@ msgstr Клацніть щоб вибрати типовий шрифт для #: ../globaltime/gt_prefs.c:944 ../globaltime/gt_prefs.c:978 msgid Cross this to use system default font instead of selected font -msgstr -Перейшовши сюди використовуєте типовий системний шрифт замість вибраного +msgstr Перейшовши сюди використовуєте типовий системний шрифт замість вибраного #: ../globaltime/gt_prefs.c:963 msgid Click to change default font for clock time @@ -467,18 +462,8 @@ msgid fix time after suspend/hibernate msgstr скоригувати час після призупинення/сплячки #: ../panel-plugin/oc_config.c:415 -msgid -You only need this if you do short term (less than 5 hours) suspend or -hibernate and your visible time does not include seconds. Under these -circumstances it is possible that Orageclock shows time inaccurately unless -you have this selected. (Selecting this prevents cpu and interrupt saving -features from working.) -msgstr -Вам це потрібно якщо це відбувається в короткому проміжку часу (менше 5 -годин) призупинення чи сплячки і Ваш видимий час не включає секунд. В цих -випадках можливо, Orageclock відображатиме неточний час ніж вибраний Вами. -(Виберіть цю опцію для правильної роботи повідомлень з допомогою -процесора і системного переривання) +msgid You only need this if you do short term (less than 5 hours) suspend or hibernate and your visible time does not include seconds. Under these circumstances it is possible that Orageclock shows time inaccurately unless you have this selected. (Selecting this prevents cpu and interrupt saving features from working.) +msgstr Вам це потрібно якщо це відбувається в короткому проміжку часу (менше 5 годин) призупинення чи сплячки і Ваш видимий час не включає секунд. В цих випадках можливо, Orageclock відображатиме неточний час ніж вибраний Вами. (Виберіть цю опцію для правильної роботи повідомлень з допомогоюпроцесора і системного переривання) #: ../panel-plugin/oc_config.c:432 msgid @@ -492,8 +477,7 @@ msgid \t%X = local time\t\t\t%x = local date msgstr Ця програма використовує strftime для одержання часу.\n -Використовуйте будь-який правильний код щоб отримати час в потрібному -форматі\n +Використовуйте будь-який правильний код щоб отримати час в потрібному форматі\n Деякі з основних кодів:\n \t%A = день тижня\t\t\t%B = місяць\n \t%c = дата і час\t\t%R = години і хвилини\n @@ -514,7 +498,7 @@ msgstr Налаштування Orage #. * %B : full month name #. * %Y : four digit year #. * %V : ISO week number -#. +#. #: ../panel-plugin/xfce4-orageclock-plugin.c:623 msgid %A %d %B %Y/%V msgstr %A %d %B %Y/%V @@ -524,9 +508,8 @@ msgid Maintainer msgstr Супроводжувач #: ../src/about-xfcalendar.c:47 -#, fuzzy msgid Manage your time with Orage -msgstr Керуйте своїм часом з Xfce4 +msgstr Керуйте своїм часом з Orage #. if (gtk_toggle_button_get_active( #. GTK_TOGGLE_BUTTON(apptw-Type_journal_rb))) @@ -752,12 +735,8 @@ msgid Categories msgstr Категорії #: ../src/appointment.c:2729 -msgid -This
[Xfce4-commits] xfce4-time-out-plugin:master l10n: Updated Ukrainian (uk) translation to 90%
Updating branch refs/heads/master to 22b58a6d8435c6b5f25fc9906116a9dedb9754bc (commit) from 299636e6662606a66b86bc06ddaba4525118076b (commit) commit 22b58a6d8435c6b5f25fc9906116a9dedb9754bc Author: Dmitry Nikitin luckas...@mail.ru Date: Tue Dec 21 11:57:24 2010 +0100 l10n: Updated Ukrainian (uk) translation to 90% New status: 28 messages complete with 3 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/uk.po | 21 ++--- 1 files changed, 10 insertions(+), 11 deletions(-) diff --git a/po/uk.po b/po/uk.po index 1b54ed3..f0fe1ee 100644 --- a/po/uk.po +++ b/po/uk.po @@ -1,20 +1,20 @@ # Ukrainian translation of xfce4-time-out-plugin. # Copyright (C) 2008 Dmitry Nikitin # This file is distributed under the same license as the xfce4-time-out-plugin package. -# +# # Dmitry Nikitin luckas...@mail.ru, 2008. msgid msgstr Project-Id-Version: xfce4-time-out-plugin\n Report-Msgid-Bugs-To: \n -POT-Creation-Date: 2010-12-12 00:01+0900\n +POT-Creation-Date: 2010-12-21 05:13+\n PO-Revision-Date: 2008-11-27 21:02+0200\n Last-Translator: Dmitry Nikitin luckas...@mail.ru\n Language-Team: Ukrainian xfce4-...@xfce.org\n -Language: uk\n MIME-Version: 1.0\n Content-Type: text/plain; charset=UTF-8\n Content-Transfer-Encoding: 8bit\n +Language: uk\n X-Generator: KBabel 1.11.4\n #. Create menu item for taking an instant break @@ -33,8 +33,7 @@ msgid Enabled msgstr Активно #: ../panel-plugin/time-out.c:422 -msgid -Xfce Panel plugin for taking a break from computer work every now and then. +msgid Xfce Panel plugin for taking a break from computer work every now and then. msgstr Плагін панелі Xfce для організації часу роботи з комп’ютером #: ../panel-plugin/time-out.c:431 @@ -174,9 +173,9 @@ msgstr[1] %d секунди #: ../panel-plugin/time-out-countdown.c:524 #: ../panel-plugin/time-out-countdown.c:538 #: ../panel-plugin/time-out-countdown.c:543 -#, fuzzy, c-format +#, c-format msgid Time left: %s -msgstr Залишилось часу: %d годин +msgstr Залишилось часу: %s #. Translators: this is %s minutes, %s seconds #. Translators: this is %s hours %s seconds @@ -188,15 +187,15 @@ msgstr Залишилось часу: %d годин #: ../panel-plugin/time-out-countdown.c:499 #: ../panel-plugin/time-out-countdown.c:505 #: ../panel-plugin/time-out-countdown.c:527 -#, fuzzy, c-format +#, c-format msgid Time left: %s %s -msgstr Залишилось часу: %d годин +msgstr Залишилось часу: %s %s #. Translators: this is %s hours, %s minutes, %s seconds #: ../panel-plugin/time-out-countdown.c:467 -#, fuzzy, c-format +#, c-format msgid Time left: %s %s %s -msgstr Залишилось часу: %d секунд +msgstr Залишилось часу: %s %s %s #: ../panel-plugin/xfce4-time-out-plugin.desktop.in.in.h:1 msgid Automatically controlled time outs and breaks ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfce4-panel:master Make vertical clock rotation optional (bug #7002).
Updating branch refs/heads/master
to 5056f2d6c85aaad73f588ddc7b87a058b158bc72 (commit)
from 295841f8050728a3c0644dd66fe2ca5abe3f8e9a (commit)
commit 5056f2d6c85aaad73f588ddc7b87a058b158bc72
Author: Nick Schermer n...@xfce.org
Date: Tue Dec 21 15:43:30 2010 +0100
Make vertical clock rotation optional (bug #7002).
Not always nice to rotate the clock in some panel situations,
so make this optional in a hidden property rotate-vertically.
In 4.10 this will be configurable in the interface (bug #7027).
plugins/clock/clock-digital.c |6 +++---
plugins/clock/clock-fuzzy.c |6 +++---
plugins/clock/clock.c | 34 +++---
3 files changed, 37 insertions(+), 9 deletions(-)
diff --git a/plugins/clock/clock-digital.c b/plugins/clock/clock-digital.c
index 99121af..f042c19 100644
--- a/plugins/clock/clock-digital.c
+++ b/plugins/clock/clock-digital.c
@@ -46,9 +46,9 @@ static gboolean xfce_clock_digital_update (gpointer
user_dat
enum
{
- PROP_0,
- PROP_DIGITAL_FORMAT,
- PROP_SIZE_RATIO,
+ PROP_0,
+ PROP_DIGITAL_FORMAT,
+ PROP_SIZE_RATIO,
PROP_ORIENTATION
};
diff --git a/plugins/clock/clock-fuzzy.c b/plugins/clock/clock-fuzzy.c
index cbf2964..f1dcab5 100644
--- a/plugins/clock/clock-fuzzy.c
+++ b/plugins/clock/clock-fuzzy.c
@@ -61,9 +61,9 @@ enum
enum
{
- PROP_0,
- PROP_FUZZINESS,
- PROP_SIZE_RATIO,
+ PROP_0,
+ PROP_FUZZINESS,
+ PROP_SIZE_RATIO,
PROP_ORIENTATION
};
diff --git a/plugins/clock/clock.c b/plugins/clock/clock.c
index fe69faf..e76e655 100644
--- a/plugins/clock/clock.c
+++ b/plugins/clock/clock.c
@@ -83,7 +83,8 @@ enum
PROP_MODE,
PROP_SHOW_FRAME,
PROP_TOOLTIP_FORMAT,
- PROP_COMMAND
+ PROP_COMMAND,
+ PROP_ROTATE_VERTICALLY
};
typedef enum
@@ -116,6 +117,7 @@ struct _ClockPlugin
guint show_frame : 1;
gchar *command;
ClockPluginMode mode;
+ guint rotate_vertically : 1;
gchar *tooltip_format;
ClockPluginTimeout *tooltip_timeout;
@@ -221,6 +223,13 @@ clock_plugin_class_init (ClockPluginClass *klass)
EXO_PARAM_READWRITE));
g_object_class_install_property (gobject_class,
+ PROP_ROTATE_VERTICALLY,
+ g_param_spec_boolean (rotate-vertically,
+ NULL, NULL,
+ FALSE,
+ EXO_PARAM_READWRITE));
+
+ g_object_class_install_property (gobject_class,
PROP_COMMAND,
g_param_spec_string (command,
NULL, NULL, NULL,
@@ -238,6 +247,7 @@ clock_plugin_init (ClockPlugin *plugin)
plugin-tooltip_format = g_strdup (DEFAULT_TOOLTIP_FORMAT);
plugin-tooltip_timeout = NULL;
plugin-command = NULL;
+ plugin-rotate_vertically = FALSE;
plugin-frame = gtk_frame_new (NULL);
gtk_container_add (GTK_CONTAINER (plugin), plugin-frame);
@@ -273,6 +283,10 @@ clock_plugin_get_property (GObject*object,
g_value_set_string (value, plugin-command);
break;
+case PROP_ROTATE_VERTICALLY:
+ g_value_set_boolean (value, plugin-rotate_vertically);
+ break;
+
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
break;
@@ -289,6 +303,7 @@ clock_plugin_set_property (GObject *object,
{
ClockPlugin *plugin = XFCE_CLOCK_PLUGIN (object);
gboolean show_frame;
+ gboolean rotate_vertically;
switch (prop_id)
{
@@ -320,6 +335,15 @@ clock_plugin_set_property (GObject *object,
plugin-command = g_value_dup_string (value);
break;
+case PROP_ROTATE_VERTICALLY:
+ rotate_vertically = g_value_get_boolean (value);
+ if (plugin-rotate_vertically != rotate_vertically)
+{
+ plugin-rotate_vertically = rotate_vertically;
+ clock_plugin_set_mode (plugin);
+}
+ break;
+
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
break;
@@ -402,6 +426,7 @@ clock_plugin_construct (XfcePanelPlugin *panel_plugin)
{ show-frame, G_TYPE_BOOLEAN },
{ tooltip-format, G_TYPE_STRING },
{ command, G_TYPE_STRING },
+{ rotate-vertically, G_TYPE_BOOLEAN },
{ NULL }
};
@@ -805,14 +830,17 @@ clock_plugin_set_mode (ClockPlugin *plugin)
properties[plugin-mode], FALSE);
gtk_container_add (GTK_CONTAINER (plugin-frame), plugin-clock);
- exo_binding_new (G_OBJECT (plugin), orientation, G_OBJECT (plugin-clock),
orientation);
clock_plugin_size_changed (XFCE_PANEL_PLUGIN (plugin),
xfce_panel_plugin_get_size (XFCE_PANEL_PLUGIN (plugin)));
- gtk_widget_show (plugin-clock);
+
+ if
[Xfce4-commits] xfce4-notifyd:master Remove the option from the settings dialog.
Updating branch refs/heads/master
to ee52401ae610726a007b4b0712907a392d043110 (commit)
from d4265988c27b3993a80e287868a0c2773fd48bf6 (commit)
commit ee52401ae610726a007b4b0712907a392d043110
Author: Jérôme Guelfucci jero...@xfce.org
Date: Mon Dec 20 19:28:29 2010 +0100
Remove the option from the settings dialog.
xfce4-notifyd-config/main.c |6 +---
xfce4-notifyd-config/xfce4-notifyd-config.glade | 33 +--
2 files changed, 2 insertions(+), 37 deletions(-)
diff --git a/xfce4-notifyd-config/main.c b/xfce4-notifyd-config/main.c
index 47b3aec..1f3d64e 100644
--- a/xfce4-notifyd-config/main.c
+++ b/xfce4-notifyd-config/main.c
@@ -233,7 +233,7 @@ static GtkWidget *
xfce4_notifyd_config_setup_dialog(GtkBuilder *builder)
{
XfconfChannel *channel;
-GtkWidget *dlg, *btn, *sbtn, *slider, *chk, *treeview, *combo;
+GtkWidget *dlg, *btn, *sbtn, *slider, *treeview, *combo;
GtkAdjustment *adj;
GtkTreeSelection *sel;
GError *error = NULL;
@@ -276,10 +276,6 @@ xfce4_notifyd_config_setup_dialog(GtkBuilder *builder)
xfconf_g_property_bind(channel, /initial-opacity, G_TYPE_DOUBLE,
G_OBJECT(adj), value);
-chk = GTK_WIDGET(gtk_builder_get_object(builder,
fade_transparency_chk));
-xfconf_g_property_bind(channel, /fade-transparency, G_TYPE_BOOLEAN,
- G_OBJECT(chk), active);
-
treeview = GTK_WIDGET(gtk_builder_get_object(builder, themes_treeview));
current_theme = xfconf_channel_get_string(channel, /theme, Default);
xfce4_notifyd_config_setup_treeview(treeview, current_theme);
diff --git a/xfce4-notifyd-config/xfce4-notifyd-config.glade
b/xfce4-notifyd-config/xfce4-notifyd-config.glade
index a96d22b..0fedf2a 100644
--- a/xfce4-notifyd-config/xfce4-notifyd-config.glade
+++ b/xfce4-notifyd-config/xfce4-notifyd-config.glade
@@ -42,7 +42,6 @@
property name=window_positioncenter-on-parent/property
property name=icon_namexfce4-notifyd/property
property name=type_hintdialog/property
-property name=has_separatorFalse/property
property name=subtitle translatable=yesCustomize how notifications
appear on your screen/property
child internal-child=vbox
object class=GtkVBox id=dialog-vbox1
@@ -76,7 +75,7 @@
child
object class=GtkTable id=table1
property name=visibleTrue/property
-property name=n_rows4/property
+property name=n_rows3/property
property name=n_columns2/property
property name=column_spacing10/property
property name=row_spacing10/property
@@ -192,36 +191,6 @@
property name=bottom_attach3/property
/packing
/child
-child
- object class=GtkCheckButton id=fade_transparency_chk
-property name=label translatable=yes_Fade to
transparent/property
-property name=visibleTrue/property
-property name=can_focusTrue/property
-property name=receives_defaultFalse/property
-property name=use_underlineTrue/property
-property name=xalign0/property
-property name=activeTrue/property
-property name=draw_indicatorTrue/property
- /object
- packing
-property name=left_attach1/property
-property name=right_attach2/property
-property name=top_attach3/property
-property name=bottom_attach4/property
- /packing
-/child
-child
- object class=GtkLabel id=label5
-property name=visibleTrue/property
-property name=xalign0/property
-property name=label
translatable=yes_Effect:/property
-property name=use_underlineTrue/property
- /object
- packing
-property name=top_attach3/property
-property name=bottom_attach4/property
- /packing
-/child
/object
packing
property name=position1/property
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfce4-notifyd:master Remove fade to transparent option.
Updating branch refs/heads/master
to d4265988c27b3993a80e287868a0c2773fd48bf6 (commit)
from aac0a7b316d57a7d033f50ebfb5fc3560fed1656 (commit)
commit d4265988c27b3993a80e287868a0c2773fd48bf6
Author: Jérôme Guelfucci jero...@xfce.org
Date: Mon Dec 20 19:25:36 2010 +0100
Remove fade to transparent option.
Now we fade to transparent if we have a compositor.
xfce4-notifyd/xfce-notify-daemon.c | 11 --
xfce4-notifyd/xfce-notify-window.c | 39
2 files changed, 13 insertions(+), 37 deletions(-)
diff --git a/xfce4-notifyd/xfce-notify-daemon.c
b/xfce4-notifyd/xfce-notify-daemon.c
index f677923..999214f 100644
--- a/xfce4-notifyd/xfce-notify-daemon.c
+++ b/xfce4-notifyd/xfce-notify-daemon.c
@@ -50,7 +50,6 @@ struct _XfceNotifyDaemon
GObject parent;
gint expire_timeout;
-gboolean fade_transparency;
gdouble initial_opacity;
GtkCornerType notify_location;
@@ -862,8 +861,6 @@ notify_notify(XfceNotifyDaemon *xndaemon,
xfce_notify_window_set_body(window, body);
xfce_notify_window_set_actions(window, actions);
xfce_notify_window_set_expire_timeout(window, expire_timeout);
-xfce_notify_window_set_fade_transparent(window,
-xndaemon-fade_transparency);
xfce_notify_window_set_opacity(window, xndaemon-initial_opacity);
*OUT_id = replaces_id;
@@ -872,8 +869,6 @@ notify_notify(XfceNotifyDaemon *xndaemon,
app_icon,
expire_timeout,
actions));
-xfce_notify_window_set_fade_transparent(window,
-xndaemon-fade_transparency);
xfce_notify_window_set_opacity(window, xndaemon-initial_opacity);
*OUT_id = xfce_notify_daemon_generate_id(xndaemon);
@@ -1102,9 +1097,6 @@ xfce_notify_daemon_settings_changed(XfconfChannel
*channel,
? g_value_get_int(value) : -1;
if(xndaemon-expire_timeout != -1)
xndaemon-expire_timeout *= 1000;
-} else if(!strcmp(property, /fade-transparency)) {
-xndaemon-fade_transparency = G_VALUE_TYPE(value)
-? g_value_get_boolean(value) : TRUE;
} else if(!strcmp(property, /initial-opacity)) {
xndaemon-initial_opacity = G_VALUE_TYPE(value)
? g_value_get_double(value) : 0.9;
@@ -1175,9 +1167,6 @@ xfce_notify_daemon_load_config(XfceNotifyDaemon *xndaemon,
if(xndaemon-expire_timeout != -1)
xndaemon-expire_timeout *= 1000;
-xndaemon-fade_transparency = xfconf_channel_get_bool(xndaemon-settings,
-/fade-transparency,
-TRUE);
xndaemon-initial_opacity = xfconf_channel_get_double(xndaemon-settings,
/initial-opacity,
0.9);
diff --git a/xfce4-notifyd/xfce-notify-window.c
b/xfce4-notifyd/xfce-notify-window.c
index a7c7289..4190c84 100644
--- a/xfce4-notifyd/xfce-notify-window.c
+++ b/xfce4-notifyd/xfce-notify-window.c
@@ -58,8 +58,7 @@ struct _XfceNotifyWindow
gdouble normal_opacity;
-guint32 fade_transparent:1,
-icon_only:1,
+guint32 icon_only:1,
has_summary_text:1,
has_body_text:1,
has_actions;
@@ -200,7 +199,6 @@ xfce_notify_window_init(XfceNotifyWindow *window)
GTK_WINDOW(window)-type = GTK_WINDOW_TOPLEVEL;
window-expire_timeout = DEFAULT_EXPIRE_TIMEOUT;
window-normal_opacity = DEFAULT_NORMAL_OPACITY;
-window-fade_transparent = TRUE;
/* The summary widget needs to be initialized before style_set is called.
gtk_widget_ensure_style calls style_set */
window-summary = gtk_label_new(NULL);
@@ -271,9 +269,15 @@ xfce_notify_window_start_expiration(XfceNotifyWindow
*window)
{
if(window-expire_timeout) {
GTimeVal ct;
+gboolean fade_transparent;
+
g_get_current_time(ct);
+
+fade_transparent =
+gdk_screen_is_composited(gtk_window_get_screen(GTK_WINDOW
(window)));
+
window-expire_start_timestamp = ct.tv_sec * 1000 + ct.tv_usec / 1000;
-window-expire_id = g_timeout_add(window-fade_transparent
+window-expire_id = g_timeout_add(fade_transparent
? window-expire_timeout - FADE_TIME
: window-expire_timeout,
xfce_notify_window_expire_timeout,
@@ -661,10 +665,14 @@ static gboolean
xfce_notify_window_expire_timeout(gpointer data)
{
[Xfce4-commits] xfce4-notifyd:master Merge branch 'master' of ssh://git.xfce.org/git/apps/xfce4-notifyd
Updating branch refs/heads/master
to 6389a44679b18643ccffd11d9caea9a9f73a5a48 (commit)
from ee52401ae610726a007b4b0712907a392d043110 (commit)
commit 6389a44679b18643ccffd11d9caea9a9f73a5a48
Merge: ee52401 fb78c0c
Author: Jérôme Guelfucci jero...@xfce.org
Date: Tue Dec 21 16:59:20 2010 +0100
Merge branch 'master' of ssh://git.xfce.org/git/apps/xfce4-notifyd
commit fb78c0cfadc8132e61b023ab99a508142db45ef0
Author: Dmitry Nikitin luckas...@mail.ru
Date: Tue Dec 21 11:45:23 2010 +0100
l10n: Updated Ukrainian (uk) translation to 100%
New status: 29 messages complete with 0 fuzzies and 0 untranslated.
Transmitted-via: Transifex (translations.xfce.org).
commit 96fac7eb0cc9c0f4152ee17f44fa184b02677337
Author: Dmitry Nikitin luckas...@mail.ru
Date: Tue Dec 21 11:41:16 2010 +0100
l10n: Updated Ukrainian (uk) translation to 96%
New status: 28 messages complete with 0 fuzzies and 1 untranslated.
Transmitted-via: Transifex (translations.xfce.org).
commit fe7e0b8a28c805e76f37c073c30540c79fb86f40
Author: Andhika Padmawan andhika.padma...@gmail.com
Date: Sun Dec 19 12:57:13 2010 +0100
l10n: Updated Indonesian (id) translation to 100%
New status: 29 messages complete with 0 fuzzies and 0 untranslated.
Transmitted-via: Transifex (translations.xfce.org).
commit def239f143f5f6aaf717f7edecb7cd596444e426
Author: Jeff Bailes thepizzak...@gmail.com
Date: Sun Dec 19 10:32:58 2010 +0100
l10n: en_GB translation.
New status: 29 messages complete with 0 fuzzies and 0 untranslated.
Transmitted-via: Transifex (translations.xfce.org).
po/{fi.po = en_GB.po} | 87 +++
po/id.po | 65 +---
po/uk.po | 68 +
3 files changed, 120 insertions(+), 100 deletions(-)
diff --git a/po/fi.po b/po/en_GB.po
similarity index 61%
copy from po/fi.po
copy to po/en_GB.po
index 1e32d09..bf878fc 100644
--- a/po/fi.po
+++ b/po/en_GB.po
@@ -1,146 +1,145 @@
-# Finnish translations for xfce4-notifyd package.
-# Copyright (C) 2008 Brian J. Tarricone
-# This file is distributed under the same license as the xfce-notifyd package.
-# Jari Rahkonen jari.rahko...@pp1.inet.fi, 2008, 2010.
+# xfce4-notifyd en_GB translation.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# Jeff Bailes thepizzak...@gmail.com, 2010.
#
msgid
msgstr
-Project-Id-Version: xfce4-notifyd\n
+Project-Id-Version: \n
Report-Msgid-Bugs-To: \n
-POT-Creation-Date: 2010-11-22 23:03+\n
-PO-Revision-Date: 2010-11-23 11:36+0200\n
-Last-Translator: Jari Rahkonen jari.rahko...@pp1.inet.fi\n
-Language-Team: Finnish xfce-i...@xfce.org\n
+POT-Creation-Date: 2010-12-19 05:05+\n
+PO-Revision-Date: 2010-12-19 20:30+1100\n
+Last-Translator: Jeff Bailes thepizzak...@gmail.com\n
+Language-Team: en_GB\n
MIME-Version: 1.0\n
Content-Type: text/plain; charset=UTF-8\n
Content-Transfer-Encoding: 8bit\n
-Language: \n
-Plural-Forms: nplurals=2; plural=(n != 1);\n
#: ../xfce4-notifyd/main.c:50 ../xfce4-notifyd/main.c:60
#: ../xfce4-notifyd-config/main.c:257
msgid Xfce Notify Daemon
-msgstr Xfce:n huomautuspalvelu
+msgstr Xfce Notify Daemon
#: ../xfce4-notifyd/main.c:53
#, c-format
msgid Unknown option \%s\\n
-msgstr Tuntematon valitsin \%s\\n
+msgstr Unknown option \%s\\n
#: ../xfce4-notifyd/main.c:62
msgid Unable to start notification daemon
-msgstr Huomautuspalvelua ei voi käynnistää
+msgstr Unable to start notification daemon
-#: ../xfce4-notifyd/xfce-notify-daemon.c:1118
+#: ../xfce4-notifyd/xfce-notify-daemon.c:1134
#, c-format
msgid Unable to connect to D-Bus session bus
-msgstr D-Bus -istuntoväylään ei saa yhteyttä
+msgstr Unable to connect to D-Bus session bus
-#: ../xfce4-notifyd/xfce-notify-daemon.c:1135
+#: ../xfce4-notifyd/xfce-notify-daemon.c:1151
#, c-format
msgid Another notification xndaemon is already running
-msgstr Toinen huomautuspalvelu on jo käynnissä
+msgstr Another notification xndaemon is already running
#: ../xfce4-notifyd/xfce-notify-window.c:809
msgid image:
-msgstr kuva:
+msgstr image:
#: ../xfce4-notifyd-config/main.c:196
msgid Theme
-msgstr Teema
+msgstr Theme
#: ../xfce4-notifyd-config/main.c:223
msgid
notify-send \Notification Preview\ \This is how notifications will look
like\
msgstr
-notify-send \Mallihuomautus\ \Huomautukset näyttävät tältä.\
+notify-send \Notification Preview\ \This is how notifications will look
+like\
#: ../xfce4-notifyd-config/main.c:227
msgid Notification preview failed
-msgstr Mallihuomautusta ei voi näyttää
+msgstr Notification preview failed
#: ../xfce4-notifyd-config/main.c:259
msgid Settings daemon is unavailable
-msgstr Asetuspalveluun ei saa yhteyttä
+msgstr Settings daemon is unavailable
#: ../xfce4-notifyd-config/main.c:314
msgid Display
[Xfce4-commits] xfce4-notifyd:master l10n: Updated Galician (gl) translation to 100%
Updating branch refs/heads/master to 6e98556e02e7fb5cafd28a31a6f103928b2843fe (commit) from 6389a44679b18643ccffd11d9caea9a9f73a5a48 (commit) commit 6e98556e02e7fb5cafd28a31a6f103928b2843fe Author: Leandro Regueiro leandro.regue...@gmail.com Date: Tue Dec 21 17:18:13 2010 +0100 l10n: Updated Galician (gl) translation to 100% New status: 29 messages complete with 0 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/gl.po | 67 - 1 files changed, 39 insertions(+), 28 deletions(-) diff --git a/po/gl.po b/po/gl.po index 3553874..47fdc3a 100644 --- a/po/gl.po +++ b/po/gl.po @@ -1,28 +1,28 @@ # Galician translation of xfce4-notifyd # Copyright (C) 2009 Leandro Regueiro. # This file is distributed under the same license as the Xfce package. -# +# # Leandro Regueiro leandro DOT regueiro AT gmail DOT com, 2009. -# +# # Proxecto Trasno - Adaptación do software libre á lingua galega: Se desexas # colaborar connosco, podes atopar máis información en http://trasno.net -# +# msgid msgstr Project-Id-Version: Transifex master\n Report-Msgid-Bugs-To: \n -POT-Creation-Date: 2010-11-07 18:14+0100\n +POT-Creation-Date: 2010-12-21 11:05+\n PO-Revision-Date: 2009-11-06 13:49+0100\n Last-Translator: Leandro Regueiro leandro.regue...@gmail.com\n Language-Team: Galician proxe...@trasno.net\n -Language: gl\n MIME-Version: 1.0\n Content-Type: text/plain; charset=UTF-8\n Content-Transfer-Encoding: 8bit\n +Language: gl\n Plural-Forms: nplurals=2; plural=(n != 1);\n #: ../xfce4-notifyd/main.c:50 ../xfce4-notifyd/main.c:60 -#: ../xfce4-notifyd-config/main.c:229 +#: ../xfce4-notifyd-config/main.c:257 msgid Xfce Notify Daemon msgstr Daemon de notificación de Xfce @@ -35,22 +35,17 @@ msgstr Opción \%s\ descoñecida\n msgid Unable to start notification daemon msgstr Non foi posible iniciar o daemon de notificación -#: ../xfce4-notifyd/xfce-notify-daemon.c:1073 +#: ../xfce4-notifyd/xfce-notify-daemon.c:1134 #, c-format msgid Unable to connect to D-Bus session bus msgstr Non se puido conectar ao bus de sesión de D-Bus -#: ../xfce4-notifyd/xfce-notify-daemon.c:1090 -#, fuzzy, c-format +#: ../xfce4-notifyd/xfce-notify-daemon.c:1151 +#, c-format msgid Another notification xndaemon is already running msgstr Xa se está executando outro daemon de notificación -#: ../xfce4-notifyd/xfce-notify-window.c:756 -#, c-format -msgid %s could not be launched -msgstr - -#: ../xfce4-notifyd/xfce-notify-window.c:857 +#: ../xfce4-notifyd/xfce-notify-window.c:809 msgid image: msgstr imaxe: @@ -58,44 +53,52 @@ msgstr imaxe: msgid Theme msgstr Tema -#: ../xfce4-notifyd-config/main.c:231 +#: ../xfce4-notifyd-config/main.c:223 +msgid notify-send \Notification Preview\ \This is how notifications will look like\ +msgstr notify-send \Previsualización de notificación\ \Esta é a pinta que teñen as notificacións\ + +#: ../xfce4-notifyd-config/main.c:227 +msgid Notification preview failed +msgstr Produciuse un erro ao previsualizar a notificación + +#: ../xfce4-notifyd-config/main.c:259 msgid Settings daemon is unavailable msgstr O daemon de configuración non está dispoñible -#: ../xfce4-notifyd-config/main.c:286 +#: ../xfce4-notifyd-config/main.c:314 msgid Display version information msgstr Mostrar a información da versión -#: ../xfce4-notifyd-config/main.c:287 +#: ../xfce4-notifyd-config/main.c:315 msgid Settings manager socket msgstr Socket do xestor de configuración -#: ../xfce4-notifyd-config/main.c:287 +#: ../xfce4-notifyd-config/main.c:315 msgid SOCKET_ID msgstr ID_SOCKET -#: ../xfce4-notifyd-config/main.c:297 +#: ../xfce4-notifyd-config/main.c:325 #, c-format msgid Type '%s --help' for usage. msgstr Escriba '%s --help' para ver o modo de uso. -#: ../xfce4-notifyd-config/main.c:309 +#: ../xfce4-notifyd-config/main.c:338 #, c-format msgid Released under the terms of the GNU General Public License, version 2\n msgstr Publicado baixo os termos da Licenza Pública Xeral de GNU, versión 2\n -#: ../xfce4-notifyd-config/main.c:310 +#: ../xfce4-notifyd-config/main.c:339 #, c-format msgid Please report bugs to %s.\n msgstr Por favor, comuníquelle os erros a %s.\n #: ../xfce4-notifyd-config/xfce4-notifyd-config.glade.h:1 msgid Bottom left -msgstr +msgstr Abaixo á esquerda #: ../xfce4-notifyd-config/xfce4-notifyd-config.glade.h:2 msgid Bottom right -msgstr +msgstr Abaixo á dereita #: ../xfce4-notifyd-config/xfce4-notifyd-config.glade.h:3 #: ../xfce4-notifyd-config/xfce4-notifyd-config.desktop.in.h:1 @@ -113,25 +116,33 @@ msgstr Notificacións #: ../xfce4-notifyd-config/xfce4-notifyd-config.glade.h:6 msgid Top left -msgstr +msgstr Arriba á esquerda #: ../xfce4-notifyd-config/xfce4-notifyd-config.glade.h:7 msgid Top right -msgstr +msgstr Arriba á dereita #: ../xfce4-notifyd-config/xfce4-notifyd-config.glade.h:8 msgid _Disappear
[Xfce4-commits] postler:master Exclude hidden folders from fetching
Updating branch refs/heads/master
to ad213ee01dbba5ee8cb2981ba14da6a8513446b0 (commit)
from 12f689c5f6819f2ef19cd6ce04e881271f08a093 (commit)
commit ad213ee01dbba5ee8cb2981ba14da6a8513446b0
Author: Bernd Prünster bernd.pruens...@gmail.com
Date: Mon Dec 20 23:14:30 2010 +0100
Exclude hidden folders from fetching
Fixes: https://bugs.launchpad.net/postler/+bug/676615
postler/postler-accounts.vala | 14 +-
1 files changed, 13 insertions(+), 1 deletions(-)
diff --git a/postler/postler-accounts.vala b/postler/postler-accounts.vala
index 0c16ee8..b2a0303 100644
--- a/postler/postler-accounts.vala
+++ b/postler/postler-accounts.vala
@@ -419,6 +419,16 @@ public class Postler.Accounts : GLib.Object {
if (certificate != null !Path.is_absolute (certificate))
certificate = info.path + / + certificate;
+/* Exclude hidden folders from fetching */
+string[] hidden_tmp = info.hide.split (,);
+string hidden_folders = ;
+foreach (string hidden in hidden_tmp) {
+if (hidden.contains ( ))
+hidden_folders += \! + hidden.replace (~-, /) + \;
+else
+hidden_folders += ! + hidden;
+}
+
if (send != null) {
string msmtprc =
defaults
@@ -473,6 +483,7 @@ public class Postler.Accounts : GLib.Object {
Master :remote:
Slave :local:
Patterns %% * !INBOX
+ Patterns %% %s
Group mirror
Channel local-remote:INBOX
@@ -487,7 +498,8 @@ public class Postler.Accounts : GLib.Object {
certificate != null ? CertificateFile : ,
certificate != null ? certificate : ,
info.path,
- info.path
+ info.path,
+ hidden_folders
);
FileUtils.set_contents (filename, mbsyncrc, -1);
FileUtils.chmod (filename, 0700);
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] postler:master Optimise fetching for single accounts
Updating branch refs/heads/master
to 98ff70d5ffa8268038148ba0a226612db4a5a5d5 (commit)
from ad213ee01dbba5ee8cb2981ba14da6a8513446b0 (commit)
commit 98ff70d5ffa8268038148ba0a226612db4a5a5d5
Author: Christian Dywan christ...@twotoasts.de
Date: Mon Dec 20 23:18:29 2010 +0100
Optimise fetching for single accounts
postler/postler-bureau.vala |4 ++--
postler/postler-service.vala | 14 +++---
2 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/postler/postler-bureau.vala b/postler/postler-bureau.vala
index 4bccc19..1dece50 100644
--- a/postler/postler-bureau.vala
+++ b/postler/postler-bureau.vala
@@ -333,7 +333,7 @@ public class Postler.Bureau : Gtk.Window {
void action_account_new () {
AccountSetup.new_account ().done.connect ((setup, info) = {
accounts.add_info (info);
-client.fetch ();
+client.fetch (info.name);
folders.populate ();
} );
}
@@ -656,7 +656,7 @@ public class Postler.Bureau : Gtk.Window {
messages.parent.set_no_show_all (false);
messages.parent.show_all ();
accounts.add_info (info);
-client.fetch ();
+client.fetch (info.name);
folders.populate ();
});
}
diff --git a/postler/postler-service.vala b/postler/postler-service.vala
index c7723c3..58f4502 100644
--- a/postler/postler-service.vala
+++ b/postler/postler-service.vala
@@ -159,24 +159,24 @@ namespace Postler {
try {
string command = accounts.get_fetch_command (info);
string output;
-Process.spawn_sync (null, command.split ( ), null,
SpawnFlags.SEARCH_PATH, null, out output);
+Process.spawn_sync (null, command.split ( ), null,
+SpawnFlags.SEARCH_PATH, null, out
output);
GLib.debug (%s - %s, info.path, output);
string[] folders = ((output.split (INBOX\n
+ Channel local-remote\n
+ Opening slave local...\n
+ local-remote:))[1]).split (\n);
/* INBOX is always needed */
-DirUtils.create (info.path + /INBOX, 0700);
-DirUtils.create (info.path + /INBOX/new, 0700);
+DirUtils.create_with_parents (info.path + /INBOX/new,
0700);
DirUtils.create (info.path + /INBOX/cur, 0700);
DirUtils.create (info.path + /INBOX/tmp, 0700);
foreach (string current_folder in folders) {
if (current_folder == )
continue;
-DirUtils.create (info.path + / +
current_folder.replace (/, ~-), 0700);
-DirUtils.create (info.path + / +
current_folder.replace (/, ~-) + /new, 0700);
-DirUtils.create (info.path + / +
current_folder.replace (/, ~-) + /cur, 0700);
-DirUtils.create (info.path + / +
current_folder.replace (/, ~-) + /tmp, 0700);
+string folder = info.path + / +
current_folder.replace (/, ~-);
+DirUtils.create_with_parents (folder + /new, 0700);
+DirUtils.create (folder + /cur, 0700);
+DirUtils.create (current_folder + /tmp, 0700);
}
} catch (Error error) {
return false;
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] postler:master Remove extra space causing warning in mbsync
Updating branch refs/heads/master
to 43ea54042a88826122e4a8f9a0164ddec65012ae (commit)
from 98ff70d5ffa8268038148ba0a226612db4a5a5d5 (commit)
commit 43ea54042a88826122e4a8f9a0164ddec65012ae
Author: Christian Dywan christ...@twotoasts.de
Date: Mon Dec 20 23:24:17 2010 +0100
Remove extra space causing warning in mbsync
postler/postler-accounts.vala |2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/postler/postler-accounts.vala b/postler/postler-accounts.vala
index b2a0303..65e31ff 100644
--- a/postler/postler-accounts.vala
+++ b/postler/postler-accounts.vala
@@ -540,7 +540,7 @@ public class Postler.Accounts : GLib.Object {
if (mbsync == null || mbsync == )
mbsync = postler-mbsync;
string filename = get_tool_configuration (null, info);
-command = %s --list -c %s mirror.printf (
+command = %s --list -c %s mirror.printf (
mbsync, filename);
}
else
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] postler:master Use the new org.elementary.dexterserver
Updating branch refs/heads/master
to 55e405b7c9dc2e93e6cbabbbefbd47a2d015f262 (commit)
from 43ea54042a88826122e4a8f9a0164ddec65012ae (commit)
commit 55e405b7c9dc2e93e6cbabbbefbd47a2d015f262
Author: Christian Dywan christ...@twotoasts.de
Date: Tue Dec 21 20:42:59 2010 +0100
Use the new org.elementary.dexterserver
postler/dexter.vala | 12 ++--
postler/postler-composer.vala |2 +-
2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/postler/dexter.vala b/postler/dexter.vala
index 812a502..d8a830b 100644
--- a/postler/dexter.vala
+++ b/postler/dexter.vala
@@ -11,10 +11,10 @@
namespace Dexter {
-[DBus (name = org.elementary.dexterservice)]
+[DBus (name = org.elementary.dexterserver)]
interface DexterService : Object {
public abstract string get_name (string email_address) throws IOError;
-public abstract string[] search_contacts (string keywords) throws
IOError;
+public abstract string[] autocomplete_contact (string keywords) throws
IOError;
public abstract void show_window () throws IOError;
}
@@ -23,8 +23,8 @@ namespace Dexter {
public Dexter () {
try {
service = Bus.get_proxy_sync (BusType.SESSION,
- org.elementary.dexterservice,
- /org/elementary/dexterservice);
+ org.elementary.dexterserver,
+ /org/elementary/dexterserver);
/* Ensure Dexter is running, ignore errors, without is fine */
Process.spawn_async (null, { dexter, -d }, null,
SpawnFlags.SEARCH_PATH
@@ -41,9 +41,9 @@ namespace Dexter {
return null;
}
}
-public string[] search_contacts (string keywords) {
+public string[] autocomplete_contact (string keywords) {
try {
-return service.search_contacts (keywords);
+return service.autocomplete_contact (keywords);
} catch (GLib.Error error) {
return {};
}
diff --git a/postler/postler-composer.vala b/postler/postler-composer.vala
index 48585ab..535f7d9 100644
--- a/postler/postler-composer.vala
+++ b/postler/postler-composer.vala
@@ -358,7 +358,7 @@ public class Postler.Composer : Gtk.Window {
var model = entry.get_completion ().model as Gtk.ListStore;
if (model.iter_n_children (null) 0)
return;
-string[] contacts = dexter.search_contacts (entry.text);
+string[] contacts = dexter.autocomplete_contact (entry.text);
foreach (string contact in contacts) {
Gtk.TreeIter iter;
model.append (out iter);
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] postler:master Quote the Path value in mbsyncrc
Updating branch refs/heads/master
to e9ba401cfa170e2bcfb313e1815f88f152d1c9d2 (commit)
from 55e405b7c9dc2e93e6cbabbbefbd47a2d015f262 (commit)
commit e9ba401cfa170e2bcfb313e1815f88f152d1c9d2
Author: Christian Dywan christ...@twotoasts.de
Date: Tue Dec 21 20:49:12 2010 +0100
Quote the Path value in mbsyncrc
A warning is issues in case of a space without quotes.
postler/postler-accounts.vala |2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/postler/postler-accounts.vala b/postler/postler-accounts.vala
index 65e31ff..8902c31 100644
--- a/postler/postler-accounts.vala
+++ b/postler/postler-accounts.vala
@@ -470,7 +470,7 @@ public class Postler.Accounts : GLib.Object {
Host %s
User %s
Pass %s
- Path %s
+ Path %s
UseIMAPS yes
CertificateFile %s
%s %s
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] postler:master Call dexter-server instead of the old dexter -d
Updating branch refs/heads/master
to 733cfd12f239c91b8cbf0855645f8a3b531e10fa (commit)
from 9e2531cae02131daa1d00ad4d3c3ef1f16ae1fed (commit)
commit 733cfd12f239c91b8cbf0855645f8a3b531e10fa
Author: Christian Dywan christ...@twotoasts.de
Date: Tue Dec 21 21:07:29 2010 +0100
Call dexter-server instead of the old dexter -d
postler/dexter.vala |2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/postler/dexter.vala b/postler/dexter.vala
index d8a830b..28bad16 100644
--- a/postler/dexter.vala
+++ b/postler/dexter.vala
@@ -26,7 +26,7 @@ namespace Dexter {
org.elementary.dexterserver,
/org/elementary/dexterserver);
/* Ensure Dexter is running, ignore errors, without is fine */
-Process.spawn_async (null, { dexter, -d }, null,
+Process.spawn_async (null, { dexter-server }, null,
SpawnFlags.SEARCH_PATH
| SpawnFlags.STDOUT_TO_DEV_NULL
| SpawnFlags.STDERR_TO_DEV_NULL,
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] postler:master Ellipsise and justify the statuslabel
Updating branch refs/heads/master
to 9e2531cae02131daa1d00ad4d3c3ef1f16ae1fed (commit)
from e9ba401cfa170e2bcfb313e1815f88f152d1c9d2 (commit)
commit 9e2531cae02131daa1d00ad4d3c3ef1f16ae1fed
Author: Christian Dywan christ...@twotoasts.de
Date: Tue Dec 21 20:58:49 2010 +0100
Ellipsise and justify the statuslabel
postler/postler-bureau.vala |2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/postler/postler-bureau.vala b/postler/postler-bureau.vala
index 1dece50..8c031f2 100644
--- a/postler/postler-bureau.vala
+++ b/postler/postler-bureau.vala
@@ -538,6 +538,8 @@ public class Postler.Bureau : Gtk.Window {
progressbar = new Gtk.ProgressBar ();
statuslabel = new Gtk.Label ();
+statuslabel.justify = Gtk.Justification.CENTER;
+statuslabel.ellipsize = Pango.EllipsizeMode.END;
var panebox = new Gtk.VBox (false, 0);
panebox.border_width = 4;
panebox.pack_start (folderbox, true, true, 0);
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfce4-panel:master Fix various size allocation issues in clock (bug #5219, #3960).
Updating branch refs/heads/master
to f24985be06d4e5f78dac7cf3f607acf6215478c6 (commit)
from 5056f2d6c85aaad73f588ddc7b87a058b158bc72 (commit)
commit f24985be06d4e5f78dac7cf3f607acf6215478c6
Author: Nick Schermer n...@xfce.org
Date: Tue Dec 21 21:05:29 2010 +0100
Fix various size allocation issues in clock (bug #5219, #3960).
Also change the way the lcd clock draws it's segments, so the spacing
between the segments looks better in different panel sizes.
plugins/clock/clock-binary.c |4 -
plugins/clock/clock-lcd.c| 142 ++
plugins/clock/clock.c| 26 ++--
3 files changed, 108 insertions(+), 64 deletions(-)
diff --git a/plugins/clock/clock-binary.c b/plugins/clock/clock-binary.c
index 9580263..dbb49e1 100644
--- a/plugins/clock/clock-binary.c
+++ b/plugins/clock/clock-binary.c
@@ -27,10 +27,6 @@
#include math.h
#endif
-#ifndef M_PI
-#define M_PI 3.141592654
-#endif
-
#include gtk/gtk.h
#include cairo/cairo.h
diff --git a/plugins/clock/clock-lcd.c b/plugins/clock/clock-lcd.c
index 3f9f6d1..99633a2 100644
--- a/plugins/clock/clock-lcd.c
+++ b/plugins/clock/clock-lcd.c
@@ -31,7 +31,7 @@
#include clock-lcd.h
#define RELATIVE_SPACE (0.10)
-#define RELATIVE_DIGIT (0.50)
+#define RELATIVE_DIGIT (5 * RELATIVE_SPACE)
#define RELATIVE_DOTS (3 * RELATIVE_SPACE)
@@ -89,6 +89,13 @@ struct _XfceClockLcd
guint flash_separators : 1;
};
+typedef struct
+{
+ gdouble x;
+ gdouble y;
+}
+LcdPoint;
+
XFCE_PANEL_DEFINE_TYPE (XfceClockLcd, xfce_clock_lcd, GTK_TYPE_IMAGE)
@@ -283,11 +290,8 @@ xfce_clock_lcd_expose_event (GtkWidget *widget,
/* get the width:height ratio */
ratio = xfce_clock_lcd_get_ratio (XFCE_CLOCK_LCD (widget));
- /* size of a digit should be a fraction of 10 */
- size = widget-allocation.height - widget-allocation.height % 10;
-
/* make sure we also fit on small vertical panels */
- size = MIN (rint ((gdouble) widget-allocation.width / ratio), size);
+ size = MIN ((gdouble) widget-allocation.width / ratio,
widget-allocation.height);
/* begin offsets */
offset_x = rint ((widget-allocation.width - (size * ratio)) / 2.00);
@@ -299,13 +303,16 @@ xfce_clock_lcd_expose_event (GtkWidget *widget,
/* get the cairo context */
cr = gdk_cairo_create (widget-window);
- gdk_cairo_set_source_color (cr, widget-style-fg[GTK_WIDGET_STATE
(widget)]);
if (G_LIKELY (cr != NULL))
{
- /* clip the drawing region */
+ gdk_cairo_set_source_color (cr, widget-style-fg[GTK_WIDGET_STATE
(widget)]);
gdk_cairo_rectangle (cr, event-area);
cairo_clip (cr);
+ cairo_push_group (cr);
+
+ /* width of the clear line */
+ cairo_set_line_width (cr, MAX (size * 0.05, 1.5));
/* get the local time */
clock_plugin_get_localtime (tm);
@@ -317,6 +324,9 @@ xfce_clock_lcd_expose_event (GtkWidget *widget,
if (!lcd-show_military ticks 12)
ticks -= 12;
+ if (ticks == 1 || (ticks = 10 ticks 20))
+offset_x -= size * (RELATIVE_SPACE * 4);
+
/* queue a resize when the number of hour digits changed,
* because we might miss the exact second (due to slightly delayed
* timeout) we queue a resize the first 3 seconds or anything in
@@ -374,7 +384,9 @@ xfce_clock_lcd_expose_event (GtkWidget *widget,
offset_x = xfce_clock_lcd_draw_digit (cr, ticks, size, offset_x,
offset_y);
}
- /* cleanup */
+ /* drop the pushed group */
+ cairo_pop_group_to_source (cr);
+ cairo_paint (cr);
cairo_destroy (cr);
}
@@ -393,7 +405,7 @@ xfce_clock_lcd_get_ratio (XfceClockLcd *lcd)
/* get the local time */
clock_plugin_get_localtime (tm);
- /* 8:88 */
+ /* 8:8(space)8 */
ratio = (3 * RELATIVE_DIGIT) + RELATIVE_DOTS + RELATIVE_SPACE;
ticks = tm.tm_hour;
@@ -401,9 +413,14 @@ xfce_clock_lcd_get_ratio (XfceClockLcd *lcd)
if (!lcd-show_military ticks 12)
ticks -= 12;
- if (ticks = 10)
+ if (ticks == 1)
+ratio -= RELATIVE_SPACE * 4; /* only show 1 */
+ else if (ticks = 10 ticks 20)
+ratio += RELATIVE_SPACE * 2; /* 1 + space */
+ else if (ticks = 20)
ratio += RELATIVE_DIGIT + RELATIVE_SPACE;
+ /* (space):88 */
if (lcd-show_seconds)
ratio += (2 * RELATIVE_DIGIT) + RELATIVE_SPACE + RELATIVE_DOTS;
@@ -446,6 +463,15 @@ xfce_clock_lcd_draw_dots (cairo_t *cr,
+/*
+ * number:
+ *
+ * ##1##
+ * 6 2
+ * ##7##
+ * 5 3
+ * ##4##
+ */
static gdouble
xfce_clock_lcd_draw_digit (cairo_t *cr,
guintnumber,
@@ -453,47 +479,43 @@ xfce_clock_lcd_draw_digit (cairo_t *cr,
gdouble offset_x,
gdouble offset_y)
{
- ginti, j;
+ guint i, j;
gintsegment;
gdouble x, y;
gdouble rel_x, rel_y;
- /* ##1##
- * 6 2
- * ##7##
- * 5 3
- * ##4##
- */
-
/*
[Xfce4-commits] xfce4-panel:master Fix plugin dnd with locked panel and outside itembar.
Updating branch refs/heads/master
to 0f4795a72eed99d77cd927fb79c387c3c2623a20 (commit)
from f24985be06d4e5f78dac7cf3f607acf6215478c6 (commit)
commit 0f4795a72eed99d77cd927fb79c387c3c2623a20
Author: Nick Schermer n...@xfce.org
Date: Tue Dec 21 21:20:34 2010 +0100
Fix plugin dnd with locked panel and outside itembar.
panel/panel-itembar.c |4 +---
1 files changed, 1 insertions(+), 3 deletions(-)
diff --git a/panel/panel-itembar.c b/panel/panel-itembar.c
index d7874ef..4fea04b 100644
--- a/panel/panel-itembar.c
+++ b/panel/panel-itembar.c
@@ -835,12 +835,10 @@ panel_itembar_get_drop_index (PanelItembar *itembar,
/* add the itembar position */
alloc = GTK_WIDGET (itembar)-allocation;
- x += alloc-x;
- y += alloc-y;
/* return -1 if point is outside the widget allocation */
if (x alloc-width || y alloc-height)
-return -1;
+return g_slist_length (itembar-children);
for (li = itembar-children, idx = 0; li != NULL; li = g_slist_next (li))
{
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfce4-panel:master Remove plugin when dropping in items dialog (bug #6976).
Updating branch refs/heads/master
to de21c4eeb536a82ce7473a05f358373745f75330 (commit)
from 79310a0c941bb29791ea97b47724bc7dbf04c974 (commit)
commit de21c4eeb536a82ce7473a05f358373745f75330
Author: Nick Schermer n...@xfce.org
Date: Sat Dec 18 13:26:33 2010 +0100
Remove plugin when dropping in items dialog (bug #6976).
libxfce4panel/xfce-panel-macros-46.h |4 ++
libxfce4panel/xfce-panel-plugin-provider.c |9 +++
libxfce4panel/xfce-panel-plugin-provider.h |6 ++-
libxfce4panel/xfce-panel-plugin.c | 12
panel/panel-application.c | 21 +++
panel/panel-item-dialog.c | 80 ++--
panel/panel-plugin-external.c | 14 +
wrapper/main.c |4 ++
8 files changed, 132 insertions(+), 18 deletions(-)
diff --git a/libxfce4panel/xfce-panel-macros-46.h
b/libxfce4panel/xfce-panel-macros-46.h
index fd97159..bf1557b 100644
--- a/libxfce4panel/xfce-panel-macros-46.h
+++ b/libxfce4panel/xfce-panel-macros-46.h
@@ -363,6 +363,10 @@ G_BEGIN_DECLS
gtk_widget_queue_draw (plug); \
break; \
\
+ case PROVIDER_PROP_TYPE_ACTION_ASK_REMOVE: \
+xfce_panel_plugin_provider_ask_remove (provider); \
+break; \
+\
default: \
g_warning (Received unknow client event %u, type); \
break; \
diff --git a/libxfce4panel/xfce-panel-plugin-provider.c
b/libxfce4panel/xfce-panel-plugin-provider.c
index ab1caa3..cc73c53 100644
--- a/libxfce4panel/xfce-panel-plugin-provider.c
+++ b/libxfce4panel/xfce-panel-plugin-provider.c
@@ -246,5 +246,14 @@ xfce_panel_plugin_provider_set_locked
(XfcePanelPluginProvider *provider,
+void
+xfce_panel_plugin_provider_ask_remove (XfcePanelPluginProvider *provider)
+{
+ panel_return_if_fail (XFCE_IS_PANEL_PLUGIN_PROVIDER (provider));
+
+ (*XFCE_PANEL_PLUGIN_PROVIDER_GET_INTERFACE (provider)-ask_remove)
(provider);
+}
+
+
#define __XFCE_PANEL_PLUGIN_PROVIDER_C__
#include libxfce4panel/libxfce4panel-aliasdef.c
diff --git a/libxfce4panel/xfce-panel-plugin-provider.h
b/libxfce4panel/xfce-panel-plugin-provider.h
index cf82e3a..59b6a68 100644
--- a/libxfce4panel/xfce-panel-plugin-provider.h
+++ b/libxfce4panel/xfce-panel-plugin-provider.h
@@ -68,6 +68,7 @@ struct _XfcePanelPluginProviderInterface
guint *handle);
void (*set_locked) (XfcePanelPluginProvider *provider,
gboolean locked);
+ void (*ask_remove) (XfcePanelPluginProvider
*provider);
};
/* signals send from the plugin to the panel (possibly through the wrapper) */
@@ -109,7 +110,8 @@ typedef enum /* skip */
PROVIDER_PROP_TYPE_ACTION_QUIT_FOR_RESTART, /* none */
PROVIDER_PROP_TYPE_ACTION_BACKGROUND_UNSET, /* none */
PROVIDER_PROP_TYPE_ACTION_SHOW_CONFIGURE, /* none */
- PROVIDER_PROP_TYPE_ACTION_SHOW_ABOUT/* none */
+ PROVIDER_PROP_TYPE_ACTION_SHOW_ABOUT, /* none */
+ PROVIDER_PROP_TYPE_ACTION_ASK_REMOVE/* none */
}
XfcePanelPluginProviderPropType;
@@ -179,6 +181,8 @@ gboolean
xfce_panel_plugin_provider_remote_event(XfcePanelP
void xfce_panel_plugin_provider_set_locked
(XfcePanelPluginProvider *provider,
gboolean
locked);
+void xfce_panel_plugin_provider_ask_remove
(XfcePanelPluginProvider *provider);
+
G_END_DECLS
#endif /* !__XFCE_PANEL_PLUGIN_PROVIDER_H__ */
diff --git a/libxfce4panel/xfce-panel-plugin.c
b/libxfce4panel/xfce-panel-plugin.c
index e0b039f..b06885a 100644
--- a/libxfce4panel/xfce-panel-plugin.c
+++ b/libxfce4panel/xfce-panel-plugin.c
@@ -106,6 +106,7 @@ static gboolean xfce_panel_plugin_remote_event
(XfcePanelPluginPr
guint
*handle);
static void xfce_panel_plugin_set_locked
(XfcePanelPluginProvider *provider,
gboolean
locked);
+static void xfce_panel_plugin_ask_remove
(XfcePanelPluginProvider *provider);
static void xfce_panel_plugin_take_window_notify (gpointer
data,
GObject
*where_the_object_was);
static void xfce_panel_plugin_menu_item_destroy (GtkWidget
*item,
@@ -619,6 +620,7 @@ xfce_panel_plugin_provider_init
(XfcePanelPluginProviderInterface *iface)
iface-removed = xfce_panel_plugin_removed;
iface-remote_event =
[Xfce4-commits] xfce4-panel:master Merge branch 'nick/wip-4.10'
Updating branch refs/heads/master
to 7d714ceef550fb703c066210a3f3f6a36003d7e9 (commit)
from 0f4795a72eed99d77cd927fb79c387c3c2623a20 (commit)
commit 7d714ceef550fb703c066210a3f3f6a36003d7e9
Merge: 0f4795a de21c4e
Author: Nick Schermer n...@xfce.org
Date: Tue Dec 21 21:25:23 2010 +0100
Merge branch 'nick/wip-4.10'
commit de21c4eeb536a82ce7473a05f358373745f75330
Author: Nick Schermer n...@xfce.org
Date: Sat Dec 18 13:26:33 2010 +0100
Remove plugin when dropping in items dialog (bug #6976).
libxfce4panel/xfce-panel-macros-46.h |4 ++
libxfce4panel/xfce-panel-plugin-provider.c |9 +++
libxfce4panel/xfce-panel-plugin-provider.h |6 ++-
libxfce4panel/xfce-panel-plugin.c | 12
panel/panel-application.c | 21 +++
panel/panel-item-dialog.c | 80 ++--
panel/panel-plugin-external.c | 14 +
wrapper/main.c |4 ++
8 files changed, 132 insertions(+), 18 deletions(-)
diff --git a/libxfce4panel/xfce-panel-macros-46.h
b/libxfce4panel/xfce-panel-macros-46.h
index b1d6bab..dd28bb9 100644
--- a/libxfce4panel/xfce-panel-macros-46.h
+++ b/libxfce4panel/xfce-panel-macros-46.h
@@ -363,6 +363,10 @@ G_BEGIN_DECLS
gtk_widget_queue_draw (plug); \
break; \
\
+ case PROVIDER_PROP_TYPE_ACTION_ASK_REMOVE: \
+xfce_panel_plugin_provider_ask_remove (provider); \
+break; \
+\
default: \
g_warning (Received unknow client event %u, type); \
break; \
diff --git a/libxfce4panel/xfce-panel-plugin-provider.c
b/libxfce4panel/xfce-panel-plugin-provider.c
index a72c853..967de02 100644
--- a/libxfce4panel/xfce-panel-plugin-provider.c
+++ b/libxfce4panel/xfce-panel-plugin-provider.c
@@ -246,5 +246,14 @@ xfce_panel_plugin_provider_set_locked
(XfcePanelPluginProvider *provider,
+void
+xfce_panel_plugin_provider_ask_remove (XfcePanelPluginProvider *provider)
+{
+ panel_return_if_fail (XFCE_IS_PANEL_PLUGIN_PROVIDER (provider));
+
+ (*XFCE_PANEL_PLUGIN_PROVIDER_GET_INTERFACE (provider)-ask_remove)
(provider);
+}
+
+
#define __XFCE_PANEL_PLUGIN_PROVIDER_C__
#include libxfce4panel/libxfce4panel-aliasdef.c
diff --git a/libxfce4panel/xfce-panel-plugin-provider.h
b/libxfce4panel/xfce-panel-plugin-provider.h
index 4794dce..b5225ac 100644
--- a/libxfce4panel/xfce-panel-plugin-provider.h
+++ b/libxfce4panel/xfce-panel-plugin-provider.h
@@ -68,6 +68,7 @@ struct _XfcePanelPluginProviderInterface
guint *handle);
void (*set_locked) (XfcePanelPluginProvider *provider,
gboolean locked);
+ void (*ask_remove) (XfcePanelPluginProvider
*provider);
};
/* signals send from the plugin to the panel (possibly through the wrapper) */
@@ -109,7 +110,8 @@ typedef enum /* skip */
PROVIDER_PROP_TYPE_ACTION_QUIT_FOR_RESTART, /* none */
PROVIDER_PROP_TYPE_ACTION_BACKGROUND_UNSET, /* none */
PROVIDER_PROP_TYPE_ACTION_SHOW_CONFIGURE, /* none */
- PROVIDER_PROP_TYPE_ACTION_SHOW_ABOUT/* none */
+ PROVIDER_PROP_TYPE_ACTION_SHOW_ABOUT, /* none */
+ PROVIDER_PROP_TYPE_ACTION_ASK_REMOVE/* none */
}
XfcePanelPluginProviderPropType;
@@ -179,6 +181,8 @@ gboolean
xfce_panel_plugin_provider_remote_event(XfcePanelP
void xfce_panel_plugin_provider_set_locked
(XfcePanelPluginProvider *provider,
gboolean
locked);
+void xfce_panel_plugin_provider_ask_remove
(XfcePanelPluginProvider *provider);
+
G_END_DECLS
#endif /* !__XFCE_PANEL_PLUGIN_PROVIDER_H__ */
diff --git a/libxfce4panel/xfce-panel-plugin.c
b/libxfce4panel/xfce-panel-plugin.c
index e0b039f..b06885a 100644
--- a/libxfce4panel/xfce-panel-plugin.c
+++ b/libxfce4panel/xfce-panel-plugin.c
@@ -106,6 +106,7 @@ static gboolean xfce_panel_plugin_remote_event
(XfcePanelPluginPr
guint
*handle);
static void xfce_panel_plugin_set_locked
(XfcePanelPluginProvider *provider,
gboolean
locked);
+static void xfce_panel_plugin_ask_remove
(XfcePanelPluginProvider *provider);
static void xfce_panel_plugin_take_window_notify (gpointer
data,
GObject
*where_the_object_was);
static void xfce_panel_plugin_menu_item_destroy (GtkWidget
[Xfce4-commits] libxfce4ui:master Fix ABI check in ppc (bug #7005).
Updating branch refs/heads/master
to 1c9774bfb11903fdb0ee914a2ae0279f7f08194a (commit)
from 881874f0823452397107b817d74ca0ec456e0a1e (commit)
commit 1c9774bfb11903fdb0ee914a2ae0279f7f08194a
Author: Nick Schermer n...@xfce.org
Date: Tue Dec 21 21:42:18 2010 +0100
Fix ABI check in ppc (bug #7005).
libxfce4ui/abicheck.sh |2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/libxfce4ui/abicheck.sh b/libxfce4ui/abicheck.sh
index ae69a45..a9fb91d 100755
--- a/libxfce4ui/abicheck.sh
+++ b/libxfce4ui/abicheck.sh
@@ -20,5 +20,5 @@
#
cpp -P -DINCLUDE_INTERNAL_SYMBOLS -DINCLUDE_VARIABLES -DALL_FILES
${srcdir:-.}/libxfce4ui.symbols | sed -e '/^$/d' -e 's/ LIBXFCE4UI_GNUC.*$//'
-e 's/ G_GNUC.*$//' -e 's/ PRIVATE//' | sort expected-abi
-nm -D .libs/libxfce4ui-1.so | grep T\|R | cut -d ' ' -f 3 | grep -v '^_.*'
| sort actual-abi
+nm -D .libs/libxfce4ui-1.so | grep T\|R\|G | cut -d ' ' -f 3 | grep -v
'^_.*' | grep -v '^ *$' | sort actual-abi
diff -u expected-abi actual-abi rm expected-abi actual-abi
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] exo:master Fix ABI check on ppc (bug #7008).
Updating branch refs/heads/master
to a5bfe16356fdf530126608c499ff0e197745b1aa (commit)
from 248086bec37b2f87f05e7c6060fad4c4b15d0bd5 (commit)
commit a5bfe16356fdf530126608c499ff0e197745b1aa
Author: Nick Schermer n...@xfce.org
Date: Tue Dec 21 21:46:46 2010 +0100
Fix ABI check on ppc (bug #7008).
exo/abicheck.sh |2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/exo/abicheck.sh b/exo/abicheck.sh
index 5200a43..766d17a 100755
--- a/exo/abicheck.sh
+++ b/exo/abicheck.sh
@@ -20,5 +20,5 @@
#
cpp -P -DINCLUDE_INTERNAL_SYMBOLS -DINCLUDE_VARIABLES -DALL_FILES
${srcdir:-.}/exo.symbols | sed -e '/^$/d' -e 's/ EXO_GNUC.*$//' -e 's/
G_GNUC.*$//' -e 's/ PRIVATE//' | sort expected-abi
-nm -D .libs/libexo-1.so | grep T\|R | cut -d ' ' -f 3 | grep -v '^_.*' |
sort actual-abi
+nm -D .libs/libexo-1.so | grep T\|R\|G | cut -d ' ' -f 3 | grep -v '^_.*'
| grep -v '^ *$' | sort actual-abi
diff -u expected-abi actual-abi rm expected-abi actual-abi
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] libxfce4util:master Fix ABI check on ppc (bug #7004).
Updating branch refs/heads/master
to d9b50aab587e4514696396a693fb6d10cc7cdcb0 (commit)
from 62eea44ea666d0b5e748bd777c99a326e73b6601 (commit)
commit d9b50aab587e4514696396a693fb6d10cc7cdcb0
Author: Nick Schermer n...@xfce.org
Date: Tue Dec 21 21:46:02 2010 +0100
Fix ABI check on ppc (bug #7004).
libxfce4util/abicheck.sh |2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/libxfce4util/abicheck.sh b/libxfce4util/abicheck.sh
index 9f0f504..79fa83f 100755
--- a/libxfce4util/abicheck.sh
+++ b/libxfce4util/abicheck.sh
@@ -20,5 +20,5 @@
#
cpp -P -DINCLUDE_INTERNAL_SYMBOLS -DINCLUDE_VARIABLES -DALL_FILES
${srcdir:-.}/libxfce4util.symbols | sed -e '/^$/d' -e 's/ G_GNUC.*$//' -e 's/
PRIVATE//' | sort expected-abi
-nm -D .libs/libxfce4util.so | grep T\|R | cut -d ' ' -f 3 | grep -v '^_.*'
| sort actual-abi
+nm -D .libs/libxfce4util.so | grep T\|R\|G | cut -d ' ' -f 3 | grep -v
'^_.*' | grep -v '^ *$' | sort actual-abi
diff -u expected-abi actual-abi rm expected-abi actual-abi
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfce4-panel:master Fix ABI check on ppc (bug #7009).
Updating branch refs/heads/master
to e2f40fa462202675cf6efa951802bdb532e9075f (commit)
from 642a43dbe82a81ed02dbddc37584b9eec40fa3af (commit)
commit e2f40fa462202675cf6efa951802bdb532e9075f
Author: Nick Schermer n...@xfce.org
Date: Tue Dec 21 21:48:34 2010 +0100
Fix ABI check on ppc (bug #7009).
libxfce4panel/abicheck.sh |2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/libxfce4panel/abicheck.sh b/libxfce4panel/abicheck.sh
index 43365b2..5812c82 100755
--- a/libxfce4panel/abicheck.sh
+++ b/libxfce4panel/abicheck.sh
@@ -19,5 +19,5 @@
#
cpp -P -DINCLUDE_INTERNAL_SYMBOLS -DINCLUDE_VARIABLES -DALL_FILES
${srcdir:-.}/libxfce4panel.symbols | sed -e '/^$/d' -e 's/ G_GNUC.*$//' -e 's/
PRIVATE//' | sort expected-abi
-nm -D .libs/libxfce4panel-1.0.so | grep T\|R | cut -d ' ' -f 3 | grep -v
'^_.*' | sort actual-abi
+nm -D .libs/libxfce4panel-1.0.so | grep T\|R\|G | cut -d ' ' -f 3 | grep
-v '^_.*' | grep -v '^ *$' | sort actual-abi
diff -u expected-abi actual-abi rm expected-abi actual-abi
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfce4-panel:master Add missing function to libxfce4panel.symbols.
Updating branch refs/heads/master to 642a43dbe82a81ed02dbddc37584b9eec40fa3af (commit) from 7d714ceef550fb703c066210a3f3f6a36003d7e9 (commit) commit 642a43dbe82a81ed02dbddc37584b9eec40fa3af Author: Nick Schermer n...@xfce.org Date: Tue Dec 21 21:48:19 2010 +0100 Add missing function to libxfce4panel.symbols. libxfce4panel/libxfce4panel.symbols |1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/libxfce4panel/libxfce4panel.symbols b/libxfce4panel/libxfce4panel.symbols index fcbe2dc..5c856ce 100644 --- a/libxfce4panel/libxfce4panel.symbols +++ b/libxfce4panel/libxfce4panel.symbols @@ -132,6 +132,7 @@ xfce_panel_plugin_save_location G_GNUC_MALLOC G_GNUC_WARN_UNUSED_RESULT /* xfce-panel-plugin-provider.h */ #if IN_HEADER(__XFCE_PANEL_PLUGIN_PROVIDER_H__) #if IN_SOURCE(__XFCE_PANEL_PLUGIN_PROVIDER_C__) +xfce_panel_plugin_provider_ask_remove xfce_panel_plugin_provider_get_type G_GNUC_CONST xfce_panel_plugin_provider_get_name xfce_panel_plugin_provider_get_unique_id ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] postler:master Require GLib 2.26 at minimum
Updating branch refs/heads/master
to dfbc6d8a4e801275ddbd8969ebcc4ae5dc6ce40f (commit)
from f7c50afdaaf7ffbce2a91312cf38eb95d5c914be (commit)
commit dfbc6d8a4e801275ddbd8969ebcc4ae5dc6ce40f
Author: Christian Dywan christ...@twotoasts.de
Date: Tue Dec 21 21:33:00 2010 +0100
Require GLib 2.26 at minimum
Fixes: https://bugs.launchpad.net/postler/+bug/688697
wscript |2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/wscript b/wscript
index 9992a15..326eea9 100644
--- a/wscript
+++ b/wscript
@@ -107,7 +107,7 @@ def configure (conf):
conf.check (function_name=function, header_name=header, \
mandatory=mandatory, define_name=var)
-check_pkg ('gio-2.0', '2.16.0')
+check_pkg ('gio-2.0', '2.26.0')
check_pkg ('unique-1.0', '0.9')
check_pkg ('gtk+-2.0', '2.12.0', var='GTK')
check_pkg ('webkit-1.0', '1.1.1')
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] postler:master Pass number of accounts from folder change monitor
Updating branch refs/heads/master
to f7c50afdaaf7ffbce2a91312cf38eb95d5c914be (commit)
from 733cfd12f239c91b8cbf0855645f8a3b531e10fa (commit)
commit f7c50afdaaf7ffbce2a91312cf38eb95d5c914be
Author: Christian Dywan christ...@twotoasts.de
Date: Tue Dec 21 21:11:45 2010 +0100
Pass number of accounts from folder change monitor
postler/postler-folders.vala |2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/postler/postler-folders.vala b/postler/postler-folders.vala
index 0fe9b41..24a9555 100644
--- a/postler/postler-folders.vala
+++ b/postler/postler-folders.vala
@@ -152,7 +152,7 @@ public class Postler.Folders : Gtk.TreeView {
monitor.changed.connect ((monitor, file, other, event) = {
var account_infos = new GLib.ListAccountInfo ();
account_infos.prepend (account_info);
-populate_accounts (account_infos);
+populate_accounts (account_infos, num_accounts);
});
store.insert_with_values (out account_iter, null, -1,
Columns.ICON, Gtk.STOCK_DIRECTORY,
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] postler:master Don't show Use As and Hide Folder for Inbox
Updating branch refs/heads/master
to a72700d6936a6d661533c12db94a43b9c785b3a1 (commit)
from dfbc6d8a4e801275ddbd8969ebcc4ae5dc6ce40f (commit)
commit a72700d6936a6d661533c12db94a43b9c785b3a1
Author: Christian Dywan christ...@twotoasts.de
Date: Tue Dec 21 22:51:45 2010 +0100
Don't show Use As and Hide Folder for Inbox
It doesn't make sense to switch the Inbox folder and it isn't
helpful to hide it either.
postler/postler-folders.vala | 76 ++
1 files changed, 40 insertions(+), 36 deletions(-)
diff --git a/postler/postler-folders.vala b/postler/postler-folders.vala
index 24a9555..19b726a 100644
--- a/postler/postler-folders.vala
+++ b/postler/postler-folders.vala
@@ -431,23 +431,6 @@ public class Postler.Folders : Gtk.TreeView {
menu.append (menuitem);
menu.append (new Gtk.SeparatorMenuItem ());
-menuitem = new Gtk.MenuItem.with_mnemonic (_(_Hide Folder));
-menuitem.activate.connect ((menuitem) = {
- Gtk.TreeIter iter;
- if (get_selection ().get_selected (null, out iter)) {
- string name;
- AccountInfo? account_info;
- store.get (iter,
- Columns.NAME, out name,
- Columns.INFO, out account_info);
- if (account_info != null) {
- account_info.hide += , + name;
- accounts.update ();
- populate ();
- }
- }
-});
-menu.append (menuitem);
menuitem = new Gtk.MenuItem.with_mnemonic (_(_Import Archived
Mailbox));
menuitem.activate.connect ((menuitem) = {
Gtk.TreeIter iter;
@@ -462,23 +445,8 @@ public class Postler.Folders : Gtk.TreeView {
empty_folder (iter);
});
menu.append (menuitem);
-
-menuitem = new Gtk.MenuItem.with_mnemonic (_(_Use as...));
-var use_as_menu = new Gtk.Menu ();
-for (int i = 0; i FolderType.MAX; i++) {
-var type = (FolderType)i;
-var folder_item = new Gtk.ImageMenuItem.from_stock (
-type.get_stock_id () ?? Gtk.STOCK_DIRECTORY, null);
-folder_item.label = type.get_label ();
-use_as_menu.append (folder_item);
-folder_item.activate.connect ((folder_item) = {
-Gtk.TreeIter iter;
-if (get_selection ().get_selected (null, out iter))
-use_folder (iter, type);
-});
-}
-menuitem.submenu = use_as_menu;
-menu.append (menuitem);
+
+menu.append (new Gtk.SeparatorMenuItem ());
bool is_account = false;
Gtk.TreeIter selected_iter;
@@ -487,8 +455,44 @@ public class Postler.Folders : Gtk.TreeView {
if (!store.iter_parent (out iter, selected_iter))
is_account = true;
}
-if (is_account) {
-menu.append (new Gtk.SeparatorMenuItem ());
+
+if (!is_account) {
+menuitem = new Gtk.MenuItem.with_mnemonic (_(_Use as...));
+var use_as_menu = new Gtk.Menu ();
+for (int i = 1; i FolderType.MAX; i++) {
+var type = (FolderType)i;
+var folder_item = new Gtk.ImageMenuItem.from_stock (
+type.get_stock_id () ?? Gtk.STOCK_DIRECTORY, null);
+folder_item.label = type.get_label ();
+use_as_menu.append (folder_item);
+folder_item.activate.connect ((folder_item) = {
+Gtk.TreeIter iter;
+ if (get_selection ().get_selected (null, out iter))
+ use_folder (iter, type);
+});
+}
+menuitem.submenu = use_as_menu;
+menu.append (menuitem);
+
+menuitem = new Gtk.MenuItem.with_mnemonic (_(_Hide Folder));
+menuitem.activate.connect ((menuitem) = {
+ Gtk.TreeIter iter;
+ if (get_selection ().get_selected (null, out iter)) {
+ string name;
+ AccountInfo? account_info;
+ store.get (iter,
+ Columns.NAME, out name,
+ Columns.INFO, out account_info);
+ if (account_info != null) {
+ account_info.hide += , + name;
+ accounts.update ();
+ populate ();
+ }
+ }
+});
+menu.append (menuitem);
+}
+else {
menuitem = new Gtk.MenuItem.with_mnemonic (_(_Remove Account));
menuitem.activate.connect ((menuitem) = {
Gtk.TreeIter iter;
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
[Xfce4-commits] postler:master Determine name of folders to hide from the location
Updating branch refs/heads/master
to 0c80ea7f35b1420353511813d3798e68a2cacab8 (commit)
from a72700d6936a6d661533c12db94a43b9c785b3a1 (commit)
commit 0c80ea7f35b1420353511813d3798e68a2cacab8
Author: Christian Dywan christ...@twotoasts.de
Date: Tue Dec 21 23:04:09 2010 +0100
Determine name of folders to hide from the location
The visible name may not be the same as on disk and won't
contain the parent folder either.
postler/postler-folders.vala |8 +---
1 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/postler/postler-folders.vala b/postler/postler-folders.vala
index 19b726a..658c8ba 100644
--- a/postler/postler-folders.vala
+++ b/postler/postler-folders.vala
@@ -478,13 +478,15 @@ public class Postler.Folders : Gtk.TreeView {
menuitem.activate.connect ((menuitem) = {
Gtk.TreeIter iter;
if (get_selection ().get_selected (null, out iter)) {
- string name;
+ string? location;
AccountInfo? account_info;
store.get (iter,
- Columns.NAME, out name,
+ Columns.LOCATION, out location,
Columns.INFO, out account_info);
if (account_info != null) {
- account_info.hide += , + name;
+ string name = location.rstr (/).substring (1, -1);
+ if (!account_info.hide.contains (name))
+ account_info.hide += , + name;
accounts.update ();
populate ();
}
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] pyxfce:master changed to use only 'libxfce4panel-enum-types.h'.
Updating branch refs/heads/master
to c090ae95fcf375a6c176a992c5d461d27c81bbf0 (commit)
from e41f8efd7133baa1ee85dbe3874c5e381d8d177b (commit)
commit c090ae95fcf375a6c176a992c5d461d27c81bbf0
Author: Danny Milosavljevic dan...@xfce.org
Date: Wed Dec 22 07:55:08 2010 +0100
changed to use only 'libxfce4panel-enum-types.h'.
panel/arrow_button.defs|2 +-
panel/enums.defs |2 +-
panel/enums.override |1 -
panel/external_plugin.defs |6 ++--
panel/gen |2 +-
panel/itembar.defs | 40 -
panel/plugin_iface.defs| 53 ++-
panel/window.defs |2 +-
8 files changed, 82 insertions(+), 26 deletions(-)
diff --git a/panel/arrow_button.defs b/panel/arrow_button.defs
index d627a78..a0782de 100644
--- a/panel/arrow_button.defs
+++ b/panel/arrow_button.defs
@@ -10,7 +10,7 @@
;; Enumerations and flags ...
-;; From /usr/local/include/xfce4/libxfce4panel/xfce-arrow-button.h
+;; From xfce-arrow-button.h
(define-function xfce_arrow_button_get_type
(c-name xfce_arrow_button_get_type)
diff --git a/panel/enums.defs b/panel/enums.defs
index 38aa51a..7e6834a 100644
--- a/panel/enums.defs
+++ b/panel/enums.defs
@@ -26,6 +26,6 @@
)
-;; From /usr/local/include/xfce4/libxfce4panel/xfce-panel-enums.h
+;; From xfce-panel-enums.h
diff --git a/panel/enums.override b/panel/enums.override
index b16e01c..162b70a 100644
--- a/panel/enums.override
+++ b/panel/enums.override
@@ -5,7 +5,6 @@
headers
#include pygobject.h
#include gtk/gtk.h
-#include libxfce4panel/xfce-panel-enums.h
#include libxfce4panel/libxfce4panel-enum-types.h
extern PyTypeObject PyGtkWidget_Type;
diff --git a/panel/external_plugin.defs b/panel/external_plugin.defs
index d0a1190..16a75f9 100644
--- a/panel/external_plugin.defs
+++ b/panel/external_plugin.defs
@@ -12,7 +12,7 @@
;; Enumerations and flags ...
-;; From /usr/local/include/xfce4/libxfce4panel/xfce-panel-external-plugin.h
+;; From xfce-panel-external-plugin.h
(define-function xfce_external_panel_plugin_get_type
(c-name xfce_external_panel_plugin_get_type)
@@ -24,8 +24,8 @@
(is-constructor-of XfceExternalPanelPlugin)
(return-type GtkWidget*)
(parameters
-'(int argc)
-'(char** argv)
+'(gint argc)
+'(gchar** argv)
'(XfcePanelPluginFunc construct)
)
)
diff --git a/panel/gen b/panel/gen
index 9f8bb66..fffe123 100755
--- a/panel/gen
+++ b/panel/gen
@@ -19,7 +19,7 @@ do
[ ${defs} = internal_plugin.defs ] continue
[ ${defs} = plugin.defs ] continue
- python /usr/share/pygtk/2.0/codegen/h2def.py $s ${defs}
+ python2
/usr/lib/python2.6/site-packages/gtk-2.0/codegen/h2def.py $s ${defs}
fi
done
diff --git a/panel/itembar.defs b/panel/itembar.defs
index b29336b..9376478 100644
--- a/panel/itembar.defs
+++ b/panel/itembar.defs
@@ -10,7 +10,7 @@
;; Enumerations and flags ...
-;; From /usr/local/include/xfce4/libxfce4panel/xfce-itembar.h
+;; From xfce-itembar.h
(define-function xfce_itembar_get_type
(c-name xfce_itembar_get_type)
@@ -26,6 +26,24 @@
)
)
+(define-method set_maximum_size
+ (of-object XfceItembar)
+ (c-name xfce_itembar_set_maximum_size)
+ (return-type none)
+ (parameters
+'(gint size)
+ )
+)
+
+(define-method set_allow_expand
+ (of-object XfceItembar)
+ (c-name xfce_itembar_set_allow_expand)
+ (return-type none)
+ (parameters
+'(gboolean allow)
+ )
+)
+
(define-method set_orientation
(of-object XfceItembar)
(c-name xfce_itembar_set_orientation)
@@ -47,7 +65,7 @@
(return-type none)
(parameters
'(GtkWidget* item)
-'(int position)
+'(gint position)
)
)
@@ -75,7 +93,7 @@
(return-type none)
(parameters
'(GtkWidget* item)
-'(int position)
+'(gint position)
)
)
@@ -101,13 +119,13 @@
(define-method get_n_items
(of-object XfceItembar)
(c-name xfce_itembar_get_n_items)
- (return-type int)
+ (return-type gint)
)
(define-method get_item_index
(of-object XfceItembar)
(c-name xfce_itembar_get_item_index)
- (return-type int)
+ (return-type gint)
(parameters
'(GtkWidget* item)
)
@@ -118,7 +136,7 @@
(c-name xfce_itembar_get_nth_item)
(return-type GtkWidget*)
(parameters
-'(int n)
+'(gint n)
)
)
@@ -145,18 +163,18 @@
(c-name xfce_itembar_get_item_at_point)
(return-type GtkWidget*)
(parameters
-'(int x)
-'(int y)
+'(gint x)
+'(gint y)
)
)
(define-method get_drop_index
(of-object XfceItembar)
(c-name xfce_itembar_get_drop_index)
- (return-type int)
+ (return-type gint)
(parameters
-'(int x)
-'(int y)
+'(gint x)
+'(gint y)
)
)
diff --git a/panel/plugin_iface.defs b/panel/plugin_iface.defs
index 34f5485..f812f97 100644
--- a/panel/plugin_iface.defs
+++ b/panel/plugin_iface.defs
@@ -9,7 +9,7 @@
;;
