112 Commits

Author SHA1 Message Date
Abdel
66a77f3b98 Merge pull request #42 from JDM170/fix_work_number
Fixed adding a work number via extended panel
2025-05-28 15:12:09 -04:00
5f33b3adaf fixed adding a work number via extended panel 2024-07-30 15:22:20 +07:00
abdelkader
90dce429bd bug fixed 2024-04-04 12:45:14 -04:00
abdelkader
b17fce8dde 2nd draft for loading folder 2024-04-04 12:42:08 -04:00
abdelkader
afe52e2b18 draft for opening multiple vcard files 2024-04-02 22:45:32 -04:00
abdelkader
c89d9a197c fixed bug 2024-04-02 13:14:58 -04:00
abdelkader
6b57814c5b added a test for SaveSplittedFile 2024-04-02 12:45:31 -04:00
abdelkader
2023043889 draft for saving split files 2024-04-02 12:31:33 -04:00
abdelkader
4401f13fb4 allow to create a empty vcard file 2024-03-30 19:12:35 -04:00
Abdel
c9b9dfb623 Update Releases.txt 2024-03-28 18:53:42 -04:00
Abdel
d79ea44306 Update README.md 2024-03-28 18:46:21 -04:00
abdelkader
724113e304 added image batch export 2024-03-28 18:39:06 -04:00
abdelkader
32bf064f93 added the clear image batch operation 2024-03-28 13:14:43 -04:00
abdelkader
250279cf7c fix when opening new file
feature: image count
2024-03-28 12:10:40 -04:00
abdelkader
62744daa8a fix image type retrieval 2024-03-27 17:22:17 -04:00
abdelkader
4dad2c4151 fix the filter 2024-03-21 08:57:48 -04:00
abdelkader
e89b85411f Fixed the image handlers 2024-03-21 08:47:22 -04:00
abdelkader
81ce797614 keep focus on text box filter 2024-03-21 08:41:38 -04:00
abdelkader
2eb633cfd7 remove unused warning
fix bug
2024-03-21 08:39:29 -04:00
abdelkader
7a575bf526 forget a declaration 2024-03-20 18:17:39 -04:00
abdelkader
ad990213be Fix a multiple firing event 2024-03-20 18:16:55 -04:00
abdelkader
d1296f66b7 show the last inserted address 2024-03-20 17:21:05 -04:00
abdelkader
6b133c27f5 Merge branch 'master' of https://github.com/abdelkader/vCardEditor 2024-03-20 16:04:50 -04:00
abdelkader
ce69d72d46 fix a bug in Add Address 2024-03-20 16:04:28 -04:00
abdelkader
b2edc48f66 Added Parcel, and Preferred 2024-03-20 15:04:18 -04:00
abdelkader
ae3961ec33 rename OverWrite
refactor some code
2024-03-20 09:54:14 -04:00
abdelkader
bad8fee66b arrange some code 2024-03-20 09:50:48 -04:00
abdelkader
4ab38ffea7 move some code around. 2024-03-20 09:48:28 -04:00
abdelkader
2faa7965cd Extra Tab show number of item.
Correct a designer pb
2024-03-20 09:34:17 -04:00
Abdel
3d558b0216 Update README.md
new image
2024-03-19 13:09:52 -04:00
Abdel
ad28a57df8 Update README.md
added a new image
2024-03-19 13:05:34 -04:00
abdelkader
ba9d26f981 some minor changes 2024-03-19 12:28:25 -04:00
abdelkader
abbb03dddf added a button to the extra tab 2024-03-19 12:04:55 -04:00
abdelkader
a989351889 remove the flowlayout panel, and replace it with a simple panel. 2024-03-19 11:48:18 -04:00
abdelkader
22f7f88018 move the declaration, so the autogenerate of vs won't remove them 2024-03-19 11:41:37 -04:00
abdelkader
85bb588f42 saving only if change occured 2024-03-19 08:41:19 -04:00
abdelkader
1bf467f81f catch error when parsing error.
optimize parsing of vcard
save last row
2024-03-18 17:26:20 -04:00
abdelkader
7e8c43e011 refactor 2024-03-18 13:02:42 -04:00
abdelkader
7d09a9ee3e Use Version Class to handle version, and added some error handling 2024-03-18 12:34:47 -04:00
abdelkader
77c1e45bfd the application check if un update is available. 2024-03-18 11:05:52 -04:00
abdelkader
1f234c61e9 #38 fix when changing phone, email, web 2024-03-17 22:25:12 -04:00
abdelkader
927d36a9a0 save phone when changed 2024-03-17 22:05:27 -04:00
abdelkader
653f21b9cc extended, po box were not saved 2024-03-15 14:19:11 -04:00
abdelkader
f509d5da84 Added svg support for qr code 2023-10-19 15:12:35 -04:00
Abdel
9012d355d3 Update README.md 2023-10-18 08:57:42 -04:00
abdelkader
88efefef5e #36 feature added 2023-10-18 08:55:44 -04:00
abdelkader
c244f09b92 Export/display of qr code 2023-10-18 08:52:13 -04:00
abdelkader
1df41c4714 QR Code Draft 2023-10-17 16:05:57 -04:00
abdelkader
634f82b3bb draft for adding/removing phones 2023-07-21 09:13:48 -04:00
abdelkader
016c23d4fc some refactoring 2023-07-07 17:00:52 -04:00
abdelkader
e3171db86d a working draft for adding extra properties 2023-07-07 16:45:05 -04:00
abdelkader
2bf9cd6064 Merge branch 'master' of https://github.com/abdelkader/vCardEditor 2023-07-07 14:39:50 -04:00
abdelkader
81a63e8281 remove unused event, and corrected event binding for text values 2023-07-07 14:39:27 -04:00
Abdel
8cda766954 Update README.md 2023-07-07 09:50:49 -04:00
abdelkader
194ee7e56c draft for extra field 2023-07-07 09:11:22 -04:00
Abdel
a0a6c4900c Update properties.md 2023-07-06 16:52:05 -04:00
Abdel
449c22f576 Update properties.md 2023-07-02 22:19:58 -04:00
Abdel
0020c3e6c8 Update properties.md 2023-07-02 21:57:21 -04:00
Abdel
397279be43 Update properties.md 2023-07-01 22:14:46 -04:00
Abdel
d6f5e2f316 Update properties.md 2023-07-01 12:01:03 -04:00
Abdel
5a87bc104f Create properties.md 2023-07-01 08:36:18 -04:00
abdelkader
47e5f0406f added UIToolbox to add removable component
start
2023-06-27 12:32:38 -04:00
abdelkader
cbc4a24152 Merge branch 'master' of https://github.com/abdelkader/vCardEditor 2023-06-27 12:32:26 -04:00
Abdel
2c47765a5e Update README.md 2023-06-12 22:50:59 -04:00
abdelkader
f538d3a978 remove test 2023-05-11 08:56:35 -04:00
abdelkader
a589c642d3 Merge branch 'master' of https://github.com/abdelkader/vCardEditor 2023-05-11 08:56:13 -04:00
Abdel
687b2a248a Update README.md 2023-05-11 08:53:39 -04:00
abdelkader
834c1a7243 Added test and refactor 2023-05-10 13:20:17 -04:00
abdelkader
d9657f2318 Added test 2023-05-09 22:08:49 -04:00
abdelkader
3bbe7170c4 added autofixture et other tests 2023-05-09 20:41:33 -04:00
abdelkader
48631de425 refacotring
added tests
2023-05-09 19:42:31 -04:00
abdelkader
71b5b7580a Merge branch 'master' of https://github.com/abdelkader/vCardEditor 2023-05-08 21:56:13 -04:00
abdelkader
7a4c8e9d42 fix minor fusions commit 2023-05-08 21:54:33 -04:00
abdelkader
1233425972 refactor 2023-05-08 21:43:23 -04:00
abdelkader
2885f5f5cc fusion 2023-05-08 19:57:21 -04:00
abdelkader
89c06504ee first draft of adding column
added a split container
save position and location of winform
save also visible columns
Added vcard copy to clipboard
corrected failed tests
2023-05-08 19:53:12 -04:00
Abdel
adac378b13 Update README.md 2023-05-05 17:56:07 -04:00
abdelkader
74b5400a34 Added vcard copy to clipboard 2023-05-04 21:22:37 -04:00
abdelkader
7ffb330559 corrected failed tests 2023-05-04 18:30:07 -04:00
abdelkader
3b1cfcd36b added a release file 2023-05-04 15:28:42 -04:00
Abdel
8cf9ce829c Update README.md 2023-05-04 14:36:39 -04:00
Abdel
071c967e08 Update README.md
added the screenshot
2023-05-04 14:34:35 -04:00
Abdel
618e341e02 Update README.md 2023-05-04 13:59:19 -04:00
abdelkader
6427542051 possibility to modify address type 2023-05-04 13:52:10 -04:00
abdelkader
dc9fa3143a Merge branch 'master' of https://github.com/abdelkader/vCardEditor 2023-05-03 21:12:50 -04:00
abdelkader
f0742c560c fusion 2023-05-03 21:08:37 -04:00
abdelkader
e4e6a983e3 Support adding/removing multiple addresses 2023-05-03 21:01:06 -04:00
Abdel
f4ede0585b Merge pull request #28 from abdelkader/abdelkader-patch-1
Update README.md
2023-04-30 12:04:34 -04:00
Abdel
83cda3c073 Update README.md 2023-04-30 12:03:30 -04:00
Abdel
8d9070f483 Update README.md 2023-04-19 17:27:07 -04:00
Abdel
4b33a2425d Update README.md 2023-04-19 17:22:17 -04:00
Abdel
fa7f2c85d2 Update README.md 2023-04-19 15:15:57 -04:00
Abdel
a40ffaca58 Update README.md 2023-04-19 15:05:43 -04:00
abdelkader
2325b5f986 file extension capital letter 2023-04-14 17:52:18 -04:00
abdelkader
1db99cf187 extension capital letter 2023-04-14 17:52:02 -04:00
abdelkader
fe4c6381da first working draft 2023-04-14 12:07:42 -04:00
abdelkader
437301d5bc Draft of export image 2023-04-09 17:21:40 -04:00
abdelkader
ed4d988c1d Merge branch 'master' into export-img 2023-04-06 23:51:40 -04:00
abdelkader
b249d91439 added test to incorrect vcf file 2023-04-06 23:50:46 -04:00
abdelkader
7d9bfc4fe3 draft of export image 2023-04-06 23:27:12 -04:00
abdelkader
62deb9a13e support for empty vcf file 2023-04-06 15:56:31 -04:00
abdelkader
4081142e2c refactoring 2023-04-06 15:35:20 -04:00
abdelkader
dd62810160 refactoring 2023-04-06 13:50:32 -04:00
abdelkader
314065c2dc fixed mru problem 2023-04-03 12:14:18 -04:00
abdelkader
a5e932b345 issue #15 2023-04-03 11:14:54 -04:00
abdelkader
1e1c3cce81 changed version 2023-04-02 16:18:57 -04:00
Abdel
dbc2615ed5 Merge pull request #20 from abdelkader/issue17-not-saving
Issue17 not saving
2023-04-02 16:12:55 -04:00
abdelkader
f9d016260f tabulation order fixed!
adress saving fixed!
2023-04-02 16:07:32 -04:00
abdelkader
a03a4e8ee4 fix issue 17 2023-04-02 14:49:10 -04:00
Abdel
6843863778 Merge pull request #19 from mokhin-denis/master
Upgraded to .NET Framework 4.8.1
2023-03-29 11:54:10 -04:00
Denis Mokhin
ee95238e2d Upgraded to .NET Framework 4.8.1 2023-03-28 20:10:08 +03:00
abdelkader
f14f5086d0 add empty contact entry draft 2022-10-12 11:49:43 -04:00
139 changed files with 13570 additions and 1997 deletions

1
.gitignore vendored
View File

