← Back to branch summary

~lukas-kde/unity8/globalshortcuts

~lukas-kde/unity8/globalshortcuts

Viewing all changes in revision 1934.

Committer: Lukáš Tinkl
Date: 2015-09-02 09:30:32 UTC
mfrom: (1927.2.17 unity8)
Revision ID: lukas.tinkl@canonical.com-20150902093032-0023pevl8y0plwsu

merge overlay and fix conflicts

files added:
qml/Greeter/IntegratedLightDMImpl.qml

qml/Greeter/LightDM.qml

tests/qmltests/Dash/tst_DashShell.qml

files renamed:
plugins/LightDM/ => plugins/IntegratedLightDM/

plugins/LightDM/LightDM.qmltypes => plugins/IntegratedLightDM/IntegratedLightDM.qmltypes

tests/mocks/LightDM/ => tests/mocks/IntegratedLightDM/

tests/mocks/LightDM/LightDM.qmltypes => tests/mocks/IntegratedLightDM/IntegratedLightDM.qmltypes

tests/plugins/LightDM/ => tests/plugins/IntegratedLightDM/

files modified:
debian/changelog

debian/unity8-private.install

plugins/CMakeLists.txt

plugins/Dash/abstractdashview.cpp

plugins/Dash/listviewwithpageheader.cpp

plugins/IntegratedLightDM/CMakeLists.txt

plugins/IntegratedLightDM/DBusGreeter.cpp

plugins/IntegratedLightDM/DBusGreeterList.cpp

plugins/IntegratedLightDM/Greeter.cpp

plugins/IntegratedLightDM/liblightdm/Greeter.cpp

plugins/IntegratedLightDM/liblightdm/GreeterPrivate.cpp

plugins/IntegratedLightDM/plugin.cpp

plugins/IntegratedLightDM/plugin.h

plugins/IntegratedLightDM/qmldir

plugins/Powerd/Powerd.cpp

plugins/Powerd/Powerd.h

plugins/Ubuntu/DownloadDaemonListener/DownloadTracker.cpp

plugins/Unity/Indicators/indicatorsmanager.cpp

plugins/Unity/Indicators/indicatorsmodel.cpp

plugins/Unity/Indicators/modelactionrootstate.cpp

plugins/Unity/Indicators/modelprinter.cpp

plugins/Unity/Indicators/unitymenumodelstack.cpp

plugins/Unity/InputInfo/linux/qinputdeviceinfo_linux.cpp

plugins/Unity/InputInfo/qdeclarativeinputdeviceinfo.cpp

plugins/Unity/InputInfo/qinputinfo.cpp

plugins/Unity/Launcher/launchermodel.cpp

plugins/Utils/qlimitproxymodelqml.cpp

plugins/Utils/unitysortfilterproxymodelqml.cpp

plugins/Wizard/System.cpp

po/am.po

po/ar.po

po/ast.po

po/az.po

po/be.po

po/bg.po

po/br.po

po/bs.po

po/ca.po

po/ca@valencia.po

po/ce.po

po/ckb.po

po/cs.po

po/cy.po

po/da.po

po/de.po

po/el.po

po/en_AU.po

po/en_GB.po

po/eo.po

po/es.po

po/eu.po

po/fa.po

po/fi.po

po/fo.po

po/fr.po

po/ga.po

po/gd.po

po/gl.po

po/gv.po

po/he.po

po/hi.po

po/hr.po

po/hu.po

po/hy.po

po/ia.po

po/id.po

po/is.po

po/it.po

po/ja.po

po/km.po

po/kn.po

po/ko.po

po/ku.po

po/ky.po

po/lo.po

po/lt.po

po/lv.po

po/ml.po

po/mr.po

po/ms.po

po/my.po

po/nb.po

po/nl.po

po/nn.po

po/oc.po

po/or.po

po/pa.po

po/pl.po

po/pt.po

po/pt_BR.po

po/ro.po

po/ru.po

po/shn.po

po/si.po

po/sk.po

po/sl.po

po/sq.po

po/sr.po

po/sv.po

po/sw.po

po/ta.po

po/te.po

po/th.po

po/tr.po

po/ug.po

po/uk.po

po/unity8.pot

po/ur.po

po/uz.po

po/vi.po

po/xh.po

po/zh_CN.po

po/zh_HK.po

po/zh_TW.po

qml/Components/Dialogs.qml

qml/Components/PhysicalKeysMapper.qml

qml/Components/VolumeControl.qml

qml/Dash/Dash.qml

