Skip to content

Commit 08d2d13

Browse files
committed
Bugfix & Enhancement
Bugfix in GUI. (Load file panel didn't disappear.) Replacement of BB-Code image tags with HTML for better output result.
1 parent a9511ee commit 08d2d13

File tree

4 files changed

+48
-45
lines changed

4 files changed

+48
-45
lines changed

wordpress2doc/Form1.Designer.cs

Lines changed: 26 additions & 26 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

wordpress2doc/Form1.cs

Lines changed: 20 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -238,17 +238,14 @@ private void RenderLoadFilePlease()
238238

239239
private void HideLoadFilePlease()
240240
{
241-
if (metroTabPageChoose.Controls.Cast<Control>().Where(x => x.Name == "blockpanel").Count() > 0)
242-
{
243-
var con = metroTabPageChoose.Controls.Cast<Control>().Where(x => x.Name == "blockpanel").First();
244-
var con2 = metroTabPageExport.Controls.Cast<Control>().Where(x => x.Name == "blockpanel").First();
245-
metroTabPageChoose.Controls.RemoveByKey("blockpanel");
246-
metroTabPageExport.Controls.RemoveByKey("blockpanel");
247-
con.Dispose();
248-
con = null;
249-
con2.Dispose();
250-
con2 = null;
251-
}
241+
var tabPages = new Control[] { metroTabPageExport, metroTabPageChoose };
242+
foreach (var tabPage in tabPages)
243+
{
244+
while (tabPage.Controls.Cast<Control>().Where(x => x.Name == "blockpanel").Count() > 0)
245+
{
246+
tabPage.Controls.RemoveByKey("blockpanel");
247+
}
248+
}
252249
}
253250

254251
private void Form1_Load(object sender, EventArgs e)
@@ -602,6 +599,18 @@ void bgw_DoWork(object sender, DoWorkEventArgs e)
602599
{
603600
var contentBody = item.Descendants(nsContent + "encoded").First().Value.Replace("\n", "<br />");
604601

602+
//Clean BB-Code images
603+
Regex re = new Regex(@"\[imag.*?src=""(.*?)"".*?\]\[\/image\]", RegexOptions.Multiline | RegexOptions.Singleline);
604+
MatchCollection mc = re.Matches(contentBody);
605+
foreach (Match m in mc)
606+
{
607+
try
608+
{
609+
contentBody = contentBody.Replace(m.Value, "<img src=\"" + m.Groups[1].Value + "\">");
610+
}
611+
catch { }
612+
}
613+
605614
if (!(bool)((object[])e.Argument)[4]) // != AllInOne
606615
{
607616
var fNameBase = string.Concat((string)((object[])e.Argument)[1], "\\", CleanFileName(item.Descendants("title").First().Value));

wordpress2doc/Form1.resx

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -123,12 +123,6 @@
123123
<metadata name="ColumnTitle.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
124124
<value>True</value>
125125
</metadata>
126-
<metadata name="ColumnExport.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
127-
<value>True</value>
128-
</metadata>
129-
<metadata name="ColumnTitle.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
130-
<value>True</value>
131-
</metadata>
132126
<data name="richTextBoxSettingsCredits.Text" xml:space="preserve">
133127
<value>Wordpress2Doc is project by Raffael Herrmann and was first released
134128
in 08/2013. For more information visit: www.code-bude.net

wordpress2doc/Properties/AssemblyInfo.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,5 +32,5 @@
3232
// Sie können alle Werte angeben oder die standardmäßigen Build- und Revisionsnummern
3333
// übernehmen, indem Sie "*" eingeben:
3434
// [assembly: AssemblyVersion("1.0.*")]
35-
[assembly: AssemblyVersion("1.2.6.0")]
36-
[assembly: AssemblyFileVersion("1.2.6.0")]
35+
[assembly: AssemblyVersion("1.2.7.0")]
36+
[assembly: AssemblyFileVersion("1.2.7.0")]

0 commit comments

Comments
 (0)