Zergling_man/moment
Zergling_man/moment
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Move popups to their own folder

Browse Source
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/qml/Chat/Timeline/EventDelegate.qml
View File

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

5
src/qml/Pages/EditAccount/ImportExportKeys.qml
View File

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

1
src/qml/Base/HBoxPopup.qml → src/qml/Popups/BoxPopup.qml
View File

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

3
src/qml/Chat/ClearMessagesPopup.qml → src/qml/Popups/ClearMessagesPopup.qml
View File

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

5
src/qml/Base/HPasswordPopup.qml → src/qml/Popups/PasswordPopup.qml
View File

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

2
src/qml/Shortcuts.qml
View File

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