Develop #10

Merged
SemvdH merged 229 commits from develop into master 2020-10-29 22:50:49 +00:00
2 changed files with 0 additions and 18 deletions
Showing only changes of commit 22021dc821 - Show all commits

View File

@@ -9,7 +9,6 @@ namespace ClientApp.ViewModels
class MainViewModel : ObservableObject
{
public ICommand RetryServerCommand { get; set; }
public ICommand RetryVREngineCommand { get; set; }
public MainWindowViewModel MainWindowViewModel { get; set; }
private Client client;
@@ -25,17 +24,6 @@ namespace ClientApp.ViewModels
//try connect server
this.MainWindowViewModel.InfoModel.ConnectedToServer = true;
});
this.RetryVREngineCommand = new RelayCommand(() =>
{
//try connect vr-engine
//this.MainWindowViewModel.InfoModel.ConnectedToVREngine = true;
//this.MainWindowViewModel.InfoModel.CanConnectToVR = false;
//client.engineConnection.CreateConnection();
//retryEngineConnection();
Debug.WriteLine("retry button clicked");
});
}
private void retryEngineConnection()

View File

@@ -40,12 +40,6 @@
</Button.Content>
</Button>
<Button Grid.Column="1" Grid.Row="1" Command="{Binding RetryVREngineCommand}" Width="50" Height="20" IsEnabled="{Binding MainWindowViewModel.InfoModel.CanConnectToVR}">
<Button.Content>
<TextBlock TextWrapping="Wrap" Text="retry"/>
</Button.Content>
</Button>
</Grid>
</DockPanel>