create sln file, crowService crow assembly location file dialog

diff --git a/CrowEdit.csproj b/CrowEdit.csproj
index 06689f952c54cb50c5acabf62ef0debfb65a23e9..75e0b06f07554cd78f50c7f6c5a8dd79f6c3262d 100644 (file)
--- a/CrowEdit.csproj
+++ b/CrowEdit.csproj
@@ -26,7 +26,7 @@
                <ProjectReference Include="plugins\CENetcoreDbgPlugin\CENetcoreDbgPlugin.csproj" >
                        <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
                </ProjectReference>
-               <ProjectReference Include="/mnt/devel/CrowIDE/Crow/Crow/Crow.csproj" />
+               <ProjectReference Include="..\CrowIDE\Crow\Crow\Crow.csproj" />
 
                <!--<PackageReference Include="Crow" Version="0.9.6-beta" />-->
        </ItemGroup>

diff --git a/CrowEdit.sln b/CrowEdit.sln
index 84532d65e663f2c2bf0b1b947f4d106ff8de31ea..3608c07563f2a8fa23d038e95bd83a175473ed40 100644 (file)
--- a/CrowEdit.sln
+++ b/CrowEdit.sln
@@ -11,6 +11,20 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Global", "Global", "{3118E6
                README.md = README.md
        EndProjectSection
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CrowEditBase", "CrowEditBase\CrowEditBase.csproj", "{B8B5D071-097D-40A6-B1AE-3EC996D2E843}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Plugins", "Plugins", "{386C459C-4849-40C3-9D5A-4A8802A5A848}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CECrowDebugLog", "plugins\CECrowDebugLog\CECrowDebugLog.csproj", "{1095C2F1-802F-4DE1-8035-EE0AAC4A5E35}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CENetcoreDbgPlugin", "plugins\CENetcoreDbgPlugin\CENetcoreDbgPlugin.csproj", "{14E49365-6E22-4A27-B0E5-C6BBB347A85C}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CERoslynPlugin", "plugins\CERoslynPlugin\CERoslynPlugin.csproj", "{93105D4F-3015-4C37-A377-9E4BD63DB582}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CEXmlPlugin", "plugins\CEXmlPlugin\CEXmlPlugin.csproj", "{196D847E-D051-429B-892F-C405F036B8C2}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Crow", "..\CrowIDE\Crow\Crow\Crow.csproj", "{D0487872-E5A5-424A-AB18-3B2F258D51D5}"
+EndProject
 Global
        GlobalSection(SolutionConfigurationPlatforms) = preSolution
                Debug|Any CPU = Debug|Any CPU
@@ -21,10 +35,40 @@ Global
                {AAA67D93-458E-4DD7-9CDA-4EC7F73D47FF}.Debug|Any CPU.Build.0 = Debug|Any CPU
                {AAA67D93-458E-4DD7-9CDA-4EC7F73D47FF}.Release|Any CPU.ActiveCfg = Release|Any CPU
                {AAA67D93-458E-4DD7-9CDA-4EC7F73D47FF}.Release|Any CPU.Build.0 = Release|Any CPU
+               {B8B5D071-097D-40A6-B1AE-3EC996D2E843}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+               {B8B5D071-097D-40A6-B1AE-3EC996D2E843}.Debug|Any CPU.Build.0 = Debug|Any CPU
+               {B8B5D071-097D-40A6-B1AE-3EC996D2E843}.Release|Any CPU.ActiveCfg = Release|Any CPU
+               {B8B5D071-097D-40A6-B1AE-3EC996D2E843}.Release|Any CPU.Build.0 = Release|Any CPU
+               {1095C2F1-802F-4DE1-8035-EE0AAC4A5E35}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+               {1095C2F1-802F-4DE1-8035-EE0AAC4A5E35}.Debug|Any CPU.Build.0 = Debug|Any CPU
+               {1095C2F1-802F-4DE1-8035-EE0AAC4A5E35}.Release|Any CPU.ActiveCfg = Release|Any CPU
+               {1095C2F1-802F-4DE1-8035-EE0AAC4A5E35}.Release|Any CPU.Build.0 = Release|Any CPU
+               {14E49365-6E22-4A27-B0E5-C6BBB347A85C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+               {14E49365-6E22-4A27-B0E5-C6BBB347A85C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+               {14E49365-6E22-4A27-B0E5-C6BBB347A85C}.Release|Any CPU.ActiveCfg = Release|Any CPU
+               {14E49365-6E22-4A27-B0E5-C6BBB347A85C}.Release|Any CPU.Build.0 = Release|Any CPU
+               {93105D4F-3015-4C37-A377-9E4BD63DB582}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+               {93105D4F-3015-4C37-A377-9E4BD63DB582}.Debug|Any CPU.Build.0 = Debug|Any CPU
+               {93105D4F-3015-4C37-A377-9E4BD63DB582}.Release|Any CPU.ActiveCfg = Release|Any CPU
+               {93105D4F-3015-4C37-A377-9E4BD63DB582}.Release|Any CPU.Build.0 = Release|Any CPU
+               {196D847E-D051-429B-892F-C405F036B8C2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+               {196D847E-D051-429B-892F-C405F036B8C2}.Debug|Any CPU.Build.0 = Debug|Any CPU
+               {196D847E-D051-429B-892F-C405F036B8C2}.Release|Any CPU.ActiveCfg = Release|Any CPU
+               {196D847E-D051-429B-892F-C405F036B8C2}.Release|Any CPU.Build.0 = Release|Any CPU
+               {D0487872-E5A5-424A-AB18-3B2F258D51D5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+               {D0487872-E5A5-424A-AB18-3B2F258D51D5}.Debug|Any CPU.Build.0 = Debug|Any CPU
+               {D0487872-E5A5-424A-AB18-3B2F258D51D5}.Release|Any CPU.ActiveCfg = Release|Any CPU
+               {D0487872-E5A5-424A-AB18-3B2F258D51D5}.Release|Any CPU.Build.0 = Release|Any CPU
        EndGlobalSection
        GlobalSection(SolutionProperties) = preSolution
                HideSolutionNode = FALSE
        EndGlobalSection
+       GlobalSection(NestedProjects) = preSolution
+               {1095C2F1-802F-4DE1-8035-EE0AAC4A5E35} = {386C459C-4849-40C3-9D5A-4A8802A5A848}
+               {14E49365-6E22-4A27-B0E5-C6BBB347A85C} = {386C459C-4849-40C3-9D5A-4A8802A5A848}
+               {93105D4F-3015-4C37-A377-9E4BD63DB582} = {386C459C-4849-40C3-9D5A-4A8802A5A848}
+               {196D847E-D051-429B-892F-C405F036B8C2} = {386C459C-4849-40C3-9D5A-4A8802A5A848}
+       EndGlobalSection
        GlobalSection(ExtensibilityGlobals) = postSolution
                SolutionGuid = {121E26CF-4A0F-4E74-BC0F-82BABEFDE8BF}
        EndGlobalSection

diff --git a/CrowEditBase/CrowEditBase.csproj b/CrowEditBase/CrowEditBase.csproj
index 6ef5821b72944a1e27859bf68033dbdee9350015..530872159c33c0c018b041d1e5e830b6b7c16f60 100644 (file)
--- a/CrowEditBase/CrowEditBase.csproj
+++ b/CrowEditBase/CrowEditBase.csproj
@@ -13,7 +13,7 @@
                </EmbeddedResource>             
        </ItemGroup>
        <ItemGroup>
-               <ProjectReference Include="/mnt/devel/CrowIDE/Crow/Crow/Crow.csproj" />
+               <ProjectReference Include="..\..\CrowIDE\Crow\Crow\Crow.csproj" />
          <!--<PackageReference Include="Crow" Version="0.9.7-beta" />    -->
        </ItemGroup>
 </Project>
\ No newline at end of file

diff --git a/plugins/CECrowDebugLog/src/CrowService.cs b/plugins/CECrowDebugLog/src/CrowService.cs
index fd446d61abcdc6f8288f85ddca9bdac5a5044d0f..06cd564b90843ccec04d4892a0f9404d424913c3 100644 (file)
--- a/plugins/CECrowDebugLog/src/CrowService.cs
+++ b/plugins/CECrowDebugLog/src/CrowService.cs
@@ -80,6 +80,15 @@ namespace Crow
                        CMDEventHistoryForward = new Command("forw.", currentEventHistoryGoForward, "#icons.forward-arrow.svg", false);
                }
 
+               public Command CMDOptions_SelectCrowAssemblyLocation => new Command ("...",
+                       () => {
+                               FileDialog dlg = App.LoadIMLFragment<FileDialog> (@"
+                               <FileDialog Caption='Select Crow.dll assembly' CurrentDirectory='{CrowDbgAssemblyLocation}'
+                                                       ShowFiles='true' ShowHidden='true' />");
+                               dlg.OkClicked += (sender, e) => CrowDbgAssemblyLocation = (sender as FileDialog).SelectedFileFullPath;
+                               dlg.DataSource = this;
+                       }
+               );
 
                public void LoadIML (string imlSource) {
                        if (CurrentState == Status.Running)

diff --git a/plugins/CECrowDebugLog/ui/winConfiguration.crow b/plugins/CECrowDebugLog/ui/winConfiguration.crow
index 1724fe62fa2921a738ca321cca78e08424233e9d..66f5b0a0d1c8d98abfc70b36e47c37503637e1c7 100644 (file)
--- a/plugins/CECrowDebugLog/ui/winConfiguration.crow
+++ b/plugins/CECrowDebugLog/ui/winConfiguration.crow
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<DockWindow Caption="Crow Preview Configuration"  Width="300" Height="400" Resizable="false">
+<DockWindow Caption="Crow Preview Configuration"  Width="80%" Height="400" Resizable="false">
        <VerticalStack RootDataLevel="true" Margin="5">
                <HorizontalStack Height="Fit" Margin="5">
                        <Label Text="Crow Service" Width="Stretched"/>
@@ -11,10 +11,11 @@
                        </ListBox>
                </HorizontalStack>
                <HorizontalStack Height="Fit">
-                       <Label Fit="true" Text="Crow debug assembly path:"/>
+                       <Label Width="200" Text="Crow assembly path:"/>
+                       <TextBox Width="Stretched" Text="{²CrowDbgAssemblyLocation}"/>
                        <Image Width="30" Height="20" Path="#Crow.Icons.IconAlerte.svg" Visible="{ServiceIsInError}"/>
-               </HorizontalStack>
-               <TextBox Height="Fit" Text="{²CrowDbgAssemblyLocation}" Margin="2"/>
+                       <Button Command="{CMDOptions_SelectCrowAssemblyLocation}" MinimumSize="0,0"/>
+               </HorizontalStack>                      
                <Label Background="Red" Foreground="White" Margin="5" Width="Stretched" Text="{ServiceErrorMessage}"
                        IsVisible="{ServiceIsInError}"/>
                <Spinner Caption="Refresh Rate (ms)" Value="{²RefreshRate}" Maximum="1000"/>