Merge lp:~l-admin-3/switchboard-plug-notifications/code-cleanup-and-new-backend into lp:~elementary-pantheon/switchboard-plug-notifications/trunk

[Marcus Wichelmann]

Code cleanup and new backend

This branch removes the old backend code that was mixed with the gui code and replaces it with a new separated backend. The app-id list is now based on the registered desktop files which are making use of the the x-notify key. Also the settings are now saved using child-schemas so there is no need for the string splitting anymore and the performance of the plug far better.
The control whether apps are listed in the notification-center is handled by the plug now, too.

Please test if everything works as expected and if there are any regressions.

[lp:~l-admin-3/switchboard-plug-notifications/code-cleanup-and-new-backend]

124. By Marcus Wichelmann on 2015-09-15

Update translations

125. By Marcus Wichelmann on 2015-09-15

apps -> applications

126. By Marcus Wichelmann on 2015-09-15

Resolve conflicts; Update to trunk

[Danielle Foré (danrabbit)]

It looks like there's a regression in the sidebar with the size of the "Bubbles sounds" etc text.

Might want to reduce your row spacing to something more sane like 32 instead of 60.

Needs merge conflicts resolved

review: Needs Fixing

[lp:~l-admin-3/switchboard-plug-notifications/code-cleanup-and-new-backend]

127. By Marcus Wichelmann on 2015-09-15

Change row-spacing in settings view to 32

128. By Marcus Wichelmann on 2015-09-15

Move some app related code to the App class

129. By Marcus Wichelmann on 2015-09-15

Use small text for description labels for apps

130. By Marcus Wichelmann on 2015-09-15

Replace placeholder with new notify-center image by Dan

[Danielle Foré (danrabbit)]

I can't confirm that the notification center control actually works, but everything else looks okay here :)

[Rico Tzschichholz (ricotz)]

A bunch of general code-design issues.

Construction: Use gobject-style construction. Use construct { ... } instead of private methods which called onece (build_ui, connect).

Properties: Only use "construct set;" if needed otherwise "construct;"

Arguments: Don't pass general arguments which can be created with already given information. Don't hold references to the same object in different local fields/properties.

Signals: Avoid using lambdas if you can pass existing callbacks/methods directly, or if it is possible to easily create one.

...

review: Needs Fixing

[Rico Tzschichholz (ricotz)]

Invocations: Avoid calling the very same function/retrieving the very same object multiple times in the same context/scope.

...

review: Needs Fixing

[lp:~l-admin-3/switchboard-plug-notifications/code-cleanup-and-new-backend]

131. By Marcus Wichelmann on 2015-09-16

Code-style improvements.

[Marcus Wichelmann (l-admin-3)]

Okay, I've updated the code and changed some things.

[lp:~l-admin-3/switchboard-plug-notifications/code-cleanup-and-new-backend]

132. By Marcus Wichelmann on 2015-09-16

Revert notify_manager fields and use them only inside methods

133. By Marcus Wichelmann on 2015-09-16

Don't create two variables for option widget

[xapantu (xapantu)]

Conflicts with trunk.

The code looks rather fine, I am not a big fan of the use of private everywhere, but that's not important. You also seem to like the use of Gtk.Grid, maybe too much, but that's your choice.

That would need more testing I think. Please fix the conflict so as we can merge this :)

review: Needs Fixing

[lp:~l-admin-3/switchboard-plug-notifications/code-cleanup-and-new-backend]

134. By Marcus Wichelmann on 2015-09-22

Adopt renamed notification-center key.

135. By Marcus Wichelmann on 2015-09-22

Relove merge conflicts

136. By Marcus Wichelmann on 2015-09-22

Fix bug with app permission description

[Rico Tzschichholz (ricotz)]

review: Abstain

[lp:~l-admin-3/switchboard-plug-notifications/code-cleanup-and-new-backend]

137. By Marcus Wichelmann on 2015-09-22

Use make get_default () methods unowned.

138. By Marcus Wichelmann on 2015-09-22

Change field/method order

[xapantu (xapantu)]

That does not work here, this is a fix that seems to work:
=== modified file 'src/Backend/App.vala'
--- src/Backend/App.vala 2015-09-16 17:24:11 +0000
+++ src/Backend/App.vala 2015-10-11 10:01:12 +0000
@@ -29,6 +29,6 @@
         Object (app_info: app_info);

         app_id = app_info.get_id ().replace (".desktop", "");
- settings = new Settings.full (SettingsSchemaSource.get_default ().lookup (CHILD_SCHEMA_ID, false), null, CHILD_PATH.printf (app_id));
+ settings = new Settings.full (SettingsSchemaSource.get_default ().lookup (CHILD_SCHEMA_ID, true), null, CHILD_PATH.printf (app_id));
     }
-}
\ No newline at end of file
+}

See the doc for the rationale https://developer.gnome.org/gio/stable/gio-GSettingsSchema-GSettingsSchemaSource.html#g-settings-schema-source-get-default

The code looks fine, if you apply the patch above, feel free to merge it.

review: Approve

[lp:~l-admin-3/switchboard-plug-notifications/code-cleanup-and-new-backend]

139. By Marcus Wichelmann on 2015-10-11

Apply settins patch by xapantu

140. By Marcus Wichelmann on 2015-10-11

Resolve merge conflicts

