From f61584a52687e5620caa95f0f95e8b8f9fbed286 Mon Sep 17 00:00:00 2001 From: Morgan McMillian Date: Sun, 30 Oct 2016 09:13:53 -0700 Subject: [PATCH] indicate & disable deleted posts --- assets/PostItem.qml | 5 ++++- assets/StreamTab.qml | 30 +++++++++++++++++++----------- buildnum | 2 +- translations/Goober.ts | 29 +++++++++++++++++------------ 4 files changed, 41 insertions(+), 25 deletions(-) diff --git a/assets/PostItem.qml b/assets/PostItem.qml index b79a929..cd74de1 100644 --- a/assets/PostItem.qml +++ b/assets/PostItem.qml @@ -32,6 +32,9 @@ Container { property variant theme : Application.themeSupport.theme.colorTheme.style + enabled: (ListItemData.is_deleted) ? false : true + opacity: (ListItemData.is_deleted) ? 0.5 : 1.0 + Container { layout: DockLayout {} horizontalAlignment: HorizontalAlignment.Fill @@ -132,7 +135,7 @@ Container { topMargin: ui.sdu(2.0) bottomMargin: ui.sdu(2.0) Label { - text: ListItemData.content.html + text: (ListItemData.is_deleted) ? qsTr("{{POST DELETED}}") : ListItemData.content.html multiline: true textFormat: TextFormat.Html } diff --git a/assets/StreamTab.qml b/assets/StreamTab.qml index d4c7564..c91587a 100644 --- a/assets/StreamTab.qml +++ b/assets/StreamTab.qml @@ -57,16 +57,18 @@ NavigationPane { } ] onTriggered: { - var page = threadPage.createObject(); - pnut.threadReceived.connect(page.loadThread); - pnut.getThread(postModel.data(indexPath).thread_id); - page.follow.connect(pnut.followUser) - page.unfollow.connect(pnut.unfollowUser) - page.block.connect(pnut.blockUser) - page.unblock.connect(pnut.unblockUser) - page.mute.connect(pnut.muteUser) - page.unmute.connect(pnut.unmuteUser) - nav.push(page); + if (!postModel.data(indexPath).is_deleted) { + var page = threadPage.createObject(); + pnut.threadReceived.connect(page.loadThread); + pnut.getThread(postModel.data(indexPath).thread_id); + page.follow.connect(pnut.followUser) + page.unfollow.connect(pnut.unfollowUser) + page.block.connect(pnut.blockUser) + page.unblock.connect(pnut.unblockUser) + page.mute.connect(pnut.muteUser) + page.unmute.connect(pnut.unmuteUser) + nav.push(page); + } } function viewProfile(userobj) { var page = profilePage.createObject(); @@ -204,7 +206,13 @@ NavigationPane { id: pnut onStreamReceived: { - //nav.parent.unreadContentCount = stream.length + + stream.forEach(function(post) { + if (post.is_deleted) { + console.log("got a deleted post") + } + }) + switch (rtype) { case Pnut.STREAM_OLDER: //streamView.scrollToPosition(ScrollPosition.End, ScrollAnimation.None); diff --git a/buildnum b/buildnum index 5e78f1e..274ccca 100644 --- a/buildnum +++ b/buildnum @@ -1 +1 @@ -203 \ No newline at end of file +209 \ No newline at end of file diff --git a/translations/Goober.ts b/translations/Goober.ts index 22cf628..68cfbf9 100644 --- a/translations/Goober.ts +++ b/translations/Goober.ts @@ -30,42 +30,47 @@ PostItem - + + <i>{{POST DELETED}}</i> + + + + Reply - + Reply All - + Add Bookmark - + Delete Bookmark - + Repost - + Delete Repost - + Quote - + View Profile @@ -152,22 +157,22 @@ StreamTab - + New Post - + To Top - + To Bottom - + Reload