vanken 0.1.0 → 0.2.0

data/lib/vanken/ui/coloring_operations.rb

@@ -0,0 +1,104 @@
+# frozen_string_literal: true
+
+require_relative "../core/coloring"
+
+module Vanken
+  module UI
+    module ColoringOperations
+      def coloring_rules = @coloring_rules ||= load_coloring_rules
+      def reload_coloring_rules
+        @coloring_rules = load_coloring_rules
+        @packet_source.reset
+        @window.request_frame
+      end
+      def replace_coloring_rules(payload)
+        rules = Core::Coloring::RuleSet.new(payload, catalog: document&.catalog)
+        rules.save(File.join(@preferences.directory, "coloring_rules.yml"))
+        @coloring_rules = rules
+        @packet_source.reset
+        @window.request_frame
+        rules
+      end
+      def coloring_enabled? = @preferences.get("packet_list.coloring")
+      def toggle_coloring
+        @preferences.set("packet_list.coloring", !coloring_enabled?)
+        @packet_source.reset
+        @window.request_frame
+      end
+
+      def coloring_dialog
+        @coloring_draft ||= coloring_rules.to_h
+        rules = @coloring_draft.fetch("rules")
+        @coloring_index = (@coloring_index || 0).clamp(0, [rules.size - 1, 0].max)
+        content = Zaniah::Div.new.flex_col.gap(12)
+        unless rules.empty?
+          content.child(Zaniah::UI::Select.new(rules.each_with_index.map { |rule, index| ["#{index + 1}. #{rule.fetch('name')}", index] }, label: t("ルール"), value: @coloring_index)
+            .on_change { |value, *_| @coloring_index = value; coloring_dialog }.test_id("vk.coloring.rule"))
+          rule = rules[@coloring_index]
+          content.child(Zaniah::UI::TextField.new(rule.fetch("name"), label: t("名前")).on_change { |value, *_| rule["name"] = value }.test_id("vk.coloring.name"))
+          content.child(Zaniah::UI::TextField.new(rule.fetch("filter"), label: t("表示フィルタ")).on_change { |value, *_| rule["filter"] = value }.test_id("vk.coloring.filter"))
+          content.child(Zaniah::UI::Checkbox.new(t("有効"), value: rule.fetch("enabled")).on_change { |value, *_| rule["enabled"] = value })
+          %w[light dark].each do |theme|
+            content.child(Zaniah::Div.new.flex_row.gap(12).children(%w[fg bg].map do |key|
+              label = t("%{theme} %{part}", theme: t(theme == "light" ? "ライト" : "ダーク"), part: t(key == "fg" ? "文字" : "背景"))
+              Zaniah::UI::ColorPicker.new(rule.fetch(theme).fetch(key), label: label).on_change { |value, *_| rule.fetch(theme)[key] = value }.flex_1
+            end))
+          end
+          content.child(Zaniah::Div.new.flex_row.gap(8)
+            .child(Zaniah::UI::Button.new(t("上へ移動"), variant: :secondary).disabled(@coloring_index.zero?).on_click { move_coloring_rule(-1) })
+            .child(Zaniah::UI::Button.new(t("下へ移動"), variant: :secondary).disabled(@coloring_index == rules.size - 1).on_click { move_coloring_rule(1) })
+            .child(Zaniah::UI::Button.new(t("削除"), variant: :secondary).on_click { rules.delete_at(@coloring_index); coloring_dialog }))
+        end
+        content.child(Zaniah::Div.new.flex_row.gap(8)
+          .child(Zaniah::UI::Button.new(t("追加"), variant: :secondary).on_click do
+            rules << {"name" => t("新しいルール"), "filter" => "tcp", "enabled" => true, "light" => {"fg" => "#12272E", "bg" => "#E7E6FF"}, "dark" => {"fg" => "#E7E6FF", "bg" => "#24233A"}}
+            @coloring_index = rules.size - 1
+            coloring_dialog
+          end)
+          .child(Zaniah::UI::Button.new(t("インポート"), variant: :secondary).on_click { import_coloring_rules })
+          .child(Zaniah::UI::Button.new(t("エクスポート"), variant: :secondary).on_click { export_coloring_rules }))
+        content.child(Zaniah::Div.new.flex_row.gap(8)
+          .child(Zaniah::UI::Button.new(t("適用")).test_id("vk.coloring.apply").on_click do
+            replace_coloring_rules(@coloring_draft)
+            @coloring_draft = nil
+            dismiss_dialog
+          rescue StandardError => error
+            show_error(error)
+          end)
+          .child(Zaniah::UI::Button.new(t("キャンセル"), variant: :secondary).on_click { @coloring_draft = nil; dismiss_dialog }))
+        viewport = Zaniah::ScrollView.new.h([(@window.content_size.height * 0.9) - 100, 120].max).child(content)
+        show_dialog(:coloring, t("色付けルール"), viewport, reopen: -> { coloring_dialog })
+      end
+
+      def import_coloring_rules
+        path_dialog(t("色付けルールの読み込み先")) do |path|
+          @coloring_draft = Core::Coloring::RuleSet.load(path, catalog: document&.catalog).to_h
+          @coloring_index = 0
+          coloring_dialog
+        end
+      end
+      def export_coloring_rules
+        path_dialog(t("色付けルールの保存先")) do |path|
+          Core::Coloring::RuleSet.new(@coloring_draft || coloring_rules.to_h, catalog: document&.catalog).save(path)
+          coloring_dialog
+        end
+      end
+
+      private
+      def load_coloring_rules
+        path = File.join(@preferences.directory, "coloring_rules.yml")
+        File.file?(path) ? Core::Coloring::RuleSet.load(path, catalog: document&.catalog) : Core::Coloring::RuleSet.defaults(catalog: document&.catalog)
+      rescue Vanken::ConfigError => error
+        show_error(error)
+        Core::Coloring::RuleSet.defaults(catalog: document&.catalog)
+      end
+      def move_coloring_rule(delta)
+        rules = @coloring_draft.fetch("rules")
+        target = @coloring_index + delta
+        rules[@coloring_index], rules[target] = rules[target], rules[@coloring_index]
+        @coloring_index = target
+        coloring_dialog
+      end
+    end
+  end
+end

