← Back to branch summary

~nathwill-deactivatedaccount-deactivatedaccount/ubuntu/precise/gnome-control-center/fix-lp-978118

« back to all changes in this revision

Viewing changes to debian/patches/04_new_appearance_settings.patch

  • Committer: Package Import Robot
  • Author(s): Didier Roche
  • Date: 2012-02-21 13:06:43 UTC
  • Revision ID: package-import@ubuntu.com-20120221130643-s8hcdw2tg48sbfmm
Tags: 1:3.3.5-0ubuntu4
* debian/patches/04_new_appearance_settings.patch:
  - remove the "launcher reveal option" as unsure that the unity side
    will be ready on time.
  - make some pixel tweaking as asked by design

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/04_new_appearance_settings.patch
1
1
Index: gnome-control-center-3.3.5/configure.ac
2
2
===================================================================
3
 
--- gnome-control-center-3.3.5.orig/configure.ac        2012-02-12 13:01:10.789224493 -0500
4
 
+++ gnome-control-center-3.3.5/configure.ac     2012-02-12 13:01:13.057235735 -0500
 
3
--- gnome-control-center-3.3.5.orig/configure.ac        2012-02-07 19:41:46.000000000 +0100
 
4
+++ gnome-control-center-3.3.5/configure.ac     2012-02-21 12:03:28.421673893 +0100
5
5
@@ -96,7 +96,7 @@
6
6
 PKG_CHECK_MODULES(LIBSHORTCUTS, $COMMON_MODULES x11)
7
7
 PKG_CHECK_MODULES(SHELL, $COMMON_MODULES libgnome-menu-3.0 gio-unix-2.0)
13
13
                   polkit-gobject-1 >= $POLKIT_REQUIRED_VERSION
14
14
Index: gnome-control-center-3.3.5/panels/background/background.ui
15
15
===================================================================
16
 
--- gnome-control-center-3.3.5.orig/panels/background/background.ui     2012-02-12 13:01:06.909205250 -0500
17
 
+++ gnome-control-center-3.3.5/panels/background/background.ui  2012-02-12 13:05:08.466403070 -0500
 
16
--- gnome-control-center-3.3.5.orig/panels/background/background.ui     2012-01-30 15:13:19.000000000 +0100
 
17
+++ gnome-control-center-3.3.5/panels/background/background.ui  2012-02-21 12:55:09.465051137 +0100
18
18
@@ -1,7 +1,6 @@
19
19
-<?xml version="1.0"?>
20
20
+<?xml version="1.0" encoding="UTF-8"?>
24
24
   <object class="GtkListStore" id="sources-liststore">
25
25
     <columns>
26
26
       <!-- column-name source-name -->
27
 
@@ -12,321 +11,917 @@
 
27
@@ -12,321 +11,920 @@
28
28
       <column type="gpointer"/>
29
29
     </columns>
30
30
   </object>
124
124
-                <property name="column_spacing">0</property>
125
125
-                <property name="margin">0</property>
126
126
+                <property name="can_focus">False</property>
 
127
+                <property name="margin_right">4</property>
127
128
+                <property name="border_width">10</property>
128
129
+                <property name="spacing">12</property>
129
130
                 <child>
402
403
+                    </child>
403
404
+                    <child>
404
405
+                      <object class="GtkScrolledWindow" id="scrolledwindow1">
405
 
+                        <property name="width_request">265</property>
 
406
+                        <property name="width_request">262</property>
406
407
+                        <property name="height_request">260</property>
407
408
+                        <property name="visible">True</property>
408
409
+                        <property name="can_focus">True</property>
556
557
-                <property name="sensitive">False</property>
557
558
+                <property name="can_focus">False</property>
558
559
+                <property name="margin_left">5</property>
559
 
+                <property name="margin_right">5</property>
 
560
+                <property name="margin_right">13</property>
560
561
               </object>
561
562
               <packing>
562
563
                 <property name="expand">False</property>
619
620
+                </child>
620
621
+                <child>
621
622
+                  <object class="GtkComboBox" id="theme-selector">
622
 
+                    <property name="width_request">220</property>
 
623
+                    <property name="width_request">268</property>
623
624
+                    <property name="visible">True</property>
624
625
+                    <property name="can_focus">False</property>
 
626
+                    <property name="margin_right">1</property>
625
627
+                    <property name="model">theme-list-store</property>
626
628
+                    <property name="id_column">0</property>
627
629
+                    <child>
655
657
-                <property name="label">1280x700px</property>
656
658
+                <property name="can_focus">False</property>
657
659
+                <property name="margin_left">5</property>
658
 
+                <property name="margin_right">5</property>
 
660
+                <property name="margin_right">13</property>
659
661
               </object>
660
662
               <packing>
661
663
-                <property name="position">1</property>
721
723
                 <child>
722
724
-                  <object class="GtkLabel" id="strut">
723
725
+                  <object class="GtkScale" id="unity-iconsize-scale">
724
 
+                    <property name="width_request">250</property>
 
726
+                    <property name="width_request">264</property>
725
727
                     <property name="visible">True</property>
