diff --git a/Bin/Debug/CarSongManage/CarSongManage.exe b/Bin/Debug/CarSongManage/CarSongManage.exe index b861065..88bd09a 100644 Binary files a/Bin/Debug/CarSongManage/CarSongManage.exe and b/Bin/Debug/CarSongManage/CarSongManage.exe differ diff --git a/CHANGELOG.md b/CHANGELOG.md index 7015218..93f439a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,10 @@ -### 2022-02-12更新 +### 2022-02-13更新 +------ +#### CarSongManage V1.0.2202.1301 +- *.[改进]音乐软件写真双击列表保存时,根据歌手名自动生成保存路径和文件名。 +- *.[改进]支持在歌曲情况页右击列表来搜索歌手写真。 + +### 2022-02-12更新 ------ #### CarSongManage V1.0.2202.1201 - *.[初始版本] diff --git a/Source/CarSongManage/.vs/CarSongManage/FileContentIndex/06fee9a6-b2cb-451f-8cc1-6e4ba009fd07.vsidx b/Source/CarSongManage/.vs/CarSongManage/FileContentIndex/06fee9a6-b2cb-451f-8cc1-6e4ba009fd07.vsidx new file mode 100644 index 0000000..a02ecb0 Binary files /dev/null and b/Source/CarSongManage/.vs/CarSongManage/FileContentIndex/06fee9a6-b2cb-451f-8cc1-6e4ba009fd07.vsidx differ diff --git a/Source/CarSongManage/.vs/CarSongManage/FileContentIndex/cc429cb8-cc17-40f9-a31c-ef82f0cf8a8b.vsidx b/Source/CarSongManage/.vs/CarSongManage/FileContentIndex/cc429cb8-cc17-40f9-a31c-ef82f0cf8a8b.vsidx deleted file mode 100644 index 64ea417..0000000 Binary files a/Source/CarSongManage/.vs/CarSongManage/FileContentIndex/cc429cb8-cc17-40f9-a31c-ef82f0cf8a8b.vsidx and /dev/null differ diff --git a/Source/CarSongManage/.vs/CarSongManage/v17/.suo b/Source/CarSongManage/.vs/CarSongManage/v17/.suo index 7b95df2..b68a175 100644 Binary files a/Source/CarSongManage/.vs/CarSongManage/v17/.suo and b/Source/CarSongManage/.vs/CarSongManage/v17/.suo differ diff --git a/Source/CarSongManage/CarSongManage/FrmLrcConvert.Designer.cs b/Source/CarSongManage/CarSongManage/FrmLrcConvert.Designer.cs index 2d7b680..07a5f17 100644 --- a/Source/CarSongManage/CarSongManage/FrmLrcConvert.Designer.cs +++ b/Source/CarSongManage/CarSongManage/FrmLrcConvert.Designer.cs @@ -42,7 +42,6 @@ this.BtnConvert = new ryControls.ButtonEx(); this.LblState = new System.Windows.Forms.Label(); this.chromeTabControl1 = new ryControls.ChromeTabControl(); - this.tabPage1 = new System.Windows.Forms.TabPage(); this.tabPage2 = new System.Windows.Forms.TabPage(); this.BtnScanMusic = new ryControls.ButtonEx(); this.table_music = new XPTable.Models.Table(); @@ -56,6 +55,12 @@ this.定位歌词文件ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.编辑歌词ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.tableModel2 = new XPTable.Models.TableModel(); + this.tabPage5 = new System.Windows.Forms.TabPage(); + this.rySearch1 = new ryControls.rySearch(); + this.BtnKuwo = new ryControls.ButtonEx(); + this.iconViewEx1 = new ryControls.IconViewEx(); + this.BtnQQMusic = new ryControls.ButtonEx(); + this.tabPage1 = new System.Windows.Forms.TabPage(); this.tabPage3 = new System.Windows.Forms.TabPage(); this.ChkPriority_Krc = new System.Windows.Forms.CheckBox(); this.LblToPath = new System.Windows.Forms.Label(); @@ -76,22 +81,19 @@ this.label4 = new System.Windows.Forms.Label(); this.TxtMovieRename = new ryControls.TextBoxEx2(); this.label2 = new System.Windows.Forms.Label(); - this.tabPage5 = new System.Windows.Forms.TabPage(); - this.BtnKuwo = new ryControls.ButtonEx(); - this.iconViewEx1 = new ryControls.IconViewEx(); - this.BtnQQMusic = new ryControls.ButtonEx(); this.toolTip1 = new System.Windows.Forms.ToolTip(this.components); this.saveFileDialog1 = new System.Windows.Forms.SaveFileDialog(); - this.rySearch1 = new ryControls.rySearch(); + this.搜索写真图片ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.toolStripMenuItem1 = new System.Windows.Forms.ToolStripSeparator(); ((System.ComponentModel.ISupportInitialize)(this.table_lrc)).BeginInit(); this.chromeTabControl1.SuspendLayout(); - this.tabPage1.SuspendLayout(); this.tabPage2.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.table_music)).BeginInit(); this.menuMusic.SuspendLayout(); + this.tabPage5.SuspendLayout(); + this.tabPage1.SuspendLayout(); this.tabPage3.SuspendLayout(); this.tabPage4.SuspendLayout(); - this.tabPage5.SuspendLayout(); this.SuspendLayout(); // // TxtLrcFolder @@ -224,19 +226,6 @@ this.chromeTabControl1.TabIndex = 6; this.chromeTabControl1.TabMaxWidth = 130; // - // tabPage1 - // - this.tabPage1.Controls.Add(this.table_lrc); - this.tabPage1.Controls.Add(this.BtnScanLrc); - this.tabPage1.Controls.Add(this.BtnConvert); - this.tabPage1.Location = new System.Drawing.Point(1, 29); - this.tabPage1.Name = "tabPage1"; - this.tabPage1.Padding = new System.Windows.Forms.Padding(3); - this.tabPage1.Size = new System.Drawing.Size(751, 474); - this.tabPage1.TabIndex = 0; - this.tabPage1.Text = "歌词转码"; - this.tabPage1.UseVisualStyleBackColor = true; - // // tabPage2 // this.tabPage2.Controls.Add(this.BtnScanMusic); @@ -309,38 +298,127 @@ this.打开写真文件夹ToolStripMenuItem, this.定位歌曲文件ToolStripMenuItem, this.定位歌词文件ToolStripMenuItem, - this.编辑歌词ToolStripMenuItem}); + this.编辑歌词ToolStripMenuItem, + this.toolStripMenuItem1, + this.搜索写真图片ToolStripMenuItem}); this.menuMusic.Name = "menuMusic"; - this.menuMusic.Size = new System.Drawing.Size(161, 92); + this.menuMusic.Size = new System.Drawing.Size(181, 142); // // 打开写真文件夹ToolStripMenuItem // this.打开写真文件夹ToolStripMenuItem.Name = "打开写真文件夹ToolStripMenuItem"; - this.打开写真文件夹ToolStripMenuItem.Size = new System.Drawing.Size(160, 22); + this.打开写真文件夹ToolStripMenuItem.Size = new System.Drawing.Size(180, 22); this.打开写真文件夹ToolStripMenuItem.Text = "打开写真文件夹"; this.打开写真文件夹ToolStripMenuItem.Click += new System.EventHandler(this.打开写真文件夹ToolStripMenuItem_Click); // // 定位歌曲文件ToolStripMenuItem // this.定位歌曲文件ToolStripMenuItem.Name = "定位歌曲文件ToolStripMenuItem"; - this.定位歌曲文件ToolStripMenuItem.Size = new System.Drawing.Size(160, 22); + this.定位歌曲文件ToolStripMenuItem.Size = new System.Drawing.Size(180, 22); this.定位歌曲文件ToolStripMenuItem.Text = "定位歌曲文件"; this.定位歌曲文件ToolStripMenuItem.Click += new System.EventHandler(this.定位歌曲文件ToolStripMenuItem_Click); // // 定位歌词文件ToolStripMenuItem // this.定位歌词文件ToolStripMenuItem.Name = "定位歌词文件ToolStripMenuItem"; - this.定位歌词文件ToolStripMenuItem.Size = new System.Drawing.Size(160, 22); + this.定位歌词文件ToolStripMenuItem.Size = new System.Drawing.Size(180, 22); this.定位歌词文件ToolStripMenuItem.Text = "定位歌词文件"; this.定位歌词文件ToolStripMenuItem.Click += new System.EventHandler(this.定位歌词文件ToolStripMenuItem_Click); // // 编辑歌词ToolStripMenuItem // this.编辑歌词ToolStripMenuItem.Name = "编辑歌词ToolStripMenuItem"; - this.编辑歌词ToolStripMenuItem.Size = new System.Drawing.Size(160, 22); + this.编辑歌词ToolStripMenuItem.Size = new System.Drawing.Size(180, 22); this.编辑歌词ToolStripMenuItem.Text = "编辑歌词"; this.编辑歌词ToolStripMenuItem.Click += new System.EventHandler(this.编辑歌词ToolStripMenuItem_Click); // + // tabPage5 + // + this.tabPage5.Controls.Add(this.rySearch1); + this.tabPage5.Controls.Add(this.BtnKuwo); + this.tabPage5.Controls.Add(this.iconViewEx1); + this.tabPage5.Controls.Add(this.BtnQQMusic); + this.tabPage5.Location = new System.Drawing.Point(1, 29); + this.tabPage5.Name = "tabPage5"; + this.tabPage5.Padding = new System.Windows.Forms.Padding(3); + this.tabPage5.Size = new System.Drawing.Size(751, 474); + this.tabPage5.TabIndex = 4; + this.tabPage5.Text = "音乐软件写真"; + this.tabPage5.UseVisualStyleBackColor = true; + // + // rySearch1 + // + this.rySearch1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(236)))), ((int)(((byte)(239)))), ((int)(((byte)(244))))); + this.rySearch1.ButtonRoundBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(236)))), ((int)(((byte)(239)))), ((int)(((byte)(244))))); + this.rySearch1.EmptyText = "请输入歌手名称来搜索"; + this.rySearch1.Location = new System.Drawing.Point(203, 6); + this.rySearch1.Name = "rySearch1"; + this.rySearch1.Size = new System.Drawing.Size(282, 30); + this.rySearch1.TabIndex = 7; + this.rySearch1.OnSearch += new System.EventHandler(this.rySearch1_OnSearch); + // + // BtnKuwo + // + this.BtnKuwo.BaseColor = System.Drawing.Color.FromArgb(((int)(((byte)(51)))), ((int)(((byte)(76)))), ((int)(((byte)(95))))); + this.BtnKuwo.Location = new System.Drawing.Point(3, 6); + this.BtnKuwo.Name = "BtnKuwo"; + this.BtnKuwo.Size = new System.Drawing.Size(84, 30); + this.BtnKuwo.TabIndex = 6; + this.BtnKuwo.Text = "刷新酷我"; + this.BtnKuwo.UseVisualStyleBackColor = true; + this.BtnKuwo.Click += new System.EventHandler(this.BtnKuwo_Click); + // + // iconViewEx1 + // + this.iconViewEx1.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) + | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); + this.iconViewEx1.BadgeListImage = ((System.Collections.Generic.List)(resources.GetObject("iconViewEx1.BadgeListImage"))); + this.iconViewEx1.HideSelection = false; + this.iconViewEx1.Icon = null; + this.iconViewEx1.IconSize = 160; + this.iconViewEx1.IsDrawGridLines = false; + this.iconViewEx1.IsDrawIcon = true; + this.iconViewEx1.Location = new System.Drawing.Point(3, 41); + this.iconViewEx1.MultiSelect = false; + this.iconViewEx1.Name = "iconViewEx1"; + this.iconViewEx1.OwnerDraw = true; + this.iconViewEx1.SelectedBorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(229)))), ((int)(((byte)(195)))), ((int)(((byte)(101))))); + this.iconViewEx1.SelectedEndBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(236)))), ((int)(((byte)(181))))); + this.iconViewEx1.SelectedForeColor = System.Drawing.Color.Black; + this.iconViewEx1.SelectedStartBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(251)))), ((int)(((byte)(237))))); + this.iconViewEx1.Size = new System.Drawing.Size(742, 430); + this.iconViewEx1.TabIndex = 5; + this.iconViewEx1.TextHeight = 20; + this.iconViewEx1.TileSize = new System.Drawing.Size(170, 170); + this.iconViewEx1.UseCompatibleStateImageBehavior = false; + this.iconViewEx1.View = System.Windows.Forms.View.Tile; + this.iconViewEx1.MouseDoubleClick += new System.Windows.Forms.MouseEventHandler(this.iconViewEx1_MouseDoubleClick); + // + // BtnQQMusic + // + this.BtnQQMusic.BaseColor = System.Drawing.Color.FromArgb(((int)(((byte)(51)))), ((int)(((byte)(76)))), ((int)(((byte)(95))))); + this.BtnQQMusic.Location = new System.Drawing.Point(93, 6); + this.BtnQQMusic.Name = "BtnQQMusic"; + this.BtnQQMusic.Size = new System.Drawing.Size(104, 30); + this.BtnQQMusic.TabIndex = 4; + this.BtnQQMusic.Text = "打开QQ音乐写真"; + this.BtnQQMusic.UseVisualStyleBackColor = true; + this.BtnQQMusic.Click += new System.EventHandler(this.BtnQQMusic_Click); + // + // tabPage1 + // + this.tabPage1.Controls.Add(this.table_lrc); + this.tabPage1.Controls.Add(this.BtnScanLrc); + this.tabPage1.Controls.Add(this.BtnConvert); + this.tabPage1.Location = new System.Drawing.Point(1, 29); + this.tabPage1.Name = "tabPage1"; + this.tabPage1.Padding = new System.Windows.Forms.Padding(3); + this.tabPage1.Size = new System.Drawing.Size(751, 474); + this.tabPage1.TabIndex = 0; + this.tabPage1.Text = "歌词转码"; + this.tabPage1.UseVisualStyleBackColor = true; + // // tabPage3 // this.tabPage3.Controls.Add(this.ChkPriority_Krc); @@ -636,83 +714,21 @@ this.label2.TabIndex = 0; this.label2.Text = "请输入文件名"; // - // tabPage5 - // - this.tabPage5.Controls.Add(this.rySearch1); - this.tabPage5.Controls.Add(this.BtnKuwo); - this.tabPage5.Controls.Add(this.iconViewEx1); - this.tabPage5.Controls.Add(this.BtnQQMusic); - this.tabPage5.Location = new System.Drawing.Point(1, 29); - this.tabPage5.Name = "tabPage5"; - this.tabPage5.Padding = new System.Windows.Forms.Padding(3); - this.tabPage5.Size = new System.Drawing.Size(751, 474); - this.tabPage5.TabIndex = 4; - this.tabPage5.Text = "音乐软件写真"; - this.tabPage5.UseVisualStyleBackColor = true; - // - // BtnKuwo - // - this.BtnKuwo.BaseColor = System.Drawing.Color.FromArgb(((int)(((byte)(51)))), ((int)(((byte)(76)))), ((int)(((byte)(95))))); - this.BtnKuwo.Location = new System.Drawing.Point(3, 6); - this.BtnKuwo.Name = "BtnKuwo"; - this.BtnKuwo.Size = new System.Drawing.Size(84, 30); - this.BtnKuwo.TabIndex = 6; - this.BtnKuwo.Text = "刷新酷我"; - this.BtnKuwo.UseVisualStyleBackColor = true; - this.BtnKuwo.Click += new System.EventHandler(this.BtnKuwo_Click); - // - // iconViewEx1 - // - this.iconViewEx1.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) - | System.Windows.Forms.AnchorStyles.Left) - | System.Windows.Forms.AnchorStyles.Right))); - this.iconViewEx1.BadgeListImage = ((System.Collections.Generic.List)(resources.GetObject("iconViewEx1.BadgeListImage"))); - this.iconViewEx1.HideSelection = false; - this.iconViewEx1.Icon = null; - this.iconViewEx1.IconSize = 160; - this.iconViewEx1.IsDrawGridLines = false; - this.iconViewEx1.IsDrawIcon = true; - this.iconViewEx1.Location = new System.Drawing.Point(3, 41); - this.iconViewEx1.MultiSelect = false; - this.iconViewEx1.Name = "iconViewEx1"; - this.iconViewEx1.OwnerDraw = true; - this.iconViewEx1.SelectedBorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(229)))), ((int)(((byte)(195)))), ((int)(((byte)(101))))); - this.iconViewEx1.SelectedEndBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(236)))), ((int)(((byte)(181))))); - this.iconViewEx1.SelectedForeColor = System.Drawing.Color.Black; - this.iconViewEx1.SelectedStartBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(251)))), ((int)(((byte)(237))))); - this.iconViewEx1.Size = new System.Drawing.Size(742, 430); - this.iconViewEx1.TabIndex = 5; - this.iconViewEx1.TextHeight = 20; - this.iconViewEx1.TileSize = new System.Drawing.Size(170, 170); - this.iconViewEx1.UseCompatibleStateImageBehavior = false; - this.iconViewEx1.View = System.Windows.Forms.View.Tile; - this.iconViewEx1.MouseDoubleClick += new System.Windows.Forms.MouseEventHandler(this.iconViewEx1_MouseDoubleClick); - // - // BtnQQMusic - // - this.BtnQQMusic.BaseColor = System.Drawing.Color.FromArgb(((int)(((byte)(51)))), ((int)(((byte)(76)))), ((int)(((byte)(95))))); - this.BtnQQMusic.Location = new System.Drawing.Point(93, 6); - this.BtnQQMusic.Name = "BtnQQMusic"; - this.BtnQQMusic.Size = new System.Drawing.Size(104, 30); - this.BtnQQMusic.TabIndex = 4; - this.BtnQQMusic.Text = "打开QQ音乐写真"; - this.BtnQQMusic.UseVisualStyleBackColor = true; - this.BtnQQMusic.Click += new System.EventHandler(this.BtnQQMusic_Click); - // // saveFileDialog1 // this.saveFileDialog1.Filter = "jpg图片|*.jpg"; // - // rySearch1 + // 搜索写真图片ToolStripMenuItem // - this.rySearch1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(236)))), ((int)(((byte)(239)))), ((int)(((byte)(244))))); - this.rySearch1.ButtonRoundBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(236)))), ((int)(((byte)(239)))), ((int)(((byte)(244))))); - this.rySearch1.EmptyText = "请输入歌手名称来搜索"; - this.rySearch1.Location = new System.Drawing.Point(203, 6); - this.rySearch1.Name = "rySearch1"; - this.rySearch1.Size = new System.Drawing.Size(282, 30); - this.rySearch1.TabIndex = 7; - this.rySearch1.OnSearch += new System.EventHandler(this.rySearch1_OnSearch); + this.搜索写真图片ToolStripMenuItem.Name = "搜索写真图片ToolStripMenuItem"; + this.搜索写真图片ToolStripMenuItem.Size = new System.Drawing.Size(180, 22); + this.搜索写真图片ToolStripMenuItem.Text = "搜索写真图片"; + this.搜索写真图片ToolStripMenuItem.Click += new System.EventHandler(this.搜索写真图片ToolStripMenuItem_Click); + // + // toolStripMenuItem1 + // + this.toolStripMenuItem1.Name = "toolStripMenuItem1"; + this.toolStripMenuItem1.Size = new System.Drawing.Size(177, 6); // // FrmLrcConvert // @@ -731,15 +747,15 @@ this.Load += new System.EventHandler(this.FrmLrcConvert_Load); ((System.ComponentModel.ISupportInitialize)(this.table_lrc)).EndInit(); this.chromeTabControl1.ResumeLayout(false); - this.tabPage1.ResumeLayout(false); this.tabPage2.ResumeLayout(false); ((System.ComponentModel.ISupportInitialize)(this.table_music)).EndInit(); this.menuMusic.ResumeLayout(false); + this.tabPage5.ResumeLayout(false); + this.tabPage1.ResumeLayout(false); this.tabPage3.ResumeLayout(false); this.tabPage3.PerformLayout(); this.tabPage4.ResumeLayout(false); this.tabPage4.PerformLayout(); - this.tabPage5.ResumeLayout(false); this.ResumeLayout(false); this.PerformLayout(); @@ -800,6 +816,8 @@ private ryControls.ButtonEx BtnKuwo; private System.Windows.Forms.SaveFileDialog saveFileDialog1; private ryControls.rySearch rySearch1; + private System.Windows.Forms.ToolStripSeparator toolStripMenuItem1; + private System.Windows.Forms.ToolStripMenuItem 搜索写真图片ToolStripMenuItem; } } diff --git a/Source/CarSongManage/CarSongManage/FrmLrcConvert.cs b/Source/CarSongManage/CarSongManage/FrmLrcConvert.cs index d3d24d1..e15a528 100644 --- a/Source/CarSongManage/CarSongManage/FrmLrcConvert.cs +++ b/Source/CarSongManage/CarSongManage/FrmLrcConvert.cs @@ -145,8 +145,8 @@ namespace CarSongManage var songfn_split = songfilename.Split('-'); if (songfn_split.Length == 2) { - songname = songfn_split[1]; - singername = songfn_split[0]; + songname = songfn_split[1].Trim() ; + singername = songfn_split[0].Trim(); } else { continue; } string have_lrc = "不含歌词"; @@ -170,7 +170,8 @@ namespace CarSongManage { SongPath = music_path, LrcPath = lrc_path, - SingerFolder = music_folder + "\\写真\\" + singername + SingerFolder = music_folder + "\\写真\\" + singername, + SingerName = singername, }; XPTable.Models.Row itemList = new XPTable.Models.Row() { @@ -828,16 +829,59 @@ namespace CarSongManage { if(e.Button!= MouseButtons.Left) { return; } if (iconViewEx1.SelectedItems.Count == 0) { return; } - if (saveFileDialog1.FileName.Length == 0) { saveFileDialog1.InitialDirectory = Environment.GetFolderPath(Environment.SpecialFolder.Desktop); } + var item = (ImgInfo)iconViewEx1.SelectedItems[0].Tag; + var init_folder= Environment.GetFolderPath(Environment.SpecialFolder.Desktop); + var singer_folder = TxtLrcFolder.Text + "\\写真\\"+item.Singer; + var next_jpgfile = ""; + if (item.Singer.Length > 0) + { + if (System.IO.Directory.Exists(singer_folder)) + { + init_folder = singer_folder; + if(System.IO.File.Exists(singer_folder+"\\01.jpg")) + { + for (int i = 1; i < 50; i++) + { + if (!System.IO.File.Exists(singer_folder + "\\"+i.ToString("00")+".jpg")) + { + next_jpgfile = singer_folder + "\\" + i.ToString("00") + ".jpg";break; + } + } + } + else if (System.IO.File.Exists(singer_folder + "\\1.jpg")) + { + for (int i = 1; i < 50; i++) + { + if (!System.IO.File.Exists(singer_folder + "\\" + i + ".jpg")) + { + next_jpgfile = singer_folder + "\\" + i + ".jpg"; break; + } + } + } + } + } + if (saveFileDialog1.FileName.Length == 0) { + if (next_jpgfile.Length > 0) + { + saveFileDialog1.FileName = next_jpgfile; + } + else + { + saveFileDialog1.InitialDirectory = init_folder; + } + } else { saveFileDialog1.InitialDirectory = ""; + if (next_jpgfile.Length > 0) + { + saveFileDialog1.FileName = next_jpgfile; + } } if(saveFileDialog1.ShowDialog()==DialogResult.OK) { var path = saveFileDialog1.FileName; if (System.IO.Path.GetExtension(path).ToLower() != ".jpg") { path += ".jpg"; } - var item =(ImgInfo) iconViewEx1.SelectedItems[0].Tag; RyFiles.SaveHighQualityImage(item.Image, path); } } @@ -846,6 +890,15 @@ namespace CarSongManage { BtnKuwo.PerformClick(); } + + private void 搜索写真图片ToolStripMenuItem_Click(object sender, EventArgs e) + { + if (table_music.SelectedItems.Length == 0) { return; } + var musicinfo = (MusicInfo)table_music.SelectedItems[0].Tag; + chromeTabControl1.SelectedTab = tabPage5; + rySearch1.Text = musicinfo.SingerName; + rySearch1.PerformClick(); + } } /// /// 图片信息 @@ -880,6 +933,10 @@ namespace CarSongManage } public class MusicInfo { + /// + /// 歌手名称 + /// + public string SingerName { get; set; } /// /// 写真文件夹 /// diff --git a/Source/CarSongManage/CarSongManage/FrmLrcConvert.resx b/Source/CarSongManage/CarSongManage/FrmLrcConvert.resx index abd7045..79fb5ec 100644 --- a/Source/CarSongManage/CarSongManage/FrmLrcConvert.resx +++ b/Source/CarSongManage/CarSongManage/FrmLrcConvert.resx @@ -132,9 +132,6 @@ 295, 19 - - 684, 20 - AAEAAAD/////AQAAAAAAAAAMAgAAAKABU3lzdGVtLkRyYXdpbmcsIFZlcnNpb249NC4wLjAuMCwgQ3Vs @@ -150,6 +147,9 @@ 684, 20 + + 684, 20 + 785, 20 diff --git a/Source/CarSongManage/CarSongManage/Properties/AssemblyInfo.cs b/Source/CarSongManage/CarSongManage/Properties/AssemblyInfo.cs index 2634742..74f582d 100644 --- a/Source/CarSongManage/CarSongManage/Properties/AssemblyInfo.cs +++ b/Source/CarSongManage/CarSongManage/Properties/AssemblyInfo.cs @@ -32,5 +32,5 @@ using System.Runtime.InteropServices; //可以指定所有这些值，也可以使用“生成号”和“修订号”的默认值 //通过使用 "*"，如下所示: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.0.2202.1201")] -[assembly: AssemblyFileVersion("1.0.2202.1201")] \ No newline at end of file +[assembly: AssemblyVersion("1.0.2202.1301")] +[assembly: AssemblyFileVersion("1.0.2202.1301")] \ No newline at end of file