Commit 203f54c4 authored by Jouni Pentikäinen's avatar Jouni Pentikäinen

Merge remote-tracking branch 'origin/master' into rempt/intel-3

parents 8e480a81 25cea389
......@@ -620,16 +620,18 @@ endif()
set(OLD_CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} )
set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake/modules )
set(HAVE_VC FALSE)
if( NOT MSVC)
find_package(Vc 1.1.0)
set_package_properties(Vc PROPERTIES
DESCRIPTION "Portable, zero-overhead SIMD library for C++"
URL "https://github.com/VcDevel/Vc"
TYPE OPTIONAL
PURPOSE "Required by the Krita for vectorization")
macro_bool_to_01(Vc_FOUND HAVE_VC)
if (NOT ${CMAKE_SYSTEM_PROCESSOR} MATCHES "arm")
if(NOT MSVC)
find_package(Vc 1.1.0)
set_package_properties(Vc PROPERTIES
DESCRIPTION "Portable, zero-overhead SIMD library for C++"
URL "https://github.com/VcDevel/Vc"
TYPE OPTIONAL
PURPOSE "Required by the Krita for vectorization")
macro_bool_to_01(Vc_FOUND HAVE_VC)
endif()
configure_file(config-vc.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-vc.h )
endif()
configure_file(config-vc.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-vc.h )
if(HAVE_VC)
message(STATUS "Vc found!")
......
......@@ -678,7 +678,7 @@ set "BUILDDIR_KRITA_INSTALL_CMAKE=%BUILDDIR_KRITA_INSTALL_CMAKE: =\ %"
set PATH=%DEPS_INSTALL_DIR%\bin;%PATH%
if not "%GETTEXT_SEARCH_PATH%" == "" (
set PATH=%PATH%;%GETTEXT_SEARCH_PATH%
set PATH=!PATH!;!GETTEXT_SEARCH_PATH!
)
if "%ARG_SKIP_DEPS%" == "1" goto skip_build_deps
......
......@@ -102,9 +102,9 @@ MACRO(ADD_SIP_PYTHON_MODULE MODULE_NAME MODULE_SIP)
# not sure if type MODULE could be uses anywhere, limit to cygwin for now
IF (WIN32 OR CYGWIN OR APPLE)
ADD_LIBRARY(${_logical_name} MODULE ${_sip_output_files} )
ELSE (WIN32 OR CYGWIN)
ELSE (WIN32 OR CYGWIN OR APPLE)
ADD_LIBRARY(${_logical_name} SHARED ${_sip_output_files} )
ENDIF (WIN32 OR CYGWIN)
ENDIF (WIN32 OR CYGWIN OR APPLE)
TARGET_LINK_LIBRARIES(${_logical_name} ${PYTHON_LIBRARY})
TARGET_LINK_LIBRARIES(${_logical_name} ${EXTRA_LINK_LIBRARIES})
SET_TARGET_PROPERTIES(${_logical_name} PROPERTIES PREFIX "" OUTPUT_NAME ${_child_module_name})
......
This diff is collapsed.
[Shortcuts]
BrushesAndStuff=none
EditLayerMetaData=none
LayerGroupSwitcher/next=none
LayerGroupSwitcher/previous=none
Macro_Open_Edit=none
Macro_Open_Play=none
Recording_Start_Recording_Macro=none
Recording_Stop_Recording_Macro=none
RenameCurrentLayer=F2
Select Behind Blending Mode=Alt+Shift+Q
Select Clear Blending Mode=Alt+Shift+R
Select Color Blending Mode=Alt+Shift+C
Select Color Burn Blending Mode=Alt+Shift+B
Select Color Dodge Blending Mode=Alt+Shift+D
Select Darken Blending Mode=Alt+Shift+K
Select Difference Blending Mode=Alt+Shift+E
Select Dissolve Blending Mode=Alt+Shift+I
Select Exclusion Blending Mode=Alt+Shift+X
Select Hard Light Blending Mode=Alt+Shift+H
Select Hard Mix Blending Mode=Alt+Shift+L
Select Hue Blending Mode=Alt+Shift+U
Select Lighten Blending Mode=Alt+Shift+G
Select Linear Burn Blending Mode=Alt+Shift+A
Select Linear Dodge Blending Mode=Alt+Shift+W
Select Linear Light Blending Mode=Alt+Shift+J
Select Luminosity Blending Mode=Alt+Shift+Y
Select Multiply Blending Mode=Alt+Shift+M
Select Normal Blending Mode=Alt+Shift+N
Select Overlay Blending Mode=Alt+Shift+O
Select Pin Light Blending Mode=Alt+Shift+Z
Select Saturation Blending Mode=Alt+Shift+T
Select Screen Blending Mode=Alt+Shift+S
Select Soft Light Blending Mode=Alt+Shift+F
Select Vivid Light Blending Mode=Alt+Shift+V
activateNextLayer=PgUp
activatePreviousLayer=PgDown
add_blank_frame=none
......@@ -49,6 +15,7 @@ add_new_shape_layer=none
add_new_transform_mask=none
add_new_transparency_mask=none
borderselection=none
BrushesAndStuff=none
brushslider2=none
brushslider3=none
canvassize=Ctrl+Alt+C
......@@ -71,8 +38,8 @@ create_copy=none
create_template=none
cut_selection_to_new_layer=Ctrl+Shift+J
cut_sharp=none
decrease_opacity=I
decrease_brush_size=[
decrease_opacity=I
delete_keyframe=none
deselect=Ctrl+Shift+A
dual=none
......@@ -80,13 +47,14 @@ duplicatelayer=Ctrl+J
edit_blacklist_cleanup=none
edit_copy=Ctrl+C
edit_cut=Ctrl+X
EditLayerMetaData=none
edit_paste=Ctrl+V
edit_redo=Ctrl+Shift+Z
edit_undo=Ctrl+Z
erase_action=E
featherselection=Shift+F6
file_close=Ctrl+W
file_close_all=Ctrl+Shift+W
file_close=Ctrl+W
file_documentinfo=none
file_export_animation=none
file_export_file=none
......@@ -98,12 +66,12 @@ file_open_recent=none
file_print=Ctrl+P
file_print_preview=none
file_quit=Ctrl+Q
file_save=Ctrl+S
file_save_as=Ctrl+Shift+S
file_save=Ctrl+S
fill_selection_background_color=Backspace
fill_selection_background_color_opacity=Ctrl+Backspace
fill_selection_foreground_color=Shift+Backspace
fill_selection_foreground_color_opacity=Ctrl+Shift+Backspace
fill_selection_foreground_color=Shift+Backspace
fill_selection_pattern=none
fill_selection_pattern_opacity=none
filter_apply_again=Ctrl+F
......@@ -121,8 +89,8 @@ help_report_bug=none
histogram=none
hmirror_action=none
image_color=none
image_properties=none
imagecolorspaceconversion=none
image_properties=none
imagesize=Ctrl+Alt+I
imagesplit=none
import_layer_as_filter_mask=none
......@@ -131,8 +99,8 @@ import_layer_as_selection_mask=none
import_layer_as_transparency_mask=none
import_layer_from_file=none
import_resources=none
increase_opacity=O
increase_brush_size=]
increase_opacity=O
invert=Ctrl+Shift+I
isolate_layer=none
krita_filter_autocontrast=none
......@@ -145,11 +113,11 @@ krita_filter_colortoalpha=none
krita_filter_colortransfer=none
krita_filter_desaturate=Ctrl+Shift+U
krita_filter_dodge=none
krita_filter_emboss=none
krita_filter_emboss all directions=none
krita_filter_emboss horizontal and vertical=none
krita_filter_emboss horizontal only=none
krita_filter_emboss laplascian=none
krita_filter_emboss=none
krita_filter_emboss vertical only=none
krita_filter_gaussian blur=none
krita_filter_gaussiannoisereducer=none
......@@ -178,27 +146,31 @@ krita_filter_smalltiles=none
krita_filter_sobel=none
krita_filter_top edge detections=none
krita_filter_unsharp=none
krita_filter_wave=none
krita_filter_waveletnoisereducer=none
krita_filter_wave=none
last_frame=none
layer_properties=none
layer_style=none
layercolorspaceconversion=none
LayerGroupSwitcher/next=none
LayerGroupSwitcher/previous=none
layer_properties=none
layersize=none
layersplit=none
layer_style=none
lazy_frame=none
level_of_detail_mode=Shift+L
Macro_Open_Edit=none
Macro_Open_Play=none
mainToolBar=none
make_brush_color_darker=K
make_brush_color_lighter=L
manage_bundles=none
merge_layer=Ctrl+E
mirror_actions=none
mirror_canvas=M
mirrorImageHorizontal=none
mirrorImageVertical=none
mirrorNodeX=none
mirrorNodeY=none
mirror_actions=none
mirror_canvas=M
move_layer_down=none
move_layer_up=none
next_favorite_preset=,
......@@ -207,8 +179,8 @@ next_keyframe=none
offsetimage=none
offsetlayer=none
open_resources_directory=none
options_configure=none
options_configure_keybinding=none
options_configure=none
options_configure_toolbars=none
paintops=none
paste_at=none
......@@ -220,37 +192,65 @@ previous_frame=none
previous_keyframe=none
previous_preset=/
rasterize_layer=none
Recording_Start_Recording_Macro=none
Recording_Stop_Recording_Macro=none
reload_preset_action=none
remove_layer=Shift+Delete
RenameCurrentLayer=F2
reselect=Ctrl+Shift+D
resizeimagetolayer=none
resizeimagetoselection=none
rotate_canvas_left=Ctrl+[
rotate_canvas_right=Ctrl+]
rotateImage180=none
rotateImageCCW90=none
rotateImageCW90=none
rotateimage=none
rotateLayer180=none
rotateLayerCCW90=none
rotateLayerCW90=none
rotate_canvas_left=Ctrl+[
rotate_canvas_right=Ctrl+]
rotateimage=none
rotatelayer=none
save_groups_as_images=none
save_incremental_backup=F4
save_incremental_version=Ctrl+Alt+S
save_node_as_image=none
select_all=Ctrl+A
select_opaque=none
Select Behind Blending Mode=Alt+Shift+Q
Select Clear Blending Mode=Alt+Shift+R
Select Color Blending Mode=Alt+Shift+C
Select Color Burn Blending Mode=Alt+Shift+B
Select Color Dodge Blending Mode=Alt+Shift+D
Select Darken Blending Mode=Alt+Shift+K
Select Difference Blending Mode=Alt+Shift+E
Select Dissolve Blending Mode=Alt+Shift+I
Select Exclusion Blending Mode=Alt+Shift+X
Select Hard Light Blending Mode=Alt+Shift+H
Select Hard Mix Blending Mode=Alt+Shift+L
Select Hue Blending Mode=Alt+Shift+U
selectionscale=none
Select Lighten Blending Mode=Alt+Shift+G
Select Linear Burn Blending Mode=Alt+Shift+A
Select Linear Dodge Blending Mode=Alt+Shift+W
Select Linear Light Blending Mode=Alt+Shift+J
Select Luminosity Blending Mode=Alt+Shift+Y
Select Multiply Blending Mode=Alt+Shift+M
Select Normal Blending Mode=Alt+Shift+N
select_opaque=none
selectopaque=none
Select Overlay Blending Mode=Alt+Shift+O
Select Pin Light Blending Mode=Alt+Shift+Z
Select Saturation Blending Mode=Alt+Shift+T
Select Screen Blending Mode=Alt+Shift+S
Select Soft Light Blending Mode=Alt+Shift+F
Select Vivid Light Blending Mode=Alt+Shift+V
separate=none
settings_active_author=none
shearimage=none
shearlayer=none
show-global-selection-mask=none
showStatusBar=none
show_brush_presets=F6
show-global-selection-mask=none
show_in_timeline=none
showStatusBar=none
shrinkselection=none
smoothselection=none
split_alpha_into_mask=none
......@@ -258,22 +258,22 @@ split_alpha_save_merged=none
split_alpha_write=none
stroke_shapes=none
tablet_debugger=Ctrl+Shift+T
toggle-selection-overlay-mode=none
toggle_display_selection=Ctrl+H
toggle_playback=none
toggle-selection-overlay-mode=none
trim_to_image=none
view_clear_perspective_grid=none
view_grid=Ctrl+Shift+'
view_newwindow=none
view_ruler=none
view_show_guides=none
view_show_canvas_only=Tab
view_show_guides=none
view_snap_to_grid=Ctrl+Shift+;
view_toggle_assistant_previews=none
view_toggle_painting_assistants=none
view_toggle_perspective_grid=none
view_toggledockers=none
view_toggledockertitlebars=none
view_toggle_painting_assistants=none
view_toggle_perspective_grid=none
view_zoom_in=Ctrl++
view_zoom_out=Ctrl+-
vmirror_action=none
......
This diff is collapsed.
......@@ -2129,28 +2129,225 @@
<isCheckable>true</isCheckable>
<statusTip></statusTip>
</Action>
<Action name="add_blank_frame">
<Action name="show_in_timeline">
<icon></icon>
<text>Add blank frame</text>
<text>Show in Timeline</text>
<whatsThis></whatsThis>
<toolTip>Add blank frame</toolTip>
<iconText>Add blank frame</iconText>
<toolTip></toolTip>
<iconText></iconText>
<shortcut></shortcut>
<isCheckable>true</isCheckable>
<statusTip></statusTip>
</Action>
<Action name="insert_n_frames_left">
<icon></icon>
<text>Insert N Frame Left</text>
<whatsThis></whatsThis>
<toolTip>Insert N Frame Left</toolTip>
<iconText>Insert N Frame Left</iconText>
<activationFlags>100000</activationFlags>
<activationConditions>0</activationConditions>
<shortcut></shortcut>
<isCheckable>false</isCheckable>
<statusTip></statusTip>
</Action>
<Action name="show_in_timeline">
<Action name="insert_n_frames_right">
<icon></icon>
<text>Show in Timeline</text>
<text>Insert N Frame Right</text>
<whatsThis></whatsThis>
<toolTip></toolTip>
<toolTip>Insert N Frame Right</toolTip>
<iconText>Insert N Frame Right</iconText>
<activationFlags>100000</activationFlags>
<activationConditions>0</activationConditions>
<shortcut></shortcut>
<isCheckable>false</isCheckable>
<statusTip></statusTip>
</Action>
<Action name="clear_animation_columns">
<icon></icon>
<text>Clear Columns</text>
<whatsThis></whatsThis>
<toolTip>Clear Columns</toolTip>
<iconText>Clear Columns</iconText>
<activationFlags>100000</activationFlags>
<activationConditions>0</activationConditions>
<shortcut></shortcut>
<isCheckable>false</isCheckable>
<statusTip></statusTip>
</Action>
<Action name="remove_animation_columns">
<icon></icon>
<text>Remove Columns</text>
<whatsThis></whatsThis>
<toolTip>Remove Columns</toolTip>
<iconText>Remove Columns</iconText>
<activationFlags>100000</activationFlags>
<activationConditions>0</activationConditions>
<shortcut></shortcut>
<isCheckable>false</isCheckable>
<statusTip></statusTip>
</Action>
<Action name="insert_keyframes_right">
<icon></icon>
<text>Insert Keyframe Right</text>
<whatsThis></whatsThis>
<toolTip>Insert keyframes to the right of selection moving the tail of animation to the right</toolTip>
<iconText></iconText>
<activationFlags>100000</activationFlags>
<activationConditions>0</activationConditions>
<shortcut></shortcut>
<isCheckable>true</isCheckable>
<isCheckable>false</isCheckable>
<statusTip></statusTip>
</Action>
<Action name="insert_keyframes_left">
<icon></icon>
<text>Insert Keyframe Left</text>
<whatsThis></whatsThis>
<toolTip>Insert keyframes to the left of selection moving the tail of animation to the right</toolTip>
<iconText></iconText>
<activationFlags>100000</activationFlags>
<activationConditions>0</activationConditions>
<shortcut></shortcut>
<isCheckable>false</isCheckable>
<statusTip></statusTip>
</Action>
<Action name="insert_n_keyframes_right">
<icon></icon>
<text>Insert N Keyframes Right</text>
<whatsThis></whatsThis>
<toolTip>Insert several keyframes to the right of selection moving the tail of animation to the right</toolTip>
<iconText></iconText>
<activationFlags>100000</activationFlags>
<activationConditions>0</activationConditions>
<shortcut></shortcut>
<isCheckable>false</isCheckable>
<statusTip></statusTip>
</Action>
<Action name="insert_n_keyframes_left">
<icon></icon>
<text>Insert N Keyframes Left</text>
<whatsThis></whatsThis>
<toolTip>Insert several keyframes to the left of selection moving the tail of animation to the right</toolTip>
<iconText></iconText>
<activationFlags>100000</activationFlags>
<activationConditions>0</activationConditions>
<shortcut></shortcut>
<isCheckable>false</isCheckable>
<statusTip></statusTip>
</Action>
<Action name="remove_frames_and_shift">
<icon></icon>
<text>Remove Frame and Shift</text>
<whatsThis></whatsThis>
<toolTip>Remove keyframes moving the tail of animation to the left</toolTip>
<iconText></iconText>
<activationFlags>100000</activationFlags>
<activationConditions>0</activationConditions>
<shortcut></shortcut>
<isCheckable>false</isCheckable>
<statusTip></statusTip>
</Action>
<Action name="remove_frames">
<icon></icon>
<text>Remove Frame</text>
<whatsThis></whatsThis>
<toolTip>Just remove keyframes without moving anything around</toolTip>
<iconText></iconText>
<activationFlags>100000</activationFlags>
<activationConditions>0</activationConditions>
<shortcut></shortcut>
<isCheckable>false</isCheckable>
<statusTip></statusTip>
</Action>
<Action name="insert_columns_right">
<icon></icon>
<text>Insert Column Right</text>
<whatsThis></whatsThis>
<toolTip>Insert keyframes to the right of selection moving the tail of animation to the right</toolTip>
<iconText></iconText>
<activationFlags>100000</activationFlags>
<activationConditions>0</activationConditions>
<shortcut></shortcut>
<isCheckable>false</isCheckable>
<statusTip></statusTip>
</Action>
<Action name="insert_columns_left">
<icon></icon>
<text>Insert Column Left</text>
<whatsThis></whatsThis>
<toolTip>Insert column to the left of selection moving the tail of animation to the right</toolTip>
<iconText></iconText>
<activationFlags>100000</activationFlags>
<activationConditions>0</activationConditions>
<shortcut></shortcut>
<isCheckable>false</isCheckable>
<statusTip></statusTip>
</Action>
<Action name="insert_n_columns_right">
<icon></icon>
<text>Insert N Columns Right</text>
<whatsThis></whatsThis>
<toolTip>Insert several columns to the right of selection moving the tail of animation to the right</toolTip>
<iconText></iconText>
<activationFlags>100000</activationFlags>
<activationConditions>0</activationConditions>
<shortcut></shortcut>
<isCheckable>false</isCheckable>
<statusTip></statusTip>
</Action>
<Action name="insert_n_columns_left">
<icon></icon>
<text>Insert N Columns Left</text>
<whatsThis></whatsThis>
<toolTip>Insert several columns to the left of selection moving the tail of animation to the right</toolTip>
<iconText></iconText>
<activationFlags>100000</activationFlags>
<activationConditions>0</activationConditions>
<shortcut></shortcut>
<isCheckable>false</isCheckable>
<statusTip></statusTip>
</Action>
<Action name="remove_columns_and_shift">
<icon></icon>
<text>Remove Column and Shift</text>
<whatsThis></whatsThis>
<toolTip>Remove columns moving the tail of animation to the left</toolTip>
<iconText></iconText>
<activationFlags>100000</activationFlags>
<activationConditions>0</activationConditions>
<shortcut></shortcut>
<isCheckable>false</isCheckable>
<statusTip></statusTip>
</Action>
<Action name="remove_columns">
<icon></icon>
<text>Remove Column</text>
<whatsThis></whatsThis>
<toolTip>Just remove columns without moving anything around</toolTip>
<iconText></iconText>
<activationFlags>100000</activationFlags>
<activationConditions>0</activationConditions>
<shortcut></shortcut>
<isCheckable>false</isCheckable>
<statusTip></statusTip>
</Action>
</Actions>
</Actions>
<Actions category="Layers">
......
......@@ -332,7 +332,6 @@ xsi:schemaLocation="http://www.kde.org/standards/kxmlgui/1.0 http://www.kde.org
<Merge name="StandardToolBarMenuHandler" />
<Separator/>
<Action name="view_toggledockers"/>
<Action name="view_toggledockertitlebars"/>
<Action name="settings_dockers_menu"/>
<Separator/>
<Action name="theme_menu"/>
......
......@@ -516,6 +516,8 @@
<isCheckable>false</isCheckable>
<statusTip></statusTip>
</Action>
<Action name="delete_keyframe">
<icon></icon>
<text>Delete keyframe</text>
......@@ -530,6 +532,7 @@
</Action>
</Actions>
<Actions category="Window">
<text>Window</text>
<Action name="view_newwindow">
......@@ -1604,18 +1607,6 @@
<isCheckable>true</isCheckable>
<statusTip></statusTip>
</Action>
<Action name="view_toggledockertitlebars">
<icon></icon>
<text>Sho&amp;w Docker Titlebars</text>
<whatsThis></whatsThis>
<toolTip>Show Docker Titlebars</toolTip>
<iconText>Show Docker Titlebars</iconText>
<activationFlags>0</activationFlags>
<activationConditions>0</activationConditions>
<shortcut></shortcut>
<isCheckable>true</isCheckable>
<statusTip></statusTip>
</Action>
<Action name="options_configure_toolbars">
<icon>configure</icon>
<text>Configure Tool&amp;bars...</text>
......
......@@ -96,8 +96,8 @@ typedef enum ORIENTATION_PREFERENCE {
ORIENTATION_PREFERENCE_PORTRAIT_FLIPPED = 0x8
} ORIENTATION_PREFERENCE;
typedef BOOL WINAPI (*pSetDisplayAutoRotationPreferences_t)(
ORIENTATION_PREFERENCE orientation
);
ORIENTATION_PREFERENCE orientation
);
void resetRotation()
{
QLibrary user32Lib("user32");
......@@ -187,11 +187,15 @@ extern "C" int main(int argc, char **argv)
QString root;
QString language;
{
// Create a temporary application to get the root
QCoreApplication app(argc, argv);
Q_UNUSED(app);
root = KoResourcePaths::getApplicationRoot();
QSettings languageoverride(configPath + QStringLiteral("/klanguageoverridesrc"), QSettings::IniFormat);
languageoverride.beginGroup(QStringLiteral("Language"));
language = languageoverride.value(qAppName(), "").toString();
}
......@@ -212,33 +216,27 @@ extern "C" int main(int argc, char **argv)
// Now that the paths are set, set the language. First check the override from the language
// selection dialog.
{
QSettings languageoverride(configPath + QStringLiteral("/klanguageoverridesrc"), QSettings::IniFormat);
languageoverride.beginGroup(QStringLiteral("Language"));
QString language = languageoverride.value("krita", "").toString();
qDebug() << "Override language:" << language;
qDebug() << "Override language:" << language;
if (!language.isEmpty()) {
KLocalizedString::setLanguages(language.split(":"));
// And override Qt's locale, too
qputenv("LANG", language.split(":").first().toUtf8());
QLocale locale(language.split(":").first());
QLocale::setDefault(locale);
}
if (!language.isEmpty()) {
KLocalizedString::setLanguages(language.split(":"));
// And override Qt's locale, too
qputenv("LANG", language.split(":").first().toUtf8());
QLocale locale(language.split(":").first());
QLocale::setDefault(locale);
}
#ifndef Q_OS_LINUX
else {
// And if there isn't one, check the one set by the system.
QLocale locale = QLocale::system();
if (locale.name() != QStringLiteral("en")) {
qDebug() << "Setting Krita's language to:" << locale;
qputenv("LANG", locale.name().toLatin1());
KLocalizedString::setLanguages(QStringList() << locale.name());
}
else {
// And if there isn't one, check the one set by the system.
QLocale locale = QLocale::system();