=== added file 'data/notify-center.svg'
--- data/notify-center.svg	1970-01-01 00:00:00 +0000
+++ data/notify-center.svg	2015-10-11 11:46:23 +0000
@@ -0,0 +1,81 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:cc="http://creativecommons.org/ns#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" width="124.056" height="86.056" id="svg4729" version="1.1" inkscape:version="0.48.4 r9939" sodipodi:docname="notify-center.svg">
+  <defs id="defs4731">
+    <linearGradient id="linearGradient3797">
+      <stop id="stop3799" offset="0" style="stop-color:#616c8c;stop-opacity:1;"/>
+      <stop id="stop3801" offset="1" style="stop-color:#6282ac;stop-opacity:1;"/>
+    </linearGradient>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient3924-4" id="linearGradient9678" gradientUnits="userSpaceOnUse" gradientTransform="matrix(2.6216216,0,0,0.43243243,359.32485,409.20951)" x1="23.99999" y1="4.999989" x2="23.99999" y2="43"/>
+    <linearGradient id="linearGradient3924-4">
+      <stop id="stop3926-8" style="stop-color:#ffffff;stop-opacity:1;" offset="0"/>
+      <stop offset="0.06316455" style="stop-color:#ffffff;stop-opacity:0.23529412;" id="stop3928-5"/>
+      <stop id="stop3930-6-4" style="stop-color:#ffffff;stop-opacity:0.15686275;" offset="0.95056331"/>
+      <stop id="stop3932-25" style="stop-color:#ffffff;stop-opacity:0.39215687;" offset="1"/>
+    </linearGradient>
+    <linearGradient id="linearGradient5717">
+      <stop style="stop-color:#fafafa;stop-opacity:1" offset="0" id="stop5719"/>
+      <stop style="stop-color:#e7eef3;stop-opacity:1;" offset="1" id="stop5721"/>
+    </linearGradient>
+    <linearGradient id="linearGradient5709">
+      <stop style="stop-color:#bec3d2;stop-opacity:1;" offset="0" id="stop5711"/>
+      <stop style="stop-color:#b1c1d6;stop-opacity:1;" offset="1" id="stop5713"/>
+    </linearGradient>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient5717" id="linearGradient9688" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.33110384,0,0,0.32727369,484.49126,490.84661)" x1="-200.29341" y1="-321.39581" x2="-200.29341" y2="-266.54333"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient5709" id="linearGradient9690" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.33110384,0,0,0.32727369,484.49126,490.84661)" x1="-320.87225" y1="-327.28119" x2="-320.87225" y2="-274.6741"/>
+    <filter color-interpolation-filters="sRGB" inkscape:collect="always" id="filter5705">
+      <feGaussianBlur inkscape:collect="always" stdDeviation="1.47" id="feGaussianBlur5707"/>
+    </filter>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient3797" id="linearGradient3795" x1="412.29114" y1="411.73077" x2="469.51785" y2="449.94507" gradientUnits="userSpaceOnUse"/>
+    <linearGradient y2="-310.18402" x2="787.31219" y1="-315.36099" x1="787.31219" gradientTransform="matrix(0.33110384,0,0,9.420807,149.46323,3383.4914)" gradientUnits="userSpaceOnUse" id="linearGradient4459-2" xlink:href="#linearGradient5717-7-0" inkscape:collect="always"/>
+    <linearGradient id="linearGradient5717-7-0">
+      <stop style="stop-color:#fafafa;stop-opacity:1" offset="0" id="stop5719-4-2"/>
+      <stop style="stop-color:#e7eef3;stop-opacity:1;" offset="1" id="stop5721-3-7"/>
+    </linearGradient>
+    <linearGradient y2="-310.14444" x2="920.43018" y1="-315.36102" x1="920.43018" gradientTransform="matrix(0.33110384,0,0,9.420807,149.46323,3383.4914)" gradientUnits="userSpaceOnUse" id="linearGradient4461-7" xlink:href="#linearGradient5709-7-1" inkscape:collect="always"/>
+    <linearGradient id="linearGradient5709-7-1">
+      <stop style="stop-color:#bec3d2;stop-opacity:1;" offset="0" id="stop5711-8-0"/>
+      <stop style="stop-color:#b1c1d6;stop-opacity:1;" offset="1" id="stop5713-2-3"/>
+    </linearGradient>
+  </defs>
+  <sodipodi:namedview id="base" pagecolor="#ffffff" bordercolor="#666666" borderopacity="1.0" inkscape:pageopacity="0.0" inkscape:pageshadow="2" inkscape:zoom="1" inkscape:cx="87" inkscape:cy="24.5" inkscape:document-units="px" inkscape:current-layer="layer1" showgrid="false" fit-margin-top="0" fit-margin-left="0" fit-margin-right="0" fit-margin-bottom="0" inkscape:window-width="1440" inkscape:window-height="845" inkscape:window-x="0" inkscape:window-y="30" inkscape:window-maximized="1" showguides="false">
+    <inkscape:grid type="xygrid" id="grid4301"/>
+  </sodipodi:namedview>
+  <metadata id="metadata4734">
+    <rdf:RDF>
+      <cc:Work rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
+        <dc:title/>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g inkscape:label="Ebene 1" inkscape:groupmode="layer" id="layer1" transform="translate(-360.21577,-385.05992)">
+    <rect style="opacity:0.15;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.99999976;marker:none;visibility:visible;display:inline;overflow:visible;filter:url(#filter5705);enable-background:accumulate" id="rect4888-5" width="117" height="79" x="363.74377" y="388.58792" rx="4" ry="3.9999998"/>
+    <rect style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#a2a6b0;stroke-width:0.99999976;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" id="rect4888" width="117" height="79" x="363.74377" y="387.58792" rx="4" ry="3.9999998"/>
+    <path style="opacity:0.95;color:#000000;fill:url(#linearGradient9688);fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient9690);stroke-width:0.9999218;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" d="m 367.74376,387.58791 c -2.216,0 -4,1.784 -4,4 l 0,10 117,0 0,-10 c 0,-2.216 -1.784,-4 -4,-4 z" id="rect4888-4" inkscape:connector-curvature="0" sodipodi:nodetypes="ssccsss"/>
+    <rect style="color:#000000;fill:none;stroke:#a2a6b0;stroke-width:0.99999976;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" id="rect4888-0" width="117" height="79" x="363.74377" y="387.58792" rx="4" ry="3.9999998"/>
+    <rect style="opacity:0.6;fill:none;stroke:url(#linearGradient9678);stroke-width:0.99999994;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" id="rect6741" y="411.58792" x="373.74377" ry="1" rx="1" height="16" width="97"/>
+    <path inkscape:connector-curvature="0" style="opacity:0.94999999999999996;color:#000000;fill:url(#linearGradient4459-2);fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient4461-7);stroke-width:0.99992179999999997;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" id="rect5212-7-5" d="m 457.21576,406.50654 -5.5313,6 -43.96869,0 c -2.216,0 -3.00004,0.78437 -3.00004,3.00038 l 0,43 c 0,2.216 0.78404,2.99962 3.00004,2.99963 l 65,3.7e-4 c 2.216,1e-5 2.99999,-0.784 2.99999,-3 l 0,-43 c 0,-2.216 -0.79239,-2.80814 -2.99999,-3.00037 l -9.96881,0 z" sodipodi:nodetypes="ccsssssssccc"/>
+    <g id="g4290" transform="matrix(0.73333333,0,0,0.73333333,448.96023,386.15458)" style="fill:#b5c4d8;fill-opacity:1">
+      <path d="m 13.59377,5.125 c -0.25424,0.11867 -0.45328,0.33403 -0.53125,0.625 -0.003,0.0105 0.002,0.0208 0,0.0312 -1.78508,-0.0144 -3.41627,1.17138 -3.90625,3 -0.006,0.0206 -0.0261,0.0419 -0.0312,0.0625 -0.51898,1.93691 -1.52877,5.80495 -3.25,5.34375 -0.11466,-0.0307 -0.2454,0.0537 -0.28125,0.1875 l -0.125,0.46875 c -0.0358,0.13378 0.0103,0.28177 0.125,0.3125 l 11.1875,2.96875 c 0.11467,0.0307 0.24541,-0.0225 0.28125,-0.15625 l 0.125,-0.5 c 0.0358,-0.13378 -0.0416,-0.25052 -0.15625,-0.28125 -1.72795,-0.463 -0.67515,-4.34469 -0.15625,-6.28125 0.006,-0.0204 -0.005,-0.0419 0,-0.0625 0.12115,-0.45213 0.15537,-0.90892 0.125,-1.34375 -1.93948,0 -3.5,-1.56051 -3.5,-3.5 0,-0.29885 0.0235,-0.59799 0.0937,-0.875 z m -2.59375,12.5 c 0.0827,0.77146 0.95012,1.375 2,1.375 0.57062,0 1.07313,-0.18127 1.4375,-0.46875 L 11.00002,17.625 z" id="rect3022" style="color:#bebebe;fill:#b5c4d8;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" inkscape:connector-curvature="0"/>
+      <path class="info" d="m 19.00002,6 a 2,2 0 0 1 -4,0 2,2 0 1 1 4,0 z" id="path3009" style="color:#000000;fill:#b5c4d8;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" inkscape:connector-curvature="0"/>
+      <g style="fill:#b5c4d8;fill-opacity:1;display:inline" id="layer10" transform="translate(-333.00018,430)"/>
+      <g style="fill:#b5c4d8;fill-opacity:1;display:inline" id="layer13" transform="translate(-333.00018,430)"/>
+      <g id="layer14" transform="translate(-333.00018,430)" style="fill:#b5c4d8;fill-opacity:1"/>
+      <g style="fill:#b5c4d8;fill-opacity:1;display:inline" id="layer15" transform="translate(-333.00018,430)"/>
+      <g style="fill:#b5c4d8;fill-opacity:1;display:inline" id="g71291" transform="translate(-333.00018,430)"/>
+      <g style="fill:#b5c4d8;fill-opacity:1;display:inline" id="g4953" transform="translate(-333.00018,430)"/>
+      <g style="fill:#b5c4d8;fill-opacity:1;display:inline" id="layer12" transform="translate(-333.00018,430)"/>
+    </g>
+    <rect style="opacity:0.95;color:#000000;fill:#b5c4d8;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.73333335;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" id="rect4584" width="8" height="8" x="410.21576" y="418.11591" rx="2" ry="2"/>
+    <rect style="opacity:0.95;color:#000000;fill:#b5c4d8;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.73333335;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" id="rect4584-9" width="20" height="2" x="420.21576" y="423.11591" rx="1" ry="1"/>
+    <rect style="opacity:0.95;color:#000000;fill:#b5c4d8;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.73333335;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" id="rect4584-9-0" width="8" height="2" x="420.21576" y="419.11591" rx="1" ry="1"/>
+    <rect style="opacity:0.95;color:#000000;fill:#b5c4d8;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.73333335;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" id="rect4584-8" width="8" height="8" x="410.21576" y="448.11591" rx="2" ry="2"/>
+    <rect style="opacity:0.95;color:#000000;fill:#b5c4d8;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.73333335;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" id="rect4584-9-3" width="24" height="2" x="420.21576" y="453.11591" rx="1" ry="1"/>
+    <rect style="opacity:0.95;color:#000000;fill:#b5c4d8;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.73333335;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" id="rect4584-9-0-7" width="16" height="2" x="420.21576" y="449.11591" rx="1" ry="1"/>
+    <rect style="opacity:0.95;color:#000000;fill:#b5c4d8;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.73333335;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" id="rect4584-0" width="8" height="8" x="410.21576" y="433.11591" rx="2" ry="2"/>
+    <rect style="opacity:0.95;color:#000000;fill:#b5c4d8;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.73333335;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" id="rect4584-9-32" width="32" height="2" x="420.21576" y="438.11591" rx="1" ry="1"/>
+    <rect style="opacity:0.95;color:#000000;fill:#b5c4d8;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.73333335;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" id="rect4584-9-0-2" width="12" height="2" x="420.21576" y="434.11591" rx="1" ry="1"/>
+  </g>
+</svg>
\ No newline at end of file

=== modified file 'po/notifications-plug.pot'
--- po/notifications-plug.pot	2015-02-03 15:05:53 +0000
+++ po/notifications-plug.pot	2015-10-11 11:46:23 +0000
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-02-03 16:05+0100\n"
+"POT-Creation-Date: 2015-09-22 15:49+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[e-mail]>\n"
@@ -17,85 +17,77 @@
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../src/Plug.vala:30
-msgid "Notifications"
-msgstr ""
-
-#: ../src/Plug.vala:31
-msgid "Enable or disable notifications."
-msgstr ""
-
-#: ../src/Plug.vala:43
-msgid "Nothing to do here"
-msgstr ""
-
-#: ../src/Plug.vala:44
-msgid ""
-"Notifications preferences are for configuring which apps make use of "
-"notifications, for changing how an app's notifications appear,\n"
-"and for setting when you do not want to be disturbed by notifications."
-msgstr ""
-
-#: ../src/Plug.vala:45
-msgid ""
-"When apps are installed that have notification options they will "
-"automatically appear here."
-msgstr ""
-
-#: ../src/Widgets/AppsView.vala:43
+#: ../src/Widgets/MainView.vala:62
 msgid "elementary OS is in Do Not Disturb mode"
 msgstr ""
 