data/lib/vanken/ui/column_operations.rb

@@ -0,0 +1,115 @@
+# frozen_string_literal: true
+
+require_relative "../config/columns"
+
+module Vanken
+  module UI
+    module ColumnOperations
+      def column_settings
+        if !@column_settings || @columns_directory != @preferences.directory
+          @columns_directory = @preferences.directory
+          @column_settings = Config::Columns.load(directory: @columns_directory, legacy: @preferences.get("layout.columns"))
+        end
+        @column_settings
+      rescue ConfigError => error
+        show_error(error)
+        @column_settings = Config::Columns.new
+      end
+
+      def reload_columns
+        @column_settings = nil
+        column_settings
+        configure_document_columns
+      end
+
+      def configure_document_columns
+        document.custom_columns = column_settings.custom if document
+        @packet_source.reset
+      end
+
+      def persist_columns_layout(items)
+        column_settings.update_layout(items)
+        column_settings.save(@preferences.directory)
+        configure_document_columns
+      rescue StandardError => error
+        show_error(error)
+      end
+
+      def add_field_column(field, label: field, width: 120)
+        if document && !Core::DisplayFilter::FieldResolver.new(document.catalog).resolve(field).known
+          raise Vanken::ConfigError, "unknown field: #{field}"
+        end
+        key = column_settings.add(field, label: label, width: width)
+        apply_columns
+        key
+      end
+
+      def remove_column(key)
+        column_settings.remove(key)
+        apply_columns
+      end
+
+      def field_menu(node)
+        menu = selection_menu(node.filter)
+        return menu unless node.field
+        @app.actions.register(:context_apply_column, title: column_text("列として適用")) { add_field_column(node.field) }
+        added = Zaniah::Menu.build { item(:context_apply_column) }
+        Zaniah::Menu.new(menu.items + added.items)
+      end
+
+      def columns_dialog
+        rows = Zaniah::Div.new.flex_col.gap(6)
+        @table.columns.each_with_index do |column, index|
+          key = column[:key]
+          width = Zaniah::UI::NumberInput.new(column[:width], min: 40, max: 4096, step: 8, label: column_text("幅"))
+            .w(100).test_id("vk.columns.width.#{key}")
+          width.on_change do |*_|
+            amount = width.number
+            if amount && amount.finite? && amount.between?(40, 4096)
+              width.status(:none)
+              @table.resize_column(key, amount)
+            else
+              width.status(:error, message: column_text("幅は40から4096の範囲で指定してください"))
+            end
+          end
+          row = Zaniah::Div.new.flex_row.items_center.gap(6)
+            .child(Zaniah::UI::Checkbox.new(column[:label], value: column[:visible]).flex_1
+              .on_change { |value, *_| @table.column_visible(key, value) })
+            .child(width)
+            .child(Zaniah::UI::Button.new(column_text("上へ移動"), size: :sm).disabled(index.zero?).on_click { @table.move_column(key, index - 1); columns_dialog })
+            .child(Zaniah::UI::Button.new(column_text("下へ移動"), size: :sm).disabled(index == @table.columns.size - 1).on_click { @table.move_column(key, index + 1); columns_dialog })
+          row.child(Zaniah::UI::Button.new(column_text("削除"), size: :sm).on_click { remove_column(key); columns_dialog }) if key.to_s.start_with?("field:")
+          rows.child(row)
+        end
+        field = Zaniah::UI::TextField.new("", label: column_text("フィールド名")).test_id("vk.columns.field")
+        label = Zaniah::UI::TextField.new("", label: column_text("列名 (空欄: フィールド名)")).test_id("vk.columns.label")
+        content = Zaniah::Div.new.flex_col.gap(8)
+          .child(Zaniah::ScrollView.new.h(280).child(rows)).child(field).child(label)
+          .child(Zaniah::UI::Button.new(column_text("追加")).test_id("vk.columns.add").on_click do
+            name = field.value.strip
+            add_field_column(name, label: label.value.empty? ? name : label.value)
+            columns_dialog
+          rescue StandardError => error
+            show_error(error)
+          end)
+        show_dialog(:columns, column_text("表示する列"), content, reopen: -> { columns_dialog })
+      end
+
+      private
+
+      def column_text(text) = respond_to?(:t) ? t(text) : text
+
+      def apply_columns
+        column_settings.save(@preferences.directory)
+        configure_document_columns
+        selected = selected_number
+        rebuild_view
+        index = document&.displayed_index(selected)
+        if index
+          @table.select(index)
+          @table.scroll_to(index, align: :nearest)
+        end
+      end
+    end
+  end
+end

