diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml index 1bd2122..9376757 100644 --- a/.github/ISSUE_TEMPLATE/bug_report.yml +++ b/.github/ISSUE_TEMPLATE/bug_report.yml @@ -1,5 +1,5 @@ name: Bug Report -description: Help improve Reminders by filing a bug report +description: Help improve Retainer by filing a bug report title: "[Bug]: " labels: ["bug"] body: @@ -8,26 +8,27 @@ body: value: | ## System information - Make sure you have tested the Flatpak release of Reminders through Flathub before opening a bug report. If the bug is not present in the Flatpak open the report with the package maintainer. + If on Linux, make sure you have tested the Flatpak release of Retainer through Flathub before opening a bug report. If the bug is not present in the Flatpak open the report with the package maintainer. - type: dropdown id: package attributes: label: Package description: | - Where did you install Reminders from? + Where did you install Retainer from? options: - Flathub - Flathub Beta + - Windows Store validations: required: true - type: input id: distro attributes: - label: Distribution + label: OS description: What distribution are you currently using? - placeholder: Fedora 37, Ubuntu 22.04, Arch Linux... + placeholder: Fedora 37, Ubuntu 22.04, Windows 10... validations: required: true @@ -63,7 +64,9 @@ body: attributes: label: Logs description: | - If you saw an error dialog, click view error and copy the text here. Otherwise you can run something like `sudo journalctl --boot | grep remembrance | grep -i error` in the terminal to see the errors and copy that here. + If you can access the about page, you can also view logs by going to About > Troubleshooting > Debugging Information. + On Windows you can find these logs by pressing `Windows Key + r` and entering `%LOCALAPPDATA%`, and then navigating to `retainerdevs.Retainer_8mcfc8dhbzctc\LocalState\retainer`. + On Linux the logs are at `~/.var/app/io.github.retainerdevs.Retainer/data/retainer`. render: shell validations: required: false diff --git a/.github/ISSUE_TEMPLATE/feature_request.yml b/.github/ISSUE_TEMPLATE/feature_request.yml index 9596d9a..e89e10e 100644 --- a/.github/ISSUE_TEMPLATE/feature_request.yml +++ b/.github/ISSUE_TEMPLATE/feature_request.yml @@ -1,5 +1,5 @@ name: Feature Request -description: Suggest an idea for improving Reminders +description: Suggest an idea for improving Retainer title: "[Request]: " labels: ["enhancement"] diff --git a/.github/workflows/flatpak_builder.yml b/.github/workflows/flatpak_builder.yml index 405c234..0bbc68d 100644 --- a/.github/workflows/flatpak_builder.yml +++ b/.github/workflows/flatpak_builder.yml @@ -1,11 +1,17 @@ on: push: - branches: [main] + branches: + - main + paths: + - 'src/**' + - 'data/**' + - 'flatpak/**' + - 'meson.build' pull_request: -name: CI + +name: Flatpak jobs: flatpak: - name: "Flatpak" runs-on: ubuntu-latest container: image: bilelmoussaoui/flatpak-github-actions:gnome-44 @@ -14,6 +20,6 @@ jobs: - uses: actions/checkout@v3 - uses: bilelmoussaoui/flatpak-github-actions/flatpak-builder@v6.1 with: - bundle: Reminders.flatpak - manifest-path: flatpak/io.github.remindersdevs.Reminders.yml + bundle: Retainer.flatpak + manifest-path: flatpak/io.github.retainerdevs.Retainer.Devel.yml cache-key: flatpak-builder-${{ github.sha }} diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml new file mode 100644 index 0000000..f758020 --- /dev/null +++ b/.github/workflows/windows.yml @@ -0,0 +1,24 @@ +on: + push: + branches: + - main + paths: + - 'src/**' + - 'data/**' + - 'windows/**' + - 'meson.build' + pull_request: + +name: Windows +jobs: + windows: + runs-on: windows-latest + steps: + - uses: actions/checkout@v3 + - uses: msys2/setup-msys2@v2 + with: + update: true + - uses: microsoft/setup-msbuild@v1.1 + - name: Build + run: | + msbuild Retainer.sln -property:Platform=x64 -property:Configuration=Devel diff --git a/.gitignore b/.gitignore index dd928d9..c973d9f 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ build build-dir .flatpak-builder +.vs diff --git a/COPYING b/COPYING index 94a9ed0..14e2f77 100644 --- a/COPYING +++ b/COPYING @@ -1,674 +1,373 @@ - 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 -. +Mozilla Public License Version 2.0 +================================== + +1. Definitions +-------------- + +1.1. "Contributor" + means each individual or legal entity that creates, contributes to + the creation of, or owns Covered Software. + +1.2. "Contributor Version" + means the combination of the Contributions of others (if any) used + by a Contributor and that particular Contributor's Contribution. + +1.3. "Contribution" + means Covered Software of a particular Contributor. + +1.4. "Covered Software" + means Source Code Form to which the initial Contributor has attached + the notice in Exhibit A, the Executable Form of such Source Code + Form, and Modifications of such Source Code Form, in each case + including portions thereof. + +1.5. "Incompatible With Secondary Licenses" + means + + (a) that the initial Contributor has attached the notice described + in Exhibit B to the Covered Software; or + + (b) that the Covered Software was made available under the terms of + version 1.1 or earlier of the License, but not also under the + terms of a Secondary License. + +1.6. "Executable Form" + means any form of the work other than Source Code Form. + +1.7. "Larger Work" + means a work that combines Covered Software with other material, in + a separate file or files, that is not Covered Software. + +1.8. "License" + means this document. + +1.9. "Licensable" + means having the right to grant, to the maximum extent possible, + whether at the time of the initial grant or subsequently, any and + all of the rights conveyed by this License. + +1.10. "Modifications" + means any of the following: + + (a) any file in Source Code Form that results from an addition to, + deletion from, or modification of the contents of Covered + Software; or + + (b) any new file in Source Code Form that contains any Covered + Software. + +1.11. "Patent Claims" of a Contributor + means any patent claim(s), including without limitation, method, + process, and apparatus claims, in any patent Licensable by such + Contributor that would be infringed, but for the grant of the + License, by the making, using, selling, offering for sale, having + made, import, or transfer of either its Contributions or its + Contributor Version. + +1.12. "Secondary License" + means either the GNU General Public License, Version 2.0, the GNU + Lesser General Public License, Version 2.1, the GNU Affero General + Public License, Version 3.0, or any later versions of those + licenses. + +1.13. "Source Code Form" + means the form of the work preferred for making modifications. + +1.14. "You" (or "Your") + means an individual or a legal entity exercising rights under this + License. For legal entities, "You" includes any entity that + controls, is controlled by, or is under common control with You. For + purposes of this definition, "control" means (a) the power, direct + or indirect, to cause the direction or management of such entity, + whether by contract or otherwise, or (b) ownership of more than + fifty percent (50%) of the outstanding shares or beneficial + ownership of such entity. + +2. License Grants and Conditions +-------------------------------- + +2.1. Grants + +Each Contributor hereby grants You a world-wide, royalty-free, +non-exclusive license: + +(a) under intellectual property rights (other than patent or trademark) + Licensable by such Contributor to use, reproduce, make available, + modify, display, perform, distribute, and otherwise exploit its + Contributions, either on an unmodified basis, with Modifications, or + as part of a Larger Work; and + +(b) under Patent Claims of such Contributor to make, use, sell, offer + for sale, have made, import, and otherwise transfer either its + Contributions or its Contributor Version. + +2.2. Effective Date + +The licenses granted in Section 2.1 with respect to any Contribution +become effective for each Contribution on the date the Contributor first +distributes such Contribution. + +2.3. Limitations on Grant Scope + +The licenses granted in this Section 2 are the only rights granted under +this License. No additional rights or licenses will be implied from the +distribution or licensing of Covered Software under this License. +Notwithstanding Section 2.1(b) above, no patent license is granted by a +Contributor: + +(a) for any code that a Contributor has removed from Covered Software; + or + +(b) for infringements caused by: (i) Your and any other third party's + modifications of Covered Software, or (ii) the combination of its + Contributions with other software (except as part of its Contributor + Version); or + +(c) under Patent Claims infringed by Covered Software in the absence of + its Contributions. + +This License does not grant any rights in the trademarks, service marks, +or logos of any Contributor (except as may be necessary to comply with +the notice requirements in Section 3.4). + +2.4. Subsequent Licenses + +No Contributor makes additional grants as a result of Your choice to +distribute the Covered Software under a subsequent version of this +License (see Section 10.2) or under the terms of a Secondary License (if +permitted under the terms of Section 3.3). + +2.5. Representation + +Each Contributor represents that the Contributor believes its +Contributions are its original creation(s) or it has sufficient rights +to grant the rights to its Contributions conveyed by this License. + +2.6. Fair Use + +This License is not intended to limit any rights You have under +applicable copyright doctrines of fair use, fair dealing, or other +equivalents. + +2.7. Conditions + +Sections 3.1, 3.2, 3.3, and 3.4 are conditions of the licenses granted +in Section 2.1. + +3. Responsibilities +------------------- + +3.1. Distribution of Source Form + +All distribution of Covered Software in Source Code Form, including any +Modifications that You create or to which You contribute, must be under +the terms of this License. You must inform recipients that the Source +Code Form of the Covered Software is governed by the terms of this +License, and how they can obtain a copy of this License. You may not +attempt to alter or restrict the recipients' rights in the Source Code +Form. + +3.2. Distribution of Executable Form + +If You distribute Covered Software in Executable Form then: + +(a) such Covered Software must also be made available in Source Code + Form, as described in Section 3.1, and You must inform recipients of + the Executable Form how they can obtain a copy of such Source Code + Form by reasonable means in a timely manner, at a charge no more + than the cost of distribution to the recipient; and + +(b) You may distribute such Executable Form under the terms of this + License, or sublicense it under different terms, provided that the + license for the Executable Form does not attempt to limit or alter + the recipients' rights in the Source Code Form under this License. + +3.3. Distribution of a Larger Work + +You may create and distribute a Larger Work under terms of Your choice, +provided that You also comply with the requirements of this License for +the Covered Software. If the Larger Work is a combination of Covered +Software with a work governed by one or more Secondary Licenses, and the +Covered Software is not Incompatible With Secondary Licenses, this +License permits You to additionally distribute such Covered Software +under the terms of such Secondary License(s), so that the recipient of +the Larger Work may, at their option, further distribute the Covered +Software under the terms of either this License or such Secondary +License(s). + +3.4. Notices + +You may not remove or alter the substance of any license notices +(including copyright notices, patent notices, disclaimers of warranty, +or limitations of liability) contained within the Source Code Form of +the Covered Software, except that You may alter any license notices to +the extent required to remedy known factual inaccuracies. + +3.5. Application of Additional Terms + +You may choose to offer, and to charge a fee for, warranty, support, +indemnity or liability obligations to one or more recipients of Covered +Software. However, You may do so only on Your own behalf, and not on +behalf of any Contributor. You must make it absolutely clear that any +such warranty, support, indemnity, or liability obligation is offered by +You alone, and You hereby agree to indemnify every Contributor for any +liability incurred by such Contributor as a result of warranty, support, +indemnity or liability terms You offer. You may include additional +disclaimers of warranty and limitations of liability specific to any +jurisdiction. + +4. Inability to Comply Due to Statute or Regulation +--------------------------------------------------- + +If it is impossible for You to comply with any of the terms of this +License with respect to some or all of the Covered Software due to +statute, judicial order, or regulation then You must: (a) comply with +the terms of this License to the maximum extent possible; and (b) +describe the limitations and the code they affect. Such description must +be placed in a text file included with all distributions of the Covered +Software under this License. Except to the extent prohibited by statute +or regulation, such description must be sufficiently detailed for a +recipient of ordinary skill to be able to understand it. + +5. Termination +-------------- + +5.1. The rights granted under this License will terminate automatically +if You fail to comply with any of its terms. However, if You become +compliant, then the rights granted under this License from a particular +Contributor are reinstated (a) provisionally, unless and until such +Contributor explicitly and finally terminates Your grants, and (b) on an +ongoing basis, if such Contributor fails to notify You of the +non-compliance by some reasonable means prior to 60 days after You have +come back into compliance. Moreover, Your grants from a particular +Contributor are reinstated on an ongoing basis if such Contributor +notifies You of the non-compliance by some reasonable means, this is the +first time You have received notice of non-compliance with this License +from such Contributor, and You become compliant prior to 30 days after +Your receipt of the notice. + +5.2. If You initiate litigation against any entity by asserting a patent +infringement claim (excluding declaratory judgment actions, +counter-claims, and cross-claims) alleging that a Contributor Version +directly or indirectly infringes any patent, then the rights granted to +You by any and all Contributors for the Covered Software under Section +2.1 of this License shall terminate. + +5.3. In the event of termination under Sections 5.1 or 5.2 above, all +end user license agreements (excluding distributors and resellers) which +have been validly granted by You or Your distributors under this License +prior to termination shall survive termination. + +************************************************************************ +* * +* 6. Disclaimer of Warranty * +* ------------------------- * +* * +* Covered Software is provided under this License on an "as is" * +* basis, without warranty of any kind, either expressed, implied, or * +* statutory, including, without limitation, warranties that the * +* Covered Software is free of defects, merchantable, fit for a * +* particular purpose or non-infringing. The entire risk as to the * +* quality and performance of the Covered Software is with You. * +* Should any Covered Software prove defective in any respect, You * +* (not any Contributor) assume the cost of any necessary servicing, * +* repair, or correction. This disclaimer of warranty constitutes an * +* essential part of this License. No use of any Covered Software is * +* authorized under this License except under this disclaimer. * +* * +************************************************************************ + +************************************************************************ +* * +* 7. Limitation of Liability * +* -------------------------- * +* * +* Under no circumstances and under no legal theory, whether tort * +* (including negligence), contract, or otherwise, shall any * +* Contributor, or anyone who distributes Covered Software as * +* permitted above, be liable to You for any direct, indirect, * +* special, incidental, or consequential damages of any character * +* including, without limitation, damages for lost profits, loss of * +* goodwill, work stoppage, computer failure or malfunction, or any * +* and all other commercial damages or losses, even if such party * +* shall have been informed of the possibility of such damages. This * +* limitation of liability shall not apply to liability for death or * +* personal injury resulting from such party's negligence to the * +* extent applicable law prohibits such limitation. Some * +* jurisdictions do not allow the exclusion or limitation of * +* incidental or consequential damages, so this exclusion and * +* limitation may not apply to You. * +* * +************************************************************************ + +8. Litigation +------------- + +Any litigation relating to this License may be brought only in the +courts of a jurisdiction where the defendant maintains its principal +place of business and such litigation shall be governed by laws of that +jurisdiction, without reference to its conflict-of-law provisions. +Nothing in this Section shall prevent a party's ability to bring +cross-claims or counter-claims. + +9. Miscellaneous +---------------- + +This License represents the complete agreement concerning the subject +matter hereof. If any provision of this License is held to be +unenforceable, such provision shall be reformed only to the extent +necessary to make it enforceable. Any law or regulation which provides +that the language of a contract shall be construed against the drafter +shall not be used to construe this License against a Contributor. + +10. Versions of the License +--------------------------- + +10.1. New Versions + +Mozilla Foundation is the license steward. Except as provided in Section +10.3, no one other than the license steward has the right to modify or +publish new versions of this License. Each version will be given a +distinguishing version number. + +10.2. Effect of New Versions + +You may distribute the Covered Software under the terms of the version +of the License under which You originally received the Covered Software, +or under the terms of any subsequent version published by the license +steward. + +10.3. Modified Versions + +If you create software not governed by this License, and you want to +create a new license for such software, you may create and use a +modified version of this License if you rename the license and remove +any references to the name of the license steward (except to note that +such modified license differs from this License). + +10.4. Distributing Source Code Form that is Incompatible With Secondary +Licenses + +If You choose to distribute Source Code Form that is Incompatible With +Secondary Licenses under the terms of this version of the License, the +notice described in Exhibit B of this License must be attached. + +Exhibit A - Source Code Form License Notice +------------------------------------------- + + This Source Code Form is subject to the terms of the Mozilla Public + License, v. 2.0. If a copy of the MPL was not distributed with this + file, You can obtain one at http://mozilla.org/MPL/2.0/. + +If it is not possible or desirable to put the notice in a particular +file, then You may include the notice in a location (such as a LICENSE +file in a relevant directory) where a recipient would be likely to look +for such a notice. + +You may add additional accurate notices of copyright ownership. + +Exhibit B - "Incompatible With Secondary Licenses" Notice +--------------------------------------------------------- + + This Source Code Form is "Incompatible With Secondary Licenses", as + defined by the Mozilla Public License, v. 2.0. diff --git a/README.md b/README.md index 6036269..bb542a9 100644 --- a/README.md +++ b/README.md @@ -1,10 +1,11 @@
-![Reminders](data/icons/io.github.remindersdevs.Reminders.svg) -# Reminders, an open source reminder app +Retainer + +# Retainer, a cross platform and open source reminder app - Download on Flathub + Download on Flathub ![screenshot-dark](screenshot-dark.png) @@ -25,7 +26,7 @@ - Import and export ical/ics files ## Translators -You can translate Reminders on [Weblate](https://hosted.weblate.org/engage/reminders/), or through GitHub pull requests. +You can translate Retainer on [Weblate](https://hosted.weblate.org/engage/reminders/), or through GitHub pull requests. ## Manual installation @@ -38,49 +39,64 @@ flatpak install flathub org.gnome.Platform//44 ``` You will also need `flatpak-builder` - ### Building (Flatpak): ``` -flatpak-builder --user --install --force-clean build-dir flatpak/io.github.remindersdevs.Reminders.yml +flatpak-builder --user --install --force-clean build-dir flatpak/io.github.retainerdevs.Retainer.Devel.yml ``` ``` -flatpak run io.github.remindersdevs.Reminders.Devel --restart-service +flatpak run io.github.retainerdevs.Retainer.Devel --restart-service ``` -### Dependencies (generic): +### Building (Windows): +You need at least Windows 10 build 17763 (October 2018) to build and install Retainer. + +Install [MSYS2](https://www.msys2.org/) + +Install [Visual Studio](https://visualstudio.microsoft.com/) + +MSYS2 will be used to build the app in a unix environment (Arch based), and all of the dependencies will be automatically installed. Visual Studio is used to build the installer, but you should probably edit the code in a regular text editor. You might want to consider adding msbuild to the PATH and using dotnet tools to manage the solution and project files. + +Open Retainer.sln in Visual Studio and build there. Or run this if msbuild is in the PATH: + +``` +msbuild Retainer.sln -property:Platform=x64 -property:Configuration=Devel +``` + +Sometimes the build may fail after certain things are updated, in that case run the clean target in msbuild/VS and also delete the `build` folder. + +### Dependencies (generic linux): +- `Libadwaita` >= 1.2 +- `GTK` >= 4.10 - `PyGObject` - `Meson` -- `Libadwaita` - `GLib` -- `GSound` -- `WebKitGTK` - `python3-msal` - `python3-requests` - `python3-caldav` - `python3-icalendar` - `python3-setuptools` +- `GSound` +- `WebKitGTK` +- `Libsecret` -### Building (generic): +### Building (generic linux): ``` -meson build -Ddevel=true +meson setup build -Drelease-type=Devel ``` ``` ninja -C build install ``` ``` -remembrance --restart-service +retainer --restart-service ``` ## Todo -- Windows port (Need to look into dbus support on Windows) -- Add a debug mode and make it easier to get logs -- Maybe make a GNOME Shell extension that lets you view your reminders (This probably will never happen) -- Maybe integrate the search with GNOME Shell (Also probably not happening) +- Make log files debug logs (Need to add more logging code) If you want to contribute anything, just open a pull request. Depending on what you are going to contribute, you might want to [email me](mailto:dgsasha04@gmail.com) first. This will let me help you get started and it will also help me make sure that multiple people aren't working on the same feature without knowing it. -## Reminders DBus Service Documentation -The documentation can be found [here](REMINDERS_SERVICE.md). You probably will want to select the tag for the latest release of Reminders when looking at the documentation. +## Retainer DBus Service Documentation +The documentation can be found [here](RETAINER_SERVICE.md). You probably will want to select the tag for the latest release of Retainer when looking at the documentation. ## Copying -Reminders is licensed under the terms of the [GNU General Public License, version 3 or later](https://www.gnu.org/licenses/gpl-3.0.txt). +Retainer is licensed under the terms of the [Mozilla Public License, Version 2.0](https://www.mozilla.org/en-US/MPL/2.0/). diff --git a/REMINDERS_SERVICE.md b/RETAINER_SERVICE.md similarity index 87% rename from REMINDERS_SERVICE.md rename to RETAINER_SERVICE.md index 7493985..72370bc 100644 --- a/REMINDERS_SERVICE.md +++ b/RETAINER_SERVICE.md @@ -1,9 +1,4 @@ -# Reminders DBus Service version 5.0 Documentation -name: io.github.remindersdevs.Reminders.Service - -interface: io.github.remindersdevs.Reminders.Service - -object: /io/github/remindersdevs/Reminders/Service +# Retainer DBus Service version 5.0 Documentation Currently this is only packaged with Reminders and anyone who wants to use it will have to have the full Reminders app installed. The reason this exists is to allow integrating the Reminders app with desktop environments through extensions. @@ -13,6 +8,30 @@ This service will have some breaking changes made to it at times, so make sure y Newer versions of this service should usually be compatible with apps that expect an older version. If this ever changes, the bus name will be updated. +To use the dbus service, you first need to connect to the public service on the DBus session bus, and get the private address, and then connect to the private server at that address. This is done for security reasons, and also for performance reasons on Windows. I wont be explaining how to do all of this in your app, but you can always look at my source code if you are confused, and GLib also has an example [here](https://gitlab.gnome.org/GNOME/glib/-/blob/HEAD/gio/tests/gdbus-example-server.c). + +Do not try to use this service on Windows, you probably will not have any luck even though Retainer runs on Windows. + +# Public Service (Session Bus) +name: io.github.retainerdevs.Retainer.Service + +interface: io.github.retainerdevs.Retainer.Service + +object: /io/github/retainerdevs/Retainer/Service + +## Methods + +### GetPrivateAddress +Get address of private dbus server +- Returns (s) + - dbus-address + - Type: s + +# Private Service +interface: io.github.retainerdevs.Retainer.Service + +object: /io/github/retainerdevs/Retainer/Service + ## Enums ### RepeatType On what interval to repeat the reminder. @@ -41,18 +60,18 @@ Type: a{sv} | 'id' | s | This is the id of the reminder. | This usually cannot be left blank, no default. | | 'title' | s | This is the title of the reminder. | '' | | 'description' | s | This is a short description of the reminder. | '' | -| 'due-date' | u | This is a Unix timestamp for the day that the reminder is due. This should be at 00:00 of the desired day in UTC, and can be 0 if you don't want to set a due date. | 0 | -| 'timestamp' | u | This is a Unix timestamp that sets when the notification will be sent. This has to be on the same day as the due date, and if it isn't the due date will be changed. This can be 0 if you don't want to send a notification. | 0 | +| 'due-date' | t | This is a Unix timestamp for the day that the reminder is due. This should be at 00:00 of the desired day in UTC, and can be 0 if you don't want to set a due date. | 0 | +| 'timestamp' | t | This is a Unix timestamp that sets when the notification will be sent. This has to be on the same day as the due date, and if it isn't the due date will be changed. This can be 0 if you don't want to send a notification. | 0 | | 'important' | b | Whether or not the reminder is important. | False | | 'completed' | b | Whether or not the reminder is completed. | False | | 'repeat-type' | q | This is the enum [RepeatType](#repeattype). | 0 | | 'repeat-frequency' | q | How often to repeat the reminder, so if 'repeat-type' is 4 and and 'repeat-frequency' is 3, it will repeat every 3 weeks. | 1 | | 'repeat-days' | q | This is the enum [RepeatDays](#repeatdays). | 0 | | 'repeat-times'| q | How many times in total the reminder should be repeated, this gets decreased by 1 each time the reminder is repeated. -1 if you want to repeat forever or are not repeating. Must be -1 for Microsoft Tasks. | -1 | -| 'repeat-until' | u | This is a Unix timestamp that represents the last day that the reminder should be repeated on. This should be at 00:00 of the desired day in UTC. Must be 0 for Microsoft Tasks | 0 | -| 'created-timestamp' | u | This is a Unix timestamp that represents the time the reminder was created, this is set automatically and cannot be changed. | 0 | -| 'updated-timestamp' | u | This is a Unix timestamp that represents the last time the reminder was updated, this is set automatically and cannot be changed. | 0 | -| 'completed-date' | u | This is a Unix timestamp that represents the day the reminder was completed, at 00:00 in UTC. 0 if not complete. This is set automatically and cannot be changed. | 0 | +| 'repeat-until' | t | This is a Unix timestamp that represents the last day that the reminder should be repeated on. This should be at 00:00 of the desired day in UTC. Must be 0 for Microsoft Tasks | 0 | +| 'created-timestamp' | t | This is a Unix timestamp that represents the time the reminder was created, this is set automatically and cannot be changed. | 0 | +| 'updated-timestamp' | t | This is a Unix timestamp that represents the last time the reminder was updated, this is set automatically and cannot be changed. | 0 | +| 'completed-date' | t | This is a Unix timestamp that represents the day the reminder was completed, at 00:00 in UTC. 0 if not complete. This is set automatically and cannot be changed. | 0 | | 'list-id' | s | This is the id of the list that the reminder is in. | 'local' | ## List Object @@ -182,12 +201,12 @@ Add a new reminder - Note that the 'completed', and 'id' key will be ignored here - You can leave any of these values blank, in that case the default value will be used -- Returns (su) +- Returns (st) - reminder-id - Type: s - Id that was generated to represent the reminder, keep track of these - created-timestamp - - Type: u + - Type: t - The Unix timestamp of when the reminder was created ### UpdateReminder @@ -200,9 +219,9 @@ Update an existing reminder - Note that the 'completed' key will be ignored here - You can leave any of these values blank, in that case the previous value will be used -- Returns (u) +- Returns (t) - updated-timestamp - - Type: u + - Type: t - The Unix timestamp of when the reminder was updated ### UpdateCompleted @@ -217,12 +236,12 @@ Update the completed status of a reminder - Type: b - Whether or not the reminder should be completed - completed-date - - Type: u + - Type: t - The Unix timestamp of the day the reminder was completed -- Returns (u) +- Returns (t) - updated-timestamp - - Type: u + - Type: t - The Unix timestamp of when the reminder was updated ### RemoveReminder @@ -245,12 +264,12 @@ Update an existing reminder - Note that the 'completed' key will be ignored here - You can leave any of these values blank, in that case the previous value will be used -- Returns (u) +- Returns (t) - updated-reminder-ids - Type: as - Ids of reminders that were actually updated (in case there were errors) - updated-timestamp - - Type: u + - Type: t - The Unix timestamp of when the reminder was updated ### UpdateCompletedv @@ -265,15 +284,15 @@ Update the completed status of a reminder - Type: b - Whether or not the reminder should be completed -- Returns (asu) +- Returns (ast) - updated-reminder-ids - Type: as - Ids of reminders that were actually updated (in case there were errors) - updated-timestamp - - Type: u + - Type: t - The Unix timestamp of when the reminder was updated - completed-date - - Type: u + - Type: t - The Unix timestamp of the day the reminder was completed ### RemoveReminderv @@ -330,22 +349,21 @@ Log out of a remote account, once logged out the reminders will be refreshed - Type: s ### ExportLists -Export lists to ical/ics file +Export lists to ical/ics file, you shouldn't use this because of flatpak sandboxing limitations - Parameters (as) + - folder + - Type: s + - The folder you want to export to - list-ids - Type: as - An array of list ids that represent the lists to export -- Returns (s) - - folder - - Type: s - ### ImportLists -Import lists from an ical/ics file +Import lists from an ical/ics file, you shouldn't use this because of flatpak sandboxing limitations - Parameters (ass) - ical-files - Type: as - - An array of files ids to import + - An array of files to import - list-id - Type: s - The list to import the files to, or 'auto' if you want to create new lists @@ -360,7 +378,7 @@ Read reminders file again and also check for remote updates. Changes will be emi - The version of the service that is currently loaded (PEP 440) ### Quit -Quits the service +Quits the service, this will not return anything and will close the connection immediately. Make sure to handle the error if needed. ## Signals @@ -412,7 +430,7 @@ Emitted when a Reminder is created or updated ### CompletedUpdated Emitted when a reminder's completed status is changed -- Parameters (ssbuu) +- Parameters (ssbtt) - [app-id](#app-id-parameter) - Type: s - reminder-id @@ -422,10 +440,10 @@ Emitted when a reminder's completed status is changed - Type: b - Whether or not the reminder was set as completed - updated-timestamp - - Type: u + - Type: t - The Unix timestamp of when the reminder was last updated - completed-date - - Type: u + - Type: t - The Unix timestamp of the day the reminder was completed ### ReminderRemoved @@ -447,7 +465,7 @@ Emitted when a reminder is removed ### RemindersCompleted Emitted when multiple reminders' completed status changes -- Parameters (saa{sv}) +- Parameters (sasbtt) - [app-id](#app-id-parameter) - Type: s - reminder-ids @@ -457,10 +475,10 @@ Emitted when multiple reminders' completed status changes - Type: b - Whether or not the reminders were set as completed - updated-timestamp - - Type: u + - Type: t - The Unix timestamp of when the reminders were updated - completed-date - - Type: u + - Type: t - The Unix timestamp of the day the reminders were completed ### RemindersRemoved diff --git a/Retainer.sln b/Retainer.sln new file mode 100644 index 0000000..d6c4c0a --- /dev/null +++ b/Retainer.sln @@ -0,0 +1,57 @@ + +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio Version 17 +VisualStudioVersion = 17.5.33627.172 +MinimumVisualStudioVersion = 10.0.40219.1 +Project("{13B669BE-BB05-4DDF-9536-439F39A36129}") = "Retainer", "windows\Retainer\Retainer.msbuildproj", "{3782B125-7CEE-4C7E-B750-F00F01F907D1}" +EndProject +Project("{C7167F0D-BC9F-4E6E-AFE1-012C56B48DB5}") = "RetainerPackage", "windows\RetainerPackage\RetainerPackage.wapproj", "{5D29BE7E-2E95-4693-984E-E0E61D5C04BB}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Devel|ARM64 = Devel|ARM64 + Devel|x64 = Devel|x64 + Devel|x86 = Devel|x86 + Release|ARM64 = Release|ARM64 + Release|x64 = Release|x64 + Release|x86 = Release|x86 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {3782B125-7CEE-4C7E-B750-F00F01F907D1}.Devel|ARM64.ActiveCfg = Devel|ARM64 + {3782B125-7CEE-4C7E-B750-F00F01F907D1}.Devel|ARM64.Build.0 = Devel|ARM64 + {3782B125-7CEE-4C7E-B750-F00F01F907D1}.Devel|x64.ActiveCfg = Devel|x64 + {3782B125-7CEE-4C7E-B750-F00F01F907D1}.Devel|x64.Build.0 = Devel|x64 + {3782B125-7CEE-4C7E-B750-F00F01F907D1}.Devel|x86.ActiveCfg = Devel|x86 + {3782B125-7CEE-4C7E-B750-F00F01F907D1}.Devel|x86.Build.0 = Devel|x86 + {3782B125-7CEE-4C7E-B750-F00F01F907D1}.Release|ARM64.ActiveCfg = Release|ARM64 + {3782B125-7CEE-4C7E-B750-F00F01F907D1}.Release|ARM64.Build.0 = Release|ARM64 + {3782B125-7CEE-4C7E-B750-F00F01F907D1}.Release|x64.ActiveCfg = Release|x64 + {3782B125-7CEE-4C7E-B750-F00F01F907D1}.Release|x64.Build.0 = Release|x64 + {3782B125-7CEE-4C7E-B750-F00F01F907D1}.Release|x86.ActiveCfg = Release|x86 + {3782B125-7CEE-4C7E-B750-F00F01F907D1}.Release|x86.Build.0 = Release|x86 + {5D29BE7E-2E95-4693-984E-E0E61D5C04BB}.Devel|ARM64.ActiveCfg = Devel|ARM64 + {5D29BE7E-2E95-4693-984E-E0E61D5C04BB}.Devel|ARM64.Build.0 = Devel|ARM64 + {5D29BE7E-2E95-4693-984E-E0E61D5C04BB}.Devel|ARM64.Deploy.0 = Devel|ARM64 + {5D29BE7E-2E95-4693-984E-E0E61D5C04BB}.Devel|x64.ActiveCfg = Devel|x64 + {5D29BE7E-2E95-4693-984E-E0E61D5C04BB}.Devel|x64.Build.0 = Devel|x64 + {5D29BE7E-2E95-4693-984E-E0E61D5C04BB}.Devel|x64.Deploy.0 = Devel|x64 + {5D29BE7E-2E95-4693-984E-E0E61D5C04BB}.Devel|x86.ActiveCfg = Devel|x86 + {5D29BE7E-2E95-4693-984E-E0E61D5C04BB}.Devel|x86.Build.0 = Devel|x86 + {5D29BE7E-2E95-4693-984E-E0E61D5C04BB}.Devel|x86.Deploy.0 = Devel|x86 + {5D29BE7E-2E95-4693-984E-E0E61D5C04BB}.Release|ARM64.ActiveCfg = Release|ARM64 + {5D29BE7E-2E95-4693-984E-E0E61D5C04BB}.Release|ARM64.Build.0 = Release|ARM64 + {5D29BE7E-2E95-4693-984E-E0E61D5C04BB}.Release|ARM64.Deploy.0 = Release|ARM64 + {5D29BE7E-2E95-4693-984E-E0E61D5C04BB}.Release|x64.ActiveCfg = Release|x64 + {5D29BE7E-2E95-4693-984E-E0E61D5C04BB}.Release|x64.Build.0 = Release|x64 + {5D29BE7E-2E95-4693-984E-E0E61D5C04BB}.Release|x64.Deploy.0 = Release|x64 + {5D29BE7E-2E95-4693-984E-E0E61D5C04BB}.Release|x86.ActiveCfg = Release|x86 + {5D29BE7E-2E95-4693-984E-E0E61D5C04BB}.Release|x86.Build.0 = Release|x86 + {5D29BE7E-2E95-4693-984E-E0E61D5C04BB}.Release|x86.Deploy.0 = Release|x86 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {B96EB3E7-CEA5-4829-A070-5F4808273A41} + EndGlobalSection +EndGlobal diff --git a/data/browser/io.github.remindersdevs.Reminders.service.in b/data/browser/io.github.remindersdevs.Reminders.service.in deleted file mode 100644 index dfb0d01..0000000 --- a/data/browser/io.github.remindersdevs.Reminders.service.in +++ /dev/null @@ -1,3 +0,0 @@ -[D-BUS Service] -Name=@APP_ID@ -Exec=@BINDIR@/@APP_EXECUTABLE@ diff --git a/data/browser/io.github.remindersdevs.Reminders.desktop.in.in b/data/browser/io.github.retainerdevs.Retainer.desktop.in.in similarity index 80% rename from data/browser/io.github.remindersdevs.Reminders.desktop.in.in rename to data/browser/io.github.retainerdevs.Retainer.desktop.in.in index 40ba4b3..0117a39 100644 --- a/data/browser/io.github.remindersdevs.Reminders.desktop.in.in +++ b/data/browser/io.github.retainerdevs.Retainer.desktop.in.in @@ -1,14 +1,14 @@ [Desktop Entry] Type=Application -Name=Reminders +Name=Retainer Comment=Set reminders and manage tasks -Exec=@BINDIR@/@APP_EXECUTABLE@ %U +Exec=@EXEC@ %U Icon=@APP_ID@ Terminal=false StartupWMClass=@APP_ID@ StartupNotify=true X-SingleMainWindow=true Categories=GNOME;GTK;Office;ProjectManagement; -Keywords=Todo;Productivity;Task;Planning;Planner;Time;Management;Reminder;Remembrance;Reminders; +Keywords=Todo;Productivity;Task;Planning;Planner;Time;Management;Reminder;Reminders;Retainer; MimeType=text/calendar; X-GNOME-UsesNotifications=true diff --git a/data/browser/io.github.retainerdevs.Retainer.service.in b/data/browser/io.github.retainerdevs.Retainer.service.in new file mode 100644 index 0000000..6c7e10b --- /dev/null +++ b/data/browser/io.github.retainerdevs.Retainer.service.in @@ -0,0 +1,3 @@ +[D-BUS Service] +Name=@APP_ID@ +Exec=@EXEC@ diff --git a/data/browser/meson.build b/data/browser/meson.build index 7b5fe62..88f5484 100644 --- a/data/browser/meson.build +++ b/data/browser/meson.build @@ -1,35 +1,29 @@ -conf = configuration_data() -conf.set('APP_EXECUTABLE', app_executable) -conf.set('APP_ID', app_id) -conf.set('BINDIR', get_option('prefix') / get_option('bindir')) - desktop_file = configure_file( - input: 'io.github.remindersdevs.Reminders.desktop.in.in', + input: 'io.github.retainerdevs.Retainer.desktop.in.in', output: '@0@.desktop.in'.format(app_id), configuration: conf, ) desktop = i18n.merge_file( - input: desktop_file, - output: '@0@.desktop'.format(app_id), - type: 'desktop', - po_dir: '../../po', - install: true, - install_dir: join_paths(get_option('datadir'), 'applications') + input: desktop_file, + output: '@0@.desktop'.format(app_id), + type: 'desktop', + po_dir: '../../po', + install: true, + install_dir: join_paths(get_option('datadir'), 'applications') ) desktop_utils = find_program('desktop-file-validate', required: false) -if desktop_utils.found() - test('Validate desktop file', desktop_utils, - args: [desktop] - ) + if desktop_utils.found() + test('Validate desktop file', desktop_utils, + args: [desktop] + ) endif - configure_file( - input: 'io.github.remindersdevs.Reminders.service.in', + input: 'io.github.retainerdevs.Retainer.service.in', output: '@0@.service'.format(app_id), install: true, - install_dir: get_option('datadir') / 'dbus-1/services', + install_dir: get_option('datadir') / 'dbus-1' / 'services', configuration: conf, ) diff --git a/data/icons/io.github.remindersdevs.Reminders-symbolic.svg b/data/icons/io.github.remindersdevs.Reminders-symbolic.svg deleted file mode 100644 index fdbc121..0000000 --- a/data/icons/io.github.remindersdevs.Reminders-symbolic.svg +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/data/icons/io.github.remindersdevs.Reminders.Devel.svg b/data/icons/io.github.remindersdevs.Reminders.Devel.svg deleted file mode 100644 index 2c4c83f..0000000 --- a/data/icons/io.github.remindersdevs.Reminders.Devel.svg +++ /dev/null @@ -1,98 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/data/icons/io.github.remindersdevs.Reminders.Source.svg b/data/icons/io.github.remindersdevs.Reminders.Source.svg deleted file mode 100644 index cfacce9..0000000 --- a/data/icons/io.github.remindersdevs.Reminders.Source.svg +++ /dev/null @@ -1,3537 +0,0 @@ - - - - - Adwaita Icon Template - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - GNOME Design Team - - - - - Adwaita Icon Template - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Hicolor - Symbolic - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - battery is full and there is no a/c connected. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/data/icons/io.github.remindersdevs.Reminders.svg b/data/icons/io.github.remindersdevs.Reminders.svg deleted file mode 100644 index 89666e7..0000000 --- a/data/icons/io.github.remindersdevs.Reminders.svg +++ /dev/null @@ -1,53 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/data/icons/io.github.retainerdevs.Retainer-symbolic.Source.svg b/data/icons/io.github.retainerdevs.Retainer-symbolic.Source.svg new file mode 100644 index 0000000..2dd8104 --- /dev/null +++ b/data/icons/io.github.retainerdevs.Retainer-symbolic.Source.svg @@ -0,0 +1,798 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/data/icons/io.github.retainerdevs.Retainer.Devel.Source.svg b/data/icons/io.github.retainerdevs.Retainer.Devel.Source.svg new file mode 100644 index 0000000..f9b0fa1 --- /dev/null +++ b/data/icons/io.github.retainerdevs.Retainer.Devel.Source.svg @@ -0,0 +1,1956 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/data/icons/io.github.retainerdevs.Retainer.Devel/16x16/apps/io.github.retainerdevs.Retainer.Devel.png b/data/icons/io.github.retainerdevs.Retainer.Devel/16x16/apps/io.github.retainerdevs.Retainer.Devel.png new file mode 100644 index 0000000..fb8ffa9 Binary files /dev/null and b/data/icons/io.github.retainerdevs.Retainer.Devel/16x16/apps/io.github.retainerdevs.Retainer.Devel.png differ diff --git a/data/icons/io.github.retainerdevs.Retainer.Devel/16x16@2x/apps/io.github.retainerdevs.Retainer.Devel.png b/data/icons/io.github.retainerdevs.Retainer.Devel/16x16@2x/apps/io.github.retainerdevs.Retainer.Devel.png new file mode 100644 index 0000000..919dc1c Binary files /dev/null and b/data/icons/io.github.retainerdevs.Retainer.Devel/16x16@2x/apps/io.github.retainerdevs.Retainer.Devel.png differ diff --git a/data/icons/io.github.retainerdevs.Retainer.Devel/24x24/apps/io.github.retainerdevs.Retainer.Devel.png b/data/icons/io.github.retainerdevs.Retainer.Devel/24x24/apps/io.github.retainerdevs.Retainer.Devel.png new file mode 100644 index 0000000..133a142 Binary files /dev/null and b/data/icons/io.github.retainerdevs.Retainer.Devel/24x24/apps/io.github.retainerdevs.Retainer.Devel.png differ diff --git a/data/icons/io.github.retainerdevs.Retainer.Devel/24x24@2x/apps/io.github.retainerdevs.Retainer.Devel.png b/data/icons/io.github.retainerdevs.Retainer.Devel/24x24@2x/apps/io.github.retainerdevs.Retainer.Devel.png new file mode 100644 index 0000000..fd93446 Binary files /dev/null and b/data/icons/io.github.retainerdevs.Retainer.Devel/24x24@2x/apps/io.github.retainerdevs.Retainer.Devel.png differ diff --git a/data/icons/io.github.retainerdevs.Retainer.Devel/256x256/apps/io.github.retainerdevs.Retainer.Devel.png b/data/icons/io.github.retainerdevs.Retainer.Devel/256x256/apps/io.github.retainerdevs.Retainer.Devel.png new file mode 100644 index 0000000..d842cbf Binary files /dev/null and b/data/icons/io.github.retainerdevs.Retainer.Devel/256x256/apps/io.github.retainerdevs.Retainer.Devel.png differ diff --git a/data/icons/io.github.retainerdevs.Retainer.Devel/256x256@2x/apps/io.github.retainerdevs.Retainer.Devel.png b/data/icons/io.github.retainerdevs.Retainer.Devel/256x256@2x/apps/io.github.retainerdevs.Retainer.Devel.png new file mode 100644 index 0000000..60447a1 Binary files /dev/null and b/data/icons/io.github.retainerdevs.Retainer.Devel/256x256@2x/apps/io.github.retainerdevs.Retainer.Devel.png differ diff --git a/data/icons/io.github.retainerdevs.Retainer.Devel/32x32/apps/io.github.retainerdevs.Retainer.Devel.png b/data/icons/io.github.retainerdevs.Retainer.Devel/32x32/apps/io.github.retainerdevs.Retainer.Devel.png new file mode 100644 index 0000000..919dc1c Binary files /dev/null and b/data/icons/io.github.retainerdevs.Retainer.Devel/32x32/apps/io.github.retainerdevs.Retainer.Devel.png differ diff --git a/data/icons/io.github.retainerdevs.Retainer.Devel/32x32@2x/apps/io.github.retainerdevs.Retainer.Devel.png b/data/icons/io.github.retainerdevs.Retainer.Devel/32x32@2x/apps/io.github.retainerdevs.Retainer.Devel.png new file mode 100644 index 0000000..814d522 Binary files /dev/null and b/data/icons/io.github.retainerdevs.Retainer.Devel/32x32@2x/apps/io.github.retainerdevs.Retainer.Devel.png differ diff --git a/data/icons/io.github.retainerdevs.Retainer.Devel/48x48/apps/io.github.retainerdevs.Retainer.Devel.png b/data/icons/io.github.retainerdevs.Retainer.Devel/48x48/apps/io.github.retainerdevs.Retainer.Devel.png new file mode 100644 index 0000000..fd93446 Binary files /dev/null and b/data/icons/io.github.retainerdevs.Retainer.Devel/48x48/apps/io.github.retainerdevs.Retainer.Devel.png differ diff --git a/data/icons/io.github.retainerdevs.Retainer.Devel/48x48@2x/apps/io.github.retainerdevs.Retainer.Devel.png b/data/icons/io.github.retainerdevs.Retainer.Devel/48x48@2x/apps/io.github.retainerdevs.Retainer.Devel.png new file mode 100644 index 0000000..e4eb1f6 Binary files /dev/null and b/data/icons/io.github.retainerdevs.Retainer.Devel/48x48@2x/apps/io.github.retainerdevs.Retainer.Devel.png differ diff --git a/data/icons/io.github.retainerdevs.Retainer.Devel/symbolic/apps/io.github.retainerdevs.Retainer-symbolic.svg b/data/icons/io.github.retainerdevs.Retainer.Devel/symbolic/apps/io.github.retainerdevs.Retainer-symbolic.svg new file mode 100644 index 0000000..7cd1058 --- /dev/null +++ b/data/icons/io.github.retainerdevs.Retainer.Devel/symbolic/apps/io.github.retainerdevs.Retainer-symbolic.svg @@ -0,0 +1,412 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/data/icons/io.github.retainerdevs.Retainer.Source.svg b/data/icons/io.github.retainerdevs.Retainer.Source.svg new file mode 100644 index 0000000..d5402d3 --- /dev/null +++ b/data/icons/io.github.retainerdevs.Retainer.Source.svg @@ -0,0 +1,1150 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/data/icons/io.github.retainerdevs.Retainer/16x16/apps/io.github.retainerdevs.Retainer.png b/data/icons/io.github.retainerdevs.Retainer/16x16/apps/io.github.retainerdevs.Retainer.png new file mode 100644 index 0000000..9a069dc Binary files /dev/null and b/data/icons/io.github.retainerdevs.Retainer/16x16/apps/io.github.retainerdevs.Retainer.png differ diff --git a/data/icons/io.github.retainerdevs.Retainer/16x16@2x/apps/io.github.retainerdevs.Retainer.png b/data/icons/io.github.retainerdevs.Retainer/16x16@2x/apps/io.github.retainerdevs.Retainer.png new file mode 100644 index 0000000..a81a788 Binary files /dev/null and b/data/icons/io.github.retainerdevs.Retainer/16x16@2x/apps/io.github.retainerdevs.Retainer.png differ diff --git a/data/icons/io.github.retainerdevs.Retainer/24x24/apps/io.github.retainerdevs.Retainer.png b/data/icons/io.github.retainerdevs.Retainer/24x24/apps/io.github.retainerdevs.Retainer.png new file mode 100644 index 0000000..0a43748 Binary files /dev/null and b/data/icons/io.github.retainerdevs.Retainer/24x24/apps/io.github.retainerdevs.Retainer.png differ diff --git a/data/icons/io.github.retainerdevs.Retainer/24x24@2x/apps/io.github.retainerdevs.Retainer.png b/data/icons/io.github.retainerdevs.Retainer/24x24@2x/apps/io.github.retainerdevs.Retainer.png new file mode 100644 index 0000000..12e902f Binary files /dev/null and b/data/icons/io.github.retainerdevs.Retainer/24x24@2x/apps/io.github.retainerdevs.Retainer.png differ diff --git a/data/icons/io.github.retainerdevs.Retainer/256x256/apps/io.github.retainerdevs.Retainer.png b/data/icons/io.github.retainerdevs.Retainer/256x256/apps/io.github.retainerdevs.Retainer.png new file mode 100644 index 0000000..6b08d41 Binary files /dev/null and b/data/icons/io.github.retainerdevs.Retainer/256x256/apps/io.github.retainerdevs.Retainer.png differ diff --git a/data/icons/io.github.retainerdevs.Retainer/256x256@2x/apps/io.github.retainerdevs.Retainer.png b/data/icons/io.github.retainerdevs.Retainer/256x256@2x/apps/io.github.retainerdevs.Retainer.png new file mode 100644 index 0000000..301b7f8 Binary files /dev/null and b/data/icons/io.github.retainerdevs.Retainer/256x256@2x/apps/io.github.retainerdevs.Retainer.png differ diff --git a/data/icons/io.github.retainerdevs.Retainer/32x32/apps/io.github.retainerdevs.Retainer.png b/data/icons/io.github.retainerdevs.Retainer/32x32/apps/io.github.retainerdevs.Retainer.png new file mode 100644 index 0000000..a81a788 Binary files /dev/null and b/data/icons/io.github.retainerdevs.Retainer/32x32/apps/io.github.retainerdevs.Retainer.png differ diff --git a/data/icons/io.github.retainerdevs.Retainer/32x32@2x/apps/io.github.retainerdevs.Retainer.png b/data/icons/io.github.retainerdevs.Retainer/32x32@2x/apps/io.github.retainerdevs.Retainer.png new file mode 100644 index 0000000..5da7f0b Binary files /dev/null and b/data/icons/io.github.retainerdevs.Retainer/32x32@2x/apps/io.github.retainerdevs.Retainer.png differ diff --git a/data/icons/io.github.retainerdevs.Retainer/48x48/apps/io.github.retainerdevs.Retainer.png b/data/icons/io.github.retainerdevs.Retainer/48x48/apps/io.github.retainerdevs.Retainer.png new file mode 100644 index 0000000..12e902f Binary files /dev/null and b/data/icons/io.github.retainerdevs.Retainer/48x48/apps/io.github.retainerdevs.Retainer.png differ diff --git a/data/icons/io.github.retainerdevs.Retainer/48x48@2x/apps/io.github.retainerdevs.Retainer.png b/data/icons/io.github.retainerdevs.Retainer/48x48@2x/apps/io.github.retainerdevs.Retainer.png new file mode 100644 index 0000000..bf010af Binary files /dev/null and b/data/icons/io.github.retainerdevs.Retainer/48x48@2x/apps/io.github.retainerdevs.Retainer.png differ diff --git a/data/icons/io.github.retainerdevs.Retainer/symbolic/apps/io.github.retainerdevs.Retainer-symbolic.svg b/data/icons/io.github.retainerdevs.Retainer/symbolic/apps/io.github.retainerdevs.Retainer-symbolic.svg new file mode 100644 index 0000000..7cd1058 --- /dev/null +++ b/data/icons/io.github.retainerdevs.Retainer/symbolic/apps/io.github.retainerdevs.Retainer-symbolic.svg @@ -0,0 +1,412 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/data/icons/meson.build b/data/icons/meson.build index 45b9f82..5b78d20 100644 --- a/data/icons/meson.build +++ b/data/icons/meson.build @@ -1,23 +1,15 @@ -dir = get_option('datadir') / 'icons/hicolor' +dir = get_option('datadir') / 'icons' / 'hicolor' -if release_type == 'devel' - install_data( - 'io.github.remindersdevs.Reminders.Devel.svg', - rename: app_id + '.svg', - install_dir: dir / 'scalable/apps', +if release_type == 'Devel' + install_subdir( + 'io.github.retainerdevs.Retainer.Devel', + install_dir: dir, + strip_directory: true ) else - install_data( - 'io.github.remindersdevs.Reminders.svg', - rename: app_id + '.svg', - install_dir: dir / 'scalable/apps', + install_subdir( + 'io.github.retainerdevs.Retainer', + install_dir: dir, + strip_directory: true ) endif - -install_data( - 'io.github.remindersdevs.Reminders-symbolic.svg', - rename: app_id + '-symbolic.svg', - install_dir: dir / 'symbolic/apps', -) - - diff --git a/data/icons/svg_to_ico.py b/data/icons/svg_to_ico.py new file mode 100644 index 0000000..75a5378 --- /dev/null +++ b/data/icons/svg_to_ico.py @@ -0,0 +1,42 @@ +#!/usr/bin/env python3 +# Copyright (C) 2023 Sasha Hale +# +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at https://mozilla.org/MPL/2.0/. + +import sys +from subprocess import run +from os import path, sep, mkdir +from shutil import which, rmtree +from atexit import register +from telnetlib import TM + +SIZES = (16, 24, 32, 48, 64, 128, 256) +SCRIPT_DIR = path.realpath(path.dirname(__file__)) + +IDS = ('io.github.retainerdevs.Retainer', 'io.github.retainerdevs.Retainer.Devel') + +INKSCAPE = [which('flatpak'), 'run', 'org.inkscape.Inkscape'] if len(sys.argv) > 1 and sys.argv[1] == 'flatpak' else [which('inkscape')] + +MAGICK = [which('magick')] + +TMP_DIR = SCRIPT_DIR + sep + 'tmp' +WIN_DIR = SCRIPT_DIR + sep + 'windows' + +for i in TMP_DIR, WIN_DIR: + try: + mkdir(i) + except: + pass + +register(rmtree, TMP_DIR, ignore_errors=True) + +for id in IDS: + out = [] + for size in SIZES: + name = f'{TMP_DIR}{sep}{id}-{size}.png' + out += [name, '-background', 'none'] + run(INKSCAPE + ['-w', str(size), '-h', str(size), '-o', name, f'{SCRIPT_DIR}{sep}{id}.Source.svg']) + + run(MAGICK + out + [f'{WIN_DIR}{sep}{id}.ico']) diff --git a/data/icons/svg_to_png.py b/data/icons/svg_to_png.py new file mode 100644 index 0000000..0c6f1d8 --- /dev/null +++ b/data/icons/svg_to_png.py @@ -0,0 +1,64 @@ +#!/usr/bin/env python3 +# Copyright (C) 2023 Sasha Hale +# +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at https://mozilla.org/MPL/2.0/. + +import sys +from os import mkdir, path, sep +from subprocess import run +from shutil import which + +SIZES = (16, 24, 32, 48, 256) +IDS = ('io.github.retainerdevs.Retainer', 'io.github.retainerdevs.Retainer.Devel') + +SYMBOLIC = 'io.github.retainerdevs.Retainer-symbolic' + +INKSCAPE = [which('flatpak'), 'run', 'org.inkscape.Inkscape'] if len(sys.argv) > 1 and sys.argv[1] == 'flatpak' else [which('inkscape')] + +SCRIPT_DIR = path.realpath(path.dirname(__file__)) + +for id in IDS: + ID_DIR = f'{SCRIPT_DIR}{sep}{id}' + try: + mkdir(ID_DIR) + except: + pass + + for size in SIZES: + for hidpi in False, True: + SIZE_DIR = f'{ID_DIR}{sep}{size}x{size}' + if hidpi: + SIZE_DIR += '@2x' + size *= 2 + + try: + mkdir(SIZE_DIR) + except: + pass + + APPS_DIR = SIZE_DIR + sep + 'apps' + + try: + mkdir(APPS_DIR) + except: + pass + + run(INKSCAPE + ['-w', str(size), '-h', str(size), '-o', f'{APPS_DIR}{sep}{id}.png', f'{SCRIPT_DIR}{sep}{id}.Source.svg']) + + + SYMBOLIC_DIR = ID_DIR + sep + 'symbolic' + try: + mkdir(SYMBOLIC_DIR) + except: + pass + + APPS_DIR = SYMBOLIC_DIR + sep + 'apps' + + try: + mkdir(APPS_DIR) + except: + pass + + run(INKSCAPE + ['--export-plain-svg', '-o', f'{APPS_DIR}{sep}{SYMBOLIC}.svg', f'{SCRIPT_DIR}{sep}{SYMBOLIC}.Source.svg']) diff --git a/data/icons/svg_to_png_win.py b/data/icons/svg_to_png_win.py new file mode 100644 index 0000000..6af83c1 --- /dev/null +++ b/data/icons/svg_to_png_win.py @@ -0,0 +1,45 @@ +#!/usr/bin/env python3 +# Copyright (C) 2023 Sasha Hale +# +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at https://mozilla.org/MPL/2.0/. + +import sys +from os import mkdir, path, sep +from subprocess import run +from shutil import which + +SIZES = (16, 20, 24, 30, 32, 36, 40, 48, 60, 64, 72, 80, 96, 256) +SCALES = (100, 125, 150, 200, 400) +IDS = ('retainerdevs.Retainer', 'retainerdevs.Retainer.Devel') + +INKSCAPE = [which('flatpak'), 'run', 'org.inkscape.Inkscape'] if len(sys.argv) > 1 and sys.argv[1] == 'flatpak' else [which('inkscape')] + +SIZE_NAME_PAIRS = (('Square44x44Logo', 44, 44), ('Square150x150Logo', 150, 150), ('StoreLogo', 50, 50), ('SmallTile', 71, 71), ('LargeTile', 310, 310), ('Wide310x150Logo', 310, 150), ('SplashScreen', 620, 300)) +SCRIPT_DIR = path.realpath(path.dirname(__file__)) + +for id in IDS: + WIN_DIR = f'{SCRIPT_DIR}{sep}windows' + ID_DIR = f'{WIN_DIR}{sep}{id}' + + for i in WIN_DIR, ID_DIR: + try: + mkdir(i) + except: + pass + + for size in SIZES: + NAMES = (f'Square44x44Logo.targetsize-{size}', f'Square44x44Logo.targetsize-{size}_altform-unplated', f'Square44x44Logo.targetsize-{size}_altform-lightunplated') + for name in NAMES: + run(INKSCAPE + ['-w', str(size), '-h', str(size), '-o', f'{ID_DIR}{sep}{name}.png', f'{SCRIPT_DIR}{sep}io.github.{id}.Source.svg']) + + for name, x, y in SIZE_NAME_PAIRS: + x_offset = int((x - y) * (128 / y) + 0.5) / 2 if x > y else 0 + y_offset = int((y - x) * (128 / x) + 0.5) / 2 if x < y else 0 + + for scale in SCALES: + new_x = int(x * (scale / 100) + 0.5) + new_y = int(y * (scale / 100) + 0.5) + + run(INKSCAPE + ['--export-area', f'{-x_offset}:{-y_offset}:{128+x_offset}:{128+y_offset}', '-w', str(new_x), '-h', str(new_y), '-o', f'{ID_DIR}{sep}{name}.scale-{scale}.png', f'{SCRIPT_DIR}{sep}io.github.{id}.Source.svg']) diff --git a/data/icons/windows/io.github.retainerdevs.Retainer.Devel.ico b/data/icons/windows/io.github.retainerdevs.Retainer.Devel.ico new file mode 100644 index 0000000..addcb4d Binary files /dev/null and b/data/icons/windows/io.github.retainerdevs.Retainer.Devel.ico differ diff --git a/data/icons/windows/io.github.retainerdevs.Retainer.ico b/data/icons/windows/io.github.retainerdevs.Retainer.ico new file mode 100644 index 0000000..bd93b31 Binary files /dev/null and b/data/icons/windows/io.github.retainerdevs.Retainer.ico differ diff --git a/data/icons/windows/retainerdevs.Retainer.Devel/LargeTile.scale-100.png b/data/icons/windows/retainerdevs.Retainer.Devel/LargeTile.scale-100.png new file mode 100644 index 0000000..538aa64 Binary files /dev/null and b/data/icons/windows/retainerdevs.Retainer.Devel/LargeTile.scale-100.png differ diff --git a/data/icons/windows/retainerdevs.Retainer.Devel/LargeTile.scale-125.png b/data/icons/windows/retainerdevs.Retainer.Devel/LargeTile.scale-125.png new file mode 100644 index 0000000..351a13c Binary files /dev/null and b/data/icons/windows/retainerdevs.Retainer.Devel/LargeTile.scale-125.png differ diff --git a/data/icons/windows/retainerdevs.Retainer.Devel/LargeTile.scale-150.png b/data/icons/windows/retainerdevs.Retainer.Devel/LargeTile.scale-150.png new file mode 100644 index 0000000..54e21f1 Binary files /dev/null and b/data/icons/windows/retainerdevs.Retainer.Devel/LargeTile.scale-150.png differ diff --git a/data/icons/windows/retainerdevs.Retainer.Devel/LargeTile.scale-200.png b/data/icons/windows/retainerdevs.Retainer.Devel/LargeTile.scale-200.png new file mode 100644 index 0000000..a05d994 Binary files /dev/null and b/data/icons/windows/retainerdevs.Retainer.Devel/LargeTile.scale-200.png differ diff --git a/data/icons/windows/retainerdevs.Retainer.Devel/LargeTile.scale-400.png b/data/icons/windows/retainerdevs.Retainer.Devel/LargeTile.scale-400.png new file mode 100644 index 0000000..ae8d0f3 Binary files /dev/null and b/data/icons/windows/retainerdevs.Retainer.Devel/LargeTile.scale-400.png differ diff --git a/data/icons/windows/retainerdevs.Retainer.Devel/SmallTile.scale-100.png b/data/icons/windows/retainerdevs.Retainer.Devel/SmallTile.scale-100.png new file mode 100644 index 0000000..5524f1f Binary files /dev/null and b/data/icons/windows/retainerdevs.Retainer.Devel/SmallTile.scale-100.png differ diff --git a/data/icons/windows/retainerdevs.Retainer.Devel/SmallTile.scale-125.png b/data/icons/windows/retainerdevs.Retainer.Devel/SmallTile.scale-125.png new file mode 100644 index 0000000..d4ac606 Binary files /dev/null and b/data/icons/windows/retainerdevs.Retainer.Devel/SmallTile.scale-125.png differ diff --git a/data/icons/windows/retainerdevs.Retainer.Devel/SmallTile.scale-150.png b/data/icons/windows/retainerdevs.Retainer.Devel/SmallTile.scale-150.png new file mode 100644 index 0000000..423781d Binary files /dev/null and b/data/icons/windows/retainerdevs.Retainer.Devel/SmallTile.scale-150.png differ diff --git a/data/icons/windows/retainerdevs.Retainer.Devel/SmallTile.scale-200.png b/data/icons/windows/retainerdevs.Retainer.Devel/SmallTile.scale-200.png new file mode 100644 index 0000000..44d2b07 Binary files /dev/null and b/data/icons/windows/retainerdevs.Retainer.Devel/SmallTile.scale-200.png differ diff --git a/data/icons/windows/retainerdevs.Retainer.Devel/SmallTile.scale-400.png b/data/icons/windows/retainerdevs.Retainer.Devel/SmallTile.scale-400.png new file mode 100644 index 0000000..da43618 Binary files /dev/null and b/data/icons/windows/retainerdevs.Retainer.Devel/SmallTile.scale-400.png differ diff --git a/data/icons/windows/retainerdevs.Retainer.Devel/SplashScreen.scale-100.png b/data/icons/windows/retainerdevs.Retainer.Devel/SplashScreen.scale-100.png new file mode 100644 index 0000000..3f6c46b Binary files /dev/null and b/data/icons/windows/retainerdevs.Retainer.Devel/SplashScreen.scale-100.png differ diff --git a/data/icons/windows/retainerdevs.Retainer.Devel/SplashScreen.scale-125.png b/data/icons/windows/retainerdevs.Retainer.Devel/SplashScreen.scale-125.png new file mode 100644 index 0000000..8be38de Binary files /dev/null and b/data/icons/windows/retainerdevs.Retainer.Devel/SplashScreen.scale-125.png differ diff --git a/data/icons/windows/retainerdevs.Retainer.Devel/SplashScreen.scale-150.png b/data/icons/windows/retainerdevs.Retainer.Devel/SplashScreen.scale-150.png new file mode 100644 index 0000000..922e984 Binary files /dev/null and b/data/icons/windows/retainerdevs.Retainer.Devel/SplashScreen.scale-150.png differ diff --git a/data/icons/windows/retainerdevs.Retainer.Devel/SplashScreen.scale-200.png b/data/icons/windows/retainerdevs.Retainer.Devel/SplashScreen.scale-200.png new file mode 100644 index 0000000..7d7ff43 Binary files /dev/null and b/data/icons/windows/retainerdevs.Retainer.Devel/SplashScreen.scale-200.png differ diff --git a/data/icons/windows/retainerdevs.Retainer.Devel/SplashScreen.scale-400.png b/data/icons/windows/retainerdevs.Retainer.Devel/SplashScreen.scale-400.png new file mode 100644 index 0000000..8bfc2df Binary files /dev/null and b/data/icons/windows/retainerdevs.Retainer.Devel/SplashScreen.scale-400.png differ diff --git a/data/icons/windows/retainerdevs.Retainer.Devel/Square150x150Logo.scale-100.png b/data/icons/windows/retainerdevs.Retainer.Devel/Square150x150Logo.scale-100.png new file mode 100644 index 0000000..6a6dd03 Binary files /dev/null and b/data/icons/windows/retainerdevs.Retainer.Devel/Square150x150Logo.scale-100.png differ diff --git a/data/icons/windows/retainerdevs.Retainer.Devel/Square150x150Logo.scale-125.png b/data/icons/windows/retainerdevs.Retainer.Devel/Square150x150Logo.scale-125.png new file mode 100644 index 0000000..0c5c636 Binary files /dev/null and b/data/icons/windows/retainerdevs.Retainer.Devel/Square150x150Logo.scale-125.png differ diff --git a/data/icons/windows/retainerdevs.Retainer.Devel/Square150x150Logo.scale-150.png b/data/icons/windows/retainerdevs.Retainer.Devel/Square150x150Logo.scale-150.png new file mode 100644 index 0000000..5d7451f Binary files /dev/null and b/data/icons/windows/retainerdevs.Retainer.Devel/Square150x150Logo.scale-150.png differ diff --git a/data/icons/windows/retainerdevs.Retainer.Devel/Square150x150Logo.scale-200.png b/data/icons/windows/retainerdevs.Retainer.Devel/Square150x150Logo.scale-200.png new file mode 100644 index 0000000..7b0de0c Binary files /dev/null and b/data/icons/windows/retainerdevs.Retainer.Devel/Square150x150Logo.scale-200.png differ diff --git a/data/icons/windows/retainerdevs.Retainer.Devel/Square150x150Logo.scale-400.png b/data/icons/windows/retainerdevs.Retainer.Devel/Square150x150Logo.scale-400.png new file mode 100644 index 0000000..082bae9 Binary files /dev/null and b/data/icons/windows/retainerdevs.Retainer.Devel/Square150x150Logo.scale-400.png differ diff --git a/data/icons/windows/retainerdevs.Retainer.Devel/Square44x44Logo.scale-100.png b/data/icons/windows/retainerdevs.Retainer.Devel/Square44x44Logo.scale-100.png new file mode 100644 index 0000000..01e8c91 Binary files /dev/null and b/data/icons/windows/retainerdevs.Retainer.Devel/Square44x44Logo.scale-100.png differ diff --git a/data/icons/windows/retainerdevs.Retainer.Devel/Square44x44Logo.scale-125.png b/data/icons/windows/retainerdevs.Retainer.Devel/Square44x44Logo.scale-125.png new file mode 100644 index 0000000..791920d Binary files /dev/null and b/data/icons/windows/retainerdevs.Retainer.Devel/Square44x44Logo.scale-125.png differ diff --git a/data/icons/windows/retainerdevs.Retainer.Devel/Square44x44Logo.scale-150.png b/data/icons/windows/retainerdevs.Retainer.Devel/Square44x44Logo.scale-150.png new file mode 100644 index 0000000..0641067 Binary files /dev/null and b/data/icons/windows/retainerdevs.Retainer.Devel/Square44x44Logo.scale-150.png differ diff --git a/data/icons/windows/retainerdevs.Retainer.Devel/Square44x44Logo.scale-200.png b/data/icons/windows/retainerdevs.Retainer.Devel/Square44x44Logo.scale-200.png new file mode 100644 index 0000000..3ac60cd Binary files /dev/null and b/data/icons/windows/retainerdevs.Retainer.Devel/Square44x44Logo.scale-200.png differ diff --git a/data/icons/windows/retainerdevs.Retainer.Devel/Square44x44Logo.scale-400.png b/data/icons/windows/retainerdevs.Retainer.Devel/Square44x44Logo.scale-400.png new file mode 100644 index 0000000..fcd4afa Binary files /dev/null and b/data/icons/windows/retainerdevs.Retainer.Devel/Square44x44Logo.scale-400.png differ diff --git a/data/icons/windows/retainerdevs.Retainer.Devel/Square44x44Logo.targetsize-16.png b/data/icons/windows/retainerdevs.Retainer.Devel/Square44x44Logo.targetsize-16.png new file mode 100644 index 0000000..fb8ffa9 Binary files /dev/null and b/data/icons/windows/retainerdevs.Retainer.Devel/Square44x44Logo.targetsize-16.png differ diff --git a/data/icons/windows/retainerdevs.Retainer.Devel/Square44x44Logo.targetsize-16_altform-lightunplated.png b/data/icons/windows/retainerdevs.Retainer.Devel/Square44x44Logo.targetsize-16_altform-lightunplated.png new file mode 100644 index 0000000..fb8ffa9 Binary files /dev/null and b/data/icons/windows/retainerdevs.Retainer.Devel/Square44x44Logo.targetsize-16_altform-lightunplated.png differ diff --git a/data/icons/windows/retainerdevs.Retainer.Devel/Square44x44Logo.targetsize-16_altform-unplated.png b/data/icons/windows/retainerdevs.Retainer.Devel/Square44x44Logo.targetsize-16_altform-unplated.png new file mode 100644 index 0000000..fb8ffa9 Binary files /dev/null and b/data/icons/windows/retainerdevs.Retainer.Devel/Square44x44Logo.targetsize-16_altform-unplated.png differ diff --git a/data/icons/windows/retainerdevs.Retainer.Devel/Square44x44Logo.targetsize-20.png b/data/icons/windows/retainerdevs.Retainer.Devel/Square44x44Logo.targetsize-20.png new file mode 100644 index 0000000..acda9f6 Binary files /dev/null and b/data/icons/windows/retainerdevs.Retainer.Devel/Square44x44Logo.targetsize-20.png differ diff --git a/data/icons/windows/retainerdevs.Retainer.Devel/Square44x44Logo.targetsize-20_altform-lightunplated.png b/data/icons/windows/retainerdevs.Retainer.Devel/Square44x44Logo.targetsize-20_altform-lightunplated.png new file mode 100644 index 0000000..acda9f6 Binary files /dev/null and b/data/icons/windows/retainerdevs.Retainer.Devel/Square44x44Logo.targetsize-20_altform-lightunplated.png differ diff --git a/data/icons/windows/retainerdevs.Retainer.Devel/Square44x44Logo.targetsize-20_altform-unplated.png b/data/icons/windows/retainerdevs.Retainer.Devel/Square44x44Logo.targetsize-20_altform-unplated.png new file mode 100644 index 0000000..acda9f6 Binary files /dev/null and b/data/icons/windows/retainerdevs.Retainer.Devel/Square44x44Logo.targetsize-20_altform-unplated.png differ diff --git a/data/icons/windows/retainerdevs.Retainer.Devel/Square44x44Logo.targetsize-24.png b/data/icons/windows/retainerdevs.Retainer.Devel/Square44x44Logo.targetsize-24.png new file mode 100644 index 0000000..133a142 Binary files /dev/null and b/data/icons/windows/retainerdevs.Retainer.Devel/Square44x44Logo.targetsize-24.png differ diff --git a/data/icons/windows/retainerdevs.Retainer.Devel/Square44x44Logo.targetsize-24_altform-lightunplated.png b/data/icons/windows/retainerdevs.Retainer.Devel/Square44x44Logo.targetsize-24_altform-lightunplated.png new file mode 100644 index 0000000..133a142 Binary files /dev/null and b/data/icons/windows/retainerdevs.Retainer.Devel/Square44x44Logo.targetsize-24_altform-lightunplated.png differ diff --git a/data/icons/windows/retainerdevs.Retainer.Devel/Square44x44Logo.targetsize-24_altform-unplated.png b/data/icons/windows/retainerdevs.Retainer.Devel/Square44x44Logo.targetsize-24_altform-unplated.png new file mode 100644 index 0000000..133a142 Binary files /dev/null and b/data/icons/windows/retainerdevs.Retainer.Devel/Square44x44Logo.targetsize-24_altform-unplated.png differ diff --git a/data/icons/windows/retainerdevs.Retainer.Devel/Square44x44Logo.targetsize-256.png b/data/icons/windows/retainerdevs.Retainer.Devel/Square44x44Logo.targetsize-256.png new file mode 100644 index 0000000..d842cbf Binary files /dev/null and b/data/icons/windows/retainerdevs.Retainer.Devel/Square44x44Logo.targetsize-256.png differ diff --git a/data/icons/windows/retainerdevs.Retainer.Devel/Square44x44Logo.targetsize-256_altform-lightunplated.png b/data/icons/windows/retainerdevs.Retainer.Devel/Square44x44Logo.targetsize-256_altform-lightunplated.png new file mode 100644 index 0000000..d842cbf Binary files /dev/null and b/data/icons/windows/retainerdevs.Retainer.Devel/Square44x44Logo.targetsize-256_altform-lightunplated.png differ diff --git a/data/icons/windows/retainerdevs.Retainer.Devel/Square44x44Logo.targetsize-256_altform-unplated.png b/data/icons/windows/retainerdevs.Retainer.Devel/Square44x44Logo.targetsize-256_altform-unplated.png new file mode 100644 index 0000000..d842cbf Binary files /dev/null and b/data/icons/windows/retainerdevs.Retainer.Devel/Square44x44Logo.targetsize-256_altform-unplated.png differ diff --git a/data/icons/windows/retainerdevs.Retainer.Devel/Square44x44Logo.targetsize-30.png b/data/icons/windows/retainerdevs.Retainer.Devel/Square44x44Logo.targetsize-30.png new file mode 100644 index 0000000..35234cc Binary files /dev/null and b/data/icons/windows/retainerdevs.Retainer.Devel/Square44x44Logo.targetsize-30.png differ diff --git a/data/icons/windows/retainerdevs.Retainer.Devel/Square44x44Logo.targetsize-30_altform-lightunplated.png b/data/icons/windows/retainerdevs.Retainer.Devel/Square44x44Logo.targetsize-30_altform-lightunplated.png new file mode 100644 index 0000000..35234cc Binary files /dev/null and b/data/icons/windows/retainerdevs.Retainer.Devel/Square44x44Logo.targetsize-30_altform-lightunplated.png differ diff --git a/data/icons/windows/retainerdevs.Retainer.Devel/Square44x44Logo.targetsize-30_altform-unplated.png b/data/icons/windows/retainerdevs.Retainer.Devel/Square44x44Logo.targetsize-30_altform-unplated.png new file mode 100644 index 0000000..35234cc Binary files /dev/null and b/data/icons/windows/retainerdevs.Retainer.Devel/Square44x44Logo.targetsize-30_altform-unplated.png differ diff --git a/data/icons/windows/retainerdevs.Retainer.Devel/Square44x44Logo.targetsize-32.png b/data/icons/windows/retainerdevs.Retainer.Devel/Square44x44Logo.targetsize-32.png new file mode 100644 index 0000000..919dc1c Binary files /dev/null and b/data/icons/windows/retainerdevs.Retainer.Devel/Square44x44Logo.targetsize-32.png differ diff --git a/data/icons/windows/retainerdevs.Retainer.Devel/Square44x44Logo.targetsize-32_altform-lightunplated.png b/data/icons/windows/retainerdevs.Retainer.Devel/Square44x44Logo.targetsize-32_altform-lightunplated.png new file mode 100644 index 0000000..919dc1c Binary files /dev/null and b/data/icons/windows/retainerdevs.Retainer.Devel/Square44x44Logo.targetsize-32_altform-lightunplated.png differ diff --git a/data/icons/windows/retainerdevs.Retainer.Devel/Square44x44Logo.targetsize-32_altform-unplated.png b/data/icons/windows/retainerdevs.Retainer.Devel/Square44x44Logo.targetsize-32_altform-unplated.png new file mode 100644 index 0000000..919dc1c Binary files /dev/null and b/data/icons/windows/retainerdevs.Retainer.Devel/Square44x44Logo.targetsize-32_altform-unplated.png differ diff --git a/data/icons/windows/retainerdevs.Retainer.Devel/Square44x44Logo.targetsize-36.png b/data/icons/windows/retainerdevs.Retainer.Devel/Square44x44Logo.targetsize-36.png new file mode 100644 index 0000000..367e9d4 Binary files /dev/null and b/data/icons/windows/retainerdevs.Retainer.Devel/Square44x44Logo.targetsize-36.png differ diff --git a/data/icons/windows/retainerdevs.Retainer.Devel/Square44x44Logo.targetsize-36_altform-lightunplated.png b/data/icons/windows/retainerdevs.Retainer.Devel/Square44x44Logo.targetsize-36_altform-lightunplated.png new file mode 100644 index 0000000..367e9d4 Binary files /dev/null and b/data/icons/windows/retainerdevs.Retainer.Devel/Square44x44Logo.targetsize-36_altform-lightunplated.png differ diff --git a/data/icons/windows/retainerdevs.Retainer.Devel/Square44x44Logo.targetsize-36_altform-unplated.png b/data/icons/windows/retainerdevs.Retainer.Devel/Square44x44Logo.targetsize-36_altform-unplated.png new file mode 100644 index 0000000..367e9d4 Binary files /dev/null and b/data/icons/windows/retainerdevs.Retainer.Devel/Square44x44Logo.targetsize-36_altform-unplated.png differ diff --git a/data/icons/windows/retainerdevs.Retainer.Devel/Square44x44Logo.targetsize-40.png b/data/icons/windows/retainerdevs.Retainer.Devel/Square44x44Logo.targetsize-40.png new file mode 100644 index 0000000..b5d2d8c Binary files /dev/null and b/data/icons/windows/retainerdevs.Retainer.Devel/Square44x44Logo.targetsize-40.png differ diff --git a/data/icons/windows/retainerdevs.Retainer.Devel/Square44x44Logo.targetsize-40_altform-lightunplated.png b/data/icons/windows/retainerdevs.Retainer.Devel/Square44x44Logo.targetsize-40_altform-lightunplated.png new file mode 100644 index 0000000..b5d2d8c Binary files /dev/null and b/data/icons/windows/retainerdevs.Retainer.Devel/Square44x44Logo.targetsize-40_altform-lightunplated.png differ diff --git a/data/icons/windows/retainerdevs.Retainer.Devel/Square44x44Logo.targetsize-40_altform-unplated.png b/data/icons/windows/retainerdevs.Retainer.Devel/Square44x44Logo.targetsize-40_altform-unplated.png new file mode 100644 index 0000000..b5d2d8c Binary files /dev/null and b/data/icons/windows/retainerdevs.Retainer.Devel/Square44x44Logo.targetsize-40_altform-unplated.png differ diff --git a/data/icons/windows/retainerdevs.Retainer.Devel/Square44x44Logo.targetsize-48.png b/data/icons/windows/retainerdevs.Retainer.Devel/Square44x44Logo.targetsize-48.png new file mode 100644 index 0000000..fd93446 Binary files /dev/null and b/data/icons/windows/retainerdevs.Retainer.Devel/Square44x44Logo.targetsize-48.png differ diff --git a/data/icons/windows/retainerdevs.Retainer.Devel/Square44x44Logo.targetsize-48_altform-lightunplated.png b/data/icons/windows/retainerdevs.Retainer.Devel/Square44x44Logo.targetsize-48_altform-lightunplated.png new file mode 100644 index 0000000..fd93446 Binary files /dev/null and b/data/icons/windows/retainerdevs.Retainer.Devel/Square44x44Logo.targetsize-48_altform-lightunplated.png differ diff --git a/data/icons/windows/retainerdevs.Retainer.Devel/Square44x44Logo.targetsize-48_altform-unplated.png b/data/icons/windows/retainerdevs.Retainer.Devel/Square44x44Logo.targetsize-48_altform-unplated.png new file mode 100644 index 0000000..fd93446 Binary files /dev/null and b/data/icons/windows/retainerdevs.Retainer.Devel/Square44x44Logo.targetsize-48_altform-unplated.png differ diff --git a/data/icons/windows/retainerdevs.Retainer.Devel/Square44x44Logo.targetsize-60.png b/data/icons/windows/retainerdevs.Retainer.Devel/Square44x44Logo.targetsize-60.png new file mode 100644 index 0000000..60771a8 Binary files /dev/null and b/data/icons/windows/retainerdevs.Retainer.Devel/Square44x44Logo.targetsize-60.png differ diff --git a/data/icons/windows/retainerdevs.Retainer.Devel/Square44x44Logo.targetsize-60_altform-lightunplated.png b/data/icons/windows/retainerdevs.Retainer.Devel/Square44x44Logo.targetsize-60_altform-lightunplated.png new file mode 100644 index 0000000..60771a8 Binary files /dev/null and b/data/icons/windows/retainerdevs.Retainer.Devel/Square44x44Logo.targetsize-60_altform-lightunplated.png differ diff --git a/data/icons/windows/retainerdevs.Retainer.Devel/Square44x44Logo.targetsize-60_altform-unplated.png b/data/icons/windows/retainerdevs.Retainer.Devel/Square44x44Logo.targetsize-60_altform-unplated.png new file mode 100644 index 0000000..60771a8 Binary files /dev/null and b/data/icons/windows/retainerdevs.Retainer.Devel/Square44x44Logo.targetsize-60_altform-unplated.png differ diff --git a/data/icons/windows/retainerdevs.Retainer.Devel/Square44x44Logo.targetsize-64.png b/data/icons/windows/retainerdevs.Retainer.Devel/Square44x44Logo.targetsize-64.png new file mode 100644 index 0000000..814d522 Binary files /dev/null and b/data/icons/windows/retainerdevs.Retainer.Devel/Square44x44Logo.targetsize-64.png differ diff --git a/data/icons/windows/retainerdevs.Retainer.Devel/Square44x44Logo.targetsize-64_altform-lightunplated.png b/data/icons/windows/retainerdevs.Retainer.Devel/Square44x44Logo.targetsize-64_altform-lightunplated.png new file mode 100644 index 0000000..814d522 Binary files /dev/null and b/data/icons/windows/retainerdevs.Retainer.Devel/Square44x44Logo.targetsize-64_altform-lightunplated.png differ diff --git a/data/icons/windows/retainerdevs.Retainer.Devel/Square44x44Logo.targetsize-64_altform-unplated.png b/data/icons/windows/retainerdevs.Retainer.Devel/Square44x44Logo.targetsize-64_altform-unplated.png new file mode 100644 index 0000000..814d522 Binary files /dev/null and b/data/icons/windows/retainerdevs.Retainer.Devel/Square44x44Logo.targetsize-64_altform-unplated.png differ diff --git a/data/icons/windows/retainerdevs.Retainer.Devel/Square44x44Logo.targetsize-72.png b/data/icons/windows/retainerdevs.Retainer.Devel/Square44x44Logo.targetsize-72.png new file mode 100644 index 0000000..9b041a4 Binary files /dev/null and b/data/icons/windows/retainerdevs.Retainer.Devel/Square44x44Logo.targetsize-72.png differ diff --git a/data/icons/windows/retainerdevs.Retainer.Devel/Square44x44Logo.targetsize-72_altform-lightunplated.png b/data/icons/windows/retainerdevs.Retainer.Devel/Square44x44Logo.targetsize-72_altform-lightunplated.png new file mode 100644 index 0000000..9b041a4 Binary files /dev/null and b/data/icons/windows/retainerdevs.Retainer.Devel/Square44x44Logo.targetsize-72_altform-lightunplated.png differ diff --git a/data/icons/windows/retainerdevs.Retainer.Devel/Square44x44Logo.targetsize-72_altform-unplated.png b/data/icons/windows/retainerdevs.Retainer.Devel/Square44x44Logo.targetsize-72_altform-unplated.png new file mode 100644 index 0000000..9b041a4 Binary files /dev/null and b/data/icons/windows/retainerdevs.Retainer.Devel/Square44x44Logo.targetsize-72_altform-unplated.png differ diff --git a/data/icons/windows/retainerdevs.Retainer.Devel/Square44x44Logo.targetsize-80.png b/data/icons/windows/retainerdevs.Retainer.Devel/Square44x44Logo.targetsize-80.png new file mode 100644 index 0000000..6c6c5fb Binary files /dev/null and b/data/icons/windows/retainerdevs.Retainer.Devel/Square44x44Logo.targetsize-80.png differ diff --git a/data/icons/windows/retainerdevs.Retainer.Devel/Square44x44Logo.targetsize-80_altform-lightunplated.png b/data/icons/windows/retainerdevs.Retainer.Devel/Square44x44Logo.targetsize-80_altform-lightunplated.png new file mode 100644 index 0000000..6c6c5fb Binary files /dev/null and b/data/icons/windows/retainerdevs.Retainer.Devel/Square44x44Logo.targetsize-80_altform-lightunplated.png differ diff --git a/data/icons/windows/retainerdevs.Retainer.Devel/Square44x44Logo.targetsize-80_altform-unplated.png b/data/icons/windows/retainerdevs.Retainer.Devel/Square44x44Logo.targetsize-80_altform-unplated.png new file mode 100644 index 0000000..6c6c5fb Binary files /dev/null and b/data/icons/windows/retainerdevs.Retainer.Devel/Square44x44Logo.targetsize-80_altform-unplated.png differ diff --git a/data/icons/windows/retainerdevs.Retainer.Devel/Square44x44Logo.targetsize-96.png b/data/icons/windows/retainerdevs.Retainer.Devel/Square44x44Logo.targetsize-96.png new file mode 100644 index 0000000..e4eb1f6 Binary files /dev/null and b/data/icons/windows/retainerdevs.Retainer.Devel/Square44x44Logo.targetsize-96.png differ diff --git a/data/icons/windows/retainerdevs.Retainer.Devel/Square44x44Logo.targetsize-96_altform-lightunplated.png b/data/icons/windows/retainerdevs.Retainer.Devel/Square44x44Logo.targetsize-96_altform-lightunplated.png new file mode 100644 index 0000000..e4eb1f6 Binary files /dev/null and b/data/icons/windows/retainerdevs.Retainer.Devel/Square44x44Logo.targetsize-96_altform-lightunplated.png differ diff --git a/data/icons/windows/retainerdevs.Retainer.Devel/Square44x44Logo.targetsize-96_altform-unplated.png b/data/icons/windows/retainerdevs.Retainer.Devel/Square44x44Logo.targetsize-96_altform-unplated.png new file mode 100644 index 0000000..e4eb1f6 Binary files /dev/null and b/data/icons/windows/retainerdevs.Retainer.Devel/Square44x44Logo.targetsize-96_altform-unplated.png differ diff --git a/data/icons/windows/retainerdevs.Retainer.Devel/StoreLogo.scale-100.png b/data/icons/windows/retainerdevs.Retainer.Devel/StoreLogo.scale-100.png new file mode 100644 index 0000000..7ba80dd Binary files /dev/null and b/data/icons/windows/retainerdevs.Retainer.Devel/StoreLogo.scale-100.png differ diff --git a/data/icons/windows/retainerdevs.Retainer.Devel/StoreLogo.scale-125.png b/data/icons/windows/retainerdevs.Retainer.Devel/StoreLogo.scale-125.png new file mode 100644 index 0000000..c02bc94 Binary files /dev/null and b/data/icons/windows/retainerdevs.Retainer.Devel/StoreLogo.scale-125.png differ diff --git a/data/icons/windows/retainerdevs.Retainer.Devel/StoreLogo.scale-150.png b/data/icons/windows/retainerdevs.Retainer.Devel/StoreLogo.scale-150.png new file mode 100644 index 0000000..6e8fe01 Binary files /dev/null and b/data/icons/windows/retainerdevs.Retainer.Devel/StoreLogo.scale-150.png differ diff --git a/data/icons/windows/retainerdevs.Retainer.Devel/StoreLogo.scale-200.png b/data/icons/windows/retainerdevs.Retainer.Devel/StoreLogo.scale-200.png new file mode 100644 index 0000000..5db0d9b Binary files /dev/null and b/data/icons/windows/retainerdevs.Retainer.Devel/StoreLogo.scale-200.png differ diff --git a/data/icons/windows/retainerdevs.Retainer.Devel/StoreLogo.scale-400.png b/data/icons/windows/retainerdevs.Retainer.Devel/StoreLogo.scale-400.png new file mode 100644 index 0000000..ee6d141 Binary files /dev/null and b/data/icons/windows/retainerdevs.Retainer.Devel/StoreLogo.scale-400.png differ diff --git a/data/icons/windows/retainerdevs.Retainer.Devel/Wide310x150Logo.scale-100.png b/data/icons/windows/retainerdevs.Retainer.Devel/Wide310x150Logo.scale-100.png new file mode 100644 index 0000000..81d6994 Binary files /dev/null and b/data/icons/windows/retainerdevs.Retainer.Devel/Wide310x150Logo.scale-100.png differ diff --git a/data/icons/windows/retainerdevs.Retainer.Devel/Wide310x150Logo.scale-125.png b/data/icons/windows/retainerdevs.Retainer.Devel/Wide310x150Logo.scale-125.png new file mode 100644 index 0000000..b84f75d Binary files /dev/null and b/data/icons/windows/retainerdevs.Retainer.Devel/Wide310x150Logo.scale-125.png differ diff --git a/data/icons/windows/retainerdevs.Retainer.Devel/Wide310x150Logo.scale-150.png b/data/icons/windows/retainerdevs.Retainer.Devel/Wide310x150Logo.scale-150.png new file mode 100644 index 0000000..c8eda1c Binary files /dev/null and b/data/icons/windows/retainerdevs.Retainer.Devel/Wide310x150Logo.scale-150.png differ diff --git a/data/icons/windows/retainerdevs.Retainer.Devel/Wide310x150Logo.scale-200.png b/data/icons/windows/retainerdevs.Retainer.Devel/Wide310x150Logo.scale-200.png new file mode 100644 index 0000000..3f6c46b Binary files /dev/null and b/data/icons/windows/retainerdevs.Retainer.Devel/Wide310x150Logo.scale-200.png differ diff --git a/data/icons/windows/retainerdevs.Retainer.Devel/Wide310x150Logo.scale-400.png b/data/icons/windows/retainerdevs.Retainer.Devel/Wide310x150Logo.scale-400.png new file mode 100644 index 0000000..7d7ff43 Binary files /dev/null and b/data/icons/windows/retainerdevs.Retainer.Devel/Wide310x150Logo.scale-400.png differ diff --git a/data/icons/windows/retainerdevs.Retainer/LargeTile.scale-100.png b/data/icons/windows/retainerdevs.Retainer/LargeTile.scale-100.png new file mode 100644 index 0000000..4d21f33 Binary files /dev/null and b/data/icons/windows/retainerdevs.Retainer/LargeTile.scale-100.png differ diff --git a/data/icons/windows/retainerdevs.Retainer/LargeTile.scale-125.png b/data/icons/windows/retainerdevs.Retainer/LargeTile.scale-125.png new file mode 100644 index 0000000..6275dac Binary files /dev/null and b/data/icons/windows/retainerdevs.Retainer/LargeTile.scale-125.png differ diff --git a/data/icons/windows/retainerdevs.Retainer/LargeTile.scale-150.png b/data/icons/windows/retainerdevs.Retainer/LargeTile.scale-150.png new file mode 100644 index 0000000..08c5f5f Binary files /dev/null and b/data/icons/windows/retainerdevs.Retainer/LargeTile.scale-150.png differ diff --git a/data/icons/windows/retainerdevs.Retainer/LargeTile.scale-200.png b/data/icons/windows/retainerdevs.Retainer/LargeTile.scale-200.png new file mode 100644 index 0000000..2fc2fad Binary files /dev/null and b/data/icons/windows/retainerdevs.Retainer/LargeTile.scale-200.png differ diff --git a/data/icons/windows/retainerdevs.Retainer/LargeTile.scale-400.png b/data/icons/windows/retainerdevs.Retainer/LargeTile.scale-400.png new file mode 100644 index 0000000..7161ca5 Binary files /dev/null and b/data/icons/windows/retainerdevs.Retainer/LargeTile.scale-400.png differ diff --git a/data/icons/windows/retainerdevs.Retainer/SmallTile.scale-100.png b/data/icons/windows/retainerdevs.Retainer/SmallTile.scale-100.png new file mode 100644 index 0000000..0b08631 Binary files /dev/null and b/data/icons/windows/retainerdevs.Retainer/SmallTile.scale-100.png differ diff --git a/data/icons/windows/retainerdevs.Retainer/SmallTile.scale-125.png b/data/icons/windows/retainerdevs.Retainer/SmallTile.scale-125.png new file mode 100644 index 0000000..1805310 Binary files /dev/null and b/data/icons/windows/retainerdevs.Retainer/SmallTile.scale-125.png differ diff --git a/data/icons/windows/retainerdevs.Retainer/SmallTile.scale-150.png b/data/icons/windows/retainerdevs.Retainer/SmallTile.scale-150.png new file mode 100644 index 0000000..8fbcb69 Binary files /dev/null and b/data/icons/windows/retainerdevs.Retainer/SmallTile.scale-150.png differ diff --git a/data/icons/windows/retainerdevs.Retainer/SmallTile.scale-200.png b/data/icons/windows/retainerdevs.Retainer/SmallTile.scale-200.png new file mode 100644 index 0000000..d319581 Binary files /dev/null and b/data/icons/windows/retainerdevs.Retainer/SmallTile.scale-200.png differ diff --git a/data/icons/windows/retainerdevs.Retainer/SmallTile.scale-400.png b/data/icons/windows/retainerdevs.Retainer/SmallTile.scale-400.png new file mode 100644 index 0000000..6b258f4 Binary files /dev/null and b/data/icons/windows/retainerdevs.Retainer/SmallTile.scale-400.png differ diff --git a/data/icons/windows/retainerdevs.Retainer/SplashScreen.scale-100.png b/data/icons/windows/retainerdevs.Retainer/SplashScreen.scale-100.png new file mode 100644 index 0000000..b134814 Binary files /dev/null and b/data/icons/windows/retainerdevs.Retainer/SplashScreen.scale-100.png differ diff --git a/data/icons/windows/retainerdevs.Retainer/SplashScreen.scale-125.png b/data/icons/windows/retainerdevs.Retainer/SplashScreen.scale-125.png new file mode 100644 index 0000000..b6c4c86 Binary files /dev/null and b/data/icons/windows/retainerdevs.Retainer/SplashScreen.scale-125.png differ diff --git a/data/icons/windows/retainerdevs.Retainer/SplashScreen.scale-150.png b/data/icons/windows/retainerdevs.Retainer/SplashScreen.scale-150.png new file mode 100644 index 0000000..b8d9d3a Binary files /dev/null and b/data/icons/windows/retainerdevs.Retainer/SplashScreen.scale-150.png differ diff --git a/data/icons/windows/retainerdevs.Retainer/SplashScreen.scale-200.png b/data/icons/windows/retainerdevs.Retainer/SplashScreen.scale-200.png new file mode 100644 index 0000000..18a71a3 Binary files /dev/null and b/data/icons/windows/retainerdevs.Retainer/SplashScreen.scale-200.png differ diff --git a/data/icons/windows/retainerdevs.Retainer/SplashScreen.scale-400.png b/data/icons/windows/retainerdevs.Retainer/SplashScreen.scale-400.png new file mode 100644 index 0000000..563db8f Binary files /dev/null and b/data/icons/windows/retainerdevs.Retainer/SplashScreen.scale-400.png differ diff --git a/data/icons/windows/retainerdevs.Retainer/Square150x150Logo.scale-100.png b/data/icons/windows/retainerdevs.Retainer/Square150x150Logo.scale-100.png new file mode 100644 index 0000000..09464e8 Binary files /dev/null and b/data/icons/windows/retainerdevs.Retainer/Square150x150Logo.scale-100.png differ diff --git a/data/icons/windows/retainerdevs.Retainer/Square150x150Logo.scale-125.png b/data/icons/windows/retainerdevs.Retainer/Square150x150Logo.scale-125.png new file mode 100644 index 0000000..f10a08c Binary files /dev/null and b/data/icons/windows/retainerdevs.Retainer/Square150x150Logo.scale-125.png differ diff --git a/data/icons/windows/retainerdevs.Retainer/Square150x150Logo.scale-150.png b/data/icons/windows/retainerdevs.Retainer/Square150x150Logo.scale-150.png new file mode 100644 index 0000000..2903ca0 Binary files /dev/null and b/data/icons/windows/retainerdevs.Retainer/Square150x150Logo.scale-150.png differ diff --git a/data/icons/windows/retainerdevs.Retainer/Square150x150Logo.scale-200.png b/data/icons/windows/retainerdevs.Retainer/Square150x150Logo.scale-200.png new file mode 100644 index 0000000..1b81bd1 Binary files /dev/null and b/data/icons/windows/retainerdevs.Retainer/Square150x150Logo.scale-200.png differ diff --git a/data/icons/windows/retainerdevs.Retainer/Square150x150Logo.scale-400.png b/data/icons/windows/retainerdevs.Retainer/Square150x150Logo.scale-400.png new file mode 100644 index 0000000..6abac0b Binary files /dev/null and b/data/icons/windows/retainerdevs.Retainer/Square150x150Logo.scale-400.png differ diff --git a/data/icons/windows/retainerdevs.Retainer/Square44x44Logo.scale-100.png b/data/icons/windows/retainerdevs.Retainer/Square44x44Logo.scale-100.png new file mode 100644 index 0000000..21d324a Binary files /dev/null and b/data/icons/windows/retainerdevs.Retainer/Square44x44Logo.scale-100.png differ diff --git a/data/icons/windows/retainerdevs.Retainer/Square44x44Logo.scale-125.png b/data/icons/windows/retainerdevs.Retainer/Square44x44Logo.scale-125.png new file mode 100644 index 0000000..07e33bf Binary files /dev/null and b/data/icons/windows/retainerdevs.Retainer/Square44x44Logo.scale-125.png differ diff --git a/data/icons/windows/retainerdevs.Retainer/Square44x44Logo.scale-150.png b/data/icons/windows/retainerdevs.Retainer/Square44x44Logo.scale-150.png new file mode 100644 index 0000000..57d3a26 Binary files /dev/null and b/data/icons/windows/retainerdevs.Retainer/Square44x44Logo.scale-150.png differ diff --git a/data/icons/windows/retainerdevs.Retainer/Square44x44Logo.scale-200.png b/data/icons/windows/retainerdevs.Retainer/Square44x44Logo.scale-200.png new file mode 100644 index 0000000..11373d8 Binary files /dev/null and b/data/icons/windows/retainerdevs.Retainer/Square44x44Logo.scale-200.png differ diff --git a/data/icons/windows/retainerdevs.Retainer/Square44x44Logo.scale-400.png b/data/icons/windows/retainerdevs.Retainer/Square44x44Logo.scale-400.png new file mode 100644 index 0000000..c2af61f Binary files /dev/null and b/data/icons/windows/retainerdevs.Retainer/Square44x44Logo.scale-400.png differ diff --git a/data/icons/windows/retainerdevs.Retainer/Square44x44Logo.targetsize-16.png b/data/icons/windows/retainerdevs.Retainer/Square44x44Logo.targetsize-16.png new file mode 100644 index 0000000..9a069dc Binary files /dev/null and b/data/icons/windows/retainerdevs.Retainer/Square44x44Logo.targetsize-16.png differ diff --git a/data/icons/windows/retainerdevs.Retainer/Square44x44Logo.targetsize-16_altform-lightunplated.png b/data/icons/windows/retainerdevs.Retainer/Square44x44Logo.targetsize-16_altform-lightunplated.png new file mode 100644 index 0000000..9a069dc Binary files /dev/null and b/data/icons/windows/retainerdevs.Retainer/Square44x44Logo.targetsize-16_altform-lightunplated.png differ diff --git a/data/icons/windows/retainerdevs.Retainer/Square44x44Logo.targetsize-16_altform-unplated.png b/data/icons/windows/retainerdevs.Retainer/Square44x44Logo.targetsize-16_altform-unplated.png new file mode 100644 index 0000000..9a069dc Binary files /dev/null and b/data/icons/windows/retainerdevs.Retainer/Square44x44Logo.targetsize-16_altform-unplated.png differ diff --git a/data/icons/windows/retainerdevs.Retainer/Square44x44Logo.targetsize-20.png b/data/icons/windows/retainerdevs.Retainer/Square44x44Logo.targetsize-20.png new file mode 100644 index 0000000..118ff45 Binary files /dev/null and b/data/icons/windows/retainerdevs.Retainer/Square44x44Logo.targetsize-20.png differ diff --git a/data/icons/windows/retainerdevs.Retainer/Square44x44Logo.targetsize-20_altform-lightunplated.png b/data/icons/windows/retainerdevs.Retainer/Square44x44Logo.targetsize-20_altform-lightunplated.png new file mode 100644 index 0000000..118ff45 Binary files /dev/null and b/data/icons/windows/retainerdevs.Retainer/Square44x44Logo.targetsize-20_altform-lightunplated.png differ diff --git a/data/icons/windows/retainerdevs.Retainer/Square44x44Logo.targetsize-20_altform-unplated.png b/data/icons/windows/retainerdevs.Retainer/Square44x44Logo.targetsize-20_altform-unplated.png new file mode 100644 index 0000000..118ff45 Binary files /dev/null and b/data/icons/windows/retainerdevs.Retainer/Square44x44Logo.targetsize-20_altform-unplated.png differ diff --git a/data/icons/windows/retainerdevs.Retainer/Square44x44Logo.targetsize-24.png b/data/icons/windows/retainerdevs.Retainer/Square44x44Logo.targetsize-24.png new file mode 100644 index 0000000..0a43748 Binary files /dev/null and b/data/icons/windows/retainerdevs.Retainer/Square44x44Logo.targetsize-24.png differ diff --git a/data/icons/windows/retainerdevs.Retainer/Square44x44Logo.targetsize-24_altform-lightunplated.png b/data/icons/windows/retainerdevs.Retainer/Square44x44Logo.targetsize-24_altform-lightunplated.png new file mode 100644 index 0000000..0a43748 Binary files /dev/null and b/data/icons/windows/retainerdevs.Retainer/Square44x44Logo.targetsize-24_altform-lightunplated.png differ diff --git a/data/icons/windows/retainerdevs.Retainer/Square44x44Logo.targetsize-24_altform-unplated.png b/data/icons/windows/retainerdevs.Retainer/Square44x44Logo.targetsize-24_altform-unplated.png new file mode 100644 index 0000000..0a43748 Binary files /dev/null and b/data/icons/windows/retainerdevs.Retainer/Square44x44Logo.targetsize-24_altform-unplated.png differ diff --git a/data/icons/windows/retainerdevs.Retainer/Square44x44Logo.targetsize-256.png b/data/icons/windows/retainerdevs.Retainer/Square44x44Logo.targetsize-256.png new file mode 100644 index 0000000..6b08d41 Binary files /dev/null and b/data/icons/windows/retainerdevs.Retainer/Square44x44Logo.targetsize-256.png differ diff --git a/data/icons/windows/retainerdevs.Retainer/Square44x44Logo.targetsize-256_altform-lightunplated.png b/data/icons/windows/retainerdevs.Retainer/Square44x44Logo.targetsize-256_altform-lightunplated.png new file mode 100644 index 0000000..6b08d41 Binary files /dev/null and b/data/icons/windows/retainerdevs.Retainer/Square44x44Logo.targetsize-256_altform-lightunplated.png differ diff --git a/data/icons/windows/retainerdevs.Retainer/Square44x44Logo.targetsize-256_altform-unplated.png b/data/icons/windows/retainerdevs.Retainer/Square44x44Logo.targetsize-256_altform-unplated.png new file mode 100644 index 0000000..6b08d41 Binary files /dev/null and b/data/icons/windows/retainerdevs.Retainer/Square44x44Logo.targetsize-256_altform-unplated.png differ diff --git a/data/icons/windows/retainerdevs.Retainer/Square44x44Logo.targetsize-30.png b/data/icons/windows/retainerdevs.Retainer/Square44x44Logo.targetsize-30.png new file mode 100644 index 0000000..58b1067 Binary files /dev/null and b/data/icons/windows/retainerdevs.Retainer/Square44x44Logo.targetsize-30.png differ diff --git a/data/icons/windows/retainerdevs.Retainer/Square44x44Logo.targetsize-30_altform-lightunplated.png b/data/icons/windows/retainerdevs.Retainer/Square44x44Logo.targetsize-30_altform-lightunplated.png new file mode 100644 index 0000000..58b1067 Binary files /dev/null and b/data/icons/windows/retainerdevs.Retainer/Square44x44Logo.targetsize-30_altform-lightunplated.png differ diff --git a/data/icons/windows/retainerdevs.Retainer/Square44x44Logo.targetsize-30_altform-unplated.png b/data/icons/windows/retainerdevs.Retainer/Square44x44Logo.targetsize-30_altform-unplated.png new file mode 100644 index 0000000..58b1067 Binary files /dev/null and b/data/icons/windows/retainerdevs.Retainer/Square44x44Logo.targetsize-30_altform-unplated.png differ diff --git a/data/icons/windows/retainerdevs.Retainer/Square44x44Logo.targetsize-32.png b/data/icons/windows/retainerdevs.Retainer/Square44x44Logo.targetsize-32.png new file mode 100644 index 0000000..a81a788 Binary files /dev/null and b/data/icons/windows/retainerdevs.Retainer/Square44x44Logo.targetsize-32.png differ diff --git a/data/icons/windows/retainerdevs.Retainer/Square44x44Logo.targetsize-32_altform-lightunplated.png b/data/icons/windows/retainerdevs.Retainer/Square44x44Logo.targetsize-32_altform-lightunplated.png new file mode 100644 index 0000000..a81a788 Binary files /dev/null and b/data/icons/windows/retainerdevs.Retainer/Square44x44Logo.targetsize-32_altform-lightunplated.png differ diff --git a/data/icons/windows/retainerdevs.Retainer/Square44x44Logo.targetsize-32_altform-unplated.png b/data/icons/windows/retainerdevs.Retainer/Square44x44Logo.targetsize-32_altform-unplated.png new file mode 100644 index 0000000..a81a788 Binary files /dev/null and b/data/icons/windows/retainerdevs.Retainer/Square44x44Logo.targetsize-32_altform-unplated.png differ diff --git a/data/icons/windows/retainerdevs.Retainer/Square44x44Logo.targetsize-36.png b/data/icons/windows/retainerdevs.Retainer/Square44x44Logo.targetsize-36.png new file mode 100644 index 0000000..2c3c955 Binary files /dev/null and b/data/icons/windows/retainerdevs.Retainer/Square44x44Logo.targetsize-36.png differ diff --git a/data/icons/windows/retainerdevs.Retainer/Square44x44Logo.targetsize-36_altform-lightunplated.png b/data/icons/windows/retainerdevs.Retainer/Square44x44Logo.targetsize-36_altform-lightunplated.png new file mode 100644 index 0000000..2c3c955 Binary files /dev/null and b/data/icons/windows/retainerdevs.Retainer/Square44x44Logo.targetsize-36_altform-lightunplated.png differ diff --git a/data/icons/windows/retainerdevs.Retainer/Square44x44Logo.targetsize-36_altform-unplated.png b/data/icons/windows/retainerdevs.Retainer/Square44x44Logo.targetsize-36_altform-unplated.png new file mode 100644 index 0000000..2c3c955 Binary files /dev/null and b/data/icons/windows/retainerdevs.Retainer/Square44x44Logo.targetsize-36_altform-unplated.png differ diff --git a/data/icons/windows/retainerdevs.Retainer/Square44x44Logo.targetsize-40.png b/data/icons/windows/retainerdevs.Retainer/Square44x44Logo.targetsize-40.png new file mode 100644 index 0000000..ec7ccb7 Binary files /dev/null and b/data/icons/windows/retainerdevs.Retainer/Square44x44Logo.targetsize-40.png differ diff --git a/data/icons/windows/retainerdevs.Retainer/Square44x44Logo.targetsize-40_altform-lightunplated.png b/data/icons/windows/retainerdevs.Retainer/Square44x44Logo.targetsize-40_altform-lightunplated.png new file mode 100644 index 0000000..ec7ccb7 Binary files /dev/null and b/data/icons/windows/retainerdevs.Retainer/Square44x44Logo.targetsize-40_altform-lightunplated.png differ diff --git a/data/icons/windows/retainerdevs.Retainer/Square44x44Logo.targetsize-40_altform-unplated.png b/data/icons/windows/retainerdevs.Retainer/Square44x44Logo.targetsize-40_altform-unplated.png new file mode 100644 index 0000000..ec7ccb7 Binary files /dev/null and b/data/icons/windows/retainerdevs.Retainer/Square44x44Logo.targetsize-40_altform-unplated.png differ diff --git a/data/icons/windows/retainerdevs.Retainer/Square44x44Logo.targetsize-48.png b/data/icons/windows/retainerdevs.Retainer/Square44x44Logo.targetsize-48.png new file mode 100644 index 0000000..12e902f Binary files /dev/null and b/data/icons/windows/retainerdevs.Retainer/Square44x44Logo.targetsize-48.png differ diff --git a/data/icons/windows/retainerdevs.Retainer/Square44x44Logo.targetsize-48_altform-lightunplated.png b/data/icons/windows/retainerdevs.Retainer/Square44x44Logo.targetsize-48_altform-lightunplated.png new file mode 100644 index 0000000..12e902f Binary files /dev/null and b/data/icons/windows/retainerdevs.Retainer/Square44x44Logo.targetsize-48_altform-lightunplated.png differ diff --git a/data/icons/windows/retainerdevs.Retainer/Square44x44Logo.targetsize-48_altform-unplated.png b/data/icons/windows/retainerdevs.Retainer/Square44x44Logo.targetsize-48_altform-unplated.png new file mode 100644 index 0000000..12e902f Binary files /dev/null and b/data/icons/windows/retainerdevs.Retainer/Square44x44Logo.targetsize-48_altform-unplated.png differ diff --git a/data/icons/windows/retainerdevs.Retainer/Square44x44Logo.targetsize-60.png b/data/icons/windows/retainerdevs.Retainer/Square44x44Logo.targetsize-60.png new file mode 100644 index 0000000..95a76f6 Binary files /dev/null and b/data/icons/windows/retainerdevs.Retainer/Square44x44Logo.targetsize-60.png differ diff --git a/data/icons/windows/retainerdevs.Retainer/Square44x44Logo.targetsize-60_altform-lightunplated.png b/data/icons/windows/retainerdevs.Retainer/Square44x44Logo.targetsize-60_altform-lightunplated.png new file mode 100644 index 0000000..95a76f6 Binary files /dev/null and b/data/icons/windows/retainerdevs.Retainer/Square44x44Logo.targetsize-60_altform-lightunplated.png differ diff --git a/data/icons/windows/retainerdevs.Retainer/Square44x44Logo.targetsize-60_altform-unplated.png b/data/icons/windows/retainerdevs.Retainer/Square44x44Logo.targetsize-60_altform-unplated.png new file mode 100644 index 0000000..95a76f6 Binary files /dev/null and b/data/icons/windows/retainerdevs.Retainer/Square44x44Logo.targetsize-60_altform-unplated.png differ diff --git a/data/icons/windows/retainerdevs.Retainer/Square44x44Logo.targetsize-64.png b/data/icons/windows/retainerdevs.Retainer/Square44x44Logo.targetsize-64.png new file mode 100644 index 0000000..5da7f0b Binary files /dev/null and b/data/icons/windows/retainerdevs.Retainer/Square44x44Logo.targetsize-64.png differ diff --git a/data/icons/windows/retainerdevs.Retainer/Square44x44Logo.targetsize-64_altform-lightunplated.png b/data/icons/windows/retainerdevs.Retainer/Square44x44Logo.targetsize-64_altform-lightunplated.png new file mode 100644 index 0000000..5da7f0b Binary files /dev/null and b/data/icons/windows/retainerdevs.Retainer/Square44x44Logo.targetsize-64_altform-lightunplated.png differ diff --git a/data/icons/windows/retainerdevs.Retainer/Square44x44Logo.targetsize-64_altform-unplated.png b/data/icons/windows/retainerdevs.Retainer/Square44x44Logo.targetsize-64_altform-unplated.png new file mode 100644 index 0000000..5da7f0b Binary files /dev/null and b/data/icons/windows/retainerdevs.Retainer/Square44x44Logo.targetsize-64_altform-unplated.png differ diff --git a/data/icons/windows/retainerdevs.Retainer/Square44x44Logo.targetsize-72.png b/data/icons/windows/retainerdevs.Retainer/Square44x44Logo.targetsize-72.png new file mode 100644 index 0000000..0616592 Binary files /dev/null and b/data/icons/windows/retainerdevs.Retainer/Square44x44Logo.targetsize-72.png differ diff --git a/data/icons/windows/retainerdevs.Retainer/Square44x44Logo.targetsize-72_altform-lightunplated.png b/data/icons/windows/retainerdevs.Retainer/Square44x44Logo.targetsize-72_altform-lightunplated.png new file mode 100644 index 0000000..0616592 Binary files /dev/null and b/data/icons/windows/retainerdevs.Retainer/Square44x44Logo.targetsize-72_altform-lightunplated.png differ diff --git a/data/icons/windows/retainerdevs.Retainer/Square44x44Logo.targetsize-72_altform-unplated.png b/data/icons/windows/retainerdevs.Retainer/Square44x44Logo.targetsize-72_altform-unplated.png new file mode 100644 index 0000000..0616592 Binary files /dev/null and b/data/icons/windows/retainerdevs.Retainer/Square44x44Logo.targetsize-72_altform-unplated.png differ diff --git a/data/icons/windows/retainerdevs.Retainer/Square44x44Logo.targetsize-80.png b/data/icons/windows/retainerdevs.Retainer/Square44x44Logo.targetsize-80.png new file mode 100644 index 0000000..c0c8276 Binary files /dev/null and b/data/icons/windows/retainerdevs.Retainer/Square44x44Logo.targetsize-80.png differ diff --git a/data/icons/windows/retainerdevs.Retainer/Square44x44Logo.targetsize-80_altform-lightunplated.png b/data/icons/windows/retainerdevs.Retainer/Square44x44Logo.targetsize-80_altform-lightunplated.png new file mode 100644 index 0000000..c0c8276 Binary files /dev/null and b/data/icons/windows/retainerdevs.Retainer/Square44x44Logo.targetsize-80_altform-lightunplated.png differ diff --git a/data/icons/windows/retainerdevs.Retainer/Square44x44Logo.targetsize-80_altform-unplated.png b/data/icons/windows/retainerdevs.Retainer/Square44x44Logo.targetsize-80_altform-unplated.png new file mode 100644 index 0000000..c0c8276 Binary files /dev/null and b/data/icons/windows/retainerdevs.Retainer/Square44x44Logo.targetsize-80_altform-unplated.png differ diff --git a/data/icons/windows/retainerdevs.Retainer/Square44x44Logo.targetsize-96.png b/data/icons/windows/retainerdevs.Retainer/Square44x44Logo.targetsize-96.png new file mode 100644 index 0000000..bf010af Binary files /dev/null and b/data/icons/windows/retainerdevs.Retainer/Square44x44Logo.targetsize-96.png differ diff --git a/data/icons/windows/retainerdevs.Retainer/Square44x44Logo.targetsize-96_altform-lightunplated.png b/data/icons/windows/retainerdevs.Retainer/Square44x44Logo.targetsize-96_altform-lightunplated.png new file mode 100644 index 0000000..bf010af Binary files /dev/null and b/data/icons/windows/retainerdevs.Retainer/Square44x44Logo.targetsize-96_altform-lightunplated.png differ diff --git a/data/icons/windows/retainerdevs.Retainer/Square44x44Logo.targetsize-96_altform-unplated.png b/data/icons/windows/retainerdevs.Retainer/Square44x44Logo.targetsize-96_altform-unplated.png new file mode 100644 index 0000000..bf010af Binary files /dev/null and b/data/icons/windows/retainerdevs.Retainer/Square44x44Logo.targetsize-96_altform-unplated.png differ diff --git a/data/icons/windows/retainerdevs.Retainer/StoreLogo.scale-100.png b/data/icons/windows/retainerdevs.Retainer/StoreLogo.scale-100.png new file mode 100644 index 0000000..ded4caf Binary files /dev/null and b/data/icons/windows/retainerdevs.Retainer/StoreLogo.scale-100.png differ diff --git a/data/icons/windows/retainerdevs.Retainer/StoreLogo.scale-125.png b/data/icons/windows/retainerdevs.Retainer/StoreLogo.scale-125.png new file mode 100644 index 0000000..1dd169d Binary files /dev/null and b/data/icons/windows/retainerdevs.Retainer/StoreLogo.scale-125.png differ diff --git a/data/icons/windows/retainerdevs.Retainer/StoreLogo.scale-150.png b/data/icons/windows/retainerdevs.Retainer/StoreLogo.scale-150.png new file mode 100644 index 0000000..415812d Binary files /dev/null and b/data/icons/windows/retainerdevs.Retainer/StoreLogo.scale-150.png differ diff --git a/data/icons/windows/retainerdevs.Retainer/StoreLogo.scale-200.png b/data/icons/windows/retainerdevs.Retainer/StoreLogo.scale-200.png new file mode 100644 index 0000000..c9fa8ba Binary files /dev/null and b/data/icons/windows/retainerdevs.Retainer/StoreLogo.scale-200.png differ diff --git a/data/icons/windows/retainerdevs.Retainer/StoreLogo.scale-400.png b/data/icons/windows/retainerdevs.Retainer/StoreLogo.scale-400.png new file mode 100644 index 0000000..3ddace2 Binary files /dev/null and b/data/icons/windows/retainerdevs.Retainer/StoreLogo.scale-400.png differ diff --git a/data/icons/windows/retainerdevs.Retainer/Wide310x150Logo.scale-100.png b/data/icons/windows/retainerdevs.Retainer/Wide310x150Logo.scale-100.png new file mode 100644 index 0000000..cbe1a5e Binary files /dev/null and b/data/icons/windows/retainerdevs.Retainer/Wide310x150Logo.scale-100.png differ diff --git a/data/icons/windows/retainerdevs.Retainer/Wide310x150Logo.scale-125.png b/data/icons/windows/retainerdevs.Retainer/Wide310x150Logo.scale-125.png new file mode 100644 index 0000000..bff1c70 Binary files /dev/null and b/data/icons/windows/retainerdevs.Retainer/Wide310x150Logo.scale-125.png differ diff --git a/data/icons/windows/retainerdevs.Retainer/Wide310x150Logo.scale-150.png b/data/icons/windows/retainerdevs.Retainer/Wide310x150Logo.scale-150.png new file mode 100644 index 0000000..7ab5abb Binary files /dev/null and b/data/icons/windows/retainerdevs.Retainer/Wide310x150Logo.scale-150.png differ diff --git a/data/icons/windows/retainerdevs.Retainer/Wide310x150Logo.scale-200.png b/data/icons/windows/retainerdevs.Retainer/Wide310x150Logo.scale-200.png new file mode 100644 index 0000000..b134814 Binary files /dev/null and b/data/icons/windows/retainerdevs.Retainer/Wide310x150Logo.scale-200.png differ diff --git a/data/icons/windows/retainerdevs.Retainer/Wide310x150Logo.scale-400.png b/data/icons/windows/retainerdevs.Retainer/Wide310x150Logo.scale-400.png new file mode 100644 index 0000000..18a71a3 Binary files /dev/null and b/data/icons/windows/retainerdevs.Retainer/Wide310x150Logo.scale-400.png differ diff --git a/data/io.github.remindersdevs.Reminders.gschema.xml.in b/data/io.github.retainerdevs.Retainer.gschema.xml.in similarity index 80% rename from data/io.github.remindersdevs.Reminders.gschema.xml.in rename to data/io.github.retainerdevs.Retainer.gschema.xml.in index 58d25e7..0dd49a5 100644 --- a/data/io.github.remindersdevs.Reminders.gschema.xml.in +++ b/data/io.github.retainerdevs.Retainer.gschema.xml.in @@ -1,34 +1,34 @@ - - + + - + - + - - + + 'locale' Time format What format to display the time in - + 'time' Sort by How to sort the reminders - + '15m' Auto refresh frequency How often the reminders are refreshed (minutes) @@ -72,6 +72,11 @@ Selected list list ids can be 'all', 'local', or an actual id + + '' + Selected list + list ids can be 'all', 'local', or an actual id + [] [DEPRECATED] Task lists that should be synced diff --git a/data/io.github.remindersdevs.Reminders.metainfo.xml.in.in b/data/io.github.retainerdevs.Retainer.metainfo.xml.in.in similarity index 95% rename from data/io.github.remindersdevs.Reminders.metainfo.xml.in.in rename to data/io.github.retainerdevs.Retainer.metainfo.xml.in.in index d2028b3..785fd05 100644 --- a/data/io.github.remindersdevs.Reminders.metainfo.xml.in.in +++ b/data/io.github.retainerdevs.Retainer.metainfo.xml.in.in @@ -3,13 +3,13 @@ - Reminders Developers + Retainer Developers dgsasha04_at_gmail.com - Reminders - Set reminders and manage tasks + Retainer + Set reminders and manage tasks - +