-#: ../src/Widgets/AppsView.vala:44
+#: ../src/Widgets/MainView.vala:64
 msgid ""
 "While in Do Not Disturb mode, notifications and alerts will be hidden and "
 "notification sounds will be silenced."
 msgstr ""
 
-#: ../src/Widgets/AppsView.vala:45
+#: ../src/Widgets/MainView.vala:66
 msgid ""
 "System notifications, such as volume and display brightness, will be "
 "unaffected."
 msgstr ""
 
-#: ../src/Widgets/AppItem.vala:141 ../src/Widgets/AppSettings.vala:58
+#: ../src/Widgets/AppEntry.vala:77 ../src/Widgets/AppSettingsView.vala:54
 msgid "Bubbles"
 msgstr ""
 
-#: ../src/Widgets/AppItem.vala:144 ../src/Widgets/AppSettings.vala:99
+#: ../src/Widgets/AppEntry.vala:81 ../src/Widgets/AppSettingsView.vala:60
 msgid "Sounds"
 msgstr ""
 
-#: ../src/Widgets/AppItem.vala:147
+#: ../src/Widgets/AppEntry.vala:85 ../src/Widgets/AppSettingsView.vala:66
+msgid "Remember"
+msgstr ""
+
+#: ../src/Widgets/AppEntry.vala:89
 msgid "Disabled"
 msgstr ""
 
-#: ../src/Widgets/AppItem.vala:157
-msgid "Unknown"
-msgstr ""
-
-#: ../src/Widgets/AppItem.vala:159
-msgid "Sound Menu"
-msgstr ""
-
-#: ../src/Widgets/AppItem.vala:161
-msgid "Network"
-msgstr ""
-
-#: ../src/Widgets/AppItem.vala:163
-msgid "System Configuration"
-msgstr ""
-
-#: ../src/Widgets/Footer.vala:33
-msgid "Do Not Disturb"
-msgstr ""
-
-#: ../src/Widgets/AppSettings.vala:83
+#: ../src/Widgets/AppSettingsView.vala:55
 msgid ""
 "Bubbles appear in the top right corner of the display and disappear "
 "automatically."
 msgstr ""
 
-#: ../src/Widgets/AppSettings.vala:122
+#: ../src/Widgets/AppSettingsView.vala:61
 msgid "Sounds play once when a new notification arrives."
 msgstr ""
+
+#: ../src/Widgets/AppSettingsView.vala:67
+msgid "Show missed notifications in Notification Center."
+msgstr ""
+
+#: ../src/Widgets/Footer.vala:36
+msgid "Do Not Disturb"
+msgstr ""
+
+#: ../src/Plug.vala:29
+msgid "Notifications"
+msgstr ""
+
+#: ../src/Plug.vala:30
+msgid "Enable or disable notifications."
+msgstr ""
+
+#: ../src/Plug.vala:78
+msgid "Nothing to do here"
+msgstr ""
+
+#: ../src/Plug.vala:80
+msgid ""
+"Notifications preferences are for configuring which apps make use of "
+"notifications, for changing how an app's notifications appear,\n"
+"and for setting when you do not want to be disturbed by notifications."
+msgstr ""
+
+#: ../src/Plug.vala:82
+msgid ""
+"When apps are installed that have notification options they will "
+"automatically appear here."
+msgstr ""

=== added directory 'src/Backend'
=== added file 'src/Backend/App.vala'
--- src/Backend/App.vala	1970-01-01 00:00:00 +0000
+++ src/Backend/App.vala	2015-10-11 11:46:23 +0000
@@ -0,0 +1,34 @@
+/*
+ * Copyright (c) 2011-2015 elementary Developers
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public
+ * License along with this program; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ */
+
+public class Backend.App : Object {
+    private static const string CHILD_SCHEMA_ID = "org.pantheon.desktop.gala.notifications.application";
+    private static const string CHILD_PATH = "/org/pantheon/desktop/gala/notifications/applications/%s/";
+
+    public DesktopAppInfo app_info { get; construct; }
+    public string app_id { get; private set; }
+    public Settings settings { get; private set; }
+
+    public App (DesktopAppInfo app_info) {
+        Object (app_info: app_info);
+
+        app_id = app_info.get_id ().replace (".desktop", "");
+        settings = new Settings.full (SettingsSchemaSource.get_default ().lookup (CHILD_SCHEMA_ID, true), null, CHILD_PATH.printf (app_id));
+    }
+}
\ No newline at end of file

=== added file 'src/Backend/NotifyManager.vala'
--- src/Backend/NotifyManager.vala	1970-01-01 00:00:00 +0000
+++ src/Backend/NotifyManager.vala	2015-10-11 11:46:23 +0000
@@ -0,0 +1,63 @@
+/*
+ * Copyright (c) 2011-2015 elementary Developers
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public
+ * License along with this program; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ */
+
+public class Backend.NotifyManager : Object {
+    public static NotifyManager? instance = null;
+
+    public static unowned NotifyManager get_default () {
+        if (instance == null) {
+            instance = new NotifyManager ();
+        }
+
+        return instance;
+    }
+
+    public bool do_not_disturb { get; set; }
+    public Gee.HashMap<string, App> apps { get; construct; } /* string: app-id */
+
+    public string selected_app_id { get; set; }
+
+    construct {
+        apps = new Gee.HashMap<string, App> ();
+
+        create_bindings ();
+        read_app_list ();
+    }
+
+    private void create_bindings () {
+        NotifySettings.get_default ().schema.bind ("do-not-disturb", this, "do-not-disturb", SettingsBindFlags.DEFAULT);
+    }
+
+    private void read_app_list () {
+        var installed_apps = AppInfo.get_all ();
+
+        foreach (AppInfo app_info in installed_apps) {
+            DesktopAppInfo? desktop_app_info = app_info as DesktopAppInfo;
+
+            if (desktop_app_info != null && desktop_app_info.get_boolean ("X-GNOME-UsesNotifications")) {
+                register_app (desktop_app_info);
+            }
+        }
+    }
+
+    private void register_app (DesktopAppInfo app_info) {
+        App app = new App (app_info);
+        apps.@set (app.app_id, app);
+    }
+}
\ No newline at end of file

=== added file 'src/Backend/NotifySettings.vala'
--- src/Backend/NotifySettings.vala	1970-01-01 00:00:00 +0000
+++ src/Backend/NotifySettings.vala	2015-10-11 11:46:23 +0000
@@ -0,0 +1,36 @@
+/*
+ * Copyright (c) 2011-2015 elementary Developers
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public
+ * License along with this program; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ */
+
+public class Backend.NotifySettings : Granite.Services.Settings {
+    public static NotifySettings? instance = null;
+
+    public static unowned NotifySettings get_default () {
+        if (instance == null) {
+            instance = new NotifySettings ();
+        }
+
+        return instance;
+    }
+
+    public bool do_not_disturb { get; set; }
+
+    private NotifySettings () {
+        base ("org.pantheon.desktop.gala.notifications");
+    }
+}
\ No newline at end of file

