[Xfce4-commits] xfce4-settings:bluesabre/display-settings Added current setup detection to minimal dialog.
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 Added current setup detection to minimal dialog.
Updating branch refs/heads/bluesabre/display-settings
to 940e73d1bccc1c0558cccefe199c00baab0ad9a9 (commit)
from f71c0af05a0853de4ad620f57cad1bcbdb6a7143 (commit)
commit 940e73d1bccc1c0558cccefe199c00baab0ad9a9
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
