mirror of
https://github.com/SubtitleEdit/subtitleedit.git
synced 2024-10-27 22:42:38 +01:00
Added backup host for downloading Open Office dictionaries as extensions.services.openoffice.org is unstable
git-svn-id: https://subtitleedit.googlecode.com/svn/trunk@590 99eadd0c-20b8-1223-b5c4-2a2b2df33de2
This commit is contained in:
parent
cdc8bd5f24
commit
ea42066e39
@ -14,6 +14,7 @@ namespace Nikse.SubtitleEdit.Forms
|
|||||||
{
|
{
|
||||||
List<string> _dictionaryDownloadLinks = new List<string>();
|
List<string> _dictionaryDownloadLinks = new List<string>();
|
||||||
List<string> _descriptions = new List<string>();
|
List<string> _descriptions = new List<string>();
|
||||||
|
string _xmlName = null;
|
||||||
|
|
||||||
public GetDictionaries()
|
public GetDictionaries()
|
||||||
{
|
{
|
||||||
@ -28,12 +29,20 @@ namespace Nikse.SubtitleEdit.Forms
|
|||||||
buttonOK.Text = Configuration.Settings.Language.General.OK;
|
buttonOK.Text = Configuration.Settings.Language.General.OK;
|
||||||
labelPleaseWait.Text = Configuration.Settings.Language.General.PleaseWait;
|
labelPleaseWait.Text = Configuration.Settings.Language.General.PleaseWait;
|
||||||
|
|
||||||
System.Reflection.Assembly asm = System.Reflection.Assembly.GetExecutingAssembly();
|
LoadDictionaryList("Nikse.SubtitleEdit.Resources.OpenOfficeDictionaries.xml.zip");
|
||||||
Stream strm = asm.GetManifestResourceStream("Nikse.SubtitleEdit.Resources.OpenOfficeDictionaries.xml.zip");
|
FixLargeFonts();
|
||||||
// Stream strm = asm.GetManifestResourceStream("Nikse.SubtitleEdit.Resources.HunspellDictionaries.xml.zip"); // backup plan...
|
}
|
||||||
|
|
||||||
|
private void LoadDictionaryList(string xmlRessourceName)
|
||||||
|
{
|
||||||
|
_dictionaryDownloadLinks = new List<string>();
|
||||||
|
_descriptions = new List<string>();
|
||||||
|
_xmlName = xmlRessourceName;
|
||||||
|
System.Reflection.Assembly asm = System.Reflection.Assembly.GetExecutingAssembly();
|
||||||
|
Stream strm = asm.GetManifestResourceStream(_xmlName);
|
||||||
if (strm != null)
|
if (strm != null)
|
||||||
{
|
{
|
||||||
|
comboBoxDictionaries.Items.Clear();
|
||||||
XmlDocument doc = new XmlDocument();
|
XmlDocument doc = new XmlDocument();
|
||||||
var rdr = new StreamReader(strm);
|
var rdr = new StreamReader(strm);
|
||||||
using (var zip = new GZipStream(rdr.BaseStream, CompressionMode.Decompress))
|
using (var zip = new GZipStream(rdr.BaseStream, CompressionMode.Decompress))
|
||||||
@ -67,7 +76,6 @@ namespace Nikse.SubtitleEdit.Forms
|
|||||||
comboBoxDictionaries.SelectedIndex = 0;
|
comboBoxDictionaries.SelectedIndex = 0;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
FixLargeFonts();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
private void FixLargeFonts()
|
private void FixLargeFonts()
|
||||||
@ -136,6 +144,24 @@ namespace Nikse.SubtitleEdit.Forms
|
|||||||
|
|
||||||
void wc_DownloadDataCompleted(object sender, DownloadDataCompletedEventArgs e)
|
void wc_DownloadDataCompleted(object sender, DownloadDataCompletedEventArgs e)
|
||||||
{
|
{
|
||||||
|
if (e.Error != null && _xmlName == "Nikse.SubtitleEdit.Resources.OpenOfficeDictionaries.xml.zip")
|
||||||
|
{
|
||||||
|
MessageBox.Show("Unable to connect to extensions.services.openoffice.org... Switching host - please re-try!");
|
||||||
|
LoadDictionaryList("Nikse.SubtitleEdit.Resources.HunspellDictionaries.xml.zip");
|
||||||
|
labelPleaseWait.Text = string.Empty;
|
||||||
|
buttonOK.Enabled = true;
|
||||||
|
buttonDownload.Enabled = true;
|
||||||
|
comboBoxDictionaries.Enabled = true;
|
||||||
|
Cursor = Cursors.Default;
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
else if (e.Error != null)
|
||||||
|
{
|
||||||
|
MessageBox.Show("Download failed!");
|
||||||
|
DialogResult = DialogResult.Cancel;
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
string dictionaryFolder = Utilities.DictionaryFolder;
|
string dictionaryFolder = Utilities.DictionaryFolder;
|
||||||
if (!Directory.Exists(dictionaryFolder))
|
if (!Directory.Exists(dictionaryFolder))
|
||||||
Directory.CreateDirectory(dictionaryFolder);
|
Directory.CreateDirectory(dictionaryFolder);
|
||||||
|
Loading…
Reference in New Issue
Block a user