diff --git a/UltraStarSongPicker/My Project/AssemblyInfo.vb b/UltraStarSongPicker/My Project/AssemblyInfo.vb index 8b4f093..bd649b9 100644 --- a/UltraStarSongPicker/My Project/AssemblyInfo.vb +++ b/UltraStarSongPicker/My Project/AssemblyInfo.vb @@ -12,7 +12,7 @@ Imports System.Runtime.InteropServices - + @@ -32,4 +32,4 @@ Imports System.Runtime.InteropServices ' - + diff --git a/UltraStarSongPicker/My Project/Resources.resx b/UltraStarSongPicker/My Project/Resources.resx index 0df3b72..bd47b8f 100644 --- a/UltraStarSongPicker/My Project/Resources.resx +++ b/UltraStarSongPicker/My Project/Resources.resx @@ -119,15 +119,15 @@ - ..\Resources\documentpdf.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v22.2, Version=22.2.6.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + ..\Resources\documentpdf.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v24.1, Version=24.1.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - ..\Resources\changeview.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v22.2, Version=22.2.6.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + ..\Resources\changeview.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v24.1, Version=24.1.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - ..\Resources\properties.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v22.2, Version=22.2.6.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + ..\Resources\properties.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v24.1, Version=24.1.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - ..\Resources\save.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v22.2, Version=22.2.6.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + ..\Resources\save.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v24.1, Version=24.1.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a \ No newline at end of file diff --git a/UltraStarSongPicker/My Project/Resources.resx.bak b/UltraStarSongPicker/My Project/Resources.resx.bak index dc5de54..0df3b72 100644 --- a/UltraStarSongPicker/My Project/Resources.resx.bak +++ b/UltraStarSongPicker/My Project/Resources.resx.bak @@ -119,15 +119,15 @@ - ..\Resources\documentpdf.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v22.1, Version=22.1.6.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + ..\Resources\documentpdf.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v22.2, Version=22.2.6.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - ..\Resources\changeview.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v22.1, Version=22.1.6.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + ..\Resources\changeview.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v22.2, Version=22.2.6.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - ..\Resources\properties.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v22.1, Version=22.1.6.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + ..\Resources\properties.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v22.2, Version=22.2.6.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - ..\Resources\save.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v22.1, Version=22.1.6.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + ..\Resources\save.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v22.2, Version=22.2.6.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a \ No newline at end of file diff --git a/UltraStarSongPicker/My Project/licenses.licx b/UltraStarSongPicker/My Project/licenses.licx index df11897..1410bf3 100644 --- a/UltraStarSongPicker/My Project/licenses.licx +++ b/UltraStarSongPicker/My Project/licenses.licx @@ -1,2 +1,2 @@ -DevExpress.XtraBars.Ribbon.RibbonControl, DevExpress.XtraBars.v22.2, Version=22.2.6.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a -DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v22.2, Version=22.2.6.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v24.1, Version=24.1.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.XtraBars.Ribbon.RibbonControl, DevExpress.XtraBars.v24.1, Version=24.1.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a diff --git a/UltraStarSongPicker/My Project/licenses.licx.bak b/UltraStarSongPicker/My Project/licenses.licx.bak index ac22e89..df11897 100644 --- a/UltraStarSongPicker/My Project/licenses.licx.bak +++ b/UltraStarSongPicker/My Project/licenses.licx.bak @@ -1,4 +1,2 @@ -DevExpress.XtraBars.Ribbon.RibbonControl, DevExpress.XtraBars.v22.1, Version=22.1.6.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a -DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v22.1, Version=22.1.6.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a -DevExpress.XtraReports.UI.XtraReport, DevExpress.XtraReports.v22.1, Version=22.1.6.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a -DevExpress.XtraEditors.TextEdit, DevExpress.XtraEditors.v22.1, Version=22.1.6.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.XtraBars.Ribbon.RibbonControl, DevExpress.XtraBars.v22.2, Version=22.2.6.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v22.2, Version=22.2.6.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a diff --git a/UltraStarSongPicker/UltraStarSongPicker.vbproj b/UltraStarSongPicker/UltraStarSongPicker.vbproj index 0d2e31c..0e5fe64 100644 --- a/UltraStarSongPicker/UltraStarSongPicker.vbproj +++ b/UltraStarSongPicker/UltraStarSongPicker.vbproj @@ -1,6 +1,6 @@  - + Debug @@ -76,65 +76,65 @@ Sora-Meliae-Matrilineare-Apps-gnome-music.ico - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + - ..\packages\EntityFramework.6.4.4\lib\net45\EntityFramework.dll + ..\packages\EntityFramework.6.5.1\lib\net45\EntityFramework.dll - ..\packages\EntityFramework.6.4.4\lib\net45\EntityFramework.SqlServer.dll + ..\packages\EntityFramework.6.5.1\lib\net45\EntityFramework.SqlServer.dll ..\packages\Newtonsoft.Json.13.0.3\lib\net45\Newtonsoft.Json.dll - - ..\packages\System.Buffers.4.5.1\lib\net461\System.Buffers.dll + + ..\packages\System.Buffers.4.6.0\lib\net462\System.Buffers.dll - - ..\packages\Stub.System.Data.SQLite.Core.NetFramework.1.0.118.0\lib\net46\System.Data.SQLite.dll + + ..\packages\Stub.System.Data.SQLite.Core.NetFramework.1.0.119.0\lib\net46\System.Data.SQLite.dll - - ..\packages\System.Data.SQLite.EF6.1.0.118.0\lib\net46\System.Data.SQLite.EF6.dll + + ..\packages\System.Data.SQLite.EF6.1.0.119.0\lib\net46\System.Data.SQLite.EF6.dll - - ..\packages\System.Data.SQLite.Linq.1.0.118.0\lib\net46\System.Data.SQLite.Linq.dll + + ..\packages\System.Data.SQLite.Linq.1.0.119.0\lib\net46\System.Data.SQLite.Linq.dll - - ..\packages\System.Memory.4.5.5\lib\net461\System.Memory.dll + + ..\packages\System.Memory.4.6.0\lib\net462\System.Memory.dll - - ..\packages\System.Numerics.Vectors.4.5.0\lib\net46\System.Numerics.Vectors.dll + + ..\packages\System.Numerics.Vectors.4.6.0\lib\net462\System.Numerics.Vectors.dll - - ..\packages\System.Runtime.CompilerServices.Unsafe.6.0.0\lib\net461\System.Runtime.CompilerServices.Unsafe.dll + + ..\packages\System.Runtime.CompilerServices.Unsafe.6.1.0\lib\net462\System.Runtime.CompilerServices.Unsafe.dll @@ -291,10 +291,10 @@ Dieses Projekt verweist auf mindestens ein NuGet-Paket, das auf diesem Computer fehlt. Verwenden Sie die Wiederherstellung von NuGet-Paketen, um die fehlenden Dateien herunterzuladen. Weitere Informationen finden Sie unter "http://go.microsoft.com/fwlink/?LinkID=322105". Die fehlende Datei ist "{0}". - - - + + + - - + + \ No newline at end of file diff --git a/UltraStarSongPicker/UltraStarSongPicker.vbproj.bak b/UltraStarSongPicker/UltraStarSongPicker.vbproj.bak index 9db7d33..0d2e31c 100644 --- a/UltraStarSongPicker/UltraStarSongPicker.vbproj.bak +++ b/UltraStarSongPicker/UltraStarSongPicker.vbproj.bak @@ -76,30 +76,30 @@ Sora-Meliae-Matrilineare-Apps-gnome-music.ico - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + ..\packages\EntityFramework.6.4.4\lib\net45\EntityFramework.dll diff --git a/UltraStarSongPicker/frmMain.vb b/UltraStarSongPicker/frmMain.vb index d3df12d..f779be2 100644 --- a/UltraStarSongPicker/frmMain.vb +++ b/UltraStarSongPicker/frmMain.vb @@ -22,6 +22,9 @@ Public Class frmMain prepareGrid() preparePlaylist() GetSongsFromDB() + + 'Playlist erstmal ausblenden, da noch nicht in Benutzung + splLibraryPlaylists.PanelVisibility = DevExpress.XtraEditors.SplitPanelVisibility.Panel1 End Sub Private Sub preparePlaylist() @@ -413,7 +416,15 @@ Public Class frmMain End If Dim rep As New repFavoritesList - rep.DataSource = Songs.Where(Function(s) s.ExistsInUltrastar = True) + + Dim ReportList As New List(Of Song) + For Each song As Song In Songs.Where(Function(s) s.ExistsInUltrastar = True).OrderBy(Function(s) s.Artist.Trim().ToLower()).ThenBy(Function(s) s.Title.Trim().ToLower) + If ReportList.Exists(Function(s) s.Artist.Trim().ToLower() = song.Artist.Trim().ToLower() AndAlso s.Title.Trim.ToLower = song.Title.Trim.ToLower) = False Then + ReportList.Add(song) + End If + Next + + rep.DataSource = ReportList If SFD.ShowDialog = DialogResult.OK Then Try rep.ExportToPdf(SFD.FileName) diff --git a/UltraStarSongPicker/frmSettings.resx b/UltraStarSongPicker/frmSettings.resx index 0541d6d..b389f10 100644 --- a/UltraStarSongPicker/frmSettings.resx +++ b/UltraStarSongPicker/frmSettings.resx @@ -117,8 +117,8 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - + + AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIyLjEsIFZlcnNpb249MjIuMS42 LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl diff --git a/UltraStarSongPicker/frmSettings.resx.bak b/UltraStarSongPicker/frmSettings.resx.bak index 83795c0..0541d6d 100644 --- a/UltraStarSongPicker/frmSettings.resx.bak +++ b/UltraStarSongPicker/frmSettings.resx.bak @@ -117,8 +117,8 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - + + AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIyLjEsIFZlcnNpb249MjIuMS42 LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl diff --git a/UltraStarSongPicker/packages.config b/UltraStarSongPicker/packages.config index 9b9fcef..6c1055c 100644 --- a/UltraStarSongPicker/packages.config +++ b/UltraStarSongPicker/packages.config @@ -1,14 +1,14 @@  - + - - - - - - - - - + + + + + + + + + \ No newline at end of file diff --git a/UltraStarSongPicker/repFavoritesList.Designer.vb b/UltraStarSongPicker/repFavoritesList.Designer.vb index 99e530e..b130b37 100644 --- a/UltraStarSongPicker/repFavoritesList.Designer.vb +++ b/UltraStarSongPicker/repFavoritesList.Designer.vb @@ -206,7 +206,7 @@ Partial Public Class repFavoritesList Me.Margins = New DevExpress.Drawing.DXMargins(254, 254, 120, 120) Me.PageHeight = 2970 Me.PageWidth = 2100 - Me.PaperKind = System.Drawing.Printing.PaperKind.A4 + Me.PaperKind = DevExpress.Drawing.Printing.DXPaperKind.A4 Me.ReportUnit = DevExpress.XtraReports.UI.ReportUnit.TenthsOfAMillimeter Me.SnapGridSize = 25.0! Me.Version = "22.1" diff --git a/UltraStarSongPicker/repFavoritesList.Designer.vb.bak b/UltraStarSongPicker/repFavoritesList.Designer.vb.bak index 12bd0c6..99e530e 100644 --- a/UltraStarSongPicker/repFavoritesList.Designer.vb.bak +++ b/UltraStarSongPicker/repFavoritesList.Designer.vb.bak @@ -109,7 +109,7 @@ Partial Public Class repFavoritesList ' Me.XrTable2.AnchorVertical = DevExpress.XtraReports.UI.VerticalAnchorStyles.Bottom Me.XrTable2.Dpi = 254.0! - Me.XrTable2.Font = New System.Drawing.Font("Arial", 12.0!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.XrTable2.Font = New DevExpress.Drawing.DXFont("Arial", 12.0!, DevExpress.Drawing.DXFontStyle.Bold, DevExpress.Drawing.DXGraphicsUnit.Point, New DevExpress.Drawing.DXFontAdditionalProperty() {New DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", CType(0, Byte))}) Me.XrTable2.LocationFloat = New DevExpress.Utils.PointFloat(0!, 141.0!) Me.XrTable2.Name = "XrTable2" Me.XrTable2.Padding = New DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 96.0!) @@ -167,7 +167,7 @@ Partial Public Class repFavoritesList 'XrLabel1 ' Me.XrLabel1.Dpi = 254.0! - Me.XrLabel1.Font = New System.Drawing.Font("Arial", 24.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.XrLabel1.Font = New DevExpress.Drawing.DXFont("Arial", 24.0!, DevExpress.Drawing.DXFontStyle.Regular, DevExpress.Drawing.DXGraphicsUnit.Point, New DevExpress.Drawing.DXFontAdditionalProperty() {New DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", CType(0, Byte))}) Me.XrLabel1.LocationFloat = New DevExpress.Utils.PointFloat(0!, 0!) Me.XrLabel1.Multiline = True Me.XrLabel1.Name = "XrLabel1" @@ -186,7 +186,7 @@ Partial Public Class repFavoritesList 'XrPageInfo1 ' Me.XrPageInfo1.Dpi = 254.0! - Me.XrPageInfo1.Font = New System.Drawing.Font("Arial", 12.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.XrPageInfo1.Font = New DevExpress.Drawing.DXFont("Arial", 12.0!, DevExpress.Drawing.DXFontStyle.Regular, DevExpress.Drawing.DXGraphicsUnit.Point, New DevExpress.Drawing.DXFontAdditionalProperty() {New DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", CType(0, Byte))}) Me.XrPageInfo1.LocationFloat = New DevExpress.Utils.PointFloat(1338.0!, 0!) Me.XrPageInfo1.Name = "XrPageInfo1" Me.XrPageInfo1.Padding = New DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 96.0!) @@ -202,8 +202,8 @@ Partial Public Class repFavoritesList Me.ComponentStorage.AddRange(New System.ComponentModel.IComponent() {Me.ObjectDataSource1}) Me.DataSource = Me.ObjectDataSource1 Me.Dpi = 254.0! - Me.Font = New System.Drawing.Font("Arial", 9.75!) - Me.Margins = New System.Drawing.Printing.Margins(254, 254, 120, 120) + Me.Font = New DevExpress.Drawing.DXFont("Arial", 9.75!) + Me.Margins = New DevExpress.Drawing.DXMargins(254, 254, 120, 120) Me.PageHeight = 2970 Me.PageWidth = 2100 Me.PaperKind = System.Drawing.Printing.PaperKind.A4