data/lib/vanken/ui/dialogs.rb

@@ -5,18 +5,23 @@ module Vanken
     module Dialogs
       def dialog = @dialog
       def dismiss_dialog
+        close_analysis if respond_to?(:close_analysis)
         @dialog&.close
-        @dialog = @dialog_kind = @pending_destructive = nil
+        @dialog = @dialog_kind = @pending_destructive = @dialog_reopen = nil
         @window.request_frame
       end
-      def show_dialog(kind, title, content)
+      def reopen_dialog
+        @dialog_reopen&.call
+      end
+      def show_dialog(kind, title, content, reopen: nil)
         dismiss_dialog
         @dialog_kind = kind
-        @dialog = Zaniah::UI::Dialog.new(content, title: title).on_close { dismiss_dialog }.test_id("vk.#{kind}")
+        @dialog_reopen = reopen
+        @dialog = Zaniah::UI::Dialog.new(content, title: title, close_label: t("閉じる")).on_close { dismiss_dialog }.test_id("vk.#{kind}")
         @window.request_frame
       end
-      def path_dialog(title, &operation)
-        field = Zaniah::UI::TextField.new("", label: title).test_id("vk.path.input")
+      def path_dialog(title, value: "", &operation)
+        field = Zaniah::UI::TextField.new(value, label: t(title)).test_id("vk.path.input")
         content = Zaniah::Div.new.flex_col.gap(12).child(field)
           .child(Zaniah::Div.new.flex_row.gap(8)
             .child(Zaniah::UI::Button.new("OK").on_click do
@@ -25,32 +30,42 @@ module Vanken
             rescue StandardError => error
               show_error(error)
             end)
-            .child(Zaniah::UI::Button.new("キャンセル", variant: :secondary).on_click { dismiss_dialog }))
-        show_dialog(:path, title, content)
+            .child(Zaniah::UI::Button.new(t("キャンセル"), variant: :secondary).on_click { dismiss_dialog }))
+        show_dialog(:path, t(title), content, reopen: -> { path_dialog(title, value: field.value, &operation) })
       end
