lp:~lukas-kde/unity8/globalshortcuts

Branch merges

Superseded for merging into lp:unity8

PS Jenkins bot: Needs Fixing (continuous-integration) on 2015-08-25

Daniel d'Andrada (community): Approve on 2015-08-25

Diff: 1740 lines (+832/-163)

30 files modified

plugins/CMakeLists.txt (+1/-0)
plugins/GlobalShortcut/CMakeLists.txt (+10/-0)
plugins/GlobalShortcut/globalshortcut.cpp (+80/-0)
plugins/GlobalShortcut/globalshortcut.h (+76/-0)
plugins/GlobalShortcut/globalshortcutregistry.cpp (+115/-0)
plugins/GlobalShortcut/globalshortcutregistry.h (+70/-0)
plugins/GlobalShortcut/plugin.cpp (+27/-0)
plugins/GlobalShortcut/plugin.h (+32/-0)
plugins/GlobalShortcut/qmldir (+2/-0)
plugins/Unity/Session/Session.qmltypes (+34/-0)
plugins/Unity/Session/dbusunitysessionservice.cpp (+38/-2)
plugins/Utils/Utils.qmltypes (+1/-1)
plugins/Utils/easingcurve.h (+2/-2)
po/unity8.pot (+83/-73)
qml/Components/Dialogs.qml (+60/-5)
qml/Components/PhysicalKeysMapper.qml (+7/-8)
qml/Components/ScreenGrabber.qml (+7/-0)
qml/Components/ShellDialog.qml (+7/-1)
qml/Components/VolumeControl.qml (+20/-6)
qml/OrientedShell.qml (+1/-5)
qml/Panel/Indicators/MessageMenuItemFactory.qml (+2/-2)
qml/Shell.qml (+11/-4)
tests/mocks/Utils/windowstatestorage.cpp (+0/-2)
tests/mocks/Utils/windowstatestorage.h (+1/-0)
tests/plugins/CMakeLists.txt (+1/-0)
tests/plugins/GlobalShortcut/CMakeLists.txt (+14/-0)
tests/plugins/GlobalShortcut/GlobalShortcutTest.cpp (+77/-0)
tests/plugins/GlobalShortcut/shortcut.qml (+39/-0)
tests/qmltests/Components/tst_Dialogs.qml (+13/-8)
tests/qmltests/Components/tst_PhysicalKeysMapper.qml (+1/-44)

api

Propose for merging

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

1936. By Lukáš Tinkl on 2015-09-03

remove trailing WS

1935. By Lukáš Tinkl on 2015-09-03

remove conflicts

1934. By Lukáš Tinkl on 2015-09-02

merge overlay and fix conflicts

1933. By Lukáš Tinkl on 2015-09-01

fix installing the new plugin

1932. By Lukáš Tinkl on 2015-08-31

merge overlay

1931. By Lukáš Tinkl on 2015-08-25

change to 1.1 version of U components

1930. By Lukáš Tinkl on 2015-08-25

address minor issues

1929. By Lukáš Tinkl on 2015-08-25

protect the GlobalShortcut pointer with QPointer

cleanup the list of shortcuts on destruction

1928. By Lukáš Tinkl on 2015-08-24

introduce GlobalShortcut component

1927. By Launchpad Translations on behalf of unity-team on 2015-08-20

Launchpad automatic translations update.