medvedych/harbour-tooter
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

ui improvements / landscape support

Browse source
This commit is contained in:
molan-git 2020-07-03 10:45:30 +02:00
parent 699265fca7
commit 95f065fd5b
28 changed files with 327 additions and 233 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

76
qml/pages/ConversationPage.qml
View file

@ -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
@ -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
}
}

4
qml/pages/LoginPage.qml
View file

@ -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
}
}

4
qml/pages/MainPage.qml
View file

@ -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: {
}
}

9
qml/pages/ProfilePage.qml
View file

@ -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)
}
}
}

235
qml/pages/components/EmojiSelect.qml
View file

@ -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 }
}
}
}

3
qml/pages/components/InfoBanner.qml
View file

@ -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

4
qml/pages/components/ItemUser.qml
View file

@ -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 {

8
qml/pages/components/MediaFullScreen.qml
View file

@ -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 }

2
qml/pages/components/MiniHeader.qml
View file

@ -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
}
}

4
qml/pages/components/MiniStatus.qml
View file

@ -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
}
}

2
qml/pages/components/MyList.qml
View file

@ -188,7 +188,7 @@ SilicaListView {
'model' : model,
'mode' : mode,
'conf' : Logic.conf
};
}
console.log(JSON.stringify(msg))
if (type !== "")

13
qml/pages/components/MyMedia.qml
View file

@ -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

6
qml/pages/components/ProfileHeader.qml
View file

@ -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
}
}
}
}

4
qml/pages/components/VisualContainer.qml
View file

@ -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"

47
translations/harbour-tooter-de.ts
View file

@ -29,6 +29,7 @@
</message>
<message>
<source>Write your warning here</source>
<extracomment>placeholderText in Toot content warning panel</extracomment>
<translation>Inhaltswarnung</translation>
</message>
<message>
@ -77,11 +78,11 @@
<name>EmojiSelect</name>
<message>
<source>Emojis</source>
<translation type="unfinished"></translation>
<translation>Emojis</translation>
</message>
<message>
<source>Tap to insert</source>
<translation type="unfinished"></translation>
<translation>Tippen um einzufügen</translation>
</message>
</context>
<context>
@ -118,38 +119,38 @@
<name>MainPage</name>
<message>
<source>Home</source>
<translation type="unfinished"></translation>
<translation>Home</translation>
</message>
<message>
<source>Notifications</source>
<translation type="unfinished"></translation>
<translation>Benachrichtigungen</translation>
</message>
<message>
<source>Local</source>
<translation type="unfinished"></translation>
<translation>Lokal</translation>
</message>
<message>
<source>Federated</source>
<translation type="unfinished"></translation>
<translation>Föderiert</translation>
</message>
<message>
<source>Search</source>
<translation type="unfinished"></translation>
<translation>Suche</translation>
</message>
<message>
<source>@user or #term</source>
<translation type="unfinished"></translation>
<translation>@Benutzer oder #Ausdruck</translation>
</message>
<message>
<source>New Toot</source>
<translation type="unfinished">Neuer Toot</translation>
<translation>Neuer Toot</translation>
</message>
</context>
<context>
<name>MediaFullScreen</name>
<message>
<source>Error loading</source>
<translation type="unfinished"></translation>
<translation>Ladefehler</translation>
</message>
</context>
<context>
@ -191,7 +192,7 @@
</message>
<message>
<source>Open in Browser</source>
<translation type="unfinished">Im Browser öffnen</translation>
<translation>Im Browser öffnen</translation>
</message>
</context>
<context>
@ -214,61 +215,61 @@
<message>
<source>About</source>
<extracomment>If there&apos;s no good translation for &quot;About&quot;, use &quot;Details&quot; (in details about profile).</extracomment>
<translation type="unfinished"></translation>
<translation>Details</translation>
</message>
<message>
<source>Followers</source>
<extracomment>Will show as: &quot;35 Followers&quot;</extracomment>
<translation type="unfinished"></translation>
<translation>Folgende</translation>
</message>
<message>
<source>Following</source>
<extracomment>Will show as: &quot;23 Following&quot;</extracomment>
<translation type="unfinished"></translation>
<translation>Folgt</translation>
</message>
<message>
<source>Statuses</source>
<extracomment>Will show as: &quot;115 Statuses&quot;</extracomment>
<translation type="unfinished"></translation>
<translation>Beiträge</translation>
</message>
<message>
<source>Mention</source>
<translation type="unfinished">Erwähnen</translation>
<translation>Erwähnen</translation>
</message>
<message>
<source>Unfollow</source>
<extracomment>Is a button. Keep it as short as possible.</extracomment>
<translation type="unfinished"></translation>
<translation>Entfolgen</translation>
</message>
<message>
<source>Requested</source>
<extracomment>Is a button. Keep it as short as possible.</extracomment>
<translation type="unfinished"></translation>
<translation>Angefragt</translation>
</message>
<message>
<source>Follow</source>
<extracomment>Is a button. Keep it as short as possible.</extracomment>
<translation type="unfinished"></translation>
<translation>Folgen</translation>
</message>
<message>
<source>Unmute</source>
<extracomment>Is a button. Keep it as short as possible.</extracomment>
<translation type="unfinished"></translation>
<translation>Nicht stumm</translation>
</message>
<message>
<source>Mute</source>
<extracomment>Is a button. Keep it as short as possible.</extracomment>
<translation type="unfinished"></translation>
<translation>Stumm schalten</translation>
</message>
<message>
<source>Unblock</source>
<extracomment>Is a button. Keep it as short as possible.</extracomment>
<translation type="unfinished"></translation>
<translation>Zulassen</translation>
</message>
<message>
<source>Block</source>
<extracomment>Is a button. Keep it as short as possible.</extracomment>
<translation type="unfinished"></translation>
<translation>Blockieren</translation>
</message>
</context>
<context>

