From 5f633a7d67658ef8cc7395c008e72b8dd3de6029 Mon Sep 17 00:00:00 2001 From: Manfred Karrer Date: Thu, 24 Apr 2014 16:55:55 +0200 Subject: [PATCH] add basic wallet, update nav buttons, move unused img --- COPYING | 202 ------ LICENSE | 661 ++++++++++++++++++ design/navIcons.psd | Bin 48076 -> 49006 bytes .../java/io/bitsquare/btc/IWalletFacade.java | 12 + .../java/io/bitsquare/btc/WalletFacade.java | 15 +- .../java/io/bitsquare/di/BitSquareModule.java | 2 +- .../java/io/bitsquare/gui/MainController.java | 68 +- src/main/java/io/bitsquare/gui/MainView.fxml | 4 +- .../bitsquare/gui/funds/FundsController.java | 39 ++ .../io/bitsquare/gui/funds/FundsView.fxml | 45 +- src/main/java/io/bitsquare/gui/global.css | 27 +- .../java/io/bitsquare/gui/home/HomeView.fxml | 2 + .../java/io/bitsquare/gui/util/Icons.java | 20 +- src/main/resources/images/add.png | Bin 708 -> 0 bytes src/main/resources/images/buy_white.png | Bin 287 -> 0 bytes src/main/resources/images/edit.png | Bin 425 -> 0 bytes src/main/resources/images/edit_pen.png | Bin 415 -> 0 bytes src/main/resources/images/funds.png | Bin 388 -> 0 bytes src/main/resources/images/history.png | Bin 330 -> 0 bytes src/main/resources/images/home.png | Bin 457 -> 0 bytes src/main/resources/images/info.png | Bin 491 -> 0 bytes src/main/resources/images/msg.png | Bin 376 -> 0 bytes src/main/resources/images/nav_buy.png | Bin 568 -> 0 bytes src/main/resources/images/nav_buy_active.png | Bin 574 -> 0 bytes src/main/resources/images/nav_sell.png | Bin 553 -> 0 bytes src/main/resources/images/nav_sell_active.png | Bin 558 -> 0 bytes src/main/resources/images/orders.png | Bin 361 -> 0 bytes src/main/resources/images/payment_step1.png | Bin 1540 -> 0 bytes src/main/resources/images/payment_step2.png | Bin 1628 -> 0 bytes src/main/resources/images/payment_step3.png | Bin 1706 -> 0 bytes src/main/resources/images/payment_step4.png | Bin 1681 -> 0 bytes src/main/resources/images/payment_step5.png | Bin 1663 -> 0 bytes src/main/resources/images/peers.png | Bin 1945 -> 0 bytes src/main/resources/images/remove.png | Bin 454 -> 0 bytes src/main/resources/images/remove_minus.png | Bin 389 -> 0 bytes src/main/resources/images/remove_minus_8.png | Bin 212 -> 0 bytes src/main/resources/images/sell_white.png | Bin 284 -> 0 bytes src/main/resources/images/settings.png | Bin 571 -> 0 bytes src/main/resources/images/step1.png | Bin 1436 -> 0 bytes src/main/resources/images/step2.png | Bin 1670 -> 0 bytes src/main/resources/images/step3.png | Bin 1703 -> 0 bytes src/main/resources/images/step4.png | Bin 1621 -> 0 bytes src/main/resources/images/step5.png | Bin 1532 -> 0 bytes src/main/resources/images/trade.png | Bin 371 -> 0 bytes src/main/resources/images/trash.png | Bin 286 -> 0 bytes src/main/resources/images/unused/edit.png | Bin 2950 -> 425 bytes 46 files changed, 840 insertions(+), 257 deletions(-) delete mode 100644 COPYING create mode 100644 LICENSE delete mode 100644 src/main/resources/images/add.png delete mode 100644 src/main/resources/images/buy_white.png delete mode 100644 src/main/resources/images/edit.png delete mode 100644 src/main/resources/images/edit_pen.png delete mode 100644 src/main/resources/images/funds.png delete mode 100644 src/main/resources/images/history.png delete mode 100644 src/main/resources/images/home.png delete mode 100644 src/main/resources/images/info.png delete mode 100644 src/main/resources/images/msg.png delete mode 100644 src/main/resources/images/nav_buy.png delete mode 100644 src/main/resources/images/nav_buy_active.png delete mode 100644 src/main/resources/images/nav_sell.png delete mode 100644 src/main/resources/images/nav_sell_active.png delete mode 100644 src/main/resources/images/orders.png delete mode 100644 src/main/resources/images/payment_step1.png delete mode 100644 src/main/resources/images/payment_step2.png delete mode 100644 src/main/resources/images/payment_step3.png delete mode 100644 src/main/resources/images/payment_step4.png delete mode 100644 src/main/resources/images/payment_step5.png delete mode 100644 src/main/resources/images/peers.png delete mode 100644 src/main/resources/images/remove.png delete mode 100644 src/main/resources/images/remove_minus.png delete mode 100644 src/main/resources/images/remove_minus_8.png delete mode 100644 src/main/resources/images/sell_white.png delete mode 100644 src/main/resources/images/settings.png delete mode 100644 src/main/resources/images/step1.png delete mode 100644 src/main/resources/images/step2.png delete mode 100644 src/main/resources/images/step3.png delete mode 100644 src/main/resources/images/step4.png delete mode 100644 src/main/resources/images/step5.png delete mode 100644 src/main/resources/images/trade.png delete mode 100644 src/main/resources/images/trash.png diff --git a/COPYING b/COPYING deleted file mode 100644 index 57418495d6..0000000000 --- a/COPYING +++ /dev/null @@ -1,202 +0,0 @@ - - Apache License - Version 2.0, January 2004 - http://www.apache.org/licenses/ - - TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION - - 1. Definitions. - - "License" shall mean the terms and conditions for use, reproduction, - and distribution as defined by Sections 1 through 9 of this document. - - "Licensor" shall mean the copyright owner or entity authorized by - the copyright owner that is granting the License. - - "Legal Entity" shall mean the union of the acting entity and all - other entities that control, are controlled by, or are under common - control with that entity. For the purposes of this definition, - "control" means (i) the power, direct or indirect, to cause the - direction or management of such entity, whether by contract or - otherwise, or (ii) ownership of fifty percent (50%) or more of the - outstanding shares, or (iii) beneficial ownership of such entity. - - "You" (or "Your") shall mean an individual or Legal Entity - exercising permissions granted by this License. - - "Source" form shall mean the preferred form for making modifications, - including but not limited to software source code, documentation - source, and configuration files. - - "Object" form shall mean any form resulting from mechanical - transformation or translation of a Source form, including but - not limited to compiled object code, generated documentation, - and conversions to other media types. - - "Work" shall mean the work of authorship, whether in Source or - Object form, made available under the License, as indicated by a - copyright notice that is included in or attached to the work - (an example is provided in the Appendix below). - - "Derivative Works" shall mean any work, whether in Source or Object - form, that is based on (or derived from) the Work and for which the - editorial revisions, annotations, elaborations, or other modifications - represent, as a whole, an original work of authorship. For the purposes - of this License, Derivative Works shall not include works that remain - separable from, or merely link (or bind by name) to the interfaces of, - the Work and Derivative Works thereof. - - "Contribution" shall mean any work of authorship, including - the original version of the Work and any modifications or additions - to that Work or Derivative Works thereof, that is intentionally - submitted to Licensor for inclusion in the Work by the copyright owner - or by an individual or Legal Entity authorized to submit on behalf of - the copyright owner. For the purposes of this definition, "submitted" - means any form of electronic, verbal, or written communication sent - to the Licensor or its representatives, including but not limited to - communication on electronic mailing lists, source code control systems, - and issue tracking systems that are managed by, or on behalf of, the - Licensor for the purpose of discussing and improving the Work, but - excluding communication that is conspicuously marked or otherwise - designated in writing by the copyright owner as "Not a Contribution." - - "Contributor" shall mean Licensor and any individual or Legal Entity - on behalf of whom a Contribution has been received by Licensor and - subsequently incorporated within the Work. - - 2. Grant of Copyright License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - copyright license to reproduce, prepare Derivative Works of, - publicly display, publicly perform, sublicense, and distribute the - Work and such Derivative Works in Source or Object form. - - 3. Grant of Patent License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - (except as stated in this section) patent license to make, have made, - use, offer to sell, sell, import, and otherwise transfer the Work, - where such license applies only to those patent claims licensable - by such Contributor that are necessarily infringed by their - Contribution(s) alone or by combination of their Contribution(s) - with the Work to which such Contribution(s) was submitted. If You - institute patent litigation against any entity (including a - cross-claim or counterclaim in a lawsuit) alleging that the Work - or a Contribution incorporated within the Work constitutes direct - or contributory patent infringement, then any patent licenses - granted to You under this License for that Work shall terminate - as of the date such litigation is filed. - - 4. Redistribution. You may reproduce and distribute copies of the - Work or Derivative Works thereof in any medium, with or without - modifications, and in Source or Object form, provided that You - meet the following conditions: - - (a) You must give any other recipients of the Work or - Derivative Works a copy of this License; and - - (b) You must cause any modified files to carry prominent notices - stating that You changed the files; and - - (c) You must retain, in the Source form of any Derivative Works - that You distribute, all copyright, patent, trademark, and - attribution notices from the Source form of the Work, - excluding those notices that do not pertain to any part of - the Derivative Works; and - - (d) If the Work includes a "NOTICE" text file as part of its - distribution, then any Derivative Works that You distribute must - include a readable copy of the attribution notices contained - within such NOTICE file, excluding those notices that do not - pertain to any part of the Derivative Works, in at least one - of the following places: within a NOTICE text file distributed - as part of the Derivative Works; within the Source form or - documentation, if provided along with the Derivative Works; or, - within a display generated by the Derivative Works, if and - wherever such third-party notices normally appear. The contents - of the NOTICE file are for informational purposes only and - do not modify the License. You may add Your own attribution - notices within Derivative Works that You distribute, alongside - or as an addendum to the NOTICE text from the Work, provided - that such additional attribution notices cannot be construed - as modifying the License. - - You may add Your own copyright statement to Your modifications and - may provide additional or different license terms and conditions - for use, reproduction, or distribution of Your modifications, or - for any such Derivative Works as a whole, provided Your use, - reproduction, and distribution of the Work otherwise complies with - the conditions stated in this License. - - 5. Submission of Contributions. Unless You explicitly state otherwise, - any Contribution intentionally submitted for inclusion in the Work - by You to the Licensor shall be under the terms and conditions of - this License, without any additional terms or conditions. - Notwithstanding the above, nothing herein shall supersede or modify - the terms of any separate license agreement you may have executed - with Licensor regarding such Contributions. - - 6. Trademarks. This License does not grant permission to use the trade - names, trademarks, service marks, or product names of the Licensor, - except as required for reasonable and customary use in describing the - origin of the Work and reproducing the content of the NOTICE file. - - 7. Disclaimer of Warranty. Unless required by applicable law or - agreed to in writing, Licensor provides the Work (and each - Contributor provides its Contributions) on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - implied, including, without limitation, any warranties or conditions - of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A - PARTICULAR PURPOSE. You are solely responsible for determining the - appropriateness of using or redistributing the Work and assume any - risks associated with Your exercise of permissions under this License. - - 8. Limitation of Liability. In no event and under no legal theory, - whether in tort (including negligence), contract, or otherwise, - unless required by applicable law (such as deliberate and grossly - negligent acts) or agreed to in writing, shall any Contributor be - liable to You for damages, including any direct, indirect, special, - incidental, or consequential damages of any character arising as a - result of this License or out of the use or inability to use the - Work (including but not limited to damages for loss of goodwill, - work stoppage, computer failure or malfunction, or any and all - other commercial damages or losses), even if such Contributor - has been advised of the possibility of such damages. - - 9. Accepting Warranty or Additional Liability. While redistributing - the Work or Derivative Works thereof, You may choose to offer, - and charge a fee for, acceptance of support, warranty, indemnity, - or other liability obligations and/or rights consistent with this - License. However, in accepting such obligations, You may act only - on Your own behalf and on Your sole responsibility, not on behalf - of any other Contributor, and only if You agree to indemnify, - defend, and hold each Contributor harmless for any liability - incurred by, or claims asserted against, such Contributor by reason - of your accepting any such warranty or additional liability. - - END OF TERMS AND CONDITIONS - - APPENDIX: How to apply the Apache License to your work. - - To apply the Apache License to your work, attach the following - boilerplate notice, with the fields enclosed by brackets "[]" - replaced with your own identifying information. (Don't include - the brackets!) The text should be enclosed in the appropriate - comment syntax for the file format. We also recommend that a - file or class name and description of purpose be included on the - same "printed page" as the copyright notice for easier - identification within third-party archives. - - Copyright [yyyy] [name of copyright owner] - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific languages governing permissions and - limitations under the License. \ No newline at end of file diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000000..dba13ed2dd --- /dev/null +++ b/LICENSE @@ -0,0 +1,661 @@ + GNU AFFERO GENERAL PUBLIC LICENSE + Version 3, 19 November 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 Affero General Public License is a free, copyleft license for +software and other kinds of works, specifically designed to ensure +cooperation with the community in the case of network server software. + + The licenses for most software and other practical works are designed +to take away your freedom to share and change the works. By contrast, +our General Public Licenses are 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. + + 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. + + Developers that use our General Public Licenses protect your rights +with two steps: (1) assert copyright on the software, and (2) offer +you this License which gives you legal permission to copy, distribute +and/or modify the software. + + A secondary benefit of defending all users' freedom is that +improvements made in alternate versions of the program, if they +receive widespread use, become available for other developers to +incorporate. Many developers of free software are heartened and +encouraged by the resulting cooperation. However, in the case of +software used on network servers, this result may fail to come about. +The GNU General Public License permits making a modified version and +letting the public access it on a server without ever releasing its +source code to the public. + + The GNU Affero General Public License is designed specifically to +ensure that, in such cases, the modified source code becomes available +to the community. It requires the operator of a network server to +provide the source code of the modified version running there to the +users of that server. Therefore, public use of a modified version, on +a publicly accessible server, gives the public access to the source +code of the modified version. + + An older license, called the Affero General Public License and +published by Affero, was designed to accomplish similar goals. This is +a different license, not a version of the Affero GPL, but Affero has +released a new version of the Affero GPL which permits relicensing under +this license. + + 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 Affero 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. Remote Network Interaction; Use with the GNU General Public License. + + Notwithstanding any other provision of this License, if you modify the +Program, your modified version must prominently offer all users +interacting with it remotely through a computer network (if your version +supports such interaction) an opportunity to receive the Corresponding +Source of your version by providing access to the Corresponding Source +from a network server at no charge, through some standard or customary +means of facilitating copying of software. This Corresponding Source +shall include the Corresponding Source for any work covered by version 3 +of the GNU General Public License that is incorporated pursuant to the +following paragraph. + + 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 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 work with which it is combined will remain governed by version +3 of the GNU General Public License. + + 14. Revised Versions of this License. + + The Free Software Foundation may publish revised and/or new versions of +the GNU Affero 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 Affero 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 Affero 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 Affero 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 Affero 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 Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . + +Also add information on how to contact you by electronic and paper mail. + + If your software can interact with users remotely through a computer +network, you should also make sure that it provides a way for users to +get its source. For example, if your program is a web application, its +interface could display a "Source" link that leads users to an archive +of the code. There are many ways you could offer source, and different +solutions will be better for different programs; see section 13 for the +specific requirements. + + 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 AGPL, see +. diff --git a/design/navIcons.psd b/design/navIcons.psd index bf371e550de490db9fd4c274daf1109de85d8960..7456529c0e10ba484ad87023db92650b0be958a9 100644 GIT binary patch delta 3294 zcmcgsdr(wW82|1AP!!b6%s~TfeWtm)XLngP4MEsk(KLimaTrSxHA(P+W}|D`!_;ZS zn-=*9OGzYAyrDy>^bpO*3`*jQh-464kac<7Re9{!x$HKs$_(}goipD#-}l|`cg{V( z-#z!jJ=W@A2kAqnP6Gy^9=D01Q&8E>^FN~JTXi9svOV#m0J z;x}wA>#x!)RjNRZGElA5=~XIypvtHZ)GEW3dUXg13l~#7>OF*`T|eolP?+Uya9=## z`)4*l8>TY`>O(Z@P@_6bZPXc6A!?m2ER?2HDiWd+*7{^JT498*p3#bPd~Y%Vfk8px zL=_eurqqOKH9;DpC1GkkA)!hm(bMI`xjkc43<$?VCNo~5cW5!!OFleACd^;9Xz{xV zG7*9;{O*%k(Pq5m)9)HBkePEb2Jj`ofWrXXalsn(Yi~8EIc5;By%??+gQdU&Fa8$& z24mi88a!OJG{i^2t{iagbWPceri2K~(YdXAvU6&4zbsgL?P}aXf5hmv3 z7a&Zt=$4%y^`p&^c{hK5SyIv{4{LmE{lWQ%5;FSTks_yE-y{aAj>iUnQzI)4;9napLnE#^R%l#{FOi!84ce{N(cI+#? zqb0u#lK$C-m-Dur`1Qh$1Ec0xlMqZNzF6~Ve%j3X!mQHx(%xCqF7Jprbld8Auq4nc zx43oep;mKkS;&m0Vkxz3dPB_x&FZw=s1becO8TW``6=g4Zb$gjG$mPDnpt+y@P{LF z`Agj_X_hqKirl}dEi0sxn}ToVhc|CJ8rMg9`=^mjXa4Yujo5I0-zmnRJ3ZFwI6w15 zvFq@cq$rtbO2kByVr%49lj3s(ERy`9zBreu_^x_yJCitfdKX5m)&#h|awSzWooTxY zj4X9JOJ#J4p3Xh=#oaR|`SAWw6)jljEp$4w5@LP2(PG&KP#Y?aSu>s?S6*8<_rZP8 zhngnOTe&2OKIl14K}XugJ?ot5=tZqNwE${E#KQ|+z>_OF0(w$_w+lE-JeA-AW=?7! z*prqzTNgUXI}W5aSTrnf0dqs!2R`pa(NR91yyFYhhKfTLxq!dNcLbDol!5*-P}rHM zU`B|)B>FMp$Q9Qap~re(;kTqyl&_87yx!rlpIA%$EBPwdM)scz+kcTq$^MtKp@R3S z;bO0p(@yX$_^)6EGfW)4>V^|;TiX%bgC71N?MKW`_TmF(w-0=%m;Ayq^|D?=#9<$} zfFowM5A09NoXwr8VdCy}$@- z9rEAFikP3~l60aX=BK$Nov4WUX)ei=8We(iuLQO$QPzS5Jh;U-i{~k1m&?Ly-D{v4 zxERC*)w1&gVjtOIZD_YZ4RD?~5N#Hy1t@7k*nbD=fRDMk5@t6c9|JRs=GdTKQ0?o@ z)j@-hx~nf&4~@cG`<^p5fCT(AC1?+723Aq5Xa;@>Vo8rin&)y5x7dI?hM3a`cHoyI zK6t?fprb#E-Ti+6x=5*o delta 3003 zcmbW13s4p3701taAEL-D2trf{BC!*-7=g?3P%QGcSZe}}RLxi)F-kjhg znT*e@zIONP+2vXvIGwiN&UerG z&Yu6bXMf+>D=NA#T)NoQtQU)b!00fbiPq+L(2s^T?mrYeUzf4%^lArT4+n;^8+2yX za;J2)I(A{;46e#(HFDETZu0HCEG8{EF*hYIAuBf_H!~+EFEJ}QJ|`_cAvr5Amq|^Z zx1;1WHZnAhJ)p-;f^&(P{W>_+V2)3p$I{?%Zf-~miOEUI&C1M4Fq`8u&8cZg@rmXn zCNCv1D=8@}B_%T@mx~B3P9O%hEPE-L$equ=uAipX422sv?I|PJDdiQ01TH10k0WC1<$ucfD7U7}XfGZ{jOg`aW4w zv(@BqiPGOMo?_EaHU-5eKGz}sbkD|4%R4PoNM6pj&M&MgzIXFx+RpTawLxn-Kb^`p zz3`pP4Rw(p{qS}nSG42@u0WU0F8#Lg^4be|XVxy5H6bp<(qEN2@S98Q^Pj~PnO%R` zFsmT@ddA3l?}um4zH}hupnlionhxJp+IIh5YxBv!RhRF}xED&Em;SMQZ@|l5ODT70 zZP)NEsjH}NB%&w5Tw8v?``ymlz0;k}i2Qk<+mALMj=OP}R7R)&yx}eHy02P}Os*{m z4Y-j1?jPTHxz+jOdn*dV#RUsL?yf%n*|_(nb2BGq@aLxu7z z`;+RK+}m%qs_7-mcCGs_(#ag|!|Jb8!Op2~P8lmuNvcOZMctqKYl#N^{+7Y4CsUu9 z@bFM;YqH6Lw$jqKXEKka;U3y}q#KMFQ1@56AqotX;xdXozGnrydv`Y;TJ*8EK6vUL zi%{Snk0Oiaj_%1Ov2B~hGHdx$g?LMaKASE5v>W8|3Pc{_k;fr@&Bgn zq3UI)VD$;$^QfLnvIs;}Jk&;ENEX21rVdJEn}i8&>ZC-mqC4b5H^3nXqRT3bxTueY zc!mVQMnz#*p^{Y|wz|Dk!tG?i>{+_ z5GmLdf%qs4tG989VKPid1h8XuHngfQqAx!1Ee{q>0VD+#Xlbv1!cf0JhOnNY0YNw9 z)%cB4^pkA$@nF+Pc1t{IkX4r`O)?KRHIkloi3h7j($|V^vqthJ&o}h6@V8ZxmXN_F zo^Mkw@>jgn@rCP3>s<|HugsgicJrV6`Z`2~cJh3mijoNRGH<*g)!$bxd3jPlq``DH zNWAfqug$Go@?aGs8cSabe{mRDiddhahv!>-8p{rz??RR~WZBO19g2k-X*bW;;{k%= z#v2N+>&Bz7)${xfks2|--bM{q(6|sN-X>S*2oKkhTRU3SZ$Q6ctWWA42z1zqNxl9F zP5nG+!q;dV;B}1x0<}EksrBXx9|N5l(GwCwvfUa{xj<%MuSWErWfB8dHKO(v=q}TU z?q!(FlZDJNtvAmWFieS@&a4q>*Q&lXD^6=beItmsT=Ntp?Q6m?AUA z-OiLcIm644lva)CH<=P+%&?c-l`}jH$?VpM4i_@%?MSp4>oc5Wm_qDC?9S~B^FG4+ z5{Z^E%ytEVo?w{yc#I$;&`yQXoj{LW*T* zRX-E`%&|U6=|ZCIPE6|cPblbTNC72{iw79p;>L$93O#t)0ow6%NcN~+CDtxXP+g+$ z#n1AX8yv8dOgV!OOLv14NHD%0eB(kl;25RWZC$j+1wIHV?xpmCeuTD!!`!PgTH4op zK>{e3sp zu^_`XO1pv;4C_x*de94Cc7y&5rKc4zLM5f1XpHII0Lco~RRS22B}#uSf)UfDWH7X# znIWPK{|{PVgu*GT>C6bt2X$e^g%#}+K9S}s0BKIV(d(bk+fPX^ki~ZgsP67!jho8u EU)`J}FaQ7m diff --git a/src/main/java/io/bitsquare/btc/IWalletFacade.java b/src/main/java/io/bitsquare/btc/IWalletFacade.java index 3c36732e3d..c6578645be 100644 --- a/src/main/java/io/bitsquare/btc/IWalletFacade.java +++ b/src/main/java/io/bitsquare/btc/IWalletFacade.java @@ -14,9 +14,21 @@ public interface IWalletFacade void terminateWallet(); + /** + * + * @return current balance in satoshis + */ BigInteger getBalance(); + /** + * + * @return + */ + String getAddress(); + boolean pay(BigInteger satoshisToPay, String destinationAddress); KeyPair createNewAddress(); + + } diff --git a/src/main/java/io/bitsquare/btc/WalletFacade.java b/src/main/java/io/bitsquare/btc/WalletFacade.java index 853b0f30ce..2825ccef28 100644 --- a/src/main/java/io/bitsquare/btc/WalletFacade.java +++ b/src/main/java/io/bitsquare/btc/WalletFacade.java @@ -1,13 +1,16 @@ package io.bitsquare.btc; +import com.google.bitcoin.core.Address; import com.google.bitcoin.core.NetworkParameters; import com.google.bitcoin.core.PeerEventListener; +import com.google.bitcoin.core.Wallet; import com.google.bitcoin.kits.WalletAppKit; import com.google.bitcoin.params.MainNetParams; import com.google.bitcoin.params.RegTestParams; import com.google.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import wallettemplate.Main; import java.math.BigInteger; import java.util.UUID; @@ -29,6 +32,7 @@ public class WalletFacade implements IWalletFacade balance = new BigInteger("100000000"); } + @Override public void initWallet(PeerEventListener peerEventListener) { if (networkParameters == RegTestParams.get()) @@ -58,18 +62,23 @@ public class WalletFacade implements IWalletFacade log.info(walletAppKit.wallet().toString()); } + @Override public void terminateWallet() { walletAppKit.stopAsync(); walletAppKit.awaitTerminated(); } - - //MOCK... @Override public BigInteger getBalance() { - return balance; + return walletAppKit.wallet().getBalance(Wallet.BalanceType.ESTIMATED); + } + + @Override + public String getAddress() + { + return walletAppKit.wallet().getKeys().get(0).toAddress(networkParameters).toString(); } @Override diff --git a/src/main/java/io/bitsquare/di/BitSquareModule.java b/src/main/java/io/bitsquare/di/BitSquareModule.java index 683689ffeb..a855bd513a 100644 --- a/src/main/java/io/bitsquare/di/BitSquareModule.java +++ b/src/main/java/io/bitsquare/di/BitSquareModule.java @@ -54,7 +54,7 @@ public class BitSquareModule extends AbstractModule bind(TradingFacade.class).asEagerSingleton(); - bind(String.class).annotatedWith(Names.named("networkType")).toInstance(IWalletFacade.MAIN_NET); + bind(String.class).annotatedWith(Names.named("networkType")).toInstance(IWalletFacade.TEST_NET); bind(NetworkParameters.class).toProvider(NetworkParametersProvider.class).asEagerSingleton(); bind(WalletAppKit.class).toProvider(WalletAppKitProvider.class).asEagerSingleton(); } diff --git a/src/main/java/io/bitsquare/gui/MainController.java b/src/main/java/io/bitsquare/gui/MainController.java index ff373ad3bd..4b2fb9a65e 100644 --- a/src/main/java/io/bitsquare/gui/MainController.java +++ b/src/main/java/io/bitsquare/gui/MainController.java @@ -6,6 +6,7 @@ import io.bitsquare.BitSquare; import io.bitsquare.btc.IWalletFacade; import io.bitsquare.di.GuiceFXMLLoader; import io.bitsquare.gui.trade.TradeController; +import io.bitsquare.gui.util.Formatter; import io.bitsquare.gui.util.Icons; import io.bitsquare.settings.Settings; import io.bitsquare.trade.Direction; @@ -19,6 +20,7 @@ import javafx.collections.FXCollections; import javafx.fxml.FXML; import javafx.fxml.FXMLLoader; import javafx.fxml.Initializable; +import javafx.geometry.Insets; import javafx.scene.Node; import javafx.scene.control.*; import javafx.scene.image.Image; @@ -65,11 +67,11 @@ public class MainController implements Initializable, INavigationController @Override public void initialize(URL url, ResourceBundle rb) { + walletFacade.initWallet(new ProgressBarUpdater()); + buildNavigation(); buildFooter(); - - walletFacade.initWallet(new ProgressBarUpdater()); } @@ -113,7 +115,9 @@ public class MainController implements Initializable, INavigationController addNavButton(leftNavPane, "History", Icons.HISTORY, Icons.HISTORY, INavigationController.HISTORY); addNavButton(leftNavPane, "Funds", Icons.FUNDS, Icons.FUNDS, INavigationController.FUNDS); addNavButton(leftNavPane, "Message", Icons.MSG, Icons.MSG, INavigationController.MSG); + addBalanceInfo(rightNavPane); addCurrencyComboBox(); + addNavButton(rightNavPane, "Settings", Icons.SETTINGS, Icons.SETTINGS, INavigationController.SETTINGS); sellButton.fire(); @@ -137,22 +141,13 @@ public class MainController implements Initializable, INavigationController private ToggleButton addNavButton(Pane parent, String title, String iconId, String iconIdActivated, String navTarget, Direction direction) { - VBox vBox = new VBox(); + Pane pane = new Pane(); + pane.setPrefSize(50,50); ToggleButton toggleButton = new ToggleButton("", Icons.getIconImageView(iconId)); - toggleButton.setPrefWidth(50); toggleButton.setToggleGroup(toggleGroup); - Label titleLabel = new Label(title); - titleLabel.setPrefWidth(50); - toggleButton.setId("nav-button"); - titleLabel.setId("nav-button-label"); - - vBox.getChildren().setAll(toggleButton, titleLabel); - parent.getChildren().add(vBox); - + toggleButton.setPrefSize(50,50); toggleButton.setOnAction(e -> { - - if (prevToggleButton != null) { ((ImageView) (prevToggleButton.getGraphic())).setImage(prevToggleButtonIcon); @@ -170,14 +165,57 @@ public class MainController implements Initializable, INavigationController prevToggleButton = toggleButton; }); + + Label titleLabel = new Label(title); + titleLabel.setPrefWidth(60); + titleLabel.setLayoutY(40); + titleLabel.setId("nav-button-label"); + titleLabel.setMouseTransparent(true); + + pane.getChildren().setAll(toggleButton, titleLabel); + parent.getChildren().add(pane); + return toggleButton; } + private TextField addBalanceInfo(Pane parent) + { + Pane holder = new Pane(); + TextField balanceLabel = new TextField(); + balanceLabel.setEditable(false); + balanceLabel.setMouseTransparent(true); + //balanceLabel.setPrefHeight(30); + balanceLabel.setPrefWidth(90); + balanceLabel.setId("nav-balance-label"); + balanceLabel.setText(Formatter.formatSatoshis(walletFacade.getBalance(), false)); + holder.getChildren().add(balanceLabel); + rightNavPane.getChildren().add(holder); + + Label balanceCurrencyLabel = new Label("BTC"); + balanceCurrencyLabel.setPadding(new Insets(6, 0, 0, 0)); + HBox hBox = new HBox(); + hBox.setSpacing(2); + hBox.getChildren().setAll(balanceLabel, balanceCurrencyLabel); + + VBox vBox = new VBox(); + vBox.setPadding(new Insets(12, 0, 0, 0)); + vBox.setSpacing(2); + Label titleLabel = new Label("Balance"); + titleLabel.setMouseTransparent(true); + titleLabel.setPrefWidth(90); + titleLabel.setId("nav-button-label"); + + vBox.getChildren().setAll(hBox, titleLabel); + parent.getChildren().add(vBox); + + return balanceLabel; + } + private void addCurrencyComboBox() { Pane holder = new Pane(); ComboBox currencyComboBox = new ComboBox(FXCollections.observableArrayList(settings.getAllCurrencies())); - currencyComboBox.setLayoutY(10); + currencyComboBox.setLayoutY(12); currencyComboBox.setId("nav-currency-combobox"); currencyComboBox.setValue(Settings.getCurrency()); diff --git a/src/main/java/io/bitsquare/gui/MainView.fxml b/src/main/java/io/bitsquare/gui/MainView.fxml index 7de5014ed5..467d0696dd 100644 --- a/src/main/java/io/bitsquare/gui/MainView.fxml +++ b/src/main/java/io/bitsquare/gui/MainView.fxml @@ -6,8 +6,8 @@ xmlns="http://javafx.com/javafx/8" fx:controller="io.bitsquare.gui.MainController"> - - + + { + Clipboard clipboard = Clipboard.getSystemClipboard(); + ClipboardContent content = new ClipboardContent(); + content.putString(addressLabel.getText()); + clipboard.setContent(content); + }); } @Override public void setNavigationController(INavigationController navigationController) { this.navigationController = navigationController; + + addressLabel.setText(walletFacade.getAddress()); + balanceLabel.setText(Formatter.formatSatoshis(walletFacade.getBalance(), false)); } + + } diff --git a/src/main/java/io/bitsquare/gui/funds/FundsView.fxml b/src/main/java/io/bitsquare/gui/funds/FundsView.fxml index 3eda0873fd..5c6ec90483 100644 --- a/src/main/java/io/bitsquare/gui/funds/FundsView.fxml +++ b/src/main/java/io/bitsquare/gui/funds/FundsView.fxml @@ -1,6 +1,39 @@ - - - - \ No newline at end of file + + + + + + + + \ No newline at end of file diff --git a/src/main/java/io/bitsquare/gui/global.css b/src/main/java/io/bitsquare/gui/global.css index 78fd8fdd1a..677e4023ad 100644 --- a/src/main/java/io/bitsquare/gui/global.css +++ b/src/main/java/io/bitsquare/gui/global.css @@ -10,45 +10,36 @@ #nav-button { -fx-background-color: transparent; + -fx-alignment: center; } #nav-button-label { -fx-font-size: 10; + -fx-text-alignment: center; -fx-alignment: center; - -fx-padding: -10; } -#nav-buy-button { - -fx-background-color: transparent; +#nav-balance-label { + -fx-font-weight: bold; + -fx-text-alignment: right; } -#nav-buy-button-label { - -fx-font-size: 10; - -fx-alignment: center; - -fx-padding: -10; +#nav-balance-currency-label { + -fx-text-alignment: left; } -#nav-sell-button { - -fx-background-color: transparent; -} - -#nav-sell-button-label { - -fx-font-size: 10; - -fx-alignment: center; - -fx-padding: -10; -} #nav-currency-combobox { } -/* */ +/* table */ #orderbook-table .table-cell { -fx-alignment: center; } #orderbook-table .column-header .label { - -fx-alignment: center; + -fx-alignment-alignment: center; } #orderbook-table .focus { diff --git a/src/main/java/io/bitsquare/gui/home/HomeView.fxml b/src/main/java/io/bitsquare/gui/home/HomeView.fxml index 15882869f0..9d8f53408a 100644 --- a/src/main/java/io/bitsquare/gui/home/HomeView.fxml +++ b/src/main/java/io/bitsquare/gui/home/HomeView.fxml @@ -1,4 +1,6 @@ + + \ No newline at end of file diff --git a/src/main/java/io/bitsquare/gui/util/Icons.java b/src/main/java/io/bitsquare/gui/util/Icons.java index 109ed64cb0..598368dc75 100644 --- a/src/main/java/io/bitsquare/gui/util/Icons.java +++ b/src/main/java/io/bitsquare/gui/util/Icons.java @@ -5,16 +5,16 @@ import javafx.scene.image.ImageView; public class Icons { - public static final String HOME = "/images/home.png"; - public static final String NAV_BUY = "/images/nav_buy.png"; - public static final String NAV_BUY_ACTIVE = "/images/nav_buy_active.png"; - public static final String NAV_SELL = "/images/nav_sell.png"; - public static final String NAV_SELL_ACTIVE = "/images/nav_sell_active.png"; - public static final String ORDERS = "/images/orders.png"; - public static final String HISTORY = "/images/history.png"; - public static final String FUNDS = "/images/funds.png"; - public static final String MSG = "/images/msg.png"; - public static final String SETTINGS = "/images/settings.png"; + public static final String HOME = "/images/nav/home.png"; + public static final String NAV_BUY = "/images/nav/nav_buy.png"; + public static final String NAV_BUY_ACTIVE = "/images/nav/nav_buy_active.png"; + public static final String NAV_SELL = "/images/nav/nav_sell.png"; + public static final String NAV_SELL_ACTIVE = "/images/nav/nav_sell_active.png"; + public static final String ORDERS = "/images/nav/orders.png"; + public static final String HISTORY = "/images/nav/history.png"; + public static final String FUNDS = "/images/nav/funds.png"; + public static final String MSG = "/images/nav/msg.png"; + public static final String SETTINGS = "/images/nav/settings.png"; public static final String BUY = "/images/buy.png"; public static final String SELL = "/images/sell.png"; diff --git a/src/main/resources/images/add.png b/src/main/resources/images/add.png deleted file mode 100644 index f1495b03767211000d67ef51facd9de041b44292..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 708 zcmV;#0z3VQP)FqZ9$c{#HhbVx{wQiopTu zU7^Jzkz1Gd1bbhUv>cG+d>VeOO&xlk>VIuALs7(OmS8Y^@COfgw!+mn5v-VH5Llpy z(7S!Kx7BwnjyWUM^y<%zF$r>^1F9NU-8PxyoWpqP`okqH5yP3x*p-~V9HycZ7bvUd z+;QOcVKRrJreu}^pEC~zmHEQE6AH>8av}@l%Wg~TZb%f4#IQk5XO79@hoj_F9Qck+ zyUB%)mkeqkfS|9LBB797OEE6xtx|qAdk$y+PJ<$85mDfE)&D=AWFX=Q9!18Tj06j% z!G;V>Y)%)`1*UkY!cX*4-gS0Fm1Nw93Xq-IaZf{dX~>wk&jS z8$M4dwM65Z2yW^HRq?_4a3*)Y-OYC{hP`dyl?uzl-r&i&SPD9xx_Q53t_J1xJo(xO zE~VnL{lCCf5KObdT-=bI>Bp0#k4h&-%4c3)^RF3v9(vyBN>9*c~)# zO;iT`PDp0000PbVXQnQ*UN; zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBUzOG!jQRCwBykx5U&P!Px8)-|*b6e0-( z8Z~0X7(Ht$s0xu3Tea@1Vn2pZD~uLf+1mxVe(!wGx=qf|6tp;(SKIGt|hr{ z6mqOqH_he?#&{NpD5d9Tr{Fn`YuSTt-{QK)+P$xIIzuR#VWWtk2%MW*-EoJN8BvnRc+`0s)M!4v9qbv3EK%|&6d@Si5*pSm@9(TS6G7|P`ZPw^_k&f$ zaOh8c2D=hMFD|Q&GgwN)sd+Mq(I}?3HdEG*2eGDUbHY#B5=t4R=@f_XSAYQkhk$K; T@P=|s00000NkvXXu0mjfx=6PC diff --git a/src/main/resources/images/edit_pen.png b/src/main/resources/images/edit_pen.png deleted file mode 100644 index 170587da45db49d9d6e18774c16d0cd5e744f3c4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 415 zcmV;Q0bu@#P)?<8%`L7em0x@xvNmc?sl zr<4-BR(E^P?;oZYgjYr@2m%s8!!YdiUy52mxPk4sLWt`|n?z`c2gC7XY9Hyb?yRaL1ZA%qA;*>q}8D|`X6tSxT;Xt;?hQn{Fi^WO%@8m-QfrX_8ze>H$M`E*fl zD3Y$_7WKRV;#@ZE$HvhbYBp)xaW3jcCcSm2Z(|&b(BBP=3)}JP#y!TUtmTuN%6}Sa zHaHmj$YkCAYvB8}>aj#=#J(WL*!iVVJ*gms6`5kZW*t8T7y$KbvXf>zSDF9-002ov JPDHLkV1l@$vv>di diff --git a/src/main/resources/images/funds.png b/src/main/resources/images/funds.png deleted file mode 100644 index 259bf05f406ca34e516bc217208018e05b1695f2..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 388 zcmV-~0ek+5P)_^))ly&i&4G?>*B9 z!!R^A!l$_uu8CiXJQxGRf+;B3A)elmDwcML)#S+=V@Zx}?GkU_7{7|*gSGoKaycr3 zH&KT->RPZ0uYvrm_$0*r#1(5kOF>?<8vDvERKX#bGf7s z8lV7zAO@`6pHRCwBA`2YVu0|+C5y+Hh*N_a1_ z!7#hP_F=L3KaKD-dRr_C#GfG^#&0nQNCWX|Dp?EyAMjbc7cFk&XlXGMk}rRuvDp}C z32+3pF%Tc1S5V_iTx9u)REz%%l*J$LSp1McuwJ5-#WeLX12oewqL;eLCu0E zA9G^yg*>hEF{sqqI2ckjT?&v> zj8KdDfp#(C^D#A3^mbBG^)9F;Zz}m%7v>N`7K0RiqeY{hn0)L3#Lua0@nNiqi{4;z+sUz*8JcQg7R(1?KOp{$mT+JR%oxc*AT>@AUT3m{1zI=(~!jGU@K<5k+Q^UXd-%x!%#v#{*M&L zplGT_659w(KVX1d2(%NCh={cqhCz8f0m)2I{0lMSC}XJ&7zqlDT0HD5W*|_3W5bGQ z>eY$R!$1umQ$^3H#iJI}&ft!gEQjo+0D7p{Kvioh$S%RJ3a};d5iFbS3*3cv}Rq*jBD=iA3)@J@%phz(yXlgU?{b4FaUvKzL4=so|ymu002ovPDHLkV1oG|+!O!+ diff --git a/src/main/resources/images/msg.png b/src/main/resources/images/msg.png deleted file mode 100644 index f286405d95f97d3dcc0dc5886c9edc169ca06350..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 376 zcmV-;0f+vHP)z)YyDrd7#>AqPv< zFdxsQvQHO~Qakkm@pB4&`W$Kw8#Ei?^f3dD`WO^9-$<=_kbpE0FU1xGge(Suy=a<# z0&xP=QCr9ikuG8^Zb8!U7KrVk;*%+f0%9!ofNHu8#431#6;~tT8@B93jK%!WAmt$< zP7|O}fo$}M{P)U1J z8F1#z83q#*6HXvg3yA*$`4?#IV`d=E2U_|NWIqsteDH->%`6mHyaI?rfcPd5n*)9N zg&uJn4z&~nCX#9?B^JjbvDeTuRog)6??B(arkBNRK+F$i|Ds2Bx(&oCc;r_CeIG#$ zAA=GQD63RJ`K<)ZS`Q+C*((Z&F9C5fITq(bvx^)MR|By$5HA4YJ{;;hfWBP`w2TMH z?gC<6Af5x{XOd#E2N3rn@nMF6Kp7D4KvTa7h-;v1m?L3eGSG4-V&WK7>>Wc&JjlQn zh>t+!P6Dwy5MKjgE1+*b0xbZ=|5a$>Lk1r~F#uF^2baY{Py;~*d6F+YcBDrN|bW0dYH$g2h1mh#Iy6eSHd=_+X$NXt^28;>pk|4g~%ZkzYv#O=wl= zWLULmh9+?jk0GE6ArwnO+78Wz!~ipL%4$~};+8|E%|)ukJka70IhZYR6gX6E`he2F zr6JwC1zG%*&UQY9S)2mIFX&|H3#fezj3cfKGhh}21Q-C%IeSRJsF7j-0000S->P)UShA5&oQ3Lp*v;+sHh4)p04 zdc<)!)KUh~|@bptfNFjFzYWYWOK|LQS)y~3WDa;^kD2=P~=tGJYkhzPn#c?SR z`yu7cJ}T9I^+;?#U?`L#TWkiz?MMn11Mwqj*b4OZDQMz@fp(zfW-yBsiJgais; zA;VIBAl`)|e(wW)dxTc0x(mtDk3d`u#CJ&XEg_4;f%pj!|A*qeK+Fupu~2zXs#OL0 z5ER!zKzsp+7nqosoCM-aK%7jD#rZ(I0xb?NK;xDZh_3;$8xV&8E!YAT2W6rA&;$nx zkvTxQOj7c(2Q=X@qlwQ2;sPN40K}m{ya~$Y!Q-*NAO`{+w2zRFwV*y_#u4-&@q<8o zmdL0Csb2^5xe7iX3jy&-AOpfO&jhIU zBQ_t;hgu2(vv61n0=uC>h!;Q;-3}-hWbPttL0t;Oeo*!=XsLt`Tp%*2>yg-gz)&bf zw%81a+tEs%M+6M~ON_11ieeLzP&?3aGnmDbkrETgz*Z{PfK6zLZ8EILG((fPhsTgL z(5!@>khVj!Au+&=oFdZ|hq&diZTj$_*Gj-(wuIJLBmq*ZMP_J|XK1%FpVHaRr!b3C rfcOQSEPVmBkAZQtCo$|T1_&?!?P7KJkI$rJ00000NkvXXu0mjfQIF>4 diff --git a/src/main/resources/images/nav_sell_active.png b/src/main/resources/images/nav_sell_active.png deleted file mode 100644 index 3f4b0e8ad1c7ac1a88023b565e9d8564372924d1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 558 zcmV+}0@3}6P)siJgam3F zlVK@85bwefzxRQ@JwmHg-GyZ7M<6Z+;ya}HmXO8aK>P%V|3mR!AZ7;QSg1TG)v5x0 z2#V_K4d<}@*fH(wb!4{}EC=1<(COA-t z%mK<}; z4;Tui$QFabsvWK5c|^d#zr@%Ittd7j3AF<)H-lL`87VP=3~Z%x4cLU1*e1h@Ofxiz zdw2|41Iiafn+E+olf>daVQuW=m*|MOxE`MD@(jCeP4rWj>{| woljvFrvUK_I$8PxY99mRXis9;TMQ6j0OP-T6^C}`tN;K207*qoM6N<$f-OuEL2>+o4$;YmO>i0(7iI!6KdoE= z^YK$O@jE~~9cuYcDhK&nAZ~$Klz=9=7l@gG_#2Jl`zOrDkI;O44Tx2Mn3F~!eG^uI zJjEiRMZ<))6_>@AfmoN;7Q?^?q&ScU;uSQCUr^#=hQ%=hQapczh5)U6yaR~;B3BYm zkrEatv#ZlOn9(i11GSWy2A2MX`WVIHM|4P7$AS1AE+5k}D{aNr5J0wAmmU_wfG)IL z2F2}d8f2q;*y>|gwFPTsT%tkV4Mew?akN1{YB8+`00000NkvXX Hu0mjfj_Hq5 diff --git a/src/main/resources/images/payment_step1.png b/src/main/resources/images/payment_step1.png deleted file mode 100644 index 16dc4cbecf6a37ea25d63a023fc8b02eb6743145..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1540 zcmV+f2K)JmP)EFG~$<%Yt>q#>PC+Lnk21qJ^A*C0grC@9XfA+2`3_cJ5DKKD%ki0MdaUiY^eSi2#M=TFC%R<26b z{g`%FHFLk*{~~SRkW_+-+?c#1e05%U{p*;z@k9_K4|Jdl9E{1T7&+N}Bu^E9 zVTtnS$y6RKytH{BwqT^`n6Xt?L(URkwLRiyD!zl(0l=?5@3oUOKiiC&-9mhQ@{;U` zmCf+3G)NH`mWfwvejd?;wbYPo!AyL0kT(!9C;@=)B06ezT{n6uwK2HSP{a+Emq#>V zO*P~uZnS6dWl#bDM0CQ9UW~8fMne(A-RRVB^wWg3)DYZg%|ruHz4^r{1|3J7c~So+JpF-RvR}O01(j`PD9U)?iV?@(eUu8 zWYRZW%#BXu7)@A3eB*+d_^J&&XQKfC5uM{SG$W^BA>IUWqv4@*so!lD{)(aY_(nA( z+pQ$NT6zR$qX7UBJ-}(;Y&4X2({VQ1hZ@4!Xy4+?pag)3_Nxx&K91dRA1C^k!;ai_ zKla>bmDGV@c|acRh*LmBmK_IK_5)8|CADe?bN<9e)!?V2xeDTFSc50++NFt8 z%a8)xzNwKM)y80G!#wTh0bWq&(MHX)DT=~ALGlA1b~RfVd%NgZ`rw-?L^_k zg@z&;aJ~yYP6Jj`LvW#$$M=ZYTgQb407P`sVc0(l{UI(i6iv*9Udw3AoQ2j=L+X#n z?g?CIz47f1L%X%3IlnNSRz6*UNzK#nGMeu+( za?pTv)DYgtp_ynH`s3L68bdGuAfl6vuIoZyv2!ztzaEDR4TT7-{5NvYfc4Z6-pJuw zd>N7ez;_WHccFPB2NVr1v==o57g{rU!w^Ff0QfGVV=nYxiN=Tv4MhknTxcI^2rjg5 z@nuK?0PjU~tBnf{r7eo^k_jOyI#bTwg}Ct2QMBpcv8eD zO*B^nYGYfI?mXX2Hrbh-o!PKEdzkmW4>nugp7#C!{Qv*H9i~caEv}-J5`baw!-rD! zoAUgrm*sMFJ?nZSAB)Ask6wM`(~;>-nVH&PH!P&ysD$rb;_GtX1b|52mfDiL)j;dt zW$xUG=+g2v88>fh=5?6#fI;y}^2Efv{2Xn*sC4*yP^X;NP7uDAIhTrL_3PWEjtQO%3DA4q4G7&L-lUwGI%k1?Rifd0zIsJf{;} zsRgqOZ+0$wBl3nQnGSxErwTy7MDpmd4l}VHreD256D~MSHS&w8A+h+%>@(|o!!#7V zN30~`o3#!AZuNPmP14L%t<~%;fD8R$^nY(U8Xl)+LXEK^hxvRSj9eMmrW?4oU#P5RHw7;gXg| zp^>Hu+fqZY(KgdM5LIfQoZz4Y01VMdqkxTu;ay~DdDLpc*k~(i2sYaC_};wK5NtFI_hQ3FyHG>0(GJ8n@gE~` zPy%3x#x(5N=-KExHX8DvhmHP~CTv9w!A3g}-^78JgAxEkG{~-vUg$Ip-iW-8jfR0Q zxO5x+2TizWr9!2BkhGNySvCcpd!qq>Av(o0)LN!tHrfOy=4AyN4THkH(H7N;&Y$$# zHKe<(B)+!v2=0vr0EXxc(-7L|#Ab1CG~{v7^|&{hCTv9w;ofN1;>$q^fFatgI+*%% z?3(#=taI6K%7%ISSME!N)Pa8KkwR`U?f}3LZ5L@j$BOSS zh>~{`^-<()(Xuk}ihN7zK;Qj0EsyGrsimA-)#JH)|aL ztYm~O=ooN5{_>3Z`;?Tu>8Pn*z9!>lVa67=1G)AFd^c*uNu z#5CYlcB$|+WXDEEhvhvBO?<74Z`L{hSPLdPZWsa!{iJDh=dsX`H$5!$qgYBSY6uqE z#rR^O0h|OA9dC4jg}$OMOm4;sCl(s=Xu#ZLIXe)O!Q8p3oP_|rqS_44#5d>@p**09h35XE^D9kI~QM%S^>kOw`U$bp5nqlWNA4x4G&=06XOW1#^c z1}1vPLcebYnSWx95ep4@3|Q$;EDR8iaYzYcGN~{=)NTDE2M6jX45d={Y1X1n~5|lVia)^S41`}u~ zFvvD?5h5iL!6BCXv%~ED#CyAQ@#VZ%?CkeRdzR*^oA>t3oA1VZN^31yMJXi!?cmzy zlJ_^|%@-%-6tm$bPZhozy`i35m9fFg(f4X~l^T;`ilton@7Un2M)3uJY@?)bHM`Y7 z>%Zja;eFwuxeL-`{w$em59t9r#p{s1{t5ZDZt&8TYo@#EV|JXVAva77c{&o`{U*LS zCdY~R-Zk<4KGs}oy`RZ}rc%hV$p)9maua>&%A)!F6Vc(hPvzU-A~|3uRP$)oa?ibG za_>4b13@HMw(sx|f^5~pp5uS-PUywc;ZHQ>HT#4^; zHNJbB8V3NH=!}_$z(&6ln;2{~Byoc^$|G#FOEqMsk&ULwaw5LiXaJyzwty~tLD)!Unp#}yEOzG?RI?USM=^@ zZR2c|0BE8!O~^(c4Uc1^AqlY282}sYdVH7HWS8b_Gyu><+f74Yqu-595H=c;xY4lD zS*Rh{Xt(3b*=PWuiMD}_hIWFD&H&hG*VhQ1)BylA(f2V8*l1|q&4!K6LJh%2yB**1 zhRCuJW}^f^6P&c6_nX0Fdn_ z+V*vO^^GO-@>q1(-;`VC&wsKZIZ_8&Wt%*@E}|c2mQr6_{xmNSTi#hU@$F)QQXk*D z=B2CYaR8u+b`9It?UgRapAsb>#_FTUSOjluZ#9qlCUt!t6-&eB-CpVL z_=H(X`%cN9Hi5nviLco-sYgtFmzki{$2V`{yU_GF060k}QxIuzzWnZhd3`~;y(3{$ zJ$FHROv`=D^W-&V30mdn&s2|8^CiLcFO$Qz6|SZcw< zcb!Q}^%_y#40%7rHc7sYj{^WrbcPJWRPeYlJuLW1ArwESKVI-wd%y0-%Y`xM2t^^z&w+8^S_E(u6GZ>z0N23>Mk}u+Xlr z5m;ydpowl^7y=7DqelkrV4)%L1$ZluW+MymFc#XG8iIv(JHGi{YGZM2^kpnG0MJB- z3`6ZKG!_~XCuE_ITNY-{Lc0JK+VwS}Y@ye>AHqTd08Mmcp(~$-HVfUIy26Qth9nl? zN*?`T^5~nU8ZSs=4Z%XY9bYUo0MJBR48y%Aa)igR(2xY%Sm`&wnHc0>(CG#daWT9UPk7J=B3ATA62Nv1|u+Xl@w``kl?(V@t z0{~5QWT6YrLVv7B2L9!V9FX`Xt??5%I1BAg4dE=b+wtYO&;URa9cys5Ec7r>~%y^(vZL z3GnCnxS)j{snD6`jlG#ljr+x3ud;j_GFsroI;wnlh0oVzyd?wv~ zUEX|tT#l0sJ9&NP=!x@fuPn-;{)=S8LaMdO>U&0gUEZ4j5Yv$|ciG)(p!M%Edf@4J zXyKf6nzw7_*iC!DcJWHm(>o?VH3VlbT`^a1J!GfY?9t0|S04KF?&#nX)YsY_aoy~Q zy$NyMVd5{49N1C|agl8~E{o{dOTU@VKb8zHd?FWugXVzk5cSb~#yR(v>AfW~RCIl% z#hd;5`f5F?udO>`DOKMv{-TLLMS@@xeN_qO1c$wc=X8TBHDR)FIvMub&{Ld8eJEL;Z8n zvO64)_m0WWqGjG+kttdPTBYZRUhAW?TVBpkv>B2un5nNFG`k=g8TccL<3(5V+Crq!NT14SAesxX~`m5Zq|j>Kn#!qX7`n zZi5>QI|**I6Eg%i+GcoC2LK?VH*^|sqhaSxHr!|zW(aPyYxND|xX}QJXt#;E(IfFV zZZzbroA#kH7k|M`zlasj7@L;W^(kEQZjc(|%k%130 zmopTqzHz~vs4s4`J%z`O1^`5K7He*_s@6v0OR#rL7ICBDfqE(FHcO)$z2)T$g{f~e zL#Cq{f*WlkxX}QBh~Cg?SaqXQ$>QE<$m68r-e?zQ2=_+2R^Kp=8x4Snc4ZDW{W|uV zd3h`u_Um%Py!|69(n0G$t8CIoOCtJlvQ+rt@~e4yl=?bWU!`uFmv#~afQYu9W?#pO z?@x%54^s0{vqiSu){IyHUrH{!{(XW*JNmJ;VM13pN z*W&ty@op2pN`e5~pp6tH1kU+y_Lv@Eci^-;CPsSZ*e~z>fNc@op2pYU1}u5&$CF zJ%JOt(9fDhSHXpbyotHcuVpOe)3}sY%#ezi99qx0RR!*)L{r*=qWwicMBI9 zau-h{~vP237OS237psyIpT3#Xvl+2TxeWMJ7!2_m-x@Dl)e4b*Ftci z0RR!*)L{r*=xMX)mKzo$E;QsJu-5ws7uwbu`}Ij&XsdU`WJ&q6^@9Vr&;WplzQ6p| zUFetMaa?G~gH4{uflFz}45=ud3vDma#ZbN6jtdO{i0H(k3tZ@r^l;zbJdp!(7g)`o z$bm~~&kUK=JQv#P`tn?806;`11x8(J_RJ7|ozS)VhH+eI0B~4DS8MysqQixT9U<07+zV~%MH0VG zX#0-Hycl|l90HxEG%{9#ub8FtBJUR zSPelif^_cnzVh0>d2gmI?dxLB{r!^ZB)6;HbKd#B`_1bcm~rCe56cW3U?Yf_q!Z^;i>e} z<#W>J->&)BZrTI3O4K49og?y7&En+j6@P;3V0W6Ez3#T$lSlrzcew8f>Z?{GZg`D2 zkTciL&9FJJp%xnIA+1wQ$R>Jn_Ba3ck7SoGe=gs|FPa0kLefVwb*{O$eD7Unhnn4A zIf*8}y|GkJ>Z?^FuIK8z);d7OU&V8Rm)=(tbb}i+=6B&#b~$R5lVYSV{z#rF0GlQ0 zqq6U#_L^S|_nuubThP>46Mf`o$Vuv}RwKr9^<8Tn0K(Gwpp&Gbo~cCaj-=N+N91R5 zGGiBIoECx2(s9%+_t6=rfq|vawkVXeFLr9}TtS<*8 z08BIpX*6u_#YP$(!VDpe4xqjqgaH5(olhE;)9B&!I%zZ%!8&R58AMpc3?YpUpuT2$ zjx-toFwu3AhB%EL%bJ|1Ro)?uhKFk?7G4flS62seLy(}p=yUrd&s!gFsl z0AQjUBn?wZ(lDGB!OjtxCyj=O>ZNSjEVXGgBCM~z$qcEVR#IOr8o|BM0Dy^JBWYMl zqjQ_Zz0pv_MaR9-A-5oe5%)N|)bzvUSN~%V_0?NnC()jVs5<~)qIJ>e<5;nFOpJV-n~x%=#mRi<>+%Dw z1Dn?0q>nmAU2Pvt&-MG?wo9qyGj^%jPfE7p3q6skZ<+e)sc&T5#D?k)0BUJv3o-`h z{C5Za&*!8R^`(>Q%jcxcTka!KB(Jhduvvcm!n8@!N4ZZztUWEpOvqsOpX^jq&yd6{ zM?HCiMSZo@*JkS*ACj!g*Bt;b(E%k4WAWq0+(6guw8e?jLl>veqjHf=f=vr>qduCR zdl>;%Geh!b8H1&}z8sPOFwrCoODXiTUg*lC&`>m~6#7sdVLpWbtC%5WKRMbRDYV-9 z*8P-$LlOWcnuK8~g&ubUU3W;Kp>P3S?W38D0QV!nN@{GY6=xz+XuTRyX)$)PI@n7J z4FH(vRKl=)FElAM6izCIK3YeZxffc;3@PuD`|Wp2B~oam^^H^LYH0^4Gyq_tGeWm? zFSHlBJ2iuo6dH;U;0Jy5i|?ba5n!dm)c*IuU9*!ETCYY_c9_M<`-3l%LIVIMI+ZZ2 zJdq>4P6`c0uuck%0PC0`zN@H$8(`o*O%u) z0{|vEYj9Rm=zgBa0Y#JkcESw{Gc?-_;oAu{)95h7AqfCNH_@pS`W7iP6mGB@e>))p ztY?Ps?S!G#mqQW&1aG3J=MH+IBZY=-A=O9R3$68##J3Y_*ND1@p=f%x&sxJF2>=ok zJ$10Jg&SoyRiwLO3L4Y|c~uh-p@v9# zHAO)lHk60-NuSrdZg1Cb?zZ-|*Iwye73?%$XSzExJKy|%^P6ubU%^_O=oINzzQgSa_giVAC*acFqdx{7K?9_4>tRSN}2$%}Ii)VxX zEh1c~8zKfd9N7vWR4E+tUtQxZXj@*72;-|>>DB=AR=1`tO6ba zqPpqx46u@|8xT^Ervo#9*}ym;O{@1F@J62y0SOzj4B#Ve=3CNPU;=Be(~Na^bfj|r z#dV%lAEKPu#rKZ@5^x$=3sNvl z0^H6k=^u`^Yd=YMyuW768vRQ(RR zr;6v3r<$knwlaD%Vxv8|ha%`KJCg_py6RG-niZN_Nu&~)zN`cf1%hu~# z%wkzWHf%Aeh`J)aEub2&b;a^H?4b^cIIGQ1vVd<@E~?TLY%EMI>=aj>i=?i)e}M7amxo)BD`?6oI@Zgae_=jv0v-2dY)g zp^m31tVCdmi`qL!rTO%Rkj{{HWewO1j5~{Ay zYM0<#J-Ec2nYHiVrBtnwqW7`Rt_%QKV(vBI28iGfKBNqpE<;yHzy)Gp?X;||8A zJpV%^4_2)63=ps}5-6LLL_SXyprAs%*n>q1<-zn!$=qNyYG7TafGW#k)H?VMDnPsYC6abVqTDF>@H$;v|s*WSp9N`7~8Arcds*R-ZdjPF~Mqvicgksuxw; zK%49b#1M|t*B}@VSLe^%2rafiX|5OhgovNarTio0@yr4l{R()#d%zbo#1PVb0<%J< zs>nIA`^LzI(xV3$FF*tzx1EKANPsNn~-%Al_gj)fZgc3dR@`Ey?8bRs_4`SP~H;-DD5za;;o%bt#hyg7TIJRweh#GUSe~(TU{hsj+4zM`H!`2FBd{clcT)!`RGzg zv&dc6J5_6-Gk27-Sl%~u>GbTz@ZW2Bq#Tm$5=jV3iqPXu3u;ZYuxJqNN-w2}b}z{) zN3UOvr-!2(sTkIp1ft*6TIrX+M7mw>8Bp3>w_xdX`a1kX5=`TWGgFV`dWUq$EmHO+ z2kn4mY=TO8l@{83JsNSsN9CHN=Mkorc$8~o7Lj^Igb#87=kTwCUZ#_<46_6qc%>ZZ zue{BWID7jYuK%BE`ib-t f`F{}kTYv!oLWxwk-`Jn;00000NkvXXu0mjfMpTxA diff --git a/src/main/resources/images/remove.png b/src/main/resources/images/remove.png deleted file mode 100644 index 8cdb0687712cdfd50d7d3520b05d19ac391237ea..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 454 zcmV;%0XhDOP)HDPr<1iGvNL%>ya2A_8h?#3;AeFJox1OI%w#riYF|#>Vr|q(PQKCTHC_XkxBirQ?soWBD?* zn2|HXJO+mJ?~{lT6U9v9v+bbk1jy%~$)r;Q+4VTodhDzT_14-wPl+oCipK$~71-GJ wVPmrw*Y{2c!Kf_L(BfH!*S&@x9lrt$0Q(KnrTQK$U;qFB07*qoM6N<$fRCwBA{PN`s0}Om$v*!DzO}|c^ z`v3VeBQGzTi3w*w0B1-D0}^0_X!!Hs!TZF-Keui%U;uVUNB*83W(f&|2B7MJyz0@Vz3^zTcT7zlx%`}coezaFdsOc4Vh zDp`JCxFEWJKZ}|ge$~LBd!Ld5vfc1dV5wmInFr?_VY+0fC=~4iVJw_rU|8 zN(N?T7FGj;cQG-<_<`No8RR6c@NgnM&FSLSQw9i3)xpH^Ia ztiSsEzr5_<Cj%oJgT)bBvncI4R-g+QJYD@< J);T3K0RT_zPRRfO diff --git a/src/main/resources/images/sell_white.png b/src/main/resources/images/sell_white.png deleted file mode 100644 index 355aa77f28dde8ec0859d80593a242ba86039c34..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 284 zcmV+%0ptFOP)u4^P)LAuOS6X6jpxF(*5-Tefug z#QZzIojGUDOloPGI#rZCr=n6B*pXXpx!paXrJRc2o-ON#R{$IWnkoEkuqSjX)KKSZ zL`xm>ydvNWp%qzCN2o0{V!$KxOU==?f*oUUgZMBdzT7a-OdHKS3HMFGXE^{{U73Pi zp&4W315sQj{_LS$H-16J8u?iIDpt1f5$zKg%nVP3j)aDaJ7TmuwqR=H7F)JvR<=g} zz4EbbTkwDwcojM%QJ(IAOVB%M8<>Fmny8ctgq}!!h5&T1$_43@Zn)9dkaqhVIAm7R zRQisU-3gQ|)?)0099TE_8^$w#Cj|IHG92~m0p|`592u_oM007FtT^Jpf#NUf;|ZyM zAr`%DuTLXgB}>002ov JPDHLkV1lXU02%-Q diff --git a/src/main/resources/images/step1.png b/src/main/resources/images/step1.png deleted file mode 100644 index 3dbc3b1fdfe7149a63fc4fc83d4ecac46ec65342..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1436 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 I6OLN&H!S=aOaK4? diff --git a/src/main/resources/images/step3.png b/src/main/resources/images/step3.png deleted file mode 100644 index dafd5d6e1a9be250087943b09ade9fac2cb5e566..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1703 zcmXw4dsNcr8~+*(oq#ddbbwBAcG>VUldv?8%9rrA(6A;pQ`{t3qNL&|?^%#$;JuTT z31V|PFL>ES$_ts7W-3@oYQ$W#@PgJajT2V>(4GDBzVA8D=lMLJ&+|Ozyai#D0E7kF z0ssI+P#}p409%yCw}Uya zen z)$-2COQYf48O!SRwKwT$QK||`f3mGfU|vN+N{19@Z(n_>u#p^mcQ&A~I-bww^?W&Y z7@VfV4NeS5cuey!oA5b_}Z1V-Mv-&yguEN6H!yoHDUCBk=UVF5X7lB~q~ zh(LqB;jAaSg(*YR)2Qy?dnGEx2@kdzlBqF~*5;zBwTOwL>a8Qsqq-y33@+AYXh|8k zGBTYrr}6!jecsUYR@=49G9RoLUV{7R3nrdGapf0KZHM+(uZ_KPU+&*x(y=y}M7a^5>&PCL*6LVND}TcZSmITUwQV`OSrF ziLVFVhJZfmUOSR@PC&U2my;nha{}62=`JUOrKYTvx7|59fq-K6hzVqXVT|^*%%3-t zlgwFoC-2(Aw2pMOoLtA{(Y8>Cbb{1I2OHR$RkXC@KyE015!Q| z-m%jn`}Mm*+n+e1NXL05cqgm!NL%(FZ|m7^pN_s0X77KfcP=zlH0y9hY3*0{WWJAq1Na`pX5^ExC{<=I%O z^S*KW+I204pSmu)zUESe{npvaZ|&tYm-0=S9D@p2LKzG{UlxLc<0Dq*TvIgb9HOQu zDD)Xeao8=UB08}#wen(S@0b1;P1Lv>UQ_yzK=D_f3sb=-Iq_u`ZI`364_h=R@pt#h z`@F!ng{kChMhP&5hiJ*FRf6n(e+>L=Ru*l|a6p$}urXKe`Qj)uUT$YU^tCEYQ{fRe+JR~~oea(Wt+!o4O^|%sp&0eiEz~t`L)IKL8T?(r zK2eP7CxTlbGM3mE57!RUwA*rdP^l+`E;hCwq9KmmdX4-g?(SyFHPW0-))cY<;ziJ@pHUQetuaW;+-C2CWu;j4SBjVn@8zQmhw zc(v;RjmBj5=f0lTZf%m-qd$zM&%)(I<95&`g*+&6}O0Po3M49qzC<1buRK0)lB-h|+woKB%sF;|79F#*_zEKUR>OJJnosB^{X>3*v84U~_EDGWi!rg_R}Ob1ec z>9q^I&z=_8Do*6Bd&f%TFlUG{%!dBesqo7e`u7uk?`-yOVx5xDql|4jG2gJ8JTx21 zES3{NDnu3)@EBJ01VtSt`kv=OnQW;-AwzbZ8r1#K6LmAdR$l|HJTLF7be(fq{8OBV z3rTl3&F>pKYtLKaz1~;T0-NI6&>R=yhiqm>ibso+s<4q&ShfcUOm$>+ML$F(Y8N8# pvGKD(Gv%X9Ym50~kk9siOb49h>U-g94>rCeAm{*v)J&x3{U7|WARGVy diff --git a/src/main/resources/images/step4.png b/src/main/resources/images/step4.png deleted file mode 100644 index 10a7e51e4457692f3c4ea885bef5b9d40145e296..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1621 zcmYjSdsvcJ9R5I32u!mk;UzDrxzKQ>&MTy%f^*L3B59kKL@gl=Ff`N10xBcTsP^QT zm|EIJu{1AD$&!Xs@uSi-Q`5C%Y1=fYbea3GfA-Hg=Xrk5`#bOZd*A1rlhIM(rpv9C z0{~!3rI2X=0M|fgd!#Y6KKaq91ln-iP&#*8Mhcgg$YuaR$r(uudnzk2l|f@9Cg&XJ zVgvxdviDSS(Dv+S(^3-Cnz2SS*0)!5ZK5oxc*F5dNrYQ*wS`fL$)n1`VTvoo!*fTR z7o+;g3T}-n%58_EYtm)pwTF?+;)rUmRcLgT+#-6f(%eZK9h)F)DSAr0ODy|)y0Gue z$C1FI)p4h;9{x01c4X{ax00UjT(@QqBEkIm2lByO>)D4t=lCl3B}>><+jEJYSpp@H zSvZCLgPTZhzvSaW3T^v&azCO}d-fLFUE!~MHq6dmyj|Y0;q_zpg=byw_zh{4qIAmQ z;B0SqOokS<|EK;gvhZUq?p7fNmU$qbk=2LtUE^m%s^Tm-78-S_I49c=>thz?iW;TS zq!PmQc;*U9NS@uzu%738M{=ibM7wNCZhMzs;s8W#U0{{3&1UI+lWOA!TJnWE3N|jZ zY**>wYi`Tdt8b5IVDEI{zGB<6n*j^jSh({@_#Ssc&$sc}^eY{D%&tcm-w+|t9QtO{ z3jFm^qg|(dobr-ReYF$Sny;Rm6E%sh?0n65MVT0fQ&bAYNt~m(7hnIXyon9bu77N%gLzVdtr8G za2q2nbQo_xEUrLooY{!y1( zc}?5uJH3zgRh+v($lUl@xuZeyHd>SBqzEk&6~B6>jZ9tAyoCSgn>z7BbCp?1TdQ)7GdWb%O^n6XeC$tL-=e^<=p47V2jb{?0P6?yRVVbz9~eA=v~UffQG zGN9BK(w?MbR+?*I+*;n0`B?IKS%>!pd!57kp{Kd}nPo#;eat=k%}lP_*VRXW_^~6* zQ&6H<3e?OmoTMJ-oUF038^p?Ja^3CTQ z=xKln%7$CvWMT=0(H0%`Ha5-8QzzvMh*m4X-Ds&8(-Cac?5CJ1F+xK*sC`l=7;xl} zQsf?#VsF`zfjnJ~tLz)PwkH{BX>b{YBDpOS&U<+R=Z3M+MPkuyC;rbwhg_@&37h)= z4UPvLIfMXuV{Yr(U+sfh4Hg_kzroh==+2XyI~4@(ae+$+AiQ`lsL5HBz8HS_Ks-dP zvp9E^tsFGjV~jqA2z>m<85_Emxpa5`94l5!2<8M{E22ZGL|l7Z4ibbcuMfOjjDw5L=e{72oCiYKTJ&X(~Xj-LICr%tyB0)v}q|`gMZ5WD}VNN z{HRrKL}Aa!izf6sn$A1ZU5yBh(A3IZRH>=9fj$!qd>( z6+&#M-3=W2W+i8#!F&46Y+Y0Q=1YQts4^Ju6E*?(y-s7A2d?*l{t18@8bz)RPAK>f D&^GK% diff --git a/src/main/resources/images/step5.png b/src/main/resources/images/step5.png deleted file mode 100644 index 4fcbdb39ce02f9b1b9c265c3770091c76123e1eb..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1532 zcmYL}eKga19LIm!nunR~Sed4)P2J=kl0qc0O~iyDw@}Q}{mEmjkgRFbl83@|D^z1d z!o4yNt>rmU)Nhe7b#YUK^k8y5)%{iH-2VA~zvp~E=kR+qaDRFUOrvm8onl2yJL7ThMd8mSx3+E93o!5PNqkgh0yUH_%A$7aEtD~5fVYK z?t_;e&L!Y?$jszJaX20^)s?1?{L>3R>WNoy{3X!Bsrs6!$K8)vO*5=~_V6;h>qO3# zUiOmplilxXdR5a++`Z0_a2!hXcx(dM_tHG}@uN_$HjkqjlO0Q0scW?m%|?-axjS;n z3z6Y2?5wv4`FhiAp7UDiw3vzac@ z!ir3S?nnN~PWEnO^WGJwl@UkF0%B(A0om|h7XA)bXo|V~rm6AkQ+aMSxjH?Be8hQ3 z?l7m`b5(k;zC$fxlpLlrtgpLjWKEAB`uK=hPn^$TMDc8FNgo=AMDIFwjlQ93I;%#r z)AL3HU>N#VSUw{}q~dFGE`7%Kj)?h&H~9tkX~6SBa&Jid2aQ(m^3p*?Dn>pcEl$(xvKP zMo87nIH{Km;7w>(n=gWy4Pdq)3KY^u$s#FGg(?IGlDI=N9NY_IhRzD(>$Sg?bDp_8 z3R{?gipI@kpr|YgOuY!%Uuva+LM2}eZ5eNYD?-C`EB~h=>5;^*GPrIm02Wwne$t#> zuvzs)bFs1i(<9#%CZ8)ps7P0*$|q7-os45iwmC?jA*Yrbo39Q8*5nXOLZcev{Pi<3ekt{r{|*Xe(am zg2KM5{brrt_!$X)Uh!ndo3>H$a!J&ePW<45{$%!>>I?mL-8B{2v#&qqe@;-tDn&CI zWBm9pN+XVAcoXi~bFqo65;Vcn_B!j0!{g)uD~CD_MFdotWV$OVd#SAda(|6- z&^u_YSJ#}Qfp4GjA`#ArmQ9jYI=J1!OLeTMvZ_!r%~W+K+%aylDL(C&eJ}TByhqYf zxm{~{=TL>_8WRvsOO+qB^}PhyVwN!V%;u0msdX_CL(5J5_ZXa3rIkrRSRQvq(udbS zno-WXL6_N{I~#QI5V$9@yF1-R?RH9St6qz_w!-P5V7Ogy@59CW70hoTX{T$zF(nh_ zgga#^YzEgkSBr=Op?5*r3QKi48e5oxiayY^@Uya!DXu6{vlgOt@v1o%X6^$7wXIpV+GTK$WK{%_B znBdLrez~40B~cjM&j;qEGHp@)w>nZaW!@T=gew{%+!?@I#_;xXkx9M6ln%kldz?22 z{5m&eVA;68KrjYSMXMR;Bu8$yP#q??zo2NZd4$ zuj@M2{DZTO)#UVpGuWN}r3Y{6&q4KYmsaM!_EH{XK_ze>)&)*)XklrBo^trk-3?91 zF?CwJ3J0-{GfstP47jSbNH#L{haf&5q9QC{LvTfDZei=6l4xiQ*BqQl`6Q#s+n}Jy zyQek2j%K)fj58yqxu2@|XyhSwt(wegF6bxCZeurW-?VX5tj@QeJZXa5(uxh#cb}&^ zOv_{j&t4e((V2i@wn`~iqJ0x{=6SPU}wBoK?@vl!&EIY9gzs)3sLHV~`evUn*CEJVg{f!GY2 z#ouUbF$k~5W-+ZT1%)UZy)B-GFL5C&1O>Y~r9}i3HxkND$QD1OM%e_!MNl>y5YMES z#mP`w4w{$$)5~HIaD`^0|MavN6uf`X%*AUlNO3r|>L6k*23Z;l)f7%oixZ$40-=te zi^Z^1=ncd_VG1b#io{wBONBpaSb|}-*q#m*1y+l1)7a9_$QC0v_JV-;BMqB(%kVY! zoM;foppdM9HT>|kxuT#N4%4(%i=(jza^abQuowg~X=yRzi0i@(n8g4A1^_^cLhXFk RGC}|V002ovPDHLkV1m1=lpO#7 diff --git a/src/main/resources/images/trash.png b/src/main/resources/images/trash.png deleted file mode 100644 index 2ef8994fd25381725b1724a65a8b4d6bed6b05f3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 286 zcmeAS@N?(olHy`uVBq!ia0vp^{2k|nMYCBgY=CFO}lsSJ)O`AMk? zp1FzXsX?iUDV2pMQ*D5X4tTmahE&{2`t#{2H#1L7|EGWDPi>fm5(>X2zMsqb+(>El zzg6l-8yI)!+d5~sO@17+d%9<+@S%Uz|E~1^U`UBP7A}_cKYnk50+Ye*od$+noW=tD z`x*{v+s>TsRU^MWmtm5_mzRGsIhd6`or)4()WaF6K6#?#6vkq!7?xA13ak^B{`!CZ z{gN4ff196;VPciHcaZ(|M{~-@cd}kFPM1!amk00Q(s5gr#T3kPDCgU$FgMT4HC~cS ipWf)oQpjmwU}jjj(oeT>hH@j&FAScpelF{r5}E*vuWu^= diff --git a/src/main/resources/images/unused/edit.png b/src/main/resources/images/unused/edit.png index 24eb3b4a912e319c38902c9dde9042a26dd398e9..bda0d24c90e77b528de5e0d9422bf5462e3bc02a 100644 GIT binary patch literal 425 zcmV;a0apHrP)p0000PbVXQnQ*UN; zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBUzOG!jQRCwBykx5U&P!Px8)-|*b6e0-( z8Z~0X7(Ht$s0xu3Tea@1Vn2pZD~uLf+1mxVe(!wGx=qf|6tp;(SKIGt|hr{ z6mqOqH_he?#&{NpD5d9Tr{Fn`YuSTt-{QK)+P$xIIzuR#VWWtk2%MW*-EoJN8BvnRc+`0s)M!4v9qbv3EK%|&6d@Si5*pSm@9(TS6G7|P`ZPw^_k&f$ zaOh8c2D=hMFD|Q&GgwN)sd+Mq(I}?3HdEG*2eGDUbHY#B5=t4R=@f_XSAYQkhk$K; T@P=|s00000NkvXXu0mjfx=6PC literal 2950 zcmV;13wiX3P)5r00009a7bBm000XU z000XU0RWnu7ytkYPiaF#P*7-ZbZ>KLZ*U+IBfRsybQWXdwQbLP>6pAqfylh#{fb6;Z(vMMVS~$e@S=j*ftg6;Uhf59&ghTmgWD0l;*T zI709Y^p6lP1rIRMx#05C~cW=H_Aw*bJ-5DT&Z2n+x)QHX^p z00esgV8|mQcmRZ%02D^@S3L16t`O%c004NIvOKvYIYoh62rY33S640`D9%Y2D-rV&neh&#Q1i z007~1e$oCcFS8neI|hJl{-P!B1ZZ9hpmq0)X0i`JwE&>$+E?>%_LC6RbVIkUx0b+_+BaR3cnT7Zv!AJxW zizFb)h!jyGOOZ85F;a?DAXP{m@;!0_IfqH8(HlgRxt7s3}k3K`kFu>>-2Q$QMFfPW!La{h336o>X zu_CMttHv6zR;&ZNiS=X8v3CR#fknUxHUxJ0uoBa_M6WNWeqIg~6QE69c9o#eyhGvpiOA@W-aonk<7r1(?fC{oI5N*U!4 zfg=2N-7=cNnjjOr{yriy6mMFgG#l znCF=fnQv8CDz++o6_Lscl}eQ+l^ZHARH>?_s@|##Rr6KLRFA1%Q+=*RRWnoLsR`7U zt5vFIcfW3@?wFpwUVxrVZ>QdQz32KIeJ}k~{cZZE^+ya? z2D1z#2HOnI7(B%_ac?{wFUQ;QQA1tBKtrWrm0_3Rgps+?Jfqb{jYbcQX~taRB;#$y zZN{S}1|}gUOHJxc?wV3fxuz+mJ4`!F$IZ;mqRrNsHJd##*D~ju=bP7?-?v~|cv>vB zsJ6IeNwVZxrdjT`yl#bBIa#GxRa#xMMy;K#CDyyGyQdMSxlWT#tDe?p!?5wT$+oGt z8L;Kp2HUQ-ZMJ=3XJQv;x5ci*?vuTfeY$;({XGW_huIFR9a(?@3)XSs8O^N5RyOM=TTmp(3=8^+zpz2r)C z^>JO{deZfso3oq3?Wo(Y?l$ge?uXo;%ru`Vo>?<<(8I_>;8Eq#KMS9gFl*neeosSB zfoHYnBQIkwkyowPu(zdms`p{<7e4kra-ZWq<2*OsGTvEV%s0Td$hXT+!*8Bnh2KMe zBmZRodjHV?r+_5^X9J0WL4jKW`}lf%A-|44I@@LTvf1rHjG(ze6+w@Jt%Bvjts!X0 z?2xS?_ve_-kiKB_KiJlZ$9G`c^=E@oNG)mWWaNo-3TIW8)$Hg0Ub-~8?KhvJ>$ z3*&nim@mj(aCxE5!t{lw7O5^0EIO7zOo&c6l<+|iDySBWCGrz@C5{St!X3hAA}`T4 z(TLbXTq+(;@<=L8dXnssyft|w#WSTW<++3>sgS%(4NTpeI-VAqb|7ssJvzNHgOZVu zaYCvgO_R1~>SyL=cFU|~g|hy|Zi}}s9+d~lYqOB71z9Z$wnC=pR9Yz4DhIM>Wmjgu z&56o6maCpC&F##y%G;1PobR9i?GnNg;gYtchD%p19a!eQtZF&3JaKv33gZ<8D~47E ztUS1iwkmDaPpj=$m#%)jCVEY4fnLGNg2A-`YwHVD3gv};>)hAvT~AmqS>Lr``i7kw zJ{5_It`yrBmlc25DBO7E8;5VoznR>Ww5hAaxn$2~(q`%A-YuS64wkBy=9dm`4cXeX z4c}I@?e+FW+b@^RDBHV(wnMq2zdX3SWv9u`%{xC-q*U}&`cyXV(%rRT*Z6MH?i+i& z_B8C(+grT%{XWUQ+f@NoP1R=AW&26{v-dx)iK^-Nmiuj8txj!m?Z*Ss1N{dh4z}01 z)YTo*JycSU)+_5r4#yw9{+;i4Ee$peRgIj+;v;ZGdF1K$3E%e~4LaI(jC-u%2h$&R z9cLXcYC@Xwnns&bn)_Q~Te?roKGD|d-g^8;+aC{{G(1^(O7m37Y1-+6)01cN&y1aw zoqc{T`P^XJqPBbIW6s}d4{z_f5Om?vMgNQEJG?v2T=KYd^0M3I6IZxbny)%vZR&LD zJpPl@Psh8QyPB@KTx+@RdcC!KX7}kEo;S|j^u2lU7XQ}Oo;f|;z4Ll+_r>@1-xl3| zawq-H%e&ckC+@AhPrP6BKT#_XdT7&;F71j}Joy zkC~6lh7E@6o;W@^IpRNZ{ptLtL(gQ-CY~4mqW;US7Zxvm_|@yz&e53Bp_lTPlfP|z zrTyx_>lv@x#=^!PzR7qqF<$gm`|ZJZ+;<)Cqu&ot2z=0000WV@Og>004R=004l4008;_004mL004C`008P>0026e000+nl3&F} z00027NklNA(YDh)2v3V=%^RORylY#^KxP9Pt3U1(l8oIc?;gC|6UIb@! w(2AW8sa0)aggY*%7g>;iQ+&ByWI^CL08vjs#=5stk^lez07*qoM6N<$f`zVncmMzZ