diff --git a/resources.qrc b/resources.qrc index 2c6f6a299..f233501fc 100644 --- a/resources.qrc +++ b/resources.qrc @@ -9,12 +9,14 @@ src/gui/ErrorBox.qml src/gui/filedetails/FileActivityView.qml src/gui/filedetails/FileDetailsPage.qml + src/gui/filedetails/FileDetailsView.qml src/gui/filedetails/FileDetailsWindow.qml src/gui/filedetails/NCInputTextEdit.qml src/gui/filedetails/NCInputTextField.qml src/gui/filedetails/NCTabButton.qml src/gui/filedetails/ShareeDelegate.qml src/gui/filedetails/ShareDelegate.qml + src/gui/filedetails/ShareDetailsPage.qml src/gui/filedetails/ShareeSearchField.qml src/gui/filedetails/ShareView.qml src/gui/tray/Window.qml diff --git a/src/gui/filedetails/FileDetailsPage.qml b/src/gui/filedetails/FileDetailsPage.qml index aa3f4f488..304d1cee4 100644 --- a/src/gui/filedetails/FileDetailsPage.qml +++ b/src/gui/filedetails/FileDetailsPage.qml @@ -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 @@ -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 diff --git a/src/gui/filedetails/FileDetailsView.qml b/src/gui/filedetails/FileDetailsView.qml new file mode 100644 index 000000000..0f96d0fbf --- /dev/null +++ b/src/gui/filedetails/FileDetailsView.qml @@ -0,0 +1,35 @@ +/* + * Copyright (C) 2022 by Claudio Cambra + * + * 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: "" + + FileDetailsPage { + width: parent.width + height: parent.height + accountState: root.accountState + localPath: root.localPath + rootStackView: root + } +} diff --git a/src/gui/filedetails/FileDetailsWindow.qml b/src/gui/filedetails/FileDetailsWindow.qml index 04320615c..39c9590e2 100644 --- a/src/gui/filedetails/FileDetailsWindow.qml +++ b/src/gui/filedetails/FileDetailsWindow.qml @@ -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