diff --git a/CMakeLists.txt b/CMakeLists.txt index 8c7d38a..3769f6e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -11,7 +11,7 @@ if (NOT CMAKE_CXX_COMPILER_ID STREQUAL "GNU" AND WIN32) set(CMAKE_INTERPROCEDURAL_OPTIMIZATION ON) endif () -find_package(Qt6 REQUIRED COMPONENTS Widgets Network Svg LinguistTools QuickControls2) +find_package(Qt6 REQUIRED COMPONENTS Widgets Network LinguistTools) if (NKR_CROSS) set_property(TARGET Qt6::moc PROPERTY IMPORTED_LOCATION /usr/bin/moc) @@ -259,7 +259,7 @@ target_sources(nekoray PRIVATE ${CMAKE_BINARY_DIR}/translations.qrc) # Target Link target_link_libraries(nekoray PRIVATE - Qt6::Widgets Qt6::Network Qt6::Svg + Qt6::Widgets Qt6::Network Threads::Threads ${NKR_EXTERNAL_TARGETS} ${PLATFORM_LIBRARIES} diff --git a/include/ui/profile/ProxyItem.ui b/include/ui/profile/ProxyItem.ui index 351dbae..23ddf6c 100644 --- a/include/ui/profile/ProxyItem.ui +++ b/include/ui/profile/ProxyItem.ui @@ -45,7 +45,7 @@ - :/icon/material/swap-horizontal.svg:/icon/material/swap-horizontal.svg + :/icon/material/swap-horizontal.png:/icon/material/swap-horizontal.png @@ -59,7 +59,7 @@ - :/icon/material/delete.svg:/icon/material/delete.svg + :/icon/material/delete.png:/icon/material/delete.png diff --git a/res/icon/dialog-question.png b/res/icon/dialog-question.png new file mode 100644 index 0000000..01d8ab0 Binary files /dev/null and b/res/icon/dialog-question.png differ diff --git a/res/icon/dialog-question.svg b/res/icon/dialog-question.svg deleted file mode 100644 index 7ff4bc4..0000000 --- a/res/icon/dialog-question.svg +++ /dev/null @@ -1,29 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/res/icon/internet-web-browser.png b/res/icon/internet-web-browser.png new file mode 100644 index 0000000..0cb76fa Binary files /dev/null and b/res/icon/internet-web-browser.png differ diff --git a/res/icon/internet-web-browser.svg b/res/icon/internet-web-browser.svg deleted file mode 100644 index 138a1a3..0000000 --- a/res/icon/internet-web-browser.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/res/icon/material/cancel.png b/res/icon/material/cancel.png new file mode 100644 index 0000000..1ca259b Binary files /dev/null and b/res/icon/material/cancel.png differ diff --git a/res/icon/material/cancel.svg b/res/icon/material/cancel.svg deleted file mode 100644 index 3327c05..0000000 --- a/res/icon/material/cancel.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/res/icon/material/delete.png b/res/icon/material/delete.png new file mode 100644 index 0000000..9a3f4cf Binary files /dev/null and b/res/icon/material/delete.png differ diff --git a/res/icon/material/delete.svg b/res/icon/material/delete.svg deleted file mode 100644 index 21c80c2..0000000 --- a/res/icon/material/delete.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/res/icon/material/history.png b/res/icon/material/history.png new file mode 100644 index 0000000..aedbb0f Binary files /dev/null and b/res/icon/material/history.png differ diff --git a/res/icon/material/history.svg b/res/icon/material/history.svg deleted file mode 100644 index 20c490c..0000000 --- a/res/icon/material/history.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/res/icon/material/lock-open-outline.png b/res/icon/material/lock-open-outline.png new file mode 100644 index 0000000..5a004f2 Binary files /dev/null and b/res/icon/material/lock-open-outline.png differ diff --git a/res/icon/material/lock-open-outline.svg b/res/icon/material/lock-open-outline.svg deleted file mode 100644 index 4e0291d..0000000 --- a/res/icon/material/lock-open-outline.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/res/icon/material/lock-outline.png b/res/icon/material/lock-outline.png new file mode 100644 index 0000000..d513492 Binary files /dev/null and b/res/icon/material/lock-outline.png differ diff --git a/res/icon/material/lock-outline.svg b/res/icon/material/lock-outline.svg deleted file mode 100644 index 4dee801..0000000 --- a/res/icon/material/lock-outline.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/res/icon/material/swap-horizontal.png b/res/icon/material/swap-horizontal.png new file mode 100644 index 0000000..2a88457 Binary files /dev/null and b/res/icon/material/swap-horizontal.png differ diff --git a/res/icon/material/swap-horizontal.svg b/res/icon/material/swap-horizontal.svg deleted file mode 100644 index 3f30649..0000000 --- a/res/icon/material/swap-horizontal.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/res/icon/material/swap-vertical.png b/res/icon/material/swap-vertical.png new file mode 100644 index 0000000..ea2188b Binary files /dev/null and b/res/icon/material/swap-vertical.png differ diff --git a/res/icon/material/swap-vertical.svg b/res/icon/material/swap-vertical.svg deleted file mode 100644 index 41d46a9..0000000 --- a/res/icon/material/swap-vertical.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/res/icon/network-server.png b/res/icon/network-server.png new file mode 100644 index 0000000..c098376 Binary files /dev/null and b/res/icon/network-server.png differ diff --git a/res/icon/network-server.svg b/res/icon/network-server.svg deleted file mode 100644 index 0806722..0000000 --- a/res/icon/network-server.svg +++ /dev/null @@ -1,35 +0,0 @@ - - - - - - - - - - diff --git a/res/icon/preferences.png b/res/icon/preferences.png new file mode 100644 index 0000000..6d76f70 Binary files /dev/null and b/res/icon/preferences.png differ diff --git a/res/icon/preferences.svg b/res/icon/preferences.svg deleted file mode 100644 index 875b939..0000000 --- a/res/icon/preferences.svg +++ /dev/null @@ -1,141 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/res/icon/system-run.png b/res/icon/system-run.png new file mode 100644 index 0000000..b36b392 Binary files /dev/null and b/res/icon/system-run.png differ diff --git a/res/icon/system-run.svg b/res/icon/system-run.svg deleted file mode 100644 index 45494f4..0000000 --- a/res/icon/system-run.svg +++ /dev/null @@ -1,190 +0,0 @@ - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/res/icon/system-software-update.png b/res/icon/system-software-update.png new file mode 100644 index 0000000..638dc75 Binary files /dev/null and b/res/icon/system-software-update.png differ diff --git a/res/icon/system-software-update.svg b/res/icon/system-software-update.svg deleted file mode 100644 index e8567fb..0000000 --- a/res/icon/system-software-update.svg +++ /dev/null @@ -1,32 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/res/neko.qrc b/res/neko.qrc index 5a38a40..a6785a5 100644 --- a/res/neko.qrc +++ b/res/neko.qrc @@ -1,18 +1,18 @@ - icon/internet-web-browser.svg - icon/system-run.svg - icon/preferences.svg - icon/network-server.svg - icon/dialog-question.svg - icon/system-software-update.svg - icon/material/lock-open-outline.svg - icon/material/lock-outline.svg - icon/material/cancel.svg - icon/material/history.svg - icon/material/swap-vertical.svg - icon/material/delete.svg - icon/material/swap-horizontal.svg + icon/internet-web-browser.png + icon/system-run.png + icon/preferences.png + icon/network-server.png + icon/dialog-question.png + icon/system-software-update.png + icon/material/lock-open-outline.png + icon/material/lock-outline.png + icon/material/cancel.png + icon/material/history.png + icon/material/swap-vertical.png + icon/material/delete.png + icon/material/swap-horizontal.png public/nekobox.png diff --git a/script/deploy_linux64.sh b/script/deploy_linux64.sh index 1e38d5b..6bbe72d 100755 --- a/script/deploy_linux64.sh +++ b/script/deploy_linux64.sh @@ -32,7 +32,7 @@ wget https://github.com/linuxdeploy/linuxdeploy/releases/download/1-alpha-202401 wget https://github.com/linuxdeploy/linuxdeploy-plugin-qt/releases/download/1-alpha-20240109-1/linuxdeploy-plugin-qt-x86_64.AppImage chmod +x linuxdeploy-x86_64.AppImage linuxdeploy-plugin-qt-x86_64.AppImage -export EXTRA_QT_PLUGINS="svg;iconengines;" +export EXTRA_QT_PLUGINS="iconengines;" ./linuxdeploy-x86_64.AppImage --appdir $DEST --executable $DEST/nekoray --plugin qt rm linuxdeploy-x86_64.AppImage linuxdeploy-plugin-qt-x86_64.AppImage cd $DEST diff --git a/src/ui/setting/Icon.cpp b/src/ui/setting/Icon.cpp index bc72e63..b979399 100644 --- a/src/ui/setting/Icon.cpp +++ b/src/ui/setting/Icon.cpp @@ -50,6 +50,6 @@ QPixmap Icon::GetTrayIcon(Icon::TrayIconStatus status) { } QPixmap Icon::GetMaterialIcon(const QString &name) { - QPixmap pixmap(":/icon/material/" + name + ".svg"); + QPixmap pixmap(":/icon/material/" + name + ".png"); return pixmap; }