ESCA111/neochat
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Port away from Qt.Plaform.labs

Browse Source 
This bring a QtWidget dependency on Android
This commit is contained in:
Carl Schwan
2024-09-21 11:39:01 +02:00
parent cfb663d399
commit 9d6b940b78
10 changed files with 34 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/CMakeLists.txt
View File

@@ -238,7 +238,6 @@ ecm_add_qml_module(neochat URI org.kde.neochat GENERATE_PLUGIN_SOURCE
qml/EmojiSas.qml qml/EmojiSas.qml
qml/ConfirmDeactivateAccountDialog.qml qml/ConfirmDeactivateAccountDialog.qml
qml/VerificationCanceled.qml qml/VerificationCanceled.qml
qml/EditMenu.qml
qml/MessageDelegateContextMenu.qml qml/MessageDelegateContextMenu.qml
qml/FileDelegateContextMenu.qml qml/FileDelegateContextMenu.qml
qml/MessageSourceSheet.qml qml/MessageSourceSheet.qml
@@ -309,6 +308,7 @@ if(NOT ANDROID AND NOT WIN32)
qt_target_qml_sources(neochat QML_FILES qt_target_qml_sources(neochat QML_FILES
qml/ShareAction.qml qml/ShareAction.qml
qml/GlobalMenu.qml qml/GlobalMenu.qml
qml/EditMenu.qml
) )
else() else()
set_source_files_properties(qml/ShareActionStub.qml PROPERTIES set_source_files_properties(qml/ShareActionStub.qml PROPERTIES

15
src/qml/FileDelegateContextMenu.qml
View File

@@ -1,9 +1,10 @@
// SPDX-FileCopyrightText: 2019 Black Hat <bhat@encom.eu.org> // SPDX-FileCopyrightText: 2019 Black Hat <bhat@encom.eu.org>
// SPDX-License-Identifier: GPL-3.0-only // SPDX-License-Identifier: GPL-3.0-only
import QtCore as Core
import QtQuick import QtQuick
import QtQuick.Controls as QQC2 import QtQuick.Controls as QQC2
import Qt.labs.platform import QtQuick.Dialogs as Dialogs
import org.kde.kirigami as Kirigami import org.kde.kirigami as Kirigami
@@ -110,16 +111,16 @@ DelegateContextMenu {
Component { Component {
id: saveAsDialog id: saveAsDialog
FileDialog { Dialogs.FileDialog {
fileMode: FileDialog.SaveFile fileMode: Dialogs.FileDialog.SaveFile
folder: NeoChatConfig.lastSaveDirectory.length > 0 ? NeoChatConfig.lastSaveDirectory : StandardPaths.writableLocation(StandardPaths.DownloadLocation) currentFolder: NeoChatConfig.lastSaveDirectory.length > 0 ? NeoChatConfig.lastSaveDirectory : Core.StandardPaths.writableLocation(Core.StandardPaths.DownloadLocation)
onAccepted: { onAccepted: {
if (!currentFile) { if (!selectedFile) {
return; return;
} }
NeoChatConfig.lastSaveDirectory = folder; NeoChatConfig.lastSaveDirectory = currentFolder;
NeoChatConfig.save(); NeoChatConfig.save();
currentRoom.downloadFile(eventId, currentFile); currentRoom.downloadFile(eventId, selectedFile);
} }
} }
} }

4
src/qml/ImageEditorPage.qml
View File

@@ -4,7 +4,7 @@
import QtQuick import QtQuick
import QtQuick.Controls as QQC2 import QtQuick.Controls as QQC2
import QtQuick.Layouts import QtQuick.Layouts
import Qt.labs.platform as Platform import QtCore as Core
import org.kde.kirigami as Kirigami import org.kde.kirigami as Kirigami
import org.kde.kirigamiaddons.labs.components as KirigamiComponents import org.kde.kirigamiaddons.labs.components as KirigamiComponents
@@ -44,7 +44,7 @@ Kirigami.Page {
text: i18nc("@action:button Accept image modification", "Accept") text: i18nc("@action:button Accept image modification", "Accept")
icon.name: "dialog-ok" icon.name: "dialog-ok"
onTriggered: { onTriggered: {
let newPath = Platform.StandardPaths.writableLocation(Platform.StandardPaths.CacheLocation) + "/" + (new Date()).getTime() + "." + imagePath.split('.').pop(); let newPath = Core.StandardPaths.writableLocation(Core.StandardPaths.CacheLocation) + "/" + (new Date()).getTime() + "." + imagePath.split('.').pop();
if (imageDoc.saveAs(newPath)) { if (imageDoc.saveAs(newPath)) {
newPathChanged(newPath); newPathChanged(newPath);
} else { } else {

17
src/qml/NeochatMaximizeComponent.qml
View File

@@ -1,10 +1,11 @@
// SPDX-FileCopyrightText: 2023 James Graham <james.h.graham@protonmail.com> // SPDX-FileCopyrightText: 2023 James Graham <james.h.graham@protonmail.com>
// SPDX-License-Identifier: GPL-2.0-only OR GPL-3.0-only OR LicenseRef-KDE-Accepted-GPL // SPDX-License-Identifier: GPL-2.0-only OR GPL-3.0-only OR LicenseRef-KDE-Accepted-GPL
import QtCore as Core
import QtQuick import QtQuick
import QtQuick.Controls as QQC2 import QtQuick.Controls as QQC2
import QtQuick.Layouts import QtQuick.Layouts
import Qt.labs.platform as Platform import QtQuick.Dialogs as Dialogs
import QtMultimedia import QtMultimedia
import org.kde.kirigami as Kirigami import org.kde.kirigami as Kirigami
@@ -36,7 +37,7 @@ Components.AlbumMaximizeComponent {
downloadAction: Components.DownloadAction { downloadAction: Components.DownloadAction {
id: downloadAction id: downloadAction
onTriggered: { onTriggered: {
currentRoom.downloadFile(root.currentEventId, Platform.StandardPaths.writableLocation(Platform.StandardPaths.CacheLocation) + "/" + root.currentEventId.replace(":", "_").replace("/", "_").replace("+", "_") + currentRoom.fileNameToDownload(root.currentEventId)); currentRoom.downloadFile(root.currentEventId, Core.StandardPaths.writableLocation(Core.StandardPaths.CacheLocation) + "/" + root.currentEventId.replace(":", "_").replace("/", "_").replace("+", "_") + currentRoom.fileNameToDownload(root.currentEventId));
} }
} }
@@ -120,16 +121,16 @@ Components.AlbumMaximizeComponent {
Component { Component {
id: saveAsDialog id: saveAsDialog
Platform.FileDialog { Dialogs.FileDialog {
fileMode: Platform.FileDialog.SaveFile fileMode: Dialogs.FileDialog.SaveFile
folder: root.saveFolder currentFolder: root.saveFolder
onAccepted: { onAccepted: {
NeoChatConfig.lastSaveDirectory = folder; NeoChatConfig.lastSaveDirectory = currentFolder;
NeoChatConfig.save(); NeoChatConfig.save();
if (!currentFile) { if (!selectedFile) {
return; return;
} }
currentRoom.downloadFile(root.currentEventId, currentFile); currentRoom.downloadFile(root.currentEventId, selectedFile);
} }
} }
} }

4
src/settings/AccountEditorPage.qml
View File

@@ -2,10 +2,10 @@
// SPDX-FileCopyrightText: 2022 Carl Schwan <carl@carlschwan.eu> // SPDX-FileCopyrightText: 2022 Carl Schwan <carl@carlschwan.eu>
// SPDX-License-Identifier: GPL-2.0-or-later // SPDX-License-Identifier: GPL-2.0-or-later
import QtCore as Core
import QtQuick import QtQuick
import QtQuick.Controls as QQC2 import QtQuick.Controls as QQC2
import QtQuick.Layouts import QtQuick.Layouts
import Qt.labs.platform
import QtQuick.Window import QtQuick.Window
import org.kde.kirigami as Kirigami import org.kde.kirigami as Kirigami
@@ -88,7 +88,7 @@ FormCard.FormCardPage {
id: openFileDialog id: openFileDialog
OpenFileDialog { OpenFileDialog {
currentFolder: StandardPaths.standardLocations(StandardPaths.PicturesLocation)[0] currentFolder: Core.StandardPaths.standardLocations(Core.StandardPaths.PicturesLocation)[0]
parentWindow: root.Window.window parentWindow: root.Window.window
onAccepted: destroy() onAccepted: destroy()

1
src/settings/AccountsPage.qml
View File

@@ -5,7 +5,6 @@ import QtQuick
import QtQuick.Controls as QQC2 import QtQuick.Controls as QQC2
import QtQuick.Layouts import QtQuick.Layouts
import QtQuick.Window import QtQuick.Window
import Qt.labs.platform
import org.kde.kirigami as Kirigami import org.kde.kirigami as Kirigami
import org.kde.kirigamiaddons.formcard as FormCard import org.kde.kirigamiaddons.formcard as FormCard

4
src/settings/EmoticonEditorPage.qml
View File

@@ -1,10 +1,10 @@
// SPDX-FileCopyrightText: 2023 Tobias Fella <tobias.fella@kde.org> // SPDX-FileCopyrightText: 2023 Tobias Fella <tobias.fella@kde.org>
// SPDX-License-Identifier: GPL-2.0-or-later // SPDX-License-Identifier: GPL-2.0-or-later
import QtCore as Core
import QtQuick import QtQuick
import QtQuick.Controls as QQC2 import QtQuick.Controls as QQC2
import QtQuick.Layouts import QtQuick.Layouts
import Qt.labs.platform
import QtQuick.Window import QtQuick.Window
import org.kde.kirigami as Kirigami import org.kde.kirigami as Kirigami
@@ -130,7 +130,7 @@ FormCard.FormCardPage {
id: openFileDialog id: openFileDialog
OpenFileDialog { OpenFileDialog {
currentFolder: StandardPaths.standardLocations(StandardPaths.PicturesLocation)[0] currentFolder: Core.StandardPaths.standardLocations(Core.StandardPaths.PicturesLocation)[0]
parentWindow: root.Window.window parentWindow: root.Window.window
} }
} }

15
src/timeline/FileComponent.qml
View File

@@ -2,10 +2,11 @@
// SPDX-FileCopyrightText: 2024 James Graham <james.h.graham@protonmail.com> // SPDX-FileCopyrightText: 2024 James Graham <james.h.graham@protonmail.com>
// SPDX-License-Identifier: GPL-3.0-only // SPDX-License-Identifier: GPL-3.0-only
import QtCore as Core
import QtQuick import QtQuick
import QtQuick.Controls as QQC2 import QtQuick.Controls as QQC2
import QtQuick.Layouts import QtQuick.Layouts
import Qt.labs.platform import QtQuick.Dialogs as Dialogs
import Qt.labs.qmlmodels import Qt.labs.qmlmodels
import org.kde.coreaddons import org.kde.coreaddons
@@ -191,16 +192,16 @@ ColumnLayout {
Component { Component {
id: fileDialog id: fileDialog
FileDialog { Dialogs.FileDialog {
fileMode: FileDialog.SaveFile fileMode: Dialogs.FileDialog.SaveFile
folder: NeoChatConfig.lastSaveDirectory.length > 0 ? NeoChatConfig.lastSaveDirectory : StandardPaths.writableLocation(StandardPaths.DownloadLocation) currentFolder: NeoChatConfig.lastSaveDirectory.length > 0 ? NeoChatConfig.lastSaveDirectory : Core.StandardPaths.writableLocation(Core.StandardPaths.DownloadLocation)
onAccepted: { onAccepted: {
NeoChatConfig.lastSaveDirectory = folder; NeoChatConfig.lastSaveDirectory = currentFolder;
NeoChatConfig.save(); NeoChatConfig.save();
if (autoOpenFile) { if (autoOpenFile) {
UrlHelper.copyTo(root.fileTransferInfo.localPath, file); UrlHelper.copyTo(root.fileTransferInfo.localPath, selectedFile);
} else { } else {
root.room.download(root.eventId, file); root.room.download(root.eventId, selectedFile);
} }
} }
} }

1
src/timeline/PollComponent.qml
View File

@@ -5,7 +5,6 @@
import QtQuick import QtQuick
import QtQuick.Controls import QtQuick.Controls
import QtQuick.Layouts import QtQuick.Layouts
import Qt.labs.platform
import org.kde.neochat import org.kde.neochat

4
src/timeline/VideoComponent.qml
View File

@@ -2,11 +2,11 @@
// SPDX-FileCopyrightText: 2024 James Graham <james.h.graham@protonmail.com> // SPDX-FileCopyrightText: 2024 James Graham <james.h.graham@protonmail.com>
// SPDX-License-Identifier: GPL-3.0-only // SPDX-License-Identifier: GPL-3.0-only
import QtCore as Core
import QtQuick import QtQuick
import QtQuick.Controls as QQC2 import QtQuick.Controls as QQC2
import QtQuick.Layouts import QtQuick.Layouts
import QtMultimedia import QtMultimedia
import Qt.labs.platform as Platform
import org.kde.coreaddons import org.kde.coreaddons
import org.kde.kirigami as Kirigami import org.kde.kirigami as Kirigami
@@ -451,7 +451,7 @@ Video {
playSavedFile(); playSavedFile();
} else { } else {
playOnFinished = true; playOnFinished = true;
root.room.downloadFile(root.eventId, Platform.StandardPaths.writableLocation(Platform.StandardPaths.CacheLocation) + "/" + root.eventId.replace(":", "_").replace("/", "_").replace("+", "_") + root.room.fileNameToDownload(root.eventId)); root.room.downloadFile(root.eventId, Core.StandardPaths.writableLocation(Core.StandardPaths.CacheLocation) + "/" + root.eventId.replace(":", "_").replace("/", "_").replace("+", "_") + root.room.fileNameToDownload(root.eventId));
} }
} }