Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add objects filter to the objects dock #1566

Closed
wants to merge 30 commits into from
Closed

Add objects filter to the objects dock #1566

wants to merge 30 commits into from

Commits on May 7, 2017

  1. Add the line edit

    @thabetx
    thabetx committed May 7, 2017
    Configuration menu
    Copy the full SHA
    bd138a3 View commit details
    Browse the repository at this point in the history

Commits on May 9, 2017

  1. New filter

    @thabetx
    thabetx committed May 9, 2017
    Configuration menu
    Copy the full SHA
    9b2c9a5 View commit details
    Browse the repository at this point in the history

  2. Initial working version 

    selecting directly from the map doesn't update the dock
    @thabetx
    thabetx committed May 9, 2017
    Configuration menu
    Copy the full SHA
    59d44b4 View commit details
    Browse the repository at this point in the history

  3. Fix object selection from map

    @thabetx
    thabetx committed May 9, 2017
    Configuration menu
    Copy the full SHA
    a821e3d View commit details
    Browse the repository at this point in the history

  4. Fix saving and restoring expanded groups

    @thabetx
    thabetx committed May 9, 2017
    Configuration menu
    Copy the full SHA
    eb8e1ae View commit details
    Browse the repository at this point in the history

  5. Make the models private

    @thabetx
    thabetx committed May 9, 2017
    Configuration menu
    Copy the full SHA
    afaf337 View commit details
    Browse the repository at this point in the history

  6. Fix style

    @thabetx
    thabetx committed May 9, 2017
    Configuration menu
    Copy the full SHA
    6d42d49 View commit details
    Browse the repository at this point in the history

Commits on May 10, 2017

  1. Update filtering logic 

    Don't show empty layers that matches the filter
    @thabetx
    thabetx committed May 10, 2017
    Configuration menu
    Copy the full SHA
    0553dbb View commit details
    Browse the repository at this point in the history

  2. Add keyboard shortcuts to the objects dock

    @thabetx
    thabetx committed May 10, 2017
    Configuration menu
    Copy the full SHA
    2ffaefd View commit details
    Browse the repository at this point in the history

  3. Fix style

    @thabetx
    thabetx committed May 10, 2017
    Configuration menu
    Copy the full SHA
    eeb0dd7 View commit details
    Browse the repository at this point in the history

  4. Save filter string between maps

    @thabetx
    thabetx committed May 10, 2017
    Configuration menu
    Copy the full SHA
    e72855d View commit details
    Browse the repository at this point in the history

Commits on May 12, 2017

  1. Refactoring

    @thabetx
    thabetx committed May 12, 2017
    Configuration menu
    Copy the full SHA
    6ebcdf9 View commit details
    Browse the repository at this point in the history

  2. Use returnPressed signal instead of handling return key

    @thabetx
    thabetx committed May 12, 2017
    Configuration menu
    Copy the full SHA
    a46173b View commit details
    Browse the repository at this point in the history

  3. Expand groups having matching objects

    @thabetx
    thabetx committed May 12, 2017
    Configuration menu
    Copy the full SHA
    6b522ae View commit details
    Browse the repository at this point in the history

Commits on May 13, 2017

  1. Restore the prefilter expansion state when filter is canceled

    @thabetx
    thabetx committed May 13, 2017
    Configuration menu
    Copy the full SHA
    4dc0fdb View commit details
    Browse the repository at this point in the history

Commits on May 14, 2017

  1. Fix style

    @thabetx
    thabetx committed May 14, 2017
    Configuration menu
    Copy the full SHA
    e425e53 View commit details
    Browse the repository at this point in the history

Commits on May 16, 2017

  1. Use Filter string from TileStampsDock

    @thabetx
    thabetx committed May 16, 2017
    Configuration menu
    Copy the full SHA
    12eaea7 View commit details
    Browse the repository at this point in the history

  2. Refactor the switching code

    @thabetx
    thabetx committed May 16, 2017
    Configuration menu
    Copy the full SHA
    5f6f1df View commit details
    Browse the repository at this point in the history

  3. Prevent collapsing while filtering

    @thabetx
    thabetx committed May 16, 2017
    Configuration menu
    Copy the full SHA
    184bff3 View commit details
    Browse the repository at this point in the history

Commits on May 17, 2017

  1. Fix spaces

    @thabetx
    thabetx committed May 17, 2017
    Configuration menu
    Copy the full SHA
    d302c97 View commit details
    Browse the repository at this point in the history

  2. Use nullptr instead of 0 for initializing ObjectsFilterModel

    @thabetx
    thabetx committed May 17, 2017
    Configuration menu
    Copy the full SHA
    3c0a470 View commit details
    Browse the repository at this point in the history

  3. Rename mProxyModel to mReversingProxyModel

    @thabetx
    thabetx committed May 17, 2017
    Configuration menu
    Copy the full SHA
    9a51d46 View commit details
    Browse the repository at this point in the history

  4. Reverse the order of the proxy models 

    Filter then reverse
    @thabetx
    thabetx committed May 17, 2017
    Configuration menu
    Copy the full SHA
    e4f3b46 View commit details
    Browse the repository at this point in the history

  5. Rename proxyIndex to viewIndex

    @thabetx
    thabetx committed May 17, 2017
    Configuration menu
    Copy the full SHA
    5a59bd7 View commit details
    Browse the repository at this point in the history

  6. Create mapToViewModel function

    @thabetx
    thabetx committed May 17, 2017
    Configuration menu
    Copy the full SHA
    fd400ad View commit details
    Browse the repository at this point in the history

Commits on May 18, 2017

  1. Refactor getGroupIndex code

    @thabetx
    thabetx committed May 18, 2017
    Configuration menu
    Copy the full SHA
    1ad9ef2 View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'upstream/master' into new-filter

    @thabetx
    thabetx committed May 18, 2017
    Configuration menu
    Copy the full SHA
    a440d16 View commit details
    Browse the repository at this point in the history

  3. Filter using objects instead of indices

    @thabetx
    thabetx committed May 18, 2017
    Configuration menu
    Copy the full SHA
    b62505e View commit details
    Browse the repository at this point in the history

  4. Rename getGroupIndex to groupIndex

    @thabetx
    thabetx committed May 18, 2017
    Configuration menu
    Copy the full SHA
    04cbe51 View commit details
    Browse the repository at this point in the history

Commits on May 20, 2017

  1. Fixed the logic in ReversingProxyModel::sourceRowsAboutToBeInserted 

    The logic was wrong when more than one row was getting inserted.
    @bjorn
    bjorn committed May 20, 2017
    Configuration menu
    Copy the full SHA
    7bdad99 View commit details
    Browse the repository at this point in the history