Removed Encarta search as it is discontinued

git-svn-id: https://subtitleedit.googlecode.com/svn/trunk@671 99eadd0c-20b8-1223-b5c4-2a2b2df33de2
This commit is contained in:
niksedk 2011-09-27 05:28:00 +00:00
parent 9e4775de8f
commit 7a5fa4e4cb
5 changed files with 54 additions and 39 deletions

View File

@ -357,7 +357,7 @@
this.checkBoxPromptDeleteLines.AutoSize = true;
this.checkBoxPromptDeleteLines.Location = new System.Drawing.Point(436, 319);
this.checkBoxPromptDeleteLines.Name = "checkBoxPromptDeleteLines";
this.checkBoxPromptDeleteLines.Size = new System.Drawing.Size(142, 17);
this.checkBoxPromptDeleteLines.Size = new System.Drawing.Size(138, 17);
this.checkBoxPromptDeleteLines.TabIndex = 40;
this.checkBoxPromptDeleteLines.Text = "Prompt for deleting lines";
this.checkBoxPromptDeleteLines.UseVisualStyleBackColor = true;
@ -367,7 +367,7 @@
this.checkBoxAutoWrapWhileTyping.AutoSize = true;
this.checkBoxAutoWrapWhileTyping.Location = new System.Drawing.Point(193, 146);
this.checkBoxAutoWrapWhileTyping.Name = "checkBoxAutoWrapWhileTyping";
this.checkBoxAutoWrapWhileTyping.Size = new System.Drawing.Size(137, 17);
this.checkBoxAutoWrapWhileTyping.Size = new System.Drawing.Size(132, 17);
this.checkBoxAutoWrapWhileTyping.TabIndex = 4;
this.checkBoxAutoWrapWhileTyping.Text = "Auto-wrap while typing";
this.checkBoxAutoWrapWhileTyping.UseVisualStyleBackColor = true;
@ -395,7 +395,7 @@
this.checkBoxAllowEditOfOriginalSubtitle.AutoSize = true;
this.checkBoxAllowEditOfOriginalSubtitle.Location = new System.Drawing.Point(436, 296);
this.checkBoxAllowEditOfOriginalSubtitle.Name = "checkBoxAllowEditOfOriginalSubtitle";
this.checkBoxAllowEditOfOriginalSubtitle.Size = new System.Drawing.Size(160, 17);
this.checkBoxAllowEditOfOriginalSubtitle.Size = new System.Drawing.Size(155, 17);
this.checkBoxAllowEditOfOriginalSubtitle.TabIndex = 24;
this.checkBoxAllowEditOfOriginalSubtitle.Text = "Allow edit of original subtitle";
this.checkBoxAllowEditOfOriginalSubtitle.UseVisualStyleBackColor = true;
@ -563,7 +563,7 @@
this.checkBoxRememberWindowPosition.AutoSize = true;
this.checkBoxRememberWindowPosition.Location = new System.Drawing.Point(436, 101);
this.checkBoxRememberWindowPosition.Name = "checkBoxRememberWindowPosition";
this.checkBoxRememberWindowPosition.Size = new System.Drawing.Size(223, 17);
this.checkBoxRememberWindowPosition.Size = new System.Drawing.Size(222, 17);
this.checkBoxRememberWindowPosition.TabIndex = 15;
this.checkBoxRememberWindowPosition.Text = "Remember main window position and size";
this.checkBoxRememberWindowPosition.UseVisualStyleBackColor = true;
@ -610,7 +610,7 @@
this.checkBoxStartInSourceView.AutoSize = true;
this.checkBoxStartInSourceView.Location = new System.Drawing.Point(436, 124);
this.checkBoxStartInSourceView.Name = "checkBoxStartInSourceView";
this.checkBoxStartInSourceView.Size = new System.Drawing.Size(121, 17);
this.checkBoxStartInSourceView.Size = new System.Drawing.Size(119, 17);
this.checkBoxStartInSourceView.TabIndex = 16;
this.checkBoxStartInSourceView.Text = "Start in source view";
this.checkBoxStartInSourceView.UseVisualStyleBackColor = true;
@ -620,7 +620,7 @@
this.checkBoxReopenLastOpened.AutoSize = true;
this.checkBoxReopenLastOpened.Location = new System.Drawing.Point(444, 52);
this.checkBoxReopenLastOpened.Name = "checkBoxReopenLastOpened";
this.checkBoxReopenLastOpened.Size = new System.Drawing.Size(145, 17);
this.checkBoxReopenLastOpened.Size = new System.Drawing.Size(140, 17);
this.checkBoxReopenLastOpened.TabIndex = 13;
this.checkBoxReopenLastOpened.Text = "Start with last file loaded";
this.checkBoxReopenLastOpened.UseVisualStyleBackColor = true;
@ -630,7 +630,7 @@
this.checkBoxRememberRecentFiles.AutoSize = true;
this.checkBoxRememberRecentFiles.Location = new System.Drawing.Point(436, 28);
this.checkBoxRememberRecentFiles.Name = "checkBoxRememberRecentFiles";
this.checkBoxRememberRecentFiles.Size = new System.Drawing.Size(195, 17);
this.checkBoxRememberRecentFiles.Size = new System.Drawing.Size(188, 17);
this.checkBoxRememberRecentFiles.TabIndex = 12;
this.checkBoxRememberRecentFiles.Text = "Remember recent files (for reopen)";
this.checkBoxRememberRecentFiles.UseVisualStyleBackColor = true;
@ -641,7 +641,7 @@
this.checkBoxSubtitleFontBold.AutoSize = true;
this.checkBoxSubtitleFontBold.Location = new System.Drawing.Point(193, 269);
this.checkBoxSubtitleFontBold.Name = "checkBoxSubtitleFontBold";
this.checkBoxSubtitleFontBold.Size = new System.Drawing.Size(46, 17);
this.checkBoxSubtitleFontBold.Size = new System.Drawing.Size(47, 17);
this.checkBoxSubtitleFontBold.TabIndex = 8;
this.checkBoxSubtitleFontBold.Text = "Bold";
this.checkBoxSubtitleFontBold.UseVisualStyleBackColor = true;
@ -745,7 +745,7 @@
this.checkBoxShowFrameRate.AutoSize = true;
this.checkBoxShowFrameRate.Location = new System.Drawing.Point(16, 29);
this.checkBoxShowFrameRate.Name = "checkBoxShowFrameRate";
this.checkBoxShowFrameRate.Size = new System.Drawing.Size(154, 17);
this.checkBoxShowFrameRate.Size = new System.Drawing.Size(149, 17);
this.checkBoxShowFrameRate.TabIndex = 34;
this.checkBoxShowFrameRate.Text = "Show frame rate in toolbar";
this.checkBoxShowFrameRate.UseVisualStyleBackColor = true;
@ -811,7 +811,7 @@
this.checkBoxHelp.AutoSize = true;
this.checkBoxHelp.Location = new System.Drawing.Point(704, 80);
this.checkBoxHelp.Name = "checkBoxHelp";
this.checkBoxHelp.Size = new System.Drawing.Size(55, 17);
this.checkBoxHelp.Size = new System.Drawing.Size(56, 17);
this.checkBoxHelp.TabIndex = 31;
this.checkBoxHelp.Text = "Visible";
this.checkBoxHelp.UseVisualStyleBackColor = true;
@ -838,7 +838,7 @@
this.checkBoxSettings.AutoSize = true;
this.checkBoxSettings.Location = new System.Drawing.Point(628, 80);
this.checkBoxSettings.Name = "checkBoxSettings";
this.checkBoxSettings.Size = new System.Drawing.Size(55, 17);
this.checkBoxSettings.Size = new System.Drawing.Size(56, 17);
this.checkBoxSettings.TabIndex = 28;
this.checkBoxSettings.Text = "Visible";
this.checkBoxSettings.UseVisualStyleBackColor = true;
@ -865,7 +865,7 @@
this.checkBoxSpellCheck.AutoSize = true;
this.checkBoxSpellCheck.Location = new System.Drawing.Point(550, 80);
this.checkBoxSpellCheck.Name = "checkBoxSpellCheck";
this.checkBoxSpellCheck.Size = new System.Drawing.Size(55, 17);
this.checkBoxSpellCheck.Size = new System.Drawing.Size(56, 17);
this.checkBoxSpellCheck.TabIndex = 26;
this.checkBoxSpellCheck.Text = "Visible";
this.checkBoxSpellCheck.UseVisualStyleBackColor = true;
@ -892,7 +892,7 @@
this.checkBoxVisualSync.AutoSize = true;
this.checkBoxVisualSync.Location = new System.Drawing.Point(476, 80);
this.checkBoxVisualSync.Name = "checkBoxVisualSync";
this.checkBoxVisualSync.Size = new System.Drawing.Size(55, 17);
this.checkBoxVisualSync.Size = new System.Drawing.Size(56, 17);
this.checkBoxVisualSync.TabIndex = 19;
this.checkBoxVisualSync.Text = "Visible";
this.checkBoxVisualSync.UseVisualStyleBackColor = true;
@ -919,7 +919,7 @@
this.checkBoxReplace.AutoSize = true;
this.checkBoxReplace.Location = new System.Drawing.Point(400, 80);
this.checkBoxReplace.Name = "checkBoxReplace";
this.checkBoxReplace.Size = new System.Drawing.Size(55, 17);
this.checkBoxReplace.Size = new System.Drawing.Size(56, 17);
this.checkBoxReplace.TabIndex = 16;
this.checkBoxReplace.Text = "Visible";
this.checkBoxReplace.UseVisualStyleBackColor = true;
@ -946,7 +946,7 @@
this.checkBoxToolbarFind.AutoSize = true;
this.checkBoxToolbarFind.Location = new System.Drawing.Point(324, 80);
this.checkBoxToolbarFind.Name = "checkBoxToolbarFind";
this.checkBoxToolbarFind.Size = new System.Drawing.Size(55, 17);
this.checkBoxToolbarFind.Size = new System.Drawing.Size(56, 17);
this.checkBoxToolbarFind.TabIndex = 13;
this.checkBoxToolbarFind.Text = "Visible";
this.checkBoxToolbarFind.UseVisualStyleBackColor = true;
@ -973,7 +973,7 @@
this.checkBoxToolbarSaveAs.AutoSize = true;
this.checkBoxToolbarSaveAs.Location = new System.Drawing.Point(248, 80);
this.checkBoxToolbarSaveAs.Name = "checkBoxToolbarSaveAs";
this.checkBoxToolbarSaveAs.Size = new System.Drawing.Size(55, 17);
this.checkBoxToolbarSaveAs.Size = new System.Drawing.Size(56, 17);
this.checkBoxToolbarSaveAs.TabIndex = 10;
this.checkBoxToolbarSaveAs.Text = "Visible";
this.checkBoxToolbarSaveAs.UseVisualStyleBackColor = true;
@ -1000,7 +1000,7 @@
this.checkBoxToolbarSave.AutoSize = true;
this.checkBoxToolbarSave.Location = new System.Drawing.Point(172, 80);
this.checkBoxToolbarSave.Name = "checkBoxToolbarSave";
this.checkBoxToolbarSave.Size = new System.Drawing.Size(55, 17);
this.checkBoxToolbarSave.Size = new System.Drawing.Size(56, 17);
this.checkBoxToolbarSave.TabIndex = 7;
this.checkBoxToolbarSave.Text = "Visible";
this.checkBoxToolbarSave.UseVisualStyleBackColor = true;
@ -1027,7 +1027,7 @@
this.checkBoxToolbarOpen.AutoSize = true;
this.checkBoxToolbarOpen.Location = new System.Drawing.Point(96, 80);
this.checkBoxToolbarOpen.Name = "checkBoxToolbarOpen";
this.checkBoxToolbarOpen.Size = new System.Drawing.Size(55, 17);
this.checkBoxToolbarOpen.Size = new System.Drawing.Size(56, 17);
this.checkBoxToolbarOpen.TabIndex = 4;
this.checkBoxToolbarOpen.Text = "Visible";
this.checkBoxToolbarOpen.UseVisualStyleBackColor = true;
@ -1054,7 +1054,7 @@
this.checkBoxToolbarNew.AutoSize = true;
this.checkBoxToolbarNew.Location = new System.Drawing.Point(20, 80);
this.checkBoxToolbarNew.Name = "checkBoxToolbarNew";
this.checkBoxToolbarNew.Size = new System.Drawing.Size(55, 17);
this.checkBoxToolbarNew.Size = new System.Drawing.Size(56, 17);
this.checkBoxToolbarNew.TabIndex = 1;
this.checkBoxToolbarNew.Text = "Visible";
this.checkBoxToolbarNew.UseVisualStyleBackColor = true;
@ -1104,9 +1104,8 @@
//
this.comboBoxCustomSearch.FormattingEnabled = true;
this.comboBoxCustomSearch.Items.AddRange(new object[] {
"MS Encarta Thesaurus",
"Dictionary.com",
"The Free Dictionary",
"Dictionary.com",
"VISUWORDS"});
this.comboBoxCustomSearch.Location = new System.Drawing.Point(12, 38);
this.comboBoxCustomSearch.Name = "comboBoxCustomSearch";
@ -1165,7 +1164,7 @@
this.checkBoxVideoPlayerShowStopButton.AutoSize = true;
this.checkBoxVideoPlayerShowStopButton.Location = new System.Drawing.Point(9, 19);
this.checkBoxVideoPlayerShowStopButton.Name = "checkBoxVideoPlayerShowStopButton";
this.checkBoxVideoPlayerShowStopButton.Size = new System.Drawing.Size(111, 17);
this.checkBoxVideoPlayerShowStopButton.Size = new System.Drawing.Size(109, 17);
this.checkBoxVideoPlayerShowStopButton.TabIndex = 10;
this.checkBoxVideoPlayerShowStopButton.Text = "Show stop button";
this.checkBoxVideoPlayerShowStopButton.UseVisualStyleBackColor = true;
@ -1232,7 +1231,7 @@
this.radioButtonVideoPlayerVLC.AutoSize = true;
this.radioButtonVideoPlayerVLC.Location = new System.Drawing.Point(10, 46);
this.radioButtonVideoPlayerVLC.Name = "radioButtonVideoPlayerVLC";
this.radioButtonVideoPlayerVLC.Size = new System.Drawing.Size(43, 17);
this.radioButtonVideoPlayerVLC.Size = new System.Drawing.Size(45, 17);
this.radioButtonVideoPlayerVLC.TabIndex = 4;
this.radioButtonVideoPlayerVLC.TabStop = true;
this.radioButtonVideoPlayerVLC.Text = "VLC";
@ -1288,7 +1287,7 @@
this.radioButtonVideoPlayerDirectShow.AutoSize = true;
this.radioButtonVideoPlayerDirectShow.Location = new System.Drawing.Point(10, 23);
this.radioButtonVideoPlayerDirectShow.Name = "radioButtonVideoPlayerDirectShow";
this.radioButtonVideoPlayerDirectShow.Size = new System.Drawing.Size(82, 17);
this.radioButtonVideoPlayerDirectShow.Size = new System.Drawing.Size(83, 17);
this.radioButtonVideoPlayerDirectShow.TabIndex = 1;
this.radioButtonVideoPlayerDirectShow.TabStop = true;
this.radioButtonVideoPlayerDirectShow.Text = "DirectShow ";
@ -1299,7 +1298,7 @@
this.radioButtonVideoPlayerManagedDirectX.AutoSize = true;
this.radioButtonVideoPlayerManagedDirectX.Location = new System.Drawing.Point(10, 90);
this.radioButtonVideoPlayerManagedDirectX.Name = "radioButtonVideoPlayerManagedDirectX";
this.radioButtonVideoPlayerManagedDirectX.Size = new System.Drawing.Size(106, 17);
this.radioButtonVideoPlayerManagedDirectX.Size = new System.Drawing.Size(108, 17);
this.radioButtonVideoPlayerManagedDirectX.TabIndex = 6;
this.radioButtonVideoPlayerManagedDirectX.TabStop = true;
this.radioButtonVideoPlayerManagedDirectX.Text = "Managed DirectX";
@ -1356,7 +1355,7 @@
this.checkBoxGenerateSpectrogram.AutoSize = true;
this.checkBoxGenerateSpectrogram.Location = new System.Drawing.Point(10, 20);
this.checkBoxGenerateSpectrogram.Name = "checkBoxGenerateSpectrogram";
this.checkBoxGenerateSpectrogram.Size = new System.Drawing.Size(134, 17);
this.checkBoxGenerateSpectrogram.Size = new System.Drawing.Size(131, 17);
this.checkBoxGenerateSpectrogram.TabIndex = 11;
this.checkBoxGenerateSpectrogram.Text = "Generate spectrogram";
this.checkBoxGenerateSpectrogram.UseVisualStyleBackColor = true;
@ -1543,7 +1542,7 @@
this.checkBoxSpellCheckAutoChangeNames.AutoSize = true;
this.checkBoxSpellCheckAutoChangeNames.Location = new System.Drawing.Point(15, 20);
this.checkBoxSpellCheckAutoChangeNames.Name = "checkBoxSpellCheckAutoChangeNames";
this.checkBoxSpellCheckAutoChangeNames.Size = new System.Drawing.Size(216, 17);
this.checkBoxSpellCheckAutoChangeNames.Size = new System.Drawing.Size(209, 17);
this.checkBoxSpellCheckAutoChangeNames.TabIndex = 0;
this.checkBoxSpellCheckAutoChangeNames.Text = "Auto fix names where only casing differ";
this.checkBoxSpellCheckAutoChangeNames.UseVisualStyleBackColor = true;
@ -1567,7 +1566,7 @@
this.checkBoxFixCommonOcrErrorsUsingHardcodedRules.AutoSize = true;
this.checkBoxFixCommonOcrErrorsUsingHardcodedRules.Location = new System.Drawing.Point(15, 115);
this.checkBoxFixCommonOcrErrorsUsingHardcodedRules.Name = "checkBoxFixCommonOcrErrorsUsingHardcodedRules";
this.checkBoxFixCommonOcrErrorsUsingHardcodedRules.Size = new System.Drawing.Size(268, 17);
this.checkBoxFixCommonOcrErrorsUsingHardcodedRules.Size = new System.Drawing.Size(264, 17);
this.checkBoxFixCommonOcrErrorsUsingHardcodedRules.TabIndex = 2;
this.checkBoxFixCommonOcrErrorsUsingHardcodedRules.Text = "Fix common OCR errors - also use hardcoded rules";
this.checkBoxFixCommonOcrErrorsUsingHardcodedRules.UseVisualStyleBackColor = true;
@ -1850,7 +1849,7 @@
this.checkBoxNamesEtcOnline.AutoSize = true;
this.checkBoxNamesEtcOnline.Location = new System.Drawing.Point(7, 22);
this.checkBoxNamesEtcOnline.Name = "checkBoxNamesEtcOnline";
this.checkBoxNamesEtcOnline.Size = new System.Drawing.Size(163, 17);
this.checkBoxNamesEtcOnline.Size = new System.Drawing.Size(162, 17);
this.checkBoxNamesEtcOnline.TabIndex = 26;
this.checkBoxNamesEtcOnline.Text = "Use online names etc xml file";
this.checkBoxNamesEtcOnline.UseVisualStyleBackColor = true;
@ -2234,7 +2233,7 @@
this.checkBoxShortcutsShift.Enabled = false;
this.checkBoxShortcutsShift.Location = new System.Drawing.Point(243, 367);
this.checkBoxShortcutsShift.Name = "checkBoxShortcutsShift";
this.checkBoxShortcutsShift.Size = new System.Drawing.Size(48, 17);
this.checkBoxShortcutsShift.Size = new System.Drawing.Size(47, 17);
this.checkBoxShortcutsShift.TabIndex = 3;
this.checkBoxShortcutsShift.Text = "Shift";
this.checkBoxShortcutsShift.UseVisualStyleBackColor = true;
@ -2245,7 +2244,7 @@
this.checkBoxShortcutsAlt.Enabled = false;
this.checkBoxShortcutsAlt.Location = new System.Drawing.Point(174, 367);
this.checkBoxShortcutsAlt.Name = "checkBoxShortcutsAlt";
this.checkBoxShortcutsAlt.Size = new System.Drawing.Size(39, 17);
this.checkBoxShortcutsAlt.Size = new System.Drawing.Size(38, 17);
this.checkBoxShortcutsAlt.TabIndex = 2;
this.checkBoxShortcutsAlt.Text = "Alt";
this.checkBoxShortcutsAlt.UseVisualStyleBackColor = true;
@ -2256,7 +2255,7 @@
this.checkBoxShortcutsControl.Enabled = false;
this.checkBoxShortcutsControl.Location = new System.Drawing.Point(87, 367);
this.checkBoxShortcutsControl.Name = "checkBoxShortcutsControl";
this.checkBoxShortcutsControl.Size = new System.Drawing.Size(61, 17);
this.checkBoxShortcutsControl.Size = new System.Drawing.Size(59, 17);
this.checkBoxShortcutsControl.TabIndex = 1;
this.checkBoxShortcutsControl.Text = "Control";
this.checkBoxShortcutsControl.UseVisualStyleBackColor = true;