-      def capture_options(interface: nil)
+      def capture_options(interface: nil, values: {})
         fields = {}
         infos = @interface_infos || []
         choices = infos.map { |item| ["#{item.fetch(:name)}  #{item[:description]}", item.fetch(:name)] }
         selected = choices.any? { |choice| choice.last == interface } ? interface : choices.first&.last
-        selector = Zaniah::UI::Select.new(choices, label: "インタフェース", value: selected)
+        selector = Zaniah::UI::Select.new(choices, label: t("インタフェース"), value: selected)
         selector.on_change { |value, *_| selected = value }
         content = Zaniah::Div.new.flex_col.gap(10).child(selector)
-        [["filter", "キャプチャフィルタ (BPF)", ""], ["snaplen", "Snaplen", @preferences.get("capture.snaplen").to_s],
-          ["buffer_size", "バッファサイズ (bytes)", @preferences.get("capture.buffer_size").to_s]].each do |key, label, value|
-          fields[key] = Zaniah::UI::TextField.new(value, label: label)
+        [["filter", t("キャプチャフィルタ (BPF)"), ""], ["snaplen", "Snaplen", @preferences.get("capture.snaplen").to_s],
+          ["buffer_size", t("バッファサイズ (bytes)"), @preferences.get("capture.buffer_size").to_s]].each do |key, label, value|
+          fields[key] = Zaniah::UI::TextField.new(values.fetch(key, value), label: label)
           content.child(fields[key])
         end
-        promiscuous = Zaniah::UI::Checkbox.new("プロミスキャスモード", value: @preferences.get("capture.promiscuous"))
+        advanced = Zaniah::Div.new.flex_col.gap(6)
+        {"stop_count" => t("停止件数 (0: 無制限)"), "stop_duration" => t("停止までの秒数 (0: 無制限)"), "stop_bytes" => t("停止サイズ (bytes、0: 無制限)"),
+          "ring_path" => t("リング保存先 (空欄: 保存しない)"), "ring_max_bytes" => t("リングファイル上限 (bytes)"), "ring_interval" => t("リング切替間隔 (秒)"), "ring_file_count" => t("リングファイル数")}.each do |key, label|
+          fields[key] = Zaniah::UI::TextField.new(values.fetch(key, @preferences.get("capture.#{key}").to_s), label: label).test_id("vk.capture.#{key}")
+          advanced.child(fields[key])
+        end
+        content.child(Zaniah::ScrollView.new.h(160).child(advanced))
+        promiscuous = Zaniah::UI::Checkbox.new(t("プロミスキャスモード"), value: values.fetch("promiscuous", @preferences.get("capture.promiscuous")))
         content.child(promiscuous)
