#
# Ubuntu: https://bugs.launchpad.net/bugs/224229
# Upstream: http://bugzilla.gnome.org/show_bug.cgi?id=545120
# Patch: http://bugzilla.gnome.org/attachment.cgi?id=130847&action=view
# Description: Make Display capplet fit in smaller screens
#
diff -Nur -x '*.orig' -x '*~' gnome-control-center-2.25.92/capplets/display/display-capplet.glade gnome-control-center-2.25.92.new/capplets/display/display-capplet.glade
--- gnome-control-center-2.25.92/capplets/display/display-capplet.glade 2009-03-17 15:50:52.000000000 -0400
+++ gnome-control-center-2.25.92.new/capplets/display/display-capplet.glade 2009-03-17 15:51:30.000000000 -0400
@@ -218,34 +218,13 @@
True
- 3
+ 2
5
False
6
12
-
- True
- Include _panel
- True
- GTK_RELIEF_NORMAL
- True
- False
- False
- True
-
-
- 3
- 5
- 1
- 2
- shrink|fill
-
-
-
-
-
True
_Resolution:
@@ -292,10 +271,10 @@
0
- 1
- 2
- 2
- 3
+ 3
+ 4
+ 0
+ 1
shrink|fill
@@ -322,8 +301,8 @@
3
4
- 2
- 3
+ 1
+ 2
shrink|fill
@@ -352,10 +331,10 @@
True
- 2
- 3
- 2
- 3
+ 4
+ 5
+ 0
+ 1
@@ -374,8 +353,8 @@
4
5
- 2
- 3
+ 1
+ 2
@@ -400,7 +379,7 @@
0
1
0
- 3
+ 2
fill
@@ -452,7 +431,7 @@
1
- 5
+ 3
0
1
fill
diff -Nur -x '*.orig' -x '*~' gnome-control-center-2.25.92/capplets/display/xrandr-capplet.c gnome-control-center-2.25.92.new/capplets/display/xrandr-capplet.c
--- gnome-control-center-2.25.92/capplets/display/xrandr-capplet.c 2009-03-17 15:50:52.000000000 -0400
+++ gnome-control-center-2.25.92.new/capplets/display/xrandr-capplet.c 2009-03-17 15:51:30.000000000 -0400
@@ -56,7 +56,6 @@
GtkWidget *resolution_combo;
GtkWidget *refresh_combo;
GtkWidget *rotation_combo;
- GtkWidget *panel_checkbox;
GtkWidget *clone_checkbox;
GtkWidget *show_icon_checkbox;
@@ -648,7 +647,6 @@
#if 0
g_debug ("sensitive: %d, on: %d", sensitive, app->current_output->on);
#endif
- gtk_widget_set_sensitive (app->panel_checkbox, sensitive);
app->ignore_gui_changes = FALSE;
@@ -914,8 +912,8 @@
}
}
-#define SPACE 15
-#define MARGIN 15
+#define SPACE 5
+#define MARGIN 5
static GList *
list_connected_outputs (App *app, int *total_w, int *total_h)
@@ -2214,21 +2212,17 @@
g_signal_connect (app->show_icon_checkbox, "toggled", G_CALLBACK (on_show_icon_toggled), app);
- app->panel_checkbox = glade_xml_get_widget (xml, "panel_checkbox");
-
make_text_combo (app->resolution_combo, 4);
make_text_combo (app->refresh_combo, 3);
make_text_combo (app->rotation_combo, -1);
- g_assert (app->panel_checkbox);
-
/* Scroll Area */
app->area = (GtkWidget *)foo_scroll_area_new ();
g_object_set_data (G_OBJECT (app->area), "app", app);
/* FIXME: this should be computed dynamically */
- foo_scroll_area_set_min_size (FOO_SCROLL_AREA (app->area), -1, 200);
+ foo_scroll_area_set_min_size (FOO_SCROLL_AREA (app->area), -1, 150);
gtk_widget_show (app->area);
g_signal_connect (app->area, "paint",
G_CALLBACK (on_area_paint), app);