) freedb submission

) proxy support in freedb/musicbrainz
) advanced settings
) bugfixes
This commit is contained in:
chudov
2010-05-09 07:01:47 +00:00
parent 057c892303
commit 4562034e5e
23 changed files with 871 additions and 421 deletions

View File

@@ -746,9 +746,9 @@ namespace JDP {
if (_batchPaths.Count == 0 && action == CUEAction.Encode)
{
if (checkBoxUseFreeDb.Checked || checkBoxUseMusicBrainz.Checked)
releases = cueSheet.LookupAlbumInfo(checkBoxUseFreeDb.Checked, checkBoxUseMusicBrainz.Checked, true);
releases = cueSheet.LookupAlbumInfo(checkBoxUseFreeDb.Checked, checkBoxUseMusicBrainz.Checked, _profile._config.advanced.CacheMetadata);
}
else // if checkBoxUseMetadataCache.Checked
else if (_profile._config.advanced.CacheMetadata)
{
try
{

View File

@@ -140,7 +140,8 @@ namespace JDP
if (e.CloseReason != CloseReason.None || DialogResult != DialogResult.OK || ri == null || CUE == null)
return;
CUE.CopyMetadata(ri.metadata);
ri.metadata.Save();
if (CUE.Config.advanced.CacheMetadata)
ri.metadata.Save();
}
private void AutoResizeTracks()

View File

@@ -172,11 +172,12 @@ namespace JDP {
this.columnHeader6 = new System.Windows.Forms.ColumnHeader();
this.listViewScripts = new System.Windows.Forms.ListView();
this.columnHeader5 = new System.Windows.Forms.ColumnHeader();
this.tabPage7 = new System.Windows.Forms.TabPage();
this.propertyGrid1 = new System.Windows.Forms.PropertyGrid();
this.labelFormatDecoder = new System.Windows.Forms.Label();
this.labelFormatEncoder = new System.Windows.Forms.Label();
this.columnHeader2 = new System.Windows.Forms.ColumnHeader();
this.checkBox1 = new System.Windows.Forms.CheckBox();
this.checkBoxUseSystemProxy = new System.Windows.Forms.CheckBox();
btnCancel = new System.Windows.Forms.Button();
this.grpGeneral.SuspendLayout();
this.groupBox1.SuspendLayout();
@@ -218,6 +219,7 @@ namespace JDP {
this.grpHDCD.SuspendLayout();
this.tabPage5.SuspendLayout();
this.groupBoxScriptConditions.SuspendLayout();
this.tabPage7.SuspendLayout();
this.SuspendLayout();
//
// btnCancel
@@ -229,7 +231,6 @@ namespace JDP {
//
// grpGeneral
//
this.grpGeneral.Controls.Add(this.checkBoxUseSystemProxy);
this.grpGeneral.Controls.Add(this.checkBoxSeparateDecodingThread);
this.grpGeneral.Controls.Add(this.checkBoxCheckForUpdates);
this.grpGeneral.Controls.Add(this.chkAllowMultipleInstances);
@@ -654,6 +655,7 @@ namespace JDP {
this.tabControl1.Controls.Add(this.tabPage11);
this.tabControl1.Controls.Add(this.tabPage4);
this.tabControl1.Controls.Add(this.tabPage5);
this.tabControl1.Controls.Add(this.tabPage7);
this.tabControl1.HotTrack = true;
this.tabControl1.Multiline = true;
this.tabControl1.Name = "tabControl1";
@@ -1453,6 +1455,20 @@ namespace JDP {
//
resources.ApplyResources(this.columnHeader5, "columnHeader5");
//
// tabPage7
//
this.tabPage7.BackColor = System.Drawing.SystemColors.Control;
this.tabPage7.Controls.Add(this.propertyGrid1);
resources.ApplyResources(this.tabPage7, "tabPage7");
this.tabPage7.Name = "tabPage7";
//
// propertyGrid1
//
resources.ApplyResources(this.propertyGrid1, "propertyGrid1");
this.propertyGrid1.Name = "propertyGrid1";
this.propertyGrid1.PropertySort = System.Windows.Forms.PropertySort.Categorized;
this.propertyGrid1.ToolbarVisible = false;
//
// labelFormatDecoder
//
resources.ApplyResources(this.labelFormatDecoder, "labelFormatDecoder");
@@ -1473,12 +1489,6 @@ namespace JDP {
this.checkBox1.Name = "checkBox1";
this.checkBox1.UseVisualStyleBackColor = true;
//
// checkBoxUseSystemProxy
//
resources.ApplyResources(this.checkBoxUseSystemProxy, "checkBoxUseSystemProxy");
this.checkBoxUseSystemProxy.Name = "checkBoxUseSystemProxy";
this.checkBoxUseSystemProxy.UseVisualStyleBackColor = true;
//
// frmSettings
//
this.AcceptButton = this.btnOK;
@@ -1557,6 +1567,7 @@ namespace JDP {
this.grpHDCD.PerformLayout();
this.tabPage5.ResumeLayout(false);
this.groupBoxScriptConditions.ResumeLayout(false);
this.tabPage7.ResumeLayout(false);
this.ResumeLayout(false);
}
@@ -1713,7 +1724,8 @@ namespace JDP {
private System.Windows.Forms.CheckBox checkBox1;
private System.Windows.Forms.CheckBox checkBoxFlaCudaMultithread;
private System.Windows.Forms.CheckBox checkBoxSeparateDecodingThread;
private System.Windows.Forms.CheckBox checkBoxUseSystemProxy;
private System.Windows.Forms.TabPage tabPage7;
private System.Windows.Forms.PropertyGrid propertyGrid1;
}
}

View File

@@ -35,6 +35,7 @@ namespace JDP {
private void frmSettings_Load(object sender, EventArgs e)
{
cUEConfigBindingSource.DataSource = _config;
propertyGrid1.SelectedObject = _config.advanced;
chkReducePriority.Checked = _reducePriority;
checkBoxCheckForUpdates.Checked = _config.checkForUpdates;
@@ -85,7 +86,6 @@ namespace JDP {
//textBoxARLogExtension.Text = _config.arLogFilenameFormat;
numericUpDownMaxResolution.Value = _config.maxAlbumArtSize;
checkBoxSeparateDecodingThread.Checked = _config.separateDecodingThread;
checkBoxUseSystemProxy.Checked = _config.useSystemProxySettings;
switch (_config.gapsHandling)
{
@@ -249,7 +249,6 @@ namespace JDP {
//_config.arLogFilenameFormat = textBoxARLogExtension.Text;
_config.maxAlbumArtSize = (int) numericUpDownMaxResolution.Value;
_config.separateDecodingThread = checkBoxSeparateDecodingThread.Checked;
_config.useSystemProxySettings = checkBoxUseSystemProxy.Checked;
_config.language = ((CultureInfo)comboLanguage.SelectedItem).Name;
}

View File

@@ -150,33 +150,6 @@
<data name="&gt;&gt;btnCancel.ZOrder" xml:space="preserve">
<value>1</value>
</data>
<data name="checkBoxUseSystemProxy.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
</data>
<data name="checkBoxUseSystemProxy.Location" type="System.Drawing.Point, System.Drawing">
<value>12, 157</value>
</data>
<data name="checkBoxUseSystemProxy.Size" type="System.Drawing.Size, System.Drawing">
<value>153, 17</value>
</data>
<data name="checkBoxUseSystemProxy.TabIndex" type="System.Int32, mscorlib">
<value>10</value>
</data>
<data name="checkBoxUseSystemProxy.Text" xml:space="preserve">
<value>Use system proxy settings</value>
</data>
<data name="&gt;&gt;checkBoxUseSystemProxy.Name" xml:space="preserve">
<value>checkBoxUseSystemProxy</value>
</data>
<data name="&gt;&gt;checkBoxUseSystemProxy.Type" xml:space="preserve">
<value>System.Windows.Forms.CheckBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;checkBoxUseSystemProxy.Parent" xml:space="preserve">
<value>grpGeneral</value>
</data>
<data name="&gt;&gt;checkBoxUseSystemProxy.ZOrder" xml:space="preserve">
<value>0</value>
</data>
<data name="checkBoxSeparateDecodingThread.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
</data>
@@ -208,7 +181,7 @@
<value>grpGeneral</value>
</data>
<data name="&gt;&gt;checkBoxSeparateDecodingThread.ZOrder" xml:space="preserve">
<value>1</value>
<value>0</value>
</data>
<data name="checkBoxCheckForUpdates.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
@@ -241,7 +214,7 @@
<value>grpGeneral</value>
</data>
<data name="&gt;&gt;checkBoxCheckForUpdates.ZOrder" xml:space="preserve">
<value>2</value>
<value>1</value>
</data>
<data name="chkAllowMultipleInstances.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
@@ -274,7 +247,7 @@
<value>grpGeneral</value>
</data>
<data name="&gt;&gt;chkAllowMultipleInstances.ZOrder" xml:space="preserve">
<value>3</value>
<value>2</value>
</data>
<data name="chkReducePriority.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
@@ -307,7 +280,7 @@
<value>grpGeneral</value>
</data>
<data name="&gt;&gt;chkReducePriority.ZOrder" xml:space="preserve">
<value>4</value>
<value>3</value>
</data>
<data name="chkTruncateExtra4206Samples.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
@@ -340,7 +313,7 @@
<value>grpGeneral</value>
</data>
<data name="&gt;&gt;chkTruncateExtra4206Samples.ZOrder" xml:space="preserve">
<value>5</value>
<value>4</value>
</data>
<data name="chkCreateCUEFileWhenEmbedded.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
@@ -373,7 +346,7 @@
<value>grpGeneral</value>
</data>
<data name="&gt;&gt;chkCreateCUEFileWhenEmbedded.ZOrder" xml:space="preserve">
<value>6</value>
<value>5</value>
</data>
<data name="chkCreateM3U.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
@@ -406,7 +379,7 @@
<value>grpGeneral</value>
</data>
<data name="&gt;&gt;chkCreateM3U.ZOrder" xml:space="preserve">
<value>7</value>
<value>6</value>
</data>
<data name="chkAutoCorrectFilenames.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
@@ -439,7 +412,7 @@
<value>grpGeneral</value>
</data>
<data name="&gt;&gt;chkAutoCorrectFilenames.ZOrder" xml:space="preserve">
<value>8</value>
<value>7</value>
</data>
<data name="grpGeneral.Location" type="System.Drawing.Point, System.Drawing">
<value>6, 6</value>
@@ -4192,6 +4165,54 @@
<data name="&gt;&gt;tabPage5.ZOrder" xml:space="preserve">
<value>7</value>
</data>
<data name="propertyGrid1.Location" type="System.Drawing.Point, System.Drawing">
<value>8, 6</value>
</data>
<data name="propertyGrid1.Size" type="System.Drawing.Size, System.Drawing">
<value>518, 279</value>
</data>
<data name="propertyGrid1.TabIndex" type="System.Int32, mscorlib">
<value>0</value>
</data>
<data name="&gt;&gt;propertyGrid1.Name" xml:space="preserve">
<value>propertyGrid1</value>
</data>
<data name="&gt;&gt;propertyGrid1.Type" xml:space="preserve">
<value>System.Windows.Forms.PropertyGrid, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;propertyGrid1.Parent" xml:space="preserve">
<value>tabPage7</value>
</data>
<data name="&gt;&gt;propertyGrid1.ZOrder" xml:space="preserve">
<value>0</value>
</data>
<data name="tabPage7.Location" type="System.Drawing.Point, System.Drawing">
<value>4, 22</value>
</data>
<data name="tabPage7.Padding" type="System.Windows.Forms.Padding, System.Windows.Forms">
<value>3, 3, 3, 3</value>
</data>
<data name="tabPage7.Size" type="System.Drawing.Size, System.Drawing">
<value>535, 291</value>
</data>
<data name="tabPage7.TabIndex" type="System.Int32, mscorlib">
<value>10</value>
</data>
<data name="tabPage7.Text" xml:space="preserve">
<value>Advanced</value>
</data>
<data name="&gt;&gt;tabPage7.Name" xml:space="preserve">
<value>tabPage7</value>
</data>
<data name="&gt;&gt;tabPage7.Type" xml:space="preserve">
<value>System.Windows.Forms.TabPage, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;tabPage7.Parent" xml:space="preserve">
<value>tabControl1</value>
</data>
<data name="&gt;&gt;tabPage7.ZOrder" xml:space="preserve">
<value>8</value>
</data>
<data name="tabControl1.Location" type="System.Drawing.Point, System.Drawing">
<value>0, 0</value>
</data>