Compare commits
4 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| c534b459ae | |||
| d7522c4eb8 | |||
| 1f7a918ac2 | |||
| e4a87dc475 |
@@ -223,8 +223,8 @@ Public Class MainWindowM
|
||||
' Verifico abilitazione nesting automatico
|
||||
m_bAutoNestOption = Not String.IsNullOrWhiteSpace( sNestKey)
|
||||
' Recupero livello e opzioni della chiave
|
||||
Dim bKey As Boolean = EgtGetKeyLevel(9423, 2601, 1, m_nKeyLevel) And
|
||||
EgtGetKeyOptions(9423, 2601, 1, m_nKeyOptions)
|
||||
Dim bKey As Boolean = EgtGetKeyLevel(9423, 2602, 1, m_nKeyLevel) And
|
||||
EgtGetKeyOptions(9423, 2602, 1, m_nKeyOptions)
|
||||
' Verifico abilitazione prodotto
|
||||
Dim bProd As Boolean = GetKeyOption(KEY_OPT.OFFICE_BASE)
|
||||
' Inizializzazione generale di EgtInterface
|
||||
|
||||
@@ -69,6 +69,6 @@ Imports System.Windows
|
||||
' by using the '*' as shown below:
|
||||
' <Assembly: AssemblyVersion("1.0.*")>
|
||||
|
||||
<Assembly: AssemblyVersion("2.6.1.1")>
|
||||
<Assembly: AssemblyFileVersion("2.6.1.1")>
|
||||
<Assembly: AssemblyVersion("2.6.2.2")>
|
||||
<Assembly: AssemblyFileVersion("2.6.2.2")>
|
||||
|
||||
|
||||
@@ -2305,6 +2305,17 @@ Public Class RawPartTabVM
|
||||
' aggiungo la nuova lastra
|
||||
OmagOFFICEMap.refMachGroupPanelVM.SlabNameListCurr.Add(sSlabNameDB)
|
||||
EgtPHOTOLib.PhotoMap.refOptionPanelVM.SetAssignedSlab(sSlabNameDB)
|
||||
|
||||
' Provo ad assegnare il nome della macchinata
|
||||
Dim sName As String = LocalSlab.Id
|
||||
EgtGetMachGroupNewName(sName)
|
||||
If sName <> LocalSlab.Id Then
|
||||
EgtOutLog("Nome lastra (Id lastra) già presente nell'elenco delle macchinate correnti!")
|
||||
Else
|
||||
OmagOFFICEMap.refMachGroupPanelVM.SelectedMachGroup.SetName(LocalSlab.Id)
|
||||
EgtChangeMachGroupName(EgtGetCurrMachGroup, LocalSlab.Id)
|
||||
End If
|
||||
|
||||
Else
|
||||
' Apro dialogo per scelta immagine
|
||||
Dim PhotoDlg As New Microsoft.Win32.OpenFileDialog()
|
||||
|
||||
@@ -68,7 +68,7 @@
|
||||
|
||||
<!--Colore del contorno quando il Mouse è sopra la TextBox-->
|
||||
<LinearGradientBrush x:Key="BrushBorderIsMouseOverTText" EndPoint="0,20" MappingMode="Absolute" StartPoint="0,0">
|
||||
<GradientStop Color="#484D55" Offset="0.05"/>
|
||||
<GradientStop Color="#1C1D22" Offset="0.05"/>
|
||||
<GradientStop Color="#1C1D22" Offset="0.07"/>
|
||||
</LinearGradientBrush>
|
||||
|
||||
@@ -1127,11 +1127,13 @@
|
||||
</Style>
|
||||
|
||||
<Style TargetType="{x:Type ComboBox}">
|
||||
<Setter Property="FocusVisualStyle" Value="{StaticResource ComboBoxFocusVisual}"/>
|
||||
<Setter Property="Foreground" Value="{DynamicResource {x:Static SystemColors.WindowTextBrushKey}}"/>
|
||||
<Setter Property="Background" Value="{StaticResource ButtonNormalBackground}"/>
|
||||
<Setter Property="BorderBrush" Value="{StaticResource ButtonNormalBorder}"/>
|
||||
<Setter Property="BorderThickness" Value="1"/>
|
||||
<Setter Property="Background" Value="{StaticResource Omag_Black}"/>
|
||||
<Setter Property="Foreground" Value="{StaticResource Omag_White}"/>
|
||||
<Setter Property="BorderThickness" Value="{StaticResource BorderBtn_Thickness}"/>
|
||||
<Setter Property="VerticalContentAlignment" Value="Center"/>
|
||||
<Setter Property="Height" Value="25" />
|
||||
<Setter Property="Width" Value="Auto" />
|
||||
|
||||
<Setter Property="ScrollViewer.HorizontalScrollBarVisibility" Value="Auto"/>
|
||||
<Setter Property="ScrollViewer.VerticalScrollBarVisibility" Value="Auto"/>
|
||||
<Setter Property="Padding" Value="4,3"/>
|
||||
|
||||
Reference in New Issue
Block a user