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.

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

Keep icons current in the UI #1200

Merged
merged 7 commits into from Nov 11, 2012
Merged

Keep icons current in the UI #1200

merged 7 commits into from Nov 11, 2012

Conversation

skurfer
Copy link
Member

@skurfer skurfer commented Nov 8, 2012

I took the resultIcons branch from #1190 and rebased it to get rid of unused commits and squash some that should have gone together.

The one change in addition to what was on that branch (prior to KVO) is that I've told QSSearchObjectView to only watch for notifications from the selected objects (instead of it having to deal with all of them).

@tiennou - This means the updateIcon: method is back in, if you want to use it in the Keychain plug-in.

skurfer added 7 commits Oct 30, 2012
Instead of the interface controller getting these notifications and trying to figure out where to send them, just let the QSSearchObjectView and QSResultController take care of their own changes. Icons should now appear correctly in the pane, the results list and the child results list (if enabled).
…bject

This prevents QSSearchObjectView from having to process dozens of irrelevant notifications.
@pjrobertson
Copy link
Member

pjrobertson commented Nov 9, 2012

@tiennou would you mind chiming in just to make sure you're happy with going back to NSNotifications? :)

@tiennou
Copy link
Member

tiennou commented Nov 10, 2012

No problem for me, if it works better that way. I'll try to remember that there are still some fishy things in there (e.g. I don't like the unused return values and the different meaning they might have).

@pjrobertson
Copy link
Member

pjrobertson commented Nov 10, 2012

Great, merci Etienne :)

btw Rob - there seems to be a tiny merge conflict (I think) with file-uti branch, but nothing to worry about

@skurfer
Copy link
Member Author

skurfer commented Nov 10, 2012

Yes, there is. The one that has updateIcon: wins. (This one.)

pjrobertson added a commit that referenced this pull request Nov 11, 2012
@pjrobertson pjrobertson merged commit c17f2c1 into quicksilver:master Nov 11, 2012
pjrobertson added a commit that referenced this pull request Nov 13, 2012
…file-uti

Conflicts:
	Quicksilver/Code-QuickStepCore/QSObject_FileHandling.m
	Conflict with pull #1200
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants