From b95e096136c541896cb751843f6a5e6916d78c6f Mon Sep 17 00:00:00 2001 From: a1346054 <36859588+a1346054@users.noreply.github.com> Date: Tue, 28 Sep 2021 01:33:45 +0000 Subject: [PATCH] Simple maintenance improvements (#1918) * Use license file from gnu.org Downloaded from: https://www.gnu.org/licenses/gpl-3.0.txt * Add missing final newline * Fix link * Fix shellcheck warnings * Move donation header one level up * Fix typos * Stop mixing tabs and spaces * Trim trailing whitespace --- .cmake-format.yaml | 2 +- .github/ISSUE_TEMPLATE/Feature_request.md | 2 +- .github/workflows/Linux-pack.yml | 22 +++++++------- .github/workflows/Windows-pack.yml | 2 +- .github/workflows/build_cmake.yml | 10 +++---- .github/workflows/clang-format.yml | 2 +- LICENSE | 14 ++++----- README.md | 12 ++++---- appveyor.yml | 6 ++-- cmake/Cache.cmake | 1 - cmake/CompilerWarnings.cmake | 2 +- cmake/Sanitizers.cmake | 2 +- cmake/StandardProjectSettings.cmake | 2 +- cmake/modules/MacOSXBundleInfo.plist.in | 12 ++++---- .../org.flameshot.Flameshot.metainfo.xml | 3 +- data/dbus/org.freedesktop.Notifications.xml | 2 +- data/flameshot.rc | 2 +- data/shell-completion/flameshot | 20 ++++++------- data/snap/snapcraft.yaml | 14 ++++----- docs/CONTRIBUTING.md | 2 +- docs/RFC.md | 18 +++++------ docs/ReleaseNotes_0.8.md | 2 +- docs/ReleaseNotes_0.9.md | 30 +++++++++---------- docs/Releasing.md | 7 ++--- packaging/macos/Info.plist | 2 +- packaging/macos/create_keychain.sh | 4 +-- packaging/macos/sign_qtapp.sh | 2 +- packaging/macos/update_package.sh | 2 +- packaging/rpm/flameshot.spec | 2 +- packaging/win-installer/LICENSE/GPL-3.0.txt | 14 ++++----- snapcraft.yaml | 14 ++++----- src/CMakeLists.txt | 2 +- src/tools/text/texttool.cpp | 2 +- src/utils/filenamehandler.cpp | 2 +- src/utils/request.cpp | 2 +- src/utils/valuehandler.h | 4 +-- src/widgets/capture/capturetoolobjects.cpp | 2 +- tests/path_option.sh | 2 +- 38 files changed, 122 insertions(+), 125 deletions(-) diff --git a/.cmake-format.yaml b/.cmake-format.yaml index e7be3399..c4a575ee 100644 --- a/.cmake-format.yaml +++ b/.cmake-format.yaml @@ -15,4 +15,4 @@ line_width: 120 max_pargs_hwrap: 3 separate_ctrl_name_with_space: false separate_fn_name_with_space: false -tab_size: 2 \ No newline at end of file +tab_size: 2 diff --git a/.github/ISSUE_TEMPLATE/Feature_request.md b/.github/ISSUE_TEMPLATE/Feature_request.md index 7b62f674..ab8e7c58 100644 --- a/.github/ISSUE_TEMPLATE/Feature_request.md +++ b/.github/ISSUE_TEMPLATE/Feature_request.md @@ -11,4 +11,4 @@ Please make sure: - a single feature per issue - explain in detail what you have in mind - if it helps, add sketches/pictures ---> \ No newline at end of file +--> diff --git a/.github/workflows/Linux-pack.yml b/.github/workflows/Linux-pack.yml index 33d41ef6..72c43dc6 100644 --- a/.github/workflows/Linux-pack.yml +++ b/.github/workflows/Linux-pack.yml @@ -2,7 +2,7 @@ name: Packaging(Linux) on: push: - branches: + branches: - master paths-ignore: - 'README.md' @@ -37,13 +37,13 @@ jobs: os: debian, symbol: buster, arch: amd64 - } + } - { name: debian-10, os: debian, symbol: buster, arch: arm64 - } + } - { name: debian-10, os: debian, @@ -55,13 +55,13 @@ jobs: os: debian, symbol: bullseye, arch: amd64 - } + } - { name: debian-11, os: debian, symbol: bullseye, arch: arm64 - } + } - { name: debian-11, os: debian, @@ -75,7 +75,7 @@ jobs: arch: amd64 } steps: - - name: Enable Docker Experimental Features + - name: Enable Docker Experimental Features run: | echo $'{\n "experimental": true\n}' | sudo tee /etc/docker/daemon.json mkdir -p ~/.docker @@ -115,7 +115,7 @@ jobs: - name: Checkout Source code if: github.event_name == 'push' uses: actions/checkout@v2 - with: + with: fetch-depth: 0 ref: master - name: Checkout Source code @@ -324,7 +324,7 @@ jobs: - name: Checkout Source code if: github.event_name == 'push' uses: actions/checkout@v2 - with: + with: fetch-depth: 0 ref: master - name: Checkout Source code @@ -438,7 +438,7 @@ jobs: - name: Checkout Source code if: github.event_name == 'push' uses: actions/checkout@v2 - with: + with: fetch-depth: 0 ref: master - name: Checkout Source code @@ -484,7 +484,7 @@ jobs: openssl \ ca-certificates - name: Get go-appimage tool - # Will not use linuxdeployqt anymore, because it suopprts currently still-supported mainstream distribution, + # Will not use linuxdeployqt anymore, because it suopprts currently still-supported mainstream distribution, # which is glibc 2.23. For more information, please see https://github.com/probonopd/linuxdeployqt/issues/340. # Will try new tool https://github.com/probonopd/go-appimage written in golang by probonopd. run: | @@ -614,7 +614,7 @@ jobs: - name: Checkout Source code if: github.event_name == 'push' uses: actions/checkout@v2 - with: + with: fetch-depth: 0 ref: master - name: Checkout Source code diff --git a/.github/workflows/Windows-pack.yml b/.github/workflows/Windows-pack.yml index 4a431461..1963aeed 100644 --- a/.github/workflows/Windows-pack.yml +++ b/.github/workflows/Windows-pack.yml @@ -62,7 +62,7 @@ jobs: - name: Checkout Source code if: github.event_name == 'pull_request' uses: actions/checkout@v2 - with: + with: fetch-depth: 0 ref: ${{ github.event.pull_request.head.sha }} diff --git a/.github/workflows/build_cmake.yml b/.github/workflows/build_cmake.yml index 7650c97a..51c0628c 100644 --- a/.github/workflows/build_cmake.yml +++ b/.github/workflows/build_cmake.yml @@ -32,7 +32,7 @@ jobs: - name: Checkout Source code if: github.event_name == 'pull_request' uses: actions/checkout@v2 - with: + with: ref: ${{ github.event.pull_request.head.sha }} - name: Install Dependencies @@ -62,10 +62,10 @@ jobs: # access regardless of the host operating system shell: bash working-directory: ${{runner.workspace}}/build - # Note the current convention is to use the -S and -B options here to specify source - # and build directories, but this is only available with CMake 3.13 and higher. + # Note the current convention is to use the -S and -B options here to specify source + # and build directories, but this is only available with CMake 3.13 and higher. # The CMake binaries on the Github Actions machines are (as of this writing) 3.12 - # + # # We need to source the profile file to make sure conan is in PATH run: | cmake $GITHUB_WORKSPACE -DCMAKE_BUILD_TYPE=$BUILD_TYPE @@ -78,7 +78,7 @@ jobs: - name: Test working-directory: ${{runner.workspace}}/build shell: bash - # Execute tests defined by the CMake configuration. + # Execute tests defined by the CMake configuration. # See https://cmake.org/cmake/help/latest/manual/ctest.1.html for more detail run: ctest -C $BUILD_TYPE diff --git a/.github/workflows/clang-format.yml b/.github/workflows/clang-format.yml index 3e1fe9e2..b5e946d3 100644 --- a/.github/workflows/clang-format.yml +++ b/.github/workflows/clang-format.yml @@ -13,7 +13,7 @@ jobs: - name: Checkout Source code if: github.event_name == 'pull_request' uses: actions/checkout@v2 - with: + with: ref: ${{ github.event.pull_request.head.sha }} - uses: DoozyX/clang-format-lint-action@v0.9 with: diff --git a/LICENSE b/LICENSE index 9cecc1d4..f288702d 100644 --- a/LICENSE +++ b/LICENSE @@ -1,7 +1,7 @@ GNU GENERAL PUBLIC LICENSE Version 3, 29 June 2007 - Copyright (C) 2007 Free Software Foundation, Inc. + 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. @@ -631,8 +631,8 @@ 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. - {one line to give the program's name and a brief idea of what it does.} - Copyright (C) {year} {name of author} + + 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 @@ -645,14 +645,14 @@ the "copyright" line and a pointer to where the full notice is found. 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 . + 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: - {project} Copyright (C) {year} {fullname} + 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. @@ -664,11 +664,11 @@ might be different; for a GUI interface, you would use an "about box". You should also get your employer (if you work as a programmer) or school, if any, to sign a "copyright disclaimer" for the program, if necessary. For more information on this, and how to apply and follow the GNU GPL, see -. +. The GNU General Public License does not permit incorporating your program into proprietary programs. If your program is a subroutine library, you may consider it more useful to permit linking proprietary applications with the library. If this is what you want to do, use the GNU Lesser General Public License instead of this License. But first, please read -. +. diff --git a/README.md b/README.md index 91ed2084..0d72f852 100644 --- a/README.md +++ b/README.md @@ -252,7 +252,7 @@ Steps for using the configuration: #### On Ubuntu (Tested on 18.04, 20.04) -To use Flameshot instead of the default screenshot application in Ubuntu we need to remove the binding on Prt Sc key, and then create a new binding for `/usr/bin/flameshot gui` ([adaptated](https://askubuntu.com/posts/1039949/revisions) from [Pavel's answer on AskUbuntu](https://askubuntu.com/revisions/1036473/1)). +To use Flameshot instead of the default screenshot application in Ubuntu we need to remove the binding on Prt Sc key, and then create a new binding for `/usr/bin/flameshot gui` ([adaptated](https://askubuntu.com/posts/1039949/revisions) from [Pavel's answer on AskUbuntu](https://askubuntu.com/revisions/1036473/1)). 1. Remove the binding on Prt Sc using the following command. @@ -275,7 +275,7 @@ Now every time you press Prt Sc, it will start the Flameshot GUI inst 1. Go to `Keyboard` settings 2. Switch to the tab `Application Shortcuts` 3. Find the entry - + ```text Command Shortcut xfce4-screenshooter -fd 1 Print @@ -360,7 +360,7 @@ Also you can open and build/debug the project in a C++ IDE. For example, in Qt C - Qt >= 5.9 + Development tools -- GCC >= 7.4 +- GCC >= 7.4 - CMake >= 3.13 #### Run-time @@ -448,8 +448,8 @@ When `make` command completed you can launch flameshot from `project_folder/buil ### Install -Simply use `make install` with privileges. -Note: If you install from source, there is no uninstaller, you will need to manually remove the files. Consider using [CMAKE_INSTALL_PREFIX](https://cmake.org/cmake/help/latest/variable/CMAKE_INSTALL_PREFIX.html) to install to a custom location for easy removal. +Simply use `make install` with privileges. +Note: If you install from source, there is no uninstaller, you will need to manually remove the files. Consider using [CMAKE_INSTALL_PREFIX](https://cmake.org/cmake/help/latest/variable/CMAKE_INSTALL_PREFIX.html) to install to a custom location for easy removal. ### FAQ https://flameshot.org/guide/faq/ @@ -472,7 +472,7 @@ This program will not transfer any information to other networked systems unless ## Code Signing Policy Free code signing provided by [SignPath.io](https://signpath.io/), certificate by [SignPath Foundation](https://signpath.org/). -Code signing is currently a manual process so not every patch release will be signed. +Code signing is currently a manual process so not every patch release will be signed. ## Contribute If you want to contribute check the [CONTRIBUTING.md](docs/CONTRIBUTING.md) diff --git a/appveyor.yml b/appveyor.yml index f9062ff0..c802fadc 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -12,7 +12,7 @@ build_script: mkdir build cd build - + set QTDIR=%Qt5_INSTALL_DIR% set "VCINSTALLDIR=C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC" @@ -22,11 +22,11 @@ build_script: cmake c:\projects\source -G "Visual Studio 16 2019" -DCMAKE_BUILD_TYPE:STRING=Release -DENABLE_OPENSSL=ON -DRUN_IN_PLACE=OFF cmake --build . --parallel 2 --config "Release" - + cpack -G WIX -B package mkdir artifact - + cp package/*.msi artifact/. cp src/Release/*.exe artifact/. diff --git a/cmake/Cache.cmake b/cmake/Cache.cmake index 8664491d..31f5e7ed 100644 --- a/cmake/Cache.cmake +++ b/cmake/Cache.cmake @@ -27,4 +27,3 @@ if(CACHE_BINARY) else() message(WARNING "${CACHE_OPTION} is enabled but was not found. Not using it") endif() - diff --git a/cmake/CompilerWarnings.cmake b/cmake/CompilerWarnings.cmake index d933ce30..82431545 100644 --- a/cmake/CompilerWarnings.cmake +++ b/cmake/CompilerWarnings.cmake @@ -1,6 +1,6 @@ # from here: # -# https://github.com/lefticus/cppbestpractices/blob/master/02-Use_the_Tools_Avai lable.md +# https://github.com/lefticus/cppbestpractices/blob/master/02-Use_the_Tools_Available.md function(set_project_warnings project_name) option(WARNINGS_AS_ERRORS "Treat compiler warnings as errors" TRUE) diff --git a/cmake/Sanitizers.cmake b/cmake/Sanitizers.cmake index dda0d26c..4342f7da 100644 --- a/cmake/Sanitizers.cmake +++ b/cmake/Sanitizers.cmake @@ -63,4 +63,4 @@ function(enable_sanitizers project_name) endif() endif() -endfunction() \ No newline at end of file +endfunction() diff --git a/cmake/StandardProjectSettings.cmake b/cmake/StandardProjectSettings.cmake index 743b0712..1ee6f5ae 100644 --- a/cmake/StandardProjectSettings.cmake +++ b/cmake/StandardProjectSettings.cmake @@ -31,4 +31,4 @@ if(ENABLE_IPO) else() message(SEND_ERROR "IPO is not supported: ${output}") endif() -endif() \ No newline at end of file +endif() diff --git a/cmake/modules/MacOSXBundleInfo.plist.in b/cmake/modules/MacOSXBundleInfo.plist.in index 8072a17c..5822f97b 100644 --- a/cmake/modules/MacOSXBundleInfo.plist.in +++ b/cmake/modules/MacOSXBundleInfo.plist.in @@ -3,7 +3,7 @@ CFBundleDevelopmentRegion - English + English CFBundleExecutable flameshot CFBundleGetInfoString @@ -37,10 +37,10 @@ NSHighResolutionCapable True LSUIElement - 1 - NSPhotoLibraryAddUsageDescription - Application requires access to save screenshots to your gallery - NSSupportsAutomaticGraphicsSwitching - + 1 + NSPhotoLibraryAddUsageDescription + Application requires access to save screenshots to your gallery + NSSupportsAutomaticGraphicsSwitching + diff --git a/data/appdata/org.flameshot.Flameshot.metainfo.xml b/data/appdata/org.flameshot.Flameshot.metainfo.xml index 5bbe4f3a..dbb1e26d 100644 --- a/data/appdata/org.flameshot.Flameshot.metainfo.xml +++ b/data/appdata/org.flameshot.Flameshot.metainfo.xml @@ -8,7 +8,7 @@ SPDX-License-Identifier: CC0-1.0 CC0-1.0 GPL-3.0-or-later Flameshot - + @@ -38,5 +38,4 @@ SPDX-License-Identifier: CC0-1.0 https://github.com/flameshot-org/flameshot https://github.com/flameshot-org/flameshot/issues/new org.flameshot.Flameshot.desktop - diff --git a/data/dbus/org.freedesktop.Notifications.xml b/data/dbus/org.freedesktop.Notifications.xml index e9630a61..00e85ea5 100644 --- a/data/dbus/org.freedesktop.Notifications.xml +++ b/data/dbus/org.freedesktop.Notifications.xml @@ -27,4 +27,4 @@ - + diff --git a/data/flameshot.rc b/data/flameshot.rc index 1fac2d6f..142e6318 100644 --- a/data/flameshot.rc +++ b/data/flameshot.rc @@ -44,4 +44,4 @@ BEGIN BEGIN VALUE "Translation", 0x0409, 0x04b0 /* U.S. English (Unicode) */ END -END \ No newline at end of file +END diff --git a/data/shell-completion/flameshot b/data/shell-completion/flameshot index 60c197e3..cdca3869 100644 --- a/data/shell-completion/flameshot +++ b/data/shell-completion/flameshot @@ -21,19 +21,19 @@ _flameshot() { return 0 ;; screen) - COMPREPLY=( $(compgen -W "$screen_opts --help -h" -- ${cur}) ) + COMPREPLY=( $(compgen -W "$screen_opts --help -h" -- "${cur}") ) return 0 ;; gui) - COMPREPLY=( $(compgen -W "$gui_opts --help -h" -- ${cur}) ) + COMPREPLY=( $(compgen -W "$gui_opts --help -h" -- "${cur}") ) return 0 ;; full) - COMPREPLY=( $(compgen -W "$full_opts --help -h" -- ${cur}) ) + COMPREPLY=( $(compgen -W "$full_opts --help -h" -- "${cur}") ) return 0 ;; config) - COMPREPLY=( $(compgen -W "$config_opts --help -h" -- ${cur}) ) + COMPREPLY=( $(compgen -W "$config_opts --help -h" -- "${cur}") ) return 0 ;; -f|--filename|-p|--path) @@ -41,7 +41,7 @@ _flameshot() { return 0 ;; -s|--showhelp|-t|--trayicon) - COMPREPLY=( $(compgen -W "true false" -- ${cur}) ) + COMPREPLY=( $(compgen -W "true false" -- "${cur}") ) return 0 ;; -d|--delay|-h|--help|-c|--clipboard|--version|-v|--number|-n) @@ -54,23 +54,23 @@ _flameshot() { # Options case "${cur}" in -*) - COMPREPLY=( $( compgen -W "--version --help -v -h" -- ${cur}) ) + COMPREPLY=( $( compgen -W "--version --help -v -h" -- "${cur}") ) return 0 ;; --*) - COMPREPLY=( $( compgen -W "--version --help" -- ${cur}) ) + COMPREPLY=( $( compgen -W "--version --help" -- "${cur}") ) return 0 ;; *) - COMPREPLY=( $( compgen -W "${cmd}" -- ${cur}) ) + COMPREPLY=( $( compgen -W "${cmd}" -- "${cur}") ) return 0 ;; esac } if [[ -n ${ZSH_VERSION} ]]; then - autoload -U bashcompinit - bashcompinit + autoload -U bashcompinit + bashcompinit fi complete -F _flameshot flameshot diff --git a/data/snap/snapcraft.yaml b/data/snap/snapcraft.yaml index ab9b5f24..9bed0889 100644 --- a/data/snap/snapcraft.yaml +++ b/data/snap/snapcraft.yaml @@ -69,8 +69,8 @@ parts: build-packages: - g++ - make - - qt5-default - - qttools5-dev-tools + - qt5-default + - qttools5-dev-tools - libqt5svg5-dev stage-packages: - dbus-x11 @@ -78,11 +78,11 @@ parts: - openssl - ca-certificates - qtwayland5 - - libqt5dbus5 - - libqt5network5 - - libqt5core5a - - libqt5widgets5 - - libqt5gui5 + - libqt5dbus5 + - libqt5network5 + - libqt5core5a + - libqt5widgets5 + - libqt5gui5 - libqt5svg5 - libxkbcommon0 - ttf-ubuntu-font-family diff --git a/docs/CONTRIBUTING.md b/docs/CONTRIBUTING.md index 5935a019..2f023811 100644 --- a/docs/CONTRIBUTING.md +++ b/docs/CONTRIBUTING.md @@ -42,7 +42,7 @@ For small fixes or incremental improvements simply fork the repo and follow the After reporting you should aim to answer questions or clarifications as this helps pinpoint the cause of the issue. -### Donations +## Donations I improve Flameshot in my free time because I want to create something good for everyone to use. If you want you can donate some bucks [here](https://www.paypal.me/lupoDharkael). diff --git a/docs/RFC.md b/docs/RFC.md index ed43c477..827a782e 100644 --- a/docs/RFC.md +++ b/docs/RFC.md @@ -40,7 +40,7 @@ following. + Any changes breaking compatibility to command line flags or config files. + Any major changes to the UI - + Substantial new features like new tools. + + Substantial new features like new tools. Some changes do not require an RFC: @@ -48,12 +48,12 @@ Some changes do not require an RFC: not change meaning". - + Improving translations. + + Improving translations. + Additions that strictly improve objective, numerical quality criteria (warning removal, speedup, better platform coverage, etc.) - + Additions only likely to be _noticed by_ other developers-of-flameshot, + + Additions only likely to be _noticed by_ other developers-of-flameshot, invisible to users-of-flameshot. @@ -76,7 +76,7 @@ beforehand, to ascertain that the RFC may be desirable; having a consistent impact on the project requires concerted effort toward consensus-building. The most common preparations for writing and submitting an RFC include talking -the idea over on our [official Slack server](flameshotworkspace.slack.com) or opening an issue on github for discussion. +the idea over on our [official Slack server](flameshotworkspace.slack.com) or opening an issue on github for discussion. ## What the process is @@ -86,7 +86,7 @@ In short, to get a major feature added to Flameshot, one must first get the RFC merged into the RFC repository as a markdown file. At that point the RFC is "active" and may be implemented with the goal of eventual inclusion into Flameshot. - + Fork the Flameshot repo + + Fork the Flameshot repo + Copy `docs/0000-template.md` to `docs/RFC/0000-my-feature.md` (where "my-feature" is descriptive). Don't assign an RFC number yet; This is going to be the PR @@ -170,9 +170,9 @@ next major release. In general, once accepted, RFCs should not be substantially changed. Only very minor changes should be submitted as amendments. More substantial changes should be new RFCs, with a note added to the original RFC. Exactly what counts -as a "very minor change" is up to the development team. +as a "very minor change" is up to the development team. + - ## Reviewing RFCs @@ -216,11 +216,11 @@ Some RFC pull requests are tagged with the "postponed" label when they are closed (as part of the rejection process). An RFC closed with "postponed" is marked as such because we want neither to think about evaluating the proposal nor about implementing the described feature until some time in the future, and -we believe that we can afford to wait until then to do so. +we believe that we can afford to wait until then to do so. Usually an RFC pull request marked as "postponed" has already passed an informal first round of evaluation, namely the round of "do we think we would -ever possibly consider making this change, as outlined in the RFC pull request, +ever possibly consider making this change, as outlined in the RFC pull request, or some semi-obvious variation of it." (When the answer to the latter question is "no", then the appropriate response is to close the RFC, not postpone it.) diff --git a/docs/ReleaseNotes_0.8.md b/docs/ReleaseNotes_0.8.md index d1e2f559..cfd3bc5c 100644 --- a/docs/ReleaseNotes_0.8.md +++ b/docs/ReleaseNotes_0.8.md @@ -60,4 +60,4 @@ A button has been added to open the sidebar. This tool was previously only acces * Enable Pin and Text tool by default. (#443) * Fix the problem that moving or resizing does not affect screenshot. (#459) * Fix problem with re-enabling disabled tray icon (#495) -* Fix compilation problem against Qt 5.15. \ No newline at end of file +* Fix compilation problem against Qt 5.15. diff --git a/docs/ReleaseNotes_0.9.md b/docs/ReleaseNotes_0.9.md index ee371f6d..8073059e 100644 --- a/docs/ReleaseNotes_0.9.md +++ b/docs/ReleaseNotes_0.9.md @@ -1,40 +1,40 @@ # 0.9 Release Notes Thanks to all the testers and contributors that helped make version 0.9! We are very excited to have improved many -bugs and added new features in version 0.9. +bugs and added new features in version 0.9. ## Known Issues -- Fractional scaling issues are not resolved. We are working with Qt upstream on this issue. +- Fractional scaling issues are not resolved. We are working with Qt upstream on this issue. ## New Features - Improved MacOS support. MacOS is now officially supported and we will resolve any reported issues on this platform. - -- Thanks to SignPath we are able to offer digitally signed windows releases. + +- Thanks to SignPath we are able to offer digitally signed windows releases. - Improved Wayland support - - Behind the scenes we configure flameshot to automatically run on xcb. This significantly improves the + - Behind the scenes we configure flameshot to automatically run on xcb. This significantly improves the wayland experience. This resolves issues with multimonitor setups and copying to the clipboard - -- New option to allow the the clipboard image to be a jpeg instead of a png. This may reduce bandwidth when pasting the + +- New option to allow the clipboard image to be a jpeg instead of a png. This may reduce bandwidth when pasting the image into chat or email clients -- New global shortcut menu. All actions hotkeys are fully customizable. - -- Ability to take "symmetric" selections by holding down the Shift key while resizing the selection. +- New global shortcut menu. All actions hotkeys are fully customizable. + +- Ability to take "symmetric" selections by holding down the Shift key while resizing the selection. - The rectangle tool will now round the corners of the rectangles based on the current thickness - All imgur uploads are now tracked in the "Upload History" menu. This makes it much easier to delete of images off imgur or find the upload link later. -- Added "check for new release" feature. This allows users on MacOS / Windows / and AppImages to easily check for updated versions. +- Added "check for new release" feature. This allows users on MacOS / Windows / and AppImages to easily check for updated versions. - New option for setting a "fixed save path". When this is enabled a user will no longer need to set the path for images -that are saved. +that are saved. + - ## Fixes - Under certain circumstance the circle count could get set to the wrong number with large numbers of undo / redo. This -has been fixed. - +has been fixed. + - Close after capture has been removed. This feature was not well implemented and lead to numerous bugs. diff --git a/docs/Releasing.md b/docs/Releasing.md index 998599ed..30eda7b3 100644 --- a/docs/Releasing.md +++ b/docs/Releasing.md @@ -10,11 +10,10 @@ These are the code changes that need to take place These are the steps for actually making the release - [ ] Download all binaries from CI run started from PR related to code changes shown above - [ ] Create sha256 for each binary and compare against sha256 shown in the CI to verify there was no corruption or inserted malware. -- [ ] Create a new "New Release" in githhub and explain changes in release notes +- [ ] Create a new "New Release" in github and explain changes in release notes - [ ] Upload all binaries and sha's -- [ ] Update flatpak manifest for flathub: https://github.com/flathub/org.flameshot.Flameshot +- [ ] Update flatpak manifest for flathub: https://github.com/flathub/org.flameshot.Flameshot - [ ] Push snapcraft edge release to stable -- [ ] If this is a major release coordinate with sign path on signed windows binaries +- [ ] If this is a major release coordinate with sign path on signed windows binaries - [ ] Update change log on [website](https://github.com/flameshot-org/flameshot-org.github.io/) data/changelog.md - [ ] Update version on [website](https://github.com/flameshot-org/flameshot-org.github.io/blob/master/_coverpage.md) - diff --git a/packaging/macos/Info.plist b/packaging/macos/Info.plist index c659db35..887f22b2 100644 --- a/packaging/macos/Info.plist +++ b/packaging/macos/Info.plist @@ -21,4 +21,4 @@ NSSupportsAutomaticGraphicsSwitching - \ No newline at end of file + diff --git a/packaging/macos/create_keychain.sh b/packaging/macos/create_keychain.sh index 24eeb9ca..fb4ca17a 100755 --- a/packaging/macos/create_keychain.sh +++ b/packaging/macos/create_keychain.sh @@ -25,9 +25,9 @@ security default-keychain -s build.keychain security unlock-keychain -p "${APPLE_TEMP_CI_KEYCHAIN_PASS}" build.keychain # import certificate -[ -r "${TEMP_CI_CERT_FILENAME}" ] && rm ${TEMP_CI_CERT_FILENAME} +[ -r "${TEMP_CI_CERT_FILENAME}" ] && rm "${TEMP_CI_CERT_FILENAME}" echo "${APPLE_DEVELOPER_ID_APPLICATION_CERT_DATA}" | base64 --decode > "${TEMP_CI_CERT_FILENAME}" security import "${TEMP_CI_CERT_FILENAME}" -P "${APPLE_DEVELOPER_ID_APPLICATION_CERT_PASS}" -k build.keychain -T /usr/bin/codesign -[ -r "${TEMP_CI_CERT_FILENAME}" ] && rm ${TEMP_CI_CERT_FILENAME} +[ -r "${TEMP_CI_CERT_FILENAME}" ] && rm "${TEMP_CI_CERT_FILENAME}" security find-identity -v security set-key-partition-list -S apple-tool:,apple:,codesign: -s -k "${APPLE_TEMP_CI_KEYCHAIN_PASS}" build.keychain diff --git a/packaging/macos/sign_qtapp.sh b/packaging/macos/sign_qtapp.sh index ecfd36d8..a32dc799 100755 --- a/packaging/macos/sign_qtapp.sh +++ b/packaging/macos/sign_qtapp.sh @@ -21,7 +21,7 @@ if [[ "${APPLE_DEV_IDENTITY}" == "" ]]; then fi echo "--> Start application signing process" -codesign --sign "${APPLE_DEV_IDENTITY}" --verbose --deep ${APP_NAME}.app +codesign --sign "${APPLE_DEV_IDENTITY}" --verbose --deep "${APP_NAME}.app" echo "--> Start packaging process" "$(brew --prefix qt5)/bin/macdeployqt" "${APP_NAME}.app" -dmg -sign-for-notarization="${APPLE_DEV_IDENTITY}" diff --git a/packaging/macos/update_package.sh b/packaging/macos/update_package.sh index f68103a9..d4f4f974 100755 --- a/packaging/macos/update_package.sh +++ b/packaging/macos/update_package.sh @@ -4,7 +4,7 @@ echo "Change the permision of .dmg file" hdiutil convert "flameshot.dmg" -format UDRW -o "flameshot_rw.dmg" echo "Mount it and save the device" -DEVICE=$(hdiutil attach -readwrite -noverify "flameshot_rw.dmg" | egrep '^/dev/' | sed 1q | awk '{print $1}') +DEVICE=$(hdiutil attach -readwrite -noverify "flameshot_rw.dmg" | grep -E '^/dev/' | sed 1q | awk '{print $1}') sleep 5 echo "Create the sysmbolic link to application folder" diff --git a/packaging/rpm/flameshot.spec b/packaging/rpm/flameshot.spec index b8008081..3fdf89c0 100644 --- a/packaging/rpm/flameshot.spec +++ b/packaging/rpm/flameshot.spec @@ -54,7 +54,7 @@ Requires: libqt5-qttools >= 5.9.0 Requires: libQt5Svg5 >= 5.9.0 %endif - + %description Powerful and simple to use screenshot software with built-in editor with advanced features. diff --git a/packaging/win-installer/LICENSE/GPL-3.0.txt b/packaging/win-installer/LICENSE/GPL-3.0.txt index 9cecc1d4..f288702d 100644 --- a/packaging/win-installer/LICENSE/GPL-3.0.txt +++ b/packaging/win-installer/LICENSE/GPL-3.0.txt @@ -1,7 +1,7 @@ GNU GENERAL PUBLIC LICENSE Version 3, 29 June 2007 - Copyright (C) 2007 Free Software Foundation, Inc. + 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. @@ -631,8 +631,8 @@ 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. - {one line to give the program's name and a brief idea of what it does.} - Copyright (C) {year} {name of author} + + 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 @@ -645,14 +645,14 @@ the "copyright" line and a pointer to where the full notice is found. 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 . + 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: - {project} Copyright (C) {year} {fullname} + 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. @@ -664,11 +664,11 @@ might be different; for a GUI interface, you would use an "about box". You should also get your employer (if you work as a programmer) or school, if any, to sign a "copyright disclaimer" for the program, if necessary. For more information on this, and how to apply and follow the GNU GPL, see -. +. The GNU General Public License does not permit incorporating your program into proprietary programs. If your program is a subroutine library, you may consider it more useful to permit linking proprietary applications with the library. If this is what you want to do, use the GNU Lesser General Public License instead of this License. But first, please read -. +. diff --git a/snapcraft.yaml b/snapcraft.yaml index 3444f26c..028f3cdb 100644 --- a/snapcraft.yaml +++ b/snapcraft.yaml @@ -66,8 +66,8 @@ parts: build-packages: - g++ - make - - qt5-default - - qttools5-dev-tools + - qt5-default + - qttools5-dev-tools - libqt5svg5-dev stage-packages: - dbus-x11 @@ -75,11 +75,11 @@ parts: - openssl - ca-certificates - qtwayland5 - - libqt5dbus5 - - libqt5network5 - - libqt5core5a - - libqt5widgets5 - - libqt5gui5 + - libqt5dbus5 + - libqt5network5 + - libqt5core5a + - libqt5widgets5 + - libqt5gui5 - libqt5svg5 - libxkbcommon0 - ttf-ubuntu-font-family diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 5d67c318..023cff95 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -328,7 +328,7 @@ if (WIN32) STRING(REGEX REPLACE "\\\\" "/" OPENSSL_ROOT_DIR "$ENV{OPENSSL_ROOT_DIR}" ) - + if (ENABLE_OPENSSL) if (EXISTS ${OPENSSL_ROOT_DIR}/bin) diff --git a/src/tools/text/texttool.cpp b/src/tools/text/texttool.cpp index 92f54b10..f87d5d74 100644 --- a/src/tools/text/texttool.cpp +++ b/src/tools/text/texttool.cpp @@ -321,4 +321,4 @@ void TextTool::setEditMode(bool b) bool TextTool::isChanged() { return QString::compare(m_text, m_textOld, Qt::CaseInsensitive) != 0; -} \ No newline at end of file +} diff --git a/src/utils/filenamehandler.cpp b/src/utils/filenamehandler.cpp index 7959538d..c15cdbcd 100644 --- a/src/utils/filenamehandler.cpp +++ b/src/utils/filenamehandler.cpp @@ -66,7 +66,7 @@ QString FileNameHandler::parseFilename(const QString& name) * - If `format` is not given, the suffix will remain untouched, unless `path` * has no suffix, in which case it will be given the "png" suffix * - If the path generated by the previous steps points to an existing file, - * "_NUM" will be appended to its base name, where NUM is the first + * "_NUM" will be appended to its base name, where NUM is the first * available number that produces a non-existent path (starting from 1). * @param path Possibly incomplete file name to transform * @param format Desired output file suffix (excluding an initial '.' character) diff --git a/src/utils/request.cpp b/src/utils/request.cpp index a6c321bf..e743bc13 100644 --- a/src/utils/request.cpp +++ b/src/utils/request.cpp @@ -18,4 +18,4 @@ OrgFreedesktopPortalRequestInterface::OrgFreedesktopPortalRequestInterface( parent) {} -OrgFreedesktopPortalRequestInterface::~OrgFreedesktopPortalRequestInterface() {} \ No newline at end of file +OrgFreedesktopPortalRequestInterface::~OrgFreedesktopPortalRequestInterface() {} diff --git a/src/utils/valuehandler.h b/src/utils/valuehandler.h index 5f6de375..60f1d490 100644 --- a/src/utils/valuehandler.h +++ b/src/utils/valuehandler.h @@ -51,7 +51,7 @@ class ValueHandler * `check`, the fallback will be returned. Otherwise the value is processed * by `process` and then returned. * - * @note Cannot be overriden + * @note Cannot be overridden * @see fallback, process */ QVariant value(const QVariant& val); @@ -60,7 +60,7 @@ class ValueHandler */ virtual QVariant fallback(); /** - * @brief Return the representaion of the value in the config file. + * @brief Return the representation of the value in the config file. * * Override this if you want to write the value in a different format than * the one provided by `QVariant`. diff --git a/src/widgets/capture/capturetoolobjects.cpp b/src/widgets/capture/capturetoolobjects.cpp index bd9b76a5..bf7f6226 100644 --- a/src/widgets/capture/capturetoolobjects.cpp +++ b/src/widgets/capture/capturetoolobjects.cpp @@ -148,4 +148,4 @@ CaptureToolObjects& CaptureToolObjects::operator=( count++; } return *this; -} \ No newline at end of file +} diff --git a/tests/path_option.sh b/tests/path_option.sh index af9abf60..214683dc 100644 --- a/tests/path_option.sh +++ b/tests/path_option.sh @@ -30,7 +30,7 @@ echo ">> Redundancy in the path will be removed" "$flameshot" screen -p /tmp/flameshot_path_test/subdir/..///redundancy_removed.png sleep 2 -echo ">> If the destionation is a directory, the file name is generated from strf from the config" +echo ">> If the destination is a directory, the file name is generated from strf from the config" "$flameshot" screen -p ./ sleep 2