@@ -216,3 +216,4 @@ FakesAssemblies/
**/*.Server/ModelManifest.xml
_Pvt_Extensions
/contacts
/vCardEditor/assests/icons8-save-32.png

View File

@@ -1,40 +1,39 @@
# vCard Editor
[![ko-fi](https://ko-fi.com/img/githubbutton_sm.svg)](https://ko-fi.com/B0B2KV8WP)
<a href="https://github.com/abdelkader/vCardEditor/releases/latest/download/vCardEditor.exe"><img src="https://camo.githubusercontent.com/d83fa798b621f1e112646fcc4aa74fff1ff6a8b22f5fc1da5ed8f79ddb4a51cb/68747470733a2f2f62616467656e2e6e65742f6769746875622f72656c656173652f4e61657265656e2f5374726170646f776e2e6a73" alt="Latest release" data-canonical-src="https://badgen.net/github/release/Naereen/Strapdown.js" style="max-width: 100%;"></a>
## vCard Editor
A Simple vcf file Editor. You can export easily edit (modify, delete) entries of a vcf file with this simple tool.
The software is still in **early stage**.
<p align="center"><img src="https://user-images.githubusercontent.com/169070/236289228-106c1489-e01d-400c-968e-92d3e2be74ab.png" width="800"></p>
## Installation
## ✅ Features
- [x] No need to install anything. Just head to the release section and download the last release version.
- [x] Add/Export images
No need to install anything. Just head to the release section and download the last release version.
## 📚 Tech Stack
- 🧰 [Wonderful library of parsing and generating vcf format](https://github.com/drlongnecker/Thought.vCards)
- 📖 [MVP pattern from this example](https://github.com/lennykean/NoteCards)
- 🧰 [SortableBindingList](http://timvw.be/2008/08/02/presenting-the-sortablebindinglistt-take-two/)
- 🧰 [Custom TabControl](https://github.com/r-aghaei/TabControlWithCloseButtonAndAddButton)
- 🧰 [QRCoder](https://github.com/codebude/QRCoder)
## Screenshots
## 📑 Release notes
Check release text file for history.
![App Screenshot](https://user-images.githubusercontent.com/474542/151180600-cf169628-0761-49a9-a63d-05f751c6a9bb.png)
## Acknowledgements
- [Wonderful library of parsing and generating vcf format](https://github.com/drlongnecker/Thought.vCards)
- [MVP pattern from this example](https://github.com/lennykean/NoteCards)
## 👷 Contributing and help
Contributions are always welcome! Check ths projet or ths issue page for ideas.
- 📝 [**Report a bug**](https://github.com/abdelkader/vCardEditor/issues)
- 🙋‍♀️ [**Request a feature**](https://github.com/abdelkader/vCardEditor/discussions)
## Release notes
#### 0.3
- Added address section.
- refactoring and bugs fixed
#### 0.2
- Updated the vCard library to https://github.com/acastroy/Thought.vCards
- Replaced Moq with nsubstitute (Test mocking library).
## Contributing
Contributions are always welcome!

446
properties.md Normal file
View File

@@ -0,0 +1,446 @@
Some properties are not supported by the library **Tought.vCards**.
AGENT, ANNIVERSARY, CALADRURI, CALURI, CLIENTPIDMAP, FBURL, GENDER, KIND, LANG, LOGO, MEMBER, PROFILE, RELATED, SORT-STRING, SOUND.
<h3>Already implemented &#9989; in version 5.0 </h3>
<table>
<tr>
<td rowspan="2"><b>Name</b></td>
<td colspan="3"><b>Property presence</b></td>
<td rowspan="2"><b>Description</b></td>
<td rowspan="2"><b>Example</b></td>
</tr>
<tr>
<td><b>v. 2.1</b></td>
<td><b>v. 3.0</b></td>
<td><b>v. 4.0</b></td>
</tr>
<tr>
<td>ADR</td>
<td>Optional</td>
<td>Optional</td>
<td>Optional</td>
<td>A structured representation of the physical delivery address for the vCard object.</td>
<td>ADR;TYPE=home:;;123 Main St.;Springfield;IL;12345;USA</td>
</tr>
<tr>
<td>BEGIN</td>
<td>Required</td>
<td>Required</td>
<td>Required</td>
<td>All vCards must start with this property.</td>
<td>BEGIN:VCARD</td>
</tr>
<tr>
<td>EMAIL</td>
<td>Optional</td>
<td>Optional</td>
<td>Optional</td>
<td>The address for electronic mail communication with the vCard object.</td>
<td>EMAIL:johndoe@hotmail.com</td>
</tr>
<tr>
<td>END</td>
<td>Required</td>
<td>Required</td>
<td>Required</td>
<td>All vCards must end with this property.</td>
<td>END:VCARD</td>
</tr>
<tr>
<td>FN</td>
<td>Optional</td>
<td>Required</td>
<td>Required</td>
<td>The formatted name string associated with the vCard object.</td>
<td>FN:Dr. John Doe</td>
</tr>
<tr>
<td>N</td>
<td>Required</td>
<td>Required</td>
<td>Optional</td>
<td>A structured representation of the name of the person, place or thing associated with the vCard object. Structure recognizes, in order separated by semicolons: Family Name, Given Name, Additional/Middle Names, Honorific Prefixes, and Honorific Suffixes[3]</td>
<td>N:Doe;John;;Dr;</td>
</tr>
<tr>
<td>NAME</td>
<td>Undefined</td>
<td>Optional</td>
<td>Undefined</td>
<td>Provides a textual representation of the SOURCE property.</td>
<td></td>
</tr>
<tr>
<td>NICKNAME</td>
<td>Undefined</td>
<td>Optional</td>
<td>Optional</td>
<td>One or more descriptive/familiar names for the object represented by this vCard.</td>
<td>NICKNAME:Jon,Johnny</td>
</tr>
<tr>
<td rowspan="6">PHOTO</td>
<td rowspan="6">Optional</td>
<td rowspan="6">Optional</td>
<td rowspan="6">Optional</td>
<td rowspan="6">An image or photograph of the individual associated with the vCard. It may point to an external URL or may be embedded in the vCard as a Base64 encoded block of text.</td>
<td>2.1: PHOTO;JPEG:http://example.com/photo.jpg</td>
</tr>
<tr>
<td>2.1: PHOTO;JPEG;ENCODING=BASE64:[base64-data]</td>
</tr>
<tr><td>3.0: PHOTO;TYPE=JPEG;VALUE=URI:http://example.com/photo.jpg</td>
</tr>
<tr><td>3.0: PHOTO;TYPE=JPEG;ENCODING=b:[base64-data]</td>
</tr>
<tr><td>4.0: PHOTO;MEDIATYPE=image/jpeg:http://example.com/photo.jpg</td>
</tr>
<tr><td>4.0: PHOTO;ENCODING=BASE64;TYPE=JPEG:[base64-data]</td>
</tr>
<tr>
<td>TEL</td>
<td>Optional</td>
<td>Optional</td>
<td>Optional</td>
<td>The canonical number string for a telephone number for telephony communication with the vCard object.</td>
<td>TEL;TYPE=cell:(123) 555-5832</td>
</tr>
<tr>
<td>TITLE</td>
<td>Optional</td>
<td>Optional</td>
<td>Optional</td>
<td>Specifies the job title, functional position or function of the individual associated with the vCard object within an organization.</td>
<td>TITLE:V.P. Research and Development</td>
</tr>
<tr>
<td>VERSION</td>
<td>Required</td>
<td>Required</td>
<td>Required</td>
<td>The version of the vCard specification. In version 4.0, this must come right after the BEGIN property.</td>
<td>VERSION:3.0</td>
</tr>
</table>
<h3>Not implemented yet &#10060; </h3>
<table>
<tr>
<td rowspan="2"><b>Name</b></td>
<td colspan="3"><b>Property presence</b></td>
<td rowspan="2"><b>Description</b></td>
<td rowspan="2"><b>Example</b></td>
</tr>
<tr>
<td><b>v. 2.1</b></td>
<td><b>v. 3.0</b></td>
<td><b>v. 4.0</b></td>
</tr>
<tr>
<td>AGENT</td>
<td>Optional</td>
<td>Optional</td>
<td>Undefined</td>
<td>Information about another person who will act on behalf of the vCard object. Typically this would be an area administrator, assistant, or secretary for the individual. Can be either a URL or an embedded vCard.</td>
<td>AGENT:http://mi6.gov.uk/007</td>
</tr>
<tr>
<td>ANNIVERSARY</td>
<td>Undefined</td>
<td>Undefined</td>
<td>Optional</td>
<td>Defines the person&#39;s anniversary.</td>
<td>ANNIVERSARY:19901021</td>
</tr>
<tr>
<td>BDAY</td>
<td>Optional</td>
<td>Optional</td>
<td>Optional</td>
<td>Date of birth of the individual associated with the vCard.</td>
<td>BDAY:19700310</td>
</tr>
<tr>
<td>CALADRURI</td>
<td>Undefined</td>
<td>Undefined</td>
<td>Optional</td>
<td>A URL to use for sending a scheduling request to the person&#39;s calendar.</td>
<td>CALADRURI:http://example.com/calendar/jdoe</td>
</tr>
<tr>
<td>CALURI</td>
<td>Undefined</td>
<td>Undefined</td>
<td>Optional</td>
<td>A URL to the person&#39;s calendar.</td>
<td>CALURI:http://example.com/calendar/jdoe</td>
</tr>
<tr>
<td>CATEGORIES</td>
<td>Optional</td>
<td>Optional</td>
<td>Optional</td>
<td>A list of &quot;tags&quot; that can be used to describe the object represented by this vCard.</td>
<td>CATEGORIES:swimmer,biker</td>
</tr>
<tr>
<td>CLASS</td>
<td>Undefined</td>
<td>Optional</td>
<td>Undefined</td>
<td>Describes the sensitivity of the information in the vCard.</td>
<td>CLASS:public</td>
</tr>
<tr>
<td>CLIENTPIDMAP</td>
<td>Undefined</td>
<td>Undefined</td>
<td>Optional</td>
<td>Used for synchronizing different revisions of the same vCard.</td>
<td>CLIENTPIDMAP:1;urn:uuid:3df403f4-5924-4bb7-b077-3c711d9eb34b</td>
</tr>
<tr>
<td>FBURL</td>
<td>Undefined</td>
<td>Undefined</td>
<td>Optional</td>
<td>Defines a URL that shows when the person is &quot;free&quot; or &quot;busy&quot; on their calendar.</td>
<td>FBURL:http://example.com/fb/jdoe</td>
</tr>
<tr>
<td>GENDER</td>
<td>Undefined</td>
<td>Undefined</td>
<td>Optional</td>
<td>Defines the person&#39;s gender.</td>
<td>GENDER:F</td>
</tr>
<tr>
<td>GEO</td>
<td>Optional</td>
<td>Optional</td>
<td>Optional</td>
<td>Specifies a latitude and longitude.</td>
<td>2.1, 3.0: GEO:39.95;-75.1667 <br>4.0: GEO:geo:39.95,-75.1667</td>
</tr>
<tr>
<td>IMPP</td>
<td>Undefined</td>
<td>Maybe</td>
<td>Optional</td>
<td>&quot;Defines an instant messenger handle. <br>This property was introduced in a separate RFC when the latest vCard version was 3.0. Therefore, 3.0 vCards might use this property without otherwise declaring it.&quot;</td>
<td>IMPP:aim:johndoe@aol.com</td>
</tr>
<tr>
<td rowspan="6">KEY</td>
<td rowspan="6">Optional</td>
<td rowspan="6">Optional</td>
<td rowspan="6">Optional</td>
<td rowspan="6">The public encryption key associated with the vCard object. It may point to an external URL, may be plain text, or may be embedded in the vCard as a Base64 encoded block of text.</td>
<td>2.1: KEY;PGP:http://example.com/key.pgp</td>
</tr>
<tr>
<td>2.1: KEY;PGP;ENCODING=BASE64:[base64-data]</td>
</tr>
<tr>
<td>3.0: KEY;TYPE=PGP:http://example.com/key.pgp</td>
</tr>
<tr><td>3.0: KEY;TYPE=PGP;ENCODING=b:[base64-data]</td>
</tr>
<tr><td>4.0: KEY;MEDIATYPE=application/pgp-keys:http://example.com/key.pgp</td>
</tr>
<tr><td>4.0: KEY:data:application/pgp-keys;base64,[base64-data]</td>
</tr>
<tr>
<td>KIND</td>
<td>Undefined</td>
<td>Undefined</td>
<td>Optional</td>
<td>Defines the type of entity that this vCard represents: &#39;application&#39;, &#39;individual&#39;, &#39;group&#39;, &#39;location&#39; or &#39;organization&#39;; &#39;x-*&#39; values may be used for experimental purposes.[1][2]</td>
<td>KIND:individual</td>
</tr>
<tr>
<td>LABEL</td>
<td>Optional</td>
<td>Optional</td>
<td>Incorporated without</td>
<td>Represents the actual text that should be put on the mailing label when delivering a physical package to the person/object associated with the vCard (related to the ADR property).<br>Not supported in version 4.0. Instead, this information is stored in the LABEL parameter of the ADR property. Example: ADR;TYPE=home;LABEL=&quot;123 Main St\nNew York, NY 12345&quot;:;;123 Main St;New York;NY;12345;USA</td>
<td>LABEL;TYPE=HOME:123 Main St.\nSpringfield, IL 12345\nUSA</td>
</tr>
<tr>
<td>LANG</td>
<td>Undefined</td>
<td>Undefined</td>
<td>Optional</td>
<td>Defines a language that the person speaks.</td>
<td>LANG:fr-CA</td>
</tr>
<tr>
<td rowspan="6">LOGO</td>
<td rowspan="6">Optional</td>
<td rowspan="6">Optional</td>
<td rowspan="6">Optional</td>
<td rowspan="6">An image or graphic of the logo of the organization that is associated with the individual to which the vCard belongs. It may point to an external URL or may be embedded in the vCard as a Base64 encoded block of text.</td>
<td>2.1: LOGO;PNG:http://example.com/logo.png</td>
</tr>
<tr> <td>2.1: LOGO;PNG;ENCODING=BASE64:[base64-data]</td>
</tr>
<tr><td>3.0: LOGO;TYPE=PNG:http://example.com/logo.png</td>
</tr>
<tr><td>3.0: LOGO;TYPE=PNG;ENCODING=b:[base64-data]</td>
</tr>
<tr><td>4.0: LOGO;MEDIATYPE=image/png:http://example.com/logo.png</td>
</tr>
<tr><td>4.0: LOGO;ENCODING=BASE64;TYPE=PNG:[base64-data]</td>
</tr>
<tr>
<td>MAILER</td>
<td>Optional</td>
<td>Optional</td>
<td>Undefined</td>
<td>Type of email program used.</td>
<td>MAILER:Thunderbird</td>
</tr>
<tr>
<td>MEMBER</td>
<td>Undefined</td>
<td>Undefined</td>
<td>Optional</td>
<td>Defines a member that is part of the group that this vCard represents. Acceptable values include:
<ul><li>a &quot;mailto:&quot; URL containing an email address</li>
<li>a UID which references the member&#39;s own vCard</li>
</ul>
The KIND property must be set to &quot;group&quot; in order to use this property.
</td>
<td>MEMBER:urn:uuid:03a0e51f-d1aa-4385-8a53-e29025acd8af</td>
</tr><tr>
<td>NOTE</td>
<td>Optional</td>
<td>Optional</td>
<td>Optional</td>
<td>Specifies supplemental information or a comment that is associated with the vCard.</td>
<td>NOTE:I am proficient in Tiger-Crane Style,\nand I am more than proficient in the exquisite art of the Samurai sword.</td>
</tr>
<tr>
<td>ORG</td>
<td>Optional</td>
<td>Optional</td>
<td>Optional</td>
<td>The name and optionally the unit(s) of the organization associated with the vCard object. This property is based on the X.520 Organization Name attribute and the X.520 Organization Unit attribute.</td>
<td>ORG:Google;GMail Team;Spam Detection Squad</td>
</tr>
<tr>
<td>PRODID</td>
<td>Undefined</td>
<td>Optional</td>
<td>Optional</td>
<td>The identifier for the product that created the vCard object.</td>
<td>PRODID:-//ONLINE DIRECTORY//NONSGML Version 1//EN</td>
</tr>
<tr>
<td>PROFILE</td>
<td>Optional</td>
<td>Optional</td>
<td>Undefined</td>
<td>States that the vCard is a vCard.</td>
<td>PROFILE:VCARD</td>
</tr>
<tr>
<td>RELATED</td>
<td>Undefined</td>
<td>Undefined</td>
<td>Optional</td>
<td>Another entity that the person is related to. Acceptable values include:
<ul>
<li>a &quot;mailto:&quot; URL containing an email address</li>
<li>a UID which references the person&#39;s own vCard</li>
</ul>
</td>
<td>RELATED;TYPE=friend:urn:uuid:03a0e51f-d1aa-4385-8a53-e29025acd8af</td>
</tr>
<tr>
<td>REV</td>
<td>Optional</td>
<td>Optional</td>
<td>Optional</td>
<td>A timestamp for the last time the vCard was updated.</td>
<td>REV:20121201T134211Z</td>
</tr>
<tr>
<td>ROLE</td>
<td>Optional</td>
<td>Optional</td>
<td>Optional</td>
<td>The role, occupation, or business category of the vCard object within an organization.</td>
<td>ROLE:Executive</td>
</tr>
<tr>
<td>SORT-STRING</td>
<td>Undefined</td>
<td>Optional</td>
<td>Incorporated without</td>
<td>Defines a string that should be used when an application sorts this vCard in some way.<br/>Not supported in version 4.0. Instead, this information is stored in the SORT-AS parameter of the N and/or ORG properties.</td>
<td>SORT-STRING:Doe</td>
</tr>
<tr>
<td rowspan="6">SOUND</td>
<td rowspan="6">Optional</td>
<td rowspan="6">Optional</td>
<td rowspan="6">Optional</td>
<td rowspan="6">By default, if this property is not grouped with other properties it specifies the pronunciation of the FN property of the vCard object. It may point to an external URL or may be embedded in the vCard as a Base64 encoded block of text.</td>
<td>2.1: SOUND;OGG:http://example.com/sound.ogg</td>
</tr>
<tr><td>2.1: SOUND;OGG;ENCODING=BASE64:[base64-data]</td>
</tr>
<tr><td>3.0: SOUND;TYPE=OGG:http://example.com/sound.ogg</td>
</tr>
<tr><td>3.0: SOUND;TYPE=OGG;ENCODING=b:[base64-data]</td>
</tr>
<tr><td>4.0: SOUND;MEDIATYPE=audio/ogg:http://example.com/sound.ogg</td>
</tr>
<tr><td>4.0: SOUND:data:audio/ogg;base64,[base64-data]</td>
</tr>
<tr>
<td>SOURCE</td>
<td>Optional</td>
<td>Optional</td>
<td>Optional</td>
<td>A URL that can be used to get the latest version of this vCard.</td>
<td>SOURCE:http://johndoe.com/vcard.vcf</td>
</tr>
<tr>
<td>TZ</td>
<td>Optional</td>
<td>Optional</td>
<td>Optional</td>
<td>The time zone of the vCard object.</td>
<td>2.1, 3.0: TZ:-0500 <br/>4.0: TZ:America/New_York</td>
</tr>
<tr>
<td>UID</td>
<td>Optional</td>
<td>Optional</td>
<td>Optional</td>
<td>Specifies a value that represents a persistent, globally unique identifier associated with the object.</td>
<td>UID:urn:uuid:da418720-3754-4631-a169-db89a02b831b</td>
</tr>
<tr>
<td>URL</td>
<td>Optional</td>
<td>Optional</td>
<td>Optional</td>
<td>A URL pointing to a website that represents the person in some way.</td>
<td>URL:http://www.johndoe.com</td>
</tr>
<tr>
<td>XML</td>
<td>Undefined</td>
<td>Undefined</td>
<td>Optional</td>
<td>Any XML data that is attached to the vCard. This is used if the vCard was encoded in XML (xCard standard) and the XML document contained elements which are not part of the xCard standard.</td>
<td>XML:&lt;b&gt;Not an xCard XML element&lt;/b&gt;</td>
</tr>
</table>

View File

@@ -0,0 +1,78 @@
using System;
using System.Collections.Generic;
using System.Text;
using static QRCoder.QRCodeGenerator;
namespace QRCoder
{
public class AsciiQRCode : AbstractQRCode, IDisposable
{
/// <summary>
/// Constructor without params to be used in COM Objects connections
/// </summary>
public AsciiQRCode() { }
public AsciiQRCode(QRCodeData data) : base(data) { }
/// <summary>
/// Returns a strings that contains the resulting QR code as ASCII chars.
/// </summary>
/// <param name="repeatPerModule">Number of repeated darkColorString/whiteSpaceString per module.</param>
/// <param name="darkColorString">String for use as dark color modules. In case of string make sure whiteSpaceString has the same length.</param>
/// <param name="whiteSpaceString">String for use as white modules (whitespace). In case of string make sure darkColorString has the same length.</param>
/// <param name="endOfLine">End of line separator. (Default: \n)</param>
/// <returns></returns>
public string GetGraphic(int repeatPerModule, string darkColorString = "██", string whiteSpaceString = " ", bool drawQuietZones = true, string endOfLine = "\n")
{
return string.Join(endOfLine, GetLineByLineGraphic(repeatPerModule, darkColorString, whiteSpaceString, drawQuietZones));
}
/// <summary>
/// Returns an array of strings that contains each line of the resulting QR code as ASCII chars.
/// </summary>
/// <param name="repeatPerModule">Number of repeated darkColorString/whiteSpaceString per module.</param>
/// <param name="darkColorString">String for use as dark color modules. In case of string make sure whiteSpaceString has the same length.</param>
/// <param name="whiteSpaceString">String for use as white modules (whitespace). In case of string make sure darkColorString has the same length.</param>
/// <returns></returns>
public string[] GetLineByLineGraphic(int repeatPerModule, string darkColorString = "██", string whiteSpaceString = " ", bool drawQuietZones = true)
{
var qrCode = new List<string>();
//We need to adjust the repeatPerModule based on number of characters in darkColorString
//(we assume whiteSpaceString has the same number of characters)
//to keep the QR code as square as possible.
var quietZonesModifier = (drawQuietZones ? 0 : 8);
var quietZonesOffset = (int)(quietZonesModifier * 0.5);
var adjustmentValueForNumberOfCharacters = darkColorString.Length / 2 != 1 ? darkColorString.Length / 2 : 0;
var verticalNumberOfRepeats = repeatPerModule + adjustmentValueForNumberOfCharacters;
var sideLength = (QrCodeData.ModuleMatrix.Count - quietZonesModifier) * verticalNumberOfRepeats;
for (var y = 0; y < sideLength; y++)
{
var lineBuilder = new StringBuilder();
for (var x = 0; x < QrCodeData.ModuleMatrix.Count - quietZonesModifier; x++)
{
var module = QrCodeData.ModuleMatrix[x + quietZonesOffset][((y + verticalNumberOfRepeats) / verticalNumberOfRepeats - 1)+quietZonesOffset];
for (var i = 0; i < repeatPerModule; i++)
{
lineBuilder.Append(module ? darkColorString : whiteSpaceString);
}
}
qrCode.Add(lineBuilder.ToString());
}
return qrCode.ToArray();
}
}
public static class AsciiQRCodeHelper
{
public static string GetQRCode(string plainText, int pixelsPerModule, string darkColorString, string whiteSpaceString, ECCLevel eccLevel, bool forceUtf8 = false, bool utf8BOM = false, EciMode eciMode = EciMode.Default, int requestedVersion = -1, string endOfLine = "\n", bool drawQuietZones = true)
{
using (var qrGenerator = new QRCodeGenerator())
using (var qrCodeData = qrGenerator.CreateQrCode(plainText, eccLevel, forceUtf8, utf8BOM, eciMode, requestedVersion))
using (var qrCode = new AsciiQRCode(qrCodeData))
return qrCode.GetGraphic(pixelsPerModule, darkColorString, whiteSpaceString, drawQuietZones, endOfLine);
}
}
}

View File

@@ -0,0 +1,28 @@
namespace QRCoder
{
public abstract class AbstractQRCode
{
protected QRCodeData QrCodeData { get; set; }
protected AbstractQRCode() {
}
protected AbstractQRCode(QRCodeData data) {
this.QrCodeData = data;
}
/// <summary>
/// Set a QRCodeData object that will be used to generate QR code. Used in COM Objects connections
/// </summary>
/// <param name="data">Need a QRCodeData object generated by QRCodeGenerator.CreateQrCode()</param>
virtual public void SetQRCodeData(QRCodeData data) {
this.QrCodeData = data;
}
public void Dispose()
{
this.QrCodeData?.Dispose();
this.QrCodeData = null;
}
}
}

View File

@@ -0,0 +1,298 @@
#if NETFRAMEWORK || NETSTANDARD2_0 || NET5_0 || NET6_0_WINDOWS
using System;
using System.Drawing;
using System.Drawing.Drawing2D;
using static QRCoder.ArtQRCode;
using static QRCoder.QRCodeGenerator;
// pull request raised to extend library used.
namespace QRCoder
{
#if NET6_0_WINDOWS
[System.Runtime.Versioning.SupportedOSPlatform("windows")]
#endif
public class ArtQRCode : AbstractQRCode, IDisposable
{
/// <summary>
/// Constructor without params to be used in COM Objects connections
/// </summary>
public ArtQRCode() { }
/// <summary>
/// Creates new ArtQrCode object
/// </summary>
/// <param name="data">QRCodeData generated by the QRCodeGenerator</param>
public ArtQRCode(QRCodeData data) : base(data) { }
/// <summary>
/// Renders an art-style QR code with dots as modules. (With default settings: DarkColor=Black, LightColor=White, Background=Transparent, QuietZone=true)
/// </summary>
/// <param name="pixelsPerModule">Amount of px each dark/light module of the QR code shall take place in the final QR code image</param>
/// <returns>QRCode graphic as bitmap</returns>
public Bitmap GetGraphic(int pixelsPerModule)
{
return this.GetGraphic(pixelsPerModule, Color.Black, Color.White, Color.Transparent);
}
/// <summary>
/// Renders an art-style QR code with dots as modules and a background image (With default settings: DarkColor=Black, LightColor=White, Background=Transparent, QuietZone=true)
/// </summary>
/// <param name="backgroundImage">A bitmap object that will be used as background picture</param>
/// <returns>QRCode graphic as bitmap</returns>
public Bitmap GetGraphic(Bitmap backgroundImage = null)
{
return this.GetGraphic(10, Color.Black, Color.White, Color.Transparent, backgroundImage: backgroundImage);
}
/// <summary>
/// Renders an art-style QR code with dots as modules and various user settings
/// </summary>
/// <param name="pixelsPerModule">Amount of px each dark/light module of the QR code shall take place in the final QR code image</param>
/// <param name="darkColor">Color of the dark modules</param>
/// <param name="lightColor">Color of the light modules</param>
/// <param name="backgroundColor">Color of the background</param>
/// <param name="backgroundImage">A bitmap object that will be used as background picture</param>
/// <param name="pixelSizeFactor">Value between 0.0 to 1.0 that defines how big the module dots are. The bigger the value, the less round the dots will be.</param>
/// <param name="drawQuietZones">If true a white border is drawn around the whole QR Code</param>
/// <param name="quietZoneRenderingStyle">Style of the quiet zones</param>
/// <param name="backgroundImageStyle">Style of the background image (if set). Fill=spanning complete graphic; DataAreaOnly=Don't paint background into quietzone</param>
/// <param name="finderPatternImage">Optional image that should be used instead of the default finder patterns</param>
/// <returns>QRCode graphic as bitmap</returns>
public Bitmap GetGraphic(int pixelsPerModule, Color darkColor, Color lightColor, Color backgroundColor, Bitmap backgroundImage = null, double pixelSizeFactor = 0.8,
bool drawQuietZones = true, QuietZoneStyle quietZoneRenderingStyle = QuietZoneStyle.Dotted,
BackgroundImageStyle backgroundImageStyle = BackgroundImageStyle.DataAreaOnly, Bitmap finderPatternImage = null)
{
if (pixelSizeFactor > 1)
throw new Exception("The parameter pixelSize must be between 0 and 1. (0-100%)");
int pixelSize = (int)Math.Min(pixelsPerModule, Math.Floor(pixelsPerModule / pixelSizeFactor));
var numModules = QrCodeData.ModuleMatrix.Count - (drawQuietZones ? 0 : 8);
var offset = (drawQuietZones ? 0 : 4);
var size = numModules * pixelsPerModule;
var bitmap = new Bitmap(size, size);
using (var graphics = Graphics.FromImage(bitmap))
{
using (var lightBrush = new SolidBrush(lightColor))
{
using (var darkBrush = new SolidBrush(darkColor))
{
// make background transparent
using (var brush = new SolidBrush(backgroundColor))
graphics.FillRectangle(brush, new Rectangle(0, 0, size, size));
//Render background if set
if (backgroundImage != null)
{
if (backgroundImageStyle == BackgroundImageStyle.Fill)
graphics.DrawImage(Resize(backgroundImage, size), 0, 0);
else if (backgroundImageStyle == BackgroundImageStyle.DataAreaOnly)
{
var bgOffset = 4 - offset;
graphics.DrawImage(Resize(backgroundImage, size - (2 * bgOffset * pixelsPerModule)), 0 + (bgOffset * pixelsPerModule), (bgOffset * pixelsPerModule));
}
}
var darkModulePixel = MakeDotPixel(pixelsPerModule, pixelSize, darkBrush);
var lightModulePixel = MakeDotPixel(pixelsPerModule, pixelSize, lightBrush);
for (var x = 0; x < numModules; x += 1)
{
for (var y = 0; y < numModules; y += 1)
{
var rectangleF = new Rectangle(x * pixelsPerModule, y * pixelsPerModule, pixelsPerModule, pixelsPerModule);
var pixelIsDark = this.QrCodeData.ModuleMatrix[offset + y][offset + x];
var solidBrush = pixelIsDark ? darkBrush : lightBrush;
var pixelImage = pixelIsDark ? darkModulePixel : lightModulePixel;
if (!IsPartOfFinderPattern(x, y, numModules, offset))
if (drawQuietZones && quietZoneRenderingStyle == QuietZoneStyle.Flat && IsPartOfQuietZone(x, y, numModules))
graphics.FillRectangle(solidBrush, rectangleF);
else
graphics.DrawImage(pixelImage, rectangleF);
else if (finderPatternImage == null)
graphics.FillRectangle(solidBrush, rectangleF);
}
}
if (finderPatternImage != null)
{
var finderPatternSize = 7 * pixelsPerModule;
graphics.DrawImage(finderPatternImage, new Rectangle(0, 0, finderPatternSize, finderPatternSize));
graphics.DrawImage(finderPatternImage, new Rectangle(size - finderPatternSize, 0, finderPatternSize, finderPatternSize));
graphics.DrawImage(finderPatternImage, new Rectangle(0, size - finderPatternSize, finderPatternSize, finderPatternSize));
}
graphics.Save();
}
}
}
return bitmap;
}
/// <summary>
/// If the pixelSize is bigger than the pixelsPerModule or may end up filling the Module making a traditional QR code.
/// </summary>
/// <param name="pixelsPerModule">Pixels used per module rendered</param>
/// <param name="pixelSize">Size of the dots</param>
/// <param name="brush">Color of the pixels</param>
/// <returns></returns>
private Bitmap MakeDotPixel(int pixelsPerModule, int pixelSize, SolidBrush brush)
{
// draw a dot
var bitmap = new Bitmap(pixelSize, pixelSize);
using (var graphics = Graphics.FromImage(bitmap))
{
graphics.FillEllipse(brush, new Rectangle(0, 0, pixelSize, pixelSize));
graphics.Save();
}
var pixelWidth = Math.Min(pixelsPerModule, pixelSize);
var margin = Math.Max((pixelsPerModule - pixelWidth) / 2, 0);
// center the dot in the module and crop to stay the right size.
var cropped = new Bitmap(pixelsPerModule, pixelsPerModule);
using (var graphics = Graphics.FromImage(cropped))
{
graphics.DrawImage(bitmap, new Rectangle(margin, margin, pixelWidth, pixelWidth),
new RectangleF(((float)pixelSize - pixelWidth) / 2, ((float)pixelSize - pixelWidth) / 2, pixelWidth, pixelWidth),
GraphicsUnit.Pixel);
graphics.Save();
}
return cropped;
}
/// <summary>
/// Checks if a given module(-position) is part of the quietzone of a QR code
/// </summary>
/// <param name="x">X position</param>
/// <param name="y">Y position</param>
/// <param name="numModules">Total number of modules per row</param>
/// <returns>true, if position is part of quiet zone</returns>
private bool IsPartOfQuietZone(int x, int y, int numModules)
{
return
x < 4 || //left
y < 4 || //top
x > numModules - 5 || //right
y > numModules - 5; //bottom
}
/// <summary>
/// Checks if a given module(-position) is part of one of the three finder patterns of a QR code
/// </summary>
/// <param name="x">X position</param>
/// <param name="y">Y position</param>
/// <param name="numModules">Total number of modules per row</param>
/// <param name="offset">Offset in modules (usually depending on drawQuietZones parameter)</param>
/// <returns>true, if position is part of any finder pattern</returns>
private bool IsPartOfFinderPattern(int x, int y, int numModules, int offset)
{
var cornerSize = 11 - offset;
var outerLimitLow = (numModules - cornerSize - 1);
var outerLimitHigh = outerLimitLow + 8;
var invertedOffset = 4 - offset;
return
(x >= invertedOffset && x < cornerSize && y >= invertedOffset && y < cornerSize) || //Top-left finder pattern
(x > outerLimitLow && x < outerLimitHigh && y >= invertedOffset && y < cornerSize) || //Top-right finder pattern
(x >= invertedOffset && x < cornerSize && y > outerLimitLow && y < outerLimitHigh); //Bottom-left finder pattern
}
/// <summary>
/// Resize to a square bitmap, but maintain the aspect ratio by padding transparently.
/// </summary>
/// <param name="image"></param>
/// <param name="newSize"></param>
/// <returns>Resized image as bitmap</returns>
private Bitmap Resize(Bitmap image, int newSize)
{
if (image == null) return null;
float scale = Math.Min((float)newSize / image.Width, (float)newSize / image.Height);
var scaledWidth = (int)(image.Width * scale);
var scaledHeight = (int)(image.Height * scale);
var offsetX = (newSize - scaledWidth) / 2;
var offsetY = (newSize - scaledHeight) / 2;
var scaledImage = new Bitmap(image, new Size(scaledWidth, scaledHeight));
var bm = new Bitmap(newSize, newSize);
using (Graphics graphics = Graphics.FromImage(bm))
{
using (var brush = new SolidBrush(Color.Transparent))
{
graphics.FillRectangle(brush, new Rectangle(0, 0, newSize, newSize));
graphics.InterpolationMode = InterpolationMode.High;
graphics.CompositingQuality = CompositingQuality.HighQuality;
graphics.SmoothingMode = SmoothingMode.AntiAlias;
graphics.DrawImage(scaledImage, new Rectangle(offsetX, offsetY, scaledWidth, scaledHeight));
}
}
return bm;
}
/// <summary>
/// Defines how the quiet zones shall be rendered.
/// </summary>
public enum QuietZoneStyle
{
Dotted,
Flat
}
/// <summary>
/// Defines how the background image (if set) shall be rendered.
/// </summary>
public enum BackgroundImageStyle
{
Fill,
DataAreaOnly
}
}
#if NET6_0_WINDOWS
[System.Runtime.Versioning.SupportedOSPlatform("windows")]
#endif
public static class ArtQRCodeHelper
{
/// <summary>
/// Helper function to create an ArtQRCode graphic with a single function call
/// </summary>
/// <param name="plainText">Text/payload to be encoded inside the QR code</param>
/// <param name="pixelsPerModule">Amount of px each dark/light module of the QR code shall take place in the final QR code image</param>
/// <param name="darkColor">Color of the dark modules</param>
/// <param name="lightColor">Color of the light modules</param>
/// <param name="backgroundColor">Color of the background</param>
/// <param name="eccLevel">The level of error correction data</param>
/// <param name="forceUtf8">Shall the generator be forced to work in UTF-8 mode?</param>
/// <param name="utf8BOM">Should the byte-order-mark be used?</param>
/// <param name="eciMode">Which ECI mode shall be used?</param>
/// <param name="requestedVersion">Set fixed QR code target version.</param>
/// <param name="backgroundImage">A bitmap object that will be used as background picture</param>
/// <param name="pixelSizeFactor">Value between 0.0 to 1.0 that defines how big the module dots are. The bigger the value, the less round the dots will be.</param>
/// <param name="drawQuietZones">If true a white border is drawn around the whole QR Code</param>
/// <param name="quietZoneRenderingStyle">Style of the quiet zones</param>
/// <param name="backgroundImageStyle">Style of the background image (if set). Fill=spanning complete graphic; DataAreaOnly=Don't paint background into quietzone</param>
/// <param name="finderPatternImage">Optional image that should be used instead of the default finder patterns</param>
/// <returns>QRCode graphic as bitmap</returns>
public static Bitmap GetQRCode(string plainText, int pixelsPerModule, Color darkColor, Color lightColor, Color backgroundColor, ECCLevel eccLevel, bool forceUtf8 = false,
bool utf8BOM = false, EciMode eciMode = EciMode.Default, int requestedVersion = -1, Bitmap backgroundImage = null, double pixelSizeFactor = 0.8,
bool drawQuietZones = true, QuietZoneStyle quietZoneRenderingStyle = QuietZoneStyle.Flat,
BackgroundImageStyle backgroundImageStyle = BackgroundImageStyle.DataAreaOnly, Bitmap finderPatternImage = null)
{
using (var qrGenerator = new QRCodeGenerator())
using (var qrCodeData = qrGenerator.CreateQrCode(plainText, eccLevel, forceUtf8, utf8BOM, eciMode, requestedVersion))
using (var qrCode = new ArtQRCode(qrCodeData))
return qrCode.GetGraphic(pixelsPerModule, darkColor, lightColor, backgroundColor, backgroundImage, pixelSizeFactor, drawQuietZones, quietZoneRenderingStyle, backgroundImageStyle, finderPatternImage);
}
}
}
#endif

Binary file not shown.

After

Width:  |  Height:  |  Size: 22 KiB

View File

@@ -0,0 +1,59 @@
## About
QRCoder is a simple library, written in C#.NET, which enables you to create QR codes. It hasn't any dependencies to other libraries and is available as .NET Framework and .NET Core PCL version on NuGet.
***
## Documentation
👉 *Your first place to go should be our wiki. Here you can find a detailed documentation of the QRCoder and its functions.*
* [**QRCode Wiki**](https://github.com/codebude/QRCoder/wiki)
* [Creator's blog (english)](http://en.code-bude.net/2013/10/17/qrcoder-an-open-source-qr-code-generator-implementation-in-csharp/)
* [Creator's blog (german)](http://code-bude.net/2013/10/17/qrcoder-eine-open-source-qr-code-implementierung-in-csharp/)
### Release Notes
The release notes for the current and all past releases can be read here: [📄 Release Notes](https://github.com/codebude/QRCoder/wiki/Release-notes)
## Usage / Quick start
You only need four lines of code, to generate and view your first QR code.
```csharp
using (QRCodeGenerator qrGenerator = new QRCodeGenerator())
using (QRCodeData qrCodeData = qrGenerator.CreateQrCode("The text which should be encoded.", QRCodeGenerator.ECCLevel.Q))
using (QRCode qrCode = new QRCode(qrCodeData))
{
Bitmap qrCodeImage = qrCode.GetGraphic(20);
}
```
### Optional parameters and overloads
The GetGraphics-method has some more overloads. The first two enable you to set the color of the QR code graphic. One uses Color-class-types, the other HTML hex color notation.
```csharp
//Set color by using Color-class types
Bitmap qrCodeImage = qrCode.GetGraphic(20, Color.DarkRed, Color.PaleGreen, true);
//Set color by using HTML hex color notation
Bitmap qrCodeImage = qrCode.GetGraphic(20, "#000ff0", "#0ff000");
```
The other overload enables you to render a logo/image in the center of the QR code.
```csharp
Bitmap qrCodeImage = qrCode.GetGraphic(20, Color.Black, Color.White, (Bitmap)Bitmap.FromFile("C:\\myimage.png"));
```
There are a plenty of other options. So feel free to read more on that in our wiki: [Wiki: How to use QRCoder](https://github.com/codebude/QRCoder/wiki/How-to-use-QRCoder)
## Help & Issues
If you think you have found a bug or have new ideas or feature requests, then feel free to open a new issue: https://github.com/codebude/QRCoder/issues
In case you have a question about using the library (and couldn't find an answer in our wiki), feel free to open a new question/discussion: https://github.com/codebude/QRCoder/discussions
## Legal information and credits
QRCoder is a project by [Raffael Herrmann](https://raffaelherrmann.de) and was first released in 10/2013. It's licensed under the [MIT license](https://github.com/codebude/QRCoder/blob/master/LICENSE.txt).

View File

@@ -0,0 +1,115 @@
#if NETFRAMEWORK || NETSTANDARD2_0 || NET5_0 || NET6_0_WINDOWS
using System;
using System.Drawing;
using System.Drawing.Imaging;
using System.IO;
using static QRCoder.Base64QRCode;
using static QRCoder.QRCodeGenerator;
namespace QRCoder
{
#if NET6_0_WINDOWS
[System.Runtime.Versioning.SupportedOSPlatform("windows")]
#endif
public class Base64QRCode : AbstractQRCode, IDisposable
{
private QRCode qr;
/// <summary>
/// Constructor without params to be used in COM Objects connections
/// </summary>
public Base64QRCode() {
qr = new QRCode();
}
public Base64QRCode(QRCodeData data) : base(data) {
qr = new QRCode(data);
}
public override void SetQRCodeData(QRCodeData data) {
this.qr.SetQRCodeData(data);
}
public string GetGraphic(int pixelsPerModule)
{
return this.GetGraphic(pixelsPerModule, Color.Black, Color.White, true);
}
public string GetGraphic(int pixelsPerModule, string darkColorHtmlHex, string lightColorHtmlHex, bool drawQuietZones = true, ImageType imgType = ImageType.Png)
{
return this.GetGraphic(pixelsPerModule, ColorTranslator.FromHtml(darkColorHtmlHex), ColorTranslator.FromHtml(lightColorHtmlHex), drawQuietZones, imgType);
}
public string GetGraphic(int pixelsPerModule, Color darkColor, Color lightColor, bool drawQuietZones = true, ImageType imgType = ImageType.Png)
{
var base64 = string.Empty;
using (Bitmap bmp = qr.GetGraphic(pixelsPerModule, darkColor, lightColor, drawQuietZones))
{
base64 = BitmapToBase64(bmp, imgType);
}
return base64;
}
public string GetGraphic(int pixelsPerModule, Color darkColor, Color lightColor, Bitmap icon, int iconSizePercent = 15, int iconBorderWidth = 6, bool drawQuietZones = true, ImageType imgType = ImageType.Png)
{
var base64 = string.Empty;
using (Bitmap bmp = qr.GetGraphic(pixelsPerModule, darkColor, lightColor, icon, iconSizePercent, iconBorderWidth, drawQuietZones))
{
base64 = BitmapToBase64(bmp, imgType);
}
return base64;
}
private string BitmapToBase64(Bitmap bmp, ImageType imgType)
{
var base64 = string.Empty;
ImageFormat iFormat;
switch (imgType) {
case ImageType.Png:
iFormat = ImageFormat.Png;
break;
case ImageType.Jpeg:
iFormat = ImageFormat.Jpeg;
break;
case ImageType.Gif:
iFormat = ImageFormat.Gif;
break;
default:
iFormat = ImageFormat.Png;
break;
}
using (MemoryStream memoryStream = new MemoryStream())
{
bmp.Save(memoryStream, iFormat);
base64 = Convert.ToBase64String(memoryStream.ToArray(), Base64FormattingOptions.None);
}
return base64;
}
public enum ImageType
{
Gif,
Jpeg,
Png
}
}
#if NET6_0_WINDOWS
[System.Runtime.Versioning.SupportedOSPlatform("windows")]
#endif
public static class Base64QRCodeHelper
{
public static string GetQRCode(string plainText, int pixelsPerModule, string darkColorHtmlHex, string lightColorHtmlHex, ECCLevel eccLevel, bool forceUtf8 = false, bool utf8BOM = false, EciMode eciMode = EciMode.Default, int requestedVersion = -1, bool drawQuietZones = true, ImageType imgType = ImageType.Png)
{
using (var qrGenerator = new QRCodeGenerator())
using (var qrCodeData = qrGenerator.CreateQrCode(plainText, eccLevel, forceUtf8, utf8BOM, eciMode, requestedVersion))
using (var qrCode = new Base64QRCode(qrCodeData))
return qrCode.GetGraphic(pixelsPerModule, darkColorHtmlHex, lightColorHtmlHex, drawQuietZones, imgType);
}
}
}
#endif

View File

@@ -0,0 +1,125 @@
using System;
using System.Collections.Generic;
using System.Linq;
using static QRCoder.QRCodeGenerator;
namespace QRCoder
{
// ReSharper disable once InconsistentNaming
public class BitmapByteQRCode : AbstractQRCode, IDisposable
{
/// <summary>
/// Constructor without params to be used in COM Objects connections
/// </summary>
public BitmapByteQRCode() { }
public BitmapByteQRCode(QRCodeData data) : base(data) { }
public byte[] GetGraphic(int pixelsPerModule)
{
return GetGraphic(pixelsPerModule, new byte[] { 0x00, 0x00, 0x00 }, new byte[] { 0xFF, 0xFF, 0xFF });
}
public byte[] GetGraphic(int pixelsPerModule, string darkColorHtmlHex, string lightColorHtmlHex)
{
return GetGraphic(pixelsPerModule, HexColorToByteArray(darkColorHtmlHex), HexColorToByteArray(lightColorHtmlHex));
}
public byte[] GetGraphic(int pixelsPerModule, byte[] darkColorRgb, byte[] lightColorRgb)
{
var sideLength = this.QrCodeData.ModuleMatrix.Count * pixelsPerModule;
var moduleDark = darkColorRgb.Reverse();
var moduleLight = lightColorRgb.Reverse();
List<byte> bmp = new List<byte>();
//header
bmp.AddRange(new byte[] { 0x42, 0x4D, 0x4C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1A, 0x00, 0x00, 0x00, 0x0C, 0x00, 0x00, 0x00 });
//width
bmp.AddRange(IntTo4Byte(sideLength));
//height
bmp.AddRange(IntTo4Byte(sideLength));
//header end
bmp.AddRange(new byte[] { 0x01, 0x00, 0x18, 0x00 });
//draw qr code
for (var x = sideLength-1; x >= 0; x = x - pixelsPerModule)
{
for (int pm = 0; pm < pixelsPerModule; pm++)
{
for (var y = 0; y < sideLength; y = y + pixelsPerModule)
{
var module =
this.QrCodeData.ModuleMatrix[(x + pixelsPerModule)/pixelsPerModule - 1][(y + pixelsPerModule)/pixelsPerModule - 1];
for (int i = 0; i < pixelsPerModule; i++)
{
bmp.AddRange(module ? moduleDark : moduleLight);
}
}
if (sideLength%4 != 0)
{
for (int i = 0; i < sideLength%4; i++)
{
bmp.Add(0x00);
}
}
}
}
//finalize with terminator
bmp.AddRange(new byte[] { 0x00, 0x00 });
return bmp.ToArray();
}
private byte[] HexColorToByteArray(string colorString)
{
if (colorString.StartsWith("#"))
colorString = colorString.Substring(1);
byte[] byteColor = new byte[colorString.Length / 2];
for (int i = 0; i < byteColor.Length; i++)
byteColor[i] = byte.Parse(colorString.Substring(i * 2, 2), System.Globalization.NumberStyles.HexNumber, System.Globalization.CultureInfo.InvariantCulture);
return byteColor;
}
private byte[] IntTo4Byte(int inp)
{
byte[] bytes = new byte[2];
unchecked
{
bytes[1] = (byte)(inp >> 8);
bytes[0] = (byte)(inp);
}
return bytes;
}
}
public static class BitmapByteQRCodeHelper
{
public static byte[] GetQRCode(string plainText, int pixelsPerModule, string darkColorHtmlHex,
string lightColorHtmlHex, ECCLevel eccLevel, bool forceUtf8 = false, bool utf8BOM = false,
EciMode eciMode = EciMode.Default, int requestedVersion = -1)
{
using (var qrGenerator = new QRCodeGenerator())
using (
var qrCodeData = qrGenerator.CreateQrCode(plainText, eccLevel, forceUtf8, utf8BOM, eciMode,
requestedVersion))
using (var qrCode = new BitmapByteQRCode(qrCodeData))
return qrCode.GetGraphic(pixelsPerModule, darkColorHtmlHex, lightColorHtmlHex);
}
public static byte[] GetQRCode(string txt, QRCodeGenerator.ECCLevel eccLevel, int size)
{
using (var qrGen = new QRCodeGenerator())
using (var qrCode = qrGen.CreateQrCode(txt, eccLevel))
using (var qrBmp = new BitmapByteQRCode(qrCode))
return qrBmp.GetGraphic(size);
}
}
}

View File

@@ -0,0 +1,16 @@
using System;
namespace QRCoder.Exceptions
{
public class DataTooLongException : Exception
{
public DataTooLongException(string eccLevel, string encodingMode, int maxSizeByte) : base(
$"The given payload exceeds the maximum size of the QR code standard. The maximum size allowed for the choosen paramters (ECC level={eccLevel}, EncodingMode={encodingMode}) is {maxSizeByte} byte."
){}
public DataTooLongException(string eccLevel, string encodingMode, int version, int maxSizeByte) : base(
$"The given payload exceeds the maximum size of the QR code standard. The maximum size allowed for the choosen paramters (ECC level={eccLevel}, EncodingMode={encodingMode}, FixedVersion={version}) is {maxSizeByte} byte."
)
{ }
}
}

View File

@@ -0,0 +1,52 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Reflection;
using System.Text;
namespace QRCoder.Extensions
{
/// <summary>
/// Used to represent a string value for a value in an enum
/// </summary>
public class StringValueAttribute : Attribute
{
#region Properties
/// <summary>
/// Holds the alue in an enum
/// </summary>
public string StringValue { get; protected set; }
#endregion
/// <summary>
/// Init a StringValue Attribute
/// </summary>
/// <param name="value"></param>
public StringValueAttribute(string value)
{
this.StringValue = value;
}
}
public static class CustomExtensions
{
/// <summary>
/// Will get the string value for a given enum's value
/// </summary>
/// <param name="value"></param>
/// <returns></returns>
public static string GetStringValue(this Enum value)
{
#if NETSTANDARD1_3
var fieldInfo = value.GetType().GetRuntimeField(value.ToString());
#else
var fieldInfo = value.GetType().GetField(value.ToString());
#endif
var attr = fieldInfo.GetCustomAttributes(typeof(StringValueAttribute), false) as StringValueAttribute[];
return attr.Length > 0 ? attr[0].StringValue : null;
}
}
}

View File

@@ -0,0 +1,20 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
namespace QRCoder.Framework4._0Methods
{
class Stream4Methods
{
public static void CopyTo(System.IO.Stream input, System.IO.Stream output)
{
byte[] buffer = new byte[16 * 1024];
int bytesRead;
while ((bytesRead = input.Read(buffer, 0, buffer.Length)) > 0)
{
output.Write(buffer, 0, bytesRead);
}
}
}
}

View File

@@ -0,0 +1,48 @@
using System;
namespace QRCoder
{
internal static class String40Methods
{
/// <summary>
/// The IsNullOrWhiteSpace method from Framework4.0
/// </summary>
/// <returns>
/// <c>true</c> if the <paramref name="value"/> is null or white space; otherwise, <c>false</c>.
/// </returns>
public static bool IsNullOrWhiteSpace(String value)
{
if (value == null) return true;
for (int i = 0; i < value.Length; i++)
{
if (!Char.IsWhiteSpace(value[i])) return false;
}
return true;
}
public static string ReverseString(string str)
{
char[] chars = str.ToCharArray();
char[] result = new char[chars.Length];
for (int i = 0, j = str.Length - 1; i < str.Length; i++, j--)
{
result[i] = chars[j];
}
return new string(result);
}
public static bool IsAllDigit(string str)
{
foreach (var c in str)
{
if (!char.IsDigit(c))
{
return false;
}
}
return true;
}
}
}

File diff suppressed because it is too large Load Diff

View File

@@ -0,0 +1,243 @@
#if NETFRAMEWORK || NETSTANDARD2_0 || NET5_0 || NET6_0_WINDOWS
using System;
using System.Collections.Generic;
using System.Drawing.Imaging;
using System.Globalization;
using System.IO;
using System.Linq;
using static QRCoder.QRCodeGenerator;
/* This renderer is inspired by RemusVasii: https://github.com/codebude/QRCoder/issues/223 */
namespace QRCoder
{
#if NET6_0_WINDOWS
[System.Runtime.Versioning.SupportedOSPlatform("windows")]
#endif
// ReSharper disable once InconsistentNaming
public class PdfByteQRCode : AbstractQRCode, IDisposable
{
private readonly byte[] pdfBinaryComment = new byte[] { 0x25, 0xe2, 0xe3, 0xcf, 0xd3 };
/// <summary>
/// Constructor without params to be used in COM Objects connections
/// </summary>
public PdfByteQRCode() { }
public PdfByteQRCode(QRCodeData data) : base(data) { }
/// <summary>
/// Creates a PDF document with a black & white QR code
/// </summary>
/// <param name="pixelsPerModule"></param>
/// <returns></returns>
public byte[] GetGraphic(int pixelsPerModule)
{
return GetGraphic(pixelsPerModule, "#000000", "#ffffff");
}
/// <summary>
/// Takes hexadecimal color string #000000 and returns byte[]{ 0, 0, 0 }
/// </summary>
/// <param name="colorString">Color in HEX format like #ffffff</param>
/// <returns></returns>
private byte[] HexColorToByteArray(string colorString)
{
if (colorString.StartsWith("#"))
colorString = colorString.Substring(1);
byte[] byteColor = new byte[colorString.Length / 2];
for (int i = 0; i < byteColor.Length; i++)
byteColor[i] = byte.Parse(colorString.Substring(i * 2, 2), NumberStyles.HexNumber, CultureInfo.InvariantCulture);
return byteColor;
}
/// <summary>
/// Creates a PDF document with given colors DPI and quality
/// </summary>
/// <param name="pixelsPerModule"></param>
/// <param name="darkColorHtmlHex"></param>
/// <param name="lightColorHtmlHex"></param>
/// <param name="dpi"></param>
/// <param name="jpgQuality"></param>
/// <returns></returns>
public byte[] GetGraphic(int pixelsPerModule, string darkColorHtmlHex, string lightColorHtmlHex, int dpi = 150, long jpgQuality = 85)
{
byte[] jpgArray = null, pngArray = null;
var imgSize = QrCodeData.ModuleMatrix.Count * pixelsPerModule;
var pdfMediaSize = (imgSize * 72 / dpi).ToString(CultureInfo.InvariantCulture);
//Get QR code image
using (var qrCode = new PngByteQRCode(QrCodeData))
{
pngArray = qrCode.GetGraphic(pixelsPerModule, HexColorToByteArray(darkColorHtmlHex), HexColorToByteArray(lightColorHtmlHex));
}
//Create image and transofrm to JPG
using (var msPng = new MemoryStream())
{
msPng.Write(pngArray, 0, pngArray.Length);
var img = System.Drawing.Image.FromStream(msPng);
using (var msJpeg = new MemoryStream())
{
// Create JPEG with specified quality
var jpgImageCodecInfo = ImageCodecInfo.GetImageEncoders().First(x => x.MimeType == "image/jpeg");
var jpgEncoderParameters = new EncoderParameters(1) {
Param = new EncoderParameter[]{ new EncoderParameter(Encoder.Quality, jpgQuality) }
};
img.Save(msJpeg, jpgImageCodecInfo, jpgEncoderParameters);
jpgArray = msJpeg.ToArray();
}
}
//Create PDF document
using (var stream = new MemoryStream())
{
var writer = new StreamWriter(stream, System.Text.Encoding.GetEncoding("ASCII"));
var xrefs = new List<long>();
writer.Write("%PDF-1.5\r\n");
writer.Flush();
stream.Write(pdfBinaryComment, 0, pdfBinaryComment.Length);
writer.WriteLine();
writer.Flush();
xrefs.Add(stream.Position);
writer.Write(
xrefs.Count.ToString() + " 0 obj\r\n" +
"<<\r\n" +
"/Type /Catalog\r\n" +
"/Pages 2 0 R\r\n" +
">>\r\n" +
"endobj\r\n"
);
writer.Flush();
xrefs.Add(stream.Position);
writer.Write(
xrefs.Count.ToString() + " 0 obj\r\n" +
"<<\r\n" +
"/Count 1\r\n" +
"/Kids [ <<\r\n" +
"/Type /Page\r\n" +
"/Parent 2 0 R\r\n" +
"/MediaBox [0 0 " + pdfMediaSize + " " + pdfMediaSize + "]\r\n" +
"/Resources << /ProcSet [ /PDF /ImageC ]\r\n" +
"/XObject << /Im1 4 0 R >> >>\r\n" +
"/Contents 3 0 R\r\n" +
">> ]\r\n" +
">>\r\n" +
"endobj\r\n"
);
var X = "q\r\n" +
pdfMediaSize + " 0 0 " + pdfMediaSize + " 0 0 cm\r\n" +
"/Im1 Do\r\n" +
"Q";
writer.Flush();
xrefs.Add(stream.Position);
writer.Write(
xrefs.Count.ToString() + " 0 obj\r\n" +
"<< /Length " + X.Length.ToString() + " >>\r\n" +
"stream\r\n" +
X + "endstream\r\n" +
"endobj\r\n"
);
writer.Flush();
xrefs.Add(stream.Position);
writer.Write(
xrefs.Count.ToString() + " 0 obj\r\n" +
"<<\r\n" +
"/Name /Im1\r\n" +
"/Type /XObject\r\n" +
"/Subtype /Image\r\n" +
"/Width " + imgSize.ToString() + "/Height " + imgSize.ToString() + "/Length 5 0 R\r\n" +
"/Filter /DCTDecode\r\n" +
"/ColorSpace /DeviceRGB\r\n" +
"/BitsPerComponent 8\r\n" +
">>\r\n" +
"stream\r\n"
);
writer.Flush();
stream.Write(jpgArray, 0, jpgArray.Length);
writer.Write(
"\r\n" +
"endstream\r\n" +
"endobj\r\n"
);
writer.Flush();
xrefs.Add(stream.Position);
writer.Write(
xrefs.Count.ToString() + " 0 obj\r\n" +
jpgArray.Length.ToString() + " endobj\r\n"
);
writer.Flush();
var startxref = stream.Position;
writer.Write(
"xref\r\n" +
"0 " + (xrefs.Count + 1).ToString() + "\r\n" +
"0000000000 65535 f\r\n"
);
foreach (var refValue in xrefs)
writer.Write(refValue.ToString("0000000000") + " 00000 n\r\n");
writer.Write(
"trailer\r\n" +
"<<\r\n" +
"/Size " + (xrefs.Count + 1).ToString() + "\r\n" +
"/Root 1 0 R\r\n" +
">>\r\n" +
"startxref\r\n" +
startxref.ToString() + "\r\n" +
"%%EOF"
);
writer.Flush();
stream.Position = 0;
return stream.ToArray();
}
}
}
#if NET6_0_WINDOWS
[System.Runtime.Versioning.SupportedOSPlatform("windows")]
#endif
public static class PdfByteQRCodeHelper
{
public static byte[] GetQRCode(string plainText, int pixelsPerModule, string darkColorHtmlHex,
string lightColorHtmlHex, ECCLevel eccLevel, bool forceUtf8 = false, bool utf8BOM = false,
EciMode eciMode = EciMode.Default, int requestedVersion = -1)
{
using (var qrGenerator = new QRCodeGenerator())
using (
var qrCodeData = qrGenerator.CreateQrCode(plainText, eccLevel, forceUtf8, utf8BOM, eciMode,
requestedVersion))
using (var qrCode = new PdfByteQRCode(qrCodeData))
return qrCode.GetGraphic(pixelsPerModule, darkColorHtmlHex, lightColorHtmlHex);
}
public static byte[] GetQRCode(string txt, ECCLevel eccLevel, int size)
{
using (var qrGen = new QRCodeGenerator())
using (var qrCode = qrGen.CreateQrCode(txt, eccLevel))
using (var qrBmp = new PdfByteQRCode(qrCode))
return qrBmp.GetGraphic(size);
}
}
}
#endif

