rabbit 3.0.5 → 4.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7f3fbfefe40c2abbea3572d6d22aec3ac5d5e3de069f61120cff0d82db031527
-  data.tar.gz: 6435432f528d3af5caeae8a8cd112be3f979c03fa2d431249344c08b7afd9810
+  metadata.gz: 4ac6e6479d10579f2f17e6ff0809ba4ff01197a59c619b4b0171be6bea72c17c
+  data.tar.gz: e881f8f9de691e4abbe120cde321be1825be1007d5e6785ef399f2449448872e
 SHA512:
-  metadata.gz: 59f6d1c1f91e68727a981b1170d6d344c55118b140557282c8166cae84c5118364d73da505e9555dc6a44fed9600451c64dda5b3230811722dd6f8de93ddc464
-  data.tar.gz: f4f59780a8370a527da3aa6615fdb96003b3a1e1b5925f36269a3af6f174cde58058640900ff11153a49411894f796fc6c2b9ef09d827f574ead743ad56998cf
+  metadata.gz: 2cc3b854b072ac58a3bd6a98cb83329aa634aab6a287a6039339e21133949a5a78d42de41a7afdc751cfb213e1fe9105d4651863bcc572907ee44398a278d1eb
+  data.tar.gz: 8b99a01fb205d11ae6cd692e171576857837153d879b0aafc25b76cf0eae1337c06552327292d17c171e0cd6c3e3551281a99e9a881f06bf5b6d421db6a96f17

data/doc/_config.yml

@@ -1,6 +1,6 @@
 markdown: kramdown
-version: 3.0.5
-release_date: 2025-03-30
+version: 4.0.0
+release_date: 2025-08-18
 rabbiter_version: 2.0.3
 rabbiter_release_date: 2016-08-21
 rabbirack_version: 2.0.0

data/doc/en/news.rd

@@ -4,6 +4,60 @@ title: News
 ---
 {% raw %}
 
+== 4.0.0: 2025-08-18
+
+GTK 4 support release!
+
+GTK 4 support is still experimental. It still misses some
+features. You can use it by (({RABBIT_GTK=4})) environment variable.
+
+=== Improvements
+
+==== rabbit
+
+  * GIMP: Add support for GIMP 3.0
+
+  * Rouge: Add support for attaching user properties.
+
+  * Preformatted: Add support for enabling/disabling auto size
+    computation per element.
+
+    Here is a RD example:
+
+    Disable:
+
+        # rouge ruby
+        # keep-in-size = false
+
+        variable = expression
+
+    Enable:
+
+        # rouge ruby
+        # keep-in-size = true
+
+        variable = expression
+
+  * Added support for GTK 4.
+
+    It's still experimental. It still misses some features. You can
+    use it by (({RABBIT_GTK=4})) environment variable.
+
+    You can embed video with GTK 4 support.
+
+  * Dropped support for window icon. It's not portable.
+
+  * Removed GtkGLExt based GL support.
+
+==== rabbit-slide
+
+  * Use 1920x1080 by default.
+
+  * Use presentation date as the (({date})) gem metadata.
+
+  * Set markup language as the (({markup_language})) gem metadata to render
+    slide description in Rabbit Slide Show.
+
 == 3.0.5: 2025-03-30
 
 === Improvements

data/doc/ja/news.rd

@@ -5,6 +5,60 @@ apply_data: false
 ---
 {% raw %}
 
