Merge commit '19eb5b211011952d579233d4518ee364a1e88136' into Henraux/Switch_jpg_DataBase

CurrMachWindow/CurrMachWindowVM.vb

@@ -456,28 +456,28 @@ Public Class CurrMachWindowVM
                ' --- DRILL ---
                CreateMachiningList(MCH_MY.DRILLING, m_AvailableDrillList, m_CurrDrillingList)
                ' Se la lista è vuota cancello la lavorazione corrente di questo tipo
-               If m_CurrDrillingList.Count <= 1 Then
+               If m_CurrDrillingList.Count = 0 Then
                   CurrentMachine.sCurrDrilling = String.Empty
                End If
 
                ' --- MILL ---
                CreateMachiningList(MCH_MY.MILLING, m_AvailableMillList, m_CurrMillingList)
                ' Se la lista è vuota cancello la lavorazione corrente di questo tipo
-               If m_CurrMillingList.Count <= 1 Then
+               If m_CurrMillingList.Count = 0 Then
                   CurrentMachine.sCurrMilling = String.Empty
                End If
 
                ' --- SCASSO ---
                CreateMachiningList(MCH_MY.POCKETING, m_AvailableMillList, m_CurrPocketingList)
                ' Se la lista è vuota cancello la lavorazione corrente di questo tipo
-               If m_CurrPocketingList.Count <= 1 Then
+               If m_CurrPocketingList.Count = 0 Then
                   CurrentMachine.sCurrPocketing = String.Empty
                End If
 
                ' --- WATERJET ---
                CreateMachiningList(MCH_MY.WATERJETTING, m_AvailableWaterjetList, m_CurrWaterjettingList)
                ' Se la lista è vuota cancello la lavorazione corrente di questo tipo
-               If m_CurrWaterjettingList.Count <= 1 Then
+               If m_CurrWaterjettingList.Count = 0 Then
                   CurrentMachine.sCurrWaterJetting = String.Empty
                End If
                m_CurrWaterjettingQualityList = New List(Of String)(CurrentMachine.Qualities)
@@ -487,28 +487,28 @@ Public Class CurrMachWindowVM
                ' --- DRILL ---
                CreateMachiningList(MCH_MY.DRILLING, m_AvailableDrillList, m_CurrDrillingList)
                ' Se la lista è vuota cancello la lavorazione corrente di questo tipo
-               If m_CurrDrillingList.Count <= 1 Then
+               If m_CurrDrillingList.Count = 0 Then
                   CurrentMachine.sCurrDrilling = String.Empty
                End If
 
                ' --- MILL ---
                CreateMachiningList(MCH_MY.MILLING, m_AvailableMillList, m_CurrMillingList)
                ' Se la lista è vuota cancello la lavorazione corrente di questo tipo
-               If m_CurrMillingList.Count <= 1 Then
+               If m_CurrMillingList.Count = 0 Then
                   CurrentMachine.sCurrMilling = String.Empty
                End If
 
                ' --- SCASSO ---
                CreateMachiningList(MCH_MY.POCKETING, m_AvailableMillList, m_CurrPocketingList)
                ' Se la lista è vuota cancello la lavorazione corrente di questo tipo
-               If m_CurrPocketingList.Count <= 1 Then
+               If m_CurrPocketingList.Count = 0 Then
                   CurrentMachine.sCurrPocketing = String.Empty
                End If
 
                ' --- WATERJET ---
                CreateMachiningList(MCH_MY.WATERJETTING, m_AvailableWaterjetList, m_CurrWaterjettingList)
                ' Se la lista è vuota cancello la lavorazione corrente di questo tipo
-               If m_CurrWaterjettingList.Count <= 1 Then
+               If m_CurrWaterjettingList.Count = 0 Then
                   CurrentMachine.sCurrWaterJetting = String.Empty
                End If
                m_CurrWaterjettingQualityList = New List(Of String)(CurrentMachine.Qualities)

DxfImportWindow/DxfImportWindowVM.vb

