update crow

diff --git a/CrowEditBase/CrowEditBase.csproj b/CrowEditBase/CrowEditBase.csproj
index d388caff01de92f91cdac25dabf3a9e62fb59d4d..0ba3dc6686a887b9c6e27c2918693fd016c0c865 100644 (file)
--- a/CrowEditBase/CrowEditBase.csproj
+++ b/CrowEditBase/CrowEditBase.csproj
@@ -15,9 +15,7 @@
                </EmbeddedResource>
        </ItemGroup>
        <ItemGroup>
                </EmbeddedResource>
        </ItemGroup>
        <ItemGroup>

-               <ProjectReference Include="/mnt/devel/crow/Crow/Crow.csproj" />
-               <ProjectReference Include="/mnt/devel/crow/Backends/CairoBackend/Crow.CairoBackend.csproj" />
-               <!--<PackageReference Include="Crow" Version="1.0.1-beta" />
-               <PackageReference Include="Crow.CairoBackend" Version="1.0.1-beta" />-->
+               <PackageReference Include="Crow" Version="1.1.0-beta" />
+               <PackageReference Include="Crow.CairoBackend" Version="1.1.0-beta" />

        </ItemGroup>
 </Project>
        </ItemGroup>
 </Project>

diff --git a/CrowEditBase/ui/CrowEdit.style b/CrowEditBase/ui/CrowEdit.style
index e94bbc02e1e4153e448860d4622a5facf39bf63a..70f574f03c6d6dc10dab7edebfba288350a3a2dc 100644 (file)
--- a/CrowEditBase/ui/CrowEdit.style
+++ b/CrowEditBase/ui/CrowEdit.style
@@ -52,7 +52,7 @@ MemberViewHStack {
 }
 
 IcoBut {
 }
 
 IcoBut {

-       Template = "#Crow.Coding.ui.IcoBut.template";
+       Template = "#ui.IcoBut.template";

        MinimumSize = "10,10";
        Width = "8";
        Height = "14";
        MinimumSize = "10,10";
        Width = "8";
        Height = "14";

diff --git a/CrowEditBase/ui/IcoBut.template b/CrowEditBase/ui/IcoBut.template
index a9fc28a7dc7ab89dfea020faa4536110d3fddd89..325381a09b6077d1f5e77252fa0c58d72bb5e89b 100644 (file)
--- a/CrowEditBase/ui/IcoBut.template
+++ b/CrowEditBase/ui/IcoBut.template
@@ -3,5 +3,5 @@
        BorderWidth="1" BorderStyle="Normal"
        MouseDown="{BorderStyle=Sunken}"
        MouseUp="{BorderStyle=Normal}">
        BorderWidth="1" BorderStyle="Normal"
        MouseDown="{BorderStyle=Sunken}"
        MouseUp="{BorderStyle=Normal}">

-       <Image Margin="1" Path="#Crow.Coding.ui.icons.blank-file.svg" />
+       <Image Margin="1" Path="#icons.blank-file.svg" />

 </Border>
 </Border>

diff --git a/plugins/CENetcoreDbgPlugin/src/NetcoreDbgService.cs b/plugins/CENetcoreDbgPlugin/src/NetcoreDbgService.cs
index 12711c8d8863dde2e77fec7cdc0625c6fb4c5326..1e374bce56d787b3da0a5e0fbf2672195032078b 100644 (file)
--- a/plugins/CENetcoreDbgPlugin/src/NetcoreDbgService.cs
+++ b/plugins/CENetcoreDbgPlugin/src/NetcoreDbgService.cs
@@ -18,8 +18,27 @@ using Crow;
 namespace NetcoreDbgPlugin
 {
        public class NetcoreDbgService : Service {
 namespace NetcoreDbgPlugin
 {
        public class NetcoreDbgService : Service {

+               public override string ConfigurationWindowPath => "#CENetcoreDbgPlugin.ui.winConfiguration.crow";

                public NetcoreDbgService () : base () {
                public NetcoreDbgService () : base () {

+                       initCommands();
+                       App.ViewCommands.Add (CMDViewDebug);
+               }
+               #region commands
+               public ActionCommand CMDViewDebug;
+               public Command CMDOptions_SelectNetcoredbgPath => new ActionCommand ("...",
+                       () => {
+                               FileDialog dlg = App.LoadIMLFragment<FileDialog> (@"
+                                       <FileDialog Caption='Select netcoredbg executable path' CurrentDirectory='{NetcoredbgPath}'
+                                                               ShowFiles='true' ShowHidden='true'/>");
+                               dlg.OkClicked += (sender, e) => NetcoredbgPath = (sender as FileDialog).SelectedFileFullPath;
+                               dlg.DataSource = this;
+                       }
+               );
+               void initCommands ()
+               {
+                       CMDViewDebug = new ActionCommand("Debug Window", () => App.LoadWindow ("#CENetcoreDbgPlugin.ui.winDebugging.crow", dbg));

                }
                }

+               #endregion

                public string NetcoredbgPath {
                        get => Configuration.Global.Get<string> ("NetcoredbgPath");
                        set {
                public string NetcoredbgPath {
                        get => Configuration.Global.Get<string> ("NetcoredbgPath");
                        set {


@@ -54,16 +73,5 @@ namespace NetcoreDbgPlugin
                        CurrentState = Status.Paused;
                }
 
                        CurrentState = Status.Paused;
                }
 

-               public Command CMDOptions_SelectNetcoredbgPath => new ActionCommand ("...",
-                       () => {
-                               FileDialog dlg = App.LoadIMLFragment<FileDialog> (@"
-                                       <FileDialog Caption='Select netcoredbg executable path' CurrentDirectory='{NetcoredbgPath}'
-                                                               ShowFiles='true' ShowHidden='true'/>");
-                               dlg.OkClicked += (sender, e) => NetcoredbgPath = (sender as FileDialog).SelectedFileFullPath;
-                               dlg.DataSource = this;
-                       }
-               );
-
-               public override string ConfigurationWindowPath => "#CENetcoreDbgPlugin.ui.winConfiguration.crow";

        }
 }
\ No newline at end of file
        }
 }
\ No newline at end of file

diff --git a/plugins/CENetcoreDbgPlugin/ui/winDebugging.crow b/plugins/CENetcoreDbgPlugin/ui/winDebugging.crow
index dafe9aa3c586ed175761f1d00c198f860c9f2b60..08a6cc5a98c064260401b80a2e7547fa01c56912 100644 (file)
--- a/plugins/CENetcoreDbgPlugin/ui/winDebugging.crow
+++ b/plugins/CENetcoreDbgPlugin/ui/winDebugging.crow
@@ -1,16 +1,21 @@
 <?xml version="1.0"?>
 <?xml version="1.0"?>

-<DockWindow Caption="Netcore Debugger"  Width="Fit" Height="Fit" Resizable="false">
+<Window Caption="Netcore Debugger"  Width="Fit" Height="Fit" Resizable="false">

        <Template>
        <Template>

-               <Border Name="Content" Name="MoveHandle" Margin="5"/>
+               <Border Margin="5">
+                       <HorizontalStack Fit="true">
+                               <Image Name="MoveHandle" Path="#icons.move-arrows.svg" Width="12" Height="12"/>
+                               <Container Name="Content"/>
+                       </HorizontalStack>
+               </Border>

        </Template>
        </Template>

-               <HorizontalStack Fit="true">
-                       <Button Style="IcoBut" Command="{CMDDebugStart}"/>
-                       <Button Style="IcoBut" Command="{CMDDebugPause}"/>
-                       <Button Style="IcoBut" Command="{CMDDebugStop}"/>
-                       <Button Style="IcoBut" Command="{CMDDebugStepIn}"/>
-                       <Button Style="IcoBut" Command="{CMDDebugStepOut}"/>
-                       <Button Style="IcoBut" Command="{CMDDebugStepOver}"/>
-       </VerticalStack>
-</DockWindow>
+       <HorizontalStack Fit="true">
+               <Button Style="IcoBut" Command="{CMDDebugStart}"/>
+               <Button Style="IcoBut" Command="{CMDDebugPause}"/>
+               <Button Style="IcoBut" Command="{CMDDebugStop}"/>
+               <Button Style="IcoBut" Command="{CMDDebugStepIn}"/>
+               <Button Style="IcoBut" Command="{CMDDebugStepOut}"/>
+               <Button Style="IcoBut" Command="{CMDDebugStepOver}"/>
+       </HorizontalStack>
+</kWindow>