unity-2d

Merge lp://staging/~ris/unity-2d/fix-729478 into lp://staging/unity-2d/3.0

fix-729478
Merge into natty

Proposed by Robert Sajdok on 2011-03-27

Status:

Merged

Approved by:

Aurélien Gâteau on 2011-04-04

Approved revision:

493

Merged at revision:

504

Proposed branch:

lp://staging/~ris/unity-2d/fix-729478

Merge into:

lp://staging/unity-2d/3.0

Diff against target:

109 lines (+24/-1)

8 files modified

launcher/LauncherItem.qml (+1/-1)
launcher/LauncherList.qml (+3/-0)
launcher/UnityApplications/launcherapplication.cpp (+6/-0)
launcher/UnityApplications/launcherapplication.h (+1/-0)
launcher/UnityApplications/launcheritem.cpp (+5/-0)
launcher/UnityApplications/launcheritem.h (+1/-0)
launcher/UnityApplications/trash.cpp (+6/-0)
launcher/UnityApplications/trash.h (+1/-0)

To merge this branch:

bzr merge lp://staging/~ris/unity-2d/fix-729478

Medium

Fix Released

Link a bug report

Reviewer	Review Type	Date Requested	Status
Aurélien Gâteau (community)		2011-03-27	Approve on 2011-04-04
Review via email: mp+55000@code.staging.launchpad.net

Commit message

[launcher] Clicking middle mouse button now launches another instance of the application.

Revision history for this message

Aurélien Gâteau (agateau) wrote on 2011-03-30:

Hi Robert,

Thanks for this patch, works well! I just have a few nitpicks:

- Indentation in launcher/LauncherList.qml is wrong: it mixes tabs and spaces

- Since LauncherApplication::newInstance() just calls LauncherApplication::launch(), it is simpler to just call launch(). You only have to make it a public slot.

review: Needs Fixing

lp://staging/~ris/unity-2d/fix-729478 updated on 2011-03-30

492. By Robert Sajdok on 2011-03-30: Fixed: "Indentation in launcher/LauncherList.qml is wrong: it mixes tabs and spaces"

Revision history for this message

Robert Sajdok (ris) wrote on 2011-03-30:

> Hi Robert,
>
> Thanks for this patch, works well! I just have a few nitpicks:
>
> - Indentation in launcher/LauncherList.qml is wrong: it mixes tabs and spaces
Done

>
> - Since LauncherApplication::newInstance() just calls
> LauncherApplication::launch(), it is simpler to just call launch(). You only
> have to make it a public slot.
Did you notice that the class: Trash does not have a function: "launch()" ?

Revision history for this message

Aurélien Gâteau (agateau) wrote on 2011-03-31:

> > - Since LauncherApplication::newInstance() just calls
> > LauncherApplication::launch(), it is simpler to just call launch(). You only
> > have to make it a public slot.
> Did you notice that the class: Trash does not have a function: "launch()" ?

Of course I did not, otherwise I wouldn't have made such a dumb suggestion :)

Can you then just rename newInstance() to launchNewInstance() for consistency?

lp://staging/~ris/unity-2d/fix-729478 updated on 2011-03-31