[gnome-control-center] display: remove the primary display checkbox

[William Jon McCann <mccann src gnome org>]

commit 16f45eb8a79e4aa380d152b5352e19a258af463c
Author: William Jon McCann <jmccann redhat com>
Date:   Sun Nov 14 15:44:36 2010 -0500

    display: remove the primary display checkbox
    
    We'll add a graphical representation instead.

 panels/display/display-capplet.ui |   93 +++++++++++++++++--------------------
 panels/display/xrandr-capplet.c   |    6 --
 2 files changed, 42 insertions(+), 57 deletions(-)
---
diff --git a/panels/display/display-capplet.ui b/panels/display/display-capplet.ui
index 8bb5314..7ec07c0 100644
--- a/panels/display/display-capplet.ui
+++ b/panels/display/display-capplet.ui
@@ -27,7 +27,7 @@
       <object class="GtkVBox" id="display-panel">
         <property name="visible">True</property>
         <property name="orientation">vertical</property>
-        <property name="spacing">6</property>
+        <property name="spacing">12</property>
         <child>
           <object class="GtkAlignment" id="align">
             <property name="visible">True</property>
@@ -42,6 +42,7 @@
         <child>
           <object class="GtkHBox" id="hbox1">
             <property name="visible">True</property>
+            <property name="spacing">12</property>
             <child>
               <object class="GtkVBox" id="vbox1">
                 <property name="visible">True</property>
@@ -133,7 +134,7 @@
                     <child>
                       <object class="GtkTable" id="table1">
                         <property name="visible">True</property>
-                        <property name="n_rows">4</property>
+                        <property name="n_rows">3</property>
                         <property name="n_columns">2</property>
                         <property name="column_spacing">12</property>
                         <property name="row_spacing">6</property>
@@ -147,8 +148,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">2</property>
+                            <property name="bottom_attach">3</property>
                             <property name="x_options"></property>
                             <property name="y_options"></property>
                           </packing>
@@ -209,23 +210,6 @@
                           </packing>
                         </child>
                         <child>
-                          <object class="GtkCheckButton" id="primary_display_checkbox">
-                            <property name="label" translatable="yes">_Include Top Menu Bar</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="right_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"></property>
-                          </packing>
-                        </child>
-                        <child>
                           <placeholder/>
                         </child>
                       </object>
@@ -302,44 +286,51 @@
           </packing>
         </child>
         <child>
-          <object class="GtkHButtonBox" id="hbuttonbox1">
+          <object class="GtkAlignment" id="alignment3">
             <property name="visible">True</property>
-            <property name="spacing">6</property>
-            <property name="layout_style">end</property>
-            <child>
-              <object class="GtkButton" id="apply_button">
-                <property name="label">gtk-apply</property>
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="can_default">True</property>
-                <property name="receives_default">True</property>
-                <property name="use_stock">True</property>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">False</property>
-                <property name="position">1</property>
-              </packing>
-            </child>
+            <property name="top_padding">10</property>
             <child>
-              <object class="GtkButton" id="detect_displays_button">
-                <property name="label" translatable="yes">_Detect monitors</property>
+              <object class="GtkHButtonBox" id="hbuttonbox1">
                 <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="receives_default">True</property>
-                <property name="use_underline">True</property>
+                <property name="spacing">6</property>
+                <property name="layout_style">end</property>
+                <child>
+                  <object class="GtkButton" id="apply_button">
+                    <property name="label">gtk-apply</property>
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="can_default">True</property>
+                    <property name="receives_default">True</property>
+                    <property name="use_stock">True</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="detect_displays_button">
+                    <property name="label" translatable="yes">_Detect monitors</property>
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="receives_default">True</property>
+                    <property name="use_underline">True</property>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">False</property>
+                    <property name="pack_type">end</property>
+                    <property name="position">0</property>
+                    <property name="secondary">True</property>
+                  </packing>
+                </child>
               </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">False</property>
-                <property name="pack_type">end</property>
-                <property name="position">0</property>
-                <property name="secondary">True</property>
-              </packing>
             </child>
           </object>
           <packing>
             <property name="expand">False</property>
+            <property name="fill">False</property>
             <property name="position">2</property>
           </packing>
         </child>
diff --git a/panels/display/xrandr-capplet.c b/panels/display/xrandr-capplet.c
index e784471..d2c1346 100644
--- a/panels/display/xrandr-capplet.c
+++ b/panels/display/xrandr-capplet.c
@@ -59,7 +59,6 @@ struct App
     GtkWidget	   *resolution_combo;
     GtkWidget	   *rotation_combo;
     GtkWidget	   *clone_checkbox;
-    GtkWidget	   *primary_display_checkbox;
     GtkWidget	   *clone_label;
     GtkWidget	   *show_icon_checkbox;
 
@@ -668,7 +667,6 @@ rebuild_gui (App *app)
 #if 0
     g_debug ("sensitive: %d, on: %d", sensitive, app->current_output->on);
 #endif
-    gtk_widget_set_sensitive (app->primary_display_checkbox, sensitive);
 
     app->ignore_gui_changes = FALSE;
 }
@@ -2372,13 +2370,9 @@ run_application (void)
     g_signal_connect (_gtk_builder_get_widget (builder, "detect_displays_button"),
 		      "clicked", G_CALLBACK (on_detect_displays), app);
 
-    app->primary_display_checkbox = _gtk_builder_get_widget (builder, "primary_display_checkbox");
-
     make_text_combo (app->resolution_combo, 4);
     make_text_combo (app->rotation_combo, -1);
 
-    g_assert (app->primary_display_checkbox);
-
     /* Scroll Area */
     app->area = (GtkWidget *)foo_scroll_area_new ();