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

Merge branch 'upstream'

Browse source
This commit is contained in:
molan-git 2020-05-04 15:44:29 +02:00
commit 9d7a0cb58b
3 changed files with 20 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
qml/pages/Conversation.qml
View file

@ -157,7 +157,6 @@ Page {
Rectangle {
id: progressBar
width: toot.text.length ? panel.width * (toot.text.length / tootMaxChar) : 0
height: Theme.itemSizeSmall * 0.05
color: Theme.highlightBackgroundColor
opacity: 0.7
@ -179,6 +178,7 @@ Page {
}
autoScrollEnabled: true
labelVisible: false
font.pixelSize: Theme.fontSizeSmall
placeholderText: qsTr("Write your warning here")
placeholderColor: palette.highlightColor
color: palette.highlightColor
@ -198,8 +198,8 @@ Page {
top: warningContent.bottom
topMargin: Theme.paddingMedium
left: parent.left
right: parent.right
rightMargin: Theme.paddingMedium
right: parent.right
rightMargin: Theme.paddingLarge * 2
}
autoScrollEnabled: true
labelVisible: false
@ -209,9 +209,9 @@ Page {
0) == '#') ? description + ' ' : ''
height: Math.max(270, Math.min(900, implicitHeight))
//height: implicitHeight
horizontalAlignment: Text.AlignLeft
horizontalAlignment: Text.AlignLeft
placeholderText: qsTr("What's on your mind?")
font.pixelSize: Theme.fontSizeSmall
font.pixelSize: Theme.fontSizeSmall
EnterKey.onClicked: {
//tweet()
}
@ -243,6 +243,7 @@ Page {
right: parent.right
rightMargin: Theme.paddingSmall
}
opacity: 0.8
icon.source: "../../qml/images/emojiselect.svg" + (pressed ? Theme.highlightColor : (warningContent.visible ? Theme.secondaryHighlightColor : Theme.primaryColor))
onClicked: pageStack.push(firstWizardPage)
}
@ -306,7 +307,8 @@ Page {
id: btnContentWarning
anchors {
verticalCenter: privacy.verticalCenter
top: toot.bottom
topMargin: -Theme.paddingSmall * 1.5
left: parent.left
leftMargin: Theme.paddingMedium
}
@ -318,7 +320,8 @@ Page {
id: btnAddImage
enabled: mediaModel.count < 4
anchors {
verticalCenter: privacy.verticalCenter
top: toot.bottom
topMargin: -Theme.paddingSmall * 1.5
left: btnContentWarning.right
leftMargin: Theme.paddingSmall
}
@ -364,7 +367,7 @@ Page {
id: privacy
anchors {
top: toot.bottom
topMargin: -Theme.paddingSmall * 2
topMargin: -Theme.paddingSmall * 1.5
left: btnAddImage.right
right: btnSend.left
}
@ -390,6 +393,7 @@ Page {
+ (pressed ? Theme.highlightColor : Theme.primaryColor)
anchors {
top: toot.bottom
topMargin: -Theme.paddingSmall * 1.5
right: parent.right
rightMargin: Theme.paddingSmall
}

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

@ -69,7 +69,7 @@ Item {
}
Label {
height: description === "" ? 0 : contentHeight
text: "@"+description
text: description
color: Theme.secondaryHighlightColor
font.pixelSize: Theme.fontSizeSmall
font.family: Theme.fontFamilyHeading

14
translations/harbour-tooterb-it.ts
View file

@ -38,37 +38,37 @@
<translation>A cosa stai pensando?</translation>
</message>
<message>
<location filename="../qml/pages/Conversation.qml" line="274"/>
<location filename="../qml/pages/Conversation.qml" line="275"/>
<source>Delete</source>
<translation>Elimina</translation>
</message>
<message>
<location filename="../qml/pages/Conversation.qml" line="372"/>
<location filename="../qml/pages/Conversation.qml" line="375"/>
<source>Public</source>
<translation>Pubblico</translation>
</message>
<message>
<location filename="../qml/pages/Conversation.qml" line="375"/>
<location filename="../qml/pages/Conversation.qml" line="378"/>
<source>Unlisted</source>
<translation>Non elencato</translation>
</message>
<message>
<location filename="../qml/pages/Conversation.qml" line="378"/>
<location filename="../qml/pages/Conversation.qml" line="381"/>
<source>Followers-only</source>
<translation>Solo ai seguaci</translation>
</message>
<message>
<location filename="../qml/pages/Conversation.qml" line="381"/>
<location filename="../qml/pages/Conversation.qml" line="384"/>
<source>Direct</source>
<translation>Diretto</translation>
</message>
<message>
<location filename="../qml/pages/Conversation.qml" line="494"/>
<location filename="../qml/pages/Conversation.qml" line="498"/>
<source>Emojis</source>
<translation>Emojis</translation>
</message>
<message>
<location filename="../qml/pages/Conversation.qml" line="495"/>
<location filename="../qml/pages/Conversation.qml" line="499"/>
<source>Tap to insert</source>
<translation>Tap per inserire</translation>
</message>