Browse Source

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
a1346054 3 years ago
parent
commit
b95e096136

+ 1 - 1
.cmake-format.yaml

@@ -15,4 +15,4 @@ line_width: 120
 max_pargs_hwrap: 3
 max_pargs_hwrap: 3
 separate_ctrl_name_with_space: false
 separate_ctrl_name_with_space: false
 separate_fn_name_with_space: false
 separate_fn_name_with_space: false
-tab_size: 2
+tab_size: 2

+ 1 - 1
.github/ISSUE_TEMPLATE/Feature_request.md

@@ -11,4 +11,4 @@ Please make sure:
 - a single feature per issue
 - a single feature per issue
 - explain in detail what you have in mind
 - explain in detail what you have in mind
 - if it helps, add sketches/pictures
 - if it helps, add sketches/pictures
--->
+-->

+ 11 - 11
.github/workflows/Linux-pack.yml

@@ -2,7 +2,7 @@ name: Packaging(Linux)
 
 
 on:
 on:
   push:
   push:
-    branches: 
+    branches:
       - master
       - master
     paths-ignore:
     paths-ignore:
       - 'README.md'
       - 'README.md'
@@ -37,13 +37,13 @@ jobs:
               os: debian,
               os: debian,
               symbol: buster,
               symbol: buster,
               arch: amd64
               arch: amd64
-            }          
+            }
           - {
           - {
               name: debian-10,
               name: debian-10,
               os: debian,
               os: debian,
               symbol: buster,
               symbol: buster,
               arch: arm64
               arch: arm64
-            }       
+            }
           - {
           - {
               name: debian-10,
               name: debian-10,
               os: debian,
               os: debian,
@@ -55,13 +55,13 @@ jobs:
               os: debian,
               os: debian,
               symbol: bullseye,
               symbol: bullseye,
               arch: amd64
               arch: amd64
-            }          
+            }
           - {
           - {
               name: debian-11,
               name: debian-11,
               os: debian,
               os: debian,
               symbol: bullseye,
               symbol: bullseye,
               arch: arm64
               arch: arm64
-            }       
+            }
           - {
           - {
               name: debian-11,
               name: debian-11,
               os: debian,
               os: debian,
@@ -75,7 +75,7 @@ jobs:
               arch: amd64
               arch: amd64
             }
             }
     steps:
     steps:
-      - name: Enable Docker Experimental Features 
+      - name: Enable Docker Experimental Features
         run: |
         run: |
           echo $'{\n  "experimental": true\n}' | sudo tee /etc/docker/daemon.json
           echo $'{\n  "experimental": true\n}' | sudo tee /etc/docker/daemon.json
           mkdir -p ~/.docker
           mkdir -p ~/.docker
@@ -115,7 +115,7 @@ jobs:
       - name: Checkout Source code
       - name: Checkout Source code
         if: github.event_name == 'push'
         if: github.event_name == 'push'
         uses: actions/checkout@v2
         uses: actions/checkout@v2
-        with: 
+        with:
           fetch-depth: 0
           fetch-depth: 0
           ref: master
           ref: master
       - name: Checkout Source code
       - name: Checkout Source code
@@ -324,7 +324,7 @@ jobs:
       - name: Checkout Source code
       - name: Checkout Source code
         if: github.event_name == 'push'
         if: github.event_name == 'push'
         uses: actions/checkout@v2
         uses: actions/checkout@v2
-        with: 
+        with:
           fetch-depth: 0
           fetch-depth: 0
           ref: master
           ref: master
       - name: Checkout Source code
       - name: Checkout Source code
@@ -438,7 +438,7 @@ jobs:
       - name: Checkout Source code
       - name: Checkout Source code
         if: github.event_name == 'push'
         if: github.event_name == 'push'
         uses: actions/checkout@v2
         uses: actions/checkout@v2
-        with: 
+        with:
           fetch-depth: 0
           fetch-depth: 0
           ref: master
           ref: master
       - name: Checkout Source code
       - name: Checkout Source code
