Skip to content

feat(icons): add theme-aware SVG rendering #316

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
alphagocc wants to merge 1 commit into
base: master
Choose a base branch
from
Open

feat(icons): add theme-aware SVG rendering #316

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 11 additions & 0 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -297,6 +297,17 @@ target_precompile_headers(lemon PUBLIC ${CMAKE_SOURCE_DIR}/src/pch.h)

target_link_libraries(lemon PRIVATE ${LEMON_QT_LIBS} lemon-core lemon-base SingleApplication::SingleApplication spdlog::spdlog)

# Linking this static Qt plugin also imports its generated registration object.
find_package(${LEMON_QT_LIBNAME} COMPONENTS Svg REQUIRED)
qt_add_plugin(lemon-svg-icon STATIC
PLUGIN_TYPE iconengines
CLASS_NAME LemonSvgIconPlugin
src/plugins/lemonsvgiconplugin.cpp
src/plugins/lemonsvgiconplugin.json
)
target_link_libraries(lemon-svg-icon PRIVATE ${LEMON_QT_LIBNAME}::Gui ${LEMON_QT_LIBNAME}::Svg)
target_link_libraries(lemon PRIVATE lemon-svg-icon)

if(ENABLE_LTO)
include(CheckIPOSupported)
check_ipo_supported(RESULT LTO_SUPPORTED OUTPUT error)
Expand Down
8 changes: 5 additions & 3 deletions assets/pics/acrobat.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion assets/pics/list-add.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion assets/pics/list-remove.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
64 changes: 32 additions & 32 deletions resource.qrc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,37 +9,37 @@
</qresource>
<qresource prefix="/icon">
<file alias="icon.png">assets/icons/lemon-lime.png</file>
<file alias="code-function.svg">assets/pics/code-function.svg</file>
<file alias="configure.svg">assets/pics/configure.svg</file>
<file alias="dialog-cancel.svg">assets/pics/dialog-cancel.svg</file>
<file alias="dialog-ok-apply.svg">assets/pics/dialog-ok-apply.svg</file>
<file alias="document-edit.svg">assets/pics/document-edit.svg</file>
<file alias="edit-clear.svg">assets/pics/edit-clear.svg</file>
<file alias="edit-delete.svg">assets/pics/edit-delete.svg</file>
<file alias="edit-find-replace.svg">assets/pics/edit-find-replace.svg</file>
<file alias="edit-find.svg">assets/pics/edit-find.svg</file>
<file alias="go-down.svg">assets/pics/go-down.svg</file>
<file alias="go-up.svg">assets/pics/go-up.svg</file>
<file alias="list-add.svg">assets/pics/list-add.svg</file>
<file alias="list-remove.svg">assets/pics/list-remove.svg</file>
<file alias="media-playback-stop.svg">assets/pics/media-playback-stop.svg</file>
<file alias="media-skip-forward.svg">assets/pics/media-skip-forward.svg</file>
<file alias="paint-none.svg">assets/pics/paint-none.svg</file>
<file alias="view-refresh.svg">assets/pics/view-refresh.svg</file>
<file alias="view-sort.svg">assets/pics/view-sort.svg</file>
<file alias="application-exit.svg">assets/pics/application-exit.svg</file>
<file alias="deletecell.svg">assets/pics/deletecell.svg</file>
<file alias="document-close.svg">assets/pics/document-close.svg</file>
<file alias="document-export.svg">assets/pics/document-export.svg</file>
<file alias="document-new.svg">assets/pics/document-new.svg</file>
<file alias="document-save.svg">assets/pics/document-save.svg</file>
<file alias="globe.svg">assets/pics/globe.svg</file>
<file alias="go-parent-folder.svg">assets/pics/go-parent-folder.svg</file>
<file alias="help-about.svg">assets/pics/help-about.svg</file>
<file alias="layer-new.svg">assets/pics/layer-new.svg</file>
<file alias="paint-unknown.svg">assets/pics/paint-unknown.svg</file>
<file alias="quickopen-file.svg">assets/pics/quickopen-file.svg</file>
<file alias="system-help.svg">assets/pics/system-help.svg</file>
<file alias="acrobat.svg">assets/pics/acrobat.svg</file>
<file alias="code-function.llsvg">assets/pics/code-function.svg</file>
<file alias="configure.llsvg">assets/pics/configure.svg</file>
<file alias="dialog-cancel.llsvg">assets/pics/dialog-cancel.svg</file>
<file alias="dialog-ok-apply.llsvg">assets/pics/dialog-ok-apply.svg</file>
<file alias="document-edit.llsvg">assets/pics/document-edit.svg</file>
<file alias="edit-clear.llsvg">assets/pics/edit-clear.svg</file>
<file alias="edit-delete.llsvg">assets/pics/edit-delete.svg</file>
<file alias="edit-find-replace.llsvg">assets/pics/edit-find-replace.svg</file>
<file alias="edit-find.llsvg">assets/pics/edit-find.svg</file>
<file alias="go-down.llsvg">assets/pics/go-down.svg</file>
<file alias="go-up.llsvg">assets/pics/go-up.svg</file>
<file alias="list-add.llsvg">assets/pics/list-add.svg</file>
<file alias="list-remove.llsvg">assets/pics/list-remove.svg</file>
<file alias="media-playback-stop.llsvg">assets/pics/media-playback-stop.svg</file>
<file alias="media-skip-forward.llsvg">assets/pics/media-skip-forward.svg</file>
<file alias="paint-none.llsvg">assets/pics/paint-none.svg</file>
<file alias="view-refresh.llsvg">assets/pics/view-refresh.svg</file>
<file alias="view-sort.llsvg">assets/pics/view-sort.svg</file>
<file alias="application-exit.llsvg">assets/pics/application-exit.svg</file>
<file alias="deletecell.llsvg">assets/pics/deletecell.svg</file>
<file alias="document-close.llsvg">assets/pics/document-close.svg</file>
<file alias="document-export.llsvg">assets/pics/document-export.svg</file>
<file alias="document-new.llsvg">assets/pics/document-new.svg</file>
<file alias="document-save.llsvg">assets/pics/document-save.svg</file>
<file alias="globe.llsvg">assets/pics/globe.svg</file>
<file alias="go-parent-folder.llsvg">assets/pics/go-parent-folder.svg</file>
<file alias="help-about.llsvg">assets/pics/help-about.svg</file>
<file alias="layer-new.llsvg">assets/pics/layer-new.svg</file>
<file alias="paint-unknown.llsvg">assets/pics/paint-unknown.svg</file>
<file alias="quickopen-file.llsvg">assets/pics/quickopen-file.svg</file>
<file alias="system-help.llsvg">assets/pics/system-help.svg</file>
<file alias="acrobat.llsvg">assets/pics/acrobat.svg</file>
</qresource>
</RCC>
4 changes: 2 additions & 2 deletions src/forms/addtestcaseswizard.ui
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -415,7 +415,7 @@
</property>
<property name="icon">
<iconset resource="../../resource.qrc">
<normaloff>:/icon/list-add.svg</normaloff>:/icon/list-add.svg</iconset>
<normaloff>:/icon/list-add.llsvg</normaloff>:/icon/list-add.llsvg</iconset>
</property>
</widget>
</item>
Expand All @@ -438,7 +438,7 @@
</property>
<property name="icon">
<iconset resource="../../resource.qrc">
<normaloff>:/icon/list-remove.svg</normaloff>:/icon/list-remove.svg</iconset>
<normaloff>:/icon/list-remove.llsvg</normaloff>:/icon/list-remove.llsvg</iconset>
</property>
</widget>
</item>
Expand Down
2 changes: 1 addition & 1 deletion src/forms/advancedcompilersettingsdialog.ui
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -339,7 +339,7 @@
</property>
<property name="icon">
<iconset resource="../../resource.qrc">
<normaloff>:/icon/edit-delete.svg</normaloff>:/icon/edit-delete.svg</iconset>
<normaloff>:/icon/edit-delete.llsvg</normaloff>:/icon/edit-delete.llsvg</iconset>
</property>
</widget>
</item>
Expand Down
8 changes: 4 additions & 4 deletions src/forms/compilersettings.ui
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@
</property>
<property name="icon">
<iconset resource="../../resource.qrc">
<normaloff>:/icon/go-up.svg</normaloff>:/icon/go-up.svg</iconset>
<normaloff>:/icon/go-up.llsvg</normaloff>:/icon/go-up.llsvg</iconset>
</property>
<property name="autoRaise">
<bool>false</bool>
Expand Down Expand Up @@ -106,7 +106,7 @@
</property>
<property name="icon">
<iconset resource="../../resource.qrc">
<normaloff>:/icon/go-down.svg</normaloff>:/icon/go-down.svg</iconset>
<normaloff>:/icon/go-down.llsvg</normaloff>:/icon/go-down.llsvg</iconset>
</property>
<property name="autoRaise">
<bool>false</bool>
Expand Down Expand Up @@ -148,7 +148,7 @@
</property>
<property name="icon">
<iconset resource="../../resource.qrc">
<normaloff>:/icon/list-add.svg</normaloff>:/icon/list-add.svg</iconset>
<normaloff>:/icon/list-add.llsvg</normaloff>:/icon/list-add.llsvg</iconset>
</property>
<property name="autoRaise">
<bool>false</bool>
Expand Down Expand Up @@ -177,7 +177,7 @@
</property>
<property name="icon">
<iconset resource="../../resource.qrc">
<normaloff>:/icon/list-remove.svg</normaloff>:/icon/list-remove.svg</iconset>
<normaloff>:/icon/list-remove.llsvg</normaloff>:/icon/list-remove.llsvg</iconset>
</property>
<property name="autoRaise">
<bool>false</bool>
Expand Down
2 changes: 1 addition & 1 deletion src/forms/detaildialog.ui
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@
</property>
<property name="icon">
<iconset resource="../../resource.qrc">
<normaloff>:/icon/paint-none.svg</normaloff>:/icon/paint-none.svg</iconset>
<normaloff>:/icon/paint-none.llsvg</normaloff>:/icon/paint-none.llsvg</iconset>
</property>
</widget>
</item>
Expand Down
6 changes: 3 additions & 3 deletions src/forms/environmentvariablesdialog.ui
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@
</property>
<property name="icon">
<iconset resource="../../resource.qrc">
<normaloff>:/icon/list-add.svg</normaloff>:/icon/list-add.svg</iconset>
<normaloff>:/icon/list-add.llsvg</normaloff>:/icon/list-add.llsvg</iconset>
</property>
</widget>
</item>
Expand All @@ -102,7 +102,7 @@
</property>
<property name="icon">
<iconset resource="../../resource.qrc">
<normaloff>:/icon/document-edit.svg</normaloff>:/icon/document-edit.svg</iconset>
<normaloff>:/icon/document-edit.llsvg</normaloff>:/icon/document-edit.llsvg</iconset>
</property>
</widget>
</item>
Expand All @@ -121,7 +121,7 @@
</property>
<property name="icon">
<iconset resource="../../resource.qrc">
<normaloff>:/icon/edit-delete.svg</normaloff>:/icon/edit-delete.svg</iconset>
<normaloff>:/icon/edit-delete.llsvg</normaloff>:/icon/edit-delete.llsvg</iconset>
</property>
</widget>
</item>
Expand Down
4 changes: 2 additions & 2 deletions src/forms/judgingdialog.ui
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@
</property>
<property name="icon">
<iconset resource="../../resource.qrc">
<normaloff>:/icon/media-skip-forward.svg</normaloff>:/icon/media-skip-forward.svg</iconset>
<normaloff>:/icon/media-skip-forward.llsvg</normaloff>:/icon/media-skip-forward.llsvg</iconset>
</property>
<property name="autoDefault">
<bool>false</bool>
Expand Down Expand Up @@ -156,7 +156,7 @@
</property>
<property name="icon">
<iconset resource="../../resource.qrc">
<normaloff>:/icon/media-playback-stop.svg</normaloff>:/icon/media-playback-stop.svg</iconset>
<normaloff>:/icon/media-playback-stop.llsvg</normaloff>:/icon/media-playback-stop.llsvg</iconset>
</property>
<property name="autoDefault">
<bool>false</bool>
Expand Down
Loading