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

Use fluent icon instead of fontawesome

parent fff130d3
No related branches found
No related tags found
1 merge request!16Change QML UI for redactions
Pipeline #2150 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
resources/icons/ui/delete.svg 0 → 100644
+ 1
− 0
View file @ 34871cca
<svg width="24" height="24" fill="none" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><path d="M12 1.75a3.25 3.25 0 0 1 3.245 3.066L15.25 5h5.25a.75.75 0 0 1 .102 1.493L20.5 6.5h-.796l-1.28 13.02a2.75 2.75 0 0 1-2.561 2.474l-.176.006H8.313a2.75 2.75 0 0 1-2.714-2.307l-.023-.174L4.295 6.5H3.5a.75.75 0 0 1-.743-.648L2.75 5.75a.75.75 0 0 1 .648-.743L3.5 5h5.25A3.25 3.25 0 0 1 12 1.75Zm6.197 4.75H5.802l1.267 12.872a1.25 1.25 0 0 0 1.117 1.122l.127.006h7.374c.6 0 1.109-.425 1.225-1.002l.02-.126L18.196 6.5ZM13.75 9.25a.75.75 0 0 1 .743.648L14.5 10v7a.75.75 0 0 1-1.493.102L13 17v-7a.75.75 0 0 1 .75-.75Zm-3.5 0a.75.75 0 0 1 .743.648L11 10v7a.75.75 0 0 1-1.493.102L9.5 17v-7a.75.75 0 0 1 .75-.75Zm1.75-6a1.75 1.75 0 0 0-1.744 1.606L10.25 5h3.5A1.75 1.75 0 0 0 12 3.25Z" fill="#212121"/></svg>
resources/qml/delegates/MessageDelegate.qml
+ 1
− 1
View file @ 34871cca
......@@ -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 @ 34871cca
<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>
......@@ -77,6 +11,7 @@
<file>icons/ui/chat.svg</file>
<file>icons/ui/checkmark.svg</file>
<file>icons/ui/clock.svg</file>
<file>icons/ui/delete.svg</file>
<file>icons/ui/edit.svg</file>
<file>icons/ui/end-call.svg</file>
<file>icons/ui/lowprio.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