@@ -646,13 +646,9 @@ Public Class DxfImportWindowVM
       Case FT.DXF
          ' recupero unità di misura del file
          Dim dScale As Double = If(m_MmIsChecked, ONEMM, ONEINCH)
-            ' Importo file DXF
-            If Not EgtImportDxf(m_sFilePath, dScale) Then Return False
-            ' Riporto al piano tutte le superifici
-            EgtSelectAll()
-            EgtScale(GDB_ID.SEL, Frame3d.GLOB, 1, 1, 0)
-            EgtDeselectAll()
-         Case FT.NGE
+         ' Importo file DXF
+         If Not EgtImportDxf(m_sFilePath, dScale) Then Return False
+      Case FT.NGE
          ' Carico Nge
          If Not EgtOpenFile(m_sFilePath) Then Return False
          ' Filtro Nge

MachinePanel/MachinePanelV.xaml

@@ -9,19 +9,17 @@
             Height="20" Width="150"/>-->
 
     <Button Command="{Binding ToolDbCommand}" ToolTip="{Binding ToolDBToolTip}" Style="{StaticResource ToolBar_Button}">
-        <Image Source="/Resources/NewIcons/DB-lavorazioni.png" Stretch="Uniform"/>
+        <Image Source="/Resources/NewIcons/DB-utensili.png" Stretch="Uniform"/>
     </Button>
     <Button Command="{Binding MachDbCommand}" ToolTip="{Binding MachiningDbToolTip}" Style="{StaticResource ToolBar_Button}">
-        <Image Source="/Resources/NewIcons/DB-utensili.png" Stretch="UniformToFill"/>
+        <Image Source="/Resources/NewIcons/DB-lavorazioni.png" Stretch="UniformToFill"/>
+    </Button>
+    <Button Command="{Binding MachOptionsCommand}" ToolTip="{Binding OptionsToolTip}" Style="{StaticResource ToolBar_Button}">
+        <Image Source="/Resources/TopCommandBar/Options.png" Stretch="Uniform" />
     </Button>
     <Button Command="{Binding SetUpCommand}" ToolTip="{Binding SetUpToolTip}" Style="{StaticResource ToolBar_Button}">
         <Image Source="/Resources/NewIcons/ToolChangerPos.png" Stretch="Uniform" />
     </Button>
     <Button Command="{Binding WaterjetDbCommand}" ToolTip="{Binding WaterjetDbToolTip}"
-           Style="{StaticResource ToolBar_Button}" Visibility="{Binding WjDb_Visibility}">
-        <Image Source="/Resources/NewIcons/DB-WJ.png" Stretch="UniformToFill"/>
-    </Button>
-    <Button Command="{Binding MachOptionsCommand}" ToolTip="{Binding OptionsToolTip}" Style="{StaticResource ToolBar_Button}">
-        <Image Source="/Resources/TopCommandBar/Options.png" Stretch="Uniform" />
-    </Button>
+           Style="{StaticResource ToolBar_TextButton}" Width="70" Content="{Binding WaterjetDbMsg}" Visibility="{Binding WjDb_Visibility}"/>
 </DockPanel>

MachinePanel/MyMachinePanelVM.vb

@@ -148,7 +148,6 @@ Public Class MyMachinePanelVM
 
       ' Definisco lo stile della ComboBox
       ToolDbWindowVM.BackgroundCmBxTxBl = DirectCast(New System.Windows.Media.BrushConverter().ConvertFromString("#1C1D22"), Brush)
-      ToolDbWindowVM.BackgroundListCmBxTxBl = DirectCast(New System.Windows.Media.BrushConverter().ConvertFromString("#1C1D22"), Brush)
       ToolDbWindowVM.ForegroundCmBxTxBl = Brushes.White
       ToolDbWindowVM.BorderBrushCmBxTxBl = Brushes.Black
       ToolDbWindowVM.BorderThicknessCmBxTxBl = New Thickness(1)
@@ -242,7 +241,6 @@ Public Class MyMachinePanelVM
 
       ' Definisco lo stile della ComboBox
       MachDbWindowVM.BackgroundCmBxTxBl = DirectCast(New System.Windows.Media.BrushConverter().ConvertFromString("#1C1D22"), Brush)
