Unity

Merge lp://qastaging/~azzar1/unity/fix-681503 into lp://qastaging/unity

fix-681503
Merge into trunk

Proposed by Andrea Azzarone on 2012-01-07

Status:

Merged

Approved by:

Andrea Azzarone on 2012-01-26

Approved revision:

no longer in the source branch.

Merged at revision:

1871

Proposed branch:

lp://qastaging/~azzar1/unity/fix-681503

Merge into:

lp://qastaging/unity

Diff against target:

1285 lines (+1033/-26)

13 files modified

plugins/unityshell/src/BamfLauncherIcon.cpp (+2/-2)
plugins/unityshell/src/BamfLauncherIcon.h (+2/-2)
plugins/unityshell/src/FavoriteStore.h (+5/-5)
plugins/unityshell/src/FavoriteStoreGSettings.cpp (+41/-14)
plugins/unityshell/src/FavoriteStoreGSettings.h (+2/-1)
plugins/unityshell/src/FavoriteStorePrivate.cpp (+130/-0)
plugins/unityshell/src/FavoriteStorePrivate.h (+47/-0)
plugins/unityshell/src/LauncherController.cpp (+85/-0)
plugins/unityshell/src/LauncherModel.cpp (+30/-0)
plugins/unityshell/src/LauncherModel.h (+1/-0)
tests/CMakeLists.txt (+3/-0)
tests/test_favorite_store_gsettings.cpp (+268/-2)
tests/test_favorite_store_private.cpp (+417/-0)

To merge this branch:

bzr merge lp://qastaging/~azzar1/unity/fix-681503

High

Fix Released

Link a bug report

Reviewer	Review Type	Date Requested	Status
Mirco Müller (community)		2012-01-07	Approve on 2012-01-26
Review via email: mp+87849@code.qastaging.launchpad.net

Commit message

Add FavoriteStore external change support.

Description of the change

Add FavoriteStore external change support.

FavoriteStore can emit 3 signals:
* favorite_added
* favorite_removed
* reordered

Because favorite icons are not separated (in the launcher) from no-favorite icons, we do something like this:
- favorite_added.emit("a", "b", true) to say that we want to add the icon before (true) the icon b.
- favorite_added.emit("a", "", true) to say that we want to add the icon at the begin of the launcher.
- favorite_added.emit("a", "b", false) to say that we want to add the icon after (false) the icon b.

The reordered signal is not emitted if we don't really need it. For example:
- A B C D -> A C D we don't need the reordered signal
- A B C D -> A C E D we don't need it
- A B C D -> A F B H C D we don't need it
- A B C D -> A B D C we need it
- A B C D -> B A we need it
- A B C D -> B A F C D we need it

Revision history for this message

Mirco Müller (macslow) wrote on 2012-01-12:

There's a merge-conflict in plugins/unityshell/src/BamfLauncherIcon.h with trunk...

  const char* DesktopFile();
  bool IsSticky();
<<<<<<< TREE
  void Quit();
  void Stick();
=======
  void Stick(bool save = true);
>>>>>>> MERGE-SOURCE
  void UnStick();

review: Needs Fixing

Revision history for this message

Andrea Azzarone (azzar1) wrote on 2012-01-18:

> There's a merge-conflict in plugins/unityshell/src/BamfLauncherIcon.h with
> trunk...
>
> const char* DesktopFile();
> bool IsSticky();
> <<<<<<< TREE
> void Quit();
> void Stick();
> =======
> void Stick(bool save = true);
> >>>>>>> MERGE-SOURCE
> void UnStick();

Fixed.

Revision history for this message

Mirco Müller (macslow) wrote on 2012-01-26:

Looking good now.

review: Approve

Revision history for this message

Unity Merger (unity-merger) wrote on 2012-01-26:

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

text conflict in tests/CMakeLists.txt