=== modified file 'src/CMakeLists.txt'
--- src/CMakeLists.txt	2014-11-12 23:50:40 +0000
+++ src/CMakeLists.txt	2015-10-11 11:46:23 +0000
@@ -19,13 +19,17 @@
 # Add all your vala files and requires packages to the List below to include them in the build
 vala_precompile (VALA_C ${PLUGNAME}
     Plug.vala
-    NotifySettings.vala
-    Widgets/AppsView.vala
+    Widgets/AppEntry.vala
     Widgets/AppList.vala
-    Widgets/AppItem.vala
-    Widgets/AppSettings.vala
-    Widgets/InfoScreen.vala
+    Widgets/AppSettingsView.vala
     Widgets/Footer.vala
+    Widgets/MainView.vala
+    Widgets/SettingsHeader.vala
+    Widgets/SettingsOption.vala
+    Widgets/Sidebar.vala
+    Backend/NotifySettings.vala
+    Backend/NotifyManager.vala
+    Backend/App.vala
     ${CMAKE_CURRENT_BINARY_DIR}/config.vala
 PACKAGES
     switchboard-2.0

=== removed file 'src/NotifySettings.vala'
--- src/NotifySettings.vala	2014-11-14 15:12:21 +0000
+++ src/NotifySettings.vala	1970-01-01 00:00:00 +0000
@@ -1,64 +0,0 @@
-/***
-	BEGIN LICENSE
-
-	Copyright (C) 2014 elementary Developers
-	This program is free software: you can redistribute it and/or modify it
-	under the terms of the GNU Lesser General Public License version 3, as published
-	by the Free Software Foundation.
-
-	This program is distributed in the hope that it will be useful, but
-	WITHOUT ANY WARRANTY; without even the implied warranties of
-	MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
-	PURPOSE.  See the GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License along
-	with this program.  If not, see <http://www.gnu.org/licenses/>
-
-	END LICENSE
-	Written By: Marcus Wichelmann <[e-mail]>
-
-***/
-
-public class NotifySettings : Object {
-	public Settings settings;
-
-	static const string APPS_KEY = "apps";
-	static const string DEFAULT_BUBBLES_KEY = "default-bubbles";
-	static const string DEFAULT_SOUNDS_KEY = "default-sounds";
-	static const string DO_NOT_DISTURB_KEY = "do-not-disturb";
-
-	public string[] apps { get; set; }
-	public bool default_bubbles { get; set; }
-	public bool default_sounds { get; set; }
-	public bool do_not_disturb { get; set; }
-
-	public signal void apps_changed (string[] new_value);
-	public signal void do_not_disturb_changed (bool new_value);
-
-	static NotifySettings? instance = null;
-
-	private NotifySettings () {
-		settings = new Settings ("org.pantheon.desktop.gala.notifications");
-
-		settings.bind (APPS_KEY, this, "apps", SettingsBindFlags.DEFAULT);
-		settings.bind (DEFAULT_BUBBLES_KEY, this, "default-bubbles", SettingsBindFlags.DEFAULT);
-		settings.bind (DEFAULT_SOUNDS_KEY, this, "default-sounds", SettingsBindFlags.DEFAULT);
-		settings.bind (DO_NOT_DISTURB_KEY, this, "do-not-disturb", SettingsBindFlags.DEFAULT);
-
-		settings.changed[APPS_KEY].connect (() => {
-			apps_changed (apps);
-		});
-
-		settings.changed[DO_NOT_DISTURB_KEY].connect (() => {
-			do_not_disturb_changed (do_not_disturb);
-		});
-	}
-
-	public static NotifySettings get_default () {
-		if (instance == null) {
-			instance = new NotifySettings ();
-		}
-
-		return instance;
-	}
-}

=== modified file 'src/Plug.vala'
--- src/Plug.vala	2015-09-19 06:09:51 +0000
+++ src/Plug.vala	2015-10-11 11:46:23 +0000
@@ -1,87 +1,95 @@
-/***
-	BEGIN LICENSE
-
-	Copyright (C) 2014 elementary Developers
-	This program is free software: you can redistribute it and/or modify it
-	under the terms of the GNU Lesser General Public License version 3, as published
-	by the Free Software Foundation.
-
-	This program is distributed in the hope that it will be useful, but
-	WITHOUT ANY WARRANTY; without even the implied warranties of
-	MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
-	PURPOSE.  See the GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License along
-	with this program.  If not, see <http://www.gnu.org/licenses/>
-
-	END LICENSE
-	Written By: Marcus Wichelmann <[e-mail]>
-
-***/
+/*
+ * Copyright (c) 2011-2015 elementary Developers
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public
+ * License along with this program; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ */
 
 public class NotificationsPlug : Switchboard.Plug {
-	private Gtk.Stack stack;
-	private Widgets.AppsView appsview;
-	private Widgets.InfoScreen no_apps_info;
-
-	public NotificationsPlug () {
-		Object (category: Category.PERSONAL,
-			code_name: "personal-pantheon-notifications",
-			display_name: _("Notifications"),
-			description: _("Enable or disable notifications."),
-			icon: "preferences-desktop-notifications");
-	}
-
-	public override Gtk.Widget get_widget () {
-		if (stack != null) {
-			return stack;
-		}
-
-		stack = new Gtk.Stack ();
-
-		appsview = new Widgets.AppsView ();
-		no_apps_info = new Widgets.InfoScreen (_("Nothing to do here"),
-				_("Notifications preferences are for configuring which apps make use of notifications, for changing how an app's notifications appear,\nand for setting when you do not want to be disturbed by notifications.") + "\n\n" +
-				_("When apps are installed that have notification options they will automatically appear here."),
-				"dialog-information");
-
-		stack.add_named (appsview, "apps-view");
-		stack.add_named (no_apps_info, "no-apps-info");
-
-		appsview.applist.list_loaded.connect ((length) => {
-			if (length > 0) {
-				stack.set_visible_child (appsview);
-			} else {
-				no_apps_info.show ();
-				stack.set_visible_child (no_apps_info);
-			}
-		});
-
-		stack.show_all ();
-
-		return stack;
-	}
-
-	public override void shown () {
-		
-	}
-
-	public override void hidden () {
-		
-	}
-
-	public override void search_callback (string location) {
-		
-	}
-
-	public override async Gee.TreeMap<string, string> search (string search) {
-		return new Gee.TreeMap<string, string> (null, null);
-	}
-
+    private static Granite.Widgets.AlertView create_alert_view () {
+        var title = _("Nothing to do here");
+
+        var description = _("Notifications preferences are for configuring which apps make use of notifications, for changing how an app's notifications appear,\nand for setting when you do not want to be disturbed by notifications.");
+        description += "\n\n";
+        description += _("When apps are installed that have notification options they will automatically appear here.");
+
+        var icon_name = "dialog-information";
+
+        return new Granite.Widgets.AlertView (title, description, icon_name);
+    }
+
+    private Gtk.Stack stack;
+
+    private Widgets.MainView main_view;
+    private Granite.Widgets.AlertView alert_view;
+
+    public NotificationsPlug () {
+        Object (category: Category.PERSONAL,
+                code_name: "personal-pantheon-notifications",
+                display_name: _("Notifications"),
+                description: _("Enable or disable notifications."),
+                icon: "preferences-desktop-notifications");
+    }
+
+    public override Gtk.Widget get_widget () {
+        if (stack != null) {
+            return stack;
+        }
+
+        build_ui ();
+        update_view ();
+
+        return stack;
+    }
+
+    public override void shown () {
+    }
+
+    public override void hidden () {
+    }
+
+    public override void search_callback (string location) {
+    }
+
+    public override async Gee.TreeMap<string, string> search (string search) {
+        return new Gee.TreeMap<string, string> (null, null);
+    }
+
+    private void build_ui () {
+        stack = new Gtk.Stack ();
+
+        main_view = new Widgets.MainView ();
+        alert_view = create_alert_view ();
+
+        main_view.show_all ();
+        alert_view.show_all ();
+
+        stack.add_named (main_view, "main-view");
+        stack.add_named (alert_view, "alert-view");
+
+        stack.show_all ();
+    }
+
+    private void update_view () {
+        stack.set_visible_child_name (Backend.NotifyManager.get_default ().apps.size > 0 ? "main-view" : "alert-view");
+    }
 }
 
 public Switchboard.Plug get_plug (Module module) {
-	debug ("Activating Notifications plug");
-	var plug = new NotificationsPlug ();
-	return plug;
-}
+    debug ("Activating Notifications plug");
+    var plug = new NotificationsPlug ();
+
+    return plug;
+}
\ No newline at end of file

