diff --git a/Effector.Main/Comms/MachineManager.vb b/Effector.Main/Comms/MachineManager.vb index 8ad4494..c950572 100644 --- a/Effector.Main/Comms/MachineManager.vb +++ b/Effector.Main/Comms/MachineManager.vb @@ -1,9 +1,8 @@ -Imports NGP_COMM_DLL +Imports Effector.Plugin.Lib +Imports NGP_COMM_DLL Public Class MachineManager - ' - ' - ' !!!! TO DO : use a list of n machines, not just 2 !!!! + Private m_MachineList(20) As NC.NC_generic Friend ReadOnly Property MachineList As NC.NC_generic() Get diff --git a/Effector.Main/Effector.Main.vbproj b/Effector.Main/Effector.Main.vbproj index 7200754..584c281 100644 --- a/Effector.Main/Effector.Main.vbproj +++ b/Effector.Main/Effector.Main.vbproj @@ -87,7 +87,11 @@ Resources\Effector.ico + + + ..\..\Effector.Plugin.Lib\Effector.Plugin.Lib\bin\Debug\Effector.Plugin.Lib.dll + ..\packages\KeraLua.1.4.1\lib\net46\KeraLua.dll @@ -171,13 +175,10 @@ Dictionary.xaml - - + - - MSBuild:Compile Designer @@ -186,7 +187,6 @@ Application.xaml Code - MainWindowV.xaml Code @@ -243,11 +243,16 @@ Resources.Designer.vb My.Resources + SettingsSingleFileGenerator Settings.Designer.vb + + + + diff --git a/Effector.Main/FiniteStateMachineManager/FiniteStateMachineManager.vb b/Effector.Main/FiniteStateMachineManager/FiniteStateMachineManager.vb index 3b846cc..e781104 100644 --- a/Effector.Main/FiniteStateMachineManager/FiniteStateMachineManager.vb +++ b/Effector.Main/FiniteStateMachineManager/FiniteStateMachineManager.vb @@ -1,5 +1,6 @@ Imports System.IO Imports System.Windows.Threading +Imports Effector.Plugin.Lib Public Class FiniteStateMachineManager diff --git a/Effector.Main/LUA/Lua_General.vb b/Effector.Main/LUA/Lua_General.vb index 78be10c..e56c269 100644 --- a/Effector.Main/LUA/Lua_General.vb +++ b/Effector.Main/LUA/Lua_General.vb @@ -1,6 +1,7 @@ +Imports System.IO Imports KeraLua Imports StackExchange.Redis -Imports System.IO +Imports Effector.Plugin.Lib Public Module Lua_General diff --git a/Effector.Main/MEFPlugin/SupervisorFunctions.vb b/Effector.Main/MEFPlugin/SupervisorFunctions.vb index 41deac0..403b32c 100644 --- a/Effector.Main/MEFPlugin/SupervisorFunctions.vb +++ b/Effector.Main/MEFPlugin/SupervisorFunctions.vb @@ -1,4 +1,5 @@ Imports System.ComponentModel.Composition +Imports Effector.Plugin.Lib Imports Effector.Plugin.Interface Public Class SupervisorFunctions diff --git a/Effector.Main/MainWindow/MainWindowM.vb b/Effector.Main/MainWindow/MainWindowM.vb index 569bc2e..0a7a486 100644 --- a/Effector.Main/MainWindow/MainWindowM.vb +++ b/Effector.Main/MainWindow/MainWindowM.vb @@ -1,6 +1,7 @@ Imports System.Threading Imports System.Math Imports System.IO +Imports Effector.Plugin.Lib Public Class MainWindowM diff --git a/Effector.Main/MainWindow/MainWindowV.xaml b/Effector.Main/MainWindow/MainWindowV.xaml index fa4bb3c..594039c 100644 --- a/Effector.Main/MainWindow/MainWindowV.xaml +++ b/Effector.Main/MainWindow/MainWindowV.xaml @@ -1,15 +1,16 @@ - + - + @@ -21,15 +22,14 @@ - + MinWidth="{Binding ActualHeight, RelativeSource={RelativeSource Self}}" + Source="/Resources/Effector.ico"/> + Style="{StaticResource TitleBar_Button}"> - - + + + Content="{Binding ContentPanel}" + BorderThickness="0"/> - + diff --git a/Effector.Main/MainWindow/MainWindowV.xaml.vb b/Effector.Main/MainWindow/MainWindowV.xaml.vb index bfea309..5201f58 100644 --- a/Effector.Main/MainWindow/MainWindowV.xaml.vb +++ b/Effector.Main/MainWindow/MainWindowV.xaml.vb @@ -1,6 +1,14 @@ -Imports System.Windows.Interop +Imports System.IO +Imports System.Runtime.CompilerServices +Imports System.Runtime.InteropServices +Imports System.Text +Imports System.Windows.Interop +Imports System.Xml +Imports System.Xml.Serialization +Imports Effector.Plugin.Lib Class MainWindowV + Inherits Effector.Plugin.Lib.EgtWindow Private m_MainWindowVM As MainWindowVM @@ -12,72 +20,34 @@ Class MainWindowV InitializeComponent() ' Assegno al DataContext il VM appena creato Me.DataContext = m_MainWindowVM - AddHandler Me.Loaded, AddressOf MainWindowV_Loaded - AddHandler Me.ContentRendered, AddressOf MainWindowV_ContentRendered - AddHandler Me.StateChanged, AddressOf Window_StateChanged - AddHandler Me.Closing, AddressOf MainWindowV_Closing - AddHandler Me.Closed, AddressOf MainWindowV_Closed - Me.RefreshMaximizeRestoreButton() + 'AddHandler Me.ContentRendered, AddressOf MainWindowV_ContentRendered + ' imposto posizione finestra + Me.SetPlacementAppName(S_GENERAL) + Me.SetPlacementKeyName(K_WINPLACE) + Me.SetPlacementFileName(IniFile.sPath) End Sub #End Region ' CONSTRUCTOR - Private Sub RefreshMaximizeRestoreButton() - If Me.WindowState = WindowState.Maximized Then - Me.maximizeButton.Visibility = Visibility.Collapsed - Me.restoreButton.Visibility = Visibility.Visible - Else - Me.maximizeButton.Visibility = Visibility.Visible - Me.restoreButton.Visibility = Visibility.Collapsed - End If - End Sub +#Region "METHODS" + +#End Region ' METHODS #Region "EVENTS" - Private Sub OnMinimizeButtonClick(ByVal sender As Object, ByVal e As RoutedEventArgs) - Me.WindowState = WindowState.Minimized + Protected Overrides Sub OnContentRendered(e As EventArgs) + MyBase.OnContentRendered(e) + m_MainWindowVM.ContentRendered() End Sub - - Private Sub OnMaximizeRestoreButtonClick(ByVal sender As Object, ByVal e As RoutedEventArgs) - If Me.WindowState = WindowState.Maximized Then - Me.WindowState = WindowState.Normal - Else - Me.WindowState = WindowState.Maximized - End If - End Sub - - Private Sub Window_StateChanged(ByVal sender As Object, ByVal e As EventArgs) - Me.RefreshMaximizeRestoreButton() - End Sub - - Private Sub OnCloseButtonClick(ByVal sender As Object, ByVal e As RoutedEventArgs) - Me.Close() - End Sub - - Private Sub MainWindowV_Loaded(sender As Object, e As RoutedEventArgs) - ' Carico e imposto posizione finestra - WinPosFromIniToWindow(S_GENERAL, K_WINPLACE, Me) - End Sub - Private Sub MainWindowV_ContentRendered(sender As Object, e As EventArgs) m_MainWindowVM.ContentRendered() End Sub - Private Sub MainWindowV_Closing(sender As Object, e As System.ComponentModel.CancelEventArgs) - If (Keyboard.Modifiers And ModifierKeys.Alt) = ModifierKeys.Alt OrElse Keyboard.IsKeyDown(Key.F4) Then - e.Cancel = True - Return + Public Overrides Sub OnCloseButtonClick(ByVal sender As Object, ByVal e As RoutedEventArgs) + If m_MainWindowVM.OnClose() Then + EgtOutLog("Exit") + Me.Close() End If - ' Salvo posizione finestra (se non minimizzata) - If WindowState <> WindowState.Minimized Then - WinPosFromWindowToIni(Me, S_GENERAL, K_WINPLACE) - End If - End Sub - - Private Sub MainWindowV_Closed(sender As Object, e As EventArgs) - If Not IsNothing(m_MainWindowVM) AndAlso Not IsNothing(m_MainWindowVM.FiniteStateMachineManager) Then m_MainWindowVM.FiniteStateMachineManager.ResetFiniteStateMachineTimer() - LuaManager.Close() - EgtOutLog("Exit") End Sub #End Region ' EVENTS diff --git a/Effector.Main/MainWindow/MainWindowVM.vb b/Effector.Main/MainWindow/MainWindowVM.vb index c5c558d..60c6a8f 100644 --- a/Effector.Main/MainWindow/MainWindowVM.vb +++ b/Effector.Main/MainWindow/MainWindowVM.vb @@ -2,6 +2,7 @@ Imports System.IO Imports System.Runtime.InteropServices Imports System.Security Imports System.Windows.Threading +Imports Effector.Plugin.Lib Imports Effector.Plugin.Interface Public Module EgtInterface @@ -13,34 +14,34 @@ Public Module EgtInterface #End If -Public Function EgtSetKey(sKey As String) As Boolean -End Function + Public Function EgtSetKey(sKey As String) As Boolean + End Function - -Public Function EgtGetKeyLevel(nProd As Integer, nVer As Integer, nLev As Integer, ByRef nKLev As Integer) As Boolean -End Function + + Public Function EgtGetKeyLevel(nProd As Integer, nVer As Integer, nLev As Integer, ByRef nKLev As Integer) As Boolean + End Function - -Public Function EgtGetKeyOptions(nProd As Integer, nVer As Integer, nLev As Integer, - ByRef nOpt1 As UInteger, ByRef nOpt2 As UInteger) As Boolean -End Function + + Public Function EgtGetKeyOptions(nProd As Integer, nVer As Integer, nLev As Integer, + ByRef nOpt1 As UInteger, ByRef nOpt2 As UInteger) As Boolean + End Function - -Public Function EgtGetKeyLeftDays(ByRef nLeftDays As Integer) As Boolean -End Function + + Public Function EgtGetKeyLeftDays(ByRef nLeftDays As Integer) As Boolean + End Function - -Public Function EgtGetKeyAssLeftDays(ByRef nAssLeftDays As Integer) As Boolean -End Function + + Public Function EgtGetKeyAssLeftDays(ByRef nAssLeftDays As Integer) As Boolean + End Function - -Public Function EgtGetKeyOptLeftDays(ByRef nOptLeftDays As Integer) As Boolean -End Function + + Public Function EgtGetKeyOptLeftDays(ByRef nOptLeftDays As Integer) As Boolean + End Function End Module Public Class MainWindowVM - Inherits vmbase + Inherits VMBase Friend m_PluginTestInfo As Integer = 764 @@ -180,6 +181,16 @@ Public Class MainWindowVM m_WaitAfterRender = 1 End Sub + Friend Function OnClose() As Boolean + If Not IsNothing(FiniteStateMachineManager) Then FiniteStateMachineManager.ResetFiniteStateMachineTimer() + LuaManager.Close() + ' chiudo comunicazione macchine + m_MachineManager.Close() + ' Termino il Model + m_MainWindowM.Close() + Return True + End Function + Private Sub SplashScreenTimer_Tick() If m_WaitAfterRender > 1 Then m_Window_Opacity = 1 diff --git a/Effector.Main/Resources/Fonts/AdventPro-Light.ttf b/Effector.Main/Resources/Fonts/AdventPro-Light.ttf new file mode 100644 index 0000000..61bba6c Binary files /dev/null and b/Effector.Main/Resources/Fonts/AdventPro-Light.ttf differ diff --git a/Effector.Main/Resources/Fonts/AdventPro-Regular.ttf b/Effector.Main/Resources/Fonts/AdventPro-Regular.ttf new file mode 100644 index 0000000..60c8762 Binary files /dev/null and b/Effector.Main/Resources/Fonts/AdventPro-Regular.ttf differ diff --git a/Effector.Main/Resources/SplashScreen.old.png b/Effector.Main/Resources/SplashScreen.old.png new file mode 100644 index 0000000..3812adb Binary files /dev/null and b/Effector.Main/Resources/SplashScreen.old.png differ diff --git a/Effector.Main/Resources/SplashScreen.png b/Effector.Main/Resources/SplashScreen.png index 3812adb..0ed27b0 100644 Binary files a/Effector.Main/Resources/SplashScreen.png and b/Effector.Main/Resources/SplashScreen.png differ diff --git a/Effector.Main/SplashScreen/SplashScreen.xaml b/Effector.Main/SplashScreen/SplashScreen.xaml index 9d10293..c28301d 100644 --- a/Effector.Main/SplashScreen/SplashScreen.xaml +++ b/Effector.Main/SplashScreen/SplashScreen.xaml @@ -10,14 +10,26 @@ Height="600" Width="1000"> - + + + + + + + + + + + FontFamily="./Resources/Fonts/#Advent Pro" + HorizontalAlignment="Center"/> - - - - - - - - - - - - - - - - - - - - - - - - - + diff --git a/Effector.Main/FiniteStateMachine.vb b/Effector.Main/Utility/FiniteStateMachine.vb similarity index 100% rename from Effector.Main/FiniteStateMachine.vb rename to Effector.Main/Utility/FiniteStateMachine.vb diff --git a/Effector.Main/Utility/GenInterface.vb b/Effector.Main/Utility/GenInterface.vb deleted file mode 100644 index cc0386e..0000000 --- a/Effector.Main/Utility/GenInterface.vb +++ /dev/null @@ -1,129 +0,0 @@ -Imports System.Globalization -Imports System.Runtime.InteropServices -Imports System.Text - -Public Module GenInterface - - '-------------------------------- IniFile : Get -------------------------------------------------- - - Public Function GetPrivateProfileInt( - lpAppName As String, - lpKeyName As String, - nDefault As Integer, - lpFileName As String) As Integer - End Function - - Public Function GetPrivateProfileDouble( - lpAppName As String, - lpKeyName As String, - dDefault As Double, - lpFileName As String) As Double - Dim sValue As String = String.Empty - GetPrivateProfileString(lpAppName, lpKeyName, dDefault.ToString(), sValue, lpFileName) - Dim nPos As Integer = sValue.IndexOf(";") - If nPos >= 0 Then - sValue = sValue.Remove(nPos) - End If - Dim dValue As Double - If Not Double.TryParse(sValue, NumberStyles.Float, System.Globalization.CultureInfo.InvariantCulture, dValue) Then - dValue = dDefault - End If - Return dValue - End Function - - - Private Function GetPrivateProfileString( - lpAppName As String, - lpKeyName As String, - lpDefault As String, - lpReturnedString As StringBuilder, - nSize As Integer, - lpFileName As String) As Integer - End Function - Public Function GetPrivateProfileString( - lpAppName As String, - lpKeyName As String, - lpDefault As String, - ByRef lpString As String, - lpFileName As String) As Integer - Dim sb As New StringBuilder(1024) - Dim nRet As Integer = GetPrivateProfileString(lpAppName, lpKeyName, lpDefault, sb, sb.Capacity, lpFileName) - lpString = sb.ToString - Return nRet - End Function - - Public Function GetPrivateProfileWinPos( - lpAppName As String, - lpKeyName As String, - ByRef nFlag As Integer, - ByRef nLeft As Integer, - ByRef nTop As Integer, - ByRef nWidth As Integer, - ByRef nHeight As Integer, - lpFileName As String) As Boolean - Dim sVal As String = String.Empty - GetPrivateProfileString(lpAppName, lpKeyName, "", sVal, lpFileName) - Dim sItems() As String = sVal.Split(",".ToCharArray) - If sItems.Count() >= 5 Then - Dim bOk As Boolean = True - If Not Integer.TryParse(sItems(0), nFlag) Then - nFlag = 0 - bOk = False - End If - If Not Integer.TryParse(sItems(1), nLeft) Then - nLeft = 0 - bOk = False - End If - If Not Integer.TryParse(sItems(2), nTop) Then - nTop = 0 - bOk = False - End If - If Not Integer.TryParse(sItems(3), nWidth) Then - nWidth = 1024 - bOk = False - End If - If Not Integer.TryParse(sItems(4), nHeight) Then - nHeight = 768 - bOk = False - End If - Return bOk - End If - Return False - End Function - - '-------------------------------- IniFile : Write ------------------------------------------------ - - Public Function WritePrivateProfileString( - lpAppName As String, - lpKeyName As String, - lpString As String, - lpFileName As String) As Boolean - End Function - - Public Function WritePrivateProfileWinPos( - lpAppName As String, - lpKeyName As String, - nFlag As Integer, - nLeft As Integer, - nTop As Integer, - nWidth As Integer, - nHeight As Integer, - lpFileName As String) As Boolean - Dim sVal As String - sVal = nFlag.ToString & "," & nLeft.ToString & "," & nTop.ToString & "," & nWidth.ToString & "," & nHeight.ToString - Return WritePrivateProfileString(lpAppName, lpKeyName, sVal, lpFileName) - End Function - - '-------------------------------- Windows -------------------------------------------------------- - Public Enum SW As Integer - HIDE = 0 - SHOWMAXIMIZED = 3 - RESTORE = 9 - End Enum - - - Public Function ShowWindow(hWnd As IntPtr, nCmdShow As Integer) As Boolean - End Function - - -End Module diff --git a/Effector.Main/Utility/IniFile.vb b/Effector.Main/Utility/IniFile.vb deleted file mode 100644 index 61e6f8f..0000000 --- a/Effector.Main/Utility/IniFile.vb +++ /dev/null @@ -1,73 +0,0 @@ -'---------------------------------------------------------------------------- -' EgalTech 2017-2017 -'---------------------------------------------------------------------------- -' File : IniFile.vb Data : 08.05.24 Versione : 2.6e1 -' Contenuto : Modulo IniFile per gestione lettura/scrittura da file INI. -' -' -' -' Modifiche : 08.05.24 ES Creazione modulo. -' -' -'---------------------------------------------------------------------------- - - -Imports System.Collections.ObjectModel - -Public Module IniFile - - Private m_sPath As String - Public ReadOnly Property sPath As String - Get - Return m_sPath - End Get - End Property - Friend Sub SetIniFile(sPath) - m_sPath = sPath - End Sub - - Public Function GetMainPrivateProfileInt(IpAppName As String, IpKeyName As String, nDefault As Integer) As Integer - Return GetPrivateProfileInt(IpAppName, IpKeyName, nDefault, m_sPath) - End Function - - Public Function GetMainPrivateProfileDouble(IpAppName As String, IpKeyName As String, dDefault As Double) As Double - Return GetPrivateProfileDouble(IpAppName, IpKeyName, dDefault, m_sPath) - End Function - - Public Function GetMainPrivateProfileString(IpAppName As String, IpKeyName As String, IpDefault As String, ByRef IpString As String) As Integer - Return GetPrivateProfileString(IpAppName, IpKeyName, IpDefault, IpString, m_sPath) - End Function - - Public Function GetMainPrivateProfileWinPos(IpAppName As String, IpKeyName As String, ByRef nFlag As Integer, ByRef nLeft As Integer, ByRef nTop As Integer, ByRef nWidth As Integer, ByRef nHeight As Integer) As Boolean - Return GetPrivateProfileWinPos(IpAppName, IpKeyName, nFlag, nLeft, nTop, nWidth, nHeight, m_sPath) - End Function - - 'Public Function GetPrivateProfileLanguage(lpAppName As String, lpKeyName As String, lpFileName As String) As Language - ' Dim sVal As String = String.Empty - ' GetPrivateProfileString(lpAppName, lpKeyName, "", sVal, lpFileName) - ' Dim sItems() As String = sVal.Split(",".ToCharArray) - ' If sItems.Count() = 2 Then - ' Return New Language(sItems(0), sItems(1)) - ' End If - ' Return Nothing - 'End Function - - 'Public Function GetMainPrivateProfileLanguage(lpAppName As String, lpKeyName As String) As Language - ' Dim sVal As String = String.Empty - ' GetMainPrivateProfileString(lpAppName, lpKeyName, "", sVal) - ' Dim sItems() As String = sVal.Split(",".ToCharArray) - ' If sItems.Count() = 2 Then - ' Return New Language(sItems(0), sItems(1)) - ' End If - ' Return Nothing - 'End Function - - Public Function WriteMainPrivateProfileString(IpAppName As String, IpKeyName As String, ByRef IpString As String) As Boolean - Return WritePrivateProfileString(IpAppName, IpKeyName, IpString, m_sPath) - End Function - - Public Function WriteMainPrivateProfileWinPos(IpAppName As String, IpKeyName As String, ByRef nFlag As Integer, ByRef nLeft As Integer, ByRef nTop As Integer, ByRef nWidth As Integer, ByRef nHeight As Integer) As Boolean - Return WritePrivateProfileWinPos(IpAppName, IpKeyName, nFlag, nLeft, nTop, nWidth, nHeight, m_sPath) - End Function - -End Module diff --git a/Effector.Main/Utility/RedisManager.vb b/Effector.Main/Utility/RedisManager.vb index c476856..0694c85 100644 --- a/Effector.Main/Utility/RedisManager.vb +++ b/Effector.Main/Utility/RedisManager.vb @@ -1,5 +1,6 @@ Imports StackExchange Imports StackExchange.Redis +Imports Effector.Plugin.Lib Class RedisManager diff --git a/Effector.Main/Utility/VMBase.vb b/Effector.Main/Utility/VMBase.vb deleted file mode 100644 index b2d5ce6..0000000 --- a/Effector.Main/Utility/VMBase.vb +++ /dev/null @@ -1,12 +0,0 @@ -Imports System.ComponentModel - -Public Class VMBase - Implements INotifyPropertyChanged - - Public Event PropertyChanged(sender As Object, e As PropertyChangedEventArgs) Implements INotifyPropertyChanged.PropertyChanged - - Public Sub NotifyPropertyChanged(propName As String) - RaiseEvent PropertyChanged(Me, New PropertyChangedEventArgs(propName)) - End Sub - -End Class diff --git a/Effector.Main/Utility/WinPos.vb b/Effector.Main/Utility/WinPos.vb deleted file mode 100644 index 7eda759..0000000 --- a/Effector.Main/Utility/WinPos.vb +++ /dev/null @@ -1,94 +0,0 @@ -'---------------------------------------------------------------------------- -' EgalTech 2017-2017 -'---------------------------------------------------------------------------- -' File : WinPos.vb Data : 08.04.17 Versione : 1.8d1 -' Contenuto : Classe WinPos per gestione posizione e dimensioni finestra. -' -' -' -' Modifiche : 08.04.17 ES Creazione modulo. -' -' -'---------------------------------------------------------------------------- - -Public Module WinPosition - - Public Class WinPos - ' Membri - Public nFlag As Integer - Public nLeft As Integer - Public nTop As Integer - Public nWidth As Integer - Public nHeight As Integer - - Public Sub ToWindow(Window As Window) - ' Verifico che il punto in alto a sinistra stia nello schermo - Dim PtTL = New System.Drawing.Point(nLeft, nTop) - Dim s As System.Windows.Forms.Screen = System.Windows.Forms.Screen.FromPoint(PtTL) - If Not s.Bounds.Contains(PtTL) Then Return - ' Imposto posizione e dimensioni - Window.WindowStartupLocation = WindowStartupLocation.Manual - Window.Top = nTop - Window.Left = nLeft - Window.Height = nHeight - Window.Width = nWidth - Window.WindowState = If(nFlag = 1, WindowState.Maximized, WindowState.Normal) - End Sub - - Public Sub FromWindow(Window As Window) - nTop = CInt(Window.Top) - nLeft = CInt(Window.Left) - nHeight = CInt(Window.Height) - nWidth = CInt(Window.Width) - nFlag = If(Window.WindowState = WindowState.Maximized, 1, 0) - If Window.WindowState = WindowState.Maximized Then - nHeight = CInt(Window.RestoreBounds.Height) - nWidth = CInt(Window.RestoreBounds.Width) - End If - End Sub - - Public Overloads Function FromIni(sSection As String, sKey As String) As Boolean - Return GetMainPrivateProfileWinPos(sSection, sKey, nFlag, nLeft, nTop, nWidth, nHeight) - End Function - - Public Overloads Function FromIni(sSection As String, sKey As String, IpFileName As String) As Boolean - Return GetMainPrivateProfileWinPos(sSection, sKey, nFlag, nLeft, nTop, nWidth, nHeight) - End Function - - Public Overloads Function ToIni(sSection As String, sKey As String) As Boolean - Return WriteMainPrivateProfileWinPos(sSection, sKey, nFlag, nLeft, nTop, nWidth, nHeight) - End Function - - Public Overloads Function ToIni(sSection As String, sKey As String, IpFileName As String) As Boolean - Return WriteMainPrivateProfileWinPos(sSection, sKey, nFlag, nLeft, nTop, nWidth, nHeight) - End Function - - End Class - - Public Function WinPosFromIniToWindow(sSection As String, sKey As String, Window As Window) As Boolean - Dim WinPos As New WinPos - If Not WinPos.FromIni(sSection, sKey) Then Return False - WinPos.ToWindow(Window) - Return True - End Function - - Public Function WinPosFromIniToWindow(sSection As String, sKey As String, Window As Window, IpFileName As String) As Boolean - Dim WinPos As New WinPos - If Not WinPos.FromIni(sSection, sKey, IpFileName) Then Return False - WinPos.ToWindow(Window) - Return True - End Function - - Public Function WinPosFromWindowToIni(Window As Window, sSection As String, sKey As String) As Boolean - Dim WinPos As New WinPos - WinPos.FromWindow(Window) - Return WinPos.ToIni(sSection, sKey) - End Function - - Public Function WinPosFromWindowToIni(Window As Window, sSection As String, sKey As String, IpFileName As String) As Boolean - Dim WinPos As New WinPos - WinPos.FromWindow(Window) - Return WinPos.ToIni(sSection, sKey, IpFileName) - End Function - -End Module diff --git a/Effector.Main/app.manifest b/Effector.Main/app.manifest new file mode 100644 index 0000000..03a1090 --- /dev/null +++ b/Effector.Main/app.manifest @@ -0,0 +1,80 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Effector.Plugin.Interface/Effector.Plugin.Interface.vbproj b/Effector.Plugin.Interface/Effector.Plugin.Interface.vbproj index 36d48a9..f00efe2 100644 --- a/Effector.Plugin.Interface/Effector.Plugin.Interface.vbproj +++ b/Effector.Plugin.Interface/Effector.Plugin.Interface.vbproj @@ -109,11 +109,8 @@ - IF "$(PlatformName)"=="x86" IF "$(ConfigurationName)" == "Release" copy $(TargetPath) c:\EgtProg\Effector\Effector.Plugin.InterfaceR32.dll -IF "$(PlatformName)"=="x86" IF "$(ConfigurationName)" == "Debug" copy $(TargetPath) c:\EgtProg\Effector\Effector.Plugin.InterfaceD32.dll -IF "$(PlatformName)"=="x64" IF "$(ConfigurationName)" == "Release" copy $(TargetPath) c:\EgtProg\Effector\Effector.Plugin.InterfaceR64.dll -IF "$(PlatformName)"=="x64" IF "$(ConfigurationName)" == "Debug" copy $(TargetPath) c:\EgtProg\Effector\Effector.Plugin.InterfaceD64.dll -copy $(TargetPath) c:\EgtData\Effector\Plugin\Effector.Plugin.FiveLakes\Effector.Plugin.FiveLakes.dll + copy $(TargetPath) c:\EgtData\Effector\Plugin\Effector.Plugin.DoorArreda\Effector.Plugin.Interface.dll +copy $(TargetPath) c:\EgtData\Effector\Plugin\Effector.Plugin.FiveLakes\Effector.Plugin.Interface.dll copy $(TargetPath) c:\EgtProg\Effector\Effector.Plugin.Interface.dll \ No newline at end of file