Skip to content

Commit 01afcf7

Browse files
end2endzoneend2endzone
authored
Merge pull request #180 from end2endzone/feature-issue171 (fixes #171)
2 parents 2489b88 + 3cd41f7 commit 01afcf7

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

56 files changed

+2509
-8
lines changed

‎.github/workflows/build_windows.yml‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -135,6 +135,16 @@ jobs:
135135
shell: cmd
136136
run: call ci\github\install_libmagic.bat
137137

138+
- name: Install ImageMagick
139+
working-directory: ${{env.GITHUB_WORKSPACE}}
140+
shell: cmd
141+
run: call ci\github\install_imagemagick.bat
142+
143+
- name: Build flat-color-icons ico files
144+
working-directory: ${{env.GITHUB_WORKSPACE}}
145+
shell: cmd
146+
run: call ci\github\build_flat-color-icons.bat
147+
138148
- name: Build Shellanything
139149
working-directory: ${{env.GITHUB_WORKSPACE}}
140150
shell: cmd

‎.gitignore‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
/build
22
/install
3-
/third_parties
43
/out
54
.vscode
65
.vs
@@ -16,3 +15,10 @@
1615
/src/plugins/sa_plugin_process/build
1716
/scripts/refresh.tmp.bat
1817
/installer
18+
/third_parties/RapidAssist
19+
/third_parties/glog
20+
/third_parties/glog_static_old
21+
/third_parties/googletest
22+
/third_parties/libmagic
23+
/third_parties/tinyxml2
24+
/third_parties/zlib

‎.gitmodules‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
[submodule "third_parties/flat-color-icons"]
2+
path = third_parties/flat-color-icons
3+
url = https://github.com/icons8/flat-color-icons.git

‎CHANGES‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
Changes for 0.10.0
22

