Merge lp:~unity-2d-team/unity-2d/update-launcher-pips-shell into lp:~unity-2d-team/unity-2d/unity-2d-shell
| Status: | Merged |
|---|---|
| Approved by: | Michał Sawicz on 2012-01-27 |
| Approved revision: | 934 |
| Merged at revision: | 934 |
| Proposed branch: | lp:~unity-2d-team/unity-2d/update-launcher-pips-shell |
| Merge into: | lp:~unity-2d-team/unity-2d/unity-2d-shell |
| Diff against target: |
571 lines (+408/-4) 9 files modified
libunity-2d-private/src/launcherapplication.cpp (+56/-2) libunity-2d-private/src/launcherapplication.h (+4/-0) libunity-2d-private/src/launcheritem.cpp (+6/-0) libunity-2d-private/src/launcheritem.h (+2/-0) libunity-2d-private/src/unity2ddeclarativeview.cpp (+1/-0) libunity-2d-private/src/unity2ddeclarativeview.h (+1/-0) shell/launcher/LauncherItem.qml (+1/-1) shell/launcher/LauncherList.qml (+22/-1) tests/launcher/update_pips_tests.rb (+315/-0) |
| To merge this branch: | bzr merge lp:~unity-2d-team/unity-2d/update-launcher-pips-shell |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Michał Sawicz | 2012-01-23 | Approve on 2012-01-27 | |
| Gerry Boland | 2012-01-25 | Needs Fixing on 2012-01-26 | |
|
Review via email:
|
|||
Description of the Change
[shell][launcher] launcher pips indicate whether application windows belongs to current workspace or not
- 924. By Lohith D Shivamurthy on 2012-01-24
-
[shell][launcher] update pips when the user workspace changed. Also added tests for the same
| Michał Sawicz (saviq) wrote : | # |
Hey, any reason you're not using the TmpWindow class?
| Gerry Boland (gerboland) wrote : | # |
Yeah, since we run tests with a Terminal open already, he needed to start testing with a non-running application, checking no pips, run the app, check pip, etc.
| Michał Sawicz (saviq) wrote : | # |
Maybe take a look at autohide_
| Lohith D Shivamurthy (dyams) wrote : | # |
Hey, The test application should take some parameter to identiy its xid accurately. In this case, a unique title is set to test application and then later we find the xid for that window.
| Michał Sawicz (saviq) wrote : | # |
OK then, lets merge that now and once we have a better way to test these lets revisit, can you please add a FIXME in the tests? I'm simply wary of the test being unreliable if you pre-launch xman anywhere.
| Michał Sawicz (saviq) wrote : | # |
* what's the use of updateWindowWor
* there's a tab instead of spaces in unity2ddeclarat
* updatePipSource updates both the source and pip count, please rename to updatePips
* pipSource should not be bound to updatePipSource, as it doesn't return anything - make it use the default value initially and the Connections will take care of updating it later
* there are tabs instead of spaces in LauncherList.
* change the puts() to comments in test startup and shutdown
* drop unneeded comment in test setup
* you have extra lines in test descriptions, please drop the lines only containing an asterisk
* Post-Conditions should not contain stuff that happens in teardown anyway, please drop the "Reset the current..." entries there
* again, tabs instead of spaces in the tests file
* test comments mentions calculator, please fix
* please don't "reuse" windows between tests as this will prevent running just one single test
* typos in "Test steps" - "reused", not "resued"
* typo in "Test steps" for "Update launcher pips to indicate an app with two windows on two different workspaces" - "along", not "alogn"
* typo in "Test steps" for "Update launcher pips to indicate an app completely belonging to different workspace." - missing "e" in "differnt"
* in some test objectives you say "Check for...", in others "Update...", please be consistent
- 925. By Lohith D Shivamurthy on 2012-01-24
-
[shell][launcher] Review comments fixed
- 926. By Lohith D Shivamurthy on 2012-01-25
-
[shell][launcher] Added a FIXME to choose a better test application
| Michał Sawicz (saviq) wrote : | # |
Gerry please take a look at the tests if you will.
And Gerry, Lohith some more things I'm not certain about:
1) the workspace-changed signals are connected in setIconGeometry? doesn't seem like the right place to do so?
2) shouldn't we also connect to workspace-changed signal in windowAdded()
3) do we really need to cast user_data to LauncherApplica
Please rename the callback to onWindowWorkspa
- 927. By Lohith D Shivamurthy on 2012-01-26
-
[shell][launcher] windows signal connection is moved to separate method
- 928. By Lohith D Shivamurthy on 2012-01-26
-
[shell] merge with trunk
| Michał Sawicz (saviq) wrote : | # |
You forgot:
* Please rename the callback to onWindowWorkspa
Please also fix the style in LauncherList.
There's also an extra blank line in launcherapplica
I'm not completely sure us going through QML just to proxy onRunningChanged() back into C++ is needed or required :/ Gerry, I'd like your opinion on that.
I'm not GObject-savvy enough to know whether we should disconnect from the workspace-changed signal when the window is removed / application stopped?
| Gerry Boland (gerboland) wrote : | # |
Functional problems:
1. I find when I launch shell, with existing applications open, that the pips are incorrect (they're all filled). Once I start navigating workspaces, the pips are corrected.
2. Set an application window to be "Always on Visible Workspace" (from window menu) - then its pips are always unfilled.
- 929. By Lohith D Shivamurthy on 2012-01-26
-
[launcher] update pips as soon as loading the launcher is completed
- 930. By Lohith D Shivamurthy on 2012-01-26
-
[launcher] Consider 'always on visible workspace' windows as always in the current workspace
| Gerry Boland (gerboland) wrote : | # |
Nice, those functional problems have been fixed.
Please update the tests to use $SUT.execute_
There is also a stray blank line in void LauncherApplica
And
+ onRunningChanged: { setIconGeometry()
+ item.connectWin
+ }
is formatted strangely.
Fix those & I think we're good :)
- 931. By Lohith D Shivamurthy on 2012-01-26
-
[launcher] use sut global object, remove local object
- 932. By Lohith D Shivamurthy on 2012-01-26
-
[launcher] Replace 'system' with execute_
shell_command - 933. By Lohith D Shivamurthy on 2012-01-26
-
[launcher] remove extra line in cpp and add one line in qml
- 934. By Lohith D Shivamurthy on 2012-01-26
-
[launcher] replace 'CB' suffix with 'on' prefix for the callback


Hey, the pips weren't updating when I changed workspaces, just when I launched / closed apps, can you please verify it behaves as expected when switching workspaces?