=== renamed file 'src/Widgets/AppItem.vala' => 'src/Widgets/AppEntry.vala'
--- src/Widgets/AppItem.vala	2015-08-30 20:34:25 +0000
+++ src/Widgets/AppEntry.vala	2015-10-11 11:46:23 +0000
@@ -1,237 +1,94 @@
-/***
-	BEGIN LICENSE
-
-	Copyright (C) 2014 elementary Developers
-	This program is free software: you can redistribute it and/or modify it
-	under the terms of the GNU Lesser General Public License version 3, as published
-	by the Free Software Foundation.
-
-	This program is distributed in the hope that it will be useful, but
-	WITHOUT ANY WARRANTY; without even the implied warranties of
-	MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
-	PURPOSE.  See the GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License along
-	with this program.  If not, see <http://www.gnu.org/licenses/>
-
-	END LICENSE
-	Written By: Marcus Wichelmann <[e-mail]>
-
-***/
-
-public class Widgets.AppItem : Gtk.ListBoxRow {
-	private AppInfo appinfo;
-	private string appname;
-	private string appbubbles;
-	private string appsounds;
-	private Icon appicon;
-
-	private Gtk.Grid row_grid;
-	private Gtk.Image row_image;
-	private Gtk.Label row_title;
-	private Gtk.Label row_description;
-
-	private string[] cond_bubbles = ({"show", "hide"});
-	private string[] cond_sounds = ({"on", "off"});
-
-	// Please add more exceptions! TODO: app-name, title and icon all in one array.
-	private string[] exceptions = ({"", "indicator-sound", "NetworkManager", "gnome-settings-daemon"});
-
-	public AppItem (string app_name, string[] properties) {
-		if (search_appinfo_for_name (app_name) && load_icon ()) {
-			appname = app_name;
-			appbubbles = properties [0];
-			appsounds = properties[1];
-
-			create_ui ();
-		}
-	}
-
-	private bool search_appinfo_for_name (string app_name) {
-		try {
-			AppInfo found_info = AppInfo.create_from_commandline ("", app_name, AppInfoCreateFlags.NONE);
-
-			if (!(app_name in exceptions)) {
-				var found = false;
-
-				AppInfo.get_all ().foreach ((info) => {
-					if (app_name.down ().contains (info.get_name ().down ()) || app_name.down ().contains (info.get_executable ().down ())) {
-						found_info = info;
-						found = true;
-					}
-				});
-
-				if (!found) {
-					AppInfo.get_all ().foreach ((info) => {
-						if (info.get_display_name ().down ().contains (app_name.down ())) {
-							found_info = info;
-							found = true;
-						}
-					});
-				}
-			}
-
-			appinfo = found_info;
-			return true;
-		} catch {
-			return false;
-		}
-	}
-
-	private bool load_icon () {
-		try {
-			if (appinfo.get_icon () == null) {
-				// Please add more exceptions! (See also string[] exceptions!)
-				switch (appinfo.get_display_name ()) {
-					case "indicator-sound":
-						appicon = Icon.new_for_string ("preferences-desktop-sound");
-						break;
-					case "NetworkManager":
-						appicon = Icon.new_for_string ("preferences-system-network");
-						break;
-					case "gnome-settings-daemon":
-						appicon = Icon.new_for_string ("applications-electronics");
-						break;
-					default:
-						appicon = Icon.new_for_string ("application-default-icon");
-						break;
-				}
-			} else {
-				appicon = appinfo.get_icon ();
-			}
-
-			return true;
-		} catch {
-			return false;
-		}
-	}
-
-	private void create_ui () {
-		row_grid = new Gtk.Grid ();
-		row_grid.margin = 6;
-		row_grid.column_spacing = 6;
-		this.add (row_grid);
-
-		row_image = new Gtk.Image.from_gicon (appicon, Gtk.IconSize.DND);
-		row_image.pixel_size = 32;
-		row_grid.attach (row_image, 0, 0, 1, 2);
-
-		row_title = new Gtk.Label (this.get_title ());
-		row_title.get_style_context ().add_class ("h3");
-		row_title.ellipsize = Pango.EllipsizeMode.END;
-		row_title.halign = Gtk.Align.START;
-		row_title.valign = Gtk.Align.END;
-		row_grid.attach (row_title, 1, 0, 1, 1);
-
-		row_description = new Gtk.Label (null);
-		row_description.use_markup = true;
-		row_description.ellipsize = Pango.EllipsizeMode.END;
-		row_description.halign = Gtk.Align.START;
-		row_description.valign = Gtk.Align.START;
-		create_description ();
-		row_grid.attach (row_description, 1, 1, 1, 1);
-	}
-
-	private void create_description () {
-		var desc = "";
-
-		if (appbubbles != "hide") {
-			desc += _("Bubbles");
-
-			if (appsounds == "on") {
-				desc += ", " + _("Sounds");
-			}
-		} else {
-			desc += _("Disabled");
-		}
-
-		row_description.set_label (@"<span font_size=\"small\">$desc</span>");
-	}
-
-	public string get_title () {
-		// Please add more exceptions! (See also string[] exceptions!)
-		switch (appinfo.get_display_name ()) {
-				case "":
-					return _("Unknown");
-				case "indicator-sound":
-					return _("Sound Menu");
-				case "NetworkManager":
-					return _("Network");
-				case "gnome-settings-daemon":
-					return _("System Configuration");
-				default:
-					switch (appinfo.get_executable ()) {
-						case "midori":
-							return "Midori";
-						default:
-							return appinfo.get_display_name ();
-					}
-			}
-	}
-
-	public Icon get_icon () {
-		return appicon;
-	}
-
-	public string get_bubbles () {
-		if (appbubbles in cond_bubbles) {
-			return appbubbles;
-		} else {
-			// Fallback to default
-			if (NotifySettings.get_default ().default_bubbles) {
-				return "show";
-			} else {
-				return "hide";
-			}
-		}
-	}
-
-	public void set_bubbles (string bubbles) {
-		if (bubbles in cond_bubbles) {
-			appbubbles = bubbles;
-			rewrite_settings ();
-			create_description ();
-		}
-	}
-
-	public string get_sounds () {
-		if (appsounds in cond_sounds) {
-			return appsounds;
-		} else {
-			// Fallback to default
-			if (NotifySettings.get_default ().default_sounds) {
-				return "on";
-			} else {
-				return "off";
-			}
-		}
-	}
-
-	public void set_sounds (string sounds) {
-		if (sounds in cond_sounds) {
-			appsounds = sounds;
-			rewrite_settings ();
-			create_description ();
-		}
-	}
-
-	private void rewrite_settings () {
-		var apps_new = new string[NotifySettings.get_default ().apps.length];
-
-		for (int i = 0; i < NotifySettings.get_default ().apps.length; i++) {
-			var parameters = NotifySettings.get_default ().apps[i].split (":");
-
-			if (parameters.length == 2) {
-				if (parameters[0] == appname) {
-					// Rewrite
-					apps_new[i] = appname + ":" + appbubbles + "," + appsounds;
-				} else {
-					// Keep
-					apps_new[i] = NotifySettings.get_default ().apps[i];
-				}
-			}
-		}
-
-		NotifySettings.get_default ().apps = apps_new;
-	}
-}
+/*
+ * Copyright (c) 2011-2015 elementary Developers
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public
+ * License along with this program; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ */
+
+public class Widgets.AppEntry : Gtk.ListBoxRow {
+    private static const string BUBBLES_KEY = "bubbles";
+    private static const string SOUNDS_KEY = "sounds";
+    private static const string REMEMBER_KEY = "remember";
+
+    public Backend.App app { get; construct; }
+
+    private Gtk.Grid grid;
+
+    private Gtk.Image image;
+    private Gtk.Label title_label;
+    private Gtk.Label description_label;
+
+    public AppEntry (Backend.App app) {
+        Object (app: app);
+
+        build_ui ();
+        connect_signals ();
+    }
+
+    private void build_ui () {
+        grid = new Gtk.Grid ();
+        grid.margin = 6;
+        grid.column_spacing = 6;
+
+        image = new Gtk.Image.from_gicon (app.app_info.get_icon (), Gtk.IconSize.DND);
+        image.pixel_size = 32;
+
+        title_label = new Gtk.Label (Markup.escape_text (app.app_info.get_display_name ()));
+        title_label.get_style_context ().add_class ("h3");
+        title_label.ellipsize = Pango.EllipsizeMode.END;
+        title_label.halign = Gtk.Align.START;
+        title_label.valign = Gtk.Align.END;
+
+        description_label = new Gtk.Label (get_permissions_string (app));
+        description_label.use_markup = true;
+        description_label.ellipsize = Pango.EllipsizeMode.END;
+        description_label.halign = Gtk.Align.START;
+        description_label.valign = Gtk.Align.START;
+
+        grid.attach (image, 0, 0, 1, 2);
+        grid.attach (title_label, 1, 0, 1, 1);
+        grid.attach (description_label, 1, 1, 1, 1);
+
+        this.add (grid);
+    }
+
+    private void connect_signals () {
+        app.settings.changed.connect (() => {
+            description_label.set_markup (get_permissions_string (app));
+        });
+    }
+
+    private string get_permissions_string (Backend.App app) {
+        string[] items = {};
+
+        if (app.settings.get_boolean (BUBBLES_KEY)) {
+            items += _("Bubbles");
+        }
+
+        if (app.settings.get_boolean (SOUNDS_KEY)) {
+            items += _("Sounds");
+        }
+
+        if (app.settings.get_boolean (REMEMBER_KEY)) {
+            items += _("Remember");
+        }
+
+        if (items.length == 0) {
+            items += _("Disabled");
+        }
+
+        return "<span font_size=\"small\">%s</span>".printf (string.joinv (", ", items));
+    }
+}
\ No newline at end of file