@@ -484,7 +484,7 @@ jobs:
             openssl \
             openssl \
             ca-certificates
             ca-certificates
       - name: Get go-appimage tool
       - 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.
       # 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.
       # Will try new tool https://github.com/probonopd/go-appimage written in golang by probonopd.
         run: |
         run: |
@@ -614,7 +614,7 @@ jobs:
       - name: Checkout Source code
       - name: Checkout Source code
         if: github.event_name == 'push'
         if: github.event_name == 'push'
         uses: actions/checkout@v2
         uses: actions/checkout@v2
-        with: 
+        with:
           fetch-depth: 0
           fetch-depth: 0
           ref: master
           ref: master
       - name: Checkout Source code
       - name: Checkout Source code

+ 1 - 1
.github/workflows/Windows-pack.yml

@@ -62,7 +62,7 @@ jobs:
       - name: Checkout Source code
       - name: Checkout Source code
         if: github.event_name == 'pull_request'
         if: github.event_name == 'pull_request'
         uses: actions/checkout@v2
         uses: actions/checkout@v2
-        with: 
+        with:
           fetch-depth: 0
           fetch-depth: 0
           ref: ${{ github.event.pull_request.head.sha }}
           ref: ${{ github.event.pull_request.head.sha }}
 
 

+ 5 - 5
.github/workflows/build_cmake.yml

@@ -32,7 +32,7 @@ jobs:
       - name: Checkout Source code
       - name: Checkout Source code
         if: github.event_name == 'pull_request'
         if: github.event_name == 'pull_request'
         uses: actions/checkout@v2
         uses: actions/checkout@v2
-        with: 
+        with:
           ref: ${{ github.event.pull_request.head.sha }}
           ref: ${{ github.event.pull_request.head.sha }}
 
 
       - name: Install Dependencies
       - name: Install Dependencies
@@ -62,10 +62,10 @@ jobs:
         # access regardless of the host operating system
         # access regardless of the host operating system
         shell: bash
         shell: bash
         working-directory: ${{runner.workspace}}/build
         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
         # 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
         # We need to source the profile file to make sure conan is in PATH
         run: |
         run: |
           cmake $GITHUB_WORKSPACE -DCMAKE_BUILD_TYPE=$BUILD_TYPE
           cmake $GITHUB_WORKSPACE -DCMAKE_BUILD_TYPE=$BUILD_TYPE
@@ -78,7 +78,7 @@ jobs:
       - name: Test
       - name: Test
         working-directory: ${{runner.workspace}}/build
         working-directory: ${{runner.workspace}}/build
         shell: bash
         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
         # See https://cmake.org/cmake/help/latest/manual/ctest.1.html for more detail
         run: ctest -C $BUILD_TYPE
         run: ctest -C $BUILD_TYPE
 
 

+ 1 - 1
.github/workflows/clang-format.yml

@@ -13,7 +13,7 @@ jobs:
     - name: Checkout Source code
     - name: Checkout Source code
       if: github.event_name == 'pull_request'
       if: github.event_name == 'pull_request'
       uses: actions/checkout@v2
       uses: actions/checkout@v2
-      with: 
+      with:
         ref: ${{ github.event.pull_request.head.sha }}
         ref: ${{ github.event.pull_request.head.sha }}
     - uses: DoozyX/clang-format-lint-action@v0.9
     - uses: DoozyX/clang-format-lint-action@v0.9
       with:
       with:

+ 7 - 7
LICENSE

@@ -1,7 +1,7 @@
                     GNU GENERAL PUBLIC LICENSE
                     GNU GENERAL PUBLIC LICENSE
                        Version 3, 29 June 2007
                        Version 3, 29 June 2007
 
 
- Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
+ Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
  Everyone is permitted to copy and distribute verbatim copies
  Everyone is permitted to copy and distribute verbatim copies
  of this license document, but changing it is not allowed.
  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
 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.
 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}
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
 
 
     This program is free software: you can redistribute it and/or modify
     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
     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.
     GNU General Public License for more details.
 
 
     You should have received a copy of the GNU General Public License
     You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+    along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 
 Also add information on how to contact you by electronic and paper mail.
 Also add information on how to contact you by electronic and paper mail.
 
 
   If the program does terminal interaction, make it output a short
   If the program does terminal interaction, make it output a short
 notice like this when it starts in an interactive mode:
 notice like this when it starts in an interactive mode:
 
 