View File

@@ -0,0 +1,341 @@
using System;
using System.IO;
using System.IO.Compression;
using static QRCoder.QRCodeGenerator;
namespace QRCoder
{
public sealed class PngByteQRCode : AbstractQRCode, IDisposable
{
/// <summary>
/// Constructor without params to be used in COM Objects connections
/// </summary>
public PngByteQRCode() { }
public PngByteQRCode(QRCodeData data) : base(data)
{
}
/// <summary>
/// Creates a black & white PNG of the QR code, using 1-bit grayscale.
/// </summary>
public byte[] GetGraphic(int pixelsPerModule, bool drawQuietZones = true)
{
using (var png = new PngBuilder())
{
var size = (this.QrCodeData.ModuleMatrix.Count - (drawQuietZones ? 0 : 8)) * pixelsPerModule;
png.WriteHeader(size, size, 1, PngBuilder.ColorType.Greyscale);
png.WriteScanlines(this.DrawScanlines(pixelsPerModule, drawQuietZones));
png.WriteEnd();
return png.GetBytes();
}
}
/// <summary>
/// Creates 2-color PNG of the QR code, using 1-bit indexed color. Accepts 3-byte RGB colors for normal images and 4-byte RGBA-colors for transparent images.
/// </summary>
public byte[] GetGraphic(int pixelsPerModule, byte[] darkColorRgba, byte[] lightColorRgba, bool drawQuietZones = true)
{
using (var png = new PngBuilder())
{
var size = (this.QrCodeData.ModuleMatrix.Count - (drawQuietZones ? 0 : 8)) * pixelsPerModule;
png.WriteHeader(size, size, 1, PngBuilder.ColorType.Indexed);
png.WritePalette(darkColorRgba, lightColorRgba);
png.WriteScanlines(this.DrawScanlines(pixelsPerModule, drawQuietZones));
png.WriteEnd();
return png.GetBytes();
}
}
/// <summary>
/// Creates a bitmap where each pixel is represented by a single bit, dark = 0 and light = 1.
/// </summary>
private byte[] DrawScanlines(int pixelsPerModule, bool drawQuietZones)
{
var moduleMatrix = this.QrCodeData.ModuleMatrix;
var matrixSize = moduleMatrix.Count - (drawQuietZones ? 0 : 8);
var quietZoneOffset = (drawQuietZones ? 0 : 4);
var bytesPerScanline = (matrixSize * pixelsPerModule + 7) / 8 + 1; // A monochrome scanline is one byte for filter type then one bit per pixel.
var scanlines = new byte[bytesPerScanline * matrixSize * pixelsPerModule];
for (var y = 0; y < matrixSize; y++)
{
var modules = moduleMatrix[y+quietZoneOffset];
var scanlineOffset = y * pixelsPerModule * bytesPerScanline;
// Draw a scanline with the modules from the QR code.
for (var x = 0; x < matrixSize; x++)
{
if (modules[x + quietZoneOffset])
{
continue;
}
var pixelIndex = x * pixelsPerModule;
var endIndex = pixelIndex + pixelsPerModule;
for (; pixelIndex < endIndex; pixelIndex++)
{
scanlines[scanlineOffset + 1 + pixelIndex / 8] |= (byte)(0x80 >> (pixelIndex % 8));
}
}
// Copy the scanline required number of times.
for (var copyCount = 1; copyCount < pixelsPerModule; copyCount++)
{
Array.Copy(scanlines, scanlineOffset, scanlines, scanlineOffset + copyCount * bytesPerScanline, bytesPerScanline);
}
}
return scanlines;
}
/// <summary>
/// Writes the chunks that make up a PNG file.
/// </summary>
/// <remarks>
/// See https://www.w3.org/TR/2003/REC-PNG-20031110 and https://www.ietf.org/rfc/rfc1950.txt.
/// </remarks>
private sealed class PngBuilder : IDisposable
{
private static readonly byte[] PngSignature = { 0x89, 0x50, 0x4E, 0x47, 0x0D, 0x0A, 0x1A, 0x0A };
private static readonly uint[] CrcTable = {
0x00000000, 0x77073096, 0xEE0E612C, 0x990951BA, 0x076DC419, 0x706AF48F, 0xE963A535, 0x9E6495A3, 0x0EDB8832, 0x79DCB8A4, 0xE0D5E91E, 0x97D2D988, 0x09B64C2B, 0x7EB17CBD, 0xE7B82D07, 0x90BF1D91, 0x1DB71064, 0x6AB020F2, 0xF3B97148, 0x84BE41DE, 0x1ADAD47D, 0x6DDDE4EB, 0xF4D4B551, 0x83D385C7, 0x136C9856, 0x646BA8C0, 0xFD62F97A, 0x8A65C9EC, 0x14015C4F, 0x63066CD9, 0xFA0F3D63, 0x8D080DF5, 0x3B6E20C8, 0x4C69105E, 0xD56041E4, 0xA2677172, 0x3C03E4D1, 0x4B04D447, 0xD20D85FD, 0xA50AB56B, 0x35B5A8FA, 0x42B2986C, 0xDBBBC9D6, 0xACBCF940, 0x32D86CE3, 0x45DF5C75, 0xDCD60DCF, 0xABD13D59, 0x26D930AC, 0x51DE003A, 0xC8D75180, 0xBFD06116, 0x21B4F4B5, 0x56B3C423, 0xCFBA9599, 0xB8BDA50F, 0x2802B89E, 0x5F058808, 0xC60CD9B2, 0xB10BE924, 0x2F6F7C87, 0x58684C11, 0xC1611DAB, 0xB6662D3D,
0x76DC4190, 0x01DB7106, 0x98D220BC, 0xEFD5102A, 0x71B18589, 0x06B6B51F, 0x9FBFE4A5, 0xE8B8D433, 0x7807C9A2, 0x0F00F934, 0x9609A88E, 0xE10E9818, 0x7F6A0DBB, 0x086D3D2D, 0x91646C97, 0xE6635C01, 0x6B6B51F4, 0x1C6C6162, 0x856530D8, 0xF262004E, 0x6C0695ED, 0x1B01A57B, 0x8208F4C1, 0xF50FC457, 0x65B0D9C6, 0x12B7E950, 0x8BBEB8EA, 0xFCB9887C, 0x62DD1DDF, 0x15DA2D49, 0x8CD37CF3, 0xFBD44C65, 0x4DB26158, 0x3AB551CE, 0xA3BC0074, 0xD4BB30E2, 0x4ADFA541, 0x3DD895D7, 0xA4D1C46D, 0xD3D6F4FB, 0x4369E96A, 0x346ED9FC, 0xAD678846, 0xDA60B8D0, 0x44042D73, 0x33031DE5, 0xAA0A4C5F, 0xDD0D7CC9, 0x5005713C, 0x270241AA, 0xBE0B1010, 0xC90C2086, 0x5768B525, 0x206F85B3, 0xB966D409, 0xCE61E49F, 0x5EDEF90E, 0x29D9C998, 0xB0D09822, 0xC7D7A8B4, 0x59B33D17, 0x2EB40D81, 0xB7BD5C3B, 0xC0BA6CAD,
0xEDB88320, 0x9ABFB3B6, 0x03B6E20C, 0x74B1D29A, 0xEAD54739, 0x9DD277AF, 0x04DB2615, 0x73DC1683, 0xE3630B12, 0x94643B84, 0x0D6D6A3E, 0x7A6A5AA8, 0xE40ECF0B, 0x9309FF9D, 0x0A00AE27, 0x7D079EB1, 0xF00F9344, 0x8708A3D2, 0x1E01F268, 0x6906C2FE, 0xF762575D, 0x806567CB, 0x196C3671, 0x6E6B06E7, 0xFED41B76, 0x89D32BE0, 0x10DA7A5A, 0x67DD4ACC, 0xF9B9DF6F, 0x8EBEEFF9, 0x17B7BE43, 0x60B08ED5, 0xD6D6A3E8, 0xA1D1937E, 0x38D8C2C4, 0x4FDFF252, 0xD1BB67F1, 0xA6BC5767, 0x3FB506DD, 0x48B2364B, 0xD80D2BDA, 0xAF0A1B4C, 0x36034AF6, 0x41047A60, 0xDF60EFC3, 0xA867DF55, 0x316E8EEF, 0x4669BE79, 0xCB61B38C, 0xBC66831A, 0x256FD2A0, 0x5268E236, 0xCC0C7795, 0xBB0B4703, 0x220216B9, 0x5505262F, 0xC5BA3BBE, 0xB2BD0B28, 0x2BB45A92, 0x5CB36A04, 0xC2D7FFA7, 0xB5D0CF31, 0x2CD99E8B, 0x5BDEAE1D,
0x9B64C2B0, 0xEC63F226, 0x756AA39C, 0x026D930A, 0x9C0906A9, 0xEB0E363F, 0x72076785, 0x05005713, 0x95BF4A82, 0xE2B87A14, 0x7BB12BAE, 0x0CB61B38, 0x92D28E9B, 0xE5D5BE0D, 0x7CDCEFB7, 0x0BDBDF21, 0x86D3D2D4, 0xF1D4E242, 0x68DDB3F8, 0x1FDA836E, 0x81BE16CD, 0xF6B9265B, 0x6FB077E1, 0x18B74777, 0x88085AE6, 0xFF0F6A70, 0x66063BCA, 0x11010B5C, 0x8F659EFF, 0xF862AE69, 0x616BFFD3, 0x166CCF45, 0xA00AE278, 0xD70DD2EE, 0x4E048354, 0x3903B3C2, 0xA7672661, 0xD06016F7, 0x4969474D, 0x3E6E77DB, 0xAED16A4A, 0xD9D65ADC, 0x40DF0B66, 0x37D83BF0, 0xA9BCAE53, 0xDEBB9EC5, 0x47B2CF7F, 0x30B5FFE9, 0xBDBDF21C, 0xCABAC28A, 0x53B39330, 0x24B4A3A6, 0xBAD03605, 0xCDD70693, 0x54DE5729, 0x23D967BF, 0xB3667A2E, 0xC4614AB8, 0x5D681B02, 0x2A6F2B94, 0xB40BBE37, 0xC30C8EA1, 0x5A05DF1B, 0x2D02EF8D
};
// ReSharper disable InconsistentNaming
// Chunk types
private static readonly byte[] IHDR = { 73, 72, 68, 82 };
private static readonly byte[] IDAT = { 73, 68, 65, 84 };
private static readonly byte[] IEND = { 73, 69, 78, 68 };
private static readonly byte[] PLTE = { 80, 76, 84, 69 };
private static readonly byte[] tRNS = { 116, 82, 78, 83 };
// ReSharper enable InconsistentNaming
public enum ColorType : byte
{
Greyscale = 0,
Indexed = 3
}
private MemoryStream stream = new MemoryStream();
public void Dispose()
{
this.stream?.Dispose();
this.stream = null;
}
public byte[] GetBytes()
{
var bytes = this.stream.ToArray();
// Enumerate chunks in file and insert their CRC32 checksums.
var chunkOffset = PngSignature.Length;
while (chunkOffset < bytes.Length)
{
// Read length field.
var dataLength = (bytes[chunkOffset] << 24) | (bytes[chunkOffset + 1] << 16) | (bytes[chunkOffset + 2] << 8) | bytes[chunkOffset + 3];
// CRC is computed from type and data fields.
var crc = Crc32(bytes, chunkOffset + 4, dataLength + 4);
// Write CRC to end of chunk.
var crcOffset = chunkOffset + 8 + dataLength;
bytes[crcOffset + 0] = (byte)(crc >> 24);
bytes[crcOffset + 1] = (byte)(crc >> 16);
bytes[crcOffset + 2] = (byte)(crc >> 8);
bytes[crcOffset + 3] = (byte)crc;
// Seek to next chunk.
chunkOffset = crcOffset + 4;
}
return bytes;
}
/// <summary>
/// Writes the IHDR chunk. This must be the first chunk in the file.
/// </summary>
public void WriteHeader(int width, int height, byte bitDepth, ColorType colorType)
{
this.stream.Write(PngSignature, 0, PngSignature.Length);
this.WriteChunkStart(IHDR, 13);
// Size.
this.WriteIntBigEndian((uint)width);
this.WriteIntBigEndian((uint)height);
// Color.
this.stream.WriteByte(bitDepth);
this.stream.WriteByte((byte)colorType);
// Constants.
this.stream.WriteByte(0);
this.stream.WriteByte(0);
this.stream.WriteByte(0);
this.WriteChunkEnd();
}
/// <summary>
/// Writes the PLTE chunk, and also the tRNS chunk if necessary. Must come before the IDAT chunk.
/// </summary>
public void WritePalette(params byte[][] rgbaColors)
{
const int Red = 0, Green = 1, Blue = 2, Alpha = 3;
const byte Opaque = 255;
var hasAlpha = false;
this.WriteChunkStart(PLTE, 3 * rgbaColors.Length);
foreach (var color in rgbaColors)
{
hasAlpha |= color.Length > Alpha && color[Alpha] < Opaque;
this.stream.WriteByte(color[Red]);
this.stream.WriteByte(color[Green]);
this.stream.WriteByte(color[Blue]);
}
this.WriteChunkEnd();
if (!hasAlpha)
{
return;
}
this.WriteChunkStart(tRNS, rgbaColors.Length);
foreach (var color in rgbaColors)
{
this.stream.WriteByte(color.Length > Alpha ? color[Alpha] : Opaque);
}
this.WriteChunkEnd();
}
/// <summary>
/// Writes the IDAT chunk with the actual picture.
/// </summary>
public void WriteScanlines(byte[] scanlines)
{
using (var idatStream = new MemoryStream())
{
Deflate(idatStream, scanlines);
this.WriteChunkStart(IDAT, (int)(idatStream.Length + 6));
// Deflate header.
this.stream.WriteByte(0x78); // 8 Deflate algorithm, 7 max window size
this.stream.WriteByte(0x9C); // Check bits.
// Compressed data.
idatStream.Position = 0;
#if NET35
idatStream.WriteTo(this.stream);
#else
idatStream.CopyTo(this.stream);
#endif
// Deflate checksum.
var adler = Adler32(scanlines, 0, scanlines.Length);
this.WriteIntBigEndian(adler);
this.WriteChunkEnd();
}
}
/// <summary>
/// Writes the IEND chunk. This must be the last chunk in the file.
/// </summary>
public void WriteEnd()
{
this.WriteChunkStart(IEND, 0);
this.WriteChunkEnd();
}
private void WriteChunkStart(byte[] type, int length)
{
this.WriteIntBigEndian((uint)length);
this.stream.Write(type, 0, 4);
}
private void WriteChunkEnd()
{
// Reserves 4 bytes space for crc32 so GetBytes can add it later.
this.stream.SetLength(this.stream.Length + 4);
this.stream.Position += 4;
}
private void WriteIntBigEndian(uint value)
{
this.stream.WriteByte((byte)(value >> 24));
this.stream.WriteByte((byte)(value >> 16));
this.stream.WriteByte((byte)(value >> 8));
this.stream.WriteByte((byte)value);
}
private static void Deflate(Stream output, byte[] bytes)
{
using (var deflateStream = new DeflateStream(output, CompressionMode.Compress, leaveOpen: true))
{
deflateStream.Write(bytes, 0, bytes.Length);
}
}
// Reference implementation from RFC 1950. Not optimized.
private static uint Adler32(byte[] data, int index, int length)
{
const uint Base = 65521;
uint s1 = 1, s2 = 0;
var end = index + length;
for (var n = index; n < end; n++)
{
s1 = (s1 + data[n]) % Base;
s2 = (s2 + s1) % Base;
}
return (s2 << 16) + s1;
}
// Reference implementation from REC-PNG-20031110. Not optimized.
private static uint Crc32(byte[] data, int index, int length)
{
var c = 0xffffffff;
var end = index + length;
for (var n = index; n < end; n++)
{
c = CrcTable[(c ^ data[n]) & 0xff] ^ (c >> 8);
}
return c ^ 0xffffffff;
}
}
}
public static class PngByteQRCodeHelper
{
public static byte[] GetQRCode(string plainText, int pixelsPerModule, byte[] darkColorRgba, byte[] lightColorRgba, ECCLevel eccLevel, bool forceUtf8 = false, bool utf8BOM = false, EciMode eciMode = EciMode.Default, int requestedVersion = -1, bool drawQuietZones = true)
{
using (var qrGenerator = new QRCodeGenerator())
using (var qrCodeData = qrGenerator.CreateQrCode(plainText, eccLevel, forceUtf8, utf8BOM, eciMode, requestedVersion))
using (var qrCode = new PngByteQRCode(qrCodeData))
return qrCode.GetGraphic(pixelsPerModule, darkColorRgba, lightColorRgba, drawQuietZones);
}
public static byte[] GetQRCode(string txt, QRCodeGenerator.ECCLevel eccLevel, int size, bool drawQuietZones = true)
{
using (var qrGen = new QRCodeGenerator())
using (var qrCode = qrGen.CreateQrCode(txt, eccLevel))
using (var qrPng = new PngByteQRCode(qrCode))
return qrPng.GetGraphic(size, drawQuietZones);
}
}
}

