diff --git a/Constants/ConstIni.vb b/Constants/ConstIni.vb index 66a0a6a..a758414 100644 --- a/Constants/ConstIni.vb +++ b/Constants/ConstIni.vb @@ -35,7 +35,6 @@ Module ConstIni Public Const K_DISABLEARCH As String = "DisableArch" Public Const K_SINGLEDOOR As String = "SingleDoor" Public Const K_DELETEPROJECT As String = "DeleteProject" - Public Const K_ENABLEBTNDESING As String = "EnableDesign" Public Const S_LANGUAGES As String = "Languages" Public Const K_LANGUAGE As String = "Language" @@ -88,8 +87,9 @@ Module ConstIni Public Const S_REPORT As String = "Report" Public Const K_REPORTDIR As String = "ReportDirectory" - Public Const K_REPORTFILE As String = "ReportCurrent" - Public Const K_ENABLEREPORTBROWSE As String = "EnableBrowse" + Public Const K_CURRENTREPORT As String = "CurrentReport" + Public Const K_TEMPLATEBROWSER As String = "TemplateBrowser" + Public Const K_REPORTDESIGNER As String = "ReportDesigner" Public Const S_LAUNCHERWINDOW As String = "LauncherWindow" Public Const K_LAUNCHER As String = "Launcher" diff --git a/DdfFile.vb b/DdfFile.vb index 025d181..bd75529 100644 --- a/DdfFile.vb +++ b/DdfFile.vb @@ -89,6 +89,7 @@ Friend Module DdfFile DdfFileContent.Add(ConstCompo.S_ORDER & ":") Dim TOrder As New TableOrder + TOrder.Order_ParametersList.Add(New ReportParameter("Door", Map.refAssemblyManagerVM.CurrProject.SelAssemblyName.GraphicName)) ' Probabilmente da cambiare If Not IsNothing(Part.Customer) Then DdfFileContent.Add(ConstCompo.DDF_SPACE3 & ConstCompo.K_CUSTOMER & ": " & Part.Customer) diff --git a/MainWindow/MainWindowModel.vb b/MainWindow/MainWindowModel.vb index 03108b8..670d66d 100644 --- a/MainWindow/MainWindowModel.vb +++ b/MainWindow/MainWindowModel.vb @@ -57,8 +57,8 @@ Friend Class MainWindowModel EgtUILib.GetPrivateProfileString(S_LICENCE, K_KEY, "", sKey, sLicFile) EgtSetKey(sKey) ' Recupero livello e opzioni della chiave - Dim bKey As Boolean = EgtGetKeyLevel(3279, 19, 1, IniFile.m_nKeyLevel) And - EgtGetKeyOptions(3279, 19, 1, IniFile.m_nKeyOptions) + Dim bKey As Boolean = EgtGetKeyLevel(3279, 21, 1, IniFile.m_nKeyLevel) And + EgtGetKeyOptions(3279, 21, 1, IniFile.m_nKeyOptions) 'Inizializzazione generale di EgtInterface m_nDebug = GetMainPrivateProfileInt(S_GENERAL, K_DEBUG, 0) Dim sLogFile As String = IniFile.m_sTempDir & "\" & GENLOG_FILE_NAME.Replace("#", m_nInstance.ToString()) diff --git a/My Project/AssemblyInfo.vb b/My Project/AssemblyInfo.vb index 9bf57a0..a952dab 100644 --- a/My Project/AssemblyInfo.vb +++ b/My Project/AssemblyInfo.vb @@ -32,7 +32,7 @@ Imports System.Windows - + diff --git a/OptionsWindow/OptionModule.vb b/OptionsWindow/OptionModule.vb index e3f7a78..3d0b742 100644 --- a/OptionsWindow/OptionModule.vb +++ b/OptionsWindow/OptionModule.vb @@ -247,7 +247,7 @@ Friend Module OptionModule End If Dim sListLabelFile As String = String.Empty - If GetMainPrivateProfileString(S_REPORT, K_REPORTFILE, "", sListLabelFile) > 0 AndAlso File.Exists(sListLabelFile) Then + If GetMainPrivateProfileString(S_REPORT, K_CURRENTREPORT, "", sListLabelFile) > 0 AndAlso File.Exists(sListLabelFile) Then IniFile.m_sListLabelCurrent = sListLabelFile Else ' mantengo l'accesso a quello di default @@ -281,9 +281,9 @@ Friend Module OptionModule m_DeleteProject = If(GetMainPrivateProfileInt(S_GENERAL, K_DELETEPROJECT, 0) = 1, True, False) - m_VisibilityBtnDesign = If(GetMainPrivateProfileInt(S_GENERAL, K_ENABLEBTNDESING, 0) = 1, Visibility.Visible, Visibility.Hidden) + m_VisibilityBtnDesign = If(GetMainPrivateProfileInt(S_REPORT, K_REPORTDESIGNER, 0) = 1, Visibility.Visible, Visibility.Hidden) - m_EnableBrowse = If(GetMainPrivateProfileInt(S_REPORT, K_ENABLEREPORTBROWSE, 0) = 1, True, False) + m_EnableBrowse = If(GetMainPrivateProfileInt(S_REPORT, K_TEMPLATEBROWSER, 0) = 1, True, False) ' leggo il tipo di Bevel selezionato DefaultGetPrivateProfilesBevel(S_EDGE, K_BEVELU_INI, m_bBevelUp) diff --git a/Print/PrintWndV.xaml b/Print/PrintWndV.xaml index 13c1fee..ce9543c 100644 --- a/Print/PrintWndV.xaml +++ b/Print/PrintWndV.xaml @@ -10,7 +10,7 @@ Title="{Binding Title}" Icon="/Resources/EgtDOOR.ico" TitleBarBrush="{StaticResource EgaltechBlue1}" BorderBrush="{StaticResource EgaltechBlue1}" - WindowStyle="None" ResizeMode="NoResize" TitleBarHeight="30" IsResizable="False" + WindowStyle="None" ResizeMode="NoResize" TitleBarHeight="30" IsResizable="false" IsMinimizable="False" WindowStartupLocation="CenterScreen" ShowInTaskbar="False" CloseCommand="{Binding CancelCommand,Mode=OneWay,UpdateSourceTrigger=PropertyChanged}" SizeToContent="WidthAndHeight"> @@ -21,25 +21,31 @@ - + -