Yet, another icons update

Author: eranif

LiteEditor/wxcrafter_liteeditor_bitmaps.cpp

@@ -731,141 +731,46 @@ static unsigned char xml_res_file_13[] = {
 178,178,88,68,78,27,99,102,85,219,252,7,71,116,101,91,105,46,115,61,0,0,
 0,0,73,69,78,68,174,66,96,130};
 
-static size_t xml_res_size_14 = 828;
+static size_t xml_res_size_14 = 305;
 static unsigned char xml_res_file_14[] = {
 137,80,78,71,13,10,26,10,0,0,0,13,73,72,68,82,0,0,0,16,0,0,0,16,8,6,0,0,
 0,31,243,255,97,0,0,0,4,115,66,73,84,8,8,8,8,124,8,100,136,0,0,0,9,112,
-72,89,115,0,0,13,215,0,0,13,215,1,66,40,155,120,0,0,0,25,116,69,88,116,
-83,111,102,116,119,97,114,101,0,119,119,119,46,105,110,107,115,99,97,112,
-101,46,111,114,103,155,238,60,26,0,0,2,185,73,68,65,84,56,141,125,147,75,
-76,19,97,20,133,207,63,175,118,166,148,82,90,167,15,176,8,66,88,20,11,34,
-84,30,1,21,137,18,30,138,26,87,68,99,92,8,168,36,234,162,137,59,19,131,
-9,59,87,69,77,212,196,141,27,195,74,87,6,140,24,141,104,138,66,34,40,70,
-12,10,182,229,85,176,69,96,250,119,198,133,129,32,84,207,242,222,115,191,
-155,156,220,75,240,15,61,240,120,12,171,130,244,24,0,116,202,175,198,211,
-195,195,75,201,124,36,89,177,219,83,33,179,188,250,204,150,158,154,163,
-40,171,100,33,166,140,211,56,217,223,62,252,106,122,179,151,217,92,240,
-151,150,230,48,130,22,112,185,156,121,121,217,78,125,150,217,160,219,150,
-170,223,201,112,234,144,223,83,146,255,95,64,119,97,185,151,215,132,128,
-219,157,231,200,222,110,227,19,177,24,56,66,32,27,117,130,195,44,202,12,
-199,13,116,23,150,123,147,2,252,69,222,6,65,226,251,118,151,21,166,217,
-108,22,86,153,155,197,248,236,79,76,44,174,64,199,178,48,75,2,147,105,150,
-76,12,167,246,249,139,188,13,107,115,44,0,248,139,43,206,73,70,195,93,239,
-190,189,6,163,65,194,242,196,4,198,194,11,32,206,76,192,108,193,92,120,
-6,178,40,128,176,128,78,96,133,232,10,109,110,112,184,230,158,4,39,3,236,
-237,146,178,206,84,171,229,90,249,161,106,73,207,177,136,126,28,197,72,
-48,2,131,187,0,149,157,215,145,85,91,131,208,232,103,132,190,79,193,46,
-10,80,9,32,234,57,62,186,172,212,28,113,186,82,216,6,91,70,239,129,147,
-77,60,171,38,16,121,63,136,145,224,34,172,21,149,216,227,187,2,16,2,141,
-16,100,84,85,98,97,42,136,111,99,95,225,144,116,80,161,65,212,113,124,36,
-182,90,245,39,131,165,24,230,223,190,193,135,224,34,236,181,7,177,171,163,
-29,9,85,5,165,20,148,82,36,84,21,158,142,243,112,29,63,134,209,249,101,
-164,112,28,36,158,5,0,112,132,32,62,212,251,28,51,177,85,190,224,236,25,
-100,214,31,6,165,52,217,121,32,251,68,51,120,81,196,240,189,251,176,136,
-66,156,16,2,46,174,113,59,194,145,165,171,97,119,254,133,166,163,141,228,
-225,101,231,95,67,205,55,190,224,81,79,15,166,67,33,200,118,59,78,181,180,
-224,233,139,126,36,70,62,221,97,25,218,201,116,188,123,249,163,117,240,
-117,71,212,46,67,81,20,0,64,113,174,9,197,185,38,0,0,165,20,211,161,16,
-170,219,46,97,58,20,66,60,30,71,212,97,67,219,224,192,197,214,64,32,200,
-109,220,182,6,208,73,105,32,12,3,96,17,148,82,88,101,25,253,183,110,194,
-42,219,214,61,107,90,7,16,66,52,69,81,8,0,232,141,86,16,134,129,201,48,
-9,74,41,234,235,234,182,44,217,2,88,107,154,12,28,68,163,5,132,176,72,55,
-242,80,85,21,155,61,27,181,254,141,62,159,47,162,105,90,90,210,248,55,137,
-97,152,88,87,87,151,17,0,126,3,32,173,253,56,136,57,219,234,0,0,0,0,73,
-69,78,68,174,66,96,130};
+72,89,115,0,0,4,157,0,0,4,157,1,124,52,107,161,0,0,0,25,116,69,88,116,83,
+111,102,116,119,97,114,101,0,119,119,119,46,105,110,107,115,99,97,112,101,
+46,111,114,103,155,238,60,26,0,0,0,174,73,68,65,84,56,141,173,211,189,14,
+65,65,16,5,224,207,79,40,105,36,226,242,40,30,131,70,162,80,120,40,37,157,
+78,161,209,122,11,175,160,150,136,68,162,48,55,65,220,13,151,147,76,50,
+123,118,206,153,204,100,151,52,186,17,165,144,97,27,145,97,25,241,132,122,
+66,188,192,60,206,11,156,190,237,156,189,112,59,236,203,136,115,244,112,
+40,184,195,125,89,155,84,193,67,77,191,140,56,105,178,14,241,236,3,131,
+89,212,174,223,93,190,37,83,53,213,15,4,73,20,189,3,88,161,25,249,25,211,
+111,13,154,24,71,94,56,218,207,35,252,125,7,109,76,112,193,0,163,224,243,
+188,129,214,163,160,242,98,208,193,16,181,130,134,87,247,255,112,204,137,
+27,203,135,25,236,185,93,230,96,0,0,0,0,73,69,78,68,174,66,96,130};
 
