diff --git a/UltraStarSongPicker/My Project/Resources.resx b/UltraStarSongPicker/My Project/Resources.resx index dc5de54..0df3b72 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.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/Resources.resx.bak b/UltraStarSongPicker/My Project/Resources.resx.bak new file mode 100644 index 0000000..dc5de54 --- /dev/null +++ b/UltraStarSongPicker/My Project/Resources.resx.bak @@ -0,0 +1,133 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + + ..\Resources\documentpdf.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.1, Version=22.1.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\save.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v22.1, Version=22.1.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 ac22e89..df11897 100644 --- a/UltraStarSongPicker/My Project/licenses.licx +++ b/UltraStarSongPicker/My Project/licenses.licx @@ -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/My Project/licenses.licx.bak b/UltraStarSongPicker/My Project/licenses.licx.bak index 2af023c..ac22e89 100644 --- a/UltraStarSongPicker/My Project/licenses.licx.bak +++ b/UltraStarSongPicker/My Project/licenses.licx.bak @@ -1,3 +1,4 @@ -DevExpress.XtraEditors.TextEdit, DevExpress.XtraEditors.v20.2, Version=20.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a -DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v20.2, Version=20.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a -DevExpress.XtraBars.Ribbon.RibbonControl, DevExpress.XtraBars.v20.2, Version=20.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +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 diff --git a/UltraStarSongPicker/UltraStarSongPicker.vbproj b/UltraStarSongPicker/UltraStarSongPicker.vbproj index 9db7d33..0d2e31c 100644 --- a/UltraStarSongPicker/UltraStarSongPicker.vbproj +++ b/UltraStarSongPicker/UltraStarSongPicker.vbproj @@ -76,30 +76,30 @@ Sora-Meliae-Matrilineare-Apps-gnome-music.ico - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + ..\packages\EntityFramework.6.4.4\lib\net45\EntityFramework.dll diff --git a/UltraStarSongPicker/UltraStarSongPicker.vbproj.bak b/UltraStarSongPicker/UltraStarSongPicker.vbproj.bak index d513dd4..9db7d33 100644 --- a/UltraStarSongPicker/UltraStarSongPicker.vbproj.bak +++ b/UltraStarSongPicker/UltraStarSongPicker.vbproj.bak @@ -12,7 +12,7 @@ UltraStarSongPicker 512 WindowsForms - v4.7.2 + v4.8 true true @@ -76,35 +76,53 @@ Sora-Meliae-Matrilineare-Apps-gnome-music.ico - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + ..\packages\EntityFramework.6.4.4\lib\net45\EntityFramework.dll ..\packages\EntityFramework.6.4.4\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\Stub.System.Data.SQLite.Core.NetFramework.1.0.117.0\lib\net46\System.Data.SQLite.dll + + ..\packages\Stub.System.Data.SQLite.Core.NetFramework.1.0.118.0\lib\net46\System.Data.SQLite.dll - - ..\packages\System.Data.SQLite.EF6.1.0.117.0\lib\net46\System.Data.SQLite.EF6.dll + + ..\packages\System.Data.SQLite.EF6.1.0.118.0\lib\net46\System.Data.SQLite.EF6.dll - - ..\packages\System.Data.SQLite.Linq.1.0.117.0\lib\net46\System.Data.SQLite.Linq.dll + + ..\packages\System.Data.SQLite.Linq.1.0.118.0\lib\net46\System.Data.SQLite.Linq.dll @@ -139,8 +157,21 @@ - - + + + + + ctrlAudioVideoPlayer.vb + + + UserControl + + + frmErrorList.vb + + + Form + Form @@ -170,8 +201,22 @@ Settings.settings True + + repFavoritesList.vb + + + Component + + + + + ctrlAudioVideoPlayer.vb + + + frmErrorList.vb + frmMain.vb @@ -180,16 +225,23 @@ - VbMyResourcesResXFileCodeGenerator - Resources.Designer.vb My.Resources + VbMyResourcesResXFileCodeGenerator Designer + Resources.Designer.vb + + + repFavoritesList.vb PreserveNewest + + + + MyApplicationCodeGenerator @@ -241,8 +293,8 @@ - + - + \ No newline at end of file diff --git a/UltraStarSongPicker/frmMain.Designer.vb b/UltraStarSongPicker/frmMain.Designer.vb index 4c104ed..09ff565 100644 --- a/UltraStarSongPicker/frmMain.Designer.vb +++ b/UltraStarSongPicker/frmMain.Designer.vb @@ -87,7 +87,7 @@ Partial Class frmMain Me.rcMain.Pages.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPage() {Me.rpGeneral}) Me.rcMain.ShowApplicationButton = DevExpress.Utils.DefaultBoolean.[False] Me.rcMain.ShowPageHeadersMode = DevExpress.XtraBars.Ribbon.ShowPageHeadersMode.ShowOnMultiplePages - Me.rcMain.Size = New System.Drawing.Size(1115, 100) + Me.rcMain.Size = New System.Drawing.Size(1115, 122) Me.rcMain.ToolbarLocation = DevExpress.XtraBars.Ribbon.RibbonQuickAccessToolbarLocation.Hidden ' 'btnSettings @@ -212,7 +212,7 @@ Partial Class frmMain ' Me.splMain.Dock = System.Windows.Forms.DockStyle.Fill Me.splMain.FixedPanel = DevExpress.XtraEditors.SplitFixedPanel.Panel2 - Me.splMain.Location = New System.Drawing.Point(0, 100) + Me.splMain.Location = New System.Drawing.Point(0, 122) Me.splMain.Name = "splMain" ' 'splMain.Panel1 @@ -225,7 +225,7 @@ Partial Class frmMain ' Me.splMain.Panel2.Controls.Add(Me.splSongInfo) Me.splMain.Panel2.Text = "Panel2" - Me.splMain.Size = New System.Drawing.Size(1115, 603) + Me.splMain.Size = New System.Drawing.Size(1115, 581) Me.splMain.SplitterPosition = 450 Me.splMain.TabIndex = 3 ' @@ -245,12 +245,13 @@ Partial Class frmMain ' Me.splLibraryPlaylists.Panel2.Controls.Add(Me.grdPlaylist) Me.splLibraryPlaylists.Panel2.Text = "Panel2" - Me.splLibraryPlaylists.Size = New System.Drawing.Size(655, 603) + Me.splLibraryPlaylists.Size = New System.Drawing.Size(655, 581) Me.splLibraryPlaylists.SplitterPosition = 329 Me.splLibraryPlaylists.TabIndex = 3 ' 'grdPlaylist ' + Me.grdPlaylist.AllowDrop = True Me.grdPlaylist.ContextMenuStrip = Me.cmsSongs Me.grdPlaylist.Dock = System.Windows.Forms.DockStyle.Fill Me.grdPlaylist.EmbeddedNavigator.Buttons.Append.Visible = False @@ -269,7 +270,7 @@ Partial Class frmMain Me.grdPlaylist.MainView = Me.grdvPlaylist Me.grdPlaylist.MenuManager = Me.rcMain Me.grdPlaylist.Name = "grdPlaylist" - Me.grdPlaylist.Size = New System.Drawing.Size(655, 264) + Me.grdPlaylist.Size = New System.Drawing.Size(655, 242) Me.grdPlaylist.TabIndex = 2 Me.grdPlaylist.UseEmbeddedNavigator = True Me.grdPlaylist.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.grdvPlaylist}) @@ -291,7 +292,7 @@ Partial Class frmMain Me.prgMain.Appearance.BackColor = System.Drawing.Color.Transparent Me.prgMain.Appearance.Options.UseBackColor = True Me.prgMain.Caption = "" - Me.prgMain.Location = New System.Drawing.Point(204, 268) + Me.prgMain.Location = New System.Drawing.Point(204, 257) Me.prgMain.Name = "prgMain" Me.prgMain.Size = New System.Drawing.Size(246, 66) Me.prgMain.TabIndex = 2 @@ -314,7 +315,7 @@ Partial Class frmMain ' Me.splSongInfo.Panel2.Controls.Add(Me.grdSongInfos) Me.splSongInfo.Panel2.Text = "Panel2" - Me.splSongInfo.Size = New System.Drawing.Size(450, 603) + Me.splSongInfo.Size = New System.Drawing.Size(450, 581) Me.splSongInfo.SplitterPosition = 201 Me.splSongInfo.TabIndex = 5 ' @@ -323,7 +324,7 @@ Partial Class frmMain Me.avPlayer.Dock = System.Windows.Forms.DockStyle.Fill Me.avPlayer.Location = New System.Drawing.Point(0, 0) Me.avPlayer.Name = "avPlayer" - Me.avPlayer.Size = New System.Drawing.Size(450, 392) + Me.avPlayer.Size = New System.Drawing.Size(450, 370) Me.avPlayer.TabIndex = 0 ' 'grdSongInfos diff --git a/UltraStarSongPicker/frmMain.vb b/UltraStarSongPicker/frmMain.vb index 8bb81e2..d3df12d 100644 --- a/UltraStarSongPicker/frmMain.vb +++ b/UltraStarSongPicker/frmMain.vb @@ -2,6 +2,7 @@ Imports System.Data.SQLite Imports System.IO Imports System.Reflection +Imports DevExpress.Utils.DragDrop Imports DevExpress.XtraGrid Imports DevExpress.XtraGrid.Columns Imports DevExpress.XtraGrid.Views.Base @@ -32,6 +33,7 @@ Public Class frmMain grdPlaylist.DataSource = dvPlaylist With grdvPlaylist .PopulateColumns() + .OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.True End With End Sub @@ -39,6 +41,7 @@ Public Class frmMain Private Sub prepareGrid() grdSongs.DataSource = Songs grdvSongs.PopulateColumns() + With grdvSongs .OptionsBehavior.Editable = True For Each col As GridColumn In grdvSongs.Columns @@ -113,6 +116,16 @@ Public Class frmMain End Sub + + + Private Sub grdvPlaylist_DragDrop(sender As Object, e As DragDropEventArgs) + + End Sub + + Private Sub grdvSongs_DragDrop(sender As Object, e As DragDropEventArgs) + ' Throw New NotImplementedException() + End Sub + Private Sub btnSettings_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles btnSettings.ItemClick Dim frm As New frmSettings frm.ShowDialog() @@ -269,41 +282,41 @@ Public Class frmMain End Sub - Private downHitInfo As GridHitInfo = Nothing + 'Private downHitInfo As GridHitInfo = Nothing - Private Sub grdvSongs_MouseDown(ByVal sender As Object, ByVal e As System.Windows.Forms.MouseEventArgs) Handles grdvSongs.MouseDown - Dim view As GridView = TryCast(sender, GridView) - downHitInfo = Nothing + 'Private Sub grdvSongs_MouseDown(ByVal sender As Object, ByVal e As System.Windows.Forms.MouseEventArgs) Handles grdvSongs.MouseDown + ' Dim view As GridView = TryCast(sender, GridView) + ' downHitInfo = Nothing - Dim hitInfo As GridHitInfo = view.CalcHitInfo(New Point(e.X, e.Y)) - If Control.ModifierKeys <> Keys.None Then - Return - End If - If e.Button = MouseButtons.Left AndAlso hitInfo.InRow AndAlso hitInfo.RowHandle <> GridControl.NewItemRowHandle Then - downHitInfo = hitInfo - End If - End Sub + ' Dim hitInfo As GridHitInfo = view.CalcHitInfo(New Point(e.X, e.Y)) + ' If Control.ModifierKeys <> Keys.None Then + ' Return + ' End If + ' If e.Button = MouseButtons.Left AndAlso hitInfo.InRow AndAlso hitInfo.RowHandle <> GridControl.NewItemRowHandle Then + ' downHitInfo = hitInfo + ' End If + 'End Sub - Private Sub grdvSongs_MouseMove(ByVal sender As Object, ByVal e As System.Windows.Forms.MouseEventArgs) Handles grdvSongs.MouseMove - Dim view As GridView = TryCast(sender, GridView) - If e.Button = MouseButtons.Left AndAlso downHitInfo IsNot Nothing Then - Dim dragSize As Size = SystemInformation.DragSize - Dim dragRect As New Rectangle(New Point(downHitInfo.HitPoint.X - dragSize.Width \ 2, downHitInfo.HitPoint.Y - dragSize.Height \ 2), dragSize) + 'Private Sub grdvSongs_MouseMove(ByVal sender As Object, ByVal e As System.Windows.Forms.MouseEventArgs) Handles grdvSongs.MouseMove + ' Dim view As GridView = TryCast(sender, GridView) + ' If e.Button = MouseButtons.Left AndAlso downHitInfo IsNot Nothing Then + ' Dim dragSize As Size = SystemInformation.DragSize + ' Dim dragRect As New Rectangle(New Point(downHitInfo.HitPoint.X - dragSize.Width \ 2, downHitInfo.HitPoint.Y - dragSize.Height \ 2), dragSize) - If (Not dragRect.Contains(New Point(e.X, e.Y))) Then - Dim pfade As New Specialized.StringCollection - For Each rh As Integer In grdvSongs.GetSelectedRows - pfade.Add(CStr(grdvSongs.GetRowCellValue(rh, NameOf(Song.FullPath)))) - Next - Dim datas As New DataObject - datas.SetFileDropList(pfade) + ' If (Not dragRect.Contains(New Point(e.X, e.Y))) Then + ' Dim pfade As New Specialized.StringCollection + ' For Each rh As Integer In grdvSongs.GetSelectedRows + ' pfade.Add(CStr(grdvSongs.GetRowCellValue(rh, NameOf(Song.FullPath)))) + ' Next + ' Dim datas As New DataObject + ' datas.SetFileDropList(pfade) - 'view.GridControl.DoDragDrop(downHitInfo, DragDropEffects.All) - view.GridControl.DoDragDrop(datas, DragDropEffects.Copy) - downHitInfo = Nothing - End If - End If - End Sub + ' 'view.GridControl.DoDragDrop(downHitInfo, DragDropEffects.All) + ' view.GridControl.DoDragDrop(datas, DragDropEffects.Copy) + ' downHitInfo = Nothing + ' End If + ' End If + 'End Sub Private Sub cmsSongs_Opening(sender As Object, e As CancelEventArgs) Handles cmsSongs.Opening Dim hi As GridHitInfo = grdvSongs.CalcHitInfo(grdSongs.PointToClient(Cursor.Position)) @@ -422,4 +435,8 @@ Public Class frmMain Private Sub frmMain_FormClosing(sender As Object, e As FormClosingEventArgs) Handles Me.FormClosing avPlayer.Stop() End Sub + + Private Sub grdvPlaylist_DragObjectOver(sender As Object, e As DragObjectOverEventArgs) Handles grdvPlaylist.DragObjectOver + Console.WriteLine(e.DragObject.ToString()) + End Sub End Class diff --git a/UltraStarSongPicker/frmSettings.resx b/UltraStarSongPicker/frmSettings.resx index 83795c0..0541d6d 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 472df72..83795c0 100644 --- a/UltraStarSongPicker/frmSettings.resx.bak +++ b/UltraStarSongPicker/frmSettings.resx.bak @@ -117,10 +117,10 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - + + - AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIwLjIsIFZlcnNpb249MjAuMi40 + AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIyLjEsIFZlcnNpb249MjIuMS42 LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAMICAAAC77u/ PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi diff --git a/UltraStarSongPicker/repFavoritesList.Designer.vb b/UltraStarSongPicker/repFavoritesList.Designer.vb index 12bd0c6..99e530e 100644 --- a/UltraStarSongPicker/repFavoritesList.Designer.vb +++ b/UltraStarSongPicker/repFavoritesList.Designer.vb @@ -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 diff --git a/UltraStarSongPicker/repFavoritesList.Designer.vb.bak b/UltraStarSongPicker/repFavoritesList.Designer.vb.bak new file mode 100644 index 0000000..12bd0c6 --- /dev/null +++ b/UltraStarSongPicker/repFavoritesList.Designer.vb.bak @@ -0,0 +1,238 @@ + _ +Partial Public Class repFavoritesList + Inherits DevExpress.XtraReports.UI.XtraReport + + 'XtraReport overrides dispose to clean up the component list. + _ + Protected Overrides Sub Dispose(ByVal disposing As Boolean) + If disposing AndAlso components IsNot Nothing Then + components.Dispose() + End If + MyBase.Dispose(disposing) + End Sub + + 'Required by the Designer + Private components As System.ComponentModel.IContainer + + 'NOTE: The following procedure is required by the Designer + 'It can be modified using the Designer. + 'Do not modify it using the code editor. + _ + Private Sub InitializeComponent() + Me.components = New System.ComponentModel.Container() + Me.TopMargin = New DevExpress.XtraReports.UI.TopMarginBand() + Me.BottomMargin = New DevExpress.XtraReports.UI.BottomMarginBand() + Me.Detail = New DevExpress.XtraReports.UI.DetailBand() + Me.XrTable1 = New DevExpress.XtraReports.UI.XRTable() + Me.XrTableRow1 = New DevExpress.XtraReports.UI.XRTableRow() + Me.XrTableCell1 = New DevExpress.XtraReports.UI.XRTableCell() + Me.XrTableCell2 = New DevExpress.XtraReports.UI.XRTableCell() + Me.XrTableCell3 = New DevExpress.XtraReports.UI.XRTableCell() + Me.XrTable2 = New DevExpress.XtraReports.UI.XRTable() + Me.XrTableRow2 = New DevExpress.XtraReports.UI.XRTableRow() + Me.XrTableCell4 = New DevExpress.XtraReports.UI.XRTableCell() + Me.XrTableCell5 = New DevExpress.XtraReports.UI.XRTableCell() + Me.XrTableCell6 = New DevExpress.XtraReports.UI.XRTableCell() + Me.PageHeader = New DevExpress.XtraReports.UI.PageHeaderBand() + Me.ObjectDataSource1 = New DevExpress.DataAccess.ObjectBinding.ObjectDataSource(Me.components) + Me.XrLabel1 = New DevExpress.XtraReports.UI.XRLabel() + Me.PageFooter = New DevExpress.XtraReports.UI.PageFooterBand() + Me.XrPageInfo1 = New DevExpress.XtraReports.UI.XRPageInfo() + CType(Me.XrTable1, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.XrTable2, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.ObjectDataSource1, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me, System.ComponentModel.ISupportInitialize).BeginInit() + ' + 'TopMargin + ' + Me.TopMargin.Dpi = 254.0! + Me.TopMargin.HeightF = 120.0! + Me.TopMargin.Name = "TopMargin" + ' + 'BottomMargin + ' + Me.BottomMargin.Dpi = 254.0! + Me.BottomMargin.HeightF = 120.0! + Me.BottomMargin.Name = "BottomMargin" + ' + 'Detail + ' + Me.Detail.Controls.AddRange(New DevExpress.XtraReports.UI.XRControl() {Me.XrTable1}) + Me.Detail.Dpi = 254.0! + Me.Detail.HeightF = 63.5! + Me.Detail.Name = "Detail" + ' + 'XrTable1 + ' + Me.XrTable1.Dpi = 254.0! + Me.XrTable1.LocationFloat = New DevExpress.Utils.PointFloat(0!, 0!) + Me.XrTable1.Name = "XrTable1" + Me.XrTable1.Padding = New DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 96.0!) + Me.XrTable1.Rows.AddRange(New DevExpress.XtraReports.UI.XRTableRow() {Me.XrTableRow1}) + Me.XrTable1.SizeF = New System.Drawing.SizeF(1592.0!, 63.5!) + ' + 'XrTableRow1 + ' + Me.XrTableRow1.Cells.AddRange(New DevExpress.XtraReports.UI.XRTableCell() {Me.XrTableCell1, Me.XrTableCell2, Me.XrTableCell3}) + Me.XrTableRow1.Dpi = 254.0! + Me.XrTableRow1.Name = "XrTableRow1" + Me.XrTableRow1.Weight = 1.0R + ' + 'XrTableCell1 + ' + Me.XrTableCell1.Dpi = 254.0! + Me.XrTableCell1.ExpressionBindings.AddRange(New DevExpress.XtraReports.UI.ExpressionBinding() {New DevExpress.XtraReports.UI.ExpressionBinding("BeforePrint", "Text", "[Artist]")}) + Me.XrTableCell1.Multiline = True + Me.XrTableCell1.Name = "XrTableCell1" + Me.XrTableCell1.Text = "XrTableCell1" + Me.XrTableCell1.Weight = 1.0R + ' + 'XrTableCell2 + ' + Me.XrTableCell2.Dpi = 254.0! + Me.XrTableCell2.ExpressionBindings.AddRange(New DevExpress.XtraReports.UI.ExpressionBinding() {New DevExpress.XtraReports.UI.ExpressionBinding("BeforePrint", "Text", "[Title]")}) + Me.XrTableCell2.Multiline = True + Me.XrTableCell2.Name = "XrTableCell2" + Me.XrTableCell2.Text = "XrTableCell2" + Me.XrTableCell2.Weight = 1.4337711046688522R + ' + 'XrTableCell3 + ' + Me.XrTableCell3.CanShrink = True + Me.XrTableCell3.Dpi = 254.0! + Me.XrTableCell3.ExpressionBindings.AddRange(New DevExpress.XtraReports.UI.ExpressionBinding() {New DevExpress.XtraReports.UI.ExpressionBinding("BeforePrint", "Text", "[Language]")}) + Me.XrTableCell3.Name = "XrTableCell3" + Me.XrTableCell3.Text = "XrTableCell3" + Me.XrTableCell3.Weight = 0.56622889533114784R + ' + 'XrTable2 + ' + 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.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!) + Me.XrTable2.Rows.AddRange(New DevExpress.XtraReports.UI.XRTableRow() {Me.XrTableRow2}) + Me.XrTable2.SizeF = New System.Drawing.SizeF(1592.0!, 63.5!) + Me.XrTable2.StylePriority.UseFont = False + ' + 'XrTableRow2 + ' + Me.XrTableRow2.Cells.AddRange(New DevExpress.XtraReports.UI.XRTableCell() {Me.XrTableCell4, Me.XrTableCell5, Me.XrTableCell6}) + Me.XrTableRow2.Dpi = 254.0! + Me.XrTableRow2.Name = "XrTableRow2" + Me.XrTableRow2.Weight = 1.0R + ' + 'XrTableCell4 + ' + Me.XrTableCell4.CanGrow = False + Me.XrTableCell4.Dpi = 254.0! + Me.XrTableCell4.Multiline = True + Me.XrTableCell4.Name = "XrTableCell4" + Me.XrTableCell4.Text = "Künstler" + Me.XrTableCell4.Weight = 1.0R + ' + 'XrTableCell5 + ' + Me.XrTableCell5.CanGrow = False + Me.XrTableCell5.Dpi = 254.0! + Me.XrTableCell5.Multiline = True + Me.XrTableCell5.Name = "XrTableCell5" + Me.XrTableCell5.Text = "Titel" + Me.XrTableCell5.Weight = 1.4337704145728645R + ' + 'XrTableCell6 + ' + Me.XrTableCell6.CanGrow = False + Me.XrTableCell6.Dpi = 254.0! + Me.XrTableCell6.Multiline = True + Me.XrTableCell6.Name = "XrTableCell6" + Me.XrTableCell6.Text = "Sprache" + Me.XrTableCell6.Weight = 0.56622958542713564R + ' + 'PageHeader + ' + Me.PageHeader.Controls.AddRange(New DevExpress.XtraReports.UI.XRControl() {Me.XrLabel1, Me.XrTable2}) + Me.PageHeader.Dpi = 254.0! + Me.PageHeader.HeightF = 204.5! + Me.PageHeader.Name = "PageHeader" + ' + 'ObjectDataSource1 + ' + Me.ObjectDataSource1.DataMember = "Songs" + Me.ObjectDataSource1.DataSource = GetType(UltraStarSongPicker.frmMain) + Me.ObjectDataSource1.Name = "ObjectDataSource1" + ' + '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.LocationFloat = New DevExpress.Utils.PointFloat(0!, 0!) + Me.XrLabel1.Multiline = True + Me.XrLabel1.Name = "XrLabel1" + Me.XrLabel1.Padding = New DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 96.0!) + Me.XrLabel1.SizeF = New System.Drawing.SizeF(1592.0!, 141.0!) + Me.XrLabel1.StylePriority.UseFont = False + Me.XrLabel1.Text = "Karaoke Songliste" + ' + 'PageFooter + ' + Me.PageFooter.Controls.AddRange(New DevExpress.XtraReports.UI.XRControl() {Me.XrPageInfo1}) + Me.PageFooter.Dpi = 254.0! + Me.PageFooter.HeightF = 58.42! + Me.PageFooter.Name = "PageFooter" + ' + '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.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!) + Me.XrPageInfo1.SizeF = New System.Drawing.SizeF(254.0!, 58.42!) + Me.XrPageInfo1.StylePriority.UseFont = False + Me.XrPageInfo1.StylePriority.UseTextAlignment = False + Me.XrPageInfo1.TextAlignment = DevExpress.XtraPrinting.TextAlignment.BottomRight + Me.XrPageInfo1.TextFormatString = "Seite {0}/{1}" + ' + 'repFavoritesList + ' + Me.Bands.AddRange(New DevExpress.XtraReports.UI.Band() {Me.TopMargin, Me.BottomMargin, Me.Detail, Me.PageHeader, Me.PageFooter}) + 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.PageHeight = 2970 + Me.PageWidth = 2100 + Me.PaperKind = System.Drawing.Printing.PaperKind.A4 + Me.ReportUnit = DevExpress.XtraReports.UI.ReportUnit.TenthsOfAMillimeter + Me.SnapGridSize = 25.0! + Me.Version = "22.1" + CType(Me.XrTable1, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.XrTable2, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.ObjectDataSource1, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me, System.ComponentModel.ISupportInitialize).EndInit() + + End Sub + + Friend WithEvents TopMargin As DevExpress.XtraReports.UI.TopMarginBand + Friend WithEvents BottomMargin As DevExpress.XtraReports.UI.BottomMarginBand + Friend WithEvents Detail As DevExpress.XtraReports.UI.DetailBand + Friend WithEvents ObjectDataSource1 As DevExpress.DataAccess.ObjectBinding.ObjectDataSource + Friend WithEvents XrTable1 As DevExpress.XtraReports.UI.XRTable + Friend WithEvents XrTableRow1 As DevExpress.XtraReports.UI.XRTableRow + Friend WithEvents XrTableCell1 As DevExpress.XtraReports.UI.XRTableCell + Friend WithEvents XrTableCell2 As DevExpress.XtraReports.UI.XRTableCell + Friend WithEvents XrTableCell3 As DevExpress.XtraReports.UI.XRTableCell + Friend WithEvents XrTable2 As DevExpress.XtraReports.UI.XRTable + Friend WithEvents XrTableRow2 As DevExpress.XtraReports.UI.XRTableRow + Friend WithEvents XrTableCell4 As DevExpress.XtraReports.UI.XRTableCell + Friend WithEvents XrTableCell5 As DevExpress.XtraReports.UI.XRTableCell + Friend WithEvents XrTableCell6 As DevExpress.XtraReports.UI.XRTableCell + Friend WithEvents PageHeader As DevExpress.XtraReports.UI.PageHeaderBand + Friend WithEvents XrLabel1 As DevExpress.XtraReports.UI.XRLabel + Friend WithEvents PageFooter As DevExpress.XtraReports.UI.PageFooterBand + Friend WithEvents XrPageInfo1 As DevExpress.XtraReports.UI.XRPageInfo +End Class