fergalmoran/flameshot
1
0
Fork 0
mirror of https://github.com/fergalmoran/flameshot.git synced 2025-12-22 09:51:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed translations and added feedback from PR

Browse Source
This commit is contained in:
Jeremy Borgman
2020-09-03 11:48:01 -05:00
parent be61406e57
commit 286db9ff69
24 changed files with 4449 additions and 2839 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
CMakeLists.txt
View File

@@ -1,12 +1,12 @@
cmake_minimum_required(VERSION 3.13)
project(flameshot VERSION 0.8.0 LANGUAGES CXX)
project(
flameshot
VERSION 0.8.0
LANGUAGES CXX)
include(cmake/StandardProjectSettings.cmake)
add_library(project_options INTERFACE)
target_compile_features(project_options INTERFACE cxx_std_17)
@@ -14,14 +14,12 @@ add_library(project_warnings INTERFACE)
# standard compiler warnings
include(cmake/CompilerWarnings.cmake)
#set_project_warnings(project_warnings)
# set_project_warnings(project_warnings)
# sanitizer options if supported by compiler
include(cmake/Sanitizers.cmake)
#enable_sanitizers(project_options)
# allow for static analysis options
#include(cmake/StaticAnalyzers.cmake)
# enable_sanitizers(project_options)
# allow for static analysis options include(cmake/StaticAnalyzers.cmake)
add_subdirectory(src)

25
README.md
View File

