Aggiornamento versione 2.7g1

- ricompilazione con cambio versione.

AboutBoxWindow/AboutBoxV.xaml

@@ -31,7 +31,7 @@
                <ColumnDefinition Width="1*"/>
             </Grid.ColumnDefinitions>
             <Border Name="LogoBrd" Grid.Column="1" Background="White">
-               <Image Source="/Resources/LogoOmag.jpg" Stretch="Uniform"/>
+               <Image Source="/Resources/AboutBoxImage.png" Stretch="Uniform"/>
             </Border>
          </Grid>
          <TextBlock Name="DescriptionLbl" Grid.Column="1" Grid.Row="3" HorizontalAlignment="Center"

Application.xaml.vb

@@ -1,4 +1,6 @@
-Class Application
+Imports EgtPHOTOLib
+
+Class Application
 
    ' Application-level events, such as Startup, Exit, and DispatcherUnhandledException
    ' can be handled in this file.
@@ -8,7 +10,12 @@
       ' Creo la View principale
       Me.MainWindow = New MainWindowV
       ' Mostro la View principale
+      If PhotoMap.ContinueApplication Then
          Me.MainWindow.Show()
+      Else
+         End
+      End If
+
    End Sub
 
 End Class

Constants/ConstIni.vb

@@ -11,6 +11,10 @@
 '
 '----------------------------------------------------------------------------
 
+Imports System.Data
+Imports EgtPHOTOLib
+Imports EgtWPFLib5
+
 Module ConstIni
 
    Public Const INI_FILE_NAME As String = "OmagPHOTO.ini"
@@ -89,6 +93,13 @@ Module ConstIni
    Public Const K_MINLNCOLOR As String = "MinLnColor"
    Public Const K_MAJLNCOLOR As String = "MajLnColor"
 
+   Public Const S_AUTOCLICK As String = "AutoClick"
+   Public Const K_CLICKDIR As String = "ClickDir"
+   Public Const K_STATE As String = "State"
+   Public Const K_AUTOMATERIAL As String = "Material"
+   Public Const K_THICKNESS As String = "Thickness"
+   Public Const K_WAREHAOUSE As String = "WareHouse"
+
    Public Const S_CAMERA As String = "Camera"
    Public Const K_CAM_COUNT As String = "Count"
    Public Const K_CAM_EXEPATH As String = "ExePath"

MainWindow/MainWindowM.vb

@@ -5,6 +5,7 @@ Imports System.IO
 Imports EgtUILib
 Imports EgtWPFLib5
 Imports EgtPHOTOLib
+Imports System.Windows.Forms.Integration
 
 Public Class MainWindowM
 
@@ -14,6 +15,12 @@ Public Class MainWindowM
    Private m_TimerIsBusy As Boolean = False
    Private m_RefreshTimer As New DispatcherTimer
 
+   ' Per lettura modifica direttorio
+   Private fsWatch As FileSystemWatcher
+   Private m_RefreshNewFileClick As New DispatcherTimer
+   Private m_bNewFileClick As Boolean = False
+   Private m_sNewFileClickPath As String = String.Empty
+
    Private m_sDataRoot As String = String.Empty
    Friend ReadOnly Property sDataRoot As String
       Get
@@ -202,8 +209,8 @@ Public Class MainWindowM
       Dim bNetHwKey As Boolean = (GetMainPrivateProfileInt(S_GENERAL, K_NETKEY, 0) = 1)
       EgtSetNetHwKey(bNetHwKey)
       ' Recupero livello e opzioni della chiave
-      Dim bKey As Boolean = EgtGetKeyLevel(9423, 2407, 1, m_nKeyLevel) And
+      Dim bKey As Boolean = EgtGetKeyLevel(9423, 2707, 1, m_nKeyLevel) And
-                            EgtGetKeyOptions(9423, 2407, 1, m_nKeyOptions)
+                            EgtGetKeyOptions(9423, 2707, 1, m_nKeyOptions)
       ' Verifico abilitazione prodotto
       Dim bProd As Boolean = GetKeyOption(KEY_OPT.PHOTO_BASE)
       ' Inizializzazione generale di EgtInterface
@@ -278,12 +285,10 @@ Public Class MainWindowM
          MessageBox.Show(EgtMsg(MSG_OMAGPHOTO + 1) & EgtMsg(MSG_OMAGPHOTO + 2), EgtMsg(MSG_EGTMSGBOX + 15), MessageBoxButton.OK, MessageBoxImage.Error)
          End
       End If
-
-      Dim sLastBlock As String = String.Empty
-
       ' Info su opzioni chiave
       EgtOutLog("KeyOptions : " & bKey.ToString() & " " & m_nKeyOptions.ToString() & " " & bProd.ToString())
       ' Imposto parametri EgtPHOTOLib
+      EgtPHOTOLib.MainData.SetDebugLevel(m_nDebug)
       EgtPHOTOLib.MainData.SetConfigDir(m_sConfigDir)
       EgtPHOTOLib.MainData.SetKeyLevel(m_nKeyLevel)
       EgtPHOTOLib.MainData.SetKeyOptions(m_nKeyOptions)
@@ -295,6 +300,7 @@ Public Class MainWindowM
       EgtPHOTOLib.MainData.SetZebraPrinterExe(m_ZebraUtilitiesExe)
       EgtPHOTOLib.MainData.SetPrinterVisibility(m_PrinterIsVisible)
       EgtPHOTOLib.MainData.SetCapsLock(m_bCapsLock)
+      Dim sLastBlock As String = String.Empty
       If GetMainPrivateProfileString(S_GENERAL, "LastBlock", "", sLastBlock) <> 0 Then EgtPHOTOLib.MainData.SetLastBlock(sLastBlock)
       Dim sIdKey As String = String.Empty
       EgtGetKeyInfo(sIdKey)
@@ -303,11 +309,88 @@ Public Class MainWindowM
       AddHandler m_RefreshTimer.Tick, AddressOf RefreshTimer_Tick
       m_RefreshTimer.Interval = TimeSpan.FromMilliseconds(2000)
       m_RefreshTimer.Start()
