verzija
This commit is contained in:
@@ -8,6 +8,8 @@ using System.Reflection;
|
||||
using System.Threading.Tasks;
|
||||
using System.Windows;
|
||||
|
||||
//[assembly: AssemblyVersion("2024.08.02.0")]
|
||||
//Publish location:InfosysPublisher
|
||||
namespace InfosysPublisher
|
||||
{
|
||||
/// <summary>
|
||||
@@ -19,6 +21,7 @@ namespace InfosysPublisher
|
||||
|
||||
internal static Settings.Application? _application;
|
||||
internal static User User;
|
||||
internal static Version CurrentVersion;
|
||||
|
||||
protected override void OnStartup(StartupEventArgs e)
|
||||
{
|
||||
@@ -26,6 +29,8 @@ namespace InfosysPublisher
|
||||
//base.OnStartup(e);
|
||||
_application = WinSettings.GetSettings();
|
||||
|
||||
CurrentVersion = typeof(App).Assembly.GetName().Version;
|
||||
|
||||
if (_application == null)
|
||||
{
|
||||
OpenSettings();
|
||||
|
||||
@@ -5,7 +5,7 @@
|
||||
<TargetFramework>net8.0-windows7.0</TargetFramework>
|
||||
<Nullable>enable</Nullable>
|
||||
<UseWPF>true</UseWPF>
|
||||
<AssemblyVersion>1.0.1.0</AssemblyVersion>
|
||||
<AssemblyVersion>2024.08.02.0</AssemblyVersion>
|
||||
<ApplicationIcon>infosysPublisher.ico</ApplicationIcon>
|
||||
</PropertyGroup>
|
||||
|
||||
|
||||
@@ -11,6 +11,7 @@
|
||||
<Grid.RowDefinitions>
|
||||
<RowDefinition Height="*"/>
|
||||
<RowDefinition Height="50"/>
|
||||
<RowDefinition Height="20"/>
|
||||
<RowDefinition Height="30"/>
|
||||
<RowDefinition Height="25"/>
|
||||
<RowDefinition Height="25"/>
|
||||
@@ -22,22 +23,25 @@
|
||||
</Grid.RowDefinitions>
|
||||
<Viewbox Grid.Row="1">
|
||||
<TextBlock>Infosys-Publisher</TextBlock></Viewbox>
|
||||
<Viewbox Grid.Row="2">
|
||||
<TextBlock Name="tblVersion">Version: xxxx-xx-xx-xx</TextBlock>
|
||||
</Viewbox>
|
||||
|
||||
<Viewbox Grid.Row="3">
|
||||
<Viewbox Grid.Row="4">
|
||||
<TextBlock>Username:</TextBlock>
|
||||
</Viewbox>
|
||||
<Viewbox Grid.Row="4">
|
||||
<Viewbox Grid.Row="5">
|
||||
<TextBox Name="tbUsername" Width="300"></TextBox>
|
||||
</Viewbox>
|
||||
|
||||
<Viewbox Grid.Row="5">
|
||||
<Viewbox Grid.Row="6">
|
||||
<TextBlock>Password:</TextBlock>
|
||||
</Viewbox>
|
||||
<Viewbox Grid.Row="6">
|
||||
<Viewbox Grid.Row="7">
|
||||
<PasswordBox Name="tbPassword" Width="300"></PasswordBox>
|
||||
</Viewbox>
|
||||
|
||||
<Button Grid.Row="8" Width="300" Click="Login_OnClick">
|
||||
<Button Grid.Row="9" Width="300" Click="Login_OnClick">
|
||||
<Viewbox>
|
||||
<TextBlock>Login</TextBlock>
|
||||
</Viewbox>
|
||||
|
||||
@@ -19,6 +19,7 @@ namespace InfosysPublisher
|
||||
{
|
||||
InitializeComponent();
|
||||
|
||||
tblVersion.Text = $"Version: {App.CurrentVersion}";
|
||||
}
|
||||
|
||||
private async void Login_OnClick(object sender, RoutedEventArgs e)
|
||||
|
||||
Reference in New Issue
Block a user