AppJour.rb AppJour.xib GemJour.rb GemJour.xib GitJour.rb GitJour.xib Jour.rb PasteJour.rb PasteJour.xib ServiceKind.rb @@ -3,53 +3,67 @@ require 'osx/cocoa' class BonjourWatcher < OSX::NSObject include OSX - kvc_array_accessor :messages - attr_reader :known_services + kvc_accessor :servicekinds + kvc_array_accessor :servicekinds kvc_accessor :status + ib_outlet :detail_view + ib_outlet :outline_view + def init if super_init - @messages = NSMutableArray.alloc.init + @servicekinds = NSMutableArray.alloc.init + @selectedItems = NSMutableArray.alloc.init return self end end def awakeFromNib self.status = 'setting up...' + setup_known_services load_rc + browse self.status = '' + + @outline_view.expandItem_expandChildren(nil,true) end def setup_known_services - @known_services = {} - @service_browsers = {} - @service_messages = {} - - service('git') do |service| - [ "gitjour", "git clone #{service.name}", lambda {|msg|} ] - end + service('pastejour', PasteJour) + service('http' , AppJour ) + service('git' , GitJour ) + service('rubygems' , GemJour ) - service('pastejour') do |service| - (from, to) = *service.name.split('-') - - message = "Paste from #{from}" - message << " to #{to}" if to - - ['pastejour', message, lambda {|msg| system("/opt/local/bin/pastejour '#{msg[:service].name}' | pbcopy"); 'copied to pasteboard'}] - end + # service('git' , GitJour ) + # service('rubygems' , GemJour ) + # service('http' , AppJour ) - service('rubygems') do |service| - ['gemjour', "gem server #{service.name}", lambda {|msg|}] - end - - service('http') do |service| - ['appjour', "appjour #{service.name}", lambda {|msg|}] - end + # service('git') do |service| + # [ "gitjour", "git clone #{service.name}", lambda {|msg|} ] + # end + # + # service('pastejour') do |service| + # (from, to) = *service.name.split('-') + # + # message = "Paste from #{from}" + # message << " to #{to}" if to + # + # ['pastejour', message, lambda {|msg| system("/opt/local/bin/pastejour '#{msg[:service].name}' | pbcopy"); 'copied to pasteboard'}] + # end + # + # service('rubygems') do |service| + # ['gemjour', "gem server #{service.name}", lambda {|msg|}] + # end + # + # service('http') do |service| + # ['appjour', "appjour #{service.name}", lambda {|msg|}] + # end end + def load_rc rcfile = "#{ENV['HOME']}/.jourrc" if File.exist?(rcfile) @@ -57,27 +71,50 @@ class BonjourWatcher < OSX::NSObject end end - def service(name,srv_class=nil,&block) - known_services[name.to_s] = srv_class || block + def service(name,klass) + srv = ServiceKind.alloc.initWithName_andClass(name,klass) + insertObject_inServicekindsAtIndex(srv, @servicekinds.size) end def browse - @known_services.each_key do |name| - @service_browsers[name] = browser = NSNetServiceBrowser.alloc.init - browser.setDelegate self - browser.searchForServicesOfType_inDomain("_#{name}._tcp","") + servicekinds.each do |srv| + browser = NSNetServiceBrowser.alloc.init + browser.delegate = self + browser.searchForServicesOfType_inDomain(srv.service_type, "") end end - def messageClicked(selectedObjects) - message = selectedObjects.first + # def selectedItems; @selectedItems end + def selectedItems=(selectedItems) + @selectedItems = selectedItems - if message.respond_to?(:run) - self.status = message.run - elsif message.respond_to?(:key?) && message[:runner] && message[:runner].respond_to?(:call) - self.status = message[:runner].call(message) + if !selectedItems or selectedItems.length < 1 + @detail_view.subviews.each {|sv| sv.removeFromSuperview} + return end + + path = selectedItems.first + if path.length == 2 + srv_index = path.indexAtPosition(0) + jour_index = path.indexAtPosition(1) + + srv = @servicekinds[srv_index] + jour = srv.children[jour_index] + + puts "jour.text: #{jour.text}" + update_view(jour) + end + + end + kvc_accessor :selectedItems + + def update_view(jour) + return unless jour.view? + + @detail_view.subviews.each {|sv| sv.removeFromSuperview} + @detail_view.addSubview jour.view + jour.view.frame = @detail_view.bounds end def netServiceBrowserWillSearch(ns) @@ -88,35 +125,23 @@ class BonjourWatcher < OSX::NSObject puts "didn't start searching due to error #{errorDict.to_ruby.inspect}" end - def service_key(service) - service.name.to_ruby + service.oc_type.to_ruby - end - def netServiceBrowser_didFindService_moreComing(nsb,service,more) - name = service.oc_type.to_ruby[/_([^\.]+)\._tcp/,1] - - if srv = @known_services[name] - if srv.respond_to?(:call) - service_name,text,runner = srv.call(service) - message = {:service_name => service_name, :text => text, :runner => runner, - :service => service, :image => NSWorkspace.sharedWorkspace.iconForFile('/')} - else - message = srv.alloc.initWithService(service) - end - - index = @messages.size - insertObject_inMessagesAtIndex(message, index) - @service_messages[service_key(service)] = message - end + ServiceKind.found(service) + @outline_view.expandItem_expandChildren(nil,true) end def netServiceBrowser_didRemoveService_moreComing(nsb,service,more) - puts "removing service #{service.name}" - if message = @service_messages[service_key(service)] - index = @messages.index(message) - removeObjectFromMessagesAtIndex(index) - end + puts "lost service #{service.name}" + ServiceKind.lost(service) + @outline_view.expandItem_expandChildren(nil,true) end - - + + + def outlineView_isGroupItem(outlineView,item) + item.representedObject.is_a?(ServiceKind) + end + + def outlineView_shouldSelectItem(outlineView,item) + !item.representedObject.is_a?(ServiceKind) + end end \ No newline at end of file BonjourWatcher.rb @@ -8,8 +8,7 @@ <string key="IBDocument.HIToolboxVersion">352.00</string> <object class="NSMutableArray" key="IBDocument.EditedObjectIDs"> <bool key="EncodedWithXMLCoder">YES</bool> - <integer value="453"/> - <integer value="448"/> + <integer value="367"/> </object> <object class="NSArray" key="IBDocument.PluginDependencies"> <bool key="EncodedWithXMLCoder">YES</bool> @@ -756,7 +755,7 @@ <object class="NSWindowTemplate" id="513744381"> <int key="NSWindowStyleMask">15</int> <int key="NSWindowBacking">2</int> - <string key="NSWindowRect">{{196, 219}, {352, 291}}</string> + <string key="NSWindowRect">{{196, 219}, {641, 291}}</string> <int key="NSWTFlags">603979776</int> <string key="NSWindowTitle">Starjour</string> <string key="NSWindowClass">NSWindow</string> @@ -783,11 +782,11 @@ <int key="NSfFlags">16</int> </object> <reference key="NSControlView" ref="361621960"/> - <object class="NSColor" key="NSBackgroundColor" id="210640837"> + <object class="NSColor" key="NSBackgroundColor"> <int key="NSColorSpace">6</int> <string key="NSCatalogName">System</string> <string key="NSColorName">controlColor</string> - <object class="NSColor" key="NSColor"> + <object class="NSColor" key="NSColor" id="502649113"> <int key="NSColorSpace">3</int> <bytes key="NSWhite">MC42NjY2NjY2OQA</bytes> </object> @@ -803,74 +802,194 @@ </object> </object> </object> - <object class="NSScrollView" id="900089199"> + <object class="NSSplitView" id="887432493"> <reference key="NSNextResponder" ref="414427165"/> - <int key="NSvFlags">274</int> + <int key="NSvFlags">282</int> <object class="NSMutableArray" key="NSSubviews"> <bool key="EncodedWithXMLCoder">YES</bool> - <object class="NSClipView" id="944338092"> - <reference key="NSNextResponder" ref="900089199"/> - <int key="NSvFlags">2304</int> + <object class="NSScrollView" id="1051005359"> + <reference key="NSNextResponder" ref="887432493"/> + <int key="NSvFlags">274</int> <object class="NSMutableArray" key="NSSubviews"> <bool key="EncodedWithXMLCoder">YES</bool> - <object class="NSCollectionView" id="548321188"> - <reference key="NSNextResponder" ref="944338092"/> - <int key="NSvFlags">274</int> - <string key="NSFrameSize">{343, 262}</string> - <reference key="NSSuperview" ref="944338092"/> - <string key="NSMinGridSize">{0, 0}</string> - <string key="NSMaxGridSize">{0, 0}</string> - <int key="NSMinNumberOfGridRows">0</int> - <int key="NSMaxNumberOfGridRows">0</int> - <int key="NSMinNumberOfGridColumns">0</int> - <int key="NSMaxNumberOfGridColumns">0</int> - <object class="NSArray" key="NSBackgroundColors"> + <object class="NSClipView" id="229972990"> + <reference key="NSNextResponder" ref="1051005359"/> + <int key="NSvFlags">2304</int> + <object class="NSMutableArray" key="NSSubviews"> <bool key="EncodedWithXMLCoder">YES</bool> - <object class="NSColor"> - <int key="NSColorSpace">3</int> - <bytes key="NSWhite">MQA</bytes> + <object class="NSOutlineView" id="1005650349"> + <reference key="NSNextResponder" ref="229972990"/> + <int key="NSvFlags">256</int> + <string key="NSFrameSize">{159, 269}</string> + <reference key="NSSuperview" ref="229972990"/> + <bool key="NSEnabled">YES</bool> + <object class="_NSCornerView" key="NSCornerView"> + <nil key="NSNextResponder"/> + <int key="NSvFlags">256</int> + <string key="NSFrame">{{-26, 0}, {16, 17}}</string> + </object> + <object class="NSMutableArray" key="NSTableColumns"> + <bool key="EncodedWithXMLCoder">YES</bool> + <object class="NSTableColumn" id="9220477"> + <double key="NSWidth">2.800000e+01</double> + <double key="NSMinWidth">1.600000e+01</double> + <double key="NSMaxWidth">1.000000e+03</double> + <object class="NSTableHeaderCell" key="NSHeaderCell"> + <int key="NSCellFlags">75628032</int> + <int key="NSCellFlags2">0</int> + <string key="NSContents"/> + <object class="NSFont" key="NSSupport" id="26"> + <string key="NSName">LucidaGrande</string> + <double key="NSSize">1.100000e+01</double> + <int key="NSfFlags">3100</int> + </object> + <object class="NSColor" key="NSBackgroundColor"> + <int key="NSColorSpace">3</int> + <bytes key="NSWhite">MC4zMzMzMzI5OQA</bytes> + </object> + <object class="NSColor" key="NSTextColor" id="929884713"> + <int key="NSColorSpace">6</int> + <string key="NSCatalogName">System</string> + <string key="NSColorName">headerTextColor</string> + <reference key="NSColor" ref="574714943"/> + </object> + </object> + <object class="NSTextFieldCell" key="NSDataCell" id="338825516"> + <int key="NSCellFlags">337772096</int> + <int key="NSCellFlags2">2048</int> + <string key="NSContents">Text Cell</string> + <object class="NSFont" key="NSSupport" id="637456802"> + <string key="NSName">LucidaGrande</string> + <double key="NSSize">1.300000e+01</double> + <int key="NSfFlags">1044</int> + </object> + <reference key="NSControlView" ref="1005650349"/> + <object class="NSColor" key="NSBackgroundColor" id="449539636"> + <int key="NSColorSpace">6</int> + <string key="NSCatalogName">System</string> + <string key="NSColorName">controlBackgroundColor</string> + <reference key="NSColor" ref="502649113"/> + </object> + <reference key="NSTextColor" ref="965034473"/> + </object> + <int key="NSResizingMask">1</int> + <bool key="NSIsResizeable">YES</bool> + <reference key="NSTableView" ref="1005650349"/> + </object> + <object class="NSTableColumn" id="664053431"> + <double key="NSWidth">1.250000e+02</double> + <double key="NSMinWidth">1.000000e+01</double> + <double key="NSMaxWidth">3.402823e+38</double> + <object class="NSTableHeaderCell" key="NSHeaderCell"> + <int key="NSCellFlags">75628032</int> + <int key="NSCellFlags2">0</int> + <string key="NSContents"/> + <reference key="NSSupport" ref="26"/> + <object class="NSColor" key="NSBackgroundColor"> + <int key="NSColorSpace">6</int> + <string key="NSCatalogName">System</string> + <string key="NSColorName">headerColor</string> + <object class="NSColor" key="NSColor"> + <int key="NSColorSpace">3</int> + <bytes key="NSWhite">MQA</bytes> + </object> + </object> + <reference key="NSTextColor" ref="929884713"/> + </object> + <object class="NSTextFieldCell" key="NSDataCell" id="933958747"> + <int key="NSCellFlags">337772096</int> + <int key="NSCellFlags2">2048</int> + <string key="NSContents">Text Cell</string> + <reference key="NSSupport" ref="637456802"/> + <reference key="NSControlView" ref="1005650349"/> + <reference key="NSBackgroundColor" ref="449539636"/> + <reference key="NSTextColor" ref="965034473"/> + </object> + <int key="NSResizingMask">1</int> + <bool key="NSIsResizeable">YES</bool> + <reference key="NSTableView" ref="1005650349"/> + </object> + </object> + <double key="NSIntercellSpacingWidth">3.000000e+00</double> + <object class="NSColor" key="NSBackgroundColor"> + <int key="NSColorSpace">6</int> + <string key="NSCatalogName">System</string> + <string key="NSColorName">_sourceListBackgroundColor</string> + <object class="NSColor" key="NSColor"> + <int key="NSColorSpace">1</int> + <bytes key="NSRGB">MC44MzkyMTU3IDAuODY2NjY2NjcgMC44OTgwMzkyMgA</bytes> + </object> + </object> + <object class="NSColor" key="NSGridColor"> + <int key="NSColorSpace">6</int> + <string key="NSCatalogName">System</string> + <string key="NSColorName">gridColor</string> + <object class="NSColor" key="NSColor"> + <int key="NSColorSpace">3</int> + <bytes key="NSWhite">MC41AA</bytes> + </object> + </object> + <double key="NSRowHeight">2.000000e+01</double> + <int key="NSTvFlags">1379926016</int> + <int key="NSColumnAutoresizingStyle">4</int> + <int key="NSDraggingSourceMaskForLocal">15</int> + <int key="NSDraggingSourceMaskForNonLocal">0</int> + <bool key="NSAllowsTypeSelect">YES</bool> + <int key="NSTableViewSelectionHighlightStyle">1</int> + <float key="NSOutlineViewIndentationPerLevelKey">1.400000e+01</float> </object> </object> + <string key="NSFrame">{{1, 1}, {159, 269}}</string> + <reference key="NSSuperview" ref="1051005359"/> + <reference key="NSNextKeyView" ref="1005650349"/> + <reference key="NSDocView" ref="1005650349"/> + <reference key="NSBGColor" ref="449539636"/> + <int key="NScvFlags">4</int> + </object> + <object class="NSScroller" id="236680618"> + <reference key="NSNextResponder" ref="1051005359"/> + <int key="NSvFlags">256</int> + <string key="NSFrame">{{160, 1}, {15, 269}}</string> + <reference key="NSSuperview" ref="1051005359"/> + <reference key="NSTarget" ref="1051005359"/> + <string key="NSAction">_doScroller:</string> + <double key="NSCurValue">3.700000e+01</double> + <double key="NSPercent">1.390978e-01</double> + </object> + <object class="NSScroller" id="628149687"> + <reference key="NSNextResponder" ref="1051005359"/> + <int key="NSvFlags">256</int> + <string key="NSFrame">{{-100, -100}, {174, 15}}</string> + <reference key="NSSuperview" ref="1051005359"/> + <int key="NSsFlags">1</int> + <reference key="NSTarget" ref="1051005359"/> + <string key="NSAction">_doScroller:</string> + <double key="NSPercent">9.943182e-01</double> </object> </object> - <string key="NSFrame">{{1, 1}, {343, 262}}</string> - <reference key="NSSuperview" ref="900089199"/> - <reference key="NSNextKeyView" ref="548321188"/> - <reference key="NSDocView" ref="548321188"/> - <reference key="NSBGColor" ref="210640837"/> - <int key="NScvFlags">4</int> + <string key="NSFrameSize">{176, 271}</string> + <reference key="NSSuperview" ref="887432493"/> + <reference key="NSNextKeyView" ref="229972990"/> + <int key="NSsFlags">18</int> + <reference key="NSVScroller" ref="236680618"/> + <reference key="NSHScroller" ref="628149687"/> + <reference key="NSContentView" ref="229972990"/> + <bytes key="NSScrollAmts">QSAAAEEgAABBoAAAQaAAAA</bytes> </object> - <object class="NSScroller" id="115827275"> - <reference key="NSNextResponder" ref="900089199"/> - <int key="NSvFlags">256</int> - <string key="NSFrame">{{344, 1}, {15, 262}}</string> - <reference key="NSSuperview" ref="900089199"/> - <reference key="NSTarget" ref="900089199"/> - <string key="NSAction">_doScroller:</string> - <double key="NSCurValue">1.000000e+00</double> - <double key="NSPercent">8.965517e-01</double> - </object> - <object class="NSScroller" id="134770120"> - <reference key="NSNextResponder" ref="900089199"/> - <int key="NSvFlags">256</int> - <string key="NSFrame">{{1, 263}, {343, 15}}</string> - <reference key="NSSuperview" ref="900089199"/> - <int key="NSsFlags">1</int> - <reference key="NSTarget" ref="900089199"/> - <string key="NSAction">_doScroller:</string> - <double key="NSPercent">6.315789e-01</double> + <object class="NSCustomView" id="899446701"> + <reference key="NSNextResponder" ref="887432493"/> + <int key="NSvFlags">274</int> + <string key="NSFrame">{{185, 0}, {458, 271}}</string> + <reference key="NSSuperview" ref="887432493"/> + <string key="NSClassName">NSView</string> </object> </object> - <string key="NSFrame">{{-8, 20}, {360, 279}}</string> + <string key="NSFrame">{{-1, 20}, {643, 271}}</string> <reference key="NSSuperview" ref="414427165"/> - <reference key="NSNextKeyView" ref="944338092"/> - <int key="NSsFlags">50</int> - <reference key="NSVScroller" ref="115827275"/> - <reference key="NSHScroller" ref="134770120"/> - <reference key="NSContentView" ref="944338092"/> + <bool key="NSIsVertical">YES</bool> </object> </object> - <string key="NSFrameSize">{352, 291}</string> + <string key="NSFrameSize">{641, 291}</string> <reference key="NSSuperview"/> </object> <string key="NSScreenRect">{{0, 0}, {1280, 778}}</string> @@ -883,83 +1002,20 @@ <object class="NSCustomObject" id="284119073"> <string key="NSClassName">AppController</string> </object> - <object class="NSCollectionViewItem" id="818864313"/> - <object class="NSView" id="317160314"> - <reference key="NSNextResponder"/> - <int key="NSvFlags">256</int> - <object class="NSMutableArray" key="NSSubviews"> + <object class="NSTreeController" id="681190474"> + <object class="NSMutableArray" key="NSDeclaredKeys"> <bool key="EncodedWithXMLCoder">YES</bool> - <object class="NSImageView" id="581097435"> - <reference key="NSNextResponder" ref="317160314"/> - <int key="NSvFlags">274</int> - <object class="NSMutableSet" key="NSDragTypes"> - <bool key="EncodedWithXMLCoder">YES</bool> - <object class="NSMutableArray" key="set.sortedObjects"> - <bool key="EncodedWithXMLCoder">YES</bool> - <string>Apple PDF pasteboard type</string> - <string>Apple PICT pasteboard type</string> - <string>Apple PNG pasteboard type</string> - <string>NSFilenamesPboardType</string> - <string>NeXT Encapsulated PostScript v1.2 pasteboard type</string> - <string>NeXT TIFF v4.0 pasteboard type</string> - </object> - </object> - <string key="NSFrame">{{20, 0}, {45, 64}}</string> - <reference key="NSSuperview" ref="317160314"/> - <bool key="NSEnabled">YES</bool> - <object class="NSImageCell" key="NSCell" id="125148400"> - <int key="NSCellFlags">130560</int> - <int key="NSCellFlags2">33554432</int> - <object class="NSCustomResource" key="NSContents"> - <string key="NSClassName">NSImage</string> - <string key="NSResourceName">NSInfo</string> - </object> - <int key="NSAlign">0</int> - <int key="NSScale">3</int> - <int key="NSStyle">0</int> - <bool key="NSAnimates">NO</bool> - </object> - <bool key="NSEditable">YES</bool> - </object> - <object class="NSTextField" id="714848346"> - <reference key="NSNextResponder" ref="317160314"/> - <int key="NSvFlags">290</int> - <string key="NSFrame">{{73, 20}, {212, 13}}</string> - <reference key="NSSuperview" ref="317160314"/> - <bool key="NSEnabled">YES</bool> - <object class="NSTextFieldCell" key="NSCell" id="564607218"> - <int key="NSCellFlags">67239488</int> - <int key="NSCellFlags2">4195328</int> - <string key="NSContents">Text</string> - <object class="NSFont" key="NSSupport" id="24"> - <string key="NSName">LucidaGrande</string> - <double key="NSSize">1.000000e+01</double> - <int key="NSfFlags">16</int> - </object> - <reference key="NSControlView" ref="714848346"/> - <reference key="NSBackgroundColor" ref="210640837"/> - <reference key="NSTextColor" ref="965034473"/> - </object> - </object> - <object class="NSTextField" id="30095882"> - <reference key="NSNextResponder" ref="317160314"/> - <int key="NSvFlags">290</int> - <string key="NSFrame">{{73, 37}, {85, 13}}</string> - <reference key="NSSuperview" ref="317160314"/> - <bool key="NSEnabled">YES</bool> - <object class="NSTextFieldCell" key="NSCell" id="1064688791"> - <int key="NSCellFlags">67239488</int> - <int key="NSCellFlags2">4195328</int> - <string key="NSContents">Service</string> - <reference key="NSSupport" ref="24"/> - <reference key="NSControlView" ref="30095882"/> - <reference key="NSBackgroundColor" ref="210640837"/> - <reference key="NSTextColor" ref="965034473"/> - </object> - </object> + <string>name</string> + <string>detail</string> + <string>descriptive_text</string> + <string>text</string> </object> - <string key="NSFrameSize">{305, 70}</string> - <reference key="NSSuperview"/> + <bool key="NSEditable">YES</bool> + <object class="_NSManagedProxy" key="_NSManagedProxy"/> + <bool key="NSAvoidsEmptySelection">YES</bool> + <bool key="NSPreservesSelection">YES</bool> + <bool key="NSSelectsInsertedObjects">YES</bool> + <string key="NSTreeContentChildrenKey">children</string> </object> </object> <object class="IBObjectContainer" key="IBDocument.Objects"> @@ -1279,91 +1335,100 @@ </object> <object class="IBConnectionRecord"> <object class="IBOutletConnection" key="connection"> - <string key="label">view</string> - <reference key="source" ref="818864313"/> - <reference key="destination" ref="317160314"/> + <string key="label">delegate</string> + <reference key="source" ref="1050"/> + <reference key="destination" ref="284119073"/> </object> - <int key="connectionID">455</int> + <int key="connectionID">464</int> </object> <object class="IBConnectionRecord"> <object class="IBBindingConnection" key="connection"> - <string key="label">content: messages</string> - <reference key="source" ref="548321188"/> + <string key="label">contentArray: servicekinds</string> + <reference key="source" ref="681190474"/> <reference key="destination" ref="722948515"/> <object class="NSNibBindingConnector" key="connector"> - <reference key="NSSource" ref="548321188"/> + <reference key="NSSource" ref="681190474"/> <reference key="NSDestination" ref="722948515"/> - <string key="NSLabel">content: messages</string> - <string key="NSBinding">content</string> - <string key="NSKeyPath">messages</string> + <string key="NSLabel">contentArray: servicekinds</string> + <string key="NSBinding">contentArray</string> + <string key="NSKeyPath">servicekinds</string> <int key="NSNibBindingConnectorVersion">2</int> </object> </object> - <int key="connectionID">461</int> - </object> - <object class="IBConnectionRecord"> - <object class="IBOutletConnection" key="connection"> - <string key="label">delegate</string> - <reference key="source" ref="1050"/> - <reference key="destination" ref="284119073"/> - </object> - <int key="connectionID">464</int> + <int key="connectionID">497</int> </object> <object class="IBConnectionRecord"> <object class="IBBindingConnection" key="connection"> - <string key="label">value: representedObject.text</string> - <reference key="source" ref="564607218"/> - <reference key="destination" ref="818864313"/> + <string key="label">value: arrangedObjects.text</string> + <reference key="source" ref="664053431"/> + <reference key="destination" ref="681190474"/> <object class="NSNibBindingConnector" key="connector"> - <reference key="NSSource" ref="564607218"/> - <reference key="NSDestination" ref="818864313"/> - <string key="NSLabel">value: representedObject.text</string> + <reference key="NSSource" ref="664053431"/> + <reference key="NSDestination" ref="681190474"/> + <string key="NSLabel">value: arrangedObjects.text</string> <string key="NSBinding">value</string> - <string key="NSKeyPath">representedObject.text</string> + <string key="NSKeyPath">arrangedObjects.text</string> <int key="NSNibBindingConnectorVersion">2</int> </object> </object> - <int key="connectionID">465</int> + <int key="connectionID">500</int> </object> <object class="IBConnectionRecord"> <object class="IBBindingConnection" key="connection"> - <string key="label">value: representedObject.service_name</string> - <reference key="source" ref="30095882"/> - <reference key="destination" ref="818864313"/> - <object class="NSNibBindingConnector" key="connector"> - <reference key="NSSource" ref="30095882"/> - <reference key="NSDestination" ref="818864313"/> - <string key="NSLabel">value: representedObject.service_name</string> - <string key="NSBinding">value</string> - <string key="NSKeyPath">representedObject.service_name</string> + <string key="label">content: arrangedObjects</string> + <reference key="source" ref="1005650349"/> + <reference key="destination" ref="681190474"/> + <object class="NSNibBindingConnector" key="connector" id="123700931"> + <reference key="NSSource" ref="1005650349"/> + <reference key="NSDestination" ref="681190474"/> + <string key="NSLabel">content: arrangedObjects</string> + <string key="NSBinding">content</string> + <string key="NSKeyPath">arrangedObjects</string> <int key="NSNibBindingConnectorVersion">2</int> </object> </object> - <int key="connectionID">469</int> + <int key="connectionID">505</int> </object> <object class="IBConnectionRecord"> <object class="IBBindingConnection" key="connection"> - <string key="label">value: representedObject.text</string> - <reference key="source" ref="714848346"/> - <reference key="destination" ref="818864313"/> + <string key="label">selectionIndexPaths: selectedItems</string> + <reference key="source" ref="1005650349"/> + <reference key="destination" ref="722948515"/> <object class="NSNibBindingConnector" key="connector"> - <reference key="NSSource" ref="714848346"/> - <reference key="NSDestination" ref="818864313"/> - <string key="NSLabel">value: representedObject.text</string> - <string key="NSBinding">value</string> - <string key="NSKeyPath">representedObject.text</string> + <reference key="NSSource" ref="1005650349"/> + <reference key="NSDestination" ref="722948515"/> + <string key="NSLabel">selectionIndexPaths: selectedItems</string> + <string key="NSBinding">selectionIndexPaths</string> + <string key="NSKeyPath">selectedItems</string> + <reference key="NSPreviousConnector" ref="123700931"/> <int key="NSNibBindingConnectorVersion">2</int> </object> </object> - <int key="connectionID">473</int> + <int key="connectionID">509</int> + </object> + <object class="IBConnectionRecord"> + <object class="IBOutletConnection" key="connection"> + <string key="label">detail_view</string> + <reference key="source" ref="722948515"/> + <reference key="destination" ref="899446701"/> + </object> + <int key="connectionID">510</int> + </object> + <object class="IBConnectionRecord"> + <object class="IBOutletConnection" key="connection"> + <string key="label">outline_view</string> + <reference key="source" ref="722948515"/> + <reference key="destination" ref="1005650349"/> + </object> + <int key="connectionID">513</int> </object> <object class="IBConnectionRecord"> <object class="IBOutletConnection" key="connection"> - <string key="label">itemPrototype</string> - <reference key="source" ref="548321188"/> - <reference key="destination" ref="818864313"/> + <string key="label">delegate</string> + <reference key="source" ref="1005650349"/> + <reference key="destination" ref="722948515"/> </object> - <int key="connectionID">475</int> + <int key="connectionID">514</int> </object> </object> <object class="IBMutableOrderedSet" key="objectRecords"> @@ -1981,7 +2046,7 @@ <object class="NSMutableArray" key="children"> <bool key="EncodedWithXMLCoder">YES</bool> <reference ref="361621960"/> - <reference ref="900089199"/> + <reference ref="887432493"/> </object> <reference key="parent" ref="513744381"/> </object> @@ -2005,93 +2070,88 @@ <reference key="parent" ref="361621960"/> </object> <object class="IBObjectRecord"> - <int key="objectID">448</int> - <reference key="object" ref="900089199"/> - <object class="NSMutableArray" key="children"> - <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="115827275"/> - <reference ref="134770120"/> - <reference ref="548321188"/> - </object> - <reference key="parent" ref="414427165"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">449</int> - <reference key="object" ref="115827275"/> - <reference key="parent" ref="900089199"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">450</int> - <reference key="object" ref="134770120"/> - <reference key="parent" ref="900089199"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">451</int> - <reference key="object" ref="548321188"/> - <reference key="parent" ref="900089199"/> + <int key="objectID">462</int> + <reference key="object" ref="284119073"/> + <reference key="parent" ref="1049"/> </object> <object class="IBObjectRecord"> - <int key="objectID">452</int> - <reference key="object" ref="818864313"/> + <int key="objectID">492</int> + <reference key="object" ref="681190474"/> <reference key="parent" ref="1049"/> </object> <object class="IBObjectRecord"> - <int key="objectID">453</int> - <reference key="object" ref="317160314"/> + <int key="objectID">511</int> + <reference key="object" ref="887432493"/> <object class="NSMutableArray" key="children"> <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="581097435"/> - <reference ref="714848346"/> - <reference ref="30095882"/> + <reference ref="1051005359"/> + <reference ref="899446701"/> </object> - <reference key="parent" ref="1049"/> + <reference key="parent" ref="414427165"/> </object> <object class="IBObjectRecord"> - <int key="objectID">457</int> - <reference key="object" ref="581097435"/> + <int key="objectID">481</int> + <reference key="object" ref="1051005359"/> <object class="NSMutableArray" key="children"> <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="125148400"/> + <reference ref="1005650349"/> + <reference ref="628149687"/> + <reference ref="236680618"/> </object> - <reference key="parent" ref="317160314"/> + <reference key="parent" ref="887432493"/> </object> <object class="IBObjectRecord"> - <int key="objectID">458</int> - <reference key="object" ref="714848346"/> + <int key="objectID">484</int> + <reference key="object" ref="1005650349"/> <object class="NSMutableArray" key="children"> <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="564607218"/> + <reference ref="664053431"/> + <reference ref="9220477"/> </object> - <reference key="parent" ref="317160314"/> + <reference key="parent" ref="1051005359"/> </object> <object class="IBObjectRecord"> - <int key="objectID">459</int> - <reference key="object" ref="564607218"/> - <reference key="parent" ref="714848346"/> + <int key="objectID">483</int> + <reference key="object" ref="628149687"/> + <reference key="parent" ref="1051005359"/> </object> <object class="IBObjectRecord"> - <int key="objectID">460</int> - <reference key="object" ref="125148400"/> - <reference key="parent" ref="581097435"/> + <int key="objectID">482</int> + <reference key="object" ref="236680618"/> + <reference key="parent" ref="1051005359"/> </object> <object class="IBObjectRecord"> - <int key="objectID">462</int> - <reference key="object" ref="284119073"/> - <reference key="parent" ref="1049"/> + <int key="objectID">490</int> + <reference key="object" ref="664053431"/> + <object class="NSMutableArray" key="children"> + <bool key="EncodedWithXMLCoder">YES</bool> + <reference ref="933958747"/> + </object> + <reference key="parent" ref="1005650349"/> </object> <object class="IBObjectRecord"> - <int key="objectID">466</int> - <reference key="object" ref="30095882"/> + <int key="objectID">486</int> + <reference key="object" ref="9220477"/> <object class="NSMutableArray" key="children"> <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="1064688791"/> + <reference ref="338825516"/> </object> - <reference key="parent" ref="317160314"/> + <reference key="parent" ref="1005650349"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">489</int> + <reference key="object" ref="338825516"/> + <reference key="parent" ref="9220477"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">491</int> + <reference key="object" ref="933958747"/> + <reference key="parent" ref="664053431"/> </object> <object class="IBObjectRecord"> - <int key="objectID">467</int> - <reference key="object" ref="1064688791"/> - <reference key="parent" ref="30095882"/> + <int key="objectID">476</int> + <reference key="object" ref="899446701"/> + <reference key="parent" ref="887432493"/> </object> </object> </object> @@ -2252,22 +2312,15 @@ <string>417.IBViewIntegration.shadowOffsetHeight</string> <string>417.IBViewIntegration.shadowOffsetWidth</string> <string>418.IBPluginDependency</string> - <string>448.IBPluginDependency</string> - <string>449.IBPluginDependency</string> - <string>450.IBPluginDependency</string> - <string>451.CustomClassName</string> - <string>451.IBPluginDependency</string> - <string>452.CustomClassName</string> - <string>453.CustomClassName</string> - <string>453.IBEditorWindowLastContentRect</string> - <string>453.editorWindowContentRectSynchronizationRect</string> - <string>457.IBPluginDependency</string> - <string>457.ImportedFromIB2</string> - <string>458.IBPluginDependency</string> - <string>458.ImportedFromIB2</string> <string>462.IBPluginDependency</string> - <string>466.IBPluginDependency</string> - <string>466.ImportedFromIB2</string> + <string>476.IBPluginDependency</string> + <string>481.IBPluginDependency</string> + <string>482.IBPluginDependency</string> + <string>483.IBPluginDependency</string> + <string>484.IBPluginDependency</string> + <string>486.IBPluginDependency</string> + <string>489.IBPluginDependency</string> + <string>492.IBPluginDependency</string> <string>5.IBPluginDependency</string> <string>5.ImportedFromIB2</string> <string>56.IBPluginDependency</string> @@ -2442,10 +2495,10 @@ <reference ref="9"/> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <reference ref="9"/> - <string>{{340, 561}, {352, 291}}</string> + <string>{{344, 218}, {641, 291}}</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <reference ref="9"/> - <string>{{340, 561}, {352, 291}}</string> + <integer value="0"/> + <string>{{344, 218}, {641, 291}}</string> <reference ref="9"/> <string>{{437, 175}, {352, 291}}</string> <reference ref="9"/> @@ -2461,19 +2514,12 @@ <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>CollectionView</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>CollectionViewItem</string> - <string>MessageView</string> - <string>{{0, 1075}, {305, 70}}</string> - <string>{{450, 78}, {305, 70}}</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <reference ref="9"/> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <reference ref="9"/> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <reference ref="9"/> + <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <reference ref="9"/> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> @@ -2530,7 +2576,7 @@ </object> </object> <nil key="sourceID"/> - <int key="maxID">475</int> + <int key="maxID">514</int> </object> <object class="IBClassDescriber" key="IBDocument.Classes"> <object class="NSMutableArray" key="referencedPartialClassDescriptions"> @@ -2546,6 +2592,19 @@ <object class="IBPartialClassDescription"> <string key="className">BonjourWatcher</string> <string key="superclassName">NSObject</string> + <object class="NSMutableDictionary" key="outlets"> + <bool key="EncodedWithXMLCoder">YES</bool> + <object class="NSMutableArray" key="dict.sortedKeys"> + <bool key="EncodedWithXMLCoder">YES</bool> + <string>detail_view</string> + <string>outline_view</string> + </object> + <object class="NSMutableArray" key="dict.values"> + <bool key="EncodedWithXMLCoder">YES</bool> + <string>id</string> + <string>id</string> + </object> + </object> <object class="IBClassDescriptionSource" key="sourceIdentifier"> <string key="majorKey">IBProjectSource</string> <string key="minorKey">BonjourWatcher.rb</string> @@ -2559,42 +2618,6 @@ <string key="minorKey"/> </object> </object> - <object class="IBPartialClassDescription"> - <string key="className">CollectionView</string> - <string key="superclassName">NSCollectionView</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBProjectSource</string> - <string key="minorKey">CollectionView.rb</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">CollectionView</string> - <string key="superclassName">NSCollectionView</string> - <object class="NSMutableDictionary" key="outlets"> - <string key="NS.key.0">itemPrototype</string> - <string key="NS.object.0">CollectionViewItem</string> - </object> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBUserSource</string> - <string key="minorKey"/> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">CollectionViewItem</string> - <string key="superclassName">NSCollectionViewItem</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBProjectSource</string> - <string key="minorKey">CollectionViewItem.rb</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">MessageView</string> - <string key="superclassName">NSView</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBProjectSource</string> - <string key="minorKey">MessageView.rb</string> - </object> - </object> </object> </object> <int key="IBDocument.localizationMode">0</int> English.lproj/MainMenu.xib @@ -24,14 +24,14 @@ class MessageView < OSX::NSView super_drawRect rect end - def mouseDown(event) - # check for double-clicks - if event.clickCount > 1 - puts "double click" - # self.delegate.doubleClick(self) rescue nil if self.delegate - end - - nextResponder.mouseDown(event) - end + # def mouseDown(event) + # # check for double-clicks + # if event.clickCount > 1 + # puts "double click" + # # self.delegate.doubleClick(self) rescue nil if self.delegate + # end + # + # nextResponder.mouseDown(event) + # end end MessageView.rb @@ -7,6 +7,16 @@ objects = { /* Begin PBXBuildFile section */ + 080DA5440E0CD5E5009AFF17 /* AppJour.xib in Resources */ = {isa = PBXBuildFile; fileRef = 080DA5430E0CD5E5009AFF17 /* AppJour.xib */; }; + 080DA55C0E0CDE29009AFF17 /* GitJour.xib in Resources */ = {isa = PBXBuildFile; fileRef = 080DA55B0E0CDE29009AFF17 /* GitJour.xib */; }; + 080DA55E0E0CDE32009AFF17 /* GemJour.xib in Resources */ = {isa = PBXBuildFile; fileRef = 080DA55D0E0CDE32009AFF17 /* GemJour.xib */; }; + 083C8C080E0C750C00E2D5AD /* Jour.rb in Resources */ = {isa = PBXBuildFile; fileRef = 083C8C070E0C750C00E2D5AD /* Jour.rb */; }; + 083C8C0A0E0C751C00E2D5AD /* GitJour.rb in Resources */ = {isa = PBXBuildFile; fileRef = 083C8C090E0C751C00E2D5AD /* GitJour.rb */; }; + 083C8C0C0E0C756000E2D5AD /* AppJour.rb in Resources */ = {isa = PBXBuildFile; fileRef = 083C8C0B0E0C756000E2D5AD /* AppJour.rb */; }; + 083C8C0E0E0C766800E2D5AD /* GemJour.rb in Resources */ = {isa = PBXBuildFile; fileRef = 083C8C0D0E0C766800E2D5AD /* GemJour.rb */; }; + 083C8C100E0C767B00E2D5AD /* PasteJour.rb in Resources */ = {isa = PBXBuildFile; fileRef = 083C8C0F0E0C767B00E2D5AD /* PasteJour.rb */; }; + 083C8C6C0E0C882300E2D5AD /* ServiceKind.rb in Resources */ = {isa = PBXBuildFile; fileRef = 083C8C6B0E0C882300E2D5AD /* ServiceKind.rb */; }; + 083C8CB00E0CA30700E2D5AD /* PasteJour.xib in Resources */ = {isa = PBXBuildFile; fileRef = 083C8CAF0E0CA30700E2D5AD /* PasteJour.xib */; }; 086D84500E020012008A3B2B /* BonjourWatcher.rb in Resources */ = {isa = PBXBuildFile; fileRef = 086D844F0E020011008A3B2B /* BonjourWatcher.rb */; }; 08B2B5760E022EC60084F4D3 /* MainMenu.xib in Resources */ = {isa = PBXBuildFile; fileRef = 08B2B5740E022EC60084F4D3 /* MainMenu.xib */; }; 08B2B5970E0241DE0084F4D3 /* RubyCocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 08B2B5960E0241DE0084F4D3 /* RubyCocoa.framework */; }; @@ -24,6 +34,16 @@ /* End PBXBuildFile section */ /* Begin PBXFileReference section */ + 080DA5430E0CD5E5009AFF17 /* AppJour.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = AppJour.xib; sourceTree = "<group>"; }; + 080DA55B0E0CDE29009AFF17 /* GitJour.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = GitJour.xib; sourceTree = "<group>"; }; + 080DA55D0E0CDE32009AFF17 /* GemJour.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = GemJour.xib; sourceTree = "<group>"; }; + 083C8C070E0C750C00E2D5AD /* Jour.rb */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.ruby; path = Jour.rb; sourceTree = "<group>"; }; + 083C8C090E0C751C00E2D5AD /* GitJour.rb */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.ruby; path = GitJour.rb; sourceTree = "<group>"; }; + 083C8C0B0E0C756000E2D5AD /* AppJour.rb */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.ruby; path = AppJour.rb; sourceTree = "<group>"; }; + 083C8C0D0E0C766800E2D5AD /* GemJour.rb */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.ruby; path = GemJour.rb; sourceTree = "<group>"; }; + 083C8C0F0E0C767B00E2D5AD /* PasteJour.rb */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.ruby; path = PasteJour.rb; sourceTree = "<group>"; }; + 083C8C6B0E0C882300E2D5AD /* ServiceKind.rb */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.ruby; path = ServiceKind.rb; sourceTree = "<group>"; }; + 083C8CAF0E0CA30700E2D5AD /* PasteJour.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = PasteJour.xib; sourceTree = "<group>"; }; 086D844F0E020011008A3B2B /* BonjourWatcher.rb */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.ruby; path = BonjourWatcher.rb; sourceTree = "<group>"; }; 089C165DFE840E0CC02AAC07 /* English */ = {isa = PBXFileReference; fileEncoding = 10; lastKnownFileType = text.plist.strings; name = English; path = English.lproj/InfoPlist.strings; sourceTree = "<group>"; }; 08B2B5750E022EC60084F4D3 /* English */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = English; path = English.lproj/MainMenu.xib; sourceTree = "<group>"; }; @@ -65,6 +85,12 @@ 31FBE7D10E03E6BB00213906 /* CollectionView.rb */, 31FBE7D60E03E74400213906 /* CollectionViewItem.rb */, 31FBE7DE0E03E7E000213906 /* AppController.rb */, + 083C8C070E0C750C00E2D5AD /* Jour.rb */, + 083C8C090E0C751C00E2D5AD /* GitJour.rb */, + 083C8C0B0E0C756000E2D5AD /* AppJour.rb */, + 083C8C0D0E0C766800E2D5AD /* GemJour.rb */, + 083C8C0F0E0C767B00E2D5AD /* PasteJour.rb */, + 083C8C6B0E0C882300E2D5AD /* ServiceKind.rb */, ); name = Classes; sourceTree = "<group>"; @@ -125,6 +151,10 @@ CE26873D0E092BCE0068195C /* star-jour.icns */, 08B2B5740E022EC60084F4D3 /* MainMenu.xib */, 089C165CFE840E0CC02AAC07 /* InfoPlist.strings */, + 083C8CAF0E0CA30700E2D5AD /* PasteJour.xib */, + 080DA5430E0CD5E5009AFF17 /* AppJour.xib */, + 080DA55B0E0CDE29009AFF17 /* GitJour.xib */, + 080DA55D0E0CDE32009AFF17 /* GemJour.xib */, ); name = Resources; sourceTree = "<group>"; @@ -203,6 +233,16 @@ 31D9736D0E08C72A0051DC91 /* Rakefile in Resources */, 31D9736E0E08C72A0051DC91 /* Readme.textile in Resources */, CE26873E0E092BCE0068195C /* star-jour.icns in Resources */, + 083C8C080E0C750C00E2D5AD /* Jour.rb in Resources */, + 083C8C0A0E0C751C00E2D5AD /* GitJour.rb in Resources */, + 083C8C0C0E0C756000E2D5AD /* AppJour.rb in Resources */, + 083C8C0E0E0C766800E2D5AD /* GemJour.rb in Resources */, + 083C8C100E0C767B00E2D5AD /* PasteJour.rb in Resources */, + 083C8C6C0E0C882300E2D5AD /* ServiceKind.rb in Resources */, + 083C8CB00E0CA30700E2D5AD /* PasteJour.xib in Resources */, + 080DA5440E0CD5E5009AFF17 /* AppJour.xib in Resources */, + 080DA55C0E0CDE29009AFF17 /* GitJour.xib in Resources */, + 080DA55E0E0CDE32009AFF17 /* GemJour.xib in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; starjour.xcodeproj/project.pbxproj 6da372a751e0e71ae3f20431591ed2a843367ec2 lachie lachiec@gmail.com http://github.com/lachie/starjour/commit/aa0e4dab87252c0611656d3ee302bdd891ad5fdd aa0e4dab87252c0611656d3ee302bdd891ad5fdd 2008-06-21T00:34:54-07:00 2008-06-21T00:34:54-07:00 lots of refactorage 5cff05d2e3d201024c957126d99528183d382081 lachie lachiec@gmail.com