=== modified file 'src/Widgets/AppList.vala'
--- src/Widgets/AppList.vala	2015-09-19 06:10:39 +0000
+++ src/Widgets/AppList.vala	2015-10-11 11:46:23 +0000
@@ -1,102 +1,78 @@
-/***
-	BEGIN LICENSE
-
-	Copyright (C) 2014 elementary Developers
-	This program is free software: you can redistribute it and/or modify it
-	under the terms of the GNU Lesser General Public License version 3, as published
-	by the Free Software Foundation.
-
-	This program is distributed in the hope that it will be useful, but
-	WITHOUT ANY WARRANTY; without even the implied warranties of
-	MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
-	PURPOSE.  See the GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License along
-	with this program.  If not, see <http://www.gnu.org/licenses/>
-
-	END LICENSE
-	Written By: Marcus Wichelmann <[e-mail]>
-
-***/
+/*
+ * Copyright (c) 2011-2015 elementary Developers
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public
+ * License along with this program; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ */
 
 public class Widgets.AppList : Gtk.ListBox {
-	private int item_count;
-	private Cancellable list_apps_cancellable;
-
-	public signal void item_changed (AppItem item);
-	public signal void list_loaded (int length);
-
-	public AppItem selected_row;
-
-	public AppList () {
-		this.selection_mode = Gtk.SelectionMode.SINGLE;
-		this.row_selected.connect ((row) => {
-			if (row != null) {
-				selected_row = row as AppItem;
-				item_changed (row as AppItem);
-			}
-		});
-
-		list_apps_cancellable = new Cancellable ();
-		NotifySettings.get_default ().apps_changed.connect (() => {
-			if (NotifySettings.get_default ().apps.length != item_count) {
-				queue_reload ();
-			}
-		});
-
-		queue_reload ();
-	}
-
-	private void queue_reload () {
-		list_apps_cancellable.cancel ();
-		this.get_children ().foreach ((row) => {
-			this.remove (row);
-			});
-		list_apps_cancellable.reset ();
-		list_apps_async.begin ();
-	}
-
-	private async void list_apps_async () {
-		var apps = NotifySettings.get_default ().apps;
-		item_count = apps.length;
-
-		foreach (var app in apps) {
-			var idle_handler = Idle.add (list_apps_async.callback);
-			var cancellable_handler = list_apps_cancellable.connect (() => {
-				Source.remove(idle_handler);
-			});
-			yield;
-			list_apps_cancellable.disconnect (cancellable_handler);
-
-			var parameters = app.split (":");
-
-			if (parameters.length == 2) {
-				var properties = parameters[1].split (",");
-
-				if (properties.length == 2 && parameters[0] != "notify-send") {
-					var item = new AppItem (parameters[0], properties);
-					this.add (item);
-				}
-			}
-
-			if (selected_row == null && NotifySettings.get_default ().do_not_disturb == false)
-				select_first ();
-
-			this.show_all ();
-			list_loaded (item_count);
-		}
-	}
-
-	public void select_first () {
-		if (item_count > 0) {
-			var first_row = this.get_row_at_index (0);
-
-			this.select_row (first_row);
-			selected_row = first_row as AppItem;
-		}
-	}
-
-	public void select_none () {
-		this.select_row (null);
-	}
-}
+    construct {
+        this.selection_mode = Gtk.SelectionMode.SINGLE;
+        this.set_sort_func (sort_func);
+
+        create_list ();
+        connect_signals ();
+        select_first_item ();
+    }
+
+    private void create_list () {
+        Backend.NotifyManager.get_default ().apps.@foreach ((entry) => {
+            AppEntry app_entry = new AppEntry (entry.value);
+            this.add (app_entry);
+
+            return true;
+        });
+    }
+
+    private void connect_signals () {
+        this.row_selected.connect (show_row);
+    }
+
+    private void show_row (Gtk.ListBoxRow? row) {
+        if (row == null) {
+            return;
+        }
+
+        if (!(row is AppEntry)) {
+            return;
+        }
+
+        Backend.NotifyManager.get_default ().selected_app_id = ((AppEntry)row).app.app_id;
+    }
+
+    private void select_first_item () {
+        List<weak Gtk.Widget> children = this.get_children ();
+
+        if (children.length () > 0) {
+            Gtk.ListBoxRow row = ((Gtk.ListBoxRow)children.nth_data (0));
+
+            this.select_row (row);
+            show_row (row);
+        }
+    }
+
+    private int sort_func (Gtk.ListBoxRow row1, Gtk.ListBoxRow row2) {
+        if (!(row1 is AppEntry && row2 is AppEntry)) {
+            return 0;
+        }
+
+        string row_name1 = ((AppEntry)row1).app.app_info.get_display_name ();
+        string row_name2 = ((AppEntry)row2).app.app_info.get_display_name ();
+
+        int order = strcmp (row_name1, row_name2);
+
+        return order.clamp (-1, 1);
+    }
+}
\ No newline at end of file

=== renamed file 'src/Widgets/AppSettings.vala' => 'src/Widgets/AppSettingsView.vala'
--- src/Widgets/AppSettings.vala	2015-09-16 18:44:59 +0000
+++ src/Widgets/AppSettingsView.vala	2015-10-11 11:46:23 +0000
@@ -1,152 +1,107 @@
-/***
-	BEGIN LICENSE
-
-	Copyright (C) 2014 elementary Developers
-	This program is free software: you can redistribute it and/or modify it
-	under the terms of the GNU Lesser General Public License version 3, as published
-	by the Free Software Foundation.
-
-	This program is distributed in the hope that it will be useful, but
-	WITHOUT ANY WARRANTY; without even the implied warranties of
-	MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
-	PURPOSE.  See the GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License along
-	with this program.  If not, see <http://www.gnu.org/licenses/>
-
-	END LICENSE
-	Written By: Marcus Wichelmann <[e-mail]>
-
-***/
-
-public class Widgets.AppSettings : Gtk.Grid {
-	private Gtk.Image appicon;
-	private Gtk.Label apptitle;
-
-	private Gtk.Image bubblesimage;
-	private Gtk.Label bubblestitle;
-	private Gtk.Switch bubblesswitch;
-	private Gtk.Label bubblesinfo;
-
-	private Gtk.Image soundsimage;
-	private Gtk.Label soundstitle;
-	private Gtk.Switch soundsswitch;
-	private Gtk.Label soundsinfo;
-
-	public signal void bubbles_changed (string bubbles);
-	public signal void sounds_changed (string sounds);
-
-	public AppSettings () {
-		this.margin = 12;
-		this.row_spacing = 12;
-		this.column_spacing = 12;
-
-		appicon = new Gtk.Image ();
-		this.attach (appicon, 0, 0, 1, 1);
-
-		apptitle = new Gtk.Label (null);
-		apptitle.halign = Gtk.Align.START;
-		apptitle.hexpand = true;
-		this.attach (apptitle, 1, 0, 2, 1);
-
-		bubblesimage = new Gtk.Image.from_file (Constants.PKGDATADIR + "/bubbles.svg");
-		bubblesimage.halign = Gtk.Align.START;
-		bubblesimage.hexpand = false;
-		bubblesimage.margin_top = 50;
-		this.attach (bubblesimage, 1, 1, 1, 3);
-
-		bubblestitle = new Gtk.Label ("<span font_weight=\"bold\" size=\"large\">" + _("Bubbles") + "</span>");
-		bubblestitle.use_markup = true;
-		bubblestitle.halign = Gtk.Align.START;
-		bubblestitle.valign = Gtk.Align.START;
-		bubblestitle.hexpand = true;
-		bubblestitle.vexpand = false;
-		bubblestitle.margin_top = 50 + 5;
-		this.attach (bubblestitle, 2, 1, 1, 1);
-
-		bubblesswitch = new Gtk.Switch ();
-		bubblesswitch.halign = Gtk.Align.START;
-		bubblesswitch.valign = Gtk.Align.CENTER;
-		bubblesswitch.hexpand = false;
-		bubblesswitch.vexpand = false;
-		bubblesswitch.notify["active"].connect (() => {
-			if (bubblesswitch.active) {
-				bubbles_changed ("show");
-				soundsswitch.set_sensitive (true);
-			} else {
-				bubbles_changed ("hide");
-				soundsswitch.set_sensitive (false);
-			}
-		});
-		this.attach (bubblesswitch, 2, 2, 1, 1);
-
-		bubblesinfo = new Gtk.Label (_("Bubbles appear in the top right corner of the display and disappear automatically."));
-		bubblesinfo.halign = Gtk.Align.START;
-		bubblesinfo.valign = Gtk.Align.START;
-		bubblesinfo.hexpand = true;
-		bubblesinfo.vexpand = false;
-		bubblesinfo.margin_bottom = 9;
-		bubblesinfo.wrap = true;
-		bubblesinfo.justify = Gtk.Justification.LEFT;
-		this.attach (bubblesinfo, 2, 3, 1, 1);
-
-		soundsimage = new Gtk.Image.from_file (Constants.PKGDATADIR + "/sounds.svg");
-		soundsimage.halign = Gtk.Align.START;
-		soundsimage.hexpand = false;
-		soundsimage.margin_top = 50;
-		this.attach (soundsimage, 1, 4, 1, 3);
-
-		soundstitle = new Gtk.Label ("<span font_weight=\"bold\" size=\"large\">" + _("Sounds") + "</span>");
-		soundstitle.use_markup = true;
-		soundstitle.halign = Gtk.Align.START;
-		soundstitle.valign = Gtk.Align.START;
-		soundstitle.hexpand = true;
-		soundstitle.vexpand = false;
-		soundstitle.margin_top = 50 + 5;
-		this.attach (soundstitle, 2, 4, 1, 1);
-
-		soundsswitch = new Gtk.Switch ();
-		soundsswitch.halign = Gtk.Align.START;
-		soundsswitch.valign = Gtk.Align.CENTER;
-		soundsswitch.hexpand = false;
-		soundsswitch.vexpand = false;
-		soundsswitch.notify["active"].connect (() => {
-			if (soundsswitch.active) {
-				sounds_changed ("on");
-			} else {
-				sounds_changed ("off");
-			}
-		});
-		this.attach (soundsswitch, 2, 5, 1, 1);
-
-		soundsinfo = new Gtk.Label (_("Sounds play once when a new notification arrives."));
-		soundsinfo.halign = Gtk.Align.START;
-		soundsinfo.valign = Gtk.Align.START;
-		soundsinfo.hexpand = true;
-		soundsinfo.vexpand = false;
-		soundsinfo.margin_bottom = 9;
-		soundsinfo.wrap = true;
-		soundsinfo.justify = Gtk.Justification.LEFT;
-		this.attach (soundsinfo, 2, 6, 1, 1);
-
-		this.show_all ();
-	}
-
-	public void set_appicon (Icon icon) {
-		appicon.set_from_gicon (icon, Gtk.IconSize.DIALOG);
-		appicon.pixel_size = 48;
-	}
-
-	public void set_apptitle (string title) {
-		apptitle.set_label (title);
-		apptitle.get_style_context ().add_class ("h2");
-	}
-
-	public void set_bubbles (string bubbles) {
-		bubblesswitch.set_active (bubbles == "show");
-	}
-
-	public void set_sounds (string sounds) {
-		soundsswitch.set_active (sounds == "on");
-	}
-}
+/*
+ * Copyright (c) 2011-2015 elementary Developers
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public
+ * License along with this program; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ */
+
+public class Widgets.AppSettingsView : Gtk.Grid {
+    private static const string BUBBLES_KEY = "bubbles";
+    private static const string SOUNDS_KEY = "sounds";
+    private static const string REMEMBER_KEY = "remember";
+
+    private Backend.App? selected_app = null;
+
+    private SettingsHeader header;
+
+    private Gtk.Switch bubbles_switch;
+    private SettingsOption bubbles_option;
+
+    private Gtk.Switch sound_switch;
+    private SettingsOption sound_option;
+
+    private Gtk.Switch remember_switch;
+    private SettingsOption remember_option;
+
+    construct {
+        build_ui ();
+        update_selected_app ();
+        create_bindings ();
+        update_header ();
+        connect_signals ();
+    }
+
+    private void build_ui () {
+        this.margin = 12;
+        this.row_spacing = 32;
+
+        header = new SettingsHeader ();
+
+        bubbles_option = new SettingsOption (
+            Constants.PKGDATADIR + "/bubbles.svg",
+            _("Bubbles"),
+            _("Bubbles appear in the top right corner of the display and disappear automatically."),
+            bubbles_switch = new Gtk.Switch ());
+
+        sound_option = new SettingsOption (
+            Constants.PKGDATADIR + "/sounds.svg",
+            _("Sounds"),
+            _("Sounds play once when a new notification arrives."),
+            sound_switch = new Gtk.Switch ());
+
+        remember_option = new SettingsOption (
+            Constants.PKGDATADIR + "/notify-center.svg",
+            _("Remember"),
+            _("Show missed notifications in Notification Center."),
+            remember_switch = new Gtk.Switch ());
+
+        this.attach (header, 0, 0, 1, 1);
+        this.attach (bubbles_option, 0, 1, 1, 1);
+        this.attach (sound_option, 0, 2, 1, 1);
+        this.attach (remember_option, 0, 3, 1, 1);
+    }
+
+    private void connect_signals () {
+        Backend.NotifyManager.get_default ().notify["selected-app-id"].connect (() => {
+            remove_bindings ();
+            update_selected_app ();
+            create_bindings ();
+            update_header ();
+        });
+    }
+
+    private void remove_bindings () {
+        Settings.unbind (bubbles_option.widget, "state");
+        Settings.unbind (sound_option.widget, "state");
+        Settings.unbind (remember_option.widget, "state");
+    }
+
+    private void update_selected_app () {
+        Backend.NotifyManager notify_manager = Backend.NotifyManager.get_default ();
+        string app_id = notify_manager.selected_app_id;
+        selected_app = notify_manager.apps.get (app_id);
+    }
+
+    private void create_bindings () {
+        selected_app.settings.bind (BUBBLES_KEY, bubbles_option.widget, "state", GLib.SettingsBindFlags.DEFAULT);
+        selected_app.settings.bind (SOUNDS_KEY, sound_option.widget, "state", GLib.SettingsBindFlags.DEFAULT);
+        selected_app.settings.bind (REMEMBER_KEY, remember_option.widget, "state", GLib.SettingsBindFlags.DEFAULT);
+    }
+
+    private void update_header () {
+        header.set_title (selected_app.app_info.get_display_name ());
+        header.set_icon (selected_app.app_info.get_icon ());
+    }
+}
\ No newline at end of file

