Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Replace share settings popup with a page on a StackView #5194

Merged
merged 9 commits into from
Dec 9, 2022
Merged

Replace share settings popup with a page on a StackView #5194

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
e421882
Add stackview to file details view
claucambra Nov 18, 2022
046f8ea
Convert share details menu into a page pushed onto stackview
claucambra Nov 18, 2022
cfccd02
Improve layout of share details page
claucambra Nov 18, 2022
79ec0e9
Match design of expire date spinbox to other text fields
claucambra Nov 18, 2022
4d837bd
Set main file details page as initial item of stack view
claucambra Nov 21, 2022
5e0a267
Make unshare button less prominent, move out of bottom button box
claucambra Nov 23, 2022
e723b75
Make 'Add another link' button less prominent
claucambra Nov 23, 2022
6ae41c0
Add copy share link button to share details page footer, remove unnee…
claucambra Nov 23, 2022
2261615
Use EnforcedPlainTextLabel in new ShareDetailsPage
claucambra Dec 8, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions resources.qrc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,14 @@
<file>src/gui/ErrorBox.qml</file>
<file>src/gui/filedetails/FileActivityView.qml</file>
<file>src/gui/filedetails/FileDetailsPage.qml</file>
<file>src/gui/filedetails/FileDetailsView.qml</file>
<file>src/gui/filedetails/FileDetailsWindow.qml</file>
<file>src/gui/filedetails/NCInputTextEdit.qml</file>
<file>src/gui/filedetails/NCInputTextField.qml</file>
<file>src/gui/filedetails/NCTabButton.qml</file>
<file>src/gui/filedetails/ShareeDelegate.qml</file>
<file>src/gui/filedetails/ShareDelegate.qml</file>
<file>src/gui/filedetails/ShareDetailsPage.qml</file>
<file>src/gui/filedetails/ShareeSearchField.qml</file>
<file>src/gui/filedetails/ShareView.qml</file>
<file>src/gui/tray/Window.qml</file>
Expand Down
4 changes: 3 additions & 1 deletion src/gui/filedetails/FileDetailsPage.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ Page {
id: root

property var accountState: ({})
property string localPath: ({})
property string localPath: ""

// We want the SwipeView to "spill" over the edges of the window to really
// make it look nice. If we apply page-wide padding, however, the swipe
Expand All @@ -33,6 +33,7 @@ Page {
// padding, which we have to apply selectively to achieve our desired effect.
property int intendedPadding: Style.standardSpacing * 2
property int iconSize: 32
property StackView rootStackView: StackView {}

property FileDetails fileDetails: FileDetails {
id: fileDetails
Expand Down Expand Up @@ -186,6 +187,7 @@ Page {
fileDetails: root.fileDetails
horizontalPadding: root.intendedPadding
iconSize: root.iconSize
rootStackView: root.rootStackView
}
}
}
35 changes: 35 additions & 0 deletions src/gui/filedetails/FileDetailsView.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
/*
* Copyright (C) 2022 by Claudio Cambra <claudio.cambra@nextcloud.com>
*
* This program 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; either version 2 of the License, or
* (at your option) any later version.
*
* This program 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.
*/

import QtQuick 2.15
import QtQuick.Layouts 1.15
import QtQuick.Controls 2.15

import com.nextcloud.desktopclient 1.0
import Style 1.0

StackView {
id: root

property var accountState: ({})
property string localPath: ""

initialItem: FileDetailsPage {
width: parent.width
height: parent.height
accountState: root.accountState
localPath: root.localPath
rootStackView: root
}
}
2 changes: 1 addition & 1 deletion src/gui/filedetails/FileDetailsWindow.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ ApplicationWindow {

title: qsTr("File details of %1 · %2").arg(fileDetailsPage.fileDetails.name).arg(Systray.windowTitle)

FileDetailsPage {
FileDetailsView {
id: fileDetailsPage
anchors.fill: parent
accountState: root.accountState
Expand Down
Loading