Used your branch to build win64 version of Code::Blocks and CB booted up OK; did not test any plugins.
Tested only 64 bit wxWidgets 3.0 build; patch used below
From 9fa06dff4ecceb602411b34e925f061089cf17d5 Mon Sep 17 00:00:00 2001
From: Tim S <stahta01@gmail.com>
Date: Sun, 3 Mar 2019 14:38:10 -0500
Subject: [PATCH] ui: Copy 22x22 images
---
src/update30_64.bat | 12 ++++++++----
1 file changed, 8 insertions(+), 4 deletions(-)
diff --git a/src/update30_64.bat b/src/update30_64.bat
index 07388dc3a..bc71ac4a6 100644
--- a/src/update30_64.bat
+++ b/src/update30_64.bat
@@ -16,6 +16,7 @@ if not exist %CB_OUTPUT_RESDIR%\lexers md %CB_OUTPUT_RESDIR%\lexers\
if not exist %CB_OUTPUT_RESDIR%\images md %CB_OUTPUT_RESDIR%\images\
if not exist %CB_OUTPUT_RESDIR%\images\settings md %CB_OUTPUT_RESDIR%\images\settings\
if not exist %CB_OUTPUT_RESDIR%\images\16x16 md %CB_OUTPUT_RESDIR%\images\16x16\
+if not exist %CB_OUTPUT_RESDIR%\images\22x22 md %CB_OUTPUT_RESDIR%\images\22x22\
if not exist %CB_OUTPUT_RESDIR%\images\codecompletion md %CB_OUTPUT_RESDIR%\images\codecompletion\
if not exist %CB_OUTPUT_RESDIR%\plugins md %CB_OUTPUT_RESDIR%\plugins\
if not exist %CB_OUTPUT_RESDIR%\templates md %CB_OUTPUT_RESDIR%\templates\
@@ -30,6 +31,7 @@ if not exist %CB_DEVEL_RESDIR%\lexers md %CB_DEVEL_RESDIR%\lexers\
if not exist %CB_DEVEL_RESDIR%\images md %CB_DEVEL_RESDIR%\images\
if not exist %CB_DEVEL_RESDIR%\images\settings md %CB_DEVEL_RESDIR%\images\settings\
if not exist %CB_DEVEL_RESDIR%\images\16x16 md %CB_DEVEL_RESDIR%\images\16x16\
+if not exist %CB_DEVEL_RESDIR%\images\22x22 md %CB_DEVEL_RESDIR%\images\22x22\
if not exist %CB_DEVEL_RESDIR%\images\codecompletion md %CB_DEVEL_RESDIR%\images\codecompletion\
if not exist %CB_DEVEL_RESDIR%\plugins md %CB_DEVEL_RESDIR%\plugins\
if not exist %CB_DEVEL_RESDIR%\templates md %CB_DEVEL_RESDIR%\templates\
@@ -60,14 +62,14 @@ echo Compressing plugins UI resources
%ZIPCMD% -jqu9 %CB_DEVEL_RESDIR%\abbreviations.zip plugins\abbreviations\resources\manifest.xml plugins\abbreviations\resources\*.xrc > nul
echo Packing core UI bitmaps
cd src\resources
-%ZIPCMD% -0 -qu ..\..\%CB_DEVEL_RESDIR%\resources.zip images\*.png images\12x12\*.png images\16x16\*.png > nul
+%ZIPCMD% -0 -qu ..\..\%CB_DEVEL_RESDIR%\resources.zip images\*.png images\12x12\*.png images\16x16\*.png images\22x22\*.png > nul
cd ..\..\sdk\resources
-%ZIPCMD% -0 -qu ..\..\%CB_DEVEL_RESDIR%\manager_resources.zip images\*.png images\12x12\*.png images\16x16\*.png > nul
+%ZIPCMD% -0 -qu ..\..\%CB_DEVEL_RESDIR%\manager_resources.zip images\*.png images\12x12\*.png images\16x16\*.png images\22x22\*.png > nul
echo Packing plugins UI bitmaps
cd ..\..\plugins\compilergcc\resources
-%ZIPCMD% -0 -qu ..\..\..\%CB_DEVEL_RESDIR%\compiler.zip images\*.png images\16x16\*.png > nul
+%ZIPCMD% -0 -qu ..\..\..\%CB_DEVEL_RESDIR%\compiler.zip images\*.png images\16x16\*.png images\22x22\*.png > nul
cd ..\..\..\plugins\debuggergdb\resources
-%ZIPCMD% -0 -qu ..\..\..\%CB_DEVEL_RESDIR%\debugger.zip images\*.png images\16x16\*.png > nul
+%ZIPCMD% -0 -qu ..\..\..\%CB_DEVEL_RESDIR%\debugger.zip images\*.png images\16x16\*.png images\22x22\*.png > nul
cd ..\..\..
echo Copying files
@@ -80,6 +82,8 @@ xcopy /D /y src\resources\images\*.png %CB_OUTPUT_RESDIR%\images > nul
xcopy /D /y src\resources\images\settings\*.png %CB_OUTPUT_RESDIR%\images\settings > nul
xcopy /D /y src\resources\images\16x16\*.png %CB_DEVEL_RESDIR%\images\16x16 > nul
xcopy /D /y src\resources\images\16x16\*.png %CB_OUTPUT_RESDIR%\images\16x16 > nul
+xcopy /D /y src\resources\images\22x22\*.png %CB_DEVEL_RESDIR%\images\22x22 > nul
+xcopy /D /y src\resources\images\22x22\*.png %CB_OUTPUT_RESDIR%\images\22x22 > nul
xcopy /D /y plugins\codecompletion\resources\images\*.png %CB_DEVEL_RESDIR%\images\codecompletion > nul
xcopy /D /y plugins\codecompletion\resources\images\*.png %CB_OUTPUT_RESDIR%\images\codecompletion > nul
xcopy /D /y plugins\compilergcc\resources\compilers\*.xml %CB_DEVEL_RESDIR%\compilers > nul
--
2.21.0.windows.1
The folder src\src\resources\images\22x22 is empty and can be removed, because 22x22 images are no longer used.
There are still references to 22x22 images, notably in XRC files and in ThreadSearch\update31
G:\Codeblocks312\src\plugins\compilergcc\resources\compiler_toolbar.xrc|7|<bitmap>images/22x22/compile.png</bitmap>|
G:\Codeblocks312\src\plugins\compilergcc\resources\compiler_toolbar.xrc|12|<bitmap>images/22x22/run.png</bitmap>|
G:\Codeblocks312\src\plugins\compilergcc\resources\compiler_toolbar.xrc|17|<bitmap>images/22x22/compilerun.png</bitmap>|
G:\Codeblocks312\src\plugins\compilergcc\resources\compiler_toolbar.xrc|22|<bitmap>images/22x22/rebuild.png</bitmap>|
G:\Codeblocks312\src\plugins\compilergcc\resources\compiler_toolbar.xrc|27|<bitmap>images/22x22/stop.png</bitmap>|
G:\Codeblocks312\src\plugins\compilergcc\resources\compiler_toolbar.xrc|39|<bitmap>images/22x22/select_target.png</bitmap>|
G:\Codeblocks312\src\plugins\contrib\BrowseTracker\BrowseTrackerToolbar.xrc|7|<bitmap>images/22x22/prev.png</bitmap>|
G:\Codeblocks312\src\plugins\contrib\BrowseTracker\BrowseTrackerToolbar.xrc|12|<bitmap>images/22x22/next.png</bitmap>|
G:\Codeblocks312\src\plugins\contrib\BrowseTracker\BrowseTrackerToolbar.xrc|18|<bitmap>images/22x22/mark.png</bitmap>|
G:\Codeblocks312\src\plugins\contrib\BrowseTracker\BrowseTrackerToolbar.xrc|23|<bitmap>images/22x22/mark_prev.png</bitmap>|
G:\Codeblocks312\src\plugins\contrib\BrowseTracker\BrowseTrackerToolbar.xrc|28|<bitmap>images/22x22/mark_next.png</bitmap>|
G:\Codeblocks312\src\plugins\contrib\BrowseTracker\BrowseTrackerToolbar.xrc|33|<bitmap>images/22x22/mark_clear.png</bitmap>|
G:\Codeblocks312\src\plugins\contrib\FortranProject\fortranproject.cpp|1128|tbSStr = _T("_22x22");|
G:\Codeblocks312\src\plugins\contrib\FortranProject\fpimagelist.cpp|20|prefix2 = ConfigManager::GetDataFolder() + _T("/images/fortranproject/22x22/");|
G:\Codeblocks312\src\plugins\contrib\FortranProject\resources\fortranprojecttoolbar.xrc|21|<object class="wxToolBarAddOn" name="fortran_project_toolbar_22x22">|
G:\Codeblocks312\src\plugins\contrib\FortranProject\resources\fortranprojecttoolbar.xrc|25|<bitmap>images/22x22/fprojectjumpback.png</bitmap>|
G:\Codeblocks312\src\plugins\contrib\FortranProject\resources\fortranprojecttoolbar.xrc|30|<bitmap>images/22x22/fprojectjumphome.png</bitmap>|
G:\Codeblocks312\src\plugins\contrib\FortranProject\resources\fortranprojecttoolbar.xrc|35|<bitmap>images/22x22/fprojectjumpforward.png</bitmap>|
G:\Codeblocks312\src\plugins\contrib\IncrementalSearch\IncrementalSearchToolbar.xrc|8|<bitmap>images/22x22/incsearchclear.png</bitmap>|
G:\Codeblocks312\src\plugins\contrib\IncrementalSearch\IncrementalSearchToolbar.xrc|14|<bitmap>images/22x22/incsearchprev.png</bitmap>|
G:\Codeblocks312\src\plugins\contrib\IncrementalSearch\IncrementalSearchToolbar.xrc|19|<bitmap>images/22x22/incsearchnext.png</bitmap>|
G:\Codeblocks312\src\plugins\contrib\IncrementalSearch\IncrementalSearchToolbar.xrc|24|<bitmap>images/22x22/incsearchhighlight.png</bitmap>|
G:\Codeblocks312\src\plugins\contrib\IncrementalSearch\IncrementalSearchToolbar.xrc|30|<bitmap>images/22x22/incsearchselectedonly.png</bitmap>|
G:\Codeblocks312\src\plugins\contrib\IncrementalSearch\IncrementalSearchToolbar.xrc|36|<bitmap>images/22x22/incsearchcase.png</bitmap>|
G:\Codeblocks312\src\plugins\contrib\IncrementalSearch\IncrementalSearchToolbar.xrc|42|<bitmap>images/22x22/incsearchregex.png</bitmap>|
G:\Codeblocks312\src\plugins\contrib\NassiShneiderman\nassi_shneiderman_toolbar.xrc|7|<bitmap>images/22x22/selecttool.png</bitmap>|
G:\Codeblocks312\src\plugins\contrib\NassiShneiderman\nassi_shneiderman_toolbar.xrc|14|<bitmap>images/22x22/instrtool.png</bitmap>|
G:\Codeblocks312\src\plugins\contrib\NassiShneiderman\nassi_shneiderman_toolbar.xrc|21|<bitmap>images/22x22/iftool.png</bitmap>|
G:\Codeblocks312\src\plugins\contrib\NassiShneiderman\nassi_shneiderman_toolbar.xrc|26|<bitmap>images/22x22/switchtool.png</bitmap>|
G:\Codeblocks312\src\plugins\contrib\NassiShneiderman\nassi_shneiderman_toolbar.xrc|33|<bitmap>images/22x22/whiletool.png</bitmap>|
G:\Codeblocks312\src\plugins\contrib\NassiShneiderman\nassi_shneiderman_toolbar.xrc|38|<bitmap>images/22x22/dowhiletool.png</bitmap>|
G:\Codeblocks312\src\plugins\contrib\NassiShneiderman\nassi_shneiderman_toolbar.xrc|43|<bitmap>images/22x22/fortool.png</bitmap>|
G:\Codeblocks312\src\plugins\contrib\NassiShneiderman\nassi_shneiderman_toolbar.xrc|48|<bitmap>images/22x22/blocktool.png</bitmap>|
G:\Codeblocks312\src\plugins\contrib\NassiShneiderman\nassi_shneiderman_toolbar.xrc|55|<bitmap>images/22x22/breaktool.png</bitmap>|
G:\Codeblocks312\src\plugins\contrib\NassiShneiderman\nassi_shneiderman_toolbar.xrc|60|<bitmap>images/22x22/continuetool.png</bitmap>|
G:\Codeblocks312\src\plugins\contrib\NassiShneiderman\nassi_shneiderman_toolbar.xrc|65|<bitmap>images/22x22/returntool.png</bitmap>|
G:\Codeblocks312\src\plugins\contrib\NassiShneiderman\nassi_shneiderman_toolbar.xrc|72|<bitmap>images/22x22/glassptool.png</bitmap>|
G:\Codeblocks312\src\plugins\contrib\NassiShneiderman\nassi_shneiderman_toolbar.xrc|77|<bitmap>images/22x22/glassntool.png</bitmap>|
G:\Codeblocks312\src\plugins\contrib\NassiShneiderman\nassi_shneiderman_toolbar.xrc|84|<bitmap>images/22x22/sourceToggletool.png</bitmap>|
G:\Codeblocks312\src\plugins\contrib\NassiShneiderman\nassi_shneiderman_toolbar.xrc|89|<bitmap>images/22x22/commentToggletool.png</bitmap>|
G:\Codeblocks312\src\plugins\contrib\ThreadSearch\update31|4|mkdir -p ../../../devel31/share/codeblocks/images/ThreadSearch/22x22 > /dev/null 2> /dev/null|
G:\Codeblocks312\src\plugins\contrib\ThreadSearch\update31|7|mkdir -p ../../../output31/share/codeblocks/images/ThreadSearch/22x22 > /dev/null 2> /dev/null|
G:\Codeblocks312\src\plugins\contrib\ThreadSearch\update31|12|cp ./resources/images/22x22/*.png ../../../devel31/share/codeblocks/images/ThreadSearch/22x22/ > /dev/null 2> /dev/null|
G:\Codeblocks312\src\plugins\contrib\ThreadSearch\update31|15|cp ./resources/images/22x22/*.png ../../../output31/share/codeblocks/images/ThreadSearch/22x22/ > /dev/null 2> /dev/null|
G:\Codeblocks312\src\sdk\xtra_res.cpp|67|finalName.Replace(wxT("22x22"), m_PathReplaceString);|
G:\Codeblocks312\src\src\resources\debugger_toolbar.xrc|7|<bitmap>images/22x22/dbgrun.png</bitmap>|
G:\Codeblocks312\src\src\resources\debugger_toolbar.xrc|12|<bitmap>images/22x22/dbgrunto.png</bitmap>|
G:\Codeblocks312\src\src\resources\debugger_toolbar.xrc|17|<bitmap>images/22x22/dbgnext.png</bitmap>|
G:\Codeblocks312\src\src\resources\debugger_toolbar.xrc|22|<bitmap>images/22x22/dbgstep.png</bitmap>|
G:\Codeblocks312\src\src\resources\debugger_toolbar.xrc|27|<bitmap>images/22x22/dbgstepout.png</bitmap>|
G:\Codeblocks312\src\src\resources\debugger_toolbar.xrc|32|<bitmap>images/22x22/dbgnexti.png</bitmap>|
G:\Codeblocks312\src\src\resources\debugger_toolbar.xrc|37|<bitmap>images/22x22/dbgstepi.png</bitmap>|
G:\Codeblocks312\src\src\resources\debugger_toolbar.xrc|42|<bitmap>images/22x22/dbgpause.png</bitmap>|
G:\Codeblocks312\src\src\resources\debugger_toolbar.xrc|47|<bitmap>images/22x22/dbgstop.png</bitmap>|
G:\Codeblocks312\src\src\resources\debugger_toolbar.xrc|53|<bitmap>images/22x22/dbgwindow.png</bitmap>|
G:\Codeblocks312\src\src\resources\debugger_toolbar.xrc|58|<bitmap>images/22x22/dbginfo.png</bitmap>|
G:\Codeblocks312\src\src\resources\main_toolbar.xrc|10|<bitmap>images/22x22/filenew.png</bitmap>|
G:\Codeblocks312\src\src\resources\main_toolbar.xrc|15|<bitmap>images/22x22/fileopen.png</bitmap>|
G:\Codeblocks312\src\src\resources\main_toolbar.xrc|20|<bitmap>images/22x22/filesave.png</bitmap>|
G:\Codeblocks312\src\src\resources\main_toolbar.xrc|25|<bitmap>images/22x22/filesaveall.png</bitmap>|
G:\Codeblocks312\src\src\resources\main_toolbar.xrc|31|<bitmap>images/22x22/undo.png</bitmap>|
G:\Codeblocks312\src\src\resources\main_toolbar.xrc|35|<bitmap>images/22x22/redo.png</bitmap>|
G:\Codeblocks312\src\src\resources\main_toolbar.xrc|41|<bitmap>images/22x22/editcut.png</bitmap>|
G:\Codeblocks312\src\src\resources\main_toolbar.xrc|46|<bitmap>images/22x22/editcopy.png</bitmap>|
G:\Codeblocks312\src\src\resources\main_toolbar.xrc|51|<bitmap>images/22x22/editpaste.png</bitmap>|
G:\Codeblocks312\src\src\resources\main_toolbar.xrc|57|<bitmap>images/22x22/filefind.png</bitmap>|
G:\Codeblocks312\src\src\resources\main_toolbar.xrc|62|<bitmap>images/22x22/searchreplace.png</bitmap>|
linux mint 18
if i run ./update30 i get
codeblocks_sf/src$ ./update30
./update30: 2: ./update30: source: not found
and for
./update
codeblocks_sf/src$ ./update
Updating Linux version.
./update: 26: ./update: Syntax error: "(" unexpected (expecting "}")
I had to replace the first line with
I've just found that some of the images used for the project tree aren't provided for all new sizes.
This is the list of the missing icons:
rc-file-added.png
rc-file-conflict.png
rc-file-external.png
rc-file-gotlock.png
rc-file-lockstolen.png
rc-file-mismatch.png
rc-file-missing.png
rc-file-modified.png
rc-file-noncontrolled.png
rc-file-outofdate.png
rc-file-requireslock.png
rc-file-uptodate.png
vfolder_open.png
Would it be possible to talk to Specialmart if he wants/can to do them?