Disable radios if not connected to MPD

Views/MainWindow.xaml.cs

@@ -58,6 +58,8 @@ namespace unison
                 ConnectionFailIcon.Visibility = Visibility.Visible;
             }
             _settingsWin.UpdateConnectionStatus();
+            if (_radiosWin.IsConnected())
+                Radio.IsEnabled = true;
             Connection.Text = $"{Properties.Settings.Default.mpd_host}:{Properties.Settings.Default.mpd_port}";
         }
 
@@ -188,11 +190,6 @@ namespace unison
                 SnapcastText.Text = unison.Resources.Resources.StartSnapcast;
         }
 
-        public void OnRadioBrowserConnected()
-        {
-            Radio.IsEnabled = true;
-        }
-
         public void UpdateButton(ref Border border, bool b)
         {
             border.Style = b ? (Style)Resources["SelectedButton"] : (Style)Resources["UnselectedButton"];

Views/Radios.xaml.cs

@@ -54,6 +54,9 @@ namespace unison
     {
         private RadioBrowserClient _radioBrowser;
         private MPDHandler _mpd;
+        private bool _connected = true;
+
+        public bool IsConnected() => _connected;
 
         public Radios()
         {
@@ -69,11 +72,8 @@ namespace unison
                 Debug.WriteLine("Exception while connecting to RadioBrowser: " + e.Message);
                 return;
             }
-            Application.Current.Dispatcher.Invoke(() =>
+
-            {
+            _connected = true;
-                MainWindow MainWin = (MainWindow)Application.Current.MainWindow;
-                MainWin.OnRadioBrowserConnected();
-            });
         }
 
         public async void Initialize()

Views/Settings.xaml

@@ -43,7 +43,7 @@
 
                                     <StackPanel Margin="0,5,0,0">
                                         <TextBlock Text="{x:Static properties:Resources.Settings_Password}" TextWrapping="Wrap" Margin="5,0,0,0"/>
-                                        <PasswordBox x:Name="MpdPassword" Width="250" Margin="10,2,0,0"/>
+                                        <PasswordBox x:Name="MpdPassword" KeyDown="ConnectHandler" Width="250" Margin="10,2,0,0"/>
                                         <TextBlock Text="{x:Static properties:Resources.Settings_ConnectionPasswordInfo}" TextWrapping="Wrap" Margin="10,5,0,0" MaxWidth="250" HorizontalAlignment="Left"/>
                                     </StackPanel>
 
@@ -52,7 +52,6 @@
                                         <Run x:Name="ConnectionStatus" Text="{x:Static properties:Resources.Settings_ConnectionStatusOffline}"/>
                                     </TextBlock>
 
-                                    <!--<TextBlock x:Name="ConnectionStatus" Text="{x:Static properties:Resources.Settings_ConnectionStatusOffline}" TextWrapping="Wrap" Margin="5,10,0,0"/>-->
                                     <Button x:Name="ConnectButton" Content="{x:Static properties:Resources.Settings_ConnectButton}" Margin="0,10,0,0" Width="120" Click="MPDConnect_Clicked"/>
                                 </StackPanel>
                             </Grid>
@@ -60,30 +59,6 @@
                     </DockPanel>
                 </TabItem>
 
-                <TabItem Header="{x:Static properties:Resources.Stats}">
-                    <DockPanel Margin="8">
-                        <GroupBox DockPanel.Dock="Top" Padding="0,4,0,0">
-                            <GroupBox.Header>
-                                <TextBlock>
-                                    <emoji:EmojiInline Text="📊"/>
-                                    <Run Text="{x:Static properties:Resources.Stats}"/>
-                                </TextBlock>
-                            </GroupBox.Header>
-                            <Grid VerticalAlignment="Top">
-                                <TextBlock>
-                                    <Run Text="{x:Static properties:Resources.Stats_Songs}"/><Run Text=" "/><Run x:Name="StatSong"/><LineBreak/>
-                                    <Run Text="{x:Static properties:Resources.Stats_Albums}"/><Run Text=" "/><Run x:Name="StatAlbum"/><LineBreak/>
-                                    <Run Text="{x:Static properties:Resources.Stats_Artists}"/><Run Text=" "/><Run x:Name="StatArtist"/><LineBreak/>
-                                    <Run Text="{x:Static properties:Resources.Stats_TotalPlaytime}"/><Run Text=" "/><Run x:Name="StatTotalPlaytime"/><LineBreak/><LineBreak/>
-                                    <Run Text="{x:Static properties:Resources.Stats_Uptime}"/><Run Text=" "/><Run x:Name="StatUptime"/><LineBreak/>
-                                    <Run Text="{x:Static properties:Resources.Stats_TotalTimePlayed}"/><Run Text=" "/><Run x:Name="StatTotalTimePlayed"/><LineBreak/>
-                                    <Run Text="{x:Static properties:Resources.Stats_LastDatabaseUpdate}"/><Run Text=" "/><Run x:Name="StatDatabaseUpdate"/>
-                                </TextBlock>
-                            </Grid>
-                        </GroupBox>
-                    </DockPanel>
-                </TabItem>
-
                 <TabItem Header="Snapcast">
                     <DockPanel Margin="8">
                         <GroupBox DockPanel.Dock="Top" Padding="0,4,0,0">
@@ -222,6 +197,30 @@
                     </DockPanel>
                 </TabItem>
 
+                <TabItem Header="{x:Static properties:Resources.Stats}">
+                    <DockPanel Margin="8">
+                        <GroupBox DockPanel.Dock="Top" Padding="0,4,0,0">
+                            <GroupBox.Header>
+                                <TextBlock>
+                                    <emoji:EmojiInline Text="📊"/>
+                                    <Run Text="{x:Static properties:Resources.Stats}"/>
+                                </TextBlock>
+                            </GroupBox.Header>
+                            <Grid VerticalAlignment="Top">
+                                <TextBlock>
+                                    <Run Text="{x:Static properties:Resources.Stats_Songs}"/><Run Text=" "/><Run x:Name="StatSong"/><LineBreak/>
+                                    <Run Text="{x:Static properties:Resources.Stats_Albums}"/><Run Text=" "/><Run x:Name="StatAlbum"/><LineBreak/>
+                                    <Run Text="{x:Static properties:Resources.Stats_Artists}"/><Run Text=" "/><Run x:Name="StatArtist"/><LineBreak/>
+                                    <Run Text="{x:Static properties:Resources.Stats_TotalPlaytime}"/><Run Text=" "/><Run x:Name="StatTotalPlaytime"/><LineBreak/><LineBreak/>
+                                    <Run Text="{x:Static properties:Resources.Stats_Uptime}"/><Run Text=" "/><Run x:Name="StatUptime"/><LineBreak/>
+                                    <Run Text="{x:Static properties:Resources.Stats_TotalTimePlayed}"/><Run Text=" "/><Run x:Name="StatTotalTimePlayed"/><LineBreak/>
+                                    <Run Text="{x:Static properties:Resources.Stats_LastDatabaseUpdate}"/><Run Text=" "/><Run x:Name="StatDatabaseUpdate"/>
+                                </TextBlock>
+                            </Grid>
+                        </GroupBox>
+                    </DockPanel>
+                </TabItem>
+
                 <TabItem Header="{x:Static properties:Resources.Settings_About}" Height="20" VerticalAlignment="Bottom">
                     <DockPanel Margin="8">
                         <GroupBox DockPanel.Dock="Top" Padding="0,4,0,0">