Merge lp:~robert-ancell/activity-log-manager/panel-width into lp:activity-log-manager

Proposed by Robert Ancell on 2014-02-03
Status: Merged
Merge reported by: Robert Ancell
Merged at revision: not available
Proposed branch: lp:~robert-ancell/activity-log-manager/panel-width
Merge into: lp:activity-log-manager
Diff against target: 87 lines (+12/-5)
3 files modified
data/whoopsie.ui (+3/-0)
src/diagnostics-widget.c (+5/-2)
src/unified-privacy.vala (+4/-3)
To merge this branch: bzr merge lp:~robert-ancell/activity-log-manager/panel-width
Reviewer Review Type Date Requested Status
PS Jenkins bot continuous-integration Needs Fixing on 2014-02-06
Activity Log Manager 2014-02-03 Pending
Review via email: mp+204452@code.launchpad.net

Commit message

Stop control center panel from expanding too wide

To post a comment you must log in.
86. By Robert Ancell on 2014-02-03

Make whoopsie preferences not expand

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'data/whoopsie.ui'
2--- data/whoopsie.ui 2013-07-19 10:31:55 +0000
3+++ data/whoopsie.ui 2014-02-03 11:32:22 +0000
4@@ -23,6 +23,7 @@
5 <property name="can_focus">False</property>
6 <property name="xalign">0</property>
7 <property name="label" translatable="yes">Ubuntu can collect anonymous information that helps developers improve it. All information collected is covered by our privacy policy.</property>
8+ <property name="max_width_chars">60</property>
9 <property name="wrap">True</property>
10 </object>
11 <packing>
12@@ -147,6 +148,7 @@
13 <property name="xalign">0</property>
14 <property name="label" translatable="yes">&lt;small&gt;Error reports include information about what a program was doing when it failed. You always have the choice to send or cancel an error report.&lt;/small&gt;</property>
15 <property name="use_markup">True</property>
16+ <property name="max_width_chars">60</property>
17 <property name="wrap">True</property>
18 </object>
19 <packing>
20@@ -256,6 +258,7 @@
21 <property name="xpad">24</property>
22 <property name="label" translatable="yes">&lt;small&gt;This includes things like how many programs are running, how much disk space the computer has, and what devices are connected.&lt;/small&gt;</property>
23 <property name="use_markup">True</property>
24+ <property name="max_width_chars">60</property>
25 <property name="wrap">True</property>
26 </object>
27 <packing>
28
29=== modified file 'src/diagnostics-widget.c'
30--- src/diagnostics-widget.c 2013-07-19 10:31:55 +0000
31+++ src/diagnostics-widget.c 2014-02-03 11:32:22 +0000
32@@ -191,10 +191,13 @@
33 GtkWidget* show_previous_reports = NULL;
34 WhoopsieDaisyPreferencesPrivate* priv;
35 priv = self->priv = WHOOPSIE_DAISY_PREFERENCES_PRIVATE (self);
36+ gchar **objects;
37
38 priv->builder = gtk_builder_new ();
39 gtk_builder_set_translation_domain (priv->builder, GETTEXT_PACKAGE);
40- gtk_builder_add_from_file(priv->builder, GNOMECC_UI_DIR "/whoopsie.ui", &error);
41+ objects = g_strsplit ("privacy_page_box", ":", -1);
42+ gtk_builder_add_objects_from_file(priv->builder, GNOMECC_UI_DIR "/whoopsie.ui", objects, &error);
43+ g_strfreev (objects);
44 if (error != NULL) {
45 g_warning ("Could not load interface file: %s", error->message);
46 g_error_free (error);
47@@ -214,7 +217,7 @@
48 show_previous_reports = GTK_WIDGET (
49 gtk_builder_get_object (priv->builder, "show_previous_reports"));
50
51- gtk_widget_reparent (privacy_page, (GtkWidget *) self);
52+ gtk_box_pack_start (GTK_BOX (self), privacy_page, TRUE, TRUE, 0);
53 g_object_set (self, "valign", GTK_ALIGN_START, NULL);
54
55 priv->permission = polkit_permission_new_sync (POL_PATH, NULL, NULL, &error);
56
57=== modified file 'src/unified-privacy.vala'
58--- src/unified-privacy.vala 2013-07-11 02:13:34 +0000
59+++ src/unified-privacy.vala 2014-02-03 11:32:22 +0000
60@@ -176,6 +176,7 @@
61 label.set_line_wrap(true);
62 label.set_line_wrap_mode(Pango.WrapMode.WORD);
63 label.set_alignment(0, 0.5f);
64+ label.set_max_width_chars(60);
65 this.pack_start(label, false);
66
67 record_button = new Switch();
68@@ -250,7 +251,7 @@
69 al.add (checkbox_label);
70
71 var checkbox_vbox = new Box(Orientation.VERTICAL, 0);
72- checkbox_vbox.pack_start (al, false);
73+ checkbox_vbox.pack_start (al, false, false, 5);
74 checkbox_vbox.pack_start (checkbox_hbox, true);
75
76 //Exception List
77@@ -328,8 +329,8 @@
78
79 exception_vbox.pack_start(exception_toolbar, false, false);
80
81- var general_hbox = new Box(Orientation.HORIZONTAL, 0);
82- general_hbox.pack_start(checkbox_vbox, true);
83+ var general_hbox = new Box(Orientation.HORIZONTAL, 5);
84+ general_hbox.pack_start(checkbox_vbox, false);
85 general_hbox.pack_start(exception_vbox, true);
86
87 this.pack_start(general_hbox, false);

Subscribers

People subscribed via source and target branches