more edits
This commit is contained in:
Bitl
parent
febbf481cf
commit
21af979cad
|
|
@ -2,7 +2,7 @@
|
|||
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
|
||||
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
|
||||
xmlns:local="clr-namespace:NovetusLauncher2_0"
|
||||
StartupUri="MainWindow.xaml">
|
||||
StartupUri="LauncherFormStylish.xaml">
|
||||
<Application.Resources>
|
||||
|
||||
</Application.Resources>
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
<Window x:Class="NovetusLauncher2_0.MainWindow"
|
||||
<Window x:Class="NovetusLauncher2_0.LauncherFormStylish"
|
||||
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
|
||||
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
|
||||
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
|
||||
|
|
@ -8,12 +8,40 @@
|
|||
Title="Novetus" Height="379.767" Width="695.158" ResizeMode="NoResize" Background="#FF294E64" Icon="Resources/N.png">
|
||||
|
||||
<Window.Resources>
|
||||
<Style x:Key="TabItemStyle1" TargetType="{x:Type TabItem}">
|
||||
<Style x:Key="TabItemStyleSeperators" TargetType="{x:Type TabItem}">
|
||||
<Setter Property="Template">
|
||||
<Setter.Value>
|
||||
<ControlTemplate TargetType="{x:Type TabItem}">
|
||||
<Border x:Name="Border" BorderThickness="7,1,7,1" CornerRadius="0,0,0,0" Margin="0,0,0,0" HorizontalAlignment="Center">
|
||||
<ContentPresenter x:Name="ContentSite" ContentSource="Header" />
|
||||
<Border x:Name="Border" BorderThickness="0,0,2,0" HorizontalAlignment="Center" BorderBrush="White" >
|
||||
<Border x:Name="Border2" BorderThickness="6,1,6,1" HorizontalAlignment="Center">
|
||||
<Grid Name="Panel">
|
||||
<ContentPresenter x:Name="ContentSite" ContentSource="Header" />
|
||||
</Grid>
|
||||
</Border>
|
||||
</Border>
|
||||
<ControlTemplate.Triggers>
|
||||
<Trigger Property="IsSelected" Value="True">
|
||||
<Setter Property="TextElement.Foreground" TargetName="ContentSite" Value="White"/>
|
||||
<Setter TargetName="Border" Property="Background" Value="#FF142732"/>
|
||||
</Trigger>
|
||||
<Trigger Property="IsSelected" Value="False">
|
||||
<Setter Property="TextElement.Foreground" TargetName="ContentSite" Value="White"/>
|
||||
<Setter TargetName="Border" Property="Background" Value="#FF294E64" />
|
||||
</Trigger>
|
||||
</ControlTemplate.Triggers>
|
||||
</ControlTemplate>
|
||||
</Setter.Value>
|
||||
</Setter>
|
||||
</Style>
|
||||
|
||||
<Style x:Key="TabItemStyleNoSeperators" TargetType="{x:Type TabItem}">
|
||||
<Setter Property="Template">
|
||||
<Setter.Value>
|
||||
<ControlTemplate TargetType="{x:Type TabItem}">
|
||||
<Border x:Name="Border" BorderThickness="6,1,6,1" HorizontalAlignment="Center">
|
||||
<Grid Name="Panel">
|
||||
<ContentPresenter x:Name="ContentSite" ContentSource="Header" />
|
||||
</Grid>
|
||||
</Border>
|
||||
<ControlTemplate.Triggers>
|
||||
<Trigger Property="IsSelected" Value="True">
|
||||
|
|
@ -47,12 +75,12 @@
|
|||
|
||||
<ControlTemplate.Triggers>
|
||||
<Trigger Property="IsMouseOver" Value="True">
|
||||
<Setter Property="Background" Value="#E59400" />
|
||||
<Setter Property="Background" Value="#FFF7DF80" />
|
||||
<Setter Property="Foreground" Value="Black" />
|
||||
</Trigger>
|
||||
|
||||
<Trigger Property="IsPressed" Value="True">
|
||||
<Setter Property="Background" Value="OrangeRed" />
|
||||
<Setter Property="Background" Value="#FF93770C" />
|
||||
<Setter Property="Foreground" Value="Black" />
|
||||
</Trigger>
|
||||
</ControlTemplate.Triggers>
|
||||
|
|
@ -62,48 +90,59 @@
|
|||
</Style>
|
||||
|
||||
<Style x:Key="TextBoxStyle1" TargetType="{x:Type TextBox}">
|
||||
<Setter Property="FontSize" Value="12" />
|
||||
<Setter Property="FontFamily" Value="Helvetica" />
|
||||
<Setter Property="TextAlignment" Value="Center" />
|
||||
<Setter Property="VerticalContentAlignment" Value="Center" />
|
||||
<Setter Property="HorizontalContentAlignment" Value="Center" />
|
||||
<Setter Property="Template">
|
||||
<Setter.Value>
|
||||
<ControlTemplate TargetType="{x:Type TextBox}">
|
||||
<Border BorderThickness="3">
|
||||
<ControlTemplate TargetType="{x:Type TextBoxBase}">
|
||||
<Border BorderThickness="2">
|
||||
<Border.BorderBrush>
|
||||
<VisualBrush>
|
||||
<VisualBrush.Visual>
|
||||
<Rectangle StrokeDashArray="4 2" Stroke="Gray" StrokeThickness="3"
|
||||
<Rectangle StrokeDashArray="4 2" Stroke="Gray" StrokeThickness="2"
|
||||
Width="{Binding RelativeSource={RelativeSource AncestorType={x:Type Border}}, Path=ActualWidth}"
|
||||
Height="{Binding RelativeSource={RelativeSource AncestorType={x:Type Border}}, Path=ActualHeight}"/>
|
||||
</VisualBrush.Visual>
|
||||
</VisualBrush>
|
||||
</Border.BorderBrush>
|
||||
|
||||
<TextBlock Text="{TemplateBinding Text}" FontSize="11" FontFamily="Arial" TextAlignment="Center" HorizontalAlignment="Left" VerticalAlignment="Center"/>
|
||||
<ScrollViewer Margin="0" x:Name="PART_ContentHost" />
|
||||
</Border>
|
||||
</ControlTemplate>
|
||||
</Setter.Value>
|
||||
</Setter>
|
||||
</Style>
|
||||
|
||||
<Style x:Key="CheckBoxStyle1" TargetType="{x:Type CheckBox}">
|
||||
<Setter Property="FontSize" Value="12" />
|
||||
<Setter Property="VerticalContentAlignment" Value="Center" />
|
||||
<Setter Property="HorizontalContentAlignment" Value="Center" />
|
||||
</Style>
|
||||
</Window.Resources>
|
||||
|
||||
<Grid Margin="0,0,0,-1">
|
||||
<Image x:Name="image" HorizontalAlignment="Center" Height="35" VerticalAlignment="Center" Width="35" AutomationProperties.Name="Logo" Source="Resources/N_new_final_repositioned_smol.png" Margin="332,10,322,307" Panel.ZIndex="1"/>
|
||||
<TabControl x:Name="tabControl" HorizontalAlignment="Center" Height="295" Margin="0,46,0,0" VerticalAlignment="Center" Width="689" BorderBrush="{x:Null}" Background="#FF294E64">
|
||||
<TabItem Header="PLAY" Style="{DynamicResource TabItemStyle1}" BorderBrush="{x:Null}" Background="#FF294E64" Foreground="White" IsSelected="True" FontSize="18" FontFamily="Comic Sans MS">
|
||||
<Grid Background="#FFEDEDED" Margin="0,0,-2,-10">
|
||||
<TabItem Header="PLAY" Style="{DynamicResource TabItemStyleSeperators}" BorderBrush="{x:Null}" Background="#FF294E64" Foreground="White" IsSelected="True" FontSize="18" FontFamily="Comic Sans MS">
|
||||
<Grid Background="#FFEDEDED" Margin="0,0,-2,0">
|
||||
<Grid.ColumnDefinitions>
|
||||
<ColumnDefinition Width="101*"/>
|
||||
<ColumnDefinition Width="584*"/>
|
||||
</Grid.ColumnDefinitions>
|
||||
<Rectangle Fill="#FFDEDCDC" HorizontalAlignment="Left" Height="237" Margin="10,10,0,0" Stroke="Black" VerticalAlignment="Top" Width="665" Grid.ColumnSpan="2"/>
|
||||
<Button x:Name="buttonTest" Style="{DynamicResource ButtonStyle1}" Content="Button" HorizontalAlignment="Left" Margin="78,95,0,0" VerticalAlignment="Top" Width="75" Grid.ColumnSpan="2"/>
|
||||
<TextBox x:Name="textBox" Style="{DynamicResource TextBoxStyle1}" HorizontalAlignment="Left" Height="18" Margin="78,72,0,0" TextWrapping="Wrap" Text="Test Text" VerticalAlignment="Top" Width="89" Grid.ColumnSpan="2"/>
|
||||
<TextBox x:Name="textBox" Style="{DynamicResource TextBoxStyle1}" HorizontalAlignment="Left" Height="20" Margin="78,70,0,0" TextWrapping="Wrap" Text="Bitl" VerticalAlignment="Top" Width="95" Grid.ColumnSpan="2"/>
|
||||
<CheckBox x:Name="checkBox" Style="{DynamicResource CheckBoxStyle1}" Content="TestCheck" HorizontalAlignment="Left" Margin="78,127,0,0" VerticalAlignment="Top" Width="83" Grid.ColumnSpan="2"/>
|
||||
</Grid>
|
||||
</TabItem>
|
||||
<TabItem Header="HOST" Style="{DynamicResource TabItemStyle1}" BorderBrush="{x:Null}" Background="#FF294E64" Foreground="White" IsSelected="True" FontSize="18" FontFamily="Comic Sans MS">
|
||||
<TabItem Header="HOST" Style="{DynamicResource TabItemStyleSeperators}" BorderBrush="{x:Null}" Background="#FF294E64" Foreground="White" IsSelected="True" FontSize="18" FontFamily="Comic Sans MS">
|
||||
<Grid Background="#FFEDEDED">
|
||||
<Rectangle Fill="#FFDEDCDC" HorizontalAlignment="Left" Height="237" Margin="10,10,0,0" Stroke="Black" VerticalAlignment="Top" Width="665"/>
|
||||
</Grid>
|
||||
</TabItem>
|
||||
<TabItem Header="VERSIONS" Style="{DynamicResource TabItemStyle1}" BorderBrush="{x:Null}" Background="#FF294E64" Foreground="White" IsSelected="True" FontSize="18" FontFamily="Comic Sans MS">
|
||||
<TabItem Header="VERSIONS" Style="{DynamicResource TabItemStyleSeperators}" BorderBrush="{x:Null}" Background="#FF294E64" Foreground="White" IsSelected="True" FontSize="18" FontFamily="Comic Sans MS">
|
||||
<Grid Background="#FFEDEDED">
|
||||
<Grid.ColumnDefinitions>
|
||||
<ColumnDefinition Width="274*"/>
|
||||
|
|
@ -112,27 +151,27 @@
|
|||
<Rectangle Fill="#FFDEDCDC" HorizontalAlignment="Left" Height="237" Margin="10,10,0,0" Stroke="Black" VerticalAlignment="Top" Width="665" Grid.ColumnSpan="2"/>
|
||||
</Grid>
|
||||
</TabItem>
|
||||
<TabItem Header="MAPS" Style="{DynamicResource TabItemStyle1}" BorderBrush="{x:Null}" Background="#FF294E64" Foreground="White" IsSelected="True" FontSize="18" FontFamily="Comic Sans MS">
|
||||
<TabItem Header="MAPS" Style="{DynamicResource TabItemStyleSeperators}" BorderBrush="{x:Null}" Background="#FF294E64" Foreground="White" IsSelected="True" FontSize="18" FontFamily="Comic Sans MS">
|
||||
<Grid Background="#FFEDEDED">
|
||||
<Rectangle Fill="#FFDEDCDC" HorizontalAlignment="Left" Height="237" Margin="10,10,0,0" Stroke="Black" VerticalAlignment="Top" Width="665"/>
|
||||
</Grid>
|
||||
</TabItem>
|
||||
<TabItem Header="SAVED" Style="{DynamicResource TabItemStyle1}" BorderBrush="{x:Null}" Background="#FF294E64" Foreground="White" IsSelected="True" FontSize="18" FontFamily="Comic Sans MS">
|
||||
<TabItem Header="SAVED" Style="{DynamicResource TabItemStyleSeperators}" BorderBrush="{x:Null}" Background="#FF294E64" Foreground="White" IsSelected="True" FontSize="18" FontFamily="Comic Sans MS">
|
||||
<Grid Background="#FFEDEDED">
|
||||
<Rectangle Fill="#FFDEDCDC" HorizontalAlignment="Left" Height="237" Margin="10,10,0,0" Stroke="Black" VerticalAlignment="Top" Width="665"/>
|
||||
</Grid>
|
||||
</TabItem>
|
||||
<TabItem Header="CONSOLE" Style="{DynamicResource TabItemStyle1}" BorderBrush="{x:Null}" Background="#FF294E64" Foreground="White" IsSelected="True" FontSize="18" FontFamily="Comic Sans MS">
|
||||
<TabItem Header="CONSOLE" Style="{DynamicResource TabItemStyleSeperators}" BorderBrush="{x:Null}" Background="#FF294E64" Foreground="White" IsSelected="True" FontSize="18" FontFamily="Comic Sans MS">
|
||||
<Grid Background="#FFEDEDED">
|
||||
<Rectangle Fill="#FFDEDCDC" HorizontalAlignment="Left" Height="237" Margin="10,10,0,0" Stroke="Black" VerticalAlignment="Top" Width="665"/>
|
||||
</Grid>
|
||||
</TabItem>
|
||||
<TabItem Header="CHANGES" Style="{DynamicResource TabItemStyle1}" BorderBrush="{x:Null}" Background="#FF294E64" Foreground="White" IsSelected="True" FontSize="18" FontFamily="Comic Sans MS">
|
||||
<TabItem Header="CHANGES" Style="{DynamicResource TabItemStyleSeperators}" BorderBrush="{x:Null}" Background="#FF294E64" Foreground="White" IsSelected="True" FontSize="18" FontFamily="Comic Sans MS">
|
||||
<Grid Background="#FFEDEDED">
|
||||
<Rectangle Fill="#FFDEDCDC" HorizontalAlignment="Left" Height="237" Margin="10,10,0,0" Stroke="Black" VerticalAlignment="Top" Width="665"/>
|
||||
</Grid>
|
||||
</TabItem>
|
||||
<TabItem Header="OPTIONS" Style="{DynamicResource TabItemStyle1}" BorderBrush="{x:Null}" Background="#FF294E64" Foreground="White" IsSelected="True" FontSize="18" FontFamily="Comic Sans MS">
|
||||
<TabItem Header="OPTIONS" Style="{DynamicResource TabItemStyleNoSeperators}" BorderBrush="{x:Null}" Background="#FF294E64" Foreground="White" IsSelected="True" FontSize="18" FontFamily="Comic Sans MS">
|
||||
<Grid Background="#FFEDEDED">
|
||||
<Rectangle Fill="#FFDEDCDC" HorizontalAlignment="Left" Height="237" Margin="10,10,0,0" Stroke="Black" VerticalAlignment="Top" Width="665"/>
|
||||
</Grid>
|
||||
|
|
@ -16,11 +16,11 @@ using System.Windows.Shapes;
|
|||
namespace NovetusLauncher2_0
|
||||
{
|
||||
/// <summary>
|
||||
/// Interaction logic for MainWindow.xaml
|
||||
/// Interaction logic for LauncherFormStylish.xaml
|
||||
/// </summary>
|
||||
public partial class MainWindow : Window
|
||||
public partial class LauncherFormStylish : Window
|
||||
{
|
||||
public MainWindow()
|
||||
public LauncherFormStylish()
|
||||
{
|
||||
InitializeComponent();
|
||||
}
|
||||
|
|
@ -55,7 +55,7 @@
|
|||
<Generator>MSBuild:Compile</Generator>
|
||||
<SubType>Designer</SubType>
|
||||
</ApplicationDefinition>
|
||||
<Page Include="MainWindow.xaml">
|
||||
<Page Include="LauncherFormStylish.xaml">
|
||||
<Generator>MSBuild:Compile</Generator>
|
||||
<SubType>Designer</SubType>
|
||||
</Page>
|
||||
|
|
@ -63,8 +63,8 @@
|
|||
<DependentUpon>App.xaml</DependentUpon>
|
||||
<SubType>Code</SubType>
|
||||
</Compile>
|
||||
<Compile Include="MainWindow.xaml.cs">
|
||||
<DependentUpon>MainWindow.xaml</DependentUpon>
|
||||
<Compile Include="LauncherFormStylish.xaml.cs">
|
||||
<DependentUpon>LauncherFormStylish.xaml</DependentUpon>
|
||||
<SubType>Code</SubType>
|
||||
</Compile>
|
||||
</ItemGroup>
|
||||
|
|
|
|||
Loading…
Reference in New Issue