=== modified file 'src/Widgets/Footer.vala'
--- src/Widgets/Footer.vala	2015-10-06 16:47:07 +0000
+++ src/Widgets/Footer.vala	2015-10-11 11:46:23 +0000
@@ -1,29 +1,32 @@
-/***
-    BEGIN LICENSE
-
-    Copyright (C) 2014 elementary Developers
-    This program is free software: you can redistribute it and/or modify it
-    under the terms of the GNU Lesser General Public License version 3, as published
-    by the Free Software Foundation.
-
-    This program is distributed in the hope that it will be useful, but
-    WITHOUT ANY WARRANTY; without even the implied warranties of
-    MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
-    PURPOSE.  See the GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License along
-    with this program.  If not, see <http://www.gnu.org/licenses/>
-
-    END LICENSE
-    Written By: Marcus Wichelmann <[e-mail]>
-
-***/
+/*
+ * Copyright (c) 2011-2015 elementary Developers
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public
+ * License along with this program; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ */
 
 public class Widgets.Footer : Gtk.Grid {
     private Gtk.Label do_not_disturb_label;
     private Gtk.Switch do_not_disturb_switch;
 
-    public Footer () {
+    construct {
+        build_ui ();
+        create_bindings ();
+    }
+
+    private void build_ui () {
         this.margin = 12;
         this.column_spacing = 12;
 
@@ -36,7 +39,12 @@
 
         this.attach (do_not_disturb_label, 0, 0, 1, 1);
         this.attach (do_not_disturb_switch, 1, 0, 1, 1);
+    }
 
-        NotifySettings.get_default ().settings.bind ("do-not-disturb", do_not_disturb_switch, "active", SettingsBindFlags.DEFAULT);
+    private void create_bindings () {
+        Backend.NotifyManager.get_default ().bind_property ("do-not-disturb",
+                                                            do_not_disturb_switch,
+                                                            "state",
+                                                            BindingFlags.BIDIRECTIONAL | BindingFlags.SYNC_CREATE);
     }
-}
+}
\ No newline at end of file

=== removed file 'src/Widgets/InfoScreen.vala'
--- src/Widgets/InfoScreen.vala	2014-11-15 23:15:37 +0000
+++ src/Widgets/InfoScreen.vala	1970-01-01 00:00:00 +0000
@@ -1,66 +0,0 @@
-/***
-	BEGIN LICENSE
-
-	Copyright (C) 2014 elementary Developers
-	This program is free software: you can redistribute it and/or modify it
-	under the terms of the GNU Lesser General Public License version 3, as published
-	by the Free Software Foundation.
-
-	This program is distributed in the hope that it will be useful, but
-	WITHOUT ANY WARRANTY; without even the implied warranties of
-	MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
-	PURPOSE.  See the GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License along
-	with this program.  If not, see <http://www.gnu.org/licenses/>
-
-	END LICENSE
-	Written By: Marcus Wichelmann <[e-mail]>
-
-***/
-
-public class Widgets.InfoScreen : Gtk.Frame {
-	private Gtk.Grid grid;
-
-	private Gtk.Image image;
-	private Gtk.Label title;
-	private Gtk.Label description;
-
-	// Compareable to the widget of switchboard-plug-security-privacy.
-	public InfoScreen (string header, string desc, string icon_name) {
-		this.expand = true;
-		this.get_style_context ().add_class (Gtk.STYLE_CLASS_VIEW);
-		this.shadow_type = Gtk.ShadowType.NONE;
-
-		grid = new Gtk.Grid ();
-		grid.vexpand = false;
-		grid.valign = Gtk.Align.CENTER;
-		grid.halign = Gtk.Align.CENTER;
-		grid.border_width = 24;
-		grid.row_spacing = 12;
-		grid.column_spacing = 12;
-
-		image = new Gtk.Image.from_icon_name (icon_name, Gtk.IconSize.DIALOG);
-		image.valign = Gtk.Align.START;
-		image.halign = Gtk.Align.END;
-
-		grid.attach (image, 0, 0, 1, 2);
-
-		title = new Gtk.Label (header);
-		title.halign = Gtk.Align.START;
-		title.set_line_wrap (true);
-		title.justify = Gtk.Justification.FILL;
-		title.get_style_context ().add_class ("h2");
-		grid.attach (title, 1, 0, 1, 1);
-
-		description = new Gtk.Label (desc);
-		description.halign = Gtk.Align.START;
-		description.set_line_wrap (true);
-		description.justify = Gtk.Justification.FILL;
-		grid.attach (description, 1, 1, 1, 1);
-
-		grid.show_all ();
-
-		this.add (grid);
-	}
-}

=== renamed file 'src/Widgets/AppsView.vala' => 'src/Widgets/MainView.vala'
--- src/Widgets/AppsView.vala	2015-09-12 23:27:51 +0000
+++ src/Widgets/MainView.vala	2015-10-11 11:46:23 +0000
@@ -1,99 +1,72 @@
-/***
-	BEGIN LICENSE
-
-	Copyright (C) 2014 elementary Developers
-	This program is free software: you can redistribute it and/or modify it
-	under the terms of the GNU Lesser General Public License version 3, as published
-	by the Free Software Foundation.
-
-	This program is distributed in the hope that it will be useful, but
-	WITHOUT ANY WARRANTY; without even the implied warranties of
-	MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
-	PURPOSE.  See the GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License along
-	with this program.  If not, see <http://www.gnu.org/licenses/>
-
-	END LICENSE
-	Written By: Marcus Wichelmann <[e-mail]>
-
-***/
-
-public class Widgets.AppsView : Granite.Widgets.ThinPaned {
-	private Gtk.Box sidebar;
-
-	private Gtk.ScrolledWindow scrolled_window;
-	public AppList applist;
-	private Footer footer;
-
-	private Gtk.Stack content;
-
-	private AppSettings appsettings;
-	private InfoScreen do_not_disturb_info;
-
-	public AppsView () {
-		sidebar = new Gtk.Box (Gtk.Orientation.VERTICAL, 0);
-
-		applist = new AppList ();
-		footer = new Footer ();
-
-		content = new Gtk.Stack ();
-
-		appsettings = new AppSettings ();
-		do_not_disturb_info = new InfoScreen (_("elementary OS is in Do Not Disturb mode"),
-				_("While in Do Not Disturb mode, notifications and alerts will be hidden and notification sounds will be silenced.") + "\n\n" +
-				_("System notifications, such as volume and display brightness, will be unaffected."),
-				"notification-disabled");
-
-		content.add_named (appsettings, "app-settings");
-		content.add_named (do_not_disturb_info, "do-not-disturb");
-
-		scrolled_window = new Gtk.ScrolledWindow (null, null);
-		scrolled_window.add (applist);
-		
-		sidebar.pack_start (scrolled_window, true, true);
-		sidebar.pack_start (new Gtk.Separator (Gtk.Orientation.HORIZONTAL), false, true);
-		sidebar.pack_start (footer, false, true);
-
-		this.pack1 (sidebar, true, false);
-		this.pack2 (content, true, false);
-		this.set_position (240);
-
-		applist.item_changed.connect (select_app);
-
-		appsettings.bubbles_changed.connect ((bubbles) => {
-			(applist.selected_row as AppItem).set_bubbles (bubbles);
-		});
-
-		appsettings.sounds_changed.connect ((sounds) => {
-			(applist.selected_row as AppItem).set_sounds (sounds);
-		});
-
-		set_do_not_disturb_mode (NotifySettings.get_default ().do_not_disturb);
-
-		NotifySettings.get_default ().do_not_disturb_changed.connect ((do_not_disturb) => {
-			set_do_not_disturb_mode (do_not_disturb);
-		});
-	}
-
-	private void set_do_not_disturb_mode (bool do_not_disturb) {
-		if (do_not_disturb) {
-			applist.set_sensitive (false);
-			applist.select_none ();
-			do_not_disturb_info.show ();
-			content.set_visible_child (do_not_disturb_info);
-		} else {
-			applist.set_sensitive (true);
-			applist.select_first ();
-			content.set_visible_child (appsettings);
-		}
-	}
-
-	private void select_app (AppItem item) {
-		appsettings.set_appicon (item.get_icon ());
-		appsettings.set_apptitle (item.get_title ());
-		appsettings.set_bubbles (item.get_bubbles ());
-		appsettings.set_sounds (item.get_sounds ());
-		appsettings.set_sensitive (true);
-	}
-}
+/*
+ * Copyright (c) 2011-2015 elementary Developers
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public
+ * License along with this program; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ */
+
+public class Widgets.MainView : Gtk.Paned {
+    private static Granite.Widgets.AlertView create_alert_view () {
+        var title = _("elementary OS is in Do Not Disturb mode");
+
+        var description = _("While in Do Not Disturb mode, notifications and alerts will be hidden and notification sounds will be silenced.");
+        description += "\n\n";
+        description += _("System notifications, such as volume and display brightness, will be unaffected.");
+
+        var icon_name = "notification-disabled";
+
+        return new Granite.Widgets.AlertView (title, description, icon_name);
+    }
+
+    private Sidebar sidebar;
+
+    private Gtk.Stack content;
+
+    private AppSettingsView app_settings_view;
+    private Granite.Widgets.AlertView alert_view;
+
+    construct {
+        build_ui ();
+        update_view ();
+        connect_signals ();
+    }
+
+    private void build_ui () {
+        sidebar = new Sidebar ();
+
+        content = new Gtk.Stack ();
+
+        app_settings_view = new AppSettingsView ();
+        alert_view = create_alert_view ();
+
+        app_settings_view.show_all ();
+        alert_view.show_all ();
+
+        content.add_named (app_settings_view, "app-settings-view");
+        content.add_named (alert_view, "alert-view");
+
+        this.pack1 (sidebar, true, false);
+        this.pack2 (content, true, false);
+        this.set_position (240);
+    }
+
+    private void connect_signals () {
+        Backend.NotifyManager.get_default ().notify["do-not-disturb"].connect (update_view);
+    }
+
+    private void update_view () {
+        content.set_visible_child_name (Backend.NotifyManager.get_default ().do_not_disturb ? "alert-view" : "app-settings-view");
+    }
+}
\ No newline at end of file

=== added file 'src/Widgets/SettingsHeader.vala'
--- src/Widgets/SettingsHeader.vala	1970-01-01 00:00:00 +0000
+++ src/Widgets/SettingsHeader.vala	2015-10-11 11:46:23 +0000
@@ -0,0 +1,50 @@
+/*
+ * Copyright (c) 2011-2015 elementary Developers
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public
+ * License along with this program; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ */
+
+public class Widgets.SettingsHeader : Gtk.Grid {
+    private Gtk.Image app_image;
+    private Gtk.Label app_label;
+
+    construct {
+        build_ui ();
+    }
+
+    public void set_title (string title) {
+        app_label.set_label ("<span font_weight=\"bold\" size=\"x-large\">%s</span>".printf (Markup.escape_text (title)));
+    }
+
+    public void set_icon (Icon icon) {
+        app_image.set_from_gicon (icon, Gtk.IconSize.DIALOG);
+        app_image.set_pixel_size (48);
+    }
+
+    private void build_ui () {
+        this.column_spacing = 12;
+
+        app_image = new Gtk.Image ();
+
+        app_label = new Gtk.Label (null);
+        app_label.use_markup = true;
+        app_label.halign = Gtk.Align.START;
+        app_label.hexpand = true;
+
+        this.attach (app_image, 0, 0, 1, 1);
+        this.attach (app_label, 1, 0, 1, 1);
+    }
+}
\ No newline at end of file

=== added file 'src/Widgets/SettingsOption.vala'
--- src/Widgets/SettingsOption.vala	1970-01-01 00:00:00 +0000
+++ src/Widgets/SettingsOption.vala	2015-10-11 11:46:23 +0000
@@ -0,0 +1,74 @@
+/*
+ * Copyright (c) 2011-2015 elementary Developers
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public
+ * License along with this program; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ */
+
+public class Widgets.SettingsOption : Gtk.Grid {
+    public string image_path { get; construct; }
+    public string title { get; construct; }
+    public string description { get; construct; }
+    public Gtk.Widget widget { get; construct; }
+
+    private Gtk.Image image;
+    private Gtk.Label title_label;
+    private Gtk.Label description_label;
+
+    public SettingsOption (string image_path, string title, string description, Gtk.Widget widget) {
+        Object (image_path: image_path,
+                title: title,
+                description: description,
+                widget: widget);
+
+        build_ui ();
+    }
+
+    private void build_ui () {
+        this.column_spacing = 6;
+        this.row_spacing = 6;
+        this.margin_start = 60;
+        this.margin_end = 30;
+
+        image = new Gtk.Image.from_file (image_path);
+        image.halign = Gtk.Align.START;
+        image.hexpand = false;
+
+        title_label = new Gtk.Label (title);
+        title_label.get_style_context ().add_class ("h2");
+        title_label.halign = Gtk.Align.START;
+        title_label.valign = Gtk.Align.END;
+        title_label.hexpand = true;
+        title_label.vexpand = false;
+
+        widget.halign = Gtk.Align.START;
+        widget.valign = Gtk.Align.CENTER;
+        widget.hexpand = false;
+        widget.vexpand = false;
+
+        description_label = new Gtk.Label (description);
+        description_label.halign = Gtk.Align.START;
+        description_label.valign = Gtk.Align.START;
+        description_label.hexpand = true;
+        description_label.vexpand = false;
+        description_label.wrap = true;
+        description_label.justify = Gtk.Justification.LEFT;
+
+        this.attach (image, 0, 0, 1, 3);
+        this.attach (title_label, 1, 0, 1, 1);
+        this.attach (widget, 1, 1, 1, 1);
+        this.attach (description_label, 1, 2, 1, 1);
+    }
+}
\ No newline at end of file

=== added file 'src/Widgets/Sidebar.vala'
--- src/Widgets/Sidebar.vala	1970-01-01 00:00:00 +0000
+++ src/Widgets/Sidebar.vala	2015-10-11 11:46:23 +0000
@@ -0,0 +1,59 @@
+/*
+ * Copyright (c) 2011-2015 elementary Developers
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public
+ * License along with this program; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ */
+
+public class Widgets.Sidebar : Gtk.Box {
+    private Gtk.ScrolledWindow scrolled_window;
+    private AppList app_list;
+
+    private Footer footer;
+
+    construct {
+        build_ui ();
+        create_bindings ();
+    }
+
+    private void build_ui () {
+        this.orientation = Gtk.Orientation.VERTICAL;
+
+        scrolled_window = create_scrolled_window ();
+
+        footer = new Footer ();
+
+        this.pack_start (scrolled_window);
+        this.pack_start (new Gtk.Separator (Gtk.Orientation.HORIZONTAL), false, false);
+        this.pack_end (footer, false, false);
+    }
+
+    private void create_bindings () {
+        Backend.NotifyManager.get_default ().bind_property ("do-not-disturb",
+                                                            app_list,
+                                                            "sensitive",
+                                                            BindingFlags.INVERT_BOOLEAN | BindingFlags.SYNC_CREATE);
+    }
+
+    private Gtk.ScrolledWindow create_scrolled_window () {
+        var scrolled_window = new Gtk.ScrolledWindow (null, null);
+
+        app_list = new AppList ();
+
+        scrolled_window.add (app_list);
+
+        return scrolled_window;
+    }
+}
\ No newline at end of file