+      ' sec onfigurato lancio il controllo di uno specifico direttorio per leggere quando scattare una nuova foto
+      Dim sClidkDir As String = String.Empty
+      Dim bEnableLineProduction As Boolean = GetMainPrivateProfileString(S_AUTOCLICK, K_CLICKDIR, "", sClidkDir) <> 0
+      If bEnableLineProduction Then
+         fsWatch = New FileSystemWatcher(sClidkDir) With {.EnableRaisingEvents = True}
+         'fsWatch.EnableRaisingEvents = True
+         AddHandler fsWatch.Created, AddressOf AutoClick
+         AddHandler fsWatch.Changed, AddressOf AutoClick
+         AddHandler fsWatch.Renamed, AddressOf AutoClick
+         m_bNewFileClick = False
+         AddHandler m_RefreshNewFileClick.Tick, AddressOf AutoClick_Cmd
+         m_RefreshNewFileClick.Interval = TimeSpan.FromMilliseconds(2000)
+         m_RefreshNewFileClick.Start()
+      End If
+   End Sub
+
+   Private Sub AutoClick(ByVal sender As Object, ByVal e As FileSystemEventArgs)
+      EgtOutLog("File '" & e.FullPath & "' has been created: ready to Click")
+      m_sNewFileClickPath = e.FullPath
+      m_bNewFileClick = True
+   End Sub
+
+   Private Sub AutoClick_Cmd()
+      If Not m_bNewFileClick Then Return
+      ' deseleziono la precedente lastra
+      If Not IsNothing(EgtPHOTOLib.PhotoMap.refProjectVM.SelSlab) Then
+         EgtPHOTOLib.PhotoMap.refProjectVM.SelSlab.IsSelected = 0
+      End If
+      ' verifico se esite una lastra corrente in modifica, quindi chiedo se salvare
+      Map.refTopCommandBarVM.NewCmd(True)
+      ' apro la pagina per inserire una nuova lastra, se esiste un oggetto di tipo lastra allora procedo
+      If Not IsNothing(EgtPHOTOLib.PhotoMap.refProjectVM.SelSlab) Then
+         ' Autocompilazione dei campi con i dati dell'ultima lastra salvata
+         ReadLastInfoAutoClick(EgtPHOTOLib.PhotoMap.refProjectVM.SelSlab)
+         ' scatto la foto
+         EgtPHOTOLib.PhotoMap.refOptionPanelVM.Photo(Nothing)
+         ' notifico che è stata scattata una foto
+         Try
+            File.Delete(m_sNewFileClickPath)
+            EgtOutLog("File '" & m_sNewFileClickPath & "' has been deleted!")
+            m_bNewFileClick = False
+         Catch ex As Exception
+            EgtOutLog("File '" & m_sNewFileClickPath & "' can't be deleted! " & ex.ToString)
+
+         End Try
+         ' se è stata scattata una foto provvedo a salvare l'inserimento
+         If Not m_bNewFileClick Then
+            ' salvo i dati inseriti ( nel file ini e nel DB )
+            EgtPHOTOLib.PhotoMap.refOptionPanelVM.Save()
+            ' ricarico la pagina
+            EgtPHOTOLib.PhotoMap.refProjectVM.SelProjectMode = ProjectSlabVM.ProjectModeOpt.DETAIL
+            EgtPHOTOLib.PhotoMap.refOptionPanelVM.Ok_IsEnabled = False
+            ' stampo etichetta
+            EgtPHOTOLib.PhotoMap.refOptionPanelVM.PrintLabel()
+         End If
+      End If
+   End Sub
+
+   Private Sub ReadLastInfoAutoClick(CurrSlab As Slab)
+      Dim nIndState As Integer = 1
+      Dim sMaterial As String = ""
+      Dim dThick As Double = 0
+      Dim sWarehouse As String = ""
+      nIndState = GetMainPrivateProfileInt(S_AUTOCLICK, K_STATE, nIndState)
+      GetMainPrivateProfileString(S_AUTOCLICK, K_AUTOMATERIAL, "", sMaterial)
+      dThick = GetMainPrivateProfileDouble(S_AUTOCLICK, K_THICKNESS, 1)
+      GetMainPrivateProfileString(S_AUTOCLICK, K_WAREHAOUSE, "", sWarehouse)
+      CurrSlab.State = nIndState
+      For IndexMat As Integer = 0 To EgtPHOTOLib.PhotoMap.refProjectVM.MaterialList.Count - 1
+         If EgtPHOTOLib.PhotoMap.refProjectVM.MaterialList(IndexMat).Trim = sMaterial.Trim Then
+            CurrSlab.SetMaterial(EgtPHOTOLib.PhotoMap.refProjectVM.MaterialList(IndexMat))
+            Exit For
+         End If
+      Next
+      CurrSlab.SetThickness(dThick)
+      CurrSlab.WarehousePosition = sWarehouse
    End Sub
 
    ' per la gestione di due OmagPHOTO che accedono allo stesso SQL
    Private Sub RefreshTimer_Tick()
-      If Not m_TimerIsBusy And PhotoMap.refProjectVM.SelProjectMode = ProjectSlabVM.ProjectModeOpt.LIST Then
+      If Not m_TimerIsBusy AndAlso Not IsNothing(PhotoMap.refProjectVM) AndAlso
+         PhotoMap.refProjectVM.SelProjectMode = ProjectSlabVM.ProjectModeOpt.LIST Then
          m_TimerIsBusy = True
          m_RefreshTimer.Stop()
          EgtPHOTOLib.PhotoMap.refListPageVM.RefreshLisPage()

MainWindow/MainWindowV.xaml

@@ -6,6 +6,7 @@
    xmlns:EgtPHOTOLib="clr-namespace:EgtPHOTOLib;assembly=EgtPHOTOLib"
    DataContext="{StaticResource MainWindowVM}"
    Style="{DynamicResource {x:Type EgtWPFLib5:EgtCustomWindow}}"
+   TitleBarForeground="{StaticResource Omag_White}"                         
    Title="{Binding Title}" Icon="/Resources/OmagPHOTO.ico"
    MinHeight="600" MinWidth="800"
    AboutBoxCommand="{Binding AboutBoxCommand}" WindowStyle="None" ResizeMode="NoResize"

My Project/AssemblyInfo.vb

@@ -19,7 +19,7 @@ Imports System.Windows
 #End If
 <Assembly: AssemblyCompany("Egalware s.r.l.")> 
 <Assembly: AssemblyProduct("OmagPHOTO")>
-<Assembly: AssemblyCopyright("Copyright ©  2017-2022 by Egalware s.r.l.")> 
+<Assembly: AssemblyCopyright("Copyright ©  2017-2025 by Egalware s.r.l.")>
 <Assembly: AssemblyTrademark("")> 
 <Assembly: ComVisible(false)>
 
@@ -59,5 +59,5 @@ Imports System.Windows
 ' by using the '*' as shown below:
 ' <Assembly: AssemblyVersion("1.0.*")> 
 
-<Assembly: AssemblyVersion("2.4.7.1")>
+<Assembly: AssemblyVersion("2.7.7.1")>
-<Assembly: AssemblyFileVersion("2.4.7.1")>
+<Assembly: AssemblyFileVersion("2.7.7.1")>

OmagPHOTO.vbproj

@@ -219,6 +219,39 @@
   <ItemGroup>
     <Resource Include="Resources\InstrumentPanel\Matitina.png" />
   </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Resources\AboutBoxImage.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Resources\DetailPage\Save.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Resources\DetailPage\Print.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Resources\DetailPage\Elimina.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Resources\DetailPage\Cancel.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Resources\DetailPage\Confirm.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Resources\DetailPage\Reset.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Resources\DetailPage\Pencil.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Resources\DetailPage\Polygon.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Resources\DetailPage\Rubber.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Resources\DetailPage\ZoomAll.png" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.VisualBasic.targets" />
   <PropertyGroup>
     <PostBuildEvent>IF "$(PlatformName)"=="x86" IF "$(ConfigurationName)" == "Release" copy $(TargetPath) c:\EgtProg\OmagPHOTO\OmagPHOTOR32.exe

OptionWindow/OptionWindowV.xaml

@@ -44,7 +44,7 @@
          <UniformGrid Columns="2">
             <TextBlock Text="{Binding ThicknessToleranceMsg}"/>
             <EgtWPFLib5:EgtTextBox Text="{Binding ThicknessTolerance}"
-                                   Margin="13,0,0,0"
+                                   Margin="36,0,0,0"
                                    TextAlignment="Right"/>
          </UniformGrid>
       </GroupBox>
@@ -58,7 +58,7 @@
                  <ColumnDefinition Width="3*"/>
                  <ColumnDefinition Width="1*"/>
              </Grid.ColumnDefinitions>
-             <TextBlock Text="{Binding LabelFileName}"/>
+             <TextBlock Text="{Binding LabelFileName}" VerticalAlignment="Center"/>
              <Button Content="{Binding BrowseMsg}" Grid.Column="1"
                   Command="{Binding BrowseCommand}"
                   Style="{StaticResource OptionPanel_TextButton}"
@@ -112,6 +112,9 @@
 
              <ListBox ItemsSource="{Binding MaterialList}"
                   SelectedItem="{Binding SelMaterial}"
+                  Background="{StaticResource Omag_Black}"
+                  Foreground="{StaticResource Omag_White}"
+                  BorderThickness="0"
                   Grid.RowSpan="2"
                   Margin="0,0,0,5"
                   Height="150"/>

TopCommandBar/TopCommandBarV.xaml

@@ -6,12 +6,14 @@
 
    <!--Barra superiore dei comandi-->
    <Button Command="{Binding NewCommand}"
-           ToolTip="{Binding NewToolTip}">
+           ToolTip="{Binding NewToolTip}"
+           Style="{StaticResource TopCmdBar_Button}">
       <Image Source="/Resources/TopCommandBar/New.png" Stretch="Uniform"/>
    </Button>
     <ToggleButton IsChecked="{Binding Search_IsChecked}"
                  IsEnabled="{Binding Search_IsEnabled}"
-                 ToolTip="{Binding SearchToolTip}">
+                 ToolTip="{Binding SearchToolTip}"
+                 Style="{StaticResource TopCmdBar_ToggleButton}">
       <Image Source="/Resources/TopCommandBar/Search.png" Stretch="Uniform"/>
    </ToggleButton>
    <!--<Button Command="{Binding OpenCommand}"
@@ -41,7 +43,8 @@
    </Button>-->
    <Button Command="{Binding OptionsCommand}"
            ToolTip="{Binding OptionsToolTip}"
-           IsEnabled="{Binding IsEnabled}">
+           IsEnabled="{Binding IsEnabled}"
+           Style="{StaticResource TopCmdBar_Button}">
       <Image Source="/Resources/TopCommandBar/Options.png" Stretch="Uniform"/>
    </Button>
    

TopCommandBar/TopCommandBarVM.vb

@@ -7,6 +7,8 @@ Imports EgtPHOTOLib
 Public Class TopCommandBarVM
    Inherits VMBase
 
+   Private m_bFirstResearch As Boolean = True
+
 #Region "FIELDS & PROPERTIES"
 
    Friend m_MruFiles As New MruList
@@ -23,7 +25,16 @@ Public Class TopCommandBarVM
       End Get
       Set(value As Boolean)
          If value Then
+            If m_bFirstResearch Then
+               ' Resetto la data corrente per la prima ricerca 
+               PhotoMap.refSearchPanelVM.StartAddedDate = Nothing
+               PhotoMap.refSearchPanelVM.NotifyPropertyChanged("StartAddedDate")
+               PhotoMap.refSearchPanelVM.EndAddedDate = Nothing
+               PhotoMap.refSearchPanelVM.NotifyPropertyChanged("EndAddedDate")
+               m_bFirstResearch = False
+            End If
             PhotoMap.refSearchPanelVM.InitSearchPanel()
+
          Else
             PhotoMap.refListPageVM.InitListPage()
          End If
@@ -156,6 +167,23 @@ Public Class TopCommandBarVM
    Friend Sub NewCmd(Optional bUseDefaults As Boolean = False)
       ' passo alla libreria l'oggetto Camera che è stato inizializzato nel Omag-PHOTO
       EgtPHOTOLib.MainData.SetCamera(Map.refMainWindowVM.m_Camera)