-        direction = @preferences.get("capture.direction")
-        content.child(Zaniah::UI::Select.new([["送受信", "inout"], ["受信", "in"], ["送信", "out"]], label: "方向", value: direction).on_change { |value, *_| direction = value })
-        status = Zaniah::UI::Label.new(infos.empty? ? (@interface_error || "インタフェースを取得中です。") : "GUI は通常ユーザーで動作し、取得ヘルパーに必要な権限を渡します。", wrap: :word, tone: :muted)
+        direction = values.fetch("direction", @preferences.get("capture.direction"))
+        content.child(Zaniah::UI::Select.new([[t("送受信"), "inout"], [t("受信"), "in"], [t("送信"), "out"]], label: t("方向"), value: direction).on_change { |value, *_| direction = value })
+        status = Zaniah::UI::Label.new(infos.empty? ? (@interface_error || t("インタフェースを取得中です。")) : t("GUI は通常ユーザーで動作し、取得ヘルパーに必要な権限を渡します。"), wrap: :word, tone: :muted)
         content.child(status)
-        content.child(Zaniah::UI::Button.new("開始").test_id("vk.capture.start").disabled(infos.empty?).on_click do
+        content.child(Zaniah::UI::Button.new(t("開始")).test_id("vk.capture.start").disabled(infos.empty?).on_click do
           options = {"interface" => selected, "snaplen" => Integer(fields.fetch("snaplen").value, 10),
             "buffer_size" => Integer(fields.fetch("buffer_size").value, 10), "filter" => fields.fetch("filter").value,
             "promiscuous" => promiscuous.value, "direction" => direction, "backend" => @preferences.get("capture.backend")}
+          %w[stop_count stop_bytes ring_max_bytes ring_file_count].each { |key| options[key] = Integer(fields.fetch(key).value, 10) }
+          %w[stop_duration ring_interval].each { |key| options[key] = Float(fields.fetch(key).value) }
+          options["ring_path"] = fields.fetch("ring_path").value
           # Compilation and privileged helper startup both happen away from the UI thread.
           @app.executor.background do
             metadata = infos.find { |item| item[:name] == selected }
@@ -62,27 +77,27 @@ module Vanken
         rescue ArgumentError => error
           show_error(error)
         end)
-        show_dialog(:capture_options, "キャプチャオプション", content)
+        show_dialog(:capture_options, t("キャプチャオプション"), content, reopen: -> { capture_options(interface: selected, values: fields.transform_values(&:value).merge("promiscuous" => promiscuous.value, "direction" => direction)) })
       end
       def preferences_dialog
-        theme = Zaniah::UI::Select.new(%w[system dark light high_contrast], label: "テーマ", value: @preferences.get("appearance.theme"))
+        theme = Zaniah::UI::Select.new({"システム設定" => "system", "ダーク" => "dark", "ライト" => "light", "ハイコントラスト" => "high_contrast"}.map { |label, value| [t(label), value] }, label: t("テーマ"), value: @preferences.get("appearance.theme"))
           .on_change { |value, *_| change_theme(value) }
-        time = Zaniah::UI::Select.new(%w[relative absolute delta delta_displayed epoch], label: "時刻表示", value: @preferences.get("packet_list.time_format"))
+        time = Zaniah::UI::Select.new({"相対時刻" => "relative", "絶対時刻" => "absolute", "前パケットとの差" => "delta", "前表示パケットとの差" => "delta_displayed", "エポック時刻" => "epoch"}.map { |label, value| [t(label), value] }, label: t("時刻表示"), value: @preferences.get("packet_list.time_format"))
           .on_change { |value, *_| time_format(value) }
         content = Zaniah::Div.new.flex_col.gap(12).child(theme).child(time)
-          .child(Zaniah::Div.new.flex_row.gap(8).child(Zaniah::UI::Button.new("文字を小さく").on_click { zoom(-1) })
-            .child(Zaniah::UI::Button.new("文字を大きく").on_click { zoom(1) }))
-        show_dialog(:preferences, "設定", content)
+          .child(Zaniah::Div.new.flex_row.gap(8).child(Zaniah::UI::Button.new(t("文字を小さく")).on_click { zoom(-1) })
+            .child(Zaniah::UI::Button.new(t("文字を大きく")).on_click { zoom(1) }))
+        show_dialog(:preferences, t("設定"), content, reopen: -> { preferences_dialog })
       end
       def columns_dialog
         content = Zaniah::Div.new.flex_col.gap(8)
         @table.columns.each_with_index do |column, index|
           content.child(Zaniah::Div.new.flex_row.gap(8)
             .child(Zaniah::UI::Checkbox.new(column[:label], value: column[:visible]).on_change { |value, *_| @table.column_visible(column[:key], value) }.flex_1)
-            .child(Zaniah::UI::Button.new("↑", size: :sm).disabled(index.zero?).on_click { @table.move_column(column[:key], index - 1); columns_dialog })
-            .child(Zaniah::UI::Button.new("↓", size: :sm).disabled(index == @table.columns.size - 1).on_click { @table.move_column(column[:key], index + 1); columns_dialog }))
+            .child(Zaniah::UI::Button.new(t("上へ移動"), size: :sm).disabled(index.zero?).on_click { @table.move_column(column[:key], index - 1); columns_dialog })
+            .child(Zaniah::UI::Button.new(t("下へ移動"), size: :sm).disabled(index == @table.columns.size - 1).on_click { @table.move_column(column[:key], index + 1); columns_dialog }))
         end
