Merge lp:~pete-woods/unity8/remove-indicator-session-hacks into lp:unity8

Proposed by Pete Woods
Status: Needs review
Proposed branch: lp:~pete-woods/unity8/remove-indicator-session-hacks
Merge into: lp:unity8
Prerequisite: lp:~pete-woods/unity8/fix-unity-platform-ispc-lp1670657
Diff against target: 44 lines (+2/-12)
2 files modified
plugins/Unity/Indicators/indicatorsmanager.cpp (+2/-4)
qml/Panel/Indicators/IndicatorMenuItemFactory.qml (+0/-8)
To merge this branch: bzr merge lp:~pete-woods/unity8/remove-indicator-session-hacks
Reviewer Review Type Date Requested Status
Unity8 CI Bot continuous-integration Approve
Lukáš Tinkl (community) Needs Fixing
Review via email: mp+320351@code.launchpad.net

Commit message

Remove indicator-session visibility and desktop profile hacks

Description of the change

Remove indicator-session visibility and desktop profile hacks

Note that this is dependent on https://code.launchpad.net/~pete-woods/indicator-session/add-phone-indicator-profiles/+merge/320350

To post a comment you must log in.
Revision history for this message
Unity8 CI Bot (unity8-ci-bot) wrote :
review: Needs Fixing (continuous-integration)
2869. By Michael Terry

