diff --git a/ClientApp/ViewModels/LoginViewModel.cs b/ClientApp/ViewModels/LoginViewModel.cs
index d42b04d..c714b3c 100644
--- a/ClientApp/ViewModels/LoginViewModel.cs
+++ b/ClientApp/ViewModels/LoginViewModel.cs
@@ -28,7 +28,7 @@ namespace ClientApp.ViewModels
internal void setLoginStatus(bool status)
{
- this.mainWindowViewModel.infoModel.ConnectedToServer = true;
+ this.mainWindowViewModel.InfoModel.ConnectedToServer = true;
if (status)
{
this.mainWindowViewModel.SelectedViewModel = new MainViewModel(mainWindowViewModel);
diff --git a/ClientApp/ViewModels/MainViewModel.cs b/ClientApp/ViewModels/MainViewModel.cs
index 145623e..872b33a 100644
--- a/ClientApp/ViewModels/MainViewModel.cs
+++ b/ClientApp/ViewModels/MainViewModel.cs
@@ -18,12 +18,12 @@ namespace ClientApp.ViewModels
this.RetryServerCommand = new RelayCommand(() =>
{
//try connect server
- this.MainWindowViewModel.infoModel.ConnectedToServer = true;
+ this.MainWindowViewModel.InfoModel.ConnectedToServer = true;
});
this.RetryVREngineCommand = new RelayCommand(() =>
{
//try connect vr-engine
- this.MainWindowViewModel.infoModel.ConnectedToVREngine = true;
+ this.MainWindowViewModel.InfoModel.ConnectedToVREngine = true;
});
}
}
diff --git a/ClientApp/ViewModels/MainWindowViewModel.cs b/ClientApp/ViewModels/MainWindowViewModel.cs
index eada356..f30bf73 100644
--- a/ClientApp/ViewModels/MainWindowViewModel.cs
+++ b/ClientApp/ViewModels/MainWindowViewModel.cs
@@ -8,14 +8,14 @@ namespace ClientApp.ViewModels
{
class MainWindowViewModel : ObservableObject
{
- public Info infoModel { get; set; }
+ public Info InfoModel { get; set; }
public ObservableObject SelectedViewModel { get; set; }
public Client client { get; }
public MainWindowViewModel(Client client)
{
- this.infoModel = new Info();
+ this.InfoModel = new Info();
this.client = client;
LoginViewModel loginViewModel = new LoginViewModel(this);
SelectedViewModel = loginViewModel;
diff --git a/ClientApp/Views/MainView.xaml b/ClientApp/Views/MainView.xaml
index 2020d1b..14d43b4 100644
--- a/ClientApp/Views/MainView.xaml
+++ b/ClientApp/Views/MainView.xaml
@@ -21,17 +21,17 @@
-
+
-
+
-
+