From 110010bb65c818cf33bef9c138545f02d3f961bf Mon Sep 17 00:00:00 2001
From: Gabriel Burt <gabriel.burt@gmail.com>
Date: Thu, 9 Sep 2010 14:46:00 -0500
Subject: [PATCH] bnc#600599 - [randr] Label to warn that 'Same image in all
 monitors' may limit the resolution options

Signed-off-by: Federico Mena Quintero <federico@novell.com>
---
 panels/display/display-capplet.ui | 36 +++++++++++++++++++++++++------
 panels/display/xrandr-capplet.c   |  4 ++++
 2 files changed, 34 insertions(+), 6 deletions(-)

diff --git a/panels/display/display-capplet.ui b/panels/display/display-capplet.ui
index 981aabd9f..130521f99 100644
--- a/panels/display/display-capplet.ui
+++ b/panels/display/display-capplet.ui
@@ -56,13 +56,37 @@
                     <property name="visible">True</property>
                     <property name="spacing">12</property>
                     <child>
-                      <object class="GtkCheckButton" id="clone_checkbox">
-                        <property name="label" translatable="yes">Sa_me image in all monitors</property>
+                      <object class="GtkVBox" id="vbox1">
                         <property name="visible">True</property>
-                        <property name="can_focus">True</property>
-                        <property name="receives_default">False</property>
-                        <property name="use_underline">True</property>
-                        <property name="draw_indicator">True</property>
+                        <property name="orientation">vertical</property>
+                        <child>
+                          <object class="GtkCheckButton" id="clone_checkbox">
+                            <property name="label" translatable="yes">Sa_me image in all monitors</property>
+                            <property name="visible">True</property>
+                            <property name="can_focus">True</property>
+                            <property name="receives_default">False</property>
+                            <property name="use_underline">True</property>
+                            <property name="draw_indicator">True</property>
+                          </object>
+                          <packing>
+                            <property name="expand">False</property>
+                            <property name="fill">False</property>
+                            <property name="position">0</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkLabel" id="clone_resolution_warning_label">
+                            <property name="visible">True</property>
+                            <property name="xalign">0</property>
+                            <property name="label" translatable="yes">&lt;i&gt;Note: may limit resolution options&lt;/i&gt;</property>
+                            <property name="use_markup">True</property>
+                          </object>
+                          <packing>
+                            <property name="expand">False</property>
+                            <property name="fill">False</property>
+                            <property name="position">1</property>
+                          </packing>
+                        </child>
                       </object>
                       <packing>
                         <property name="expand">False</property>
diff --git a/panels/display/xrandr-capplet.c b/panels/display/xrandr-capplet.c
index 227f5d1c0..31269a7ad 100644
--- a/panels/display/xrandr-capplet.c
+++ b/panels/display/xrandr-capplet.c
@@ -60,6 +60,7 @@ struct App
     GtkWidget	   *rotation_combo;
     GtkWidget	   *panel_checkbox;
     GtkWidget	   *clone_checkbox;
+    GtkWidget	   *clone_label;
     GtkWidget	   *show_icon_checkbox;
 
     /* We store the event timestamp when the Apply button is clicked */
@@ -495,6 +496,7 @@ rebuild_mirror_screens (App *app)
     
     gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (app->clone_checkbox), mirror_is_active);
     gtk_widget_set_sensitive (app->clone_checkbox, mirror_is_supported);
+    gtk_widget_set_sensitive (app->clone_label, mirror_is_supported);
 
     g_signal_handlers_unblock_by_func (app->clone_checkbox, G_CALLBACK (on_clone_changed), app);
 }
@@ -2459,6 +2461,8 @@ run_application (void)
     g_signal_connect (app->clone_checkbox, "toggled",
 		      G_CALLBACK (on_clone_changed), app);
 
+    app->clone_label    = _gtk_builder_get_widget (builder, "clone_resolution_warning_label");
+
     g_signal_connect (_gtk_builder_get_widget (builder, "detect_displays_button"),
 		      "clicked", G_CALLBACK (on_detect_displays), app);