-static size_t xml_res_size_15 = 1837;
+static size_t xml_res_size_15 = 444;
 static unsigned char xml_res_file_15[] = {
 137,80,78,71,13,10,26,10,0,0,0,13,73,72,68,82,0,0,0,32,0,0,0,32,8,6,0,0,
 0,115,122,122,244,0,0,0,4,115,66,73,84,8,8,8,8,124,8,100,136,0,0,0,9,112,
-72,89,115,0,0,27,175,0,0,27,175,1,94,26,145,28,0,0,0,25,116,69,88,116,83,
+72,89,115,0,0,9,58,0,0,9,58,1,240,100,146,74,0,0,0,25,116,69,88,116,83,
 111,102,116,119,97,114,101,0,119,119,119,46,105,110,107,115,99,97,112,101,
-46,111,114,103,155,238,60,26,0,0,6,170,73,68,65,84,88,133,173,150,107,108,
-20,215,21,199,127,103,30,251,182,55,94,7,48,176,108,141,108,98,160,6,243,
-16,24,112,226,96,145,84,161,80,145,164,85,154,4,41,82,63,165,77,148,38,
-169,84,161,170,169,132,212,74,52,106,43,33,170,4,42,69,106,84,69,8,41,138,
-210,47,80,169,95,74,73,193,36,21,17,144,242,104,104,241,35,118,188,24,123,
-97,189,235,125,205,204,189,253,176,222,197,14,216,216,78,255,210,104,102,
-238,157,123,254,255,115,238,57,231,142,48,79,252,126,125,199,18,11,247,
-4,96,27,134,187,243,197,115,231,250,231,99,71,230,179,232,15,27,183,174,
-81,74,157,0,226,19,67,3,134,97,124,251,197,115,221,159,205,213,150,49,215,
-5,111,181,181,119,105,165,78,1,241,88,109,152,218,144,31,32,174,148,250,
-232,240,186,45,219,231,106,207,156,203,199,135,215,183,127,87,132,15,128,
-200,162,5,117,172,76,44,36,106,11,121,199,165,224,120,1,132,231,119,53,
-44,189,126,60,57,56,235,72,204,90,192,145,117,237,175,34,188,131,136,221,
-152,88,76,211,210,122,12,67,112,10,5,234,2,22,74,41,198,75,158,41,34,79,
-239,94,178,76,142,15,13,156,252,191,8,208,32,13,235,182,188,137,240,75,
-49,12,105,105,89,206,178,133,117,136,148,39,157,92,14,165,52,145,128,141,
-33,194,88,201,19,209,122,251,238,197,241,216,166,228,224,95,79,130,158,
-201,254,140,73,120,168,121,167,223,174,73,189,11,60,107,249,125,180,174,
-110,34,22,9,162,149,66,187,46,206,173,91,120,165,34,69,79,161,208,160,225,
-86,190,68,255,232,248,132,122,249,48,31,148,189,63,233,238,206,207,89,192,
-219,107,30,174,19,203,249,51,208,25,12,135,245,218,182,22,137,4,236,50,
-185,227,80,186,57,140,118,28,180,214,104,160,224,121,40,13,26,77,182,224,
-210,55,58,142,210,26,208,127,47,232,210,147,175,159,63,127,123,214,2,38,
-213,120,91,77,172,142,182,117,43,9,216,38,40,133,42,22,41,38,135,208,142,
-67,111,42,75,190,164,104,89,84,131,136,144,115,93,60,173,209,26,242,142,
-75,239,232,56,202,211,0,151,167,235,21,119,9,152,168,241,191,0,75,23,196,
-23,211,186,166,5,203,16,208,10,47,151,163,56,56,128,114,28,174,141,100,
-25,201,22,0,168,13,218,172,90,24,197,48,132,156,227,226,104,5,64,209,85,
-244,141,142,227,186,10,166,233,21,83,4,188,213,214,222,101,24,124,8,68,
-151,62,180,156,85,171,87,96,160,65,41,188,108,150,66,127,31,174,227,242,
-239,225,49,110,231,75,132,23,44,64,11,228,134,111,18,246,89,172,110,136,
-98,153,6,57,199,165,164,20,26,141,171,20,253,169,28,165,146,66,195,152,
-86,60,249,242,133,143,255,86,225,172,86,65,165,198,197,48,34,43,54,174,
-165,101,85,51,166,33,32,130,55,54,70,190,183,7,215,241,184,58,124,155,116,
-193,161,54,177,140,199,15,253,150,230,93,79,240,229,199,255,36,155,186,
-77,106,188,68,44,236,39,100,155,40,52,174,214,8,66,52,104,147,119,21,142,
-171,252,134,240,220,228,94,97,194,157,26,55,108,219,110,125,164,157,198,
-198,56,34,2,8,238,232,40,249,222,30,74,174,199,165,100,154,108,209,37,246,
-208,10,186,126,247,38,129,88,12,43,20,162,113,71,23,195,23,46,146,25,190,
-201,200,120,137,186,144,143,176,109,1,224,40,13,2,53,1,27,87,107,138,142,
-154,210,43,204,195,27,218,15,2,251,237,112,72,54,238,232,100,241,146,133,
-136,8,2,20,147,67,20,250,122,201,23,29,254,149,76,83,112,60,22,173,111,
-227,209,95,255,10,59,18,46,87,128,214,24,62,31,203,182,119,50,122,229,42,
-153,161,36,35,227,69,162,1,155,176,207,70,144,106,153,134,253,22,10,77,
-190,164,68,96,251,119,26,226,15,152,187,27,226,39,0,217,182,231,9,98,15,
-62,80,38,23,161,208,219,67,161,191,143,76,209,225,210,141,49,28,79,177,
-180,99,27,219,246,191,129,225,247,85,201,171,34,44,139,68,215,163,164,175,
-247,144,238,31,96,100,188,72,141,223,34,226,47,55,168,162,242,208,26,66,
-62,11,211,132,241,130,139,136,108,169,30,70,209,104,4,49,45,196,48,200,
-93,251,156,194,192,23,220,202,149,184,148,76,227,122,138,198,111,61,70,
-251,27,251,192,52,81,74,221,243,194,52,105,255,197,207,248,198,227,59,240,
-148,230,202,112,154,84,174,68,208,50,169,243,249,0,80,90,83,27,180,81,19,
-188,119,78,67,165,193,243,200,126,118,145,226,151,131,220,204,22,185,58,
-60,134,82,154,166,61,187,89,247,234,203,104,152,150,188,42,66,132,13,175,
-191,194,138,239,61,133,82,112,245,70,154,27,153,2,126,211,164,62,224,199,
-16,65,79,106,206,86,229,65,151,138,100,175,94,198,73,165,72,142,21,232,
-73,101,209,192,202,189,207,210,242,252,247,209,128,86,138,217,98,245,15,
-94,192,174,169,225,242,31,255,196,127,71,50,56,74,19,143,6,89,16,8,48,90,
-44,222,45,160,247,204,89,162,184,124,145,202,50,144,206,35,134,193,166,
-215,94,161,161,171,179,236,217,60,208,244,244,30,66,209,90,206,29,122,155,
-254,84,22,207,83,36,98,97,180,123,167,1,89,192,32,16,191,220,51,132,109,
-24,56,74,161,13,97,235,207,247,17,239,124,152,92,46,55,47,242,10,150,239,
-218,137,21,14,211,125,224,55,12,166,115,12,103,10,56,74,97,138,128,230,
-186,85,95,202,54,141,216,53,47,136,193,62,71,169,102,109,26,36,215,126,
-147,197,29,91,241,60,143,15,246,53,206,72,240,212,129,235,0,92,187,118,
-141,51,103,206,144,205,102,1,168,169,169,161,163,163,131,214,214,86,150,
-60,210,65,242,196,113,22,93,188,130,227,121,104,248,92,68,14,220,136,6,
-222,51,158,185,116,169,244,210,249,179,239,212,55,45,91,9,60,55,180,177,
-77,229,235,235,240,60,111,86,161,175,36,95,119,119,119,149,28,32,147,201,
-112,250,244,233,234,124,190,62,70,114,195,26,180,214,123,31,108,78,172,
-254,209,167,103,223,221,127,242,164,91,205,129,103,222,127,223,3,142,253,
-244,177,206,247,0,60,207,155,232,134,101,108,104,142,78,33,254,244,63,233,
-170,128,10,33,64,231,15,95,3,224,212,145,131,100,50,25,60,207,171,174,41,
-68,107,121,233,252,39,71,57,255,73,117,172,42,96,18,116,197,240,100,1,136,
-32,148,207,134,201,227,247,139,210,253,230,167,21,224,186,46,134,113,167,
-77,216,190,208,20,17,48,58,133,32,18,137,144,205,102,57,117,228,96,117,
-77,36,18,153,18,129,123,97,218,223,114,207,243,166,44,182,124,161,242,229,
-47,223,69,192,50,165,186,199,155,54,109,34,18,137,76,33,223,188,121,243,
-93,118,102,29,1,207,243,208,147,90,150,229,15,78,120,111,128,8,1,159,137,
-105,72,53,2,137,68,130,68,34,113,79,71,102,194,140,91,96,154,229,223,5,
-211,144,9,175,203,71,180,136,16,244,25,83,4,76,135,249,8,160,34,64,107,
-77,208,103,98,154,82,205,129,74,30,84,198,239,7,215,117,231,44,160,90,5,
-0,65,127,217,83,203,31,162,226,61,34,4,253,229,45,184,159,135,247,195,180,
-2,142,29,59,86,126,139,254,24,128,11,23,190,242,149,177,162,124,63,122,
-244,107,9,184,87,21,124,244,181,44,206,0,173,245,63,190,58,246,63,107,137,
-96,8,105,105,146,162,0,0,0,0,73,69,78,68,174,66,96,130};
+46,111,114,103,155,238,60,26,0,0,1,57,73,68,65,84,88,133,237,150,63,78,
+195,48,20,135,191,34,68,23,56,65,57,0,221,97,201,206,192,212,169,93,153,
+96,160,1,137,149,13,169,55,224,22,109,231,74,28,3,238,80,46,0,75,6,210,
+14,60,87,142,229,132,196,121,166,170,232,79,122,138,244,236,151,223,103,
+39,254,3,59,174,107,137,173,40,5,190,37,82,43,159,0,67,137,36,182,249,88,
+194,134,200,128,149,68,22,195,252,86,12,239,173,220,141,228,30,196,216,
+204,192,74,219,220,140,60,245,180,153,153,136,6,80,101,110,67,228,192,179,
+54,64,29,115,183,239,171,22,128,239,155,215,169,201,53,0,154,140,220,87,
+155,7,214,2,97,35,119,101,175,142,63,55,15,134,208,52,111,12,17,195,188,
+54,132,187,165,94,0,93,5,227,46,112,238,120,140,125,29,223,157,134,12,24,
+40,0,12,40,158,9,119,192,91,157,66,179,165,182,85,229,142,120,160,96,208,
+74,123,128,16,128,132,226,165,195,190,124,52,190,1,29,6,0,244,128,35,96,
+228,228,167,210,22,29,192,104,214,162,118,163,157,252,7,246,0,255,7,224,
+3,56,83,240,232,3,203,178,198,170,101,248,2,76,248,217,92,62,173,252,169,
+60,167,158,154,71,138,7,216,9,112,9,60,149,153,116,42,0,144,151,93,1,199,
+191,244,43,211,23,176,0,230,129,245,241,181,6,242,200,86,203,201,28,131,
+34,0,0,0,0,73,69,78,68,174,66,96,130};
 
 static size_t xml_res_size_16 = 421;
 static unsigned char xml_res_file_16[] = {

Plugin/bitmap_loader.cpp

@@ -265,7 +265,8 @@ wxImageList* BitmapLoader::MakeStandardMimeImageList()
     AddImage(imageList->Add(LoadBitmap(wxT("mime/16/css"))), FileExtManager::TypeCSS);
     AddImage(imageList->Add(LoadBitmap(wxT("mime/16/javascript"))), FileExtManager::TypeJS);
     AddImage(imageList->Add(LoadBitmap(wxT("cxx-workspace"))), FileExtManager::TypeWorkspace);
-    AddImage(imageList->Add(LoadBitmap(wxT("workspace/16/workspace_php"))), FileExtManager::TypeWorkspacePHP);
+    AddImage(imageList->Add(LoadBitmap(wxT("php-workspace"))), FileExtManager::TypeWorkspacePHP);
+    AddImage(imageList->Add(LoadBitmap(wxT("nodejs-workspace"))), FileExtManager::TypeWorkspaceNodeJS);
     AddImage(imageList->Add(LoadBitmap(wxT("project"))), FileExtManager::TypeProject);
     AddImage(imageList->Add(LoadBitmap(wxT("blocks"))), FileExtManager::TypeWxCrafter);
     AddImage(imageList->Add(LoadBitmap(wxT("mime/16/xml"))), FileExtManager::TypeXRC);
@@ -313,15 +314,17 @@ BitmapLoader::BitmapMap_t BitmapLoader::MakeStandardMimeMap()
     images[FileExtManager::TypePython] = LoadBitmap(wxT("mime/16/python"));
     images[FileExtManager::TypeCSS] = LoadBitmap(wxT("mime/16/css"));
     images[FileExtManager::TypeJS] = LoadBitmap(wxT("mime/16/javascript"));
-    images[FileExtManager::TypeWorkspace] = LoadBitmap(wxT("workspace/16/workspace"));
-    images[FileExtManager::TypeWorkspacePHP] = LoadBitmap(wxT("workspace/16/workspace_php"));
-    images[FileExtManager::TypeProject] = LoadBitmap(wxT("workspace/16/project"));
+    images[FileExtManager::TypeWorkspace] = LoadBitmap("cxx-workspace");
+    images[FileExtManager::TypeWorkspacePHP] = LoadBitmap("php-workspace");
+    images[FileExtManager::TypeWorkspaceNodeJS] = LoadBitmap("nodejs-workspace");
+    images[FileExtManager::TypeProject] = LoadBitmap(wxT("project"));
     images[FileExtManager::TypeWxCrafter] = LoadBitmap(wxT("mime/16/wxcp"));
     images[FileExtManager::TypeXRC] = LoadBitmap(wxT("mime/16/xml"));
     images[FileExtManager::TypeResource] = LoadBitmap(wxT("mime/16/res"));
     images[FileExtManager::TypeSQL] = LoadBitmap(wxT("mime/16/sql"));
-    images[FileExtManager::TypeFolder] = LoadBitmap(wxT("mime/16/folder"));
-    images[FileExtManager::TypeProjectActive] = LoadBitmap(wxT("workspace/16/project_active"));
+    images[FileExtManager::TypeFolder] = LoadBitmap("folder-yellow");
+    images[FileExtManager::TypeFolderExpanded] = LoadBitmap("folder-yellow-opened");
+    images[FileExtManager::TypeProjectActive] = LoadBitmap(wxT("project"));
     images[FileExtManager::TypeAsm] = LoadBitmap(wxT("mime/16/asm"));
     images[FileExtManager::TypeCMake] = LoadBitmap(wxT("mime/16/cmake"));
     images[FileExtManager::TypeQMake] = LoadBitmap(wxT("mime/16/qmake"));

Runtime/codelite-bitmaps.zip

@@ -136,7 +136,7 @@ WebToolsSettingsBase::WebToolsSettingsBase(wxWindow* parent, wxWindowID id, cons
     #endif
 
     SetName(wxT("WebToolsSettingsBase"));
-    SetSizeHints(-1,-1);
+    SetSize(-1,-1);
     if (GetSizer()) {
          GetSizer()->Fit(this);
     }
@@ -295,7 +295,7 @@ NodeJSDebuggerDlgBase::NodeJSDebuggerDlgBase(wxWindow* parent, wxWindowID id, co
     m_stdBtnSizer70->Realize();
 
     SetName(wxT("NodeJSDebuggerDlgBase"));
-    SetSizeHints(-1,-1);
+    SetSize(-1,-1);
     if (GetSizer()) {
          GetSizer()->Fit(this);
     }
@@ -460,7 +460,7 @@ NodeJSDebuggerPaneBase::NodeJSDebuggerPaneBase(wxWindow* parent, wxWindowID id,
     m_dvListCtrlBreakpoints->AppendTextColumn(_("File"), wxDATAVIEW_CELL_INERT, 250, wxALIGN_LEFT);
 
     SetName(wxT("NodeJSDebuggerPaneBase"));
-    SetSizeHints(500,250);
+    SetSize(500,250);
     if (GetSizer()) {
          GetSizer()->Fit(this);
     }
@@ -550,7 +550,7 @@ NodeJSNewWorkspaceDlgBase::NodeJSNewWorkspaceDlgBase(wxWindow* parent, wxWindowI
     m_stdBtnSizer142->Realize();
 
     SetName(wxT("NodeJSNewWorkspaceDlgBase"));
-    SetSizeHints(-1,-1);
+    SetSize(-1,-1);
     if (GetSizer()) {
          GetSizer()->Fit(this);
     }

WebTools/WebToolsBase.cpp

@@ -9,6 +9,7 @@
   "m_outputFileName": "",
   "m_firstWindowId": 1000,
   "m_useEnum": true,
+  "m_useUnderscoreMacro": true,
   "m_templateClasses": []
  },
  "windows": [{
@@ -5519,7 +5520,7 @@
       }, {
        "type": "filePicker",
        "m_label": "Bitmap File:",
-       "m_path": "nodejs.png"
+       "m_path": "../bitmaps/16-nodejs-workspace.png"
       }],
      "m_events": [],
      "m_children": []