Zergling_man/moment
Zergling_man/moment
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Upload UI/code improvements

Browse Source
This commit is contained in:
miruka 2019-12-06 16:44:25 -04:00
parent 54df551b08
commit 4ada039384
6 changed files with 87 additions and 89 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/icons/thin/uploading.svg Normal file
View File

@ -0,0 +1,3 @@
<svg height="24" viewBox="0 0 24 24" width="24" xmlns="http://www.w3.org/2000/svg">
<path d="m16 16h-3v5h-2v-5h-3l4-4zm3.479-5.908c-.212-3.951-3.473-7.092-7.479-7.092s-7.267 3.141-7.479 7.092c-2.57.463-4.521 2.706-4.521 5.408 0 3.037 2.463 5.5 5.5 5.5h3.5v-2h-3.5c-1.93 0-3.5-1.57-3.5-3.5 0-2.797 2.479-3.833 4.433-3.72-.167-4.218 2.208-6.78 5.567-6.78 3.453 0 5.891 2.797 5.567 6.78 1.745-.046 4.433.751 4.433 3.72 0 1.93-1.57 3.5-3.5 3.5h-3.5v2h3.5c3.037 0 5.5-2.463 5.5-5.5 0-2.702-1.951-4.945-4.521-5.408z"/>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 524 B

8
src/python/matrix_client.py
View File

