Skip to content

Commit

Permalink
Modify icon
Browse files Browse the repository at this point in the history
  • Loading branch information
@KangLin
KangLin committed Jun 25, 2023
1 parent 54b5735 commit 6188d3f
Show file tree
Hide file tree
Showing 41 changed files with 53 additions and 50 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/macos.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -74,9 +74,9 @@ jobs:
vcpkgDirectory: ${{runner.workspace}}/vcpkg/
# Since the cache must be invalidated when content of the vcpkg.json file changes, let's
# compute its hash and append this to the computed cache's key.
appendedCacheKey: cache-vcpkg-msvc-${{matrix.os}}-vc${{matrix.VCPKG_PLATFORM_TOOLSET}}-${{matrix.triplet}}-qt${{matrix.qt_version}}-${{matrix.BUILD_TYPE}}-${{env.VCPKGGITCOMMITID}}
appendedCacheKey: vcpkg-macos-${{env.VCPKGGITCOMMITID}}
vcpkgTriplet: '${{matrix.triplet}}'
vcpkgArguments: 'openssl libpng pixman libjpeg-turbo libyuv ffmpeg opencv' # dlib ncnn'
vcpkgArguments: 'openssl libpng pixman libjpeg-turbo libyuv ffmpeg opencv dlib ncnn'

- name: Cache Qt
id: cache-qt
Expand Down
2 changes: 2 additions & 0 deletions App/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -115,3 +115,5 @@ else()
DESTINATION etc
COMPONENT Runtime)
endif()

