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

Moved TS generation behind flag, fixed more references to blur, fixed missing pixelate icon.

Browse Source
This commit is contained in:
Jeremy Borgman
2020-09-06 10:11:27 -05:00
committed by borgmanJeremy
parent 9de316425f
commit 889b688ee2
7 changed files with 33 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
CMakeLists.txt
View File

@@ -1,11 +1,13 @@
cmake_minimum_required(VERSION 3.13)
#cmake_policy(SET CMP0076 OLD)
# cmake_policy(SET CMP0076 OLD)
project(
flameshot
VERSION 0.8.0
LANGUAGES CXX)
option(GENERATE_TS "Regenerate translation source files" OFF)
include(cmake/StandardProjectSettings.cmake)
add_library(project_options INTERFACE)

44
src/CMakeLists.txt
View File

@@ -29,26 +29,30 @@ 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)
set(FLAMESHOT_TS_FILES
${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)
if(GENERATE_TS)
qt5_create_translation(QM_FILES ${CMAKE_SOURCE_DIR} ${FLAMESHOT_TS_FILES})
else()
qt5_add_translation(QM_FILES ${FLAMESHOT_TS_FILES})
endif()
target_sources(
flameshot

2
src/tools/pixelate/pixelatetool.cpp
View File

@@ -31,7 +31,7 @@ QIcon
PixelateTool::icon(const QColor& background, bool inEditor) const
{
Q_UNUSED(inEditor);
return QIcon(iconPath(background) + "blur.svg");
return QIcon(iconPath(background) + "pixelate.svg");
}
QString
PixelateTool::name() const

2
src/tools/toolfactory.cpp
View File

@@ -94,7 +94,7 @@ ToolFactory::CreateTool(CaptureButton::ButtonType t, QObject* parent)
case CaptureButton::TYPE_OPEN_APP:
tool = new AppLauncher(parent);
break;
case CaptureButton::TYPE_BLUR:
case CaptureButton::TYPE_PIXELATE:
tool = new PixelateTool(parent);
break;
case CaptureButton::TYPE_PIN:

2
src/utils/confighandler.cpp
View File

@@ -46,7 +46,7 @@ ConfigHandler::getButtons()
buttons << CaptureButton::TYPE_PENCIL << CaptureButton::TYPE_DRAWER
<< CaptureButton::TYPE_ARROW << CaptureButton::TYPE_SELECTION
<< CaptureButton::TYPE_RECTANGLE << CaptureButton::TYPE_CIRCLE
<< CaptureButton::TYPE_MARKER << CaptureButton::TYPE_BLUR
<< CaptureButton::TYPE_MARKER << CaptureButton::TYPE_PIXELATE
<< CaptureButton::TYPE_SELECTIONINDICATOR
<< CaptureButton::TYPE_MOVESELECTION << CaptureButton::TYPE_UNDO
<< CaptureButton::TYPE_REDO << CaptureButton::TYPE_COPY

4
src/widgets/capture/capturebutton.cpp
View File

@@ -180,7 +180,7 @@ static std::map<CaptureButton::ButtonType, int> buttonTypeOrder{
{ CaptureButton::TYPE_CIRCLE, 5 },
{ CaptureButton::TYPE_MARKER, 6 },
{ CaptureButton::TYPE_TEXT, 7 },
{ CaptureButton::TYPE_BLUR, 8 },
{ CaptureButton::TYPE_PIXELATE, 8 },
{ CaptureButton::TYPE_SELECTIONINDICATOR, 9 },
{ CaptureButton::TYPE_MOVESELECTION, 10 },
{ CaptureButton::TYPE_UNDO, 11 },
@@ -207,7 +207,7 @@ QVector<CaptureButton::ButtonType> CaptureButton::iterableButtonTypes = {
CaptureButton::TYPE_ARROW, CaptureButton::TYPE_SELECTION,
CaptureButton::TYPE_RECTANGLE, CaptureButton::TYPE_CIRCLE,
CaptureButton::TYPE_MARKER, CaptureButton::TYPE_TEXT,
CaptureButton::TYPE_BLUR, CaptureButton::TYPE_SELECTIONINDICATOR,
CaptureButton::TYPE_PIXELATE, CaptureButton::TYPE_SELECTIONINDICATOR,
CaptureButton::TYPE_MOVESELECTION, CaptureButton::TYPE_UNDO,
CaptureButton::TYPE_REDO, CaptureButton::TYPE_COPY,
CaptureButton::TYPE_SAVE, CaptureButton::TYPE_EXIT,

2
src/widgets/capture/capturebutton.h
View File

@@ -49,7 +49,7 @@ public:
TYPE_EXIT = 12,
TYPE_IMAGEUPLOADER = 13,
TYPE_OPEN_APP = 14,
TYPE_BLUR = 15,
TYPE_PIXELATE = 15,
TYPE_REDO = 16,
TYPE_PIN = 17,
TYPE_TEXT = 18,