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_width">5</property> <property name="title" translatable="yes">Confirmation</property> <property name="resizable">False</property> + <property name="modal">True</property> <property name="window_position">center</property> <property name="icon_name">dialog-question</property> <property name="type_hint">normal</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_focus">True</property> <property name="receives_default">False</property> <property name="use_action_appearance">False</property> - <property name="active">True</property> <property name="draw_indicator">False</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_attach">1</property> <property name="right_attach">2</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_attach">2</property> <property name="right_attach">3</property> - <property name="x_options"></property> - <property name="y_options"></property> + <property name="x_options"/> + <property name="y_options"/> </packing> </child> <child> @@ -178,8 +177,8 @@ <packing> <property name="left_attach">3</property> <property name="right_attach">4</property> - <property name="x_options"></property> - <property name="y_options"></property> + <property name="x_options"/> + <property name="y_options"/> </packing> </child> </object> @@ -208,6 +207,22 @@ </packing> </child> <child> + <object class="GtkRadioButton" id="fake_button"> + <property name="label" translatable="yes">radiobutton</property> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <property name="use_action_appearance">False</property> + <property name="active">True</property> + <property name="draw_indicator">True</property> + <property name="group">display1</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">1</property> + </packing> + </child> + <child> <object class="GtkButton" id="cancel_button"> <property name="label">gtk-close</property> <property name="visible">True</property> @@ -219,7 +234,7 @@ <packing> <property name="expand">False</property> <property name="fill">False</property> - <property name="position">1</property> + <property name="position">2</property> </packing> </child> </object> _______________________________________________ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits