Merge lp:~aaronhoneycutt/ureadit/ureadit-personal into lp:ureadit/4.0

[Michael Hall]

fix FrontPage content from going under PageHeader

Unmerged revisions

51. By Aaron Honeycutt on 2016-04-28

fix FrontPage content from going under PageHeader

=== modified file 'Main.qml'
--- Main.qml	2016-01-14 18:46:10 +0000
+++ Main.qml	2016-05-02 20:39:24 +0000
@@ -83,7 +83,10 @@
 
     PageStack {
         id: mainStack
-        anchors.fill: parent
+        anchors {
+                 fill: parent
+                 topMargin: units.gu(10)
+                }
 
         Keys.onPressed: { if (mainStack.depth > 1 && event.key == Qt.Key_Escape) pop(); }
         onCurrentPageChanged: {

=== modified file 'po/template.pot'
--- po/template.pot	2016-01-14 18:46:10 +0000
+++ po/template.pot	2016-05-02 20:39:24 +0000
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-01-13 23:13-0500\n"
+"POT-Creation-Date: 2016-04-27 23:00-0400\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,175 +17,162 @@
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: .ubuntu-sdk-deploy/ui/InternalBrowserPage.qml:70
-#: .ubuntu-sdk-deploy/ui/ArticlePage.qml:89 ui/InternalBrowserPage.qml:70
-#: ui/ArticlePage.qml:89
-msgid "Open link in browser"
-msgstr ""
-
-#: .ubuntu-sdk-deploy/ui/InternalBrowserPage.qml:75
-#: .ubuntu-sdk-deploy/ui/ArticlePage.qml:94 ui/InternalBrowserPage.qml:75
-#: ui/ArticlePage.qml:94
-msgid "Open image in browser"
-msgstr ""
-
-#: .ubuntu-sdk-deploy/ui/InternalBrowserPage.qml:80
-#: .ubuntu-sdk-deploy/ui/ArticlePage.qml:104 ui/InternalBrowserPage.qml:80
-#: ui/ArticlePage.qml:104
-msgid "Share image"
-msgstr ""
-
-#: .ubuntu-sdk-deploy/ui/SettingsPage.qml:8
-#: .ubuntu-sdk-deploy/ui/Frontpage.qml:229 ui/SettingsPage.qml:8
-#: ui/Frontpage.qml:229
+#: ui/SettingsPage.qml:8 ui/Frontpage.qml:229
 msgid "Settings"
 msgstr ""
 
-#: .ubuntu-sdk-deploy/ui/SettingsPage.qml:19 ui/SettingsPage.qml:19
+#: ui/SettingsPage.qml:19
 msgid "Startup"
 msgstr ""
 
-#: .ubuntu-sdk-deploy/ui/SettingsPage.qml:22 ui/SettingsPage.qml:22
+#: ui/SettingsPage.qml:22
 msgid "Login automatically at startup"
 msgstr ""
 
-#: .ubuntu-sdk-deploy/ui/SettingsPage.qml:33 ui/SettingsPage.qml:33
+#: ui/SettingsPage.qml:33
 msgid "Internal Browser"
 msgstr ""
 
-#: .ubuntu-sdk-deploy/ui/SettingsPage.qml:37 ui/SettingsPage.qml:37
+#: ui/SettingsPage.qml:37
 msgid "Open links internally"
 msgstr ""
 
-#: .ubuntu-sdk-deploy/ui/SettingsPage.qml:48 ui/SettingsPage.qml:48
+#: ui/SettingsPage.qml:48
 msgid "Image Previews"
 msgstr ""
 
-#: .ubuntu-sdk-deploy/ui/SettingsPage.qml:56 ui/SettingsPage.qml:56
+#: ui/SettingsPage.qml:56
 msgid "Don't show images"
 msgstr ""
 
-#: .ubuntu-sdk-deploy/ui/SettingsPage.qml:56 ui/SettingsPage.qml:56
+#: ui/SettingsPage.qml:56
 msgid "Show large previews"
 msgstr ""
 
-#: .ubuntu-sdk-deploy/ui/SettingsPage.qml:56 ui/SettingsPage.qml:56
+#: ui/SettingsPage.qml:56
 msgid "Show thumbnail previews"
 msgstr ""
 
-#: .ubuntu-sdk-deploy/ui/SettingsPage.qml:64 ui/SettingsPage.qml:64
+#: ui/SettingsPage.qml:64
 msgid "Theme"
 msgstr ""
 
-#: .ubuntu-sdk-deploy/ui/ArticlePage.qml:99 ui/ArticlePage.qml:99
+#: ui/AboutPage.qml:8 ui/Frontpage.qml:237
+msgid "About"
+msgstr ""
+
+#: ui/AboutPage.qml:30
+msgid "Name"
+msgstr ""
+
+#: ui/AboutPage.qml:34
+msgid "Author"
+msgstr ""
+
+#: ui/AboutPage.qml:38
+msgid "Version"
+msgstr ""
+
+#: ui/AboutPage.qml:42
+msgid "Released"
+msgstr ""
+
+#: ui/ArticlePage.qml:89 ui/InternalBrowserPage.qml:70
+msgid "Open link in browser"
+msgstr ""
+
+#: ui/ArticlePage.qml:94 ui/InternalBrowserPage.qml:75
+msgid "Open image in browser"
+msgstr ""
+
+#: ui/ArticlePage.qml:99
 msgid "Share image link"
 msgstr ""
 
-#: .ubuntu-sdk-deploy/ui/Frontpage.qml:20
-#: .ubuntu-sdk-deploy/ui/Frontpage.qml:285
-#: .ubuntu-sdk-deploy/ui/Frontpage.qml:503 ui/Frontpage.qml:20
-#: ui/Frontpage.qml:285 ui/Frontpage.qml:503
+#: ui/ArticlePage.qml:104 ui/InternalBrowserPage.qml:80
+msgid "Share image"
+msgstr ""
+
+#: ui/Frontpage.qml:20 ui/Frontpage.qml:285 ui/Frontpage.qml:503
 msgid "Frontpage"
 msgstr ""
 
-#: .ubuntu-sdk-deploy/ui/Frontpage.qml:85 ui/Frontpage.qml:85
+#: ui/Frontpage.qml:85
 msgid "Hot"
 msgstr ""
 
-#: .ubuntu-sdk-deploy/ui/Frontpage.qml:85 ui/Frontpage.qml:85
+#: ui/Frontpage.qml:85
 msgid "New"
 msgstr ""
 
-#: .ubuntu-sdk-deploy/ui/Frontpage.qml:85 ui/Frontpage.qml:85
+#: ui/Frontpage.qml:85
 msgid "Top"
 msgstr ""
 
-#: .ubuntu-sdk-deploy/ui/Frontpage.qml:85 ui/Frontpage.qml:85
+#: ui/Frontpage.qml:85
 msgid "Controversial"
 msgstr ""
 
-#: .ubuntu-sdk-deploy/ui/Frontpage.qml:85 ui/Frontpage.qml:85
+#: ui/Frontpage.qml:85
 msgid "Rising"
 msgstr ""
 
-#: .ubuntu-sdk-deploy/ui/Frontpage.qml:95 ui/Frontpage.qml:95
+#: ui/Frontpage.qml:95
 msgid "Subscriptions"
 msgstr ""
 
-#: .ubuntu-sdk-deploy/ui/Frontpage.qml:95 ui/Frontpage.qml:95
+#: ui/Frontpage.qml:95
 msgid "Defaults"
 msgstr ""
 
-#: .ubuntu-sdk-deploy/ui/Frontpage.qml:95 ui/Frontpage.qml:95
+#: ui/Frontpage.qml:95
 msgid "Search"
 msgstr ""
 
-#: .ubuntu-sdk-deploy/ui/Frontpage.qml:95 ui/Frontpage.qml:95
+#: ui/Frontpage.qml:95
 msgid "Multis"
 msgstr ""
 
-#: .ubuntu-sdk-deploy/ui/Frontpage.qml:175 ui/Frontpage.qml:175
+#: ui/Frontpage.qml:175
 msgid "Subreddit"
 msgstr ""
 
-#: .ubuntu-sdk-deploy/ui/Frontpage.qml:184 ui/Frontpage.qml:184
+#: ui/Frontpage.qml:184
 msgid "Login"
 msgstr ""
 
-#: .ubuntu-sdk-deploy/ui/Frontpage.qml:193 ui/Frontpage.qml:193
+#: ui/Frontpage.qml:193
 msgid "New Unread"
 msgstr ""
 
-#: .ubuntu-sdk-deploy/ui/Frontpage.qml:202 ui/Frontpage.qml:202
+#: ui/Frontpage.qml:202
 msgid "View as Gallery"
 msgstr ""
 
-#: .ubuntu-sdk-deploy/ui/Frontpage.qml:211 ui/Frontpage.qml:211
+#: ui/Frontpage.qml:211
 msgid "Inbox"
 msgstr ""
 
-#: .ubuntu-sdk-deploy/ui/Frontpage.qml:220 ui/Frontpage.qml:220
+#: ui/Frontpage.qml:220
 msgid "Users"
 msgstr ""
 
-#: .ubuntu-sdk-deploy/ui/Frontpage.qml:237
-#: .ubuntu-sdk-deploy/ui/AboutPage.qml:8 ui/Frontpage.qml:237
-#: ui/AboutPage.qml:8
-msgid "About"
-msgstr ""
-
-#: .ubuntu-sdk-deploy/ui/Frontpage.qml:245 ui/Frontpage.qml:245
+#: ui/Frontpage.qml:245
 msgid "Logout"
 msgstr ""
 
-#: .ubuntu-sdk-deploy/ui/Frontpage.qml:264 ui/Frontpage.qml:264
+#: ui/Frontpage.qml:264
 msgid "Back"
 msgstr ""
 
-#: .ubuntu-sdk-deploy/ui/Frontpage.qml:274 ui/Frontpage.qml:274
+#: ui/Frontpage.qml:274
 msgid "Confirm"
 msgstr ""
 
-#: .ubuntu-sdk-deploy/ui/Frontpage.qml:505 ui/Frontpage.qml:505
+#: ui/Frontpage.qml:505
 msgid "All"
 msgstr ""
 
-#: .ubuntu-sdk-deploy/ui/AboutPage.qml:30 ui/AboutPage.qml:30
-msgid "Name"
-msgstr ""
-
-#: .ubuntu-sdk-deploy/ui/AboutPage.qml:34 ui/AboutPage.qml:34
-msgid "Author"
-msgstr ""
-
-#: .ubuntu-sdk-deploy/ui/AboutPage.qml:38 ui/AboutPage.qml:38
-msgid "Version"
-msgstr ""
-
-#: .ubuntu-sdk-deploy/ui/AboutPage.qml:42 ui/AboutPage.qml:42
-msgid "Released"
-msgstr ""
-
-#: .ubuntu-sdk-deploy/Main.qml:135 Main.qml:135
+#: Main.qml:138
 msgid "Link to a Reddit thread"
 msgstr ""