[Xfce4-commits] <xfce4-settings:ochosi/primary> Add option to set primary display
Simon Steinbeiss
noreply at xfce.org
Thu Dec 6 23:56:01 CET 2012
Updating branch refs/heads/ochosi/primary
to 7379317c553beb34e2b1a61027c1e7ad0afa3487 (commit)
from b609baea269a6c54becf2b07bec61abd8d1c1995 (commit)
commit 7379317c553beb34e2b1a61027c1e7ad0afa3487
Author: Simon Steinbeiss <simon.steinbeiss at elfenbeinturm.at>
Date: Thu Dec 6 23:54:15 2012 +0100
Add option to set primary display
dialogs/display-settings/display-dialog.glade | 63 ++++++++++++++++---------
dialogs/display-settings/main.c | 23 +++++++++-
2 files changed, 62 insertions(+), 24 deletions(-)
diff --git a/dialogs/display-settings/display-dialog.glade b/dialogs/display-settings/display-dialog.glade
index 478ec1b..d5fd484 100644
--- a/dialogs/display-settings/display-dialog.glade
+++ b/dialogs/display-settings/display-dialog.glade
@@ -51,7 +51,7 @@
<object class="GtkTable" id="table1">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="n_rows">7</property>
+ <property name="n_rows">8</property>
<property name="n_columns">2</property>
<property name="column_spacing">12</property>
<property name="row_spacing">6</property>
@@ -62,8 +62,8 @@
<packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
- <property name="top_attach">6</property>
- <property name="bottom_attach">7</property>
+ <property name="top_attach">7</property>
+ <property name="bottom_attach">8</property>
<property name="y_options">GTK_FILL</property>
</packing>
</child>
@@ -75,8 +75,8 @@
<packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
- <property name="top_attach">5</property>
- <property name="bottom_attach">6</property>
+ <property name="top_attach">6</property>
+ <property name="bottom_attach">7</property>
<property name="y_options">GTK_FILL</property>
</packing>
</child>
@@ -88,8 +88,8 @@
<packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
- <property name="top_attach">4</property>
- <property name="bottom_attach">5</property>
+ <property name="top_attach">5</property>
+ <property name="bottom_attach">6</property>
<property name="y_options">GTK_FILL</property>
</packing>
</child>
@@ -101,8 +101,8 @@
<packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
- <property name="top_attach">3</property>
- <property name="bottom_attach">4</property>
+ <property name="top_attach">4</property>
+ <property name="bottom_attach">5</property>
<property name="y_options">GTK_FILL</property>
</packing>
</child>
@@ -114,8 +114,8 @@
<property name="use_underline">True</property>
</object>
<packing>
- <property name="top_attach">6</property>
- <property name="bottom_attach">7</property>
+ <property name="top_attach">7</property>
+ <property name="bottom_attach">8</property>
<property name="x_options">GTK_FILL</property>
<property name="y_options">GTK_FILL</property>
</packing>
@@ -129,8 +129,8 @@
<property name="use_underline">True</property>
</object>
<packing>
- <property name="top_attach">5</property>
- <property name="bottom_attach">6</property>
+ <property name="top_attach">6</property>
+ <property name="bottom_attach">7</property>
<property name="x_options">GTK_FILL</property>
<property name="y_options">GTK_FILL</property>
</packing>
@@ -144,8 +144,8 @@
<property name="use_underline">True</property>
</object>
<packing>
- <property name="top_attach">4</property>
- <property name="bottom_attach">5</property>
+ <property name="top_attach">5</property>
+ <property name="bottom_attach">6</property>
<property name="x_options">GTK_FILL</property>
<property name="y_options">GTK_FILL</property>
</packing>
@@ -159,8 +159,8 @@
<property name="use_underline">True</property>
</object>
<packing>
- <property name="top_attach">3</property>
- <property name="bottom_attach">4</property>
+ <property name="top_attach">4</property>
+ <property name="bottom_attach">5</property>
<property name="x_options">GTK_FILL</property>
<property name="y_options">GTK_FILL</property>
</packing>
@@ -174,8 +174,8 @@
<property name="use_underline">True</property>
</object>
<packing>
- <property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
+ <property name="top_attach">3</property>
+ <property name="bottom_attach">4</property>
<property name="x_options">GTK_FILL</property>
<property name="y_options">GTK_FILL</property>
</packing>
@@ -208,8 +208,8 @@
</object>
<packing>
<property name="right_attach">2</property>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
+ <property name="top_attach">2</property>
+ <property name="bottom_attach">3</property>
<property name="x_options">GTK_FILL</property>
<property name="y_options">GTK_FILL</property>
</packing>
@@ -244,8 +244,25 @@
<packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
- <property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
+ <property name="top_attach">3</property>
+ <property name="bottom_attach">4</property>
+ <property name="y_options">GTK_FILL</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkCheckButton" id="primary">
+ <property name="label" translatable="yes">Set as primary</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="use_action_appearance">False</property>
+ <property name="draw_indicator">True</property>
+ </object>
+ <packing>
+ <property name="right_attach">2</property>
+ <property name="top_attach">1</property>
+ <property name="bottom_attach">2</property>
+ <property name="x_options">GTK_FILL</property>
<property name="y_options">GTK_FILL</property>
</packing>
</child>
diff --git a/dialogs/display-settings/main.c b/dialogs/display-settings/main.c
index 4a6be6c..8646acb 100644
--- a/dialogs/display-settings/main.c
+++ b/dialogs/display-settings/main.c
@@ -1207,6 +1207,24 @@ display_setting_mirror_displays_populate (GtkBuilder *builder)
}
+static void
+display_setting_primary_toggled (GtkToggleButton *togglebutton,
+ GtkBuilder *builder)
+{
+ if (!xfce_randr)
+ return;
+
+ if (gtk_toggle_button_get_active (togglebutton))
+ xfce_randr->status[active_output]=XFCE_OUTPUT_STATUS_PRIMARY;
+ else
+ xfce_randr->status[active_output]=XFCE_OUTPUT_STATUS_SECONDARY;
+
+ /* Apply the changes */
+ xfce_randr_save_output (xfce_randr, "Default", display_channel,
+ active_output, FALSE);
+ xfce_randr_apply (xfce_randr, "Default", display_channel);
+}
+
static void
display_setting_output_toggled (GtkToggleButton *togglebutton,
@@ -1516,7 +1534,10 @@ display_settings_dialog_new (GtkBuilder *builder)
combobox = gtk_builder_get_object (builder, "randr-rotation");
display_settings_combo_box_create (GTK_COMBO_BOX (combobox));
g_signal_connect (G_OBJECT (combobox), "changed", G_CALLBACK (display_setting_rotations_changed), builder);
-
+
+ check = gtk_builder_get_object (builder, "primary");
+ g_signal_connect (G_OBJECT (check), "toggled", G_CALLBACK (display_setting_primary_toggled), builder);
+
check = gtk_builder_get_object (builder, "minimal-autoshow");
xfconf_g_property_bind (display_channel, "/Notify", G_TYPE_BOOLEAN, check,
"active");
More information about the Xfce4-commits
mailing list