[macruby-changes] [1926] MacRuby/branches/experimental/sample-macruby/FlickrDemo/ FlickrDemoController.rb
source_changes at macosforge.org
source_changes at macosforge.org
Wed Jun 24 21:06:16 PDT 2009
Revision: 1926
http://trac.macosforge.org/projects/ruby/changeset/1926
Author: lsansonetti at apple.com
Date: 2009-06-24 21:06:15 -0700 (Wed, 24 Jun 2009)
Log Message:
-----------
fixed a few problems
Modified Paths:
--------------
MacRuby/branches/experimental/sample-macruby/FlickrDemo/FlickrDemoController.rb
Modified: MacRuby/branches/experimental/sample-macruby/FlickrDemo/FlickrDemoController.rb
===================================================================
--- MacRuby/branches/experimental/sample-macruby/FlickrDemo/FlickrDemoController.rb 2009-06-25 04:04:55 UTC (rev 1925)
+++ MacRuby/branches/experimental/sample-macruby/FlickrDemo/FlickrDemoController.rb 2009-06-25 04:06:15 UTC (rev 1926)
@@ -7,16 +7,16 @@
@imageBrowserView.animates = true
@imageBrowserView.dataSource = self
@imageBrowserView.delegate = self
+
+ NSNotificationCenter.defaultCenter.addObserver self,
+ selector:'feedRefreshed:',
+ name:PSFeedRefreshingNotification,
+ object:nil
@sources = []
@sources << Source.new('cat')
@sourcesTableView.reloadData
- @sourcesTableView.selectRowIndexes(NSIndexSet.indexSetWithIndex(0), byExtendingSelection:false)
-
- NSNotificationCenter.defaultCenter.addObserver self,
- selector:'feedRefreshed:',
- name:PSFeedRefreshingNotification,
- object:nil
+ @sourcesTableView.selectRowIndexes(NSIndexSet.indexSetWithIndex(0), byExtendingSelection:false)
end
# Actions
@@ -25,12 +25,13 @@
row = @sources.size
@sources << Source.new('dog')
@sourcesTableView.reloadData
+ @sourceEditing = true
@sourcesTableView.selectRowIndexes(NSIndexSet.indexSetWithIndex(row), byExtendingSelection:false)
@sourcesTableView.editColumn(0, row:row, withEvent:nil, select:true)
end
def removeSource(sender)
- i =@sourcesTableView.selectedRow
+ i = @sourcesTableView.selectedRow
if i == -1
NSBeep()
else
@@ -65,10 +66,13 @@
source = @sources[row]
source.tag = object
refreshImageView(source)
+ @sourceEditing = false
end
- def tableViewSelectionDidChange(notification)
- refreshImageView @sources[@sourcesTableView.selectedRow]
+ def tableViewSelectionDidChange(notification)
+ unless @sourceEditing
+ refreshImageView @sources[@sourcesTableView.selectedRow]
+ end
end
# Image browser datasource/delegate
@@ -99,8 +103,8 @@
def refreshImageView(source)
if source
url = NSURL.URLWithString(source.url)
- feed = PSFeed.alloc.initWithURL(url)
- feed.refresh(nil)
+ @feed = PSFeed.alloc.initWithURL(url)
+ @feed.refresh(nil)
else
@cache.clear
@results.clear
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macruby-changes/attachments/20090624/9da7bafe/attachment.html>
More information about the macruby-changes
mailing list