+== 4.0.0: 2025-08-18
+
+GTK 4をサポートしたリリース。
+
+GTK 4サポートはまだ実験的な機能です。いくつかの機能はまだ実装されてい
+ません。(({RABBIT_GTK=4}))環境変数を設定することで有効にできます。
+
+=== 改良
+
+==== rabbit
+
+  * GIMP: GIMP 3.0をサポート。
+
+  * Rouge: ユーザー指定のプロパティをサポート。
+
+  * フォーマット済みテキスト: 要素ごとに自動でサイズを計算するかどうか
+    の有効・無効を切り替えられるようになった。
+
+    RDでの例：
+
+    無効:
+
+        # rouge ruby
+        # keep-in-size = false
+
+        variable = expression
+
+    有効:
+
+        # rouge ruby
+        # keep-in-size = true
+
+        variable = expression
+
+  * GTK 4をサポート。
+
+    まだ実験的な機能です。いくつかの機能はまだ実装されてい
+    ません。(({RABBIT_GTK=4}))環境変数を設定することで有効にできます。
+
+    GTK 4サポートを有効にすると動画を埋め込むことができます。
+
+  * ウィンドウアイコンのサポートを削除。ポータブルではないため。
+
+  * GtkGLExtベースのGLサポートを削除。
+
+==== rabbit-slide
+
+  * デフォルトで1920x1080を使うように変更。
+
+  * プレゼンテーションの日を(({date}))というgemのメタデータに設定。
+
+  * マークアップの言語を(({markup_language}))というgemのメタデータに設
+    定。これはRabbit Slide Showでスライドの説明を整形するため。
+
 == 3.0.5: 2025-03-30
 
 === 改良

data/lib/rabbit/actions.rb

