diff --git a/qml/pages/ConversationPage.qml b/qml/pages/ConversationPage.qml
index a3c68ba..8c82fd8 100644
--- a/qml/pages/ConversationPage.qml
+++ b/qml/pages/ConversationPage.qml
@@ -26,10 +26,7 @@ Page {
allowedOrientations: Orientation.All
onSuggestedUserChanged: {
console.log(suggestedUser)
- suggestedModel = Qt.createQmlObject(
- 'import QtQuick 2.0; ListModel { }',
- Qt.application, 'InternalQmlObject'
- )
+ suggestedModel = Qt.createQmlObject( 'import QtQuick 2.0; ListModel { }', Qt.application, 'InternalQmlObject' )
predictionList.visible = false
if (suggestedUser.length > 0) {
var msg = {
@@ -58,9 +55,7 @@ Page {
WorkerScript {
id: worker
source: "../lib/Worker.js"
- onMessage: {
- console.log(JSON.stringify(messageObject))
- }
+ onMessage: { console.log(JSON.stringify(messageObject)) }
}
SilicaListView {
@@ -85,8 +80,7 @@ Page {
text: Format.formatDate(section, Formatter.DateMedium)
}
}
- delegate: VisualContainer {
- }
+ delegate: VisualContainer {}
onCountChanged: {
if (mdl)
for (var i = 0; i < mdl.count; i++) {
@@ -121,11 +115,8 @@ Page {
//: "Reply" will show the Toot text entry Panel. "Hide Reply" closes it. Alternative: Use "Close Reply"
text: !panel.open ? qsTr("Reply") : qsTr("Hide Reply")
visible: type == "reply"
- onClicked: if (!panel.open) {
- panel.open = true
- } else panel.open = false
+ onClicked: !panel.open ? panel.open = true : panel.open = false
}
-
}
}
@@ -137,20 +128,16 @@ Page {
anchors {
left: panel.left
right: panel.right
- bottom: if (panel.open == true) {
- panel.top
- } else {
- hiddenPanel.top
- }
+ bottom: panel.open == true ? panel.top : hiddenPanel.top
}
SilicaListView {
- rotation: 180
+ id: predictionResults
+ rotation: 180 // shows best matching result on the bottom
anchors.fill: parent
model: suggestedModel
clip: true
quickScroll: false
- VerticalScrollDecorator {}
delegate: ItemUser {
rotation: 180
onClicked: {
@@ -166,7 +153,6 @@ Page {
+ model.account_acct
+ ' '
+ textOperations.text.substring(textOperations.selectionEnd).trim()
-
toot.cursorPosition = toot.text.indexOf('@' + model.account_acct)
}
}
@@ -175,21 +161,20 @@ Page {
positionViewAtBeginning(suggestedModel.count - 1, ListView.Beginning)
}
}
+
+ VerticalScrollDecorator {}
}
}
DockedPanel {
id: panel
width: parent.width
- height: progressBar.height + toot.height + (mediaModel.count ? uploadedImages.height : 0)
- + btnContentWarning.height + Theme.paddingMedium
- + (warningContent.visible ? warningContent.height : 0)
+ height: progressBar.height + toot.height + (mediaModel.count ? uploadedImages.height : 0) + btnContentWarning.height + Theme.paddingMedium + (warningContent.visible ? warningContent.height : 0)
dock: Dock.Bottom
open: true
- animationDuration: 300
-
Rectangle {
+ id: progressBarBg
width: parent.width
height: progressBar.height
color: Theme.highlightBackgroundColor
@@ -220,17 +205,18 @@ Page {
autoScrollEnabled: true
labelVisible: false
font.pixelSize: Theme.fontSizeSmall
+ //: placeholderText in Toot content warning panel
placeholderText: qsTr("Write your warning here")
placeholderColor: palette.highlightColor
color: palette.highlightColor
horizontalAlignment: Text.AlignLeft
+ EnterKey.onClicked: {}
anchors {
top: parent.top
topMargin: Theme.paddingMedium
left: parent.left
right: parent.right
}
- EnterKey.onClicked: {}
}
TextInput {
@@ -270,7 +256,6 @@ Page {
textOperations.select(
textOperations.selectionStart ? textOperations.selectionStart - 1 : 0,
textOperations.selectionEnd)
- //console.log(textOperations.text.substr(textOperations.selectionStart, textOperations.selectionEnd))
console.log(toot.text.length)
suggestedUser = ""
if (textOperations.selectedText.charAt(0) === "@") {
@@ -317,8 +302,6 @@ Page {
RemorseItem {
id: remorse
cancelText: ""
-
-
}
Image {
@@ -362,22 +345,20 @@ Page {
IconButton {
id: btnContentWarning
+ icon.source: "image://theme/icon-s-warning?" + ( pressed ? Theme.highlightColor : (warningContent.visible ? Theme.secondaryHighlightColor : Theme.primaryColor) )
+ onClicked: warningContent.visible = !warningContent.visible
anchors {
top: toot.bottom
topMargin: -Theme.paddingSmall * 1.5
left: parent.left
leftMargin: Theme.paddingMedium
}
- icon.source: "image://theme/icon-s-warning?"
- + (pressed ? Theme.highlightColor : (warningContent.visible ? Theme.secondaryHighlightColor : Theme.primaryColor))
- onClicked: warningContent.visible = !warningContent.visible
}
IconButton {
id: btnAddImage
enabled: mediaModel.count < 4
- icon.source: "image://theme/icon-s-attach?"
- + (pressed ? Theme.highlightColor : (warningContent.visible ? Theme.secondaryHighlightColor : Theme.primaryColor))
+ icon.source: "image://theme/icon-s-attach?" + ( pressed ? Theme.highlightColor : (warningContent.visible ? Theme.secondaryHighlightColor : Theme.primaryColor) )
anchors {
top: toot.bottom
topMargin: -Theme.paddingSmall * 1.5
@@ -387,7 +368,7 @@ Page {
onClicked: {
btnAddImage.enabled = false
var once = true
- var imagePicker = pageStack.push("Sailfish.Pickers.ImagePickerPage", {"allowedOrientations": Orientation.All})
+ var imagePicker = pageStack.push("Sailfish.Pickers.ImagePickerPage", { "allowedOrientations": Orientation.All })
imagePicker.selectedContentChanged.connect(function () {
var imagePath = imagePicker.selectedContent
console.log(imagePath)
@@ -420,12 +401,6 @@ Page {
ComboBox {
id: privacy
- anchors {
- top: toot.bottom
- topMargin: -Theme.paddingSmall * 1.5
- left: btnAddImage.right
- right: btnSend.left
- }
menu: ContextMenu {
MenuItem {
text: qsTr("Public")
@@ -440,12 +415,17 @@ Page {
text: qsTr("Direct")
}
}
+ anchors {
+ top: toot.bottom
+ topMargin: -Theme.paddingSmall * 1.5
+ left: btnAddImage.right
+ right: btnSend.left
+ }
}
IconButton {
id: btnSend
- icon.source: "image://theme/icon-m-send?"
- + (pressed ? Theme.highlightColor : Theme.primaryColor)
+ icon.source: "image://theme/icon-m-send?" + (pressed ? Theme.highlightColor : Theme.primaryColor)
enabled: toot.text !== "" && toot.text.length < tootMaxChar && uploadProgress.width == 0
anchors {
top: toot.bottom
@@ -492,8 +472,10 @@ Page {
id: uploadProgress
color: Theme.highlightBackgroundColor
height: Theme.itemSizeSmall * 0.05
- anchors.bottom: parent.bottom
- anchors.left: parent.left
+ anchors {
+ bottom: parent.bottom
+ left: parent.left
+ }
}
}
@@ -563,9 +545,9 @@ Page {
color: Theme.highlightBackgroundColor
opacity: 0.2
anchors {
+ top: parent.top
left: parent.left
right: parent.right
- top: parent.top
}
}
@@ -576,8 +558,8 @@ Page {
color: Theme.highlightBackgroundColor
opacity: 0.7
anchors {
- left: parent.left
top: parent.top
+ left: parent.left
}
}
diff --git a/qml/pages/LoginPage.qml b/qml/pages/LoginPage.qml
index 288e4d8..5227d13 100644
--- a/qml/pages/LoginPage.qml
+++ b/qml/pages/LoginPage.qml
@@ -81,10 +81,10 @@ Page {
wrapMode: Text.WordWrap
width: parent.width
anchors {
- left: parent.left
- right: parent.right
topMargin: Theme.paddingMedium
+ left: parent.left
leftMargin: Theme.horizontalPageMargin
+ right: parent.right
rightMargin: Theme.horizontalPageMargin
}
}
diff --git a/qml/pages/MainPage.qml b/qml/pages/MainPage.qml
index 7d460a0..0ce3be1 100644
--- a/qml/pages/MainPage.qml
+++ b/qml/pages/MainPage.qml
@@ -135,7 +135,7 @@ Page {
mdl: ListModel {}
width: parent.width
height: parent.height
- onOpenDrawer: infoPanel.open = setDrawer
+ onOpenDrawer: isPortrait ? infoPanel.open = setDrawer : infoPanel.open = true
anchors.fill: parent
currentIndex: -1 // otherwise currentItem will steal focus
header: Item {
@@ -234,6 +234,7 @@ Page {
itemWidth: isTablet ? Math.round(parent.width) : parent.width
itemHeight: height
clip: true
+ model: visualModel
onCurrentIndexChanged: {
navigation.slideshowIndexChanged(currentIndex)
}
@@ -243,7 +244,6 @@ Page {
rightMargin: isPortrait ? 0 : infoPanel.visibleSize
bottomMargin: isPortrait ? infoPanel.visibleSize : 0
}
- model: visualModel
Component.onCompleted: {
}
}
diff --git a/qml/pages/ProfilePage.qml b/qml/pages/ProfilePage.qml
index 6956187..efb5b21 100644
--- a/qml/pages/ProfilePage.qml
+++ b/qml/pages/ProfilePage.qml
@@ -182,7 +182,7 @@ Page {
id: txtNote
text: note
textFormat: Text.StyledText
- color: Theme.highlightColor
+ color: Theme.secondaryHighlightColor
font.pixelSize: Theme.fontSizeExtraSmall
linkColor: Theme.secondaryColor
wrapMode: Text.Wrap
@@ -256,7 +256,7 @@ Page {
//: Will show as: "115 Statuses"
qsTr("Statuses")
font.pixelSize: Theme.fontSizeExtraSmall
- color: Theme.primaryColor
+ color: pressed ? Theme.highlightColor : Theme.primaryColor
wrapMode: Text.Wrap
MouseArea {
@@ -305,7 +305,6 @@ Page {
'conf' : Logic.conf
};
worker.sendMessage(msg);
- // to-do: create notification banner "Follow request sent!"
}
}
@@ -344,8 +343,8 @@ Page {
'params' : [],
'action' : "accounts/" + user_id + (blocking ? '/unblock':'/block'),
'conf' : Logic.conf
- };
- worker.sendMessage(msg);
+ }
+ worker.sendMessage(msg)
}
}
}
diff --git a/qml/pages/components/EmojiSelect.qml b/qml/pages/components/EmojiSelect.qml
index 1353f15..5580d37 100644
--- a/qml/pages/components/EmojiSelect.qml
+++ b/qml/pages/components/EmojiSelect.qml
@@ -4,7 +4,6 @@ import Sailfish.Silica 1.0
Dialog {
id: emojiDialog
- anchors.top: parent.top
allowedOrientations: Orientation.All
canAccept: false //selector.currentIndex >= 0
onAcceptPendingChanged: {
@@ -13,6 +12,7 @@ Dialog {
// acceptDestinationInstance.category = selector.value
}
}
+ anchors.top: parent.top
Column {
id: emojiColumn
@@ -20,6 +20,8 @@ Dialog {
width: parent.width
height: parent.height
+ VerticalScrollDecorator { flickable: gridView}
+
SilicaGridView {
id: gridView
header: PageHeader {
@@ -31,71 +33,170 @@ Dialog {
width: parent.width
height: parent.height
model: ListModel {
- ListElement { section: "smileys"; glyph: "๐" }
- ListElement { section: "smileys"; glyph: "๐" }
- ListElement { section: "smileys"; glyph: "๐" }
- ListElement { section: "smileys"; glyph: "๐" }
- ListElement { section: "smileys"; glyph: "๐
" }
- ListElement { section: "smileys"; glyph: "๐" }
- ListElement { section: "smileys"; glyph: "๐" }
- ListElement { section: "smileys"; glyph: "๐" }
- ListElement { section: "smileys"; glyph: "๐" }
- ListElement { section: "smileys"; glyph: "๐" }
- ListElement { section: "smileys"; glyph: "๐" }
- ListElement { section: "smileys"; glyph: "๐" }
- ListElement { section: "smileys"; glyph: "๐" }
- ListElement { section: "smileys"; glyph: "๐" }
- ListElement { section: "smileys"; glyph: "๐" }
- ListElement { section: "smileys"; glyph: "๐" }
- ListElement { section: "smileys"; glyph: "๐" }
- ListElement { section: "smileys"; glyph: "๐" }
- ListElement { section: "smileys"; glyph: "๐" }
- ListElement { section: "smileys"; glyph: "๐" }
- ListElement { section: "smileys"; glyph: "๐" }
- ListElement { section: "smileys"; glyph: "๐" }
- ListElement { section: "smileys"; glyph: "๐ " }
- ListElement { section: "smileys"; glyph: "๐ก" }
- ListElement { section: "smileys"; glyph: "๐ข" }
- ListElement { section: "smileys"; glyph: "๐ฃ" }
- ListElement { section: "smileys"; glyph: "๐ค" }
- ListElement { section: "smileys"; glyph: "๐ฅ" }
- ListElement { section: "smileys"; glyph: "๐จ" }
- ListElement { section: "smileys"; glyph: "๐ฉ" }
- ListElement { section: "smileys"; glyph: "๐ช" }
- ListElement { section: "smileys"; glyph: "๐ซ" }
- ListElement { section: "smileys"; glyph: "๐ญ" }
- ListElement { section: "smileys"; glyph: "๐ฐ" }
- ListElement { section: "smileys"; glyph: "๐ฑ" }
- ListElement { section: "smileys"; glyph: "๐ฒ" }
- ListElement { section: "smileys"; glyph: "๐ณ" }
- ListElement { section: "smileys"; glyph: "๐ต" }
- ListElement { section: "smileys"; glyph: "๐ท" }
- ListElement { section: "smileys"; glyph: "๐ธ" }
- ListElement { section: "smileys"; glyph: "๐น" }
- ListElement { section: "smileys"; glyph: "๐บ" }
- ListElement { section: "smileys"; glyph: "๐ป" }
- ListElement { section: "smileys"; glyph: "๐ผ" }
- ListElement { section: "smileys"; glyph: "๐ฝ" }
- ListElement { section: "smileys"; glyph: "๐พ" }
- ListElement { section: "smileys"; glyph: "๐ฟ" }
- ListElement { section: "smileys"; glyph: "๐" }
+ ListElement { section: "Smileys"; glyph: "๐" }
+ ListElement { section: "Smileys"; glyph: "๐" }
+ ListElement { section: "Smileys"; glyph: "๐" }
+ ListElement { section: "Smileys"; glyph: "๐" }
+ ListElement { section: "Smileys"; glyph: "โบ" }
+ ListElement { section: "Smileys"; glyph: "๐" }
+ ListElement { section: "Smileys"; glyph: "๐" }
+ ListElement { section: "Smileys"; glyph: "๐" }
+ ListElement { section: "Smileys"; glyph: "๐" }
+ ListElement { section: "Smileys"; glyph: "๐" }
+ ListElement { section: "Smileys"; glyph: "๐" }
+ ListElement { section: "Smileys"; glyph: "๐" }
+ ListElement { section: "Smileys"; glyph: "๐" }
+ ListElement { section: "Smileys"; glyph: "๐" }
+ ListElement { section: "Smileys"; glyph: "๐ณ" }
+ ListElement { section: "Smileys"; glyph: "๐" }
+ ListElement { section: "Smileys"; glyph: "๐" }
+ ListElement { section: "Smileys"; glyph: "๐" }
+ ListElement { section: "Smileys"; glyph: "๐" }
+ ListElement { section: "Smileys"; glyph: "๐" }
+ ListElement { section: "Smileys"; glyph: "๐ฃ" }
+ ListElement { section: "Smileys"; glyph: "๐ข" }
+ ListElement { section: "Smileys"; glyph: "๐" }
+ ListElement { section: "Smileys"; glyph: "๐ญ" }
+ ListElement { section: "Smileys"; glyph: "๐ช" }
+ ListElement { section: "Smileys"; glyph: "๐ฅ" }
+ ListElement { section: "Smileys"; glyph: "๐ฐ" }
+ ListElement { section: "Smileys"; glyph: "๐
" }
+ ListElement { section: "Smileys"; glyph: "๐ฉ" }
+ ListElement { section: "Smileys"; glyph: "๐ซ" }
+ ListElement { section: "Smileys"; glyph: "๐จ" }
+ ListElement { section: "Smileys"; glyph: "๐ฑ" }
+ ListElement { section: "Smileys"; glyph: "๐ " }
+ ListElement { section: "Smileys"; glyph: "๐ก" }
+ ListElement { section: "Smileys"; glyph: "๐ค" }
+ ListElement { section: "Smileys"; glyph: "๐" }
+ ListElement { section: "Smileys"; glyph: "๐" }
+ ListElement { section: "Smileys"; glyph: "๐" }
+ ListElement { section: "Smileys"; glyph: "๐ท" }
+ ListElement { section: "Smileys"; glyph: "๐" }
+ ListElement { section: "Smileys"; glyph: "๐ด" }
+ ListElement { section: "Smileys"; glyph: "๐ต" }
+ ListElement { section: "Smileys"; glyph: "๐ฒ" }
+ ListElement { section: "Smileys"; glyph: "๐" }
+ ListElement { section: "Smileys"; glyph: "๐ฆ" }
+ ListElement { section: "Smileys"; glyph: "๐ง" }
+ ListElement { section: "Smileys"; glyph: "๐" }
+ ListElement { section: "Smileys"; glyph: "๐ฟ" }
+ ListElement { section: "Smileys"; glyph: "๐ฎ" }
+ ListElement { section: "Smileys"; glyph: "๐ฌ" }
+ ListElement { section: "Smileys"; glyph: "๐" }
+ ListElement { section: "Smileys"; glyph: "๐" }
+ ListElement { section: "Smileys"; glyph: "๐ฏ" }
+ ListElement { section: "Smileys"; glyph: "๐ถ" }
+ ListElement { section: "Smileys"; glyph: "๐" }
+ ListElement { section: "Smileys"; glyph: "๐" }
+ ListElement { section: "Smileys"; glyph: "๐" }
- ListElement { section: "People and Fantasy"; glyph: "๐
" }
- ListElement { section: "People and Fantasy"; glyph: "๐" }
- ListElement { section: "People and Fantasy"; glyph: "๐" }
- ListElement { section: "People and Fantasy"; glyph: "๐" }
- ListElement { section: "People and Fantasy"; glyph: "๐" }
- ListElement { section: "People and Fantasy"; glyph: "๐" }
- ListElement { section: "People and Fantasy"; glyph: "๐" }
- ListElement { section: "People and Fantasy"; glyph: "๐" }
- ListElement { section: "People and Fantasy"; glyph: "๐" }
- ListElement { section: "People and Fantasy"; glyph: "๐" }
- ListElement { section: "People and Fantasy"; glyph: "๐" }
- ListElement { section: "People and Fantasy"; glyph: "๐" }
- ListElement { section: "People and Fantasy"; glyph: "โ" }
- ListElement { section: "People and Fantasy"; glyph: "๐ช" }
- ListElement { section: "People and Fantasy"; glyph: "๐" }
- ListElement { section: "People and Fantasy"; glyph: "๐" }
+ ListElement { section: "Cat Faces"; glyph: "๐บ" }
+ ListElement { section: "Cat Faces"; glyph: "๐ธ" }
+ ListElement { section: "Cat Faces"; glyph: "๐ป" }
+ ListElement { section: "Cat Faces"; glyph: "๐ฝ" }
+ ListElement { section: "Cat Faces"; glyph: "๐ผ" }
+ ListElement { section: "Cat Faces"; glyph: "๐" }
+ ListElement { section: "Cat Faces"; glyph: "๐ฟ" }
+ ListElement { section: "Cat Faces"; glyph: "๐น" }
+ ListElement { section: "Cat Faces"; glyph: "๐พ" }
+
+ ListElement { section: "Other Faces"; glyph: "๐น" }
+ ListElement { section: "Other Faces"; glyph: "๐บ" }
+ ListElement { section: "Other Faces"; glyph: "๐" }
+ ListElement { section: "Other Faces"; glyph: "๐" }
+ ListElement { section: "Other Faces"; glyph: "๐" }
+ ListElement { section: "Other Faces"; glyph: "๐" }
+ ListElement { section: "Other Faces"; glyph: "๐ฝ" }
+
+ ListElement { section: "Misc Emoji"; glyph: "๐ฅ" }
+ ListElement { section: "Misc Emoji"; glyph: "โจ" }
+ ListElement { section: "Misc Emoji"; glyph: "๐" }
+ ListElement { section: "Misc Emoji"; glyph: "๐ซ" }
+ ListElement { section: "Misc Emoji"; glyph: "๐ฅ" }
+ ListElement { section: "Misc Emoji"; glyph: "๐ข" }
+ ListElement { section: "Misc Emoji"; glyph: "๐ฆ" }
+ ListElement { section: "Misc Emoji"; glyph: "๐ง" }
+ ListElement { section: "Misc Emoji"; glyph: "๐ค" }
+ ListElement { section: "Misc Emoji"; glyph: "๐จ" }
+ ListElement { section: "Misc Emoji"; glyph: "๐" }
+ ListElement { section: "Misc Emoji"; glyph: "๐" }
+ ListElement { section: "Misc Emoji"; glyph: "๐" }
+ ListElement { section: "Misc Emoji"; glyph: "๐
" }
+ ListElement { section: "Misc Emoji"; glyph: "๐" }
+ ListElement { section: "Misc Emoji"; glyph: "๐" }
+ ListElement { section: "Misc Emoji"; glyph: "๐" }
+ ListElement { section: "Misc Emoji"; glyph: "๐" }
+ ListElement { section: "Misc Emoji"; glyph: "๐" }
+ ListElement { section: "Misc Emoji"; glyph: "โ" }
+ ListElement { section: "Misc Emoji"; glyph: "โ" }
+ ListElement { section: "Misc Emoji"; glyph: "๐" }
+ ListElement { section: "Misc Emoji"; glyph: "โ" }
+ ListElement { section: "Misc Emoji"; glyph: "๐" }
+ ListElement { section: "Misc Emoji"; glyph: "๐" }
+ ListElement { section: "Misc Emoji"; glyph: "๐" }
+ ListElement { section: "Misc Emoji"; glyph: "๐" }
+ ListElement { section: "Misc Emoji"; glyph: "๐" }
+ ListElement { section: "Misc Emoji"; glyph: "๐" }
+ ListElement { section: "Misc Emoji"; glyph: "๐" }
+ ListElement { section: "Misc Emoji"; glyph: "โ" }
+ ListElement { section: "Misc Emoji"; glyph: "๐" }
+ ListElement { section: "Misc Emoji"; glyph: "๐ช" }
+
+ ListElement { section: "Animals Emoji"; glyph: "๐ถ" }
+ ListElement { section: "Animals Emoji"; glyph: "๐บ" }
+ ListElement { section: "Animals Emoji"; glyph: "๐ฑ" }
+ ListElement { section: "Animals Emoji"; glyph: "๐ญ" }
+ ListElement { section: "Animals Emoji"; glyph: "๐น" }
+ ListElement { section: "Animals Emoji"; glyph: "๐ฐ" }
+ ListElement { section: "Animals Emoji"; glyph: "๐ธ" }
+ ListElement { section: "Animals Emoji"; glyph: "๐ฏ" }
+ ListElement { section: "Animals Emoji"; glyph: "๐จ" }
+ ListElement { section: "Animals Emoji"; glyph: "๐" }
+ ListElement { section: "Animals Emoji"; glyph: "๐ผ" }
+ ListElement { section: "Animals Emoji"; glyph: "๐ง" }
+ ListElement { section: "Animals Emoji"; glyph: "๐ฆ" }
+ ListElement { section: "Animals Emoji"; glyph: "๐ค" }
+ ListElement { section: "Animals Emoji"; glyph: "๐ฅ" }
+ ListElement { section: "Animals Emoji"; glyph: "๐ฃ" }
+ ListElement { section: "Animals Emoji"; glyph: "๐" }
+ ListElement { section: "Animals Emoji"; glyph: "๐" }
+ ListElement { section: "Animals Emoji"; glyph: "๐ข" }
+ ListElement { section: "Animals Emoji"; glyph: "๐" }
+ ListElement { section: "Animals Emoji"; glyph: "๐" }
+ ListElement { section: "Animals Emoji"; glyph: "๐" }
+ ListElement { section: "Animals Emoji"; glyph: "๐" }
+ ListElement { section: "Animals Emoji"; glyph: "๐" }
+ ListElement { section: "Animals Emoji"; glyph: "๐" }
+ ListElement { section: "Animals Emoji"; glyph: "๐" }
+ ListElement { section: "Animals Emoji"; glyph: "๐ " }
+ ListElement { section: "Animals Emoji"; glyph: "๐" }
+ ListElement { section: "Animals Emoji"; glyph: "๐ฌ" }
+ ListElement { section: "Animals Emoji"; glyph: "๐ณ" }
+ ListElement { section: "Animals Emoji"; glyph: "๐" }
+ ListElement { section: "Animals Emoji"; glyph: "๐" }
+ ListElement { section: "Animals Emoji"; glyph: "๐" }
+ ListElement { section: "Animals Emoji"; glyph: "๐" }
+ ListElement { section: "Animals Emoji"; glyph: "๐" }
+ ListElement { section: "Animals Emoji"; glyph: "๐
" }
+ ListElement { section: "Animals Emoji"; glyph: "๐" }
+ ListElement { section: "Animals Emoji"; glyph: "๐" }
+ ListElement { section: "Animals Emoji"; glyph: "๐" }
+ ListElement { section: "Animals Emoji"; glyph: "๐" }
+ ListElement { section: "Animals Emoji"; glyph: "๐" }
+ ListElement { section: "Animals Emoji"; glyph: "๐" }
+ ListElement { section: "Animals Emoji"; glyph: "๐" }
+ ListElement { section: "Animals Emoji"; glyph: "๐" }
+ ListElement { section: "Animals Emoji"; glyph: "๐" }
+ ListElement { section: "Animals Emoji"; glyph: "๐ฒ" }
+ ListElement { section: "Animals Emoji"; glyph: "๐ก" }
+ ListElement { section: "Animals Emoji"; glyph: "๐" }
+ ListElement { section: "Animals Emoji"; glyph: "๐ซ" }
+ ListElement { section: "Animals Emoji"; glyph: "๐ช" }
+ ListElement { section: "Animals Emoji"; glyph: "๐" }
+ ListElement { section: "Animals Emoji"; glyph: "๐" }
+ ListElement { section: "Animals Emoji"; glyph: "๐ฉ" }
+ ListElement { section: "Animals Emoji"; glyph: "๐พ" }
ListElement { section: "Transport and Map"; glyph: "๐" }
ListElement { section: "Transport and Map"; glyph: "๐" }
@@ -151,9 +252,10 @@ Dialog {
Label {
text: glyph
font.pixelSize: Theme.fontSizeLarge
- color: (highlighted ? Theme.secondaryHighlightColor : Theme.secondaryColor)
+ color: highlighted ? Theme.secondaryHighlightColor : Theme.secondaryColor
anchors.centerIn: parent
}
+
onClicked: {
var cursorPosition = toot.cursorPosition
toot.text = toot.text.substring(
@@ -164,7 +266,6 @@ Dialog {
emojiDialog.accept()
}
}
- VerticalScrollDecorator { flickable: listEmojis }
}
}
}
diff --git a/qml/pages/components/InfoBanner.qml b/qml/pages/components/InfoBanner.qml
index 048a43f..e740634 100644
--- a/qml/pages/components/InfoBanner.qml
+++ b/qml/pages/components/InfoBanner.qml
@@ -5,8 +5,9 @@ import Sailfish.Silica 1.0
DockedPanel {
id: root
dock: Dock.Top
- width: parent.width
+ width: isPortrait ? parent.width : Theme.buttonWidthLarge * 1.5
height: content.height
+ anchors.horizontalCenter: parent.horizontalCenter
Rectangle {
id: content
diff --git a/qml/pages/components/ItemUser.qml b/qml/pages/components/ItemUser.qml
index 4220a76..02913eb 100644
--- a/qml/pages/components/ItemUser.qml
+++ b/qml/pages/components/ItemUser.qml
@@ -18,7 +18,6 @@ BackgroundItem {
anchors.left: parent.left
anchors.leftMargin: Theme.horizontalPageMargin
-
Image {
id: img
opacity: status === Image.Ready ? 1.0 : 0.0
@@ -56,7 +55,7 @@ BackgroundItem {
}
Item {
- id: userdescription
+ id: userDescription
height: account_acct.height + display_name.height
anchors.left: avatar.right
anchors.leftMargin: Theme.paddingLarge
@@ -72,7 +71,6 @@ BackgroundItem {
truncationMode: TruncationMode.Fade
width: parent.width - Theme.paddingMedium
anchors.top: parent.top
-
}
Label {
diff --git a/qml/pages/components/MediaFullScreen.qml b/qml/pages/components/MediaFullScreen.qml
index d0f9119..f4adf7d 100644
--- a/qml/pages/components/MediaFullScreen.qml
+++ b/qml/pages/components/MediaFullScreen.qml
@@ -287,23 +287,23 @@ FullscreenContentPage {
IconButton {
y: Theme.paddingLarge
+ icon.source: "image://theme/icon-m-dismiss"
+ onClicked: pageStack.pop()
anchors {
right: parent.right
rightMargin: Theme.horizontalPageMargin
}
- icon.source: "image://theme/icon-m-dismiss"
- onClicked: pageStack.pop()
}
IconButton {
id: mediaDlBtn
+ icon.source: "image://theme/icon-m-cloud-download"
anchors {
right: parent.right
rightMargin: Theme.horizontalPageMargin
bottom: parent.bottom
bottomMargin: Theme.horizontalPageMargin
}
- icon.source: "image://theme/icon-m-cloud-download"
onClicked: {
var filename = mediaURL.split("/")
FileDownloader.downloadFile(mediaURL, filename[filename.length-1])
@@ -327,7 +327,6 @@ FullscreenContentPage {
} else {
video.play()
hideTimer.start()
-
}
}
}
@@ -354,7 +353,6 @@ FullscreenContentPage {
overlayIcons.active = !overlayIcons.active
}
}
-
}
VerticalScrollDecorator { flickable: imageFlickable }
diff --git a/qml/pages/components/MiniHeader.qml b/qml/pages/components/MiniHeader.qml
index 1774e95..3cf3cd3 100644
--- a/qml/pages/components/MiniHeader.qml
+++ b/qml/pages/components/MiniHeader.qml
@@ -48,9 +48,9 @@ Item {
width: parent.width - Theme.paddingMedium
truncationMode: TruncationMode.Fade
anchors {
+ top: lblName.bottom
left: parent.left
leftMargin: Theme.paddingMedium
- top: lblName.bottom
}
}
diff --git a/qml/pages/components/MiniStatus.qml b/qml/pages/components/MiniStatus.qml
index 946fe98..96170fe 100644
--- a/qml/pages/components/MiniStatus.qml
+++ b/qml/pages/components/MiniStatus.qml
@@ -5,8 +5,8 @@ import Sailfish.Silica 1.0
Item {
id: miniStatus
visible: true
- height: icon.height+Theme.paddingMedium
width: parent.width
+ height: icon.height+Theme.paddingMedium
Icon {
id: icon
@@ -18,9 +18,9 @@ Item {
anchors {
top: parent.top
topMargin: Theme.paddingMedium
- bottomMargin: Theme.paddingMedium
left: parent.left
leftMargin: Theme.horizontalPageMargin + Theme.iconSizeMedium - width
+ bottomMargin: Theme.paddingMedium
}
}
diff --git a/qml/pages/components/MyList.qml b/qml/pages/components/MyList.qml
index d903ccc..3d96f61 100644
--- a/qml/pages/components/MyList.qml
+++ b/qml/pages/components/MyList.qml
@@ -188,7 +188,7 @@ SilicaListView {
'model' : model,
'mode' : mode,
'conf' : Logic.conf
- };
+ }
console.log(JSON.stringify(msg))
if (type !== "")
diff --git a/qml/pages/components/MyMedia.qml b/qml/pages/components/MyMedia.qml
index 32fe464..4e5c980 100644
--- a/qml/pages/components/MyMedia.qml
+++ b/qml/pages/components/MyMedia.qml
@@ -34,7 +34,7 @@ Item {
Image {
visible: type == 'audio'
- opacity: img.status === Image.Ready ? 0.0 : 1.0
+ //opacity: img.status === Image.Ready ? 0.0 : 1.0
Behavior on opacity { FadeAnimator {} }
source: "image://theme/icon-m-file-audio?"
anchors.centerIn: parent
@@ -85,24 +85,25 @@ Item {
BusyIndicator {
id: mediaLoader
+ visible: type != 'audio'
size: BusyIndicatorSize.Large
running: img.status !== Image.Ready
opacity: img.status === Image.Ready ? 0.0 : 1.0
- anchors.verticalCenter: parent.verticalCenter
- anchors.horizontalCenter: parent.horizontalCenter
+ anchors {
+ verticalCenter: parent.verticalCenter
+ horizontalCenter: parent.horizontalCenter
+ }
}
Rectangle {
id: mediaWarning
color: Theme.highlightDimmerColor
visible: typeof status_sensitive != "undefined" && status_sensitive ? true : false
- anchors.fill: parent
-
Image {
source: "image://theme/icon-l-attention?"+Theme.highlightColor
anchors.centerIn: parent
}
-
+ anchors.fill: parent
MouseArea {
anchors.fill: parent
onClicked: parent.visible = false
diff --git a/qml/pages/components/ProfileHeader.qml b/qml/pages/components/ProfileHeader.qml
index 5cddfbd..7fbb541 100644
--- a/qml/pages/components/ProfileHeader.qml
+++ b/qml/pages/components/ProfileHeader.qml
@@ -181,8 +181,10 @@ Item {
text: qsTr("Bot")
font.pixelSize: Theme.fontSizeExtraSmall
color: Theme.primaryColor
- anchors.horizontalCenter: parent.horizontalCenter
- anchors.verticalCenter: parent.verticalCenter
+ anchors {
+ horizontalCenter: parent.horizontalCenter
+ verticalCenter: parent.verticalCenter
+ }
}
}
}
diff --git a/qml/pages/components/VisualContainer.qml b/qml/pages/components/VisualContainer.qml
index 57cacb3..54c2e0d 100644
--- a/qml/pages/components/VisualContainer.qml
+++ b/qml/pages/components/VisualContainer.qml
@@ -198,7 +198,6 @@ BackgroundItem {
console.log(link)
console.log(JSON.stringify(test))
console.log(JSON.stringify(test.length))
-
if (test.length === 5 && (test[3] === "tags" || test[3] === "tag") ) {
pageStack.pop(pageStack.find(function(page) {
var check = page.isFirstPage === true;
@@ -341,8 +340,8 @@ BackgroundItem {
width: Theme.iconSizeSmall
height: width
anchors {
- leftMargin: Theme.horizontalPageMargin
left: parent.left
+ leftMargin: Theme.horizontalPageMargin
verticalCenter: parent.verticalCenter
}
}
@@ -389,7 +388,6 @@ BackgroundItem {
}
}
-
MenuItem {
id: mnuMention
visible: model.type === "follow"
diff --git a/translations/harbour-tooter-de.ts b/translations/harbour-tooter-de.ts
index a85cd34..f0adf3f 100644
--- a/translations/harbour-tooter-de.ts
+++ b/translations/harbour-tooter-de.ts
@@ -29,6 +29,7 @@
+ placeholderText in Toot content warning panel
Inhaltswarnung
@@ -77,11 +78,11 @@
EmojiSelect
-
+ Emojis
-
+ Tippen um einzufรผgen
@@ -118,38 +119,38 @@
MainPage
-
+ Home
-
+ Benachrichtigungen
-
+ Lokal
-
+ Fรถderiert
-
+ Suche
-
+ @Benutzer oder #Ausdruck
- Neuer Toot
+ Neuer Toot
MediaFullScreen
-
+ Ladefehler
@@ -191,7 +192,7 @@
- Im Browser รถffnen
+ Im Browser รถffnen
@@ -214,61 +215,61 @@
If there's no good translation for "About", use "Details" (in details about profile).
-
+ Details
Will show as: "35 Followers"
-
+ Folgende
Will show as: "23 Following"
-
+ Folgt
Will show as: "115 Statuses"
-
+ Beitrรคge
- Erwรคhnen
+ Erwรคhnen
Is a button. Keep it as short as possible.
-
+ Entfolgen
Is a button. Keep it as short as possible.
-
+ Angefragt
Is a button. Keep it as short as possible.
-
+ Folgen
Is a button. Keep it as short as possible.
-
+ Nicht stumm
Is a button. Keep it as short as possible.
-
+ Stumm schalten
Is a button. Keep it as short as possible.
-
+ Zulassen
Is a button. Keep it as short as possible.
-
+ Blockieren
diff --git a/translations/harbour-tooter-el.ts b/translations/harbour-tooter-el.ts
index 5be46c0..25a224e 100644
--- a/translations/harbour-tooter-el.ts
+++ b/translations/harbour-tooter-el.ts
@@ -29,6 +29,7 @@
+ placeholderText in Toot content warning panel
@@ -118,15 +119,15 @@
MainPage
-
+ ฮฮนฮบฮฟฯฮตฮปฮฏฮดฮฑ
-
+ ฮฮนฮดฮฟฯฮฟฮนฮฎฯฮตฮนฯ
-
+ ฮคฮฟฯฮนฮบฯฯ
@@ -134,15 +135,15 @@
-
+ ฮฮฝฮฑฮถฮฎฯฮทฯฮท
-
+ @ฯฯฮฎฯฯฮท ฮฎ #ฯฯฮฟฯ
- ฮฮญฮฟฯ
+ ฮฮญฮฟฯ
@@ -187,7 +188,7 @@
- ฮฯฮฑฮฝฮฑฯฯฯฯฯฯฮท
+ ฮฆฯฯฯฯฯฮท ฯฮตฯฮนฯฯฮฟฯฮญฯฯฮฝ
@@ -219,26 +220,26 @@
Will show as: "35 Followers"
-
+ ฮฃฮฑฯ ฮฑฮบฮฟฮปฮฟฯ
ฮธฮฟฯฮฝ
Will show as: "23 Following"
-
+ ฮฃฮต ฯฮฑฯฮฑฮบฮฟฮปฮฟฯฮธฮทฯฮท
Will show as: "115 Statuses"
-
+ ฮฮฑฯฮฌฯฯฮฑฯฮท
-
+ ฮฆฯฮฑฮณฮฎ
Is a button. Keep it as short as possible.
-
+ ฮฮฝฮฑฮฏฯฮตฯฮท ฯฮฑฯฮฑฮบฮฟฮปฮฟฯฮธฮทฯฮทฯ
@@ -248,22 +249,22 @@
Is a button. Keep it as short as possible.
-
+ ฮ ฮฑฯฮฑฮบฮฟฮปฮฟฯฮธฮทฯฮท
Is a button. Keep it as short as possible.
-
+ ฮฮฝฮฑฮฏฯฮตฯฮท ฯฮฏฮณฮฑฯฮทฯ
Is a button. Keep it as short as possible.
-
+ ฮฃฮฏฮณฮฑฯฮท
Is a button. Keep it as short as possible.
-
+ ฮฮฝฮฑฮฏฯฮตฯฮท ฯฯฮฑฮณฮฎฯ
@@ -376,7 +377,7 @@
-
+ ฮฆฯฮฑฮณฮฎ
diff --git a/translations/harbour-tooter-es.ts b/translations/harbour-tooter-es.ts
index fc84ce7..6973817 100644
--- a/translations/harbour-tooter-es.ts
+++ b/translations/harbour-tooter-es.ts
@@ -29,6 +29,7 @@
+ placeholderText in Toot content warning panel
Escribe aquรญ tu advertencia
diff --git a/translations/harbour-tooter-fr.ts b/translations/harbour-tooter-fr.ts
index 3135fb6..aa50e34 100644
--- a/translations/harbour-tooter-fr.ts
+++ b/translations/harbour-tooter-fr.ts
@@ -29,6 +29,7 @@
+ placeholderText in Toot content warning panel
Rรฉdigez votre alerte ici
@@ -77,11 +78,11 @@
EmojiSelect
-
+ Emojis
-
+ Appuyez pour insรฉrer
@@ -118,27 +119,27 @@
MainPage
-
+ Accueil
-
+ Notifications
-
+ Fil public local
-
+ Fil public global
-
+ Rechercher
-
+ @personne ou #terme
@@ -149,7 +150,7 @@
MediaFullScreen
-
+ Erreur au chargement
@@ -191,7 +192,7 @@
- Ouvrir dans le navigateur
+ Ouvrir dans le navigateur
@@ -214,61 +215,61 @@
If there's no good translation for "About", use "Details" (in details about profile).
-
+ Dรฉtails
Will show as: "35 Followers"
-
+ Abonnรฉ(e)s
Will show as: "23 Following"
-
+ Abonnements
Will show as: "115 Statuses"
-
+ Pouets
- Mentionner
+ Mentionner
Is a button. Keep it as short as possible.
-
+ Ne plus suivre
Is a button. Keep it as short as possible.
-
+ Demandรฉ
Is a button. Keep it as short as possible.
-
+ Suivre
Is a button. Keep it as short as possible.
-
+ Dรฉmasquer
Is a button. Keep it as short as possible.
-
+ Masquer
Is a button. Keep it as short as possible.
-
+ Dรฉbloquer
Is a button. Keep it as short as possible.
-
+ Bloquer
diff --git a/translations/harbour-tooter-it.ts b/translations/harbour-tooter-it.ts
index 93cb7c3..4e12a4d 100644
--- a/translations/harbour-tooter-it.ts
+++ b/translations/harbour-tooter-it.ts
@@ -29,6 +29,7 @@
+ placeholderText in Toot content warning panel
Contenuto avviso
@@ -77,11 +78,11 @@
EmojiSelect
-
+ Emojis
-
+ Tap per inserire
@@ -118,38 +119,38 @@
MainPage
-
+ Home
-
+ Notifiche
-
+ Locale
-
+ Federazione
-
+ Cerca
-
+ @utente o #terme
- Nuovo Toot
+ Nuovo Toot
MediaFullScreen
-
+ Errore durante caricamento
@@ -191,7 +192,7 @@
- Aprire nel browser
+ Aprire nel browser
@@ -214,61 +215,61 @@
If there's no good translation for "About", use "Details" (in details about profile).
-
+ Dettagli
Will show as: "35 Followers"
-
+ Seguaci
Will show as: "23 Following"
-
+ Segue
Will show as: "115 Statuses"
-
+ Toots
- Menzionare
+ Menzionare
Is a button. Keep it as short as possible.
-
+ Smetti di seguire
Is a button. Keep it as short as possible.
-
+ Richiesto
Is a button. Keep it as short as possible.
-
+ Segui
Is a button. Keep it as short as possible.
-
+ Non silenziare
Is a button. Keep it as short as possible.
-
+ Silenzia
Is a button. Keep it as short as possible.
-
+ Sblocca
Is a button. Keep it as short as possible.
-
+ Blocca
diff --git a/translations/harbour-tooter-nl.ts b/translations/harbour-tooter-nl.ts
index 83c891a..9e6e937 100644
--- a/translations/harbour-tooter-nl.ts
+++ b/translations/harbour-tooter-nl.ts
@@ -29,6 +29,7 @@
+ placeholderText in Toot content warning panel
Waarschuwingstekst
diff --git a/translations/harbour-tooter-nl_BE.ts b/translations/harbour-tooter-nl_BE.ts
index f0e21c0..20dccf8 100644
--- a/translations/harbour-tooter-nl_BE.ts
+++ b/translations/harbour-tooter-nl_BE.ts
@@ -29,6 +29,7 @@
+ placeholderText in Toot content warning panel
diff --git a/translations/harbour-tooter-oc.ts b/translations/harbour-tooter-oc.ts
index 6599ff6..8eb237f 100644
--- a/translations/harbour-tooter-oc.ts
+++ b/translations/harbour-tooter-oc.ts
@@ -29,6 +29,7 @@
+ placeholderText in Toot content warning panel
diff --git a/translations/harbour-tooter-pl.ts b/translations/harbour-tooter-pl.ts
index be3604d..41e4364 100644
--- a/translations/harbour-tooter-pl.ts
+++ b/translations/harbour-tooter-pl.ts
@@ -29,6 +29,7 @@
+ placeholderText in Toot content warning panel
diff --git a/translations/harbour-tooter-ru.ts b/translations/harbour-tooter-ru.ts
index a9224f4..495b13c 100644
--- a/translations/harbour-tooter-ru.ts
+++ b/translations/harbour-tooter-ru.ts
@@ -29,6 +29,7 @@
+ placeholderText in Toot content warning panel
ะขะตะบัั ะฟัะตะดัะฟัะตะถะดะตะฝะธั
diff --git a/translations/harbour-tooter-sr.ts b/translations/harbour-tooter-sr.ts
index 1a0f511..5cc6c90 100644
--- a/translations/harbour-tooter-sr.ts
+++ b/translations/harbour-tooter-sr.ts
@@ -29,6 +29,7 @@
+ placeholderText in Toot content warning panel
diff --git a/translations/harbour-tooter-sv.ts b/translations/harbour-tooter-sv.ts
index 7e3b76b..da2e70c 100644
--- a/translations/harbour-tooter-sv.ts
+++ b/translations/harbour-tooter-sv.ts
@@ -29,6 +29,7 @@
+ placeholderText in Toot content warning panel
diff --git a/translations/harbour-tooter-zh_CN.ts b/translations/harbour-tooter-zh_CN.ts
index 062036b..f82ed64 100644
--- a/translations/harbour-tooter-zh_CN.ts
+++ b/translations/harbour-tooter-zh_CN.ts
@@ -29,6 +29,7 @@
+ placeholderText in Toot content warning panel
ๅจๆญค็ผๅไฝ ็่ญฆๅไฟกๆฏ
diff --git a/translations/harbour-tooter.ts b/translations/harbour-tooter.ts
index 8e242a8..09af8b4 100644
--- a/translations/harbour-tooter.ts
+++ b/translations/harbour-tooter.ts
@@ -29,6 +29,7 @@
+ placeholderText in Toot content warning panel
Write your warning here