Modificata dimensione bottoni Ante

Merge branch 'master' into NicolaP
Cambio versione
2022-06-27 17:25:50 +02:00 · 2022-06-27 15:47:59 +02:00 · 2022-06-27 15:46:45 +02:00 · 2022-06-27 15:43:56 +02:00 · 2022-06-27 15:43:22 +02:00
3 changed files with 13 additions and 13 deletions
@@ -415,17 +415,17 @@

            <Grid Margin="0,0,0,2" >
                <Grid.ColumnDefinitions>
-                    <ColumnDefinition Width="2*"/>
+                    <ColumnDefinition Width="0.5*"/>
                    <ColumnDefinition Width="20"/>
-                    <ColumnDefinition Width="10"/>
-                    <ColumnDefinition Width="{Binding}"/>
-                    <ColumnDefinition Width="10"/>
+                    <ColumnDefinition Width="7"/>
+                    <ColumnDefinition Width="0.5*"/>
+                    <ColumnDefinition Width="7"/>
                    <ColumnDefinition Width="Auto"/>
-                    <ColumnDefinition Width="10"/>
-                    <ColumnDefinition Width="{Binding}"/>
-                    <ColumnDefinition Width="10"/>
+                    <ColumnDefinition Width="7"/>
+                    <ColumnDefinition Width="0.5*"/>
+                    <ColumnDefinition Width="7"/>
                    <ColumnDefinition Width="20"/>
-                    <ColumnDefinition Width="2*"/>
+                    <ColumnDefinition Width="0.5*"/>
                </Grid.ColumnDefinitions>
                <Grid.RowDefinitions>
                    <RowDefinition Height="3*"/>
@@ -566,7 +566,7 @@
                           Command="{Binding DataContext.JambBtnCommand,
                                             RelativeSource={RelativeSource AncestorType={x:Type UserControl}}}" 
                           CommandParameter="{Binding Type}"
-                           Width="100"
+                           Width="140"
                           Style="{StaticResource DoorButton}"  
                           IsEnabled="{Binding IsChecked, ElementName=DoorChk}"     
                           Grid.Column="0" />
@@ -57,8 +57,8 @@ Friend Class MainWindowModel
      EgtUILib.GetPrivateProfileString(S_LICENCE, K_KEY, "", sKey, sLicFile)
      EgtSetKey(sKey)
      ' Recupero livello e opzioni della chiave
-      Dim bKey As Boolean = EgtGetKeyLevel(3279, 2404, 1, IniFile.m_nKeyLevel) And
-                            EgtGetKeyOptions(3279, 2404, 1, IniFile.m_nKeyOptions)
+      Dim bKey As Boolean = EgtGetKeyLevel(3279, 2406, 1, IniFile.m_nKeyLevel) And
+                            EgtGetKeyOptions(3279, 2406, 1, IniFile.m_nKeyOptions)
      'Inizializzazione generale di EgtInterface
      m_nDebug = GetMainPrivateProfileInt(S_GENERAL, K_DEBUG, 0)
      Dim sLogFile As String = IniFile.m_sTempDir & "\" & GENLOG_FILE_NAME.Replace("#", m_nInstance.ToString())
@@ -72,5 +72,5 @@ Imports System.Windows
 ' by using the '*' as shown below:
 ' <Assembly: AssemblyVersion("1.0.*")> 

-<Assembly: AssemblyVersion("2.4.4.1")>
-<Assembly: AssemblyFileVersion("2.4.4.1")>
+<Assembly: AssemblyVersion("2.4.6.1")>
+<Assembly: AssemblyFileVersion("2.4.6.1")>
Author	SHA1	Message	Date
NicolaP	10bf8719bd	Modificata dimensione bottoni Ante	2022-06-27 17:25:50 +02:00
NicolaP	9b0ce1a094	Merge branch 'master' into NicolaP	2022-06-27 15:47:59 +02:00
NicolaP	47e84044f9	Cambio versione	2022-06-27 15:46:45 +02:00
NicolaP	a82ded8b77	Merge commit '915e3f32db96319bf6d856f21f3a7b02fd9fc1bd'	2022-06-27 15:43:56 +02:00
NicolaP	915e3f32db	Merge branch 'Features/Manage_ParamOnOff_In_Hardware_DDF_Param' into NicolaP	2022-06-27 15:43:22 +02:00