726
728
-                    <property name="label" translatable="no"> </property>
727
729
+                    <property name="can_focus">True</property>
 
730
+                    <property name="margin_right">2</property>
728
731
+                    <property name="round_digits">0</property>
729
732
+                    <property name="digits">0</property>
730
733
+                    <property name="value_pos">left</property>
839
842
+                        </child>
840
843
+                        <child>
841
844
+                          <object class="GtkBox" id="box2">
842
 
+                            <property name="visible">True</property>
843
845
+                            <property name="can_focus">False</property>
 
846
+                            <property name="no_show_all">True</property>
844
847
+                            <property name="margin_left">10</property>
845
848
+                            <property name="margin_top">9</property>
846
849
+                            <property name="orientation">vertical</property>
1155
1158
     </child>
1156
1159
   </object>
1157
1160
   <object class="GtkSizeGroup" id="sizegroup">
1158
 
@@ -338,38 +933,4 @@
 
1161
@@ -338,38 +936,4 @@
1159
1162
       <widget name="strut"/>
1160
1163
     </widgets>
1161
1164
   </object>
1196
1199
 </interface>
1197
1200
Index: gnome-control-center-3.3.5/panels/background/cc-background-panel.c
1198
1201
===================================================================
1199
 
--- gnome-control-center-3.3.5.orig/panels/background/cc-background-panel.c     2012-02-12 13:01:06.933205369 -0500
1200
 
+++ gnome-control-center-3.3.5/panels/background/cc-background-panel.c  2012-02-12 13:01:13.057235735 -0500
 
1202
--- gnome-control-center-3.3.5.orig/panels/background/cc-background-panel.c     2012-01-30 15:13:19.000000000 +0100
 
1203
+++ gnome-control-center-3.3.5/panels/background/cc-background-panel.c  2012-02-21 12:03:22.657645317 +0100
1201
1204
@@ -24,6 +24,7 @@
1202
1205
 #include <string.h>
1203
1206
 #include <glib/gi18n-lib.h>
1314
1317
 
1315
1318
       gdk_color_parse (cc_background_item_get_pcolor (priv->current_background), &pcolor);
1316
1319
       gdk_color_parse (cc_background_item_get_scolor (priv->current_background), &scolor);
1317
 
@@ -1162,12 +1215,492 @@
 
1320
@@ -1162,12 +1215,493 @@
1318
1321
   g_strfreev(uris);
1319
1322
 }
1320
1323
 
1480
1483
+  gboolean modified_ext_tool = FALSE;
1481
1484
+
1482
1485
+  // reveal side
1483
 
+  modified_ext_tool = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (WID ("unity_reveal_spot_otheroption")));
 
1486
+  /* COMMENTED FOR NOW AS LONG AS UPSTREAM DON'T SUPPORT IT
 
1487
+modified_ext_tool = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (WID ("unity_reveal_spot_otheroption"))); */
1484
1488
+
1485
1489
+  // autohide mode
1486
1490
+  if (!modified_ext_tool && (!gtk_widget_get_sensitive (WID ("unity_launcher_autohide"))))
1808
1812
   GError *err = NULL;
1809
1813
   GtkWidget *widget;
1810
1814
   GtkListStore *store;
1811
 
@@ -1177,9 +1710,14 @@
 
1815
@@ -1177,9 +1711,14 @@
1812
1816
 
1813
1817
   priv->builder = gtk_builder_new ();
1814
1818
 
1826
1830
 
1827
1831
   if (err)
1828
1832
     {
1829
 
@@ -1230,7 +1768,10 @@
 
1833
@@ -1230,7 +1769,10 @@
1830
1834
 
1831
1835
 
1832
1836
   /* add the top level widget */
1838
1842
 
1839
1843
   gtk_container_add (GTK_CONTAINER (self), widget);
1840
1844
   gtk_widget_show_all (GTK_WIDGET (self));
1841
 
@@ -1301,6 +1842,16 @@
 
1845
@@ -1301,6 +1843,16 @@
1842
1846
 
1843
1847
   /* Setup the edit box with our current settings */
1844
1848
   source_update_edit_box (priv, TRUE);
1857
1861
 void
1858
1862
Index: gnome-control-center-3.3.5/panels/background/gnome-background-panel.desktop.in.in
1859
1863
===================================================================
1860
 
--- gnome-control-center-3.3.5.orig/panels/background/gnome-background-panel.desktop.in.in      2012-02-12 13:01:06.969205542 -0500
1861
 
+++ gnome-control-center-3.3.5/panels/background/gnome-background-panel.desktop.in.in   2012-02-12 13:01:13.057235735 -0500
 
1864
--- gnome-control-center-3.3.5.orig/panels/background/gnome-background-panel.desktop.in.in      2012-01-30 15:13:19.000000000 +0100
 
1865
+++ gnome-control-center-3.3.5/panels/background/gnome-background-panel.desktop.in.in   2012-02-21 12:03:22.657645317 +0100
1862
1866
@@ -1,6 +1,6 @@
1863
1867
 [Desktop Entry]
1864
1868
-_Name=Background