david/infosys-publisher
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

verzija

Browse Source
This commit is contained in:
David Štaleker
2024-08-02 11:09:49 +02:00
parent ca229fbd89
commit 1459205ef3
4 changed files with 17 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
InfosysPublisher/App.xaml.cs
View File

@@ -8,6 +8,8 @@ using System.Reflection;
using System.Threading.Tasks; using System.Threading.Tasks;
using System.Windows; using System.Windows;
//[assembly: AssemblyVersion("2024.08.02.0")]
//Publish location:InfosysPublisher
namespace InfosysPublisher namespace InfosysPublisher
{ {
/// <summary> /// <summary>
@@ -19,6 +21,7 @@ namespace InfosysPublisher
internal static Settings.Application? _application; internal static Settings.Application? _application;
internal static User User; internal static User User;
internal static Version CurrentVersion;
protected override void OnStartup(StartupEventArgs e) protected override void OnStartup(StartupEventArgs e)
{ {
@@ -26,6 +29,8 @@ namespace InfosysPublisher
//base.OnStartup(e); //base.OnStartup(e);
_application = WinSettings.GetSettings(); _application = WinSettings.GetSettings();
CurrentVersion = typeof(App).Assembly.GetName().Version;
if (_application == null) if (_application == null)
{ {
OpenSettings(); OpenSettings();

2
InfosysPublisher/InfosysPublisher.csproj
View File

@@ -5,7 +5,7 @@
<TargetFramework>net8.0-windows7.0</TargetFramework> <TargetFramework>net8.0-windows7.0</TargetFramework>
<Nullable>enable</Nullable> <Nullable>enable</Nullable>
<UseWPF>true</UseWPF> <UseWPF>true</UseWPF>
<AssemblyVersion>1.0.1.0</AssemblyVersion> <AssemblyVersion>2024.08.02.0</AssemblyVersion>
<ApplicationIcon>infosysPublisher.ico</ApplicationIcon> <ApplicationIcon>infosysPublisher.ico</ApplicationIcon>
</PropertyGroup> </PropertyGroup>

14
InfosysPublisher/WinLogin.xaml
View File

@@ -11,6 +11,7 @@
<Grid.RowDefinitions> <Grid.RowDefinitions>
<RowDefinition Height="*"/> <RowDefinition Height="*"/>
<RowDefinition Height="50"/> <RowDefinition Height="50"/>
<RowDefinition Height="20"/>
<RowDefinition Height="30"/> <RowDefinition Height="30"/>
<RowDefinition Height="25"/> <RowDefinition Height="25"/>
<RowDefinition Height="25"/> <RowDefinition Height="25"/>
@@ -22,22 +23,25 @@
</Grid.RowDefinitions> </Grid.RowDefinitions>
<Viewbox Grid.Row="1"> <Viewbox Grid.Row="1">
<TextBlock>Infosys-Publisher</TextBlock></Viewbox> <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> <TextBlock>Username:</TextBlock>
</Viewbox> </Viewbox>
<Viewbox Grid.Row="4"> <Viewbox Grid.Row="5">
<TextBox Name="tbUsername" Width="300"></TextBox> <TextBox Name="tbUsername" Width="300"></TextBox>
</Viewbox> </Viewbox>
<Viewbox Grid.Row="5"> <Viewbox Grid.Row="6">
<TextBlock>Password:</TextBlock> <TextBlock>Password:</TextBlock>
</Viewbox> </Viewbox>
<Viewbox Grid.Row="6"> <Viewbox Grid.Row="7">
<PasswordBox Name="tbPassword" Width="300"></PasswordBox> <PasswordBox Name="tbPassword" Width="300"></PasswordBox>
</Viewbox> </Viewbox>
<Button Grid.Row="8" Width="300" Click="Login_OnClick"> <Button Grid.Row="9" Width="300" Click="Login_OnClick">
<Viewbox> <Viewbox>
<TextBlock>Login</TextBlock> <TextBlock>Login</TextBlock>
</Viewbox> </Viewbox>

1
InfosysPublisher/WinLogin.xaml.cs
View File

@@ -19,6 +19,7 @@ namespace InfosysPublisher
{ {
InitializeComponent(); InitializeComponent();
tblVersion.Text = $"Version: {App.CurrentVersion}";
} }
private async void Login_OnClick(object sender, RoutedEventArgs e) private async void Login_OnClick(object sender, RoutedEventArgs e)