Merge lp:~jbicha/unity/lp964673-improve-keyboard-shortcut-overlay-wording into lp:unity

[Jeremy Bícha]

Fix #964673: [UIFe] keyboard shortcut overlay needs more consistent wording

[Tim Penhey (thumper)]

Nothing wrong with the code, just textual changes.

review: Approve

[Unity Merger (unity-merger)]

Attempt to merge into lp:unity failed due to conflicts:

text conflict in plugins/unityshell/src/unityshell.cpp
text conflict in shortcuts/StandaloneShortcuts.cpp

[lp:~jbicha/unity/lp964673-improve-keyboard-shortcut-overlay-wording]

2411. By Andrea Azzarone on 2012-06-14

Fix compilation problems on quantal.. Fixes: https://bugs.launchpad.net/bugs/1012000. Approved by Andrea Azzarone, Sam Spilsbury.

2412. By Andrea Azzarone on 2012-06-14

Fix inconsistent hover/highlight/clickable area behavior.. Fixes: https://bugs.launchpad.net/bugs/979686. Approved by Thomi Richards.

2413. By Andrea Azzarone on 2012-06-15

The dash maximise button changes location if clicked just after the login.. Fixes: https://bugs.launchpad.net/bugs/987674. Approved by Marco Trevisan (Treviño).

2414. By Gord Allott on 2012-06-15

Removes old, unused, preview codebase. Fixes: . Approved by Mikkel Kamstrup Erlandsen.

2415. By Thomi Richards on 2012-06-15

Update method signature in UnityNETWorkareaRegionWindow::resizeNotify so this method is called when the base class resizeNotify method is called.. Fixes: https://bugs.launchpad.net/bugs/1010303. Approved by Tim Penhey.

2416. By Daniel van Vugt on 2012-06-15