View File

@@ -0,0 +1,161 @@
#if NETFRAMEWORK || NETSTANDARD2_0 || NET5_0 || NET6_0_WINDOWS
using System;
using System.Drawing;
using static QRCoder.QRCodeGenerator;
namespace QRCoder
{
#if NET6_0_WINDOWS
[System.Runtime.Versioning.SupportedOSPlatform("windows")]
#endif
public class PostscriptQRCode : AbstractQRCode, IDisposable
{
/// <summary>
/// Constructor without params to be used in COM Objects connections
/// </summary>
public PostscriptQRCode() { }
public PostscriptQRCode(QRCodeData data) : base(data) { }
public string GetGraphic(int pointsPerModule, bool epsFormat = false)
{
var viewBox = new Size(pointsPerModule * this.QrCodeData.ModuleMatrix.Count, pointsPerModule * this.QrCodeData.ModuleMatrix.Count);
return this.GetGraphic(viewBox, Color.Black, Color.White, true, epsFormat);
}
public string GetGraphic(int pointsPerModule, Color darkColor, Color lightColor, bool drawQuietZones = true, bool epsFormat = false)
{
var viewBox = new Size(pointsPerModule * this.QrCodeData.ModuleMatrix.Count, pointsPerModule * this.QrCodeData.ModuleMatrix.Count);
return this.GetGraphic(viewBox, darkColor, lightColor, drawQuietZones, epsFormat);
}
public string GetGraphic(int pointsPerModule, string darkColorHex, string lightColorHex, bool drawQuietZones = true, bool epsFormat = false)
{
var viewBox = new Size(pointsPerModule * this.QrCodeData.ModuleMatrix.Count, pointsPerModule * this.QrCodeData.ModuleMatrix.Count);
return this.GetGraphic(viewBox, darkColorHex, lightColorHex, drawQuietZones, epsFormat);
}
public string GetGraphic(Size viewBox, bool drawQuietZones = true, bool epsFormat = false)
{
return this.GetGraphic(viewBox, Color.Black, Color.White, drawQuietZones, epsFormat);
}
public string GetGraphic(Size viewBox, string darkColorHex, string lightColorHex, bool drawQuietZones = true, bool epsFormat = false)
{
return this.GetGraphic(viewBox, ColorTranslator.FromHtml(darkColorHex), ColorTranslator.FromHtml(lightColorHex), drawQuietZones, epsFormat);
}
public string GetGraphic(Size viewBox, Color darkColor, Color lightColor, bool drawQuietZones = true, bool epsFormat = false)
{
var offset = drawQuietZones ? 0 : 4;
var drawableModulesCount = this.QrCodeData.ModuleMatrix.Count - (drawQuietZones ? 0 : offset * 2);
var pointsPerModule = (double)Math.Min(viewBox.Width, viewBox.Height) / (double)drawableModulesCount;
string psFile = string.Format(psHeader, new object[] {
DateTime.Now.ToString("s"), CleanSvgVal(viewBox.Width), CleanSvgVal(pointsPerModule),
epsFormat ? "EPSF-3.0" : string.Empty
});
psFile += string.Format(psFunctions, new object[] {
CleanSvgVal(darkColor.R /255.0), CleanSvgVal(darkColor.G /255.0), CleanSvgVal(darkColor.B /255.0),
CleanSvgVal(lightColor.R /255.0), CleanSvgVal(lightColor.G /255.0), CleanSvgVal(lightColor.B /255.0),
drawableModulesCount
});
for (int xi = offset; xi < offset + drawableModulesCount; xi++)
{
if (xi > offset)
psFile += "nl\n";
for (int yi = offset; yi < offset + drawableModulesCount; yi++)
{
psFile += (this.QrCodeData.ModuleMatrix[xi][yi] ? "f " : "b ");
}
psFile += "\n";
}
return psFile + psFooter;
}
private string CleanSvgVal(double input)
{
//Clean double values for international use/formats
return input.ToString(System.Globalization.CultureInfo.InvariantCulture);
}
private const string psHeader = @"%!PS-Adobe-3.0 {3}
%%Creator: QRCoder.NET
%%Title: QRCode
%%CreationDate: {0}
%%DocumentData: Clean7Bit
%%Origin: 0
%%DocumentMedia: Default {1} {1} 0 () ()
%%BoundingBox: 0 0 {1} {1}
%%LanguageLevel: 2
%%Pages: 1
%%Page: 1 1
%%EndComments
%%BeginConstants
/sz {1} def
/sc {2} def
%%EndConstants
%%BeginFeature: *PageSize Default
<< /PageSize [ sz sz ] /ImagingBBox null >> setpagedevice
%%EndFeature
";
private const string psFunctions = @"%%BeginFunctions
/csquare {{
newpath
0 0 moveto
0 1 rlineto
1 0 rlineto
0 -1 rlineto
closepath
setrgbcolor
fill
}} def
/f {{
{0} {1} {2} csquare
1 0 translate
}} def
/b {{
1 0 translate
}} def
/background {{
{3} {4} {5} csquare
}} def
/nl {{
-{6} -1 translate
}} def
%%EndFunctions
%%BeginBody
0 0 moveto
gsave
sz sz scale
background
grestore
gsave
sc sc scale
0 {6} 1 sub translate
";
private const string psFooter = @"%%EndBody
grestore
showpage
%%EOF
";
}
#if NET6_0_WINDOWS
[System.Runtime.Versioning.SupportedOSPlatform("windows")]
#endif
public static class PostscriptQRCodeHelper
{
public static string GetQRCode(string plainText, int pointsPerModule, string darkColorHex, string lightColorHex, ECCLevel eccLevel, bool forceUtf8 = false, bool utf8BOM = false, EciMode eciMode = EciMode.Default, int requestedVersion = -1, bool drawQuietZones = true, bool epsFormat = false)
{
using (var qrGenerator = new QRCodeGenerator())
using (var qrCodeData = qrGenerator.CreateQrCode(plainText, eccLevel, forceUtf8, utf8BOM, eciMode, requestedVersion))
using (var qrCode = new PostscriptQRCode(qrCodeData))
return qrCode.GetGraphic(pointsPerModule, darkColorHex, lightColorHex, drawQuietZones, epsFormat);
}
}
}
#endif

View File

@@ -0,0 +1,138 @@
using System;
using System.Drawing;
using System.Drawing.Drawing2D;
using static QRCoder.QRCodeGenerator;
namespace QRCoder
{
public class QRCode : AbstractQRCode, IDisposable
{
/// <summary>
/// Constructor without params to be used in COM Objects connections
/// </summary>
public QRCode() { }
public QRCode(QRCodeData data) : base(data) {}
public Bitmap GetGraphic(int pixelsPerModule)
{
return this.GetGraphic(pixelsPerModule, Color.Black, Color.White, true);
}
public Bitmap GetGraphic(int pixelsPerModule, string darkColorHtmlHex, string lightColorHtmlHex, bool drawQuietZones = true)
{
return this.GetGraphic(pixelsPerModule, ColorTranslator.FromHtml(darkColorHtmlHex), ColorTranslator.FromHtml(lightColorHtmlHex), drawQuietZones);
}
public Bitmap GetGraphic(int pixelsPerModule, Color darkColor, Color lightColor, bool drawQuietZones = true)
{
var size = (this.QrCodeData.ModuleMatrix.Count - (drawQuietZones ? 0 : 8)) * pixelsPerModule;
var offset = drawQuietZones ? 0 : 4 * pixelsPerModule;
var bmp = new Bitmap(size, size);
using (var gfx = Graphics.FromImage(bmp))
using (var lightBrush = new SolidBrush(lightColor))
using (var darkBrush = new SolidBrush(darkColor))
{
for (var x = 0; x < size + offset; x = x + pixelsPerModule)
{
for (var y = 0; y < size + offset; y = y + pixelsPerModule)
{
var module = this.QrCodeData.ModuleMatrix[(y + pixelsPerModule) / pixelsPerModule - 1][(x + pixelsPerModule) / pixelsPerModule - 1];
if (module)
{
gfx.FillRectangle(darkBrush, new Rectangle(x - offset, y - offset, pixelsPerModule, pixelsPerModule));
}
else
{
gfx.FillRectangle(lightBrush, new Rectangle(x - offset, y - offset, pixelsPerModule, pixelsPerModule));
}
}
}
gfx.Save();
}
return bmp;
}
public Bitmap GetGraphic(int pixelsPerModule, Color darkColor, Color lightColor, Bitmap icon=null, int iconSizePercent=15, int iconBorderWidth = 0, bool drawQuietZones = true, Color? iconBackgroundColor = null)
{
var size = (this.QrCodeData.ModuleMatrix.Count - (drawQuietZones ? 0 : 8)) * pixelsPerModule;
var offset = drawQuietZones ? 0 : 4 * pixelsPerModule;
var bmp = new Bitmap(size, size, System.Drawing.Imaging.PixelFormat.Format32bppArgb);
using (var gfx = Graphics.FromImage(bmp))
using (var lightBrush = new SolidBrush(lightColor))
using (var darkBrush = new SolidBrush(darkColor))
{
gfx.InterpolationMode = InterpolationMode.HighQualityBicubic;
gfx.CompositingQuality = CompositingQuality.HighQuality;
gfx.Clear(lightColor);
var drawIconFlag = icon != null && iconSizePercent > 0 && iconSizePercent <= 100;
for (var x = 0; x < size + offset; x = x + pixelsPerModule)
{
for (var y = 0; y < size + offset; y = y + pixelsPerModule)
{
var moduleBrush = this.QrCodeData.ModuleMatrix[(y + pixelsPerModule) / pixelsPerModule - 1][(x + pixelsPerModule) / pixelsPerModule - 1] ? darkBrush : lightBrush;
gfx.FillRectangle(moduleBrush , new Rectangle(x - offset, y - offset, pixelsPerModule, pixelsPerModule));
}
}
if (drawIconFlag)
{
float iconDestWidth = iconSizePercent * bmp.Width / 100f;
float iconDestHeight = drawIconFlag ? iconDestWidth * icon.Height / icon.Width : 0;
float iconX = (bmp.Width - iconDestWidth) / 2;
float iconY = (bmp.Height - iconDestHeight) / 2;
var centerDest = new RectangleF(iconX - iconBorderWidth, iconY - iconBorderWidth, iconDestWidth + iconBorderWidth * 2, iconDestHeight + iconBorderWidth * 2);
var iconDestRect = new RectangleF(iconX, iconY, iconDestWidth, iconDestHeight);
var iconBgBrush = iconBackgroundColor != null ? new SolidBrush((Color)iconBackgroundColor) : lightBrush;
//Only render icon/logo background, if iconBorderWith is set > 0
if (iconBorderWidth > 0)
{
using (GraphicsPath iconPath = CreateRoundedRectanglePath(centerDest, iconBorderWidth * 2))
{
gfx.FillPath(iconBgBrush, iconPath);
}
}
gfx.DrawImage(icon, iconDestRect, new RectangleF(0, 0, icon.Width, icon.Height), GraphicsUnit.Pixel);
}
gfx.Save();
}
return bmp;
}
internal GraphicsPath CreateRoundedRectanglePath(RectangleF rect, int cornerRadius)
{
var roundedRect = new GraphicsPath();
roundedRect.AddArc(rect.X, rect.Y, cornerRadius * 2, cornerRadius * 2, 180, 90);
roundedRect.AddLine(rect.X + cornerRadius, rect.Y, rect.Right - cornerRadius * 2, rect.Y);
roundedRect.AddArc(rect.X + rect.Width - cornerRadius * 2, rect.Y, cornerRadius * 2, cornerRadius * 2, 270, 90);
roundedRect.AddLine(rect.Right, rect.Y + cornerRadius * 2, rect.Right, rect.Y + rect.Height - cornerRadius * 2);
roundedRect.AddArc(rect.X + rect.Width - cornerRadius * 2, rect.Y + rect.Height - cornerRadius * 2, cornerRadius * 2, cornerRadius * 2, 0, 90);
roundedRect.AddLine(rect.Right - cornerRadius * 2, rect.Bottom, rect.X + cornerRadius * 2, rect.Bottom);
roundedRect.AddArc(rect.X, rect.Bottom - cornerRadius * 2, cornerRadius * 2, cornerRadius * 2, 90, 90);
roundedRect.AddLine(rect.X, rect.Bottom - cornerRadius * 2, rect.X, rect.Y + cornerRadius * 2);
roundedRect.CloseFigure();
return roundedRect;
}
}
public static class QRCodeHelper
{
public static Bitmap GetQRCode(string plainText, int pixelsPerModule, Color darkColor, Color lightColor, ECCLevel eccLevel, bool forceUtf8 = false, bool utf8BOM = false, EciMode eciMode = EciMode.Default, int requestedVersion = -1, Bitmap icon = null, int iconSizePercent = 15, int iconBorderWidth = 0, bool drawQuietZones = true)
{
using (var qrGenerator = new QRCodeGenerator())
using (var qrCodeData = qrGenerator.CreateQrCode(plainText, eccLevel, forceUtf8, utf8BOM, eciMode, requestedVersion))
using (var qrCode = new QRCode(qrCodeData))
return qrCode.GetGraphic(pixelsPerModule, darkColor, lightColor, icon, iconSizePercent, iconBorderWidth, drawQuietZones);
}
}
}

View File

@@ -0,0 +1,185 @@
using System.Collections;
using System.Collections.Generic;
using System.Linq;
namespace QRCoder
{
using QRCoder.Framework4._0Methods;
using System;
using System.IO;
using System.IO.Compression;
public class QRCodeData : IDisposable
{
public List<BitArray> ModuleMatrix { get; set; }
public QRCodeData(int version)
{
this.Version = version;
var size = ModulesPerSideFromVersion(version);
this.ModuleMatrix = new List<BitArray>();
for (var i = 0; i < size; i++)
this.ModuleMatrix.Add(new BitArray(size));
}
#if NETFRAMEWORK || NETSTANDARD2_0 || NET5_0
public QRCodeData(string pathToRawData, Compression compressMode) : this(File.ReadAllBytes(pathToRawData), compressMode)
{
}
#endif
public QRCodeData(byte[] rawData, Compression compressMode)
{
var bytes = new List<byte>(rawData);
//Decompress
if (compressMode == Compression.Deflate)
{
using (var input = new MemoryStream(bytes.ToArray()))
{
using (var output = new MemoryStream())
{
using (var dstream = new DeflateStream(input, CompressionMode.Decompress))
{
Stream4Methods.CopyTo(dstream, output);
}
bytes = new List<byte>(output.ToArray());
}
}
}
else if (compressMode == Compression.GZip)
{
using (var input = new MemoryStream(bytes.ToArray()))
{
using (var output = new MemoryStream())
{
using (var dstream = new GZipStream(input, CompressionMode.Decompress))
{
Stream4Methods.CopyTo(dstream, output);
}
bytes = new List<byte>(output.ToArray());
}
}
}
if (bytes[0] != 0x51 || bytes[1] != 0x52 || bytes[2] != 0x52)
throw new Exception("Invalid raw data file. Filetype doesn't match \"QRR\".");
//Set QR code version
var sideLen = (int)bytes[4];
bytes.RemoveRange(0, 5);
this.Version = (sideLen - 21 - 8) / 4 + 1;
//Unpack
var modules = new Queue<bool>(8 * bytes.Count);
foreach (var b in bytes)
{
var bArr = new BitArray(new byte[] { b });
for (int i = 7; i >= 0; i--)
{
modules.Enqueue((b & (1 << i)) != 0);
}
}
//Build module matrix
this.ModuleMatrix = new List<BitArray>(sideLen);
for (int y = 0; y < sideLen; y++)
{
this.ModuleMatrix.Add(new BitArray(sideLen));
for (int x = 0; x < sideLen; x++)
{
this.ModuleMatrix[y][x] = modules.Dequeue();
}
}
}
public byte[] GetRawData(Compression compressMode)
{
var bytes = new List<byte>();
//Add header - signature ("QRR")
bytes.AddRange(new byte[]{ 0x51, 0x52, 0x52, 0x00 });
//Add header - rowsize
bytes.Add((byte)ModuleMatrix.Count);
//Build data queue
var dataQueue = new Queue<int>();
foreach (var row in ModuleMatrix)
{
foreach (var module in row)
{
dataQueue.Enqueue((bool)module ? 1 : 0);
}
}
for (int i = 0; i < 8 - (ModuleMatrix.Count * ModuleMatrix.Count) % 8; i++)
{
dataQueue.Enqueue(0);
}
//Process queue
while (dataQueue.Count > 0)
{
byte b = 0;
for (int i = 7; i >= 0; i--)
{
b += (byte)(dataQueue.Dequeue() << i);
}
bytes.Add(b);
}
var rawData = bytes.ToArray();
//Compress stream (optional)
if (compressMode == Compression.Deflate)
{
using (var output = new MemoryStream())
{
using (var dstream = new DeflateStream(output, CompressionMode.Compress))
{
dstream.Write(rawData, 0, rawData.Length);
}
rawData = output.ToArray();
}
}
else if (compressMode == Compression.GZip)
{
using (var output = new MemoryStream())
{
using (GZipStream gzipStream = new GZipStream(output, CompressionMode.Compress, true))
{
gzipStream.Write(rawData, 0, rawData.Length);
}
rawData = output.ToArray();
}
}
return rawData;
}
#if NETFRAMEWORK || NETSTANDARD2_0 || NET5_0
public void SaveRawData(string filePath, Compression compressMode)
{
File.WriteAllBytes(filePath, GetRawData(compressMode));
}
#endif
public int Version { get; private set; }
private static int ModulesPerSideFromVersion(int version)
{
return 21 + (version - 1) * 4;
}
public void Dispose()
{
this.ModuleMatrix = null;
this.Version = 0;
}
public enum Compression
{
Uncompressed,
Deflate,
GZip
}
}
}

