[Xfce4-commits] www:master I18n: Update translation uk (97%).

[Transifex]

Updating branch refs/heads/master
 to 93a8ffc5ceabe8d9165463b6d6b1c2885320c765 (commit)
   from c17bbb89d6d8af1831d3178ef86ca13676b7713f (commit)

commit 93a8ffc5ceabe8d9165463b6d6b1c2885320c765
Author: Yarema aka Knedlyk yupad...@gmail.com
Date:   Mon Dec 9 12:31:51 2013 +0100

I18n: Update translation uk (97%).

576 translated messages, 15 untranslated messages.

Transifex (https://www.transifex.com/projects/p/xfce/).

 lib/po/uk.po |   10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/lib/po/uk.po b/lib/po/uk.po
index 32e0887..799abfa 100644
--- a/lib/po/uk.po
+++ b/lib/po/uk.po
@@ -10,7 +10,7 @@ msgstr 
 Project-Id-Version: Xfce Websites\n
 Report-Msgid-Bugs-To: https://bugzilla.xfce.org\n;
 POT-Creation-Date: 2013-07-03 22:08+0200\n
-PO-Revision-Date: 2013-12-08 21:40+\n
+PO-Revision-Date: 2013-12-09 10:35+\n
 Last-Translator: Yarema aka Knedlyk yupad...@gmail.com\n
 Language-Team: Ukrainian 
(http://www.transifex.com/projects/p/xfce/language/uk/)\n
 MIME-Version: 1.0\n
@@ -1735,7 +1735,7 @@ msgid 
  by Xfce applications. The goal was to make it as easy as possible to change
  an application for a certain category (GNOME users may have already noticed
  that GNOME adopted this approach, because it is such simple).
-msgstr 
+msgstr База потрібних програм, в якій раніше був тільки bТермінал/b, була 
імпортована в Xfce. Тепер користувачам не потрібно редагувати змінні оболонки, 
щоб визначити, який переглядач або емулятор терміналу повинен бути використаний 
з програмами Xfce. Метою цього було зробити зміну програм якомога простішою для 
певних категрій (користувачі GNOME вже відчули, оскільки GNOME вже перейняв цей 
підхід, тому що це дійсно дуже просто).
 
 #: about/tour44.php:201
 msgid Keyboard Shortcuts
@@ -2213,7 +2213,7 @@ msgid 
 rows in the panel. Some plugins (e.g. emlaunchers/em) fit a single row, 
 while others, like window buttons are allowed to occupy full width of the 
 panel.
-msgstr 
+msgstr У версії 4.10 появилася опція конфігурування кількість рядків в одній 
панелі. Деякі додатки (як emзапускачі/em) займають цілий рядок, тоді як 
іншим, таким як кнопки вікон дозволено займати повну ширину панелі.
 
 #: about/tour.php:29
 msgid A horizontal panel with a number of rows set to three
@@ -2260,7 +2260,7 @@ msgid 
  add a transparent emseparator/em plugin with the 
 strongExpand/strong option enabled just behind the window buttons 
 plugin.
-msgstr 
+msgstr Тепер додаток emкнопок вікон/em не розширюється, що робить додаток 
більш зручнішим. Щоб відновити попередню поведінку, потрібно додати додаток 
прозорого emрозділювача/em з ввімкнутим параметром 
strongРозширення/strong за додатком кнопок вікон.
 
 #: about/tour.php:49
 msgid 
@@ -2274,7 +2274,7 @@ msgid 
 clearing the saved session (no more ttrm -r ~/.config/sessions/tt). 
 Xfce4-tips has been removed and the session manager can now lock the screen 
 before suspending or hibernating the system.
-msgstr 
+msgstr Діалог налаштувань уemМенеджері налаштувань/em має кнопку для 
очищення збереженої сесії (немає більше ttrm -r ~/.config/sessions/tt). 
Xfce4-tips вилучено, а менеджер сесій тепер може замикати екран пере засинанням 
або сплячкою системи.
 
 #: about/tour.php:55
 msgid Applications Autostart
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] orage:orage-4.10 Creating branch orage-4.10

[Transifex]

Updating branch refs/heads/orage-4.10
 as new branch
 to 2298340330aee91dfe8ca860b55d4f00fa7ec317 (commit)

Branches are created implicitly by pushing. This mail only exists to 
let you know that there was code pushed to 

  refs/heads/orage-4.10

for the first time. Mails for the commits that lead to the creation 
of the branch will follow after this mail.
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] xfce4-settings:bluesabre/display-settings l10n: Updated Portuguese (pt) translation to 100%

[Transifex]

Updating branch refs/heads/bluesabre/display-settings
 to 4c4efe90497763eb8fff29a659f57cfb163df0ff (commit)
   from 62ced46be1b5d0afd0f1e9ac2799747541cfc42e (commit)

commit 4c4efe90497763eb8fff29a659f57cfb163df0ff
Author: Sergio Marques smarque...@gmail.com
Date:   Mon Oct 1 00:13:34 2012 +0200

l10n: Updated Portuguese (pt) translation to 100%

New status: 336 messages complete with 0 fuzzies and 0 untranslated.

Transmitted-via: Transifex (translations.xfce.org).

 po/pt.po |  138 ++
 1 file changed, 67 insertions(+), 71 deletions(-)

diff --git a/po/pt.po b/po/pt.po
index 0223679..39dba49 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -7,7 +7,7 @@ msgid 
 msgstr 
 Project-Id-Version: xfce4-settings\n
 Report-Msgid-Bugs-To: \n
-POT-Creation-Date: 2012-05-15 13:27+\n
+POT-Creation-Date: 2012-09-30 18:27+\n
 PO-Revision-Date: 2012-04-27 15:49+0100\n
 Last-Translator: Nuno Miguel nunom...@gmail.com\n
 Language-Team: \n
@@ -254,7 +254,7 @@ msgstr Informações da versão
 #: ../dialogs/display-settings/main.c:1043
 #: ../dialogs/keyboard-settings/main.c:76 ../dialogs/mime-settings/main.c:62
 #: ../dialogs/mouse-settings/main.c:1597 ../xfce4-settings-editor/main.c:63
-#: ../xfsettingsd/main.c:173 ../xfce4-settings-manager/main.c:60
+#: ../xfsettingsd/main.c:187 ../xfce4-settings-manager/main.c:60
 #, c-format
 msgid Type '%s --help' for usage.
 msgstr Digite '%s --help' para informações de utilização.
@@ -264,7 +264,7 @@ msgstr Digite '%s --help' para informações de utilização.
 #: ../dialogs/display-settings/main.c:1062
 #: ../dialogs/keyboard-settings/main.c:92 ../dialogs/mime-settings/main.c:81
 #: ../dialogs/mouse-settings/main.c:1616 ../xfce4-settings-editor/main.c:82
-#: ../xfsettingsd/main.c:189 ../xfce4-settings-manager/main.c:76
+#: ../xfsettingsd/main.c:203 ../xfce4-settings-manager/main.c:76
 msgid The Xfce development team. All rights reserved.
 msgstr A equipa de desenvolvimento do Xfce. Todos os direitos reservados.
 
@@ -273,7 +273,7 @@ msgstr A equipa de desenvolvimento do Xfce. Todos os 
direitos reservados.
 #: ../dialogs/display-settings/main.c:1063
 #: ../dialogs/keyboard-settings/main.c:93 ../dialogs/mime-settings/main.c:82
 #: ../dialogs/mouse-settings/main.c:1617 ../xfce4-settings-editor/main.c:83
-#: ../xfsettingsd/main.c:190 ../xfce4-settings-manager/main.c:77
+#: ../xfsettingsd/main.c:204 ../xfce4-settings-manager/main.c:77
 #, c-format
 msgid Please report bugs to %s.
 msgstr Por favor, reporte os erros em %s.
@@ -768,62 +768,82 @@ msgstr _Comportamento
 msgid Blink _delay:
 msgstr Intervalo _de intermitência:
 
+# Automatically copied. Please review and remove fuzzy flag.
 #: ../dialogs/keyboard-settings/keyboard-dialog.glade.h:4
+msgid Change layout option
+msgstr Alterar opção de esquema
+
+# Automatically copied. Please review and remove fuzzy flag.
+#: ../dialogs/keyboard-settings/keyboard-dialog.glade.h:5
+msgid Compose key
+msgstr Chave composta
+
+#: ../dialogs/keyboard-settings/keyboard-dialog.glade.h:6
 msgid Cursor
 msgstr Cursor
 
-#: ../dialogs/keyboard-settings/keyboard-dialog.glade.h:5
+#: ../dialogs/keyboard-settings/keyboard-dialog.glade.h:7
 msgid Define _shortcuts for launching applications:
 msgstr Definir atal_hos para iniciar as aplicações:
 
-#: ../dialogs/keyboard-settings/keyboard-dialog.glade.h:6
+#: ../dialogs/keyboard-settings/keyboard-dialog.glade.h:8
 #: ../dialogs/keyboard-settings/xfce-keyboard-settings.desktop.in.h:1
 msgid Edit keyboard settings and application shortcuts
 msgstr Editar definições do teclado e atalhos das aplicações
 
-#: ../dialogs/keyboard-settings/keyboard-dialog.glade.h:7
+#: ../dialogs/keyboard-settings/keyboard-dialog.glade.h:9
 #: ../dialogs/mouse-settings/mouse-dialog.glade.h:16
 msgid General
 msgstr Geral
 
-#: ../dialogs/keyboard-settings/keyboard-dialog.glade.h:8
+#: ../dialogs/keyboard-settings/keyboard-dialog.glade.h:10
 #: ../dialogs/keyboard-settings/xfce-keyboard-settings.desktop.in.h:2
 msgid Keyboard
 msgstr Teclado
 
-#: ../dialogs/keyboard-settings/keyboard-dialog.glade.h:9
+#: ../dialogs/keyboard-settings/keyboard-dialog.glade.h:11
 msgid Keyboard layout
 msgstr Esquema do teclado
 
-#: ../dialogs/keyboard-settings/keyboard-dialog.glade.h:10
+#: ../dialogs/keyboard-settings/keyboard-dialog.glade.h:12
 msgid Keyboard layout selection
 msgstr Seleção do esquema do teclado
 
-#: ../dialogs/keyboard-settings/keyboard-dialog.glade.h:11
+#: ../dialogs/keyboard-settings/keyboard-dialog.glade.h:13
 msgid Keyboard model
 msgstr Modelo do teclado
 
-#: ../dialogs/keyboard-settings/keyboard-dialog.glade.h:12
+# Automatically copied. Please review and remove fuzzy flag.
+#: ../dialogs/keyboard-settings/keyboard-dialog.glade.h:14
+msgid Move currently selected item down by one row
+msgstr Mover o item atualmente selecionado uma linha para baixo
+
+# Automatically copied. Please review and remove fuzzy flag.
+#: 

[Xfce4-commits] xfce4-settings:bluesabre/display-settings Xsettingsd: Unset input method properties (bug #5437).

[Nick Schermer]

Updating branch refs/heads/bluesabre/display-settings
 to adf990f6e3688b8471a969420acbeb58c57fed3a (commit)
   from 2d7524c2783943d7b16e8fe71154e170ad49 (commit)

commit adf990f6e3688b8471a969420acbeb58c57fed3a
Author: Nick Schermer n...@xfce.org
Date:   Wed Sep 26 18:31:14 2012 +0200

Xsettingsd: Unset input method properties (bug #5437).

 xfsettingsd/xsettings.xml |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/xfsettingsd/xsettings.xml b/xfsettingsd/xsettings.xml
index 8f9e2eb..0a579d6 100644
--- a/xfsettingsd/xsettings.xml
+++ b/xfsettingsd/xsettings.xml
@@ -33,13 +33,13 @@
 property name=KeyThemeName type=string value=/
 property name=ToolbarStyle type=string value=icons/
 property name=ToolbarIconSize type=int value=3/
-property name=IMPreeditStyle type=string value=/
-property name=IMStatusStyle type=string value=/
+!-- property name=IMPreeditStyle type=string value=/ --
+!-- property name=IMStatusStyle type=string value=/ --
+!-- property name=IMModule type=string value=/ --
 property name=MenuImages type=bool value=true/
 property name=ButtonImages type=bool value=true/
 property name=MenuBarAccel type=string value=F10/
 property name=CursorThemeName type=string value=/
 property name=CursorThemeSize type=int value=0/
-property name=IMModule type=string value=/
   /property
 /channel
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] xfce4-settings:bluesabre/display-settings Fixed fill options for Position.

[Nick Schermer]

Updating branch refs/heads/bluesabre/display-settings
 to 55f46009289f8a7ccd336a9ea5e2ab3d06a1a81d (commit)
   from 544a97d69a6872dd43d545428bd33e10aedbbe6a (commit)

commit 55f46009289f8a7ccd336a9ea5e2ab3d06a1a81d
Author: Sean Davis smd.seanda...@gmail.com
Date:   Tue Sep 25 10:02:22 2012 -0400

Fixed fill options for Position.

 dialogs/display-settings/display-dialog.glade |1 +
 1 file changed, 1 insertion(+)

diff --git a/dialogs/display-settings/display-dialog.glade 
b/dialogs/display-settings/display-dialog.glade
index b6632a8..8bce601 100644
--- a/dialogs/display-settings/display-dialog.glade
+++ b/dialogs/display-settings/display-dialog.glade
@@ -287,6 +287,7 @@
 property name=right_attach2/property
 property name=top_attach2/property
 property name=bottom_attach3/property
+property name=y_optionsGTK_FILL/property
   /packing
 /child
   /object
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] xfce4-settings:bluesabre/display-settings Set up the position comboboxes for extended desktop mode The signals and combos are there, but some of it is just proof-of-concept

[Nick Schermer]

Updating branch refs/heads/bluesabre/display-settings
 to 5d5b8f596b8a29b72f2d3dac2c26b216fe0872e1 (commit)
   from 16dd3b15075d98ba9b539b9243684a01a366cc0c (commit)

commit 5d5b8f596b8a29b72f2d3dac2c26b216fe0872e1
Author: Simon Steinbeiss simon.steinbe...@elfenbeinturm.at
Date:   Mon Sep 24 23:29:22 2012 +0200

Set up the position comboboxes for extended desktop mode
The signals and combos are there, but some of it is just proof-of-concept

 dialogs/display-settings/display-dialog.glade |   47 --
 dialogs/display-settings/main.c   |  217 -
 2 files changed, 250 insertions(+), 14 deletions(-)

diff --git a/dialogs/display-settings/display-dialog.glade 
b/dialogs/display-settings/display-dialog.glade
index f3d5da0..b6632a8 100644
--- a/dialogs/display-settings/display-dialog.glade
+++ b/dialogs/display-settings/display-dialog.glade
@@ -151,19 +151,6 @@
   /packing
 /child
 child
-  object class=GtkComboBox id=randr-position
-property name=visibleTrue/property
-property name=can_focusFalse/property
-  /object
-  packing
-property name=left_attach1/property
-property name=right_attach2/property
-property name=top_attach2/property
-property name=bottom_attach3/property
-property name=y_optionsGTK_FILL/property
-  /packing
-/child
-child
   object class=GtkLabel id=label-reflection
 property name=can_focusFalse/property
 property name=xalign0/property
@@ -268,6 +255,40 @@
 property name=y_optionsGTK_FILL/property
   /packing
 /child
+child
+  object class=GtkHBox id=hbox1
+property name=visibleTrue/property
+property name=can_focusFalse/property
+child
+  object class=GtkComboBox id=randr-position
+property name=visibleTrue/property
+property name=can_focusFalse/property
+  /object
+  packing
+property name=expandTrue/property
+property name=fillTrue/property
+property name=position0/property
+  /packing
+/child
+child
+  object class=GtkComboBox id=randr-active-displays
+property name=visibleTrue/property
+property name=can_focusFalse/property
+  /object
+  packing
+property name=expandTrue/property
+property name=fillTrue/property
+property name=position1/property
+  /packing
+/child
+  /object
+  packing
+property name=left_attach1/property
+property name=right_attach2/property
+property name=top_attach2/property
+property name=bottom_attach3/property
+  /packing
+/child
   /object
   packing
 property name=expandTrue/property
diff --git a/dialogs/display-settings/main.c b/dialogs/display-settings/main.c
index 836daea..96daaf6 100644
--- a/dialogs/display-settings/main.c
+++ b/dialogs/display-settings/main.c
@@ -233,7 +233,123 @@ display_setting_timed_confirmation (GtkBuilder 
*main_builder)
 return ((response_id == 2) ? TRUE : FALSE);
 }
 
+static void
+display_setting_positions_changed (GtkComboBox *combobox,
+ GtkBuilder  *builder)
+{
+gint value;
+
+if (!display_setting_combo_box_get_value (combobox, value))
+return;
+}
+
+static void
+display_setting_positions_populate (GtkBuilder *builder)
+{
+GtkTreeModel *model;
+GObject  *combobox;
+GtkTreeIter   iter;
+
+/* Get the positions combo box store and clear it */
+combobox = gtk_builder_get_object (builder, randr-position);
+model = gtk_combo_box_get_model (GTK_COMBO_BOX (combobox));
+gtk_list_store_clear (GTK_LIST_STORE (model));
+
+/* Only make the combobox interactive if there is more than one output */
+if (display_settings_get_n_active_outputs ()  1)
+{
+gtk_widget_set_sensitive (GTK_WIDGET (combobox), TRUE);
+return;
+}
+else
+gtk_widget_set_sensitive (GTK_WIDGET (combobox), FALSE);
+
+/* Disconnect the changed signal to avoid triggering the confirmation
+ * dialog */
+g_object_disconnect (combobox, any_signal::changed,
+  

[Xfce4-commits] xfce4-settings:bluesabre/display-settings l10n: Updated Uyghur (ug) translation to 100%

[Transifex]

Updating branch refs/heads/bluesabre/display-settings
 to 68324bb287d1c9536df813609db53963005afdf4 (commit)
   from 42da85059612221482486ce385a1bb1d16a3b584 (commit)

commit 68324bb287d1c9536df813609db53963005afdf4
Author: Gheyret Kenji ghey...@yahoo.com
Date:   Wed Oct 24 05:19:16 2012 +0200

l10n: Updated Uyghur (ug) translation to 100%

New status: 336 messages complete with 0 fuzzies and 0 untranslated.

Transmitted-via: Transifex (translations.xfce.org).

 po/ug.po |  153 --
 1 file changed, 39 insertions(+), 114 deletions(-)

diff --git a/po/ug.po b/po/ug.po
index a0d5994..3d5c224 100644
--- a/po/ug.po
+++ b/po/ug.po
@@ -2,7 +2,7 @@
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
 # Gheyret Kenji ghey...@gmail.com, 2012.
-# 
+#
 msgid 
 msgstr 
 Project-Id-Version: xfce4-settings\n
@@ -38,8 +38,7 @@ msgstr ياردەم ئىقتىدارى
 msgid 
 Assistive technologies will be available the\n
 next time you login
-msgstr 
-ياردەمچى تېخنىكىلارنى كېيىنكى قېتىم كىرگەندە\n
+msgstr ياردەمچى تېخنىكىلارنى كېيىنكى قېتىم كىرگەندە\n
 ئىشلەتكىلى بولىدۇ
 
 #: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:7
@@ -58,9 +57,7 @@ msgstr 2 دانە كۇنۇپكا بېسىلغاندا چاپلىشاڭغۇ كۇ
 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:11
 msgid K_eystroke delay:
@@ -110,23 +107,17 @@ msgstr تېزلىتىلگەندىن كېيىنكى چاشقىنەك ئىستر
 
 #: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:22
 msgid The ramp used to reach maximum pointer speed
-msgstr 
-چاشقىنەك ئىسترېلكىسىنىڭ ئەڭ چوڭ تېزلىككە يېتىشكۈچە بولغان ئارىلىقتىكى 
-تېزلىنىشى
+msgstr چاشقىنەك ئىسترېلكىسىنىڭ ئەڭ چوڭ تېزلىككە يېتىشكۈچە بولغان ئارىلىقتىكى 
تېزلىنىشى
 
 #: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:23
 msgid The time, in milliseconds, between repeated motion events
-msgstr 
-كۇنۇپكا بېسىلىپ تۇرغاندا تەكرار مەشغۇلاتنى ئېلىپ بېرىش ئىنتېرۋالى
-(مىللىسېكۇنت ms)
+msgstr كۇنۇپكا بېسىلىپ تۇرغاندا تەكرار مەشغۇلاتنى ئېلىپ بېرىش 
ئىنتېرۋالى(مىللىسېكۇنت ms)
 
 #: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:24
 msgid 
 The time, in milliseconds, between the initial key press and first repeated 
 motion event
-msgstr 
-كۇنۇپكا تۈننى قېتىم بېسىلىپ، ئۈزلۈكسىز بېسىلىپ تۇرۇۋاتىدۇ دەپ ھۆكۈم 
-قىلىنغۇچە بولغان ۋاقىت(مىللىسېكۇنت ms)
+msgstr كۇنۇپكا تۈننى قېتىم بېسىلىپ، ئۈزلۈكسىز بېسىلىپ تۇرۇۋاتىدۇ دەپ ھۆكۈم 
قىلىنغۇچە بولغان ۋاقىت(مىللىسېكۇنت ms)
 
 #: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:25
 msgid The time, in milliseconds, to get to maximum speed
@@ -136,18 +127,13 @@ 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:27
 msgid 
 To help prevent accidental multiple keystrokes, bounce keys imposes a 
 minimum delay between keystrokes
-msgstr 
-خاتا بېسىلىپ قېلىشتىن ساقلىنىش ئۈچۈن ئىشلىتىلىدۇ. سەكرىمە كۇنۇپكىلار كۇنۇپكا 
-بېسىلىپ مەلۇم ۋاقىت ئۆتكەندىن كېيىن كېيىنكى كۇنۇپكا بېسىلمىسا قوبۇل 
-قىلىنمايدۇ.
+msgstr خاتا بېسىلىپ قېلىشتىن ساقلىنىش ئۈچۈن ئىشلىتىلىدۇ. سەكرىمە كۇنۇپكىلار 
كۇنۇپكا بېسىلىپ مەلۇم ۋاقىت ئۆتكەندىن كېيىن كېيىنكى كۇنۇپكا بېسىلمىسا قوبۇل 
قىلىنمايدۇ.
 
 #: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:28
 msgid Use _bounce keys
@@ -166,36 +152,25 @@ msgid 
 When selected, modifier keys (such as Control, Alt, and Shift) do not need 
 to be held down (they can be pressed and then released) when multiple keys 
 would normally need to be pressed at the same time
-msgstr 
-بۇ تاللانما تاللانسا، سۈپەتلىگۈچى كۇنۇپكىلار(Control، Alt، ۋە Shift 
-قاتارلىقلار) بېسىلىپ قويۇۋېتىلسىمۇ، بېسىلغان ھالىتى ساقلىنىپ قېلىنىدۇ. شۇڭا 
-سۈپەتلىگۈچى كۇنۇپكىلار بىلەن باشقا كۇنۇپكىلار تەڭ بېسىلغاندەك مەشغۇلاتنى 
-ئېلىپ بېرىشقا بولىدۇ.
+msgstr بۇ تاللانما تاللانسا، سۈپەتلىگۈچى كۇنۇپكىلار(Control، Alt، ۋە Shift 
قاتارلىقلار) بېسىلىپ قويۇۋېتىلسىمۇ، بېسىلغان ھالىتى ساقلىنىپ قېلىنىدۇ. شۇڭا 
سۈپەتلىگۈچى كۇنۇپكىلار بىلەن باشقا كۇنۇپكىلار تەڭ بېسىلغاندەك مەشغۇلاتنى ئېلىپ 
بېرىشقا بولىدۇ.
 
 #: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:32
 msgid 
 

[Xfce4-commits] xfce4-settings:bluesabre/display-settings l10n: Updated Hungarian (hu) translation to 98%

[Transifex]

Updating branch refs/heads/bluesabre/display-settings
 to 62ced46be1b5d0afd0f1e9ac2799747541cfc42e (commit)
   from adf990f6e3688b8471a969420acbeb58c57fed3a (commit)

commit 62ced46be1b5d0afd0f1e9ac2799747541cfc42e
Author: László Horváth leslie.transl...@yahoo.co.uk
Date:   Thu Sep 27 19:08:37 2012 +0200

l10n: Updated Hungarian (hu) translation to 98%

New status: 331 messages complete with 5 fuzzies and 0 untranslated.

Transmitted-via: Transifex (translations.xfce.org).

 po/hu.po |  328 ++
 1 file changed, 178 insertions(+), 150 deletions(-)

diff --git a/po/hu.po b/po/hu.po
index cc50960..5e043ff 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -1,23 +1,23 @@
 # Hungarian translation of xfce4-settings
 # Copyright (C) 2009, 2010, 2012. Free Software Foundation, Inc.
 # This file is distributed under the same license as the xfce4-settings 
package.
-#
+# 
 # SZERVÁC Attila sas@321, 2004-2009.
 # Gabor Kelemen kelemeng at gnome dot hu, 2009, 2010, 2012.
 msgid 
 msgstr 
 Project-Id-Version: xfce4-settings\n
 Report-Msgid-Bugs-To: \n
-POT-Creation-Date: 2012-04-19 09:06+\n
+POT-Creation-Date: 2012-09-27 15:33+\n
 PO-Revision-Date: 2012-04-21 04:52+0200\n
 Last-Translator: Gabor Kelemen kelemeng at gnome dot hu\n
 Language-Team: Hungarian gnome-hu-list at gnome dot org\n
-Language: \n
 MIME-Version: 1.0\n
 Content-Type: text/plain; charset=UTF-8\n
 Content-Transfer-Encoding: 8bit\n
+Language: \n
+Plural-Forms: nplurals=2; plural=(n != 1);\n
 X-Generator: KBabel 1.11.4\n
-Plural-Forms:  nplurals=2; plural=(n != 1);\n
 
 #: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:1
 msgid Acceleration _profile:
@@ -98,13 +98,15 @@ msgstr Ragadós billentyűk
 
 #: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:19
 msgid The amount of time, in milliseconds, required between keystrokes
-msgstr A billentyűleütések között ennyi időnek kell eltelnie 
ezredmásodpercben
+msgstr 
+A billentyűleütések között ennyi időnek kell eltelnie ezredmásodpercben
 
 #: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:20
 msgid 
 The amount of time, in milliseconds, that must elapse before a keystroke 
 will be accepted
-msgstr A billentyűleütés elfogadásáig ennyi időnek kell eltelnie 
ezredmásodpercben
+msgstr 
+A billentyűleütés elfogadásáig ennyi időnek kell eltelnie ezredmásodpercben
 
 #: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:21
 msgid The maximum pointer speed after acceleration
@@ -189,7 +191,8 @@ msgstr 
 msgid 
 When selected, the mouse pointer can be controlled using the keyboard number 
 pad
-msgstr Az egérmutató a billentyűzet számmezejének segítségével lesz 
irányítható
+msgstr 
+Az egérmutató a billentyűzet számmezejének segítségével lesz irányítható
 
 #: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:35
 msgid _Acceleration delay:
@@ -250,8 +253,8 @@ msgstr Verzióinformációk
 #: ../dialogs/appearance-settings/main.c:966
 #: ../dialogs/display-settings/main.c:1043
 #: ../dialogs/keyboard-settings/main.c:76 ../dialogs/mime-settings/main.c:62
-#: ../dialogs/mouse-settings/main.c:1526 ../xfce4-settings-editor/main.c:63
-#: ../xfsettingsd/main.c:173 ../xfce4-settings-manager/main.c:60
+#: ../dialogs/mouse-settings/main.c:1597 ../xfce4-settings-editor/main.c:63
+#: ../xfsettingsd/main.c:187 ../xfce4-settings-manager/main.c:60
 #, c-format
 msgid Type '%s --help' for usage.
 msgstr Segítségért adja ki az „%s --help” parancsot.
@@ -260,8 +263,8 @@ msgstr Segítségért adja ki az „%s --help” parancsot.
 #: ../dialogs/appearance-settings/main.c:985
 #: ../dialogs/display-settings/main.c:1062
 #: ../dialogs/keyboard-settings/main.c:92 ../dialogs/mime-settings/main.c:81
-#: ../dialogs/mouse-settings/main.c:1545 ../xfce4-settings-editor/main.c:82
-#: ../xfsettingsd/main.c:189 ../xfce4-settings-manager/main.c:76
+#: ../dialogs/mouse-settings/main.c:1616 ../xfce4-settings-editor/main.c:82
+#: ../xfsettingsd/main.c:203 ../xfce4-settings-manager/main.c:76
 msgid The Xfce development team. All rights reserved.
 msgstr Az Xfce fejlesztőcsapata. Minden jog fenntartva.
 
@@ -269,8 +272,8 @@ msgstr Az Xfce fejlesztőcsapata. Minden jog fenntartva.
 #: ../dialogs/appearance-settings/main.c:986
 #: ../dialogs/display-settings/main.c:1063
 #: ../dialogs/keyboard-settings/main.c:93 ../dialogs/mime-settings/main.c:82
-#: ../dialogs/mouse-settings/main.c:1546 ../xfce4-settings-editor/main.c:83
-#: ../xfsettingsd/main.c:190 ../xfce4-settings-manager/main.c:77
+#: ../dialogs/mouse-settings/main.c:1617 ../xfce4-settings-editor/main.c:83
+#: ../xfsettingsd/main.c:204 ../xfce4-settings-manager/main.c:77
 #, c-format
 msgid Please report bugs to %s.
 msgstr A hibákat ide jelentse: %s.
@@ -280,7 +283,8 @@ msgid Improve keyboard and mouse accessibility
 msgstr Billentyűzet és egér akadálymentesítésének javítása
 
 #: ../dialogs/appearance-settings/appearance-dialog.glade.h:1
-msgid 

[Xfce4-commits] xfce4-settings:bluesabre/display-settings l10n: Updated Arabic (ar) translation to 100%

[Transifex]

Updating branch refs/heads/bluesabre/display-settings
 to eb85045030f7adc2bada1e989ece718a3a883533 (commit)
   from 4c4efe90497763eb8fff29a659f57cfb163df0ff (commit)

commit eb85045030f7adc2bada1e989ece718a3a883533
Author: محمد الحرقان malh...@gmail.com
Date:   Thu Oct 4 22:57:47 2012 +0200

l10n: Updated Arabic (ar) translation to 100%

New status: 336 messages complete with 0 fuzzies and 0 untranslated.

Transmitted-via: Transifex (translations.xfce.org).

 po/ar.po |  143 ++
 1 file changed, 70 insertions(+), 73 deletions(-)

diff --git a/po/ar.po b/po/ar.po
index c14164f..4593566 100644
--- a/po/ar.po
+++ b/po/ar.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # mohammad malh...@gmail.com, 2012.
 # كريم أولاد الشلحة herr.linu...@gmail.com, 2012.
+# محمد الحرقان malh...@gmail.com, 2012.
 msgid 
 msgstr 
 Project-Id-Version: Xfce4-settings\n
 Report-Msgid-Bugs-To: \n
-POT-Creation-Date: 2012-05-22 11:18+\n
-PO-Revision-Date: 2012-05-22 19:26+0300\n
-Last-Translator: mohammad malh...@gmail.com\n
+POT-Creation-Date: 2012-10-04 18:45+\n
+PO-Revision-Date: 2012-10-04 23:57+0300\n
+Last-Translator: محمد الحرقان malh...@gmail.com\n
 Language-Team: http://www.vertaal.com.ar/files/factory/ar/list/\n;
 Language: ar\n
 MIME-Version: 1.0\n
@@ -249,7 +250,7 @@ msgstr معلومات النسخة
 #: ../dialogs/display-settings/main.c:1043
 #: ../dialogs/keyboard-settings/main.c:76 ../dialogs/mime-settings/main.c:62
 #: ../dialogs/mouse-settings/main.c:1597 ../xfce4-settings-editor/main.c:63
-#: ../xfsettingsd/main.c:173 ../xfce4-settings-manager/main.c:60
+#: ../xfsettingsd/main.c:187 ../xfce4-settings-manager/main.c:60
 #, c-format
 msgid Type '%s --help' for usage.
 msgstr أكتب '%s --help' لإستعمال.
@@ -259,7 +260,7 @@ msgstr أكتب '%s --help' لإستعمال.
 #: ../dialogs/display-settings/main.c:1062
 #: ../dialogs/keyboard-settings/main.c:92 ../dialogs/mime-settings/main.c:81
 #: ../dialogs/mouse-settings/main.c:1616 ../xfce4-settings-editor/main.c:82
-#: ../xfsettingsd/main.c:189 ../xfce4-settings-manager/main.c:76
+#: ../xfsettingsd/main.c:203 ../xfce4-settings-manager/main.c:76
 msgid The Xfce development team. All rights reserved.
 msgstr فريق تطوير إكسفس. كل الحقوق محفوظة.
 
@@ -268,7 +269,7 @@ msgstr فريق تطوير إكسفس. كل الحقوق محفوظة.
 #: ../dialogs/display-settings/main.c:1063
 #: ../dialogs/keyboard-settings/main.c:93 ../dialogs/mime-settings/main.c:82
 #: ../dialogs/mouse-settings/main.c:1617 ../xfce4-settings-editor/main.c:83
-#: ../xfsettingsd/main.c:190 ../xfce4-settings-manager/main.c:77
+#: ../xfsettingsd/main.c:204 ../xfce4-settings-manager/main.c:77
 #, c-format
 msgid Please report bugs to %s.
 msgstr الرجاء الإبلاغ عن الخلل في %s.
@@ -745,62 +746,82 @@ msgstr سلوك
 msgid Blink _delay:
 msgstr مهلة الوميض:
 
+# Automatically copied. Please review and remove fuzzy flag.
 #: ../dialogs/keyboard-settings/keyboard-dialog.glade.h:4
+msgid Change layout option
+msgstr تغيير خيارات التخطيط
+
+# Automatically copied. Please review and remove fuzzy flag.
+#: ../dialogs/keyboard-settings/keyboard-dialog.glade.h:5
+msgid Compose key
+msgstr إعداد موقع المفتاح
+
+#: ../dialogs/keyboard-settings/keyboard-dialog.glade.h:6
 msgid Cursor
 msgstr المؤشر
 
-#: ../dialogs/keyboard-settings/keyboard-dialog.glade.h:5
+#: ../dialogs/keyboard-settings/keyboard-dialog.glade.h:7
 msgid Define _shortcuts for launching applications:
 msgstr تعريف إختصارات بدء التطبيقات:
 
-#: ../dialogs/keyboard-settings/keyboard-dialog.glade.h:6
+#: ../dialogs/keyboard-settings/keyboard-dialog.glade.h:8
 #: ../dialogs/keyboard-settings/xfce-keyboard-settings.desktop.in.h:1
 msgid Edit keyboard settings and application shortcuts
 msgstr تحرير إعدادات لوحة المفاتيح واختصارات التطبيقات
 
-#: ../dialogs/keyboard-settings/keyboard-dialog.glade.h:7
+#: ../dialogs/keyboard-settings/keyboard-dialog.glade.h:9
 #: ../dialogs/mouse-settings/mouse-dialog.glade.h:16
 msgid General
 msgstr عام
 
-#: ../dialogs/keyboard-settings/keyboard-dialog.glade.h:8
+#: ../dialogs/keyboard-settings/keyboard-dialog.glade.h:10
 #: ../dialogs/keyboard-settings/xfce-keyboard-settings.desktop.in.h:2
 msgid Keyboard
 msgstr لوحة المفاتيح
 
-#: ../dialogs/keyboard-settings/keyboard-dialog.glade.h:9
+#: ../dialogs/keyboard-settings/keyboard-dialog.glade.h:11
 msgid Keyboard layout
 msgstr مبدّل تخطيط لوحة المفاتيح
 
-#: ../dialogs/keyboard-settings/keyboard-dialog.glade.h:10
+#: ../dialogs/keyboard-settings/keyboard-dialog.glade.h:12
 msgid Keyboard layout selection
 msgstr محدد مبدّل تخطيط لوحة المفاتيح
 
-#: ../dialogs/keyboard-settings/keyboard-dialog.glade.h:11
+#: ../dialogs/keyboard-settings/keyboard-dialog.glade.h:13
 msgid Keyboard model
 msgstr نموذج لوحة المفاتيح
 
-#: ../dialogs/keyboard-settings/keyboard-dialog.glade.h:12
+# Automatically copied. Please review and remove fuzzy flag.
+#: 

[Xfce4-commits] xfce4-settings:bluesabre/display-settings l10n: Updated Polish (pl) translation to 98%

[Transifex]

Updating branch refs/heads/bluesabre/display-settings
 to 01f1996378531895f413761e20c88c7ae1521dda (commit)
   from afa79de4dfda99e58bb55efb07c021e6c71e9a6c (commit)

commit 01f1996378531895f413761e20c88c7ae1521dda
Author: Kamil Polczak elderl...@gmail.com
Date:   Wed Oct 17 20:04:46 2012 +0200

l10n: Updated Polish (pl) translation to 98%

New status: 332 messages complete with 4 fuzzies and 0 untranslated.

Transmitted-via: Transifex (translations.xfce.org).

 po/pl.po |   10 --
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/po/pl.po b/po/pl.po
index fd40794..9ef8710 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -8,7 +8,7 @@ msgid 
 msgstr 
 Project-Id-Version: xfce4-settings 4.7.7\n
 Report-Msgid-Bugs-To: \n
-POT-Creation-Date: 2012-09-02 11:00+\n
+POT-Creation-Date: 2012-10-17 17:03+\n
 PO-Revision-Date: 2012-04-12 11:16+0200\n
 Last-Translator: Piotr Sokół pso...@jabster.pl\n
 Language-Team: polski \n
@@ -254,7 +254,7 @@ msgstr Wypisuje informacje o wersji i kończy
 #: ../dialogs/display-settings/main.c:1043
 #: ../dialogs/keyboard-settings/main.c:76 ../dialogs/mime-settings/main.c:62
 #: ../dialogs/mouse-settings/main.c:1597 ../xfce4-settings-editor/main.c:63
-#: ../xfsettingsd/main.c:173 ../xfce4-settings-manager/main.c:60
+#: ../xfsettingsd/main.c:187 ../xfce4-settings-manager/main.c:60
 #, c-format
 msgid Type '%s --help' for usage.
 msgstr Proszę wprowadzić „%s --help”, aby wypisać komunikat pomocy.
@@ -264,7 +264,7 @@ msgstr Proszę wprowadzić „%s --help”, aby wypisać 
komunikat pomocy.
 #: ../dialogs/display-settings/main.c:1062
 #: ../dialogs/keyboard-settings/main.c:92 ../dialogs/mime-settings/main.c:81
 #: ../dialogs/mouse-settings/main.c:1616 ../xfce4-settings-editor/main.c:82
-#: ../xfsettingsd/main.c:189 ../xfce4-settings-manager/main.c:76
+#: ../xfsettingsd/main.c:203 ../xfce4-settings-manager/main.c:76
 msgid The Xfce development team. All rights reserved.
 msgstr Zespół twórców środowiska Xfce. Wszystkie prawa zastrzeżone.
 
@@ -273,7 +273,7 @@ msgstr Zespół twórców środowiska Xfce. Wszystkie prawa 
zastrzeżone.
 #: ../dialogs/display-settings/main.c:1063
 #: ../dialogs/keyboard-settings/main.c:93 ../dialogs/mime-settings/main.c:82
 #: ../dialogs/mouse-settings/main.c:1617 ../xfce4-settings-editor/main.c:83
-#: ../xfsettingsd/main.c:190 ../xfce4-settings-manager/main.c:77
+#: ../xfsettingsd/main.c:204 ../xfce4-settings-manager/main.c:77
 #, c-format
 msgid Please report bugs to %s.
 msgstr Proszę zgłaszać błędy na adres %s.
@@ -805,13 +805,11 @@ msgstr Model
 
 # Automatically copied. Please review and remove fuzzy flag.
 #: ../dialogs/keyboard-settings/keyboard-dialog.glade.h:14
-#, fuzzy
 msgid Move currently selected item down by one row
 msgstr Przemieszcza wybrany element jeden wiersz w dół
 
 # Automatically copied. Please review and remove fuzzy flag.
 #: ../dialogs/keyboard-settings/keyboard-dialog.glade.h:15
-#, fuzzy
 msgid Move currently selected item up by one row
 msgstr Przemieszcza wybrany element jeden wiersz w górę
 
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] xfce4-settings:bluesabre/display-settings l10n: Updated Polish (pl) translation to 99%

[Transifex]

Updating branch refs/heads/bluesabre/display-settings
 to 42da85059612221482486ce385a1bb1d16a3b584 (commit)
   from 01f1996378531895f413761e20c88c7ae1521dda (commit)

commit 42da85059612221482486ce385a1bb1d16a3b584
Author: Michał Jeż michal.j...@gmail.com
Date:   Mon Oct 22 10:14:06 2012 +0200

l10n: Updated Polish (pl) translation to 99%

New status: 333 messages complete with 3 fuzzies and 0 untranslated.

Transmitted-via: Transifex (translations.xfce.org).

 po/pl.po |3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/po/pl.po b/po/pl.po
index 9ef8710..56bb58a 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -8,7 +8,7 @@ msgid 
 msgstr 
 Project-Id-Version: xfce4-settings 4.7.7\n
 Report-Msgid-Bugs-To: \n
-POT-Creation-Date: 2012-10-17 17:03+\n
+POT-Creation-Date: 2012-10-22 04:03+\n
 PO-Revision-Date: 2012-04-12 11:16+0200\n
 Last-Translator: Piotr Sokół pso...@jabster.pl\n
 Language-Team: polski \n
@@ -1154,7 +1154,6 @@ msgid Enable hori_zontal scrolling
 msgstr Przewijanie w p_oziomie
 
 #: ../dialogs/mouse-settings/mouse-dialog.glade.h:17
-#, fuzzy
 msgid Half (left-handed)
 msgstr _Leworęczny
 
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] xfce4-settings:bluesabre/display-settings Fixed above and left positioning.

[Nick Schermer]

Updating branch refs/heads/bluesabre/display-settings
 to 7c45c31da0a14f22dc1aec02e94361674fac68e3 (commit)
   from 37d456cf9f52bcddcf8d009af909ff4b69331bc2 (commit)

commit 7c45c31da0a14f22dc1aec02e94361674fac68e3
Author: Sean Davis smd.seanda...@gmail.com
Date:   Wed Sep 26 18:29:56 2012 -0400

Fixed above and left positioning.

 dialogs/display-settings/main.c |   10 +-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/dialogs/display-settings/main.c b/dialogs/display-settings/main.c
index 2c17dfe..f7eacd9 100644
--- a/dialogs/display-settings/main.c
+++ b/dialogs/display-settings/main.c
@@ -265,7 +265,7 @@ display_setting_positions_changed (GtkComboBox *combobox,
 current_display = xfce_randr-active_output;
 
 switch (value) {
-case XFCE_RANDR_PLACEMENT_LEFT: // Extend Left FIXME
+case XFCE_RANDR_PLACEMENT_LEFT: // Extend Left
 /* Walk all supported modes of current display */
 modes = XFCE_RANDR_SUPPORTED_MODES (xfce_randr);
 for (n = 0; n  XFCE_RANDR_OUTPUT_INFO (xfce_randr)-nmode; ++n)
@@ -337,6 +337,12 @@ display_setting_positions_changed (GtkComboBox *combobox,
 break;
 }
 
+/* Apply and save changes to secondary display */
+xfce_randr-active_output = selected_display;
+xfce_randr_save_output (xfce_randr, Default, display_channel,
+xfce_randr-active_output);
+xfce_randr_apply (xfce_randr, Default, display_channel);
+
 /* Restore the current display to the primary display. */
 xfce_randr-active_output = current_display;
 
@@ -345,6 +351,8 @@ display_setting_positions_changed (GtkComboBox *combobox,
 xfce_randr-active_output);
 xfce_randr_apply (xfce_randr, Default, display_channel);
 
+
+
 }
 
 static void
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] xfce4-settings:bluesabre/display-settings Fix gloss in pixmap for extend-to-right

[Nick Schermer]

Updating branch refs/heads/bluesabre/display-settings
 to 544a97d69a6872dd43d545428bd33e10aedbbe6a (commit)
   from 5d5b8f596b8a29b72f2d3dac2c26b216fe0872e1 (commit)

commit 544a97d69a6872dd43d545428bd33e10aedbbe6a
Author: Simon Steinbeiss simon.steinbe...@elfenbeinturm.at
Date:   Mon Sep 24 23:32:27 2012 +0200

Fix gloss in pixmap for extend-to-right

 dialogs/display-settings/extend-right.png |  Bin 6059 - 5958 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/dialogs/display-settings/extend-right.png 
b/dialogs/display-settings/extend-right.png
index fc520dc..3fe963e 100644
Binary files a/dialogs/display-settings/extend-right.png and 
b/dialogs/display-settings/extend-right.png differ
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] xfce4-settings:bluesabre/display-settings Reduce the RandR calls for setting new display positions

[Nick Schermer]

Updating branch refs/heads/bluesabre/display-settings
 to 12143544084112a30e989f12e949b8e515a2b93c (commit)
   from bad30c37b680fd443c92c3f9d63202516a7dc238 (commit)

commit 12143544084112a30e989f12e949b8e515a2b93c
Author: Simon Steinbeiss simon.steinbe...@elfenbeinturm.at
Date:   Tue Oct 2 17:08:55 2012 +0200

Reduce the RandR calls for setting new display positions

 dialogs/display-settings/main.c |  143 ---
 1 file changed, 43 insertions(+), 100 deletions(-)

diff --git a/dialogs/display-settings/main.c b/dialogs/display-settings/main.c
index 57c8ae8..d99df8d 100644
--- a/dialogs/display-settings/main.c
+++ b/dialogs/display-settings/main.c
@@ -247,9 +247,9 @@ static void
 display_setting_positions_changed (GtkComboBox *combobox,
  GtkBuilder  *builder)
 {
-gint value, current_display, selected_display, selected_x, selected_y, 
old_x1, old_y1, old_x2, old_y2;
+gint value, current_display, current_x, current_y, selected_display, 
selected_x, selected_y;
 GObject *display_combobox;
-XfceRRMode   *current_mode;
+XfceRRMode   *current_mode, *selected_mode;
 
 display_combobox = gtk_builder_get_object(builder, 
randr-active-displays);
 
@@ -262,120 +262,65 @@ display_setting_positions_changed (GtkComboBox *combobox,
 /* Skip if the display combobox hasn't made a selection yet */
 if (selected_display == -1) return;
 
-/* Store the Current Display */
+/* Store the currently active display's position and mode */
 current_display = xfce_randr-active_output;
+current_mode = xfce_randr_find_mode_by_id (xfce_randr, current_display, 
XFCE_RANDR_MODE (xfce_randr));
+current_x = XFCE_RANDR_POS_X (xfce_randr);
+current_y = XFCE_RANDR_POS_Y (xfce_randr);
+
+/* Store the selected display's position and mode */
+xfce_randr-active_output = selected_display;
+selected_mode = xfce_randr_find_mode_by_id (xfce_randr, selected_display, 
XFCE_RANDR_MODE (xfce_randr));
+selected_x = XFCE_RANDR_POS_X (xfce_randr);
+selected_y = XFCE_RANDR_POS_Y (xfce_randr);
 
 switch (value) {
 case XFCE_RANDR_PLACEMENT_LEFT: // Extend Left
-current_mode = xfce_randr_find_mode_by_id (xfce_randr, 
xfce_randr-active_output, XFCE_RANDR_MODE (xfce_randr));
-
-/* Change active output to secondary display. */
-xfce_randr-active_output = selected_display;
-
-/* Move the primary to where the secondary is... */
-selected_x = XFCE_RANDR_POS_X (xfce_randr);
-selected_y = XFCE_RANDR_POS_Y (xfce_randr);
+/* Move the selected display to the right of the currently active 
display. */
+XFCE_RANDR_POS_X (xfce_randr) = current_mode-width;
 
+/* Move the currently active display to where the selected was */
 xfce_randr-active_output = current_display;
-
-/* Save positions to be able to restore */
-old_x2 = selected_x; old_y2 = selected_y;
-old_x1 = XFCE_RANDR_POS_X (xfce_randr);
-old_y1 = XFCE_RANDR_POS_Y (xfce_randr);
-
 XFCE_RANDR_POS_X (xfce_randr) = selected_x;
 XFCE_RANDR_POS_Y (xfce_randr) = selected_y;
-
 
-
-/* Move the secondary display to the right of the primary display. 
*/
-xfce_randr-active_output = selected_display;
-XFCE_RANDR_POS_X (xfce_randr) = current_mode-width;
 break;
 
 case XFCE_RANDR_PLACEMENT_RIGHT: // Extend Right
-/* Change active output to secondary display. */
-xfce_randr-active_output = selected_display;
-
-current_mode = xfce_randr_find_mode_by_id (xfce_randr, 
xfce_randr-active_output, XFCE_RANDR_MODE (xfce_randr));
+   /* Move the selected display to where the currently 
active one is */
+XFCE_RANDR_POS_X (xfce_randr) = current_x;
+XFCE_RANDR_POS_Y (xfce_randr) = current_y;
 
-/* Change active output to primary display. */
+/* Move the currently active display to the right of the selected 
display. */
 xfce_randr-active_output = current_display;
+XFCE_RANDR_POS_X (xfce_randr) = selected_mode-width;
 
-/* Move the secondary to where the primary is... */
-selected_x = XFCE_RANDR_POS_X (xfce_randr);
-selected_y = XFCE_RANDR_POS_Y (xfce_randr);
-xfce_randr-active_output = selected_display;
-
-/* Save positions to be able to restore */
-old_x1 = selected_x; old_y1 = selected_y;
-old_x2 = XFCE_RANDR_POS_X (xfce_randr);
-old_y2 = XFCE_RANDR_POS_Y (xfce_randr);
-
-XFCE_RANDR_POS_X (xfce_randr) = selected_x;
-

[Xfce4-commits] xfce4-settings:bluesabre/display-settings Updated glade files.

[Nick Schermer]

Updating branch refs/heads/bluesabre/display-settings
 to 9d926f57009155586ecaf7ca62af838e38015052 (commit)
   from 68324bb287d1c9536df813609db53963005afdf4 (commit)

commit 9d926f57009155586ecaf7ca62af838e38015052
Author: Sean Davis smd.seanda...@gmail.com
Date:   Thu Sep 13 16:14:25 2012 -0400

Updated glade files.

 dialogs/display-settings/confirmation-dialog.glade |  100 ++---
 dialogs/display-settings/display-dialog.glade  |  382 
 dialogs/display-settings/extend-left.png   |  Bin 0 - 5205 bytes
 dialogs/display-settings/extend-right.png  |  Bin 0 - 5358 bytes
 .../display-settings/minimal-display-dialog.glade  |  229 +++-
 dialogs/display-settings/mirror.png|  Bin 0 - 8382 bytes
 6 files changed, 417 insertions(+), 294 deletions(-)

diff --git a/dialogs/display-settings/confirmation-dialog.glade 
b/dialogs/display-settings/confirmation-dialog.glade
index dbf7c76..7b91c7a 100644
--- a/dialogs/display-settings/confirmation-dialog.glade
+++ b/dialogs/display-settings/confirmation-dialog.glade
@@ -1,26 +1,71 @@
-?xml version=1.0?
+?xml version=1.0 encoding=UTF-8?
 interface
-  !-- interface-requires gtk+ 2.12 --
+  requires lib=gtk+ version=2.24/
   !-- interface-naming-policy project-wide --
   object class=GtkDialog id=dialog1
+property name=can_focusFalse/property
 property name=border_width5/property
 property name=title translatable=yesConfirmation/property
 property name=resizableFalse/property
 property name=window_positioncenter/property
 property name=icon_namedialog-question/property
 property name=type_hintnormal/property
-property name=has_separatorFalse/property
 child internal-child=vbox
   object class=GtkVBox id=dialog-vbox1
 property name=visibleTrue/property
-property name=orientationvertical/property
+property name=can_focusFalse/property
 property name=spacing2/property
+child internal-child=action_area
+  object class=GtkHButtonBox id=dialog-action_area1
+property name=visibleTrue/property
+property name=can_focusFalse/property
+property name=layout_styleend/property
+child
+  object class=GtkButton id=button2
+property name=label translatable=yesKeep this 
configuration/property
+property name=visibleTrue/property
+property name=can_focusTrue/property
+property name=can_defaultTrue/property
+property name=has_defaultTrue/property
+property name=receives_defaultTrue/property
+property name=use_action_appearanceFalse/property
+  /object
+  packing
+property name=expandFalse/property
+property name=fillFalse/property
+property name=position0/property
+  /packing
+/child
+child
+  object class=GtkButton id=button1
+property name=label translatable=yesRestore the previous 
configuration/property
+property name=visibleTrue/property
+property name=can_focusTrue/property
+property name=receives_defaultTrue/property
+property name=use_action_appearanceFalse/property
+  /object
+  packing
+property name=expandFalse/property
+property name=fillFalse/property
+property name=position1/property
+  /packing
+/child
+  /object
+  packing
+property name=expandFalse/property
+property name=fillTrue/property
+property name=pack_typeend/property
+property name=position0/property
+  /packing
+/child
 child
   object class=GtkHBox id=hbox1
 property name=visibleTrue/property
+property name=can_focusFalse/property
 child
   object class=GtkImage id=image1
 property name=visibleTrue/property
+property name=can_focusFalse/property
 property name=xalign0.2000298023224/property
 property name=xpad10/property
 property name=stockgtk-dialog-question/property
@@ -35,10 +80,11 @@
 child
   object class=GtkVBox id=vbox1
 property name=visibleTrue/property
-property name=orientationvertical/property
+property name=can_focusFalse/property
 child
   object class=GtkLabel id=label1
 property name=visibleTrue/property
+property name=can_focusFalse/property
 property name=xalign0/property
 property name=yalign0/property
 property name=ypad10/property
@@ -54,6 +100,7 @@
  

[Xfce4-commits] xfce4-settings:bluesabre/display-settings Added Right-Of positioning.

[Nick Schermer]

Updating branch refs/heads/bluesabre/display-settings
 to 59943ca568e9191fc5f9e91d25f3cfb3eb624473 (commit)
   from 821122ba6d68e2a0d9c8f5f850b609bbbc3b661f (commit)

commit 59943ca568e9191fc5f9e91d25f3cfb3eb624473
Author: Sean Davis smd.seanda...@gmail.com
Date:   Wed Sep 26 14:57:57 2012 -0400

Added Right-Of positioning.

 dialogs/display-settings/main.c |  102 +++
 1 file changed, 60 insertions(+), 42 deletions(-)

diff --git a/dialogs/display-settings/main.c b/dialogs/display-settings/main.c
index 2d77156..350f3bb 100644
--- a/dialogs/display-settings/main.c
+++ b/dialogs/display-settings/main.c
@@ -142,24 +142,6 @@ display_settings_get_n_active_outputs (void)
 }
 
 static gboolean
-display_setting_combo_box_get_str (GtkComboBox *combobox,
-   gchar   **str)
-{
-GtkTreeModel *model;
-GtkTreeIter   iter;
-
-if (gtk_combo_box_get_active_iter (combobox, iter))
-{
-model = gtk_combo_box_get_model (combobox);
-gtk_tree_model_get (model, iter, COLUMN_COMBO_VALUE, str, -1);
-
-return TRUE;
-}
-
-return FALSE;
-}
-
-static gboolean
 display_setting_combo_box_get_value (GtkComboBox *combobox,
  gint*value)
 {
@@ -268,41 +250,70 @@ display_setting_positions_changed (GtkComboBox *combobox,
 /* This part is incomplete.  We should check if the display combobox is 
also already selected, then move on with working with the specific 
displays. */
-RRMode old_mode;
-gchar *value;
+gint value, current_display, selected_display, n;
+GObject *display_combobox;
+XfceRRMode   *modes;
+
+display_combobox = gtk_builder_get_object(builder, 
randr-active-displays);
 
-if (!display_setting_combo_box_get_str (combobox, value))
+if (!display_setting_combo_box_get_value (combobox, value))
 return;
 
-/* Extend Left */
-if (g_strcmp0(value, left) == 0)
-{
+if (!display_setting_combo_box_get_value (GTK_COMBO_BOX(display_combobox), 
selected_display))
+return;
+
+if (selected_display == -1) return;
+
+/* Store the Current Display */
+current_display = xfce_randr-active_output;
 
+/* FIXME: Extend Left (Move primary screen right/make secondary primary) */
+if (value == 0)
+{
+/* Walk all supported modes of current display */
+modes = XFCE_RANDR_SUPPORTED_MODES (xfce_randr);
+for (n = 0; n  XFCE_RANDR_OUTPUT_INFO (xfce_randr)-nmode; ++n)
+{
+/* Find the current mode. */
+if (modes[n].id == XFCE_RANDR_MODE (xfce_randr))
+{
+/* Change active output to secondary display. */
+xfce_randr-active_output = selected_display;
+/* Move the secondary display to the right of the primary 
display. */
+XFCE_RANDR_POS_X (xfce_randr) = modes[n].width;
+break;
+}
+}
 }
 
 /* Extend Right */
-if (g_strcmp0(value, right) == 0)
+if (value == 1)
 {
-
+/* Change active output to secondary display. */
+xfce_randr-active_output = selected_display;
+
+/* Find the current mode. */
+modes = XFCE_RANDR_SUPPORTED_MODES (xfce_randr);
+for (n = 0; n  XFCE_RANDR_OUTPUT_INFO (xfce_randr)-nmode; ++n)
+{
+if (modes[n].id == XFCE_RANDR_MODE (xfce_randr))
+{
+/* Change active output to primary display. */
+xfce_randr-active_output = current_display;
+/* Move the primary display to the right of the secondary 
display. */
+XFCE_RANDR_POS_X (xfce_randr) = modes[n].width;
+break;
+}
+}
 }
-
-/* Set new resolution */
-old_mode = XFCE_RANDR_MODE (xfce_randr);
-//XFCE_RANDR_MODE (xfce_randr) = value;
-
+
+/* Restore the current display to the primary display. */
+xfce_randr-active_output = current_display;
+
 /* Apply the changes */
 xfce_randr_save_output (xfce_randr, Default, display_channel,
 xfce_randr-active_output);
 xfce_randr_apply (xfce_randr, Default, display_channel);
-
-/* Ask user confirmation */
-if (!display_setting_timed_confirmation (builder))
-{
-XFCE_RANDR_MODE (xfce_randr) = old_mode;
-xfce_randr_save_output (xfce_randr, Default, display_channel,
-xfce_randr-active_output);
-xfce_randr_apply (xfce_randr, Default, display_channel);
-}
 
 }
 
@@ -336,13 +347,13 @@ display_setting_positions_populate (GtkBuilder *builder)
 gtk_list_store_append (GTK_LIST_STORE (model), iter);
 gtk_list_store_set (GTK_LIST_STORE (model), iter,
 COLUMN_COMBO_NAME, _(left of),
-COLUMN_COMBO_VALUE, left, 

[Xfce4-commits] xfce4-settings:bluesabre/display-settings Initial dark background and rounded corners for popups.

[Nick Schermer]

Updating branch refs/heads/bluesabre/display-settings
 to c396f9298a902094a5b5ffa69bc60e1461cf6015 (commit)
   from 47c0e40e14e9ffbceccecdf090027f9050e1edfd (commit)

commit c396f9298a902094a5b5ffa69bc60e1461cf6015
Author: Sean Davis smd.seanda...@gmail.com
Date:   Fri Oct 5 12:11:06 2012 -0400

Initial dark background and rounded corners for popups.

 dialogs/display-settings/main.c |   86 ++-
 1 file changed, 84 insertions(+), 2 deletions(-)

diff --git a/dialogs/display-settings/main.c b/dialogs/display-settings/main.c
index cd9fa11..423228f 100644
--- a/dialogs/display-settings/main.c
+++ b/dialogs/display-settings/main.c
@@ -128,6 +128,7 @@ static gboolean   bound_to_channel = FALSE;
 XfceRandr *xfce_randr = NULL;
 
 identity_popup_store display_popups;
+gboolean supports_alpha = FALSE;
 
 static void
 display_settings_minimal_only_display1_toggled (GtkToggleButton *button,
@@ -990,6 +991,80 @@ display_setting_resolutions_populate (GtkBuilder *builder)
 g_signal_connect (G_OBJECT (combobox), changed, G_CALLBACK 
(display_setting_resolutions_changed), builder);
 }
 
+static void
+display_setting_screen_changed(GtkWidget *widget, GdkScreen *old_screen, 
gpointer userdata)
+{
+GdkScreen *screen = gtk_widget_get_screen(widget);
+GdkColormap *colormap = gdk_screen_get_rgba_colormap(screen);
+
+if (!colormap)
+{
+colormap = gdk_screen_get_rgb_colormap(screen);
+supports_alpha = FALSE;
+}
+else
+{
+supports_alpha = TRUE;
+}
+
+gtk_widget_set_colormap(widget, colormap);
+}
+
+static gboolean
+display_setting_identity_popup_expose(GtkWidget *popup, GdkEventExpose *event, 
gpointer userdata)
+{
+cairo_t *cr = gdk_cairo_create(popup-window);
+gint radius;
+
+radius = 15;
+
+/* Compositing is not available, so just set the background color. */
+if (!supports_alpha)
+{
+cairo_set_source_rgb(cr, 0.2, 0.2, 0.2);
+cairo_set_operator (cr, CAIRO_OPERATOR_SOURCE);
+cairo_paint (cr);
+}
+
+/* The radius is tiny, don't bother drawing rounded corners. */
+else if (radius  0.1) {
+cairo_set_source_rgba(cr, 0.2, 0.2, 0.2, 0.9);
+cairo_set_operator (cr, CAIRO_OPERATOR_SOURCE);
+cairo_paint (cr);
+cairo_rectangle(cr, 0, 0, popup-allocation.width, 
popup-allocation.height);
+}
+
+/* Draw rounded corners. FIXME Does not work with xfce compositor off. */
+else
+{
+cairo_set_source_rgba(cr, 0, 0, 0, 0);
+cairo_set_operator (cr, CAIRO_OPERATOR_SOURCE);
+cairo_paint (cr);
+
+cairo_set_source_rgba(cr, 0.2, 0.2, 0.2, 0.9);
+
+cairo_move_to(cr, 0, radius);
+cairo_arc(cr, radius, radius, radius, 3.14, 3.0*3.14/2.0);
+cairo_line_to(cr, popup-allocation.width - radius, 0);
+cairo_arc(cr, popup-allocation.width - radius, radius, radius, 
3.0*3.14/2.0, 0.0);
+//cairo_line_to(cr, popup-allocation.width, popup-allocation.height 
- radius);
+cairo_line_to(cr, popup-allocation.width, popup-allocation.height);
+//cairo_arc(cr, popup-allocation.width - radius, 
popup-allocation.height - radius, radius, 0.0, 3.14/2.0);
+//cairo_line_to(cr, radius, popup-allocation.height);
+cairo_line_to(cr, 0, popup-allocation.height);
+//cairo_arc(cr, radius, popup-allocation.height - radius, radius, 
3.14/2.0, 3.14);
+cairo_stroke_preserve(cr);
+cairo_set_operator (cr, CAIRO_OPERATOR_SOURCE);
+cairo_fill(cr);
+cairo_set_operator (cr, CAIRO_OPERATOR_OVER);
+cairo_close_path(cr);
+}
+
+cairo_destroy (cr);
+
+return FALSE;
+}
+
 static GtkWidget*
 display_setting_identify_display (gint display_id,
GError *error)
@@ -1012,6 +1087,11 @@ display_setting_identify_display (gint display_id,
  identity_popup_ui_length, error) != 0)
 {
 popup = (GtkWidget *) gtk_builder_get_object(builder, popup);
+
+gtk_widget_set_app_paintable(popup, TRUE);
+g_signal_connect( G_OBJECT(popup), expose-event, 
G_CALLBACK(display_setting_identity_popup_expose), NULL );
+g_signal_connect( G_OBJECT(popup), screen-changed, 
G_CALLBACK(display_setting_screen_changed), NULL );
+
 display_name = gtk_builder_get_object(builder, display_name);
 display_details = gtk_builder_get_object(builder, display_details);
 
@@ -1040,10 +1120,10 @@ display_setting_identify_display (gint display_id,
  
xfce_randr-output_info[display_id]-name);
  
 gtk_label_set_markup (GTK_LABEL(display_name),
-  g_strdup_printf(bigb%s: %s/b/big, 
_(Display), name) );
+  g_strdup_printf(span 

[Xfce4-commits] xfce4-settings:bluesabre/display-settings Enhancements to minimal dialog, tweaked code to support new minimal dialog.

[Nick Schermer]

Updating branch refs/heads/bluesabre/display-settings
 to 8d1ed825c1e739b63d87083401b4efdee357b09f (commit)
   from 94c2d0fcec0fc2e3e6fbf66944172ca251f39067 (commit)

commit 8d1ed825c1e739b63d87083401b4efdee357b09f
Author: Sean Davis smd.seanda...@gmail.com
Date:   Wed Sep 26 05:39:00 2012 -0400

Enhancements to minimal dialog, tweaked code to support new minimal dialog.

 dialogs/display-settings/main.c|  119 +---
 .../display-settings/minimal-display-dialog.glade  |   14 +--
 2 files changed, 9 insertions(+), 124 deletions(-)

diff --git a/dialogs/display-settings/main.c b/dialogs/display-settings/main.c
index b6192b1..86dd15e 100644
--- a/dialogs/display-settings/main.c
+++ b/dialogs/display-settings/main.c
@@ -1140,90 +1140,6 @@ screen_on_event (GdkXEvent *xevent,
 }
 
 
-
-static void
-display_settings_minimal_dialog_response (GtkDialog  *dialog,
-  gintresponse_id,
-  GtkBuilder *builder)
-{
-GObject*first_screen_radio;
-GObject*second_screen_radio;
-XfceRRMode *mode1, *mode2;
-gbooleanuse_first_screen;
-gbooleanuse_second_screen;
-guint   first, second;
-gintm, n, found;
-
-if (response_id == 1)
-{
-/* TODO: handle correctly more than 2 outputs? */
-first = 0;
-second = 1;
-
-first_screen_radio = gtk_builder_get_object (builder, radiobutton1);
-second_screen_radio = gtk_builder_get_object (builder, radiobutton2);
-
-use_first_screen =
-gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON 
(first_screen_radio));
-use_second_screen =
-gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON 
(second_screen_radio));
-
-if (use_first_screen)
-{
-xfce_randr-mode[first] = xfce_randr_preferred_mode (xfce_randr, 
first);
-xfce_randr-mode[second] = None;
-}
-else if (use_second_screen)
-{
-xfce_randr-mode[second] = xfce_randr_preferred_mode (xfce_randr, 
second);
-xfce_randr-mode[first] = None;
-}
-else
-{
-if (xfce_randr-clone_modes[0] != None)
-{
-xfce_randr-mode[first] = xfce_randr-clone_modes[0];
-xfce_randr-mode[second] = xfce_randr-clone_modes[0];
-}
-else
-{
-found = FALSE;
-/* No clone mode available, try to find a similar mode */
-for (n = 0; n  xfce_randr-output_info[first]-nmode; ++n)
-{
-mode1 = xfce_randr-modes[first][n];
-for (m = 0; m  xfce_randr-output_info[second]-nmode; 
++m)
-{
-mode2 = xfce_randr-modes[second][m];
-/* similar means same resolution */
-if (mode1-width == mode2-width
- mode1-height == mode2-height)
-{
-xfce_randr-mode[first] = mode1-id;
-xfce_randr-mode[second] = mode2-id;
-found = TRUE;
-break;
-}
-}
-
-if (found)
-break;
-}
-}
-}
-/* Save the two outputs and apply */
-xfce_randr_save_output (xfce_randr, MinimalAutoConfig, 
display_channel,
-first);
-xfce_randr_save_output (xfce_randr, MinimalAutoConfig, 
display_channel,
-second);
-xfce_randr_apply (xfce_randr, MinimalAutoConfig, display_channel);
-}
-
-gtk_main_quit ();
-}
-
-
-
 gint
 main (gint argc, gchar **argv)
 {
@@ -1235,7 +1151,6 @@ main (gint argc, gchar **argv)
 GError  *error = NULL;
 gboolean succeeded = TRUE;
 gint event_base, error_base;
-guintfirst, second;
 gchar   *command;
 const gchar *alternative = NULL;
 const gchar *alternative_icon = NULL;
@@ -1407,45 +1322,15 @@ main (gint argc, gchar **argv)
 if (xfce_randr-noutput  2)
 goto cleanup;
 
-/* TODO: handle correctly more than 2 outputs? */
-first = 0;
-second = 1;
-
 builder = gtk_builder_new ();
 
 if (gtk_builder_add_from_string (builder, 
minimal_display_dialog_ui,
  minimal_display_dialog_ui_length, 
error) != 0)
 {
-GObject*first_screen_radio;
-GObject*second_screen_radio;
-gchar  *screen_name;
 
 /* Build the minimal dialog */
-dialog = (GtkWidget *) gtk_builder_get_object (builder, 
dialog1);
-

[Xfce4-commits] xfce4-settings:bluesabre/display-settings Show Strv arrays in the renderer.

[Nick Schermer]

Updating branch refs/heads/bluesabre/display-settings
 to afa79de4dfda99e58bb55efb07c021e6c71e9a6c (commit)
   from eb85045030f7adc2bada1e989ece718a3a883533 (commit)

commit afa79de4dfda99e58bb55efb07c021e6c71e9a6c
Author: Nick Schermer n...@xfce.org
Date:   Tue Oct 9 19:25:19 2012 +0200

Show Strv arrays in the renderer.

 .../xfce-settings-cell-renderer.c  |   37 ++--
 1 file changed, 35 insertions(+), 2 deletions(-)

diff --git a/xfce4-settings-editor/xfce-settings-cell-renderer.c 
b/xfce4-settings-editor/xfce-settings-cell-renderer.c
index fd684a1..31e964e 100644
--- a/xfce4-settings-editor/xfce-settings-cell-renderer.c
+++ b/xfce4-settings-editor/xfce-settings-cell-renderer.c
@@ -108,7 +108,8 @@ static GtkCellEditable 
*xfce_settings_cell_renderer_start_editing (GtkCellRender

GdkRectangle *background_area,

GdkRectangle *cell_area,

GtkCellRendererState  flags);
-
+static void xfce_settings_strv_to_string  (const 
GValue *src_value,
+   GValue  
 *dest_value);
 
 
 G_DEFINE_TYPE (XfceSettingsCellRenderer, xfce_settings_cell_renderer, 
GTK_TYPE_CELL_RENDERER)
@@ -158,6 +159,9 @@ xfce_settings_cell_renderer_class_init 
(XfceSettingsCellRendererClass *klass)
 G_TYPE_VALUE);
 
 edit_data_quark = g_quark_from_static_string (path);
+
+g_value_register_transform_func (G_TYPE_STRV, G_TYPE_STRING,
+ xfce_settings_strv_to_string);
 }
 
 
@@ -282,7 +286,8 @@ xfce_settings_cell_renderer_prepare 
(XfceSettingsCellRenderer *renderer)
 const GValue *value = renderer-cell_value;
 GValuestr_value = { 0, };
 
-if (G_VALUE_TYPE (value) == xfce_settings_array_type ())
+if (G_VALUE_TYPE (value) == xfce_settings_array_type ()
+|| G_VALUE_TYPE (value) == G_TYPE_STRV)
 goto transform_value;
 
 switch (G_VALUE_TYPE (value))
@@ -613,6 +618,34 @@ xfce_settings_array_to_string (const GValue *src_value,
 
 
 
+static void
+xfce_settings_strv_to_string (const GValue *src_value,
+  GValue   *dest_value)
+{
+gchar   **array = g_value_get_boxed (src_value);
+GString  *str;
+guint i;
+
+g_return_if_fail (G_VALUE_HOLDS_STRING (dest_value));
+g_return_if_fail (array != NULL);
+
+str = g_string_new ([ );
+
+for (i = 0; array[i] != NULL; i++)
+{
+if (i  0)
+  g_string_append (str, , );
+g_string_append_printf (str, \%s\, array[i]);
+}
+
+g_string_append (str,  ]);
+
+g_value_take_string (dest_value, g_string_free (str, FALSE));
+}
+
+
+
+
 GtkCellRenderer *
 xfce_settings_cell_renderer_new (void)
 {
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] xfce4-settings:bluesabre/display-settings Changed to switch statement and static variables.

[Nick Schermer]

Updating branch refs/heads/bluesabre/display-settings
 to f97545f2fd40630aff3adb67195315ff81321a14 (commit)
   from 59943ca568e9191fc5f9e91d25f3cfb3eb624473 (commit)

commit f97545f2fd40630aff3adb67195315ff81321a14
Author: Sean Davis smd.seanda...@gmail.com
Date:   Wed Sep 26 15:43:56 2012 -0400

Changed to switch statement and static variables.

 dialogs/display-settings/main.c   |   76 -
 dialogs/display-settings/xfce-randr.h |4 ++
 2 files changed, 41 insertions(+), 39 deletions(-)

diff --git a/dialogs/display-settings/main.c b/dialogs/display-settings/main.c
index 350f3bb..2147c68 100644
--- a/dialogs/display-settings/main.c
+++ b/dialogs/display-settings/main.c
@@ -247,9 +247,6 @@ static void
 display_setting_positions_changed (GtkComboBox *combobox,
  GtkBuilder  *builder)
 {
-/* This part is incomplete.  We should check if the display combobox is 
-   also already selected, then move on with working with the specific 
-   displays. */
 gint value, current_display, selected_display, n;
 GObject *display_combobox;
 XfceRRMode   *modes;
@@ -267,44 +264,45 @@ display_setting_positions_changed (GtkComboBox *combobox,
 /* Store the Current Display */
 current_display = xfce_randr-active_output;
 
-/* FIXME: Extend Left (Move primary screen right/make secondary primary) */
-if (value == 0)
-{
-/* Walk all supported modes of current display */
-modes = XFCE_RANDR_SUPPORTED_MODES (xfce_randr);
-for (n = 0; n  XFCE_RANDR_OUTPUT_INFO (xfce_randr)-nmode; ++n)
-{
-/* Find the current mode. */
-if (modes[n].id == XFCE_RANDR_MODE (xfce_randr))
+switch (value) {
+case XFCE_RANDR_PLACEMENT_LEFT: // Extend Left FIXME
+/* Walk all supported modes of current display */
+modes = XFCE_RANDR_SUPPORTED_MODES (xfce_randr);
+for (n = 0; n  XFCE_RANDR_OUTPUT_INFO (xfce_randr)-nmode; ++n)
 {
-/* Change active output to secondary display. */
-xfce_randr-active_output = selected_display;
-/* Move the secondary display to the right of the primary 
display. */
-XFCE_RANDR_POS_X (xfce_randr) = modes[n].width;
-break;
+/* Find the current mode. */
+if (modes[n].id == XFCE_RANDR_MODE (xfce_randr))
+{
+/* Change active output to secondary display. */
+xfce_randr-active_output = selected_display;
+/* Move the secondary display to the right of the primary 
display. */
+XFCE_RANDR_POS_X (xfce_randr) = modes[n].width;
+break;
+}
 }
-}
-}
-
-/* Extend Right */
-if (value == 1)
-{
-/* Change active output to secondary display. */
-xfce_randr-active_output = selected_display;
-
-/* Find the current mode. */
-modes = XFCE_RANDR_SUPPORTED_MODES (xfce_randr);
-for (n = 0; n  XFCE_RANDR_OUTPUT_INFO (xfce_randr)-nmode; ++n)
-{
-if (modes[n].id == XFCE_RANDR_MODE (xfce_randr))
+break;
+case XFCE_RANDR_PLACEMENT_RIGHT: // Extend Right
+/* Change active output to secondary display. */
+xfce_randr-active_output = selected_display;
+
+/* Find the current mode. */
+modes = XFCE_RANDR_SUPPORTED_MODES (xfce_randr);
+for (n = 0; n  XFCE_RANDR_OUTPUT_INFO (xfce_randr)-nmode; ++n)
 {
-/* Change active output to primary display. */
-xfce_randr-active_output = current_display;
-/* Move the primary display to the right of the secondary 
display. */
-XFCE_RANDR_POS_X (xfce_randr) = modes[n].width;
-break;
+if (modes[n].id == XFCE_RANDR_MODE (xfce_randr))
+{
+/* Change active output to primary display. */
+xfce_randr-active_output = current_display;
+/* Move the primary display to the right of the secondary 
display. */
+XFCE_RANDR_POS_X (xfce_randr) = modes[n].width;
+break;
+}
 }
-}
+break;
+case XFCE_RANDR_PLACEMENT_UP:
+case XFCE_RANDR_PLACEMENT_DOWN:
+default:
+break;
 }
 
 /* Restore the current display to the primary display. */
@@ -347,13 +345,13 @@ display_setting_positions_populate (GtkBuilder *builder)
 gtk_list_store_append (GTK_LIST_STORE (model), iter);
 gtk_list_store_set (GTK_LIST_STORE (model), iter,
 COLUMN_COMBO_NAME, _(left of),
-COLUMN_COMBO_VALUE, 0, -1);
+

[Xfce4-commits] xfce4-settings:bluesabre/display-settings Beginning randr stuff for left/right.

[Nick Schermer]

Updating branch refs/heads/bluesabre/display-settings
 to 821122ba6d68e2a0d9c8f5f850b609bbbc3b661f (commit)
   from 7ec05479b669a0bf9300101d692b79bf11ed1448 (commit)

commit 821122ba6d68e2a0d9c8f5f850b609bbbc3b661f
Author: Sean Davis smd.seanda...@gmail.com
Date:   Wed Sep 26 09:25:08 2012 -0400

Beginning randr stuff for left/right.

 dialogs/display-settings/main.c |   57 ---
 1 file changed, 53 insertions(+), 4 deletions(-)

diff --git a/dialogs/display-settings/main.c b/dialogs/display-settings/main.c
index fccc3e0..2d77156 100644
--- a/dialogs/display-settings/main.c
+++ b/dialogs/display-settings/main.c
@@ -141,7 +141,23 @@ display_settings_get_n_active_outputs (void)
 return count;
 }
 
+static gboolean
+display_setting_combo_box_get_str (GtkComboBox *combobox,
+   gchar   **str)
+{
+GtkTreeModel *model;
+GtkTreeIter   iter;
+
+if (gtk_combo_box_get_active_iter (combobox, iter))
+{
+model = gtk_combo_box_get_model (combobox);
+gtk_tree_model_get (model, iter, COLUMN_COMBO_VALUE, str, -1);
+
+return TRUE;
+}
 
+return FALSE;
+}
 
 static gboolean
 display_setting_combo_box_get_value (GtkComboBox *combobox,
@@ -249,10 +265,45 @@ static void
 display_setting_positions_changed (GtkComboBox *combobox,
  GtkBuilder  *builder)
 {
-gint value;
+/* This part is incomplete.  We should check if the display combobox is 
+   also already selected, then move on with working with the specific 
+   displays. */
+RRMode old_mode;
+gchar *value;
 
-if (!display_setting_combo_box_get_value (combobox, value))
+if (!display_setting_combo_box_get_str (combobox, value))
 return;
+
+/* Extend Left */
+if (g_strcmp0(value, left) == 0)
+{
+
+}
+
+/* Extend Right */
+if (g_strcmp0(value, right) == 0)
+{
+
+}
+
+/* Set new resolution */
+old_mode = XFCE_RANDR_MODE (xfce_randr);
+//XFCE_RANDR_MODE (xfce_randr) = value;
+
+/* Apply the changes */
+xfce_randr_save_output (xfce_randr, Default, display_channel,
+xfce_randr-active_output);
+xfce_randr_apply (xfce_randr, Default, display_channel);
+
+/* Ask user confirmation */
+if (!display_setting_timed_confirmation (builder))
+{
+XFCE_RANDR_MODE (xfce_randr) = old_mode;
+xfce_randr_save_output (xfce_randr, Default, display_channel,
+xfce_randr-active_output);
+xfce_randr_apply (xfce_randr, Default, display_channel);
+}
+
 }
 
 static void
@@ -646,8 +697,6 @@ display_setting_refresh_rates_populate (GtkBuilder *builder)
 g_signal_connect (G_OBJECT (combobox), changed, G_CALLBACK 
(display_setting_refresh_rates_changed), builder);
 }
 
-
-
 static void
 display_setting_resolutions_changed (GtkComboBox *combobox,
  GtkBuilder  *builder)
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] xfce4-settings:bluesabre/display-settings Added above (broken) and below code.

[Nick Schermer]

Updating branch refs/heads/bluesabre/display-settings
 to 37d456cf9f52bcddcf8d009af909ff4b69331bc2 (commit)
   from f97545f2fd40630aff3adb67195315ff81321a14 (commit)

commit 37d456cf9f52bcddcf8d009af909ff4b69331bc2
Author: Sean Davis smd.seanda...@gmail.com
Date:   Wed Sep 26 16:01:29 2012 -0400

Added above (broken) and below code.

 dialogs/display-settings/main.c |   50 +++
 1 file changed, 46 insertions(+), 4 deletions(-)

diff --git a/dialogs/display-settings/main.c b/dialogs/display-settings/main.c
index 2147c68..2c17dfe 100644
--- a/dialogs/display-settings/main.c
+++ b/dialogs/display-settings/main.c
@@ -299,8 +299,40 @@ display_setting_positions_changed (GtkComboBox *combobox,
 }
 }
 break;
-case XFCE_RANDR_PLACEMENT_UP:
-case XFCE_RANDR_PLACEMENT_DOWN:
+case XFCE_RANDR_PLACEMENT_UP: // Extend Above
+/* Walk all supported modes of current display */
+modes = XFCE_RANDR_SUPPORTED_MODES (xfce_randr);
+for (n = 0; n  XFCE_RANDR_OUTPUT_INFO (xfce_randr)-nmode; ++n)
+{
+/* Find the current mode. */
+if (modes[n].id == XFCE_RANDR_MODE (xfce_randr))
+{
+/* Change active output to secondary display. */
+xfce_randr-active_output = selected_display;
+/* Move the secondary display to the above the primary 
display. */
+XFCE_RANDR_POS_Y (xfce_randr) = modes[n].height;
+break;
+}
+}
+break;
+case XFCE_RANDR_PLACEMENT_DOWN: // Extend Below
+/* Change active output to secondary display. */
+xfce_randr-active_output = selected_display;
+
+/* Find the current mode. */
+modes = XFCE_RANDR_SUPPORTED_MODES (xfce_randr);
+for (n = 0; n  XFCE_RANDR_OUTPUT_INFO (xfce_randr)-nmode; ++n)
+{
+if (modes[n].id == XFCE_RANDR_MODE (xfce_randr))
+{
+/* Change active output to primary display. */
+xfce_randr-active_output = current_display;
+/* Move the primary display to the below the secondary 
display. */
+XFCE_RANDR_POS_Y (xfce_randr) = modes[n].height;
+break;
+}
+}
+break;
 default:
 break;
 }
@@ -352,6 +384,18 @@ display_setting_positions_populate (GtkBuilder *builder)
 gtk_list_store_set (GTK_LIST_STORE (model), iter,
 COLUMN_COMBO_NAME, _(right of),
 COLUMN_COMBO_VALUE, XFCE_RANDR_PLACEMENT_RIGHT, -1);
+
+/* Insert above */
+gtk_list_store_append (GTK_LIST_STORE (model), iter);
+gtk_list_store_set (GTK_LIST_STORE (model), iter,
+COLUMN_COMBO_NAME, _(above),
+COLUMN_COMBO_VALUE, XFCE_RANDR_PLACEMENT_UP, -1);
+
+/* Insert below */
+gtk_list_store_append (GTK_LIST_STORE (model), iter);
+gtk_list_store_set (GTK_LIST_STORE (model), iter,
+COLUMN_COMBO_NAME, _(below),
+COLUMN_COMBO_VALUE, XFCE_RANDR_PLACEMENT_DOWN, -1);
 
 
 /* Reconnect the signal */
@@ -755,8 +799,6 @@ display_setting_resolutions_populate (GtkBuilder *builder)
 GtkTreeIteriter;
 XfceRRMode   *modes;
 
-g_print(get resolutions);
-
 /* Get the combo box store and clear it */
 combobox = gtk_builder_get_object (builder, randr-resolution);
 model = gtk_combo_box_get_model (GTK_COMBO_BOX (combobox));
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] xfce4-settings:bluesabre/display-settings Fix for when to display minimal/main dialogs.

[Nick Schermer]

Updating branch refs/heads/bluesabre/display-settings
 to 47c0e40e14e9ffbceccecdf090027f9050e1edfd (commit)
   from dd037637961e26994a33adc38f6fe6d7ce74d14c (commit)

commit 47c0e40e14e9ffbceccecdf090027f9050e1edfd
Author: Sean Davis smd.seanda...@gmail.com
Date:   Fri Oct 5 07:58:42 2012 -0400

Fix for when to display minimal/main dialogs.

 dialogs/display-settings/main.c |5 +
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/dialogs/display-settings/main.c b/dialogs/display-settings/main.c
index 736cb01..cd9fa11 100644
--- a/dialogs/display-settings/main.c
+++ b/dialogs/display-settings/main.c
@@ -1969,15 +1969,12 @@ main (gint argc, gchar **argv)
 if (xfce_titled_dialog_get_type () == 0)
 return EXIT_FAILURE;
 
-if (!minimal)
+if (xfce_randr-noutput = 1 || !minimal)
 {
 display_settings_show_main_dialog( display, event_base, error );
 }
 else
 {
-if (xfce_randr-noutput  2)
-goto cleanup;
-
 display_settings_show_minimal_dialog ( display, event_base, error 
);
 }
 
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] xfce4-settings:bluesabre/display-settings Update minimal-display-dialog icons

[Nick Schermer]

Updating branch refs/heads/bluesabre/display-settings
 to 16dd3b15075d98ba9b539b9243684a01a366cc0c (commit)
   from 9d926f57009155586ecaf7ca62af838e38015052 (commit)

commit 16dd3b15075d98ba9b539b9243684a01a366cc0c
Author: Simon Steinbeiss simon.steinbe...@elfenbeinturm.at
Date:   Thu Sep 13 23:11:53 2012 +0200

Update minimal-display-dialog icons

 dialogs/display-settings/extend-left.png  |  Bin 5205 - 5867 bytes
 dialogs/display-settings/extend-right.png |  Bin 5358 - 6059 bytes
 dialogs/display-settings/mirror.png   |  Bin 8382 - 6179 bytes
 3 files changed, 0 insertions(+), 0 deletions(-)

diff --git a/dialogs/display-settings/extend-left.png 
b/dialogs/display-settings/extend-left.png
index 46966ac..5e0dbd5 100644
Binary files a/dialogs/display-settings/extend-left.png and 
b/dialogs/display-settings/extend-left.png differ
diff --git a/dialogs/display-settings/extend-right.png 
b/dialogs/display-settings/extend-right.png
index 9577e7b..fc520dc 100644
Binary files a/dialogs/display-settings/extend-right.png and 
b/dialogs/display-settings/extend-right.png differ
diff --git a/dialogs/display-settings/mirror.png 
b/dialogs/display-settings/mirror.png
index bbe903f..adc3ae7 100644
Binary files a/dialogs/display-settings/mirror.png and 
b/dialogs/display-settings/mirror.png differ
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] xfce4-settings:bluesabre/display-settings Added detection of relative display position.

[Nick Schermer]

Updating branch refs/heads/bluesabre/display-settings
 to 402a724d0734f2c54ffef8574cb9f6e84708fe5e (commit)
   from 04d492c4cc626a50cfefcc04751d43ce856dec1d (commit)

commit 402a724d0734f2c54ffef8574cb9f6e84708fe5e
Author: Sean Davis smd.seanda...@gmail.com
Date:   Thu Sep 27 10:23:48 2012 -0400

Added detection of relative display position.

 dialogs/display-settings/main.c |   81 +++
 1 file changed, 81 insertions(+)

diff --git a/dialogs/display-settings/main.c b/dialogs/display-settings/main.c
index 79a948a..af39b61 100644
--- a/dialogs/display-settings/main.c
+++ b/dialogs/display-settings/main.c
@@ -498,6 +498,86 @@ display_setting_active_displays_populate (GtkBuilder 
*builder)
 }
 
 static void
+display_setting_guess_positioning (GtkBuilder *builder)
+{
+GObject *position_combo, *display_combo;
+gint current_x, current_y, index;
+guint n, current_display;
+
+current_display = xfce_randr-active_output;
+current_x = XFCE_RANDR_POS_X (xfce_randr);
+current_y = XFCE_RANDR_POS_Y (xfce_randr);
+
+position_combo = gtk_builder_get_object(builder, randr-position);
+display_combo = gtk_builder_get_object(builder, randr-active-displays);
+
+g_object_disconnect (position_combo, any_signal::changed,
+ display_setting_positions_changed,
+ builder, NULL);
+ 
+g_object_disconnect (display_combo, any_signal::changed,
+ display_setting_active_displays_changed,
+ builder, NULL);
+ 
+index = 0;
+
+for (n = 0; n  display_settings_get_n_active_outputs (); n++)
+{
+if (n != current_display)
+{
+xfce_randr-active_output = n;
+
+/* Check for mirror */
+if ( (XFCE_RANDR_POS_X (xfce_randr) == current_x)  
+ (XFCE_RANDR_POS_Y (xfce_randr) == current_y) ) {
+gtk_combo_box_set_active( GTK_COMBO_BOX(position_combo), 0 );
+gtk_combo_box_set_active( GTK_COMBO_BOX(display_combo), index 
);
+break;   
+}
+
+/* Check for Left Of */
+if ( (XFCE_RANDR_POS_Y (xfce_randr) == current_y) 
+ (XFCE_RANDR_POS_X (xfce_randr)  current_x) ) {
+gtk_combo_box_set_active( GTK_COMBO_BOX(position_combo), 1 );
+gtk_combo_box_set_active( GTK_COMBO_BOX(display_combo), index 
);
+break;
+}
+
+/* Check for Right Of */
+if ( (XFCE_RANDR_POS_Y (xfce_randr) == current_y) 
+ (XFCE_RANDR_POS_X (xfce_randr)  current_x) ) {
+gtk_combo_box_set_active( GTK_COMBO_BOX(position_combo), 2 );
+gtk_combo_box_set_active( GTK_COMBO_BOX(display_combo), index 
);
+break;
+}
+
+/* Check for Above */
+if ( (XFCE_RANDR_POS_X (xfce_randr) == current_x) 
+ (XFCE_RANDR_POS_Y (xfce_randr)  current_y) ) {
+gtk_combo_box_set_active( GTK_COMBO_BOX(position_combo), 3 );
+gtk_combo_box_set_active( GTK_COMBO_BOX(display_combo), index 
);
+break;
+}
+
+/* Check for Below */
+if ( (XFCE_RANDR_POS_X (xfce_randr) == current_x) 
+ (XFCE_RANDR_POS_Y (xfce_randr)  current_y) ) {
+gtk_combo_box_set_active( GTK_COMBO_BOX(position_combo), 4 );
+gtk_combo_box_set_active( GTK_COMBO_BOX(display_combo), index 
);
+break;
+}
+
+index++;
+}
+}
+
+xfce_randr-active_output = current_display;
+
+g_signal_connect (G_OBJECT (position_combo), changed, G_CALLBACK 
(display_setting_positions_changed), builder);
+g_signal_connect (G_OBJECT (display_combo), changed, G_CALLBACK 
(display_setting_active_displays_changed), builder);
+}
+
+static void
 display_setting_reflections_changed (GtkComboBox *combobox,
  GtkBuilder  *builder)
 {
@@ -1061,6 +1141,7 @@ display_settings_treeview_selection_changed 
(GtkTreeSelection *selection,
 /* Update the combo boxes */
 display_setting_positions_populate (builder);
 display_setting_active_displays_populate (builder);
+display_setting_guess_positioning (builder);
 display_setting_output_status_populate (builder);
 display_setting_mirror_displays_populate (builder);
 display_setting_resolutions_populate (builder);
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] xfce4-settings:bluesabre/display-settings Plugged in mirror displays checkbox.

[Nick Schermer]

Updating branch refs/heads/bluesabre/display-settings
 to 13cc6a31ba8a89976149034bcd8a9354b3681adf (commit)
   from 402a724d0734f2c54ffef8574cb9f6e84708fe5e (commit)

commit 13cc6a31ba8a89976149034bcd8a9354b3681adf
Author: Sean Davis smd.seanda...@gmail.com
Date:   Thu Sep 27 10:58:53 2012 -0400

Plugged in mirror displays checkbox.

 dialogs/display-settings/main.c |   30 ++
 1 file changed, 30 insertions(+)

diff --git a/dialogs/display-settings/main.c b/dialogs/display-settings/main.c
index af39b61..5c61662 100644
--- a/dialogs/display-settings/main.c
+++ b/dialogs/display-settings/main.c
@@ -962,12 +962,15 @@ display_setting_mirror_displays_toggled (GtkToggleButton 
*togglebutton,
 GtkBuilder  *builder)
 {
 GObject *positions, *active_displays;
+guint n, current_display;
 
 if (!xfce_randr)
 return;
 
 if (xfce_randr-noutput = 1)
 return;
+
+current_display = xfce_randr-active_output;
 
 positions = gtk_builder_get_object (builder, randr-position);
 active_displays = gtk_builder_get_object (builder, 
randr-active-displays);
@@ -976,6 +979,23 @@ display_setting_mirror_displays_toggled (GtkToggleButton 
*togglebutton,
 {
 /* Activate mirror-mode */
 
+/* Apply mirror settings to each monitor */
+for (n = 0; n  display_settings_get_n_active_outputs (); n++)
+{
+xfce_randr-active_output = n;
+
+XFCE_RANDR_POS_X (xfce_randr) = 0;
+XFCE_RANDR_POS_Y (xfce_randr) = 0;
+
+xfce_randr_save_output (xfce_randr, Default, display_channel,
+xfce_randr-active_output);
+
+}
+
+xfce_randr-active_output = current_display;
+
+xfce_randr_apply (xfce_randr, Default, display_channel);
+
 /* Disable the position comboboxes */
 gtk_widget_set_sensitive (GTK_WIDGET (positions), FALSE);
 gtk_widget_set_sensitive (GTK_WIDGET (active_displays), FALSE);
@@ -1127,6 +1147,7 @@ display_settings_treeview_selection_changed 
(GtkTreeSelection *selection,
 GtkTreeIter   iter;
 gboolean  has_selection;
 gint  active_id;
+GObject *mirror_displays, *position_combo, *display_combo;
 
 /* Get the selection */
 has_selection = gtk_tree_selection_get_selected (selection, model, iter);
@@ -1148,6 +1169,15 @@ display_settings_treeview_selection_changed 
(GtkTreeSelection *selection,
 display_setting_refresh_rates_populate (builder);
 display_setting_rotations_populate (builder);
 display_setting_reflections_populate (builder);
+
+mirror_displays = gtk_builder_get_object(builder, mirror-displays);
+if (gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON(mirror_displays) 
)) {
+position_combo = gtk_builder_get_object(builder, randr-position);
+display_combo = gtk_builder_get_object(builder, 
randr-active-displays);
+
+gtk_widget_set_sensitive( GTK_WIDGET(position_combo), FALSE );
+gtk_widget_set_sensitive( GTK_WIDGET(display_combo), FALSE );
+}
 }
 }
 
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] xfce4-settings:bluesabre/display-settings Fixed loading of comboboxes and enabling/disabling comboboxes.

[Nick Schermer]

Updating branch refs/heads/bluesabre/display-settings
 to 94c2d0fcec0fc2e3e6fbf66944172ca251f39067 (commit)
   from 55f46009289f8a7ccd336a9ea5e2ab3d06a1a81d (commit)

commit 94c2d0fcec0fc2e3e6fbf66944172ca251f39067
Author: Sean Davis smd.seanda...@gmail.com
Date:   Wed Sep 26 05:17:39 2012 -0400

Fixed loading of comboboxes and enabling/disabling comboboxes.

 dialogs/display-settings/main.c |   12 
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/dialogs/display-settings/main.c b/dialogs/display-settings/main.c
index 96daaf6..b6192b1 100644
--- a/dialogs/display-settings/main.c
+++ b/dialogs/display-settings/main.c
@@ -259,7 +259,6 @@ display_setting_positions_populate (GtkBuilder *builder)
 if (display_settings_get_n_active_outputs ()  1)
 {
 gtk_widget_set_sensitive (GTK_WIDGET (combobox), TRUE);
-return;
 }
 else
 gtk_widget_set_sensitive (GTK_WIDGET (combobox), FALSE);
@@ -315,7 +314,6 @@ display_setting_active_displays_populate (GtkBuilder 
*builder)
 if (display_settings_get_n_active_outputs ()  1)
 {
 gtk_widget_set_sensitive (GTK_WIDGET (combobox), TRUE);
-return;
 }
 else
 gtk_widget_set_sensitive (GTK_WIDGET (combobox), FALSE);
@@ -345,8 +343,6 @@ display_setting_active_displays_populate (GtkBuilder 
*builder)
 }
 }
 
-
-
 /* Reconnect the signal */
 g_signal_connect (G_OBJECT (combobox), changed, G_CALLBACK 
(display_setting_active_displays_changed), builder);
 }
@@ -745,14 +741,14 @@ display_setting_mirror_displays_toggled (GtkToggleButton 
*togglebutton,
 if (xfce_randr-noutput = 1)
 return;
 
-positions = gtk_builder_get_object (builder, randr-positions);
-active_displays = gtk_builder_get_object (builder, active-displays);
+positions = gtk_builder_get_object (builder, randr-position);
+active_displays = gtk_builder_get_object (builder, 
randr-active-displays);
 
 if (gtk_toggle_button_get_active (togglebutton))
 {
 /* Activate mirror-mode */
 
-/* Disable the position comboboxes FIXME */
+/* Disable the position comboboxes */
 gtk_widget_set_sensitive (GTK_WIDGET (positions), FALSE);
 gtk_widget_set_sensitive (GTK_WIDGET (active_displays), FALSE);
 }
@@ -760,7 +756,7 @@ display_setting_mirror_displays_toggled (GtkToggleButton 
*togglebutton,
 {
 /* Deactivate mirror-mode */
 
-/* Re-enable the position comboboxes FIXME */
+/* Re-enable the position comboboxes */
 gtk_widget_set_sensitive (GTK_WIDGET (positions), TRUE);
 gtk_widget_set_sensitive (GTK_WIDGET (active_displays), TRUE);
 }
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] xfce4-settings:bluesabre/display-settings Fix for variable index.

[Nick Schermer]

Updating branch refs/heads/bluesabre/display-settings
 to 85ea3069a1c06fc5c4e29f0f8ee80cc7d1f852c2 (commit)
   from d1ccb38ff9bbd3b9ed7887fffaa86843d9c0b69f (commit)

commit 85ea3069a1c06fc5c4e29f0f8ee80cc7d1f852c2
Author: Sean Davis smd.seanda...@gmail.com
Date:   Thu Sep 27 13:10:12 2012 -0400

Fix for variable index.

 dialogs/display-settings/main.c |   16 
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/dialogs/display-settings/main.c b/dialogs/display-settings/main.c
index eeca298..21d1f74 100644
--- a/dialogs/display-settings/main.c
+++ b/dialogs/display-settings/main.c
@@ -501,7 +501,7 @@ static void
 display_setting_guess_positioning (GtkBuilder *builder)
 {
 GObject *position_combo, *display_combo;
-gint current_x, current_y, index;
+gint current_x, current_y, cb_index;
 guint n, current_display;
 
 current_display = xfce_randr-active_output;
@@ -519,7 +519,7 @@ display_setting_guess_positioning (GtkBuilder *builder)
  display_setting_active_displays_changed,
  builder, NULL);
  
-index = 0;
+cb_index = 0;
 
 for (n = 0; n  display_settings_get_n_active_outputs (); n++)
 {
@@ -531,7 +531,7 @@ display_setting_guess_positioning (GtkBuilder *builder)
 if ( (XFCE_RANDR_POS_X (xfce_randr) == current_x)  
  (XFCE_RANDR_POS_Y (xfce_randr) == current_y) ) {
 gtk_combo_box_set_active( GTK_COMBO_BOX(position_combo), 0 );
-gtk_combo_box_set_active( GTK_COMBO_BOX(display_combo), index 
);
+gtk_combo_box_set_active( GTK_COMBO_BOX(display_combo), 
cb_index );
 break;   
 }
 
@@ -539,7 +539,7 @@ display_setting_guess_positioning (GtkBuilder *builder)
 if ( (XFCE_RANDR_POS_Y (xfce_randr) == current_y) 
  (XFCE_RANDR_POS_X (xfce_randr)  current_x) ) {
 gtk_combo_box_set_active( GTK_COMBO_BOX(position_combo), 1 );
-gtk_combo_box_set_active( GTK_COMBO_BOX(display_combo), index 
);
+gtk_combo_box_set_active( GTK_COMBO_BOX(display_combo), 
cb_index );
 break;
 }
 
@@ -547,7 +547,7 @@ display_setting_guess_positioning (GtkBuilder *builder)
 if ( (XFCE_RANDR_POS_Y (xfce_randr) == current_y) 
  (XFCE_RANDR_POS_X (xfce_randr)  current_x) ) {
 gtk_combo_box_set_active( GTK_COMBO_BOX(position_combo), 2 );
-gtk_combo_box_set_active( GTK_COMBO_BOX(display_combo), index 
);
+gtk_combo_box_set_active( GTK_COMBO_BOX(display_combo), 
cb_index );
 break;
 }
 
@@ -555,7 +555,7 @@ display_setting_guess_positioning (GtkBuilder *builder)
 if ( (XFCE_RANDR_POS_X (xfce_randr) == current_x) 
  (XFCE_RANDR_POS_Y (xfce_randr)  current_y) ) {
 gtk_combo_box_set_active( GTK_COMBO_BOX(position_combo), 3 );
-gtk_combo_box_set_active( GTK_COMBO_BOX(display_combo), index 
);
+gtk_combo_box_set_active( GTK_COMBO_BOX(display_combo), 
cb_index );
 break;
 }
 
@@ -563,11 +563,11 @@ display_setting_guess_positioning (GtkBuilder *builder)
 if ( (XFCE_RANDR_POS_X (xfce_randr) == current_x) 
  (XFCE_RANDR_POS_Y (xfce_randr)  current_y) ) {
 gtk_combo_box_set_active( GTK_COMBO_BOX(position_combo), 4 );
-gtk_combo_box_set_active( GTK_COMBO_BOX(display_combo), index 
);
+gtk_combo_box_set_active( GTK_COMBO_BOX(display_combo), 
cb_index );
 break;
 }
 
-index++;
+cb_index++;
 }
 }
 
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] xfce4-settings:bluesabre/display-settings Connected Advanced button in minimal dialog.

[Nick Schermer]

Updating branch refs/heads/bluesabre/display-settings
 to 2e57f485c4e66edaf405583f880945b9e7ace5a7 (commit)
   from 1499a6c1cc8cf74dd4b5b453830cd9b25302d8fe (commit)

commit 2e57f485c4e66edaf405583f880945b9e7ace5a7
Author: Sean Davis smd.seanda...@gmail.com
Date:   Thu Oct 4 15:55:34 2012 -0400

Connected Advanced button in minimal dialog.

 dialogs/display-settings/main.c |  257 ---
 1 file changed, 156 insertions(+), 101 deletions(-)

diff --git a/dialogs/display-settings/main.c b/dialogs/display-settings/main.c
index 03ebbc5..3b4edb1 100644
--- a/dialogs/display-settings/main.c
+++ b/dialogs/display-settings/main.c
@@ -60,6 +60,13 @@ enum
 N_COMBO_COLUMNS
 };
 
+typedef struct {
+GtkBuilder *builder;
+GdkDisplay  *display;
+gint event_base;
+GError *error;
+} minimal_advanced_context;
+
 
 
 /* Xrandr rotation name conversion */
@@ -1556,15 +1563,158 @@ screen_on_event (GdkXEvent *xevent,
 return GDK_FILTER_CONTINUE;
 }
 
+static void
+display_settings_show_main_dialog (GdkDisplay  *display,
+   gint event_base,
+   GError *error)
+{
+GtkBuilder  *builder;
+GtkWidget   *dialog;
+
+GtkWidget   *plug;
+GObject *plug_child;
+
+/* Load the Gtk user-interface file */
+builder = gtk_builder_new ();
+if (gtk_builder_add_from_string (builder, display_dialog_ui,
+ display_dialog_ui_length, error) != 0)
+{
+/* Build the dialog */
+dialog = display_settings_dialog_new (builder);
+XFCE_RANDR_EVENT_BASE (xfce_randr) = event_base;
+/* Set up notifications */
+XRRSelectInput (gdk_x11_display_get_xdisplay (display),
+GDK_WINDOW_XID (gdk_get_default_root_window ()),
+RRScreenChangeNotifyMask);
+gdk_x11_register_standard_event_type (display,
+  event_base,
+  RRNotify + 1);
+gdk_window_add_filter (gdk_get_default_root_window (), 
screen_on_event, builder);
+
+if (G_UNLIKELY (opt_socket_id == 0))
+{
+g_signal_connect (G_OBJECT (dialog), response,
+G_CALLBACK (display_settings_dialog_response), builder);
+
+/* Show the dialog */
+gtk_window_present (GTK_WINDOW (dialog));
+}
+else
+{
+/* Create plug widget */
+plug = gtk_plug_new (opt_socket_id);
+g_signal_connect (plug, delete-event, G_CALLBACK 
(gtk_main_quit), NULL);
+gtk_widget_show (plug);
+
+/* Get plug child widget */
+plug_child = gtk_builder_get_object (builder, plug-child);
+gtk_widget_reparent (GTK_WIDGET (plug_child), plug);
+gtk_widget_show (GTK_WIDGET (plug_child));
+}
+
+/* To prevent the settings dialog to be saved in the session */
+gdk_set_sm_client_id (FAKE ID);
+
+/* Enter the main loop */
+gtk_main ();
+
+gtk_widget_destroy (dialog);
+}
+else
+{
+g_error (Failed to load the UI file: %s., error-message);
+g_error_free (error);
+}
+
+gdk_window_remove_filter (gdk_get_default_root_window (), screen_on_event, 
builder);
+
+/* Release the builder */
+g_object_unref (G_OBJECT (builder));
+}
+
+static void
+display_settings_minimal_advanced_clicked(GtkButton *button,
+  minimal_advanced_context *context)
+{
+GtkWidget *dialog;
+
+dialog = (GtkWidget *) gtk_builder_get_object (context-builder, dialog);
+gtk_widget_hide( dialog );
+
+display_settings_show_main_dialog( context-display, context-event_base, 
context-error );
+
+gtk_main_quit();
+}
+
+static void
+display_settings_show_minimal_dialog (GdkDisplay  *display,
+  gint event_base,
+  GError *error)
+{
+GtkBuilder  *builder;
+GtkWidget   *dialog, *cancel;
+
+builder = gtk_builder_new ();
+
+if (gtk_builder_add_from_string (builder, minimal_display_dialog_ui,
+ minimal_display_dialog_ui_length, error) 
!= 0)
+{
+GObject *only_display1;
+GObject *only_display2;
+GObject *mirror_displays;
+GObject *extend_right;
+GObject *advanced;
+minimal_advanced_context context;
+
+context.builder = builder;
+context.display = display;
+context.event_base = event_base;
+context.error = error;
+
+/* Build the minimal dialog */
+dialog = (GtkWidget *) gtk_builder_get_object (builder, dialog);
+cancel = (GtkWidget *) gtk_builder_get_object (builder, 
cancel_button);
+
+g_signal_connect (dialog, delete-event, G_CALLBACK 

[Xfce4-commits] xfce4-settings:bluesabre/display-settings Hook up the reworked minimal dialog

[Nick Schermer]

Updating branch refs/heads/bluesabre/display-settings
 to 7f506412224f57f93020b15a9e69ffbb64f82889 (commit)
   from 6575a0c1c9726c30d0cb39f307d597a323762423 (commit)

commit 7f506412224f57f93020b15a9e69ffbb64f82889
Author: Simon Steinbeiss simon.steinbe...@elfenbeinturm.at
Date:   Thu Oct 4 12:24:11 2012 +0200

Hook up the reworked minimal dialog

 dialogs/display-settings/main.c |  288 ---
 1 file changed, 179 insertions(+), 109 deletions(-)

diff --git a/dialogs/display-settings/main.c b/dialogs/display-settings/main.c
index 0640404..c22ffea 100644
--- a/dialogs/display-settings/main.c
+++ b/dialogs/display-settings/main.c
@@ -113,7 +113,7 @@ static gboolean   bound_to_channel = FALSE;
 XfceRandr *xfce_randr = NULL;
 
 static void
-display_settings_minimal_extend_left_toggled (GtkToggleButton *button,
+display_settings_minimal_only_display1_toggled (GtkToggleButton *button,
   GtkBuilder *builder);
   
 static void
@@ -123,7 +123,10 @@ display_settings_minimal_mirror_displays_toggled 
(GtkToggleButton *button,
 static void
 display_settings_minimal_extend_right_toggled (GtkToggleButton *button,
   GtkBuilder *builder);
-
+  
+static void
+display_settings_minimal_only_display2_toggled (GtkToggleButton *button,
+  GtkBuilder *builder);
 
 
 static guint
@@ -1363,134 +1366,193 @@ display_settings_dialog_new (GtkBuilder *builder)
 }
 
 static void
-display_settings_minimal_extend_left_toggled (GtkToggleButton *button,
+display_settings_minimal_only_display1_toggled (GtkToggleButton *button,
   GtkBuilder *builder)
 {
-GObject *mirror_displays;
-GObject *extend_right;
-
-gint selected_x, selected_y;
-XfceRRMode   *current_mode;
+GObject *mirror_displays, *extend_right, *only_display2;
 
 mirror_displays = gtk_builder_get_object(builder, mirror);
 extend_right = gtk_builder_get_object(builder, extend_right);
-
+only_display2 = gtk_builder_get_object(builder, display2);
+
+/* Lock everything in the dialog to prevent bad things from happening */
 g_object_disconnect (mirror_displays, any_signal::toggled,
  display_settings_minimal_mirror_displays_toggled,
  builder, NULL);
- 
 g_object_disconnect (extend_right, any_signal::toggled,
  display_settings_minimal_extend_right_toggled,
  builder, NULL);
+g_object_disconnect (only_display2, any_signal::toggled,
+ display_settings_minimal_only_display2_toggled,
+ builder, NULL);
  
 gtk_widget_set_sensitive( GTK_WIDGET(mirror_displays), FALSE );
 gtk_widget_set_sensitive( GTK_WIDGET(extend_right), FALSE );
-
-/* Since this signal will only be called when a toggle button is 
activated. */
+gtk_widget_set_sensitive( GTK_WIDGET(only_display2), FALSE );
+
 gtk_toggle_button_set_active (button, TRUE);
 gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON(mirror_displays), FALSE);
 gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON(extend_right), FALSE);
+gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON(only_display2), FALSE);
 
-/* Change active output to secondary display. */
-xfce_randr-active_output = 1;
-
-current_mode = xfce_randr_find_mode_by_id (xfce_randr, 
xfce_randr-active_output, XFCE_RANDR_MODE (xfce_randr));
-
-/* Change active output to primary display. */
-xfce_randr-active_output = 0;
+if (!xfce_randr)
+return;
+
+if (xfce_randr-noutput = 1)
+return;
+
+if (gtk_toggle_button_get_active (button))
+{
+   /* Put Display1 in its preferred mode and deactivate Display2 */
+XFCE_RANDR_MODE (xfce_randr) = xfce_randr_preferred_mode (xfce_randr, 
0);
+xfce_randr-active_output = 1;
+XFCE_RANDR_MODE (xfce_randr) = None;
+/* Apply the changes */
+xfce_randr_save_output (xfce_randr, Default, display_channel,0);
+xfce_randr_save_output (xfce_randr, Default, display_channel,1);
+xfce_randr_apply (xfce_randr, Default, display_channel);
+}
 
-/* Move the secondary to where the primary is... */
-selected_x = XFCE_RANDR_POS_X (xfce_randr);
-selected_y = XFCE_RANDR_POS_Y (xfce_randr);
-xfce_randr-active_output = 1;
-XFCE_RANDR_POS_X (xfce_randr) = selected_x;
-XFCE_RANDR_POS_Y (xfce_randr) = selected_y;
+gtk_widget_set_sensitive( GTK_WIDGET(mirror_displays), TRUE );
+gtk_widget_set_sensitive( GTK_WIDGET(extend_right), TRUE );
+gtk_widget_set_sensitive( GTK_WIDGET(only_display2), TRUE );
+
+/* Reconnect the signals 

[Xfce4-commits] xfce4-settings:bluesabre/display-settings Connected main buttons on minimal dialog. Added to display advanced dialog when minimal called and only one display.

[Nick Schermer]

Updating branch refs/heads/bluesabre/display-settings
 to d1ccb38ff9bbd3b9ed7887fffaa86843d9c0b69f (commit)
   from 13cc6a31ba8a89976149034bcd8a9354b3681adf (commit)

commit d1ccb38ff9bbd3b9ed7887fffaa86843d9c0b69f
Author: Sean Davis smd.seanda...@gmail.com
Date:   Thu Sep 27 11:58:01 2012 -0400

Connected main buttons on minimal dialog.  Added to display advanced dialog 
when minimal called and only one display.

 dialogs/display-settings/main.c|  118 +++-
 .../display-settings/minimal-display-dialog.glade  |2 +-
 2 files changed, 117 insertions(+), 3 deletions(-)

diff --git a/dialogs/display-settings/main.c b/dialogs/display-settings/main.c
index 5c61662..eeca298 100644
--- a/dialogs/display-settings/main.c
+++ b/dialogs/display-settings/main.c
@@ -1379,6 +1379,9 @@ display_settings_minimal_extend_left_toggled 
(GtkToggleButton *button,
 GObject *mirror_displays;
 GObject *extend_right;
 
+gint selected_x, selected_y;
+XfceRRMode   *current_mode;
+
 mirror_displays = gtk_builder_get_object(builder, mirror);
 extend_right = gtk_builder_get_object(builder, extend_right);
 
@@ -1389,11 +1392,49 @@ display_settings_minimal_extend_left_toggled 
(GtkToggleButton *button,
 g_object_disconnect (extend_right, any_signal::toggled,
  display_settings_minimal_extend_right_toggled,
  builder, NULL);
+ 
+gtk_widget_set_sensitive( GTK_WIDGET(mirror_displays), FALSE );
+gtk_widget_set_sensitive( GTK_WIDGET(extend_right), FALSE );
 
 /* Since this signal will only be called when a toggle button is 
activated. */
 gtk_toggle_button_set_active (button, TRUE);
 gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON(mirror_displays), FALSE);
 gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON(extend_right), FALSE);
+
+/* Change active output to secondary display. */
+xfce_randr-active_output = 1;
+
+current_mode = xfce_randr_find_mode_by_id (xfce_randr, 
xfce_randr-active_output, XFCE_RANDR_MODE (xfce_randr));
+
+/* Change active output to primary display. */
+xfce_randr-active_output = 0;
+
+/* Move the secondary to where the primary is... */
+selected_x = XFCE_RANDR_POS_X (xfce_randr);
+selected_y = XFCE_RANDR_POS_Y (xfce_randr);
+xfce_randr-active_output = 1;
+XFCE_RANDR_POS_X (xfce_randr) = selected_x;
+XFCE_RANDR_POS_Y (xfce_randr) = selected_y;
+
+/* Move the primary display to the right of the secondary display. */
+xfce_randr-active_output = 0;
+XFCE_RANDR_POS_X (xfce_randr) = current_mode-width;
+
+/* Save changes to secondary display */
+xfce_randr-active_output = 1;
+xfce_randr_save_output (xfce_randr, Default, display_channel,
+xfce_randr-active_output);
+
+/* Save changes to primary display */
+xfce_randr-active_output = 0;
+xfce_randr_save_output (xfce_randr, Default, display_channel,
+xfce_randr-active_output);
+
+/* Apply all changes */
+xfce_randr_apply (xfce_randr, Default, display_channel);
+
+gtk_widget_set_sensitive( GTK_WIDGET(mirror_displays), TRUE );
+gtk_widget_set_sensitive( GTK_WIDGET(extend_right), TRUE );
 
 /* Reconnect the signals */
 g_signal_connect (mirror_displays, toggled, G_CALLBACK 
(display_settings_minimal_mirror_displays_toggled),
@@ -1410,6 +1451,8 @@ display_settings_minimal_mirror_displays_toggled 
(GtkToggleButton *button,
 GObject *extend_left;
 GObject *extend_right;
 
+gint selected_x, selected_y;
+
 extend_left = gtk_builder_get_object(builder, extend_left);
 extend_right = gtk_builder_get_object(builder, extend_right);
 
@@ -1420,11 +1463,39 @@ display_settings_minimal_mirror_displays_toggled 
(GtkToggleButton *button,
 g_object_disconnect (extend_right, any_signal::toggled,
  display_settings_minimal_extend_right_toggled,
  builder, NULL);
+ 
+gtk_widget_set_sensitive( GTK_WIDGET(extend_left), FALSE );
+gtk_widget_set_sensitive( GTK_WIDGET(extend_right), FALSE );
 
 /* Since this signal will only be called when a toggle button is 
activated. */
 gtk_toggle_button_set_active (button, TRUE);
 gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON(extend_left), FALSE);
 gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON(extend_right), FALSE);
+
+xfce_randr-active_output = 0;
+
+selected_x = XFCE_RANDR_POS_X (xfce_randr);
+selected_y = XFCE_RANDR_POS_Y (xfce_randr);
+
+xfce_randr-active_output = 1;
+XFCE_RANDR_POS_X (xfce_randr) = selected_x;
+XFCE_RANDR_POS_Y (xfce_randr) = selected_y;
+
+/* Save changes to secondary display */
+xfce_randr-active_output = 1;
+xfce_randr_save_output (xfce_randr, Default, 

[Xfce4-commits] xfce4-settings:bluesabre/display-settings Changed mode detection to xfce_randr_find_mode_by_id and apply only once.

[Nick Schermer]

Updating branch refs/heads/bluesabre/display-settings
 to ddbfcdac263ac4d85a21eabfb0a859c2bb596071 (commit)
   from d2a415b5314eef158e8a457c69e3b5622b15aae9 (commit)

commit ddbfcdac263ac4d85a21eabfb0a859c2bb596071
Author: Sean Davis smd.seanda...@gmail.com
Date:   Thu Sep 27 06:10:16 2012 -0400

Changed mode detection to xfce_randr_find_mode_by_id and apply only once.

 dialogs/display-settings/main.c |  173 ---
 1 file changed, 72 insertions(+), 101 deletions(-)

diff --git a/dialogs/display-settings/main.c b/dialogs/display-settings/main.c
index f95671f..098e55a 100644
--- a/dialogs/display-settings/main.c
+++ b/dialogs/display-settings/main.c
@@ -247,9 +247,9 @@ static void
 display_setting_positions_changed (GtkComboBox *combobox,
  GtkBuilder  *builder)
 {
-gint value, current_display, selected_display, selected_x, selected_y, n;
+gint value, current_display, selected_display, selected_x, selected_y;
 GObject *display_combobox;
-XfceRRMode   *modes;
+XfceRRMode   *current_mode;
 
 display_combobox = gtk_builder_get_object(builder, 
randr-active-displays);
 
@@ -259,6 +259,7 @@ display_setting_positions_changed (GtkComboBox *combobox,
 if (!display_setting_combo_box_get_value (GTK_COMBO_BOX(display_combobox), 
selected_display))
 return;
 
+/* Skip if the display combobox hasn't made a selection yet */
 if (selected_display == -1) return;
 
 /* Store the Current Display */
@@ -266,129 +267,99 @@ display_setting_positions_changed (GtkComboBox *combobox,
 
 switch (value) {
 case XFCE_RANDR_PLACEMENT_LEFT: // Extend Left
-/* Walk all supported modes of current display */
-modes = XFCE_RANDR_SUPPORTED_MODES (xfce_randr);
-for (n = 0; n  XFCE_RANDR_OUTPUT_INFO (xfce_randr)-nmode; ++n)
-{
-/* Find the current mode. */
-if (modes[n].id == XFCE_RANDR_MODE (xfce_randr))
-{
-/* Change active output to secondary display. */
-xfce_randr-active_output = selected_display;
-
-/* Move the primary to where the secondary is... */
-selected_x = XFCE_RANDR_POS_X (xfce_randr);
-selected_y = XFCE_RANDR_POS_Y (xfce_randr);
-xfce_randr-active_output = current_display;
-XFCE_RANDR_POS_X (xfce_randr) = selected_x;
-XFCE_RANDR_POS_Y (xfce_randr) = selected_y;
-
-xfce_randr-active_output = selected_display;
-/* Move the secondary display to the right of the primary 
display. */
-XFCE_RANDR_POS_X (xfce_randr) = modes[n].width;
-break;
-}
-}
+current_mode = xfce_randr_find_mode_by_id (xfce_randr, 
xfce_randr-active_output, XFCE_RANDR_MODE (xfce_randr));
+
+/* Change active output to secondary display. */
+xfce_randr-active_output = selected_display;
+
+/* Move the primary to where the secondary is... */
+selected_x = XFCE_RANDR_POS_X (xfce_randr);
+selected_y = XFCE_RANDR_POS_Y (xfce_randr);
+xfce_randr-active_output = current_display;
+XFCE_RANDR_POS_X (xfce_randr) = selected_x;
+XFCE_RANDR_POS_Y (xfce_randr) = selected_y;
+
+/* Move the secondary display to the right of the primary display. 
*/
+xfce_randr-active_output = selected_display;
+XFCE_RANDR_POS_X (xfce_randr) = current_mode-width;
 break;
+
 case XFCE_RANDR_PLACEMENT_RIGHT: // Extend Right
 /* Change active output to secondary display. */
 xfce_randr-active_output = selected_display;
 
-/* Find the current mode. */
-modes = XFCE_RANDR_SUPPORTED_MODES (xfce_randr);
-for (n = 0; n  XFCE_RANDR_OUTPUT_INFO (xfce_randr)-nmode; ++n)
-{
-if (modes[n].id == XFCE_RANDR_MODE (xfce_randr))
-{
-/* Change active output to primary display. */
-xfce_randr-active_output = current_display;
-
-/* Move the secondary to where the primary is... */
-selected_x = XFCE_RANDR_POS_X (xfce_randr);
-selected_y = XFCE_RANDR_POS_Y (xfce_randr);
-xfce_randr-active_output = selected_display;
-XFCE_RANDR_POS_X (xfce_randr) = selected_x;
-XFCE_RANDR_POS_Y (xfce_randr) = selected_y;
-
-xfce_randr-active_output = current_display;
-/* Move the primary display to the right of the 

[Xfce4-commits] xfce4-settings:bluesabre/display-settings Added radio states to minimal dialog.

[Nick Schermer]

Updating branch refs/heads/bluesabre/display-settings
 to 7ec05479b669a0bf9300101d692b79bf11ed1448 (commit)
   from 8d1ed825c1e739b63d87083401b4efdee357b09f (commit)

commit 7ec05479b669a0bf9300101d692b79bf11ed1448
Author: Sean Davis smd.seanda...@gmail.com
Date:   Wed Sep 26 06:39:19 2012 -0400

Added radio states to minimal dialog.

 dialogs/display-settings/main.c |  119 +++
 1 file changed, 119 insertions(+)

diff --git a/dialogs/display-settings/main.c b/dialogs/display-settings/main.c
index 86dd15e..fccc3e0 100644
--- a/dialogs/display-settings/main.c
+++ b/dialogs/display-settings/main.c
@@ -112,6 +112,18 @@ static gboolean   bound_to_channel = FALSE;
 /* Pointer to the used randr structure */
 XfceRandr *xfce_randr = NULL;
 
+static void
+display_settings_minimal_extend_left_toggled (GtkToggleButton *button,
+  GtkBuilder *builder);
+  
+static void
+display_settings_minimal_mirror_displays_toggled (GtkToggleButton *button,
+  GtkBuilder *builder);
+  
+static void
+display_settings_minimal_extend_right_toggled (GtkToggleButton *button,
+  GtkBuilder *builder);
+
 
 
 static guint
@@ -1113,6 +1125,99 @@ display_settings_dialog_new (GtkBuilder *builder)
 return GTK_WIDGET (gtk_builder_get_object (builder, display-dialog));
 }
 
+static void
+display_settings_minimal_extend_left_toggled (GtkToggleButton *button,
+  GtkBuilder *builder)
+{
+GObject *mirror_displays;
+GObject *extend_right;
+
+mirror_displays = gtk_builder_get_object(builder, mirror);
+extend_right = gtk_builder_get_object(builder, extend_right);
+
+g_object_disconnect (mirror_displays, any_signal::toggled,
+ display_settings_minimal_mirror_displays_toggled,
+ builder, NULL);
+ 
+g_object_disconnect (extend_right, any_signal::toggled,
+ display_settings_minimal_extend_right_toggled,
+ builder, NULL);
+
+/* Since this signal will only be called when a toggle button is 
activated. */
+gtk_toggle_button_set_active (button, TRUE);
+gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON(mirror_displays), FALSE);
+gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON(extend_right), FALSE);
+
+/* Reconnect the signals */
+g_signal_connect (mirror_displays, toggled, G_CALLBACK 
(display_settings_minimal_mirror_displays_toggled),
+  builder);
+  
+g_signal_connect (extend_right, toggled, G_CALLBACK 
(display_settings_minimal_extend_right_toggled),
+  builder);
+}
+
+static void
+display_settings_minimal_mirror_displays_toggled (GtkToggleButton *button,
+  GtkBuilder *builder)
+{
+GObject *extend_left;
+GObject *extend_right;
+
+extend_left = gtk_builder_get_object(builder, extend_left);
+extend_right = gtk_builder_get_object(builder, extend_right);
+
+g_object_disconnect (extend_left, any_signal::toggled,
+ display_settings_minimal_extend_left_toggled,
+ builder, NULL);
+ 
+g_object_disconnect (extend_right, any_signal::toggled,
+ display_settings_minimal_extend_right_toggled,
+ builder, NULL);
+
+/* Since this signal will only be called when a toggle button is 
activated. */
+gtk_toggle_button_set_active (button, TRUE);
+gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON(extend_left), FALSE);
+gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON(extend_right), FALSE);
+
+/* Reconnect the signals */
+g_signal_connect (extend_left, toggled, G_CALLBACK 
(display_settings_minimal_extend_left_toggled),
+  builder);
+  
+g_signal_connect (extend_right, toggled, G_CALLBACK 
(display_settings_minimal_extend_right_toggled),
+  builder);
+}
+
+static void
+display_settings_minimal_extend_right_toggled (GtkToggleButton *button,
+  GtkBuilder *builder)
+{
+GObject *mirror_displays;
+GObject *extend_left;
+
+mirror_displays = gtk_builder_get_object(builder, mirror);
+extend_left = gtk_builder_get_object(builder, extend_left);
+
+g_object_disconnect (mirror_displays, any_signal::toggled,
+ display_settings_minimal_mirror_displays_toggled,
+ builder, NULL);
+ 
+g_object_disconnect (extend_left, any_signal::toggled,
+ display_settings_minimal_extend_left_toggled,
+   

[Xfce4-commits] xfce4-settings:bluesabre/display-settings Tweak the label-colors in identity-popups

[Nick Schermer]

Updating branch refs/heads/bluesabre/display-settings
 to 487c1b0e364b37a4310827e8192c26b4c47da61a (commit)
   from fac8d97f4d7173c9ebaeb4bdf5f51a5ee7eb03f5 (commit)

commit 487c1b0e364b37a4310827e8192c26b4c47da61a
Author: Simon Steinbeiss simon.steinbe...@elfenbeinturm.at
Date:   Fri Oct 12 14:25:28 2012 +0200

Tweak the label-colors in identity-popups

 dialogs/display-settings/main.c |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/dialogs/display-settings/main.c b/dialogs/display-settings/main.c
index e32bd32..0fcc825 100644
--- a/dialogs/display-settings/main.c
+++ b/dialogs/display-settings/main.c
@@ -1172,14 +1172,14 @@ display_setting_identity_display (gint display_id,
 name = xfce_randr_friendly_name (xfce_randr,
  
xfce_randr-resources-outputs[display_id],
  
xfce_randr-output_info[display_id]-name);
-color_hex = #D0D0D0;
-if ((has_selection)) color_hex = #FF;
+color_hex = #FF;
+if ((has_selection)) color_hex = #EDEDFF;
 
 name_label = g_markup_printf_escaped(span foreground='%s'bigb%s 
%s/b/big/span, color_hex, _(Display:), name);
 gtk_label_set_markup (GTK_LABEL(display_name), name_label);
 g_free (name_label);
 
-details_label = g_markup_printf_escaped(span foreground='#ABABAB'%s 
%i x %i/span, _(Resolution:), screen_width, screen_height);
+details_label = g_markup_printf_escaped(span foreground='%s'%s %i x 
%i/span, color_hex, _(Resolution:), screen_width, screen_height);
 gtk_label_set_markup (GTK_LABEL(display_details), details_label);
 g_free (details_label);
 
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] xfce4-settings:bluesabre/display-settings Fix mirror-mode in combobox

[Nick Schermer]

Updating branch refs/heads/bluesabre/display-settings
 to 2f7699c7ee4db05fa35daf65ac41f5a01336ebc7 (commit)
   from 12143544084112a30e989f12e949b8e515a2b93c (commit)

commit 2f7699c7ee4db05fa35daf65ac41f5a01336ebc7
Author: Simon Steinbeiss simon.steinbe...@elfenbeinturm.at
Date:   Wed Oct 3 15:24:17 2012 +0200

Fix mirror-mode in combobox

 dialogs/display-settings/main.c |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dialogs/display-settings/main.c b/dialogs/display-settings/main.c
index d99df8d..0640404 100644
--- a/dialogs/display-settings/main.c
+++ b/dialogs/display-settings/main.c
@@ -321,8 +321,8 @@ display_setting_positions_changed (GtkComboBox *combobox,
 
 case XFCE_RANDR_PLACEMENT_MIRROR: // Mirror Display
 
-XFCE_RANDR_POS_X (xfce_randr) = selected_x;
-XFCE_RANDR_POS_Y (xfce_randr) = selected_y;
+XFCE_RANDR_POS_X (xfce_randr) = current_x;
+XFCE_RANDR_POS_Y (xfce_randr) = current_y;
 break;
 
 default:
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] xfce4-settings:bluesabre/display-settings Also draw a white border without compositing

[Nick Schermer]

Updating branch refs/heads/bluesabre/display-settings
 to 0b641006b099507b8017bc46777d2606cf7cf4e2 (commit)
   from a130d88717b96708c307b0613bd562a892a19782 (commit)

commit 0b641006b099507b8017bc46777d2606cf7cf4e2
Author: Simon Steinbeiss simon.steinbe...@elfenbeinturm.at
Date:   Wed Oct 10 10:51:23 2012 +0200

Also draw a white border without compositing

 dialogs/display-settings/main.c |3 +++
 1 file changed, 3 insertions(+)

diff --git a/dialogs/display-settings/main.c b/dialogs/display-settings/main.c
index 4b2cf8c..9b5aa69 100644
--- a/dialogs/display-settings/main.c
+++ b/dialogs/display-settings/main.c
@@ -1024,6 +1024,9 @@ display_setting_identity_popup_expose(GtkWidget *popup, 
GdkEventExpose *event, g
 {
 cairo_set_source_rgb(cr, 0.1, 0.1, 0.1);
 cairo_paint (cr);
+cairo_set_source_rgb(cr, 1.0, 1.0, 1.0);
+cairo_rectangle(cr, 0, 0, popup-allocation.width, 
popup-allocation.height);
+cairo_stroke(cr);
 }
 
 /* Draw rounded corners. */
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] xfce4-settings:bluesabre/display-settings Added mirror option to placement settings.

[Nick Schermer]

Updating branch refs/heads/bluesabre/display-settings
 to 83b7bfd1009a1a31044761eb2b9a365156f37cea (commit)
   from ddbfcdac263ac4d85a21eabfb0a859c2bb596071 (commit)

commit 83b7bfd1009a1a31044761eb2b9a365156f37cea
Author: Sean Davis smd.seanda...@gmail.com
Date:   Thu Sep 27 09:12:01 2012 -0400

Added mirror option to placement settings.

 dialogs/display-settings/main.c   |   23 +++
 dialogs/display-settings/xfce-randr.h |1 +
 2 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/dialogs/display-settings/main.c b/dialogs/display-settings/main.c
index 098e55a..d7b9c59 100644
--- a/dialogs/display-settings/main.c
+++ b/dialogs/display-settings/main.c
@@ -344,6 +344,15 @@ display_setting_positions_changed (GtkComboBox *combobox,
 XFCE_RANDR_POS_Y (xfce_randr) = current_mode-height;
 break;
 
+case XFCE_RANDR_PLACEMENT_MIRROR: // Mirror Display
+selected_x = XFCE_RANDR_POS_X (xfce_randr);
+selected_y = XFCE_RANDR_POS_Y (xfce_randr);
+
+xfce_randr-active_output = selected_display;
+XFCE_RANDR_POS_X (xfce_randr) = selected_x;
+XFCE_RANDR_POS_Y (xfce_randr) = selected_y;
+break;
+
 default:
 break;
 }
@@ -388,28 +397,34 @@ display_setting_positions_populate (GtkBuilder *builder)
  display_setting_positions_changed,
  builder, NULL);
 
+/* Insert mirror */
+gtk_list_store_append (GTK_LIST_STORE (model), iter);
+gtk_list_store_set (GTK_LIST_STORE (model), iter,
+COLUMN_COMBO_NAME, _(Mirror),
+COLUMN_COMBO_VALUE, XFCE_RANDR_PLACEMENT_MIRROR, -1);
+
 /* Insert left-of */
 gtk_list_store_append (GTK_LIST_STORE (model), iter);
 gtk_list_store_set (GTK_LIST_STORE (model), iter,
-COLUMN_COMBO_NAME, _(left of),
+COLUMN_COMBO_NAME, _(Left of),
 COLUMN_COMBO_VALUE, XFCE_RANDR_PLACEMENT_LEFT, -1);
 
 /* Insert right-of */
 gtk_list_store_append (GTK_LIST_STORE (model), iter);
 gtk_list_store_set (GTK_LIST_STORE (model), iter,
-COLUMN_COMBO_NAME, _(right of),
+COLUMN_COMBO_NAME, _(Right of),
 COLUMN_COMBO_VALUE, XFCE_RANDR_PLACEMENT_RIGHT, -1);
 
 /* Insert above */
 gtk_list_store_append (GTK_LIST_STORE (model), iter);
 gtk_list_store_set (GTK_LIST_STORE (model), iter,
-COLUMN_COMBO_NAME, _(above),
+COLUMN_COMBO_NAME, _(Above),
 COLUMN_COMBO_VALUE, XFCE_RANDR_PLACEMENT_UP, -1);
 
 /* Insert below */
 gtk_list_store_append (GTK_LIST_STORE (model), iter);
 gtk_list_store_set (GTK_LIST_STORE (model), iter,
-COLUMN_COMBO_NAME, _(below),
+COLUMN_COMBO_NAME, _(Below),
 COLUMN_COMBO_VALUE, XFCE_RANDR_PLACEMENT_DOWN, -1);
 
 
diff --git a/dialogs/display-settings/xfce-randr.h 
b/dialogs/display-settings/xfce-randr.h
index 9aed8de..4f40305 100644
--- a/dialogs/display-settings/xfce-randr.h
+++ b/dialogs/display-settings/xfce-randr.h
@@ -34,6 +34,7 @@
 #define XFCE_RANDR_POS_Y(randr)   
(randr-position[randr-active_output].y)
 #define XFCE_RANDR_ROTATIONS_MASK 
(RR_Rotate_0|RR_Rotate_90|RR_Rotate_180|RR_Rotate_270)
 #define XFCE_RANDR_REFLECTIONS_MASK   (RR_Reflect_X|RR_Reflect_Y)
+#define XFCE_RANDR_PLACEMENT_MIRROR   -1
 #define XFCE_RANDR_PLACEMENT_UP   0
 #define XFCE_RANDR_PLACEMENT_RIGHT1
 #define XFCE_RANDR_PLACEMENT_DOWN 2
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] xfce4-settings:bluesabre/display-settings Fixed placement of displays when changing often.

[Nick Schermer]

Updating branch refs/heads/bluesabre/display-settings
 to d2a415b5314eef158e8a457c69e3b5622b15aae9 (commit)
   from 7c45c31da0a14f22dc1aec02e94361674fac68e3 (commit)

commit d2a415b5314eef158e8a457c69e3b5622b15aae9
Author: Sean Davis smd.seanda...@gmail.com
Date:   Wed Sep 26 19:23:33 2012 -0400

Fixed placement of displays when changing often.

 dialogs/display-settings/main.c |   38 +-
 1 file changed, 37 insertions(+), 1 deletion(-)

diff --git a/dialogs/display-settings/main.c b/dialogs/display-settings/main.c
index f7eacd9..f95671f 100644
--- a/dialogs/display-settings/main.c
+++ b/dialogs/display-settings/main.c
@@ -247,7 +247,7 @@ static void
 display_setting_positions_changed (GtkComboBox *combobox,
  GtkBuilder  *builder)
 {
-gint value, current_display, selected_display, n;
+gint value, current_display, selected_display, selected_x, selected_y, n;
 GObject *display_combobox;
 XfceRRMode   *modes;
 
@@ -275,6 +275,15 @@ display_setting_positions_changed (GtkComboBox *combobox,
 {
 /* Change active output to secondary display. */
 xfce_randr-active_output = selected_display;
+
+/* Move the primary to where the secondary is... */
+selected_x = XFCE_RANDR_POS_X (xfce_randr);
+selected_y = XFCE_RANDR_POS_Y (xfce_randr);
+xfce_randr-active_output = current_display;
+XFCE_RANDR_POS_X (xfce_randr) = selected_x;
+XFCE_RANDR_POS_Y (xfce_randr) = selected_y;
+
+xfce_randr-active_output = selected_display;
 /* Move the secondary display to the right of the primary 
display. */
 XFCE_RANDR_POS_X (xfce_randr) = modes[n].width;
 break;
@@ -293,6 +302,15 @@ display_setting_positions_changed (GtkComboBox *combobox,
 {
 /* Change active output to primary display. */
 xfce_randr-active_output = current_display;
+
+/* Move the secondary to where the primary is... */
+selected_x = XFCE_RANDR_POS_X (xfce_randr);
+selected_y = XFCE_RANDR_POS_Y (xfce_randr);
+xfce_randr-active_output = selected_display;
+XFCE_RANDR_POS_X (xfce_randr) = selected_x;
+XFCE_RANDR_POS_Y (xfce_randr) = selected_y;
+
+xfce_randr-active_output = current_display;
 /* Move the primary display to the right of the secondary 
display. */
 XFCE_RANDR_POS_X (xfce_randr) = modes[n].width;
 break;
@@ -309,6 +327,15 @@ display_setting_positions_changed (GtkComboBox *combobox,
 {
 /* Change active output to secondary display. */
 xfce_randr-active_output = selected_display;
+
+/* Move the primary to where the secondary is... */
+selected_x = XFCE_RANDR_POS_X (xfce_randr);
+selected_y = XFCE_RANDR_POS_Y (xfce_randr);
+xfce_randr-active_output = current_display;
+XFCE_RANDR_POS_X (xfce_randr) = selected_x;
+XFCE_RANDR_POS_Y (xfce_randr) = selected_y;
+
+xfce_randr-active_output = selected_display;
 /* Move the secondary display to the above the primary 
display. */
 XFCE_RANDR_POS_Y (xfce_randr) = modes[n].height;
 break;
@@ -327,6 +354,15 @@ display_setting_positions_changed (GtkComboBox *combobox,
 {
 /* Change active output to primary display. */
 xfce_randr-active_output = current_display;
+
+/* Move the secondary to where the primary is... */
+selected_x = XFCE_RANDR_POS_X (xfce_randr);
+selected_y = XFCE_RANDR_POS_Y (xfce_randr);
+xfce_randr-active_output = selected_display;
+XFCE_RANDR_POS_X (xfce_randr) = selected_x;
+XFCE_RANDR_POS_Y (xfce_randr) = selected_y;
+
+xfce_randr-active_output = current_display;
 /* Move the primary display to the below the secondary 
display. */
 XFCE_RANDR_POS_Y (xfce_randr) = modes[n].height;
 break;
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] xfce4-settings:bluesabre/display-settings Added bottomside identity popups for displays.

[Nick Schermer]

Updating branch refs/heads/bluesabre/display-settings
 to dd037637961e26994a33adc38f6fe6d7ce74d14c (commit)
   from 2e57f485c4e66edaf405583f880945b9e7ace5a7 (commit)

commit dd037637961e26994a33adc38f6fe6d7ce74d14c
Author: Sean Davis smd.seanda...@gmail.com
Date:   Fri Oct 5 07:21:49 2012 -0400

Added bottomside identity popups for displays.

 dialogs/display-settings/Makefile.am  |   10 +-
 dialogs/display-settings/identity-popup.glade |   72 
 dialogs/display-settings/main.c   |  146 -
 3 files changed, 225 insertions(+), 3 deletions(-)

diff --git a/dialogs/display-settings/Makefile.am 
b/dialogs/display-settings/Makefile.am
index c768893..86137d9 100644
--- a/dialogs/display-settings/Makefile.am
+++ b/dialogs/display-settings/Makefile.am
@@ -19,6 +19,7 @@ xfce4_display_settings_SOURCES = \
confirmation-dialog_ui.h \
display-dialog_ui.h \
minimal-display-dialog_ui.h \
+   identity-popup_ui.h \
display-name.c \
edid-parse.c \
edid.h
@@ -49,7 +50,8 @@ if MAINTAINER_MODE
 BUILT_SOURCES = \
confirmation-dialog_ui.h \
display-dialog_ui.h \
-   minimal-display-dialog_ui.h
+   minimal-display-dialog_ui.h \
+   identity-popup_ui.h
 
 confirmation-dialog_ui.h: confirmation-dialog.glade
exo-csource --static --strip-comments --strip-content 
--name=confirmation_dialog_ui $ $@
@@ -59,6 +61,9 @@ display-dialog_ui.h: display-dialog.glade
 
 minimal-display-dialog_ui.h: minimal-display-dialog.glade
exo-csource --static --strip-comments --strip-content 
--name=minimal_display_dialog_ui $ $@
+   
+identity-popup_ui.h: identity-popup.glade
+   exo-csource --static --strip-comments --strip-content 
--name=identity_popup_ui $ $@
 
 endif
 
@@ -72,7 +77,8 @@ EXTRA_DIST = \
$(desktop_in_files) \
confirmation-dialog.glade \
display-dialog.glade \
-   minimal-display-dialog.glade
+   minimal-display-dialog.glade \
+   identity-popup.glade
 
 DISTCLEANFILES = \
$(desktop_DATA)
diff --git a/dialogs/display-settings/identity-popup.glade 
b/dialogs/display-settings/identity-popup.glade
new file mode 100644
index 000..896ff80
--- /dev/null
+++ b/dialogs/display-settings/identity-popup.glade
@@ -0,0 +1,72 @@
+?xml version=1.0 encoding=UTF-8?
+interface
+  requires lib=gtk+ version=2.24/
+  !-- interface-naming-policy project-wide --
+  object class=GtkWindow id=popup
+property name=can_focusFalse/property
+property name=typepopup/property
+property name=default_height64/property
+property name=type_hintnotification/property
+property name=gravitysouth/property
+child
+  object class=GtkHBox id=hbox1
+property name=visibleTrue/property
+property name=can_focusFalse/property
+property name=border_width6/property
+property name=spacing12/property
+child
+  object class=GtkImage id=image1
+property name=visibleTrue/property
+property name=can_focusFalse/property
+property name=pixel_size48/property
+property name=icon_namecomputer/property
+property name=icon-size6/property
+  /object
+  packing
+property name=expandTrue/property
+property name=fillTrue/property
+property name=position0/property
+  /packing
+/child
+child
+  object class=GtkVBox id=vbox1
+property name=visibleTrue/property
+property name=can_focusFalse/property
+child
+  object class=GtkLabel id=display_name
+property name=visibleTrue/property
+property name=can_focusFalse/property
+property name=xalign0/property
+property name=label 
translatable=yeslt;biggt;lt;bgt;Display: 
Namelt;/bgt;lt;/biggt;/property
+property name=use_markupTrue/property
+  /object
+  packing
+property name=expandTrue/property
+property name=fillTrue/property
+property name=position0/property
+  /packing
+/child
+child
+  object class=GtkLabel id=display_details
+property name=visibleTrue/property
+property name=can_focusFalse/property
+property name=xalign0/property
+property name=label translatable=yesResolution: 1280 x 
800, Refresh Rate: 60.0 Hz/property
+  /object
+  packing
+property name=expandTrue/property
+property name=fillTrue/property
+property name=position1/property
+  /packing
+/child
+  /object
+  packing
+property name=expandTrue/property
+property name=fillTrue/property
+property 

[Xfce4-commits] xfce4-settings:bluesabre/display-settings Fix for -1 is list terminator on mirror variable.

[Nick Schermer]

Updating branch refs/heads/bluesabre/display-settings
 to 04d492c4cc626a50cfefcc04751d43ce856dec1d (commit)
   from 83b7bfd1009a1a31044761eb2b9a365156f37cea (commit)

commit 04d492c4cc626a50cfefcc04751d43ce856dec1d
Author: Sean Davis smd.seanda...@gmail.com
Date:   Thu Sep 27 09:18:33 2012 -0400

Fix for -1 is list terminator on mirror variable.

 dialogs/display-settings/main.c   |1 -
 dialogs/display-settings/xfce-randr.h |2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/dialogs/display-settings/main.c b/dialogs/display-settings/main.c
index d7b9c59..79a948a 100644
--- a/dialogs/display-settings/main.c
+++ b/dialogs/display-settings/main.c
@@ -426,7 +426,6 @@ display_setting_positions_populate (GtkBuilder *builder)
 gtk_list_store_set (GTK_LIST_STORE (model), iter,
 COLUMN_COMBO_NAME, _(Below),
 COLUMN_COMBO_VALUE, XFCE_RANDR_PLACEMENT_DOWN, -1);
-
 
 /* Reconnect the signal */
 g_signal_connect (G_OBJECT (combobox), changed, G_CALLBACK 
(display_setting_positions_changed), builder);
diff --git a/dialogs/display-settings/xfce-randr.h 
b/dialogs/display-settings/xfce-randr.h
index 4f40305..78a0e7e 100644
--- a/dialogs/display-settings/xfce-randr.h
+++ b/dialogs/display-settings/xfce-randr.h
@@ -34,11 +34,11 @@
 #define XFCE_RANDR_POS_Y(randr)   
(randr-position[randr-active_output].y)
 #define XFCE_RANDR_ROTATIONS_MASK 
(RR_Rotate_0|RR_Rotate_90|RR_Rotate_180|RR_Rotate_270)
 #define XFCE_RANDR_REFLECTIONS_MASK   (RR_Reflect_X|RR_Reflect_Y)
-#define XFCE_RANDR_PLACEMENT_MIRROR   -1
 #define XFCE_RANDR_PLACEMENT_UP   0
 #define XFCE_RANDR_PLACEMENT_RIGHT1
 #define XFCE_RANDR_PLACEMENT_DOWN 2
 #define XFCE_RANDR_PLACEMENT_LEFT 3
+#define XFCE_RANDR_PLACEMENT_MIRROR   4
 
 /* check for randr 1.3 or better */
 #if RANDR_MAJOR  1 || (RANDR_MAJOR == 1  RANDR_MINOR = 3)
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] xfce4-settings:bluesabre/display-settings Fix whitespace error

[Nick Schermer]

Updating branch refs/heads/bluesabre/display-settings
 to c3036362dbffe9a9cafff721960a89bdd828e957 (commit)
   from 72d36dce758f1d9168d3f11c78af9da02a1ed93f (commit)

commit c3036362dbffe9a9cafff721960a89bdd828e957
Author: Simon Steinbeiss simon.steinbe...@elfenbeinturm.at
Date:   Tue Oct 16 01:10:30 2012 +0200

Fix whitespace error

 dialogs/display-settings/main.c |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dialogs/display-settings/main.c b/dialogs/display-settings/main.c
index d4a60aa..ce246ee 100644
--- a/dialogs/display-settings/main.c
+++ b/dialogs/display-settings/main.c
@@ -550,7 +550,7 @@ display_setting_guess_positioning (GtkBuilder *builder)
 if (n != active_output)
 {
 /* Check for mirror */
-if ( (xfce_randr-position[n].x == current_x)  
+if ( (xfce_randr-position[n].x == current_x) 
  (xfce_randr-position[n].y == current_y) ) {
 gtk_combo_box_set_active( GTK_COMBO_BOX(position_combo), 0 );
 gtk_combo_box_set_active( GTK_COMBO_BOX(display_combo), 
cb_index );
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] xfce4-settings:bluesabre/display-settings Added current setup detection to minimal dialog.

[Nick Schermer]

Updating branch refs/heads/bluesabre/display-settings
 to 1d174393625714b25975ec9e9675f40500f60b24 (commit)
   from 4fa8b017408126006b653e758b8ca38b47f98b1a (commit)

commit 1d174393625714b25975ec9e9675f40500f60b24
Author: Sean Davis smd.seanda...@gmail.com
Date:   Tue Oct 16 05:56:49 2012 -0400

Added current setup detection to minimal dialog.

 dialogs/display-settings/confirmation-dialog.glade |1 +
 dialogs/display-settings/main.c|   31 +
 .../display-settings/minimal-display-dialog.glade  |   35 ++--
 3 files changed, 57 insertions(+), 10 deletions(-)

diff --git a/dialogs/display-settings/confirmation-dialog.glade 
b/dialogs/display-settings/confirmation-dialog.glade
index 7b91c7a..fe2bdca 100644
--- a/dialogs/display-settings/confirmation-dialog.glade
+++ b/dialogs/display-settings/confirmation-dialog.glade
@@ -7,6 +7,7 @@
 property name=border_width5/property
 property name=title translatable=yesConfirmation/property
 property name=resizableFalse/property
+property name=modalTrue/property
 property name=window_positioncenter/property
 property name=icon_namedialog-question/property
 property name=type_hintnormal/property
diff --git a/dialogs/display-settings/main.c b/dialogs/display-settings/main.c
index 51c5091..ac79f14 100644
--- a/dialogs/display-settings/main.c
+++ b/dialogs/display-settings/main.c
@@ -1952,6 +1952,7 @@ display_settings_show_minimal_dialog (GdkDisplay  
*display,
 GObject *mirror_displays;
 GObject *extend_right;
 GObject *advanced;
+GObject *fake_button;
 minimal_advanced_context context;
 
 context.builder = builder;
@@ -1971,6 +1972,36 @@ display_settings_show_minimal_dialog (GdkDisplay  
*display,
 extend_right = gtk_builder_get_object (builder, extend_right);
 only_display2 = gtk_builder_get_object (builder, display2);
 advanced = gtk_builder_get_object (builder, advanced_button);
+fake_button = gtk_builder_get_object (builder, fake_button);
+
+gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(fake_button), TRUE);
+
+//
+if ( display_settings_get_n_active_outputs() == 1 )
+{
+gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(only_display1),
+ xfce_randr-mode[0] != None);
+gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(only_display2),
+ xfce_randr-mode[1] != None);
+}
+else
+{
+/* Check for mirror */
+if ( (xfce_randr-position[0].x == xfce_randr-position[1].x )  
+ (xfce_randr-position[0].y == xfce_randr-position[1].y) ) {
+
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(mirror_displays),
+ TRUE);
+}
+
+/* Check for Extend Right */
+if ( (xfce_randr-position[0].y == xfce_randr-position[1].y) 
+ (xfce_randr-position[0].x  xfce_randr-position[1].x) ) {
+gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(extend_right),
+ TRUE);
+}
+}
+
+//
 
 g_signal_connect (only_display1, toggled, G_CALLBACK 
(display_settings_minimal_only_display1_toggled),
   builder);
diff --git a/dialogs/display-settings/minimal-display-dialog.glade 
b/dialogs/display-settings/minimal-display-dialog.glade
index abaf02a..888d855 100644
--- a/dialogs/display-settings/minimal-display-dialog.glade
+++ b/dialogs/display-settings/minimal-display-dialog.glade
@@ -89,7 +89,6 @@
 property name=can_focusTrue/property
 property name=receives_defaultFalse/property
 property name=use_action_appearanceFalse/property
-property name=activeTrue/property
 property name=draw_indicatorFalse/property
 child
   object class=GtkImage id=image1
@@ -100,8 +99,8 @@
 /child
   /object
   packing
-property name=x_options/property
-property name=y_options/property
+property name=x_options/
+property name=y_options/
   /packing
 /child
 child
@@ -126,8 +125,8 @@
   packing
 property name=left_attach1/property
 property name=right_attach2/property
-property name=x_options/property
-property name=y_options/property
+property name=x_options/
+property name=y_options/
   /packing
 /child
 child
@@ -152,8 +151,8 @@
   packing
 property name=left_attach2/property
 property 

[Xfce4-commits] xfce4-settings:bluesabre/display-settings Fix check for compositing

[Nick Schermer]

Updating branch refs/heads/bluesabre/display-settings
 to de05a685e10a8eedd60081830481cb4690f29223 (commit)
   from 6d490988e1f3546a5db3f32ce21b519776783778 (commit)

commit de05a685e10a8eedd60081830481cb4690f29223
Author: Simon Steinbeiss simon.steinbe...@elfenbeinturm.at
Date:   Tue Oct 9 17:44:10 2012 +0200

Fix check for compositing

 dialogs/display-settings/main.c |   10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/dialogs/display-settings/main.c b/dialogs/display-settings/main.c
index b7f3e3e..4b2cf8c 100644
--- a/dialogs/display-settings/main.c
+++ b/dialogs/display-settings/main.c
@@ -997,14 +997,14 @@ display_setting_screen_changed(GtkWidget *widget, 
GdkScreen *old_screen, gpointe
 GdkScreen *screen = gtk_widget_get_screen(widget);
 GdkColormap *colormap = gdk_screen_get_rgba_colormap(screen);
 
-if (!colormap)
+if (gdk_screen_is_composited(screen))
 {
-colormap = gdk_screen_get_rgb_colormap(screen);
-supports_alpha = FALSE;
+supports_alpha = TRUE;
 }
 else
 {
-supports_alpha = TRUE;
+colormap = gdk_screen_get_rgb_colormap(screen);
+supports_alpha = FALSE;
 }
 
 gtk_widget_set_colormap(widget, colormap);
@@ -1026,7 +1026,7 @@ display_setting_identity_popup_expose(GtkWidget *popup, 
GdkEventExpose *event, g
 cairo_paint (cr);
 }
 
-/* Draw rounded corners. FIXME Does not work with xfce compositor off. */
+/* Draw rounded corners. */
 else
 {
 cairo_set_source_rgba(cr, 0, 0, 0, 0);
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] xfce4-settings:bluesabre/display-settings Super simplification of minimal dialog and code.

[Nick Schermer]

Updating branch refs/heads/bluesabre/display-settings
 to 1499a6c1cc8cf74dd4b5b453830cd9b25302d8fe (commit)
   from 07b666ad15773ed01ecc742a4305c2c8368927b9 (commit)

commit 1499a6c1cc8cf74dd4b5b453830cd9b25302d8fe
Author: Sean Davis smd.seanda...@gmail.com
Date:   Thu Oct 4 14:03:25 2012 -0400

Super simplification of minimal dialog and code.

 dialogs/display-settings/main.c|  225 ++--
 .../display-settings/minimal-display-dialog.glade  |  161 +++---
 2 files changed, 147 insertions(+), 239 deletions(-)

diff --git a/dialogs/display-settings/main.c b/dialogs/display-settings/main.c
index e57ba21..03ebbc5 100644
--- a/dialogs/display-settings/main.c
+++ b/dialogs/display-settings/main.c
@@ -1367,158 +1367,86 @@ display_settings_dialog_new (GtkBuilder *builder)
 
 static void
 display_settings_minimal_only_display1_toggled (GtkToggleButton *button,
-  GtkBuilder *builder)
+GtkBuilder  *builder)
 {
-GObject *mirror_displays, *extend_right, *only_display2;
+GObject *buttons;
 
-mirror_displays = gtk_builder_get_object(builder, mirror);
-extend_right = gtk_builder_get_object(builder, extend_right);
-only_display2 = gtk_builder_get_object(builder, display2);
-
-/* Lock everything in the dialog to prevent bad things from happening */
-g_object_disconnect (mirror_displays, any_signal::toggled,
- display_settings_minimal_mirror_displays_toggled,
- builder, NULL);
-g_object_disconnect (extend_right, any_signal::toggled,
- display_settings_minimal_extend_right_toggled,
- builder, NULL);
-g_object_disconnect (only_display2, any_signal::toggled,
- display_settings_minimal_only_display2_toggled,
- builder, NULL);
- 
-gtk_widget_set_sensitive( GTK_WIDGET(mirror_displays), FALSE );
-gtk_widget_set_sensitive( GTK_WIDGET(extend_right), FALSE );
-gtk_widget_set_sensitive( GTK_WIDGET(only_display2), FALSE );
-
-gtk_toggle_button_set_active (button, TRUE);
-gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON(mirror_displays), FALSE);
-gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON(extend_right), FALSE);
-gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON(only_display2), FALSE);
+if ( !gtk_toggle_button_get_active(button) ) 
+return;
 
 if (!xfce_randr)
 return;
 
 if (xfce_randr-noutput = 1)
 return;
+
+buttons = gtk_builder_get_object(builder, buttons);
+gtk_widget_set_sensitive( GTK_WIDGET(buttons), FALSE );
 
-if (gtk_toggle_button_get_active (button))
-{
-   /* Put Display1 in its preferred mode and deactivate Display2 */
-XFCE_RANDR_MODE (xfce_randr) = xfce_randr_preferred_mode (xfce_randr, 
0);
-xfce_randr-active_output = 1;
-XFCE_RANDR_MODE (xfce_randr) = None;
-/* Apply the changes */
-xfce_randr_save_output (xfce_randr, Default, display_channel,0);
-xfce_randr_save_output (xfce_randr, Default, display_channel,1);
-xfce_randr_apply (xfce_randr, Default, display_channel);
-}
+   /* Put Display1 in its preferred mode and deactivate Display2 */
+XFCE_RANDR_MODE (xfce_randr) = xfce_randr_preferred_mode (xfce_randr, 0);
+xfce_randr-active_output = 1;
+XFCE_RANDR_MODE (xfce_randr) = None;
 
-gtk_widget_set_sensitive( GTK_WIDGET(mirror_displays), TRUE );
-gtk_widget_set_sensitive( GTK_WIDGET(extend_right), TRUE );
-gtk_widget_set_sensitive( GTK_WIDGET(only_display2), TRUE );
-
-/* Reconnect the signals */
-g_signal_connect (mirror_displays, toggled, G_CALLBACK 
(display_settings_minimal_mirror_displays_toggled),
-  builder);
-g_signal_connect (extend_right, toggled, G_CALLBACK 
(display_settings_minimal_extend_right_toggled),
-  builder);
-g_signal_connect (only_display2, toggled, G_CALLBACK 
(display_settings_minimal_only_display2_toggled),
-  builder);
+/* Apply the changes */
+xfce_randr_save_output (xfce_randr, Default, display_channel,0);
+xfce_randr_save_output (xfce_randr, Default, display_channel,1);
+xfce_randr_apply (xfce_randr, Default, display_channel);
+
+gtk_widget_set_sensitive( GTK_WIDGET(buttons), TRUE );
 }
 
 static void
 display_settings_minimal_only_display2_toggled (GtkToggleButton *button,
-  GtkBuilder *builder)
+GtkBuilder  *builder)
 {
-GObject *mirror_displays, *extend_right, *only_display1;
+GObject *buttons;
 
-mirror_displays = gtk_builder_get_object(builder, mirror);
-extend_right = gtk_builder_get_object(builder, extend_right);
-

[Xfce4-commits] xfce4-settings:bluesabre/display-settings Ask for user-confirmation upon changing positions (and offer to restore)

[Nick Schermer]

Updating branch refs/heads/bluesabre/display-settings
 to 3d960a6ef9334fb88492d21cba9a6bb89c634119 (commit)
   from 85ea3069a1c06fc5c4e29f0f8ee80cc7d1f852c2 (commit)

commit 3d960a6ef9334fb88492d21cba9a6bb89c634119
Author: Simon Steinbeiss simon.steinbe...@elfenbeinturm.at
Date:   Mon Oct 1 17:18:28 2012 +0200

Ask for user-confirmation upon changing positions
(and offer to restore)

 dialogs/display-settings/main.c |   49 ++-
 1 file changed, 48 insertions(+), 1 deletion(-)

diff --git a/dialogs/display-settings/main.c b/dialogs/display-settings/main.c
index 21d1f74..57c8ae8 100644
--- a/dialogs/display-settings/main.c
+++ b/dialogs/display-settings/main.c
@@ -247,7 +247,7 @@ static void
 display_setting_positions_changed (GtkComboBox *combobox,
  GtkBuilder  *builder)
 {
-gint value, current_display, selected_display, selected_x, selected_y;
+gint value, current_display, selected_display, selected_x, selected_y, 
old_x1, old_y1, old_x2, old_y2;
 GObject *display_combobox;
 XfceRRMode   *current_mode;
 
@@ -275,10 +275,19 @@ display_setting_positions_changed (GtkComboBox *combobox,
 /* Move the primary to where the secondary is... */
 selected_x = XFCE_RANDR_POS_X (xfce_randr);
 selected_y = XFCE_RANDR_POS_Y (xfce_randr);
+
 xfce_randr-active_output = current_display;
+
+/* Save positions to be able to restore */
+old_x2 = selected_x; old_y2 = selected_y;
+old_x1 = XFCE_RANDR_POS_X (xfce_randr);
+old_y1 = XFCE_RANDR_POS_Y (xfce_randr);
+
 XFCE_RANDR_POS_X (xfce_randr) = selected_x;
 XFCE_RANDR_POS_Y (xfce_randr) = selected_y;
 
+
+
 /* Move the secondary display to the right of the primary display. 
*/
 xfce_randr-active_output = selected_display;
 XFCE_RANDR_POS_X (xfce_randr) = current_mode-width;
@@ -297,6 +306,12 @@ display_setting_positions_changed (GtkComboBox *combobox,
 selected_x = XFCE_RANDR_POS_X (xfce_randr);
 selected_y = XFCE_RANDR_POS_Y (xfce_randr);
 xfce_randr-active_output = selected_display;
+
+/* Save positions to be able to restore */
+old_x1 = selected_x; old_y1 = selected_y;
+old_x2 = XFCE_RANDR_POS_X (xfce_randr);
+old_y2 = XFCE_RANDR_POS_Y (xfce_randr);
+
 XFCE_RANDR_POS_X (xfce_randr) = selected_x;
 XFCE_RANDR_POS_Y (xfce_randr) = selected_y;
 
@@ -315,6 +330,12 @@ display_setting_positions_changed (GtkComboBox *combobox,
 selected_x = XFCE_RANDR_POS_X (xfce_randr);
 selected_y = XFCE_RANDR_POS_Y (xfce_randr);
 xfce_randr-active_output = current_display;
+
+/* Save positions to be able to restore */
+old_x2 = selected_x; old_y2 = selected_y;
+old_x1 = XFCE_RANDR_POS_X (xfce_randr);
+old_y1 = XFCE_RANDR_POS_Y (xfce_randr);
+
 XFCE_RANDR_POS_X (xfce_randr) = selected_x;
 XFCE_RANDR_POS_Y (xfce_randr) = selected_y;
 
@@ -336,6 +357,12 @@ display_setting_positions_changed (GtkComboBox *combobox,
 selected_x = XFCE_RANDR_POS_X (xfce_randr);
 selected_y = XFCE_RANDR_POS_Y (xfce_randr);
 xfce_randr-active_output = selected_display;
+
+/* Save positions to be able to restore */
+old_x1 = selected_x; old_y1 = selected_y;
+old_x2 = XFCE_RANDR_POS_X (xfce_randr);
+old_y2 = XFCE_RANDR_POS_Y (xfce_randr);
+
 XFCE_RANDR_POS_X (xfce_randr) = selected_x;
 XFCE_RANDR_POS_Y (xfce_randr) = selected_y;
 
@@ -369,6 +396,26 @@ display_setting_positions_changed (GtkComboBox *combobox,
 
 /* Apply all changes */
 xfce_randr_apply (xfce_randr, Default, display_channel);
+
+/* Ask user confirmation */
+if (!display_setting_timed_confirmation (builder))
+{
+/* Restore the primary display */
+xfce_randr-active_output = current_display;
+XFCE_RANDR_POS_X (xfce_randr) = old_x1;
+XFCE_RANDR_POS_Y (xfce_randr) = old_y1;
+xfce_randr_save_output (xfce_randr, Default, display_channel,
+xfce_randr-active_output);
+
+/* Restore the secondary display */
+xfce_randr-active_output = selected_display;
+XFCE_RANDR_POS_X (xfce_randr) = old_x2;
+XFCE_RANDR_POS_Y (xfce_randr) = old_y2;
+xfce_randr_save_output (xfce_randr, Default, display_channel,
+xfce_randr-active_output);
+
+xfce_randr_apply (xfce_randr, Default, display_channel);
+}
 }
 
 static void

[Xfce4-commits] xfce4-settings:bluesabre/display-settings Drop XFCE_RANDR_* macros

[Nick Schermer]

Updating branch refs/heads/bluesabre/display-settings
 to 72d36dce758f1d9168d3f11c78af9da02a1ed93f (commit)
   from 9e5481cb8a2d00f2c77e12b7e15f1f0a586a3927 (commit)

commit 72d36dce758f1d9168d3f11c78af9da02a1ed93f
Author: Lionel Le Folgoc lio...@lefolgoc.net
Date:   Mon Oct 15 22:52:47 2012 +0200

Drop XFCE_RANDR_* macros

It lead to do insane stuff with xfce_randr-active_output.

Signed-off-by: Simon Steinbeiss simon.steinbe...@elfenbeinturm.at

 dialogs/display-settings/main.c   |  272 +++--
 dialogs/display-settings/xfce-randr.h |   15 +-
 2 files changed, 127 insertions(+), 160 deletions(-)

diff --git a/dialogs/display-settings/main.c b/dialogs/display-settings/main.c
index 560a37c..d4a60aa 100644
--- a/dialogs/display-settings/main.c
+++ b/dialogs/display-settings/main.c
@@ -80,11 +80,11 @@ typedef struct {
 /* Xrandr relation name conversion */
 static const XfceRelation relation_names[] =
 {
-{ XFCE_RANDR_PLACEMENT_MIRROR,   N_(Same as) },
-{ XFCE_RANDR_PLACEMENT_UP, N_(Above) },
-{ XFCE_RANDR_PLACEMENT_DOWN, N_(Below) },
-{ XFCE_RANDR_PLACEMENT_RIGHT, N_(Right of) },
-{ XFCE_RANDR_PLACEMENT_LEFT,  N_(Left of) }
+{ XFCE_RANDR_PLACEMENT_MIRROR, N_(Same as) },
+{ XFCE_RANDR_PLACEMENT_UP, N_(Above) },
+{ XFCE_RANDR_PLACEMENT_DOWN,   N_(Below) },
+{ XFCE_RANDR_PLACEMENT_RIGHT,  N_(Right of) },
+{ XFCE_RANDR_PLACEMENT_LEFT,   N_(Left of) }
 };
 
 
@@ -136,6 +136,9 @@ static GOptionEntry option_entries[] =
 static XfconfChannel *display_channel;
 static gboolean   bound_to_channel = FALSE;
 
+/* output currently selected in the treeview */
+static guint active_output;
+
 /* Pointer to the used randr structure */
 XfceRandr *xfce_randr = NULL;
 
@@ -305,7 +308,7 @@ static void
 display_setting_positions_changed (GtkComboBox *combobox,
  GtkBuilder  *builder)
 {
-gint value, current_display, current_x, current_y, selected_display, 
selected_x, selected_y;
+gint value, current_x, current_y, selected_display, selected_x, selected_y;
 GObject *display_combobox;
 XfceRRMode   *current_mode, *selected_mode;
 
@@ -321,66 +324,62 @@ display_setting_positions_changed (GtkComboBox *combobox,
 if (selected_display == -1) return;
 
 /* Store the currently active display's position and mode */
-current_display = xfce_randr-active_output;
-current_mode = xfce_randr_find_mode_by_id (xfce_randr, current_display, 
XFCE_RANDR_MODE (xfce_randr));
-current_x = XFCE_RANDR_POS_X (xfce_randr);
-current_y = XFCE_RANDR_POS_Y (xfce_randr);
+current_mode = xfce_randr_find_mode_by_id (xfce_randr, active_output,
+   
xfce_randr-mode[active_output]);
+current_x = xfce_randr-position[active_output].x;
+current_y = xfce_randr-position[active_output].y;
 
 /* Store the selected display's position and mode */
-xfce_randr-active_output = selected_display;
-selected_mode = xfce_randr_find_mode_by_id (xfce_randr, selected_display, 
XFCE_RANDR_MODE (xfce_randr));
-selected_x = XFCE_RANDR_POS_X (xfce_randr);
-selected_y = XFCE_RANDR_POS_Y (xfce_randr);
+selected_mode = xfce_randr_find_mode_by_id (xfce_randr, selected_display,
+
xfce_randr-mode[selected_display]);
+selected_x = xfce_randr-position[selected_display].x;
+selected_y = xfce_randr-position[selected_display].y;
 
 switch (value) {
 case XFCE_RANDR_PLACEMENT_LEFT: // Extend Left
 /* Move the selected display to the right of the currently active 
display. */
-XFCE_RANDR_POS_X (xfce_randr) = current_mode-width;
+xfce_randr-position[selected_display].x = current_mode-width;
 
 /* Move the currently active display to where the selected was */
-xfce_randr-active_output = current_display;
-XFCE_RANDR_POS_X (xfce_randr) = selected_x;
-XFCE_RANDR_POS_Y (xfce_randr) = selected_y;
+xfce_randr-position[active_output].x = selected_x;
+xfce_randr-position[active_output].y = selected_y;
 
 break;
 
 case XFCE_RANDR_PLACEMENT_RIGHT: // Extend Right
/* Move the selected display to where the currently 
active one is */
-XFCE_RANDR_POS_X (xfce_randr) = current_x;
-XFCE_RANDR_POS_Y (xfce_randr) = current_y;
+xfce_randr-position[selected_display].x = current_x;
+xfce_randr-position[selected_display].y = current_y;
 
 /* Move the currently active display to the right of the selected 
display. */
-xfce_randr-active_output = current_display;
-XFCE_RANDR_POS_X (xfce_randr) = selected_mode-width;
+xfce_randr-position[active_output].x = selected_mode-width;
 
 

[Xfce4-commits] xfce4-settings:bluesabre/display-settings Rename Rotation from Normal to None (consistency with Reflection)

[Nick Schermer]

Updating branch refs/heads/bluesabre/display-settings
 to 07b666ad15773ed01ecc742a4305c2c8368927b9 (commit)
   from 7f506412224f57f93020b15a9e69ffbb64f82889 (commit)

commit 07b666ad15773ed01ecc742a4305c2c8368927b9
Author: Simon Steinbeiss simon.steinbe...@elfenbeinturm.at
Date:   Thu Oct 4 12:27:03 2012 +0200

Rename Rotation from Normal to None (consistency with Reflection)

 dialogs/display-settings/main.c |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dialogs/display-settings/main.c b/dialogs/display-settings/main.c
index c22ffea..e57ba21 100644
--- a/dialogs/display-settings/main.c
+++ b/dialogs/display-settings/main.c
@@ -65,7 +65,7 @@ enum
 /* Xrandr rotation name conversion */
 static const XfceRotation rotation_names[] =
 {
-{ RR_Rotate_0,   N_(Normal) },
+{ RR_Rotate_0,   N_(None) },
 { RR_Rotate_90,  N_(Left) },
 { RR_Rotate_180, N_(Inverted) },
 { RR_Rotate_270, N_(Right) }
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] xfce4-settings:bluesabre/display-settings Correct icon-name in identity-popups

[Nick Schermer]

Updating branch refs/heads/bluesabre/display-settings
 to a130d88717b96708c307b0613bd562a892a19782 (commit)
   from de05a685e10a8eedd60081830481cb4690f29223 (commit)

commit a130d88717b96708c307b0613bd562a892a19782
Author: Simon Steinbeiss simon.steinbe...@elfenbeinturm.at
Date:   Wed Oct 10 10:50:48 2012 +0200

Correct icon-name in identity-popups

 dialogs/display-settings/identity-popup.glade |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dialogs/display-settings/identity-popup.glade 
b/dialogs/display-settings/identity-popup.glade
index 896ff80..da5d733 100644
--- a/dialogs/display-settings/identity-popup.glade
+++ b/dialogs/display-settings/identity-popup.glade
@@ -19,7 +19,7 @@
 property name=visibleTrue/property
 property name=can_focusFalse/property
 property name=pixel_size48/property
-property name=icon_namecomputer/property
+property name=icon_namevideo-display/property
 property name=icon-size6/property
   /object
   packing
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] xfce4-settings:bluesabre/display-settings Fix bug preventing to disable outputs

[Nick Schermer]

Updating branch refs/heads/bluesabre/display-settings
 to bcc727f6a7e067b18268642029bf8f4ac0092f26 (commit)
   from bbc6e64c1b48c45659227dcffb1475f0650d9e8b (commit)

commit bcc727f6a7e067b18268642029bf8f4ac0092f26
Author: Lionel Le Folgoc lio...@lefolgoc.net
Date:   Mon Oct 15 16:37:07 2012 +0200

Fix bug preventing to disable outputs

Signed-off-by: Simon Steinbeiss simon.steinbe...@elfenbeinturm.at

 xfsettingsd/displays.c |1 +
 1 file changed, 1 insertion(+)

diff --git a/xfsettingsd/displays.c b/xfsettingsd/displays.c
index be03da3..9a7d441 100644
--- a/xfsettingsd/displays.c
+++ b/xfsettingsd/displays.c
@@ -537,6 +537,7 @@ xfce_displays_helper_channel_apply (XfceDisplaysHelper 
*helper,
 
 crtc-mode = None;
 crtc-noutput = 0;
+crtc-changed = TRUE;
 }
 
 continue;
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] xfce4-settings:bluesabre/display-settings Swap Advanced and Close buttons

[Nick Schermer]

Updating branch refs/heads/bluesabre/display-settings
 to bad30c37b680fd443c92c3f9d63202516a7dc238 (commit)
   from 3d960a6ef9334fb88492d21cba9a6bb89c634119 (commit)

commit bad30c37b680fd443c92c3f9d63202516a7dc238
Author: Simon Steinbeiss simon.steinbe...@elfenbeinturm.at
Date:   Tue Oct 2 12:05:47 2012 +0200

Swap Advanced and Close buttons

 dialogs/display-settings/minimal-display-dialog.glade |   10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/dialogs/display-settings/minimal-display-dialog.glade 
b/dialogs/display-settings/minimal-display-dialog.glade
index 0a79bf7..b5cb4b1 100644
--- a/dialogs/display-settings/minimal-display-dialog.glade
+++ b/dialogs/display-settings/minimal-display-dialog.glade
@@ -160,13 +160,12 @@
   /packing
 /child
 child
-  object class=GtkButton id=cancel_button
-property name=labelgtk-close/property
+  object class=GtkButton id=advanced_button
+property name=label translatable=yesAdvanced/property
 property name=visibleTrue/property
 property name=can_focusTrue/property
 property name=receives_defaultTrue/property
 property name=use_action_appearanceFalse/property
-property name=use_stockTrue/property
   /object
   packing
 property name=expandFalse/property
@@ -175,12 +174,13 @@
   /packing
 /child
 child
-  object class=GtkButton id=advanced_button
-property name=label translatable=yesAdvanced/property
+  object class=GtkButton id=cancel_button
+property name=labelgtk-close/property
 property name=visibleTrue/property
 property name=can_focusTrue/property
 property name=receives_defaultTrue/property
 property name=use_action_appearanceFalse/property
+property name=use_stockTrue/property
   /object
   packing
 property name=expandFalse/property
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] xfce4-settings:bluesabre/display-settings Improved cairo-drawing of the identification-popups The popups have borders now, which should make them more visible. I also added an offset

[Nick Schermer]

Updating branch refs/heads/bluesabre/display-settings
 to e9b4cc39bd9f2f8a7711c3e5efdb2ad37c183093 (commit)
   from c396f9298a902094a5b5ffa69bc60e1461cf6015 (commit)

commit e9b4cc39bd9f2f8a7711c3e5efdb2ad37c183093
Author: Simon Steinbeiss simon.steinbe...@elfenbeinturm.at
Date:   Fri Oct 5 23:43:34 2012 +0200

Improved cairo-drawing of the identification-popups
The popups have borders now, which should make them more visible.
I also added an offset of +/- 0.5px, which improves the rendering of the 
arc with cairo (otherwise the corners look thicker than the straight lines)

 dialogs/display-settings/main.c |   37 -
 1 file changed, 12 insertions(+), 25 deletions(-)

diff --git a/dialogs/display-settings/main.c b/dialogs/display-settings/main.c
index 423228f..6a50c2d 100644
--- a/dialogs/display-settings/main.c
+++ b/dialogs/display-settings/main.c
@@ -1017,46 +1017,33 @@ display_setting_identity_popup_expose(GtkWidget *popup, 
GdkEventExpose *event, g
 gint radius;
 
 radius = 15;
+cairo_set_operator (cr, CAIRO_OPERATOR_SOURCE);
 
 /* Compositing is not available, so just set the background color. */
 if (!supports_alpha)
 {
 cairo_set_source_rgb(cr, 0.2, 0.2, 0.2);
-cairo_set_operator (cr, CAIRO_OPERATOR_SOURCE);
 cairo_paint (cr);
 }
 
-/* The radius is tiny, don't bother drawing rounded corners. */
-else if (radius  0.1) {
-cairo_set_source_rgba(cr, 0.2, 0.2, 0.2, 0.9);
-cairo_set_operator (cr, CAIRO_OPERATOR_SOURCE);
-cairo_paint (cr);
-cairo_rectangle(cr, 0, 0, popup-allocation.width, 
popup-allocation.height);
-}
-
 /* Draw rounded corners. FIXME Does not work with xfce compositor off. */
 else
 {
 cairo_set_source_rgba(cr, 0, 0, 0, 0);
-cairo_set_operator (cr, CAIRO_OPERATOR_SOURCE);
 cairo_paint (cr);
 
+/* Draw a filled rounded rectangle with outline */
+cairo_set_line_width(cr, 1.0);
+cairo_move_to(cr, 0.5, popup-allocation.height+0.5);
+cairo_line_to(cr, 0.5, radius+0.5);
+cairo_arc(cr, radius+0.5, radius+0.5, radius, 3.14, 3.0*3.14/2.0);
+cairo_line_to(cr, popup-allocation.width-0.5 - radius, 0.5);
+cairo_arc(cr, popup-allocation.width-0.5 - radius, radius+0.5, 
radius, 3.0*3.14/2.0, 0.0);
+cairo_line_to(cr, popup-allocation.width-0.5, 
popup-allocation.height+0.5);
 cairo_set_source_rgba(cr, 0.2, 0.2, 0.2, 0.9);
-
-cairo_move_to(cr, 0, radius);
-cairo_arc(cr, radius, radius, radius, 3.14, 3.0*3.14/2.0);
-cairo_line_to(cr, popup-allocation.width - radius, 0);
-cairo_arc(cr, popup-allocation.width - radius, radius, radius, 
3.0*3.14/2.0, 0.0);
-//cairo_line_to(cr, popup-allocation.width, popup-allocation.height 
- radius);
-cairo_line_to(cr, popup-allocation.width, popup-allocation.height);
-//cairo_arc(cr, popup-allocation.width - radius, 
popup-allocation.height - radius, radius, 0.0, 3.14/2.0);
-//cairo_line_to(cr, radius, popup-allocation.height);
-cairo_line_to(cr, 0, popup-allocation.height);
-//cairo_arc(cr, radius, popup-allocation.height - radius, radius, 
3.14/2.0, 3.14);
-cairo_stroke_preserve(cr);
-cairo_set_operator (cr, CAIRO_OPERATOR_SOURCE);
-cairo_fill(cr);
-cairo_set_operator (cr, CAIRO_OPERATOR_OVER);
+cairo_fill_preserve(cr);
+cairo_set_source_rgba(cr, 1.0, 1.0, 1.0,0.7);
+cairo_stroke(cr);
 cairo_close_path(cr);
 }
 
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] xfce4-settings:bluesabre/display-settings Fix activation/sensivity of toggle buttons (minimal dialog)

[Nick Schermer]

Updating branch refs/heads/bluesabre/display-settings
 to 6191fb51e35cd9a869f6af1dbd94f3f29309bd4e (commit)
   from a9e176755018ad894290714893e01717de7dc5d5 (commit)

commit 6191fb51e35cd9a869f6af1dbd94f3f29309bd4e
Author: Lionel Le Folgoc lio...@lefolgoc.net
Date:   Wed Oct 24 11:15:43 2012 +0200

Fix activation/sensivity of toggle buttons (minimal dialog)

And show the display name instead of display1 display2

Signed-off-by: Simon Steinbeiss simon.steinbe...@elfenbeinturm.at

 dialogs/display-settings/main.c |   48 +--
 1 file changed, 31 insertions(+), 17 deletions(-)

diff --git a/dialogs/display-settings/main.c b/dialogs/display-settings/main.c
index bcc9666..fbe27af 100644
--- a/dialogs/display-settings/main.c
+++ b/dialogs/display-settings/main.c
@@ -1849,7 +1849,7 @@ display_settings_show_minimal_dialog (GdkDisplay  
*display,
 GtkBuilder   *builder;
 GtkWidget*dialog, *cancel;
 GObject  *only_display1, *only_display2, *mirror_displays;
-GObject  *extend_right, *advanced, *fake_button;
+GObject  *extend_right, *advanced, *fake_button, *label;
 minimal_advanced_context  context;
 
 builder = gtk_builder_new ();
@@ -1878,30 +1878,44 @@ display_settings_show_minimal_dialog (GdkDisplay  
*display,
 
 gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (fake_button), TRUE);
 
-//
+label = gtk_builder_get_object (builder, label1);
+gtk_label_set_text (GTK_LABEL (label), xfce_randr-friendly_name[0]);
+
+gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (only_display1),
+  xfce_randr-mode[0] != None);
+
 if (xfce_randr-noutput  1)
 {
-gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (only_display1),
- xfce_randr-mode[0] != None);
+label = gtk_builder_get_object (builder, label4);
+gtk_label_set_text (GTK_LABEL (label), 
xfce_randr-friendly_name[1]);
 gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (only_display2),
- xfce_randr-mode[1] != None);
+  xfce_randr-mode[1] != None);
+
+if (xfce_randr-mode[0] != None  xfce_randr-mode[1] != None)
+{
+/* Check for mirror */
+if ((xfce_randr-relation[1] == XFCE_RANDR_PLACEMENT_MIRROR 
+xfce_randr-related_to[1] == 0) || 
(xfce_randr-related_to[0] == 1 
+xfce_randr-relation[0] == XFCE_RANDR_PLACEMENT_MIRROR))
+gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON 
(mirror_displays),
+  TRUE);
+
+/* Check for Extend Right */
+if ((xfce_randr-relation[1] == XFCE_RANDR_PLACEMENT_RIGHT 
+xfce_randr-related_to[1] == 0) || 
(xfce_randr-related_to[0] == 1 
+xfce_randr-relation[1] == XFCE_RANDR_PLACEMENT_LEFT))
+gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON 
(extend_right),
+  TRUE);
+}
 }
 else
 {
-/* Check for mirror */
-if (xfce_randr-relation[1] == XFCE_RANDR_PLACEMENT_MIRROR 
-xfce_randr-related_to[1] == 0)
-gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON 
(mirror_displays),
-  TRUE);
-
-/* Check for Extend Right */
-if (xfce_randr-relation[1] == XFCE_RANDR_PLACEMENT_RIGHT 
-xfce_randr-related_to[1] == 0)
-gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (extend_right),
-  TRUE);
+/* Only one output, disable other buttons */
+gtk_widget_set_sensitive (GTK_WIDGET (mirror_displays), FALSE);
+gtk_widget_set_sensitive (GTK_WIDGET (extend_right), FALSE);
+gtk_widget_set_sensitive (GTK_WIDGET (only_display2), FALSE);
 }
 
-//
 g_signal_connect (only_display1, toggled, G_CALLBACK 
(display_settings_minimal_only_display1_toggled),
   builder);
 g_signal_connect (mirror_displays, toggled, G_CALLBACK 
(display_settings_minimal_mirror_displays_toggled),
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] xfce4-settings:bluesabre/display-settings Update glade-file and icons for minimal dialog

[Nick Schermer]

Updating branch refs/heads/bluesabre/display-settings
 to 6575a0c1c9726c30d0cb39f307d597a323762423 (commit)
   from 2f7699c7ee4db05fa35daf65ac41f5a01336ebc7 (commit)

commit 6575a0c1c9726c30d0cb39f307d597a323762423
Author: Simon Steinbeiss simon.steinbe...@elfenbeinturm.at
Date:   Thu Oct 4 11:16:41 2012 +0200

Update glade-file and icons for minimal dialog

 dialogs/display-settings/display1.png  |  Bin 0 - 7527 bytes
 dialogs/display-settings/display2.png  |  Bin 0 - 7654 bytes
 dialogs/display-settings/extend-left.png   |  Bin 5867 - 0 bytes
 .../display-settings/minimal-display-dialog.glade  |   71 +---
 4 files changed, 47 insertions(+), 24 deletions(-)

diff --git a/dialogs/display-settings/display1.png 
b/dialogs/display-settings/display1.png
new file mode 100644
index 000..793022f
Binary files /dev/null and b/dialogs/display-settings/display1.png differ
diff --git a/dialogs/display-settings/display2.png 
b/dialogs/display-settings/display2.png
new file mode 100644
index 000..64bbd39
Binary files /dev/null and b/dialogs/display-settings/display2.png differ
diff --git a/dialogs/display-settings/extend-left.png 
b/dialogs/display-settings/extend-left.png
deleted file mode 100644
index 5e0dbd5..000
Binary files a/dialogs/display-settings/extend-left.png and /dev/null differ
diff --git a/dialogs/display-settings/minimal-display-dialog.glade 
b/dialogs/display-settings/minimal-display-dialog.glade
index b5cb4b1..6e6b1d9 100644
--- a/dialogs/display-settings/minimal-display-dialog.glade
+++ b/dialogs/display-settings/minimal-display-dialog.glade
@@ -13,18 +13,18 @@
   object class=GtkVBox id=vbox1
 property name=visibleTrue/property
 property name=can_focusFalse/property
-property name=border_width12/property
-property name=spacing12/property
+property name=border_width6/property
+property name=spacing6/property
 child
   object class=GtkTable id=table1
 property name=visibleTrue/property
 property name=can_focusFalse/property
 property name=n_rows2/property
-property name=n_columns3/property
-property name=column_spacing48/property
+property name=n_columns4/property
+property name=column_spacing24/property
 property name=row_spacing3/property
 child
-  object class=GtkToggleButton id=extend_left
+  object class=GtkToggleButton id=display1
 property name=width_request128/property
 property name=height_request128/property
 property name=visibleTrue/property
@@ -35,7 +35,7 @@
   object class=GtkImage id=image1
 property name=visibleTrue/property
 property name=can_focusFalse/property
-property name=pixbufextend-left.png/property
+property name=pixbufdisplay1.png/property
   /object
 /child
   /object
@@ -94,7 +94,7 @@
   object class=GtkLabel id=label1
 property name=visibleTrue/property
 property name=can_focusFalse/property
-property name=label translatable=yesExtend to the 
left/property
+property name=label translatable=yesOnly Display 
1/property
   /object
   packing
 property name=top_attach1/property
@@ -133,6 +133,44 @@
 property name=y_optionsGTK_FILL/property
   /packing
 /child
+child
+  object class=GtkToggleButton id=display2
+property name=width_request128/property
+property name=height_request128/property
+property name=visibleTrue/property
+property name=can_focusTrue/property
+property name=receives_defaultTrue/property
+property name=use_action_appearanceFalse/property
+child
+  object class=GtkImage id=image4
+property name=visibleTrue/property
+property name=can_focusFalse/property
+property name=pixbufdisplay2.png/property
+  /object
+/child
+  /object
+  packing
+property name=left_attach3/property
+property name=right_attach4/property
+property name=x_optionsGTK_FILL/property
+property name=y_optionsGTK_FILL/property
+  /packing
+/child
+child
+  object class=GtkLabel id=label4
+property name=visibleTrue/property
+property name=can_focusFalse/property
+property name=label translatable=yesOnly Display 
2/property
+  /object
+  

[Xfce4-commits] xfce4-settings:bluesabre/display-settings Restore failsafe to prevent disabling all outputs

[Nick Schermer]

Updating branch refs/heads/bluesabre/display-settings
 to 8e422bf4ed9440f70e0fca56f6a3dfd0da794eb9 (commit)
   from bcc727f6a7e067b18268642029bf8f4ac0092f26 (commit)

commit 8e422bf4ed9440f70e0fca56f6a3dfd0da794eb9
Author: Lionel Le Folgoc lio...@lefolgoc.net
Date:   Mon Oct 15 17:12:07 2012 +0200

Restore failsafe to prevent disabling all outputs

Also improve a bit debugging messages.

Signed-off-by: Simon Steinbeiss simon.steinbe...@elfenbeinturm.at

 xfsettingsd/displays.c |   89 +++-
 1 file changed, 58 insertions(+), 31 deletions(-)

diff --git a/xfsettingsd/displays.c b/xfsettingsd/displays.c
index 9a7d441..4101135 100644
--- a/xfsettingsd/displays.c
+++ b/xfsettingsd/displays.c
@@ -234,6 +234,26 @@ xfce_displays_helper_list_crtcs (Display
*xdisplay,
 
 
 
+static XfceRRCrtc *
+xfce_displays_helper_find_crtc_by_id (XRRScreenResources *resources,
+  XfceRRCrtc *crtcs,
+  RRCrtc  id)
+{
+gint n;
+
+g_assert (resources  crtcs);
+
+for (n = 0; n  resources-ncrtc; ++n)
+{
+if (crtcs[n].id == id)
+return crtcs[n];
+}
+
+return NULL;
+}
+
+
+
 static void
 xfce_displays_helper_cleanup_crtc (XfceRRCrtc *crtc)
 {
@@ -262,18 +282,22 @@ xfce_displays_helper_free_output (XfceRROutput *output)
 
 static GPtrArray *
 xfce_displays_helper_list_outputs (Display*xdisplay,
-   XRRScreenResources *resources)
+   XRRScreenResources *resources,
+   XfceRRCrtc *crtcs,
+   gint   *nactive)
 {
 GPtrArray *outputs;
 XRROutputInfo *info;
 XfceRROutput  *output;
+XfceRRCrtc*crtc;
 gint   n;
 
-g_assert (xdisplay  resources);
+g_assert (xdisplay  resources  nactive);
 
 outputs = g_ptr_array_new ();
 
 /* get all connected outputs */
+*nactive = 0;
 for (n = 0; n  resources-noutput; ++n)
 {
 info = XRRGetOutputInfo (xdisplay, resources, resources-outputs[n]);
@@ -288,6 +312,18 @@ xfce_displays_helper_list_outputs (Display
*xdisplay,
 output-id = resources-outputs[n];
 output-info = info;
 
+xfsettings_dbg (XFSD_DEBUG_DISPLAYS, Detected output %lu %s., 
output-id,
+output-info-name);
+
+/* track active outputs */
+crtc = xfce_displays_helper_find_crtc_by_id (resources, crtcs,
+ output-info-crtc);
+if (crtc  crtc-mode != None)
+{
+xfsettings_dbg (XFSD_DEBUG_DISPLAYS, %s is active., 
output-info-name);
+++(*nactive);
+}
+
 /* cache it */
 g_ptr_array_add (outputs, output);
 }
@@ -298,26 +334,6 @@ xfce_displays_helper_list_outputs (Display
*xdisplay,
 
 
 static XfceRRCrtc *
-xfce_displays_helper_find_crtc_by_id (XRRScreenResources *resources,
-  XfceRRCrtc *crtcs,
-  RRCrtc  id)
-{
-gint n;
-
-g_assert (resources  crtcs);
-
-for (n = 0; n  resources-ncrtc; ++n)
-{
-if (crtcs[n].id == id)
-return crtcs[n];
-}
-
-return NULL;
-}
-
-
-
-static XfceRRCrtc *
 xfce_displays_helper_find_usable_crtc (XRRScreenResources *resources,
XfceRRCrtc *crtcs,
XfceRROutput   *output)
@@ -437,7 +453,7 @@ xfce_displays_helper_channel_apply (XfceDisplaysHelper 
*helper,
 gintmin_width, min_height, max_width, max_height;
 gintmm_width, mm_height, width, height;
 gintx, y, min_x, min_y;
-gintl, m, int_value;
+gintl, m, int_value, nactive;
 guint   n;
 GValue *value;
 const gchar*str_value;
@@ -474,7 +490,8 @@ xfce_displays_helper_channel_apply (XfceDisplaysHelper 
*helper,
 crtcs = xfce_displays_helper_list_crtcs (xdisplay, resources);
 
 /* then all connected outputs */
-connected_outputs = xfce_displays_helper_list_outputs (xdisplay, 
resources);
+connected_outputs = xfce_displays_helper_list_outputs (xdisplay, resources,
+   crtcs, nactive);
 
 /* finally the list of saved outputs from xfconf */
 g_snprintf (property, sizeof (property), /%s, scheme);
@@ -521,18 +538,19 @@ xfce_displays_helper_channel_apply (XfceDisplaysHelper 
*helper,
 crtc = xfce_displays_helper_find_usable_crtc (resources, crtcs, 
output);
 if (!crtc)
 {
-g_warning (No available CRTC for output %s, aborting., 
output-info-name);
+

[Xfce4-commits] xfce4-settings:bluesabre/display-settings Fix popup positionint with Left/Right rotations

[Nick Schermer]

Updating branch refs/heads/bluesabre/display-settings
 to 9c3e74c50a0c83672abb0cfd99cc957ff25fe886 (commit)
   from 9516474faf7d1f69cbc82236bf47bfdb84a5af72 (commit)

commit 9c3e74c50a0c83672abb0cfd99cc957ff25fe886
Author: Lionel Le Folgoc lio...@lefolgoc.net
Date:   Wed Oct 17 20:38:53 2012 +0200

Fix popup positionint with Left/Right rotations

Signed-off-by: Simon Steinbeiss simon.steinbe...@elfenbeinturm.at

 dialogs/display-settings/main.c |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dialogs/display-settings/main.c b/dialogs/display-settings/main.c
index 89559dd..6c1656e 100644
--- a/dialogs/display-settings/main.c
+++ b/dialogs/display-settings/main.c
@@ -1039,8 +1039,8 @@ display_setting_identity_display (gint display_id)
 screen_pos_x = 0;
 screen_pos_y = 0;
 }
-screen_width = current_mode-width;
-screen_height = current_mode-height;
+screen_width = xfce_randr_mode_width (current_mode, 
xfce_randr-rotation[display_id]);
+screen_height = xfce_randr_mode_height (current_mode, 
xfce_randr-rotation[display_id]);
 }
 else
 {
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] xfce4-settings:bluesabre/display-settings Flush the X buffer on exit

[Nick Schermer]

Updating branch refs/heads/bluesabre/display-settings
 to ecb721ee1d5babd31d543c7ee23eb348797b2300 (commit)
   from e6962fa722eeec3ebe97ef96f7bc2b06331f64a5 (commit)

commit ecb721ee1d5babd31d543c7ee23eb348797b2300
Author: Lionel Le Folgoc lio...@lefolgoc.net
Date:   Thu Oct 18 17:29:12 2012 +0200

Flush the X buffer on exit

Signed-off-by: Simon Steinbeiss simon.steinbe...@elfenbeinturm.at

 xfsettingsd/displays.c |1 +
 1 file changed, 1 insertion(+)

diff --git a/xfsettingsd/displays.c b/xfsettingsd/displays.c
index 7a14088..9f01694 100644
--- a/xfsettingsd/displays.c
+++ b/xfsettingsd/displays.c
@@ -821,6 +821,7 @@ err_cleanup:
 /* free the screen resources */
 XRRFreeScreenResources (resources);
 
+gdk_flush ();
 gdk_error_trap_pop ();
 }
 
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] xfce4-settings:bluesabre/display-settings Do not harcode 4 identify popups

[Nick Schermer]

Updating branch refs/heads/bluesabre/display-settings
 to a7f44eec2f3e41306189b635eeab9e691b3d2ebe (commit)
   from 1d174393625714b25975ec9e9675f40500f60b24 (commit)

commit a7f44eec2f3e41306189b635eeab9e691b3d2ebe
Author: Lionel Le Folgoc lio...@lefolgoc.net
Date:   Tue Oct 16 12:00:14 2012 +0200

Do not harcode 4 identify popups

Signed-off-by: Simon Steinbeiss simon.steinbe...@elfenbeinturm.at

 dialogs/display-settings/main.c |  155 +--
 1 file changed, 67 insertions(+), 88 deletions(-)

diff --git a/dialogs/display-settings/main.c b/dialogs/display-settings/main.c
index ac79f14..625d2c0 100644
--- a/dialogs/display-settings/main.c
+++ b/dialogs/display-settings/main.c
@@ -68,13 +68,6 @@ typedef struct {
 GError *error;
 } minimal_advanced_context;
 
-typedef struct {
-GtkWidget *display1;
-GtkWidget *display2;
-GtkWidget *display3;
-GtkWidget *display4;
-} identity_popup_store;
-
 
 
 /* Xrandr relation name conversion */
@@ -142,7 +135,9 @@ static guint active_output;
 /* Pointer to the used randr structure */
 XfceRandr *xfce_randr = NULL;
 
-identity_popup_store display_popups;
+/* Used to identify the display */
+static GHashTable *display_popups;
+
 gboolean supports_alpha = FALSE;
 
 static void
@@ -196,21 +191,25 @@ display_setting_combo_box_get_value (GtkComboBox 
*combobox,
 }
 
 static void
-display_setting_hide_identity_popups(void)
+display_setting_toggle_identity_popup (gpointer   key,
+   GtkWidget *value,
+   gpointer   show)
 {
-if (GTK_IS_WIDGET(display_popups.display1)) 
gtk_widget_hide(display_popups.display1);
-if (GTK_IS_WIDGET(display_popups.display2)) 
gtk_widget_hide(display_popups.display2);
-if (GTK_IS_WIDGET(display_popups.display3)) 
gtk_widget_hide(display_popups.display3);
-if (GTK_IS_WIDGET(display_popups.display4)) 
gtk_widget_hide(display_popups.display4);
+if (!GPOINTER_TO_INT (show))
+gtk_widget_hide (value);
+else
+gtk_widget_show (value);
 }
 
-static void
-display_setting_show_identity_popups(void)
+static gboolean
+display_setting_toggle_identity_popups (GtkWidget *widget,
+GdkEvent  *event,
+gpointer   show)
 {
-if (GTK_IS_WIDGET(display_popups.display1)) 
gtk_widget_show(display_popups.display1);
-if (GTK_IS_WIDGET(display_popups.display2)) 
gtk_widget_show(display_popups.display2);
-if (GTK_IS_WIDGET(display_popups.display3)) 
gtk_widget_show(display_popups.display3);
-if (GTK_IS_WIDGET(display_popups.display4)) 
gtk_widget_show(display_popups.display4);
+g_hash_table_foreach (display_popups,
+  (GHFunc) display_setting_toggle_identity_popup,
+  show);
+return FALSE;
 }
 
 static gboolean
@@ -275,11 +274,11 @@ display_setting_timed_confirmation (GtkBuilder 
*main_builder)
 
 dialog = gtk_builder_get_object (builder, dialog1);
 
-g_signal_connect (G_OBJECT (dialog), focus-out-event, G_CALLBACK 
(display_setting_hide_identity_popups),
-  NULL);
+g_signal_connect (G_OBJECT (dialog), focus-out-event, G_CALLBACK 
(display_setting_toggle_identity_popups),
+  GINT_TO_POINTER (FALSE));
   
-g_signal_connect (G_OBJECT (dialog), focus-in-event, G_CALLBACK 
(display_setting_show_identity_popups),
-  NULL);
+g_signal_connect (G_OBJECT (dialog), focus-in-event, G_CALLBACK 
(display_setting_toggle_identity_popups),
+  GINT_TO_POINTER (TRUE));
 
 gtk_window_set_transient_for (GTK_WINDOW (dialog), GTK_WINDOW 
(main_dialog));
 source_id = g_timeout_add_seconds (1, (GSourceFunc) 
display_settings_update_time_label,
@@ -1006,11 +1005,13 @@ display_setting_screen_changed(GtkWidget *widget, 
GdkScreen *old_screen, gpointe
 }
 
 static gboolean
-display_setting_identity_popup_expose(GtkWidget *popup, GdkEventExpose *event, 
gpointer has_selection)
+display_setting_identity_popup_expose (GtkWidget  *popup,
+   GdkEventExpose *event,
+   GtkBuilder *builder)
 {
 cairo_t *cr = gdk_cairo_create(popup-window);
 gint radius;
-gboolean selected = GPOINTER_TO_INT(has_selection);
+gboolean selected = (g_hash_table_lookup (display_popups, GINT_TO_POINTER 
(active_output)) == popup);
 cairo_pattern_t *vertical_gradient, *innerstroke_gradient, 
*selected_gradient, *selected_innerstroke_gradient;
 
 radius = 10;
@@ -1113,16 +1114,16 @@ display_setting_identity_popup_expose(GtkWidget *popup, 
GdkEventExpose *event, g
 return FALSE;
 }
 
-static GtkWidget*
-display_setting_identity_display (gint display_id,
-   GError *error, gboolean 

[Xfce4-commits] xfce4-settings:bluesabre/display-settings Do not save to Xfconf each time the treeview is refreshed

[Nick Schermer]

Updating branch refs/heads/bluesabre/display-settings
 to 46cfd99b570344910f36f96c1d331f78522d5b8b (commit)
   from b14b00b0d6997b16a89ca0a4ac64860bc71862b3 (commit)

commit 46cfd99b570344910f36f96c1d331f78522d5b8b
Author: Lionel Le Folgoc lio...@lefolgoc.net
Date:   Wed Oct 17 15:42:42 2012 +0200

Do not save to Xfconf each time the treeview is refreshed

Signed-off-by: Simon Steinbeiss simon.steinbe...@elfenbeinturm.at

 dialogs/display-settings/main.c |4 
 1 file changed, 4 deletions(-)

diff --git a/dialogs/display-settings/main.c b/dialogs/display-settings/main.c
index 57e27c8..107b4d9 100644
--- a/dialogs/display-settings/main.c
+++ b/dialogs/display-settings/main.c
@@ -1474,10 +1474,6 @@ display_settings_treeview_populate (GtkBuilder *builder)
 
 lucent_display_icon = NULL;
 
-/* Save the current status of all outputs, if the user doesn't change
- * anything after, it means she's happy with that. */
-xfce_randr_save_all (xfce_randr, Default, display_channel);
-
 /* Walk all the connected outputs */
 for (m = 0; m  xfce_randr-noutput; ++m)
 {
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] xfce4-settings:bluesabre/display-settings Do not harcode iter indexes for positions

[Nick Schermer]

Updating branch refs/heads/bluesabre/display-settings
 to 4fa8b017408126006b653e758b8ca38b47f98b1a (commit)
   from 720535bd5332b33735a05a66b70ef1186080fd17 (commit)

commit 4fa8b017408126006b653e758b8ca38b47f98b1a
Author: Lionel Le Folgoc lio...@lefolgoc.net
Date:   Mon Oct 15 23:35:21 2012 +0200

Do not harcode iter indexes for positions

Signed-off-by: Simon Steinbeiss simon.steinbe...@elfenbeinturm.at

 dialogs/display-settings/main.c |   23 +--
 1 file changed, 17 insertions(+), 6 deletions(-)

diff --git a/dialogs/display-settings/main.c b/dialogs/display-settings/main.c
index d4a60aa..51c5091 100644
--- a/dialogs/display-settings/main.c
+++ b/dialogs/display-settings/main.c
@@ -527,6 +527,7 @@ display_setting_guess_positioning (GtkBuilder *builder)
 {
 GObject *position_combo, *display_combo;
 gint current_x, current_y, cb_index;
+XfceOutputRelation rel;
 guint n;
 
 current_x = xfce_randr-position[active_output].x;
@@ -552,7 +553,7 @@ display_setting_guess_positioning (GtkBuilder *builder)
 /* Check for mirror */
 if ( (xfce_randr-position[n].x == current_x)  
  (xfce_randr-position[n].y == current_y) ) {
-gtk_combo_box_set_active( GTK_COMBO_BOX(position_combo), 0 );
+rel = XFCE_RANDR_PLACEMENT_MIRROR;
 gtk_combo_box_set_active( GTK_COMBO_BOX(display_combo), 
cb_index );
 break;   
 }
@@ -560,7 +561,7 @@ display_setting_guess_positioning (GtkBuilder *builder)
 /* Check for Left Of */
 if ( (xfce_randr-position[n].y == current_y) 
  (xfce_randr-position[n].x  current_x) ) {
-gtk_combo_box_set_active( GTK_COMBO_BOX(position_combo), 1 );
+rel = XFCE_RANDR_PLACEMENT_LEFT;
 gtk_combo_box_set_active( GTK_COMBO_BOX(display_combo), 
cb_index );
 break;
 }
@@ -568,7 +569,7 @@ display_setting_guess_positioning (GtkBuilder *builder)
 /* Check for Right Of */
 if ( (xfce_randr-position[n].y == current_y) 
  (xfce_randr-position[n].x  current_x) ) {
-gtk_combo_box_set_active( GTK_COMBO_BOX(position_combo), 2 );
+rel = XFCE_RANDR_PLACEMENT_RIGHT;
 gtk_combo_box_set_active( GTK_COMBO_BOX(display_combo), 
cb_index );
 break;
 }
@@ -576,7 +577,7 @@ display_setting_guess_positioning (GtkBuilder *builder)
 /* Check for Above */
 if ( (xfce_randr-position[n].x == current_x) 
  (xfce_randr-position[n].y  current_y) ) {
-gtk_combo_box_set_active( GTK_COMBO_BOX(position_combo), 3 );
+rel = XFCE_RANDR_PLACEMENT_UP;
 gtk_combo_box_set_active( GTK_COMBO_BOX(display_combo), 
cb_index );
 break;
 }
@@ -584,7 +585,7 @@ display_setting_guess_positioning (GtkBuilder *builder)
 /* Check for Below */
 if ( (xfce_randr-position[n].x == current_x) 
  (xfce_randr-position[n].y  current_y) ) {
-gtk_combo_box_set_active( GTK_COMBO_BOX(position_combo), 4 );
+rel = XFCE_RANDR_PLACEMENT_DOWN;
 gtk_combo_box_set_active( GTK_COMBO_BOX(display_combo), 
cb_index );
 break;
 }
@@ -592,7 +593,17 @@ display_setting_guess_positioning (GtkBuilder *builder)
 cb_index++;
 }
 }
-
+
+/* set the correct index for the position combobox */
+for (n = 0; n  G_N_ELEMENTS (relation_names); n++)
+{
+if (rel == relation_names[n].relation)
+{
+gtk_combo_box_set_active (GTK_COMBO_BOX (position_combo), n);
+break;
+}
+}
+
 g_signal_connect (G_OBJECT (position_combo), changed, G_CALLBACK 
(display_setting_positions_changed), builder);
 g_signal_connect (G_OBJECT (display_combo), changed, G_CALLBACK 
(display_setting_active_displays_changed), builder);
 }
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] xfce4-settings:bluesabre/display-settings Crude fix to recolor the popups based on what display is selected (still flickers) Also, renamed two functions for more consistency

[Nick Schermer]

Updating branch refs/heads/bluesabre/display-settings
 to 4076c8a4ff786c0a87685a5f848c71dcdb7a4312 (commit)
   from e28c32cf6d6712ebc9a7d2fe2425ee9180bbc25e (commit)

commit 4076c8a4ff786c0a87685a5f848c71dcdb7a4312
Author: Simon Steinbeiss simon.steinbe...@elfenbeinturm.at
Date:   Mon Oct 8 14:15:16 2012 +0200

Crude fix to recolor the popups based on what display is selected (still 
flickers)
Also, renamed two functions for more consistency

 dialogs/display-settings/main.c |   54 ---
 1 file changed, 39 insertions(+), 15 deletions(-)

diff --git a/dialogs/display-settings/main.c b/dialogs/display-settings/main.c
index de5a9f8..57a611f 100644
--- a/dialogs/display-settings/main.c
+++ b/dialogs/display-settings/main.c
@@ -1022,7 +1022,7 @@ display_setting_identity_popup_expose(GtkWidget *popup, 
GdkEventExpose *event, g
 /* Compositing is not available, so just set the background color. */
 if (!supports_alpha)
 {
-cairo_set_source_rgb(cr, 0.2, 0.2, 0.2);
+cairo_set_source_rgb(cr, 0.1, 0.1, 0.1);
 cairo_paint (cr);
 }
 
@@ -1040,7 +1040,7 @@ display_setting_identity_popup_expose(GtkWidget *popup, 
GdkEventExpose *event, g
 cairo_line_to(cr, popup-allocation.width-0.5 - radius, 0.5);
 cairo_arc(cr, popup-allocation.width-0.5 - radius, radius+0.5, 
radius, 3.0*3.14/2.0, 0.0);
 cairo_line_to(cr, popup-allocation.width-0.5, 
popup-allocation.height+0.5);
-cairo_set_source_rgba(cr, 0.2, 0.2, 0.2, 0.9);
+cairo_set_source_rgba(cr, 0.1, 0.1, 0.1, 0.9);
 cairo_fill_preserve(cr);
 cairo_set_source_rgba(cr, 1.0, 1.0, 1.0,0.7);
 cairo_stroke(cr);
@@ -1053,15 +1053,15 @@ display_setting_identity_popup_expose(GtkWidget *popup, 
GdkEventExpose *event, g
 }
 
 static GtkWidget*
-display_setting_identify_display (gint display_id,
-   GError *error)
+display_setting_identity_display (gint display_id,
+   GError *error, gboolean has_selection)
 {
 GtkBuilder *builder;
 GtkWidget *popup;
 
 GObject *display_name, *display_details;
 
-gchar *name;
+gchar *name, *color_hex;
 
 gint active_output;
 XfceRRMode   *current_mode;
@@ -1106,12 +1106,14 @@ display_setting_identify_display (gint display_id,
 name = xfce_randr_friendly_name (xfce_randr,
  
xfce_randr-resources-outputs[display_id],
  
xfce_randr-output_info[display_id]-name);
- 
+color_hex = #FF;
+if ((has_selection)) color_hex = #D2;
+  
 gtk_label_set_markup (GTK_LABEL(display_name),
-  g_strdup_printf(span 
foreground='#FF'bigb%s: %s/b/big/span, _(Display), name) );
-  
+  g_strdup_printf(span 
foreground='%s'bigb%s: %s/b/big/span, color_hex, _(Display), 
name) );
+
 gtk_label_set_markup (GTK_LABEL(display_details),
-  g_strdup_printf(span foreground='#FF'%s: 
%i x %i/span, _(Resolution), screen_width, screen_height) );
+  g_strdup_printf(span foreground='%s'%s: %i x 
%i/span, color_hex, _(Resolution), screen_width, screen_height) );
   
 
 gtk_window_get_size(GTK_WINDOW(popup), window_width, window_height);
@@ -1132,7 +1134,7 @@ display_setting_identify_display (gint display_id,
 }
 
 static void
-display_setting_populate_identity_popups(GtkBuilder *builder)
+display_setting_identity_popups_populate(GtkBuilder *builder)
 {
 guint n;
 
@@ -1147,16 +1149,16 @@ display_setting_populate_identity_popups(GtkBuilder 
*builder)
 {
 switch (n) {
 case 0:
-display_popups.display1 = display_setting_identify_display(n, 
error);
+display_popups.display1 = display_setting_identity_display(n, 
error, FALSE);
 break;
 case 1:
-display_popups.display2 = display_setting_identify_display(n, 
error);
+display_popups.display2 = display_setting_identity_display(n, 
error, FALSE);
 break;
 case 2:
-display_popups.display3 = display_setting_identify_display(n, 
error);
+display_popups.display3 = display_setting_identity_display(n, 
error, FALSE);
 break;
 case 3:
-display_popups.display4 = display_setting_identify_display(n, 
error);
+display_popups.display4 = display_setting_identity_display(n, 
error, FALSE);
 break;
 default:
 break;
@@ -1355,6 +1357,7 @@ display_settings_treeview_selection_changed 
(GtkTreeSelection *selection,
 gboolean  has_selection;
 gint  

[Xfce4-commits] xfce4-settings:bluesabre/display-settings Fix Bug #7797, patch by Eric Koegel (slightly adjusted)

[Nick Schermer]

Updating branch refs/heads/bluesabre/display-settings
 to 947d77198e8dd63b467023f5a13cbabf322fa943 (commit)
   from a7f44eec2f3e41306189b635eeab9e691b3d2ebe (commit)

commit 947d77198e8dd63b467023f5a13cbabf322fa943
Author: Simon Steinbeiss simon.steinbe...@elfenbeinturm.at
Date:   Tue Oct 16 15:43:55 2012 +0200

Fix Bug #7797, patch by Eric Koegel (slightly adjusted)

 dialogs/display-settings/main.c |6 ++
 1 file changed, 6 insertions(+)

diff --git a/dialogs/display-settings/main.c b/dialogs/display-settings/main.c
index 625d2c0..b403e95 100644
--- a/dialogs/display-settings/main.c
+++ b/dialogs/display-settings/main.c
@@ -1452,6 +1452,7 @@ display_settings_treeview_populate (GtkBuilder *builder)
 gchar*name;
 GdkPixbuf*display_icon, *lucent_display_icon;
 GtkTreeSelection *selection;
+gboolean  selected = FALSE;
 
 /* Create a new list store */
 store = gtk_list_store_new (N_OUTPUT_COLUMNS,
@@ -1509,6 +1510,11 @@ display_settings_treeview_populate (GtkBuilder *builder)
 gtk_tree_selection_select_iter (selection, iter);
 }
 
+/* If nothing was selected the active output is no longer valid,
+ * select the last display in the list. */
+if (!selected)
+gtk_tree_selection_select_iter (selection, iter);
+
 /* Release the store */
 g_object_unref (G_OBJECT (store));
 
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] xfce4-settings:bluesabre/display-settings Adjust the blue hue of the selection-highlight (thanks Pasi!)

[Nick Schermer]

Updating branch refs/heads/bluesabre/display-settings
 to fac8d97f4d7173c9ebaeb4bdf5f51a5ee7eb03f5 (commit)
   from af52d5f5c0782bb7a86dba96d63bff3086a0fe3d (commit)

commit fac8d97f4d7173c9ebaeb4bdf5f51a5ee7eb03f5
Author: Simon Steinbeiss simon.steinbe...@elfenbeinturm.at
Date:   Thu Oct 11 01:13:18 2012 +0200

Adjust the blue hue of the selection-highlight (thanks Pasi!)

 dialogs/display-settings/main.c |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/dialogs/display-settings/main.c b/dialogs/display-settings/main.c
index 0775ae8..e32bd32 100644
--- a/dialogs/display-settings/main.c
+++ b/dialogs/display-settings/main.c
@@ -1034,10 +1034,10 @@ display_setting_identity_popup_expose(GtkWidget *popup, 
GdkEventExpose *event, g
cairo_pattern_add_color_stop_rgb(innerstroke_gradient, 0.85, 0.0, 0.0, 
0.0);

selected_gradient = cairo_pattern_create_linear(0, 0, 0, 
popup-allocation.height);
-   cairo_pattern_add_color_stop_rgb(selected_gradient, 0, 0.05, 0.25, 
0.45);
-   cairo_pattern_add_color_stop_rgb(selected_gradient, 0.4, 0.05, 0.15, 
0.25);
+   cairo_pattern_add_color_stop_rgb(selected_gradient, 0, 0.05, 0.20, 
0.46);
+   cairo_pattern_add_color_stop_rgb(selected_gradient, 0.4, 0.05, 0.12, 
0.25);
cairo_pattern_add_color_stop_rgb(selected_gradient, 0.6, 0.05, 0.10, 
0.20);
-   cairo_pattern_add_color_stop_rgb(selected_gradient, 0.8, 0.0, 0.05, 
0.05);
+   cairo_pattern_add_color_stop_rgb(selected_gradient, 0.8, 0.0, 0.02, 
0.05);

selected_innerstroke_gradient = cairo_pattern_create_linear(0, 0, 0, 
popup-allocation.height);
cairo_pattern_add_color_stop_rgb(selected_innerstroke_gradient, 0, 
0.15, 0.45, 0.75);
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] xfce4-settings:bluesabre/display-settings Fix previous commit

[Nick Schermer]

Updating branch refs/heads/bluesabre/display-settings
 to b14b00b0d6997b16a89ca0a4ac64860bc71862b3 (commit)
   from 947d77198e8dd63b467023f5a13cbabf322fa943 (commit)

commit b14b00b0d6997b16a89ca0a4ac64860bc71862b3
Author: Simon Steinbeiss simon.steinbe...@elfenbeinturm.at
Date:   Tue Oct 16 16:18:14 2012 +0200

Fix previous commit

 dialogs/display-settings/main.c |3 +++
 1 file changed, 3 insertions(+)

diff --git a/dialogs/display-settings/main.c b/dialogs/display-settings/main.c
index b403e95..57e27c8 100644
--- a/dialogs/display-settings/main.c
+++ b/dialogs/display-settings/main.c
@@ -1507,7 +1507,10 @@ display_settings_treeview_populate (GtkBuilder *builder)
 
 /* Select active output */
 if (m == active_output)
+{
 gtk_tree_selection_select_iter (selection, iter);
+selected = TRUE;
+}
 }
 
 /* If nothing was selected the active output is no longer valid,
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] xfce4-settings:bluesabre/display-settings Recompute dimensions even if the mode hasn't changed

[Nick Schermer]

Updating branch refs/heads/bluesabre/display-settings
 to 0de6f94cf852014bfde94eac903bf9f43995 (commit)
   from e8be92f29a55eb71168a1c26d94e4a32614a (commit)

commit 0de6f94cf852014bfde94eac903bf9f43995
Author: Lionel Le Folgoc lio...@lefolgoc.net
Date:   Thu Oct 18 13:06:39 2012 +0200

Recompute dimensions even if the mode hasn't changed

(because the rotation may have changed)

Signed-off-by: Simon Steinbeiss simon.steinbe...@elfenbeinturm.at

 xfsettingsd/displays.c |   22 +++---
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/xfsettingsd/displays.c b/xfsettingsd/displays.c
index 8948637..b21b2bc 100644
--- a/xfsettingsd/displays.c
+++ b/xfsettingsd/displays.c
@@ -676,18 +676,18 @@ xfce_displays_helper_channel_apply (XfceDisplaysHelper 
*helper,
 /* update CRTC mode */
 crtc-mode = valid_mode;
 crtc-changed = TRUE;
+}
 
-/* recompute dimensions according to the selected rotation */
-if ((crtc-rotation  (RR_Rotate_90|RR_Rotate_270)) != 0)
-{
-crtc-width = resources-modes[l].height;
-crtc-height = resources-modes[l].width;
-}
-else
-{
-crtc-width = resources-modes[l].width;
-crtc-height = resources-modes[l].height;
-}
+/* recompute dimensions according to the selected rotation */
+if ((crtc-rotation  (RR_Rotate_90|RR_Rotate_270)) != 0)
+{
+crtc-width = resources-modes[l].height;
+crtc-height = resources-modes[l].width;
+}
+else
+{
+crtc-width = resources-modes[l].width;
+crtc-height = resources-modes[l].height;
 }
 
 /* position, x */
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] xfce4-settings:bluesabre/display-settings Visual improvements to the identity-popup

[Nick Schermer]

Updating branch refs/heads/bluesabre/display-settings
 to af52d5f5c0782bb7a86dba96d63bff3086a0fe3d (commit)
   from 0b641006b099507b8017bc46777d2606cf7cf4e2 (commit)

commit af52d5f5c0782bb7a86dba96d63bff3086a0fe3d
Author: Simon Steinbeiss simon.steinbe...@elfenbeinturm.at
Date:   Wed Oct 10 18:27:21 2012 +0200

Visual improvements to the identity-popup

 dialogs/display-settings/main.c |   87 +--
 1 file changed, 75 insertions(+), 12 deletions(-)

diff --git a/dialogs/display-settings/main.c b/dialogs/display-settings/main.c
index 9b5aa69..0775ae8 100644
--- a/dialogs/display-settings/main.c
+++ b/dialogs/display-settings/main.c
@@ -1011,21 +1011,63 @@ display_setting_screen_changed(GtkWidget *widget, 
GdkScreen *old_screen, gpointe
 }
 
 static gboolean
-display_setting_identity_popup_expose(GtkWidget *popup, GdkEventExpose *event, 
gpointer userdata)
+display_setting_identity_popup_expose(GtkWidget *popup, GdkEventExpose *event, 
gpointer has_selection)
 {
 cairo_t *cr = gdk_cairo_create(popup-window);
 gint radius;
+gboolean selected = GPOINTER_TO_INT(has_selection);
+cairo_pattern_t *vertical_gradient, *innerstroke_gradient, 
*selected_gradient, *selected_innerstroke_gradient;
 
-radius = 15;
+radius = 10;
 cairo_set_operator (cr, CAIRO_OPERATOR_SOURCE);
-
+
+/* Create the various gradients */
+   vertical_gradient = cairo_pattern_create_linear(0, 0, 0, 
popup-allocation.height);
+   cairo_pattern_add_color_stop_rgb(vertical_gradient, 0, 0.25, 0.25, 
0.25);
+   cairo_pattern_add_color_stop_rgb(vertical_gradient, 0.24, 0.15, 0.15, 
0.15);
+   cairo_pattern_add_color_stop_rgb(vertical_gradient, 0.6, 0.0, 0.0, 0.0);
+   
+   innerstroke_gradient = cairo_pattern_create_linear(0, 0, 0, 
popup-allocation.height);
+   cairo_pattern_add_color_stop_rgb(innerstroke_gradient, 0, 0.35, 0.35, 
0.35);
+   cairo_pattern_add_color_stop_rgb(innerstroke_gradient, 0.4, 0.25, 0.25, 
0.25);
+   cairo_pattern_add_color_stop_rgb(innerstroke_gradient, 0.7, 0.15, 0.15, 
0.15);
+   cairo_pattern_add_color_stop_rgb(innerstroke_gradient, 0.85, 0.0, 0.0, 
0.0);
+   
+   selected_gradient = cairo_pattern_create_linear(0, 0, 0, 
popup-allocation.height);
+   cairo_pattern_add_color_stop_rgb(selected_gradient, 0, 0.05, 0.25, 
0.45);
+   cairo_pattern_add_color_stop_rgb(selected_gradient, 0.4, 0.05, 0.15, 
0.25);
+   cairo_pattern_add_color_stop_rgb(selected_gradient, 0.6, 0.05, 0.10, 
0.20);
+   cairo_pattern_add_color_stop_rgb(selected_gradient, 0.8, 0.0, 0.05, 
0.05);
+   
+   selected_innerstroke_gradient = cairo_pattern_create_linear(0, 0, 0, 
popup-allocation.height);
+   cairo_pattern_add_color_stop_rgb(selected_innerstroke_gradient, 0, 
0.15, 0.45, 0.75);
+   cairo_pattern_add_color_stop_rgb(selected_innerstroke_gradient, 0.7, 
0.0, 0.15, 0.25);
+   cairo_pattern_add_color_stop_rgb(selected_innerstroke_gradient, 0.85, 
0.0, 0.0, 0.0);
+   
 /* Compositing is not available, so just set the background color. */
 if (!supports_alpha)
 {
-cairo_set_source_rgb(cr, 0.1, 0.1, 0.1);
+   /* Draw a filled rectangle with outline */
+   cairo_set_line_width(cr, 1.0);
+cairo_set_source(cr, vertical_gradient);
+if (selected) cairo_set_source(cr, selected_gradient);
 cairo_paint (cr);
-cairo_set_source_rgb(cr, 1.0, 1.0, 1.0);
-cairo_rectangle(cr, 0, 0, popup-allocation.width, 
popup-allocation.height);
+cairo_set_source_rgb(cr, 0.0, 0.0, 0.0);
+cairo_rectangle(cr, 0.5, 0.5, popup-allocation.width-0.5, 
popup-allocation.height-0.5);
+cairo_stroke(cr);
+
+/* Draw the inner stroke */
+cairo_set_source_rgb(cr, 0.35, 0.35, 0.35);
+if (selected) cairo_set_source_rgb(cr, 0.15, 0.45, 0.75);
+cairo_move_to(cr, 1.5, 1.5);
+cairo_line_to(cr, popup-allocation.width-1, 1.5);
+cairo_stroke(cr);
+cairo_set_source(cr, innerstroke_gradient);
+if (selected) cairo_set_source(cr, selected_innerstroke_gradient);
+cairo_move_to(cr, 1.5, 1.5);
+cairo_line_to(cr, 1.5, popup-allocation.height-1.0);
+cairo_move_to(cr, popup-allocation.width-1.5, 1.5);
+cairo_line_to(cr, popup-allocation.width-1.5, 
popup-allocation.height-1.0);
 cairo_stroke(cr);
 }
 
@@ -1043,14 +1085,35 @@ display_setting_identity_popup_expose(GtkWidget *popup, 
GdkEventExpose *event, g
 cairo_line_to(cr, popup-allocation.width-0.5 - radius, 0.5);
 cairo_arc(cr, popup-allocation.width-0.5 - radius, radius+0.5, 
radius, 3.0*3.14/2.0, 0.0);
 cairo_line_to(cr, popup-allocation.width-0.5, 
popup-allocation.height+0.5);
-cairo_set_source_rgba(cr, 0.1, 0.1, 0.1, 0.9);
+cairo_set_source(cr, vertical_gradient);
+if (selected) cairo_set_source(cr, 

[Xfce4-commits] xfce4-settings:bluesabre/display-settings Change the display size before applying settings

[Nick Schermer]

Updating branch refs/heads/bluesabre/display-settings
 to bbc6e64c1b48c45659227dcffb1475f0650d9e8b (commit)
   from 487c1b0e364b37a4310827e8192c26b4c47da61a (commit)

commit bbc6e64c1b48c45659227dcffb1475f0650d9e8b
Author: Lionel Le Folgoc lio...@lefolgoc.net
Date:   Mon Oct 15 16:32:50 2012 +0200

Change the display size before applying settings

Apply changes per CRTC instead of per output and simplify the code a bit.

Signed-off-by: Simon Steinbeiss simon.steinbe...@elfenbeinturm.at

 xfsettingsd/debug.c|1 +
 xfsettingsd/debug.h|1 +
 xfsettingsd/displays.c |  435 ++--
 3 files changed, 201 insertions(+), 236 deletions(-)

diff --git a/xfsettingsd/debug.c b/xfsettingsd/debug.c
index 67d53d9..e9653e8 100644
--- a/xfsettingsd/debug.c
+++ b/xfsettingsd/debug.c
@@ -40,6 +40,7 @@ static const GDebugKey dbg_keys[] =
 { workspaces, XFSD_DEBUG_WORKSPACES },
 { accessibility, XFSD_DEBUG_ACCESSIBILITY },
 { pointers, XFSD_DEBUG_POINTERS },
+{ displays, XFSD_DEBUG_DISPLAYS },
 };
 
 
diff --git a/xfsettingsd/debug.h b/xfsettingsd/debug.h
index 228913e..20adbf3 100644
--- a/xfsettingsd/debug.h
+++ b/xfsettingsd/debug.h
@@ -32,6 +32,7 @@ typedef enum
XFSD_DEBUG_WORKSPACES = 1  6,
XFSD_DEBUG_ACCESSIBILITY  = 1  7,
XFSD_DEBUG_POINTERS   = 1  8,
+   XFSD_DEBUG_DISPLAYS   = 1  9,
 }
 XfsdDebugDomain;
 
diff --git a/xfsettingsd/displays.c b/xfsettingsd/displays.c
index ee0a4d9..be03da3 100644
--- a/xfsettingsd/displays.c
+++ b/xfsettingsd/displays.c
@@ -32,10 +32,10 @@
 #include gdk/gdkx.h
 #include gtk/gtk.h
 #include xfconf/xfconf.h
-#include libxfce4ui/libxfce4ui.h
 
 #include X11/extensions/Xrandr.h
 
+#include debug.h
 #include displays.h
 
 /* check for randr 1.3 or better */
@@ -89,14 +89,13 @@ struct _XfceRRCrtc
 RROutput *outputs;
 gint  npossible;
 RROutput *possible;
-gint  processed;
+gint  changed;
 };
 
 struct _XfceRROutput
 {
 RROutput   id;
 XRROutputInfo *info;
-XfceRRCrtc*pending;
 };
 
 
@@ -226,7 +225,7 @@ xfce_displays_helper_list_crtcs (Display
*xdisplay,
 crtcs[n].possible = g_memdup (crtc_info-possible,
   crtc_info-npossible * sizeof 
(RROutput));
 
-crtcs[n].processed = FALSE;
+crtcs[n].changed = FALSE;
 XRRFreeCrtcInfo (crtc_info);
 }
 
@@ -256,8 +255,6 @@ xfce_displays_helper_free_output (XfceRROutput *output)
 return;
 
 XRRFreeOutputInfo (output-info);
-xfce_displays_helper_cleanup_crtc (output-pending);
-g_free (output-pending);
 g_free (output);
 }
 
@@ -265,20 +262,18 @@ xfce_displays_helper_free_output (XfceRROutput *output)
 
 static GPtrArray *
 xfce_displays_helper_list_outputs (Display*xdisplay,
-   XRRScreenResources *resources,
-   gint   *nactive)
+   XRRScreenResources *resources)
 {
 GPtrArray *outputs;
 XRROutputInfo *info;
 XfceRROutput  *output;
 gint   n;
 
-g_assert (xdisplay  resources  nactive);
+g_assert (xdisplay  resources);
 
 outputs = g_ptr_array_new ();
 
 /* get all connected outputs */
-*nactive = 0;
 for (n = 0; n  resources-noutput; ++n)
 {
 info = XRRGetOutputInfo (xdisplay, resources, resources-outputs[n]);
@@ -292,15 +287,9 @@ xfce_displays_helper_list_outputs (Display
*xdisplay,
 output = g_new0 (XfceRROutput, 1);
 output-id = resources-outputs[n];
 output-info = info;
-/* this will contain the settings to apply (filled in later) */
-output-pending = NULL;
 
 /* cache it */
 g_ptr_array_add (outputs, output);
-
-/* return the number of active outputs */
-if (info-crtc != None)
-++(*nactive);
 }
 
 return outputs;
@@ -329,46 +318,6 @@ xfce_displays_helper_find_crtc_by_id (XRRScreenResources 
*resources,
 
 
 static XfceRRCrtc *
-xfce_displays_helper_find_clonable_crtc (XRRScreenResources *resources,
- XfceRRCrtc *crtcs,
- XfceRROutput   *output)
-{
-gint m, n, candidate;
-
-g_assert (resources  crtcs  output);
-
-for (n = 0; n  resources-ncrtc; ++n)
-{
-if (crtcs[n].processed  crtcs[n].x == output-pending-x
- crtcs[n].y == output-pending-y
- crtcs[n].mode == output-pending-mode
- crtcs[n].rotation == output-pending-rotation)
-{
-/* we found a CRTC already enabled with the exact values
-   = might be suitable for a clone, check that it can be
-   connected to the new output */
-candidate = FALSE;
-for (m = 0; m  crtcs[n].npossible; ++m)
-

[Xfce4-commits] xfce4-settings:bluesabre/display-settings Fix small memleak and don't recolor identity-popup when there's only one display

[Nick Schermer]

Updating branch refs/heads/bluesabre/display-settings
 to 6d490988e1f3546a5db3f32ce21b519776783778 (commit)
   from bac44358340e4d960a4147111dd8fabfe1b469ed (commit)

commit 6d490988e1f3546a5db3f32ce21b519776783778
Author: Simon Steinbeiss simon.steinbe...@elfenbeinturm.at
Date:   Mon Oct 8 16:24:48 2012 +0200

Fix small memleak and don't recolor identity-popup when there's only one 
display

 dialogs/display-settings/main.c |   25 ++---
 1 file changed, 14 insertions(+), 11 deletions(-)

diff --git a/dialogs/display-settings/main.c b/dialogs/display-settings/main.c
index e8c0e52..b7f3e3e 100644
--- a/dialogs/display-settings/main.c
+++ b/dialogs/display-settings/main.c
@@ -1061,7 +1061,7 @@ display_setting_identity_display (gint display_id,
 
 GObject *display_name, *display_details;
 
-gchar *name, *color_hex;
+gchar *name, *color_hex, *name_label, *details_label;
 
 gint active_output;
 XfceRRMode   *current_mode;
@@ -1108,13 +1108,14 @@ display_setting_identity_display (gint display_id,
  
xfce_randr-output_info[display_id]-name);
 color_hex = #FF;
 if ((has_selection)) color_hex = #D2;
-  
-gtk_label_set_markup (GTK_LABEL(display_name),
-  g_markup_printf_escaped(span 
foreground='%s'bigb%s %s/b/big/span, color_hex, _(Display:), 
name) );
 
-gtk_label_set_markup (GTK_LABEL(display_details),
-  g_markup_printf_escaped(span 
foreground='%s'%s %i x %i/span, color_hex, _(Resolution:), screen_width, 
screen_height) );
-  
+name_label = g_markup_printf_escaped(span foreground='%s'bigb%s 
%s/b/big/span, color_hex, _(Display:), name);
+gtk_label_set_markup (GTK_LABEL(display_name), name_label);
+g_free (name_label);
+
+details_label = g_markup_printf_escaped(span foreground='%s'%s %i x 
%i/span, color_hex, _(Resolution:), screen_width, screen_height);
+gtk_label_set_markup (GTK_LABEL(display_details), details_label);
+g_free (details_label);
 
 gtk_window_get_size(GTK_WINDOW(popup), window_width, window_height);
 
@@ -1390,26 +1391,28 @@ display_settings_treeview_selection_changed 
(GtkTreeSelection *selection,
 gtk_widget_set_sensitive( GTK_WIDGET(display_combo), FALSE );
 }
 
+if (display_settings_get_n_active_outputs()  1) {
 switch (active_id) {
 case 0:
-   gtk_widget_destroy(display_popups.display1);
+if (GTK_IS_WIDGET(display_popups.display1)) 
gtk_widget_destroy(display_popups.display1);
 display_popups.display1 = 
display_setting_identity_display(active_id, error, has_selection);
 break;
 case 1:
-   gtk_widget_destroy(display_popups.display2);
+if (GTK_IS_WIDGET(display_popups.display2)) 
gtk_widget_destroy(display_popups.display2);
 display_popups.display2 = 
display_setting_identity_display(active_id, error, has_selection);
 break;
 case 2:
-   gtk_widget_destroy(display_popups.display3);
+if (GTK_IS_WIDGET(display_popups.display3)) 
gtk_widget_destroy(display_popups.display3);
 display_popups.display3 = 
display_setting_identity_display(active_id, error, has_selection);
 break;
 case 3:
-   gtk_widget_destroy(display_popups.display4);
+if (GTK_IS_WIDGET(display_popups.display4)) 
gtk_widget_destroy(display_popups.display4);
 display_popups.display4 = 
display_setting_identity_display(active_id, error, has_selection);
 break;
 default:
 break;
 }
+   }
 }
 }
 
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] xfce4-settings:bluesabre/display-settings Simplify position handling with enums and structs

[Nick Schermer]

Updating branch refs/heads/bluesabre/display-settings
 to 9e5481cb8a2d00f2c77e12b7e15f1f0a586a3927 (commit)
   from b6139161381874dff079765a2e1f2abae5061ac5 (commit)

commit 9e5481cb8a2d00f2c77e12b7e15f1f0a586a3927
Author: Lionel Le Folgoc lio...@lefolgoc.net
Date:   Mon Oct 15 18:15:02 2012 +0200

Simplify position handling with enums and structs

This matches what's done for Rotations and Reflections.

Signed-off-by: Simon Steinbeiss simon.steinbe...@elfenbeinturm.at

 dialogs/display-settings/main.c   |   50 ++---
 dialogs/display-settings/xfce-randr.h |   22 +++
 2 files changed, 38 insertions(+), 34 deletions(-)

diff --git a/dialogs/display-settings/main.c b/dialogs/display-settings/main.c
index 0fcc825..560a37c 100644
--- a/dialogs/display-settings/main.c
+++ b/dialogs/display-settings/main.c
@@ -77,6 +77,18 @@ typedef struct {
 
 
 
+/* Xrandr relation name conversion */
+static const XfceRelation relation_names[] =
+{
+{ XFCE_RANDR_PLACEMENT_MIRROR,   N_(Same as) },
+{ XFCE_RANDR_PLACEMENT_UP, N_(Above) },
+{ XFCE_RANDR_PLACEMENT_DOWN, N_(Below) },
+{ XFCE_RANDR_PLACEMENT_RIGHT, N_(Right of) },
+{ XFCE_RANDR_PLACEMENT_LEFT,  N_(Left of) }
+};
+
+
+
 /* Xrandr rotation name conversion */
 static const XfceRotation rotation_names[] =
 {
@@ -413,6 +425,7 @@ display_setting_positions_populate (GtkBuilder *builder)
 GtkTreeModel *model;
 GObject  *combobox;
 GtkTreeIter   iter;
+guint n;
 
 /* Get the positions combo box store and clear it */
 combobox = gtk_builder_get_object (builder, randr-position);
@@ -433,35 +446,14 @@ display_setting_positions_populate (GtkBuilder *builder)
  display_setting_positions_changed,
  builder, NULL);
 
-/* Insert mirror */
-gtk_list_store_append (GTK_LIST_STORE (model), iter);
-gtk_list_store_set (GTK_LIST_STORE (model), iter,
-COLUMN_COMBO_NAME, _(Mirror),
-COLUMN_COMBO_VALUE, XFCE_RANDR_PLACEMENT_MIRROR, -1);
-
-/* Insert left-of */
-gtk_list_store_append (GTK_LIST_STORE (model), iter);
-gtk_list_store_set (GTK_LIST_STORE (model), iter,
-COLUMN_COMBO_NAME, _(Left of),
-COLUMN_COMBO_VALUE, XFCE_RANDR_PLACEMENT_LEFT, -1);
-
-/* Insert right-of */
-gtk_list_store_append (GTK_LIST_STORE (model), iter);
-gtk_list_store_set (GTK_LIST_STORE (model), iter,
-COLUMN_COMBO_NAME, _(Right of),
-COLUMN_COMBO_VALUE, XFCE_RANDR_PLACEMENT_RIGHT, -1);
-
-/* Insert above */
-gtk_list_store_append (GTK_LIST_STORE (model), iter);
-gtk_list_store_set (GTK_LIST_STORE (model), iter,
-COLUMN_COMBO_NAME, _(Above),
-COLUMN_COMBO_VALUE, XFCE_RANDR_PLACEMENT_UP, -1);
-
-/* Insert below */
-gtk_list_store_append (GTK_LIST_STORE (model), iter);
-gtk_list_store_set (GTK_LIST_STORE (model), iter,
-COLUMN_COMBO_NAME, _(Below),
-COLUMN_COMBO_VALUE, XFCE_RANDR_PLACEMENT_DOWN, -1);
+/* Try to insert the relations */
+for (n = 0; n  G_N_ELEMENTS (relation_names); n++)
+{
+gtk_list_store_append (GTK_LIST_STORE (model), iter);
+gtk_list_store_set (GTK_LIST_STORE (model), iter,
+COLUMN_COMBO_NAME, _(relation_names[n].name),
+COLUMN_COMBO_VALUE, relation_names[n].relation, 
-1);
+}
 
 /* Reconnect the signal */
 g_signal_connect (G_OBJECT (combobox), changed, G_CALLBACK 
(display_setting_positions_changed), builder);
diff --git a/dialogs/display-settings/xfce-randr.h 
b/dialogs/display-settings/xfce-randr.h
index 78a0e7e..f6997ad 100644
--- a/dialogs/display-settings/xfce-randr.h
+++ b/dialogs/display-settings/xfce-randr.h
@@ -34,11 +34,6 @@
 #define XFCE_RANDR_POS_Y(randr)   
(randr-position[randr-active_output].y)
 #define XFCE_RANDR_ROTATIONS_MASK 
(RR_Rotate_0|RR_Rotate_90|RR_Rotate_180|RR_Rotate_270)
 #define XFCE_RANDR_REFLECTIONS_MASK   (RR_Reflect_X|RR_Reflect_Y)
-#define XFCE_RANDR_PLACEMENT_UP   0
-#define XFCE_RANDR_PLACEMENT_RIGHT1
-#define XFCE_RANDR_PLACEMENT_DOWN 2
-#define XFCE_RANDR_PLACEMENT_LEFT 3
-#define XFCE_RANDR_PLACEMENT_MIRROR   4
 
 /* check for randr 1.3 or better */
 #if RANDR_MAJOR  1 || (RANDR_MAJOR == 1  RANDR_MINOR = 3)
@@ -50,8 +45,10 @@
 typedef struct _XfceRandr  XfceRandr;
 typedef struct _XfceOutputPosition XfceOutputPosition;
 typedef struct _XfceRRMode XfceRRMode;
+typedef struct _XfceRelation   XfceRelation;
 typedef struct _XfceRotation   XfceRotation;
 typedef enum   _XfceOutputStatus   XfceOutputStatus;
+typedef enum   _XfceOutputRelation XfceOutputRelation;
 
 

[Xfce4-commits] xfce4-settings:bluesabre/display-settings Fix buggy computation of the screen size

[Nick Schermer]

Updating branch refs/heads/bluesabre/display-settings
 to 6b51b394691ddcde8bdad2c49dcc5cfe53d844b2 (commit)
   from 0de6f94cf852014bfde94eac903bf9f43995 (commit)

commit 6b51b394691ddcde8bdad2c49dcc5cfe53d844b2
Author: Lionel Le Folgoc lio...@lefolgoc.net
Date:   Thu Oct 18 14:25:14 2012 +0200

Fix buggy computation of the screen size

It's meaningless with multiple outputs, so change the code to match what's 
done
in other apps (GnomeRR, chromeos).

Signed-off-by: Simon Steinbeiss simon.steinbe...@elfenbeinturm.at

 xfsettingsd/displays.c |   23 ---
 1 file changed, 8 insertions(+), 15 deletions(-)

diff --git a/xfsettingsd/displays.c b/xfsettingsd/displays.c
index b21b2bc..2517057 100644
--- a/xfsettingsd/displays.c
+++ b/xfsettingsd/displays.c
@@ -169,26 +169,19 @@ xfce_displays_helper_process_screen_size (gint  
mode_width,
   gint *mm_width,
   gint *mm_height)
 {
-gdouble dpi = 0;
-
 g_assert (width  height  mm_width  mm_height);
 
 *width = MAX (*width, crtc_pos_x + mode_width);
 *height = MAX (*height, crtc_pos_y + mode_height);
 
-dpi = 25.4 * gdk_screen_height ();
-dpi /= gdk_screen_height_mm ();
-
-if (dpi = 0)
-{
-*mm_width = gdk_screen_width_mm ();
-*mm_height = gdk_screen_height_mm ();
-}
-else
-{
-*mm_width = 25.4 * (*width) / dpi;
-*mm_height = 25.4 * (*height) / dpi;
-}
+/* The 'physical size' of an X screen is meaningless if that screen
+ * can consist of many monitors. So just pick a size that make the
+ * dpi 96.
+ *
+ * Firefox and Evince apparently believe what X tells them.
+ */
+*mm_width = (*width / 96.0) * 25.4 + 0.5;
+*mm_height = (*height / 96.0) * 25.4 + 0.5;
 }
 
 
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] xfce4-settings:bluesabre/display-settings Simplify dimensions' calculation

[Nick Schermer]

Updating branch refs/heads/bluesabre/display-settings
 to cc38417d940d0d5ff79a6d056bc190d6c9f654f5 (commit)
   from 8e422bf4ed9440f70e0fca56f6a3dfd0da794eb9 (commit)

commit cc38417d940d0d5ff79a6d056bc190d6c9f654f5
Author: Lionel Le Folgoc lio...@lefolgoc.net
Date:   Mon Oct 15 17:33:19 2012 +0200

Simplify dimensions' calculation

Signed-off-by: Simon Steinbeiss simon.steinbe...@elfenbeinturm.at

 xfsettingsd/displays.c |  153 +++-
 1 file changed, 74 insertions(+), 79 deletions(-)

diff --git a/xfsettingsd/displays.c b/xfsettingsd/displays.c
index 4101135..d5a7799 100644
--- a/xfsettingsd/displays.c
+++ b/xfsettingsd/displays.c
@@ -83,6 +83,8 @@ struct _XfceRRCrtc
 RRModemode;
 Rotation  rotation;
 Rotation  rotations;
+gint  width;
+gint  height;
 gint  x;
 gint  y;
 gint  noutput;
@@ -210,6 +212,8 @@ xfce_displays_helper_list_crtcs (Display
*xdisplay,
 crtcs[n].mode = crtc_info-mode;
 crtcs[n].rotation = crtc_info-rotation;
 crtcs[n].rotations = crtc_info-rotations;
+crtcs[n].width = crtc_info-width;
+crtcs[n].height = crtc_info-height;
 crtcs[n].x = crtc_info-x;
 crtcs[n].y = crtc_info-y;
 
@@ -561,6 +565,56 @@ xfce_displays_helper_channel_apply (XfceDisplaysHelper 
*helper,
 continue;
 }
 
+/* rotation */
+g_snprintf (property, sizeof (property), /%s/%s/Rotation, scheme,
+output-info-name);
+value = g_hash_table_lookup (saved_outputs, property);
+if (G_VALUE_HOLDS_INT (value))
+int_value = g_value_get_int (value);
+else
+int_value = 0;
+
+/* convert to a Rotation */
+switch (int_value)
+{
+case 90:  rot = RR_Rotate_90;  break;
+case 180: rot = RR_Rotate_180; break;
+case 270: rot = RR_Rotate_270; break;
+default:  rot = RR_Rotate_0;   break;
+}
+
+/* reflection */
+g_snprintf (property, sizeof (property), /%s/%s/Reflection, scheme,
+output-info-name);
+value = g_hash_table_lookup (saved_outputs, property);
+if (G_VALUE_HOLDS_STRING (value))
+str_value = g_value_get_string (value);
+else
+str_value = 0;
+
+/* convert to a Rotation */
+if (g_strcmp0 (str_value, X) == 0)
+rot |= RR_Reflect_X;
+else if (g_strcmp0 (str_value, Y) == 0)
+rot |= RR_Reflect_Y;
+else if (g_strcmp0 (str_value, XY) == 0)
+rot |= (RR_Reflect_X|RR_Reflect_Y);
+
+/* check rotation support */
+if ((crtc-rotations  rot) == 0)
+{
+g_warning (Unsupported rotation for %s. Fallback to RR_Rotate_0.,
+   output-info-name);
+rot = RR_Rotate_0;
+}
+
+/* update CRTC rotation */
+if (crtc-rotation != rot)
+{
+crtc-rotation = rot;
+crtc-changed = TRUE;
+}
+
 /* resolution */
 g_snprintf (property, sizeof (property), /%s/%s/Resolution,
 scheme, output-info-name);
@@ -586,21 +640,19 @@ xfce_displays_helper_channel_apply (XfceDisplaysHelper 
*helper,
 /* walk all modes */
 for (l = 0; l  resources-nmode; ++l)
 {
-/* get the mode info */
-XRRModeInfo *mode_info = resources-modes[l];
-
 /* does the mode info match the mode we seek? */
-if (mode_info-id != output-info-modes[m])
+if (resources-modes[l].id != output-info-modes[m])
 continue;
 
 /* calculate the refresh rate */
-rate = (gdouble) mode_info-dotClock / ((gdouble) 
mode_info-hTotal * (gdouble) mode_info-vTotal);
+rate = (gdouble) resources-modes[l].dotClock /
+((gdouble) resources-modes[l].hTotal * (gdouble) 
resources-modes[l].vTotal);
 
 /* find the mode corresponding to the saved values */
 if (rint (rate) == rint (output_rate)
- (g_strcmp0 (mode_info-name, str_value) == 0))
+ (g_strcmp0 (resources-modes[l].name, str_value) == 0))
 {
-valid_mode = mode_info-id;
+valid_mode = resources-modes[l].id;
 break;
 }
 }
@@ -624,56 +676,18 @@ xfce_displays_helper_channel_apply (XfceDisplaysHelper 
*helper,
 /* update CRTC mode */
 crtc-mode = valid_mode;
 crtc-changed = TRUE;
-}
 
-/* rotation */
-g_snprintf (property, sizeof (property), /%s/%s/Rotation, scheme,
-output-info-name);
-value = g_hash_table_lookup (saved_outputs, property);
-if 

[Xfce4-commits] xfce4-settings:bluesabre/display-settings Fix inaccurate detection of active outputs

[Nick Schermer]

Updating branch refs/heads/bluesabre/display-settings
 to 400d9bfb60f30e4856d4ffcc75b5f49bece8189f (commit)
   from 9e91c98ba03a5ab129855aa2e8c1375b72217494 (commit)

commit 400d9bfb60f30e4856d4ffcc75b5f49bece8189f
Author: Lionel Le Folgoc lio...@lefolgoc.net
Date:   Wed Oct 17 22:12:45 2012 +0200

Fix inaccurate detection of active outputs

Signed-off-by: Simon Steinbeiss simon.steinbe...@elfenbeinturm.at

 dialogs/display-settings/main.c |9 ++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/dialogs/display-settings/main.c b/dialogs/display-settings/main.c
index 94a7f9e..bbfe3dd 100644
--- a/dialogs/display-settings/main.c
+++ b/dialogs/display-settings/main.c
@@ -1020,7 +1020,7 @@ display_setting_identity_display (gint display_id)
 display_name = gtk_builder_get_object (builder, display_name);
 display_details = gtk_builder_get_object (builder, display_details);
 
-if (display_settings_get_n_active_outputs() != 1)
+if (display_settings_get_n_active_outputs()  1)
 {
 current_mode = xfce_randr_find_mode_by_id (xfce_randr, display_id,

xfce_randr-mode[display_id]);
@@ -1110,8 +1110,11 @@ display_setting_mirror_displays_toggled (GtkToggleButton 
*togglebutton,
 /* Activate mirror-mode */
 
 /* Apply mirror settings to each monitor */
-for (n = 0; n  display_settings_get_n_active_outputs (); n++)
+for (n = 0; n  xfce_randr-noutput; n++)
 {
+if (xfce_randr-mode[n] == None)
+continue;
+
 xfce_randr-relation[n] = XFCE_RANDR_PLACEMENT_MIRROR;
 xfce_randr-related_to[n] = active_output;
 
@@ -1792,7 +1795,7 @@ display_settings_show_minimal_dialog (GdkDisplay  
*display,
 gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (fake_button), TRUE);
 
 //
-if ( display_settings_get_n_active_outputs () == 1 )
+if (xfce_randr-noutput  1)
 {
 gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (only_display1),
  xfce_randr-mode[0] != None);
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] xfce4-settings:bluesabre/display-settings Give the popup-widget a name so that themers can play with it

[Nick Schermer]

Updating branch refs/heads/bluesabre/display-settings
 to e28c32cf6d6712ebc9a7d2fe2425ee9180bbc25e (commit)
   from e9b4cc39bd9f2f8a7711c3e5efdb2ad37c183093 (commit)

commit e28c32cf6d6712ebc9a7d2fe2425ee9180bbc25e
Author: Simon Steinbeiss simon.steinbe...@elfenbeinturm.at
Date:   Fri Oct 5 23:48:28 2012 +0200

Give the popup-widget a name so that themers can play with it

 dialogs/display-settings/main.c |1 +
 1 file changed, 1 insertion(+)

diff --git a/dialogs/display-settings/main.c b/dialogs/display-settings/main.c
index 6a50c2d..de5a9f8 100644
--- a/dialogs/display-settings/main.c
+++ b/dialogs/display-settings/main.c
@@ -1074,6 +1074,7 @@ display_setting_identify_display (gint display_id,
  identity_popup_ui_length, error) != 0)
 {
 popup = (GtkWidget *) gtk_builder_get_object(builder, popup);
+gtk_widget_set_name(GTK_WIDGET(popup),XfceDisplayDialogPopup);
 
 gtk_widget_set_app_paintable(popup, TRUE);
 g_signal_connect( G_OBJECT(popup), expose-event, 
G_CALLBACK(display_setting_identity_popup_expose), NULL );
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] xfce4-settings:bluesabre/display-settings Always show identity popups (Drop focus-out event to reduce redraws)

[Nick Schermer]

Updating branch refs/heads/bluesabre/display-settings
 to 6f819104eef28083a6edf7a952b82797d8f6ed2d (commit)
   from da345c7d32e09978ad12c4478a49b6a111997fd4 (commit)

commit 6f819104eef28083a6edf7a952b82797d8f6ed2d
Author: Simon Steinbeiss simon.steinbe...@elfenbeinturm.at
Date:   Fri Oct 26 14:08:44 2012 +0200

Always show identity popups
(Drop focus-out event to reduce redraws)

 dialogs/display-settings/main.c |   29 +
 1 file changed, 9 insertions(+), 20 deletions(-)

diff --git a/dialogs/display-settings/main.c b/dialogs/display-settings/main.c
index ba80d05..8f56e0a 100644
--- a/dialogs/display-settings/main.c
+++ b/dialogs/display-settings/main.c
@@ -205,24 +205,21 @@ display_setting_combo_box_get_value (GtkComboBox 
*combobox,
 }
 
 static void
-display_setting_toggle_identity_popup (gpointer   key,
+display_setting_show_identity_popup (gpointer   key,
GtkWidget *value,
-   gpointer   show)
+   gpointer   userdata)
 {
-if (!GPOINTER_TO_INT (show))
-gtk_widget_hide (value);
-else
-gtk_widget_show (value);
+gtk_widget_show (value);
 }
 
 static gboolean
-display_setting_toggle_identity_popups (GtkWidget *widget,
+display_setting_show_identity_popups (GtkWidget *widget,
 GdkEvent  *event,
-gpointer   show)
+gpointer   userdata)
 {
 g_hash_table_foreach (display_popups,
-  (GHFunc) display_setting_toggle_identity_popup,
-  show);
+  (GHFunc) display_setting_show_identity_popup,
+  NULL);
 return FALSE;
 }
 
@@ -289,11 +286,7 @@ display_setting_timed_confirmation (GtkBuilder 
*main_builder)
 
 dialog = gtk_builder_get_object (builder, dialog1);
 
-g_signal_connect (G_OBJECT (dialog), focus-out-event, G_CALLBACK 
(display_setting_toggle_identity_popups),
-  GINT_TO_POINTER (FALSE));
-
-g_signal_connect (G_OBJECT (dialog), focus-in-event, G_CALLBACK 
(display_setting_toggle_identity_popups),
-  GINT_TO_POINTER (TRUE));
+g_signal_connect (G_OBJECT (dialog), focus-in-event, G_CALLBACK 
(display_setting_show_identity_popups), NULL);
 
 gtk_window_set_transient_for (GTK_WINDOW (dialog), GTK_WINDOW 
(main_dialog));
 source_id = g_timeout_add_seconds (1, (GSourceFunc) 
display_settings_update_time_label,
@@ -1774,11 +1767,7 @@ display_settings_show_main_dialog (GdkDisplay *display)
 gtk_widget_show (GTK_WIDGET (plug_child));
 }
 
-g_signal_connect (G_OBJECT (dialog), focus-out-event, G_CALLBACK 
(display_setting_toggle_identity_popups),
-  GINT_TO_POINTER (FALSE));
-
-g_signal_connect (G_OBJECT (dialog), focus-in-event, G_CALLBACK 
(display_setting_toggle_identity_popups),
-  GINT_TO_POINTER (TRUE));
+g_signal_connect (G_OBJECT (dialog), focus-in-event, G_CALLBACK 
(display_setting_show_identity_popups), NULL);
 
 /* To prevent the settings dialog to be saved in the session */
 gdk_set_sm_client_id (FAKE ID);
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] xfce4-settings:bluesabre/display-settings Only disable CRTCs that won't fit in the new screen

[Nick Schermer]

Updating branch refs/heads/bluesabre/display-settings
 to e746c3379c7955772f58445beb2796f9095f5063 (commit)
   from b453760a7b8b174a71a6a30343d3c33e88a6e53c (commit)

commit e746c3379c7955772f58445beb2796f9095f5063
Author: Lionel Le Folgoc lio...@lefolgoc.net
Date:   Wed Oct 24 15:14:58 2012 +0200

Only disable CRTCs that won't fit in the new screen

Signed-off-by: Simon Steinbeiss simon.steinbe...@elfenbeinturm.at

 xfsettingsd/displays.c |   57 +---
 1 file changed, 35 insertions(+), 22 deletions(-)

diff --git a/xfsettingsd/displays.c b/xfsettingsd/displays.c
index 3d5e0f0..af6e6cd 100644
--- a/xfsettingsd/displays.c
+++ b/xfsettingsd/displays.c
@@ -450,6 +450,7 @@ xfce_displays_helper_channel_apply (XfceDisplaysHelper 
*helper,
 Display*xdisplay;
 GdkWindow  *root_window;
 XRRScreenResources *resources;
+XRRCrtcInfo*crtc_info;
 XfceRRCrtc *crtcs, *crtc;
 gchar   property[512];
 gintmin_width, min_height, max_width, max_height;
@@ -736,35 +737,47 @@ xfce_displays_helper_channel_apply (XfceDisplaysHelper 
*helper,
 /* grab server to prevent clients from thinking no output is enabled */
 gdk_x11_display_grab (display);
 
-/* second loop, normalization and global settings */
+/* second loop, normalization and screen size calculation */
 for (m = 0; m  resources-ncrtc; ++m)
 {
 /* ignore disabled outputs for size computations */
-if (crtcs[m].mode != None)
-{
-/* normalize positions to ensure the upper left corner is at (0,0) 
*/
-if (min_x || min_y)
-{
-crtcs[m].x -= min_x;
-crtcs[m].y -= min_y;
-crtcs[m].changed = TRUE;
-}
-
-xfsettings_dbg (XFSD_DEBUG_DISPLAYS, Normalized CRTC %lu: 
size=%dx%d, pos=%dx%d.,
-crtcs[m].id, crtcs[m].width, crtcs[m].height, 
crtcs[m].x, crtcs[m].y);
+if (crtcs[m].mode == None)
+continue;
 
-/* calculate the total screen size */
-xfce_displays_helper_process_screen_size (crtcs[m].width, 
crtcs[m].height,
-  crtcs[m].x, crtcs[m].y, 
width,
-  height, mm_width, 
mm_height);
+/* normalize positions to ensure the upper left corner is at (0,0) */
+if (min_x || min_y)
+{
+crtcs[m].x -= min_x;
+crtcs[m].y -= min_y;
+crtcs[m].changed = TRUE;
 }
 
-/* disable the CRTC, it will be reenabled after size calculation, 
unless the user disabled it */
-if (xfce_displays_helper_disable_crtc (xdisplay, resources, 
crtcs[m].id) == RRSetConfigSuccess)
-crtcs[m].changed = (crtcs[m].mode != None);
-else
-g_warning (Failed to disable CRTC %lu., crtc-id);
+xfsettings_dbg (XFSD_DEBUG_DISPLAYS, Normalized CRTC %lu: size=%dx%d, 
pos=%dx%d.,
+crtcs[m].id, crtcs[m].width, crtcs[m].height, 
crtcs[m].x, crtcs[m].y);
 
+/* calculate the total screen size */
+xfce_displays_helper_process_screen_size (crtcs[m].width, 
crtcs[m].height,
+  crtcs[m].x, crtcs[m].y, 
width,
+  height, mm_width, 
mm_height);
+}
+
+/* disable CRTCs that won't fit in the new screen */
+for (m = 0; m  resources-ncrtc; ++m)
+{
+/* The CRTC needs to be disabled if its previous mode won't fit in the 
new screen.
+   It will be reenabled with its new mode (known to fit) after the 
screen size is
+   changed, unless the user disabled it (no need to reenable it then). 
*/
+crtc_info = XRRGetCrtcInfo (xdisplay, resources, crtcs[m].id);
+if ((crtc_info-x + crtc_info-width  (guint) width) ||
+(crtc_info-y + crtc_info-height  (guint) height))
+{
+xfsettings_dbg (XFSD_DEBUG_DISPLAYS, CRTC %lu must be temporarily 
disabled., crtcs[m].id);
+if (xfce_displays_helper_disable_crtc (xdisplay, resources, 
crtcs[m].id) == RRSetConfigSuccess)
+crtcs[m].changed = (crtcs[m].mode != None);
+else
+g_warning (Failed to temporarily disable CRTC %lu., 
crtc-id);
+}
+XRRFreeCrtcInfo (crtc_info);
 }
 
 /* set the screen size only if it's really needed and valid */
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] xfce4-settings:bluesabre/display-settings Switch to gdk function to grab/ungrab the server

[Nick Schermer]

Updating branch refs/heads/bluesabre/display-settings
 to 46eb5cbcb513aac30fa009fd50fca36de1a922fc (commit)
   from 6b51b394691ddcde8bdad2c49dcc5cfe53d844b2 (commit)

commit 46eb5cbcb513aac30fa009fd50fca36de1a922fc
Author: Lionel Le Folgoc lio...@lefolgoc.net
Date:   Thu Oct 18 14:29:44 2012 +0200

Switch to gdk function to grab/ungrab the server

Signed-off-by: Simon Steinbeiss simon.steinbe...@elfenbeinturm.at

 xfsettingsd/displays.c |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/xfsettingsd/displays.c b/xfsettingsd/displays.c
index 2517057..5af8614 100644
--- a/xfsettingsd/displays.c
+++ b/xfsettingsd/displays.c
@@ -726,7 +726,7 @@ xfce_displays_helper_channel_apply (XfceDisplaysHelper 
*helper,
 }
 
 /* grab server to prevent clients from thinking no output is enabled */
-XGrabServer (xdisplay);
+gdk_x11_display_grab (display);
 
 /* second loop, normalization and global settings */
 for (m = 0; m  resources-ncrtc; ++m)
@@ -786,7 +786,7 @@ xfce_displays_helper_channel_apply (XfceDisplaysHelper 
*helper,
 }
 
 /* release the grab, changes are done */
-XUngrabServer (xdisplay);
+gdk_x11_display_ungrab (display);
 
 err_cleanup:
 /* Free the xfconf properties */
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] xfce4-settings:bluesabre/display-settings Post release tag bump.

[Nick Schermer]

Updating branch refs/heads/bluesabre/display-settings
 to 367f4941ea1ac683b02c93a07703a92fca6dc782 (commit)
   from b012838f4295990f8152beba0a3375d3275b0105 (commit)

commit 367f4941ea1ac683b02c93a07703a92fca6dc782
Author: Nick Schermer n...@xfce.org
Date:   Wed Oct 31 20:45:58 2012 +0100

Post release tag bump.

 configure.ac.in |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/configure.ac.in b/configure.ac.in
index bce4cae..042d376 100644
--- a/configure.ac.in
+++ b/configure.ac.in
@@ -14,7 +14,7 @@ m4_define([xfce4_settings_version_minor], [11])
 m4_define([xfce4_settings_version_micro], [0])
 m4_define([xfce4_settings_version_nano], [])
 m4_define([xfce4_settings_version_build], [@REVISION@])
-m4_define([xfce4_settings_version_tag], []) # Leave empty for releases
+m4_define([xfce4_settings_version_tag], [git]) # Leave empty for releases
 m4_define([xfce4_settings_version], 
[xfce4_settings_version_major().xfce4_settings_version_minor().xfce4_settings_version_micro()ifelse(xfce4_settings_version_nano(),
 [], [], [.xfce4_settings_version_nano()])ifelse(xfce4_settings_version_tag(), 
[git], [xfce4_settings_version_tag()-xfce4_settings_version_build()], 
[xfce4_settings_version_tag()])])
 
 dnl ***
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] xfce4-settings:bluesabre/display-settings Really fix items' sensitivity, for real this time

[Nick Schermer]

Updating branch refs/heads/bluesabre/display-settings
 to 28cf05504c8f800ff56b208fc9b8cead7a423726 (commit)
   from 69899f4e2af6b3f7f6d7e84530b81dac1eb154f6 (commit)

commit 28cf05504c8f800ff56b208fc9b8cead7a423726
Author: Lionel Le Folgoc lio...@lefolgoc.net
Date:   Wed Oct 17 23:27:43 2012 +0200

Really fix items' sensitivity, for real this time

Signed-off-by: Simon Steinbeiss simon.steinbe...@elfenbeinturm.at

 dialogs/display-settings/main.c |   53 +--
 1 file changed, 29 insertions(+), 24 deletions(-)

diff --git a/dialogs/display-settings/main.c b/dialogs/display-settings/main.c
index 0ee24b9..eb66c75 100644
--- a/dialogs/display-settings/main.c
+++ b/dialogs/display-settings/main.c
@@ -385,7 +385,7 @@ static void
 display_setting_positions_populate (GtkBuilder *builder)
 {
 GtkTreeModel *model;
-GObject  *combobox;
+GObject  *combobox, *mirror_displays;
 GtkTreeIter   iter;
 guint n;
 
@@ -394,9 +394,15 @@ display_setting_positions_populate (GtkBuilder *builder)
 model = gtk_combo_box_get_model (GTK_COMBO_BOX (combobox));
 gtk_list_store_clear (GTK_LIST_STORE (model));
 
-/* Only make the combobox interactive if there is more than one output */
-gtk_widget_set_sensitive (GTK_WIDGET (combobox),
-  display_settings_get_n_active_outputs ()  1);
+/* Only make the combobox interactive if there is more than one output,
+   and if they are not in mirror mode */
+mirror_displays = gtk_builder_get_object (builder, mirror-displays);
+if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (mirror_displays)) ||
+display_settings_get_n_active_outputs () = 1)
+{
+gtk_widget_set_sensitive (GTK_WIDGET (combobox), FALSE);
+return;
+}
 
 /* Disconnect the changed signal to avoid triggering the confirmation
  * dialog */
@@ -440,18 +446,24 @@ static void
 display_setting_active_displays_populate (GtkBuilder *builder)
 {
 GtkTreeModel *model;
-GObject  *combobox;
+GObject  *combobox, *mirror_displays;
 guint n;
 GtkTreeIter   iter;
 
 /* Get the active-displays combo box store and clear it */
 combobox = gtk_builder_get_object (builder, randr-active-displays);
 model = gtk_combo_box_get_model (GTK_COMBO_BOX (combobox));
-gtk_list_store_clear (GTK_LIST_STORE (model));
+ gtk_list_store_clear (GTK_LIST_STORE (model));
 
-/* Only make the combobox interactive if there is more than one output */
-gtk_widget_set_sensitive (GTK_WIDGET (combobox),
-  display_settings_get_n_active_outputs ()  1);
+/* Only make the combobox interactive if there is more than one output,
+   and if they are not in mirror mode */
+mirror_displays = gtk_builder_get_object (builder, mirror-displays);
+if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (mirror_displays)) ||
+display_settings_get_n_active_outputs () = 1)
+{
+gtk_widget_set_sensitive (GTK_WIDGET (combobox), FALSE);
+return;
+}
 
 /* Disconnect the changed signal to avoid triggering the confirmation
  * dialog */
@@ -1100,12 +1112,16 @@ display_setting_mirror_displays_toggled 
(GtkToggleButton *togglebutton,
 if (!xfce_randr)
 return;
 
-if (xfce_randr-noutput = 1)
-return;
-
 positions = gtk_builder_get_object (builder, randr-position);
 active_displays = gtk_builder_get_object (builder, 
randr-active-displays);
 
+if (display_settings_get_n_active_outputs () = 1)
+{
+gtk_widget_set_sensitive (GTK_WIDGET (positions), FALSE);
+gtk_widget_set_sensitive (GTK_WIDGET (active_displays), FALSE);
+return;
+}
+
 if (gtk_toggle_button_get_active (togglebutton))
 {
 /* Activate mirror-mode with a single mode for all of them */
@@ -1164,7 +1180,7 @@ display_setting_mirror_displays_populate (GtkBuilder 
*builder)
 check = gtk_builder_get_object (builder, mirror-displays);
 
 /* Can outputs be cloned? */
-if (xfce_randr-noutput  1)
+if (display_settings_get_n_active_outputs ()  1)
 mode = xfce_randr_clonable_mode (xfce_randr);
 
 gtk_widget_set_sensitive (GTK_WIDGET (check), mode != None);
@@ -1276,7 +1292,6 @@ display_settings_treeview_selection_changed 
(GtkTreeSelection *selection,
 {
 GtkTreeModel *model;
 GtkTreeIter   iter;
-GObject  *mirror_displays, *position_combo, *display_combo;
 GtkWidget*popup;
 gboolean  has_selection;
 gint  active_id, previous_id;
@@ -1302,16 +1317,6 @@ display_settings_treeview_selection_changed 
(GtkTreeSelection *selection,
 display_setting_rotations_populate (builder);
 display_setting_reflections_populate (builder);
 
-mirror_displays = gtk_builder_get_object (builder, mirror-displays);
-if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON 

[Xfce4-commits] xfce4-settings:bluesabre/display-settings Fix sensitive state of mirror-toggle (oops)

[Nick Schermer]

Updating branch refs/heads/bluesabre/display-settings
 to a2a700d8b8a34a9f2d88ba8d5266bf2590373f11 (commit)
   from 684d64eb8593b2ef01e001d8201743c0a61b6313 (commit)

commit a2a700d8b8a34a9f2d88ba8d5266bf2590373f11
Author: Simon Steinbeiss simon.steinbe...@elfenbeinturm.at
Date:   Fri Oct 19 00:20:40 2012 +0200

Fix sensitive state of mirror-toggle (oops)

 dialogs/display-settings/main.c |1 -
 1 file changed, 1 deletion(-)

diff --git a/dialogs/display-settings/main.c b/dialogs/display-settings/main.c
index 1b12110..3db4f88 100644
--- a/dialogs/display-settings/main.c
+++ b/dialogs/display-settings/main.c
@@ -1220,7 +1220,6 @@ display_setting_mirror_displays_populate (GtkBuilder 
*builder)
 gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (check), FALSE);
 return;
 }
-gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (check), TRUE);
 
 /* Disconnect the toggled signal to avoid writing the config again */
 g_object_disconnect (check, any_signal::toggled,
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] xfce4-settings:bluesabre/display-settings Set the primary output after the changes have been applied

[Nick Schermer]

Updating branch refs/heads/bluesabre/display-settings
 to e6962fa722eeec3ebe97ef96f7bc2b06331f64a5 (commit)
   from 22b558bf644ecfd0fdf81ea91e8fe71c36980131 (commit)

commit e6962fa722eeec3ebe97ef96f7bc2b06331f64a5
Author: Lionel Le Folgoc lio...@lefolgoc.net
Date:   Thu Oct 18 16:58:45 2012 +0200

Set the primary output after the changes have been applied

And set it to None if no primary output was present in xfconf.

Signed-off-by: Simon Steinbeiss simon.steinbe...@elfenbeinturm.at

 xfsettingsd/displays.c |   12 +++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/xfsettingsd/displays.c b/xfsettingsd/displays.c
index 2212092..7a14088 100644
--- a/xfsettingsd/displays.c
+++ b/xfsettingsd/displays.c
@@ -200,6 +200,8 @@ xfce_displays_helper_list_crtcs (Display
*xdisplay,
 crtcs = g_new0 (XfceRRCrtc, resources-ncrtc);
 for (n = 0; n  resources-ncrtc; ++n)
 {
+xfsettings_dbg (XFSD_DEBUG_DISPLAYS, Detected CRTC %lu., 
resources-crtcs[n]);
+
 crtcs[n].id = resources-crtcs[n];
 crtc_info = XRRGetCrtcInfo (xdisplay, resources, resources-crtcs[n]);
 crtcs[n].mode = crtc_info-mode;
@@ -463,6 +465,9 @@ xfce_displays_helper_channel_apply (XfceDisplaysHelper 
*helper,
 GPtrArray  *connected_outputs;
 GHashTable *saved_outputs;
 XfceRROutput   *output;
+#ifdef HAS_RANDR_ONE_POINT_THREE
+RROutputprimary = None;
+#endif
 
 gdk_error_trap_push ();
 
@@ -522,7 +527,7 @@ xfce_displays_helper_channel_apply (XfceDisplaysHelper 
*helper,
 output-info-name);
 value = g_hash_table_lookup (saved_outputs, property);
 if (G_VALUE_HOLDS_BOOLEAN (value)  g_value_get_boolean (value))
-XRRSetOutputPrimary (xdisplay, GDK_WINDOW_XID (root_window), 
output-id);
+primary = output-id;
 }
 #endif
 
@@ -789,6 +794,11 @@ xfce_displays_helper_channel_apply (XfceDisplaysHelper 
*helper,
 }
 }
 
+#ifdef HAS_RANDR_ONE_POINT_THREE
+if (helper-has_1_3)
+XRRSetOutputPrimary (xdisplay, GDK_WINDOW_XID (root_window), 
primary);
+#endif
+
 /* release the grab, changes are done */
 gdk_x11_display_ungrab (display);
 
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] xfce4-settings:bluesabre/display-settings Fix crash when using dualhead with separate xscreens (Bug #9389)

[Nick Schermer]

Updating branch refs/heads/bluesabre/display-settings
 to 430b46f6c5ed382fb1a2560efb6bdd291011b169 (commit)
   from a2a700d8b8a34a9f2d88ba8d5266bf2590373f11 (commit)

commit 430b46f6c5ed382fb1a2560efb6bdd291011b169
Author: Simon Steinbeiss simon.steinbe...@elfenbeinturm.at
Date:   Mon Oct 22 10:34:06 2012 +0200

Fix crash when using dualhead with separate xscreens (Bug #9389)

 xfsettingsd/displays.c |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/xfsettingsd/displays.c b/xfsettingsd/displays.c
index 9f01694..3d5e0f0 100644
--- a/xfsettingsd/displays.c
+++ b/xfsettingsd/displays.c
@@ -488,7 +488,7 @@ xfce_displays_helper_channel_apply (XfceDisplaysHelper 
*helper,
 min_width, min_height, max_width, 
max_height))
 {
 g_critical (Unable to get the range of screen sizes, aborting.);
-goto err_cleanup;
+goto err_abort;
 }
 
 /* get all existing CRTCs */
@@ -818,6 +818,7 @@ err_cleanup:
 }
 g_free (crtcs);
 
+err_abort:
 /* free the screen resources */
 XRRFreeScreenResources (resources);
 
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] xfce4-settings:bluesabre/display-settings Fix problem in display1 pixmap

[Nick Schermer]

Updating branch refs/heads/bluesabre/display-settings
 to 197cac6f79c5a8d330aeeabc053158aa5a791728 (commit)
   from 7dac54e082b2520560fd1473c3a707f8517d486f (commit)

commit 197cac6f79c5a8d330aeeabc053158aa5a791728
Author: Simon Steinbeiss simon.steinbe...@elfenbeinturm.at
Date:   Sat Oct 27 11:54:14 2012 +0200

Fix problem in display1 pixmap

 dialogs/display-settings/display1.png |  Bin 8155 - 8271 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/dialogs/display-settings/display1.png 
b/dialogs/display-settings/display1.png
index 721d207..37e0d57 100644
Binary files a/dialogs/display-settings/display1.png and 
b/dialogs/display-settings/display1.png differ
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] xfce4-settings:bluesabre/display-settings Try to reduce flickering

[Nick Schermer]

Updating branch refs/heads/bluesabre/display-settings
 to b6139161381874dff079765a2e1f2abae5061ac5 (commit)
   from cc38417d940d0d5ff79a6d056bc190d6c9f654f5 (commit)

commit b6139161381874dff079765a2e1f2abae5061ac5
Author: Lionel Le Folgoc lio...@lefolgoc.net
Date:   Mon Oct 15 17:38:41 2012 +0200

Try to reduce flickering

Signed-off-by: Simon Steinbeiss simon.steinbe...@elfenbeinturm.at

 xfsettingsd/displays.c |   34 +-
 1 file changed, 17 insertions(+), 17 deletions(-)

diff --git a/xfsettingsd/displays.c b/xfsettingsd/displays.c
index d5a7799..8948637 100644
--- a/xfsettingsd/displays.c
+++ b/xfsettingsd/displays.c
@@ -739,28 +739,28 @@ xfce_displays_helper_channel_apply (XfceDisplaysHelper 
*helper,
 for (m = 0; m  resources-ncrtc; ++m)
 {
 /* ignore disabled outputs for size computations */
-if (crtcs[m].mode == None)
-continue;
-
-/* normalize positions to ensure the upper left corner is at (0,0) */
-if (min_x || min_y)
+if (crtcs[m].mode != None)
 {
-crtcs[m].x -= min_x;
-crtcs[m].y -= min_y;
-crtcs[m].changed = TRUE;
-}
+/* normalize positions to ensure the upper left corner is at (0,0) 
*/
+if (min_x || min_y)
+{
+crtcs[m].x -= min_x;
+crtcs[m].y -= min_y;
+crtcs[m].changed = TRUE;
+}
 
-xfsettings_dbg (XFSD_DEBUG_DISPLAYS, Normalized CRTC %lu: size=%dx%d, 
pos=%dx%d.,
-crtcs[m].id, crtcs[m].width, crtcs[m].height, 
crtcs[m].x, crtcs[m].y);
+xfsettings_dbg (XFSD_DEBUG_DISPLAYS, Normalized CRTC %lu: 
size=%dx%d, pos=%dx%d.,
+crtcs[m].id, crtcs[m].width, crtcs[m].height, 
crtcs[m].x, crtcs[m].y);
 
-/* calculate the total screen size */
-xfce_displays_helper_process_screen_size (crtcs[m].width, 
crtcs[m].height,
-  crtcs[m].x, crtcs[m].y, 
width,
-  height, mm_width, 
mm_height);
+/* calculate the total screen size */
+xfce_displays_helper_process_screen_size (crtcs[m].width, 
crtcs[m].height,
+  crtcs[m].x, crtcs[m].y, 
width,
+  height, mm_width, 
mm_height);
+}
 
-/* disable the CRTC, it will be reenabled after size calculation */
+/* disable the CRTC, it will be reenabled after size calculation, 
unless the user disabled it */
 if (xfce_displays_helper_disable_crtc (xdisplay, resources, 
crtcs[m].id) == RRSetConfigSuccess)
-crtcs[m].changed = TRUE;
+crtcs[m].changed = (crtcs[m].mode != None);
 else
 g_warning (Failed to disable CRTC %lu., crtc-id);
 
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] xfce4-settings:bluesabre/display-settings Fix visibility of elements depending on the number of outputs

[Nick Schermer]

Updating branch refs/heads/bluesabre/display-settings
 to e8be92f29a55eb71168a1c26d94e4a32614a (commit)
   from 28cf05504c8f800ff56b208fc9b8cead7a423726 (commit)

commit e8be92f29a55eb71168a1c26d94e4a32614a
Author: Lionel Le Folgoc lio...@lefolgoc.net
Date:   Wed Oct 17 23:50:42 2012 +0200

Fix visibility of elements depending on the number of outputs

And connect signals even when only 1 output is present, since hot-plug is
supported (Bug #8327).

Signed-off-by: Simon Steinbeiss simon.steinbe...@elfenbeinturm.at

 dialogs/display-settings/display-dialog.glade |2 +-
 dialogs/display-settings/main.c   |   46 +
 2 files changed, 41 insertions(+), 7 deletions(-)

diff --git a/dialogs/display-settings/display-dialog.glade 
b/dialogs/display-settings/display-dialog.glade
index 8bce601..c7357a3 100644
--- a/dialogs/display-settings/display-dialog.glade
+++ b/dialogs/display-settings/display-dialog.glade
@@ -210,7 +210,7 @@
   /packing
 /child
 child
-  object class=GtkLabel id=label1
+  object class=GtkLabel id=label-position
 property name=visibleTrue/property
 property name=can_focusFalse/property
 property name=xalign0/property
diff --git a/dialogs/display-settings/main.c b/dialogs/display-settings/main.c
index eb66c75..c7e5332 100644
--- a/dialogs/display-settings/main.c
+++ b/dialogs/display-settings/main.c
@@ -385,7 +385,7 @@ static void
 display_setting_positions_populate (GtkBuilder *builder)
 {
 GtkTreeModel *model;
-GObject  *combobox, *mirror_displays;
+GObject  *combobox, *label, *mirror_displays;
 GtkTreeIter   iter;
 guint n;
 
@@ -394,6 +394,19 @@ display_setting_positions_populate (GtkBuilder *builder)
 model = gtk_combo_box_get_model (GTK_COMBO_BOX (combobox));
 gtk_list_store_clear (GTK_LIST_STORE (model));
 
+label = gtk_builder_get_object (builder, label-position);
+if (xfce_randr-noutput  1)
+{
+gtk_widget_show (GTK_WIDGET (label));
+gtk_widget_show (GTK_WIDGET (combobox));
+}
+else
+{
+gtk_widget_hide (GTK_WIDGET (label));
+gtk_widget_hide (GTK_WIDGET (combobox));
+return;
+}
+
 /* Only make the combobox interactive if there is more than one output,
and if they are not in mirror mode */
 mirror_displays = gtk_builder_get_object (builder, mirror-displays);
@@ -455,6 +468,14 @@ display_setting_active_displays_populate (GtkBuilder 
*builder)
 model = gtk_combo_box_get_model (GTK_COMBO_BOX (combobox));
  gtk_list_store_clear (GTK_LIST_STORE (model));
 
+if (xfce_randr-noutput  1)
+gtk_widget_show (GTK_WIDGET (combobox));
+else
+{
+gtk_widget_hide (GTK_WIDGET (combobox));
+return;
+}
+
 /* Only make the combobox interactive if there is more than one output,
and if they are not in mirror mode */
 mirror_displays = gtk_builder_get_object (builder, mirror-displays);
@@ -1179,6 +1200,14 @@ display_setting_mirror_displays_populate (GtkBuilder 
*builder)
 
 check = gtk_builder_get_object (builder, mirror-displays);
 
+if (xfce_randr-noutput  1)
+gtk_widget_show (GTK_WIDGET (check));
+else
+{
+gtk_widget_hide (GTK_WIDGET (check));
+return;
+}
+
 /* Can outputs be cloned? */
 if (display_settings_get_n_active_outputs ()  1)
 mode = xfce_randr_clonable_mode (xfce_randr);
@@ -1268,11 +1297,16 @@ display_setting_output_status_populate (GtkBuilder 
*builder)
 if (!xfce_randr)
 return;
 
-if (xfce_randr-noutput = 1)
-return;
-
 check = gtk_builder_get_object (builder, output-on);
 
+if (xfce_randr-noutput  1)
+gtk_widget_show (GTK_WIDGET (check));
+else
+{
+gtk_widget_hide (GTK_WIDGET (check));
+return;
+}
+
 /* Disconnect the toggled signal to avoid writing the config again */
 g_object_disconnect (check, any_signal::toggled,
  display_setting_output_toggled,
@@ -1471,12 +1505,12 @@ display_settings_dialog_new (GtkBuilder *builder)
 /* Setup the combo boxes */
 check = gtk_builder_get_object (builder, output-on);
 mirror = gtk_builder_get_object (builder, mirror-displays);
+g_signal_connect (G_OBJECT (check), toggled, G_CALLBACK 
(display_setting_output_toggled), builder);
+g_signal_connect (G_OBJECT (mirror), toggled, G_CALLBACK 
(display_setting_mirror_displays_toggled), builder);
 if (xfce_randr-noutput  1)
 {
 gtk_widget_show (GTK_WIDGET (check));
-g_signal_connect (G_OBJECT (check), toggled, G_CALLBACK 
(display_setting_output_toggled), builder);
 gtk_widget_show (GTK_WIDGET (mirror));
-g_signal_connect (G_OBJECT (mirror), toggled, G_CALLBACK 

[Xfce4-commits] xfce4-settings:bluesabre/display-settings Escape the text in the identification-popup labels

[Nick Schermer]

Updating branch refs/heads/bluesabre/display-settings
 to bac44358340e4d960a4147111dd8fabfe1b469ed (commit)
   from 4076c8a4ff786c0a87685a5f848c71dcdb7a4312 (commit)

commit bac44358340e4d960a4147111dd8fabfe1b469ed
Author: Simon Steinbeiss simon.steinbe...@elfenbeinturm.at
Date:   Mon Oct 8 15:28:22 2012 +0200

Escape the text in the identification-popup labels

 dialogs/display-settings/main.c |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dialogs/display-settings/main.c b/dialogs/display-settings/main.c
index 57a611f..e8c0e52 100644
--- a/dialogs/display-settings/main.c
+++ b/dialogs/display-settings/main.c
@@ -1110,10 +1110,10 @@ display_setting_identity_display (gint display_id,
 if ((has_selection)) color_hex = #D2;
   
 gtk_label_set_markup (GTK_LABEL(display_name),
-  g_strdup_printf(span 
foreground='%s'bigb%s: %s/b/big/span, color_hex, _(Display), 
name) );
+  g_markup_printf_escaped(span 
foreground='%s'bigb%s %s/b/big/span, color_hex, _(Display:), 
name) );
 
 gtk_label_set_markup (GTK_LABEL(display_details),
-  g_strdup_printf(span foreground='%s'%s: %i x 
%i/span, color_hex, _(Resolution), screen_width, screen_height) );
+  g_markup_printf_escaped(span 
foreground='%s'%s %i x %i/span, color_hex, _(Resolution:), screen_width, 
screen_height) );
   
 
 gtk_window_get_size(GTK_WINDOW(popup), window_width, window_height);
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] xfce4-settings:bluesabre/display-settings Fix detection of mirror mode and checkbox sensitivity

[Nick Schermer]

Updating branch refs/heads/bluesabre/display-settings
 to 69899f4e2af6b3f7f6d7e84530b81dac1eb154f6 (commit)
   from 25abd5f2a6e4105082ffc4aee21ada2d1637a696 (commit)

commit 69899f4e2af6b3f7f6d7e84530b81dac1eb154f6
Author: Lionel Le Folgoc lio...@lefolgoc.net
Date:   Wed Oct 17 23:02:14 2012 +0200

Fix detection of mirror mode and checkbox sensitivity

Signed-off-by: Simon Steinbeiss simon.steinbe...@elfenbeinturm.at

 dialogs/display-settings/main.c |   37 -
 1 file changed, 24 insertions(+), 13 deletions(-)

diff --git a/dialogs/display-settings/main.c b/dialogs/display-settings/main.c
index 033c0a4..0ee24b9 100644
--- a/dialogs/display-settings/main.c
+++ b/dialogs/display-settings/main.c
@@ -1154,38 +1154,49 @@ static void
 display_setting_mirror_displays_populate (GtkBuilder *builder)
 {
 GObject *check;
+RRMode   mode = None;
+guintn;
+gint cloned = TRUE;
 
 if (!xfce_randr)
 return;
 
-if (xfce_randr-noutput = 1)
-return;
-
 check = gtk_builder_get_object (builder, mirror-displays);
 
-/* Only make the check interactive if there is more than one output */
-if (display_settings_get_n_active_outputs ()  1)
+/* Can outputs be cloned? */
+if (xfce_randr-noutput  1)
+mode = xfce_randr_clonable_mode (xfce_randr);
+
+gtk_widget_set_sensitive (GTK_WIDGET (check), mode != None);
+if (mode == None)
 {
-gtk_widget_set_sensitive (GTK_WIDGET (check), TRUE);
+gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (check), FALSE);
 return;
 }
-else
-gtk_widget_set_sensitive (GTK_WIDGET (check), FALSE);
 
 /* Disconnect the toggled signal to avoid writing the config again */
 g_object_disconnect (check, any_signal::toggled,
  display_setting_mirror_displays_toggled,
  builder, NULL);
-gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (check),
-  xfce_randr-mode[active_output] != None);
 
+/* Check if mirror settings are on */
+for (n = 0; n  xfce_randr-noutput; n++)
+{
+if (xfce_randr-mode[n] == None)
+continue;
+
+cloned = (xfce_randr-mode[n] == mode 
+   xfce_randr-relation[n] == XFCE_RANDR_PLACEMENT_MIRROR);
+
+if (!cloned)
+break;
+}
+
+gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (check), cloned);
 
 /* Reconnect the signal */
 g_signal_connect (G_OBJECT (check), toggled, G_CALLBACK 
(display_setting_mirror_displays_toggled),
   builder);
-
-/* Write the correct RandR value to xfconf */
-
 }
 
 
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] xfce4-settings:bluesabre/display-settings l10n: Updated Ukrainian (uk) translation to 100%

[Transifex]

Updating branch refs/heads/bluesabre/display-settings
 to 813a75d7ca3746c56ebaaf25893ef98e179897ff (commit)
   from 12dcdb1ceba2272a990d8e39817e1abc498b7bb5 (commit)

commit 813a75d7ca3746c56ebaaf25893ef98e179897ff
Author: Yarema aka Knedlyk yupad...@gmail.com
Date:   Fri Nov 2 20:00:13 2012 +0100

l10n: Updated Ukrainian (uk) translation to 100%

New status: 347 messages complete with 0 fuzzies and 0 untranslated.

Transmitted-via: Transifex (translations.xfce.org).

 po/uk.po |  160 ++
 1 file changed, 110 insertions(+), 50 deletions(-)

diff --git a/po/uk.po b/po/uk.po
index 3eacb03..410f789 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -6,7 +6,7 @@ msgid 
 msgstr 
 Project-Id-Version: xfce4-settings\n
 Report-Msgid-Bugs-To: \n
-POT-Creation-Date: 2012-09-03 19:06+\n
+POT-Creation-Date: 2012-11-02 18:15+\n
 PO-Revision-Date: 2009-01-26 16:20+0200\n
 Last-Translator: Dmitry Nikitin luckas...@mail.ru\n
 Language-Team: Ukrainian xfce4-...@xfce.org\n
@@ -228,21 +228,21 @@ msgstr пікселів/сек
 
 #: ../dialogs/accessibility-settings/main.c:43
 #: ../dialogs/appearance-settings/main.c:94
-#: ../dialogs/display-settings/main.c:102
+#: ../dialogs/display-settings/main.c:136
 #: ../dialogs/keyboard-settings/main.c:39 ../dialogs/mouse-settings/main.c:79
 msgid Settings manager socket
 msgstr Сокет менеджера параметрів
 
 #: ../dialogs/accessibility-settings/main.c:43
 #: ../dialogs/appearance-settings/main.c:94
-#: ../dialogs/display-settings/main.c:102
+#: ../dialogs/display-settings/main.c:136
 #: ../dialogs/keyboard-settings/main.c:39 ../dialogs/mouse-settings/main.c:79
 msgid SOCKET ID
 msgstr ID сокета
 
 #: ../dialogs/accessibility-settings/main.c:44
 #: ../dialogs/appearance-settings/main.c:95
-#: ../dialogs/display-settings/main.c:103
+#: ../dialogs/display-settings/main.c:137
 #: ../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:39
@@ -251,29 +251,29 @@ msgstr Інформація про версію
 
 #: ../dialogs/accessibility-settings/main.c:192
 #: ../dialogs/appearance-settings/main.c:966
-#: ../dialogs/display-settings/main.c:1043
+#: ../dialogs/display-settings/main.c:1922
 #: ../dialogs/keyboard-settings/main.c:76 ../dialogs/mime-settings/main.c:62
 #: ../dialogs/mouse-settings/main.c:1597 ../xfce4-settings-editor/main.c:63
-#: ../xfsettingsd/main.c:173 ../xfce4-settings-manager/main.c:60
+#: ../xfsettingsd/main.c:187 ../xfce4-settings-manager/main.c:60
 #, c-format
 msgid Type '%s --help' for usage.
 msgstr Наберіть '%s --help' для використання.
 
 #: ../dialogs/accessibility-settings/main.c:211
 #: ../dialogs/appearance-settings/main.c:985
-#: ../dialogs/display-settings/main.c:1062
+#: ../dialogs/display-settings/main.c:1941
 #: ../dialogs/keyboard-settings/main.c:92 ../dialogs/mime-settings/main.c:81
 #: ../dialogs/mouse-settings/main.c:1616 ../xfce4-settings-editor/main.c:82
-#: ../xfsettingsd/main.c:189 ../xfce4-settings-manager/main.c:76
+#: ../xfsettingsd/main.c:203 ../xfce4-settings-manager/main.c:76
 msgid The Xfce development team. All rights reserved.
 msgstr Команда розробників Xfce. Всі права застережено.
 
 #: ../dialogs/accessibility-settings/main.c:212
 #: ../dialogs/appearance-settings/main.c:986
-#: ../dialogs/display-settings/main.c:1063
+#: ../dialogs/display-settings/main.c:1942
 #: ../dialogs/keyboard-settings/main.c:93 ../dialogs/mime-settings/main.c:82
 #: ../dialogs/mouse-settings/main.c:1617 ../xfce4-settings-editor/main.c:83
-#: ../xfsettingsd/main.c:190 ../xfce4-settings-manager/main.c:77
+#: ../xfsettingsd/main.c:204 ../xfce4-settings-manager/main.c:77
 #, c-format
 msgid Please report bugs to %s.
 msgstr Звіти про помилки для %s.
@@ -295,7 +295,7 @@ msgid Appearance
 msgstr Зовнішній вигляд
 
 #: ../dialogs/appearance-settings/appearance-dialog.glade.h:3
-#: ../dialogs/display-settings/main.c:82
+#: ../dialogs/display-settings/main.c:116
 msgid Both
 msgstr Значки та текст
 
@@ -390,7 +390,8 @@ msgstr Меню і кнопки
 
 #: ../dialogs/appearance-settings/appearance-dialog.glade.h:22
 #: ../dialogs/appearance-settings/main.c:852
-#: ../dialogs/display-settings/main.c:79
+#: ../dialogs/display-settings/main.c:102
+#: ../dialogs/display-settings/main.c:113
 msgid None
 msgstr Нічого
 
@@ -556,70 +557,106 @@ msgid Display
 msgstr Дисплей
 
 #: ../dialogs/display-settings/display-dialog.glade.h:3
+msgid Mirror displays
+msgstr Дзеркальні Дисплеї
+
+#: ../dialogs/display-settings/display-dialog.glade.h:4
+msgid Position:
+msgstr Позиція:
+
+#: ../dialogs/display-settings/display-dialog.glade.h:5
 msgid R_esolution:
 msgstr Р_оздільна здатність:
 
-#: ../dialogs/display-settings/display-dialog.glade.h:4
+#: ../dialogs/display-settings/display-dialog.glade.h:6
 msgid Ref_lection:
 msgstr Відоб_раження:
 
-#: 

[Xfce4-commits] xfce4-settings:bluesabre/display-settings l10n: Updated Spanish (Castilian) (es) translation to 99%

[Transifex]

Updating branch refs/heads/bluesabre/display-settings
 to cf67ba0d283d991c67a4e3df2de758f94cb2f7d2 (commit)
   from dbd76eb58bd9d7a55de753daa5572ef24867d924 (commit)

commit cf67ba0d283d991c67a4e3df2de758f94cb2f7d2
Author: Francisco Javier Serrador fserra...@gmail.com
Date:   Fri Nov 9 16:28:58 2012 +0100

l10n: Updated Spanish (Castilian) (es) translation to 99%

New status: 345 messages complete with 2 fuzzies and 0 untranslated.

Transmitted-via: Transifex (translations.xfce.org).

 po/es.po |  401 --
 1 file changed, 206 insertions(+), 195 deletions(-)

diff --git a/po/es.po b/po/es.po
index 7ec6b2b..a51bd03 100644
--- a/po/es.po
+++ b/po/es.po
@@ -7,25 +7,25 @@ msgid 
 msgstr 
 Project-Id-Version: xfce 4-settings\n
 Report-Msgid-Bugs-To: \n
-POT-Creation-Date: 2012-11-04 02:21+\n
+POT-Creation-Date: 2012-11-09 10:45+\n
 PO-Revision-Date: 2012-05-13 11:37-0600\n
 Last-Translator: Sergio García oigres...@gmail.com\n
 Language-Team: Spanish/ES xfce-i...@xfce.org\n
 MIME-Version: 1.0\n
 Content-Type: text/plain; charset=utf-8\n
 Content-Transfer-Encoding: 8bit\n
+X-Poedit-Country: SPAIN\n
 Language: \n
 Plural-Forms: nplurals=2; plural=(n != 1);\n
 X-Poedit-Language: Spanish\n
-X-Poedit-Country: SPAIN\n
 
 #: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:1
 msgid Acceleration _profile:
 msgstr _Perfil de aceleración:
 
 #: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:2
-msgid Acceleration _time:
-msgstr _Tiempo de aceleración:
+msgid Acceleration t_ime:
+msgstr T_iempo de aceleración:
 
 #: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:3
 msgid Acceptance _delay:
@@ -37,6 +37,10 @@ msgid Accessibility
 msgstr Accesibilidad
 
 #: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:5
+msgid Assistive _Technologies
+msgstr _Tecnologías de asistencia
+
+#: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:6
 msgid 
 Assistive technologies will be available the\n
 next time you login
@@ -44,19 +48,19 @@ msgstr 
 Las tecnologías de asistencia estarán disponibles la próxima vez que inicie 
 sesión.
 
-#: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:7
+#: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:8
 msgid Bounce Keys
 msgstr Rechazo de teclas
 
-#: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:8
+#: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:9
 msgid Configure keyboard and mouse accessibility
 msgstr Configure la accesibilidad de teclado y ratón
 
-#: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:9
-msgid Disable sticky keys if _two keys are pressed
-msgstr Desactivar teclas persistentes si se pulsan _dos teclas
-
 #: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:10
+msgid Disable sticky keys if two keys are _pressed
+msgstr Desactivar las teclas _persistentes si se pulsan las dos teclas
+
+#: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:11
 msgid 
 If enabled, the session manager will start the required applications for 
 screen readers and magnifiers
@@ -64,43 +68,43 @@ msgstr 
 Si se habilita, el gestor de sesiones iniciará las aplicaciones necesarias 
 para lectores y magnificadores de pantalla
 
-#: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:11
+#: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:12
 msgid K_eystroke delay:
 msgstr Retraso de _teclas lentas:
 
-#: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:12
+#: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:13
 msgid Keyboa_rd
 msgstr Te_clado
 
-#: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:13
-msgid Maximum _speed:
-msgstr _Velocidad máxima
-
 #: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:14
+msgid Ma_ximum speed:
+msgstr Velocidad má_xima
+
+#: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:15
 msgid Mouse Emulation
 msgstr Emulación del ratón
 
-#: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:15
+#: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:16
 msgid No AT-SPI provider was found on your system
 msgstr No se encontró ningún proveedor AT-SPI en su sistema
 
-#: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:16
+#: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:17
 msgid R_epeat interval:
 msgstr Intervalo de r_epetición:
 
-#: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:17
+#: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:18
 msgid Slow Keys
 msgstr Teclas lentas
 
-#: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:18
+#: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:19
 msgid Sticky Keys
 msgstr Teclas persistentes
 
-#: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:19
+#: 

[Xfce4-commits] xfce4-settings:bluesabre/display-settings Try to harmonize codestyle

[Nick Schermer]

Updating branch refs/heads/bluesabre/display-settings
 to 9e91c98ba03a5ab129855aa2e8c1375b72217494 (commit)
   from 8190158f9f841d1caf515aa9169b87dd4438df92 (commit)

commit 9e91c98ba03a5ab129855aa2e8c1375b72217494
Author: Lionel Le Folgoc lio...@lefolgoc.net
Date:   Wed Oct 17 22:06:42 2012 +0200

Try to harmonize codestyle

Signed-off-by: Simon Steinbeiss simon.steinbe...@elfenbeinturm.at

 dialogs/display-settings/main.c |  591 +++
 1 file changed, 284 insertions(+), 307 deletions(-)

diff --git a/dialogs/display-settings/main.c b/dialogs/display-settings/main.c
index 6c1656e..94a7f9e 100644
--- a/dialogs/display-settings/main.c
+++ b/dialogs/display-settings/main.c
@@ -163,21 +163,19 @@ static GHashTable *display_popups;
 
 gboolean supports_alpha = FALSE;
 
-static void
-display_settings_minimal_only_display1_toggled (GtkToggleButton *button,
-  GtkBuilder *builder);
-  
-static void
-display_settings_minimal_mirror_displays_toggled (GtkToggleButton *button,
-  GtkBuilder *builder);
-  
-static void
-display_settings_minimal_extend_right_toggled (GtkToggleButton *button,
-  GtkBuilder *builder);
-  
-static void
-display_settings_minimal_only_display2_toggled (GtkToggleButton *button,
-  GtkBuilder *builder);
+
+
+static void display_settings_minimal_only_display1_toggled   (GtkToggleButton 
*button,
+  GtkBuilder  
*builder);
+
+static void display_settings_minimal_mirror_displays_toggled (GtkToggleButton 
*button,
+  GtkBuilder  
*builder);
+
+static void display_settings_minimal_extend_right_toggled(GtkToggleButton 
*button,
+  GtkBuilder  
*builder);
+
+static void display_settings_minimal_only_display2_toggled   (GtkToggleButton 
*button,
+  GtkBuilder  
*builder);
 
 
 static guint
@@ -296,13 +294,13 @@ display_setting_timed_confirmation (GtkBuilder 
*main_builder)
 confirmation_dialog-count = 10;
 
 dialog = gtk_builder_get_object (builder, dialog1);
-
+
 g_signal_connect (G_OBJECT (dialog), focus-out-event, G_CALLBACK 
(display_setting_toggle_identity_popups),
-  GINT_TO_POINTER (FALSE));
-  
+  GINT_TO_POINTER (FALSE));
+
 g_signal_connect (G_OBJECT (dialog), focus-in-event, G_CALLBACK 
(display_setting_toggle_identity_popups),
-  GINT_TO_POINTER (TRUE));
-
+  GINT_TO_POINTER (TRUE));
+
 gtk_window_set_transient_for (GTK_WINDOW (dialog), GTK_WINDOW 
(main_dialog));
 source_id = g_timeout_add_seconds (1, (GSourceFunc) 
display_settings_update_time_label,
confirmation_dialog);
@@ -395,21 +393,17 @@ display_setting_positions_populate (GtkBuilder *builder)
 combobox = gtk_builder_get_object (builder, randr-position);
 model = gtk_combo_box_get_model (GTK_COMBO_BOX (combobox));
 gtk_list_store_clear (GTK_LIST_STORE (model));
-
+
 /* Only make the combobox interactive if there is more than one output */
-if (display_settings_get_n_active_outputs ()  1)
-{
-gtk_widget_set_sensitive (GTK_WIDGET (combobox), TRUE);
-}
-else
-gtk_widget_set_sensitive (GTK_WIDGET (combobox), FALSE);
-
+gtk_widget_set_sensitive (GTK_WIDGET (combobox),
+  display_settings_get_n_active_outputs ()  1);
+
 /* Disconnect the changed signal to avoid triggering the confirmation
  * dialog */
 g_object_disconnect (combobox, any_signal::changed,
  display_setting_positions_changed,
  builder, NULL);
-
+
 /* Try to insert the relations */
 for (n = 0; n  G_N_ELEMENTS (relation_names); n++)
 {
@@ -422,24 +416,24 @@ display_setting_positions_populate (GtkBuilder *builder)
 if (relation_names[n].relation == xfce_randr-relation[active_output])
 gtk_combo_box_set_active_iter (GTK_COMBO_BOX (combobox), iter);
 }
-
+
 /* Reconnect the signal */
 g_signal_connect (G_OBJECT (combobox), changed, G_CALLBACK 
(display_setting_positions_changed), builder);
 }
 
 static void
 display_setting_active_displays_changed (GtkComboBox *combobox,
- GtkBuilder  *builder)
+ GtkBuilder  *builder)
 {
-gint value;
 GObject *position_combobox;
+

[Xfce4-commits] xfce4-settings:bluesabre/display-settings l10n: Updated Korean (ko) translation to 100%

[Transifex]

Updating branch refs/heads/bluesabre/display-settings
 to 12dcdb1ceba2272a990d8e39817e1abc498b7bb5 (commit)
   from 6b38385378b0efef5b08847a991b2602c7886ef3 (commit)

commit 12dcdb1ceba2272a990d8e39817e1abc498b7bb5
Author: Seong-ho Cho darkcircle.0...@gmail.com
Date:   Fri Nov 2 14:18:44 2012 +0100

l10n: Updated Korean (ko) translation to 100%

New status: 347 messages complete with 0 fuzzies and 0 untranslated.

Transmitted-via: Transifex (translations.xfce.org).

 po/ko.po |  161 ++
 1 file changed, 110 insertions(+), 51 deletions(-)

diff --git a/po/ko.po b/po/ko.po
index 82e45ec..572b822 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -7,8 +7,8 @@ msgid 
 msgstr 
 Project-Id-Version: xfce4-settings.xfce-4-8\n
 Report-Msgid-Bugs-To: \n
-POT-Creation-Date: 2012-08-25 15:45+\n
-PO-Revision-Date: 2012-08-26 01:48+0900\n
+POT-Creation-Date: 2012-11-02 12:54+\n
+PO-Revision-Date: 2012-11-02 22:18+0900\n
 Last-Translator: Seong-ho Cho darkcircle.0...@gmail.com\n
 Language-Team: xfce-i18n xfce-i...@xfce.org\n
 Language: ko\n
@@ -189,7 +189,7 @@ msgstr pixels/sec
 
 #: ../dialogs/accessibility-settings/main.c:43
 #: ../dialogs/appearance-settings/main.c:94
-#: ../dialogs/display-settings/main.c:102
+#: ../dialogs/display-settings/main.c:136
 #: ../dialogs/keyboard-settings/main.c:39
 #: ../dialogs/mouse-settings/main.c:79
 msgid Settings manager socket
@@ -197,7 +197,7 @@ msgstr 설정 관리자 소켓
 
 #: ../dialogs/accessibility-settings/main.c:43
 #: ../dialogs/appearance-settings/main.c:94
-#: ../dialogs/display-settings/main.c:102
+#: ../dialogs/display-settings/main.c:136
 #: ../dialogs/keyboard-settings/main.c:39
 #: ../dialogs/mouse-settings/main.c:79
 msgid SOCKET ID
@@ -205,7 +205,7 @@ msgstr SOCKET ID
 
 #: ../dialogs/accessibility-settings/main.c:44
 #: ../dialogs/appearance-settings/main.c:95
-#: ../dialogs/display-settings/main.c:103
+#: ../dialogs/display-settings/main.c:137
 #: ../dialogs/keyboard-settings/main.c:40
 #: ../dialogs/mime-settings/main.c:40
 #: ../dialogs/mouse-settings/main.c:80
@@ -217,12 +217,12 @@ msgstr 버전 정보
 
 #: ../dialogs/accessibility-settings/main.c:192
 #: ../dialogs/appearance-settings/main.c:966
-#: ../dialogs/display-settings/main.c:1043
+#: ../dialogs/display-settings/main.c:1922
 #: ../dialogs/keyboard-settings/main.c:76
 #: ../dialogs/mime-settings/main.c:62
 #: ../dialogs/mouse-settings/main.c:1597
 #: ../xfce4-settings-editor/main.c:63
-#: ../xfsettingsd/main.c:173
+#: ../xfsettingsd/main.c:187
 #: ../xfce4-settings-manager/main.c:60
 #, c-format
 msgid Type '%s --help' for usage.
@@ -230,24 +230,24 @@ msgstr 사용방법을 보려면 '%s --help'를 입력합니다.
 
 #: ../dialogs/accessibility-settings/main.c:211
 #: ../dialogs/appearance-settings/main.c:985
-#: ../dialogs/display-settings/main.c:1062
+#: ../dialogs/display-settings/main.c:1941
 #: ../dialogs/keyboard-settings/main.c:92
 #: ../dialogs/mime-settings/main.c:81
 #: ../dialogs/mouse-settings/main.c:1616
 #: ../xfce4-settings-editor/main.c:82
-#: ../xfsettingsd/main.c:189
+#: ../xfsettingsd/main.c:203
 #: ../xfce4-settings-manager/main.c:76
 msgid The Xfce development team. All rights reserved.
 msgstr Xfce 개발 팀. All rights reserved.
 
 #: ../dialogs/accessibility-settings/main.c:212
 #: ../dialogs/appearance-settings/main.c:986
-#: ../dialogs/display-settings/main.c:1063
+#: ../dialogs/display-settings/main.c:1942
 #: ../dialogs/keyboard-settings/main.c:93
 #: ../dialogs/mime-settings/main.c:82
 #: ../dialogs/mouse-settings/main.c:1617
 #: ../xfce4-settings-editor/main.c:83
-#: ../xfsettingsd/main.c:190
+#: ../xfsettingsd/main.c:204
 #: ../xfce4-settings-manager/main.c:77
 #, c-format
 msgid Please report bugs to %s.
@@ -267,7 +267,7 @@ msgid Appearance
 msgstr 모양새
 
 #: ../dialogs/appearance-settings/appearance-dialog.glade.h:3
-#: ../dialogs/display-settings/main.c:82
+#: ../dialogs/display-settings/main.c:116
 msgid Both
 msgstr 둘다
 
@@ -346,7 +346,8 @@ msgstr 메뉴와 단추
 
 #: ../dialogs/appearance-settings/appearance-dialog.glade.h:22
 #: ../dialogs/appearance-settings/main.c:852
-#: ../dialogs/display-settings/main.c:79
+#: ../dialogs/display-settings/main.c:102
+#: ../dialogs/display-settings/main.c:113
 msgid None
 msgstr 없음
 
@@ -499,126 +500,170 @@ msgid Display
 msgstr 디스플레이
 
 #: ../dialogs/display-settings/display-dialog.glade.h:3
+msgid Mirror displays
+msgstr 디스플레이 반전
+
+#: ../dialogs/display-settings/display-dialog.glade.h:4
+msgid Position:
+msgstr 위치:
+
+#: ../dialogs/display-settings/display-dialog.glade.h:5
 msgid R_esolution:
 msgstr 해상도(_E):
 
-#: ../dialogs/display-settings/display-dialog.glade.h:4
+#: ../dialogs/display-settings/display-dialog.glade.h:6
 msgid Ref_lection:
 msgstr 뒤집기(_L):
 
-#: ../dialogs/display-settings/display-dialog.glade.h:5
+#: ../dialogs/display-settings/display-dialog.glade.h:7
 msgid Refresh _rate:
 msgstr 재생율(_R):
 
-#: ../dialogs/display-settings/display-dialog.glade.h:6
+#: 

[Xfce4-commits] xfce4-settings:bluesabre/display-settings Xfsettingsd: Check for NoSuchExtension (bug #9390).

[Nick Schermer]

Updating branch refs/heads/bluesabre/display-settings
 to 1d62ea7fb76ce14c87c61dd4a41d6ccc5b9c6095 (commit)
   from 5231578eae05bf32e3dc9e05baf38dd3ed974c3c (commit)

commit 1d62ea7fb76ce14c87c61dd4a41d6ccc5b9c6095
Author: Lionel Le Folgoc lio...@lefolgoc.net
Date:   Sun Oct 28 17:11:13 2012 +0100

Xfsettingsd: Check for NoSuchExtension (bug #9390).

 xfsettingsd/pointers.c |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/xfsettingsd/pointers.c b/xfsettingsd/pointers.c
index a060051..e7192e7 100644
--- a/xfsettingsd/pointers.c
+++ b/xfsettingsd/pointers.c
@@ -129,7 +129,8 @@ xfce_pointers_helper_init (XfcePointersHelper *helper)
 version = XGetExtensionVersion (xdisplay, INAME);
 
 /* check for Xi */
-if (version == NULL || !version-present)
+if (version == NULL || ((long) version) == NoSuchExtension
+|| !version-present)
 {
 g_critical (XI is not present.);
 }
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] xfce4-settings:bluesabre/display-settings Revert previous commit to be able to cleanly apply another patch

[Nick Schermer]

Updating branch refs/heads/bluesabre/display-settings
 to 720535bd5332b33735a05a66b70ef1186080fd17 (commit)
   from c3036362dbffe9a9cafff721960a89bdd828e957 (commit)

commit 720535bd5332b33735a05a66b70ef1186080fd17
Author: Simon Steinbeiss simon.steinbe...@elfenbeinturm.at
Date:   Tue Oct 16 01:20:43 2012 +0200

Revert previous commit to be able to cleanly apply another patch

 dialogs/display-settings/main.c |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dialogs/display-settings/main.c b/dialogs/display-settings/main.c
index ce246ee..d4a60aa 100644
--- a/dialogs/display-settings/main.c
+++ b/dialogs/display-settings/main.c
@@ -550,7 +550,7 @@ display_setting_guess_positioning (GtkBuilder *builder)
 if (n != active_output)
 {
 /* Check for mirror */
-if ( (xfce_randr-position[n].x == current_x) 
+if ( (xfce_randr-position[n].x == current_x)  
  (xfce_randr-position[n].y == current_y) ) {
 gtk_combo_box_set_active( GTK_COMBO_BOX(position_combo), 0 );
 gtk_combo_box_set_active( GTK_COMBO_BOX(display_combo), 
cb_index );
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] xfce4-settings:bluesabre/display-settings Improve Mirror displays mode

[Nick Schermer]

Updating branch refs/heads/bluesabre/display-settings
 to 25abd5f2a6e4105082ffc4aee21ada2d1637a696 (commit)
   from 400d9bfb60f30e4856d4ffcc75b5f49bece8189f (commit)

commit 25abd5f2a6e4105082ffc4aee21ada2d1637a696
Author: Lionel Le Folgoc lio...@lefolgoc.net
Date:   Wed Oct 17 22:39:12 2012 +0200

Improve Mirror displays mode

When the checkbox is enabled, all active outputs use the same mode and
position. They revert back to their preferred mode when unchecked.

Signed-off-by: Simon Steinbeiss simon.steinbe...@elfenbeinturm.at

 dialogs/display-settings/main.c   |   19 ++--
 dialogs/display-settings/xfce-randr.c |   86 +++--
 dialogs/display-settings/xfce-randr.h |5 +-
 3 files changed, 57 insertions(+), 53 deletions(-)

diff --git a/dialogs/display-settings/main.c b/dialogs/display-settings/main.c
index bbfe3dd..033c0a4 100644
--- a/dialogs/display-settings/main.c
+++ b/dialogs/display-settings/main.c
@@ -1095,6 +1095,7 @@ display_setting_mirror_displays_toggled (GtkToggleButton 
*togglebutton,
 {
 GObject *positions, *active_displays;
 guintn;
+RRMode   mode;
 
 if (!xfce_randr)
 return;
@@ -1107,14 +1108,16 @@ display_setting_mirror_displays_toggled 
(GtkToggleButton *togglebutton,
 
 if (gtk_toggle_button_get_active (togglebutton))
 {
-/* Activate mirror-mode */
-
-/* Apply mirror settings to each monitor */
+/* Activate mirror-mode with a single mode for all of them */
+mode = xfce_randr_clonable_mode (xfce_randr);
+/* Apply mirror settings to each output */
 for (n = 0; n  xfce_randr-noutput; n++)
 {
 if (xfce_randr-mode[n] == None)
 continue;
 
+if (mode != None)
+xfce_randr-mode[n] = mode;
 xfce_randr-relation[n] = XFCE_RANDR_PLACEMENT_MIRROR;
 xfce_randr-related_to[n] = active_output;
 
@@ -1130,7 +1133,15 @@ display_setting_mirror_displays_toggled (GtkToggleButton 
*togglebutton,
 }
 else
 {
-/* Deactivate mirror-mode */
+/* Deactivate mirror-mode, use the preferred mode of each output */
+for (n = 0; n  xfce_randr-noutput; n++)
+{
+xfce_randr-mode[n] = xfce_randr_preferred_mode (xfce_randr, n);
+xfce_randr_save_output (xfce_randr, Default, display_channel,
+n, TRUE);
+}
+
+xfce_randr_apply (xfce_randr, Default, display_channel);
 
 /* Re-enable the position comboboxes */
 gtk_widget_set_sensitive (GTK_WIDGET (positions), TRUE);
diff --git a/dialogs/display-settings/xfce-randr.c 
b/dialogs/display-settings/xfce-randr.c
index b9baaff..c114824 100644
--- a/dialogs/display-settings/xfce-randr.c
+++ b/dialogs/display-settings/xfce-randr.c
@@ -69,48 +69,6 @@ static gchar *xfce_randr_friendly_name (XfceRandr *randr,
 
 
 
-static void
-xfce_randr_list_clone_modes (XfceRandr *randr)
-{
-GArray *clone_modes;
-gintl, n, candidate, found;
-guint   m;
-
-clone_modes = g_array_new (TRUE, FALSE, sizeof (RRMode));
-
-/* walk all available modes */
-for (n = 0; n  randr-priv-resources-nmode; ++n)
-{
-candidate = TRUE;
-/* walk all connected outputs */
-for (m = 0; m  randr-noutput; ++m)
-{
-found = FALSE;
-/* walk supported modes from this output */
-for (l = 0; l  randr-priv-output_info[m]-nmode; ++l)
-{
-if (randr-priv-resources-modes[n].id == 
randr-priv-output_info[m]-modes[l])
-{
-found = TRUE;
-break;
-}
-}
-
-/* if it is not present in one output, forget it */
-candidate = found;
-}
-
-/* common to all outputs, can be used for clone mode */
-if (candidate)
-clone_modes = g_array_append_val (clone_modes, 
randr-priv-resources-modes[n].id);
-}
-
-/* return a normal array (last value - None) */
-randr-clone_modes = (RRMode *) g_array_free (clone_modes, FALSE);
-}
-
-
-
 static Rotation
 xfce_randr_get_safe_rotations (XfceRandr *randr,
Display   *xdisplay,
@@ -365,9 +323,6 @@ xfce_randr_populate (XfceRandr *randr,
 randr-friendly_name[m] = xfce_randr_friendly_name (randr, m);
 }
 
-/* clone modes: same RRModes present for all outputs */
-xfce_randr_list_clone_modes (randr);
-
 /* calculate relations from positions */
 xfce_randr_guess_relations (randr);
 }
@@ -448,7 +403,6 @@ xfce_randr_cleanup (XfceRandr *randr)
 
 /* free the settings */
 g_free (randr-friendly_name);
-g_free (randr-clone_modes);
 g_free (randr-mode);
 g_free (randr-priv-modes);
 g_free (randr-rotation);
@@ -767,6 +721,46 @@ xfce_randr_preferred_mode (XfceRandr *randr,
 
 
 
+RRMode

[Xfce4-commits] xfce4-settings:bluesabre/display-settings Set labels in identity-popups to non-translatable

[Nick Schermer]

Updating branch refs/heads/bluesabre/display-settings
 to 684d64eb8593b2ef01e001d8201743c0a61b6313 (commit)
   from b790a697d1e0e1c7cac2047817cb2473edec264a (commit)

commit 684d64eb8593b2ef01e001d8201743c0a61b6313
Author: Simon Steinbeiss simon.steinbe...@elfenbeinturm.at
Date:   Thu Oct 18 23:50:45 2012 +0200

Set labels in identity-popups to non-translatable

 dialogs/display-settings/identity-popup.glade |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dialogs/display-settings/identity-popup.glade 
b/dialogs/display-settings/identity-popup.glade
index da5d733..f6386d5 100644
--- a/dialogs/display-settings/identity-popup.glade
+++ b/dialogs/display-settings/identity-popup.glade
@@ -37,7 +37,7 @@
 property name=visibleTrue/property
 property name=can_focusFalse/property
 property name=xalign0/property
-property name=label 
translatable=yeslt;biggt;lt;bgt;Display: 
Namelt;/bgt;lt;/biggt;/property
+property name=label 
translatable=nolt;biggt;lt;bgt;Display: 
Namelt;/bgt;lt;/biggt;/property
 property name=use_markupTrue/property
   /object
   packing
@@ -51,7 +51,7 @@
 property name=visibleTrue/property
 property name=can_focusFalse/property
 property name=xalign0/property
-property name=label translatable=yesResolution: 1280 x 
800, Refresh Rate: 60.0 Hz/property
+property name=label translatable=noResolution: 1280 x 
800/property
   /object
   packing
 property name=expandTrue/property
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] xfce4-settings:bluesabre/display-settings l10n: Updated Portuguese (pt) translation to 99%

[Transifex]

Updating branch refs/heads/bluesabre/display-settings
 to 482d24b31c6d36f9d98fa47e6a7873036ab1da8d (commit)
   from 5e3315f5f623a5712623cc0b93649efcafa712b5 (commit)

commit 482d24b31c6d36f9d98fa47e6a7873036ab1da8d
Author: Sergio Marques smarque...@gmail.com
Date:   Wed Nov 7 12:20:36 2012 +0100

l10n: Updated Portuguese (pt) translation to 99%

New status: 346 messages complete with 1 fuzzy and 0 untranslated.

Transmitted-via: Transifex (translations.xfce.org).

 po/pt.po |  397 --
 1 file changed, 205 insertions(+), 192 deletions(-)

diff --git a/po/pt.po b/po/pt.po
index 0fbfd38..206362a 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -7,24 +7,24 @@ msgid 
 msgstr 
 Project-Id-Version: xfce4-settings\n
 Report-Msgid-Bugs-To: \n
-POT-Creation-Date: 2012-10-29 12:36+\n
+POT-Creation-Date: 2012-11-07 10:36+\n
 PO-Revision-Date: 2012-04-27 15:49+0100\n
 Last-Translator: Nuno Miguel nunom...@gmail.com\n
 Language-Team: \n
 MIME-Version: 1.0\n
 Content-Type: text/plain; charset=UTF-8\n
 Content-Transfer-Encoding: 8bit\n
+X-Poedit-Country: PORTUGAL\n
 Language: pt\n
 Plural-Forms: nplurals=2; plural=(n != 1);\n
 X-Poedit-Language: Portuguese\n
-X-Poedit-Country: PORTUGAL\n
 
 #: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:1
 msgid Acceleration _profile:
 msgstr _Perfil de aceleração:
 
 #: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:2
-msgid Acceleration _time:
+msgid Acceleration t_ime:
 msgstr Te_mpo de aceleração:
 
 #: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:3
@@ -37,6 +37,10 @@ msgid Accessibility
 msgstr Acessibilidade
 
 #: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:5
+msgid Assistive _Technologies
+msgstr _Tecnologias de acessibilidade
+
+#: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:6
 msgid 
 Assistive technologies will be available the\n
 next time you login
@@ -44,19 +48,19 @@ msgstr 
 As tecnologias de acessibilidade estarão\n
 disponíveis na próxima sessão
 
-#: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:7
+#: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:8
 msgid Bounce Keys
 msgstr Teclas saltitantes
 
-#: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:8
+#: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:9
 msgid Configure keyboard and mouse accessibility
 msgstr Configurar a acessibilidade do teclado e rato
 
-#: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:9
-msgid Disable sticky keys if _two keys are pressed
-msgstr Desativar teclas fi_xas se duas teclas forem pressionadas
-
 #: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:10
+msgid Disable sticky keys if two keys are _pressed
+msgstr Desativar teclas fixas se duas teclas forem _pressionadas
+
+#: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:11
 msgid 
 If enabled, the session manager will start the required applications for 
 screen readers and magnifiers
@@ -64,43 +68,43 @@ msgstr 
 Se ativo, o gestor de sessões vai iniciar todas as aplicações necessárias 
 para o leitores de ecrã e ampliadores.
 
-#: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:11
+#: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:12
 msgid K_eystroke delay:
 msgstr Atraso ao pressionar as t_eclas:
 
-#: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:12
+#: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:13
 msgid Keyboa_rd
 msgstr _Teclado
 
-#: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:13
-msgid Maximum _speed:
-msgstr Velo_cidade máxima:
-
 #: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:14
+msgid Ma_ximum speed:
+msgstr Velocidade má_xima:
+
+#: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:15
 msgid Mouse Emulation
 msgstr Emulação do rato
 
-#: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:15
+#: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:16
 msgid No AT-SPI provider was found on your system
 msgstr Não foi encontrado qualquer fornecedor AT-SI no sistema 
 
-#: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:16
+#: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:17
 msgid R_epeat interval:
 msgstr Intervalo de r_epetição:
 
-#: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:17
+#: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:18
 msgid Slow Keys
 msgstr Teclas lentas
 
-#: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:18
+#: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:19
 msgid Sticky Keys
 msgstr Teclas fixas
 
-#: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:19
+#: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:20
 msgid The amount of time, in milliseconds, required 

[Xfce4-commits] xfce4-settings:bluesabre/display-settings Improve debug statements

[Nick Schermer]

Updating branch refs/heads/bluesabre/display-settings
 to 22b558bf644ecfd0fdf81ea91e8fe71c36980131 (commit)
   from 46eb5cbcb513aac30fa009fd50fca36de1a922fc (commit)

commit 22b558bf644ecfd0fdf81ea91e8fe71c36980131
Author: Lionel Le Folgoc lio...@lefolgoc.net
Date:   Thu Oct 18 15:23:59 2012 +0200

Improve debug statements

Signed-off-by: Simon Steinbeiss simon.steinbe...@elfenbeinturm.at

 xfsettingsd/displays.c |   16 ++--
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/xfsettingsd/displays.c b/xfsettingsd/displays.c
index 5af8614..2212092 100644
--- a/xfsettingsd/displays.c
+++ b/xfsettingsd/displays.c
@@ -412,6 +412,10 @@ xfce_displays_helper_set_outputs (XfceRRCrtc *crtc,
 
 g_assert (crtc);
 
+for (n = 0; n  crtc-noutput; ++n)
+xfsettings_dbg (XFSD_DEBUG_DISPLAYS, CRTC %lu, output list[%d] - 
%lu., crtc-id, n,
+crtc-outputs[n]);
+
 /* check if the output is already present */
 for (n = 0; n  crtc-noutput; ++n)
 {
@@ -430,9 +434,8 @@ xfce_displays_helper_set_outputs (XfceRRCrtc *crtc,
 crtc-outputs [crtc-noutput++] = output;
 crtc-changed = TRUE;
 
-for (n = 0; n  crtc-noutput; ++n)
-xfsettings_dbg (XFSD_DEBUG_DISPLAYS, CRTC %lu, output list: %d - 
%lu., crtc-id, n,
-crtc-outputs[n]);
+xfsettings_dbg (XFSD_DEBUG_DISPLAYS, CRTC %lu, output list[%d] - %lu., 
crtc-id,
+crtc-noutput - 1, crtc-outputs[crtc-noutput - 1]);
 }
 
 
@@ -759,9 +762,6 @@ xfce_displays_helper_channel_apply (XfceDisplaysHelper 
*helper,
 
 }
 
-xfsettings_dbg (XFSD_DEBUG_DISPLAYS, Desktop dimensions: %dx%d (px), 
%dx%d (mm).,
-width, height, mm_width, mm_height);
-
 /* set the screen size only if it's really needed and valid */
 if (width = min_width  width = max_width
  height = min_height  height = max_height
@@ -769,8 +769,12 @@ xfce_displays_helper_channel_apply (XfceDisplaysHelper 
*helper,
 || height != gdk_screen_height ()
 || mm_width != gdk_screen_width_mm ()
 || mm_height != gdk_screen_height_mm ()))
+{
+xfsettings_dbg (XFSD_DEBUG_DISPLAYS, Applying desktop dimensions: 
%dx%d (px), %dx%d (mm).,
+width, height, mm_width, mm_height);
 XRRSetScreenSize (xdisplay, GDK_WINDOW_XID (root_window),
   width, height, mm_width, mm_height);
+}
 
 /* final loop, apply crtc changes */
 for (m = 0; m  resources-ncrtc; ++m)
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] xfce4-settings:bluesabre/display-settings l10n: Updated Dutch (Flemish) (nl) translation to 99%

[Transifex]

Updating branch refs/heads/bluesabre/display-settings
 to 91ee02a8332d32c16ec96107bf3ffc5b601f68ad (commit)
   from 0099bc1c1bc69d735e1b5938806921a3b48416d9 (commit)

commit 91ee02a8332d32c16ec96107bf3ffc5b601f68ad
Author: Pjotr vertaalt pjotrverta...@gmail.com
Date:   Wed Nov 7 16:33:53 2012 +0100

l10n: Updated Dutch (Flemish) (nl) translation to 99%

New status: 345 messages complete with 2 fuzzies and 0 untranslated.

Transmitted-via: Transifex (translations.xfce.org).

 po/nl.po |  393 --
 1 file changed, 202 insertions(+), 191 deletions(-)

diff --git a/po/nl.po b/po/nl.po
index 1cdef5d..f9fee4d 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -9,7 +9,7 @@ msgid 
 msgstr 
 Project-Id-Version: xfce4-settings\n
 Report-Msgid-Bugs-To: \n
-POT-Creation-Date: 2012-10-28 09:51+\n
+POT-Creation-Date: 2012-11-07 10:36+\n
 PO-Revision-Date: 2011-09-08 22:32+0200\n
 Last-Translator: Pjotr\n
 Language-Team: Dutch (Flemish)\n
@@ -24,8 +24,8 @@ msgid Acceleration _profile:
 msgstr Versnellings_profiel:
 
 #: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:2
-msgid Acceleration _time:
-msgstr Versnellings_tijd:
+msgid Acceleration t_ime:
+msgstr Versnellingstijd:
 
 #: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:3
 msgid Acceptance _delay:
@@ -37,6 +37,10 @@ msgid Accessibility
 msgstr Toegankelijkheid
 
 #: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:5
+msgid Assistive _Technologies
+msgstr _Ondersteunende technieken
+
+#: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:6
 msgid 
 Assistive technologies will be available the\n
 next time you login
@@ -44,20 +48,20 @@ msgstr 
 Ondersteunende technieken zullen de\n
 volgende keer dat u zich aanmeldt, beschikbaar zijn
 
-#: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:7
+#: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:8
 msgid Bounce Keys
 msgstr Kaatstoetsen
 
-#: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:8
+#: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:9
 msgid Configure keyboard and mouse accessibility
 msgstr Toegankelijkheid voor toetsenbord en muis instellen
 
-#: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:9
-msgid Disable sticky keys if _two keys are pressed
+#: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:10
+msgid Disable sticky keys if two keys are _pressed
 msgstr 
 Plaktoetsen uitschakelen wanneer _twee toetsen tegelijk worden ingedrukt
 
-#: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:10
+#: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:11
 msgid 
 If enabled, the session manager will start the required applications for 
 screen readers and magnifiers
@@ -65,44 +69,44 @@ msgstr 
 Indien geactiveerd, zal de sessiebeheerder de vereiste toepassingen starten 
 voor schermlezers en vergroters
 
-#: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:11
+#: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:12
 msgid K_eystroke delay:
 msgstr V_ertraging voor toetsaanslagen:
 
-#: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:12
+#: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:13
 msgid Keyboa_rd
 msgstr Toetsenbo_rd
 
-#: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:13
-msgid Maximum _speed:
-msgstr Maximum_snelheid:
-
 #: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:14
+msgid Ma_ximum speed:
+msgstr Maximumsnelheid:
+
+#: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:15
 msgid Mouse Emulation
 msgstr Muisnabootsing
 
-#: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:15
+#: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:16
 msgid No AT-SPI provider was found on your system
 msgstr Op uw systeem is geen AT-SPI-leverancier gevonden
 
-#: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:16
+#: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:17
 msgid R_epeat interval:
 msgstr Herhalings_interval:
 
-#: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:17
+#: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:18
 msgid Slow Keys
 msgstr Trage toetsen
 
-#: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:18
+#: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:19
 msgid Sticky Keys
 msgstr Plaktoetsen
 
-#: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:19
+#: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:20
 msgid The amount of time, in milliseconds, required between keystrokes
 msgstr 
 De hoeveelheid tijd, in milliseconden, die nodig is tussen toetsaanslagen
 
-#: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:20
+#: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:21
 

[Xfce4-commits] xfce4-settings:bluesabre/display-settings Enable/Disable internal output on lid changed events

[Simon Steinbeiss]

Updating branch refs/heads/bluesabre/display-settings
 to 4eaeaf0726dd89d9e3fd66fff37e7aaa117260c2 (commit)
   from 8beeb1f9177a1fc454aa37ba251e2d5ff484963f (commit)

commit 4eaeaf0726dd89d9e3fd66fff37e7aaa117260c2
Author: Lionel Le Folgoc lio...@lefolgoc.net
Date:   Wed Nov 7 19:29:42 2012 +0100

Enable/Disable internal output on lid changed events

Signed-off-by: Simon Steinbeiss simon.steinbe...@elfenbeinturm.at

 xfsettingsd/displays.c |  269 +---
 1 file changed, 233 insertions(+), 36 deletions(-)

diff --git a/xfsettingsd/displays.c b/xfsettingsd/displays.c
index 597e0d9..7238f2c 100644
--- a/xfsettingsd/displays.c
+++ b/xfsettingsd/displays.c
@@ -1,6 +1,6 @@
 /*
  *  Copyright (c) 2008 Nick Schermer n...@xfce.org
- *  Copyright (C) 2010 Lionel Le Folgoc lio...@lefolgoc.net
+ *  Copyright (C) 2010-2012 Lionel Le Folgoc lio...@lefolgoc.net
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -37,6 +37,9 @@
 
 #include debug.h
 #include displays.h
+#ifdef HAVE_UPOWERGLIB
+#include displays-upower.h
+#endif
 
 /* check for randr 1.3 or better */
 #if RANDR_MAJOR  1 || (RANDR_MAJOR == 1  RANDR_MINOR = 3)
@@ -69,6 +72,8 @@ static XfceRRCrtc  *xfce_displays_helper_find_crtc_by_id  
  (Xfc
 static void xfce_displays_helper_free_crtc  
(XfceRRCrtc  *crtc);
 static XfceRRCrtc  *xfce_displays_helper_find_usable_crtc   
(XfceDisplaysHelper  *helper,
  
RROutput output);
+static void xfce_displays_helper_get_topleftmost_pos
(XfceRRCrtc  *crtc,
+ 
XfceDisplaysHelper  *helper);
 static void xfce_displays_helper_normalize_crtc 
(XfceRRCrtc  *crtc,
  
XfceDisplaysHelper  *helper);
 static Status   xfce_displays_helper_disable_crtc   
(XfceDisplaysHelper  *helper,
@@ -79,12 +84,18 @@ static void xfce_displays_helper_apply_crtc 
(Xfc
  
XfceDisplaysHelper  *helper);
 static void xfce_displays_helper_set_outputs
(XfceRRCrtc  *crtc,
  
RROutput output);
+static void xfce_displays_helper_apply_all  
(XfceDisplaysHelper  *helper);
 static void xfce_displays_helper_channel_apply  
(XfceDisplaysHelper  *helper,
  
const gchar *scheme);
 static void xfce_displays_helper_channel_property_changed   
(XfconfChannel   *channel,
  
const gchar *property_name,
  
const GValue*value,
  
XfceDisplaysHelper  *helper);
+#ifdef HAVE_UPOWERGLIB
+static void xfce_displays_helper_toggle_internal
(XfceDisplaysUPower  *power,
+ 
gboolean lid_is_closed,
+ 
XfceDisplaysHelper  *helper);
+#endif
 
 
 
@@ -106,6 +117,11 @@ struct _XfceDisplaysHelper
 gintprimary;
 #endif
 
+#ifdef HAVE_UPOWERGLIB
+XfceDisplaysUPower *power;
+gintphandler;
+#endif
+
 GdkDisplay *display;
 GdkWindow  *root_window;
 Display*xdisplay;
@@ -166,6 +182,10 @@ xfce_displays_helper_init (XfceDisplaysHelper *helper)
 gint major = 0, minor = 0;
 gint error_base, err;
 
+#ifdef HAVE_UPOWERGLIB
+helper-power = NULL;
+helper-phandler = 0;
+#endif
 helper-resources = NULL;
 helper-crtcs = NULL;
 helper-handler = 0;
@@ -209,6 +229,14 @@ xfce_displays_helper_init (XfceDisplaysHelper *helper)
xfce_displays_helper_screen_on_event,
helper);
 
+#ifdef HAVE_UPOWERGLIB
+helper-power = g_object_new (XFCE_TYPE_DISPLAYS_UPOWER, NULL);
+helper-phandler = g_signal_connect (G_OBJECT (helper-power),
+ lid-changed,
+ G_CALLBACK 

[Xfce4-commits] xfce4-settings:bluesabre/display-settings l10n: Updated Portuguese (Brazilian) (pt_BR) translation to 100%

[Transifex]

Updating branch refs/heads/bluesabre/display-settings
 to 645fa17d093052b6ef62f4eee35a47c04b9b18ad (commit)
   from 367f4941ea1ac683b02c93a07703a92fca6dc782 (commit)

commit 645fa17d093052b6ef62f4eee35a47c04b9b18ad
Author: Rafael Ferreira rafael.f...@gmail.com
Date:   Thu Nov 1 00:19:12 2012 +0100

l10n: Updated Portuguese (Brazilian) (pt_BR) translation to 100%

New status: 347 messages complete with 0 fuzzies and 0 untranslated.

Transmitted-via: Transifex (translations.xfce.org).

 po/pt_BR.po |  166 ---
 1 file changed, 113 insertions(+), 53 deletions(-)

diff --git a/po/pt_BR.po b/po/pt_BR.po
index 2ef57f9..cd0f42d 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -6,19 +6,19 @@
 # Henrique P Machado zehri...@gmail.com, 2008.
 # Og Maciel ogmac...@gnome.org, 2008 - 2010.
 # Sérgio Cipolla secipo...@gmail.com, 2011.
-# 
+#
 msgid 
 msgstr 
 Project-Id-Version: xfce4-settings\n
 Report-Msgid-Bugs-To: \n
-POT-Creation-Date: 2012-08-26 02:27+\n
-PO-Revision-Date: 2012-06-17 02:30-0300\n
+POT-Creation-Date: 2012-10-30 10:00+\n
+PO-Revision-Date: 2012-10-31 21:17-0300\n
 Last-Translator: Rafael Ferreira rafael.f...@gmail.com\n
 Language-Team: Brazilian Portuguese xfce-i18n...@xfce.org\n
+Language: pt_BR\n
 MIME-Version: 1.0\n
 Content-Type: text/plain; charset=utf-8\n
 Content-Transfer-Encoding: 8bit\n
-Language: pt_BR\n
 Plural-Forms: nplurals=2; plural=(n  1);\n
 X-Poedit-SourceCharset: utf-8\n
 
@@ -235,21 +235,21 @@ msgstr px/s
 
 #: ../dialogs/accessibility-settings/main.c:43
 #: ../dialogs/appearance-settings/main.c:94
-#: ../dialogs/display-settings/main.c:102
+#: ../dialogs/display-settings/main.c:136
 #: ../dialogs/keyboard-settings/main.c:39 ../dialogs/mouse-settings/main.c:79
 msgid Settings manager socket
 msgstr Socket do gerenciador de configurações
 
 #: ../dialogs/accessibility-settings/main.c:43
 #: ../dialogs/appearance-settings/main.c:94
-#: ../dialogs/display-settings/main.c:102
+#: ../dialogs/display-settings/main.c:136
 #: ../dialogs/keyboard-settings/main.c:39 ../dialogs/mouse-settings/main.c:79
 msgid SOCKET ID
 msgstr SOCKET ID
 
 #: ../dialogs/accessibility-settings/main.c:44
 #: ../dialogs/appearance-settings/main.c:95
-#: ../dialogs/display-settings/main.c:103
+#: ../dialogs/display-settings/main.c:137
 #: ../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:39
@@ -258,29 +258,29 @@ msgstr Informações da versão
 
 #: ../dialogs/accessibility-settings/main.c:192
 #: ../dialogs/appearance-settings/main.c:966
-#: ../dialogs/display-settings/main.c:1043
+#: ../dialogs/display-settings/main.c:1922
 #: ../dialogs/keyboard-settings/main.c:76 ../dialogs/mime-settings/main.c:62
 #: ../dialogs/mouse-settings/main.c:1597 ../xfce4-settings-editor/main.c:63
-#: ../xfsettingsd/main.c:173 ../xfce4-settings-manager/main.c:60
+#: ../xfsettingsd/main.c:187 ../xfce4-settings-manager/main.c:60
 #, 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:985
-#: ../dialogs/display-settings/main.c:1062
+#: ../dialogs/display-settings/main.c:1941
 #: ../dialogs/keyboard-settings/main.c:92 ../dialogs/mime-settings/main.c:81
 #: ../dialogs/mouse-settings/main.c:1616 ../xfce4-settings-editor/main.c:82
-#: ../xfsettingsd/main.c:189 ../xfce4-settings-manager/main.c:76
+#: ../xfsettingsd/main.c:203 ../xfce4-settings-manager/main.c:76
 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:986
-#: ../dialogs/display-settings/main.c:1063
+#: ../dialogs/display-settings/main.c:1942
 #: ../dialogs/keyboard-settings/main.c:93 ../dialogs/mime-settings/main.c:82
 #: ../dialogs/mouse-settings/main.c:1617 ../xfce4-settings-editor/main.c:83
-#: ../xfsettingsd/main.c:190 ../xfce4-settings-manager/main.c:77
+#: ../xfsettingsd/main.c:204 ../xfce4-settings-manager/main.c:77
 #, c-format
 msgid Please report bugs to %s.
 msgstr Por favor relate os erros para %s.
@@ -302,7 +302,7 @@ msgid Appearance
 msgstr Aparência
 
 #: ../dialogs/appearance-settings/appearance-dialog.glade.h:3
-#: ../dialogs/display-settings/main.c:82
+#: ../dialogs/display-settings/main.c:116
 msgid Both
 msgstr Ambos
 
@@ -398,7 +398,8 @@ msgstr Menus e botões
 
 #: ../dialogs/appearance-settings/appearance-dialog.glade.h:22
 #: ../dialogs/appearance-settings/main.c:852
-#: ../dialogs/display-settings/main.c:79
+#: ../dialogs/display-settings/main.c:102
+#: ../dialogs/display-settings/main.c:113
 msgid None
 msgstr Nenhum(a)
 
@@ -566,70 +567,106 @@ msgid Display
 msgstr Monitor
 
 #: 

[Xfce4-commits] xfce4-settings:bluesabre/display-settings Use g_signal_handlers_block_by_func()/unblock_by_func() instead of disconnecting and reconnecting

[Nick Schermer]

Updating branch refs/heads/bluesabre/display-settings
 to a89421cc58668a114c71f923e7cd64f7215950c1 (commit)
   from 536274e8a8517c99e7be8e897f1f3b7392bf7606 (commit)

commit a89421cc58668a114c71f923e7cd64f7215950c1
Author: Lionel Le Folgoc lio...@lefolgoc.net
Date:   Wed Oct 24 19:25:26 2012 +0200

Use g_signal_handlers_block_by_func()/unblock_by_func() instead of 
disconnecting and reconnecting

Signed-off-by: Simon Steinbeiss simon.steinbe...@elfenbeinturm.at

 dialogs/display-settings/main.c |  115 ++-
 1 file changed, 53 insertions(+), 62 deletions(-)

diff --git a/dialogs/display-settings/main.c b/dialogs/display-settings/main.c
index 069715a..bfd1cc9 100644
--- a/dialogs/display-settings/main.c
+++ b/dialogs/display-settings/main.c
@@ -412,11 +412,9 @@ display_setting_positions_populate (GtkBuilder *builder)
 }
 gtk_widget_set_sensitive (GTK_WIDGET (combobox), TRUE);
 
-/* Disconnect the changed signal to avoid triggering the confirmation
- * dialog */
-g_object_disconnect (combobox, any_signal::changed,
- display_setting_positions_changed,
- builder, NULL);
+/* Block the changed signal to avoid triggering the confirmation dialog 
*/
+g_signal_handlers_block_by_func (combobox, 
display_setting_positions_changed,
+ builder);
 
 /* Try to insert the relations */
 for (n = 0; n  G_N_ELEMENTS (relation_names); n++)
@@ -431,8 +429,9 @@ display_setting_positions_populate (GtkBuilder *builder)
 gtk_combo_box_set_active_iter (GTK_COMBO_BOX (combobox), iter);
 }
 
-/* Reconnect the signal */
-g_signal_connect (G_OBJECT (combobox), changed, G_CALLBACK 
(display_setting_positions_changed), builder);
+/* Unblock the signal */
+g_signal_handlers_unblock_by_func (combobox, 
display_setting_positions_changed,
+   builder);
 }
 
 static void
@@ -482,11 +481,9 @@ display_setting_active_displays_populate (GtkBuilder 
*builder)
 }
 gtk_widget_set_sensitive (GTK_WIDGET (combobox), TRUE);
 
-/* Disconnect the changed signal to avoid triggering the confirmation
- * dialog */
-g_object_disconnect (combobox, any_signal::changed,
- display_setting_active_displays_changed,
- builder, NULL);
+/* Block the changed signal to avoid triggering the confirmation dialog 
*/
+g_signal_handlers_block_by_func (combobox, 
display_setting_active_displays_changed,
+ builder);
 
 /* Insert all active displays */
 for (n = 0; n  xfce_randr-noutput; ++n)
@@ -505,8 +502,9 @@ display_setting_active_displays_populate (GtkBuilder 
*builder)
 gtk_combo_box_set_active_iter (GTK_COMBO_BOX (combobox), iter);
 }
 
-/* Reconnect the signal */
-g_signal_connect (G_OBJECT (combobox), changed, G_CALLBACK 
(display_setting_active_displays_changed), builder);
+/* Unblock the signal */
+g_signal_handlers_unblock_by_func (combobox, 
display_setting_active_displays_changed,
+   builder);
 }
 
 
@@ -571,11 +569,9 @@ display_setting_reflections_populate (GtkBuilder *builder)
 }
 gtk_widget_set_sensitive (GTK_WIDGET (combobox), TRUE);
 
-/* Disconnect the changed signal to avoid triggering the confirmation
- * dialog */
-g_object_disconnect (combobox, any_signal::changed,
- display_setting_reflections_changed,
- builder, NULL);
+/* Block the changed signal to avoid triggering the confirmation dialog 
*/
+g_signal_handlers_block_by_func (combobox, 
display_setting_reflections_changed,
+ builder);
 
 /* Load only supported reflections */
 reflections = xfce_randr-rotations[active_output]  
XFCE_RANDR_REFLECTIONS_MASK;
@@ -601,8 +597,9 @@ display_setting_reflections_populate (GtkBuilder *builder)
 }
 }
 
-/* Reconnect the signal */
-g_signal_connect (G_OBJECT (combobox), changed, G_CALLBACK 
(display_setting_reflections_changed), builder);
+/* Unblock the signal */
+g_signal_handlers_unblock_by_func (combobox, 
display_setting_reflections_changed,
+   builder);
 }
 
 
@@ -662,11 +659,9 @@ display_setting_rotations_populate (GtkBuilder *builder)
 }
 gtk_widget_set_sensitive (GTK_WIDGET (combobox), TRUE);
 
-/* Disconnect the changed signal to avoid triggering the confirmation
- * dialog */
-g_object_disconnect (combobox, any_signal::changed,
- display_setting_rotations_changed,
- builder, NULL);
+/* Block the changed signal to avoid triggering the confirmation dialog 
*/
+g_signal_handlers_block_by_func (combobox, 
display_setting_rotations_changed,
+  

[Xfce4-commits] xfce4-settings:bluesabre/display-settings l10n: Updated Croatian (hr) translation to 72%

[Transifex]

Updating branch refs/heads/bluesabre/display-settings
 to 0290a22944134c68e6a7ed69e528db45832c1438 (commit)
   from 1ae3f7a234368e2f69d1fb69eeb35808e43f1a95 (commit)

commit 0290a22944134c68e6a7ed69e528db45832c1438
Author: Ivica  Kolić ik...@yahoo.com
Date:   Thu Nov 8 01:56:13 2012 +0100

l10n: Updated Croatian (hr) translation to 72%

New status: 252 messages complete with 1 fuzzy and 94 untranslated.

Transmitted-via: Transifex (translations.xfce.org).

 po/hr.po |  393 --
 1 file changed, 201 insertions(+), 192 deletions(-)

diff --git a/po/hr.po b/po/hr.po
index 1bd0a5b..1279dff 100644
--- a/po/hr.po
+++ b/po/hr.po
@@ -7,7 +7,7 @@ msgid 
 msgstr 
 Project-Id-Version: xfce 4-settings\n
 Report-Msgid-Bugs-To: \n
-POT-Creation-Date: 2012-11-06 13:12+\n
+POT-Creation-Date: 2012-11-07 21:18+\n
 PO-Revision-Date: 2010-06-05 17:46+0200\n
 Last-Translator: Ivica Kolićik...@yahoo.com \n
 Language-Team: Croatian \n
@@ -22,8 +22,8 @@ msgid Acceleration _profile:
 msgstr Profil _ubrzanja
 
 #: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:2
-msgid Acceleration _time:
-msgstr Vrijeme _ubrzanja
+msgid Acceleration t_ime:
+msgstr Vrijeme u_brzanja
 
 #: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:3
 msgid Acceptance _delay:
@@ -35,6 +35,10 @@ msgid Accessibility
 msgstr Pristupačnost
 
 #: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:5
+msgid Assistive _Technologies
+msgstr 
+
+#: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:6
 msgid 
 Assistive technologies will be available the\n
 next time you login
@@ -42,19 +46,19 @@ msgstr 
 Tehnologije za pomoć bit će dostupne\n
 kod sljedeće prijave
 
-#: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:7
+#: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:8
 msgid Bounce Keys
 msgstr 
 
-#: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:8
+#: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:9
 msgid Configure keyboard and mouse accessibility
 msgstr Konfiguriraj pristupačnost tipkovnice i miša
 
-#: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:9
-msgid Disable sticky keys if _two keys are pressed
+#: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:10
+msgid Disable sticky keys if two keys are _pressed
 msgstr 
 
-#: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:10
+#: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:11
 msgid 
 If enabled, the session manager will start the required applications for 
 screen readers and magnifiers
@@ -62,89 +66,85 @@ msgstr 
 Ako je omogučeno, upravitelj sesije će pokrenuti potrebne aplikacije za 
 čitaće zaslona i povečalo
 
-#: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:11
+#: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:12
 msgid K_eystroke delay:
 msgstr O_dgoda pritiska tipke
 
-#: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:12
+#: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:13
 msgid Keyboa_rd
 msgstr Tipkovni_ca
 
-#: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:13
-msgid Maximum _speed:
-msgstr Maksimalna _brzina
-
 #: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:14
+msgid Ma_ximum speed:
+msgstr Ma_ksimalna brzina:
+
+#: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:15
 msgid Mouse Emulation
 msgstr Emulacija miša
 
-#: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:15
+#: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:16
 msgid No AT-SPI provider was found on your system
 msgstr 
 
-#: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:16
+#: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:17
 msgid R_epeat interval:
 msgstr P_onovi interval
 
-#: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:17
+#: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:18
 msgid Slow Keys
 msgstr Spore tipke
 
-#: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:18
+#: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:19
 msgid Sticky Keys
 msgstr 
 
-#: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:19
+#: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:20
 msgid The amount of time, in milliseconds, required between keystrokes
 msgstr Vrijeme,u milisekundama potrebno između pritisaka tipke
 
-#: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:20
+#: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:21
 msgid 
 The amount of time, in milliseconds, that must elapse before a keystroke 
 will be accepted
 msgstr 
 Vrijeme,u milisekundama,koje mora proći da pritisak tipke bude prihvaćen
 
-#: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:21
+#: