OmagVIEW 2.7j1 :

- sistemato logo Omag
- sistemato AboutBox con Egalware.
This commit is contained in:
Dario Sassi
2025-10-08 19:50:51 +02:00
parent 18ada2f088
commit dd385a1890
12 changed files with 37 additions and 36 deletions
+11 -10
View File
@@ -5,7 +5,8 @@
AllowsTransparency="True" Background="Transparent" ShowInTaskbar="False">
<!-- Definizione dell'AboutBox -->
<Border Style="{StaticResource OmagCut_WindowBorder}">
<Border Style="{StaticResource OmagCut_WindowBorder}"
Background="{StaticResource OmagCut_VeryLightGray}">
<Grid >
<Grid.ColumnDefinitions>
<ColumnDefinition Width="0.5*"/>
@@ -34,24 +35,24 @@
<ColumnDefinition Width="3*"/>
<ColumnDefinition Width="1*"/>
</Grid.ColumnDefinitions>
<Border Name="LogoBrd" Grid.Column="1" Background="{DynamicResource Omag_LogoBackground}">
<Image Source="{DynamicResource AboutBoxImg}" Stretch="Uniform"/>
<Border Name="LogoBrd" Grid.Column="1">
<Image Source="{DynamicResource LogoEgalwareImg}" Stretch="Uniform"/>
</Border>
</Grid>
<TextBlock Name="DescriptionLbl" Grid.Column="1" Grid.Row="3" HorizontalAlignment="Center"
VerticalAlignment="Center" FontSize="18" Foreground="{DynamicResource Omag_TextColor}"/>
VerticalAlignment="Center" FontSize="18"/>
<TextBlock Name="VersionLbl" Grid.Column="1" Grid.Row="4" HorizontalAlignment="Center"
VerticalAlignment="Center" FontSize="18" Foreground="{DynamicResource Omag_TextColor}"/>
VerticalAlignment="Center" FontSize="18"/>
<TextBlock Name="KeyLbl" Grid.Column="1" Grid.Row="5" HorizontalAlignment="Center"
VerticalAlignment="Center" FontSize="16" Foreground="{DynamicResource Omag_TextColor}"/>
VerticalAlignment="Center" FontSize="16"/>
<TextBlock Name="MachineLbl" Grid.Column="1" Grid.Row="6" HorizontalAlignment="Center"
VerticalAlignment="Center" FontSize="18" Foreground="{DynamicResource Omag_TextColor}"/>
VerticalAlignment="Center" FontSize="18"/>
<TextBlock Name="ProjIndexLbl" Grid.Column="1" Grid.Row="7" HorizontalAlignment="Center"
VerticalAlignment="Center" FontSize="18" Foreground="{DynamicResource Omag_TextColor}"/>
VerticalAlignment="Center" FontSize="18"/>
<TextBlock Name="ProjPathLbl" Grid.Column="1" Grid.Row="8" HorizontalAlignment="Center"
VerticalAlignment="Center" FontSize="18" Foreground="{DynamicResource Omag_TextColor}"/>
VerticalAlignment="Center" FontSize="18"/>
<TextBlock Name="CopyrightLbl" Grid.Column="1" Grid.Row="9" HorizontalAlignment="Center"
VerticalAlignment="Center" FontSize="15" Foreground="{DynamicResource Omag_TextColor}"/>
VerticalAlignment="Center" FontSize="15"/>
<Button Name="ExitBtn" Grid.Column="1" Grid.Row="11" IsCancel="True"
Style="{StaticResource OmagCut_WindowGrayTextButton}" Margin="1,0"/>
+1 -1
View File
@@ -22,7 +22,7 @@
</Grid.ColumnDefinitions>
<Border Name="LogoBrd" Background="{DynamicResource Omag_LogoBackground}">
<Image Source="{DynamicResource LogoOmagImg}" Stretch="Uniform" Margin="1"/>
<Image Source="{DynamicResource LogoOmagImg}" Stretch="Uniform" Margin="2"/>
</Border>
<!-- ** Definizione della Grid delle tab ** -->
+2 -2
View File
@@ -195,8 +195,8 @@ Class MainWindow
' leggo nome file exe (per stampante zebra)
GetPrivateProfileString(S_PRINTER, K_ZEBRAUTILITIES, System.AppDomain.CurrentDomain.BaseDirectory & "ZebraPrinterUtilitiesR32.exe", m_ZebraUtilitiesExe, m_sIniFile)
' Recupero opzioni della chiave
Dim bKey As Boolean = EgtGetKeyLevel(9423, 2707, 1, m_nKeyLevel) And
EgtGetKeyOptions(9423, 2707, 1, m_nKeyOptions)
Dim bKey As Boolean = EgtGetKeyLevel(9423, 2710, 1, m_nKeyLevel) And
EgtGetKeyOptions(9423, 2710, 1, m_nKeyOptions)
EgtOutLog("KeyOptions : " & bKey.ToString() & " " & m_nKeyOptions.ToString())
' Imposto dir di default per libreria Lua e lancio libreria di base
Dim sLuaLibsDir As String = String.Empty
+2 -2
View File
@@ -55,6 +55,6 @@ Imports System.Windows
' by using the '*' as shown below:
' <Assembly: AssemblyVersion("1.0.*")>
<Assembly: AssemblyVersion("2.7.7.1")>
<Assembly: AssemblyFileVersion("2.7.7.1")>
<Assembly: AssemblyVersion("2.7.10.1")>
<Assembly: AssemblyFileVersion("2.7.10.1")>
+2 -2
View File
@@ -248,10 +248,10 @@
<Resource Include="Resources\LogoOmag.png" />
</ItemGroup>
<ItemGroup>
<Resource Include="Resources\AboutBoxImage.png" />
<Resource Include="Resources\Folder.png" />
</ItemGroup>
<ItemGroup>
<Resource Include="Resources\Folder.png" />
<Resource Include="Resources\LogoEgalware.png" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.VisualBasic.targets" />
<PropertyGroup>
+1 -1
View File
@@ -17,7 +17,7 @@
<BitmapImage x:Key="DownArrowImg" UriSource="Resources/DarkTheme/DownArrow.png"></BitmapImage>
<BitmapImage x:Key="GenericViewImg" UriSource="Resources/DarkTheme/GenericView.png"></BitmapImage>
<BitmapImage x:Key="AboutBoxImg" UriSource="Resources/DarkTheme/AboutBoxImage.png"></BitmapImage>
<BitmapImage x:Key="LogoEgalwareImg" UriSource="Resources/LogoEgalware.png"></BitmapImage>
<BitmapImage x:Key="LogoOmagImg" UriSource="Resources/DarkTheme/LogoOmag.png"></BitmapImage>
<BitmapImage x:Key="LookFromTOPImg" UriSource="Resources/DarkTheme/LookFromTOP.png"></BitmapImage>
<BitmapImage x:Key="OptionsImg" UriSource="Resources/DarkTheme/Options.png"></BitmapImage>
+18 -18
View File
@@ -26,8 +26,8 @@
<SolidColorBrush x:Key="OmagCut_DarkGray" Color="#FF444444" />
<SolidColorBrush x:Key="OmagCut_White" Color="#FFFFFFFF" />
<SolidColorBrush x:Key="Omag_LogoBackground" Color="WhiteSmoke" />
<SolidColorBrush x:Key="Omag_TextColor" Color="Black" />
<SolidColorBrush x:Key="Omag_LogoBackground" Color="#FF9E9E9E" />
<SolidColorBrush x:Key="Omag_TextColor" Color="Black" />
<FontFamily x:Key="OmagView_Font">./Resources/Fonts/#Century Gothic</FontFamily>
@@ -89,23 +89,23 @@
<CornerRadius x:Key="Page_CornerRadius">9.5</CornerRadius> <!--2.5mm-->
<SolidColorBrush x:Key="OmagCut_MainBackground" Color="#FF9E9E9E" />
<BitmapImage x:Key="DownArrowImg" UriSource="Resources/DownArrow.png"></BitmapImage>
<BitmapImage x:Key="GenericViewImg" UriSource="Resources/GenericView.png"></BitmapImage>
<BitmapImage x:Key="AboutBoxImg" UriSource="Resources/AboutBoxImage.png"></BitmapImage>
<BitmapImage x:Key="LogoOmagImg" UriSource="Resources/LogoOmag.png"></BitmapImage>
<BitmapImage x:Key="LookFromTOPImg" UriSource="Resources/LookFromTOP.png"></BitmapImage>
<BitmapImage x:Key="OptionsImg" UriSource="Resources/Options.png"></BitmapImage>
<BitmapImage x:Key="PanImg" UriSource="Resources/Pan.png"></BitmapImage>
<BitmapImage x:Key="UpArrowImg" UriSource="Resources/UpArrow.png"></BitmapImage>
<BitmapImage x:Key="VImg" UriSource="Resources/V.png"></BitmapImage>
<BitmapImage x:Key="XImg" UriSource="Resources/X.png"></BitmapImage>
<BitmapImage x:Key="ZoomAllImg" UriSource="Resources/ZoomAll.png"></BitmapImage>
<BitmapImage x:Key="ZoomInImg" UriSource="Resources/ZoomIn.png"></BitmapImage>
<BitmapImage x:Key="ZoomOutImg" UriSource="Resources/ZoomOut.png"></BitmapImage>
<BitmapImage x:Key="ZoomWinImg" UriSource="Resources/ZoomWIn.png"></BitmapImage>
<BitmapImage x:Key="FolderImg" UriSource="Resources/Folder.png"></BitmapImage>
<BitmapImage x:Key="DownArrowImg" UriSource="Resources/DownArrow.png"></BitmapImage>
<BitmapImage x:Key="GenericViewImg" UriSource="Resources/GenericView.png"></BitmapImage>
<BitmapImage x:Key="LogoEgalwareImg" UriSource="Resources/LogoEgalware.png"></BitmapImage>
<BitmapImage x:Key="LogoOmagImg" UriSource="Resources/LogoOmag.png"></BitmapImage>
<BitmapImage x:Key="LookFromTOPImg" UriSource="Resources/LookFromTOP.png"></BitmapImage>
<BitmapImage x:Key="OptionsImg" UriSource="Resources/Options.png"></BitmapImage>
<BitmapImage x:Key="PanImg" UriSource="Resources/Pan.png"></BitmapImage>
<BitmapImage x:Key="UpArrowImg" UriSource="Resources/UpArrow.png"></BitmapImage>
<BitmapImage x:Key="VImg" UriSource="Resources/V.png"></BitmapImage>
<BitmapImage x:Key="XImg" UriSource="Resources/X.png"></BitmapImage>
<BitmapImage x:Key="ZoomAllImg" UriSource="Resources/ZoomAll.png"></BitmapImage>
<BitmapImage x:Key="ZoomInImg" UriSource="Resources/ZoomIn.png"></BitmapImage>
<BitmapImage x:Key="ZoomOutImg" UriSource="Resources/ZoomOut.png"></BitmapImage>
<BitmapImage x:Key="ZoomWinImg" UriSource="Resources/ZoomWIn.png"></BitmapImage>
<BitmapImage x:Key="FolderImg" UriSource="Resources/Folder.png"></BitmapImage>
<!-- ______________________________________________________________________________________________________________________ -->
<!-- ______________________________________________________________________________________________________________________ -->
<!--Empty Border-->
<Style x:Key="OmagCut_EmptyBorder" TargetType="{x:Type Border}">
Binary file not shown.

Before

Width:  |  Height:  |  Size: 4.1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 4.1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 25 KiB

After

Width:  |  Height:  |  Size: 64 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 6.4 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 25 KiB

After

Width:  |  Height:  |  Size: 64 KiB