-      MachDbWindowVM.BackgroundListCmBxTxBl = DirectCast(New System.Windows.Media.BrushConverter().ConvertFromString("#1C1D22"), Brush)
       MachDbWindowVM.ForegroundCmBxTxBl = Brushes.White
       MachDbWindowVM.BorderBrushCmBxTxBl = Brushes.Black
       MachDbWindowVM.BorderThicknessCmBxTxBl = New Thickness(1)

MainWindow/MainWindowM.vb

@@ -10,6 +10,7 @@ Public Class MainWindowM
 #Region "FIELDS"
 
    Friend m_SlabDB As Boolean = False
+   Friend m_SlabDBMode As Integer = 0
 
    Private m_sDataRoot As String = String.Empty
    Friend ReadOnly Property sDataRoot As String
@@ -223,8 +224,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, 2602, 1, m_nKeyLevel) And
-                            EgtGetKeyOptions(9423, 2602, 1, m_nKeyOptions)
+      Dim bKey As Boolean = EgtGetKeyLevel(9423, 2509, 1, m_nKeyLevel) And
+                            EgtGetKeyOptions(9423, 2509, 1, m_nKeyOptions)
       ' Verifico abilitazione prodotto
       Dim bProd As Boolean = GetKeyOption(KEY_OPT.OFFICE_BASE)
       ' Inizializzazione generale di EgtInterface
@@ -282,10 +283,11 @@ Public Class MainWindowM
       GetMainPrivateProfileString(S_LUA, K_BASELIB, "EgtBase", sLuaBaseLib)
       EgtLuaRequire(sLuaBaseLib)
       ' abilitazione DB
-      m_SlabDB = (GetMainPrivateProfileInt(S_GENERAL, "SlabDB", 0) <> 0)
+      m_SlabDBMode = GetMainPrivateProfileInt(S_GENERAL, "SlabDB", 0)
+      m_SlabDB = (m_SlabDBMode <> 0)
       ' Leggo nome cartella delle foto
       GetMainPrivateProfileString(S_GENERAL, K_PHOTODIR, sDataRoot & "\Data", m_sPhotoDir)
