diff --git a/EETGW.sln b/EETGW.sln index 9c8db93..efdb9cd 100644 --- a/EETGW.sln +++ b/EETGW.sln @@ -46,7 +46,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "솔루션 항목", "솔루 MemoryMap.cs = MemoryMap.cs EndProjectSection EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "YARTE", "Sub\YARTE\YARTE\YARTE\YARTE.csproj", "{DB5EE9C8-EACF-4231-877E-B9DFD7A714DE}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "YARTE", "Sub\YARTE\YARTE.csproj", "{DB5EE9C8-EACF-4231-877E-B9DFD7A714DE}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution diff --git a/Project/Controller/ItemController.cs b/Project/Controller/ItemController.cs index 20c6567..f360359 100644 --- a/Project/Controller/ItemController.cs +++ b/Project/Controller/ItemController.cs @@ -51,7 +51,7 @@ namespace Project if (searchkey.isEmpty() == false) { var db = new EEEntitiesMain(); - var rows = db.vFindSID.Where(t => t.sid.Contains(searchkey) || t.name.Contains(searchkey) || t.manu.Contains(searchkey) || t.model.Contains(searchkey)); + var rows = db.vFindSID.Where(t => t.sid.Contains(searchkey) || t.name.Contains(searchkey) || t.model.Contains(searchkey)); itemcnt = rows.Count(); foreach (var item in rows) { diff --git a/Sub/YARTE/YARTE/YARTE/Buttons/BoldButton.cs b/Sub/YARTE/Buttons/BoldButton.cs similarity index 100% rename from Sub/YARTE/YARTE/YARTE/Buttons/BoldButton.cs rename to Sub/YARTE/Buttons/BoldButton.cs diff --git a/Sub/YARTE/YARTE/YARTE/Buttons/CheckboxButton.cs b/Sub/YARTE/Buttons/CheckboxButton.cs similarity index 100% rename from Sub/YARTE/YARTE/YARTE/Buttons/CheckboxButton.cs rename to Sub/YARTE/Buttons/CheckboxButton.cs diff --git a/Sub/YARTE/YARTE/YARTE/Buttons/ForecolorButton.cs b/Sub/YARTE/Buttons/ForecolorButton.cs similarity index 100% rename from Sub/YARTE/YARTE/YARTE/Buttons/ForecolorButton.cs rename to Sub/YARTE/Buttons/ForecolorButton.cs diff --git a/Sub/YARTE/YARTE/YARTE/Buttons/IButton.cs b/Sub/YARTE/Buttons/IButton.cs similarity index 100% rename from Sub/YARTE/YARTE/YARTE/Buttons/IButton.cs rename to Sub/YARTE/Buttons/IButton.cs diff --git a/Sub/YARTE/YARTE/YARTE/Buttons/IFunctionButton.cs b/Sub/YARTE/Buttons/IFunctionButton.cs similarity index 100% rename from Sub/YARTE/YARTE/YARTE/Buttons/IFunctionButton.cs rename to Sub/YARTE/Buttons/IFunctionButton.cs diff --git a/Sub/YARTE/YARTE/YARTE/Buttons/IHTMLEditorButton.cs b/Sub/YARTE/Buttons/IHTMLEditorButton.cs similarity index 100% rename from Sub/YARTE/YARTE/YARTE/Buttons/IHTMLEditorButton.cs rename to Sub/YARTE/Buttons/IHTMLEditorButton.cs diff --git a/Sub/YARTE/YARTE/YARTE/Buttons/InsertLinkedImageButton.cs b/Sub/YARTE/Buttons/InsertLinkedImageButton.cs similarity index 100% rename from Sub/YARTE/YARTE/YARTE/Buttons/InsertLinkedImageButton.cs rename to Sub/YARTE/Buttons/InsertLinkedImageButton.cs diff --git a/Sub/YARTE/YARTE/YARTE/Buttons/ItalicButton.cs b/Sub/YARTE/Buttons/ItalicButton.cs similarity index 100% rename from Sub/YARTE/YARTE/YARTE/Buttons/ItalicButton.cs rename to Sub/YARTE/Buttons/ItalicButton.cs diff --git a/Sub/YARTE/YARTE/YARTE/Buttons/JustifyCenterButton.cs b/Sub/YARTE/Buttons/JustifyCenterButton.cs similarity index 100% rename from Sub/YARTE/YARTE/YARTE/Buttons/JustifyCenterButton.cs rename to Sub/YARTE/Buttons/JustifyCenterButton.cs diff --git a/Sub/YARTE/YARTE/YARTE/Buttons/JustifyLeftButton.cs b/Sub/YARTE/Buttons/JustifyLeftButton.cs similarity index 100% rename from Sub/YARTE/YARTE/YARTE/Buttons/JustifyLeftButton.cs rename to Sub/YARTE/Buttons/JustifyLeftButton.cs diff --git a/Sub/YARTE/YARTE/YARTE/Buttons/JustifyRightButton.cs b/Sub/YARTE/Buttons/JustifyRightButton.cs similarity index 100% rename from Sub/YARTE/YARTE/YARTE/Buttons/JustifyRightButton.cs rename to Sub/YARTE/Buttons/JustifyRightButton.cs diff --git a/Sub/YARTE/YARTE/YARTE/Buttons/LinkButton.cs b/Sub/YARTE/Buttons/LinkButton.cs similarity index 100% rename from Sub/YARTE/YARTE/YARTE/Buttons/LinkButton.cs rename to Sub/YARTE/Buttons/LinkButton.cs diff --git a/Sub/YARTE/YARTE/YARTE/Buttons/OrderedListButton.cs b/Sub/YARTE/Buttons/OrderedListButton.cs similarity index 100% rename from Sub/YARTE/YARTE/YARTE/Buttons/OrderedListButton.cs rename to Sub/YARTE/Buttons/OrderedListButton.cs diff --git a/Sub/YARTE/YARTE/YARTE/Buttons/PredefinedButtonSets.cs b/Sub/YARTE/Buttons/PredefinedButtonSets.cs similarity index 100% rename from Sub/YARTE/YARTE/YARTE/Buttons/PredefinedButtonSets.cs rename to Sub/YARTE/Buttons/PredefinedButtonSets.cs diff --git a/Sub/YARTE/YARTE/YARTE/Buttons/ReadOnlyButton.cs b/Sub/YARTE/Buttons/ReadOnlyButton.cs similarity index 100% rename from Sub/YARTE/YARTE/YARTE/Buttons/ReadOnlyButton.cs rename to Sub/YARTE/Buttons/ReadOnlyButton.cs diff --git a/Sub/YARTE/YARTE/YARTE/Buttons/UnderlineButton.cs b/Sub/YARTE/Buttons/UnderlineButton.cs similarity index 100% rename from Sub/YARTE/YARTE/YARTE/Buttons/UnderlineButton.cs rename to Sub/YARTE/Buttons/UnderlineButton.cs diff --git a/Sub/YARTE/YARTE/YARTE/Buttons/UnlinkButton.cs b/Sub/YARTE/Buttons/UnlinkButton.cs similarity index 100% rename from Sub/YARTE/YARTE/YARTE/Buttons/UnlinkButton.cs rename to Sub/YARTE/Buttons/UnlinkButton.cs diff --git a/Sub/YARTE/YARTE/YARTE/Buttons/UnorderedListButton.cs b/Sub/YARTE/Buttons/UnorderedListButton.cs similarity index 100% rename from Sub/YARTE/YARTE/YARTE/Buttons/UnorderedListButton.cs rename to Sub/YARTE/Buttons/UnorderedListButton.cs diff --git a/Sub/YARTE/YARTE/YARTE/CheckboxItem.cs b/Sub/YARTE/CheckboxItem.cs similarity index 100% rename from Sub/YARTE/YARTE/YARTE/CheckboxItem.cs rename to Sub/YARTE/CheckboxItem.cs diff --git a/Sub/YARTE/YARTE/YARTE/HTMLEditor.Designer.cs b/Sub/YARTE/HTMLEditor.Designer.cs similarity index 100% rename from Sub/YARTE/YARTE/YARTE/HTMLEditor.Designer.cs rename to Sub/YARTE/HTMLEditor.Designer.cs diff --git a/Sub/YARTE/YARTE/YARTE/HTMLEditor.resx b/Sub/YARTE/HTMLEditor.resx similarity index 100% rename from Sub/YARTE/YARTE/YARTE/HTMLEditor.resx rename to Sub/YARTE/HTMLEditor.resx diff --git a/Sub/YARTE/YARTE/YARTE/HtmlEditor.cs b/Sub/YARTE/HtmlEditor.cs similarity index 100% rename from Sub/YARTE/YARTE/YARTE/HtmlEditor.cs rename to Sub/YARTE/HtmlEditor.cs diff --git a/Sub/YARTE/LICENSE b/Sub/YARTE/LICENSE deleted file mode 100644 index 8dada3e..0000000 --- a/Sub/YARTE/LICENSE +++ /dev/null @@ -1,201 +0,0 @@ - Apache License - Version 2.0, January 2004 - http://www.apache.org/licenses/ - - TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION - - 1. Definitions. - - "License" shall mean the terms and conditions for use, reproduction, - and distribution as defined by Sections 1 through 9 of this document. - - "Licensor" shall mean the copyright owner or entity authorized by - the copyright owner that is granting the License. - - "Legal Entity" shall mean the union of the acting entity and all - other entities that control, are controlled by, or are under common - control with that entity. For the purposes of this definition, - "control" means (i) the power, direct or indirect, to cause the - direction or management of such entity, whether by contract or - otherwise, or (ii) ownership of fifty percent (50%) or more of the - outstanding shares, or (iii) beneficial ownership of such entity. - - "You" (or "Your") shall mean an individual or Legal Entity - exercising permissions granted by this License. - - "Source" form shall mean the preferred form for making modifications, - including but not limited to software source code, documentation - source, and configuration files. - - "Object" form shall mean any form resulting from mechanical - transformation or translation of a Source form, including but - not limited to compiled object code, generated documentation, - and conversions to other media types. - - "Work" shall mean the work of authorship, whether in Source or - Object form, made available under the License, as indicated by a - copyright notice that is included in or attached to the work - (an example is provided in the Appendix below). - - "Derivative Works" shall mean any work, whether in Source or Object - form, that is based on (or derived from) the Work and for which the - editorial revisions, annotations, elaborations, or other modifications - represent, as a whole, an original work of authorship. For the purposes - of this License, Derivative Works shall not include works that remain - separable from, or merely link (or bind by name) to the interfaces of, - the Work and Derivative Works thereof. - - "Contribution" shall mean any work of authorship, including - the original version of the Work and any modifications or additions - to that Work or Derivative Works thereof, that is intentionally - submitted to Licensor for inclusion in the Work by the copyright owner - or by an individual or Legal Entity authorized to submit on behalf of - the copyright owner. For the purposes of this definition, "submitted" - means any form of electronic, verbal, or written communication sent - to the Licensor or its representatives, including but not limited to - communication on electronic mailing lists, source code control systems, - and issue tracking systems that are managed by, or on behalf of, the - Licensor for the purpose of discussing and improving the Work, but - excluding communication that is conspicuously marked or otherwise - designated in writing by the copyright owner as "Not a Contribution." - - "Contributor" shall mean Licensor and any individual or Legal Entity - on behalf of whom a Contribution has been received by Licensor and - subsequently incorporated within the Work. - - 2. Grant of Copyright License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - copyright license to reproduce, prepare Derivative Works of, - publicly display, publicly perform, sublicense, and distribute the - Work and such Derivative Works in Source or Object form. - - 3. Grant of Patent License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - (except as stated in this section) patent license to make, have made, - use, offer to sell, sell, import, and otherwise transfer the Work, - where such license applies only to those patent claims licensable - by such Contributor that are necessarily infringed by their - Contribution(s) alone or by combination of their Contribution(s) - with the Work to which such Contribution(s) was submitted. If You - institute patent litigation against any entity (including a - cross-claim or counterclaim in a lawsuit) alleging that the Work - or a Contribution incorporated within the Work constitutes direct - or contributory patent infringement, then any patent licenses - granted to You under this License for that Work shall terminate - as of the date such litigation is filed. - - 4. Redistribution. You may reproduce and distribute copies of the - Work or Derivative Works thereof in any medium, with or without - modifications, and in Source or Object form, provided that You - meet the following conditions: - - (a) You must give any other recipients of the Work or - Derivative Works a copy of this License; and - - (b) You must cause any modified files to carry prominent notices - stating that You changed the files; and - - (c) You must retain, in the Source form of any Derivative Works - that You distribute, all copyright, patent, trademark, and - attribution notices from the Source form of the Work, - excluding those notices that do not pertain to any part of - the Derivative Works; and - - (d) If the Work includes a "NOTICE" text file as part of its - distribution, then any Derivative Works that You distribute must - include a readable copy of the attribution notices contained - within such NOTICE file, excluding those notices that do not - pertain to any part of the Derivative Works, in at least one - of the following places: within a NOTICE text file distributed - as part of the Derivative Works; within the Source form or - documentation, if provided along with the Derivative Works; or, - within a display generated by the Derivative Works, if and - wherever such third-party notices normally appear. The contents - of the NOTICE file are for informational purposes only and - do not modify the License. You may add Your own attribution - notices within Derivative Works that You distribute, alongside - or as an addendum to the NOTICE text from the Work, provided - that such additional attribution notices cannot be construed - as modifying the License. - - You may add Your own copyright statement to Your modifications and - may provide additional or different license terms and conditions - for use, reproduction, or distribution of Your modifications, or - for any such Derivative Works as a whole, provided Your use, - reproduction, and distribution of the Work otherwise complies with - the conditions stated in this License. - - 5. Submission of Contributions. Unless You explicitly state otherwise, - any Contribution intentionally submitted for inclusion in the Work - by You to the Licensor shall be under the terms and conditions of - this License, without any additional terms or conditions. - Notwithstanding the above, nothing herein shall supersede or modify - the terms of any separate license agreement you may have executed - with Licensor regarding such Contributions. - - 6. Trademarks. This License does not grant permission to use the trade - names, trademarks, service marks, or product names of the Licensor, - except as required for reasonable and customary use in describing the - origin of the Work and reproducing the content of the NOTICE file. - - 7. Disclaimer of Warranty. Unless required by applicable law or - agreed to in writing, Licensor provides the Work (and each - Contributor provides its Contributions) on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - implied, including, without limitation, any warranties or conditions - of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A - PARTICULAR PURPOSE. You are solely responsible for determining the - appropriateness of using or redistributing the Work and assume any - risks associated with Your exercise of permissions under this License. - - 8. Limitation of Liability. In no event and under no legal theory, - whether in tort (including negligence), contract, or otherwise, - unless required by applicable law (such as deliberate and grossly - negligent acts) or agreed to in writing, shall any Contributor be - liable to You for damages, including any direct, indirect, special, - incidental, or consequential damages of any character arising as a - result of this License or out of the use or inability to use the - Work (including but not limited to damages for loss of goodwill, - work stoppage, computer failure or malfunction, or any and all - other commercial damages or losses), even if such Contributor - has been advised of the possibility of such damages. - - 9. Accepting Warranty or Additional Liability. While redistributing - the Work or Derivative Works thereof, You may choose to offer, - and charge a fee for, acceptance of support, warranty, indemnity, - or other liability obligations and/or rights consistent with this - License. However, in accepting such obligations, You may act only - on Your own behalf and on Your sole responsibility, not on behalf - of any other Contributor, and only if You agree to indemnify, - defend, and hold each Contributor harmless for any liability - incurred by, or claims asserted against, such Contributor by reason - of your accepting any such warranty or additional liability. - - END OF TERMS AND CONDITIONS - - APPENDIX: How to apply the Apache License to your work. - - To apply the Apache License to your work, attach the following - boilerplate notice, with the fields enclosed by brackets "{}" - replaced with your own identifying information. (Don't include - the brackets!) The text should be enclosed in the appropriate - comment syntax for the file format. We also recommend that a - file or class name and description of purpose be included on the - same "printed page" as the copyright notice for easier - identification within third-party archives. - - Copyright {yyyy} {name of copyright owner} - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. diff --git a/Sub/YARTE/YARTE/YARTE/Properties/AssemblyInfo.cs b/Sub/YARTE/Properties/AssemblyInfo.cs similarity index 100% rename from Sub/YARTE/YARTE/YARTE/Properties/AssemblyInfo.cs rename to Sub/YARTE/Properties/AssemblyInfo.cs diff --git a/Sub/YARTE/YARTE/YARTE/Properties/Resources.Designer.cs b/Sub/YARTE/Properties/Resources.Designer.cs similarity index 100% rename from Sub/YARTE/YARTE/YARTE/Properties/Resources.Designer.cs rename to Sub/YARTE/Properties/Resources.Designer.cs diff --git a/Sub/YARTE/YARTE/YARTE/Properties/Resources.resx b/Sub/YARTE/Properties/Resources.resx similarity index 100% rename from Sub/YARTE/YARTE/YARTE/Properties/Resources.resx rename to Sub/YARTE/Properties/Resources.resx diff --git a/Sub/YARTE/README.md b/Sub/YARTE/README.md deleted file mode 100644 index 515cdf5..0000000 --- a/Sub/YARTE/README.md +++ /dev/null @@ -1,2 +0,0 @@ -# YARTE -YARTE (Yet Another Rich Text Editor) is an HTML-based rich text editor for WinForms. The original project is located at http://yarte.codeplex.com/. diff --git a/Sub/YARTE/YARTE/YARTE/Resources/bold.gif b/Sub/YARTE/Resources/bold.gif similarity index 100% rename from Sub/YARTE/YARTE/YARTE/Resources/bold.gif rename to Sub/YARTE/Resources/bold.gif diff --git a/Sub/YARTE/YARTE/YARTE/Resources/bulletedlist.gif b/Sub/YARTE/Resources/bulletedlist.gif similarity index 100% rename from Sub/YARTE/YARTE/YARTE/Resources/bulletedlist.gif rename to Sub/YARTE/Resources/bulletedlist.gif diff --git a/Sub/YARTE/YARTE/YARTE/Resources/copy.gif b/Sub/YARTE/Resources/copy.gif similarity index 100% rename from Sub/YARTE/YARTE/YARTE/Resources/copy.gif rename to Sub/YARTE/Resources/copy.gif diff --git a/Sub/YARTE/YARTE/YARTE/Resources/createlink.gif b/Sub/YARTE/Resources/createlink.gif similarity index 100% rename from Sub/YARTE/YARTE/YARTE/Resources/createlink.gif rename to Sub/YARTE/Resources/createlink.gif diff --git a/Sub/YARTE/YARTE/YARTE/Resources/cut.gif b/Sub/YARTE/Resources/cut.gif similarity index 100% rename from Sub/YARTE/YARTE/YARTE/Resources/cut.gif rename to Sub/YARTE/Resources/cut.gif diff --git a/Sub/YARTE/YARTE/YARTE/Resources/delete.gif b/Sub/YARTE/Resources/delete.gif similarity index 100% rename from Sub/YARTE/YARTE/YARTE/Resources/delete.gif rename to Sub/YARTE/Resources/delete.gif diff --git a/Sub/YARTE/YARTE/YARTE/Resources/deletetablecolumn.gif b/Sub/YARTE/Resources/deletetablecolumn.gif similarity index 100% rename from Sub/YARTE/YARTE/YARTE/Resources/deletetablecolumn.gif rename to Sub/YARTE/Resources/deletetablecolumn.gif diff --git a/Sub/YARTE/YARTE/YARTE/Resources/deletetablerow.gif b/Sub/YARTE/Resources/deletetablerow.gif similarity index 100% rename from Sub/YARTE/YARTE/YARTE/Resources/deletetablerow.gif rename to Sub/YARTE/Resources/deletetablerow.gif diff --git a/Sub/YARTE/YARTE/YARTE/Resources/editstyle.gif b/Sub/YARTE/Resources/editstyle.gif similarity index 100% rename from Sub/YARTE/YARTE/YARTE/Resources/editstyle.gif rename to Sub/YARTE/Resources/editstyle.gif diff --git a/Sub/YARTE/YARTE/YARTE/Resources/edittable.gif b/Sub/YARTE/Resources/edittable.gif similarity index 100% rename from Sub/YARTE/YARTE/YARTE/Resources/edittable.gif rename to Sub/YARTE/Resources/edittable.gif diff --git a/Sub/YARTE/YARTE/YARTE/Resources/fontbackcolorpicker.gif b/Sub/YARTE/Resources/fontbackcolorpicker.gif similarity index 100% rename from Sub/YARTE/YARTE/YARTE/Resources/fontbackcolorpicker.gif rename to Sub/YARTE/Resources/fontbackcolorpicker.gif diff --git a/Sub/YARTE/YARTE/YARTE/Resources/fontforecolorpicker.gif b/Sub/YARTE/Resources/fontforecolorpicker.gif similarity index 100% rename from Sub/YARTE/YARTE/YARTE/Resources/fontforecolorpicker.gif rename to Sub/YARTE/Resources/fontforecolorpicker.gif diff --git a/Sub/YARTE/YARTE/YARTE/Resources/iespellcheck.gif b/Sub/YARTE/Resources/iespellcheck.gif similarity index 100% rename from Sub/YARTE/YARTE/YARTE/Resources/iespellcheck.gif rename to Sub/YARTE/Resources/iespellcheck.gif diff --git a/Sub/YARTE/YARTE/YARTE/Resources/indent.gif b/Sub/YARTE/Resources/indent.gif similarity index 100% rename from Sub/YARTE/YARTE/YARTE/Resources/indent.gif rename to Sub/YARTE/Resources/indent.gif diff --git a/Sub/YARTE/YARTE/YARTE/Resources/insertbutton.gif b/Sub/YARTE/Resources/insertbutton.gif similarity index 100% rename from Sub/YARTE/YARTE/YARTE/Resources/insertbutton.gif rename to Sub/YARTE/Resources/insertbutton.gif diff --git a/Sub/YARTE/YARTE/YARTE/Resources/insertcheckbox.gif b/Sub/YARTE/Resources/insertcheckbox.gif similarity index 100% rename from Sub/YARTE/YARTE/YARTE/Resources/insertcheckbox.gif rename to Sub/YARTE/Resources/insertcheckbox.gif diff --git a/Sub/YARTE/YARTE/YARTE/Resources/insertdate.gif b/Sub/YARTE/Resources/insertdate.gif similarity index 100% rename from Sub/YARTE/YARTE/YARTE/Resources/insertdate.gif rename to Sub/YARTE/Resources/insertdate.gif diff --git a/Sub/YARTE/YARTE/YARTE/Resources/insertdiv.gif b/Sub/YARTE/Resources/insertdiv.gif similarity index 100% rename from Sub/YARTE/YARTE/YARTE/Resources/insertdiv.gif rename to Sub/YARTE/Resources/insertdiv.gif diff --git a/Sub/YARTE/YARTE/YARTE/Resources/insertdropdownlist.gif b/Sub/YARTE/Resources/insertdropdownlist.gif similarity index 100% rename from Sub/YARTE/YARTE/YARTE/Resources/insertdropdownlist.gif rename to Sub/YARTE/Resources/insertdropdownlist.gif diff --git a/Sub/YARTE/YARTE/YARTE/Resources/insertform.gif b/Sub/YARTE/Resources/insertform.gif similarity index 100% rename from Sub/YARTE/YARTE/YARTE/Resources/insertform.gif rename to Sub/YARTE/Resources/insertform.gif diff --git a/Sub/YARTE/YARTE/YARTE/Resources/insertimage.gif b/Sub/YARTE/Resources/insertimage.gif similarity index 100% rename from Sub/YARTE/YARTE/YARTE/Resources/insertimage.gif rename to Sub/YARTE/Resources/insertimage.gif diff --git a/Sub/YARTE/YARTE/YARTE/Resources/insertimagefromgallery.gif b/Sub/YARTE/Resources/insertimagefromgallery.gif similarity index 100% rename from Sub/YARTE/YARTE/YARTE/Resources/insertimagefromgallery.gif rename to Sub/YARTE/Resources/insertimagefromgallery.gif diff --git a/Sub/YARTE/YARTE/YARTE/Resources/insertradiobutton.gif b/Sub/YARTE/Resources/insertradiobutton.gif similarity index 100% rename from Sub/YARTE/YARTE/YARTE/Resources/insertradiobutton.gif rename to Sub/YARTE/Resources/insertradiobutton.gif diff --git a/Sub/YARTE/YARTE/YARTE/Resources/insertrule.gif b/Sub/YARTE/Resources/insertrule.gif similarity index 100% rename from Sub/YARTE/YARTE/YARTE/Resources/insertrule.gif rename to Sub/YARTE/Resources/insertrule.gif diff --git a/Sub/YARTE/YARTE/YARTE/Resources/inserttable.gif b/Sub/YARTE/Resources/inserttable.gif similarity index 100% rename from Sub/YARTE/YARTE/YARTE/Resources/inserttable.gif rename to Sub/YARTE/Resources/inserttable.gif diff --git a/Sub/YARTE/YARTE/YARTE/Resources/inserttablecolumnafter.gif b/Sub/YARTE/Resources/inserttablecolumnafter.gif similarity index 100% rename from Sub/YARTE/YARTE/YARTE/Resources/inserttablecolumnafter.gif rename to Sub/YARTE/Resources/inserttablecolumnafter.gif diff --git a/Sub/YARTE/YARTE/YARTE/Resources/inserttablecolumnbefore.gif b/Sub/YARTE/Resources/inserttablecolumnbefore.gif similarity index 100% rename from Sub/YARTE/YARTE/YARTE/Resources/inserttablecolumnbefore.gif rename to Sub/YARTE/Resources/inserttablecolumnbefore.gif diff --git a/Sub/YARTE/YARTE/YARTE/Resources/inserttablerowafter.gif b/Sub/YARTE/Resources/inserttablerowafter.gif similarity index 100% rename from Sub/YARTE/YARTE/YARTE/Resources/inserttablerowafter.gif rename to Sub/YARTE/Resources/inserttablerowafter.gif diff --git a/Sub/YARTE/YARTE/YARTE/Resources/inserttablerowbefore.gif b/Sub/YARTE/Resources/inserttablerowbefore.gif similarity index 100% rename from Sub/YARTE/YARTE/YARTE/Resources/inserttablerowbefore.gif rename to Sub/YARTE/Resources/inserttablerowbefore.gif diff --git a/Sub/YARTE/YARTE/YARTE/Resources/inserttextarea.gif b/Sub/YARTE/Resources/inserttextarea.gif similarity index 100% rename from Sub/YARTE/YARTE/YARTE/Resources/inserttextarea.gif rename to Sub/YARTE/Resources/inserttextarea.gif diff --git a/Sub/YARTE/YARTE/YARTE/Resources/inserttextbox.gif b/Sub/YARTE/Resources/inserttextbox.gif similarity index 100% rename from Sub/YARTE/YARTE/YARTE/Resources/inserttextbox.gif rename to Sub/YARTE/Resources/inserttextbox.gif diff --git a/Sub/YARTE/YARTE/YARTE/Resources/inserttime.gif b/Sub/YARTE/Resources/inserttime.gif similarity index 100% rename from Sub/YARTE/YARTE/YARTE/Resources/inserttime.gif rename to Sub/YARTE/Resources/inserttime.gif diff --git a/Sub/YARTE/YARTE/YARTE/Resources/italic.gif b/Sub/YARTE/Resources/italic.gif similarity index 100% rename from Sub/YARTE/YARTE/YARTE/Resources/italic.gif rename to Sub/YARTE/Resources/italic.gif diff --git a/Sub/YARTE/YARTE/YARTE/Resources/justifycenter.gif b/Sub/YARTE/Resources/justifycenter.gif similarity index 100% rename from Sub/YARTE/YARTE/YARTE/Resources/justifycenter.gif rename to Sub/YARTE/Resources/justifycenter.gif diff --git a/Sub/YARTE/YARTE/YARTE/Resources/justifyfull.gif b/Sub/YARTE/Resources/justifyfull.gif similarity index 100% rename from Sub/YARTE/YARTE/YARTE/Resources/justifyfull.gif rename to Sub/YARTE/Resources/justifyfull.gif diff --git a/Sub/YARTE/YARTE/YARTE/Resources/justifyleft.gif b/Sub/YARTE/Resources/justifyleft.gif similarity index 100% rename from Sub/YARTE/YARTE/YARTE/Resources/justifyleft.gif rename to Sub/YARTE/Resources/justifyleft.gif diff --git a/Sub/YARTE/YARTE/YARTE/Resources/justifyright.gif b/Sub/YARTE/Resources/justifyright.gif similarity index 100% rename from Sub/YARTE/YARTE/YARTE/Resources/justifyright.gif rename to Sub/YARTE/Resources/justifyright.gif diff --git a/Sub/YARTE/YARTE/YARTE/Resources/netspell.gif b/Sub/YARTE/Resources/netspell.gif similarity index 100% rename from Sub/YARTE/YARTE/YARTE/Resources/netspell.gif rename to Sub/YARTE/Resources/netspell.gif diff --git a/Sub/YARTE/YARTE/YARTE/Resources/numberedlist.gif b/Sub/YARTE/Resources/numberedlist.gif similarity index 100% rename from Sub/YARTE/YARTE/YARTE/Resources/numberedlist.gif rename to Sub/YARTE/Resources/numberedlist.gif diff --git a/Sub/YARTE/YARTE/YARTE/Resources/outdent.gif b/Sub/YARTE/Resources/outdent.gif similarity index 100% rename from Sub/YARTE/YARTE/YARTE/Resources/outdent.gif rename to Sub/YARTE/Resources/outdent.gif diff --git a/Sub/YARTE/YARTE/YARTE/Resources/paste.gif b/Sub/YARTE/Resources/paste.gif similarity index 100% rename from Sub/YARTE/YARTE/YARTE/Resources/paste.gif rename to Sub/YARTE/Resources/paste.gif diff --git a/Sub/YARTE/YARTE/YARTE/Resources/preview.gif b/Sub/YARTE/Resources/preview.gif similarity index 100% rename from Sub/YARTE/YARTE/YARTE/Resources/preview.gif rename to Sub/YARTE/Resources/preview.gif diff --git a/Sub/YARTE/YARTE/YARTE/Resources/print.gif b/Sub/YARTE/Resources/print.gif similarity index 100% rename from Sub/YARTE/YARTE/YARTE/Resources/print.gif rename to Sub/YARTE/Resources/print.gif diff --git a/Sub/YARTE/YARTE/YARTE/Resources/redo.gif b/Sub/YARTE/Resources/redo.gif similarity index 100% rename from Sub/YARTE/YARTE/YARTE/Resources/redo.gif rename to Sub/YARTE/Resources/redo.gif diff --git a/Sub/YARTE/YARTE/YARTE/Resources/removeformat.gif b/Sub/YARTE/Resources/removeformat.gif similarity index 100% rename from Sub/YARTE/YARTE/YARTE/Resources/removeformat.gif rename to Sub/YARTE/Resources/removeformat.gif diff --git a/Sub/YARTE/YARTE/YARTE/Resources/save.gif b/Sub/YARTE/Resources/save.gif similarity index 100% rename from Sub/YARTE/YARTE/YARTE/Resources/save.gif rename to Sub/YARTE/Resources/save.gif diff --git a/Sub/YARTE/YARTE/YARTE/Resources/selectall.gif b/Sub/YARTE/Resources/selectall.gif similarity index 100% rename from Sub/YARTE/YARTE/YARTE/Resources/selectall.gif rename to Sub/YARTE/Resources/selectall.gif diff --git a/Sub/YARTE/YARTE/YARTE/Resources/strikethrough.gif b/Sub/YARTE/Resources/strikethrough.gif similarity index 100% rename from Sub/YARTE/YARTE/YARTE/Resources/strikethrough.gif rename to Sub/YARTE/Resources/strikethrough.gif diff --git a/Sub/YARTE/YARTE/YARTE/Resources/subscript.gif b/Sub/YARTE/Resources/subscript.gif similarity index 100% rename from Sub/YARTE/YARTE/YARTE/Resources/subscript.gif rename to Sub/YARTE/Resources/subscript.gif diff --git a/Sub/YARTE/YARTE/YARTE/Resources/superscript.gif b/Sub/YARTE/Resources/superscript.gif similarity index 100% rename from Sub/YARTE/YARTE/YARTE/Resources/superscript.gif rename to Sub/YARTE/Resources/superscript.gif diff --git a/Sub/YARTE/YARTE/YARTE/Resources/underline.gif b/Sub/YARTE/Resources/underline.gif similarity index 100% rename from Sub/YARTE/YARTE/YARTE/Resources/underline.gif rename to Sub/YARTE/Resources/underline.gif diff --git a/Sub/YARTE/YARTE/YARTE/Resources/undo.gif b/Sub/YARTE/Resources/undo.gif similarity index 100% rename from Sub/YARTE/YARTE/YARTE/Resources/undo.gif rename to Sub/YARTE/Resources/undo.gif diff --git a/Sub/YARTE/YARTE/YARTE/Resources/unlink.gif b/Sub/YARTE/Resources/unlink.gif similarity index 100% rename from Sub/YARTE/YARTE/YARTE/Resources/unlink.gif rename to Sub/YARTE/Resources/unlink.gif diff --git a/Sub/YARTE/YARTE/YARTE/Resources/wordclean.gif b/Sub/YARTE/Resources/wordclean.gif similarity index 100% rename from Sub/YARTE/YARTE/YARTE/Resources/wordclean.gif rename to Sub/YARTE/Resources/wordclean.gif diff --git a/Sub/YARTE/YARTE.Example/YARTE.Example/AddTaskDialog.Designer.cs b/Sub/YARTE/YARTE.Example/YARTE.Example/AddTaskDialog.Designer.cs deleted file mode 100644 index 05668ec..0000000 --- a/Sub/YARTE/YARTE.Example/YARTE.Example/AddTaskDialog.Designer.cs +++ /dev/null @@ -1,87 +0,0 @@ -namespace YARTE.Example -{ - partial class AddTaskDialog - { - /// - /// Required designer variable. - /// - private System.ComponentModel.IContainer components = null; - - /// - /// Clean up any resources being used. - /// - /// true if managed resources should be disposed; otherwise, false. - protected override void Dispose(bool disposing) - { - if (disposing && (components != null)) - { - components.Dispose(); - } - base.Dispose(disposing); - } - - #region Windows Form Designer generated code - - /// - /// Required method for Designer support - do not modify - /// the contents of this method with the code editor. - /// - private void InitializeComponent() - { - this.btnCancel = new System.Windows.Forms.Button(); - this.btnAdd = new System.Windows.Forms.Button(); - this.txtInput = new System.Windows.Forms.TextBox(); - this.SuspendLayout(); - // - // btnCancel - // - this.btnCancel.DialogResult = System.Windows.Forms.DialogResult.Cancel; - this.btnCancel.Location = new System.Drawing.Point(244, 75); - this.btnCancel.Name = "btnCancel"; - this.btnCancel.Size = new System.Drawing.Size(75, 23); - this.btnCancel.TabIndex = 2; - this.btnCancel.Text = "Cancel"; - this.btnCancel.UseVisualStyleBackColor = true; - this.btnCancel.Click += new System.EventHandler(this.btnCancel_Click); - // - // btnAdd - // - this.btnAdd.Location = new System.Drawing.Point(325, 75); - this.btnAdd.Name = "btnAdd"; - this.btnAdd.Size = new System.Drawing.Size(75, 23); - this.btnAdd.TabIndex = 1; - this.btnAdd.Text = "Add"; - this.btnAdd.UseVisualStyleBackColor = true; - this.btnAdd.Click += new System.EventHandler(this.btnAdd_Click); - // - // txtInput - // - this.txtInput.Location = new System.Drawing.Point(12, 30); - this.txtInput.Name = "txtInput"; - this.txtInput.Size = new System.Drawing.Size(388, 22); - this.txtInput.TabIndex = 0; - // - // AddTaskDialog - // - this.AcceptButton = this.btnAdd; - this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 16F); - this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.CancelButton = this.btnCancel; - this.ClientSize = new System.Drawing.Size(412, 110); - this.Controls.Add(this.txtInput); - this.Controls.Add(this.btnAdd); - this.Controls.Add(this.btnCancel); - this.Name = "AddTaskDialog"; - this.Text = "AddTaskDialog"; - this.ResumeLayout(false); - this.PerformLayout(); - - } - - #endregion - - private System.Windows.Forms.Button btnCancel; - private System.Windows.Forms.Button btnAdd; - private System.Windows.Forms.TextBox txtInput; - } -} \ No newline at end of file diff --git a/Sub/YARTE/YARTE.Example/YARTE.Example/AddTaskDialog.cs b/Sub/YARTE/YARTE.Example/YARTE.Example/AddTaskDialog.cs deleted file mode 100644 index 18b9ad7..0000000 --- a/Sub/YARTE/YARTE.Example/YARTE.Example/AddTaskDialog.cs +++ /dev/null @@ -1,33 +0,0 @@ -using System; -using System.Collections.Generic; -using System.ComponentModel; -using System.Data; -using System.Drawing; -using System.Linq; -using System.Text; -using System.Windows.Forms; - -namespace YARTE.Example -{ - public partial class AddTaskDialog : Form - { - private Form1 frmParent; - - public AddTaskDialog(Form1 parent) - { - InitializeComponent(); - frmParent = parent; - } - - private void btnCancel_Click(object sender, EventArgs e) - { - this.Close(); - } - - private void btnAdd_Click(object sender, EventArgs e) - { - frmParent.AddTask(txtInput.Text); - txtInput.Clear(); - } - } -} diff --git a/Sub/YARTE/YARTE.Example/YARTE.Example/AddTaskDialog.resx b/Sub/YARTE/YARTE.Example/YARTE.Example/AddTaskDialog.resx deleted file mode 100644 index 1af7de1..0000000 --- a/Sub/YARTE/YARTE.Example/YARTE.Example/AddTaskDialog.resx +++ /dev/null @@ -1,120 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - text/microsoft-resx - - - 2.0 - - - System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - \ No newline at end of file diff --git a/Sub/YARTE/YARTE.Example/YARTE.Example/Form1.Designer.cs b/Sub/YARTE/YARTE.Example/YARTE.Example/Form1.Designer.cs deleted file mode 100644 index 32fece3..0000000 --- a/Sub/YARTE/YARTE.Example/YARTE.Example/Form1.Designer.cs +++ /dev/null @@ -1,128 +0,0 @@ -namespace YARTE.Example -{ - partial class Form1 - { - /// - /// Required designer variable. - /// - private System.ComponentModel.IContainer components = null; - - /// - /// Clean up any resources being used. - /// - /// true if managed resources should be disposed; otherwise, false. - protected override void Dispose(bool disposing) - { - if (disposing && (components != null)) - { - components.Dispose(); - } - base.Dispose(disposing); - } - - #region Windows Form Designer generated code - - /// - /// Required method for Designer support - do not modify - /// the contents of this method with the code editor. - /// - private void InitializeComponent() - { - this.btnDispHTML = new System.Windows.Forms.Button(); - this.btnAddTodo = new System.Windows.Forms.Button(); - this.btnDispTasks = new System.Windows.Forms.Button(); - this.btnChangeChecked = new System.Windows.Forms.Button(); - this.htmlEditor1 = new YARTE.UI.HtmlEditor(); - this.btnGetTasks = new System.Windows.Forms.Button(); - this.SuspendLayout(); - // - // btnDispHTML - // - this.btnDispHTML.Location = new System.Drawing.Point(599, 398); - this.btnDispHTML.Name = "btnDispHTML"; - this.btnDispHTML.Size = new System.Drawing.Size(94, 23); - this.btnDispHTML.TabIndex = 1; - this.btnDispHTML.Text = "Disp HTML"; - this.btnDispHTML.UseVisualStyleBackColor = true; - this.btnDispHTML.Click += new System.EventHandler(this.btnDispHTML_Click); - // - // btnAddTodo - // - this.btnAddTodo.Location = new System.Drawing.Point(503, 398); - this.btnAddTodo.Name = "btnAddTodo"; - this.btnAddTodo.Size = new System.Drawing.Size(90, 23); - this.btnAddTodo.TabIndex = 2; - this.btnAddTodo.Text = "Add Todo"; - this.btnAddTodo.UseVisualStyleBackColor = true; - this.btnAddTodo.Click += new System.EventHandler(this.btnAddTodo_Click); - // - // btnDispTasks - // - this.btnDispTasks.Location = new System.Drawing.Point(407, 398); - this.btnDispTasks.Name = "btnDispTasks"; - this.btnDispTasks.Size = new System.Drawing.Size(90, 23); - this.btnDispTasks.TabIndex = 3; - this.btnDispTasks.Text = "Disp Tasks"; - this.btnDispTasks.UseVisualStyleBackColor = true; - this.btnDispTasks.Click += new System.EventHandler(this.btnDispTasks_Click); - // - // btnChangeChecked - // - this.btnChangeChecked.Location = new System.Drawing.Point(311, 398); - this.btnChangeChecked.Name = "btnChangeChecked"; - this.btnChangeChecked.Size = new System.Drawing.Size(90, 23); - this.btnChangeChecked.TabIndex = 4; - this.btnChangeChecked.Text = "Checked"; - this.btnChangeChecked.UseVisualStyleBackColor = true; - this.btnChangeChecked.Click += new System.EventHandler(this.btnChangeChecked_Click); - // - // htmlEditor1 - // - this.htmlEditor1.Dock = System.Windows.Forms.DockStyle.Top; - this.htmlEditor1.Html = null; - this.htmlEditor1.Location = new System.Drawing.Point(0, 0); - this.htmlEditor1.Margin = new System.Windows.Forms.Padding(4); - this.htmlEditor1.Name = "htmlEditor1"; - this.htmlEditor1.ReadOnly = false; - this.htmlEditor1.ShowToolbar = true; - this.htmlEditor1.Size = new System.Drawing.Size(723, 395); - this.htmlEditor1.TabIndex = 0; - // - // btnGetTasks - // - this.btnGetTasks.Location = new System.Drawing.Point(215, 398); - this.btnGetTasks.Name = "btnGetTasks"; - this.btnGetTasks.Size = new System.Drawing.Size(90, 23); - this.btnGetTasks.TabIndex = 5; - this.btnGetTasks.Text = "Get Tasks"; - this.btnGetTasks.UseVisualStyleBackColor = true; - this.btnGetTasks.Click += new System.EventHandler(this.btnGetTasks_Click); - // - // Form1 - // - this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 16F); - this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(723, 433); - this.Controls.Add(this.btnGetTasks); - this.Controls.Add(this.btnChangeChecked); - this.Controls.Add(this.btnDispTasks); - this.Controls.Add(this.btnAddTodo); - this.Controls.Add(this.btnDispHTML); - this.Controls.Add(this.htmlEditor1); - this.Name = "Form1"; - this.Text = "Form1"; - this.ResumeLayout(false); - - } - - #endregion - - private UI.HtmlEditor htmlEditor1; - private System.Windows.Forms.Button btnDispHTML; - private System.Windows.Forms.Button btnAddTodo; - private System.Windows.Forms.Button btnDispTasks; - private System.Windows.Forms.Button btnChangeChecked; - private System.Windows.Forms.Button btnGetTasks; - } -} - diff --git a/Sub/YARTE/YARTE.Example/YARTE.Example/Form1.cs b/Sub/YARTE/YARTE.Example/YARTE.Example/Form1.cs deleted file mode 100644 index 5b01cfe..0000000 --- a/Sub/YARTE/YARTE.Example/YARTE.Example/Form1.cs +++ /dev/null @@ -1,95 +0,0 @@ -using System.Collections.Generic; -using System.Windows.Forms; -using YARTE.UI.Buttons; -using System; - -namespace YARTE.Example -{ - public partial class Form1 : Form - { - //private List tasks = new List(); - private Dictionary tasks = new Dictionary(); - - public Form1() - { - InitializeComponent(); - - PredefinedButtonSets.SetupDefaultButtons(this.htmlEditor1); - } - - private void btnDispHTML_Click(object sender, System.EventArgs e) - { - MessageBox.Show(this.htmlEditor1.Html, "The output HTML"); - } - - private void btnAddTodo_Click(object sender, System.EventArgs e) - { - AddTaskDialog atd = new AddTaskDialog(this); - atd.ShowDialog(); - } - - public void AddTask(string label) - { - string id = htmlEditor1.insertCheckbox(label); - tasks.Add(id, new CheckboxItem(label, id)); - //htmlEditor1.InsertTextAtCursor(task.Identifier); - } - - private void btnDispTasks_Click(object sender, EventArgs e) - { - // display all unchecked s - string output = ""; - foreach (var item in htmlEditor1.getCheckedStates()) - { - if (item.Value) - { - output += item.Key + "\n"; - } - } - MessageBox.Show(output, "Checked Tasks"); - - // update and display the s in tasks - output = ""; - foreach (var item in htmlEditor1.getCheckedStates()) - { - CheckboxItem temp; - tasks.TryGetValue(item.Key, out temp); - temp.Checked = item.Value; - tasks.TryGetValue(item.Key, out temp); // redefine temp to ensure Dictionary contains up-to-date refs - output += temp.Label + " " + temp.Checked + "\n"; - } - MessageBox.Show(output, "Checked Tasks"); - } - - private void btnChangeChecked_Click(object sender, EventArgs e) - { - // changes an arbitrary task's checked state - Random rand = new Random(); - int temp = rand.Next(0, tasks.Count); - CheckboxItem[] items = new CheckboxItem[10]; - CheckboxItem selected; - tasks.Values.CopyTo(items,0); - Console.WriteLine(temp); - - // get a checkbox item from a known identifier - tasks.TryGetValue(items[temp].Identifier, out selected); - selected.Checked = !selected.Checked; // local dictionary is up-to-date - htmlEditor1.updateCheckedState(selected.Identifier, selected.Checked); // update editor - } - - private void btnGetTasks_Click(object sender, EventArgs e) - { - // update the tasks dictionary using the method that returns a - // dictionary of all ID'd checkboxes. Display labels and - // checked states. - tasks = htmlEditor1.getCheckboxes(); - string output = ""; - foreach (var item in tasks) - { - output += item.Value.Label + " " + item.Value.Checked + "\n"; - } - - MessageBox.Show(output, "The current task states"); - } - } -} diff --git a/Sub/YARTE/YARTE.Example/YARTE.Example/Form1.resx b/Sub/YARTE/YARTE.Example/YARTE.Example/Form1.resx deleted file mode 100644 index 1af7de1..0000000 --- a/Sub/YARTE/YARTE.Example/YARTE.Example/Form1.resx +++ /dev/null @@ -1,120 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - text/microsoft-resx - - - 2.0 - - - System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - \ No newline at end of file diff --git a/Sub/YARTE/YARTE.Example/YARTE.Example/Program.cs b/Sub/YARTE/YARTE.Example/YARTE.Example/Program.cs deleted file mode 100644 index 6e6846b..0000000 --- a/Sub/YARTE/YARTE.Example/YARTE.Example/Program.cs +++ /dev/null @@ -1,21 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Windows.Forms; - -namespace YARTE.Example -{ - static class Program - { - /// - /// The main entry point for the application. - /// - [STAThread] - static void Main() - { - Application.EnableVisualStyles(); - Application.SetCompatibleTextRenderingDefault(false); - Application.Run(new Form1()); - } - } -} diff --git a/Sub/YARTE/YARTE.Example/YARTE.Example/Properties/AssemblyInfo.cs b/Sub/YARTE/YARTE.Example/YARTE.Example/Properties/AssemblyInfo.cs deleted file mode 100644 index af6df89..0000000 --- a/Sub/YARTE/YARTE.Example/YARTE.Example/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,36 +0,0 @@ -using System.Reflection; -using System.Runtime.CompilerServices; -using System.Runtime.InteropServices; - -// General Information about an assembly is controlled through the following -// set of attributes. Change these attribute values to modify the information -// associated with an assembly. -[assembly: AssemblyTitle("YARTE.Example")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("YARTE.Example")] -[assembly: AssemblyCopyright("Copyright © 2010")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] - -// Setting ComVisible to false makes the types in this assembly not visible -// to COM components. If you need to access a type in this assembly from -// COM, set the ComVisible attribute to true on that type. -[assembly: ComVisible(false)] - -// The following GUID is for the ID of the typelib if this project is exposed to COM -[assembly: Guid("07c96ba0-29d1-41fd-9643-40fc4078dd5c")] - -// Version information for an assembly consists of the following four values: -// -// Major Version -// Minor Version -// Build Number -// Revision -// -// You can specify all the values or you can default the Build and Revision Numbers -// by using the '*' as shown below: -// [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.0.0.0")] -[assembly: AssemblyFileVersion("1.0.0.0")] diff --git a/Sub/YARTE/YARTE.Example/YARTE.Example/Properties/Resources.Designer.cs b/Sub/YARTE/YARTE.Example/YARTE.Example/Properties/Resources.Designer.cs deleted file mode 100644 index 62855c2..0000000 --- a/Sub/YARTE/YARTE.Example/YARTE.Example/Properties/Resources.Designer.cs +++ /dev/null @@ -1,71 +0,0 @@ -//------------------------------------------------------------------------------ -// -// This code was generated by a tool. -// Runtime Version:4.0.30319.1 -// -// Changes to this file may cause incorrect behavior and will be lost if -// the code is regenerated. -// -//------------------------------------------------------------------------------ - -namespace YARTE.Example.Properties -{ - - - /// - /// A strongly-typed resource class, for looking up localized strings, etc. - /// - // This class was auto-generated by the StronglyTypedResourceBuilder - // class via a tool like ResGen or Visual Studio. - // To add or remove a member, edit your .ResX file then rerun ResGen - // with the /str option, or rebuild your VS project. - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")] - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] - internal class Resources - { - - private static global::System.Resources.ResourceManager resourceMan; - - private static global::System.Globalization.CultureInfo resourceCulture; - - [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")] - internal Resources() - { - } - - /// - /// Returns the cached ResourceManager instance used by this class. - /// - [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] - internal static global::System.Resources.ResourceManager ResourceManager - { - get - { - if ((resourceMan == null)) - { - global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("YARTE.Example.Properties.Resources", typeof(Resources).Assembly); - resourceMan = temp; - } - return resourceMan; - } - } - - /// - /// Overrides the current thread's CurrentUICulture property for all - /// resource lookups using this strongly typed resource class. - /// - [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] - internal static global::System.Globalization.CultureInfo Culture - { - get - { - return resourceCulture; - } - set - { - resourceCulture = value; - } - } - } -} diff --git a/Sub/YARTE/YARTE.Example/YARTE.Example/Properties/Resources.resx b/Sub/YARTE/YARTE.Example/YARTE.Example/Properties/Resources.resx deleted file mode 100644 index af7dbeb..0000000 --- a/Sub/YARTE/YARTE.Example/YARTE.Example/Properties/Resources.resx +++ /dev/null @@ -1,117 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - text/microsoft-resx - - - 2.0 - - - System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - \ No newline at end of file diff --git a/Sub/YARTE/YARTE.Example/YARTE.Example/Properties/Settings.Designer.cs b/Sub/YARTE/YARTE.Example/YARTE.Example/Properties/Settings.Designer.cs deleted file mode 100644 index 73e6184..0000000 --- a/Sub/YARTE/YARTE.Example/YARTE.Example/Properties/Settings.Designer.cs +++ /dev/null @@ -1,30 +0,0 @@ -//------------------------------------------------------------------------------ -// -// This code was generated by a tool. -// Runtime Version:4.0.30319.1 -// -// Changes to this file may cause incorrect behavior and will be lost if -// the code is regenerated. -// -//------------------------------------------------------------------------------ - -namespace YARTE.Example.Properties -{ - - - [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "10.0.0.0")] - internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase - { - - private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings()))); - - public static Settings Default - { - get - { - return defaultInstance; - } - } - } -} diff --git a/Sub/YARTE/YARTE.Example/YARTE.Example/Properties/Settings.settings b/Sub/YARTE/YARTE.Example/YARTE.Example/Properties/Settings.settings deleted file mode 100644 index 3964565..0000000 --- a/Sub/YARTE/YARTE.Example/YARTE.Example/Properties/Settings.settings +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/Sub/YARTE/YARTE.Example/YARTE.Example/YARTE.Example.csproj b/Sub/YARTE/YARTE.Example/YARTE.Example/YARTE.Example.csproj deleted file mode 100644 index 46a6cdf..0000000 --- a/Sub/YARTE/YARTE.Example/YARTE.Example/YARTE.Example.csproj +++ /dev/null @@ -1,100 +0,0 @@ - - - - Debug - x86 - 8.0.30703 - 2.0 - {EA03531C-F6BA-4EFC-AD06-ECA7E249AE81} - WinExe - Properties - YARTE.Example - YARTE.Example - v4.0 - Client - 512 - - - x86 - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - - - x86 - pdbonly - true - bin\Release\ - TRACE - prompt - 4 - - - - - - - - - - - - - - False - ..\..\YARTE\YARTE\bin\Debug\YARTE.dll - - - - - Form - - - AddTaskDialog.cs - - - Form - - - Form1.cs - - - - - AddTaskDialog.cs - - - Form1.cs - - - ResXFileCodeGenerator - Resources.Designer.cs - Designer - - - True - Resources.resx - - - SettingsSingleFileGenerator - Settings.Designer.cs - - - True - Settings.settings - True - - - - - \ No newline at end of file diff --git a/Sub/YARTE/YARTE/YARTE/YARTE.csproj b/Sub/YARTE/YARTE.csproj similarity index 100% rename from Sub/YARTE/YARTE/YARTE/YARTE.csproj rename to Sub/YARTE/YARTE.csproj diff --git a/Sub/YARTE/YARTE.sln b/Sub/YARTE/YARTE.sln deleted file mode 100644 index ea9053c..0000000 --- a/Sub/YARTE/YARTE.sln +++ /dev/null @@ -1,42 +0,0 @@ - -Microsoft Visual Studio Solution File, Format Version 11.00 -# Visual Studio 2010 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "YARTE", "YARTE\YARTE\YARTE.csproj", "{DB5EE9C8-EACF-4231-877E-B9DFD7A714DE}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "YARTE.Example", "YARTE.Example\YARTE.Example\YARTE.Example.csproj", "{EA03531C-F6BA-4EFC-AD06-ECA7E249AE81}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Any CPU = Debug|Any CPU - Debug|Mixed Platforms = Debug|Mixed Platforms - Debug|x86 = Debug|x86 - Release|Any CPU = Release|Any CPU - Release|Mixed Platforms = Release|Mixed Platforms - Release|x86 = Release|x86 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {DB5EE9C8-EACF-4231-877E-B9DFD7A714DE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {DB5EE9C8-EACF-4231-877E-B9DFD7A714DE}.Debug|Any CPU.Build.0 = Debug|Any CPU - {DB5EE9C8-EACF-4231-877E-B9DFD7A714DE}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU - {DB5EE9C8-EACF-4231-877E-B9DFD7A714DE}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU - {DB5EE9C8-EACF-4231-877E-B9DFD7A714DE}.Debug|x86.ActiveCfg = Debug|Any CPU - {DB5EE9C8-EACF-4231-877E-B9DFD7A714DE}.Release|Any CPU.ActiveCfg = Release|Any CPU - {DB5EE9C8-EACF-4231-877E-B9DFD7A714DE}.Release|Any CPU.Build.0 = Release|Any CPU - {DB5EE9C8-EACF-4231-877E-B9DFD7A714DE}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU - {DB5EE9C8-EACF-4231-877E-B9DFD7A714DE}.Release|Mixed Platforms.Build.0 = Release|Any CPU - {DB5EE9C8-EACF-4231-877E-B9DFD7A714DE}.Release|x86.ActiveCfg = Release|Any CPU - {EA03531C-F6BA-4EFC-AD06-ECA7E249AE81}.Debug|Any CPU.ActiveCfg = Debug|x86 - {EA03531C-F6BA-4EFC-AD06-ECA7E249AE81}.Debug|Mixed Platforms.ActiveCfg = Debug|x86 - {EA03531C-F6BA-4EFC-AD06-ECA7E249AE81}.Debug|Mixed Platforms.Build.0 = Debug|x86 - {EA03531C-F6BA-4EFC-AD06-ECA7E249AE81}.Debug|x86.ActiveCfg = Debug|x86 - {EA03531C-F6BA-4EFC-AD06-ECA7E249AE81}.Debug|x86.Build.0 = Debug|x86 - {EA03531C-F6BA-4EFC-AD06-ECA7E249AE81}.Release|Any CPU.ActiveCfg = Release|x86 - {EA03531C-F6BA-4EFC-AD06-ECA7E249AE81}.Release|Mixed Platforms.ActiveCfg = Release|x86 - {EA03531C-F6BA-4EFC-AD06-ECA7E249AE81}.Release|Mixed Platforms.Build.0 = Release|x86 - {EA03531C-F6BA-4EFC-AD06-ECA7E249AE81}.Release|x86.ActiveCfg = Release|x86 - {EA03531C-F6BA-4EFC-AD06-ECA7E249AE81}.Release|x86.Build.0 = Release|x86 - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection -EndGlobal diff --git a/Sub/tcpservice b/Sub/tcpservice index 9b8ceff..1680e26 160000 --- a/Sub/tcpservice +++ b/Sub/tcpservice @@ -1 +1 @@ -Subproject commit 9b8ceffdeb8eb011111fc516a38a6f2ad3f02423 +Subproject commit 1680e266da64298180eb18de5548a7c40454ce5e diff --git a/SubProject/FCM0000/FCM0000.csproj b/SubProject/FCM0000/FCM0000.csproj index fd8a22e..372d9c4 100644 --- a/SubProject/FCM0000/FCM0000.csproj +++ b/SubProject/FCM0000/FCM0000.csproj @@ -600,7 +600,7 @@ {f31c242c-1b15-4518-9733-48558499fe4b} arControl - + {db5ee9c8-eacf-4231-877e-b9dfd7a714de} YARTE diff --git a/SubProject/FEQ0000/FEQ0000.csproj b/SubProject/FEQ0000/FEQ0000.csproj index caad4d9..064f512 100644 --- a/SubProject/FEQ0000/FEQ0000.csproj +++ b/SubProject/FEQ0000/FEQ0000.csproj @@ -559,7 +559,7 @@ {58cfc90c-5068-46a2-a8de-0e92ee9e0990} AmkorRestfulService - + {db5ee9c8-eacf-4231-877e-b9dfd7a714de} YARTE diff --git a/SubProject/FEQ0000/PurchaseCR/fPurchaseCR.cs b/SubProject/FEQ0000/PurchaseCR/fPurchaseCR.cs index fd84f32..8e6a13d 100644 --- a/SubProject/FEQ0000/PurchaseCR/fPurchaseCR.cs +++ b/SubProject/FEQ0000/PurchaseCR/fPurchaseCR.cs @@ -1245,9 +1245,9 @@ namespace FEQ0000 int curLevel = Math.Max(FCOMMON.info.Login.level, FCOMMON.DBM.getAuth(FCOMMON.DBM.eAuthType.purchase)); if (curLevel < 5) //일반사용자 입고 여부 { - if (dr.state != "PO") + if (dr.state != "PO" && dr.state != "PR") { - FCOMMON.Util.MsgE("PO 상태의 자료만 입고처리가 가능 합니다"); + FCOMMON.Util.MsgE("PR/PO 상태의 자료만 입고처리가 가능 합니다"); return; } if (dr.request != FCOMMON.info.Login.no) diff --git a/SubProject/FEQ0000/PurchaseEB/fPurchaseEB.cs b/SubProject/FEQ0000/PurchaseEB/fPurchaseEB.cs index b874d73..692481f 100644 --- a/SubProject/FEQ0000/PurchaseEB/fPurchaseEB.cs +++ b/SubProject/FEQ0000/PurchaseEB/fPurchaseEB.cs @@ -1329,9 +1329,9 @@ namespace FEQ0000 int curLevel = Math.Max(FCOMMON.info.Login.level, FCOMMON.DBM.getAuth(FCOMMON.DBM.eAuthType.purchase)); if (curLevel < 5) //일반사용자 입고 여부 { - if (dr.state != "PO") + if (dr.state != "PO" && dr.state != "PR") { - FCOMMON.Util.MsgE("PO 상태의 자료만 입고처리가 가능 합니다"); + FCOMMON.Util.MsgE("PR/PO 상태의 자료만 입고처리가 가능 합니다"); return; } if (dr.request != FCOMMON.info.Login.no) diff --git a/SubProject/FEQ0000/PurchaseEB/fPurchaseEB_Add.cs b/SubProject/FEQ0000/PurchaseEB/fPurchaseEB_Add.cs index 84d5cba..3b23f53 100644 --- a/SubProject/FEQ0000/PurchaseEB/fPurchaseEB_Add.cs +++ b/SubProject/FEQ0000/PurchaseEB/fPurchaseEB_Add.cs @@ -105,7 +105,7 @@ namespace FEQ0000 this.cmbDept.DataSource = LstCost; //SITE - var LstLine = FCOMMON.DBM.getCodeTable("23"); + var LstLine = FCOMMON.DBM.getCodeTable("23","code"); this.cmbSite.DisplayMember = "Value"; this.cmbSite.ValueMember = "Value"; this.cmbSite.DataSource = LstLine; @@ -232,6 +232,7 @@ namespace FEQ0000 cmbState.Text = dr.state; cmbSite.Text = dr.site; + cmbDept.Text = dr.dept; tbSC.Text = dr.sc; tbPO.Text = dr.po; @@ -619,6 +620,7 @@ namespace FEQ0000 dr.supply = tbSupply.Text; dr.site = cmbSite.Text; + dr.dept = cmbDept.Text; if (tbSupplyIndex.Text == "") dr.SetsupplyidxNull(); diff --git a/SubProject/FPJ0000/FPJ0000.csproj b/SubProject/FPJ0000/FPJ0000.csproj index 330be08..d45888c 100644 --- a/SubProject/FPJ0000/FPJ0000.csproj +++ b/SubProject/FPJ0000/FPJ0000.csproj @@ -1001,7 +1001,7 @@ {f31c242c-1b15-4518-9733-48558499fe4b} arControl - + {db5ee9c8-eacf-4231-877e-b9dfd7a714de} YARTE