@ -305,7 +305,11 @@ class MatrixClient(nio.AsyncClient):
except OSError as err:
log.warning(f"Failed thumbnailing {path}: {err}")
else:
upload_item.status = UploadStatus.UploadingThumbnail
thumb_name = f"{path.stem}_thumbnail{''.join(path.suffixes)}"
upload_item.status = UploadStatus.Uploading
upload_item.filepath = Path(thumb_name)
upload_item.total_size = len(thumb_data)
try:
thumb_url, _, thumb_crypt_dict = await self.upload(
@ -317,7 +321,7 @@ class MatrixClient(nio.AsyncClient):
except MatrixError as err:
log.warning(f"Failed uploading thumbnail {path}: {err}")
else:
upload_item.status = UploadStatus.CachingThumbnail
upload_item.status = UploadStatus.Caching
await Thumbnail.from_bytes(
self.backend.media_cache,

8
src/python/models/items.py
View File

@ -105,11 +105,9 @@ class Member(ModelItem):
class UploadStatus(AutoStrEnum):
Uploading = auto()
Caching = auto()
UploadingThumbnail = auto()
CachingThumbnail = auto()
Error = auto()
Uploading = auto()
Caching = auto()
Error = auto()
@dataclass

2
src/qml/Chat/ChatSplitView.qml
View File

@ -29,7 +29,7 @@ HSplitView {
TransferList {
Layout.fillWidth: true
Layout.minimumHeight: implicitHeight
Layout.preferredHeight: implicitHeight * uploadsCount
Layout.preferredHeight: implicitHeight * transferCount
Layout.maximumHeight: chatSplitView.height / 6
Behavior on Layout.preferredHeight { HNumberAnimation {} }

147
src/qml/Chat/FileTransfer/Transfer.qml
View File

@ -5,29 +5,29 @@ import "../../utils.js" as Utils
HColumnLayout {
id: transfer
width: uploadsList.width
property bool guiPaused: false
readonly property bool paused: model.status === "Paused" || guiPaused
property int msLeft: model.time_left || 0
property int uploaded: model.uploaded
readonly property int speed: model.speed
readonly property int totalSize: model.total_size
readonly property string status: model.status
readonly property bool paused: status === "Paused" || guiPaused
Behavior on msLeft { HNumberAnimation { duration: 1000 } }
Behavior on uploaded { HNumberAnimation { duration: 1000 }}
Behavior on height { HNumberAnimation {} }
HRowLayout {
HButton {
icon.name: "upload-cancel"
icon.color: theme.colors.negativeBackground
padded: false
onClicked: {
// Python might take a sec to cancel, but we want
// immediate visual feedback
transfer.height = 0
// Python will delete this model item on cancel
py.call(py.getattr(model.task, "cancel"))
}
HIcon {
svgName: "uploading"
colorize:
status === "Error" ? theme.colors.negativeBackground :
status === "Paused" ? theme.colors.middleBackground :
theme.icons.colorize
Layout.preferredWidth: theme.baseElementsHeight
Layout.fillHeight: true
@ -38,51 +38,33 @@ HColumnLayout {
elide: expand ? Text.ElideNone : Text.ElideRight
wrapMode: expand ? Text.Wrap : Text.NoWrap
color: model.status === "Error" ?
color: status === "Error" ?
theme.colors.errorText : theme.colors.text
text:
model.status === "Uploading" ?
qsTr("Uploading %1...").arg(fileName) :
status === "Uploading" ? fileName :
model.status === "Caching" ?
status === "Caching" ?
qsTr("Caching %1...").arg(fileName) :
model.status === "UploadingThumbnail" ?
qsTr("Uploading thumbnail for %1...").arg(fileName) :
model.error === "MatrixForbidden" ?
qsTr("Forbidden file type or quota exceeded: %1")
.arg(fileName) :
model.status === "CachingThumbnail" ?
qsTr("Caching thumbnail for %1...").arg(fileName) :
model.error === "MatrixTooLarge" ?
qsTr("Too large for this server: %1").arg(fileName) :
model.status === "Error" ? (
model.error === "MatrixForbidden" ?
qsTr("Forbidden file type or quota exceeded: %1")
.arg(fileName) :
model.error === "IsADirectoryError" ?
qsTr("Can't upload folders, need a file: %1").arg(filePath) :
model.error === "MatrixTooLarge" ?
qsTr("Too large for this server: %1")
.arg(fileName) :
model.error === "FileNotFoundError" ?
qsTr("Non-existant file: %1").arg(filePath) :
model.error === "IsADirectoryError" ?
qsTr("Can't upload folders, need a file: %1")
.arg(filePath) :
model.error === "PermissionError" ?
qsTr("No permission to read this file: %1").arg(filePath) :
model.error === "FileNotFoundError" ?
qsTr("Non-existant file: %1")
.arg(filePath) :
model.error === "PermissionError" ?
qsTr("No permission to read this file: %1")
.arg(filePath) :
qsTr("Unknown error for %1: %2 - %3")
.arg(filePath)
.arg(model.error)
.arg(model.error_args)
) :
qsTr("Invalid status for %1: %2")
.arg(fileName).arg(model.status)
qsTr("Unknown error for %1: %2 - %3")
.arg(filePath).arg(model.error).arg(model.error_args)
topPadding: theme.spacing / 2
bottomPadding: topPadding
@ -92,7 +74,7 @@ HColumnLayout {
Layout.fillWidth: true
property bool expand: model.status === "Error"
property bool expand: status === "Error"
readonly property string fileName:
model.filepath.split("/").slice(-1)[0]
@ -111,31 +93,27 @@ HColumnLayout {
HSpacer {}
HLabel {
id: uploadCountLabel
visible: Layout.preferredWidth > 0
text: qsTr("-%1 %2/s %3/%4")
.arg(model.time_left ?
Utils.formatDuration(msLeft) : "∞")
.arg(CppUtils.formattedBytes(model.speed))
.arg(CppUtils.formattedBytes(uploaded))
.arg(CppUtils.formattedBytes(model.total_size))
Repeater {
model: [
msLeft ? qsTr("-%1").arg(Utils.formatDuration(msLeft)) : "",
topPadding: theme.spacing / 2
bottomPadding: topPadding
leftPadding: theme.spacing / 1.5
rightPadding: leftPadding
speed ? qsTr("%1/s").arg(CppUtils.formattedBytes(speed)) : "",
Layout.preferredWidth:
model.status === "Uploading" ? implicitWidth : 0
qsTr("%1/%2").arg(CppUtils.formattedBytes(uploaded))
.arg(CppUtils.formattedBytes(totalSize)),
]
property int msLeft: model.time_left || -1
property int uploaded: model.uploaded
HLabel {
text: modelData
visible: text && Layout.preferredWidth > 0
leftPadding: theme.spacing / 1.5
rightPadding: leftPadding
Behavior on msLeft { HNumberAnimation { duration: 1000 } }
Behavior on uploaded { HNumberAnimation { duration: 1000 }}
Layout.preferredWidth:
status === "Uploading" ? implicitWidth : 0
Behavior on Layout.preferredWidth { HNumberAnimation {} }
Behavior on Layout.preferredWidth { HNumberAnimation {} }
}
}
HButton {
@ -160,7 +138,7 @@ HColumnLayout {
}
Layout.preferredWidth:
model.status === "Uploading" ?
status === "Uploading" ?
theme.baseElementsHeight : 0
Layout.fillHeight: true
@ -168,8 +146,24 @@ HColumnLayout {
Behavior on Layout.preferredWidth { HNumberAnimation {} }
}
HButton {
icon.name: "upload-cancel"
icon.color: theme.colors.negativeBackground
padded: false
onClicked: {
// Python might take a sec to cancel, but we want
// immediate visual feedback
transfer.height = 0
// Python will delete this model item on cancel
py.call(py.getattr(model.task, "cancel"))
}
Layout.preferredWidth: theme.baseElementsHeight
Layout.fillHeight: true
}
TapHandler {
onTapped: if (model.status !== "Error")
onTapped: if (status !== "Error")
statusLabel.expand = ! statusLabel.expand
}
}
@ -177,13 +171,13 @@ HColumnLayout {
HProgressBar {
id: progressBar
visible: Layout.maximumHeight !== 0
indeterminate: model.status !== "Uploading"
value: model.uploaded
to: model.total_size
indeterminate: status !== "Uploading"
value: uploaded
to: totalSize
// TODO: bake this in hprogressbar
foregroundColor:
model.status === "Error" ?
status === "Error" ?
theme.controls.progressBar.errorForeground :
transfer.paused ?
@ -193,9 +187,8 @@ HColumnLayout {
Layout.fillWidth: true
Layout.maximumHeight:
model.status === "Error" && indeterminate ? 0 : -1
status === "Error" && indeterminate ? 0 : -1
Behavior on value { HNumberAnimation { duration: 1000 } }
Behavior on Layout.maximumHeight { HNumberAnimation {} }
}
}

8
src/qml/Chat/FileTransfer/TransferList.qml
View File

@ -12,15 +12,15 @@ Rectangle {
property int delegateHeight: 0
readonly property var firstDelegate:
uploadsList.contentItem.visibleChildren[0]
transferList.contentItem.visibleChildren[0]
readonly property alias uploadsCount: uploadsList.count
readonly property alias transferCount: transferList.count
Behavior on implicitHeight { HNumberAnimation {} }
HListView {
id: uploadsList
id: transferList
anchors.fill: parent
model: HListModel {
@ -28,6 +28,6 @@ Rectangle {
source: modelSources[["Upload", chatPage.roomId]] || []
}
delegate: Transfer { width: uploadsList.width }
delegate: Transfer { width: transferList.width }
}
}