35
translations/harbour-tooter-el.ts
View file

@ -29,6 +29,7 @@
</message>
<message>
<source>Write your warning here</source>
<extracomment>placeholderText in Toot content warning panel</extracomment>
<translation type="unfinished"></translation>
</message>
<message>
@ -118,15 +119,15 @@
<name>MainPage</name>
<message>
<source>Home</source>
<translation type="unfinished"></translation>
<translation>Οικοσελίδα</translation>
</message>
<message>
<source>Notifications</source>
<translation type="unfinished"></translation>
<translation>Ειδοποιήσεις</translation>
</message>
<message>
<source>Local</source>
<translation type="unfinished"></translation>
<translation>Τοπικός</translation>
</message>
<message>
<source>Federated</source>
@ -134,15 +135,15 @@
</message>
<message>
<source>Search</source>
<translation type="unfinished"></translation>
<translation>Αναζήτηση</translation>
</message>
<message>
<source>@user or #term</source>
<translation type="unfinished"></translation>
<translation>@χρήστη ή #όρος</translation>
</message>
<message>
<source>New Toot</source>
<translation type="unfinished">Νέος</translation>
<translation>Νέος</translation>
</message>
</context>
<context>
@ -187,7 +188,7 @@
</message>
<message>
<source>Reload</source>
<translation type="unfinished">Επαναφόρτωση</translation>
<translation>Φόρτωση περισσοτέρων</translation>
</message>
<message>
<source>Open in Browser</source>
@ -219,26 +220,26 @@
<message>
<source>Followers</source>
<extracomment>Will show as: &quot;35 Followers&quot;</extracomment>
<translation type="unfinished"></translation>
<translation>Σας ακολουθούν</translation>
</message>
<message>
<source>Following</source>
<extracomment>Will show as: &quot;23 Following&quot;</extracomment>
<translation type="unfinished"></translation>
<translation>Σε παρακολούθηση</translation>
</message>
<message>
<source>Statuses</source>
<extracomment>Will show as: &quot;115 Statuses&quot;</extracomment>
<translation type="unfinished"></translation>
<translation>Κατάσταση</translation>
</message>
<message>
<source>Mention</source>
<translation type="unfinished"></translation>
<translation>Φραγή</translation>
</message>
<message>
<source>Unfollow</source>
<extracomment>Is a button. Keep it as short as possible.</extracomment>
<translation type="unfinished"></translation>
<translation>Αναίρεση παρακολούθησης</translation>
</message>
<message>
<source>Requested</source>
@ -248,22 +249,22 @@
<message>
<source>Follow</source>
<extracomment>Is a button. Keep it as short as possible.</extracomment>
<translation type="unfinished"></translation>
<translation>Παρακολούθηση</translation>
</message>
<message>
<source>Unmute</source>
<extracomment>Is a button. Keep it as short as possible.</extracomment>
<translation type="unfinished"></translation>
<translation>Αναίρεση σίγασης</translation>
</message>
<message>
<source>Mute</source>
<extracomment>Is a button. Keep it as short as possible.</extracomment>
<translation type="unfinished"></translation>
<translation>Σίγαση</translation>
</message>
<message>
<source>Unblock</source>
<extracomment>Is a button. Keep it as short as possible.</extracomment>
<translation type="unfinished"></translation>
<translation>Αναίρεση φραγής</translation>
</message>
<message>
<source>Block</source>
@ -376,7 +377,7 @@
</message>
<message>
<source>Mention</source>
<translation type="unfinished"></translation>
<translation type="unfinished">Φραγή</translation>
</message>
<message>
<source>Conversation</source>