-    {project}  Copyright (C) {year}  {fullname}
+    <program>  Copyright (C) <year>  <name of author>
     This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
     This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
     This is free software, and you are welcome to redistribute it
     This is free software, and you are welcome to redistribute it
     under certain conditions; type `show c' for details.
     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,
   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.
 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
 For more information on this, and how to apply and follow the GNU GPL, see
-<http://www.gnu.org/licenses/>.
+<https://www.gnu.org/licenses/>.
 
 
   The GNU General Public License does not permit incorporating your program
   The GNU General Public License does not permit incorporating your program
 into proprietary programs.  If your program is a subroutine library, you
 into proprietary programs.  If your program is a subroutine library, you
 may consider it more useful to permit linking proprietary applications with
 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
 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
 Public License instead of this License.  But first, please read
-<http://www.gnu.org/philosophy/why-not-lgpl.html>.
+<https://www.gnu.org/licenses/why-not-lgpl.html>.

+ 6 - 6
README.md

@@ -252,7 +252,7 @@ Steps for using the configuration:
 
 
 #### On Ubuntu (Tested on 18.04, 20.04)
 #### 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 <kbd>Prt Sc</kbd> 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 <kbd>Prt Sc</kbd> 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 <kbd>Prt Sc</kbd> using the following command.
 1. Remove the binding on <kbd>Prt Sc</kbd> using the following command.
 
 
@@ -275,7 +275,7 @@ Now every time you press <kbd>Prt Sc</kbd>, it will start the Flameshot GUI inst
 1. Go to `Keyboard` settings
 1. Go to `Keyboard` settings
 2. Switch to the tab `Application Shortcuts`
 2. Switch to the tab `Application Shortcuts`
 3. Find the entry
 3. Find the entry
-        
+
     ```text
     ```text
     Command                        Shortcut
     Command                        Shortcut
     xfce4-screenshooter -fd 1      Print
     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
 - Qt >= 5.9
   + Development tools
   + Development tools
-- GCC >= 7.4 
+- GCC >= 7.4
 - CMake >= 3.13
 - CMake >= 3.13
 
 
 #### Run-time
 #### Run-time
@@ -448,8 +448,8 @@ When `make` command completed you can launch flameshot from `project_folder/buil
 
 
 ### Install
 ### 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
 ### FAQ
 https://flameshot.org/guide/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
 ## Code Signing Policy
 Free code signing provided by [SignPath.io](https://signpath.io/), certificate by [SignPath Foundation](https://signpath.org/).
 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
 ## Contribute
 If you want to contribute check the [CONTRIBUTING.md](docs/CONTRIBUTING.md)
 If you want to contribute check the [CONTRIBUTING.md](docs/CONTRIBUTING.md)

+ 3 - 3
appveyor.yml

@@ -12,7 +12,7 @@ build_script:
     mkdir build
     mkdir build
 
 
     cd build
     cd build
-    
+
     set QTDIR=%Qt5_INSTALL_DIR%
     set QTDIR=%Qt5_INSTALL_DIR%
 
 
     set "VCINSTALLDIR=C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC"
     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 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"
     cmake --build . --parallel 2 --config "Release"
- 
+
     cpack -G WIX -B package
     cpack -G WIX -B package
 
 
     mkdir artifact
     mkdir artifact
-    
+
     cp package/*.msi artifact/.
     cp package/*.msi artifact/.
 
 
     cp src/Release/*.exe artifact/.
     cp src/Release/*.exe artifact/.

+ 0 - 1
cmake/Cache.cmake

@@ -27,4 +27,3 @@ if(CACHE_BINARY)
 else()
 else()
   message(WARNING "${CACHE_OPTION} is enabled but was not found. Not using it")
   message(WARNING "${CACHE_OPTION} is enabled but was not found. Not using it")
 endif()
 endif()
-

Some files were not shown because too many files changed in this diff