What you can do with Reminders:

  • Set recurring reminders
    • @@ -62,8 +62,8 @@ Time Management Reminder - Remembrance Reminders + Retainer @@ -75,15 +75,16 @@ - @APP_EXECUTABLE@ + @PROJECT_NAME@ https://hosted.weblate.org/engage/reminders https://github.com/dgsasha/remembrance https://github.com/dgsasha/remembrance/issues - +
      +
    • Windows port
    • UI improvements
    • Added support for making the week start on sunday
    • Added indicators that show how many incomplete reminders are in each list/group
      • diff --git a/data/meson.build b/data/meson.build index ef7aaee..80003cb 100644 --- a/data/meson.build +++ b/data/meson.build @@ -1,36 +1,35 @@ -conf = configuration_data() -conf.set('APP_EXECUTABLE', app_executable) -conf.set('APP_ID', app_id) -conf.set('SERVICE_ID', service_id) +if not on_windows + appstream_file = configure_file( + input: 'io.github.retainerdevs.Retainer.metainfo.xml.in.in', + output: '@0@.metainfo.xml.in'.format(app_id), + configuration: conf, + ) -appstream_file = configure_file( - input: 'io.github.remindersdevs.Reminders.metainfo.xml.in.in', - output: '@0@.metainfo.xml.in'.format(app_id), - configuration: conf, -) + appstream = i18n.merge_file( + input: appstream_file, + output: '@0@.metainfo.xml'.format(app_id), + po_dir: '../../po', + install: true, + install_dir: join_paths(get_option('datadir'), 'metainfo') + ) -appstream = i18n.merge_file( - input: appstream_file, - output: '@0@.metainfo.xml'.format(app_id), - po_dir: '../../po', - install: true, - install_dir: join_paths(get_option('datadir'), 'metainfo') -) + appstreamcli = find_program('appstreamcli', required: false) + if appstreamcli.found() + test( + 'Validate appstream file', + appstreamcli, + args: ['validate', '--no-net', appstream] + ) + endif -appstreamcli = find_program('appstreamcli', required: false) -if appstreamcli.found() - test( - 'Validate appstream file', - appstreamcli, - args: ['validate', '--no-net', appstream] - ) + subdir('browser') endif configure_file( - input: 'io.github.remindersdevs.Reminders.gschema.xml.in', - output: '@0@..gschema.xml'.format(app_id), + input: 'io.github.retainerdevs.Retainer.gschema.xml.in', + output: '@0@.gschema.xml'.format(app_id), install: true, - install_dir: join_paths(get_option('datadir'), 'glib-2.0/schemas'), + install_dir: join_paths(get_option('datadir'), 'glib-2.0' / 'schemas'), configuration: conf, ) @@ -43,6 +42,5 @@ if compile_schemas.found() ) endif -subdir('service') -subdir('browser') subdir('icons') +subdir('service') diff --git a/data/service/io.github.remindersdevs.Reminders.Service.service.in b/data/service/io.github.remindersdevs.Reminders.Service.service.in deleted file mode 100644 index fe52706..0000000 --- a/data/service/io.github.remindersdevs.Reminders.Service.service.in +++ /dev/null @@ -1,3 +0,0 @@ -[D-BUS Service] -Name=@SERVICE_ID@ -Exec=@LIBEXECDIR@/@SERVICE_EXECUTABLE@ diff --git a/data/service/io.github.remindersdevs.Reminders.Service.desktop.in.in b/data/service/io.github.retainerdevs.Retainer.Service.desktop.in.in similarity index 57% rename from data/service/io.github.remindersdevs.Reminders.Service.desktop.in.in rename to data/service/io.github.retainerdevs.Retainer.Service.desktop.in.in index dd57d3f..a7ac20b 100644 --- a/data/service/io.github.remindersdevs.Reminders.Service.desktop.in.in +++ b/data/service/io.github.retainerdevs.Retainer.Service.desktop.in.in @@ -1,7 +1,8 @@ [Desktop Entry] Type=Application -Name=Remembrance Service -Exec=@LIBEXECDIR@/@SERVICE_EXECUTABLE@ +Name=Retainer Service +Comment=DBus service for managing reminders and tasks +Exec=@SERVICE_EXEC@ Icon=@APP_ID@ Terminal=false NoDisplay=true diff --git a/data/service/io.github.retainerdevs.Retainer.Service.service.in b/data/service/io.github.retainerdevs.Retainer.Service.service.in new file mode 100644 index 0000000..5089f49 --- /dev/null +++ b/data/service/io.github.retainerdevs.Retainer.Service.service.in @@ -0,0 +1,3 @@ +[D-BUS Service] +Name=@SERVICE_ID@ +Exec=@SERVICE_EXEC@ diff --git a/data/service/io.github.remindersdevs.Reminders.Service.xml.in b/data/service/io.github.retainerdevs.Retainer.Service.xml.in similarity index 81% rename from data/service/io.github.remindersdevs.Reminders.Service.xml.in rename to data/service/io.github.retainerdevs.Retainer.Service.xml.in index b9f2b96..0a6d241 100644 --- a/data/service/io.github.remindersdevs.Reminders.Service.xml.in +++ b/data/service/io.github.retainerdevs.Retainer.Service.xml.in @@ -1,20 +1,12 @@ - + @@ -64,19 +56,19 @@ - + - + - - + + @@ -86,15 +78,15 @@ - + - - + + @@ -118,8 +110,8 @@ + - @@ -155,8 +147,8 @@ - - + + @@ -166,8 +158,8 @@ - - + + diff --git a/data/service/meson.build b/data/service/meson.build index 56625e1..a11c7f5 100644 --- a/data/service/meson.build +++ b/data/service/meson.build @@ -1,56 +1,50 @@ -conf = configuration_data() -conf.set('SERVICE_EXECUTABLE', service_executable) -conf.set('SERVICE_ID', service_id) -conf.set('SERVICE_INTERFACE', service_interface) -conf.set('VERSION', meson.project_version()) -conf.set('APP_ID', app_id) -conf.set('LIBEXECDIR', get_option('prefix') / get_option('libexecdir')) +if not on_windows + desktop_file = configure_file( + input: 'io.github.retainerdevs.Retainer.Service.desktop.in.in', + output: '@0@.desktop.in'.format(service_id), + configuration: conf, + ) -desktop_file = configure_file( - input: 'io.github.remindersdevs.Reminders.Service.desktop.in.in', - output: '@0@.desktop.in'.format(service_id), - configuration: conf, -) + desktop = i18n.merge_file( + input: desktop_file, + output: '@0@.desktop'.format(service_id), + type: 'desktop', + po_dir: '../../po', + install: true, + install_dir: get_option('sysconfdir') / 'xdg' / 'autostart', + ) -desktop = i18n.merge_file( - input: desktop_file, - output: '@0@.desktop'.format(service_id), - type: 'desktop', - po_dir: '../../po', - install: true, - install_dir: get_option('sysconfdir') / 'xdg/autostart', -) + meson.add_install_script( + 'cp', + get_option('prefix') / get_option('sysconfdir') / 'xdg' / 'autostart' / '@0@.desktop'.format(service_id), + get_option('prefix') / get_option('datadir') / 'applications' + ) -meson.add_install_script( - 'cp', - get_option('prefix') / get_option('sysconfdir') / 'xdg/autostart' / '@0@.desktop'.format(service_id), - get_option('prefix') / get_option('datadir') / 'applications' -) + desktop_utils = find_program('desktop-file-validate', required: false) + if desktop_utils.found() + test('Validate desktop file', desktop_utils, + args: [desktop] + ) + endif -desktop_utils = find_program('desktop-file-validate', required: false) -if desktop_utils.found() - test('Validate desktop file', desktop_utils, - args: [desktop] + install_data( + 'notification.ogg', + install_dir: get_option('datadir') / 'sounds' / meson.project_name(), ) -endif -configure_file( - input: 'io.github.remindersdevs.Reminders.Service.service.in', - output: '@0@.service'.format(service_id), - install: true, - install_dir: get_option('datadir') / 'dbus-1/services', - configuration: conf, -) - -install_data( - 'notification.ogg', - install_dir: get_option('datadir') / 'sounds' / app_executable, -) + configure_file( + input: 'io.github.retainerdevs.Retainer.Service.service.in', + output: '@0@.service'.format(service_id), + install: true, + install_dir: get_option('datadir') / 'dbus-1' / 'services', + configuration: conf, + ) +endif configure_file( - input: 'io.github.remindersdevs.Reminders.Service.xml.in', + input: 'io.github.retainerdevs.Retainer.Service.xml.in', output: '@0@.xml'.format(service_interface), install: true, - install_dir: get_option('datadir') / 'dbus-1/interfaces', + install_dir: get_option('prefix') / get_option('datadir') / meson.project_name(), configuration: conf, ) diff --git a/flatpak/io.github.remindersdevs.Reminders.yml b/flatpak/io.github.retainerdevs.Retainer.Devel.yml similarity index 92% rename from flatpak/io.github.remindersdevs.Reminders.yml rename to flatpak/io.github.retainerdevs.Retainer.Devel.yml index d398e05..168e70b 100644 --- a/flatpak/io.github.remindersdevs.Reminders.yml +++ b/flatpak/io.github.retainerdevs.Retainer.Devel.yml @@ -1,8 +1,8 @@ -app-id: io.github.remindersdevs.Reminders.Devel +app-id: io.github.retainerdevs.Retainer.Devel runtime: org.gnome.Platform runtime-version: '44' sdk: org.gnome.Sdk -command: reminders +command: retainer finish-args: - --share=network @@ -45,12 +45,12 @@ modules: url: http://people.freedesktop.org/~mccann/dist/sound-theme-freedesktop-0.8.tar.bz2 sha256: cb518b20eef05ec2e82dda1fa89a292c1760dc023aba91b8aa69bafac85e8a14 - - name: reminders + - name: retainer builddir: true buildsystem: meson config-opts: - -Denable-portals=true - - -Drelease-type=devel + - -Drelease-type=Devel sources: - type: dir path: '../' diff --git a/flatpak/io.github.retainerdevs.Retainer.yml b/flatpak/io.github.retainerdevs.Retainer.yml new file mode 100644 index 0000000..572b202 --- /dev/null +++ b/flatpak/io.github.retainerdevs.Retainer.yml @@ -0,0 +1,56 @@ +app-id: io.github.retainerdevs.Retainer +runtime: org.gnome.Platform +runtime-version: '44' +sdk: org.gnome.Sdk +command: retainer + +finish-args: + - --share=network + - --share=ipc + - --device=dri + - --socket=wayland + - --socket=fallback-x11 + - --system-talk-name=org.freedesktop.login1 + - --talk-name=org.freedesktop.secrets + - --socket=pulseaudio + +modules: + - shared-modules/intltool/intltool-0.51.json + - shared-modules/libcanberra/libcanberra.json + - python3-modules.json + + - name: libportal + buildsystem: meson + config-opts: + - -Ddocs=false + - -Dbackends=gtk4 + sources: + - type: archive + url: https://github.com/flatpak/libportal/archive/refs/tags/0.6.tar.gz + sha256: 8ad326c4f53b7433645dc86d994fef0292bee8adda0fe67db9288ace19250a9c + + - name: gsound + buildsystem: meson + config-opts: + - -Denable_vala=false + sources: + - type: archive + url: https://gitlab.gnome.org/GNOME/gsound/-/archive/1.0.3/gsound-1.0.3.tar.gz + sha256: ebee33c77f43bcae87406c20e051acaff08e86f8960c35b92911e243fddc7a0b + + - name: sound-theme-freedesktop + sources: + - type: archive + url: http://people.freedesktop.org/~mccann/dist/sound-theme-freedesktop-0.8.tar.bz2 + sha256: cb518b20eef05ec2e82dda1fa89a292c1760dc023aba91b8aa69bafac85e8a14 + + - name: retainer + builddir: true + buildsystem: meson + config-opts: + - -Denable-portals=true + - -Drelease-type=Release + sources: + - type: dir + path: '../' + diff --git a/flatpak/python3-modules.json b/flatpak/python3-modules.json index 0827812..cd4f640 100644 --- a/flatpak/python3-modules.json +++ b/flatpak/python3-modules.json @@ -146,4 +146,4 @@ "sha256": "e438b27b96635f5f712a4fb5dda4c82597a53a412fe834c9fe8409fddb3fc2b1" } ] -} +} \ No newline at end of file diff --git a/flatpak/requirements.in b/flatpak/requirements.in index d5e5f11..12e71d4 100644 --- a/flatpak/requirements.in +++ b/flatpak/requirements.in @@ -2,3 +2,4 @@ msal==1.22.0 requests==2.28.2 caldav==1.2.1 setuptools==67.7.2 +keyring==23.13.1 diff --git a/flatpak/requirements.txt b/flatpak/requirements.txt index e687f84..91bb5d9 100644 --- a/flatpak/requirements.txt +++ b/flatpak/requirements.txt @@ -65,4 +65,4 @@ x-wr-timezone==0.0.5 # via recurring-ical-events # The following packages are considered to be unsafe in a requirements file: -# setuptools +# setuptools \ No newline at end of file diff --git a/io.github.retainerdevs.Retainer.png b/io.github.retainerdevs.Retainer.png new file mode 100644 index 0000000..301b7f8 Binary files /dev/null and b/io.github.retainerdevs.Retainer.png differ diff --git a/meson.build b/meson.build index 84a7b9c..100744d 100644 --- a/meson.build +++ b/meson.build @@ -1,30 +1,40 @@ project( - 'reminders', + 'retainer', version: '5.0', - meson_version: '>= 0.59', - default_options: ['prefix=/usr'] + meson_version: '>= 0.59' +) + +host_os = host_machine.system().to_lower() + +on_windows = ( + host_os.contains('mingw') or + host_os.contains('cygwin') or + host_os.contains('windows') ) dependency('glib-2.0') dependency('pygobject-3.0') -dependency('libadwaita-1') +dependency('libadwaita-1', version: '>=1.2') +dependency('gtk4',version: '>=4.10') + +if not on_windows + dependency('gsound') + dependency('libsecret-1') + dependency('webkitgtk-6.0') +endif release_type = get_option('release-type') -app_executable = meson.project_name() +app_file = meson.project_name() +app_executable = on_windows ? app_file + '.exe' : app_file -base_app_id = 'io.github.remindersdevs.Reminders' -beta_app_id = base_app_id + '.Beta' +base_app_id = 'io.github.retainerdevs.Retainer' devel_app_id = base_app_id + '.Devel' -base_path = '/io/github/remindersdevs/Reminders' -beta_path = base_path + '/Beta' +base_path = '/io/github/retainerdevs/Retainer' devel_path = base_path + '/Devel' -if release_type == 'beta' - app_id = beta_app_id - path = beta_path -elif release_type == 'devel' +if release_type == 'Devel' app_id = devel_app_id path = devel_path else @@ -32,22 +42,48 @@ else path = base_path endif -service_executable = app_executable + '-service' +service_file = app_file + '-service' +service_executable = on_windows ? service_file + '.exe' : service_file service_id = app_id + '.Service' service_interface = service_id service_object = path + '/Service' i18n = import('i18n') -localedir = get_option('localedir') -gnome = import('gnome') python = import('python').find_installation('python3') +gnome = import('gnome') + +data_dir = on_windows ? 'share' : get_option('prefix') / get_option('datadir') + +exec = on_windows ? app_executable : get_option('prefix') / get_option('bindir') / app_executable +service_exec = on_windows ? service_executable : get_option('prefix') / get_option('bindir') / service_executable +conf = configuration_data() +conf.set('VERSION', meson.project_version()) +conf.set('APP_EXECUTABLE', app_executable) +conf.set('BASE_APP_ID', base_app_id) +conf.set('APP_ID', app_id) +conf.set('PROJECT_NAME', meson.project_name()) +conf.set('APP_OBJECT', path) +conf.set('SERVICE_ID', service_id) +conf.set('SERVICE_INTERFACE', service_interface) +conf.set('SERVICE_EXECUTABLE', service_executable) +conf.set('SERVICE_OBJECT', service_object) +conf.set('CLIENT_ID', get_option('client-id')) +conf.set('PYTHON_PATH', python.full_path()) +conf.set('DATA_DIR', data_dir) +conf.set('LOCALE_DIR', data_dir / 'locale') +conf.set('SERVICE_EXEC', service_exec) +conf.set('EXEC', exec) +conf.set('ON_WINDOWS', on_windows ? 'True' : 'False') +conf.set('PORTALS_ENABLED', get_option('enable-portals') ? 'True' : 'False') + subdir('po') subdir('data') subdir('src') +subdir('windows') gnome.post_install( glib_compile_schemas: true, gtk_update_icon_cache: true, - update_desktop_database: true, + update_desktop_database: not on_windows ) diff --git a/meson_options.txt b/meson_options.txt index 565bf00..1996573 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -1,3 +1,3 @@ -option('enable-portals', type: 'boolean', value: 'false', description: 'enable libportal, used by the flatpak') -option('release-type', type : 'combo', choices: ['stable', 'beta', 'devel'], value : 'stable') -option('client-id', type : 'string', value : '75c0b88f-6c54-4679-b6bd-18ed15e7dedf') +option('enable-portals', type: 'boolean', value: false, description: 'enable libportal, used by the flatpak') +option('release-type', type : 'combo', choices: ['Release', 'Devel'], value : 'Release') +option('client-id', type : 'string', value : 'fcf7f104-7e7f-4a52-9803-f901b907aaa0') diff --git a/po/POTFILES b/po/POTFILES index cd92b0d..aaca810 100644 --- a/po/POTFILES +++ b/po/POTFILES @@ -1,9 +1,9 @@ # List of source files containing translatable strings. # Please keep this file sorted alphabetically. -data/browser/io.github.dgsasha.Remembrance.desktop.in.in -data/service/io.github.dgsasha.Remembrance.Service3.desktop.in.in -data/io.github.dgsasha.Remembrance.gschema.xml.in -data/io.github.dgsasha.Remembrance.metainfo.xml.in.in +data/browser/io.github.retainerdevs.Retainer.desktop.in.in +data/service/io.github.retainerdevs.Retainer.Service.desktop.in.in +data/io.github.retainerdevs.Retainer.gschema.xml.in +data/io.github.retainerdevs.Retainer.metainfo.xml.in.in src/browser/resources/ui/caldav_sign_in.ui src/browser/resources/ui/edit_lists_window.ui src/browser/resources/ui/error_dialog.ui @@ -15,7 +15,7 @@ src/browser/resources/ui/move_reminders_window.ui src/browser/resources/ui/preferences.ui src/browser/resources/ui/preferences_user_row.ui src/browser/resources/ui/reminder.ui -src/browser/resources/ui/reminder_edit_window.ui +src/browser/resources/ui/reminder_edit_page.ui src/browser/resources/ui/shortcuts_window.ui src/browser/about.py src/browser/application.py @@ -24,6 +24,7 @@ src/browser/main_window.py src/browser/move_reminders_window.py src/browser/preferences.py src/browser/reminder.py -src/browser/reminder_edit_window.py +src/browser/reminder_edit_page.py src/info.py src/service/backend.py +src/service/ms_to_do.py diff --git a/po/meson.build b/po/meson.build index 01448a9..1b97fc0 100644 --- a/po/meson.build +++ b/po/meson.build @@ -1 +1 @@ -i18n.gettext(meson.project_name()) \ No newline at end of file +i18n.gettext(meson.project_name()) diff --git a/po/remembrance.pot b/po/remembrance.pot deleted file mode 100644 index 5132959..0000000 --- a/po/remembrance.pot +++ /dev/null @@ -1,1245 +0,0 @@ -# SOME DESCRIPTIVE TITLE. -# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER -# This file is distributed under the same license as the remembrance package. -# FIRST AUTHOR , YEAR. -# -#, fuzzy -msgid "" -msgstr "" -"Project-Id-Version: remembrance\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-05-02 16:55-0400\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME \n" -"Language-Team: LANGUAGE \n" -"Language: \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=CHARSET\n" -"Content-Transfer-Encoding: 8bit\n" - -#: data/browser/io.github.dgsasha.Remembrance.desktop.in.in:4 -#: data/io.github.dgsasha.Remembrance.metainfo.xml.in.in:9 -#: data/io.github.dgsasha.Remembrance.metainfo.xml.in.in:66 src/info.py:8 -msgid "Reminders" -msgstr "" - -#: data/browser/io.github.dgsasha.Remembrance.desktop.in.in:5 -msgid "Set reminders for yourself" -msgstr "" - -#: data/browser/io.github.dgsasha.Remembrance.desktop.in.in:13 -msgid "" -"Todo;Productivity;Task;Planning;Planner;Time;Management;Reminder;Remembrance;" -"Reminders;" -msgstr "" - -#: data/service/io.github.dgsasha.Remembrance.Service3.desktop.in.in:4 -msgid "Remembrance Service" -msgstr "" - -#: data/io.github.dgsasha.Remembrance.gschema.xml.in:23 -#: src/browser/resources/ui/preferences.ui:113 -msgid "Time format" -msgstr "" - -#: data/io.github.dgsasha.Remembrance.gschema.xml.in:24 -msgid "What format to display the time in" -msgstr "" - -#: data/io.github.dgsasha.Remembrance.gschema.xml.in:28 -#: src/browser/resources/ui/main_window.ui:62 -msgid "Sort by" -msgstr "" - -#: data/io.github.dgsasha.Remembrance.gschema.xml.in:29 -msgid "How to sort the reminders" -msgstr "" - -#: data/io.github.dgsasha.Remembrance.gschema.xml.in:33 -#: src/browser/resources/ui/preferences.ui:94 -msgid "Auto refresh frequency" -msgstr "" - -#: data/io.github.dgsasha.Remembrance.gschema.xml.in:34 -msgid "How often the reminders are refreshed (minutes)" -msgstr "" - -#: data/io.github.dgsasha.Remembrance.gschema.xml.in:38 -msgid "Notification Sound" -msgstr "" - -#: data/io.github.dgsasha.Remembrance.gschema.xml.in:39 -msgid "Whether or not to play a notification sound" -msgstr "" - -#: data/io.github.dgsasha.Remembrance.gschema.xml.in:43 -msgid "Use included notification sound" -msgstr "" - -#: data/io.github.dgsasha.Remembrance.gschema.xml.in:44 -msgid "Whether to use the included notification sound" -msgstr "" - -#: data/io.github.dgsasha.Remembrance.gschema.xml.in:48 -msgid "Descending sort" -msgstr "" - -#: data/io.github.dgsasha.Remembrance.gschema.xml.in:49 -msgid "If reminders sort should be descending" -msgstr "" - -#: data/io.github.dgsasha.Remembrance.gschema.xml.in:53 -msgid "Week starts on sunday" -msgstr "" - -#: data/io.github.dgsasha.Remembrance.gschema.xml.in:54 -msgid "If week should start on sunday" -msgstr "" - -#: data/io.github.dgsasha.Remembrance.gschema.xml.in:67 -msgid "Remote lists that should be synced" -msgstr "" - -#: data/io.github.dgsasha.Remembrance.gschema.xml.in:68 -msgid "" -"Add a user id if you want to sync all of the lists on a user, or any list id " -"on the user" -msgstr "" - -#: data/io.github.dgsasha.Remembrance.gschema.xml.in:72 -msgid "Selected list" -msgstr "" - -#: data/io.github.dgsasha.Remembrance.gschema.xml.in:73 -msgid "list ids can be 'all', 'local', or an actual id" -msgstr "" - -#: data/io.github.dgsasha.Remembrance.gschema.xml.in:77 -msgid "[DEPRECATED] Task lists that should be synced" -msgstr "" - -#: data/io.github.dgsasha.Remembrance.gschema.xml.in:78 -msgid "" -"{user_id: [task_list_ids]}, task_list_ids can be 'all' or an array of ids" -msgstr "" - -#: data/io.github.dgsasha.Remembrance.gschema.xml.in:82 -msgid "[DEPRECATED] Task lists that should be visible" -msgstr "" - -#: data/io.github.dgsasha.Remembrance.gschema.xml.in:83 -msgid "(user_id, task_id) ids can be 'all', 'local', or an actual id" -msgstr "" - -#: data/io.github.dgsasha.Remembrance.metainfo.xml.in.in:10 -msgid "Set reminders and manage tasks" -msgstr "" - -#: data/io.github.dgsasha.Remembrance.metainfo.xml.in.in:13 -msgid "What you can do with Reminders:" -msgstr "" - -#: data/io.github.dgsasha.Remembrance.metainfo.xml.in.in:15 -msgid "Set recurring reminders" -msgstr "" - -#: data/io.github.dgsasha.Remembrance.metainfo.xml.in.in:16 -msgid "Schedule notifications" -msgstr "" - -#: data/io.github.dgsasha.Remembrance.metainfo.xml.in.in:17 -msgid "Sort, filter, and search for reminders" -msgstr "" - -#: data/io.github.dgsasha.Remembrance.metainfo.xml.in.in:18 -msgid "Mark reminders as important or complete" -msgstr "" - -#: data/io.github.dgsasha.Remembrance.metainfo.xml.in.in:19 -msgid "Organize reminders using lists" -msgstr "" - -#: data/io.github.dgsasha.Remembrance.metainfo.xml.in.in:20 -msgid "Optionally play a sound when notifications are sent" -msgstr "" - -#: data/io.github.dgsasha.Remembrance.metainfo.xml.in.in:21 -msgid "Optionally sync with Microsoft To Do" -msgstr "" - -#: data/io.github.dgsasha.Remembrance.metainfo.xml.in.in:22 -msgid "Optionally sync with CalDAV servers" -msgstr "" - -#: data/io.github.dgsasha.Remembrance.metainfo.xml.in.in:23 -msgid "Import and export ical/ics files" -msgstr "" - -#: data/io.github.dgsasha.Remembrance.metainfo.xml.in.in:57 -msgid "Todo" -msgstr "" - -#: data/io.github.dgsasha.Remembrance.metainfo.xml.in.in:58 -msgid "Productivity" -msgstr "" - -#: data/io.github.dgsasha.Remembrance.metainfo.xml.in.in:59 -msgid "Task" -msgstr "" - -#: data/io.github.dgsasha.Remembrance.metainfo.xml.in.in:60 -msgid "Planning" -msgstr "" - -#: data/io.github.dgsasha.Remembrance.metainfo.xml.in.in:61 -msgid "Planner" -msgstr "" - -#: data/io.github.dgsasha.Remembrance.metainfo.xml.in.in:62 -#: src/browser/resources/ui/reminder_edit_window.ui:87 -msgid "Time" -msgstr "" - -#: data/io.github.dgsasha.Remembrance.metainfo.xml.in.in:63 -msgid "Management" -msgstr "" - -#: data/io.github.dgsasha.Remembrance.metainfo.xml.in.in:64 -msgid "Reminder" -msgstr "" - -#: data/io.github.dgsasha.Remembrance.metainfo.xml.in.in:65 -msgid "Remembrance" -msgstr "" - -#: data/io.github.dgsasha.Remembrance.metainfo.xml.in.in:87 -msgid "UI improvements" -msgstr "" - -#: data/io.github.dgsasha.Remembrance.metainfo.xml.in.in:88 -msgid "Added support for making the week start on sunday" -msgstr "" - -#: data/io.github.dgsasha.Remembrance.metainfo.xml.in.in:89 -msgid "" -"Added indicators that show how many incomplete reminders are in each list/" -"group" -msgstr "" - -#: data/io.github.dgsasha.Remembrance.metainfo.xml.in.in:90 -msgid "Added support for syncing with CalDAV servers" -msgstr "" - -#: data/io.github.dgsasha.Remembrance.metainfo.xml.in.in:91 -msgid "" -"Added support for selecting multiple reminders in one click by holding shift" -msgstr "" - -#: data/io.github.dgsasha.Remembrance.metainfo.xml.in.in:92 -msgid "Added support for dragging and dropping reminders between lists" -msgstr "" - -#: data/io.github.dgsasha.Remembrance.metainfo.xml.in.in:93 -msgid "Added support for importing and exporting ical/ics files" -msgstr "" - -#: data/io.github.dgsasha.Remembrance.metainfo.xml.in.in:94 -msgid "Added more multithreading to significantly speed up certain operations" -msgstr "" - -#: data/io.github.dgsasha.Remembrance.metainfo.xml.in.in:95 -msgid "Added support for syncing recurring reminders with Microsoft To Do" -msgstr "" - -#: data/io.github.dgsasha.Remembrance.metainfo.xml.in.in:96 -msgid "Added support for creating monthly and yearly repeating reminders" -msgstr "" - -#: data/io.github.dgsasha.Remembrance.metainfo.xml.in.in:97 -msgid "" -"Version numbers are now handled in a logical way (as in they aren't just " -"doubles)" -msgstr "" - -#: data/io.github.dgsasha.Remembrance.metainfo.xml.in.in:98 -msgid "" -"Microsoft sign in window now appears in the app instead of in the browser" -msgstr "" - -#: data/io.github.dgsasha.Remembrance.metainfo.xml.in.in:99 -msgid "Significantly improve how recurring reminders function" -msgstr "" - -#: data/io.github.dgsasha.Remembrance.metainfo.xml.in.in:100 -msgid "Fix date/time text wrapping awkwardly" -msgstr "" - -#: data/io.github.dgsasha.Remembrance.metainfo.xml.in.in:101 -msgid "Improvements to handling of network errors" -msgstr "" - -#: data/io.github.dgsasha.Remembrance.metainfo.xml.in.in:102 -msgid "Fix some other minor issues" -msgstr "" - -#: data/io.github.dgsasha.Remembrance.metainfo.xml.in.in:103 -#: data/io.github.dgsasha.Remembrance.metainfo.xml.in.in:207 -msgid "Bump API version" -msgstr "" - -#: data/io.github.dgsasha.Remembrance.metainfo.xml.in.in:110 -msgid "Fix versioning by bumping to 4.0" -msgstr "" - -#: data/io.github.dgsasha.Remembrance.metainfo.xml.in.in:117 -msgid "Remove warning about cloud syncing being in beta" -msgstr "" - -#: data/io.github.dgsasha.Remembrance.metainfo.xml.in.in:118 -msgid "Fix issue where you could make reminder recurring when it shouldn't be" -msgstr "" - -#: data/io.github.dgsasha.Remembrance.metainfo.xml.in.in:125 -msgid "Change delete icon" -msgstr "" - -#: data/io.github.dgsasha.Remembrance.metainfo.xml.in.in:126 -msgid "Fix some ui bugs" -msgstr "" - -#: data/io.github.dgsasha.Remembrance.metainfo.xml.in.in:127 -msgid "Some tiny performance improvements" -msgstr "" - -#: data/io.github.dgsasha.Remembrance.metainfo.xml.in.in:128 -msgid "Improve logging" -msgstr "" - -#: data/io.github.dgsasha.Remembrance.metainfo.xml.in.in:135 -msgid "UI Improvements to sidebar" -msgstr "" - -#: data/io.github.dgsasha.Remembrance.metainfo.xml.in.in:136 -msgid "Fix issues when moving reminders between lists" -msgstr "" - -#: data/io.github.dgsasha.Remembrance.metainfo.xml.in.in:137 -msgid "Fix issue with error dialogs" -msgstr "" - -#: data/io.github.dgsasha.Remembrance.metainfo.xml.in.in:144 -msgid "Fix issue when deleting lists" -msgstr "" - -#: data/io.github.dgsasha.Remembrance.metainfo.xml.in.in:151 -msgid "Fix issue when removing selected reminders" -msgstr "" - -#: data/io.github.dgsasha.Remembrance.metainfo.xml.in.in:158 -msgid "Performance improvements" -msgstr "" - -#: data/io.github.dgsasha.Remembrance.metainfo.xml.in.in:159 -msgid "Don't freeze UI when updating MS reminders" -msgstr "" - -#: data/io.github.dgsasha.Remembrance.metainfo.xml.in.in:160 -msgid "Automatically refresh reminders after waking from suspend" -msgstr "" - -#: data/io.github.dgsasha.Remembrance.metainfo.xml.in.in:161 -msgid "Fix issues with deleting lists" -msgstr "" - -#: data/io.github.dgsasha.Remembrance.metainfo.xml.in.in:162 -msgid "Fix issues when queueing remote changes while internet is disconnected" -msgstr "" - -#: data/io.github.dgsasha.Remembrance.metainfo.xml.in.in:169 -msgid "Stop showing completed reminders on upcoming page" -msgstr "" - -#: data/io.github.dgsasha.Remembrance.metainfo.xml.in.in:170 -msgid "Cross out completed reminders on all reminders page" -msgstr "" - -#: data/io.github.dgsasha.Remembrance.metainfo.xml.in.in:177 -msgid "Add support for setting due dates without sending notifications" -msgstr "" - -#: data/io.github.dgsasha.Remembrance.metainfo.xml.in.in:178 -msgid "" -"Add support for selecting and editing multiple reminders (Start selecting " -"with Ctrl + LMB or by pressing and holding a reminder)" -msgstr "" - -#: data/io.github.dgsasha.Remembrance.metainfo.xml.in.in:179 -msgid "Slightly improve error handling" -msgstr "" - -#: data/io.github.dgsasha.Remembrance.metainfo.xml.in.in:186 -msgid "Fix issue when setting reminders in another year" -msgstr "" - -#: data/io.github.dgsasha.Remembrance.metainfo.xml.in.in:193 -msgid "Fix issue when saving Microsoft To Do Reminders" -msgstr "" - -#: data/io.github.dgsasha.Remembrance.metainfo.xml.in.in:200 -msgid "New notification sound" -msgstr "" - -#: data/io.github.dgsasha.Remembrance.metainfo.xml.in.in:201 -msgid "Allow sorting reminders by created time and last updated time" -msgstr "" - -#: data/io.github.dgsasha.Remembrance.metainfo.xml.in.in:202 -msgid "Allow marking reminders as important" -msgstr "" - -#: data/io.github.dgsasha.Remembrance.metainfo.xml.in.in:203 -msgid "Slightly improved UI" -msgstr "" - -#: data/io.github.dgsasha.Remembrance.metainfo.xml.in.in:204 -msgid "Added keyboard shortcuts page" -msgstr "" - -#: data/io.github.dgsasha.Remembrance.metainfo.xml.in.in:205 -msgid "Added more keyboard shortcuts" -msgstr "" - -#: data/io.github.dgsasha.Remembrance.metainfo.xml.in.in:206 -msgid "Lots of bugfixes" -msgstr "" - -#: src/browser/resources/ui/caldav_sign_in.ui:23 -msgid "CalDAV Sync" -msgstr "" - -#: src/browser/resources/ui/caldav_sign_in.ui:47 -#: src/browser/resources/ui/preferences_user_row.ui:23 -msgid "Display Name" -msgstr "" - -#: src/browser/resources/ui/caldav_sign_in.ui:53 -msgid "Server URL" -msgstr "" - -#: src/browser/resources/ui/caldav_sign_in.ui:59 -msgid "Username" -msgstr "" - -#: src/browser/resources/ui/caldav_sign_in.ui:65 -msgid "Password" -msgstr "" - -#: src/browser/resources/ui/caldav_sign_in.ui:72 -msgid "Sign In" -msgstr "" - -#: src/browser/resources/ui/edit_lists_window.ui:20 -#: src/browser/resources/ui/main_window.ui:285 -msgid "Edit Lists" -msgstr "" - -#: src/browser/resources/ui/error_dialog.ui:48 -msgid "View Error" -msgstr "" - -#: src/browser/resources/ui/export_lists_window.ui:20 -msgid "Export Lists" -msgstr "" - -#: src/browser/resources/ui/export_lists_window.ui:78 -#: src/browser/resources/ui/import_lists_window.ui:92 -#: src/browser/resources/ui/main_window.ui:426 -#: src/browser/resources/ui/move_reminders_window.ui:78 -#: src/browser/resources/ui/reminder_edit_window.ui:490 -#: src/browser/edit_lists_window.py:96 src/browser/edit_lists_window.py:201 -#: src/browser/main_window.py:391 src/browser/main_window.py:1285 -#: src/browser/main_window.py:1300 src/browser/main_window.py:1319 -#: src/browser/main_window.py:1334 src/browser/main_window.py:1349 -#: src/browser/move_reminders_window.py:111 src/browser/preferences.py:274 -#: src/browser/reminder.py:412 -msgid "Cancel" -msgstr "" - -#: src/browser/resources/ui/export_lists_window.ui:93 -#: src/browser/resources/ui/shortcuts_window.ui:37 -msgid "Export" -msgstr "" - -#: src/browser/resources/ui/import_lists_window.ui:20 -msgid "Import Lists" -msgstr "" - -#: src/browser/resources/ui/import_lists_window.ui:56 -msgid "Import to specific list" -msgstr "" - -#: src/browser/resources/ui/import_lists_window.ui:57 -msgid "Otherwise new lists will be created" -msgstr "" - -#: src/browser/resources/ui/import_lists_window.ui:63 -msgid "Select a list" -msgstr "" - -#: src/browser/resources/ui/import_lists_window.ui:107 -#: src/browser/resources/ui/shortcuts_window.ui:43 -msgid "Import" -msgstr "" - -#: src/browser/resources/ui/main_window.ui:50 -msgid "Show sidebar" -msgstr "" - -#: src/browser/resources/ui/main_window.ui:61 -msgid "Sort direction" -msgstr "" - -#: src/browser/resources/ui/main_window.ui:75 -#: src/browser/resources/ui/shortcuts_window.ui:101 -msgid "Search" -msgstr "" - -#: src/browser/resources/ui/main_window.ui:83 -msgid "App menu" -msgstr "" - -#: src/browser/resources/ui/main_window.ui:126 -#: src/browser/resources/ui/main_window.ui:340 src/browser/main_window.py:1048 -msgid "All Reminders" -msgstr "" - -#: src/browser/resources/ui/main_window.ui:158 src/browser/main_window.py:1059 -msgid "Upcoming Reminders" -msgstr "" - -#: src/browser/resources/ui/main_window.ui:190 src/browser/main_window.py:1070 -msgid "Past Reminders" -msgstr "" - -#: src/browser/resources/ui/main_window.ui:222 src/browser/main_window.py:1081 -msgid "Completed Reminders" -msgstr "" - -#: src/browser/resources/ui/main_window.ui:448 src/browser/reminder.py:346 -msgid "Complete" -msgstr "" - -#: src/browser/resources/ui/main_window.ui:474 src/browser/reminder.py:342 -msgid "Incomplete" -msgstr "" - -#: src/browser/resources/ui/main_window.ui:500 -#: src/browser/resources/ui/reminder_edit_window.ui:66 -msgid "Important" -msgstr "" - -#: src/browser/resources/ui/main_window.ui:526 -msgid "Unimportant" -msgstr "" - -#: src/browser/resources/ui/main_window.ui:551 -#: src/browser/resources/ui/move_reminders_window.ui:93 -msgid "Move" -msgstr "" - -#: src/browser/resources/ui/main_window.ui:573 -#: src/browser/resources/ui/reminder.ui:100 -#: src/browser/edit_lists_window.py:202 src/browser/reminder.py:413 -msgid "Remove" -msgstr "" - -#: src/browser/resources/ui/main_window.ui:595 -#: src/browser/resources/ui/main_window.ui:603 -msgid "Add a reminder" -msgstr "" - -#: src/browser/resources/ui/main_window.ui:625 -msgid "_Refresh" -msgstr "" - -#: src/browser/resources/ui/main_window.ui:629 -msgid "_Export Lists" -msgstr "" - -#: src/browser/resources/ui/main_window.ui:633 -msgid "_Import Lists" -msgstr "" - -#: src/browser/resources/ui/main_window.ui:639 -msgid "_Preferences" -msgstr "" - -#: src/browser/resources/ui/main_window.ui:643 -msgid "_Keyboard Shortcuts" -msgstr "" - -#: src/browser/resources/ui/main_window.ui:647 -msgid "_About Reminders" -msgstr "" - -#: src/browser/resources/ui/main_window.ui:654 -msgid "Sort By" -msgstr "" - -#: src/browser/resources/ui/main_window.ui:656 -msgid "_Time" -msgstr "" - -#: src/browser/resources/ui/main_window.ui:661 -msgid "_Alphabetical" -msgstr "" - -#: src/browser/resources/ui/main_window.ui:666 -msgid "_Created" -msgstr "" - -#: src/browser/resources/ui/main_window.ui:671 -msgid "_Last Updated" -msgstr "" - -#: src/browser/resources/ui/microsoft_sign_in.ui:23 -msgid "Microsoft To Do Sync" -msgstr "" - -#: src/browser/resources/ui/move_reminders_window.ui:20 -msgid "Move Selected Reminder(s)" -msgstr "" - -#: src/browser/resources/ui/preferences.ui:20 -#: src/browser/resources/ui/shortcuts_window.ui:49 -msgid "Preferences" -msgstr "" - -#: src/browser/resources/ui/preferences.ui:29 -msgid "Syncing" -msgstr "" - -#: src/browser/resources/ui/preferences.ui:38 -msgid "Microsoft To Do" -msgstr "" - -#: src/browser/resources/ui/preferences.ui:50 -#: src/browser/resources/ui/preferences.ui:78 -msgid "Add Account" -msgstr "" - -#: src/browser/resources/ui/preferences.ui:66 -msgid "CalDAV" -msgstr "" - -#: src/browser/resources/ui/preferences.ui:98 -msgid "Refresh" -msgstr "" - -#: src/browser/resources/ui/preferences.ui:110 -#: src/browser/resources/ui/reminder_edit_window.ui:52 -msgid "General" -msgstr "" - -#: src/browser/resources/ui/preferences.ui:119 -msgid "Week starts on Sunday" -msgstr "" - -#: src/browser/resources/ui/preferences.ui:130 -msgid "Play sound with notification" -msgstr "" - -#: src/browser/resources/ui/preferences.ui:134 -msgid "Use the included notification sound" -msgstr "" - -#: src/browser/resources/ui/preferences.ui:135 -msgid "Otherwise the bell sound from the enabled sound theme will be used" -msgstr "" - -#: src/browser/resources/ui/preferences.ui:153 -msgid "Use locale default" -msgstr "" - -#: src/browser/resources/ui/preferences.ui:154 -msgid "12 hour time" -msgstr "" - -#: src/browser/resources/ui/preferences.ui:155 -msgid "24 hour time" -msgstr "" - -#: src/browser/resources/ui/preferences.ui:160 -msgid "5 mins" -msgstr "" - -#: src/browser/resources/ui/preferences.ui:161 -msgid "15 mins" -msgstr "" - -#: src/browser/resources/ui/preferences.ui:162 -msgid "30 mins" -msgstr "" - -#: src/browser/resources/ui/preferences.ui:163 -msgid "60 mins" -msgstr "" - -#: src/browser/resources/ui/preferences_user_row.ui:52 -msgid "All" -msgstr "" - -#: src/browser/resources/ui/preferences_user_row.ui:75 -#: src/browser/preferences.py:275 -msgid "Sign Out" -msgstr "" - -#: src/browser/resources/ui/reminder.ui:131 -msgid "Edit" -msgstr "" - -#: src/browser/resources/ui/reminder_edit_window.ui:55 -msgid "What should the reminder be called?" -msgstr "" - -#: src/browser/resources/ui/reminder_edit_window.ui:61 -msgid "Short description of the reminder (Optional)" -msgstr "" - -#: src/browser/resources/ui/reminder_edit_window.ui:67 -msgid "This will make the reminder display first in the list" -msgstr "" - -#: src/browser/resources/ui/reminder_edit_window.ui:79 -msgid "Location" -msgstr "" - -#: src/browser/resources/ui/reminder_edit_window.ui:90 -msgid "Set a date/time" -msgstr "" - -#: src/browser/resources/ui/reminder_edit_window.ui:112 -#: src/browser/resources/ui/reminder_edit_window.ui:447 -msgid "Select date" -msgstr "" - -#: src/browser/resources/ui/reminder_edit_window.ui:147 -msgid "Hour" -msgstr "" - -#: src/browser/resources/ui/reminder_edit_window.ui:178 -msgid "Minute" -msgstr "" - -#: src/browser/resources/ui/reminder_edit_window.ui:224 -msgid "Send a notification" -msgstr "" - -#: src/browser/resources/ui/reminder_edit_window.ui:243 -msgid "Repeat the reminder" -msgstr "" - -#: src/browser/resources/ui/reminder_edit_window.ui:244 -msgid "The reminder will be updated when you complete it" -msgstr "" - -#: src/browser/resources/ui/reminder_edit_window.ui:259 -msgid "Repeat every" -msgstr "" - -#: src/browser/resources/ui/reminder_edit_window.ui:310 -msgid "Mon" -msgstr "" - -#: src/browser/resources/ui/reminder_edit_window.ui:311 -msgid "Monday" -msgstr "" - -#: src/browser/resources/ui/reminder_edit_window.ui:322 -msgid "Tue" -msgstr "" - -#: src/browser/resources/ui/reminder_edit_window.ui:323 -msgid "Tuesday" -msgstr "" - -#: src/browser/resources/ui/reminder_edit_window.ui:334 -msgid "Wed" -msgstr "" - -#: src/browser/resources/ui/reminder_edit_window.ui:335 -msgid "Wednesday" -msgstr "" - -#: src/browser/resources/ui/reminder_edit_window.ui:346 -msgid "Thu" -msgstr "" - -#: src/browser/resources/ui/reminder_edit_window.ui:347 -msgid "Thursday" -msgstr "" - -#: src/browser/resources/ui/reminder_edit_window.ui:358 -msgid "Fri" -msgstr "" - -#: src/browser/resources/ui/reminder_edit_window.ui:359 -msgid "Friday" -msgstr "" - -#: src/browser/resources/ui/reminder_edit_window.ui:370 -msgid "Sat" -msgstr "" - -#: src/browser/resources/ui/reminder_edit_window.ui:371 -msgid "Saturday" -msgstr "" - -#: src/browser/resources/ui/reminder_edit_window.ui:382 -msgid "Sun" -msgstr "" - -#: src/browser/resources/ui/reminder_edit_window.ui:383 -msgid "Sunday" -msgstr "" - -#. Translators: This is a noun, preceded by a number to represent the number of occurrences of something -#: src/browser/resources/ui/reminder_edit_window.ui:432 -msgid "time(s)" -msgstr "" - -#: src/browser/resources/ui/reminder_edit_window.ui:505 -msgid "Save" -msgstr "" - -#: src/browser/resources/ui/reminder_edit_window.ui:520 -msgid "minute(s)" -msgstr "" - -#: src/browser/resources/ui/reminder_edit_window.ui:521 -msgid "hour(s)" -msgstr "" - -#: src/browser/resources/ui/reminder_edit_window.ui:522 -#: src/browser/resources/ui/reminder_edit_window.ui:530 -msgid "day(s)" -msgstr "" - -#: src/browser/resources/ui/reminder_edit_window.ui:523 -#: src/browser/resources/ui/reminder_edit_window.ui:531 -msgid "week(s)" -msgstr "" - -#: src/browser/resources/ui/reminder_edit_window.ui:524 -#: src/browser/resources/ui/reminder_edit_window.ui:532 -msgid "months(s)" -msgstr "" - -#: src/browser/resources/ui/reminder_edit_window.ui:525 -#: src/browser/resources/ui/reminder_edit_window.ui:533 -msgid "years(s)" -msgstr "" - -#: src/browser/resources/ui/reminder_edit_window.ui:538 -msgid "Repeat forever" -msgstr "" - -#: src/browser/resources/ui/reminder_edit_window.ui:539 -msgid "Display a total of" -msgstr "" - -#: src/browser/resources/ui/reminder_edit_window.ui:540 -msgid "Repeat until" -msgstr "" - -#: src/browser/resources/ui/shortcuts_window.ui:27 -msgid "Application" -msgstr "" - -#: src/browser/resources/ui/shortcuts_window.ui:31 -msgid "Show menu" -msgstr "" - -#: src/browser/resources/ui/shortcuts_window.ui:55 -msgid "Keyboard shortcuts" -msgstr "" - -#: src/browser/resources/ui/shortcuts_window.ui:61 -msgid "Quit" -msgstr "" - -#: src/browser/resources/ui/shortcuts_window.ui:68 -msgid "Navigation" -msgstr "" - -#: src/browser/resources/ui/shortcuts_window.ui:72 -msgid "Move left" -msgstr "" - -#: src/browser/resources/ui/shortcuts_window.ui:78 -msgid "Move up" -msgstr "" - -#: src/browser/resources/ui/shortcuts_window.ui:84 -msgid "Move right" -msgstr "" - -#: src/browser/resources/ui/shortcuts_window.ui:90 -msgid "Move down" -msgstr "" - -#: src/browser/resources/ui/shortcuts_window.ui:97 -msgid "Main Window" -msgstr "" - -#: src/browser/resources/ui/shortcuts_window.ui:107 -msgid "New reminder" -msgstr "" - -#: src/browser/resources/ui/shortcuts_window.ui:113 -msgid "Refresh reminders" -msgstr "" - -#: src/browser/resources/ui/shortcuts_window.ui:119 -msgid "Select all reminders" -msgstr "" - -#: src/browser/resources/ui/shortcuts_window.ui:125 -msgid "Hold to start selecting reminders" -msgstr "" - -#: src/browser/resources/ui/shortcuts_window.ui:131 -msgid "Unselect all reminders" -msgstr "" - -#: src/browser/resources/ui/shortcuts_window.ui:137 -msgid "Remove selected reminders" -msgstr "" - -#: src/browser/resources/ui/shortcuts_window.ui:144 -msgid "Child Windows" -msgstr "" - -#: src/browser/resources/ui/shortcuts_window.ui:148 -msgid "Close window" -msgstr "" - -#: src/browser/resources/ui/shortcuts_window.ui:154 -msgid "Save changes" -msgstr "" - -#: src/browser/about.py:51 -msgid "Copyright 2023 Sasha Hale" -msgstr "" - -#. Translators: Do not translate this, instead put your name and email here. -#. name -#: src/browser/about.py:59 -msgid "translator-credits" -msgstr "" - -#: src/browser/application.py:56 -msgid "Print the version of the app" -msgstr "" - -#: src/browser/application.py:63 -msgid "Restart service before starting app" -msgstr "" - -#: src/browser/application.py:70 -msgid "Start on a different page" -msgstr "" - -#: src/browser/application.py:195 src/browser/application.py:375 -msgid "Something went wrong" -msgstr "" - -#: src/browser/application.py:195 src/browser/application.py:375 -msgid "Changes were not saved. This bug should be reported." -msgstr "" - -#: src/browser/application.py:367 -msgid "Reminders failed to start" -msgstr "" - -#: src/browser/application.py:367 -msgid "" -"If this is your first time running Reminders, you will probably have to log " -"out and log back in before using it. This is due to a bug in Flatpak." -msgstr "" - -#: src/browser/edit_lists_window.py:22 src/browser/edit_lists_window.py:118 -msgid "New List" -msgstr "" - -#: src/browser/edit_lists_window.py:93 src/browser/main_window.py:388 -msgid "You have unsaved changes" -msgstr "" - -#: src/browser/edit_lists_window.py:94 src/browser/main_window.py:389 -msgid "Are you sure you want to close the window?" -msgstr "" - -#: src/browser/edit_lists_window.py:97 src/browser/main_window.py:392 -#: src/browser/main_window.py:1286 src/browser/main_window.py:1301 -#: src/browser/main_window.py:1320 src/browser/main_window.py:1335 -#: src/browser/main_window.py:1350 src/browser/move_reminders_window.py:112 -msgid "Yes" -msgstr "" - -#: src/browser/edit_lists_window.py:153 -msgid "What should the list be called?" -msgstr "" - -#: src/browser/edit_lists_window.py:197 -msgid "Remove list?" -msgstr "" - -#: src/browser/edit_lists_window.py:198 -#, python-brace-format -msgid "This will remove {list_name} and cannot be undone." -msgstr "" - -#: src/browser/main_window.py:99 -msgid "Nothing to see here!" -msgstr "" - -#: src/browser/main_window.py:100 -msgid "Press the plus button below to add a reminder" -msgstr "" - -#: src/browser/main_window.py:104 -msgid "No reminders match your search" -msgstr "" - -#: src/browser/main_window.py:407 -msgid "Does not repeat" -msgstr "" - -#: src/browser/main_window.py:410 -msgid "minute" -msgstr "" - -#: src/browser/main_window.py:412 -msgid "minutes" -msgstr "" - -#: src/browser/main_window.py:415 -msgid "hour" -msgstr "" - -#: src/browser/main_window.py:417 -msgid "hours" -msgstr "" - -#: src/browser/main_window.py:420 -msgid "day" -msgstr "" - -#: src/browser/main_window.py:422 -msgid "days" -msgstr "" - -#. Translators: This is an abbreviation for Monday -#: src/browser/main_window.py:427 -msgid "M" -msgstr "" - -#. Translators: This is an abbreviation for Tuesday -#: src/browser/main_window.py:429 -msgid "Tu" -msgstr "" - -#. Translators: This is an abbreviation for Wednesday -#: src/browser/main_window.py:431 -msgid "W" -msgstr "" - -#. Translators: This is an abbreviation for Thursday -#: src/browser/main_window.py:433 -msgid "Th" -msgstr "" - -#. Translators: This is an abbreviation for Friday -#: src/browser/main_window.py:435 -msgid "F" -msgstr "" - -#. Translators: This is an abbreviation for Saturday -#: src/browser/main_window.py:437 -msgid "Sa" -msgstr "" - -#. Translators: This is an abbreviation for Sunday -#: src/browser/main_window.py:439 -msgid "Su" -msgstr "" - -#: src/browser/main_window.py:445 -msgid "week" -msgstr "" - -#: src/browser/main_window.py:447 -msgid "weeks" -msgstr "" - -#: src/browser/main_window.py:453 -msgid "month" -msgstr "" - -#: src/browser/main_window.py:455 -msgid "months" -msgstr "" - -#: src/browser/main_window.py:458 -msgid "year" -msgstr "" - -#: src/browser/main_window.py:460 -msgid "years" -msgstr "" - -#: src/browser/main_window.py:463 -msgid "until" -msgstr "" - -#. Translators: This is a noun, preceded by a number to represent the number of occurrences of something -#: src/browser/main_window.py:466 -msgid "time" -msgstr "" - -#. Translators: This is a noun, preceded by a number to represent the number of occurrences of something -#: src/browser/main_window.py:469 -msgid "times" -msgstr "" - -#. Translators: This is a adjective, followed by a number to represent how often something occurs -#: src/browser/main_window.py:474 -msgid "Every" -msgstr "" - -#: src/browser/main_window.py:510 -msgid "Today" -msgstr "" - -#: src/browser/main_window.py:512 -msgid "Tomorrow" -msgstr "" - -#: src/browser/main_window.py:514 -msgid "Yesterday" -msgstr "" - -#: src/browser/main_window.py:736 -msgid "All Lists" -msgstr "" - -#: src/browser/main_window.py:1257 -#, python-brace-format -msgid "Searching '{text}'" -msgstr "" - -#: src/browser/main_window.py:1264 -msgid "Start typing to search" -msgstr "" - -#: src/browser/main_window.py:1282 -msgid "Mark reminders as complete?" -msgstr "" - -#: src/browser/main_window.py:1283 -msgid "" -"Are you sure you want to mark the currently selected reminder(s) as complete?" -msgstr "" - -#: src/browser/main_window.py:1297 -msgid "Mark reminders as incomplete?" -msgstr "" - -#: src/browser/main_window.py:1298 -msgid "" -"Are you sure you want to mark the currently selected reminder(s) as " -"incomplete?" -msgstr "" - -#: src/browser/main_window.py:1316 -msgid "Mark reminders as important?" -msgstr "" - -#: src/browser/main_window.py:1317 -msgid "" -"Are you sure you want to mark the currently selected reminder(s) as " -"important?" -msgstr "" - -#: src/browser/main_window.py:1331 -msgid "Mark reminders as unimportant?" -msgstr "" - -#: src/browser/main_window.py:1332 -msgid "" -"Are you sure you want to mark the currently selected reminder(s) as " -"unimportant?" -msgstr "" - -#: src/browser/main_window.py:1346 -msgid "Remove reminders?" -msgstr "" - -#: src/browser/main_window.py:1347 -msgid "" -"Are you sure you want to remove the currently selected reminder(s)? This " -"cannot be undone." -msgstr "" - -#: src/browser/move_reminders_window.py:109 -msgid "Are you sure you want to move the currently selected reminder(s)?" -msgstr "" - -#: src/browser/preferences.py:270 -msgid "Are you sure you want to sign out?" -msgstr "" - -#: src/browser/preferences.py:271 -#, python-brace-format -msgid "This will sign out {self.username}" -msgstr "" - -#: src/browser/reminder.py:408 -msgid "Remove reminder?" -msgstr "" - -#: src/browser/reminder.py:409 -#, python-brace-format -msgid "This will remove {reminder} and cannot be undone." -msgstr "" - -#: src/browser/reminder_edit_window.py:123 -msgid "Edit Reminder" -msgstr "" - -#: src/browser/reminder_edit_window.py:125 -msgid "New Reminder" -msgstr "" - -#: src/browser/reminder_edit_window.py:278 -#: src/browser/reminder_edit_window.py:298 -msgid "PM" -msgstr "" - -#: src/browser/reminder_edit_window.py:282 -#: src/browser/reminder_edit_window.py:302 -msgid "AM" -msgstr "" - -#: src/service/backend.py:634 -msgid "Mark as completed" -msgstr "" - -#: src/service/backend.py:1015 -msgid "Local Reminders" -msgstr "" - -#: src/service/backend.py:1676 -msgid "Local" -msgstr "" diff --git a/po/retainer.pot b/po/retainer.pot new file mode 100644 index 0000000..674b4f1 --- /dev/null +++ b/po/retainer.pot @@ -0,0 +1,1020 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the retainer package. +# FIRST AUTHOR , YEAR. +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: retainer\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2023-06-20 14:49-0400\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: FULL NAME \n" +"Language-Team: LANGUAGE \n" +"Language: \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=CHARSET\n" +"Content-Transfer-Encoding: 8bit\n" + +#: data/browser/io.github.retainerdevs.Retainer.desktop.in.in:4 +#: data/io.github.retainerdevs.Retainer.metainfo.xml.in.in:9 src/info.py:27 +msgid "Retainer" +msgstr "" + +#: data/browser/io.github.retainerdevs.Retainer.desktop.in.in:5 +#: data/io.github.retainerdevs.Retainer.metainfo.xml.in.in:10 +msgid "Set reminders and manage tasks" +msgstr "" + +#: data/browser/io.github.retainerdevs.Retainer.desktop.in.in:13 +msgid "" +"Todo;Productivity;Task;Planning;Planner;Time;Management;Reminder;Reminders;" +"Retainer;" +msgstr "" + +#: data/service/io.github.retainerdevs.Retainer.Service.desktop.in.in:4 +msgid "Retainer Service" +msgstr "" + +#: data/service/io.github.retainerdevs.Retainer.Service.desktop.in.in:5 +msgid "DBus service for managing reminders and tasks" +msgstr "" + +#: data/io.github.retainerdevs.Retainer.gschema.xml.in:23 +#: src/browser/resources/ui/preferences.ui:127 +msgid "Time format" +msgstr "" + +#: data/io.github.retainerdevs.Retainer.gschema.xml.in:24 +msgid "What format to display the time in" +msgstr "" + +#: data/io.github.retainerdevs.Retainer.gschema.xml.in:28 +#: src/browser/resources/ui/main_window.ui:46 +msgid "Sort by" +msgstr "" + +#: data/io.github.retainerdevs.Retainer.gschema.xml.in:29 +msgid "How to sort the reminders" +msgstr "" + +#: data/io.github.retainerdevs.Retainer.gschema.xml.in:33 +#: src/browser/resources/ui/preferences.ui:108 +msgid "Auto refresh frequency" +msgstr "" + +#: data/io.github.retainerdevs.Retainer.gschema.xml.in:34 +msgid "How often the reminders are refreshed (minutes)" +msgstr "" + +#: data/io.github.retainerdevs.Retainer.gschema.xml.in:38 +msgid "Notification Sound" +msgstr "" + +#: data/io.github.retainerdevs.Retainer.gschema.xml.in:39 +msgid "Whether or not to play a notification sound" +msgstr "" + +#: data/io.github.retainerdevs.Retainer.gschema.xml.in:43 +msgid "Use included notification sound" +msgstr "" + +#: data/io.github.retainerdevs.Retainer.gschema.xml.in:44 +msgid "Whether to use the included notification sound" +msgstr "" + +#: data/io.github.retainerdevs.Retainer.gschema.xml.in:48 +msgid "Descending sort" +msgstr "" + +#: data/io.github.retainerdevs.Retainer.gschema.xml.in:49 +msgid "If reminders sort should be descending" +msgstr "" + +#: data/io.github.retainerdevs.Retainer.gschema.xml.in:53 +msgid "Week starts on sunday" +msgstr "" + +#: data/io.github.retainerdevs.Retainer.gschema.xml.in:54 +msgid "If week should start on sunday" +msgstr "" + +#: data/io.github.retainerdevs.Retainer.gschema.xml.in:67 +msgid "Remote lists that should be synced" +msgstr "" + +#: data/io.github.retainerdevs.Retainer.gschema.xml.in:68 +msgid "" +"Add a user id if you want to sync all of the lists on a user, or any list id " +"on the user" +msgstr "" + +#: data/io.github.retainerdevs.Retainer.gschema.xml.in:72 +#: data/io.github.retainerdevs.Retainer.gschema.xml.in:77 +msgid "Selected list" +msgstr "" + +#: data/io.github.retainerdevs.Retainer.gschema.xml.in:73 +#: data/io.github.retainerdevs.Retainer.gschema.xml.in:78 +msgid "list ids can be 'all', 'local', or an actual id" +msgstr "" + +#: data/io.github.retainerdevs.Retainer.gschema.xml.in:82 +msgid "[DEPRECATED] Task lists that should be synced" +msgstr "" + +#: data/io.github.retainerdevs.Retainer.gschema.xml.in:83 +msgid "" +"{user_id: [task_list_ids]}, task_list_ids can be 'all' or an array of ids" +msgstr "" + +#: data/io.github.retainerdevs.Retainer.gschema.xml.in:87 +msgid "[DEPRECATED] Task lists that should be visible" +msgstr "" + +#: data/io.github.retainerdevs.Retainer.gschema.xml.in:88 +msgid "(user_id, task_id) ids can be 'all', 'local', or an actual id" +msgstr "" + +#: data/io.github.retainerdevs.Retainer.metainfo.xml.in.in:6 +#: src/browser/about.py:56 +msgid "Retainer Developers" +msgstr "" + +#: data/io.github.retainerdevs.Retainer.metainfo.xml.in.in:13 +msgid "What you can do with Reminders:" +msgstr "" + +#: data/io.github.retainerdevs.Retainer.metainfo.xml.in.in:15 +msgid "Set recurring reminders" +msgstr "" + +#: data/io.github.retainerdevs.Retainer.metainfo.xml.in.in:16 +msgid "Schedule notifications" +msgstr "" + +#: data/io.github.retainerdevs.Retainer.metainfo.xml.in.in:17 +msgid "Sort, filter, and search for reminders" +msgstr "" + +#: data/io.github.retainerdevs.Retainer.metainfo.xml.in.in:18 +msgid "Mark reminders as important or complete" +msgstr "" + +#: data/io.github.retainerdevs.Retainer.metainfo.xml.in.in:19 +msgid "Organize reminders using lists" +msgstr "" + +#: data/io.github.retainerdevs.Retainer.metainfo.xml.in.in:20 +msgid "Optionally play a sound when notifications are sent" +msgstr "" + +#: data/io.github.retainerdevs.Retainer.metainfo.xml.in.in:21 +msgid "Optionally sync with Microsoft To Do" +msgstr "" + +#: data/io.github.retainerdevs.Retainer.metainfo.xml.in.in:22 +msgid "Optionally sync with CalDAV servers" +msgstr "" + +#: data/io.github.retainerdevs.Retainer.metainfo.xml.in.in:23 +msgid "Import and export ical/ics files" +msgstr "" + +#: src/browser/resources/ui/caldav_sign_in.ui:15 +msgid "CalDAV Sync" +msgstr "" + +#: src/browser/resources/ui/caldav_sign_in.ui:39 +#: src/browser/resources/ui/preferences_user_row.ui:15 +msgid "Display Name" +msgstr "" + +#: src/browser/resources/ui/caldav_sign_in.ui:45 +msgid "Server URL" +msgstr "" + +#: src/browser/resources/ui/caldav_sign_in.ui:51 +msgid "Username" +msgstr "" + +#: src/browser/resources/ui/caldav_sign_in.ui:57 +msgid "Password" +msgstr "" + +#: src/browser/resources/ui/caldav_sign_in.ui:64 +msgid "Sign In" +msgstr "" + +#: src/browser/resources/ui/edit_lists_window.ui:12 +#: src/browser/resources/ui/main_window.ui:304 +msgid "Edit Lists" +msgstr "" + +#: src/browser/resources/ui/error_dialog.ui:40 +msgid "View Error" +msgstr "" + +#: src/browser/resources/ui/export_lists_window.ui:12 +msgid "Export Lists" +msgstr "" + +#: src/browser/resources/ui/export_lists_window.ui:67 +#: src/browser/resources/ui/import_lists_window.ui:81 +#: src/browser/resources/ui/main_window.ui:444 +#: src/browser/resources/ui/move_reminders_window.ui:67 +#: src/browser/resources/ui/reminder_edit_page.ui:500 +#: src/browser/edit_lists_window.py:99 src/browser/edit_lists_window.py:205 +#: src/browser/main_window.py:206 src/browser/main_window.py:1317 +#: src/browser/main_window.py:1333 src/browser/main_window.py:1353 +#: src/browser/main_window.py:1369 src/browser/main_window.py:1385 +#: src/browser/move_reminders_window.py:110 src/browser/preferences.py:298 +#: src/browser/reminder.py:399 src/browser/reminder_edit_page.py:109 +msgid "Cancel" +msgstr "" + +#: src/browser/resources/ui/export_lists_window.ui:82 +#: src/browser/resources/ui/shortcuts_window.ui:29 +msgid "Export" +msgstr "" + +#: src/browser/resources/ui/import_lists_window.ui:12 +msgid "Import Lists" +msgstr "" + +#: src/browser/resources/ui/import_lists_window.ui:45 +msgid "Import to specific list" +msgstr "" + +#: src/browser/resources/ui/import_lists_window.ui:46 +msgid "Otherwise new lists will be created" +msgstr "" + +#: src/browser/resources/ui/import_lists_window.ui:52 +msgid "Select a list" +msgstr "" + +#: src/browser/resources/ui/import_lists_window.ui:96 +#: src/browser/resources/ui/shortcuts_window.ui:35 +msgid "Import" +msgstr "" + +#: src/browser/resources/ui/main_window.ui:28 +msgid "Show sidebar" +msgstr "" + +#: src/browser/resources/ui/main_window.ui:45 +msgid "Sort direction" +msgstr "" + +#: src/browser/resources/ui/main_window.ui:56 +#: src/browser/resources/ui/preferences.ui:112 +msgid "Refresh" +msgstr "" + +#: src/browser/resources/ui/main_window.ui:70 +#: src/browser/resources/ui/shortcuts_window.ui:93 +msgid "Search" +msgstr "" + +#: src/browser/resources/ui/main_window.ui:78 +msgid "App menu" +msgstr "" + +#: src/browser/resources/ui/main_window.ui:141 +#: src/browser/resources/ui/main_window.ui:363 src/browser/main_window.py:1085 +msgid "All Reminders" +msgstr "" + +#: src/browser/resources/ui/main_window.ui:174 src/browser/main_window.py:1096 +msgid "Upcoming Reminders" +msgstr "" + +#: src/browser/resources/ui/main_window.ui:207 src/browser/main_window.py:1107 +msgid "Past Reminders" +msgstr "" + +#: src/browser/resources/ui/main_window.ui:240 src/browser/main_window.py:1118 +msgid "Completed Reminders" +msgstr "" + +#: src/browser/resources/ui/main_window.ui:466 src/browser/reminder.py:338 +msgid "Complete" +msgstr "" + +#: src/browser/resources/ui/main_window.ui:492 src/browser/reminder.py:334 +msgid "Incomplete" +msgstr "" + +#: src/browser/resources/ui/main_window.ui:518 +#: src/browser/resources/ui/reminder_edit_page.ui:66 +msgid "Important" +msgstr "" + +#: src/browser/resources/ui/main_window.ui:544 +msgid "Unimportant" +msgstr "" + +#: src/browser/resources/ui/main_window.ui:569 +#: src/browser/resources/ui/move_reminders_window.ui:82 +msgid "Move" +msgstr "" + +#: src/browser/resources/ui/main_window.ui:591 +#: src/browser/resources/ui/reminder.ui:92 src/browser/edit_lists_window.py:206 +#: src/browser/reminder.py:400 +msgid "Remove" +msgstr "" + +#: src/browser/resources/ui/main_window.ui:613 +#: src/browser/resources/ui/main_window.ui:621 +msgid "Add a reminder" +msgstr "" + +#: src/browser/resources/ui/main_window.ui:657 +msgid "_Export Lists" +msgstr "" + +#: src/browser/resources/ui/main_window.ui:661 +msgid "_Import Lists" +msgstr "" + +#: src/browser/resources/ui/main_window.ui:667 +msgid "_Preferences" +msgstr "" + +#: src/browser/resources/ui/main_window.ui:671 +msgid "_Keyboard Shortcuts" +msgstr "" + +#: src/browser/resources/ui/main_window.ui:675 +msgid "_About Retainer" +msgstr "" + +#: src/browser/resources/ui/main_window.ui:682 +msgid "Sort By" +msgstr "" + +#: src/browser/resources/ui/main_window.ui:684 +msgid "_Time" +msgstr "" + +#: src/browser/resources/ui/main_window.ui:689 +msgid "_Alphabetical" +msgstr "" + +#: src/browser/resources/ui/main_window.ui:694 +msgid "_Created" +msgstr "" + +#: src/browser/resources/ui/main_window.ui:699 +msgid "_Last Updated" +msgstr "" + +#: src/browser/resources/ui/microsoft_sign_in.ui:15 +msgid "Microsoft To Do Sync" +msgstr "" + +#: src/browser/resources/ui/move_reminders_window.ui:12 +msgid "Move Selected Reminder(s)" +msgstr "" + +#: src/browser/resources/ui/preferences.ui:12 +#: src/browser/resources/ui/shortcuts_window.ui:41 +msgid "Preferences" +msgstr "" + +#: src/browser/resources/ui/preferences.ui:43 +msgid "Syncing" +msgstr "" + +#: src/browser/resources/ui/preferences.ui:52 +msgid "Microsoft To Do" +msgstr "" + +#: src/browser/resources/ui/preferences.ui:64 +#: src/browser/resources/ui/preferences.ui:92 +msgid "Add Account" +msgstr "" + +#: src/browser/resources/ui/preferences.ui:80 +msgid "CalDAV" +msgstr "" + +#: src/browser/resources/ui/preferences.ui:124 +#: src/browser/resources/ui/reminder_edit_page.ui:44 +msgid "General" +msgstr "" + +#: src/browser/resources/ui/preferences.ui:133 +msgid "Week starts on Sunday" +msgstr "" + +#: src/browser/resources/ui/preferences.ui:144 +#: src/browser/resources/ui/preferences.ui:162 +msgid "Play sound with notification" +msgstr "" + +#: src/browser/resources/ui/preferences.ui:148 +msgid "Use the included notification sound" +msgstr "" + +#: src/browser/resources/ui/preferences.ui:149 +msgid "Otherwise the bell sound from the enabled sound theme will be used" +msgstr "" + +#: src/browser/resources/ui/preferences.ui:184 +msgid "Use locale default" +msgstr "" + +#: src/browser/resources/ui/preferences.ui:185 +msgid "12 hour time" +msgstr "" + +#: src/browser/resources/ui/preferences.ui:186 +msgid "24 hour time" +msgstr "" + +#: src/browser/resources/ui/preferences.ui:191 +msgid "5 mins" +msgstr "" + +#: src/browser/resources/ui/preferences.ui:192 +msgid "15 mins" +msgstr "" + +#: src/browser/resources/ui/preferences.ui:193 +msgid "30 mins" +msgstr "" + +#: src/browser/resources/ui/preferences.ui:194 +msgid "60 mins" +msgstr "" + +#: src/browser/resources/ui/preferences_user_row.ui:44 +msgid "All" +msgstr "" + +#: src/browser/resources/ui/preferences_user_row.ui:67 +#: src/browser/preferences.py:299 +msgid "Sign Out" +msgstr "" + +#: src/browser/resources/ui/reminder.ui:123 +msgid "Edit" +msgstr "" + +#: src/browser/resources/ui/reminder_edit_page.ui:55 +msgid "What should the reminder be called?" +msgstr "" + +#: src/browser/resources/ui/reminder_edit_page.ui:61 +msgid "Short description of the reminder (Optional)" +msgstr "" + +#: src/browser/resources/ui/reminder_edit_page.ui:67 +msgid "This will make the reminder display first in the list" +msgstr "" + +#: src/browser/resources/ui/reminder_edit_page.ui:79 +msgid "Location" +msgstr "" + +#: src/browser/resources/ui/reminder_edit_page.ui:89 +msgid "Time" +msgstr "" + +#: src/browser/resources/ui/reminder_edit_page.ui:100 +msgid "Set a date/time" +msgstr "" + +#: src/browser/resources/ui/reminder_edit_page.ui:122 +#: src/browser/resources/ui/reminder_edit_page.ui:457 +msgid "Select date" +msgstr "" + +#: src/browser/resources/ui/reminder_edit_page.ui:157 +msgid "Hour" +msgstr "" + +#: src/browser/resources/ui/reminder_edit_page.ui:188 +msgid "Minute" +msgstr "" + +#: src/browser/resources/ui/reminder_edit_page.ui:234 +msgid "Send a notification" +msgstr "" + +#: src/browser/resources/ui/reminder_edit_page.ui:253 +msgid "Repeat the reminder" +msgstr "" + +#: src/browser/resources/ui/reminder_edit_page.ui:254 +msgid "The reminder will be updated when you complete it" +msgstr "" + +#: src/browser/resources/ui/reminder_edit_page.ui:269 +msgid "Repeat every" +msgstr "" + +#: src/browser/resources/ui/reminder_edit_page.ui:320 +msgid "Mon" +msgstr "" + +#: src/browser/resources/ui/reminder_edit_page.ui:321 +msgid "Monday" +msgstr "" + +#: src/browser/resources/ui/reminder_edit_page.ui:332 +msgid "Tue" +msgstr "" + +#: src/browser/resources/ui/reminder_edit_page.ui:333 +msgid "Tuesday" +msgstr "" + +#: src/browser/resources/ui/reminder_edit_page.ui:344 +msgid "Wed" +msgstr "" + +#: src/browser/resources/ui/reminder_edit_page.ui:345 +msgid "Wednesday" +msgstr "" + +#: src/browser/resources/ui/reminder_edit_page.ui:356 +msgid "Thu" +msgstr "" + +#: src/browser/resources/ui/reminder_edit_page.ui:357 +msgid "Thursday" +msgstr "" + +#: src/browser/resources/ui/reminder_edit_page.ui:368 +msgid "Fri" +msgstr "" + +#: src/browser/resources/ui/reminder_edit_page.ui:369 +msgid "Friday" +msgstr "" + +#: src/browser/resources/ui/reminder_edit_page.ui:380 +msgid "Sat" +msgstr "" + +#: src/browser/resources/ui/reminder_edit_page.ui:381 +msgid "Saturday" +msgstr "" + +#: src/browser/resources/ui/reminder_edit_page.ui:392 +msgid "Sun" +msgstr "" + +#: src/browser/resources/ui/reminder_edit_page.ui:393 +msgid "Sunday" +msgstr "" + +#. Translators: This is a noun, preceded by a number to represent the number of occurrences of something +#: src/browser/resources/ui/reminder_edit_page.ui:442 +msgid "time(s)" +msgstr "" + +#: src/browser/resources/ui/reminder_edit_page.ui:515 +msgid "Save" +msgstr "" + +#: src/browser/resources/ui/reminder_edit_page.ui:528 +msgid "minute(s)" +msgstr "" + +#: src/browser/resources/ui/reminder_edit_page.ui:529 +msgid "hour(s)" +msgstr "" + +#: src/browser/resources/ui/reminder_edit_page.ui:530 +#: src/browser/resources/ui/reminder_edit_page.ui:538 +msgid "day(s)" +msgstr "" + +#: src/browser/resources/ui/reminder_edit_page.ui:531 +#: src/browser/resources/ui/reminder_edit_page.ui:539 +msgid "week(s)" +msgstr "" + +#: src/browser/resources/ui/reminder_edit_page.ui:532 +#: src/browser/resources/ui/reminder_edit_page.ui:540 +msgid "months(s)" +msgstr "" + +#: src/browser/resources/ui/reminder_edit_page.ui:533 +#: src/browser/resources/ui/reminder_edit_page.ui:541 +msgid "years(s)" +msgstr "" + +#: src/browser/resources/ui/reminder_edit_page.ui:546 +msgid "Repeat forever" +msgstr "" + +#: src/browser/resources/ui/reminder_edit_page.ui:547 +msgid "Display a total of" +msgstr "" + +#: src/browser/resources/ui/reminder_edit_page.ui:548 +msgid "Repeat until" +msgstr "" + +#: src/browser/resources/ui/shortcuts_window.ui:19 +msgid "Application" +msgstr "" + +#: src/browser/resources/ui/shortcuts_window.ui:23 +msgid "Show menu" +msgstr "" + +#: src/browser/resources/ui/shortcuts_window.ui:47 +msgid "Keyboard shortcuts" +msgstr "" + +#: src/browser/resources/ui/shortcuts_window.ui:53 +msgid "Quit" +msgstr "" + +#: src/browser/resources/ui/shortcuts_window.ui:60 +msgid "Navigation" +msgstr "" + +#: src/browser/resources/ui/shortcuts_window.ui:64 +msgid "Move left" +msgstr "" + +#: src/browser/resources/ui/shortcuts_window.ui:70 +msgid "Move up" +msgstr "" + +#: src/browser/resources/ui/shortcuts_window.ui:76 +msgid "Move right" +msgstr "" + +#: src/browser/resources/ui/shortcuts_window.ui:82 +msgid "Move down" +msgstr "" + +#: src/browser/resources/ui/shortcuts_window.ui:89 +msgid "Main Window" +msgstr "" + +#: src/browser/resources/ui/shortcuts_window.ui:99 +msgid "New reminder" +msgstr "" + +#: src/browser/resources/ui/shortcuts_window.ui:105 +msgid "Refresh reminders" +msgstr "" + +#: src/browser/resources/ui/shortcuts_window.ui:111 +msgid "Select all reminders" +msgstr "" + +#: src/browser/resources/ui/shortcuts_window.ui:117 +msgid "Hold to start selecting reminders" +msgstr "" + +#: src/browser/resources/ui/shortcuts_window.ui:123 +msgid "Unselect all reminders" +msgstr "" + +#: src/browser/resources/ui/shortcuts_window.ui:129 +msgid "Remove selected reminders" +msgstr "" + +#: src/browser/resources/ui/shortcuts_window.ui:136 +msgid "Child Windows" +msgstr "" + +#: src/browser/resources/ui/shortcuts_window.ui:140 +msgid "Close window" +msgstr "" + +#: src/browser/resources/ui/shortcuts_window.ui:146 +msgid "Save changes" +msgstr "" + +#: src/browser/about.py:57 +msgid "Copyright 2023 Retainer Developers" +msgstr "" + +#. Translators: Do not translate this, instead put your name and email here. +#. name +#: src/browser/about.py:66 +msgid "translator-credits" +msgstr "" + +#: src/browser/application.py:61 +msgid "Print the version of the app" +msgstr "" + +#: src/browser/application.py:68 +msgid "Restart service before starting app" +msgstr "" + +#: src/browser/application.py:225 src/browser/application.py:472 +msgid "Something went wrong" +msgstr "" + +#: src/browser/application.py:225 src/browser/application.py:472 +msgid "Changes were not saved. This bug should be reported." +msgstr "" + +#: src/browser/application.py:464 +msgid "Retainer failed to start" +msgstr "" + +#: src/browser/application.py:464 +msgid "" +"If this is your first time running Retainer, you will probably have to log " +"out and log back in before using it. This is due to a bug in Flatpak." +msgstr "" + +#: src/browser/edit_lists_window.py:14 src/browser/edit_lists_window.py:122 +msgid "New List" +msgstr "" + +#: src/browser/edit_lists_window.py:96 src/browser/main_window.py:203 +#: src/browser/reminder_edit_page.py:106 +msgid "You have unsaved changes" +msgstr "" + +#: src/browser/edit_lists_window.py:97 src/browser/main_window.py:204 +msgid "Are you sure you want to close the window?" +msgstr "" + +#: src/browser/edit_lists_window.py:100 src/browser/main_window.py:207 +#: src/browser/main_window.py:1318 src/browser/main_window.py:1334 +#: src/browser/main_window.py:1354 src/browser/main_window.py:1370 +#: src/browser/main_window.py:1386 src/browser/move_reminders_window.py:111 +#: src/browser/reminder_edit_page.py:110 +msgid "Yes" +msgstr "" + +#: src/browser/edit_lists_window.py:157 +msgid "What should the list be called?" +msgstr "" + +#: src/browser/edit_lists_window.py:201 +msgid "Remove list?" +msgstr "" + +#: src/browser/edit_lists_window.py:202 +#, python-brace-format +msgid "This will remove {list_name} and cannot be undone." +msgstr "" + +#: src/browser/main_window.py:97 +msgid "Nothing to see here!" +msgstr "" + +#: src/browser/main_window.py:98 +msgid "Press the plus button below to add a reminder" +msgstr "" + +#: src/browser/main_window.py:102 +msgid "No reminders match your search" +msgstr "" + +#: src/browser/main_window.py:438 +msgid "Does not repeat" +msgstr "" + +#: src/browser/main_window.py:441 +msgid "minute" +msgstr "" + +#: src/browser/main_window.py:443 +msgid "minutes" +msgstr "" + +#: src/browser/main_window.py:446 +msgid "hour" +msgstr "" + +#: src/browser/main_window.py:448 +msgid "hours" +msgstr "" + +#: src/browser/main_window.py:451 +msgid "day" +msgstr "" + +#: src/browser/main_window.py:453 +msgid "days" +msgstr "" + +#. Translators: This is an abbreviation for Monday +#: src/browser/main_window.py:458 +msgid "M" +msgstr "" + +#. Translators: This is an abbreviation for Tuesday +#: src/browser/main_window.py:460 +msgid "Tu" +msgstr "" + +#. Translators: This is an abbreviation for Wednesday +#: src/browser/main_window.py:462 +msgid "W" +msgstr "" + +#. Translators: This is an abbreviation for Thursday +#: src/browser/main_window.py:464 +msgid "Th" +msgstr "" + +#. Translators: This is an abbreviation for Friday +#: src/browser/main_window.py:466 +msgid "F" +msgstr "" + +#. Translators: This is an abbreviation for Saturday +#: src/browser/main_window.py:468 +msgid "Sa" +msgstr "" + +#. Translators: This is an abbreviation for Sunday +#: src/browser/main_window.py:470 +msgid "Su" +msgstr "" + +#: src/browser/main_window.py:476 +msgid "week" +msgstr "" + +#: src/browser/main_window.py:478 +msgid "weeks" +msgstr "" + +#: src/browser/main_window.py:484 +msgid "month" +msgstr "" + +#: src/browser/main_window.py:486 +msgid "months" +msgstr "" + +#: src/browser/main_window.py:489 +msgid "year" +msgstr "" + +#: src/browser/main_window.py:491 +msgid "years" +msgstr "" + +#: src/browser/main_window.py:494 +msgid "until" +msgstr "" + +#. Translators: This is a noun, preceded by a number to represent the number of occurrences of something +#: src/browser/main_window.py:497 +msgid "time" +msgstr "" + +#. Translators: This is a noun, preceded by a number to represent the number of occurrences of something +#: src/browser/main_window.py:500 +msgid "times" +msgstr "" + +#. Translators: This is a adjective, followed by a number to represent how often something occurs +#: src/browser/main_window.py:505 +msgid "Every" +msgstr "" + +#: src/browser/main_window.py:541 +msgid "Today" +msgstr "" + +#: src/browser/main_window.py:543 +msgid "Tomorrow" +msgstr "" + +#: src/browser/main_window.py:545 +msgid "Yesterday" +msgstr "" + +#: src/browser/main_window.py:768 +msgid "All Lists" +msgstr "" + +#: src/browser/main_window.py:1289 +#, python-brace-format +msgid "Searching '{text}'" +msgstr "" + +#: src/browser/main_window.py:1296 +msgid "Start typing to search" +msgstr "" + +#: src/browser/main_window.py:1314 +msgid "Mark reminders as complete?" +msgstr "" + +#: src/browser/main_window.py:1315 +msgid "" +"Are you sure you want to mark the currently selected reminder(s) as complete?" +msgstr "" + +#: src/browser/main_window.py:1330 +msgid "Mark reminders as incomplete?" +msgstr "" + +#: src/browser/main_window.py:1331 +msgid "" +"Are you sure you want to mark the currently selected reminder(s) as " +"incomplete?" +msgstr "" + +#: src/browser/main_window.py:1350 +msgid "Mark reminders as important?" +msgstr "" + +#: src/browser/main_window.py:1351 +msgid "" +"Are you sure you want to mark the currently selected reminder(s) as " +"important?" +msgstr "" + +#: src/browser/main_window.py:1366 +msgid "Mark reminders as unimportant?" +msgstr "" + +#: src/browser/main_window.py:1367 +msgid "" +"Are you sure you want to mark the currently selected reminder(s) as " +"unimportant?" +msgstr "" + +#: src/browser/main_window.py:1382 +msgid "Remove reminders?" +msgstr "" + +#: src/browser/main_window.py:1383 +msgid "" +"Are you sure you want to remove the currently selected reminder(s)? This " +"cannot be undone." +msgstr "" + +#: src/browser/move_reminders_window.py:108 +msgid "Are you sure you want to move the currently selected reminder(s)?" +msgstr "" + +#: src/browser/preferences.py:294 +msgid "Are you sure you want to sign out?" +msgstr "" + +#: src/browser/preferences.py:295 +#, python-brace-format +msgid "This will sign out {self.username}" +msgstr "" + +#: src/browser/reminder.py:395 +msgid "Remove reminder?" +msgstr "" + +#: src/browser/reminder.py:396 +#, python-brace-format +msgid "This will remove {reminder} and cannot be undone." +msgstr "" + +#: src/browser/reminder_edit_page.py:107 +msgid "Are you sure you want to abandon them?" +msgstr "" + +#: src/browser/reminder_edit_page.py:152 +msgid "Edit Reminder" +msgstr "" + +#: src/browser/reminder_edit_page.py:154 +msgid "New Reminder" +msgstr "" + +#: src/browser/reminder_edit_page.py:305 src/browser/reminder_edit_page.py:325 +msgid "PM" +msgstr "" + +#: src/browser/reminder_edit_page.py:309 src/browser/reminder_edit_page.py:329 +msgid "AM" +msgstr "" + +#: src/service/backend.py:53 +msgid "Mark as completed" +msgstr "" + +#: src/service/backend.py:1075 +msgid "Local Reminders" +msgstr "" + +#: src/service/backend.py:1736 +msgid "Local" +msgstr "" + +#: src/service/ms_to_do.py:52 +msgid "Authentication complete. You can close this window now." +msgstr "" diff --git a/po/update_potfile.ps1 b/po/update_potfile.ps1 new file mode 100644 index 0000000..dcaf569 --- /dev/null +++ b/po/update_potfile.ps1 @@ -0,0 +1,41 @@ +# update_potfile.ps1 +# Copyright (C) 2023 Sasha Hale +# +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at https://mozilla.org/MPL/2.0/. + +param ( + [string]$arch = 'x64', + [string]$root = 'C:\msys64', + [switch]$help +) + +$SCRIPT_PATH = $PSScriptRoot.replace('\', '/') + +if ($help) { + write-host 'Usage: update_potfile.ps1 [options...]' + write-host 'Options:' + write-host " -arches Can be x86, x64, or arm64." + write-host " -root MSYS2 root path, default is 'C:\msys64'." + write-host " -help Display this message." + exit +} + +if ($root -match '[a-zA-Z]:(\/|\\).*') { + $root = $root.TrimEnd('\', '/') +} else { + throw 'Invalid root path' +} + +if ($arch -eq 'x86') { + $msystem = 'mingw32' +} elseif ($arch -eq 'x64') { + $msystem = 'mingw64' +} elseif ($arch -eq 'arm64') { + $msystem = 'clangarm64' +} else { + throw 'Invalid arch' +} + +& ${root}\msys2_shell.cmd -defterm -here -no-start -shell bash -${msystem} -lc "${SCRIPT_PATH}/update_potfile_msys.sh" diff --git a/po/update_potfile.sh b/po/update_potfile.sh index 988b440..6ca3079 100755 --- a/po/update_potfile.sh +++ b/po/update_potfile.sh @@ -1,8 +1,13 @@ #!/usr/bin/env bash +# update_potfile.sh +# Copyright (C) 2023 Sasha Hale +# +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at https://mozilla.org/MPL/2.0/. dir=$(dirname "$(realpath "$0")") -cd "${dir}" -cd '../' +cd "${dir}/../" -xgettext -f "${dir}/POTFILES" -o "${dir}/remembrance.pot" --keyword=_ --add-comments=Translators --from-code=UTF-8 --package-name="remembrance" +xgettext -f "${dir}/POTFILES" -o "${dir}/retainer.pot" --keyword=_ --add-comments=Translators --from-code=UTF-8 --package-name=retainer diff --git a/po/update_potfile_msys.sh b/po/update_potfile_msys.sh new file mode 100644 index 0000000..e1e9437 --- /dev/null +++ b/po/update_potfile_msys.sh @@ -0,0 +1,32 @@ +#!/usr/bin/env bash +# update_potfile_msys.sh +# Copyright (C) 2023 Sasha Hale +# +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at https://mozilla.org/MPL/2.0/. + +set -e +set -x + +SCRIPT_DIR=$(dirname $(realpath -s $0)) + +if [[ "$MSYSTEM" == "MINGW32" ]]; then + ARCH="i686" + PREFIX="mingw32" +elif [[ "$MSYSTEM" == "CLANGARM64" ]]; then + ARCH="clang-aarch64" + PREFIX="clangarm64" +else + ARCH="x86_64" + PREFIX="mingw64" +fi + +pacman --noconfirm -Syu + +pacman --noconfirm -S --needed \ + mingw-w64-${ARCH}-gettext + +cd "${SCRIPT_DIR}/../" + +/${PREFIX}/bin/xgettext -f "${SCRIPT_DIR}/POTFILES" -o "${SCRIPT_DIR}/retainer.pot" --keyword=_ --add-comments=Translators --from-code=UTF-8 --package-name=retainer diff --git a/src/__init__.py b/src/__init__.py index e69de29..5172873 100644 --- a/src/__init__.py +++ b/src/__init__.py @@ -0,0 +1,44 @@ +# Reminders - Set reminders and manage tasks +# Copyright (C) 2023 Sasha Hale +# +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at https://mozilla.org/MPL/2.0/. + +import sys +import logging + +class Logger: + def __init__(self, stream, file_stream): + self.stream = stream + self.file_stream = file_stream + + def write(self, data): + if self.stream is not None: + self.stream.write(data) + self.stream.flush() + self.file_stream.write(data) + self.file_stream.flush() + + def flush(self): + if self.stream is not None: + self.stream.flush() + self.file_stream.flush() + +def create_logger(name, path): + formatter = logging.Formatter('%(asctime)s - %(name)s - %(levelname)s - %(module)s:%(funcName)s - %(message)s') + + if sys.stdout is not None: + handler = logging.StreamHandler() + handler.setLevel(logging.INFO) + handler.setFormatter(formatter) + logger.addHandler(handler) + + logger = logging.getLogger(name) + logger.setLevel(logging.INFO) + file_handler = logging.FileHandler(path, 'w') + file_handler.setFormatter(formatter) + sys.stdout = Logger(sys.stdout, file_handler.stream) + sys.stderr = Logger(sys.stderr, file_handler.stream) + logger.addHandler(file_handler) + return logger diff --git a/src/browser/__init__.py b/src/browser/__init__.py index fca9eaa..e69de29 100644 --- a/src/browser/__init__.py +++ b/src/browser/__init__.py @@ -1,7 +0,0 @@ -from gi.repository import Gio - -from reminders import info -from pathlib import Path - -resource = Gio.Resource.load(f'{Path(__file__).parent.absolute()}/{info.app_executable}.gresource') -resource._register() diff --git a/src/browser/about.py b/src/browser/about.py index 2b0d6bf..a6f6aec 100644 --- a/src/browser/about.py +++ b/src/browser/about.py @@ -1,24 +1,18 @@ # about.py # Copyright (C) 2023 Sasha Hale # -# 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 . +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at https://mozilla.org/MPL/2.0/. -from reminders import info +from retainer import info from gi.repository import Adw, Gtk from gettext import gettext as _ +from os.path import isfile RELEASE_NOTES = '''
        +
      • Windows port
      • UI improvements
      • Added support for making the week start on sunday
      • Added indicators that show how many incomplete reminders are in each list/group
        • @@ -40,23 +34,37 @@ ''' def about_window(win): - win = Adw.AboutWindow( + if isfile(info.app_log): + with open(info.app_log, 'r') as f: + app_log = f.read() + else: + app_log = '' + + if isfile(info.service_log): + with open(info.service_log, 'r') as f: + service_log = f.read() + else: + service_log = '' + + abt_win = Adw.AboutWindow( modal = True, transient_for=win, application_name = info.app_name, application_icon = info.app_id, license_type = Gtk.License.GPL_3_0, version = info.version, - developer_name = _('Reminders Developers'), - copyright = _('Copyright 2023 Reminders Developers'), + developer_name = _('Retainer Developers'), + copyright = _('Copyright 2023 Retainer Developers'), website = 'https://github.com/remindersdevs/reminders', developers = ['dgsasha https://github.com/dgsasha'], issue_url = 'https://github.com/remindersdevs/reminders/issues', release_notes = RELEASE_NOTES, release_notes_version = info.version, + debug_info = app_log + '\n\n' + service_log, # Translators: Do not translate this, instead put your name and email here. # name translator_credits = _("translator-credits") ) - win.add_shortcut(Gtk.Shortcut.new(Gtk.ShortcutTrigger.parse_string('w'), Gtk.CallbackAction.new(lambda *args: win.close()))) - win.present() + abt_win.add_shortcut(Gtk.Shortcut.new(Gtk.ShortcutTrigger.parse_string('w'), Gtk.CallbackAction.new(lambda *args: abt_win.close()))) + + abt_win.present() diff --git a/src/browser/application.py b/src/browser/application.py index e2cc5af..fc2c7f9 100644 --- a/src/browser/application.py +++ b/src/browser/application.py @@ -1,53 +1,58 @@ # application.py # Copyright (C) 2023 Sasha Hale # -# 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 . +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at https://mozilla.org/MPL/2.0/. import sys -import logging from gi import require_version +require_version('Gdk', '4.0') require_version('Gtk', '4.0') require_version('Adw', '1') from gi.repository import Gtk, Adw, GLib, Gio, Gdk -from reminders import info -from reminders.browser.error_dialog import ErrorDialog -from reminders.browser.main_window import MainWindow -from reminders.browser.about import about_window -from reminders.browser.preferences import PreferencesWindow -from reminders.browser.shortcuts_window import ShortcutsWindow -from reminders.browser.export_lists_window import ExportListsWindow -from reminders.browser.import_lists_window import ImportListsWindow +from retainer import info +from retainer.browser.error_dialog import ErrorDialog +from retainer.browser.main_window import MainWindow +from retainer.browser.about import about_window +from retainer.browser.preferences import PreferencesWindow +from retainer.browser.shortcuts_window import ShortcutsWindow +from retainer.browser.export_lists_window import ExportListsWindow +from retainer.browser.import_lists_window import ImportListsWindow from gettext import gettext as _ from pkg_resources import parse_version from traceback import format_exception +from logging import getLogger +from os.path import isfile +if info.on_windows: + from winsdk.windows.applicationmodel import activation, AppInstance + from winsdk.windows.system import Launcher + from winsdk.windows.foundation import Uri + from winsdk.windows.system.threading import ThreadPoolTimer + from datetime import timedelta + from threading import Event + from os import _exit + +logger = getLogger(info.app_executable) # Always update this when new features are added that require the service to restart MIN_SERVICE_VERSION = '5.0' -class Remembrance(Adw.Application): +class Retainer(Adw.Application): '''Application for the frontend''' def __init__(self, **kwargs): super().__init__(**kwargs) - self.restart = False self.sandboxed = False self.preferences = None + self.watcher_id = None self.win = None self.error_dialog = None self.spinning_cursor = Gdk.Cursor.new_from_name('wait') + self.set_resource_base_path('/io/github/retainerdevs/Retainer') self.page = 'all' self.add_main_option( 'version', ord('v'), @@ -63,13 +68,6 @@ def __init__(self, **kwargs): _('Restart service before starting app'), None ) - self.add_main_option( - 'page', ord('p'), - GLib.OptionFlags.NONE, - GLib.OptionArg.STRING, - _('Start on a different page'), - '(upcoming|past|completed)', - ) self.add_main_option( GLib.OPTION_REMAINING, 0, @@ -80,33 +78,50 @@ def __init__(self, **kwargs): ) def do_command_line(self, command): - commands = command.get_options_dict() - - if commands.contains('restart-service'): - self.restart = True + no_activate = False + action = None + param = None + imports = [] + commands = command.get_options_dict() if commands.contains('version'): print(info.version) sys.exit(0) - if commands.contains('page'): - value = commands.lookup_value('page').get_string() - if value in ('upcoming', 'past', 'completed'): - self.page = value - else: - print(f'{value} is not a valid page') - - self.do_activate() - - files = commands.lookup_value(GLib.OPTION_REMAINING) - if files: - self.open_files(files) + self.restart = commands.contains('restart-service') + + args = commands.lookup_value(GLib.OPTION_REMAINING) + if args: + for arg in args: + prefix = f'{info.win_id}:' + if info.on_windows and arg.startswith(prefix): + arg = arg[len(prefix):] + args = arg.split(';') + for arg in args: + if arg == 'no-activate': + no_activate = True + elif '=' in arg: + arg = arg.split('=', 1) + if arg[0] == 'action': + action = arg[1] + if arg[0] == 'param': + param = GLib.Variant('s', arg[1]) + elif isfile(arg): + imports.append(arg) + + if not no_activate: + self.do_activate() + + if action is not None: + self.activate_action(action, param) + + if len(imports) > 0: + self.open_files(imports) return 0 def do_startup(self): Adw.Application.do_startup(self) - self.configure_logging() self.refreshing = False if info.portals_enabled: @@ -117,7 +132,7 @@ def do_startup(self): if portal.running_under_sandbox(): self.sandboxed = True - if self.sandboxed: + if self.sandboxed or info.on_windows: # xdg-desktop-portal will try to run the actions from the backend here when the notification is interacted with # for now, we can just add the action here if the app is sandboxed # later I will probably make the frontend of the app the owner of the notification to simplify things @@ -137,29 +152,45 @@ def check_service_version(self): if self.restart or loaded_ver < min_ver: if min_ver <= installed_ver: try: - self.run_service_method( - 'Quit', - None - ) + try: + self.run_service_method( + 'Quit', + None + ) + except: + pass self.connect_to_service() except Exception as error: - self.logger.exception(f"{error}: Couldn't quit {info.service_executable}") + logger.exception(f"{error}: Couldn't restart {info.service_executable}") else: - self.logger.error(f'{info.service_executable} version is too low') + logger.error(f'{info.service_executable} version is too low') sys.exit(1) + def do_activate(self): Adw.Application.do_activate(self) - self.provider = Gtk.CssProvider() - self.provider.load_from_resource('/io/github/remindersdevs/Reminders/stylesheet.css') - if win := self.get_active_window(): self.win = win self.win.activate_action(f'win.{self.page}', None) self.win.present() return - self.connect_to_service() + if info.on_windows: + # Can't autostart dbus services on windows + self.hold() + Launcher.launch_uri_async(Uri(f'{info.win_service_id}:')) + timeout = ThreadPoolTimer.create_timer(lambda *args: self.timeout_error(), timedelta(seconds=10)) + def name_appeared(): + self.release() + timeout.cancel() + self.do_connect() + self.on_connected() + self.watcher_id = self.watch(name_appeared) + else: + self.do_connect() + self.on_connected() + + def on_connected(self): self.check_service_version() self.settings = Gio.Settings(info.base_app_id) @@ -184,7 +215,6 @@ def do_activate(self): self.create_action('export', self.export, accels=['e']) self.create_action('import', self.import_lists, accels=['i']) self.create_action('about', self.show_about) - Gtk.StyleContext.add_provider_for_display(self.win.get_display(), self.provider, Gtk.STYLE_PROVIDER_PRIORITY_APPLICATION) self.win.present() def error_cb(self, proxy, sender_name, signal_name, parameters): @@ -287,7 +317,7 @@ def reminders_removed_cb(self, proxy, sender_name, signal_name, parameters): app_id, deleted_reminders = parameters.unpack() if app_id != info.app_id: for reminder_id in deleted_reminders: - self.delete_reminder(reminder_id) + self.win.remove_reminder_id(reminder_id, False) self.win.invalidate_filter() @@ -304,24 +334,58 @@ def reminder_updated_cb(self, proxy, sender_name, signal_name, parameters): self.win.invalidate_filter() self.win.reminders_list.invalidate_sort() - def delete_reminder(self, reminder_id): - try: - reminder = self.win.reminder_lookup_dict[reminder_id] - - self.win.reminders_list.remove(reminder) - - self.win.reminder_lookup_dict.pop(reminder_id) - except: - pass - def reminder_deleted_cb(self, proxy, sender_name, signal_name, parameters): app_id, reminder_id = parameters.unpack() if app_id != info.app_id: - self.delete_reminder(reminder_id) + self.win.remove_reminder_id(reminder_id, False) self.win.invalidate_filter() + def watch(self, cb): + self.watcher_id = Gio.bus_watch_name( + Gio.BusType.SESSION, + info.service_id, + Gio.BusNameWatcherFlags.NONE, + lambda *args: cb(), + None + ) + def connect_to_service(self): - self.service = Gio.DBusProxy.new_for_bus_sync( + if info.on_windows: + # Can't seem to autostart dbus services on windows + Launcher.launch_uri_async(Uri(f'{info.win_service_id}:')) + event = Event() + cb = event.set + timeout = ThreadPoolTimer.create_timer(lambda *args: self.timeout_error(), timedelta(seconds=10)) + context = GLib.MainContext.new() + context.push_thread_default() + self.watch(cb) + while not event.is_set(): + context.iteration(True) + context.pop_thread_default() + timeout.cancel() + self.do_connect() + else: + self.do_connect() + + def timeout_error(self): + logger.error('Failed to connect to service') + _exit(1) + + def watch(self, cb): + self.watcher_id = Gio.bus_watch_name( + Gio.BusType.SESSION, + info.service_id, + Gio.BusNameWatcherFlags.NONE, + lambda *args: cb(), + None + ) + + def do_connect(self): + if self.watcher_id is not None: + Gio.bus_unwatch_name(self.watcher_id) + self.watcher_id = None + + service = Gio.DBusProxy.new_for_bus_sync( Gio.BusType.SESSION, Gio.DBusProxyFlags.NONE, None, @@ -330,17 +394,49 @@ def connect_to_service(self): info.service_interface, None ) + if service is None: + logger.error('Failed to start proxy to connect to service') + sys.exit(1) + + address = self.run_service_method('GetPrivateAddress', None, retry = False, service = service).unpack()[0] + connection = Gio.DBusConnection.new_for_address_sync( + address, + Gio.DBusConnectionFlags.AUTHENTICATION_CLIENT, + None, + None + ) + self.service = Gio.DBusProxy.new_sync( + connection, + Gio.DBusProxyFlags.NONE, + None, + None, + info.service_object, + info.service_interface, + None + ) if self.service is not None: - self.logger.info('Connected to service') + logger.info('Connected to service') else: - self.logger.error('Faled to start proxy to connect to service') + logger.error('Failed to start proxy to connect to service') sys.exit(1) - def run_service_method(self, method, parameters, sync = True, callback = None, retry = True, show_error_dialog = True): + def watch(self, cb): + watcher_id = Gio.bus_watch_name( + Gio.BusType.SESSION, + info.service_id, + Gio.BusNameWatcherFlags.NONE, + lambda *args: cb(), + None + ) + return watcher_id + + def run_service_method(self, method, parameters, sync = True, callback = None, retry = True, show_error_dialog = True, service = None): self.mark_busy() + if service is None: + service = self.service try: if sync: - retval = self.service.call_sync( + retval = service.call_sync( method, parameters, Gio.DBusCallFlags.NONE, @@ -348,7 +444,7 @@ def run_service_method(self, method, parameters, sync = True, callback = None, r None ) else: - retval = self.service.call( + retval = service.call( method, parameters, Gio.DBusCallFlags.NONE, @@ -359,12 +455,13 @@ def run_service_method(self, method, parameters, sync = True, callback = None, r ) except GLib.GError as error: error_text = ''.join(format_exception(error)) + # This sucks but I don't think these strings get translated so it's probably fine i guess if 'The name is not activatable' in str(error): if show_error_dialog: if self.error_dialog is not None: self.error_dialog.destroy() self.error_dialog = None - self.error_dialog = ErrorDialog(self, _('Reminders failed to start'), _('If this is your first time running Reminders, you will probably have to log out and log back in before using it. This is due to a bug in Flatpak.'), error_text) + self.error_dialog = ErrorDialog(self, _('Retainer failed to start'), _('If this is your first time running Retainer, you will probably have to log out and log back in before using it. This is due to a bug in Flatpak.'), error_text) self.unmark_busy() raise error elif 'failed to execute' in str(error) or not retry: # method failed @@ -377,7 +474,10 @@ def run_service_method(self, method, parameters, sync = True, callback = None, r raise error elif retry: # service was probably disconnected self.connect_to_service() - retval = self.run_service_method(method, parameters, sync, callback, False) + retval = self.run_service_method(method, parameters, sync, callback, False, show_error_dialog, service) + else: + self.unmark_busy() + raise error self.unmark_busy() return retval @@ -398,13 +498,27 @@ def show_shortcuts(self, action, data): ShortcutsWindow(self.win) def export(self, action, data): - ExportListsWindow(self) + dialog = Gtk.FileDialog.new() + + dialog.select_folder(self.win, None, self.export_cb) + + def export_cb(self, dialog, result, data = None): + try: + folder = dialog.select_folder_finish(result) + except: + return + + ExportListsWindow(self, folder) def import_lists(self, action, data): dialog = Gtk.FileDialog.new() filters = Gio.ListStore.new(Gtk.FileFilter) file_filter = Gtk.FileFilter.new() - file_filter.add_mime_type('text/calendar') + if info.on_windows: + file_filter.add_pattern('*.ics') + file_filter.add_pattern('*.ical') + else: + file_filter.add_mime_type('text/calendar') filters.append(file_filter) dialog.set_filters(filters) dialog.open_multiple(self.win, None, self.open_cb) @@ -430,15 +544,6 @@ def show_preferences(self, action, data): else: self.preferences.set_visible(True) - def configure_logging(self): - handler = logging.StreamHandler() - handler.setLevel(logging.INFO) - formatter = logging.Formatter('%(asctime)s - %(name)s - %(levelname)s - %(module)s:%(funcName)s - %(message)s') - handler.setFormatter(formatter) - self.logger = logging.getLogger(info.app_executable) - self.logger.setLevel(logging.INFO) - self.logger.addHandler(handler) - def refresh_reminders(self, action = None, data = None): if not self.refreshing: self.start_spinners() @@ -446,22 +551,40 @@ def refresh_reminders(self, action = None, data = None): def stop_spinners(self): self.win.spinner.stop() + self.win.refresh_button.set_sensitive(True) if self.preferences is not None: + self.preferences.refresh_button.set_sensitive(True) self.preferences.spinner.stop() self.refreshing = False def start_spinners(self): self.refreshing = True + self.win.refresh_button.set_sensitive(False) self.win.spinner.start() if self.preferences is not None: + self.preferences.refresh_button.set_sensitive(False) self.preferences.spinner.start() def quit_app(self, action, data): self.quit() def main(): + if info.on_windows: + try: + args = AppInstance.get_activated_event_args() + if args is not None: + if args.kind == activation.ActivationKind.FILE: + args = activation.FileActivatedEventArgs._from(args) + for file in args.files: + sys.argv.append(file.path) + elif args.kind == activation.ActivationKind.PROTOCOL: + args = activation.ProtocolActivatedEventArgs._from(args) + sys.argv.append(args.uri.raw_uri) + except Exception as error: + logger.exception(error) + try: - app = Remembrance(application_id=info.app_id, flags=Gio.ApplicationFlags.HANDLES_COMMAND_LINE) + app = Retainer(application_id=info.app_id, flags=Gio.ApplicationFlags.HANDLES_COMMAND_LINE) return app.run(sys.argv) except: sys.exit(1) diff --git a/src/browser/caldav_sign_in.py b/src/browser/caldav_sign_in.py index ef1ee5b..f41c8f2 100644 --- a/src/browser/caldav_sign_in.py +++ b/src/browser/caldav_sign_in.py @@ -1,31 +1,24 @@ # caldav_sign_in.py # Copyright (C) 2023 Sasha Hale # -# 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 . +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at https://mozilla.org/MPL/2.0/. -from reminders import info -from gi.repository import Gtk, Adw, GLib +from retainer import info +from gi.repository import Gtk, GLib from logging import getLogger logger = getLogger(info.app_executable) -@Gtk.Template(resource_path='/io/github/remindersdevs/Reminders/ui/caldav_sign_in.ui') -class CalDAVSignIn(Adw.Window): +@Gtk.Template(resource_path='/io/github/retainerdevs/Retainer/ui/caldav_sign_in.ui') +class CalDAVSignIn(Gtk.Window): __gtype_name__ = 'CaldavSignIn' name_entry = Gtk.Template.Child() url_entry = Gtk.Template.Child() username_entry = Gtk.Template.Child() password_entry = Gtk.Template.Child() + main = Gtk.Template.Child() def __init__(self, preferences, **kwargs): super().__init__(**kwargs) @@ -33,6 +26,12 @@ def __init__(self, preferences, **kwargs): self.app = preferences.app self.add_shortcut(Gtk.Shortcut.new(Gtk.ShortcutTrigger.parse_string('w'), Gtk.CallbackAction.new(lambda *args: self.close()))) + if info.on_windows: + self.set_titlebar(None) + sep = Gtk.Separator() + sep.add_css_class('titlebar-separator') + self.main.prepend(sep) + self.present() def caldav_sign_in(self, name, url, username, password): diff --git a/src/browser/calendar.py b/src/browser/calendar.py index e830151..1d61966 100644 --- a/src/browser/calendar.py +++ b/src/browser/calendar.py @@ -1,49 +1,43 @@ # calendar.py # Copyright (C) 2023 Sasha Hale # -# 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 . +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at https://mozilla.org/MPL/2.0/. import datetime from gi.repository import GLib, Gio -from reminders import info +from retainer import info from logging import getLogger from time import time -from threading import Thread +if info.on_windows: + from winsdk.windows.system.threading import ThreadPoolTimer logger = getLogger(info.app_executable) -class Calendar(Thread): +class Calendar(): '''Updates date labels when day changes''' def __init__(self, win): self.win = win self.time = datetime.datetime.combine(datetime.date.today(), datetime.time()) - self.countdown_id = 0 - super().__init__(target=self.run_countdown) - self.start() + self.timer = 0 - self.connection = Gio.bus_get_sync(Gio.BusType.SYSTEM, None) - self.connection.signal_subscribe( - 'org.freedesktop.login1', - 'org.freedesktop.login1.Manager', - 'PrepareForSleep', - '/org/freedesktop/login1', - None, - Gio.DBusSignalFlags.NONE, - self.on_wake_from_suspend, - None - ) + if not info.on_windows: + self.connection = Gio.bus_get_sync(Gio.BusType.SYSTEM, None) + self.connection.signal_subscribe( + 'org.freedesktop.login1', + 'org.freedesktop.login1.Manager', + 'PrepareForSleep', + '/org/freedesktop/login1', + None, + Gio.DBusSignalFlags.NONE, + self.on_wake_from_suspend, + None + ) + + self.run_countdown() def on_wake_from_suspend(self, connection, sender, object, interface, signal, parameters, data = None): if parameters.unpack()[0]: @@ -57,12 +51,17 @@ def on_countdown_done(self): reminder.refresh_time() if self.win.reminder_edit_win is not None: self.win.reminder_edit_win.update_date_button_label() - self.countdown_id = 0 + self.timer = 0 self.run_countdown() return False def remove_countdown(self): - GLib.Source.remove(self.countdown_id) + if self.timer != 0 and self.timer is not None: + if info.on_windows: + self.timer.cancel() + else: + GLib.Source.remove(self.timer) + self.timer = 0 def run_countdown(self, new_day = True): try: @@ -70,14 +69,15 @@ def run_countdown(self, new_day = True): self.time += datetime.timedelta(days=1) self.timestamp = self.time.timestamp() - if self.countdown_id != 0: - GLib.Source.remove(self.countdown_id) - self.countdown_id = 0 + self.remove_countdown() now = time() wait = int(1000 * (self.timestamp - now)) if wait > 0: - self.countdown_id = GLib.timeout_add(wait, self.on_countdown_done) + if info.on_windows: + self.timer = ThreadPoolTimer.create_timer(lambda *args: self.on_countdown_done(), datetime.timedelta(milliseconds=wait)) + else: + self.timer = GLib.timeout_add(wait, self.on_countdown_done) else: self.on_countdown_done() except Exception as error: diff --git a/src/browser/dnd_reminder.py b/src/browser/dnd_reminder.py index 6f3ae05..cb4cb74 100644 --- a/src/browser/dnd_reminder.py +++ b/src/browser/dnd_reminder.py @@ -1,21 +1,13 @@ # dnd_reminder.py # Copyright (C) 2023 Sasha Hale # -# 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 . +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at https://mozilla.org/MPL/2.0/. from gi.repository import Gtk, Adw -@Gtk.Template(resource_path='/io/github/remindersdevs/Reminders/ui/dnd_reminder.ui') +@Gtk.Template(resource_path='/io/github/retainerdevs/Retainer/ui/dnd_reminder.ui') class DNDReminder(Adw.ActionRow): __gtype_name__ = 'DNDReminder' diff --git a/src/browser/edit_lists_window.py b/src/browser/edit_lists_window.py index c6011f9..612016b 100644 --- a/src/browser/edit_lists_window.py +++ b/src/browser/edit_lists_window.py @@ -1,33 +1,26 @@ # edit_lists_window.py # Copyright (C) 2023 Sasha Hale # -# 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 . +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at https://mozilla.org/MPL/2.0/. from gi.repository import Gtk, Adw from gettext import gettext as _ -from reminders import info +from retainer import info from logging import getLogger DEFAULT_LIST_TITLE = _('New List') logger = getLogger(info.app_executable) -@Gtk.Template(resource_path='/io/github/remindersdevs/Reminders/ui/edit_lists_window.ui') -class EditListsWindow(Adw.Window): +@Gtk.Template(resource_path='/io/github/retainerdevs/Retainer/ui/edit_lists_window.ui') +class EditListsWindow(Gtk.Window): __gtype_name__ = 'EditListsWindow' box = Gtk.Template.Child() + main = Gtk.Template.Child() def __init__(self, win, *args, **kwargs): super().__init__(*args, **kwargs) @@ -49,6 +42,12 @@ def __init__(self, win, *args, **kwargs): except: pass + if info.on_windows: + self.set_titlebar(None) + sep = Gtk.Separator() + sep.add_css_class('titlebar-separator') + self.main.prepend(sep) + def list_updated(self, user_id, list_id, list_name): if user_id not in self.users.keys(): self.users[user_id] = ListGroup(self, user_id, self.win.usernames[user_id]) @@ -83,7 +82,11 @@ def do_close(self): self.unsaved = [] - self.set_visible(False) + if info.on_windows: + self.destroy() + self.win.edit_lists_window = None + else: + self.set_visible(False) @Gtk.Template.Callback() def on_close(self, window = None): @@ -99,6 +102,7 @@ def on_close(self, window = None): confirm_dialog.set_default_response('cancel') confirm_dialog.set_close_response('cancel') confirm_dialog.connect('response::yes', lambda *args: self.do_close()) + confirm_dialog.present() else: self.do_close() @@ -203,6 +207,7 @@ def show_delete_dialog(self): confirm_dialog.set_default_response('cancel') confirm_dialog.set_response_appearance('remove', Adw.ResponseAppearance.DESTRUCTIVE) confirm_dialog.connect('response::remove', lambda *args: self.delete()) + confirm_dialog.present() def delete(self): diff --git a/src/browser/error_dialog.py b/src/browser/error_dialog.py index f3d5db8..aa3e7a9 100644 --- a/src/browser/error_dialog.py +++ b/src/browser/error_dialog.py @@ -1,32 +1,35 @@ # error_dialog.py # Copyright (C) 2023 Sasha Hale # -# 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 . +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at https://mozilla.org/MPL/2.0/. from gi.repository import Gtk, Adw -@Gtk.Template(resource_path='/io/github/remindersdevs/Reminders/ui/error_dialog.ui') -class ErrorDialog(Adw.Window): +from retainer import info + +@Gtk.Template(resource_path='/io/github/retainerdevs/Retainer/ui/error_dialog.ui') +class ErrorDialog(Gtk.Window): __gtype_name__ = 'ErrorDialog' body = Gtk.Template.Child() error = Gtk.Template.Child() + main = Gtk.Template.Child() def __init__(self, app, title: str, body: str, error: str, parent_window = None, *args, **kwargs): super().__init__(*args, **kwargs) self.set_title(title) self.body.set_label(body) self.error.set_buffer(Gtk.TextBuffer(text=error)) + self.add_shortcut(Gtk.Shortcut.new(Gtk.ShortcutTrigger.parse_string('w'), Gtk.CallbackAction.new(lambda *args: self.close()))) + + if info.on_windows: + self.set_titlebar(None) + sep = Gtk.Separator() + sep.add_css_class('titlebar-separator') + self.main.prepend(sep) + if app.win is not None: if parent_window is None: parent_window = app.win @@ -38,9 +41,9 @@ def __init__(self, app, title: str, body: str, error: str, parent_window = None, parent_window = app.win.edit_lists_window self.set_transient_for(parent_window) self.set_modal(True) + + self.present() else: - Gtk.StyleContext.add_provider_for_display(self.get_display(), app.provider, Gtk.STYLE_PROVIDER_PRIORITY_APPLICATION) self.set_application(app) + self.present() - self.present() - self.add_shortcut(Gtk.Shortcut.new(Gtk.ShortcutTrigger.parse_string('w'), Gtk.CallbackAction.new(lambda *args: self.close()))) diff --git a/src/browser/export_lists_window.py b/src/browser/export_lists_window.py index a596f39..2161da9 100644 --- a/src/browser/export_lists_window.py +++ b/src/browser/export_lists_window.py @@ -1,24 +1,20 @@ # export_lists_window.py # Copyright (C) 2023 Sasha Hale # -# 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 . +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at https://mozilla.org/MPL/2.0/. from gi.repository import Gtk, Adw, GLib, Gio from gettext import gettext as _ -from reminders import info +from retainer import info from logging import getLogger +if info.on_windows: + from winsdk.windows.system import Launcher + from winsdk.windows.foundation import Uri + logger = getLogger(info.app_executable) class ListRow(Adw.ActionRow): @@ -28,17 +24,19 @@ def __init__(self, *args, **kwargs): self.add_suffix(self.check) self.connect('activated', lambda *args: self.check.set_active(not self.check.get_active())) -@Gtk.Template(resource_path='/io/github/remindersdevs/Reminders/ui/export_lists_window.ui') -class ExportListsWindow(Adw.Window): +@Gtk.Template(resource_path='/io/github/retainerdevs/Retainer/ui/export_lists_window.ui') +class ExportListsWindow(Gtk.Window): __gtype_name__ = 'ExportListsWindow' lists = Gtk.Template.Child() + main = Gtk.Template.Child() - def __init__(self, app, *args, **kwargs): + def __init__(self, app, folder, *args, **kwargs): super().__init__(*args, **kwargs) self.app = app self.win = app.win self.rows = {} + self.folder = folder self.set_transient_for(self.win) for list_id, value in self.win.synced_lists.items(): @@ -51,10 +49,19 @@ def __init__(self, app, *args, **kwargs): self.add_shortcut(Gtk.Shortcut.new(Gtk.ShortcutTrigger.parse_string('s'), Gtk.CallbackAction.new(lambda *args: self.on_save()))) self.add_shortcut(Gtk.Shortcut.new(Gtk.ShortcutTrigger.parse_string('w'), Gtk.CallbackAction.new(lambda *args: self.close()))) + if info.on_windows: + self.set_titlebar(None) + sep = Gtk.Separator() + sep.add_css_class('titlebar-separator') + self.main.prepend(sep) + self.present() def launch_folder(self, uri): - Gio.AppInfo.launch_default_for_uri(uri, None) + if info.on_windows: + Launcher.launch_uri_async(Uri(uri)) + else: + Gio.AppInfo.launch_default_for_uri(uri, None) self.close() @Gtk.Template.Callback() @@ -70,9 +77,7 @@ def on_save(self, button = None): if len(lists) > 0: try: - result = self.app.run_service_method('ExportLists', GLib.Variant('(as)', (lists,))) - folder = result.unpack()[0] - uri = GLib.filename_to_uri(folder, None) + self.app.run_service_method('ExportLists', GLib.Variant('(sas)', (self.folder.get_path(), lists))) dialog = Adw.MessageDialog( transient_for=self, heading=_('Success!'), @@ -84,7 +89,8 @@ def on_save(self, button = None): dialog.set_default_response('cancel') dialog.set_close_response('cancel') dialog.connect('response::close', lambda *args: self.close()) - dialog.connect('response::yes', lambda *args: self.launch_folder(uri)) + dialog.connect('response::yes', lambda *args: self.launch_folder(self.folder.get_uri())) + dialog.present() except Exception as error: logger.exception(error) diff --git a/src/browser/import_lists_window.py b/src/browser/import_lists_window.py index 607bd87..e5eea82 100644 --- a/src/browser/import_lists_window.py +++ b/src/browser/import_lists_window.py @@ -1,33 +1,26 @@ # import_lists_window.py # Copyright (C) 2023 Sasha Hale # -# 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 . +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at https://mozilla.org/MPL/2.0/. from gi.repository import Gtk, Adw, GLib from gettext import gettext as _ -from reminders import info -from reminders.browser.error_dialog import ErrorDialog +from retainer import info +from retainer.browser.error_dialog import ErrorDialog from traceback import format_exception from logging import getLogger logger = getLogger(info.app_executable) -@Gtk.Template(resource_path='/io/github/remindersdevs/Reminders/ui/import_lists_window.ui') -class ImportListsWindow(Adw.Window): +@Gtk.Template(resource_path='/io/github/retainerdevs/Retainer/ui/import_lists_window.ui') +class ImportListsWindow(Gtk.Window): __gtype_name__ = 'ImportListsWindow' expander = Gtk.Template.Child() task_list_row = Gtk.Template.Child() + main = Gtk.Template.Child() def __init__(self, app, files, *args, **kwargs): super().__init__(*args, **kwargs) @@ -42,6 +35,12 @@ def __init__(self, app, files, *args, **kwargs): self.add_shortcut(Gtk.Shortcut.new(Gtk.ShortcutTrigger.parse_string('s'), Gtk.CallbackAction.new(lambda *args: self.on_save()))) self.add_shortcut(Gtk.Shortcut.new(Gtk.ShortcutTrigger.parse_string('w'), Gtk.CallbackAction.new(lambda *args: self.close()))) + if info.on_windows: + self.set_titlebar(None) + sep = Gtk.Separator() + sep.add_css_class('titlebar-separator') + self.main.prepend(sep) + self.present() def do_save(self): @@ -74,4 +73,5 @@ def on_save(self, button = None): confirm_dialog.set_default_response('cancel') confirm_dialog.set_close_response('cancel') confirm_dialog.connect('response::yes', lambda *args: self.do_save()) + confirm_dialog.present() diff --git a/src/browser/main_window.py b/src/browser/main_window.py index 84a2820..f9d9b74 100644 --- a/src/browser/main_window.py +++ b/src/browser/main_window.py @@ -1,17 +1,9 @@ # main_window.py # Copyright (C) 2023 Sasha Hale # -# 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 . +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at https://mozilla.org/MPL/2.0/. import datetime @@ -21,12 +13,12 @@ from gi.repository import Gtk, Adw, GLib, Gio, GObject, Gdk -from reminders import info -from reminders.browser.reminder import Reminder -from reminders.browser.calendar import Calendar -from reminders.browser.edit_lists_window import EditListsWindow -from reminders.browser.reminder_edit_window import ReminderEditWindow -from reminders.browser.move_reminders_window import MoveRemindersWindow +from retainer import info +from retainer.browser.reminder import Reminder +from retainer.browser.calendar import Calendar +from retainer.browser.edit_lists_window import EditListsWindow +from retainer.browser.reminder_edit_page import ReminderEditPage +from retainer.browser.move_reminders_window import MoveRemindersWindow from time import time, strftime from logging import getLogger from gettext import gettext as _ @@ -35,7 +27,9 @@ logger = getLogger(info.app_executable) -@Gtk.Template(resource_path='/io/github/remindersdevs/Reminders/ui/task_list_row.ui') +UI = 'main_window_win32' if info.on_windows else 'main_window' + +@Gtk.Template(resource_path='/io/github/retainerdevs/Retainer/ui/task_list_row.ui') class TaskListRow(Gtk.ListBoxRow): __gtype_name__ = 'TaskListRow' label = Gtk.Template.Child() @@ -57,11 +51,16 @@ def set_count(self, count): self.count_label.set_visible(count != 0) self.count_label.set_label(str(count)) -@Gtk.Template(resource_path='/io/github/remindersdevs/Reminders/ui/main_window.ui') -class MainWindow(Adw.ApplicationWindow): + +@Gtk.Template(resource_path=f'/io/github/retainerdevs/Retainer/ui/{UI}.ui') +class MainWindow(Gtk.ApplicationWindow): '''Main application Window''' __gtype_name__ = 'MainWindow' + refresh_button = Gtk.Template.Child() + search_bar = Gtk.Template.Child() + leaflet = Gtk.Template.Child() + main = Gtk.Template.Child() page_label = Gtk.Template.Child() page_sub_label = Gtk.Template.Child() app_menu_button = Gtk.Template.Child() @@ -73,13 +72,12 @@ class MainWindow(Adw.ApplicationWindow): upcoming_row = Gtk.Template.Child() past_row = Gtk.Template.Child() completed_row = Gtk.Template.Child() + sort_button_box = Gtk.Template.Child() sort_button = Gtk.Template.Child() flap = Gtk.Template.Child() flap_button_revealer = Gtk.Template.Child() - search_revealer = Gtk.Template.Child() search_entry = Gtk.Template.Child() task_lists_list = Gtk.Template.Child() - label_revealer = Gtk.Template.Child() spinner = Gtk.Template.Child() add_reminder_revealer = Gtk.Template.Child() multiple_select_revealer = Gtk.Template.Child() @@ -108,11 +106,11 @@ def __init__(self, page: str, app, *args, **kwargs): self.set_title(info.app_name) self.set_icon_name(info.app_id) self.dropdown_connection = None - self.reminder_edit_win = None self.edit_lists_window = None self.expanded = None self.last_selected_row = None self.selected = None + self.reminder_edit_page = None self.row_filter_pairs = ( (self.all_row, self.all_filter, self.all_count_label), @@ -131,11 +129,10 @@ def __init__(self, page: str, app, *args, **kwargs): self.create_action('upcoming', lambda *args: self.upcoming_reminders()) self.create_action('past', lambda *args: self.past_reminders()) self.create_action('completed', lambda *args: self.completed_reminders()) - self.create_action('search', lambda *args: self.search_revealer.set_reveal_child(True), accels=['f']) + self.create_action('search', lambda *args: self.search_bar.set_search_mode(True), accels=['f']) self.create_action('edit-task-lists', lambda *args: self.edit_lists(), accels=['l']) self.create_action('new-reminder', lambda *args: self.new_reminder(), accels=['n']) self.create_action('select-all', lambda *args: self.select_all(), accels=['a']) - self.search_entry.connect('stop-search', lambda *args: self.search_revealer.set_reveal_child(False)) self.settings_create_action('sort') self.settings_create_action('descending-sort') self.settings_create_action('selected-list') @@ -170,16 +167,21 @@ def __init__(self, page: str, app, *args, **kwargs): self.set_synced_ids() self.set_task_lists() + self.reminder_edit_page = ReminderEditPage(self, self.app) + self.edit_leaflet_page = self.leaflet.append(self.reminder_edit_page) + reminders = self.app.run_service_method('GetReminders', None).unpack()[0] self.unpack_reminders(reminders) self.reminders_list.connect('selected-rows-changed', self.selected_changed) key_pressed = Gtk.EventControllerKey() - key_pressed.connect('key-released', self.key_released) + key_pressed.connect('key-pressed', self.key_pressed) self.add_controller(key_pressed) self.setup_dnd() + self.connect('close-request', self.on_close) + self.task_lists_list.set_sort_func(self.task_lists_sort_func) self.app.settings.connect('changed::time-format', lambda *args: self.set_time_format()) self.set_application(self.app) @@ -194,6 +196,26 @@ def time_format(self): def time_format(self, value): self._time_format = value + def on_close(self, window): + if self.reminder_edit_page.check_changed(self.reminder_edit_page.get_options()): + confirm_dialog = Adw.MessageDialog( + transient_for=self, + heading=_('You have unsaved changes'), + body=_('Are you sure you want to close the window?'), + ) + confirm_dialog.add_response('cancel', _('Cancel')) + confirm_dialog.add_response('yes', _('Yes')) + confirm_dialog.set_response_appearance('yes', Adw.ResponseAppearance.DESTRUCTIVE) + confirm_dialog.set_default_response('cancel') + confirm_dialog.set_close_response('cancel') + confirm_dialog.connect('response::yes', lambda *args: self.destroy()) + + confirm_dialog.present() + else: + self.destroy() + + return True + def invalidate_filter(self): self.reminders_list.invalidate_filter() current_filter = None @@ -221,6 +243,32 @@ def invalidate_filter(self): count += 1 row.set_count(count) + def remove_reminder(self, reminder, remove_backend=True): + if reminder.id is not None: + if remove_backend: + self.app.run_service_method( + 'RemoveReminder', + GLib.Variant('(ss)', (info.app_id, reminder.id)) + ) + if reminder.id in self.reminder_lookup_dict: + self.reminder_lookup_dict.pop(reminder.id) + if reminder is self.reminder_edit_page.reminder: + self.reminder_edit_page.unfocus(False) + self.reminders_list.remove(reminder) + + def remove_reminder_id(self, reminder_id, remove_backend=True): + if remove_backend: + self.app.run_service_method( + 'RemoveReminder', + GLib.Variant('(ss)', (info.app_id, reminder_id)) + ) + if reminder_id in self.reminder_lookup_dict: + reminder = self.reminder_lookup_dict[reminder_id] + if reminder is self.reminder_edit_page.reminder: + self.reminder_edit_page.unfocus(False) + self.reminders_list.remove(reminder) + self.reminder_lookup_dict.pop(reminder_id) + def setup_dnd(self): drop_target = Gtk.DropTarget.new(GObject.TYPE_STRV, Gdk.DragAction.MOVE) drop_target.connect('enter', self.enter) @@ -281,7 +329,7 @@ def drop(self, drop_target, values, x, y): 'repeat-frequency': GLib.Variant('q', opts['repeat-frequency']), 'repeat-days': GLib.Variant('q', opts['repeat-days']), 'repeat-times': GLib.Variant('n', opts['repeat-times']), - 'repeat-until': GLib.Variant('u', opts['repeat-until']), + 'repeat-until': GLib.Variant('t', opts['repeat-until']), 'list-id': GLib.Variant('s', opts['list-id']) }) reminder.show() @@ -313,9 +361,12 @@ def week_start_changed(self): for reminder in self.reminder_lookup_dict.values(): reminder.set_time_label() - def key_released(self, event, keyval, keycode, state): + def key_pressed(self, event, keyval, keycode, state): if keyval == Gdk.KEY_Escape: - self.set_selecting(False) + if self.reminders_list.get_property('selection-mode') != Gtk.SelectionMode.NONE: + self.set_selecting(False) + elif not self.search_entry.has_focus(): + self.reminder_edit_page.unfocus() if keyval == Gdk.KEY_Delete: if self.reminders_list.get_property('selection-mode') != Gtk.SelectionMode.NONE: self.selected_remove() @@ -342,7 +393,7 @@ def select_all(self): self.set_selecting(True) for reminder in self.reminder_lookup_dict.values(): reminder.set_selectable(True) - if reminder.get_visible(): + if reminder.get_sensitive(): self.reminders_list.select_row(reminder) def selected_changed(self, list_box = None): @@ -372,32 +423,12 @@ def selected_changed(self, list_box = None): self.unimportant_revealer.set_hexpand(self.unimportant_revealer.props.reveal_child) self.important_revealer.set_hexpand(self.important_revealer.props.reveal_child) - def new_edit_win(self, reminder = None): - if self.reminder_edit_win is None: - self.reminder_edit_win = ReminderEditWindow(self, self.app, reminder) - self.reminder_edit_win.present() - self.reminder_edit_win.connect('close-request', self.close_edit_win) + def close_edit_win(self): + if info.on_windows: + self.reminder_edit_page.destroy() + self.reminder_edit_page = None else: - self.reminder_edit_win.setup(reminder) - self.reminder_edit_win.set_visible(True) - - def close_edit_win(self, window = None): - if self.reminder_edit_win.check_changed(self.reminder_edit_win.get_options()): - confirm_dialog = Adw.MessageDialog( - transient_for=self.reminder_edit_win, - heading=_('You have unsaved changes'), - body=_('Are you sure you want to close the window?'), - ) - confirm_dialog.add_response('cancel', _('Cancel')) - confirm_dialog.add_response('yes', _('Yes')) - confirm_dialog.set_response_appearance('yes', Adw.ResponseAppearance.DESTRUCTIVE) - confirm_dialog.set_default_response('cancel') - confirm_dialog.set_close_response('cancel') - confirm_dialog.connect('response::yes', lambda *args: self.reminder_edit_win.set_visible(False)) - confirm_dialog.present() - return True - else: - self.reminder_edit_win.set_visible(False) + self.reminder_edit_page.set_visible(False) def get_repeat_label(self, repeat_type, repeat_frequency, repeat_days, repeat_until, repeat_times): repeat_days_flag = info.RepeatDays(repeat_days) @@ -532,6 +563,7 @@ def get_time_label(self, time): def edit_lists(self): if self.edit_lists_window is None: self.edit_lists_window = EditListsWindow(self) + self.edit_lists_window.present() else: self.edit_lists_window.set_visible(True) @@ -774,8 +806,8 @@ def set_reminder_task_list_dropdown(self): self.string_list.append(f"{name} ({self.usernames[user_id]})") self.task_list_ids.append(list_id) - if self.reminder_edit_win is not None: - self.reminder_edit_win.set_task_list_dropdown() + if self.reminder_edit_page is not None: + self.reminder_edit_page.set_task_list_dropdown() self.move_revealer.set_reveal_child(len(self.task_list_ids) > 1) self.move_revealer.set_hexpand(self.move_revealer.props.reveal_child) @@ -909,15 +941,20 @@ def task_list_filter(self, reminder, list_id = None): return task_list == selected_list_id def no_filter(self, reminder): - #reminder.set_sensitive(True) - reminder.set_no_strikethrough(True) - return True + retval = self.task_list_filter(reminder) + if retval: + reminder.set_no_strikethrough(True) + reminder.set_sensitive(retval) + if not retval: + self.reminders_list.unselect_row(reminder) + reminder.set_selectable(False) + return retval def all_filter(self, reminder, list_id = None, just_filter = False): retval = self.task_list_filter(reminder, list_id) if not just_filter: reminder.set_no_strikethrough(False) - #reminder.set_sensitive(retval) + reminder.set_sensitive(retval) if not retval: self.reminders_list.unselect_row(reminder) reminder.set_selectable(False) @@ -930,7 +967,7 @@ def upcoming_filter(self, reminder, list_id = None, just_filter = False): else: retval = False if not just_filter: - #reminder.set_sensitive(retval) + reminder.set_sensitive(retval) if not retval: self.reminders_list.unselect_row(reminder) reminder.set_selectable(False) @@ -944,7 +981,7 @@ def past_filter(self, reminder, list_id = None, just_filter = False): else: retval = False if not just_filter: - #reminder.set_sensitive(retval) + reminder.set_sensitive(retval) if not retval: self.reminders_list.unselect_row(reminder) reminder.set_selectable(False) @@ -958,7 +995,7 @@ def completed_filter(self, reminder, list_id = None, just_filter = False): else: retval = False if not just_filter: - #reminder.set_sensitive(retval) + reminder.set_sensitive(retval) if not retval: self.reminders_list.unselect_row(reminder) reminder.set_selectable(False) @@ -1087,14 +1124,13 @@ def completed_reminders(self): def stop_search(self): self.search_entry.set_text('') - self.flap.set_fold_policy(Adw.FlapFoldPolicy.AUTO) self.reminders_list.set_placeholder(self.placeholder) self.reminders_list.set_sort_func(self.sort_func) self.selected.emit('activate') - self.label_revealer.set_reveal_child(True) + self.sidebar_list.set_sensitive(True) def search_filter(self, reminder): - retval = True + retval = self.task_list_filter(reminder) text = self.search_entry.get_text().lower() words = text.split() reminder_text = reminder.options['title'].lower() + ' ' + reminder.options['description'].lower() @@ -1106,7 +1142,7 @@ def search_filter(self, reminder): if retval: reminder.set_no_strikethrough(True) - #reminder.set_sensitive(retval) + reminder.set_sensitive(retval) if not retval: self.reminders_list.unselect_row(reminder) reminder.set_selectable(False) @@ -1134,8 +1170,7 @@ def search_sort_func(self, row1, row2): def start_search(self): self.searching = True - self.sort_button.set_sensitive(False) - + self.sort_button_box.set_sensitive(False) self.reminders_list.set_placeholder(self.search_placeholder) self.reminders_list.set_filter_func(self.search_filter) self.reminders_list.set_sort_func(self.search_sort_func) @@ -1144,7 +1179,7 @@ def selected_remove_reminders(self): try: reminder_ids = [] for reminder in self.reminders_list.get_selected_rows(): - if reminder.get_visible(): + if reminder.get_sensitive(): reminder_ids.append(reminder.id) results = self.app.run_service_method( @@ -1156,9 +1191,7 @@ def selected_remove_reminders(self): removed_reminder_ids = results.unpack()[0] for reminder_id in removed_reminder_ids: - reminder = self.reminder_lookup_dict[reminder_id] - self.reminder_lookup_dict.pop(reminder_id) - self.reminders_list.remove(reminder) + self.remove_reminder_id(reminder_id, False) except Exception as error: logger.exception(error) @@ -1169,7 +1202,7 @@ def selected_change_important(self, important): try: variants = [] for reminder in self.reminders_list.get_selected_rows(): - if reminder.get_visible() and reminder.options['important'] != important: + if reminder.get_sensitive() and reminder.options['important'] != important: variants.append( { 'id': GLib.Variant('s', reminder.id), @@ -1205,7 +1238,7 @@ def selected_change_completed(self, completed): try: reminder_ids = [] for reminder in self.reminders_list.get_selected_rows(): - if reminder.get_visible() and reminder.completed != completed: + if reminder.get_sensitive() and reminder.completed != completed: reminder_ids.append(reminder.id) results = self.app.run_service_method( @@ -1230,19 +1263,18 @@ def selected_change_completed(self, completed): @Gtk.Template.Callback() def show_flap_button(self, flap = None, data = None): - if self.search_revealer.get_reveal_child(): + if self.search_bar.get_search_mode(): self.flap_button_revealer.set_reveal_child(False) else: self.flap_button_revealer.set_reveal_child(self.flap.get_folded()) @Gtk.Template.Callback() def search_enabled_cb(self, entry, data): - self.show_flap_button() - if self.search_revealer.get_reveal_child(): + if self.search_bar.get_search_mode(): self.search_changed_cb() self.search_entry.grab_focus() - self.flap.set_fold_policy(Adw.FlapFoldPolicy.ALWAYS) - self.flap.set_reveal_flap(False) + if self.flap.get_folded(): + self.flap.set_reveal_flap(False) else: self.stop_search() @@ -1255,21 +1287,21 @@ def search_changed_cb(self, entry = False): self.reminders_list.invalidate_filter() self.reminders_list.invalidate_sort() self.page_label.set_label(_(f"Searching '{text}'")) - self.label_revealer.set_reveal_child(False) + self.sidebar_list.set_sensitive(False) else: self.searching = False - self.sort_button.set_sensitive(True) + self.sort_button_box.set_sensitive(True) self.reminders_list.set_filter_func(self.no_filter) self.reminders_list.set_sort_func(self.sort_func) self.page_label.set_label(_('Start typing to search')) - self.label_revealer.set_reveal_child(False) + self.sidebar_list.set_sensitive(False) @Gtk.Template.Callback() def new_reminder(self, button = None): - self.search_revealer.set_reveal_child(False) + self.search_bar.set_search_mode(False) self.selected = self.all_row self.selected.emit('activate') - self.new_edit_win() + self.reminder_edit_page.new_reminder() @Gtk.Template.Callback() def on_cancel(self, btn): @@ -1288,6 +1320,7 @@ def selected_complete(self, btn): confirm_dialog.set_default_response('cancel') confirm_dialog.set_close_response('cancel') confirm_dialog.connect('response::yes', lambda *args: self.selected_change_completed(True)) + confirm_dialog.present() @Gtk.Template.Callback() @@ -1303,6 +1336,7 @@ def selected_incomplete(self, btn): confirm_dialog.set_default_response('cancel') confirm_dialog.set_close_response('cancel') confirm_dialog.connect('response::yes', lambda *args: self.selected_change_completed(False)) + confirm_dialog.present() @Gtk.Template.Callback() @@ -1322,6 +1356,7 @@ def selected_important(self, btn): confirm_dialog.set_default_response('cancel') confirm_dialog.set_close_response('cancel') confirm_dialog.connect('response::yes', lambda *args: self.selected_change_important(True)) + confirm_dialog.present() @Gtk.Template.Callback() @@ -1337,6 +1372,7 @@ def selected_unimportant(self, btn): confirm_dialog.set_default_response('cancel') confirm_dialog.set_close_response('cancel') confirm_dialog.connect('response::yes', lambda *args: self.selected_change_important(False)) + confirm_dialog.present() @Gtk.Template.Callback() @@ -1352,4 +1388,5 @@ def selected_remove(self, btn = None): confirm_dialog.set_default_response('cancel') confirm_dialog.set_close_response('cancel') confirm_dialog.connect('response::yes', lambda *args: self.selected_remove_reminders()) + confirm_dialog.present() diff --git a/src/browser/meson.build b/src/browser/meson.build index 9832ef4..2f00ee3 100644 --- a/src/browser/meson.build +++ b/src/browser/meson.build @@ -1,7 +1,3 @@ -conf = configuration_data() -conf.set('PYTHON_PATH', python.full_path()) -conf.set('LOCALE_DIR', get_option('prefix') / get_option('localedir')) - source_files = files( '__init__.py', 'about.py', @@ -18,7 +14,7 @@ source_files = files( 'move_reminders_window.py', 'preferences.py', 'reminder.py', - 'reminder_edit_window.py', + 'reminder_edit_page.py', 'shortcuts_window.py' ) @@ -28,8 +24,8 @@ install_data( ) configure_file( - input: 'reminders.py', - output: app_executable, + input: 'retainer.py', + output: app_file, configuration: conf, install: true, install_dir: get_option('prefix') / get_option('bindir') diff --git a/src/browser/microsoft_sign_in.py b/src/browser/microsoft_sign_in.py index 58eba0a..33c5c95 100644 --- a/src/browser/microsoft_sign_in.py +++ b/src/browser/microsoft_sign_in.py @@ -1,30 +1,22 @@ # caldav_sign_in.py # Copyright (C) 2023 Sasha Hale # -# 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 . +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at https://mozilla.org/MPL/2.0/. -import gi +from gi import require_version -from reminders import info +from retainer import info -gi.require_version('WebKit', '6.0') +require_version('WebKit', '6.0') from gi.repository import Gtk, Adw, WebKit from logging import getLogger logger = getLogger(info.app_executable) -@Gtk.Template(resource_path='/io/github/remindersdevs/Reminders/ui/microsoft_sign_in.ui') +@Gtk.Template(resource_path='/io/github/retainerdevs/Retainer/ui/microsoft_sign_in.ui') class MicrosoftSignIn(Adw.Window): __gtype_name__ = 'MicrosoftSignIn' @@ -40,8 +32,7 @@ def __init__(self, preferences, **kwargs): self.web.set_vexpand(True) url = self.app.run_service_method('MSGetLoginURL', None).unpack()[0] - self.app.service.connect('g-signal::MSSignedIn', lambda *args: self.destroy()) - self.web.load_uri(url) self.main.append(self.web) + self.present() diff --git a/src/browser/move_reminders_window.py b/src/browser/move_reminders_window.py index 24d5ddf..a49c2ad 100644 --- a/src/browser/move_reminders_window.py +++ b/src/browser/move_reminders_window.py @@ -1,31 +1,24 @@ # move_reminders_window.py # Copyright (C) 2023 Sasha Hale # -# 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 . +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at https://mozilla.org/MPL/2.0/. from gi.repository import Gtk, Adw, GLib -from reminders import info +from retainer import info from gettext import gettext as _ from logging import getLogger logger = getLogger(info.app_executable) -@Gtk.Template(resource_path='/io/github/remindersdevs/Reminders/ui/move_reminders_window.ui') -class MoveRemindersWindow(Adw.Window): +@Gtk.Template(resource_path='/io/github/retainerdevs/Retainer/ui/move_reminders_window.ui') +class MoveRemindersWindow(Gtk.Window): __gtype_name__ = 'MoveRemindersWindow' lists = Gtk.Template.Child() + main = Gtk.Template.Child() def __init__(self, win, reminders, *args, **kwargs): super().__init__(*args, **kwargs) @@ -46,6 +39,12 @@ def __init__(self, win, reminders, *args, **kwargs): if list_id == selected: self.lists.select_row(row) + if info.on_windows: + self.set_titlebar(None) + sep = Gtk.Separator() + sep.add_css_class('titlebar-separator') + self.main.prepend(sep) + self.present() def do_save(self): @@ -57,7 +56,7 @@ def do_save(self): options[reminder.id] = reminder.options.copy() opts = options[reminder.id] opts['list-id'] = self.rows[selected] - if reminder.get_visible() and reminder.options['list-id'] != opts['list-id']: + if reminder.get_sensitive() and reminder.options['list-id'] != opts['list-id']: if self.win.synced_lists[opts['list-id']]['user-id'] in self.win.ms_users.keys(): if opts['repeat-type'] in (1, 2): opts['repeat-type'] = 0 @@ -72,7 +71,7 @@ def do_save(self): 'repeat-frequency': GLib.Variant('q', opts['repeat-frequency']), 'repeat-days': GLib.Variant('q', opts['repeat-days']), 'repeat-times': GLib.Variant('n', opts['repeat-times']), - 'repeat-until': GLib.Variant('u', opts['repeat-until']), + 'repeat-until': GLib.Variant('t', opts['repeat-until']), 'list-id': GLib.Variant('s', opts['list-id']) }) results = self.win.app.run_service_method( @@ -114,4 +113,5 @@ def on_save(self, button = None): confirm_dialog.set_default_response('cancel') confirm_dialog.set_close_response('cancel') confirm_dialog.connect('response::yes', lambda *args: self.do_save()) + confirm_dialog.present() diff --git a/src/browser/preferences.py b/src/browser/preferences.py index 96535f3..7255708 100644 --- a/src/browser/preferences.py +++ b/src/browser/preferences.py @@ -1,33 +1,33 @@ # preferences.py # Copyright (C) 2023 Sasha Hale # -# 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 . +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at https://mozilla.org/MPL/2.0/. from gettext import gettext as _ -from reminders import info -from reminders.browser.caldav_sign_in import CalDAVSignIn -from reminders.browser.microsoft_sign_in import MicrosoftSignIn +from retainer import info +from retainer.browser.caldav_sign_in import CalDAVSignIn + +if not info.on_windows: + from retainer.browser.microsoft_sign_in import MicrosoftSignIn +else: + from winsdk.windows.system import Launcher + from winsdk.windows.foundation import Uri from gi.repository import Gtk, Adw, GLib, Gio, Pango from logging import getLogger logger = getLogger(info.app_executable) -@Gtk.Template(resource_path='/io/github/remindersdevs/Reminders/ui/preferences.ui') -class PreferencesWindow(Adw.PreferencesWindow): +@Gtk.Template(resource_path='/io/github/retainerdevs/Retainer/ui/preferences.ui') +class PreferencesWindow(Gtk.Window): '''Settings Window''' __gtype_name__ = 'PreferencesWindow' + general = Gtk.Template.Child() + sound_row = Gtk.Template.Child() + sound_row_win = Gtk.Template.Child() sound_switch = Gtk.Template.Child() sound_theme_switch = Gtk.Template.Child() time_format_row = Gtk.Template.Child() @@ -39,6 +39,7 @@ class PreferencesWindow(Adw.PreferencesWindow): refresh_time_row = Gtk.Template.Child() spinner = Gtk.Template.Child() week_switch = Gtk.Template.Child() + main = Gtk.Template.Child() def __init__(self, app, **kwargs): super().__init__(**kwargs) @@ -46,8 +47,6 @@ def __init__(self, app, **kwargs): self.settings = app.settings self.set_transient_for(self.app.win) self.settings.bind('week-starts-sunday', self.week_switch, 'active', Gio.SettingsBindFlags.DEFAULT) - self.settings.bind('notification-sound', self.sound_switch, 'enable-expansion', Gio.SettingsBindFlags.DEFAULT) - self.settings.bind('included-notification-sound', self.sound_theme_switch, 'active', Gio.SettingsBindFlags.DEFAULT) self.settings.connect('changed::time-format', lambda *args: self.update_time_dropdown()) self.settings.connect('changed::refresh-frequency', lambda *args: self.update_refresh_dropdown()) self.settings.connect('changed::synced-lists', lambda *args: self.synced_lists_updated()) @@ -60,6 +59,14 @@ def __init__(self, app, **kwargs): self.synced = self.settings.get_value('synced-lists').unpack() self.user_rows = {} + if info.on_windows: + self.settings.bind('notification-sound', self.sound_switch, 'active', Gio.SettingsBindFlags.DEFAULT) + self.general.remove(self.sound_row) + else: + self.settings.bind('notification-sound', self.sound_row, 'enable-expansion', Gio.SettingsBindFlags.DEFAULT) + self.settings.bind('included-notification-sound', self.sound_theme_switch, 'active', Gio.SettingsBindFlags.DEFAULT) + self.general.remove(self.sound_row_win) + for user_id, username in self.app.win.ms_users.items(): self.on_ms_signed_in(user_id, username) for user_id, username in self.app.win.caldav_users.items(): @@ -68,6 +75,12 @@ def __init__(self, app, **kwargs): self.synced_lists_updated() self.add_shortcut(Gtk.Shortcut.new(Gtk.ShortcutTrigger.parse_string('w'), Gtk.CallbackAction.new(lambda *args: self.close()))) + if info.on_windows: + self.set_titlebar(None) + sep = Gtk.Separator() + sep.add_css_class('titlebar-separator') + self.main.prepend(sep) + def username_updated(self, user_id, username): if user_id in self.user_rows.keys(): self.user_rows[user_id].set_username(username) @@ -95,7 +108,11 @@ def on_close(self, window, data = None): except Exception as error: logger.exception(error) - self.set_visible(False) + if info.on_windows: + self.destroy() + self.app.preferences = None + else: + self.set_visible(False) return True def on_ms_signed_in(self, user_id, username): @@ -157,13 +174,20 @@ def caldav_signed_in(self, user_id, username): @Gtk.Template.Callback() def ms_sign_in(self, row = None): - MicrosoftSignIn(self) + if info.on_windows: + url = self.app.run_service_method('MSGetLoginURL', None).unpack()[0] + try: + Launcher.launch_uri_async(Uri(url)) + except: + pass + else: + MicrosoftSignIn(self) @Gtk.Template.Callback() def caldav_sign_in(self, row = None): CalDAVSignIn(self) -@Gtk.Template(resource_path='/io/github/remindersdevs/Reminders/ui/preferences_user_row.ui') +@Gtk.Template(resource_path='/io/github/retainerdevs/Retainer/ui/preferences_user_row.ui') class PreferencesUserRow(Adw.ExpanderRow): __gtype_name__ = 'PreferencesUserRow' task_list_grid = Gtk.Template.Child() diff --git a/src/browser/reminder.py b/src/browser/reminder.py index 137b2a0..7a0e430 100644 --- a/src/browser/reminder.py +++ b/src/browser/reminder.py @@ -1,24 +1,16 @@ # reminder.py # Copyright (C) 2023 Sasha Hale # -# 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 . +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at https://mozilla.org/MPL/2.0/. import datetime from gi.repository import Gtk, Adw, GLib, GObject, Gdk -from reminders import info -from reminders.browser.dnd_reminder import DNDReminder +from retainer import info +from retainer.browser.dnd_reminder import DNDReminder from time import time from logging import getLogger from gettext import gettext as _ @@ -26,7 +18,7 @@ logger = getLogger(info.app_executable) -@Gtk.Template(resource_path='/io/github/remindersdevs/Reminders/ui/reminder.ui') +@Gtk.Template(resource_path='/io/github/retainerdevs/Retainer/ui/reminder.ui') class Reminder(Adw.ExpanderRow): '''Ui for each reminder''' __gtype_name__ = 'Reminder' @@ -184,7 +176,7 @@ def select_between(self): selecting = True else: set_selecting_false = True - if selecting: + if selecting and row.get_sensitive(): row.set_selectable(True) self.win.reminders_list.select_row(row) else: @@ -228,7 +220,7 @@ def set_no_strikethrough(self, no_strikethrough): self.set_text() def update(self, options): - edit_win = self.win.reminder_edit_win + edit_win = self.win.reminder_edit_page if edit_win is not None and edit_win.id == self.id: if self.options['title'] != options['title']: edit_win.title_entry.set_text(options['title']) @@ -277,7 +269,7 @@ def set_repeat_times(self, times): if self.options['repeat-times'] != times: self.options['repeat-times'] = times self.set_repeat_label() - edit_win = self.win.reminder_edit_win + edit_win = self.win.reminder_edit_page if edit_win is not None and edit_win.id == self.id: edit_win.set_repeat_times(times) @@ -356,14 +348,7 @@ def set_completed(self, completed): def remove(self): try: - if self.id is not None: - self.app.run_service_method( - 'RemoveReminder', - GLib.Variant('(ss)', (info.app_id, self.id)) - ) - if self.id in self.win.reminder_lookup_dict: - self.win.reminder_lookup_dict.pop(self.id) - self.win.reminders_list.remove(self) + self.win.remove_reminder(self) self.win.invalidate_filter() except Exception as error: logger.exception(error) @@ -393,6 +378,8 @@ def expanded_cb(self, row, pspec): if self.win.expanded is not None: self.win.expanded.set_expanded(False) self.win.expanded = self + if self.win.reminder_edit_page.reminder is not self: + self.win.reminder_edit_page.setup(self, force=False) elif self.win.expanded == self: self.win.expanded = None @@ -418,4 +405,6 @@ def on_remove(self, button): @Gtk.Template.Callback() def edit(self, button = None): - self.win.new_edit_win(self) + if self.win.reminder_edit_page.reminder is not self: + self.win.reminder_edit_page.setup(self) + self.win.reminder_edit_page.focus() diff --git a/src/browser/reminder_edit_window.py b/src/browser/reminder_edit_page.py similarity index 90% rename from src/browser/reminder_edit_window.py rename to src/browser/reminder_edit_page.py index 0930842..fd735bb 100644 --- a/src/browser/reminder_edit_window.py +++ b/src/browser/reminder_edit_page.py @@ -1,27 +1,19 @@ # reminder_edit_window.py # Copyright (C) 2023 Sasha Hale # -# 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 . +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at https://mozilla.org/MPL/2.0/. import datetime from gi.repository import Gtk, Adw, GLib, Gio from gettext import gettext as _ -from reminders import info -from reminders.browser.reminder import Reminder -from ctypes import c_double +from retainer import info +from retainer.browser.reminder import Reminder from logging import getLogger +from ctypes import c_double logger = getLogger(info.app_executable) @@ -32,11 +24,12 @@ DEFAULT_OPTIONS.pop('completed-timestamp') DEFAULT_OPTIONS.pop('completed-date') -@Gtk.Template(resource_path='/io/github/remindersdevs/Reminders/ui/reminder_edit_window.ui') -class ReminderEditWindow(Adw.Window): - __gtype_name__ = 'ReminderEditWindow' +@Gtk.Template(resource_path='/io/github/retainerdevs/Retainer/ui/reminder_edit_page.ui') +class ReminderEditPage(Gtk.Box): + __gtype_name__ = 'ReminderEditPage' title_entry = Gtk.Template.Child() + page_label = Gtk.Template.Child() description_entry = Gtk.Template.Child() task_list_row = Gtk.Template.Child() time_row = Gtk.Template.Child() @@ -69,20 +62,33 @@ class ReminderEditWindow(Adw.Window): repeat_times_row = Gtk.Template.Child() days_box = Gtk.Template.Child() - def __init__(self, win, app, reminder = None, **kwargs): + def __init__(self, win, app, **kwargs): super().__init__(**kwargs) self.task_list_row_connection = None self.win = win self.app = app self.calendar_connections = [] - self.set_transient_for(win) - self.setup(reminder) + self.do_setup() self.win.connect('notify::time-format', lambda *args: self.time_format_updated()) - self.add_shortcut(Gtk.Shortcut.new(Gtk.ShortcutTrigger.parse_string('s'), Gtk.CallbackAction.new(lambda *args: self.on_save()))) - self.add_shortcut(Gtk.Shortcut.new(Gtk.ShortcutTrigger.parse_string('w'), Gtk.CallbackAction.new(lambda *args: self.close()))) + self.win.add_shortcut(Gtk.Shortcut.new(Gtk.ShortcutTrigger.parse_string('s'), Gtk.CallbackAction.new(lambda *args: self.on_save()))) self.app.settings.connect('changed::week-starts-sunday', lambda *args: self.week_start_changed()) self.week_start_changed() + def new_reminder(self): + self.setup(new=True) + self.focus() + + def focus(self): + self.win.leaflet.navigate(Adw.NavigationDirection.FORWARD) + self.title_entry.grab_focus() + + def unfocus(self, check_changed = True): + self.win.leaflet.navigate(Adw.NavigationDirection.BACK) + if check_changed: + self.setup(None) + else: + self.do_setup(None) + def week_start_changed(self): starts_sunday = self.app.settings.get_boolean('week-starts-sunday') if starts_sunday: @@ -92,17 +98,38 @@ def week_start_changed(self): self.days_box.remove(self.sun_btn) self.days_box.append(self.sun_btn) - def setup(self, reminder): + def setup(self, reminder = None, new = False, force = True): + if self.check_changed(self.get_options()): + if force: + confirm_dialog = Adw.MessageDialog( + transient_for=self.win, + heading=_('You have unsaved changes'), + body=_('Are you sure you want to abandon them?'), + ) + confirm_dialog.add_response('cancel', _('Cancel')) + confirm_dialog.add_response('yes', _('Yes')) + confirm_dialog.set_response_appearance('yes', Adw.ResponseAppearance.DESTRUCTIVE) + confirm_dialog.set_default_response('cancel') + confirm_dialog.set_close_response('cancel') + confirm_dialog.connect('response::yes', lambda *args: self.do_setup(reminder, new)) + + confirm_dialog.present() + else: + self.do_setup(reminder, new) + + def do_setup(self, reminder = None, new = False): self.reminder = reminder if reminder is not None: self.options = reminder.options.copy() self.id = reminder.id self.task_list = self.options['list-id'] + self.set_sensitive(True) else: self.options = DEFAULT_OPTIONS.copy() self.id = None self.task_list = self.options['list-id'] = self.win.selected_list_id if self.win.selected_list_id != 'all' else 'local' + self.set_sensitive(new) self.set_time(self.options['timestamp'], self.options['due-date']) self.set_important(self.options['important']) @@ -119,13 +146,13 @@ def setup(self, reminder): self.title_entry.set_text(self.options['title']) self.description_entry.set_text(self.options['description']) - if reminder is not None: - self.set_title(_('Edit Reminder')) - else: - self.set_title(_('New Reminder')) - self.repeat_duration_selected_changed() + if not new: + self.page_label.set_label(_('Edit Reminder')) + else: + self.page_label.set_label(_('New Reminder')) + if self.options['repeat-type'] == info.RepeatType.WEEK: self.week_repeat_row.set_visible(True) else: @@ -421,14 +448,14 @@ def do_save(self, data = None): { 'title': GLib.Variant('s', options['title']), 'description': GLib.Variant('s', options['description']), - 'due-date': GLib.Variant('u', options['due-date']), - 'timestamp': GLib.Variant('u', options['timestamp']), - 'important': GLib.Variant('u', options['important']), + 'due-date': GLib.Variant('t', options['due-date']), + 'timestamp': GLib.Variant('t', options['timestamp']), + 'important': GLib.Variant('b', options['important']), 'repeat-type': GLib.Variant('q', options['repeat-type']), 'repeat-frequency': GLib.Variant('q', options['repeat-frequency']), 'repeat-days': GLib.Variant('q', options['repeat-days']), 'repeat-times': GLib.Variant('n', options['repeat-times']), - 'repeat-until': GLib.Variant('u', options['repeat-until']), + 'repeat-until': GLib.Variant('t', options['repeat-until']), 'list-id': GLib.Variant('s', options['list-id']) } ) @@ -446,14 +473,14 @@ def do_save(self, data = None): 'id': GLib.Variant('s', self.id), 'title': GLib.Variant('s', options['title']), 'description': GLib.Variant('s', options['description']), - 'due-date': GLib.Variant('u', options['due-date']), - 'timestamp': GLib.Variant('u', options['timestamp']), - 'important': GLib.Variant('u', options['important']), + 'due-date': GLib.Variant('t', options['due-date']), + 'timestamp': GLib.Variant('t', options['timestamp']), + 'important': GLib.Variant('b', options['important']), 'repeat-type': GLib.Variant('q', options['repeat-type']), 'repeat-frequency': GLib.Variant('q', options['repeat-frequency']), 'repeat-days': GLib.Variant('q', options['repeat-days']), 'repeat-times': GLib.Variant('n', options['repeat-times']), - 'repeat-until': GLib.Variant('u', options['repeat-until']), + 'repeat-until': GLib.Variant('t', options['repeat-until']), 'list-id': GLib.Variant('s', options['list-id']) } ) @@ -473,7 +500,8 @@ def do_save(self, data = None): self.win.invalidate_filter() self.win.reminders_list.invalidate_sort() - self.set_visible(False) + self.unfocus(False) + except Exception as error: logger.exception(error) @@ -653,7 +681,7 @@ def wrap_hour(self, button = None): @Gtk.Template.Callback() def on_cancel(self, button = None): - self.win.close_edit_win() + self.unfocus() @Gtk.Template.Callback() def on_save(self, button = None): diff --git a/src/browser/reminders.py b/src/browser/reminders.py deleted file mode 100755 index 51eabd4..0000000 --- a/src/browser/reminders.py +++ /dev/null @@ -1,32 +0,0 @@ -#!@PYTHON_PATH@ -# Reminders - Set reminders and manage tasks -# Copyright (C) 2023 Sasha Hale -# -# 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 . - -import sys -import gettext -import locale - -locale_dir = '@LOCALE_DIR@' - -if __name__ == '__main__': - from reminders import info - from reminders.browser.application import main - - locale.bindtextdomain(info.app_executable, locale_dir) - locale.textdomain(info.app_executable) - gettext.bindtextdomain(info.app_executable, locale_dir) - gettext.textdomain(info.app_executable) - - sys.exit(main()) diff --git a/src/browser/resources/meson.build b/src/browser/resources/meson.build index c102431..09762df 100644 --- a/src/browser/resources/meson.build +++ b/src/browser/resources/meson.build @@ -6,22 +6,23 @@ resources = files( 'ui/export_lists_window.ui', 'ui/import_lists_window.ui', 'ui/main_window.ui', + 'ui/main_window_win32.ui', 'ui/microsoft_sign_in.ui', 'ui/move_reminders_window.ui', 'ui/preferences.ui', 'ui/preferences_user_row.ui', 'ui/reminder.ui', - 'ui/reminder_edit_window.ui', + 'ui/reminder_edit_page.ui', 'ui/shortcuts_window.ui', 'ui/task_list_row.ui', - 'stylesheet.css' + 'style.css' ) gnome.compile_resources( - app_executable, - 'reminders.gresource.xml', + meson.project_name(), + 'retainer.gresource.xml', install: true, - install_dir: python.get_install_dir() / meson.project_name() / 'browser', + install_dir: get_option('prefix') / get_option('datadir') / meson.project_name(), dependencies: resources, gresource_bundle: true, ) diff --git a/src/browser/resources/reminders.gresource.xml b/src/browser/resources/retainer.gresource.xml similarity index 79% rename from src/browser/resources/reminders.gresource.xml rename to src/browser/resources/retainer.gresource.xml index 4a214fd..89dfc67 100644 --- a/src/browser/resources/reminders.gresource.xml +++ b/src/browser/resources/retainer.gresource.xml @@ -1,6 +1,6 @@ - + ui/caldav_sign_in.ui ui/dnd_reminder.ui ui/edit_lists_window.ui @@ -8,14 +8,15 @@ ui/export_lists_window.ui ui/import_lists_window.ui ui/main_window.ui + ui/main_window_win32.ui ui/microsoft_sign_in.ui ui/move_reminders_window.ui ui/preferences.ui ui/preferences_user_row.ui ui/reminder.ui - ui/reminder_edit_window.ui + ui/reminder_edit_page.ui ui/shortcuts_window.ui ui/task_list_row.ui - stylesheet.css + style.css diff --git a/src/browser/resources/stylesheet.css b/src/browser/resources/style.css similarity index 79% rename from src/browser/resources/stylesheet.css rename to src/browser/resources/style.css index 0c055f9..6418081 100644 --- a/src/browser/resources/stylesheet.css +++ b/src/browser/resources/style.css @@ -52,14 +52,14 @@ spinbutton button { .add-reminder { min-height: 48px; min-width: 48px; - margin: 10px; + margin: 8px; } .bottom-area { - min-height: 68px; + min-height: 64px; } -.select-options button { +.bottom-area button.flat { padding: 0 24px; border-radius: 0; box-shadow: none; @@ -68,19 +68,19 @@ spinbutton button { margin-left: -1px; } -.select-options button.suggested { +.bottom-area button.flat.suggested { color: @accent_bg_color; } -.select-options button.complete { +.bottom-area button.flat.complete { color: @success_bg_color; } -.select-options button.incomplete { +.bottom-area button.flat.incomplete { color: @warning_bg_color; } -.select-options button.destructive { +.bottom-area button.flat.destructive { color: @destructive_bg_color; } @@ -137,10 +137,23 @@ box.main { padding: 12px; } +.edit-groups { + border-spacing: 24px; +} + .page-heading-box { margin: 0 5px; } +.reminder-edit-page .page-heading, +.reminder-edit-page .page-sub-heading { + margin: 0 5px; +} + +.reminder-edit-page preferencesgroup { + margin: 12px 0; +} + .page-sub-heading { opacity: 0.6; font-weight: 650; @@ -219,31 +232,6 @@ button.rounded.incomplete:active { border-spacing: 24px; } -.reminder-edit-window .response-area > button { - padding: 12px 14px; - border-radius: 0; - box-shadow: none; - margin-top: -1px; - margin-right: -1px; - margin-left: -1px; -} - -.reminder-edit-window .response-area > button.suggested { - color: @accent_bg_color; -} - -.reminder-edit-window .response-area > button:first-child:dir(ltr), -.reminder-edit-window .response-area > button:last-child:dir(rtl) { - border-bottom-left-radius: 12px; - margin-left: 0; -} - -.reminder-edit-window .response-area > button:last-child:dir(ltr), -.reminder-edit-window .response-area > button:first-child:dir(rtl) { - border-bottom-right-radius: 12px; - margin-right: 0; -} - button.refresh:dir(ltr) { margin-left: 6px; } @@ -297,7 +285,6 @@ list.nested list.nested { box-shadow: inset 0 0 0 1px @accent_bg_color; } - .reminders-list {background-color: transparent; box-shadow: none;} .reminders-list > row {margin-bottom: 12px; background-color: @card_bg_color;} .reminders-list > row row.header {border-top-left-radius: 12px; border-top-right-radius: 12px;} @@ -314,3 +301,51 @@ list.nested list.nested { .dnd-reminder { margin: 6px; } + +.shortcuts { + border-spacing: 0; + padding: 6px; +} + +.shortcuts button, .shortcuts menubutton {margin: 0;} + +.shortcuts { + background-color: mix(@headerbar_bg_color, @view_bg_color, 0.2); + box-shadow: inset -1px 0 0 0 @headerbar_shade_color; +} + +.shortcuts:backdrop { + background-color: @headerbar_backdrop_color; + transition: background-color 200ms ease-out; +} + +.shortcuts:backdrop > box { + filter: opacity(0.5); + transition: filter 200ms ease-out; +} + +.button-separator { + margin: 0 6px; +} + +.vertical-split-button > menubutton > button { + padding-top: 4px; + padding-bottom: 4px; +} + +.vertical-split-button > button { + margin-bottom: -1px; +} + +.vertical-split-button > menubutton > button { + margin-top: -1px; +} + +.titlebar-separator { + background-image: image(@headerbar_shade_color); + background-color: @headerbar_bg_color; +} + +.titlebar-separator:backdrop { + background-color: @headerbar_backdrop_color; +} diff --git a/src/browser/resources/ui/caldav_sign_in.ui b/src/browser/resources/ui/caldav_sign_in.ui index 487c1f8..578cc47 100644 --- a/src/browser/resources/ui/caldav_sign_in.ui +++ b/src/browser/resources/ui/caldav_sign_in.ui @@ -1,32 +1,24 @@ -