Merge remote-tracking branch 'origin/pentikainen-T7220-multi-window-sessions'…
a39225133c5e
Actions

Authored by rempt on Feb 1 2018, 3:47 PM.

Description

Merge remote-tracking branch 'origin/pentikainen-T7220-multi-window-sessions' into rempt/intel-3

Committed

rempt

Feb 1 2018, 3:47 PM

Parents

Branches

Unknown

Tags

Unknown

Commit	Author	Details	Committed
5bbcfeabad1e	jounip	Fix copyright block	Feb 1 2018
c7f82264e041	jounip	Add session manager window, support multiple saved sessions	Feb 1 2018
7e20a97b03f5	jounip	Introduce window layouts	Jan 31 2018
6feafd8b6992	jounip	Merge remote-tracking branch 'origin/master' into pentikainen-T7220-multi…	Jan 30 2018
583187b226b6	jounip	Fix restoring window geometry	Nov 21 2017
ac458aaa9524	jounip	Fix backward compatibility of restoring main window	Nov 16 2017
c03b6c08da22	jounip	Add settings option to restore open documents on startup	Nov 15 2017
6069b1c4ecbd	jounip	FEATURE: restore previously open documents on start up	Nov 15 2017
ddd04271c4fd	jounip	Extend window state serialization to multiple windows	Nov 14 2017
f92b100e9ad2	jounip	Refactor KisMainWindow state serialization	Nov 14 2017
eda851ad9049	jounip	Remove dead code	Nov 14 2017

				Path	Packages
	M			krita/krita4.xmlgui
	M			krita/kritamenu.action
	M			libs/ui/CMakeLists.txt
	M			libs/ui/KisApplication.cpp
	M			libs/ui/KisMainWindow.cpp
	M			libs/ui/KisMainWindow.h
	M			libs/ui/KisPart.cpp
	M			libs/ui/KisPart.h
	A			libs/ui/KisSessionResource.cpp
	P			libs/ui/KisSessionResource.h Copied from libs/flake/KoClipMaskPainter.h
	M			libs/ui/KisView.cpp
	M			libs/ui/KisView.h
	A			libs/ui/KisWindowLayoutResource.cpp
	P			libs/ui/KisWindowLayoutResource.h Copied from libs/brush/kis_svg_brush.h
	M			libs/ui/canvas/kis_canvas_controller.cpp
	M			libs/ui/canvas/kis_canvas_controller.h
	A			libs/ui/dialogs/KisSessionManagerDialog.cpp
	P			libs/ui/dialogs/KisSessionManagerDialog.h Copied from libs/ui/opengl/kis_opengl_canvas_debugger.h
	M			libs/ui/dialogs/kis_dlg_preferences.cc
	M			libs/ui/dialogs/kis_dlg_preferences.h
	M			libs/ui/forms/wdggeneralsettings.ui
	A			libs/ui/forms/wdgsessionmanager.ui
	M			libs/ui/kis_config.cc
	M			libs/ui/kis_config.h
	M			libs/ui/kis_resource_server_provider.cpp
	M			libs/ui/kis_resource_server_provider.h
	M			libs/ui/tests/kis_derived_resources_test.cpp
	M			libs/ui/widgets/kis_workspace_chooser.cpp
	M			libs/ui/widgets/kis_workspace_chooser.h
	M			sdk/tests/ui_manager_test.h