Skip to content
Snippets Groups Projects

Change QML UI for redactions

Merged Joe Donofry requested to merge redaction_updates into master
1 unresolved thread
  • Make the timeline designator a little more attractive
  • Add hover tooltip for additional information about the redaction
  • Update translations

Merge request reports

Loading
Loading

Activity

Filter activity
  • Approvals
  • Assignees & reviewers
  • Comments (from bots)
  • Comments (from users)
  • Commits & branches
  • Edits
  • Labels
  • Lock status
  • Mentions
  • Merge request status
  • Tracking
  • Joe Donofry added 2 commits

    added 2 commits

    • fff130d3 - Merge nheko-im/master and fix conflicts
    • 34871cca - Use fluent icon instead of fontawesome

    Compare with previous version

  • Nicolas Werner
  • Joe Donofry added 1 commit

    added 1 commit

    • dc633e9c - Remove extra icon, fix html escaping

    Compare with previous version

  • Joe Donofry added 1 commit

    added 1 commit

    • 47e4b35d - Fix redacted user being incorrect and fix styling for large redactions

    Compare with previous version

  • Joe Donofry added 1 commit

    added 1 commit

    Compare with previous version

  • Joe Donofry added 46 commits

    added 46 commits

    Compare with previous version

  • Joe Donofry resolved all threads

    resolved all threads

  • Joe Donofry added 1 commit

    added 1 commit

    Compare with previous version

  • 187 Layout.preferredHeight: fontMetrics.font.pixelSize
    188 source: "image://colorimage/:/icons/icons/ui/delete.svg?" + Nheko.colors.text
    189 }
    190 Label {
    191 id: redactedLabel
    192 Layout.margins: Nheko.paddingSmall
    193 Layout.alignment: Qt.AlignVCenter | Qt.AlignRight
    194 Layout.fillWidth: true
    195 Layout.maximumWidth: d.width - 4 * Nheko.paddingSmall - trashImg.width - 2 * Nheko.paddingMedium
    196 property var redactedPair: room.formatRedactedEvent(eventId)
    197 text: redactedPair["first"]
    198 wrapMode: Label.WordWrap
    199
    200 ToolTip.text: redactedPair["second"]
    201 ToolTip.visible: ma.containsMouse
    202 MouseArea {
  • Joe Donofry added 13 commits

    added 13 commits

    • 134e179f...bd020bb4 - 11 commits from branch master
    • 69240121 - Move redacted delegate to its own file and change mousearea to hoverhandler
    • aeef7e22 - Merge remote-tracking branch 'nheko-im/master' into redaction_updates

    Compare with previous version

  • Joe Donofry added 1 commit

    added 1 commit

    Compare with previous version

  • Nicolas Werner enabled an automatic merge when the pipeline for 2abb5e2f succeeds

    enabled an automatic merge when the pipeline for 2abb5e2f succeeds

  • Nicolas Werner mentioned in commit 87d99779

    mentioned in commit 87d99779

  • Please register or sign in to reply
    Loading