diff --git a/.github/workflows/Linux-pack.yml b/.github/workflows/Linux-pack.yml index 8734eb9f..080cdab8 100644 --- a/.github/workflows/Linux-pack.yml +++ b/.github/workflows/Linux-pack.yml @@ -9,8 +9,6 @@ on: - 'LICENSE' pull_request: - branches: - - master paths-ignore: - 'README.md' - 'LICENSE' diff --git a/.github/workflows/Windows-pack.yml b/.github/workflows/Windows-pack.yml index aaaead8d..32972e5e 100644 --- a/.github/workflows/Windows-pack.yml +++ b/.github/workflows/Windows-pack.yml @@ -9,8 +9,6 @@ on: - 'LICENSE' pull_request: - branches: - - master* paths-ignore: - 'README.md' - 'LICENSE' diff --git a/.github/workflows/build_cmake.yml b/.github/workflows/build_cmake.yml index 279709a9..155b2b82 100644 --- a/.github/workflows/build_cmake.yml +++ b/.github/workflows/build_cmake.yml @@ -2,12 +2,12 @@ name: Building(CMake) on: push: - branches: [ master, master_nc_merge_upstream_test ] + branches: [ master ] paths-ignore: - 'README.md' - 'LICENSE' pull_request: - branches: [ master, master_nc_merge_upstream_test ] + branches: [ master ] paths-ignore: - 'README.md' - 'LICENSE' diff --git a/.gitignore b/.gitignore index 9b11ebb5..fb71df32 100644 --- a/.gitignore +++ b/.gitignore @@ -61,5 +61,6 @@ data/flatpak/.flatpak-builder # Jetbrains .idea/ +.run # End of https://www.gitignore.io/api/snapcraft diff --git a/CMakeLists.txt b/CMakeLists.txt index 9edb83e8..0436273c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -4,7 +4,7 @@ cmake_minimum_required(VERSION 3.13) # This can be read from ${PROJECT_NAME} after project() is called project( flameshot - VERSION 0.8.5.1 + VERSION 0.8.5.2 LANGUAGES CXX) set(PROJECT_NAME_CAPITALIZED "Flameshot") diff --git a/README.md b/README.md index 8bbbbea4..a864e2ab 100644 --- a/README.md +++ b/README.md @@ -168,15 +168,31 @@ These shortcuts are available in GUI mode: | Keys | Description | |--- |--- | +| P | Set the Pencil as paint tool | +| D | Set the Line as paint tool | +| A | Set the Arrow as paint tool | +| S | Set Selection as paint tool | +| R | Set the Rectangle as paint tool | +| C | Set the Circle as paint tool | +| M | Set the Marker as paint tool | +| T | Add text to your capture | +| B | Set Pixalate as the paint tool | | ←, ↓, ↑, → | Move selection 1px | | Shift + ←, ↓, ↑, → | Resize selection 1px | | Esc | Quit capture | +| Ctrl + M | Move the selection area | | Ctrl + C | Copy to clipboard | | Ctrl + S | Save selection as a file | | Ctrl + Z | Undo the last modification | +| Ctrl + Shift + Z | Redo the next modification | +| Ctrl + Q | Leave the capture screen | +| Ctrl + O | Choose an app to open the capture | +| Return | Upload the selection to Imgur | | Spacebar | Toggle visibility of sidebar with options of the selected tool, color picker for the drawing color and history menu | | Right Click | Show the color wheel | | Mouse Wheel | Change the tool's thickness | +| Print screen | Capture Screen | +| Shift + Print | Screenshot History | Shift + drag a handler of the selection area: mirror redimension in the opposite handler. @@ -218,6 +234,24 @@ Steps for using the configuration: 6. Now the Flameshot entry should appear in the list. Click _Apply_ to apply the changes. 7. If you want to change the defaults, you can expand the entry, select the appropriate action and modify it as you wish; the process is pretty mush self-explanatory. +### On Ubuntu (Tested on 18.04) + +Taken from [adaptation](https://askubuntu.com/posts/1039949/revisions) of [Pavel Answer on askubuntu](https://askubuntu.com/revisions/1036473/1). To use flameshot instead of default screenshot application in ubuntu we need to release the binding on Prt Sc key, and then create a new binding for `/usr/bin/flameshot gui`. + +1. Release the binding on Prt Sc using the following command. + + ```shell + gsettings set org.gnome.settings-daemon.plugins.media-keys screenshot '' + ``` + +2. Go to Settings > Device > Keyboard and press the '+' button at the bottom. + +3. Name the command as you like it, e.g. `flameshot`. And in the command insert `/usr/bin/flameshot gui`. + +4. Then click "_Set Shortcut.._" and press Prt Sc. This will show as "_print_". + +Now everytime You press Prt Sc it will start the flameshot gui instead of the default application + ## Considerations - Experimental Gnome Wayland and Plasma Wayland support. @@ -278,6 +312,7 @@ some Linux distributions: Alternatively, in case you don't want to have a systray, you can always call Flameshot from the terminal. See [Usage section](#usage). + ### S3 bucket configuration S3 bucket credentials are placed in the file `config.ini` and cannot be configured with UI. diff --git a/src/tools/storage/imgur/imguruploader.cpp b/src/tools/storage/imgur/imguruploader.cpp index 565f6372..db449061 100644 --- a/src/tools/storage/imgur/imguruploader.cpp +++ b/src/tools/storage/imgur/imguruploader.cpp @@ -79,10 +79,10 @@ void ImgurUploader::handleReply(QNetworkReply* reply) resultStatus = true; if (ConfigHandler().copyAndCloseAfterUploadEnabled()) { - QApplication::clipboard()->setText(imageUrl().toString()); SystemNotification().sendMessage( QObject::tr("URL copied to clipboard.")); Controller::getInstance()->updateRecentScreenshots(); + QApplication::clipboard()->setText(imageUrl().toString()); close(); } else { onUploadOk(); diff --git a/src/tools/storage/s3/imgs3uploader.cpp b/src/tools/storage/s3/imgs3uploader.cpp index 7a7c846f..6012121a 100644 --- a/src/tools/storage/s3/imgs3uploader.cpp +++ b/src/tools/storage/s3/imgs3uploader.cpp @@ -198,9 +198,9 @@ void ImgS3Uploader::handleReplyUpload(QNetworkReply* reply) // Copy url to clipboard if required if (ConfigHandler().copyAndCloseAfterUploadEnabled()) { - QApplication::clipboard()->setText(imageUrl().toString()); SystemNotification().sendMessage(tr("URL copied to clipboard.")); Controller::getInstance()->updateRecentScreenshots(); + QApplication::clipboard()->setText(imageUrl().toString()); close(); } else { onUploadOk();