~kroq-gar78/ubuntu/precise/gnome-control-center/fix-885947

« back to all changes in this revision

Viewing changes to debian/patches/90_gnome-mouse-properties_small_screen.patch

  • Committer: Bazaar Package Importer
  • Author(s): Rodrigo Moya
  • Date: 2011-05-17 10:47:27 UTC
  • mfrom: (0.1.11 experimental) (1.1.45 upstream)
  • Revision ID: james.westby@ubuntu.com-20110517104727-lqel6m8vhfw5jby1
Tags: 1:3.0.1.1-1ubuntu1
* Rebase on Debian, remaining Ubuntu changes:
* debian/control:
  - Build-Depend on hardening-wrapper, dpkg-dev and dh-autoreconf
  - Add dependency on ubuntu-system-service
  - Remove dependency on gnome-icon-theme-symbolic
  - Move dependency on apg, gnome-icon-theme-symbolic and accountsservice to
    be a Recommends: until we get them in main
* debian/rules:
  - Use autoreconf
  - Add binary-post-install rule for gnome-control-center-data
  - Run dh-autoreconf
* debian/gnome-control-center.dirs:
* debian/gnome-control-center.links:
  - Add a link to the control center shell for indicators
* debian/patches/00_disable-nm.patch:
  - Temporary patch to disable building with NetworkManager until we get
    the new one in the archive
* debian/patches/01_git_remove_gettext_calls.patch:
  - Remove calls to AM_GNU_GETTEXT, IT_PROG_INTLTOOL should be enough
* debian/patches/01_git_kill_warning.patch:
  - Kill warning
* debian/patches/50_ubuntu_systemwide_prefs.patch:
  - Ubuntu specific proxy preferences
* debian/patches/51_ubuntu_system_keyboard.patch:
  - Implement the global keyboard spec at https://wiki.ubuntu.com/DefaultKeyboardSettings

Show diffs side-by-side

added added

removed removed

Lines of Context:
1
 
Description: Add scrollbar on small screens in mouse properties
2
 
Author: ?
3
 
 
4
 
Index: gnome-control-center-2.29.4/capplets/mouse/gnome-mouse-properties.c
5
 
===================================================================
6
 
--- gnome-control-center-2.29.4.orig/capplets/mouse/gnome-mouse-properties.c    2009-12-04 17:11:07.000000000 +0000
7
 
+++ gnome-control-center-2.29.4/capplets/mouse/gnome-mouse-properties.c 2010-01-11 02:11:43.000000000 +0000
8
 
@@ -525,6 +525,62 @@
9
 
                return NULL;
10
 
        }
11
 
 
12
 
+       if (gdk_screen_get_default () != NULL && gdk_screen_get_height (gdk_screen_get_default ()) <= 600) {
13
 
+               GtkWidget *scrolledWindow1024x600_1, *viewport_1;
14
 
+               GtkWidget *scrolledWindow1024x600_2, *viewport_2;
15
 
+               GtkWidget *dialogWindow = NULL;
16
 
+               GtkWidget *child, *mother, *childtablabel, *childmenulabel;
17
 
+               gchar* childlabeltext;
18
 
+               int pagenum;
19
 
+
20
 
+               /* add scrolledbar to general_vbox */
21
 
+               child = GTK_WIDGET (gtk_builder_get_object (dialog,"general_vbox"));
22
 
+               if (child != NULL) {
23
 
+               mother = gtk_widget_get_parent (child);
24
 
+               pagenum = gtk_notebook_page_num (GTK_NOTEBOOK (mother), child);
25
 
+               childtablabel = gtk_notebook_get_tab_label (GTK_NOTEBOOK (mother),child);
26
 
+               childmenulabel = gtk_notebook_get_menu_label (GTK_NOTEBOOK (mother), child);
27
 
+               childlabeltext = g_strdup (gtk_notebook_get_tab_label_text (GTK_NOTEBOOK (mother), GTK_WIDGET (child)));
28
 
+               scrolledWindow1024x600_1 = gtk_scrolled_window_new (NULL,NULL);
29
 
+               if (scrolledWindow1024x600_1 != NULL) {
30
 
+                       gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolledWindow1024x600_1), GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC);
31
 
+               }
32
 
+               viewport_1 = gtk_viewport_new (NULL, NULL);
33
 
+               gtk_container_add (GTK_CONTAINER (scrolledWindow1024x600_1), GTK_WIDGET (viewport_1));
34
 
+               gtk_widget_show (scrolledWindow1024x600_1);
35
 
+               gtk_widget_show (viewport_1);
36
 
+               gtk_widget_reparent (GTK_WIDGET (child), GTK_WIDGET (viewport_1));
37
 
+               gtk_notebook_insert_page_menu (GTK_NOTEBOOK (mother), GTK_WIDGET (scrolledWindow1024x600_1), NULL, childmenulabel, pagenum);
38
 
+               gtk_notebook_set_tab_label_text (GTK_NOTEBOOK (mother), GTK_WIDGET (scrolledWindow1024x600_1), childlabeltext);
39
 
+               }
40
 
+
41
 
+               /* add scrolledbar to accessibility_vbox */
42
 
+               child = GTK_WIDGET (gtk_builder_get_object (dialog, "accessibility_vbox"));
43
 
+               if (child != NULL) {
44
 
+                       mother = gtk_widget_get_parent (child);
45
 
+                       pagenum = gtk_notebook_page_num (GTK_NOTEBOOK (mother), child);
46
 
+                       childtablabel = gtk_notebook_get_tab_label (GTK_NOTEBOOK (mother), child);
47
 
+                       childmenulabel = gtk_notebook_get_menu_label (GTK_NOTEBOOK (mother), child);
48
 
+                       childlabeltext = g_strdup (gtk_notebook_get_tab_label_text (GTK_NOTEBOOK (mother), GTK_WIDGET (child)));
49
 
+                       scrolledWindow1024x600_2 = gtk_scrolled_window_new (NULL,NULL);
50
 
+                       if (scrolledWindow1024x600_2 != NULL) {
51
 
+                               gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolledWindow1024x600_2), GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC);
52
 
+                       }
53
 
+                       viewport_2 = gtk_viewport_new (NULL,NULL);
54
 
+                       gtk_container_add (GTK_CONTAINER (scrolledWindow1024x600_2), GTK_WIDGET (viewport_2));
55
 
+                       gtk_widget_show (scrolledWindow1024x600_2);
56
 
+                       gtk_widget_show (viewport_2);
57
 
+                       gtk_widget_reparent (GTK_WIDGET (child), GTK_WIDGET (viewport_2));
58
 
+                       gtk_notebook_insert_page_menu (GTK_NOTEBOOK (mother), GTK_WIDGET (scrolledWindow1024x600_2), NULL, childmenulabel, pagenum);
59
 
+                       gtk_notebook_set_tab_label_text (GTK_NOTEBOOK (mother), GTK_WIDGET (scrolledWindow1024x600_2), childlabeltext);
60
 
+               }
61
 
+
62
 
+               /* set default size of dialog smaller */
63
 
+               dialogWindow = GTK_WIDGET (gtk_builder_get_object (dialog, "mouse_properties_dialog"));
64
 
+               if (dialogWindow != NULL) {
65
 
+                       gtk_window_set_default_size (GTK_WINDOW (dialogWindow), -1, 448);
66
 
+               }
67
 
+       }
68
 
        size_group = gtk_size_group_new (GTK_SIZE_GROUP_HORIZONTAL);
69
 
        gtk_size_group_add_widget (size_group, WID ("acceleration_label"));
70
 
        gtk_size_group_add_widget (size_group, WID ("sensitivity_label"));