[Xfce4-commits] [xfce/thunar] branch master updated (23fc980 -> da0eb1f)
This is an automated email from the git hooks/post-receive script. transifex pushed a change to branch master in repository xfce/thunar. from 23fc980 I18n: Update translation de (100%). new da0eb1f I18n: Update translation kk (100%). The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: po/kk.po | 423 -- 1 file changed, 216 insertions(+), 207 deletions(-) -- To stop receiving notification emails like this one, please contact the administrator of this repository. ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] [xfce/xfwm4] branch master updated (90bcaf5 -> a1e9961)
This is an automated email from the git hooks/post-receive script. transifex pushed a change to branch master in repository xfce/xfwm4. from 90bcaf5 Trivial code reformatting new a1e9961 I18n: Update translation kk (100%). The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: po/kk.po | 64 +- 1 file changed, 34 insertions(+), 30 deletions(-) -- To stop receiving notification emails like this one, please contact the administrator of this repository. ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] [xfce/xfce4-settings] 01/01: I18n: Update translation kk (100%).
This is an automated email from the git hooks/post-receive script. transifex pushed a commit to branch master in repository xfce/xfce4-settings. commit b2beaaf22bf7c339ca83114fe51933c860eaeb44 Author: Baurzhan Muftakhidinov Date: Sat Feb 7 06:30:48 2015 +0100 I18n: Update translation kk (100%). 354 translated messages. Transifex (https://www.transifex.com/projects/p/xfce/). --- po/kk.po | 190 +- 1 file changed, 101 insertions(+), 89 deletions(-) diff --git a/po/kk.po b/po/kk.po index 6b4085b..1528749 100644 --- a/po/kk.po +++ b/po/kk.po @@ -3,13 +3,13 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: -# Baurzhan Muftakhidinov , 2009,2014 +# Baurzhan Muftakhidinov , 2009,2014-2015 msgid "" msgstr "" "Project-Id-Version: Xfce4-settings\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-07-27 18:30+0200\n" -"PO-Revision-Date: 2014-08-22 02:33+\n" +"POT-Creation-Date: 2015-02-06 06:30+0100\n" +"PO-Revision-Date: 2015-02-07 05:07+\n" "Last-Translator: Baurzhan Muftakhidinov \n" "Language-Team: Kazakh (http://www.transifex.com/projects/p/xfce4-settings/language/kk/)\n" "MIME-Version: 1.0\n" @@ -207,14 +207,14 @@ msgstr "Ты_шқан" #: ../dialogs/accessibility-settings/main.c:43 #: ../dialogs/appearance-settings/main.c:95 #: ../dialogs/display-settings/main.c:120 -#: ../dialogs/keyboard-settings/main.c:39 ../dialogs/mouse-settings/main.c:79 +#: ../dialogs/keyboard-settings/main.c:39 ../dialogs/mouse-settings/main.c:83 msgid "Settings manager socket" msgstr "Баптаулар басқарушысының сокеті" #: ../dialogs/accessibility-settings/main.c:43 #: ../dialogs/appearance-settings/main.c:95 #: ../dialogs/display-settings/main.c:120 -#: ../dialogs/keyboard-settings/main.c:39 ../dialogs/mouse-settings/main.c:79 +#: ../dialogs/keyboard-settings/main.c:39 ../dialogs/mouse-settings/main.c:83 msgid "SOCKET ID" msgstr "SOCKET ID" @@ -222,36 +222,37 @@ msgstr "SOCKET ID" #: ../dialogs/appearance-settings/main.c:96 #: ../dialogs/display-settings/main.c:121 #: ../dialogs/keyboard-settings/main.c:40 ../dialogs/mime-settings/main.c:40 -#: ../dialogs/mouse-settings/main.c:80 ../xfce4-settings-editor/main.c:43 -#: ../xfsettingsd/main.c:77 ../xfce4-settings-manager/main.c:40 +#: ../dialogs/mouse-settings/main.c:84 ../xfce4-settings-editor/main.c:43 +#: ../xfsettingsd/main.c:78 ../xfce4-settings-manager/main.c:40 msgid "Version information" msgstr "Нұсқа ақпараты" #: ../dialogs/accessibility-settings/main.c:192 -#: ../dialogs/appearance-settings/main.c:1006 -#: ../dialogs/display-settings/main.c:2950 +#: ../dialogs/appearance-settings/main.c:997 +#: ../dialogs/display-settings/main.c:3025 #: ../dialogs/keyboard-settings/main.c:76 ../dialogs/mime-settings/main.c:62 -#: ../dialogs/mouse-settings/main.c:1611 ../xfce4-settings-editor/main.c:63 -#: ../xfsettingsd/main.c:187 ../xfce4-settings-manager/main.c:61 +#: ../dialogs/mouse-settings/main.c:1769 ../xfce4-settings-editor/main.c:63 +#: ../xfsettingsd/main.c:191 ../xfsettingsd/main.c:229 +#: ../xfce4-settings-manager/main.c:61 #, c-format msgid "Type '%s --help' for usage." msgstr "Көмек үшін '%s --help' енгізіңіз." #: ../dialogs/accessibility-settings/main.c:211 -#: ../dialogs/appearance-settings/main.c:1025 -#: ../dialogs/display-settings/main.c:2969 +#: ../dialogs/appearance-settings/main.c:1016 +#: ../dialogs/display-settings/main.c:3044 #: ../dialogs/keyboard-settings/main.c:92 ../dialogs/mime-settings/main.c:81 -#: ../dialogs/mouse-settings/main.c:1630 ../xfce4-settings-editor/main.c:82 -#: ../xfsettingsd/main.c:203 ../xfce4-settings-manager/main.c:77 +#: ../dialogs/mouse-settings/main.c:1788 ../xfce4-settings-editor/main.c:82 +#: ../xfsettingsd/main.c:207 ../xfce4-settings-manager/main.c:77 msgid "The Xfce development team. All rights reserved." msgstr "Xfce өндіру тобы. Барлық құқықтары қорғалған." #: ../dialogs/accessibility-settings/main.c:212 -#: ../dialogs/appearance-settings/main.c:1026 -#: ../dialogs/display-settings/main.c:2970 +#: ../dialogs/appearance-settings/main.c:1017 +#: ../dialogs/display-settings/main.c:3045 #: ../dialogs/keyboard-settings/main.c:93 ../dialogs/mime-settings/main.c:82 -#: ../dialogs/mouse-settings/main.c:1631 ../xfce4-settings-editor/main.c:83 -#: ../xfsettingsd/main.c:204 ../xfce4-settings-manager/main.c:78 +#: ../dialogs/mouse-settings/main.c:1789 ../xfce4-settings-editor/main.c:83 +#: ../xfsettingsd/main.c:208 ../xfce4-settings-manager/main.c:78 #, c-format msgid "Please report bugs to <%s>." msgstr "Ақаулықтар жөнінде хабарласыңыз: <%s>." @@ -409,7 +410,7 @@ msgid "Setti_ngs" msgstr "Бап_таулар" #: ../dialogs/appearance-settings/appearance-dialog.glade.h:34 -#: ../dialogs/appearance-settings/main.c:892 +#: ../dialogs/appearance-settings/main.c:883 #: ../dialogs/display-settings/main.c:87 ../dialogs/display-settings/main.c:98 msgid "None" msgstr "Ешнә
[Xfce4-commits] [xfce/xfwm4] 01/01: I18n: Update translation kk (100%).
This is an automated email from the git hooks/post-receive script. transifex pushed a commit to branch master in repository xfce/xfwm4. commit a1e99610cd75f8cef2525123156b1eef551e1299 Author: Baurzhan Muftakhidinov Date: Sat Feb 7 06:32:01 2015 +0100 I18n: Update translation kk (100%). 173 translated messages. Transifex (https://www.transifex.com/projects/p/xfce/). --- po/kk.po | 64 +- 1 file changed, 34 insertions(+), 30 deletions(-) diff --git a/po/kk.po b/po/kk.po index 4614876..f9ef74d 100644 --- a/po/kk.po +++ b/po/kk.po @@ -3,15 +3,15 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: -# Baurzhan Muftakhidinov , 2009,2013-2014 +# Baurzhan Muftakhidinov , 2009,2013-2015 msgid "" msgstr "" "Project-Id-Version: Xfwm4\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-02-24 00:32+0100\n" -"PO-Revision-Date: 2014-04-04 11:05+\n" +"POT-Creation-Date: 2015-01-30 00:32+0100\n" +"PO-Revision-Date: 2015-02-07 05:09+\n" "Last-Translator: Baurzhan Muftakhidinov \n" -"Language-Team: Kazakh (http://www.transifex.com/projects/p/xfce/language/kk/)\n" +"Language-Team: Kazakh (http://www.transifex.com/projects/p/xfwm4/language/kk/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -32,29 +32,29 @@ msgstr "Ескерту" msgid "None" msgstr "Ешнәрсе" -#: ../settings-dialogs/tweaks-settings.c:473 +#: ../settings-dialogs/tweaks-settings.c:471 msgid "Session manager socket" msgstr "Сессиялар басқарушысының сокеті" -#: ../settings-dialogs/tweaks-settings.c:473 +#: ../settings-dialogs/tweaks-settings.c:471 #: ../settings-dialogs/workspace-settings.c:381 #: ../settings-dialogs/xfwm4-settings.c:241 msgid "SOCKET ID" msgstr "СОКЕТ ID" -#: ../settings-dialogs/tweaks-settings.c:474 +#: ../settings-dialogs/tweaks-settings.c:472 #: ../settings-dialogs/workspace-settings.c:382 #: ../settings-dialogs/xfwm4-settings.c:243 msgid "Version information" msgstr "Нұсқа ақпараты" -#: ../settings-dialogs/tweaks-settings.c:492 +#: ../settings-dialogs/tweaks-settings.c:490 #: ../settings-dialogs/workspace-settings.c:399 #: ../settings-dialogs/xfwm4-settings.c:895 msgid "." msgstr "." -#: ../settings-dialogs/tweaks-settings.c:496 +#: ../settings-dialogs/tweaks-settings.c:494 #: ../settings-dialogs/workspace-settings.c:403 #: ../settings-dialogs/xfwm4-settings.c:899 #, c-format @@ -438,8 +438,8 @@ msgid "Hide frame of windows when ma_ximized" msgstr "Ма_ксималды етілген терезе қоршауын жасыру" #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:20 -msgid "Restore original size of maximi_zed windows when moving" -msgstr "Максималды терезелерді жы_лжытқан кезде өлшемдерін бастапқы мәнге келтіру" +msgid "Hide title of windows when maximized" +msgstr "Терезе максималды етілген кезде оның атау жолағын жасыру" #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:21 msgid "Automatically _tile windows when moving toward the screen edge" @@ -525,46 +525,50 @@ msgid "Synchronize drawing to the _vertical blank" msgstr "Бейнелеуді кадр_лық сөндіргіш импульспен синхрондау" #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:45 +msgid "Show windows preview in place of icons when cycling" +msgstr "Циклды ауыстыру кезінде таңбашалар орнына терезелердің кіші көріністерін көрсету" + +#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:46 msgid "Show shadows under pop_up windows" msgstr "Атып шығатын терезелердің _көлеңкесін көрсету" -#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:46 +#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:47 msgid "Show shadows under _dock windows" msgstr "Сыбайлас терезел_ердің көлеңкесін көрсету" -#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:47 +#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:48 msgid "Show shadows under _regular windows" msgstr "Қалыпты _терезелердің көлеңкесін көрсету" -#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:48 +#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:49 msgid "Opaci_ty of window decorations:" msgstr "Терезе қ_оршауының мөлдірлілігі:" -#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:49 +#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:50 msgid "Transparent" msgstr "Мөлдір" -#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:50 +#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:51 msgid "Opaque" msgstr "Мөлдір емес" -#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:51 +#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:52 msgid "Opacity of _inactive windows:" msgstr "Белсенді емес терезелердің _ мөлдірлілігі:" -#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:52 +#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:53 msgid "Opacity of windows during _move:" msgstr "Жылж_ыту кезінде терезелердің мөлдірлілігі:" -#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:53 +#: ../settings-dialogs/xfwm
[Xfce4-commits] [xfce/thunar] 01/01: I18n: Update translation kk (100%).
This is an automated email from the git hooks/post-receive script. transifex pushed a commit to branch master in repository xfce/thunar. commit da0eb1f102cf63fe231bfb9985533cfdc025dc5a Author: Baurzhan Muftakhidinov Date: Sat Feb 7 06:30:18 2015 +0100 I18n: Update translation kk (100%). 739 translated messages. Transifex (https://www.transifex.com/projects/p/xfce/). --- po/kk.po | 423 -- 1 file changed, 216 insertions(+), 207 deletions(-) diff --git a/po/kk.po b/po/kk.po index a42d8d6..1f8d702 100644 --- a/po/kk.po +++ b/po/kk.po @@ -3,13 +3,13 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: -# Baurzhan Muftakhidinov , 2009,2013-2014 +# Baurzhan Muftakhidinov , 2009,2013-2015 msgid "" msgstr "" "Project-Id-Version: Thunar\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-11-05 18:30+0100\n" -"PO-Revision-Date: 2014-11-07 11:18+\n" +"POT-Creation-Date: 2015-01-29 00:30+0100\n" +"PO-Revision-Date: 2015-02-07 04:59+\n" "Last-Translator: Baurzhan Muftakhidinov \n" "Language-Team: Kazakh (http://www.transifex.com/projects/p/thunar/language/kk/)\n" "MIME-Version: 1.0\n" @@ -135,7 +135,7 @@ msgstr "Әрекетті жөнелту сәтсіз аяқталды" #. tell the user that we were unable to launch the file specified #: ../thunar/thunar-application.c:1168 ../thunar/thunar-application.c:1294 -#: ../thunar/thunar-launcher.c:1216 ../thunar/thunar-location-entry.c:402 +#: ../thunar/thunar-launcher.c:1222 ../thunar/thunar-location-entry.c:402 #: ../thunar/thunar-location-entry.c:430 #: ../thunar/thunar-shortcuts-view.c:1630 #: ../thunar/thunar-shortcuts-view.c:1658 ../thunar/thunar-window.c:2236 @@ -150,21 +150,21 @@ msgstr "\"%s\" ашу сәтсіз аяқталды: %s" #. display an error message #: ../thunar/thunar-application.c:1362 -#: ../thunar/thunar-properties-dialog.c:672 -#: ../thunar/thunar-standard-view.c:2746 ../thunar/thunar-tree-view.c:1760 +#: ../thunar/thunar-properties-dialog.c:682 +#: ../thunar/thunar-standard-view.c:2747 ../thunar/thunar-tree-view.c:1767 #, c-format msgid "Failed to rename \"%s\"" msgstr "\"%s\" атын ауыстыру қатесі" #: ../thunar/thunar-application.c:1464 #: ../thunar/thunar-location-buttons.c:1308 -#: ../thunar/thunar-standard-view.c:2296 ../thunar/thunar-tree-view.c:1622 +#: ../thunar/thunar-standard-view.c:2297 ../thunar/thunar-tree-view.c:1629 msgid "New Folder" msgstr "Жаңа бума" #: ../thunar/thunar-application.c:1465 #: ../thunar/thunar-location-buttons.c:1309 -#: ../thunar/thunar-standard-view.c:2297 ../thunar/thunar-tree-view.c:1623 +#: ../thunar/thunar-standard-view.c:2298 ../thunar/thunar-tree-view.c:1630 msgid "Create New Folder" msgstr "Жаңа буманы жасау" @@ -177,7 +177,7 @@ msgid "Create New File" msgstr "Жаңа файлды жасау" #. generate a title for the create dialog -#: ../thunar/thunar-application.c:1527 ../thunar/thunar-standard-view.c:2341 +#: ../thunar/thunar-application.c:1527 ../thunar/thunar-standard-view.c:2342 #, c-format msgid "Create Document from template \"%s\"" msgstr "Жаңа құжатты \"%s\" үлгісінен жасау" @@ -245,7 +245,7 @@ msgstr "Қоқыс шелегінен барлық файлдар мен бум #. append the "Empty Trash" menu action #. prepare the menu item #: ../thunar/thunar-application.c:2008 ../thunar/thunar-location-buttons.c:179 -#: ../thunar/thunar-shortcuts-view.c:1191 ../thunar/thunar-tree-view.c:1183 +#: ../thunar/thunar-shortcuts-view.c:1191 ../thunar/thunar-tree-view.c:1184 #: ../thunar/thunar-window.c:351 ../plugins/thunar-tpa/thunar-tpa.c:191 msgid "_Empty Trash" msgstr "Қ_оқыс шелегін тазарту" @@ -493,8 +493,8 @@ msgstr "Кер_ек болса, бағандар өлшемін автоөзге #. the file_time is invalid #. reset page title #. tell the user that we're unable to determine the file info -#: ../thunar/thunar-column-model.c:858 ../thunar/thunar-list-model.c:680 -#: ../thunar/thunar-list-model.c:708 +#: ../thunar/thunar-column-model.c:858 ../thunar/thunar-list-model.c:705 +#: ../thunar/thunar-list-model.c:733 #: ../thunar/thunar-permissions-chooser.c:229 ../thunar/thunar-util.c:454 #: ../plugins/thunar-apr/thunar-apr-desktop-page.c:503 #: ../plugins/thunar-apr/thunar-apr-image-page.c:285 @@ -621,88 +621,88 @@ msgid "_Cancel" msgstr "Ба_с тарту" #. setup the confirmation dialog -#: ../thunar/thunar-dialogs.c:533 +#: ../thunar/thunar-dialogs.c:535 msgid "Confirm to replace files" msgstr "Файлдарды алмастыруды растау" -#: ../thunar/thunar-dialogs.c:539 +#: ../thunar/thunar-dialogs.c:541 msgid "S_kip All" msgstr "Бар_лығын аттап кету" -#: ../thunar/thunar-dialogs.c:540 +#: ../thunar/thunar-dialogs.c:542 msgid "_Skip" msgstr "А_ттап кету" -#: ../thunar/thunar-dialogs.c:541 +#: ../thunar/thunar-dialogs.c:543 msgid "Replace _All" msgstr "Барл_ығын алмастыру" -#: ../thunar/thunar-dialogs.c:542 +#: ../thunar/thunar-dialogs.c:544 msgid "_Replace" msgstr "А_лмастыру" -#: ../thunar/thunar-dialogs.c:575
[Xfce4-commits] [xfce/xfce4-settings] branch master updated (6f7ecb0 -> b2beaaf)
This is an automated email from the git hooks/post-receive script. transifex pushed a change to branch master in repository xfce/xfce4-settings. from 6f7ecb0 Prevent potential illegal memory access, move null pointer check to before dereference new b2beaaf I18n: Update translation kk (100%). The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: po/kk.po | 190 +- 1 file changed, 101 insertions(+), 89 deletions(-) -- To stop receiving notification emails like this one, please contact the administrator of this repository. ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] [xfce/xfce4-settings] branch master updated (e0f9a22 -> 6f7ecb0)
This is an automated email from the git hooks/post-receive script. bluesabre pushed a change to branch master in repository xfce/xfce4-settings. from e0f9a22 Fix Unchecked return values, potentially revealing missed warnings new 6f7ecb0 Prevent potential illegal memory access, move null pointer check to before dereference The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: dialogs/appearance-settings/main.c | 12 ++-- dialogs/mouse-settings/main.c |7 +-- 2 files changed, 11 insertions(+), 8 deletions(-) -- To stop receiving notification emails like this one, please contact the administrator of this repository. ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] [xfce/xfce4-settings] 01/01: Prevent potential illegal memory access, move null pointer check to before dereference
This is an automated email from the git hooks/post-receive script.
bluesabre pushed a commit to branch master
in repository xfce/xfce4-settings.
commit 6f7ecb05c9e6227375638fd94b12a10d0a59abc2
Author: Sean Davis
Date: Fri Feb 6 22:12:26 2015 -0500
Prevent potential illegal memory access, move null pointer check to before
dereference
---
dialogs/appearance-settings/main.c | 12 ++--
dialogs/mouse-settings/main.c |7 +--
2 files changed, 11 insertions(+), 8 deletions(-)
diff --git a/dialogs/appearance-settings/main.c
b/dialogs/appearance-settings/main.c
index b8b676a..81a3fdc 100644
--- a/dialogs/appearance-settings/main.c
+++ b/dialogs/appearance-settings/main.c
@@ -167,8 +167,8 @@ cb_toolbar_style_combo_changed (GtkComboBox *combo)
{
gint active;
-/* Get active item, prevent number outside the array */
-active = CLAMP (gtk_combo_box_get_active (combo), 0, (gint) G_N_ELEMENTS
(toolbar_styles_array));
+/* Get active item, prevent number outside the array (stay within
zero-index) */
+active = CLAMP (gtk_combo_box_get_active (combo), 0, (gint) G_N_ELEMENTS
(toolbar_styles_array)-1);
/* Save setting */
xfconf_channel_set_string (xsettings_channel, "/Gtk/ToolbarStyle",
toolbar_styles_array[active]);
@@ -194,8 +194,8 @@ cb_hinting_style_combo_changed (GtkComboBox *combo)
{
gint active;
-/* Get active item, prevent number outside the array */
-active = CLAMP (gtk_combo_box_get_active (combo), 0, (gint) G_N_ELEMENTS
(xft_hint_styles_array));
+/* Get active item, prevent number outside the array (stay within
zero-index) */
+active = CLAMP (gtk_combo_box_get_active (combo), 0, (gint) G_N_ELEMENTS
(xft_hint_styles_array)-1);
/* Save setting */
xfconf_channel_set_string (xsettings_channel, "/Xft/HintStyle",
xft_hint_styles_array[active]);
@@ -206,8 +206,8 @@ cb_rgba_style_combo_changed (GtkComboBox *combo)
{
gint active;
-/* Get active item, prevent number outside the array */
-active = CLAMP (gtk_combo_box_get_active (combo), 0, (gint) G_N_ELEMENTS
(xft_rgba_array));
+/* Get active item, prevent number outside the array (stay within
zero-index) */
+active = CLAMP (gtk_combo_box_get_active (combo), 0, (gint) G_N_ELEMENTS
(xft_rgba_array)-1);
/* Save setting */
xfconf_channel_set_string (xsettings_channel, "/Xft/RGBA",
xft_rgba_array[active]);
diff --git a/dialogs/mouse-settings/main.c b/dialogs/mouse-settings/main.c
index 1942612..3516a95 100644
--- a/dialogs/mouse-settings/main.c
+++ b/dialogs/mouse-settings/main.c
@@ -1568,6 +1568,10 @@ mouse_settings_device_populate_store (GtkBuilder
*builder,
|| g_str_has_prefix (device_info->name, "Virtual core XTEST"))
continue;
+/* cannot go any further without device name */
+if (device_info->name == NULL)
+continue;
+
/* create a valid xfconf device name */
xfconf_name = mouse_settings_device_xfconf_name (device_info->name);
@@ -1579,8 +1583,7 @@ mouse_settings_device_populate_store (GtkBuilder *builder,
-1);
/* check if we should select this device */
-if (device_info->name != NULL
-&& opt_device_name != NULL
+if (opt_device_name != NULL
&& strcmp (opt_device_name, device_info->name) == 0)
{
gtk_combo_box_set_active_iter (GTK_COMBO_BOX (combobox), &iter);
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] [xfce/xfce4-settings] branch master updated (74a1bdb -> e0f9a22)
This is an automated email from the git hooks/post-receive script. bluesabre pushed a change to branch master in repository xfce/xfce4-settings. from 74a1bdb Fix logically dead code in a few components, prevent division by zero new e0f9a22 Fix Unchecked return values, potentially revealing missed warnings The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: dialogs/keyboard-settings/xfce-keyboard-settings.c | 114 +++- dialogs/mime-settings/xfce-mime-chooser.c | 10 +- xfsettingsd/clipboard-manager.c| 15 ++- xfsettingsd/displays.c | 16 ++- 4 files changed, 91 insertions(+), 64 deletions(-) -- To stop receiving notification emails like this one, please contact the administrator of this repository. ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] [xfce/xfce4-settings] 01/01: Fix Unchecked return values, potentially revealing missed warnings
This is an automated email from the git hooks/post-receive script.
bluesabre pushed a commit to branch master
in repository xfce/xfce4-settings.
commit e0f9a220adbd41a24d9e3df9af7e89a0ef97478e
Author: Sean Davis
Date: Fri Feb 6 21:44:18 2015 -0500
Fix Unchecked return values, potentially revealing missed warnings
---
dialogs/keyboard-settings/xfce-keyboard-settings.c | 114 +++-
dialogs/mime-settings/xfce-mime-chooser.c | 10 +-
xfsettingsd/clipboard-manager.c| 15 ++-
xfsettingsd/displays.c | 16 ++-
4 files changed, 91 insertions(+), 64 deletions(-)
diff --git a/dialogs/keyboard-settings/xfce-keyboard-settings.c
b/dialogs/keyboard-settings/xfce-keyboard-settings.c
index 384f17d..e2a93a0 100644
--- a/dialogs/keyboard-settings/xfce-keyboard-settings.c
+++ b/dialogs/keyboard-settings/xfce-keyboard-settings.c
@@ -1633,12 +1633,14 @@ xfce_keyboard_settings_layouts_combo_changed
(GtkComboBox *combo,
GtkTreeIter iter;
gchar*xfconf_prop_value;
- gtk_combo_box_get_active_iter (GTK_COMBO_BOX (combo), &iter);
- model = gtk_combo_box_get_model (GTK_COMBO_BOX (combo));
- gtk_tree_model_get (model, &iter, XKB_LAYOUTS_COMBO_VALUE,
&xfconf_prop_value, -1);
- xfconf_channel_set_string (settings->priv->keyboard_layout_channel,
- xfconf_prop_name, xfconf_prop_value);
- g_free (xfconf_prop_value);
+ if (G_LIKELY(gtk_combo_box_get_active_iter (GTK_COMBO_BOX (combo), &iter)))
+ {
+model = gtk_combo_box_get_model (GTK_COMBO_BOX (combo));
+gtk_tree_model_get (model, &iter, XKB_LAYOUTS_COMBO_VALUE,
&xfconf_prop_value, -1);
+xfconf_channel_set_string (settings->priv->keyboard_layout_channel,
+ xfconf_prop_name, xfconf_prop_value);
+g_free (xfconf_prop_value);
+ }
}
@@ -1718,27 +1720,29 @@ xfce_keyboard_settings_edit_layout_button_cb (GtkWidget
*widget,
model = gtk_tree_view_get_model (GTK_TREE_VIEW (view));
selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (view));
- gtk_tree_selection_get_selected (selection, &model, &iter);
- gtk_tree_model_get (model, &iter,
- XKB_TREE_LAYOUTS, ¤t_layout,
- XKB_TREE_VARIANTS, ¤t_variant,
- -1);
-
- layout_selection =
- xfce_keyboard_settings_layout_selection (settings, current_layout,
current_variant);
- if (layout_selection)
-{
- gtk_list_store_set (GTK_LIST_STORE (model), &iter,
- XKB_TREE_LAYOUTS, layout_selection[0],
- XKB_TREE_LAYOUTS_NAMES, layout_selection[1],
- XKB_TREE_VARIANTS, layout_selection[2],
- XKB_TREE_VARIANTS_NAMES, layout_selection[3],
- -1);
- xfce_keyboard_settings_set_layout (settings);
- g_strfreev (layout_selection);
-}
- g_free (current_layout);
- g_free (current_variant);
+ if (G_LIKELY (gtk_tree_selection_get_selected (selection, &model, &iter)))
+ {
+gtk_tree_model_get (model, &iter,
+XKB_TREE_LAYOUTS, ¤t_layout,
+XKB_TREE_VARIANTS, ¤t_variant,
+-1);
+
+ layout_selection =
+xfce_keyboard_settings_layout_selection (settings, current_layout,
current_variant);
+if (layout_selection)
+ {
+gtk_list_store_set (GTK_LIST_STORE (model), &iter,
+XKB_TREE_LAYOUTS, layout_selection[0],
+XKB_TREE_LAYOUTS_NAMES, layout_selection[1],
+XKB_TREE_VARIANTS, layout_selection[2],
+XKB_TREE_VARIANTS_NAMES, layout_selection[3],
+-1);
+xfce_keyboard_settings_set_layout (settings);
+g_strfreev (layout_selection);
+ }
+g_free (current_layout);
+g_free (current_variant);
+ }
}
@@ -2079,34 +2083,38 @@ xfce_keyboard_settings_layout_selection
(XfceKeyboardSettings *settings,
result = gtk_dialog_run (GTK_DIALOG (keyboard_layout_selection_dialog));
if (result == GTK_RESPONSE_OK)
{
- gtk_tree_selection_get_selected (selection, &model, &iter);
- gtk_tree_model_get (model, &iter, XKB_AVAIL_LAYOUTS_TREE_ID, &layout,
-XKB_AVAIL_LAYOUTS_TREE_DESCRIPTION,
&layout_desc, -1);
-
- path = gtk_tree_model_get_path (model, &iter);
- if (gtk_tree_path_get_depth (path) == 1)
-{
- variant = g_strdup ("");
- variant_desc = g_strdup ("");
-}
- else
-{
- variant = layout;
- variant_desc = layout_desc;
- gtk_tree_path_up (path);
- gtk_tree_model_get_iter (model, &iter, path);
- gtk_tree_model_get (model, &iter, XKB_AVAIL_LAYOUTS_TREE_ID, &layout,
-
XKB_AVAIL_LAYOUTS_TREE_DESCRIPTION, &
[Xfce4-commits] [xfce/xfce4-settings] branch master updated (0cd2254 -> 74a1bdb)
This is an automated email from the git hooks/post-receive script. bluesabre pushed a change to branch master in repository xfce/xfce4-settings. from 0cd2254 Bug 11317: descriptions returned by libxklavier are already in UTF-8 new 74a1bdb Fix logically dead code in a few components, prevent division by zero The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: dialogs/display-settings/main.c| 19 +-- dialogs/keyboard-settings/xfce-keyboard-settings.c |2 +- xfsettingsd/clipboard-manager.c|9 +++-- 3 files changed, 17 insertions(+), 13 deletions(-) -- To stop receiving notification emails like this one, please contact the administrator of this repository. ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] [xfce/xfce4-settings] 01/01: Fix logically dead code in a few components, prevent division by zero
This is an automated email from the git hooks/post-receive script.
bluesabre pushed a commit to branch master
in repository xfce/xfce4-settings.
commit 74a1bdb748807c3126c55f571ee1495eb50dbec2
Author: Sean Davis
Date: Fri Feb 6 20:24:21 2015 -0500
Fix logically dead code in a few components, prevent division by zero
---
dialogs/display-settings/main.c| 19 +--
dialogs/keyboard-settings/xfce-keyboard-settings.c |2 +-
xfsettingsd/clipboard-manager.c|9 +++--
3 files changed, 17 insertions(+), 13 deletions(-)
diff --git a/dialogs/display-settings/main.c b/dialogs/display-settings/main.c
index 93d7dc1..5ea3489 100644
--- a/dialogs/display-settings/main.c
+++ b/dialogs/display-settings/main.c
@@ -1191,14 +1191,9 @@ display_settings_combobox_populate (GtkBuilder *builder)
{
/* Insert the output in the store */
gtk_list_store_append (store, &iter);
-if (xfce_randr->mode[m] == None)
-gtk_list_store_set (store, &iter,
-COLUMN_OUTPUT_NAME,
xfce_randr->friendly_name[m],
-COLUMN_OUTPUT_ID, m, -1);
-else
-gtk_list_store_set (store, &iter,
-COLUMN_OUTPUT_NAME,
xfce_randr->friendly_name[m],
-COLUMN_OUTPUT_ID, m, -1);
+gtk_list_store_set (store, &iter,
+COLUMN_OUTPUT_NAME, xfce_randr->friendly_name[m],
+COLUMN_OUTPUT_ID, m, -1);
/* Select active output */
if (m == active_output)
@@ -1568,7 +1563,7 @@ get_mirrored_configuration (void)
if (!xfce_randr)
return FALSE;
-if (!xfce_randr->noutput > 1)
+if (xfce_randr->noutput <= 1)
return FALSE;
/* Can outputs be cloned? */
@@ -3082,6 +3077,7 @@ main (gint argc, gchar **argv)
if (!xfce_randr)
{
+succeeded = FALSE;
command = g_find_program_in_path ("amdcccle");
if (command != NULL)
@@ -3112,7 +3108,10 @@ main (gint argc, gchar **argv)
/* Hook to make sure the libxfce4ui library is linked */
if (xfce_titled_dialog_get_type () == 0)
-return EXIT_FAILURE;
+{
+succeeded = FALSE;
+goto cleanup;
+}
if (xfce_randr->noutput <= 1 || !minimal)
display_settings_show_main_dialog (display);
diff --git a/dialogs/keyboard-settings/xfce-keyboard-settings.c
b/dialogs/keyboard-settings/xfce-keyboard-settings.c
index 63b461a..384f17d 100644
--- a/dialogs/keyboard-settings/xfce-keyboard-settings.c
+++ b/dialogs/keyboard-settings/xfce-keyboard-settings.c
@@ -1076,7 +1076,7 @@ xfce_keyboard_settings_edit_button_clicked
(XfceKeyboardSettings *settings)
if (G_LIKELY (gtk_tree_model_get_iter (model, &iter, path)))
{
GtkWidget *command_dialog;
- gboolean finished;
+ gboolean finished = FALSE;
gboolean snotify;
gchar*shortcut_label;
gchar*shortcut;
diff --git a/xfsettingsd/clipboard-manager.c b/xfsettingsd/clipboard-manager.c
index dbf2f0d..b142915 100644
--- a/xfsettingsd/clipboard-manager.c
+++ b/xfsettingsd/clipboard-manager.c
@@ -406,6 +406,7 @@ send_incrementally (GsdClipboardManager *manager,
IncrConversion *rdata;
gulong length;
gulong items;
+gulong bytes;
guchar *data;
list = g_slist_find_custom (manager->priv->conversions, xev,
@@ -422,7 +423,9 @@ send_incrementally (GsdClipboardManager *manager,
rdata->offset += length;
-items = length / clipboard_bytes_per_item (rdata->data->format);
+bytes = clipboard_bytes_per_item (rdata->data->format);
+items = bytes == 0 ? 0 : length / bytes;
+
XChangeProperty (manager->priv->display, rdata->requestor,
rdata->property, rdata->data->type,
rdata->data->format, PropModeAppend,
@@ -533,6 +536,7 @@ convert_clipboard_target (IncrConversion *rdata,
gint n_targets;
GSList*list;
gulong items;
+gulong bytes;
XWindowAttributes atts;
if (rdata->target == XA_TARGETS) {
@@ -571,7 +575,8 @@ convert_clipboard_target (IncrConversion *rdata,
}
rdata->data = target_data_ref (tdata);
-items = tdata->length / clipboard_bytes_per_item
(tdata->format);
+bytes = clipboard_bytes_per_item (tdata->format);
+items = bytes == 0 ? 0 : tdata->length / bytes;
if (tdata->length <= SELECTION_MAX_SIZE)
XChangeProperty (manager->priv->display,
rdata->requestor,
rdata->property,
--
To stop r
[Xfce4-commits] [xfce/xfce4-settings] branch master updated (926320b -> 0cd2254)
This is an automated email from the git hooks/post-receive script. igor pushed a change to branch master in repository xfce/xfce4-settings. from 926320b I18n: Update translation sr (100%). new 0cd2254 Bug 11317: descriptions returned by libxklavier are already in UTF-8 The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: dialogs/keyboard-settings/xfce-keyboard-settings.c |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- To stop receiving notification emails like this one, please contact the administrator of this repository. ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] [xfce/xfce4-settings] 01/01: Bug 11317: descriptions returned by libxklavier are already in UTF-8
This is an automated email from the git hooks/post-receive script. igor pushed a commit to branch master in repository xfce/xfce4-settings. commit 0cd22546f9d64cbb47697f23d62ed099378617e1 Author: Igor Slepchin Date: Fri Feb 6 18:50:57 2015 -0500 Bug 11317: descriptions returned by libxklavier are already in UTF-8 --- dialogs/keyboard-settings/xfce-keyboard-settings.c |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dialogs/keyboard-settings/xfce-keyboard-settings.c b/dialogs/keyboard-settings/xfce-keyboard-settings.c index cca0e6e..63b461a 100644 --- a/dialogs/keyboard-settings/xfce-keyboard-settings.c +++ b/dialogs/keyboard-settings/xfce-keyboard-settings.c @@ -1302,7 +1302,7 @@ xfce_keyboard_settings_xkb_description (XklConfigItem *config_item) if (ci_description[0] == 0) description = g_strdup (config_item->name); else -description = g_locale_to_utf8 (ci_description, -1, NULL, NULL, NULL); +description = g_strdup (ci_description); return description; } -- To stop receiving notification emails like this one, please contact the administrator of this repository. ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] [xfce/xfce4-settings] 02/02: I18n: Update translation sr (100%).
This is an automated email from the git hooks/post-receive script. transifex pushed a commit to branch master in repository xfce/xfce4-settings. commit 926320b1e478484c9f40b3716af15018fe007502 Author: Саша Петровић Date: Sat Feb 7 00:30:54 2015 +0100 I18n: Update translation sr (100%). 354 translated messages. Transifex (https://www.transifex.com/projects/p/xfce/). --- po/sr.po | 464 -- 1 file changed, 238 insertions(+), 226 deletions(-) diff --git a/po/sr.po b/po/sr.po index 13384cd..ba7b418 100644 --- a/po/sr.po +++ b/po/sr.po @@ -4,13 +4,13 @@ # # Translators: # Саша Петровић , 2012,2014 -# Саша Петровић , 2012,2014 +# Саша Петровић , 2012,2014-2015 msgid "" msgstr "" "Project-Id-Version: Xfce4-settings\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-07-27 18:30+0200\n" -"PO-Revision-Date: 2014-09-17 17:38+\n" +"POT-Creation-Date: 2015-02-06 06:30+0100\n" +"PO-Revision-Date: 2015-02-06 22:32+\n" "Last-Translator: Саша Петровић \n" "Language-Team: Serbian (http://www.transifex.com/projects/p/xfce4-settings/language/sr/)\n" "MIME-Version: 1.0\n" @@ -26,7 +26,7 @@ msgstr "Приступачност" #: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:2 msgid "Configure keyboard and mouse accessibility" -msgstr "Подесите тастатуру и осетљивост миша" +msgstr "Подесите приступачност тастатуре и миша" #: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:3 msgid "_Enable assistive technologies" @@ -36,7 +36,7 @@ msgstr "_Омогући технологије приступачности" msgid "" "If enabled, the session manager will start the required applications for " "screen readers and magnifiers" -msgstr "Уколико је укључено, управник сесије ће покренути потребне програме за читање екрана и лупе" +msgstr "Уколико је омогућено, управник сесије ће покренути потребне програме за читање екрана и лупе" #: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:5 msgid "" @@ -71,7 +71,7 @@ msgstr "_Закључај лепљиву дугмад" msgid "" "When selected, modifier keys (such as Control, Alt, and Shift) will remain " "locked in the pressed state until pressed again" -msgstr "Када је изабрано, управачка дугмад (као што су Контрол, Алт и Шифт) ће остати закључани у притиснутом стању док се не притисну опет" +msgstr "Када је изабрано, управљачка дугмад (као што су Контрол, Алт и Шифт) ће остати закључани у притиснутом стању док се не притисну опет" #: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:13 msgid "Disable sticky keys if two keys are _pressed" @@ -95,7 +95,7 @@ msgstr "Користи _спору дугмад" msgid "" "To help prevent accidental keystrokes, slow keys requires that a key is held" " for a certain minimum amount of time before the keystroke will be accepted" -msgstr "Да би се спречили случајни притисци дугмади, спора дугмад захтевају држање одређено време, пре него се прихвати сигнал" +msgstr "Да би се спречили случајни притисци дугмади, спора дугмад захтевају држање одређено време да би њихово дејство било прихваћено" #: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:18 msgid "Acceptance _delay:" @@ -127,7 +127,7 @@ msgstr "Кашњење одзива ду_гмади:" #: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:24 msgid "The amount of time, in milliseconds, required between keystrokes" -msgstr "Време у милисекундама, потребно за раздвајање притисака тастера" +msgstr "Време у милисекундама, потребно за раздвајање притисака дугмади" #: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:25 msgid "Bounce Keys" @@ -208,54 +208,55 @@ msgstr "_Миш" #: ../dialogs/accessibility-settings/main.c:43 #: ../dialogs/appearance-settings/main.c:95 #: ../dialogs/display-settings/main.c:120 -#: ../dialogs/keyboard-settings/main.c:39 ../dialogs/mouse-settings/main.c:79 +#: ../dialogs/keyboard-settings/main.c:39 ../dialogs/mouse-settings/main.c:83 msgid "Settings manager socket" -msgstr "Подешава управника утичнице" +msgstr "Поставке управника утичнице" #: ../dialogs/accessibility-settings/main.c:43 #: ../dialogs/appearance-settings/main.c:95 #: ../dialogs/display-settings/main.c:120 -#: ../dialogs/keyboard-settings/main.c:39 ../dialogs/mouse-settings/main.c:79 +#: ../dialogs/keyboard-settings/main.c:39 ../dialogs/mouse-settings/main.c:83 msgid "SOCKET ID" -msgstr "ИБ УТИЧНИЦЕ" +msgstr "ЛБ УТИЧНИЦЕ" #: ../dialogs/accessibility-settings/main.c:44 #: ../dialogs/appearance-settings/main.c:96 #: ../dialogs/display-settings/main.c:121 #: ../dialogs/keyboard-settings/main.c:40 ../dialogs/mime-settings/main.c:40 -#: ../dialogs/mouse-settings/main.c:80 ../xfce4-settings-editor/main.c:43 -#: ../xfsettingsd/main.c:77 ../xfce4-settings-manager/main.c:40 +#: ../dialogs/mouse-settings/main.c:84 ../xfce4-settings-editor/main.c:43 +#: ../xfsettingsd/main.c:78 ../xfce4-settings-manager/main.c:40 msgid "Version information" msgstr "Подаци о
[Xfce4-commits] [apps/ristretto] 01/01: I18n: Update translation sr (100%).
This is an automated email from the git hooks/post-receive script. transifex pushed a commit to branch master in repository apps/ristretto. commit c1cb09b97bb9258c485850b98e1f55c2971ad683 Author: Саша Петровић Date: Sat Feb 7 00:31:09 2015 +0100 I18n: Update translation sr (100%). 188 translated messages. Transifex (https://www.transifex.com/projects/p/xfce/). --- po/sr.po | 139 +++--- 1 file changed, 87 insertions(+), 52 deletions(-) diff --git a/po/sr.po b/po/sr.po index 1361b57..9632df7 100644 --- a/po/sr.po +++ b/po/sr.po @@ -4,13 +4,13 @@ # # Translators: # Саша Петровић , 2012 -# Саша Петровић , 2015 +# Саша Петровић , 2012,2015 msgid "" msgstr "" "Project-Id-Version: Xfce Apps\n" "Report-Msgid-Bugs-To: xfce-i...@xfce.org\n" -"POT-Creation-Date: 2015-01-18 12:31+0100\n" -"PO-Revision-Date: 2015-01-20 10:59+\n" +"POT-Creation-Date: 2015-01-25 12:30+0100\n" +"PO-Revision-Date: 2015-02-06 23:12+\n" "Last-Translator: Саша Петровић \n" "Language-Team: Serbian (http://www.transifex.com/projects/p/xfce-apps/language/sr/)\n" "MIME-Version: 1.0\n" @@ -33,7 +33,7 @@ msgstr "Покрени као покретни приказ" #: ../src/main.c:78 msgid "Show settings dialog" -msgstr "Прикажи дијалог подешавања" +msgstr "Прикажи прозорче поставки" #: ../src/main.c:108 #, c-format @@ -83,7 +83,7 @@ msgstr "_Својства..." #. Keyboard shortcut #: ../src/main_window.c:383 msgid "Show file properties" -msgstr "Прикажи особине датотеке" +msgstr "Прикажи својства датотеке" #. Icon-name #: ../src/main_window.c:387 ../src/main_window.c:406 @@ -120,11 +120,11 @@ msgstr "Напусти Ристрето" #: ../src/main_window.c:410 msgid "_Open with" -msgstr "_Отвори са" +msgstr "_Отвори помоћу" #: ../src/main_window.c:414 msgid "_Sorting" -msgstr "_Правило распореда" +msgstr "_Распоред" #. Icon-name #: ../src/main_window.c:418 @@ -207,7 +207,7 @@ msgstr "Умањи" #. Icon-name #: ../src/main_window.c:476 msgid "Zoom _Fit" -msgstr "Увећај да _испуни" +msgstr "Увећај до _попуне" #. Label-text #. Keyboard shortcut @@ -218,7 +218,7 @@ msgstr "Увећај ради уклапања на величину прозо #. Icon-name #: ../src/main_window.c:482 msgid "_Normal Size" -msgstr "_Нормална величина" +msgstr "_Уобичајена величина" #. Label-text #. Keyboard shortcut @@ -301,7 +301,7 @@ msgstr "_Садржај" #. Keyboard shortcut #: ../src/main_window.c:541 msgid "Display ristretto user manual" -msgstr "Прикажи корисничко упутство за Ристрето" +msgstr "Прикажи корисничко упутство Ристрета" #. Icon-name #: ../src/main_window.c:545 @@ -324,11 +324,11 @@ msgstr "_Величина" #: ../src/main_window.c:560 msgid "Thumbnail Bar _Position" -msgstr "Положај _траке сличица" +msgstr "Положај _траке умањених сличица" #: ../src/main_window.c:564 msgid "Thumb_nail Size" -msgstr "Величина _сличице" +msgstr "Величина умањене _сличице" #. Icon-name #: ../src/main_window.c:569 @@ -338,17 +338,17 @@ msgstr "Напусти _цео екран" #. Icon-name #: ../src/main_window.c:585 msgid "_Show Toolbar" -msgstr "Прикажи траку _алата" +msgstr "Приказуј траку _алата" #. Icon-name #: ../src/main_window.c:593 msgid "Show _Thumbnail Bar" -msgstr "Прикажи траку _сличица" +msgstr "Приказуј траку умањених _сличица" #. Icon-name #: ../src/main_window.c:601 msgid "Show Status _Bar" -msgstr "Прикажи траку _стања" +msgstr "Приказуј траку _стања" #. Icon-name #: ../src/main_window.c:614 @@ -379,11 +379,11 @@ msgstr "Доле" #: ../src/main_window.c:661 msgid "Very Small" -msgstr "Врло мале" +msgstr "Најмање" #: ../src/main_window.c:667 msgid "Smaller" -msgstr "Јако мале" +msgstr "Мање" #: ../src/main_window.c:673 msgid "Small" @@ -391,7 +391,7 @@ msgstr "Мале" #: ../src/main_window.c:679 msgid "Normal" -msgstr "Нормалне" +msgstr "Уобичајене" #: ../src/main_window.c:685 msgid "Large" @@ -403,12 +403,12 @@ msgstr "Веће" #: ../src/main_window.c:697 msgid "Very Large" -msgstr "Врло велике" +msgstr "Највеће" #. Create Play/Pause Slideshow actions #: ../src/main_window.c:849 msgid "_Play" -msgstr "_Пусти" +msgstr "_Изведи" #: ../src/main_window.c:849 msgid "Play slideshow" @@ -437,7 +437,7 @@ msgstr "Притисните „Отвори“ да изаберете слик #: ../src/main_window.c:1354 ../src/main_window.c:1358 msgid "Open With Other _Application..." -msgstr "Отвори другим _програмом..." +msgstr "Отвори неким другим _програмом..." #: ../src/main_window.c:1379 ../src/main_window.c:1385 msgid "Empty" @@ -456,7 +456,7 @@ msgid "" "Configure which system is currently managing your desktop.\n" "This setting determines the method Ristretto will use\n" "to configure the desktop wallpaper." -msgstr "Подеси који систем тренутно управља радном површином.\nОво подешавање одређује који начин ће Ристрето\nкористити за поставку позадине радне површи." +msgstr "Подесите који систем тренутно управља радном површином.\nОва поставка одређује који начин ће Ристрето\nкористит
[Xfce4-commits] [xfce/xfce4-settings] branch master updated (6f09f93 -> 926320b)
This is an automated email from the git hooks/post-receive script. transifex pushed a change to branch master in repository xfce/xfce4-settings. from 6f09f93 I18n: Update translation zh_TW (100%). new a691a63 I18n: Update translation pt_BR (99%). new 926320b I18n: Update translation sr (100%). The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: po/pt_BR.po | 190 po/sr.po| 464 ++- 2 files changed, 339 insertions(+), 315 deletions(-) -- To stop receiving notification emails like this one, please contact the administrator of this repository. ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] [xfce/xfce4-settings] 01/02: I18n: Update translation pt_BR (99%).
This is an automated email from the git hooks/post-receive script. transifex pushed a commit to branch master in repository xfce/xfce4-settings. commit a691a637dfa8370ab927306a8fb97e7902d61758 Author: André Miranda Date: Sat Feb 7 00:30:54 2015 +0100 I18n: Update translation pt_BR (99%). 353 translated messages, 1 untranslated message. Transifex (https://www.transifex.com/projects/p/xfce/). --- po/pt_BR.po | 190 +++ 1 file changed, 101 insertions(+), 89 deletions(-) diff --git a/po/pt_BR.po b/po/pt_BR.po index 3c4a820..76acb04 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -3,7 +3,7 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: -# André Miranda , 2014 +# André Miranda , 2014-2015 # Fábio Nogueira , 2008 # Henrique P. Machado , 2008 # Rafael Ferreira , 2014 @@ -13,8 +13,8 @@ msgid "" msgstr "" "Project-Id-Version: Xfce4-settings\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-07-27 18:30+0200\n" -"PO-Revision-Date: 2014-07-29 03:28+\n" +"POT-Creation-Date: 2015-02-06 06:30+0100\n" +"PO-Revision-Date: 2015-02-06 22:41+\n" "Last-Translator: André Miranda \n" "Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/xfce4-settings/language/pt_BR/)\n" "MIME-Version: 1.0\n" @@ -212,14 +212,14 @@ msgstr "_Mouse" #: ../dialogs/accessibility-settings/main.c:43 #: ../dialogs/appearance-settings/main.c:95 #: ../dialogs/display-settings/main.c:120 -#: ../dialogs/keyboard-settings/main.c:39 ../dialogs/mouse-settings/main.c:79 +#: ../dialogs/keyboard-settings/main.c:39 ../dialogs/mouse-settings/main.c:83 msgid "Settings manager socket" msgstr "Socket do gerenciador de configurações" #: ../dialogs/accessibility-settings/main.c:43 #: ../dialogs/appearance-settings/main.c:95 #: ../dialogs/display-settings/main.c:120 -#: ../dialogs/keyboard-settings/main.c:39 ../dialogs/mouse-settings/main.c:79 +#: ../dialogs/keyboard-settings/main.c:39 ../dialogs/mouse-settings/main.c:83 msgid "SOCKET ID" msgstr "SOCKET ID" @@ -227,36 +227,37 @@ msgstr "SOCKET ID" #: ../dialogs/appearance-settings/main.c:96 #: ../dialogs/display-settings/main.c:121 #: ../dialogs/keyboard-settings/main.c:40 ../dialogs/mime-settings/main.c:40 -#: ../dialogs/mouse-settings/main.c:80 ../xfce4-settings-editor/main.c:43 -#: ../xfsettingsd/main.c:77 ../xfce4-settings-manager/main.c:40 +#: ../dialogs/mouse-settings/main.c:84 ../xfce4-settings-editor/main.c:43 +#: ../xfsettingsd/main.c:78 ../xfce4-settings-manager/main.c:40 msgid "Version information" msgstr "Informações da versão" #: ../dialogs/accessibility-settings/main.c:192 -#: ../dialogs/appearance-settings/main.c:1006 -#: ../dialogs/display-settings/main.c:2950 +#: ../dialogs/appearance-settings/main.c:997 +#: ../dialogs/display-settings/main.c:3025 #: ../dialogs/keyboard-settings/main.c:76 ../dialogs/mime-settings/main.c:62 -#: ../dialogs/mouse-settings/main.c:1611 ../xfce4-settings-editor/main.c:63 -#: ../xfsettingsd/main.c:187 ../xfce4-settings-manager/main.c:61 +#: ../dialogs/mouse-settings/main.c:1769 ../xfce4-settings-editor/main.c:63 +#: ../xfsettingsd/main.c:191 ../xfsettingsd/main.c:229 +#: ../xfce4-settings-manager/main.c:61 #, c-format msgid "Type '%s --help' for usage." msgstr "Digite \"%s --help\" para informações de uso." #: ../dialogs/accessibility-settings/main.c:211 -#: ../dialogs/appearance-settings/main.c:1025 -#: ../dialogs/display-settings/main.c:2969 +#: ../dialogs/appearance-settings/main.c:1016 +#: ../dialogs/display-settings/main.c:3044 #: ../dialogs/keyboard-settings/main.c:92 ../dialogs/mime-settings/main.c:81 -#: ../dialogs/mouse-settings/main.c:1630 ../xfce4-settings-editor/main.c:82 -#: ../xfsettingsd/main.c:203 ../xfce4-settings-manager/main.c:77 +#: ../dialogs/mouse-settings/main.c:1788 ../xfce4-settings-editor/main.c:82 +#: ../xfsettingsd/main.c:207 ../xfce4-settings-manager/main.c:77 msgid "The Xfce development team. All rights reserved." msgstr "A equipe de desenvolvimento do Xfce. Todos os direitos reservados." #: ../dialogs/accessibility-settings/main.c:212 -#: ../dialogs/appearance-settings/main.c:1026 -#: ../dialogs/display-settings/main.c:2970 +#: ../dialogs/appearance-settings/main.c:1017 +#: ../dialogs/display-settings/main.c:3045 #: ../dialogs/keyboard-settings/main.c:93 ../dialogs/mime-settings/main.c:82 -#: ../dialogs/mouse-settings/main.c:1631 ../xfce4-settings-editor/main.c:83 -#: ../xfsettingsd/main.c:204 ../xfce4-settings-manager/main.c:78 +#: ../dialogs/mouse-settings/main.c:1789 ../xfce4-settings-editor/main.c:83 +#: ../xfsettingsd/main.c:208 ../xfce4-settings-manager/main.c:78 #, c-format msgid "Please report bugs to <%s>." msgstr "Por favor, relate os erros para <%s>." @@ -414,7 +415,7 @@ msgid "Setti_ngs" msgstr "_Configurações" #: ../dialogs/appearance-settings/appearance-dialog.glade.h:34 -#: ../dialogs/appearance-settings/main.c:892
[Xfce4-commits] [apps/ristretto] branch master updated (481bfeb -> c1cb09b)
This is an automated email from the git hooks/post-receive script. transifex pushed a change to branch master in repository apps/ristretto. from 481bfeb I18n: Update translation fr (98%). new c1cb09b I18n: Update translation sr (100%). The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: po/sr.po | 139 +++--- 1 file changed, 87 insertions(+), 52 deletions(-) -- To stop receiving notification emails like this one, please contact the administrator of this repository. ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] [xfce/thunar] 01/01: I18n: Update translation de (100%).
This is an automated email from the git hooks/post-receive script. transifex pushed a commit to branch master in repository xfce/thunar. commit 23fc98065ab56b8fd45cd8ffb6346f531397d99a Author: Tobias Bannert Date: Sat Feb 7 00:30:19 2015 +0100 I18n: Update translation de (100%). 739 translated messages. Transifex (https://www.transifex.com/projects/p/xfce/). --- po/de.po |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/po/de.po b/po/de.po index e9d6cc3..832a3cd 100644 --- a/po/de.po +++ b/po/de.po @@ -15,7 +15,7 @@ msgstr "" "Project-Id-Version: Thunar\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2015-01-29 00:30+0100\n" -"PO-Revision-Date: 2015-01-30 14:05+\n" +"PO-Revision-Date: 2015-02-06 19:17+\n" "Last-Translator: Tobias Bannert \n" "Language-Team: German (http://www.transifex.com/projects/p/thunar/language/de/)\n" "MIME-Version: 1.0\n" @@ -673,7 +673,7 @@ msgstr "Wollen Sie den vorhandenen Ordner" #: ../thunar/thunar-dialogs.c:603 msgid "ReplaceDialogPart1|Do you want to replace the existing file" -msgstr "Wollen Sie die existierende Datei" +msgstr "Wollen Sie die vorhandene Datei" #. Fourth box (size, volume, free space) #: ../thunar/thunar-dialogs.c:620 ../thunar/thunar-dialogs.c:651 -- To stop receiving notification emails like this one, please contact the administrator of this repository. ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] [xfce/thunar] branch master updated (c22f1e5 -> 23fc980)
This is an automated email from the git hooks/post-receive script. transifex pushed a change to branch master in repository xfce/thunar. from c22f1e5 I18n: Update translation pt_BR (100%). new 23fc980 I18n: Update translation de (100%). The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: po/de.po |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- To stop receiving notification emails like this one, please contact the administrator of this repository. ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] [xfce/gtk-xfce-engine] 05/08: Use parent background for smooth edges.
This is an automated email from the git hooks/post-receive script.
peter pushed a commit to branch peter/refresh-gtk2
in repository xfce/gtk-xfce-engine.
commit 8debac71ec8834f6ddb33af8617f2128ab792864
Author: Peter de Ridder
Date: Sun Jan 5 14:00:38 2014 +0100
Use parent background for smooth edges.
---
src/xfce_theme_draw.c | 28 +---
1 file changed, 21 insertions(+), 7 deletions(-)
diff --git a/src/xfce_theme_draw.c b/src/xfce_theme_draw.c
index 1e0c0db..f2a4abd 100644
--- a/src/xfce_theme_draw.c
+++ b/src/xfce_theme_draw.c
@@ -383,6 +383,9 @@ static void draw_shadow(GtkStyle * style, GdkWindow *
window, GtkStateType state
{
gint xt, yt;
cairo_t *cr;
+GtkWidget *parent;
+GtkStyle *pstyle;
+GdkColor *pbg;
CHECK_ARGS;
@@ -391,6 +394,17 @@ static void draw_shadow(GtkStyle * style, GdkWindow *
window, GtkStateType state
SANITIZE_SIZE;
+parent = gtk_widget_get_parent(widget);
+if (parent)
+{
+pstyle = gtk_widget_get_style(widget);
+pbg = &pstyle->bg[gtk_widget_get_state(parent)];
+}
+else
+{
+pbg = &style->mid[state_type];
+}
+
/* Spin buttons are a special case */
if (widget && GTK_IS_SPIN_BUTTON (widget))
{
@@ -465,7 +479,7 @@ static void draw_shadow(GtkStyle * style, GdkWindow *
window, GtkStateType state
state_type = GTK_STATE_NORMAL;
}
-gdk_cairo_set_source_color(cr,
&style->mid[state_type]);
+gdk_cairo_set_source_color(cr, pbg);
cairo_rectangle(cr, x, y, 1, 1);
cairo_rectangle(cr, x + width - 1, y, 1, 1);
cairo_rectangle(cr, x, y + height - 1, 1, 1);
@@ -559,7 +573,7 @@ static void draw_shadow(GtkStyle * style, GdkWindow *
window, GtkStateType state
cairo_rectangle(cr, x + 0.5, y + 0.5, width - 1,
height - 1);
cairo_stroke(cr);
-gdk_cairo_set_source_color(cr,
&style->mid[GTK_STATE_NORMAL]);
+gdk_cairo_set_source_color(cr, pbg);
cairo_rectangle(cr, x, y, 1, 1);
cairo_rectangle(cr, x + width - 1, y, 1, 1);
cairo_rectangle(cr, x, y + height - 1, 1, 1);
@@ -592,7 +606,7 @@ static void draw_shadow(GtkStyle * style, GdkWindow *
window, GtkStateType state
cairo_line_to(cr, x + width - 1.5, y + 2.5);
cairo_stroke(cr);
-gdk_cairo_set_source_color(cr,
&style->mid[state_type]);
+gdk_cairo_set_source_color(cr, pbg);
cairo_rectangle(cr, x, y, 1, 1);
cairo_rectangle(cr, x + width - 1, y, 1, 1);
cairo_rectangle(cr, x, y + height - 1, 1, 1);
@@ -614,7 +628,7 @@ static void draw_shadow(GtkStyle * style, GdkWindow *
window, GtkStateType state
cairo_line_to(cr, x + width - 0.5, y + 1.5);
cairo_stroke(cr);
-gdk_cairo_set_source_color(cr,
&style->mid[state_type]);
+gdk_cairo_set_source_color(cr, pbg);
cairo_rectangle(cr, x, y, 1, 1);
cairo_rectangle(cr, x + width - 1, y, 1, 1);
cairo_rectangle(cr, x, y + height - 1, 1, 1);
@@ -685,7 +699,7 @@ static void draw_shadow(GtkStyle * style, GdkWindow *
window, GtkStateType state
cairo_rectangle(cr, x + 0.5, y + 0.5, width - 1,
height - 1);
cairo_stroke(cr);
-gdk_cairo_set_source_color(cr,
&style->mid[GTK_STATE_NORMAL]);
+gdk_cairo_set_source_color(cr, pbg);
cairo_rectangle(cr, x, y, 1, 1);
cairo_rectangle(cr, x + width - 1, y, 1, 1);
cairo_rectangle(cr, x, y + height - 1, 1, 1);
@@ -865,7 +879,7 @@ static void draw_shadow(GtkStyle * style, GdkWindow *
window, GtkStateType state
cairo_line_to(cr, x + width - 1.5, y + 1.5);
cairo_stroke(cr);
-gdk_cairo_set_source_color(cr,
&style->mid[state_type]);
+gdk_cairo_set_source_color(cr, pbg);
cairo_rectangle(cr, x, y, 1, 1);
cairo_rectangle(cr, x + width - 1, y, 1, 1);
cairo_rectangle(cr, x, y + height - 1, 1, 1);
@@ -887,7 +901,7 @@ static void draw_shadow(GtkStyle * style, GdkWindow *
window, GtkStateType state
cairo_line_to(cr, x + width - 0.5, y + 1.5);
cairo_stroke(cr);
-gdk_cairo_set_source_color(cr,
&style->mid[state_type])
[Xfce4-commits] [xfce/gtk-xfce-engine] 06/08: Use smooth_edge in focus line too.
This is an automated email from the git hooks/post-receive script.
peter pushed a commit to branch peter/refresh-gtk2
in repository xfce/gtk-xfce-engine.
commit 21367f9422bca8f0f80c4eb195a8eab69ff9c9da
Author: Peter de Ridder
Date: Sun Jan 5 15:19:00 2014 +0100
Use smooth_edge in focus line too.
---
src/xfce_theme_draw.c | 63 +++--
1 file changed, 50 insertions(+), 13 deletions(-)
diff --git a/src/xfce_theme_draw.c b/src/xfce_theme_draw.c
index f2a4abd..3c5070e 100644
--- a/src/xfce_theme_draw.c
+++ b/src/xfce_theme_draw.c
@@ -1776,14 +1776,21 @@ static void draw_focus(GtkStyle * style, GdkWindow *
window, GtkStateType state_
total_length += dash_list[i];
}
-/* The dash offset here aligns the pattern to integer pixels
- * by starting the dash at the right side of the left border
- * Negative dash offsets in cairo don't work
- * (https://bugs.freedesktop.org/show_bug.cgi?id=2729)
- */
-dash_offset = - line_width / 2.;
-while (dash_offset < 0)
-dash_offset += total_length;
+if (XFCE_RC_STYLE(style->rc_style)->smooth_edge)
+{
+ dash_offset = 0;
+}
+else
+{
+/* The dash offset here aligns the pattern to integer pixels
+ * by starting the dash at the right side of the left border
+ * Negative dash offsets in cairo don't work
+ * (https://bugs.freedesktop.org/show_bug.cgi?id=2729)
+ */
+dash_offset = - line_width / 2.;
+while (dash_offset < 0)
+dash_offset += total_length;
+}
cairo_set_dash (cr, dashes, n_dashes, dash_offset);
g_free (dashes);
@@ -1795,11 +1802,41 @@ static void draw_focus(GtkStyle * style, GdkWindow *
window, GtkStateType state_
cairo_clip (cr);
}
-cairo_rectangle (cr,
-x + line_width / 2.,
-y + line_width / 2.,
-width - line_width,
-height - line_width);
+if (XFCE_RC_STYLE(style->rc_style)->smooth_edge)
+{
+cairo_move_to (cr,
+x + 1,
+y + line_width / 2.);
+cairo_line_to (cr,
+x + width - 1,
+y + line_width / 2.);
+cairo_move_to (cr,
+x + width - line_width / 2.,
+y + 1);
+cairo_line_to (cr,
+x + width - line_width / 2.,
+y + height - 1);
+cairo_move_to (cr,
+x + width - 1,
+y + height - line_width / 2.);
+cairo_line_to (cr,
+x + 1,
+y + height - line_width / 2.);
+cairo_move_to (cr,
+x + line_width / 2.,
+y + height - 1);
+cairo_line_to (cr,
+x + line_width / 2.,
+y + 1);
+}
+else
+{
+cairo_rectangle (cr,
+x + line_width / 2.,
+y + line_width / 2.,
+width - line_width,
+height - line_width);
+}
cairo_stroke (cr);
cairo_destroy (cr);
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] [xfce/gtk-xfce-engine] branch peter/refresh-gtk2 created (now f233581)
This is an automated email from the git hooks/post-receive script. peter pushed a change to branch peter/refresh-gtk2 in repository xfce/gtk-xfce-engine. at f233581 Use parent style for retrieving the background. This branch includes the following new commits: new 52f856d Support trough-side-details. new 0c3ce9d More consistent notebook in Gtk2. new c9b5e15 Added flat_border style property. new d320de2 Added focus_color style property. new 8debac7 Use parent background for smooth edges. new 21367f9 Use smooth_edge in focus line too. new c1c192d Improved Gtk2 notebook. new f233581 Use parent style for retrieving the background. The 8 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. -- To stop receiving notification emails like this one, please contact the administrator of this repository. ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] [xfce/gtk-xfce-engine] 01/08: Support trough-side-details.
This is an automated email from the git hooks/post-receive script.
peter pushed a commit to branch peter/refresh-gtk2
in repository xfce/gtk-xfce-engine.
commit 52f856d2168f0312cd1988bd7e0db4181f565911
Author: Peter de Ridder
Date: Sun Dec 15 19:44:52 2013 +0100
Support trough-side-details.
---
src/xfce_theme_draw.c | 15 ++-
1 file changed, 10 insertions(+), 5 deletions(-)
diff --git a/src/xfce_theme_draw.c b/src/xfce_theme_draw.c
index 6181356..3b1ea9a 100644
--- a/src/xfce_theme_draw.c
+++ b/src/xfce_theme_draw.c
@@ -107,6 +107,11 @@ static void xfce_fill_background(GtkStyle * style,
GdkWindow * window, GtkStateT
cr = ge_gdk_drawable_to_cairo(window, area);
+if (DETAIL("trough-lower"))
+{
+state_type = GTK_STATE_SELECTED;
+}
+
if ((!draw_base) && (XFCE_RC_STYLE(style->rc_style)->gradient))
{
switch (XFCE_RC_STYLE(style->rc_style)->gradient_style)
@@ -143,7 +148,7 @@ static void xfce_fill_background(GtkStyle * style,
GdkWindow * window, GtkStateT
}
break;
}
-if ((state_type == GTK_STATE_ACTIVE) || (DETAIL("trough")))
+if ((state_type == GTK_STATE_ACTIVE) || (DETAIL("trough")) ||
(DETAIL("trough-lower")) || (DETAIL("trough-upper")))
{
shade_start = MIN (XFCE_RC_STYLE(style->rc_style)->shade_start,
XFCE_RC_STYLE(style->rc_style)->shade_end);
shade_end = MAX (XFCE_RC_STYLE(style->rc_style)->shade_start,
XFCE_RC_STYLE(style->rc_style)->shade_end);
@@ -493,9 +498,9 @@ static void draw_shadow(GtkStyle * style, GdkWindow *
window, GtkStateType state
case GTK_SHADOW_IN:
if (XFCE_RC_STYLE(style->rc_style)->smooth_edge)
{
-if (DETAIL("trough"))
+if (DETAIL("trough") || DETAIL("trough-lower") ||
DETAIL("trough-upper"))
{
-gdk_cairo_set_source_color(cr,
&style->bg[GTK_STATE_NORMAL]);
+gdk_cairo_set_source_color(cr,
&style->bg[DETAIL("trough-lower") ? GTK_STATE_SELECTED : GTK_STATE_NORMAL]);
cairo_rectangle(cr, x + 0.5, y + 0.5, width - 1, height -
1);
cairo_stroke(cr);
@@ -564,9 +569,9 @@ static void draw_shadow(GtkStyle * style, GdkWindow *
window, GtkStateType state
}
else
{
-if (DETAIL("trough"))
+if (DETAIL("trough") || DETAIL("trough-lower") ||
DETAIL("trough-upper"))
{
-gdk_cairo_set_source_color(cr,
&style->dark[GTK_STATE_ACTIVE]);
+gdk_cairo_set_source_color(cr,
&style->dark[DETAIL("trough-lower") ? GTK_STATE_SELECTED : GTK_STATE_ACTIVE]);
cairo_rectangle(cr, x + 0.5, y + 0.5, width - 1, height -
1);
cairo_stroke(cr);
}
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] [xfce/gtk-xfce-engine] 08/08: Use parent style for retrieving the background.
This is an automated email from the git hooks/post-receive script. peter pushed a commit to branch peter/refresh-gtk2 in repository xfce/gtk-xfce-engine. commit f23358109325bc9644a9ac7e61ff8b4eb3a9a502 Author: Peter de Ridder Date: Thu Jan 9 22:11:32 2014 +0100 Use parent style for retrieving the background. --- src/xfce_theme_draw.c |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/xfce_theme_draw.c b/src/xfce_theme_draw.c index b1eff5b..4226d25 100644 --- a/src/xfce_theme_draw.c +++ b/src/xfce_theme_draw.c @@ -400,7 +400,7 @@ static void draw_shadow(GtkStyle * style, GdkWindow * window, GtkStateType state /* Get the background color from the parent widget. * This makes a nicer corner if the background colors differ. */ -pstyle = gtk_widget_get_style(widget); +pstyle = gtk_widget_get_style(parent); pbg = &pstyle->bg[gtk_widget_get_state(parent)]; } else -- To stop receiving notification emails like this one, please contact the administrator of this repository. ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] [xfce/gtk-xfce-engine] 04/08: Added focus_color style property.
This is an automated email from the git hooks/post-receive script.
peter pushed a commit to branch peter/refresh-gtk2
in repository xfce/gtk-xfce-engine.
commit d320de29d3592fe26c66c7b5ae40d3adc7fbdaf9
Author: Peter de Ridder
Date: Fri Dec 27 13:52:17 2013 +0100
Added focus_color style property.
---
src/xfce_rc_style.c | 32 ++
src/xfce_rc_style.h | 10 ++
src/xfce_theme_draw.c | 88 +
3 files changed, 130 insertions(+)
diff --git a/src/xfce_rc_style.c b/src/xfce_rc_style.c
index a732b69..5e36230 100644
--- a/src/xfce_rc_style.c
+++ b/src/xfce_rc_style.c
@@ -78,6 +78,7 @@ theme_symbols[] =
{ "shade_start", TOKEN_SHADE_START },
{ "shade_end", TOKEN_SHADE_END },
{ "flat_border", TOKEN_FLATBORDER },
+{ "focus_color", TOKEN_FOCUSCOLOR },
{ "true", TOKEN_TRUE},
{ "TRUE", TOKEN_TRUE},
{ "false", TOKEN_FALSE},
@@ -111,6 +112,7 @@ void xfce_rc_style_register_type(GTypeModule * module)
static void xfce_rc_style_init(XfceRcStyle * style)
{
+style->flags = XFCE_RC_FLAGS_NONE;
style->smooth_edge = FALSE;
style->grip_style = XFCE_RC_GRIP_ROUGH;
style->gradient = FALSE;
@@ -375,6 +377,24 @@ static guint theme_parse_grip_style (GScanner * scanner,
GTokenType wanted_token
return G_TOKEN_NONE;
}
+static guint theme_parse_color (GScanner *scanner, GTokenType wanted_token,
GtkRcStyle *style, GdkColor *retval)
+{
+guint token;
+
+token = g_scanner_get_next_token (scanner);
+if (token != wanted_token)
+{
+return wanted_token;
+}
+token = g_scanner_get_next_token (scanner);
+if (token != G_TOKEN_EQUAL_SIGN)
+{
+return G_TOKEN_EQUAL_SIGN;
+}
+
+return gtk_rc_parse_color_full (scanner, style, retval);
+}
+
static guint xfce_rc_style_parse(GtkRcStyle * rc_style, GtkSettings *
settings, GScanner * scanner)
{
static GQuark scope_id = 0;
@@ -383,6 +403,7 @@ static guint xfce_rc_style_parse(GtkRcStyle * rc_style,
GtkSettings * settings,
guint token;
guint i;
gboolean b;
+GdkColor c;
/* Set up a new scope in this scanner. */
if(!scope_id)
@@ -432,6 +453,15 @@ static guint xfce_rc_style_parse(GtkRcStyle * rc_style,
GtkSettings * settings,
}
theme_data->flat_border = b;
break;
+case TOKEN_FOCUSCOLOR:
+token = theme_parse_color (scanner, TOKEN_FOCUSCOLOR,
rc_style, &c);
+if(token != G_TOKEN_NONE)
+{
+break;
+}
+theme_data->focus_color = c;
+theme_data->flags |= XFCE_RC_FOCUS_COLOR;
+break;
default:
g_scanner_get_next_token(scanner);
token = G_TOKEN_RIGHT_CURLY;
@@ -464,6 +494,7 @@ static void xfce_rc_style_merge(GtkRcStyle * dest,
GtkRcStyle * src)
src_data = XFCE_RC_STYLE(src);
dest_data = XFCE_RC_STYLE(dest);
+dest_data->flags = src_data->flags;
dest_data->smooth_edge = src_data->smooth_edge;
dest_data->grip_style = src_data->grip_style;
dest_data->gradient = src_data->gradient;
@@ -471,6 +502,7 @@ static void xfce_rc_style_merge(GtkRcStyle * dest,
GtkRcStyle * src)
dest_data->shade_start = src_data->shade_start;
dest_data->shade_end = src_data->shade_end;
dest_data->flat_border = src_data->flat_border;
+dest_data->focus_color = src_data->focus_color;
}
/* Create an empty style suitable to this RC style
diff --git a/src/xfce_rc_style.h b/src/xfce_rc_style.h
index c2c94e1..0b8d609 100644
--- a/src/xfce_rc_style.h
+++ b/src/xfce_rc_style.h
@@ -71,10 +71,18 @@ typedef enum
XFCE_RC_GRIP_SLIDE
} XfceRcHandlerType;
+typedef enum
+{
+XFCE_RC_FLAGS_NONE = 0,
+XFCE_RC_FOCUS_COLOR = 1<<0
+} XfceRcFlags;
+
struct _XfceRcStyle
{
GtkRcStyle parent_instance;
+XfceRcFlags flags;
+
gboolean smooth_edge;
XfceRcHandlerType grip_style;
gboolean gradient;
@@ -82,6 +90,7 @@ struct _XfceRcStyle
gfloat shade_start;
gfloat shade_end;
gboolean flat_border;
+GdkColor focus_color;
};
struct _XfceRcStyleClass
@@ -111,6 +120,7 @@ enum
TOKEN_SHADE_START,
TOKEN_SHADE_END,
TOKEN_FLATBORDER,
+TOKEN_FOCUSCOLOR,
TOKEN_TRUE,
TOKEN_FALSE
};
diff --git a/src/xfce_theme_draw.c b/src/xfce_theme_draw.c
index a50c692..1e0c0db 100644
--- a/src/xfce_theme_draw.c
+++ b/src/xfce_theme_draw.c
@@ -1706,6 +1706,93 @@ static void draw_handle(GtkStyle * style, GdkWindow *
window, GtkStateType state
xfce_draw_grips(style, window, state_type, area, widget, x, y, width,
height, orientation);
}
+static void draw_focus(GtkStyle * style, GdkWindow * window, GtkStateType
state_type, GdkRectangle * area, GtkWidget * widget, const gchar * detail, gint
x, gint y, gint width, gint height)
+{
+cairo_t *cr;
+gboolean free_dash_list = FALSE;
+
[Xfce4-commits] [xfce/gtk-xfce-engine] 03/08: Added flat_border style property.
This is an automated email from the git hooks/post-receive script.
peter pushed a commit to branch peter/refresh-gtk2
in repository xfce/gtk-xfce-engine.
commit c9b5e1537aac1eb3994b7cbbf16b0b7898844aac
Author: Peter de Ridder
Date: Sun Dec 15 22:03:51 2013 +0100
Added flat_border style property.
---
src/xfce_rc_style.c | 11 +
src/xfce_rc_style.h |2 +
src/xfce_theme_draw.c | 788 ++---
3 files changed, 435 insertions(+), 366 deletions(-)
diff --git a/src/xfce_rc_style.c b/src/xfce_rc_style.c
index 99db22c..a732b69 100644
--- a/src/xfce_rc_style.c
+++ b/src/xfce_rc_style.c
@@ -77,6 +77,7 @@ theme_symbols[] =
{ "southern_diagonal", TOKEN_SOUTHERN_DIAGONAL },
{ "shade_start", TOKEN_SHADE_START },
{ "shade_end", TOKEN_SHADE_END },
+{ "flat_border", TOKEN_FLATBORDER },
{ "true", TOKEN_TRUE},
{ "TRUE", TOKEN_TRUE},
{ "false", TOKEN_FALSE},
@@ -116,6 +117,7 @@ static void xfce_rc_style_init(XfceRcStyle * style)
style->gradient_style = XFCE_RC_GRADIENT_AUTO;
style->shade_start = DEFAULT_SHADE_START;
style->shade_end = DEFAULT_SHADE_END;
+style->flat_border = FALSE;
}
static void xfce_rc_style_class_init(XfceRcStyleClass * klass)
@@ -422,6 +424,14 @@ static guint xfce_rc_style_parse(GtkRcStyle * rc_style,
GtkSettings * settings,
break;
}
break;
+case TOKEN_FLATBORDER:
+token = theme_parse_boolean(scanner, TOKEN_FLATBORDER, &b);
+if(token != G_TOKEN_NONE)
+{
+break;
+}
+theme_data->flat_border = b;
+break;
default:
g_scanner_get_next_token(scanner);
token = G_TOKEN_RIGHT_CURLY;
@@ -460,6 +470,7 @@ static void xfce_rc_style_merge(GtkRcStyle * dest,
GtkRcStyle * src)
dest_data->gradient_style = src_data->gradient_style;
dest_data->shade_start = src_data->shade_start;
dest_data->shade_end = src_data->shade_end;
+dest_data->flat_border = src_data->flat_border;
}
/* Create an empty style suitable to this RC style
diff --git a/src/xfce_rc_style.h b/src/xfce_rc_style.h
index 53566b6..c2c94e1 100644
--- a/src/xfce_rc_style.h
+++ b/src/xfce_rc_style.h
@@ -81,6 +81,7 @@ struct _XfceRcStyle
XfceRcGradientType gradient_style;
gfloat shade_start;
gfloat shade_end;
+gboolean flat_border;
};
struct _XfceRcStyleClass
@@ -109,6 +110,7 @@ enum
TOKEN_SOUTHERN_DIAGONAL,
TOKEN_SHADE_START,
TOKEN_SHADE_END,
+TOKEN_FLATBORDER,
TOKEN_TRUE,
TOKEN_FALSE
};
diff --git a/src/xfce_theme_draw.c b/src/xfce_theme_draw.c
index 576cb36..a50c692 100644
--- a/src/xfce_theme_draw.c
+++ b/src/xfce_theme_draw.c
@@ -423,345 +423,234 @@ static void draw_shadow(GtkStyle * style, GdkWindow *
window, GtkStateType state
xt = MIN(style->xthickness, width - 1);
yt = MIN(style->ythickness, height - 1);
-switch (shadow_type)
+if (XFCE_RC_STYLE(style->rc_style)->flat_border)
{
-case GTK_SHADOW_NONE:
-break;
-case GTK_SHADOW_ETCHED_IN:
-if ((xt > 1) && (yt > 1))
+if ((DETAIL("spinbutton_up") || DETAIL("spinbutton_down")) &&
(state_type != GTK_STATE_PRELIGHT && state_type != GTK_STATE_ACTIVE))
+{
+/* Do nothing */
+}
+else if (DETAIL("menubar") || DETAIL ("handlebox_bin") || DETAIL
("handlebox") || DETAIL ("toolbar"))
+{
+if (yt > 0)
{
-gdk_cairo_set_source_color(cr, &style->light[state_type]);
+gdk_cairo_set_source_color(cr, &style->dark[state_type]);
cairo_move_to(cr, x + 0.5, y + height - 0.5);
cairo_line_to(cr, x + width - 0.5, y + height - 0.5);
-cairo_line_to(cr, x + width - 0.5, y + 0.5);
-cairo_stroke(cr);
-
-gdk_cairo_set_source_color(cr, &style->dark[state_type]);
-cairo_move_to(cr, x + width - 1.5, y + 0.5);
-cairo_line_to(cr, x + 0.5, y + 0.5);
-cairo_line_to(cr, x + 0.5, y + height - 1.5);
-cairo_stroke(cr);
-
-gdk_cairo_set_source_color(cr, &style->light[state_type]);
-cairo_move_to(cr, x + width - 1.5, y + 1.5);
-cairo_line_to(cr, x + 1.5, y + 1.5);
-cairo_line_to(cr, x + 1.5, y + height - 1.5);
-cairo_stroke(cr);
-
-gdk_cairo_set_source_color(cr, &style->dark[state_type]);
-cairo_move_to(cr, x + 1.5, y + height - 1.5);
-cairo_line_to(cr, x + width - 1.5, y + height - 1.5);
-cairo_line_to(cr, x + width - 1.5, y + 1.5);
cairo_stroke(cr);
}
-else if ((xt > 0) && (yt > 0))
+}
+else
+{
+if (((xt >
[Xfce4-commits] [xfce/gtk-xfce-engine] 02/08: More consistent notebook in Gtk2.
This is an automated email from the git hooks/post-receive script.
peter pushed a commit to branch peter/refresh-gtk2
in repository xfce/gtk-xfce-engine.
commit 0c3ce9d7bb5e48aacc78acac86fa7a66a3deef92
Author: Peter de Ridder
Date: Sun Dec 15 19:46:17 2013 +0100
More consistent notebook in Gtk2.
---
src/xfce_theme_draw.c | 30 +++---
1 file changed, 15 insertions(+), 15 deletions(-)
diff --git a/src/xfce_theme_draw.c b/src/xfce_theme_draw.c
index 3b1ea9a..576cb36 100644
--- a/src/xfce_theme_draw.c
+++ b/src/xfce_theme_draw.c
@@ -1259,13 +1259,13 @@ static void draw_box_gap(GtkStyle * style, GdkWindow *
window, GtkStateType stat
gdk_cairo_set_source_color(cr, c3);
cairo_move_to(cr, x + 2.5, y + height - 1.5);
cairo_line_to(cr, x + width - 1.5, y + height - 1.5);
-cairo_line_to(cr, x + width - 1.5, y + 0.5);
+cairo_line_to(cr, x + width - 0.5, y + 0.5);
cairo_stroke(cr);
gdk_cairo_set_source_color(cr, c4);
cairo_move_to(cr, x + 1.5, y + height - 0.5);
cairo_line_to(cr, x + width - 0.5, y + height - 0.5);
-cairo_line_to(cr, x + width - 0.5, y + 0.5);
+cairo_line_to(cr, x + width - 0.5, y + 1.5);
cairo_stroke(cr);
cairo_set_line_cap(cr, CAIRO_LINE_CAP_BUTT);
@@ -1290,7 +1290,7 @@ static void draw_box_gap(GtkStyle * style, GdkWindow *
window, GtkStateType stat
{
gdk_cairo_set_source_color(cr, c1);
cairo_move_to(cr, x + gap_x + gap_width, y + 0.5);
-cairo_line_to(cr, x + width - 1, y + 0.5);
+cairo_line_to(cr, x + width, y + 0.5);
cairo_stroke(cr);
gdk_cairo_set_source_color(cr, c2);
@@ -1316,12 +1316,12 @@ static void draw_box_gap(GtkStyle * style, GdkWindow *
window, GtkStateType stat
cairo_stroke(cr);
gdk_cairo_set_source_color(cr, c3);
-cairo_move_to(cr, x + width - 1.5, y + 1.5);
+cairo_move_to(cr, x + width - 1.5, y + 2.5);
cairo_line_to(cr, x + width - 1.5, y + height - 0.5);
cairo_stroke(cr);
gdk_cairo_set_source_color(cr, c4);
-cairo_move_to(cr, x + width - 0.5, y + 0.5);
+cairo_move_to(cr, x + width - 0.5, y + 1.5);
cairo_line_to(cr, x + width - 0.5, y + height - 0.5);
cairo_stroke(cr);
@@ -1329,12 +1329,12 @@ static void draw_box_gap(GtkStyle * style, GdkWindow *
window, GtkStateType stat
if (gap_x > 0)
{
gdk_cairo_set_source_color(cr, c4);
-cairo_move_to(cr, x, y + height - 0.5);
+cairo_move_to(cr, x + 1, y + height - 0.5);
cairo_line_to(cr, x + gap_x, y + height - 0.5);
cairo_stroke(cr);
gdk_cairo_set_source_color(cr, c3);
-cairo_move_to(cr, x + 1, y + height - 1.5);
+cairo_move_to(cr, x + 2, y + height - 1.5);
cairo_line_to(cr, x + gap_x, y + height - 1.5);
cairo_move_to(cr, x + gap_x, y + height - 0.5);
@@ -1371,25 +1371,25 @@ static void draw_box_gap(GtkStyle * style, GdkWindow *
window, GtkStateType stat
gdk_cairo_set_source_color(cr, c3);
cairo_move_to(cr, x + 0.5, y + height - 1.5);
cairo_line_to(cr, x + width - 1.5, y + height - 1.5);
-cairo_line_to(cr, x + width - 1.5, y + 1.5);
+cairo_line_to(cr, x + width - 1.5, y + 2.5);
cairo_stroke(cr);
gdk_cairo_set_source_color(cr, c4);
cairo_move_to(cr, x + 1.5, y + height - 0.5);
cairo_line_to(cr, x + width - 0.5, y + height - 0.5);
-cairo_line_to(cr, x + width - 0.5, y + 0.5);
+cairo_line_to(cr, x + width - 0.5, y + 1.5);
cairo_stroke(cr);
cairo_set_line_cap(cr, CAIRO_LINE_CAP_BUTT);
if (gap_x > 0)
{
gdk_cairo_set_source_color(cr, c1);
-cairo_move_to(cr, x + 0.5, y);
+cairo_move_to(cr, x + 0.5, y + 1);
cairo_line_to(cr, x + 0.5, y + gap_x);
cairo_stroke(cr);
gdk_cairo_set_source_color(cr, c2);
-cairo_move_to(cr, x + 1.5, y + 1);
+cairo_move_to(cr, x + 1
[Xfce4-commits] [xfce/gtk-xfce-engine] 07/08: Improved Gtk2 notebook.
This is an automated email from the git hooks/post-receive script.
peter pushed a commit to branch peter/refresh-gtk2
in repository xfce/gtk-xfce-engine.
commit c1c192ded072ebddaa6a139be4be88730ba17ef7
Author: Peter de Ridder
Date: Sun Jan 5 16:16:22 2014 +0100
Improved Gtk2 notebook.
---
src/xfce_theme_draw.c | 18 +-
1 file changed, 9 insertions(+), 9 deletions(-)
diff --git a/src/xfce_theme_draw.c b/src/xfce_theme_draw.c
index 3c5070e..b1eff5b 100644
--- a/src/xfce_theme_draw.c
+++ b/src/xfce_theme_draw.c
@@ -397,6 +397,9 @@ static void draw_shadow(GtkStyle * style, GdkWindow *
window, GtkStateType state
parent = gtk_widget_get_parent(widget);
if (parent)
{
+/* Get the background color from the parent widget.
+ * This makes a nicer corner if the background colors differ.
+ */
pstyle = gtk_widget_get_style(widget);
pbg = &pstyle->bg[gtk_widget_get_state(parent)];
}
@@ -1322,14 +1325,14 @@ static void draw_box_gap(GtkStyle * style, GdkWindow *
window, GtkStateType stat
cairo_stroke(cr);
gdk_cairo_set_source_color(cr, c2);
-cairo_move_to(cr, x + 1.5, y + 1.5);
+cairo_move_to(cr, x + 1.5, y + 0.5);
cairo_line_to(cr, x + 1.5, y + height - 1.5);
cairo_stroke(cr);
gdk_cairo_set_source_color(cr, c3);
cairo_move_to(cr, x + 2.5, y + height - 1.5);
cairo_line_to(cr, x + width - 1.5, y + height - 1.5);
-cairo_line_to(cr, x + width - 0.5, y + 0.5);
+cairo_line_to(cr, x + width - 1.5, y + 0.5);
cairo_stroke(cr);
gdk_cairo_set_source_color(cr, c4);
@@ -1351,10 +1354,9 @@ static void draw_box_gap(GtkStyle * style, GdkWindow *
window, GtkStateType stat
cairo_line_to(cr, x + gap_x, y + 1.5);
cairo_stroke(cr);
-cairo_rectangle(cr, x + gap_x, y + 0.5, 1, 1);
-cairo_move_to(cr, x + gap_x, y);
+cairo_move_to(cr, x + gap_x, y + 0.5);
cairo_line_to(cr, x + gap_x + 1, y + 0.5);
-cairo_fill(cr);
+cairo_stroke(cr);
}
if ((width - (gap_x + gap_width)) > 0)
{
@@ -1554,8 +1556,6 @@ static void draw_extension(GtkStyle * style, GdkWindow *
window, GtkStateType st
CHECK_ARGS;
SANITIZE_SIZE;
-gtk_style_apply_default_background(style, window, widget &&
!GTK_WIDGET_NO_WINDOW(widget), state_type, area, x, y, width, height);
-
if (XFCE_RC_STYLE(style->rc_style)->smooth_edge)
{
c1 = &style->dark[state_type];
@@ -1591,7 +1591,7 @@ static void draw_extension(GtkStyle * style, GdkWindow *
window, GtkStateType st
cairo_stroke(cr);
gdk_cairo_set_source_color(cr, c2);
-cairo_move_to(cr, x + 1.5, y + 1.5);
+cairo_move_to(cr, x + 1.5, y + 0.5);
cairo_line_to(cr, x + 1.5, y + height - 1.5);
cairo_stroke(cr);
@@ -1643,7 +1643,7 @@ static void draw_extension(GtkStyle * style, GdkWindow *
window, GtkStateType st
cairo_stroke(cr);
gdk_cairo_set_source_color(cr, c2);
-cairo_move_to(cr, x + 1.5, y + 1.5);
+cairo_move_to(cr, x + 0.5, y + 1.5);
cairo_line_to(cr, x + width - 1.5, y + 1.5);
cairo_stroke(cr);
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] [xfce/xfwm4] 04/07: Fix keyboard shortcuts vs. layout change
This is an automated email from the git hooks/post-receive script.
olivier pushed a commit to branch master
in repository xfce/xfwm4.
commit ec233f961cdccb31c09eb22a3c50f5bb4c270f52
Author: Olivier Fourdan
Date: Fri Feb 6 22:02:38 2015 +0100
Fix keyboard shortcuts vs. layout change
When changing keyboard layouts, if a shortcut is using a key which is
placed at a different location (e.g. QWERTY vs. AZERTY), it would stop
working with the different layout.
Parse all shortcuts on keymap layout changes to update keys shortcut.
Signed-off-by: Olivier Fourdan
---
src/settings.c | 39 +++
1 file changed, 35 insertions(+), 4 deletions(-)
diff --git a/src/settings.c b/src/settings.c
index 061da7b..502e51b 100644
--- a/src/settings.c
+++ b/src/settings.c
@@ -48,6 +48,9 @@
#define THEMERC "themerc"
#define XPM_COLOR_SYMBOL_SIZE 24
+#define KEYMAP_UPDATE_TIMEOUT 250 /* ms */
+static guint keymap_timeout = 0;
+
/* Forward static decls. */
static void update_grabs (ScreenInfo *);
@@ -1441,18 +1444,46 @@ cb_xfwm4_channel_property_changed(XfconfChannel
*channel, const gchar *property_
}
}
-static void
-cb_keys_changed (GdkKeymap *keymap, ScreenInfo *screen_info)
+
+static gboolean
+keymap_reload (gpointer data)
{
+ScreenInfo *screen_info = (ScreenInfo *) data;
+
+g_return_val_if_fail (screen_info != NULL, FALSE);
+TRACE ("entering keymap_reload");
+
/* Recompute modifiers mask in case it changed */
initModifiers (myScreenGetXDisplay (screen_info));
-/* Ungrab/regrab shortcuts */
+/* Ungrab shortcuts and clear existing bindings */
myScreenUngrabKeys (screen_info);
+unloadKeyBindings (screen_info);
+
+/* Reload new key bindings and regrab shortcuts */
+loadKeyBindings (screen_info);
myScreenGrabKeys (screen_info);
-/* Uupdate all grabs for mouse buttons */
+/* Update all grabs for mouse buttons */
clientUpdateAllFrames (screen_info, UPDATE_BUTTON_GRABS);
+
+/* We're done */
+keymap_timeout = 0;
+
+return FALSE;
+}
+
+static void
+cb_keys_changed (GdkKeymap *keymap, ScreenInfo *screen_info)
+{
+if (keymap_timeout)
+{
+g_source_remove (keymap_timeout);
+}
+keymap_timeout = g_timeout_add_full (G_PRIORITY_DEFAULT,
+ KEYMAP_UPDATE_TIMEOUT,
+ (GSourceFunc) keymap_reload,
+ (gpointer) screen_info, NULL);
}
static void
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] [xfce/xfwm4] 05/07: Use default icon if preview in not available
This is an automated email from the git hooks/post-receive script.
olivier pushed a commit to branch master
in repository xfce/xfwm4.
commit deda565b501533cd57db714441bece3bc17a1aad
Author: Olivier Fourdan
Date: Fri Feb 6 22:12:39 2015 +0100
Use default icon if preview in not available
Signed-off-by: Olivier Fourdan
---
src/icons.c | 55 +++
1 file changed, 27 insertions(+), 28 deletions(-)
diff --git a/src/icons.c b/src/icons.c
index 58b356a..1066f1e 100644
--- a/src/icons.c
+++ b/src/icons.c
@@ -580,8 +580,11 @@ GdkPixbuf *
getClientIcon (Client *c, guint width, guint height)
{
ScreenInfo *screen_info;
+GdkPixbuf *app_content;
+GdkPixbuf *small_icon;
GdkPixbuf *icon_pixbuf;
GdkPixbuf *icon_pixbuf_stated;
+guint small_icon_size;
guint app_icon_width, app_icon_height;
Pixmap pixmap;
@@ -592,45 +595,41 @@ getClientIcon (Client *c, guint width, guint height)
app_icon_width = width; /* Set to 0 to use gdk pixbuf scaling */
app_icon_height = height; /* Set to 0 to use gdk pixbuf scaling */
+icon_pixbuf = gdk_pixbuf_new (GDK_COLORSPACE_RGB, TRUE, 8, width, height);
+gdk_pixbuf_fill (icon_pixbuf, 0x00);
+
pixmap = compositorGetWindowPixmapAtSize (screen_info, c->frame,
&app_icon_width, &app_icon_height);
if (pixmap != None)
{
-GdkPixbuf *app_content;
-GdkPixbuf *small_icon;
-guint small_icon_size;
-
-icon_pixbuf = gdk_pixbuf_new (GDK_COLORSPACE_RGB, TRUE, 8, width,
height);
-gdk_pixbuf_fill (icon_pixbuf, 0x00);
-
app_content = try_pixmap_and_mask (screen_info, pixmap, None, width,
height);
XFreePixmap (myScreenGetXDisplay (screen_info), pixmap);
+}
+else
+{
+app_content = inline_icon_at_size (default_icon_data, width, height);
+}
-app_icon_width = (guint) gdk_pixbuf_get_width (app_content);
-app_icon_height = (guint) gdk_pixbuf_get_height (app_content);
+app_icon_width = (guint) gdk_pixbuf_get_width (app_content);
+app_icon_height = (guint) gdk_pixbuf_get_height (app_content);
-gdk_pixbuf_copy_area (app_content, 0, 0, app_icon_width,
app_icon_height, icon_pixbuf,
- (width - app_icon_width) / 2, (height -
app_icon_height) / 2);
-g_object_unref (app_content);
+gdk_pixbuf_copy_area (app_content, 0, 0, app_icon_width, app_icon_height,
icon_pixbuf,
+ (width - app_icon_width) / 2, (height -
app_icon_height) / 2);
+g_object_unref (app_content);
-small_icon_size = MIN (width / 4, height / 4);
-small_icon_size = MIN (small_icon_size, 48);
+small_icon_size = MIN (width / 4, height / 4);
+small_icon_size = MIN (small_icon_size, 48);
-small_icon = getAppIcon (screen_info, c->window, small_icon_size,
small_icon_size);
+small_icon = getAppIcon (screen_info, c->window, small_icon_size,
small_icon_size);
-gdk_pixbuf_composite (small_icon, icon_pixbuf,
- (width - small_icon_size) / 2, height -
small_icon_size,
- small_icon_size, small_icon_size,
- (width - small_icon_size) / 2, height -
small_icon_size,
- 1.0, 1.0,
- GDK_INTERP_BILINEAR,
- 0xff);
+gdk_pixbuf_composite (small_icon, icon_pixbuf,
+ (width - small_icon_size) / 2, height -
small_icon_size,
+ small_icon_size, small_icon_size,
+ (width - small_icon_size) / 2, height -
small_icon_size,
+ 1.0, 1.0,
+ GDK_INTERP_BILINEAR,
+ 0xff);
-g_object_unref (small_icon);
-}
-else
-{
-icon_pixbuf = getAppIcon (screen_info, c->window, width, height);
-}
+g_object_unref (small_icon);
if (FLAG_TEST (c->flags, CLIENT_FLAG_ICONIFIED))
{
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] [xfce/xfwm4] 07/07: Trivial code reformatting
This is an automated email from the git hooks/post-receive script.
olivier pushed a commit to branch master
in repository xfce/xfwm4.
commit 90bcaf59d5888c9de1700ba4f2dd288042ab1044
Author: Olivier Fourdan
Date: Fri Feb 6 22:16:39 2015 +0100
Trivial code reformatting
Signed-off-by: Olivier Fourdan
---
src/focus.c |2 +-
src/wireframe.c |5 +++--
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/src/focus.c b/src/focus.c
index 11723b9..0a8f333 100644
--- a/src/focus.c
+++ b/src/focus.c
@@ -763,7 +763,7 @@ delayed_focus_cb (gpointer data)
void
clientClearDelayedFocus (void)
{
-if(focus_timeout)
+if (focus_timeout)
{
g_source_remove (focus_timeout);
focus_timeout = 0;
diff --git a/src/wireframe.c b/src/wireframe.c
index e2611f2..bf272f2 100644
--- a/src/wireframe.c
+++ b/src/wireframe.c
@@ -238,8 +238,9 @@ wireframeCreate (Client *c)
{
xvisual = xvisual_info.visual;
depth = xvisual_info.depth;
-wireframe->xcolormap = XCreateColormap (myScreenGetXDisplay
(screen_info), screen_info->xroot,
- xvisual, AllocNone);
+wireframe->xcolormap = XCreateColormap (myScreenGetXDisplay
(screen_info),
+screen_info->xroot,
+xvisual, AllocNone);
}
else
{
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] [xfce/xfwm4] 06/07: Allow for larger preview icons
This is an automated email from the git hooks/post-receive script.
olivier pushed a commit to branch master
in repository xfce/xfwm4.
commit 567db78b407106a3bc81927722ede74b69fae83c
Author: Olivier Fourdan
Date: Fri Feb 6 22:14:13 2015 +0100
Allow for larger preview icons
Signed-off-by: Olivier Fourdan
---
src/tabwin.c |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/tabwin.c b/src/tabwin.c
index 2d20a11..790769f 100644
--- a/src/tabwin.c
+++ b/src/tabwin.c
@@ -644,7 +644,7 @@ tabwin_widget_class_init (TabwinWidgetClass *klass)
g_param_spec_int ("preview-size",
"preview size",
"the size of
the application preview",
-24, 256,
+48, 512,
WIN_PREVIEW_SIZE,
G_PARAM_READABLE));
gtk_widget_class_install_style_property (widget_class,
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] [xfce/xfwm4] 03/07: Fix window pixmaps disappearing on themes reload
This is an automated email from the git hooks/post-receive script.
olivier pushed a commit to branch master
in repository xfce/xfwm4.
commit 618582bf4999dbf0533f8fe14f26273d2acd200a
Author: Olivier Fourdan
Date: Fri Feb 6 22:01:14 2015 +0100
Fix window pixmaps disappearing on themes reload
Signed-off-by: Olivier Fourdan
---
src/compositor.c |5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/src/compositor.c b/src/compositor.c
index 1a953d4..e6819a2 100644
--- a/src/compositor.c
+++ b/src/compositor.c
@@ -739,7 +739,7 @@ free_win_data (CWindow *cw, gboolean delete)
display_info = screen_info->display_info;
#if HAVE_NAME_WINDOW_PIXMAP
-if (cw->saved_window_pixmap)
+if (cw->name_window_pixmap || delete)
{
XFreePixmap (display_info->dpy, cw->saved_window_pixmap);
cw->saved_window_pixmap = None;
@@ -3115,6 +3115,7 @@ compositorScaleWindowPixmap (CWindow *cw, guint *width,
guint *height)
render_format = XRenderFindStandardFormat (dpy, PictStandardARGB32);
destPicture = XRenderCreatePicture (dpy, pixmap, render_format, 0, NULL);
+XRenderSetPictureFilter (dpy, destPicture, FilterBilinear, 0, 0);
XRenderFillRectangle (dpy, PictOpSrc, destPicture, &c, 0, 0, dest_w,
dest_h);
XRenderComposite (dpy, PictOpSrc, srcPicture, None, destPicture,
@@ -3759,7 +3760,7 @@ compositorRebuildScreen (ScreenInfo *screen_info)
GList *list;
g_return_if_fail (screen_info != NULL);
-TRACE ("entering compositorRepairScreen");
+TRACE ("entering compositorRebuildScreen");
display_info = screen_info->display_info;
if (!compositorIsUsable (display_info))
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] [xfce/xfwm4] 01/07: Move window but do not switch workspace
This is an automated email from the git hooks/post-receive script.
olivier pushed a commit to branch master
in repository xfce/xfwm4.
commit 355a32670c9e67e8f27229fbe2a7df8cbd5cf4ab
Author: Olivier Fourdan
Date: Fri Feb 6 21:53:14 2015 +0100
Move window but do not switch workspace
Bug: 11511
Signed-off-by: Olivier Fourdan
---
src/events.c |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/events.c b/src/events.c
index 719ce41..4876742 100644
--- a/src/events.c
+++ b/src/events.c
@@ -411,7 +411,7 @@ handleKeyPress (DisplayInfo *display_info, XKeyEvent * ev)
if ((guint) (key - KEY_MOVE_WORKSPACE_1) <
screen_info->workspace_count)
{
clientRaise (c, None);
-workspaceSwitch (screen_info, key - KEY_MOVE_WORKSPACE_1,
c, TRUE, ev->time);
+clientSetWorkspace (c, key - KEY_MOVE_WORKSPACE_1, TRUE);
}
break;
case KEY_POPUP_MENU:
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] [xfce/xfwm4] 02/07: Fix icons transparency
This is an automated email from the git hooks/post-receive script.
olivier pushed a commit to branch master
in repository xfce/xfwm4.
commit c652f0bc06279e89c7137cd25129a40a6b94f649
Author: Olivier Fourdan
Date: Fri Feb 6 21:55:22 2015 +0100
Fix icons transparency
Bug 11512
Signed-off-by: Olivier Fourdan
---
src/icons.c |5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/src/icons.c b/src/icons.c
index 40ebd41..58b356a 100644
--- a/src/icons.c
+++ b/src/icons.c
@@ -423,9 +423,8 @@ get_pixbuf_from_pixmap (GdkScreen *gscreen, Pixmap xpixmap,
guint src_x, guint s
}
cmap = get_cmap (drawable, gscreen);
-retval = gdk_pixbuf_new (GDK_COLORSPACE_RGB, TRUE, 8, width, height);
-gdk_pixbuf_get_from_drawable (retval, drawable, cmap, src_x, src_y,
- dest_x, dest_y, width, height);
+retval = gdk_pixbuf_get_from_drawable (NULL, drawable, cmap, src_x, src_y,
+ dest_x, dest_y, width, height);
if (G_LIKELY(cmap))
{
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] [xfce/xfwm4] branch master updated (f352f82 -> 90bcaf5)
This is an automated email from the git hooks/post-receive script. olivier pushed a change to branch master in repository xfce/xfwm4. from f352f82 I18n: Update translation fr (100%). new 355a326 Move window but do not switch workspace new c652f0b Fix icons transparency new 618582b Fix window pixmaps disappearing on themes reload new ec233f9 Fix keyboard shortcuts vs. layout change new deda565 Use default icon if preview in not available new 567db78 Allow for larger preview icons new 90bcaf5 Trivial code reformatting The 7 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: src/compositor.c |5 +++-- src/events.c |2 +- src/focus.c |2 +- src/icons.c | 60 ++ src/settings.c | 39 +++ src/tabwin.c |2 +- src/wireframe.c |5 +++-- 7 files changed, 73 insertions(+), 42 deletions(-) -- To stop receiving notification emails like this one, please contact the administrator of this repository. ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] [xfce/gtk-xfce-engine] branch peter/gtk3 updated (955dd15 -> 7474743)
This is an automated email from the git hooks/post-receive script. peter pushed a change to branch peter/gtk3 in repository xfce/gtk-xfce-engine. from 955dd15 Set -xfce-button-default-border (bug #8454) adds e9d9e7b Correctly match gtk-tooltip widgets (bug #8494) adds aa2f6b7 Merge branch 'peter/gtk3' adds ce59bdc Release 2.99.2! adds f624005 Post release tag bump. adds 8e816c5 Link against libm for floor() and ceil() adds 3429190 Reduce GtkComboBox padding (bug #8455) adds 4bc6242 Updates for release. adds c16155f Post release tag bump. adds 8820907 Added px for border sizes adds 0d4b202 Corrected DETAIL names adds dadd9f2 Use the correct colors for options and checks adds b7c22fe More consisten extension rendering adds 4da9c7e Corrected class matching and alignments adds c4324b7 Require Gtk 3.2 adds 1ff854f Tuned default theme for Gtk 3.2 adds 39d67c1 Added Gtk 3.4 support to the engine adds ee948e3 Default themes don't support Gtk+-3.4 adds c48fc41 Release 3.0.0! adds c1c3842 Post release tag bump. adds 964d4a0 Don't leak a graduent pattern at each draw (bug #8521) adds bd46665 Release 3.0.1! adds 52153bb Post release tag bump. adds 7474743 Autotools updates. No new revisions were added by this update. Summary of changes: Makefile.am|8 --- NEWS | 29 README |3 +- configure.in.in => configure.ac.in | 19 +++-- gtk-2.0/Makefile.am|5 +- gtk-2.0/gradient_draw.c|2 + gtk-2.0/xfce_theme_draw.c | 37 ++ gtk-3.0/Makefile.am|2 +- gtk-3.0/xfce_engine.c | 140 gtk-xfce-engine-2.spec.in | 36 -- themes/b5/gtk-3.0/gtk.css | 12 +++- themes/basic/gtk-3.0/gtk.css | 14 +++- themes/cadmium/gtk-3.0/gtk.css | 12 +++- themes/curve/gtk-3.0/gtk.css | 16 +++-- themes/dawn/gtk-3.0/gtk.css| 16 +++-- themes/dusk/gtk-3.0/gtk.css| 16 +++-- themes/kde2/gtk-3.0/gtk.css| 16 +++-- themes/kolors/gtk-3.0/gtk.css | 22 -- themes/light/gtk-3.0/gtk.css | 12 +++- themes/orange/gtk-3.0/gtk.css | 14 +++- themes/redmondxp/gtk-3.0/gtk.css | 22 -- themes/saltlake/gtk-3.0/gtk.css| 12 +++- themes/smooth/gtk-3.0/gtk.css | 12 +++- themes/stellar/gtk-3.0/gtk.css | 10 ++- themes/winter/gtk-3.0/gtk.css | 20 -- themes/xfce-4.0/gtk-3.0/gtk.css| 28 +--- themes/xfce-4.2/gtk-3.0/gtk.css| 16 +++-- themes/xfce-4.4/gtk-3.0/gtk.css| 16 +++-- themes/xfce-4.6/gtk-3.0/gtk.css| 18 +++-- themes/xfce/gtk-3.0/gtk.css| 74 --- 30 files changed, 472 insertions(+), 187 deletions(-) rename configure.in.in => configure.ac.in (92%) delete mode 100644 gtk-xfce-engine-2.spec.in -- To stop receiving notification emails like this one, please contact the administrator of this repository. ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] [xfce/gtk-xfce-engine] 03/10: Correctly match gtk-tooltip widgets (bug #8494)
This is an automated email from the git hooks/post-receive script. peter pushed a commit to branch peter/gtk2 in repository xfce/gtk-xfce-engine. commit d4fb4dd4eb0077dddf07695331388905212ec3b7 Author: Peter de Ridder Date: Sun Mar 25 10:43:58 2012 +0200 Correctly match gtk-tooltip widgets (bug #8494) --- themes/orange/gtk-2.0/gtkrc |2 +- themes/xfce-4.4/gtk-2.0/gtkrc |2 +- themes/xfce-4.6/gtk-2.0/gtkrc |2 +- themes/xfce/gtk-2.0/gtkrc |2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/themes/orange/gtk-2.0/gtkrc b/themes/orange/gtk-2.0/gtkrc index eba6a42..713906f 100644 --- a/themes/orange/gtk-2.0/gtkrc +++ b/themes/orange/gtk-2.0/gtkrc @@ -293,7 +293,7 @@ class "*GtkVScale*"style "scale" widget_class "*.GtkProgress*" style "progress" class "*.GtkProgress*" style "progress" -widget "gtk-tooltips*" style "tooltips" +widget "gtk-tooltip*" style "tooltips" widget_class "*.Collection"style "rox" diff --git a/themes/xfce-4.4/gtk-2.0/gtkrc b/themes/xfce-4.4/gtk-2.0/gtkrc index dc676a0..879c95d 100644 --- a/themes/xfce-4.4/gtk-2.0/gtkrc +++ b/themes/xfce-4.4/gtk-2.0/gtkrc @@ -339,7 +339,7 @@ class "*GtkVScale*"style "scale" widget_class "*GtkProgress*" style "progress" class "*GtkProgress*" style "progress" -widget "gtk-tooltips*" style "tooltips" +widget "gtk-tooltip*" style "tooltips" widget_class "*.Collection"style "rox" diff --git a/themes/xfce-4.6/gtk-2.0/gtkrc b/themes/xfce-4.6/gtk-2.0/gtkrc index fe39654..9f7d131 100644 --- a/themes/xfce-4.6/gtk-2.0/gtkrc +++ b/themes/xfce-4.6/gtk-2.0/gtkrc @@ -388,7 +388,7 @@ class "*GtkVScale*"style "scale" widget_class "*GtkProgress*" style "progress" class "*GtkProgress*" style "progress" -widget "gtk-tooltips*" style "tooltips" +widget "gtk-tooltip*" style "tooltips" widget_class "*.Collection"style "rox" diff --git a/themes/xfce/gtk-2.0/gtkrc b/themes/xfce/gtk-2.0/gtkrc index e533aab..b2a33e0 100644 --- a/themes/xfce/gtk-2.0/gtkrc +++ b/themes/xfce/gtk-2.0/gtkrc @@ -388,7 +388,7 @@ class "*GtkVScale*"style "scale" widget_class "*GtkProgress*" style "progress" class "*GtkProgress*" style "progress" -widget "gtk-tooltips*" style "tooltips" +widget "gtk-tooltip*" style "tooltips" widget_class "*.Collection"style "rox" -- To stop receiving notification emails like this one, please contact the administrator of this repository. ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] [xfce/gtk-xfce-engine] 02/10: Correctly draw spin button without state-hint set
This is an automated email from the git hooks/post-receive script.
peter pushed a commit to branch peter/gtk2
in repository xfce/gtk-xfce-engine.
commit a49861be9fc3f4ca2a7e89cd9ae35b2eeaaaf2b0
Author: Peter de Ridder
Date: Wed Feb 8 20:25:53 2012 +0100
Correctly draw spin button without state-hint set
---
src/xfce_theme_draw.c |3 +++
1 file changed, 3 insertions(+)
diff --git a/src/xfce_theme_draw.c b/src/xfce_theme_draw.c
index 56375c1..8ffc61b 100644
--- a/src/xfce_theme_draw.c
+++ b/src/xfce_theme_draw.c
@@ -168,6 +168,9 @@ static void xfce_fill_background(GtkStyle * style,
GdkWindow * window, GtkStateT
if (DETAIL("spinbutton"))
{
draw_base = TRUE;
+/* The entry sets the background to the base state color
+ * This function is called with the state conditionally set
according to state-hint */
+state_type = gtk_widget_get_state(widget);
}
else if (DETAIL("spinbutton_up") || DETAIL("spinbutton_down"))
{
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] [xfce/gtk-xfce-engine] 05/10: Link against libm for floor() and ceil()
This is an automated email from the git hooks/post-receive script. peter pushed a commit to branch peter/gtk2 in repository xfce/gtk-xfce-engine. commit 5d8c972547d93ff8f1fb48a813a2c282bf4827db Author: Lionel Le Folgoc Date: Sun Apr 8 17:45:18 2012 +0200 Link against libm for floor() and ceil() --- configure.in.in |3 +++ src/Makefile.am |3 ++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/configure.in.in b/configure.in.in index e73d192..158c166 100644 --- a/configure.in.in +++ b/configure.in.in @@ -57,6 +57,9 @@ dnl *** XDT_CHECK_PACKAGE([GTK], [gtk+-2.0], [2.20.0]) XDT_CHECK_PACKAGE([GLIB], [glib-2.0], [2.24.0]) XDT_CHECK_PACKAGE([GMODULE], [gmodule-2.0], [2.24.0]) +dnl libm is needed for floor() and ceil() +AC_CHECK_LIBM +AC_SUBST(LIBM) GTK_BINARY_VERSION=`$PKG_CONFIG --variable=gtk_binary_version gtk+-2.0` AC_SUBST([GTK_BINARY_VERSION]) diff --git a/src/Makefile.am b/src/Makefile.am index d81392e..095afa9 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -30,7 +30,8 @@ libxfce_la_CFLAGS = \ libxfce_la_LIBADD = \ $(GTK_LIBS) \ $(GLIB_LIBS) \ - $(GMODULE_LIBS) + $(GMODULE_LIBS) \ + $(LIBM) libxfce_la_LDFLAGS = \ -module \ -- To stop receiving notification emails like this one, please contact the administrator of this repository. ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] [xfce/gtk-xfce-engine] 07/10: Use the correct colors for options and checks
This is an automated email from the git hooks/post-receive script.
peter pushed a commit to branch peter/gtk2
in repository xfce/gtk-xfce-engine.
commit 18629cb020f1ddfb8a322c5256efc0ca1ab0f290
Author: Peter de Ridder
Date: Thu Apr 26 21:08:01 2012 +0200
Use the correct colors for options and checks
---
src/xfce_theme_draw.c | 25 ++---
1 file changed, 18 insertions(+), 7 deletions(-)
diff --git a/src/xfce_theme_draw.c b/src/xfce_theme_draw.c
index 107764d..89f8d90 100644
--- a/src/xfce_theme_draw.c
+++ b/src/xfce_theme_draw.c
@@ -987,6 +987,7 @@ static void draw_check(GtkStyle * style, GdkWindow *
window, GtkStateType state,
cairo_t *cr;
guint size;
guint w, b;
+GdkColor * c;
CHECK_ARGS;
SANITIZE_SIZE;
@@ -1023,13 +1024,18 @@ static void draw_check(GtkStyle * style, GdkWindow *
window, GtkStateType state,
cairo_set_antialias (cr, CAIRO_ANTIALIAS_NONE);
-cairo_rectangle (cr, x + 0.5, y + 0.5, width - 1, height - 1);
+cairo_rectangle (cr, x + 0.5, y + 0.5, size - 1, size - 1);
if (!DETAIL("check"))/* not Menu item */
{
/* Draw the background */
gdk_cairo_set_source_color(cr, &style->base[state]);
cairo_fill_preserve(cr);
+c = &style->text[state];
+}
+else
+{
+c = &style->fg[state];
}
/* Draw the border */
@@ -1046,7 +1052,7 @@ static void draw_check(GtkStyle * style, GdkWindow *
window, GtkStateType state,
w = ((size + 4 - b) / 6);
/* Draw the check */
-gdk_cairo_set_source_color(cr, &style->fg[state]);
+gdk_cairo_set_source_color(cr, c);
cairo_move_to (cr, x + b, y + floor(size / 2 - 1.5));
@@ -1066,8 +1072,7 @@ static void draw_check(GtkStyle * style, GdkWindow *
window, GtkStateType state,
}
else if (shadow == GTK_SHADOW_ETCHED_IN)
{
-gdk_cairo_set_source_color(cr, &style->fg[state]);
-draw_dash(cr, &style->fg[state], x, y, size);
+draw_dash(cr, c, x, y, size);
}
cairo_destroy(cr);
@@ -1077,6 +1082,7 @@ static void draw_option(GtkStyle * style, GdkWindow *
window, GtkStateType state
{
cairo_t *cr;
guint size;
+GdkColor * c;
CHECK_ARGS;
SANITIZE_SIZE;
@@ -1113,13 +1119,18 @@ static void draw_option(GtkStyle * style, GdkWindow *
window, GtkStateType state
cairo_set_antialias (cr, CAIRO_ANTIALIAS_NONE);
-cairo_arc (cr, x + (width / 2.0), y + (height / 2.0), width / 2, 0, 2 *
M_PI);
+cairo_arc (cr, x + (size / 2.0), y + (size / 2.0), (size - 1) / 2.0, 0, 2
* M_PI);
if (!DETAIL("option")) /* not Menu item */
{
/* Draw the background */
gdk_cairo_set_source_color(cr, &style->base[state]);
cairo_fill_preserve(cr);
+c = &style->text[state];
+}
+else
+{
+c = &style->fg[state];
}
/* Draw the border */
@@ -1133,14 +1144,14 @@ static void draw_option(GtkStyle * style, GdkWindow *
window, GtkStateType state
if (shadow == GTK_SHADOW_IN)
{
/* Draw the dot */
-gdk_cairo_set_source_color(cr, &style->fg[state]);
+gdk_cairo_set_source_color(cr, c);
cairo_arc (cr, x + (size / 2.0), y + (size / 2.0), (size / 2.0) -
((size + 2) / 5), 0, 2 * M_PI);
cairo_fill(cr);
}
else if (shadow == GTK_SHADOW_ETCHED_IN)
{
-draw_dash(cr, &style->fg[state], x, y, size);
+draw_dash(cr, c, x, y, size);
}
cairo_destroy(cr);
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] [xfce/gtk-xfce-engine] 08/10: More consisten extension rendering
This is an automated email from the git hooks/post-receive script.
peter pushed a commit to branch peter/gtk2
in repository xfce/gtk-xfce-engine.
commit e87463265241d35bf4792ae8f8e772546658c418
Author: Peter de Ridder
Date: Thu Apr 26 21:16:01 2012 +0200
More consisten extension rendering
---
src/xfce_theme_draw.c |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/xfce_theme_draw.c b/src/xfce_theme_draw.c
index 89f8d90..6181356 100644
--- a/src/xfce_theme_draw.c
+++ b/src/xfce_theme_draw.c
@@ -1479,7 +1479,7 @@ static void draw_extension(GtkStyle * style, GdkWindow *
window, GtkStateType st
CHECK_ARGS;
SANITIZE_SIZE;
-gtk_style_apply_default_background(style, window, widget &&
!GTK_WIDGET_NO_WINDOW(widget), GTK_STATE_NORMAL, area, x, y, width, height);
+gtk_style_apply_default_background(style, window, widget &&
!GTK_WIDGET_NO_WINDOW(widget), state_type, area, x, y, width, height);
if (XFCE_RC_STYLE(style->rc_style)->smooth_edge)
{
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] [xfce/gtk-xfce-engine] 04/10: Use size for the radio and check boxes (bug #8456)
This is an automated email from the git hooks/post-receive script.
peter pushed a commit to branch peter/gtk2
in repository xfce/gtk-xfce-engine.
commit 8c590f4937b6996ba2b0346aeb92a8f93ea1bedc
Author: Peter de Ridder
Date: Sun Mar 25 14:12:51 2012 +0200
Use size for the radio and check boxes (bug #8456)
---
src/xfce_theme_draw.c | 290 ++---
1 file changed, 152 insertions(+), 138 deletions(-)
diff --git a/src/xfce_theme_draw.c b/src/xfce_theme_draw.c
index 8ffc61b..bef4648 100644
--- a/src/xfce_theme_draw.c
+++ b/src/xfce_theme_draw.c
@@ -59,83 +59,8 @@ static GtkStyleClass *parent_class = NULL;
extern GtkStyleClass xfce_default_class;
-/* Taken from raleigh theme engine */
-typedef enum
-{
-CHECK_LIGHT,
-CHECK_DARK,
-CHECK_BASE,
-CHECK_TEXT,
-CHECK_CROSS,
-CHECK_DASH,
-RADIO_LIGHT,
-RADIO_DARK,
-RADIO_BASE,
-RADIO_TEXT
-}
-Part;
-
-#define PART_SIZE 13
-
-static const guint32 check_light_bits[] = {
-0x, 0x, 0x0800, 0x0800, 0x0800, 0x0800, 0x0800, 0x0800, 0x0800,
-0x0800, 0x0800, 0x0ffc, 0x,
-};
-static const guint32 check_dark_bits[] = {
-0x, 0x0ffe, 0x0002, 0x0002, 0x0002, 0x0002, 0x0002, 0x0002, 0x0002,
-0x0002, 0x0002, 0x0002, 0x,
-};
-static const guint32 check_base_bits[] = {
-0x, 0x, 0x07fc, 0x07fc, 0x07fc, 0x07fc, 0x07fc, 0x07fc, 0x07fc,
-0x07fc, 0x07fc, 0x, 0x,
-};
-static const guint32 check_text_bits[] = {
-0x, 0x, 0x1c00, 0x0f00, 0x0380, 0x01c0, 0x00e0, 0x0073, 0x003f,
-0x003e, 0x001c, 0x0018, 0x0008
-};
-static const guint32 check_cross_bits[] = {
-0x, 0x, 0x, 0x0300, 0x0380, 0x01d8, 0x00f8, 0x0078, 0x0038,
-0x0018, 0x, 0x, 0x,
-};
-static const guint32 check_dash_bits[] = {
-0x, 0x, 0x, 0x, 0x, 0x03f8, 0x03f8, 0x03f8, 0x,
-0x, 0x, 0x, 0x,
-};
-static const guint32 radio_light_bits[] = {
-0x, 0x, 0x, 0x0400, 0x0800, 0x0800, 0x0800, 0x0800, 0x0800,
-0x0400, 0x0208, 0x01f0, 0x,
-};
-static const guint32 radio_dark_bits[] = {
-0x, 0x01f0, 0x0208, 0x0004, 0x0002, 0x0002, 0x0002, 0x0002, 0x0002,
-0x0004, 0x, 0x, 0x,
-};
-static const guint32 radio_base_bits[] = {
-0x, 0x, 0x01f0, 0x03f8, 0x07fc, 0x07fc, 0x07fc, 0x07fc, 0x07fc,
-0x03f8, 0x01f0, 0x, 0x,
-};
-static const guint32 radio_text_bits[] = {
-0x, 0x, 0x, 0x, 0x00e0, 0x01f0, 0x01f0, 0x01f0, 0x00e0,
-0x, 0x, 0x, 0x,
-};
-
-static struct
-{
-const guint32 *bits;
-cairo_surface_t *bmap;
-}
-parts[] =
-{
-{ check_light_bits, NULL },
-{ check_dark_bits, NULL },
-{ check_base_bits, NULL },
-{ check_text_bits, NULL },
-{ check_cross_bits, NULL },
-{ check_dash_bits, NULL },
-{ radio_light_bits, NULL },
-{ radio_dark_bits, NULL },
-{ radio_base_bits, NULL },
-{ radio_text_bits, NULL }
-};
+#define CHECK_MIN_SIZE 15
+#define CHECK_DRAW_SIZE 11
/* internal functions */
static void xfce_fill_background(GtkStyle * style, GdkWindow * window,
GtkStateType state_type, GdkRectangle * area, GtkWidget * widget, const gchar *
detail, gint x, gint y, gint width, gint height);
@@ -1034,102 +959,191 @@ static void draw_box(GtkStyle * style, GdkWindow *
window, GtkStateType state_ty
draw_shadow(style, window, state_type, shadow_type, area, widget, detail,
x, y, width, height);
}
-static cairo_surface_t *get_part_bmap (Part part)
+static void draw_dash(cairo_t * cr, const GdkColor * c, gdouble x, gdouble y,
guint size)
{
-if (!parts[part].bmap)
-{
-parts[part].bmap =
cairo_image_surface_create_for_data((guchar*)parts[part].bits, CAIRO_FORMAT_A1,
PART_SIZE, PART_SIZE, sizeof(guint32));
-}
-return parts[part].bmap;
-}
+guint w, b;
-static void draw_part(GdkDrawable * drawable, GdkColor * c, GdkRectangle *
area, gint x, gint y, Part part)
-{
-cairo_t *cr;
+b = (size + 7) / 10;
-cr = ge_gdk_drawable_to_cairo(drawable, area);
+w = size / 4;
+if ((w % 2) != (size % 2))
+{
+w += 1;
+}
gdk_cairo_set_source_color(cr, c);
-cairo_mask_surface(cr, get_part_bmap (part), x, y);
+cairo_set_line_width (cr, w);
+cairo_set_line_cap(cr, CAIRO_LINE_CAP_BUTT);
-cairo_destroy(cr);
+cairo_move_to (cr, x + b, y + size / 2.0);
+cairo_line_to (cr, x + size - b, y + size / 2.0);
+
+cairo_stroke(cr);
}
static void draw_check(GtkStyle * style, GdkWindow * window, GtkStateType
state, GtkShadowType shadow, GdkRectangle * area, GtkWidget * widget, const
gchar * detail, gint x, gint y, gint width, gint height)
{
+cairo_t *cr;
+guint size;
+guint w, b;
+
CHECK_ARGS;
SANITIZE_SIZE;
-x -= (1 + PART_SIZE - width) / 2;
-y -= (1 + PART_SIZE - height) / 2;
-
-if (DETAIL("check"))/* Menu item */
+/* Make sure it
[Xfce4-commits] [xfce/gtk-xfce-engine] 09/10: Don't leak a graduent pattern at each draw (bug #8521)
This is an automated email from the git hooks/post-receive script. peter pushed a commit to branch peter/gtk2 in repository xfce/gtk-xfce-engine. commit 5554fa303912c0d13c01bf4fe21e37990cce9bb4 Author: Landry Breuil Date: Wed Aug 22 09:34:45 2012 +0200 Don't leak a graduent pattern at each draw (bug #8521) --- src/gradient_draw.c |2 ++ 1 file changed, 2 insertions(+) diff --git a/src/gradient_draw.c b/src/gradient_draw.c index 02deb88..37af559 100644 --- a/src/gradient_draw.c +++ b/src/gradient_draw.c @@ -278,4 +278,6 @@ void gradient_draw_shaded(cairo_t *cr, gint x, gint y, gint width, gint height, cairo_fill (cr); cairo_restore(cr); + +cairo_pattern_destroy(gradient); } -- To stop receiving notification emails like this one, please contact the administrator of this repository. ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] [xfce/gtk-xfce-engine] 10/10: Autotools updates.
This is an automated email from the git hooks/post-receive script. peter pushed a commit to branch peter/gtk2 in repository xfce/gtk-xfce-engine. commit 0dc6b5c0924f354a5e02dd2ed68ce7881f63feb7 Author: Nick Schermer Date: Sun Jan 6 12:19:05 2013 +0100 Autotools updates. --- configure.in.in => configure.ac.in |4 ++-- src/Makefile.am|2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/configure.in.in b/configure.ac.in similarity index 98% rename from configure.in.in rename to configure.ac.in index 158c166..665ad43 100644 --- a/configure.in.in +++ b/configure.ac.in @@ -29,8 +29,8 @@ AC_REVISION([gtk_xfce_engine_version_build]) dnl *** dnl *** Initialize automake *** dnl *** -AM_CONFIG_HEADER([config.h]) -AM_INIT_AUTOMAKE([1.8 no-dist-gzip dist-bzip2 tar-ustar]) +AC_CONFIG_HEADERS([config.h]) +AM_INIT_AUTOMAKE([1.8 dist-bzip2 tar-ustar no-dist-gzip]) AM_MAINTAINER_MODE() m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) diff --git a/src/Makefile.am b/src/Makefile.am index 095afa9..85c2651 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,5 +1,5 @@ -INCLUDES = \ +AM_CPPFLAGS = \ -I$(top_srcdir) \ -DG_LOG_DOMAIN=\"gtk-xfce-engine\" \ $(PLATFORM_CPPFLAGS) -- To stop receiving notification emails like this one, please contact the administrator of this repository. ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] [xfce/gtk-xfce-engine] 01/10: Render the spin buttons inside the entry part
This is an automated email from the git hooks/post-receive script.
peter pushed a commit to branch peter/gtk2
in repository xfce/gtk-xfce-engine.
commit 9b0c7bb79a20ef2804d753712191f959720b45a7
Author: Peter de Ridder
Date: Mon Feb 6 21:58:48 2012 +0100
Render the spin buttons inside the entry part
Extended the entry part of the spin button and moved the spinner buttons
inside. This gives more consistency with Gtk.
---
src/xfce_theme_draw.c | 62 +
1 file changed, 26 insertions(+), 36 deletions(-)
diff --git a/src/xfce_theme_draw.c b/src/xfce_theme_draw.c
index e41dd33..56375c1 100644
--- a/src/xfce_theme_draw.c
+++ b/src/xfce_theme_draw.c
@@ -158,24 +158,28 @@ static void xfce_fill_background(GtkStyle * style,
GdkWindow * window, GtkStateT
{
GradientType gradient_style = GRADIENT_VERTICAL;
gfloat shade_start = 1.0, shade_end = 1.0;
-gboolean draw_flat = FALSE;
+gboolean draw_base = FALSE;
cairo_t *cr;
/* Spin buttons are a special case */
if (widget && GTK_IS_SPIN_BUTTON (widget))
{
-if (DETAIL("spinbutton_up") || DETAIL("spinbutton_down"))
+/* The entry part needs to be completed on the background */
+if (DETAIL("spinbutton"))
{
+draw_base = TRUE;
+}
+else if (DETAIL("spinbutton_up") || DETAIL("spinbutton_down"))
+{
+/* Only draw the spinner buttons if you interact with them */
if ((state_type != GTK_STATE_PRELIGHT) && (state_type !=
GTK_STATE_ACTIVE))
-{
-draw_flat = TRUE;
-}
+return;
}
}
cr = ge_gdk_drawable_to_cairo(window, area);
-if ((!draw_flat) && (XFCE_RC_STYLE(style->rc_style)->gradient))
+if ((!draw_base) && (XFCE_RC_STYLE(style->rc_style)->gradient))
{
switch (XFCE_RC_STYLE(style->rc_style)->gradient_style)
{
@@ -226,7 +230,7 @@ static void xfce_fill_background(GtkStyle * style,
GdkWindow * window, GtkStateT
}
else
{
-gdk_cairo_set_source_color(cr, &style->bg[state_type]);
+gdk_cairo_set_source_color(cr, draw_base ? &style->base[state_type] :
&style->bg[state_type]);
cairo_rectangle(cr, x, y, width, height);
cairo_fill(cr);
}
@@ -457,17 +461,27 @@ static void draw_shadow(GtkStyle * style, GdkWindow *
window, GtkStateType state
/* Spin buttons are a special case */
if (widget && GTK_IS_SPIN_BUTTON (widget))
{
-/* GtkEntry doesn't provide the text area as frame size */
-if (DETAIL("entry"))
+/* The button part of the spin button is a separate window which isn't
drawn correctly */
+if (DETAIL("spinbutton"))
{
gint line_width = 0;
gboolean interior_focus;
-gdk_drawable_get_size (GTK_ENTRY(widget)->text_area, &width, NULL);
-if (!gtk_widget_has_focus(widget))
+if (gtk_widget_has_focus(widget))
gtk_widget_style_get(widget, "focus-line-width", &line_width,
"interior-focus", &interior_focus, NULL);
if (interior_focus)
line_width = 0;
-width += (style->xthickness + line_width) * 2;
+
+if (gtk_widget_get_direction(widget) != GTK_TEXT_DIR_RTL)
+{
+x -= widget->allocation.width - width;
+}
+width = widget->allocation.width;
+if (line_width)
+gtk_paint_focus(style, window, state_type, area, widget,
detail, x, y, width, height);
+x += line_width;
+width -= 2 * line_width;
+y += line_width;
+height -= 2 * line_width;
}
}
@@ -1575,29 +1589,6 @@ static void draw_extension(GtkStyle * style, GdkWindow *
window, GtkStateType st
cairo_destroy(cr);
}
-static void draw_focus(GtkStyle * style, GdkWindow * window, GtkStateType
state_type, GdkRectangle * area, GtkWidget * widget, const gchar * detail, gint
x, gint y, gint width, gint height)
-{
-CHECK_ARGS;
-
-/* Spin buttons are a special case */
-if (widget && GTK_IS_SPIN_BUTTON (widget))
-{
-/* GtkEntry doesn't provide the text area as focus size */
-if (DETAIL("entry"))
-{
-gint line_width = 0;
-gboolean interior_focus;
-gdk_drawable_get_size (GTK_ENTRY(widget)->text_area, &width, NULL);
-gtk_widget_style_get (widget, "focus-line-width", &line_width,
"interior-focus", &interior_focus, NULL);
-if (interior_focus)
-line_width = 0;
-width += (style->xthickness + line_width) * 2;
-}
-}
-
-parent_class->draw_focus(style, window, state_type, area, widget, detail,
x, y, width, height);
-}
-
static void draw_slider(GtkStyle * style, GdkWindow * window, GtkStateType
state_type, GtkShadowType shadow_type, GdkRectang
[Xfce4-commits] [xfce/gtk-xfce-engine] branch peter/gtk2 created (now 0dc6b5c)
This is an automated email from the git hooks/post-receive script. peter pushed a change to branch peter/gtk2 in repository xfce/gtk-xfce-engine. at 0dc6b5c Autotools updates. This branch includes the following new commits: new 9b0c7bb Render the spin buttons inside the entry part new a49861b Correctly draw spin button without state-hint set new d4fb4dd Correctly match gtk-tooltip widgets (bug #8494) new 8c590f4 Use size for the radio and check boxes (bug #8456) new 5d8c972 Link against libm for floor() and ceil() new d68e5e6 Corrected DETAIL names new 18629cb Use the correct colors for options and checks new e874632 More consisten extension rendering new 5554fa3 Don't leak a graduent pattern at each draw (bug #8521) new 0dc6b5c Autotools updates. The 10 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. -- To stop receiving notification emails like this one, please contact the administrator of this repository. ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] [xfce/gtk-xfce-engine] 06/10: Corrected DETAIL names
This is an automated email from the git hooks/post-receive script.
peter pushed a commit to branch peter/gtk2
in repository xfce/gtk-xfce-engine.
commit d68e5e6e5bc7fe771b75e3cc42ff3aee4b5495a3
Author: Peter de Ridder
Date: Thu Apr 26 21:03:54 2012 +0200
Corrected DETAIL names
---
src/xfce_theme_draw.c | 10 +-
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/xfce_theme_draw.c b/src/xfce_theme_draw.c
index bef4648..107764d 100644
--- a/src/xfce_theme_draw.c
+++ b/src/xfce_theme_draw.c
@@ -15,7 +15,7 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*
* Copyright (C) 1999-2004 Olivier Fourdan (four...@xfce.org)
- * Copyright (C) 2011 Peter de Ridder (pe...@xfce.org)
+ * Copyright (C) 2011-2012 Peter de Ridder (pe...@xfce.org)
*
* Portions based Thinice port by
* Tim Gerla ,
@@ -663,7 +663,7 @@ static void draw_shadow(GtkStyle * style, GdkWindow *
window, GtkStateType state
cairo_stroke(cr);
}
}
-else if (DETAIL ("dockitem_bin") || DETAIL ("dockitem") ||
DETAIL ("toolbar"))
+else if (DETAIL ("handlebox_bin") || DETAIL ("handlebox") ||
DETAIL ("toolbar"))
{
if ((xt > 1) && (yt > 1))
{
@@ -695,7 +695,7 @@ static void draw_shadow(GtkStyle * style, GdkWindow *
window, GtkStateType state
cairo_stroke(cr);
}
}
-else if (DETAIL("vscrollbar") || DETAIL("hscrollbar") ||
DETAIL("bar") || DETAIL("slider") || DETAIL("vscale") || DETAIL("hscale"))
+else if (DETAIL("vscrollbar") || DETAIL("hscrollbar") ||
DETAIL("slider") || DETAIL("vscale") || DETAIL("hscale"))
{
if ((xt > 1) && (yt > 1))
{
@@ -736,7 +736,7 @@ static void draw_shadow(GtkStyle * style, GdkWindow *
window, GtkStateType state
cairo_stroke(cr);
}
}
-else if (DETAIL("menubar") || DETAIL("frame") ||
DETAIL("dockitem") || DETAIL("dockitem_bin") || DETAIL("menu") ||
DETAIL("toolbar"))
+else if (DETAIL("frame"))
{
if ((xt > 1) && (yt > 1))
{
@@ -864,7 +864,7 @@ static void draw_shadow(GtkStyle * style, GdkWindow *
window, GtkStateType state
cairo_stroke(cr);
}
}
-else if (DETAIL ("dockitem_bin") || DETAIL ("dockitem") ||
DETAIL ("toolbar"))
+else if (DETAIL ("handlebox_bin") || DETAIL ("handlebox") ||
DETAIL ("toolbar"))
{
if ((xt > 1) && (yt > 1))
{
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] [panel-plugins/xfce4-verve-plugin] 01/01: I18n: Update translation it (100%).
This is an automated email from the git hooks/post-receive script. transifex pushed a commit to branch master in repository panel-plugins/xfce4-verve-plugin. commit 4255f79dc975e9c8371f2d2667d5deaa8101b780 Author: Cristian Marchi Date: Fri Feb 6 18:31:49 2015 +0100 I18n: Update translation it (100%). 15 translated messages. Transifex (https://www.transifex.com/projects/p/xfce/). --- po/it.po | 40 +++- 1 file changed, 31 insertions(+), 9 deletions(-) diff --git a/po/it.po b/po/it.po index d580af2..cb88c5b 100644 --- a/po/it.po +++ b/po/it.po @@ -10,8 +10,8 @@ msgid "" msgstr "" "Project-Id-Version: Xfce Panel Plugins\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-01-29 06:31+0100\n" -"PO-Revision-Date: 2015-01-31 12:02+\n" +"POT-Creation-Date: 2015-02-01 00:31+0100\n" +"PO-Revision-Date: 2015-02-06 13:32+\n" "Last-Translator: Cristian Marchi \n" "Language-Team: Italian (http://www.transifex.com/projects/p/xfce-panel-plugins/language/it/)\n" "MIME-Version: 1.0\n" @@ -21,40 +21,62 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n != 1);\n" #. Generate error message -#: ../panel-plugin/verve-plugin.c:408 +#: ../panel-plugin/verve-plugin.c:412 msgid "Could not execute command:" msgstr "Impossibile eseguire il comando:" #. Create properties dialog -#: ../panel-plugin/verve-plugin.c:845 +#: ../panel-plugin/verve-plugin.c:1043 msgid "Verve" msgstr "Verve" #. Frame for appearance settings -#: ../panel-plugin/verve-plugin.c:863 +#: ../panel-plugin/verve-plugin.c:1061 msgid "Appearance" msgstr "Aspetto" #. Plugin size label -#: ../panel-plugin/verve-plugin.c:879 +#: ../panel-plugin/verve-plugin.c:1077 msgid "Width (in chars):" msgstr "Larghezza (numero di caratteri):" #. Plugin label label -#: ../panel-plugin/verve-plugin.c:904 +#: ../panel-plugin/verve-plugin.c:1102 msgid "Label:" msgstr "Etichetta:" #. Frame for behaviour settings -#: ../panel-plugin/verve-plugin.c:921 +#: ../panel-plugin/verve-plugin.c:1119 msgid "Behaviour" msgstr "Comportamento" #. History length label -#: ../panel-plugin/verve-plugin.c:932 +#: ../panel-plugin/verve-plugin.c:1130 msgid "Number of saved history items:" msgstr "Numero di elementi della cronologia salvati:" +#. Frame for DuckDuckGo settings +#: ../panel-plugin/verve-plugin.c:1150 +msgid "DuckDuckGo" +msgstr "DuckDuckGo" + +#. DuckDuckGo redirect options label +#: ../panel-plugin/verve-plugin.c:1161 +msgid "Search DuckDuckGo if command starts with:" +msgstr "Cerca con DuckDuckGo se il comando inizia con:" + +#. Frame for smart bookmark settings +#: ../panel-plugin/verve-plugin.c:1193 +msgid "Smart Bookmark" +msgstr "Segnalibri intelligenti" + +#. smartbookmark check box +#: ../panel-plugin/verve-plugin.c:1204 +msgid "" +"Instead of launching commands,\n" +"use this smart bookmark URL:" +msgstr "Invece di avviare i comandi,\nusa questo URL del segnalibro intelligente:" + #. vim:set expandtab sts=2 ts=2 sw=2: #: ../panel-plugin/xfce4-verve-plugin.desktop.in.h:1 msgid "Verve Command Line" -- To stop receiving notification emails like this one, please contact the administrator of this repository. ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] [panel-plugins/xfce4-verve-plugin] branch master updated (0f058b8 -> 4255f79)
This is an automated email from the git hooks/post-receive script. transifex pushed a change to branch master in repository panel-plugins/xfce4-verve-plugin. from 0f058b8 pass a format string to silence a -Werror=format-security warning (#11505) new 4255f79 I18n: Update translation it (100%). The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: po/it.po | 40 +++- 1 file changed, 31 insertions(+), 9 deletions(-) -- To stop receiving notification emails like this one, please contact the administrator of this repository. ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] [xfce/xfce4-settings] 02/05: I18n: Update translation fr (100%).
This is an automated email from the git hooks/post-receive script. transifex pushed a commit to branch master in repository xfce/xfce4-settings. commit 2d0c3b20176ac11ebf382369af8235e447359346 Author: Yannick Le Guen Date: Fri Feb 6 18:30:46 2015 +0100 I18n: Update translation fr (100%). 354 translated messages. Transifex (https://www.transifex.com/projects/p/xfce/). --- po/fr.po | 207 +- 1 file changed, 110 insertions(+), 97 deletions(-) diff --git a/po/fr.po b/po/fr.po index 406a582..1ea9919 100644 --- a/po/fr.po +++ b/po/fr.po @@ -10,13 +10,13 @@ # Maximilian Schleiss , 2008 # Mike Massonnet , 2009 # Urien Desterres , 2014 -# Yannick Le Guen , 2014 +# Yannick Le Guen , 2014-2015 msgid "" msgstr "" "Project-Id-Version: Xfce4-settings\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-07-10 06:30+0200\n" -"PO-Revision-Date: 2014-07-12 21:11+\n" +"POT-Creation-Date: 2015-02-06 06:30+0100\n" +"PO-Revision-Date: 2015-02-06 12:04+\n" "Last-Translator: Yannick Le Guen \n" "Language-Team: French (http://www.transifex.com/projects/p/xfce4-settings/language/fr/)\n" "MIME-Version: 1.0\n" @@ -214,14 +214,14 @@ msgstr "_Souris" #: ../dialogs/accessibility-settings/main.c:43 #: ../dialogs/appearance-settings/main.c:95 #: ../dialogs/display-settings/main.c:120 -#: ../dialogs/keyboard-settings/main.c:39 ../dialogs/mouse-settings/main.c:79 +#: ../dialogs/keyboard-settings/main.c:39 ../dialogs/mouse-settings/main.c:83 msgid "Settings manager socket" msgstr "Socket du gestionnaire de paramètres" #: ../dialogs/accessibility-settings/main.c:43 #: ../dialogs/appearance-settings/main.c:95 #: ../dialogs/display-settings/main.c:120 -#: ../dialogs/keyboard-settings/main.c:39 ../dialogs/mouse-settings/main.c:79 +#: ../dialogs/keyboard-settings/main.c:39 ../dialogs/mouse-settings/main.c:83 msgid "SOCKET ID" msgstr "ID SOCKET" @@ -229,36 +229,37 @@ msgstr "ID SOCKET" #: ../dialogs/appearance-settings/main.c:96 #: ../dialogs/display-settings/main.c:121 #: ../dialogs/keyboard-settings/main.c:40 ../dialogs/mime-settings/main.c:40 -#: ../dialogs/mouse-settings/main.c:80 ../xfce4-settings-editor/main.c:43 -#: ../xfsettingsd/main.c:77 ../xfce4-settings-manager/main.c:40 +#: ../dialogs/mouse-settings/main.c:84 ../xfce4-settings-editor/main.c:43 +#: ../xfsettingsd/main.c:78 ../xfce4-settings-manager/main.c:40 msgid "Version information" msgstr "Informations sur la version" #: ../dialogs/accessibility-settings/main.c:192 -#: ../dialogs/appearance-settings/main.c:1006 -#: ../dialogs/display-settings/main.c:2950 +#: ../dialogs/appearance-settings/main.c:997 +#: ../dialogs/display-settings/main.c:3025 #: ../dialogs/keyboard-settings/main.c:76 ../dialogs/mime-settings/main.c:62 -#: ../dialogs/mouse-settings/main.c:1611 ../xfce4-settings-editor/main.c:63 -#: ../xfsettingsd/main.c:187 ../xfce4-settings-manager/main.c:61 +#: ../dialogs/mouse-settings/main.c:1769 ../xfce4-settings-editor/main.c:63 +#: ../xfsettingsd/main.c:191 ../xfsettingsd/main.c:229 +#: ../xfce4-settings-manager/main.c:61 #, c-format msgid "Type '%s --help' for usage." msgstr "Taper « %s --help » pour plus d'aide." #: ../dialogs/accessibility-settings/main.c:211 -#: ../dialogs/appearance-settings/main.c:1025 -#: ../dialogs/display-settings/main.c:2969 +#: ../dialogs/appearance-settings/main.c:1016 +#: ../dialogs/display-settings/main.c:3044 #: ../dialogs/keyboard-settings/main.c:92 ../dialogs/mime-settings/main.c:81 -#: ../dialogs/mouse-settings/main.c:1630 ../xfce4-settings-editor/main.c:82 -#: ../xfsettingsd/main.c:203 ../xfce4-settings-manager/main.c:77 +#: ../dialogs/mouse-settings/main.c:1788 ../xfce4-settings-editor/main.c:82 +#: ../xfsettingsd/main.c:207 ../xfce4-settings-manager/main.c:77 msgid "The Xfce development team. All rights reserved." msgstr "L'équipe de développement Xfce. Tous droits réservés." #: ../dialogs/accessibility-settings/main.c:212 -#: ../dialogs/appearance-settings/main.c:1026 -#: ../dialogs/display-settings/main.c:2970 +#: ../dialogs/appearance-settings/main.c:1017 +#: ../dialogs/display-settings/main.c:3045 #: ../dialogs/keyboard-settings/main.c:93 ../dialogs/mime-settings/main.c:82 -#: ../dialogs/mouse-settings/main.c:1631 ../xfce4-settings-editor/main.c:83 -#: ../xfsettingsd/main.c:204 ../xfce4-settings-manager/main.c:78 +#: ../dialogs/mouse-settings/main.c:1789 ../xfce4-settings-editor/main.c:83 +#: ../xfsettingsd/main.c:208 ../xfce4-settings-manager/main.c:78 #, c-format msgid "Please report bugs to <%s>." msgstr "Veuillez signaler les bogues à <%s>." @@ -416,7 +417,7 @@ msgid "Setti_ngs" msgstr "Para_mètres" #: ../dialogs/appearance-settings/appearance-dialog.glade.h:34 -#: ../dialogs/appearance-settings/main.c:892 +#: ../dialogs/appearance-settings/main.c:883 #: ../dialogs/display-settings/main.c:87 ../dialogs/display-settings/main.c:98 msgid "None" msgstr "Aucun" @@ -449,52 +450,52
[Xfce4-commits] [xfce/xfce4-settings] 01/05: I18n: Update translation bg (100%).
This is an automated email from the git hooks/post-receive script. transifex pushed a commit to branch master in repository xfce/xfce4-settings. commit e3ba34743130b96b6842d95d16e5f421936774d7 Author: Kiril Kirilov Date: Fri Feb 6 18:30:46 2015 +0100 I18n: Update translation bg (100%). 354 translated messages. Transifex (https://www.transifex.com/projects/p/xfce/). --- po/bg.po | 190 +- 1 file changed, 101 insertions(+), 89 deletions(-) diff --git a/po/bg.po b/po/bg.po index 6f45333..c1f87be 100644 --- a/po/bg.po +++ b/po/bg.po @@ -10,8 +10,8 @@ msgid "" msgstr "" "Project-Id-Version: Xfce4-settings\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-07-27 18:30+0200\n" -"PO-Revision-Date: 2015-01-16 13:49+\n" +"POT-Creation-Date: 2015-02-06 06:30+0100\n" +"PO-Revision-Date: 2015-02-06 11:43+\n" "Last-Translator: Kiril Kirilov \n" "Language-Team: Bulgarian (http://www.transifex.com/projects/p/xfce4-settings/language/bg/)\n" "MIME-Version: 1.0\n" @@ -209,14 +209,14 @@ msgstr "Мишка" #: ../dialogs/accessibility-settings/main.c:43 #: ../dialogs/appearance-settings/main.c:95 #: ../dialogs/display-settings/main.c:120 -#: ../dialogs/keyboard-settings/main.c:39 ../dialogs/mouse-settings/main.c:79 +#: ../dialogs/keyboard-settings/main.c:39 ../dialogs/mouse-settings/main.c:83 msgid "Settings manager socket" msgstr "Гнездо на мениджъра на настройките" #: ../dialogs/accessibility-settings/main.c:43 #: ../dialogs/appearance-settings/main.c:95 #: ../dialogs/display-settings/main.c:120 -#: ../dialogs/keyboard-settings/main.c:39 ../dialogs/mouse-settings/main.c:79 +#: ../dialogs/keyboard-settings/main.c:39 ../dialogs/mouse-settings/main.c:83 msgid "SOCKET ID" msgstr "Гнездо ID" @@ -224,36 +224,37 @@ msgstr "Гнездо ID" #: ../dialogs/appearance-settings/main.c:96 #: ../dialogs/display-settings/main.c:121 #: ../dialogs/keyboard-settings/main.c:40 ../dialogs/mime-settings/main.c:40 -#: ../dialogs/mouse-settings/main.c:80 ../xfce4-settings-editor/main.c:43 -#: ../xfsettingsd/main.c:77 ../xfce4-settings-manager/main.c:40 +#: ../dialogs/mouse-settings/main.c:84 ../xfce4-settings-editor/main.c:43 +#: ../xfsettingsd/main.c:78 ../xfce4-settings-manager/main.c:40 msgid "Version information" msgstr "Информация за версията" #: ../dialogs/accessibility-settings/main.c:192 -#: ../dialogs/appearance-settings/main.c:1006 -#: ../dialogs/display-settings/main.c:2950 +#: ../dialogs/appearance-settings/main.c:997 +#: ../dialogs/display-settings/main.c:3025 #: ../dialogs/keyboard-settings/main.c:76 ../dialogs/mime-settings/main.c:62 -#: ../dialogs/mouse-settings/main.c:1611 ../xfce4-settings-editor/main.c:63 -#: ../xfsettingsd/main.c:187 ../xfce4-settings-manager/main.c:61 +#: ../dialogs/mouse-settings/main.c:1769 ../xfce4-settings-editor/main.c:63 +#: ../xfsettingsd/main.c:191 ../xfsettingsd/main.c:229 +#: ../xfce4-settings-manager/main.c:61 #, c-format msgid "Type '%s --help' for usage." msgstr "Напишете '%s --help' за показване на потребителско ръководство" #: ../dialogs/accessibility-settings/main.c:211 -#: ../dialogs/appearance-settings/main.c:1025 -#: ../dialogs/display-settings/main.c:2969 +#: ../dialogs/appearance-settings/main.c:1016 +#: ../dialogs/display-settings/main.c:3044 #: ../dialogs/keyboard-settings/main.c:92 ../dialogs/mime-settings/main.c:81 -#: ../dialogs/mouse-settings/main.c:1630 ../xfce4-settings-editor/main.c:82 -#: ../xfsettingsd/main.c:203 ../xfce4-settings-manager/main.c:77 +#: ../dialogs/mouse-settings/main.c:1788 ../xfce4-settings-editor/main.c:82 +#: ../xfsettingsd/main.c:207 ../xfce4-settings-manager/main.c:77 msgid "The Xfce development team. All rights reserved." msgstr "Екипът по разрабоката на Xfce. Всички права са запазени." #: ../dialogs/accessibility-settings/main.c:212 -#: ../dialogs/appearance-settings/main.c:1026 -#: ../dialogs/display-settings/main.c:2970 +#: ../dialogs/appearance-settings/main.c:1017 +#: ../dialogs/display-settings/main.c:3045 #: ../dialogs/keyboard-settings/main.c:93 ../dialogs/mime-settings/main.c:82 -#: ../dialogs/mouse-settings/main.c:1631 ../xfce4-settings-editor/main.c:83 -#: ../xfsettingsd/main.c:204 ../xfce4-settings-manager/main.c:78 +#: ../dialogs/mouse-settings/main.c:1789 ../xfce4-settings-editor/main.c:83 +#: ../xfsettingsd/main.c:208 ../xfce4-settings-manager/main.c:78 #, c-format msgid "Please report bugs to <%s>." msgstr "Моля, докладвайте грешки на <%s>." @@ -312,7 +313,7 @@ msgstr "Подпикселна подредба:" #: ../dialogs/appearance-settings/appearance-dialog.glade.h:11 msgid "Hintin_g:" -msgstr "Намекване:" +msgstr "Подсказване:" #: ../dialogs/appearance-settings/appearance-dialog.glade.h:12 msgid "_Enable anti-aliasing" @@ -411,7 +412,7 @@ msgid "Setti_ngs" msgstr "_Настройки" #: ../dialogs/appearance-settings/appearance-dialog.glade.h:34 -#: ../dialogs/appearance-settings/main.c:892 +#: ../dialogs/appearanc
[Xfce4-commits] [xfce/xfce4-settings] 05/05: I18n: Update translation zh_TW (100%).
This is an automated email from the git hooks/post-receive script. transifex pushed a commit to branch master in repository xfce/xfce4-settings. commit 6f09f9301196501a6fe753480f2c460f7d0b5939 Author: Jeff Huang Date: Fri Feb 6 18:30:46 2015 +0100 I18n: Update translation zh_TW (100%). 354 translated messages. Transifex (https://www.transifex.com/projects/p/xfce/). --- po/zh_TW.po | 190 +++ 1 file changed, 101 insertions(+), 89 deletions(-) diff --git a/po/zh_TW.po b/po/zh_TW.po index c8b53b3..0998ee4 100644 --- a/po/zh_TW.po +++ b/po/zh_TW.po @@ -4,14 +4,14 @@ # # Translators: # Cheng-Chia Tseng , 2010 -# Jeff Huang , 2014 +# Jeff Huang , 2014-2015 # Walter Cheuk , 2013-2014 msgid "" msgstr "" "Project-Id-Version: Xfce4-settings\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-07-27 18:30+0200\n" -"PO-Revision-Date: 2014-07-28 02:28+\n" +"POT-Creation-Date: 2015-02-06 06:30+0100\n" +"PO-Revision-Date: 2015-02-06 13:13+\n" "Last-Translator: Jeff Huang \n" "Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/xfce4-settings/language/zh_TW/)\n" "MIME-Version: 1.0\n" @@ -209,14 +209,14 @@ msgstr "滑鼠(_M)" #: ../dialogs/accessibility-settings/main.c:43 #: ../dialogs/appearance-settings/main.c:95 #: ../dialogs/display-settings/main.c:120 -#: ../dialogs/keyboard-settings/main.c:39 ../dialogs/mouse-settings/main.c:79 +#: ../dialogs/keyboard-settings/main.c:39 ../dialogs/mouse-settings/main.c:83 msgid "Settings manager socket" msgstr "設定值管理員 socket" #: ../dialogs/accessibility-settings/main.c:43 #: ../dialogs/appearance-settings/main.c:95 #: ../dialogs/display-settings/main.c:120 -#: ../dialogs/keyboard-settings/main.c:39 ../dialogs/mouse-settings/main.c:79 +#: ../dialogs/keyboard-settings/main.c:39 ../dialogs/mouse-settings/main.c:83 msgid "SOCKET ID" msgstr "SOCKET ID" @@ -224,36 +224,37 @@ msgstr "SOCKET ID" #: ../dialogs/appearance-settings/main.c:96 #: ../dialogs/display-settings/main.c:121 #: ../dialogs/keyboard-settings/main.c:40 ../dialogs/mime-settings/main.c:40 -#: ../dialogs/mouse-settings/main.c:80 ../xfce4-settings-editor/main.c:43 -#: ../xfsettingsd/main.c:77 ../xfce4-settings-manager/main.c:40 +#: ../dialogs/mouse-settings/main.c:84 ../xfce4-settings-editor/main.c:43 +#: ../xfsettingsd/main.c:78 ../xfce4-settings-manager/main.c:40 msgid "Version information" msgstr "版本資訊" #: ../dialogs/accessibility-settings/main.c:192 -#: ../dialogs/appearance-settings/main.c:1006 -#: ../dialogs/display-settings/main.c:2950 +#: ../dialogs/appearance-settings/main.c:997 +#: ../dialogs/display-settings/main.c:3025 #: ../dialogs/keyboard-settings/main.c:76 ../dialogs/mime-settings/main.c:62 -#: ../dialogs/mouse-settings/main.c:1611 ../xfce4-settings-editor/main.c:63 -#: ../xfsettingsd/main.c:187 ../xfce4-settings-manager/main.c:61 +#: ../dialogs/mouse-settings/main.c:1769 ../xfce4-settings-editor/main.c:63 +#: ../xfsettingsd/main.c:191 ../xfsettingsd/main.c:229 +#: ../xfce4-settings-manager/main.c:61 #, c-format msgid "Type '%s --help' for usage." msgstr "輸入 '%s --help' 以了解用法。" #: ../dialogs/accessibility-settings/main.c:211 -#: ../dialogs/appearance-settings/main.c:1025 -#: ../dialogs/display-settings/main.c:2969 +#: ../dialogs/appearance-settings/main.c:1016 +#: ../dialogs/display-settings/main.c:3044 #: ../dialogs/keyboard-settings/main.c:92 ../dialogs/mime-settings/main.c:81 -#: ../dialogs/mouse-settings/main.c:1630 ../xfce4-settings-editor/main.c:82 -#: ../xfsettingsd/main.c:203 ../xfce4-settings-manager/main.c:77 +#: ../dialogs/mouse-settings/main.c:1788 ../xfce4-settings-editor/main.c:82 +#: ../xfsettingsd/main.c:207 ../xfce4-settings-manager/main.c:77 msgid "The Xfce development team. All rights reserved." msgstr "Xfce 開發團隊。保留所有權利。" #: ../dialogs/accessibility-settings/main.c:212 -#: ../dialogs/appearance-settings/main.c:1026 -#: ../dialogs/display-settings/main.c:2970 +#: ../dialogs/appearance-settings/main.c:1017 +#: ../dialogs/display-settings/main.c:3045 #: ../dialogs/keyboard-settings/main.c:93 ../dialogs/mime-settings/main.c:82 -#: ../dialogs/mouse-settings/main.c:1631 ../xfce4-settings-editor/main.c:83 -#: ../xfsettingsd/main.c:204 ../xfce4-settings-manager/main.c:78 +#: ../dialogs/mouse-settings/main.c:1789 ../xfce4-settings-editor/main.c:83 +#: ../xfsettingsd/main.c:208 ../xfce4-settings-manager/main.c:78 #, c-format msgid "Please report bugs to <%s>." msgstr "請回報錯誤至 <%s>。" @@ -411,7 +412,7 @@ msgid "Setti_ngs" msgstr "設定值(_N)" #: ../dialogs/appearance-settings/appearance-dialog.glade.h:34 -#: ../dialogs/appearance-settings/main.c:892 +#: ../dialogs/appearance-settings/main.c:883 #: ../dialogs/display-settings/main.c:87 ../dialogs/display-settings/main.c:98 msgid "None" msgstr "無" @@ -444,52 +445,52 @@ msgstr "文字在圖示下" msgid "Text next to icons" msgstr "文字在圖示旁" -#: ../dialogs/appearance-settings/main.c:355 +#: ../dialogs/app
[Xfce4-commits] [xfce/xfce4-settings] 04/05: I18n: Update translation ja (100%).
This is an automated email from the git hooks/post-receive script. transifex pushed a commit to branch master in repository xfce/xfce4-settings. commit 41123c130ba10729c38da2f9ab0f3d07dba541b7 Author: Masato HASHIMOTO Date: Fri Feb 6 18:30:46 2015 +0100 I18n: Update translation ja (100%). 354 translated messages. Transifex (https://www.transifex.com/projects/p/xfce/). --- po/ja.po | 190 +- 1 file changed, 101 insertions(+), 89 deletions(-) diff --git a/po/ja.po b/po/ja.po index e2f05cb..e2fd2db 100644 --- a/po/ja.po +++ b/po/ja.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: Xfce4-settings\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-07-27 18:30+0200\n" -"PO-Revision-Date: 2014-08-01 13:38+\n" +"POT-Creation-Date: 2015-02-06 06:30+0100\n" +"PO-Revision-Date: 2015-02-06 13:17+\n" "Last-Translator: Masato HASHIMOTO \n" "Language-Team: Japanese (http://www.transifex.com/projects/p/xfce4-settings/language/ja/)\n" "MIME-Version: 1.0\n" @@ -207,14 +207,14 @@ msgstr "マウス(_M)" #: ../dialogs/accessibility-settings/main.c:43 #: ../dialogs/appearance-settings/main.c:95 #: ../dialogs/display-settings/main.c:120 -#: ../dialogs/keyboard-settings/main.c:39 ../dialogs/mouse-settings/main.c:79 +#: ../dialogs/keyboard-settings/main.c:39 ../dialogs/mouse-settings/main.c:83 msgid "Settings manager socket" msgstr "設定マネージャーソケット" #: ../dialogs/accessibility-settings/main.c:43 #: ../dialogs/appearance-settings/main.c:95 #: ../dialogs/display-settings/main.c:120 -#: ../dialogs/keyboard-settings/main.c:39 ../dialogs/mouse-settings/main.c:79 +#: ../dialogs/keyboard-settings/main.c:39 ../dialogs/mouse-settings/main.c:83 msgid "SOCKET ID" msgstr "SOCKET ID" @@ -222,36 +222,37 @@ msgstr "SOCKET ID" #: ../dialogs/appearance-settings/main.c:96 #: ../dialogs/display-settings/main.c:121 #: ../dialogs/keyboard-settings/main.c:40 ../dialogs/mime-settings/main.c:40 -#: ../dialogs/mouse-settings/main.c:80 ../xfce4-settings-editor/main.c:43 -#: ../xfsettingsd/main.c:77 ../xfce4-settings-manager/main.c:40 +#: ../dialogs/mouse-settings/main.c:84 ../xfce4-settings-editor/main.c:43 +#: ../xfsettingsd/main.c:78 ../xfce4-settings-manager/main.c:40 msgid "Version information" msgstr "バージョン情報を表示する" #: ../dialogs/accessibility-settings/main.c:192 -#: ../dialogs/appearance-settings/main.c:1006 -#: ../dialogs/display-settings/main.c:2950 +#: ../dialogs/appearance-settings/main.c:997 +#: ../dialogs/display-settings/main.c:3025 #: ../dialogs/keyboard-settings/main.c:76 ../dialogs/mime-settings/main.c:62 -#: ../dialogs/mouse-settings/main.c:1611 ../xfce4-settings-editor/main.c:63 -#: ../xfsettingsd/main.c:187 ../xfce4-settings-manager/main.c:61 +#: ../dialogs/mouse-settings/main.c:1769 ../xfce4-settings-editor/main.c:63 +#: ../xfsettingsd/main.c:191 ../xfsettingsd/main.c:229 +#: ../xfce4-settings-manager/main.c:61 #, c-format msgid "Type '%s --help' for usage." msgstr "'%s --help' と入力すると使用方法が表示されます。" #: ../dialogs/accessibility-settings/main.c:211 -#: ../dialogs/appearance-settings/main.c:1025 -#: ../dialogs/display-settings/main.c:2969 +#: ../dialogs/appearance-settings/main.c:1016 +#: ../dialogs/display-settings/main.c:3044 #: ../dialogs/keyboard-settings/main.c:92 ../dialogs/mime-settings/main.c:81 -#: ../dialogs/mouse-settings/main.c:1630 ../xfce4-settings-editor/main.c:82 -#: ../xfsettingsd/main.c:203 ../xfce4-settings-manager/main.c:77 +#: ../dialogs/mouse-settings/main.c:1788 ../xfce4-settings-editor/main.c:82 +#: ../xfsettingsd/main.c:207 ../xfce4-settings-manager/main.c:77 msgid "The Xfce development team. All rights reserved." msgstr "The Xfce development team. All rights reserved." #: ../dialogs/accessibility-settings/main.c:212 -#: ../dialogs/appearance-settings/main.c:1026 -#: ../dialogs/display-settings/main.c:2970 +#: ../dialogs/appearance-settings/main.c:1017 +#: ../dialogs/display-settings/main.c:3045 #: ../dialogs/keyboard-settings/main.c:93 ../dialogs/mime-settings/main.c:82 -#: ../dialogs/mouse-settings/main.c:1631 ../xfce4-settings-editor/main.c:83 -#: ../xfsettingsd/main.c:204 ../xfce4-settings-manager/main.c:78 +#: ../dialogs/mouse-settings/main.c:1789 ../xfce4-settings-editor/main.c:83 +#: ../xfsettingsd/main.c:208 ../xfce4-settings-manager/main.c:78 #, c-format msgid "Please report bugs to <%s>." msgstr "バグの報告は <%s> までお願いします。" @@ -296,7 +297,7 @@ msgstr "デフォルトフォント(_T)" msgid "" "Many fonts contain information that provides extra hints as to how best draw" " the font; pick whichever looks best according to personal preference" -msgstr "多くのフォントはフォントを最も高い品質で描画するための拡張ヒントデータを含んでいます。あなたの好みに合うものを選択してください。" +msgstr "多くのフォントはフォントをもっとも高い品質で描画するための拡張ヒントデータを含んでいます。あなたの好みに合うものを選択してください。" #: ../dialogs/appearance-settings/appearance-dialog.glade.h:9 msgid "" @@ -409,7 +410,7 @@ msgid "Setti_ngs" msgstr "設定(_N)" #: ../dialogs/appearance-settings/appearance-dialog.glade.h:3
[Xfce4-commits] [apps/ristretto] branch master updated (167bb42 -> 481bfeb)
This is an automated email from the git hooks/post-receive script. transifex pushed a change to branch master in repository apps/ristretto. from 167bb42 I18n: Update translation fr (98%). new 481bfeb I18n: Update translation fr (98%). The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: po/fr.po |6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) -- To stop receiving notification emails like this one, please contact the administrator of this repository. ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] [apps/ristretto] 01/01: I18n: Update translation fr (98%).
This is an automated email from the git hooks/post-receive script. transifex pushed a commit to branch master in repository apps/ristretto. commit 481bfebf5d3aa9ed6e30a5d3f0db5fc4f4ab08fd Author: Urien Desterres Date: Fri Feb 6 18:30:59 2015 +0100 I18n: Update translation fr (98%). 186 translated messages, 2 untranslated messages. Transifex (https://www.transifex.com/projects/p/xfce/). --- po/fr.po |6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/po/fr.po b/po/fr.po index d08ae91..fd71109 100644 --- a/po/fr.po +++ b/po/fr.po @@ -15,7 +15,7 @@ msgstr "" "Project-Id-Version: Xfce Apps\n" "Report-Msgid-Bugs-To: xfce-i...@xfce.org\n" "POT-Creation-Date: 2015-01-25 12:30+0100\n" -"PO-Revision-Date: 2015-02-05 18:39+\n" +"PO-Revision-Date: 2015-02-06 17:21+\n" "Last-Translator: Urien Desterres \n" "Language-Team: French (http://www.transifex.com/projects/p/xfce-apps/language/fr/)\n" "MIME-Version: 1.0\n" @@ -873,7 +873,7 @@ msgid "" "scroll through images, run a slideshow of images, open images with other " "applications like an image-editor or configure an image as the desktop " "wallpaper." -msgstr "Le visionneur d’images Ristretto est une application qui peut être utilisée pour visionner et faire défiler des images, les ouvrir dans d’autres applications, comme un éditeur d’images, ou les définir comme fond d’écran." +msgstr "Le visionneur d’images Ristretto est une application qui peut être utilisée pour visionner et faire défiler des images, les ouvrir dans d’autres applications comme un éditeur d’images, ou les définir comme fond d’écran." #: ../ristretto.appdata.xml.in.h:3 msgid "" @@ -886,7 +886,7 @@ msgstr "" msgid "" "This release contains lots of translation-updates, and a crash when " "configuring the 'limit-quality' property." -msgstr "Cette version contient de nombreuses mises à jour de traduction et s’arrête brutalement lors de l’activation de l’option limitant la qualité de rendue de l’image." +msgstr "Cette version contient de nombreuses mises à jour de traduction et peut planter en configurant l’option limitant la qualité de rendue de l’image." #: ../ristretto.appdata.xml.in.h:5 msgid "" -- To stop receiving notification emails like this one, please contact the administrator of this repository. ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] [xfce/xfce4-settings] 03/05: I18n: Update translation hr (100%).
This is an automated email from the git hooks/post-receive script. transifex pushed a commit to branch master in repository xfce/xfce4-settings. commit 6273010939e84f5d15d761fea11cefa829826072 Author: Edin Veskovic Date: Fri Feb 6 18:30:46 2015 +0100 I18n: Update translation hr (100%). 354 translated messages. Transifex (https://www.transifex.com/projects/p/xfce/). --- po/hr.po | 206 +- 1 file changed, 110 insertions(+), 96 deletions(-) diff --git a/po/hr.po b/po/hr.po index 26c8710..d0484a1 100644 --- a/po/hr.po +++ b/po/hr.po @@ -3,7 +3,8 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: -# Edin Veskovic , 2014 +# Edin Veskovic , 2015 +# Edin Veskovic , 2014 # Ivica Kolić , 2010 # Ivica Kolić , 2010 # Ivica Kolić , 2013-2014 @@ -11,9 +12,9 @@ msgid "" msgstr "" "Project-Id-Version: Xfce4-settings\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-07-10 06:30+0200\n" -"PO-Revision-Date: 2014-07-11 22:16+\n" -"Last-Translator: Edin Veskovic \n" +"POT-Creation-Date: 2015-02-06 06:30+0100\n" +"PO-Revision-Date: 2015-02-06 13:52+\n" +"Last-Translator: Edin Veskovic \n" "Language-Team: Croatian (http://www.transifex.com/projects/p/xfce4-settings/language/hr/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -210,14 +211,14 @@ msgstr "_Miš" #: ../dialogs/accessibility-settings/main.c:43 #: ../dialogs/appearance-settings/main.c:95 #: ../dialogs/display-settings/main.c:120 -#: ../dialogs/keyboard-settings/main.c:39 ../dialogs/mouse-settings/main.c:79 +#: ../dialogs/keyboard-settings/main.c:39 ../dialogs/mouse-settings/main.c:83 msgid "Settings manager socket" msgstr "Priključak upravitelja postavkama" #: ../dialogs/accessibility-settings/main.c:43 #: ../dialogs/appearance-settings/main.c:95 #: ../dialogs/display-settings/main.c:120 -#: ../dialogs/keyboard-settings/main.c:39 ../dialogs/mouse-settings/main.c:79 +#: ../dialogs/keyboard-settings/main.c:39 ../dialogs/mouse-settings/main.c:83 msgid "SOCKET ID" msgstr "SOCKET ID" @@ -225,36 +226,37 @@ msgstr "SOCKET ID" #: ../dialogs/appearance-settings/main.c:96 #: ../dialogs/display-settings/main.c:121 #: ../dialogs/keyboard-settings/main.c:40 ../dialogs/mime-settings/main.c:40 -#: ../dialogs/mouse-settings/main.c:80 ../xfce4-settings-editor/main.c:43 -#: ../xfsettingsd/main.c:77 ../xfce4-settings-manager/main.c:40 +#: ../dialogs/mouse-settings/main.c:84 ../xfce4-settings-editor/main.c:43 +#: ../xfsettingsd/main.c:78 ../xfce4-settings-manager/main.c:40 msgid "Version information" msgstr "Inforemacija o verziji" #: ../dialogs/accessibility-settings/main.c:192 -#: ../dialogs/appearance-settings/main.c:1006 -#: ../dialogs/display-settings/main.c:2950 +#: ../dialogs/appearance-settings/main.c:997 +#: ../dialogs/display-settings/main.c:3025 #: ../dialogs/keyboard-settings/main.c:76 ../dialogs/mime-settings/main.c:62 -#: ../dialogs/mouse-settings/main.c:1611 ../xfce4-settings-editor/main.c:63 -#: ../xfsettingsd/main.c:187 ../xfce4-settings-manager/main.c:61 +#: ../dialogs/mouse-settings/main.c:1769 ../xfce4-settings-editor/main.c:63 +#: ../xfsettingsd/main.c:191 ../xfsettingsd/main.c:229 +#: ../xfce4-settings-manager/main.c:61 #, c-format msgid "Type '%s --help' for usage." msgstr "Upiši '%s --help' za upotrebu." #: ../dialogs/accessibility-settings/main.c:211 -#: ../dialogs/appearance-settings/main.c:1025 -#: ../dialogs/display-settings/main.c:2969 +#: ../dialogs/appearance-settings/main.c:1016 +#: ../dialogs/display-settings/main.c:3044 #: ../dialogs/keyboard-settings/main.c:92 ../dialogs/mime-settings/main.c:81 -#: ../dialogs/mouse-settings/main.c:1630 ../xfce4-settings-editor/main.c:82 -#: ../xfsettingsd/main.c:203 ../xfce4-settings-manager/main.c:77 +#: ../dialogs/mouse-settings/main.c:1788 ../xfce4-settings-editor/main.c:82 +#: ../xfsettingsd/main.c:207 ../xfce4-settings-manager/main.c:77 msgid "The Xfce development team. All rights reserved." msgstr "Xfce razvojni tim.Sva prava pridržana." #: ../dialogs/accessibility-settings/main.c:212 -#: ../dialogs/appearance-settings/main.c:1026 -#: ../dialogs/display-settings/main.c:2970 +#: ../dialogs/appearance-settings/main.c:1017 +#: ../dialogs/display-settings/main.c:3045 #: ../dialogs/keyboard-settings/main.c:93 ../dialogs/mime-settings/main.c:82 -#: ../dialogs/mouse-settings/main.c:1631 ../xfce4-settings-editor/main.c:83 -#: ../xfsettingsd/main.c:204 ../xfce4-settings-manager/main.c:78 +#: ../dialogs/mouse-settings/main.c:1789 ../xfce4-settings-editor/main.c:83 +#: ../xfsettingsd/main.c:208 ../xfce4-settings-manager/main.c:78 #, c-format msgid "Please report bugs to <%s>." msgstr "Prijavite probleme u <%s>." @@ -412,7 +414,7 @@ msgid "Setti_ngs" msgstr "Postav_ke" #: ../dialogs/appearance-settings/appearance-dialog.glade.h:34 -#: ../dialogs/appearance-settings/main.c:892 +#: ../dialogs/appearan
[Xfce4-commits] [xfce/xfce4-settings] branch master updated (fbbccc2 -> 6f09f93)
This is an automated email from the git hooks/post-receive script. transifex pushed a change to branch master in repository xfce/xfce4-settings. from fbbccc2 Show more information in icon-theme list (bug #9130) new e3ba347 I18n: Update translation bg (100%). new 2d0c3b2 I18n: Update translation fr (100%). new 6273010 I18n: Update translation hr (100%). new 41123c1 I18n: Update translation ja (100%). new 6f09f93 I18n: Update translation zh_TW (100%). The 5 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: po/bg.po| 190 +- po/fr.po| 207 +++ po/hr.po| 206 +++--- po/ja.po| 190 +- po/zh_TW.po | 190 +- 5 files changed, 523 insertions(+), 460 deletions(-) -- To stop receiving notification emails like this one, please contact the administrator of this repository. ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] [xfce/xfwm4] branch master updated (6facb28 -> f352f82)
This is an automated email from the git hooks/post-receive script. transifex pushed a change to branch master in repository xfce/xfwm4. from 6facb28 I18n: Update translation fr (100%). new f352f82 I18n: Update translation fr (100%). The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: po/fr.po | 72 +++--- 1 file changed, 36 insertions(+), 36 deletions(-) -- To stop receiving notification emails like this one, please contact the administrator of this repository. ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] [xfce/xfwm4] 01/01: I18n: Update translation fr (100%).
This is an automated email from the git hooks/post-receive script. transifex pushed a commit to branch master in repository xfce/xfwm4. commit f352f827b7611768f09b78a70b7062e8fc54ff2d Author: Yannick Le Guen Date: Fri Feb 6 12:31:56 2015 +0100 I18n: Update translation fr (100%). 173 translated messages. Transifex (https://www.transifex.com/projects/p/xfce/). --- po/fr.po | 72 +++--- 1 file changed, 36 insertions(+), 36 deletions(-) diff --git a/po/fr.po b/po/fr.po index e18bed3..64f8bcd 100644 --- a/po/fr.po +++ b/po/fr.po @@ -17,7 +17,7 @@ msgstr "" "Project-Id-Version: Xfwm4\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2015-01-30 00:32+0100\n" -"PO-Revision-Date: 2015-02-05 17:48+\n" +"PO-Revision-Date: 2015-02-06 09:48+\n" "Last-Translator: Yannick Le Guen \n" "Language-Team: French (http://www.transifex.com/projects/p/xfwm4/language/fr/)\n" "MIME-Version: 1.0\n" @@ -30,7 +30,7 @@ msgstr "" msgid "" "This window might be busy and is not responding.\n" "Do you want to terminate the application?" -msgstr "Cette fenêtre ne répond pas : il se peut qu'elle soit occupée.\nVoulez-vous fermer l'application ?" +msgstr "Cette fenêtre ne répond pas : il se peut qu’elle soit occupée.\nVoulez-vous fermer l’application ?" #: ../helper-dialog/helper-dialog.c:89 msgid "Warning" @@ -79,7 +79,7 @@ msgstr "Espace de travail %d" #: ../settings-dialogs/workspace-settings.c:275 msgid "Workspace Name" -msgstr "Nom de l'espace de travail" +msgstr "Nom de l’espace de travail" #: ../settings-dialogs/workspace-settings.c:381 #: ../settings-dialogs/xfwm4-settings.c:241 @@ -228,7 +228,7 @@ msgstr "Focaliser les nouvelles fenêtres" #: ../settings-dialogs/xfwm4-dialog.glade.h:32 msgid "Automatically _raise windows when they receive focus" -msgstr "Mettre les fenêtres au _premier plan lorsqu'elles sont focalisées" +msgstr "Placer les fenêtres au _premier plan lorsqu’elles reçoivent le focus" #: ../settings-dialogs/xfwm4-dialog.glade.h:33 msgid "Delay _before raising focused window:" @@ -240,7 +240,7 @@ msgstr "Mettre les fenêtres focalisées au premier plan" #: ../settings-dialogs/xfwm4-dialog.glade.h:35 msgid "Raise window when clicking _inside application window" -msgstr "Mettre une fenêtre au premier plan en cl_iquant à l'intérieur" +msgstr "Placer une fenêtre au premier plan en cl_iquant à l’intérieur" #: ../settings-dialogs/xfwm4-dialog.glade.h:36 msgid "Raise on click" @@ -253,7 +253,7 @@ msgstr "_Focalisation" #: ../settings-dialogs/xfwm4-dialog.glade.h:38 msgid "To screen _borders" -msgstr "Sur les _bords de l'écran" +msgstr "Sur les _bords de l’écran" #: ../settings-dialogs/xfwm4-dialog.glade.h:39 msgid "To other _windows" @@ -293,7 +293,7 @@ msgstr "_Résistance aux bords :" #: ../settings-dialogs/xfwm4-dialog.glade.h:49 msgid "Wrap workspaces when reaching the screen edge" -msgstr "Changer d'espace de travail lorsque le pointeur arrive au bord de l'écran" +msgstr "Changer d’espace de travail lorsque le pointeur arrive au bord de l’écran" #: ../settings-dialogs/xfwm4-dialog.glade.h:50 msgid "When _moving" @@ -309,7 +309,7 @@ msgstr "Masquer le contenu des fenêtres" #: ../settings-dialogs/xfwm4-dialog.glade.h:53 msgid "The action to perform when the title-bar is double-clicked" -msgstr "Action à effectuer lors d'un double clic sur la barre de titre" +msgstr "Action à effectuer lors d’un double clic sur la barre de titre" #: ../settings-dialogs/xfwm4-dialog.glade.h:54 msgid "Double click _action" @@ -366,7 +366,7 @@ msgstr "Raccourci" #: ../settings-dialogs/xfwm4-settings.c:924 #, c-format msgid "Failed to initialize xfconf. Reason: %s" -msgstr "Impossible d'initialiser xfconf. Raison : %s" +msgstr "Impossible d’initialiser xfconf. Raison : %s" #: ../settings-dialogs/xfwm4-settings.c:935 msgid "Could not create the settings dialog." @@ -419,15 +419,15 @@ msgstr "Suivre le _standard ICCCM pour la focalisation" #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:12 msgid "When a window raises itself:" -msgstr "Lorsqu'une fenêtre se place au premier plan :" +msgstr "Lorsqu’une fenêtre se place au premier plan :" #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:13 msgid "_Bring window on current workspace" -msgstr "_Placer la fenêtre dans l'espace de travail actif" +msgstr "_Placer la fenêtre dans l’espace de travail actif" #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:14 msgid "Switch to win_dow's workspace" -msgstr "Basculer dans l'espace _de travail de la fenêtre" +msgstr "Basculer dans l’espace _de travail de la fenêtre" #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:15 msgid "Do _nothing" @@ -439,7 +439,7 @@ msgstr "Touche utilisée pour _saisir et déplacer les fenêtres :" #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:18 msgid "_Raise windows when any mouse button is pressed" -msgstr "_Mettre les fenêtres au premier plan