1
translations/harbour-tooter-es.ts
View file

@ -29,6 +29,7 @@
</message>
<message>
<source>Write your warning here</source>
<extracomment>placeholderText in Toot content warning panel</extracomment>
<translation>Escribe aquí tu advertencia</translation>
</message>
<message>

45
translations/harbour-tooter-fr.ts
View file

@ -29,6 +29,7 @@
</message>
<message>
<source>Write your warning here</source>
<extracomment>placeholderText in Toot content warning panel</extracomment>
<translation>Rédigez votre alerte ici</translation>
</message>
<message>
@ -77,11 +78,11 @@
<name>EmojiSelect</name>
<message>
<source>Emojis</source>
<translation type="unfinished"></translation>
<translation>Emojis</translation>
</message>
<message>
<source>Tap to insert</source>
<translation type="unfinished"></translation>
<translation>Appuyez pour insérer</translation>
</message>
</context>
<context>
@ -118,27 +119,27 @@
<name>MainPage</name>
<message>
<source>Home</source>
<translation type="unfinished"></translation>
<translation>Accueil</translation>
</message>
<message>
<source>Notifications</source>
<translation type="unfinished"></translation>
<translation>Notifications</translation>
</message>
<message>
<source>Local</source>
<translation type="unfinished"></translation>
<translation>Fil public local</translation>
</message>
<message>
<source>Federated</source>
<translation type="unfinished"></translation>
<translation>Fil public global</translation>
</message>
<message>
<source>Search</source>
<translation type="unfinished"></translation>
<translation>Rechercher</translation>
</message>
<message>
<source>@user or #term</source>
<translation type="unfinished"></translation>
<translation>@personne ou #terme</translation>
</message>
<message>
<source>New Toot</source>
@ -149,7 +150,7 @@
<name>MediaFullScreen</name>
<message>
<source>Error loading</source>
<translation type="unfinished"></translation>
<translation>Erreur au chargement</translation>
</message>
</context>
<context>
@ -191,7 +192,7 @@
</message>
<message>
<source>Open in Browser</source>
<translation type="unfinished">Ouvrir dans le navigateur</translation>
<translation>Ouvrir dans le navigateur</translation>
</message>
</context>
<context>
@ -214,61 +215,61 @@
<message>
<source>About</source>
<extracomment>If there&apos;s no good translation for &quot;About&quot;, use &quot;Details&quot; (in details about profile).</extracomment>
<translation type="unfinished"></translation>
<translation>Détails</translation>
</message>
<message>
<source>Followers</source>
<extracomment>Will show as: &quot;35 Followers&quot;</extracomment>
<translation type="unfinished"></translation>
<translation>Abonné(e)s</translation>
</message>
<message>
<source>Following</source>
<extracomment>Will show as: &quot;23 Following&quot;</extracomment>
<translation type="unfinished"></translation>
<translation>Abonnements</translation>
</message>
<message>
<source>Statuses</source>
<extracomment>Will show as: &quot;115 Statuses&quot;</extracomment>
<translation type="unfinished"></translation>
<translation>Pouets</translation>
</message>
<message>
<source>Mention</source>
<translation type="unfinished">Mentionner</translation>
<translation>Mentionner</translation>
</message>
<message>
<source>Unfollow</source>
<extracomment>Is a button. Keep it as short as possible.</extracomment>
<translation type="unfinished"></translation>
<translation>Ne plus suivre</translation>
</message>
<message>
<source>Requested</source>
<extracomment>Is a button. Keep it as short as possible.</extracomment>
<translation type="unfinished"></translation>
<translation>Demandé</translation>
</message>
<message>
<source>Follow</source>
<extracomment>Is a button. Keep it as short as possible.</extracomment>
<translation type="unfinished"></translation>
<translation>Suivre</translation>
</message>
<message>
<source>Unmute</source>
<extracomment>Is a button. Keep it as short as possible.</extracomment>
<translation type="unfinished"></translation>
<translation>Démasquer</translation>
</message>
<message>
<source>Mute</source>
<extracomment>Is a button. Keep it as short as possible.</extracomment>
<translation type="unfinished"></translation>
<translation>Masquer</translation>
</message>
<message>
<source>Unblock</source>
<extracomment>Is a button. Keep it as short as possible.</extracomment>
<translation type="unfinished"></translation>
<translation>Débloquer</translation>
</message>
<message>
<source>Block</source>
<extracomment>Is a button. Keep it as short as possible.</extracomment>
<translation type="unfinished"></translation>
<translation>Bloquer</translation>
</message>
</context>
<context>

