Merge branch 'develop' into window-restyle

2020-10-14 15:30:00 +02:00
parent c13cdf64b6 e226ab586e
commit ed19714338
38 changed files with 1065 additions and 102 deletions
--- a/ClientApp/Views/MainView.xaml
+++ b/ClientApp/Views/MainView.xaml
@@ -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>