Diffusion Krita b877d8e10e48

Merge branch 'master' into woltherav/pressurecallibrationhelper
b877d8e10e48
Actions

Authored by woltherav on Aug 17 2019, 5:33 PM.

Description

Merge branch 'master' into woltherav/pressurecallibrationhelper

Details

Committed

woltherav

Aug 17 2019, 5:33 PM

Parents

R37:8caa615d5c88: Merge branch 'master' into woltherav/pressurecallibrationhelper
R37:da7f659803e4: Change relative widths of the tablet tester and status messages widgets

Branches

Unknown

Tags

Unknown

woltherav committed R37:b877d8e10e48: Merge branch 'master' into woltherav/pressurecallibrationhelper (authored by woltherav).Aug 17 2019, 5:33 PM

Merged Changes

Commit	Author	Details	Committed
da7f659803e4	huftis	Change relative widths of the tablet tester and status messages widgets	Aug 17 2019
1706af33e50d	huftis	Set minimum size for the tablet tester area	Aug 17 2019
8b418f1aaa18	huftis	Add size hints to tablet tester widget (for better dialogue size)	Aug 17 2019
c2608efd8e9e	rempt	Remove "calligra" from the name of our app icon	Aug 17 2019
7fee359c6add	dkazakov	Fix lost scroll events when tablet is in the proximity	Aug 16 2019
0cc84daa0a85	amedonosova	Show gamut mask in the on-canvas color selector	Aug 16 2019
35d7895167df	amedonosova	Gamut masking: share activation state in KisCanvasResourceProvider	Aug 16 2019
39f8f6755e60	scottpetrovic	Add icon to notification message	Aug 15 2019
ba45e6a8bfb1	scottpetrovic	Test and fix new version URL to make sure it works	Aug 15 2019
5ab00d607961	scottpetrovic	Determine dev build if version has git hash	Aug 15 2019
3ddf2b6e6b18	scottpetrovic	Start hooking up UI for version update message	Aug 15 2019
5cad27a8545e	scottpetrovic	Add logic to grab version numbers and calulcate if we need an update	Aug 15 2019
93b3a2668017	scottpetrovic	Add category to model for RSS feed	Aug 15 2019
3602c72493b7	tymond	Fix Strength not used in Rotation - Fuzzy Dab	Aug 15 2019

