status-im/status-desktop
2
0
Fork 0
mirror of https://github.com/status-im/status-desktop.git synced 2025-02-22 11:38:57 +00:00
Code Issues Projects Releases Wiki Activity

put sounds on top level to avoid duplicated sound channels

Browse Source
This commit is contained in:
Iuri Matias 2020-07-09 13:02:58 -04:00
parent 2221f1c8e3
commit 91cf1682b1
12 changed files with 17 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ui/app/AppLayouts/Chat/ChatColumn/ChatInput.qml
View File

@ -11,11 +11,6 @@ Rectangle {
visible: chatsModel.activeChannel.chatType !== Constants.chatTypePrivateGroupChat || chatsModel.activeChannel.isMember(profileModel.profile.pubKey)
Audio {
id: sendMessageSound
source: "../../../../sounds/send_message.wav"
}
function onEnter(event){
if (event.modifiers === Qt.NoModifier && (event.key === Qt.Key_Enter || event.key === Qt.Key_Return)) {
if(txtData.text.trim().length > 0){

7
ui/app/AppLayouts/Wallet/AccountSettingsModal.qml
View File

@ -4,7 +4,6 @@ import QtQuick.Layouts 1.13
import QtQuick.Dialogs 1.3
import "../../../imports"
import "../../../shared"
import "../../../sounds"
ModalPopup {
property var currentAccount: walletModel.currentAccount
@ -34,12 +33,6 @@ ModalPopup {
accountNameInput.forceActiveFocus(Qt.MouseFocusReason)
}
Item {
ErrorSound {
id: errorSound
}
}
Input {
id: accountNameInput
//% "Enter an account name..."

7
ui/app/AppLayouts/Wallet/AddCustomTokenModal.qml
View File

@ -3,7 +3,6 @@ import QtQuick.Controls 2.13
import QtQuick.Layouts 1.13
import "../../../imports"
import "../../../shared"
import "../../../sounds"
ModalPopup {
id: popup
@ -17,12 +16,6 @@ ModalPopup {
accountNameInput.forceActiveFocus(Qt.MouseFocusReason)
}
Item {
ErrorSound {
id: errorSound
}
}
Input {
id: addressInput
//% "Enter contract address..."

7
ui/app/AppLayouts/Wallet/components/AddAccountWithPrivateKey.qml
View File

@ -2,7 +2,6 @@ import QtQuick 2.13
import QtQuick.Dialogs 1.3
import "../../../../imports"
import "../../../../shared"
import "../../../../sounds"
ModalPopup {
id: popup
@ -53,12 +52,6 @@ ModalPopup {
passwordInput.forceActiveFocus(Qt.MouseFocusReason)
}
Item {
ErrorSound {
id: errorSound
}
}
Input {
id: passwordInput
//% "Enter your password…"

7
ui/app/AppLayouts/Wallet/components/AddAccountWithSeed.qml
View File

@ -2,7 +2,6 @@ import QtQuick 2.13
import QtQuick.Dialogs 1.3
import "../../../../imports"
import "../../../../shared"
import "../../../../sounds"
ModalPopup {
id: popup
@ -54,12 +53,6 @@ ModalPopup {
//% "Add account with a seed phrase"
title: qsTrId("add-seed-account")
Item {
ErrorSound {
id: errorSound
}
}
Input {
id: passwordInput
//% "Enter your password…"

7
ui/app/AppLayouts/Wallet/components/AddWatchOnlyAccount.qml
View File

@ -2,7 +2,6 @@ import QtQuick 2.13
import QtQuick.Dialogs 1.3
import "../../../../imports"
import "../../../../shared"
import "../../../../sounds"
ModalPopup {
id: popup
@ -41,12 +40,6 @@ ModalPopup {
addressInput.forceActiveFocus(Qt.MouseFocusReason)
}
Item {
ErrorSound {
id: errorSound
}
}
Input {
id: addressInput
// TODO add QR code reader for the address

7
ui/app/AppLayouts/Wallet/components/GenerateAccountModal.qml
View File

@ -2,7 +2,6 @@ import QtQuick 2.13
import QtQuick.Dialogs 1.3
import "../../../../imports"
import "../../../../shared"
import "../../../../sounds"
ModalPopup {
id: popup
@ -41,12 +40,6 @@ ModalPopup {
passwordInput.forceActiveFocus(Qt.MouseFocusReason)
}
Item {
ErrorSound {
id: errorSound
}
}
Input {
id: passwordInput
//% "Enter your password…"

16
ui/main.qml
View File

@ -3,10 +3,12 @@ import QtQuick.Controls 2.13
import QtQuick.Layouts 1.13
import Qt.labs.platform 1.1
import QtQml.StateMachine 1.14 as DSM
import QtMultimedia 5.13
import Qt.labs.settings 1.0
import QtQml 2.13
import "./onboarding"
import "./app"
import "./sounds"
import "./imports"
ApplicationWindow {
@ -29,6 +31,20 @@ ApplicationWindow {
signal navigateTo(string path)
Item {
ErrorSound {
id: errorSound
}
}
Item {
Audio {
id: sendMessageSound
audioRole: NotificationRole
source: "../../../../sounds/send_message.wav"
}
}
Settings {
id: settings
property var chatSplitView

7
ui/onboarding/CreatePasswordModal.qml
View File

@ -3,7 +3,6 @@ import QtQuick.Controls 2.13
import QtQuick.Dialogs 1.3
import "../imports"
import "../shared"
import "../sounds"
ModalPopup {
property bool loading: false
@ -44,12 +43,6 @@ ModalPopup {
firstPasswordField.forceActiveFocus(Qt.MouseFocusReason)
}
Item {
ErrorSound {
id: errorSound
}
}
Input {
id: firstPasswordField
anchors.rightMargin: 56

5
ui/onboarding/ExistingKey.qml
View File

@ -1,6 +1,5 @@
import QtQuick 2.13
import QtQuick.Controls 2.13
import "../sounds"
Item {
property var onClosed: function () {}
@ -11,10 +10,6 @@ Item {
enterSeedPhraseModal.open()
}
ErrorSound {
id: errorSound
}
EnterSeedPhraseModal {
property bool wentNext: false
id: enterSeedPhraseModal

5
ui/onboarding/Login.qml
View File

@ -5,7 +5,6 @@ import QtQuick.Dialogs 1.3
import QtGraphicalEffects 1.13
import "../shared"
import "../imports"
import "../sounds"
import "./Login"
Item {
@ -25,10 +24,6 @@ Item {
txtPassword.forceActiveFocus(Qt.MouseFocusReason)
}
ErrorSound {
id: errorSound
}
Item {
id: element
width: 360

1
ui/sounds/ErrorSound.qml
View File

@ -4,6 +4,7 @@ import QtMultimedia 5.13
Audio {
id: errorSound
source: "./error.mp3"
audioRole: NotificationRole
}
/*##^##