qml/Greeter/Greeter.qml

qml/Launcher/LauncherPanel.qml

qml/Notifications/Notification.qml

qml/Panel/IndicatorsBar.qml

qml/Panel/IndicatorsMenu.qml

qml/Shell.qml

qml/Stages/ApplicationWindow.qml

src/libunity8-private/unitydbusobject.cpp

src/libunity8-private/unitydbusvirtualobject.cpp

src/main.cpp

tests/autopilot/unity8/greeter/__init__.py

tests/autopilot/unity8/process_helpers.py

tests/mocks/CMakeLists.txt

tests/mocks/GSettings.1.0/fake_gsettings.cpp

tests/mocks/IntegratedLightDM/CMakeLists.txt

tests/mocks/IntegratedLightDM/liblightdm/Greeter.cpp

tests/mocks/IntegratedLightDM/plugin.cpp

tests/mocks/IntegratedLightDM/plugin.h

tests/mocks/IntegratedLightDM/qmldir

tests/mocks/MeeGo/QOfono/MockQOfonoManager.cpp

tests/mocks/QtMultimedia/audio.cpp

tests/mocks/Unity/Application/ApplicationInfo.cpp

tests/mocks/Unity/DashCommunicator/dashcommunicator.cpp

tests/mocks/Unity/DashCommunicator/dashcommunicatorservice.cpp

tests/mocks/Unity/DashCommunicator/dashcommunicatorservice.h

tests/mocks/Unity/Indicators/fakeindicatorsmodel.cpp

tests/mocks/Unity/fake_navigation.cpp

tests/mocks/Unity/fake_previewmodel.cpp

tests/mocks/Unity/fake_scopes.cpp

tests/mocks/libusermetrics/UserMetrics.cpp

tests/plugins/CMakeLists.txt

tests/plugins/Dash/listviewwithpageheadersectiontest.cpp

tests/plugins/Dash/listviewwithpageheadertest.cpp

tests/plugins/IntegratedLightDM/CMakeLists.txt

tests/plugins/IntegratedLightDM/dbus.cpp

tests/plugins/IntegratedLightDM/greeter.qml

tests/plugins/Ubuntu/Gestures/tst_DirectionalDragArea.cpp

tests/plugins/Ubuntu/Gestures/tst_PressedOutsideNotifier.cpp

tests/plugins/Unity/Indicators/UnityMenuModelStackTest.cpp

tests/plugins/Unity/Launcher/launchermodeltest.cpp

tests/plugins/Utils/HomeKeyWatcherTest.cpp

tests/plugins/Utils/ModelTest.cpp

tests/plugins/Utils/QLimitProxyModelTest.cpp

tests/plugins/Utils/UnitySortFilterProxyModelTest.cpp

tests/qmltests/CMakeLists.txt

tests/qmltests/Components/tst_DragHandle.cpp

tests/qmltests/Components/tst_PhysicalKeysMapper.qml

tests/qmltests/Greeter/tst_Greeter.qml

tests/qmltests/Greeter/tst_Infographics.qml

tests/qmltests/Greeter/tst_NarrowView.qml

tests/qmltests/Greeter/tst_WideView.qml

tests/qmltests/Tutorial/tst_Tutorial.qml

tests/qmltests/tst_OrientedShell.qml

tests/qmltests/tst_Shell.qml

tests/qmltests/tst_ShellWithPin.qml

tests/uqmlscene/main.cpp

Show diffs side-by-side

added added

removed removed

debian/changelog

debian/unity8-private.install

plugins/CMakeLists.txt

plugins/Dash/abstractdashview.cpp

plugins/Dash/listviewwithpageheader.cpp

plugins/IntegratedLightDM/CMakeLists.txt

plugins/IntegratedLightDM/DBusGreeter.cpp

plugins/IntegratedLightDM/DBusGreeterList.cpp

plugins/IntegratedLightDM/Greeter.cpp

plugins/IntegratedLightDM/liblightdm/Greeter.cpp

plugins/IntegratedLightDM/liblightdm/GreeterPrivate.cpp

plugins/IntegratedLightDM/plugin.cpp

plugins/IntegratedLightDM/plugin.h

plugins/IntegratedLightDM/qmldir

plugins/Powerd/Powerd.cpp

plugins/Powerd/Powerd.h

plugins/Ubuntu/DownloadDaemonListener/DownloadTracker.cpp

plugins/Unity/Indicators/indicatorsmanager.cpp

