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

v0.2.0 Candidate

Browse source
This commit is contained in:
Dusko Angirevic 2017-07-20 15:26:20 +02:00
parent 9975b54630
commit 59437ec087
7 changed files with 43 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
harbour-tooter.pro
View file

@ -66,7 +66,8 @@ DISTFILES += \
qml/images/boosted.svg \
qml/pages/Settings.qml \
qml/pages/components/MediaBlock.qml \
qml/pages/components/MyImage.qml
qml/pages/components/MyImage.qml \
qml/pages/components/ImageFullScreen.qml
HEADERS += \
src/imageuploader.h

8
harbour-tooter.pro.user
View file

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE QtCreatorProject>
<!-- Written by QtCreator 4.0.1, 2017-07-06T16:14:27. -->
<!-- Written by QtCreator 4.0.1, 2017-07-20T15:26:01. -->
<qtcreator>
<data>
<variable>EnvironmentId</variable>
@ -8,7 +8,7 @@
</data>
<data>
<variable>ProjectExplorer.Project.ActiveTarget</variable>
<value type="int">0</value>
<value type="int">1</value>
</data>
<data>
<variable>ProjectExplorer.Project.EditorSettings</variable>
@ -403,7 +403,7 @@
<value type="QString" key="MerRunConfiguration.QmlLiveTargetWorkspace"></value>
<value type="int" key="PE.EnvironmentAspect.Base">1</value>
<valuelist type="QVariantList" key="PE.EnvironmentAspect.Changes"/>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">harbour-tooter (on Mer Device)</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">harbour-tooter (on Remote Device)</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">QmakeProjectManager.MerRunConfiguration:harbour-tooter</value>
<value type="QString" key="Qt4ProjectManager.MaemoRunConfiguration.Arguments"></value>
@ -768,7 +768,7 @@
<value type="QString" key="MerRunConfiguration.QmlLiveTargetWorkspace"></value>
<value type="int" key="PE.EnvironmentAspect.Base">1</value>
<valuelist type="QVariantList" key="PE.EnvironmentAspect.Changes"/>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">harbour-tooter (on Mer Device)</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">harbour-tooter (on Remote Device)</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">QmakeProjectManager.MerRunConfiguration:harbour-tooter</value>
<value type="QString" key="Qt4ProjectManager.MaemoRunConfiguration.Arguments"></value>

1
qml/pages/Conversation.qml
View file

@ -312,6 +312,7 @@ Page {
worker.sendMessage(msg);
warningContent.text = ""
toot.text = ""
mediaModel.clear()
}
}

20
qml/pages/Settings.qml
View file

@ -23,7 +23,10 @@ Page {
text: Logic.conf['login'] ? qsTr("Remove Account"): qsTr("Add Account")
description: Logic.conf['login'] ? qsTr("Deauthorize this app and remove your account") : qsTr("Authorize this app to use your Mastodon account in your behalf")
icon.source: Logic.conf['login'] ? "image://theme/icon-m-people" : "image://theme/icon-m-add"
onClicked: {
onCheckedChanged: {
busy = true;
checked = false;
timer1.start()
if (Logic.conf['login']) {
Logic.conf['login'] = false
Logic.conf['instance'] = null;
@ -31,6 +34,11 @@ Page {
}
pageStack.push(Qt.resolvedUrl("LoginPage.qml"))
}
Timer {
id: timer1
interval: 4700
onTriggered: parent.busy = false
}
}
IconTextSwitch {
//enabled: false
@ -46,8 +54,16 @@ Page {
text: qsTr("Translate")
description: qsTr("Use Transifex to help with app translation to your language")
icon.source: "image://theme/icon-m-presence"
onClicked: {
onCheckedChanged: {
busy = true;
checked = false;
Qt.openUrlExternally("https://www.transifex.com/dysko/tooter/");
timer2.start()
}
Timer {
id: timer2
interval: 4700
onTriggered: parent.busy = false
}
}
}

16
qml/pages/components/MyImage.qml
View file

@ -16,6 +16,13 @@ Item {
anchors.centerIn: parent
source: "image://theme/icon-m-image"
}
Rectangle {
id: progressRec
anchors.bottom: parent.bottom
width: 0
height: Theme.paddingSmall
color: Theme.highlightBackgroundColor
}
Image {
id: img
anchors.fill: parent
@ -24,6 +31,15 @@ Item {
opacity: status === Image.Ready ? 1.0 : 0.0
Behavior on opacity { FadeAnimator {} }
source: previewURL
onProgressChanged: {
if (progress != 1)
progressRec.width = parent.width * progress
else {
progressRec.width = 0;
}
}
MouseArea {
anchors.fill: parent
onClicked: {

2
rpm/harbour-tooter.spec
View file

@ -13,7 +13,7 @@ Name: harbour-tooter
%{!?qtc_make:%define qtc_make make}
%{?qtc_builddir:%define _builddir %qtc_builddir}
Summary: Tooter
Version: 0.1.9
Version: 0.2.0
Release: 1
Group: Qt/Qt
License: LICENSE

2
rpm/harbour-tooter.yaml
View file

@ -1,6 +1,6 @@
Name: harbour-tooter
Summary: Tooter
Version: 0.1.9
Version: 0.2.0
Release:
# The contents of the Group field should be one of the groups listed here:
# http://gitorious.org/meego-developer-tools/spectacle/blobs/master/data/GROUPS