-        show_dialog(:columns, "表示する列", content)
+        show_dialog(:columns, t("表示する列"), content, reopen: -> { columns_dialog })
       end
     end
   end

data/lib/vanken/ui/file_operations.rb

@@ -5,11 +5,13 @@ module Vanken
     module FileOperations
       CAPTURE_FILTERS = [{label: "Capture files", patterns: %w[*.pcapng *.pcap]}].freeze
 
+      def capture_filters = CAPTURE_FILTERS.map { |filter| filter.merge(label: t("キャプチャファイル")) }
+
       def open_dialog
         if @backend == :tui
-          path_dialog("ファイルを開く") { |path| open_file(path) }
+          path_dialog(t("ファイルを開く")) { |path| open_file(path) }
         else
-          paths = @window.prompt_for_paths(filters: CAPTURE_FILTERS)
+          paths = @window.prompt_for_paths(filters: capture_filters)
           open_file(paths.first) if paths && !paths.empty?
         end
       rescue StandardError => error
@@ -46,8 +48,8 @@ module Vanken
       def save_dialog(after: nil)
         return unless document
         path = @backend == :tui ? nil : @window.prompt_for_paths(save: true,
-          default_name: "capture.pcapng", filters: CAPTURE_FILTERS)&.first
-        return path_dialog("名前を付けて保存") { |value| save_file(value, after: after) } if @backend == :tui
+          default_name: "capture.pcapng", filters: capture_filters)&.first
+        return path_dialog(t("名前を付けて保存")) { |value| save_file(value, after: after) } if @backend == :tui
         save_file(path, after: after) if path
       rescue StandardError => error
         show_error(error)
@@ -77,28 +79,31 @@ module Vanken
       def reload_file = document&.source == :file && document.path && open_file(document.path)
 
       def request_destructive(&operation)
+        dismiss_dialog
         if @capture.running?
+          @dialog_reopen = -> { request_destructive(&operation) }
           @dialog_kind = :capturing
