Unity

Merge lp://staging/~3v1n0/unity/trash-volumes-illumination into lp://staging/unity

trash-volumes-illumination
Merge into trunk

Proposed by Marco Trevisan (Treviño) on 2013-03-27

Status:

Merged

Approved by:

Brandon Schaefer on 2013-03-28

Approved revision:

no longer in the source branch.

Merged at revision:

3256

Proposed branch:

lp://staging/~3v1n0/unity/trash-volumes-illumination

Merge into:

lp://staging/unity

Diff against target:

706 lines (+278/-58)

16 files modified

launcher/DeviceLauncherSection.cpp (+1/-1)
launcher/Launcher.cpp (+7/-0)
launcher/TrashLauncherIcon.cpp (+21/-6)
launcher/TrashLauncherIcon.h (+1/-0)
launcher/Volume.h (+2/-0)
launcher/VolumeImp.cpp (+33/-7)
launcher/VolumeImp.h (+1/-0)
launcher/VolumeLauncherIcon.cpp (+2/-2)
tests/test_mock_devices.h (+1/-0)
tests/test_mock_filemanager.h (+4/-1)
tests/test_trash_launcher_icon.cpp (+41/-3)
tests/test_volume_imp.cpp (+33/-9)
tests/test_volume_launcher_icon.cpp (+27/-28)
unity-shared/FileManager.h (+8/-1)
unity-shared/GnomeFileManager.cpp (+86/-0)
unity-shared/GnomeFileManager.h (+10/-0)

To merge this branch:

bzr merge lp://staging/~3v1n0/unity/trash-volumes-illumination

Medium

Fix Released

Link a bug report

Reviewer	Review Type	Date Requested	Status
PS Jenkins bot (community)	continuous-integration		Approve on 2013-03-28
Brandon Schaefer (community)		2013-03-27	Approve on 2013-03-28
Review via email: mp+155845@code.staging.launchpad.net

Commit message

{Trash,Volume}Icon: enable running state if the location is opened in the filemanager

Description of the change

GnomeFileManager is now monitoring the nautilus' OpenLocations property and emitting changes when this value is updated.

TrashLauncherIcon and VolumeLauncherIcon checks if their location is opened in the filemanager to toggle the icon illumination.

The pips support is disabled for now since this needs some other nautilus changes (done and pending merge) and a major refactoring for windows handling.

Revision history for this message

Brandon Schaefer (brandontschaefer) wrote on 2013-03-27:

Looks good, but what happens when you set the backlight to always on? Possibly make the indicator arrow 1 when its open? Also its no illuminated for me (like what happens when things are urgent), but im not sure if thats what you intended (I don't see it in the code).

review: Needs Information

Revision history for this message

Marco Trevisan (Treviño) (3v1n0) wrote on 2013-03-28:

> Looks good, but what happens when you set the backlight to always on? Possibly
> make the indicator arrow 1 when its open?

I thought about that, but it could be confusing since it wouldn't be aware of the window position (monitor or workspace side), so I'd prefer to keep it in this way for now (in the worst case, there's no regression).

However the pips support is something I've alredy been working on and I've opened the bug #1161323 to track it.

> Also its no illuminated for me (like what happens when things are urgent),
> but im not sure if thats what you intended (I don't see it in the code).

This is what I meant by illumination: http://ubuntuone.com/4WdBG8RSg0bbU4f1rHoZee
Per se the trash/device icons would have a white background and I don't think this is what we want to see when they're opened.