コミット: 04d6ac5467d1cce249a0a13b3a0f6c42ca3775d1 - ruby-gtk3 (git)

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

コミットメタ情報

• リビジョン: 04d6ac5467d1cce249a0a13b3a0f6c42ca3775d1 (tree)
• 日時: 2015-04-08 22:59:58
• 作者: Shyouzou Sugitani <shy@user...>
• コミッター: Shyouzou Sugitani

ログメッセージ

assorted fixes(6)

変更サマリ

• modified: lib/ninix/menu.rb
• modified: lib/ninix/metamagic.rb
• modified: lib/ninix/prefs.rb
• modified: lib/ninix/sakura.rb
• modified: lib/ninix_main.rb
• modified: test/test-sakura.rb

差分

--- a/lib/ninix/menu.rb
+++ b/lib/ninix/menu.rb
@@ -640,9 +640,9 @@ module Menu
         if pixbuf == nil
           item = Gtk::MenuItem.new(name)
         else
-          image = Gtk::Image.new()
-          image.set_from_pixbuf(pixbuf)
-          image.show()
+          image = Gtk::Image.new
+          image.pixbuf = pixbuf
+          image.show
           item = Gtk::ImageMenuItem.new(name)
           item.set_image(image)
           item.set_always_show_image(true) # XXX

--- a/lib/ninix/metamagic.rb
+++ b/lib/ninix/metamagic.rb
@@ -99,7 +99,7 @@ module MetaMagic
         delete_by_myself()
         return
       else
-        @instance.new(data) # reset
+        @instance.new_(*data) # reset
         menuitem = create_menuitem(data)
         if menuitem == nil
           delete_by_myself()

--- a/lib/ninix/prefs.rb
+++ b/lib/ninix/prefs.rb
@@ -478,11 +478,11 @@ module Prefs
       while listiter != nil
         value = model.get_value(listiter, 1)
         if value == directory or directory == nil
-          @balloon_treeview.get_selection().select_iter(listiter)
+          @balloon_treeview.selection.select_iter(listiter)
           selected = true
           break
         end
-        listiter = model.iter_next(listiter) 
+        listiter.next!
       end
       if not selected
         listiter = model.iter_first

--- a/lib/ninix/sakura.rb
+++ b/lib/ninix/sakura.rb
@@ -220,8 +220,8 @@ module Sakura
       return @shell_menu
     end
 
-    def new(desc, shiori_dir, use_makoto, surface_set, prefix,
-            shiori_dll, shiori_name) ## FIXME
+    def new_(desc, shiori_dir, use_makoto, surface_set, prefix,
+             shiori_dll, shiori_name) ## FIXME
       @shiori = nil
       @desc = desc
       @shiori_dir = shiori_dir
@@ -506,7 +506,7 @@ module Sakura
                         db, request_handler]
     end
 
-    reset_event = ['OnGhostChanging', 'OnShellChanging', 'OnVanishSelected']
+    RESET_EVENT = ['OnGhostChanging', 'OnShellChanging', 'OnVanishSelected']
 
     def check_event_queue()
       return (not @event_queue.empty?)
@@ -516,7 +516,7 @@ module Sakura
       #for key in argdict
       #  assert ['proc'].include?(key) # trap typo, etc.
       #end
-      if @reset_event.include?(event)
+      if RESET_EVENT.include?(event)
         reset_script(true)
       end
       @event_queue << [event, arglist, argdict]
@@ -1179,13 +1179,13 @@ module Sakura
                    'Jul', 'Aug', 'Sep', 'Oct', 'Nov', 'Dec']
     boot_event = ['OnBoot', 'OnFirstBoot', 'OnGhostChanged', 'OnShellChanged',
                   'OnUpdateComplete']
-    reset_event = ['OnVanishSelecting', 'OnVanishCancel'] ## FIXME
+    RESET_EVENT = ['OnVanishSelecting', 'OnVanishCancel'] ## FIXME
 
     def notify_event(event, *arglist, **argdict)
       if @time_critical_session and event.startswith('OnMouse')
         return 0
       end