+      Dim bIsSaved As Boolean = False
+      If Not IsNothing(EgtPHOTOLib.PhotoMap.refProjectVM.SelSlab) Then
+         If EgtPHOTOLib.PhotoMap.refProjectVM.SelSlab.IsModified Then
+            ' 91125: Salvare le modifiche correnti? - 92201: Avviso
+            If MessageBox.Show(EgtMsg(91125), EgtMsg(92201), MessageBoxButton.YesNo, MessageBoxImage.Asterisk) = MessageBoxResult.Yes Then
+               EgtPHOTOLib.PhotoMap.refOptionPanelVM.Save()
+               bIsSaved = True
+            End If
+         Else
+            bIsSaved = True
+         End If
+         If Not bIsSaved Then
+            EgtPHOTOLib.PhotoMap.refOptionPanelVM.Cancel(Nothing)
+         Else
+            EgtPHOTOLib.PhotoMap.refListPageVM.RefreshLisPage()
+         End If
+      End If
       Map.refProjectVM.SelProjectMode = ProjectSlabVM.ProjectModeOpt.NEWSLAB
    End Sub
 

Utility/Dictionary.xaml

@@ -25,18 +25,53 @@
 
     <!--Colori predefiniti-->
     <SolidColorBrush x:Key="Omag_Blue" Color="#FF095CA8" />
-   <SolidColorBrush x:Key="Omag_Yellow" Color="#FFFFCE5B" />
+    <SolidColorBrush x:Key="Omag_Yellow_ORIG" Color="#FFFFCE5B" />
+    <SolidColorBrush x:Key="Omag_Yellow" Color="#FEBE00" />
     <SolidColorBrush x:Key="Omag_Red" Color="Red" />
     <SolidColorBrush x:Key="Omag_Green" Color="LawnGreen" />
     <SolidColorBrush x:Key="Omag_VeryLightGray" Color="#FFF2F2F2" />
     <SolidColorBrush x:Key="Omag_LightGray" Color="LightGray" />
     <SolidColorBrush x:Key="Omag_Gray" Color="#FF9E9E9E" />
-   <SolidColorBrush x:Key="Omag_DarkGray" Color="#FF444444" />
+    <SolidColorBrush x:Key="Omag_DarkGray" Color="#484D55" />
     <SolidColorBrush x:Key="Omag_White" Color="#FFFFFFFF" />
-   <SolidColorBrush x:Key="Omag_Black" Color="#FF000000" />
+    <SolidColorBrush x:Key="Omag_Black" Color="#1C1D22" />
+
+    <Thickness x:Key="BorderBtn_Thickness">0</Thickness>
+    <Thickness x:Key="BorderGpBx_Thickness">0.25</Thickness>
+    <Thickness x:Key="BorderBrd_Thickness">0.5</Thickness>
 
     <!--Colori per EgtWPFLib5-->
-   <SolidColorBrush x:Key="TextBox.Static.Border" Color="#FFABAdB3"/>
+    <!-- ____________________________________ EGT TEXTBOX ____________________________________  -->
+    <!--Definizione colori per UserControl EgtTextBox-->
+    <!--Colore dello sfondo del border quando è attiva la TextBox-->
+    <SolidColorBrush x:Key="BackgroundBorderEnableFText" Color="#FF444444" />
+    <!--Colore dello sfondo del border quando non è attiva la TextBox-->
+    <SolidColorBrush x:Key="BackgroundBorderEnableTText" Color="#FF000000" />
+
+    <!--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="#1C1D22" Offset="0.07"/>
+    </LinearGradientBrush>
+
+    <!--Colore del contorno quandodi default la TextBox-->
+    <LinearGradientBrush x:Key="BrushBorderIsMouseOverFText" EndPoint="0,20" MappingMode="Absolute" StartPoint="0,0">
+        <GradientStop Color="#484D55" Offset="0.07"/>
+        <GradientStop Color="#1C1D22" Offset="1"/>
+    </LinearGradientBrush>
+
+    <!--Colore dello sfondo quando non è abilitata la TextBox-->
+    <SolidColorBrush x:Key="BackgroundTextBlockIsEnableFText" Color="#FF444444" />
+    <!--Colore dello sfondo quando è abilitata la TextBox-->
+    <SolidColorBrush x:Key="BackgroundTextBlockIsEnableTText" Color="#FF000000" />
+    <!--Colore della scritta quando non è selezioonata, ma è attiva la TextBox -->
+    <SolidColorBrush x:Key="ForegroundTextBlockIsEnableTText" Color="White" />
+    <!--Colore della scritta quando non è attiva la TextBox -->
+    <SolidColorBrush x:Key="ForegroundTextBlockIsEnableFText" Color="LightGray" />
+    <!--Colore della scritta quando seleziono la TextBox-->
+    <SolidColorBrush x:Key="ForegroundTextBoxText" Color="White" />
+    <!-- ____________________________________ EGT TEXTBOX ____________________________________  -->
+
     <!--Colori per TabHeader-->
     <LinearGradientBrush x:Key="TabItem.Static.Background" EndPoint="0,1" StartPoint="0,0">
         <GradientStop Color="#F0F0F0" Offset="0.0"/>
@@ -78,7 +113,7 @@
         <Setter Property="Background" Value="{StaticResource Button.Static.Background}"/>
         <Setter Property="BorderBrush" Value="{StaticResource Button.Static.Border}"/>
         <Setter Property="Foreground" Value="{DynamicResource {x:Static SystemColors.ControlTextBrushKey}}"/>
-      <Setter Property="BorderThickness" Value="1"/>
+        <Setter Property="BorderThickness" Value="{StaticResource BorderBtn_Thickness}"/>
         <Setter Property="HorizontalContentAlignment" Value="Center"/>
         <Setter Property="VerticalContentAlignment" Value="Center"/>
         <Setter Property="Padding" Value="1"/>