47
translations/harbour-tooter-it.ts
View file

@ -29,6 +29,7 @@
</message>
<message>
<source>Write your warning here</source>
<extracomment>placeholderText in Toot content warning panel</extracomment>
<translation>Contenuto avviso</translation>
</message>
<message>
@ -77,11 +78,11 @@
<name>EmojiSelect</name>
<message>
<source>Emojis</source>
<translation type="unfinished"></translation>
<translation>Emojis</translation>
</message>
<message>
<source>Tap to insert</source>
<translation type="unfinished"></translation>
<translation>Tap per inserire</translation>
</message>
</context>
<context>
@ -118,38 +119,38 @@
<name>MainPage</name>
<message>
<source>Home</source>
<translation type="unfinished"></translation>
<translation>Home</translation>
</message>
<message>
<source>Notifications</source>
<translation type="unfinished"></translation>
<translation>Notifiche</translation>
</message>
<message>
<source>Local</source>
<translation type="unfinished"></translation>
<translation>Locale</translation>
</message>
<message>
<source>Federated</source>
<translation type="unfinished"></translation>
<translation>Federazione</translation>
</message>
<message>
<source>Search</source>
<translation type="unfinished"></translation>
<translation>Cerca</translation>
</message>
<message>
<source>@user or #term</source>
<translation type="unfinished"></translation>
<translation>@utente o #terme</translation>
</message>
<message>
<source>New Toot</source>
<translation type="unfinished">Nuovo Toot</translation>
<translation>Nuovo Toot</translation>
</message>
</context>
<context>
<name>MediaFullScreen</name>
<message>
<source>Error loading</source>
<translation type="unfinished"></translation>
<translation>Errore durante caricamento</translation>
</message>
</context>
<context>
@ -191,7 +192,7 @@
</message>
<message>
<source>Open in Browser</source>
<translation type="unfinished">Aprire nel browser</translation>
<translation>Aprire nel browser</translation>
</message>
</context>
<context>
@ -214,61 +215,61 @@
<message>
<source>About</source>
<extracomment>If there&apos;s no good translation for &quot;About&quot;, use &quot;Details&quot; (in details about profile).</extracomment>
<translation type="unfinished"></translation>
<translation>Dettagli</translation>
</message>
<message>
<source>Followers</source>
<extracomment>Will show as: &quot;35 Followers&quot;</extracomment>
<translation type="unfinished"></translation>
<translation>Seguaci</translation>
</message>
<message>
<source>Following</source>
<extracomment>Will show as: &quot;23 Following&quot;</extracomment>
<translation type="unfinished"></translation>
<translation>Segue</translation>
</message>
<message>
<source>Statuses</source>
<extracomment>Will show as: &quot;115 Statuses&quot;</extracomment>
<translation type="unfinished"></translation>
<translation>Toots</translation>
</message>
<message>
<source>Mention</source>
<translation type="unfinished">Menzionare</translation>
<translation>Menzionare</translation>
</message>
<message>
<source>Unfollow</source>
<extracomment>Is a button. Keep it as short as possible.</extracomment>
<translation type="unfinished"></translation>
<translation>Smetti di seguire</translation>
</message>
<message>
<source>Requested</source>
<extracomment>Is a button. Keep it as short as possible.</extracomment>
<translation type="unfinished"></translation>
<translation>Richiesto</translation>
</message>
<message>
<source>Follow</source>
<extracomment>Is a button. Keep it as short as possible.</extracomment>
<translation type="unfinished"></translation>
<translation>Segui</translation>
</message>
<message>
<source>Unmute</source>
<extracomment>Is a button. Keep it as short as possible.</extracomment>
<translation type="unfinished"></translation>
<translation>Non silenziare</translation>
</message>
<message>
<source>Mute</source>
<extracomment>Is a button. Keep it as short as possible.</extracomment>
<translation type="unfinished"></translation>
<translation>Silenzia</translation>
</message>
<message>
<source>Unblock</source>
<extracomment>Is a button. Keep it as short as possible.</extracomment>
<translation type="unfinished"></translation>
<translation>Sblocca</translation>
</message>
<message>
<source>Block</source>
<extracomment>Is a button. Keep it as short as possible.</extracomment>
<translation type="unfinished"></translation>
<translation>Blocca</translation>
</message>
</context>
<context>

