Compare commits
2 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| ca80b6fea0 | |||
| d306b924df |
@@ -36,6 +36,7 @@ Module ConstIni
|
|||||||
Public Const K_PHOTODIR As String = "PhotoDir"
|
Public Const K_PHOTODIR As String = "PhotoDir"
|
||||||
Public Const K_CAMERALINK As String = "CameraLink"
|
Public Const K_CAMERALINK As String = "CameraLink"
|
||||||
Public Const K_LASTID As String = "LastId"
|
Public Const K_LASTID As String = "LastId"
|
||||||
|
Public Const K_LISTRAWFROMCSV As String = "ListRawFromCSV"
|
||||||
|
|
||||||
Public Const S_PRINTER As String = "Printer"
|
Public Const S_PRINTER As String = "Printer"
|
||||||
Public Const K_TEMPLATE As String = "Template"
|
Public Const K_TEMPLATE As String = "Template"
|
||||||
|
|||||||
@@ -153,6 +153,13 @@ Public Class MainWindowM
|
|||||||
End Set
|
End Set
|
||||||
End Property
|
End Property
|
||||||
|
|
||||||
|
Private m_FileRawCSV As String
|
||||||
|
Friend ReadOnly Property FileRawCS As String
|
||||||
|
Get
|
||||||
|
Return m_FileRawCSV
|
||||||
|
End Get
|
||||||
|
End Property
|
||||||
|
|
||||||
#End Region ' FIELDS
|
#End Region ' FIELDS
|
||||||
|
|
||||||
#Region "CONSTRUCTOR"
|
#Region "CONSTRUCTOR"
|
||||||
@@ -261,6 +268,8 @@ Public Class MainWindowM
|
|||||||
GetMainPrivateProfileString(S_PRINTER, K_ZEBRAUTILITIES, System.AppDomain.CurrentDomain.BaseDirectory & "ZebraPrinterUtilitiesR32.exe", m_ZebraUtilitiesExe)
|
GetMainPrivateProfileString(S_PRINTER, K_ZEBRAUTILITIES, System.AppDomain.CurrentDomain.BaseDirectory & "ZebraPrinterUtilitiesR32.exe", m_ZebraUtilitiesExe)
|
||||||
' verifico che sia abilitata la stampante con flag
|
' verifico che sia abilitata la stampante con flag
|
||||||
m_PrinterIsVisible = (GetMainPrivateProfileInt(S_PRINTER, K_ENABLE_PRINTER, 0) = 1)
|
m_PrinterIsVisible = (GetMainPrivateProfileInt(S_PRINTER, K_ENABLE_PRINTER, 0) = 1)
|
||||||
|
' leggo il nome del file CSV che contiene gli identificativi dei grezzi
|
||||||
|
GetMainPrivateProfileString(S_GENERAL, K_LISTRAWFROMCSV, sDataRoot & "\Data\RawList.csv", m_FileRawCSV)
|
||||||
' Creo connessione al Db
|
' Creo connessione al Db
|
||||||
If Not ManageDb.ConnectToDb(m_sPhotoDir & "\" & DB_FILENAME) Then
|
If Not ManageDb.ConnectToDb(m_sPhotoDir & "\" & DB_FILENAME) Then
|
||||||
EgtOutLog("Error connecting to DB")
|
EgtOutLog("Error connecting to DB")
|
||||||
@@ -283,6 +292,10 @@ Public Class MainWindowM
|
|||||||
EgtPHOTOLib.MainData.SetZebraPrinterExe(m_ZebraUtilitiesExe)
|
EgtPHOTOLib.MainData.SetZebraPrinterExe(m_ZebraUtilitiesExe)
|
||||||
EgtPHOTOLib.MainData.SetPrinterVisibility(m_PrinterIsVisible)
|
EgtPHOTOLib.MainData.SetPrinterVisibility(m_PrinterIsVisible)
|
||||||
If GetMainPrivateProfileString(S_GENERAL, "LastBlock", "", sLastBlock) <> 0 Then EgtPHOTOLib.MainData.SetLastBlock(sLastBlock)
|
If GetMainPrivateProfileString(S_GENERAL, "LastBlock", "", sLastBlock) <> 0 Then EgtPHOTOLib.MainData.SetLastBlock(sLastBlock)
|
||||||
|
If File.Exists(m_FileRawCSV) Then
|
||||||
|
EgtPHOTOLib.MainData.SetRawFileCSV(m_FileRawCSV)
|
||||||
|
EgtPHOTOLib.MainData.SetEnableReadrawCSV(GetMainPrivateProfileInt(S_GENERAL, "EnableListRawFromCSV", 0) <> 0)
|
||||||
|
End If
|
||||||
Dim sIdKey As String = String.Empty
|
Dim sIdKey As String = String.Empty
|
||||||
EgtGetKeyInfo(sIdKey)
|
EgtGetKeyInfo(sIdKey)
|
||||||
EgtPHOTOLib.MainData.SetKey(sIdKey)
|
EgtPHOTOLib.MainData.SetKey(sIdKey)
|
||||||
|
|||||||
+6
-2
@@ -1,18 +1,22 @@
|
|||||||
|
|
||||||
Microsoft Visual Studio Solution File, Format Version 12.00
|
Microsoft Visual Studio Solution File, Format Version 12.00
|
||||||
# Visual Studio 15
|
# Visual Studio Version 16
|
||||||
VisualStudioVersion = 15.0.28307.271
|
VisualStudioVersion = 16.0.31205.134
|
||||||
MinimumVisualStudioVersion = 10.0.40219.1
|
MinimumVisualStudioVersion = 10.0.40219.1
|
||||||
Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "OmagPHOTO", "OmagPHOTO.vbproj", "{79B976E3-FAB4-4663-B1FA-DC94FC380094}"
|
Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "OmagPHOTO", "OmagPHOTO.vbproj", "{79B976E3-FAB4-4663-B1FA-DC94FC380094}"
|
||||||
EndProject
|
EndProject
|
||||||
Global
|
Global
|
||||||
GlobalSection(SolutionConfigurationPlatforms) = preSolution
|
GlobalSection(SolutionConfigurationPlatforms) = preSolution
|
||||||
|
Debug|Any CPU = Debug|Any CPU
|
||||||
Debug|x86 = Debug|x86
|
Debug|x86 = Debug|x86
|
||||||
|
Release|Any CPU = Release|Any CPU
|
||||||
Release|x86 = Release|x86
|
Release|x86 = Release|x86
|
||||||
EndGlobalSection
|
EndGlobalSection
|
||||||
GlobalSection(ProjectConfigurationPlatforms) = postSolution
|
GlobalSection(ProjectConfigurationPlatforms) = postSolution
|
||||||
|
{79B976E3-FAB4-4663-B1FA-DC94FC380094}.Debug|Any CPU.ActiveCfg = Debug|x86
|
||||||
{79B976E3-FAB4-4663-B1FA-DC94FC380094}.Debug|x86.ActiveCfg = Debug|x86
|
{79B976E3-FAB4-4663-B1FA-DC94FC380094}.Debug|x86.ActiveCfg = Debug|x86
|
||||||
{79B976E3-FAB4-4663-B1FA-DC94FC380094}.Debug|x86.Build.0 = Debug|x86
|
{79B976E3-FAB4-4663-B1FA-DC94FC380094}.Debug|x86.Build.0 = Debug|x86
|
||||||
|
{79B976E3-FAB4-4663-B1FA-DC94FC380094}.Release|Any CPU.ActiveCfg = Release|x86
|
||||||
{79B976E3-FAB4-4663-B1FA-DC94FC380094}.Release|x86.ActiveCfg = Release|x86
|
{79B976E3-FAB4-4663-B1FA-DC94FC380094}.Release|x86.ActiveCfg = Release|x86
|
||||||
{79B976E3-FAB4-4663-B1FA-DC94FC380094}.Release|x86.Build.0 = Release|x86
|
{79B976E3-FAB4-4663-B1FA-DC94FC380094}.Release|x86.Build.0 = Release|x86
|
||||||
EndGlobalSection
|
EndGlobalSection
|
||||||
|
|||||||
+5
-1
@@ -55,7 +55,8 @@
|
|||||||
<ApplicationManifest>app.manifest</ApplicationManifest>
|
<ApplicationManifest>app.manifest</ApplicationManifest>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<Reference Include="EgtPHOTOLib">
|
<Reference Include="EgtPHOTOLib, Version=2.4.5.1, Culture=neutral, processorArchitecture=x86">
|
||||||
|
<SpecificVersion>False</SpecificVersion>
|
||||||
<HintPath>..\..\EgtProg\Dll32\EgtPHOTOLib.dll</HintPath>
|
<HintPath>..\..\EgtProg\Dll32\EgtPHOTOLib.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="EgtUILib, Version=2.3.4.5, Culture=neutral, processorArchitecture=MSIL">
|
<Reference Include="EgtUILib, Version=2.3.4.5, Culture=neutral, processorArchitecture=MSIL">
|
||||||
@@ -216,6 +217,9 @@
|
|||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<Resource Include="Resources\TopCommandBar\Search.png" />
|
<Resource Include="Resources\TopCommandBar\Search.png" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
<ItemGroup>
|
||||||
|
<Resource Include="Resources\DetailPage\BarCode.png" />
|
||||||
|
</ItemGroup>
|
||||||
<Import Project="$(MSBuildToolsPath)\Microsoft.VisualBasic.targets" />
|
<Import Project="$(MSBuildToolsPath)\Microsoft.VisualBasic.targets" />
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<PostBuildEvent>IF "$(PlatformName)"=="x86" IF "$(ConfigurationName)" == "Release" copy $(TargetPath) c:\EgtProg\OmagPHOTO\OmagPHOTOR32.exe
|
<PostBuildEvent>IF "$(PlatformName)"=="x86" IF "$(ConfigurationName)" == "Release" copy $(TargetPath) c:\EgtProg\OmagPHOTO\OmagPHOTOR32.exe
|
||||||
|
|||||||
Binary file not shown.
|
After Width: | Height: | Size: 1.1 KiB |
@@ -253,6 +253,17 @@
|
|||||||
|
|
||||||
<!-- TextBox -->
|
<!-- TextBox -->
|
||||||
|
|
||||||
|
<Style x:Key="TextBox_WD" TargetType="{x:Type TextBox}" BasedOn="{StaticResource {x:Type TextBox}}">
|
||||||
|
<Setter Property="Height" Value="30"/>
|
||||||
|
<Setter Property="Foreground" Value="Black"/>
|
||||||
|
<Setter Property="Background" Value="White"/>
|
||||||
|
<Setter Property="BorderBrush" Value="Black"/>
|
||||||
|
<Setter Property="BorderThickness" Value="1"/>
|
||||||
|
<Setter Property="TextAlignment" Value="Center"/>
|
||||||
|
<Setter Property="VerticalContentAlignment" Value="Center"/>
|
||||||
|
<Setter Property="Padding" Value="1"/>
|
||||||
|
</Style>
|
||||||
|
|
||||||
<Style TargetType="{x:Type EgtWPFLib5:EgtTextBox}" BasedOn="{StaticResource {x:Type EgtWPFLib5:EgtTextBox}}">
|
<Style TargetType="{x:Type EgtWPFLib5:EgtTextBox}" BasedOn="{StaticResource {x:Type EgtWPFLib5:EgtTextBox}}">
|
||||||
<Setter Property="Height" Value="22"/>
|
<Setter Property="Height" Value="22"/>
|
||||||
<Setter Property="VerticalContentAlignment" Value="Center"/>
|
<Setter Property="VerticalContentAlignment" Value="Center"/>
|
||||||
|
|||||||
Reference in New Issue
Block a user