Move popups to their own folder

This commit is contained in:
miruka 2019-09-09 08:57:38 -04:00
parent 6b26aa6d0b
commit c38cc9d3df
6 changed files with 9 additions and 9 deletions

View File

@ -128,7 +128,7 @@ Column {
icon.name: "clear-messages"
text: qsTr("Clear messages")
onTriggered: Utils.makePopup(
"Chat/ClearMessagesPopup.qml",
"Popups/ClearMessagesPopup.qml",
chatPage,
{userId: chatPage.userId, roomId: chatPage.roomId},
)

View File

@ -3,6 +3,7 @@ import QtQuick.Controls 2.12
import QtQuick.Layouts 1.12
import Qt.labs.platform 1.1
import "../../Base"
import "../../Popups"
import "../../utils.js" as Utils
HBox {
@ -58,7 +59,7 @@ HBox {
}
}
HPasswordPopup {
PasswordPopup {
property url file: ""
id: exportPasswordPopup
@ -69,7 +70,7 @@ HBox {
encryptionUI.exportKeys(file, acceptedPassword, exportButton)
}
HPasswordPopup {
PasswordPopup {
property url file: ""
function verifyPassword(pass, callback) {

View File

@ -1,5 +1,6 @@
import QtQuick 2.12
import QtQuick.Layouts 1.12
import "../Base"
HPopup {
id: popup

View File

@ -1,7 +1,6 @@
import QtQuick 2.12
import "../Base"
HBoxPopup {
BoxPopup {
summary.text: qsTr("Clear this room's messages?")
details.text: qsTr(
"The messages will only be removed on your side. " +

View File

@ -1,9 +1,8 @@
import QtQuick 2.12
import QtQuick.Controls 2.12
import QtQuick.Layouts 1.12
import "../SidePane"
import "../Base"
HBoxPopup {
BoxPopup {
id: popup
okEnabled: Boolean(passwordField.text)

View File

@ -117,7 +117,7 @@ HShortcutHandler {
enabled: window.uiState.page == "Chat/Chat.qml"
sequences: settings.keys.clearRoomMessages
onPressed: Utils.makePopup(
"Chat/ClearMessagesPopup.qml",
"Popups/ClearMessagesPopup.qml",
mainUI,
{
userId: window.uiState.pageProperties.userId,