parent
4188193e0e
commit
123b8e320a
|
@ -82,7 +82,7 @@ SettingsPageLayout {
|
||||||
if (root.membersModel.count === 0) {
|
if (root.membersModel.count === 0) {
|
||||||
return qsTr("No members to search")
|
return qsTr("No members to search")
|
||||||
} else {
|
} else {
|
||||||
return qsTr("Search %1's %n member(s)", "", root.membersModel.count).arg(root.communityName)
|
return qsTr("Search %1's %n member(s)", "", root.membersModel ? root.membersModel.count : 0).arg(root.communityName)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
panelType: CommunityMembersTabPanel.TabType.AllMembers
|
panelType: CommunityMembersTabPanel.TabType.AllMembers
|
||||||
|
|
|
@ -20,7 +20,7 @@ Item {
|
||||||
property alias searchButton: searchButton
|
property alias searchButton: searchButton
|
||||||
|
|
||||||
property var rootStore
|
property var rootStore
|
||||||
property var chatContentModule: root.rootStore.currentChatContentModule()
|
property var chatContentModule: root.rootStore.currentChatContentModule() || null
|
||||||
property var emojiPopup
|
property var emojiPopup
|
||||||
property int padding: Style.current.halfPadding
|
property int padding: Style.current.halfPadding
|
||||||
|
|
||||||
|
@ -287,8 +287,8 @@ Item {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
asset.name: chatContentModule? chatContentModule.chatDetails.icon : ""
|
asset.name: chatContentModule? chatContentModule.chatDetails.icon : ""
|
||||||
asset.isImage: chatContentModule.chatDetails.icon !== ""
|
asset.isImage: chatContentModule && chatContentModule.chatDetails.icon !== ""
|
||||||
asset.isLetterIdenticon: chatContentModule.chatDetails.icon === ""
|
asset.isLetterIdenticon: chatContentModule && chatContentModule.chatDetails.icon === ""
|
||||||
ringSettings.ringSpecModel: chatContentModule && chatContentModule.chatDetails.type === Constants.chatType.oneToOne ?
|
ringSettings.ringSpecModel: chatContentModule && chatContentModule.chatDetails.type === Constants.chatType.oneToOne ?
|
||||||
Utils.getColorHashAsJson(chatContentModule.chatDetails.id) : ""
|
Utils.getColorHashAsJson(chatContentModule.chatDetails.id) : ""
|
||||||
asset.color: chatContentModule?
|
asset.color: chatContentModule?
|
||||||
|
|
|
@ -121,7 +121,7 @@ StatusSectionLayout {
|
||||||
let chatContentModule = root.rootStore.currentChatContentModule()
|
let chatContentModule = root.rootStore.currentChatContentModule()
|
||||||
if (!chatContentModule || !chatContentModule.usersModule) {
|
if (!chatContentModule || !chatContentModule.usersModule) {
|
||||||
// New communities have no chats, so no chatContentModule
|
// New communities have no chats, so no chatContentModule
|
||||||
return 0
|
return null
|
||||||
}
|
}
|
||||||
return chatContentModule.usersModule.model
|
return chatContentModule.usersModule.model
|
||||||
}
|
}
|
||||||
|
|
|
@ -79,7 +79,7 @@ StatusSectionLayout {
|
||||||
id: communityHeader
|
id: communityHeader
|
||||||
|
|
||||||
title: community.name
|
title: community.name
|
||||||
subTitle: qsTr("%n member(s)", "", community.members.count)
|
subTitle: qsTr("%n member(s)", "", community.members.count || 0)
|
||||||
asset.name: community.image
|
asset.name: community.image
|
||||||
asset.color: community.color
|
asset.color: community.color
|
||||||
asset.isImage: true
|
asset.isImage: true
|
||||||
|
|
|
@ -14,7 +14,8 @@ OnboardingBasePage {
|
||||||
|
|
||||||
property var startupStore: StartupStore {}
|
property var startupStore: StartupStore {}
|
||||||
|
|
||||||
backButtonVisible: root.startupStore.currentStartupState.displayBackButton
|
backButtonVisible: root.startupStore.currentStartupState ? root.startupStore.currentStartupState.displayBackButton
|
||||||
|
: false
|
||||||
|
|
||||||
onBackClicked: {
|
onBackClicked: {
|
||||||
root.startupStore.backAction()
|
root.startupStore.backAction()
|
||||||
|
|
|
@ -4,8 +4,10 @@ QtObject {
|
||||||
id: root
|
id: root
|
||||||
|
|
||||||
property var startupModuleInst: startupModule
|
property var startupModuleInst: startupModule
|
||||||
property var currentStartupState: startupModuleInst.currentStartupState
|
property var currentStartupState: startupModuleInst ? startupModuleInst.currentStartupState
|
||||||
property var selectedLoginAccount: startupModuleInst.selectedLoginAccount
|
: null
|
||||||
|
property var selectedLoginAccount: startupModuleInst ? startupModuleInst.selectedLoginAccount
|
||||||
|
: null
|
||||||
|
|
||||||
function backAction() {
|
function backAction() {
|
||||||
root.currentStartupState.backAction()
|
root.currentStartupState.backAction()
|
||||||
|
|
|
@ -259,7 +259,7 @@ Popup {
|
||||||
|
|
||||||
RowLayout {
|
RowLayout {
|
||||||
id: stickersRowLayout
|
id: stickersRowLayout
|
||||||
width: inputScrollView.availableWidth
|
width: installedStickersSV.availableWidth
|
||||||
spacing: Style.current.padding
|
spacing: Style.current.padding
|
||||||
|
|
||||||
Repeater {
|
Repeater {
|
||||||
|
|
Loading…
Reference in New Issue