Changeset 717

Timestamp:

10/25/07 22:55:24 (6 years ago)

Author:

cho45

Message:

lang/ruby/Chemr/CHMDocument.rb,
lang/ruby/Chemr/English.lproj/CHMDocument.nib/info.nib,
lang/ruby/Chemr/English.lproj/CHMDocument.nib/keyedobjects.nib:

chmlib binding の変更に追従
おちにくいようにコード変更
おちやすいようにコード変更

Location:

lang/ruby/Chemr

Files:

• CHMDocument.rb (modified) (4 diffs)
• English.lproj/CHMDocument.nib/info.nib (modified) (1 diff)
• English.lproj/CHMDocument.nib/keyedobjects.nib (modified) (previous)

lang/ruby/Chemr/CHMDocument.rb

@@ -79 +79 @@
 
                 @tree.setAction("treeclicked_")
-                Thread.start do
-                        @chm.topics
-                        # タイミングの問題?で BUS Error になるのでコメントアウト
-                        # どうせツリーなんかつかわないよね
-                        # @tree.setDataSource(self)
-                end
 
                 @search.setDelegate(self)
@@ -98 +92 @@
 
         def outlineView_child_ofItem(ov, index, item)
-                if item
-                        item[:children][index]
-                else
-                        @topics[index]
-                end
+                (item || @topics)[:children][index]
         end
 
         def outlineView_isItemExpandable(ov, item)
-                if item
-                        item[:children].length.nonzero?
-                else
-                        @topics.length.nonzero?
-                end
+                (item || @topics)[:children].length.nonzero?
         end
 
         def outlineView_numberOfChildrenOfItem(ov, item)
-                if item
-                        item[:children].length
-                else
-                        @topics.length
-                end
+                (item || @topics)[:children].length
         end
 
@@ -161 +143 @@
         def acceptsFirstResponder
                 true
+        end
+
+        # TabView
+        def tabView_willSelectTabViewItem(sender, item)
+                log item.label
+                if item.label == "Tree"
+                        Thread.start do
+                                @topics = @chm.topics
+                                # おちやすい
+                                @tree.setDataSource(self)
+                                @tree.reloadData
+                        end
+                end
         end
 
@@ -279 +274 @@
 
         def process_keybinds(e)
-                log NSInputManager.currentInputManager.markedRange.empty?
-                return false unless NSInputManager.currentInputManager.markedRange.empty?
+                if NSInputManager.currentInputManager
+                        return false unless NSInputManager.currentInputManager.markedRange.empty?
+                end
                 key = key_string(e)
                 log "keyDown (#{e.characters}:#{e.charactersIgnoringModifiers}) -> '#{key}'"

lang/ruby/Chemr/English.lproj/CHMDocument.nib/info.nib

@@ -8 +8 @@
         <dict>
                 <key>39</key>
-                <string>429 291 422 473 0 0 1280 778 </string>
+                <string>440 291 422 473 0 0 1280 778 </string>
         </dict>
         <key>IBFramework Version</key>