← Back to branch summary

~elementary-os/elementaryos/os-patch-gnome-control-center-precise

« back to all changes in this revision

Viewing changes to debian/patches/11_power-configure_lid_action.patch

  • Committer: Sergey "Shnatsel" Davidoff
  • Date: 2012-05-18 13:02:50 UTC
  • Revision ID: shnatsel@gmail.com-20120518130250-2u99ldq61a42rbt7
Initial import, version 1:3.4.1-0ubuntu2

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/11_power-configure_lid_action.patch
 
1
Subject: [PATCH] power: Add configuration for lid action
 
2
Bug: https://bugzilla.gnome.org/show_bug.cgi?id=659045
 
3
Bug-Ubuntu: https://bugs.launchpad.net/bugs/792636
 
4
Index: gnome-control-center-3.3.91/panels/power/cc-power-panel.c
 
5
===================================================================
 
6
--- gnome-control-center-3.3.91.orig/panels/power/cc-power-panel.c      2012-03-05 15:04:55.000000000 +0100
 
7
+++ gnome-control-center-3.3.91/panels/power/cc-power-panel.c   2012-03-06 17:52:23.007083396 +0100
 
8
@@ -922,6 +922,7 @@
 
9
 set_ac_battery_ui_mode (CcPowerPanel *self)
 
10
 {
 
11
   gboolean has_batteries = FALSE;
 
12
+  gboolean has_lid = FALSE;
 
13
   gboolean ret;
 
14
   GError *error = NULL;
 
15
   GPtrArray *devices;
 
16
@@ -954,7 +955,13 @@
 
17
         }
 
18
     }
 
19
   g_ptr_array_unref (devices);
 
20
+
 
21
+  has_lid = up_client_get_lid_is_present (self->priv->up_client);
 
22
+
 
23
 out:
 
24
+  gtk_widget_set_visible (WID (priv->builder, "combobox_lid_ac"), has_lid);
 
25
+  gtk_widget_set_visible (WID (priv->builder, "label_lid_action"), has_lid);
 
26
+  gtk_widget_set_visible (WID (priv->builder, "combobox_lid_battery"), has_batteries && has_lid);    
 
27
   gtk_widget_set_visible (WID (priv->builder, "label_header_battery"), has_batteries);
 
28
   gtk_widget_set_visible (WID (priv->builder, "label_header_ac"), has_batteries);
 
29
   gtk_widget_set_visible (WID (priv->builder, "combobox_sleep_battery"), has_batteries);
 
30
@@ -1083,6 +1090,26 @@
 
31
                     G_CALLBACK (activate_link_cb),
 
32
                     self);
 
33
 
 
34
+  value = g_settings_get_enum (self->priv->gsd_settings, "lid-close-ac-action");
 
35
+  widget = GTK_WIDGET (gtk_builder_get_object (self->priv->builder,
 
36
+                                               "combobox_lid_ac"));
 
37
+  disable_unavailable_combo_items (self, GTK_COMBO_BOX (widget));
 
38
+  set_value_for_combo (GTK_COMBO_BOX (widget), value);
 
39
+  g_object_set_data (G_OBJECT(widget), "_gsettings_key", "lid-close-ac-action");
 
40
+  g_signal_connect (widget, "changed",
 
41
+                    G_CALLBACK (combo_enum_changed_cb),
 
42
+                    self);
 
43
+
 
44
+  value = g_settings_get_enum (self->priv->gsd_settings, "lid-close-battery-action");
 
45
+  widget = GTK_WIDGET (gtk_builder_get_object (self->priv->builder,
 
46
+                                               "combobox_lid_battery"));
 
47
+  disable_unavailable_combo_items (self, GTK_COMBO_BOX (widget));
 
48
+  set_value_for_combo (GTK_COMBO_BOX (widget), value);
 
49
+  g_object_set_data (G_OBJECT(widget), "_gsettings_key", "lid-close-battery-action");
 
50
+  g_signal_connect (widget, "changed",
 
51
+                    G_CALLBACK (combo_enum_changed_cb),
 
52
+                    self);
 
53
+
 
54
   widget = WID (self->priv->builder, "vbox_power");
 
55
   gtk_widget_reparent (widget, (GtkWidget *) self);
 
56
 }
 
57
Index: gnome-control-center-3.3.91/panels/power/power.ui
 