-      if @reset_event.include?(event)
+      if RESET_EVENT.include?(event)
         reset_script(true)
       end
       #for key in argdict

--- a/lib/ninix_main.rb
+++ b/lib/ninix_main.rb
@@ -885,7 +885,7 @@ module Ninix_Main
     def create_ghost(data)
       ghost = Sakura::Sakura.new
       ghost.set_responsible(self)
-      ghost.new(*data)
+      ghost.new_(*data)
       return ghost
     end
 
@@ -1060,7 +1060,8 @@ module Ninix_Main
 
     def create_shell_menuitem(shell_name, shell_key, thumbnail)
       return @__menu.create_meme_menuitem(
-        shell_name, shell_key, self.select_shell, thumbnail)
+        shell_name, shell_key,
+        lambda {|key| select_shell(key) }, thumbnail)
     end
 
     def create_menuitem(key, baseinfo)
@@ -1081,10 +1082,10 @@ module Ninix_Main
         thumbnail_path = nil
       end
       start_menuitem = @__menu.create_ghost_menuitem(
-        name, icon_path, key, self.start_sakura_cb, # XXX
+        name, icon_path, key, lambda {|key| start_sakura_cb(key) }, # XXX
         thumbnail_path)
       select_menuitem = @__menu.create_ghost_menuitem(
-        name, icon_path, key, self.select_sakura,
+        name, icon_path, key, lambda {|key| select_sakura(key) },
         thumbnail_path)
       menuitem = {
         'Summon' => start_menuitem,
@@ -1388,7 +1389,10 @@ module Ninix_Main
       if sakura.key == key # XXX: needs reloading?
         return
       end
-      proc = lambda { stop_sakura(sakura, self.start_sakura, key, sakura.key) }
+      proc = lambda { stop_sakura(
+                        sakura,
+                        lambda {|key, prev| start_sakura(key, prev) },
+                        key, sakura.key) }
 #      def proc(self=self, key=key)
 #        stop_sakura(sakura, self.start_sakura, key, sakura.key)
 #      end
@@ -1523,7 +1527,7 @@ module Ninix_Main
           end
         else
           holon = Ghost.new(ghost_dir)
-          holon.set_responsible(self.handle_request)
+          holon.set_responsible(self)
           @ghosts[ghost_dir] = holon
           holon.baseinfo = ghost_conf[ghost_dir]
         end
@@ -1553,7 +1557,7 @@ module Ninix_Main
           @balloons[balloon_dir].baseinfo = balloon_conf[balloon_dir]
         else
           meme = BalloonMeme(balloon_dir)
-          meme.set_responsible(self.handle_request)
+          meme.set_responsible(self)
           @balloons[balloon_dir] = meme
           meme.baseinfo = balloon_conf[balloon_dir]
         end

--- a/test/test-sakura.rb
+++ b/test/test-sakura.rb
@@ -11,7 +11,7 @@ module NinixTest
       @ghosts = Home.search_ghosts(target=nil, check_shiori=false)
       key = @ghosts.keys.sample
       @baseinfo = @ghosts[key]
-      @sakura.new(*@baseinfo)
+      @sakura.new_(*@baseinfo)
     end
 
     def update
@@ -31,7 +31,7 @@ module NinixTest
       @index = 0
       #INIT#OK#@sakura.initialize
       #INIT#OK#@sakura.set_responsible(parent)
-      #INIT#OK#@sakura.new(desc, shiori_dir, use_makoto, surface_set, prefix,
+      #INIT#OK#@sakura.new_(desc, shiori_dir, use_makoto, surface_set, prefix,
       ##@sakura.handle_request(event_type, event, *arglist, **argdict)
       #OK#@sakura.attach_observer(self)
       #OK#@sakura.notify_observer("OBSERVER TEST", args=nil)