parent
595bca0294
commit
aa1dae9e20
|
@ -74,7 +74,7 @@ QtObject:
|
||||||
self, "onNewCommunityMembershipRequestNotification(QString, QString, QString)", 2)
|
self, "onNewCommunityMembershipRequestNotification(QString, QString, QString)", 2)
|
||||||
signalConnect(singletonInstance.globalEvents, "myRequestToJoinCommunityAcccepted(QString, QString, QString)",
|
signalConnect(singletonInstance.globalEvents, "myRequestToJoinCommunityAcccepted(QString, QString, QString)",
|
||||||
self, "onMyRequestToJoinCommunityAcccepted(QString, QString, QString)", 2)
|
self, "onMyRequestToJoinCommunityAcccepted(QString, QString, QString)", 2)
|
||||||
signalConnect(singletonInstance.globalEvents, "myRequestToJoinCommunityHasBeenRejected(QString, QString, QString)",
|
signalConnect(singletonInstance.globalEvents, "myRequestToJoinCommunityRejected(QString, QString, QString)",
|
||||||
self, "onMyRequestToJoinCommunityRejected(QString, QString, QString)", 2)
|
self, "onMyRequestToJoinCommunityRejected(QString, QString, QString)", 2)
|
||||||
self.notificationSetUp = true
|
self.notificationSetUp = true
|
||||||
|
|
||||||
|
|
|
@ -49,12 +49,15 @@ QtObject:
|
||||||
|
|
||||||
proc receivedMessage*(self: View, lastMessage: string) {.signal.}
|
proc receivedMessage*(self: View, lastMessage: string) {.signal.}
|
||||||
|
|
||||||
|
proc getLastMessage*(self: View): string {.slot.} =
|
||||||
|
return self.lastMessage
|
||||||
|
|
||||||
proc setLastMessage*(self: View, lastMessage: string) =
|
proc setLastMessage*(self: View, lastMessage: string) =
|
||||||
self.lastMessage = lastMessage
|
self.lastMessage = lastMessage
|
||||||
self.receivedMessage(lastMessage)
|
self.receivedMessage(lastMessage)
|
||||||
|
|
||||||
QtProperty[string] lastMessage:
|
QtProperty[string] lastMessage:
|
||||||
read = lastMessage
|
read = getLastMessage
|
||||||
notify = receivedMessage
|
notify = receivedMessage
|
||||||
|
|
||||||
proc getWakuBloomFilterMode*(self: View): bool {.slot.} =
|
proc getWakuBloomFilterMode*(self: View): bool {.slot.} =
|
||||||
|
|
|
@ -130,7 +130,7 @@ QtObject {
|
||||||
property string currentCurrency: walletSection.currentCurrency
|
property string currentCurrency: walletSection.currentCurrency
|
||||||
property string signingPhrase: walletSection.signingPhrase
|
property string signingPhrase: walletSection.signingPhrase
|
||||||
|
|
||||||
property string channelEmoji: chatCommunitySectionModule && chatCommunitySectionModule.emoji
|
property string channelEmoji: chatCommunitySectionModule && chatCommunitySectionModule.emoji ? chatCommunitySectionModule.emoji : ""
|
||||||
|
|
||||||
property string gasPrice: profileSectionModule.ensUsernamesModule.gasPrice
|
property string gasPrice: profileSectionModule.ensUsernamesModule.gasPrice
|
||||||
|
|
||||||
|
|
|
@ -46,6 +46,7 @@ StatusAppThreePanelLayout {
|
||||||
|
|
||||||
Connections {
|
Connections {
|
||||||
target: root.rootStore.chatCommunitySectionModule
|
target: root.rootStore.chatCommunitySectionModule
|
||||||
|
ignoreUnknownSignals: true
|
||||||
onActiveItemChanged: {
|
onActiveItemChanged: {
|
||||||
root.rootStore.openCreateChat = false;
|
root.rootStore.openCreateChat = false;
|
||||||
}
|
}
|
||||||
|
|
|
@ -20,7 +20,7 @@ RadioButtonSelector {
|
||||||
|
|
||||||
onCheckedChanged: {
|
onCheckedChanged: {
|
||||||
if (checked) {
|
if (checked) {
|
||||||
if (root.advancedStore.currentNetworkName === root.network)
|
if (root.advancedStore.currentNetworkName === root.title)
|
||||||
return
|
return
|
||||||
|
|
||||||
root.newNetwork = root.network;
|
root.newNetwork = root.network;
|
||||||
|
|
|
@ -125,10 +125,12 @@ SettingsContentBase {
|
||||||
model: [ qsTr("XS"), qsTr("S"), qsTr("M"), qsTr("L"), qsTr("XL"), qsTr("XXL") ]
|
model: [ qsTr("XS"), qsTr("S"), qsTr("M"), qsTr("L"), qsTr("XL"), qsTr("XXL") ]
|
||||||
value: localAccountSensitiveSettings.fontSize
|
value: localAccountSensitiveSettings.fontSize
|
||||||
onValueChanged: {
|
onValueChanged: {
|
||||||
|
if (localAccountSensitiveSettings.fontSize !== value) {
|
||||||
localAccountSensitiveSettings.fontSize = value
|
localAccountSensitiveSettings.fontSize = value
|
||||||
appearanceView.updateFontSize(value)
|
appearanceView.updateFontSize(value)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
StatusBaseText {
|
StatusBaseText {
|
||||||
id: labelZoom
|
id: labelZoom
|
||||||
|
|
|
@ -80,9 +80,11 @@ SettingsContentBase {
|
||||||
StatusSwitch {
|
StatusSwitch {
|
||||||
checked: localAccountSensitiveSettings.shouldShowFavoritesBar
|
checked: localAccountSensitiveSettings.shouldShowFavoritesBar
|
||||||
onCheckedChanged: {
|
onCheckedChanged: {
|
||||||
|
if (localAccountSensitiveSettings.shouldShowFavoritesBar !== checked) {
|
||||||
localAccountSensitiveSettings.shouldShowFavoritesBar = checked
|
localAccountSensitiveSettings.shouldShowFavoritesBar = checked
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -72,7 +72,7 @@ SettingsContentBase {
|
||||||
enabled: root.contactsStore.receivedContactRequestsModel.count > 0 ||
|
enabled: root.contactsStore.receivedContactRequestsModel.count > 0 ||
|
||||||
root.contactsStore.sentContactRequestsModel.count > 0
|
root.contactsStore.sentContactRequestsModel.count > 0
|
||||||
btnText: qsTr("Pending Requests")
|
btnText: qsTr("Pending Requests")
|
||||||
badge.value: contactList.count
|
badge.value: root.contactsStore.receivedContactRequestsModel.count
|
||||||
}
|
}
|
||||||
// Temporary commented until we provide appropriate flags on the `status-go` side to cover all sections.
|
// Temporary commented until we provide appropriate flags on the `status-go` side to cover all sections.
|
||||||
// StatusTabButton {
|
// StatusTabButton {
|
||||||
|
|
|
@ -49,7 +49,7 @@ ColumnLayout {
|
||||||
checked: localAccountSensitiveSettings.useBrowserEthereumExplorer === Constants.browserEthereumExplorerEtherscan
|
checked: localAccountSensitiveSettings.useBrowserEthereumExplorer === Constants.browserEthereumExplorerEtherscan
|
||||||
text: "etherscan.io"
|
text: "etherscan.io"
|
||||||
onCheckedChanged: {
|
onCheckedChanged: {
|
||||||
if (checked) {
|
if (checked && localAccountSensitiveSettings.useBrowserEthereumExplorer !== Constants.browserEthereumExplorerEtherscan) {
|
||||||
localAccountSensitiveSettings.useBrowserEthereumExplorer = Constants.browserEthereumExplorerEtherscan
|
localAccountSensitiveSettings.useBrowserEthereumExplorer = Constants.browserEthereumExplorerEtherscan
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -54,12 +54,14 @@ StatusSelect {
|
||||||
if(generatedAccountsModel) {
|
if(generatedAccountsModel) {
|
||||||
generatedAccountsModel.clear()
|
generatedAccountsModel.clear()
|
||||||
for (var row = 0; row < _internal.delegateModel.model.count; row++) {
|
for (var row = 0; row < _internal.delegateModel.model.count; row++) {
|
||||||
|
if (_internal.delegateModel.items.count > 0) {
|
||||||
var item = _internal.delegateModel.items.get(row).model;
|
var item = _internal.delegateModel.items.get(row).model;
|
||||||
generatedAccountsModel.append({"name": item.name, "iconName": item.iconName, "generatedModel": item.generatedModel, "derivedfrom": item.derivedfrom, "isHeader": false})
|
generatedAccountsModel.append({"name": item.name, "iconName": item.iconName, "generatedModel": item.generatedModel, "derivedfrom": item.derivedfrom, "isHeader": false})
|
||||||
if (row === 0 && _internal.delegateModel.model.count > 1) {
|
if (row === 0 && _internal.delegateModel.model.count > 1) {
|
||||||
generatedAccountsModel.append({"name": qsTr("Imported"), "iconName": "", "derivedfrom": "", "isHeader": true})
|
generatedAccountsModel.append({"name": qsTr("Imported"), "iconName": "", "derivedfrom": "", "isHeader": true})
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
generatedAccountsModel.append({"name": qsTr("Add new"), "iconName": "", "derivedfrom": "", "isHeader": true})
|
generatedAccountsModel.append({"name": qsTr("Add new"), "iconName": "", "derivedfrom": "", "isHeader": true})
|
||||||
generatedAccountsModel.append({"name": _internal.importSeedPhraseString, "iconName": "seed-phrase", "derivedfrom": "", "isHeader": false})
|
generatedAccountsModel.append({"name": _internal.importSeedPhraseString, "iconName": "seed-phrase", "derivedfrom": "", "isHeader": false})
|
||||||
generatedAccountsModel.append({"name": _internal.importPrivateKeyString, "iconName": "password", "derivedfrom": "", "isHeader": false})
|
generatedAccountsModel.append({"name": _internal.importPrivateKeyString, "iconName": "password", "derivedfrom": "", "isHeader": false})
|
||||||
|
|
|
@ -143,7 +143,7 @@ QtObject {
|
||||||
}
|
}
|
||||||
|
|
||||||
function checkRecentHistory() {
|
function checkRecentHistory() {
|
||||||
history.checkRecentHistory()
|
walletSection.checkRecentHistory()
|
||||||
}
|
}
|
||||||
|
|
||||||
function fetchCollectionCollectiblesList(slug) {
|
function fetchCollectionCollectiblesList(slug) {
|
||||||
|
|
|
@ -28,6 +28,8 @@ import StatusQ.Layout 0.1
|
||||||
import StatusQ.Popups 0.1
|
import StatusQ.Popups 0.1
|
||||||
import StatusQ.Core 0.1
|
import StatusQ.Core 0.1
|
||||||
|
|
||||||
|
import AppLayouts.Browser.stores 1.0 as BrowserStores
|
||||||
|
|
||||||
import AppLayouts.stores 1.0
|
import AppLayouts.stores 1.0
|
||||||
|
|
||||||
Item {
|
Item {
|
||||||
|
|
|
@ -404,7 +404,7 @@ Rectangle {
|
||||||
property string copiedTextFormatted: ""
|
property string copiedTextFormatted: ""
|
||||||
ListView {
|
ListView {
|
||||||
id: dummyContactList
|
id: dummyContactList
|
||||||
model: control.usersStore.usersModel
|
model: control.usersStore ? control.usersStore.usersModel : []
|
||||||
delegate: Item {
|
delegate: Item {
|
||||||
property string contactName: model.name
|
property string contactName: model.name
|
||||||
}
|
}
|
||||||
|
@ -631,6 +631,7 @@ Rectangle {
|
||||||
Connections {
|
Connections {
|
||||||
enabled: control.isActiveChannel
|
enabled: control.isActiveChannel
|
||||||
target: Global.appMain.dragAndDrop
|
target: Global.appMain.dragAndDrop
|
||||||
|
ignoreUnknownSignals: true
|
||||||
onDroppedOnValidScreen: (drop) => {
|
onDroppedOnValidScreen: (drop) => {
|
||||||
let validImages = validateImages(drop.urls)
|
let validImages = validateImages(drop.urls)
|
||||||
if (validImages.length > 0) {
|
if (validImages.length > 0) {
|
||||||
|
@ -690,7 +691,7 @@ Rectangle {
|
||||||
|
|
||||||
SuggestionBoxPanel {
|
SuggestionBoxPanel {
|
||||||
id: suggestionsBox
|
id: suggestionsBox
|
||||||
model: control.usersStore.usersModel
|
model: control.usersStore ? control.usersStore.usersModel : []
|
||||||
x : messageInput.x
|
x : messageInput.x
|
||||||
y: -height - Style.current.smallPadding
|
y: -height - Style.current.smallPadding
|
||||||
width: messageInput.width
|
width: messageInput.width
|
||||||
|
|
|
@ -87,7 +87,7 @@ Item {
|
||||||
+ (dateGroupLbl.visible ? dateGroupLbl.height + dateGroupLbl.anchors.topMargin : 0)
|
+ (dateGroupLbl.visible ? dateGroupLbl.height + dateGroupLbl.anchors.topMargin : 0)
|
||||||
|
|
||||||
Connections {
|
Connections {
|
||||||
target: root.messageStore.messageModule? root.messageStore.messageModule : null
|
target: !!root.messageStore && root.messageStore.messageModule? root.messageStore.messageModule : null
|
||||||
enabled: responseTo !== ""
|
enabled: responseTo !== ""
|
||||||
onRefreshAMessageUserRespondedTo: {
|
onRefreshAMessageUserRespondedTo: {
|
||||||
if(msgId === messageId)
|
if(msgId === messageId)
|
||||||
|
|
Loading…
Reference in New Issue