File diff suppressed because it is too large Load Diff

View File

@@ -0,0 +1,391 @@
using QRCoder.Extensions;
using System;
using System.Collections;
using System.Collections.Generic;
using System.Drawing;
using System.Text;
using System.Text.RegularExpressions;
using static QRCoder.QRCodeGenerator;
using static QRCoder.SvgQRCode;
namespace QRCoder
{
public class SvgQRCode : AbstractQRCode, IDisposable
{
/// <summary>
/// Constructor without params to be used in COM Objects connections
/// </summary>
public SvgQRCode() { }
public SvgQRCode(QRCodeData data) : base(data) { }
/// <summary>
/// Returns a QR code as SVG string
/// </summary>
/// <param name="pixelsPerModule">The pixel size each b/w module is drawn</param>
/// <returns>SVG as string</returns>
public string GetGraphic(int pixelsPerModule)
{
var viewBox = new Size(pixelsPerModule*this.QrCodeData.ModuleMatrix.Count, pixelsPerModule * this.QrCodeData.ModuleMatrix.Count);
return this.GetGraphic(viewBox, Color.Black, Color.White);
}
/// <summary>
/// Returns a QR code as SVG string with custom colors, optional quietzone and logo
/// </summary>
/// <param name="pixelsPerModule">The pixel size each b/w module is drawn</param>
/// <param name="darkColor">Color of the dark modules</param>
/// <param name="lightColor">Color of the light modules</param>
/// <param name="drawQuietZones">If true a white border is drawn around the whole QR Code</param>
/// <param name="sizingMode">Defines if width/height or viewbox should be used for size definition</param>
/// <param name="logo">A (optional) logo to be rendered on the code (either Bitmap or SVG)</param>
/// <returns>SVG as string</returns>
public string GetGraphic(int pixelsPerModule, Color darkColor, Color lightColor, bool drawQuietZones = true, SizingMode sizingMode = SizingMode.WidthHeightAttribute, SvgLogo logo = null)
{
var offset = drawQuietZones ? 0 : 4;
var edgeSize = this.QrCodeData.ModuleMatrix.Count * pixelsPerModule - (offset * 2 * pixelsPerModule);
var viewBox = new Size(edgeSize, edgeSize);
return this.GetGraphic(viewBox, darkColor, lightColor, drawQuietZones, sizingMode, logo);
}
/// <summary>
/// Returns a QR code as SVG string with custom colors (in HEX syntax), optional quietzone and logo
/// </summary>
/// <param name="pixelsPerModule">The pixel size each b/w module is drawn</param>
/// <param name="darkColorHex">The color of the dark/black modules in hex (e.g. #000000) representation</param>
/// <param name="lightColorHex">The color of the light/white modules in hex (e.g. #ffffff) representation</param>
/// <param name="drawQuietZones">If true a white border is drawn around the whole QR Code</param>
/// <param name="sizingMode">Defines if width/height or viewbox should be used for size definition</param>
/// <param name="logo">A (optional) logo to be rendered on the code (either Bitmap or SVG)</param>
/// <returns>SVG as string</returns>
public string GetGraphic(int pixelsPerModule, string darkColorHex, string lightColorHex, bool drawQuietZones = true, SizingMode sizingMode = SizingMode.WidthHeightAttribute, SvgLogo logo = null)
{
var offset = drawQuietZones ? 0 : 4;
var edgeSize = this.QrCodeData.ModuleMatrix.Count * pixelsPerModule - (offset * 2 * pixelsPerModule);
var viewBox = new Size(edgeSize, edgeSize);
return this.GetGraphic(viewBox, darkColorHex, lightColorHex, drawQuietZones, sizingMode, logo);
}
/// <summary>
/// Returns a QR code as SVG string with optional quietzone and logo
/// </summary>
/// <param name="viewBox">The viewbox of the QR code graphic</param>
/// <param name="drawQuietZones">If true a white border is drawn around the whole QR Code</param>
/// <param name="sizingMode">Defines if width/height or viewbox should be used for size definition</param>
/// <param name="logo">A (optional) logo to be rendered on the code (either Bitmap or SVG)</param>
/// <returns>SVG as string</returns>
public string GetGraphic(Size viewBox, bool drawQuietZones = true, SizingMode sizingMode = SizingMode.WidthHeightAttribute, SvgLogo logo = null)
{
return this.GetGraphic(viewBox, Color.Black, Color.White, drawQuietZones, sizingMode, logo);
}
/// <summary>
/// Returns a QR code as SVG string with custom colors and optional quietzone and logo
/// </summary>
/// <param name="viewBox">The viewbox of the QR code graphic</param>
/// <param name="darkColor">Color of the dark modules</param>
/// <param name="lightColor">Color of the light modules</param>
/// <param name="drawQuietZones">If true a white border is drawn around the whole QR Code</param>
/// <param name="sizingMode">Defines if width/height or viewbox should be used for size definition</param>
/// <param name="logo">A (optional) logo to be rendered on the code (either Bitmap or SVG)</param>
/// <returns>SVG as string</returns>
public string GetGraphic(Size viewBox, Color darkColor, Color lightColor, bool drawQuietZones = true, SizingMode sizingMode = SizingMode.WidthHeightAttribute, SvgLogo logo = null)
{
return this.GetGraphic(viewBox, ColorTranslator.ToHtml(Color.FromArgb(darkColor.ToArgb())), ColorTranslator.ToHtml(Color.FromArgb(lightColor.ToArgb())), drawQuietZones, sizingMode, logo);
}
/// <summary>
/// Returns a QR code as SVG string with custom colors (in HEX syntax), optional quietzone and logo
/// </summary>
/// <param name="viewBox">The viewbox of the QR code graphic</param>
/// <param name="darkColorHex">The color of the dark/black modules in hex (e.g. #000000) representation</param>
/// <param name="lightColorHex">The color of the light/white modules in hex (e.g. #ffffff) representation</param>
/// <param name="drawQuietZones">If true a white border is drawn around the whole QR Code</param>
/// <param name="sizingMode">Defines if width/height or viewbox should be used for size definition</param>
/// <param name="logo">A (optional) logo to be rendered on the code (either Bitmap or SVG)</param>
/// <returns>SVG as string</returns>
public string GetGraphic(Size viewBox, string darkColorHex, string lightColorHex, bool drawQuietZones = true, SizingMode sizingMode = SizingMode.WidthHeightAttribute, SvgLogo logo = null)
{
int offset = drawQuietZones ? 0 : 4;
int drawableModulesCount = this.QrCodeData.ModuleMatrix.Count - (drawQuietZones ? 0 : offset * 2);
double pixelsPerModule = Math.Min(viewBox.Width, viewBox.Height) / (double)drawableModulesCount;
double qrSize = drawableModulesCount * pixelsPerModule;
string svgSizeAttributes = (sizingMode == SizingMode.WidthHeightAttribute) ? $@"width=""{viewBox.Width}"" height=""{viewBox.Height}""" : $@"viewBox=""0 0 {viewBox.Width} {viewBox.Height}""";
ImageAttributes? logoAttr = null;
if (logo != null)
logoAttr = GetLogoAttributes(logo, viewBox);
// Merge horizontal rectangles
int[,] matrix = new int[drawableModulesCount, drawableModulesCount];
for (int yi = 0; yi < drawableModulesCount; yi += 1)
{
BitArray bitArray = this.QrCodeData.ModuleMatrix[yi+offset];
int x0 = -1;
int xL = 0;
for (int xi = 0; xi < drawableModulesCount; xi += 1)
{
matrix[yi, xi] = 0;
if (bitArray[xi+offset] && (logo == null || !logo.FillLogoBackground() || !IsBlockedByLogo((xi+offset)*pixelsPerModule, (yi+offset) * pixelsPerModule, logoAttr, pixelsPerModule)))
{
if(x0 == -1)
{
x0 = xi;
}
xL += 1;
}
else
{
if(xL > 0)
{
matrix[yi, x0] = xL;
x0 = -1;
xL = 0;
}
}
}
if (xL > 0)
{
matrix[yi, x0] = xL;
}
}
StringBuilder svgFile = new StringBuilder($@"<svg version=""1.1"" baseProfile=""full"" shape-rendering=""crispEdges"" {svgSizeAttributes} xmlns=""http://www.w3.org/2000/svg"" xmlns:xlink=""http://www.w3.org/1999/xlink"">");
svgFile.AppendLine($@"<rect x=""0"" y=""0"" width=""{CleanSvgVal(qrSize)}"" height=""{CleanSvgVal(qrSize)}"" fill=""{lightColorHex}"" />");
for (int yi = 0; yi < drawableModulesCount; yi += 1)
{
double y = yi * pixelsPerModule;
for (int xi = 0; xi < drawableModulesCount; xi += 1)
{
int xL = matrix[yi, xi];
if(xL > 0)
{
// Merge vertical rectangles
int yL = 1;
for (int y2 = yi + 1; y2 < drawableModulesCount; y2 += 1)
{
if(matrix[y2, xi] == xL)
{
matrix[y2, xi] = 0;
yL += 1;
}
else
{
break;
}
}
// Output SVG rectangles
double x = xi * pixelsPerModule;
if (logo == null || !logo.FillLogoBackground() || !IsBlockedByLogo(x, y, logoAttr, pixelsPerModule))
svgFile.AppendLine($@"<rect x=""{CleanSvgVal(x)}"" y=""{CleanSvgVal(y)}"" width=""{CleanSvgVal(xL * pixelsPerModule)}"" height=""{CleanSvgVal(yL * pixelsPerModule)}"" fill=""{darkColorHex}"" />");
}
}
}
//Render logo, if set
if (logo != null)
{
if (!logo.IsEmbedded())
{
svgFile.AppendLine($@"<svg width=""100%"" height=""100%"" version=""1.1"" xmlns = ""http://www.w3.org/2000/svg"">");
svgFile.AppendLine($@"<image x=""{CleanSvgVal(logoAttr.Value.X)}"" y=""{CleanSvgVal(logoAttr.Value.Y)}"" width=""{CleanSvgVal(logoAttr.Value.Width)}"" height=""{CleanSvgVal(logoAttr.Value.Height)}"" xlink:href=""{logo.GetDataUri()}"" />");
svgFile.AppendLine(@"</svg>");
}
else
{
var rawLogo = (string)logo.GetRawLogo();
var svg = System.Xml.Linq.XDocument.Parse(rawLogo);
svg.Root.SetAttributeValue("x", CleanSvgVal(logoAttr.Value.X));
svg.Root.SetAttributeValue("y", CleanSvgVal(logoAttr.Value.Y));
svg.Root.SetAttributeValue("width", CleanSvgVal(logoAttr.Value.Width));
svg.Root.SetAttributeValue("height", CleanSvgVal(logoAttr.Value.Height));
svg.Root.SetAttributeValue("shape-rendering", "geometricPrecision");
svgFile.AppendLine(svg.ToString(System.Xml.Linq.SaveOptions.DisableFormatting).Replace("svg:", ""));
}
}
svgFile.Append(@"</svg>");
return svgFile.ToString();
}
private bool IsBlockedByLogo(double x, double y, ImageAttributes? attr, double pixelPerModule)
{
return x + pixelPerModule >= attr.Value.X && x <= attr.Value.X + attr.Value.Width && y + pixelPerModule >= attr.Value.Y && y <= attr.Value.Y + attr.Value.Height;
}
private ImageAttributes GetLogoAttributes(SvgLogo logo, Size viewBox)
{
var imgWidth = logo.GetIconSizePercent() / 100d * viewBox.Width;
var imgHeight = logo.GetIconSizePercent() / 100d * viewBox.Height;
var imgPosX = viewBox.Width / 2d - imgWidth / 2d;
var imgPosY = viewBox.Height / 2d - imgHeight / 2d;
return new ImageAttributes()
{
Width = imgWidth,
Height = imgHeight,
X = imgPosX,
Y = imgPosY
};
}
private struct ImageAttributes
{
public double Width;
public double Height;
public double X;
public double Y;
}
private string CleanSvgVal(double input)
{
//Clean double values for international use/formats
//We use explicitly "G15" to avoid differences between .NET full and Core platforms
//https://stackoverflow.com/questions/64898117/tostring-has-a-different-behavior-between-net-462-and-net-core-3-1
return input.ToString("G15", System.Globalization.CultureInfo.InvariantCulture);
}
/// <summary>
/// Mode of sizing attribution on svg root node
/// </summary>
public enum SizingMode
{
WidthHeightAttribute,
ViewBoxAttribute
}
/// <summary>
/// Represents a logo graphic that can be rendered on a SvgQRCode
/// </summary>
public class SvgLogo
{
private string _logoData;
private MediaType _mediaType;
private int _iconSizePercent;
private bool _fillLogoBackground;
private object _logoRaw;
private bool _isEmbedded;
/// <summary>
/// Create a logo object to be used in SvgQRCode renderer
/// </summary>
/// <param name="iconRasterized">Logo to be rendered as Bitmap/rasterized graphic</param>
/// <param name="iconSizePercent">Degree of percentage coverage of the QR code by the logo</param>
/// <param name="fillLogoBackground">If true, the background behind the logo will be cleaned</param>
public SvgLogo(Bitmap iconRasterized, int iconSizePercent = 15, bool fillLogoBackground = true)
{
_iconSizePercent = iconSizePercent;
using (var ms = new System.IO.MemoryStream())
{
using (var bitmap = new Bitmap(iconRasterized))
{
bitmap.Save(ms, System.Drawing.Imaging.ImageFormat.Png);
_logoData = Convert.ToBase64String(ms.GetBuffer(), Base64FormattingOptions.None);
}
}
_mediaType = MediaType.PNG;
_fillLogoBackground = fillLogoBackground;
_logoRaw = iconRasterized;
_isEmbedded = false;
}
/// <summary>
/// Create a logo object to be used in SvgQRCode renderer
/// </summary>
/// <param name="iconVectorized">Logo to be rendered as SVG/vectorized graphic/string</param>
/// <param name="iconSizePercent">Degree of percentage coverage of the QR code by the logo</param>
/// <param name="fillLogoBackground">If true, the background behind the logo will be cleaned</param>
/// <param name="iconEmbedded">If true, the logo will embedded as native svg instead of embedding it as image-tag</param>
public SvgLogo(string iconVectorized, int iconSizePercent = 15, bool fillLogoBackground = true, bool iconEmbedded = true)
{
_iconSizePercent = iconSizePercent;
_logoData = Convert.ToBase64String(Encoding.UTF8.GetBytes(iconVectorized), Base64FormattingOptions.None);
_mediaType = MediaType.SVG;
_fillLogoBackground = fillLogoBackground;
_logoRaw = iconVectorized;
_isEmbedded = iconEmbedded;
}
/// <summary>
/// Returns the raw logo's data
/// </summary>
/// <returns></returns>
public object GetRawLogo()
{
return _logoRaw;
}
/// <summary>
/// Defines, if the logo shall be natively embedded.
/// true=native svg embedding, false=embedding via image-tag
/// </summary>
/// <returns></returns>
public bool IsEmbedded()
{
return _isEmbedded;
}
/// <summary>
/// Returns the media type of the logo
/// </summary>
/// <returns></returns>
public MediaType GetMediaType()
{
return _mediaType;
}
/// <summary>
/// Returns the logo as data-uri
/// </summary>
/// <returns></returns>
public string GetDataUri()
{
return $"data:{_mediaType.GetStringValue()};base64,{_logoData}";
}
/// <summary>
/// Returns how much of the QR code should be covered by the logo (in percent)
/// </summary>
/// <returns></returns>
public int GetIconSizePercent()
{
return _iconSizePercent;
}
/// <summary>
/// Returns if the background of the logo should be cleaned (no QR modules will be rendered behind the logo)
/// </summary>
/// <returns></returns>
public bool FillLogoBackground()
{
return _fillLogoBackground;
}
/// <summary>
/// Media types for SvgLogos
/// </summary>
public enum MediaType : int
{
[StringValue("image/png")]
PNG = 0,
[StringValue("image/svg+xml")]
SVG = 1
}
}
}
public static class SvgQRCodeHelper
{
public static string GetQRCode(string plainText, int pixelsPerModule, string darkColorHex, string lightColorHex, ECCLevel eccLevel, bool forceUtf8 = false, bool utf8BOM = false, EciMode eciMode = EciMode.Default, int requestedVersion = -1, bool drawQuietZones = true, SizingMode sizingMode = SizingMode.WidthHeightAttribute, SvgLogo logo = null)
{
using (var qrGenerator = new QRCodeGenerator())
using (var qrCodeData = qrGenerator.CreateQrCode(plainText, eccLevel, forceUtf8, utf8BOM, eciMode, requestedVersion))
using (var qrCode = new SvgQRCode(qrCodeData))
return qrCode.GetGraphic(pixelsPerModule, darkColorHex, lightColorHex, drawQuietZones, sizingMode, logo);
}
}
}

View File

@@ -25,6 +25,8 @@ namespace Thought.vCards
private string postalCode;
private string region;
private string street;
private string postOfficeBox;
private string extendedAddress;
/// <summary>
@@ -37,14 +39,42 @@ namespace Thought.vCards
this.postalCode = string.Empty;
this.region = string.Empty;
this.street = string.Empty;
this.postOfficeBox = string.Empty;
this.extendedAddress = string.Empty;
this.addressType = new List<vCardDeliveryAddressTypes>();
}
public vCardDeliveryAddress(string street, string city, string region, string country, string postalCode, vCardDeliveryAddressTypes addressType)
{
AddressType = new List<vCardDeliveryAddressTypes>() { addressType };
City = city;
Country = country;
PostalCode = postalCode;
Region = region;
Street = street;
}
public vCardDeliveryAddress(string street, string city, string region, string country, string postalCode, string extendedAddress, string postOfficeBox, vCardDeliveryAddressTypes addressType)
{
AddressType = new List<vCardDeliveryAddressTypes>() { addressType };
City = city;
Country = country;
PostalCode = postalCode;
Region = region;
Street = street;
ExtendedAddress = extendedAddress;
PostOfficeBox= postOfficeBox;
}
public vCardDeliveryAddress(List<vCardDeliveryAddressTypes> addressType)
{
AddressType = addressType ;
}
/// <summary>
/// The type of postal address.
/// </summary>
public List<vCardDeliveryAddressTypes> AddressType
public List<vCardDeliveryAddressTypes> AddressType
{
get
{
@@ -219,6 +249,28 @@ namespace Thought.vCards
}
}
public string ExtendedAddress
{
get
{
return this.extendedAddress ?? string.Empty;
}
set
{
this.extendedAddress = value;
}
}
public string PostOfficeBox
{
get
{
return this.postOfficeBox ?? string.Empty;
}
set
{
this.postOfficeBox = value;
}
}
}
}

View File

@@ -21,7 +21,7 @@ namespace Thought.vCards
/// </remarks>
/// <seealso cref="vCardEmailAddressCollection"/>
/// <seealso cref="vCardEmailAddressType"/>
public class vCardEmailAddress
public class vCardEmailAddress : vCardRoot
{
private string address;
@@ -120,6 +120,16 @@ namespace Thought.vCards
}
public override void ChangeContent(string text)
{
this.address = text;
}
public override string GetNameType()
{
return EmailType.ToString();
}
/// <summary>
/// Builds a string that represents the email address.

View File

@@ -16,7 +16,7 @@ namespace Thought.vCards
/// <seealso cref="vCardPhoneCollection"/>
/// <seealso cref="vCardPhoneTypes"/>
[Serializable]
public class vCardPhone
public class vCardPhone : vCardRoot
{
private string fullNumber;
@@ -42,6 +42,10 @@ namespace Thought.vCards
this.fullNumber = fullNumber;
}
public override string ToString()
{
return this.fullNumber;
}
/// <summary>
/// Creates a new <see cref="vCardPhone"/> with the specified number and subtype.
@@ -452,6 +456,15 @@ namespace Thought.vCards
}
}
public override void ChangeContent(string text)
{
this.FullNumber = text;
}
public override string GetNameType()
{
return PhoneType.ToString();
}
}
}

View File

@@ -48,7 +48,7 @@ namespace Thought.vCards
/// </summary>
private Uri url;
public string Extension { get; }
private string encodedData;
@@ -60,12 +60,13 @@ namespace Thought.vCards
/// An array of bytes containing the raw data from
/// any of the supported image formats.
/// </param>
public vCardPhoto(byte[] buffer)
public vCardPhoto(byte[] buffer, string imageType)
{
if (buffer == null)
throw new ArgumentNullException("buffer");
this.data = (byte[])buffer.Clone();
this.Extension = imageType;
}
@@ -75,13 +76,14 @@ namespace Thought.vCards
/// <param name="url">
/// A URL pointing to an image.
/// </param>
public vCardPhoto(Uri url)
public vCardPhoto(Uri url, string imageType)
{
if (url == null)
throw new ArgumentNullException("url");
this.url = url;
this.Extension = imageType;
}
@@ -110,7 +112,7 @@ namespace Thought.vCards
/// <param name="isEncoded">
/// Boolean true if is encoded.
/// </param>
public vCardPhoto(string data, bool isEncoded)
public vCardPhoto(string data, bool isEncoded, string imageType)
{
if (string.IsNullOrEmpty(data))
@@ -119,7 +121,7 @@ namespace Thought.vCards
}
this.encodedData = data;
this.Extension = imageType;
}
@@ -291,6 +293,7 @@ namespace Thought.vCards
}
}
/// <summary>
/// The URL of the image.

View File

@@ -0,0 +1,8 @@
namespace Thought.vCards
{
abstract public class vCardRoot
{
abstract public void ChangeContent(string text);
abstract public string GetNameType();
}
}

View File

@@ -1225,6 +1225,12 @@ namespace Thought.vCards
if (addressParts.Length >= 3)
deliveryAddress.Street = addressParts[2].Trim();
if (addressParts.Length >= 1)
deliveryAddress.ExtendedAddress = addressParts[1].Trim();
if (addressParts.Length >= 0)
deliveryAddress.PostOfficeBox = addressParts[0].Trim();
if (
(string.IsNullOrEmpty(deliveryAddress.City)) &&
(string.IsNullOrEmpty(deliveryAddress.Country)) &&
@@ -1661,6 +1667,7 @@ namespace Thought.vCards
// often consist of binary data.
vCardCertificate certificate = new vCardCertificate();
certificate.Data = (byte[])property.Value;
// TODO: Support other key types.
@@ -1899,11 +1906,12 @@ namespace Thought.vCards
/// </summary>
private void ReadInto_PHOTO(vCard card, vCardProperty property)
{
string[] Formats = { "GIF", "CGM", "WMF", "JPEG", "BMP", "MET", "PMB", "DIB", "PICT", "TIFF", "PS", "PDF" };
string imageType = property.Subproperties.GetValue("TYPE", Formats);
// The PHOTO property contains an embedded (encoded) image
// or a link to an image. A URL (linked) image is supposed
// to be indicated with the VALUE=URI subproperty.
string valueType = property.Subproperties.GetValue("VALUE");
//URI is the standard, but I've seen examples online of URL
@@ -1914,7 +1922,7 @@ namespace Thought.vCards
// rather than being encoded directly in the vCard.
card.Photos.Add(
new vCardPhoto(new Uri(property.ToString())));
new vCardPhoto(new Uri(property.ToString()), imageType));
}
@@ -1922,13 +1930,15 @@ namespace Thought.vCards
{
if (property.Value.GetType() == typeof(string))
{
card.Photos.Add(new vCardPhoto((string)property.Value, true));
card.Photos.Add(new vCardPhoto((string)property.Value, true, imageType));
}
else
{
card.Photos.Add(new vCardPhoto((byte[])property.Value));
card.Photos.Add(new vCardPhoto((byte[])property.Value, imageType));
}
}
}
@@ -2279,10 +2289,7 @@ namespace Thought.vCards
firstLine = firstLine.Trim();
if (firstLine.Length == 0)
{
Warnings.Add(Thought.vCards.WarningMessages.BlankLine);
continue;
}
// Get the index of the colon (:) in this
// property line. All vCard properties are
@@ -2290,10 +2297,7 @@ namespace Thought.vCards
int colonIndex = firstLine.IndexOf(':');
if (colonIndex == -1)
{
Warnings.Add(Thought.vCards.WarningMessages.ColonMissing);
continue;
}
// Get the name portion of the property. This
// portion contains the property name as well
@@ -2301,10 +2305,7 @@ namespace Thought.vCards
string namePart = firstLine.Substring(0, colonIndex).Trim();
if (string.IsNullOrEmpty(namePart))
{
Warnings.Add(Thought.vCards.WarningMessages.EmptyName);
continue;
}
// Split apart the name portion of the property.
// A property can have subproperties, separated
@@ -2312,17 +2313,14 @@ namespace Thought.vCards
string[] nameParts = namePart.Split(';');
for (int i = 0; i < nameParts.Length; i++)
nameParts[i] = nameParts[i].Trim();
nameParts[i] = nameParts[i].Trim();
// The name of the property is supposed to
// be first on the line. An empty name is not
// legal syntax.
if (nameParts[0].Length == 0)
{
Warnings.Add(Thought.vCards.WarningMessages.EmptyName);
continue;
}
// At this point there is sufficient text
// to define a vCard property. The only
@@ -2351,13 +2349,14 @@ namespace Thought.vCards
if (subNameValue.Length == 1)
{
// The Split function above returned a single
// array element. This means no equal (=) sign
// was present. The subproperty consists of
// a name only.
property.Subproperties.Add(
nameParts[index].Trim());
// The Split function above returned a single
// array element. This means no equal (=) sign
// was present. The subproperty consists of
// a name only.
if (!string.IsNullOrEmpty(subNameValue[0]))
{
property.Subproperties.Add(nameParts[index].Trim());
}
}
else
{

View File

@@ -311,8 +311,8 @@ namespace Thought.vCards
vCardValueCollection values = new vCardValueCollection(';');
values.Add(string.Empty);
values.Add(string.Empty);
values.Add(address.PostOfficeBox);
values.Add(address.ExtendedAddress);
values.Add(!string.IsNullOrEmpty(address.Street) ? address.Street.Replace("\r\n", "\n") : string.Empty);
values.Add(address.City);
values.Add(address.Region);
@@ -1020,8 +1020,10 @@ namespace Thought.vCards
if (doEmbedded)
{
properties.Add(
new vCardProperty("PHOTO", photo.GetBytes()));
var EmbeddedProperty = new vCardProperty("PHOTO", photo.GetBytes());
EmbeddedProperty.Subproperties.Add("TYPE", "JPG");
properties.Add(EmbeddedProperty);
}
else
{

View File

@@ -15,7 +15,7 @@ namespace Thought.vCards
/// </summary>
/// <seealso cref="vCardWebsiteCollection"/>
/// <seealso cref="vCardWebsiteTypes"/>
public class vCardWebsite
public class vCardWebsite : vCardRoot
{
private string url;
@@ -154,6 +154,16 @@ namespace Thought.vCards
}
}
public override void ChangeContent(string text)
{
this.url = text;
}
public override string GetNameType()
{
return WebsiteType.ToString();
}
/// <summary>
/// Returns the string representation (URL) of the web site.

View File

@@ -0,0 +1,9 @@
namespace vCardEditor.Model
{
public enum Column
{
Name = 0,
FamilyName,
Cellular,
}
}

View File

@@ -3,23 +3,32 @@ using Thought.vCards;
namespace VCFEditor.Model
{
/// <summary>
///
/// </summary>
public class Contact : INotifyPropertyChanged
{
[DisplayName(" ")]
public bool isSelected { get; set; }
[DisplayName("Name")]
public string Name
{
get { return card.FormattedName; }
get => card.FormattedName;
set
{
card.FormattedName = value;
this.NotifyPropertyChanged("Name");
NotifyPropertyChanged("Name");
}
}
[DisplayName("F.Name")]
public string FamilyName
{
get => card.FamilyName;
}
[DisplayName("Cellular")]
public string Cellular
{
get {
if (card.Phones.GetFirstChoice(vCardPhoneTypes.Cellular) != null)
return card.Phones.GetFirstChoice(vCardPhoneTypes.Cellular).FullNumber;
return string.Empty;
}
}
@@ -29,9 +38,15 @@ namespace VCFEditor.Model
[Browsable(false)]
public bool isDirty { get; set; }
[DisplayName(" ")]
public bool isSelected { get; set; }
[Browsable(false)]
public bool isDeleted { get; set; }
[Browsable(false)]
public string path { get; set; }
public Contact()
@@ -41,14 +56,23 @@ namespace VCFEditor.Model
isDirty = false;
}
#region property change event
public Contact(vCard card)
{
this.card = card;
isSelected = false;
isDirty = false;
}
public Contact(string path) : this()
{
this.path = path;
}
private void NotifyPropertyChanged(string name)
{
if (PropertyChanged != null)
PropertyChanged(this, new PropertyChangedEventArgs(name));
PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(name));
}
public event PropertyChangedEventHandler PropertyChanged;
#endregion
}
}