-          content = Zaniah::Div.new.gap(12).child(Zaniah::UI::Label.new("キャプチャを停止してから操作してください。"))
-            .child(Zaniah::UI::Button.new("停止").on_click do
+          content = Zaniah::Div.new.gap(12).child(Zaniah::UI::Label.new(t("キャプチャを停止してから操作してください。")))
+            .child(Zaniah::UI::Button.new(t("停止")).on_click do
               @capture.stop
               dismiss_dialog
               @app.executor.background { @capture.wait; @app.executor.post { request_destructive(&operation) unless @closing } }
             end)
-          @dialog = Zaniah::UI::Dialog.new(content, title: "キャプチャ中").test_id("vk.capture.confirm")
+          @dialog = Zaniah::UI::Dialog.new(content, title: t("キャプチャ中"), close_label: t("閉じる")).on_close { dismiss_dialog }.test_id("vk.capture.confirm")
           @window.request_frame
           return false
         end
         return operation.call unless document&.dirty?
+        @dialog_reopen = -> { request_destructive(&operation) }
         @pending_destructive = operation
         @dialog_kind = :unsaved
         content = Zaniah::Div.new.flex_col.gap(12)
-          .child(Zaniah::UI::Label.new("このキャプチャはまだ保存されていません。"))
+          .child(Zaniah::UI::Label.new(t("このキャプチャはまだ保存されていません。")))
           .child(Zaniah::Div.new.flex_row.gap(8)
-            .child(Zaniah::UI::Button.new("保存").test_id("vk.unsaved.save").on_click { save_dialog(after: @pending_destructive) })
-            .child(Zaniah::UI::Button.new("破棄", variant: :danger).test_id("vk.unsaved.discard").on_click { discard_changes })
-            .child(Zaniah::UI::Button.new("キャンセル", variant: :secondary).test_id("vk.unsaved.cancel").on_click { dismiss_dialog }))
-        @dialog = Zaniah::UI::Dialog.new(content, title: "キャプチャを保存しますか？", close_on_scrim: false).test_id("vk.unsaved")
+            .child(Zaniah::UI::Button.new(t("保存")).test_id("vk.unsaved.save").on_click { save_dialog(after: @pending_destructive) })
+            .child(Zaniah::UI::Button.new(t("破棄"), variant: :danger).test_id("vk.unsaved.discard").on_click { discard_changes })
+            .child(Zaniah::UI::Button.new(t("キャンセル"), variant: :secondary).test_id("vk.unsaved.cancel").on_click { dismiss_dialog }))
+        @dialog = Zaniah::UI::Dialog.new(content, title: t("キャプチャを保存しますか？"), close_on_scrim: false, close_label: t("閉じる")).on_close { dismiss_dialog }.test_id("vk.unsaved")
         @window.request_frame
         false
       end

data/lib/vanken/ui/filter_operations.rb

@@ -42,7 +42,7 @@ module Vanken
             message = program.warnings.join("\n")
           rescue Core::DisplayFilter::SyntaxError => error
             status = :error
-            message = "#{error.message} (位置 #{error.position + 1})"
+            message = t("%{message} (位置 %{position})", message: error.message, position: error.position + 1)
           end
           @app.executor.post do
             @filter_field.status(status, message: message) if generation == @filter_generation && !@closing
@@ -51,6 +51,7 @@ module Vanken
       end
 
       def apply_filter
+        cancel_packet_search
         doc = document
         return unless doc
         expression = @filter_field.value
@@ -60,7 +61,7 @@ module Vanken
         @packet_source.reset
         @window.request_frame
       rescue Core::DisplayFilter::SyntaxError => error
-        @filter_field.status(:error, message: "#{error.message} (位置 #{error.position + 1})")
+        @filter_field.status(:error, message: t("%{message} (位置 %{position})", message: error.message, position: error.position + 1))
       end
       def initial_filter(text)
         set_filter(text)
@@ -85,25 +86,51 @@ module Vanken
         set_filter(expression)
         apply_filter unless prepare
       end
