diff --git a/InnoSetup/Recorder devices setup.iss b/InnoSetup/Recorder devices setup.iss index ab02c3970..0e02038f6 100644 --- a/InnoSetup/Recorder devices setup.iss +++ b/InnoSetup/Recorder devices setup.iss @@ -12,6 +12,7 @@ DefaultGroupName={#AppName} DirExistsWarning=no OutputBaseFilename=Recorder-devices-setup OutputDir=Output\ +ShowLanguageDialog=no [Languages] Name: "en"; MessagesFile: "compiler:Default.isl" diff --git a/InnoSetup/ShareX setup.iss b/InnoSetup/ShareX setup.iss index 3d14389c7..6ee68ecbc 100644 --- a/InnoSetup/ShareX setup.iss +++ b/InnoSetup/ShareX setup.iss @@ -55,8 +55,7 @@ Name: "CreateStartupIcon"; Description: "Launch {#AppName} automatically at Wind Source: "{#AppParentDirectory}\ShareX.exe"; DestDir: {app}; Flags: ignoreversion Source: "{#AppParentDirectory}\ShareX.exe.config"; DestDir: {app}; Flags: ignoreversion Source: "{#AppParentDirectory}\*.dll"; DestDir: {app}; Flags: ignoreversion -Source: "{#AppParentDirectory}\*.css"; DestDir: {app}; Flags: ignoreversion -Source: "{#AppParentDirectory}\*.txt"; DestDir: {app}; Flags: ignoreversion +Source: "..\Licenses\*.txt"; DestDir: {app}\Licenses; Flags: ignoreversion Source: "Output\Recorder-devices-setup.exe"; DestDir: {app}; Flags: ignoreversion Source: "..\..\ShareX_Chrome\ShareX_Chrome\bin\Release\ShareX_Chrome.exe"; DestDir: {app}; Flags: ignoreversion diff --git a/Licenses/7-Zip_license.txt b/Licenses/7-Zip_license.txt new file mode 100644 index 000000000..4362b4915 --- /dev/null +++ b/Licenses/7-Zip_license.txt @@ -0,0 +1,502 @@ + GNU LESSER GENERAL PUBLIC LICENSE + Version 2.1, February 1999 + + Copyright (C) 1991, 1999 Free Software Foundation, Inc. + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + +[This is the first released version of the Lesser GPL. It also counts + as the successor of the GNU Library Public License, version 2, hence + the version number 2.1.] + + Preamble + + The licenses for most software are designed to take away your +freedom to share and change it. By contrast, the GNU General Public +Licenses are intended to guarantee your freedom to share and change +free software--to make sure the software is free for all its users. + + This license, the Lesser General Public License, applies to some +specially designated software packages--typically libraries--of the +Free Software Foundation and other authors who decide to use it. You +can use it too, but we suggest you first think carefully about whether +this license or the ordinary General Public License is the better +strategy to use in any particular case, based on the explanations below. + + When we speak of free software, we are referring to freedom of use, +not price. Our General Public Licenses are designed to make sure that +you have the freedom to distribute copies of free software (and charge +for this service if you wish); that you receive source code or can get +it if you want it; that you can change the software and use pieces of +it in new free programs; and that you are informed that you can do +these things. + + To protect your rights, we need to make restrictions that forbid +distributors to deny you these rights or to ask you to surrender these +rights. These restrictions translate to certain responsibilities for +you if you distribute copies of the library or if you modify it. + + For example, if you distribute copies of the library, whether gratis +or for a fee, you must give the recipients all the rights that we gave +you. You must make sure that they, too, receive or can get the source +code. If you link other code with the library, you must provide +complete object files to the recipients, so that they can relink them +with the library after making changes to the library and recompiling +it. And you must show them these terms so they know their rights. + + We protect your rights with a two-step method: (1) we copyright the +library, and (2) we offer you this license, which gives you legal +permission to copy, distribute and/or modify the library. + + To protect each distributor, we want to make it very clear that +there is no warranty for the free library. Also, if the library is +modified by someone else and passed on, the recipients should know +that what they have is not the original version, so that the original +author's reputation will not be affected by problems that might be +introduced by others. + + Finally, software patents pose a constant threat to the existence of +any free program. We wish to make sure that a company cannot +effectively restrict the users of a free program by obtaining a +restrictive license from a patent holder. Therefore, we insist that +any patent license obtained for a version of the library must be +consistent with the full freedom of use specified in this license. + + Most GNU software, including some libraries, is covered by the +ordinary GNU General Public License. This license, the GNU Lesser +General Public License, applies to certain designated libraries, and +is quite different from the ordinary General Public License. We use +this license for certain libraries in order to permit linking those +libraries into non-free programs. + + When a program is linked with a library, whether statically or using +a shared library, the combination of the two is legally speaking a +combined work, a derivative of the original library. The ordinary +General Public License therefore permits such linking only if the +entire combination fits its criteria of freedom. The Lesser General +Public License permits more lax criteria for linking other code with +the library. + + We call this license the "Lesser" General Public License because it +does Less to protect the user's freedom than the ordinary General +Public License. It also provides other free software developers Less +of an advantage over competing non-free programs. These disadvantages +are the reason we use the ordinary General Public License for many +libraries. However, the Lesser license provides advantages in certain +special circumstances. + + For example, on rare occasions, there may be a special need to +encourage the widest possible use of a certain library, so that it becomes +a de-facto standard. To achieve this, non-free programs must be +allowed to use the library. A more frequent case is that a free +library does the same job as widely used non-free libraries. In this +case, there is little to gain by limiting the free library to free +software only, so we use the Lesser General Public License. + + In other cases, permission to use a particular library in non-free +programs enables a greater number of people to use a large body of +free software. For example, permission to use the GNU C Library in +non-free programs enables many more people to use the whole GNU +operating system, as well as its variant, the GNU/Linux operating +system. + + Although the Lesser General Public License is Less protective of the +users' freedom, it does ensure that the user of a program that is +linked with the Library has the freedom and the wherewithal to run +that program using a modified version of the Library. + + The precise terms and conditions for copying, distribution and +modification follow. Pay close attention to the difference between a +"work based on the library" and a "work that uses the library". The +former contains code derived from the library, whereas the latter must +be combined with the library in order to run. + + GNU LESSER GENERAL PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 0. This License Agreement applies to any software library or other +program which contains a notice placed by the copyright holder or +other authorized party saying it may be distributed under the terms of +this Lesser General Public License (also called "this License"). +Each licensee is addressed as "you". + + A "library" means a collection of software functions and/or data +prepared so as to be conveniently linked with application programs +(which use some of those functions and data) to form executables. + + The "Library", below, refers to any such software library or work +which has been distributed under these terms. A "work based on the +Library" means either the Library or any derivative work under +copyright law: that is to say, a work containing the Library or a +portion of it, either verbatim or with modifications and/or translated +straightforwardly into another language. (Hereinafter, translation is +included without limitation in the term "modification".) + + "Source code" for a work means the preferred form of the work for +making modifications to it. For a library, complete source code means +all the source code for all modules it contains, plus any associated +interface definition files, plus the scripts used to control compilation +and installation of the library. + + Activities other than copying, distribution and modification are not +covered by this License; they are outside its scope. The act of +running a program using the Library is not restricted, and output from +such a program is covered only if its contents constitute a work based +on the Library (independent of the use of the Library in a tool for +writing it). Whether that is true depends on what the Library does +and what the program that uses the Library does. + + 1. You may copy and distribute verbatim copies of the Library's +complete source code as you receive it, in any medium, provided that +you conspicuously and appropriately publish on each copy an +appropriate copyright notice and disclaimer of warranty; keep intact +all the notices that refer to this License and to the absence of any +warranty; and distribute a copy of this License along with the +Library. + + You may charge a fee for the physical act of transferring a copy, +and you may at your option offer warranty protection in exchange for a +fee. + + 2. You may modify your copy or copies of the Library or any portion +of it, thus forming a work based on the Library, and copy and +distribute such modifications or work under the terms of Section 1 +above, provided that you also meet all of these conditions: + + a) The modified work must itself be a software library. + + b) You must cause the files modified to carry prominent notices + stating that you changed the files and the date of any change. + + c) You must cause the whole of the work to be licensed at no + charge to all third parties under the terms of this License. + + d) If a facility in the modified Library refers to a function or a + table of data to be supplied by an application program that uses + the facility, other than as an argument passed when the facility + is invoked, then you must make a good faith effort to ensure that, + in the event an application does not supply such function or + table, the facility still operates, and performs whatever part of + its purpose remains meaningful. + + (For example, a function in a library to compute square roots has + a purpose that is entirely well-defined independent of the + application. Therefore, Subsection 2d requires that any + application-supplied function or table used by this function must + be optional: if the application does not supply it, the square + root function must still compute square roots.) + +These requirements apply to the modified work as a whole. If +identifiable sections of that work are not derived from the Library, +and can be reasonably considered independent and separate works in +themselves, then this License, and its terms, do not apply to those +sections when you distribute them as separate works. But when you +distribute the same sections as part of a whole which is a work based +on the Library, the distribution of the whole must be on the terms of +this License, whose permissions for other licensees extend to the +entire whole, and thus to each and every part regardless of who wrote +it. + +Thus, it is not the intent of this section to claim rights or contest +your rights to work written entirely by you; rather, the intent is to +exercise the right to control the distribution of derivative or +collective works based on the Library. + +In addition, mere aggregation of another work not based on the Library +with the Library (or with a work based on the Library) on a volume of +a storage or distribution medium does not bring the other work under +the scope of this License. + + 3. You may opt to apply the terms of the ordinary GNU General Public +License instead of this License to a given copy of the Library. To do +this, you must alter all the notices that refer to this License, so +that they refer to the ordinary GNU General Public License, version 2, +instead of to this License. (If a newer version than version 2 of the +ordinary GNU General Public License has appeared, then you can specify +that version instead if you wish.) Do not make any other change in +these notices. + + Once this change is made in a given copy, it is irreversible for +that copy, so the ordinary GNU General Public License applies to all +subsequent copies and derivative works made from that copy. + + This option is useful when you wish to copy part of the code of +the Library into a program that is not a library. + + 4. You may copy and distribute the Library (or a portion or +derivative of it, under Section 2) in object code or executable form +under the terms of Sections 1 and 2 above provided that you accompany +it with the complete corresponding machine-readable source code, which +must be distributed under the terms of Sections 1 and 2 above on a +medium customarily used for software interchange. + + If distribution of object code is made by offering access to copy +from a designated place, then offering equivalent access to copy the +source code from the same place satisfies the requirement to +distribute the source code, even though third parties are not +compelled to copy the source along with the object code. + + 5. A program that contains no derivative of any portion of the +Library, but is designed to work with the Library by being compiled or +linked with it, is called a "work that uses the Library". Such a +work, in isolation, is not a derivative work of the Library, and +therefore falls outside the scope of this License. + + However, linking a "work that uses the Library" with the Library +creates an executable that is a derivative of the Library (because it +contains portions of the Library), rather than a "work that uses the +library". The executable is therefore covered by this License. +Section 6 states terms for distribution of such executables. + + When a "work that uses the Library" uses material from a header file +that is part of the Library, the object code for the work may be a +derivative work of the Library even though the source code is not. +Whether this is true is especially significant if the work can be +linked without the Library, or if the work is itself a library. The +threshold for this to be true is not precisely defined by law. + + If such an object file uses only numerical parameters, data +structure layouts and accessors, and small macros and small inline +functions (ten lines or less in length), then the use of the object +file is unrestricted, regardless of whether it is legally a derivative +work. (Executables containing this object code plus portions of the +Library will still fall under Section 6.) + + Otherwise, if the work is a derivative of the Library, you may +distribute the object code for the work under the terms of Section 6. +Any executables containing that work also fall under Section 6, +whether or not they are linked directly with the Library itself. + + 6. As an exception to the Sections above, you may also combine or +link a "work that uses the Library" with the Library to produce a +work containing portions of the Library, and distribute that work +under terms of your choice, provided that the terms permit +modification of the work for the customer's own use and reverse +engineering for debugging such modifications. + + You must give prominent notice with each copy of the work that the +Library is used in it and that the Library and its use are covered by +this License. You must supply a copy of this License. If the work +during execution displays copyright notices, you must include the +copyright notice for the Library among them, as well as a reference +directing the user to the copy of this License. Also, you must do one +of these things: + + a) Accompany the work with the complete corresponding + machine-readable source code for the Library including whatever + changes were used in the work (which must be distributed under + Sections 1 and 2 above); and, if the work is an executable linked + with the Library, with the complete machine-readable "work that + uses the Library", as object code and/or source code, so that the + user can modify the Library and then relink to produce a modified + executable containing the modified Library. (It is understood + that the user who changes the contents of definitions files in the + Library will not necessarily be able to recompile the application + to use the modified definitions.) + + b) Use a suitable shared library mechanism for linking with the + Library. A suitable mechanism is one that (1) uses at run time a + copy of the library already present on the user's computer system, + rather than copying library functions into the executable, and (2) + will operate properly with a modified version of the library, if + the user installs one, as long as the modified version is + interface-compatible with the version that the work was made with. + + c) Accompany the work with a written offer, valid for at + least three years, to give the same user the materials + specified in Subsection 6a, above, for a charge no more + than the cost of performing this distribution. + + d) If distribution of the work is made by offering access to copy + from a designated place, offer equivalent access to copy the above + specified materials from the same place. + + e) Verify that the user has already received a copy of these + materials or that you have already sent this user a copy. + + For an executable, the required form of the "work that uses the +Library" must include any data and utility programs needed for +reproducing the executable from it. However, as a special exception, +the materials to be distributed need not include anything that is +normally distributed (in either source or binary form) with the major +components (compiler, kernel, and so on) of the operating system on +which the executable runs, unless that component itself accompanies +the executable. + + It may happen that this requirement contradicts the license +restrictions of other proprietary libraries that do not normally +accompany the operating system. Such a contradiction means you cannot +use both them and the Library together in an executable that you +distribute. + + 7. You may place library facilities that are a work based on the +Library side-by-side in a single library together with other library +facilities not covered by this License, and distribute such a combined +library, provided that the separate distribution of the work based on +the Library and of the other library facilities is otherwise +permitted, and provided that you do these two things: + + a) Accompany the combined library with a copy of the same work + based on the Library, uncombined with any other library + facilities. This must be distributed under the terms of the + Sections above. + + b) Give prominent notice with the combined library of the fact + that part of it is a work based on the Library, and explaining + where to find the accompanying uncombined form of the same work. + + 8. You may not copy, modify, sublicense, link with, or distribute +the Library except as expressly provided under this License. Any +attempt otherwise to copy, modify, sublicense, link with, or +distribute the Library is void, and will automatically terminate your +rights under this License. However, parties who have received copies, +or rights, from you under this License will not have their licenses +terminated so long as such parties remain in full compliance. + + 9. You are not required to accept this License, since you have not +signed it. However, nothing else grants you permission to modify or +distribute the Library or its derivative works. These actions are +prohibited by law if you do not accept this License. Therefore, by +modifying or distributing the Library (or any work based on the +Library), you indicate your acceptance of this License to do so, and +all its terms and conditions for copying, distributing or modifying +the Library or works based on it. + + 10. Each time you redistribute the Library (or any work based on the +Library), the recipient automatically receives a license from the +original licensor to copy, distribute, link with or modify the Library +subject to these terms and conditions. You may not impose any further +restrictions on the recipients' exercise of the rights granted herein. +You are not responsible for enforcing compliance by third parties with +this License. + + 11. If, as a consequence of a court judgment or allegation of patent +infringement or for any other reason (not limited to patent issues), +conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot +distribute so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you +may not distribute the Library at all. For example, if a patent +license would not permit royalty-free redistribution of the Library by +all those who receive copies directly or indirectly through you, then +the only way you could satisfy both it and this License would be to +refrain entirely from distribution of the Library. + +If any portion of this section is held invalid or unenforceable under any +particular circumstance, the balance of the section is intended to apply, +and the section as a whole is intended to apply in other circumstances. + +It is not the purpose of this section to induce you to infringe any +patents or other property right claims or to contest validity of any +such claims; this section has the sole purpose of protecting the +integrity of the free software distribution system which is +implemented by public license practices. Many people have made +generous contributions to the wide range of software distributed +through that system in reliance on consistent application of that +system; it is up to the author/donor to decide if he or she is willing +to distribute software through any other system and a licensee cannot +impose that choice. + +This section is intended to make thoroughly clear what is believed to +be a consequence of the rest of this License. + + 12. If the distribution and/or use of the Library is restricted in +certain countries either by patents or by copyrighted interfaces, the +original copyright holder who places the Library under this License may add +an explicit geographical distribution limitation excluding those countries, +so that distribution is permitted only in or among countries not thus +excluded. In such case, this License incorporates the limitation as if +written in the body of this License. + + 13. The Free Software Foundation may publish revised and/or new +versions of the Lesser General Public License from time to time. +Such new versions will be similar in spirit to the present version, +but may differ in detail to address new problems or concerns. + +Each version is given a distinguishing version number. If the Library +specifies a version number of this License which applies to it and +"any later version", you have the option of following the terms and +conditions either of that version or of any later version published by +the Free Software Foundation. If the Library does not specify a +license version number, you may choose any version ever published by +the Free Software Foundation. + + 14. If you wish to incorporate parts of the Library into other free +programs whose distribution conditions are incompatible with these, +write to the author to ask for permission. For software which is +copyrighted by the Free Software Foundation, write to the Free +Software Foundation; we sometimes make exceptions for this. Our +decision will be guided by the two goals of preserving the free status +of all derivatives of our free software and of promoting the sharing +and reuse of software generally. + + NO WARRANTY + + 15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO +WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW. +EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR +OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY +KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE +IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE +LIBRARY IS WITH YOU. SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME +THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN +WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY +AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU +FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR +CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE +LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING +RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A +FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF +SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH +DAMAGES. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Libraries + + If you develop a new library, and you want it to be of the greatest +possible use to the public, we recommend making it free software that +everyone can redistribute and change. You can do so by permitting +redistribution under these terms (or, alternatively, under the terms of the +ordinary General Public License). + + To apply these terms, attach the following notices to the library. It is +safest to attach them to the start of each source file to most effectively +convey the exclusion of warranty; and each file should have at least the +"copyright" line and a pointer to where the full notice is found. + + + Copyright (C) + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + This library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with this library; if not, write to the Free Software + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + +Also add information on how to contact you by electronic and paper mail. + +You should also get your employer (if you work as a programmer) or your +school, if any, to sign a "copyright disclaimer" for the library, if +necessary. Here is a sample; alter the names: + + Yoyodyne, Inc., hereby disclaims all copyright interest in the + library `Frob' (a library for tweaking knobs) written by James Random Hacker. + + , 1 April 1990 + Ty Coon, President of Vice + +That's all there is to it! diff --git a/Licenses/AWS_SDK_license.txt b/Licenses/AWS_SDK_license.txt new file mode 100644 index 000000000..df33f6533 --- /dev/null +++ b/Licenses/AWS_SDK_license.txt @@ -0,0 +1,54 @@ +Apache License + +Version 2.0, January 2004 + +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: + +You must give any other recipients of the Work or Derivative Works a copy of this License; and + +You must cause any modified files to carry prominent notices stating that You changed the files; and + +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 + +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 \ No newline at end of file diff --git a/Licenses/CLR_Security_license.txt b/Licenses/CLR_Security_license.txt new file mode 100644 index 000000000..af3fff347 --- /dev/null +++ b/Licenses/CLR_Security_license.txt @@ -0,0 +1,33 @@ +Microsoft Limited Permissive License (Ms-LPL) + +This license governs use of the accompanying software. If you use the software, you accept this license. If you do not accept the license, do not use the software. + +1. Definitions + +The terms “reproduce,” “reproduction,” “derivative works,” and “distribution” have the same meaning here as under U.S. copyright law. + +A “contribution” is the original software, or any additions or changes to the software. + +A “contributor” is any person that distributes its contribution under this license. + +“Licensed patents” are a contributor’s patent claims that read directly on its contribution. + +2. Grant of Rights + +(A) Copyright Grant- Subject to the terms of this license, including the license conditions and limitations in section 3, each contributor grants you a non-exclusive, worldwide, royalty-free copyright license to reproduce its contribution, prepare derivative works of its contribution, and distribute its contribution or any derivative works that you create. + +(B) Patent Grant- Subject to the terms of this license, including the license conditions and limitations in section 3, each contributor grants you a non-exclusive, worldwide, royalty-free license under its licensed patents to make, have made, use, sell, offer for sale, import, and/or otherwise dispose of its contribution in the software or derivative works of the contribution in the software. + +3. Conditions and Limitations + +(A) No Trademark License- This license does not grant you rights to use any contributors’ name, logo, or trademarks. + +(B) If you bring a patent claim against any contributor over patents that you claim are infringed by the software, your patent license from such contributor to the software ends automatically. + +(C) If you distribute any portion of the software, you must retain all copyright, patent, trademark, and attribution notices that are present in the software. + +(D) If you distribute any portion of the software in source code form, you may do so only under this license by including a complete copy of this license with your distribution. If you distribute any portion of the software in compiled or object code form, you may only do so under a license that complies with this license. + +(E) The software is licensed “as-is.” You bear the risk of using it. The contributors give no express warranties, guarantees or conditions. You may have additional consumer rights under your local laws which this license cannot change. To the extent permitted under your local laws, the contributors exclude the implied warranties of merchantability, fitness for a particular purpose and non-infringement. + +(F) Platform Limitation- The licenses granted in sections 2(A) & 2(B) extend only to the software or derivative works that you create that run on a Microsoft Windows operating system product. \ No newline at end of file diff --git a/Licenses/DirectShow_devices_license.txt b/Licenses/DirectShow_devices_license.txt new file mode 100644 index 000000000..3f0434f36 --- /dev/null +++ b/Licenses/DirectShow_devices_license.txt @@ -0,0 +1,20 @@ +This license governs use of the accompanying software. If you use the software, you +accept this license. If you do not accept the license, do not use the software. + +1. Definitions +The terms "reproduce," "reproduction," "derivative works," and "distribution" have the +same meaning here as under U.S. copyright law. +A "contribution" is the original software, or any additions or changes to the software. +A "contributor" is any person that distributes its contribution under this license. +"Licensed patents" are a contributor's patent claims that read directly on its contribution. + +2. Grant of Rights +(A) Copyright Grant- Subject to the terms of this license, including the license conditions and limitations in section 3, each contributor grants you a non-exclusive, worldwide, royalty-free copyright license to reproduce its contribution, prepare derivative works of its contribution, and distribute its contribution or any derivative works that you create. +(B) Patent Grant- Subject to the terms of this license, including the license conditions and limitations in section 3, each contributor grants you a non-exclusive, worldwide, royalty-free license under its licensed patents to make, have made, use, sell, offer for sale, import, and/or otherwise dispose of its contribution in the software or derivative works of the contribution in the software. + +3. Conditions and Limitations +(A) No Trademark License- This license does not grant you rights to use any contributors' name, logo, or trademarks. +(B) If you bring a patent claim against any contributor over patents that you claim are infringed by the software, your patent license from such contributor to the software ends automatically. +(C) If you distribute any portion of the software, you must retain all copyright, patent, trademark, and attribution notices that are present in the software. +(D) If you distribute any portion of the software in source code form, you may do so only under this license by including a complete copy of this license with your distribution. If you distribute any portion of the software in compiled or object code form, you may only do so under a license that complies with this license. +(E) The software is licensed "as-is." You bear the risk of using it. The contributors give no express warranties, guarantees or conditions. You may have additional consumer rights under your local laws which this license cannot change. To the extent permitted under your local laws, the contributors exclude the implied warranties of merchantability, fitness for a particular purpose and non-infringement. \ No newline at end of file diff --git a/Licenses/FFmpeg_license.txt b/Licenses/FFmpeg_license.txt new file mode 100644 index 000000000..4362b4915 --- /dev/null +++ b/Licenses/FFmpeg_license.txt @@ -0,0 +1,502 @@ + GNU LESSER GENERAL PUBLIC LICENSE + Version 2.1, February 1999 + + Copyright (C) 1991, 1999 Free Software Foundation, Inc. + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + +[This is the first released version of the Lesser GPL. It also counts + as the successor of the GNU Library Public License, version 2, hence + the version number 2.1.] + + Preamble + + The licenses for most software are designed to take away your +freedom to share and change it. By contrast, the GNU General Public +Licenses are intended to guarantee your freedom to share and change +free software--to make sure the software is free for all its users. + + This license, the Lesser General Public License, applies to some +specially designated software packages--typically libraries--of the +Free Software Foundation and other authors who decide to use it. You +can use it too, but we suggest you first think carefully about whether +this license or the ordinary General Public License is the better +strategy to use in any particular case, based on the explanations below. + + When we speak of free software, we are referring to freedom of use, +not price. Our General Public Licenses are designed to make sure that +you have the freedom to distribute copies of free software (and charge +for this service if you wish); that you receive source code or can get +it if you want it; that you can change the software and use pieces of +it in new free programs; and that you are informed that you can do +these things. + + To protect your rights, we need to make restrictions that forbid +distributors to deny you these rights or to ask you to surrender these +rights. These restrictions translate to certain responsibilities for +you if you distribute copies of the library or if you modify it. + + For example, if you distribute copies of the library, whether gratis +or for a fee, you must give the recipients all the rights that we gave +you. You must make sure that they, too, receive or can get the source +code. If you link other code with the library, you must provide +complete object files to the recipients, so that they can relink them +with the library after making changes to the library and recompiling +it. And you must show them these terms so they know their rights. + + We protect your rights with a two-step method: (1) we copyright the +library, and (2) we offer you this license, which gives you legal +permission to copy, distribute and/or modify the library. + + To protect each distributor, we want to make it very clear that +there is no warranty for the free library. Also, if the library is +modified by someone else and passed on, the recipients should know +that what they have is not the original version, so that the original +author's reputation will not be affected by problems that might be +introduced by others. + + Finally, software patents pose a constant threat to the existence of +any free program. We wish to make sure that a company cannot +effectively restrict the users of a free program by obtaining a +restrictive license from a patent holder. Therefore, we insist that +any patent license obtained for a version of the library must be +consistent with the full freedom of use specified in this license. + + Most GNU software, including some libraries, is covered by the +ordinary GNU General Public License. This license, the GNU Lesser +General Public License, applies to certain designated libraries, and +is quite different from the ordinary General Public License. We use +this license for certain libraries in order to permit linking those +libraries into non-free programs. + + When a program is linked with a library, whether statically or using +a shared library, the combination of the two is legally speaking a +combined work, a derivative of the original library. The ordinary +General Public License therefore permits such linking only if the +entire combination fits its criteria of freedom. The Lesser General +Public License permits more lax criteria for linking other code with +the library. + + We call this license the "Lesser" General Public License because it +does Less to protect the user's freedom than the ordinary General +Public License. It also provides other free software developers Less +of an advantage over competing non-free programs. These disadvantages +are the reason we use the ordinary General Public License for many +libraries. However, the Lesser license provides advantages in certain +special circumstances. + + For example, on rare occasions, there may be a special need to +encourage the widest possible use of a certain library, so that it becomes +a de-facto standard. To achieve this, non-free programs must be +allowed to use the library. A more frequent case is that a free +library does the same job as widely used non-free libraries. In this +case, there is little to gain by limiting the free library to free +software only, so we use the Lesser General Public License. + + In other cases, permission to use a particular library in non-free +programs enables a greater number of people to use a large body of +free software. For example, permission to use the GNU C Library in +non-free programs enables many more people to use the whole GNU +operating system, as well as its variant, the GNU/Linux operating +system. + + Although the Lesser General Public License is Less protective of the +users' freedom, it does ensure that the user of a program that is +linked with the Library has the freedom and the wherewithal to run +that program using a modified version of the Library. + + The precise terms and conditions for copying, distribution and +modification follow. Pay close attention to the difference between a +"work based on the library" and a "work that uses the library". The +former contains code derived from the library, whereas the latter must +be combined with the library in order to run. + + GNU LESSER GENERAL PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 0. This License Agreement applies to any software library or other +program which contains a notice placed by the copyright holder or +other authorized party saying it may be distributed under the terms of +this Lesser General Public License (also called "this License"). +Each licensee is addressed as "you". + + A "library" means a collection of software functions and/or data +prepared so as to be conveniently linked with application programs +(which use some of those functions and data) to form executables. + + The "Library", below, refers to any such software library or work +which has been distributed under these terms. A "work based on the +Library" means either the Library or any derivative work under +copyright law: that is to say, a work containing the Library or a +portion of it, either verbatim or with modifications and/or translated +straightforwardly into another language. (Hereinafter, translation is +included without limitation in the term "modification".) + + "Source code" for a work means the preferred form of the work for +making modifications to it. For a library, complete source code means +all the source code for all modules it contains, plus any associated +interface definition files, plus the scripts used to control compilation +and installation of the library. + + Activities other than copying, distribution and modification are not +covered by this License; they are outside its scope. The act of +running a program using the Library is not restricted, and output from +such a program is covered only if its contents constitute a work based +on the Library (independent of the use of the Library in a tool for +writing it). Whether that is true depends on what the Library does +and what the program that uses the Library does. + + 1. You may copy and distribute verbatim copies of the Library's +complete source code as you receive it, in any medium, provided that +you conspicuously and appropriately publish on each copy an +appropriate copyright notice and disclaimer of warranty; keep intact +all the notices that refer to this License and to the absence of any +warranty; and distribute a copy of this License along with the +Library. + + You may charge a fee for the physical act of transferring a copy, +and you may at your option offer warranty protection in exchange for a +fee. + + 2. You may modify your copy or copies of the Library or any portion +of it, thus forming a work based on the Library, and copy and +distribute such modifications or work under the terms of Section 1 +above, provided that you also meet all of these conditions: + + a) The modified work must itself be a software library. + + b) You must cause the files modified to carry prominent notices + stating that you changed the files and the date of any change. + + c) You must cause the whole of the work to be licensed at no + charge to all third parties under the terms of this License. + + d) If a facility in the modified Library refers to a function or a + table of data to be supplied by an application program that uses + the facility, other than as an argument passed when the facility + is invoked, then you must make a good faith effort to ensure that, + in the event an application does not supply such function or + table, the facility still operates, and performs whatever part of + its purpose remains meaningful. + + (For example, a function in a library to compute square roots has + a purpose that is entirely well-defined independent of the + application. Therefore, Subsection 2d requires that any + application-supplied function or table used by this function must + be optional: if the application does not supply it, the square + root function must still compute square roots.) + +These requirements apply to the modified work as a whole. If +identifiable sections of that work are not derived from the Library, +and can be reasonably considered independent and separate works in +themselves, then this License, and its terms, do not apply to those +sections when you distribute them as separate works. But when you +distribute the same sections as part of a whole which is a work based +on the Library, the distribution of the whole must be on the terms of +this License, whose permissions for other licensees extend to the +entire whole, and thus to each and every part regardless of who wrote +it. + +Thus, it is not the intent of this section to claim rights or contest +your rights to work written entirely by you; rather, the intent is to +exercise the right to control the distribution of derivative or +collective works based on the Library. + +In addition, mere aggregation of another work not based on the Library +with the Library (or with a work based on the Library) on a volume of +a storage or distribution medium does not bring the other work under +the scope of this License. + + 3. You may opt to apply the terms of the ordinary GNU General Public +License instead of this License to a given copy of the Library. To do +this, you must alter all the notices that refer to this License, so +that they refer to the ordinary GNU General Public License, version 2, +instead of to this License. (If a newer version than version 2 of the +ordinary GNU General Public License has appeared, then you can specify +that version instead if you wish.) Do not make any other change in +these notices. + + Once this change is made in a given copy, it is irreversible for +that copy, so the ordinary GNU General Public License applies to all +subsequent copies and derivative works made from that copy. + + This option is useful when you wish to copy part of the code of +the Library into a program that is not a library. + + 4. You may copy and distribute the Library (or a portion or +derivative of it, under Section 2) in object code or executable form +under the terms of Sections 1 and 2 above provided that you accompany +it with the complete corresponding machine-readable source code, which +must be distributed under the terms of Sections 1 and 2 above on a +medium customarily used for software interchange. + + If distribution of object code is made by offering access to copy +from a designated place, then offering equivalent access to copy the +source code from the same place satisfies the requirement to +distribute the source code, even though third parties are not +compelled to copy the source along with the object code. + + 5. A program that contains no derivative of any portion of the +Library, but is designed to work with the Library by being compiled or +linked with it, is called a "work that uses the Library". Such a +work, in isolation, is not a derivative work of the Library, and +therefore falls outside the scope of this License. + + However, linking a "work that uses the Library" with the Library +creates an executable that is a derivative of the Library (because it +contains portions of the Library), rather than a "work that uses the +library". The executable is therefore covered by this License. +Section 6 states terms for distribution of such executables. + + When a "work that uses the Library" uses material from a header file +that is part of the Library, the object code for the work may be a +derivative work of the Library even though the source code is not. +Whether this is true is especially significant if the work can be +linked without the Library, or if the work is itself a library. The +threshold for this to be true is not precisely defined by law. + + If such an object file uses only numerical parameters, data +structure layouts and accessors, and small macros and small inline +functions (ten lines or less in length), then the use of the object +file is unrestricted, regardless of whether it is legally a derivative +work. (Executables containing this object code plus portions of the +Library will still fall under Section 6.) + + Otherwise, if the work is a derivative of the Library, you may +distribute the object code for the work under the terms of Section 6. +Any executables containing that work also fall under Section 6, +whether or not they are linked directly with the Library itself. + + 6. As an exception to the Sections above, you may also combine or +link a "work that uses the Library" with the Library to produce a +work containing portions of the Library, and distribute that work +under terms of your choice, provided that the terms permit +modification of the work for the customer's own use and reverse +engineering for debugging such modifications. + + You must give prominent notice with each copy of the work that the +Library is used in it and that the Library and its use are covered by +this License. You must supply a copy of this License. If the work +during execution displays copyright notices, you must include the +copyright notice for the Library among them, as well as a reference +directing the user to the copy of this License. Also, you must do one +of these things: + + a) Accompany the work with the complete corresponding + machine-readable source code for the Library including whatever + changes were used in the work (which must be distributed under + Sections 1 and 2 above); and, if the work is an executable linked + with the Library, with the complete machine-readable "work that + uses the Library", as object code and/or source code, so that the + user can modify the Library and then relink to produce a modified + executable containing the modified Library. (It is understood + that the user who changes the contents of definitions files in the + Library will not necessarily be able to recompile the application + to use the modified definitions.) + + b) Use a suitable shared library mechanism for linking with the + Library. A suitable mechanism is one that (1) uses at run time a + copy of the library already present on the user's computer system, + rather than copying library functions into the executable, and (2) + will operate properly with a modified version of the library, if + the user installs one, as long as the modified version is + interface-compatible with the version that the work was made with. + + c) Accompany the work with a written offer, valid for at + least three years, to give the same user the materials + specified in Subsection 6a, above, for a charge no more + than the cost of performing this distribution. + + d) If distribution of the work is made by offering access to copy + from a designated place, offer equivalent access to copy the above + specified materials from the same place. + + e) Verify that the user has already received a copy of these + materials or that you have already sent this user a copy. + + For an executable, the required form of the "work that uses the +Library" must include any data and utility programs needed for +reproducing the executable from it. However, as a special exception, +the materials to be distributed need not include anything that is +normally distributed (in either source or binary form) with the major +components (compiler, kernel, and so on) of the operating system on +which the executable runs, unless that component itself accompanies +the executable. + + It may happen that this requirement contradicts the license +restrictions of other proprietary libraries that do not normally +accompany the operating system. Such a contradiction means you cannot +use both them and the Library together in an executable that you +distribute. + + 7. You may place library facilities that are a work based on the +Library side-by-side in a single library together with other library +facilities not covered by this License, and distribute such a combined +library, provided that the separate distribution of the work based on +the Library and of the other library facilities is otherwise +permitted, and provided that you do these two things: + + a) Accompany the combined library with a copy of the same work + based on the Library, uncombined with any other library + facilities. This must be distributed under the terms of the + Sections above. + + b) Give prominent notice with the combined library of the fact + that part of it is a work based on the Library, and explaining + where to find the accompanying uncombined form of the same work. + + 8. You may not copy, modify, sublicense, link with, or distribute +the Library except as expressly provided under this License. Any +attempt otherwise to copy, modify, sublicense, link with, or +distribute the Library is void, and will automatically terminate your +rights under this License. However, parties who have received copies, +or rights, from you under this License will not have their licenses +terminated so long as such parties remain in full compliance. + + 9. You are not required to accept this License, since you have not +signed it. However, nothing else grants you permission to modify or +distribute the Library or its derivative works. These actions are +prohibited by law if you do not accept this License. Therefore, by +modifying or distributing the Library (or any work based on the +Library), you indicate your acceptance of this License to do so, and +all its terms and conditions for copying, distributing or modifying +the Library or works based on it. + + 10. Each time you redistribute the Library (or any work based on the +Library), the recipient automatically receives a license from the +original licensor to copy, distribute, link with or modify the Library +subject to these terms and conditions. You may not impose any further +restrictions on the recipients' exercise of the rights granted herein. +You are not responsible for enforcing compliance by third parties with +this License. + + 11. If, as a consequence of a court judgment or allegation of patent +infringement or for any other reason (not limited to patent issues), +conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot +distribute so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you +may not distribute the Library at all. For example, if a patent +license would not permit royalty-free redistribution of the Library by +all those who receive copies directly or indirectly through you, then +the only way you could satisfy both it and this License would be to +refrain entirely from distribution of the Library. + +If any portion of this section is held invalid or unenforceable under any +particular circumstance, the balance of the section is intended to apply, +and the section as a whole is intended to apply in other circumstances. + +It is not the purpose of this section to induce you to infringe any +patents or other property right claims or to contest validity of any +such claims; this section has the sole purpose of protecting the +integrity of the free software distribution system which is +implemented by public license practices. Many people have made +generous contributions to the wide range of software distributed +through that system in reliance on consistent application of that +system; it is up to the author/donor to decide if he or she is willing +to distribute software through any other system and a licensee cannot +impose that choice. + +This section is intended to make thoroughly clear what is believed to +be a consequence of the rest of this License. + + 12. If the distribution and/or use of the Library is restricted in +certain countries either by patents or by copyrighted interfaces, the +original copyright holder who places the Library under this License may add +an explicit geographical distribution limitation excluding those countries, +so that distribution is permitted only in or among countries not thus +excluded. In such case, this License incorporates the limitation as if +written in the body of this License. + + 13. The Free Software Foundation may publish revised and/or new +versions of the Lesser General Public License from time to time. +Such new versions will be similar in spirit to the present version, +but may differ in detail to address new problems or concerns. + +Each version is given a distinguishing version number. If the Library +specifies a version number of this License which applies to it and +"any later version", you have the option of following the terms and +conditions either of that version or of any later version published by +the Free Software Foundation. If the Library does not specify a +license version number, you may choose any version ever published by +the Free Software Foundation. + + 14. If you wish to incorporate parts of the Library into other free +programs whose distribution conditions are incompatible with these, +write to the author to ask for permission. For software which is +copyrighted by the Free Software Foundation, write to the Free +Software Foundation; we sometimes make exceptions for this. Our +decision will be guided by the two goals of preserving the free status +of all derivatives of our free software and of promoting the sharing +and reuse of software generally. + + NO WARRANTY + + 15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO +WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW. +EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR +OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY +KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE +IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE +LIBRARY IS WITH YOU. SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME +THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN +WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY +AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU +FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR +CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE +LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING +RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A +FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF +SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH +DAMAGES. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Libraries + + If you develop a new library, and you want it to be of the greatest +possible use to the public, we recommend making it free software that +everyone can redistribute and change. You can do so by permitting +redistribution under these terms (or, alternatively, under the terms of the +ordinary General Public License). + + To apply these terms, attach the following notices to the library. It is +safest to attach them to the start of each source file to most effectively +convey the exclusion of warranty; and each file should have at least the +"copyright" line and a pointer to where the full notice is found. + + + Copyright (C) + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + This library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with this library; if not, write to the Free Software + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + +Also add information on how to contact you by electronic and paper mail. + +You should also get your employer (if you work as a programmer) or your +school, if any, to sign a "copyright disclaimer" for the library, if +necessary. Here is a sample; alter the names: + + Yoyodyne, Inc., hereby disclaims all copyright interest in the + library `Frob' (a library for tweaking knobs) written by James Random Hacker. + + , 1 April 1990 + Ty Coon, President of Vice + +That's all there is to it! diff --git a/Licenses/Greenshot_license.txt b/Licenses/Greenshot_license.txt new file mode 100644 index 000000000..48fc04d6f --- /dev/null +++ b/Licenses/Greenshot_license.txt @@ -0,0 +1,336 @@ +Copyright (C) 1989, 1991 Free Software Foundation, Inc. +59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed. + +Preamble + +The licenses for most software are designed to take away your +freedom to share and change it. By contrast, the GNU General Public +License is intended to guarantee your freedom to share and change free +software--to make sure the software is free for all its users. This +General Public License applies to most of the Free Software +Foundation's software and to any other program whose authors commit to +using it. (Some other Free Software Foundation software is covered by +the GNU Library General Public License instead.) You can apply it to +your programs, too. + +When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +this service if you wish), that you receive source code or can get it +if you want it, that you can change the software or use pieces of it +in new free programs; and that you know you can do these things. + +To protect your rights, we need to make restrictions that forbid +anyone to deny you these rights or to ask you to surrender the rights. +These restrictions translate to certain responsibilities for you if you +distribute copies of the software, or if you modify it. + +For example, if you distribute copies of such a program, whether +gratis or for a fee, you must give the recipients all the rights that +you have. You must make sure that they, too, receive or can get the +source code. And you must show them these terms so they know their +rights. + +We protect your rights with two steps: (1) copyright the software, and +(2) offer you this license which gives you legal permission to copy, +distribute and/or modify the software. + +Also, for each author's protection and ours, we want to make certain +that everyone understands that there is no warranty for this free +software. If the software is modified by someone else and passed on, we +want its recipients to know that what they have is not the original, so +that any problems introduced by others will not reflect on the original +authors' reputations. + +Finally, any free program is threatened constantly by software +patents. We wish to avoid the danger that redistributors of a free +program will individually obtain patent licenses, in effect making the +program proprietary. To prevent this, we have made it clear that any +patent must be licensed for everyone's free use or not licensed at all. + +The precise terms and conditions for copying, distribution and +modification follow. + +TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + +0. This License applies to any program or other work which contains +a notice placed by the copyright holder saying it may be distributed +under the terms of this General Public License. The "Program", below, +refers to any such program or work, and a "work based on the Program" +means either the Program or any derivative work under copyright law: +that is to say, a work containing the Program or a portion of it, +either verbatim or with modifications and/or translated into another +language. (Hereinafter, translation is included without limitation in +the term "modification".) Each licensee is addressed as "you". + +Activities other than copying, distribution and modification are not +covered by this License; they are outside its scope. The act of +running the Program is not restricted, and the output from the Program +is covered only if its contents constitute a work based on the +Program (independent of having been made by running the Program). +Whether that is true depends on what the Program does. + +1. You may copy and distribute verbatim copies of the Program's +source code as you receive it, in any medium, provided that you +conspicuously and appropriately publish on each copy an appropriate +copyright notice and disclaimer of warranty; keep intact all the +notices that refer to this License and to the absence of any warranty; +and give any other recipients of the Program a copy of this License +along with the Program. + +You may charge a fee for the physical act of transferring a copy, and +you may at your option offer warranty protection in exchange for a fee. + +2. You may modify your copy or copies of the Program or any portion +of it, thus forming a work based on the Program, and copy and +distribute such modifications or work under the terms of Section 1 +above, provided that you also meet all of these conditions: + + a) You must cause the modified files to carry prominent notices + stating that you changed the files and the date of any change. + + b) You must cause any work that you distribute or publish, that in + whole or in part contains or is derived from the Program or any + part thereof, to be licensed as a whole at no charge to all third + parties under the terms of this License. + + c) If the modified program normally reads commands interactively + when run, you must cause it, when started running for such + interactive use in the most ordinary way, to print or display an + announcement including an appropriate copyright notice and a + notice that there is no warranty (or else, saying that you provide + a warranty) and that users may redistribute the program under + these conditions, and telling the user how to view a copy of this + License. (Exception: if the Program itself is interactive but + does not normally print such an announcement, your work based on + the Program is not required to print an announcement.) + +These requirements apply to the modified work as a whole. If +identifiable sections of that work are not derived from the Program, +and can be reasonably considered independent and separate works in +themselves, then this License, and its terms, do not apply to those +sections when you distribute them as separate works. But when you +distribute the same sections as part of a whole which is a work based +on the Program, the distribution of the whole must be on the terms of +this License, whose permissions for other licensees extend to the +entire whole, and thus to each and every part regardless of who wrote it. + +Thus, it is not the intent of this section to claim rights or contest +your rights to work written entirely by you; rather, the intent is to +exercise the right to control the distribution of derivative or +collective works based on the Program. + +In addition, mere aggregation of another work not based on the Program +with the Program (or with a work based on the Program) on a volume of +a storage or distribution medium does not bring the other work under +the scope of this License. + +3. You may copy and distribute the Program (or a work based on it, +under Section 2) in object code or executable form under the terms of +Sections 1 and 2 above provided that you also do one of the following: + + a) Accompany it with the complete corresponding machine-readable + source code, which must be distributed under the terms of Sections + 1 and 2 above on a medium customarily used for software interchange; or, + + b) Accompany it with a written offer, valid for at least three + years, to give any third party, for a charge no more than your + cost of physically performing source distribution, a complete + machine-readable copy of the corresponding source code, to be + distributed under the terms of Sections 1 and 2 above on a medium + customarily used for software interchange; or, + + c) Accompany it with the information you received as to the offer + to distribute corresponding source code. (This alternative is + allowed only for noncommercial distribution and only if you + received the program in object code or executable form with such + an offer, in accord with Subsection b above.) + +The source code for a work means the preferred form of the work for +making modifications to it. For an executable work, complete source +code means all the source code for all modules it contains, plus any +associated interface definition files, plus the scripts used to +control compilation and installation of the executable. However, as a +special exception, the source code distributed need not include +anything that is normally distributed (in either source or binary +form) with the major components (compiler, kernel, and so on) of the +operating system on which the executable runs, unless that component +itself accompanies the executable. + +If distribution of executable or object code is made by offering +access to copy from a designated place, then offering equivalent +access to copy the source code from the same place counts as +distribution of the source code, even though third parties are not +compelled to copy the source along with the object code. + +4. You may not copy, modify, sublicense, or distribute the Program +except as expressly provided under this License. Any attempt +otherwise to copy, modify, sublicense or distribute the Program is +void, and will automatically terminate your rights under this License. +However, parties who have received copies, or rights, from you under +this License will not have their licenses terminated so long as such +parties remain in full compliance. + +5. You are not required to accept this License, since you have not +signed it. However, nothing else grants you permission to modify or +distribute the Program or its derivative works. These actions are +prohibited by law if you do not accept this License. Therefore, by +modifying or distributing the Program (or any work based on the +Program), you indicate your acceptance of this License to do so, and +all its terms and conditions for copying, distributing or modifying +the Program or works based on it. + +6. Each time you redistribute the Program (or any work based on the +Program), the recipient automatically receives a license from the +original licensor to copy, distribute or modify the Program subject to +these terms and conditions. You may not impose any further +restrictions on the recipients' exercise of the rights granted herein. +You are not responsible for enforcing compliance by third parties to +this License. + +7. If, as a consequence of a court judgment or allegation of patent +infringement or for any other reason (not limited to patent issues), +conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot +distribute so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you +may not distribute the Program at all. For example, if a patent +license would not permit royalty-free redistribution of the Program by +all those who receive copies directly or indirectly through you, then +the only way you could satisfy both it and this License would be to +refrain entirely from distribution of the Program. + +If any portion of this section is held invalid or unenforceable under +any particular circumstance, the balance of the section is intended to +apply and the section as a whole is intended to apply in other +circumstances. + +It is not the purpose of this section to induce you to infringe any +patents or other property right claims or to contest validity of any +such claims; this section has the sole purpose of protecting the +integrity of the free software distribution system, which is +implemented by public license practices. Many people have made +generous contributions to the wide range of software distributed +through that system in reliance on consistent application of that +system; it is up to the author/donor to decide if he or she is willing +to distribute software through any other system and a licensee cannot +impose that choice. + +This section is intended to make thoroughly clear what is believed to +be a consequence of the rest of this License. + +8. If the distribution and/or use of the Program is restricted in +certain countries either by patents or by copyrighted interfaces, the +original copyright holder who places the Program under this License +may add an explicit geographical distribution limitation excluding +those countries, so that distribution is permitted only in or among +countries not thus excluded. In such case, this License incorporates +the limitation as if written in the body of this License. + +9. The Free Software Foundation may publish revised and/or new versions +of the General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + +Each version is given a distinguishing version number. If the Program +specifies a version number of this License which applies to it and "any +later version", you have the option of following the terms and conditions +either of that version or of any later version published by the Free +Software Foundation. If the Program does not specify a version number of +this License, you may choose any version ever published by the Free Software +Foundation. + +10. If you wish to incorporate parts of the Program into other free +programs whose distribution conditions are different, write to the author +to ask for permission. For software which is copyrighted by the Free +Software Foundation, write to the Free Software Foundation; we sometimes +make exceptions for this. Our decision will be guided by the two goals +of preserving the free status of all derivatives of our free software and +of promoting the sharing and reuse of software generally. + +NO WARRANTY + +11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY +FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN +OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES +PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED +OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS +TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE +PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, +REPAIR OR CORRECTION. + +12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR +REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, +INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING +OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED +TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY +YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER +PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE +POSSIBILITY OF SUCH DAMAGES. + +END OF TERMS AND CONDITIONS + +How to Apply These Terms to Your New Programs + +If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + +To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +convey the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + One line to give the program's name and a brief idea of what it does. + + Copyright (C) + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + +Also add information on how to contact you by electronic and paper mail. + +If the program is interactive, make it output a short notice like this +when it starts in an interactive mode: + + Gnomovision version 69, Copyright (C) year name of author + Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, the commands you use may +be called something other than `show w' and `show c'; they could even be +mouse-clicks or menu items--whatever suits your program. + +You should also get your employer (if you work as a programmer) or your +school, if any, to sign a "copyright disclaimer" for the program, if +necessary. Here is a sample; alter the names: + + Yoyodyne, Inc., hereby disclaims all copyright interest in the program + `Gnomovision' (which makes passes at compilers) written by James Hacker. + + signature of Ty Coon, 1 April 1989 + + Ty Coon, President of Vice + +This General Public License does not permit incorporating your program into +proprietary programs. If your program is a subroutine library, you may +consider it more useful to permit linking proprietary applications with the +library. If this is what you want to do, use the GNU Library General +Public License instead of this License. diff --git a/Licenses/Icons_license.txt b/Licenses/Icons_license.txt new file mode 100644 index 000000000..474b2133e --- /dev/null +++ b/Licenses/Icons_license.txt @@ -0,0 +1,53 @@ +THE WORK (AS DEFINED BELOW) IS PROVIDED UNDER THE TERMS OF THIS CREATIVE COMMONS PUBLIC LICENSE ("CCPL" OR "LICENSE"). THE WORK IS PROTECTED BY COPYRIGHT AND/OR OTHER APPLICABLE LAW. ANY USE OF THE WORK OTHER THAN AS AUTHORIZED UNDER THIS LICENSE OR COPYRIGHT LAW IS PROHIBITED. + +BY EXERCISING ANY RIGHTS TO THE WORK PROVIDED HERE, YOU ACCEPT AND AGREE TO BE BOUND BY THE TERMS OF THIS LICENSE. TO THE EXTENT THIS LICENSE MAY BE CONSIDERED TO BE A CONTRACT, THE LICENSOR GRANTS YOU THE RIGHTS CONTAINED HERE IN CONSIDERATION OF YOUR ACCEPTANCE OF SUCH TERMS AND CONDITIONS. + +1. Definitions + +"Adaptation" means a work based upon the Work, or upon the Work and other pre-existing works, such as a translation, adaptation, derivative work, arrangement of music or other alterations of a literary or artistic work, or phonogram or performance and includes cinematographic adaptations or any other form in which the Work may be recast, transformed, or adapted including in any form recognizably derived from the original, except that a work that constitutes a Collection will not be considered an Adaptation for the purpose of this License. For the avoidance of doubt, where the Work is a musical work, performance or phonogram, the synchronization of the Work in timed-relation with a moving image ("synching") will be considered an Adaptation for the purpose of this License. +"Collection" means a collection of literary or artistic works, such as encyclopedias and anthologies, or performances, phonograms or broadcasts, or other works or subject matter other than works listed in Section 1(f) below, which, by reason of the selection and arrangement of their contents, constitute intellectual creations, in which the Work is included in its entirety in unmodified form along with one or more other contributions, each constituting separate and independent works in themselves, which together are assembled into a collective whole. A work that constitutes a Collection will not be considered an Adaptation (as defined above) for the purposes of this License. +"Distribute" means to make available to the public the original and copies of the Work or Adaptation, as appropriate, through sale or other transfer of ownership. +"Licensor" means the individual, individuals, entity or entities that offer(s) the Work under the terms of this License. +"Original Author" means, in the case of a literary or artistic work, the individual, individuals, entity or entities who created the Work or if no individual or entity can be identified, the publisher; and in addition (i) in the case of a performance the actors, singers, musicians, dancers, and other persons who act, sing, deliver, declaim, play in, interpret or otherwise perform literary or artistic works or expressions of folklore; (ii) in the case of a phonogram the producer being the person or legal entity who first fixes the sounds of a performance or other sounds; and, (iii) in the case of broadcasts, the organization that transmits the broadcast. +"Work" means the literary and/or artistic work offered under the terms of this License including without limitation any production in the literary, scientific and artistic domain, whatever may be the mode or form of its expression including digital form, such as a book, pamphlet and other writing; a lecture, address, sermon or other work of the same nature; a dramatic or dramatico-musical work; a choreographic work or entertainment in dumb show; a musical composition with or without words; a cinematographic work to which are assimilated works expressed by a process analogous to cinematography; a work of drawing, painting, architecture, sculpture, engraving or lithography; a photographic work to which are assimilated works expressed by a process analogous to photography; a work of applied art; an illustration, map, plan, sketch or three-dimensional work relative to geography, topography, architecture or science; a performance; a broadcast; a phonogram; a compilation of data to the extent it is protected as a copyrightable work; or a work performed by a variety or circus performer to the extent it is not otherwise considered a literary or artistic work. +"You" means an individual or entity exercising rights under this License who has not previously violated the terms of this License with respect to the Work, or who has received express permission from the Licensor to exercise rights under this License despite a previous violation. +"Publicly Perform" means to perform public recitations of the Work and to communicate to the public those public recitations, by any means or process, including by wire or wireless means or public digital performances; to make available to the public Works in such a way that members of the public may access these Works from a place and at a place individually chosen by them; to perform the Work to the public by any means or process and the communication to the public of the performances of the Work, including by public digital performance; to broadcast and rebroadcast the Work by any means including signs, sounds or images. +"Reproduce" means to make copies of the Work by any means including without limitation by sound or visual recordings and the right of fixation and reproducing fixations of the Work, including storage of a protected performance or phonogram in digital form or other electronic medium. +2. Fair Dealing Rights. Nothing in this License is intended to reduce, limit, or restrict any uses free from copyright or rights arising from limitations or exceptions that are provided for in connection with the copyright protection under copyright law or other applicable laws. + +3. License Grant. Subject to the terms and conditions of this License, Licensor hereby grants You a worldwide, royalty-free, non-exclusive, perpetual (for the duration of the applicable copyright) license to exercise the rights in the Work as stated below: + +to Reproduce the Work, to incorporate the Work into one or more Collections, and to Reproduce the Work as incorporated in the Collections; +to create and Reproduce Adaptations provided that any such Adaptation, including any translation in any medium, takes reasonable steps to clearly label, demarcate or otherwise identify that changes were made to the original Work. For example, a translation could be marked "The original work was translated from English to Spanish," or a modification could indicate "The original work has been modified."; +to Distribute and Publicly Perform the Work including as incorporated in Collections; and, +to Distribute and Publicly Perform Adaptations. +For the avoidance of doubt: + +Non-waivable Compulsory License Schemes. In those jurisdictions in which the right to collect royalties through any statutory or compulsory licensing scheme cannot be waived, the Licensor reserves the exclusive right to collect such royalties for any exercise by You of the rights granted under this License; +Waivable Compulsory License Schemes. In those jurisdictions in which the right to collect royalties through any statutory or compulsory licensing scheme can be waived, the Licensor waives the exclusive right to collect such royalties for any exercise by You of the rights granted under this License; and, +Voluntary License Schemes. The Licensor waives the right to collect royalties, whether individually or, in the event that the Licensor is a member of a collecting society that administers voluntary licensing schemes, via that society, from any exercise by You of the rights granted under this License. +The above rights may be exercised in all media and formats whether now known or hereafter devised. The above rights include the right to make such modifications as are technically necessary to exercise the rights in other media and formats. Subject to Section 8(f), all rights not expressly granted by Licensor are hereby reserved. + +4. Restrictions. The license granted in Section 3 above is expressly made subject to and limited by the following restrictions: + +You may Distribute or Publicly Perform the Work only under the terms of this License. You must include a copy of, or the Uniform Resource Identifier (URI) for, this License with every copy of the Work You Distribute or Publicly Perform. You may not offer or impose any terms on the Work that restrict the terms of this License or the ability of the recipient of the Work to exercise the rights granted to that recipient under the terms of the License. You may not sublicense the Work. You must keep intact all notices that refer to this License and to the disclaimer of warranties with every copy of the Work You Distribute or Publicly Perform. When You Distribute or Publicly Perform the Work, You may not impose any effective technological measures on the Work that restrict the ability of a recipient of the Work from You to exercise the rights granted to that recipient under the terms of the License. This Section 4(a) applies to the Work as incorporated in a Collection, but this does not require the Collection apart from the Work itself to be made subject to the terms of this License. If You create a Collection, upon notice from any Licensor You must, to the extent practicable, remove from the Collection any credit as required by Section 4(b), as requested. If You create an Adaptation, upon notice from any Licensor You must, to the extent practicable, remove from the Adaptation any credit as required by Section 4(b), as requested. +If You Distribute, or Publicly Perform the Work or any Adaptations or Collections, You must, unless a request has been made pursuant to Section 4(a), keep intact all copyright notices for the Work and provide, reasonable to the medium or means You are utilizing: (i) the name of the Original Author (or pseudonym, if applicable) if supplied, and/or if the Original Author and/or Licensor designate another party or parties (e.g., a sponsor institute, publishing entity, journal) for attribution ("Attribution Parties") in Licensor's copyright notice, terms of service or by other reasonable means, the name of such party or parties; (ii) the title of the Work if supplied; (iii) to the extent reasonably practicable, the URI, if any, that Licensor specifies to be associated with the Work, unless such URI does not refer to the copyright notice or licensing information for the Work; and (iv) , consistent with Section 3(b), in the case of an Adaptation, a credit identifying the use of the Work in the Adaptation (e.g., "French translation of the Work by Original Author," or "Screenplay based on original Work by Original Author"). The credit required by this Section 4 (b) may be implemented in any reasonable manner; provided, however, that in the case of a Adaptation or Collection, at a minimum such credit will appear, if a credit for all contributing authors of the Adaptation or Collection appears, then as part of these credits and in a manner at least as prominent as the credits for the other contributing authors. For the avoidance of doubt, You may only use the credit required by this Section for the purpose of attribution in the manner set out above and, by exercising Your rights under this License, You may not implicitly or explicitly assert or imply any connection with, sponsorship or endorsement by the Original Author, Licensor and/or Attribution Parties, as appropriate, of You or Your use of the Work, without the separate, express prior written permission of the Original Author, Licensor and/or Attribution Parties. +Except as otherwise agreed in writing by the Licensor or as may be otherwise permitted by applicable law, if You Reproduce, Distribute or Publicly Perform the Work either by itself or as part of any Adaptations or Collections, You must not distort, mutilate, modify or take other derogatory action in relation to the Work which would be prejudicial to the Original Author's honor or reputation. Licensor agrees that in those jurisdictions (e.g. Japan), in which any exercise of the right granted in Section 3(b) of this License (the right to make Adaptations) would be deemed to be a distortion, mutilation, modification or other derogatory action prejudicial to the Original Author's honor and reputation, the Licensor will waive or not assert, as appropriate, this Section, to the fullest extent permitted by the applicable national law, to enable You to reasonably exercise Your right under Section 3(b) of this License (right to make Adaptations) but not otherwise. +5. Representations, Warranties and Disclaimer + +UNLESS OTHERWISE MUTUALLY AGREED TO BY THE PARTIES IN WRITING, LICENSOR OFFERS THE WORK AS-IS AND MAKES NO REPRESENTATIONS OR WARRANTIES OF ANY KIND CONCERNING THE WORK, EXPRESS, IMPLIED, STATUTORY OR OTHERWISE, INCLUDING, WITHOUT LIMITATION, WARRANTIES OF TITLE, MERCHANTIBILITY, FITNESS FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR THE ABSENCE OF LATENT OR OTHER DEFECTS, ACCURACY, OR THE PRESENCE OF ABSENCE OF ERRORS, WHETHER OR NOT DISCOVERABLE. SOME JURISDICTIONS DO NOT ALLOW THE EXCLUSION OF IMPLIED WARRANTIES, SO SUCH EXCLUSION MAY NOT APPLY TO YOU. + +6. Limitation on Liability. EXCEPT TO THE EXTENT REQUIRED BY APPLICABLE LAW, IN NO EVENT WILL LICENSOR BE LIABLE TO YOU ON ANY LEGAL THEORY FOR ANY SPECIAL, INCIDENTAL, CONSEQUENTIAL, PUNITIVE OR EXEMPLARY DAMAGES ARISING OUT OF THIS LICENSE OR THE USE OF THE WORK, EVEN IF LICENSOR HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. + +7. Termination + +This License and the rights granted hereunder will terminate automatically upon any breach by You of the terms of this License. Individuals or entities who have received Adaptations or Collections from You under this License, however, will not have their licenses terminated provided such individuals or entities remain in full compliance with those licenses. Sections 1, 2, 5, 6, 7, and 8 will survive any termination of this License. +Subject to the above terms and conditions, the license granted here is perpetual (for the duration of the applicable copyright in the Work). Notwithstanding the above, Licensor reserves the right to release the Work under different license terms or to stop distributing the Work at any time; provided, however that any such election will not serve to withdraw this License (or any other license that has been, or is required to be, granted under the terms of this License), and this License will continue in full force and effect unless terminated as stated above. +8. Miscellaneous + +Each time You Distribute or Publicly Perform the Work or a Collection, the Licensor offers to the recipient a license to the Work on the same terms and conditions as the license granted to You under this License. +Each time You Distribute or Publicly Perform an Adaptation, Licensor offers to the recipient a license to the original Work on the same terms and conditions as the license granted to You under this License. +If any provision of this License is invalid or unenforceable under applicable law, it shall not affect the validity or enforceability of the remainder of the terms of this License, and without further action by the parties to this agreement, such provision shall be reformed to the minimum extent necessary to make such provision valid and enforceable. +No term or provision of this License shall be deemed waived and no breach consented to unless such waiver or consent shall be in writing and signed by the party to be charged with such waiver or consent. +This License constitutes the entire agreement between the parties with respect to the Work licensed here. There are no understandings, agreements or representations with respect to the Work not specified here. Licensor shall not be bound by any additional provisions that may appear in any communication from You. This License may not be modified without the mutual written agreement of the Licensor and You. +The rights granted under, and the subject matter referenced, in this License were drafted utilizing the terminology of the Berne Convention for the Protection of Literary and Artistic Works (as amended on September 28, 1979), the Rome Convention of 1961, the WIPO Copyright Treaty of 1996, the WIPO Performances and Phonograms Treaty of 1996 and the Universal Copyright Convention (as revised on July 24, 1971). These rights and subject matter take effect in the relevant jurisdiction in which the License terms are sought to be enforced according to the corresponding provisions of the implementation of those treaty provisions in the applicable national law. If the standard suite of rights granted under applicable copyright law includes additional rights not granted under this License, such additional rights are deemed to be included in the License; this License is not intended to restrict the license of any rights under applicable law. \ No newline at end of file diff --git a/Licenses/ImageListView_license.txt b/Licenses/ImageListView_license.txt new file mode 100644 index 000000000..d64569567 --- /dev/null +++ b/Licenses/ImageListView_license.txt @@ -0,0 +1,202 @@ + + 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/Licenses/Json.NET_license.txt b/Licenses/Json.NET_license.txt new file mode 100644 index 000000000..dfaadbe49 --- /dev/null +++ b/Licenses/Json.NET_license.txt @@ -0,0 +1,20 @@ +The MIT License (MIT) + +Copyright (c) 2007 James Newton-King + +Permission is hereby granted, free of charge, to any person obtaining a copy of +this software and associated documentation files (the "Software"), to deal in +the Software without restriction, including without limitation the rights to +use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of +the Software, and to permit persons to whom the Software is furnished to do so, +subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS +FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR +COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER +IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN +CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. diff --git a/Licenses/QrCode.Net_license.txt b/Licenses/QrCode.Net_license.txt new file mode 100644 index 000000000..2ca9170c9 --- /dev/null +++ b/Licenses/QrCode.Net_license.txt @@ -0,0 +1,7 @@ +Copyright (c) 2011 George Mamaladze + +Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. \ No newline at end of file diff --git a/Licenses/SSH.NET_license.txt b/Licenses/SSH.NET_license.txt new file mode 100644 index 000000000..13640e72c --- /dev/null +++ b/Licenses/SSH.NET_license.txt @@ -0,0 +1,12 @@ +Copyright (c) 2010, RENCI +All rights reserved. + +Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: + +* Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. + +* Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. + +* Neither the name of RENCI nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. \ No newline at end of file diff --git a/Licenses/SevenZipSharp_license.txt b/Licenses/SevenZipSharp_license.txt new file mode 100644 index 000000000..fc8a5de7e --- /dev/null +++ b/Licenses/SevenZipSharp_license.txt @@ -0,0 +1,165 @@ + GNU LESSER GENERAL PUBLIC LICENSE + Version 3, 29 June 2007 + + Copyright (C) 2007 Free Software Foundation, Inc. + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + + This version of the GNU Lesser General Public License incorporates +the terms and conditions of version 3 of the GNU General Public +License, supplemented by the additional permissions listed below. + + 0. Additional Definitions. + + As used herein, "this License" refers to version 3 of the GNU Lesser +General Public License, and the "GNU GPL" refers to version 3 of the GNU +General Public License. + + "The Library" refers to a covered work governed by this License, +other than an Application or a Combined Work as defined below. + + An "Application" is any work that makes use of an interface provided +by the Library, but which is not otherwise based on the Library. +Defining a subclass of a class defined by the Library is deemed a mode +of using an interface provided by the Library. + + A "Combined Work" is a work produced by combining or linking an +Application with the Library. The particular version of the Library +with which the Combined Work was made is also called the "Linked +Version". + + The "Minimal Corresponding Source" for a Combined Work means the +Corresponding Source for the Combined Work, excluding any source code +for portions of the Combined Work that, considered in isolation, are +based on the Application, and not on the Linked Version. + + The "Corresponding Application Code" for a Combined Work means the +object code and/or source code for the Application, including any data +and utility programs needed for reproducing the Combined Work from the +Application, but excluding the System Libraries of the Combined Work. + + 1. Exception to Section 3 of the GNU GPL. + + You may convey a covered work under sections 3 and 4 of this License +without being bound by section 3 of the GNU GPL. + + 2. Conveying Modified Versions. + + If you modify a copy of the Library, and, in your modifications, a +facility refers to a function or data to be supplied by an Application +that uses the facility (other than as an argument passed when the +facility is invoked), then you may convey a copy of the modified +version: + + a) under this License, provided that you make a good faith effort to + ensure that, in the event an Application does not supply the + function or data, the facility still operates, and performs + whatever part of its purpose remains meaningful, or + + b) under the GNU GPL, with none of the additional permissions of + this License applicable to that copy. + + 3. Object Code Incorporating Material from Library Header Files. + + The object code form of an Application may incorporate material from +a header file that is part of the Library. You may convey such object +code under terms of your choice, provided that, if the incorporated +material is not limited to numerical parameters, data structure +layouts and accessors, or small macros, inline functions and templates +(ten or fewer lines in length), you do both of the following: + + a) Give prominent notice with each copy of the object code that the + Library is used in it and that the Library and its use are + covered by this License. + + b) Accompany the object code with a copy of the GNU GPL and this license + document. + + 4. Combined Works. + + You may convey a Combined Work under terms of your choice that, +taken together, effectively do not restrict modification of the +portions of the Library contained in the Combined Work and reverse +engineering for debugging such modifications, if you also do each of +the following: + + a) Give prominent notice with each copy of the Combined Work that + the Library is used in it and that the Library and its use are + covered by this License. + + b) Accompany the Combined Work with a copy of the GNU GPL and this license + document. + + c) For a Combined Work that displays copyright notices during + execution, include the copyright notice for the Library among + these notices, as well as a reference directing the user to the + copies of the GNU GPL and this license document. + + d) Do one of the following: + + 0) Convey the Minimal Corresponding Source under the terms of this + License, and the Corresponding Application Code in a form + suitable for, and under terms that permit, the user to + recombine or relink the Application with a modified version of + the Linked Version to produce a modified Combined Work, in the + manner specified by section 6 of the GNU GPL for conveying + Corresponding Source. + + 1) Use a suitable shared library mechanism for linking with the + Library. A suitable mechanism is one that (a) uses at run time + a copy of the Library already present on the user's computer + system, and (b) will operate properly with a modified version + of the Library that is interface-compatible with the Linked + Version. + + e) Provide Installation Information, but only if you would otherwise + be required to provide such information under section 6 of the + GNU GPL, and only to the extent that such information is + necessary to install and execute a modified version of the + Combined Work produced by recombining or relinking the + Application with a modified version of the Linked Version. (If + you use option 4d0, the Installation Information must accompany + the Minimal Corresponding Source and Corresponding Application + Code. If you use option 4d1, you must provide the Installation + Information in the manner specified by section 6 of the GNU GPL + for conveying Corresponding Source.) + + 5. Combined Libraries. + + You may place library facilities that are a work based on the +Library side by side in a single library together with other library +facilities that are not Applications and are not covered by this +License, and convey such a combined library under terms of your +choice, if you do both of the following: + + a) Accompany the combined library with a copy of the same work based + on the Library, uncombined with any other library facilities, + conveyed under the terms of this License. + + b) Give prominent notice with the combined library that part of it + is a work based on the Library, and explaining where to find the + accompanying uncombined form of the same work. + + 6. Revised Versions of the GNU Lesser General Public License. + + The Free Software Foundation may publish revised and/or new versions +of the GNU Lesser General Public License from time to time. Such new +versions will be similar in spirit to the present version, but may +differ in detail to address new problems or concerns. + + Each version is given a distinguishing version number. If the +Library as you received it specifies that a certain numbered version +of the GNU Lesser General Public License "or any later version" +applies to it, you have the option of following the terms and +conditions either of that published version or of any later version +published by the Free Software Foundation. If the Library as you +received it does not specify a version number of the GNU Lesser +General Public License, you may choose any version of the GNU Lesser +General Public License ever published by the Free Software Foundation. + + If the Library as you received it specifies that a proxy can decide +whether future versions of the GNU Lesser General Public License shall +apply, that proxy's public statement of acceptance of any version is +permanent authorization for you to choose that version for the +Library. diff --git a/Licenses/ShareX_license.txt b/Licenses/ShareX_license.txt new file mode 100644 index 000000000..20d40b6bc --- /dev/null +++ b/Licenses/ShareX_license.txt @@ -0,0 +1,674 @@ + GNU GENERAL PUBLIC LICENSE + Version 3, 29 June 2007 + + Copyright (C) 2007 Free Software Foundation, Inc. + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The GNU General Public License is a free, copyleft license for +software and other kinds of works. + + The licenses for most software and other practical works are designed +to take away your freedom to share and change the works. By contrast, +the GNU General Public License is intended to guarantee your freedom to +share and change all versions of a program--to make sure it remains free +software for all its users. We, the Free Software Foundation, use the +GNU General Public License for most of our software; it applies also to +any other work released this way by its authors. You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +them if you wish), that you receive source code or can get it if you +want it, that you can change the software or use pieces of it in new +free programs, and that you know you can do these things. + + To protect your rights, we need to prevent others from denying you +these rights or asking you to surrender the rights. Therefore, you have +certain responsibilities if you distribute copies of the software, or if +you modify it: responsibilities to respect the freedom of others. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must pass on to the recipients the same +freedoms that you received. You must make sure that they, too, receive +or can get the source code. And you must show them these terms so they +know their rights. + + Developers that use the GNU GPL protect your rights with two steps: +(1) assert copyright on the software, and (2) offer you this License +giving you legal permission to copy, distribute and/or modify it. + + For the developers' and authors' protection, the GPL clearly explains +that there is no warranty for this free software. For both users' and +authors' sake, the GPL requires that modified versions be marked as +changed, so that their problems will not be attributed erroneously to +authors of previous versions. + + Some devices are designed to deny users access to install or run +modified versions of the software inside them, although the manufacturer +can do so. This is fundamentally incompatible with the aim of +protecting users' freedom to change the software. The systematic +pattern of such abuse occurs in the area of products for individuals to +use, which is precisely where it is most unacceptable. Therefore, we +have designed this version of the GPL to prohibit the practice for those +products. If such problems arise substantially in other domains, we +stand ready to extend this provision to those domains in future versions +of the GPL, as needed to protect the freedom of users. + + Finally, every program is threatened constantly by software patents. +States should not allow patents to restrict development and use of +software on general-purpose computers, but in those that do, we wish to +avoid the special danger that patents applied to a free program could +make it effectively proprietary. To prevent this, the GPL assures that +patents cannot be used to render the program non-free. + + The precise terms and conditions for copying, distribution and +modification follow. + + TERMS AND CONDITIONS + + 0. Definitions. + + "This License" refers to version 3 of the GNU General Public License. + + "Copyright" also means copyright-like laws that apply to other kinds of +works, such as semiconductor masks. + + "The Program" refers to any copyrightable work licensed under this +License. Each licensee is addressed as "you". "Licensees" and +"recipients" may be individuals or organizations. + + To "modify" a work means to copy from or adapt all or part of the work +in a fashion requiring copyright permission, other than the making of an +exact copy. The resulting work is called a "modified version" of the +earlier work or a work "based on" the earlier work. + + A "covered work" means either the unmodified Program or a work based +on the Program. + + To "propagate" a work means to do anything with it that, without +permission, would make you directly or secondarily liable for +infringement under applicable copyright law, except executing it on a +computer or modifying a private copy. Propagation includes copying, +distribution (with or without modification), making available to the +public, and in some countries other activities as well. + + To "convey" a work means any kind of propagation that enables other +parties to make or receive copies. Mere interaction with a user through +a computer network, with no transfer of a copy, is not conveying. + + An interactive user interface displays "Appropriate Legal Notices" +to the extent that it includes a convenient and prominently visible +feature that (1) displays an appropriate copyright notice, and (2) +tells the user that there is no warranty for the work (except to the +extent that warranties are provided), that licensees may convey the +work under this License, and how to view a copy of this License. If +the interface presents a list of user commands or options, such as a +menu, a prominent item in the list meets this criterion. + + 1. Source Code. + + The "source code" for a work means the preferred form of the work +for making modifications to it. "Object code" means any non-source +form of a work. + + A "Standard Interface" means an interface that either is an official +standard defined by a recognized standards body, or, in the case of +interfaces specified for a particular programming language, one that +is widely used among developers working in that language. + + The "System Libraries" of an executable work include anything, other +than the work as a whole, that (a) is included in the normal form of +packaging a Major Component, but which is not part of that Major +Component, and (b) serves only to enable use of the work with that +Major Component, or to implement a Standard Interface for which an +implementation is available to the public in source code form. A +"Major Component", in this context, means a major essential component +(kernel, window system, and so on) of the specific operating system +(if any) on which the executable work runs, or a compiler used to +produce the work, or an object code interpreter used to run it. + + The "Corresponding Source" for a work in object code form means all +the source code needed to generate, install, and (for an executable +work) run the object code and to modify the work, including scripts to +control those activities. However, it does not include the work's +System Libraries, or general-purpose tools or generally available free +programs which are used unmodified in performing those activities but +which are not part of the work. For example, Corresponding Source +includes interface definition files associated with source files for +the work, and the source code for shared libraries and dynamically +linked subprograms that the work is specifically designed to require, +such as by intimate data communication or control flow between those +subprograms and other parts of the work. + + The Corresponding Source need not include anything that users +can regenerate automatically from other parts of the Corresponding +Source. + + The Corresponding Source for a work in source code form is that +same work. + + 2. Basic Permissions. + + All rights granted under this License are granted for the term of +copyright on the Program, and are irrevocable provided the stated +conditions are met. This License explicitly affirms your unlimited +permission to run the unmodified Program. The output from running a +covered work is covered by this License only if the output, given its +content, constitutes a covered work. This License acknowledges your +rights of fair use or other equivalent, as provided by copyright law. + + You may make, run and propagate covered works that you do not +convey, without conditions so long as your license otherwise remains +in force. You may convey covered works to others for the sole purpose +of having them make modifications exclusively for you, or provide you +with facilities for running those works, provided that you comply with +the terms of this License in conveying all material for which you do +not control copyright. Those thus making or running the covered works +for you must do so exclusively on your behalf, under your direction +and control, on terms that prohibit them from making any copies of +your copyrighted material outside their relationship with you. + + Conveying under any other circumstances is permitted solely under +the conditions stated below. Sublicensing is not allowed; section 10 +makes it unnecessary. + + 3. Protecting Users' Legal Rights From Anti-Circumvention Law. + + No covered work shall be deemed part of an effective technological +measure under any applicable law fulfilling obligations under article +11 of the WIPO copyright treaty adopted on 20 December 1996, or +similar laws prohibiting or restricting circumvention of such +measures. + + When you convey a covered work, you waive any legal power to forbid +circumvention of technological measures to the extent such circumvention +is effected by exercising rights under this License with respect to +the covered work, and you disclaim any intention to limit operation or +modification of the work as a means of enforcing, against the work's +users, your or third parties' legal rights to forbid circumvention of +technological measures. + + 4. Conveying Verbatim Copies. + + You may convey verbatim copies of the Program's source code as you +receive it, in any medium, provided that you conspicuously and +appropriately publish on each copy an appropriate copyright notice; +keep intact all notices stating that this License and any +non-permissive terms added in accord with section 7 apply to the code; +keep intact all notices of the absence of any warranty; and give all +recipients a copy of this License along with the Program. + + You may charge any price or no price for each copy that you convey, +and you may offer support or warranty protection for a fee. + + 5. Conveying Modified Source Versions. + + You may convey a work based on the Program, or the modifications to +produce it from the Program, in the form of source code under the +terms of section 4, provided that you also meet all of these conditions: + + a) The work must carry prominent notices stating that you modified + it, and giving a relevant date. + + b) The work must carry prominent notices stating that it is + released under this License and any conditions added under section + 7. This requirement modifies the requirement in section 4 to + "keep intact all notices". + + c) You must license the entire work, as a whole, under this + License to anyone who comes into possession of a copy. This + License will therefore apply, along with any applicable section 7 + additional terms, to the whole of the work, and all its parts, + regardless of how they are packaged. This License gives no + permission to license the work in any other way, but it does not + invalidate such permission if you have separately received it. + + d) If the work has interactive user interfaces, each must display + Appropriate Legal Notices; however, if the Program has interactive + interfaces that do not display Appropriate Legal Notices, your + work need not make them do so. + + A compilation of a covered work with other separate and independent +works, which are not by their nature extensions of the covered work, +and which are not combined with it such as to form a larger program, +in or on a volume of a storage or distribution medium, is called an +"aggregate" if the compilation and its resulting copyright are not +used to limit the access or legal rights of the compilation's users +beyond what the individual works permit. Inclusion of a covered work +in an aggregate does not cause this License to apply to the other +parts of the aggregate. + + 6. Conveying Non-Source Forms. + + You may convey a covered work in object code form under the terms +of sections 4 and 5, provided that you also convey the +machine-readable Corresponding Source under the terms of this License, +in one of these ways: + + a) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by the + Corresponding Source fixed on a durable physical medium + customarily used for software interchange. + + b) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by a + written offer, valid for at least three years and valid for as + long as you offer spare parts or customer support for that product + model, to give anyone who possesses the object code either (1) a + copy of the Corresponding Source for all the software in the + product that is covered by this License, on a durable physical + medium customarily used for software interchange, for a price no + more than your reasonable cost of physically performing this + conveying of source, or (2) access to copy the + Corresponding Source from a network server at no charge. + + c) Convey individual copies of the object code with a copy of the + written offer to provide the Corresponding Source. This + alternative is allowed only occasionally and noncommercially, and + only if you received the object code with such an offer, in accord + with subsection 6b. + + d) Convey the object code by offering access from a designated + place (gratis or for a charge), and offer equivalent access to the + Corresponding Source in the same way through the same place at no + further charge. You need not require recipients to copy the + Corresponding Source along with the object code. If the place to + copy the object code is a network server, the Corresponding Source + may be on a different server (operated by you or a third party) + that supports equivalent copying facilities, provided you maintain + clear directions next to the object code saying where to find the + Corresponding Source. Regardless of what server hosts the + Corresponding Source, you remain obligated to ensure that it is + available for as long as needed to satisfy these requirements. + + e) Convey the object code using peer-to-peer transmission, provided + you inform other peers where the object code and Corresponding + Source of the work are being offered to the general public at no + charge under subsection 6d. + + A separable portion of the object code, whose source code is excluded +from the Corresponding Source as a System Library, need not be +included in conveying the object code work. + + A "User Product" is either (1) a "consumer product", which means any +tangible personal property which is normally used for personal, family, +or household purposes, or (2) anything designed or sold for incorporation +into a dwelling. In determining whether a product is a consumer product, +doubtful cases shall be resolved in favor of coverage. For a particular +product received by a particular user, "normally used" refers to a +typical or common use of that class of product, regardless of the status +of the particular user or of the way in which the particular user +actually uses, or expects or is expected to use, the product. A product +is a consumer product regardless of whether the product has substantial +commercial, industrial or non-consumer uses, unless such uses represent +the only significant mode of use of the product. + + "Installation Information" for a User Product means any methods, +procedures, authorization keys, or other information required to install +and execute modified versions of a covered work in that User Product from +a modified version of its Corresponding Source. The information must +suffice to ensure that the continued functioning of the modified object +code is in no case prevented or interfered with solely because +modification has been made. + + If you convey an object code work under this section in, or with, or +specifically for use in, a User Product, and the conveying occurs as +part of a transaction in which the right of possession and use of the +User Product is transferred to the recipient in perpetuity or for a +fixed term (regardless of how the transaction is characterized), the +Corresponding Source conveyed under this section must be accompanied +by the Installation Information. But this requirement does not apply +if neither you nor any third party retains the ability to install +modified object code on the User Product (for example, the work has +been installed in ROM). + + The requirement to provide Installation Information does not include a +requirement to continue to provide support service, warranty, or updates +for a work that has been modified or installed by the recipient, or for +the User Product in which it has been modified or installed. Access to a +network may be denied when the modification itself materially and +adversely affects the operation of the network or violates the rules and +protocols for communication across the network. + + Corresponding Source conveyed, and Installation Information provided, +in accord with this section must be in a format that is publicly +documented (and with an implementation available to the public in +source code form), and must require no special password or key for +unpacking, reading or copying. + + 7. Additional Terms. + + "Additional permissions" are terms that supplement the terms of this +License by making exceptions from one or more of its conditions. +Additional permissions that are applicable to the entire Program shall +be treated as though they were included in this License, to the extent +that they are valid under applicable law. If additional permissions +apply only to part of the Program, that part may be used separately +under those permissions, but the entire Program remains governed by +this License without regard to the additional permissions. + + When you convey a copy of a covered work, you may at your option +remove any additional permissions from that copy, or from any part of +it. (Additional permissions may be written to require their own +removal in certain cases when you modify the work.) You may place +additional permissions on material, added by you to a covered work, +for which you have or can give appropriate copyright permission. + + Notwithstanding any other provision of this License, for material you +add to a covered work, you may (if authorized by the copyright holders of +that material) supplement the terms of this License with terms: + + a) Disclaiming warranty or limiting liability differently from the + terms of sections 15 and 16 of this License; or + + b) Requiring preservation of specified reasonable legal notices or + author attributions in that material or in the Appropriate Legal + Notices displayed by works containing it; or + + c) Prohibiting misrepresentation of the origin of that material, or + requiring that modified versions of such material be marked in + reasonable ways as different from the original version; or + + d) Limiting the use for publicity purposes of names of licensors or + authors of the material; or + + e) Declining to grant rights under trademark law for use of some + trade names, trademarks, or service marks; or + + f) Requiring indemnification of licensors and authors of that + material by anyone who conveys the material (or modified versions of + it) with contractual assumptions of liability to the recipient, for + any liability that these contractual assumptions directly impose on + those licensors and authors. + + All other non-permissive additional terms are considered "further +restrictions" within the meaning of section 10. If the Program as you +received it, or any part of it, contains a notice stating that it is +governed by this License along with a term that is a further +restriction, you may remove that term. If a license document contains +a further restriction but permits relicensing or conveying under this +License, you may add to a covered work material governed by the terms +of that license document, provided that the further restriction does +not survive such relicensing or conveying. + + If you add terms to a covered work in accord with this section, you +must place, in the relevant source files, a statement of the +additional terms that apply to those files, or a notice indicating +where to find the applicable terms. + + Additional terms, permissive or non-permissive, may be stated in the +form of a separately written license, or stated as exceptions; +the above requirements apply either way. + + 8. Termination. + + You may not propagate or modify a covered work except as expressly +provided under this License. Any attempt otherwise to propagate or +modify it is void, and will automatically terminate your rights under +this License (including any patent licenses granted under the third +paragraph of section 11). + + However, if you cease all violation of this License, then your +license from a particular copyright holder is reinstated (a) +provisionally, unless and until the copyright holder explicitly and +finally terminates your license, and (b) permanently, if the copyright +holder fails to notify you of the violation by some reasonable means +prior to 60 days after the cessation. + + Moreover, your license from a particular copyright holder is +reinstated permanently if the copyright holder notifies you of the +violation by some reasonable means, this is the first time you have +received notice of violation of this License (for any work) from that +copyright holder, and you cure the violation prior to 30 days after +your receipt of the notice. + + Termination of your rights under this section does not terminate the +licenses of parties who have received copies or rights from you under +this License. If your rights have been terminated and not permanently +reinstated, you do not qualify to receive new licenses for the same +material under section 10. + + 9. Acceptance Not Required for Having Copies. + + You are not required to accept this License in order to receive or +run a copy of the Program. Ancillary propagation of a covered work +occurring solely as a consequence of using peer-to-peer transmission +to receive a copy likewise does not require acceptance. However, +nothing other than this License grants you permission to propagate or +modify any covered work. These actions infringe copyright if you do +not accept this License. Therefore, by modifying or propagating a +covered work, you indicate your acceptance of this License to do so. + + 10. Automatic Licensing of Downstream Recipients. + + Each time you convey a covered work, the recipient automatically +receives a license from the original licensors, to run, modify and +propagate that work, subject to this License. You are not responsible +for enforcing compliance by third parties with this License. + + An "entity transaction" is a transaction transferring control of an +organization, or substantially all assets of one, or subdividing an +organization, or merging organizations. If propagation of a covered +work results from an entity transaction, each party to that +transaction who receives a copy of the work also receives whatever +licenses to the work the party's predecessor in interest had or could +give under the previous paragraph, plus a right to possession of the +Corresponding Source of the work from the predecessor in interest, if +the predecessor has it or can get it with reasonable efforts. + + You may not impose any further restrictions on the exercise of the +rights granted or affirmed under this License. For example, you may +not impose a license fee, royalty, or other charge for exercise of +rights granted under this License, and you may not initiate litigation +(including a cross-claim or counterclaim in a lawsuit) alleging that +any patent claim is infringed by making, using, selling, offering for +sale, or importing the Program or any portion of it. + + 11. Patents. + + A "contributor" is a copyright holder who authorizes use under this +License of the Program or a work on which the Program is based. The +work thus licensed is called the contributor's "contributor version". + + A contributor's "essential patent claims" are all patent claims +owned or controlled by the contributor, whether already acquired or +hereafter acquired, that would be infringed by some manner, permitted +by this License, of making, using, or selling its contributor version, +but do not include claims that would be infringed only as a +consequence of further modification of the contributor version. For +purposes of this definition, "control" includes the right to grant +patent sublicenses in a manner consistent with the requirements of +this License. + + Each contributor grants you a non-exclusive, worldwide, royalty-free +patent license under the contributor's essential patent claims, to +make, use, sell, offer for sale, import and otherwise run, modify and +propagate the contents of its contributor version. + + In the following three paragraphs, a "patent license" is any express +agreement or commitment, however denominated, not to enforce a patent +(such as an express permission to practice a patent or covenant not to +sue for patent infringement). To "grant" such a patent license to a +party means to make such an agreement or commitment not to enforce a +patent against the party. + + If you convey a covered work, knowingly relying on a patent license, +and the Corresponding Source of the work is not available for anyone +to copy, free of charge and under the terms of this License, through a +publicly available network server or other readily accessible means, +then you must either (1) cause the Corresponding Source to be so +available, or (2) arrange to deprive yourself of the benefit of the +patent license for this particular work, or (3) arrange, in a manner +consistent with the requirements of this License, to extend the patent +license to downstream recipients. "Knowingly relying" means you have +actual knowledge that, but for the patent license, your conveying the +covered work in a country, or your recipient's use of the covered work +in a country, would infringe one or more identifiable patents in that +country that you have reason to believe are valid. + + If, pursuant to or in connection with a single transaction or +arrangement, you convey, or propagate by procuring conveyance of, a +covered work, and grant a patent license to some of the parties +receiving the covered work authorizing them to use, propagate, modify +or convey a specific copy of the covered work, then the patent license +you grant is automatically extended to all recipients of the covered +work and works based on it. + + A patent license is "discriminatory" if it does not include within +the scope of its coverage, prohibits the exercise of, or is +conditioned on the non-exercise of one or more of the rights that are +specifically granted under this License. You may not convey a covered +work if you are a party to an arrangement with a third party that is +in the business of distributing software, under which you make payment +to the third party based on the extent of your activity of conveying +the work, and under which the third party grants, to any of the +parties who would receive the covered work from you, a discriminatory +patent license (a) in connection with copies of the covered work +conveyed by you (or copies made from those copies), or (b) primarily +for and in connection with specific products or compilations that +contain the covered work, unless you entered into that arrangement, +or that patent license was granted, prior to 28 March 2007. + + Nothing in this License shall be construed as excluding or limiting +any implied license or other defenses to infringement that may +otherwise be available to you under applicable patent law. + + 12. No Surrender of Others' Freedom. + + If conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot convey a +covered work so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you may +not convey it at all. For example, if you agree to terms that obligate you +to collect a royalty for further conveying from those to whom you convey +the Program, the only way you could satisfy both those terms and this +License would be to refrain entirely from conveying the Program. + + 13. Use with the GNU Affero General Public License. + + Notwithstanding any other provision of this License, you have +permission to link or combine any covered work with a work licensed +under version 3 of the GNU Affero General Public License into a single +combined work, and to convey the resulting work. The terms of this +License will continue to apply to the part which is the covered work, +but the special requirements of the GNU Affero General Public License, +section 13, concerning interaction through a network will apply to the +combination as such. + + 14. Revised Versions of this License. + + The Free Software Foundation may publish revised and/or new versions of +the GNU General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + + Each version is given a distinguishing version number. If the +Program specifies that a certain numbered version of the GNU General +Public License "or any later version" applies to it, you have the +option of following the terms and conditions either of that numbered +version or of any later version published by the Free Software +Foundation. If the Program does not specify a version number of the +GNU General Public License, you may choose any version ever published +by the Free Software Foundation. + + If the Program specifies that a proxy can decide which future +versions of the GNU General Public License can be used, that proxy's +public statement of acceptance of a version permanently authorizes you +to choose that version for the Program. + + Later license versions may give you additional or different +permissions. However, no additional obligations are imposed on any +author or copyright holder as a result of your choosing to follow a +later version. + + 15. Disclaimer of Warranty. + + THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY +APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT +HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY +OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, +THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM +IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF +ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. Limitation of Liability. + + IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS +THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY +GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE +USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF +DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD +PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), +EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF +SUCH DAMAGES. + + 17. Interpretation of Sections 15 and 16. + + If the disclaimer of warranty and limitation of liability provided +above cannot be given local legal effect according to their terms, +reviewing courts shall apply local law that most closely approximates +an absolute waiver of all civil liability in connection with the +Program, unless a warranty or assumption of liability accompanies a +copy of the Program in return for a fee. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +state the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + + Copyright (C) + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . + +Also add information on how to contact you by electronic and paper mail. + + If the program does terminal interaction, make it output a short +notice like this when it starts in an interactive mode: + + Copyright (C) + This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, your program's commands +might be different; for a GUI interface, you would use an "about box". + + You should also get your employer (if you work as a programmer) or school, +if any, to sign a "copyright disclaimer" for the program, if necessary. +For more information on this, and how to apply and follow the GNU GPL, see +. + + The GNU General Public License does not permit incorporating your program +into proprietary programs. If your program is a subroutine library, you +may consider it more useful to permit linking proprietary applications with +the library. If this is what you want to do, use the GNU Lesser General +Public License instead of this License. But first, please read +. \ No newline at end of file diff --git a/Licenses/Steamworks.NET_license.txt b/Licenses/Steamworks.NET_license.txt new file mode 100644 index 000000000..9bb3fd76a --- /dev/null +++ b/Licenses/Steamworks.NET_license.txt @@ -0,0 +1,21 @@ +The MIT License (MIT) + +Copyright (c) 2015 Riley Labrecque + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +THE SOFTWARE. diff --git a/Licenses/System.Net.FtpClient_license.txt b/Licenses/System.Net.FtpClient_license.txt new file mode 100644 index 000000000..a18c059b0 --- /dev/null +++ b/Licenses/System.Net.FtpClient_license.txt @@ -0,0 +1,7 @@ +Copyright (c) 2013 J.P. Trosclair + +Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. \ No newline at end of file diff --git a/Licenses/Zeranoe_FFmpeg_license.txt b/Licenses/Zeranoe_FFmpeg_license.txt new file mode 100644 index 000000000..94a9ed024 --- /dev/null +++ b/Licenses/Zeranoe_FFmpeg_license.txt @@ -0,0 +1,674 @@ + GNU GENERAL PUBLIC LICENSE + Version 3, 29 June 2007 + + Copyright (C) 2007 Free Software Foundation, Inc. + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The GNU General Public License is a free, copyleft license for +software and other kinds of works. + + The licenses for most software and other practical works are designed +to take away your freedom to share and change the works. By contrast, +the GNU General Public License is intended to guarantee your freedom to +share and change all versions of a program--to make sure it remains free +software for all its users. We, the Free Software Foundation, use the +GNU General Public License for most of our software; it applies also to +any other work released this way by its authors. You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +them if you wish), that you receive source code or can get it if you +want it, that you can change the software or use pieces of it in new +free programs, and that you know you can do these things. + + To protect your rights, we need to prevent others from denying you +these rights or asking you to surrender the rights. Therefore, you have +certain responsibilities if you distribute copies of the software, or if +you modify it: responsibilities to respect the freedom of others. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must pass on to the recipients the same +freedoms that you received. You must make sure that they, too, receive +or can get the source code. And you must show them these terms so they +know their rights. + + Developers that use the GNU GPL protect your rights with two steps: +(1) assert copyright on the software, and (2) offer you this License +giving you legal permission to copy, distribute and/or modify it. + + For the developers' and authors' protection, the GPL clearly explains +that there is no warranty for this free software. For both users' and +authors' sake, the GPL requires that modified versions be marked as +changed, so that their problems will not be attributed erroneously to +authors of previous versions. + + Some devices are designed to deny users access to install or run +modified versions of the software inside them, although the manufacturer +can do so. This is fundamentally incompatible with the aim of +protecting users' freedom to change the software. The systematic +pattern of such abuse occurs in the area of products for individuals to +use, which is precisely where it is most unacceptable. Therefore, we +have designed this version of the GPL to prohibit the practice for those +products. If such problems arise substantially in other domains, we +stand ready to extend this provision to those domains in future versions +of the GPL, as needed to protect the freedom of users. + + Finally, every program is threatened constantly by software patents. +States should not allow patents to restrict development and use of +software on general-purpose computers, but in those that do, we wish to +avoid the special danger that patents applied to a free program could +make it effectively proprietary. To prevent this, the GPL assures that +patents cannot be used to render the program non-free. + + The precise terms and conditions for copying, distribution and +modification follow. + + TERMS AND CONDITIONS + + 0. Definitions. + + "This License" refers to version 3 of the GNU General Public License. + + "Copyright" also means copyright-like laws that apply to other kinds of +works, such as semiconductor masks. + + "The Program" refers to any copyrightable work licensed under this +License. Each licensee is addressed as "you". "Licensees" and +"recipients" may be individuals or organizations. + + To "modify" a work means to copy from or adapt all or part of the work +in a fashion requiring copyright permission, other than the making of an +exact copy. The resulting work is called a "modified version" of the +earlier work or a work "based on" the earlier work. + + A "covered work" means either the unmodified Program or a work based +on the Program. + + To "propagate" a work means to do anything with it that, without +permission, would make you directly or secondarily liable for +infringement under applicable copyright law, except executing it on a +computer or modifying a private copy. Propagation includes copying, +distribution (with or without modification), making available to the +public, and in some countries other activities as well. + + To "convey" a work means any kind of propagation that enables other +parties to make or receive copies. Mere interaction with a user through +a computer network, with no transfer of a copy, is not conveying. + + An interactive user interface displays "Appropriate Legal Notices" +to the extent that it includes a convenient and prominently visible +feature that (1) displays an appropriate copyright notice, and (2) +tells the user that there is no warranty for the work (except to the +extent that warranties are provided), that licensees may convey the +work under this License, and how to view a copy of this License. If +the interface presents a list of user commands or options, such as a +menu, a prominent item in the list meets this criterion. + + 1. Source Code. + + The "source code" for a work means the preferred form of the work +for making modifications to it. "Object code" means any non-source +form of a work. + + A "Standard Interface" means an interface that either is an official +standard defined by a recognized standards body, or, in the case of +interfaces specified for a particular programming language, one that +is widely used among developers working in that language. + + The "System Libraries" of an executable work include anything, other +than the work as a whole, that (a) is included in the normal form of +packaging a Major Component, but which is not part of that Major +Component, and (b) serves only to enable use of the work with that +Major Component, or to implement a Standard Interface for which an +implementation is available to the public in source code form. A +"Major Component", in this context, means a major essential component +(kernel, window system, and so on) of the specific operating system +(if any) on which the executable work runs, or a compiler used to +produce the work, or an object code interpreter used to run it. + + The "Corresponding Source" for a work in object code form means all +the source code needed to generate, install, and (for an executable +work) run the object code and to modify the work, including scripts to +control those activities. However, it does not include the work's +System Libraries, or general-purpose tools or generally available free +programs which are used unmodified in performing those activities but +which are not part of the work. For example, Corresponding Source +includes interface definition files associated with source files for +the work, and the source code for shared libraries and dynamically +linked subprograms that the work is specifically designed to require, +such as by intimate data communication or control flow between those +subprograms and other parts of the work. + + The Corresponding Source need not include anything that users +can regenerate automatically from other parts of the Corresponding +Source. + + The Corresponding Source for a work in source code form is that +same work. + + 2. Basic Permissions. + + All rights granted under this License are granted for the term of +copyright on the Program, and are irrevocable provided the stated +conditions are met. This License explicitly affirms your unlimited +permission to run the unmodified Program. The output from running a +covered work is covered by this License only if the output, given its +content, constitutes a covered work. This License acknowledges your +rights of fair use or other equivalent, as provided by copyright law. + + You may make, run and propagate covered works that you do not +convey, without conditions so long as your license otherwise remains +in force. You may convey covered works to others for the sole purpose +of having them make modifications exclusively for you, or provide you +with facilities for running those works, provided that you comply with +the terms of this License in conveying all material for which you do +not control copyright. Those thus making or running the covered works +for you must do so exclusively on your behalf, under your direction +and control, on terms that prohibit them from making any copies of +your copyrighted material outside their relationship with you. + + Conveying under any other circumstances is permitted solely under +the conditions stated below. Sublicensing is not allowed; section 10 +makes it unnecessary. + + 3. Protecting Users' Legal Rights From Anti-Circumvention Law. + + No covered work shall be deemed part of an effective technological +measure under any applicable law fulfilling obligations under article +11 of the WIPO copyright treaty adopted on 20 December 1996, or +similar laws prohibiting or restricting circumvention of such +measures. + + When you convey a covered work, you waive any legal power to forbid +circumvention of technological measures to the extent such circumvention +is effected by exercising rights under this License with respect to +the covered work, and you disclaim any intention to limit operation or +modification of the work as a means of enforcing, against the work's +users, your or third parties' legal rights to forbid circumvention of +technological measures. + + 4. Conveying Verbatim Copies. + + You may convey verbatim copies of the Program's source code as you +receive it, in any medium, provided that you conspicuously and +appropriately publish on each copy an appropriate copyright notice; +keep intact all notices stating that this License and any +non-permissive terms added in accord with section 7 apply to the code; +keep intact all notices of the absence of any warranty; and give all +recipients a copy of this License along with the Program. + + You may charge any price or no price for each copy that you convey, +and you may offer support or warranty protection for a fee. + + 5. Conveying Modified Source Versions. + + You may convey a work based on the Program, or the modifications to +produce it from the Program, in the form of source code under the +terms of section 4, provided that you also meet all of these conditions: + + a) The work must carry prominent notices stating that you modified + it, and giving a relevant date. + + b) The work must carry prominent notices stating that it is + released under this License and any conditions added under section + 7. This requirement modifies the requirement in section 4 to + "keep intact all notices". + + c) You must license the entire work, as a whole, under this + License to anyone who comes into possession of a copy. This + License will therefore apply, along with any applicable section 7 + additional terms, to the whole of the work, and all its parts, + regardless of how they are packaged. This License gives no + permission to license the work in any other way, but it does not + invalidate such permission if you have separately received it. + + d) If the work has interactive user interfaces, each must display + Appropriate Legal Notices; however, if the Program has interactive + interfaces that do not display Appropriate Legal Notices, your + work need not make them do so. + + A compilation of a covered work with other separate and independent +works, which are not by their nature extensions of the covered work, +and which are not combined with it such as to form a larger program, +in or on a volume of a storage or distribution medium, is called an +"aggregate" if the compilation and its resulting copyright are not +used to limit the access or legal rights of the compilation's users +beyond what the individual works permit. Inclusion of a covered work +in an aggregate does not cause this License to apply to the other +parts of the aggregate. + + 6. Conveying Non-Source Forms. + + You may convey a covered work in object code form under the terms +of sections 4 and 5, provided that you also convey the +machine-readable Corresponding Source under the terms of this License, +in one of these ways: + + a) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by the + Corresponding Source fixed on a durable physical medium + customarily used for software interchange. + + b) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by a + written offer, valid for at least three years and valid for as + long as you offer spare parts or customer support for that product + model, to give anyone who possesses the object code either (1) a + copy of the Corresponding Source for all the software in the + product that is covered by this License, on a durable physical + medium customarily used for software interchange, for a price no + more than your reasonable cost of physically performing this + conveying of source, or (2) access to copy the + Corresponding Source from a network server at no charge. + + c) Convey individual copies of the object code with a copy of the + written offer to provide the Corresponding Source. This + alternative is allowed only occasionally and noncommercially, and + only if you received the object code with such an offer, in accord + with subsection 6b. + + d) Convey the object code by offering access from a designated + place (gratis or for a charge), and offer equivalent access to the + Corresponding Source in the same way through the same place at no + further charge. You need not require recipients to copy the + Corresponding Source along with the object code. If the place to + copy the object code is a network server, the Corresponding Source + may be on a different server (operated by you or a third party) + that supports equivalent copying facilities, provided you maintain + clear directions next to the object code saying where to find the + Corresponding Source. Regardless of what server hosts the + Corresponding Source, you remain obligated to ensure that it is + available for as long as needed to satisfy these requirements. + + e) Convey the object code using peer-to-peer transmission, provided + you inform other peers where the object code and Corresponding + Source of the work are being offered to the general public at no + charge under subsection 6d. + + A separable portion of the object code, whose source code is excluded +from the Corresponding Source as a System Library, need not be +included in conveying the object code work. + + A "User Product" is either (1) a "consumer product", which means any +tangible personal property which is normally used for personal, family, +or household purposes, or (2) anything designed or sold for incorporation +into a dwelling. In determining whether a product is a consumer product, +doubtful cases shall be resolved in favor of coverage. For a particular +product received by a particular user, "normally used" refers to a +typical or common use of that class of product, regardless of the status +of the particular user or of the way in which the particular user +actually uses, or expects or is expected to use, the product. A product +is a consumer product regardless of whether the product has substantial +commercial, industrial or non-consumer uses, unless such uses represent +the only significant mode of use of the product. + + "Installation Information" for a User Product means any methods, +procedures, authorization keys, or other information required to install +and execute modified versions of a covered work in that User Product from +a modified version of its Corresponding Source. The information must +suffice to ensure that the continued functioning of the modified object +code is in no case prevented or interfered with solely because +modification has been made. + + If you convey an object code work under this section in, or with, or +specifically for use in, a User Product, and the conveying occurs as +part of a transaction in which the right of possession and use of the +User Product is transferred to the recipient in perpetuity or for a +fixed term (regardless of how the transaction is characterized), the +Corresponding Source conveyed under this section must be accompanied +by the Installation Information. But this requirement does not apply +if neither you nor any third party retains the ability to install +modified object code on the User Product (for example, the work has +been installed in ROM). + + The requirement to provide Installation Information does not include a +requirement to continue to provide support service, warranty, or updates +for a work that has been modified or installed by the recipient, or for +the User Product in which it has been modified or installed. Access to a +network may be denied when the modification itself materially and +adversely affects the operation of the network or violates the rules and +protocols for communication across the network. + + Corresponding Source conveyed, and Installation Information provided, +in accord with this section must be in a format that is publicly +documented (and with an implementation available to the public in +source code form), and must require no special password or key for +unpacking, reading or copying. + + 7. Additional Terms. + + "Additional permissions" are terms that supplement the terms of this +License by making exceptions from one or more of its conditions. +Additional permissions that are applicable to the entire Program shall +be treated as though they were included in this License, to the extent +that they are valid under applicable law. If additional permissions +apply only to part of the Program, that part may be used separately +under those permissions, but the entire Program remains governed by +this License without regard to the additional permissions. + + When you convey a copy of a covered work, you may at your option +remove any additional permissions from that copy, or from any part of +it. (Additional permissions may be written to require their own +removal in certain cases when you modify the work.) You may place +additional permissions on material, added by you to a covered work, +for which you have or can give appropriate copyright permission. + + Notwithstanding any other provision of this License, for material you +add to a covered work, you may (if authorized by the copyright holders of +that material) supplement the terms of this License with terms: + + a) Disclaiming warranty or limiting liability differently from the + terms of sections 15 and 16 of this License; or + + b) Requiring preservation of specified reasonable legal notices or + author attributions in that material or in the Appropriate Legal + Notices displayed by works containing it; or + + c) Prohibiting misrepresentation of the origin of that material, or + requiring that modified versions of such material be marked in + reasonable ways as different from the original version; or + + d) Limiting the use for publicity purposes of names of licensors or + authors of the material; or + + e) Declining to grant rights under trademark law for use of some + trade names, trademarks, or service marks; or + + f) Requiring indemnification of licensors and authors of that + material by anyone who conveys the material (or modified versions of + it) with contractual assumptions of liability to the recipient, for + any liability that these contractual assumptions directly impose on + those licensors and authors. + + All other non-permissive additional terms are considered "further +restrictions" within the meaning of section 10. If the Program as you +received it, or any part of it, contains a notice stating that it is +governed by this License along with a term that is a further +restriction, you may remove that term. If a license document contains +a further restriction but permits relicensing or conveying under this +License, you may add to a covered work material governed by the terms +of that license document, provided that the further restriction does +not survive such relicensing or conveying. + + If you add terms to a covered work in accord with this section, you +must place, in the relevant source files, a statement of the +additional terms that apply to those files, or a notice indicating +where to find the applicable terms. + + Additional terms, permissive or non-permissive, may be stated in the +form of a separately written license, or stated as exceptions; +the above requirements apply either way. + + 8. Termination. + + You may not propagate or modify a covered work except as expressly +provided under this License. Any attempt otherwise to propagate or +modify it is void, and will automatically terminate your rights under +this License (including any patent licenses granted under the third +paragraph of section 11). + + However, if you cease all violation of this License, then your +license from a particular copyright holder is reinstated (a) +provisionally, unless and until the copyright holder explicitly and +finally terminates your license, and (b) permanently, if the copyright +holder fails to notify you of the violation by some reasonable means +prior to 60 days after the cessation. + + Moreover, your license from a particular copyright holder is +reinstated permanently if the copyright holder notifies you of the +violation by some reasonable means, this is the first time you have +received notice of violation of this License (for any work) from that +copyright holder, and you cure the violation prior to 30 days after +your receipt of the notice. + + Termination of your rights under this section does not terminate the +licenses of parties who have received copies or rights from you under +this License. If your rights have been terminated and not permanently +reinstated, you do not qualify to receive new licenses for the same +material under section 10. + + 9. Acceptance Not Required for Having Copies. + + You are not required to accept this License in order to receive or +run a copy of the Program. Ancillary propagation of a covered work +occurring solely as a consequence of using peer-to-peer transmission +to receive a copy likewise does not require acceptance. However, +nothing other than this License grants you permission to propagate or +modify any covered work. These actions infringe copyright if you do +not accept this License. Therefore, by modifying or propagating a +covered work, you indicate your acceptance of this License to do so. + + 10. Automatic Licensing of Downstream Recipients. + + Each time you convey a covered work, the recipient automatically +receives a license from the original licensors, to run, modify and +propagate that work, subject to this License. You are not responsible +for enforcing compliance by third parties with this License. + + An "entity transaction" is a transaction transferring control of an +organization, or substantially all assets of one, or subdividing an +organization, or merging organizations. If propagation of a covered +work results from an entity transaction, each party to that +transaction who receives a copy of the work also receives whatever +licenses to the work the party's predecessor in interest had or could +give under the previous paragraph, plus a right to possession of the +Corresponding Source of the work from the predecessor in interest, if +the predecessor has it or can get it with reasonable efforts. + + You may not impose any further restrictions on the exercise of the +rights granted or affirmed under this License. For example, you may +not impose a license fee, royalty, or other charge for exercise of +rights granted under this License, and you may not initiate litigation +(including a cross-claim or counterclaim in a lawsuit) alleging that +any patent claim is infringed by making, using, selling, offering for +sale, or importing the Program or any portion of it. + + 11. Patents. + + A "contributor" is a copyright holder who authorizes use under this +License of the Program or a work on which the Program is based. The +work thus licensed is called the contributor's "contributor version". + + A contributor's "essential patent claims" are all patent claims +owned or controlled by the contributor, whether already acquired or +hereafter acquired, that would be infringed by some manner, permitted +by this License, of making, using, or selling its contributor version, +but do not include claims that would be infringed only as a +consequence of further modification of the contributor version. For +purposes of this definition, "control" includes the right to grant +patent sublicenses in a manner consistent with the requirements of +this License. + + Each contributor grants you a non-exclusive, worldwide, royalty-free +patent license under the contributor's essential patent claims, to +make, use, sell, offer for sale, import and otherwise run, modify and +propagate the contents of its contributor version. + + In the following three paragraphs, a "patent license" is any express +agreement or commitment, however denominated, not to enforce a patent +(such as an express permission to practice a patent or covenant not to +sue for patent infringement). To "grant" such a patent license to a +party means to make such an agreement or commitment not to enforce a +patent against the party. + + If you convey a covered work, knowingly relying on a patent license, +and the Corresponding Source of the work is not available for anyone +to copy, free of charge and under the terms of this License, through a +publicly available network server or other readily accessible means, +then you must either (1) cause the Corresponding Source to be so +available, or (2) arrange to deprive yourself of the benefit of the +patent license for this particular work, or (3) arrange, in a manner +consistent with the requirements of this License, to extend the patent +license to downstream recipients. "Knowingly relying" means you have +actual knowledge that, but for the patent license, your conveying the +covered work in a country, or your recipient's use of the covered work +in a country, would infringe one or more identifiable patents in that +country that you have reason to believe are valid. + + If, pursuant to or in connection with a single transaction or +arrangement, you convey, or propagate by procuring conveyance of, a +covered work, and grant a patent license to some of the parties +receiving the covered work authorizing them to use, propagate, modify +or convey a specific copy of the covered work, then the patent license +you grant is automatically extended to all recipients of the covered +work and works based on it. + + A patent license is "discriminatory" if it does not include within +the scope of its coverage, prohibits the exercise of, or is +conditioned on the non-exercise of one or more of the rights that are +specifically granted under this License. You may not convey a covered +work if you are a party to an arrangement with a third party that is +in the business of distributing software, under which you make payment +to the third party based on the extent of your activity of conveying +the work, and under which the third party grants, to any of the +parties who would receive the covered work from you, a discriminatory +patent license (a) in connection with copies of the covered work +conveyed by you (or copies made from those copies), or (b) primarily +for and in connection with specific products or compilations that +contain the covered work, unless you entered into that arrangement, +or that patent license was granted, prior to 28 March 2007. + + Nothing in this License shall be construed as excluding or limiting +any implied license or other defenses to infringement that may +otherwise be available to you under applicable patent law. + + 12. No Surrender of Others' Freedom. + + If conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot convey a +covered work so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you may +not convey it at all. For example, if you agree to terms that obligate you +to collect a royalty for further conveying from those to whom you convey +the Program, the only way you could satisfy both those terms and this +License would be to refrain entirely from conveying the Program. + + 13. Use with the GNU Affero General Public License. + + Notwithstanding any other provision of this License, you have +permission to link or combine any covered work with a work licensed +under version 3 of the GNU Affero General Public License into a single +combined work, and to convey the resulting work. The terms of this +License will continue to apply to the part which is the covered work, +but the special requirements of the GNU Affero General Public License, +section 13, concerning interaction through a network will apply to the +combination as such. + + 14. Revised Versions of this License. + + The Free Software Foundation may publish revised and/or new versions of +the GNU General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + + Each version is given a distinguishing version number. If the +Program specifies that a certain numbered version of the GNU General +Public License "or any later version" applies to it, you have the +option of following the terms and conditions either of that numbered +version or of any later version published by the Free Software +Foundation. If the Program does not specify a version number of the +GNU General Public License, you may choose any version ever published +by the Free Software Foundation. + + If the Program specifies that a proxy can decide which future +versions of the GNU General Public License can be used, that proxy's +public statement of acceptance of a version permanently authorizes you +to choose that version for the Program. + + Later license versions may give you additional or different +permissions. However, no additional obligations are imposed on any +author or copyright holder as a result of your choosing to follow a +later version. + + 15. Disclaimer of Warranty. + + THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY +APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT +HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY +OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, +THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM +IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF +ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. Limitation of Liability. + + IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS +THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY +GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE +USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF +DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD +PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), +EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF +SUCH DAMAGES. + + 17. Interpretation of Sections 15 and 16. + + If the disclaimer of warranty and limitation of liability provided +above cannot be given local legal effect according to their terms, +reviewing courts shall apply local law that most closely approximates +an absolute waiver of all civil liability in connection with the +Program, unless a warranty or assumption of liability accompanies a +copy of the Program in return for a fee. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +state the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + + Copyright (C) + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . + +Also add information on how to contact you by electronic and paper mail. + + If the program does terminal interaction, make it output a short +notice like this when it starts in an interactive mode: + + Copyright (C) + This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, your program's commands +might be different; for a GUI interface, you would use an "about box". + + You should also get your employer (if you work as a programmer) or school, +if any, to sign a "copyright disclaimer" for the program, if necessary. +For more information on this, and how to apply and follow the GNU GPL, see +. + + The GNU General Public License does not permit incorporating your program +into proprietary programs. If your program is a subroutine library, you +may consider it more useful to permit linking proprietary applications with +the library. If this is what you want to do, use the GNU Lesser General +Public License instead of this License. But first, please read +. diff --git a/ShareX.HelpersLib/CLI/CLICommand.cs b/ShareX.HelpersLib/CLI/CLICommand.cs index f8027f06b..f3516bdb7 100644 --- a/ShareX.HelpersLib/CLI/CLICommand.cs +++ b/ShareX.HelpersLib/CLI/CLICommand.cs @@ -23,6 +23,8 @@ #endregion License Information (GPL v3) +using System; + namespace ShareX.HelpersLib { public class CLICommand @@ -37,6 +39,11 @@ public CLICommand(string command = null, string parameter = null) Parameter = parameter; } + public bool CheckCommand(string command) + { + return !string.IsNullOrEmpty(Command) && Command.Equals(command, StringComparison.InvariantCultureIgnoreCase); + } + public override string ToString() { string text = string.Format("Command: \"{0}\"", Command); diff --git a/ShareX.HelpersLib/CLI/CLICommandAction.cs b/ShareX.HelpersLib/CLI/CLICommandAction.cs index 45da0b6b3..d02be3fc2 100644 --- a/ShareX.HelpersLib/CLI/CLICommandAction.cs +++ b/ShareX.HelpersLib/CLI/CLICommandAction.cs @@ -46,7 +46,7 @@ public bool CheckCommands(List commands) { foreach (string text in Commands) { - if (command.Command.Equals(text, StringComparison.InvariantCultureIgnoreCase)) + if (command.CheckCommand(text)) { ExecuteAction(command.Parameter); return true; diff --git a/ShareX.HelpersLib/CLI/CLIManager.cs b/ShareX.HelpersLib/CLI/CLIManager.cs index 5d7f840f9..dbca130b3 100644 --- a/ShareX.HelpersLib/CLI/CLIManager.cs +++ b/ShareX.HelpersLib/CLI/CLIManager.cs @@ -139,9 +139,9 @@ public bool IsCommandExist(params string[] commands) command1 = command1.Substring(1); } - foreach (CLICommand command2 in Commands.Where(x => x != null && x.IsCommand && !string.IsNullOrEmpty(x.Command))) + foreach (CLICommand command2 in Commands.Where(x => x != null && x.IsCommand)) { - if (command1.Equals(command2.Command, StringComparison.InvariantCultureIgnoreCase)) + if (command2.CheckCommand(command1)) { return true; } @@ -154,7 +154,7 @@ public bool IsCommandExist(params string[] commands) public string GetParameter(string command) { - CLICommand cliCommand = Commands.Find(x => command.Equals(x.Command, StringComparison.InvariantCultureIgnoreCase)); + CLICommand cliCommand = Commands.Find(x => x.CheckCommand(command)); if (cliCommand != null) { diff --git a/ShareX.HelpersLib/CLI/ExternalCLIManager.cs b/ShareX.HelpersLib/CLI/ExternalCLIManager.cs index 8f08991f3..998208d32 100644 --- a/ShareX.HelpersLib/CLI/ExternalCLIManager.cs +++ b/ShareX.HelpersLib/CLI/ExternalCLIManager.cs @@ -36,6 +36,7 @@ public abstract class ExternalCLIManager : IDisposable public event DataReceivedEventHandler ErrorDataReceived; protected Process process; + protected bool processRunning; public virtual int Open(string path, string args = null) { @@ -63,7 +64,17 @@ public virtual int Open(string path, string args = null) process.Start(); if (psi.RedirectStandardOutput) process.BeginOutputReadLine(); if (psi.RedirectStandardError) process.BeginErrorReadLine(); - process.WaitForExit(); + + try + { + processRunning = true; + process.WaitForExit(); + } + finally + { + processRunning = false; + } + return process.ExitCode; } } @@ -95,7 +106,7 @@ private void cli_ErrorDataReceived(object sender, DataReceivedEventArgs e) public void WriteInput(string input) { - if (process != null && process.StartInfo != null && process.StartInfo.RedirectStandardInput) + if (processRunning && process != null && process.StartInfo != null && process.StartInfo.RedirectStandardInput) { process.StandardInput.WriteLine(input); } @@ -103,7 +114,7 @@ public void WriteInput(string input) public virtual void Close() { - if (process != null) + if (processRunning && process != null) { process.CloseMainWindow(); } diff --git a/ShareX.HelpersLib/CodeMenu.cs b/ShareX.HelpersLib/CodeMenu.cs index 24561a9ca..121616d5f 100644 --- a/ShareX.HelpersLib/CodeMenu.cs +++ b/ShareX.HelpersLib/CodeMenu.cs @@ -47,7 +47,8 @@ public static ContextMenuStrip Create(TextBox tb, params TEntry[] ignore Select(x => new { Name = x.ToPrefixString(), - Description = x.Description + Description = x.Description, + Category = x.Category }); foreach (var variable in variables) @@ -58,7 +59,27 @@ public static ContextMenuStrip Create(TextBox tb, params TEntry[] ignore string text = ((ToolStripMenuItem)sender).Tag.ToString(); tb.AppendTextToSelection(text); }; - cms.Items.Add(tsmi); + + if (string.IsNullOrWhiteSpace(variable.Category)) + { + cms.Items.Add(tsmi); + } + else + { + ToolStripMenuItem tsmiParent; + int index = cms.Items.IndexOfKey(variable.Category); + if (0 > index) + { + tsmiParent = new ToolStripMenuItem { Text = variable.Category, Tag = variable.Category, Name = variable.Category }; + tsmiParent.HideImageMargin(); + cms.Items.Add(tsmiParent); + } + else + { + tsmiParent = cms.Items[index] as ToolStripMenuItem; + } + tsmiParent.DropDownItems.Add(tsmi); + } } cms.Items.Add(new ToolStripSeparator()); diff --git a/ShareX.HelpersLib/CodeMenuEntry.cs b/ShareX.HelpersLib/CodeMenuEntry.cs index da53137c0..926ccc560 100644 --- a/ShareX.HelpersLib/CodeMenuEntry.cs +++ b/ShareX.HelpersLib/CodeMenuEntry.cs @@ -29,16 +29,18 @@ namespace ShareX.HelpersLib { public abstract class CodeMenuEntry { - protected readonly String _value, _description; + protected readonly String _value, _description, _category; - public CodeMenuEntry(string value, string description) + public CodeMenuEntry(string value, string description, string category = default(string)) { _value = value; _description = description; + _category = category; } public String Value { get { return _value; } } public String Description { get { return _description; } } + public String Category { get { return _category; } } public abstract string ToPrefixString(); } diff --git a/ShareX.HelpersLib/Extensions/Extensions.cs b/ShareX.HelpersLib/Extensions/Extensions.cs index 4bcbd5455..56d0bea80 100644 --- a/ShareX.HelpersLib/Extensions/Extensions.cs +++ b/ShareX.HelpersLib/Extensions/Extensions.cs @@ -454,5 +454,10 @@ public static void SetWatermark(this TextBox textBox, string watermarkText, bool NativeMethods.SendMessage(textBox.Handle, (int)NativeMethods.EM_SETCUEBANNER, showCueWhenFocus ? 1 : 0, watermarkText); } } + + public static void HideImageMargin(this ToolStripDropDownItem tsddi) + { + ((ToolStripDropDownMenu)tsddi.DropDown).ShowImageMargin = false; + } } } \ No newline at end of file diff --git a/ShareX.HelpersLib/Extensions/NumberExtensions.cs b/ShareX.HelpersLib/Extensions/NumberExtensions.cs index a3c84c3c7..6d31e6577 100644 --- a/ShareX.HelpersLib/Extensions/NumberExtensions.cs +++ b/ShareX.HelpersLib/Extensions/NumberExtensions.cs @@ -113,5 +113,29 @@ public static string ToDecimalString(this double number, int decimalPlaces) if (decimalPlaces > 0) format += "." + new string('0', decimalPlaces); return number.ToString(format); } + + public static string ToBase(this int value, int radix, string digits) + { + if (string.IsNullOrEmpty(digits)) + { + throw new ArgumentNullException("digits", string.Format("Digits must contain character value representations")); + } + + radix = Math.Abs(radix); + if (radix > digits.Length || radix < 2) + { + throw new ArgumentOutOfRangeException("radix", radix, string.Format("Radix has to be > 2 and < {0}", digits.Length)); + } + + string result = string.Empty; + int quotient = Math.Abs(value); + while (0 < quotient) + { + int temp = quotient % radix; + result = digits[temp] + result; + quotient /= radix; + } + return result; + } } } \ No newline at end of file diff --git a/ShareX.HelpersLib/Extensions/StringExtensions.cs b/ShareX.HelpersLib/Extensions/StringExtensions.cs index 853ff580a..f143c9b6f 100644 --- a/ShareX.HelpersLib/Extensions/StringExtensions.cs +++ b/ShareX.HelpersLib/Extensions/StringExtensions.cs @@ -286,5 +286,45 @@ public static string[] Lines(this string text) f += front.Length; } } + + public static int FromBase(this string text, int radix, string digits) + { + if (string.IsNullOrEmpty(digits)) + { + throw new ArgumentNullException("digits", string.Format("Digits must contain character value representations")); + } + + radix = Math.Abs(radix); + if (radix > digits.Length || radix < 2) + { + throw new ArgumentOutOfRangeException("radix", radix, string.Format("Radix has to be > 2 and < {0}", digits.Length)); + } + + // Convert to Base 10 + int value = 0; + if (!string.IsNullOrEmpty(text)) + { + for (int i = text.Length - 1; i >= 0; --i) + { + int temp = digits.IndexOf(text[i]) * (int)Math.Pow(radix, text.Length - (i + 1)); + if (0 > temp) + { + throw new IndexOutOfRangeException("Text contains characters not found in digits."); + } + value += temp; + } + } + return value; + } + + public static string ToBase(this string text, int fromRadix, string fromDigits, int toRadix, string toDigits) + { + return text.FromBase(fromRadix, fromDigits).ToBase(toRadix, toDigits); + } + + public static string ToBase(this string text, int from, int to, string digits) + { + return text.FromBase(from, digits).ToBase(to, digits); + } } } \ No newline at end of file diff --git a/ShareX.HelpersLib/ExternalProgram.cs b/ShareX.HelpersLib/ExternalProgram.cs index 050b4c804..9e6fe15b9 100644 --- a/ShareX.HelpersLib/ExternalProgram.cs +++ b/ShareX.HelpersLib/ExternalProgram.cs @@ -32,6 +32,7 @@ namespace ShareX.HelpersLib public class ExternalProgram { public bool IsActive { get; set; } + public bool HiddenWindow { get; set; } public string Name { get; set; } public string Path { get; set; } public string Args { get; set; } @@ -98,6 +99,12 @@ public string Run(string filePath) psi.Arguments = args; } + if (HiddenWindow) + { + psi.WindowStyle = ProcessWindowStyle.Hidden; + psi.CreateNoWindow = true; + } + process.StartInfo = psi; DebugHelper.WriteLine(string.Format("Running {0} with arguments: {1}", Path, psi.Arguments)); diff --git a/ShareX.HelpersLib/Forms/MyMessageBox.cs b/ShareX.HelpersLib/Forms/MyMessageBox.cs index 4215eeb73..7640fce78 100644 --- a/ShareX.HelpersLib/Forms/MyMessageBox.cs +++ b/ShareX.HelpersLib/Forms/MyMessageBox.cs @@ -53,6 +53,8 @@ public MyMessageBox(string text, string caption, MessageBoxButtons buttons = Mes MinimizeBox = false; MaximizeBox = false; + Shown += MyMessageBox_Shown; + Label labelText = new Label(); labelText.Margin = new Padding(0); labelText.Font = SystemFonts.MessageBoxFont; @@ -148,6 +150,11 @@ public MyMessageBox(string text, string caption, MessageBoxButtons buttons = Mes ClientSize = new Size(panel.Width, labelPanel.Height + (LabelVerticalPadding * 2) + panel.Height); } + private void MyMessageBox_Shown(object sender, System.EventArgs e) + { + this.ShowActivate(); + } + public static DialogResult Show(string text, string caption, MessageBoxButtons buttons = MessageBoxButtons.OK) { using (MyMessageBox messageBox = new MyMessageBox(text, caption, buttons)) diff --git a/ShareX.HelpersLib/Helpers/Helpers.cs b/ShareX.HelpersLib/Helpers/Helpers.cs index 089766310..e01828c32 100644 --- a/ShareX.HelpersLib/Helpers/Helpers.cs +++ b/ShareX.HelpersLib/Helpers/Helpers.cs @@ -54,6 +54,8 @@ public static class Helpers public const string AlphabetCapital = "ABCDEFGHIJKLMNOPQRSTUVWXYZ"; // 65 ... 90 public const string Alphabet = "abcdefghijklmnopqrstuvwxyz"; // 97 ... 122 public const string Alphanumeric = Numbers + AlphabetCapital + Alphabet; + public const string AlphanumericInverse = Numbers + Alphabet + AlphabetCapital; + public const string Hexadecimal = Numbers + "ABCDEF"; public const string URLCharacters = Alphanumeric + "-._~"; // 45 46 95 126 public const string URLPathCharacters = URLCharacters + "/"; // 47 public const string ValidURLCharacters = URLPathCharacters + ":?#[]@!$&'()*+,;= "; @@ -138,9 +140,14 @@ public static EDataType FindDataType(string filePath) return EDataType.File; } + public static string AddZeroes(string input, int digits = 2) + { + return input.PadLeft(digits, '0'); + } + public static string AddZeroes(int number, int digits = 2) { - return number.ToString().PadLeft(digits, '0'); + return AddZeroes(number.ToString(), digits); } public static string HourTo12(int hour) diff --git a/ShareX.HelpersLib/Helpers/ImageHelpers.cs b/ShareX.HelpersLib/Helpers/ImageHelpers.cs index 9d91eab57..38584c361 100644 --- a/ShareX.HelpersLib/Helpers/ImageHelpers.cs +++ b/ShareX.HelpersLib/Helpers/ImageHelpers.cs @@ -60,6 +60,7 @@ using System.Drawing.Drawing2D; using System.Drawing.Imaging; using System.IO; +using System.Linq; using System.Reflection; using System.Runtime.InteropServices; using System.Text; @@ -1122,6 +1123,18 @@ public static Bitmap Sharpen(Image image, double strength) } public static string OpenImageFileDialog() + { + string[] images = OpenImageFileDialog(false); + + if (images != null && images.Length > 0) + { + return images[0]; + } + + return null; + } + + public static string[] OpenImageFileDialog(bool multiselect) { using (OpenFileDialog ofd = new OpenFileDialog()) { @@ -1129,9 +1142,11 @@ public static string OpenImageFileDialog() "PNG (*.png)|*.png|JPEG (*.jpg, *.jpeg, *.jpe, *.jfif)|*.jpg;*.jpeg;*.jpe;*.jfif|GIF (*.gif)|*.gif|BMP (*.bmp)|*.bmp|TIFF (*.tif, *.tiff)|*.tif;*.tiff|" + "All files (*.*)|*.*"; + ofd.Multiselect = multiselect; + if (ofd.ShowDialog() == DialogResult.OK) { - return ofd.FileName; + return ofd.FileNames; } } @@ -1222,5 +1237,51 @@ public static Image LoadImage(string filePath) return null; } + + public static Image CombineImages(IEnumerable images, Orientation orientation = Orientation.Vertical, int space = 0) + { + int width, height; + + int spaceSize = space * (images.Count() - 1); + + if (orientation == Orientation.Vertical) + { + width = images.Max(x => x.Width); + height = images.Sum(x => x.Height) + spaceSize; + } + else + { + width = images.Sum(x => x.Width) + spaceSize; + height = images.Max(x => x.Height); + } + + Bitmap bmp = new Bitmap(width, height); + + using (Graphics g = Graphics.FromImage(bmp)) + { + g.SetHighQuality(); + int position = 0; + + foreach (Image image in images) + { + Rectangle rect; + + if (orientation == Orientation.Vertical) + { + rect = new Rectangle(0, position, image.Width, image.Height); + position += image.Height + space; + } + else + { + rect = new Rectangle(position, 0, image.Width, image.Height); + position += image.Width + space; + } + + g.DrawImage(image, rect); + } + } + + return bmp; + } } } \ No newline at end of file diff --git a/ShareX.HelpersLib/Links.cs b/ShareX.HelpersLib/Links.cs index e61848edc..2367bc72a 100644 --- a/ShareX.HelpersLib/Links.cs +++ b/ShareX.HelpersLib/Links.cs @@ -33,6 +33,7 @@ public static class Links public const string URL_CALLBACK = URL_WEBSITE + "/callback/"; public const string URL_CHANGELOG = URL_PROJECT + "/wiki/Changelog"; public const string URL_DONATE = "https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=PCNWK2G6ZYJ2E"; + public const string URL_STEAM_DONATE = "http://store.steampowered.com/dlc/400040/"; public const string URL_BERK = "https://github.com/Jaex"; public const string URL_MIKE = "https://github.com/McoreD"; public const string URL_STEAM = "http://store.steampowered.com/app/400040/"; diff --git a/ShareX.HelpersLib/Logger.cs b/ShareX.HelpersLib/Logger.cs index 225249b5d..f675bd741 100644 --- a/ShareX.HelpersLib/Logger.cs +++ b/ShareX.HelpersLib/Logger.cs @@ -54,7 +54,7 @@ public void WriteLine(string message = "") { if (!string.IsNullOrEmpty(message)) { - message = string.Format("{0:yyyy-MM-dd HH:mm:ss.fff} - {1}", FastDateTime.Now, message); + message = string.Format("{0:yyyy-MM-dd HH:mm:ss.fff} - {1}", DateTime.Now, message); } sbMessages.AppendLine(message); diff --git a/ShareX.HelpersLib/NameParser.cs b/ShareX.HelpersLib/NameParser.cs index de64ba432..5135af4ac 100644 --- a/ShareX.HelpersLib/NameParser.cs +++ b/ShareX.HelpersLib/NameParser.cs @@ -34,8 +34,8 @@ namespace ShareX.HelpersLib { public class ReplCodeMenuEntry : CodeMenuEntry { - public ReplCodeMenuEntry(string value, string description) - : base(value, description) + public ReplCodeMenuEntry(string value, string description, string category = default(string)) + : base(value, description, category) { } @@ -44,30 +44,36 @@ public override String ToPrefixString() return '%' + _value; } - public static readonly ReplCodeMenuEntry t = new ReplCodeMenuEntry("t", Resources.ReplCodeMenuEntry_t_Title_of_active_window); - public static readonly ReplCodeMenuEntry pn = new ReplCodeMenuEntry("pn", Resources.ReplCodeMenuEntry_pn_Process_name_of_active_window); - public static readonly ReplCodeMenuEntry y = new ReplCodeMenuEntry("y", Resources.ReplCodeMenuEntry_y_Current_year); - public static readonly ReplCodeMenuEntry yy = new ReplCodeMenuEntry("yy", Resources.ReplCodeMenuEntry_yy_Current_year__2_digits_); - public static readonly ReplCodeMenuEntry mo = new ReplCodeMenuEntry("mo", Resources.ReplCodeMenuEntry_mo_Current_month); - public static readonly ReplCodeMenuEntry mon = new ReplCodeMenuEntry("mon", Resources.ReplCodeMenuEntry_mon_Current_month_name__Local_language_); - public static readonly ReplCodeMenuEntry mon2 = new ReplCodeMenuEntry("mon2", Resources.ReplCodeMenuEntry_mon2_Current_month_name__English_); - public static readonly ReplCodeMenuEntry d = new ReplCodeMenuEntry("d", Resources.ReplCodeMenuEntry_d_Current_day); - public static readonly ReplCodeMenuEntry h = new ReplCodeMenuEntry("h", Resources.ReplCodeMenuEntry_h_Current_hour); - public static readonly ReplCodeMenuEntry mi = new ReplCodeMenuEntry("mi", Resources.ReplCodeMenuEntry_mi_Current_minute); - public static readonly ReplCodeMenuEntry s = new ReplCodeMenuEntry("s", Resources.ReplCodeMenuEntry_s_Current_second); - public static readonly ReplCodeMenuEntry ms = new ReplCodeMenuEntry("ms", Resources.ReplCodeMenuEntry_ms_Current_millisecond); - public static readonly ReplCodeMenuEntry pm = new ReplCodeMenuEntry("pm", Resources.ReplCodeMenuEntry_pm_Gets_AM_PM); - public static readonly ReplCodeMenuEntry w = new ReplCodeMenuEntry("w", Resources.ReplCodeMenuEntry_w_Current_week_name__Local_language_); - public static readonly ReplCodeMenuEntry w2 = new ReplCodeMenuEntry("w2", Resources.ReplCodeMenuEntry_w2_Current_week_name__English_); - public static readonly ReplCodeMenuEntry unix = new ReplCodeMenuEntry("unix", Resources.ReplCodeMenuEntry_unix_Unix_timestamp); - public static readonly ReplCodeMenuEntry i = new ReplCodeMenuEntry("i", Resources.ReplCodeMenuEntry_i_Auto_increment_number); - public static readonly ReplCodeMenuEntry rn = new ReplCodeMenuEntry("rn", Resources.ReplCodeMenuEntry_rn_Random_number_0_to_9); - public static readonly ReplCodeMenuEntry ra = new ReplCodeMenuEntry("ra", Resources.ReplCodeMenuEntry_ra_Random_alphanumeric_char); - public static readonly ReplCodeMenuEntry width = new ReplCodeMenuEntry("width", Resources.ReplCodeMenuEntry_width_Gets_image_width); - public static readonly ReplCodeMenuEntry height = new ReplCodeMenuEntry("height", Resources.ReplCodeMenuEntry_height_Gets_image_height); - public static readonly ReplCodeMenuEntry un = new ReplCodeMenuEntry("un", Resources.ReplCodeMenuEntry_un_User_name); - public static readonly ReplCodeMenuEntry uln = new ReplCodeMenuEntry("uln", Resources.ReplCodeMenuEntry_uln_User_login_name); - public static readonly ReplCodeMenuEntry cn = new ReplCodeMenuEntry("cn", Resources.ReplCodeMenuEntry_cn_Computer_name); + public static readonly ReplCodeMenuEntry t = new ReplCodeMenuEntry("t", Resources.ReplCodeMenuEntry_t_Title_of_active_window, Resources.ReplCodeMenuCategory_Target); + public static readonly ReplCodeMenuEntry pn = new ReplCodeMenuEntry("pn", Resources.ReplCodeMenuEntry_pn_Process_name_of_active_window, Resources.ReplCodeMenuCategory_Target); + public static readonly ReplCodeMenuEntry y = new ReplCodeMenuEntry("y", Resources.ReplCodeMenuEntry_y_Current_year, Resources.ReplCodeMenuCategory_Date_and_Time); + public static readonly ReplCodeMenuEntry yy = new ReplCodeMenuEntry("yy", Resources.ReplCodeMenuEntry_yy_Current_year__2_digits_, Resources.ReplCodeMenuCategory_Date_and_Time); + public static readonly ReplCodeMenuEntry mo = new ReplCodeMenuEntry("mo", Resources.ReplCodeMenuEntry_mo_Current_month, Resources.ReplCodeMenuCategory_Date_and_Time); + public static readonly ReplCodeMenuEntry mon = new ReplCodeMenuEntry("mon", Resources.ReplCodeMenuEntry_mon_Current_month_name__Local_language_, Resources.ReplCodeMenuCategory_Date_and_Time); + public static readonly ReplCodeMenuEntry mon2 = new ReplCodeMenuEntry("mon2", Resources.ReplCodeMenuEntry_mon2_Current_month_name__English_, Resources.ReplCodeMenuCategory_Date_and_Time); + public static readonly ReplCodeMenuEntry d = new ReplCodeMenuEntry("d", Resources.ReplCodeMenuEntry_d_Current_day, Resources.ReplCodeMenuCategory_Date_and_Time); + public static readonly ReplCodeMenuEntry h = new ReplCodeMenuEntry("h", Resources.ReplCodeMenuEntry_h_Current_hour, Resources.ReplCodeMenuCategory_Date_and_Time); + public static readonly ReplCodeMenuEntry mi = new ReplCodeMenuEntry("mi", Resources.ReplCodeMenuEntry_mi_Current_minute, Resources.ReplCodeMenuCategory_Date_and_Time); + public static readonly ReplCodeMenuEntry s = new ReplCodeMenuEntry("s", Resources.ReplCodeMenuEntry_s_Current_second, Resources.ReplCodeMenuCategory_Date_and_Time); + public static readonly ReplCodeMenuEntry ms = new ReplCodeMenuEntry("ms", Resources.ReplCodeMenuEntry_ms_Current_millisecond, Resources.ReplCodeMenuCategory_Date_and_Time); + public static readonly ReplCodeMenuEntry pm = new ReplCodeMenuEntry("pm", Resources.ReplCodeMenuEntry_pm_Gets_AM_PM, Resources.ReplCodeMenuCategory_Date_and_Time); + public static readonly ReplCodeMenuEntry w = new ReplCodeMenuEntry("w", Resources.ReplCodeMenuEntry_w_Current_week_name__Local_language_, Resources.ReplCodeMenuCategory_Date_and_Time); + public static readonly ReplCodeMenuEntry w2 = new ReplCodeMenuEntry("w2", Resources.ReplCodeMenuEntry_w2_Current_week_name__English_, Resources.ReplCodeMenuCategory_Date_and_Time); + public static readonly ReplCodeMenuEntry unix = new ReplCodeMenuEntry("unix", Resources.ReplCodeMenuEntry_unix_Unix_timestamp, Resources.ReplCodeMenuCategory_Date_and_Time); + public static readonly ReplCodeMenuEntry i = new ReplCodeMenuEntry("i", Resources.ReplCodeMenuEntry_i_Auto_increment_number, Resources.ReplCodeMenuCategory_Incremental); + public static readonly ReplCodeMenuEntry ia = new ReplCodeMenuEntry("ia", Resources.ReplCodeMenuEntry_ia_Auto_increment_alphanumeric, Resources.ReplCodeMenuCategory_Incremental); + public static readonly ReplCodeMenuEntry iAa = new ReplCodeMenuEntry("iAa", Resources.ReplCodeMenuEntry_iAa_Auto_increment_alphanumeric_all, Resources.ReplCodeMenuCategory_Incremental); + public static readonly ReplCodeMenuEntry ib = new ReplCodeMenuEntry("ib", Resources.ReplCodeMenuEntry_ib_Auto_increment_base_alphanumeric, Resources.ReplCodeMenuCategory_Incremental); + public static readonly ReplCodeMenuEntry ix = new ReplCodeMenuEntry("ix", Resources.ReplCodeMenuEntry_ix_Auto_increment_hexadecimal, Resources.ReplCodeMenuCategory_Incremental); + public static readonly ReplCodeMenuEntry rn = new ReplCodeMenuEntry("rn", Resources.ReplCodeMenuEntry_rn_Random_number_0_to_9, Resources.ReplCodeMenuCategory_Random); + public static readonly ReplCodeMenuEntry ra = new ReplCodeMenuEntry("ra", Resources.ReplCodeMenuEntry_ra_Random_alphanumeric_char, Resources.ReplCodeMenuCategory_Random); + public static readonly ReplCodeMenuEntry rx = new ReplCodeMenuEntry("rx", Resources.ReplCodeMenuEntry_rx_Random_hexadecimal, Resources.ReplCodeMenuCategory_Random); + public static readonly ReplCodeMenuEntry guid = new ReplCodeMenuEntry("guid", Resources.ReplCodeMenuEntry_guid_Random_guid, Resources.ReplCodeMenuCategory_Random); + public static readonly ReplCodeMenuEntry width = new ReplCodeMenuEntry("width", Resources.ReplCodeMenuEntry_width_Gets_image_width, Resources.ReplCodeMenuCategory_Image); + public static readonly ReplCodeMenuEntry height = new ReplCodeMenuEntry("height", Resources.ReplCodeMenuEntry_height_Gets_image_height, Resources.ReplCodeMenuCategory_Image); + public static readonly ReplCodeMenuEntry un = new ReplCodeMenuEntry("un", Resources.ReplCodeMenuEntry_un_User_name, Resources.ReplCodeMenuCategory_Computer); + public static readonly ReplCodeMenuEntry uln = new ReplCodeMenuEntry("uln", Resources.ReplCodeMenuEntry_uln_User_login_name, Resources.ReplCodeMenuCategory_Computer); + public static readonly ReplCodeMenuEntry cn = new ReplCodeMenuEntry("cn", Resources.ReplCodeMenuEntry_cn_Computer_name, Resources.ReplCodeMenuCategory_Computer); public static readonly ReplCodeMenuEntry n = new ReplCodeMenuEntry("n", Resources.ReplCodeMenuEntry_n_New_line); } @@ -85,7 +91,7 @@ public class NameParser public NameParserType Type { get; private set; } public int MaxNameLength { get; set; } public int MaxTitleLength { get; set; } - public int AutoIncrementNumber { get; set; } // %i + public int AutoIncrementNumber { get; set; } // %i, %ia, %ib, %iAa, %ix public Image Picture { get; set; } // %width, %height public string WindowText { get; set; } // %t public string ProcessName { get; set; } // %pn @@ -175,14 +181,82 @@ public string Parse(string pattern) sb.Replace(ReplCodeMenuEntry.unix.ToPrefixString(), DateTime.UtcNow.ToUnix().ToString()); - if (sb.ToString().Contains(ReplCodeMenuEntry.i.ToPrefixString())) + if (sb.ToString().Contains(ReplCodeMenuEntry.i.ToPrefixString()) + || sb.ToString().Contains(ReplCodeMenuEntry.ib.ToPrefixString()) + || sb.ToString().Contains(ReplCodeMenuEntry.ib.ToPrefixString().Replace('b', 'B')) + || sb.ToString().Contains(ReplCodeMenuEntry.iAa.ToPrefixString()) + || sb.ToString().Contains(ReplCodeMenuEntry.iAa.ToPrefixString().Replace("Aa", "aA")) + || sb.ToString().Contains(ReplCodeMenuEntry.ia.ToPrefixString()) + || sb.ToString().Contains(ReplCodeMenuEntry.ia.ToPrefixString().Replace('a', 'A')) + || sb.ToString().Contains(ReplCodeMenuEntry.ix.ToPrefixString()) + || sb.ToString().Contains(ReplCodeMenuEntry.ix.ToPrefixString().Replace('x', 'X'))) { AutoIncrementNumber++; + + // Base + try + { + foreach (Tuple entry in ListEntryWithValues(sb.ToString(), ReplCodeMenuEntry.ib.ToPrefixString(), 2)) + { + sb.Replace(entry.Item1, Helpers.AddZeroes(AutoIncrementNumber.ToBase(entry.Item2[0], Helpers.AlphanumericInverse), entry.Item2[1])); + } + foreach (Tuple entry in ListEntryWithValues(sb.ToString(), ReplCodeMenuEntry.ib.ToPrefixString().Replace('b', 'B'), 2)) + { + sb.Replace(entry.Item1, Helpers.AddZeroes(AutoIncrementNumber.ToBase(entry.Item2[0], Helpers.Alphanumeric), entry.Item2[1])); + } + } + catch + { + } + + // Alphanumeric Dual Case (Base 62) + foreach (Tuple entry in ListEntryWithValue(sb.ToString(), ReplCodeMenuEntry.iAa.ToPrefixString())) + { + sb.Replace(entry.Item1, Helpers.AddZeroes(AutoIncrementNumber.ToBase(62, Helpers.Alphanumeric), entry.Item2)); + } + sb.Replace(ReplCodeMenuEntry.iAa.ToPrefixString(), AutoIncrementNumber.ToBase(62, Helpers.Alphanumeric)); + + // Alphanumeric Dual Case (Base 62) + foreach (Tuple entry in ListEntryWithValue(sb.ToString(), ReplCodeMenuEntry.iAa.ToPrefixString().Replace("Aa", "aA"))) + { + sb.Replace(entry.Item1, Helpers.AddZeroes(AutoIncrementNumber.ToBase(62, Helpers.AlphanumericInverse), entry.Item2)); + } + sb.Replace(ReplCodeMenuEntry.iAa.ToPrefixString().Replace("Aa", "aA"), AutoIncrementNumber.ToBase(62, Helpers.AlphanumericInverse)); + + // Alphanumeric Single Case (Base 36) + foreach (Tuple entry in ListEntryWithValue(sb.ToString(), ReplCodeMenuEntry.ia.ToPrefixString())) + { + sb.Replace(entry.Item1, Helpers.AddZeroes(AutoIncrementNumber.ToBase(36, Helpers.Alphanumeric), entry.Item2).ToLowerInvariant()); + } + sb.Replace(ReplCodeMenuEntry.ia.ToPrefixString(), AutoIncrementNumber.ToBase(36, Helpers.Alphanumeric).ToLowerInvariant()); + + // Alphanumeric Single Case Capital (Base 36) + foreach (Tuple entry in ListEntryWithValue(sb.ToString(), ReplCodeMenuEntry.ia.ToPrefixString().Replace('a', 'A'))) + { + sb.Replace(entry.Item1, Helpers.AddZeroes(AutoIncrementNumber.ToBase(36, Helpers.Alphanumeric), entry.Item2).ToUpperInvariant()); + } + sb.Replace(ReplCodeMenuEntry.ia.ToPrefixString().Replace('a', 'A'), AutoIncrementNumber.ToBase(36, Helpers.Alphanumeric).ToUpperInvariant()); + + // Hexadecimal (Base 16) + foreach (Tuple entry in ListEntryWithValue(sb.ToString(), ReplCodeMenuEntry.ix.ToPrefixString())) + { + sb.Replace(entry.Item1, AutoIncrementNumber.ToString("x" + entry.Item2.ToString())); + } + sb.Replace(ReplCodeMenuEntry.ix.ToPrefixString(), AutoIncrementNumber.ToString("x")); + + // Hexadecimal Capital (Base 16) + foreach (Tuple entry in ListEntryWithValue(sb.ToString(), ReplCodeMenuEntry.ix.ToPrefixString().Replace('x', 'X'))) + { + sb.Replace(entry.Item1, AutoIncrementNumber.ToString("X" + entry.Item2.ToString())); + } + sb.Replace(ReplCodeMenuEntry.ix.ToPrefixString().Replace('x', 'X'), AutoIncrementNumber.ToString("X")); + + // Number (Base 10) foreach (Tuple entry in ListEntryWithValue(sb.ToString(), ReplCodeMenuEntry.i.ToPrefixString())) { - sb.Replace(entry.Item1, Helpers.AddZeroes(AutoIncrementNumber, Math.Max(0, entry.Item2))); + sb.Replace(entry.Item1, AutoIncrementNumber.ToString("d" + entry.Item2.ToString())); } - sb.Replace(ReplCodeMenuEntry.i.ToPrefixString(), AutoIncrementNumber.ToString()); + sb.Replace(ReplCodeMenuEntry.i.ToPrefixString(), AutoIncrementNumber.ToString("d")); } sb.Replace(ReplCodeMenuEntry.un.ToPrefixString(), Environment.UserName); @@ -204,9 +278,22 @@ public string Parse(string pattern) { result = result.ReplaceAll(entry.Item1, () => Helpers.RepeatGenerator(entry.Item2, () => Helpers.GetRandomChar(Helpers.Alphanumeric).ToString())); } + foreach (Tuple entry in ListEntryWithValue(result, ReplCodeMenuEntry.rx.ToPrefixString())) + { + result = result.ReplaceAll(entry.Item1, () => Helpers.RepeatGenerator(entry.Item2, () => Helpers.GetRandomChar(Helpers.Hexadecimal.ToLowerInvariant()).ToString())); + } + foreach (Tuple entry in ListEntryWithValue(result, ReplCodeMenuEntry.rx.ToPrefixString().Replace('x', 'X'))) + { + result = result.ReplaceAll(entry.Item1, () => Helpers.RepeatGenerator(entry.Item2, () => Helpers.GetRandomChar(Helpers.Hexadecimal.ToUpperInvariant()).ToString())); + } result = result.ReplaceAll(ReplCodeMenuEntry.rn.ToPrefixString(), () => Helpers.GetRandomChar(Helpers.Numbers).ToString()); result = result.ReplaceAll(ReplCodeMenuEntry.ra.ToPrefixString(), () => Helpers.GetRandomChar(Helpers.Alphanumeric).ToString()); + result = result.ReplaceAll(ReplCodeMenuEntry.rx.ToPrefixString(), () => Helpers.GetRandomChar(Helpers.Hexadecimal.ToLowerInvariant()).ToString()); + result = result.ReplaceAll(ReplCodeMenuEntry.rx.ToPrefixString().Replace('x', 'X'), () => Helpers.GetRandomChar(Helpers.Hexadecimal.ToUpperInvariant()).ToString()); + + result = result.ReplaceAll(ReplCodeMenuEntry.guid.ToPrefixString().ToLowerInvariant(), () => Guid.NewGuid().ToString().ToLowerInvariant()); + result = result.ReplaceAll(ReplCodeMenuEntry.guid.ToPrefixString().ToUpperInvariant(), () => Guid.NewGuid().ToString().ToUpperInvariant()); if (Type == NameParserType.FolderPath) { @@ -233,15 +320,41 @@ public string Parse(string pattern) return result; } + private IEnumerable> ListEntryWithArguments(string text, string entry, int elements) + { + foreach (Tuple o in text.ForEachBetween(entry + "{", "}")) + { + string[] s = o.Item2.Split(','); + if (elements > s.Length) + { + Array.Resize(ref s, elements); + } + yield return new Tuple(o.Item1, s); + } + } + + private IEnumerable> ListEntryWithValues(string text, string entry, int elements) + { + foreach (Tuple o in ListEntryWithArguments(text, entry, elements)) + { + int[] a = new int[o.Item2.Length]; + for (int i = o.Item2.Length - 1; i >= 0; --i) + { + int n = 0; + if (int.TryParse(o.Item2[i], out n)) + { + a[i] = n; + } + } + yield return new Tuple(o.Item1, a); + } + } + private IEnumerable> ListEntryWithValue(string text, string entry) { - foreach (Tuple s in text.ForEachBetween(entry + "{", "}")) + foreach (Tuple o in ListEntryWithValues(text, entry, 1)) { - int n = 0; - if (int.TryParse(s.Item2, out n)) - { - yield return new Tuple(s.Item1, n); - } + yield return new Tuple(o.Item1, o.Item2[0]); } } } diff --git a/ShareX.HelpersLib/Native/NativeEnums.cs b/ShareX.HelpersLib/Native/NativeEnums.cs index ea8d63084..97aeeddb0 100644 --- a/ShareX.HelpersLib/Native/NativeEnums.cs +++ b/ShareX.HelpersLib/Native/NativeEnums.cs @@ -2796,4 +2796,41 @@ public enum FlashWindow : uint /// FLASHW_TIMERNOFG = 12 } + + public enum ScrollBarCommands + { + SB_LINEUP = 0, + SB_LINELEFT = 0, + SB_LINEDOWN = 1, + SB_LINERIGHT = 1, + SB_PAGEUP = 2, + SB_PAGELEFT = 2, + SB_PAGEDOWN = 3, + SB_PAGERIGHT = 3, + SB_THUMBPOSITION = 4, + SB_THUMBTRACK = 5, + SB_TOP = 6, + SB_LEFT = 6, + SB_BOTTOM = 7, + SB_RIGHT = 7, + SB_ENDSCROLL = 8 + } + + public enum SBOrientation : int + { + SB_HORZ = 0x0, + SB_VERT = 0x1, + SB_CTL = 0x2, + SB_BOTH = 0x3 + } + + public enum ScrollInfoMask : uint + { + SIF_RANGE = 0x1, + SIF_PAGE = 0x2, + SIF_POS = 0x4, + SIF_DISABLENOSCROLL = 0x8, + SIF_TRACKPOS = 0x10, + SIF_ALL = (SIF_RANGE | SIF_PAGE | SIF_POS | SIF_TRACKPOS) + } } \ No newline at end of file diff --git a/ShareX.HelpersLib/Native/NativeMethods.cs b/ShareX.HelpersLib/Native/NativeMethods.cs index ad032e70e..69bbdf827 100644 --- a/ShareX.HelpersLib/Native/NativeMethods.cs +++ b/ShareX.HelpersLib/Native/NativeMethods.cs @@ -137,6 +137,10 @@ public static partial class NativeMethods [DllImport("user32.dll")] public static extern IntPtr GetWindow(IntPtr hWnd, GetWindowConstants wCmd); + [DllImport("user32.dll")] + [return: MarshalAs(UnmanagedType.Bool)] + public static extern bool GetScrollInfo(IntPtr hwnd, int fnBar, ref SCROLLINFO lpsi); + [DllImport("user32.dll")] public static extern int GetSystemMetrics(int smIndex); diff --git a/ShareX.HelpersLib/Native/NativeStructs.cs b/ShareX.HelpersLib/Native/NativeStructs.cs index 53a2a6632..258bff55e 100644 --- a/ShareX.HelpersLib/Native/NativeStructs.cs +++ b/ShareX.HelpersLib/Native/NativeStructs.cs @@ -609,4 +609,16 @@ public struct FLASHWINFO public UInt32 uCount; public UInt32 dwTimeout; } + + [Serializable, StructLayout(LayoutKind.Sequential)] + public struct SCROLLINFO + { + public uint cbSize; + public uint fMask; + public int nMin; + public int nMax; + public uint nPage; + public int nPos; + public int nTrackPos; + } } \ No newline at end of file diff --git a/ShareX.HelpersLib/Printer/PrintTextForm.pt-BR.resx b/ShareX.HelpersLib/Printer/PrintTextForm.pt-BR.resx index ca4856d09..b8af7cc45 100644 --- a/ShareX.HelpersLib/Printer/PrintTextForm.pt-BR.resx +++ b/ShareX.HelpersLib/Printer/PrintTextForm.pt-BR.resx @@ -124,7 +124,7 @@ Cancelar - Mudar fonte... + Alterar fonte... Imprimir... diff --git a/ShareX.HelpersLib/Properties/Resources.Designer.cs b/ShareX.HelpersLib/Properties/Resources.Designer.cs index 3c345ce21..182a78403 100644 --- a/ShareX.HelpersLib/Properties/Resources.Designer.cs +++ b/ShareX.HelpersLib/Properties/Resources.Designer.cs @@ -655,7 +655,7 @@ internal class Resources { } /// - /// Looks up a localized string similar to Could not create directory, check your path settings.. + /// Looks up a localized string similar to Could not create directory.. /// internal static string Helpers_CreateDirectoryIfNotExist_Create_failed_ { get { @@ -987,6 +987,24 @@ internal class Resources { } } + /// + /// Looks up a localized string similar to Image combiner. + /// + internal static string HotkeyType_ImageCombiner { + get { + return ResourceManager.GetString("HotkeyType_ImageCombiner", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Tools. + /// + internal static string HotkeyType_ImageCombiner_Category { + get { + return ResourceManager.GetString("HotkeyType_ImageCombiner_Category", resourceCulture); + } + } + /// /// Looks up a localized string similar to Image editor. /// @@ -1041,6 +1059,24 @@ internal class Resources { } } + /// + /// Looks up a localized string similar to IRC client. + /// + internal static string HotkeyType_IRCClient { + get { + return ResourceManager.GetString("HotkeyType_IRCClient", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Tools. + /// + internal static string HotkeyType_IRCClient_Category { + get { + return ResourceManager.GetString("HotkeyType_IRCClient_Category", resourceCulture); + } + } + /// /// Looks up a localized string similar to Capture last region. /// @@ -1338,6 +1374,24 @@ internal class Resources { } } + /// + /// Looks up a localized string similar to Scrolling capture. + /// + internal static string HotkeyType_ScrollingCapture { + get { + return ResourceManager.GetString("HotkeyType_ScrollingCapture", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Screen capture. + /// + internal static string HotkeyType_ScrollingCapture_Category { + get { + return ResourceManager.GetString("HotkeyType_ScrollingCapture_Category", resourceCulture); + } + } + /// /// Looks up a localized string similar to Start auto capture using last region. /// @@ -1446,6 +1500,24 @@ internal class Resources { } } + /// + /// Looks up a localized string similar to Video thumbnailer. + /// + internal static string HotkeyType_VideoThumbnailer { + get { + return ResourceManager.GetString("HotkeyType_VideoThumbnailer", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Tools. + /// + internal static string HotkeyType_VideoThumbnailer_Category { + get { + return ResourceManager.GetString("HotkeyType_VideoThumbnailer_Category", resourceCulture); + } + } + /// /// Looks up a localized string similar to Capture region (Objects). /// @@ -1636,6 +1708,60 @@ internal class Resources { } } + /// + /// Looks up a localized string similar to Computer. + /// + internal static string ReplCodeMenuCategory_Computer { + get { + return ResourceManager.GetString("ReplCodeMenuCategory_Computer", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Date and time. + /// + internal static string ReplCodeMenuCategory_Date_and_Time { + get { + return ResourceManager.GetString("ReplCodeMenuCategory_Date_and_Time", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Image. + /// + internal static string ReplCodeMenuCategory_Image { + get { + return ResourceManager.GetString("ReplCodeMenuCategory_Image", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Incremental. + /// + internal static string ReplCodeMenuCategory_Incremental { + get { + return ResourceManager.GetString("ReplCodeMenuCategory_Incremental", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Random. + /// + internal static string ReplCodeMenuCategory_Random { + get { + return ResourceManager.GetString("ReplCodeMenuCategory_Random", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Target. + /// + internal static string ReplCodeMenuCategory_Target { + get { + return ResourceManager.GetString("ReplCodeMenuCategory_Target", resourceCulture); + } + } + /// /// Looks up a localized string similar to Computer name. /// @@ -1654,6 +1780,15 @@ internal class Resources { } } + /// + /// Looks up a localized string similar to Random GUID. + /// + internal static string ReplCodeMenuEntry_guid_Random_guid { + get { + return ResourceManager.GetString("ReplCodeMenuEntry_guid_Random_guid", resourceCulture); + } + } + /// /// Looks up a localized string similar to Current hour. /// @@ -1681,6 +1816,42 @@ internal class Resources { } } + /// + /// Looks up a localized string similar to Auto increment alphanumeric case-insensitive. 0 pad left using {n}. + /// + internal static string ReplCodeMenuEntry_ia_Auto_increment_alphanumeric { + get { + return ResourceManager.GetString("ReplCodeMenuEntry_ia_Auto_increment_alphanumeric", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Auto increment alphanumeric case-sensitive. 0 pad left using {n}. + /// + internal static string ReplCodeMenuEntry_iAa_Auto_increment_alphanumeric_all { + get { + return ResourceManager.GetString("ReplCodeMenuEntry_iAa_Auto_increment_alphanumeric_all", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Auto increment by base {n} using alphanumeric (1 < n < 63). + /// + internal static string ReplCodeMenuEntry_ib_Auto_increment_base_alphanumeric { + get { + return ResourceManager.GetString("ReplCodeMenuEntry_ib_Auto_increment_base_alphanumeric", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Auto increment hexadecimal. 0 pad left using {n}. + /// + internal static string ReplCodeMenuEntry_ix_Auto_increment_hexadecimal { + get { + return ResourceManager.GetString("ReplCodeMenuEntry_ix_Auto_increment_hexadecimal", resourceCulture); + } + } + /// /// Looks up a localized string similar to Current minute. /// @@ -1771,6 +1942,15 @@ internal class Resources { } } + /// + /// Looks up a localized string similar to Random hexadecimal char. Repeat using {n}. + /// + internal static string ReplCodeMenuEntry_rx_Random_hexadecimal { + get { + return ResourceManager.GetString("ReplCodeMenuEntry_rx_Random_hexadecimal", resourceCulture); + } + } + /// /// Looks up a localized string similar to Current second. /// diff --git a/ShareX.HelpersLib/Properties/Resources.pt-BR.resx b/ShareX.HelpersLib/Properties/Resources.pt-BR.resx index 9608df90d..b93f601a4 100644 --- a/ShareX.HelpersLib/Properties/Resources.pt-BR.resx +++ b/ShareX.HelpersLib/Properties/Resources.pt-BR.resx @@ -641,7 +641,7 @@ VocĂŞ gostaria de baixar e instalar? {0} está atualizado - Procurar um arquivo CSS... + Procurar por um arquivo CSS... Segundo atual diff --git a/ShareX.HelpersLib/Properties/Resources.resx b/ShareX.HelpersLib/Properties/Resources.resx index de2eda7bd..fad6aef1c 100644 --- a/ShareX.HelpersLib/Properties/Resources.resx +++ b/ShareX.HelpersLib/Properties/Resources.resx @@ -784,4 +784,64 @@ Would you like to download and install it? Other + + Auto increment alphanumeric case-insensitive. 0 pad left using {n} + + + Auto increment hexadecimal. 0 pad left using {n} + + + Random hexadecimal char. Repeat using {n} + + + Auto increment alphanumeric case-sensitive. 0 pad left using {n} + + + Auto increment by base {n} using alphanumeric (1 < n < 63) + + + Random GUID + + + Date and time + + + Incremental + + + Random + + + Image + + + Computer + + + Target + + + Scrolling capture + + + Screen capture + + + IRC client + + + Tools + + + Image combiner + + + Tools + + + Video thumbnailer + + + Tools + \ No newline at end of file diff --git a/ShareX.HelpersLib/Properties/Resources.tr.resx b/ShareX.HelpersLib/Properties/Resources.tr.resx index aeaffff34..cea198e8e 100644 --- a/ShareX.HelpersLib/Properties/Resources.tr.resx +++ b/ShareX.HelpersLib/Properties/Resources.tr.resx @@ -283,10 +283,10 @@ Aktif pencerenin iĹźlem ismi - Rastgele alfa sayısal karakter + Rastgele alfanumerik karakter. {n} haneli - Rastgele 0 ile 9 arasında sayı + Rastgele 0 ile 9 arasında sayı. {n} haneli Aktif pencerenin baĹźlığı @@ -301,7 +301,7 @@ GĂĽncel hafta adı (Yerel dil) - Otomatik artan sayı + Otomatik artan sayı. {n} baĹźa n kadar 0 ekler Elle @@ -762,4 +762,40 @@ Dosya boyutu: {2:n0} / {3:n0} KB Aktif pencere alanıyla ekran kaydetme (GIF) baĹźlat + + Bilgisayar + + + Tarih ve zaman + + + Resim + + + Artan + + + Rastgele + + + Rastgele GUID + + + Otomatik artan alfanumerik bĂĽyĂĽk küçük harfe duyarsız. {n} baĹźa n kadar 0 ekler + + + Otomatik artan alfanumerik bĂĽyĂĽk küçük harfe duyarlı. {n} baĹźa n kadar 0 ekler + + + Otomatik artan {n} sayı tabanında alfanumerik (1 < n < 63) + + + Otomatik artan heksadesimal. {n} baĹźa n kadar 0 ekler + + + Rastgele heksadesimal karakter. {n} haneli + + + Hedef + \ No newline at end of file diff --git a/ShareX.HelpersLib/UpdateChecker/UpdateMessageBox.tr.resx b/ShareX.HelpersLib/UpdateChecker/UpdateMessageBox.tr.resx index 860d6c429..099535ac0 100644 --- a/ShareX.HelpersLib/UpdateChecker/UpdateMessageBox.tr.resx +++ b/ShareX.HelpersLib/UpdateChecker/UpdateMessageBox.tr.resx @@ -127,6 +127,6 @@ ShareX bir sonraki defa açılana kadar tekrar sorma - DeÄźiĹźiklikleri gör + DeÄźiĹźim gĂĽnlüğünĂĽ gör \ No newline at end of file diff --git a/ShareX.HistoryLib/HistoryForm.cs b/ShareX.HistoryLib/HistoryForm.cs index f59652c0f..f5a3e3b1b 100644 --- a/ShareX.HistoryLib/HistoryForm.cs +++ b/ShareX.HistoryLib/HistoryForm.cs @@ -92,7 +92,7 @@ private HistoryItem[] GetHistoryItems() } } - return tempHistoryItems.OrderByDescending(x => x.DateTimeUtc).ToArray(); + return tempHistoryItems.OrderByDescending(x => x.DateTime).ToArray(); } private void ApplyFiltersAndAdd() @@ -160,8 +160,7 @@ private HistoryItem[] ApplyFilters(HistoryItem[] historyItems) DateTime toDate = dtpFilterTo.Value.Date; result = from hi in result - let date = FastDateTime.ToLocalTime(hi.DateTimeUtc).Date - where date >= fromDate && date <= toDate + where hi.DateTime.Date >= fromDate && hi.DateTime.Date <= toDate select hi; } @@ -196,7 +195,7 @@ private void AddHistoryItems(HistoryItem[] historyItems) for (int i = 0; i < historyItems.Length; i++) { HistoryItem hi = historyItems[i]; - ListViewItem lvi = listViewItems[i] = new ListViewItem(hi.DateTimeUtc.ToLocalTime().ToString()); + ListViewItem lvi = listViewItems[i] = new ListViewItem(hi.DateTime.ToString()); lvi.SubItems.Add(hi.Filename); lvi.SubItems.Add(hi.Type); lvi.SubItems.Add(hi.Host); diff --git a/ShareX.HistoryLib/HistoryItem.cs b/ShareX.HistoryLib/HistoryItem.cs index 8a6043c53..f59a847b4 100644 --- a/ShareX.HistoryLib/HistoryItem.cs +++ b/ShareX.HistoryLib/HistoryItem.cs @@ -31,7 +31,7 @@ public class HistoryItem { public string Filename { get; set; } public string Filepath { get; set; } - public DateTime DateTimeUtc { get; set; } + public DateTime DateTime { get; set; } public string Type { get; set; } public string Host { get; set; } public string URL { get; set; } diff --git a/ShareX.HistoryLib/HistoryManager.cs b/ShareX.HistoryLib/HistoryManager.cs index 2b2c2322c..a6c229ea3 100644 --- a/ShareX.HistoryLib/HistoryManager.cs +++ b/ShareX.HistoryLib/HistoryManager.cs @@ -42,7 +42,7 @@ public HistoryManager(string historyPath) private bool IsValidHistoryItem(HistoryItem historyItem) { - return historyItem != null && !string.IsNullOrEmpty(historyItem.Filename) && historyItem.DateTimeUtc != DateTime.MinValue && + return historyItem != null && !string.IsNullOrEmpty(historyItem.Filename) && historyItem.DateTime != DateTime.MinValue && (!string.IsNullOrEmpty(historyItem.URL) || !string.IsNullOrEmpty(historyItem.Filepath)); } diff --git a/ShareX.HistoryLib/ImageHistoryForm.cs b/ShareX.HistoryLib/ImageHistoryForm.cs index 608dea674..568a58c74 100644 --- a/ShareX.HistoryLib/ImageHistoryForm.cs +++ b/ShareX.HistoryLib/ImageHistoryForm.cs @@ -115,7 +115,7 @@ private HistoryItem[] GetHistoryItems() } } - return tempHistoryItems.OrderByDescending(x => x.DateTimeUtc).ToArray(); + return tempHistoryItems.OrderByDescending(x => x.DateTime).ToArray(); } private HistoryItem[] him_GetHistoryItems() diff --git a/ShareX.HistoryLib/Properties/Resources.pt-BR.resx b/ShareX.HistoryLib/Properties/Resources.pt-BR.resx index 13aa754c5..27860c213 100644 --- a/ShareX.HistoryLib/Properties/Resources.pt-BR.resx +++ b/ShareX.HistoryLib/Properties/Resources.pt-BR.resx @@ -133,7 +133,7 @@ Copiar - URL de Remoção + URL de remoção Arquivo @@ -181,7 +181,7 @@ Abrir - URL Encurtado + URL encurtado Mostrar @@ -190,7 +190,7 @@ Texto - URL da Miniatura + URL da miniatura URL diff --git a/ShareX.HistoryLib/XMLManager.cs b/ShareX.HistoryLib/XMLManager.cs index 9d2eb7aa0..a30723d54 100644 --- a/ShareX.HistoryLib/XMLManager.cs +++ b/ShareX.HistoryLib/XMLManager.cs @@ -106,7 +106,7 @@ public bool Append(params HistoryItem[] historyItems) writer.WriteStartElement("HistoryItem"); writer.WriteElementIfNotEmpty("Filename", historyItem.Filename); writer.WriteElementIfNotEmpty("Filepath", historyItem.Filepath); - writer.WriteElementIfNotEmpty("DateTimeUtc", historyItem.DateTimeUtc.ToString("o")); + writer.WriteElementIfNotEmpty("DateTimeUtc", historyItem.DateTime.ToString("o")); writer.WriteElementIfNotEmpty("Type", historyItem.Type); writer.WriteElementIfNotEmpty("Host", historyItem.Host); writer.WriteElementIfNotEmpty("URL", historyItem.URL); @@ -146,7 +146,7 @@ private HistoryItem ParseHistoryItem(XElement element) DateTime dateTime; if (DateTime.TryParse(child.Value, out dateTime)) { - hi.DateTimeUtc = dateTime; + hi.DateTime = dateTime; } break; case "Type": diff --git a/ShareX.IRCLib/IRCClient/IRCClientForm.cs b/ShareX.IRCLib/IRCClient/IRCClientForm.cs index 26ccbac8b..ab7341cba 100644 --- a/ShareX.IRCLib/IRCClient/IRCClientForm.cs +++ b/ShareX.IRCLib/IRCClient/IRCClientForm.cs @@ -47,7 +47,7 @@ public IRCClientForm(IRCInfo info) { InitializeComponent(); rtbOutput.AddContextMenu(); - ((ToolStripDropDownMenu)tsmiColors.DropDown).ShowImageMargin = false; + tsmiColors.HideImageMargin(); tabManager = new TabManager(tcMessages); diff --git a/ShareX.ImageEffectsLib/ImageEffectsForm.cs b/ShareX.ImageEffectsLib/ImageEffectsForm.cs index 0a021a6db..41d5c19c5 100644 --- a/ShareX.ImageEffectsLib/ImageEffectsForm.cs +++ b/ShareX.ImageEffectsLib/ImageEffectsForm.cs @@ -115,7 +115,7 @@ private void AddAllEffectsToContextMenu() private void AddEffectToContextMenu(string groupName, params Type[] imageEffects) { ToolStripMenuItem tsmiParent = new ToolStripMenuItem(groupName); - ((ToolStripDropDownMenu)tsmiParent.DropDown).ShowImageMargin = false; + tsmiParent.HideImageMargin(); cmsEffects.Items.Add(tsmiParent); diff --git a/ShareX.IndexerLib/HtmlHelper.cs b/ShareX.IndexerLib/HtmlHelper.cs index afc2547b6..449870acc 100644 --- a/ShareX.IndexerLib/HtmlHelper.cs +++ b/ShareX.IndexerLib/HtmlHelper.cs @@ -32,22 +32,6 @@ namespace ShareX.IndexerLib { public static class HtmlHelper { - public static string GetCssStyle(string filePath) - { - string css; - - if (!string.IsNullOrEmpty(filePath) && File.Exists(filePath)) - { - css = File.ReadAllText(filePath, Encoding.UTF8); - } - else - { - css = Resources.IndexerDefault; - } - - return string.Format("", css); - } - public static string StartTag(string tag, string style = "", string otherFields = "") { string css = string.Empty; diff --git a/ShareX.IndexerLib/IndexerHtml.cs b/ShareX.IndexerLib/IndexerHtml.cs index 6f50a8618..e888ce42c 100644 --- a/ShareX.IndexerLib/IndexerHtml.cs +++ b/ShareX.IndexerLib/IndexerHtml.cs @@ -44,7 +44,7 @@ public override string Index(string folderPath) StringBuilder sbHtmlIndex = new StringBuilder(); sbHtmlIndex.AppendLine(Resources.doctype_xhtml); sbHtmlIndex.AppendLine(HtmlHelper.Tag("title", "Index for " + Path.GetFileName(folderPath))); - sbHtmlIndex.AppendLine(HtmlHelper.GetCssStyle(config.CssFilePath)); + sbHtmlIndex.AppendLine(GetCssStyle()); sbHtmlIndex.AppendLine(HtmlHelper.EndTag("head")); sbHtmlIndex.AppendLine(HtmlHelper.StartTag("body")); string index = base.Index(folderPath).Trim(); @@ -127,5 +127,21 @@ protected override string GetFooter() return string.Format("Generated by {0} on {1}.", string.Format("{1}", Links.URL_WEBSITE, "ShareX " + Application.ProductVersion), DateTime.UtcNow.ToString("yyyy-MM-dd 'at' HH:mm:ss 'UTC'")); } + + private string GetCssStyle() + { + string css; + + if (config.UseCustomCSSFile && !string.IsNullOrEmpty(config.CustomCSSFilePath) && File.Exists(config.CustomCSSFilePath)) + { + css = File.ReadAllText(config.CustomCSSFilePath, Encoding.UTF8); + } + else + { + css = Resources.IndexerDefault; + } + + return $""; + } } } \ No newline at end of file diff --git a/ShareX.IndexerLib/IndexerSettings.cs b/ShareX.IndexerLib/IndexerSettings.cs index eec0bdcfd..d5b817271 100644 --- a/ShareX.IndexerLib/IndexerSettings.cs +++ b/ShareX.IndexerLib/IndexerSettings.cs @@ -53,9 +53,12 @@ public class IndexerSettings [Category("Indexer / Text"), DefaultValue(false), Description("Adds empty line after folders.")] public bool AddEmptyLineAfterFolders { get; set; } - [Category("Indexer / HTML"), DefaultValue("IndexerDefault.css"), Description("Cascading Style Sheet file path.")] + [Category("Indexer / HTML"), DefaultValue(false), Description("Use custom Cascading Style Sheet file.")] + public bool UseCustomCSSFile { get; set; } + + [Category("Indexer / HTML"), DefaultValue(""), Description("Custom Cascading Style Sheet file path.")] [Editor(typeof(CssFileNameEditor), typeof(UITypeEditor))] - public string CssFilePath { get; set; } + public string CustomCSSFilePath { get; set; } [Category("Indexer / HTML"), DefaultValue(false), Description("Add W3C validation icons. The W3C validation icons may be used on documents that successfully passed validation for a specific technology, using the W3C validation services.")] public bool AddValidationIcons { get; set; } diff --git a/ShareX.IndexerLib/Properties/Resources.Designer.cs b/ShareX.IndexerLib/Properties/Resources.Designer.cs index 300870245..820b57464 100644 --- a/ShareX.IndexerLib/Properties/Resources.Designer.cs +++ b/ShareX.IndexerLib/Properties/Resources.Designer.cs @@ -1,7 +1,7 @@ //------------------------------------------------------------------------------ // // This code was generated by a tool. -// Runtime Version:4.0.30319.34209 +// Runtime Version:4.0.30319.42000 // // Changes to this file may cause incorrect behavior and will be lost if // the code is regenerated. diff --git a/ShareX.IndexerLib/Properties/Resources.resx b/ShareX.IndexerLib/Properties/Resources.resx index 4f39a0e46..cd6b8eaa5 100644 --- a/ShareX.IndexerLib/Properties/Resources.resx +++ b/ShareX.IndexerLib/Properties/Resources.resx @@ -112,12 +112,12 @@ 2.0 - System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + ..\Resources\doctype_xhtml.txt;System.String, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252 @@ -125,6 +125,6 @@ ..\Resources\valid_xhtml.txt;System.String, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-8 - ..\IndexerDefault.css;System.String, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;windows-1254 + ..\resources\indexerdefault.css;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252 - + \ No newline at end of file diff --git a/ShareX.IndexerLib/IndexerDefault.css b/ShareX.IndexerLib/Resources/IndexerDefault.css similarity index 100% rename from ShareX.IndexerLib/IndexerDefault.css rename to ShareX.IndexerLib/Resources/IndexerDefault.css diff --git a/ShareX.IndexerLib/ShareX.IndexerLib.csproj b/ShareX.IndexerLib/ShareX.IndexerLib.csproj index a30206568..f6da30d9b 100644 --- a/ShareX.IndexerLib/ShareX.IndexerLib.csproj +++ b/ShareX.IndexerLib/ShareX.IndexerLib.csproj @@ -92,9 +92,7 @@ - - PreserveNewest - + diff --git a/ShareX.ScreenCaptureLib/Enums.cs b/ShareX.ScreenCaptureLib/Enums.cs index 7c68b5918..b61767f12 100644 --- a/ShareX.ScreenCaptureLib/Enums.cs +++ b/ShareX.ScreenCaptureLib/Enums.cs @@ -146,4 +146,16 @@ public enum RegionShape Triangle, Diamond } + + public enum ScrollingCaptureScrollMethod + { + [Description("Automatically try all methods until one works")] + Automatic, + [Description("Send scroll message to window or control")] + SendMessageScroll, + [Description("Simulate pressing \"Page down\" key")] + KeyPressPageDown, + [Description("Simulate mouse wheel scrolling")] + MouseWheel + } } \ No newline at end of file diff --git a/ShareX.ScreenCaptureLib/Forms/RectangleRegion.cs b/ShareX.ScreenCaptureLib/Forms/RectangleRegion.cs index ba232b5d3..912657f5f 100644 --- a/ShareX.ScreenCaptureLib/Forms/RectangleRegion.cs +++ b/ShareX.ScreenCaptureLib/Forms/RectangleRegion.cs @@ -68,6 +68,9 @@ public Color CurrentColor #endregion Screen ruler + public bool OneClickMode { get; set; } + public SimpleWindowInfo SelectedWindow { get; set; } + private ColorBlinkAnimation colorBlinkAnimation = new ColorBlinkAnimation(); public RectangleRegion() @@ -81,9 +84,15 @@ public RectangleRegion() private void RectangleRegion_MouseDown(object sender, MouseEventArgs e) { - if (ScreenColorPickerMode && e.Button == MouseButtons.Left) + if ((OneClickMode || ScreenColorPickerMode) && e.Button == MouseButtons.Left) { CurrentPosition = InputManager.MousePosition; + + if (OneClickMode) + { + SelectedWindow = AreaManager.FindSelectedWindow(); + } + Close(SurfaceResult.Region); } } @@ -162,7 +171,7 @@ public override void Prepare() AreaManager.WindowCaptureMode |= Config.ForceWindowCapture; AreaManager.IncludeControls |= Config.IncludeControls; - if (AreaManager.WindowCaptureMode) + if (OneClickMode || AreaManager.WindowCaptureMode) { IntPtr handle = Handle; diff --git a/ShareX.ScreenCaptureLib/Forms/ScrollingCaptureForm.Designer.cs b/ShareX.ScreenCaptureLib/Forms/ScrollingCaptureForm.Designer.cs new file mode 100644 index 000000000..2f648b15c --- /dev/null +++ b/ShareX.ScreenCaptureLib/Forms/ScrollingCaptureForm.Designer.cs @@ -0,0 +1,566 @@ +using System; +using System.ComponentModel; +using System.Drawing; +using System.Runtime.InteropServices; +using System.Windows.Forms; +using ShareX.HelpersLib; + +namespace ShareX.ScreenCaptureLib +{ + partial class ScrollingCaptureForm + { + /// + /// Required designer variable. + /// + private IContainer components = null; + + #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.components = new System.ComponentModel.Container(); + System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(ScrollingCaptureForm)); + this.btnSelectHandle = new System.Windows.Forms.Button(); + this.lblControlText = new System.Windows.Forms.Label(); + this.btnCapture = new System.Windows.Forms.Button(); + this.captureTimer = new System.Windows.Forms.Timer(this.components); + this.nudScrollDelay = new System.Windows.Forms.NumericUpDown(); + this.nudMaximumScrollCount = new System.Windows.Forms.NumericUpDown(); + this.lblScrollDelay = new System.Windows.Forms.Label(); + this.lblMaximumScrollCount = new System.Windows.Forms.Label(); + this.tcScrollingCapture = new System.Windows.Forms.TabControl(); + this.tpCapture = new System.Windows.Forms.TabPage(); + this.cbStartSelectionAutomatically = new System.Windows.Forms.CheckBox(); + this.cbAutoCombine = new System.Windows.Forms.CheckBox(); + this.lblSelectedRectangle = new System.Windows.Forms.Label(); + this.btnSelectRectangle = new System.Windows.Forms.Button(); + this.lblStartDelay = new System.Windows.Forms.Label(); + this.nudStartDelay = new System.Windows.Forms.NumericUpDown(); + this.cbScrollTopBeforeCapture = new System.Windows.Forms.CheckBox(); + this.cbStartCaptureAutomatically = new System.Windows.Forms.CheckBox(); + this.cbRemoveDuplicates = new System.Windows.Forms.CheckBox(); + this.cbAutoDetectScrollEnd = new System.Windows.Forms.CheckBox(); + this.lblScrollMethod = new System.Windows.Forms.Label(); + this.cbScrollMethod = new System.Windows.Forms.ComboBox(); + this.tpOutput = new System.Windows.Forms.TabPage(); + this.gbImages = new System.Windows.Forms.GroupBox(); + this.txtImagesCount = new System.Windows.Forms.TextBox(); + this.lblImageCount = new System.Windows.Forms.Label(); + this.nudIgnoreLast = new System.Windows.Forms.NumericUpDown(); + this.lblIgnoreLast = new System.Windows.Forms.Label(); + this.btnResetCombine = new System.Windows.Forms.Button(); + this.btnGuessCombineAdjustments = new System.Windows.Forms.Button(); + this.btnStartTask = new System.Windows.Forms.Button(); + this.btnGuessEdges = new System.Windows.Forms.Button(); + this.gbCombineAdjustments = new System.Windows.Forms.GroupBox(); + this.lblCombineLastVertical = new System.Windows.Forms.Label(); + this.lblCombineVertical = new System.Windows.Forms.Label(); + this.nudCombineVertical = new System.Windows.Forms.NumericUpDown(); + this.nudCombineLastVertical = new System.Windows.Forms.NumericUpDown(); + this.gbTrimEdges = new System.Windows.Forms.GroupBox(); + this.lblTrimBottom = new System.Windows.Forms.Label(); + this.lblTrimRight = new System.Windows.Forms.Label(); + this.lblTrimTop = new System.Windows.Forms.Label(); + this.lblTrimLeft = new System.Windows.Forms.Label(); + this.nudTrimLeft = new System.Windows.Forms.NumericUpDown(); + this.nudTrimBottom = new System.Windows.Forms.NumericUpDown(); + this.nudTrimTop = new System.Windows.Forms.NumericUpDown(); + this.nudTrimRight = new System.Windows.Forms.NumericUpDown(); + this.pOutput = new System.Windows.Forms.Panel(); + this.lblProcessing = new System.Windows.Forms.Label(); + this.pbOutput = new System.Windows.Forms.PictureBox(); + ((System.ComponentModel.ISupportInitialize)(this.nudScrollDelay)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.nudMaximumScrollCount)).BeginInit(); + this.tcScrollingCapture.SuspendLayout(); + this.tpCapture.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.nudStartDelay)).BeginInit(); + this.tpOutput.SuspendLayout(); + this.gbImages.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.nudIgnoreLast)).BeginInit(); + this.gbCombineAdjustments.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.nudCombineVertical)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.nudCombineLastVertical)).BeginInit(); + this.gbTrimEdges.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.nudTrimLeft)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.nudTrimBottom)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.nudTrimTop)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.nudTrimRight)).BeginInit(); + this.pOutput.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.pbOutput)).BeginInit(); + this.SuspendLayout(); + // + // btnSelectHandle + // + resources.ApplyResources(this.btnSelectHandle, "btnSelectHandle"); + this.btnSelectHandle.Name = "btnSelectHandle"; + this.btnSelectHandle.UseVisualStyleBackColor = true; + this.btnSelectHandle.Click += new System.EventHandler(this.btnSelectHandle_Click); + // + // lblControlText + // + resources.ApplyResources(this.lblControlText, "lblControlText"); + this.lblControlText.Name = "lblControlText"; + // + // btnCapture + // + resources.ApplyResources(this.btnCapture, "btnCapture"); + this.btnCapture.Name = "btnCapture"; + this.btnCapture.UseVisualStyleBackColor = true; + this.btnCapture.Click += new System.EventHandler(this.btnCapture_Click); + // + // captureTimer + // + this.captureTimer.Tick += new System.EventHandler(this.captureTimer_Tick); + // + // nudScrollDelay + // + resources.ApplyResources(this.nudScrollDelay, "nudScrollDelay"); + this.nudScrollDelay.Maximum = new decimal(new int[] { + 5000, + 0, + 0, + 0}); + this.nudScrollDelay.Name = "nudScrollDelay"; + this.nudScrollDelay.ValueChanged += new System.EventHandler(this.nudScrollDelay_ValueChanged); + // + // nudMaximumScrollCount + // + resources.ApplyResources(this.nudMaximumScrollCount, "nudMaximumScrollCount"); + this.nudMaximumScrollCount.Name = "nudMaximumScrollCount"; + this.nudMaximumScrollCount.ValueChanged += new System.EventHandler(this.nudMaximumScrollCount_ValueChanged); + // + // lblScrollDelay + // + resources.ApplyResources(this.lblScrollDelay, "lblScrollDelay"); + this.lblScrollDelay.Name = "lblScrollDelay"; + // + // lblMaximumScrollCount + // + resources.ApplyResources(this.lblMaximumScrollCount, "lblMaximumScrollCount"); + this.lblMaximumScrollCount.Name = "lblMaximumScrollCount"; + // + // tcScrollingCapture + // + this.tcScrollingCapture.Controls.Add(this.tpCapture); + this.tcScrollingCapture.Controls.Add(this.tpOutput); + resources.ApplyResources(this.tcScrollingCapture, "tcScrollingCapture"); + this.tcScrollingCapture.Name = "tcScrollingCapture"; + this.tcScrollingCapture.SelectedIndex = 0; + // + // tpCapture + // + this.tpCapture.Controls.Add(this.cbStartSelectionAutomatically); + this.tpCapture.Controls.Add(this.cbAutoCombine); + this.tpCapture.Controls.Add(this.lblSelectedRectangle); + this.tpCapture.Controls.Add(this.btnSelectRectangle); + this.tpCapture.Controls.Add(this.lblStartDelay); + this.tpCapture.Controls.Add(this.nudStartDelay); + this.tpCapture.Controls.Add(this.cbScrollTopBeforeCapture); + this.tpCapture.Controls.Add(this.cbStartCaptureAutomatically); + this.tpCapture.Controls.Add(this.cbRemoveDuplicates); + this.tpCapture.Controls.Add(this.cbAutoDetectScrollEnd); + this.tpCapture.Controls.Add(this.lblScrollMethod); + this.tpCapture.Controls.Add(this.cbScrollMethod); + this.tpCapture.Controls.Add(this.btnSelectHandle); + this.tpCapture.Controls.Add(this.lblMaximumScrollCount); + this.tpCapture.Controls.Add(this.lblControlText); + this.tpCapture.Controls.Add(this.lblScrollDelay); + this.tpCapture.Controls.Add(this.btnCapture); + this.tpCapture.Controls.Add(this.nudMaximumScrollCount); + this.tpCapture.Controls.Add(this.nudScrollDelay); + resources.ApplyResources(this.tpCapture, "tpCapture"); + this.tpCapture.Name = "tpCapture"; + this.tpCapture.UseVisualStyleBackColor = true; + // + // cbStartSelectionAutomatically + // + resources.ApplyResources(this.cbStartSelectionAutomatically, "cbStartSelectionAutomatically"); + this.cbStartSelectionAutomatically.Name = "cbStartSelectionAutomatically"; + this.cbStartSelectionAutomatically.UseVisualStyleBackColor = true; + this.cbStartSelectionAutomatically.CheckedChanged += new System.EventHandler(this.cbStartSelectionAutomatically_CheckedChanged); + // + // cbAutoCombine + // + resources.ApplyResources(this.cbAutoCombine, "cbAutoCombine"); + this.cbAutoCombine.Name = "cbAutoCombine"; + this.cbAutoCombine.UseVisualStyleBackColor = true; + this.cbAutoCombine.CheckedChanged += new System.EventHandler(this.cbAutoCombine_CheckedChanged); + // + // lblSelectedRectangle + // + resources.ApplyResources(this.lblSelectedRectangle, "lblSelectedRectangle"); + this.lblSelectedRectangle.Name = "lblSelectedRectangle"; + // + // btnSelectRectangle + // + resources.ApplyResources(this.btnSelectRectangle, "btnSelectRectangle"); + this.btnSelectRectangle.Name = "btnSelectRectangle"; + this.btnSelectRectangle.UseVisualStyleBackColor = true; + this.btnSelectRectangle.Click += new System.EventHandler(this.btnSelectRectangle_Click); + // + // lblStartDelay + // + resources.ApplyResources(this.lblStartDelay, "lblStartDelay"); + this.lblStartDelay.Name = "lblStartDelay"; + // + // nudStartDelay + // + resources.ApplyResources(this.nudStartDelay, "nudStartDelay"); + this.nudStartDelay.Maximum = new decimal(new int[] { + 5000, + 0, + 0, + 0}); + this.nudStartDelay.Name = "nudStartDelay"; + this.nudStartDelay.ValueChanged += new System.EventHandler(this.nudStartDelay_ValueChanged); + // + // cbScrollTopBeforeCapture + // + resources.ApplyResources(this.cbScrollTopBeforeCapture, "cbScrollTopBeforeCapture"); + this.cbScrollTopBeforeCapture.Name = "cbScrollTopBeforeCapture"; + this.cbScrollTopBeforeCapture.UseVisualStyleBackColor = true; + this.cbScrollTopBeforeCapture.CheckedChanged += new System.EventHandler(this.cbScrollTopBeforeCapture_CheckedChanged); + // + // cbStartCaptureAutomatically + // + resources.ApplyResources(this.cbStartCaptureAutomatically, "cbStartCaptureAutomatically"); + this.cbStartCaptureAutomatically.Name = "cbStartCaptureAutomatically"; + this.cbStartCaptureAutomatically.UseVisualStyleBackColor = true; + this.cbStartCaptureAutomatically.CheckedChanged += new System.EventHandler(this.cbStartCaptureAutomatically_CheckedChanged); + // + // cbRemoveDuplicates + // + resources.ApplyResources(this.cbRemoveDuplicates, "cbRemoveDuplicates"); + this.cbRemoveDuplicates.Name = "cbRemoveDuplicates"; + this.cbRemoveDuplicates.UseVisualStyleBackColor = true; + this.cbRemoveDuplicates.CheckedChanged += new System.EventHandler(this.cbRemoveDuplicates_CheckedChanged); + // + // cbAutoDetectScrollEnd + // + resources.ApplyResources(this.cbAutoDetectScrollEnd, "cbAutoDetectScrollEnd"); + this.cbAutoDetectScrollEnd.Name = "cbAutoDetectScrollEnd"; + this.cbAutoDetectScrollEnd.UseVisualStyleBackColor = true; + this.cbAutoDetectScrollEnd.CheckedChanged += new System.EventHandler(this.cbAutoDetectScrollEnd_CheckedChanged); + // + // lblScrollMethod + // + resources.ApplyResources(this.lblScrollMethod, "lblScrollMethod"); + this.lblScrollMethod.Name = "lblScrollMethod"; + // + // cbScrollMethod + // + this.cbScrollMethod.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; + this.cbScrollMethod.FormattingEnabled = true; + resources.ApplyResources(this.cbScrollMethod, "cbScrollMethod"); + this.cbScrollMethod.Name = "cbScrollMethod"; + this.cbScrollMethod.SelectedIndexChanged += new System.EventHandler(this.cbScrollMethod_SelectedIndexChanged); + // + // tpOutput + // + this.tpOutput.Controls.Add(this.gbImages); + this.tpOutput.Controls.Add(this.btnResetCombine); + this.tpOutput.Controls.Add(this.btnGuessCombineAdjustments); + this.tpOutput.Controls.Add(this.btnStartTask); + this.tpOutput.Controls.Add(this.btnGuessEdges); + this.tpOutput.Controls.Add(this.gbCombineAdjustments); + this.tpOutput.Controls.Add(this.gbTrimEdges); + this.tpOutput.Controls.Add(this.pOutput); + resources.ApplyResources(this.tpOutput, "tpOutput"); + this.tpOutput.Name = "tpOutput"; + this.tpOutput.UseVisualStyleBackColor = true; + // + // gbImages + // + this.gbImages.Controls.Add(this.txtImagesCount); + this.gbImages.Controls.Add(this.lblImageCount); + this.gbImages.Controls.Add(this.nudIgnoreLast); + this.gbImages.Controls.Add(this.lblIgnoreLast); + resources.ApplyResources(this.gbImages, "gbImages"); + this.gbImages.Name = "gbImages"; + this.gbImages.TabStop = false; + // + // txtImagesCount + // + resources.ApplyResources(this.txtImagesCount, "txtImagesCount"); + this.txtImagesCount.Name = "txtImagesCount"; + this.txtImagesCount.ReadOnly = true; + // + // lblImageCount + // + resources.ApplyResources(this.lblImageCount, "lblImageCount"); + this.lblImageCount.Name = "lblImageCount"; + // + // nudIgnoreLast + // + resources.ApplyResources(this.nudIgnoreLast, "nudIgnoreLast"); + this.nudIgnoreLast.Maximum = new decimal(new int[] { + 5, + 0, + 0, + 0}); + this.nudIgnoreLast.Name = "nudIgnoreLast"; + this.nudIgnoreLast.ValueChanged += new System.EventHandler(this.nudIgnoreLast_ValueChanged); + // + // lblIgnoreLast + // + resources.ApplyResources(this.lblIgnoreLast, "lblIgnoreLast"); + this.lblIgnoreLast.Name = "lblIgnoreLast"; + // + // btnResetCombine + // + resources.ApplyResources(this.btnResetCombine, "btnResetCombine"); + this.btnResetCombine.Name = "btnResetCombine"; + this.btnResetCombine.UseMnemonic = false; + this.btnResetCombine.UseVisualStyleBackColor = true; + this.btnResetCombine.Click += new System.EventHandler(this.btnResetCombine_Click); + // + // btnGuessCombineAdjustments + // + resources.ApplyResources(this.btnGuessCombineAdjustments, "btnGuessCombineAdjustments"); + this.btnGuessCombineAdjustments.Name = "btnGuessCombineAdjustments"; + this.btnGuessCombineAdjustments.UseMnemonic = false; + this.btnGuessCombineAdjustments.UseVisualStyleBackColor = true; + this.btnGuessCombineAdjustments.Click += new System.EventHandler(this.btnGuessCombineAdjustments_Click); + // + // btnStartTask + // + resources.ApplyResources(this.btnStartTask, "btnStartTask"); + this.btnStartTask.Name = "btnStartTask"; + this.btnStartTask.UseVisualStyleBackColor = true; + this.btnStartTask.Click += new System.EventHandler(this.btnProcess_Click); + // + // btnGuessEdges + // + resources.ApplyResources(this.btnGuessEdges, "btnGuessEdges"); + this.btnGuessEdges.Name = "btnGuessEdges"; + this.btnGuessEdges.UseVisualStyleBackColor = true; + this.btnGuessEdges.Click += new System.EventHandler(this.btnGuessEdges_Click); + // + // gbCombineAdjustments + // + this.gbCombineAdjustments.Controls.Add(this.lblCombineLastVertical); + this.gbCombineAdjustments.Controls.Add(this.lblCombineVertical); + this.gbCombineAdjustments.Controls.Add(this.nudCombineVertical); + this.gbCombineAdjustments.Controls.Add(this.nudCombineLastVertical); + resources.ApplyResources(this.gbCombineAdjustments, "gbCombineAdjustments"); + this.gbCombineAdjustments.Name = "gbCombineAdjustments"; + this.gbCombineAdjustments.TabStop = false; + // + // lblCombineLastVertical + // + resources.ApplyResources(this.lblCombineLastVertical, "lblCombineLastVertical"); + this.lblCombineLastVertical.Name = "lblCombineLastVertical"; + // + // lblCombineVertical + // + resources.ApplyResources(this.lblCombineVertical, "lblCombineVertical"); + this.lblCombineVertical.Name = "lblCombineVertical"; + // + // nudCombineVertical + // + resources.ApplyResources(this.nudCombineVertical, "nudCombineVertical"); + this.nudCombineVertical.Maximum = new decimal(new int[] { + 5000, + 0, + 0, + 0}); + this.nudCombineVertical.Name = "nudCombineVertical"; + this.nudCombineVertical.ValueChanged += new System.EventHandler(this.nudCombineVertical_ValueChanged); + // + // nudCombineLastVertical + // + resources.ApplyResources(this.nudCombineLastVertical, "nudCombineLastVertical"); + this.nudCombineLastVertical.Maximum = new decimal(new int[] { + 5000, + 0, + 0, + 0}); + this.nudCombineLastVertical.Name = "nudCombineLastVertical"; + this.nudCombineLastVertical.ValueChanged += new System.EventHandler(this.nudCombineLastVertical_ValueChanged); + // + // gbTrimEdges + // + this.gbTrimEdges.Controls.Add(this.lblTrimBottom); + this.gbTrimEdges.Controls.Add(this.lblTrimRight); + this.gbTrimEdges.Controls.Add(this.lblTrimTop); + this.gbTrimEdges.Controls.Add(this.lblTrimLeft); + this.gbTrimEdges.Controls.Add(this.nudTrimLeft); + this.gbTrimEdges.Controls.Add(this.nudTrimBottom); + this.gbTrimEdges.Controls.Add(this.nudTrimTop); + this.gbTrimEdges.Controls.Add(this.nudTrimRight); + resources.ApplyResources(this.gbTrimEdges, "gbTrimEdges"); + this.gbTrimEdges.Name = "gbTrimEdges"; + this.gbTrimEdges.TabStop = false; + // + // lblTrimBottom + // + resources.ApplyResources(this.lblTrimBottom, "lblTrimBottom"); + this.lblTrimBottom.Name = "lblTrimBottom"; + // + // lblTrimRight + // + resources.ApplyResources(this.lblTrimRight, "lblTrimRight"); + this.lblTrimRight.Name = "lblTrimRight"; + // + // lblTrimTop + // + resources.ApplyResources(this.lblTrimTop, "lblTrimTop"); + this.lblTrimTop.Name = "lblTrimTop"; + // + // lblTrimLeft + // + resources.ApplyResources(this.lblTrimLeft, "lblTrimLeft"); + this.lblTrimLeft.Name = "lblTrimLeft"; + // + // nudTrimLeft + // + resources.ApplyResources(this.nudTrimLeft, "nudTrimLeft"); + this.nudTrimLeft.Maximum = new decimal(new int[] { + 5000, + 0, + 0, + 0}); + this.nudTrimLeft.Name = "nudTrimLeft"; + this.nudTrimLeft.ValueChanged += new System.EventHandler(this.nudTrimLeft_ValueChanged); + // + // nudTrimBottom + // + resources.ApplyResources(this.nudTrimBottom, "nudTrimBottom"); + this.nudTrimBottom.Maximum = new decimal(new int[] { + 5000, + 0, + 0, + 0}); + this.nudTrimBottom.Name = "nudTrimBottom"; + this.nudTrimBottom.ValueChanged += new System.EventHandler(this.nudTrimBottom_ValueChanged); + // + // nudTrimTop + // + resources.ApplyResources(this.nudTrimTop, "nudTrimTop"); + this.nudTrimTop.Maximum = new decimal(new int[] { + 5000, + 0, + 0, + 0}); + this.nudTrimTop.Name = "nudTrimTop"; + this.nudTrimTop.ValueChanged += new System.EventHandler(this.nudTrimTop_ValueChanged); + // + // nudTrimRight + // + resources.ApplyResources(this.nudTrimRight, "nudTrimRight"); + this.nudTrimRight.Maximum = new decimal(new int[] { + 5000, + 0, + 0, + 0}); + this.nudTrimRight.Name = "nudTrimRight"; + this.nudTrimRight.ValueChanged += new System.EventHandler(this.nudTrimRight_ValueChanged); + // + // pOutput + // + resources.ApplyResources(this.pOutput, "pOutput"); + this.pOutput.Controls.Add(this.lblProcessing); + this.pOutput.Controls.Add(this.pbOutput); + this.pOutput.Name = "pOutput"; + // + // lblProcessing + // + resources.ApplyResources(this.lblProcessing, "lblProcessing"); + this.lblProcessing.Name = "lblProcessing"; + // + // pbOutput + // + resources.ApplyResources(this.pbOutput, "pbOutput"); + this.pbOutput.Name = "pbOutput"; + this.pbOutput.TabStop = false; + // + // ScrollingCaptureForm + // + resources.ApplyResources(this, "$this"); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.Controls.Add(this.tcScrollingCapture); + this.Name = "ScrollingCaptureForm"; + ((System.ComponentModel.ISupportInitialize)(this.nudScrollDelay)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.nudMaximumScrollCount)).EndInit(); + this.tcScrollingCapture.ResumeLayout(false); + this.tpCapture.ResumeLayout(false); + this.tpCapture.PerformLayout(); + ((System.ComponentModel.ISupportInitialize)(this.nudStartDelay)).EndInit(); + this.tpOutput.ResumeLayout(false); + this.gbImages.ResumeLayout(false); + this.gbImages.PerformLayout(); + ((System.ComponentModel.ISupportInitialize)(this.nudIgnoreLast)).EndInit(); + this.gbCombineAdjustments.ResumeLayout(false); + this.gbCombineAdjustments.PerformLayout(); + ((System.ComponentModel.ISupportInitialize)(this.nudCombineVertical)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.nudCombineLastVertical)).EndInit(); + this.gbTrimEdges.ResumeLayout(false); + this.gbTrimEdges.PerformLayout(); + ((System.ComponentModel.ISupportInitialize)(this.nudTrimLeft)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.nudTrimBottom)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.nudTrimTop)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.nudTrimRight)).EndInit(); + this.pOutput.ResumeLayout(false); + this.pOutput.PerformLayout(); + ((System.ComponentModel.ISupportInitialize)(this.pbOutput)).EndInit(); + this.ResumeLayout(false); + + } + + #endregion + + private Button btnSelectHandle; + private Label lblControlText; + private Button btnCapture; + private Timer captureTimer; + private NumericUpDown nudScrollDelay; + private NumericUpDown nudMaximumScrollCount; + private Label lblScrollDelay; + private Label lblMaximumScrollCount; + private TabControl tcScrollingCapture; + private TabPage tpCapture; + private TabPage tpOutput; + private Panel pOutput; + private PictureBox pbOutput; + private GroupBox gbCombineAdjustments; + private Label lblCombineVertical; + private NumericUpDown nudCombineVertical; + private NumericUpDown nudCombineLastVertical; + private GroupBox gbTrimEdges; + private Label lblTrimBottom; + private Label lblTrimRight; + private Label lblTrimTop; + private Label lblTrimLeft; + private NumericUpDown nudTrimLeft; + private NumericUpDown nudTrimBottom; + private NumericUpDown nudTrimTop; + private NumericUpDown nudTrimRight; + private Label lblCombineLastVertical; + private Button btnGuessEdges; + private Button btnStartTask; + private Button btnGuessCombineAdjustments; + private Button btnResetCombine; + private Label lblScrollMethod; + private ComboBox cbScrollMethod; + private CheckBox cbAutoDetectScrollEnd; + private CheckBox cbRemoveDuplicates; + private CheckBox cbStartCaptureAutomatically; + private CheckBox cbScrollTopBeforeCapture; + private Label lblProcessing; + private Label lblImageCount; + private Label lblStartDelay; + private NumericUpDown nudStartDelay; + private Button btnSelectRectangle; + private Label lblSelectedRectangle; + private CheckBox cbAutoCombine; + private CheckBox cbStartSelectionAutomatically; + private NumericUpDown nudIgnoreLast; + private Label lblIgnoreLast; + private GroupBox gbImages; + private TextBox txtImagesCount; + } +} \ No newline at end of file diff --git a/ShareX.ScreenCaptureLib/Forms/ScrollingCaptureForm.cs b/ShareX.ScreenCaptureLib/Forms/ScrollingCaptureForm.cs new file mode 100644 index 000000000..8c976cf02 --- /dev/null +++ b/ShareX.ScreenCaptureLib/Forms/ScrollingCaptureForm.cs @@ -0,0 +1,824 @@ +#region License Information (GPL v3) + +/* + ShareX - A program that allows you to take screenshots and share any file type + Copyright (c) 2007-2015 ShareX Team + + This program is free software; you can redistribute it and/or + modify it under the terms of the GNU General Public License + as published by the Free Software Foundation; either version 2 + of the License, or (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + + Optionally you can also view the license at . +*/ + +#endregion License Information (GPL v3) + +using ShareX.HelpersLib; +using ShareX.ScreenCaptureLib.Properties; +using System; +using System.Collections.Generic; +using System.Drawing; +using System.Drawing.Imaging; +using System.Runtime.InteropServices; +using System.Threading; +using System.Windows.Forms; + +namespace ShareX.ScreenCaptureLib +{ + public partial class ScrollingCaptureForm : BaseForm + { + public event Action ProcessRequested; + + public ScrollingCaptureOptions Options { get; set; } + public Image Result { get; set; } + + private WindowInfo selectedWindow; + private Rectangle selectedRectangle; + private List images = new List(); + private int currentScrollCount; + private bool isBusy, isCapturing, firstCapture, detectingScrollMethod; + private ScrollingCaptureScrollMethod currentScrollMethod; + + public ScrollingCaptureForm(ScrollingCaptureOptions options, bool forceSelection = false) + { + Options = options; + + InitializeComponent(); + + cbScrollMethod.Items.AddRange(Helpers.GetEnumDescriptions()); + cbScrollMethod.SelectedIndex = (int)Options.ScrollMethod; + nudStartDelay.Value = Options.StartDelay; + nudScrollDelay.Value = Options.ScrollDelay; + nudMaximumScrollCount.Value = Options.MaximumScrollCount; + cbStartSelectionAutomatically.Checked = Options.StartSelectionAutomatically; + cbStartCaptureAutomatically.Checked = Options.StartCaptureAutomatically; + cbScrollTopBeforeCapture.Checked = Options.ScrollTopBeforeCapture; + cbAutoDetectScrollEnd.Checked = Options.AutoDetectScrollEnd; + cbRemoveDuplicates.Checked = Options.RemoveDuplicates; + cbAutoCombine.Checked = Options.AfterCaptureAutomaticallyCombine; + + if (forceSelection || Options.StartSelectionAutomatically) + { + if (Options.StartCaptureAutomatically) + { + WindowState = FormWindowState.Minimized; + } + + SelectHandle(); + } + } + + protected override void Dispose(bool disposing) + { + if (disposing) + { + if (components != null) + { + components.Dispose(); + } + + Clean(); + } + + base.Dispose(disposing); + } + + protected void OnProcessRequested(Image image) + { + if (ProcessRequested != null) + { + ProcessRequested(image); + } + } + + private void btnSelectHandle_Click(object sender, EventArgs e) + { + SelectHandle(); + } + + private void btnSelectRectangle_Click(object sender, EventArgs e) + { + SelectRectangle(); + } + + private void SelectHandle() + { + WindowState = FormWindowState.Minimized; + + bool capturing = false; + + try + { + Thread.Sleep(250); + + SimpleWindowInfo simpleWindowInfo = GetWindowInfo(); + + if (simpleWindowInfo != null) + { + selectedWindow = new WindowInfo(simpleWindowInfo.Handle); + lblControlText.Text = selectedWindow.ClassName ?? string.Empty; + selectedRectangle = simpleWindowInfo.Rectangle; + lblSelectedRectangle.Text = selectedRectangle.ToString(); + btnSelectRectangle.Enabled = btnCapture.Enabled = true; + + if (Options.StartCaptureAutomatically) + { + capturing = true; + StartCapture(); + } + } + else + { + btnCapture.Enabled = false; + } + } + finally + { + if (!capturing) this.ShowActivate(); + } + } + + private void SelectRectangle() + { + WindowState = FormWindowState.Minimized; + + try + { + Thread.Sleep(250); + + Rectangle rect; + if (Surface.SelectRegion(out rect)) + { + selectedRectangle = rect; + lblSelectedRectangle.Text = selectedRectangle.ToString(); + } + } + finally + { + this.ShowActivate(); + } + } + + private void btnCapture_Click(object sender, EventArgs e) + { + if (isCapturing) + { + StopCapture(); + } + else + { + StartCapture(); + } + } + + private SimpleWindowInfo GetWindowInfo() + { + using (RectangleRegion surface = new RectangleRegion()) + { + surface.OneClickMode = true; + surface.Config.ForceWindowCapture = true; + surface.Config.IncludeControls = true; + surface.Config.UseDimming = false; + surface.Config.ShowInfo = true; + surface.Config.ShowMagnifier = false; + surface.Config.ShowTips = false; + surface.Prepare(); + surface.ShowDialog(); + + if (surface.Result == SurfaceResult.Region) + { + return surface.SelectedWindow; + } + } + + return null; + } + + private void StartCapture() + { + isCapturing = true; + btnCapture.Text = Resources.ScrollingCaptureForm_StartCapture_Stop_capture; + WindowState = FormWindowState.Minimized; + firstCapture = true; + + if (Options.ScrollMethod == ScrollingCaptureScrollMethod.Automatic) + { + currentScrollMethod = ScrollingCaptureScrollMethod.SendMessageScroll; + } + else + { + currentScrollMethod = Options.ScrollMethod; + } + + detectingScrollMethod = true; + Clean(); + selectedWindow.Activate(); + captureTimer.Interval = Options.StartDelay; + captureTimer.Start(); + } + + private void StopCapture() + { + captureTimer.Stop(); + btnCapture.Text = Resources.ScrollingCaptureForm_StopCapture_Start_capture; + this.ShowActivate(); + tcScrollingCapture.SelectedTab = tpOutput; + StartingProcess(); + if (Options.RemoveDuplicates) RemoveDuplicates(); + txtImagesCount.Text = images.Count.ToString(); + btnGuessEdges.Enabled = btnGuessCombineAdjustments.Enabled = images.Count > 1; + btnStartTask.Enabled = btnResetCombine.Enabled = images.Count > 0; + nudIgnoreLast.Maximum = images.Count > 1 ? images.Count - 1 : 0; + ResetOffsets(); + if (Options.AfterCaptureAutomaticallyCombine) + { + GuessEdges(); + GuessCombineAdjustments(); + } + CombineAndPreviewImages(); + EndingProcess(); + isCapturing = false; + } + + private void Clean() + { + currentScrollCount = 0; + + if (images != null) + { + foreach (Image image in images) + { + if (image != null) + { + image.Dispose(); + } + } + + images.Clear(); + } + + if (Result != null) + { + Result.Dispose(); + } + } + + private void CleanPictureBox(Image img = null) + { + Image temp = pbOutput.Image; + + pbOutput.Image = img; + + if (temp != null) + { + temp.Dispose(); + } + } + + private void RemoveDuplicates() + { + if (images.Count > 1) + { + for (int i = images.Count - 1; i > 0; i--) + { + bool result = ImageHelpers.IsImagesEqual((Bitmap)images[i], (Bitmap)images[i - 1]); + + if (result) + { + Image img = images[i]; + images.Remove(img); + img.Dispose(); + } + } + } + } + + private void captureTimer_Tick(object sender, EventArgs e) + { + if (firstCapture) + { + firstCapture = false; + captureTimer.Interval = Options.ScrollDelay; + + if (Options.ScrollTopBeforeCapture) + { + InputHelpers.SendKeyPress(VirtualKeyCode.HOME); + NativeMethods.SendMessage(selectedWindow.Handle, (int)WindowsMessages.VSCROLL, (int)ScrollBarCommands.SB_TOP, 0); + return; + } + } + + Screenshot.CaptureCursor = false; + Image image = Screenshot.CaptureRectangle(selectedRectangle); + + if (image != null) + { + images.Add(image); + } + + if (Options.ScrollMethod == ScrollingCaptureScrollMethod.Automatic && detectingScrollMethod && images.Count > 1 && IsLastTwoImagesSame()) + { + if (currentScrollMethod == ScrollingCaptureScrollMethod.SendMessageScroll) + { + currentScrollMethod = ScrollingCaptureScrollMethod.KeyPressPageDown; + } + else if (currentScrollMethod == ScrollingCaptureScrollMethod.KeyPressPageDown) + { + currentScrollMethod = ScrollingCaptureScrollMethod.MouseWheel; + } + else + { + StopCapture(); + } + } + else if (currentScrollCount == Options.MaximumScrollCount || (Options.AutoDetectScrollEnd && IsScrollReachedBottom(selectedWindow.Handle))) + { + StopCapture(); + } + else if (images.Count > 1) + { + detectingScrollMethod = false; + } + + switch (currentScrollMethod) + { + case ScrollingCaptureScrollMethod.Automatic: + case ScrollingCaptureScrollMethod.SendMessageScroll: + NativeMethods.SendMessage(selectedWindow.Handle, (int)WindowsMessages.VSCROLL, (int)ScrollBarCommands.SB_PAGEDOWN, 0); + break; + case ScrollingCaptureScrollMethod.KeyPressPageDown: + InputHelpers.SendKeyPress(VirtualKeyCode.NEXT); + break; + case ScrollingCaptureScrollMethod.MouseWheel: + InputHelpers.SendMouseWheel(-120); + break; + } + + currentScrollCount++; + } + + private void cbScrollMethod_SelectedIndexChanged(object sender, EventArgs e) + { + Options.ScrollMethod = (ScrollingCaptureScrollMethod)cbScrollMethod.SelectedIndex; + } + + private void nudStartDelay_ValueChanged(object sender, EventArgs e) + { + Options.StartDelay = (int)nudStartDelay.Value; + } + + private void nudScrollDelay_ValueChanged(object sender, EventArgs e) + { + Options.ScrollDelay = (int)nudScrollDelay.Value; + } + + private void nudMaximumScrollCount_ValueChanged(object sender, EventArgs e) + { + Options.MaximumScrollCount = (int)nudMaximumScrollCount.Value; + } + + private void cbStartSelectionAutomatically_CheckedChanged(object sender, EventArgs e) + { + Options.StartSelectionAutomatically = cbStartSelectionAutomatically.Checked; + } + + private void cbStartCaptureAutomatically_CheckedChanged(object sender, EventArgs e) + { + Options.StartCaptureAutomatically = cbStartCaptureAutomatically.Checked; + } + + private void cbScrollTopBeforeCapture_CheckedChanged(object sender, EventArgs e) + { + Options.ScrollTopBeforeCapture = cbScrollTopBeforeCapture.Checked; + } + + private void cbAutoDetectScrollEnd_CheckedChanged(object sender, EventArgs e) + { + Options.AutoDetectScrollEnd = cbAutoDetectScrollEnd.Checked; + } + + private void cbRemoveDuplicates_CheckedChanged(object sender, EventArgs e) + { + Options.RemoveDuplicates = cbRemoveDuplicates.Checked; + } + + private void cbAutoCombine_CheckedChanged(object sender, EventArgs e) + { + Options.AfterCaptureAutomaticallyCombine = cbAutoCombine.Checked; + } + + private bool IsScrollReachedBottom(IntPtr handle) + { + SCROLLINFO scrollInfo = new SCROLLINFO(); + scrollInfo.cbSize = (uint)Marshal.SizeOf(scrollInfo); + scrollInfo.fMask = (uint)(ScrollInfoMask.SIF_RANGE | ScrollInfoMask.SIF_PAGE | ScrollInfoMask.SIF_TRACKPOS); + + if (NativeMethods.GetScrollInfo(handle, (int)SBOrientation.SB_VERT, ref scrollInfo)) + { + return scrollInfo.nMax == scrollInfo.nTrackPos + scrollInfo.nPage - 1; + } + + return IsLastTwoImagesSame(); + } + + private bool IsLastTwoImagesSame() + { + bool result = false; + + if (images.Count > 1) + { + result = ImageHelpers.IsImagesEqual((Bitmap)images[images.Count - 1], (Bitmap)images[images.Count - 2]); + + if (result) + { + Image last = images[images.Count - 1]; + images.Remove(last); + last.Dispose(); + } + } + + return result; + } + + private void nudTrimLeft_ValueChanged(object sender, EventArgs e) + { + Options.TrimLeftEdge = (int)nudTrimLeft.Value; + CombineAndPreviewImagesFromControl(); + } + + private void nudTrimTop_ValueChanged(object sender, EventArgs e) + { + Options.TrimTopEdge = (int)nudTrimTop.Value; + CombineAndPreviewImagesFromControl(); + } + + private void nudTrimRight_ValueChanged(object sender, EventArgs e) + { + Options.TrimRightEdge = (int)nudTrimRight.Value; + CombineAndPreviewImagesFromControl(); + } + + private void nudTrimBottom_ValueChanged(object sender, EventArgs e) + { + Options.TrimBottomEdge = (int)nudTrimBottom.Value; + CombineAndPreviewImagesFromControl(); + } + + private void nudCombineVertical_ValueChanged(object sender, EventArgs e) + { + Options.CombineAdjustmentVertical = (int)nudCombineVertical.Value; + CombineAndPreviewImagesFromControl(); + } + + private void nudCombineLastVertical_ValueChanged(object sender, EventArgs e) + { + Options.CombineAdjustmentLastVertical = (int)nudCombineLastVertical.Value; + CombineAndPreviewImagesFromControl(); + } + + private void nudIgnoreLast_ValueChanged(object sender, EventArgs e) + { + Options.IgnoreLast = (int)nudIgnoreLast.Value; + txtImagesCount.Text = (images.Count - Options.IgnoreLast).ToString(); + CombineAndPreviewImagesFromControl(); + } + + private void btnGuessEdges_Click(object sender, EventArgs e) + { + StartingProcess(); + GuessEdges(); + CombineAndPreviewImages(); + EndingProcess(); + } + + private void btnGuessCombineAdjustments_Click(object sender, EventArgs e) + { + StartingProcess(); + GuessCombineAdjustments(); + CombineAndPreviewImages(); + EndingProcess(); + } + + private void btnProcess_Click(object sender, EventArgs e) + { + if (Result != null) + { + OnProcessRequested((Image)Result.Clone()); + } + } + + private void StartingProcess() + { + isBusy = true; + CleanPictureBox(); + lblProcessing.Visible = true; + Application.DoEvents(); + } + + private void EndingProcess() + { + lblProcessing.Visible = false; + isBusy = false; + } + + private void btnResetCombine_Click(object sender, EventArgs e) + { + StartingProcess(); + ResetOffsets(); + CombineAndPreviewImages(); + EndingProcess(); + } + + private void ResetOffsets() + { + nudTrimLeft.Value = nudTrimTop.Value = nudTrimRight.Value = nudTrimBottom.Value = nudCombineVertical.Value = nudCombineLastVertical.Value = nudIgnoreLast.Value = 0; + Options.TrimLeftEdge = Options.TrimTopEdge = Options.TrimRightEdge = Options.TrimBottomEdge = + Options.CombineAdjustmentVertical = Options.CombineAdjustmentLastVertical = Options.IgnoreLast = 0; + } + + private void CombineAndPreviewImagesFromControl() + { + if (!isBusy) + { + Result = CombineImages(); + CleanPictureBox(Result); + } + } + + private void CombineAndPreviewImages() + { + Result = CombineImages(); + pbOutput.Image = Result; + } + + private Image CombineImages() + { + if (images == null || images.Count == 0) + { + return null; + } + + if (images.Count == 1) + { + return (Image)images[0].Clone(); + } + + List output = new List(); + + for (int i = 0; i < images.Count - Options.IgnoreLast; i++) + { + Image newImage; + Image image = images[i]; + + if (Options.TrimLeftEdge > 0 || Options.TrimTopEdge > 0 || Options.TrimTopEdge > 0 || Options.TrimBottomEdge > 0 || + Options.CombineAdjustmentVertical > 0 || Options.CombineAdjustmentLastVertical > 0) + { + Rectangle rect = new Rectangle(Options.TrimLeftEdge, Options.TrimTopEdge, image.Width - Options.TrimLeftEdge - Options.TrimRightEdge, + image.Height - Options.TrimTopEdge - Options.TrimBottomEdge); + + if (i == images.Count - 1) + { + rect.Y += Options.CombineAdjustmentLastVertical; + rect.Height -= Options.CombineAdjustmentLastVertical; + } + else if (i > 0) + { + rect.Y += Options.CombineAdjustmentVertical; + rect.Height -= Options.CombineAdjustmentVertical; + } + + newImage = ImageHelpers.CropImage(image, rect); + + if (newImage == null) + { + continue; + } + } + else + { + newImage = (Image)image.Clone(); + } + + output.Add(newImage); + } + + Image result = ImageHelpers.CombineImages(output); + + foreach (Image image in output) + { + if (image != null) + { + image.Dispose(); + } + } + + output.Clear(); + + return result; + } + + private void GuessEdges() + { + if (images.Count < 2) return; + + nudTrimLeft.Value = nudTrimTop.Value = nudTrimRight.Value = nudTrimBottom.Value = 0; + + Padding result = new Padding(); + + for (int i = 0; i < images.Count - 1; i++) + { + Padding edges = GuessEdges(images[i], images[i + 1]); + + if (i == 0) + { + result = edges; + } + else + { + result.Left = Math.Min(result.Left, edges.Left); + result.Top = Math.Min(result.Top, edges.Top); + result.Right = Math.Min(result.Right, edges.Right); + result.Bottom = Math.Min(result.Bottom, edges.Bottom); + } + } + + nudTrimLeft.Value = result.Left; + nudTrimTop.Value = result.Top; + nudTrimRight.Value = result.Right; + nudTrimBottom.Value = result.Bottom; + } + + private Padding GuessEdges(Image img1, Image img2) + { + Padding result = new Padding(); + Rectangle rect = new Rectangle(0, 0, img1.Width, img1.Height); + + using (UnsafeBitmap bmp1 = new UnsafeBitmap((Bitmap)img1, true, ImageLockMode.ReadOnly)) + using (UnsafeBitmap bmp2 = new UnsafeBitmap((Bitmap)img2, true, ImageLockMode.ReadOnly)) + { + bool valueFound = false; + + // Left edge + for (int x = rect.X; !valueFound && x < rect.Width; x++) + { + for (int y = rect.Y; y < rect.Height; y++) + { + if (bmp1.GetPixel(x, y) != bmp2.GetPixel(x, y)) + { + valueFound = true; + result.Left = x; + rect.X = x; + break; + } + } + } + + valueFound = false; + + // Top edge + for (int y = rect.Y; !valueFound && y < rect.Height; y++) + { + for (int x = rect.X; x < rect.Width; x++) + { + if (bmp1.GetPixel(x, y) != bmp2.GetPixel(x, y)) + { + valueFound = true; + result.Top = y; + rect.Y = y; + break; + } + } + } + + valueFound = false; + + // Right edge + for (int x = rect.Width - 1; !valueFound && x >= rect.X; x--) + { + for (int y = rect.Y; y < rect.Height; y++) + { + if (bmp1.GetPixel(x, y) != bmp2.GetPixel(x, y)) + { + valueFound = true; + result.Right = rect.Width - x - 1; + rect.Width = x + 1; + break; + } + } + } + + valueFound = false; + + // Bottom edge + for (int y = rect.Height - 1; !valueFound && y >= rect.X; y--) + { + for (int x = rect.X; x < rect.Width; x++) + { + if (bmp1.GetPixel(x, y) != bmp2.GetPixel(x, y)) + { + valueFound = true; + result.Bottom = rect.Height - y - 1; + rect.Height = y + 1; + break; + } + } + } + } + + return result; + } + + private void GuessCombineAdjustments() + { + if (images.Count > 1) + { + int vertical = 0; + + for (int i = 0; i < images.Count - 2; i++) + { + int temp = CalculateVerticalOffset(images[i], images[i + 1]); + vertical = Math.Max(vertical, temp); + } + + nudCombineVertical.Value = vertical; + nudCombineLastVertical.Value = CalculateVerticalOffset(images[images.Count - 2], images[images.Count - 1]); + } + } + + private int CalculateVerticalOffset(Image img1, Image img2, int ignoreRightOffset = 50) + { + int lastMatchCount = 0; + int lastMatchOffset = 0; + + Rectangle rect = new Rectangle(Options.TrimLeftEdge, Options.TrimTopEdge, + img1.Width - Options.TrimLeftEdge - Options.TrimRightEdge - (img1.Width > ignoreRightOffset ? ignoreRightOffset : 0), + img1.Height - Options.TrimTopEdge - Options.TrimBottomEdge); + + using (UnsafeBitmap bmp1 = new UnsafeBitmap((Bitmap)img1, true, ImageLockMode.ReadOnly)) + using (UnsafeBitmap bmp2 = new UnsafeBitmap((Bitmap)img2, true, ImageLockMode.ReadOnly)) + { + for (int y = rect.Y; y < rect.Bottom; y++) + { + bool isLineMatches = true; + + for (int x = rect.X; x < rect.Right; x++) + { + if (bmp2.GetPixel(x, y) != bmp1.GetPixel(x, rect.Bottom - 1)) + { + isLineMatches = false; + break; + } + } + + if (isLineMatches) + { + int lineMatchesCount = 1; + int y3 = 2; + + for (int y2 = y - 1; y2 >= rect.Y; y2--) + { + bool isLineMatches2 = true; + + for (int x2 = rect.X; x2 < rect.Right; x2++) + { + if (bmp2.GetPixel(x2, y2) != bmp1.GetPixel(x2, rect.Bottom - y3)) + { + isLineMatches2 = false; + break; + } + } + + if (isLineMatches2) + { + lineMatchesCount++; + y3++; + } + else + { + break; + } + } + + if (lineMatchesCount > lastMatchCount) + { + lastMatchCount = lineMatchesCount; + lastMatchOffset = y - rect.Y + 1; + } + } + } + } + + return lastMatchOffset; + } + } +} \ No newline at end of file diff --git a/ShareX.ScreenCaptureLib/Forms/ScrollingCaptureForm.resx b/ShareX.ScreenCaptureLib/Forms/ScrollingCaptureForm.resx new file mode 100644 index 000000000..a19330bf2 --- /dev/null +++ b/ShareX.ScreenCaptureLib/Forms/ScrollingCaptureForm.resx @@ -0,0 +1,1416 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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 + + + + 16, 16 + + + 344, 23 + + + + 0 + + + Select window or control to scroll... + + + btnSelectHandle + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tpCapture + + + 12 + + + True + + + 368, 21 + + + 0, 13 + + + 1 + + + lblControlText + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tpCapture + + + 14 + + + False + + + 16, 312 + + + 344, 32 + + + 18 + + + Start capture + + + btnCapture + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tpCapture + + + 16 + + + 17, 17 + + + 160, 116 + + + 80, 20 + + + 9 + + + + Center + + + nudScrollDelay + + + System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tpCapture + + + 18 + + + 160, 140 + + + 80, 20 + + + 11 + + + Center + + + nudMaximumScrollCount + + + System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tpCapture + + + 17 + + + True + + + 13, 120 + + + 64, 13 + + + 8 + + + Scroll delay: + + + lblScrollDelay + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tpCapture + + + 15 + + + True + + + 13, 144 + + + 111, 13 + + + 10 + + + Maximum scroll count: + + + lblMaximumScrollCount + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tpCapture + + + 13 + + + True + + + 16, 168 + + + 359, 17 + + + 12 + + + Automatically start selecting capture region before opening this window + + + cbStartSelectionAutomatically + + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tpCapture + + + 0 + + + True + + + 16, 288 + + + 280, 17 + + + 17 + + + Automatically guess offsets and combine after capture + + + cbAutoCombine + + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tpCapture + + + 1 + + + True + + + 368, 45 + + + 0, 13 + + + 3 + + + lblSelectedRectangle + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tpCapture + + + 2 + + + False + + + 16, 40 + + + 344, 23 + + + 2 + + + (Optional) Select custom region in window... + + + btnSelectRectangle + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tpCapture + + + 3 + + + True + + + 13, 96 + + + 60, 13 + + + 6 + + + Start delay: + + + lblStartDelay + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tpCapture + + + 4 + + + 160, 92 + + + 80, 20 + + + 7 + + + Center + + + nudStartDelay + + + System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tpCapture + + + 5 + + + True + + + 16, 216 + + + 223, 17 + + + 14 + + + Attempt scrolling to the top before capture + + + cbScrollTopBeforeCapture + + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tpCapture + + + 6 + + + True + + + 16, 192 + + + 325, 17 + + + 13 + + + Start scrolling capture immediately after capture region selection + + + cbStartCaptureAutomatically + + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tpCapture + + + 7 + + + True + + + 16, 264 + + + 148, 17 + + + 16 + + + Remove duplicate images + + + cbRemoveDuplicates + + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tpCapture + + + 8 + + + True + + + 16, 240 + + + 169, 17 + + + 15 + + + Automatically detect scroll end + + + cbAutoDetectScrollEnd + + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tpCapture + + + 9 + + + True + + + 13, 72 + + + 74, 13 + + + 4 + + + Scroll method: + + + lblScrollMethod + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tpCapture + + + 10 + + + 160, 68 + + + 312, 21 + + + 5 + + + cbScrollMethod + + + System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tpCapture + + + 11 + + + 4, 22 + + + 3, 3, 3, 3 + + + 976, 635 + + + 0 + + + Capture + + + tpCapture + + + System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tcScrollingCapture + + + 0 + + + 120, 16 + + + 56, 20 + + + 1 + + + Center + + + txtImagesCount + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gbImages + + + 0 + + + True + + + 8, 20 + + + 69, 13 + + + 0 + + + Image count: + + + lblImageCount + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gbImages + + + 1 + + + 120, 40 + + + 56, 20 + + + 3 + + + Center + + + nudIgnoreLast + + + System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gbImages + + + 2 + + + True + + + 8, 44 + + + 69, 13 + + + 2 + + + Remove last: + + + lblIgnoreLast + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gbImages + + + 3 + + + 8, 8 + + + 184, 120 + + + 0 + + + Images + + + gbImages + + + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tpOutput + + + 0 + + + False + + + 560, 96 + + + 3, 0, 0, 0 + + + 376, 23 + + + 6 + + + Reset output options + + + MiddleLeft + + + btnResetCombine + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tpOutput + + + 1 + + + False + + + 560, 40 + + + 3, 0, 0, 0 + + + 376, 23 + + + 4 + + + Guess combine adjustments & combine + + + MiddleLeft + + + btnGuessCombineAdjustments + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tpOutput + + + 2 + + + False + + + 560, 64 + + + 3, 0, 0, 0 + + + 376, 23 + + + 5 + + + Upload/save depending on after capture settings + + + MiddleLeft + + + btnStartTask + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tpOutput + + + 3 + + + False + + + 560, 16 + + + 3, 0, 0, 0 + + + 376, 23 + + + 3 + + + Guess edge values to trim + + + MiddleLeft + + + btnGuessEdges + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tpOutput + + + 4 + + + True + + + 8, 44 + + + 67, 13 + + + 2 + + + Last vertical: + + + lblCombineLastVertical + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gbCombineAdjustments + + + 0 + + + True + + + 8, 20 + + + 45, 13 + + + 0 + + + Vertical: + + + lblCombineVertical + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gbCombineAdjustments + + + 1 + + + 120, 16 + + + 56, 20 + + + 1 + + + Center + + + nudCombineVertical + + + System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gbCombineAdjustments + + + 2 + + + 120, 40 + + + 56, 20 + + + 3 + + + Center + + + nudCombineLastVertical + + + System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gbCombineAdjustments + + + 3 + + + 368, 8 + + + 184, 120 + + + 2 + + + Combine adjustments + + + gbCombineAdjustments + + + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tpOutput + + + 5 + + + True + + + 8, 92 + + + 43, 13 + + + 6 + + + Bottom: + + + lblTrimBottom + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gbTrimEdges + + + 0 + + + True + + + 8, 68 + + + 35, 13 + + + 4 + + + Right: + + + lblTrimRight + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gbTrimEdges + + + 1 + + + True + + + 8, 44 + + + 29, 13 + + + 2 + + + Top: + + + lblTrimTop + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gbTrimEdges + + + 2 + + + True + + + 8, 20 + + + 28, 13 + + + 0 + + + Left: + + + lblTrimLeft + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gbTrimEdges + + + 3 + + + 96, 16 + + + 56, 20 + + + 1 + + + Center + + + nudTrimLeft + + + System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gbTrimEdges + + + 4 + + + 96, 88 + + + 56, 20 + + + 7 + + + Center + + + nudTrimBottom + + + System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gbTrimEdges + + + 5 + + + 96, 40 + + + 56, 20 + + + 3 + + + Center + + + nudTrimTop + + + System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gbTrimEdges + + + 6 + + + 96, 64 + + + 56, 20 + + + 5 + + + Center + + + nudTrimRight + + + System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gbTrimEdges + + + 7 + + + 200, 8 + + + 160, 120 + + + 1 + + + Trim edges + + + gbTrimEdges + + + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tpOutput + + + 6 + + + Top, Bottom, Left, Right + + + True + + + True + + + Microsoft Sans Serif, 15.75pt + + + 8, 8 + + + 137, 25 + + + 0 + + + Processing... + + + False + + + lblProcessing + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + pOutput + + + 0 + + + 0, 0 + + + 10, 10 + + + AutoSize + + + 0 + + + pbOutput + + + System.Windows.Forms.PictureBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + pOutput + + + 1 + + + 8, 136 + + + 961, 490 + + + 7 + + + pOutput + + + System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tpOutput + + + 7 + + + 4, 22 + + + 3, 3, 3, 3 + + + 976, 635 + + + 1 + + + Output + + + tpOutput + + + System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tcScrollingCapture + + + 1 + + + Fill + + + 0, 0 + + + 984, 661 + + + 0 + + + tcScrollingCapture + + + System.Windows.Forms.TabControl, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 0 + + + True + + + 6, 13 + + + 984, 661 + + + CenterScreen + + + ShareX - Scrolling capture + + + captureTimer + + + System.Windows.Forms.Timer, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + ScrollingCaptureForm + + + ShareX.HelpersLib.BaseForm, ShareX.HelpersLib, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + + \ No newline at end of file diff --git a/ShareX.ScreenCaptureLib/Forms/Surface.cs b/ShareX.ScreenCaptureLib/Forms/Surface.cs index e71d65c5e..356e0604a 100644 --- a/ShareX.ScreenCaptureLib/Forms/Surface.cs +++ b/ShareX.ScreenCaptureLib/Forms/Surface.cs @@ -429,5 +429,56 @@ protected override void Dispose(bool disposing) base.Dispose(disposing); } + + public static bool SelectRegion(out Rectangle rect) + { + return SelectRegion(out rect, new SurfaceOptions()); + } + + public static bool SelectRegion(out Rectangle rect, SurfaceOptions options) + { + using (RectangleRegion surface = new RectangleRegion()) + { + surface.Config = options; + surface.Config.ShowTips = false; + surface.Config.QuickCrop = true; + surface.Config.ForceWindowCapture = true; + surface.Prepare(); + surface.ShowDialog(); + + if (surface.Result == SurfaceResult.Region) + { + if (surface.AreaManager.IsCurrentAreaValid) + { + rect = CaptureHelpers.ClientToScreen(surface.AreaManager.CurrentArea); + return true; + } + } + else if (surface.Result == SurfaceResult.Fullscreen) + { + rect = CaptureHelpers.GetScreenBounds(); + return true; + } + else if (surface.Result == SurfaceResult.Monitor) + { + Screen[] screens = Screen.AllScreens; + + if (surface.MonitorIndex < screens.Length) + { + Screen screen = screens[surface.MonitorIndex]; + rect = screen.Bounds; + return true; + } + } + else if (surface.Result == SurfaceResult.ActiveMonitor) + { + rect = CaptureHelpers.GetActiveScreenBounds(); + return true; + } + } + + rect = Rectangle.Empty; + return false; + } } } \ No newline at end of file diff --git a/ShareX.ScreenCaptureLib/Properties/Resources.Designer.cs b/ShareX.ScreenCaptureLib/Properties/Resources.Designer.cs index 400499529..6e02508fa 100644 --- a/ShareX.ScreenCaptureLib/Properties/Resources.Designer.cs +++ b/ShareX.ScreenCaptureLib/Properties/Resources.Designer.cs @@ -579,6 +579,24 @@ internal class Resources { } } + /// + /// Looks up a localized string similar to Stop capture. + /// + internal static string ScrollingCaptureForm_StartCapture_Stop_capture { + get { + return ResourceManager.GetString("ScrollingCaptureForm_StartCapture_Stop_capture", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Start capture. + /// + internal static string ScrollingCaptureForm_StopCapture_Start_capture { + get { + return ResourceManager.GetString("ScrollingCaptureForm_StopCapture_Start_capture", resourceCulture); + } + } + /// /// Looks up a localized string similar to Region capture. /// diff --git a/ShareX.ScreenCaptureLib/Properties/Resources.resx b/ShareX.ScreenCaptureLib/Properties/Resources.resx index e460574b2..5cf5ffeec 100644 --- a/ShareX.ScreenCaptureLib/Properties/Resources.resx +++ b/ShareX.ScreenCaptureLib/Properties/Resources.resx @@ -296,4 +296,10 @@ X: {4} Y: {5} [Hold Alt] Snap selection to preset sizes + + Stop capture + + + Start capture + \ No newline at end of file diff --git a/ShareX.ScreenCaptureLib/RegionHelpers/AreaManager.cs b/ShareX.ScreenCaptureLib/RegionHelpers/AreaManager.cs index 889c9b9eb..38281710a 100644 --- a/ShareX.ScreenCaptureLib/RegionHelpers/AreaManager.cs +++ b/ShareX.ScreenCaptureLib/RegionHelpers/AreaManager.cs @@ -119,7 +119,7 @@ public bool IsResizing public bool IsProportionalResizing { get; private set; } public bool IsSnapResizing { get; private set; } - public List Windows { get; set; } + public List Windows { get; set; } public bool WindowCaptureMode { get; set; } public bool IncludeControls { get; set; } public int MinimumSize { get; set; } @@ -319,19 +319,29 @@ private void CheckHover() { CurrentHoverArea = hoverArea; } - else if (WindowCaptureMode && Windows != null) + else { - hoverArea = Windows.FirstOrDefault(x => x.Contains(InputManager.MousePosition)); + SimpleWindowInfo window = FindSelectedWindow(); - if (!hoverArea.IsEmpty) + if (window != null && !window.Rectangle.IsEmpty) { - hoverArea = CaptureHelpers.ScreenToClient(hoverArea); + hoverArea = CaptureHelpers.ScreenToClient(window.Rectangle); CurrentHoverArea = Rectangle.Intersect(surface.ScreenRectangle0Based, hoverArea); } } } } + public SimpleWindowInfo FindSelectedWindow() + { + if (Windows != null) + { + return Windows.FirstOrDefault(x => x.Rectangle.Contains(InputManager.MousePosition)); + } + + return null; + } + private void surface_MouseDown(object sender, MouseEventArgs e) { if (e.Button == MouseButtons.Left) diff --git a/ShareX.ScreenCaptureLib/Screencast/FFmpegHelper.cs b/ShareX.ScreenCaptureLib/Screencast/FFmpegHelper.cs index 34ad6d5d6..fee244bd6 100644 --- a/ShareX.ScreenCaptureLib/Screencast/FFmpegHelper.cs +++ b/ShareX.ScreenCaptureLib/Screencast/FFmpegHelper.cs @@ -180,14 +180,17 @@ public DirectShowDevices GetDirectShowDevices() public override void Close() { - if (closeTryCount >= 2) + if (processRunning) { - process.Kill(); - } - else - { - WriteInput("q"); - closeTryCount++; + if (closeTryCount >= 2) + { + process.Kill(); + } + else + { + WriteInput("q"); + closeTryCount++; + } } } } diff --git a/ShareX.ScreenCaptureLib/Screencast/ScreenRecorder.cs b/ShareX.ScreenCaptureLib/Screencast/ScreenRecorder.cs index 1f073aa19..cc959e12e 100644 --- a/ShareX.ScreenCaptureLib/Screencast/ScreenRecorder.cs +++ b/ShareX.ScreenCaptureLib/Screencast/ScreenRecorder.cs @@ -35,7 +35,6 @@ namespace ShareX.ScreenCaptureLib public class ScreenRecorder : IDisposable { public bool IsRecording { get; private set; } - public bool WriteCompressed { get; set; } public int FPS { diff --git a/ShareX.ScreenCaptureLib/Screencast/ScreencastOptions.cs b/ShareX.ScreenCaptureLib/Screencast/ScreencastOptions.cs index 8077e73b6..34ea74da0 100644 --- a/ShareX.ScreenCaptureLib/Screencast/ScreencastOptions.cs +++ b/ShareX.ScreenCaptureLib/Screencast/ScreencastOptions.cs @@ -174,6 +174,7 @@ public string GetFFmpegArgs(bool isCustom = false) case FFmpegVideoCodec.libvpx: // https://trac.ffmpeg.org/wiki/Encode/VP8 args.AppendFormat("-deadline {0} ", "realtime"); args.AppendFormat("-b:v {0}k ", FFmpeg.VPx_bitrate); + args.AppendFormat("-pix_fmt {0} ", "yuv420p"); // -pix_fmt yuv420p required otherwise causing issues in Chrome related to WebM transparency support break; case FFmpegVideoCodec.libxvid: // https://trac.ffmpeg.org/wiki/Encode/MPEG-4 args.AppendFormat("-qscale:v {0} ", FFmpeg.XviD_qscale); diff --git a/ShareX.ScreenCaptureLib/ScrollingCaptureOptions.cs b/ShareX.ScreenCaptureLib/ScrollingCaptureOptions.cs new file mode 100644 index 000000000..926a1d57f --- /dev/null +++ b/ShareX.ScreenCaptureLib/ScrollingCaptureOptions.cs @@ -0,0 +1,55 @@ +#region License Information (GPL v3) + +/* + ShareX - A program that allows you to take screenshots and share any file type + Copyright (c) 2007-2015 ShareX Team + + This program is free software; you can redistribute it and/or + modify it under the terms of the GNU General Public License + as published by the Free Software Foundation; either version 2 + of the License, or (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + + Optionally you can also view the license at . +*/ + +#endregion License Information (GPL v3) + +using ShareX.ScreenCaptureLib; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; + +namespace ShareX +{ + public class ScrollingCaptureOptions + { + public ScrollingCaptureScrollMethod ScrollMethod { get; set; } = ScrollingCaptureScrollMethod.Automatic; + public int StartDelay { get; set; } = 500; + public int ScrollDelay { get; set; } = 500; + public int MaximumScrollCount { get; set; } = 20; + public bool StartSelectionAutomatically { get; set; } = true; + public bool StartCaptureAutomatically { get; set; } = false; + public bool ScrollTopBeforeCapture { get; set; } = true; + public bool AutoDetectScrollEnd { get; set; } = true; + public bool RemoveDuplicates { get; set; } = true; + public bool AfterCaptureAutomaticallyCombine { get; set; } = true; + + public int TrimLeftEdge { get; set; } = 0; + public int TrimTopEdge { get; set; } = 0; + public int TrimRightEdge { get; set; } = 0; + public int TrimBottomEdge { get; set; } = 0; + public int CombineAdjustmentVertical { get; set; } = 0; + public int CombineAdjustmentLastVertical { get; set; } = 0; + public int IgnoreLast { get; set; } = 0; + } +} \ No newline at end of file diff --git a/ShareX.ScreenCaptureLib/ShareX.ScreenCaptureLib.csproj b/ShareX.ScreenCaptureLib/ShareX.ScreenCaptureLib.csproj index 5f1ae6825..d28a3ff7d 100644 --- a/ShareX.ScreenCaptureLib/ShareX.ScreenCaptureLib.csproj +++ b/ShareX.ScreenCaptureLib/ShareX.ScreenCaptureLib.csproj @@ -66,6 +66,12 @@ Form + + Form + + + ScrollingCaptureForm.cs + @@ -109,6 +115,8 @@ + + @@ -131,6 +139,9 @@ + + ScrollingCaptureForm.cs + Designer diff --git a/ShareX.ScreenCaptureLib/SimpleWindowInfo.cs b/ShareX.ScreenCaptureLib/SimpleWindowInfo.cs new file mode 100644 index 000000000..558e92b08 --- /dev/null +++ b/ShareX.ScreenCaptureLib/SimpleWindowInfo.cs @@ -0,0 +1,50 @@ +#region License Information (GPL v3) + +/* + ShareX - A program that allows you to take screenshots and share any file type + Copyright (c) 2007-2015 ShareX Team + + This program is free software; you can redistribute it and/or + modify it under the terms of the GNU General Public License + as published by the Free Software Foundation; either version 2 + of the License, or (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + + Optionally you can also view the license at . +*/ + +#endregion License Information (GPL v3) + +using System; +using System.Collections.Generic; +using System.Drawing; +using System.Linq; +using System.Text; + +namespace ShareX.ScreenCaptureLib +{ + public class SimpleWindowInfo + { + public IntPtr Handle { get; set; } + public Rectangle Rectangle { get; set; } + + public SimpleWindowInfo(IntPtr handle) + { + Handle = handle; + } + + public SimpleWindowInfo(IntPtr handle, Rectangle rect) + { + Handle = handle; + Rectangle = rect; + } + } +} \ No newline at end of file diff --git a/ShareX.ScreenCaptureLib/WindowInfo.cs b/ShareX.ScreenCaptureLib/WindowInfo.cs index 1d8f2326e..5deaeae89 100644 --- a/ShareX.ScreenCaptureLib/WindowInfo.cs +++ b/ShareX.ScreenCaptureLib/WindowInfo.cs @@ -127,6 +127,11 @@ public WindowInfo(IntPtr handle) Handle = handle; } + public void Activate() + { + NativeMethods.ActivateWindow(Handle); + } + public override string ToString() { return Text; diff --git a/ShareX.ScreenCaptureLib/WindowsRectangleList.cs b/ShareX.ScreenCaptureLib/WindowsRectangleList.cs index 86967b358..669b49843 100644 --- a/ShareX.ScreenCaptureLib/WindowsRectangleList.cs +++ b/ShareX.ScreenCaptureLib/WindowsRectangleList.cs @@ -35,23 +35,23 @@ public class WindowsRectangleList public IntPtr IgnoreHandle { get; set; } public bool IncludeChildWindows { get; set; } - private List rectangles; + private List windows; - public List GetWindowsRectangleList() + public List GetWindowsRectangleList() { - rectangles = new List(); + windows = new List(); NativeMethods.EnumWindowsProc ewp = EvalWindow; NativeMethods.EnumWindows(ewp, IntPtr.Zero); - List result = new List(); + List result = new List(); - foreach (Rectangle rect in rectangles) + foreach (SimpleWindowInfo window in windows) { bool rectVisible = true; - foreach (Rectangle rect2 in result) + foreach (SimpleWindowInfo window2 in result) { - if (rect2.Contains(rect)) + if (window2.Rectangle.Contains(window.Rectangle)) { rectVisible = false; break; @@ -60,7 +60,7 @@ public List GetWindowsRectangleList() if (rectVisible) { - result.Add(rect); + result.Add(window); } } @@ -84,18 +84,18 @@ private bool CheckHandle(IntPtr handle, bool isWindow) return true; } - Rectangle rect; + SimpleWindowInfo windowInfo = new SimpleWindowInfo(handle); if (isWindow) { - rect = CaptureHelpers.GetWindowRectangle(handle); + windowInfo.Rectangle = CaptureHelpers.GetWindowRectangle(handle); } else { - rect = NativeMethods.GetWindowRect(handle); + windowInfo.Rectangle = NativeMethods.GetWindowRect(handle); } - if (!rect.IsValid()) + if (!windowInfo.Rectangle.IsValid()) { return true; } @@ -112,11 +112,11 @@ private bool CheckHandle(IntPtr handle, bool isWindow) if (clientRect.IsValid()) { - rectangles.Add(clientRect); + windows.Add(new SimpleWindowInfo(handle, clientRect)); } } - rectangles.Add(rect); + windows.Add(windowInfo); return true; } diff --git a/ShareX.Setup/Program.cs b/ShareX.Setup/Program.cs index 45e60a423..f65480c95 100644 --- a/ShareX.Setup/Program.cs +++ b/ShareX.Setup/Program.cs @@ -42,21 +42,22 @@ private enum SetupType Steam // Create Steam folder } - private static SetupType Setup = SetupType.Steam; + private static readonly SetupType Setup = SetupType.Steam; - private static string parentDir = @"..\..\..\"; - private static string binDir = Path.Combine(parentDir, "ShareX", "bin"); - private static string releaseDir = Path.Combine(binDir, "Release"); - private static string debugDir = Path.Combine(binDir, "Debug"); - private static string steamDir = Path.Combine(binDir, "Steam"); - private static string debugPath = Path.Combine(debugDir, "ShareX.exe"); - private static string outputDir = Path.Combine(parentDir, "InnoSetup", "Output"); - private static string portableDir = Path.Combine(outputDir, "ShareX-portable"); - private static string steamOutputDir = Path.Combine(outputDir, "ShareX"); - private static string steamLauncherDir = Path.Combine(parentDir, @"..\ShareX_Steam\ShareX_Steam\bin\Release"); - private static string steamUpdatesDir = Path.Combine(steamOutputDir, "Updates"); - private static string innoSetupPath = @"C:\Program Files (x86)\Inno Setup 5\ISCC.exe"; - private static string innoSetupScriptPath = Path.Combine(parentDir, "InnoSetup", "ShareX setup.iss"); + private static readonly string parentDir = @"..\..\..\"; + private static readonly string binDir = Path.Combine(parentDir, "ShareX", "bin"); + private static readonly string releaseDir = Path.Combine(binDir, "Release"); + private static readonly string debugDir = Path.Combine(binDir, "Debug"); + private static readonly string steamDir = Path.Combine(binDir, "Steam"); + private static readonly string debugPath = Path.Combine(debugDir, "ShareX.exe"); + private static readonly string outputDir = Path.Combine(parentDir, "InnoSetup", "Output"); + private static readonly string portableDir = Path.Combine(outputDir, "ShareX-portable"); + private static readonly string steamOutputDir = Path.Combine(outputDir, "ShareX"); + private static readonly string steamLauncherDir = Path.Combine(parentDir, @"..\ShareX_Steam\ShareX_Steam\bin\Release"); + private static readonly string steamUpdatesDir = Path.Combine(steamOutputDir, "Updates"); + private static readonly string chromeReleaseDir = Path.Combine(parentDir, @"..\ShareX_Chrome\ShareX_Chrome\bin\Release"); + private static readonly string innoSetupPath = @"C:\Program Files (x86)\Inno Setup 5\ISCC.exe"; + private static readonly string innoSetupScriptPath = Path.Combine(parentDir, "InnoSetup", "ShareX setup.iss"); private static string ReleaseDirectory => Setup == SetupType.Steam ? steamDir : releaseDir; @@ -135,21 +136,12 @@ private static void CreatePortable(string destination) Directory.CreateDirectory(destination); - List files = new List(); - - string[] endsWith = new string[] { "ShareX.exe", "ShareX.exe.config", ".dll", ".css", ".txt" }; - string[] ignoreEndsWith = new string[] { }; - - foreach (string filepath in Directory.GetFiles((ReleaseDirectory))) - { - if (endsWith.Any(x => filepath.EndsWith(x, StringComparison.InvariantCultureIgnoreCase)) && - ignoreEndsWith.All(x => !filepath.EndsWith(x, StringComparison.InvariantCultureIgnoreCase))) - { - files.Add(filepath); - } - } - - CopyFiles(files, destination); + CopyFile(Path.Combine(ReleaseDirectory, "ShareX.exe"), destination); + CopyFile(Path.Combine(ReleaseDirectory, "ShareX.exe.config"), destination); + CopyFiles(ReleaseDirectory, "*.dll", destination); + CopyFiles(Path.Combine(parentDir, "Licenses"), "*.txt", Path.Combine(destination, "Licenses")); + CopyFile(Path.Combine(outputDir, "Recorder-devices-setup.exe"), destination); + CopyFile(Path.Combine(chromeReleaseDir, "ShareX_Chrome.exe"), destination); string[] languages = new string[] { "de", "es", "fr", "hu", "ko-KR", "nl-NL", "pt-BR", "tr", "zh-CN" }; @@ -164,11 +156,7 @@ private static void CreatePortable(string destination) CopyFile(Path.Combine(parentDir, "Lib", "ffmpeg.exe"), destination); CopyFile(Path.Combine(parentDir, "Lib", "ffmpeg-x64.exe"), destination); } - - CopyFile(Path.Combine(outputDir, "Recorder-devices-setup.exe"), destination); - CopyFile(Path.Combine(parentDir, @"..\ShareX_Chrome\ShareX_Chrome\bin\Release\ShareX_Chrome.exe"), destination); - - if (Setup != SetupType.Steam) + else { File.WriteAllText(Path.Combine(destination, "PersonalPath.cfg"), "ShareX", Encoding.UTF8); @@ -192,7 +180,7 @@ private static void CreatePortable(string destination) Console.WriteLine("Portable created."); } - private static void CopyFiles(IEnumerable files, string toFolder) + private static void CopyFiles(string[] files, string toFolder) { if (!Directory.Exists(toFolder)) { diff --git a/ShareX.UploadersLib/Favicons/hubic.ico b/ShareX.UploadersLib/Favicons/hubic.ico deleted file mode 100644 index 94183cad1..000000000 Binary files a/ShareX.UploadersLib/Favicons/hubic.ico and /dev/null differ diff --git a/ShareX.UploadersLib/FileUploaders/FTP/FTPAdapter.cs b/ShareX.UploadersLib/FileUploaders/FTP/FTPAdapter.cs index ae24375d7..bc544dc41 100644 --- a/ShareX.UploadersLib/FileUploaders/FTP/FTPAdapter.cs +++ b/ShareX.UploadersLib/FileUploaders/FTP/FTPAdapter.cs @@ -413,7 +413,7 @@ public void WriteOutput(string text) { if (FTPOutput != null) { - FTPOutput(string.Format("{0} - {1}", FastDateTime.Now.ToLongTimeString(), text)); + FTPOutput(string.Format("{0} - {1}", DateTime.Now.ToLongTimeString(), text)); } } } @@ -500,7 +500,7 @@ public void SetDateTime(string year, string month, string day) if (year.Contains(":")) { time = year; - year = FastDateTime.Now.Year.ToString(); + year = DateTime.Now.Year.ToString(); TimeInfo = true; } diff --git a/ShareX.UploadersLib/FileUploaders/Hubic.cs b/ShareX.UploadersLib/FileUploaders/Hubic.cs deleted file mode 100644 index 69141f3d7..000000000 --- a/ShareX.UploadersLib/FileUploaders/Hubic.cs +++ /dev/null @@ -1,272 +0,0 @@ -#region License Information (GPL v3) - -/* - ShareX - A program that allows you to take screenshots and share any file type - Copyright (c) 2007-2015 ShareX Team - - This program is free software; you can redistribute it and/or - modify it under the terms of the GNU General Public License - as published by the Free Software Foundation; either version 2 - of the License, or (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - - Optionally you can also view the license at . -*/ - -#endregion License Information (GPL v3) - -using Newtonsoft.Json; -using ShareX.HelpersLib; -using ShareX.UploadersLib.HelperClasses; -using System; -using System.Collections.Generic; -using System.Collections.Specialized; -using System.IO; -using System.Text; - -namespace ShareX.UploadersLib.FileUploaders -{ - public sealed class Hubic : FileUploader, IOAuth2 - { - public OAuth2Info AuthInfo { get; set; } - public HubicOpenstackAuthInfo HubicOpenstackAuthInfo { get; set; } - public HubicFolderInfo SelectedFolder { get; set; } - public bool Publish { get; set; } - public static HubicFolderInfo RootFolder = new HubicFolderInfo - { - name = "" - }; - public const string Scope = @"usage.r,account.r,getAllLinks.r,credentials.r,sponsorCode.r,activate.w,sponsored.r,links.drw"; - public const string URLApi = @"https://api.hubic.com/1.0/account/credentials/"; - - public Hubic(OAuth2Info oauth, HubicOpenstackAuthInfo osauth) - { - AuthInfo = oauth; - HubicOpenstackAuthInfo = osauth; - } - - public string GetAuthorizationURL() - { - Dictionary args = new Dictionary(); - //Hubic only accepts https callback URL - args.Add("redirect_uri", Links.URL_CALLBACK); - args.Add("client_id", AuthInfo.Client_ID); - args.Add("scope", Scope); - args.Add("response_type", "code"); - - return CreateQuery("https://api.hubic.com/oauth/auth/", args); - } - - public bool GetAccessToken(string code) - { - Dictionary args = new Dictionary(); - args.Add("code", code); - //Hubic only accepts https callback URL - args.Add("redirect_uri", Links.URL_CALLBACK); - args.Add("grant_type", "authorization_code"); - - string response = SendRequest(HttpMethod.POST, "https://api.hubic.com/oauth/token/", args, GetAuthHeaders("Basic")); - - if (!string.IsNullOrEmpty(response)) - { - OAuth2Token token = JsonConvert.DeserializeObject(response); - - if (token != null && !string.IsNullOrEmpty(token.access_token)) - { - token.UpdateExpireDate(); - AuthInfo.Token = token; - GetHubicOpenStackAuthInfo(); - return true; - } - } - - return false; - } - - private NameValueCollection GetAuthHeaders(string headerType) - { - NameValueCollection headers = new NameValueCollection(); - switch (headerType) - { - case "Basic": - string secretInBase64 = Convert.ToBase64String(Encoding.UTF8.GetBytes(AuthInfo.Client_ID + ":" + AuthInfo.Client_Secret)); - headers["Authorization"] = headerType + " " + secretInBase64; - break; - case "Bearer": - headers["Authorization"] = headerType + " " + AuthInfo.Token.access_token; - break; - case "X-Auth-Token": - headers["X-Auth-Token"] = " " + HubicOpenstackAuthInfo.token; - headers["X-Detect-Content-Type"] = " " + "true"; - break; - } - return headers; - } - - public bool RefreshAccessToken() - { - if (OAuth2Info.CheckOAuth(AuthInfo) && !string.IsNullOrEmpty(AuthInfo.Token.refresh_token)) - { - Dictionary args = new Dictionary(); - args.Add("grant_type", "refresh_token"); - args.Add("refresh_token", AuthInfo.Token.refresh_token); - args.Add("client_id", AuthInfo.Client_ID); - args.Add("client_secret", AuthInfo.Client_Secret); - - string response = SendRequest(HttpMethod.POST, "https://api.hubic.com/oauth/token", args); - - if (!string.IsNullOrEmpty(response)) - { - OAuth2Token token = JsonConvert.DeserializeObject(response); - - if (token != null && !string.IsNullOrEmpty(token.access_token)) - { - token.UpdateExpireDate(); - AuthInfo.Token = token; - return true; - } - } - } - - return false; - } - - public bool CheckAuthorization() - { - if (OAuth2Info.CheckOAuth(AuthInfo)) - { - if (AuthInfo.Token.IsExpired && !RefreshAccessToken()) - { - Errors.Add("Refresh access token failed."); - return false; - } - } - else - { - Errors.Add("Hubic login is required."); - return false; - } - - return true; - } - - public void GetHubicOpenStackAuthInfo() - { - string response = SendRequest(HttpMethod.GET, URLApi, headers: GetAuthHeaders("Bearer")); - if (!string.IsNullOrEmpty(response)) - { - HubicOpenstackAuthInfo resp = JsonConvert.DeserializeObject(response); - HubicOpenstackAuthInfo.endpoint = resp.endpoint; - HubicOpenstackAuthInfo.expires = resp.expires; - HubicOpenstackAuthInfo.token = resp.token; - } - } - - public List GetFiles(HubicFolderInfo fileInfo) - { - if (!CheckAuthorization()) - { - return null; - } - - string response = SendRequest(HttpMethod.GET, HubicOpenstackAuthInfo.endpoint + "/default" + "/?path=" + fileInfo.name + "&format=json", headers: GetAuthHeaders("X-Auth-Token")); - - if (!string.IsNullOrEmpty(response)) - { - return JsonConvert.DeserializeObject>(response); - } - - return null; - } - - public override UploadResult Upload(Stream stream, string fileName) - { - if (!CheckAuthorization()) - { - return null; - } - - string url = URLHelpers.CombineURL(HubicOpenstackAuthInfo.endpoint, "default", SelectedFolder.path, fileName); - - NameValueCollection headers = new NameValueCollection(); - headers.Add("X-Auth-Token", HubicOpenstackAuthInfo.token); - headers.Add("X-Detect-Content-Type", "true"); - - UploadResult result = UploadData(stream, url, fileName, headers: headers, method: HttpMethod.PUT); - - if (Publish) - { - AllowReportProgress = false; - Dictionary args = new Dictionary(); - args.Add("comment", fileName); - args.Add("container", "default"); - args.Add("mode", "ro"); - args.Add("ttl", "30"); - args.Add("type", "file"); - args.Add("uri", "/" + SelectedFolder.path + "/" + fileName); - - string response = SendRequest(HttpMethod.POST, "https://api.hubic.com/1.0/account/links", args, GetAuthHeaders("Bearer")); - - if (!string.IsNullOrEmpty(response)) - { - HubicPublishURLResponse resp = JsonConvert.DeserializeObject(response); - string respURL = resp.indirectUrl; - result.IsURLExpected = true; - result.URL = respURL; - } - } - - return result; - } - } - - public class HubicOpenstackAuthInfo - { - public string token { get; set; } - public string endpoint { get; set; } - public string expires { get; set; } - } - - public class HubicFolderInfo - { - private string _name; - public string hash { get; set; } - public string last_modified { get; set; } - public int bytes { get; set; } - public string name - { - get - { - return _name; - } - set - { - //split the folder path and jsut store the folder name - path = value; - string[] temp = value.Split('/'); - _name = temp[temp.Length - 1]; - } - } - public string content_type { get; set; } - public string path { get; set; } - } - - public class HubicPublishURLResponse - { - public string indirectUrl { get; set; } - public string mode { get; set; } - public string container { get; set; } - public string expirationDate { get; set; } - public string creationDate { get; set; } - public string comment { get; set; } - public string type { get; set; } - } -} \ No newline at end of file diff --git a/ShareX.UploadersLib/FileUploaders/SendSpace.cs b/ShareX.UploadersLib/FileUploaders/SendSpace.cs index 6dae11be4..a0afd201d 100644 --- a/ShareX.UploadersLib/FileUploaders/SendSpace.cs +++ b/ShareX.UploadersLib/FileUploaders/SendSpace.cs @@ -511,7 +511,7 @@ private void bw_DoWork(object sender, DoWorkEventArgs e) DateTime time; while (!bw.CancellationPending) { - time = FastDateTime.Now; + time = DateTime.Now; try { progressInfo.ParseResponse(sendSpace.SendRequest(HttpMethod.POST, url)); @@ -526,7 +526,7 @@ private void bw_DoWork(object sender, DoWorkEventArgs e) catch { } - elapsed = (int)(FastDateTime.Now - time).TotalMilliseconds; + elapsed = (int)(DateTime.Now - time).TotalMilliseconds; if (elapsed < interval) { Thread.Sleep(interval - elapsed); diff --git a/ShareX.UploadersLib/FileUploaders/SendSpaceManager.cs b/ShareX.UploadersLib/FileUploaders/SendSpaceManager.cs index ebee297c8..95bddf25f 100644 --- a/ShareX.UploadersLib/FileUploaders/SendSpaceManager.cs +++ b/ShareX.UploadersLib/FileUploaders/SendSpaceManager.cs @@ -63,11 +63,11 @@ public static List PrepareUploadInfo(string apiKey, string username = nu Token = sendSpace.AuthCreateToken(); if (string.IsNullOrEmpty(Token)) throw new Exception("Token is null or empty."); } - if (string.IsNullOrEmpty(SessionKey) || (FastDateTime.Now - LastSessionKey).Minutes > 30) + if (string.IsNullOrEmpty(SessionKey) || (DateTime.Now - LastSessionKey).Minutes > 30) { SessionKey = sendSpace.AuthLogin(Token, username, password).SessionKey; if (string.IsNullOrEmpty(Token)) throw new Exception("SessionKey is null or empty."); - LastSessionKey = FastDateTime.Now; + LastSessionKey = DateTime.Now; } UploadInfo = sendSpace.UploadGetInfo(SessionKey); if (UploadInfo == null) throw new Exception("UploadInfo is null."); diff --git a/ShareX.UploadersLib/Forms/UploadersConfigForm.Designer.cs b/ShareX.UploadersLib/Forms/UploadersConfigForm.Designer.cs index 80fd0bf61..95e11bb47 100644 --- a/ShareX.UploadersLib/Forms/UploadersConfigForm.Designer.cs +++ b/ShareX.UploadersLib/Forms/UploadersConfigForm.Designer.cs @@ -191,14 +191,6 @@ private void InitializeComponent() this.lblCopyPath = new System.Windows.Forms.Label(); this.txtCopyPath = new System.Windows.Forms.TextBox(); this.oAuthCopy = new ShareX.UploadersLib.OAuthControl(); - this.tpHubic = new System.Windows.Forms.TabPage(); - this.cbHubicPublishLink = new System.Windows.Forms.CheckBox(); - this.lblHubicSelectedFolderNote = new System.Windows.Forms.Label(); - this.lvHubicFolders = new ShareX.HelpersLib.MyListView(); - this.chHubicFolderName = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader())); - this.lblHubicSelectedFolder = new System.Windows.Forms.Label(); - this.btnHubicRefreshFolders = new System.Windows.Forms.Button(); - this.oauth2Hubic = new ShareX.UploadersLib.OAuthControl(); this.tpAmazonS3 = new System.Windows.Forms.TabPage(); this.txtAmazonS3CustomDomain = new System.Windows.Forms.TextBox(); this.lblAmazonS3PathPreviewLabel = new System.Windows.Forms.Label(); @@ -474,7 +466,6 @@ private void InitializeComponent() this.tpBox.SuspendLayout(); this.tpCopy.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.pbCopyLogo)).BeginInit(); - this.tpHubic.SuspendLayout(); this.tpAmazonS3.SuspendLayout(); this.tpMega.SuspendLayout(); this.tpOwnCloud.SuspendLayout(); @@ -1323,7 +1314,6 @@ private void InitializeComponent() this.tcFileUploaders.Controls.Add(this.tpGoogleDrive); this.tcFileUploaders.Controls.Add(this.tpBox); this.tcFileUploaders.Controls.Add(this.tpCopy); - this.tcFileUploaders.Controls.Add(this.tpHubic); this.tcFileUploaders.Controls.Add(this.tpAmazonS3); this.tcFileUploaders.Controls.Add(this.tpMega); this.tcFileUploaders.Controls.Add(this.tpOwnCloud); @@ -1727,68 +1717,6 @@ private void InitializeComponent() this.oAuthCopy.CompleteButtonClicked += new ShareX.UploadersLib.OAuthControl.CompleteButtonClickedEventHandler(this.oAuthCopy_CompleteButtonClicked); this.oAuthCopy.ClearButtonClicked += new ShareX.UploadersLib.OAuthControl.ClearButtonclickedEventHandler(this.oAuthCopy_ClearButtonClicked); // - // tpHubic - // - this.tpHubic.Controls.Add(this.cbHubicPublishLink); - this.tpHubic.Controls.Add(this.lblHubicSelectedFolderNote); - this.tpHubic.Controls.Add(this.lvHubicFolders); - this.tpHubic.Controls.Add(this.lblHubicSelectedFolder); - this.tpHubic.Controls.Add(this.btnHubicRefreshFolders); - this.tpHubic.Controls.Add(this.oauth2Hubic); - resources.ApplyResources(this.tpHubic, "tpHubic"); - this.tpHubic.Name = "tpHubic"; - this.tpHubic.UseVisualStyleBackColor = true; - // - // cbHubicPublishLink - // - resources.ApplyResources(this.cbHubicPublishLink, "cbHubicPublishLink"); - this.cbHubicPublishLink.Name = "cbHubicPublishLink"; - this.cbHubicPublishLink.UseVisualStyleBackColor = true; - this.cbHubicPublishLink.CheckedChanged += new System.EventHandler(this.cbHubicPublishLink_CheckedChanged); - // - // lblHubicSelectedFolderNote - // - resources.ApplyResources(this.lblHubicSelectedFolderNote, "lblHubicSelectedFolderNote"); - this.lblHubicSelectedFolderNote.Name = "lblHubicSelectedFolderNote"; - // - // lvHubicFolders - // - this.lvHubicFolders.AutoFillColumn = true; - this.lvHubicFolders.Columns.AddRange(new System.Windows.Forms.ColumnHeader[] { - this.chHubicFolderName}); - this.lvHubicFolders.FullRowSelect = true; - resources.ApplyResources(this.lvHubicFolders, "lvHubicFolders"); - this.lvHubicFolders.Name = "lvHubicFolders"; - this.lvHubicFolders.UseCompatibleStateImageBehavior = false; - this.lvHubicFolders.View = System.Windows.Forms.View.Details; - this.lvHubicFolders.SelectedIndexChanged += new System.EventHandler(this.lvHubicFolders_SelectedIndexChanged); - this.lvHubicFolders.MouseDoubleClick += new System.Windows.Forms.MouseEventHandler(this.lvHubicFolders_MouseDoubleClick); - // - // chHubicFolderName - // - resources.ApplyResources(this.chHubicFolderName, "chHubicFolderName"); - // - // lblHubicSelectedFolder - // - resources.ApplyResources(this.lblHubicSelectedFolder, "lblHubicSelectedFolder"); - this.lblHubicSelectedFolder.Name = "lblHubicSelectedFolder"; - // - // btnHubicRefreshFolders - // - resources.ApplyResources(this.btnHubicRefreshFolders, "btnHubicRefreshFolders"); - this.btnHubicRefreshFolders.Name = "btnHubicRefreshFolders"; - this.btnHubicRefreshFolders.UseVisualStyleBackColor = true; - this.btnHubicRefreshFolders.Click += new System.EventHandler(this.btnHubicRefreshFolders_Click); - // - // oauth2Hubic - // - resources.ApplyResources(this.oauth2Hubic, "oauth2Hubic"); - this.oauth2Hubic.Name = "oauth2Hubic"; - this.oauth2Hubic.OpenButtonClicked += new ShareX.UploadersLib.OAuthControl.OpenButtonClickedEventHandler(this.oAuth2Hubic_OpenButtonClicked); - this.oauth2Hubic.CompleteButtonClicked += new ShareX.UploadersLib.OAuthControl.CompleteButtonClickedEventHandler(this.oAuth2Hubic_CompleteButtonClicked); - this.oauth2Hubic.ClearButtonClicked += new ShareX.UploadersLib.OAuthControl.ClearButtonclickedEventHandler(this.oAuth2Hubic_ClearButtonClicked); - this.oauth2Hubic.RefreshButtonClicked += new ShareX.UploadersLib.OAuthControl.RefreshButtonClickedEventHandler(this.oAuth2Hubic_RefreshButtonClicked); - // // tpAmazonS3 // this.tpAmazonS3.Controls.Add(this.txtAmazonS3CustomDomain); @@ -3617,8 +3545,6 @@ private void InitializeComponent() this.tpCopy.ResumeLayout(false); this.tpCopy.PerformLayout(); ((System.ComponentModel.ISupportInitialize)(this.pbCopyLogo)).EndInit(); - this.tpHubic.ResumeLayout(false); - this.tpHubic.PerformLayout(); this.tpAmazonS3.ResumeLayout(false); this.tpAmazonS3.PerformLayout(); this.tpMega.ResumeLayout(false); @@ -4070,14 +3996,6 @@ private void InitializeComponent() private System.Windows.Forms.CheckBox cbOneDriveCreateShareableLink; private System.Windows.Forms.Label lblOneDriveFolderID; private System.Windows.Forms.TreeView tvOneDrive; - private System.Windows.Forms.TabPage tpHubic; - private OAuthControl oauth2Hubic; - private System.Windows.Forms.Label lblHubicSelectedFolderNote; - private HelpersLib.MyListView lvHubicFolders; - private System.Windows.Forms.ColumnHeader chHubicFolderName; - private System.Windows.Forms.Label lblHubicSelectedFolder; - private System.Windows.Forms.Button btnHubicRefreshFolders; - private System.Windows.Forms.CheckBox cbHubicPublishLink; private System.Windows.Forms.TabPage tpLambda; private System.Windows.Forms.Label lblLambdaApiKey; private System.Windows.Forms.TextBox txtLambdaApiKey; diff --git a/ShareX.UploadersLib/Forms/UploadersConfigForm.cs b/ShareX.UploadersLib/Forms/UploadersConfigForm.cs index 9e11debe2..49d4049a2 100644 --- a/ShareX.UploadersLib/Forms/UploadersConfigForm.cs +++ b/ShareX.UploadersLib/Forms/UploadersConfigForm.cs @@ -77,7 +77,6 @@ private void FormSettings() AddIconToTab(tpBitly, Resources.Bitly); AddIconToTab(tpBox, Resources.Box); AddIconToTab(tpCopy, Resources.Copy); - AddIconToTab(tpHubic, Resources.Hubic); AddIconToTab(tpChevereto, Resources.Chevereto); AddIconToTab(tpCoinURL, Resources.CoinURL); AddIconToTab(tpCustomUploaders, Resources.globe_network); @@ -115,8 +114,6 @@ private void FormSettings() AddIconToTab(tpOneTimeSecret, Resources.OneTimeSecret); AddIconToTab(tpPolr, Resources.Polr); - tcFileUploaders.TabPages.Remove(tpHubic); - ttlvMain.ImageList = uploadersImageList; ttlvMain.MainTabControl = tcUploaders; ttlvMain.FocusListView(); @@ -368,16 +365,6 @@ public void LoadSettings() cbBoxShare.Checked = Config.BoxShare; lblBoxFolderID.Text = Resources.UploadersConfigForm_LoadSettings_Selected_folder_ + " " + Config.BoxSelectedFolder.name; - // Hubic - - if (OAuth2Info.CheckOAuth(Config.HubicOAuth2Info)) - { - oauth2Hubic.Status = OAuthLoginStatus.LoginSuccessful; - btnHubicRefreshFolders.Enabled = true; - } - - cbHubicPublishLink.Checked = Config.HubicPublish; - // Ge.tt if (Config.Ge_ttLogin != null && !string.IsNullOrEmpty(Config.Ge_ttLogin.AccessToken)) @@ -1174,69 +1161,6 @@ private void cbCopyURLType_SelectedIndexChanged(object sender, EventArgs e) #endregion Copy - #region Hubic - - private void oAuth2Hubic_OpenButtonClicked() - { - HubicAuthOpen(); - } - - private void oAuth2Hubic_CompleteButtonClicked(string code) - { - HubicAuthComplete(code); - } - - private void oAuth2Hubic_RefreshButtonClicked() - { - HubicAuthRefresh(); - } - - private void oAuth2Hubic_ClearButtonClicked() - { - Config.HubicOAuth2Info = null; - Config.HubicOpenstackAuthInfo = null; - } - - private void btnHubicRefreshFolders_Click(object sender, EventArgs e) - { - HubicListFolders(Hubic.RootFolder); - } - - private void lvHubicFolders_SelectedIndexChanged(object sender, EventArgs e) - { - if (lvHubicFolders.SelectedItems.Count > 0) - { - ListViewItem lvi = lvHubicFolders.SelectedItems[0]; - HubicFolderInfo folder = lvi.Tag as HubicFolderInfo; - if (folder != null) - { - lblHubicSelectedFolder.Text = Resources.UploadersConfigForm_LoadSettings_Selected_folder_ + " " + folder.name; - Config.HubicSelectedFolder = folder; - } - } - } - - private void lvHubicFolders_MouseDoubleClick(object sender, MouseEventArgs e) - { - if (e.Button == MouseButtons.Left && lvHubicFolders.SelectedItems.Count > 0) - { - ListViewItem lvi = lvHubicFolders.SelectedItems[0]; - HubicFolderInfo folder = lvi.Tag as HubicFolderInfo; - if (folder != null) - { - lvHubicFolders.Items.Clear(); - HubicListFolders(folder); - } - } - } - - private void cbHubicPublishLink_CheckedChanged(object sender, EventArgs e) - { - Config.HubicPublish = cbHubicPublishLink.Checked; - } - - #endregion Hubic - #region OneDrive private void oAuth2OneDrive_OpenButtonClicked() diff --git a/ShareX.UploadersLib/Forms/UploadersConfigForm.de.resx b/ShareX.UploadersLib/Forms/UploadersConfigForm.de.resx index 2e1af43e4..1dc4663d0 100644 --- a/ShareX.UploadersLib/Forms/UploadersConfigForm.de.resx +++ b/ShareX.UploadersLib/Forms/UploadersConfigForm.de.resx @@ -718,21 +718,6 @@ D.h., dass sie möglicherweise von Amazon S3 verloren gehen können. ausgewählter Ordner - - Ordnerliste erneuern - - - Teilbaren Link erstellen (gilt 30 Tage) - - - Ordnername - - - Ausgewählter Ordner: - - - Notiz: Du kannst den Namen 2x anklicken um in den Ordner zu gehen - API SchlĂĽssel: diff --git a/ShareX.UploadersLib/Forms/UploadersConfigForm.es.resx b/ShareX.UploadersLib/Forms/UploadersConfigForm.es.resx index 868cfe4c9..3de18a9dd 100644 --- a/ShareX.UploadersLib/Forms/UploadersConfigForm.es.resx +++ b/ShareX.UploadersLib/Forms/UploadersConfigForm.es.resx @@ -171,9 +171,6 @@ Refrescar lista de carpetas - - Refrescar lista de carpetas - Refrescar lista de carpetas @@ -317,9 +314,6 @@ Por ejemplo, si el balde se llama balde.ejemplo.com entonces URL será http://ba TĂ­tulo - - Nombre de la carpeta - DescripciĂłn @@ -347,9 +341,6 @@ Por ejemplo, si el balde se llama balde.ejemplo.com entonces URL será http://ba Confirmar antes de enviar - - Crear un enlace compartible (válido por 30 dĂ­as) - Subir imágenes al álbum seleccionado @@ -532,9 +523,6 @@ Esto significa que se pueden perder de Amazon S3 en algĂşn momento. Dominio personalizado: - - Carpeta seleccionada: - Nombre de usuario: @@ -730,9 +718,6 @@ Esto significa que se pueden perder de Amazon S3 en algĂşn momento. IdentificaciĂłn del álbum para subir (vacĂ­o = No subida álbum): - - Nota: Puede hacer doble clic en el nombre de carpeta para ir dentro de esa carpeta. - Si utiliza la carpeta "PĂşblico", una url compartible ya se generĂł. No es necesario activar la opciĂłn "Crear URL compartible". diff --git a/ShareX.UploadersLib/Forms/UploadersConfigForm.fr.resx b/ShareX.UploadersLib/Forms/UploadersConfigForm.fr.resx index 02e2e06b1..debcb665e 100644 --- a/ShareX.UploadersLib/Forms/UploadersConfigForm.fr.resx +++ b/ShareX.UploadersLib/Forms/UploadersConfigForm.fr.resx @@ -718,21 +718,6 @@ Cela signifie qu'ils peuvent ĂŞtre perdu d'Amazon S3 Ă  un certain moment. Utiliser le stockage de redondance rĂ©duite - - RafraĂ®chir la liste des dossiers - - - CrĂ©ation d'un lien de partage (valide pour 30 jours) - - - Nom du dossier - - - Dossier sĂ©lectionnĂ©: - - - Note: Vous pouvez double-cliquer sur le nom du dossier pour aller dedans. - Ajouter diff --git a/ShareX.UploadersLib/Forms/UploadersConfigForm.hu.resx b/ShareX.UploadersLib/Forms/UploadersConfigForm.hu.resx index 66aaaa420..0244f14bd 100644 --- a/ShareX.UploadersLib/Forms/UploadersConfigForm.hu.resx +++ b/ShareX.UploadersLib/Forms/UploadersConfigForm.hu.resx @@ -717,19 +717,4 @@ Ezzel az opciĂłval olcsĂłbb a tárolás, de csak 99.99% a rendelkezĂ©sreállás, Sablon - - Könyvtár neve - - - Kiválasztott mappa: - - - Könyvtár lista frissĂ­tĂ©se - - - MegosztĂł link kĂ©szĂ­tĂ©se (30 napig Ă©rvĂ©nyes) - - - MegjegyzĂ©s: duplán kattinthatsz a mappa nevĂ©re ha bele szeretnĂ©l lĂ©pni. - \ No newline at end of file diff --git a/ShareX.UploadersLib/Forms/UploadersConfigForm.ko-KR.resx b/ShareX.UploadersLib/Forms/UploadersConfigForm.ko-KR.resx index 856798fa0..3e5c41097 100644 --- a/ShareX.UploadersLib/Forms/UploadersConfigForm.ko-KR.resx +++ b/ShareX.UploadersLib/Forms/UploadersConfigForm.ko-KR.resx @@ -162,9 +162,6 @@ ě„ íťëś 폴더: - - ě„ íťëś 폴더: - ě„ íť... @@ -318,9 +315,6 @@ 커스텀 도메인: - - 참고: 폴더 이름을 더블í´ë¦­í•ë©´ ę·¸ 폴더 ě•ěśĽëˇś ë“¤ě–´ę° ě ěžěŠµë‹ë‹¤. - API 키: @@ -516,9 +510,6 @@ 제목 - - 폴더 이름 - 공개 업로드 @@ -534,9 +525,6 @@ 다이렉트 URL 사용í•ę¸° - - 공유 ë§í¬ 만들기 (30일간 유효) - 파일 이름을 포함í•ëŠ” 긴 ë§í¬ 사용í•ę¸° @@ -710,9 +698,6 @@ 인증 ě로고침í•ę¸° - - 폴더 목록 갱신 - 폴더 목록 갱신 diff --git a/ShareX.UploadersLib/Forms/UploadersConfigForm.nl-NL.resx b/ShareX.UploadersLib/Forms/UploadersConfigForm.nl-NL.resx index 886b90dd5..bc66c8787 100644 --- a/ShareX.UploadersLib/Forms/UploadersConfigForm.nl-NL.resx +++ b/ShareX.UploadersLib/Forms/UploadersConfigForm.nl-NL.resx @@ -198,9 +198,6 @@ Ververs mappenlijst - - Ververs mappenlijst - Inloggen @@ -307,9 +304,6 @@ De bestanden kunnen dus bij Amazon S3 verloren gaan op een bepaald punt. Upload bestanden naar geselecteerde map - - CreĂ«er een gedeelde link (geldig voor 30 dagen) - Is de upload publiek? @@ -355,9 +349,6 @@ De bestanden kunnen dus bij Amazon S3 verloren gaan op een bepaald punt. Titel - - Mapnaam - Beschrijving @@ -541,12 +532,6 @@ De bestanden kunnen dus bij Amazon S3 verloren gaan op een bepaald punt. Syntax markeren: - - Geselecteerde map: - - - Nota: Je kunt dubbelklikken om in de map te gaan. - Wachtwoord: diff --git a/ShareX.UploadersLib/Forms/UploadersConfigForm.pt-BR.resx b/ShareX.UploadersLib/Forms/UploadersConfigForm.pt-BR.resx index c54714031..8e76e04a0 100644 --- a/ShareX.UploadersLib/Forms/UploadersConfigForm.pt-BR.resx +++ b/ShareX.UploadersLib/Forms/UploadersConfigForm.pt-BR.resx @@ -201,9 +201,6 @@ Atualizar lista de pastas - - Atualizar lista de pastas - Logar @@ -297,7 +294,7 @@ Por exemplo, se o seu bucket Ă© chamado bucket.example.com entĂŁo o URL será ht Criar link compartilhável - URL Direto + URL direto Criar URL compartilhável: @@ -311,9 +308,6 @@ Por exemplo, se o seu bucket Ă© chamado bucket.example.com entĂŁo o URL será ht Enviar arquivos para pasta selecionada - - Criar link de compartilhamento (válido por 30 dias) - Upload pĂşblico? @@ -365,9 +359,6 @@ Por exemplo, se o seu bucket Ă© chamado bucket.example.com entĂŁo o URL será ht TĂ­tulo - - Nome da pasta - Descrição @@ -465,7 +456,7 @@ Por exemplo, se o seu bucket Ă© chamado bucket.example.com entĂŁo o URL será ht Tipo de URL: - URL de Remoção: + URL de remoção: Senha: @@ -563,9 +554,6 @@ Por exemplo, se o seu bucket Ă© chamado bucket.example.com entĂŁo o URL será ht Dominio personalizado: - - Pasta selecionada: - Senha: @@ -698,9 +686,6 @@ Por exemplo, se o seu bucket Ă© chamado bucket.example.com entĂŁo o URL será ht Caminho de upload: - - Dica: VocĂŞ pode clicar duas vezes no nome da pasta para abri-la. - Local: diff --git a/ShareX.UploadersLib/Forms/UploadersConfigForm.resx b/ShareX.UploadersLib/Forms/UploadersConfigForm.resx index 6effa5ed4..d99d2fe8f 100644 --- a/ShareX.UploadersLib/Forms/UploadersConfigForm.resx +++ b/ShareX.UploadersLib/Forms/UploadersConfigForm.resx @@ -208,237 +208,6 @@ For example, if your bucket is called bucket.example.com then URL will be http:/ 5 - - tcOtherUploaders - - - System.Windows.Forms.TabControl, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tpOtherUploaders - - - 0 - - - 4, 22 - - - 3, 3, 3, 3 - - - 986, 525 - - - 6 - - - Other uploaders - - - tpOtherUploaders - - - System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tcUploaders - - - 4 - - - tpTwitter - - - System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tcOtherUploaders - - - 0 - - - tpCustomUploaders - - - System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tcOtherUploaders - - - 1 - - - Fill - - - 3, 3 - - - 980, 519 - - - 0 - - - tcOtherUploaders - - - System.Windows.Forms.TabControl, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tpOtherUploaders - - - 0 - - - btnTwitterNameUpdate - - - System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tpTwitter - - - 0 - - - lbTwitterAccounts - - - System.Windows.Forms.ListBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tpTwitter - - - 1 - - - lblTwitterDefaultMessage - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tpTwitter - - - 2 - - - txtTwitterDefaultMessage - - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tpTwitter - - - 3 - - - cbTwitterSkipMessageBox - - - System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tpTwitter - - - 4 - - - oauthTwitter - - - ShareX.UploadersLib.OAuthControl, ShareX.UploadersLib, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - - - tpTwitter - - - 5 - - - txtTwitterDescription - - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tpTwitter - - - 6 - - - lblTwitterDescription - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tpTwitter - - - 7 - - - btnTwitterRemove - - - System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tpTwitter - - - 8 - - - btnTwitterAdd - - - System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tpTwitter - - - 9 - - - 4, 22 - - - 972, 493 - - - 0 - - - Twitter - @Invariant - - tpTwitter - - - System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tcOtherUploaders - - - 0 - NoControl @@ -706,440 +475,29 @@ For example, if your bucket is called bucket.example.com then URL will be http:/ 9 - - btnCustomUploaderExamples - - - System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tpCustomUploaders - - - 0 - - - btnCustomUploaderHelp - - - System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tpCustomUploaders - - - 1 - - - lblCustomUploaderImageUploader - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tpCustomUploaders - - - 2 - - - btnCustomUploaderFileUploaderTest - - - System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tpCustomUploaders - - - 3 - - - lblCustomUploaderFileUploader - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tpCustomUploaders - - - 4 - - - btnCustomUploaderImageUploaderTest - - - System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tpCustomUploaders - - - 5 - - - lblCustomUploaderTestResult - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tpCustomUploaders - - - 6 - - - txtCustomUploaderDeletionURL - - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tpCustomUploaders - - - 7 - - - cbCustomUploaderFileUploader - - - System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tpCustomUploaders - - - 8 - - - lblCustomUploaderDeletionURL - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tpCustomUploaders - - - 9 - - - btnCustomUploaderShowLastResponse - - - System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tpCustomUploaders - - - 10 - - - lblCustomUploaderResponseType - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tpCustomUploaders - - - 11 - - - cbCustomUploaderURLShortener - - - System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tpCustomUploaders - - - 12 - - - gbCustomUploaders - - - System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tpCustomUploaders - - - 13 - - - lblCustomUploaderTextUploader - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tpCustomUploaders - - - 14 - - - lblCustomUploaderRequestURL - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tpCustomUploaders - - - 15 - - - btnCustomUploaderURLShortenerTest - - - System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tpCustomUploaders - - - 16 - - - gbCustomUploaderRegexp - - - System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tpCustomUploaders - - - 17 - - - cbCustomUploaderTextUploader - - - System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tpCustomUploaders - - - 18 - - - txtCustomUploaderThumbnailURL - - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tpCustomUploaders - - - 19 - - - lblCustomUploaderURLShortener - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tpCustomUploaders - - - 20 - - - cbCustomUploaderResponseType - - - System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tpCustomUploaders - - - 21 - - - btnCustomUploaderTextUploaderTest - - - System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tpCustomUploaders - - - 22 - - - txtCustomUploaderURL - - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tpCustomUploaders - - - 23 - - - cbCustomUploaderImageUploader - - - System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tpCustomUploaders - - - 24 - - - txtCustomUploaderRequestURL - - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tpCustomUploaders - - - 25 - - - txtCustomUploaderLog - - - System.Windows.Forms.RichTextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tpCustomUploaders - - - 26 - - - lblCustomUploaderThumbnailURL - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tpCustomUploaders - - - 27 - - - lblCustomUploaderFileForm - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tpCustomUploaders - - - 28 - - - lblCustomUploaderRequestType - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tpCustomUploaders - - - 29 - - - cbCustomUploaderRequestType - - - System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tpCustomUploaders - - - 30 - - - txtCustomUploaderFileForm - - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tpCustomUploaders - - - 31 - - - lblCustomUploaderURL - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tpCustomUploaders - - - 32 - - - gbCustomUploaderArguments - - - System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tpCustomUploaders - - - 33 - - + 4, 22 - - 3, 3, 3, 3 - - + 972, 493 - - 5 + + 0 - - Custom uploaders + + Twitter + @Invariant + + tpTwitter - - tpCustomUploaders - - + System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + tcOtherUploaders - - 1 + + 0 NoControl @@ -1492,126 +850,6 @@ For example, if your bucket is called bucket.example.com then URL will be http:/ 12 - - btnCustomUploaderClearUploaders - - - System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - gbCustomUploaders - - - 0 - - - eiCustomUploaders - - - ShareX.HelpersLib.ExportImportControl, ShareX.HelpersLib, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - - - gbCustomUploaders - - - 1 - - - lbCustomUploaderList - - - System.Windows.Forms.ListBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - gbCustomUploaders - - - 2 - - - btnCustomUploaderClear - - - System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - gbCustomUploaders - - - 3 - - - btnCustomUploaderRemove - - - System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - gbCustomUploaders - - - 4 - - - btnCustomUploaderUpdate - - - System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - gbCustomUploaders - - - 5 - - - txtCustomUploaderName - - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - gbCustomUploaders - - - 6 - - - btnCustomUploaderAdd - - - System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - gbCustomUploaders - - - 7 - - - 8, 8 - - - 248, 312 - - - 0 - - - Uploaders - - - gbCustomUploaders - - - System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tpCustomUploaders - - - 13 - NoControl @@ -1813,6 +1051,30 @@ For example, if your bucket is called bucket.example.com then URL will be http:/ 7 + + 8, 8 + + + 248, 312 + + + 0 + + + Uploaders + + + gbCustomUploaders + + + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tpCustomUploaders + + + 13 + True @@ -1900,102 +1162,6 @@ For example, if your bucket is called bucket.example.com then URL will be http:/ 16 - - lblCustomUploaderRegexTip - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - gbCustomUploaderRegexp - - - 0 - - - btnCustomUploaderRegexpEdit - - - System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - gbCustomUploaderRegexp - - - 1 - - - txtCustomUploaderRegexp - - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - gbCustomUploaderRegexp - - - 2 - - - lvCustomUploaderRegexps - - - ShareX.HelpersLib.MyListView, ShareX.HelpersLib, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - - - gbCustomUploaderRegexp - - - 3 - - - btnCustomUploaderRegexpRemove - - - System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - gbCustomUploaderRegexp - - - 4 - - - btnCustomUploaderRegexpAdd - - - System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - gbCustomUploaderRegexp - - - 5 - - - 536, 56 - - - 248, 184 - - - 10 - - - Regex from response - - - gbCustomUploaderRegexp - - - System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tpCustomUploaders - - - 17 - True @@ -2074,6 +1240,9 @@ For example, if your bucket is called bucket.example.com then URL will be http:/ 2 + + 227 + 8, 72 @@ -2095,9 +1264,6 @@ For example, if your bucket is called bucket.example.com then URL will be http:/ 3 - - 227 - NoControl @@ -2152,6 +1318,30 @@ For example, if your bucket is called bucket.example.com then URL will be http:/ 5 + + 536, 56 + + + 248, 184 + + + 10 + + + Regex from response + + + gbCustomUploaderRegexp + + + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tpCustomUploaders + + + 17 + 8, 384 @@ -2521,102 +1711,6 @@ For example, if your bucket is called bucket.example.com then URL will be http:/ 32 - - btnCustomUploaderArgEdit - - - System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - gbCustomUploaderArguments - - - 0 - - - txtCustomUploaderArgValue - - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - gbCustomUploaderArguments - - - 1 - - - btnCustomUploaderArgRemove - - - System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - gbCustomUploaderArguments - - - 2 - - - lvCustomUploaderArguments - - - ShareX.HelpersLib.MyListView, ShareX.HelpersLib, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - - - gbCustomUploaderArguments - - - 3 - - - btnCustomUploaderArgAdd - - - System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - gbCustomUploaderArguments - - - 4 - - - txtCustomUploaderArgName - - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - gbCustomUploaderArguments - - - 5 - - - 272, 136 - - - 248, 232 - - - 7 - - - Arguments - - - gbCustomUploaderArguments - - - System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tpCustomUploaders - - - 33 - NoControl @@ -2692,6 +1786,18 @@ For example, if your bucket is called bucket.example.com then URL will be http:/ 2 + + Name + + + 114 + + + Value + + + 114 + 8, 72 @@ -2713,18 +1819,6 @@ For example, if your bucket is called bucket.example.com then URL will be http:/ 3 - - Name - - - 114 - - - Value - - - 114 - NoControl @@ -2773,512 +1867,107 @@ For example, if your bucket is called bucket.example.com then URL will be http:/ 5 - - txtBitlyDomain + + 272, 136 - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 248, 232 - - tpBitly - - - 0 - - - lblBitlyDomain - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tpBitly - - - 1 - - - oauth2Bitly - - - ShareX.UploadersLib.OAuthControl, ShareX.UploadersLib, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - - - tpBitly - - - 2 - - - 4, 22 - - - 3, 3, 3, 3 - - - 972, 493 - - - 1 - - - bit.ly - @Invariant - - tpBitly - - - System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tcURLShorteners - - - 0 - - - oauth2GoogleURLShortener - - - ShareX.UploadersLib.OAuthControl, ShareX.UploadersLib, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - - - tpGoogleURLShortener - - - 0 - - - atcGoogleURLShortenerAccountType - - - ShareX.UploadersLib.AccountTypeControl, ShareX.UploadersLib, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - - - tpGoogleURLShortener - - - 1 - - - 4, 22 - - - 3, 3, 3, 3 - - - 972, 493 - - - 0 - - - Google - @Invariant - - tpGoogleURLShortener - - - System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tcURLShorteners - - - 1 - - - txtYourlsPassword - - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tpYourls - - - 0 - - - txtYourlsUsername - - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tpYourls - - - 1 - - - txtYourlsSignature - - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tpYourls - - - 2 - - - lblYourlsNote - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tpYourls - - - 3 - - - lblYourlsPassword - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tpYourls - - - 4 - - - lblYourlsUsername - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tpYourls - - - 5 - - - lblYourlsSignature - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tpYourls - - - 6 - - - txtYourlsAPIURL - - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tpYourls - - + 7 - - lblYourlsAPIURL + + Arguments - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + gbCustomUploaderArguments - - tpYourls + + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 8 + + tpCustomUploaders - + + 33 + + 4, 22 - + 3, 3, 3, 3 - + 972, 493 - - 2 - - - YOURLS - @Invariant - - tpYourls - - - System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tcURLShorteners - - - 2 - - - llAdflyLink - - - System.Windows.Forms.LinkLabel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tpAdFly - - - 0 - - - txtAdflyAPIUID - - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tpAdFly - - - 1 - - - lblAdflyAPIUID - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tpAdFly - - - 2 - - - txtAdflyAPIKEY - - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tpAdFly - - - 3 - - - lblAdflyAPIKEY - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tpAdFly - - - 4 - - - 4, 22 - - - 3, 3, 3, 3 - - - 972, 493 - - - 3 - - - adf.ly - @Invariant - - tpAdFly - - - System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tcURLShorteners - - - 3 - - - txtCoinURLUUID - - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tpCoinURL - - - 0 - - - lblCoinURLUUID - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tpCoinURL - - - 1 - - - 4, 22 - - - 972, 493 - - + 5 - - CoinURL - @Invariant - - tpCoinURL + + Custom uploaders - + + tpCustomUploaders + + System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - tcURLShorteners + + tcOtherUploaders - - 4 - - - txtPolrAPIKey - - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tpPolr - - - 0 - - - lblPolrAPIKey - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tpPolr - - + 1 - - txtPolrAPIHostname - - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tpPolr - - - 2 - - - lblPolrAPIHostname - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tpPolr - - - 3 - - - 4, 22 - - - 972, 493 - - - 6 - - - Polr - @Invariant - - tpPolr - - - System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tcURLShorteners - - - 5 - - + Fill - + 3, 3 - + 980, 519 - + 0 - - tcURLShorteners + + tcOtherUploaders - + System.Windows.Forms.TabControl, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - tpURLShorteners + + tpOtherUploaders - + 0 - + 4, 22 - + 3, 3, 3, 3 - + 986, 525 - - 3 + + 6 - - URL shorteners + + Other uploaders - - tpURLShorteners + + tpOtherUploaders - + System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + tcUploaders - - 3 + + 4 16, 248 @@ -3352,6 +2041,33 @@ For example, if your bucket is called bucket.example.com then URL will be http:/ 2 + + 4, 22 + + + 3, 3, 3, 3 + + + 972, 493 + + + 1 + + + bit.ly + @Invariant + + tpBitly + + + System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tcURLShorteners + + + 0 + 16, 64 @@ -3394,6 +2110,33 @@ For example, if your bucket is called bucket.example.com then URL will be http:/ 1 + + 4, 22 + + + 3, 3, 3, 3 + + + 972, 493 + + + 0 + + + Google + @Invariant + + tpGoogleURLShortener + + + System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tcURLShorteners + + + 1 + 16, 200 @@ -3628,6 +2371,33 @@ For example, if your bucket is called bucket.example.com then URL will be http:/ 8 + + 4, 22 + + + 3, 3, 3, 3 + + + 972, 493 + + + 2 + + + YOURLS + @Invariant + + tpYourls + + + System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tcURLShorteners + + + 2 + True @@ -3760,6 +2530,33 @@ For example, if your bucket is called bucket.example.com then URL will be http:/ 4 + + 4, 22 + + + 3, 3, 3, 3 + + + 972, 493 + + + 3 + + + adf.ly + @Invariant + + tpAdFly + + + System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tcURLShorteners + + + 3 + 16, 32 @@ -3811,6 +2608,30 @@ For example, if your bucket is called bucket.example.com then URL will be http:/ 1 + + 4, 22 + + + 972, 493 + + + 5 + + + CoinURL + @Invariant + + tpCoinURL + + + System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tcURLShorteners + + + 4 + 16, 72 @@ -3913,455 +2734,80 @@ For example, if your bucket is called bucket.example.com then URL will be http:/ 3 - - tcFileUploaders - - - System.Windows.Forms.TabControl, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tpFileUploaders - - - 0 - - + 4, 22 - - 3, 3, 3, 3 + + 972, 493 - - 986, 525 - - - 2 - - - File uploaders - - - tpFileUploaders - - - System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tcUploaders - - - 2 - - - tpFTP - - - System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tcFileUploaders - - - 0 - - - tpDropbox - - - System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tcFileUploaders - - - 1 - - - tpOneDrive - - - System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tcFileUploaders - - - 2 - - - tpGoogleDrive - - - System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tcFileUploaders - - - 3 - - - tpBox - - - System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tcFileUploaders - - - 4 - - - tpCopy - - - System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tcFileUploaders - - - 5 - - - tpHubic - - - System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tcFileUploaders - - + 6 - - tpAmazonS3 + + Polr + @Invariant + + tpPolr - + System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - tcFileUploaders + + tcURLShorteners - - 7 + + 5 - - tpMega - - - System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tcFileUploaders - - - 8 - - - tpOwnCloud - - - System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tcFileUploaders - - - 9 - - - tpMediaFire - - - System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tcFileUploaders - - - 10 - - - tpPushbullet - - - System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tcFileUploaders - - - 11 - - - tpSendSpace - - - System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tcFileUploaders - - - 12 - - - tpGe_tt - - - System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tcFileUploaders - - - 13 - - - tpHostr - - - System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tcFileUploaders - - - 14 - - - tpMinus - - - System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tcFileUploaders - - - 15 - - - tpJira - - - System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tcFileUploaders - - - 16 - - - tpLambda - - - System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tcFileUploaders - - - 17 - - - tpUp1 - - - System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tcFileUploaders - - - 18 - - - tpEmail - - - System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tcFileUploaders - - - 19 - - - tpSharedFolder - - - System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tcFileUploaders - - - 20 - - + Fill - + 3, 3 - + 980, 519 - + 0 - - tcFileUploaders + + tcURLShorteners - + System.Windows.Forms.TabControl, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - tpFileUploaders + + tpURLShorteners - + 0 - - eiFTP + + 4, 22 - - ShareX.HelpersLib.ExportImportControl, ShareX.HelpersLib, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - - - tpFTP - - - 0 - - - btnFtpClient - - - System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tpFTP - - - 1 - - - lblFtpFiles - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tpFTP - - - 2 - - - lblFtpText - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tpFTP - - - 3 - - - lblFtpImages - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tpFTP - - - 4 - - - cboFtpImages - - - System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tpFTP - - - 5 - - - cboFtpFiles - - - System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tpFTP - - - 6 - - - cboFtpText - - - System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tpFTP - - - 7 - - - ucFTPAccounts - - - ShareX.UploadersLib.AccountsControl, ShareX.UploadersLib, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - - - tpFTP - - - 8 - - - 4, 40 - - + 3, 3, 3, 3 - - 972, 475 + + 986, 525 - - 4 + + 3 - - FTP - @Invariant - - tpFTP + + URL shorteners - + + tpURLShorteners + + System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - tcFileUploaders + + tcUploaders - - 0 + + 3 608, 48 @@ -4591,140 +3037,32 @@ For example, if your bucket is called bucket.example.com then URL will be http:/ 8 - - oauth2Dropbox - - - ShareX.UploadersLib.OAuthControl, ShareX.UploadersLib, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - - - tpDropbox - - - 0 - - - cbDropboxURLType - - - System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tpDropbox - - - 1 - - - cbDropboxAutoCreateShareableLink - - - System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tpDropbox - - - 2 - - - btnDropboxShowFiles - - - System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tpDropbox - - - 3 - - - pbDropboxLogo - - - System.Windows.Forms.PictureBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tpDropbox - - - 4 - - - lblDropboxStatus - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tpDropbox - - - 5 - - - lblDropboxPathTip - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tpDropbox - - - 6 - - - lblDropboxPath - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tpDropbox - - - 7 - - - txtDropboxPath - - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tpDropbox - - - 8 - - + 4, 40 - + 3, 3, 3, 3 - + 972, 475 - - 0 + + 4 - - Dropbox + + FTP @Invariant - - tpDropbox + + tpFTP - + System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + tcFileUploaders - - 1 + + 0 16, 88 @@ -5082,80 +3420,32 @@ For example, if your bucket is called bucket.example.com then URL will be http:/ 8 - - tvOneDrive - - - System.Windows.Forms.TreeView, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tpOneDrive - - - 0 - - - lblOneDriveFolderID - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tpOneDrive - - - 1 - - - cbOneDriveCreateShareableLink - - - System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tpOneDrive - - - 2 - - - oAuth2OneDrive - - - ShareX.UploadersLib.OAuthControl, ShareX.UploadersLib, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - - - tpOneDrive - - - 3 - - + 4, 40 - + 3, 3, 3, 3 - + 972, 475 - - 17 + + 0 - - OneDrive + + Dropbox @Invariant - - tpOneDrive + + tpDropbox - + System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + tcFileUploaders - - 2 + + 1 False @@ -5262,116 +3552,32 @@ For example, if your bucket is called bucket.example.com then URL will be http:/ 3 - - cbGoogleDriveUseFolder - - - System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tpGoogleDrive - - - 0 - - - txtGoogleDriveFolderID - - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tpGoogleDrive - - - 1 - - - lblGoogleDriveFolderID - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tpGoogleDrive - - - 2 - - - lvGoogleDriveFoldersList - - - ShareX.HelpersLib.MyListView, ShareX.HelpersLib, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - - - tpGoogleDrive - - - 3 - - - btnGoogleDriveRefreshFolders - - - System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tpGoogleDrive - - - 4 - - - cbGoogleDriveIsPublic - - - System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tpGoogleDrive - - - 5 - - - oauth2GoogleDrive - - - ShareX.UploadersLib.OAuthControl, ShareX.UploadersLib, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - - - tpGoogleDrive - - - 6 - - + 4, 40 - + 3, 3, 3, 3 - + 972, 475 - - 1 + + 17 - - Google Drive + + OneDrive @Invariant - - tpGoogleDrive + + tpOneDrive - + System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + tcFileUploaders - - 3 + + 2 True @@ -5454,6 +3660,18 @@ For example, if your bucket is called bucket.example.com then URL will be http:/ 2 + + Title + + + 200 + + + Description + + + 228 + 352, 112 @@ -5475,18 +3693,6 @@ For example, if your bucket is called bucket.example.com then URL will be http:/ 3 - - Title - - - 200 - - - Description - - - 228 - False @@ -5568,104 +3774,32 @@ For example, if your bucket is called bucket.example.com then URL will be http:/ 6 - - lblBoxFolderTip - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tpBox - - - 0 - - - cbBoxShare - - - System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tpBox - - - 1 - - - lvBoxFolders - - - ShareX.HelpersLib.MyListView, ShareX.HelpersLib, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - - - tpBox - - - 2 - - - lblBoxFolderID - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tpBox - - - 3 - - - btnBoxRefreshFolders - - - System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tpBox - - - 4 - - - oauth2Box - - - ShareX.UploadersLib.OAuthControl, ShareX.UploadersLib, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - - - tpBox - - - 5 - - + 4, 40 - + 3, 3, 3, 3 - + 972, 475 - - 2 + + 1 - - Box + + Google Drive @Invariant - - tpBox + + tpGoogleDrive - + System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + tcFileUploaders - - 4 + + 3 True @@ -5727,6 +3861,12 @@ For example, if your bucket is called bucket.example.com then URL will be http:/ 1 + + Folder name + + + 435 + 352, 72 @@ -5748,12 +3888,6 @@ For example, if your bucket is called bucket.example.com then URL will be http:/ 2 - - Folder name - - - 435 - True @@ -5835,116 +3969,32 @@ For example, if your bucket is called bucket.example.com then URL will be http:/ 5 - - pbCopyLogo - - - System.Windows.Forms.PictureBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tpCopy - - - 0 - - - lblCopyURLType - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tpCopy - - - 1 - - - cbCopyURLType - - - System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tpCopy - - - 2 - - - lblCopyStatus - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tpCopy - - - 3 - - - lblCopyPath - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tpCopy - - - 4 - - - txtCopyPath - - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tpCopy - - - 5 - - - oAuthCopy - - - ShareX.UploadersLib.OAuthControl, ShareX.UploadersLib, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - - - tpCopy - - - 6 - - + 4, 40 - + 3, 3, 3, 3 - + 972, 475 - - 0 + + 2 - - Copy + + Box @Invariant - - tpCopy + + tpBox - + System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + tcFileUploaders - - 5 + + 4 @@ -6213,480 +4263,33 @@ For example, if your bucket is called bucket.example.com then URL will be http:/ 6 - - cbHubicPublishLink - - - System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tpHubic - - - 0 - - - lblHubicSelectedFolderNote - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tpHubic - - - 1 - - - lvHubicFolders - - - ShareX.HelpersLib.MyListView, ShareX.HelpersLib, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - - - tpHubic - - - 2 - - - lblHubicSelectedFolder - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tpHubic - - - 3 - - - btnHubicRefreshFolders - - - System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tpHubic - - - 4 - - - oauth2Hubic - - - ShareX.UploadersLib.OAuthControl, ShareX.UploadersLib, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - - - tpHubic - - - 5 - - + 4, 40 - + 3, 3, 3, 3 - + 972, 475 - - 19 + + 0 - - hubiC + + Copy @Invariant - - tpHubic + + tpCopy - + System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + tcFileUploaders - - 6 - - - True - - - NoControl - - - 16, 256 - - - 191, 17 - - - 10 - - - Create share link (valid for 30 days) - - - cbHubicPublishLink - - - System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tpHubic - - - 0 - - - True - - - NoControl - - - 349, 425 - - - 304, 13 - - - 9 - - - Note: You can double click folder name to go inside that folder. - - - lblHubicSelectedFolderNote - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tpHubic - - - 1 - - - 352, 72 - - - 440, 344 - - - 8 - - - lvHubicFolders - - - ShareX.HelpersLib.MyListView, ShareX.HelpersLib, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - - - tpHubic - - - 2 - - - Folder name - - - 435 - - - True - - - NoControl - - - 349, 50 - - - 81, 13 - - - 7 - - - Selected folder: - - - lblHubicSelectedFolder - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tpHubic - - - 3 - - - False - - - NoControl - - - 352, 16 - - - 152, 23 - - - 6 - - - Refresh folders list - - - btnHubicRefreshFolders - - - System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tpHubic - - - 4 - - - 16, 16 - - - 326, 238 - - - 0 - - - oauth2Hubic - - - ShareX.UploadersLib.OAuthControl, ShareX.UploadersLib, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - - - tpHubic - - + 5 - - txtAmazonS3CustomDomain - - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tpAmazonS3 - - - 0 - - - lblAmazonS3PathPreviewLabel - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tpAmazonS3 - - - 1 - - - lblAmazonS3PathPreview - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tpAmazonS3 - - - 2 - - - btnAmazonS3BucketNameOpen - - - System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tpAmazonS3 - - - 3 - - - btnAmazonS3AccessKeyOpen - - - System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tpAmazonS3 - - - 4 - - - cbAmazonS3Endpoint - - - System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tpAmazonS3 - - - 6 - - - lblAmazonS3BucketName - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tpAmazonS3 - - - 7 - - - txtAmazonS3BucketName - - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tpAmazonS3 - - - 8 - - - lblAmazonS3Endpoint - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tpAmazonS3 - - - 9 - - - txtAmazonS3ObjectPrefix - - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tpAmazonS3 - - - 10 - - - lblAmazonS3ObjectPrefix - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tpAmazonS3 - - - 11 - - - txtAmazonS3SecretKey - - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tpAmazonS3 - - - 13 - - - lblAmazonS3SecretKey - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tpAmazonS3 - - - 14 - - - lblAmazonS3AccessKey - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tpAmazonS3 - - - 15 - - - txtAmazonS3AccessKey - - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tpAmazonS3 - - - 16 - - - 4, 40 - - - 3, 3, 3, 3 - - - 972, 475 - - - 13 - - - Amazon S3 - @Invariant - - tpAmazonS3 - - - System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tcFileUploaders - - - 7 - 16, 272 @@ -7077,161 +4680,32 @@ For example, if your bucket is called bucket.example.com then URL will be http:/ 16 - - btnMegaRefreshFolders - - - System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tpMega - - - 0 - - - lblMegaStatus - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tpMega - - - 1 - - - btnMegaRegister - - - System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tpMega - - - 2 - - - lblMegaFolder - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tpMega - - - 3 - - - lblMegaStatusTitle - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tpMega - - - 4 - - - cbMegaFolder - - - System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tpMega - - - 5 - - - lblMegaEmail - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tpMega - - - 6 - - - btnMegaLogin - - - System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tpMega - - - 7 - - - txtMegaEmail - - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tpMega - - - 8 - - - txtMegaPassword - - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tpMega - - - 9 - - - lblMegaPassword - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tpMega - - - 10 - - + 4, 40 - + + 3, 3, 3, 3 + + 972, 475 - - 12 + + 13 - - Mega + + Amazon S3 @Invariant - - tpMega + + tpAmazonS3 - + System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + tcFileUploaders - - 8 + + 6 NoControl @@ -7527,176 +5001,29 @@ For example, if your bucket is called bucket.example.com then URL will be http:/ 10 - - cbOwnCloud81Compatibility - - - System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tpOwnCloud - - - 0 - - - cbOwnCloudIgnoreInvalidCert - - - System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tpOwnCloud - - - 1 - - - cbOwnCloudDirectLink - - - System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tpOwnCloud - - - 2 - - - cbOwnCloudCreateShare - - - System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tpOwnCloud - - - 3 - - - txtOwnCloudPath - - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tpOwnCloud - - - 4 - - - txtOwnCloudPassword - - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tpOwnCloud - - - 5 - - - txtOwnCloudUsername - - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tpOwnCloud - - - 6 - - - txtOwnCloudHost - - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tpOwnCloud - - - 7 - - - lblOwnCloudPath - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tpOwnCloud - - - 8 - - - lblOwnCloudPassword - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tpOwnCloud - - - 9 - - - lblOwnCloudUsername - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tpOwnCloud - - - 10 - - - lblOwnCloudHost - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tpOwnCloud - - - 11 - - + 4, 40 - - 3, 3, 3, 3 - - + 972, 475 - - 15 + + 12 - - ownCloud + + Mega @Invariant - - tpOwnCloud + + tpMega - + System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + tcFileUploaders - - 9 + + 7 True @@ -8022,116 +5349,32 @@ For example, if your bucket is called bucket.example.com then URL will be http:/ 11 - - cbMediaFireUseLongLink - - - System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tpMediaFire - - - 0 - - - txtMediaFirePath - - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tpMediaFire - - - 1 - - - lblMediaFirePath - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tpMediaFire - - - 2 - - - txtMediaFirePassword - - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tpMediaFire - - - 3 - - - txtMediaFireEmail - - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tpMediaFire - - - 4 - - - lblMediaFirePassword - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tpMediaFire - - - 5 - - - lblMediaFireEmail - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tpMediaFire - - - 6 - - + 4, 40 - + 3, 3, 3, 3 - + 972, 475 - - 16 + + 15 - - MediaFire + + ownCloud @Invariant - - tpMediaFire + + tpOwnCloud - + System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + tcFileUploaders - - 10 + + 8 True @@ -8319,92 +5562,32 @@ For example, if your bucket is called bucket.example.com then URL will be http:/ 6 - - lblPushbulletDevices - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tpPushbullet - - - 0 - - - cboPushbulletDevices - - - System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tpPushbullet - - - 1 - - - btnPushbulletGetDeviceList - - - System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tpPushbullet - - - 2 - - - lblPushbulletUserKey - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tpPushbullet - - - 3 - - - txtPushbulletUserKey - - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tpPushbullet - - - 4 - - + 4, 40 - + 3, 3, 3, 3 - + 972, 475 - - 14 + + 16 - - Pushbullet + + MediaFire @Invariant - - tpPushbullet + + tpMediaFire - + System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + tcFileUploaders - - 11 + + 9 True @@ -8541,104 +5724,32 @@ For example, if your bucket is called bucket.example.com then URL will be http:/ 4 - - btnSendSpaceRegister - - - System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tpSendSpace - - - 0 - - - lblSendSpacePassword - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tpSendSpace - - - 1 - - - lblSendSpaceUsername - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tpSendSpace - - - 2 - - - txtSendSpacePassword - - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tpSendSpace - - - 3 - - - txtSendSpaceUserName - - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tpSendSpace - - - 4 - - - atcSendSpaceAccountType - - - ShareX.UploadersLib.AccountTypeControl, ShareX.UploadersLib, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - - - tpSendSpace - - - 5 - - + 4, 40 - + 3, 3, 3, 3 - + 972, 475 - - 6 + + 14 - - SendSpace + + Pushbullet @Invariant - - tpSendSpace + + tpPushbullet - + System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + tcFileUploaders - - 12 + + 10 NoControl @@ -8790,104 +5901,32 @@ For example, if your bucket is called bucket.example.com then URL will be http:/ 5 - - lblGe_ttStatus - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tpGe_tt - - - 0 - - - lblGe_ttPassword - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tpGe_tt - - - 1 - - - lblGe_ttEmail - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tpGe_tt - - - 2 - - - btnGe_ttLogin - - - System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tpGe_tt - - - 3 - - - txtGe_ttPassword - - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tpGe_tt - - - 4 - - - txtGe_ttEmail - - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tpGe_tt - - - 5 - - + 4, 40 - + 3, 3, 3, 3 - + 972, 475 - - 7 + + 6 - - Ge.tt + + SendSpace @Invariant - - tpGe_tt + + tpSendSpace - + System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + tcFileUploaders - - 13 + + 11 True @@ -9048,92 +6087,32 @@ For example, if your bucket is called bucket.example.com then URL will be http:/ 5 - - cbLocalhostrDirectURL - - - System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tpHostr - - - 0 - - - lblLocalhostrPassword - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tpHostr - - - 1 - - - lblLocalhostrEmail - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tpHostr - - - 2 - - - txtLocalhostrPassword - - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tpHostr - - - 3 - - - txtLocalhostrEmail - - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tpHostr - - - 4 - - + 4, 40 - + 3, 3, 3, 3 - + 972, 475 - - 8 + + 7 - - Hostr + + Ge.tt @Invariant - - tpHostr + + tpGe_tt - + System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + tcFileUploaders - - 14 + + 12 True @@ -9267,80 +6246,32 @@ For example, if your bucket is called bucket.example.com then URL will be http:/ 4 - - lblMinusURLType - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tpMinus - - - 0 - - - cbMinusURLType - - - System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tpMinus - - - 1 - - - gbMinusUserPass - - - System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tpMinus - - - 2 - - - gbMinusUpload - - - System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tpMinus - - - 3 - - + 4, 40 - + 3, 3, 3, 3 - + 972, 475 - - 3 + + 8 - - Minus + + Hostr @Invariant - - tpMinus + + tpHostr - + System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + tcFileUploaders - - 15 + + 13 True @@ -9393,114 +6324,6 @@ For example, if your bucket is called bucket.example.com then URL will be http:/ 1 - - lblMinusAuthStatus - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - gbMinusUserPass - - - 0 - - - btnMinusRefreshAuth - - - System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - gbMinusUserPass - - - 1 - - - lblMinusPassword - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - gbMinusUserPass - - - 2 - - - lblMinusUsername - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - gbMinusUserPass - - - 3 - - - txtMinusPassword - - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - gbMinusUserPass - - - 4 - - - txtMinusUsername - - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - gbMinusUserPass - - - 5 - - - btnMinusAuth - - - System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - gbMinusUserPass - - - 6 - - - 16, 16 - - - 712, 200 - - - 0 - - - Authentication - - - gbMinusUserPass - - - System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tpMinus - - - 2 - True @@ -9687,89 +6510,29 @@ For example, if your bucket is called bucket.example.com then URL will be http:/ 6 - - btnMinusReadFolderList + + 16, 16 - - System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 712, 200 - - gbMinusUpload - - + 0 - - chkMinusPublic + + Authentication - - System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + gbMinusUserPass - - gbMinusUpload - - - 1 - - - btnMinusFolderAdd - - - System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - gbMinusUpload - - - 2 - - - btnMinusFolderRemove - - - System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - gbMinusUpload - - - 3 - - - cboMinusFolders - - - System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - gbMinusUpload - - - 4 - - - 16, 224 - - - 712, 88 - - - 1 - - - Upload images to - - - gbMinusUpload - - + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + tpMinus - - 3 + + 2 True @@ -9909,77 +6672,56 @@ For example, if your bucket is called bucket.example.com then URL will be http:/ 4 - - txtJiraIssuePrefix + + 16, 224 - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 712, 88 - - tpJira - - - 0 - - - lblJiraIssuePrefix - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tpJira - - + 1 - - gpJiraServer + + Upload images to - + + gbMinusUpload + + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - tpJira + + tpMinus - - 2 - - - oAuthJira - - - ShareX.UploadersLib.OAuthControl, ShareX.UploadersLib, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - - - tpJira - - + 3 - + 4, 40 - + + 3, 3, 3, 3 + + 972, 475 - - 11 + + 3 - - Atlassian Jira + + Minus @Invariant - - tpJira + + tpMinus - + System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + tcFileUploaders - - 16 + + 14 472, 277 @@ -10035,66 +6777,6 @@ For example, if your bucket is called bucket.example.com then URL will be http:/ 1 - - txtJiraConfigHelp - - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - gpJiraServer - - - 0 - - - txtJiraHost - - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - gpJiraServer - - - 1 - - - lblJiraHost - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - gpJiraServer - - - 2 - - - 13, 13 - - - 451, 358 - - - 0 - - - Jira server - - - gpJiraServer - - - System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tpJira - - - 2 - 8, 64 @@ -10179,6 +6861,30 @@ For example, if your bucket is called bucket.example.com then URL will be http:/ 2 + + 13, 13 + + + 451, 358 + + + 0 + + + Jira server + + + gpJiraServer + + + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tpJira + + + 2 + 473, 13 @@ -10200,68 +6906,29 @@ For example, if your bucket is called bucket.example.com then URL will be http:/ 3 - - lblLambdaInfo - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tpLambda - - - 0 - - - lblLambdaApiKey - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tpLambda - - - 1 - - - txtLambdaApiKey - - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tpLambda - - - 2 - - + 4, 40 - - 3, 3, 3, 3 - - + 972, 475 - - 20 + + 11 - - Lambda + + Atlassian Jira @Invariant - - tpLambda + + tpJira - + System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + tcFileUploaders - - 17 + + 15 True @@ -10344,80 +7011,32 @@ For example, if your bucket is called bucket.example.com then URL will be http:/ 2 - - txtUp1Key - - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tpUp1 - - - 0 - - - txtUp1Host - - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tpUp1 - - - 1 - - - lblUp1Key - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tpUp1 - - - 2 - - - lblUp1Host - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tpUp1 - - - 3 - - + 4, 40 - + 3, 3, 3, 3 - + 972, 475 - - 21 + + 20 - - Up1 + + Lambda @Invariant - - tpUp1 + + tpLambda - + System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + tcFileUploaders - - 18 + + 16 16, 96 @@ -10533,200 +7152,32 @@ For example, if your bucket is called bucket.example.com then URL will be http:/ 3 - - chkEmailConfirm - - - System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tpEmail - - - 0 - - - lblEmailSmtpServer - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tpEmail - - - 1 - - - lblEmailPassword - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tpEmail - - - 2 - - - cbEmailRememberLastTo - - - System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tpEmail - - - 3 - - - txtEmailFrom - - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tpEmail - - - 4 - - - txtEmailPassword - - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tpEmail - - - 5 - - - txtEmailDefaultBody - - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tpEmail - - - 6 - - - lblEmailFrom - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tpEmail - - - 7 - - - txtEmailSmtpServer - - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tpEmail - - - 8 - - - lblEmailDefaultSubject - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tpEmail - - - 9 - - - lblEmailDefaultBody - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tpEmail - - - 10 - - - nudEmailSmtpPort - - - System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tpEmail - - - 11 - - - lblEmailSmtpPort - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tpEmail - - - 12 - - - txtEmailDefaultSubject - - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tpEmail - - - 13 - - + 4, 40 - + 3, 3, 3, 3 - + 972, 475 - - 10 + + 21 - - Email + + Up1 + @Invariant + + tpUp1 - - tpEmail - - + System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + tcFileUploaders - - 19 + + 17 True @@ -11100,116 +7551,32 @@ For example, if your bucket is called bucket.example.com then URL will be http:/ 13 - - lblSharedFolderFiles - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tpSharedFolder - - - 0 - - - lblSharedFolderText - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tpSharedFolder - - - 1 - - - cboSharedFolderFiles - - - System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tpSharedFolder - - - 2 - - - lblSharedFolderImages - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tpSharedFolder - - - 3 - - - cboSharedFolderText - - - System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tpSharedFolder - - - 4 - - - cboSharedFolderImages - - - System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tpSharedFolder - - - 5 - - - ucLocalhostAccounts - - - ShareX.UploadersLib.AccountsControl, ShareX.UploadersLib, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - - - tpSharedFolder - - - 6 - - + 4, 40 - + 3, 3, 3, 3 - + 972, 475 - - 9 + + 10 - - Shared folder + + Email - - tpSharedFolder + + tpEmail - + System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + tcFileUploaders - - 20 + + 18 True @@ -11391,6 +7758,84 @@ For example, if your bucket is called bucket.example.com then URL will be http:/ 6 + + 4, 40 + + + 3, 3, 3, 3 + + + 972, 475 + + + 9 + + + Shared folder + + + tpSharedFolder + + + System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tcFileUploaders + + + 19 + + + Fill + + + 3, 3 + + + 980, 519 + + + 0 + + + tcFileUploaders + + + System.Windows.Forms.TabControl, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tpFileUploaders + + + 0 + + + 4, 22 + + + 3, 3, 3, 3 + + + 986, 525 + + + 2 + + + File uploaders + + + tpFileUploaders + + + System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tcUploaders + + + 2 + NoControl @@ -11409,348 +7854,6 @@ For example, if your bucket is called bucket.example.com then URL will be http:/ System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - tcTextUploaders - - - System.Windows.Forms.TabControl, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tpTextUploaders - - - 0 - - - 4, 22 - - - 3, 3, 3, 3 - - - 986, 525 - - - 1 - - - Text uploaders - - - tpTextUploaders - - - System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tcUploaders - - - 1 - - - tpPastebin - - - System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tcTextUploaders - - - 0 - - - tpPaste_ee - - - System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tcTextUploaders - - - 1 - - - tpGist - - - System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tcTextUploaders - - - 2 - - - tpUpaste - - - System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tcTextUploaders - - - 3 - - - tpHastebin - - - System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tcTextUploaders - - - 4 - - - tpOneTimeSecret - - - System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tcTextUploaders - - - 5 - - - Fill - - - 3, 3 - - - 980, 519 - - - 0 - - - tcTextUploaders - - - System.Windows.Forms.TabControl, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tpTextUploaders - - - 0 - - - cbPastebinSyntax - - - System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tpPastebin - - - 0 - - - btnPastebinRegister - - - System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tpPastebin - - - 1 - - - lblPastebinSyntax - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tpPastebin - - - 2 - - - lblPastebinExpiration - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tpPastebin - - - 3 - - - lblPastebinPrivacy - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tpPastebin - - - 4 - - - lblPastebinTitle - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tpPastebin - - - 5 - - - lblPastebinPassword - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tpPastebin - - - 6 - - - lblPastebinUsername - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tpPastebin - - - 7 - - - cbPastebinExpiration - - - System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tpPastebin - - - 8 - - - cbPastebinPrivacy - - - System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tpPastebin - - - 9 - - - txtPastebinTitle - - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tpPastebin - - - 10 - - - txtPastebinPassword - - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tpPastebin - - - 11 - - - txtPastebinUsername - - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tpPastebin - - - 12 - - - lblPastebinLoginStatus - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tpPastebin - - - 13 - - - btnPastebinLogin - - - System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tpPastebin - - - 14 - - - 4, 22 - - - 3, 3, 3, 3 - - - 972, 493 - - - 0 - - - Pastebin - @Invariant - - tpPastebin - - - System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tcTextUploaders - - - 0 - 16, 240 @@ -12141,56 +8244,32 @@ For example, if your bucket is called bucket.example.com then URL will be http:/ 14 - - lblPaste_eeUserAPIKey - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tpPaste_ee - - - 0 - - - txtPaste_eeUserAPIKey - - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tpPaste_ee - - - 1 - - + 4, 22 - + 3, 3, 3, 3 - + 972, 493 - - 1 + + 0 - - Paste.ee + + Pastebin @Invariant - - tpPaste_ee + + tpPastebin - + System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + tcTextUploaders - - 1 + + 0 True @@ -12243,65 +8322,32 @@ For example, if your bucket is called bucket.example.com then URL will be http:/ 1 - - chkGistPublishPublic - - - System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tpGist - - - 0 - - - oAuth2Gist - - - ShareX.UploadersLib.OAuthControl, ShareX.UploadersLib, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - - - tpGist - - - 1 - - - atcGistAccountType - - - ShareX.UploadersLib.AccountTypeControl, ShareX.UploadersLib, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - - - tpGist - - - 2 - - + 4, 22 - + + 3, 3, 3, 3 + + 972, 493 - - 2 + + 1 - - Gist + + Paste.ee @Invariant - - tpGist + + tpPaste_ee - + System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + tcTextUploaders - - 2 + + 1 True @@ -12378,68 +8424,29 @@ For example, if your bucket is called bucket.example.com then URL will be http:/ 2 - - cbUpasteIsPublic - - - System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tpUpaste - - - 0 - - - lblUpasteUserKey - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tpUpaste - - - 1 - - - txtUpasteUserKey - - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tpUpaste - - - 2 - - + 4, 22 - - 3, 3, 3, 3 - - + 972, 493 - - 3 + + 2 - - uPaste + + Gist @Invariant - - tpUpaste + + tpGist - + System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + tcTextUploaders - - 3 + + 2 True @@ -12522,80 +8529,32 @@ For example, if your bucket is called bucket.example.com then URL will be http:/ 2 - - txtHastebinSyntaxHighlighting - - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tpHastebin - - - 0 - - - txtHastebinCustomDomain - - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tpHastebin - - - 1 - - - lblHastebinSyntaxHighlighting - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tpHastebin - - - 2 - - - lblHastebinCustomDomain - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tpHastebin - - - 3 - - + 4, 22 - + 3, 3, 3, 3 - + 972, 493 - - 4 + + 3 - - Hastebin + + uPaste @Invariant - - tpHastebin + + tpUpaste - + System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + tcTextUploaders - - 4 + + 3 16, 80 @@ -12699,80 +8658,32 @@ For example, if your bucket is called bucket.example.com then URL will be http:/ 3 - - lblOneTimeSecretAPIKey - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tpOneTimeSecret - - - 0 - - - lblOneTimeSecretEmail - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tpOneTimeSecret - - - 1 - - - txtOneTimeSecretAPIKey - - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tpOneTimeSecret - - - 2 - - - txtOneTimeSecretEmail - - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tpOneTimeSecret - - - 3 - - + 4, 22 - + 3, 3, 3, 3 - + 972, 493 - - 5 + + 4 - - OneTimeSecret + + Hastebin @Invariant - - tpOneTimeSecret + + tpHastebin - + System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + tcTextUploaders - - 5 + + 4 True @@ -12876,291 +8787,84 @@ For example, if your bucket is called bucket.example.com then URL will be http:/ 3 - - tcImageUploaders - - - System.Windows.Forms.TabControl, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tpImageUploaders - - - 0 - - + 4, 22 - + 3, 3, 3, 3 - - 986, 525 - - - 0 - - - Image uploaders - - - tpImageUploaders - - - System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tcUploaders - - - 0 - - - tpImgur - - - System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tcImageUploaders - - - 0 - - - tpImageShack - - - System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tcImageUploaders - - - 1 - - - tpTinyPic - - - System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tcImageUploaders - - - 2 - - - tpFlickr - - - System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tcImageUploaders - - - 3 - - - tpPhotobucket - - - System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tcImageUploaders - - - 4 - - - tpPicasa - - - System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tcImageUploaders - - - 5 - - - tpChevereto - - - System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tcImageUploaders - - - 6 - - - Fill - - - 3, 3 - - - 780, 480 - - - 980, 519 - - - 0 - - - tcImageUploaders - - - System.Windows.Forms.TabControl, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tpImageUploaders - - - 0 - - - cbImgurUseGIFV - - - System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tpImgur - - - 0 - - - cbImgurUploadSelectedAlbum - - - System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tpImgur - - - 1 - - - cbImgurDirectLink - - - System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tpImgur - - - 2 - - - atcImgurAccountType - - - ShareX.UploadersLib.AccountTypeControl, ShareX.UploadersLib, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - - - tpImgur - - - 3 - - - oauth2Imgur - - - ShareX.UploadersLib.OAuthControl, ShareX.UploadersLib, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - - - tpImgur - - - 4 - - - lvImgurAlbumList - - - System.Windows.Forms.ListView, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tpImgur - - - 5 - - - btnImgurRefreshAlbumList - - - System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tpImgur - - - 6 - - - cbImgurThumbnailType - - - System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tpImgur - - - 7 - - - lblImgurThumbnailType - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tpImgur - - - 8 - - - 4, 22 - - - 3, 3, 3, 3 - - + 972, 493 - - 2 + + 5 - - Imgur + + OneTimeSecret @Invariant - - tpImgur + + tpOneTimeSecret - + System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - tcImageUploaders + + tcTextUploaders - + + 5 + + + Fill + + + 3, 3 + + + 980, 519 + + 0 + + tcTextUploaders + + + System.Windows.Forms.TabControl, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tpTextUploaders + + + 0 + + + 4, 22 + + + 3, 3, 3, 3 + + + 986, 525 + + + 1 + + + Text uploaders + + + tpTextUploaders + + + System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tcUploaders + + + 1 + True @@ -13293,6 +8997,21 @@ For example, if your bucket is called bucket.example.com then URL will be http:/ 4 + + ID + @Invariant + + Title + + + 150 + + + Description + + + 226 + 352, 48 @@ -13314,21 +9033,6 @@ For example, if your bucket is called bucket.example.com then URL will be http:/ 5 - - ID - @Invariant - - Title - - - 150 - - - Description - - - 226 - False @@ -13410,128 +9114,32 @@ For example, if your bucket is called bucket.example.com then URL will be http:/ 8 - - btnImageShackLogin - - - System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tpImageShack - - - 0 - - - btnImageShackOpenPublicProfile - - - System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tpImageShack - - - 1 - - - cbImageShackIsPublic - - - System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tpImageShack - - - 2 - - - btnImageShackOpenMyImages - - - System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tpImageShack - - - 3 - - - lblImageShackUsername - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tpImageShack - - - 4 - - - txtImageShackUsername - - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tpImageShack - - - 5 - - - txtImageShackPassword - - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tpImageShack - - - 6 - - - lblImageShackPassword - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tpImageShack - - - 7 - - + 4, 22 - + 3, 3, 3, 3 - + 972, 493 - - 0 + + 2 - - ImageShack + + Imgur @Invariant - - tpImageShack + + tpImgur - + System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + tcImageUploaders - - 1 + + 0 NoControl @@ -13746,116 +9354,32 @@ For example, if your bucket is called bucket.example.com then URL will be http:/ 7 - - atcTinyPicAccountType - - - ShareX.UploadersLib.AccountTypeControl, ShareX.UploadersLib, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - - - tpTinyPic - - - 0 - - - btnTinyPicLogin - - - System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tpTinyPic - - - 1 - - - txtTinyPicPassword - - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tpTinyPic - - - 2 - - - lblTinyPicPassword - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tpTinyPic - - - 3 - - - txtTinyPicUsername - - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tpTinyPic - - - 4 - - - lblTinyPicUsername - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tpTinyPic - - - 5 - - - btnTinyPicOpenMyImages - - - System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tpTinyPic - - - 6 - - + 4, 22 - + 3, 3, 3, 3 - + 972, 493 - - 1 + + 0 - - TinyPic + + ImageShack @Invariant - - tpTinyPic + + tpImageShack - + System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + tcImageUploaders - - 2 + + 1 16, 16 @@ -14034,104 +9558,32 @@ For example, if your bucket is called bucket.example.com then URL will be http:/ 6 - - btnFlickrOpenImages - - - System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tpFlickr - - - 0 - - - pgFlickrAuthInfo - - - System.Windows.Forms.PropertyGrid, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tpFlickr - - - 1 - - - pgFlickrSettings - - - System.Windows.Forms.PropertyGrid, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tpFlickr - - - 2 - - - btnFlickrCheckToken - - - System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tpFlickr - - - 3 - - - btnFlickrCompleteAuth - - - System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tpFlickr - - - 4 - - - btnFlickrOpenAuthorize - - - System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tpFlickr - - - 5 - - + 4, 22 - + 3, 3, 3, 3 - + 972, 493 - - 3 + + 1 - - Flickr + + TinyPic @Invariant - - tpFlickr + + tpTinyPic - + System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + tcImageUploaders - - 3 + + 2 NoControl @@ -14286,128 +9738,32 @@ For example, if your bucket is called bucket.example.com then URL will be http:/ 5 - - gbPhotobucketAlbumPath - - - System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tpPhotobucket - - - 0 - - - gbPhotobucketAlbums - - - System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tpPhotobucket - - - 1 - - - gbPhotobucketUserAccount - - - System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tpPhotobucket - - - 2 - - + 4, 22 - + 3, 3, 3, 3 - + 972, 493 - - 4 + + 3 - - Photobucket + + Flickr @Invariant - - tpPhotobucket + + tpFlickr - + System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + tcImageUploaders - - 4 - - - btnPhotobucketAddAlbum - - - System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - gbPhotobucketAlbumPath - - - 0 - - - btnPhotobucketRemoveAlbum - - - System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - gbPhotobucketAlbumPath - - - 1 - - - cboPhotobucketAlbumPaths - - - System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - gbPhotobucketAlbumPath - - - 2 - - - 16, 208 - - - 712, 64 - - - 1 - - - Upload images to - - - gbPhotobucketAlbumPath - - - System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tpPhotobucket - - - 0 + + 3 NoControl @@ -14487,89 +9843,29 @@ For example, if your bucket is called bucket.example.com then URL will be http:/ 2 - - lblPhotobucketNewAlbumName + + 16, 208 - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 712, 64 - - gbPhotobucketAlbums - - - 0 - - - lblPhotobucketParentAlbumPath - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - gbPhotobucketAlbums - - + 1 - - txtPhotobucketNewAlbumName + + Upload images to - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + gbPhotobucketAlbumPath - - gbPhotobucketAlbums - - - 2 - - - txtPhotobucketParentAlbumPath - - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - gbPhotobucketAlbums - - - 3 - - - btnPhotobucketCreateAlbum - - - System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - gbPhotobucketAlbums - - - 4 - - - 16, 280 - - - 712, 128 - - - 2 - - - Create new album - - - gbPhotobucketAlbums - - + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + tpPhotobucket - - 1 + + 0 True @@ -14700,113 +9996,29 @@ For example, if your bucket is called bucket.example.com then URL will be http:/ 4 - - lblPhotobucketDefaultAlbumName + + 16, 280 - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 712, 128 - - gbPhotobucketUserAccount - - - 0 - - - btnPhotobucketAuthOpen - - - System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - gbPhotobucketUserAccount - - - 1 - - - txtPhotobucketDefaultAlbumName - - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - gbPhotobucketUserAccount - - + 2 - - lblPhotobucketVerificationCode + + Create new album - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + gbPhotobucketAlbums - - gbPhotobucketUserAccount - - - 3 - - - btnPhotobucketAuthComplete - - - System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - gbPhotobucketUserAccount - - - 4 - - - txtPhotobucketVerificationCode - - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - gbPhotobucketUserAccount - - - 5 - - - lblPhotobucketAccountStatus - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - gbPhotobucketUserAccount - - - 6 - - - 16, 16 - - - 712, 184 - - - 0 - - - User account - - - gbPhotobucketUserAccount - - + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + tpPhotobucket - - 2 + + 1 True @@ -14994,92 +10206,56 @@ For example, if your bucket is called bucket.example.com then URL will be http:/ 6 - - txtPicasaAlbumID + + 16, 16 - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 712, 184 - - tpPicasa - - + 0 - - lblPicasaAlbumID + + User account - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + gbPhotobucketUserAccount - - tpPicasa + + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 1 + + tpPhotobucket - - lvPicasaAlbumList - - - System.Windows.Forms.ListView, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tpPicasa - - + 2 - - btnPicasaRefreshAlbumList - - - System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tpPicasa - - - 3 - - - oauth2Picasa - - - ShareX.UploadersLib.OAuthControl, ShareX.UploadersLib, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - - - tpPicasa - - - 4 - - + 4, 22 - + 3, 3, 3, 3 - + 972, 493 - - 8 + + 4 - - Picasa + + Photobucket @Invariant - - tpPicasa + + tpPhotobucket - + System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + tcImageUploaders - - 5 + + 4 352, 64 @@ -15132,6 +10308,24 @@ For example, if your bucket is called bucket.example.com then URL will be http:/ 1 + + ID + @Invariant + + 135 + + + Name + + + 150 + + + Description + + + 143 + 352, 88 @@ -15153,24 +10347,6 @@ For example, if your bucket is called bucket.example.com then URL will be http:/ 2 - - ID - @Invariant - - 135 - - - Name - - - 150 - - - Description - - - 143 - False @@ -15222,104 +10398,32 @@ For example, if your bucket is called bucket.example.com then URL will be http:/ 4 - - cbCheveretoDirectURL - - - System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tpChevereto - - - 0 - - - lblCheveretoWebsiteTip - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tpChevereto - - - 1 - - - lblCheveretoWebsite - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tpChevereto - - - 2 - - - txtCheveretoWebsite - - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tpChevereto - - - 3 - - - txtCheveretoAPIKey - - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tpChevereto - - - 4 - - - lblCheveretoAPIKey - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tpChevereto - - - 5 - - + 4, 22 - + 3, 3, 3, 3 - + 972, 493 - - 9 + + 8 - - Chevereto + + Picasa @Invariant - - tpChevereto + + tpPicasa - + System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + tcImageUploaders - - 6 + + 5 True @@ -15483,6 +10587,87 @@ For example, if your bucket is called bucket.example.com then URL will be http:/ 5 + + 4, 22 + + + 3, 3, 3, 3 + + + 972, 493 + + + 9 + + + Chevereto + @Invariant + + tpChevereto + + + System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tcImageUploaders + + + 6 + + + Fill + + + 3, 3 + + + 780, 480 + + + 980, 519 + + + 0 + + + tcImageUploaders + + + System.Windows.Forms.TabControl, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tpImageUploaders + + + 0 + + + 4, 22 + + + 3, 3, 3, 3 + + + 986, 525 + + + 0 + + + Image uploaders + + + tpImageUploaders + + + System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tcUploaders + + + 0 + Fill @@ -15645,12 +10830,6 @@ For example, if your bucket is called bucket.example.com then URL will be http:/ System.Windows.Forms.ColumnHeader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - chHubicFolderName - - - System.Windows.Forms.ColumnHeader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - chImgurID diff --git a/ShareX.UploadersLib/Forms/UploadersConfigForm.tr.resx b/ShareX.UploadersLib/Forms/UploadersConfigForm.tr.resx index 0fee54ce4..c75ce3ca3 100644 --- a/ShareX.UploadersLib/Forms/UploadersConfigForm.tr.resx +++ b/ShareX.UploadersLib/Forms/UploadersConfigForm.tr.resx @@ -716,21 +716,6 @@ Bir baĹźka deyiĹźle Amazon S3'den bazı durumlarda kaybolabilirler. Seçili dizin: - - Dizin listesini yenile - - - Paylaşılabilir link oluĹźtur (30 gĂĽn geçerli) - - - Dizin adı - - - SeçilmiĹź dizin: - - - Not: Dizin içine gitmek için dizin adına çift tıklayabilirsiniz. - API anahtarını almak için Lambda sitesine giriĹź yapın https://lambda.sx/ adresinden ve saÄź ĂĽstteki diĹźli tuĹźuna basın. diff --git a/ShareX.UploadersLib/Forms/UploadersConfigForm.zh-CN.resx b/ShareX.UploadersLib/Forms/UploadersConfigForm.zh-CN.resx index 0fc11c9ea..b297be0e5 100644 --- a/ShareX.UploadersLib/Forms/UploadersConfigForm.zh-CN.resx +++ b/ShareX.UploadersLib/Forms/UploadersConfigForm.zh-CN.resx @@ -718,19 +718,4 @@ 模板 - - ĺ·ć–°ć–‡ä»¶ĺ¤ąĺ—表 - - - ĺ›ĺ»şĺ…±äş«é“ľćŽĄďĽćś‰ć•ćśź30天） - - - 文件夹ĺŤç§° - - - 选定的文件夹: - - - 注意: 您可以双击文件夹ĺŤç§°čż›ĺ…ĄčŻĄć–‡ä»¶ĺ¤ąĺ†…. - \ No newline at end of file diff --git a/ShareX.UploadersLib/Forms/UploadersConfigFormHelper.cs b/ShareX.UploadersLib/Forms/UploadersConfigFormHelper.cs index 20ec23e37..aaedd32c4 100644 --- a/ShareX.UploadersLib/Forms/UploadersConfigFormHelper.cs +++ b/ShareX.UploadersLib/Forms/UploadersConfigFormHelper.cs @@ -883,122 +883,6 @@ private void BoxAddFolder(BoxFileEntry folder) #endregion Box - #region Hubic - - public void HubicAuthOpen() - { - try - { - OAuth2Info oauth = new OAuth2Info(APIKeys.HubicClientID, APIKeys.HubicClientSecret); - HubicOpenstackAuthInfo osauth = new HubicOpenstackAuthInfo(); - - string url = new Hubic(oauth, osauth).GetAuthorizationURL(); - - if (!string.IsNullOrEmpty(url)) - { - Config.HubicOAuth2Info = oauth; - Config.HubicOpenstackAuthInfo = osauth; - URLHelpers.OpenURL(url); - DebugHelper.WriteLine("HubicAuthOpen - Authorization URL is opened: " + url); - } - else - { - DebugHelper.WriteLine("HubicAuthOpen - Authorization URL is empty."); - } - } - catch (Exception ex) - { - MessageBox.Show(ex.ToString(), Resources.UploadersConfigForm_Error, MessageBoxButtons.OK, MessageBoxIcon.Error); - } - } - - public void HubicAuthComplete(string code) - { - try - { - if (!string.IsNullOrEmpty(code) && Config.HubicOAuth2Info != null) - { - bool result = new Hubic(Config.HubicOAuth2Info, Config.HubicOpenstackAuthInfo).GetAccessToken(code); - - if (result) - { - oauth2Hubic.Status = OAuthLoginStatus.LoginSuccessful; - MessageBox.Show(Resources.UploadersConfigForm_Login_successful, "ShareX", MessageBoxButtons.OK, MessageBoxIcon.Information); - } - else - { - oauth2Hubic.Status = OAuthLoginStatus.LoginFailed; - MessageBox.Show(Resources.UploadersConfigForm_Login_failed, "ShareX", MessageBoxButtons.OK, MessageBoxIcon.Error); - } - - btnHubicRefreshFolders.Enabled = result; - btnHubicRefreshFolders.PerformClick(); - } - } - catch (Exception ex) - { - MessageBox.Show(ex.ToString(), Resources.UploadersConfigForm_Error, MessageBoxButtons.OK, MessageBoxIcon.Error); - } - } - - public void HubicAuthRefresh() - { - try - { - if (OAuth2Info.CheckOAuth(Config.HubicOAuth2Info)) - { - bool result = new Hubic(Config.HubicOAuth2Info, Config.HubicOpenstackAuthInfo).RefreshAccessToken(); - - if (result) - { - oauth2Hubic.Status = OAuthLoginStatus.LoginSuccessful; - MessageBox.Show(Resources.UploadersConfigForm_Login_successful, "ShareX", MessageBoxButtons.OK, MessageBoxIcon.Information); - } - else - { - oauth2Hubic.Status = OAuthLoginStatus.LoginFailed; - MessageBox.Show(Resources.UploadersConfigForm_Login_failed, "ShareX", MessageBoxButtons.OK, MessageBoxIcon.Error); - } - } - } - catch (Exception ex) - { - MessageBox.Show(ex.ToString(), Resources.UploadersConfigForm_Error, MessageBoxButtons.OK, MessageBoxIcon.Error); - } - } - - public void HubicListFolders(HubicFolderInfo fileInfo) - { - lvHubicFolders.Items.Clear(); - - if (!OAuth2Info.CheckOAuth(Config.HubicOAuth2Info)) - { - MessageBox.Show(Resources.UploadersConfigForm_ListFolders_Authentication_required_, Resources.UploadersConfigForm_HubicListFolders_Hubic_refresh_folders_list_failed, - MessageBoxButtons.OK, MessageBoxIcon.Warning); - } - else - { - Hubic hubic = new Hubic(Config.HubicOAuth2Info, Config.HubicOpenstackAuthInfo); - List folders = hubic.GetFiles(fileInfo); - if (folders != null && folders.Count != 0) - { - foreach (HubicFolderInfo folder in folders.Where(x => x.content_type == "application/directory" && x.name[0] != '.')) - { - HubicAddFolder(folder); - } - } - } - } - - private void HubicAddFolder(HubicFolderInfo folder) - { - ListViewItem lvi = new ListViewItem(folder.name); - lvi.Tag = folder; - lvHubicFolders.Items.Add(lvi); - } - - #endregion Hubic - #region OneDrive public void OneDriveAuthOpen() diff --git a/ShareX.UploadersLib/HelperClasses/TCPClient.cs b/ShareX.UploadersLib/HelperClasses/TCPClient.cs index c1bae011a..cd708119f 100644 --- a/ShareX.UploadersLib/HelperClasses/TCPClient.cs +++ b/ShareX.UploadersLib/HelperClasses/TCPClient.cs @@ -123,7 +123,7 @@ public string UploadImage(Image image, string link, string fileFormName, string url = new Uri(link); - boundary = "----------" + FastDateTime.Now.Ticks.ToString("x"); + boundary = "----------" + DateTime.Now.Ticks.ToString("x"); header = string.Format("--{0}", boundary); footer = string.Format("--{0}--", boundary); diff --git a/ShareX.UploadersLib/Properties/Resources.Designer.cs b/ShareX.UploadersLib/Properties/Resources.Designer.cs index 5ac75775f..b7e10ae26 100644 --- a/ShareX.UploadersLib/Properties/Resources.Designer.cs +++ b/ShareX.UploadersLib/Properties/Resources.Designer.cs @@ -363,16 +363,6 @@ internal class Resources { } } - /// - /// Looks up a localized resource of type System.Drawing.Icon similar to (Icon). - /// - internal static System.Drawing.Icon Hubic { - get { - object obj = ResourceManager.GetObject("Hubic", resourceCulture); - return ((System.Drawing.Icon)(obj)); - } - } - /// /// Looks up a localized resource of type System.Drawing.Icon similar to (Icon). /// diff --git a/ShareX.UploadersLib/Properties/Resources.resx b/ShareX.UploadersLib/Properties/Resources.resx index e859268b4..e2687b3d1 100644 --- a/ShareX.UploadersLib/Properties/Resources.resx +++ b/ShareX.UploadersLib/Properties/Resources.resx @@ -458,9 +458,6 @@ Created folders: Root folder - - ..\Favicons\hubic.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Favicons\CoinURL.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a diff --git a/ShareX.UploadersLib/ShareX.UploadersLib.csproj b/ShareX.UploadersLib/ShareX.UploadersLib.csproj index 63c17b1be..003e96f67 100644 --- a/ShareX.UploadersLib/ShareX.UploadersLib.csproj +++ b/ShareX.UploadersLib/ShareX.UploadersLib.csproj @@ -130,7 +130,6 @@ - @@ -746,7 +745,6 @@ - diff --git a/ShareX.UploadersLib/Uploader.cs b/ShareX.UploadersLib/Uploader.cs index ad8437617..ae27b2952 100644 --- a/ShareX.UploadersLib/Uploader.cs +++ b/ShareX.UploadersLib/Uploader.cs @@ -453,7 +453,7 @@ protected bool TransferData(Stream dataStream, Stream requestStream) private string CreateBoundary() { - return new string('-', 20) + FastDateTime.Now.Ticks.ToString("x"); + return new string('-', 20) + DateTime.Now.Ticks.ToString("x"); } private byte[] MakeInputContent(string boundary, string name, string value) diff --git a/ShareX.UploadersLib/UploadersConfig.cs b/ShareX.UploadersLib/UploadersConfig.cs index ae70a527e..11ce62c66 100644 --- a/ShareX.UploadersLib/UploadersConfig.cs +++ b/ShareX.UploadersLib/UploadersConfig.cs @@ -140,13 +140,6 @@ public class UploadersConfig : SettingsBase public string CopyUploadPath = "ShareX/%y/%mo"; public CopyURLType CopyURLType = CopyURLType.Shortened; - // Hubic - - public OAuth2Info HubicOAuth2Info = null; - public HubicOpenstackAuthInfo HubicOpenstackAuthInfo = null; - public HubicFolderInfo HubicSelectedFolder = Hubic.RootFolder; - public bool HubicPublish = false; - // Google Drive public OAuth2Info GoogleDriveOAuth2Info = null; diff --git a/ShareX/CompanionCube.cs b/ShareX/CompanionCube.cs new file mode 100644 index 000000000..da45b4040 --- /dev/null +++ b/ShareX/CompanionCube.cs @@ -0,0 +1,50 @@ +#region License Information (GPL v3) + +/* + ShareX - A program that allows you to take screenshots and share any file type + Copyright (c) 2007-2015 ShareX Team + + This program is free software; you can redistribute it and/or + modify it under the terms of the GNU General Public License + as published by the Free Software Foundation; either version 2 + of the License, or (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + + Optionally you can also view the license at . +*/ + +#endregion License Information (GPL v3) + +using System; +using System.Collections.Generic; +using System.Drawing; +using System.Linq; +using System.Text; + +namespace ShareX +{ + public class CompanionCube + { + public bool IsActive { get; set; } + public Point Location { get; set; } + public Size Size { get; set; } + public Rectangle Rectangle => new Rectangle(Location, Size); + public Point Center => new Point(Location.X + (Size.Width / 2), Location.Y + (Size.Height / 2)); + public int Speed { get; set; } + + public CompanionCube(int size, int speed) + { + Size = new Size(size, size); + Speed = speed; + IsActive = true; + } + } +} \ No newline at end of file diff --git a/ShareX/CompanionCubeManager.cs b/ShareX/CompanionCubeManager.cs new file mode 100644 index 000000000..5b655ae24 --- /dev/null +++ b/ShareX/CompanionCubeManager.cs @@ -0,0 +1,191 @@ +#region License Information (GPL v3) + +/* + ShareX - A program that allows you to take screenshots and share any file type + Copyright (c) 2007-2015 ShareX Team + + This program is free software; you can redistribute it and/or + modify it under the terms of the GNU General Public License + as published by the Free Software Foundation; either version 2 + of the License, or (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + + Optionally you can also view the license at . +*/ + +#endregion License Information (GPL v3) + +using ShareX.HelpersLib; +using ShareX.Properties; +using ShareX.ScreenCaptureLib; +using System; +using System.Collections.Generic; +using System.Diagnostics; +using System.Drawing; +using System.Linq; +using System.Text; +using System.Windows.Forms; + +namespace ShareX +{ + public static class CompanionCubeManager + { + public static bool IsActive { get; set; } + public static int CubeCount { get; } = 50; + public static List Cubes { get; private set; } + + private static CompanionCubesForm cubesForm; + private static Timer timer; + private static Stopwatch startTime; + private static TimeSpan previousElapsed; + private static Rectangle area; + private static Bitmap companionCube; + + public static void Toggle() + { + if (!IsActive) + { + Start(); + } + else + { + Stop(); + } + } + + public static void Start() + { + if (!IsActive) + { + IsActive = true; + + companionCube = Resources.CompanionCube; + + if (cubesForm != null) cubesForm.Close(); + cubesForm = new CompanionCubesForm(); + cubesForm.MouseClick += CubesForm_MouseClick; + cubesForm.Show(); + + area = new Rectangle(0, 0, cubesForm.Width, cubesForm.Height); + + Cubes = new List(CubeCount); + + for (int i = 0; i < CubeCount; i++) + { + CompanionCube cube = new CompanionCube(MathHelpers.Random(50, 100), MathHelpers.Random(250, 500)); + cube.Location = new Point(MathHelpers.Random(area.X, area.X + area.Width - cube.Size.Width), + MathHelpers.Random(area.Y - cube.Size.Height - 500, area.Y - cube.Size.Height)); + Cubes.Add(cube); + } + + previousElapsed = TimeSpan.Zero; + startTime = Stopwatch.StartNew(); + + timer = new Timer(); + timer.Interval = 20; + timer.Tick += Timer_Tick; + timer.Start(); + } + } + + private static void CubesForm_MouseClick(object sender, MouseEventArgs e) + { + foreach (CompanionCube cube in Cubes.Where(x => x.Rectangle.Contains(e.Location))) + { + cube.IsActive = false; + } + } + + public static void Stop() + { + if (IsActive) + { + if (timer != null) + { + timer.Dispose(); + timer = null; + } + + if (cubesForm != null) + { + cubesForm.Close(); + cubesForm = null; + } + + if (companionCube != null) + { + companionCube.Dispose(); + companionCube = null; + } + + if (Cubes != null) + { + Cubes.Clear(); + Cubes = null; + } + + IsActive = false; + } + } + + private static void Timer_Tick(object sender, EventArgs e) + { + TimeSpan elapsed = startTime.Elapsed - previousElapsed; + previousElapsed = startTime.Elapsed; + + IEnumerable cubes = Cubes.Where(x => x.IsActive).OrderBy(x => x.Rectangle.Bottom); + + foreach (CompanionCube cube in cubes) + { + int velocityY = (int)(cube.Speed * elapsed.TotalSeconds); + Point newLocation = new Point(cube.Location.X, cube.Location.Y + velocityY); + Rectangle newRectangle = new Rectangle(newLocation, cube.Size); + bool intersect = false; + + foreach (CompanionCube cube2 in cubes) + { + if (cube != cube2 && (newRectangle.IntersectsWith(cube2.Rectangle) || cube.Rectangle.IntersectsWith(cube2.Rectangle))) + { + intersect = true; + newLocation = new Point(cube.Location.X, cube2.Location.Y - cube.Size.Height); + break; + } + } + + if (!intersect && newLocation.Y + cube.Size.Height > area.Y + area.Height) + { + newLocation = new Point(cube.Location.X, area.Height - cube.Size.Height); + } + + cube.Location = newLocation; + } + + DrawCubes(); + } + + private static void DrawCubes() + { + using (Bitmap surface = new Bitmap(area.Width, area.Height)) + using (Graphics g = Graphics.FromImage(surface)) + { + foreach (CompanionCube cube in Cubes) + { + if (cube.IsActive && area.IntersectsWith(cube.Rectangle)) + { + g.DrawImage(companionCube, new Rectangle(cube.Location, cube.Size)); + } + } + + cubesForm.SelectBitmap(surface); + } + } + } +} \ No newline at end of file diff --git a/ShareX/Controls/HotkeySelectionControl.Designer.cs b/ShareX/Controls/HotkeySelectionControl.Designer.cs index b78539811..342cbe8fa 100644 --- a/ShareX/Controls/HotkeySelectionControl.Designer.cs +++ b/ShareX/Controls/HotkeySelectionControl.Designer.cs @@ -32,6 +32,7 @@ private void InitializeComponent() this.lblHotkeyStatus = new System.Windows.Forms.Label(); this.lblHotkeyDescription = new ShareX.HelpersLib.LabelNoCopy(); this.btnHotkey = new System.Windows.Forms.Button(); + this.btnEdit = new System.Windows.Forms.Button(); this.SuspendLayout(); // // lblHotkeyStatus @@ -64,10 +65,19 @@ private void InitializeComponent() this.btnHotkey.MouseClick += new System.Windows.Forms.MouseEventHandler(this.btnHotkey_MouseClick); this.btnHotkey.PreviewKeyDown += new System.Windows.Forms.PreviewKeyDownEventHandler(this.btnHotkey_PreviewKeyDown); // + // btnEdit + // + this.btnEdit.Image = global::ShareX.Properties.Resources.gear; + resources.ApplyResources(this.btnEdit, "btnEdit"); + this.btnEdit.Name = "btnEdit"; + this.btnEdit.UseVisualStyleBackColor = true; + this.btnEdit.Click += new System.EventHandler(this.btnEdit_Click); + // // HotkeySelectionControl // resources.ApplyResources(this, "$this"); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.Controls.Add(this.btnEdit); this.Controls.Add(this.btnHotkey); this.Controls.Add(this.lblHotkeyStatus); this.Controls.Add(this.lblHotkeyDescription); @@ -81,5 +91,6 @@ private void InitializeComponent() private System.Windows.Forms.Label lblHotkeyStatus; private ShareX.HelpersLib.LabelNoCopy lblHotkeyDescription; private System.Windows.Forms.Button btnHotkey; + private System.Windows.Forms.Button btnEdit; } } diff --git a/ShareX/Controls/HotkeySelectionControl.cs b/ShareX/Controls/HotkeySelectionControl.cs index a6f21de54..928c3d06c 100644 --- a/ShareX/Controls/HotkeySelectionControl.cs +++ b/ShareX/Controls/HotkeySelectionControl.cs @@ -34,7 +34,7 @@ public partial class HotkeySelectionControl : UserControl { public event EventHandler HotkeyChanged; public event EventHandler SelectedChanged; - public event EventHandler LabelDoubleClick; + public event EventHandler EditRequested; public HotkeySettings Setting { get; set; } @@ -61,7 +61,7 @@ public bool Selected } } - public bool Editing { get; private set; } + public bool EditingHotkey { get; private set; } public HotkeySelectionControl(HotkeySettings setting) { @@ -110,7 +110,7 @@ private void UpdateHotkeyStatus() private void btnHotkey_PreviewKeyDown(object sender, PreviewKeyDownEventArgs e) { - if (Editing) + if (EditingHotkey) { // For handle Tab key etc. e.IsInputKey = true; @@ -121,7 +121,7 @@ private void btnHotkey_KeyDown(object sender, KeyEventArgs e) { e.SuppressKeyPress = true; - if (Editing) + if (EditingHotkey) { if (e.KeyData == Keys.Escape) { @@ -150,7 +150,7 @@ private void btnHotkey_KeyUp(object sender, KeyEventArgs e) { e.SuppressKeyPress = true; - if (Editing) + if (EditingHotkey) { // PrintScreen not trigger KeyDown event if (e.KeyCode == Keys.PrintScreen) @@ -163,7 +163,7 @@ private void btnHotkey_KeyUp(object sender, KeyEventArgs e) private void btnHotkey_MouseClick(object sender, MouseEventArgs e) { - if (Editing) + if (EditingHotkey) { StopEditing(); } @@ -175,7 +175,7 @@ private void btnHotkey_MouseClick(object sender, MouseEventArgs e) private void btnHotkey_Leave(object sender, EventArgs e) { - if (Editing) + if (EditingHotkey) { StopEditing(); } @@ -183,7 +183,7 @@ private void btnHotkey_Leave(object sender, EventArgs e) private void StartEditing() { - Editing = true; + EditingHotkey = true; Program.HotkeyManager.IgnoreHotkeys = true; @@ -198,7 +198,7 @@ private void StartEditing() private void StopEditing() { - Editing = false; + EditingHotkey = false; Program.HotkeyManager.IgnoreHotkeys = false; @@ -231,14 +231,19 @@ protected void OnSelectedChanged() } } - protected void OnLabelDoubleClick() + protected void OnEditRequested() { - if (LabelDoubleClick != null) + if (EditRequested != null) { - LabelDoubleClick(this, EventArgs.Empty); + EditRequested(this, EventArgs.Empty); } } + private void btnEdit_Click(object sender, EventArgs e) + { + OnEditRequested(); + } + private void lblHotkeyDescription_MouseEnter(object sender, EventArgs e) { if (!Selected) @@ -269,7 +274,7 @@ private void lblHotkeyDescription_MouseDoubleClick(object sender, MouseEventArgs { if (e.Button == MouseButtons.Left) { - OnLabelDoubleClick(); + OnEditRequested(); } } } diff --git a/ShareX/Controls/HotkeySelectionControl.resx b/ShareX/Controls/HotkeySelectionControl.resx index 6ef940fea..e74224c62 100644 --- a/ShareX/Controls/HotkeySelectionControl.resx +++ b/ShareX/Controls/HotkeySelectionControl.resx @@ -117,92 +117,77 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - $this + + + Top, Right - - 6, 13 - - - $this - - - Description - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Windows.Forms.UserControl, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - HotkeySelectionControl - - - 254, 21 - - - - 2 - - - System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - btnHotkey - - - 1 - 456, 1 24, 21 + + + 2 + lblHotkeyStatus - - MiddleRight - - - 0 - - - - Top, Right - - - MiddleLeft + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 $this - - 259, 0 - - - 0, 1 - - - 0 - - - 0, 0, 0, 0 - - - Top, Right + + 2 Top, Left, Right + + MiddleRight + + + NoControl + + + 29, 1 + + + 227, 21 + + + 0 + + + Description + + + MiddleLeft + + + lblHotkeyDescription + + + ShareX.HelpersLib.LabelNoCopy, ShareX.HelpersLib, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + + + $this + - 2 + 3 + + + Top, Right + + + 261, 0 + + + 190, 23 1 @@ -210,16 +195,58 @@ Hotkey - - lblHotkeyDescription + + btnHotkey - - 192, 23 + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 480, 23 + + $this + + + 1 + + + NoControl + + + 0, 0 + + + 24, 23 + + + 3 + + + btnEdit + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 0 True + + 6, 13 + + + 0, 0, 0, 0 + + + 480, 23 + + + HotkeySelectionControl + + + System.Windows.Forms.UserControl, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + \ No newline at end of file diff --git a/ShareX/Enums.cs b/ShareX/Enums.cs index 5dcd425d9..6616e912a 100644 --- a/ShareX/Enums.cs +++ b/ShareX/Enums.cs @@ -165,6 +165,7 @@ public enum HotkeyType // Localized + Category FreeHandRegion, CustomRegion, LastRegion, + ScrollingCapture, CaptureWebpage, AutoCapture, StartAutoCapture, @@ -181,11 +182,14 @@ public enum HotkeyType // Localized + Category ImageEditor, ImageEffects, HashCheck, + IRCClient, DNSChanger, QRCode, Ruler, Automate, IndexFolder, + ImageCombiner, + VideoThumbnailer, FTPClient, TweetMessage, MonitorTest, diff --git a/ShareX/Forms/AboutForm.Designer.cs b/ShareX/Forms/AboutForm.Designer.cs index 8e6c06486..54fe8dee3 100644 --- a/ShareX/Forms/AboutForm.Designer.cs +++ b/ShareX/Forms/AboutForm.Designer.cs @@ -57,10 +57,7 @@ private void InitializeComponent() // resources.ApplyResources(this.lblProductName, "lblProductName"); this.lblProductName.BackColor = System.Drawing.Color.Transparent; - this.lblProductName.Cursor = System.Windows.Forms.Cursors.Hand; - this.lblProductName.ForeColor = System.Drawing.Color.RoyalBlue; this.lblProductName.Name = "lblProductName"; - this.lblProductName.Click += new System.EventHandler(this.lblProductName_Click); // // lblBerk // @@ -184,6 +181,7 @@ private void InitializeComponent() this.Controls.Add(this.cLogo); this.MaximizeBox = false; this.Name = "AboutForm"; + this.FormClosed += new System.Windows.Forms.FormClosedEventHandler(this.AboutForm_FormClosed); this.Shown += new System.EventHandler(this.AboutForm_Shown); ((System.ComponentModel.ISupportInitialize)(this.pbMikeURL)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.pbAU)).EndInit(); diff --git a/ShareX/Forms/AboutForm.cs b/ShareX/Forms/AboutForm.cs index 4c80ee30a..201a8512d 100644 --- a/ShareX/Forms/AboutForm.cs +++ b/ShareX/Forms/AboutForm.cs @@ -56,7 +56,10 @@ public AboutForm() rtbShareXInfo.Text = string.Format(@"{0}: {1} {2}: {3} -{4}: {5}", Resources.AboutForm_AboutForm_Website, Links.URL_WEBSITE, Resources.AboutForm_AboutForm_Project_page, Links.URL_PROJECT, Resources.AboutForm_AboutForm_Issues, Links.URL_ISSUES); +{4}: {5} +{6}: {7}", +Resources.AboutForm_AboutForm_Website, Links.URL_WEBSITE, Resources.AboutForm_AboutForm_Project_page, Links.URL_PROJECT, Resources.AboutForm_AboutForm_Issues, Links.URL_ISSUES, +Resources.AboutForm_AboutForm_Changelog, Links.URL_CHANGELOG); rtbCredits.Text = string.Format(@"{0}: @@ -94,17 +97,22 @@ public AboutForm() Icons: http://p.yusukekamiyamane.com ImageListView: https://github.com/oozcitak/imagelistview FFmpeg: http://www.ffmpeg.org -FFmpeg Windows builds: http://ffmpeg.zeranoe.com/builds +Zeranoe FFmpeg: http://ffmpeg.zeranoe.com/builds 7-Zip: http://www.7-zip.org SevenZipSharp: https://sevenzipsharp.codeplex.com DirectShow video and audio device: https://github.com/rdp/screen-capture-recorder-to-video-windows-free QrCode.Net: https://qrcodenet.codeplex.com System.Net.FtpClient: https://netftp.codeplex.com -ResX Resource Manager: https://resxresourcemanager.codeplex.com -AWSSDK: http://aws.amazon.com/sdk-for-net/ +AWS SDK: http://aws.amazon.com/sdk-for-net/ CLR Security: http://clrsecurity.codeplex.com Steamworks.NET: https://github.com/rlabrecque/Steamworks.NET +Trailer music credits: +Track Name: Au5 - Inside (feat. Danyka Nadeau) +Video Link: https://youtu.be/WrkyT-6ivjc +Buy Link: http://music.monstercat.com/track/inside-feat-danyka-nadeau +Label Channel: http://www.YouTube.com/Monstercat + Running from: {3} @@ -117,11 +125,6 @@ private void AboutForm_Shown(object sender, EventArgs e) cLogo.Start(50); } - private void lblProductName_Click(object sender, EventArgs e) - { - URLHelpers.OpenURL(Links.URL_CHANGELOG); - } - private void pbSteam_Click(object sender, EventArgs e) { URLHelpers.OpenURL(Links.URL_STEAM); @@ -142,6 +145,11 @@ private void rtb_LinkClicked(object sender, LinkClickedEventArgs e) URLHelpers.OpenURL(e.LinkText); } + private void AboutForm_FormClosed(object sender, FormClosedEventArgs e) + { + CompanionCubeManager.Stop(); + } + #region Animation private const int w = 200; @@ -224,6 +232,20 @@ private void cLogo_Draw(Graphics g) private void cLogo_MouseDown(object sender, MouseEventArgs e) { +#if STEAM + if (e.Button == MouseButtons.Middle) + { + cLogo.Stop(); + CompanionCubeManager.Toggle(); + return; + } + + if (CompanionCubeManager.IsActive) + { + CompanionCubeManager.Stop(); + } +#endif + if (!isEasterEggStarted) { isPaused = !isPaused; diff --git a/ShareX/Forms/AboutForm.resx b/ShareX/Forms/AboutForm.resx index 7b23209ea..08720968f 100644 --- a/ShareX/Forms/AboutForm.resx +++ b/ShareX/Forms/AboutForm.resx @@ -153,7 +153,7 @@ True - 64, 144 + 64, 163 0, 13 @@ -177,7 +177,7 @@ True - 64, 168 + 64, 187 0, 13 @@ -202,10 +202,10 @@ Top, Bottom, Left, Right - 15, 200 + 15, 219 - 450, 299 + 513, 317 7 @@ -232,7 +232,7 @@ 16, 66 - 281, 48 + 328, 62 2 @@ -256,7 +256,7 @@ Top, Right - 281, -8 + 344, -8 200, 200 @@ -277,7 +277,7 @@ 13 - 13, 36 + 14, 35 224, 24 @@ -298,7 +298,7 @@ 7 - 41, 166 + 41, 185 16, 16 @@ -322,7 +322,7 @@ 8 - 17, 166 + 17, 185 16, 16 @@ -346,7 +346,7 @@ 9 - 41, 142 + 41, 161 16, 16 @@ -370,7 +370,7 @@ 10 - 17, 142 + 17, 161 16, 16 @@ -397,7 +397,7 @@ True - 14, 117 + 14, 136 0, 13 @@ -481,7 +481,7 @@ 6, 13 - 474, 511 + 537, 545 490, 550 diff --git a/ShareX/Forms/ActionsForm.Designer.cs b/ShareX/Forms/ActionsForm.Designer.cs index 2c00e9627..f6251a4e1 100644 --- a/ShareX/Forms/ActionsForm.Designer.cs +++ b/ShareX/Forms/ActionsForm.Designer.cs @@ -42,6 +42,7 @@ private void InitializeComponent() this.txtExtensions = new System.Windows.Forms.TextBox(); this.txtOutputExtension = new System.Windows.Forms.TextBox(); this.lblOutputExtension = new System.Windows.Forms.Label(); + this.cbHiddenWindow = new System.Windows.Forms.CheckBox(); this.SuspendLayout(); // // lblName @@ -115,11 +116,18 @@ private void InitializeComponent() resources.ApplyResources(this.lblOutputExtension, "lblOutputExtension"); this.lblOutputExtension.Name = "lblOutputExtension"; // + // cbHiddenWindow + // + resources.ApplyResources(this.cbHiddenWindow, "cbHiddenWindow"); + this.cbHiddenWindow.Name = "cbHiddenWindow"; + this.cbHiddenWindow.UseVisualStyleBackColor = true; + // // ActionsForm // this.AcceptButton = this.btnOK; resources.ApplyResources(this, "$this"); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.Controls.Add(this.cbHiddenWindow); this.Controls.Add(this.lblOutputExtension); this.Controls.Add(this.txtOutputExtension); this.Controls.Add(this.txtExtensions); @@ -155,5 +163,6 @@ private void InitializeComponent() private System.Windows.Forms.TextBox txtExtensions; private System.Windows.Forms.TextBox txtOutputExtension; private System.Windows.Forms.Label lblOutputExtension; + private System.Windows.Forms.CheckBox cbHiddenWindow; } } \ No newline at end of file diff --git a/ShareX/Forms/ActionsForm.cs b/ShareX/Forms/ActionsForm.cs index ea0e415be..fd699c949 100644 --- a/ShareX/Forms/ActionsForm.cs +++ b/ShareX/Forms/ActionsForm.cs @@ -49,6 +49,7 @@ public ActionsForm(ExternalProgram fileAction) CodeMenu.Create(txtArguments); txtOutputExtension.Text = fileAction.OutputExtension ?? ""; txtExtensions.Text = fileAction.Extensions ?? ""; + cbHiddenWindow.Checked = fileAction.HiddenWindow; } private void btnPathBrowse_Click(object sender, EventArgs e) @@ -75,6 +76,7 @@ private void btnOK_Click(object sender, EventArgs e) FileAction.Args = txtArguments.Text; FileAction.Extensions = txtExtensions.Text; FileAction.OutputExtension = txtOutputExtension.Text; + FileAction.HiddenWindow = cbHiddenWindow.Checked; DialogResult = DialogResult.OK; } diff --git a/ShareX/Forms/ActionsForm.resx b/ShareX/Forms/ActionsForm.resx index fcaee0350..032f7e9f2 100644 --- a/ShareX/Forms/ActionsForm.resx +++ b/ShareX/Forms/ActionsForm.resx @@ -144,7 +144,7 @@ $this - 12 + 13 True @@ -171,7 +171,7 @@ $this - 11 + 12 True @@ -198,7 +198,7 @@ $this - 10 + 11 @@ -223,7 +223,7 @@ $this - 9 + 10 Top, Left, Right @@ -247,7 +247,7 @@ $this - 8 + 9 Top, Left, Right @@ -271,7 +271,7 @@ $this - 7 + 8 Top, Right @@ -298,13 +298,13 @@ $this - 6 + 7 Top, Right - 152, 248 + 155, 285 72, 24 @@ -325,13 +325,13 @@ $this - 5 + 6 Top, Right - 232, 248 + 233, 285 72, 24 @@ -352,7 +352,7 @@ $this - 4 + 5 True @@ -379,7 +379,7 @@ $this - 3 + 4 Top, Left, Right @@ -403,7 +403,7 @@ $this - 2 + 3 Top, Left, Right @@ -427,7 +427,7 @@ $this - 1 + 2 True @@ -454,6 +454,36 @@ $this + 1 + + + True + + + 9, 248 + + + 2, 2, 2, 2 + + + 99, 17 + + + 13 + + + Hidden window + + + cbHiddenWindow + + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + 0 @@ -463,7 +493,7 @@ 6, 13 - 313, 281 + 313, 320 CenterScreen diff --git a/ShareX/Forms/CompanionCubesForm.cs b/ShareX/Forms/CompanionCubesForm.cs new file mode 100644 index 000000000..6a7ddd49c --- /dev/null +++ b/ShareX/Forms/CompanionCubesForm.cs @@ -0,0 +1,52 @@ +#region License Information (GPL v3) + +/* + ShareX - A program that allows you to take screenshots and share any file type + Copyright (c) 2007-2015 ShareX Team + + This program is free software; you can redistribute it and/or + modify it under the terms of the GNU General Public License + as published by the Free Software Foundation; either version 2 + of the License, or (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + + Optionally you can also view the license at . +*/ + +#endregion License Information (GPL v3) + +using ShareX.HelpersLib; +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 ShareX +{ + public class CompanionCubesForm : LayeredForm + { + public CompanionCubesForm() + { + StartPosition = FormStartPosition.Manual; + Bounds = CaptureHelpers.GetScreenWorkingArea(); + Shown += CompanionCubesForm_Shown; + } + + private void CompanionCubesForm_Shown(object sender, EventArgs e) + { + this.ShowActivate(); + } + } +} \ No newline at end of file diff --git a/ShareX/Forms/FirstTimeConfigForm.pt-BR.resx b/ShareX/Forms/FirstTimeConfigForm.pt-BR.resx index ee87e8887..688be8f86 100644 --- a/ShareX/Forms/FirstTimeConfigForm.pt-BR.resx +++ b/ShareX/Forms/FirstTimeConfigForm.pt-BR.resx @@ -133,7 +133,7 @@ Enquanto o programa estiver aberto, mostrar "Em aplicativo" na Steam - VocĂŞ pode achar estas configurações em "Configurações do programa -> Integração". + VocĂŞ pode achar estas configurações em "Configs. do programa -> Integração". Configuração inicial do ShareX diff --git a/ShareX/Forms/HotkeySettingsForm.cs b/ShareX/Forms/HotkeySettingsForm.cs index cbf8e2d37..0ff14cf0d 100644 --- a/ShareX/Forms/HotkeySettingsForm.cs +++ b/ShareX/Forms/HotkeySettingsForm.cs @@ -109,7 +109,7 @@ private HotkeySelectionControl AddHotkeySelectionControl(HotkeySettings hotkeySe control.Margin = new Padding(0, 0, 0, 2); control.SelectedChanged += control_SelectedChanged; control.HotkeyChanged += control_HotkeyChanged; - control.LabelDoubleClick += control_LabelDoubleClick; + control.EditRequested += control_EditRequested; flpHotkeys.Controls.Add(control); return control; } @@ -123,7 +123,7 @@ private void Edit(HotkeySelectionControl selectionControl) } } - private void control_LabelDoubleClick(object sender, EventArgs e) + private void control_EditRequested(object sender, EventArgs e) { Edit((HotkeySelectionControl)sender); } diff --git a/ShareX/Forms/HotkeySettingsForm.resx b/ShareX/Forms/HotkeySettingsForm.resx index 9ea4a6c76..3cb2c834f 100644 --- a/ShareX/Forms/HotkeySettingsForm.resx +++ b/ShareX/Forms/HotkeySettingsForm.resx @@ -127,10 +127,10 @@ - 224, 8 + 248, 8 - 72, 23 + 80, 23 3 @@ -220,10 +220,10 @@ NoControl - 80, 8 + 88, 8 - 72, 23 + 80, 23 1 @@ -250,10 +250,10 @@ NoControl - 152, 8 + 168, 8 - 72, 23 + 80, 23 2 @@ -280,7 +280,7 @@ 8, 8 - 72, 23 + 80, 23 0 diff --git a/ShareX/Forms/ImageCombinerForm.Designer.cs b/ShareX/Forms/ImageCombinerForm.Designer.cs new file mode 100644 index 000000000..4f85cef6f --- /dev/null +++ b/ShareX/Forms/ImageCombinerForm.Designer.cs @@ -0,0 +1,171 @@ +namespace ShareX +{ + partial class ImageCombinerForm + { + /// + /// 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() + { + System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(ImageCombinerForm)); + this.btnAdd = new System.Windows.Forms.Button(); + this.btnRemove = new System.Windows.Forms.Button(); + this.btnMoveUp = new System.Windows.Forms.Button(); + this.btnMoveDown = new System.Windows.Forms.Button(); + this.lvImages = new ShareX.HelpersLib.MyListView(); + this.chFilepath = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader())); + this.btnCombine = new System.Windows.Forms.Button(); + this.lblSpace = new System.Windows.Forms.Label(); + this.nudSpace = new System.Windows.Forms.NumericUpDown(); + this.lblOrientation = new System.Windows.Forms.Label(); + this.cbOrientation = new System.Windows.Forms.ComboBox(); + this.lblSpacePixel = new System.Windows.Forms.Label(); + ((System.ComponentModel.ISupportInitialize)(this.nudSpace)).BeginInit(); + this.SuspendLayout(); + // + // btnAdd + // + resources.ApplyResources(this.btnAdd, "btnAdd"); + this.btnAdd.Name = "btnAdd"; + this.btnAdd.UseVisualStyleBackColor = true; + this.btnAdd.Click += new System.EventHandler(this.btnAdd_Click); + // + // btnRemove + // + resources.ApplyResources(this.btnRemove, "btnRemove"); + this.btnRemove.Name = "btnRemove"; + this.btnRemove.UseVisualStyleBackColor = true; + this.btnRemove.Click += new System.EventHandler(this.btnRemove_Click); + // + // btnMoveUp + // + resources.ApplyResources(this.btnMoveUp, "btnMoveUp"); + this.btnMoveUp.Name = "btnMoveUp"; + this.btnMoveUp.UseVisualStyleBackColor = true; + this.btnMoveUp.Click += new System.EventHandler(this.btnMoveUp_Click); + // + // btnMoveDown + // + resources.ApplyResources(this.btnMoveDown, "btnMoveDown"); + this.btnMoveDown.Name = "btnMoveDown"; + this.btnMoveDown.UseVisualStyleBackColor = true; + this.btnMoveDown.Click += new System.EventHandler(this.btnMoveDown_Click); + // + // lvImages + // + this.lvImages.AllowDrop = true; + this.lvImages.AllowItemDrag = true; + resources.ApplyResources(this.lvImages, "lvImages"); + this.lvImages.AutoFillColumn = true; + this.lvImages.Columns.AddRange(new System.Windows.Forms.ColumnHeader[] { + this.chFilepath}); + this.lvImages.FullRowSelect = true; + this.lvImages.HeaderStyle = System.Windows.Forms.ColumnHeaderStyle.None; + this.lvImages.Name = "lvImages"; + this.lvImages.UseCompatibleStateImageBehavior = false; + this.lvImages.View = System.Windows.Forms.View.Details; + // + // chFilepath + // + resources.ApplyResources(this.chFilepath, "chFilepath"); + // + // btnCombine + // + resources.ApplyResources(this.btnCombine, "btnCombine"); + this.btnCombine.Name = "btnCombine"; + this.btnCombine.UseVisualStyleBackColor = true; + this.btnCombine.Click += new System.EventHandler(this.btnCombine_Click); + // + // lblSpace + // + resources.ApplyResources(this.lblSpace, "lblSpace"); + this.lblSpace.Name = "lblSpace"; + // + // nudSpace + // + resources.ApplyResources(this.nudSpace, "nudSpace"); + this.nudSpace.Maximum = new decimal(new int[] { + 1000, + 0, + 0, + 0}); + this.nudSpace.Name = "nudSpace"; + this.nudSpace.ValueChanged += new System.EventHandler(this.nudSpace_ValueChanged); + // + // lblOrientation + // + resources.ApplyResources(this.lblOrientation, "lblOrientation"); + this.lblOrientation.Name = "lblOrientation"; + // + // cbOrientation + // + resources.ApplyResources(this.cbOrientation, "cbOrientation"); + this.cbOrientation.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; + this.cbOrientation.FormattingEnabled = true; + this.cbOrientation.Name = "cbOrientation"; + this.cbOrientation.SelectedIndexChanged += new System.EventHandler(this.cbOrientation_SelectedIndexChanged); + // + // lblSpacePixel + // + resources.ApplyResources(this.lblSpacePixel, "lblSpacePixel"); + this.lblSpacePixel.Name = "lblSpacePixel"; + // + // ImageCombinerForm + // + resources.ApplyResources(this, "$this"); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.Controls.Add(this.lblSpacePixel); + this.Controls.Add(this.cbOrientation); + this.Controls.Add(this.lblOrientation); + this.Controls.Add(this.nudSpace); + this.Controls.Add(this.lblSpace); + this.Controls.Add(this.btnCombine); + this.Controls.Add(this.lvImages); + this.Controls.Add(this.btnMoveDown); + this.Controls.Add(this.btnMoveUp); + this.Controls.Add(this.btnRemove); + this.Controls.Add(this.btnAdd); + this.Name = "ImageCombinerForm"; + ((System.ComponentModel.ISupportInitialize)(this.nudSpace)).EndInit(); + this.ResumeLayout(false); + this.PerformLayout(); + + } + + #endregion + + private System.Windows.Forms.Button btnAdd; + private System.Windows.Forms.Button btnRemove; + private System.Windows.Forms.Button btnMoveUp; + private System.Windows.Forms.Button btnMoveDown; + private HelpersLib.MyListView lvImages; + private System.Windows.Forms.Button btnCombine; + private System.Windows.Forms.Label lblSpace; + private System.Windows.Forms.NumericUpDown nudSpace; + private System.Windows.Forms.Label lblOrientation; + private System.Windows.Forms.ComboBox cbOrientation; + private System.Windows.Forms.ColumnHeader chFilepath; + private System.Windows.Forms.Label lblSpacePixel; + } +} \ No newline at end of file diff --git a/ShareX/Forms/ImageCombinerForm.cs b/ShareX/Forms/ImageCombinerForm.cs new file mode 100644 index 000000000..455195a29 --- /dev/null +++ b/ShareX/Forms/ImageCombinerForm.cs @@ -0,0 +1,146 @@ +#region License Information (GPL v3) + +/* + ShareX - A program that allows you to take screenshots and share any file type + Copyright (c) 2007-2015 ShareX Team + + This program is free software; you can redistribute it and/or + modify it under the terms of the GNU General Public License + as published by the Free Software Foundation; either version 2 + of the License, or (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + + Optionally you can also view the license at . +*/ + +#endregion License Information (GPL v3) + +using ShareX.HelpersLib; +using ShareX.Properties; +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 ShareX +{ + public partial class ImageCombinerForm : BaseForm + { + public event Action ProcessRequested; + + public ImageCombinerOptions Options { get; private set; } + + public ImageCombinerForm(ImageCombinerOptions options) + { + Options = options; + InitializeComponent(); + cbOrientation.Items.AddRange(Enum.GetNames(typeof(Orientation))); + cbOrientation.SelectedIndex = (int)Options.Orientation; + nudSpace.Value = Options.Space; + } + + private void btnAdd_Click(object sender, EventArgs e) + { + string[] images = ImageHelpers.OpenImageFileDialog(true); + + if (images != null) + { + foreach (string image in images) + { + lvImages.Items.Add(image); + } + } + } + + private void btnRemove_Click(object sender, EventArgs e) + { + if (lvImages.SelectedItems.Count > 0) + { + foreach (ListViewItem lvi in lvImages.SelectedItems) + { + lvImages.Items.Remove(lvi); + } + } + } + + private void btnMoveUp_Click(object sender, EventArgs e) + { + if (lvImages.SelectedItems.Count > 0) + { + lvImages.SelectedItems[0].MoveUp(); + } + } + + private void btnMoveDown_Click(object sender, EventArgs e) + { + if (lvImages.SelectedItems.Count > 0) + { + lvImages.SelectedItems[0].MoveDown(); + } + } + + private void cbOrientation_SelectedIndexChanged(object sender, EventArgs e) + { + Options.Orientation = (Orientation)cbOrientation.SelectedIndex; + } + + private void nudSpace_ValueChanged(object sender, EventArgs e) + { + Options.Space = (int)nudSpace.Value; + } + + private void btnCombine_Click(object sender, EventArgs e) + { + if (lvImages.Items.Count > 0) + { + IEnumerable images = null; + + try + { + images = lvImages.Items.Cast().Select(x => ImageHelpers.LoadImage(x.Text)); + Image output = ImageHelpers.CombineImages(images, Options.Orientation, Options.Space); + OnProcessRequested(output); + } + catch (Exception ex) + { + DebugHelper.WriteException(ex); + + MessageBox.Show(ex.ToString(), $"ShareX - {Resources.Program_Run_Error}", MessageBoxButtons.OK, MessageBoxIcon.Error); + } + finally + { + if (images != null) + { + foreach (Image image in images) + { + if (image != null) + { + image.Dispose(); + } + } + } + } + } + } + + protected void OnProcessRequested(Image image) + { + if (ProcessRequested != null) + { + ProcessRequested(image); + } + } + } +} \ No newline at end of file diff --git a/ShareX/Forms/ImageCombinerForm.resx b/ShareX/Forms/ImageCombinerForm.resx new file mode 100644 index 000000000..fd24e8161 --- /dev/null +++ b/ShareX/Forms/ImageCombinerForm.resx @@ -0,0 +1,444 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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 + + + + 8, 8 + + + 120, 23 + + + + 0 + + + Add... + + + btnAdd + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 10 + + + 136, 8 + + + 120, 23 + + + 1 + + + Remove + + + btnRemove + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 9 + + + 264, 8 + + + 120, 23 + + + 2 + + + Move up + + + btnMoveUp + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 8 + + + 392, 8 + + + 120, 23 + + + 3 + + + Move down + + + btnMoveDown + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 7 + + + + Top, Bottom, Left, Right + + + Image file path + + + 487 + + + 8, 40 + + + 504, 368 + + + 4 + + + lvImages + + + ShareX.HelpersLib.MyListView, ShareX.HelpersLib, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + + + $this + + + 6 + + + Bottom, Left + + + 8, 472 + + + 504, 31 + + + 5 + + + Combine images and save/upload depending on after capture settings + + + btnCombine + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 5 + + + Bottom, Left + + + True + + + 8, 448 + + + 121, 13 + + + 6 + + + Space between images: + + + lblSpace + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 4 + + + Bottom, Left + + + 200, 444 + + + 64, 20 + + + 7 + + + Center + + + nudSpace + + + System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 3 + + + Bottom, Left + + + True + + + 8, 424 + + + 103, 13 + + + 8 + + + Combine orientation: + + + lblOrientation + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 2 + + + Bottom, Left + + + 200, 420 + + + 121, 21 + + + 9 + + + cbOrientation + + + System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 1 + + + Bottom, Left + + + True + + + 272, 448 + + + 33, 13 + + + 10 + + + pixels + + + lblSpacePixel + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 0 + + + True + + + 6, 13 + + + 521, 514 + + + CenterScreen + + + ShareX - Image combiner + + + chFilepath + + + System.Windows.Forms.ColumnHeader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + ImageCombinerForm + + + ShareX.HelpersLib.BaseForm, ShareX.HelpersLib, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + + \ No newline at end of file diff --git a/ShareX/Forms/MainForm.Designer.cs b/ShareX/Forms/MainForm.Designer.cs index cd76f2117..32cf7d6e7 100644 --- a/ShareX/Forms/MainForm.Designer.cs +++ b/ShareX/Forms/MainForm.Designer.cs @@ -57,6 +57,7 @@ private void InitializeComponent() this.tsmiLastRegion = new System.Windows.Forms.ToolStripMenuItem(); this.tsmiScreenRecordingFFmpeg = new System.Windows.Forms.ToolStripMenuItem(); this.tsmiScreenRecordingGIF = new System.Windows.Forms.ToolStripMenuItem(); + this.tsmiScrollingCapture = new System.Windows.Forms.ToolStripMenuItem(); this.tsmiWebpageCapture = new System.Windows.Forms.ToolStripMenuItem(); this.tsmiAutoCapture = new System.Windows.Forms.ToolStripMenuItem(); this.tsddbUpload = new System.Windows.Forms.ToolStripDropDownButton(); @@ -72,14 +73,15 @@ private void InitializeComponent() this.tsmiImageEditor = new System.Windows.Forms.ToolStripMenuItem(); this.tsmiImageEffects = new System.Windows.Forms.ToolStripMenuItem(); this.tsmiHashCheck = new System.Windows.Forms.ToolStripMenuItem(); + this.tsmiIRCClient = new System.Windows.Forms.ToolStripMenuItem(); this.tsmiDNSChanger = new System.Windows.Forms.ToolStripMenuItem(); this.tsmiQRCode = new System.Windows.Forms.ToolStripMenuItem(); this.tsmiRuler = new System.Windows.Forms.ToolStripMenuItem(); this.tsmiAutomate = new System.Windows.Forms.ToolStripMenuItem(); this.tsmiIndexFolder = new System.Windows.Forms.ToolStripMenuItem(); + this.tsmiImageCombiner = new System.Windows.Forms.ToolStripMenuItem(); this.tsmiVideoThumbnailer = new System.Windows.Forms.ToolStripMenuItem(); this.tsmiFTPClient = new System.Windows.Forms.ToolStripMenuItem(); - this.tsmiIRCClient = new System.Windows.Forms.ToolStripMenuItem(); this.tsmiTweetMessage = new System.Windows.Forms.ToolStripMenuItem(); this.tsmiMonitorTest = new System.Windows.Forms.ToolStripMenuItem(); this.tssMain1 = new System.Windows.Forms.ToolStripSeparator(); @@ -176,6 +178,7 @@ private void InitializeComponent() this.tsmiTrayLastRegion = new System.Windows.Forms.ToolStripMenuItem(); this.tsmiTrayScreenRecordingFFmpeg = new System.Windows.Forms.ToolStripMenuItem(); this.tsmiTrayScreenRecordingGIF = new System.Windows.Forms.ToolStripMenuItem(); + this.tsmiTrayScrollingCapture = new System.Windows.Forms.ToolStripMenuItem(); this.tsmiTrayWebpageCapture = new System.Windows.Forms.ToolStripMenuItem(); this.tsmiTrayAutoCapture = new System.Windows.Forms.ToolStripMenuItem(); this.tsmiTrayUpload = new System.Windows.Forms.ToolStripMenuItem(); @@ -191,6 +194,7 @@ private void InitializeComponent() this.tsmiTrayImageEditor = new System.Windows.Forms.ToolStripMenuItem(); this.tsmiTrayImageEffects = new System.Windows.Forms.ToolStripMenuItem(); this.tsmiTrayHashCheck = new System.Windows.Forms.ToolStripMenuItem(); + this.tsmiTrayIRCClient = new System.Windows.Forms.ToolStripMenuItem(); this.tsmiTrayDNSChanger = new System.Windows.Forms.ToolStripMenuItem(); this.tsmiTrayQRCode = new System.Windows.Forms.ToolStripMenuItem(); this.tsmiTrayRuler = new System.Windows.Forms.ToolStripMenuItem(); @@ -198,7 +202,6 @@ private void InitializeComponent() this.tsmiTrayIndexFolder = new System.Windows.Forms.ToolStripMenuItem(); this.tsmiTrayVideoThumbnailer = new System.Windows.Forms.ToolStripMenuItem(); this.tsmiTrayFTPClient = new System.Windows.Forms.ToolStripMenuItem(); - this.tsmiTrayIRCClient = new System.Windows.Forms.ToolStripMenuItem(); this.tsmiTrayTweetMessage = new System.Windows.Forms.ToolStripMenuItem(); this.tsmiTrayMonitorTest = new System.Windows.Forms.ToolStripMenuItem(); this.tssTray1 = new System.Windows.Forms.ToolStripSeparator(); @@ -227,6 +230,7 @@ private void InitializeComponent() this.tsmiTrayShow = new System.Windows.Forms.ToolStripMenuItem(); this.tsmiTrayExit = new System.Windows.Forms.ToolStripMenuItem(); this.timerTraySingleClick = new System.Windows.Forms.Timer(this.components); + this.tsmiTrayImageCombiner = new System.Windows.Forms.ToolStripMenuItem(); ((System.ComponentModel.ISupportInitialize)(this.scMain)).BeginInit(); this.scMain.Panel1.SuspendLayout(); this.scMain.Panel2.SuspendLayout(); @@ -377,6 +381,7 @@ private void InitializeComponent() this.tsmiLastRegion, this.tsmiScreenRecordingFFmpeg, this.tsmiScreenRecordingGIF, + this.tsmiScrollingCapture, this.tsmiWebpageCapture, this.tsmiAutoCapture}); this.tsddbCapture.Image = global::ShareX.Properties.Resources.camera; @@ -473,6 +478,13 @@ private void InitializeComponent() resources.ApplyResources(this.tsmiScreenRecordingGIF, "tsmiScreenRecordingGIF"); this.tsmiScreenRecordingGIF.Click += new System.EventHandler(this.tsmiScreenRecordingGIF_Click); // + // tsmiScrollingCapture + // + this.tsmiScrollingCapture.Image = global::ShareX.Properties.Resources.ui_scroll_pane_image; + this.tsmiScrollingCapture.Name = "tsmiScrollingCapture"; + resources.ApplyResources(this.tsmiScrollingCapture, "tsmiScrollingCapture"); + this.tsmiScrollingCapture.Click += new System.EventHandler(this.tsmiScrollingCapture_Click); + // // tsmiWebpageCapture // this.tsmiWebpageCapture.Image = global::ShareX.Properties.Resources.document_globe; @@ -554,6 +566,7 @@ private void InitializeComponent() this.tsmiRuler, this.tsmiAutomate, this.tsmiIndexFolder, + this.tsmiImageCombiner, this.tsmiVideoThumbnailer, this.tsmiFTPClient, this.tsmiTweetMessage, @@ -597,6 +610,13 @@ private void InitializeComponent() resources.ApplyResources(this.tsmiHashCheck, "tsmiHashCheck"); this.tsmiHashCheck.Click += new System.EventHandler(this.tsmiHashCheck_Click); // + // tsmiIRCClient + // + this.tsmiIRCClient.Image = global::ShareX.Properties.Resources.balloon_white; + this.tsmiIRCClient.Name = "tsmiIRCClient"; + resources.ApplyResources(this.tsmiIRCClient, "tsmiIRCClient"); + this.tsmiIRCClient.Click += new System.EventHandler(this.tsmiIRCClient_Click); + // // tsmiDNSChanger // this.tsmiDNSChanger.Image = global::ShareX.Properties.Resources.network_ip; @@ -632,6 +652,13 @@ private void InitializeComponent() resources.ApplyResources(this.tsmiIndexFolder, "tsmiIndexFolder"); this.tsmiIndexFolder.Click += new System.EventHandler(this.tsmiIndexFolder_Click); // + // tsmiImageCombiner + // + this.tsmiImageCombiner.Image = global::ShareX.Properties.Resources.document_break; + this.tsmiImageCombiner.Name = "tsmiImageCombiner"; + resources.ApplyResources(this.tsmiImageCombiner, "tsmiImageCombiner"); + this.tsmiImageCombiner.Click += new System.EventHandler(this.tsmiImageCombiner_Click); + // // tsmiVideoThumbnailer // this.tsmiVideoThumbnailer.Image = global::ShareX.Properties.Resources.images_stack; @@ -646,13 +673,6 @@ private void InitializeComponent() resources.ApplyResources(this.tsmiFTPClient, "tsmiFTPClient"); this.tsmiFTPClient.Click += new System.EventHandler(this.tsmiFTPClient_Click); // - // tsmiIRCClient - // - this.tsmiIRCClient.Image = global::ShareX.Properties.Resources.balloon_white; - this.tsmiIRCClient.Name = "tsmiIRCClient"; - resources.ApplyResources(this.tsmiIRCClient, "tsmiIRCClient"); - this.tsmiIRCClient.Click += new System.EventHandler(this.tsmiIRCClient_Click); - // // tsmiTweetMessage // this.tsmiTweetMessage.Image = global::ShareX.Properties.Resources.Twitter; @@ -1276,6 +1296,7 @@ private void InitializeComponent() this.tsmiTrayLastRegion, this.tsmiTrayScreenRecordingFFmpeg, this.tsmiTrayScreenRecordingGIF, + this.tsmiTrayScrollingCapture, this.tsmiTrayWebpageCapture, this.tsmiTrayAutoCapture}); this.tsmiTrayCapture.Image = global::ShareX.Properties.Resources.camera; @@ -1372,6 +1393,13 @@ private void InitializeComponent() resources.ApplyResources(this.tsmiTrayScreenRecordingGIF, "tsmiTrayScreenRecordingGIF"); this.tsmiTrayScreenRecordingGIF.Click += new System.EventHandler(this.tsmiScreenRecordingGIF_Click); // + // tsmiTrayScrollingCapture + // + this.tsmiTrayScrollingCapture.Image = global::ShareX.Properties.Resources.ui_scroll_pane_image; + this.tsmiTrayScrollingCapture.Name = "tsmiTrayScrollingCapture"; + resources.ApplyResources(this.tsmiTrayScrollingCapture, "tsmiTrayScrollingCapture"); + this.tsmiTrayScrollingCapture.Click += new System.EventHandler(this.tsmiScrollingCapture_Click); + // // tsmiTrayWebpageCapture // this.tsmiTrayWebpageCapture.Image = global::ShareX.Properties.Resources.document_globe; @@ -1453,6 +1481,7 @@ private void InitializeComponent() this.tsmiTrayRuler, this.tsmiTrayAutomate, this.tsmiTrayIndexFolder, + this.tsmiTrayImageCombiner, this.tsmiTrayVideoThumbnailer, this.tsmiTrayFTPClient, this.tsmiTrayTweetMessage, @@ -1496,6 +1525,13 @@ private void InitializeComponent() resources.ApplyResources(this.tsmiTrayHashCheck, "tsmiTrayHashCheck"); this.tsmiTrayHashCheck.Click += new System.EventHandler(this.tsmiHashCheck_Click); // + // tsmiTrayIRCClient + // + this.tsmiTrayIRCClient.Image = global::ShareX.Properties.Resources.balloon_white; + this.tsmiTrayIRCClient.Name = "tsmiTrayIRCClient"; + resources.ApplyResources(this.tsmiTrayIRCClient, "tsmiTrayIRCClient"); + this.tsmiTrayIRCClient.Click += new System.EventHandler(this.tsmiIRCClient_Click); + // // tsmiTrayDNSChanger // this.tsmiTrayDNSChanger.Image = global::ShareX.Properties.Resources.network_ip; @@ -1545,13 +1581,6 @@ private void InitializeComponent() resources.ApplyResources(this.tsmiTrayFTPClient, "tsmiTrayFTPClient"); this.tsmiTrayFTPClient.Click += new System.EventHandler(this.tsmiFTPClient_Click); // - // tsmiTrayIRCClient - // - this.tsmiTrayIRCClient.Image = global::ShareX.Properties.Resources.balloon_white; - this.tsmiTrayIRCClient.Name = "tsmiTrayIRCClient"; - resources.ApplyResources(this.tsmiTrayIRCClient, "tsmiTrayIRCClient"); - this.tsmiTrayIRCClient.Click += new System.EventHandler(this.tsmiIRCClient_Click); - // // tsmiTrayTweetMessage // this.tsmiTrayTweetMessage.Image = global::ShareX.Properties.Resources.Twitter; @@ -1737,6 +1766,13 @@ private void InitializeComponent() // this.timerTraySingleClick.Tick += new System.EventHandler(this.timerTraySingleClick_Tick); // + // tsmiTrayImageCombiner + // + this.tsmiTrayImageCombiner.Image = global::ShareX.Properties.Resources.document_break; + this.tsmiTrayImageCombiner.Name = "tsmiTrayImageCombiner"; + resources.ApplyResources(this.tsmiTrayImageCombiner, "tsmiTrayImageCombiner"); + this.tsmiTrayImageCombiner.Click += new System.EventHandler(this.tsmiImageCombiner_Click); + // // MainForm // this.AllowDrop = true; @@ -1967,5 +2003,9 @@ private void InitializeComponent() private System.Windows.Forms.Timer timerTraySingleClick; private System.Windows.Forms.ToolStripMenuItem tsmiIRCClient; private System.Windows.Forms.ToolStripMenuItem tsmiTrayIRCClient; + private System.Windows.Forms.ToolStripMenuItem tsmiScrollingCapture; + private System.Windows.Forms.ToolStripMenuItem tsmiTrayScrollingCapture; + private System.Windows.Forms.ToolStripMenuItem tsmiImageCombiner; + private System.Windows.Forms.ToolStripMenuItem tsmiTrayImageCombiner; } } \ No newline at end of file diff --git a/ShareX/Forms/MainForm.cs b/ShareX/Forms/MainForm.cs index 7559349d4..110692299 100644 --- a/ShareX/Forms/MainForm.cs +++ b/ShareX/Forms/MainForm.cs @@ -95,11 +95,15 @@ private void InitControls() Text = Program.Title; - ((ToolStripDropDownMenu)tsddbWorkflows.DropDown).ShowImageMargin = ((ToolStripDropDownMenu)tsmiTrayWorkflows.DropDown).ShowImageMargin = - ((ToolStripDropDownMenu)tsmiMonitor.DropDown).ShowImageMargin = ((ToolStripDropDownMenu)tsmiTrayMonitor.DropDown).ShowImageMargin = - ((ToolStripDropDownMenu)tsmiOpen.DropDown).ShowImageMargin = ((ToolStripDropDownMenu)tsmiCopy.DropDown).ShowImageMargin = - ((ToolStripDropDownMenu)tsmiShortenSelectedURL.DropDown).ShowImageMargin = ((ToolStripDropDownMenu)tsmiShareSelectedURL.DropDown).ShowImageMargin = - ((ToolStripDropDownMenu)tsmiTrayRecentItems.DropDown).ShowImageMargin = false; + tsddbWorkflows.HideImageMargin(); + tsmiTrayWorkflows.HideImageMargin(); + tsmiMonitor.HideImageMargin(); + tsmiTrayMonitor.HideImageMargin(); + tsmiOpen.HideImageMargin(); + tsmiCopy.HideImageMargin(); + tsmiShortenSelectedURL.HideImageMargin(); + tsmiShareSelectedURL.HideImageMargin(); + tsmiTrayRecentItems.HideImageMargin(); AddMultiEnumItems(x => Program.DefaultTaskSettings.AfterCaptureJob = Program.DefaultTaskSettings.AfterCaptureJob.Swap(x), tsddbAfterCaptureTasks, tsmiTrayAfterCaptureTasks); @@ -719,6 +723,8 @@ private void ForceClose() public void UseCommandLineArgs(List commands) { + TaskSettings taskSettings = FindCLITask(commands); + foreach (CLICommand command in commands) { DebugHelper.WriteLine("CommandLine: " + command.Command); @@ -730,11 +736,11 @@ public void UseCommandLineArgs(List commands) if (URLHelpers.IsValidURLRegex(command.Command)) { - UploadManager.DownloadAndUploadFile(command.Command); + UploadManager.DownloadAndUploadFile(command.Command, taskSettings); } else { - UploadManager.UploadFile(command.Command); + UploadManager.UploadFile(command.Command, taskSettings); } } } @@ -743,7 +749,7 @@ private bool CheckCLIHotkey(CLICommand command) { foreach (HotkeyType job in Helpers.GetEnums()) { - if (command.Command.Equals(job.ToString(), StringComparison.InvariantCultureIgnoreCase)) + if (command.CheckCommand(job.ToString())) { ExecuteJob(job); return true; @@ -755,7 +761,7 @@ private bool CheckCLIHotkey(CLICommand command) private bool CheckCLIWorkflow(CLICommand command) { - if (command.Command.Equals("workflow", StringComparison.InvariantCultureIgnoreCase) && !string.IsNullOrEmpty(command.Parameter) && Program.HotkeysConfig != null) + if (Program.HotkeysConfig != null && command.CheckCommand("workflow") && !string.IsNullOrEmpty(command.Parameter)) { foreach (HotkeySettings hotkeySetting in Program.HotkeysConfig.Hotkeys) { @@ -773,6 +779,27 @@ private bool CheckCLIWorkflow(CLICommand command) return false; } + private TaskSettings FindCLITask(List commands) + { + if (Program.HotkeysConfig != null) + { + CLICommand command = commands.FirstOrDefault(x => x.CheckCommand("task") && !string.IsNullOrEmpty(x.Parameter)); + + if (command != null) + { + foreach (HotkeySettings hotkeySetting in Program.HotkeysConfig.Hotkeys) + { + if (command.Parameter == hotkeySetting.TaskSettings.ToString()) + { + return hotkeySetting.TaskSettings; + } + } + } + } + + return null; + } + private WorkerTask[] GetCurrentTasks() { if (lvUploads.SelectedItems.Count > 0) @@ -995,6 +1022,11 @@ private void tsmiIndexFolder_Click(object sender, EventArgs e) TaskHelpers.OpenIndexFolder(); } + private void tsmiImageCombiner_Click(object sender, EventArgs e) + { + TaskHelpers.OpenImageCombiner(); + } + private void tsmiVideoThumbnailer_Click(object sender, EventArgs e) { TaskHelpers.OpenVideoThumbnailer(); @@ -1065,6 +1097,11 @@ private void tsmiScreenRecordingGIF_Click(object sender, EventArgs e) TaskHelpers.StartScreenRecording(ScreenRecordOutput.GIF, ScreenRecordStartMethod.Region); } + private void tsmiScrollingCapture_Click(object sender, EventArgs e) + { + TaskHelpers.OpenScrollingCapture(); + } + private void tsmiAutoCapture_Click(object sender, EventArgs e) { TaskHelpers.OpenAutoCapture(); @@ -1174,7 +1211,11 @@ private void tsbAbout_Click(object sender, EventArgs e) private void tsbDonate_Click(object sender, EventArgs e) { +#if STEAM + URLHelpers.OpenURL(Links.URL_STEAM_DONATE); +#else URLHelpers.OpenURL(Links.URL_DONATE); +#endif } private void lblDragAndDropTip_MouseUp(object sender, MouseEventArgs e) @@ -1547,7 +1588,7 @@ private void InitHotkeys() }, () => { - Program.HotkeyManager = new HotkeyManager(this, Program.HotkeysConfig.Hotkeys); + Program.HotkeyManager = new HotkeyManager(this, Program.HotkeysConfig.Hotkeys, !Program.NoHotkeys); Program.HotkeyManager.HotkeyTrigger += HandleHotkeys; DebugHelper.WriteLine("HotkeyManager started"); @@ -1651,6 +1692,9 @@ private void ExecuteJob(TaskSettings taskSettings, HotkeyType job) case HotkeyType.LastRegion: CaptureScreenshot(CaptureType.LastRegion, safeTaskSettings, false); break; + case HotkeyType.ScrollingCapture: + TaskHelpers.OpenScrollingCapture(safeTaskSettings, true); + break; case HotkeyType.CaptureWebpage: TaskHelpers.OpenWebpageCapture(safeTaskSettings); break; @@ -1695,6 +1739,9 @@ private void ExecuteJob(TaskSettings taskSettings, HotkeyType job) case HotkeyType.HashCheck: TaskHelpers.OpenHashCheck(); break; + case HotkeyType.IRCClient: + TaskHelpers.OpenIRCClient(safeTaskSettings); + break; case HotkeyType.DNSChanger: TaskHelpers.OpenDNSChanger(); break; @@ -1710,6 +1757,12 @@ private void ExecuteJob(TaskSettings taskSettings, HotkeyType job) case HotkeyType.IndexFolder: TaskHelpers.OpenIndexFolder(); break; + case HotkeyType.ImageCombiner: + TaskHelpers.OpenImageCombiner(safeTaskSettings); + break; + case HotkeyType.VideoThumbnailer: + TaskHelpers.OpenVideoThumbnailer(safeTaskSettings); + break; case HotkeyType.FTPClient: TaskHelpers.OpenFTPClient(); break; diff --git a/ShareX/Forms/MainForm.pt-BR.resx b/ShareX/Forms/MainForm.pt-BR.resx index fb774481c..4c6914565 100644 --- a/ShareX/Forms/MainForm.pt-BR.resx +++ b/ShareX/Forms/MainForm.pt-BR.resx @@ -256,7 +256,7 @@ Imagem - URL encurtada + URL encurtado Texto @@ -337,7 +337,7 @@ Upload de pasta... - Upload da URL... + Upload do URL... Encurtadores de URL @@ -415,7 +415,7 @@ Janela - Upload da URL... + Upload do URL... Teste de monitor... diff --git a/ShareX/Forms/MainForm.resx b/ShareX/Forms/MainForm.resx index 2baace343..74e9364ce 100644 --- a/ShareX/Forms/MainForm.resx +++ b/ShareX/Forms/MainForm.resx @@ -325,91 +325,97 @@ Left - 191, 22 + 230, 22 Fullscreen - 191, 22 + 230, 22 Window - 191, 22 + 230, 22 Monitor - 191, 22 + 230, 22 Region - 191, 22 + 230, 22 - Region (Objects) + Region (Windows && controls) - 191, 22 + 230, 22 Region (Annotate) - 191, 22 + 230, 22 Region (Light) - 191, 22 + 230, 22 Region (Transparent) - 191, 22 + 230, 22 Polygon - 191, 22 + 230, 22 Freehand - 191, 22 + 230, 22 Last region - 191, 22 + 230, 22 Screen recording - 191, 22 + 230, 22 Screen recording (GIF) + + 230, 22 + + + Scrolling capture... + - 191, 22 + 230, 22 Webpage capture... - 191, 22 + 230, 22 Auto capture... @@ -546,6 +552,12 @@ Index folder... + + 183, 22 + + + Image combiner... + 183, 22 @@ -1132,91 +1144,97 @@ 190, 17 - 191, 22 + 230, 22 Fullscreen - 191, 22 + 230, 22 Window - 191, 22 + 230, 22 Monitor - 191, 22 + 230, 22 Region - 191, 22 + 230, 22 - Region (Objects) + Region (Windows && controls) - 191, 22 + 230, 22 Region (Annotate) - 191, 22 + 230, 22 Region (Light) - 191, 22 + 230, 22 Region (Transparent) - 191, 22 + 230, 22 Polygon - 191, 22 + 230, 22 Freehand - 191, 22 + 230, 22 Last region - 191, 22 + 230, 22 Screen recording - 191, 22 + 230, 22 Screen recording (GIF) + + 230, 22 + + + Scrolling capture... + - 191, 22 + 230, 22 Webpage capture... - 191, 22 + 230, 22 Auto capture... @@ -1335,6 +1353,12 @@ Index folder... + + 183, 22 + + + Image combiner... + 183, 22 @@ -1665,6 +1689,12 @@ System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + tsmiScrollingCapture + + + System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + tsmiWebpageCapture @@ -1755,6 +1785,12 @@ System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + tsmiIRCClient + + + System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + tsmiDNSChanger @@ -1785,6 +1821,12 @@ System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + tsmiImageCombiner + + + System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + tsmiVideoThumbnailer @@ -1797,12 +1839,6 @@ System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - tsmiIRCClient - - - System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - tsmiTweetMessage @@ -2367,6 +2403,12 @@ System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + tsmiTrayScrollingCapture + + + System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + tsmiTrayWebpageCapture @@ -2457,6 +2499,12 @@ System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + tsmiTrayIRCClient + + + System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + tsmiTrayDNSChanger @@ -2499,12 +2547,6 @@ System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - tsmiTrayIRCClient - - - System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - tsmiTrayTweetMessage @@ -2673,10 +2715,16 @@ System.Windows.Forms.Timer, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + tsmiTrayImageCombiner + + + System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + MainForm - ShareX.HotkeyForm, ShareX, Version=10.2.0.0, Culture=neutral, PublicKeyToken=null + ShareX.HotkeyForm, ShareX, Version=10.3.0.0, Culture=neutral, PublicKeyToken=null \ No newline at end of file diff --git a/ShareX/Forms/MainForm.tr.resx b/ShareX/Forms/MainForm.tr.resx index edea5b99a..ac1c571db 100644 --- a/ShareX/Forms/MainForm.tr.resx +++ b/ShareX/Forms/MainForm.tr.resx @@ -151,7 +151,7 @@ Bölge - Bölge (Objeler) + Bölge (Pencereler ve kontroller) Bölge (Dipnot) @@ -445,7 +445,7 @@ Bölge - Bölge (Objeler) + Bölge (Pencereler ve kontroller) Bölge (Dipnot) diff --git a/ShareX/Forms/TaskSettingsForm.Designer.cs b/ShareX/Forms/TaskSettingsForm.Designer.cs index 37184f0d1..c2369072c 100644 --- a/ShareX/Forms/TaskSettingsForm.Designer.cs +++ b/ShareX/Forms/TaskSettingsForm.Designer.cs @@ -44,12 +44,16 @@ private void InitializeComponent() this.chkOverrideCustomUploader = new System.Windows.Forms.CheckBox(); this.chkOverrideFTP = new System.Windows.Forms.CheckBox(); this.cboFTPaccounts = new System.Windows.Forms.ComboBox(); + this.btnAfterCapture = new ShareX.HelpersLib.MenuButton(); + this.btnAfterUpload = new ShareX.HelpersLib.MenuButton(); + this.btnDestinations = new ShareX.HelpersLib.MenuButton(); this.cmsDestinations = new System.Windows.Forms.ContextMenuStrip(this.components); this.tsmiImageUploaders = new System.Windows.Forms.ToolStripMenuItem(); this.tsmiTextUploaders = new System.Windows.Forms.ToolStripMenuItem(); this.tsmiFileUploaders = new System.Windows.Forms.ToolStripMenuItem(); this.tsmiURLShorteners = new System.Windows.Forms.ToolStripMenuItem(); this.tsmiURLSharingServices = new System.Windows.Forms.ToolStripMenuItem(); + this.btnTask = new ShareX.HelpersLib.MenuButton(); this.tpGeneral = new System.Windows.Forms.TabPage(); this.panelGeneral = new System.Windows.Forms.Panel(); this.chkShowBeforeUploadForm = new System.Windows.Forms.CheckBox(); @@ -146,6 +150,11 @@ private void InitializeComponent() this.pActions = new System.Windows.Forms.Panel(); this.btnActionsDuplicate = new System.Windows.Forms.Button(); this.btnActionsAdd = new System.Windows.Forms.Button(); + this.lvActions = new ShareX.HelpersLib.MyListView(); + this.chActionsName = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader())); + this.chActionsPath = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader())); + this.chActionsArgs = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader())); + this.chActionsExtensions = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader())); this.btnActionsEdit = new System.Windows.Forms.Button(); this.btnActionsRemove = new System.Windows.Forms.Button(); this.chkUseDefaultActions = new System.Windows.Forms.CheckBox(); @@ -190,15 +199,6 @@ private void InitializeComponent() this.tpAdvanced = new System.Windows.Forms.TabPage(); this.pgTaskSettings = new System.Windows.Forms.PropertyGrid(); this.chkUseDefaultAdvancedSettings = new System.Windows.Forms.CheckBox(); - this.btnAfterCapture = new ShareX.HelpersLib.MenuButton(); - this.btnAfterUpload = new ShareX.HelpersLib.MenuButton(); - this.btnDestinations = new ShareX.HelpersLib.MenuButton(); - this.btnTask = new ShareX.HelpersLib.MenuButton(); - this.lvActions = new ShareX.HelpersLib.MyListView(); - this.chActionsName = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader())); - this.chActionsPath = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader())); - this.chActionsArgs = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader())); - this.chActionsExtensions = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader())); this.tttvMain = new ShareX.HelpersLib.TabToTreeView(); this.tcTaskSettings.SuspendLayout(); this.tpTask.SuspendLayout(); @@ -360,6 +360,30 @@ private void InitializeComponent() this.cboFTPaccounts.Name = "cboFTPaccounts"; this.cboFTPaccounts.SelectedIndexChanged += new System.EventHandler(this.cboFTPaccounts_SelectedIndexChanged); // + // btnAfterCapture + // + resources.ApplyResources(this.btnAfterCapture, "btnAfterCapture"); + this.btnAfterCapture.Menu = this.cmsAfterCapture; + this.btnAfterCapture.Name = "btnAfterCapture"; + this.btnAfterCapture.UseMnemonic = false; + this.btnAfterCapture.UseVisualStyleBackColor = true; + // + // btnAfterUpload + // + resources.ApplyResources(this.btnAfterUpload, "btnAfterUpload"); + this.btnAfterUpload.Menu = this.cmsAfterUpload; + this.btnAfterUpload.Name = "btnAfterUpload"; + this.btnAfterUpload.UseMnemonic = false; + this.btnAfterUpload.UseVisualStyleBackColor = true; + // + // btnDestinations + // + resources.ApplyResources(this.btnDestinations, "btnDestinations"); + this.btnDestinations.Menu = this.cmsDestinations; + this.btnDestinations.Name = "btnDestinations"; + this.btnDestinations.UseMnemonic = false; + this.btnDestinations.UseVisualStyleBackColor = true; + // // cmsDestinations // this.cmsDestinations.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { @@ -401,6 +425,14 @@ private void InitializeComponent() this.tsmiURLSharingServices.Name = "tsmiURLSharingServices"; resources.ApplyResources(this.tsmiURLSharingServices, "tsmiURLSharingServices"); // + // btnTask + // + resources.ApplyResources(this.btnTask, "btnTask"); + this.btnTask.Menu = this.cmsTask; + this.btnTask.Name = "btnTask"; + this.btnTask.UseMnemonic = false; + this.btnTask.UseVisualStyleBackColor = true; + // // tpGeneral // this.tpGeneral.Controls.Add(this.panelGeneral); @@ -1249,6 +1281,42 @@ private void InitializeComponent() this.btnActionsAdd.UseVisualStyleBackColor = true; this.btnActionsAdd.Click += new System.EventHandler(this.btnActionsAdd_Click); // + // lvActions + // + this.lvActions.AllowDrop = true; + this.lvActions.AllowItemDrag = true; + resources.ApplyResources(this.lvActions, "lvActions"); + this.lvActions.AutoFillColumn = true; + this.lvActions.CheckBoxes = true; + this.lvActions.Columns.AddRange(new System.Windows.Forms.ColumnHeader[] { + this.chActionsName, + this.chActionsPath, + this.chActionsArgs, + this.chActionsExtensions}); + this.lvActions.FullRowSelect = true; + this.lvActions.MultiSelect = false; + this.lvActions.Name = "lvActions"; + this.lvActions.UseCompatibleStateImageBehavior = false; + this.lvActions.View = System.Windows.Forms.View.Details; + this.lvActions.ItemMoved += new ShareX.HelpersLib.MyListView.ListViewItemMovedEventHandler(this.lvActions_ItemMoved); + this.lvActions.ItemChecked += new System.Windows.Forms.ItemCheckedEventHandler(this.lvActions_ItemChecked); + // + // chActionsName + // + resources.ApplyResources(this.chActionsName, "chActionsName"); + // + // chActionsPath + // + resources.ApplyResources(this.chActionsPath, "chActionsPath"); + // + // chActionsArgs + // + resources.ApplyResources(this.chActionsArgs, "chActionsArgs"); + // + // chActionsExtensions + // + resources.ApplyResources(this.chActionsExtensions, "chActionsExtensions"); + // // btnActionsEdit // resources.ApplyResources(this.btnActionsEdit, "btnActionsEdit"); @@ -1577,74 +1645,6 @@ private void InitializeComponent() this.chkUseDefaultAdvancedSettings.UseVisualStyleBackColor = true; this.chkUseDefaultAdvancedSettings.CheckedChanged += new System.EventHandler(this.chkUseDefaultAdvancedSettings_CheckedChanged); // - // btnAfterCapture - // - resources.ApplyResources(this.btnAfterCapture, "btnAfterCapture"); - this.btnAfterCapture.Menu = this.cmsAfterCapture; - this.btnAfterCapture.Name = "btnAfterCapture"; - this.btnAfterCapture.UseMnemonic = false; - this.btnAfterCapture.UseVisualStyleBackColor = true; - // - // btnAfterUpload - // - resources.ApplyResources(this.btnAfterUpload, "btnAfterUpload"); - this.btnAfterUpload.Menu = this.cmsAfterUpload; - this.btnAfterUpload.Name = "btnAfterUpload"; - this.btnAfterUpload.UseMnemonic = false; - this.btnAfterUpload.UseVisualStyleBackColor = true; - // - // btnDestinations - // - resources.ApplyResources(this.btnDestinations, "btnDestinations"); - this.btnDestinations.Menu = this.cmsDestinations; - this.btnDestinations.Name = "btnDestinations"; - this.btnDestinations.UseMnemonic = false; - this.btnDestinations.UseVisualStyleBackColor = true; - // - // btnTask - // - resources.ApplyResources(this.btnTask, "btnTask"); - this.btnTask.Menu = this.cmsTask; - this.btnTask.Name = "btnTask"; - this.btnTask.UseMnemonic = false; - this.btnTask.UseVisualStyleBackColor = true; - // - // lvActions - // - this.lvActions.AllowDrop = true; - this.lvActions.AllowItemDrag = true; - resources.ApplyResources(this.lvActions, "lvActions"); - this.lvActions.AutoFillColumn = true; - this.lvActions.CheckBoxes = true; - this.lvActions.Columns.AddRange(new System.Windows.Forms.ColumnHeader[] { - this.chActionsName, - this.chActionsPath, - this.chActionsArgs, - this.chActionsExtensions}); - this.lvActions.FullRowSelect = true; - this.lvActions.MultiSelect = false; - this.lvActions.Name = "lvActions"; - this.lvActions.UseCompatibleStateImageBehavior = false; - this.lvActions.View = System.Windows.Forms.View.Details; - this.lvActions.ItemMoved += new ShareX.HelpersLib.MyListView.ListViewItemMovedEventHandler(this.lvActions_ItemMoved); - this.lvActions.ItemChecked += new System.Windows.Forms.ItemCheckedEventHandler(this.lvActions_ItemChecked); - // - // chActionsName - // - resources.ApplyResources(this.chActionsName, "chActionsName"); - // - // chActionsPath - // - resources.ApplyResources(this.chActionsPath, "chActionsPath"); - // - // chActionsArgs - // - resources.ApplyResources(this.chActionsArgs, "chActionsArgs"); - // - // chActionsExtensions - // - resources.ApplyResources(this.chActionsExtensions, "chActionsExtensions"); - // // tttvMain // resources.ApplyResources(this.tttvMain, "tttvMain"); diff --git a/ShareX/Forms/TaskSettingsForm.resx b/ShareX/Forms/TaskSettingsForm.resx index 76501280d..89b311505 100644 --- a/ShareX/Forms/TaskSettingsForm.resx +++ b/ShareX/Forms/TaskSettingsForm.resx @@ -3580,7 +3580,7 @@ NoControl - 8, 216 + 8, 224 313, 17 @@ -3709,7 +3709,7 @@ NoControl - 8, 184 + 8, 192 256, 23 @@ -4491,24 +4491,6 @@ System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - chWatchFolderFolderPath - - - System.Windows.Forms.ColumnHeader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - chWatchFolderFilter - - - System.Windows.Forms.ColumnHeader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - chWatchFolderIncludeSubdirectories - - - System.Windows.Forms.ColumnHeader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - chActionsName @@ -4533,6 +4515,24 @@ System.Windows.Forms.ColumnHeader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + chWatchFolderFolderPath + + + System.Windows.Forms.ColumnHeader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + chWatchFolderFilter + + + System.Windows.Forms.ColumnHeader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + chWatchFolderIncludeSubdirectories + + + System.Windows.Forms.ColumnHeader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + TaskSettingsForm diff --git a/ShareX/HotkeyManager.cs b/ShareX/HotkeyManager.cs index 93d4f1ff9..61c141fce 100644 --- a/ShareX/HotkeyManager.cs +++ b/ShareX/HotkeyManager.cs @@ -42,7 +42,7 @@ public class HotkeyManager private HotkeyForm hotkeyForm; - public HotkeyManager(HotkeyForm form, List hotkeys) + public HotkeyManager(HotkeyForm form, List hotkeys, bool registerHotkeys) { hotkeyForm = form; hotkeyForm.HotkeyPress += hotkeyForm_HotkeyPress; @@ -50,8 +50,11 @@ public HotkeyManager(HotkeyForm form, List hotkeys) Hotkeys = hotkeys; - RegisterAllHotkeys(); - ShowFailedHotkeys(); + if (registerHotkeys) + { + RegisterAllHotkeys(); + ShowFailedHotkeys(); + } } private void hotkeyForm_HotkeyPress(ushort id, Keys key, Modifiers modifier) diff --git a/ShareX/ImageCombinerOptions.cs b/ShareX/ImageCombinerOptions.cs new file mode 100644 index 000000000..04cddb22c --- /dev/null +++ b/ShareX/ImageCombinerOptions.cs @@ -0,0 +1,39 @@ +#region License Information (GPL v3) + +/* + ShareX - A program that allows you to take screenshots and share any file type + Copyright (c) 2007-2015 ShareX Team + + This program is free software; you can redistribute it and/or + modify it under the terms of the GNU General Public License + as published by the Free Software Foundation; either version 2 + of the License, or (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + + Optionally you can also view the license at . +*/ + +#endregion License Information (GPL v3) + +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Windows.Forms; + +namespace ShareX +{ + public class ImageCombinerOptions + { + public Orientation Orientation { get; set; } = Orientation.Vertical; + public int Space { get; set; } = 0; + } +} \ No newline at end of file diff --git a/ShareX/Program.cs b/ShareX/Program.cs index a4fed551e..62b159d63 100644 --- a/ShareX/Program.cs +++ b/ShareX/Program.cs @@ -75,6 +75,7 @@ public static string Title public static bool IsSilentRun { get; private set; } public static bool IsSandbox { get; private set; } public static bool IsFirstTimeConfig { get; private set; } + public static bool NoHotkeys { get; private set; } public static ApplicationConfig Settings { get; private set; } public static TaskSettings DefaultTaskSettings { get; private set; } @@ -204,7 +205,7 @@ public static string LogsFilePath { get { - string filename = string.Format(LogFileName, FastDateTime.Now); + string filename = string.Format(LogFileName, DateTime.Now); return Path.Combine(LogsFolder, filename); } } @@ -314,7 +315,11 @@ private static void Run() } } +#if STEAM IsFirstTimeConfig = CLI.IsCommandExist("SteamConfig"); +#endif + + NoHotkeys = CLI.IsCommandExist("NoHotkeys"); DebugHelper.WriteLine($"{Title} {Build} build"); DebugHelper.WriteLine("Operating system: " + Environment.OSVersion.VersionString); diff --git a/ShareX/Properties/AssemblyInfo.cs b/ShareX/Properties/AssemblyInfo.cs index df0bfe614..59bb98abb 100644 --- a/ShareX/Properties/AssemblyInfo.cs +++ b/ShareX/Properties/AssemblyInfo.cs @@ -11,5 +11,5 @@ [assembly: AssemblyCulture("")] [assembly: ComVisible(false)] [assembly: Guid("82E6AC09-0FEF-4390-AD9F-0DD3F5561EFC")] -[assembly: AssemblyVersion("10.2.5")] -[assembly: AssemblyFileVersion("10.2.5")] \ No newline at end of file +[assembly: AssemblyVersion("10.3.0")] +[assembly: AssemblyFileVersion("10.3.0")] \ No newline at end of file diff --git a/ShareX/Properties/Resources.Designer.cs b/ShareX/Properties/Resources.Designer.cs index 1abf22496..1e1041b6f 100644 --- a/ShareX/Properties/Resources.Designer.cs +++ b/ShareX/Properties/Resources.Designer.cs @@ -60,6 +60,15 @@ public class Resources { } } + /// + /// Looks up a localized string similar to Changelog. + /// + public static string AboutForm_AboutForm_Changelog { + get { + return ResourceManager.GetString("AboutForm_AboutForm_Changelog", resourceCulture); + } + } + /// /// Looks up a localized string similar to Contributors. /// @@ -542,6 +551,16 @@ public class Resources { } } + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap CompanionCube { + get { + object obj = ResourceManager.GetObject("CompanionCube", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// @@ -612,6 +631,16 @@ public class Resources { } } + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap document_break { + get { + object obj = ResourceManager.GetObject("document-break", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// @@ -1908,6 +1937,16 @@ public class Resources { } } + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap ui_scroll_pane_image { + get { + object obj = ResourceManager.GetObject("ui_scroll_pane_image", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// diff --git a/ShareX/Properties/Resources.resx b/ShareX/Properties/Resources.resx index dd597d920..a54d45dfa 100644 --- a/ShareX/Properties/Resources.resx +++ b/ShareX/Properties/Resources.resx @@ -223,6 +223,9 @@ Press 'No' to cancel the current upload and disable screenshot auto uploading. ..\Resources\folder-open-image.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\ui-scroll-pane-image.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\camcorder--pencil.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -244,9 +247,6 @@ Press 'No' to cancel the current upload and disable screenshot auto uploading. URL is empty. - - Text upload test - Choose ShareX personal folder path @@ -296,6 +296,9 @@ Please select a different hotkey or quit the conflicting application and reopen ..\Resources\keyboard--minus.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + Changelog + ..\Resources\steam.ico;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -325,6 +328,9 @@ Would you like to automatically download it? ..\Resources\application-block.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + Translators + ..\Resources\image-export.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -364,11 +370,11 @@ Press yes to open image from clipboard. Alternatively, press no to open image fi Hide menu - - ..\Resources\navigation-000-button.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\monitor.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - URL shortener: {0} + + Capture ..\Resources\tr.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -409,8 +415,8 @@ Press yes to open image from clipboard. Alternatively, press no to open image fi Upload files - - CLI video encoder file does not exist: + + ..\Resources\document-copy.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\globe-share.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -467,12 +473,15 @@ here Choose encoder path + + For settings to take effect ShareX needs to be reopened from Steam. + Can't access to "{0}" file. Please run ShareX as administrator to change personal folder path. - - ..\Resources\gear.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + CLI video encoder file does not exist: ..\Resources\image-saturation.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -566,8 +575,8 @@ Would you like to restart ShareX? ..\Resources\folder-tree.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - Translators + + ..\Resources\arrow-270.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\layer.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -575,9 +584,6 @@ Would you like to restart ShareX? ..\Resources\ruler-triangle.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - {0} is about to be uploaded to {1}. You may choose a different destination. - Start @@ -596,8 +602,8 @@ Would you like to restart ShareX? Configure CLI video encoders ---> - - ..\Resources\camera.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + URL shortener: {0} ..\Resources\clipboard.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -635,6 +641,9 @@ Would you like to restart ShareX? ..\Resources\cross.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\navigation-000-button.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\layout-select-sidebar.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -651,6 +660,9 @@ Would you like to restart ShareX? Text uploader: {0} + + ..\Resources\ru.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\clock.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -666,6 +678,9 @@ Would you like to restart ShareX? ..\Resources\es.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\CompanionCube.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\layer-shape-polygon.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -684,9 +699,15 @@ Would you like to restart ShareX? ..\Resources\cross-button.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + Chrome support disabled. + Issues + + Chrome support enabled. + Close @@ -702,8 +723,8 @@ Would you like to restart ShareX? Preview: - - ..\Resources\document-copy.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + Text upload test ..\Resources\application-task.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -723,6 +744,9 @@ Would you like to restart ShareX? Downloading + + ..\Resources\gear.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + Image editor - How to load image? @@ -747,8 +771,8 @@ Would you like to restart ShareX? Unable to find valid Twitter account. - - ..\Resources\monitor.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + {0} is about to be uploaded to {1}. You may choose a different destination. Website @@ -765,8 +789,8 @@ Would you like to restart ShareX? ..\Resources\Fullscreen.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - Capture + + ..\Resources\camera.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\exclamation-button.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -781,19 +805,7 @@ Would you like to restart ShareX? Start screen color picker - - ..\Resources\arrow-270.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - Chrome support enabled. - - - Chrome support disabled. - - - ..\Resources\ru.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - For settings to take effect ShareX needs to be reopened from Steam. + + ..\Resources\document-break.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a \ No newline at end of file diff --git a/ShareX/Properties/Resources.tr.resx b/ShareX/Properties/Resources.tr.resx index 7dde6968a..78285c37e 100644 --- a/ShareX/Properties/Resources.tr.resx +++ b/ShareX/Properties/Resources.tr.resx @@ -470,4 +470,7 @@ Evet tuĹźuna basarsanız panonuzdaki resim açılır. Veya hayır tuĹźuna basara Ayarların geçerli olabilmesi için ShareX in Steam den yeniden açılması gerekmektedir. + + DeÄźiĹźim gĂĽnlüğü + \ No newline at end of file diff --git a/ShareX/Resources/CompanionCube.png b/ShareX/Resources/CompanionCube.png new file mode 100644 index 000000000..d2d27341a Binary files /dev/null and b/ShareX/Resources/CompanionCube.png differ diff --git a/ShareX/Resources/document-break.png b/ShareX/Resources/document-break.png new file mode 100644 index 000000000..65a6a6bee Binary files /dev/null and b/ShareX/Resources/document-break.png differ diff --git a/ShareX/Resources/ui-scroll-pane-image.png b/ShareX/Resources/ui-scroll-pane-image.png new file mode 100644 index 000000000..4ed26a46c Binary files /dev/null and b/ShareX/Resources/ui-scroll-pane-image.png differ diff --git a/ShareX/ShareX.csproj b/ShareX/ShareX.csproj index bed61dc2f..3592c084a 100644 --- a/ShareX/ShareX.csproj +++ b/ShareX/ShareX.csproj @@ -97,6 +97,8 @@ + + UserControl @@ -121,6 +123,9 @@ ClipboardFormatForm.cs + + Form + Form @@ -161,6 +166,12 @@ AboutForm.cs + + Form + + + ImageCombinerForm.cs + Form @@ -173,6 +184,7 @@ FirstTimeConfigForm.cs + @@ -642,6 +654,9 @@ HotkeySettingsForm.cs + + ImageCombinerForm.cs + MainForm.cs @@ -999,10 +1014,6 @@ - - LICENSE.txt - PreserveNewest - 7z-x64.dll PreserveNewest @@ -1065,6 +1076,9 @@ + + + diff --git a/ShareX/TaskHelpers.cs b/ShareX/TaskHelpers.cs index c841ae244..b92a1f615 100644 --- a/ShareX/TaskHelpers.cs +++ b/ShareX/TaskHelpers.cs @@ -324,48 +324,7 @@ private static void AddExternalProgramFromRegistry(TaskSettings taskSettings, st public static bool SelectRegion(out Rectangle rect, TaskSettings taskSettings) { - using (RectangleRegion surface = new RectangleRegion()) - { - surface.Config = taskSettings.CaptureSettings.SurfaceOptions; - surface.Config.ShowTips = false; - surface.Config.QuickCrop = true; - surface.Config.ForceWindowCapture = true; - surface.Prepare(); - surface.ShowDialog(); - - if (surface.Result == SurfaceResult.Region) - { - if (surface.AreaManager.IsCurrentAreaValid) - { - rect = CaptureHelpers.ClientToScreen(surface.AreaManager.CurrentArea); - return true; - } - } - else if (surface.Result == SurfaceResult.Fullscreen) - { - rect = CaptureHelpers.GetScreenBounds(); - return true; - } - else if (surface.Result == SurfaceResult.Monitor) - { - Screen[] screens = Screen.AllScreens; - - if (surface.MonitorIndex < screens.Length) - { - Screen screen = screens[surface.MonitorIndex]; - rect = screen.Bounds; - return true; - } - } - else if (surface.Result == SurfaceResult.ActiveMonitor) - { - rect = CaptureHelpers.GetActiveScreenBounds(); - return true; - } - } - - rect = Rectangle.Empty; - return false; + return Surface.SelectRegion(out rect, taskSettings.CaptureSettings.SurfaceOptions); } public static PointInfo SelectPointColor() @@ -490,6 +449,15 @@ public static void StartScreenRecording(ScreenRecordOutput outputType, ScreenRec ScreenRecordManager.StartStopRecording(outputType, startMethod, taskSettings); } + public static void OpenScrollingCapture(TaskSettings taskSettings = null, bool forceSelection = false) + { + if (taskSettings == null) taskSettings = TaskSettings.GetDefaultTaskSettings(); + + ScrollingCaptureForm scrollingCaptureForm = new ScrollingCaptureForm(taskSettings.CaptureSettingsReference.ScrollingCaptureOptions, forceSelection); + scrollingCaptureForm.ProcessRequested += image => UploadManager.RunImageTask(image, taskSettings); + scrollingCaptureForm.Show(); + } + public static void OpenAutoCapture() { AutoCaptureForm.Instance.ShowActivate(); @@ -616,6 +584,15 @@ public static void OpenIndexFolder() UploadManager.IndexFolder(); } + public static void OpenImageCombiner(TaskSettings taskSettings = null) + { + if (taskSettings == null) taskSettings = TaskSettings.GetDefaultTaskSettings(); + + ImageCombinerForm imageCombinerForm = new ImageCombinerForm(taskSettings.ToolsSettingsReference.ImageCombinerOptions); + imageCombinerForm.ProcessRequested += image => UploadManager.RunImageTask(image, taskSettings); + imageCombinerForm.Show(); + } + public static void OpenVideoThumbnailer(TaskSettings taskSettings = null) { if (taskSettings == null) taskSettings = TaskSettings.GetDefaultTaskSettings(); diff --git a/ShareX/TaskInfo.cs b/ShareX/TaskInfo.cs index f916a7a11..3ab66bee1 100644 --- a/ShareX/TaskInfo.cs +++ b/ShareX/TaskInfo.cs @@ -157,7 +157,7 @@ public HistoryItem GetHistoryItem() { Filename = FileName, Filepath = FilePath, - DateTimeUtc = UploadTime, + DateTime = UploadTime, Type = DataType.ToString(), Host = UploaderHost, URL = Result.URL, diff --git a/ShareX/TaskSettings.cs b/ShareX/TaskSettings.cs index 473a23f67..ec2bb8496 100644 --- a/ShareX/TaskSettings.cs +++ b/ShareX/TaskSettings.cs @@ -326,6 +326,12 @@ public class TaskSettingsCapture #endregion Capture / Screen recorder + #region Capture / Scrolling capture + + public ScrollingCaptureOptions ScrollingCaptureOptions = new ScrollingCaptureOptions(); + + #endregion Capture / Scrolling capture + #region Capture / Rectangle annotate public RectangleAnnotateOptions RectangleAnnotateOptions = new RectangleAnnotateOptions(); @@ -358,6 +364,7 @@ public class TaskSettingsUpload public class TaskSettingsTools { public IndexerSettings IndexerSettings = new IndexerSettings(); + public ImageCombinerOptions ImageCombinerOptions = new ImageCombinerOptions(); public VideoThumbnailOptions VideoThumbnailOptions = new VideoThumbnailOptions(); public IRCInfo IRCSettings = new IRCInfo(); }