Commit: f77cbf30c83925083b08a7f3054cae4690e8cf1e - ruby-gtk3 (git)

Ruby GTK3移行後のメインリポジトリ

Commit MetaInfo

• Revisión: f77cbf30c83925083b08a7f3054cae4690e8cf1e (tree)
• Tiempo: 2015-04-07 23:36:01
• Autor: Shyouzou Sugitani <shy@user...>
• Commiter: Shyouzou Sugitani

Log Message

assorted fixes(5)

Cambiar Resumen

• modified: lib/ninix/home.rb
• modified: lib/ninix/sakura.rb
• modified: lib/ninix_main.rb

Diferencia incremental

--- a/lib/ninix/home.rb
+++ b/lib/ninix/home.rb
@@ -76,7 +76,7 @@ module Home
         if ['.rb'].include?(ext)
           name = basename
         end
-        if !name.empty? and not table.include?(name)
+        if name and not table.include?(name)
           shiori = shiori_lib.request(['', name])
           if shiori
             table[name] = shiori
@@ -122,7 +122,7 @@ module Home
       }
       # SHIORI compatible modules
       for name, shiori in shiori_table.each_entry
-        score = int(shiori.find(ghost_dir, shiori_dll))
+        score = shiori.find(ghost_dir, shiori_dll).to_i
         if score > candidate['score']
           candidate['name'] = name
           candidate['score'] = score

--- a/lib/ninix/sakura.rb
+++ b/lib/ninix/sakura.rb
@@ -155,16 +155,20 @@ module Sakura
       @parent = parent
     end
 
-    def handle_request(event_type, event, *arglist, **argdict)
+    def handle_request(event_type, event, *arglist)
       #assert ['GET', 'NOTIFY'].include?(event_type)
       handlers = {
         'lock_repaint' => "get_lock_repaint"
       }
       if not handlers.include?(event)
-        result = @parent.handle_request(
-          event_type, event, *arglist, **argdict)
+        if Sakura.method_defined?(event)
+          result = method(event).call(*arglist)
+        else
+          result = @parent.handle_request(
+            event_type, event, *arglist)
+        end
       else
-        result = method(handlers[event]).call(*arglist, **argdict)
+        result = method(handlers[event]).call(*arglist)
       end
       if event_type == 'GET'
         return result

--- a/lib/ninix_main.rb
+++ b/lib/ninix_main.rb
@@ -634,15 +634,15 @@ module Ninix_Main
     end
 
     def create_menuitem(data)
-      return self.request_parent('GET', 'create_menuitem', @key, data)
+      return @parent.handle_request('GET', 'create_menuitem', @key, data)
     end
 
     def delete_by_myself
-      self.request_parent('NOTIFY', 'delete_ghost', @key)
+      @parent.handle_request('NOTIFY', 'delete_ghost', @key)
     end
 
     def create_instance(data)
-      return self.request_parent('GET', 'create_ghost', data)
+      return @parent.handle_request('GET', 'create_ghost', data)
     end
   end
 
@@ -805,13 +805,13 @@ module Ninix_Main
       if target_dirs
         if filetype == 'ghost'
           add_sakura(target_dirs[0])
-          Sakura.ReadmeDialog().show(
+          Sakura::ReadmeDialog.new.show(
             target_dirs[0],
             File.join(Home.get_ninix_home(),
                       'ghost', target_dirs[0]))
           if target_dirs[1]
             add_balloon(target_dirs[1])
-            Sakura.ReadmeDialog().show(
+            Sakura::ReadmeDialog.new.show(
               target_dirs[1],
               File.join(Home.get_ninix_home(),
                         'balloon', target_dirs[1]))
@@ -820,7 +820,7 @@ module Ninix_Main
           add_sakura(target_dirs) # XXX: reload
         elsif filetype == 'balloon'
           add_balloon(target_dirs)
-          Sakura.ReadmeDialog().show(
+          Sakura::ReadmeDialog.new.show(
             target_dirs,
             File.join(Home.get_ninix_home(),
                       'balloon', target_dirs))
@@ -1495,14 +1495,14 @@ module Ninix_Main
 
     def add_sakura(ghost_dir)
       if @ghosts.include?(ghost_dir)
-        exists = 1
+        exists = true
         #logging.warning('INSTALLED GHOST CHANGED: {0}'.format(ghost_dir))
       else
-        exists = 0
+        exists = false
         #logging.info('NEW GHOST INSTALLED: {0}'.format(ghost_dir))
       end
       ghost_conf = Home.search_ghosts([ghost_dir])
-      if ghost_conf
+      if not ghost_conf.empty?
         if exists
           sakura = @ghosts[ghost_dir].instance
           if sakura.is_running() # restart if working
@@ -1541,14 +1541,14 @@ module Ninix_Main
 
     def add_balloon(balloon_dir)
       if @balloons.include?(balloon_dir)
-        exists = 1
+        exists = true
         #logging.warning('INSTALLED BALLOON CHANGED: {0}'.format(balloon_dir))
       else
-        exists = 0
+        exists = false
         #logging.info('NEW BALLOON INSTALLED: {0}'.format(balloon_dir))
       end
       balloon_conf = Home.search_balloons([balloon_dir])
-      if balloon_conf
+      if not balloon_conf.empty?
         if exists
           @balloons[balloon_dir].baseinfo = balloon_conf[balloon_dir]
         else
@@ -1656,7 +1656,7 @@ module Ninix_Main
               key = key.strip()
               if key == 'time'
                 begin
-                  ghost_time = int(value.strip())
+                  ghost_time = value.strip().to_i
                 rescue # except:
                   #pass
                 end