@@ -86,26 +121,50 @@
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="{x:Type Button}">
-               <Border x:Name="border" CornerRadius="3" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" SnapsToDevicePixels="true">
+                    <Border x:Name="border" CornerRadius="0" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" SnapsToDevicePixels="true">
                         <ContentPresenter x:Name="contentPresenter" Focusable="False" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" Margin="{TemplateBinding Padding}" RecognizesAccessKey="True" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}"/>
                     </Border>
                     <ControlTemplate.Triggers>
-                  <Trigger Property="IsDefaulted" Value="true">
+                        <Trigger Property="IsEnabled" Value="False">
-                     <Setter Property="BorderBrush" TargetName="border" Value="{DynamicResource {x:Static SystemColors.HighlightBrushKey}}"/>
+                            <Setter Property="Background" Value="#FFF4F4F4"/>
+                            <Setter Property="BorderBrush" Value="#FFADB2B5"/>
+                            <Setter Property="TextElement.Foreground"  Value="#FF838383"/>
+                        </Trigger>
+                        <Trigger Property="ToggleButton.IsChecked" Value="True">
+                            <Setter Property="ToggleButton.BorderBrush" Value="{StaticResource Omag_Blue}" />
+                        </Trigger>
+                        <Trigger Property="IsMouseOver" Value="True">
+                            <Setter Property="Background" Value="#008BFF"/>
+                            <Setter Property="BorderBrush" Value="#008BFF"/>
+                        </Trigger>
+                        <Trigger Property="IsPressed" Value="True">
+                            <Setter Property="Background" Value="#E1B957"/>
+                            <Setter Property="BorderBrush" Value="#E1B957"/>
+                        </Trigger>
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+    <Style x:Key="TopCmdBar_Button" TargetType="{x:Type Button}" BasedOn="{StaticResource {x:Type Button}}">
+        <Setter Property="Height" Value="30"/>
+        <Setter Property="Width" Value="30"/>
+        <Setter Property="Background" Value="Transparent"/>
+        <Setter Property="BorderThickness" Value="{StaticResource BorderBtn_Thickness}"/>
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type Button}">
+                    <Border x:Name="border" CornerRadius="0" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" SnapsToDevicePixels="true">
+                        <ContentPresenter x:Name="contentPresenter" Focusable="False" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" Margin="{TemplateBinding Padding}" RecognizesAccessKey="True" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}"/>
+                    </Border>
+                    <ControlTemplate.Triggers>
+                        <Trigger Property="IsEnabled" Value="False">
+                            <Setter Property="OpacityMask" Value="#54707070"/>
                         </Trigger>
                         <Trigger Property="IsMouseOver" Value="true">
-                     <Setter Property="Background" TargetName="border" Value="{StaticResource Button.MouseOver.Background}"/>
+                            <Setter Property="Background" Value="#008BFF"/>
-                     <Setter Property="BorderBrush" TargetName="border" Value="{StaticResource Button.MouseOver.Border}"/>
+                            <Setter Property="BorderBrush" Value="#008BFF"/>
-                  </Trigger>
-                  <Trigger Property="IsPressed" Value="true">
-                     <Setter Property="Background" TargetName="border" Value="{StaticResource Button.Pressed.Background}"/>
-                     <Setter Property="BorderBrush" TargetName="border" Value="{StaticResource Button.Pressed.Border}"/>
-                  </Trigger>
-                  <Trigger Property="IsEnabled" Value="false">
-                     <Setter Property="Background" TargetName="border" Value="{StaticResource Button.Disabled.Background}"/>
-                     <Setter Property="BorderBrush" TargetName="border" Value="{StaticResource Button.Disabled.Border}"/>
-                     <Setter Property="TextElement.Foreground" TargetName="contentPresenter" Value="{StaticResource Button.Disabled.Foreground}"/>
-                     <Setter Property="OpacityMask" Value="#54707070"/>
                         </Trigger>
                     </ControlTemplate.Triggers>
                 </ControlTemplate>
@@ -125,13 +184,22 @@
     <Style x:Key="ToolBar_TextButton" TargetType="{x:Type Button}" BasedOn="{StaticResource {x:Type Button}}">
         <Setter Property="Height" Value="30"/>
         <Setter Property="Width" Value="80"/>
+        <Setter Property="Background" Value="{StaticResource Omag_Black}"/>
+        <Setter Property="BorderThickness" Value="{StaticResource BorderBtn_Thickness}"/>
+        <Setter Property="Foreground" Value="{StaticResource Omag_White}" />
     </Style>
-   <Style x:Key="OptionPanel_Button" TargetType="{x:Type Button}" BasedOn="{StaticResource {x:Type Button}}">
+    <Style x:Key="OptionPanel_ImgButton" TargetType="{x:Type Button}" BasedOn="{StaticResource {x:Type Button}}">
-      <Setter Property="Height" Value="60"/>
+        <Setter Property="Height" Value="30"/>
-      <Setter Property="Width" Value="60"/>
+        <Setter Property="Width" Value="30"/>
+        <Setter Property="Background" Value="Transparent" />
+        <Setter Property="BorderThickness" Value="0"/>
     </Style>
     <Style x:Key="OptionPanel_TextButton" TargetType="{x:Type Button}" BasedOn="{StaticResource {x:Type Button}}">
         <Setter Property="Height" Value="30"/>
+        <Setter Property="Width" Value="120"/>
+        <Setter Property="Background" Value="{StaticResource Omag_Black}"/>
+        <Setter Property="BorderThickness" Value="{StaticResource BorderBtn_Thickness}"/>
+        <Setter Property="Foreground" Value="{StaticResource Omag_White}" />
     </Style>
     <Style x:Key="OptionPanel_TextWrapButton" TargetType="{x:Type Button}" BasedOn="{StaticResource {x:Type Button}}">
         <Setter Property="ContentTemplate" Value="{StaticResource WrapButton_DataTemplate}" />
@@ -154,12 +222,15 @@
 
     <!-- ToggleButton Style -->
 
+    <!-- ToggleButton Style -->
+
     <Style TargetType="{x:Type ToggleButton}">
         <Setter Property="FocusVisualStyle" Value="{StaticResource FocusVisual}"/>
