diff -Nru ephoto-0.1.1~201309061142/AUTHORS ephoto-0.1.1~201401231205/AUTHORS --- ephoto-0.1.1~201309061142/AUTHORS 2013-08-05 02:52:29.000000000 +0000 +++ ephoto-0.1.1~201401231205/AUTHORS 2014-01-16 21:34:33.000000000 +0000 @@ -6,9 +6,10 @@ ________/ /__/ /__/ /__/ /_______/ /_/ /_______/ ===Project Manager/Lead Developer=== -Stephen "okra" Houston +Stephen "okra" Houston ===Developers=== Gustavo Sverzut Barbieri Otávio Pontes +Daniel Juyung Seo And others. diff -Nru ephoto-0.1.1~201309061142/COPYING ephoto-0.1.1~201401231205/COPYING --- ephoto-0.1.1~201309061142/COPYING 2013-08-05 02:52:29.000000000 +0000 +++ ephoto-0.1.1~201401231205/COPYING 2014-01-16 21:34:33.000000000 +0000 @@ -1,6 +1,3 @@ -Icons from the faenza project (http://tiheum.deviantart.com/art/Faenza-Icons-173323228) -For information see COPYING.icons - Copyright (C) 2000-2011 Stephen Houston All rights reserved. diff -Nru ephoto-0.1.1~201309061142/COPYING.icons ephoto-0.1.1~201401231205/COPYING.icons --- ephoto-0.1.1~201309061142/COPYING.icons 2013-08-05 02:52:29.000000000 +0000 +++ ephoto-0.1.1~201401231205/COPYING.icons 1970-01-01 00:00:00.000000000 +0000 @@ -1,675 +0,0 @@ - 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 -Nru ephoto-0.1.1~201309061142/NEWS ephoto-0.1.1~201401231205/NEWS --- ephoto-0.1.1~201309061142/NEWS 2013-08-05 02:52:29.000000000 +0000 +++ ephoto-0.1.1~201401231205/NEWS 2014-01-16 21:34:33.000000000 +0000 @@ -6,4 +6,4 @@ ________/ /__/ /__/ /__/ /_______/ /_/ /_______/ -New ephoto has been added to e/trunk/ephoto in svn. +Ephoto is located in git at apps/ephoto. diff -Nru ephoto-0.1.1~201309061142/README ephoto-0.1.1~201401231205/README --- ephoto-0.1.1~201309061142/README 2013-08-05 02:52:29.000000000 +0000 +++ ephoto-0.1.1~201401231205/README 2014-01-16 21:34:33.000000000 +0000 @@ -8,4 +8,3 @@ Ephoto Image Viewer/Editor/Manipulator/Slideshow creator. -Icons belong to the faenza project (http://tiheum.deviantart.com/art/Faenza-Icons-173323228) diff -Nru ephoto-0.1.1~201309061142/TODO ephoto-0.1.1~201401231205/TODO --- ephoto-0.1.1~201309061142/TODO 2013-08-05 02:52:29.000000000 +0000 +++ ephoto-0.1.1~201401231205/TODO 2014-01-16 21:34:33.000000000 +0000 @@ -7,20 +7,22 @@ TODO- +===Config=================== +Make the config system work better loading and saving config. +Add options to the config. +Add a config dialog. ===Thumb Browser============ Add a way to view more info ============================ ===Single Image Mode======== -Rotate Images. -Flip Images. --Possibly Grayscale, Sepia, etc..? --Possibly HSV, Brightness, Contrast, RGB, etc..? --Magnifier and color chooser +Make rotations and flips work +Add neat effects like grayscale, sepia, HSV/RGB, etc... +Save changes made to images ============================ ===Slideshow================ --Slideshow features. +-Slideshow features such as changing transition and possibly moving images. ============================ ===Other Random Features==== -Exporting to flickr, facebook, etc.. --Possibly a tag system? +-Read straight from a camera ============================ diff -Nru ephoto-0.1.1~201309061142/configure.ac ephoto-0.1.1~201401231205/configure.ac --- ephoto-0.1.1~201309061142/configure.ac 2013-08-05 02:52:29.000000000 +0000 +++ ephoto-0.1.1~201401231205/configure.ac 2014-01-16 21:34:33.000000000 +0000 @@ -84,8 +84,6 @@ PKG_CHECK_MODULES([ELEMENTARY], [elementary ecore-file ethumb_client]) PKG_CHECK_MODULES([EFREET_MIME], [efreet-mime]) -PKG_CHECK_MODULES([EIO], [eio]) -PKG_CHECK_MODULES([EET], [eet]) AC_ARG_ENABLE([libexif], [AC_HELP_STRING([--enable-libexif], [enable libexif support @<:@default=yes@:>@])], @@ -99,7 +97,6 @@ [_ephoto_enable_libexif="yes"] ) -AC_MSG_CHECKING([whether ethumb is built]) AC_MSG_RESULT([${_ephoto_enable_libexif}]) have_libexif="No" @@ -113,14 +110,6 @@ ]) fi -AC_ARG_WITH([edje-cc], - [AC_HELP_STRING([--with-edje-cc=PATH], - [specify a specific path to edje_cc])], - [edje_cc=$withval; - AC_MSG_NOTICE([edje_cc explicitly set to $edje_cc]) - ],[edje_cc=$(pkg-config --variable=prefix edje)/bin/edje_cc]) -AC_SUBST(edje_cc) - want_quicklaunch="auto" AC_ARG_ENABLE([quicklaunch], [AC_HELP_STRING([--disable-quicklaunch], @@ -164,10 +153,6 @@ ephoto.spec data/Makefile data/desktop/Makefile -data/images/Makefile -data/themes/Makefile -data/themes/default/Makefile -data/themes/default/images/Makefile src/Makefile src/bin/Makefile $po_makefile_in diff -Nru ephoto-0.1.1~201309061142/data/Makefile.am ephoto-0.1.1~201401231205/data/Makefile.am --- ephoto-0.1.1~201309061142/data/Makefile.am 2013-08-05 02:52:29.000000000 +0000 +++ ephoto-0.1.1~201401231205/data/Makefile.am 2014-01-16 21:34:33.000000000 +0000 @@ -1,2 +1,2 @@ MAINTAINERCLEANFILES = Makefile.in Makefile -SUBDIRS = desktop images themes +SUBDIRS = desktop diff -Nru ephoto-0.1.1~201309061142/data/desktop/ephoto.desktop ephoto-0.1.1~201401231205/data/desktop/ephoto.desktop --- ephoto-0.1.1~201309061142/data/desktop/ephoto.desktop 2013-08-05 02:52:29.000000000 +0000 +++ ephoto-0.1.1~201401231205/data/desktop/ephoto.desktop 2014-01-16 21:34:33.000000000 +0000 @@ -2,24 +2,8 @@ Encoding=UTF-8 Type=Application Name=Ephoto -Name[Name]=Ephoto -Name[ab]= -Name[ca]= -Name[cs]= -Name[de]= -Name[el]= Name[eo]=EFoto -Name[es]= Name[fr]=EPhoto -Name[gl]= -Name[hu]= -Name[it]= -Name[ja]= -Name[ko]= -Name[pt]= -Name[ru]= -Name[sr]= -Name[tr]= Comment=Enlightened Photo Viewer Comment[eo]=Foto-vidigilo de Enlightenment Comment[es]=Visualizador de fotos de Enlightenment diff -Nru ephoto-0.1.1~201309061142/data/images/Makefile.am ephoto-0.1.1~201401231205/data/images/Makefile.am --- ephoto-0.1.1~201309061142/data/images/Makefile.am 2013-08-05 02:52:29.000000000 +0000 +++ ephoto-0.1.1~201401231205/data/images/Makefile.am 1970-01-01 00:00:00.000000000 +0000 @@ -1,9 +0,0 @@ -MAINTAINERCLEANFILES = Makefile.in Makefile - -IMAGES = \ -*.png - -imagesdir = $(pkgdatadir)/images -images_DATA = $(IMAGES) - -EXTRA_DIST = $(IMAGES) Binary files /tmp/UgLaomp6hf/ephoto-0.1.1~201309061142/data/images/back.png and /tmp/adP5AvHLKB/ephoto-0.1.1~201401231205/data/images/back.png differ Binary files /tmp/UgLaomp6hf/ephoto-0.1.1~201309061142/data/images/back_grid.png and /tmp/adP5AvHLKB/ephoto-0.1.1~201401231205/data/images/back_grid.png differ Binary files /tmp/UgLaomp6hf/ephoto-0.1.1~201309061142/data/images/first.png and /tmp/adP5AvHLKB/ephoto-0.1.1~201401231205/data/images/first.png differ Binary files /tmp/UgLaomp6hf/ephoto-0.1.1~201309061142/data/images/folder.png and /tmp/adP5AvHLKB/ephoto-0.1.1~201401231205/data/images/folder.png differ Binary files /tmp/UgLaomp6hf/ephoto-0.1.1~201309061142/data/images/forward.png and /tmp/adP5AvHLKB/ephoto-0.1.1~201401231205/data/images/forward.png differ Binary files /tmp/UgLaomp6hf/ephoto-0.1.1~201309061142/data/images/grid.png and /tmp/adP5AvHLKB/ephoto-0.1.1~201401231205/data/images/grid.png differ Binary files /tmp/UgLaomp6hf/ephoto-0.1.1~201309061142/data/images/last.png and /tmp/adP5AvHLKB/ephoto-0.1.1~201401231205/data/images/last.png differ Binary files /tmp/UgLaomp6hf/ephoto-0.1.1~201309061142/data/images/single.png and /tmp/adP5AvHLKB/ephoto-0.1.1~201401231205/data/images/single.png differ Binary files /tmp/UgLaomp6hf/ephoto-0.1.1~201309061142/data/images/slideshow.png and /tmp/adP5AvHLKB/ephoto-0.1.1~201401231205/data/images/slideshow.png differ Binary files /tmp/UgLaomp6hf/ephoto-0.1.1~201309061142/data/images/up.png and /tmp/adP5AvHLKB/ephoto-0.1.1~201401231205/data/images/up.png differ Binary files /tmp/UgLaomp6hf/ephoto-0.1.1~201309061142/data/images/zoom-fit.png and /tmp/adP5AvHLKB/ephoto-0.1.1~201401231205/data/images/zoom-fit.png differ Binary files /tmp/UgLaomp6hf/ephoto-0.1.1~201309061142/data/images/zoom-in.png and /tmp/adP5AvHLKB/ephoto-0.1.1~201401231205/data/images/zoom-in.png differ Binary files /tmp/UgLaomp6hf/ephoto-0.1.1~201309061142/data/images/zoom-original.png and /tmp/adP5AvHLKB/ephoto-0.1.1~201401231205/data/images/zoom-original.png differ Binary files /tmp/UgLaomp6hf/ephoto-0.1.1~201309061142/data/images/zoom-out.png and /tmp/adP5AvHLKB/ephoto-0.1.1~201401231205/data/images/zoom-out.png differ diff -Nru ephoto-0.1.1~201309061142/data/themes/Makefile.am ephoto-0.1.1~201401231205/data/themes/Makefile.am --- ephoto-0.1.1~201309061142/data/themes/Makefile.am 2013-08-05 02:52:29.000000000 +0000 +++ ephoto-0.1.1~201401231205/data/themes/Makefile.am 1970-01-01 00:00:00.000000000 +0000 @@ -1,5 +0,0 @@ -## Process this file with automake to produce Makefile.in - -MAINTAINERCLEANFILES = Makefile.in Makefile - -SUBDIRS = default diff -Nru ephoto-0.1.1~201309061142/data/themes/default/Makefile.am ephoto-0.1.1~201401231205/data/themes/default/Makefile.am --- ephoto-0.1.1~201309061142/data/themes/default/Makefile.am 2013-08-05 02:52:29.000000000 +0000 +++ ephoto-0.1.1~201401231205/data/themes/default/Makefile.am 1970-01-01 00:00:00.000000000 +0000 @@ -1,23 +0,0 @@ -MAINTAINERCLEANFILES = Makefile.in - -SUBDIRS = images - -EDCS = ephoto.edc -EDJS = $(EDCS:%.edc=%.edj) - -ephoto_DEPS = ephoto.edc - -EXTRA_DIST = $(EDCS) - -CLEANFILES = $(EDJS) - -themedir = $(pkgdatadir)/themes/default -theme_DATA = $(EDJS) - -all: $(EDJS) - -ephoto.edj: ${ephoto_DEPS} - -SUFFIXES = .edc .edj -.edc.edj: - $(edje_cc) -id $(top_srcdir)/data/themes/default/images -fd $(top_srcdir)/data/themes/default/fonts $< $(top_builddir)/data/themes/default/$(@F) diff -Nru ephoto-0.1.1~201309061142/data/themes/default/ephoto.edc ephoto-0.1.1~201401231205/data/themes/default/ephoto.edc --- ephoto-0.1.1~201309061142/data/themes/default/ephoto.edc 2013-08-05 02:52:29.000000000 +0000 +++ ephoto-0.1.1~201401231205/data/themes/default/ephoto.edc 1970-01-01 00:00:00.000000000 +0000 @@ -1,603 +0,0 @@ -externals { - external: "elm"; -} - -collections { - group { name: "elm/layout/ephoto/orient"; - parts { - part { name: "elm.swallow.content"; - type: SWALLOW; - description { state: "default" 0.0; - } - description { state: "rotate_0" 0.0; - inherit: "default" 0.0; - map { - on: 1; - rotation.z: 0; - } - } - description { state: "rotate_90" 0.0; - inherit: "default" 0.0; - map { - on: 1; - rotation.z: 90; - } - } - description { state: "rotate_180" 0.0; - inherit: "default" 0.0; - map { - on: 1; - rotation.z: 180; - } - } - description { state: "rotate_270" 0.0; - inherit: "default" 0.0; - map { - on: 1; - rotation.z: 270; - } - } - description { state: "flip_horiz" 0.0; - inherit: "default" 0.0; - map { - on: 1; - rotation.y: 180; - } - } - description { state: "flip_vert" 0.0; - inherit: "default" 0.0; - map { - on: 1; - rotation.x: 180; - } - } - description { state: "flip_horiz_90" 0.0; - inherit: "default" 0.0; - map { - on: 1; - rotation { - z: 90; - y: 180; - } - } - } - description { state: "flip_vert_90" 0.0; - inherit: "default" 0.0; - map { - on: 1; - rotation { - z: 90; - x: 180; - } - } - } - } - programs { - program { - signal: "state,rotate,0"; - source: "ephoto"; - action: STATE_SET "rotate_0" 0.0; - target: "elm.swallow.content"; - } - program { - signal: "state,rotate,90"; - source: "ephoto"; - action: STATE_SET "rotate_90" 0.0; - target: "elm.swallow.content"; - } - program { - signal: "state,rotate,180"; - source: "ephoto"; - action: STATE_SET "rotate_180" 0.0; - target: "elm.swallow.content"; - } - program { - signal: "state,rotate,270"; - source: "ephoto"; - action: STATE_SET "rotate_270" 0.0; - target: "elm.swallow.content"; - } - program { - signal: "state,flip,horiz"; - source: "ephoto"; - action: STATE_SET "flip_horiz" 0.0; - target: "elm.swallow.content"; - } - program { - signal: "state,flip,vert"; - source: "ephoto"; - action: STATE_SET "flip_vert" 0.0; - target: "elm.swallow.content"; - } - program { - signal: "state,flip,horiz,90"; - source: "ephoto"; - action: STATE_SET "flip_horiz_90" 0.0; - target: "elm.swallow.content"; - } - program { - signal: "state,flip,vert,90"; - source: "ephoto"; - action: STATE_SET "flip_vert_90" 0.0; - target: "elm.swallow.content"; - } - } - } - } - group { name: "elm/gengrid/item/ephoto-album-preview/default"; - data.item: "texts" "elm.text"; - data.item: "icons" "elm.swallow.icon.1 elm.swallow.icon.2 elm.swallow.icon.3"; - data.item: "states" "have_files"; - images { - image: "bt_sm_base1.png" COMP; - image: "bt_sm_shine.png" COMP; - image: "bt_sm_hilight.png" COMP; - image: "directory-512.png" COMP; - } - parts { - part { name: "event"; - type: RECT; - repeat_events: 1; - description { state: "default" 0.0; - color: 0 0 0 0; - } - } - part { name: "bg"; - clip_to: "disclip"; - mouse_events: 0; - description { state: "default" 0.0; - visible: 0; - color: 255 255 255 0; - rel1.offset: -3 -3; - rel2.offset: 2 2; - image { - normal: "bt_sm_base1.png"; - border: 6 6 6 6; - middle: SOLID; - } - } - description { state: "selected" 0.0; - inherit: "default" 0.0; - visible: 1; - color: 255 255 255 255; - } - } - part { name: "image"; - type: IMAGE; - mouse_events: 0; - description { state: "default" 0.0; - aspect_preference: BOTH; - aspect: 1.0 1.0; - image.normal: "directory-512.png"; - rel2 { - to_y: "elm.text"; - relative: 1.0 0.0; - offset: -1 -2; - } - } - } - part { name: "have-files-clipper"; - type: RECT; - description { state: "default" 0.0; - color: 255 255 255 0; - visible: 0; - } - description { state: "visible" 0.0; - inherit: "default" 0.0; - color: 255 255 255 255; - visible: 1; - } - } - part { name: "icon_box_margin"; - type: RECT; - mouse_events: 0; - clip_to: "have-files-clipper"; - description { state: "default" 0.0; - color: 255 255 255 0; - rel1 { - to: "icon_box"; - offset: -1 -1; - } - rel2 { - to: "icon_box"; - offset: 0 0; - } - } - } - part { name: "icon_box"; - type: RECT; - mouse_events: 0; - clip_to: "have-files-clipper"; - description { state: "default" 0.0; - color: 255 255 255 0; - align: 1.0 1.0; - min: 32 32; - - rel1 { - to: "image"; - relative: 0.0 0.0; - offset: 0 20; - } - rel2 { - to: "image"; - relative: 1.0 1.0; - offset: -1 -1; - } - } - } - part { name: "elm.swallow.icon.1"; - type: SWALLOW; - mouse_events: 0; - clip_to: "have-files-clipper"; - description { state: "default" 0.0; - color: 255 0 0 255; - map { - on: 0; - rotation { - z: 0; - } - } - rel1 { - relative: 0.2 0.2; - to: "icon_box"; - } - rel2 { - relative: 0.8 0.8; - offset: -1 -1; - to: "icon_box"; - } - } - } - part { name: "elm.swallow.icon.2"; - type: SWALLOW; - mouse_events: 0; - clip_to: "have-files-clipper"; - description { state: "default" 0.0; - color: 255 0 0 255; - map { - on: 1; - rotation { - z: 15; - } - } - rel1 { - relative: 0.2 0.2; - to: "icon_box"; - } - rel2 { - relative: 0.8 0.8; - offset: -1 -1; - to: "icon_box"; - } - } - } - part { name: "elm.swallow.icon.3"; - type: SWALLOW; - mouse_events: 0; - clip_to: "have-files-clipper"; - description { state: "default" 0.0; - color: 255 0 0 255; - map { - on: 1; - rotation { - z: -15; - } - } - rel1 { - relative: 0.2 0.2; - to: "icon_box"; - } - rel2 { - relative: 0.8 0.8; - offset: -1 -1; - to: "icon_box"; - } - } - } - part { name: "elm.text"; - clip_to: "disclip"; - type: TEXT; - effect: SOFT_SHADOW; - mouse_events: 0; - scale: 1; - description { state: "default" 0.0; - rel1 { - relative: 0.0 1.0; - offset: 20 -30; - } - rel2 { - relative: 1.0 1.0; - offset: -21 -15; - } - color: 0 0 0 255; - color3: 0 0 0 0; - text { - font: "Sans"; - size: 10; - min: 0 1; - align: 0.5 0.0; - text_class: "grid_item"; - } - } - description { state: "selected" 0.0; - inherit: "default" 0.0; - color: 255 255 255 255; - } - } - part { name: "fg1"; - clip_to: "disclip"; - mouse_events: 0; - description { state: "default" 0.0; - visible: 0; - color: 255 255 255 0; - rel1.offset: -3 -3; - rel2 { - relative: 1.0 0.5; - offset: 2 -1; - } - image { - normal: "bt_sm_hilight.png"; - border: 6 6 6 0; - } - } - description { state: "selected" 0.0; - inherit: "default" 0.0; - visible: 1; - color: 255 255 255 255; - } - } - part { name: "fg2"; - clip_to: "disclip"; - mouse_events: 0; - description { state: "default" 0.0; - visible: 0; - color: 255 255 255 0; - rel1.offset: -3 -3; - rel2.offset: 2 2; - image { - normal: "bt_sm_shine.png"; - border: 6 6 6 0; - } - } - description { state: "selected" 0.0; - inherit: "default" 0.0; - visible: 1; - color: 255 255 255 255; - } - } - part { name: "disclip"; - type: RECT; - description { state: "default" 0.0; - rel1.to: "bg"; - rel2.to: "bg"; - } - description { state: "disabled" 0.0; - inherit: "default" 0.0; - color: 255 255 255 64; - } - } - } - programs { - program { name: "load"; - signal: "load"; - // script { - // new Float:val; - // custom_state(PART:"elm.swallow.icon.3", "default", 0.0); - // custom_state(PART:"elm.swallow.icon.1", "default", 0.0); - // val = randf(); - // val = 40 * val - 20; - // set_state_val(PART:"elm.swallow.icon.3", STATE_MAP_ROT_Z, val); - // val = randf(); - // val = 40 * val - 20; - // set_state_val(PART:"elm.swallow.icon.1", STATE_MAP_ROT_Z, val); - //set_state(PART:"elm.swallow.icon.1", "custom", 0.0); - // set_state(PART:"elm.swallow.icon.3", "custom", 0.0); - //} - } - program { name: "go_active"; - signal: "elm,state,selected"; - source: "elm"; - action: STATE_SET "selected" 0.0; - target: "bg"; - target: "fg1"; - target: "fg2"; - target: "elm.text"; - } - program { name: "go_passive"; - signal: "elm,state,unselected"; - source: "elm"; - action: STATE_SET "default" 0.0; - target: "bg"; - target: "fg1"; - target: "fg2"; - target: "elm.text"; - transition: LINEAR 0.1; - } - program { name: "go_disabled"; - signal: "elm,state,disabled"; - source: "elm"; - action: STATE_SET "disabled" 0.0; - target: "disclip"; - } - program { name: "go_enabled"; - signal: "elm,state,enabled"; - source: "elm"; - action: STATE_SET "default" 0.0; - target: "disclip"; - } - program { - signal: "elm,state,have_files,active"; - source: "elm"; - action: STATE_SET "visible" 0.0; - target: "have-files-clipper"; - } - } - } - group { name: "elm/gengrid/item/ephoto-up/default"; - data.item: "texts" "elm.text"; - images { - image: "bt_sm_base1.png" COMP; - image: "bt_sm_shine.png" COMP; - image: "bt_sm_hilight.png" COMP; - image: "directory-up-512.png" COMP; - } - parts { - part { name: "event"; - type: RECT; - repeat_events: 1; - description { state: "default" 0.0; - color: 0 0 0 0; - } - } - part { name: "bg"; - clip_to: "disclip"; - mouse_events: 0; - description { state: "default" 0.0; - visible: 0; - color: 255 255 255 0; - rel1.offset: -3 -3; - rel2.offset: 2 2; - image { - normal: "bt_sm_base1.png"; - border: 6 6 6 6; - middle: SOLID; - } - } - description { state: "selected" 0.0; - inherit: "default" 0.0; - visible: 1; - color: 255 255 255 255; - } - } - part { name: "image"; - type: IMAGE; - mouse_events: 0; - description { state: "default" 0.0; - aspect_preference: BOTH; - aspect: 1.0 1.0; - image.normal: "directory-up-512.png"; - rel2 { - to_y: "elm.text"; - relative: 1.0 0.0; - offset: -1 -2; - } - } - } - part { name: "elm.text"; - clip_to: "disclip"; - type: TEXT; - effect: SOFT_SHADOW; - mouse_events: 0; - scale: 1; - description { state: "default" 0.0; - rel1 { - relative: 0.0 1.0; - offset: 20 -30; - } - rel2 { - relative: 1.0 1.0; - offset: -21 -15; - } - color: 0 0 0 255; - color3: 0 0 0 0; - text { - font: "Sans"; - size: 10; - min: 0 1; - align: 0.5 0.0; - text_class: "grid_item"; - } - } - description { state: "selected" 0.0; - inherit: "default" 0.0; - color: 255 255 255 255; - } - } - part { name: "fg1"; - clip_to: "disclip"; - mouse_events: 0; - description { state: "default" 0.0; - visible: 0; - color: 255 255 255 0; - rel1.offset: -3 -3; - rel2 { - relative: 1.0 0.5; - offset: 2 -1; - } - image { - normal: "bt_sm_hilight.png"; - border: 6 6 6 0; - } - } - description { state: "selected" 0.0; - inherit: "default" 0.0; - visible: 1; - color: 255 255 255 255; - } - } - part { name: "fg2"; - clip_to: "disclip"; - mouse_events: 0; - description { state: "default" 0.0; - visible: 0; - color: 255 255 255 0; - rel1.offset: -3 -3; - rel2.offset: 2 2; - image { - normal: "bt_sm_shine.png"; - border: 6 6 6 0; - } - } - description { state: "selected" 0.0; - inherit: "default" 0.0; - visible: 1; - color: 255 255 255 255; - } - } - part { name: "disclip"; - type: RECT; - description { state: "default" 0.0; - rel1.to: "bg"; - rel2.to: "bg"; - } - description { state: "disabled" 0.0; - inherit: "default" 0.0; - color: 255 255 255 64; - } - } - } - programs { - program { name: "go_active"; - signal: "elm,state,selected"; - source: "elm"; - action: STATE_SET "selected" 0.0; - target: "bg"; - target: "fg1"; - target: "fg2"; - target: "elm.text"; - } - program { name: "go_passive"; - signal: "elm,state,unselected"; - source: "elm"; - action: STATE_SET "default" 0.0; - target: "bg"; - target: "fg1"; - target: "fg2"; - target: "elm.text"; - transition: LINEAR 0.1; - } - program { name: "go_disabled"; - signal: "elm,state,disabled"; - source: "elm"; - action: STATE_SET "disabled" 0.0; - target: "disclip"; - } - program { name: "go_enabled"; - signal: "elm,state,enabled"; - source: "elm"; - action: STATE_SET "default" 0.0; - target: "disclip"; - } - } - } -} Binary files /tmp/UgLaomp6hf/ephoto-0.1.1~201309061142/data/themes/default/fonts/Vera.ttf and /tmp/adP5AvHLKB/ephoto-0.1.1~201401231205/data/themes/default/fonts/Vera.ttf differ diff -Nru ephoto-0.1.1~201309061142/data/themes/default/images/Makefile.am ephoto-0.1.1~201401231205/data/themes/default/images/Makefile.am --- ephoto-0.1.1~201309061142/data/themes/default/images/Makefile.am 2013-08-05 02:52:29.000000000 +0000 +++ ephoto-0.1.1~201401231205/data/themes/default/images/Makefile.am 1970-01-01 00:00:00.000000000 +0000 @@ -1,4 +0,0 @@ -MAINTAINERCLEANFILES = Makefile.in - -EXTRA_DIST = \ -*.png Binary files /tmp/UgLaomp6hf/ephoto-0.1.1~201309061142/data/themes/default/images/bt_sm_base1.png and /tmp/adP5AvHLKB/ephoto-0.1.1~201401231205/data/themes/default/images/bt_sm_base1.png differ Binary files /tmp/UgLaomp6hf/ephoto-0.1.1~201309061142/data/themes/default/images/bt_sm_hilight.png and /tmp/adP5AvHLKB/ephoto-0.1.1~201401231205/data/themes/default/images/bt_sm_hilight.png differ Binary files /tmp/UgLaomp6hf/ephoto-0.1.1~201309061142/data/themes/default/images/bt_sm_shine.png and /tmp/adP5AvHLKB/ephoto-0.1.1~201401231205/data/themes/default/images/bt_sm_shine.png differ Binary files /tmp/UgLaomp6hf/ephoto-0.1.1~201309061142/data/themes/default/images/directory-512.png and /tmp/adP5AvHLKB/ephoto-0.1.1~201401231205/data/themes/default/images/directory-512.png differ Binary files /tmp/UgLaomp6hf/ephoto-0.1.1~201309061142/data/themes/default/images/directory-up-512.png and /tmp/adP5AvHLKB/ephoto-0.1.1~201401231205/data/themes/default/images/directory-up-512.png differ diff -Nru ephoto-0.1.1~201309061142/debian/changelog ephoto-0.1.1~201401231205/debian/changelog --- ephoto-0.1.1~201309061142/debian/changelog 2013-09-06 07:42:14.000000000 +0000 +++ ephoto-0.1.1~201401231205/debian/changelog 2014-01-23 08:05:36.000000000 +0000 @@ -1,4 +1,4 @@ -ephoto (0.1.1~201309061142-1ppa1~quantal) quantal; urgency=high +ephoto (0.1.1~201401231205-1ppa1~quantal) quantal; urgency=high * Autobuild. diff -Nru ephoto-0.1.1~201309061142/ephoto.spec.in ephoto-0.1.1~201401231205/ephoto.spec.in --- ephoto-0.1.1~201309061142/ephoto.spec.in 2013-08-05 02:52:29.000000000 +0000 +++ ephoto-0.1.1~201401231205/ephoto.spec.in 2014-01-16 21:34:33.000000000 +0000 @@ -6,8 +6,8 @@ Group: Applications/Multimedia URL: http://www.stephen.3sixty8.com Source: %{name}-%{version}.tar.gz -Packager: %{?_packager:%{_packager}}%{!?_packager:Stephen Houston } -Vendor: %{?_vendorinfo:%{_vendorinfo}}%{!?_vendorinfo:Okra Project (http://www.stephen.3sixty8.com/)} +Packager: %{?_packager:%{_packager}}%{!?_packager:Stephen Houston } +Vendor: %{?_vendorinfo:%{_vendorinfo}}%{!?_vendorinfo:Okra Project (http://www.smhouston.us/)} Distribution: %{?_distribution:%{_distribution}}%{!?_distribution:%{_vendor}} #BuildSuggests: xorg-x11-devel Requires: efl edje ethumb diff -Nru ephoto-0.1.1~201309061142/po/POTFILES.in ephoto-0.1.1~201401231205/po/POTFILES.in --- ephoto-0.1.1~201309061142/po/POTFILES.in 2013-08-05 02:52:29.000000000 +0000 +++ ephoto-0.1.1~201401231205/po/POTFILES.in 2014-01-16 21:34:33.000000000 +0000 @@ -1,7 +1,6 @@ src/bin/ephoto.c src/bin/ephoto_config.c src/bin/ephoto_main.c -src/bin/ephoto_directory_thumb.c src/bin/ephoto_thumb_browser.c src/bin/ephoto_single_browser.c src/bin/ephoto_slideshow.c diff -Nru ephoto-0.1.1~201309061142/src/bin/Makefile.am ephoto-0.1.1~201401231205/src/bin/Makefile.am --- ephoto-0.1.1~201309061142/src/bin/Makefile.am 2013-08-05 02:52:29.000000000 +0000 +++ ephoto-0.1.1~201401231205/src/bin/Makefile.am 2014-01-16 21:34:33.000000000 +0000 @@ -6,7 +6,7 @@ -DPACKAGE_DATA_DIR=\"$(datadir)/$(PACKAGE)\" \ -DGETTEXT_PACKAGE=\"$(PACKAGE)\" \ -DLOCALEDIR=\"$(localedir)\" \ - @ELEMENTARY_CFLAGS@ @EFREET_MIME_CFLAGS@ @EIO_CFLAGS@ @EXIF_CFLAGS@ @EET_CFLAGS@ + @ELEMENTARY_CFLAGS@ @EFREET_MIME_CFLAGS@ @EXIF_CFLAGS@ bin_PROGRAMS = ephoto if BUILD_QUICKLAUNCH @@ -17,13 +17,12 @@ ephoto.c \ ephoto_main.c \ ephoto_config.c \ - ephoto_directory_thumb.c \ ephoto_thumb_browser.c \ ephoto_single_browser.c \ ephoto_slideshow.c -_libs = @ELEMENTARY_LIBS@ @EFREET_MIME_LIBS@ @EIO_LIBS@ @EXIF_LIBS@ @EET_LIBS@ +_libs = @ELEMENTARY_LIBS@ @EFREET_MIME_LIBS@ @EXIF_LIBS@ ephoto_SOURCES = $(_sources) ephoto_LDADD = $(_libs) diff -Nru ephoto-0.1.1~201309061142/src/bin/ephoto.c ephoto-0.1.1~201401231205/src/bin/ephoto.c --- ephoto-0.1.1~201309061142/src/bin/ephoto.c 2013-08-05 02:52:29.000000000 +0000 +++ ephoto-0.1.1~201401231205/src/bin/ephoto.c 2014-01-16 21:34:33.000000000 +0000 @@ -37,28 +37,9 @@ goto end_log_domain; } - elm_theme_extension_add(NULL, PACKAGE_DATA_DIR"/themes/default/ephoto.edj"); - if (!efreet_mime_init()) ERR("Could not init efreet_mime!"); -/* - * this isn't valid to assume oan ethumbd is ALWAYS around and ALWAYS - * connected - especially on startup. ethumbd may go away (timeout) and - * thus the client connection may go. if you want to do this kind of thing, - * you will need to extend elm_thumb itself to store these and "implement" - * them on connect - client = elm_thumb_ethumb_client_get(); - if (!client) - { - ERR("could not get ethumb_client"); - r = 1; - goto end; - } - ethumb_client_crop_align_set(client, 0.5, 0.5); - ethumb_client_aspect_set(client, ETHUMB_THUMB_CROP); - ethumb_client_orientation_set(client, ETHUMB_THUMB_ORIENT_ORIGINAL); - */ elm_policy_set(ELM_POLICY_QUIT, ELM_POLICY_QUIT_LAST_WINDOW_CLOSED); DBG("Logging initialized"); diff -Nru ephoto-0.1.1~201309061142/src/bin/ephoto.h ephoto-0.1.1~201401231205/src/bin/ephoto.h --- ephoto-0.1.1~201309061142/src/bin/ephoto.h 2013-08-05 02:52:29.000000000 +0000 +++ ephoto-0.1.1~201401231205/src/bin/ephoto.h 2014-01-16 21:34:33.000000000 +0000 @@ -22,8 +22,6 @@ #include #include -#define THEME_FILE PACKAGE_DATA_DIR"/themes/default/ephoto.edj" - typedef struct _Ephoto_Config Ephoto_Config; typedef struct _Ephoto Ephoto; typedef struct _Ephoto_Entry Ephoto_Entry; @@ -58,8 +56,6 @@ * "back" - the user want to go back to the previous screen. */ -Evas_Object *ephoto_directory_thumb_add(Evas_Object *parent, Ephoto_Entry *e); - Evas_Object *ephoto_thumb_browser_add(Ephoto *ephoto, Evas_Object *parent); /* smart callbacks called: @@ -143,8 +139,6 @@ Ephoto *ephoto; Elm_Object_Item *item; Eina_List *free_listeners; - Eina_List *dir_files; /* if dir, here contain files with preview */ - Eina_Bool dir_files_checked : 1; Eina_Bool is_dir : 1; Eina_Bool is_up : 1; }; diff -Nru ephoto-0.1.1~201309061142/src/bin/ephoto_directory_thumb.c ephoto-0.1.1~201401231205/src/bin/ephoto_directory_thumb.c --- ephoto-0.1.1~201309061142/src/bin/ephoto_directory_thumb.c 2013-08-05 02:52:29.000000000 +0000 +++ ephoto-0.1.1~201401231205/src/bin/ephoto_directory_thumb.c 1970-01-01 00:00:00.000000000 +0000 @@ -1,176 +0,0 @@ -#include "ephoto.h" - -typedef struct _Ephoto_Directory_Thumb Ephoto_Directory_Thumb; -struct _Ephoto_Directory_Thumb -{ - Eio_File *ls; - Eina_List *objs; - Ephoto_Entry *entry; - Eina_Bool canceled:1; -}; - -static Eina_Hash *_pending_dirs = NULL; - -static void -_entry_free(void *data, const Ephoto_Entry *entry __UNUSED__) -{ - Ephoto_Directory_Thumb *dt = data; - dt->entry = NULL; -} - -static void -_ephoto_directory_thumb_free(Ephoto_Directory_Thumb *dt) -{ - if (dt->entry) - { - ephoto_entry_free_listener_del(dt->entry, _entry_free, dt); - eina_hash_del(_pending_dirs, dt->entry->path, dt); - dt->entry = NULL; - } - - if (dt->ls) - { - dt->canceled = EINA_TRUE; - eio_file_cancel(dt->ls); - return; - } - - free(dt); - - if (_pending_dirs) - { - if (!eina_hash_population(_pending_dirs)) - { - eina_hash_free(_pending_dirs); - _pending_dirs = NULL; - } - } -} - -static void -_obj_del(void *data, Evas *e __UNUSED__, Evas_Object *obj, void *event_info __UNUSED__) -{ - Ephoto_Directory_Thumb *dt = data; - dt->objs = eina_list_remove(dt->objs, obj); - if (!dt->objs) - { - dt->canceled = EINA_TRUE; - _ephoto_directory_thumb_free(dt); - } -} - -static Eina_Bool -_populate_filter(void *data __UNUSED__, Eio_File *handler __UNUSED__, const Eina_File_Direct_Info *info) -{ - return _ephoto_eina_file_direct_info_image_useful(info); -} - -static void -_populate_end(void *data, Eio_File *handler __UNUSED__) -{ - Ephoto_Directory_Thumb *dt = data; - Evas_Object *obj; - dt->ls = NULL; - - EINA_LIST_FREE(dt->objs, obj) - evas_object_event_callback_del_full(obj, EVAS_CALLBACK_DEL, _obj_del, dt); - - if (dt->entry) - { - dt->entry->dir_files_checked = EINA_TRUE; - if ((dt->entry->item) && (!dt->canceled)) - elm_gengrid_item_update(dt->entry->item); - } - - _ephoto_directory_thumb_free(dt); -} - -static void -_populate_error(void *data, Eio_File *handler, int error) -{ - Ephoto_Directory_Thumb *dt = data; - if (error) ERR("could not populate: %s", strerror(error)); - _populate_end(dt, handler); -} - -static void -_populate_main(void *data, Eio_File *handler __UNUSED__, const Eina_File_Direct_Info *info) -{ - Ephoto_Directory_Thumb *dt = data; - Evas_Object *obj; - const char *file; - - if (!dt->objs) return; - if (!dt->entry) return; - - obj = dt->objs->data; - file = eina_stringshare_add(info->path); - - DBG("populate thumbnail %p with path '%s'", obj, file); - - dt->objs = eina_list_remove_list(dt->objs, dt->objs); - dt->entry->dir_files = eina_list_append(dt->entry->dir_files, file); - ephoto_thumb_path_set(obj, file); - - evas_object_event_callback_del_full(obj, EVAS_CALLBACK_DEL, _obj_del, dt); - if ((!dt->objs) && (dt->ls)) - { - eio_file_cancel(dt->ls); - dt->ls = NULL; - } -} - -Evas_Object * -ephoto_directory_thumb_add(Evas_Object *parent, Ephoto_Entry *entry) -{ - Ephoto_Directory_Thumb *dt; - Evas_Object *obj; - - if (_pending_dirs) - dt = eina_hash_find(_pending_dirs, entry->path); - else - { - dt = NULL; - _pending_dirs = eina_hash_stringshared_new(NULL); - EINA_SAFETY_ON_NULL_RETURN_VAL(_pending_dirs, NULL); - } - - obj = ephoto_thumb_add(entry->ephoto, parent, NULL); - EINA_SAFETY_ON_NULL_RETURN_VAL(obj, NULL); - - if (!dt) - { - dt = calloc(1, sizeof(Ephoto_Directory_Thumb)); - if (!dt) - { - ERR("could not allocate memory for Ephoto_Directory_Thumb"); - evas_object_del(obj); - return NULL; - } - ephoto_entry_free_listener_add(entry, _entry_free, dt); - dt->entry = entry; - dt->ls = eio_file_direct_ls(entry->path, - _populate_filter, - _populate_main, - _populate_end, - _populate_error, - dt); - if (!dt->ls) - { - ERR("could not create eio_file_direct_ls(%s)", entry->path); - evas_object_del(obj); - free(dt); - return NULL; - } - - eina_hash_add(_pending_dirs, entry->path, dt); - DBG("start thread to lookup inside '%s' for thumbnails.", entry->path); - } - else - DBG("thread already started, wait for thumbnails in '%s'", entry->path); - - dt->objs = eina_list_append(dt->objs, obj); - - evas_object_event_callback_add(obj, EVAS_CALLBACK_DEL, _obj_del, dt); - return obj; -} diff -Nru ephoto-0.1.1~201309061142/src/bin/ephoto_main.c ephoto-0.1.1~201401231205/src/bin/ephoto_main.c --- ephoto-0.1.1~201309061142/src/bin/ephoto_main.c 2013-08-05 02:52:29.000000000 +0000 +++ ephoto-0.1.1~201401231205/src/bin/ephoto_main.c 2014-01-16 21:34:33.000000000 +0000 @@ -124,7 +124,6 @@ ephoto_window_add(const char *path) { Ephoto *ephoto = calloc(1, sizeof(Ephoto)); - Ethumb_Client *client = elm_thumb_ethumb_client_get(); char buf[PATH_MAX]; EINA_SAFETY_ON_NULL_RETURN_VAL(ephoto, NULL); @@ -155,9 +154,6 @@ (ephoto->config->thumb_gen_size != 256) && (ephoto->config->thumb_gen_size != 512)) ephoto_thumb_size_set(ephoto, ephoto->config->thumb_size); - else if (client) - ethumb_client_size_set - (client, ephoto->config->thumb_gen_size, ephoto->config->thumb_gen_size); ephoto->bg = elm_bg_add(ephoto->win); evas_object_size_hint_weight_set @@ -259,7 +255,7 @@ { char buf[1024] = "Ephoto"; - if (title) snprintf(buf, sizeof(buf), "%s - Ephoto", title); + if (title) snprintf(buf, sizeof(buf), "Ephoto - %s", title); elm_win_title_set(ephoto->win, buf); } @@ -381,7 +377,6 @@ _thumb_gen_size_changed_timer_cb(void *data) { Ephoto *ephoto = data; - Ethumb_Client *client; const Eina_List *l; Evas_Object *o; @@ -390,16 +385,7 @@ INF("thumbnail generation size changed from %d to %d", ephoto->config->thumb_gen_size, ephoto->thumb_gen_size); - client = elm_thumb_ethumb_client_get(); - if (!client) - { - DBG("no client yet, try again later"); - return EINA_TRUE; - } - ephoto->config->thumb_gen_size = ephoto->thumb_gen_size; - ethumb_client_size_set - (client, ephoto->thumb_gen_size, ephoto->thumb_gen_size); EINA_LIST_FOREACH(ephoto->thumbs, l, o) { @@ -407,7 +393,16 @@ format = (long)evas_object_data_get(o, "ephoto_format"); if (format) { - ethumb_client_format_set(client, format); + elm_thumb_format_set(o, format); + if (format == ETHUMB_THUMB_FDO) + { + if (ephoto->config->thumb_gen_size < 256) + elm_thumb_fdo_size_set(o, ETHUMB_THUMB_NORMAL); + else + elm_thumb_fdo_size_set(o, ETHUMB_THUMB_LARGE); + } + else + elm_thumb_size_set(o, ephoto->thumb_gen_size, ephoto->thumb_gen_size); elm_thumb_reload(o); } } @@ -502,8 +497,11 @@ return; } } - ethumb_client_format_set(elm_thumb_ethumb_client_get(), format); + elm_thumb_format_set(o, format); evas_object_data_set(o, "ephoto_format", (void*)(long)format); + elm_thumb_crop_align_set(o, 0.5, 0.5); + elm_thumb_aspect_set(o, ETHUMB_THUMB_CROP); + elm_thumb_orientation_set(o, ETHUMB_THUMB_ORIENT_ORIGINAL); elm_thumb_file_set(o, path, group); } @@ -524,7 +522,6 @@ void ephoto_entry_free(Ephoto_Entry *entry) { - const char *s; Ephoto_Entry_Free_Listener *fl; EINA_LIST_FREE(entry->free_listeners, fl) @@ -535,7 +532,6 @@ EINA_SAFETY_ON_NULL_RETURN(entry); eina_stringshare_del(entry->path); eina_stringshare_del(entry->label); - EINA_LIST_FREE(entry->dir_files, s) eina_stringshare_del(s); free(entry); } diff -Nru ephoto-0.1.1~201309061142/src/bin/ephoto_single_browser.c ephoto-0.1.1~201401231205/src/bin/ephoto_single_browser.c --- ephoto-0.1.1~201309061142/src/bin/ephoto_single_browser.c 2013-08-05 02:52:29.000000000 +0000 +++ ephoto-0.1.1~201401231205/src/bin/ephoto_single_browser.c 2014-01-16 21:34:33.000000000 +0000 @@ -20,7 +20,7 @@ Ephoto *ephoto; Evas_Object *main; Evas_Object *bar; - Evas_Object *sentry; + Evas_Object *edje; Evas_Object *viewer; const char *pending_path; Ephoto_Entry *entry; @@ -491,11 +491,10 @@ { const char *bname = ecore_file_file_get(sb->entry->path); sb->viewer = _viewer_add(sb->main, sb->entry->path); - elm_box_pack_end(sb->main, sb->viewer); + elm_layout_box_append(sb->main, "elm.box.content", sb->viewer); evas_object_show(sb->viewer); evas_object_event_callback_add (sb->viewer, EVAS_CALLBACK_MOUSE_WHEEL, _mouse_wheel, sb); - elm_entry_entry_set(sb->sentry, bname); ephoto_title_set(sb->ephoto, bname); sb->orient = ephoto_file_orient_get(sb->entry->path); _orient_apply(sb); @@ -698,11 +697,6 @@ } static void -_changed_file_text(void *data __UNUSED__, Evas_Object *o __UNUSED__, void *event_info __UNUSED__) -{ -} - -static void _key_down(void *data, Evas *e __UNUSED__, Evas_Object *o __UNUSED__, void *event_info) { Ephoto_Single_Browser *sb = data; @@ -804,111 +798,75 @@ return ECORE_CALLBACK_PASS_ON; } -static Evas_Object * -_button_add(Evas_Object *box, const char *image) -{ - Evas_Object *but, *ic; - - but = elm_button_add(box); - - ic = elm_icon_add(but); - elm_image_file_set(ic, image, NULL); - evas_object_size_hint_aspect_set(ic, EVAS_ASPECT_CONTROL_BOTH, 1, 1); - - elm_object_content_set(but, ic); - evas_object_size_hint_align_set(but, EVAS_HINT_FILL, EVAS_HINT_FILL); - elm_box_pack_end(box, but); - evas_object_show(but); - - return but; -} - Evas_Object * ephoto_single_browser_add(Ephoto *ephoto, Evas_Object *parent) { - Evas_Object *box = elm_box_add(parent); - Evas_Object *but, *sep; + Evas_Object *layout = elm_layout_add(parent); + Elm_Object_Item *icon; Ephoto_Single_Browser *sb; - EINA_SAFETY_ON_NULL_RETURN_VAL(box, NULL); + EINA_SAFETY_ON_NULL_RETURN_VAL(layout, NULL); sb = calloc(1, sizeof(Ephoto_Single_Browser)); EINA_SAFETY_ON_NULL_GOTO(sb, error); sb->ephoto = ephoto; - sb->main = box; - elm_box_horizontal_set(sb->main, EINA_FALSE); - elm_box_homogeneous_set(sb->main, EINA_FALSE); + sb->main = layout; + sb->edje = elm_layout_edje_get(layout); + evas_object_event_callback_add(sb->main, EVAS_CALLBACK_DEL, _main_del, sb); evas_object_event_callback_add (sb->main, EVAS_CALLBACK_KEY_DOWN, _key_down, sb); evas_object_data_set(sb->main, "single_browser", sb); - sb->bar = elm_box_add(sb->main); - elm_box_horizontal_set(sb->bar, EINA_TRUE); - elm_box_homogeneous_set(sb->bar, EINA_FALSE); - evas_object_size_hint_weight_set(sb->bar, 0.0, 0.0); - evas_object_size_hint_align_set(sb->bar, EVAS_HINT_FILL, 0.0); - evas_object_show(sb->bar); - elm_box_pack_end(sb->main, sb->bar); - - but = _button_add(sb->bar, PACKAGE_DATA_DIR "/images/back_grid.png"); - evas_object_smart_callback_add(but, "clicked", _back, sb); - - sep = elm_separator_add(sb->bar); - elm_box_pack_end(sb->bar, sep); - evas_object_show(sep); - - but = _button_add(sb->bar, PACKAGE_DATA_DIR "/images/zoom-in.png"); - evas_object_smart_callback_add(but, "clicked", _zoom_in_cb, sb); - - but = _button_add(sb->bar, PACKAGE_DATA_DIR "/images/zoom-out.png"); - evas_object_smart_callback_add(but, "clicked", _zoom_out_cb, sb); - - but = _button_add(sb->bar, PACKAGE_DATA_DIR "/images/zoom-fit.png"); - evas_object_smart_callback_add(but, "clicked", _zoom_fit_cb, sb); - - but = _button_add(sb->bar, PACKAGE_DATA_DIR "/images/zoom-original.png"); - evas_object_smart_callback_add(but, "clicked", _zoom_1_cb, sb); - - sep = elm_separator_add(sb->bar); - elm_box_pack_end(sb->bar, sep); - evas_object_show(sep); - - sb->sentry = elm_entry_add(sb->bar); - evas_object_size_hint_weight_set(sb->sentry, EVAS_HINT_EXPAND, 0.0); - evas_object_size_hint_align_set(sb->sentry, EVAS_HINT_FILL, EVAS_HINT_FILL); - elm_entry_single_line_set(sb->sentry, EINA_TRUE); - elm_entry_scrollable_set(sb->sentry, EINA_TRUE); - elm_scroller_policy_set(sb->sentry, ELM_SCROLLER_POLICY_OFF, - ELM_SCROLLER_POLICY_OFF); - elm_object_disabled_set(sb->sentry, EINA_TRUE); - evas_object_smart_callback_add - (sb->sentry, "activated", _changed_file_text, sb); - elm_box_pack_end(sb->bar, sb->sentry); - evas_object_show(sb->sentry); - - sep = elm_separator_add(sb->bar); - elm_box_pack_end(sb->bar, sep); - evas_object_show(sep); - - but = _button_add(sb->bar, PACKAGE_DATA_DIR "/images/first.png"); - evas_object_smart_callback_add(but, "clicked", _go_first, sb); - - but = _button_add(sb->bar, PACKAGE_DATA_DIR "/images/back.png"); - evas_object_smart_callback_add(but, "clicked", _go_prev, sb); - - but = _button_add(sb->bar, PACKAGE_DATA_DIR "/images/forward.png"); - evas_object_smart_callback_add(but, "clicked", _go_next, sb); - - but = _button_add(sb->bar, PACKAGE_DATA_DIR "/images/last.png"); - evas_object_smart_callback_add(but, "clicked", _go_last, sb); - - sep = elm_separator_add(sb->bar); - elm_box_pack_end(sb->bar, sep); - evas_object_show(sep); + if (!elm_layout_theme_set(sb->main, "layout", "application", "toolbar-vbox")) + { + ERR("Could not load style 'toolbar-vbox' from theme!"); + goto error; + } + sb->bar = edje_object_part_external_object_get(sb->edje, "elm.external.toolbar"); + if (!sb->bar) + { + ERR("Could not find toolbar in layout!"); + goto error; + } + elm_toolbar_homogeneous_set(sb->bar, EINA_FALSE); + elm_toolbar_shrink_mode_set(sb->bar, ELM_TOOLBAR_SHRINK_MENU); + elm_toolbar_menu_parent_set(sb->bar, parent); + elm_toolbar_select_mode_set(sb->bar, ELM_OBJECT_SELECT_MODE_NONE); + + icon = elm_toolbar_item_append(sb->bar, "go-home", "Back", _back, sb); + elm_toolbar_item_priority_set(icon, 150); + + icon = elm_toolbar_item_append(sb->bar, "media-playback-start", "Slideshow", _slideshow, sb); + elm_toolbar_item_priority_set(icon, 150); + + elm_toolbar_item_separator_set(elm_toolbar_item_append(sb->bar, NULL, NULL, NULL, NULL), EINA_TRUE); + + icon = elm_toolbar_item_append(sb->bar, "zoom-in", "In", _zoom_in_cb, sb); + elm_toolbar_item_priority_set(icon, 100); + + icon = elm_toolbar_item_append(sb->bar, "zoom-out", "Out", _zoom_out_cb, sb); + elm_toolbar_item_priority_set(icon, 100); + + icon = elm_toolbar_item_append(sb->bar, "zoom-fit", "Fit", _zoom_fit_cb, sb); + elm_toolbar_item_priority_set(icon, 80); + + icon = elm_toolbar_item_append(sb->bar, "zoom-original", "1:1", _zoom_1_cb, sb); + elm_toolbar_item_priority_set(icon, 80); + + elm_toolbar_item_separator_set(elm_toolbar_item_append(sb->bar, NULL, NULL, NULL, NULL), EINA_TRUE); + + icon = elm_toolbar_item_append(sb->bar, "go-first", "First", _go_first, sb); + elm_toolbar_item_priority_set(icon, 60); + + icon = elm_toolbar_item_append(sb->bar, "go-previous", "Previous", _go_prev, sb); + elm_toolbar_item_priority_set(icon, 70); + + icon = elm_toolbar_item_append(sb->bar, "go-next", "Next", _go_next, sb); + elm_toolbar_item_priority_set(icon, 70); - but = _button_add(sb->bar, PACKAGE_DATA_DIR "/images/slideshow.png"); - evas_object_smart_callback_add(but, "clicked", _slideshow, sb); + icon = elm_toolbar_item_append(sb->bar, "go-last", "Last", _go_last, sb); + elm_toolbar_item_priority_set(icon, 60); sb->handlers = eina_list_append (sb->handlers, ecore_event_handler_add diff -Nru ephoto-0.1.1~201309061142/src/bin/ephoto_thumb_browser.c ephoto-0.1.1~201401231205/src/bin/ephoto_thumb_browser.c --- ephoto-0.1.1~201309061142/src/bin/ephoto_thumb_browser.c 2013-08-05 02:52:29.000000000 +0000 +++ ephoto-0.1.1~201401231205/src/bin/ephoto_thumb_browser.c 2014-01-16 21:34:33.000000000 +0000 @@ -15,6 +15,7 @@ Ephoto *ephoto; Evas_Object *main; Evas_Object *bar; + Evas_Object *edje; Evas_Object *entry; Evas_Object *grid; Eio_File *ls; @@ -65,51 +66,27 @@ } static Evas_Object * -_ephoto_thumb_dir_icon_get(void *data, Evas_Object *obj, const char *part) +_ephoto_thumb_up_icon_get(void *data __UNUSED__, Evas_Object *obj, const char *part __UNUSED__) { - Ephoto_Entry *e = data; - const char *f; - int n; - - if (strncmp(part, "elm.swallow.icon.", sizeof("elm.swallow.icon.") - 1) != 0) - return NULL; - - n = atoi(part + sizeof("elm.swallow.icon.") - 1); - if (n < 1) - return NULL; - n--; + Evas_Object *ic; - f = eina_list_nth(e->dir_files, n); - if (f) - { - Evas_Object *o; - o = ephoto_thumb_add(e->ephoto, obj, f); - //elm_object_style_set(o, "default"); - return o; - } + ic = elm_icon_add(obj); + evas_object_size_hint_aspect_set(ic, EVAS_ASPECT_CONTROL_VERTICAL, 1, 1); + elm_icon_standard_set(ic, "go-up"); - if (e->dir_files_checked) - return NULL; + return ic; +} - return ephoto_directory_thumb_add(obj, e); -} - -static Eina_Bool -_ephoto_thumb_dir_state_get(void *data, Evas_Object *obj __UNUSED__, const char *part) +static Evas_Object * +_ephoto_thumb_dir_icon_get(void *data __UNUSED__, Evas_Object *obj, const char *part __UNUSED__) { - Ephoto_Entry *e = data; - int n; - - if (strcmp(part, "have_files") == 0) - return !!e->dir_files; - - if (strncmp(part, "have_file.", sizeof("have_file.") - 1) != 0) - return EINA_FALSE; - - n = atoi(part + sizeof("have_file.") - 1); - if (n < 1) - return EINA_FALSE; - return n <= (int)eina_list_count(e->dir_files); + Evas_Object *ic; + + ic = elm_icon_add(obj); + evas_object_size_hint_aspect_set(ic, EVAS_ASPECT_CONTROL_VERTICAL, 1, 1); + elm_icon_standard_set(ic, "folder"); + + return ic; } static Evas_Object * @@ -254,10 +231,21 @@ } static void +_changed_dir(void *data, Evas_Object *o __UNUSED__, void *event_info) +{ + Ephoto_Thumb_Browser *tb = data; + const char *path = event_info; + if (path) + ephoto_directory_set(tb->ephoto, path); + else + elm_fileselector_entry_path_set(tb->entry, tb->ephoto->config->directory); +} + +static void _changed_dir_text(void *data, Evas_Object *o __UNUSED__, void *event_info __UNUSED__) { Ephoto_Thumb_Browser *tb = data; - const char *path = elm_entry_entry_get(tb->entry); + const char *path = elm_fileselector_entry_path_get(tb->entry); if (ecore_file_is_dir(path)) ephoto_directory_set(tb->ephoto, path); } @@ -265,11 +253,13 @@ static void _zoom_set(Ephoto_Thumb_Browser *tb, int zoom) { + double scale = elm_config_scale_get(); + if (zoom > ZOOM_MAX) zoom = ZOOM_MAX; else if (zoom < ZOOM_MIN) zoom = ZOOM_MIN; ephoto_thumb_size_set(tb->ephoto, zoom); - elm_gengrid_item_size_set(tb->grid, zoom, zoom); + elm_gengrid_item_size_set(tb->grid, zoom * scale, zoom * scale); } static void @@ -398,7 +388,7 @@ _todo_items_free(tb); _grid_items_free(tb); elm_gengrid_clear(tb->grid); - elm_entry_entry_set(tb->entry, tb->ephoto->config->directory); + elm_fileselector_entry_path_set(tb->entry, tb->ephoto->config->directory); _up_item_add_if_required(tb); return ECORE_CALLBACK_PASS_ON; @@ -441,47 +431,29 @@ return ECORE_CALLBACK_PASS_ON; } -static Evas_Object * -_button_add(Evas_Object *box, const char *image) -{ - Evas_Object *but, *ic; - - but = elm_button_add(box); - - ic = elm_icon_add(but); - elm_image_file_set(ic, image, NULL); - evas_object_size_hint_aspect_set(ic, EVAS_ASPECT_CONTROL_BOTH, 1, 1); - - elm_object_content_set(but, ic); - evas_object_size_hint_align_set(but, EVAS_HINT_FILL, EVAS_HINT_FILL); - elm_box_pack_end(box, but); - evas_object_show(but); - - return but; -} - Evas_Object * ephoto_thumb_browser_add(Ephoto *ephoto, Evas_Object *parent) { - Evas_Object *box = elm_box_add(parent); - Evas_Object *but, *min, *max; + Evas_Object *layout = elm_layout_add(parent); + Elm_Object_Item *icon; + Evas_Object *min, *max, *ic; Ephoto_Thumb_Browser *tb; - EINA_SAFETY_ON_NULL_RETURN_VAL(box, NULL); + EINA_SAFETY_ON_NULL_RETURN_VAL(layout, NULL); tb = calloc(1, sizeof(Ephoto_Thumb_Browser)); EINA_SAFETY_ON_NULL_GOTO(tb, error); - _ephoto_thumb_up_class.item_style = "ephoto-up"; + _ephoto_thumb_up_class.item_style = "default"; _ephoto_thumb_up_class.func.text_get = _ephoto_thumb_item_text_get; - _ephoto_thumb_up_class.func.content_get = NULL; + _ephoto_thumb_up_class.func.content_get = _ephoto_thumb_up_icon_get; _ephoto_thumb_up_class.func.state_get = NULL; _ephoto_thumb_up_class.func.del = _ephoto_thumb_item_del; - _ephoto_thumb_dir_class.item_style = "ephoto-album-preview"; + _ephoto_thumb_dir_class.item_style = "default"; _ephoto_thumb_dir_class.func.text_get = _ephoto_thumb_item_text_get; _ephoto_thumb_dir_class.func.content_get = _ephoto_thumb_dir_icon_get; - _ephoto_thumb_dir_class.func.state_get = _ephoto_thumb_dir_state_get; + _ephoto_thumb_dir_class.func.state_get = NULL; _ephoto_thumb_dir_class.func.del = _ephoto_thumb_item_del; _ephoto_thumb_file_class.item_style = "thumb"; @@ -493,52 +465,59 @@ elm_theme_extension_add(NULL, PACKAGE_DATA_DIR "/themes/default/ephoto.edj"); tb->ephoto = ephoto; - tb->main = box; - elm_box_horizontal_set(tb->main, EINA_FALSE); - elm_box_homogeneous_set(tb->main, EINA_FALSE); + tb->edje = elm_layout_edje_get(layout); + tb->main = layout; + evas_object_event_callback_add(tb->main, EVAS_CALLBACK_DEL, _main_del, tb); - evas_object_event_callback_add + evas_object_event_callback_add (tb->main, EVAS_CALLBACK_KEY_DOWN, _key_down, tb); evas_object_data_set(tb->main, "thumb_browser", tb); - tb->bar = elm_box_add(tb->main); - elm_box_horizontal_set(tb->bar, EINA_TRUE); - elm_box_homogeneous_set(tb->bar, EINA_FALSE); - evas_object_size_hint_weight_set(tb->bar, 0.0, 0.0); - evas_object_size_hint_align_set(tb->bar, EVAS_HINT_FILL, 0.0); - evas_object_show(tb->bar); - elm_box_pack_end(tb->main, tb->bar); + if (!elm_layout_theme_set(tb->main, "layout", "application", "toolbar-vbox")) + { + ERR("Could not load style 'toolbar-vbox' from theme!"); + goto error; + } + tb->bar = edje_object_part_external_object_get(tb->edje, "elm.external.toolbar"); + if (!tb->bar) + { + ERR("Could not find toolbar in layout!"); + goto error; + } - but = _button_add(tb->bar, PACKAGE_DATA_DIR "/images/single.png"); - evas_object_smart_callback_add(but, "clicked", _view_single, tb); + elm_toolbar_homogeneous_set(tb->bar, EINA_FALSE); + elm_toolbar_shrink_mode_set(tb->bar, ELM_TOOLBAR_SHRINK_MENU); + elm_toolbar_menu_parent_set(tb->bar, parent); + elm_toolbar_select_mode_set(tb->bar, ELM_OBJECT_SELECT_MODE_NONE); + + elm_toolbar_item_append(tb->bar, "image", "View Single", _view_single, tb); + elm_toolbar_item_append(tb->bar, "media-playback-start", "Slideshow", _slideshow, tb); + icon = elm_toolbar_item_append(tb->bar, "zoom-in", "Zoom In", _zoom_in, tb); + max = elm_object_item_widget_get(icon); + icon = elm_toolbar_item_append(tb->bar, "zoom-out", "Zoom Out", _zoom_out, tb); + min = elm_object_item_widget_get(icon); + evas_object_data_set(max, "min", min); + evas_object_data_set(min, "max", max); - but = _button_add(tb->bar, PACKAGE_DATA_DIR "/images/slideshow.png"); - evas_object_smart_callback_add(but, "clicked", _slideshow, tb); + ic = elm_icon_add(tb->main); + elm_icon_standard_set(ic, "folder"); + evas_object_size_hint_aspect_set(ic, EVAS_ASPECT_CONTROL_VERTICAL, 1, 1); - tb->entry = elm_entry_add(tb->bar); + tb->entry = elm_fileselector_entry_add(tb->main); EINA_SAFETY_ON_NULL_GOTO(tb->entry, error); evas_object_size_hint_weight_set(tb->entry, EVAS_HINT_EXPAND, 0.0); evas_object_size_hint_align_set(tb->entry, EVAS_HINT_FILL, EVAS_HINT_FILL); - elm_entry_single_line_set(tb->entry, EINA_TRUE); - elm_entry_scrollable_set(tb->entry, EINA_TRUE); - elm_scroller_policy_set(tb->entry, ELM_SCROLLER_POLICY_OFF, - ELM_SCROLLER_POLICY_OFF); - + elm_object_text_set(tb->entry, "Choose"); + elm_object_part_content_set(tb->entry, "button icon", ic); + elm_fileselector_entry_folder_only_set(tb->entry, EINA_TRUE); + elm_fileselector_entry_inwin_mode_set(tb->entry, EINA_TRUE); + elm_fileselector_entry_expandable_set(tb->entry, EINA_FALSE); + evas_object_smart_callback_add + (tb->entry, "file,chosen", _changed_dir, tb); evas_object_smart_callback_add (tb->entry, "activated", _changed_dir_text, tb); evas_object_show(tb->entry); - elm_box_pack_end(tb->bar, tb->entry); - - but = _button_add(tb->bar, PACKAGE_DATA_DIR "/images/zoom-in.png"); - evas_object_smart_callback_add(but, "clicked", _zoom_in, tb); - max = but; - - but = _button_add(tb->bar, PACKAGE_DATA_DIR "/images/zoom-out.png"); - evas_object_smart_callback_add(but, "clicked", _zoom_out, tb); - min = but; - - evas_object_data_set(max, "min", min); - evas_object_data_set(min, "max", max); + elm_layout_box_append(tb->main, "elm.box.content", tb->entry); tb->grid = elm_gengrid_add(tb->main); EINA_SAFETY_ON_NULL_GOTO(tb->grid, error); @@ -559,7 +538,7 @@ _zoom_set(tb, tb->ephoto->config->thumb_size); evas_object_show(tb->grid); - elm_box_pack_end(tb->main, tb->grid); + elm_layout_box_append(tb->main, "elm.box.content", tb->grid); tb->handlers = eina_list_append (tb->handlers, ecore_event_handler_add