fix #28

diff --git a/SpeedportHybridControl/PageModel/LteInfoModel.cs b/SpeedportHybridControl/PageModel/LteInfoModel.cs
index 3a0a0df7a6505e68be02123b826992d2153fa83d..64b05babf8aed7e63b121f5670648431afc01ed1 100644 (file)
--- a/SpeedportHybridControl/PageModel/LteInfoModel.cs
+++ b/SpeedportHybridControl/PageModel/LteInfoModel.cs
@@ -93,6 +93,9 @@ namespace SpeedportHybridControl.PageModel {
                                _ltepopup.Show();
                                StopTimer();
                        }
+
+                       ltepopupModel lm = Application.Current.FindResource("ltepopupModel") as ltepopupModel;
+                       lm.StartTimer();
                }
 
                public bool AutoReload {

diff --git a/SpeedportHybridControl/PageModel/MainWindowModel.cs b/SpeedportHybridControl/PageModel/MainWindowModel.cs
index 77428569ac78c0a21b68d4b259ba6aeb661b6c8f..d254c37d495f6c9c271544f1bedc1f54fd7dd5cb 100644 (file)
--- a/SpeedportHybridControl/PageModel/MainWindowModel.cs
+++ b/SpeedportHybridControl/PageModel/MainWindowModel.cs
@@ -10,7 +10,7 @@ using System.Windows;
 
 namespace SpeedportHybridControl.PageModel {
        class MainWindowModel : SuperViewModel {
-               public const string VERSION = "1.0-pre9"; //TODO: change this later
+               public const string VERSION = "1.0-pre11";
 
                private string _loginButtonContent = "Login";
 

diff --git a/SpeedportHybridControl/PageModel/ltepopupModel.cs b/SpeedportHybridControl/PageModel/ltepopupModel.cs
index 07e6ce8f68d13c5280bafd558210fe7f50f22d0a..adcc97815510d7e7c822d8883e1742b2c217419d 100644 (file)
--- a/SpeedportHybridControl/PageModel/ltepopupModel.cs
+++ b/SpeedportHybridControl/PageModel/ltepopupModel.cs
@@ -130,7 +130,7 @@ namespace SpeedportHybridControl.PageModel {
                        }
                }
 
-               private void StartTimer () {
+               public void StartTimer () {
                        _timer = new System.Timers.Timer {
                                Interval = 1000, // every second
                        };
@@ -201,8 +201,6 @@ namespace SpeedportHybridControl.PageModel {
                        ds2.SetYMapping(y => y.Data);
 
                        RsrpGraph = ds2;
-
-                       StartTimer();
         }
        }
 }

diff --git a/SpeedportHybridControl/page/LoginPage.xaml b/SpeedportHybridControl/page/LoginPage.xaml
index a67cdad54a7944eb9b1ff4270e07556b85b74c90..b3e1f597283cc97bb5b3956e3aa1365e515b263e 100644 (file)
--- a/SpeedportHybridControl/page/LoginPage.xaml
+++ b/SpeedportHybridControl/page/LoginPage.xaml
@@ -15,7 +15,7 @@
             <TextBox Text="{Binding Path=ip, Mode=TwoWay}" HorizontalAlignment="Left" Height="23" Margin="115,14,0,0" TextWrapping="Wrap" VerticalAlignment="Top" Width="120"/>
 
             <TextBlock Text="Passwort:" HorizontalAlignment="Left" Margin="55,49,0,0" VerticalAlignment="Top" />
-            <PasswordBox Implementations:PasswordHelper.Password="{Binding Path=password, Mode=TwoWay}"  Visibility="{Binding Path=PasswordBoxVisibility}" x:Name="passwordBox" HorizontalAlignment="Left" Height="23" Margin="115,42,0,0" VerticalAlignment="Top" Width="120" ForceCursor="True" />
+            <PasswordBox Implementations:PasswordHelper.Password="{Binding Path=password, Mode=TwoWay, NotifyOnSourceUpdated=True}"  Visibility="{Binding Path=PasswordBoxVisibility}" x:Name="passwordBox" HorizontalAlignment="Left" Height="23" Margin="115,42,0,0" VerticalAlignment="Top" Width="120" ForceCursor="True" />
             <TextBox Text="{Binding Path=password, Mode=TwoWay}" HorizontalAlignment="Left" Height="23" Margin="115,42,0,0" VerticalAlignment="Top" Width="120" Visibility="{Binding Path=PasswordTextBoxVisibility}"/>
             <CheckBox Command="{Binding Path=ShowPasswordCommand}" IsChecked="{Binding Path=ShowPassword, Mode=TwoWay}" Content="Passwort anzeigen" Margin="240,50,0,0" HorizontalAlignment="Left" VerticalAlignment="Top" />
             <CheckBox Command="{Binding Path=SavePasswordCommand}" IsChecked="{Binding Path=SavePassword, Mode=TwoWay}" Content="Passwort speichern" Margin="240,65,0,0" HorizontalAlignment="Left" VerticalAlignment="Top" />