-      def selection_menu(expression)
-        return Zaniah::Menu.new([]) unless expression
-        %i[filter prepare].each do |kind|
-          %i[selected not and and_not or or_not].each do |mode|
-            name = :"#{kind}_#{mode}"
-            @app.actions.register(:"context_#{name}", title: @app.actions.command(name).title) do
-              filter_from_expression(expression, mode, prepare: kind == :prepare)
+      def selection_menu(expression, number: selected_number)
+        filters = Zaniah::Menu.new([])
+        if expression
+          %i[filter prepare].each do |kind|
+            %i[selected not and and_not or or_not].each do |mode|
+              name = :"#{kind}_#{mode}"
+              @app.actions.register(:"context_#{name}", title: @app.actions.command(name).title) do
+                filter_from_expression(expression, mode, prepare: kind == :prepare)
+              end
             end
           end
+          @app.actions.register(:context_copy_filter, title: t("フィルタとしてコピー")) { copy_text(expression) }
+          ui = self
+          filters = Zaniah::Menu.build do
+            submenu(ui.t("フィルタとして適用")) { %i[selected not and and_not or or_not].each { |mode| item(:"context_filter_#{mode}") } }
+            submenu(ui.t("フィルタを準備")) { %i[selected not and and_not or or_not].each { |mode| item(:"context_prepare_#{mode}") } }
+            item(:context_copy_filter)
+          end
+        end
+        Zaniah::Menu.new(filters.items + packet_context_menu(number).items)
+      end
+
+      def packet_context_menu(number)
+        doc = document
+        return Zaniah::Menu.new([]) unless doc && number.is_a?(Integer) && number.between?(1, doc.count)
+        enabled = ->(*) { document.equal?(doc) }
+        {
+          context_mark_packet: [:marked, :toggle_mark, "マーク", "マークを解除"],
+          context_ignore_packet: [:ignored, :toggle_ignore, "無視", "無視を解除"],
+          context_time_reference: [:time_references, :toggle_time_reference, "時刻基準にする", "時刻基準を解除"]
+        }.each do |action, (state, operation, label, clear_label)|
+          @app.actions.register(action, title: t(doc.public_send(state).include?(number) ? clear_label : label), enabled: enabled) do
+            update_packet_state(operation, number: number) if enabled.call
+          end
+        end
+        stream_enabled = ->(*) { enabled.call && doc.annotations[number][:tcp_stream] >= 0 }
+        @app.actions.register(:context_follow_tcp_stream, title: t("TCP ストリームを追跡"), enabled: stream_enabled) do
+          follow_tcp_stream(doc.annotations[number][:tcp_stream]) if stream_enabled.call
         end
-        @app.actions.register(:context_copy_filter, title: "フィルタとしてコピー") { copy_text(expression) }
         Zaniah::Menu.build do
-          submenu("フィルタとして適用") { %i[selected not and and_not or or_not].each { |mode| item(:"context_filter_#{mode}") } }
-          submenu("フィルタを準備") { %i[selected not and and_not or or_not].each { |mode| item(:"context_prepare_#{mode}") } }
-          item(:context_copy_filter)
+          %i[context_mark_packet context_ignore_packet context_time_reference context_follow_tcp_stream].each { |action| item(action) }
         end
       end
       def bookmark_filter
-        path_dialog("フィルタの名前") do |name|
+        path_dialog(t("フィルタの名前")) do |name|
           @preferences.bookmark(name, @filter_field.value) unless name.empty?
           dismiss_dialog
         end
@@ -113,7 +140,8 @@ module Vanken
         content = Zaniah::Div.new.flex_col.gap(4).children(items.first(60).map do |label, expression|
           Zaniah::UI::Button.new(label, variant: :ghost).on_click { set_filter(expression); apply_filter; dismiss_dialog }
         end)
-        show_dialog(:history, "表示フィルタ", content)
+        content.child(Zaniah::UI::Label.new(t("フィルタ履歴はまだありません。"), tone: :muted)) if items.empty?
+        show_dialog(:history, t("表示フィルタ"), content, reopen: -> { filter_history })
       end
     end
   end