Diffusion KScreen c31b73aa2bd8

Merge branch 'master' into sebas/configmodule
c31b73aa2bd8
Actions

Authored by sebas on Mar 7 2018, 3:39 PM.

Description

Merge branch 'master' into sebas/configmodule

Details

Committed

sebas

Mar 7 2018, 3:39 PM

Parents

R104:810b9be2d64e: SVN_SILENT made messages (.desktop file) - always resolve ours
R104:ec3467639180: Merge branch 'master' into sebas/configmodule

Branches

Unknown

Tags

Unknown

References

sebas/configmodule

sebas committed R104:c31b73aa2bd8: Merge branch 'master' into sebas/configmodule (authored by sebas).Mar 7 2018, 3:39 PM

Merged Changes

This commit merges a very large number of changes. Only the first 50 are shown.

Commit		Author	Details	Committed
810b9be2d64e		l10n daemon script	SVN_SILENT made messages (.desktop file) - always resolve ours	Mar 6 2018
521ae1d29bbb		fvogt	Merge branch 'Plasma/5.12'	Mar 5 2018
47521b011d33	D11045	fvogt	Use QQuickWidget instead of QQuickView for the main view in the kcm	Mar 5 2018
eacbddd22d99	D10896	sebas	Show config selection OSD when display button is pressed	Mar 1 2018
5feb84305560	D9414	dvratil	Merge branch 'dvratil/osd'	Feb 23 2018
cd3b350e0225	D10723	sebas	hide primary display combo when not supported	Feb 23 2018
e703ac43e99d		jriddell	Update version number for 5.12.2 GIT_SILENT	Feb 20 2018
58250a42b284		jriddell	Update version number for 5.12.1 GIT_SILENT	Feb 13 2018
8bb30dda5748		bshah	Update version number for 5.12.0 GIT_SILENT	Feb 1 2018
406b11efe1bb		l10n daemon script	SVN_SILENT made messages (.desktop file) - always resolve ours	Jan 23 2018
f966fb439e62		dvratil	Fix initOsd()	Jan 19 2018
5fb147288b40		dvratil	Simplify code	Jan 19 2018
8f662d8e9f8a		dvratil	QML optimization	Jan 19 2018
048024098551		dvratil	Use i18n instead ot qsTr	Jan 19 2018
58ef04d33657		dvratil	Initialize OSD QmlObject lazily	Jan 19 2018
77314f325ba5		dvratil	Let OsdAction delete itself after emitting the selected() signal	Jan 19 2018
071282f5450d		dvratil	OSD positioning changes	Jan 19 2018
ceb8024880da		sebas	clean up osd more aggressively	Jan 18 2018
0dfb1d77638d		sebas	Fix icons	Jan 18 2018
c0ed8ba83839		sebas	Fix typo in comment	Jan 18 2018
0bb5dcec7b27		sebas	Merge branch 'master' into dvratil/osd	Jan 17 2018
411c3c208f8d		dvratil	Merge branch 'Plasma/5.12'	Jan 16 2018
25d030dd0db1	D9903	dvratil	KDED: respond to output being completely removed	Jan 16 2018
b81e8351b369		dvratil	Merge branch 'Plasma/5.12'	Jan 16 2018
fd85ba8531a1	D9902	dvratil	KDED: restore output scale from config	Jan 16 2018
3129f5089ef2	D9902	dvratil	KDED: restore output scale from config	Jan 16 2018
969504b7197a		jriddell	Update version number for 5.12.80 GIT_SILENT	Jan 15 2018
8584cd96fcc9		jriddell	Update version number for 5.11.95 GIT_SILENT	Jan 15 2018
fc1cbc10fc4a		mlaurent	Remove obsolete reviewboardrc file	Jan 5 2018
2d6ac7e7af78		l10n daemon script	SVN_SILENT made messages (.desktop file) - always resolve ours	Dec 20 2017
09128524a22b		dvratil	Initialize OsdManager on KDED start	Dec 14 2017
7a74d3af52c9		dvratil	Integrate the OSD action selector with the KDED daemon	Dec 14 2017
b64339f42111		dvratil	Extend the OSD with an actionable OSD to choosee layout for new screens	Dec 11 2017
01e1ab306691		dvratil	Allow an OSD to stay on screen forever (when it requires action)	Dec 11 2017
5b17c9e3491d		dvratil	Rebase on current master	Dec 11 2017
b94bc90d2031		mart/dvratil	Revert "let kwin position the popup"	Dec 11 2017
30e53313ed18		mart/dvratil	let kwin position the popup	Dec 11 2017
553a13cde3cc		sebas/dvratil	Addressing Kai's review, part 1	Dec 11 2017
db206472c765		sebas/dvratil	also register the service	Dec 11 2017
3c35db2ba932		sebas/dvratil	call the dbus service from the test app	Dec 11 2017
8c623dee8134		sebas/dvratil	improve osd test app	Dec 11 2017
4af785ea7ed8	D3598	sebas/dvratil	rework kscreen's OSD logic	Dec 11 2017
bd9c1d863673		sebas/dvratil	show osd later	Dec 11 2017
757cf9fd59b5		sebas/dvratil	Somewhere, we do need to set the size...	Dec 11 2017
9f2b9729902d		sebas/dvratil	implement generic osd	Dec 11 2017
38a30f924e61		sebas/dvratil	clean up unused file	Dec 11 2017
8231e2338f21		sebas/dvratil	Fix for both, X11 and wayland	Dec 11 2017
c8c9851b27b0		sebas/dvratil	copyright updates	Dec 11 2017
aea14a38dacf		sebas/dvratil	various cleanups	Dec 11 2017
6aa38de32388		sebas/dvratil	Clean up tests	Dec 11 2017

