medvedych/harbour-fernschreiber
2
0
Fork 1
Code Issues Pull requests 1 Projects Releases Packages Wiki Activity

Merge pull request #111 from jgibbon/bugfix/poll-fixes

Browse source 
Fix two issues in PollPreview
This commit is contained in:
Sebastian Wolf 2020-10-29 21:57:16 +01:00 committed by GitHub
commit e3224c5b4f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
qml/components/PollPreview.qml
View file

@ -102,10 +102,11 @@ Item {
id: canAnswerDelegate id: canAnswerDelegate
TextSwitch { TextSwitch {
id: optionDelegate id: optionDelegate
// TextSwitch changes the html base path:
property url emojiBase: "../js/emoji/"
width: pollMessageComponent.width width: pollMessageComponent.width
automaticCheck: false automaticCheck: false
// emojify does not work here :/ text: Emoji.emojify(modelData.text, Theme.fontSizeMedium, emojiBase)
text: modelData.text
checked: pollMessageComponent.chosenIndexes.indexOf(index) > -1 checked: pollMessageComponent.chosenIndexes.indexOf(index) > -1
onClicked: { onClicked: {
pollMessageComponent.handleChoose(index); pollMessageComponent.handleChoose(index);
@ -263,6 +264,7 @@ Item {
Component { Component {
id: closePollMenuItemComponent id: closePollMenuItemComponent
MenuItem { MenuItem {
visible: !pollData.is_closed && pollMessageComponent.canEdit
text: qsTr("Close Poll") text: qsTr("Close Poll")
onClicked: { onClicked: {
tdLibWrapper.stopPoll(pollMessageComponent.chatId, pollMessageComponent.messageId); tdLibWrapper.stopPoll(pollMessageComponent.chatId, pollMessageComponent.messageId);
@ -272,6 +274,7 @@ Item {
Component { Component {
id: resetAnswerMenuItemComponent id: resetAnswerMenuItemComponent
MenuItem { MenuItem {
visible: !pollData.is_closed && !pollMessageComponent.isQuiz && pollMessageComponent.hasAnswered
text: qsTr("Reset Answer") text: qsTr("Reset Answer")
onClicked: { onClicked: {
pollMessageComponent.resetChosen() pollMessageComponent.resetChosen()
@ -282,12 +285,8 @@ Item {
Component.onCompleted: { Component.onCompleted: {
opacity = 1; opacity = 1;
if(messageItem && messageItem.menu ) { // workaround to add menu entries if(messageItem && messageItem.menu ) { // workaround to add menu entries
if(!pollData.is_closed && pollMessageComponent.canEdit) { closePollMenuItemComponent.createObject(messageItem.menu._contentColumn);
closePollMenuItemComponent.createObject(messageItem.menu._contentColumn); resetAnswerMenuItemComponent.createObject(messageItem.menu._contentColumn);
}
if(!pollData.is_closed && !pollMessageComponent.isQuiz && pollMessageComponent.hasAnswered) {
resetAnswerMenuItemComponent.createObject(messageItem.menu._contentColumn);
}
} }
} }
} }