applications/gnome-control-center
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

display: remove the primary display checkbox

Browse source 
We'll add a graphical representation instead.
This commit is contained in:
William Jon McCann 2010-11-14 15:44:36 -05:00
parent ad13352fbc
commit 16f45eb8a7
2 changed files with 42 additions and 57 deletions
Download patch file Download diff file Expand all files Collapse all files

93
panels/display/display-capplet.ui
View file

@ -27,7 +27,7 @@
<object class="GtkVBox" id="display-panel"> <object class="GtkVBox" id="display-panel">
<property name="visible">True</property> <property name="visible">True</property>
<property name="orientation">vertical</property> <property name="orientation">vertical</property>
<property name="spacing">6</property> <property name="spacing">12</property>
<child> <child>
<object class="GtkAlignment" id="align"> <object class="GtkAlignment" id="align">
<property name="visible">True</property> <property name="visible">True</property>
@ -42,6 +42,7 @@
<child> <child>
<object class="GtkHBox" id="hbox1"> <object class="GtkHBox" id="hbox1">
<property name="visible">True</property> <property name="visible">True</property>
<property name="spacing">12</property>
<child> <child>
<object class="GtkVBox" id="vbox1"> <object class="GtkVBox" id="vbox1">
<property name="visible">True</property> <property name="visible">True</property>
@ -133,7 +134,7 @@
<child> <child>
<object class="GtkTable" id="table1"> <object class="GtkTable" id="table1">
<property name="visible">True</property> <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="n_columns">2</property>
<property name="column_spacing">12</property> <property name="column_spacing">12</property>
<property name="row_spacing">6</property> <property name="row_spacing">6</property>
@ -147,8 +148,8 @@
<packing> <packing>
<property name="left_attach">1</property> <property name="left_attach">1</property>
<property name="right_attach">2</property> <property name="right_attach">2</property>
<property name="top_attach">3</property> <property name="top_attach">2</property>
<property name="bottom_attach">4</property> <property name="bottom_attach">3</property>
<property name="x_options"></property> <property name="x_options"></property>
<property name="y_options"></property> <property name="y_options"></property>
</packing> </packing>
@ -208,23 +209,6 @@
<property name="y_options"></property> <property name="y_options"></property>
</packing> </packing>
</child> </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> <child>
<placeholder/> <placeholder/>
</child> </child>
@ -302,44 +286,51 @@
</packing> </packing>
</child> </child>
<child> <child>
<object class="GtkHButtonBox" id="hbuttonbox1"> <object class="GtkAlignment" id="alignment3">
<property name="visible">True</property> <property name="visible">True</property>
<property name="spacing">6</property> <property name="top_padding">10</property>
<property name="layout_style">end</property>
<child> <child>
<object class="GtkButton" id="apply_button"> <object class="GtkHButtonBox" id="hbuttonbox1">
<property name="label">gtk-apply</property>
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">True</property> <property name="spacing">6</property>
<property name="can_default">True</property> <property name="layout_style">end</property>
<property name="receives_default">True</property> <child>
<property name="use_stock">True</property> <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> </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> </child>
</object> </object>
<packing> <packing>
<property name="expand">False</property> <property name="expand">False</property>
<property name="fill">False</property>
<property name="position">2</property> <property name="position">2</property>
</packing> </packing>
</child> </child>

6
panels/display/xrandr-capplet.c
View file

@ -59,7 +59,6 @@ struct App
GtkWidget *resolution_combo; GtkWidget *resolution_combo;
GtkWidget *rotation_combo; GtkWidget *rotation_combo;
GtkWidget *clone_checkbox; GtkWidget *clone_checkbox;
GtkWidget *primary_display_checkbox;
GtkWidget *clone_label; GtkWidget *clone_label;
GtkWidget *show_icon_checkbox; GtkWidget *show_icon_checkbox;
@ -668,7 +667,6 @@ rebuild_gui (App *app)
#if 0 #if 0
g_debug ("sensitive: %d, on: %d", sensitive, app->current_output->on); g_debug ("sensitive: %d, on: %d", sensitive, app->current_output->on);
#endif #endif
gtk_widget_set_sensitive (app->primary_display_checkbox, sensitive);
app->ignore_gui_changes = FALSE; app->ignore_gui_changes = FALSE;
} }
@ -2372,13 +2370,9 @@ run_application (void)
g_signal_connect (_gtk_builder_get_widget (builder, "detect_displays_button"), g_signal_connect (_gtk_builder_get_widget (builder, "detect_displays_button"),
"clicked", G_CALLBACK (on_detect_displays), app); "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->resolution_combo, 4);
make_text_combo (app->rotation_combo, -1); make_text_combo (app->rotation_combo, -1);
g_assert (app->primary_display_checkbox);
/* Scroll Area */ /* Scroll Area */
app->area = (GtkWidget *)foo_scroll_area_new (); app->area = (GtkWidget *)foo_scroll_area_new ();