-      <Setter Property="Background" Value="{StaticResource Button.Static.Background}"/>
+        <Setter Property="Background" Value="#636974"/>
-      <Setter Property="BorderBrush" Value="{StaticResource Button.Static.Border}"/>
+        <Setter Property="BorderBrush" Value="#636974"/>
+        <Setter Property="Foreground" Value="{StaticResource Omag_White}"/>
         <Setter Property="Foreground" Value="{DynamicResource {x:Static SystemColors.ControlTextBrushKey}}"/>
-      <Setter Property="BorderThickness" Value="1"/>
+        <Setter Property="BorderThickness" Value="{StaticResource BorderBtn_Thickness}"/>
         <Setter Property="HorizontalContentAlignment" Value="Center"/>
         <Setter Property="VerticalContentAlignment" Value="Center"/>
         <Setter Property="Padding" Value="1"/>
@@ -167,7 +238,7 @@
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="{x:Type ToggleButton}">
-               <Border x:Name="border" CornerRadius="3" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" SnapsToDevicePixels="true">
+                    <Border x:Name="border" CornerRadius="0" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" SnapsToDevicePixels="true">
                         <ContentPresenter x:Name="contentPresenter" Focusable="False" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" Margin="{TemplateBinding Padding}" RecognizesAccessKey="True" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}"/>
                     </Border>
                     <ControlTemplate.Triggers>
@@ -175,21 +246,22 @@
                             <Setter Property="BorderBrush" TargetName="border" Value="{DynamicResource {x:Static SystemColors.HighlightBrushKey}}"/>
                         </Trigger>
                         <Trigger Property="IsMouseOver" Value="true">
-                     <Setter Property="Background" TargetName="border" Value="{StaticResource Button.MouseOver.Background}"/>
+                            <Setter Property="Background" Value="#008BFF"/>
-                     <Setter Property="BorderBrush" TargetName="border" Value="{StaticResource Button.MouseOver.Border}"/>
+                            <Setter Property="BorderBrush" Value="#008BFF"/>
                         </Trigger>
                         <Trigger Property="IsPressed" Value="true">
-                     <Setter Property="Background" TargetName="border" Value="{StaticResource Button.Pressed.Background}"/>
+                            <Setter Property="Background" Value="#E1B957"/>
-                     <Setter Property="BorderBrush" TargetName="border" Value="{StaticResource Button.Pressed.Border}"/>
+                            <Setter Property="BorderBrush" Value="#E1B957"/>
                         </Trigger>
                         <Trigger Property="IsChecked" Value="true">
-                     <Setter Property="Background" TargetName="border" Value="{StaticResource Omag_Yellow}"/> 
+                            <Setter Property="ToggleButton.Background" Value="{StaticResource Omag_Blue}" />
-                     <Setter Property="BorderBrush" TargetName="border" Value="{StaticResource Button.Pressed.Border}"/>
+                            <Setter Property="ToggleButton.BorderBrush" Value="{StaticResource Omag_Blue}" />
+                            <Setter Property="ToggleButton.Foreground" Value="{StaticResource Omag_Yellow}"/>
                         </Trigger>
                         <Trigger Property="IsEnabled" Value="false">
-                     <Setter Property="Background" TargetName="border" Value="{StaticResource Button.Disabled.Background}"/>
+                            <!--<Setter Property="ToggleButton.Background" Value="#FFF4F4F4"/>
-                     <Setter Property="BorderBrush" TargetName="border" Value="{StaticResource Button.Disabled.Border}"/>
+                            <Setter Property="ToggleButton.BorderBrush" Value="#FFADB2B5"/>
-                     <Setter Property="TextElement.Foreground" TargetName="contentPresenter" Value="{StaticResource Button.Disabled.Foreground}"/>
+                            <Setter Property="ToggleButton.Foreground" Value="#FF838383"/>-->
                             <Setter Property="OpacityMask" Value="#54707070"/>
                         </Trigger>
                     </ControlTemplate.Triggers>
@@ -198,6 +270,14 @@
         </Setter>
     </Style>
 
+    <Style x:Key="TopCmdBar_ToggleButton" TargetType="{x:Type ToggleButton}" BasedOn="{StaticResource {x:Type ToggleButton}}">
+        <Setter Property="Background" Value="Transparent"/>
+        <Setter Property="Height" Value="30"/>
+        <Setter Property="Width" Value="30"/>
+        <Setter Property="BorderThickness" Value=" 0"/>
+    </Style>
+
+
     <Style x:Key="ToolBar_ToggleButton" TargetType="{x:Type ToggleButton}" BasedOn="{StaticResource {x:Type ToggleButton}}">
         <Setter Property="Height" Value="30"/>
         <Setter Property="Width" Value="30"/>
@@ -210,6 +290,10 @@
 
     <Style x:Key="OptionPanel_ToggleButton" TargetType="{x:Type ToggleButton}" BasedOn="{StaticResource {x:Type ToggleButton}}">
         <Setter Property="Height" Value="30"/>
+        <Setter Property="Width" Value="80"/>
+        <Setter Property="Background" Value="{StaticResource Omag_DarkGray}"/>
+        <Setter Property="BorderThickness" Value="{StaticResource BorderBtn_Thickness}"/>
+        <Setter Property="Foreground" Value="{StaticResource Omag_White}" />
     </Style>
 
     <Style x:Key="OptionPanel_NestingToggleButton" TargetType="{x:Type ToggleButton}" BasedOn="{StaticResource {x:Type ToggleButton}}">
@@ -258,6 +342,17 @@
         <Setter Property="VerticalContentAlignment" Value="Center"/>
         <Setter Property="HorizontalContentAlignment" Value="Right"/>
         <Setter Property="ExplicitUpdateSource" Value="EnterKeyPress"/>