Changes (78)

				Path	Packages
	M			krita/CMakeLists.txt
	M			krita/kritamenu.action
	M			krita/org.kde.krita.desktop
	V			krita/pics/app/{1024-apps-calligrakrita.png → 1024-apps-krita.png}
	V			krita/pics/app/{1024-apps-krita.png ← 1024-apps-calligrakrita.png}
	V			krita/pics/app/{128-apps-calligrakrita.png → 128-apps-krita.png}
	V			krita/pics/app/{128-apps-krita.png ← 128-apps-calligrakrita.png}
	V			krita/pics/app/{16-apps-calligrakrita.png → 16-apps-krita.png}
	V			krita/pics/app/{16-apps-krita.png ← 16-apps-calligrakrita.png}
	V			krita/pics/app/{22-apps-calligrakrita.png → 22-apps-krita.png}
	V			krita/pics/app/{22-apps-krita.png ← 22-apps-calligrakrita.png}
	V			krita/pics/app/{256-apps-calligrakrita.png → 256-apps-krita.png}
	V			krita/pics/app/{256-apps-krita.png ← 256-apps-calligrakrita.png}
	V			krita/pics/app/{32-apps-calligrakrita.png → 32-apps-krita.png}
	V			krita/pics/app/{32-apps-krita.png ← 32-apps-calligrakrita.png}
	V			krita/pics/app/{48-apps-calligrakrita.png → 48-apps-krita.png}
	V			krita/pics/app/{48-apps-krita.png ← 48-apps-calligrakrita.png}
	V			krita/pics/app/{512-apps-calligrakrita.png → 512-apps-krita.png}
	V			krita/pics/app/{512-apps-krita.png ← 512-apps-calligrakrita.png}
	V			krita/pics/app/{64-apps-calligrakrita.png → 64-apps-krita.png}
	V			krita/pics/app/{64-apps-krita.png ← 64-apps-calligrakrita.png}
	M			krita/pics/app/CMakeLists.txt
	V			krita/pics/app/{sc-apps-calligrakrita.svgz → sc-apps-krita.svgz}
	V			krita/pics/app/{sc-apps-krita.svgz ← sc-apps-calligrakrita.svgz}
	M			libs/ui/KisApplication.cpp
	M			libs/ui/KisMultiFeedRSSModel.cpp
	M			libs/ui/KisMultiFeedRSSModel.h
	M			libs/ui/KisWelcomePageWidget.cpp
	M			libs/ui/KisWelcomePageWidget.h
	M			libs/ui/forms/KisWelcomePage.ui
	M			libs/ui/input/kis_input_manager.cpp
	M			libs/ui/input/wintab/drawpile_tablettester/tablettest.cpp
	M			libs/ui/input/wintab/drawpile_tablettester/tablettest.h
	M			libs/ui/input/wintab/drawpile_tablettester/tablettest.ui
	M			libs/ui/kis_canvas_resource_provider.cpp
	M			libs/ui/kis_canvas_resource_provider.h
	M			libs/ui/kis_splash_screen.cpp
	M			libs/ui/widgets/KisGamutMaskToolbar.cpp
	M			libs/ui/widgets/KisGamutMaskToolbar.h
	M			libs/ui/widgets/KisNewsWidget.cpp
	M			libs/ui/widgets/KisNewsWidget.h
	M			libs/ui/widgets/kis_floating_message.cpp
	M			packaging/linux/flatpak/org.kde.krita-nightly.json
	M			packaging/linux/flatpak/org.kde.krita-nightly.yaml
	M			packaging/linux/flatpak/org.kde.krita-stable.yaml
	M			packaging/linux/snap/snap/gui/krita.desktop
	V			pics/{calligrakrita-base.svg → krita-base.svg}
	V			pics/{calligrakrita.png → krita.png}
	M			pics/createicons/icons.txt
	M			pics/icons.qrc
	V			pics/{krita-base.svg ← calligrakrita-base.svg}
	V			pics/{krita.png ← calligrakrita.png}
	M			plugins/dockers/advancedcolorselector/kis_color_selector.cpp
	M			plugins/dockers/advancedcolorselector/kis_color_selector.h
	M			plugins/dockers/advancedcolorselector/kis_color_selector_container.cpp
	M			plugins/dockers/artisticcolorselector/artisticcolorselector_dock.cpp
	M			plugins/dockers/artisticcolorselector/artisticcolorselector_dock.h
	M			plugins/impex/brush/krita_brush.desktop
	M			plugins/impex/csv/krita_csv.desktop
	M			plugins/impex/exr/krita_exr.desktop
	M			plugins/impex/gif/krita_gif.desktop
	M			plugins/impex/heif/krita_heif.desktop
	M			plugins/impex/heightmap/krita_heightmap.desktop
	M			plugins/impex/jpeg/krita_jpeg.desktop
	M			plugins/impex/kra/krita_kra.desktop
	M			plugins/impex/ora/krita_ora.desktop
	M			plugins/impex/pdf/krita_pdf.desktop
	M			plugins/impex/png/krita_png.desktop
	M			plugins/impex/psd/krita_psd.desktop
	M			plugins/impex/qimageio/krita_qimageio.desktop
	M			plugins/impex/raw/krita_raw.desktop
	M			plugins/impex/spriter/krita_spriter.desktop
	M			plugins/impex/svg/krita_svg.desktop
	M			plugins/impex/tga/krita_tga.desktop
	M			plugins/impex/tiff/krita_tiff.desktop
	M			plugins/impex/xcf/krita_xcf.desktop
	M			plugins/paintops/libpaintop/kis_curve_option.h
	M			plugins/paintops/libpaintop/kis_pressure_hsv_option.cpp