diff --git a/README.md b/README.md index 0343b6cd..25ec547d 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@ # Flameshot -![image](./img/flameshot.png) +![image](./img/app/flameshot.png) > Powerful yet simple to use screenshot software. [![Build Status](https://img.shields.io/travis/lupoDharkael/flameshot.svg)](https://travis-ci.org/lupoDharkael/flameshot) @@ -8,7 +8,7 @@ [![Release](https://img.shields.io/github/release/lupoDharkael/flameshot.svg)](https://github.com/lupoDharkael/flameshot/releases) ## Usage Preview -![image](./img/appPreview/animatedUsage.gif) +![image](./img/preview/animatedUsage.gif) ## Index - [Features](#features) @@ -171,7 +171,7 @@ The compilation requires Qt version 5.3 or higher and GCC 4.9.2 or higher. ### Debian Compilation Dependencies: ```` -apt install git g++ build-essential qt5-qmake qt5-default qttools5-dev-tools +apt install git g++ build-essential qt5-qmake qt5-default qttools5-dev-tools libqt5svg5-dev ```` Compilation: run `qmake && make` in the main directory. @@ -179,7 +179,7 @@ Compilation: run `qmake && make` in the main directory. ### Fedora Compilation Dependencies: ```` -dnf install qt5-devel gcc-c++ git qt5-qtbase-devel qt5-linguist +dnf install qt5-devel gcc-c++ git qt5-qtbase-devel qt5-linguist qt5-qtsvg-devel ```` Compilation: run `qmake-qt5 && make` in the main directory. @@ -187,7 +187,7 @@ Compilation: run `qmake-qt5 && make` in the main directory. ### Arch Compilation Dependencies: ```` -pacman -S git qt5-base base-devel qt5-tools +pacman -S base-devel git qt5-base qt5-tools qt5-svg ```` Compilation: run `qmake && make` in the main directory. diff --git a/debian/control b/debian/control index 323ba85f..d11ec684 100644 --- a/debian/control +++ b/debian/control @@ -9,6 +9,7 @@ Build-Depends: qt5-qmake, qtbase5-dev, qttools5-dev-tools, + libqt5svg5-dev Standards-Version: 4.1.4 Homepage: https://github.com/lupoDharkael/flameshot Vcs-Browser: https://github.com/lupoDharkael/flameshot diff --git a/docs/appdata/flameshot.appdata.xml b/docs/appdata/flameshot.appdata.xml index a5926916..62605e52 100644 --- a/docs/appdata/flameshot.appdata.xml +++ b/docs/appdata/flameshot.appdata.xml @@ -14,10 +14,10 @@ - https://raw.githubusercontent.com/lupoDharkael/flameshot/master/img/appPreview/usageStatic.png + https://raw.githubusercontent.com/lupoDharkael/flameshot/master/img/preview/usageStatic.png - https://raw.githubusercontent.com/lupoDharkael/flameshot/master/img/appPreview/animatedUsage.gif + https://raw.githubusercontent.com/lupoDharkael/flameshot/master/img/preview/animatedUsage.gif https://github.com/lupoDharkael/flameshot diff --git a/flameshot.pro b/flameshot.pro index d1f022b5..6ac850dd 100644 --- a/flameshot.pro +++ b/flameshot.pro @@ -12,7 +12,7 @@ isEmpty(TAG_VERSION){ } DEFINES += APP_VERSION=\\\"$$TAG_VERSION\\\" -QT += core gui widgets network +QT += core gui widgets network svg unix:!macx { QT += dbus @@ -25,7 +25,7 @@ CONFIG += c++11 link_pkgconfig TARGET = flameshot TEMPLATE = app -win32:RC_ICONS += img/flameshot.ico +win32:RC_ICONS += img/app/flameshot.ico #release: DESTDIR = build/release #debug: DESTDIR = build/debug @@ -250,7 +250,7 @@ unix:!macx { dbus.files = dbus/org.dharkael.Flameshot.xml icon.path = $${BASEDIR}$${PREFIX}/share/icons/ - icon.files = img/flameshot.png + icon.files = img/app/flameshot.svg completion.path = $${BASEDIR}$${PREFIX}/share/bash-completion/completions/ completion.files = docs/bash-completion/flameshot diff --git a/graphics.qrc b/graphics.qrc index 5169b369..87a2a790 100644 --- a/graphics.qrc +++ b/graphics.qrc @@ -1,63 +1,68 @@ - img/flameshot.svg - img/buttonIconsBlack/arrow-bottom-left.png - img/buttonIconsBlack/circle-outline.png - img/buttonIconsBlack/close.png - img/buttonIconsBlack/cloud-upload.png - img/buttonIconsBlack/content-copy.png - img/buttonIconsBlack/content-save.png - img/buttonIconsBlack/exit-to-app.png - img/buttonIconsBlack/line.png - img/buttonIconsBlack/marker.png - img/buttonIconsBlack/pencil.png - img/buttonIconsBlack/square-outline.png - img/buttonIconsBlack/undo-variant.png - img/buttonIconsWhite/arrow-bottom-left.png - img/buttonIconsWhite/square-outline.png - img/buttonIconsWhite/undo-variant.png - img/buttonIconsWhite/circle-outline.png - img/buttonIconsWhite/close.png - img/buttonIconsWhite/cloud-upload.png - img/buttonIconsWhite/content-copy.png - img/buttonIconsWhite/content-save.png - img/buttonIconsWhite/exit-to-app.png - img/buttonIconsWhite/format-text.png - img/buttonIconsWhite/line.png - img/buttonIconsWhite/marker.png - img/buttonIconsWhite/pencil.png - img/buttonIconsBlack/cursor-move.png - img/buttonIconsWhite/cursor-move.png - img/buttonIconsBlack/square.png - img/buttonIconsWhite/square.png - img/flameshot.png - img/configWhite/config.png - img/configWhite/graphics.png - img/configWhite/name_edition.png - img/configBlack/config.png - img/configBlack/graphics.png - img/configBlack/name_edition.png - img/buttonIconsBlack/size_indicator.png - img/buttonIconsWhite/size_indicator.png - img/buttonIconsBlack/open_with.png - img/buttonIconsWhite/open_with.png - img/buttonIconsBlack/blur.png - img/buttonIconsWhite/blur.png - img/buttonIconsBlack/redo-variant.png - img/buttonIconsWhite/redo-variant.png - img/buttonIconsBlack/pin.png - img/buttonIconsWhite/pin.png - img/buttonIconsBlack/text.png - img/buttonIconsWhite/text.png - img/configBlack/colorize.png - img/configWhite/colorize.png - img/configWhite/format_bold.png - img/configWhite/format_italic.png - img/configWhite/format_strikethrough.png - img/configWhite/format_underlined.png - img/configBlack/format_bold.png - img/configBlack/format_italic.png - img/configBlack/format_strikethrough.png - img/configBlack/format_underlined.png + img/app/flameshot.svg + img/app/flameshot.png + img/material/black/undo-variant.svg + img/material/black/text.svg + img/material/black/square.svg + img/material/black/square-outline.svg + img/material/black/size_indicator.svg + img/material/black/redo-variant.svg + img/material/black/pin.svg + img/material/black/pencil.svg + img/material/black/open_with.svg + img/material/black/name_edition.svg + img/material/black/mouse.svg + img/material/black/mouse-off.svg + img/material/black/marker.svg + img/material/black/line.svg + img/material/black/graphics.svg + img/material/black/format-text.svg + img/material/black/format_underlined.svg + img/material/black/format_strikethrough.svg + img/material/black/format_italic.svg + img/material/black/format_bold.svg + img/material/black/exit-to-app.svg + img/material/black/cursor-move.svg + img/material/black/content-save.svg + img/material/black/content-copy.svg + img/material/black/config.svg + img/material/black/colorize.svg + img/material/black/cloud-upload.svg + img/material/black/close.svg + img/material/black/circle-outline.svg + img/material/black/blur.svg + img/material/black/arrow-bottom-left.svg + img/material/white/undo-variant.svg + img/material/white/text.svg + img/material/white/square.svg + img/material/white/square-outline.svg + img/material/white/size_indicator.svg + img/material/white/redo-variant.svg + img/material/white/pin.svg + img/material/white/pencil.svg + img/material/white/open_with.svg + img/material/white/name_edition.svg + img/material/white/mouse.svg + img/material/white/mouse-off.svg + img/material/white/marker.svg + img/material/white/line.svg + img/material/white/graphics.svg + img/material/white/format-text.svg + img/material/white/format_underlined.svg + img/material/white/format_strikethrough.svg + img/material/white/format_italic.svg + img/material/white/format_bold.svg + img/material/white/exit-to-app.svg + img/material/white/cursor-move.svg + img/material/white/content-save.svg + img/material/white/content-copy.svg + img/material/white/config.svg + img/material/white/colorize.svg + img/material/white/cloud-upload.svg + img/material/white/close.svg + img/material/white/circle-outline.svg + img/material/white/blur.svg + img/material/white/arrow-bottom-left.svg diff --git a/img/flameshot.ico b/img/app/flameshot.ico similarity index 100% rename from img/flameshot.ico rename to img/app/flameshot.ico diff --git a/img/flameshot.png b/img/app/flameshot.png similarity index 100% rename from img/flameshot.png rename to img/app/flameshot.png diff --git a/img/app/flameshot.svg b/img/app/flameshot.svg new file mode 100644 index 00000000..8138a773 --- /dev/null +++ b/img/app/flameshot.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/img/flameshotLogoLicense.txt b/img/app/flameshotLogoLicense.txt similarity index 100% rename from img/flameshotLogoLicense.txt rename to img/app/flameshotLogoLicense.txt diff --git a/img/buttonIconsBlack/arrow-bottom-left.svg b/img/buttonIconsBlack/arrow-bottom-left.svg deleted file mode 100644 index c81a0744..00000000 --- a/img/buttonIconsBlack/arrow-bottom-left.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/img/buttonIconsBlack/circle-outline.svg b/img/buttonIconsBlack/circle-outline.svg deleted file mode 100644 index fa45a41c..00000000 --- a/img/buttonIconsBlack/circle-outline.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/img/buttonIconsBlack/close.svg b/img/buttonIconsBlack/close.svg deleted file mode 100644 index 18691d7e..00000000 --- a/img/buttonIconsBlack/close.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/img/buttonIconsBlack/cloud-upload.svg b/img/buttonIconsBlack/cloud-upload.svg deleted file mode 100644 index 8509478e..00000000 --- a/img/buttonIconsBlack/cloud-upload.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/img/buttonIconsBlack/content-copy.svg b/img/buttonIconsBlack/content-copy.svg deleted file mode 100644 index 923d236e..00000000 --- a/img/buttonIconsBlack/content-copy.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/img/buttonIconsBlack/content-save.svg b/img/buttonIconsBlack/content-save.svg deleted file mode 100644 index 2a895ab1..00000000 --- a/img/buttonIconsBlack/content-save.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/img/buttonIconsBlack/cursor-move.svg b/img/buttonIconsBlack/cursor-move.svg deleted file mode 100644 index 9cac61de..00000000 --- a/img/buttonIconsBlack/cursor-move.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/img/buttonIconsBlack/exit-to-app.svg b/img/buttonIconsBlack/exit-to-app.svg deleted file mode 100644 index e976e0d1..00000000 --- a/img/buttonIconsBlack/exit-to-app.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/img/buttonIconsBlack/format-text.svg b/img/buttonIconsBlack/format-text.svg deleted file mode 100644 index 52ca41d2..00000000 --- a/img/buttonIconsBlack/format-text.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/img/buttonIconsBlack/line.svg b/img/buttonIconsBlack/line.svg deleted file mode 100644 index 5e2ceae0..00000000 --- a/img/buttonIconsBlack/line.svg +++ /dev/null @@ -1,56 +0,0 @@ - - - - - - image/svg+xml - - - - - - - - - diff --git a/img/buttonIconsBlack/marker.svg b/img/buttonIconsBlack/marker.svg deleted file mode 100644 index 527424ca..00000000 --- a/img/buttonIconsBlack/marker.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/img/buttonIconsBlack/mouse-off.svg b/img/buttonIconsBlack/mouse-off.svg deleted file mode 100644 index efadb212..00000000 --- a/img/buttonIconsBlack/mouse-off.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/img/buttonIconsBlack/mouse.svg b/img/buttonIconsBlack/mouse.svg deleted file mode 100644 index 982f21c6..00000000 --- a/img/buttonIconsBlack/mouse.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/img/buttonIconsBlack/open_with.svg b/img/buttonIconsBlack/open_with.svg deleted file mode 100644 index 39bc1c09..00000000 --- a/img/buttonIconsBlack/open_with.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/img/buttonIconsBlack/pencil.svg b/img/buttonIconsBlack/pencil.svg deleted file mode 100644 index bb4259a3..00000000 --- a/img/buttonIconsBlack/pencil.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/img/buttonIconsBlack/pin.svg b/img/buttonIconsBlack/pin.svg deleted file mode 100644 index 66bbe0fe..00000000 --- a/img/buttonIconsBlack/pin.svg +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/img/buttonIconsBlack/redo-variant.svg b/img/buttonIconsBlack/redo-variant.svg deleted file mode 100644 index 47794d16..00000000 --- a/img/buttonIconsBlack/redo-variant.svg +++ /dev/null @@ -1,54 +0,0 @@ - - - - - - image/svg+xml - - - - - - - - diff --git a/img/buttonIconsBlack/square-outline.svg b/img/buttonIconsBlack/square-outline.svg deleted file mode 100644 index 3b5101b9..00000000 --- a/img/buttonIconsBlack/square-outline.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/img/buttonIconsBlack/square.svg b/img/buttonIconsBlack/square.svg deleted file mode 100644 index ee8836e6..00000000 --- a/img/buttonIconsBlack/square.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/img/buttonIconsBlack/undo-variant.svg b/img/buttonIconsBlack/undo-variant.svg deleted file mode 100644 index db1f7c91..00000000 --- a/img/buttonIconsBlack/undo-variant.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/img/buttonIconsWhite/LICENSE.txt b/img/buttonIconsWhite/LICENSE.txt deleted file mode 100644 index d6456956..00000000 --- a/img/buttonIconsWhite/LICENSE.txt +++ /dev/null @@ -1,202 +0,0 @@ - - Apache License - Version 2.0, January 2004 - http://www.apache.org/licenses/ - - TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION - - 1. Definitions. - - "License" shall mean the terms and conditions for use, reproduction, - and distribution as defined by Sections 1 through 9 of this document. - - "Licensor" shall mean the copyright owner or entity authorized by - the copyright owner that is granting the License. - - "Legal Entity" shall mean the union of the acting entity and all - other entities that control, are controlled by, or are under common - control with that entity. For the purposes of this definition, - "control" means (i) the power, direct or indirect, to cause the - direction or management of such entity, whether by contract or - otherwise, or (ii) ownership of fifty percent (50%) or more of the - outstanding shares, or (iii) beneficial ownership of such entity. - - "You" (or "Your") shall mean an individual or Legal Entity - exercising permissions granted by this License. - - "Source" form shall mean the preferred form for making modifications, - including but not limited to software source code, documentation - source, and configuration files. - - "Object" form shall mean any form resulting from mechanical - transformation or translation of a Source form, including but - not limited to compiled object code, generated documentation, - and conversions to other media types. - - "Work" shall mean the work of authorship, whether in Source or - Object form, made available under the License, as indicated by a - copyright notice that is included in or attached to the work - (an example is provided in the Appendix below). - - "Derivative Works" shall mean any work, whether in Source or Object - form, that is based on (or derived from) the Work and for which the - editorial revisions, annotations, elaborations, or other modifications - represent, as a whole, an original work of authorship. For the purposes - of this License, Derivative Works shall not include works that remain - separable from, or merely link (or bind by name) to the interfaces of, - the Work and Derivative Works thereof. - - "Contribution" shall mean any work of authorship, including - the original version of the Work and any modifications or additions - to that Work or Derivative Works thereof, that is intentionally - submitted to Licensor for inclusion in the Work by the copyright owner - or by an individual or Legal Entity authorized to submit on behalf of - the copyright owner. For the purposes of this definition, "submitted" - means any form of electronic, verbal, or written communication sent - to the Licensor or its representatives, including but not limited to - communication on electronic mailing lists, source code control systems, - and issue tracking systems that are managed by, or on behalf of, the - Licensor for the purpose of discussing and improving the Work, but - excluding communication that is conspicuously marked or otherwise - designated in writing by the copyright owner as "Not a Contribution." - - "Contributor" shall mean Licensor and any individual or Legal Entity - on behalf of whom a Contribution has been received by Licensor and - subsequently incorporated within the Work. - - 2. Grant of Copyright License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - copyright license to reproduce, prepare Derivative Works of, - publicly display, publicly perform, sublicense, and distribute the - Work and such Derivative Works in Source or Object form. - - 3. Grant of Patent License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - (except as stated in this section) patent license to make, have made, - use, offer to sell, sell, import, and otherwise transfer the Work, - where such license applies only to those patent claims licensable - by such Contributor that are necessarily infringed by their - Contribution(s) alone or by combination of their Contribution(s) - with the Work to which such Contribution(s) was submitted. If You - institute patent litigation against any entity (including a - cross-claim or counterclaim in a lawsuit) alleging that the Work - or a Contribution incorporated within the Work constitutes direct - or contributory patent infringement, then any patent licenses - granted to You under this License for that Work shall terminate - as of the date such litigation is filed. - - 4. Redistribution. You may reproduce and distribute copies of the - Work or Derivative Works thereof in any medium, with or without - modifications, and in Source or Object form, provided that You - meet the following conditions: - - (a) You must give any other recipients of the Work or - Derivative Works a copy of this License; and - - (b) You must cause any modified files to carry prominent notices - stating that You changed the files; and - - (c) You must retain, in the Source form of any Derivative Works - that You distribute, all copyright, patent, trademark, and - attribution notices from the Source form of the Work, - excluding those notices that do not pertain to any part of - the Derivative Works; and - - (d) If the Work includes a "NOTICE" text file as part of its - distribution, then any Derivative Works that You distribute must - include a readable copy of the attribution notices contained - within such NOTICE file, excluding those notices that do not - pertain to any part of the Derivative Works, in at least one - of the following places: within a NOTICE text file distributed - as part of the Derivative Works; within the Source form or - documentation, if provided along with the Derivative Works; or, - within a display generated by the Derivative Works, if and - wherever such third-party notices normally appear. The contents - of the NOTICE file are for informational purposes only and - do not modify the License. You may add Your own attribution - notices within Derivative Works that You distribute, alongside - or as an addendum to the NOTICE text from the Work, provided - that such additional attribution notices cannot be construed - as modifying the License. - - You may add Your own copyright statement to Your modifications and - may provide additional or different license terms and conditions - for use, reproduction, or distribution of Your modifications, or - for any such Derivative Works as a whole, provided Your use, - reproduction, and distribution of the Work otherwise complies with - the conditions stated in this License. - - 5. Submission of Contributions. Unless You explicitly state otherwise, - any Contribution intentionally submitted for inclusion in the Work - by You to the Licensor shall be under the terms and conditions of - this License, without any additional terms or conditions. - Notwithstanding the above, nothing herein shall supersede or modify - the terms of any separate license agreement you may have executed - with Licensor regarding such Contributions. - - 6. Trademarks. This License does not grant permission to use the trade - names, trademarks, service marks, or product names of the Licensor, - except as required for reasonable and customary use in describing the - origin of the Work and reproducing the content of the NOTICE file. - - 7. Disclaimer of Warranty. Unless required by applicable law or - agreed to in writing, Licensor provides the Work (and each - Contributor provides its Contributions) on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - implied, including, without limitation, any warranties or conditions - of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A - PARTICULAR PURPOSE. You are solely responsible for determining the - appropriateness of using or redistributing the Work and assume any - risks associated with Your exercise of permissions under this License. - - 8. Limitation of Liability. In no event and under no legal theory, - whether in tort (including negligence), contract, or otherwise, - unless required by applicable law (such as deliberate and grossly - negligent acts) or agreed to in writing, shall any Contributor be - liable to You for damages, including any direct, indirect, special, - incidental, or consequential damages of any character arising as a - result of this License or out of the use or inability to use the - Work (including but not limited to damages for loss of goodwill, - work stoppage, computer failure or malfunction, or any and all - other commercial damages or losses), even if such Contributor - has been advised of the possibility of such damages. - - 9. Accepting Warranty or Additional Liability. While redistributing - the Work or Derivative Works thereof, You may choose to offer, - and charge a fee for, acceptance of support, warranty, indemnity, - or other liability obligations and/or rights consistent with this - License. However, in accepting such obligations, You may act only - on Your own behalf and on Your sole responsibility, not on behalf - of any other Contributor, and only if You agree to indemnify, - defend, and hold each Contributor harmless for any liability - incurred by, or claims asserted against, such Contributor by reason - of your accepting any such warranty or additional liability. - - END OF TERMS AND CONDITIONS - - APPENDIX: How to apply the Apache License to your work. - - To apply the Apache License to your work, attach the following - boilerplate notice, with the fields enclosed by brackets "[]" - replaced with your own identifying information. (Don't include - the brackets!) The text should be enclosed in the appropriate - comment syntax for the file format. We also recommend that a - file or class name and description of purpose be included on the - same "printed page" as the copyright notice for easier - identification within third-party archives. - - Copyright [yyyy] [name of copyright owner] - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. diff --git a/img/buttonIconsWhite/README.md b/img/buttonIconsWhite/README.md deleted file mode 100644 index d3b113ec..00000000 --- a/img/buttonIconsWhite/README.md +++ /dev/null @@ -1 +0,0 @@ - Google Material Design Icons are licensed under Apache License 2.0 (see LICENSE.txt) diff --git a/img/buttonIconsWhite/arrow-bottom-left.svg b/img/buttonIconsWhite/arrow-bottom-left.svg deleted file mode 100644 index eaa52b12..00000000 --- a/img/buttonIconsWhite/arrow-bottom-left.svg +++ /dev/null @@ -1,54 +0,0 @@ - - - - - - image/svg+xml - - - - - - - - diff --git a/img/buttonIconsWhite/blur.svg b/img/buttonIconsWhite/blur.svg deleted file mode 100644 index 7cfb8051..00000000 --- a/img/buttonIconsWhite/blur.svg +++ /dev/null @@ -1,59 +0,0 @@ - - - - - - image/svg+xml - - - - - - - - - - diff --git a/img/buttonIconsWhite/circle-outline.svg b/img/buttonIconsWhite/circle-outline.svg deleted file mode 100644 index b187c7f9..00000000 --- a/img/buttonIconsWhite/circle-outline.svg +++ /dev/null @@ -1,54 +0,0 @@ - - - - - - image/svg+xml - - - - - - - - diff --git a/img/buttonIconsWhite/close.svg b/img/buttonIconsWhite/close.svg deleted file mode 100644 index 5df7c3f0..00000000 --- a/img/buttonIconsWhite/close.svg +++ /dev/null @@ -1,54 +0,0 @@ - - - - - - image/svg+xml - - - - - - - - diff --git a/img/buttonIconsWhite/cloud-upload.svg b/img/buttonIconsWhite/cloud-upload.svg deleted file mode 100644 index 6238d637..00000000 --- a/img/buttonIconsWhite/cloud-upload.svg +++ /dev/null @@ -1,54 +0,0 @@ - - - - - - image/svg+xml - - - - - - - - diff --git a/img/buttonIconsWhite/content-copy.svg b/img/buttonIconsWhite/content-copy.svg deleted file mode 100644 index 85fc5c64..00000000 --- a/img/buttonIconsWhite/content-copy.svg +++ /dev/null @@ -1,54 +0,0 @@ - - - - - - image/svg+xml - - - - - - - - diff --git a/img/buttonIconsWhite/content-save.svg b/img/buttonIconsWhite/content-save.svg deleted file mode 100644 index b9bd4d6c..00000000 --- a/img/buttonIconsWhite/content-save.svg +++ /dev/null @@ -1,54 +0,0 @@ - - - - - - image/svg+xml - - - - - - - - diff --git a/img/buttonIconsWhite/cursor-move.svg b/img/buttonIconsWhite/cursor-move.svg deleted file mode 100644 index f65e382c..00000000 --- a/img/buttonIconsWhite/cursor-move.svg +++ /dev/null @@ -1,55 +0,0 @@ - - - - - - image/svg+xml - - - - - - - - - diff --git a/img/buttonIconsWhite/exit-to-app.svg b/img/buttonIconsWhite/exit-to-app.svg deleted file mode 100644 index e7c5ac12..00000000 --- a/img/buttonIconsWhite/exit-to-app.svg +++ /dev/null @@ -1,54 +0,0 @@ - - - - - - image/svg+xml - - - - - - - - diff --git a/img/buttonIconsWhite/format-text.svg b/img/buttonIconsWhite/format-text.svg deleted file mode 100644 index c2c17d89..00000000 --- a/img/buttonIconsWhite/format-text.svg +++ /dev/null @@ -1,54 +0,0 @@ - - - - - - image/svg+xml - - - - - - - - diff --git a/img/buttonIconsWhite/line.svg b/img/buttonIconsWhite/line.svg deleted file mode 100644 index 83a7776c..00000000 --- a/img/buttonIconsWhite/line.svg +++ /dev/null @@ -1,57 +0,0 @@ - - - - - - image/svg+xml - - - - - - - - - diff --git a/img/buttonIconsWhite/marker.svg b/img/buttonIconsWhite/marker.svg deleted file mode 100644 index 3a769ede..00000000 --- a/img/buttonIconsWhite/marker.svg +++ /dev/null @@ -1,54 +0,0 @@ - - - - - - image/svg+xml - - - - - - - - diff --git a/img/buttonIconsWhite/mouse-off.svg b/img/buttonIconsWhite/mouse-off.svg deleted file mode 100644 index cfdc7389..00000000 --- a/img/buttonIconsWhite/mouse-off.svg +++ /dev/null @@ -1,54 +0,0 @@ - - - - - - image/svg+xml - - - - - - - - diff --git a/img/buttonIconsWhite/mouse.svg b/img/buttonIconsWhite/mouse.svg deleted file mode 100644 index 94b67439..00000000 --- a/img/buttonIconsWhite/mouse.svg +++ /dev/null @@ -1,54 +0,0 @@ - - - - - - image/svg+xml - - - - - - - - diff --git a/img/buttonIconsWhite/open_with.svg b/img/buttonIconsWhite/open_with.svg deleted file mode 100644 index cc6e5344..00000000 --- a/img/buttonIconsWhite/open_with.svg +++ /dev/null @@ -1,65 +0,0 @@ - - - - - - image/svg+xml - - - - - - - - - - - diff --git a/img/buttonIconsWhite/pencil.svg b/img/buttonIconsWhite/pencil.svg deleted file mode 100644 index b9f8094c..00000000 --- a/img/buttonIconsWhite/pencil.svg +++ /dev/null @@ -1,54 +0,0 @@ - - - - - - image/svg+xml - - - - - - - - diff --git a/img/buttonIconsWhite/pin.svg b/img/buttonIconsWhite/pin.svg deleted file mode 100644 index 901a9228..00000000 --- a/img/buttonIconsWhite/pin.svg +++ /dev/null @@ -1,48 +0,0 @@ - -image/svg+xml \ No newline at end of file diff --git a/img/buttonIconsWhite/redo-variant.svg b/img/buttonIconsWhite/redo-variant.svg deleted file mode 100644 index 893d5cab..00000000 --- a/img/buttonIconsWhite/redo-variant.svg +++ /dev/null @@ -1,55 +0,0 @@ - - - - - - image/svg+xml - - - - - - - - diff --git a/img/buttonIconsWhite/size_indicator.svg b/img/buttonIconsWhite/size_indicator.svg deleted file mode 100644 index dd2fad8d..00000000 --- a/img/buttonIconsWhite/size_indicator.svg +++ /dev/null @@ -1,61 +0,0 @@ - - - - - - image/svg+xml - - - - - - - - - - diff --git a/img/buttonIconsWhite/square-outline.svg b/img/buttonIconsWhite/square-outline.svg deleted file mode 100644 index b25ada03..00000000 --- a/img/buttonIconsWhite/square-outline.svg +++ /dev/null @@ -1,54 +0,0 @@ - - - - - - image/svg+xml - - - - - - - - diff --git a/img/buttonIconsWhite/square.svg b/img/buttonIconsWhite/square.svg deleted file mode 100644 index b5986e3e..00000000 --- a/img/buttonIconsWhite/square.svg +++ /dev/null @@ -1,56 +0,0 @@ - - - - - - image/svg+xml - - - - - - - - - diff --git a/img/buttonIconsWhite/text.svg b/img/buttonIconsWhite/text.svg deleted file mode 100644 index 32074fd5..00000000 --- a/img/buttonIconsWhite/text.svg +++ /dev/null @@ -1,60 +0,0 @@ - - - - - - image/svg+xml - - - - - - - - - - diff --git a/img/buttonIconsWhite/undo-variant.svg b/img/buttonIconsWhite/undo-variant.svg deleted file mode 100644 index 5a8514c9..00000000 --- a/img/buttonIconsWhite/undo-variant.svg +++ /dev/null @@ -1,54 +0,0 @@ - - - - - - image/svg+xml - - - - - - - - diff --git a/img/configBlack/name_edition.svg b/img/configBlack/name_edition.svg deleted file mode 100644 index f73c4f88..00000000 --- a/img/configBlack/name_edition.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/img/configWhite/colorize.svg b/img/configWhite/colorize.svg deleted file mode 100755 index 2c1ef5dc..00000000 --- a/img/configWhite/colorize.svg +++ /dev/null @@ -1,58 +0,0 @@ - - - - - - image/svg+xml - - - - - - - - - diff --git a/img/configWhite/config.svg b/img/configWhite/config.svg deleted file mode 100644 index 91cb3356..00000000 --- a/img/configWhite/config.svg +++ /dev/null @@ -1,61 +0,0 @@ - - - - - - image/svg+xml - - - - - - - - - - diff --git a/img/configWhite/format_bold.svg b/img/configWhite/format_bold.svg deleted file mode 100755 index 94eb2fa1..00000000 --- a/img/configWhite/format_bold.svg +++ /dev/null @@ -1,58 +0,0 @@ - - - - - - image/svg+xml - - - - - - - - - diff --git a/img/configWhite/format_italic.svg b/img/configWhite/format_italic.svg deleted file mode 100755 index 14cbd711..00000000 --- a/img/configWhite/format_italic.svg +++ /dev/null @@ -1,58 +0,0 @@ - - - - - - image/svg+xml - - - - - - - - - diff --git a/img/configWhite/format_strikethrough.svg b/img/configWhite/format_strikethrough.svg deleted file mode 100755 index 812c02be..00000000 --- a/img/configWhite/format_strikethrough.svg +++ /dev/null @@ -1,58 +0,0 @@ - - - - - - image/svg+xml - - - - - - - - - diff --git a/img/configWhite/format_underlined.svg b/img/configWhite/format_underlined.svg deleted file mode 100755 index f0cc574e..00000000 --- a/img/configWhite/format_underlined.svg +++ /dev/null @@ -1,58 +0,0 @@ - - - - - - image/svg+xml - - - - - - - - - diff --git a/img/configWhite/graphics.svg b/img/configWhite/graphics.svg deleted file mode 100644 index 92017402..00000000 --- a/img/configWhite/graphics.svg +++ /dev/null @@ -1,64 +0,0 @@ - - - - - - image/svg+xml - - - - - - - - - - - diff --git a/img/configWhite/name_edition.svg b/img/configWhite/name_edition.svg deleted file mode 100644 index fa4ad144..00000000 --- a/img/configWhite/name_edition.svg +++ /dev/null @@ -1,56 +0,0 @@ - - - - - - image/svg+xml - - - - - - - - - diff --git a/img/flameshot.svg b/img/flameshot.svg deleted file mode 100644 index c11c3743..00000000 --- a/img/flameshot.svg +++ /dev/null @@ -1,87 +0,0 @@ - - - -image/svg+xml \ No newline at end of file diff --git a/img/buttonIconsBlack/LICENSE.txt b/img/material/LICENSE.txt similarity index 100% rename from img/buttonIconsBlack/LICENSE.txt rename to img/material/LICENSE.txt diff --git a/img/buttonIconsBlack/README.md b/img/material/README.md similarity index 100% rename from img/buttonIconsBlack/README.md rename to img/material/README.md diff --git a/img/buttonIconsBlack/arrow-bottom-left.png b/img/material/black/arrow-bottom-left.png similarity index 100% rename from img/buttonIconsBlack/arrow-bottom-left.png rename to img/material/black/arrow-bottom-left.png diff --git a/img/material/black/arrow-bottom-left.svg b/img/material/black/arrow-bottom-left.svg new file mode 100644 index 00000000..048a0d33 --- /dev/null +++ b/img/material/black/arrow-bottom-left.svg @@ -0,0 +1,3 @@ + + + diff --git a/img/buttonIconsBlack/blur.png b/img/material/black/blur.png similarity index 100% rename from img/buttonIconsBlack/blur.png rename to img/material/black/blur.png diff --git a/img/buttonIconsBlack/blur.svg b/img/material/black/blur.svg similarity index 94% rename from img/buttonIconsBlack/blur.svg rename to img/material/black/blur.svg index bb4f8451..3cb0b2de 100644 --- a/img/buttonIconsBlack/blur.svg +++ b/img/material/black/blur.svg @@ -1,4 +1,4 @@ - + diff --git a/img/buttonIconsBlack/circle-outline.png b/img/material/black/circle-outline.png similarity index 100% rename from img/buttonIconsBlack/circle-outline.png rename to img/material/black/circle-outline.png diff --git a/img/material/black/circle-outline.svg b/img/material/black/circle-outline.svg new file mode 100644 index 00000000..01ff3ee5 --- /dev/null +++ b/img/material/black/circle-outline.svg @@ -0,0 +1,3 @@ + + + diff --git a/img/buttonIconsBlack/close.png b/img/material/black/close.png similarity index 100% rename from img/buttonIconsBlack/close.png rename to img/material/black/close.png diff --git a/img/material/black/close.svg b/img/material/black/close.svg new file mode 100644 index 00000000..4049435e --- /dev/null +++ b/img/material/black/close.svg @@ -0,0 +1,3 @@ + + + diff --git a/img/buttonIconsBlack/cloud-upload.png b/img/material/black/cloud-upload.png similarity index 100% rename from img/buttonIconsBlack/cloud-upload.png rename to img/material/black/cloud-upload.png diff --git a/img/material/black/cloud-upload.svg b/img/material/black/cloud-upload.svg new file mode 100644 index 00000000..fef9f541 --- /dev/null +++ b/img/material/black/cloud-upload.svg @@ -0,0 +1,3 @@ + + + diff --git a/img/configBlack/colorize.png b/img/material/black/colorize.png similarity index 100% rename from img/configBlack/colorize.png rename to img/material/black/colorize.png diff --git a/img/configBlack/colorize.svg b/img/material/black/colorize.svg old mode 100755 new mode 100644 similarity index 77% rename from img/configBlack/colorize.svg rename to img/material/black/colorize.svg index b387cdbe..dd91c470 --- a/img/configBlack/colorize.svg +++ b/img/material/black/colorize.svg @@ -1,4 +1,4 @@ - + diff --git a/img/configBlack/config.png b/img/material/black/config.png similarity index 100% rename from img/configBlack/config.png rename to img/material/black/config.png diff --git a/img/configBlack/config.svg b/img/material/black/config.svg old mode 100755 new mode 100644 similarity index 75% rename from img/configBlack/config.svg rename to img/material/black/config.svg index 1ee22978..03eda2dc --- a/img/configBlack/config.svg +++ b/img/material/black/config.svg @@ -1,4 +1,4 @@ - + diff --git a/img/buttonIconsBlack/content-copy.png b/img/material/black/content-copy.png similarity index 100% rename from img/buttonIconsBlack/content-copy.png rename to img/material/black/content-copy.png diff --git a/img/material/black/content-copy.svg b/img/material/black/content-copy.svg new file mode 100644 index 00000000..b3238bf5 --- /dev/null +++ b/img/material/black/content-copy.svg @@ -0,0 +1,3 @@ + + + diff --git a/img/buttonIconsBlack/content-save.png b/img/material/black/content-save.png similarity index 100% rename from img/buttonIconsBlack/content-save.png rename to img/material/black/content-save.png diff --git a/img/material/black/content-save.svg b/img/material/black/content-save.svg new file mode 100644 index 00000000..37bc9d56 --- /dev/null +++ b/img/material/black/content-save.svg @@ -0,0 +1,3 @@ + + + diff --git a/img/buttonIconsBlack/cursor-move.png b/img/material/black/cursor-move.png similarity index 100% rename from img/buttonIconsBlack/cursor-move.png rename to img/material/black/cursor-move.png diff --git a/img/material/black/cursor-move.svg b/img/material/black/cursor-move.svg new file mode 100644 index 00000000..54bfbfbe --- /dev/null +++ b/img/material/black/cursor-move.svg @@ -0,0 +1,3 @@ + + + diff --git a/img/buttonIconsBlack/exit-to-app.png b/img/material/black/exit-to-app.png similarity index 100% rename from img/buttonIconsBlack/exit-to-app.png rename to img/material/black/exit-to-app.png diff --git a/img/material/black/exit-to-app.svg b/img/material/black/exit-to-app.svg new file mode 100644 index 00000000..d2645cdc --- /dev/null +++ b/img/material/black/exit-to-app.svg @@ -0,0 +1,3 @@ + + + diff --git a/img/material/black/format-text.svg b/img/material/black/format-text.svg new file mode 100644 index 00000000..1fa2da3a --- /dev/null +++ b/img/material/black/format-text.svg @@ -0,0 +1,3 @@ + + + diff --git a/img/configBlack/format_bold.png b/img/material/black/format_bold.png similarity index 100% rename from img/configBlack/format_bold.png rename to img/material/black/format_bold.png diff --git a/img/configBlack/format_bold.svg b/img/material/black/format_bold.svg old mode 100755 new mode 100644 similarity index 77% rename from img/configBlack/format_bold.svg rename to img/material/black/format_bold.svg index ca6b4b63..dd9a0db2 --- a/img/configBlack/format_bold.svg +++ b/img/material/black/format_bold.svg @@ -1,4 +1,4 @@ - + diff --git a/img/configBlack/format_italic.png b/img/material/black/format_italic.png similarity index 100% rename from img/configBlack/format_italic.png rename to img/material/black/format_italic.png diff --git a/img/configBlack/format_italic.svg b/img/material/black/format_italic.svg old mode 100755 new mode 100644 similarity index 57% rename from img/configBlack/format_italic.svg rename to img/material/black/format_italic.svg index fa65b97d..fe967020 --- a/img/configBlack/format_italic.svg +++ b/img/material/black/format_italic.svg @@ -1,4 +1,4 @@ - + diff --git a/img/configBlack/format_strikethrough.png b/img/material/black/format_strikethrough.png similarity index 100% rename from img/configBlack/format_strikethrough.png rename to img/material/black/format_strikethrough.png diff --git a/img/configBlack/format_strikethrough.svg b/img/material/black/format_strikethrough.svg old mode 100755 new mode 100644 similarity index 58% rename from img/configBlack/format_strikethrough.svg rename to img/material/black/format_strikethrough.svg index 15151054..5f9c953e --- a/img/configBlack/format_strikethrough.svg +++ b/img/material/black/format_strikethrough.svg @@ -1,4 +1,4 @@ - + diff --git a/img/configBlack/format_underlined.png b/img/material/black/format_underlined.png similarity index 100% rename from img/configBlack/format_underlined.png rename to img/material/black/format_underlined.png diff --git a/img/configBlack/format_underlined.svg b/img/material/black/format_underlined.svg old mode 100755 new mode 100644 similarity index 68% rename from img/configBlack/format_underlined.svg rename to img/material/black/format_underlined.svg index 8615187f..4e05fc58 --- a/img/configBlack/format_underlined.svg +++ b/img/material/black/format_underlined.svg @@ -1,4 +1,4 @@ - + diff --git a/img/configBlack/graphics.png b/img/material/black/graphics.png similarity index 100% rename from img/configBlack/graphics.png rename to img/material/black/graphics.png diff --git a/img/configBlack/graphics.svg b/img/material/black/graphics.svg old mode 100755 new mode 100644 similarity index 78% rename from img/configBlack/graphics.svg rename to img/material/black/graphics.svg index 903aa6f7..f67a8333 --- a/img/configBlack/graphics.svg +++ b/img/material/black/graphics.svg @@ -1,4 +1,4 @@ - + diff --git a/img/buttonIconsBlack/line.png b/img/material/black/line.png similarity index 100% rename from img/buttonIconsBlack/line.png rename to img/material/black/line.png diff --git a/img/material/black/line.svg b/img/material/black/line.svg new file mode 100644 index 00000000..c65c1d59 --- /dev/null +++ b/img/material/black/line.svg @@ -0,0 +1,3 @@ + + + diff --git a/img/buttonIconsBlack/marker.png b/img/material/black/marker.png similarity index 100% rename from img/buttonIconsBlack/marker.png rename to img/material/black/marker.png diff --git a/img/material/black/marker.svg b/img/material/black/marker.svg new file mode 100644 index 00000000..ab143f0e --- /dev/null +++ b/img/material/black/marker.svg @@ -0,0 +1,3 @@ + + + diff --git a/img/material/black/mouse-off.svg b/img/material/black/mouse-off.svg new file mode 100644 index 00000000..5b853922 --- /dev/null +++ b/img/material/black/mouse-off.svg @@ -0,0 +1,3 @@ + + + diff --git a/img/material/black/mouse.svg b/img/material/black/mouse.svg new file mode 100644 index 00000000..1605c8c5 --- /dev/null +++ b/img/material/black/mouse.svg @@ -0,0 +1,3 @@ + + + diff --git a/img/configBlack/name_edition.png b/img/material/black/name_edition.png similarity index 100% rename from img/configBlack/name_edition.png rename to img/material/black/name_edition.png diff --git a/img/material/black/name_edition.svg b/img/material/black/name_edition.svg new file mode 100644 index 00000000..6eb207fc --- /dev/null +++ b/img/material/black/name_edition.svg @@ -0,0 +1,3 @@ + + + diff --git a/img/buttonIconsBlack/open_with.png b/img/material/black/open_with.png similarity index 100% rename from img/buttonIconsBlack/open_with.png rename to img/material/black/open_with.png diff --git a/img/material/black/open_with.svg b/img/material/black/open_with.svg new file mode 100644 index 00000000..944ea1b7 --- /dev/null +++ b/img/material/black/open_with.svg @@ -0,0 +1,3 @@ + + + diff --git a/img/buttonIconsBlack/pencil.png b/img/material/black/pencil.png similarity index 100% rename from img/buttonIconsBlack/pencil.png rename to img/material/black/pencil.png diff --git a/img/material/black/pencil.svg b/img/material/black/pencil.svg new file mode 100644 index 00000000..30320d29 --- /dev/null +++ b/img/material/black/pencil.svg @@ -0,0 +1,3 @@ + + + diff --git a/img/buttonIconsBlack/pin.png b/img/material/black/pin.png similarity index 100% rename from img/buttonIconsBlack/pin.png rename to img/material/black/pin.png diff --git a/img/material/black/pin.svg b/img/material/black/pin.svg new file mode 100644 index 00000000..01332557 --- /dev/null +++ b/img/material/black/pin.svg @@ -0,0 +1,3 @@ + + + diff --git a/img/buttonIconsBlack/redo-variant.png b/img/material/black/redo-variant.png similarity index 100% rename from img/buttonIconsBlack/redo-variant.png rename to img/material/black/redo-variant.png diff --git a/img/material/black/redo-variant.svg b/img/material/black/redo-variant.svg new file mode 100644 index 00000000..ba63f09b --- /dev/null +++ b/img/material/black/redo-variant.svg @@ -0,0 +1,3 @@ + + + diff --git a/img/buttonIconsBlack/size_indicator.png b/img/material/black/size_indicator.png similarity index 100% rename from img/buttonIconsBlack/size_indicator.png rename to img/material/black/size_indicator.png diff --git a/img/buttonIconsBlack/size_indicator.svg b/img/material/black/size_indicator.svg similarity index 69% rename from img/buttonIconsBlack/size_indicator.svg rename to img/material/black/size_indicator.svg index 6e7da92d..2c6132ba 100644 --- a/img/buttonIconsBlack/size_indicator.svg +++ b/img/material/black/size_indicator.svg @@ -1,4 +1,4 @@ - + diff --git a/img/buttonIconsBlack/square-outline.png b/img/material/black/square-outline.png similarity index 100% rename from img/buttonIconsBlack/square-outline.png rename to img/material/black/square-outline.png diff --git a/img/material/black/square-outline.svg b/img/material/black/square-outline.svg new file mode 100644 index 00000000..63fbf2ea --- /dev/null +++ b/img/material/black/square-outline.svg @@ -0,0 +1,3 @@ + + + diff --git a/img/buttonIconsBlack/square.png b/img/material/black/square.png similarity index 100% rename from img/buttonIconsBlack/square.png rename to img/material/black/square.png diff --git a/img/material/black/square.svg b/img/material/black/square.svg new file mode 100644 index 00000000..31b8298a --- /dev/null +++ b/img/material/black/square.svg @@ -0,0 +1,3 @@ + + + diff --git a/img/buttonIconsBlack/text.png b/img/material/black/text.png similarity index 100% rename from img/buttonIconsBlack/text.png rename to img/material/black/text.png diff --git a/img/buttonIconsBlack/text.svg b/img/material/black/text.svg old mode 100755 new mode 100644 similarity index 52% rename from img/buttonIconsBlack/text.svg rename to img/material/black/text.svg index 342d4033..19024ee2 --- a/img/buttonIconsBlack/text.svg +++ b/img/material/black/text.svg @@ -1,4 +1,4 @@ - + diff --git a/img/buttonIconsBlack/undo-variant.png b/img/material/black/undo-variant.png similarity index 100% rename from img/buttonIconsBlack/undo-variant.png rename to img/material/black/undo-variant.png diff --git a/img/material/black/undo-variant.svg b/img/material/black/undo-variant.svg new file mode 100644 index 00000000..42965348 --- /dev/null +++ b/img/material/black/undo-variant.svg @@ -0,0 +1,3 @@ + + + diff --git a/img/buttonIconsWhite/arrow-bottom-left.png b/img/material/white/arrow-bottom-left.png similarity index 100% rename from img/buttonIconsWhite/arrow-bottom-left.png rename to img/material/white/arrow-bottom-left.png diff --git a/img/material/white/arrow-bottom-left.svg b/img/material/white/arrow-bottom-left.svg new file mode 100644 index 00000000..a552ccc9 --- /dev/null +++ b/img/material/white/arrow-bottom-left.svg @@ -0,0 +1,3 @@ + + + diff --git a/img/buttonIconsWhite/blur.png b/img/material/white/blur.png similarity index 100% rename from img/buttonIconsWhite/blur.png rename to img/material/white/blur.png diff --git a/img/material/white/blur.svg b/img/material/white/blur.svg new file mode 100644 index 00000000..1701d59c --- /dev/null +++ b/img/material/white/blur.svg @@ -0,0 +1,4 @@ + + + + diff --git a/img/buttonIconsWhite/circle-outline.png b/img/material/white/circle-outline.png similarity index 100% rename from img/buttonIconsWhite/circle-outline.png rename to img/material/white/circle-outline.png diff --git a/img/material/white/circle-outline.svg b/img/material/white/circle-outline.svg new file mode 100644 index 00000000..9f40cdd4 --- /dev/null +++ b/img/material/white/circle-outline.svg @@ -0,0 +1,3 @@ + + + diff --git a/img/buttonIconsWhite/close.png b/img/material/white/close.png similarity index 100% rename from img/buttonIconsWhite/close.png rename to img/material/white/close.png diff --git a/img/material/white/close.svg b/img/material/white/close.svg new file mode 100644 index 00000000..748ac1e2 --- /dev/null +++ b/img/material/white/close.svg @@ -0,0 +1,3 @@ + + + diff --git a/img/buttonIconsWhite/cloud-upload.png b/img/material/white/cloud-upload.png similarity index 100% rename from img/buttonIconsWhite/cloud-upload.png rename to img/material/white/cloud-upload.png diff --git a/img/material/white/cloud-upload.svg b/img/material/white/cloud-upload.svg new file mode 100644 index 00000000..61c98dd3 --- /dev/null +++ b/img/material/white/cloud-upload.svg @@ -0,0 +1,3 @@ + + + diff --git a/img/configWhite/colorize.png b/img/material/white/colorize.png similarity index 100% rename from img/configWhite/colorize.png rename to img/material/white/colorize.png diff --git a/img/material/white/colorize.svg b/img/material/white/colorize.svg new file mode 100644 index 00000000..352a9e4b --- /dev/null +++ b/img/material/white/colorize.svg @@ -0,0 +1,4 @@ + + + + diff --git a/img/configWhite/config.png b/img/material/white/config.png similarity index 100% rename from img/configWhite/config.png rename to img/material/white/config.png diff --git a/img/material/white/config.svg b/img/material/white/config.svg new file mode 100644 index 00000000..250c5f0d --- /dev/null +++ b/img/material/white/config.svg @@ -0,0 +1,4 @@ + + + + diff --git a/img/buttonIconsWhite/content-copy.png b/img/material/white/content-copy.png similarity index 100% rename from img/buttonIconsWhite/content-copy.png rename to img/material/white/content-copy.png diff --git a/img/material/white/content-copy.svg b/img/material/white/content-copy.svg new file mode 100644 index 00000000..5df27a38 --- /dev/null +++ b/img/material/white/content-copy.svg @@ -0,0 +1,3 @@ + + + diff --git a/img/buttonIconsWhite/content-save.png b/img/material/white/content-save.png similarity index 100% rename from img/buttonIconsWhite/content-save.png rename to img/material/white/content-save.png diff --git a/img/material/white/content-save.svg b/img/material/white/content-save.svg new file mode 100644 index 00000000..ce0dda6b --- /dev/null +++ b/img/material/white/content-save.svg @@ -0,0 +1,3 @@ + + + diff --git a/img/buttonIconsWhite/cursor-move.png b/img/material/white/cursor-move.png similarity index 100% rename from img/buttonIconsWhite/cursor-move.png rename to img/material/white/cursor-move.png diff --git a/img/material/white/cursor-move.svg b/img/material/white/cursor-move.svg new file mode 100644 index 00000000..ab78e45a --- /dev/null +++ b/img/material/white/cursor-move.svg @@ -0,0 +1,3 @@ + + + diff --git a/img/buttonIconsWhite/exit-to-app.png b/img/material/white/exit-to-app.png similarity index 100% rename from img/buttonIconsWhite/exit-to-app.png rename to img/material/white/exit-to-app.png diff --git a/img/material/white/exit-to-app.svg b/img/material/white/exit-to-app.svg new file mode 100644 index 00000000..2b228a80 --- /dev/null +++ b/img/material/white/exit-to-app.svg @@ -0,0 +1,3 @@ + + + diff --git a/img/buttonIconsWhite/format-text.png b/img/material/white/format-text.png similarity index 100% rename from img/buttonIconsWhite/format-text.png rename to img/material/white/format-text.png diff --git a/img/material/white/format-text.svg b/img/material/white/format-text.svg new file mode 100644 index 00000000..a1191b30 --- /dev/null +++ b/img/material/white/format-text.svg @@ -0,0 +1,3 @@ + + + diff --git a/img/configWhite/format_bold.png b/img/material/white/format_bold.png similarity index 100% rename from img/configWhite/format_bold.png rename to img/material/white/format_bold.png diff --git a/img/material/white/format_bold.svg b/img/material/white/format_bold.svg new file mode 100644 index 00000000..5381997a --- /dev/null +++ b/img/material/white/format_bold.svg @@ -0,0 +1,4 @@ + + + + diff --git a/img/configWhite/format_italic.png b/img/material/white/format_italic.png similarity index 100% rename from img/configWhite/format_italic.png rename to img/material/white/format_italic.png diff --git a/img/material/white/format_italic.svg b/img/material/white/format_italic.svg new file mode 100644 index 00000000..750f06fd --- /dev/null +++ b/img/material/white/format_italic.svg @@ -0,0 +1,4 @@ + + + + diff --git a/img/configWhite/format_strikethrough.png b/img/material/white/format_strikethrough.png similarity index 100% rename from img/configWhite/format_strikethrough.png rename to img/material/white/format_strikethrough.png diff --git a/img/material/white/format_strikethrough.svg b/img/material/white/format_strikethrough.svg new file mode 100644 index 00000000..a760f702 --- /dev/null +++ b/img/material/white/format_strikethrough.svg @@ -0,0 +1,4 @@ + + + + diff --git a/img/configWhite/format_underlined.png b/img/material/white/format_underlined.png similarity index 100% rename from img/configWhite/format_underlined.png rename to img/material/white/format_underlined.png diff --git a/img/material/white/format_underlined.svg b/img/material/white/format_underlined.svg new file mode 100644 index 00000000..f8e0e1a6 --- /dev/null +++ b/img/material/white/format_underlined.svg @@ -0,0 +1,4 @@ + + + + diff --git a/img/configWhite/graphics.png b/img/material/white/graphics.png similarity index 100% rename from img/configWhite/graphics.png rename to img/material/white/graphics.png diff --git a/img/material/white/graphics.svg b/img/material/white/graphics.svg new file mode 100644 index 00000000..7d725e94 --- /dev/null +++ b/img/material/white/graphics.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/img/buttonIconsWhite/line.png b/img/material/white/line.png similarity index 100% rename from img/buttonIconsWhite/line.png rename to img/material/white/line.png diff --git a/img/material/white/line.svg b/img/material/white/line.svg new file mode 100644 index 00000000..8d26f403 --- /dev/null +++ b/img/material/white/line.svg @@ -0,0 +1,3 @@ + + + diff --git a/img/buttonIconsWhite/marker.png b/img/material/white/marker.png similarity index 100% rename from img/buttonIconsWhite/marker.png rename to img/material/white/marker.png diff --git a/img/material/white/marker.svg b/img/material/white/marker.svg new file mode 100644 index 00000000..1f6117e4 --- /dev/null +++ b/img/material/white/marker.svg @@ -0,0 +1,3 @@ + + + diff --git a/img/material/white/mouse-off.svg b/img/material/white/mouse-off.svg new file mode 100644 index 00000000..df6168bf --- /dev/null +++ b/img/material/white/mouse-off.svg @@ -0,0 +1,3 @@ + + + diff --git a/img/material/white/mouse.svg b/img/material/white/mouse.svg new file mode 100644 index 00000000..f559d1ea --- /dev/null +++ b/img/material/white/mouse.svg @@ -0,0 +1,3 @@ + + + diff --git a/img/configWhite/name_edition.png b/img/material/white/name_edition.png similarity index 100% rename from img/configWhite/name_edition.png rename to img/material/white/name_edition.png diff --git a/img/material/white/name_edition.svg b/img/material/white/name_edition.svg new file mode 100644 index 00000000..f1573ed8 --- /dev/null +++ b/img/material/white/name_edition.svg @@ -0,0 +1,3 @@ + + + diff --git a/img/buttonIconsWhite/open_with.png b/img/material/white/open_with.png similarity index 100% rename from img/buttonIconsWhite/open_with.png rename to img/material/white/open_with.png diff --git a/img/material/white/open_with.svg b/img/material/white/open_with.svg new file mode 100644 index 00000000..199322fd --- /dev/null +++ b/img/material/white/open_with.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/img/buttonIconsWhite/pencil.png b/img/material/white/pencil.png similarity index 100% rename from img/buttonIconsWhite/pencil.png rename to img/material/white/pencil.png diff --git a/img/material/white/pencil.svg b/img/material/white/pencil.svg new file mode 100644 index 00000000..e53d8e6d --- /dev/null +++ b/img/material/white/pencil.svg @@ -0,0 +1,3 @@ + + + diff --git a/img/buttonIconsWhite/pin.png b/img/material/white/pin.png similarity index 100% rename from img/buttonIconsWhite/pin.png rename to img/material/white/pin.png diff --git a/img/material/white/pin.svg b/img/material/white/pin.svg new file mode 100644 index 00000000..628aa1af --- /dev/null +++ b/img/material/white/pin.svg @@ -0,0 +1,3 @@ + + + diff --git a/img/buttonIconsWhite/redo-variant.png b/img/material/white/redo-variant.png similarity index 100% rename from img/buttonIconsWhite/redo-variant.png rename to img/material/white/redo-variant.png diff --git a/img/material/white/redo-variant.svg b/img/material/white/redo-variant.svg new file mode 100644 index 00000000..a84484c4 --- /dev/null +++ b/img/material/white/redo-variant.svg @@ -0,0 +1,3 @@ + + + diff --git a/img/buttonIconsWhite/size_indicator.png b/img/material/white/size_indicator.png similarity index 100% rename from img/buttonIconsWhite/size_indicator.png rename to img/material/white/size_indicator.png diff --git a/img/material/white/size_indicator.svg b/img/material/white/size_indicator.svg new file mode 100644 index 00000000..b526f998 --- /dev/null +++ b/img/material/white/size_indicator.svg @@ -0,0 +1,4 @@ + + + + diff --git a/img/buttonIconsWhite/square-outline.png b/img/material/white/square-outline.png similarity index 100% rename from img/buttonIconsWhite/square-outline.png rename to img/material/white/square-outline.png diff --git a/img/material/white/square-outline.svg b/img/material/white/square-outline.svg new file mode 100644 index 00000000..2c2f34b5 --- /dev/null +++ b/img/material/white/square-outline.svg @@ -0,0 +1,3 @@ + + + diff --git a/img/buttonIconsWhite/square.png b/img/material/white/square.png similarity index 100% rename from img/buttonIconsWhite/square.png rename to img/material/white/square.png diff --git a/img/material/white/square.svg b/img/material/white/square.svg new file mode 100644 index 00000000..a54a7d3d --- /dev/null +++ b/img/material/white/square.svg @@ -0,0 +1,3 @@ + + + diff --git a/img/buttonIconsWhite/text.png b/img/material/white/text.png similarity index 100% rename from img/buttonIconsWhite/text.png rename to img/material/white/text.png diff --git a/img/material/white/text.svg b/img/material/white/text.svg new file mode 100644 index 00000000..588ac514 --- /dev/null +++ b/img/material/white/text.svg @@ -0,0 +1,3 @@ + + + diff --git a/img/buttonIconsWhite/undo-variant.png b/img/material/white/undo-variant.png similarity index 100% rename from img/buttonIconsWhite/undo-variant.png rename to img/material/white/undo-variant.png diff --git a/img/material/white/undo-variant.svg b/img/material/white/undo-variant.svg new file mode 100644 index 00000000..425bb84d --- /dev/null +++ b/img/material/white/undo-variant.svg @@ -0,0 +1,3 @@ + + + diff --git a/img/appPreview/animatedUsage.gif b/img/preview/animatedUsage.gif similarity index 100% rename from img/appPreview/animatedUsage.gif rename to img/preview/animatedUsage.gif diff --git a/img/appPreview/usageStatic.png b/img/preview/usageStatic.png similarity index 100% rename from img/appPreview/usageStatic.png rename to img/preview/usageStatic.png diff --git a/rpm/flameshot.spec b/rpm/flameshot.spec index 71052028..d03bee95 100644 --- a/rpm/flameshot.spec +++ b/rpm/flameshot.spec @@ -20,6 +20,7 @@ BuildRequires: pkgconfig(Qt5Gui) >= 5.3.0 BuildRequires: pkgconfig(Qt5Widgets) >= 5.3.0 BuildRequires: qt5-qttools-devel BuildRequires: qt5-linguist +BuildRequires: qt5-qtsvg-devel BuildRequires: git Requires: qt5-qtbase >= 5.3.0 @@ -53,7 +54,7 @@ make %{?_smp_mflags} %{_datadir}/flameshot/translations/Internationalization_*.qm %{_datadir}/applications/%{name}.desktop %{_datadir}/bash-completion/completions/%{name} -%{_datadir}/icons/%{name}.png +%{_datadir}/icons/%{name}.svg %changelog * Tue Jan 09 2018 Zetao Yang - 0.5.0-1 diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml index 8672c5e2..454fd73f 100644 --- a/snap/snapcraft.yaml +++ b/snap/snapcraft.yaml @@ -1,6 +1,6 @@ name: flameshot version: git -icon: img/flameshot.png +icon: img/app/flameshot.svg summary: Powerful yet simple to use screenshot software description: | A powerful open source screenshot and annotation tool for Linux, Flameshot @@ -45,6 +45,7 @@ parts: build-packages: - qt5-default - qttools5-dev-tools + - libqt5svg5-dev stage-packages: - dbus-x11 - libgtk2.0-0 diff --git a/src/config/configwindow.cpp b/src/config/configwindow.cpp index 524ef077..ab935059 100644 --- a/src/config/configwindow.cpp +++ b/src/config/configwindow.cpp @@ -37,7 +37,7 @@ ConfigWindow::ConfigWindow(QWidget *parent) : QTabWidget(parent) { setAttribute(Qt::WA_DeleteOnClose); const int size = GlobalValues::buttonBaseSize() * 12; setMinimumSize(size, size); - setWindowIcon(QIcon(":img/flameshot.png")); + setWindowIcon(QIcon(":img/app/flameshot.svg")); setWindowTitle(tr("Configuration")); auto changedSlot = [this](QString s){ @@ -59,17 +59,17 @@ ConfigWindow::ConfigWindow(QWidget *parent) : QTabWidget(parent) { // visuals m_visuals = new VisualsEditor(); - addTab(m_visuals, QIcon(modifier + "graphics.png"), + addTab(m_visuals, QIcon(modifier + "graphics.svg"), tr("Interface")); // filename m_filenameEditor = new FileNameEditor(); - addTab(m_filenameEditor, QIcon(modifier + "name_edition.png"), + addTab(m_filenameEditor, QIcon(modifier + "name_edition.svg"), tr("Filename Editor")); // general m_generalConfig = new GeneneralConf(); - addTab(m_generalConfig, QIcon(modifier + "config.png"), + addTab(m_generalConfig, QIcon(modifier + "config.svg"), tr("General")); // connect update sigslots diff --git a/src/core/controller.cpp b/src/core/controller.cpp index 0422e286..459ec354 100644 --- a/src/core/controller.cpp +++ b/src/core/controller.cpp @@ -191,7 +191,7 @@ void Controller::enableTrayIcon() { m_trayIcon = new QSystemTrayIcon(); m_trayIcon->setToolTip("Flameshot"); m_trayIcon->setContextMenu(trayIconMenu); - QIcon trayicon = QIcon::fromTheme("flameshot-tray", QIcon(":img/flameshot.png")); + QIcon trayicon = QIcon::fromTheme("flameshot-tray", QIcon(":img/app/flameshot.png")); m_trayIcon->setIcon(trayicon); auto trayIconActivated = [this](QSystemTrayIcon::ActivationReason r){ diff --git a/src/tools/arrow/arrowtool.cpp b/src/tools/arrow/arrowtool.cpp index a02d7bbc..5cc26f6a 100644 --- a/src/tools/arrow/arrowtool.cpp +++ b/src/tools/arrow/arrowtool.cpp @@ -74,7 +74,7 @@ ArrowTool::ArrowTool(QObject *parent) : AbstractTwoPointTool(parent) { QIcon ArrowTool::icon(const QColor &background, bool inEditor) const { Q_UNUSED(inEditor); - return QIcon(iconPath(background) + "arrow-bottom-left.png"); + return QIcon(iconPath(background) + "arrow-bottom-left.svg"); } QString ArrowTool::name() const { return tr("Arrow"); diff --git a/src/tools/blur/blurtool.cpp b/src/tools/blur/blurtool.cpp index 4fa0c156..9d119ce8 100644 --- a/src/tools/blur/blurtool.cpp +++ b/src/tools/blur/blurtool.cpp @@ -28,7 +28,7 @@ BlurTool::BlurTool(QObject *parent) : AbstractTwoPointTool(parent) { QIcon BlurTool::icon(const QColor &background, bool inEditor) const { Q_UNUSED(inEditor); - return QIcon(iconPath(background) + "blur.png"); + return QIcon(iconPath(background) + "blur.svg"); } QString BlurTool::name() const { return tr("Blur"); diff --git a/src/tools/circle/circletool.cpp b/src/tools/circle/circletool.cpp index 8e6a253b..4ce2f5d8 100644 --- a/src/tools/circle/circletool.cpp +++ b/src/tools/circle/circletool.cpp @@ -28,7 +28,7 @@ CircleTool::CircleTool(QObject *parent) : AbstractTwoPointTool(parent) { QIcon CircleTool::icon(const QColor &background, bool inEditor) const { Q_UNUSED(inEditor); - return QIcon(iconPath(background) + "circle-outline.png"); + return QIcon(iconPath(background) + "circle-outline.svg"); } QString CircleTool::name() const { return tr("Circle"); diff --git a/src/tools/copy/copytool.cpp b/src/tools/copy/copytool.cpp index 9477718d..3914dd19 100644 --- a/src/tools/copy/copytool.cpp +++ b/src/tools/copy/copytool.cpp @@ -29,7 +29,7 @@ bool CopyTool::closeOnButtonPressed() const { QIcon CopyTool::icon(const QColor &background, bool inEditor) const { Q_UNUSED(inEditor); - return QIcon(iconPath(background) + "content-copy.png"); + return QIcon(iconPath(background) + "content-copy.svg"); } QString CopyTool::name() const { return tr("Copy"); diff --git a/src/tools/exit/exittool.cpp b/src/tools/exit/exittool.cpp index 67db6132..e4661c33 100644 --- a/src/tools/exit/exittool.cpp +++ b/src/tools/exit/exittool.cpp @@ -28,7 +28,7 @@ bool ExitTool::closeOnButtonPressed() const { QIcon ExitTool::icon(const QColor &background, bool inEditor) const { Q_UNUSED(inEditor); - return QIcon(iconPath(background) + "close.png"); + return QIcon(iconPath(background) + "close.svg"); } QString ExitTool::name() const { return tr("Exit"); diff --git a/src/tools/imgur/imguruploadertool.cpp b/src/tools/imgur/imguruploadertool.cpp index 2b432178..92d4e868 100644 --- a/src/tools/imgur/imguruploadertool.cpp +++ b/src/tools/imgur/imguruploadertool.cpp @@ -29,7 +29,7 @@ bool ImgurUploaderTool::closeOnButtonPressed() const { QIcon ImgurUploaderTool::icon(const QColor &background, bool inEditor) const { Q_UNUSED(inEditor); - return QIcon(iconPath(background) + "cloud-upload.png"); + return QIcon(iconPath(background) + "cloud-upload.svg"); } QString ImgurUploaderTool::name() const { return tr("Image Uploader"); diff --git a/src/tools/launcher/applaunchertool.cpp b/src/tools/launcher/applaunchertool.cpp index 67f079b0..15c4b992 100644 --- a/src/tools/launcher/applaunchertool.cpp +++ b/src/tools/launcher/applaunchertool.cpp @@ -28,7 +28,7 @@ bool AppLauncher::closeOnButtonPressed() const { QIcon AppLauncher::icon(const QColor &background, bool inEditor) const { Q_UNUSED(inEditor); - return QIcon(iconPath(background) + "open_with.png"); + return QIcon(iconPath(background) + "open_with.svg"); } QString AppLauncher::name() const { return tr("App Launcher"); diff --git a/src/tools/launcher/applauncherwidget.cpp b/src/tools/launcher/applauncherwidget.cpp index 5ad88c5a..9edccae4 100644 --- a/src/tools/launcher/applauncherwidget.cpp +++ b/src/tools/launcher/applauncherwidget.cpp @@ -52,7 +52,7 @@ AppLauncherWidget::AppLauncherWidget(const QPixmap &p, QWidget *parent): QWidget(parent), m_pixmap(p) { setAttribute(Qt::WA_DeleteOnClose); - setWindowIcon(QIcon(":img/flameshot.png")); + setWindowIcon(QIcon(":img/app/flameshot.svg")); setWindowTitle(tr("Open With")); m_keepOpen = ConfigHandler().keepOpenAppLauncherValue(); diff --git a/src/tools/line/linetool.cpp b/src/tools/line/linetool.cpp index 99bdab37..c6daeb8b 100644 --- a/src/tools/line/linetool.cpp +++ b/src/tools/line/linetool.cpp @@ -36,7 +36,7 @@ LineTool::LineTool(QObject *parent) : AbstractTwoPointTool(parent) { QIcon LineTool::icon(const QColor &background, bool inEditor) const { Q_UNUSED(inEditor); - return QIcon(iconPath(background) + "line.png"); + return QIcon(iconPath(background) + "line.svg"); } QString LineTool::name() const { return tr("Line"); diff --git a/src/tools/marker/markertool.cpp b/src/tools/marker/markertool.cpp index d2eccfc2..85a11dde 100644 --- a/src/tools/marker/markertool.cpp +++ b/src/tools/marker/markertool.cpp @@ -36,7 +36,7 @@ MarkerTool::MarkerTool(QObject *parent) : AbstractTwoPointTool(parent) { QIcon MarkerTool::icon(const QColor &background, bool inEditor) const { Q_UNUSED(inEditor); - return QIcon(iconPath(background) + "marker.png"); + return QIcon(iconPath(background) + "marker.svg"); } QString MarkerTool::name() const { return tr("Marker"); diff --git a/src/tools/move/movetool.cpp b/src/tools/move/movetool.cpp index 9dc25579..08e902fb 100644 --- a/src/tools/move/movetool.cpp +++ b/src/tools/move/movetool.cpp @@ -28,7 +28,7 @@ bool MoveTool::closeOnButtonPressed() const { QIcon MoveTool::icon(const QColor &background, bool inEditor) const { Q_UNUSED(inEditor); - return QIcon(iconPath(background) + "cursor-move.png"); + return QIcon(iconPath(background) + "cursor-move.svg"); } QString MoveTool::name() const { return tr("Move"); diff --git a/src/tools/pencil/penciltool.cpp b/src/tools/pencil/penciltool.cpp index 8dee23a7..509c825b 100644 --- a/src/tools/pencil/penciltool.cpp +++ b/src/tools/pencil/penciltool.cpp @@ -24,7 +24,7 @@ PencilTool::PencilTool(QObject *parent) : AbstractPathTool(parent) { QIcon PencilTool::icon(const QColor &background, bool inEditor) const { Q_UNUSED(inEditor); - return QIcon(iconPath(background) + "pencil.png"); + return QIcon(iconPath(background) + "pencil.svg"); } QString PencilTool::name() const { return tr("Pencil"); diff --git a/src/tools/pin/pintool.cpp b/src/tools/pin/pintool.cpp index 87831738..5017e14d 100755 --- a/src/tools/pin/pintool.cpp +++ b/src/tools/pin/pintool.cpp @@ -28,7 +28,7 @@ bool PinTool::closeOnButtonPressed() const { QIcon PinTool::icon(const QColor &background, bool inEditor) const { Q_UNUSED(inEditor); - return QIcon(iconPath(background) + "pin.png"); + return QIcon(iconPath(background) + "pin.svg"); } QString PinTool::name() const { return tr("Pin Tool"); diff --git a/src/tools/rectangle/rectangletool.cpp b/src/tools/rectangle/rectangletool.cpp index 39824ad1..368199c1 100644 --- a/src/tools/rectangle/rectangletool.cpp +++ b/src/tools/rectangle/rectangletool.cpp @@ -28,7 +28,7 @@ RectangleTool::RectangleTool(QObject *parent) : AbstractTwoPointTool(parent) { QIcon RectangleTool::icon(const QColor &background, bool inEditor) const { Q_UNUSED(inEditor); - return QIcon(iconPath(background) + "square.png"); + return QIcon(iconPath(background) + "square.svg"); } QString RectangleTool::name() const { return tr("Rectangle"); diff --git a/src/tools/redo/redotool.cpp b/src/tools/redo/redotool.cpp index 2ffd6b59..ee8a8c03 100644 --- a/src/tools/redo/redotool.cpp +++ b/src/tools/redo/redotool.cpp @@ -28,7 +28,7 @@ bool RedoTool::closeOnButtonPressed() const { QIcon RedoTool::icon(const QColor &background, bool inEditor) const { Q_UNUSED(inEditor); - return QIcon(iconPath(background) + "redo-variant.png"); + return QIcon(iconPath(background) + "redo-variant.svg"); } QString RedoTool::name() const { return tr("Redo"); diff --git a/src/tools/save/savetool.cpp b/src/tools/save/savetool.cpp index bc61000b..ec7027fc 100644 --- a/src/tools/save/savetool.cpp +++ b/src/tools/save/savetool.cpp @@ -29,7 +29,7 @@ bool SaveTool::closeOnButtonPressed() const { QIcon SaveTool::icon(const QColor &background, bool inEditor) const { Q_UNUSED(inEditor); - return QIcon(iconPath(background) + "content-save.png"); + return QIcon(iconPath(background) + "content-save.svg"); } QString SaveTool::name() const { return tr("Save"); diff --git a/src/tools/selection/selectiontool.cpp b/src/tools/selection/selectiontool.cpp index b02874d0..fb3b3125 100644 --- a/src/tools/selection/selectiontool.cpp +++ b/src/tools/selection/selectiontool.cpp @@ -32,7 +32,7 @@ bool SelectionTool::closeOnButtonPressed() const { QIcon SelectionTool::icon(const QColor &background, bool inEditor) const { Q_UNUSED(inEditor); - return QIcon(iconPath(background) + "square-outline.png"); + return QIcon(iconPath(background) + "square-outline.svg"); } QString SelectionTool::name() const { return tr("Rectangular Selection"); diff --git a/src/tools/sizeindicator/sizeindicatortool.cpp b/src/tools/sizeindicator/sizeindicatortool.cpp index 2ecec9d6..1e883048 100644 --- a/src/tools/sizeindicator/sizeindicatortool.cpp +++ b/src/tools/sizeindicator/sizeindicatortool.cpp @@ -28,7 +28,7 @@ bool SizeIndicatorTool::closeOnButtonPressed() const { QIcon SizeIndicatorTool::icon(const QColor &background, bool inEditor) const { return inEditor ? QIcon() : - QIcon(iconPath(background) + "size_indicator.png"); + QIcon(iconPath(background) + "size_indicator.svg"); } QString SizeIndicatorTool::name() const { return tr("Selection Size Indicator"); diff --git a/src/tools/text/textconfig.cpp b/src/tools/text/textconfig.cpp index 34e2047d..357fa041 100644 --- a/src/tools/text/textconfig.cpp +++ b/src/tools/text/textconfig.cpp @@ -38,32 +38,32 @@ TextConfig::TextConfig(QWidget *parent) : QWidget(parent) { QColor bgColor(palette().background().color()); QString iconPrefix = ColorUtils::colorIsDark(bgColor) ? - PathInfo::whiteConfigIconPath() : - PathInfo::blackConfigIconPath(); + PathInfo::whiteIconPath() : + PathInfo::blackIconPath(); m_strikeOutButton = new QPushButton( - QIcon(iconPrefix + "format_strikethrough.png"), ""); + QIcon(iconPrefix + "format_strikethrough.svg"), ""); m_strikeOutButton->setCheckable(true); connect(m_strikeOutButton, &QPushButton::clicked, this, &TextConfig::fontStrikeOutChanged); m_strikeOutButton->setToolTip(tr("StrikeOut")); m_underlineButton = new QPushButton( - QIcon(iconPrefix + "format_underlined.png"), ""); + QIcon(iconPrefix + "format_underlined.svg"), ""); m_underlineButton->setCheckable(true); connect(m_underlineButton, &QPushButton::clicked, this, &TextConfig::fontUnderlineChanged); m_underlineButton->setToolTip(tr("Underline")); m_weightButton = new QPushButton( - QIcon(iconPrefix + "format_bold.png"), ""); + QIcon(iconPrefix + "format_bold.svg"), ""); m_weightButton->setCheckable(true); connect(m_weightButton, &QPushButton::clicked, this, &TextConfig::weightButtonPressed); m_weightButton->setToolTip(tr("Bold")); m_italicButton = new QPushButton( - QIcon(iconPrefix + "format_italic.png"), ""); + QIcon(iconPrefix + "format_italic.svg"), ""); m_italicButton->setCheckable(true); connect(m_italicButton, &QPushButton::clicked, this, &TextConfig::fontItalicChanged); diff --git a/src/tools/text/texttool.cpp b/src/tools/text/texttool.cpp index ae8135a6..6688dc95 100644 --- a/src/tools/text/texttool.cpp +++ b/src/tools/text/texttool.cpp @@ -43,7 +43,7 @@ bool TextTool::showMousePreview() const { QIcon TextTool::icon(const QColor &background, bool inEditor) const { Q_UNUSED(inEditor); - return QIcon(iconPath(background) + "text.png"); + return QIcon(iconPath(background) + "text.svg"); } QString TextTool::name() const { diff --git a/src/tools/undo/undotool.cpp b/src/tools/undo/undotool.cpp index dc945060..1d1d791d 100644 --- a/src/tools/undo/undotool.cpp +++ b/src/tools/undo/undotool.cpp @@ -28,7 +28,7 @@ bool UndoTool::closeOnButtonPressed() const { QIcon UndoTool::icon(const QColor &background, bool inEditor) const { Q_UNUSED(inEditor); - return QIcon(iconPath(background) + "undo-variant.png"); + return QIcon(iconPath(background) + "undo-variant.svg"); } QString UndoTool::name() const { return tr("Undo"); diff --git a/src/utils/pathinfo.cpp b/src/utils/pathinfo.cpp index 6b50577d..a8bbaa5f 100644 --- a/src/utils/pathinfo.cpp +++ b/src/utils/pathinfo.cpp @@ -21,22 +21,13 @@ #include const QString PathInfo::whiteIconPath() { - return ":/img/buttonIconsWhite/"; + return ":/img/material/white/"; } const QString PathInfo::blackIconPath() { - return ":/img/buttonIconsBlack/"; + return ":/img/material/black/"; } -const QString PathInfo::whiteConfigIconPath() { - return ":/img/configWhite/"; -} - -const QString PathInfo::blackConfigIconPath() { - return ":/img/configBlack/"; -} - - QStringList PathInfo::translationsPaths() { QString binaryPath = QFileInfo(qApp->applicationDirPath()) .absoluteFilePath(); diff --git a/src/utils/pathinfo.h b/src/utils/pathinfo.h index cdf44c76..503eaa18 100644 --- a/src/utils/pathinfo.h +++ b/src/utils/pathinfo.h @@ -25,10 +25,6 @@ const QString whiteIconPath(); const QString blackIconPath(); -const QString whiteConfigIconPath(); - -const QString blackConfigIconPath(); - QStringList translationsPaths(); } // namespace diff --git a/src/utils/screenshotsaver.cpp b/src/utils/screenshotsaver.cpp index 3e13dcb4..3c5cb6e9 100644 --- a/src/utils/screenshotsaver.cpp +++ b/src/utils/screenshotsaver.cpp @@ -83,7 +83,7 @@ bool ScreenshotSaver::saveToFilesystemGUI(const QPixmap &capture) { QMessageBox::Warning, QObject::tr("Save Error"), msg); - saveErrBox.setWindowIcon(QIcon(":img/flameshot.png")); + saveErrBox.setWindowIcon(QIcon(":img/app/flameshot.svg")); saveErrBox.exec(); } } diff --git a/src/widgets/infowindow.cpp b/src/widgets/infowindow.cpp index be97b0d7..6f3ac061 100644 --- a/src/widgets/infowindow.cpp +++ b/src/widgets/infowindow.cpp @@ -27,7 +27,7 @@ InfoWindow::InfoWindow(QWidget *parent) : QWidget(parent) { setAttribute(Qt::WA_DeleteOnClose); - setWindowIcon(QIcon(":img/flameshot.png")); + setWindowIcon(QIcon(":img/app/flameshot.svg")); setWindowTitle(tr("About")); m_layout = new QVBoxLayout(this); diff --git a/src/widgets/panel/colorpickerwidget.cpp b/src/widgets/panel/colorpickerwidget.cpp index 75bf7762..30fe48f4 100644 --- a/src/widgets/panel/colorpickerwidget.cpp +++ b/src/widgets/panel/colorpickerwidget.cpp @@ -66,9 +66,9 @@ ColorPickerWidget::ColorPickerWidget(QPixmap *p, QWidget *parent) : QColor background = this->palette().background().color(); bool isDark = ColorUtils::colorIsDark(background); - QString modifier = isDark ? PathInfo::whiteConfigIconPath() : - PathInfo::blackConfigIconPath(); - QIcon grabIcon(modifier + "colorize.png"); + QString modifier = isDark ? PathInfo::whiteIconPath() : + PathInfo::blackIconPath(); + QIcon grabIcon(modifier + "colorize.svg"); m_colorGrabButton = new QPushButton(grabIcon, ""); updateGrabButton(false); connect(m_colorGrabButton, &QPushButton::pressed, diff --git a/travis/linux_install.sh b/travis/linux_install.sh index 1a0d18a0..52ede423 100755 --- a/travis/linux_install.sh +++ b/travis/linux_install.sh @@ -20,7 +20,7 @@ if [[ "${DIST}" == "trusty" ]]; then sudo apt-get install -qq gcc-4.9 g++-4.9 # Install qt5.3.2 - sudo apt-get -y install qt53base qt53tools + sudo apt-get -y install qt53base qt53tools qt53svg # Install fcitx-frontend-qt5 sudo apt-get -y install fcitx-frontend-qt5 diff --git a/travis/linux_script.sh b/travis/linux_script.sh index c4f020e3..a29c9b21 100755 --- a/travis/linux_script.sh +++ b/travis/linux_script.sh @@ -59,7 +59,7 @@ if [[ "${DIST}" == "trusty" ]]; then "${project_dir}"/docs/desktopEntry/package/* \ "${APPIMAGE_DST_PATH}"/appdir/usr/share/applications cp \ - "${project_dir}"/img/flameshot.png \ + "${project_dir}"/img/app/flameshot.png \ "${APPIMAGE_DST_PATH}"/appdir ls -alhR "${APPIMAGE_DST_PATH}"/appdir