Changes (68)

		Path
D		.reviewboardrc
M		CMakeLists.txt
M		console/console.cpp
M		console/main.cpp
V		icons/{48-actions-kdocumentinfo.png ← hi48-actions-kdocumentinfo.png}
M		icons/CMakeLists.txt
V		icons/{hi48-actions-kdocumentinfo.png → 48-actions-kdocumentinfo.png}
V		icons/{hisc-actions-kdocumentinfo.svgz → sc-actions-kdocumentinfo.svgz}
V		icons/{sc-actions-kdocumentinfo.svgz ← hisc-actions-kdocumentinfo.svgz}
M		kcm/kcm_kscreen.desktop.cmake
M		kcm/qml/Output.qml
M		kcm/qml/main.qml
M		kcm/src/CMakeLists.txt
M		kcm/src/collapsablebutton.cpp
M		kcm/src/collapsablebutton.h
M		kcm/src/controlpanel.cpp
M		kcm/src/controlpanel.h
D		kcm/src/debug.cpp
D		kcm/src/debug.h
M		kcm/src/declarative/qmloutput.cpp
M		kcm/src/declarative/qmloutputcomponent.cpp
M		kcm/src/declarative/qmlscreen.cpp
M		kcm/src/declarative/qmlscreen.h
M		kcm/src/kcm_kscreen.cpp
M		kcm/src/kcm_kscreen.h
M		kcm/src/outputconfig.cpp
M		kcm/src/outputconfig.h
M		kcm/src/previewwidget.cpp
M		kcm/src/previewwidget.h
M		kcm/src/primaryoutputcombo.h
M		kcm/src/resolutionslider.cpp
M		kcm/src/resolutionslider.h
M		kcm/src/scaling.ui
M		kcm/src/scalingconfig.cpp
M		kcm/src/scalingconfig.h
M		kcm/src/unifiedoutputconfig.cpp
M		kcm/src/unifiedoutputconfig.h
M		kcm/src/widget.cpp
M		kcm/src/widget.h
M		kded/CMakeLists.txt
M		kded/daemon.cpp
M		kded/daemon.h
D		kded/debug.cpp
D		kded/debug.h
M		kded/device.cpp
M		kded/device.h
M		kded/generator.cpp
M		kded/generator.h
M		kded/kscreen.desktop.cmake
A		kded/osd.cpp
A		kded/osd.h
A		kded/osdmanager.cpp
A		kded/osdmanager.h
A	(dir)	kded/qml/
A		kded/qml/Osd.qml
A		kded/qml/OsdItem.qml
A		kded/qml/OsdSelector.qml
A		kded/qml/OutputIdentifier.qml
M		kded/serializer.cpp
A		kscreen.categories
M		plasma/plasma-applet-kscreen.desktop.cmake
M		tests/CMakeLists.txt
M		tests/kded/CMakeLists.txt
A	(dir)	tests/osd/
A		tests/osd/CMakeLists.txt
A		tests/osd/main.cpp
A		tests/osd/osdtest.cpp
A		tests/osd/osdtest.h