@@ -0,0 +1,446 @@
+# Copyright (C) 2005-2025  Sutou Kouhei <kou@cozmixng.org>
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License along
+# with this program; if not, write to the Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+
+require_relative "icon"
+
+module Rabbit
+  Action = Struct.new(:name,
+                      :parameter_type,
+                      :initial_state,
+                      :update_state,
+                      :update_enabled,
+                      :label,
+                      :icon,
+                      :icon_name,
+                      :activate) do
+    def update
+      gaction.state = ensure_variant(update_state.call) if update_state
+      gaction.enabled = update_enabled.call if update_enabled
+    end
+
+    def gaction
+      @gaction ||= build_gaction
+    end
+
+    def icon
+      self[:icon] || build_icon
+    end
+
+    private
+    def build_gaction
+      state = nil
+      if initial_state.nil?
+        state = update_state.call if update_state
+      else
+        state = initial_state
+      end
+      if state.nil?
+        gaction = Gio::SimpleAction.new(name, parameter_type)
+      else
+        state = ensure_variant(state)
+        gaction = Gio::SimpleAction.new(name, parameter_type, state)
+      end
+      gaction.signal_connect("activate") do |_, parameter|
+        activate.call(self, parameter)
+      end
+      gaction
+    end
+
+    def ensure_variant(value)
+      return nil if value.nil?
+      return value if value.is_a?(GLib::Variant)
+      GLib::Variant.new(value, parameter_type)
+    end
+
+    def build_icon
+      return nil if icon_name.nil?
+      Gio::ThemedIcon.new(icon_name)
+    end
+  end
+
+  class Actions
+    include GetText
+
+    attr_reader :group
+    def initialize(canvas)
+      @canvas = canvas
+      @actions = {}
+      @group = Gio::SimpleActionGroup.new
+
+      build_move_actions
+      build_output_actions
+      build_window_actions
+      build_theme_actions
+      build_view_actions
+      build_graffiti_actions
+      build_content_actions
+      build_hole_actions
+      build_search_actions
+      build_log_level_actions
+      build_quit_actions
+    end
+
+    def update_status
+      @actions.each_value(&:update)
+    end
+
+    def find_action(name)
+      @actions[name]
+    end
+
+    def [](name)
+      @group.lookup_action(name)
+    end
+
+    private
+    def guard
+      begin
+        yield
+      rescue Exception
+        Rabbit.logger.warn($!)
+      end
+    end
+
+    def build_action(name,
+                     parameter_type: nil,
+                     initial_state: nil,
+                     update_state: nil,
+                     update_enabled: nil,
+                     label: nil,
+                     icon: nil,
+                     icon_name: nil)
+      parameter_type = GLib::VariantType.new(parameter_type) if parameter_type
+      activate = lambda do |action, parameter|
+        guard do
+          yield(action, parameter)
+        end
+      end
+      action = Action.new(name,
+                          parameter_type,
+                          initial_state,
+                          update_state,
+                          update_enabled,
+                          label,
+                          icon,
+                          icon_name,
+                          activate)
+      @actions[name] = action
+      @group.add_action(action.gaction)
+    end
+
+    def build_move_actions
+      build_action("Next",
+                   update_enabled: lambda {@canvas.have_next?},
+                   label: _("Next"),
+                   icon_name: "go-next") do
+        @canvas.move_to_next_if_can
+      end
+      build_action("Previous",
+                   update_enabled: lambda {@canvas.have_previous?},
+                   label: _("Previous"),
+                   icon_name: "go-previous") do
+        @canvas.move_to_previous_if_can
+      end
+      build_action("NextSlide",
+                   update_enabled: lambda {@canvas.have_next_slide?},
+                   label: _("Next slide"),
+                   icon_name: "go-next") do
+        @canvas.move_to_next_if_can
+      end
+      build_action("PreviousSlide",
+                   update_enabled: lambda {@canvas.have_previous_slide?},
+                   label: _("Previous slide"),
+                   icon_name: "go-previous") do
+        @canvas.move_to_previous_if_can
+      end
+      build_action("FirstSlide",
+                   update_enabled: lambda {not @canvas.first_slide?},
+                   label: _("First slide"),
+                   icon_name: "go-first") do
+        @canvas.move_to_first
+      end
+      build_action("LastSlide",
+                   update_enabled: lambda {not @canvas.last_slide?},
+                   label: _("Last slide"),
+                   icon_name: "go-last") do
+        @canvas.move_to_last
+      end
+      build_action("JumpToSlide",
+                   parameter_type: "i",
+                   label: _("Jump to slide"),
+                   icon_name: "go-jump") do |action, index|
+        @canvas.move_to_if_can(index)
+      end
+      build_action("JumpToRelativeSlide",
+                   parameter_type: "i",
+                   label: _("Jump to relative slide"),
+                   icon_name: "go-jump") do |action, index|
+        @canvas.move_to_if_can(@canvas.current_index + index)
+      end
+    end
+
+    def build_output_actions
+      build_action("SaveAsImage",
+                   update_enabled: lambda {not @canvas.processing?},
+                   label: _("Save as image"),
+                   icon_name: "document-save") do
+        @canvas.save_as_image
+      end
+      build_action("Print",
+                   update_enabled: lambda {not @canvas.processing?},
+                   label: _("Print"),
+                   icon_name: "document-print") do
+        @canvas.print
+      end
+    end
+
+    def build_window_actions
+      build_action("Iconify",
+                   update_state: lambda {false},
+                   label: _("Iconify"),
+                   icon: Icon.rabbit) do
+        @canvas.iconify
+      end
+      build_action("ToggleFullscreen",
+                   update_enabled: lambda {not @canvas.applying?},
+                   update_state: lambda {@canvas.fullscreen?},
+                   label: _("Fullscreen"),
+                   icon_name: "view-fullscreen") do
+        @canvas.toggle_fullscreen
+      end
+    end
+
+    def build_theme_actions
+      build_action("ChangeTheme",
+                   parameter_type: "s",
+                   update_enabled: lambda {not @canvas.applying?},
+                   label: _("Change theme")) do |name|
+        @canvas.apply_theme(name)
+      end
+      build_action("MergeTheme",
+                   parameter_type: "s",
+                   update_enabled: lambda {not @canvas.applying?},
+                   label: _("Merge theme")) do |name|
+        @canvas.merge_theme(name)
+      end
+      build_action("ReloadTheme",
+                   update_enabled: lambda {not @canvas.applying?},
+                   label: _("Reload theme"),
+                   icon_name: "view-refresh") do
+        @canvas.reload_theme
+      end
+    end
+
+    def build_view_actions
+      build_action("Redraw",
+                   label: _("Redraw"),
+                   icon_name: "view-refresh") do
+        @canvas.redraw
+      end
+      build_action("CacheAllSlides",
+                   update_enabled: lambda {not @canvas.processing?},
+                   label: _("Cache all slides")) do
+        @canvas.cache_all_slides
+      end
+      build_action("ResetAdjustment",
+                   label: _("Reset adjustment"),
+                   icon_name: "edit-clear") do
+        @canvas.rest_adjustment
+      end
+      build_action("ResetTimer",
+                   label: _("Reset timer"),
+                   icon_name: "edit-clear") do
+        @canvas.reset_timer
+      end
+      build_action("ToggleSpotlight",
+                   update_state: lambda {@canvas.spotlighting?},
+                   label: _("Spotlight")) do |action|
+        @canvas.toggle_spotlight
+        action.update
+      end
+      build_action("ToggleMagnifier",
+                   update_state: lambda {@canvas.magnifying?},
+                   label: _("Magnifier")) do |action|
+        @canvas.toggle_magnifier
+        action.update
+      end
+    end
+
+    def graffiti_available?
+      @canvas.graffiti_mode? or @canvas.have_graffiti?
+    end
+
+    def build_graffiti_actions
+      build_action("ToggleGraffitiMode",
+                   initial_state: false,
+                   update_state: lambda {@canvas.graffiti_mode?},
+                   label: _("Graffiti mode")) do |action|
+        @canvas.toggle_graffiti_mode
+        action.update
+      end
+      build_action("ClearGraffiti",
+                   update_enabled: lambda {graffiti_available?},
+                   label: _("Clear graffiti"),
+                   icon_name: "edit-clear") do
+        @canvas.clear_graffiti
+      end
+      build_action("UndoGraffiti",
+                   update_enabled: lambda {graffiti_available?},
+                   label: _("Undo graffiti"),
+                   icon_name: "edit-undo") do
+        @canvas.undo_graffiti
+      end
+      build_action("ChangeGraffitiColor",
+                   update_enabled: lambda {graffiti_available?},
+                   label: _("Change graffiti color")) do
+        @canvas.change_graffiti_color
+      end
+    end
+
+    def build_content_actions
+      build_action("ClearSlide",
+                   label: _("Clear slide"),
+                   icon_name: "edit-clear") do
+        @canvas.clear_slide
+      end
+      build_action("ToggleIndexMode",
+                   update_enabled: lambda {not @canvas.processing?},
+                   update_state: lambda {@canvas.index_mode?},
+                   label: _("Index mode")) do |action|
+        @canvas.toggle_index_mode
+        action.update
+      end
+      build_action("ToggleInfoWindow",
+                   update_state: lambda {@canvas.info_window_showing?},
+                   label: _("Information window")) do |action|
+        @canvas.toggle_info_window
+        action.update
+      end
+      build_action("ToggleTerminal",
+                   update_state: lambda {@canvas.in_terminal?},
+                   label: _("Terminal")) do
+        @canvas.toggle_terminal
+      end
+      build_action("ChangeBlankMode",
+                   parameter_type: "s",
+                   initial_state: "show",
+                   label: _("Change blank mode")) do |action, parameter|
+        case parameter
+        when "show"
+          if @canvas.whiteouting?
+            @canvas.toggle_whiteout
+          elsif @canvas.blackouting?
+            @canvas.toggle_blackout
+          end
+        when "whiteout"
+          @canvas.toggle_whiteout
+        when "blackout"
+          @canvas.toggle_blackout
+        end
+        action.gaction.change_state(GLib::Variant.new(parameter))
+      end
+      build_action("ToggleWhiteout",
+                   update_state: lambda {@canvas.whiteouting?},
+                   label: _("Whiteout")) do
+        if @canvas.whiteouting?
+          self["ChangeBlankMode"].activate("show")
+        else
+          self["ChangeBlankMode"].activate("whiteout")
+        end
+      end
+      build_action("ToggleBlackout",
+                   update_state: lambda {@canvas.blackouting?},
+                   label: _("Blackout")) do
+        if @canvas.blackouting?
+          self["ChangeBlankMode"].activate("show")
+        else
+          self["ChangeBlankMode"].activate("blackout")
+        end
+      end
+    end
+
+    def build_hole_actions
+      build_action("ExpandHole",
+                   label: _("Expand hole")) do
+        @canvas.expand_hole
+      end
+      build_action("NarrowHole",
+                   label: _("Narrow hole")) do
+        @canvas.narrow_hole
+      end
+    end
+
+    def build_search_actions
+      build_action("SearchSlideForward",
+                   update_enabled: lambda {not @canvas.searching?},
+                   label: _("Search slide forward"),
+                   icon_name: "system-search") do
+        @canvas.search_slide(true)
+        update_status
+      end
+      build_action("SearchSlideBackward",
+                   update_enabled: lambda {not @canvas.searching?},
+                   label: _("Search slide backward"),
+                   icon_name: "system-search") do
+        @canvas.search_slide(false)
+        update_status
+      end
+      build_action("SearchSlideForwardNext",
+                   update_enabled: lambda {@canvas.searching?},
+                   label: _("Search slide forward next"),
+                   icon_name: "system-search") do
+        @canvas.search_slide(true)
+        update_status
+      end
+      build_action("SearchSlideBackwardNext",
+                   update_enabled: lambda {@canvas.searching?},
+                   label: _("Search slide backward next"),
+                   icon_name: "system-search") do
+        @canvas.search_slide(false)
+        update_status
+      end
+      build_action("StopSlideSearch",
+                   update_enabled: lambda {@canvas.searching?},
+                   label: _("Stop search slide"),
+                   icon_name: "system-search") do
+        @canvas.stop_search_slide
+        update_status
+      end
+    end
+
+    def build_log_level_actions
+      initial_state = Logger::Severity.name(Rabbit.logger.level)
+      build_action("ChangeLogLevel",
+                   parameter_type: "s",
+                   initial_state: initial_state,
+                   label: _("Change log level")) do |action, parameter|
+        Rabbit.logger.level = Logger::Severity.level(parameter)
+        action.gaction.change_state(GLib::Variant.new(parameter))
+      end
+    end
+
+    def build_quit_actions
+      build_action("Quit",
+                   label: _("Quit"),
+                   icon_name: "application-exit") do
+        if !@canvas.processing? or
+           @canvas.confirm(_("Now processing... Do you really quit?"))
+          @canvas.quit
+        end
+      end
+    end
+  end
+end

