diff --git a/README.md b/README.md
index 5a3e279..7b33a42 100644
--- a/README.md
+++ b/README.md
@@ -32,6 +32,10 @@ Such wow! Much amaze!
[Create a Issue if something went wrong](https://github.com/MarcoPNS/Spotify-Stream-Widget/issues)
## Credits
-Made by Marco Sadowski - Follow me on [Twitch](https://www.twitch.tv/marcnado) or [Twitter](https://twitter.com/MarcoSadowski)
-
-This application use [Metroframework by Dennis Magno](https://github.com/dennismagno/metroframework-modern-ui) and [SpotifyAPI-NET by Jonas Dellinger](https://github.com/JohnnyCrazy/SpotifyAPI-NET)
+Made by [Marco Sadowski](https://twitter.com/MarcoSadowski) - Follow me on [Twitch](https://www.twitch.tv/marcnado) or [Twitter](https://twitter.com/MarcoSadowski)
+Contributers:
+[Dankyss](https://github.com/Dankyss),
+[J Wong](https://github.com/wong-justin),
+[Corey Durthaler](https://github.com/cdurth),
+[Not Bob](https://github.com/notdabob)
+Also using [Metroframework by Dennis Magno](https://github.com/dennismagno/metroframework-modern-ui) and [SpotifyAPI-NET by Jonas Dellinger](https://github.com/JohnnyCrazy/SpotifyAPI-NET).
diff --git a/Release/Spot_Widget_1_5_0_0.zip b/Release/Spot_Widget_1_5_0_0.zip
new file mode 100644
index 0000000..447df24
Binary files /dev/null and b/Release/Spot_Widget_1_5_0_0.zip differ
diff --git a/Release/version.md b/Release/version.md
index 34c3267..c085cfe 100644
--- a/Release/version.md
+++ b/Release/version.md
@@ -1 +1 @@
-1.4.1.0
\ No newline at end of file
+1.5.0.0
\ No newline at end of file
diff --git a/Spotify Stream Widget/App.config b/Spotify Stream Widget/App.config
index 4fac5fb..645cd3f 100644
--- a/Spotify Stream Widget/App.config
+++ b/Spotify Stream Widget/App.config
@@ -19,7 +19,7 @@
Blocks
-
+
Green
@@ -31,6 +31,9 @@
+
+ Green
+
diff --git a/Spotify Stream Widget/My Project/AssemblyInfo.vb b/Spotify Stream Widget/My Project/AssemblyInfo.vb
index 5c62edc..2fa201d 100644
--- a/Spotify Stream Widget/My Project/AssemblyInfo.vb
+++ b/Spotify Stream Widget/My Project/AssemblyInfo.vb
@@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices
' übernehmen, indem Sie "*" eingeben:
'
-
-
+
+
diff --git a/Spotify Stream Widget/My Project/Settings.Designer.vb b/Spotify Stream Widget/My Project/Settings.Designer.vb
index 1cd045a..6650bca 100644
--- a/Spotify Stream Widget/My Project/Settings.Designer.vb
+++ b/Spotify Stream Widget/My Project/Settings.Designer.vb
@@ -1,10 +1,10 @@
'------------------------------------------------------------------------------
'
-' This code was generated by a tool.
-' Runtime Version:4.0.30319.42000
+' Dieser Code wurde von einem Tool generiert.
+' Laufzeitversion:4.0.30319.42000
'
-' Changes to this file may cause incorrect behavior and will be lost if
-' the code is regenerated.
+' Änderungen an dieser Datei können falsches Verhalten verursachen und gehen verloren, wenn
+' der Code erneut generiert wird.
'
'------------------------------------------------------------------------------
@@ -13,35 +13,35 @@ Option Explicit On
Namespace My
-
- _
+
+
Partial Friend NotInheritable Class MySettings
Inherits Global.System.Configuration.ApplicationSettingsBase
-
- Private Shared defaultInstance As MySettings = CType(Global.System.Configuration.ApplicationSettingsBase.Synchronized(New MySettings()),MySettings)
-
-#Region "My.Settings Auto-Save Functionality"
+
+ Private Shared defaultInstance As MySettings = CType(Global.System.Configuration.ApplicationSettingsBase.Synchronized(New MySettings()), MySettings)
+
+#Region "Automatische My.Settings-Speicherfunktion"
#If _MyType = "WindowsForms" Then
- Private Shared addedHandler As Boolean
+ Private Shared addedHandler As Boolean
- Private Shared addedHandlerLockObject As New Object
+ Private Shared addedHandlerLockObject As New Object
- _
- Private Shared Sub AutoSaveSettings(sender As Global.System.Object, e As Global.System.EventArgs)
- If My.Application.SaveMySettingsOnExit Then
- My.Settings.Save()
- End If
- End Sub
+
+ Private Shared Sub AutoSaveSettings(sender As Global.System.Object, e As Global.System.EventArgs)
+ If My.Application.SaveMySettingsOnExit Then
+ My.Settings.Save()
+ End If
+ End Sub
#End If
#End Region
-
+
Public Shared ReadOnly Property [Default]() As MySettings
Get
-
+
#If _MyType = "WindowsForms" Then
- If Not addedHandler Then
+ If Not addedHandler Then
SyncLock addedHandlerLockObject
If Not addedHandler Then
AddHandler My.Application.Shutdown, AddressOf AutoSaveSettings
@@ -53,99 +53,111 @@ Namespace My
Return defaultInstance
End Get
End Property
-
- _
+
+
Public Property DarkMode() As Boolean
Get
- Return CType(Me("DarkMode"),Boolean)
+ Return CType(Me("DarkMode"), Boolean)
End Get
Set
- Me("DarkMode") = value
+ Me("DarkMode") = Value
End Set
End Property
-
- _
+
+
Public Property Size() As String
Get
- Return CType(Me("Size"),String)
+ Return CType(Me("Size"), String)
End Get
Set
- Me("Size") = value
+ Me("Size") = Value
End Set
End Property
-
- _
+
+
Public Property ProgressBarStyle() As String
Get
- Return CType(Me("ProgressBarStyle"),String)
+ Return CType(Me("ProgressBarStyle"), String)
End Get
Set
- Me("ProgressBarStyle") = value
+ Me("ProgressBarStyle") = Value
End Set
End Property
-
- _
- Public Property Color() As String
+
+
+ Public Property ProgressColor() As String
Get
- Return CType(Me("Color"),String)
+ Return CType(Me("ProgressColor"), String)
End Get
Set
- Me("Color") = value
+ Me("ProgressColor") = Value
End Set
End Property
-
- _
+
+
Public Property ExportMode() As Boolean
Get
- Return CType(Me("ExportMode"),Boolean)
+ Return CType(Me("ExportMode"), Boolean)
End Get
Set
- Me("ExportMode") = value
+ Me("ExportMode") = Value
End Set
End Property
-
- _
+
+
Public Property ApiCalls() As Integer
Get
- Return CType(Me("ApiCalls"),Integer)
+ Return CType(Me("ApiCalls"), Integer)
End Get
Set
- Me("ApiCalls") = value
+ Me("ApiCalls") = Value
End Set
End Property
-
- _
+
+
Public Property AuthToken() As Global.SpotifyAPI.Web.Models.Token
Get
- Return CType(Me("AuthToken"),Global.SpotifyAPI.Web.Models.Token)
+ Return CType(Me("AuthToken"), Global.SpotifyAPI.Web.Models.Token)
End Get
Set
- Me("AuthToken") = value
+ Me("AuthToken") = Value
End Set
End Property
-
- _
+
+
Public Property LocalDir() As String
Get
- Return CType(Me("LocalDir"),String)
+ Return CType(Me("LocalDir"), String)
+ End Get
+ Set
+ Me("LocalDir") = Value
+ End Set
+ End Property
+
+
+ Public Property WindowColor() As String
+ Get
+ Return CType(Me("WindowColor"), String)
End Get
Set
- Me("LocalDir") = value
+ Me("WindowColor") = Value
End Set
End Property
End Class
diff --git a/Spotify Stream Widget/My Project/Settings.settings b/Spotify Stream Widget/My Project/Settings.settings
index 40bc7ec..121c894 100644
--- a/Spotify Stream Widget/My Project/Settings.settings
+++ b/Spotify Stream Widget/My Project/Settings.settings
@@ -11,7 +11,7 @@
Blocks
-
+
Green
@@ -26,5 +26,8 @@
+
+ Green
+
\ No newline at end of file
diff --git a/Spotify Stream Widget/Settings.Designer.vb b/Spotify Stream Widget/Settings.Designer.vb
index 7e7bda5..afa9a5d 100644
--- a/Spotify Stream Widget/Settings.Designer.vb
+++ b/Spotify Stream Widget/Settings.Designer.vb
@@ -37,8 +37,8 @@ Partial Class Settings
Me.Button1 = New System.Windows.Forms.Button()
Me.CreditsText = New System.Windows.Forms.TextBox()
Me.ReportLink = New MetroFramework.Controls.MetroLink()
- Me.ColorStyleLabel = New MetroFramework.Controls.MetroLabel()
- Me.ColorStyleBox = New MetroFramework.Controls.MetroComboBox()
+ Me.ProgressColorStyleLabel = New MetroFramework.Controls.MetroLabel()
+ Me.ProgressColorStyleBox = New MetroFramework.Controls.MetroComboBox()
Me.VersionLabel = New System.Windows.Forms.Label()
Me.VersionCheck = New System.ComponentModel.BackgroundWorker()
Me.ExportSettingLabel = New MetroFramework.Controls.MetroLabel()
@@ -50,6 +50,8 @@ Partial Class Settings
Me.LocalDirBtn = New System.Windows.Forms.PictureBox()
Me.LocalDirValueLabel = New MetroFramework.Controls.MetroLabel()
Me.FolderDialog = New System.Windows.Forms.FolderBrowserDialog()
+ Me.WindowColorStyleLabel = New MetroFramework.Controls.MetroLabel()
+ Me.WindowColorStyleBox = New MetroFramework.Controls.MetroComboBox()
Me.CreditPanel.SuspendLayout()
CType(Me.ExportFolderBtn, System.ComponentModel.ISupportInitialize).BeginInit()
CType(Me.LocalDirBtn, System.ComponentModel.ISupportInitialize).BeginInit()
@@ -74,7 +76,7 @@ Partial Class Settings
Me.ColorSettingToggle.Size = New System.Drawing.Size(80, 17)
Me.ColorSettingToggle.Style = MetroFramework.MetroColorStyle.Green
Me.ColorSettingToggle.TabIndex = 1
- Me.ColorSettingToggle.Text = "On"
+ Me.ColorSettingToggle.Text = "An"
Me.ColorSettingToggle.Theme = MetroFramework.MetroThemeStyle.Dark
Me.ColorSettingToggle.UseSelectable = True
'
@@ -163,10 +165,10 @@ Partial Class Settings
'
Me.CreditPanel.Controls.Add(Me.Button1)
Me.CreditPanel.Controls.Add(Me.CreditsText)
- Me.CreditPanel.Location = New System.Drawing.Point(94, 295)
+ Me.CreditPanel.Location = New System.Drawing.Point(10, 27)
Me.CreditPanel.Name = "CreditPanel"
- Me.CreditPanel.Size = New System.Drawing.Size(272, 304)
- Me.CreditPanel.TabIndex = 9
+ Me.CreditPanel.Size = New System.Drawing.Size(275, 391)
+ Me.CreditPanel.TabIndex = 99
Me.CreditPanel.Visible = False
'
'Button1
@@ -184,7 +186,7 @@ Partial Class Settings
Me.CreditsText.Multiline = True
Me.CreditsText.Name = "CreditsText"
Me.CreditsText.ScrollBars = System.Windows.Forms.ScrollBars.Vertical
- Me.CreditsText.Size = New System.Drawing.Size(269, 304)
+ Me.CreditsText.Size = New System.Drawing.Size(269, 386)
Me.CreditsText.TabIndex = 10
Me.CreditsText.Text = resources.GetString("CreditsText.Text")
'
@@ -200,28 +202,28 @@ Partial Class Settings
Me.ReportLink.UseSelectable = True
Me.ReportLink.UseStyleColors = True
'
- 'ColorStyleLabel
- '
- Me.ColorStyleLabel.AutoSize = True
- Me.ColorStyleLabel.Location = New System.Drawing.Point(13, 175)
- Me.ColorStyleLabel.Name = "ColorStyleLabel"
- Me.ColorStyleLabel.Size = New System.Drawing.Size(116, 19)
- Me.ColorStyleLabel.TabIndex = 12
- Me.ColorStyleLabel.Text = "Viewer Style Color"
- Me.ColorStyleLabel.Theme = MetroFramework.MetroThemeStyle.Dark
- '
- 'ColorStyleBox
- '
- Me.ColorStyleBox.FormattingEnabled = True
- Me.ColorStyleBox.ItemHeight = 23
- Me.ColorStyleBox.Items.AddRange(New Object() {"Green", "Black", "White", "Silver", "Blue", "Lime", "Teal", "Orange", "Brown", "Pink", "Magenta", "Purple", "Red", "Yellow"})
- Me.ColorStyleBox.Location = New System.Drawing.Point(161, 175)
- Me.ColorStyleBox.Name = "ColorStyleBox"
- Me.ColorStyleBox.Size = New System.Drawing.Size(102, 29)
- Me.ColorStyleBox.Style = MetroFramework.MetroColorStyle.Green
- Me.ColorStyleBox.TabIndex = 11
- Me.ColorStyleBox.Theme = MetroFramework.MetroThemeStyle.Dark
- Me.ColorStyleBox.UseSelectable = True
+ 'ProgressColorStyleLabel
+ '
+ Me.ProgressColorStyleLabel.AutoSize = True
+ Me.ProgressColorStyleLabel.Location = New System.Drawing.Point(13, 175)
+ Me.ProgressColorStyleLabel.Name = "ProgressColorStyleLabel"
+ Me.ProgressColorStyleLabel.Size = New System.Drawing.Size(128, 19)
+ Me.ProgressColorStyleLabel.TabIndex = 12
+ Me.ProgressColorStyleLabel.Text = "Progress Style Color"
+ Me.ProgressColorStyleLabel.Theme = MetroFramework.MetroThemeStyle.Dark
+ '
+ 'ProgressColorStyleBox
+ '
+ Me.ProgressColorStyleBox.FormattingEnabled = True
+ Me.ProgressColorStyleBox.ItemHeight = 23
+ Me.ProgressColorStyleBox.Items.AddRange(New Object() {"Green", "Black", "White", "Silver", "Blue", "Lime", "Teal", "Orange", "Brown", "Pink", "Magenta", "Purple", "Red", "Yellow"})
+ Me.ProgressColorStyleBox.Location = New System.Drawing.Point(161, 175)
+ Me.ProgressColorStyleBox.Name = "ProgressColorStyleBox"
+ Me.ProgressColorStyleBox.Size = New System.Drawing.Size(102, 29)
+ Me.ProgressColorStyleBox.Style = MetroFramework.MetroColorStyle.Green
+ Me.ProgressColorStyleBox.TabIndex = 11
+ Me.ProgressColorStyleBox.Theme = MetroFramework.MetroThemeStyle.Dark
+ Me.ProgressColorStyleBox.UseSelectable = True
'
'VersionLabel
'
@@ -240,7 +242,7 @@ Partial Class Settings
'ExportSettingLabel
'
Me.ExportSettingLabel.AutoSize = True
- Me.ExportSettingLabel.Location = New System.Drawing.Point(13, 210)
+ Me.ExportSettingLabel.Location = New System.Drawing.Point(13, 246)
Me.ExportSettingLabel.Name = "ExportSettingLabel"
Me.ExportSettingLabel.Size = New System.Drawing.Size(90, 19)
Me.ExportSettingLabel.TabIndex = 15
@@ -254,19 +256,19 @@ Partial Class Settings
Me.ExportSettingToggle.AutoSize = True
Me.ExportSettingToggle.Checked = True
Me.ExportSettingToggle.CheckState = System.Windows.Forms.CheckState.Checked
- Me.ExportSettingToggle.Location = New System.Drawing.Point(183, 215)
+ Me.ExportSettingToggle.Location = New System.Drawing.Point(183, 251)
Me.ExportSettingToggle.Name = "ExportSettingToggle"
Me.ExportSettingToggle.Size = New System.Drawing.Size(80, 17)
Me.ExportSettingToggle.Style = MetroFramework.MetroColorStyle.Green
Me.ExportSettingToggle.TabIndex = 14
- Me.ExportSettingToggle.Text = "On"
+ Me.ExportSettingToggle.Text = "An"
Me.ExportSettingToggle.Theme = MetroFramework.MetroThemeStyle.Dark
Me.ExportSettingToggle.UseSelectable = True
'
'ExportFolderBtn
'
Me.ExportFolderBtn.Image = CType(resources.GetObject("ExportFolderBtn.Image"), System.Drawing.Image)
- Me.ExportFolderBtn.Location = New System.Drawing.Point(162, 215)
+ Me.ExportFolderBtn.Location = New System.Drawing.Point(162, 251)
Me.ExportFolderBtn.Name = "ExportFolderBtn"
Me.ExportFolderBtn.Size = New System.Drawing.Size(14, 16)
Me.ExportFolderBtn.SizeMode = System.Windows.Forms.PictureBoxSizeMode.AutoSize
@@ -297,7 +299,7 @@ Partial Class Settings
'LocalDirLabel
'
Me.LocalDirLabel.AutoSize = True
- Me.LocalDirLabel.Location = New System.Drawing.Point(13, 245)
+ Me.LocalDirLabel.Location = New System.Drawing.Point(13, 281)
Me.LocalDirLabel.Name = "LocalDirLabel"
Me.LocalDirLabel.Size = New System.Drawing.Size(120, 19)
Me.LocalDirLabel.TabIndex = 18
@@ -308,7 +310,7 @@ Partial Class Settings
'LocalDirBtn
'
Me.LocalDirBtn.Image = CType(resources.GetObject("LocalDirBtn.Image"), System.Drawing.Image)
- Me.LocalDirBtn.Location = New System.Drawing.Point(162, 245)
+ Me.LocalDirBtn.Location = New System.Drawing.Point(162, 281)
Me.LocalDirBtn.Name = "LocalDirBtn"
Me.LocalDirBtn.Size = New System.Drawing.Size(14, 16)
Me.LocalDirBtn.SizeMode = System.Windows.Forms.PictureBoxSizeMode.AutoSize
@@ -318,7 +320,7 @@ Partial Class Settings
'
'LocalDirValueLabel
'
- Me.LocalDirValueLabel.Location = New System.Drawing.Point(183, 245)
+ Me.LocalDirValueLabel.Location = New System.Drawing.Point(183, 281)
Me.LocalDirValueLabel.Name = "LocalDirValueLabel"
Me.LocalDirValueLabel.Size = New System.Drawing.Size(102, 19)
Me.LocalDirValueLabel.TabIndex = 19
@@ -326,6 +328,29 @@ Partial Class Settings
Me.LocalDirValueLabel.Theme = MetroFramework.MetroThemeStyle.Dark
Me.LocalDirValueLabel.UseSelectable = True
'
+ 'WindowColorStyleLabel
+ '
+ Me.WindowColorStyleLabel.AutoSize = True
+ Me.WindowColorStyleLabel.Location = New System.Drawing.Point(13, 211)
+ Me.WindowColorStyleLabel.Name = "WindowColorStyleLabel"
+ Me.WindowColorStyleLabel.Size = New System.Drawing.Size(125, 19)
+ Me.WindowColorStyleLabel.TabIndex = 21
+ Me.WindowColorStyleLabel.Text = "Window Style Color"
+ Me.WindowColorStyleLabel.Theme = MetroFramework.MetroThemeStyle.Dark
+ '
+ 'WindowColorStyleBox
+ '
+ Me.WindowColorStyleBox.FormattingEnabled = True
+ Me.WindowColorStyleBox.ItemHeight = 23
+ Me.WindowColorStyleBox.Items.AddRange(New Object() {"Green", "Black", "White", "Silver", "Blue", "Lime", "Teal", "Orange", "Brown", "Pink", "Magenta", "Purple", "Red", "Yellow"})
+ Me.WindowColorStyleBox.Location = New System.Drawing.Point(161, 211)
+ Me.WindowColorStyleBox.Name = "WindowColorStyleBox"
+ Me.WindowColorStyleBox.Size = New System.Drawing.Size(102, 29)
+ Me.WindowColorStyleBox.Style = MetroFramework.MetroColorStyle.Green
+ Me.WindowColorStyleBox.TabIndex = 20
+ Me.WindowColorStyleBox.Theme = MetroFramework.MetroThemeStyle.Dark
+ Me.WindowColorStyleBox.UseSelectable = True
+ '
'Settings
'
Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
@@ -337,8 +362,8 @@ Partial Class Settings
Me.Controls.Add(Me.ExportSettingLabel)
Me.Controls.Add(Me.ExportSettingToggle)
Me.Controls.Add(Me.VersionLabel)
- Me.Controls.Add(Me.ColorStyleLabel)
- Me.Controls.Add(Me.ColorStyleBox)
+ Me.Controls.Add(Me.ProgressColorStyleLabel)
+ Me.Controls.Add(Me.ProgressColorStyleBox)
Me.Controls.Add(Me.ReportLink)
Me.Controls.Add(Me.CreditsLink)
Me.Controls.Add(Me.ProgressStyleLabel)
@@ -352,6 +377,8 @@ Partial Class Settings
Me.Controls.Add(Me.LocalDirLabel)
Me.Controls.Add(Me.LocalDirBtn)
Me.Controls.Add(Me.LocalDirValueLabel)
+ Me.Controls.Add(Me.WindowColorStyleLabel)
+ Me.Controls.Add(Me.WindowColorStyleBox)
Me.Icon = CType(resources.GetObject("$this.Icon"), System.Drawing.Icon)
Me.MaximizeBox = False
Me.Name = "Settings"
@@ -380,8 +407,8 @@ End Sub
Friend WithEvents CreditsText As TextBox
Friend WithEvents Button1 As Button
Friend WithEvents ReportLink As MetroFramework.Controls.MetroLink
- Friend WithEvents ColorStyleLabel As MetroFramework.Controls.MetroLabel
- Friend WithEvents ColorStyleBox As MetroFramework.Controls.MetroComboBox
+ Friend WithEvents ProgressColorStyleLabel As MetroFramework.Controls.MetroLabel
+ Friend WithEvents ProgressColorStyleBox As MetroFramework.Controls.MetroComboBox
Friend WithEvents VersionLabel As Label
Friend WithEvents VersionCheck As System.ComponentModel.BackgroundWorker
Friend WithEvents ExportSettingLabel As MetroFramework.Controls.MetroLabel
@@ -394,4 +421,6 @@ End Sub
Friend WithEvents LocalDirBtn As PictureBox
Friend WithEvents LocalDirValueLabel As MetroFramework.Controls.MetroLabel
Friend WithEvents FolderDialog As FolderBrowserDialog
+ Friend WithEvents WindowColorStyleLabel As MetroFramework.Controls.MetroLabel
+ Friend WithEvents WindowColorStyleBox As MetroFramework.Controls.MetroComboBox
End Class
diff --git a/Spotify Stream Widget/Settings.resx b/Spotify Stream Widget/Settings.resx
index 43cae27..6ef5014 100644
--- a/Spotify Stream Widget/Settings.resx
+++ b/Spotify Stream Widget/Settings.resx
@@ -144,6 +144,9 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
5gAAAABJRU5ErkJggg==
+
+ 263, 17
+
iVBORw0KGgoAAAANSUhEUgAAAA4AAAAQCAYAAAAmlE46AAAABGdBTUEAALGPC/xhBQAAADxJREFUOE9j
diff --git a/Spotify Stream Widget/Settings.vb b/Spotify Stream Widget/Settings.vb
index fd10485..dae38de 100644
--- a/Spotify Stream Widget/Settings.vb
+++ b/Spotify Stream Widget/Settings.vb
@@ -1,6 +1,6 @@
'===================================================================
' Written by Marco Sadowski, J. Wong
-' Last Update: 2020-10-08
+' Last Update: 2022-09-18
' Please add your name after mine if you edit this code <3
'
' Usage of the Settings Form:
@@ -15,13 +15,23 @@ Public Class Settings
Log("Application started - v" + ProductVersion)
'check for new version
VersionCheck.RunWorkerAsync()
+
+ 'Migration to v1.5.0.0
+ If My.Settings.WindowColor = "" Then
+ My.Settings.WindowColor = "Green"
+ End If
+ If My.Settings.ProgressColor = "" Then
+ My.Settings.ProgressColor = "Green"
+ End If
+
'get current settings
VersionLabel.Text = ProductVersion
ColorSettingToggle.Checked = My.Settings.DarkMode
ExportSettingToggle.Checked = My.Settings.ExportMode
SizeSettingBox.Text = My.Settings.Size
ProgressStyleBox.Text = My.Settings.ProgressBarStyle
- ColorStyleBox.Text = My.Settings.Color
+ ProgressColorStyleBox.Text = My.Settings.ProgressColor
+ WindowColorStyleBox.Text = My.Settings.WindowColor
If Not String.IsNullOrEmpty(My.Settings.LocalDir) Then
Viewer.InitLocalDir(My.Settings.LocalDir)
LocalDirValueLabel.Text = My.Settings.LocalDir
@@ -96,8 +106,14 @@ Public Class Settings
Viewer.ApplyProgressBarStyle()
End Sub
- Private Sub ColorStyleBox_SelectedIndexChanged(sender As Object, e As EventArgs) Handles ColorStyleBox.SelectedIndexChanged
- My.Settings.Color = ColorStyleBox.Text
+ Private Sub ProgressColorStyleBox_SelectedIndexChanged(sender As Object, e As EventArgs) Handles ProgressColorStyleBox.SelectedIndexChanged
+ My.Settings.ProgressColor = ProgressColorStyleBox.Text
+ My.Settings.Save()
+ Viewer.SetColor()
+ End Sub
+
+ Private Sub WindowColorStyleBox_SelectedIndexChanged(sender As Object, e As EventArgs) Handles WindowColorStyleBox.SelectedIndexChanged
+ My.Settings.WindowColor = WindowColorStyleBox.Text
My.Settings.Save()
Viewer.SetColor()
End Sub
@@ -147,5 +163,4 @@ Public Class Settings
Private Sub CloseApp(sender As Object, e As EventArgs) Handles Me.FormClosing
Application.Exit()
End Sub
-
End Class
\ No newline at end of file
diff --git a/Spotify Stream Widget/Viewer.vb b/Spotify Stream Widget/Viewer.vb
index cef881a..af84e05 100644
--- a/Spotify Stream Widget/Viewer.vb
+++ b/Spotify Stream Widget/Viewer.vb
@@ -98,50 +98,68 @@ Public Class Viewer
'change the style color of the viewer
Public Sub SetColor()
- Select Case My.Settings.Color
+ 'Set ProgressBar Color
+ Select Case My.Settings.ProgressColor
Case "Green"
- Style = MetroFramework.MetroColorStyle.Green
timeProgressBar.Style = MetroFramework.MetroColorStyle.Green
Case "Black"
- Style = MetroFramework.MetroColorStyle.Black
timeProgressBar.Style = MetroFramework.MetroColorStyle.Black
Case "White"
- Style = MetroFramework.MetroColorStyle.White
timeProgressBar.Style = MetroFramework.MetroColorStyle.White
Case "Silver"
- Style = MetroFramework.MetroColorStyle.Silver
timeProgressBar.Style = MetroFramework.MetroColorStyle.Silver
Case "Blue"
- Style = MetroFramework.MetroColorStyle.Blue
timeProgressBar.Style = MetroFramework.MetroColorStyle.Blue
Case "Lime"
- Style = MetroFramework.MetroColorStyle.Lime
timeProgressBar.Style = MetroFramework.MetroColorStyle.Lime
Case "Teal"
- Style = MetroFramework.MetroColorStyle.Teal
timeProgressBar.Style = MetroFramework.MetroColorStyle.Teal
Case "Orange"
- Style = MetroFramework.MetroColorStyle.Orange
timeProgressBar.Style = MetroFramework.MetroColorStyle.Orange
Case "Brown"
- Style = MetroFramework.MetroColorStyle.Brown
timeProgressBar.Style = MetroFramework.MetroColorStyle.Brown
Case "Pink"
- Style = MetroFramework.MetroColorStyle.Pink
timeProgressBar.Style = MetroFramework.MetroColorStyle.Pink
Case "Magenta"
- Style = MetroFramework.MetroColorStyle.Magenta
timeProgressBar.Style = MetroFramework.MetroColorStyle.Magenta
Case "Purple"
- Style = MetroFramework.MetroColorStyle.Purple
timeProgressBar.Style = MetroFramework.MetroColorStyle.Purple
Case "Red"
- Style = MetroFramework.MetroColorStyle.Red
timeProgressBar.Style = MetroFramework.MetroColorStyle.Red
Case "Yellow"
- Style = MetroFramework.MetroColorStyle.Yellow
timeProgressBar.Style = MetroFramework.MetroColorStyle.Yellow
End Select
+ 'Set Window Color
+ Select Case My.Settings.WindowColor
+ Case "Green"
+ Style = MetroFramework.MetroColorStyle.Green
+ Case "Black"
+ Style = MetroFramework.MetroColorStyle.Black
+ Case "White"
+ Style = MetroFramework.MetroColorStyle.White
+ Case "Silver"
+ Style = MetroFramework.MetroColorStyle.Silver
+ Case "Blue"
+ Style = MetroFramework.MetroColorStyle.Blue
+ Case "Lime"
+ Style = MetroFramework.MetroColorStyle.Lime
+ Case "Teal"
+ Style = MetroFramework.MetroColorStyle.Teal
+ Case "Orange"
+ Style = MetroFramework.MetroColorStyle.Orange
+ Case "Brown"
+ Style = MetroFramework.MetroColorStyle.Brown
+ Case "Pink"
+ Style = MetroFramework.MetroColorStyle.Pink
+ Case "Magenta"
+ Style = MetroFramework.MetroColorStyle.Magenta
+ Case "Purple"
+ Style = MetroFramework.MetroColorStyle.Purple
+ Case "Red"
+ Style = MetroFramework.MetroColorStyle.Red
+ Case "Yellow"
+ Style = MetroFramework.MetroColorStyle.Yellow
+ End Select
Refresh()
End Sub
@@ -198,11 +216,19 @@ Public Class Viewer
End Sub
Private Async Sub _spotify_OnAccessTokenExpired(sender, e)
- Dim _newToken = Await _spotifyAuth.RefreshAuthAsync(_previousToken.RefreshToken)
- _spotify.AccessToken = _newToken.AccessToken
- _previousToken.AccessToken = _newToken.AccessToken
- _previousToken.CreateDate = _newToken.CreateDate
- Log("Auth refreshed: " & _spotify.AccessToken)
+ Try
+ Dim _newToken = Await _spotifyAuth.RefreshAuthAsync(_previousToken.RefreshToken)
+ _spotify.AccessToken = _newToken.AccessToken
+ _previousToken.AccessToken = _newToken.AccessToken
+ _previousToken.CreateDate = _newToken.CreateDate
+ Log("Auth refreshed: " & _spotify.AccessToken)
+ Catch ex As Exception
+ Log(3, "_spotify_OnAccessTokenExpired() Exception: " & ex.ToString())
+ MsgBox("There was a problem with reaching the Spotify API. Please check your network connection and try again." + vbNewLine + "_spotify_OnAccessTokenExpired() Exception: " + ex.Message)
+ Close()
+
+ Return
+ End Try
End Sub
Private Async Sub UpdateTrack()