move some stuff around and remove unused stuff
authorStricted <info@stricted.de>
Wed, 11 Nov 2015 13:33:06 +0000 (14:33 +0100)
committerStricted <info@stricted.de>
Wed, 11 Nov 2015 13:33:06 +0000 (14:33 +0100)
15 files changed:
SpeedportHybridControl.Implementations/PasswordHelper.cs
SpeedportHybridControl.Implementations/util.cs
SpeedportHybridControl/App.xaml
SpeedportHybridControl/App.xaml.cs
SpeedportHybridControl/Data/SpeedportHybrid.cs
SpeedportHybridControl/Data/SpeedportHybridAPI.cs
SpeedportHybridControl/MainWindow.xaml.cs
SpeedportHybridControl/Model/StatusPhoneListModel.cs [new file with mode: 0644]
SpeedportHybridControl/Model/StatusViewModel.cs [deleted file]
SpeedportHybridControl/PageModel/LoginPageModel.cs
SpeedportHybridControl/PageModel/StatusPageModel.cs
SpeedportHybridControl/SpeedportHybridControl.csproj
SpeedportHybridControl/page/LoginPage.xaml.cs
SpeedportHybridControl/page/StatusPage.xaml
SpeedportHybridControl/page/StatusPage.xaml.cs

index 7b5e0aef6330fb8e507e46e9dde1bf375ba60fa0..316a8152cfbbe8234afcf62d53980e2eb275392b 100644 (file)
@@ -1,8 +1,4 @@
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Data;
index 09e8bbf16b4edf748a125e93e6a2a5b5ffb915fc..b3d3911f19550a60a7010c0cf6696d9881790c4a 100644 (file)
@@ -4,8 +4,6 @@ using System;
 using System.Linq;
 using System.Security.Cryptography;
 using System.Text;
-using System.Threading;
-using System.Windows;
 using System.Windows.Media;
 using System.Xml;
 
@@ -174,97 +172,6 @@ namespace SpeedportHybridControl.Implementations {
                        return false;
                }
 
