This repository has been archived by the owner on Jan 22, 2022. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 35
Moved content picker into a popover #414
Open
kugiigi
wants to merge
4
commits into
ubports:xenial
Choose a base branch
from
kugiigi:xenial_-_contentpicker
base: xenial
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
4 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,156 @@ | ||
| /* | ||
| * Copyright 2021 UBports Foundation | ||
| * | ||
| * This file is part of morph-browser. | ||
| * | ||
| * morph-browser is free software; you can redistribute it and/or modify | ||
| * it under the terms of the GNU General Public License as published by | ||
| * the Free Software Foundation; version 3. | ||
| * | ||
| * morph-browser is distributed in the hope that it will be useful, | ||
| * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| * GNU General Public License for more details. | ||
| * | ||
| * You should have received a copy of the GNU General Public License | ||
| * along with this program. If not, see <http://www.gnu.org/licenses/>. | ||
| */ | ||
|
|
||
| import QtQuick 2.9 | ||
| import Ubuntu.Components 1.3 | ||
| import Ubuntu.Content 1.3 | ||
| import QtQuick.Controls 2.5 as QQC2 | ||
| import QtQuick.Controls.Suru 2.2 | ||
|
|
||
| import "UrlUtils.js" as UrlUtils | ||
|
|
||
| QQC2.Dialog { | ||
| id: contentExportDialog | ||
|
|
||
| objectName: "contentExportDialog" | ||
|
|
||
| property alias path: exportPeerPicker.path | ||
| property alias contentType: exportPeerPicker.contentType | ||
| property string mimeType | ||
| property string downloadUrl | ||
| property string fileName | ||
|
|
||
| property real maximumWidth: units.gu(90) | ||
| property real preferredWidth: parent.width | ||
|
|
||
| property real maximumHeight: units.gu(90) | ||
| property real preferredHeight: parent.height | ||
|
|
||
| signal preview(string url) | ||
|
|
||
| width: preferredWidth > maximumWidth ? maximumWidth : preferredWidth | ||
| height: preferredHeight > maximumHeight ? maximumHeight : preferredHeight | ||
| x: (parent.width - width) / 2 | ||
| parent: QQC2.Overlay.overlay | ||
| topPadding: units.gu(0.2) | ||
| leftPadding: units.gu(0.2) | ||
| rightPadding: units.gu(0.2) | ||
| bottomPadding: units.gu(0.2) | ||
| closePolicy: QQC2.Popup.CloseOnEscape | QQC2.Popup.CloseOnPressOutside | ||
| modal: true | ||
|
|
||
| QQC2.Overlay.modal: Rectangle { | ||
| color: Suru.overlayColor | ||
| Behavior on opacity { NumberAnimation { duration: Suru.animations.FastDuration } } | ||
| } | ||
|
|
||
| function openDialog(_downloadPath, _contentType, _mimeType, _downloadURL, _fileName){ | ||
| path = _downloadPath | ||
| contentType = _contentType | ||
| mimeType = _mimeType | ||
| downloadUrl = _downloadURL | ||
| fileName = _fileName | ||
| y = Qt.binding(function(){ return (parent.height - height) / 2 }) | ||
| open() | ||
| } | ||
|
|
||
| Item { | ||
| anchors.fill: parent | ||
|
|
||
| PageHeader { | ||
| id: header | ||
|
|
||
| title: i18n.tr("Open with") | ||
| subtitle: i18n.tr("File name: %1").arg(contentExportDialog.fileName) | ||
|
|
||
| anchors { | ||
| top: parent.top | ||
| left: parent.left | ||
| right: parent.right | ||
| } | ||
|
|
||
| leadingActionBar.actions: [ | ||
| Action { | ||
| iconName: "close" | ||
| text: i18n.tr("Close") | ||
| onTriggered: contentExportDialog.close() | ||
| } | ||
| ] | ||
|
|
||
| trailingActionBar { | ||
| actions: [ | ||
| Action { | ||
| iconName: "external-link" | ||
| text: i18n.tr("Open link in browser") | ||
| visible: (contentExportDialog.downloadUrl !== "") && (contentExportDialog.contentType !== ContentType.Unknown) | ||
| onTriggered: { | ||
| contentExportDialog.close() | ||
| preview((contentExportDialog.mimeType === "application/pdf") ? UrlUtils.getPdfViewerExtensionUrlPrefix() + contentExportDialog.downloadUrl : contentExportDialog.downloadUrl); | ||
| } | ||
| }, | ||
| Action { | ||
| iconName: "document-open" | ||
| text: i18n.tr("Open file in browser") | ||
| visible: (contentExportDialog.contentType !== ContentType.Unknown) | ||
| onTriggered: { | ||
| contentExportDialog.close() | ||
| preview((contentExportDialog.mimeType === "application/pdf") ? UrlUtils.getPdfViewerExtensionUrlPrefix() + "file://%1".arg(contentExportDialog.path) : contentExportDialog.path); | ||
| } | ||
| } | ||
| ] | ||
| } | ||
| } | ||
|
|
||
| Item { | ||
| id: contentPickerItem | ||
|
|
||
| anchors { | ||
| top: header.bottom | ||
| left: parent.left | ||
| right: parent.right | ||
| bottom: parent.bottom | ||
| } | ||
|
|
||
| ContentPeerPicker { | ||
| id: exportPeerPicker | ||
|
|
||
| property string path | ||
|
|
||
| focus: visible | ||
| handler: ContentHandler.Destination | ||
| showTitle: false | ||
|
|
||
| onPeerSelected: { | ||
| var transfer = peer.request() | ||
| if (transfer.state === ContentTransfer.InProgress) { | ||
| transfer.items = [contentItemComponent.createObject(contentExportDialog, {"url": path})] | ||
| transfer.state = ContentTransfer.Charged | ||
| } | ||
| contentExportDialog.close() | ||
| } | ||
| onCancelPressed: contentExportDialog.close() | ||
| Keys.onEscapePressed: contentExportDialog.close() | ||
| } | ||
| } | ||
| } | ||
|
|
||
| Component { | ||
| id: contentItemComponent | ||
| ContentItem {} | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Whoops... In this case, both copyright statements would be kept. The code was under copyright by Canonical, and now we've added some stake with our changes.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
No, that file was created in #415
i actually noticed that there are a few others that we missed in that PR 😅
I'm planning to correct them in a separate PR but I just corrected this one here since I modified it anyway.
But this is definitely a lesson learned for me moving forward - don't just copy paste copyright texts 😀