View File

@@ -0,0 +1,19 @@
using System.Collections.Generic;
namespace vCardEditor.Model
{
public struct FormState
{
public List<Column> Columns { get; set; }
public int X { get; set; }
public int Y { get; set; }
public int Height { get; set; }
public int Width { get; set; }
public int splitterPosition { get; set; }
}
}

View File

@@ -0,0 +1,48 @@
using System;
using System.Collections;
using System.Collections.Generic;
using System.ComponentModel;
using System.Reflection;
namespace vCardEditor.Model
{
public class PropertyComparer<T> : IComparer<T>
{
private readonly IComparer comparer;
private PropertyDescriptor propertyDescriptor;
private int reverse;
public PropertyComparer(PropertyDescriptor property, ListSortDirection direction)
{
this.propertyDescriptor = property;
Type comparerForPropertyType = typeof(Comparer<>).MakeGenericType(property.PropertyType);
this.comparer = (IComparer)comparerForPropertyType.InvokeMember("Default", BindingFlags.Static | BindingFlags.GetProperty | BindingFlags.Public, null, null, null);
this.SetListSortDirection(direction);
}
#region IComparer<T> Members
public int Compare(T x, T y)
{
return this.reverse * this.comparer.Compare(this.propertyDescriptor.GetValue(x), this.propertyDescriptor.GetValue(y));
}
#endregion
private void SetPropertyDescriptor(PropertyDescriptor descriptor)
{
this.propertyDescriptor = descriptor;
}
private void SetListSortDirection(ListSortDirection direction)
{
this.reverse = direction == ListSortDirection.Ascending ? 1 : -1;
}
public void SetPropertyAndDirection(PropertyDescriptor descriptor, ListSortDirection direction)
{
this.SetPropertyDescriptor(descriptor);
this.SetListSortDirection(direction);
}
}
}

View File

@@ -0,0 +1,51 @@
namespace vCardEditor.Model
{
public enum vCardPropeties
{
ADR = 0,
AGENT,
ANNIVERSARY,
BDAY,
BEGIN,
CALADRURI,
CALURI,
CATEGORIES,
CLASS,
CLIENTPIDMAP,
EMAIL,
END,
FBURL,
FN,
GENDER,
GEO,
IMPP,
KEY,
KIND,
LABEL,
LANG,
LOGO,
MAILER,
MEMBER,
N,
NAME,
NICKNAME,
NOTE,
ORG,
PHOTO,
PRODID,
PROFILE,
RELATED,
REV,
ROLE,
SORTSTRING,
SOUND,
SOURCE,
TEL,
TITLE,
TZ,
UID,
URL,
VERSION,
XML
}
}

View File

@@ -1,13 +1,12 @@
using System;
using System.Collections.Generic;
using System.Linq;
using Thought.vCards;
using VCFEditor.View;
using vCardEditor.View;
using vCardEditor.View.Customs;
using VCFEditor.Repository;
using vCardEditor.Repository;
using vCardEditor.Model;
using System.Linq;
using System.Collections.Generic;
namespace VCFEditor.Presenter
{
@@ -15,124 +14,368 @@ namespace VCFEditor.Presenter
{
private readonly IMainView _view;
private readonly IContactRepository _repository;
public MainPresenter(IMainView view, IContactRepository repository)
{
_view = view;
_repository = repository;
_view.NewFileOpened += NewFileOpened;
_view.BeforeOpeningNewFile += BeforeOpeningNewFile;
_view.SaveContactsSelected += SaveContacts;
_view.ChangeContactsSelected += ChangeContactSelected;
_view.DeleteContact += DeleteContact;
_view.FilterTextChanged += FilterTextChanged;
_view.TextBoxValueChanged += TextBoxValueChanged;
_view.BeforeLeavingContact += BeforeLeavingContact;
_view.CloseForm += CloseForm;
_view.LoadForm += LoadFormHandler;
_view.AddContact += AddContactHandler;
_view.NewFileOpened += OpenNewFileHandler;
_view.SaveContactsSelected += SaveContactsHandler;
_view.ChangeContactsSelected += ChangeContactSelectedHandler;
_view.DeleteContact += DeleteContactHandler;
_view.FilterTextChanged += FilterTextChangedHandler;
_view.TextBoxValueChanged += TextBoxValueChangedHandler;
_view.BeforeLeavingContact += BeforeLeavingContactHandler;
_view.CloseForm += CloseFormHandler;
_view.ModifyImage += ModifyImageHandler;
_view.ExportImage += ExportImageHandler;
_view.ExportQR += ExportQRHandler;
_view.AddressAdded += AddressAddedHandler;
_view.AddressModified += AddressModifiedHandler;
_view.AddressRemoved += AddressRemovedHandler;
_view.CopyTextToClipboardEvent += CopyTextToClipboardHandler;
_view.AddExtraField += _view_AddExtraField;
_view.CountImagesEvent += _view_CountImages;
_view.ClearImagesEvent += _view_ClearImages;
_view.BatchExportImagesEvent += _view_BatchExportImagesEvent;
_view.SplitFileEvent += SaveSplittedFileHandler;
_view.OpenFolderEvent += OpenNewFolderHandler;
}
void CloseForm(object sender, EventArg<bool> e)
{
if (_repository.dirty && _view.AskMessage("Exit before saving?", "Exit"))
e.Data = true;
}
public void BeforeLeavingContact(object sender, EventArg<vCard> e)
{
if (_view.SelectedContactIndex > -1)
{
if (_repository.dirty)
_repository.SaveDirtyVCard(_view.SelectedContactIndex, e.Data);
}
}
public void TextBoxValueChanged(object sender, EventArgs e)
{
StateTextBox tb = sender as StateTextBox;
if (tb != null && tb.oldText != tb.Text)
_repository.SaveDirtyFlag(_view.SelectedContactIndex);
}
public void FilterTextChanged(object sender, EventArg<string> e)
private void OpenNewFolderHandler(object sender, EventArg<string> e)
{
var FilteredContacts = _repository.FilterContacts(e.Data);
_view.DisplayContacts(FilteredContacts);
}
BeforeOpeningNewFileHandler();
private void DeleteContact(object sender, EventArgs e)
{
_repository.DeleteContact();
}
private void SaveContacts(object sender, EventArgs e)
{
if (!string.IsNullOrEmpty(_repository.fileName))
_repository.SaveContacts(_repository.fileName);
}
private void BeforeOpeningNewFile(object sender, EventArgs e)
{
if (_repository.Contacts != null && _repository.dirty)
{
if (!_view.AskMessage("Save current file before?", "Load"))
_repository.SaveContacts(_repository.fileName);
}
}
public void NewFileOpened(object sender, EventArg<string> e)
{
BeforeOpeningNewFile(sender, e);
string path = e.Data;
if (string.IsNullOrEmpty(path))
path = _view.DisplayOpenDialog();
path = _view.DisplayOpenFolderDialog();
if (!string.IsNullOrEmpty(path))
{
string ext = System.IO.Path.GetExtension(path);
if (ext != ".vcf")
var Loaded =_repository.LoadMultipleFilesContact(path);
if (!Loaded)
{
_view.DisplayMessage("No file loaded!", "Error");
return;
}
AddPathToMostRecentUsedFiles(path);
_view.DisplayContacts(_repository.Contacts);
}
}
public void OpenNewFileHandler(object sender, EventArg<string> e)
{
BeforeOpeningNewFileHandler();
string path = e.Data;
if (string.IsNullOrEmpty(path))
path = _view.DisplayOpenFileDialog("vCard Files|*.vcf");
if (!string.IsNullOrEmpty(path))
{
string ext = _repository.GetExtension(path);
if (!string.Equals(ext, ".vcf", StringComparison.OrdinalIgnoreCase))
{
_view.DisplayMessage("Only vcf extension accepted!", "Error");
return;
}
FixedList MRUList = ConfigRepository.Instance.Paths;
if (!MRUList.Contains(path))
if (!_repository.LoadContacts(path))
_view.DisplayMessage("File seems missing or corrupted!", "Error");
else
{
MRUList.Enqueue(path);
_view.UpdateMRUMenu(MRUList);
_view.DisplayContacts(_repository.Contacts);
AddPathToMostRecentUsedFiles(path);
}
_repository.LoadContacts(path);
_view.DisplayContacts(_repository.Contacts);
}
}
private void AddPathToMostRecentUsedFiles(string path)
{
FixedList MostRecentUsedFiles = ConfigRepository.Instance.Paths;
if (!MostRecentUsedFiles.Contains(path))
{
MostRecentUsedFiles.Enqueue(path);
_view.UpdateMRUMenu(MostRecentUsedFiles);
}
}
private void _view_BatchExportImagesEvent(object sender, EventArgs e)
{
if (_repository.Contacts == null || _repository.Contacts.Count == 0)
return;
int count = 0;
for (int i = 0; i < _repository.Contacts.Count; i++)
{
if (_repository.Contacts[i].card.Photos.Count > 0)
{
count++;
SaveCardPhoto(_repository.Contacts[i].card, i);
}
}
if (count > 0)
_view.DisplayMessage($"{count} contact(s) processed!", "Photo Count");
else
_view.DisplayMessage($"No picture found!", "Photo Count");
}
private void _view_ClearImages(object sender, EventArgs e)
{
if (_repository.Contacts == null || _repository.Contacts.Count == 0)
return;
int count = 0;
for (int i = 0; i < _repository.Contacts.Count; i++)
{
if (_repository.Contacts[i].card.Photos.Count > 0)
{
count++;
_repository.ModifyImage(i, null);
//remove from the form the image displayed.
if (_view.SelectedContactIndex == i)
_view.ClearImageFromForm();
}
}
if (count > 0)
_view.DisplayMessage($"{count} contact(s) processed!", "Photo Count");
else
_view.DisplayMessage($"No picture found!", "Photo Count");
}
private void _view_CountImages(object sender, EventArgs e)
{
if (_repository.Contacts == null)
return;
var count = _repository.Contacts.Count(x => x.card.Photos.Count > 0);
if (count > 0)
_view.DisplayMessage($"{count} contact(s) containing a picture = ", "Photo Count");
else
_view.DisplayMessage($"No picture found!", "Photo Count");
}
private void _view_AddExtraField(object sender, EventArg<vCardPropeties> e)
{
_view.AddExtraTextGroup(e.Data, string.Empty);
}
private void CopyTextToClipboardHandler(object sender, EventArgs e)
{
if (_view.SelectedContactIndex < 0)
return;
var contact = _repository.Contacts[_view.SelectedContactIndex];
string SerializedCard = _repository.GenerateStringFromVCard(contact.card);
_view.SendTextToClipBoard(SerializedCard);
_view.DisplayMessage("vCard copied to clipboard!", "Information");
}
private void LoadFormHandler(object sender, EventArg<FormState> e)
{
_view.LoadIntialState(ConfigRepository.Instance.FormState);
var paths = Environment.GetCommandLineArgs();
if (paths.Length > 1)
{
var evt = new EventArg<string>(paths[1]);
OpenNewFileHandler(sender, evt);
}
}
public void ChangeContactSelected(object sender, EventArgs e)
private void AddressRemovedHandler(object sender, EventArg<int> e)
{
var contact = _repository.Contacts[_view.SelectedContactIndex];
_repository.SetDirtyFlag(_view.SelectedContactIndex);
contact.card.DeliveryAddresses.RemoveAt(e.Data);
}
private void AddressAddedHandler(object sender, EventArg<List<vCardDeliveryAddressTypes>> e)
{
var contact = _repository.Contacts[_view.SelectedContactIndex];
_repository.SetDirtyFlag(_view.SelectedContactIndex);
contact.card.DeliveryAddresses.Add(new vCardDeliveryAddress( e.Data));
}
private void AddressModifiedHandler(object sender, EventArg<List<vCardDeliveryAddressTypes>> e)
{
var contact = _repository.Contacts[_view.SelectedContactIndex];
_repository.SetDirtyFlag(_view.SelectedContactIndex);
contact.card.DeliveryAddresses.Clear();
contact.card.DeliveryAddresses.Add(new vCardDeliveryAddress(e.Data));
}
private void ExportImageHandler(object sender, EventArgs e)
{
if (_view.SelectedContactIndex > -1)
{
int index = _view.SelectedContactIndex;
vCard card = _repository.Contacts[index].card;
//TODO: image can be url, or file location.
var card = _repository.Contacts[_view.SelectedContactIndex].card;
SaveCardPhoto(card, _view.SelectedContactIndex, true);
}
}
if (card != null)
{
_repository.Contacts[index].isDirty = false;
_view.DisplayContactDetail(card, _repository.fileName);
}
private void SaveCardPhoto(vCard card, int index, bool askUser = false)
{
//TODO: Save every image for a vCard.
var image = card.Photos.FirstOrDefault();
if (image != null)
{
var newPath = _repository.GenerateFileName(_repository.fileName, index, image.Extension);
//string ImagePath = string.Empty;
//if (askUser)
// ImagePath = _view.DisplaySaveDialog(newPath);
_repository.SaveImageToDisk(newPath, image);
}
}
private void ExportQRHandler(object sender, EventArgs e)
{
if (_view.SelectedContactIndex > -1)
{
var card = _repository.Contacts[_view.SelectedContactIndex].card;
string content = _repository.GenerateStringFromVCard(card);
_view.DisplayQRCode(content);
}
}
private void ModifyImageHandler(object sender, EventArg<string> e)
{
if (!string.IsNullOrEmpty(e.Data) )
{
vCardPhoto photo = new vCardPhoto(e.Data);
_repository.ModifyImage(_view.SelectedContactIndex, photo);
}
else
_repository.ModifyImage(_view.SelectedContactIndex, null);
}
void CloseFormHandler(object sender, EventArg<bool> e)
{
if (_repository.dirty && _view.AskMessage("Exit without saving?", "Exit"))
e.Data = true;
if (!e.Data)
{
var state = _view.GetFormState();
ConfigRepository.Instance.FormState = state;
ConfigRepository.Instance.SaveConfig();
}
}
public void BeforeLeavingContactHandler(object sender, EventArg<vCard> e)
{
_repository.SaveDirtyVCard(_view.SelectedContactIndex, e.Data);
}
public void TextBoxValueChangedHandler(object sender, EventArgs e)
{
var tb = sender as StateTextBox;
if (tb != null && tb.oldText != tb.Text)
_repository.SetDirtyFlag(_view.SelectedContactIndex);
}
public void FilterTextChangedHandler(object sender, EventArg<string> e)
{
var FilteredContacts = _repository.FilterContacts(e.Data);
_view.DisplayContacts(FilteredContacts);
}
private void AddContactHandler(object sender, EventArgs e)
{
_repository.AddEmptyContact();
_view.DisplayContacts(_repository.Contacts);
}
private void DeleteContactHandler(object sender, EventArgs e)
{
_repository.DeleteContact();
}
private void SaveContactsHandler(object sender, EventArgs e)
{
string filename;
if (!string.IsNullOrEmpty(_repository.fileName))
filename = _repository.fileName;
else
filename = _view.DisplaySaveDialog("");
_repository.SaveContactsToFile(filename);
}
private void SaveSplittedFileHandler(object sender, EventArgs e)
{
if (_repository.Contacts == null || _repository.Contacts.Count == 0)
return;
string Path = _view.DisplayOpenFolderDialog();
if (!string.IsNullOrEmpty(Path))
{
int count = _repository.SaveSplittedFiles(Path);
_view.DisplayMessage(string.Format("{0} contact(s) processed!", count), "Information");
}
}
private void BeforeOpeningNewFileHandler()
{
if (_repository.Contacts != null && _repository.dirty)
{
if (!_view.AskMessage("Save current file before?", "Load"))
SaveContactsHandler(null, null);
//_repository.SaveContactsToFile(_repository.fileName);
}
}
public void ChangeContactSelectedHandler(object sender, EventArgs e)
{
if (_view.SelectedContactIndex > -1)
{
vCard card = _repository.Contacts[_view.SelectedContactIndex].card;
if (card != null)
_view.DisplayContactDetail(card, _repository.fileName);
else
_view.ClearContactDetail();
}
else
_view.ClearContactDetail();
}
}
}

View File

@@ -32,5 +32,4 @@ using System.Runtime.InteropServices;
// Vous pouvez spécifier toutes les valeurs ou indiquer les numéros de build et de révision par défaut
// en utilisant '*', comme indiqué ci-dessous :
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("0.12.*")]
//[assembly: AssemblyFileVersion("1.0.0.0")]
[assembly: AssemblyVersion("0.5.7")]

View File

@@ -19,7 +19,7 @@ namespace vCardEditor.Properties {
// à l'aide d'un outil, tel que ResGen ou Visual Studio.
// Pour ajouter ou supprimer un membre, modifiez votre fichier .ResX, puis réexécutez ResGen
// avec l'option /str ou régénérez votre projet VS.
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "16.0.0.0")]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
internal class Resources {
@@ -59,5 +59,35 @@ namespace vCardEditor.Properties {
resourceCulture = value;
}
}
/// <summary>
/// Recherche une ressource localisée de type System.Drawing.Bitmap.
/// </summary>
internal static System.Drawing.Bitmap Add {
get {
object obj = ResourceManager.GetObject("Add", resourceCulture);
return ((System.Drawing.Bitmap)(obj));
}
}
/// <summary>
/// Recherche une ressource localisée de type System.Drawing.Bitmap.
/// </summary>
internal static System.Drawing.Bitmap Close {
get {
object obj = ResourceManager.GetObject("Close", resourceCulture);
return ((System.Drawing.Bitmap)(obj));
}
}
/// <summary>
/// Recherche une ressource localisée de type System.Drawing.Bitmap.
/// </summary>
internal static System.Drawing.Bitmap nuget_icon {
get {
object obj = ResourceManager.GetObject("nuget-icon", resourceCulture);
return ((System.Drawing.Bitmap)(obj));
}
}
}
}

View File

@@ -117,4 +117,14 @@
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<data name="Add" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\assests\Add.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="Close" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\assests\Close.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="nuget-icon" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Libs\QRCoder\Assets\nuget-icon.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
</root>

42
vCardEditor/Releases.txt Normal file
View File

@@ -0,0 +1,42 @@
0.5.7
added a feature to batch export/clear/count images.
Fix bug when opening files by menu.
some buttons click were not working properly.
0.5.6
Not released!
0.5.5
redisgn the extra tab
Fix some bugs
0.5.4
Fix a regression when saving Phones, Website, Email
added the update button in the about dialog to check the latest version.
0.5.3
Support of QR Code.
0.5.2
added an option to Right-click on a ".vcf"" file > Open With —> vCardEditor
0.5.1
Fixed clearing fields when changing contact
0.5
A reworked control for adding/modifying or removing addresses.
0.4
Import images/export images.
refactoring and bugs fixed
0.3
Added address section.
refactoring and bugs fixed
0.2
Updated the vCard library to https://github.com/acastroy/Thought.vCards
Replaced Moq with nsubstitute (Test mocking library).
0.1
Intial release

View File

@@ -1,22 +1,21 @@
using System;
using System.Collections.Generic;
using System.Xml.Serialization;
using System.IO;
using System.ComponentModel;
using vCardEditor.Model;
using System.Runtime.Serialization;
namespace vCardEditor.Repository
{
[XmlRoot("Config")]
[Serializable]
public class ConfigRepository
public class ConfigRepository : IConfigRepository
{
private static string ConfigFileName
{
get { return Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "config.xml"); }
}
private const int MAX_RECENT_FILES = 5;
private static ConfigRepository instance = null;
[XmlIgnore]
public static ConfigRepository Instance
@@ -31,12 +30,18 @@ namespace vCardEditor.Repository
}
[Description("Overwrite the file when saving")]
public bool OverWrite { get; set; }
public bool Overwrite { get; set; }
[Description("Maximum entries for MRU ")]
public int Maximum { get; set; }
[Description("Url for checking application version")]
public string VersionUrl { get; set; }
[Browsable(false)]
public FixedList Paths { get; set; }
[Browsable(false)]
public FixedList Paths { get; set;}
public FormState FormState;
private ConfigRepository() { }
@@ -64,7 +69,7 @@ namespace vCardEditor.Repository
/// <returns></returns>
private static ConfigRepository LoadConfig()
{
ConfigRepository obj;
ConfigRepository configData = null;
try
{
@@ -74,21 +79,25 @@ namespace vCardEditor.Repository
XmlSerializer deserializer = new XmlSerializer(typeof(ConfigRepository));
using (TextReader reader = new StreamReader(ConfigFileName))
{
obj = (ConfigRepository)deserializer.Deserialize(reader);
obj.Paths.Size = obj.Maximum;
configData = (ConfigRepository)deserializer.Deserialize(reader);
configData.Paths.Size = configData.Maximum;
}
}
catch (Exception)
{
obj = new ConfigRepository();
obj.Paths = new FixedList(5);
configData = new ConfigRepository
{
Maximum = MAX_RECENT_FILES,
Paths = new FixedList(MAX_RECENT_FILES),
VersionUrl = "https://raw.githubusercontent.com/abdelkader/vCardEditor/master/vCardEditor/Releases.txt"
};
}
return obj;
return configData;
}
}
}

View File

