Skip to content

Commit 0624a96

Browse files
hahn-kevtombogle
andauthored
Add back ImageToolbox (#1421)
* revert changes in e3f8d8d * add back images removed in c4699ac as they're used again now * remove use of dialog adapters since we no longer support WinForms on linux * remove mono specific WinForms test * disable strict init mode in language manager for test, and fix apartment thread mode * stop watching the file dialog in a finally block to avoid thread leaks --------- Co-authored-by: Tom Bogle <tom_bogle@sil.org>
1 parent 10e9ac3 commit 0624a96

27 files changed

+4805
-0
lines changed

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
7171
- [SIL.Core] Improved efficiency in XmlUtils methods: MakeSafeXml and ConvertMultiParagraphToSafeXml (name corrected), and MakeSafeXmlAttribute.
7272
- [SIL.Core] BREAKING CHANGE (potentially): Made ParseDateTimePermissivelyWithException into an extension method (on string).
7373
- [SIL.Core] BREAKING CHANGE (potentially): Changed behavior of DateTimeExtensions.ParseDateTimePermissivelyWithException (now deprecated) to try to interpret the date according to either the Gregorian calendar or the Buddhist calender in order to get the date to fall within a reasonable expected range (from 1/1/1900 through one day in the future). This means that depending on the current culture, dates might be interpreted differently from before. The known places in SIL code where this method is used seems to be for dates in the recent past (modern times); hence the default range. A new overload was added that will allow callers with other needs to specify a different range.
74+
- [SIL.Windows.Forms] BREAKING CHANGE: ImageToolbox Removed support for Linux due to no longer using DialogAdapters. Affects `OpenFileDialogWithViews`
7475

7576
### Fixed
7677

Lines changed: 178 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,178 @@
1+
using System;
2+
using System.Diagnostics;
3+
using System.Drawing.Imaging;
4+
using System.IO;
5+
using System.Reflection;
6+
using System.Threading;
7+
using System.Windows.Forms;
8+
using L10NSharp;
9+
using NUnit.Framework;
10+
using SIL.Windows.Forms.ClearShare;
11+
using SIL.Windows.Forms.ImageToolbox;
12+
using SIL.Windows.Forms.ImageToolbox.ImageGallery;
13+
14+
namespace SIL.Windows.Forms.Tests.ImageToolbox
15+
{
16+
[Apartment(ApartmentState.STA)]
17+
public class ImageToolboxTests
18+
{
19+
private bool previousInitializationMode;
20+
[OneTimeSetUp]
21+
public void Setup()
22+
{
23+
previousInitializationMode = LocalizationManager.StrictInitializationMode;
24+
LocalizationManager.StrictInitializationMode = false;
25+
}
26+
27+
[OneTimeTearDown]
28+
public void TearDown()
29+
{
30+
LocalizationManager.StrictInitializationMode = previousInitializationMode;
31+
}
32+
33+
[Test]
34+
[Explicit("By hand only")]
35+
public void ShowToolbox()
36+
{
37+
Application.EnableVisualStyles();
38+
using (var dlg = new ImageToolboxDialog(new PalasoImage(),null))// "arrow"))
39+
{
40+
if (DialogResult.OK == dlg.ShowDialog())
41+
{
42+
// File name ending in .tmp will confuse TagLib#...doesn't know what kind of metadata to write.
43+
var ext = ".png";
44+
if (Path.GetExtension(dlg.ImageInfo.OriginalFilePath) == ".jpg")
45+
ext = ".jpg";
46+
string path = Path.ChangeExtension(Path.GetTempFileName(), ext);
47+
dlg.ImageInfo.Save(path);
48+
Process.Start("explorer.exe", "/select, \"" + path + "\"");
49+
}
50+
}
51+
}
52+
53+
[Test]
54+
[Explicit("By hand only")]
55+
public void ShowGeckoToolbox()
56+
{
57+
Application.EnableVisualStyles();
58+
ThumbnailViewer.UseWebViewer = true;
59+
using (var dlg = new ImageToolboxDialog(new PalasoImage(), null))// "arrow"))
60+
{
61+
if (DialogResult.OK == dlg.ShowDialog())
62+
{
63+
// File name ending in .tmp will confuse TagLib#...doesn't know what kind of metadata to write.
64+
string path = Path.ChangeExtension(Path.GetTempFileName(), ".png");
65+
dlg.ImageInfo.Save(path);
66+
Process.Start("explorer.exe", "/select, \"" + path + "\"");
67+
}
68+
69+
}
70+
}
71+
72+
[Test]
73+
[Explicit("By hand only")]
74+
public void ShowToolboxWith_PreExisting_Image_WithMetadata()
75+
{
76+
Application.EnableVisualStyles();
77+
PalasoImage i = PalasoImage.FromImage(LicenseLogos.by_nd);
78+
i.Metadata.License = new CreativeCommonsLicense(true,true, CreativeCommonsLicense.DerivativeRules.DerivativesWithShareAndShareAlike);
79+
i.Metadata.CopyrightNotice = "Copyright 1992 Papua New Guinea Department of Education and Other Good Things";
80+
i.Metadata.CollectionName = "International Illustrations: The Art Of Reading";
81+
i.Metadata.Creator = "Various Talented Illustrators";
82+
//using (var f = TempFile.WithExtension(".png"))
83+
{
84+
//i.Save(f.Path);
85+
using (var dlg = new ImageToolboxDialog(i, "arrow"))
86+
{
87+
dlg.ShowDialog();
88+
}
89+
}
90+
}
91+
92+
[Test]
93+
[Explicit("By hand only")]
94+
public void ShowToolboxWith_PreExisting_EnsureRawFormatUnchanged()
95+
{
96+
Application.EnableVisualStyles();
97+
PalasoImage i = PalasoImage.FromImage(TestImages.logo);
98+
99+
using (var dlg = new ImageToolboxDialog(i, ""))
100+
{
101+
dlg.ShowDialog();
102+
Assert.AreEqual(ImageFormat.Jpeg.Guid, dlg.ImageInfo.Image.RawFormat.Guid);
103+
}
104+
}
105+
106+
[Test]
107+
public void DoubleCheckFileFilterWorks()
108+
{
109+
Assert.IsTrue(AcquireImageControl.DoubleCheckFileFilter(null, "foo.txt"));
110+
Assert.IsTrue(AcquireImageControl.DoubleCheckFileFilter(null, "foo.doc"));
111+
Assert.IsTrue(AcquireImageControl.DoubleCheckFileFilter(null, "foo"));
112+
Assert.IsTrue(AcquireImageControl.DoubleCheckFileFilter(null, "foo."));
113+
Assert.IsTrue(AcquireImageControl.DoubleCheckFileFilter(null, "foo.bar"));
114+
Assert.IsTrue(AcquireImageControl.DoubleCheckFileFilter(null, "foo.bar.baz"));
115+
Assert.IsTrue(AcquireImageControl.DoubleCheckFileFilter("", "foo.txt"));
116+
Assert.IsTrue(AcquireImageControl.DoubleCheckFileFilter("", "foo.doc"));
117+
Assert.IsTrue(AcquireImageControl.DoubleCheckFileFilter("", "foo"));
118+
Assert.IsTrue(AcquireImageControl.DoubleCheckFileFilter("", "foo."));
119+
Assert.IsTrue(AcquireImageControl.DoubleCheckFileFilter("", "foo.bar"));
120+
Assert.IsTrue(AcquireImageControl.DoubleCheckFileFilter("", "foo.bar.baz"));
121+
122+
var filterAll = "All files|*.*";
123+
Assert.IsTrue(AcquireImageControl.DoubleCheckFileFilter(filterAll, "foo.txt"));
124+
Assert.IsTrue(AcquireImageControl.DoubleCheckFileFilter(filterAll, "foo.doc"));
125+
Assert.IsTrue(AcquireImageControl.DoubleCheckFileFilter(filterAll, "foo"));
126+
Assert.IsTrue(AcquireImageControl.DoubleCheckFileFilter(filterAll, "foo."));
127+
Assert.IsTrue(AcquireImageControl.DoubleCheckFileFilter(filterAll, "foo.bar"));
128+
Assert.IsTrue(AcquireImageControl.DoubleCheckFileFilter(filterAll, "foo.bar.baz"));
129+
130+
var filterTxtOnly = "Text files|*.txt";
131+
Assert.IsTrue(AcquireImageControl.DoubleCheckFileFilter(filterTxtOnly, "foo.txt"));
132+
Assert.IsFalse(AcquireImageControl.DoubleCheckFileFilter(filterTxtOnly, "foo.doc"));
133+
Assert.IsFalse(AcquireImageControl.DoubleCheckFileFilter(filterTxtOnly, "foo"));
134+
Assert.IsFalse(AcquireImageControl.DoubleCheckFileFilter(filterTxtOnly, "foo."));
135+
Assert.IsFalse(AcquireImageControl.DoubleCheckFileFilter(filterTxtOnly, "foo.bar"));
136+
Assert.IsFalse(AcquireImageControl.DoubleCheckFileFilter(filterTxtOnly, "foo.txt.baz"));
137+
138+
var filterTxtAndDoc = "Text files|*.txt|Word files|*.doc";
139+
Assert.IsTrue(AcquireImageControl.DoubleCheckFileFilter(filterTxtAndDoc, "foo.txt"));
140+
Assert.IsTrue(AcquireImageControl.DoubleCheckFileFilter(filterTxtAndDoc, "foo.doc"));
141+
Assert.IsFalse(AcquireImageControl.DoubleCheckFileFilter(filterTxtAndDoc, "foo"));
142+
Assert.IsFalse(AcquireImageControl.DoubleCheckFileFilter(filterTxtAndDoc, "foo."));
143+
Assert.IsFalse(AcquireImageControl.DoubleCheckFileFilter(filterTxtAndDoc, "foo.bar"));
144+
Assert.IsFalse(AcquireImageControl.DoubleCheckFileFilter(filterTxtAndDoc, "foo.txt.baz"));
145+
146+
var filterTxtAndDocWithAll = "Text files|*.txt|Word files|*.doc|All files|*.*";
147+
Assert.IsTrue(AcquireImageControl.DoubleCheckFileFilter(filterTxtAndDocWithAll, "foo.txt"));
148+
Assert.IsTrue(AcquireImageControl.DoubleCheckFileFilter(filterTxtAndDocWithAll, "foo.doc"));
149+
Assert.IsTrue(AcquireImageControl.DoubleCheckFileFilter(filterTxtAndDocWithAll, "foo"));
150+
Assert.IsTrue(AcquireImageControl.DoubleCheckFileFilter(filterTxtAndDocWithAll, "foo."));
151+
Assert.IsTrue(AcquireImageControl.DoubleCheckFileFilter(filterTxtAndDocWithAll, "foo.bar"));
152+
Assert.IsTrue(AcquireImageControl.DoubleCheckFileFilter(filterTxtAndDocWithAll, "foo.txt.baz"));
153+
154+
var filterCodeSourceFiles = "Image files|*.png;*.jpg;*.jpeg;*.tiff";
155+
Assert.IsTrue(AcquireImageControl.DoubleCheckFileFilter(filterCodeSourceFiles, "foo.png"));
156+
Assert.IsTrue(AcquireImageControl.DoubleCheckFileFilter(filterCodeSourceFiles, "foo.jpg"));
157+
Assert.IsTrue(AcquireImageControl.DoubleCheckFileFilter(filterCodeSourceFiles, "foo.jpeg"));
158+
Assert.IsTrue(AcquireImageControl.DoubleCheckFileFilter(filterCodeSourceFiles, "foo.tiff"));
159+
Assert.IsFalse(AcquireImageControl.DoubleCheckFileFilter(filterCodeSourceFiles, "foo"));
160+
Assert.IsFalse(AcquireImageControl.DoubleCheckFileFilter(filterCodeSourceFiles, "foo."));
161+
Assert.IsFalse(AcquireImageControl.DoubleCheckFileFilter(filterCodeSourceFiles, "foo.bar"));
162+
Assert.IsFalse(AcquireImageControl.DoubleCheckFileFilter(filterCodeSourceFiles, "foo.png.baz"));
163+
164+
var filterCsCppSourceFiles = "Bitmap files|*.bmp;*.png;*.tiff|JPEG files|*.jpg;*.jpeg";
165+
Assert.IsTrue(AcquireImageControl.DoubleCheckFileFilter(filterCsCppSourceFiles, "foo.bmp"));
166+
Assert.IsTrue(AcquireImageControl.DoubleCheckFileFilter(filterCsCppSourceFiles, "foo.png"));
167+
Assert.IsTrue(AcquireImageControl.DoubleCheckFileFilter(filterCsCppSourceFiles, "foo.tiff"));
168+
Assert.IsTrue(AcquireImageControl.DoubleCheckFileFilter(filterCsCppSourceFiles, "foo.jpg"));
169+
Assert.IsTrue(AcquireImageControl.DoubleCheckFileFilter(filterCsCppSourceFiles, "foo.jpeg"));
170+
Assert.IsFalse(AcquireImageControl.DoubleCheckFileFilter(filterCsCppSourceFiles, "foo.h"));
171+
Assert.IsFalse(AcquireImageControl.DoubleCheckFileFilter(filterCsCppSourceFiles, "foo.cs"));
172+
Assert.IsFalse(AcquireImageControl.DoubleCheckFileFilter(filterCsCppSourceFiles, "foo"));
173+
Assert.IsFalse(AcquireImageControl.DoubleCheckFileFilter(filterCsCppSourceFiles, "foo."));
174+
Assert.IsFalse(AcquireImageControl.DoubleCheckFileFilter(filterCsCppSourceFiles, "foo.bar"));
175+
Assert.IsFalse(AcquireImageControl.DoubleCheckFileFilter(filterCsCppSourceFiles, "foo.png.baz"));
176+
}
177+
}
178+
}

0 commit comments

Comments
 (0)