Source/BooLangStudio/Resources/BooOverlay.png Source/BooLangStudio/Resources/boofile.bmp Source/BooLangStudio/Resources/booproj.bmp Source/BooLangStudio/Resources/booterminal.bmp @@ -10,4 +10,5 @@ _ReSharper* Debug *.ncb Install/Setup.* -Install/BooLangStudio.* \ No newline at end of file +Install/BooLangStudio.* +*.aps \ No newline at end of file .gitignore @@ -1,6 +1,5 @@ Microsoft Visual Studio Solution File, Format Version 10.00 # Visual Studio 2008 -# SharpDevelop 3.0.0.3043 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{CCBF4DAC-2449-4EC9-8F4C-264D9A3967D6}" ProjectSection(SolutionItems) = preProject ATTRIBUTION.TXT = ATTRIBUTION.TXT @@ -12,7 +11,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution WHY.txt = WHY.txt EndProjectSection EndProject -Project("{A33008B1-5DAC-44D5-9060-242E3B6E38F2}") = "BooPegLexer", "Source\BooPegLexer\BooPegLexer.booproj", "{4E326F12-116A-4A83-96E5-6433540E13A1}" +Project("{E71B5727-96E4-4B08-8561-88ECB56E9AE5}") = "BooPegLexer", "Source\BooPegLexer\BooPegLexer.booproj", "{4E326F12-116A-4A83-96E5-6433540E13A1}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Templates", "Templates", "{CD2E4A38-3DE5-4AB8-9C58-68800A932846}" ProjectSection(SolutionItems) = preProject @@ -20,8 +19,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Templates", "Templates", "{ EndProjectSection EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Project", "Project", "{9EC1E870-6274-4F62-B26F-761AE32FF881}" - ProjectSection(SolutionItems) = postProject - EndProjectSection EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ConsoleApplication", "ConsoleApplication", "{43DC1BD6-7D8F-4FDB-888D-4C5A4C424E4C}" ProjectSection(SolutionItems) = preProject @@ -42,8 +39,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ClassLibrary", "ClassLibrar EndProjectSection EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ProjectItems", "ProjectItems", "{71F16E86-4194-4132-8394-5C82BD097709}" - ProjectSection(SolutionItems) = postProject - EndProjectSection EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "TextFile", "TextFile", "{6CB557EA-F472-415C-B662-FD2879D9AF23}" ProjectSection(SolutionItems) = preProject @@ -67,48 +62,95 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BooLangService", "Source\Bo EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BooLangProject", "Source\BooLangProject\BooLangProject.csproj", "{35549DBF-BC64-4D4E-904C-7AE3A35B998B}" EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "BooLangStudio.Resources", "Source\BooLangStudio\Resources\Resources.vcproj", "{38086784-D8B1-441F-ABDE-3144DAB096FE}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU + Debug|Mixed Platforms = Debug|Mixed Platforms + Debug|Win32 = Debug|Win32 Release|Any CPU = Release|Any CPU + Release|Mixed Platforms = Release|Mixed Platforms + Release|Win32 = Release|Win32 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {35549DBF-BC64-4D4E-904C-7AE3A35B998B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {35549DBF-BC64-4D4E-904C-7AE3A35B998B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {35549DBF-BC64-4D4E-904C-7AE3A35B998B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {35549DBF-BC64-4D4E-904C-7AE3A35B998B}.Release|Any CPU.Build.0 = Release|Any CPU - {947EAB0F-FEAE-4D39-B08B-55CC0C84BE07}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {947EAB0F-FEAE-4D39-B08B-55CC0C84BE07}.Debug|Any CPU.Build.0 = Debug|Any CPU - {947EAB0F-FEAE-4D39-B08B-55CC0C84BE07}.Release|Any CPU.ActiveCfg = Release|Any CPU - {947EAB0F-FEAE-4D39-B08B-55CC0C84BE07}.Release|Any CPU.Build.0 = Release|Any CPU - {F269FE5C-0B4B-4DD9-B8CC-46856C434DB3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {F269FE5C-0B4B-4DD9-B8CC-46856C434DB3}.Debug|Any CPU.Build.0 = Debug|Any CPU - {F269FE5C-0B4B-4DD9-B8CC-46856C434DB3}.Release|Any CPU.ActiveCfg = Release|Any CPU - {F269FE5C-0B4B-4DD9-B8CC-46856C434DB3}.Release|Any CPU.Build.0 = Release|Any CPU - {80136D9A-B3E5-47D6-98A7-6B926FCFFD20}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {80136D9A-B3E5-47D6-98A7-6B926FCFFD20}.Debug|Any CPU.Build.0 = Debug|Any CPU - {80136D9A-B3E5-47D6-98A7-6B926FCFFD20}.Release|Any CPU.ActiveCfg = Release|Any CPU - {80136D9A-B3E5-47D6-98A7-6B926FCFFD20}.Release|Any CPU.Build.0 = Release|Any CPU {4E326F12-116A-4A83-96E5-6433540E13A1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {4E326F12-116A-4A83-96E5-6433540E13A1}.Debug|Any CPU.Build.0 = Debug|Any CPU + {4E326F12-116A-4A83-96E5-6433540E13A1}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU + {4E326F12-116A-4A83-96E5-6433540E13A1}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU + {4E326F12-116A-4A83-96E5-6433540E13A1}.Debug|Win32.ActiveCfg = Debug|Any CPU {4E326F12-116A-4A83-96E5-6433540E13A1}.Release|Any CPU.ActiveCfg = Release|Any CPU {4E326F12-116A-4A83-96E5-6433540E13A1}.Release|Any CPU.Build.0 = Release|Any CPU + {4E326F12-116A-4A83-96E5-6433540E13A1}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU + {4E326F12-116A-4A83-96E5-6433540E13A1}.Release|Mixed Platforms.Build.0 = Release|Any CPU + {4E326F12-116A-4A83-96E5-6433540E13A1}.Release|Win32.ActiveCfg = Release|Any CPU + {80136D9A-B3E5-47D6-98A7-6B926FCFFD20}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {80136D9A-B3E5-47D6-98A7-6B926FCFFD20}.Debug|Any CPU.Build.0 = Debug|Any CPU + {80136D9A-B3E5-47D6-98A7-6B926FCFFD20}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU + {80136D9A-B3E5-47D6-98A7-6B926FCFFD20}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU + {80136D9A-B3E5-47D6-98A7-6B926FCFFD20}.Debug|Win32.ActiveCfg = Debug|Any CPU + {80136D9A-B3E5-47D6-98A7-6B926FCFFD20}.Release|Any CPU.ActiveCfg = Release|Any CPU + {80136D9A-B3E5-47D6-98A7-6B926FCFFD20}.Release|Any CPU.Build.0 = Release|Any CPU + {80136D9A-B3E5-47D6-98A7-6B926FCFFD20}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU + {80136D9A-B3E5-47D6-98A7-6B926FCFFD20}.Release|Mixed Platforms.Build.0 = Release|Any CPU + {80136D9A-B3E5-47D6-98A7-6B926FCFFD20}.Release|Win32.ActiveCfg = Release|Any CPU + {F269FE5C-0B4B-4DD9-B8CC-46856C434DB3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {F269FE5C-0B4B-4DD9-B8CC-46856C434DB3}.Debug|Any CPU.Build.0 = Debug|Any CPU + {F269FE5C-0B4B-4DD9-B8CC-46856C434DB3}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU + {F269FE5C-0B4B-4DD9-B8CC-46856C434DB3}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU + {F269FE5C-0B4B-4DD9-B8CC-46856C434DB3}.Debug|Win32.ActiveCfg = Debug|Any CPU + {F269FE5C-0B4B-4DD9-B8CC-46856C434DB3}.Release|Any CPU.ActiveCfg = Release|Any CPU + {F269FE5C-0B4B-4DD9-B8CC-46856C434DB3}.Release|Any CPU.Build.0 = Release|Any CPU + {F269FE5C-0B4B-4DD9-B8CC-46856C434DB3}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU + {F269FE5C-0B4B-4DD9-B8CC-46856C434DB3}.Release|Mixed Platforms.Build.0 = Release|Any CPU + {F269FE5C-0B4B-4DD9-B8CC-46856C434DB3}.Release|Win32.ActiveCfg = Release|Any CPU + {947EAB0F-FEAE-4D39-B08B-55CC0C84BE07}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {947EAB0F-FEAE-4D39-B08B-55CC0C84BE07}.Debug|Any CPU.Build.0 = Debug|Any CPU + {947EAB0F-FEAE-4D39-B08B-55CC0C84BE07}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU + {947EAB0F-FEAE-4D39-B08B-55CC0C84BE07}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU + {947EAB0F-FEAE-4D39-B08B-55CC0C84BE07}.Debug|Win32.ActiveCfg = Debug|Any CPU + {947EAB0F-FEAE-4D39-B08B-55CC0C84BE07}.Release|Any CPU.ActiveCfg = Release|Any CPU + {947EAB0F-FEAE-4D39-B08B-55CC0C84BE07}.Release|Any CPU.Build.0 = Release|Any CPU + {947EAB0F-FEAE-4D39-B08B-55CC0C84BE07}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU + {947EAB0F-FEAE-4D39-B08B-55CC0C84BE07}.Release|Mixed Platforms.Build.0 = Release|Any CPU + {947EAB0F-FEAE-4D39-B08B-55CC0C84BE07}.Release|Win32.ActiveCfg = Release|Any CPU + {35549DBF-BC64-4D4E-904C-7AE3A35B998B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {35549DBF-BC64-4D4E-904C-7AE3A35B998B}.Debug|Any CPU.Build.0 = Debug|Any CPU + {35549DBF-BC64-4D4E-904C-7AE3A35B998B}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU + {35549DBF-BC64-4D4E-904C-7AE3A35B998B}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU + {35549DBF-BC64-4D4E-904C-7AE3A35B998B}.Debug|Win32.ActiveCfg = Debug|Any CPU + {35549DBF-BC64-4D4E-904C-7AE3A35B998B}.Release|Any CPU.ActiveCfg = Release|Any CPU + {35549DBF-BC64-4D4E-904C-7AE3A35B998B}.Release|Any CPU.Build.0 = Release|Any CPU + {35549DBF-BC64-4D4E-904C-7AE3A35B998B}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU + {35549DBF-BC64-4D4E-904C-7AE3A35B998B}.Release|Mixed Platforms.Build.0 = Release|Any CPU + {35549DBF-BC64-4D4E-904C-7AE3A35B998B}.Release|Win32.ActiveCfg = Release|Any CPU + {38086784-D8B1-441F-ABDE-3144DAB096FE}.Debug|Any CPU.ActiveCfg = Debug|Win32 + {38086784-D8B1-441F-ABDE-3144DAB096FE}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32 + {38086784-D8B1-441F-ABDE-3144DAB096FE}.Debug|Mixed Platforms.Build.0 = Debug|Win32 + {38086784-D8B1-441F-ABDE-3144DAB096FE}.Debug|Win32.ActiveCfg = Debug|Win32 + {38086784-D8B1-441F-ABDE-3144DAB096FE}.Debug|Win32.Build.0 = Debug|Win32 + {38086784-D8B1-441F-ABDE-3144DAB096FE}.Release|Any CPU.ActiveCfg = Release|Win32 + {38086784-D8B1-441F-ABDE-3144DAB096FE}.Release|Mixed Platforms.ActiveCfg = Release|Win32 + {38086784-D8B1-441F-ABDE-3144DAB096FE}.Release|Mixed Platforms.Build.0 = Release|Win32 + {38086784-D8B1-441F-ABDE-3144DAB096FE}.Release|Win32.ActiveCfg = Release|Win32 + {38086784-D8B1-441F-ABDE-3144DAB096FE}.Release|Win32.Build.0 = Release|Win32 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection GlobalSection(NestedProjects) = preSolution - {35549DBF-BC64-4D4E-904C-7AE3A35B998B} = {CCBF4DAC-2449-4EC9-8F4C-264D9A3967D6} - {947EAB0F-FEAE-4D39-B08B-55CC0C84BE07} = {CCBF4DAC-2449-4EC9-8F4C-264D9A3967D6} - {F269FE5C-0B4B-4DD9-B8CC-46856C434DB3} = {CCBF4DAC-2449-4EC9-8F4C-264D9A3967D6} - {80136D9A-B3E5-47D6-98A7-6B926FCFFD20} = {CCBF4DAC-2449-4EC9-8F4C-264D9A3967D6} - {CD2E4A38-3DE5-4AB8-9C58-68800A932846} = {CCBF4DAC-2449-4EC9-8F4C-264D9A3967D6} {4E326F12-116A-4A83-96E5-6433540E13A1} = {CCBF4DAC-2449-4EC9-8F4C-264D9A3967D6} - {71F16E86-4194-4132-8394-5C82BD097709} = {CD2E4A38-3DE5-4AB8-9C58-68800A932846} + {CD2E4A38-3DE5-4AB8-9C58-68800A932846} = {CCBF4DAC-2449-4EC9-8F4C-264D9A3967D6} + {80136D9A-B3E5-47D6-98A7-6B926FCFFD20} = {CCBF4DAC-2449-4EC9-8F4C-264D9A3967D6} + {F269FE5C-0B4B-4DD9-B8CC-46856C434DB3} = {CCBF4DAC-2449-4EC9-8F4C-264D9A3967D6} + {947EAB0F-FEAE-4D39-B08B-55CC0C84BE07} = {CCBF4DAC-2449-4EC9-8F4C-264D9A3967D6} + {35549DBF-BC64-4D4E-904C-7AE3A35B998B} = {CCBF4DAC-2449-4EC9-8F4C-264D9A3967D6} + {38086784-D8B1-441F-ABDE-3144DAB096FE} = {CCBF4DAC-2449-4EC9-8F4C-264D9A3967D6} {9EC1E870-6274-4F62-B26F-761AE32FF881} = {CD2E4A38-3DE5-4AB8-9C58-68800A932846} - {25FC57D0-6896-4633-A2EF-A1973E668BE2} = {9EC1E870-6274-4F62-B26F-761AE32FF881} + {71F16E86-4194-4132-8394-5C82BD097709} = {CD2E4A38-3DE5-4AB8-9C58-68800A932846} {43DC1BD6-7D8F-4FDB-888D-4C5A4C424E4C} = {9EC1E870-6274-4F62-B26F-761AE32FF881} - {7F07274F-E934-4581-9D60-391FE17D9A1C} = {71F16E86-4194-4132-8394-5C82BD097709} + {25FC57D0-6896-4633-A2EF-A1973E668BE2} = {9EC1E870-6274-4F62-B26F-761AE32FF881} {6CB557EA-F472-415C-B662-FD2879D9AF23} = {71F16E86-4194-4132-8394-5C82BD097709} + {7F07274F-E934-4581-9D60-391FE17D9A1C} = {71F16E86-4194-4132-8394-5C82BD097709} EndGlobalSection EndGlobal BooLangStudio.sln @@ -71,15 +71,6 @@ namespace Boo.BooLangProject } - protected override void Reload() - { - base.Reload(); - // setting the BooBinPath - string booBinPath = System.IO.Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location); - this.SetProjectProperty("BooBinPath", booBinPath); - this.Save(this.FileName, 0, 0); - } - public override Guid ProjectGuid { get { return typeof(BooLangProjectFactory).GUID; } Source/BooLangProject/BooProjectNode.cs Source/BooLangProject/Resources/BooFileNode.bmp Source/BooLangProject/Resources/BooProjectNode.bmp @@ -83,6 +83,10 @@ <None Include="Resources\logo.bmp" /> <None Include="Resources\200.bmp" /> <None Include="Resources\Images_32.bmp" /> + <Content Include="Resources\boofile.bmp" /> + <Content Include="Resources\BooOverlay.png" /> + <Content Include="Resources\booproj.bmp" /> + <Content Include="Resources\booterminal.bmp" /> <Content Include="Resources\Package.ico" /> <ZipProject Include="Templates\Boo\Projects\ConsoleApplication\BooConsoleApplication.vstemplate" /> <ZipProject Include="Templates\Boo\Projects\ConsoleApplication\ConsoleApplication.ico" /> Source/BooLangStudio/BooLangStudio.csproj @@ -49,23 +49,29 @@ END ///////////////////////////////////////////////////////////////////////////// // +// Icon +// + +// Icon with lowest ID value placed first to ensure application icon +// remains consistent on all systems. +BOO_SOURCE_FILE ICON "..\\Templates\\Boo\\Items\\Class\\Class.ico" +BOO_PROJ_FILE ICON "..\\Templates\\Boo\\Projects\\ClassLibrary\\ClassLibrary.ico" + +///////////////////////////////////////////////////////////////////////////// +// // Bitmap // -BOO_VS_LOGO BITMAP "200.bmp" -BOO_VS_LOGO_LARGE BITMAP "logo.bmp" +IDB_BITMAP1 BITMAP "boofile.bmp" +IDB_BITMAP2 BITMAP "booproj.bmp" +IDB_BITMAP3 BITMAP "booterminal.bmp" ///////////////////////////////////////////////////////////////////////////// // -// Icon +// PNG // -// Icon with lowest ID value placed first to ensure application icon -// remains consistent on all systems. -BOO_PACKAGE ICON "..\\Templates\\Boo\\Projects\\ConsoleApplication\\ConsoleApplication.ico" -BOO ICON "Package.ico" -BOO_SOURCE_FILE ICON "..\\Templates\\Boo\\Items\\Class\\Class.ico" -BOO_PROJ_FILE ICON "..\\Templates\\Boo\\Projects\\ClassLibrary\\ClassLibrary.ico" +IDB_PNG1 PNG "BooOverlay.png" #endif // English (U.S.) resources ///////////////////////////////////////////////////////////////////////////// Source/BooLangStudio/Resources/BooLangStudio.Resources.rc @@ -171,7 +171,9 @@ Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx" UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}" > - <File RelativePath=".\Resources.cpp"> + <File + RelativePath=".\Resources.cpp" + > </File> </Filter> <Filter @@ -183,9 +185,13 @@ RelativePath=".\resource.h" > </File> - <File RelativePath=".\Resources.h"> + <File + RelativePath=".\Resources.h" + > </File> - <File RelativePath=".\stdafx.h"> + <File + RelativePath=".\stdafx.h" + > </File> </Filter> <Filter Source/BooLangStudio/Resources/Resources.vcproj @@ -4,12 +4,16 @@ // #define BOO_SOURCE_FILE 104 #define BOO_PROJ_FILE 105 +#define IDB_BITMAP1 107 +#define IDB_PNG1 108 +#define IDB_BITMAP2 109 +#define IDB_BITMAP3 110 // Next default values for new objects // #ifdef APSTUDIO_INVOKED #ifndef APSTUDIO_READONLY_SYMBOLS -#define _APS_NEXT_RESOURCE_VALUE 107 +#define _APS_NEXT_RESOURCE_VALUE 111 #define _APS_NEXT_COMMAND_VALUE 40001 #define _APS_NEXT_CONTROL_VALUE 1001 #define _APS_NEXT_SYMED_VALUE 101 Source/BooLangStudio/Resources/resource.h Source/BooLangStudio/Templates/Boo/Items/Class/Class.ico @@ -18,7 +18,6 @@ <OutputPath>bin\Release\</OutputPath> <EnableUnmanagedDebugging>false</EnableUnmanagedDebugging> </PropertyGroup> - <ItemGroup> <Reference Include="mscorlib" /> <Reference Include="System" /> Source/BooLangStudio/Templates/Boo/Projects/ClassLibrary/ClassLibrary.booproj Source/BooLangStudio/Templates/Boo/Projects/ClassLibrary/ClassLibrary.ico Source/BooLangStudio/Templates/Boo/Projects/ConsoleApplication/ConsoleApplication.ico Source/BooLangStudio/Resources/Class.ico Source/BooLangStudio/Resources/ClassLibrary.ico Source/BooLangStudio/Resources/ConsoleApplication.ico 5379816d7449cdb6858b9341ee9fdb12a1eb8f23 Justin Chase justin.m.chase@gmail.com http://github.com/olsonjeffery/boolangstudio/commit/30bcabfe106d662a0338eb4f67216b2693f098d0 30bcabfe106d662a0338eb4f67216b2693f098d0 2008-07-27T12:24:10-07:00 2008-07-27T12:24:10-07:00 Cleaned up the icon situation 3bbf1964be4862e83f4cb72877e0140d0a709b88 Justin Chase justin.m.chase@gmail.com