コミット: febfa59d725357e8823cd331f683a1ab617aae2e - ninix-aya (git)

ninix-aya(git://git.osdn.net/gitroot/ninix-aya/ruby-gtk3.git)のfork

コミットメタ情報

• リビジョン: febfa59d725357e8823cd331f683a1ab617aae2e (tree)
• 日時: 2016-10-16 23:27:05
• 作者: Shyouzou Sugitani <shy@user...>
• コミッター: Shyouzou Sugitani

ログメッセージ

Prepare for Release of 5.0.2

変更サマリ

• modified: ChangeLog
• modified: lib/ninix/kinoko.rb
• modified: lib/ninix/nekodorif.rb
• modified: lib/ninix/ngm.rb
• modified: lib/ninix/pix.rb
• modified: lib/ninix/version.rb

差分

--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Sun October 16 2016   Shyouzou Sugitani <[e-mail]>
+	* バージョン5.0.2リリース.
+	* Ruby-GNOME2 3.0対応の漏れを修正.
+	* kinoko.rb, ngm.rbのRuby移行時の変更漏れと変更ミスを修正.
+	* PNR, PNA対応方法を変更.(暫定措置)
+	  (pixelsではなくpixel-bytesプロパティを使用するようにした.)
+
 Sat October 15 2016   Shyouzou Sugitani <[e-mail]>
 	* バージョン5.0.1リリース.
 	* Ruby-GNOME2 3.0対応.

--- a/lib/ninix/kinoko.rb
+++ b/lib/ninix/kinoko.rb
@@ -47,7 +47,7 @@ module Kinoko
         'settings' => [['Settings', nil, _('Settings...(_O)'), nil,
                         '', lambda {|a, b| @parent.handle_request('NOTIFY', 'edit_preferences')}],
                        '/ui/popup/Settings'],
-        'skin' => [['Skin', nil, _('Skin(_K)'), nil],
+        'skin' => [['Skin', nil, _('Skin(_K)'), nil, '', lambda {|a, b| }],
                    nil, '/ui/popup/Skin'],
         'exit' => [['Exit', nil, _('Exit(_Q)'), nil,
                     '', lambda {|a, b| @parent.handle_request('NOTIFY', 'close')}],
@@ -133,7 +133,7 @@ module Kinoko
         scale = @target.get_surface_scale()
         @skin.set_scale(scale)
       when 'hide'
-        side = args
+        side = args[0]
         @skin.hide() if side.zero? # sakura side
       when 'iconified'
         @skin.hide()
@@ -145,7 +145,7 @@ module Kinoko
         side, xoffset, yoffset = args
         @skin.set_position(:xoffset => xoffset, :yoffset => yoffset) if side.zero? # sakura side
       when 'raise'
-        side = args
+        side = args[0]
         @skin.set_position() if side.zero? # sakura side
       else
         Logging::Logging.debug('OBSERVER(kinoko): ignore - ' + event)
@@ -399,7 +399,7 @@ module Kinoko
     end
 
     def create_image_surface(surface_id)
-      unless surface_id.nil? and surface_id != ''
+      unless surface_id.nil? or surface_id.empty?
         surface = get_image_surface(surface_id)
       else
         surface = Pix.create_surface_from_file(@path)
@@ -409,7 +409,7 @@ module Kinoko
 
     def update_frame_buffer()
       new_surface = create_image_surface(@seriko.get_base_id)
-      rasie "assert" if new_surface.nil?
+      raise "assert" if new_surface.nil?
       # draw overlays
       for surface_id, x, y, method in @seriko.iter_overlays()
         begin

--- a/lib/ninix/nekodorif.rb
+++ b/lib/ninix/nekodorif.rb
@@ -77,7 +77,8 @@ module Nekodorif
         'settings' => [['Settings', nil, _('Settings...(_O)'), nil,
                         '', lambda {|a, b| @parent.handle_request('NOTIFY', 'edit_preferences')}],
                        '/ui/popup/Settings'],
-        'katochan' => [['Katochan', nil, _('Katochan(_K)'), nil],
+        'katochan' => [['Katochan', nil, _('Katochan(_K)'), nil,
+                       '', lambda {|a, b| }],
                        '/ui/popup/Katochan'],
         'exit' =>     [['Exit', nil,_('Exit(_Q)'), nil,
                         '', lambda {|a, b| @parent.handle_request('NOTIFY', 'close')}],

--- a/lib/ninix/ngm.rb
+++ b/lib/ninix/ngm.rb
@@ -404,47 +404,59 @@ module NGM
           </menubar>
         </ui>"
       @entries = [
-                  [ 'FileMenu', nil, _('_File') ],
-                  [ 'ViewMenu', nil, _('_View') ],
-                  [ 'ArchiveMenu', nil, _('_Archive') ],
-                  [ 'HelpMenu', nil, _('_Help') ],
-                  [ 'Search', nil,                  # name, stock id
-                    _('Search(_F)'), '<control>F',   # label, accelerator
-                    'Search',                        # tooltip
-                    lambda {|a, b| open_search_dialog()} ],
-                  [ 'Search Forward', nil,
-                    _('Search Forward(_S)'), 'F3',
-                    nil,
-                    lambda {|a, b| search_forward()} ],
-                  [ 'Settings', nil,
-                    _('Settings(_O)'), nil,
-                    nil,
-                    lambda {|a, b| @parent.handle_request(
-                                                          'NOTIFY', 'open_preference_dialog')} ],
-                  [ 'DB Network Update', nil,
-                    _('DB Network Update(_N)'), nil,
-                    nil,
-                    lambda {|a, b| network_update()} ],
-                  [ 'Close', nil,
-                    _('Close(_X)'), nil,
-                    nil,
-                    lambda {|a, b| close()} ],
-                  [ 'Mask', nil,
-                    _('Mask(_M)'), nil,
-                    nil,
-                    lambda {|a, b| @parent.handle_request(
-                                                          'NOTIFY', 'open_mask_dialog')} ],
-                  [ 'Reset to Default', nil,
-                    _('Reset to Default(_Y)'), nil,
-                    nil,
-                    lambda {|a, b| @parent.handle_request(
-                                                          'NOTIFY', 'reset_to_default')} ],
-                  [ 'Show All', nil,
-                    _('Show All(_Z)'), nil,
-                    nil,
-                    lambda {|a, b| @parent.handle_request(
-                                                          'NOTIFY', 'show_all')} ],
-                  ]
+        [ 'FileMenu', nil,
+          _('_File'), nil,
+          '',
+          lambda {|a, b| } ],
+        [ 'ViewMenu', nil,
+          _('_View'), nil,
+          '',
+          lambda {|a, b| } ],
+        [ 'ArchiveMenu', nil,
+          _('_Archive'), nil,
+          '',
+          lambda {|a, b| } ],
+        [ 'HelpMenu', nil,
+          _('_Help'), nil,
+          '',
+          lambda {|a, b| } ],
+        [ 'Search', nil,                   # name, stock id
+          _('Search(_F)'), '<control>F',   # label, accelerator
+          'Search',                        # tooltip
+          lambda {|a, b| open_search_dialog()} ],
+        [ 'Search Forward', nil,
+          _('Search Forward(_S)'), 'F3',
+          nil,
+          lambda {|a, b| search_forward()} ],
+        [ 'Settings', nil,
+          _('Settings(_O)'), nil,
+          nil,
+          lambda {|a, b| @parent.handle_request(
+                    'NOTIFY', 'open_preference_dialog')} ],
+        [ 'DB Network Update', nil,
+          _('DB Network Update(_N)'), nil,
+          nil,
+          lambda {|a, b| network_update()} ],
+        [ 'Close', nil,
+          _('Close(_X)'), nil,
+          nil,
+          lambda {|a, b| close()} ],
+        [ 'Mask', nil,
+          _('Mask(_M)'), nil,
+          nil,
+          lambda {|a, b| @parent.handle_request(
+                    'NOTIFY', 'open_mask_dialog')} ],
+        [ 'Reset to Default', nil,
+          _('Reset to Default(_Y)'), nil,
+          nil,
+          lambda {|a, b| @parent.handle_request(
+                    'NOTIFY', 'reset_to_default')} ],
+        [ 'Show All', nil,
+          _('Show All(_Z)'), nil,
+          nil,
+          lambda {|a, b| @parent.handle_request(
+                    'NOTIFY', 'show_all')} ],
+      ]
       @opened = false
       @textview = [nil, nil]
       @darea = [nil, nil]
@@ -632,10 +644,11 @@ module NGM
             surface = Pix.create_surface_from_file(filename)
           rescue
             surface = nil
-          end
+          else
             w = surface.width
             h = surface.height
             darea.set_size_request(w, h)
+          end
         else
           surface = nil
         end

--- a/lib/ninix/pix.rb
+++ b/lib/ninix/pix.rb
@@ -250,8 +250,8 @@ module Pix
   end
 
   def self.surface_new_from_file(path)
-    Cairo::ImageSurface.new(path)
- end
+    Cairo::ImageSurface.from_png(path)
+  end
 
   def self.create_icon_pixbuf(path)
     begin
@@ -318,9 +318,6 @@ module Pix
   end
 
   def self.create_surface_from_file(path, is_pnr: true, use_pna: false)
-    head = File.dirname(path)
-    basename = File.basename(path, '.*')
-    ext = File.extname(path)
     pixbuf = create_pixbuf_from_file(path, :is_pnr => is_pnr, :use_pna => use_pna)
     surface = Cairo::ImageSurface.new(Cairo::FORMAT_ARGB32,
                                       pixbuf.width, pixbuf.height)
@@ -344,30 +341,40 @@ module Pix
         pixbuf_new_from_file(path)
       end
     if is_pnr
-      pixels = pixbuf.pixels
+      pixels = pixbuf.read_pixel_bytes
       unless pixbuf.has_alpha?
-        r, g, b = pixels[0, 3]
+        r, g, b = pixels[0, 3].bytes
         pixbuf = pixbuf.add_alpha(true, r, g, b)
       else
         pix_na = NArray.to_na(pixels, NArray::INT)
         rgba = pix_na[0]
         pix_na[pix_na.eq rgba] = 0
-        pixbuf.pixels = pix_na.to_s
+        pixbuf = GdkPixbuf::Pixbuf.new(
+          :bytes => pix_na.to_s,
+          :has_alpha => true,
+          :width => pixbuf.width,
+          :height => pixbuf.height,
+          :row_stride => pixbuf.rowstride)
       end
     end
     if use_pna
       path = File.join(head, basename + '.pna')
       if File.exists?(path)
         pna_pixbuf = pixbuf_new_from_file(path)
-        pix_na = NArray.to_na(pixbuf.pixels, NArray::BYTE)
+        pix_na = NArray.to_na(pixbuf.read_pixel_bytes, NArray::BYTE)
         pix_na.reshape!(4, pix_na.size / 4)
         unless pna_pixbuf.has_alpha?
           pna_pixbuf = pna_pixbuf.add_alpha(false, 0, 0, 0)
         end
-        pna_na = NArray.to_na(pna_pixbuf.pixels, NArray::BYTE)
+        pna_na = NArray.to_na(pna_pixbuf.read_pixel_bytes, NArray::BYTE)
         pna_na.reshape!(4, pna_na.size / 4)
         pix_na[3, true] = pna_na[0, true]
-        pixbuf.pixels = pix_na.to_s
+        pixbuf = GdkPixbuf::Pixbuf.new(
+          :bytes => pix_na.to_s,
+          :has_alpha => true,
+          :width => pixbuf.width,
+          :height => pixbuf.height,
+          :row_stride => pixbuf.rowstride)
       end
     end
     return pixbuf

--- a/lib/ninix/version.rb
+++ b/lib/ninix/version.rb
@@ -18,7 +18,7 @@ module Version
   bindtextdomain("ninix-aya")
 
   def self.NUMBER
-    '5.0.1'
+    '5.0.2'
   end
 
   def self.CODENAME