INSTALL_ICON_THEME(SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/Resource/icons)
62 changes: 30 additions & 32 deletions App/MainWindow.ui
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@
<string>Face recognizer</string>
</property>
<property name="windowIcon">
<iconset resource="Resource/Resource.qrc">
<normaloff>:/image/FaceRecognizer</normaloff>:/image/FaceRecognizer</iconset>
<iconset theme="face-recognizer">
<normaloff>.</normaloff>.</iconset>
</property>
<widget class="QWidget" name="centralwidget"/>
<widget class="QMenuBar" name="menubar">
Expand All @@ -30,7 +30,7 @@
<x>0</x>
<y>0</y>
<width>600</width>
<height>21</height>
<height>20</height>
</rect>
</property>
<widget class="QMenu" name="menuOperate">
Expand All @@ -45,8 +45,8 @@
<string>Register</string>
</property>
<property name="icon">
<iconset resource="Resource/Resource.qrc">
<normaloff>:/image/Register</normaloff>:/image/Register</iconset>
<iconset theme="register">
<normaloff>.</normaloff>.</iconset>
</property>
<addaction name="actionRegisterImage"/>
<addaction name="actionRegisterImage_directory"/>
Expand All @@ -60,8 +60,8 @@
<string>Recognizer</string>
</property>
<property name="icon">
<iconset resource="Resource/Resource.qrc">
<normaloff>:/image/FaceRecognizer</normaloff>:/image/FaceRecognizer</iconset>
<iconset theme="face-recognizer">
<normaloff>.</normaloff>.</iconset>
</property>
<addaction name="actionRecognizerImage"/>
<addaction name="actionRecognizerVideo"/>
Expand All @@ -71,8 +71,8 @@
<string>AI libraries</string>
</property>
<property name="icon">
<iconset resource="Resource/Resource.qrc">
<normaloff>:/image/Tools</normaloff>:/image/Tools</iconset>
<iconset theme="tools">
<normaloff>.</normaloff>.</iconset>
</property>
</widget>
<addaction name="actionStart"/>
Expand Down Expand Up @@ -142,7 +142,8 @@
<bool>true</bool>
</property>
<property name="icon">
<iconset theme="media-playback-start"/>
<iconset theme="media-playback-start">
<normaloff>.</normaloff>.</iconset>
</property>
<property name="text">
<string>Start</string>
Expand Down Expand Up @@ -175,8 +176,8 @@
</action>
<action name="actionSet_model_path">
<property name="icon">
<iconset resource="Resource/Resource.qrc">
<normaloff>:/image/Folder</normaloff>:/image/Folder</iconset>
<iconset theme="folder">
<normaloff>.</normaloff>.</iconset>
</property>
<property name="text">
<string>Set model path</string>
Expand All @@ -187,8 +188,8 @@
</action>
<action name="actionAbout_A">
<property name="icon">
<iconset resource="Resource/Resource.qrc">
<normaloff>:/image/FaceRecognizer</normaloff>:/image/FaceRecognizer</iconset>
<iconset theme="face-recognizer">
<normaloff>.</normaloff>.</iconset>
</property>
<property name="text">
<string>About(&amp;A)</string>
Expand Down Expand Up @@ -225,8 +226,7 @@
<bool>true</bool>
</property>
<property name="icon">
<iconset resource="Resource/Resource.qrc">
<normaloff>:/image/VideoFile</normaloff>:/image/VideoFile</iconset>
<iconset theme="video-file" />
</property>
<property name="text">
<string>Display</string>
Expand All @@ -246,7 +246,8 @@
<bool>true</bool>
</property>
<property name="icon">
<iconset theme="camera-video"/>
<iconset theme="camera-video">
<normaloff>.</normaloff>.</iconset>
</property>
<property name="text">
<string>Camera</string>
Expand All @@ -257,8 +258,8 @@
<bool>true</bool>
</property>
<property name="icon">
<iconset resource="Resource/Resource.qrc">
<normaloff>:/image/VideoFile</normaloff>:/image/VideoFile</iconset>
<iconset theme="video-file">
<normaloff>.</normaloff>.</iconset>
</property>
<property name="text">
<string>File</string>
Expand All @@ -269,8 +270,8 @@
<bool>true</bool>
</property>
<property name="icon">
<iconset resource="Resource/Resource.qrc">
<normaloff>:/image/Image</normaloff>:/image/Image</iconset>
<iconset theme="image">
<normaloff>.</normaloff>.</iconset>
</property>
<property name="text">
<string>Image</string>
Expand All @@ -293,8 +294,7 @@
<bool>false</bool>
</property>
<property name="icon">
<iconset resource="Resource/Resource.qrc">
<normaloff>:/image/Folder</normaloff>:/image/Folder</iconset>
<iconset theme="folder" />
</property>
<property name="text">
<string>Image directory</string>
Expand All @@ -314,8 +314,7 @@
<bool>true</bool>
</property>
<property name="icon">
<iconset resource="Resource/Resource.qrc">
<normaloff>:/image/VideoFile</normaloff>:/image/VideoFile</iconset>
<iconset theme="video-file"/>
</property>
<property name="text">
<string>Video</string>
Expand All @@ -335,8 +334,7 @@
<bool>true</bool>
</property>
<property name="icon">
<iconset resource="Resource/Resource.qrc">
<normaloff>:/image/Image</normaloff>:/image/Image</iconset>
<iconset theme="image"/>
</property>
<property name="text">
<string>Image</string>
Expand All @@ -356,8 +354,7 @@
<bool>true</bool>
</property>
<property name="icon">
<iconset resource="Resource/Resource.qrc">
<normaloff>:/image/VideoFile</normaloff>:/image/VideoFile</iconset>
<iconset theme="video-file"/>
</property>
<property name="text">
<string>Video</string>
Expand All @@ -377,7 +374,8 @@
<bool>false</bool>
</property>
<property name="icon">
<iconset theme="applications-system"/>
<iconset theme="applications-system">
<normaloff>.</normaloff>.</iconset>
</property>
<property name="text">
<string>Options(&amp;O)</string>
Expand Down Expand Up @@ -417,8 +415,8 @@
</action>
<action name="actionExit">
<property name="icon">
<iconset resource="Resource/Resource.qrc">
<normaloff>:/image/Exit</normaloff>:/image/Exit</iconset>
<iconset theme="application-exit">
<normaloff>.</normaloff>.</iconset>
</property>
<property name="text">
<string>Exit</string>
Expand Down
15 changes: 0 additions & 15 deletions App/Resource/Resource.qrc
View file
Original file line number Diff line number Diff line change
@@ -1,20 +1,5 @@
<RCC>
<qresource prefix="/image">
<file alias="FaceRecognizer">image/FaceRecognizer.png</file>
<file alias="Start">image/Start.png</file>
<file alias="Stop">image/Stop.png</file>
<file alias="Register">image/Register.png</file>
<file alias="VideoFile">image/VideoFile.png</file>
<file alias="Video">image/Video.png</file>
<file alias="Camera">image/Camera.png</file>
<file alias="VideoFolder">image/Videofolder.png</file>
<file alias="Folder">image/Folder.png</file>
<file alias="Image">image/Image.png</file>
<file alias="Exit">image/exit.png</file>
<file alias="Log">image/log.png</file>
<file alias="Delete">image/delete.png</file>
<file alias="Option">image/option.png</file>
<file alias="Tools">image/Tools.png</file>
<file alias="Wait">image/wait.png</file>
</qresource>
</RCC>
1 change: 1 addition & 0 deletions App/Resource/icons/black/svg/face-recognizer.svg
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions App/Resource/icons/black/svg/image.svg
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions App/Resource/icons/black/svg/register.svg
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions App/Resource/icons/black/svg/video-file.svg
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions App/Resource/icons/black/svg/video-folder.svg
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions App/Resource/icons/green/svg/face-recognizer.svg
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions App/Resource/icons/green/svg/image.svg
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading

0 comments on commit 6188d3f

Please sign in to comment.