@@ -247,9 +247,9 @@ To build the application in your system, you'll need to install the dependencies
#### Compile-time
- Qt >= 5.3
- Qt >= 5.9
+ Development tools
- GCC >= 4.9.2
- GCC >= 7.4
#### Run-time
@@ -308,7 +308,7 @@ After installing all the dependencies, finally run the following commands in the
```shell
mkdir build
cd build
qmake ../
cmake ../
make
```
@@ -316,23 +316,6 @@ make
Simply use `make install` with privileges.
## Packaging
Having `git` installed is required if you're building Flameshot from a snapshot to have precise version information.
In order to generate the instructions in the `Makefile` to install the application in `/usr` instead of in `/usr/local` you can pass the `packaging` option to `qmake` (`qmake CONFIG+=packaging`).
If you want to install in a custom directory you can use the `INSTALL_ROOT` variable.
**Example**:
If you want to install Flameshot in `~/myBuilds/test`, you can execute the following to do so:
```shell
qmake CONFIG+=packaging
make INSTALL_ROOT=~/myBuilds/test install
```
## License
- The main code is licensed under [GPLv3](LICENSE)
- The logo of Flameshot is licensed under [Free Art License v1.3](img/app/flameshotLogoLicense.txt)
@@ -351,7 +334,7 @@ If you want to contribute check the [CONTRIBUTING.md](CONTRIBUTING.md)
## Acknowledgment
I really appreciate those who have shown interest in the early development process:
Thanks to those who have shown interest in the early development process:
- [lupoDharkael](https://github.com/lupoDharkael)
- [Cosmo](https://github.com/philpem)
- [XerTheSquirrel](https://github.com/XerTheSquirrel)

433
data/translations/Internationalization_ca.ts
View File

File diff suppressed because it is too large Load Diff

432
data/translations/Internationalization_de_DE.ts
View File

File diff suppressed because it is too large Load Diff

433
data/translations/Internationalization_es.ts
View File

File diff suppressed because it is too large Load Diff

461
data/translations/Internationalization_fr.ts
View File

File diff suppressed because it is too large Load Diff

202
data/translations/Internationalization_hu.ts
View File

@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!DOCTYPE TS>
<TS version="2.0" language="hu_HU" sourcelanguage="en">
<TS version="2.1" language="hu_HU" sourcelanguage="en">
<context>
<name>AppLauncher</name>
<message>
@@ -61,6 +61,45 @@
<translation>Beállítja a Homályosítás eszközt festő eszközként</translation>
</message>
</context>
<context>
<name>CaptureLauncher</name>
<message>
<source>&lt;b&gt;Capture Mode&lt;/b&gt;</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Rectangular Region</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Full Screen (All Monitors)</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>No Delay</source>
<translation type="unfinished"></translation>
</message>
<message>
<source> second</source>
<translation type="unfinished"></translation>
</message>
<message>
<source> seconds</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Take new screenshot</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Area:</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Delay:</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>CaptureWidget</name>
<message>
@@ -68,7 +107,7 @@
Press Enter to capture the screen.
Press Right Click to show the color picker.
Use the Mouse Wheel to change the thickness of your tool.</source>
<translation>Válassz egy területet egérrel, vagy nyomj Esc-et a kilépéshez.
<translation type="vanished">Válassz egy területet egérrel, vagy nyomj Esc-et a kilépéshez.
Nyomj entert a felvételhez.
Kattints job egérgombal a szín választásához.
Használd a görgőt az eszköz vastagságának állítására.</translation>
@@ -77,6 +116,25 @@ Használd a görgőt az eszköz vastagságának állítására.</translation>
<source>Unable to capture screen</source>
<translation>Nem lehet felvételt készíteni</translation>
</message>
<message>
<source>Select an area with the mouse, or press Esc to exit.
Press Enter to capture the screen.
Press Right Click to show the color picker.
Use the Mouse Wheel to change the thickness of your tool.
Press Space to open the side panel.</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>CircleCountTool</name>
<message>
<source>Circle Counter</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Add an autoincrementing counter bubble</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>CircleTool</name>
@@ -122,6 +180,14 @@ Használd a görgőt az eszköz vastagságának állítására.</translation>
<source>&amp;Quit</source>
<translation>&amp;Bezár</translation>
</message>
<message>
<source>&amp;Take Screenshot</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>&amp;Open Launcher</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>CopyTool</name>
@@ -131,7 +197,11 @@ Használd a görgőt az eszköz vastagságának állítására.</translation>
</message>
<message>
<source>Copies the selecion into the clipboard</source>
<translation>Másolja a kiválasztott területet</translation>
<translation type="vanished">Másolja a kiválasztott területet</translation>
</message>
<message>
<source>Copy the selection into the clipboard</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
@@ -195,14 +265,14 @@ Használd a görgőt az eszköz vastagságának állítására.</translation>
<name>FileNameHandler</name>
<message>
<source>screenshot</source>
<translation>Képernyőmentés</translation>
<translation type="vanished">Képernyőmentés</translation>
</message>
</context>
<context>
<name>FlameshotDBusAdapter</name>
<message>
<source>Unable to capture screen</source>
<translation>Nem lehet képernyőképet készíteni</translation>
<translation type="vanished">Nem lehet képernyőképet készíteni</translation>
</message>
</context>
<context>
@@ -275,6 +345,22 @@ Használd a görgőt az eszköz vastagságának állítására.</translation>
<source>Launch Flameshot</source>
<translation>Flameshot indítása</translation>
</message>
<message>
<source>Close after capture</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Close after taking a screenshot</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Copy URL after upload</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Copy URL and close window after upload</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>ImgurUploader</name>
@@ -310,6 +396,10 @@ Használd a görgőt az eszköz vastagságának állítására.</translation>
<source>Screenshot copied to clipboard.</source>
<translation>Képernyőmentés másolva a vágólapra.</translation>
</message>
<message>
<source>Delete image</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>ImgurUploaderTool</name>
@@ -392,6 +482,14 @@ Használd a görgőt az eszköz vastagságának állítására.</translation>
<source>Available shortcuts in the screen capture mode.</source>
<translation>Elérhető gyorsbillentyűk a képernyőfelvétel módban.</translation>
</message>
<message>
<source>SPACEBAR</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Toggle visibility of sidebar with options of the selected tool</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>LineTool</name>
@@ -437,6 +535,17 @@ Használd a görgőt az eszköz vastagságának állítására.</translation>
<translation>Beállítja a Ceruza eszközt festő eszközként</translation>
</message>
</context>
<context>
<name>PinTool</name>
<message>
<source>Pin Tool</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Pin image on the desktop</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>QObject</name>
<message>
@@ -468,6 +577,10 @@ Használd a görgőt az eszköz vastagságának állítására.</translation>
<source>Capture saved to clipboard</source>
<translation>Felvétel mentve a vágólapra</translation>
</message>
<message>
<source>URL copied to clipboard.</source>
<translation type="unfinished">URL másolva a vágólapra.</translation>
</message>
</context>
<context>
<name>RectangleTool</name>
@@ -486,6 +599,10 @@ Használd a görgőt az eszköz vastagságának állítására.</translation>
<source>Redo</source>
<translation>Újra</translation>
</message>
<message>
<source>Redo the next modification</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>SaveTool</name>
@@ -498,6 +615,13 @@ Használd a görgőt az eszköz vastagságának állítására.</translation>
<translation>Menti a felvételt</translation>
</message>
</context>
<context>
<name>ScreenGrabber</name>
<message>
<source>Unable to capture screen</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>SelectionTool</name>
<message>
@@ -509,6 +633,25 @@ Használd a görgőt az eszköz vastagságának állítására.</translation>
<translation>Beállítja a Téglalapos kijelölő eszközt Festő eszközként</translation>
</message>
</context>
<context>
<name>SidePanelWidget</name>
<message>
<source>Active thickness:</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Active color:</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Press ESC to cancel</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Grab Color</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>SizeIndicatorTool</name>
<message>
@@ -576,11 +719,11 @@ Használd a görgőt az eszköz vastagságának állítására.</translation>
</message>
<message>
<source>Time (%H:%M:%S)</source>
<translation>Idő (%H:%M:%S)</translation>
<translation type="vanished">Idő (%H:%M:%S)</translation>
</message>
<message>
<source>Time (%H:%M)</source>
<translation>Idő (%H:%M)</translation>
<translation type="vanished">Idő (%H:%M)</translation>
</message>
<message>
<source>Hour (00-23)</source>
@@ -606,6 +749,51 @@ Használd a görgőt az eszköz vastagságának állítására.</translation>
<source>Full Date (%Y-%m-%d)</source>
<translation>Teljes dátum (%Y-%m-%d)</translation>
</message>
<message>
<source>Time (%H-%M-%S)</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Time (%H-%M)</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>SystemNotification</name>
<message>
<source>Flameshot Info</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>TextConfig</name>
<message>
<source>StrikeOut</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Underline</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Bold</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Italic</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>TextTool</name>
<message>
<source>Text</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Add text to your capture</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>UIcolorEditor</name>

433
data/translations/Internationalization_ja.ts
View File

File diff suppressed because it is too large Load Diff

433
data/translations/Internationalization_ka.ts
View File

File diff suppressed because it is too large Load Diff

433
data/translations/Internationalization_nl.ts
View File

File diff suppressed because it is too large Load Diff

433
data/translations/Internationalization_pl.ts
View File

File diff suppressed because it is too large Load Diff

433
data/translations/Internationalization_pt_br.ts
View File

File diff suppressed because it is too large Load Diff

433
data/translations/Internationalization_ru.ts
View File

File diff suppressed because it is too large Load Diff

392
data/translations/Internationalization_sk.ts
View File

File diff suppressed because it is too large Load Diff

433
data/translations/Internationalization_sr.ts
View File

File diff suppressed because it is too large Load Diff

433
data/translations/Internationalization_tr.ts
View File

File diff suppressed because it is too large Load Diff

435
data/translations/Internationalization_uk.ts
View File

File diff suppressed because it is too large Load Diff

392
data/translations/Internationalization_zh_CN.ts
View File

File diff suppressed because it is too large Load Diff

433
data/translations/Internationalization_zh_TW.ts
View File

File diff suppressed because it is too large Load Diff

97
docs/RFC.md
View File

@@ -13,22 +13,23 @@ and controlled path for new features to enter the language and standard
libraries, so that all stakeholders can be confident about the direction the
project is evolving in.
## Table of Contents
[Table of Contents]: #table-of-contents
- [Opening](#flameshot-rfcs)
- [Table of Contents]
- [When you need to follow this process]
- [Before creating an RFC]
- [What the process is]
- [The RFC life-cycle]
- [Reviewing RFCs]
- [Implementing an RFC]
- [RFC Postponement]
- [Help this is all too informal!]
+ [Opening](#flameshot-rfcs)
+ [Table of Contents]
+ [When you need to follow this process]
+ [Before creating an RFC]
+ [What the process is]
+ [The RFC life-cycle]
+ [Reviewing RFCs]
+ [Implementing an RFC]
+ [RFC Postponement]
+ [Help this is all too informal!]
## When you need to follow this process
[When you need to follow this process]: #when-you-need-to-follow-this-process
You need to follow this process if you intend to make "substantial" changes to
@@ -37,25 +38,30 @@ flameshot or the RFC process itself. What constitutes a
on what part of the ecosystem you are proposing to change, but may include the
following.
- Any changes breaking compatibility to command line flags or config files.
- Any major changes to the UI
- Substantial new features like new tools.
+ Any changes breaking compatibility to command line flags or config files.
+ Any major changes to the UI
+ Substantial new features like new tools.
Some changes do not require an RFC:
- Rephrasing, reorganizing, refactoring, or otherwise "changing shape does
+ Rephrasing, reorganizing, refactoring, or otherwise "changing shape does
not change meaning".
- Improving translations.
- Additions that strictly improve objective, numerical quality criteria
+ 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.
If you submit a pull request to implement a new feature without going through
the RFC process, it may be closed with a polite request to submit an RFC first.
## Before creating an RFC
[Before creating an RFC]: #before-creating-an-rfc
A hastily-proposed RFC can hurt its chances of acceptance. Low quality
@@ -72,42 +78,57 @@ 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.
## What the process is
[What the process is]: #what-the-process-is
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
- Copy `docs/0000-template.md` to `docs/RFC/0000-my-feature.md` (where "my-feature" is
+ 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
number and we'll rename the file accordingly if the RFC is accepted.
- Fill in the RFC. Put care into the details: RFCs that do not present
+ Fill in the RFC. Put care into the details: RFCs that do not present
convincing motivation, demonstrate lack of understanding of the design's
impact, or are disingenuous about the drawbacks or alternatives tend to
be poorly-received.
- Submit a pull request. As a pull request the RFC will receive design
+ Submit a pull request. As a pull request the RFC will receive design
feedback from the larger community, and the author should be prepared to
revise it in response.
- Build consensus and integrate feedback. RFCs that have broad support are
+ Build consensus and integrate feedback. RFCs that have broad support are
much more likely to make progress than those that don't receive any
comments. Feel free to reach out to the RFC assignee in particular to get
help identifying stakeholders and obstacles.
- The team will discuss the RFC pull request, as much as possible in the
+ The team will discuss the RFC pull request, as much as possible in the
comment thread of the pull request itself. Offline discussion will be
summarized on the pull request comment thread.
- RFCs rarely go through this process unchanged, especially as alternatives
+ RFCs rarely go through this process unchanged, especially as alternatives
and drawbacks are shown. You can make edits, big and small, to the RFC to
clarify or change the design, but make changes as new commits to the pull
request, and leave a comment on the pull request explaining your changes.
Specifically, do not squash or rebase commits after they are visible on the
pull request.
- At some point, a member of the development team will propose a "motion for final
+ At some point, a member of the development team will propose a "motion for final
comment period" (FCP), along with a *disposition* for the RFC (merge, close,
or postpone).
- This step is taken when enough of the tradeoffs have been discussed that
the development is in a position to make a decision. That does not require
consensus amongst all participants in the RFC thread (which is usually
impossible). However, the argument supporting the disposition on the RFC
@@ -116,11 +137,14 @@ merged into the RFC repository as a markdown file. At that point the RFC is
members use their best judgment in taking this step, and the FCP itself
ensures there is ample time and notification for stakeholders to push back
if it is made prematurely.
- In most cases, the FCP period is quiet, and the RFC is either merged or
+ In most cases, the FCP period is quiet, and the RFC is either merged or
closed. However, sometimes substantial new arguments or ideas are raised,
the FCP is canceled, and the RFC goes back into development mode.
## The RFC life-cycle
[The RFC life-cycle]: #the-rfc-life-cycle
Once an RFC becomes "active" then authors may implement it and submit the
@@ -149,23 +173,24 @@ 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.
## Reviewing RFCs
[Reviewing RFCs]: #reviewing-rfcs
While the RFC pull request is up, the development team may schedule meetings with the
author and/or relevant stakeholders to discuss the issues in greater detail,
and in some cases the topic may be discussed at a sub-team meeting. In either
The preferred method of discussing RFC's is the github issue. However, the development team may schedule meetings with the
author and/or relevant stakeholders to discuss the issues in greater detail. In either
case a summary from the meeting will be posted back to the RFC pull request.
A sub-team makes final decisions about RFCs after the benefits and drawbacks
The development team makes final decisions about RFCs after the benefits and drawbacks
are well understood. These decisions can be made at any time, but the sub-team
will regularly issue decisions. When a decision is made, the RFC pull request
will either be merged or closed. In either case, if the reasoning is not clear
from the discussion in thread, the sub-team will add a comment describing the
rationale for the decision.
## Implementing an RFC
[Implementing an RFC]: #implementing-an-rfc
Some accepted RFCs represent vital features that need to be implemented right
@@ -183,8 +208,8 @@ If you are interested in working on the implementation for an "active" RFC, but
cannot determine if someone else is already working on it, feel free to ask
(e.g. by leaving a comment on the associated issue).
## RFC Postponement
[RFC Postponement]: #rfc-postponement
Some RFC pull requests are tagged with the "postponed" label when they are
@@ -199,8 +224,8 @@ 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.)
### Help this is all too informal!
[Help this is all too informal!]: #help-this-is-all-too-informal
The process is intended to be as lightweight as reasonable for the present

51
src/CMakeLists.txt
View File

@@ -7,14 +7,16 @@ find_package(
Widgets
Network
Svg
DBus)
DBus
LinguistTools)
set(CMAKE_AUTOMOC ON)
set(CMAKE_AUTORCC ON)
set(CMAKE_AUTOUIC ON)
add_executable(flameshot)
add_executable(Flameshot::flameshot ALIAS flameshot)
add_executable(Flameshot::flameshot ALIAS flameshot)
add_subdirectory(cli)
add_subdirectory(config)
@@ -23,6 +25,27 @@ add_subdirectory(utils)
add_subdirectory(widgets)
add_subdirectory(tools)
qt5_create_translation(
QM_FILES
${CMAKE_SOURCE_DIR}
${CMAKE_SOURCE_DIR}/data/translations/Internationalization_ca.ts
${CMAKE_SOURCE_DIR}/data/translations/Internationalization_de_DE.ts
${CMAKE_SOURCE_DIR}/data/translations/Internationalization_fr.ts
${CMAKE_SOURCE_DIR}/data/translations/Internationalization_es.ts
${CMAKE_SOURCE_DIR}/data/translations/Internationalization_hu.ts
${CMAKE_SOURCE_DIR}/data/translations/Internationalization_ja.ts
${CMAKE_SOURCE_DIR}/data/translations/Internationalization_ka.ts
${CMAKE_SOURCE_DIR}/data/translations/Internationalization_nl.ts
${CMAKE_SOURCE_DIR}/data/translations/Internationalization_pl.ts
${CMAKE_SOURCE_DIR}/data/translations/Internationalization_pt_br.ts
${CMAKE_SOURCE_DIR}/data/translations/Internationalization_ru.ts
${CMAKE_SOURCE_DIR}/data/translations/Internationalization_sk.ts
${CMAKE_SOURCE_DIR}/data/translations/Internationalization_sr.ts
${CMAKE_SOURCE_DIR}/data/translations/Internationalization_tr.ts
${CMAKE_SOURCE_DIR}/data/translations/Internationalization_uk.ts
${CMAKE_SOURCE_DIR}/data/translations/Internationalization_zh_CN.ts
${CMAKE_SOURCE_DIR}/data/translations/Internationalization_zh_TW.ts)
target_sources(
flameshot
PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/../external/singleapplication/singleapplication.cpp
@@ -30,6 +53,7 @@ target_sources(
${CMAKE_CURRENT_SOURCE_DIR}/../external/Qt-Color-Widgets/src/color_wheel.cpp
${CMAKE_CURRENT_SOURCE_DIR}/../external/Qt-Color-Widgets/include/color_wheel.hpp
${CMAKE_CURRENT_SOURCE_DIR}/../data/graphics.qrc
${QM_FILES}
main.cpp)
target_include_directories(
@@ -67,8 +91,7 @@ target_include_directories(
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/widgets>
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/widgets/panel>
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/widgets/capture>
$<INSTALL_INTERFACE:include/mylib> # <prefix>/include/mylib
)
$<INSTALL_INTERFACE:include/mylib>)
target_link_libraries(
flameshot
@@ -84,15 +107,21 @@ target_compile_definitions(flameshot PRIVATE APP_VERSION="v0.8.0")
target_compile_definitions(flameshot PRIVATE IMGUR_CLIENT_ID="313baf0c7b4d3ff")
target_compile_definitions(flameshot PRIVATE QAPPLICATION_CLASS=QApplication)
##############################################
foreach(FILE ${QM_FILES})
get_filename_component(F_NAME ${FILE} NAME)
add_custom_command(
TARGET flameshot
POST_BUILD
COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_BINARY_DIR}/${F_NAME}
${CMAKE_CURRENT_BINARY_DIR}/translations/${F_NAME})
endforeach()
# ######################################################################################################################
# Installation instructions
include(GNUInstallDirs)
set(INSTALL_CONFIGDIR ${CMAKE_INSTALL_LIBDIR}/cmake/Flameshot)
install(TARGETS flameshot
EXPORT flameshot-targets
RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
)
install(
TARGETS flameshot
EXPORT flameshot-targets
RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})

1
src/tools/arrow/arrowtool.h
View File

@@ -20,6 +20,7 @@
#include "src/tools/abstracttwopointtool.h"
#include <QPainter>
#include <QPainterPath>
class ArrowTool : public AbstractTwoPointTool {
Q_OBJECT
public:

13
src/tools/blur/blurtool.cpp
View File

@@ -62,10 +62,10 @@ QRgb calculate_block_averge(QImage &image, int x_start, int y_start,
assert(x_start + pixel_size < image.width());
assert(y_start + pixel_size < image.height());
auto red_count = 0;
auto blue_count = 0;
auto green_count = 0;
auto pixel_count = 0;
int red_count = 0;
int blue_count = 0;
int green_count = 0;
int pixel_count = 0;
for (auto x = x_start; x < x_start + pixel_size; x++)
{
for (auto y = y_start; y < y_start + pixel_size; y++)
@@ -100,6 +100,11 @@ void BlurTool::process(QPainter &painter, const QPixmap &pixmap,
QImage original_image{source->toImage()};
QImage imageResult{source->toImage()};
unsigned int pixel_size = m_thickness;
if (pixel_size < 1)
{
pixel_size =1;
}
const unsigned int width = source->width();
const unsigned int height = source->height();

2
src/tools/launcher/applauncherwidget.cpp
View File

@@ -114,7 +114,7 @@ void AppLauncherWidget::launch(const QModelIndex &index) {
tr("Unable to launch in terminal."));
}
} else {
QProcess::startDetached(app_name,{m_tempFile});
QProcess::startDetached(app_name,{m_tempFile});
}
if (!m_keepOpen) {
close();