Changeset 741 for lang/ruby/Amalgam

Timestamp:

10/26/07 23:40:50 (6 years ago)

Author:

cho45

Message:

lang/ruby/Amalgam/AppController.rb,
lang/ruby/Amalgam/English.lproj/MainMenu.nib/objects.nib,
lang/ruby/Amalgam/English.lproj/MainMenu.nib/info.nib:

でっかく。
コマンドとかは === で比較するようにした。
これによって正規表現がつかえるように
補完のところでは grep をつかっている。
正規表現同士だと必ず false になり、補完されない。

Location:

lang/ruby/Amalgam

Files:

• AppController.rb (modified) (10 diffs)
• English.lproj/MainMenu.nib/info.nib (modified) (1 diff)
• English.lproj/MainMenu.nib/objects.nib (modified) (previous)

lang/ruby/Amalgam/AppController.rb

@@ -34 +34 @@
 
         def comboBox_objectValueForItemAtIndex(sender, index)
-                (@candidate || [])[index]
+                (@candidate || [])[index].first
         end
 
         def numberOfItemsInComboBox(sender)
-                log "Reloaded data"
+                # log "Reloaded data"
                 (@candidate || []).length
         end
@@ -44 +44 @@
         def comboBox_completedString(sender, string)
                 #log "completedString->#{string}"
-                (@candidate || []).grep(/^#{string}/i).first
-        rescue
+                string = Regexp.escape(string)
+                (@candidate || []).transpose[0].grep(/^#{string}/i).first
+        rescue Exception
                 ""
         end
@@ -51 +52 @@
         def comboBox_indexOfItemWithStringValue(sender, string)
                 @candidate ||= []
-                @candidate.index(string) || NSNotFound
+                @candidate.each_with_index do |(r,l),i|
+                        if r === string
+                                return i
+                        end
+                end
+                NSNotFound
         end
 
@@ -67 +73 @@
         def windowDidBecomeMain(anot)
                 @window.makeFirstResponder(@combo)
-                @combo.reloadData
-                @combo.stringValue = ""
-                @now = nil
+                @combo.delegate = self
+                #@combo.reloadData
+                @editting = false
+                #@combo.stringValue = ""
         end
 
@@ -101 +108 @@
                 @combo.numberOfVisibleItems = 20
 
-                NSApp.register_hotkey("Command+Control+O") do
+                NSApp.register_hotkey("Command+`") do
                         log "HotKey hitted"
                         NSApp.activateIgnoringOtherApps(true)
@@ -109 +116 @@
                 end
 
-                Thread.start do
-                        search_applications()
-                end.join
+                build_candidates()
+
+                NSApp.activateIgnoringOtherApps(true)
+                @window.makeFirstResponder(@combo)
         end
 
@@ -125 +133 @@
                 case key
                 when "\r"
-                        case @combo.stringValue
-                        when "exit", "Exit"
-                                if OSX.NSRunAlertPanel("Sure?", "exit ok?", "Exit", "Cancel", nil) == NSAlertDefaultReturn
-                                        NSApp.terminate(nil)
-                                end
-                        when /^d (.+)/i
-                                code = Regexp.last_match[1]
-                                result = ""
-                                begin
-                                        result = eval(code, binding).inspect
-                                rescue Exception => e
-                                        result = e.inspect
-                                end
-                                OSX.NSRunAlertPanel("Debug", result, "Ok", "", nil) == NSAlertDefaultReturn
-                        when /^\s*$/
-                                # nothing
-                        else
+                        unless @combo.stringValue.strip.empty?
                                 index = comboBox_indexOfItemWithStringValue(@combo, @combo.stringValue)
                                 unless index == NSNotFound
-                                        @commands[index].call
+                                        pro = @candidate[index][1]
+                                        if pro.arity == 0
+                                                pro.call
+                                        else
+                                                pro.call(@candidate[index][0], @combo.stringValue.to_s)
+                                        end
                                 end
                         end
@@ -167 +164 @@
         end
 
-        def search_applications
+        def relunch(*)
+                log "relunch"
+                path = NSBundle.mainBundle.executablePath.to_s
+                fork do
+                        sleep 2
+                        system(path)
+                end
+                NSApp.terminate(nil)
+        end
+
+        def build_candidates
+                @candidate = []
+
                 @applications = [Pathname.new("Finder")]
                 search_applications_recursive("/Applications")
                 search_applications_recursive("/Developer/Applications")
-                
-
-                candidate = []
-                candidate = @applications.map {|f|
+
+                @candidate = @applications.map {|f|
                         [f.basename(".app").to_s, proc {
                                 system("open", "-a", f)
@@ -180 +187 @@
                 }
 
-                candidate.concat Pathname.glob("/System/Library/PreferencePanes/*.prefPane").map {|f|
+                @candidate.concat Pathname.glob("/System/Library/PreferencePanes/*.prefPane").map {|f|
                         [f.basename.to_s, proc {
                                 system("open", f)
@@ -186 +193 @@
                 }
 
-                @candidate, @commands = candidate.transpose
-
-                log @candidate
+                @candidate << [/.d (.+)/, proc {|s,m|
+                        code = m[s, 1]
+                        result = ""
+                        begin
+                                result = eval(code, binding).inspect
+                        rescue Exception => e
+                                result = e.inspect
+                        end
+                        log result
+                        OSX.NSRunAlertPanel("Debug", result, "Ok", "", nil)
+                }]
+
+                @candidate << ["Exit", proc {
+                        if OSX.NSRunAlertPanel("Sure?", "exit ok?", "Exit", "Cancel", nil) == NSAlertDefaultReturn
+                                NSApp.terminate(nil)
+                        end
+                }]
+
                 log "Search done"
                 #set_status "Search done"

lang/ruby/Amalgam/English.lproj/MainMenu.nib/info.nib

@@ -8 +8 @@
         <dict>
                 <key>196</key>
-                <string>538 496 204 63 0 0 1280 778 </string>
+                <string>538 496 358 63 0 0 1280 778 </string>
         </dict>
         <key>IBFramework Version</key>