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

Show catalog source #678

Merged
merged 5 commits into from Feb 10, 2012
Merged

Show catalog source #678

merged 5 commits into from Feb 10, 2012

Conversation

pjrobertson
Copy link
Member

@pjrobertson pjrobertson commented Feb 3, 2012

Updated pull request for #672 to avoid a merge conflict.

Once this is merged and changing the Info.plist 'File Type' to 'Info plist XML' I'll update the rest of the Info.plist files in the repo

@skurfer
Copy link
Member

@skurfer skurfer commented Feb 3, 2012

I think you added validatesObjects to the wrong entry. Should be under QSObjectShowSourceAction, right?

@pjrobertson
Copy link
Member Author

@pjrobertson pjrobertson commented Feb 3, 2012

I knew I did this too fast... apologies for doing so, but kudos for spotting it!

Having reverted the commit, I tried to re-edit the Info.plist in Xcode but git was complaining the whole file was changed. Seems like changing the type didn't work. If you have any ideas, then that'd be good. I'm stumped.

@skurfer
Copy link
Member

@skurfer skurfer commented Feb 3, 2012

I have two: Vim and TextMate. ;-)

@pjrobertson
Copy link
Member Author

@pjrobertson pjrobertson commented Feb 4, 2012

TextMate is my best friend on this one as well :)

@skurfer
Copy link
Member

@skurfer skurfer commented Feb 10, 2012

TextMate is my best friend on this one as well

If you fixed this by hand, I’m not seeing the additional commits. :-)

@pjrobertson
Copy link
Member Author

@pjrobertson pjrobertson commented Feb 10, 2012

Can you not see 70ac6e9 and 3724118 ?

The first reverts my previous (wrong) commit that edited the Info.plist with the second being my edit using TM

@skurfer
Copy link
Member

@skurfer skurfer commented Feb 10, 2012

Oh, sorry. I was looking at the diff that claimed over 4000 changes thinking Xcode had rearranged the file, but it was just the format change. I’ll give it another quick test and merge if it looks OK.

skurfer added a commit that referenced this issue Feb 10, 2012
@skurfer skurfer merged commit 0119bf3 into quicksilver:master Feb 10, 2012
@skurfer
Copy link
Member

@skurfer skurfer commented Feb 10, 2012

Found another bug (not affected by this change). If you launch QS and try to use Show Source in Catalog on something, it could hang, crash, or do nothing. If, on the other hand, you open the Preferences panel and close it again first, the action works fine until the next relaunch.

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

2 participants