3+
* ShellAnything has a new high-resolution logo icon!
34
* Shellanything now features verbose logging mode and command line arguments debugging tools.
5+
* ShellAnything now packages icons from [icons8/flat-color-icons](https://github.com/icons8/flat-color-icons)
6+
47
* Fixed issue #6 : (twice) Right-click on a directory with Windows Explorer in the left panel shows the menus twice.
58
* Fixed issue #31 : (twice) Error in logs for CContextMenu::GetCommandString()
69
* Fixed issue #109: Implement default and verbose logging.
@@ -13,6 +16,7 @@ Changes for 0.10.0
1316
* Fixed issue #161: Create tools to help quickly find a system icon when creating a menu.
1417
* Fixed issue #164: Fails to identify icon for HTML files.
1518
* Fixed issue #167: Improve the quality and accuracy of icon's fileextension attribute resolution (Icon::ResolveFileExtensionIcon()).
19+
* Fixed issue #171: New logo icon.
1620
* Fixed issue #177: Execute a console program without showing a window.
1721
* Fixed issue #178: Exec action should expose the created process id.
1822

‎INSTALL.md‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ This manual includes a description of the steps that are required in order to bu
2424

2525
### Compiled binary packages ###
2626

27-
You can find the latest pre-compiled binaries on the [github project release page](https://github.com/end2endzone/ShellAnything/releases/latest).
27+
You can find the latest pre-compiled binaries on the [github project release page](https://github.com/end2endzone/ShellAnything/releases/latest).
2828
The binary installer of previous versions are also available [here](https://github.com/end2endzone/ShellAnything/releases).
2929

3030
You can also checkout the [latest builds / nightly builds](https://ci.appveyor.com/project/end2endzone/shellanything) available on AppVeyor which offers CI/CD services for Windows. Successful builds are identified by a vertical green line. Select the *current build* or one [from the history](https://ci.appveyor.com/project/end2endzone/shellanything/history). Click on the `Platform: x64` , then look in the `Artifacts` tab. In the *Actifacts* section, you will find two installers, one is a traditional "setup.exe" and the other is a more modern MSI. A portable version is also available.
@@ -116,6 +116,7 @@ The following software must be installed on the system for compiling source code
116116
* [zlib v1.2.11](https://github.com/madler/zlib/releases/tag/v1.2.11)
117117
* [CMake v3.4.3](http://www.cmake.org/) (tested up to 3.29.7)
118118
* [imneme/pcg-cpp](https://github.com/imneme/pcg-cpp/tree/428802d1a5634f96bcd0705fab379ff0113bcf13) (or newer)
119+
* [icons8/flat-color-icons 8eccbbb](https://github.com/icons8/flat-color-icons/tree/8eccbbbd8b2af1d2c9593e7cfba5ecb0d68ee378) (available as a submodule)
119120
* (optional) [Grip (GitHub Readme Instant Preview)](https://github.com/joeyespo/grip) v4.5.2 (or newer)
120121

121122

‎appveyor.yml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -71,8 +71,10 @@ before_build:
7171
- cmd: call %APPVEYOR_BUILD_FOLDER%\ci\appveyor\install_grip.bat
7272
- cmd: call %APPVEYOR_BUILD_FOLDER%\ci\appveyor\install_zlib.bat
7373
- cmd: call %APPVEYOR_BUILD_FOLDER%\ci\appveyor\install_libmagic.bat
74+
- cmd: call %APPVEYOR_BUILD_FOLDER%\ci\appveyor\install_imagemagick.bat
7475

7576
build_script:
77+
- cmd: call %APPVEYOR_BUILD_FOLDER%\ci\appveyor\build_flat-color-icons.bat
7678
- cmd: call %APPVEYOR_BUILD_FOLDER%\ci\appveyor\install_shellanything.bat
7779
- cmd: call %APPVEYOR_BUILD_FOLDER%\ci\appveyor\install_sa_plugin_process.bat
7880
- cmd: call %APPVEYOR_BUILD_FOLDER%\ci\appveyor\install_sa_plugin_services.bat

‎ci/appveyor/build_flat-color-icons.bat‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
@echo off
2+
3+
:: Validate appveyor's environment
4+
if "%APPVEYOR_BUILD_FOLDER%"=="" (
5+
echo Please define 'APPVEYOR_BUILD_FOLDER' environment variable.
6+
exit /B 1
7+
)
8+
9+
:: Call matching script for windows
10+
call "%APPVEYOR_BUILD_FOLDER%\ci\windows\%~n0.bat"
11+
if %errorlevel% neq 0 exit /b %errorlevel%

‎ci/appveyor/install_imagemagick.bat‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
@echo off
2+
3+
:: Validate appveyor's environment
4+
if "%APPVEYOR_BUILD_FOLDER%"=="" (
5+
echo Please define 'APPVEYOR_BUILD_FOLDER' environment variable.
6+
exit /B 1
7+
)
8+
9+
:: Call matching script for windows
10+
call "%APPVEYOR_BUILD_FOLDER%\ci\windows\%~n0.bat"
11+
if %errorlevel% neq 0 exit /b %errorlevel%

‎ci/github/build_flat-color-icons.bat‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
@echo off
2+
3+
:: Validate GitHub CI's environment
4+
if "%GITHUB_WORKSPACE%"=="" (
5+
echo Please define 'GITHUB_WORKSPACE' environment variable.
6+
exit /B 1
7+
)
8+
9+
:: Call matching script for windows
10+
call "%GITHUB_WORKSPACE%\ci\windows\%~n0.bat"
11+
if %errorlevel% neq 0 exit /b %errorlevel%

‎ci/github/install_imagemagick.bat‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
@echo off
2+
3+
:: Validate GitHub CI's environment
4+
if "%GITHUB_WORKSPACE%"=="" (
5+
echo Please define 'GITHUB_WORKSPACE' environment variable.
6+
exit /B 1
7+
)
8+
9+
:: Call matching script for windows
10+
call "%GITHUB_WORKSPACE%\ci\windows\%~n0.bat"
11+
if %errorlevel% neq 0 exit /b %errorlevel%

0 commit comments

Comments
 (0)