+
+        <Setter Property="BackgroundBrdEnable" Value="{StaticResource Omag_Black}"/>
+        <Setter Property="BackgroundBrdDisable" Value="{StaticResource Omag_Black}"/>
+        <Setter Property="BorderBrushIsMouseOver" Value="{StaticResource Omag_Black}"/>
+        <Setter Property="BorderBrushIsFocused" Value="{StaticResource Omag_White}"/>
+        <Setter Property="GeneralBorderBrush" Value="{StaticResource BrushBorderIsMouseOverTText}"/>
+        <Setter Property="BackgroundTxBlDisable" Value="{StaticResource BrushBorderIsMouseOverTText}"/>
+        <Setter Property="ForegroundTxBlEnable" Value="{StaticResource Omag_White}"/>
+        <Setter Property="ForegroundTxBlDisable" Value="{StaticResource Omag_Gray}"/>
+        <Setter Property="GeneralForeground" Value="{StaticResource Omag_White}"/>
+        <Setter Property="GeneralBackground" Value="{StaticResource Omag_Black}"/>
     </Style>
 
     <Style x:Key="ToolsTextBox" TargetType="{x:Type EgtWPFLib5:EgtTextBox}" BasedOn="{StaticResource {x:Type EgtWPFLib5:EgtTextBox}}">
@@ -345,10 +440,30 @@
 
     <!-- EgtCustomWindow -->
 
-   <Style TargetType="{x:Type EgtWPFLib5:EgtCustomWindow}" BasedOn="{StaticResource {x:Type EgtWPFLib5:EgtCustomWindow}}">
+    <!--<Style TargetType="{x:Type EgtWPFLib5:EgtCustomWindow}" BasedOn="{StaticResource {x:Type EgtWPFLib5:EgtCustomWindow}}">
       <Setter Property="TitleBarHeight" Value="32"/>
       <Setter Property="TitleBarBrush" Value="{StaticResource Omag_LightGray}"/>
       <Setter Property="BorderBrush" Value="{StaticResource Omag_Gray}"/>
+   </Style>-->
+
+    <Style TargetType="{x:Type EgtWPFLib5:EgtCustomWindow}" BasedOn="{StaticResource {x:Type EgtWPFLib5:EgtCustomWindow}}">
+        <Setter Property="TitleBarHeight" Value="32"/>
+        <!--<Setter Property="TitleBarBrush" Value="{StaticResource Omag_LightGray}"/>
+        <Setter Property="BorderBrush" Value="{StaticResource Omag_Gray}"/>-->
+        <Setter Property="Background" Value ="{StaticResource Omag_DarkGray}"/>
+        <Setter Property="TitleBarForeground" Value="{StaticResource Omag_White}" />
+        <Setter Property="TitleBarBrush" Value="{StaticResource Omag_DarkGray}" />
+        <Setter Property="BorderBrush" Value="Transparent" />
+    </Style>
+
+    <Style x:Key="MainWindowStyle"  TargetType="{x:Type EgtWPFLib5:EgtCustomWindow}" BasedOn="{StaticResource {x:Type EgtWPFLib5:EgtCustomWindow}}">
+        <Setter Property="TitleBarHeight" Value="32"/>
+        <!--<Setter Property="TitleBarBrush" Value="{StaticResource Omag_LightGray}"/>
+        <Setter Property="BorderBrush" Value="{StaticResource Omag_Gray}"/>-->
+        <Setter Property="Background" Value ="{StaticResource Omag_DarkGray}"/>
+        <Setter Property="TitleBarForeground" Value="{StaticResource Omag_White}" />
+        <Setter Property="TitleBarBrush" Value="{StaticResource Omag_DarkGray}" />
+        <Setter Property="BorderBrush" Value="Transparent" />
     </Style>
 
     <!-- ______________________________________________________________________________________________________________________________________________ -->
@@ -480,7 +595,138 @@
 
     <!-- ______________________________________________________________________________________________________________________________________________ -->
 