View File

@ -1532,12 +1532,10 @@ namespace Nikse.SubtitleEdit.Forms
if (comboBoxCustomSearch.SelectedIndex >= 0)
{
if (comboBoxCustomSearch.SelectedIndex == 0)
textBoxCustomSearchUrl.Text = "http://encarta.msn.com/encnet/features/dictionary/DictionaryResults.aspx?lextype=2&search={0}";
textBoxCustomSearchUrl.Text = "http://www.thefreedictionary.com/{0}";
else if (comboBoxCustomSearch.SelectedIndex == 1)
textBoxCustomSearchUrl.Text = "http://dictionary.reference.com/browse/{0}";
else if (comboBoxCustomSearch.SelectedIndex == 2)
textBoxCustomSearchUrl.Text = "http://www.thefreedictionary.com/{0}";
else if (comboBoxCustomSearch.SelectedIndex == 3)
textBoxCustomSearchUrl.Text = "http://www.visuwords.com/?word={0}";
}
}

View File

@ -348,8 +348,8 @@ namespace Nikse.SubtitleEdit.Logic
public VideoControlsSettings()
{
CustomSearchText = "MS Encarta Thesaurus";
CustomSearchUrl = "http://encarta.msn.com/encnet/features/dictionary/DictionaryResults.aspx?lextype=2&search={0}";
CustomSearchText = "The Free Dictionary";
CustomSearchUrl = "http://www.thefreedictionary.com/{0}";
LastActiveTab = "Translate";
WaveFormDrawGrid = true;
WaveFormGridColor = Color.FromArgb(255, 20, 20, 18);

View File

@ -119,8 +119,24 @@ namespace Nikse.SubtitleEdit.Logic.SubtitleFormats
private double GetMillisecondsFromTimeCode(string time)
{
string[] arr = time.Split(":;".ToCharArray(), StringSplitOptions.RemoveEmptyEntries);
return new TimeSpan(0, int.Parse(arr[0]), int.Parse(arr[1]), int.Parse(arr[2]), int.Parse(arr[3])).TotalMilliseconds;
string[] parts = time.Split(":;".ToCharArray(), StringSplitOptions.RemoveEmptyEntries);
string hour = parts[0];
string minutes = parts[1];
string seconds = parts[2];
string frames = parts[3];
int milliseconds = (int)((1000.0 / Configuration.Settings.General.CurrentFrameRate) * int.Parse(frames));
if (milliseconds > 999)
milliseconds = 999;
return new TimeCode(int.Parse(hour), int.Parse(minutes), int.Parse(seconds), milliseconds).TotalMilliseconds;
}
private static string ConvertToTimeString(TimeCode time)
{
int frames = (int)(time.Milliseconds / (1000.0 / Configuration.Settings.General.CurrentFrameRate));
return string.Format("{0:00}:{1:00}:{2:00}:{3:00}", time.Hours, time.Minutes, time.Seconds, frames);
}
}

View File

@ -980,9 +980,11 @@
</Content>
<Content Include="Languages\sr-Cyrl-RS.xml">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
<SubType>Designer</SubType>
</Content>
<Content Include="Languages\sr-Latn-RS.xml">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
<SubType>Designer</SubType>
</Content>
<Content Include="Languages\sv-SE.xml">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>