Support GNOME-style logout DBus API (making the Logout, Reboot, and Shutdown launcher commands work) (LP: #1673229)

Approved by: Albert Astals Cid, Unity8 CI Bot

2870. By Michael Terry

Don't lock the screen for guest users or users in the nopasswdlogin group. (LP: #1644237)

Approved by: Josh Arenson, Unity8 CI Bot

2871. By Pete Woods

Fix up indicators-client after refactoring (LP: #1672797)

Approved by: Albert Astals Cid, Unity8 CI Bot

2872. By Lukáš Tinkl

Reset always-show-osk gsetting on startup to default value (false atm)

Approved by: Albert Astals Cid, Unity8 CI Bot

2873. By Lukáš Tinkl

Fix the restored-to position with Miral due to the state changes being async (LP: #1669819)

Approved by: Daniel d'Andrada, Unity8 CI Bot

2874. By Lukáš Tinkl

Add a cursor name fallback mapping "grabbing" -> "closedhand" for Breeze

Approved by: Daniel d'Andrada, Unity8 CI Bot

2875. By Michael Zanetti

Add support for closing apps from the spread with "Q" (LP: #1670327)

Approved by: Albert Astals Cid, Unity8 CI Bot

2876. By Daniel d'Andrada

Really disable the window decoration when in staged mode

Instead of having it only fully translucent (but still catching input).
So that it doesn't eat mouse clicks and taps near the window's top edge (LP: #1670361)

Approved by: Lukáš Tinkl, Unity8 CI Bot

2877. By Lukáš Tinkl

Fix unsnapping a maximized window from the panel (LP: #1671721)

Approved by: Albert Astals Cid, Michał Sawicz, Unity8 CI Bot

2878. By Michael Zanetti

hide "private" launcher quicklist entries when the greeter is locked (LP: #1667649)

Approved by: Lukáš Tinkl

2879. By Michael Zanetti

add surface titles to launcher's quicklist (LP: #1661668)

Approved by: Lukáš Tinkl, Unity8 CI Bot

2880. By Daniel d'Andrada

Don't let clients resize their surfaces while in staged (phone/tablet) mode (LP: #1670390)

Approved by: Gerry Boland, Unity8 CI Bot

2881. By Daniel d'Andrada

TopLevelWindowModel: don't put hidden windows in the model

From the UI point of view, it's as if they didn't exist. (LP: #1665286)

Approved by: Albert Astals Cid

2882. By Lukáš Tinkl

Disable altDrag feature outside windowed mode

Approved by: Albert Astals Cid, Unity8 CI Bot

2883. By Michael Zanetti

properly reset the drawer state when cancelling a horizontal drag (LP: #1669536)

Approved by: Lukáš Tinkl, Unity8 CI Bot

2884. By Michael Zanetti

fix the focus moving correctly between launcher and drawer (LP: #1669880)

Approved by: Albert Astals Cid, Unity8 CI Bot

2885. By Michael Zanetti

unfocus the drawer's textfield when it is moved (LP: #1669839)

Approved by: Albert Astals Cid, Unity8 CI Bot

2886. By Albert Astals Cid

Signal aboutToShow (LP: #1664578)

Approved by: Lukáš Tinkl, Unity8 CI Bot

2887. By Albert Astals Cid

Support Panel top level items to be disabled

I needed to change the way MenuContent changes its position
from using the highlight to simply setting the contentX directly
since otherwise in some reset cases the position was wrong (LP: #1670694)

Approved by: Lukáš Tinkl, Unity8 CI Bot

2888. By Albert Astals Cid

Improve Launcher ←→ touch menu interaction

Needs to move the label from PanelItemRow to Panel because how clipping works in those items (and fixes some other problems too)

If launcher is locked visible:
     * Touch menus show shifted to the right to not overlap
     * Showing the app drawer closes the touch menus
     * Showing the touch menus closes the app drawer

If launcher is not locked visible:
     * Showing the launcher closes the touch menus
     * Showing the touch menus closes the launcher (LP: #1667620, #1671069)

Approved by: Lukáš Tinkl, Unity8 CI Bot

2889. By Albert Astals Cid

Fix real world submenus (e.g. kate) not getting their first item selected on open

MenuBar.qml: remove unused function
MenuPopup.qml: Select first item when one arrives if there's no currentItem instead of on completion
unitymenumodel.cpp: trick rowCount() to simulate "real world late" menus
tst_MenuPopup.qml: adapt to unitymenumodel.cpp changes (and make the Up test actually press Up and not Down) (LP: #1666859)

Approved by: Lukáš Tinkl, Unity8 CI Bot

2890. By CI Train Bot Account

Releasing 8.15+17.04.20170321-0ubuntu1

Revision history for this message
Unity8 CI Bot (unity8-ci-bot) wrote :
review: Needs Fixing (continuous-integration)
2891. By Launchpad Translations on behalf of unity-team

Launchpad automatic translations update.

Revision history for this message
Unity8 CI Bot (unity8-ci-bot) wrote :
review: Needs Fixing (continuous-integration)
2898. By Pete Woods

Install the platformtest executable and refer to its path via the TARGET_FILE macro

2899. By Pete Woods

Remove indicator-session visibility desktop profile hacks

Revision history for this message
Lukáš Tinkl (lukas-kde) wrote :

With this change, the indicator-session no longer displays in unity8. Is there some other indicator-session branch/MP that we need here?

review: Needs Fixing
Revision history for this message
Unity8 CI Bot (unity8-ci-bot) wrote :

PASSED: Continuous integration, rev:2899
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/3527/
Executed test runs:
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build/4670
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=xenial+overlay,testname=qmluitests.sh/2827
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=zesty,testname=qmluitests.sh/2827
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/4698
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/4522
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/4522/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=zesty/4522
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=zesty/4522/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/4522
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/4522/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=zesty/4522
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=zesty/4522/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/4522
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/4522/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=zesty/4522
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=zesty/4522/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/3527/rebuild

review: Approve (continuous-integration)

Unmerged revisions

2899. By Pete Woods

Remove indicator-session visibility desktop profile hacks

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'plugins/Unity/Indicators/indicatorsmanager.cpp'
2--- plugins/Unity/Indicators/indicatorsmanager.cpp 2016-09-11 22:30:30 +0000
3+++ plugins/Unity/Indicators/indicatorsmanager.cpp 2017-03-24 11:22:33 +0000
4@@ -280,12 +280,10 @@
5 new_indicator->init(data->m_fileInfo.fileName(), settings);
6
7 // convergence:
8- // 1) enable session indicator
9- // 2) enable keyboard indicator
10+ // 1) enable keyboard indicator
11 //
12 // The rest of the indicators respect their default profile (which is "phone", even on desktop PCs)
13- if ((new_indicator->identifier() == QStringLiteral("indicator-session"))
14- || new_indicator->identifier() == QStringLiteral("indicator-keyboard")) {
15+ if (new_indicator->identifier() == QStringLiteral("indicator-keyboard")) {
16 new_indicator->setProfile(QString(m_profile).replace(QStringLiteral("phone"), QStringLiteral("desktop")));
17 } else {
18 new_indicator->setProfile(m_profile);
19
20=== modified file 'qml/Panel/Indicators/IndicatorMenuItemFactory.qml'
21--- qml/Panel/Indicators/IndicatorMenuItemFactory.qml 2016-12-14 15:38:18 +0000
22+++ qml/Panel/Indicators/IndicatorMenuItemFactory.qml 2017-03-24 11:22:33 +0000
23@@ -67,8 +67,6 @@
24 "com.canonical.indicator.location": timezoneMenu,
25 },
26 "indicator-session": {
27- "indicator.user-menu-item": Platform.isPC ? userMenuItem : null,
28- "indicator.guest-menu-item": Platform.isPC ? userMenuItem : null,
29 "com.canonical.indicator.switch": Math.min(Screen.width, Screen.height) > units.gu(60) ? switchMenu : null // Desktop mode switch
30 },
31 "indicator-messages": {
32@@ -77,12 +75,6 @@
33 }
34
35 readonly property var _action_filter_map: {
36- "indicator-session": {
37- "indicator.logout": Platform.isPC ? undefined : null,
38- "indicator.suspend": Platform.isPC ? undefined : null,
39- "indicator.hibernate": Platform.isPC ? undefined : null,
40- "indicator.reboot": Platform.isPC ? undefined : null
41- },
42 "indicator-keyboard": {
43 "indicator.map": null,
44 "indicator.chart": null

Subscribers

People subscribed via source and target branches