Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Simple maintenance improvements #1918

Merged
merged 8 commits into from Sep 28, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion .cmake-format.yaml
Expand Up @@ -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
tab_size: 2
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/Feature_request.md
Expand Up @@ -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
-->
-->
22 changes: 11 additions & 11 deletions .github/workflows/Linux-pack.yml
Expand Up @@ -2,7 +2,7 @@ name: Packaging(Linux)

on:
push:
branches:
branches:
- master
paths-ignore:
- 'README.md'
Expand Down Expand Up @@ -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,
Expand All @@ -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,
Expand All @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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: |
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/Windows-pack.yml
Expand Up @@ -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 }}

Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/build_cmake.yml
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand All @@ -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

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/clang-format.yml
Expand Up @@ -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:
Expand Down
14 changes: 7 additions & 7 deletions LICENSE
@@ -1,7 +1,7 @@
GNU GENERAL PUBLIC LICENSE
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
of this license document, but changing it is not allowed.

Expand Down Expand Up @@ -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}
<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
it under the terms of the GNU General Public License as published by
Expand All @@ -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 <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.

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}
<program> Copyright (C) <year> <name of author>
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.
Expand All @@ -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
<http://www.gnu.org/licenses/>.
<https://www.gnu.org/licenses/>.

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
<http://www.gnu.org/philosophy/why-not-lgpl.html>.
<https://www.gnu.org/licenses/why-not-lgpl.html>.
12 changes: 6 additions & 6 deletions README.md
Expand Up @@ -251,7 +251,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 <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.

Expand All @@ -274,7 +274,7 @@ Now every time you press <kbd>Prt Sc</kbd>, 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
Expand Down Expand Up @@ -359,7 +359,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
Expand Down Expand Up @@ -447,8 +447,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/
Expand All @@ -471,7 +471,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)
Expand Down
6 changes: 3 additions & 3 deletions appveyor.yml
Expand Up @@ -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"
Expand All @@ -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/.
Expand Down
1 change: 0 additions & 1 deletion cmake/Cache.cmake
Expand Up @@ -27,4 +27,3 @@ if(CACHE_BINARY)
else()
message(WARNING "${CACHE_OPTION} is enabled but was not found. Not using it")
endif()

2 changes: 1 addition & 1 deletion 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)
Expand Down
2 changes: 1 addition & 1 deletion cmake/Sanitizers.cmake
Expand Up @@ -63,4 +63,4 @@ function(enable_sanitizers project_name)
endif()
endif()

endfunction()
endfunction()
2 changes: 1 addition & 1 deletion cmake/StandardProjectSettings.cmake
Expand Up @@ -31,4 +31,4 @@ if(ENABLE_IPO)
else()
message(SEND_ERROR "IPO is not supported: ${output}")
endif()
endif()
endif()
12 changes: 6 additions & 6 deletions cmake/modules/MacOSXBundleInfo.plist.in
Expand Up @@ -3,7 +3,7 @@
<plist version="1.0">
<dict>
<key>CFBundleDevelopmentRegion</key>
<string>English</string>
<string>English</string>
<key>CFBundleExecutable</key>
<string>flameshot</string>
<key>CFBundleGetInfoString</key>
Expand Down Expand Up @@ -37,10 +37,10 @@
<key>NSHighResolutionCapable</key>
<string>True</string>
<key>LSUIElement</key>
<string>1</string>
<key>NSPhotoLibraryAddUsageDescription</key>
<string>Application requires access to save screenshots to your gallery</string>
<key>NSSupportsAutomaticGraphicsSwitching</key>
<true/>
<string>1</string>
<key>NSPhotoLibraryAddUsageDescription</key>
<string>Application requires access to save screenshots to your gallery</string>
<key>NSSupportsAutomaticGraphicsSwitching</key>
<true/>
</dict>
</plist>
3 changes: 1 addition & 2 deletions data/appdata/org.flameshot.Flameshot.metainfo.xml
Expand Up @@ -8,7 +8,7 @@ SPDX-License-Identifier: CC0-1.0
<metadata_license>CC0-1.0</metadata_license>
<project_license>GPL-3.0-or-later</project_license>
<name>Flameshot</name>
<releases>
<releases>
<release version="0.10.1" date="2021-07-25"/>
<release version="0.10.0" date="2021-05-16"/>
<release version="0.9.0" date="2021-02-27"/>
Expand Down Expand Up @@ -38,5 +38,4 @@ SPDX-License-Identifier: CC0-1.0
<url type="homepage">https://github.com/flameshot-org/flameshot</url>
<update_contact>https://github.com/flameshot-org/flameshot/issues/new</update_contact>
<launchable type="desktop-id">org.flameshot.Flameshot.desktop</launchable>

</component>
2 changes: 1 addition & 1 deletion data/dbus/org.freedesktop.Notifications.xml
Expand Up @@ -27,4 +27,4 @@
<arg name="return_id" type="u" direction="out"/>
</method>
</interface>
</node>
</node>
2 changes: 1 addition & 1 deletion data/flameshot.rc
Expand Up @@ -44,4 +44,4 @@ BEGIN
BEGIN
VALUE "Translation", 0x0409, 0x04b0 /* U.S. English (Unicode) */
END
END
END