Commit 4b0459c7 authored by Boudewijn Rempt's avatar Boudewijn Rempt

Merge master branch

parent 05112455
......@@ -204,7 +204,6 @@ find_package(KF5 ${MIN_FRAMEWORKS_VERSION} REQUIRED COMPONENTS
ItemViews
WindowSystem
)
find_package(KF5KIO ${MIN_QT_VERSION})
find_package(Qt5 ${MIN_QT_VERSION}
REQUIRED COMPONENTS
......@@ -243,7 +242,11 @@ include (ECMInstallIcons)
macro_ensure_out_of_source_build("Compiling Calligra inside the source directory is not possible. Please refer to the build instruction http://community.kde.org/Calligra/Building/Building_Calligra")
find_package(KF5KIO ${MIN_FRAMEWORKS_VERSION})
macro_bool_to_01(KF5KIO_FOUND HAVE_KIO)
find_package(KF5Crash ${MIN_FRAMEWORKS_VERSION})
macro_bool_to_01(KF5Crash_FOUND HAVE_KCRASH)
find_package(X11)
if(X11_FOUND)
......@@ -377,7 +380,7 @@ endif()
## Test for GNU Scientific Library
##
macro_optional_find_package(GSL)
macro_log_feature(GSL_FOUND "GSL" "GNU Scientific Library" "http://www.gnu.org/software/gsl" FALSE "1.7" "Required by Krita's Transform")
macro_log_feature(GSL_FOUND "GSL" "GNU Scientific Library" "http://www.gnu.org/software/gsl" FALSE "1.7" "Required by Krita's Transform tool.")
macro_bool_to_01(GSL_FOUND HAVE_GSL)
configure_file(config-gsl.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-gsl.h )
......@@ -413,7 +416,7 @@ endif()
set(OLD_CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} )
set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake/modules )
macro_optional_find_package(Vc 0.6.70)
macro_log_feature(Vc_FOUND "Vc" "Portable, zero-overhead SIMD library for C++" "http://code.compeng.uni-frankfurt.de/projects/vc" FALSE "" "Required by the Krita for vectorization")
macro_log_feature(Vc_FOUND "Vc" "Portable, zero-overhead SIMD library for C++" "https://github.com/VcDevel/Vc" FALSE "" "Required by the Krita for vectorization")
macro_bool_to_01(Vc_FOUND HAVE_VC)
macro_bool_to_01(PACKAGERS_BUILD DO_PACKAGERS_BUILD)
......
......@@ -28,9 +28,6 @@
#cmakedefine WORDS_BIGENDIAN ${CMAKE_WORDS_BIGENDIAN}
#endif
/* Defines if the krita crash handler is built */
#cmakedefine USE_BREAKPAD 1
/* Number of bits in a file offset, on hosts where this is settable. */
#define _FILE_OFFSET_BITS 64
......@@ -58,6 +55,9 @@
/* Defines if DBUS is present */
#cmakedefine HAVE_DBUS 1
/* Defines if KCrash is present */
#cmakedefine HAVE_KCRASH 1
/* This file contains all the paths that change when changing the installation prefix */
#define CALLIGRAPREFIX "${CMAKE_INSTALL_PREFIX}"
......@@ -35,9 +35,6 @@ endif()
if(MSVC OR (WIN32 AND "${CMAKE_CXX_COMPILER_ID}" STREQUAL "Intel"))
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /bigobj")
if (USE_BREAKPAD)
include_directories(${CMAKE_SOURCE_DIR}/3rdparty/google-breakpad/src)
endif ()
# set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /STACK:16777216") # for g'mic...
# set(CMAKE_CXX_STACK_SIZE "999999999")
endif()
......@@ -122,11 +119,6 @@ endif ()
set(krita_SRCS main.cc)
if(WIN32 AND USE_BREAKPAD)
set(krita_SRCS ${krita_SRCS} kis_crash_handler.cpp)
set(BREAKPAD_LIBS breakpad)
endif()
if (NOT APPLE)
file(GLOB ICONS_SRCS "${CMAKE_CURRENT_SOURCE_DIR}/pics/app/*-apps-calligrakrita.png")
ecm_add_app_icon(krita_SRCS ICONS ${ICONS_SRCS})
......@@ -161,8 +153,12 @@ target_link_libraries(krita
Qt5::Network
Qt5::PrintSupport
Qt5::Svg
Qt5::Concurrent
${BREAKPAD_LIBS})
Qt5::Concurrent)
if(HAVE_KCRASH)
target_link_libraries(krita
KF5::Crash
)
endif()
if (APPLE)
set(CMAKE_MACOSX_RPATH ON)
......@@ -178,7 +174,7 @@ endif ()
install(TARGETS krita ${INSTALL_TARGETS_DEFAULT_ARGS})
install(PROGRAMS krita.desktop DESTINATION ${XDG_APPS_INSTALL_DIR})
install(FILES krita.rc DESTINATION ${DATA_INSTALL_DIR}/krita)
install(FILES krita.action DESTINATION ${DATA_INSTALL_DIR}/krita/actions)
install(FILES krita.action kritamenu.action DESTINATION ${DATA_INSTALL_DIR}/krita/actions)
install(FILES krita.appdata.xml DESTINATION ${SHARE_INSTALL_PREFIX}/appdata/ )
if (NOT APPLE AND HAVE_OPENGL AND Qt5Quick_FOUND)
......
......@@ -9,7 +9,17 @@ RCFILES=`find . -name \*.rc \
| grep -v gemini/KritaGeminiWin.rc
`
$EXTRACTRC $RCFILES >> rc.cpp
ACTIONFILES=`find . -name \*.action`
./action_i18n.pl --context=action $ACTIONFILES >> rc.cpp
# extracti18n.pl extracts additional data from brushes, palettes etc.
perl extracti18n.pl > i18ndata
# ignore sdk/templates since it contains templates for use a future plugins, none of the strings there will ever be seen by any user
krita_xgettext krita.pot i18ndata rc.cpp `find . -name \*.cc -o -name \*.h -o -name \*.cpp | grep -v '/tests/' | grep -v './sdk/templates'`
# Ignore sdk/templates which contains templates for writing future plugins.
# None of the placeholder strings inside will be seen by users.
krita_xgettext krita.pot i18ndata rc.cpp \
`find . -name \*.cc -o -name \*.h -o -name \*.cpp | grep -v '/tests/' | grep -v './sdk/templates'`
# Clean up
rm -f i18ndata rc.cpp
This diff is collapsed.
......@@ -5,5 +5,10 @@
<file>credits.txt</file>
<file>developers.txt</file>
<file>LICENSE</file>
<file>forumfooter.html</file>
<file>forumheader.html</file>
<file>links.html</file>
<file>newsfooter.html</file>
<file>newsheader.html</file>
</qresource>
</RCC>
</body>
</html>
\ No newline at end of file
<html>
<body>
<h1>Latest Forum Posts</h1>
<html>
<body>
<p align="center"><span style=" color:%1;"><b>Links</b></span></p>
<p><a href="https://krita.org/support-us/donations/"><span style=" text-decoration: underline; color:%1;">Support Krita</span></a></p>"
<p><a href="http://krita.org/resources"><span style=" text-decoration: underline; color:%1;">Getting Started</span></a></p>"
<p><a href="http://userbase.kde.org/Krita/Manual"><span style=" text-decoration: underline; color:%1;">Manual</span></a></p>"
<p><a href="http://krita.org"><span style=" text-decoration: underline; color:%1;">Krita Website</span></a></p>"
<p><a href="http://forum.kde.org/viewforum.php?f=136"><span style=" text-decoration: underline; color:%1;">User Community</span></a></p>"
<p><a href="https://projects.kde.org/projects/calligra"><span style=" text-decoration: underline; color:%1;">Source Code</span></a></p>"
<p><a href="http://store.steampowered.com/app/280680/"><span style=" text-decoration: underline; color:%1;">Krita on Steam</span></a></p>"
</body>
</html>
\ No newline at end of file
</body>
</html>
\ No newline at end of file
<html>
<body>
<h1>News</h1>
\ No newline at end of file
<?xml version="1.0" encoding="UTF-8"?>
<Actions version="2" name="ArtisticTextTool">
<Action name="artistictext_subscript">
<iconText>Subscript</iconText>
<shortcut></shortcut>
<toolTip>Subscript</toolTip>
<icon>format-text-subscript</icon>
<whatsThis></whatsThis>
<statusTip></statusTip>
<isCheckable>false</isCheckable>
<text>Subscript</text>
<defaultShortcut></defaultShortcut>
</Action>
<Action name="artistictext_detach_from_path">
<iconText>Detach Path</iconText>
<shortcut></shortcut>
<toolTip>Detach Path</toolTip>
<icon>artistictext-detach-path</icon>
<whatsThis></whatsThis>
<statusTip></statusTip>
<isCheckable>false</isCheckable>
<text>Detach Path</text>
<defaultShortcut></defaultShortcut>
</Action>
<Action name="artistictext_font_italic">
<iconText>Italic text</iconText>
<shortcut></shortcut>
<toolTip>Italic text</toolTip>
<icon>format-text-italic</icon>
<whatsThis></whatsThis>
<statusTip></statusTip>
<isCheckable>false</isCheckable>
<text>Italic text</text>
<defaultShortcut></defaultShortcut>
</Action>
<Action name="artistictext_anchor_middle">
<iconText>Anchor at Middle</iconText>
<shortcut></shortcut>
<toolTip>Anchor at Middle</toolTip>
<icon>format-justify-center</icon>
<whatsThis></whatsThis>
<statusTip></statusTip>
<isCheckable>false</isCheckable>
<text>Anchor at Middle</text>
<defaultShortcut></defaultShortcut>
</Action>
<Action name="artistictext_anchor_end">
<iconText>Anchor at End</iconText>
<shortcut></shortcut>
<toolTip>Anchor at End</toolTip>
<icon>format-justify-right</icon>
<whatsThis></whatsThis>
<statusTip></statusTip>
<isCheckable>false</isCheckable>
<text>Anchor at End</text>
<defaultShortcut></defaultShortcut>
</Action>
<Action name="artistictext_convert_to_path">
<iconText>Convert to Path</iconText>
<shortcut></shortcut>
<toolTip>Convert to Path</toolTip>
<icon>pathshape</icon>
<whatsThis></whatsThis>
<statusTip></statusTip>
<isCheckable>false</isCheckable>
<text>Convert to Path</text>
<defaultShortcut></defaultShortcut>
</Action>
<Action name="artistictext_anchor_start">
<iconText>Anchor at Start</iconText>
<shortcut></shortcut>
<toolTip>Anchor at Start</toolTip>
<icon>format-justify-left</icon>
<whatsThis></whatsThis>
<statusTip></statusTip>
<isCheckable>false</isCheckable>
<text>Anchor at Start</text>
<defaultShortcut></defaultShortcut>
</Action>
<Action name="artistictext_font_bold">
<iconText>Bold text</iconText>
<shortcut></shortcut>
<toolTip>Bold text</toolTip>
<icon>format-text-bold</icon>
<whatsThis></whatsThis>
<statusTip></statusTip>
<isCheckable>false</isCheckable>
<text>Bold text</text>
<defaultShortcut></defaultShortcut>
</Action>
<Action name="edit_deselect_all">
<iconText>Deselect</iconText>
<shortcut>Ctrl+Shift+A</shortcut>
<toolTip>Deselect</toolTip>
<icon></icon>
<whatsThis></whatsThis>
<statusTip></statusTip>
<isCheckable>false</isCheckable>
<text>Dese&amp;lect</text>
<defaultShortcut>Ctrl+Shift+A</defaultShortcut>
</Action>
<Action name="artistictext_superscript">
<iconText>Superscript</iconText>
<shortcut></shortcut>
<toolTip>Superscript</toolTip>
<icon>format-text-superscript</icon>
<whatsThis></whatsThis>
<statusTip></statusTip>
<isCheckable>false</isCheckable>
<text>Superscript</text>
<defaultShortcut></defaultShortcut>
</Action>
</Actions>
<ActionCollection version="2" name="Tools">
<Actions category="Artistic Text Tool">
<text>Artistic Text Tool</text>
<Action name="artistictext_subscript">
<iconText>Subscript</iconText>
<shortcut></shortcut>
<toolTip>Subscript</toolTip>
<icon>format-text-subscript</icon>
<whatsThis></whatsThis>
<statusTip></statusTip>
<isCheckable>true</isCheckable>
<text>Subscript</text>
<defaultShortcut></defaultShortcut>
</Action>
<Action name="artistictext_detach_from_path">
<iconText>Detach Path</iconText>
<shortcut></shortcut>
<toolTip>Detach Path</toolTip>
<icon>artistictext-detach-path</icon>
<whatsThis></whatsThis>
<statusTip></statusTip>
<isCheckable>false</isCheckable>
<text>Detach Path</text>
<defaultShortcut></defaultShortcut>
</Action>
<Action name="artistictext_font_italic">
<iconText>Italic text</iconText>
<shortcut></shortcut>
<toolTip>Italic text</toolTip>
<icon>format-text-italic</icon>
<whatsThis></whatsThis>
<statusTip></statusTip>
<isCheckable>true</isCheckable>
<text>Italic text</text>
<defaultShortcut></defaultShortcut>
</Action>
<Action name="artistictext_anchor_middle">
<iconText>Anchor at Middle</iconText>
<shortcut></shortcut>
<toolTip>Anchor at Middle</toolTip>
<icon>format-justify-center</icon>
<whatsThis></whatsThis>
<statusTip></statusTip>
<isCheckable>true</isCheckable>
<text>Anchor at Middle</text>
<defaultShortcut></defaultShortcut>
</Action>
<Action name="artistictext_anchor_end">
<iconText>Anchor at End</iconText>
<shortcut></shortcut>
<toolTip>Anchor at End</toolTip>
<icon>format-justify-right</icon>
<whatsThis></whatsThis>
<statusTip></statusTip>
<isCheckable>true</isCheckable>
<text>Anchor at End</text>
<defaultShortcut></defaultShortcut>
</Action>
<Action name="artistictext_convert_to_path">
<iconText>Convert to Path</iconText>
<shortcut></shortcut>
<toolTip>Convert to Path</toolTip>
<icon>pathshape</icon>
<whatsThis></whatsThis>
<statusTip></statusTip>
<isCheckable>false</isCheckable>
<text>Convert to Path</text>
<defaultShortcut></defaultShortcut>
</Action>
<Action name="artistictext_anchor_start">
<iconText>Anchor at Start</iconText>
<shortcut></shortcut>
<toolTip>Anchor at Start</toolTip>
<icon>format-justify-left</icon>
<whatsThis></whatsThis>
<statusTip></statusTip>
<isCheckable>true</isCheckable>
<text>Anchor at Start</text>
<defaultShortcut></defaultShortcut>
</Action>
<Action name="artistictext_font_bold">
<iconText>Bold text</iconText>
<shortcut></shortcut>
<toolTip>Bold text</toolTip>
<icon>format-text-bold</icon>
<whatsThis></whatsThis>
<statusTip></statusTip>
<isCheckable>true</isCheckable>
<text>Bold text</text>
<defaultShortcut></defaultShortcut>
</Action>
<Action name="edit_deselect_all">
<iconText>Deselect</iconText>
<shortcut>Ctrl+Shift+A</shortcut>
<toolTip>Deselect</toolTip>
<icon></icon>
<whatsThis></whatsThis>
<statusTip></statusTip>
<isCheckable>false</isCheckable>
<text>Dese&amp;lect</text>
<defaultShortcut>Ctrl+Shift+A</defaultShortcut>
</Action>
<Action name="artistictext_superscript">
<iconText>Superscript</iconText>
<shortcut></shortcut>
<toolTip>Superscript</toolTip>
<icon>format-text-superscript</icon>
<whatsThis></whatsThis>
<statusTip></statusTip>
<isCheckable>true</isCheckable>
<text>Superscript</text>
<defaultShortcut></defaultShortcut>
</Action>
</Actions>
</ActionCollection>
......@@ -3,4 +3,6 @@ install( FILES
InteractionTool.action
PathTool.action
TextTool.action
ConnectionTool.action
ReferencesTool.action
DESTINATION ${DATA_INSTALL_DIR}/krita/actions)
<?xml version="1.0" encoding="UTF-8"?>
<ActionCollection version="2" name="Tools">
<Actions category="connection-tool">
<text>Connection Tool</text>
<Action name="toggle-edit-mode">
<iconText>Edit connection points</iconText>
<shortcut></shortcut>
<toolTip>Edit connection points</toolTip>
<icon>path-break-segment</icon>
<whatsThis></whatsThis>
<statusTip></statusTip>
<isCheckable>true</isCheckable>
<text>Edit connection points</text>
<defaultShortcut></defaultShortcut>
</Action>
<Action name="align-relative">
<iconText>%</iconText>
<shortcut></shortcut>
<toolTip>%</toolTip>
<icon>path-break-segment</icon>
<whatsThis></whatsThis>
<statusTip></statusTip>
<isCheckable>true</isCheckable>
<text>%</text>
<defaultShortcut></defaultShortcut>
</Action>
<Action name="align-left">
<iconText>Align to left edge</iconText>
<shortcut></shortcut>
<toolTip>Align to left edge</toolTip>
<icon>align-horizontal-left</icon>
<whatsThis></whatsThis>
<statusTip></statusTip>
<isCheckable>true</isCheckable>
<text>Align to left edge</text>
<defaultShortcut></defaultShortcut>
</Action>
<Action name="align-centerh">
<iconText>Align to horizontal center</iconText>
<shortcut></shortcut>
<toolTip>Align to horizontal center</toolTip>
<icon>align-horizontal-center</icon>
<whatsThis></whatsThis>
<statusTip></statusTip>
<isCheckable>true</isCheckable>
<text>Align to horizontal center</text>
<defaultShortcut></defaultShortcut>
</Action>
<Action name="align-right">
<iconText>Align to right edge</iconText>
<shortcut></shortcut>
<toolTip>Align to right edge</toolTip>
<icon>align-horizontal-right</icon>
<whatsThis></whatsThis>
<statusTip></statusTip>
<isCheckable>true</isCheckable>
<text>Align to right edge</text>
<defaultShortcut></defaultShortcut>
</Action>
<Action name="align-top">
<iconText>Align to top edge</iconText>
<shortcut></shortcut>
<toolTip>Align to top edge</toolTip>
<icon>align-vertical-top</icon>
<whatsThis></whatsThis>
<statusTip></statusTip>
<isCheckable>true</isCheckable>
<text>Align to top edge</text>
<defaultShortcut></defaultShortcut>
</Action>
<Action name="align-centerv">
<iconText>Align to vertical center</iconText>
<shortcut></shortcut>
<toolTip>Align to vertical center</toolTip>
<icon>align-vertical-center</icon>
<whatsThis></whatsThis>
<statusTip></statusTip>
<isCheckable>true</isCheckable>
<text>Align to vertical center</text>
<defaultShortcut></defaultShortcut>
</Action>
<Action name="align-bottom">
<iconText>Align to bottom edge</iconText>
<shortcut></shortcut>
<toolTip>Align to bottom edge</toolTip>
<icon>align-vertical-bottom</icon>
<whatsThis></whatsThis>
<statusTip></statusTip>
<isCheckable>true</isCheckable>
<text>Align to bottom edge</text>
<d