uiux(Communities): various community profile popup ui fixes
This commit changes a bunch of things related to ui bugs in the community profile popup. Fixes include: - Removing the `Delete Community` option since this functionality isn't implemented yet - Changing the color of the menu item's icons in dark mode to be blue - Doing the same in the memberlist popup
This commit is contained in:
parent
ea802a95d7
commit
fc2e8505f3
|
@ -3,6 +3,7 @@ import QtQuick.Controls 2.12
|
||||||
import QtQuick.Dialogs 1.3
|
import QtQuick.Dialogs 1.3
|
||||||
import QtQuick.Layouts 1.13
|
import QtQuick.Layouts 1.13
|
||||||
import QtGraphicalEffects 1.13
|
import QtGraphicalEffects 1.13
|
||||||
|
import QtQuick.Controls.Universal 2.12
|
||||||
import "../../../../imports"
|
import "../../../../imports"
|
||||||
import "../../../../shared"
|
import "../../../../shared"
|
||||||
import "../../../../shared/status"
|
import "../../../../shared/status"
|
||||||
|
@ -150,6 +151,7 @@ ModalPopup {
|
||||||
icon.width: 20
|
icon.width: 20
|
||||||
icon.height: 16
|
icon.height: 16
|
||||||
rotation: 180
|
rotation: 180
|
||||||
|
type: globalSettings.theme === Universal.Dark ? "secondary" : "primary"
|
||||||
onClicked: {
|
onClicked: {
|
||||||
stack.pop()
|
stack.pop()
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,6 +1,7 @@
|
||||||
import QtQuick 2.13
|
import QtQuick 2.13
|
||||||
import QtQuick.Controls 2.13
|
import QtQuick.Controls 2.13
|
||||||
import QtQuick.Layouts 1.13
|
import QtQuick.Layouts 1.13
|
||||||
|
import QtQuick.Controls.Universal 2.12
|
||||||
import "../../../../imports"
|
import "../../../../imports"
|
||||||
import "../../../../shared"
|
import "../../../../shared"
|
||||||
import "../../../../shared/status"
|
import "../../../../shared/status"
|
||||||
|
@ -18,6 +19,7 @@ Item {
|
||||||
//% "Invite People"
|
//% "Invite People"
|
||||||
label: qsTrId("invite-people")
|
label: qsTrId("invite-people")
|
||||||
width: parent.width
|
width: parent.width
|
||||||
|
type: globalSettings.theme === Universal.Dark ? "secondary" : "primary"
|
||||||
iconName: "invite"
|
iconName: "invite"
|
||||||
onClicked: openPopup(inviteFriendsToCommunityPopup)
|
onClicked: openPopup(inviteFriendsToCommunityPopup)
|
||||||
}
|
}
|
||||||
|
|
|
@ -3,6 +3,7 @@ import QtQuick.Controls 2.12
|
||||||
import QtQuick.Dialogs 1.3
|
import QtQuick.Dialogs 1.3
|
||||||
import QtQuick.Layouts 1.13
|
import QtQuick.Layouts 1.13
|
||||||
import QtGraphicalEffects 1.13
|
import QtGraphicalEffects 1.13
|
||||||
|
import QtQuick.Controls.Universal 2.12
|
||||||
import "../../../../imports"
|
import "../../../../imports"
|
||||||
import "../../../../shared"
|
import "../../../../shared"
|
||||||
import "../../../../shared/status"
|
import "../../../../shared/status"
|
||||||
|
@ -63,7 +64,6 @@ Item {
|
||||||
width: parent.width
|
width: parent.width
|
||||||
|
|
||||||
Loader {
|
Loader {
|
||||||
active: isAdmin
|
|
||||||
width: parent.width
|
width: parent.width
|
||||||
sourceComponent: Component {
|
sourceComponent: Component {
|
||||||
CommunityPopupButton {
|
CommunityPopupButton {
|
||||||
|
@ -72,6 +72,7 @@ Item {
|
||||||
iconName: "members"
|
iconName: "members"
|
||||||
txtColor: Style.current.textColor
|
txtColor: Style.current.textColor
|
||||||
onClicked: stack.push(membersList)
|
onClicked: stack.push(membersList)
|
||||||
|
type: globalSettings.theme === Universal.Dark ? "secondary" : "primary"
|
||||||
|
|
||||||
Item {
|
Item {
|
||||||
property int nbRequests: chatsModel.communities.activeCommunity.communityMembershipRequests.nbRequests
|
property int nbRequests: chatsModel.communities.activeCommunity.communityMembershipRequests.nbRequests
|
||||||
|
@ -164,6 +165,7 @@ Item {
|
||||||
iconName: "notifications"
|
iconName: "notifications"
|
||||||
width: parent.width
|
width: parent.width
|
||||||
txtColor: Style.current.textColor
|
txtColor: Style.current.textColor
|
||||||
|
type: globalSettings.theme === Universal.Dark ? "secondary" : "primary"
|
||||||
onClicked: function(){
|
onClicked: function(){
|
||||||
notificationSwitch.checked = !notificationSwitch.checked
|
notificationSwitch.checked = !notificationSwitch.checked
|
||||||
}
|
}
|
||||||
|
@ -216,6 +218,7 @@ Item {
|
||||||
sourceComponent: CommunityPopupButton {
|
sourceComponent: CommunityPopupButton {
|
||||||
label: qsTr("Transfer ownership")
|
label: qsTr("Transfer ownership")
|
||||||
iconName: "../transfer"
|
iconName: "../transfer"
|
||||||
|
type: globalSettings.theme === Universal.Dark ? "secondary" : "primary"
|
||||||
onClicked: {
|
onClicked: {
|
||||||
const exportResult = chatsModel.communities.exportComumnity()
|
const exportResult = chatsModel.communities.exportComumnity()
|
||||||
openPopup(transferOwnershipPopup, {privateKey: exportResult})
|
openPopup(transferOwnershipPopup, {privateKey: exportResult})
|
||||||
|
@ -232,10 +235,13 @@ Item {
|
||||||
//% "Leave community"
|
//% "Leave community"
|
||||||
label: qsTrId("leave-community")
|
label: qsTrId("leave-community")
|
||||||
iconName: "leave"
|
iconName: "leave"
|
||||||
|
type: globalSettings.theme === Universal.Dark ? "secondary" : "primary"
|
||||||
}
|
}
|
||||||
|
|
||||||
Loader {
|
Loader {
|
||||||
active: isAdmin
|
// TODO(pascal): reactivate with `isAdmin` once delete functionality
|
||||||
|
// is actually implemented
|
||||||
|
active: false
|
||||||
width: parent.width
|
width: parent.width
|
||||||
sourceComponent: CommunityPopupButton {
|
sourceComponent: CommunityPopupButton {
|
||||||
id: deleteBtn
|
id: deleteBtn
|
||||||
|
|
Loading…
Reference in New Issue