58
===================================================================
 
59
--- gnome-control-center-3.3.91.orig/panels/power/power.ui      2012-03-05 15:04:55.000000000 +0100
 
60
+++ gnome-control-center-3.3.91/panels/power/power.ui   2012-03-06 17:52:23.023083396 +0100
 
61
@@ -53,6 +53,33 @@
 
62
       </row>
 
63
     </data>
 
64
   </object>
 
65
+  <object class="GtkListStore" id="liststore_lid">
 
66
+    <columns>
 
67
+      <!-- column-name name -->
 
68
+      <column type="gchararray"/>
 
69
+      <!-- column-name value -->
 
70
+      <column type="gint"/>
 
71
+      <!-- column-name sensitive -->
 
72
+      <column type="gboolean"/>
 
73
+    </columns>
 
74
+    <data>
 
75
+      <row>
 
76
+        <col id="0" translatable="yes">Suspend</col>
 
77
+        <col id="1">1</col>
 
78
+        <col id="2">True</col>
 
79
+      </row>
 
80
+      <row>
 
81
+        <col id="0" translatable="yes">Hibernate</col>
 
82
+        <col id="1">3</col>
 
83
+        <col id="2">True</col>
 
84
+      </row>
 
85
+      <row>
 
86
+        <col id="0" translatable="yes">Do nothing</col>
 
87
+        <col id="1">5</col>
 
88
+        <col id="2">True</col>
 
89
+      </row>
 
90
+    </data>
 
91
+  </object>
 
92
   <object class="GtkWindow" id="window_power">
 
93
     <property name="can_focus">False</property>
 
94
     <property name="resizable">False</property>
 
95
@@ -172,6 +199,48 @@
 
96
                 <property name="top_attach">2</property>
 
97
               </packing>
 
98
             </child>
 
99
+            <child>
 
100
+              <object class="GtkLabel" id="label_lid_action">
 
101
+                <property name="visible">True</property>
 
102
+                <property name="can_focus">False</property>
 
103
+                <property name="halign">end</property>
 
104
+                <property name="label" translatable="yes">When the lid is closed</property>
 
105
+              </object>
 
106
+              <packing>
 
107
+                <property name="left_attach">0</property>
 
108
+                <property name="top_attach">3</property>
 
109
+              </packing>
 
110
+            </child>
 
111
+            <child>
 
112
+              <object class="GtkComboBox" id="combobox_lid_battery">
 
113
+                <property name="visible">True</property>
 
114
+                <property name="can_focus">False</property>
 
115
+                <property name="model">liststore_lid</property>
 
116
+                <property name="hexpand">True</property>
 
117
+                <accessibility>
 
118
+                  <relation type="labelled-by" target="label_lid_action"/>
 
119
+                </accessibility>
 
120
+              </object>
 
121
+              <packing>
 
122
+                <property name="left_attach">1</property>
 
123
+                <property name="top_attach">3</property>
 
124
+              </packing>
 
125
+            </child>
 
126
+            <child>
 
127
+              <object class="GtkComboBox" id="combobox_lid_ac">
 
128
+                <property name="visible">True</property>
 
129
+                <property name="can_focus">False</property>
 
130
+                <property name="model">liststore_lid</property>
 
131
+                <property name="hexpand">True</property>
 
132
+                <accessibility>
 
133
+                  <relation type="labelled-by" target="label_lid_action"/>
 
134
+                </accessibility>
 
135
+              </object>
 
136
+              <packing>
 
137
+                <property name="left_attach">2</property>
 
138
+                <property name="top_attach">3</property>
 
139
+              </packing>
 
140
+            </child>
 
141
           </object>
 
142
           <packing>
 
143
             <property name="expand">False</property>
 
144
@@ -352,9 +421,12 @@
 
145
   </object>
 
146
   <object class="GtkSizeGroup" id="sizegroup_combos">
 
147
     <widgets>
 
148
+      <widget name="combobox_lid_battery"/>
 
149
+      <widget name="combobox_lid_ac"/>    
 
150
       <widget name="combobox_critical"/>
 
151
       <widget name="combobox_sleep_battery"/>
 
152
       <widget name="combobox_sleep_ac"/>
 
153
+      <widget name="combobox_sleep_ac"/>
 
154
     </widgets>
 
155
   </object>
 
156
 </interface>