@@ -4,9 +4,8 @@ using System.Linq;
using System.Text;
using Thought.vCards;
using VCFEditor.Model;
using System.ComponentModel;
using vCardEditor.Repository;
using System.Collections.Generic;
using vCardEditor.View;
namespace VCFEditor.Repository
{
@@ -14,7 +13,6 @@ namespace VCFEditor.Repository
{
public string fileName { get; set; }
private IFileHandler _fileHandler;
#region Contact Info
/// <summary>
/// Formatted name.
/// </summary>
@@ -23,17 +21,14 @@ namespace VCFEditor.Repository
/// <summary>
/// Keep a copy of contact list when filtering
/// </summary>
private BindingList<Contact> OriginalContactList = null;
/// <summary>
/// Contact List
/// </summary>
private BindingList<Contact> _contacts;
public BindingList<Contact> Contacts
private SortableBindingList<Contact> OriginalContactList = null;
private SortableBindingList<Contact> _contacts;
public SortableBindingList<Contact> Contacts
{
get
{
if (_contacts == null)
_contacts = new BindingList<Contact>();
_contacts = new SortableBindingList<Contact>();
return _contacts;
}
set
@@ -41,72 +36,123 @@ namespace VCFEditor.Repository
_contacts = value;
}
}
#endregion
private bool _dirty;
public bool dirty
{
get { return (_contacts != null && _contacts.Any(x => x.isDirty)) || _dirty; }
set { _dirty = true; }
}
public ContactRepository(IFileHandler fileHandler)
{
_fileHandler = fileHandler;
}
public BindingList<Contact> LoadContacts(string fileName)
public bool LoadMultipleFilesContact(string path)
{
Contacts.Clear();
string[] filePaths = _fileHandler.GetFiles(path, "*.vcf");
if (filePaths.Count() == 0)
return false;
foreach (var item in filePaths)
{
var result = LoadContactFromFile(item);
Contacts.AddRange(result);
OriginalContactList = Contacts;
}
return true;
}
public bool LoadContacts(string fileName)
{
Contacts.Clear();
this.fileName = fileName;
Contacts = LoadContactFromFile(fileName);
OriginalContactList = Contacts;
return true;
}
public SortableBindingList<Contact> LoadContactFromFile(string fileName)
{
if (!_fileHandler.FileExist(fileName))
return null;
SortableBindingList<Contact> ListOfContacts = new SortableBindingList<Contact>();
string[] lines = _fileHandler.ReadAllLines(fileName);
StringBuilder RawContent = new StringBuilder();
Contact contact = new Contact();
string[] lines = _fileHandler.ReadAllLines(fileName);
//TODO: Clean end of line from spaces..
//Prevent from adding contacts to existings ones.
Contacts.Clear();
Contact contact;
for (int i = 0; i < lines.Length; i++)
{
RawContent.AppendLine(lines[i]);
if (lines[i].TrimEnd() == "END:VCARD")
try
{
contact.card = ParseRawContent(RawContent);
Contacts.Add(contact);
contact = new Contact();
RawContent.Length = 0;
if (string.Equals(lines[i].TrimEnd(), "END:VCARD", StringComparison.OrdinalIgnoreCase))
{
contact = new Contact(ParseRawContent(RawContent));
ListOfContacts.Add(contact);
RawContent.Length = 0;
}
}
catch (Exception)
{
return null;
}
}
OriginalContactList = Contacts;
_dirty = false;
return Contacts;
return ListOfContacts;
}
private vCard ParseRawContent(StringBuilder rawContent)
{
vCard card = null;
using (StringReader reader = new StringReader(rawContent.ToString()))
card = new vCard(reader);
return card;
}
/// <summary>
/// Save the contact to the file.
/// </summary>
/// <param name="path">Path to the new file, else if null, we overwrite the same file</param>
public void SaveContacts(string fileName)
public void AddEmptyContact()
{
Contact contact = new Contact();
contact.isDirty = true;
Contacts.Add(contact);
}
public void SaveContactsToFile(string fileName)
{
//overwrite the same file, else save as another file.
if (string.IsNullOrEmpty(fileName))
fileName = this.fileName;
//Take a copy...
if (!ConfigRepository.Instance.OverWrite)
//Take a copy if specified in the config file
if (!ConfigRepository.Instance.Overwrite)
{
string backupName = GetBackupName();
_fileHandler.MoveFile(fileName, backupName);
}
StringBuilder sb = new StringBuilder();
//Do not save the deleted ones...
foreach (var entry in Contacts)
{
//Do not save the deleted ones!
if (!entry.isDeleted)
sb.Append(generateRawContent(entry.card));
}
{
string SerializedCard = GenerateStringFromVCard(entry.card);
sb.Append(SerializedCard);
}
_fileHandler.WriteAllText(fileName, sb.ToString());
//Clean the flag for every contact, even the deleted ones.
entry.isDirty = false;
}
_dirty = false;
_fileHandler.WriteAllText(fileName, sb.ToString());
}
private string GetBackupName()
@@ -122,80 +168,36 @@ namespace VCFEditor.Repository
return backupName;
}
/// <summary>
/// Delete contacted that are selected.
/// </summary>
public void DeleteContact()
{
if (_contacts != null && _contacts.Count > 0)
{
//loop from the back to prevent index mangling...
for (int i = _contacts.Count - 1; i > -1; i--)
{
if (_contacts[i].isSelected)
{
_contacts[i].isDeleted = true;
_contacts.RemoveAt(i);
_dirty = true;
_contacts.RemoveAt(i);
}
}
}
}
/// <summary>
/// Use the lib to parse a vcard chunk.
/// </summary>
/// <param name="rawContent"></param>
/// <returns></returns>
private vCard ParseRawContent(StringBuilder rawContent)
{
vCard card = null;
using (MemoryStream s = GenerateStreamFromString(rawContent.ToString()))
using (TextReader streamReader = new StreamReader(s, Encoding.UTF8))
{
card = new vCard(streamReader);
}
return card;
}
/// <summary>
///
/// </summary>
/// <param name="s"></param>
/// <returns></returns>
private MemoryStream GenerateStreamFromString(string s)
{
MemoryStream stream = new MemoryStream();
StreamWriter writer = new StreamWriter(stream);
writer.Write(s);
writer.Flush();
stream.Position = 0;
return stream;
}
public BindingList<Contact> FilterContacts(string filter)
public SortableBindingList<Contact> FilterContacts(string filter)
{
var list = OriginalContactList.Where(i => (i.Name.IndexOf(filter, StringComparison.OrdinalIgnoreCase) >= 0) &&
!i.isDeleted);
Contacts = new BindingList<Contact>(list.ToList());
Contacts = new SortableBindingList<Contact>(list.ToList());
return Contacts;
}
/// <summary>
/// Save modified card info in the raw content.
/// </summary>
/// <param name="card"></param>
/// <param name="index"></param>
public void SaveDirtyFlag(int index)
public void SetDirtyFlag(int index)
{
if (index > -1)
_contacts[index].isDirty = true;
@@ -203,18 +205,61 @@ namespace VCFEditor.Repository
public void SaveDirtyVCard(int index, vCard NewCard)
{
if (index > -1 && index < _contacts.Count-1 && _contacts[index].isDirty)
if (index > -1 && index <= _contacts.Count-1 && _contacts[index].isDirty)
{
vCard card = _contacts[index].card;
card.Title = NewCard.Title;
card.FormattedName = NewCard.FormattedName;
card.GivenName = NewCard.GivenName;
card.FamilyName = NewCard.FamilyName;
card.AdditionalNames = NewCard.AdditionalNames;
card.FamilyName = NewCard.FamilyName;
SavePhone(NewCard, card);
SaveEmail(NewCard, card);
SaveWebUrl(NewCard, card);
SaveAddresses(NewCard, card);
SaveExtraField(NewCard, card);
SaveExtraPhones(NewCard, card);
}
}
_contacts[index].isDirty = false;
_dirty = true;
private void SaveExtraPhones(vCard newCard, vCard card)
{
card.Phones.Clear();
foreach (var item in newCard.Phones)
card.Phones.Add(new vCardPhone(item.FullNumber, item.PhoneType));
}
private void SaveExtraField(vCard newCard, vCard card)
{
card.Notes.Clear();
foreach (var item in newCard.Notes)
card.Notes.Add(new vCardNote(item.Text));
card.Organization = newCard.Organization;
}
private void SaveAddresses(vCard NewCard, vCard card)
{
foreach (var item in NewCard.DeliveryAddresses)
{
var adr = card.DeliveryAddresses.Where(x => x.AddressType.FirstOrDefault() == item.AddressType.FirstOrDefault()).FirstOrDefault();
if (adr != null)
{
adr.City = item.City;
adr.Country = item.Country;
adr.PostalCode = item.PostalCode;
adr.Region = item.Region;
adr.Street = item.Street;
adr.ExtendedAddress = item.ExtendedAddress;
adr.PostOfficeBox = item.PostOfficeBox;
}
else
card.DeliveryAddresses.Add(new vCardDeliveryAddress(item.Street, item.City, item.Region, item.Country,
item.PostalCode, item.AddressType.FirstOrDefault()));
}
}
@@ -320,30 +365,86 @@ namespace VCFEditor.Repository
}
}
/// <summary>
/// Generate a VCard class from a string.
/// </summary>
/// <param name="card"></param>
/// <returns></returns>
private string generateRawContent(vCard card)
public string GenerateStringFromVCard(vCard card)
{
vCardStandardWriter writer = new vCardStandardWriter();
TextWriter tw = new StringWriter();
writer.Write(card, tw);
return tw.ToString();
using (TextWriter tw = new StringWriter())
{
writer.Write(card, tw);
return tw.ToString();
}
}
/// <summary>
/// Check if some iem in the contact list is modified
/// </summary>
/// <returns>true for dirty</returns>
private bool _dirty;
public bool dirty
public void ModifyImage(int index, vCardPhoto photo)
{
get { return _dirty || (_contacts != null && _contacts.Any(x => x.isDirty)); }
set { _dirty = value; }
if (index > -1)
{
SetDirtyFlag(index);
_contacts[index].card.Photos.Clear();
if (photo != null)
_contacts[index].card.Photos.Add(photo);
}
}
public string GetExtension(string path)
{
return _fileHandler.GetExtension(path);
}
public void SaveImageToDisk(string imageFile, vCardPhoto image)
{
_fileHandler.WriteBytesToFile(imageFile, image.GetBytes());
}
public string ChangeExtension(string path, string extension)
{
return _fileHandler.ChangeExtension(path, extension);
}
public string GenerateFileName(string fileName, int index, string extension)
{
string result = _fileHandler.GetFileNameWithExtension(fileName, index, extension);
return result;
}
public int SaveSplittedFiles(string FolderPath)
{
//Do not save the deleted ones!
var contactsToSave = Contacts.Where(x => !x.isDeleted).ToList();
int count;
for (count = 0; count < contactsToSave.Count(); count++)
{
var entry = contactsToSave[count];
string SerializedCard = GenerateStringFromVCard(entry.card);
//Check if filename for the card is empty, and generate one if empty
if (string.IsNullOrEmpty(entry.path))
entry.path = GenerateFileName(FolderPath, entry.FamilyName, count);
_fileHandler.WriteAllText(entry.path, SerializedCard);
//Clean the flag for every contact, even the deleted ones.
entry.isDirty = false;
}
//Clean the global flag for the entire vCard Catalog.
_dirty = false;
//return number of contacts processed!
return count;
}
private string GenerateFileName(string FolderPath, string familyName, int index)
{
string FinalPath;
if (string.IsNullOrEmpty(familyName))
FinalPath = _fileHandler.GetVcfFileName(FolderPath, index.ToString());
else
FinalPath = _fileHandler.GetVcfFileName(FolderPath, familyName);
return FinalPath;
}
}
}

View File

@@ -1,8 +1,5 @@
using System;
using System.Collections.Generic;
using System.IO;
using System.Linq;
using System.Text;
using System.IO;
namespace vCardEditor.Repository
{
@@ -13,9 +10,21 @@ namespace vCardEditor.Repository
return File.Exists(filename);
}
public string GetExtension(string path)
{
return Path.GetExtension(path);
}
public string ChangeExtension(string path, string extension)
{
return Path.ChangeExtension(path, extension);
}
public void MoveFile(string newFilename, string oldFilename)
{
File.Move(newFilename, oldFilename);
if (File.Exists(newFilename))
File.Move(newFilename, oldFilename);
}
public string[] ReadAllLines(string filename)
@@ -27,5 +36,31 @@ namespace vCardEditor.Repository
{
File.WriteAllText(filename, contents);
}
public void WriteBytesToFile(string imageFile, byte[] image)
{
using (var ms = new MemoryStream(image))
{
using (var fs = new FileStream(imageFile, FileMode.Create))
ms.WriteTo(fs);
}
}
public string GetVcfFileName(string folderPath, string filename)
{
return Path.Combine(folderPath, filename + ".vcf");
}
public string GetFileNameWithExtension(string fileName, int index, string extension)
{
return Path.Combine(Path.GetDirectoryName(fileName), index.ToString() + "." + extension);
}
public string[] GetFiles(string path, string ext)
{
string[] filePaths = Directory.GetFiles(path, ext,SearchOption.TopDirectoryOnly);
return filePaths;
}
}
}

View File

@@ -1,25 +0,0 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using Thought.vCards;
using VCFEditor.Model;
using System.ComponentModel;
namespace VCFEditor.Repository
{
public interface IContactRepository
{
string fileName { get; set; }
BindingList<Contact> Contacts { get; set; }
bool dirty { get; set; }
BindingList<Contact> LoadContacts(string fileName);
void SaveContacts(string fileName);
void DeleteContact();
BindingList<Contact> FilterContacts(string p);
void SaveDirtyFlag(int index);
void SaveDirtyVCard(int index, vCard card);
}
}

View File

@@ -1,15 +0,0 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
namespace vCardEditor.Repository
{
public interface IFileHandler
{
void MoveFile(string newFilename, string oldFilename);
bool FileExist(string filename);
string[] ReadAllLines(string filename);
void WriteAllText(string fileName, string contents);
}
}

View File

@@ -0,0 +1,13 @@
using vCardEditor.Model;
namespace vCardEditor.Repository
{
public interface IConfigRepository
{
int Maximum { get; set; }
bool Overwrite { get; set; }
FixedList Paths { get; set; }
void SaveConfig();
}
}

View File

@@ -0,0 +1,31 @@
using System;
using Thought.vCards;
using VCFEditor.Model;
using vCardEditor.View;
namespace VCFEditor.Repository
{
public interface IContactRepository
{
bool dirty { get; }
string fileName { get; set; }
SortableBindingList<Contact> Contacts { get; set; }
bool LoadContacts(string fileName);
bool LoadMultipleFilesContact(string path);
SortableBindingList<Contact> FilterContacts(string p);
void SaveContactsToFile(string fileName);
void DeleteContact();
void SetDirtyFlag(int index);
void SaveDirtyVCard(int index, vCard card);
void AddEmptyContact();
void ModifyImage(int index, vCardPhoto photo);
string GetExtension(string path);
//string ChangeExtension(string path, int index, string extension);
void SaveImageToDisk(string imageFile, vCardPhoto image);
string GenerateStringFromVCard(vCard card);
string GenerateFileName(string fileName, int index, string extension);
int SaveSplittedFiles(string Path);
}
}

View File

@@ -0,0 +1,18 @@
using System.IO;
namespace vCardEditor.Repository
{
public interface IFileHandler
{
void MoveFile(string newFilename, string oldFilename);
bool FileExist(string filename);
string[] ReadAllLines(string filename);
void WriteAllText(string fileName, string contents);
string GetExtension(string path);
string ChangeExtension(string path, string extension);
void WriteBytesToFile(string imageFile, byte[] image);
string GetVcfFileName(string folderPath, string familyName);
string GetFileNameWithExtension(string fileName, int index, string extension);
string[] GetFiles(string path, string ext);
}
}

View File

@@ -1,90 +0,0 @@
//------------------------------------------------------------------------------
// <auto-generated>
// Ce code a été généré par un outil.
// Version du runtime :4.0.30319.34209
//
// Les modifications apportées à ce fichier peuvent provoquer un comportement incorrect et seront perdues si
// le code est régénéré.
// </auto-generated>
//------------------------------------------------------------------------------
namespace Thought.vCards {
using System;
/// <summary>
/// Une classe de ressource fortement typée destinée, entre autres, à la consultation des chaînes localisées.
/// </summary>
// Cette classe a été générée automatiquement par la classe StronglyTypedResourceBuilder
// à l'aide d'un outil, tel que ResGen ou Visual Studio.
// Pour ajouter ou supprimer un membre, modifiez votre fichier .ResX, puis réexécutez ResGen
// avec l'option /str ou régénérez votre projet VS.
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
internal class WarningMessages {
private static global::System.Resources.ResourceManager resourceMan;
private static global::System.Globalization.CultureInfo resourceCulture;
[global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
internal WarningMessages() {
}
/// <summary>
/// Retourne l'instance ResourceManager mise en cache utilisée par cette classe.
/// </summary>
[global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
internal static global::System.Resources.ResourceManager ResourceManager {
get {
if (object.ReferenceEquals(resourceMan, null)) {
global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("vCardEditor.Thought.vCards.WarningMessages", typeof(WarningMessages).Assembly);
resourceMan = temp;
}
return resourceMan;
}
}
/// <summary>
/// Remplace la propriété CurrentUICulture du thread actuel pour toutes
/// les recherches de ressources à l'aide de cette classe de ressource fortement typée.
/// </summary>
[global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
internal static global::System.Globalization.CultureInfo Culture {
get {
return resourceCulture;
}
set {
resourceCulture = value;
}
}
/// <summary>
/// Recherche une chaîne localisée semblable à Line {0} A blank line was encountered. This is not allowed in the vCard specification..
/// </summary>
internal static string BlankLine {
get {
return ResourceManager.GetString("BlankLine", resourceCulture);
}
}
/// <summary>
/// Recherche une chaîne localisée semblable à Line {0}: A colon (:) is missing. All properties must be in NAME:VALUE format..
/// </summary>
internal static string ColonMissing {
get {
return ResourceManager.GetString("ColonMissing", resourceCulture);
}
}
/// <summary>
/// Recherche une chaîne localisée semblable à Line {0}: The name section of the property is empty..
/// </summary>
internal static string EmptyName {
get {
return ResourceManager.GetString("EmptyName", resourceCulture);
}
}
}
}

View File

@@ -36,107 +36,120 @@
this.labelCompanyName = new System.Windows.Forms.Label();
this.textBoxDescription = new System.Windows.Forms.TextBox();
this.okButton = new System.Windows.Forms.Button();
this.updateButton = new System.Windows.Forms.Button();
this.tableLayoutPanel.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.logoPictureBox)).BeginInit();
this.SuspendLayout();
//
// tableLayoutPanel
//
this.tableLayoutPanel.ColumnCount = 2;
this.tableLayoutPanel.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 27.81775F));
this.tableLayoutPanel.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 72.18225F));
this.tableLayoutPanel.ColumnCount = 3;
this.tableLayoutPanel.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 32.31441F));
this.tableLayoutPanel.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 67.68559F));
this.tableLayoutPanel.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 119F));
this.tableLayoutPanel.Controls.Add(this.logoPictureBox, 0, 0);
this.tableLayoutPanel.Controls.Add(this.labelProductName, 1, 0);
this.tableLayoutPanel.Controls.Add(this.labelVersion, 1, 1);
this.tableLayoutPanel.Controls.Add(this.labelCopyright, 1, 2);
this.tableLayoutPanel.Controls.Add(this.labelCompanyName, 1, 3);
this.tableLayoutPanel.Controls.Add(this.textBoxDescription, 1, 4);
this.tableLayoutPanel.Controls.Add(this.okButton, 1, 5);
this.tableLayoutPanel.Controls.Add(this.okButton, 2, 5);
this.tableLayoutPanel.Controls.Add(this.updateButton, 1, 5);
this.tableLayoutPanel.Dock = System.Windows.Forms.DockStyle.Fill;
this.tableLayoutPanel.Location = new System.Drawing.Point(9, 9);
this.tableLayoutPanel.Location = new System.Drawing.Point(12, 11);
this.tableLayoutPanel.Margin = new System.Windows.Forms.Padding(4);
this.tableLayoutPanel.Name = "tableLayoutPanel";
this.tableLayoutPanel.RowCount = 6;
this.tableLayoutPanel.RowCount = 7;
this.tableLayoutPanel.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 10F));
this.tableLayoutPanel.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 10F));
this.tableLayoutPanel.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 10F));
this.tableLayoutPanel.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 10F));
this.tableLayoutPanel.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 50F));
this.tableLayoutPanel.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 10F));
this.tableLayoutPanel.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 47.93651F));
this.tableLayoutPanel.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 12.69841F));
this.tableLayoutPanel.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 8F));
this.tableLayoutPanel.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 25F));
this.tableLayoutPanel.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 25F));
this.tableLayoutPanel.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 20F));
this.tableLayoutPanel.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 20F));
this.tableLayoutPanel.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 20F));
this.tableLayoutPanel.Size = new System.Drawing.Size(417, 265);
this.tableLayoutPanel.Size = new System.Drawing.Size(556, 326);
this.tableLayoutPanel.TabIndex = 0;
//
// logoPictureBox
//
this.logoPictureBox.Image = ((System.Drawing.Image)(resources.GetObject("logoPictureBox.Image")));
this.logoPictureBox.Location = new System.Drawing.Point(3, 3);
this.logoPictureBox.Location = new System.Drawing.Point(4, 4);
this.logoPictureBox.Margin = new System.Windows.Forms.Padding(4);
this.logoPictureBox.Name = "logoPictureBox";
this.tableLayoutPanel.SetRowSpan(this.logoPictureBox, 6);
this.logoPictureBox.Size = new System.Drawing.Size(109, 98);
this.logoPictureBox.Size = new System.Drawing.Size(133, 121);
this.logoPictureBox.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage;
this.logoPictureBox.TabIndex = 12;
this.logoPictureBox.TabStop = false;
//
// labelProductName
//
this.tableLayoutPanel.SetColumnSpan(this.labelProductName, 2);
this.labelProductName.Dock = System.Windows.Forms.DockStyle.Fill;
this.labelProductName.Location = new System.Drawing.Point(121, 0);
this.labelProductName.Margin = new System.Windows.Forms.Padding(6, 0, 3, 0);
this.labelProductName.MaximumSize = new System.Drawing.Size(0, 17);
this.labelProductName.Location = new System.Drawing.Point(149, 0);
this.labelProductName.Margin = new System.Windows.Forms.Padding(8, 0, 4, 0);
this.labelProductName.MaximumSize = new System.Drawing.Size(0, 21);
this.labelProductName.Name = "labelProductName";
this.labelProductName.Size = new System.Drawing.Size(293, 17);
this.labelProductName.Size = new System.Drawing.Size(403, 21);
this.labelProductName.TabIndex = 19;
this.labelProductName.Text = "Nom du produit";
this.labelProductName.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
//
// labelVersion
//
this.tableLayoutPanel.SetColumnSpan(this.labelVersion, 2);
this.labelVersion.Dock = System.Windows.Forms.DockStyle.Fill;
this.labelVersion.Location = new System.Drawing.Point(121, 26);
this.labelVersion.Margin = new System.Windows.Forms.Padding(6, 0, 3, 0);
this.labelVersion.MaximumSize = new System.Drawing.Size(0, 17);
this.labelVersion.Location = new System.Drawing.Point(149, 31);
this.labelVersion.Margin = new System.Windows.Forms.Padding(8, 0, 4, 0);
this.labelVersion.MaximumSize = new System.Drawing.Size(0, 21);
this.labelVersion.Name = "labelVersion";
this.labelVersion.Size = new System.Drawing.Size(293, 17);
this.labelVersion.Size = new System.Drawing.Size(403, 21);
this.labelVersion.TabIndex = 0;
this.labelVersion.Text = "Version";
this.labelVersion.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
//
// labelCopyright
//
this.tableLayoutPanel.SetColumnSpan(this.labelCopyright, 2);
this.labelCopyright.Dock = System.Windows.Forms.DockStyle.Fill;
this.labelCopyright.Location = new System.Drawing.Point(121, 52);
this.labelCopyright.Margin = new System.Windows.Forms.Padding(6, 0, 3, 0);
this.labelCopyright.MaximumSize = new System.Drawing.Size(0, 17);
this.labelCopyright.Location = new System.Drawing.Point(149, 62);
this.labelCopyright.Margin = new System.Windows.Forms.Padding(8, 0, 4, 0);
this.labelCopyright.MaximumSize = new System.Drawing.Size(0, 21);
this.labelCopyright.Name = "labelCopyright";
this.labelCopyright.Size = new System.Drawing.Size(293, 17);
this.labelCopyright.Size = new System.Drawing.Size(403, 21);
this.labelCopyright.TabIndex = 21;
this.labelCopyright.Text = "Copyright";
this.labelCopyright.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
//
// labelCompanyName
//
this.tableLayoutPanel.SetColumnSpan(this.labelCompanyName, 2);
this.labelCompanyName.Dock = System.Windows.Forms.DockStyle.Fill;
this.labelCompanyName.Location = new System.Drawing.Point(121, 78);
this.labelCompanyName.Margin = new System.Windows.Forms.Padding(6, 0, 3, 0);
this.labelCompanyName.MaximumSize = new System.Drawing.Size(0, 17);
this.labelCompanyName.Location = new System.Drawing.Point(149, 93);
this.labelCompanyName.Margin = new System.Windows.Forms.Padding(8, 0, 4, 0);
this.labelCompanyName.MaximumSize = new System.Drawing.Size(0, 21);
this.labelCompanyName.Name = "labelCompanyName";
this.labelCompanyName.Size = new System.Drawing.Size(293, 17);
this.labelCompanyName.Size = new System.Drawing.Size(403, 21);
this.labelCompanyName.TabIndex = 22;
this.labelCompanyName.Text = "Nom de la société";
this.labelCompanyName.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
//
// textBoxDescription
//
this.tableLayoutPanel.SetColumnSpan(this.textBoxDescription, 2);
this.textBoxDescription.Dock = System.Windows.Forms.DockStyle.Fill;
this.textBoxDescription.Location = new System.Drawing.Point(121, 107);
this.textBoxDescription.Margin = new System.Windows.Forms.Padding(6, 3, 3, 3);
this.textBoxDescription.Location = new System.Drawing.Point(149, 128);
this.textBoxDescription.Margin = new System.Windows.Forms.Padding(8, 4, 4, 4);
this.textBoxDescription.Multiline = true;
this.textBoxDescription.Name = "textBoxDescription";
this.textBoxDescription.ReadOnly = true;
this.textBoxDescription.ScrollBars = System.Windows.Forms.ScrollBars.Both;
this.textBoxDescription.Size = new System.Drawing.Size(293, 126);
this.textBoxDescription.Size = new System.Drawing.Size(403, 143);
this.textBoxDescription.TabIndex = 23;
this.textBoxDescription.TabStop = false;
this.textBoxDescription.Text = "Description";
@@ -145,24 +158,36 @@
//
this.okButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
this.okButton.DialogResult = System.Windows.Forms.DialogResult.Cancel;
this.okButton.Location = new System.Drawing.Point(339, 239);
this.okButton.Location = new System.Drawing.Point(442, 282);
this.okButton.Margin = new System.Windows.Forms.Padding(4);
this.okButton.Name = "okButton";
this.okButton.Size = new System.Drawing.Size(75, 23);
this.okButton.Size = new System.Drawing.Size(110, 29);
this.okButton.TabIndex = 24;
this.okButton.Text = "&OK";
//
// updateButton
//
this.updateButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
this.updateButton.Location = new System.Drawing.Point(312, 283);
this.updateButton.Name = "updateButton";
this.updateButton.Size = new System.Drawing.Size(121, 29);
this.updateButton.TabIndex = 25;
this.updateButton.Text = "Check update...";
this.updateButton.Click += new System.EventHandler(this.updateButton_Click);
//
// AboutDialog
//
this.AcceptButton = this.okButton;
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 16F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.ClientSize = new System.Drawing.Size(435, 283);
this.ClientSize = new System.Drawing.Size(580, 348);
this.Controls.Add(this.tableLayoutPanel);
this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog;
this.Margin = new System.Windows.Forms.Padding(4);
this.MaximizeBox = false;
this.MinimizeBox = false;
this.Name = "AboutDialog";
this.Padding = new System.Windows.Forms.Padding(9);
this.Padding = new System.Windows.Forms.Padding(12, 11, 12, 11);
this.ShowIcon = false;
this.ShowInTaskbar = false;
this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
@@ -184,5 +209,6 @@
private System.Windows.Forms.Label labelCompanyName;
private System.Windows.Forms.TextBox textBoxDescription;
private System.Windows.Forms.Button okButton;
private System.Windows.Forms.Button updateButton;
}
}

View File

