From 2aeab450471cb80b59002da7da80faf251a0c4f4 Mon Sep 17 00:00:00 2001
From: asmrobot <asmrobot@hotmail.com>
Date: Mon, 25 Nov 2019 15:02:53 +0000
Subject: [PATCH] sigle computer
---
src/RichCreator/MainWindow.xaml | 56 +++++++++++++++++++++++---------------------------------
1 files changed, 23 insertions(+), 33 deletions(-)
diff --git a/src/RichCreator/MainWindow.xaml b/src/RichCreator/MainWindow.xaml
index 1b310d1..0a59ba6 100644
--- a/src/RichCreator/MainWindow.xaml
+++ b/src/RichCreator/MainWindow.xaml
@@ -9,7 +9,7 @@
ResizeMode="NoResize"
Loaded="Window_Loaded"
Unloaded="Window_Unloaded"
- Title="富豪自动创造机" Height="250" Width="800" WindowStartupLocation="CenterScreen">
+ Title="富豪自动创造机" SizeToContent="Height" Width="800" WindowStartupLocation="CenterScreen">
<Window.Resources>
<Style TargetType="Border" x:Key="RowBorderStyle">
<Setter Property="BorderBrush" Value="Gray"/>
@@ -32,13 +32,31 @@
<Grid.RowDefinitions>
<RowDefinition Height="*"/>
<RowDefinition Height="Auto" />
+ <RowDefinition Height="Auto" />
</Grid.RowDefinitions>
- <TextBox Grid.Row="0" AcceptsReturn="True" TextWrapping="Wrap" IsReadOnly="True" x:Name="LogTB" VerticalScrollBarVisibility="Auto"/>
+ <Grid Grid.Row="0">
+ <TextBox x:Name="LogTB" AcceptsReturn="True" TextWrapping="Wrap" IsReadOnly="True" VerticalScrollBarVisibility="Auto" Visibility="Collapsed" Height="200"/>
+ <Button x:Name="LogTBClearBtn" Content="清空" Padding="15 0 15 0" Margin="5" Click="ClearLog_Click" VerticalAlignment="Top" HorizontalAlignment="Right" Visibility="Collapsed" />
+
+ <Button Background="Transparent" BorderThickness="0" Click="LogTBExpand_Click" VerticalAlignment="Top">
+ <Image Source="Images/down.png" Height="20" />
+ </Button>
+ </Grid>
<Grid Grid.Row="1">
+ <ListBox Grid.Column="1" x:Name="StateList" Height="30" >
+ <ListBox.ItemsPanel>
+ <ItemsPanelTemplate>
+ <StackPanel Orientation="Horizontal" />
+ </ItemsPanelTemplate>
+ </ListBox.ItemsPanel>
+ </ListBox>
+ </Grid>
+
+ <Grid Grid.Row="2">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="Auto"/>
<ColumnDefinition Width="*"/>
@@ -52,33 +70,6 @@
</StackPanel>
<TextBlock x:Name="debugMessage" Grid.Column="1" VerticalAlignment="Center" Text="" Margin="12 0 " />
<StackPanel Orientation="Horizontal" Grid.Column="2" HorizontalAlignment="Right">
- <!--<Button Content="test" Click="Button_Click" />
-
- <ComboBox SelectedIndex="0" x:Name="d">
- <ComboBoxItem >向上</ComboBoxItem>
- <ComboBoxItem >向下</ComboBoxItem>
- </ComboBox>
- <ComboBox SelectedIndex="0" x:Name="v">
- <ComboBoxItem >0.1</ComboBoxItem>
- <ComboBoxItem >0.2</ComboBoxItem>
- <ComboBoxItem >0.3</ComboBoxItem>
- <ComboBoxItem >0.4</ComboBoxItem>
- <ComboBoxItem >0.5</ComboBoxItem>
- <ComboBoxItem >0.6</ComboBoxItem>
- <ComboBoxItem >0.7</ComboBoxItem>
- <ComboBoxItem >0.8</ComboBoxItem>
- <ComboBoxItem >0.9</ComboBoxItem>
- <ComboBoxItem >1</ComboBoxItem>
- <ComboBoxItem >2</ComboBoxItem>
- <ComboBoxItem >3</ComboBoxItem>
- <ComboBoxItem >4</ComboBoxItem>
- <ComboBoxItem >5</ComboBoxItem>
- <ComboBoxItem >6</ComboBoxItem>
- <ComboBoxItem >7</ComboBoxItem>
- <ComboBoxItem >8</ComboBoxItem>
- <ComboBoxItem >9</ComboBoxItem>
- </ComboBox>
- <Button Content="移动" Padding="15 0 15 0" Margin="5" Click="TestMoveClick" />-->
<ComboBox SelectedIndex="0" x:Name="taskName" VerticalAlignment="Center">
<ComboBoxItem >凛冬</ComboBoxItem>
<ComboBoxItem >卡勒特</ComboBoxItem>
@@ -89,12 +80,11 @@
<ComboBoxItem>读角色位置</ComboBoxItem>
<ComboBoxItem>移动进门</ComboBoxItem>
</ComboBox>
- <Button Content="清空" Padding="15 0 15 0" Margin="5" Click="ClearLog_Click" />
- <Button Content="运行(Home)" Padding="15 0 15 0" Margin="5" Click="Run_Click" x:Name="RunningButton" />
+
+ <Button Content="运行" Padding="15 0 15 0" Margin="5" Click="Run_Click" x:Name="RunningButton" />
+
</StackPanel>
</Grid>
-
-
</Grid>
</Border>
</TabItem>
--
Gitblit v1.9.3