Kaynağa Gözat

修改xaml格式

tanghai 13 yıl önce
ebeveyn
işleme
de3fcc22f4

+ 3 - 3
CSharp/App/Editor/Shell.xaml

@@ -1,7 +1,7 @@
 <Window x:Class="Editor.Shell" xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" 
-        xmlns:prism="http://www.codeplex.com/prism" Title="Editor" Height="800" Width="1280"
-        WindowStartupLocation="CenterScreen">
+		xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" 
+		xmlns:prism="http://www.codeplex.com/prism" Title="Editor" Height="800" Width="1280"
+		WindowStartupLocation="CenterScreen">
 	<Grid>
 		<TabControl>
 			<TabItem Height="25" Width="80" Header="行为树">

+ 6 - 6
CSharp/App/Modules/Robot/RobotView.xaml

@@ -1,10 +1,10 @@
 <UserControl x:Class="Modules.Robot.RobotView"
-             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
-             xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:Robot="clr-namespace:Modules.Robot"
-             mc:Ignorable="d" 
-             d:DesignHeight="600" d:DesignWidth="800" d:DataContext="{d:DesignInstance Robot:RobotViewModel}">
+		xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+		xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+		xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
+		xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:Robot="clr-namespace:Modules.Robot"
+		mc:Ignorable="d" 
+		d:DesignHeight="600" d:DesignWidth="800" d:DataContext="{d:DesignInstance Robot:RobotViewModel}">
 	<Grid Height="597" Margin="1,1,1,4">
 		<StackPanel>
 			<Button Name="btnStart" Content="开始" Width="80" Height="25" Click="btnStart_Click" />

+ 13 - 13
CSharp/App/Modules/WaiGua/WaiGuaView.xaml

@@ -1,15 +1,15 @@
 <UserControl x:Class="Modules.WaiGua.WaiGuaView"
-             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
-             xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
-             xmlns:WaiGua="clr-namespace:Modules.WaiGua"
-             mc:Ignorable="d" 
-             d:DesignHeight="600" d:DesignWidth="800" 
-             d:DataContext="{d:DesignInstance WaiGua:WaiGuaViewModel}">
-    <Grid>
-        <StackPanel>
-            <Image Height="100"/>
-        </StackPanel>
-    </Grid>
+		xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+		xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+		xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
+		xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
+		xmlns:WaiGua="clr-namespace:Modules.WaiGua"
+		mc:Ignorable="d" 
+		d:DesignHeight="600" d:DesignWidth="800" 
+		d:DataContext="{d:DesignInstance WaiGua:WaiGuaViewModel}">
+	<Grid>
+		<StackPanel>
+			<Image Height="100"/>
+		</StackPanel>
+	</Grid>
 </UserControl>

+ 5 - 0
CSharp/CSharp.sln.DotSettings

@@ -53,6 +53,11 @@
 	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/WRAP_MULTIPLE_DECLARATION_STYLE/@EntryValue">WRAP_IF_LONG</s:String>
 	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/WRAP_TERNARY_EXPR_STYLE/@EntryValue">WRAP_IF_LONG</s:String>
 	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/JavaScriptCodeFormatting/JavaScriptFormatOther/ALIGN_MULTIPLE_DECLARATION/@EntryValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/XmlFormatter/BlankLineAfterProcessingInstructions/@EntryValue">False</s:Boolean>
+	<s:String x:Key="/Default/CodeStyle/CodeFormatting/XmlFormatter/ProcessingInstructionAttributeIndenting/@EntryValue">TwoSteps</s:String>
+	<s:String x:Key="/Default/CodeStyle/CodeFormatting/XmlFormatter/TagAttributeIndenting/@EntryValue">TwoSteps</s:String>
+	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/XmlFormatter/TagSpaceBeforeHeaderEnd1/@EntryValue">False</s:Boolean>
+	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/XmlFormatter/WrapBeforeAttr/@EntryValue">False</s:Boolean>
 	<s:String x:Key="/Default/CodeStyle/CSharpMemberOrderPattern/CustomPattern/@EntryValue">&lt;?xml version="1.0" encoding="utf-8" ?&gt;&#xD;
 &#xD;
 &lt;!--&#xD;