@@ -2,9 +2,13 @@
using System.Collections.Generic;
using System.ComponentModel;
using System.Drawing;
using System.IO;
using System.Linq;
using System.Net;
using System.Reflection;
using System.Threading.Tasks;
using System.Windows.Forms;
using vCardEditor.Repository;
namespace vCardEditor.View
{
@@ -100,5 +104,36 @@ namespace vCardEditor.View
}
}
#endregion
private async void updateButton_Click(object sender, EventArgs e)
{
try
{
using (var client = new WebClient())
{
string result = await client.DownloadStringTaskAsync(ConfigRepository.Instance.VersionUrl);
using (var reader = new StringReader(result))
{
string InternetVersion = reader.ReadLine();
string AssemblyVersion = Assembly.GetExecutingAssembly().GetName().Version.ToString();
Version v1 = new Version(InternetVersion);
Version v2 = new Version(AssemblyVersion);
if (v1.CompareTo(v2) > 0)
MessageBox.Show(string.Format("New version {0} found!", result), "Information", MessageBoxButtons.OK, MessageBoxIcon.Information);
else
MessageBox.Show("You have the latest version!", "Information", MessageBoxButtons.OK, MessageBoxIcon.Information);
}
}
}
catch (WebException )
{
MessageBox.Show("Could not download version information from GitHub.", "Error", MessageBoxButtons.OK, MessageBoxIcon.Error);
}
catch (Exception )
{
MessageBox.Show("Error processing version information.", "Error", MessageBoxButtons.OK, MessageBoxIcon.Error);
}
}
}
}

View File

@@ -120,288 +120,288 @@
<assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<data name="logoPictureBox.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
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
6/8DUMTZ0FH1phIAAAAASUVORK5CYII=
</value>
</data>
</root>

View File

@@ -35,41 +35,45 @@
//
// btnClose
//
this.btnClose.Location = new System.Drawing.Point(253, 347);
this.btnClose.DialogResult = System.Windows.Forms.DialogResult.OK;
this.btnClose.Location = new System.Drawing.Point(337, 427);
this.btnClose.Margin = new System.Windows.Forms.Padding(4);
this.btnClose.Name = "btnClose";
this.btnClose.Size = new System.Drawing.Size(75, 23);
this.btnClose.Size = new System.Drawing.Size(100, 28);
this.btnClose.TabIndex = 0;
this.btnClose.Text = "Close";
this.btnClose.UseVisualStyleBackColor = true;
this.btnClose.Click += new System.EventHandler(this.btnClose_Click);
//
// pgConfig
//
this.pgConfig.Location = new System.Drawing.Point(12, 12);
this.pgConfig.Location = new System.Drawing.Point(16, 15);
this.pgConfig.Margin = new System.Windows.Forms.Padding(4);
this.pgConfig.Name = "pgConfig";
this.pgConfig.Size = new System.Drawing.Size(316, 329);
this.pgConfig.Size = new System.Drawing.Size(421, 405);
this.pgConfig.TabIndex = 1;
//
// btnCancel
//
this.btnCancel.Location = new System.Drawing.Point(172, 347);
this.btnCancel.DialogResult = System.Windows.Forms.DialogResult.Cancel;
this.btnCancel.Location = new System.Drawing.Point(229, 427);
this.btnCancel.Margin = new System.Windows.Forms.Padding(4);
this.btnCancel.Name = "btnCancel";
this.btnCancel.Size = new System.Drawing.Size(75, 23);
this.btnCancel.Size = new System.Drawing.Size(100, 28);
this.btnCancel.TabIndex = 0;
this.btnCancel.Text = "Cancel";
this.btnCancel.UseVisualStyleBackColor = true;
this.btnCancel.Click += new System.EventHandler(this.btnCancel_Click);
//
// ConfigDialog
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 16F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.ClientSize = new System.Drawing.Size(337, 382);
this.ClientSize = new System.Drawing.Size(449, 470);
this.Controls.Add(this.pgConfig);
this.Controls.Add(this.btnCancel);
this.Controls.Add(this.btnClose);
this.Margin = new System.Windows.Forms.Padding(4);
this.Name = "ConfigDialog";
this.Text = "ConfigDialog";
this.Text = "Configuration Dialog";
this.ResumeLayout(false);
}

View File

@@ -10,19 +10,8 @@ namespace vCardEditor.View
public ConfigDialog()
{
InitializeComponent();
ConfigRepository conf = ConfigRepository.Instance;//.Clone();
ConfigRepository conf = ConfigRepository.Instance;
pgConfig.SelectedObject = conf;
}
private void btnClose_Click(object sender, EventArgs e)
{
this.Close();
}
private void btnCancel_Click(object sender, EventArgs e)
{
this.Close();
}
}
}

View File

@@ -112,9 +112,9 @@
<value>2.0</value>
</resheader>
<resheader name="reader">
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
</root>

View File

@@ -0,0 +1,171 @@

namespace vCardEditor.View.Customs
{
partial class AddAddressDialog
{
/// <summary>
/// Required designer variable.
/// </summary>
private System.ComponentModel.IContainer components = null;
/// <summary>
/// Clean up any resources being used.
/// </summary>
/// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
protected override void Dispose(bool disposing)
{
if (disposing && (components != null))
{
components.Dispose();
}
base.Dispose(disposing);
}
#region Windows Form Designer generated code
/// <summary>
/// Required method for Designer support - do not modify
/// the contents of this method with the code editor.
/// </summary>
private void InitializeComponent()
{
this.cbHome = new System.Windows.Forms.CheckBox();
this.cbWork = new System.Windows.Forms.CheckBox();
this.cbPostal = new System.Windows.Forms.CheckBox();
this.cbDomestic = new System.Windows.Forms.CheckBox();
this.btnOK = new System.Windows.Forms.Button();
this.btnCancel = new System.Windows.Forms.Button();
this.cbInternational = new System.Windows.Forms.CheckBox();
this.cbParcel = new System.Windows.Forms.CheckBox();
this.cbPreferred = new System.Windows.Forms.CheckBox();
this.SuspendLayout();
//
// cbHome
//
this.cbHome.AutoSize = true;
this.cbHome.Location = new System.Drawing.Point(12, 12);
this.cbHome.Name = "cbHome";
this.cbHome.Size = new System.Drawing.Size(67, 21);
this.cbHome.TabIndex = 0;
this.cbHome.Text = "Home";
this.cbHome.UseVisualStyleBackColor = true;
//
// cbWork
//
this.cbWork.AutoSize = true;
this.cbWork.Location = new System.Drawing.Point(12, 40);
this.cbWork.Name = "cbWork";
this.cbWork.Size = new System.Drawing.Size(63, 21);
this.cbWork.TabIndex = 1;
this.cbWork.Text = "Work";
this.cbWork.UseVisualStyleBackColor = true;
//
// cbPostal
//
this.cbPostal.AutoSize = true;
this.cbPostal.Location = new System.Drawing.Point(12, 67);
this.cbPostal.Name = "cbPostal";
this.cbPostal.Size = new System.Drawing.Size(69, 21);
this.cbPostal.TabIndex = 2;
this.cbPostal.Text = "Postal";
this.cbPostal.UseVisualStyleBackColor = true;
//
// cbDomestic
//
this.cbDomestic.AutoSize = true;
this.cbDomestic.Location = new System.Drawing.Point(143, 40);
this.cbDomestic.Name = "cbDomestic";
this.cbDomestic.Size = new System.Drawing.Size(88, 21);
this.cbDomestic.TabIndex = 3;
this.cbDomestic.Text = "Domestic";
this.cbDomestic.UseVisualStyleBackColor = true;
//
// btnOK
//
this.btnOK.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
this.btnOK.DialogResult = System.Windows.Forms.DialogResult.OK;
this.btnOK.Location = new System.Drawing.Point(95, 161);
this.btnOK.Name = "btnOK";
this.btnOK.Size = new System.Drawing.Size(75, 23);
this.btnOK.TabIndex = 7;
this.btnOK.Text = "OK";
this.btnOK.UseVisualStyleBackColor = true;
this.btnOK.Click += new System.EventHandler(this.btnOK_Click);
//
// btnCancel
//
this.btnCancel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
this.btnCancel.CausesValidation = false;
this.btnCancel.DialogResult = System.Windows.Forms.DialogResult.Cancel;
this.btnCancel.Location = new System.Drawing.Point(176, 161);
this.btnCancel.Name = "btnCancel";
this.btnCancel.Size = new System.Drawing.Size(75, 23);
this.btnCancel.TabIndex = 8;
this.btnCancel.Text = "Cancel";
this.btnCancel.UseVisualStyleBackColor = true;
//
// cbInternational
//
this.cbInternational.AutoSize = true;
this.cbInternational.Location = new System.Drawing.Point(143, 12);
this.cbInternational.Name = "cbInternational";
this.cbInternational.Size = new System.Drawing.Size(108, 21);
this.cbInternational.TabIndex = 9;
this.cbInternational.Text = "International";
this.cbInternational.UseVisualStyleBackColor = true;
//
// cbParcel
//
this.cbParcel.AutoSize = true;
this.cbParcel.Location = new System.Drawing.Point(143, 67);
this.cbParcel.Name = "cbParcel";
this.cbParcel.Size = new System.Drawing.Size(70, 21);
this.cbParcel.TabIndex = 10;
this.cbParcel.Text = "Parcel";
this.cbParcel.UseVisualStyleBackColor = true;
//
// cbPreferred
//
this.cbPreferred.AutoSize = true;
this.cbPreferred.Font = new System.Drawing.Font("Microsoft Sans Serif", 7.8F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.cbPreferred.Location = new System.Drawing.Point(95, 113);
this.cbPreferred.Name = "cbPreferred";
this.cbPreferred.Size = new System.Drawing.Size(99, 21);
this.cbPreferred.TabIndex = 11;
this.cbPreferred.Text = "Preferred";
this.cbPreferred.UseVisualStyleBackColor = true;
//
// AddAddressDialog
//
this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 16F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.ClientSize = new System.Drawing.Size(263, 196);
this.Controls.Add(this.cbPreferred);
this.Controls.Add(this.cbParcel);
this.Controls.Add(this.cbInternational);
this.Controls.Add(this.btnCancel);
this.Controls.Add(this.btnOK);
this.Controls.Add(this.cbDomestic);
this.Controls.Add(this.cbPostal);
this.Controls.Add(this.cbWork);
this.Controls.Add(this.cbHome);
this.Name = "AddAddressDialog";
this.Text = "Address Type";
this.ResumeLayout(false);
this.PerformLayout();
}
#endregion
private System.Windows.Forms.CheckBox cbHome;
private System.Windows.Forms.CheckBox cbWork;
private System.Windows.Forms.CheckBox cbPostal;
private System.Windows.Forms.CheckBox cbDomestic;
private System.Windows.Forms.Button btnOK;
private System.Windows.Forms.Button btnCancel;
private System.Windows.Forms.CheckBox cbInternational;
private System.Windows.Forms.CheckBox cbParcel;
private System.Windows.Forms.CheckBox cbPreferred;
}
}

View File

@@ -0,0 +1,83 @@
using System;
using System.Collections.Generic;
using System.Data;
using System.Linq;
using System.Windows.Forms;
using Thought.vCards;
namespace vCardEditor.View.Customs
{
public partial class AddAddressDialog : Form
{
public List<vCardDeliveryAddressTypes> Addresses { get;}
private readonly List<CheckBox> _checkBoxes;
public AddAddressDialog()
{
InitializeComponent();
_checkBoxes = Controls.OfType<CheckBox>().ToList();
Addresses = new List<vCardDeliveryAddressTypes>();
}
public AddAddressDialog(List<vCardDeliveryAddressTypes> addressCollection)
{
InitializeComponent();
Addresses = addressCollection;
_checkBoxes = Controls.OfType<CheckBox>().ToList();
foreach (var item in addressCollection)
{
switch (item.ToString())
{
case "Home":
cbHome.Checked = true;
break;
case "Work":
cbWork.Checked = true;
break;
case "Postal":
cbPostal.Checked = true;
break;
case "Parcel":
cbParcel.Checked = true;
break;
case "Preferred":
cbPreferred.Checked = true;
break;
case "Domestic":
cbDomestic.Checked = true;
break;
case "International":
cbInternational.Checked = true;
break;
}
}
}
private void btnOK_Click(object sender, EventArgs e)
{
var checkedItems = _checkBoxes.Where(checkBox => checkBox.Checked);
if (checkedItems.Count() == 0)
{
MessageBox.Show("At least, one address type must be checked!");
DialogResult = DialogResult.None;
return;
}
Addresses.Clear();
foreach (var item in checkedItems)
{
var enumType = (vCardDeliveryAddressTypes)Enum.Parse(typeof(vCardDeliveryAddressTypes), item.Text, true);
Addresses.Add(enumType);
}
}
}
}

View File

@@ -112,18 +112,9 @@
<value>2.0</value>
</resheader>
<resheader name="reader">
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<data name="BlankLine" xml:space="preserve">
<value>Line {0} A blank line was encountered. This is not allowed in the vCard specification.</value>
</data>
<data name="ColonMissing" xml:space="preserve">
<value>Line {0}: A colon (:) is missing. All properties must be in NAME:VALUE format.</value>
</data>
<data name="EmptyName" xml:space="preserve">
<value>Line {0}: The name section of the property is empty.</value>
</data>
</root>

View File

@@ -0,0 +1,241 @@

namespace vCardEditor.View.Customs
{
partial class AddressBox
{
/// <summary>
/// Variable nécessaire au concepteur.
/// </summary>
private System.ComponentModel.IContainer components = null;
/// <summary>
/// Nettoyage des ressources utilisées.
/// </summary>
/// <param name="disposing">true si les ressources managées doivent être supprimées ; sinon, false.</param>
protected override void Dispose(bool disposing)
{
if (disposing && (components != null))
{
components.Dispose();
}
base.Dispose(disposing);
}
#region Code généré par le Concepteur de composants
/// <summary>
/// Méthode requise pour la prise en charge du concepteur - ne modifiez pas
/// le contenu de cette méthode avec l'éditeur de code.
/// </summary>
private void InitializeComponent()
{
this.ExtAddrValue = new vCardEditor.View.Customs.StateTextBox();
this.ExtAdressLabel = new System.Windows.Forms.Label();
this.StreetLabel = new System.Windows.Forms.Label();
this.StreetValue = new vCardEditor.View.Customs.StateTextBox();
this.POBoxLabel = new System.Windows.Forms.Label();
this.CountryValue = new vCardEditor.View.Customs.StateTextBox();
this.Country = new System.Windows.Forms.Label();
this.POBoxValue = new vCardEditor.View.Customs.StateTextBox();
this.CityLabel = new System.Windows.Forms.Label();
this.RegionValue = new vCardEditor.View.Customs.StateTextBox();
this.CityValue = new vCardEditor.View.Customs.StateTextBox();
this.StateLabel = new System.Windows.Forms.Label();
this.ZipLabel = new System.Windows.Forms.Label();
this.ZipValue = new vCardEditor.View.Customs.StateTextBox();
this.SuspendLayout();
//
// ExtAddrValue
//
this.ExtAddrValue.Location = new System.Drawing.Point(68, 45);
this.ExtAddrValue.Margin = new System.Windows.Forms.Padding(4);
this.ExtAddrValue.Name = "ExtAddrValue";
this.ExtAddrValue.oldText = null;
this.ExtAddrValue.Size = new System.Drawing.Size(190, 22);
this.ExtAddrValue.TabIndex = 27;
this.ExtAddrValue.LostFocus += new System.EventHandler(this.Value_TextChanged);
this.ExtAddrValue.Validated += new System.EventHandler(this.Value_TextChanged);
//
// ExtAdressLabel
//
this.ExtAdressLabel.Location = new System.Drawing.Point(5, 44);
this.ExtAdressLabel.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.ExtAdressLabel.Name = "ExtAdressLabel";
this.ExtAdressLabel.Size = new System.Drawing.Size(40, 23);
this.ExtAdressLabel.TabIndex = 26;
this.ExtAdressLabel.Text = "Ext:";
this.ExtAdressLabel.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
//
// StreetLabel
//
this.StreetLabel.Location = new System.Drawing.Point(2, 14);
this.StreetLabel.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.StreetLabel.Name = "StreetLabel";
this.StreetLabel.Size = new System.Drawing.Size(64, 23);
this.StreetLabel.TabIndex = 14;
this.StreetLabel.Text = "Address:";
this.StreetLabel.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
//
// StreetValue
//
this.StreetValue.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
| System.Windows.Forms.AnchorStyles.Right)));
this.StreetValue.Location = new System.Drawing.Point(68, 14);
this.StreetValue.Margin = new System.Windows.Forms.Padding(4);
this.StreetValue.Name = "StreetValue";
this.StreetValue.oldText = "";
this.StreetValue.Size = new System.Drawing.Size(632, 22);
this.StreetValue.TabIndex = 15;
this.StreetValue.LostFocus += new System.EventHandler(this.Value_TextChanged);
this.StreetValue.Validated += new System.EventHandler(this.Value_TextChanged);
//
// POBoxLabel
//
this.POBoxLabel.Location = new System.Drawing.Point(267, 76);
this.POBoxLabel.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.POBoxLabel.Name = "POBoxLabel";
this.POBoxLabel.Size = new System.Drawing.Size(38, 23);
this.POBoxLabel.TabIndex = 16;
this.POBoxLabel.Text = "PO :";
this.POBoxLabel.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
//
// CountryValue
//
this.CountryValue.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
| System.Windows.Forms.AnchorStyles.Right)));
this.CountryValue.Location = new System.Drawing.Point(557, 76);
this.CountryValue.Margin = new System.Windows.Forms.Padding(4);
this.CountryValue.Name = "CountryValue";
this.CountryValue.oldText = null;
this.CountryValue.Size = new System.Drawing.Size(143, 22);
this.CountryValue.TabIndex = 25;
this.CountryValue.LostFocus += new System.EventHandler(this.Value_TextChanged);
this.CountryValue.Validated += new System.EventHandler(this.Value_TextChanged);
//
// Country
//
this.Country.Location = new System.Drawing.Point(486, 74);
this.Country.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.Country.Name = "Country";
this.Country.Size = new System.Drawing.Size(65, 23);
this.Country.TabIndex = 24;
this.Country.Text = "Country:";
this.Country.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
//
// POBoxValue
//
this.POBoxValue.Location = new System.Drawing.Point(315, 77);
this.POBoxValue.Margin = new System.Windows.Forms.Padding(4);
this.POBoxValue.Name = "POBoxValue";
this.POBoxValue.oldText = null;
this.POBoxValue.Size = new System.Drawing.Size(166, 22);
this.POBoxValue.TabIndex = 17;
this.POBoxValue.LostFocus += new System.EventHandler(this.Value_TextChanged);
this.POBoxValue.Validated += new System.EventHandler(this.Value_TextChanged);
//
// CityLabel
//
this.CityLabel.Location = new System.Drawing.Point(267, 44);
this.CityLabel.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.CityLabel.Name = "CityLabel";
this.CityLabel.Size = new System.Drawing.Size(32, 23);
this.CityLabel.TabIndex = 18;
this.CityLabel.Text = "City:";
this.CityLabel.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
//
// RegionValue
//
this.RegionValue.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
| System.Windows.Forms.AnchorStyles.Right)));
this.RegionValue.Location = new System.Drawing.Point(557, 44);
this.RegionValue.Margin = new System.Windows.Forms.Padding(4);
this.RegionValue.Name = "RegionValue";
this.RegionValue.oldText = null;
this.RegionValue.Size = new System.Drawing.Size(143, 22);
this.RegionValue.TabIndex = 23;
this.RegionValue.LostFocus += new System.EventHandler(this.Value_TextChanged);
this.RegionValue.Validated += new System.EventHandler(this.Value_TextChanged);
//
// CityValue
//
this.CityValue.Location = new System.Drawing.Point(316, 46);
this.CityValue.Margin = new System.Windows.Forms.Padding(4);
this.CityValue.Name = "CityValue";
this.CityValue.oldText = null;
this.CityValue.Size = new System.Drawing.Size(166, 22);
this.CityValue.TabIndex = 19;
this.CityValue.LostFocus += new System.EventHandler(this.Value_TextChanged);
this.CityValue.Validated += new System.EventHandler(this.Value_TextChanged);
//
// StateLabel
//
this.StateLabel.Location = new System.Drawing.Point(486, 46);
this.StateLabel.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.StateLabel.Name = "StateLabel";
this.StateLabel.Size = new System.Drawing.Size(61, 23);
this.StateLabel.TabIndex = 22;
this.StateLabel.Text = "Region:";
this.StateLabel.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
//
// ZipLabel
//
this.ZipLabel.Location = new System.Drawing.Point(5, 75);
this.ZipLabel.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.ZipLabel.Name = "ZipLabel";
this.ZipLabel.Size = new System.Drawing.Size(37, 23);
this.ZipLabel.TabIndex = 28;
this.ZipLabel.Text = "Zip:";
this.ZipLabel.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
//
// ZipValue
//
this.ZipValue.Location = new System.Drawing.Point(68, 77);
this.ZipValue.Margin = new System.Windows.Forms.Padding(4);
this.ZipValue.Name = "ZipValue";
this.ZipValue.oldText = null;
this.ZipValue.Size = new System.Drawing.Size(190, 22);
this.ZipValue.TabIndex = 29;
//
// AddressBox
//
this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 16F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.Controls.Add(this.ZipLabel);
this.Controls.Add(this.ZipValue);
this.Controls.Add(this.ExtAddrValue);
this.Controls.Add(this.ExtAdressLabel);
this.Controls.Add(this.StreetLabel);
this.Controls.Add(this.StreetValue);
this.Controls.Add(this.POBoxLabel);
this.Controls.Add(this.CountryValue);
this.Controls.Add(this.Country);
this.Controls.Add(this.POBoxValue);
this.Controls.Add(this.CityLabel);
this.Controls.Add(this.RegionValue);
this.Controls.Add(this.CityValue);
this.Controls.Add(this.StateLabel);
this.Name = "AddressBox";
this.Size = new System.Drawing.Size(706, 104);
this.ResumeLayout(false);
this.PerformLayout();
}
#endregion
internal StateTextBox ExtAddrValue;
internal System.Windows.Forms.Label ExtAdressLabel;
internal System.Windows.Forms.Label StreetLabel;
internal StateTextBox StreetValue;
internal System.Windows.Forms.Label POBoxLabel;
internal StateTextBox CountryValue;
internal System.Windows.Forms.Label Country;
internal StateTextBox POBoxValue;
internal System.Windows.Forms.Label CityLabel;
internal StateTextBox RegionValue;
internal StateTextBox CityValue;
internal System.Windows.Forms.Label StateLabel;
internal System.Windows.Forms.Label ZipLabel;
internal StateTextBox ZipValue;
}
}

View File

@@ -0,0 +1,65 @@
using System;
using System.Collections.Generic;
using System.Windows.Forms;
using Thought.vCards;
namespace vCardEditor.View.Customs
{
public partial class AddressBox : UserControl
{
public event EventHandler TextChangedEvent;
public List<vCardDeliveryAddressTypes> AddressType { get; set; }
public AddressBox(string street, string city, string region, string country, string postalCode,
string extendedAddress, string postOfficeBox, List<vCardDeliveryAddressTypes> addressType)
{
InitializeComponent();
this.AddressType = addressType;
CityValue.Text = city;
CityValue.oldText = city;
CountryValue.Text = country;
CountryValue.oldText = country;
ZipValue.Text = postalCode;
ZipValue.oldText = postalCode;
RegionValue.Text = region;
RegionValue.oldText = region;
StreetValue.Text = street;
StreetValue.oldText = street;
ExtAddrValue.Text = extendedAddress;
ExtAddrValue.oldText = extendedAddress;
POBoxValue.Text = postOfficeBox;
POBoxValue.oldText = postOfficeBox;
}
private void Value_TextChanged(object sender, EventArgs e)
{
TextChangedEvent?.Invoke(sender, e);
}
public vCardDeliveryAddress getDeliveryAddress()
{
var deliveryAddress = new vCardDeliveryAddress
{
City = CityValue.Text,
Country = CountryValue.Text,
PostalCode = ZipValue.Text,
Region = RegionValue.Text,
Street = StreetValue.Text,
ExtendedAddress = ExtAddrValue.Text,
PostOfficeBox = POBoxValue.Text,
AddressType = AddressType
};
return deliveryAddress;
}
}
}

View File

@@ -0,0 +1,120 @@
<?xml version="1.0" encoding="utf-8"?>
<root>
<!--
Microsoft ResX Schema
Version 2.0
The primary goals of this format is to allow a simple XML format
that is mostly human readable. The generation and parsing of the
various data types are done through the TypeConverter classes
associated with the data types.
Example:
... ado.net/XML headers & schema ...
<resheader name="resmimetype">text/microsoft-resx</resheader>
<resheader name="version">2.0</resheader>
<resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
<resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
<data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
<data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
<data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
<value>[base64 mime encoded serialized .NET Framework object]</value>
</data>
<data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
<comment>This is a comment</comment>
</data>
There are any number of "resheader" rows that contain simple
name/value pairs.
Each data row contains a name, and value. The row also contains a
type or mimetype. Type corresponds to a .NET class that support
text/value conversion through the TypeConverter architecture.
Classes that don't support this are serialized and stored with the
mimetype set.
The mimetype is used for serialized objects, and tells the
ResXResourceReader how to depersist the object. This is currently not
extensible. For a given mimetype the value must be set accordingly:
Note - application/x-microsoft.net.object.binary.base64 is the format
that the ResXResourceWriter will generate, however the reader can
read any of the formats listed below.
mimetype: application/x-microsoft.net.object.binary.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.soap.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Soap.SoapFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.bytearray.base64
value : The object must be serialized into a byte array
: using a System.ComponentModel.TypeConverter
: and then encoded with base64 encoding.
-->
<xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
<xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
<xsd:element name="root" msdata:IsDataSet="true">
<xsd:complexType>
<xsd:choice maxOccurs="unbounded">
<xsd:element name="metadata">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" />
</xsd:sequence>
<xsd:attribute name="name" use="required" type="xsd:string" />
<xsd:attribute name="type" type="xsd:string" />
<xsd:attribute name="mimetype" type="xsd:string" />
<xsd:attribute ref="xml:space" />
</xsd:complexType>
</xsd:element>
<xsd:element name="assembly">
<xsd:complexType>
<xsd:attribute name="alias" type="xsd:string" />
<xsd:attribute name="name" type="xsd:string" />
</xsd:complexType>
</xsd:element>
<xsd:element name="data">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
<xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
<xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
<xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
<xsd:attribute ref="xml:space" />
</xsd:complexType>
</xsd:element>
<xsd:element name="resheader">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required" />
</xsd:complexType>
</xsd:element>
</xsd:choice>
</xsd:complexType>
</xsd:element>
</xsd:schema>
<resheader name="resmimetype">
<value>text/microsoft-resx</value>
</resheader>
<resheader name="version">
<value>2.0</value>
</resheader>
<resheader name="reader">
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
</root>

Some files were not shown because too many files have changed in this diff Show More