mirror of
https://github.com/status-im/status-desktop.git
synced 2025-02-22 11:38:57 +00:00
fix(PrivacyView): Fix relations between switches and line sensor and local settings. Add getter for profile images.
Closes: #4191
This commit is contained in:
parent
6d2d36650c
commit
f69db2c97b
@ -219,6 +219,18 @@ QtObject:
|
|||||||
return status_ens.userNameOrAlias(self.status.chat.getContacts()[pubKey])
|
return status_ens.userNameOrAlias(self.status.chat.getContacts()[pubKey])
|
||||||
generateAlias(pubKey)
|
generateAlias(pubKey)
|
||||||
|
|
||||||
|
proc getProfileThumbnail*(self: ChatsView, pubKey: string): string {.slot.} =
|
||||||
|
if self.status.chat.getContacts().hasKey(pubKey):
|
||||||
|
return self.status.chat.getContacts()[pubKey].identityImage.thumbnail
|
||||||
|
else:
|
||||||
|
return ""
|
||||||
|
|
||||||
|
proc getProfileImageLarge*(self: ChatsView, pubKey: string): string {.slot.} =
|
||||||
|
if self.status.chat.getContacts().hasKey(pubKey):
|
||||||
|
return self.status.chat.getContacts()[pubKey].identityImage.large
|
||||||
|
else:
|
||||||
|
return ""
|
||||||
|
|
||||||
proc activityNotificationsChanged*(self: ChatsView) {.signal.}
|
proc activityNotificationsChanged*(self: ChatsView) {.signal.}
|
||||||
|
|
||||||
proc getActivityNotificationList(self: ChatsView): QVariant {.slot.} =
|
proc getActivityNotificationList(self: ChatsView): QVariant {.slot.} =
|
||||||
|
@ -166,10 +166,15 @@ Item {
|
|||||||
StatusQControls.StatusSwitch {
|
StatusQControls.StatusSwitch {
|
||||||
id: switch1
|
id: switch1
|
||||||
checked: !localAccountSensitiveSettings.onlyShowContactsProfilePics
|
checked: !localAccountSensitiveSettings.onlyShowContactsProfilePics
|
||||||
|
onCheckedChanged: {
|
||||||
|
if (localAccountSensitiveSettings.onlyShowContactsProfilePics !== !checked) {
|
||||||
|
localAccountSensitiveSettings.onlyShowContactsProfilePics = !checked
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
sensor.onClicked: {
|
sensor.onClicked: {
|
||||||
switch1.checked = localAccountSensitiveSettings.onlyShowContactsProfilePics = !switch1.checked
|
switch1.checked = !switch1.checked
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -185,10 +190,15 @@ Item {
|
|||||||
StatusQControls.StatusSwitch {
|
StatusQControls.StatusSwitch {
|
||||||
id: switch2
|
id: switch2
|
||||||
checked: localAccountSensitiveSettings.displayChatImages
|
checked: localAccountSensitiveSettings.displayChatImages
|
||||||
|
onCheckedChanged: {
|
||||||
|
if (localAccountSensitiveSettings.displayChatImages !== checked) {
|
||||||
|
localAccountSensitiveSettings.displayChatImages !== checked
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
sensor.onClicked: {
|
sensor.onClicked: {
|
||||||
switch2.checked = localAccountSensitiveSettings.displayChatImages = !switch2.checked
|
switch2.checked = !switch2.checked
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -263,10 +273,15 @@ Item {
|
|||||||
StatusQControls.StatusSwitch {
|
StatusQControls.StatusSwitch {
|
||||||
id: switch3
|
id: switch3
|
||||||
checked: !root.store.messagesFromContactsOnly
|
checked: !root.store.messagesFromContactsOnly
|
||||||
|
onCheckedChanged: {
|
||||||
|
if (root.store.messagesFromContactsOnly !== !checked) {
|
||||||
|
root.store.messagesFromContactsOnly = !checked
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
sensor.onClicked: {
|
sensor.onClicked: {
|
||||||
switch3.checked = root.store.setMessagesFromContactsOnly(!switch3.checked)
|
switch3.checked = !switch3.checked
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -57,12 +57,16 @@ Item {
|
|||||||
|
|
||||||
if (localAccountSensitiveSettings.onlyShowContactsProfilePics) {
|
if (localAccountSensitiveSettings.onlyShowContactsProfilePics) {
|
||||||
const isContact = appMain.rootStore.contactsModuleInst.model.list.rowData(index, "isContact")
|
const isContact = appMain.rootStore.contactsModuleInst.model.list.rowData(index, "isContact")
|
||||||
if (isContact === "false") {
|
if (isContact === "true") {
|
||||||
|
return appMain.rootStore.contactsModuleInst.model.list.rowData(index, useLargeImage ? "largeImage" : "thumbnailImage")
|
||||||
|
} else {
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
return appMain.rootStore.contactsModuleInst.model.list.rowData(index, useLargeImage ? "largeImage" : "thumbnailImage")
|
return useLargeImage ? appMain.rootStore.chatsModelInst.getProfileImageLarge(pubkey)
|
||||||
|
: appMain.rootStore.chatsModelInst.getProfileThumbnail(pubkey)
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
function openPopup(popupComponent, params = {}) {
|
function openPopup(popupComponent, params = {}) {
|
||||||
|
Loading…
x
Reference in New Issue
Block a user