-      ' Creo connessione al Db
+      ' Creo connessione al Db se impostato di default come origine dati
       If m_SlabDB And Not ManageDb.ConnectToDb(m_sPhotoDir & "\" & DB_FILENAME) Then
          EgtOutLog("Error connecting to DB")
          MessageBox.Show(EgtMsg(92000 + 1), EgtMsg(MSG_EGTMSGBOX + 15), MessageBoxButton.OK, MessageBoxImage.Error)

My Project/AssemblyInfo.vb

@@ -69,6 +69,6 @@ Imports System.Windows
 ' by using the '*' as shown below:
 ' <Assembly: AssemblyVersion("1.0.*")> 
 
-<Assembly: AssemblyVersion("2.6.2.2")>
-<Assembly: AssemblyFileVersion("2.6.2.2")>
+<Assembly: AssemblyVersion("2.5.9.5")>
+<Assembly: AssemblyFileVersion("2.5.9.5")>
 

OmagOFFICE.vbproj

@@ -128,8 +128,8 @@
     <ApplicationManifest>My Project\app.manifest</ApplicationManifest>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="DotNetZip">
-      <HintPath>..\..\EgtProg\OmagOFFICE\DotNetZip.dll</HintPath>
+    <Reference Include="DotNetZip, Version=1.16.0.0, Culture=neutral, PublicKeyToken=6583c7c814667745, processorArchitecture=MSIL">
+      <HintPath>packages\DotNetZip.1.16.0\lib\net40\DotNetZip.dll</HintPath>
     </Reference>
     <Reference Include="EgtPHOTOLib, Version=2.3.1.1, Culture=neutral, processorArchitecture=x86">
       <SpecificVersion>False</SpecificVersion>
@@ -960,9 +960,6 @@
   <ItemGroup>
     <Resource Include="Resources\NewIcons\Linea-Copia.png" />
   </ItemGroup>
-  <ItemGroup>
-    <Resource Include="Resources\NewIcons\DB-WJ.png" />
-  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.VisualBasic.targets" />
   <PropertyGroup>
     <PostBuildEvent>IF "$(PlatformName)"=="x86" IF "$(ConfigurationName)" == "Release" copy $(TargetPath) c:\EgtProg\OmagOFFICE\OmagOFFICER32.exe

OptionPanel/MachiningTab/SplitModeV.xaml

@@ -378,7 +378,7 @@
                   ExpandDirection="Down" IsExpanded="{Binding bDirectSpLitCut_IsExpanded}">
 
                 <StackPanel HorizontalAlignment="Center" Orientation="Horizontal" Margin="0,2.5,0,1">
-                    <StackPanel Grid.Column="1" Margin="1,0,0,0">
+                    <StackPanel Visibility="{Binding AllExtendBtnVisibility}" Grid.Column="1" Margin="1,0,0,0">
                         <ToggleButton ToolTip="Crea" 
                        Style="{StaticResource Split_ToggleButton_Img}"
                        IsChecked="{Binding CreateCut_IsChecked}"
@@ -393,7 +393,7 @@
                         </ToggleButton>
                     </StackPanel>
 
-                    <StackPanel Grid.Column="1" Margin="1,0,0,0">
+                    <StackPanel Visibility="{Binding AllExtendBtnVisibility}" Grid.Column="1" Margin="1,0,0,0">
                         <ToggleButton ToolTip="Elimina" 
                        Style="{StaticResource Split_ToggleButton_Img}"
                        IsChecked="{Binding RemoveCut_IsChecked}"
@@ -408,7 +408,7 @@
                         </ToggleButton>
                     </StackPanel>
 
-                    <StackPanel Grid.Column="1" Margin="1,0,0,0">
+                    <StackPanel Visibility="{Binding AllExtendBtnVisibility}" Grid.Column="1" Margin="1,0,0,0">
                         <ToggleButton ToolTip="Copia" 
                        Style="{StaticResource Split_ToggleButton_Img}"
                        IsChecked="{Binding CreateParallelCut_IsChecked}"
@@ -422,7 +422,7 @@
                             </StackPanel>
                         </ToggleButton>
                     </StackPanel>
-                    <StackPanel Grid.Column="1" Margin="1,0,0,0">
+                    <StackPanel Visibility="{Binding AllExtendBtnVisibility}" Grid.Column="1" Margin="1,0,0,0">
                         <ToggleButton ToolTip="Muovi" 
                        Style="{StaticResource Split_ToggleButton_Img}"
                        IsChecked="{Binding ModifyCut_IsChecked}"
@@ -492,25 +492,7 @@
                             </Button>
                         </StackPanel>
 
-                        <StackPanel Margin="1,0,0,0">
-                            <Button ToolTip="{Binding ModifStartMsg}"
-                       Style="{StaticResource Split_Button_Img}"
-                       Command="{Binding ModifStartCommand}"
-                       HorizontalAlignment="Center"
-                       VerticalAlignment="Center"            
-                       Margin="0,0,0,0">
-                                <StackPanel>
-                                    <Image Source="/Resources/NewIcons/Modifica-Inizio.png"
-                            Style="{StaticResource ImgButton}"/>
-                                </StackPanel>
-                            </Button>
-                            
-                        </StackPanel>
-
-                    </UniformGrid>
-
-                    <UniformGrid Columns="4" Margin="0,0,0,1">
-                        <StackPanel Margin="1,0,0,0" Visibility="{Binding OutCenEndBtnVisibility}">
+                        <StackPanel Visibility="{Binding OutCenEndBtnVisibility}" Margin="1,0,0,0">
                             <Button ToolTip="{Binding OutCenEndMsg}"
                        Style="{StaticResource Split_Button_Img}"
                        Command="{Binding OutCenEndCommand}"
@@ -524,6 +506,10 @@
                             </Button>
                         </StackPanel>
 
+                    </UniformGrid>
+
+                    <UniformGrid Columns="4" Margin="0,0,0,1">
+
                         <StackPanel Visibility="{Binding AllOutEndBtnVisibility}" Margin="1,0,0,0">
                             <Button ToolTip="{Binding AllOutEndMsg}"
                        Style="{StaticResource Split_Button_Img}"
@@ -552,7 +538,20 @@
                             </Button>
                         </StackPanel>
 
-                        
+                        <StackPanel Margin="1,0,0,0">
+                            <Button ToolTip="{Binding ModifStartMsg}"
+                       Style="{StaticResource Split_Button_Img}"
+                       Command="{Binding ModifStartCommand}"
+                       HorizontalAlignment="Center"
+                       VerticalAlignment="Center"            
+                       Margin="0,0,0,0">
+                                <StackPanel>
+                                    <Image Source="/Resources/NewIcons/Modifica-Inizio.png"
+                            Style="{StaticResource ImgButton}"/>
+                                </StackPanel>
+                            </Button>
+                        </StackPanel>
+
                         <StackPanel Margin="1,0,0,0">
                             <Button ToolTip="{Binding ModifEndMsg}"
                        Style="{StaticResource Split_Button_Img}"

OptionPanel/RawPartTab/RawPartTabVM.vb

@@ -2224,10 +2224,23 @@ Public Class RawPartTabVM
       Dim sSlabName As String = ""
       Dim sMat As String = ""
 
-      ' cancello eventuali nome di materiali da DB
-      SetMaterialFromDB(String.Empty)
+      Dim bReadFromDB As Boolean = False
+      ' abilitazione DB
+      Select Case OmagOFFICEMap.refMainWindowVM.MainWindowM.m_SlabDBMode
+         Case 0
+            ' il database non è stato connesso
+         Case 1
+            ' il database è stato connesso, la lettura è attiva
+            bReadFromDB = True
+         Case 2
+            ' il database è stato connesso, la lettura è attivabile con il pulsante Shift 
+            If (Keyboard.IsKeyDown(Key.LeftShift) Or Keyboard.IsKeyDown(Key.RightShift)) And OmagOFFICEMap.refMainWindowVM.MainWindowM.m_SlabDB Then
+               ' verifico che esista una connessione con il DataBase di OmagPHOTO
+               bReadFromDB = True
+            End If
+      End Select
 
-      If OmagOFFICEMap.refMainWindowVM.MainWindowM.m_SlabDB Then
+      If OmagOFFICEMap.refMainWindowVM.MainWindowM.m_SlabDB And bReadFromDB Then
          ' recupero il nome del progetto corrente
          Dim sFileProject As String = String.Empty
          EgtGetCurrFilePath(sFileProject)
@@ -2298,24 +2311,16 @@ Public Class RawPartTabVM
                End If
             Next
             If Not bMaterialExists Then
+               ' mostro a video il nome del materiale importato in una casella di testa separata
                EstCalc.SetMaterialPhoto(LocalSlab.Material)
                SetMaterialFromDB(LocalSlab.Material)
+            Else
+               SetMaterialFromDB(String.Empty)
             End If
          End If
          ' 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()

Project/ProjectV.xaml

@@ -11,40 +11,14 @@
     </DockPanel>
 
     <DockPanel x:Name="TOPTRAY" DockPanel.Dock="Top" Background="Transparent">
-        <!--<StackPanel Orientation="Horizontal" HorizontalAlignment="Right" Width="{Binding}">-->
-        <!--<DockPanel>
-            <OmagOFFICE:MachinePanelV DataContext="{StaticResource MachinePanelVM}" DockPanel.Dock="Left"/>
-            <OmagOFFICE:VeinMatchPanelV DataContext="{StaticResource VeinMatchPanelVM}" />
-            <OmagOFFICE:PrintPanelV DataContext="{StaticResource PrintPanelVM}" />
-            <OmagOFFICE:ShowPanelV DataContext="{StaticResource ShowPanelVM}" DockPanel.Dock="Right"/>
-            <OmagOFFICE:ViewPanelV DataContext="{StaticResource ViewPanelVM}" DockPanel.Dock="Right"/>
-            <OmagOFFICE:InstrumentPanelV DataContext="{StaticResource InstrumentPanelVM}" DockPanel.Dock="Right"/>
-        </DockPanel>-->
-        <Grid>
-            <Grid.ColumnDefinitions>
-                <ColumnDefinition Width="7*"/>
-                <ColumnDefinition Width="1*"/>
-                <ColumnDefinition Width="1*"/>
-                <ColumnDefinition Width="19.75*"/>
-                <ColumnDefinition Width="7*"/>
-                <ColumnDefinition Width="3*"/>
-                <ColumnDefinition Width="1*"/>
-                <ColumnDefinition Width="0.25*"/>
-            </Grid.ColumnDefinitions>
-            <OmagOFFICE:MachinePanelV Grid.Column="0" DataContext="{StaticResource MachinePanelVM}"/>
-            <OmagOFFICE:VeinMatchPanelV Grid.Column="1" DataContext="{StaticResource VeinMatchPanelVM}"/>
-            <OmagOFFICE:PrintPanelV Grid.Column="2" DataContext="{StaticResource PrintPanelVM}"/>
-            <OmagOFFICE:ShowPanelV Grid.Column="5" DataContext="{StaticResource ShowPanelVM}"/>
-            <OmagOFFICE:ViewPanelV Grid.Column="4" DataContext="{StaticResource ViewPanelVM}"/>
-            <OmagOFFICE:InstrumentPanelV  Grid.Column="6" DataContext="{StaticResource InstrumentPanelVM}"/>
-        </Grid>
-        <!--<OmagOFFICE:MachinePanelV DataContext="{StaticResource MachinePanelVM}"/>
-            <OmagOFFICE:VeinMatchPanelV DataContext="{StaticResource VeinMatchPanelVM}"/>
-        <OmagOFFICE:PrintPanelV DataContext="{StaticResource PrintPanelVM}"/>
+        <StackPanel Orientation="Horizontal" HorizontalAlignment="Right" Width="{Binding}">
             <OmagOFFICE:ShowPanelV DataContext="{StaticResource ShowPanelVM}"/>
             <OmagOFFICE:ViewPanelV DataContext="{StaticResource ViewPanelVM}"/>
-            <OmagOFFICE:InstrumentPanelV DataContext="{StaticResource InstrumentPanelVM}"/>-->
-        <!--</StackPanel>-->
+            <OmagOFFICE:InstrumentPanelV DataContext="{StaticResource InstrumentPanelVM}"/>
+            <OmagOFFICE:PrintPanelV DataContext="{StaticResource PrintPanelVM}"/>
+            <OmagOFFICE:VeinMatchPanelV DataContext="{StaticResource VeinMatchPanelVM}"/>
+            <OmagOFFICE:MachinePanelV DataContext="{StaticResource MachinePanelVM}"/>
+        </StackPanel>
     </DockPanel>
 
     <DockPanel x:Name="BOTTOMTRAY" DockPanel.Dock="Bottom" Background="Transparent">
@@ -62,5 +36,5 @@
     </DockPanel>
 
     <OmagOFFICE:SceneHostV />
-
+   
 </DockPanel>

Utility/OmagOFFICEDictionary.xaml

@@ -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="#1C1D22" Offset="0.05"/>
+        <GradientStop Color="#484D55" Offset="0.05"/>
         <GradientStop Color="#1C1D22" Offset="0.07"/>
     </LinearGradientBrush>
 
@@ -1127,13 +1127,11 @@
     </Style>
 
     <Style TargetType="{x:Type ComboBox}">
-        <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="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="ScrollViewer.HorizontalScrollBarVisibility" Value="Auto"/>
         <Setter Property="ScrollViewer.VerticalScrollBarVisibility" Value="Auto"/>
         <Setter Property="Padding" Value="4,3"/>