Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions code/HellMapManager/HellMapManager.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -28,12 +28,12 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Avalonia" Version="12.0.1" />
<PackageReference Include="Avalonia.Controls.DataGrid" Version="12.0.0" />
<PackageReference Include="Avalonia" Version="12.1.1" />
<PackageReference Include="Avalonia.Controls.DataGrid" Version="12.1.1" />
<PackageReference Include="PanAndZoom" Version="12.0.0" />
<PackageReference Include="Avalonia.Desktop" Version="12.0.0" />
<PackageReference Include="Avalonia.Themes.Fluent" Version="12.0.0" />
<PackageReference Include="Avalonia.Fonts.Inter" Version="12.0.0" />
<PackageReference Include="Avalonia.Desktop" Version="12.1.1" />
<PackageReference Include="Avalonia.Themes.Fluent" Version="12.1.1" />
<PackageReference Include="Avalonia.Fonts.Inter" Version="12.1.1" />
<!--Condition below is needed to remove Avalonia.Diagnostics package from build output in Release configuration.-->
<PackageReference Include="AvaloniaUI.DiagnosticsSupport" Version="2.2.0" >
<IncludeAssets Condition="'$(Configuration)' != 'Debug'">None</IncludeAssets>
Expand Down
3 changes: 2 additions & 1 deletion code/HellMapManager/Helpers/RelationMapper.cs
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ private void BuildRelations(RelationMapItem item)
}
var target = new RelationMapItem(targetRoom, item.Depth + 1);
Walked[exit.To] = target;
mf.Map.Markers.ForEach(m =>
MapFile.Map.Markers.ForEach(m =>
{
if (m.Value == exit.To)
{
Expand Down Expand Up @@ -119,6 +119,7 @@ private void BuildRelations(RelationMapItem item)
return root;
}
Dictionary<string, RelationMapItem> Walked = new Dictionary<string, RelationMapItem>();

readonly MapFile MapFile = mf;
readonly string Start = start;
readonly int MaxDepth = maxDepth;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
<Button Click="OnPick" DockPanel.Dock="Right">
<Image Source="avares://HellMapManager/Assets/dataset.png" />
</Button>
<TextBox Text="{Binding $parent[controls:RoomPicker].Room},Mode=TwoWay" Watermark="{Binding $parent[controls:RoomPicker].Watermark}" />
<TextBox Text="{Binding $parent[controls:RoomPicker].Room},Mode=TwoWay" PlaceholderText="{Binding $parent[controls:RoomPicker].PlaceholderText}" />
</DockPanel>
</Border>
</UserControl>
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,12 @@ public RoomPicker()
{
InitializeComponent();
}
public static readonly StyledProperty<string> WatermarkProperty
= AvaloniaProperty.Register<RoomPicker, string>(nameof(WatermarkProperty));
public string Watermark
public static readonly StyledProperty<string> PlaceholderTextProperty
= AvaloniaProperty.Register<RoomPicker, string>(nameof(PlaceholderTextProperty));
public string PlaceholderText
{
get => GetValue(WatermarkProperty);
set => SetValue(WatermarkProperty, value);
get => GetValue(PlaceholderTextProperty);
set => SetValue(PlaceholderTextProperty, value);
}

public async void OnPick(object? sender, RoutedEventArgs args)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@
DockPanel.Dock="Right"
Text="{Binding LandmarksFilter}"
TextChanged="OnFilter"
Watermark="过滤"><ToolTip.Tip><TextBlock Text="{DynamicResource ModelFilterTooltip}" /></ToolTip.Tip></TextBox>
PlaceholderText="过滤"><ToolTip.Tip><TextBlock Text="{DynamicResource ModelFilterTooltip}" /></ToolTip.Tip></TextBox>
<WrapPanel
Margin="0,0,10,0"
HorizontalAlignment="Right"
Expand Down
2 changes: 1 addition & 1 deletion code/HellMapManager/Views/Mapfile/Markers/Markers.axaml
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@
DockPanel.Dock="Right"
Text="{Binding MarkersFilter}"
TextChanged="OnFilter"
Watermark="过滤"><ToolTip.Tip><TextBlock Text="{DynamicResource ModelFilterTooltip}" /></ToolTip.Tip></TextBox>
PlaceholderText="过滤"><ToolTip.Tip><TextBlock Text="{DynamicResource ModelFilterTooltip}" /></ToolTip.Tip></TextBox>
<WrapPanel
Margin="0,0,10,0"
HorizontalAlignment="Right"
Expand Down
2 changes: 1 addition & 1 deletion code/HellMapManager/Views/Mapfile/Regions/Regions.axaml
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@
DockPanel.Dock="Right"
Text="{Binding RegionsFilter}"
TextChanged="OnFilter"
Watermark="过滤"><ToolTip.Tip><TextBlock Text="{DynamicResource ModelFilterTooltip}" /></ToolTip.Tip></TextBox>
PlaceholderText="过滤"><ToolTip.Tip><TextBlock Text="{DynamicResource ModelFilterTooltip}" /></ToolTip.Tip></TextBox>
<WrapPanel
Margin="0,0,10,0"
HorizontalAlignment="Right"
Expand Down
2 changes: 1 addition & 1 deletion code/HellMapManager/Views/Mapfile/Rooms/Rooms.axaml
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@
DockPanel.Dock="Right"
Text="{Binding RoomsFilter}"
TextChanged="OnFilter"
Watermark="过滤"><ToolTip.Tip><TextBlock Text="{DynamicResource ModelFilterTooltip}" /></ToolTip.Tip></TextBox>
PlaceholderText="过滤"><ToolTip.Tip><TextBlock Text="{DynamicResource ModelFilterTooltip}" /></ToolTip.Tip></TextBox>
<WrapPanel
Margin="0,0,10,0"
HorizontalAlignment="Right"
Expand Down
2 changes: 1 addition & 1 deletion code/HellMapManager/Views/Mapfile/Routes/Routes.axaml
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@
DockPanel.Dock="Right"
Text="{Binding RoutesFilter}"
TextChanged="OnFilter"
Watermark="过滤"><ToolTip.Tip><TextBlock Text="{DynamicResource ModelFilterTooltip}" /></ToolTip.Tip></TextBox>
PlaceholderText="过滤"><ToolTip.Tip><TextBlock Text="{DynamicResource ModelFilterTooltip}" /></ToolTip.Tip></TextBox>
<WrapPanel
Margin="0,0,10,0"
HorizontalAlignment="Right"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@
DockPanel.Dock="Right"
Text="{Binding ShortcutsFilter}"
TextChanged="OnFilter"
Watermark="过滤"><ToolTip.Tip><TextBlock Text="{DynamicResource ModelFilterTooltip}" /></ToolTip.Tip></TextBox>
PlaceholderText="过滤"><ToolTip.Tip><TextBlock Text="{DynamicResource ModelFilterTooltip}" /></ToolTip.Tip></TextBox>
<WrapPanel
Margin="0,0,10,0"
HorizontalAlignment="Right"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@
DockPanel.Dock="Right"
Text="{Binding SnapshotsFilter}"
TextChanged="OnFilter"
Watermark="过滤"><ToolTip.Tip><TextBlock Text="{DynamicResource ModelFilterTooltip}" /></ToolTip.Tip></TextBox>
PlaceholderText="过滤"><ToolTip.Tip><TextBlock Text="{DynamicResource ModelFilterTooltip}" /></ToolTip.Tip></TextBox>
<WrapPanel
Margin="0,0,10,0"
HorizontalAlignment="Right"
Expand Down
2 changes: 1 addition & 1 deletion code/HellMapManager/Views/Mapfile/Traces/Traces.axaml
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@
DockPanel.Dock="Right"
Text="{Binding TracesFilter}"
TextChanged="OnFilter"
Watermark="过滤"><ToolTip.Tip><TextBlock Text="{DynamicResource ModelFilterTooltip}" /></ToolTip.Tip></TextBox>
PlaceholderText="过滤"><ToolTip.Tip><TextBlock Text="{DynamicResource ModelFilterTooltip}" /></ToolTip.Tip></TextBox>
<WrapPanel
Margin="0,0,10,0"
HorizontalAlignment="Right"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ mc:Ignorable="d">
DockPanel.Dock="Right"
Text="{Binding VariablesFilter}"
TextChanged="OnFilter"
Watermark="过滤"><ToolTip.Tip><TextBlock Text="{DynamicResource ModelFilterTooltip}" /></ToolTip.Tip></TextBox>
PlaceholderText="过滤"><ToolTip.Tip><TextBlock Text="{DynamicResource ModelFilterTooltip}" /></ToolTip.Tip></TextBox>
<WrapPanel
Margin="0,0,10,0"
HorizontalAlignment="Right"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -60,9 +60,9 @@
<TextBlock Classes="Label" Text="服务端口:" />
<NumericUpDown Increment="1" Value="{Binding Config.APIPort}" />
<TextBlock Classes="Label" Text="用户名:" />
<TextBox Text="{Binding Config.APIUserName}" Watermark="接口用户名,留空则无检验" />
<TextBox Text="{Binding Config.APIUserName}" PlaceholderText="接口用户名,留空则无检验" />
<TextBlock Classes="Label" Text="用户密码:" />
<TextBox Text="{Binding Config.APIPassWord}" Watermark="接口密码,留空则无检验" />
<TextBox Text="{Binding Config.APIPassWord}" PlaceholderText="接口密码,留空则无检验" />
<CheckBox IsChecked="{Binding Config.APIEnabled}" IsThreeState="False">打开程序时自动启动服务</CheckBox>
</StackPanel>
</Border>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -57,13 +57,13 @@
<ScrollViewer>
<StackPanel Margin="20">
<TextBlock Classes="Label" Text="主键:" />
<TextBox Text="{Binding Item.Key}" Watermark="主键" />
<TextBox Text="{Binding Item.Key}" PlaceholderText="主键" />
<TextBlock Classes="Label" Text="值:" />
<TextBox
AcceptsReturn="True"
Classes="TextArea"
Text="{Binding Item.Value}"
Watermark="值" />
PlaceholderText="值" />
</StackPanel>
</ScrollViewer>
</DockPanel>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -59,9 +59,9 @@
<ScrollViewer>
<StackPanel Margin="20">
<TextBlock Classes="Label" Text="目标:" />
<roompicker:RoomPicker Room="{Binding Item.To}" Watermark="目标" />
<roompicker:RoomPicker Room="{Binding Item.To}" PlaceholderText="目标" />
<TextBlock Classes="Label" Text="指令:" />
<TextBox Text="{Binding Item.Command}" Watermark="指令" />
<TextBox Text="{Binding Item.Command}" PlaceholderText="指令" />
<TextBlock Classes="Label" Text="条件:" />
<StackPanel Classes="Content">
<WrapPanel Margin="12,2">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -73,23 +73,23 @@
<StackPanel Margin="20">
<StackPanel IsVisible="{Binding !ViewMode}">
<TextBlock Classes="Label" Text="主键:" />
<roompicker:RoomPicker Room="{Binding Item.Key}" Watermark="定位主键" />
<roompicker:RoomPicker Room="{Binding Item.Key}" PlaceholderText="定位主键" />
<TextBlock Classes="Label" Text="类型:" />
<TextBox Text="{Binding Item.Type}" Watermark="定位类型" />
<TextBox Text="{Binding Item.Type}" PlaceholderText="定位类型" />
<TextBlock Classes="Label" Text="值:" />
<TextBox
AcceptsReturn="True"
Classes="TextArea"
Text="{Binding Item.Value}"
Watermark="定位值" />
PlaceholderText="定位值" />
<TextBlock Classes="Label" Text="分组:" />
<TextBox Text="{Binding Item.Group}" Watermark="分组" />
<TextBox Text="{Binding Item.Group}" PlaceholderText="分组" />
<TextBlock Classes="Label" Text="描述:" />
<TextBox
AcceptsReturn="True"
Classes="TextArea"
Text="{Binding Item.Desc}"
Watermark="定位描述" />
PlaceholderText="定位描述" />
</StackPanel>
<StackPanel IsVisible="{Binding ViewMode}">
<TextBlock Classes="Label" Text="主键:" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -73,23 +73,23 @@
<StackPanel Margin="20">
<StackPanel IsVisible="{Binding !ViewMode}">
<TextBlock Classes="Label" Text="主键:" />
<TextBox Text="{Binding Item.Key}" Watermark="标记主键" />
<TextBox Text="{Binding Item.Key}" PlaceholderText="标记主键" />
<TextBlock Classes="Label" Text="值:" />
<roompicker:RoomPicker Room="{Binding Item.Value}" Watermark="标记值" />
<roompicker:RoomPicker Room="{Binding Item.Value}" PlaceholderText="标记值" />
<TextBlock Classes="Label" Text="分组:" />
<TextBox Text="{Binding Item.Group}" Watermark="分组" />
<TextBox Text="{Binding Item.Group}" PlaceholderText="分组" />
<TextBlock Classes="Label" Text="描述:" />
<TextBox
AcceptsReturn="True"
Classes="TextArea"
Text="{Binding Item.Desc}"
Watermark="标记描述" />
PlaceholderText="标记描述" />
<TextBlock Classes="Label" Text="消息:" />
<TextBox
AcceptsReturn="True"
Classes="TextArea"
Text="{Binding Item.Message}"
Watermark="传递给脚本的消息" />
PlaceholderText="传递给脚本的消息" />
</StackPanel>
<StackPanel IsVisible="{Binding ViewMode}">
<TextBlock Classes="Label" Text="主键:" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -73,11 +73,11 @@
<TextBox
IsVisible="{Binding !Item.IsRoom}"
Text="{Binding Item.Value}"
Watermark="值" />
PlaceholderText="值" />
<roompicker:RoomPicker
IsVisible="{Binding Item.IsRoom}"
Room="{Binding Item.Value}"
Watermark="值" />
PlaceholderText="值" />
<CheckBox IsChecked="{Binding Item.Not}" IsThreeState="False">排除该元素</CheckBox>
</StackPanel>
</ScrollViewer>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -73,9 +73,9 @@
<StackPanel Margin="20">
<StackPanel IsVisible="{Binding !ViewMode}">
<TextBlock Classes="Label" Text="主键:" />
<TextBox Text="{Binding Item.Key}" Watermark="地区主键" />
<TextBox Text="{Binding Item.Key}" PlaceholderText="地区主键" />
<TextBlock Classes="Label" Text="分组:" />
<TextBox Text="{Binding Item.Group}" Watermark="分组" />
<TextBox Text="{Binding Item.Group}" PlaceholderText="分组" />
<TextBlock Classes="Label" Text="元素:" />
<Panel Classes="Content">
<itemlist:UpDownList Classes="RegionItems Content" ItemsSource="{Binding Item.Items}">
Expand Down Expand Up @@ -127,13 +127,13 @@
AcceptsReturn="True"
Classes="TextArea"
Text="{Binding Item.Desc}"
Watermark="地区描述" />
PlaceholderText="地区描述" />
<TextBlock Classes="Label" Text="消息:" />
<TextBox
AcceptsReturn="True"
Classes="TextArea"
Text="{Binding Item.Message}"
Watermark="传递给脚本的消息" />
PlaceholderText="传递给脚本的消息" />
</StackPanel>
<StackPanel IsVisible="{Binding ViewMode}">
<TextBlock Classes="Label" Text="主键:" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -75,11 +75,11 @@
<StackPanel Margin="20">
<StackPanel IsVisible="{Binding !ViewMode}">
<TextBlock Classes="Label" Text="主键:" />
<TextBox Text="{Binding Item.Key}" Watermark="房间主键" />
<TextBox Text="{Binding Item.Key}" PlaceholderText="房间主键" />
<TextBlock Classes="Label" Text="名称:" />
<TextBox Text="{Binding Item.Name}" Watermark="房间名" />
<TextBox Text="{Binding Item.Name}" PlaceholderText="房间名" />
<TextBlock Classes="Label" Text="分组:" />
<TextBox Text="{Binding Item.Group}" Watermark="分组" />
<TextBox Text="{Binding Item.Group}" PlaceholderText="分组" />
<TextBlock Classes="Label" Text="标签:" />
<StackPanel Classes="Content">
<WrapPanel Margin="12,2">
Expand Down Expand Up @@ -216,7 +216,7 @@
AcceptsReturn="True"
Classes="TextArea"
Text="{Binding Item.Desc}"
Watermark="房间描述" />
PlaceholderText="房间描述" />
</StackPanel>
<StackPanel IsVisible="{Binding ViewMode}">
<TextBlock Classes="Label" Text="主键:" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -72,27 +72,27 @@
<StackPanel Margin="20">
<StackPanel IsVisible="{Binding !ViewMode}">
<TextBlock Classes="Label" Text="主键:" />
<TextBox Text="{Binding Item.Key}" Watermark="路线主键" />
<TextBox Text="{Binding Item.Key}" PlaceholderText="路线主键" />
<TextBlock Classes="Label" Text="分组:" />
<TextBox Text="{Binding Item.Group}" Watermark="分组" />
<TextBox Text="{Binding Item.Group}" PlaceholderText="分组" />
<TextBlock Classes="Label" Text="房间列表,一行一个房间" />
<TextBox
AcceptsReturn="True"
Classes="TextArea"
Text="{Binding Item.Rooms}"
Watermark="房间列表" />
PlaceholderText="房间列表" />
<TextBlock Classes="Label" Text="描述:" />
<TextBox
AcceptsReturn="True"
Classes="TextArea"
Text="{Binding Item.Desc}"
Watermark="路线描述" />
PlaceholderText="路线描述" />
<TextBlock Classes="Label" Text="消息:" />
<TextBox
AcceptsReturn="True"
Classes="TextArea"
Text="{Binding Item.Message}"
Watermark="传递给脚本的消息" />
PlaceholderText="传递给脚本的消息" />
</StackPanel>
<StackPanel IsVisible="{Binding ViewMode}">
<TextBlock Classes="Label" Text="主键:" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@
<StackPanel Margin="20">
<StackPanel IsVisible="{Binding !ViewMode}">
<TextBlock Classes="Label" Text="主键:" />
<TextBox Text="{Binding Item.Key}" Watermark="主键" />
<TextBox Text="{Binding Item.Key}" PlaceholderText="主键" />
<TextBlock Classes="Label" Text="房间条件:" />
<StackPanel Classes="Content">
<WrapPanel Margin="12,2">
Expand Down Expand Up @@ -113,9 +113,9 @@
</ListBox>
</StackPanel>
<TextBlock Classes="Label" Text="指令:" />
<TextBox Text="{Binding Item.Command}" Watermark="指令" />
<TextBox Text="{Binding Item.Command}" PlaceholderText="指令" />
<TextBlock Classes="Label" Text="目标:" />
<roompicker:RoomPicker Room="{Binding Item.To}" Watermark="目标" />
<roompicker:RoomPicker Room="{Binding Item.To}" PlaceholderText="目标" />
<TextBlock Classes="Label" Text="环境条件:" />
<StackPanel Classes="Content">
<WrapPanel Margin="12,2">
Expand Down Expand Up @@ -156,13 +156,13 @@
<TextBlock Classes="Label" Text="耗时:" />
<NumericUpDown Increment="1" Value="{Binding Item.Cost}" />
<TextBlock Classes="Label" Text="分组:" />
<TextBox Text="{Binding Item.Group}" Watermark="分组" />
<TextBox Text="{Binding Item.Group}" PlaceholderText="分组" />
<TextBlock Classes="Label" Text="描述:" />
<TextBox
AcceptsReturn="True"
Classes="TextArea"
Text="{Binding Item.Desc}"
Watermark="指令描述" />
PlaceholderText="指令描述" />
</StackPanel>
<StackPanel IsVisible="{Binding ViewMode}">
<TextBlock Classes="Label" Text="主键:" />
Expand Down
Loading