Merged remote to local

songify-rocks · May 26, 2020 · 71fec8b · 71fec8b
2 parents 2b9fa06 + 03d14a2
commit 71fec8b
Show file tree

Hide file tree

Showing 13 changed files with 295 additions and 111 deletions.
diff --git a/Songify Slim/App.config b/Songify Slim/App.config
@@ -153,7 +153,7 @@
         <value>{artist} - {title} requested by @{user} has been added to the queue.</value>
       </setting>
       <setting name="spacesEnabled" serializeAs="String">
-        <value>False</value>
+        <value>True</value>
       </setting>
       <setting name="spaces" serializeAs="String">
         <value>10</value>

diff --git a/Songify Slim/MainWindow.xaml b/Songify Slim/MainWindow.xaml
@@ -136,9 +136,16 @@
             <TextBlock x:Name="TxtblockLiveoutput" FontSize="22" Padding="10"
                                Text="Artist - Title" HorizontalAlignment="Left" VerticalAlignment="Center" TextWrapping="Wrap" MaxWidth="400" MaxHeight="185" />
         </StackPanel>
-        <StatusBar Height="20" VerticalAlignment="Bottom" Padding="0" ScrollViewer.CanContentScroll="True" Margin="0" UseLayoutRounding="False">
-            <StatusBarItem x:Name="LblStatus" Content="" Foreground="Black" Margin="5,0,0,0"/>
-            <StatusBarItem x:Name="LblCopyright" Content="Songify v1.1.1-RC1 Copyright © Jan  Inzaniity  Blömacher" HorizontalAlignment="Right" Padding="0" Foreground="Black" Margin="0,0,5,0"/>
+        <StatusBar x:Name="sb_Main" Height="20" VerticalAlignment="Bottom" Padding="0" ScrollViewer.CanContentScroll="True" Margin="0" UseLayoutRounding="False">
+            <StatusBarItem x:Name="LblStatus" Content="" Foreground="Black" Margin="5,0,0,0" Width="55"/>
+            <StatusBarItem HorizontalAlignment="Right" Padding="0" Margin="0,-2,0,0">
+                <StackPanel Orientation="Horizontal">
+                    <StatusBarItem x:Name="LblCopyright" Content="Songify v1.1.1-RC1 Copyright ©" Foreground="Black" />
+                    <StatusBarItem x:Name="LblCopyrightLink" Foreground="Black" FontStyle="Italic">
+                        <Hyperlink NavigateUri="https://songify.rocks" RequestNavigate="Hyperlink_RequestNavigate" FontStyle="Normal" Foreground="Black">Songify.Rocks</Hyperlink>
+                    </StatusBarItem>
+                </StackPanel>
+            </StatusBarItem>
         </StatusBar>
         <Menu VerticalAlignment="Top" Padding="0" Margin="0,0,139,0">
             <MenuItem Header="{x:Static local:Resources.mw_menu_File}">

diff --git a/Songify Slim/MainWindow.xaml.cs b/Songify Slim/MainWindow.xaml.cs
@@ -627,7 +627,7 @@ private void MetroWindowLoaded(object sender, RoutedEventArgs e)
             AutoUpdater.Mandatory = true;
             AutoUpdater.UpdateMode = Mode.ForcedDownload;
             AutoUpdater.AppTitle = "Songify";
-            AutoUpdater.RunUpdateAsAdmin = false;
+            AutoUpdater.RunUpdateAsAdmin = true;
 
             AutoUpdater.Start("https://songify.rocks/update.xml");
 
@@ -638,7 +638,7 @@ private void MetroWindowLoaded(object sender, RoutedEventArgs e)
 
             // text in the bottom right
             LblCopyright.Content =
-                "Songify v" + Version.Substring(0, 5) + " Copyright © Songify.Rocks";
+                "Songify v" + Version.Substring(0, 5) + " Copyright ©";
 
             if (_selectedSource == PlayerType.SpotifyWeb)
             {
@@ -674,7 +674,7 @@ private void MetroWindowStateChanged(object sender, EventArgs e)
             MinimizeToSysTray();
         }
 
-        private void Mi_Blacklist_Click(object sender, RoutedEventArgs e)
+        private void mi_Blacklist_Click(object sender, RoutedEventArgs e)
         {
             // Opens the Blacklist Window
             if (!IsWindowOpen<Window_Blacklist>())
@@ -684,7 +684,7 @@ private void Mi_Blacklist_Click(object sender, RoutedEventArgs e)
             }
         }
 
-        private void Mi_Queue_Click(object sender, RoutedEventArgs e)
+        private void mi_Queue_Click(object sender, RoutedEventArgs e)
         {
             // Opens the Queue Window
             System.Windows.Controls.MenuItem item = (System.Windows.Controls.MenuItem)sender;
@@ -703,7 +703,7 @@ private void Mi_Queue_Click(object sender, RoutedEventArgs e)
             }
         }
 
-        private async void Mi_QueueClear_Click(object sender, RoutedEventArgs e)
+        private async void mi_QueueClear_Click(object sender, RoutedEventArgs e)
         {
             // After user confirmation sends a command to the webserver which clears the queue
             MessageDialogResult msgResult = await this.ShowMessageAsync("Notification", "Do you really want to clear the queue?", MessageDialogStyle.AffirmativeAndNegative, new MetroDialogSettings { AffirmativeButtonText = "Yes", NegativeButtonText = "No" });
@@ -817,6 +817,12 @@ private async void TelemetryDisclaimer()
             }
         }
 
+        private void Hyperlink_RequestNavigate(object sender, System.Windows.Navigation.RequestNavigateEventArgs e)
+        {
+            Process.Start(new ProcessStartInfo(e.Uri.AbsoluteUri));
+            e.Handled = true;
+        }
+
         private void TelemetryTimer()
         {
             // call SendTelemetry every 5 minutes

diff --git a/Songify Slim/Properties/AssemblyInfo.cs b/Songify Slim/Properties/AssemblyInfo.cs
@@ -11,7 +11,7 @@
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("Songify.Rocks")]
 [assembly: AssemblyProduct("Songify")]
-[assembly: AssemblyCopyright("Copyright ©  2020")]
+[assembly: AssemblyCopyright("Copyright © 2020")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]