From 1459205ef335fc688d2d015d09635a079669d911 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?David=20=C5=A0taleker?= <david@infosys.si>
Date: Fri, 2 Aug 2024 11:09:49 +0200
Subject: [PATCH] verzija

---
 InfosysPublisher/App.xaml.cs             |  5 +++++
 InfosysPublisher/InfosysPublisher.csproj |  2 +-
 InfosysPublisher/WinLogin.xaml           | 14 +++++++++-----
 InfosysPublisher/WinLogin.xaml.cs        |  3 ++-
 4 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/InfosysPublisher/App.xaml.cs b/InfosysPublisher/App.xaml.cs
index 8285c7b..2d7c2f4 100644
--- a/InfosysPublisher/App.xaml.cs
+++ b/InfosysPublisher/App.xaml.cs
@@ -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();
diff --git a/InfosysPublisher/InfosysPublisher.csproj b/InfosysPublisher/InfosysPublisher.csproj
index 7a9111d..fc3ecca 100644
--- a/InfosysPublisher/InfosysPublisher.csproj
+++ b/InfosysPublisher/InfosysPublisher.csproj
@@ -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>
 
diff --git a/InfosysPublisher/WinLogin.xaml b/InfosysPublisher/WinLogin.xaml
index b06874f..4525ac8 100644
--- a/InfosysPublisher/WinLogin.xaml
+++ b/InfosysPublisher/WinLogin.xaml
@@ -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>
diff --git a/InfosysPublisher/WinLogin.xaml.cs b/InfosysPublisher/WinLogin.xaml.cs
index c0ed3fe..5696fdc 100644
--- a/InfosysPublisher/WinLogin.xaml.cs
+++ b/InfosysPublisher/WinLogin.xaml.cs
@@ -18,7 +18,8 @@ namespace InfosysPublisher
         public WinLogin()
         {
             InitializeComponent();
-
+            
+            tblVersion.Text = $"Version: {App.CurrentVersion}";
         }
 
         private async void Login_OnClick(object sender, RoutedEventArgs e)