Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Krita
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
1
Issues
1
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Scott Petrovic
Krita
Commits
778d5a04
Commit
778d5a04
authored
Jan 13, 2021
by
Halla Rempt
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'master' into rempt/resource_versioning
parents
a8be50e7
c30ca18b
Changes
323
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
323 changed files
with
10310 additions
and
7093 deletions
+10310
-7093
3rdparty/ext_mypaint/0001-Add-cmake-build-system.patch
3rdparty/ext_mypaint/0001-Add-cmake-build-system.patch
+1
-1
3rdparty/ext_qt/0001-Remove-chunk-size-limits.patch
3rdparty/ext_qt/0001-Remove-chunk-size-limits.patch
+42
-0
3rdparty/ext_qt/0055-Android-prevent-out-of-order-events.patch
...rty/ext_qt/0055-Android-prevent-out-of-order-events.patch
+28
-0
3rdparty/ext_qt/CMakeLists.txt
3rdparty/ext_qt/CMakeLists.txt
+5
-0
AUTHORS
AUTHORS
+1
-1
krita/data/aboutdata/developers.txt
krita/data/aboutdata/developers.txt
+1
-1
krita/data/shortcuts/krita_default.shortcuts
krita/data/shortcuts/krita_default.shortcuts
+0
-1
krita/data/shortcuts/paint_tool_sai_compatible.shortcuts
krita/data/shortcuts/paint_tool_sai_compatible.shortcuts
+0
-1
krita/data/shortcuts/photoshop_compatible.shortcuts
krita/data/shortcuts/photoshop_compatible.shortcuts
+0
-1
krita/data/shortcuts/tablet_pro.shortcuts
krita/data/shortcuts/tablet_pro.shortcuts
+0
-1
krita/data/templates/design/.directory
krita/data/templates/design/.directory
+1
-1
krita/integration/CMakeLists.txt
krita/integration/CMakeLists.txt
+2
-1
krita/krita.action
krita/krita.action
+26
-87
krita/krita5.xmlgui
krita/krita5.xmlgui
+0
-1
krita/org.kde.krita.appdata.xml
krita/org.kde.krita.appdata.xml
+13
-7
krita/org.kde.krita.desktop
krita/org.kde.krita.desktop
+4
-4
krita/pics/svg/dark_flip_angle_h.svg
krita/pics/svg/dark_flip_angle_h.svg
+17
-0
krita/pics/svg/dark_flip_angle_hv.svg
krita/pics/svg/dark_flip_angle_hv.svg
+17
-0
krita/pics/svg/dark_flip_angle_v.svg
krita/pics/svg/dark_flip_angle_v.svg
+17
-0
krita/pics/svg/light_flip_angle_h.svg
krita/pics/svg/light_flip_angle_h.svg
+17
-0
krita/pics/svg/light_flip_angle_hv.svg
krita/pics/svg/light_flip_angle_hv.svg
+25
-0
krita/pics/svg/light_flip_angle_v.svg
krita/pics/svg/light_flip_angle_v.svg
+17
-0
krita/pics/svg/svg-icons.qrc
krita/pics/svg/svg-icons.qrc
+6
-0
krita/pics/tools/SVG/16/dark_artistic_text.svg
krita/pics/tools/SVG/16/dark_artistic_text.svg
+15
-15
krita/pics/tools/SVG/16/dark_krita_tool_assistant.svg
krita/pics/tools/SVG/16/dark_krita_tool_assistant.svg
+31
-31
krita/pics/tools/SVG/16/dark_krita_tool_color_fill.svg
krita/pics/tools/SVG/16/dark_krita_tool_color_fill.svg
+8
-11
krita/pics/tools/SVG/16/dark_krita_tool_color_picker.svg
krita/pics/tools/SVG/16/dark_krita_tool_color_picker.svg
+13
-33
krita/pics/tools/SVG/16/dark_krita_tool_line.svg
krita/pics/tools/SVG/16/dark_krita_tool_line.svg
+13
-11
krita/pics/tools/SVG/16/dark_krita_tool_measure.svg
krita/pics/tools/SVG/16/dark_krita_tool_measure.svg
+21
-21
krita/pics/tools/SVG/16/dark_krita_tool_move.svg
krita/pics/tools/SVG/16/dark_krita_tool_move.svg
+12
-12
krita/pics/tools/SVG/16/dark_krita_tool_polygon.svg
krita/pics/tools/SVG/16/dark_krita_tool_polygon.svg
+9
-7
krita/pics/tools/SVG/16/dark_pattern.svg
krita/pics/tools/SVG/16/dark_pattern.svg
+722
-1299
krita/pics/tools/SVG/16/dark_select.svg
krita/pics/tools/SVG/16/dark_select.svg
+13
-11
krita/pics/tools/SVG/16/dark_tool_contiguous_selection.svg
krita/pics/tools/SVG/16/dark_tool_contiguous_selection.svg
+40
-40
krita/pics/tools/SVG/16/dark_tool_elliptical_selection.svg
krita/pics/tools/SVG/16/dark_tool_elliptical_selection.svg
+10
-39
krita/pics/tools/SVG/16/dark_tool_outline_selection.svg
krita/pics/tools/SVG/16/dark_tool_outline_selection.svg
+27
-26
krita/pics/tools/SVG/16/dark_tool_similar_selection.svg
krita/pics/tools/SVG/16/dark_tool_similar_selection.svg
+26
-26
krita/pics/tools/SVG/16/light_artistic_text.svg
krita/pics/tools/SVG/16/light_artistic_text.svg
+17
-22
krita/pics/tools/SVG/16/light_calligraphy.svg
krita/pics/tools/SVG/16/light_calligraphy.svg
+30
-30
krita/pics/tools/SVG/16/light_krita_tool_assistant.svg
krita/pics/tools/SVG/16/light_krita_tool_assistant.svg
+31
-31
krita/pics/tools/SVG/16/light_krita_tool_color_fill.svg
krita/pics/tools/SVG/16/light_krita_tool_color_fill.svg
+11
-14
krita/pics/tools/SVG/16/light_krita_tool_color_picker.svg
krita/pics/tools/SVG/16/light_krita_tool_color_picker.svg
+13
-40
krita/pics/tools/SVG/16/light_krita_tool_line.svg
krita/pics/tools/SVG/16/light_krita_tool_line.svg
+14
-17
krita/pics/tools/SVG/16/light_krita_tool_measure.svg
krita/pics/tools/SVG/16/light_krita_tool_measure.svg
+21
-21
krita/pics/tools/SVG/16/light_krita_tool_move.svg
krita/pics/tools/SVG/16/light_krita_tool_move.svg
+12
-12
krita/pics/tools/SVG/16/light_krita_tool_polygon.svg
krita/pics/tools/SVG/16/light_krita_tool_polygon.svg
+10
-8
krita/pics/tools/SVG/16/light_krita_tool_reference_images.svg
...a/pics/tools/SVG/16/light_krita_tool_reference_images.svg
+29
-29
krita/pics/tools/SVG/16/light_pattern.svg
krita/pics/tools/SVG/16/light_pattern.svg
+677
-1254
krita/pics/tools/SVG/16/light_select.svg
krita/pics/tools/SVG/16/light_select.svg
+13
-12
krita/pics/tools/SVG/16/light_shape_handling.svg
krita/pics/tools/SVG/16/light_shape_handling.svg
+45
-45
krita/pics/tools/SVG/16/light_tool_contiguous_selection.svg
krita/pics/tools/SVG/16/light_tool_contiguous_selection.svg
+10
-10
krita/pics/tools/SVG/16/light_tool_elliptical_selection.svg
krita/pics/tools/SVG/16/light_tool_elliptical_selection.svg
+10
-39
krita/pics/tools/SVG/16/light_tool_magnetic_selection.svg
krita/pics/tools/SVG/16/light_tool_magnetic_selection.svg
+50
-108
krita/pics/tools/SVG/16/light_tool_outline_selection.svg
krita/pics/tools/SVG/16/light_tool_outline_selection.svg
+24
-56
krita/pics/tools/SVG/16/light_tool_similar_selection.svg
krita/pics/tools/SVG/16/light_tool_similar_selection.svg
+26
-26
libs/basicflakes/tools/KoCreatePathTool.cpp
libs/basicflakes/tools/KoCreatePathTool.cpp
+6
-5
libs/basicflakes/tools/KoCreatePathTool.h
libs/basicflakes/tools/KoCreatePathTool.h
+1
-1
libs/basicflakes/tools/KoCreatePathTool_p.h
libs/basicflakes/tools/KoCreatePathTool_p.h
+2
-2
libs/command/kundo2stack.cpp
libs/command/kundo2stack.cpp
+44
-1
libs/command/kundo2stack.h
libs/command/kundo2stack.h
+2
-0
libs/flake/KoToolFactoryBase.cpp
libs/flake/KoToolFactoryBase.cpp
+16
-4
libs/flake/KoToolFactoryBase.h
libs/flake/KoToolFactoryBase.h
+8
-2
libs/flake/KoToolManager.cpp
libs/flake/KoToolManager.cpp
+21
-14
libs/flake/KoToolManager.h
libs/flake/KoToolManager.h
+0
-1
libs/flake/KoToolManager_p.cpp
libs/flake/KoToolManager_p.cpp
+0
-56
libs/flake/KoToolManager_p.h
libs/flake/KoToolManager_p.h
+0
-22
libs/global/KisBezierMesh.cpp
libs/global/KisBezierMesh.cpp
+6
-0
libs/global/KisBezierMesh.h
libs/global/KisBezierMesh.h
+66
-1
libs/global/KisBezierUtils.cpp
libs/global/KisBezierUtils.cpp
+58
-0
libs/global/KisBezierUtils.h
libs/global/KisBezierUtils.h
+31
-0
libs/global/kis_algebra_2d.cpp
libs/global/kis_algebra_2d.cpp
+319
-0
libs/global/kis_algebra_2d.h
libs/global/kis_algebra_2d.h
+78
-0
libs/global/kis_signals_blocker.h
libs/global/kis_signals_blocker.h
+1
-0
libs/image/KisAslStorage.cpp
libs/image/KisAslStorage.cpp
+18
-0
libs/image/KisAslStorage.h
libs/image/KisAslStorage.h
+2
-0
libs/image/KisImageSignals.h
libs/image/KisImageSignals.h
+1
-0
libs/image/KisLodPreferences.h
libs/image/KisLodPreferences.h
+58
-0
libs/image/KisRunnableStrokeJobUtils.h
libs/image/KisRunnableStrokeJobUtils.h
+28
-0
libs/image/KisStrokesQueueMutatedJobInterface.h
libs/image/KisStrokesQueueMutatedJobInterface.h
+2
-0
libs/image/brushengine/kis_paintop_preset.cpp
libs/image/brushengine/kis_paintop_preset.cpp
+4
-0
libs/image/commands/kis_node_property_list_command.cpp
libs/image/commands/kis_node_property_list_command.cpp
+10
-9
libs/image/commands/kis_node_property_list_command.h
libs/image/commands/kis_node_property_list_command.h
+1
-0
libs/image/kis_asl_layer_style_serializer.cpp
libs/image/kis_asl_layer_style_serializer.cpp
+67
-0
libs/image/kis_asl_layer_style_serializer.h
libs/image/kis_asl_layer_style_serializer.h
+4
-0
libs/image/kis_cage_transform_worker.cpp
libs/image/kis_cage_transform_worker.cpp
+17
-18
libs/image/kis_cage_transform_worker.h
libs/image/kis_cage_transform_worker.h
+2
-2
libs/image/kis_image.cc
libs/image/kis_image.cc
+37
-33
libs/image/kis_image.h
libs/image/kis_image.h
+27
-12
libs/image/kis_image_animation_interface.cpp
libs/image/kis_image_animation_interface.cpp
+4
-4
libs/image/kis_image_signal_router.cpp
libs/image/kis_image_signal_router.cpp
+4
-0
libs/image/kis_image_signal_router.h
libs/image/kis_image_signal_router.h
+1
-0
libs/image/kis_liquify_transform_worker.cpp
libs/image/kis_liquify_transform_worker.cpp
+21
-5
libs/image/kis_liquify_transform_worker.h
libs/image/kis_liquify_transform_worker.h
+3
-1
libs/image/kis_lod_transform.h
libs/image/kis_lod_transform.h
+4
-0
libs/image/kis_projection_updates_filter.cpp
libs/image/kis_projection_updates_filter.cpp
+10
-0
libs/image/kis_projection_updates_filter.h
libs/image/kis_projection_updates_filter.h
+2
-0
libs/image/kis_psd_layer_style.cpp
libs/image/kis_psd_layer_style.cpp
+16
-0
libs/image/kis_psd_layer_style.h
libs/image/kis_psd_layer_style.h
+1
-1
libs/image/kis_recalculate_transform_mask_job.cpp
libs/image/kis_recalculate_transform_mask_job.cpp
+5
-2
libs/image/kis_simple_update_queue.cpp
libs/image/kis_simple_update_queue.cpp
+4
-0
libs/image/kis_simple_update_queue.h
libs/image/kis_simple_update_queue.h
+1
-0
libs/image/kis_stroke.cpp
libs/image/kis_stroke.cpp
+6
-0
libs/image/kis_stroke.h
libs/image/kis_stroke.h
+2
-0
libs/image/kis_stroke_job.h
libs/image/kis_stroke_job.h
+2
-1
libs/image/kis_stroke_job_strategy.cpp
libs/image/kis_stroke_job_strategy.cpp
+14
-2
libs/image/kis_stroke_job_strategy.h
libs/image/kis_stroke_job_strategy.h
+4
-0
libs/image/kis_stroke_strategy.cpp
libs/image/kis_stroke_strategy.cpp
+18
-0
libs/image/kis_stroke_strategy.h
libs/image/kis_stroke_strategy.h
+11
-1
libs/image/kis_stroke_strategy_undo_command_based.h
libs/image/kis_stroke_strategy_undo_command_based.h
+4
-1
libs/image/kis_strokes_queue.cpp
libs/image/kis_strokes_queue.cpp
+80
-32
libs/image/kis_strokes_queue.h
libs/image/kis_strokes_queue.h
+3
-2
libs/image/kis_suspend_projection_updates_stroke_strategy.cpp
.../image/kis_suspend_projection_updates_stroke_strategy.cpp
+52
-3
libs/image/kis_sync_lod_cache_stroke_strategy.cpp
libs/image/kis_sync_lod_cache_stroke_strategy.cpp
+51
-93
libs/image/kis_sync_lod_cache_stroke_strategy.h
libs/image/kis_sync_lod_cache_stroke_strategy.h
+6
-5
libs/image/kis_transform_mask.cpp
libs/image/kis_transform_mask.cpp
+67
-5
libs/image/kis_transform_mask.h
libs/image/kis_transform_mask.h
+9
-0
libs/image/kis_update_scheduler.cpp
libs/image/kis_update_scheduler.cpp
+14
-2
libs/image/kis_update_scheduler.h
libs/image/kis_update_scheduler.h
+12
-6
libs/image/kis_warptransform_worker.cc
libs/image/kis_warptransform_worker.cc
+10
-10
libs/image/kis_warptransform_worker.h
libs/image/kis_warptransform_worker.h
+2
-3
libs/image/tests/kis_algebra_2d_test.cpp
libs/image/tests/kis_algebra_2d_test.cpp
+98
-0
libs/image/tests/kis_algebra_2d_test.h
libs/image/tests/kis_algebra_2d_test.h
+7
-0
libs/image/tests/kis_cage_transform_worker_test.cpp
libs/image/tests/kis_cage_transform_worker_test.cpp
+8
-4
libs/image/tests/kis_image_test.cpp
libs/image/tests/kis_image_test.cpp
+20
-4
libs/image/tests/kis_liquify_transform_worker_test.cpp
libs/image/tests/kis_liquify_transform_worker_test.cpp
+9
-3
libs/image/tests/kis_mesh_transform_worker_test.cpp
libs/image/tests/kis_mesh_transform_worker_test.cpp
+18
-0
libs/image/tests/kis_mesh_transform_worker_test.h
libs/image/tests/kis_mesh_transform_worker_test.h
+2
-0
libs/image/tests/kis_strokes_queue_test.cpp
libs/image/tests/kis_strokes_queue_test.cpp
+204
-3
libs/image/tests/kis_strokes_queue_test.h
libs/image/tests/kis_strokes_queue_test.h
+4
-0
libs/image/tests/kis_update_scheduler_test.cpp
libs/image/tests/kis_update_scheduler_test.cpp
+1
-3
libs/image/tests/kis_warp_transform_worker_test.cpp
libs/image/tests/kis_warp_transform_worker_test.cpp
+3
-3
libs/image/tests/scheduler_utils.h
libs/image/tests/scheduler_utils.h
+13
-5
libs/pigment/compositeops/KoCompositeOps.h
libs/pigment/compositeops/KoCompositeOps.h
+3
-13
libs/pigment/compositeops/KoOptimizedCompositeOpAlphaDarken128.h
...gment/compositeops/KoOptimizedCompositeOpAlphaDarken128.h
+6
-5
libs/pigment/compositeops/KoOptimizedCompositeOpOver128.h
libs/pigment/compositeops/KoOptimizedCompositeOpOver128.h
+5
-5
libs/pigment/resources/KoPattern.cpp
libs/pigment/resources/KoPattern.cpp
+4
-1
libs/resources/KisFolderStorage.cpp
libs/resources/KisFolderStorage.cpp
+4
-1
libs/resources/KisResourceCacheDb.cpp
libs/resources/KisResourceCacheDb.cpp
+43
-10
libs/resources/KisResourceLocator.cpp
libs/resources/KisResourceLocator.cpp
+1
-1
libs/resources/KisTagFilterResourceProxyModel.cpp
libs/resources/KisTagFilterResourceProxyModel.cpp
+4
-1
libs/ui/KisApplication.cpp
libs/ui/KisApplication.cpp
+27
-0
libs/ui/KisApplication.h
libs/ui/KisApplication.h
+2
-0
libs/ui/KisDocument.cpp
libs/ui/KisDocument.cpp
+17
-2
libs/ui/KisDocument.h
libs/ui/KisDocument.h
+1
-0
libs/ui/KisGenericGradientEditor.cpp
libs/ui/KisGenericGradientEditor.cpp
+14
-348
libs/ui/KisGenericGradientEditor.h
libs/ui/KisGenericGradientEditor.h
+1
-178
libs/ui/KisMainWindow.cpp
libs/ui/KisMainWindow.cpp
+8
-6
libs/ui/KisMainWindow.h
libs/ui/KisMainWindow.h
+3
-0
libs/ui/KisPaletteEditor.cpp
libs/ui/KisPaletteEditor.cpp
+4
-5
libs/ui/KisViewManager.cpp
libs/ui/KisViewManager.cpp
+2
-4
libs/ui/KisWelcomePageWidget.cpp
libs/ui/KisWelcomePageWidget.cpp
+22
-11
libs/ui/KisWelcomePageWidget.h
libs/ui/KisWelcomePageWidget.h
+11
-0
libs/ui/canvas/kis_canvas2.cpp
libs/ui/canvas/kis_canvas2.cpp
+33
-32
libs/ui/canvas/kis_canvas2.h
libs/ui/canvas/kis_canvas2.h
+2
-2
libs/ui/canvas/kis_canvas_controller.cpp
libs/ui/canvas/kis_canvas_controller.cpp
+3
-3
libs/ui/dialogs/kis_dlg_layer_style.cpp
libs/ui/dialogs/kis_dlg_layer_style.cpp
+32
-16
libs/ui/dialogs/kis_dlg_layer_style.h
libs/ui/dialogs/kis_dlg_layer_style.h
+2
-2
libs/ui/dialogs/kis_dlg_preferences.cc
libs/ui/dialogs/kis_dlg_preferences.cc
+35
-0
libs/ui/forms/KisWelcomePage.ui
libs/ui/forms/KisWelcomePage.ui
+25
-8
libs/ui/forms/wdgGamutMaskToolbar.ui
libs/ui/forms/wdgGamutMaskToolbar.ui
+18
-5
libs/ui/forms/wdggeometryoptions.ui
libs/ui/forms/wdggeometryoptions.ui
+18
-12
libs/ui/forms/wdgperformancesettings.ui
libs/ui/forms/wdgperformancesettings.ui
+80
-0
libs/ui/kis_config.cc
libs/ui/kis_config.cc
+3
-3
libs/ui/kis_control_frame.cpp
libs/ui/kis_control_frame.cpp
+4
-1
libs/ui/kis_file_layer.cpp
libs/ui/kis_file_layer.cpp
+0
-1
libs/ui/kis_filter_manager.cc
libs/ui/kis_filter_manager.cc
+25
-3
libs/ui/kis_layer_manager.cc
libs/ui/kis_layer_manager.cc
+2
-33
libs/ui/kis_layer_manager.h
libs/ui/kis_layer_manager.h
+0
-1
libs/ui/kis_mimedata.cpp
libs/ui/kis_mimedata.cpp
+10
-3
libs/ui/kis_node_manager.cpp
libs/ui/kis_node_manager.cpp
+4
-8
libs/ui/kis_png_converter.cpp
libs/ui/kis_png_converter.cpp
+14
-0
libs/ui/kis_statusbar.cc
libs/ui/kis_statusbar.cc
+40
-16
libs/ui/kis_statusbar.h
libs/ui/kis_statusbar.h
+4
-1
libs/ui/layerstyles/wdgKisLayerStyleAngleSelector.ui
libs/ui/layerstyles/wdgKisLayerStyleAngleSelector.ui
+21
-48
libs/ui/layerstyles/wdgdropshadow.ui
libs/ui/layerstyles/wdgdropshadow.ui
+72
-68
libs/ui/tests/freehand_stroke_test.cpp
libs/ui/tests/freehand_stroke_test.cpp
+1
-1
libs/ui/tool/kis_tool_paint.cc
libs/ui/tool/kis_tool_paint.cc
+1
-1
libs/ui/tool/kis_tool_shape.cc
libs/ui/tool/kis_tool_shape.cc
+5
-6
libs/ui/tool/strokes/kis_filter_stroke_strategy.cpp
libs/ui/tool/strokes/kis_filter_stroke_strategy.cpp
+3
-0
libs/ui/tool/strokes/kis_filter_stroke_strategy.h
libs/ui/tool/strokes/kis_filter_stroke_strategy.h
+27
-0
libs/ui/utils/KisFileIconCreator.cpp
libs/ui/utils/KisFileIconCreator.cpp
+47
-13
libs/ui/utils/KisFileIconCreator.h
libs/ui/utils/KisFileIconCreator.h
+4
-9
libs/ui/widgets/KisGamutMaskToolbar.cpp
libs/ui/widgets/KisGamutMaskToolbar.cpp
+12
-14
libs/ui/widgets/KisGamutMaskToolbar.h
libs/ui/widgets/KisGamutMaskToolbar.h
+1
-1
libs/ui/widgets/KisLayerStyleAngleSelector.cpp
libs/ui/widgets/KisLayerStyleAngleSelector.cpp
+14
-35
libs/ui/widgets/KisLayerStyleAngleSelector.h
libs/ui/widgets/KisLayerStyleAngleSelector.h
+4
-13
libs/ui/widgets/kis_cmb_gradient.cpp
libs/ui/widgets/kis_cmb_gradient.cpp
+1
-0
libs/ui/widgets/kis_gradient_chooser.cc
libs/ui/widgets/kis_gradient_chooser.cc
+464
-70
libs/ui/widgets/kis_gradient_chooser.h
libs/ui/widgets/kis_gradient_chooser.h
+162
-46
libs/ui/widgets/kis_paintop_presets_popup.cpp
libs/ui/widgets/kis_paintop_presets_popup.cpp
+10
-13
libs/ui/widgets/kis_preset_chooser.cpp
libs/ui/widgets/kis_preset_chooser.cpp
+6
-4
libs/ui/widgets/kis_utility_title_bar.cpp
libs/ui/widgets/kis_utility_title_bar.cpp
+5
-2
libs/widgets/CMakeLists.txt
libs/widgets/CMakeLists.txt
+3
-0
libs/widgets/KisAngleGauge.cpp
libs/widgets/KisAngleGauge.cpp
+294
-0
libs/widgets/KisAngleGauge.h
libs/widgets/KisAngleGauge.h
+124
-0
libs/widgets/KisAngleSelector.cpp
libs/widgets/KisAngleSelector.cpp
+579
-0
libs/widgets/KisAngleSelector.h
libs/widgets/KisAngleSelector.h
+351
-0
libs/widgets/KisColorSelectorConfiguration.h
libs/widgets/KisColorSelectorConfiguration.h
+3
-2
libs/widgets/KisPaletteModel.cpp
libs/widgets/KisPaletteModel.cpp
+1
-1
libs/widgets/KisVisualColorSelector.cpp
libs/widgets/KisVisualColorSelector.cpp
+1
-0
libs/widgets/KoDockWidgetTitleBar.cpp
libs/widgets/KoDockWidgetTitleBar.cpp
+5
-21
libs/widgets/KoToolBoxDocker.cpp
libs/widgets/KoToolBoxDocker.cpp
+4
-12
libs/widgets/KoToolDocker.cpp
libs/widgets/KoToolDocker.cpp
+0
-20
libs/widgets/KoToolDocker.h
libs/widgets/KoToolDocker.h
+0
-1
libs/widgetutils/CMakeLists.txt
libs/widgetutils/CMakeLists.txt
+1
-0
libs/widgetutils/KisPreviewFileDialog.cpp
libs/widgetutils/KisPreviewFileDialog.cpp
+113
-0
libs/widgetutils/KisPreviewFileDialog.h
libs/widgetutils/KisPreviewFileDialog.h
+66
-0
libs/widgetutils/KoFileDialog.cpp
libs/widgetutils/KoFileDialog.cpp
+4
-2
packaging/macos/osxdeploy.sh
packaging/macos/osxdeploy.sh
+3
-2
plugins/dockers/advancedcolorselector/kis_color_selector.cpp
plugins/dockers/advancedcolorselector/kis_color_selector.cpp
+5
-1
plugins/dockers/advancedcolorselector/kis_color_selector_combo_box.cpp
...rs/advancedcolorselector/kis_color_selector_combo_box.cpp
+6
-11
plugins/dockers/advancedcolorselector/kis_color_selector_component.cpp
...rs/advancedcolorselector/kis_color_selector_component.cpp
+27
-26
plugins/dockers/advancedcolorselector/kis_color_selector_ring.cpp
...dockers/advancedcolorselector/kis_color_selector_ring.cpp
+20
-2
plugins/dockers/advancedcolorselector/kis_color_selector_ring.h
...s/dockers/advancedcolorselector/kis_color_selector_ring.h
+5
-0
plugins/dockers/advancedcolorselector/kis_color_selector_simple.cpp
...ckers/advancedcolorselector/kis_color_selector_simple.cpp
+12
-5
plugins/dockers/advancedcolorselector/kis_color_selector_wheel.cpp
...ockers/advancedcolorselector/kis_color_selector_wheel.cpp
+11
-8
plugins/dockers/advancedcolorselector/kis_common_colors.cpp
plugins/dockers/advancedcolorselector/kis_common_colors.cpp
+1
-1
plugins/dockers/animation/KisAnimCurvesModel.cpp
plugins/dockers/animation/KisAnimCurvesModel.cpp
+26
-4
plugins/dockers/animation/KisAnimCurvesView.cpp
plugins/dockers/animation/KisAnimCurvesView.cpp
+7
-7
plugins/dockers/animation/KisAnimTimelineFramesView.cpp
plugins/dockers/animation/KisAnimTimelineFramesView.cpp
+37
-1
plugins/dockers/overview/overviewdocker_dock.cpp
plugins/dockers/overview/overviewdocker_dock.cpp
+29
-23
plugins/dockers/overview/overviewdocker_dock.h
plugins/dockers/overview/overviewdocker_dock.h
+3
-2
plugins/dockers/recorder/recorder_writer.cpp
plugins/dockers/recorder/recorder_writer.cpp
+1
-1
plugins/dockers/smallcolorselector/kis_small_color_widget.cc
plugins/dockers/smallcolorselector/kis_small_color_widget.cc
+2
-3
plugins/dockers/storyboarddocker/StoryboardModel.cpp
plugins/dockers/storyboarddocker/StoryboardModel.cpp
+1
-1
plugins/extensions/clonesarray/dlg_clonesarray.cpp
plugins/extensions/clonesarray/dlg_clonesarray.cpp
+11
-6
plugins/extensions/clonesarray/wdg_clonesarray.ui
plugins/extensions/clonesarray/wdg_clonesarray.ui
+35
-51
plugins/extensions/pykrita/kritarunner/CMakeLists.txt
plugins/extensions/pykrita/kritarunner/CMakeLists.txt
+2
-10
plugins/extensions/pykrita/plugin/CMakeLists.txt
plugins/extensions/pykrita/plugin/CMakeLists.txt
+10
-0
plugins/extensions/resourcemanager/dlg_bundle_manager.cpp
plugins/extensions/resourcemanager/dlg_bundle_manager.cpp
+1
-0
plugins/extensions/rotateimage/dlg_rotateimage.cc
plugins/extensions/rotateimage/dlg_rotateimage.cc
+21
-5
plugins/extensions/rotateimage/dlg_rotateimage.h
plugins/extensions/rotateimage/dlg_rotateimage.h
+2
-0
plugins/extensions/rotateimage/wdg_rotateimage.ui
plugins/extensions/rotateimage/wdg_rotateimage.ui
+23
-16
plugins/extensions/shearimage/dlg_shearimage.cc
plugins/extensions/shearimage/dlg_shearimage.cc
+13
-4
plugins/extensions/shearimage/wdg_shearimage.ui
plugins/extensions/shearimage/wdg_shearimage.ui
+13
-38
plugins/filters/blur/kis_wdg_blur.cpp
plugins/filters/blur/kis_wdg_blur.cpp
+5
-3
plugins/filters/blur/kis_wdg_lens_blur.cpp
plugins/filters/blur/kis_wdg_lens_blur.cpp
+6
-3
plugins/filters/blur/kis_wdg_motion_blur.cpp
plugins/filters/blur/kis_wdg_motion_blur.cpp
+5
-33
plugins/filters/blur/kis_wdg_motion_blur.h
plugins/filters/blur/kis_wdg_motion_blur.h
+1
-3
plugins/filters/blur/wdg_lens_blur.ui
plugins/filters/blur/wdg_lens_blur.ui
+15
-38
plugins/filters/blur/wdg_motion_blur.ui
plugins/filters/blur/wdg_motion_blur.ui
+14
-99
plugins/filters/blur/wdgblur.ui
plugins/filters/blur/wdgblur.ui
+76
-77
plugins/filters/gradientmap/KisGradientMapFilterDitherCachedGradient.cpp
.../gradientmap/KisGradientMapFilterDitherCachedGradient.cpp
+2
-2
plugins/filters/gradientmap/KisGradientMapFilterDitherCachedGradient.h
...rs/gradientmap/KisGradientMapFilterDitherCachedGradient.h
+2
-2
plugins/filters/gradientmap/KisGradientMapFilterNearestCachedGradient.cpp
...gradientmap/KisGradientMapFilterNearestCachedGradient.cpp
+2
-2
plugins/filters/gradientmap/KisGradientMapFilterNearestCachedGradient.h
...s/gradientmap/KisGradientMapFilterNearestCachedGradient.h
+2
-2
plugins/filters/gradientmap/KisGradientMapFilterPlugin.cpp
plugins/filters/gradientmap/KisGradientMapFilterPlugin.cpp
+2
-2
plugins/filters/gradientmap/KisGradientMapFilterPlugin.h
plugins/filters/gradientmap/KisGradientMapFilterPlugin.h
+2
-2
plugins/filters/phongbumpmap/kis_phong_bumpmap_config_widget.cpp
.../filters/phongbumpmap/kis_phong_bumpmap_config_widget.cpp
+24
-34
plugins/filters/phongbumpmap/kis_phong_bumpmap_config_widget.h
...ns/filters/phongbumpmap/kis_phong_bumpmap_config_widget.h
+31
-0
plugins/filters/phongbumpmap/wdgphongbumpmap.ui
plugins/filters/phongbumpmap/wdgphongbumpmap.ui
+149
-496
plugins/filters/wavefilter/wavefilter.cpp
plugins/filters/wavefilter/wavefilter.cpp
+1
-1
plugins/flake/pathshapes/ellipse/EllipseShapeConfigWidget.cpp
...ins/flake/pathshapes/ellipse/EllipseShapeConfigWidget.cpp
+11
-13
plugins/flake/pathshapes/ellipse/EllipseShapeConfigWidget.ui
plugins/flake/pathshapes/ellipse/EllipseShapeConfigWidget.ui
+18
-31
plugins/generators/gradient/KisGradientGeneratorConfigWidget.cpp
.../generators/gradient/KisGradientGeneratorConfigWidget.cpp
+3
-6
plugins/generators/gradient/KisGradientGeneratorConfigWidget.ui
...s/generators/gradient/KisGradientGeneratorConfigWidget.ui
+65
-49
plugins/generators/pattern/kis_wdg_pattern.cpp
plugins/generators/pattern/kis_wdg_pattern.cpp
+10
-22
plugins/generators/pattern/wdgpatternoptions.ui
plugins/generators/pattern/wdgpatternoptions.ui
+319
-198
plugins/generators/screentone/KisScreentoneConfigWidget.cpp
plugins/generators/screentone/KisScreentoneConfigWidget.cpp
+3
-6
plugins/generators/screentone/KisScreentoneConfigWidget.ui
plugins/generators/screentone/KisScreentoneConfigWidget.ui
+51
-33
plugins/impex/kra/kra_converter.cpp
plugins/impex/kra/kra_converter.cpp
+4
-0
plugins/impex/libkra/kis_kra_loader.cpp
plugins/impex/libkra/kis_kra_loader.cpp
+28
-43
plugins/impex/libkra/kis_kra_saver.cpp
plugins/impex/libkra/kis_kra_saver.cpp
+6
-10
plugins/impex/libkra/kis_kra_tags.h
plugins/impex/libkra/kis_kra_tags.h
+1
-1
plugins/paintops/deform/kis_brush_size_option.cpp
plugins/paintops/deform/kis_brush_size_option.cpp
+4
-6
plugins/paintops/hatching/kis_hatching_options.cpp
plugins/paintops/hatching/kis_hatching_options.cpp
+8
-7
plugins/paintops/hatching/wdghatchingoptions.ui
plugins/paintops/hatching/wdghatchingoptions.ui
+55
-35
plugins/paintops/libpaintop/forms/wdgBrushSizeOptions.ui
plugins/paintops/libpaintop/forms/wdgBrushSizeOptions.ui
+99
-64
plugins/paintops/libpaintop/forms/wdgautobrush.ui
plugins/paintops/libpaintop/forms/wdgautobrush.ui
+61
-41
plugins/paintops/libpaintop/forms/wdgpredefinedbrushchooser.ui
...ns/paintops/libpaintop/forms/wdgpredefinedbrushchooser.ui
+52
-33
plugins/paintops/libpaintop/kis_auto_brush_widget.cpp
plugins/paintops/libpaintop/kis_auto_brush_widget.cpp
+5
-7
plugins/paintops/libpaintop/kis_brush_chooser.cpp
plugins/paintops/libpaintop/kis_brush_chooser.cpp
+4
-6
plugins/paintops/spray/kis_spray_shape_dynamics.cpp
plugins/paintops/spray/kis_spray_shape_dynamics.cpp
+6
-7
plugins/paintops/spray/kis_sprayop_option.cpp
plugins/paintops/spray/kis_sprayop_option.cpp
+5
-6
plugins/paintops/spray/wdgshapedynamicsoptions.ui
plugins/paintops/spray/wdgshapedynamicsoptions.ui
+38
-18
plugins/paintops/spray/wdgsprayoptions.ui
plugins/paintops/spray/wdgsprayoptions.ui
+59
-40
plugins/python/batch_exporter/kritapykrita_batch_exporter.desktop
...python/batch_exporter/kritapykrita_batch_exporter.desktop
+2
-0
plugins/python/channels2layers/kritapykrita_channels2layers.desktop
...thon/channels2layers/kritapykrita_channels2layers.desktop
+2
-0
plugins/python/mixer_slider_docker/kritapykrita_mixer_slider_docker.desktop
...er_slider_docker/kritapykrita_mixer_slider_docker.desktop
+2
-0
plugins/python/photobash_images/kritapykrita_photobash_images.desktop
...on/photobash_images/kritapykrita_photobash_images.desktop
+2
-0
plugins/tools/basictools/kis_tool_fill.cc
plugins/tools/basictools/kis_tool_fill.cc
+11
-12
plugins/tools/basictools/kis_tool_fill.h
plugins/tools/basictools/kis_tool_fill.h
+2
-1
plugins/tools/basictools/kis_tool_move.cc
plugins/tools/basictools/kis_tool_move.cc
+6
-0
plugins/tools/basictools/kis_tool_multihand.cpp
plugins/tools/basictools/kis_tool_multihand.cpp
+6
-5
plugins/tools/basictools/tests/move_selection_stroke_test.cpp
...ins/tools/basictools/tests/move_selection_stroke_test.cpp
+1
-1
plugins/tools/basictools/wdgmultihandtool.ui
plugins/tools/basictools/wdgmultihandtool.ui
+39
-35
plugins/tools/karbonplugins/tools/CalligraphyTool/KarbonCalligraphyOptionWidget.cpp
...s/tools/CalligraphyTool/KarbonCalligraphyOptionWidget.cpp
+17
-10
plugins/tools/karbonplugins/tools/CalligraphyTool/KarbonCalligraphyOptionWidget.h
...ins/tools/CalligraphyTool/KarbonCalligraphyOptionWidget.h
+4
-2
plugins/tools/svgtexttool/SvgTextToolFactory.cpp
plugins/tools/svgtexttool/SvgTextToolFactory.cpp
+0
-1
plugins/tools/tool_crop/kis_tool_crop.cc
plugins/tools/tool_crop/kis_tool_crop.cc
+23
-26
plugins/tools/tool_crop/kis_tool_crop.h
plugins/tools/tool_crop/kis_tool_crop.h
+13
-19
plugins/tools/tool_crop/kistoolcropconfigwidget.cpp
plugins/tools/tool_crop/kistoolcropconfigwidget.cpp
+9
-9
plugins/tools/tool_crop/kistoolcropconfigwidget.h
plugins/tools/tool_crop/kistoolcropconfigwidget.h
+5
-5
plugins/tools/tool_crop/wdg_tool_crop.ui
plugins/tools/tool_crop/wdg_tool_crop.ui
+8
-0
plugins/tools/tool_dyna/kis_tool_dyna.cpp
plugins/tools/tool_dyna/kis_tool_dyna.cpp
+10
-8
plugins/tools/tool_dyna/kis_tool_dyna.h
plugins/tools/tool_dyna/kis_tool_dyna.h
+2
-2
plugins/tools/tool_transform2/CMakeLists.txt
plugins/tools/tool_transform2/CMakeLists.txt
+1
-0
plugins/tools/tool_transform2/kis_free_transform_strategy.cpp
...ins/tools/tool_transform2/kis_free_transform_strategy.cpp
+1
-0
plugins/tools/tool_transform2/kis_free_transform_strategy.h
plugins/tools/tool_transform2/kis_free_transform_strategy.h
+1
-0
plugins/tools/tool_transform2/kis_liquify_transform_strategy.cpp
.../tools/tool_transform2/kis_liquify_transform_strategy.cpp
+1
-0
plugins/tools/tool_transform2/kis_liquify_transform_strategy.h
...ns/tools/tool_transform2/kis_liquify_transform_strategy.h
+1
-0
plugins/tools/tool_transform2/kis_mesh_transform_strategy.cpp
...ins/tools/tool_transform2/kis_mesh_transform_strategy.cpp
+105
-16
plugins/tools/tool_transform2/kis_mesh_transform_strategy.h
plugins/tools/tool_transform2/kis_mesh_transform_strategy.h
+1
-0
plugins/tools/tool_transform2/kis_modify_transform_mask_command.cpp
...ols/tool_transform2/kis_modify_transform_mask_command.cpp
+9
-4
plugins/tools/tool_transform2/kis_modify_transform_mask_command.h
...tools/tool_transform2/kis_modify_transform_mask_command.h
+2
-1
plugins/tools/tool_transform2/kis_perspective_transform_strategy.cpp
...ls/tool_transform2/kis_perspective_transform_strategy.cpp
+1
-0
plugins/tools/tool_transform2/kis_perspective_transform_strategy.h
...ools/tool_transform2/kis_perspective_transform_strategy.h
+1
-0
plugins/tools/tool_transform2/kis_tool_transform.cc
plugins/tools/tool_transform2/kis_tool_transform.cc
+73
-12
plugins/tools/tool_transform2/kis_tool_transform.h
plugins/tools/tool_transform2/kis_tool_transform.h
+10
-0
plugins/tools/tool_transform2/kis_tool_transform_config_widget.cpp
...ools/tool_transform2/kis_tool_transform_config_widget.cpp
+15
-0
plugins/tools/tool_transform2/kis_tool_transform_config_widget.h
.../tools/tool_transform2/kis_tool_transform_config_widget.h
+1
-1
plugins/tools/tool_transform2/kis_transform_mask_adapter.cpp
plugins/tools/tool_transform2/kis_transform_mask_adapter.cpp
+2
-2
plugins/tools/tool_transform2/kis_transform_utils.cpp
plugins/tools/tool_transform2/kis_transform_utils.cpp
+225
-21
plugins/tools/tool_transform2/kis_transform_utils.h
plugins/tools/tool_transform2/kis_transform_utils.h
+34
-0
plugins/tools/tool_transform2/kis_warp_transform_strategy.cpp
...ins/tools/tool_transform2/kis_warp_transform_strategy.cpp
+1
-0
plugins/tools/tool_transform2/kis_warp_transform_strategy.h
plugins/tools/tool_transform2/kis_warp_transform_strategy.h
+1
-0
plugins/tools/tool_transform2/strokes/inplace_transform_stroke_strategy.cpp
..._transform2/strokes/inplace_transform_stroke_strategy.cpp
+900
-0
plugins/tools/tool_transform2/strokes/inplace_transform_stroke_strategy.h
...ol_transform2/strokes/inplace_transform_stroke_strategy.h
+149
-0
plugins/tools/tool_transform2/strokes/transform_stroke_strategy.cpp
...ols/tool_transform2/strokes/transform_stroke_strategy.cpp
+16
-170
plugins/tools/tool_transform2/strokes/transform_stroke_strategy.h
...tools/tool_transform2/strokes/transform_stroke_strategy.h
+0
-25
plugins/tools/tool_transform2/tool_transform_args.cc
plugins/tools/tool_transform2/tool_transform_args.cc
+45
-0
plugins/tools/tool_transform2/tool_transform_args.h
plugins/tools/tool_transform2/tool_transform_args.h
+6
-0
plugins/tools/tool_transform2/wdg_tool_transform.ui
plugins/tools/tool_transform2/wdg_tool_transform.ui
+8
-1
No files found.
3rdparty/ext_mypaint/0001-Add-cmake-build-system.patch
View file @
778d5a04
...
...
@@ -78,7 +78,7 @@ index 0000000..d93309d
+
+
+add_library(mypaint SHARED ${mypaint_SOURCES} ${mypaint_HEADERS})
+target_link_libraries(mypaint ${JSONC_LIBRARIES})
+target_link_libraries(mypaint
PRIVATE
${JSONC_LIBRARIES})
+set_property(TARGET mypaint PROPERTY C_STANDARD 11)
+install(TARGETS mypaint RUNTIME DESTINATION bin LIBRARY DESTINATION lib ARCHIVE DESTINATION lib)
+install(FILES ${mypaint_HEADERS} DESTINATION include)
...
...
3rdparty/ext_qt/0001-Remove-chunk-size-limits.patch
0 → 100644
View file @
778d5a04
From de0c4dab234f8daebdea308be48f4d9f443e5b3a Mon Sep 17 00:00:00 2001
From: Halla Rempt <halla@valdyas.org>
Date: Wed, 30 Dec 2020 10:54:08 +0100
Subject: [PATCH] Remove chunk size limits
---
src/gui/image/qpnghandler.cpp | 12 ++++++++++++
1 file changed, 12 insertions(+)
diff --git a/src/gui/image/qpnghandler.cpp b/src/gui/image/qpnghandler.cpp
index e7e998ef..751ae4f0 100644
--- a/src/gui/image/qpnghandler.cpp
+++ b/src/gui/image/qpnghandler.cpp
@@ -542,6 +542,12 @@
bool QPngHandlerPrivate::readPngHeader()
png_set_error_fn(png_ptr, 0, 0, qt_png_warning);
+#ifdef PNG_SET_USER_LIMITS_SUPPORTED
+ /* Remove the user limits, if any */
+ png_set_chunk_cache_max(png_ptr, 0);
+ png_set_chunk_malloc_max(png_ptr, 0);
+#endif
+
#if defined(PNG_SET_OPTION_SUPPORTED) && defined(PNG_MAXIMUM_INFLATE_WINDOW)
// Trade off a little bit of memory for better compatibility with existing images
// Ref. "invalid distance too far back" explanation in libpng-manual.txt
@@ -831,6 +837,12 @@
bool QPNGImageWriter::writeImage(const QImage& image, volatile int compression_i
png_set_error_fn(png_ptr, 0, 0, qt_png_warning);
+#ifdef PNG_SET_USER_LIMITS_SUPPORTED
+ /* Remove the user limits, if any */
+ png_set_chunk_cache_max(png_ptr, 0);
+ png_set_chunk_malloc_max(png_ptr, 0);
+#endif
+
info_ptr = png_create_info_struct(png_ptr);
if (!info_ptr) {
png_destroy_write_struct(&png_ptr, 0);
--
2.25.1
3rdparty/ext_qt/0055-Android-prevent-out-of-order-events.patch
0 → 100644
View file @
778d5a04
From d3b15422158bcc39e8ad4cac44c4efbe413652e9 Mon Sep 17 00:00:00 2001
From: Sharaf Zaman <sharafzaz121@gmail.com>
Date: Wed, 6 Jan 2021 12:12:09 +0000
Subject: [PATCH] Android: prevent out-of-order events
QPlatformWindow::setVisible() flushes internal event queue which then
sends events to widgets out-of-order fashion, which can make some
widgets hidden thus freezing the entire app.
---
src/plugins/platforms/android/qandroidplatformwindow.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/plugins/platforms/android/qandroidplatformwindow.cpp b/src/plugins/platforms/android/qandroidplatformwindow.cpp
index c095f51fa3..f9972ee4e1 100644
--- a/src/plugins/platforms/android/qandroidplatformwindow.cpp
+++ b/src/plugins/platforms/android/qandroidplatformwindow.cpp
@@ -94,7 +94,7 @@
void QAndroidPlatformWindow::setVisible(bool visible)
QRect availableGeometry = screen()->availableGeometry();
if (geometry().width() > 0 && geometry().height() > 0 && availableGeometry.width() > 0 && availableGeometry.height() > 0)
- QPlatformWindow::setVisible(visible);
+ QWindowSystemInterface::handleExposeEvent(window(), QRect(QPoint(), geometry().size()));
}
void QAndroidPlatformWindow::setWindowState(Qt::WindowStates state)
--
2.29.2
3rdparty/ext_qt/CMakeLists.txt
View file @
778d5a04
...
...
@@ -81,6 +81,7 @@ if (WIN32)
COMMAND
${
PATCH_COMMAND
}
-p1 -d qtbase -i
${
CMAKE_CURRENT_SOURCE_DIR
}
/0100-Fix-artifacts-when-rendering-multisubpath-dashed-QPa.patch
COMMAND
${
PATCH_COMMAND
}
-p1 -d qtbase -i
${
CMAKE_CURRENT_SOURCE_DIR
}
/0101-Don-t-eat-ShortcutOverride-events-when-there-is-a-pa.patch
COMMAND
${
PATCH_COMMAND
}
-p1 -d qtbase -i
${
CMAKE_CURRENT_SOURCE_DIR
}
/0110-Pass-proper-dirty-rect-in-paint-event-to-QOpenGLWidg.patch
COMMAND
${
PATCH_COMMAND
}
-p1 -d qtbase -i
${
CMAKE_CURRENT_SOURCE_DIR
}
/0001-Remove-chunk-size-limits.patch
# COMMAND ${PATCH_COMMAND} -p1 -d qtbase -i ${CMAKE_CURRENT_SOURCE_DIR}/0031-Compute-logical-DPI-on-a-per-screen-basis.patch
# COMMAND ${PATCH_COMMAND} -p1 -d qtbase -i ${CMAKE_CURRENT_SOURCE_DIR}/0032-Update-Dpi-and-scale-factor-computation.patch
# COMMAND ${PATCH_COMMAND} -p1 -d qtbase -i ${CMAKE_CURRENT_SOURCE_DIR}/0033-Move-QT_FONT_DPI-to-cross-platform-code.patch
...
...
@@ -101,6 +102,7 @@ if (WIN32)
CONFIGURE_COMMAND <SOURCE_DIR>/configure.bat
${
_QT_conf
}
BUILD_COMMAND mingw32-make -j
${
SUBMAKE_JOBS
}
INSTALL_COMMAND mingw32-make -j
${
SUBMAKE_JOBS
}
install
UPDATE_COMMAND
""
# Use a short name to reduce the chance of exceeding path length limit
...
...
@@ -143,9 +145,11 @@ elseif (ANDROID)
COMMAND
${
PATCH_COMMAND
}
-p1 -d qtbase -i
${
CMAKE_CURRENT_SOURCE_DIR
}
/0052-Android-Move-events-handling-to-QtLayout.patch
COMMAND
${
PATCH_COMMAND
}
-p1 -d qtbase -i
${
CMAKE_CURRENT_SOURCE_DIR
}
/0053-Android-Use-processOpenModeFlags-to-get-right-OpenMo.patch
COMMAND
${
PATCH_COMMAND
}
-p1 -d qtbase -i
${
CMAKE_CURRENT_SOURCE_DIR
}
/0054-Android-use-EXTRA_INITIAL_URI-as-the-defaultDir.patch
COMMAND
${
PATCH_COMMAND
}
-p1 -d qtbase -i
${
CMAKE_CURRENT_SOURCE_DIR
}
/0055-Android-prevent-out-of-order-events.patch
COMMAND
${
PATCH_COMMAND
}
-p1 -d qtbase -i
${
CMAKE_CURRENT_SOURCE_DIR
}
/0105-Android-Don-t-hide-Menubar-even-if-MenuKey-is-presen.patch
COMMAND
${
PATCH_COMMAND
}
-p1 -d qtbase -i
${
CMAKE_CURRENT_SOURCE_DIR
}
/106-Android-don-t-use-getExternalStorageDirectory-and-ge.patch
COMMAND
${
PATCH_COMMAND
}
-p1 -d qtbase -i
${
CMAKE_CURRENT_SOURCE_DIR
}
/0001-Remove-chunk-size-limits.patch
CONFIGURE_COMMAND <SOURCE_DIR>/configure -prefix
${
EXTPREFIX_qt
}
-opensource -confirm-license -verbose -nomake examples -nomake tests -nomake tools -skip qt3d -skip qtactiveqt -skip qtcanvas3d -skip qtconnectivity -skip qtgraphicaleffects -skip qtlocation -skip qtwayland -skip qtwebchannel -skip qtwebengine -skip qtwebsockets -skip qtwebview -skip qtserialport -skip qtdatavis3d -skip qtvirtualkeyboard -skip qtspeech -skip qtsensors -skip qtgamepad -skip qtscxml -skip qtremoteobjects -skip qtxmlpatterns -skip qtnetworkauth -skip qtcharts -skip qtdatavis3d -skip qtgamepad -skip qtpurchasing -skip qtscxml -skip qtserialbus -skip qtspeech -skip qtvirtualkeyboard -android-sdk
${
ANDROID_SDK_ROOT
}
-android-ndk
${
CMAKE_ANDROID_NDK
}
-android-arch
${
ANDROID_ABI
}
-xplatform android-clang -android-ndk-platform android-23 -make libs -qt-sqlite
...
...
@@ -281,6 +285,7 @@ else( APPLE )
COMMAND
${
PATCH_COMMAND
}
-p1 -d qtbase -i
${
CMAKE_CURRENT_SOURCE_DIR
}
/0100-Fix-artifacts-when-rendering-multisubpath-dashed-QPa.patch
COMMAND
${
PATCH_COMMAND
}
-p1 -d qtbase -i
${
CMAKE_CURRENT_SOURCE_DIR
}
/0101-Don-t-eat-ShortcutOverride-events-when-there-is-a-pa.patch
COMMAND
${
PATCH_COMMAND
}
-p1 -d qtbase -i
${
CMAKE_CURRENT_SOURCE_DIR
}
/0110-Pass-proper-dirty-rect-in-paint-event-to-QOpenGLWidg.patch
COMMAND
${
PATCH_COMMAND
}
-p1 -d qtbase -i
${
CMAKE_CURRENT_SOURCE_DIR
}
/0001-Remove-chunk-size-limits.patch
#COMMAND ${PATCH_COMMAND} -p1 -b -d <SOURCE_DIR>/qtbase/mkspecs/features/mac -i ${CMAKE_CURRENT_SOURCE_DIR}/mac-default.patch
)
...
...
AUTHORS
View file @
778d5a04
See: ui/kis_aboutboxdata.h
Current maintainer:
Boudewijn Rempt <boud
@valdyas.org>
Current maintainer:
Halla Rempt <halla
@valdyas.org>
krita/data/aboutdata/developers.txt
View file @
778d5a04
Boudewijn
Rempt
Halla
Rempt
Aaron J. Seigo
Adam Celarek
Adam Pigg
...
...
krita/data/shortcuts/krita_default.shortcuts
View file @
778d5a04
...
...
@@ -191,7 +191,6 @@ previous_favorite_preset=.
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
...
...
krita/data/shortcuts/paint_tool_sai_compatible.shortcuts
View file @
778d5a04
...
...
@@ -302,7 +302,6 @@ previous_favorite_preset=.
previous_frame=none
previous_keyframe=none
previous_preset=/
rasterize_layer=none
Recording_Start_Recording_Macro=none
Recording_Stop_Recording_Macro=none
ReferencesTool=none
...
...
krita/data/shortcuts/photoshop_compatible.shortcuts
View file @
778d5a04
...
...
@@ -302,7 +302,6 @@ previous_favorite_preset=.
previous_frame=none
previous_keyframe=none
previous_preset=/
rasterize_layer=none
Recording_Start_Recording_Macro=none
Recording_Stop_Recording_Macro=none
ReferencesTool=none
...
...
krita/data/shortcuts/tablet_pro.shortcuts
View file @
778d5a04
...
...
@@ -319,7 +319,6 @@ previous_frame=none
previous_keyframe=none
previous_preset=/
quick_ungroup=Ctrl+Alt+G
rasterize_layer=none
Recording_Start_Recording_Macro=none
Recording_Stop_Recording_Macro=none
ReferencesTool=none
...
...
krita/data/templates/design/.directory
View file @
778d5a04
...
...
@@ -27,7 +27,7 @@ Name[lt]=Dizaino šablonai
Name[nb]=Designmaler
Name[nl]=Design-sjablonen
Name[nn]=Designmalar
Name[pl]=Szablony projek
cyjn
e
Name[pl]=Szablony projek
tow
e
Name[pt]=Modelos de Desenho
Name[pt_BR]=Modelos de design
Name[ru]=Шаблоны для дизайна
...
...
krita/integration/CMakeLists.txt
View file @
778d5a04
...
...
@@ -7,5 +7,6 @@ install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/Build/Release/kritaquicklook.qlgen
install
(
DIRECTORY
${
CMAKE_CURRENT_SOURCE_DIR
}
/Build/Release/kritaspotlight.mdimporter DESTINATION
${
PLUGIN_INSTALL_DIR
}
)
install
(
DIRECTORY
${
CMAKE_CURRENT_SOURCE_DIR
}
/Build/Release/kritaquicklookng.appex DESTINATION
${
PLUGIN_INSTALL_DIR
}
)
# TODO fix and reenable - https://bugs.kde.org/show_bug.cgi?id=430553
# install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/Build/Release/kritaquicklookng.appex DESTINATION ${PLUGIN_INSTALL_DIR})
endif
(
APPLE
)
krita/krita.action
View file @
778d5a04
...
...
@@ -1332,10 +1332,11 @@
<statusTip></statusTip>
</Action>
</Actions>
<Actions
category=
"tool-shortcuts"
>
<text>
Tool Shortcuts
</text>
<Action
name=
"KritaShape/KisToolDyna"
>
<icon></icon>
<icon>
krita_tool_dyna
</icon>
<text>
Dynamic Brush Tool
</text>
<whatsThis></whatsThis>
<toolTip>
Dynamic Brush Tool
</toolTip>
...
...
@@ -1345,7 +1346,7 @@
<statusTip></statusTip>
</Action>
<Action
name=
"KritaShape/KisToolRectangle"
>
<icon></icon>
<icon>
krita_tool_rectangle
</icon>
<text>
Rectangle Tool
</text>
<whatsThis></whatsThis>
<toolTip>
Rectangle Tool
</toolTip>
...
...
@@ -1355,7 +1356,7 @@
<statusTip></statusTip>
</Action>
<Action
name=
"KritaShape/KisToolMultiBrush"
>
<icon></icon>
<icon>
krita_tool_multihand
</icon>
<text>
Multibrush Tool
</text>
<whatsThis></whatsThis>
<toolTip>
Multibrush Tool
</toolTip>
...
...
@@ -1365,7 +1366,7 @@
<statusTip></statusTip>
</Action>
<Action
name=
"KritaShape/KisToolLazyBrush"
>
<icon></icon>
<icon>
krita_tool_lazybrush
</icon>
<text>
Colorize Mask Tool
</text>
<whatsThis></whatsThis>
<toolTip>
Colorize Mask Tool
</toolTip>
...
...
@@ -1374,7 +1375,7 @@
<statusTip></statusTip>
</Action>
<Action
name=
"KritaShape/KisToolSmartPatch"
>
<icon></icon>
<icon>
krita_tool_smart_patch
</icon>
<text>
Smart Patch Tool
</text>
<whatsThis></whatsThis>
<toolTip>
Smart Patch Tool
</toolTip>
...
...
@@ -1383,7 +1384,7 @@
<statusTip></statusTip>
</Action>
<Action
name=
"PanTool"
>
<icon></icon>
<icon>
tool_pan
</icon>
<text>
Pan Tool
</text>
<whatsThis></whatsThis>
<toolTip>
Pan Tool
</toolTip>
...
...
@@ -1392,7 +1393,7 @@
<statusTip></statusTip>
</Action>
<Action
name=
"InteractionTool"
>
<icon></icon>
<icon>
select
</icon>
<text>
Select Shapes Tool
</text>
<whatsThis></whatsThis>
<toolTip>
Select Shapes Tool
</toolTip>
...
...
@@ -1402,27 +1403,27 @@
<statusTip></statusTip>
</Action>
<Action
name=
"KritaSelected/KisToolColorPicker"
>
<icon></icon>
<icon>
krita_tool_color_picker
</icon>
<text>
Color Picker
</text>
<whatsThis></whatsThis>
<toolTip>
Select a color from the image or current layer
</toolTip>
<iconText>
Select a color from the image or current lay
er
</iconText>
<iconText>
Color Pick
er
</iconText>
<shortcut>
P
</shortcut>
<isCheckable>
false
</isCheckable>
<statusTip></statusTip>
</Action>
<Action
name=
"KritaFill/KisToolFill"
>
<icon></icon>
<icon>
krita_tool_color_fill
</icon>
<text>
Fill Tool
</text>
<whatsThis></whatsThis>
<toolTip>
Fill a contiguous area of color with a color, or fill a selection.
</toolTip>
<iconText>
Fill
a contiguous area of color with a color, or fill a selection.
</iconText>
<iconText>
Fill
</iconText>
<shortcut>
F
</shortcut>
<isCheckable>
false
</isCheckable>
<statusTip></statusTip>
</Action>
<Action
name=
"KritaShape/KisToolLine"
>
<icon></icon>
<icon>
krita_tool_line
</icon>
<text>
Line Tool
</text>
<whatsThis></whatsThis>
<toolTip>
Line Tool
</toolTip>
...
...
@@ -1432,7 +1433,7 @@
<statusTip></statusTip>
</Action>
<Action
name=
"KritaShape/KisToolEllipse"
>
<icon></icon>
<icon>
krita_tool_ellipse
</icon>
<text>
Ellipse Tool
</text>
<whatsThis></whatsThis>
<toolTip>
Ellipse Tool
</toolTip>
...
...
@@ -1442,7 +1443,7 @@
<statusTip></statusTip>
</Action>
<Action
name=
"KritaShape/KisToolBrush"
>
<icon></icon>
<icon>
krita_tool_freehand
</icon>
<text>
Freehand Brush Tool
</text>
<whatsThis></whatsThis>
<toolTip>
Freehand Brush Tool
</toolTip>
...
...
@@ -1451,78 +1452,38 @@
<isCheckable>
false
</isCheckable>
<statusTip></statusTip>
</Action>
<Action
name=
"CreateShapesTool"
>
<icon></icon>
<text>
Create object
</text>
<whatsThis></whatsThis>
<toolTip>
Create object
</toolTip>
<iconText>
Create object
</iconText>
<shortcut></shortcut>
<isCheckable>
false
</isCheckable>
<statusTip></statusTip>
</Action>
<Action
name=
"KarbonPatternTool"
>
<icon></icon>
<text>
Pattern editing
</text>
<whatsThis></whatsThis>
<toolTip>
Pattern editing
</toolTip>
<iconText>
Pattern editing
</iconText>
<shortcut></shortcut>
<isCheckable>
false
</isCheckable>
<statusTip></statusTip>
</Action>
<Action
name=
"ReviewTool"
>
<icon></icon>
<text>
Review
</text>
<whatsThis></whatsThis>
<toolTip>
Review
</toolTip>
<iconText>
Review
</iconText>
<shortcut></shortcut>
<isCheckable>
false
</isCheckable>
<statusTip></statusTip>
</Action>
<Action
name=
"KritaFill/KisToolGradient"
>
<icon></icon>
<text>
Draw a gradient.
</text>
<icon>
krita_tool_gradient
</icon>
<text>
Gradient Tool
</text>
<whatsThis></whatsThis>
<toolTip>
Draw a gradient.
</toolTip>
<iconText>
Draw a gradient.
</iconText>
<iconText>
Gradient Tool
</iconText>
<shortcut>
G
</shortcut>
<isCheckable>
false
</isCheckable>
<statusTip></statusTip>
</Action>
<Action
name=
"KritaShape/KisToolMeasure"
>
<icon></icon>
<icon>
krita_tool_measure
</icon>
<text>
Measurement Tool
</text>
<whatsThis></whatsThis>
<toolTip>
Measure the distance between two points
</toolTip>
<iconText>
Measure
the distance between two points
</iconText>
<iconText>
Measure
ment Tool
</iconText>
<shortcut></shortcut>
<isCheckable>
false
</isCheckable>
<statusTip></statusTip>
</Action>
<Action
name=
"KritaTransform/KisToolMove"
>
<icon></icon>
<icon>
krita_tool_move
</icon>
<text>
Move Tool
</text>
<whatsThis></whatsThis>
<toolTip>
Move a layer
</toolTip>
<iconText>
Move
a layer
</iconText>
<iconText>
Move
Tool
</iconText>
<shortcut>
T
</shortcut>
<isCheckable>
false
</isCheckable>
<statusTip></statusTip>
</Action>
<Action
name=
"VectorTool"
>
<icon></icon>
<text>
Vector Image Tool
</text>
<whatsThis></whatsThis>
<toolTip>
Vector Image (EMF/WMF/SVM/SVG) tool
</toolTip>
<iconText>
Vector Image (EMF/WMF/SVM/SVG) tool
</iconText>
<shortcut></shortcut>
<isCheckable>
false
</isCheckable>
<statusTip></statusTip>
</Action>
<Action
name=
"KarbonCalligraphyTool"
>
<icon></icon>
<icon>
calligraphy
</icon>
<text>
Calligraphy
</text>
<whatsThis></whatsThis>
<toolTip>
Calligraphy
</toolTip>
...
...
@@ -1532,7 +1493,7 @@
<statusTip></statusTip>
</Action>
<Action
name=
"PathTool"
>
<icon></icon>
<icon>
krita_draw_path
</icon>
<text>
Edit Shapes Tool
</text>
<whatsThis></whatsThis>
<toolTip>
Edit Shapes Tool
</toolTip>
...
...
@@ -1542,7 +1503,7 @@
<statusTip></statusTip>
</Action>
<Action
name=
"ZoomTool"
>
<icon></icon>
<icon>
tool_zoom
</icon>
<text>
Zoom Tool
</text>
<whatsThis></whatsThis>
<toolTip>
Zoom Tool
</toolTip>
...
...
@@ -1551,18 +1512,8 @@
<isCheckable>
false
</isCheckable>
<statusTip></statusTip>
</Action>
<Action
name=
"KarbonGradientTool"
>
<icon></icon>
<text>
Gradient Editing Tool
</text>
<whatsThis></whatsThis>
<toolTip>
Gradient editing
</toolTip>
<iconText>
Gradient editing
</iconText>
<shortcut></shortcut>
<isCheckable>
false
</isCheckable>
<statusTip></statusTip>
</Action>
<Action
name=
"ToolReferenceImages"
>
<icon></icon>
<icon>
krita_tool_reference_images
</icon>
<text>
Reference Images Tool
</text>
<whatsThis></whatsThis>
<toolTip>
Reference Images Tool
</toolTip>
...
...
@@ -3524,18 +3475,6 @@ Enable to preserve playback timing.</text>
<isCheckable>
false
</isCheckable>
<statusTip></statusTip>
</Action>
<Action
name=
"rasterize_layer"
>
<icon></icon>
<text>
Ras
&
terize Layer
</text>
<whatsThis></whatsThis>
<toolTip>
Rasterize Layer
</toolTip>
<iconText>
Rasterize Layer
</iconText>
<activationFlags>
10000000
</activationFlags>
<activationConditions>
1
</activationConditions>
<shortcut></shortcut>
<isCheckable>
false
</isCheckable>
<statusTip></statusTip>
</Action>
<Action
name=
"flatten_image"
>
<icon></icon>
<text>
Flatten ima
&
ge
</text>
...
...
krita/krita5.xmlgui
View file @
778d5a04
...
...
@@ -274,7 +274,6 @@ xsi:schemaLocation="http://www.kde.org/standards/kxmlgui/1.0 http://www.kde.org
<Separator/>
<Action
name=
"merge_layer"
/>
<Action
name=
"flatten_layer"
/>
<Action
name=
"rasterize_layer"
/>
<Action
name=
"merge_all_shape_layers"
/>
<Action
name=
"flatten_image"
/>
<Action
name=
"merge_selected_layers"
/>
...
...
krita/org.kde.krita.appdata.xml
View file @
778d5a04
...
...
@@ -125,7 +125,7 @@
<p
xml:lang=
"ko"
>
Krita는 디지털 예술 스튜디오입니다.
</p>
<p
xml:lang=
"nl"
>
Krita is de digitale kunststudio vol mogelijkheden.
</p>
<p
xml:lang=
"nn"
>
Krita er ei funksjonsrik digital teiknestove.
</p>
<p
xml:lang=
"pl"
>
Krita jest pełnow
ymiarowym, cyfrowym studiem artystycznym
</p>
<p
xml:lang=
"pl"
>
Krita jest pełnow
artościowym, cyfrowym studiem artystycznym.
</p>
<p
xml:lang=
"pt"
>
O Krita é o estúdio de arte digital completo.
</p>
<p
xml:lang=
"pt-BR"
>
O Krita é o estúdio de arte digital completo.
</p>
<p
xml:lang=
"ru"
>
Krita — полнофункциональный инструмент для создания цифровой графики.
</p>
...
...
@@ -257,7 +257,8 @@
<caption
xml:lang=
"it"
>
Krita è uno studio d'arte digitale completo
</caption>
<caption
xml:lang=
"ko"
>
Krita는 다기능 디지털 예술 스튜디오입니다
</caption>
<caption
xml:lang=
"nl"
>
Krita is een digitale schilderstudio vol mogelijkheden
</caption>
<caption
xml:lang=
"nn"
>
Krita er ei funksjonsrik digital teiknestove.
</caption>
<caption
xml:lang=
"nn"
>
Krita er ei funksjonsrik digital teiknestove
</caption>
<caption
xml:lang=
"pl"
>
Krita jest pełnowartościowym, cyfrowym studiem artystycznym
</caption>
<caption
xml:lang=
"pt"
>
O Krita é um estúdio de arte digital completo
</caption>
<caption
xml:lang=
"pt-BR"
>
O Krita é um estúdio de pintura digital completo
</caption>
<caption
xml:lang=
"sk"
>
Krita je plnohodnotné digitálne maliarske štúdio
</caption>
...
...
@@ -282,7 +283,8 @@
<caption
xml:lang=
"it"
>
La finestra di avvio ora fornisce anche le ultime novità su Krita
</caption>
<caption
xml:lang=
"ko"
>
시작 창에서 Krita의 최신 소식을 볼 수 있습니다
</caption>
<caption
xml:lang=
"nl"
>
Het opstartvenster geeft u nu ook you het laatste nieuws over Krita
</caption>
<caption
xml:lang=
"nn"
>
Oppstartsvindauget viser no siste nytt om Krita.
</caption>
<caption
xml:lang=
"nn"
>
Oppstartsvindauget viser no siste nytt om Krita
</caption>
<caption
xml:lang=
"pl"
>
Okno początkowe pokazuje teraz najnowsze wieści o Kricie
</caption>
<caption
xml:lang=
"pt"
>
A janela inicial agora também lhe dá as últimas notícias sobre o Krita
</caption>
<caption
xml:lang=
"pt-BR"
>
A janela de inicialização agora também mostra as últimas notícias sobre o Krita
</caption>
<caption
xml:lang=
"sk"
>
V úvodnom okne sa tiež nachádzajú najnovšie správy o Krita
</caption>
...
...
@@ -307,7 +309,8 @@
<caption
xml:lang=
"it"
>
Ci sono oltre dieci motori di pennelli incredibilmente potenti
</caption>
<caption
xml:lang=
"ko"
>
10가지 종류의 강력한 브러시 엔진을 사용할 수 있습니다
</caption>
<caption
xml:lang=
"nl"
>
Er zijn meer dan tien immens krachtige penseelengines
</caption>
<caption
xml:lang=
"nn"
>
Det finst meir enn ti enormt kraftige penselmotorar.
</caption>
<caption
xml:lang=
"nn"
>
Det finst meir enn ti enormt kraftige penselmotorar
</caption>
<caption
xml:lang=
"pl"
>
Istnieje ponad dziesięć zaawansowanych silników pędzli
</caption>
<caption
xml:lang=
"pt"
>
Existem mais de dez motores de pincéis extremamente poderosos
</caption>
<caption
xml:lang=
"pt-BR"
>
Mais de dez engines de pincéis incrivelmente poderosos disponíveis
</caption>
<caption
xml:lang=
"sk"
>
Existuje viac ako desať nesmierne výkonných štetcových enginov
</caption>
...
...
@@ -331,7 +334,8 @@