Merge lp:~unity-2d-team/unity-2d/shortcut-hint-overlay into lp:~unity-2d-team/unity-2d/unity-2d-shell
Status: | Superseded |
---|---|
Proposed branch: | lp:~unity-2d-team/unity-2d/shortcut-hint-overlay |
Merge into: | lp:~unity-2d-team/unity-2d/unity-2d-shell |
Diff against target: |
1259 lines (+723/-148) 18 files modified
libunity-2d-private/Unity2d/plugin.cpp (+4/-0) libunity-2d-private/src/lens.cpp (+15/-3) libunity-2d-private/src/lenses.cpp (+8/-5) libunity-2d-private/src/lenses.h (+2/-0) shell/Shell.qml (+6/-1) shell/app/shelldeclarativeview.cpp (+7/-0) shell/app/shelldeclarativeview.h (+2/-0) shell/common/Background.qml (+109/-0) shell/common/SearchEntry.qml (+25/-33) shell/dash/Dash.qml (+43/-64) shell/dash/Home.qml (+1/-1) shell/dash/LensBar.qml (+20/-19) shell/dash/LensView.qml (+7/-6) shell/dash/RendererGrid.qml (+6/-14) shell/launcher/LauncherLoader.qml (+12/-2) shell/shortcutoverlay/ShortcutHint.qml (+207/-0) shell/shortcutoverlay/ShortcutHintSection.qml (+160/-0) tests/shell/shortcut-hint-overlay-tests.rb (+89/-0) |
To merge this branch: | bzr merge lp:~unity-2d-team/unity-2d/shortcut-hint-overlay |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Florian Boucault (community) | Needs Fixing on 2012-02-10 | ||
Gerry Boland (community) | Needs Fixing on 2012-02-03 | ||
Michał Sawicz | Needs Fixing on 2012-02-02 | ||
Albert Astals Cid (community) | 2012-02-01 | Needs Fixing on 2012-02-01 | |
Review via email:
|
This proposal has been superseded by a proposal from 2012-02-13.
Description of the change
[launcher] Shortcut list should be shown while super key is held.
Lohith D Shivamurthy (dyams) wrote : | # |
Albert Astals Cid (aacid) wrote : | # |
u2d.tr(description) won't work since the text of the description won't be extracted by the update-unity-2d-pot script, the same for the title. And since the won't be in the .po file they won't be translatable. You'll have to move the u2d.tr to were you have the actual "text" so the text is extracted.
Florian Boucault (fboucault) wrote : | # |
Of course, we won't merge that until unity-2d-shell is merged into lp:unity-2d.
Gerry Boland (gerboland) wrote : | # |
Please give credit to Tiago in the commit message, for working on the UI side of this MR.
Michał Sawicz (saviq) wrote : | # |
Hey, this looks like it could go into lp:unity-2d with minor modifications, and will reduce the diff when we actually go to merging shell into trunk, could you please have a MR against lp:unity-2d for this?
Michał Sawicz (saviq) wrote : | # |
> Hey, this looks like it could go into lp:unity-2d with minor modifications,
> and will reduce the diff when we actually go to merging shell into trunk,
> could you please have a MR against lp:unity-2d for this?
Actually that might not be worth it, since you don't have any fullscreen part of the UI with unity-2d, you'd have to hack up the dash to go fullscreen when the hint is supposed to show.
In that case I propose that we wait with merging this for the shell to be merged into trunk and then MR that change against trunk.
Michał Sawicz (saviq) wrote : | # |
The overlay needs to have a blurred background, it's unreadable when you have a terminal window behind it.
Also, I wonder if the overlay should be input-shaped? Right now you can interact with windows behind the overlay, which makes sense, for it being just an overlay, but not sure that's the designed behavior.
Gerry Boland (gerboland) wrote : | # |
Looks nice! Aside from above comments:
- along with blurred background, the sheen is also needed. See Background.qml
- background has unusual colour tint set. We don't have tinting just now, so should be removed.
- shell/Shell.qml - why remove "KeyNavigation.
- in symmetricKey() and getShortcutKey(), GConfItem declared in Unity2D, no need to import QtQuick
- in your javascript, your notation is mixing camelCase and underscore_
- symmetricKey deserves a comment to explain why it is there.
- can you check with design about using empty strings if no key is set? I think it looks confusing.
- I have a truncation for a long key combination: https:/
- overlay needs to be positioned a little higher, see comparison image: https:/
- there are typos, and some EnglishUK spellings instead of US (see first screenshot again). Yes they're in the mockup, but check with design
- in "Switching" - the left/right cursor keys do not move focus in Metacity. Is this something that needs to be enabled, or should this listing be removed?
- Alt+Middle Mouse drag also doesn't work for me.
- Please use fontUtils.js to specify font sizes
- you have unrelated changes from tests/run-tests.rb & tests/shell/
- recently we decided having authors names in text files was going to be a pain, so we removed them. Will you do the same?
- have you given any thought to accessibility? How will this work with Orca? Since focus is not stolen, what will Orca do? Will it be possible to have Orca read out these shortcuts in some way? Just something to think about.
- import Unity2d 1.0 /* required by GConfItem */ <- GConfItem requires Unity2D, not other way around
- qml (I know, Tiago's) could be cleaned up a little, with both x,y coordinates & anchors being used, lots of unnecessary margin:0 scattered about for example.
Lohith D Shivamurthy (dyams) wrote : | # |
> The overlay needs to have a blurred background, it's unreadable when you have
> a terminal window behind it.
>
I checked with design and have done what they said.
> Also, I wonder if the overlay should be input-shaped? Right now you can
> interact with windows behind the overlay, which makes sense, for it being just
> an overlay, but not sure that's the designed behavior.
Yes you can interact with windows behind it.
- 955. By Lohith D Shivamurthy on 2012-02-08
-
[launcher] Use font utils
- 956. By Lohith D Shivamurthy on 2012-02-08
-
[launcher] Remove unnecessary margins
- 957. By Lohith D Shivamurthy on 2012-02-08
-
[launcher] Use camelCases and remove underscore_
separator - 958. By Lohith D Shivamurthy on 2012-02-08
-
[launcher] Fix spellings to US-English
- 959. By Lohith D Shivamurthy on 2012-02-08
-
[launcher] move import 'Unity2d 1.0' to ShortcutHitSect
ion.qml - 960. By Lohith D Shivamurthy on 2012-02-08
-
[launcher] Remove unnecessary margins
- 961. By Lohith D Shivamurthy on 2012-02-08
-
[launcher] Fix a confusing comment
- 962. By Lohith D Shivamurthy on 2012-02-08
-
[launcher] Fix gconf key for 'move window'
Lohith D Shivamurthy (dyams) wrote : | # |
> Looks nice! Aside from above comments:
> - along with blurred background, the sheen is also needed. See Background.qml
> - background has unusual colour tint set. We don't have tinting just now, so
> should be removed.
I checked with design, this is the conversation:
dyams rosie: should we need to have a background for overlay hint?
dyams rosie: if the overlay is displayed on a white background for ex: gedit window, the shortcuts are hardly visible
rosie dyams: there is a 35% #5e2750 layer and a -80% (-150% - 150%) brightness layer
> - shell/Shell.qml - why remove "KeyNavigation.
The only difference i see in Shell.qml is
30 + Loader {
31 + id: shortcutHintLoader
32 + anchors.centerIn: parent
33 + }
34 +
> - in symmetricKey() and getShortcutKey(), GConfItem declared in Unity2D, no
> need to import QtQuick
Are you sure? FYI, i get this '[WARNING] ShortcutHint.
> - in your javascript, your notation is mixing camelCase and
> underscore_
> the function calls would help readability too.
> - symmetricKey deserves a comment to explain why it is there.
Done.
> - can you check with design about using empty strings if no key is set? I
> think it looks confusing.
true, but its design decision.
> - I have a truncation for a long key combination: https:/
> can you also check with design to see what to do?
Design changed a bit, I have updated the same.
> - overlay needs to be positioned a little higher, see comparison image:
> https:/
It is positioned to the center. I doubt we need to adjust it again.
> - there are typos, and some EnglishUK spellings instead of US (see first
> screenshot again). Yes they're in the mockup, but check with design
Done
> - in "Switching" - the left/right cursor keys do not move focus in Metacity.
> Is this something that needs to be enabled, or should this listing be removed?
No, It works
> - Alt+Middle Mouse drag also doesn't work for me.
No, It works
> - Please use fontUtils.js to specify font sizes
Done.
> - you have unrelated changes from tests/run-tests.rb &
> tests/shell/
Is it? but they are not listed under the 'differences' here.
> - recently we decided having authors names in text files was going to be a
> pain, so we removed them. Will you do the same?
Done.
> - have you given any thought to accessibility? How will this work with Orca?
> Since focus is not stolen, what will Orca do? Will it be possible to have Orca
> read out these shortcuts in some way? Just something to think about.
No.
> - import Unity2d 1.0 /* required by GConfItem */ <- GConfItem requires
> Unity2D, not other way around
Yes I know.
> - qml (I know, Tiago's) could be cleaned up a little, with both x,y
> coordinates & anchors being used, lots of unnecessary margin:0 scattered about
> for example.
Done.
Florian Boucault (fboucault) wrote : | # |
Please resubmit the MR against lp:unity-2d
Florian Boucault (fboucault) wrote : | # |
Maybe I am out of line here but I don't see how the overlay belongs to the launcher.
- 963. By Lohith D Shivamurthy on 2012-02-13
-
merge lp:unity-2d
- 964. By Lohith D Shivamurthy on 2012-02-13
-
Move shortcut overlay files into separate folder
- 965. By Lohith D Shivamurthy on 2012-02-13
-
Directly import gconf 0.1
- 966. By Lohith D Shivamurthy on 2012-02-13
-
keep object id same as objectname
- 967. By Lohith D Shivamurthy on 2012-02-13
-
Add a FIXME for i18n of display strings
- 968. By Lohith D Shivamurthy on 2012-02-13
-
Remove background color
- 969. By Lohith D Shivamurthy on 2012-02-13
-
Use TextCustom instead of Text element
- 970. By Lohith D Shivamurthy on 2012-02-13
-
Fix missing parent object
- 971. By Lohith D Shivamurthy on 2012-02-13
-
Apply blur background
- 972. By Lohith D Shivamurthy on 2012-02-13
-
Activate/Deactivate overlay in shell.qml
- 973. By Lohith D Shivamurthy on 2012-02-13
-
Deactivate the overlay on tapping launcher tile shortcuts
- 974. By Lohith D Shivamurthy on 2012-02-14
-
Add a dummy function and call u2d.tr on all display strings
- 975. By Lohith D Shivamurthy on 2012-02-14
-
Improve background
- 976. By Lohith D Shivamurthy on 2012-02-14
-
Use workaround mentioned in the bugreport
- 977. By Lohith D Shivamurthy on 2012-02-15
-
Use regExp to replace case-insensitively
- 978. By Lohith D Shivamurthy on 2012-02-15
-
Replace Shft with Shift
- 979. By Lohith D Shivamurthy on 2012-02-15
-
Add missing file ModelElement.qml
- 980. By Lohith D Shivamurthy on 2012-02-15
-
merge
- 981. By Lohith D Shivamurthy on 2012-02-16
-
Remove extra field from ModelElement.qml
- 982. By Lohith D Shivamurthy on 2012-02-16
-
deactivate overlay when view looses focus
- 983. By Lohith D Shivamurthy on 2012-02-16
-
Apply black background with 70% opacity
- 984. By Tiago Salem Herrmann on 2012-03-19
-
merge trunk
- 985. By Tiago Salem Herrmann on 2012-03-19
-
onSuperKeyHeldC
hanged was moved to shellManager - 986. By Tiago Salem Herrmann on 2012-03-20
-
remove debug
- 987. By Tiago Salem Herrmann on 2012-03-20
-
Force string object for the key. In some cases key is a object so replace() and substring fail
- 988. By Tiago Salem Herrmann on 2012-03-20
-
fix white spaces
- 989. By Tiago Salem Herrmann on 2012-03-20
-
ignore <Primary> string
- 990. By Tiago Salem Herrmann on 2012-03-21
-
merge trunk
- 991. By Tiago Salem Herrmann on 2012-03-21
-
add MultiMonitor support
Use the same trick as Dash to update the blurred background - 992. By Gerry Boland on 2012-03-26
-
Replace 'KP_' with 'Num' in gconf string. Needed for Numpad keys
- 993. By Gerry Boland on 2012-03-26
-
QtQuick1.0 not needed to read gconf values
- 994. By Gerry Boland on 2012-03-26
-
Add basic RTL support
- 995. By Gerry Boland on 2012-03-29
-
[debian] Install shortcut overlay QML files
Unmerged revisions
- 995. By Gerry Boland on 2012-03-29
-
[debian] Install shortcut overlay QML files
- 994. By Gerry Boland on 2012-03-26
-
Add basic RTL support
- 993. By Gerry Boland on 2012-03-26
-
QtQuick1.0 not needed to read gconf values
- 992. By Gerry Boland on 2012-03-26
-
Replace 'KP_' with 'Num' in gconf string. Needed for Numpad keys
- 991. By Tiago Salem Herrmann on 2012-03-21
-
add MultiMonitor support
Use the same trick as Dash to update the blurred background - 990. By Tiago Salem Herrmann on 2012-03-21
-
merge trunk
- 989. By Tiago Salem Herrmann on 2012-03-20
-
ignore <Primary> string
- 988. By Tiago Salem Herrmann on 2012-03-20
-
fix white spaces
- 987. By Tiago Salem Herrmann on 2012-03-20
-
Force string object for the key. In some cases key is a object so replace() and substring fail
- 986. By Tiago Salem Herrmann on 2012-03-20
-
remove debug
Further details: /bugs.launchpad .net/unity- 2d/+bug/ 855532
The List of keys to be displayed and the layout of the overlay can be found in the bug description https:/
It is discussed with the design team, that certain keys having multiple values in gconf, like 'Switch workspaces' should only be displayed when the keys are symmetric.