1
translations/harbour-tooter-nl.ts
View file

@ -29,6 +29,7 @@
</message>
<message>
<source>Write your warning here</source>
<extracomment>placeholderText in Toot content warning panel</extracomment>
<translation>Waarschuwingstekst</translation>
</message>
<message>

1
translations/harbour-tooter-nl_BE.ts
View file

@ -29,6 +29,7 @@
</message>
<message>
<source>Write your warning here</source>
<extracomment>placeholderText in Toot content warning panel</extracomment>
<translation type="unfinished"></translation>
</message>
<message>

1
translations/harbour-tooter-oc.ts
View file

@ -29,6 +29,7 @@
</message>
<message>
<source>Write your warning here</source>
<extracomment>placeholderText in Toot content warning panel</extracomment>
<translation type="unfinished"></translation>
</message>
<message>

1
translations/harbour-tooter-pl.ts
View file

@ -29,6 +29,7 @@
</message>
<message>
<source>Write your warning here</source>
<extracomment>placeholderText in Toot content warning panel</extracomment>
<translation type="unfinished"></translation>
</message>
<message>

1
translations/harbour-tooter-ru.ts
View file

@ -29,6 +29,7 @@
</message>
<message>
<source>Write your warning here</source>
<extracomment>placeholderText in Toot content warning panel</extracomment>
<translation>Текст предупреждения</translation>
</message>
<message>

1
translations/harbour-tooter-sr.ts
View file

@ -29,6 +29,7 @@
</message>
<message>
<source>Write your warning here</source>
<extracomment>placeholderText in Toot content warning panel</extracomment>
<translation type="unfinished"></translation>
</message>
<message>

1
translations/harbour-tooter-sv.ts
View file

@ -29,6 +29,7 @@
</message>
<message>
<source>Write your warning here</source>
<extracomment>placeholderText in Toot content warning panel</extracomment>
<translation type="unfinished"></translation>
</message>
<message>

1
translations/harbour-tooter-zh_CN.ts
View file

@ -29,6 +29,7 @@
</message>
<message>
<source>Write your warning here</source>
<extracomment>placeholderText in Toot content warning panel</extracomment>
<translation>在此编写你的警告信息</translation>
</message>
<message>

1
translations/harbour-tooter.ts
View file

@ -29,6 +29,7 @@
</message>
<message>
<source>Write your warning here</source>
<extracomment>placeholderText in Toot content warning panel</extracomment>
<translation>Write your warning here</translation>
</message>
<message>