Оконченый дизайн
This commit is contained in:
@@ -5,7 +5,7 @@
|
|||||||
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
|
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
|
||||||
xmlns:local="clr-namespace:TracePad"
|
xmlns:local="clr-namespace:TracePad"
|
||||||
mc:Ignorable="d"
|
mc:Ignorable="d"
|
||||||
Title="MainWindow" Height="700" Width="600">
|
Title="MainWindow" Height="670" Width="600">
|
||||||
|
|
||||||
<!-- Отключение системного заголовка -->
|
<!-- Отключение системного заголовка -->
|
||||||
<WindowChrome.WindowChrome>
|
<WindowChrome.WindowChrome>
|
||||||
@@ -17,10 +17,10 @@
|
|||||||
|
|
||||||
<Grid>
|
<Grid>
|
||||||
<Grid.RowDefinitions>
|
<Grid.RowDefinitions>
|
||||||
<RowDefinition Height="30"/>
|
|
||||||
<!-- Шапка -->
|
<!-- Шапка -->
|
||||||
<RowDefinition Height="*"/>
|
<RowDefinition Height="30"/>
|
||||||
<!-- Основная часть -->
|
<!-- Основная часть -->
|
||||||
|
<RowDefinition Height="*"/>
|
||||||
</Grid.RowDefinitions>
|
</Grid.RowDefinitions>
|
||||||
|
|
||||||
<!-- Кастомная Шапка -->
|
<!-- Кастомная Шапка -->
|
||||||
@@ -33,7 +33,7 @@
|
|||||||
Foreground="#333333"
|
Foreground="#333333"
|
||||||
VerticalAlignment="Center"
|
VerticalAlignment="Center"
|
||||||
Margin="10,0,0,0"/>
|
Margin="10,0,0,0"/>
|
||||||
|
|
||||||
<!-- Кнопка Закрыть -->
|
<!-- Кнопка Закрыть -->
|
||||||
<Button DockPanel.Dock="Right" Width="46" Height="27"
|
<Button DockPanel.Dock="Right" Width="46" Height="27"
|
||||||
Content="✕" FontSize="10" Foreground="Black"
|
Content="✕" FontSize="10" Foreground="Black"
|
||||||
@@ -61,6 +61,11 @@
|
|||||||
<RowDefinition Height="Auto"/>
|
<RowDefinition Height="Auto"/>
|
||||||
<RowDefinition Height="Auto"/>
|
<RowDefinition Height="Auto"/>
|
||||||
<RowDefinition Height="Auto"/>
|
<RowDefinition Height="Auto"/>
|
||||||
|
<RowDefinition Height="Auto"/>
|
||||||
|
<RowDefinition Height="Auto"/>
|
||||||
|
<RowDefinition Height="Auto"/>
|
||||||
|
<RowDefinition Height="Auto"/>
|
||||||
|
<RowDefinition Height="Auto"/>
|
||||||
</Grid.RowDefinitions>
|
</Grid.RowDefinitions>
|
||||||
<Grid.ColumnDefinitions>
|
<Grid.ColumnDefinitions>
|
||||||
<!-- Rxx -->
|
<!-- Rxx -->
|
||||||
@@ -80,7 +85,7 @@
|
|||||||
<ColumnDefinition Width="50"/>
|
<ColumnDefinition Width="50"/>
|
||||||
</Grid.ColumnDefinitions>
|
</Grid.ColumnDefinitions>
|
||||||
|
|
||||||
<!-- Стили для экономии места в коде -->
|
<!-- Ваши оригинальные стили -->
|
||||||
<Grid.Resources>
|
<Grid.Resources>
|
||||||
<Style TargetType="TextBlock">
|
<Style TargetType="TextBlock">
|
||||||
<Setter Property="FontFamily" Value="Consolas"/>
|
<Setter Property="FontFamily" Value="Consolas"/>
|
||||||
@@ -146,8 +151,60 @@
|
|||||||
<TextBox Grid.Row="3" Grid.Column="7"/>
|
<TextBox Grid.Row="3" Grid.Column="7"/>
|
||||||
<TextBlock Grid.Row="3" Grid.Column="8" Text="DL"/>
|
<TextBlock Grid.Row="3" Grid.Column="8" Text="DL"/>
|
||||||
<TextBox Grid.Row="3" Grid.Column="9"/>
|
<TextBox Grid.Row="3" Grid.Column="9"/>
|
||||||
|
|
||||||
|
<!-- Строка 5: R8 -->
|
||||||
|
<TextBlock Grid.Row="4" Grid.Column="0" Text="R8"/>
|
||||||
|
<TextBox Grid.Row="4" Grid.Column="1"/>
|
||||||
|
<TextBlock Grid.Row="4" Grid.Column="2" Text="R8D"/>
|
||||||
|
<TextBox Grid.Row="4" Grid.Column="3"/>
|
||||||
|
<TextBlock Grid.Row="4" Grid.Column="4" Text="R8W"/>
|
||||||
|
<TextBox Grid.Row="4" Grid.Column="5"/>
|
||||||
|
<TextBlock Grid.Row="4" Grid.Column="6" Text="R8B"/>
|
||||||
|
<TextBox Grid.Row="4" Grid.Column="7" Grid.ColumnSpan="3"/>
|
||||||
|
|
||||||
|
<!-- Строка 6: R9 -->
|
||||||
|
<TextBlock Grid.Row="5" Grid.Column="0" Text="R9"/>
|
||||||
|
<TextBox Grid.Row="5" Grid.Column="1"/>
|
||||||
|
<TextBlock Grid.Row="5" Grid.Column="2" Text="R9D"/>
|
||||||
|
<TextBox Grid.Row="5" Grid.Column="3"/>
|
||||||
|
<TextBlock Grid.Row="5" Grid.Column="4" Text="R9W"/>
|
||||||
|
<TextBox Grid.Row="5" Grid.Column="5"/>
|
||||||
|
<TextBlock Grid.Row="5" Grid.Column="6" Text="R9B"/>
|
||||||
|
<TextBox Grid.Row="5" Grid.Column="7" Grid.ColumnSpan="3"/>
|
||||||
|
|
||||||
|
<!-- Строка 7: R10 -->
|
||||||
|
<TextBlock Grid.Row="6" Grid.Column="0" Text="R10"/>
|
||||||
|
<TextBox Grid.Row="6" Grid.Column="1"/>
|
||||||
|
<TextBlock Grid.Row="6" Grid.Column="2" Text="R10D"/>
|
||||||
|
<TextBox Grid.Row="6" Grid.Column="3"/>
|
||||||
|
<TextBlock Grid.Row="6" Grid.Column="4" Text="R10W"/>
|
||||||
|
<TextBox Grid.Row="6" Grid.Column="5"/>
|
||||||
|
<TextBlock Grid.Row="6" Grid.Column="6" Text="R10B"/>
|
||||||
|
<TextBox Grid.Row="6" Grid.Column="7" Grid.ColumnSpan="3"/>
|
||||||
|
|
||||||
|
<!-- Строка 8: R11 -->
|
||||||
|
<TextBlock Grid.Row="7" Grid.Column="0" Text="R11"/>
|
||||||
|
<TextBox Grid.Row="7" Grid.Column="1"/>
|
||||||
|
<TextBlock Grid.Row="7" Grid.Column="2" Text="R11D"/>
|
||||||
|
<TextBox Grid.Row="7" Grid.Column="3"/>
|
||||||
|
<TextBlock Grid.Row="7" Grid.Column="4" Text="R11W"/>
|
||||||
|
<TextBox Grid.Row="7" Grid.Column="5"/>
|
||||||
|
<TextBlock Grid.Row="7" Grid.Column="6" Text="R11B"/>
|
||||||
|
<TextBox Grid.Row="7" Grid.Column="7" Grid.ColumnSpan="3"/>
|
||||||
|
|
||||||
|
<!-- Строка 9: R12 -->
|
||||||
|
<TextBlock Grid.Row="8" Grid.Column="0" Text="R12"/>
|
||||||
|
<TextBox Grid.Row="8" Grid.Column="1"/>
|
||||||
|
<TextBlock Grid.Row="8" Grid.Column="2" Text="R12D"/>
|
||||||
|
<TextBox Grid.Row="8" Grid.Column="3"/>
|
||||||
|
<TextBlock Grid.Row="8" Grid.Column="4" Text="R12W"/>
|
||||||
|
<TextBox Grid.Row="8" Grid.Column="5"/>
|
||||||
|
<TextBlock Grid.Row="8" Grid.Column="6" Text="R12B"/>
|
||||||
|
<TextBox Grid.Row="8" Grid.Column="7" Grid.ColumnSpan="3"/>
|
||||||
</Grid>
|
</Grid>
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
<!-- Разделитель (отступ перед системными регистрами) -->
|
<!-- Разделитель (отступ перед системными регистрами) -->
|
||||||
<Separator Height="20" Background="Transparent"/>
|
<Separator Height="20" Background="Transparent"/>
|
||||||
|
|
||||||
@@ -308,7 +365,13 @@
|
|||||||
<ColumnDefinition Width="*"/>
|
<ColumnDefinition Width="*"/>
|
||||||
</Grid.ColumnDefinitions>
|
</Grid.ColumnDefinitions>
|
||||||
|
|
||||||
<Button Grid.Column="2" Content="Сохранить в Json" Height="30"
|
<Button Grid.Column="0" Content="Открыть Json" Height="30"
|
||||||
|
FontFamily="Segoe UI" FontSize="13" FontWeight="SemiBold"
|
||||||
|
Background="#888888" Foreground="White"
|
||||||
|
BorderBrush="#666666" BorderThickness="1"
|
||||||
|
Cursor="Hand"/>
|
||||||
|
|
||||||
|
<Button Grid.Column="2" Content="Создать Json" Height="30"
|
||||||
FontFamily="Segoe UI" FontSize="13" FontWeight="SemiBold"
|
FontFamily="Segoe UI" FontSize="13" FontWeight="SemiBold"
|
||||||
Background="#888888" Foreground="White"
|
Background="#888888" Foreground="White"
|
||||||
BorderBrush="#666666" BorderThickness="1"
|
BorderBrush="#666666" BorderThickness="1"
|
||||||
|
|||||||
@@ -1,13 +1,4 @@
|
|||||||
using System.Text;
|
using System.Windows;
|
||||||
using System.Windows;
|
|
||||||
using System.Windows.Controls;
|
|
||||||
using System.Windows.Data;
|
|
||||||
using System.Windows.Documents;
|
|
||||||
using System.Windows.Input;
|
|
||||||
using System.Windows.Media;
|
|
||||||
using System.Windows.Media.Imaging;
|
|
||||||
using System.Windows.Navigation;
|
|
||||||
using System.Windows.Shapes;
|
|
||||||
|
|
||||||
namespace TracePad
|
namespace TracePad
|
||||||
{
|
{
|
||||||
@@ -19,5 +10,6 @@ namespace TracePad
|
|||||||
}
|
}
|
||||||
public void MinimizeButtonClick(object sender, EventArgs e) => this.WindowState = WindowState.Minimized; // Minimize Button
|
public void MinimizeButtonClick(object sender, EventArgs e) => this.WindowState = WindowState.Minimized; // Minimize Button
|
||||||
public void ExitButtonClick(object sender, EventArgs e) => Application.Current.Shutdown(); // Exit Button
|
public void ExitButtonClick(object sender, EventArgs e) => Application.Current.Shutdown(); // Exit Button
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
Reference in New Issue
Block a user