Merge lp:~mathias-porten/switchboard-plug-notifications/fix-label-layout into lp:~elementary-pantheon/switchboard-plug-notifications/trunk

Proposed by mporten
Status: Merged
Approved by: Danielle Foré
Approved revision: 123
Merged at revision: 122
Proposed branch: lp:~mathias-porten/switchboard-plug-notifications/fix-label-layout
Merge into: lp:~elementary-pantheon/switchboard-plug-notifications/trunk
Diff against target: 32 lines (+4/-4)
1 file modified
src/Widgets/AppSettings.vala (+4/-4)
To merge this branch: bzr merge lp:~mathias-porten/switchboard-plug-notifications/fix-label-layout
Reviewer Review Type Date Requested Status
Danielle Foré Needs Fixing
Review via email: mp+271206@code.launchpad.net

Commit message

* use h2 for title
* Set text to left justify

Description of the change

Fixed bugs lp:1496101 and lp:1496103

To post a comment you must log in.
Revision history for this message
Danielle Foré (danrabbit) wrote :

Oops, this is a bit wrong :p

The "bubbles" label should not have h2. "apptitle" is the label to give h2.

review: Needs Fixing
123. By mporten

use h2 for title

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/Widgets/AppSettings.vala'
2--- src/Widgets/AppSettings.vala 2015-01-07 20:34:28 +0000
3+++ src/Widgets/AppSettings.vala 2015-09-16 18:52:26 +0000
4@@ -87,7 +87,7 @@
5 bubblesinfo.vexpand = false;
6 bubblesinfo.margin_bottom = 9;
7 bubblesinfo.wrap = true;
8- bubblesinfo.justify = Gtk.Justification.FILL;
9+ bubblesinfo.justify = Gtk.Justification.LEFT;
10 this.attach (bubblesinfo, 2, 3, 1, 1);
11
12 soundsimage = new Gtk.Image.from_file (Constants.PKGDATADIR + "/sounds.svg");
13@@ -126,7 +126,7 @@
14 soundsinfo.vexpand = false;
15 soundsinfo.margin_bottom = 9;
16 soundsinfo.wrap = true;
17- soundsinfo.justify = Gtk.Justification.FILL;
18+ soundsinfo.justify = Gtk.Justification.LEFT;
19 this.attach (soundsinfo, 2, 6, 1, 1);
20
21 this.show_all ();
22@@ -138,8 +138,8 @@
23 }
24
25 public void set_apptitle (string title) {
26- apptitle.set_label (@"<span font_weight=\"bold\" size=\"x-large\">$title</span>");
27- apptitle.set_use_markup (true);
28+ apptitle.set_label (title);
29+ apptitle.get_style_context ().add_class ("h2");
30 }
31
32 public void set_bubbles (string bubbles) {

Subscribers

People subscribed via source and target branches

to all changes: