benkyd/flameshot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #1 from namecheap/master_nc

Browse Source 
Some cherry-picks and manual fixes from the upstream
This commit is contained in:
Yurii Puchkov
2020-10-27 17:44:16 +02:00
committed by GitHub
parent 3e7b87ccfe 3c260add45
commit 2f03c51aab
8 changed files with 41 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/Linux-pack.yml vendored
View File

@@ -9,8 +9,6 @@ on:
- 'LICENSE'
pull_request:
branches:
- master
paths-ignore:
- 'README.md'
- 'LICENSE'

2
.github/workflows/Windows-pack.yml vendored
View File

@@ -9,8 +9,6 @@ on:
- 'LICENSE'
pull_request:
branches:
- master*
paths-ignore:
- 'README.md'
- 'LICENSE'

4
.github/workflows/build_cmake.yml vendored
View File

@@ -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'

1
.gitignore vendored
View File

@@ -61,5 +61,6 @@ data/flatpak/.flatpak-builder
# Jetbrains
.idea/
.run
# End of https://www.gitignore.io/api/snapcraft

2
CMakeLists.txt
View File

@@ -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")

35
README.md
View File

@@ -168,15 +168,31 @@ These shortcuts are available in GUI mode:
| Keys | Description |
|--- |--- |
| <kbd>P</kbd> | Set the Pencil as paint tool |
| <kbd>D</kbd> | Set the Line as paint tool |
| <kbd>A</kbd> | Set the Arrow as paint tool |
| <kbd>S</kbd> | Set Selection as paint tool |
| <kbd>R</kbd> | Set the Rectangle as paint tool |
| <kbd>C</kbd> | Set the Circle as paint tool |
| <kbd>M</kbd> | Set the Marker as paint tool |
| <kbd>T</kbd> | Add text to your capture |
| <kbd>B</kbd> | Set Pixalate as the paint tool |
| <kbd>←</kbd>, <kbd>↓</kbd>, <kbd>↑</kbd>, <kbd>→</kbd> | Move selection 1px |
| <kbd>Shift</kbd> + <kbd>←</kbd>, <kbd>↓</kbd>, <kbd>↑</kbd>, <kbd>→</kbd> | Resize selection 1px |
| <kbd>Esc</kbd> | Quit capture |
| <kbd>Ctrl</kbd> + <kbd>M</kbd> | Move the selection area |
| <kbd>Ctrl</kbd> + <kbd>C</kbd> | Copy to clipboard |
| <kbd>Ctrl</kbd> + <kbd>S</kbd> | Save selection as a file |
| <kbd>Ctrl</kbd> + <kbd>Z</kbd> | Undo the last modification |
| <kbd>Ctrl</kbd> + <kbd>Shift</kbd> + <kbd>Z</kbd> | Redo the next modification |
| <kbd>Ctrl</kbd> + <kbd>Q</kbd> | Leave the capture screen |
| <kbd>Ctrl</kbd> + <kbd>O</kbd> | Choose an app to open the capture |
| <kbd>Return</kbd> | Upload the selection to Imgur |
| <kbd>Spacebar</kbd> | 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 |
| <kbd>Print screen</kbd> | Capture Screen |
| <kbd>Shift</kbd> + <kbd>Print</kbd> | Screenshot History |
<kbd>Shift</kbd> + 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 <kbd>Prt Sc</kbd> key, and then create a new binding for `/usr/bin/flameshot gui`.
1. Release the binding on <kbd>Prt Sc</kbd> 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 <kbd>Prt Sc</kbd>. This will show as "_print_".
Now everytime You press <kbd>Prt Sc</kbd> 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.

2
src/tools/storage/imgur/imguruploader.cpp
View File

@@ -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();

2
src/tools/storage/s3/imgs3uploader.cpp
View File

@@ -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();