diff --git a/EpdBase/EpdBase.cpp b/EpdBase/EpdBase.cpp index 3a55a55..1286abf 100644 --- a/EpdBase/EpdBase.cpp +++ b/EpdBase/EpdBase.cpp @@ -1,12 +1,11 @@ #include "stdafx.h" #include "EpdBase.h" - #define DiscoveryTimeslotPeriod 100 #define DiscoveryExpirationPeriod 6000 #define RxRetryCount 5 #define TxRetryCount 5 - #pragma unmanaged + EpdBase::Epd2U::Epd2U(int comport) { port = comport; @@ -16,14 +15,12 @@ EpdBase::Epd2U::Epd2U(int comport) Error = 123; //SetTimeouts(port, 20, 1000, 1000); } - -DWORD EpdBase::Epd2U::WriteConfig() +WORD EpdBase::Epd2U::WriteConfig() { if (port == 0) return 1; return WriteDisplayConfig(00,2,40,10, 2,displayConfig, 56); } - -DWORD EpdBase::Epd2U::StartCom() +DWORD EpdBase::Epd2U::StartCom() { DWORD rv; ErrorReason = 0; @@ -53,16 +50,14 @@ DWORD EpdBase::Epd2U::StartCom() CommsInitialized = InitRv; return ErrorReason; } - EpdBase::Epd2U::~Epd2U() { if (port>0) DeinitComms(port); CommsInitialized = 0; } - int EpdBase::Epd2U::StartDiscover() { - WORD rv; + //WORD rv; //System::Diagnostics::Trace::WriteLine("StartDiscover"); Error = 0; @@ -94,7 +89,6 @@ int EpdBase::Epd2U::StartDiscover() //System::Diagnostics::Trace::WriteLine(System::String::Format("Discover DeviceCount = {0}", DeviceCount)); return DiscRV; } - void EpdBase::Epd2U::Open(DWORD DeviceID) { CurrentDeviceID = DeviceID; @@ -108,18 +102,15 @@ void EpdBase::Epd2U::Open(DWORD DeviceID) } else { OpenRV = ConRV = 1; } } - void EpdBase::Epd2U::Close() { if (port>0) CloseDevice(); //DeinitComms(port); CommsInitialized = 0; } - void EpdBase::Epd2U::DecodeFunctionFlags() { EpdType = (FunctionFlags & 0x1F00) >> 8; } - void EpdBase::Epd2U::DecodeStatus() { DetectorsOn = (OperatingStatus & 1) != 0; @@ -154,16 +145,16 @@ void EpdBase::Epd2U::DecodeStatus() OtherAlarmBatVolt = (OtherAlarms & 0x40) != 0; } - -WORD EpdBase::Epd2U::ReadStatus() +WORD EpdBase::Epd2U::ReadStatus() { Error = 0; ReadStatusRV = 0; memset(WearerID, 0, WearerIDLength + 1); memset(WearerName, 0, WearerNameLength + 1); - EpdClock = RealTime = IssueCount = OffTime = OperatingStatus = ErrorStatus = AlarmStatus = OtherAlarms = EEPROMBadSectors = 0; + IssueCount = OperatingStatus = ErrorStatus = AlarmStatus = OtherAlarms = EEPROMBadSectors = 0; + RealTime = EpdClock = OffTime = EpdID = 0; ErrorSource = ErrorReason = ErrorData = 0; - EpdID = HardVersion = SoftVersion = FunctionFlags = 0; + HardVersion = SoftVersion = FunctionFlags = 0; if (port == 0) { EpdID = 4567; @@ -216,8 +207,7 @@ WORD EpdBase::Epd2U::ReadStatus() } return CommitRV; } - -WORD EpdBase::Epd2U::EPDReadExtraStatus() +WORD EpdBase::Epd2U::EPDReadExtraStatus() { if (port == 0) return 1; @@ -237,8 +227,7 @@ WORD EpdBase::Epd2U::EPDReadExtraStatus() Error = GetErrorDetails(&ErrorSource, &ErrorReason, &ErrorData); return CommitRV; } - -WORD EpdBase::Epd2U::EPDReadConfig() +WORD EpdBase::Epd2U::EPDReadConfig() { if (port == 0) return 1; @@ -261,8 +250,7 @@ WORD EpdBase::Epd2U::EPDReadConfig() if (CommitRV == 0) Error = GetErrorDetails(&ErrorSource, &ErrorReason, &ErrorData); return CommitRV; } - -WORD EpdBase::Epd2U::TurnOff() +WORD EpdBase::Epd2U::TurnOff() { if (port == 0) return 1; @@ -277,8 +265,7 @@ WORD EpdBase::Epd2U::TurnOff() } return CommitRV; } - -WORD EpdBase::Epd2U::TurnOn() +WORD EpdBase::Epd2U::TurnOn() { if (port == 0) return 1; //OnRV = EpdOn(); @@ -296,8 +283,7 @@ WORD EpdBase::Epd2U::TurnOn() return 0; } - -WORD EpdBase::Epd2U::WriteCal() +WORD EpdBase::Epd2U::WriteCal() { if (port == 0) return 1; @@ -316,8 +302,7 @@ WORD EpdBase::Epd2U::WriteCal() if (CommitRV == 0) Error = GetErrorDetails(&ErrorSource, &ErrorReason, &ErrorData); return CommitRV; } - -WORD EpdBase::Epd2U::ReadTresHolds() +WORD EpdBase::Epd2U::ReadTresHolds() { if (port == 0) { Hp10THDose1 = Hp10THDose2 = Hp10THDose2 = 123; @@ -350,13 +335,14 @@ WORD EpdBase::Epd2U::ReadTresHolds() if (CommitRV == 0) Error = GetErrorDetails(&ErrorSource, &ErrorReason, &ErrorData); return CommitRV; } - -WORD EpdBase::Epd2U::ReadDoses() +WORD EpdBase::Epd2U::ReadDoses() { if (port == 0) { Hp10Dose = Hp07Dose = Hp10Total = Hp07Total = Knocks = Resets = QualityData = 21; Hp10Peak = Hp07Peak = Hp10Time = Hp07Time = 1000; ErrorSource = ErrorReason = ErrorData = 0; + K1 = 1; K2 = 2; K3 = 3; K4 = 4; K5 = 5; K6 = 6; + SG = 7; BC = 8; FB = 9; HG = 10; return 1; } ReadDosesQualityRV = ReadPeaksRV = CommitRV = 0; @@ -402,9 +388,7 @@ WORD EpdBase::Epd2U::ReadDoses() if (CommitRV == 0) Error = GetErrorDetails(&ErrorSource, &ErrorReason, &ErrorData); return CommitRV; } - - -WORD EpdBase::Epd2U::PrepareForIssue() +WORD EpdBase::Epd2U::PrepareForIssue() { if (port == 0) return 1; CommitRV = WriteConfig(); @@ -415,7 +399,7 @@ WORD EpdBase::Epd2U::PrepareForIssue() if (CommitRV) CommitRV = Commit(); return CommitRV; } -WORD EpdBase::Epd2U::DeIssue() +WORD EpdBase::Epd2U::DeIssue() { ClearDoseRV = ClearTotalDoseRV = ClearPeakRatesRV = DeIssueEpdRV = 0; if (port == 0) return 1; @@ -444,13 +428,11 @@ WORD EpdBase::Epd2U::DeIssue() Close(); return CommitRV; } - - -WORD EpdBase::Epd2U::Issue() +WORD EpdBase::Epd2U::Issue() { IssueEpdRV = WriteAlarmDoseThresholdsRV = WriteAlarmRateThresholdsRV = WriteWearerNameRV = OnRV = CommitRV = 0; if (port == 0) return 1; - DWORD OKRV = SetFailFlag(); // all actions have been completed + WORD OKRV = SetFailFlag(); // all actions have been completed if (OKRV) OKRV = Commit(); if (OKRV) OKRV = WriteAlarmDoseThresholds(Hp10THDose1, Hp10THDose2, Hp07THDose); @@ -458,7 +440,7 @@ WORD EpdBase::Epd2U::Issue() if (OKRV) OKRV = Commit(); if (OKRV) OKRV = IssueEpd(WearerID, WearerIDLength); if (OKRV) OKRV = Commit(); - if (OKRV) OKRV = WriteWearerName(WearerName,strlen((char *)WearerName)); + if (OKRV) OKRV = WriteWearerName(WearerName,(WORD)strlen((char *)WearerName)); if (OKRV) OKRV = Commit(); if (OKRV) OKRV = BaseLineCounts(); if (OKRV == 0) diff --git a/EpdBase/EpdBase.h b/EpdBase/EpdBase.h index 71cf5a1..a3b634a 100644 --- a/EpdBase/EpdBase.h +++ b/EpdBase/EpdBase.h @@ -210,7 +210,7 @@ namespace EpdBase void DecodeStatus(); Epd2U(int comport); - DWORD WriteConfig(); + WORD WriteConfig(); DWORD StartCom(); WORD ReadStatus(); WORD EPDReadExtraStatus(); diff --git a/EpdBase/TimeFunctions.h b/EpdBase/TimeFunctions.h index aff36d8..9756f33 100644 --- a/EpdBase/TimeFunctions.h +++ b/EpdBase/TimeFunctions.h @@ -2,7 +2,7 @@ #include #include -static class TimeFunctions +class TimeFunctions { public: TimeFunctions(); diff --git a/EpdBaseClr/EpdBaseClr.cpp b/EpdBaseClr/EpdBaseClr.cpp index 193ade8..93b40ea 100644 --- a/EpdBaseClr/EpdBaseClr.cpp +++ b/EpdBaseClr/EpdBaseClr.cpp @@ -131,16 +131,19 @@ int EpdBaseClr::Epd2::GetDoses() GetDosesError = epd->Error; } - if (epd->Hp10Time > 0) - Hp10PeakTime = System::DateTime::Now.AddSeconds(-(epd->EpdClock - epd->Hp10Time)); - else + if (epd->Hp10Time > 0) { + double x = (epd->EpdClock - epd->Hp10Time) * -1.0; + Hp10PeakTime = System::DateTime::Now.AddSeconds(x); + } + else Hp10PeakTime = System::Nullable();; - if (epd->Hp07Time>0) - Hp07PeakTime = System::DateTime::Now.AddSeconds(-(epd->EpdClock - epd->Hp07Time )); + if (epd->Hp07Time > 0) { + double x = (epd->EpdClock - epd->Hp07Time) * -1.0; + Hp07PeakTime = System::DateTime::Now.AddSeconds(x); + } else Hp10PeakTime = System::Nullable(); - QualityData = epd->QualityData; K1 = epd->K1; K2 = epd->K2; @@ -172,16 +175,16 @@ int EpdBaseClr::Epd2::PrepareForIssue() int EpdBaseClr::Epd2::SetIssued() { SetIssuedError = 0; - epd->Hp07THDose = Hp07THDose*64; - epd->Hp10THDose1 = Hp10THDose1*64; - epd->Hp10THDose2 = Hp10THDose2*64; + epd->Hp07THDose = (DWORD)(Hp07THDose*64.0); + epd->Hp10THDose1 = (DWORD)(Hp10THDose1*64.0); + epd->Hp10THDose2 = (DWORD)(Hp10THDose2*64.0); - epd->Hp10Rate1On = Hp10Rate1On; - epd->Hp10Rate2On = Hp10Rate2On; - epd->Hp07RateOn = Hp07RateOn; - epd->Hp10Rate1Off = Hp10Rate1Off; - epd->Hp10Rate2Off = Hp10Rate2Off; - epd->Hp07RateOff = Hp07RateOff; + epd->Hp10Rate1On = (DWORD)(Hp10Rate1On); + epd->Hp10Rate2On = (DWORD)(Hp10Rate2On); + epd->Hp07RateOn = (DWORD)(Hp07RateOn); + epd->Hp10Rate1Off = (DWORD)(Hp10Rate1Off); + epd->Hp10Rate2Off = (DWORD)(Hp10Rate2Off); + epd->Hp07RateOff = (DWORD)(Hp07RateOff); memset(epd->WearerID, ' ', WearerIDLength); epd->WearerID[WearerIDLength] = 0; char* str1 = (char*)(void *)Runtime::InteropServices::Marshal::StringToHGlobalAnsi(WearerID); diff --git a/EpdBaseClr/EpdBaseClr.vcxproj b/EpdBaseClr/EpdBaseClr.vcxproj index 533a29a..df73f76 100644 --- a/EpdBaseClr/EpdBaseClr.vcxproj +++ b/EpdBaseClr/EpdBaseClr.vcxproj @@ -21,7 +21,7 @@ 15.0 {F1F47B79-9930-48B0-8DDE-56E2C4BED2A2} - v4.7.2 + v4.8 ManagedCProj EpdBaseClr 10.0 diff --git a/eDosStation/App.Debug.config b/eDosStation/App.Debug.config index e36bc80..c38cc20 100644 --- a/eDosStation/App.Debug.config +++ b/eDosStation/App.Debug.config @@ -1,4 +1,13 @@  + + + + + + + + + \ No newline at end of file diff --git a/eDosStation/App.config b/eDosStation/App.config index 2a9dc4f..1d30e9b 100644 --- a/eDosStation/App.config +++ b/eDosStation/App.config @@ -1,22 +1,17 @@ - + - -
+ +
- - - + + + - + @@ -43,4 +38,9 @@ - \ No newline at end of file + + + + + + diff --git a/eDosStation/EntryBadge.xaml.cs b/eDosStation/EntryBadge.xaml.cs index bdd004e..d107791 100644 --- a/eDosStation/EntryBadge.xaml.cs +++ b/eDosStation/EntryBadge.xaml.cs @@ -1,4 +1,5 @@ -using System; + +using System; using System.Data; using System.Text; using System.Windows; @@ -21,18 +22,18 @@ namespace eDosStation int Search, UserSeconds; Boolean Inst1 = false, Inst2 = false; - public static OkReadBadge.Badging a; - System.Threading.Thread t; - bool nextCSN = false; - bool nextSite = false; - bool nextCode = false; - bool nextFinish = false; - string csn, site, code; + public static LSWDesfirePublic.CCard dfReader; + //System.Threading.Thread t; + //bool nextCSN = false; + //bool nextSite = false; + //bool nextCode = false; + //bool nextFinish = false; + //string csn, site, code; static User _User; DataSet1.GetTaskInfoRow CurTaskRow; enum eCOE { quiz=1} ; - private bool StopReadBadge=true; + #if SimulateEPD public SimulateData simulData = new SimulateData(); @@ -164,9 +165,9 @@ namespace eDosStation ep.WearerName = _User.PersID.ToString(); #if SimulateEPD - simulData.DebugEpdType = ep.epdType; - simulData.DebugWearerID = ep.WearerID; - simulData.DebugWearerName = ep.WearerName; + simulData.EdpType = ep.epdType; + simulData.WearerID = ep.WearerID; + simulData.WearerName = ep.WearerName; #endif ep.Hp07RateOn = CurTaskRow.HP07RateON; @@ -365,43 +366,17 @@ namespace eDosStation _User = LocalRemote.GetUser(CSN.Text, Code.Text); ShowUserInfo(); //AskTask(); } - public void showBadge() + public void showBadge(int persID, string csn) { CSN.Text = csn; - Site.Text = site; - Code.Text = code; - + Site.Text = string.Empty; + Code.Text = persID.ToString(); Dispatcher.Invoke(CheckBadge); } - bool Msg(int err) - { - //decodeert verschillende USB messages. (callback ) - if (StopReadBadge ) - { - System.Diagnostics.Debug.WriteLine("msg dropped:"); - if (err!=0) System.Diagnostics.Debug.WriteLine($"msg result={a.clr.Result}"); - return false; - } - - if (err == 0) - { - System.Diagnostics.Debug.WriteLine($"msg result={a.clr.Result} {a.clr.Final}"); - if (a.clr.Final) - { - csn = a.clr.CSN; - site = a.clr.Site; - code = a.clr.Badge; - this.Dispatcher.Invoke(new Action(() => showBadge())); - StopReadBadge = true; - } - } - else - System.Diagnostics.Debug.WriteLine($"Error {err}"); - return false; - } - + private void bClose_Click(object sender, RoutedEventArgs e) { + dfReader?.Dispose(); dfReader = null; this.Close(); } private void BClear_Click(object sender, RoutedEventArgs e) @@ -523,10 +498,8 @@ namespace eDosStation private void Window_Closing(object sender, System.ComponentModel.CancelEventArgs e) { - t = null; - a = null; + dfReader?.Dispose(); dfReader = null; ep.Close(); - //t.Abort(); } private void CbInst2_Click(object sender, RoutedEventArgs e) @@ -537,23 +510,6 @@ namespace eDosStation SetFilter(isAlara); } - private void Starter() - { - try - { - if (a == null) - { - a = new OkReadBadge.Badging(Msg); - StopReadBadge = false; - a.Start(); - } - } catch (System.Exception ex) - { - MessageBox.Show($"Badgereader error {ex.Message}", "Error", MessageBoxButton.OK, MessageBoxImage.Exclamation); - } - } - - private void AddTestButtons() { //pTestButtons @@ -594,28 +550,57 @@ namespace eDosStation LocalRemote.FillComment(); - string TestCSN = thisStation.TestCSN; + //string TestCSN = null; // thisStation.TestCSN; initialising = false; if (Properties.Settings.Default.useTestButtons) AddTestButtons(); - if (string.IsNullOrWhiteSpace(TestCSN)) + if (dfReader == null) { - t = new System.Threading.Thread(() => Starter()); - t.Start(); - } - else - { - ////Debug - _User = LocalRemote.GetUser(TestCSN, string.Empty); - if (_User.Error > 0) + dfReader = new LSWDesfirePublic.CCard(); + dfReader.GetReaderList(); + if (dfReader.readersList.Contains(thisStation.Reader)) { - MessageBox.Show(_User.ErrorMessage, "DB Error", MessageBoxButton.OK, MessageBoxImage.Exclamation); - } else { - Dispatcher.InvokeAsync(ShowUserInfo); //AskTask - } + dfReader.SetReader(thisStation.Reader); + dfReader.Badged += DFReader_Badged; + dfReader.WaitForBadge(); + } + else + { + StringBuilder er = new StringBuilder($"Badgelezer \"{thisStation.Reader}\" niet gevonden!.\nDeze zijn beschikbaar:\n"); + dfReader.GetReaderList(); + foreach (string r in dfReader.readersList) er.AppendLine(r); + MessageBox.Show(er.ToString(), "Badge Lezer", MessageBoxButton.OK, MessageBoxImage.Exclamation); + dfReader.Dispose(); dfReader = null; + } } + else { + dfReader.WaitForBadge(); + } + + //if (string.IsNullOrWhiteSpace(TestCSN) && a==null) + //{ + + //t = new System.Threading.Thread(() => Starter()); + //t.Start(); + //} + //else + //{ + // ////Debug + // _User = LocalRemote.GetUser(TestCSN, string.Empty); + // if (_User.Error > 0) + // { + // MessageBox.Show(_User.ErrorMessage, "DB Error", MessageBoxButton.OK, MessageBoxImage.Exclamation); + // } else { + // Dispatcher.InvokeAsync(ShowUserInfo); //AskTask + // } + //} + } + + private void DFReader_Badged(LSWDesfirePublic.CCard Sender, LSWDesfirePublic.BadgeEventArgs e) + { + this.Dispatcher.Invoke(new Action(() => showBadge(e.PersID,e.UID))); } } } diff --git a/eDosStation/EpdExit.xaml.cs b/eDosStation/EpdExit.xaml.cs index d323960..bf3d076 100644 --- a/eDosStation/EpdExit.xaml.cs +++ b/eDosStation/EpdExit.xaml.cs @@ -69,18 +69,17 @@ namespace eDosStation MessageBox.Show($"GetStatus {rv} error {er}"); } - #if SimulateEPD - ep.epdType = simulData.DebugEpdType; + ep.epdType = simulData.EdpType; ep.Issued = true; ep.alarmStatus = 0; ep.otherAlarms = 0; - ep.WearerID = simulData.DebugWearerID; - ep.WearerName = simulData.DebugWearerName; + ep.WearerID = simulData.WearerID; + ep.WearerName = simulData.WearerName; ep.Hp07 = 1; ep.Hp10 = 2; -#endif +#endif if (!ep.Issued) { diff --git a/eDosStation/LocalRemote.cs b/eDosStation/LocalRemote.cs index f00113e..62c4124 100644 --- a/eDosStation/LocalRemote.cs +++ b/eDosStation/LocalRemote.cs @@ -49,20 +49,21 @@ namespace eDosStation #if DEBUG cs.ConnectTimeout = 10; #endif + isLocal = false; Connection = new System.Data.SqlClient.SqlConnection(cs.ConnectionString); try { Connection.Open(); - isLocal = false; } - catch { } + catch { } if (Connection.State != System.Data.ConnectionState.Open) { - switchLocal(); //wijzigt currentConStr + switchLocal(true); //wijzigt currentConStr als isLocal niet al gezet is. } else { currentConStr = serverConstr; + isLocal = false; rv = true; } if (!rv) @@ -72,7 +73,7 @@ namespace eDosStation Connection.Open(); rv = true; } - catch (System.Exception ex) + catch { Connection.Dispose(); Connection = null; @@ -116,9 +117,9 @@ namespace eDosStation MakeCommands(); } - static void switchLocal() + static void switchLocal(bool force=false) { - if (!isLocal) + if (force || !isLocal) { isLocal = true; currentConStr = localConstr; @@ -286,15 +287,17 @@ namespace eDosStation } } - static public User GetUser(string CSN, string Code) + static public User GetUser( string CSN, string Code) { User u = new User(); object[] Values = null; + if (int.TryParse(Code,out int PersID)) using (var cmd = new SqlCommand("GetPersonInfo", Connection)) { cmd.CommandType = System.Data.CommandType.StoredProcedure; cmd.Parameters.AddWithValue("csn", CSN); - if (!string.IsNullOrWhiteSpace(Code)) cmd.Parameters.AddWithValue("Badge", Code); + cmd.Parameters.AddWithValue("PersID", PersID); + //if (!string.IsNullOrWhiteSpace(Code)) cmd.Parameters.AddWithValue("Badge", Code); checkCon(true); cmd.Connection = Connection; var rs = cmd.ExecuteReader(System.Data.CommandBehavior.SingleRow); diff --git a/eDosStation/MainWindow.xaml.cs b/eDosStation/MainWindow.xaml.cs index f96bd1c..fdfb991 100644 --- a/eDosStation/MainWindow.xaml.cs +++ b/eDosStation/MainWindow.xaml.cs @@ -77,7 +77,6 @@ namespace eDosStation Status.Content = ">>> Online >>>"; Status.Foreground = Brushes.Green; Status.Background = Brushes.White; - } } private void Window_Loaded(object sender, RoutedEventArgs e) @@ -145,6 +144,8 @@ namespace eDosStation else ibComment.Visibility = Visibility.Hidden; } + // nog niet in db + } setLocalStatus(); } diff --git a/eDosStation/Properties/Resources.Designer.cs b/eDosStation/Properties/Resources.Designer.cs index 0171334..417ddc7 100644 --- a/eDosStation/Properties/Resources.Designer.cs +++ b/eDosStation/Properties/Resources.Designer.cs @@ -8,10 +8,10 @@ // //------------------------------------------------------------------------------ -namespace eDosStation.Properties -{ - - +namespace eDosStation.Properties { + using System; + + /// /// A strongly-typed resource class, for looking up localized strings, etc. /// @@ -19,51 +19,43 @@ namespace eDosStation.Properties // class via a tool like ResGen or Visual Studio. // To add or remove a member, edit your .ResX file then rerun ResGen // with the /str option, or rebuild your VS project. - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "16.0.0.0")] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] - internal class Resources - { - + internal class Resources { + private static global::System.Resources.ResourceManager resourceMan; - + private static global::System.Globalization.CultureInfo resourceCulture; - + [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")] - internal Resources() - { + internal Resources() { } - + /// /// Returns the cached ResourceManager instance used by this class. /// [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] - internal static global::System.Resources.ResourceManager ResourceManager - { - get - { - if ((resourceMan == null)) - { + internal static global::System.Resources.ResourceManager ResourceManager { + get { + if (object.ReferenceEquals(resourceMan, null)) { global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("eDosStation.Properties.Resources", typeof(Resources).Assembly); resourceMan = temp; } return resourceMan; } } - + /// /// Overrides the current thread's CurrentUICulture property for all /// resource lookups using this strongly typed resource class. /// [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] - internal static global::System.Globalization.CultureInfo Culture - { - get - { + internal static global::System.Globalization.CultureInfo Culture { + get { return resourceCulture; } - set - { + set { resourceCulture = value; } } diff --git a/eDosStation/Properties/Settings.Designer.cs b/eDosStation/Properties/Settings.Designer.cs index e939cb0..47ce8e4 100644 --- a/eDosStation/Properties/Settings.Designer.cs +++ b/eDosStation/Properties/Settings.Designer.cs @@ -12,7 +12,7 @@ namespace eDosStation.Properties { [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "16.7.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "16.8.1.0")] internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase { private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings()))); diff --git a/eDosStation/Settings.xaml b/eDosStation/Settings.xaml index 295606f..50963f9 100644 --- a/eDosStation/Settings.xaml +++ b/eDosStation/Settings.xaml @@ -13,7 +13,11 @@ - + + + + + @@ -34,11 +38,13 @@ - + + + -