@@ -88,15 +88,13 @@ class AckInProject::Search options << "--#{result['followSymLinks'] == 1 ? '' : 'no'}follow" options << "--#{result['loadAckRC'] == 1 ? '' : 'no'}env" - # I don't know why ackFileType doesn't go into result. I am an Interface Builder n00b. - # (putting it into defaults instead of params didn't change anything) ~David - options << case plist['ackFileType'] + options << case result['ackFileType'] when 'Normal' '' when 'All' '--all-types' else - '--type='+plist['ackFileType'] + '--type='+result['ackFileType'] end AckInProject.update_search_history result['returnArgument'] Support/lib/search.rb @@ -1,3 +1,7 @@ +# NOTE: To get values put into plist['result'], they need to be put into the bindings for the "Find" +# button. *Including* the "Selector Name" for "Target". +# This is probably intuitive to experienced Cocoa programmers. I am not one. ~David + class AckInProject::SearchDialog include AckInProject::Environment AckInProject::Environment.ghetto_include %w(web_preview), binding @@ -18,7 +22,7 @@ class AckInProject::SearchDialog %w( ackMatchWholeWords ackIgnoreCase ackLiteralMatch ackShowContext ackFollowSymlinks ackLoadAckRC - ).inject({}) do |hsh,v| + ).inject({'ackFileType'=>'Normal'}) do |hsh,v| hsh[v] = false hsh end @@ -29,7 +33,6 @@ class AckInProject::SearchDialog 'ackExpression' => AckInProject.pbfind, 'ackHistory' => AckInProject.search_history, 'ackFileTypes' => filetypes, - 'ackFileType' => 'Normal' } end Support/lib/search_dialog.rb @@ -14,14 +14,14 @@ class AckInProject::SearchResults :page_title => title, :html_head => header_extra() ) - note = case plist['ackFileType'] - when 'Normal' - '' - when 'All' - ' (all types)' - else - ' ('+plist['ackFileType']+' only)' - end + note = case plist['result']['ackFileType'] + when 'Normal' + '' + when 'All' + ' (all types)' + else + ' ('+plist['result']['ackFileType']+' only)' + end puts <<-HTML <h2>Searching for “#{ h search_string }” in #{ searched_in }#{note}</h2> <div id="counters"><span id="linecount">0 lines</span> matched in <span id="filecount">0 files</span></div> Support/lib/search_results.rb @@ -8,7 +8,7 @@ <integer>5</integer> <key>IBOpenObjects</key> <array> - <integer>5</integer> + <integer>6</integer> <integer>185</integer> </array> <key>IBSystem Version</key> Support/nibs/AckInProjectSearch.nib/info.nib Support/nibs/AckInProjectSearch.nib/keyedobjects.nib 6a30a02477b8def66143f74083efc62c739a862d David Lynch kemayo@gmail.com http://github.com/adinardi/ack-tmbundle/commit/42417d926268f6501efd779519c3ccc208438419 42417d926268f6501efd779519c3ccc208438419 2009-11-05T04:54:22-08:00 2009-02-13T01:45:15-08:00 Get ackFileType into the 'result' return, and saved as a default ad248eca30d6e6605922fc01b8448d402e7b4312 Angelo DiNardi adinardi@fragtop.local