-               /**
-                * process login stuff
-                */
-               /*
-               public static void login () {
-                       try {
-                               Application.Current.Dispatcher.BeginInvoke(new Action(() => {
-                                       MainWindow MainWindow = Application.Current.MainWindow as MainWindow;
-
-                                       // LoginPage
-                                       LoginPage LoginPage = MainWindow.loginPage as LoginPage;
-                                       LoginPage.button1.Content = "Logout";
-                                       LoginPage.PasswordCheckBox.Visibility = Visibility.Hidden;
-                                       LoginPage.tbip.Visibility = Visibility.Hidden;
-                                       LoginPage.diTextBlock.Visibility = Visibility.Hidden;
-                                       LoginPage.tbpw.Visibility = Visibility.Hidden;
-                                       LoginPage.PasswordBox.Visibility = Visibility.Hidden;
-                                       LoginPage.cbSave.Visibility = Visibility.Hidden;
-
-                                       // MainWindow
-                                       MainWindow.btnLogin.Content = "Logout";
-
-                                       MainWindow.btnOverview.IsEnabled = true;
-                                       MainWindow.btnDsl.IsEnabled = true;
-                                       MainWindow.btnLteInfo.IsEnabled = true;
-                                       MainWindow.btnSyslog.IsEnabled = true;
-                                       MainWindow.btnTR181.IsEnabled = true;
-                                       MainWindow.btnPhone.IsEnabled = true;
-                                       MainWindow.btnLan.IsEnabled = true;
-                                       MainWindow.btnControls.IsEnabled = true;
-                               }));
-                       }
-                       catch (Exception ex) {
-                               Console.WriteLine(ex.Message);
-                       }
-               }
-               */
-               /**
-                * process logout stuff
-                */
-               /*
-               public static void logout () {
-                       try {
-                               Application.Current.Dispatcher.BeginInvoke(new Action(() => {
-                                       MainWindow MainWindow = Application.Current.MainWindow as MainWindow;
-
-                                       // LteInfoPage
-                                       LteInfoPage lteInfo = MainWindow.lteInfoPage as LteInfoPage;
-                                       if (Object.Equals(lteInfo._ltepopup, null).Equals(false)) {
-                                               lteInfo._ltepopup.StopTimer();
-                                               lteInfo._ltepopup.Hide();
-                                               lteInfo._ltepopup = null;
-                                       }
-                                       lteInfo.StopTimer();
-
-                                       // DslPage
-                                       DslPage dslInfo = MainWindow.dslPage as DslPage;
-                                       dslInfo.StopTimer();
-
-                                       // LoginPage
-                                       LoginPage LoginPage = MainWindow.loginPage as LoginPage;
-                                       LoginPage.PasswordBox.Visibility = Visibility.Visible;
-                                       LoginPage.tbip.Visibility = Visibility.Visible;
-                                       LoginPage.diTextBlock.Visibility = Visibility.Visible;
-                                       LoginPage.tbpw.Visibility = Visibility.Visible;
-                                       LoginPage.PasswordCheckBox.Visibility = Visibility.Visible;
-                                       LoginPage.button1.Content = "Login";
-                                       LoginPage.cbSave.Visibility = Visibility.Visible;
-                                       LoginPage.PasswordBox.Focus();
-
-                                       // MainWindow
-                                       MainWindow.btnLogin.Content = "Login";
-                                       MainWindow.frame.Content = MainWindow.loginPage;
-                                       MainWindow.changeColor(MainWindow.btnLogin);
-
-                                       MainWindow.btnOverview.IsEnabled = false;
-                                       MainWindow.btnDsl.IsEnabled = false;
-                                       MainWindow.btnLteInfo.IsEnabled = false;
-                                       MainWindow.btnSyslog.IsEnabled = false;
-                                       MainWindow.btnTR181.IsEnabled = false;
-                                       MainWindow.btnPhone.IsEnabled = false;
-                                       MainWindow.btnLan.IsEnabled = false;
-                                       MainWindow.btnControls.IsEnabled = false;
-                               }));
-                       }
-                       catch (Exception ex) {
-                               Console.WriteLine(ex.Message);
-                       }
-               }
-               */
-
                public static bool checkInstalled (string c_name) {
                        string displayName = string.Empty;
 
index 21f351c9e46e50f89179009ff1cd296a51cf490c..dbc3ae393b5c27293066738cc0a3b0fcc274bd69 100644 (file)
@@ -11,7 +11,6 @@
             <pagemodel:LoginPageModel x:Key="LoginPageModel"></pagemodel:LoginPageModel>
             <pagemodel:StatusPageModel x:Key="StatusPageModel"></pagemodel:StatusPageModel>
             
-            <model:Status x:Key="Status"></model:Status>
             <model:LTE x:Key="LTE"></model:LTE>
             <model:LTE x:Key="LTE2"></model:LTE>
             <model:DSLViewModel x:Key="DSL"></model:DSLViewModel>
index e614b4009a3b684e974278be14b7f344db87576f..74481b4ee70a35608463925dda4a1902010b0799 100644 (file)
@@ -1,10 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Configuration;
-using System.Data;
-using System.Linq;
-using System.Threading.Tasks;
-using System.Windows;
+using System.Windows;
 
 namespace SpeedportHybridControl {
        /// <summary>
index fac5cdbabf818a4641431c41c9976e2cfccbdf8c..0b964cfed96f5937e4c4b1b8451ffd31c051ca07 100644 (file)
@@ -5,6 +5,7 @@ using Newtonsoft.Json.Linq;
 using System.Linq;
 using System.Windows;
 using SpeedportHybridControl.Model;
+using SpeedportHybridControl.PageModel;
 using SpeedportHybridControl.Implementations;
 
 namespace SpeedportHybridControl.Data {
@@ -402,7 +403,7 @@ namespace SpeedportHybridControl.Data {
 
                public static void initStatus() {
                        try {
-                               Status status = Application.Current.FindResource("Status") as Status;
+                               StatusPageModel status = Application.Current.FindResource("StatusPageModel") as StatusPageModel;
                                string response = SpeedportHybridAPI.getInstance().sendRequest("data/status.json");
                                if (response.IsNullOrEmpty())
                                        return;
@@ -450,7 +451,7 @@ namespace SpeedportHybridControl.Data {
                                status.dsl_downstream = string.Concat(jArray.getVar("dsl_downstream"), " kBit/s");
                                status.dsl_upstream = string.Concat(jArray.getVar("dsl_upstream"), " kBit/s");
 
-                               List<StatusPhoneList> statusPhoneList = new List<StatusPhoneList>();
+                               List<StatusPhoneListModel> statusPhoneList = new List<StatusPhoneListModel>();
                                status.addphonenumber = null;
 
                                foreach (JToken jToken in jArray) {
@@ -465,7 +466,7 @@ namespace SpeedportHybridControl.Data {
                                                        pstatus = "Nicht aktiv";
                                                }
 
-                                               statusPhoneList.Add(new StatusPhoneList() { number = pnumber, status = pstatus });
+                                               statusPhoneList.Add(new StatusPhoneListModel() { number = pnumber, status = pstatus });
                                        }
                                }
 
index 1119882f6b3dfad45d3a0bf1853054791f1ab34e..868316326a3d9b553d7766f63b8f9e8326d516f1 100644 (file)
@@ -11,7 +11,6 @@ using System.Collections.Generic;
 using SpeedportHybridControl.Implementations;
 using SpeedportHybridControl.Model;
 using Newtonsoft.Json;
-using System.Security;
 using SpeedportHybridControl.PageModel;
 
 namespace SpeedportHybridControl.Data {
index 1ff9fa9c895c91e80ec9c83a904a20c9001044cb..c8eb6d1671679c8748620bb569b8b0f5ce2cf01c 100644 (file)
@@ -1,20 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.Windows;
-using System.Windows.Controls;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Input;
-using System.Windows.Media;
-using System.Windows.Media.Imaging;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
-using System.ComponentModel;
-using SpeedportHybridControl.Implementations;
-using Microsoft.Win32;
+using System.Windows;
 
 namespace SpeedportHybridControl {
        /// <summary>
diff --git a/SpeedportHybridControl/Model/StatusPhoneListModel.cs b/SpeedportHybridControl/Model/StatusPhoneListModel.cs
new file mode 100644 (file)
index 0000000..c08d448
--- /dev/null
@@ -0,0 +1,20 @@
+namespace SpeedportHybridControl.Model {
+       class StatusPhoneListModel : SuperViewModel {
+               private string _number;
+               private string _status;
+
+               public string number {
+                       get { return _number; }
+                       set { SetProperty(ref _number, value); }
+               }
+
+               public string status {
+                       get { return _status; }
+                       set { SetProperty(ref _status, value); }
+               }
+
+               public StatusPhoneListModel () {
+
+               }
+       }
+}
diff --git a/SpeedportHybridControl/Model/StatusViewModel.cs b/SpeedportHybridControl/Model/StatusViewModel.cs
deleted file mode 100644 (file)
index 88eebb5..0000000
+++ /dev/null
@@ -1,190 +0,0 @@
-using System.Collections.Generic;
-
-namespace SpeedportHybridControl.Model {
-       public class Status : SuperViewModel {
-               private string _device_name;
-               private string _lte_status;
-               private string _lte_signal;
-               private string _lte_image = "../assets/lte0.png";
-               private string _datetime;
-               private string _imei;
-               private string _dsl_link_status;
-               private string _status;
-               private string _dsl_downstream;
-               private string _dsl_upstream;
-               private List<StatusPhoneList> _addphonenumber;
-               private string _use_dect;
-               private string _dect_devices;
-               private string _wlan_ssid;
-               private string _wlan_5ghz_ssid;
-               private string _use_wlan;
-               private string _use_wlan_5ghz;
-               private string _wlan_devices;
-               private string _wlan_5ghz_devices;
-               private string _lan1_device = "../assets/x.png";
-               private string _lan2_device = "../assets/x.png";
-               private string _lan3_device = "../assets/x.png";
-               private string _lan4_device = "../assets/x.png";
-               private string _hsfon_status;
-               private string _firmware_version;
-               private string _serial_number;
-               private string _uptime;
-
-               public string device_name {
-                       get { return _device_name; }
-                       set { SetProperty(ref _device_name, value); }
-               }
-
-               public string lte_status {
-                       get { return _lte_status; }
-                       set { SetProperty(ref _lte_status, value); }
-               }
-               
-               public string lte_signal {
-                       get { return _lte_signal; }
-                       set { SetProperty(ref _lte_signal, value); }
-               }
-
-               public string lte_image {
-                       get { return _lte_image; }
-                       set { SetProperty(ref _lte_image, value); }
-               }
-               
-               public string datetime {
-                       get { return _datetime; }
-                       set { SetProperty(ref _datetime, value); }
-               }
-
-               public string imei {
-                       get { return _imei; }
-                       set { SetProperty(ref _imei, value); }
-               }
-
-               public string dsl_link_status {
-                       get { return _dsl_link_status; }
-                       set { SetProperty(ref _dsl_link_status, value); }
-               }
-               
-               public string status {
-                       get { return _status; }
-                       set { SetProperty(ref _status, value); }
-               }
-               
-               public string dsl_downstream {
-                       get { return _dsl_downstream; }
-                       set { SetProperty(ref _dsl_downstream, value); }
-               }
-
-               public string dsl_upstream {
-                       get { return _dsl_upstream; }
-                       set { SetProperty(ref _dsl_upstream, value); }
-               }
-
-               public List<StatusPhoneList> addphonenumber {
-                       get { return _addphonenumber; }
-                       set { SetProperty(ref _addphonenumber, value); }
-               }
-               
-               public string use_dect {
-                       get { return _use_dect; }
-                       set { SetProperty(ref _use_dect, value); }
-               }
-
-               public string dect_devices {
-                       get { return _dect_devices; }
-                       set { SetProperty(ref _dect_devices, value); }
-               }
-
-               public string wlan_ssid {
-                       get { return _wlan_ssid; }
-                       set { SetProperty(ref _wlan_ssid, value); }
-               }
-
-               public string wlan_5ghz_ssid {
-                       get { return _wlan_5ghz_ssid; }
-                       set { SetProperty(ref _wlan_5ghz_ssid, value); }
-               }
-
-               public string use_wlan {
-                       get { return _use_wlan; }
-                       set { SetProperty(ref _use_wlan, value); }
-               }
-
-               public string use_wlan_5ghz {
-                       get { return _use_wlan_5ghz; }
-                       set { SetProperty(ref _use_wlan_5ghz, value); }
-               }
-               
-               public string wlan_devices {
-                       get { return _wlan_devices; }
-                       set { SetProperty(ref _wlan_devices, value); }
-               }
-
-               public string wlan_5ghz_devices {
-                       get { return _wlan_5ghz_devices; }
-                       set { SetProperty(ref _wlan_5ghz_devices, value); }
-               }
-
-               public string lan1_device {
-                       get { return _lan1_device; }
-                       set { SetProperty(ref _lan1_device, value); }
-               }
-
-               public string lan2_device {
-                       get { return _lan2_device; }
-                       set { SetProperty(ref _lan2_device, value); }
-               }
-
-               public string lan3_device {
-                       get { return _lan3_device; }
-                       set { SetProperty(ref _lan3_device, value); }
-               }
-
-               public string lan4_device {
-                       get { return _lan4_device; }
-                       set { SetProperty(ref _lan4_device, value); }
-               }
-               
-               public string hsfon_status {
-                       get { return _hsfon_status; }
-                       set { SetProperty(ref _hsfon_status, value); }
-               }
-
-               public string firmware_version {
-                       get { return _firmware_version; }
-                       set { SetProperty(ref _firmware_version, value); }
-               }
-
-               public string serial_number {
-                       get { return _serial_number; }
-                       set { SetProperty(ref _serial_number, value); }
-               }
-
-               public string uptime {
-                       get { return _uptime; }
-                       set { SetProperty(ref _uptime, value); }
-               }
-
-               public Status() {
-               }
-       }
-
-       public class StatusPhoneList : SuperViewModel {
-               private string _number;
-               private string _status;
-
-               public string number {
-                       get { return _number; }
-                       set { SetProperty(ref _number, value); }
-               }
-
-               public string status {
-                       get { return _status; }
-                       set { SetProperty(ref _status, value); }
-               }
-
-               public StatusPhoneList () {
-
-               }
-       }
-}
index 42b439b919da81221e64d6cc65094f8bd06339cb..94f9c1da3f82a7596f5ecd09bbf2ea10a19fdf4c 100644 (file)
@@ -3,7 +3,6 @@ using SpeedportHybridControl.Implementations;
 using SpeedportHybridControl.Data;
 using System.Windows;
 using System.Threading;
-using System.Security;
 using SpeedportHybridControl.Model;
 
 namespace SpeedportHybridControl.PageModel {
index 002b3a1d83f43d99625250c1d5fadb9403daf655..1432a456bc58e79a39b5108c959d1e86d2d5a3ca 100644 (file)
@@ -1,8 +1,5 @@
 using System;
 using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using SpeedportHybridControl.Model;
 using SpeedportHybridControl.Implementations;
 using System.Threading;
@@ -12,6 +9,34 @@ namespace SpeedportHybridControl.PageModel {
        class StatusPageModel : SuperViewModel {
                private DelegateCommand _reloadCommand;
 
+               private string _device_name;
+               private string _lte_status;
+               private string _lte_signal;
+               private string _lte_image = "../assets/lte0.png";
+               private string _datetime;
+               private string _imei;
+               private string _dsl_link_status;
+               private string _status;
+               private string _dsl_downstream;
+               private string _dsl_upstream;
+               private List<StatusPhoneListModel> _addphonenumber;
+               private string _use_dect;
+               private string _dect_devices;
+               private string _wlan_ssid;
+               private string _wlan_5ghz_ssid;
+               private string _use_wlan;
+               private string _use_wlan_5ghz;
+               private string _wlan_devices;
+               private string _wlan_5ghz_devices;
+               private string _lan1_device = "../assets/x.png";
+               private string _lan2_device = "../assets/x.png";
+               private string _lan3_device = "../assets/x.png";
+               private string _lan4_device = "../assets/x.png";
+               private string _hsfon_status;
+               private string _firmware_version;
+               private string _serial_number;
+               private string _uptime;
+
                public DelegateCommand ReloadCommand {
                        get { return _reloadCommand; }
                        set { SetProperty(ref _reloadCommand, value); }
@@ -21,6 +46,141 @@ namespace SpeedportHybridControl.PageModel {
                        new Thread(() => { SpeedportHybrid.initStatus(); }).Start();
                }
 
+               public string device_name {
+                       get { return _device_name; }
+                       set { SetProperty(ref _device_name, value); }
+               }
+
+               public string lte_status {
+                       get { return _lte_status; }
+                       set { SetProperty(ref _lte_status, value); }
+               }
+
+               public string lte_signal {
+                       get { return _lte_signal; }
+                       set { SetProperty(ref _lte_signal, value); }
+               }
+
+               public string lte_image {
+                       get { return _lte_image; }
+                       set { SetProperty(ref _lte_image, value); }
+               }
+
+               public string datetime {
+                       get { return _datetime; }
+                       set { SetProperty(ref _datetime, value); }
+               }
+
+               public string imei {
+                       get { return _imei; }
+                       set { SetProperty(ref _imei, value); }
+               }
+
+               public string dsl_link_status {
+                       get { return _dsl_link_status; }
+                       set { SetProperty(ref _dsl_link_status, value); }
+               }
+
+               public string status {
+                       get { return _status; }
+                       set { SetProperty(ref _status, value); }
+               }
+
+               public string dsl_downstream {
+                       get { return _dsl_downstream; }
+                       set { SetProperty(ref _dsl_downstream, value); }
+               }
+
+               public string dsl_upstream {
+                       get { return _dsl_upstream; }
+                       set { SetProperty(ref _dsl_upstream, value); }
+               }
+
+               public List<StatusPhoneListModel> addphonenumber {
+                       get { return _addphonenumber; }
+                       set { SetProperty(ref _addphonenumber, value); }
+               }
+
+               public string use_dect {
+                       get { return _use_dect; }
+                       set { SetProperty(ref _use_dect, value); }
+               }
+
+               public string dect_devices {
+                       get { return _dect_devices; }
+                       set { SetProperty(ref _dect_devices, value); }
+               }
+
+               public string wlan_ssid {
+                       get { return _wlan_ssid; }
+                       set { SetProperty(ref _wlan_ssid, value); }
+               }
+
+               public string wlan_5ghz_ssid {
+                       get { return _wlan_5ghz_ssid; }
+                       set { SetProperty(ref _wlan_5ghz_ssid, value); }
+               }
+
+               public string use_wlan {
+                       get { return _use_wlan; }
+                       set { SetProperty(ref _use_wlan, value); }
+               }
+
+               public string use_wlan_5ghz {
+                       get { return _use_wlan_5ghz; }
+                       set { SetProperty(ref _use_wlan_5ghz, value); }
+               }
+
+               public string wlan_devices {
+                       get { return _wlan_devices; }
+                       set { SetProperty(ref _wlan_devices, value); }
+               }
+
+               public string wlan_5ghz_devices {
+                       get { return _wlan_5ghz_devices; }
+                       set { SetProperty(ref _wlan_5ghz_devices, value); }
+               }
+
+               public string lan1_device {
+                       get { return _lan1_device; }
+                       set { SetProperty(ref _lan1_device, value); }
+               }
+
+               public string lan2_device {
+                       get { return _lan2_device; }
+                       set { SetProperty(ref _lan2_device, value); }
+               }
+
+               public string lan3_device {
+                       get { return _lan3_device; }
+                       set { SetProperty(ref _lan3_device, value); }
+               }
+
+               public string lan4_device {
+                       get { return _lan4_device; }
+                       set { SetProperty(ref _lan4_device, value); }
+               }
+
+               public string hsfon_status {
+                       get { return _hsfon_status; }
+                       set { SetProperty(ref _hsfon_status, value); }
+               }
+
+               public string firmware_version {
+                       get { return _firmware_version; }
+                       set { SetProperty(ref _firmware_version, value); }
+               }
+
+               public string serial_number {
+                       get { return _serial_number; }
+                       set { SetProperty(ref _serial_number, value); }
+               }
+
+               public string uptime {
+                       get { return _uptime; }
+                       set { SetProperty(ref _uptime, value); }
+               }
+
                public StatusPageModel () {
                        ReloadCommand = new DelegateCommand(new Action(OnReloadCommandExecute));
                }
index 82a708c1d0ef8431bbdaa301b0d5395e1c86f34c..f01cea1a7cc858f6d5e44c12352b16be324ec4e7 100644 (file)
     <Compile Include="Model\bonding_client.cs" />
     <Compile Include="Model\DeviceViewModel.cs" />
     <Compile Include="Model\DSLViewModel.cs" />
+    <Compile Include="Model\StatusPhoneListModel.cs" />
     <Compile Include="PageModel\LoginPageModel.cs" />
     <Compile Include="Model\LTEViewModel.cs" />
     <Compile Include="PageModel\MainWindowModel.cs" />
     <Compile Include="Model\OverviewModel.cs" />
     <Compile Include="Model\PhoneCallViewModel.cs" />
-    <Compile Include="Model\StatusViewModel.cs" />
     <Compile Include="Model\SuperViewModel.cs" />
     <Compile Include="Data\SpeedportHybridAPI.cs" />
     <Page Include="MainWindow.xaml">
index a78eedfc8e6ed7f7bee4509351234ec42b5a0582..367586a12d249a9b274867098d3bcc897ed5907a 100644 (file)
@@ -1,9 +1,4 @@
-using System.Windows;
-using System.Windows.Controls;
-using System.Threading;
-using System;
-using SpeedportHybridControl.Model;
-using SpeedportHybridControl.Implementations;
+using System.Windows.Controls;
 
 namespace SpeedportHybridControl.page {
        /// <summary>
index b84476ca522500824dcc03f0722ea1ef6d0ac4a9..5b2e542f382974a92a0eb7844cf37d4e2ad5aa20 100644 (file)
@@ -8,7 +8,7 @@
       Width="Auto" Height="Auto"
       Title="StatusPage">
 
-    <Grid DataContext="{StaticResource Status}">
+    <Grid DataContext="{StaticResource StatusPageModel}">
         <GroupBox Header="Status-Informationen" HorizontalAlignment="Left" VerticalAlignment="Top" Width="235">
             <Grid>
                 <StackPanel HorizontalAlignment="Left" Width="120">
         </GroupBox>
         
         <TextBlock Text="{Binding datetime}" Margin="0,0,10,0" HorizontalAlignment="Right" VerticalAlignment="Bottom" />
-        <Button DataContext="{StaticResource StatusPageModel}" Command="{Binding Path=ReloadCommand}" x:Name="reload" Content="Aktualisieren" Margin="218,0,218,0" VerticalAlignment="Bottom"/>
+        <Button Command="{Binding Path=ReloadCommand}" x:Name="reload" Content="Aktualisieren" Margin="218,0,218,0" VerticalAlignment="Bottom"/>
     </Grid>
 </Page>
index 5b3918bcb1f5dd2f763b107ca932a8d8c243d794..e800ed6126bbbbfdd9be442eda4308b42de50d68 100644 (file)
@@ -1,6 +1,4 @@
-using SpeedportHybridControl.Model;
-using System.Windows;
-using System.Windows.Controls;
+using System.Windows.Controls;
 
 namespace SpeedportHybridControl.page {
        /// <summary>