data/lib/rabbit/author-configuration.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2012-2021  Sutou Kouhei <kou@cozmixng.org>
+# Copyright (C) 2012-2025  Sutou Kouhei <kou@cozmixng.org>
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -14,21 +14,18 @@
 # with this program; if not, write to the Free Software Foundation, Inc.,
 # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
-require "rabbit/gettext"
-require "rabbit/logger"
-require "rabbit/path-manipulatable"
-require "rabbit/yaml-loader"
+require_relative "path-manipulatable"
+require_relative "rabbit"
+require_relative "yaml-loader"
 
 module Rabbit
   class AuthorConfiguration
     include GetText
     include PathManipulatable
 
-    attr_accessor :logger
     attr_accessor :name, :email, :markup_language
     attr_accessor :rubygems_user, :slideshare_user, :speaker_deck_user
-    def initialize(logger=nil)
-      @logger = logger || Logger.default
+    def initialize
       clear
     end
 
@@ -39,7 +36,7 @@ module Rabbit
       merge!(conf)
     rescue
       format = _("Failed to read author configuration: %s: %s")
-      @logger.error(format % [path, $!.message])
+      Rabbit.logger.error(format % [path, $!.message])
     end
 
     def save
@@ -49,7 +46,7 @@ module Rabbit
       end
     rescue
       format = _("Failed to write author configuration: %s: %s")
-      @logger.error(format % [path, $!.message])
+      Rabbit.logger.error(format % [path, $!.message])
     end
 
     def clear