plugins/Unity/Indicators/indicatorsmodel.cpp

plugins/Unity/Indicators/modelactionrootstate.cpp

plugins/Unity/Indicators/modelprinter.cpp

plugins/Unity/Indicators/unitymenumodelstack.cpp

plugins/Unity/InputInfo/linux/qinputdeviceinfo_linux.cpp

plugins/Unity/InputInfo/qdeclarativeinputdeviceinfo.cpp

plugins/Unity/InputInfo/qinputinfo.cpp

plugins/Unity/Launcher/launchermodel.cpp

plugins/Utils/qlimitproxymodelqml.cpp

plugins/Utils/unitysortfilterproxymodelqml.cpp

plugins/Wizard/System.cpp

po/ca@valencia.po

qml/Components/Dialogs.qml

qml/Components/PhysicalKeysMapper.qml

qml/Components/VolumeControl.qml

qml/Dash/Dash.qml

qml/Greeter/Greeter.qml

qml/Greeter/IntegratedLightDMImpl.qml

qml/Greeter/LightDM.qml

qml/Launcher/LauncherPanel.qml

qml/Notifications/Notification.qml

qml/Panel/IndicatorsBar.qml

qml/Panel/IndicatorsMenu.qml

qml/Stages/ApplicationWindow.qml

src/libunity8-private/unitydbusobject.cpp

src/libunity8-private/unitydbusvirtualobject.cpp

tests/autopilot/unity8/greeter/__init__.py

tests/autopilot/unity8/process_helpers.py

tests/mocks/CMakeLists.txt

tests/mocks/GSettings.1.0/fake_gsettings.cpp

tests/mocks/IntegratedLightDM/CMakeLists.txt

tests/mocks/IntegratedLightDM/IntegratedLightDM.qmltypes

tests/mocks/IntegratedLightDM/liblightdm/Greeter.cpp

tests/mocks/IntegratedLightDM/plugin.cpp

tests/mocks/IntegratedLightDM/plugin.h

tests/mocks/IntegratedLightDM/qmldir

tests/mocks/MeeGo/QOfono/MockQOfonoManager.cpp

tests/mocks/QtMultimedia/audio.cpp

tests/mocks/Unity/Application/ApplicationInfo.cpp

tests/mocks/Unity/DashCommunicator/dashcommunicator.cpp

tests/mocks/Unity/DashCommunicator/dashcommunicatorservice.cpp

tests/mocks/Unity/DashCommunicator/dashcommunicatorservice.h

tests/mocks/Unity/Indicators/fakeindicatorsmodel.cpp

tests/mocks/Unity/fake_navigation.cpp

tests/mocks/Unity/fake_previewmodel.cpp

tests/mocks/Unity/fake_scopes.cpp

tests/mocks/libusermetrics/UserMetrics.cpp

tests/plugins/CMakeLists.txt

tests/plugins/Dash/listviewwithpageheadersectiontest.cpp

tests/plugins/Dash/listviewwithpageheadertest.cpp

tests/plugins/IntegratedLightDM/CMakeLists.txt

tests/plugins/IntegratedLightDM/dbus.cpp

tests/plugins/IntegratedLightDM/greeter.qml

tests/plugins/Ubuntu/Gestures/tst_DirectionalDragArea.cpp

tests/plugins/Ubuntu/Gestures/tst_PressedOutsideNotifier.cpp

tests/plugins/Unity/Indicators/UnityMenuModelStackTest.cpp

tests/plugins/Unity/Launcher/launchermodeltest.cpp

tests/plugins/Utils/HomeKeyWatcherTest.cpp

tests/plugins/Utils/ModelTest.cpp

tests/plugins/Utils/QLimitProxyModelTest.cpp

tests/plugins/Utils/UnitySortFilterProxyModelTest.cpp

tests/qmltests/CMakeLists.txt

tests/qmltests/Components/tst_DragHandle.cpp

tests/qmltests/Components/tst_PhysicalKeysMapper.qml

tests/qmltests/Dash/tst_DashShell.qml

tests/qmltests/Greeter/tst_Greeter.qml

tests/qmltests/Greeter/tst_Infographics.qml

tests/qmltests/Greeter/tst_NarrowView.qml

tests/qmltests/Greeter/tst_WideView.qml

tests/qmltests/Tutorial/tst_Tutorial.qml

tests/qmltests/tst_OrientedShell.qml

tests/qmltests/tst_Shell.qml

tests/qmltests/tst_ShellWithPin.qml

tests/uqmlscene/main.cpp