-   <!-- ComboBox -->
+    <LinearGradientBrush x:Key="ButtonNormalBackground" EndPoint="0,1" StartPoint="0,0">
+        <GradientStop Color="#F3F3F3" Offset="0"/>
+        <GradientStop Color="#EBEBEB" Offset="0.5"/>
+        <GradientStop Color="#DDDDDD" Offset="0.5"/>
+        <GradientStop Color="#CDCDCD" Offset="1"/>
+    </LinearGradientBrush>
+    <SolidColorBrush x:Key="ButtonNormalBorder" Color="#FF707070"/>
+    <LinearGradientBrush x:Key="TextBoxBorder" EndPoint="0,20" MappingMode="Absolute" StartPoint="0,0">
+        <GradientStop Color="#ABADB3" Offset="0.05"/>
+        <GradientStop Color="#E2E3EA" Offset="0.07"/>
+        <GradientStop Color="#E3E9EF" Offset="1"/>
+    </LinearGradientBrush>
+    <Style x:Key="ComboBoxFocusVisual">
+        <Setter Property="Control.Template">
+            <Setter.Value>
+                <ControlTemplate>
+                    <Rectangle Margin="4,4,21,4" StrokeDashArray="1 2" Stroke="{DynamicResource {x:Static SystemColors.ControlTextBrushKey}}" SnapsToDevicePixels="true" StrokeThickness="1"/>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+    <Geometry x:Key="DownArrowGeometry">M 0 0 L 3.5 4 L 7 0 Z</Geometry>
+    <Style x:Key="ComboBoxReadonlyToggleButton" TargetType="{x:Type ToggleButton}">
+        <Setter Property="OverridesDefaultStyle" Value="true"/>
+        <Setter Property="IsTabStop" Value="false"/>
+        <Setter Property="Focusable" Value="false"/>
+        <Setter Property="ClickMode" Value="Press"/>
+        <Setter Property="Background" Value="Transparent"/>
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type ToggleButton}">
+                    <Border x:Name="Chrome" Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" SnapsToDevicePixels="true" BorderThickness="{TemplateBinding BorderThickness}">
+                        <Grid HorizontalAlignment="Right" Width="{DynamicResource {x:Static SystemParameters.VerticalScrollBarWidthKey}}">
+                            <Path x:Name="Arrow" Data="{StaticResource DownArrowGeometry}" Fill="White" HorizontalAlignment="Center" Margin="3,1,0,0" VerticalAlignment="Center"/>
+                        </Grid>
+                    </Border>
+                    <ControlTemplate.Triggers>
+                        <Trigger Property="IsEnabled" Value="false">
+                            <Setter Property="Fill" TargetName="Arrow" Value="#AFAFAF"/>
+                        </Trigger>
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+    <Style x:Key="ComboBoxToggleButton" TargetType="{x:Type ToggleButton}">
+        <Setter Property="OverridesDefaultStyle" Value="true"/>
+        <Setter Property="IsTabStop" Value="false"/>
+        <Setter Property="Focusable" Value="false"/>
+        <Setter Property="ClickMode" Value="Press"/>
+        <Setter Property="Background" Value="Transparent"/>
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type ToggleButton}">
+                    <Border x:Name="Chrome" Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" SnapsToDevicePixels="true" Width="{DynamicResource {x:Static SystemParameters.VerticalScrollBarWidthKey}}">
+                        <Path x:Name="Arrow" Data="{StaticResource DownArrowGeometry}" Fill="White" HorizontalAlignment="Center" Margin="0,1,0,0" VerticalAlignment="Center"/>
+                    </Border>
+                    <ControlTemplate.Triggers>
+                        <Trigger Property="IsEnabled" Value="false">
+                            <Setter Property="Fill" TargetName="Arrow" Value="#AFAFAF"/>
+                        </Trigger>
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+    <Style TargetType="{x:Type ComboBox}">
+        <Setter Property="Background" Value="{StaticResource Omag_Black}"/>
+        <Setter Property="Foreground" Value="{StaticResource Omag_White}"/>
+        <Setter Property="BorderThickness" Value="0"/>
+        <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"/>
+        <Setter Property="ScrollViewer.CanContentScroll" Value="true"/>
+        <Setter Property="ScrollViewer.PanningMode" Value="Both"/>
+        <Setter Property="Stylus.IsFlicksEnabled" Value="False"/>
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type ComboBox}">
+                    <Grid x:Name="MainGrid" SnapsToDevicePixels="true">
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition Width="*"/>
+                            <ColumnDefinition MinWidth="{DynamicResource {x:Static SystemParameters.VerticalScrollBarWidthKey}}" Width="0"/>
+                        </Grid.ColumnDefinitions>
+                        <Popup x:Name="PART_Popup" AllowsTransparency="true" Grid.ColumnSpan="2" IsOpen="{Binding IsDropDownOpen, RelativeSource={RelativeSource TemplatedParent}}" Margin="1" Placement="Bottom" PopupAnimation="{DynamicResource {x:Static SystemParameters.ComboBoxPopupAnimationKey}}" Width="{Binding ActualWidth, ElementName=MainGrid}" >
+                            <Border x:Name="DropDownBorder" Background="{TemplateBinding Background}" BorderBrush="{DynamicResource {x:Static SystemColors.WindowFrameBrushKey}}" BorderThickness="{TemplateBinding BorderThickness}">
+                                <ScrollViewer x:Name="DropDownScrollViewer">
+                                    <Grid RenderOptions.ClearTypeHint="Enabled">
+                                        <Canvas HorizontalAlignment="Left" Height="0" VerticalAlignment="Top" Width="0">
+                                            <Rectangle x:Name="OpaqueRect" Fill="{Binding Background, ElementName=DropDownBorder}" Height="{Binding ActualHeight, ElementName=DropDownBorder}" Width="{Binding ActualWidth, ElementName=DropDownBorder}"/>
+                                        </Canvas>
+                                        <ItemsPresenter x:Name="ItemsPresenter" KeyboardNavigation.DirectionalNavigation="Contained" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"/>
+                                    </Grid>
+                                </ScrollViewer>
+                            </Border>
+                        </Popup>
+                        <ToggleButton Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Grid.ColumnSpan="2" IsChecked="{Binding IsDropDownOpen, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}" Style="{StaticResource ComboBoxReadonlyToggleButton}"/>
+                        <ContentPresenter ContentStringFormat="{TemplateBinding SelectionBoxItemStringFormat}" ContentTemplate="{TemplateBinding SelectionBoxItemTemplate}" Content="{TemplateBinding SelectionBoxItem}" ContentTemplateSelector="{TemplateBinding ItemTemplateSelector}" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" IsHitTestVisible="false" Margin="{TemplateBinding Padding}" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}"/>
+                    </Grid>
+                    <ControlTemplate.Triggers>
+                        <Trigger Property="HasItems" Value="false">
+                            <Setter Property="Height" TargetName="DropDownBorder" Value="95"/>
+                        </Trigger>
+                        <Trigger Property="IsEnabled" Value="false">
+                            <Setter Property="Foreground" Value="{DynamicResource {x:Static SystemColors.GrayTextBrushKey}}"/>
+                            <Setter Property="Background" Value="#FFF4F4F4"/>
+                        </Trigger>
+                        <MultiTrigger>
+                            <MultiTrigger.Conditions>
+                                <Condition Property="IsGrouping" Value="true"/>
+                            </MultiTrigger.Conditions>
+                            <Setter Property="ScrollViewer.CanContentScroll" Value="false"/>
+                        </MultiTrigger>
+                        <Trigger Property="ScrollViewer.CanContentScroll" SourceName="DropDownScrollViewer" Value="false">
+                            <Setter Property="Canvas.Top" TargetName="OpaqueRect" Value="{Binding VerticalOffset, ElementName=DropDownScrollViewer}"/>
+                            <Setter Property="Canvas.Left" TargetName="OpaqueRect" Value="{Binding HorizontalOffset, ElementName=DropDownScrollViewer}"/>
+                        </Trigger>
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
 
     <Style x:Key="MachiningsComboBox" TargetType="{x:Type ComboBox}" BasedOn="{StaticResource {x:Type ComboBox}}">
         <Setter Property="Margin" Value="0,0,0,10"/>
@@ -502,4 +748,16 @@
 
     <!-- ______________________________________________________________________________________________________________________________________________ -->
 
+    <!-- GroupBox -->
+
+    <Style TargetType="{x:Type GroupBox}" BasedOn="{StaticResource {x:Type GroupBox}}">
+        <Setter Property="BorderThickness" Value="{StaticResource BorderGpBx_Thickness}"/>
+        <Setter Property="BorderBrush" Value="{StaticResource Omag_White}"/>
+        <Setter Property="Foreground" Value="{StaticResource Omag_White}"/>
+        <Setter Property="Margin" Value="0,0,0,0"/>
+    </Style>
+
+    <!-- ______________________________________________________________________________________________________________________________________________ -->
+    
+    
 </ResourceDictionary>