From: Jean-Philippe Bruyère <jp_bruyere@hotmail.com>
Date: Thu, 21 Jul 2022 17:42:46 +0000 (+0200)
Subject: update crow
X-Git-Url: https://git.osiis.dedyn.io/?a=commitdiff_plain;h=b7d0264496e3d569be20100686b5857f83adc9ab;p=jp%2Fcrowedit.git

update crow
---

diff --git a/CrowEditBase/CrowEditBase.csproj b/CrowEditBase/CrowEditBase.csproj
index d388caf..0ba3dc6 100644
--- a/CrowEditBase/CrowEditBase.csproj
+++ b/CrowEditBase/CrowEditBase.csproj
@@ -15,9 +15,7 @@
 		</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>
diff --git a/CrowEditBase/ui/CrowEdit.style b/CrowEditBase/ui/CrowEdit.style
index e94bbc0..70f574f 100644
--- a/CrowEditBase/ui/CrowEdit.style
+++ b/CrowEditBase/ui/CrowEdit.style
@@ -52,7 +52,7 @@ MemberViewHStack {
 }
 
 IcoBut {
-	Template = "#Crow.Coding.ui.IcoBut.template";
+	Template = "#ui.IcoBut.template";
 	MinimumSize = "10,10";
 	Width = "8";
 	Height = "14";
diff --git a/CrowEditBase/ui/IcoBut.template b/CrowEditBase/ui/IcoBut.template
index a9fc28a..325381a 100644
--- a/CrowEditBase/ui/IcoBut.template
+++ b/CrowEditBase/ui/IcoBut.template
@@ -3,5 +3,5 @@
 	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>
diff --git a/plugins/CENetcoreDbgPlugin/src/NetcoreDbgService.cs b/plugins/CENetcoreDbgPlugin/src/NetcoreDbgService.cs
index 12711c8..1e374bc 100644
--- a/plugins/CENetcoreDbgPlugin/src/NetcoreDbgService.cs
+++ b/plugins/CENetcoreDbgPlugin/src/NetcoreDbgService.cs
@@ -18,8 +18,27 @@ using Crow;
 namespace NetcoreDbgPlugin
 {
 	public class NetcoreDbgService : Service {
+		public override string ConfigurationWindowPath => "#CENetcoreDbgPlugin.ui.winConfiguration.crow";
 		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 {
@@ -54,16 +73,5 @@ namespace NetcoreDbgPlugin
 			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
diff --git a/plugins/CENetcoreDbgPlugin/ui/winDebugging.crow b/plugins/CENetcoreDbgPlugin/ui/winDebugging.crow
index dafe9aa..08a6cc5 100644
--- a/plugins/CENetcoreDbgPlugin/ui/winDebugging.crow
+++ b/plugins/CENetcoreDbgPlugin/ui/winDebugging.crow
@@ -1,16 +1,21 @@
 <?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>
-		<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>
-		<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>