Give Unity's input windows more unique names, so we can do matching on them
more reliably. (LP: #1010338)
. Fixes: https://bugs.launchpad.net/bugs/1010338. Approved by Sam Spilsbury, Andrea Azzarone.

2417. By Christopher Lee on 2012-06-18

Use calculator rather than gedit for an autopilot test since gedit has some odd new-instance behavior.. Fixes: . Approved by Thomi Richards.

2418. By Thomi Richards on 2012-06-18

Fixed the test_launcher_keynav_alt_tab_quits autopilot test.. Fixes: . Approved by Christopher Lee.

2419. By Thomi Richards on 2012-06-18

Fix a timing issue in a launcher autopilot test.. Fixes: . Approved by Christopher Lee.

2420. By Thomi Richards on 2012-06-18

Updated HACKING file to point to the new autopilot documentation.. Fixes: . Approved by Tim Penhey.

2421. By Thomi Richards on 2012-06-19

Added extra logging to the autopilot window manager emulator.. Fixes: . Approved by Christopher Lee.

2422. By Thomi Richards on 2012-06-19

Added LauncherEntryRemote to the unity introspection tree.. Fixes: . Approved by Tim Penhey.

2423. By Marco Trevisan (Treviño) on 2012-06-19

tests, glib_source: be more permissive on TestGLibTimeoutSeconds.MultipleShotsRun. Fixes: . Approved by Michal Hruby.

2424. By Thomi Richards on 2012-06-19

Autopilot tests that leave the system in a bad state will now fail with a descriptive message.. Fixes: . Approved by Tim Penhey.

2425. By Thomi Richards on 2012-06-20

Autopilot tests once again attach the unity log to the test results.. Fixes: . Approved by Christopher Lee.

2426. By Thomi Richards on 2012-06-20

Adds logging to the unity / compiz plugin adapter class, and code in autopilot to collect those logs.. Fixes: . Approved by Christopher Lee.

2427. By Marco Trevisan (Treviño) on 2012-06-20

DashController / HudController: hide the overlay when the spread is initiated. Fixes: https://bugs.launchpad.net/bugs/870284. Approved by Tim Penhey.

2428. By Marco Trevisan (Treviño) on 2012-06-20

IMTextEntry: ignore invalid keypress when using modifiers keys.

All the key pressure when pressing the Alt or Super key should be ignored.
When pressing Ctrl key we should only allow: A key, arrow keys, Backspace or Delete keys and Home or Delete keys.. Fixes: https://bugs.launchpad.net/bugs/1013751. Approved by Andrea Azzarone.

2429. By Andrea Azzarone on 2012-06-20

Remove internal partitions after they have been unmounted.. Fixes: https://bugs.launchpad.net/bugs/994163. Approved by Marco Trevisan (Treviño).

2430. By Brandon Schaefer on 2012-06-20

Fixes focus problem when entering expo mode from KeyNav(Alt+F1).. Fixes: https://bugs.launchpad.net/bugs/962408. Approved by Thomi Richards, Jason Smith.

2431. By Christopher Lee on 2012-06-20

Ensured that any test that changes workspaces returns to the original one at completion of the test.. Fixes: . Approved by Thomi Richards.

2432. By Brandon Schaefer on 2012-06-21

Lambda function was using an undefined variable, changed to pass by value now.. Fixes: . Approved by Tim Penhey.

2433. By Brandon Schaefer on 2012-06-21

Documents and files now dragged from the Dash to the Launcher into an application will close the dash.. Fixes: https://bugs.launchpad.net/bugs/865168. Approved by Thomi Richards.

2434. By Thomi Richards on 2012-06-21

Cleaned up launcher autopilot tests.. Fixes: . Approved by Christopher Lee.

2435. By Brandon Schaefer on 2012-06-21

Removed activate_idle_ unique ptr to using the source manager already in launcher controller.. Fixes: . Approved by Marco Trevisan (Treviño).

2436. By Thomi Richards on 2012-06-21

Extend the autopilot bad behavior tests.. Fixes: . Approved by Christopher Lee.

2437. By Thomi Richards on 2012-06-22

Split the autopilot launcher tests into several smaller files.. Fixes: . Approved by Christopher Lee.

2438. By Thomi Richards on 2012-06-22

Made it easier to select an icon in the launcher using the keyboard controls from within an autopilot test.. Fixes: . Approved by Christopher Lee.

2439. By Thomi Richards on 2012-06-25

Fixed an autopilot test that was failing.. Fixes: . Approved by Christopher Lee.

2440. By Thomi Richards on 2012-06-25

Remove several ugly bits in the autopilot tests since we can now use the new Eventually matcher callable support.. Fixes: . Approved by Christopher Lee, jenkins.

2441. By Brandon Schaefer on 2012-06-25

The switcher now focuses it's own window, instead of leaving it to the current one. Now Alt+F4 does not work while the switcher is active.. Fixes: https://bugs.launchpad.net/bugs/926406. Approved by Andrea Azzarone, Thomi Richards.

2442. By Brandon Schaefer on 2012-06-26

Fixes closing the shurnk Hud when clicking outside it's geometry.. Fixes: https://bugs.launchpad.net/bugs/962651. Approved by Thomi Richards, Gord Allott.

2443. By Brandon Schaefer on 2012-06-26

The dash will now open when invoked while in spread/scale mode.. Fixes: https://bugs.launchpad.net/bugs/944033. Approved by Marco Trevisan (Treviño).

2444. By Christopher Lee on 2012-06-27

Added introspection for HudButtons (hud query results). Fixes: . Approved by jenkins, Thomi Richards.

2445. By Andrea Azzarone on 2012-06-27

Remove dead code in QuiclistView.cpp. Fixes: . Approved by Marco Trevisan (Treviño), jenkins.

2446. By Andrea Azzarone on 2012-06-27

Fix a test failure.. Fixes: . Approved by Didier Roche.

2447. By Andrea Azzarone on 2012-06-27

Set a min/max width for the hudbutton to avoid layout issues.. Fixes: https://bugs.launchpad.net/bugs/1016239. Approved by Marco Trevisan (Treviño), jenkins.

2448. By Andrea Azzarone on 2012-06-27

Fix build failure using gcc 4.7. Fixes: . Approved by Łukasz Zemczak, jenkins.

2449. By Marco Trevisan (Treviño) on 2012-06-27

DashView: filter out the unprintable keys when focusing the search bar

The search bar can't be focused when invalid keys (such as shift, ctrl, F1...) are pressed.. Fixes: https://bugs.launchpad.net/bugs/931393. Approved by Andrea Azzarone, jenkins.

2450. By Andrea Azzarone on 2012-06-27

Use the "Range-based for" feature in QuicklistView.cpp. Fixes: . Approved by Marco Trevisan (Treviño), jenkins.

2451. By Christopher Lee on 2012-06-27

Hud test now checks query result before hitting enter.. Fixes: . Approved by Thomi Richards, jenkins.

2452. By Brandon Schaefer on 2012-06-27

Condensed some code in for saving input focus and focusing a new window in unityshell.cpp. Fixes: . Approved by Andrea Azzarone.

2453. By Thomi Richards on 2012-06-29

This branch updates unity to conform to the new Autopilot DBus wire protocol.. Fixes: . Approved by Christopher Lee, jenkins.

2454. By Didier Roche-Tolomelli on 2012-06-29

Remove migration configuration tool from unity as we don't support those upgrade paths anymore.. Fixes: . Approved by jenkins.

2455. By Didier Roche-Tolomelli on 2012-06-29

Fix a crash when a GError exception is triggered. Fixes: https://bugs.launchpad.net/bugs/778470. Approved by Sam Spilsbury, jenkins.

2456. By Marco Trevisan (Treviño) on 2012-06-30

PluginAdapterCompiz: ignore offscreen windows when looking for the top one. Fixes: https://bugs.launchpad.net/bugs/996604. Approved by jenkins, Brandon Schaefer.

2457. By Brandon Schaefer on 2012-06-30

Alt+F1 now closes the dash when activated.. Fixes: https://bugs.launchpad.net/bugs/919209. Approved by Marco Trevisan (Treviño).

2458. By Brandon Schaefer on 2012-06-30

Alt+F4 closes the hud. Fixes: https://bugs.launchpad.net/bugs/1019440. Approved by Marco Trevisan (Treviño).

2459. By Andrea Azzarone on 2012-06-30

Fix hud expand animation.. Fixes: https://bugs.launchpad.net/bugs/932531. Approved by Marco Trevisan (Treviño), Brandon Schaefer, jenkins.

2460. By Andrea Azzarone on 2012-06-30

Fix a crash in compizminimizedwindowhandler.. Fixes: https://bugs.launchpad.net/bugs/851982. Approved by Marco Trevisan (Treviño), jenkins.

2461. By Thomi Richards on 2012-07-01

Fix broken Hud autopilot tests.. Fixes: . Approved by Christopher Lee, jenkins.

2462. By Thomi Richards on 2012-07-01

Fixed two failing dash autopilot tests.. Fixes: . Approved by Christopher Lee.

2463. By Thomi Richards on 2012-07-02

Fixed panel and quicklist autopilot tests.. Fixes: . Approved by Christopher Lee.

2464. By Brandon Schaefer on 2012-07-03

Triggering any quicklist item now closes the dash, if open.. Fixes: https://bugs.launchpad.net/bugs/937338. Approved by Marco Trevisan (Treviño).

2465. By Marco Trevisan (Treviño) on 2012-07-03

GLibSignal: rewrite using the variadic templates to generate multiple types

Also, use std::shared_ptr and boost::noncopyable, plus add utility template function to the Manager to add signals without initialization.. Fixes: . Approved by jenkins, Tim Penhey.

2466. By Jay Taoko on 2012-07-03

* Using Nux API 3.0
* Deprecated nux-image. Fixes: . Approved by Łukasz Zemczak, Didier Roche, Tim Penhey.

2467. By Didier Roche-Tolomelli on 2012-07-03

libgnome-desktop is not needed anymore. Removing the dep check. Fixes: . Approved by Andrea Cimitan.

2468. By Andrea Azzarone on 2012-07-03

Close the overlay is a modifier key is pressed. Don't treat super+tab as a special case.. Fixes: https://bugs.launchpad.net/bugs/934062. Approved by Marco Trevisan (Treviño), jenkins.

2469. By Marco Trevisan (Treviño) on 2012-07-04

IMTextEntry: updated to match the new interface of lp:~3v1n0/nux/text-entry-virtual-clipboard. Fixes: https://bugs.launchpad.net/bugs/1016354. Approved by Brandon Schaefer.

2470. By Daniel van Vugt on 2012-07-04

Stop Unity from redrawing the shell on every frame (ie. when it doesn't need
to). It had a severe impact on graphics performance. (LP: #988079)

This especially improves OpenGL application performance and multi-monitor
desktop performance. Because unity was previously slowing down compiz
rendering by 20-40% for each monitor added to the system. This slowdown no
longer occurs as only damaged areas of the unity shell are repainted. Now
unity will not have any impact on compiz rendering performance for most
video frames.

Coincidentally, this fixes a number of other bugs (linked).. Fixes: https://bugs.launchpad.net/bugs/734908, https://bugs.launchpad.net/bugs/874619, https://bugs.launchpad.net/bugs/886605, https://bugs.launchpad.net/bugs/967112, https://bugs.launchpad.net/bugs/988079, https://bugs.launchpad.net/bugs/992516, https://bugs.launchpad.net/bugs/1016430. Approved by Tim Penhey, Sam Spilsbury, jenkins.

2471. By Daniel van Vugt on 2012-07-06

Revert fix for LP: #833727 for now. It either needs test cases or to be
replaced with a more generic fix that applies to all unityshell plugin
options. And I'd rather wait for the latter before writing tests for it.
. Fixes: https://bugs.launchpad.net/bugs/833727. Approved by .

2472. By Daniel van Vugt on 2012-07-06

Ensure the launcher gets redrawn during keynav mode (LP: #1021549)
. Fixes: https://bugs.launchpad.net/bugs/1021549. Approved by Łukasz Zemczak, Sam Spilsbury.

2473. By Daniel van Vugt on 2012-07-06

Ensure the unity shell gets drawn before (below) windows stacked above it,
like DnD icons (LP: #1021541). Fixes: https://bugs.launchpad.net/bugs/1021541. Approved by Łukasz Zemczak.

2474. By Brandon Schaefer on 2012-07-06

Fixes Alt+F1 mode while the HUD is open.. Fixes: https://bugs.launchpad.net/bugs/1020808. Approved by Łukasz Zemczak, Thomi Richards.

2475. By Timo Jyrinki on 2012-07-06

Fix building on ARM without OpenGL (only EGL + OpenGL ES). A successful build also needed the -fPIC addition for arm.. Fixes: . Approved by Sam Spilsbury, jenkins.

2476. By Thomi Richards on 2012-07-08

Fixed up panel autopilot tests.. Fixes: . Approved by Marco Trevisan (Treviño), Christopher Lee.

2477. By Brandon Schaefer on 2012-07-09

Panels and window buttons do not steal keynav focus when the overlays are open now.. Fixes: https://bugs.launchpad.net/bugs/1021087. Approved by Thomi Richards.

2478. By Daniel van Vugt on 2012-07-09

Fix dash slowness/lag by prioritizing user interaction ahead of active blur
updates. (LP: #1021665) (LP: #874230)
. Fixes: https://bugs.launchpad.net/bugs/874230, https://bugs.launchpad.net/bugs/1021665. Approved by Andrea Azzarone, Sam Spilsbury.

2479. By Thomi Richards on 2012-07-09

Fix several intermittently failing tests.. Fixes: . Approved by Tim Penhey.

2480. By Łukasz Zemczak on 2012-07-09

Release\ 6.0.0

2481. By Thomi Richards on 2012-07-10

Dash and hud now close on Alt+F4 even when the caps lock or num lock keys are active.. Fixes: https://bugs.launchpad.net/bugs/1022801. Approved by Tim Penhey.

2482. By Andrea Azzarone on 2012-07-10

Fix freezes during dnd.. Fixes: https://bugs.launchpad.net/bugs/772445. Approved by Gord Allott.

2483. By Marco Trevisan (Treviño) on 2012-07-10

GLibSource, SourceManager: add utility functions to add timeouts and idles

Update the code to use them.. Fixes: . Approved by Marco Trevisan (Treviño).

2484. By Christopher Lee on 2012-07-10

Removed 2 fast-switching tests, made them manual tests instead.. Fixes: . Approved by Thomi Richards.

2485. By Tim Penhey on 2012-07-10

Reduce the amount of logging spam from bamf by checking for null first.. Fixes: . Approved by Thomi Richards.

2486. By Michal Hruby on 2012-07-10

Added Object::IsType method. Fixes: . Approved by Marco Trevisan (Treviño).

2487. By Andrea Azzarone on 2012-07-10

Revert revision 2398.. Fixes: . Approved by Tim Penhey.

2488. By Thomi Richards on 2012-07-11

Show desktop autopilot tests now use new-style autopilot assertions.. Fixes: . Approved by Christopher Lee.

2489. By Andrea Azzarone on 2012-07-11

Unfold valid drop icons.. Fixes: https://bugs.launchpad.net/bugs/839717. Approved by jenkins, Marco Trevisan (Treviño).

2490. By Brandon Schaefer on 2012-07-11

Hud closes when a Quicklist is open.. Fixes: https://bugs.launchpad.net/bugs/1020246. Approved by Thomi Richards.

2491. By Christopher Lee on 2012-07-11

Removed references to files that have been removed. Fixes: . Approved by Tim Penhey.

2492. By Thomi Richards on 2012-07-11

Autopilot launcher model cleanup.. Fixes: . Approved by Christopher Lee.

2493. By Andrea Azzarone on 2012-07-11

Fix padding issues in quicklist view.. Fixes: https://bugs.launchpad.net/bugs/955158. Approved by Andrea Azzarone.

2494. By Andrea Azzarone on 2012-07-11

Tint the launcher icons that are *not* valid drop receptacles.. Fixes: https://bugs.launchpad.net/bugs/1020891. Approved by Andrea Azzarone.

2495. By Thomi Richards on 2012-07-11

Fix up switcher test suite to use new assert methods available in the latest autopilot.. Fixes: . Approved by jenkins, Brandon Schaefer.

2496. By Brandon Schaefer on 2012-07-11

Quicklist closes when opening the Dash.. Fixes: https://bugs.launchpad.net/bugs/913994. Approved by Thomi Richards.

2497. By Sam Spilsbury on 2012-07-12

Scale the generated fbo tex by the screen dimentions as its screen size
and ensure nux sets the reference viewport back to output size.

(LP: #1016789). Fixes: https://bugs.launchpad.net/bugs/1016789. Approved by Daniel van Vugt, jenkins.

2498. By Brandon Schaefer on 2012-07-12

Default Icon used if one isn't found by bamf.. Fixes: https://bugs.launchpad.net/bugs/886778. Approved by Tim Penhey, Thomi Richards.

2499. By Thomi Richards on 2012-07-12

Fix up panel autopilot tests.. Fixes: . Approved by Christopher Lee, jenkins, Brandon Schaefer.

2500. By Brandon Schaefer on 2012-07-13

Scale mode now does not skip the first super to open the dash.. Fixes: https://bugs.launchpad.net/bugs/1023811. Approved by Thomi Richards.

2501. By Andrea Azzarone on 2012-07-13

Add test for bug 1020891.. Fixes: https://bugs.launchpad.net/bugs/1020891. Approved by Gord Allott, jenkins.

2502. By Marco Trevisan (Treviño) on 2012-07-16

Use std::function instead of sigc::slot. Fixes: . Approved by jenkins, Tim Penhey.

2503. By Daniel van Vugt on 2012-07-16

Don't bind the FBO if it's possible it won't get painted and unbound. That
could lead the the screen freezing while fullscreen windows are open.
(LP: #1024911)
. Fixes: https://bugs.launchpad.net/bugs/1024911. Approved by Łukasz Zemczak, jenkins.

2504. By Daniel van Vugt on 2012-07-16

Fix blinking/flickering of the launcher and panel, especially when running
LibreOffice or Emacs. (LP: #1024459). Fixes: https://bugs.launchpad.net/bugs/1024459. Approved by jenkins, Łukasz Zemczak.

2505. By Andrea Azzarone on 2012-07-16

Fix launcher autoscroll during dnd.. Fixes: https://bugs.launchpad.net/bugs/987223. Approved by Brandon Schaefer, jenkins.

2506. By Marco Trevisan (Treviño) on 2012-07-16

test_bamflaunchericon: don't try to run an application, just test for the icon name. Fixes: . Approved by jenkins, Brandon Schaefer.

2507. By Thomi Richards on 2012-07-17

Fix an autopilot panel test and add additional logging to other autopilot tests.. Fixes: . Approved by jenkins, Brandon Schaefer.

2508. By Andrea Azzarone on 2012-07-17

Fix 'Launcher Edge Stop Overcome Pressure' when the Launcher is set to autohide and 'Sticky edges' are turned off.. Fixes: https://bugs.launchpad.net/bugs/987955. Approved by Marco Trevisan (Treviño), jenkins.

2509. By Marco Trevisan (Treviño) on 2012-07-17

GLibDBusProxy: use glib::Variant instead of std::shared_ptr. Fixes: . Approved by Michal Hruby.

2510. By Michal Hruby on 2012-07-18

Updated the Preview API present in UnityCore to match latest protocol used by libunity. Fixes: . Approved by Marco Trevisan (Treviño), Gord Allott.

2511. By Andrea Azzarone on 2012-07-18

Fix duplicated device launcher icons.. Fixes: https://bugs.launchpad.net/bugs/1010714, https://bugs.launchpad.net/bugs/1010858. Approved by Marco Trevisan (Treviño).

2512. By Didier Roche-Tolomelli on 2012-07-19

Migration session from /desktop/unity/ to /com/canonical/unity/ as the dconf
documentation recommends. Fixes: . Approved by jenkins, Michal Hruby.

2513. By Martin Mrazik on 2012-07-20

Making manual test-cases consistent with TEST_TEMPLATE.txt. Fixes: . Approved by Tim Penhey, jenkins.

2514. By Tim Penhey on 2012-07-23

Remove the -Wno-uninitialized to bring back the compiler warning for uninitialized variables.. Fixes: . Approved by Christopher Lee.

2515. By Marco Trevisan (Treviño) on 2012-07-24

KeyboardUtil: fix possible crash if XkbGetKeyboard returns null

Also use initializer list. Fixes: https://bugs.launchpad.net/bugs/920258. Approved by Tim Penhey, Andrea Azzarone, jenkins.

2516. By Martin Mrazik on 2012-07-24

Adding gtest_output=xml to unit tests to generate Junit XML. Fixes: . Approved by Tim Penhey, jenkins, Sam Spilsbury.

2517. By Marco Trevisan (Treviño) on 2012-07-24

BarrierEdgeController, PointerBarrier: release the sticky edge after that the user has broken it for configurable ms. Fixes: https://bugs.launchpad.net/bugs/1020058. Approved by jenkins, Brandon Schaefer.

2518. By Gary Lasker on 2012-07-25

manual-tests/SoftwareCenter.txt: added tests for Ubuntu Software Center/Unity launcher integration feature. Fixes: . Approved by Brandon Schaefer, jenkins.

2519. By Bilal Akhtar on 2012-07-25

The launcher will auto hide when installing a program from the software center now.. Fixes: https://bugs.launchpad.net/bugs/1002440. Approved by Brandon Schaefer, Marco Trevisan (Treviño).

2520. By Bilal Akhtar on 2012-07-25

SoftwareCenterLauncherIcon: avoid the "Waiting to Install" tooltip to stay after installation

Be consistent with auto-hiding launcher.. Fixes: https://bugs.launchpad.net/bugs/925014. Approved by Brandon Schaefer, Tim Penhey, Marco Trevisan (Treviño).

2521. By Marco Trevisan (Treviño) on 2012-07-26

LauncherController: Rewritten EnsureLaunchers() added tests, fix a crash caused by invalid barrier subscriptions.. Fixes: https://bugs.launchpad.net/bugs/1020075. Approved by Andrea Azzarone.

2522. By Thomi Richards on 2012-07-26

Make the autopilot unity logging functions more stable when unity crashes & restarts.. Fixes: . Approved by Christopher Lee.

2523. By Martin Mrazik on 2012-07-26

Fixed few manual test-cases which were not consistent with the TEST_TEMPLATE.txt and other manual test-cases.. Fixes: . Approved by Thomi Richards.

2524. By Brandon Schaefer on 2012-07-27

The switcher in detail mode will now focus the last active window, instead of the current one. If the current focus window activated the switcher.. Fixes: https://bugs.launchpad.net/bugs/1029215. Approved by Christopher Lee.

2525. By Andrea Azzarone on 2012-07-27

Remove "strut hack" in launcher.cpp. Fixes: https://bugs.launchpad.net/bugs/1024113. Approved by Marco Trevisan (Treviño), jenkins.

2526. By Paweł Stołowski on 2012-07-27

Added image_source_uri property to Preview base class. Fixes: . Approved by Michal Hruby.

2527. By Andrea Azzarone on 2012-07-30

Fix typo in QuicklistView::RecvItemMouseDrag. It was the cause of the bug #1027955.. Fixes: https://bugs.launchpad.net/bugs/1027955. Approved by Marco Trevisan (Treviño).

2528. By Andrea Azzarone on 2012-07-30

Avoid extra calls to GetGeometry and GetAbsoluteGeometry.. Fixes: . Approved by Marco Trevisan (Treviño).

2529. By Brandon Schaefer on 2012-07-30

Add the option to disable the ShowDesktop icon in the switcher in CCSM.. Fixes: . Approved by Marco Trevisan (Treviño).

2530. By Brandon Schaefer on 2012-08-02

The switcher causes a crash if the current desktop has zero results. (Can only happen if you disable Show Desktop Icon). Fixes: . Approved by Marco Trevisan (Treviño).

2531. By Daniel d'Andrada on 2012-08-03

use the gestures support from nux instead of talking to libgeis directly.. Fixes: . Approved by .

2532. By Andrea Azzarone on 2012-08-03

Remove gconf dep in panel::Style.. Fixes: . Approved by Marco Trevisan (Treviño).

2533. By Andrea Azzarone on 2012-08-03

Don't set mouse position on mouse leaving.. Fixes: https://bugs.launchpad.net/bugs/980942. Approved by Brandon Schaefer.

2534. By MC Return on 2012-08-03

Optimized performance and style following suggestions reported by cppcheck:

1. Reduced the scope of various variables.

2. Used prefix ++ operators for non-primitive types, because those can be more efficient than post-increment. Post-increment usually keeps a copy of the previous value, adds extra code and is slower.. Fixes: . Approved by Brandon Schaefer, Marco Trevisan (Treviño).

2535. By <email address hidden> on 2012-08-03

Add keyboard shortcut for the video lens in the shortcut overlay.. Fixes: https://bugs.launchpad.net/bugs/937334. Approved by Łukasz Zemczak.

2536. By Marco Trevisan (Treviño) on 2012-08-03

unityshell: fix the nvidia crash on glDrawArrays disabling/enabling the client state on nuxPrologue/Epilogue (LP: #982626) (LP: #1031554). Fixes: https://bugs.launchpad.net/bugs/982626, https://bugs.launchpad.net/bugs/1031554. Approved by Daniel van Vugt, Sam Spilsbury.

2537. By Łukasz Zemczak on 2012-08-03

Add the libunity private directory to unityshell.so and libunity-core-6.0.so RPATHs, so that they can easily find the libunity-protocol-private.so library on load.. Fixes: . Approved by Michal Hruby.

2538. By Sebastien Bacher on 2012-08-03

Don't specify a specific destination for the dbus signals. Fixes: https://bugs.launchpad.net/bugs/1014850. Approved by Michal Hruby.

2539. By Marco Trevisan (Treviño) on 2012-08-03

FavoriteStoreGSettings: remove unneeded methods, use glib::Signal, refactor tests to use memory backend. Fixes: . Approved by Brandon Schaefer.

2540. By Andrea Azzarone on 2012-08-03

Revert rev 2525. Fixes: . Approved by Michal Hruby.

[MC Return (mc-return)]

jbicha, could you do a bzr merge lp:unity and fix possible conflicts (search for ======== conflict markers) please ?

I would like to see this improvements also.

[John Lea (johnlea)]

Hi, could you please attach before and after screenshots? As soon as these are attached I can review.

review: Needs Information (design)

[lp:~jbicha/unity/lp964673-improve-keyboard-shortcut-overlay-wording]

2541. By Sebastien Bacher on 2012-08-09

Update the POTFILE.in list of sources. Fixes: . Approved by Łukasz Zemczak.

2542. By Andrea Azzarone on 2012-08-09

Cherrypick rev 2539 from lp:~3v1n0/unity/launcher-icon-construction-type.. Fixes: . Approved by Łukasz Zemczak.

2543. By Thomi Richards on 2012-08-09

Use the new clipboard emulator in autopilot. Fixes some hanging tests.. Fixes: . Approved by Brandon Schaefer.

2544. By Brandon Schaefer on 2012-08-09

Calculator and Mahjongg can only have 1 instances now; this breaks AP tests. Character map is now used when you need more then 1 instance.. Fixes: . Approved by Łukasz Zemczak.

2545. By Łukasz Zemczak on 2012-08-10

Release\ 6.2.0

2546. By Marco Trevisan (Treviño) on 2012-08-10

AbstractLauncherIcon: use enum class for IconType and Quirk.

Plus don't close an application when its desktop is removed from favorite store, just unstick it.. Fixes: https://bugs.launchpad.net/bugs/1032157. Approved by .

2547. By Andrea Azzarone on 2012-08-10

Fix flickers when changing launcher icon size.. Fixes: https://bugs.launchpad.net/bugs/1024113. Approved by Tim Penhey.

2548. By Andrea Azzarone on 2012-08-13

Switch on "backlight toggles" mode by default. Fixes: https://bugs.launchpad.net/bugs/1033866. Approved by Brandon Schaefer.

2549. By Daniel van Vugt on 2012-08-13

Detect required package "libgeis", rather than waiting for cryptic build
failures. (LP: #1036095). Fixes: https://bugs.launchpad.net/bugs/1036095. Approved by Sam Spilsbury, Andrea Azzarone.

2550. By Andrea Azzarone on 2012-08-13

Remove gconf dep in u-p-s.. Fixes: . Approved by Didier Roche.

2551. By Brandon Schaefer on 2012-08-13

Switcher is now disabled when the Wall plugin is Active.. Fixes: https://bugs.launchpad.net/bugs/1031959. Approved by Marco Trevisan (Treviño), Thomi Richards.

2552. By Brandon Schaefer on 2012-08-13

Right clicking a launcher icon will open its quicklist even if a quicklist is already open.. Fixes: https://bugs.launchpad.net/bugs/890991. Approved by Marco Trevisan (Treviño).

2553. By Marco Trevisan (Treviño) on 2012-08-13

LauncherIcon: make an icon type to be set on construction, so that it can't be changed. Fixes: https://bugs.launchpad.net/bugs/763560. Approved by Marco Trevisan (Treviño).

2554. By Marco Trevisan (Treviño) on 2012-08-13

unityshell: correctly damage the LauncherDragWindow region. Fixes: https://bugs.launchpad.net/bugs/1026247, https://bugs.launchpad.net/bugs/1032700. Approved by Brandon Schaefer, Andrea Azzarone.

2555. By Brandon Schaefer on 2012-08-13

Right clicking a launcher icon will open its quicklist even if a quicklist is already open.. Fixes: https://bugs.launchpad.net/bugs/890991. Approved by Thomi Richards, Marco Trevisan (Treviño).

2556. By Marco Trevisan (Treviño) on 2012-08-13

Unity: remove the dbus-glib dependency

We don't really need it anymore at this level.. Fixes: . Approved by Andrea Azzarone.

2557. By Tim Penhey on 2012-08-13

Fix a race condition that caused occasional compression of the desktop icon work area in height.. Fixes: . Approved by jenkins, Andrea Azzarone.

2558. By Andrea Azzarone on 2012-08-13

Reduce the spread delay in alt-tab.. Fixes: https://bugs.launchpad.net/bugs/838232. Approved by John Lea, Tim Penhey, jenkins.

2559. By Nicolas d'Offay on 2012-08-14

Fixed lens indicator bug appearing when no lens was currently selected. Prior to the fix it was checking whether a lens was active, all lenses were active. It actually needed to check whether a lens currently was both active and visible and only then render the indicator.. Fixes: https://bugs.launchpad.net/bugs/998752. Approved by Tim Penhey.

2560. By Marco Trevisan (Treviño) on 2012-08-14

QuicklistMenuItem: remove debug bits, factorize duplicated code, remove friendship, use smart pointers

  Removed a lot of duplicated code between implementations, use top-level factorized code, use enum class,
  c++ types and better pointer deletions
  Tests updated. Fixes: . Approved by Tim Penhey.

2561. By Marco Trevisan (Treviño) on 2012-08-14

QuicklistMenuitem, BFBLauncherIcon: don't close the Dash when clicking on BFB quicklist items. Fixes: https://bugs.launchpad.net/bugs/1035641. Approved by Tim Penhey.

2562. By Daniel van Vugt on 2012-08-14

When building with USE_MODERN_COMPIZ_GL, we still need the same fullscreen
windowing logic. Otherwise the unity shell will appear on top of fullscreen
windows. (LP: #1036587). Fixes: https://bugs.launchpad.net/bugs/1036587. Approved by Sam Spilsbury.

2563. By Daniel van Vugt on 2012-08-14

USE_MODERN_COMPIZ_GL does not need to be a CMake option any more.
The macro is instead detected automatically from:
   include/compiz/opengl/opengl.h. Fixes: . Approved by .

2564. By Daniel van Vugt on 2012-08-14

Fix uninitialized variable warnings, causing build failure (LP: #1036514)

You'd only see these errors if you build lp:unity with:
  -DUSE_MODERN_COMPIZ_GL=ON. Fixes: https://bugs.launchpad.net/bugs/1036514. Approved by Sam Spilsbury.

2565. By Marco Trevisan (Treviño) on 2012-08-14

AbstractLauncherIcon: Use a vector of glib::Object<DbusmenuMenuitem> to get the Menus. Fixes: https://bugs.launchpad.net/bugs/1036338. Approved by Marco Trevisan (Treviño).

2566. By Daniel van Vugt on 2012-08-15

Fixed: Benchmark window was being rendered shrunken, misplaced and frequently
invisible if unity was built with USE_MODERN_COMPIZ_GL. (LP: #1036528)

This was caused by some rather important code being #ifdef'd out incorrectly.. Fixes: https://bugs.launchpad.net/bugs/1036528. Approved by Sam Spilsbury.

2567. By Michal Hruby on 2012-08-15

Don't compare entire geometry when re-rendering focus overlay in PlacesGroup. Fixes: https://bugs.launchpad.net/bugs/1033306. Approved by Marco Trevisan (Treviño).

2568. By Nick Dedekind on 2012-08-15

Added Music, App, Movie (basic) & Generic dash preview UIs and preview standalones.. Fixes: . Approved by Neil J. Patel.

2569. By Gord Allott on 2012-08-15

Add an iterator to unity core that iterates through DeeModels. Fixes: . Approved by Michal Hruby, Francis Ginther, jenkins, Alex Launi.

2570. By Nick Dedekind on 2012-08-15

Added handlers for StaticCairoText::SetMaximumSize/SetMaximumWidth which cause cached texture to be updated if width has changed.
StaticCairoText::GetTextExtents now updates need_new_extent_cache_ to false once the texture has updated so that it is not re-cached every time called.. Fixes: https://bugs.launchpad.net/bugs/1037187. Approved by Neil J. Patel.

2571. By Marco Trevisan (Treviño) on 2012-08-15

glib::Signal: add weak referencies to objects and cleanup them when the GObjects get invalid. Fixes: . Approved by Brandon Schaefer.

2572. By Michal Hruby on 2012-08-16

Fixes broken tests because of changes in libunity API. Fixes: . Approved by Didier Roche.

2573. By Didier Roche-Tolomelli on 2012-08-16

revert revision 2566. mhr3 and gord are seeing important corruptions on nvidia with blob driver and opengl 3.. Fixes: . Approved by .

2574. By Gord Allott on 2012-08-16

plumbing to enable the previews to activate on right click in the dash. . Fixes: . Approved by Neil J. Patel.

2575. By Łukasz Zemczak on 2012-08-16

Added some .convert files (for gsettings-data-convert) for converting some gconf settings to gsettings. The compiz upstream tree should have the migration tool that makes migration easier.. Fixes: . Approved by Sam Spilsbury, jenkins.

2576. By Thomi Richards on 2012-08-16

Update dash emulator to use new autopilot API.. Fixes: . Approved by Omer Akram.

2577. By Omer Akram on 2012-08-17

test if video lens reveals with super+v. Fixes: . Approved by Tim Penhey.

2578. By Brandon Schaefer on 2012-08-17

The launcher will only autohide when the mouse leaves the launcher now.. Fixes: https://bugs.launchpad.net/bugs/745707. Approved by Thomi Richards.

2579. By Andrea Azzarone on 2012-08-17

Always set _launcher_drag_delta_max/_launcher_drag_delta_min.. Fixes: . Approved by Tim Penhey.

2580. By MC Return on 2012-08-17

Minor optimizations:

Used 'if (entries_.empty())' instead of 'if (entries_.size() == 0) because it can be faster. xxxx.size() can take linear time while xxxx.empty() is guaranteed to take constant time.

Replaced 'windows.size() > 0' with '!windows.empty()' and '!m_ActionList.size()' with 'm_ActionList.empty()' (x2) in PluginAdapterCompiz.cpp to optimize performance.

Simplified void Indicator::Sync(Indicator::Entries const& new_entries) by removing the assignment of an empty list into an empty list and just using if (!entries_.empty()) instead of the else condition.

Removed redundant parentheses.

Introduced std::size_t num_windows = windows.size(); and changed the if statement in PluginAdapter::ScaleWindowGroup to check num_windows.

Removed declaration of the unused variable 'next_focused_uri'.. Fixes: . Approved by Tim Penhey.

2581. By Michal Hruby on 2012-08-17

Use FilterModels inside each ResultView.. Fixes: https://bugs.launchpad.net/bugs/1027811. Approved by Marco Trevisan (Treviño).

2582. By Gord Allott on 2012-08-17

fixes dash drawing when preview is open. Fixes: . Approved by Neil J. Patel.

2583. By Michal Hruby on 2012-08-17

Use single category per lens in home lens. Fixes: . Approved by Neil J. Patel.

2584. By MC Return on 2012-08-20

Minor speed improvements.. Fixes: . Approved by Brandon Schaefer.

2585. By Daniel van Vugt on 2012-08-20

Fix build failure. Don't refer to files that don't exist:
  dash/PreviewMusic.cpp
  dash/PreviewMusicTrack.cpp
(LP: #1038886)
. Fixes: https://bugs.launchpad.net/bugs/1038886. Approved by Andrea Azzarone.

2586. By Daniel van Vugt on 2012-08-20

Stop the launcher from overdrawing itself, hence losing transparency. It seems
to happen whenever the panel redraws but the launcher region is not damaged.
I have no idea why redrawing the panel unconditionally redraws the launcher
too, but this works around the problem for now. (LP: #1036519). Fixes: https://bugs.launchpad.net/bugs/1036519. Approved by Sam Spilsbury.

2587. By Tim Penhey on 2012-08-20

Enable the new nux animation framework. Update BGHash to use the new animations.. Fixes: . Approved by Andrea Azzarone.

2588. By Paweł Stołowski on 2012-08-20

Implemented Preview::EmitClosed method. Fixes: . Approved by Michal Hruby.

2589. By Daniel d'Andrada on 2012-08-20

Multi-touch gestures for switching between windows (a.k.a. "alt-tab with gestures").

Approved by Tim Penhey.

The following gestural interactions with the window switcher have been implemented:

1. 3-fingers double tap -> switches to previous window

2. 3-fingers tap followed by 3-fingers hold -> shows window switcher
- drag those 3-fingers -> change selected window icon
- release fingers -> selects window and closes switcher

3. 3-fingers tap followed by 3-fingers hold -> shows window switcher
- release fingers -> switcher will kept being shown for some seconds still
- drag with one or three fingers -> change selected window
- release finger(s) -> selects window and closes switcher

4. 3-fingers tap followed by 3-fingers hold -> shows window switcher
- release fingers -> switcher will kept being shown for some seconds still
- tap on some window icon -> selects that icon and closes the switcher

Unit tests included.. Fixes: . Approved by Tim Penhey.

2590. By Andrea Azzarone on 2012-08-20

Use the same padding for the minimum width and height of hud::Icon.. Fixes: https://bugs.launchpad.net/bugs/1035951. Approved by Brandon Schaefer.

2591. By Marco Trevisan (Treviño) on 2012-08-20

Added AP tests for ibus activation on keydown and on keyup.. Fixes: . Approved by Tim Penhey, jenkins.

2592. By Jason Smith on 2012-08-20

Implements coverflow in the dash based on the work done in Nux to create a coverflow widget. Fixes: . Approved by Gord Allott.

2593. By Daniel van Vugt on 2012-08-21

Don't comment out the nuxPrologue/Epilogue functions if building
USE_MODERN_COMPIZ_GL. They are critical functions and commenting them out
causes serious rendering bugs: (LP: #1036528) (LP: #1037949). Fixes: https://bugs.launchpad.net/bugs/1036528, https://bugs.launchpad.net/bugs/1037949. Approved by Sam Spilsbury.

2594. By Daniel van Vugt on 2012-08-21

Always paint the shell separately per output. Otherwise the logic for
deciding whether the shell should be painted on a given monitor makes no
sense and the shell is often not painted at all. (LP: #1037408)

This also appears to resolve VBO and FBO rendering bugs:
(LP: #1036568) (LP: #1036569)
and Benchmark painting:
(LP: #1036609). Fixes: https://bugs.launchpad.net/bugs/1036568, https://bugs.launchpad.net/bugs/1036569, https://bugs.launchpad.net/bugs/1036609, https://bugs.launchpad.net/bugs/1037408. Approved by Sam Spilsbury.

2595. By Omer Akram on 2012-08-21

get panel height from the panel instead of hardcoding, also removed unneeded semicolons.. Fixes: . Approved by Thomi Richards.

2596. By Omer Akram on 2012-08-21

Removed duplicate manual test which is already present in Launcher.txt file. . Fixes: . Approved by Thomi Richards.

2597. By Sam Spilsbury on 2012-08-21

Fixes monitor hotplug corruption (LP #1039410). Fixes: https://bugs.launchpad.net/bugs/1039410. Approved by Daniel van Vugt.

2598. By Michal Hruby on 2012-08-21

Implement rendering of UnityProtocolAnnotatedIcon. Fixes: . Approved by Gord Allott, Marco Trevisan (Treviño).

2599. By Daniel van Vugt on 2012-08-21

Fix multiple build failures due to incorrect #ifdefs when configured with
-DBUILD_GLES=ON (which then defines USE_GLES).
(LP: #1039453). Fixes: https://bugs.launchpad.net/bugs/1039453. Approved by Sam Spilsbury.

2600. By Omer Akram on 2012-08-21

HUD should activate search item and close itself on enter.. Fixes: . Approved by Andrea Azzarone.

2601. By Nick Dedekind on 2012-08-21

Stopped previews with no image or image source uri logging warning messages from the thumbnail generator.. Fixes: . Approved by Michal Hruby.

2602. By Omer Akram on 2012-08-21

Tests if Middle click pastes into dash searchbar.. Fixes: . Approved by Thomi Richards.

2603. By Omer Akram on 2012-08-21

Tests that Alt+ArrowKey events are correctly passed to the active window when not interacting with Unity.. Fixes: . Approved by Brandon Schaefer.

2604. By Andrea Azzarone on 2012-08-22

Fix annoying warning in UnityCore/Hud.cpp. Fixes: https://bugs.launchpad.net/bugs/1039451. Approved by Tim Penhey.

2605. By Nick Dedekind on 2012-08-22

Adding test for fix-950782, Application switching (Alt+tab) no longer updates panel menu titles.. Fixes: . Approved by Andrea Azzarone, Thomi Richards.

2606. By Nick Dedekind on 2012-08-22

Added Autopilot tests for Dash Previews.
Fixed introspection of Lens Results for use in preview autopilot tests. Lens result introspection includes proposed position of the result in the result grid view.. Fixes: . Approved by Gord Allott.

2607. By Andrea Azzarone on 2012-08-22

Use linear filtering to draw icons (when needed).. Fixes: https://bugs.launchpad.net/bugs/1036231. Approved by Tim Penhey.

2608. By Nick Dedekind on 2012-08-22

Fix keyboard navigation in dash previews. Fixes: . Approved by Gord Allott.

2609. By Sam Spilsbury on 2012-08-23

Provides integration into gnome-control-center for unity.. Fixes: . Approved by Timo Jyrinki, Tim Penhey.

2610. By Christopher Lee on 2012-08-23

A typo (keyword argument wasn't properly removed) in an autopilot emulator was causing tests to error. Fixes: . Approved by Thomi Richards.

2611. By Daniel van Vugt on 2012-08-23

Fix build failure. Don't refer to files that don't exist:
  dash/PreviewMusic.cpp
  dash/PreviewMusicTrack.cpp
(LP: #1040431) (regression of LP: #1038886). Fixes: https://bugs.launchpad.net/bugs/1040431. Approved by Andrea Azzarone.

2612. By Omer Akram on 2012-08-23

removed a manual test case which no longer applies after bzr2605. Fixes: . Approved by Sam Spilsbury.

2613. By Andrea Cimitan on 2012-08-23

Fix bug 1038138 by applying some tweaks for tiles with backlight 0.0f. Fixes: https://bugs.launchpad.net/bugs/1038138. Approved by Andrea Azzarone.

2614. By Tim Penhey on 2012-08-23

Changed code to get a better, readable stack trace for bug 964897. Fixes: https://bugs.launchpad.net/bugs/964897. Approved by Andrea Azzarone.

2615. By Bilal Akhtar on 2012-08-23

Dragging and dropping a SD card to the trash should 'safely remove' the card. Fixes: https://bugs.launchpad.net/bugs/960910. Approved by Andrea Azzarone.

2616. By Bilal Akhtar on 2012-08-23

Increases launcher scroll speed using mouse wheel by 2.5 times the original.. Fixes: https://bugs.launchpad.net/bugs/906072. Approved by Andrea Azzarone.

2617. By Jason Smith on 2012-08-23

Fix bug #1039959. Fixes: https://bugs.launchpad.net/bugs/1039959. Approved by .

2618. By Charles Kerr on 2012-08-23

Adds the new Sync Indicator into panel-service's indicator_order list.. Fixes: . Approved by Omer Akram.

2619. By Andrea Azzarone on 2012-08-23

Fix bottom-up key navigation in dash filterbar.. Fixes: https://bugs.launchpad.net/bugs/1028810. Approved by Brandon Schaefer.

2620. By Omer Akram on 2012-08-23

fix TODO; test newly activated lens' searchbar have the focus. Also removed un-needed semicolons. Fixes: . Approved by Thomi Richards.

2621. By Omer Akram on 2012-08-23

manual-test to AP; makes sure double clicking the grab area of a maximized app restores(unmaximize) it.. Fixes: . Approved by Thomi Richards.

2622. By Omer Akram on 2012-08-23

makes sure if the hud closes when the mouse is clicked outside of the HUD region after a search has been entered and then cleared from the searchbox. Removed the equivalent manual-test.

Now we also make sure the Hud closes with the press of escape key in both shrunk and expanded forms. Fixes: . Approved by Thomi Richards.

2623. By Nick Dedekind on 2012-08-24

Fixed introspection bug in dash result view. (LP#1040875). Fixes: https://bugs.launchpad.net/bugs/1040875. Approved by Marco Trevisan (Treviño).

2624. By Robert Carr on 2012-08-24

Webapps support for unity. Fixes: . Approved by Timo Jyrinki, Marco Trevisan (Treviño).

2625. By Sam Spilsbury on 2012-08-25

Don't enable client states if BUILD_MODERN_COMPIZ_GL. Fixes: https://bugs.launchpad.net/bugs/1041123. Approved by Daniel van Vugt, Olivier Tilloy.

2626. By Jeremy Bícha on 2012-08-26

Improve the wording on the keyboard shortcut overlay. Fixes: https://bugs.launchpad.net/bugs/964673

[Brandon Schaefer (brandontschaefer)]

This was merged over here:
https://code.launchpad.net/~brandontschaefer/unity/improve-keyboard-shortcut-overlay-wording

[Jeremy Bícha (jbicha)]

Thanks Brandon.

Unmerged revisions

2626. By Jeremy Bícha on 2012-08-26

Improve the wording on the keyboard shortcut overlay. Fixes: https://bugs.launchpad.net/bugs/964673

=== modified file 'plugins/unityshell/src/unityshell.cpp'
--- plugins/unityshell/src/unityshell.cpp	2012-08-24 09:53:54 +0000
+++ plugins/unityshell/src/unityshell.cpp	2012-08-26 17:19:18 +0000
@@ -3123,11 +3123,11 @@
   // Launcher...
   std::string const launcher(_("Launcher"));
 
-  hints_.push_back(std::make_shared<shortcut::Hint>(launcher, "", _(" (Press)"), _("Open Launcher, displays shortcuts."), shortcut::COMPIZ_KEY_OPTION, "unityshell", "show_launcher" ));
+  hints_.push_back(std::make_shared<shortcut::Hint>(launcher, "", _(" (Press)"), _("Open Launcher, display these shortcuts."), shortcut::COMPIZ_KEY_OPTION, "unityshell", "show_launcher" ));
   hints_.push_back(std::make_shared<shortcut::Hint>(launcher, "", "", _("Open Launcher keyboard navigation mode."), shortcut::COMPIZ_KEY_OPTION, "unityshell", "keyboard_focus"));
-  hints_.push_back(std::make_shared<shortcut::Hint>(launcher, "", "", _("Switch applications via Launcher."), shortcut::COMPIZ_KEY_OPTION, "unityshell", "launcher_switcher_forward"));
+  hints_.push_back(std::make_shared<shortcut::Hint>(launcher, "", "", _("Switch applications via the Launcher."), shortcut::COMPIZ_KEY_OPTION, "unityshell", "launcher_switcher_forward"));
   hints_.push_back(std::make_shared<shortcut::Hint>(launcher, "", _(" + 1 to 9"), _("Same as clicking on a Launcher icon."), shortcut::COMPIZ_KEY_OPTION, "unityshell", "show_launcher"));
-  hints_.push_back(std::make_shared<shortcut::Hint>(launcher, "", _(" + Shift + 1 to 9"), _("Open new window of the app."), shortcut::COMPIZ_KEY_OPTION, "unityshell", "show_launcher"));
+  hints_.push_back(std::make_shared<shortcut::Hint>(launcher, "", _(" + Shift + 1 to 9"), _("Open a new window of the app."), shortcut::COMPIZ_KEY_OPTION, "unityshell", "show_launcher"));
   hints_.push_back(std::make_shared<shortcut::Hint>(launcher, "", " + T", _("Open the Trash."), shortcut::COMPIZ_KEY_OPTION, "unityshell", "show_launcher"));
 
   // Dash...
@@ -3138,42 +3138,42 @@
   hints_.push_back(std::make_shared<shortcut::Hint>(dash, "", " + F", _("Open the Dash Files Lens."), shortcut::COMPIZ_KEY_OPTION,"unityshell", "show_launcher"));
   hints_.push_back(std::make_shared<shortcut::Hint>(dash, "", " + M", _("Open the Dash Music Lens."), shortcut::COMPIZ_KEY_OPTION, "unityshell", "show_launcher"));
   hints_.push_back(std::make_shared<shortcut::Hint>(dash, "", " + V", _("Open the Dash Video Lens."), shortcut::COMPIZ_KEY_OPTION, "unityshell", "show_launcher"));
-  hints_.push_back(std::make_shared<shortcut::Hint>(dash, "", "", _("Switches between Lenses."), shortcut::HARDCODED_OPTION, _("Ctrl + Tab")));
-  hints_.push_back(std::make_shared<shortcut::Hint>(dash, "", "", _("Moves the focus."), shortcut::HARDCODED_OPTION, _("Cursor Keys")));
-  hints_.push_back(std::make_shared<shortcut::Hint>(dash, "", "", _("Open currently focused item."), shortcut::HARDCODED_OPTION, _("Enter & Return")));
+  hints_.push_back(std::make_shared<shortcut::Hint>(dash, "", "", _("Switch between Lenses."), shortcut::HARDCODED_OPTION, _("Ctrl + Tab")));
+  hints_.push_back(std::make_shared<shortcut::Hint>(dash, "", "", _("Move the focus."), shortcut::HARDCODED_OPTION, _("Arrow Keys")));
+  hints_.push_back(std::make_shared<shortcut::Hint>(dash, "", "", _("Open currently focused item."), shortcut::HARDCODED_OPTION, _("Enter")));
 
   // Menu Bar
   std::string const menubar(_("HUD & Menu Bar"));
 
   hints_.push_back(std::make_shared<shortcut::Hint>(menubar, "", _(" (Tap)"), _("Open the HUD."), shortcut::COMPIZ_KEY_OPTION, "unityshell", "show_hud"));
-  hints_.push_back(std::make_shared<shortcut::Hint>(menubar, "", _(" (Press)"), _("Reveals application menu."), shortcut::HARDCODED_OPTION, "Alt"));
-  hints_.push_back(std::make_shared<shortcut::Hint>(menubar, "", "", _("Opens the indicator menu."), shortcut::COMPIZ_KEY_OPTION, "unityshell", "panel_first_menu"));
-  hints_.push_back(std::make_shared<shortcut::Hint>(menubar, "", "", _("Moves focus between indicators."), shortcut::HARDCODED_OPTION, _("Cursor Left or Right")));
+  hints_.push_back(std::make_shared<shortcut::Hint>(menubar, "", _(" (Press)"), _("Reveal the application menu."), shortcut::HARDCODED_OPTION, "Alt"));
+  hints_.push_back(std::make_shared<shortcut::Hint>(menubar, "", "", _("Open the indicator menu."), shortcut::COMPIZ_KEY_OPTION, "unityshell", "panel_first_menu"));
+  hints_.push_back(std::make_shared<shortcut::Hint>(menubar, "", "", _("Move focus between indicators."), shortcut::HARDCODED_OPTION, _("Left or Right")));
 
   // Switching
   std::string const switching(_("Switching"));
 
   hints_.push_back(std::make_shared<shortcut::Hint>(switching, "", "", _("Switch between applications."), shortcut::COMPIZ_KEY_OPTION, "unityshell", "alt_tab_forward"));
   hints_.push_back(std::make_shared<shortcut::Hint>(switching, "", "", _("Switch windows of current application."), shortcut::COMPIZ_KEY_OPTION, "unityshell", "alt_tab_next_window"));
-  hints_.push_back(std::make_shared<shortcut::Hint>(switching, "", "", _("Moves the focus."), shortcut::HARDCODED_OPTION, _("Cursor Left or Right")));
+  hints_.push_back(std::make_shared<shortcut::Hint>(switching, "", "", _("Moves the focus."), shortcut::HARDCODED_OPTION, _("Left or Right")));
 
   // Workspaces
   std::string const workspaces(_("Workspaces"));
 
   hints_.push_back(std::make_shared<shortcut::Hint>(workspaces, "", "", _("Spread workspaces."), shortcut::COMPIZ_KEY_OPTION, "expo", "expo_key"));
-  hints_.push_back(std::make_shared<shortcut::Hint>(workspaces, "",  _(" + Cursor Keys"), _("Switch workspaces."), shortcut::COMPIZ_METAKEY_OPTION, "wall", "left_key"));
-  hints_.push_back(std::make_shared<shortcut::Hint>(workspaces, "",  _(" + Cursor Keys"), _("Move focused window to different workspace."), shortcut::COMPIZ_METAKEY_OPTION, "wall", "left_window_key"));
+  hints_.push_back(std::make_shared<shortcut::Hint>(workspaces, "",  _(" + Arrow Keys"), _("Switch workspaces."), shortcut::COMPIZ_METAKEY_OPTION, "wall", "left_key"));
+  hints_.push_back(std::make_shared<shortcut::Hint>(workspaces, "",  _(" + Arrow Keys"), _("Move focused window to different workspace."), shortcut::COMPIZ_METAKEY_OPTION, "wall", "left_window_key"));
 
   // Windows
   std::string const windows(_("Windows"));
-  hints_.push_back(std::make_shared<shortcut::Hint>(windows, "", "", _("Spreads all windows in the current workspace."), shortcut::COMPIZ_KEY_OPTION, "scale", "initiate_all_key"));
-  hints_.push_back(std::make_shared<shortcut::Hint>(windows, "", "", _("Minimises all windows."), shortcut::COMPIZ_KEY_OPTION, "core", "show_desktop_key"));
-  hints_.push_back(std::make_shared<shortcut::Hint>(windows, "", "", _("Maximises the current window."), shortcut::COMPIZ_KEY_OPTION, "core", "maximize_window_key"));
-  hints_.push_back(std::make_shared<shortcut::Hint>(windows, "", "", _("Restores or minimises current window."), shortcut::COMPIZ_KEY_OPTION, "core", "unmaximize_window_key"));
-  hints_.push_back(std::make_shared<shortcut::Hint>(windows, "", _(" or Right"), _("Semi-maximises current window."), shortcut::COMPIZ_KEY_OPTION, "grid", "put_left_key"));
-  hints_.push_back(std::make_shared<shortcut::Hint>(windows, "", "", _("Closes current window."), shortcut::COMPIZ_KEY_OPTION, "core", "close_window_key"));
-  hints_.push_back(std::make_shared<shortcut::Hint>(windows, "", "", _("Opens window accessibility menu."), shortcut::HARDCODED_OPTION, _("Alt + Space")));
-  hints_.push_back(std::make_shared<shortcut::Hint>(windows, "", "", _("Places window in corresponding positions."), shortcut::HARDCODED_OPTION, _("Ctrl + Alt + Num")));
+  hints_.push_back(std::make_shared<shortcut::Hint>(windows, "", "", _("Spread all windows in the current workspace."), shortcut::COMPIZ_KEY_OPTION, "scale", "initiate_all_key"));
+  hints_.push_back(std::make_shared<shortcut::Hint>(windows, "", "", _("Minimize all windows."), shortcut::COMPIZ_KEY_OPTION, "core", "show_desktop_key"));
+  hints_.push_back(std::make_shared<shortcut::Hint>(windows, "", "", _("Maximize current window."), shortcut::COMPIZ_KEY_OPTION, "core", "maximize_window_key"));
+  hints_.push_back(std::make_shared<shortcut::Hint>(windows, "", "", _("Restore or minimise current window."), shortcut::COMPIZ_KEY_OPTION, "core", "unmaximize_window_key"));
+  hints_.push_back(std::make_shared<shortcut::Hint>(windows, "", _(" or Right"), _("Semi-maximize current window."), shortcut::COMPIZ_KEY_OPTION, "grid", "put_left_key"));
+  hints_.push_back(std::make_shared<shortcut::Hint>(windows, "", "", _("Close current window."), shortcut::COMPIZ_KEY_OPTION, "core", "close_window_key"));
+  hints_.push_back(std::make_shared<shortcut::Hint>(windows, "", "", _("Open the window accessibility menu."), shortcut::HARDCODED_OPTION, _("Alt + Space")));
+  hints_.push_back(std::make_shared<shortcut::Hint>(windows, "", "", _("Place window in corresponding position."), shortcut::HARDCODED_OPTION, _("Ctrl + Alt + Num")));
   hints_.push_back(std::make_shared<shortcut::Hint>(windows, "", _(" Drag"), _("Move window."), shortcut::COMPIZ_MOUSE_OPTION, "move", "initiate_button"));
   hints_.push_back(std::make_shared<shortcut::Hint>(windows, "", _(" Drag"), _("Resize window."), shortcut::COMPIZ_MOUSE_OPTION, "resize", "initiate_button"));
 }

=== modified file 'shortcuts/StandaloneShortcuts.cpp'
--- shortcuts/StandaloneShortcuts.cpp	2012-08-13 20:16:28 +0000
+++ shortcuts/StandaloneShortcuts.cpp	2012-08-26 17:19:18 +0000
@@ -35,10 +35,10 @@
   std::list<std::shared_ptr<shortcut::AbstractHint>> hints;
   
   // Launcher...
-  hints.push_back(std::shared_ptr<shortcut::AbstractHint>(new shortcut::MockHint(_("Launcher"), "", _(" (Press)"), _("Open Launcher, displays shortcuts."), shortcut::COMPIZ_KEY_OPTION, "unityshell", "show_launcher" )));
+  hints.push_back(std::shared_ptr<shortcut::AbstractHint>(new shortcut::MockHint(_("Launcher"), "", _(" (Hold)"), _("Open Launcher, displays shortcuts."), shortcut::COMPIZ_KEY_OPTION, "unityshell", "show_launcher" )));
   hints.push_back(std::shared_ptr<shortcut::AbstractHint>(new shortcut::MockHint(_("Launcher"), "", "", _("Open Launcher keyboard navigation mode."), shortcut::COMPIZ_KEY_OPTION, "unityshell", "keyboard_focus")));
   // FIXME: Implemstd::shared_ptr<shortcut::AbstractHint>(ent it...
-  hints.push_back(std::shared_ptr<shortcut::AbstractHint>(new shortcut::MockHint(_("Launcher"), "", "", _("Switch application via Launcher."), shortcut::HARDCODED_OPTION, "Super + Tab")));
+  hints.push_back(std::shared_ptr<shortcut::AbstractHint>(new shortcut::MockHint(_("Launcher"), "", "", _("Switch applications via the Launcher."), shortcut::HARDCODED_OPTION, "Super + Tab")));
   hints.push_back(std::shared_ptr<shortcut::AbstractHint>(new shortcut::MockHint(_("Launcher"), "", _(" + 1 to 9"), _("Same as clicking on a Launcher icon."), shortcut::COMPIZ_KEY_OPTION, "unityshell", "show_launcher")));
   hints.push_back(std::shared_ptr<shortcut::AbstractHint>(new shortcut::MockHint(_("Launcher"), "", _(" + Shift + 1 to 9"), _("Open a new window of the app."), shortcut::COMPIZ_KEY_OPTION, "unityshell", "show_launcher")));
   hints.push_back(std::shared_ptr<shortcut::AbstractHint>(new shortcut::MockHint(_("Launcher"), "", " + T", _("Open the Trash."), shortcut::COMPIZ_KEY_OPTION, "unityshell", "show_launcher"))); 
@@ -49,39 +49,39 @@
   hints.push_back(std::shared_ptr<shortcut::AbstractHint>(new shortcut::MockHint(_("Dash"), "", " + A", _("Open the Dash App Lens."), shortcut::COMPIZ_KEY_OPTION, "unityshell", "show_launcher")));
   hints.push_back(std::shared_ptr<shortcut::AbstractHint>(new shortcut::MockHint(_("Dash"), "", " + F", _("Open the Dash Files Lens."), shortcut::COMPIZ_KEY_OPTION,"unityshell", "show_launcher")));
   hints.push_back(std::shared_ptr<shortcut::AbstractHint>(new shortcut::MockHint(_("Dash"), "", " + M", _("Open the Dash Music Lens."), shortcut::COMPIZ_KEY_OPTION, "unityshell", "show_launcher")));
-  hints.push_back(std::shared_ptr<shortcut::AbstractHint>(new shortcut::MockHint(_("Dash"), "", "", _("Switches between Lenses."), shortcut::HARDCODED_OPTION, "Ctrl + Tab")));
-  hints.push_back(std::shared_ptr<shortcut::AbstractHint>(new shortcut::MockHint(_("Dash"), "", "", _("Moves the focus."), shortcut::HARDCODED_OPTION, _("Cursor Keys"))));
-  hints.push_back(std::shared_ptr<shortcut::AbstractHint>(new shortcut::MockHint(_("Dash"), "", "", _("Open currently focused item."), shortcut::HARDCODED_OPTION, _("Enter / Return"))));
+  hints.push_back(std::shared_ptr<shortcut::AbstractHint>(new shortcut::MockHint(_("Dash"), "", "", _("Switch between Lenses."), shortcut::HARDCODED_OPTION, "Ctrl + Tab")));
+  hints.push_back(std::shared_ptr<shortcut::AbstractHint>(new shortcut::MockHint(_("Dash"), "", "", _("Move the focus."), shortcut::HARDCODED_OPTION, _("Arrow Keys"))));
+  hints.push_back(std::shared_ptr<shortcut::AbstractHint>(new shortcut::MockHint(_("Dash"), "", "", _("Open currently focused item."), shortcut::HARDCODED_OPTION, _("Enter"))));
   hints.push_back(std::shared_ptr<shortcut::AbstractHint>(new shortcut::MockHint(_("Dash"), "", "", _("'Run Command' mode."), shortcut::COMPIZ_KEY_OPTION, "unityshell", "execute_command")));
  
   // Menu Bar
   // Is it really std::shared_ptr<shortcut::AbstractHint>(hard coded?
-  hints.push_back(std::shared_ptr<shortcut::AbstractHint>(new shortcut::MockHint(_("Menu Bar"), "", "", _("Reveals application menu."), shortcut::HARDCODED_OPTION, "Alt")));
-  hints.push_back(std::shared_ptr<shortcut::AbstractHint>(new shortcut::MockHint(_("Menu Bar"), "", "", _("Opens the indicator menu."), shortcut::COMPIZ_KEY_OPTION, "unityshell", "panel_first_menu")));
-  hints.push_back(std::shared_ptr<shortcut::AbstractHint>(new shortcut::MockHint(_("Menu Bar"), "", "", _("Moves focus between indicators."), shortcut::HARDCODED_OPTION, _("Cursor Left & Right"))));
+  hints.push_back(std::shared_ptr<shortcut::AbstractHint>(new shortcut::MockHint(_("Menu Bar"), "", "", _("Reveal the application menu."), shortcut::HARDCODED_OPTION, "Alt")));
+  hints.push_back(std::shared_ptr<shortcut::AbstractHint>(new shortcut::MockHint(_("Menu Bar"), "", "", _("Open the indicator menu."), shortcut::COMPIZ_KEY_OPTION, "unityshell", "panel_first_menu")));
+  hints.push_back(std::shared_ptr<shortcut::AbstractHint>(new shortcut::MockHint(_("Menu Bar"), "", "", _("Move focus between indicators."), shortcut::HARDCODED_OPTION, _("Left or Right"))));
 
   // Switching
   hints.push_back(std::shared_ptr<shortcut::AbstractHint>(new shortcut::MockHint(_("Switching"), "", "", _("Switch between applications."), shortcut::COMPIZ_KEY_OPTION, "unityshell", "alt_tab_forward")));
   hints.push_back(std::shared_ptr<shortcut::AbstractHint>(new shortcut::MockHint(_("Switching"), "", "", _("Switch windows of current application."), shortcut::COMPIZ_KEY_OPTION, "unityshell", "alt_tab_next_window")));
   hints.push_back(std::shared_ptr<shortcut::AbstractHint>(new shortcut::MockHint(_("Switching"), "", "", _("Close window switch, return to app switch."), shortcut::COMPIZ_KEY_OPTION, "unityshell", "alt_tab_detail_stop")));
-  hints.push_back(std::shared_ptr<shortcut::AbstractHint>(new shortcut::MockHint(_("Switching"), "", "", _("Moves the foucs."), shortcut::HARDCODED_OPTION, _("Cursor Left & Right"))));
+  hints.push_back(std::shared_ptr<shortcut::AbstractHint>(new shortcut::MockHint(_("Switching"), "", "", _("Move the foucs."), shortcut::HARDCODED_OPTION, _("Left or Right"))));
 
   // Workspaces
   hints.push_back(std::shared_ptr<shortcut::AbstractHint>(new shortcut::MockHint(_("Workspaces"), "", "", _("Spread workspaces."), shortcut::COMPIZ_KEY_OPTION, "expo", "expo_key")));
-  hints.push_back(std::shared_ptr<shortcut::AbstractHint>(new shortcut::MockHint(_("Workspaces"), "", "", _("Switch workspaces."), shortcut::HARDCODED_OPTION, _("Cursor Keys"))));
+  hints.push_back(std::shared_ptr<shortcut::AbstractHint>(new shortcut::MockHint(_("Workspaces"), "", "", _("Switch workspaces."), shortcut::HARDCODED_OPTION, _("Arrow Keys"))));
   //hints.push_bacstd::shared_ptr<shortcut::AbstractHint>(k(new shortcut::MockHint(_("Workspaces"), "", "", _("Move focused window to other workspace."), ...)
 
   // Windows
-  hints.push_back(std::shared_ptr<shortcut::AbstractHint>(new shortcut::MockHint(_("Windows"), "", "", _("Spreads all windows in current workspace."), shortcut::COMPIZ_KEY_OPTION, "scale", "initiate_output_key")));
-  hints.push_back(std::shared_ptr<shortcut::AbstractHint>(new shortcut::MockHint(_("Windows"), "", "", _("Minimises all windows."), shortcut::COMPIZ_KEY_OPTION, "core", "show_desktop_key")));
+  hints.push_back(std::shared_ptr<shortcut::AbstractHint>(new shortcut::MockHint(_("Windows"), "", "", _("Spread all windows in current workspace."), shortcut::COMPIZ_KEY_OPTION, "scale", "initiate_output_key")));
+  hints.push_back(std::shared_ptr<shortcut::AbstractHint>(new shortcut::MockHint(_("Windows"), "", "", _("Minimize all windows."), shortcut::COMPIZ_KEY_OPTION, "core", "show_desktop_key")));
   // I don't know std::shared_ptr<shortcut::AbstractHint>(if it is really hardcoded, but I can't find where this option is stored.
-  hints.push_back(std::shared_ptr<shortcut::AbstractHint>(new shortcut::MockHint(_("Windows"), "", "", _("Open window accessibility menu."), shortcut::HARDCODED_OPTION, "Alt+Space")));
-  hints.push_back(std::shared_ptr<shortcut::AbstractHint>(new shortcut::MockHint(_("Windows"), "", "", _("Maximises current window."), shortcut::COMPIZ_KEY_OPTION, "core", "maximize_window_key")));
-  hints.push_back(std::shared_ptr<shortcut::AbstractHint>(new shortcut::MockHint(_("Windows"), "", "", _("Un-maximises current window."), shortcut::COMPIZ_KEY_OPTION, "core", "unmaximize_window_key")));
-  hints.push_back(std::shared_ptr<shortcut::AbstractHint>(new shortcut::MockHint(_("Windows"), "", "", _("Minimises current window."), shortcut::COMPIZ_KEY_OPTION, "core", "minimize_window_key")));
-  hints.push_back(std::shared_ptr<shortcut::AbstractHint>(new shortcut::MockHint(_("Windows"), "", "", _("Resizes current window."), shortcut::COMPIZ_KEY_OPTION, "resize", "initiate_key")));
-  hints.push_back(std::shared_ptr<shortcut::AbstractHint>(new shortcut::MockHint(_("Windows"), "", "", _("Closes current window."), shortcut::COMPIZ_KEY_OPTION, "core", "close_window_key")));
-  hints.push_back(std::shared_ptr<shortcut::AbstractHint>(new shortcut::MockHint(_("Windows"), "", "", _("Places window in corresponding positions."), shortcut::HARDCODED_OPTION, "Ctrl + Alt + Num")));
+  hints.push_back(std::shared_ptr<shortcut::AbstractHint>(new shortcut::MockHint(_("Windows"), "", "", _("Open the window accessibility menu."), shortcut::HARDCODED_OPTION, "Alt + Space")));
+  hints.push_back(std::shared_ptr<shortcut::AbstractHint>(new shortcut::MockHint(_("Windows"), "", "", _("Maximise current window."), shortcut::COMPIZ_KEY_OPTION, "core", "maximize_window_key")));
+  hints.push_back(std::shared_ptr<shortcut::AbstractHint>(new shortcut::MockHint(_("Windows"), "", "", _("Un-maximize current window."), shortcut::COMPIZ_KEY_OPTION, "core", "unmaximize_window_key")));
+  hints.push_back(std::shared_ptr<shortcut::AbstractHint>(new shortcut::MockHint(_("Windows"), "", "", _("Minimize current window."), shortcut::COMPIZ_KEY_OPTION, "core", "minimize_window_key")));
+  hints.push_back(std::shared_ptr<shortcut::AbstractHint>(new shortcut::MockHint(_("Windows"), "", "", _("Resize current window."), shortcut::COMPIZ_KEY_OPTION, "resize", "initiate_key")));
+  hints.push_back(std::shared_ptr<shortcut::AbstractHint>(new shortcut::MockHint(_("Windows"), "", "", _("Close current window."), shortcut::COMPIZ_KEY_OPTION, "core", "close_window_key")));
+  hints.push_back(std::shared_ptr<shortcut::AbstractHint>(new shortcut::MockHint(_("Windows"), "", "", _("Place window in corresponding position."), shortcut::HARDCODED_OPTION, "Ctrl + Alt + Num")));
   hints.push_back(std::shared_ptr<shortcut::AbstractHint>(new shortcut::MockHint(_("Windows"), "", "", _("Move window."), shortcut::COMPIZ_KEY_OPTION, "move", "initiate_key")));
       
   controller.reset(new shortcut::Controller(hints));