Skip to content
Snippets Groups Projects
Verified Commit de66e61e authored by Joe Donofry's avatar Joe Donofry
Browse files

Fix redaction message to use fluent icon

parent 89dc9234
No related branches found
No related tags found
No related merge requests found
Pipeline #2104 passed
Stage: build
This commit is part of merge request !16. Comments created here will be created in the context of that merge request.
Hide whitespace changes
Inline Side-by-side
io.github.NhekoReborn.Nheko.yaml
+ 0
− 4
View file @ de66e61e
......@@ -166,12 +166,8 @@ modules:
- mkdir -p /app/bin/
- cp libqtjdenticon.so /app/bin/
sources:
<<<<<<< HEAD
- commit: 77eb0d62441e03bbbfc2b1d2057c4045ac87fb85
=======
- commit: e58c14369dfbf008c63f43a4556b2e52232e0265
tag: v0.1.0
>>>>>>> nheko-im/master
type: git
url: https://github.com/Nheko-Reborn/qt-jdenticon.git
- buildsystem: meson
......
resources/icons/ui/delete.svg 0 → 100644
+ 1
− 0
View file @ de66e61e
<svg width="24" height="24" fill="none" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><path d="M21.5 6a1 1 0 0 1-.883.993L20.5 7h-.845l-1.231 12.52A2.75 2.75 0 0 1 15.687 22H8.313a2.75 2.75 0 0 1-2.737-2.48L4.345 7H3.5a1 1 0 0 1 0-2h5a3.5 3.5 0 1 1 7 0h5a1 1 0 0 1 1 1Zm-7.25 3.25a.75.75 0 0 0-.743.648L13.5 10v7l.007.102a.75.75 0 0 0 1.486 0L15 17v-7l-.007-.102a.75.75 0 0 0-.743-.648Zm-4.5 0a.75.75 0 0 0-.743.648L9 10v7l.007.102a.75.75 0 0 0 1.486 0L10.5 17v-7l-.007-.102a.75.75 0 0 0-.743-.648ZM12 3.5A1.5 1.5 0 0 0 10.5 5h3A1.5 1.5 0 0 0 12 3.5Z" fill="#212121"/></svg>
\ No newline at end of file
resources/qml/EncryptionIndicator.qml
+ 0
− 7
View file @ de66e61e
......@@ -40,17 +40,10 @@ Image {
case Crypto.TOFU:
return sourceUrl + Nheko.colors.buttonText;
default:
<<<<<<< HEAD
return "image://colorimage/:/icons/icons/ui/lock.png?" + Nheko.theme.error;
}
} else {
return "image://colorimage/:/icons/icons/ui/unlock.png?" + Nheko.theme.error;
=======
return sourceUrl + Nheko.theme.error;
}
} else {
return sourceUrl + Nheko.theme.error;
>>>>>>> nheko-im/master
}
}
ToolTip.visible: ma.hovered
......
resources/qml/delegates/MessageDelegate.qml
+ 1
− 1
View file @ de66e61e
......@@ -184,7 +184,7 @@ Item {
Layout.alignment: Qt.AlignLeft | Qt.AlignVCenter
Layout.preferredWidth: fontMetrics.font.pixelSize
Layout.preferredHeight: fontMetrics.font.pixelSize
source: "image://colorimage/:/icons/icons/ui/trash.svg?" + Nheko.colors.text
source: "image://colorimage/:/icons/icons/ui/delete.svg?" + Nheko.colors.text
}
Label {
id: redactedLabel
......
resources/res.qrc
+ 1
− 67
View file @ de66e61e
<RCC>
<qresource prefix="/icons">
<file>icons/ui/sticky-note-solid.svg</file>
<<<<<<< HEAD
<file>icons/ui/smile.png</file>
<file>icons/ui/smile@2x.png</file>
<file>icons/ui/speech-bubbles-comment-option.png</file>
<file>icons/ui/speech-bubbles-comment-option@2x.png</file>
<file>icons/ui/vertical-ellipsis.png</file>
<file>icons/ui/vertical-ellipsis@2x.png</file>
<file>icons/ui/power-button-off.png</file>
<file>icons/ui/power-button-off@2x.png</file>
<file>icons/ui/plus-black-symbol.png</file>
<file>icons/ui/plus-black-symbol@2x.png</file>
<file>icons/ui/add-square-button.png</file>
<file>icons/ui/add-square-button@2x.png</file>
<file>icons/ui/cloud-storage-uploading-option.png</file>
<file>icons/ui/cloud-storage-uploading-option@2x.png</file>
<file>icons/ui/paper-clip-outline.png</file>
<file>icons/ui/paper-clip-outline@2x.png</file>
<file>icons/ui/angle-pointing-to-left.png</file>
<file>icons/ui/angle-pointing-to-left@2x.png</file>
<file>icons/ui/angle-arrow-down.png</file>
<file>icons/ui/angle-arrow-down@2x.png</file>
<file>icons/ui/arrow-pointing-down.png</file>
<file>icons/ui/arrow-pointing-down@2x.png</file>
<file>icons/ui/play-sign.png</file>
<file>icons/ui/play-sign@2x.png</file>
<file>icons/ui/pause-symbol.png</file>
<file>icons/ui/pause-symbol@2x.png</file>
<file>icons/ui/remove-symbol.png</file>
<file>icons/ui/remove-symbol@2x.png</file>
<file>icons/ui/world.png</file>
<file>icons/ui/world@2x.png</file>
<file>icons/ui/tag.png</file>
<file>icons/ui/tag@2x.png</file>
<file>icons/ui/star.png</file>
<file>icons/ui/star@2x.png</file>
<file>icons/ui/lowprio.png</file>
<file>icons/ui/lowprio@2x.png</file>
<file>icons/ui/edit.png</file>
<file>icons/ui/edit@2x.png</file>
<file>icons/ui/mail-reply.png</file>
<file>icons/ui/place-call.png</file>
<file>icons/ui/end-call.png</file>
<file>icons/ui/microphone-mute.png</file>
<file>icons/ui/microphone-unmute.png</file>
<file>icons/ui/screen-share.png</file>
<file>icons/ui/toggle-camera-view.png</file>
<file>icons/ui/video-call.png</file>
<file>icons/ui/refresh.png</file>
<file>icons/ui/trash.svg</file>
<file>icons/emoji-categories/people.png</file>
<file>icons/emoji-categories/people@2x.png</file>
<file>icons/emoji-categories/nature.png</file>
<file>icons/emoji-categories/nature@2x.png</file>
<file>icons/emoji-categories/foods.png</file>
<file>icons/emoji-categories/foods@2x.png</file>
<file>icons/emoji-categories/activity.png</file>
<file>icons/emoji-categories/activity@2x.png</file>
<file>icons/emoji-categories/travel.png</file>
<file>icons/emoji-categories/travel@2x.png</file>
<file>icons/emoji-categories/objects.png</file>
<file>icons/emoji-categories/objects@2x.png</file>
<file>icons/emoji-categories/symbols.png</file>
<file>icons/emoji-categories/symbols@2x.png</file>
<file>icons/emoji-categories/flags.png</file>
<file>icons/emoji-categories/flags@2x.png</file>
=======
<file>icons/ui/add-square-button.svg</file>
<file>icons/ui/send.svg</file>
<file>icons/ui/smile.svg</file>
......@@ -105,6 +39,7 @@
<file>icons/ui/image-failed.svg</file>
<file>icons/ui/dismiss.svg</file>
<file>icons/ui/download.svg</file>
<file>icons/ui/delete.svg</file>
<file>icons/emoji-categories/activity.svg</file>
<file>icons/emoji-categories/flags.svg</file>
<file>icons/emoji-categories/foods.svg</file>
......@@ -117,7 +52,6 @@
<file>icons/ui/shield-filled-exclamation-mark.svg</file>
<file>icons/ui/shield-filled-checkmark.svg</file>
<file>icons/ui/shield-filled-cross.svg</file>
>>>>>>> nheko-im/master
</qresource>
<qresource prefix="/logos">
<file>nheko.png</file>
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment