Merge lp://qastaging/~mhr3/unity-lens-files/fix-841847 into lp://qastaging/unity-lens-files

Proposed by Michal Hruby
Status: Merged
Approved by: Mikkel Kamstrup Erlandsen
Approved revision: 211
Merged at revision: 207
Proposed branch: lp://qastaging/~mhr3/unity-lens-files/fix-841847
Merge into: lp://qastaging/unity-lens-files
Diff against target: 782 lines (+314/-280)
3 files modified
configure.ac (+1/-1)
src/daemon.vala (+304/-279)
src/utils.vala (+9/-0)
To merge this branch: bzr merge lp://qastaging/~mhr3/unity-lens-files/fix-841847
Reviewer Review Type Date Requested Status
Mikkel Kamstrup Erlandsen (community) Approve
Review via email: mp+90485@code.qastaging.launchpad.net

Description of the change

Support selection of multiple filters at once, also simplify various code paths. UNBLOCK

To post a comment you must log in.
209. By Michal Hruby

Add missing commit

210. By Michal Hruby

Bump valac requirement

Revision history for this message
Mikkel Kamstrup Erlandsen (kamstrup) wrote :

Tested against Unity trunk and works very well.

460 +/*
461 private string get_current_type ()
462 {
463 - /* Get the current type to filter by */
464 + // Get the current type to filter by
465 var filter = scope.get_filter ("type") as RadioOptionFilter;
466 Unity.FilterOption? option = filter.get_active_option ();
467 return option == null ? "all" : option.id;
468 }
469 -
470 +*/

Any specific reason to keep this in?

Apart from the that the code looks great.

On the behavior: One change from the current ways is that the Folders category now lists recent folders after the Gtk bookmarks. Is that intentional? (fwiw, I found use of it already while testing this branch - so if it wasn't on purpose we might want to check with John if we can keep it... :-))

review: Needs Information
Revision history for this message
Michal Hruby (mhr3) wrote :

> Tested against Unity trunk and works very well.
>
> 460 +/*
> 461 private string get_current_type ()
> 462 {
> 463 - /* Get the current type to filter by */
> 464 + // Get the current type to filter by
> 465 var filter = scope.get_filter ("type") as RadioOptionFilter;
> 466 Unity.FilterOption? option = filter.get_active_option ();
> 467 return option == null ? "all" : option.id;
> 468 }
> 469 -
> 470 +*/
>
> Any specific reason to keep this in?
>

I kept it so if design changed its mind we could revert back to using it. OTOH we could just use the current functions and they'd return single element arrays - I'll remove it.

> Apart from the that the code looks great.
>
> On the behavior: One change from the current ways is that the Folders category
> now lists recent folders after the Gtk bookmarks. Is that intentional? (fwiw,
> I found use of it already while testing this branch - so if it wasn't on
> purpose we might want to check with John if we can keep it... :-))

Yes, before this change the files lens wasn't really searching folders (unless you explicitly selected the Folder filter), so that got fixed.

Revision history for this message
Mikkel Kamstrup Erlandsen (kamstrup) wrote :

Ok great. I am happy then :-)

(test wise, this branch has similar status as https://code.launchpad.net/~mhr3/unity-lens-applications/fix-841847/+merge/90150. It is in some sense a refactoring - and it is very hard to test with our current tooling. I took extra care in review and test runs to remedy this)

review: Approve
211. By Michal Hruby

Remove unused method

Revision history for this message
Mikkel Kamstrup Erlandsen (kamstrup) wrote :

Even better :-)

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches