vimamsa 0.1.21 → 0.1.23

data/lib/vimamsa/editor.rb

@@ -74,7 +74,7 @@ class Editor
 
     # build_key_bindings_tree
     @kbd = KeyBindingTree.new()
-    $kbd = @kbd
+    $kbd = @kbd #TODO: remove global
     require "vimamsa/key_bindings_vimlike"
 
     $buffers = BufferList.new
@@ -110,8 +110,7 @@ class Editor
 
     settings_path = get_dot_path("settings.rb")
     if File.exist?(settings_path)
-      #  = eval(IO.read(settings_path))
-      #TODO
+      eval(IO.read(settings_path))
     end
 
     custom_script = read_file("", custom_fn)
@@ -151,6 +150,8 @@ class Editor
       end
     end
 
+    argv_has_files = ARGV.any? { |a| File.file?(File.expand_path(a)) }
+
     if fname
       open_new_file(fname)
     else
@@ -167,6 +168,8 @@ class Editor
     # To access via vma.FileFinder
     # self.define_singleton_method(:FileFinder) { @_plugins[:FileFinder] }
 
+    check_session_restore unless argv_has_files
+
     @hook.call(:after_init)
   end
 
@@ -225,6 +228,7 @@ class Editor
   end
 
   def shutdown()
+    save_session
     @hook.call(:shutdown)
     save_state
     @gui.quit
@@ -233,6 +237,44 @@ class Editor
   def save_state
   end
 
+  def save_session
+    fnames = vma.buffers.list
+      .map { |b| b.fname }
+      .compact
+      .select { |f| File.exist?(f) }
+    IO.write(get_dot_path("session.txt"), fnames.join("\n") + "\n")
+  rescue => ex
+    debug "save_session failed: #{ex}"
+  end
+
+  def check_session_restore
+    session_path = get_dot_path("session.txt")
+    return unless File.exist?(session_path)
+
+    fnames = File.read(session_path).lines.map(&:strip).reject(&:empty?)
+    fnames.select! { |f| File.exist?(f) }
+    return if fnames.empty?
+
+    n = fnames.size
+    label = n == 1 ? "1 file" : "#{n} files"
+    params = {
+      "title" => "Restore previous session? (#{label})",
+      "inputs" => {
+        "yes_btn" => { :label => "Restore", :type => :button, :default_focus => true },
+        "no_btn"  => { :label => "No", :type => :button },
+      },
+      :callback => proc { |x|
+        if x["yes_btn"] == "submit"
+          initial = vma.buffers.list.find { |b| b.fname.nil? }
+          fnames.each { |f| load_buffer(f) }
+          initial&.close
+          message("Session restored: #{label}")
+        end
+      },
+    }
+    PopupFormGenerator.new(params).run
+  end
+
   def add_content_search_path(pathstr)
     p = File.expand_path(pathstr)
     if !@file_content_search_paths.include?(p)
@@ -261,6 +303,9 @@ class Editor
     if p and !@file_content_search_paths.include?(p)
       r.insert(0, p)
     end
+    
+    # Ensure that paths are in correct format
+    r = r.map{|x|File.expand_path(x)}
 
     return r
   end
@@ -365,35 +410,13 @@ def start_minibuffer_cmd(bufname, bufstr, cmd)
   $minibuffer.call_func = method(cmd)
 end
 
-def show_key_bindings()
-  kbd_s = "❙Key bindings❙\n"
-  kbd_s << "\n⦁[Mode] keys : action⦁\n"
-
-  kbd_s << "[B]=Browse, [C]=Command, [I]=Insert, [V]=Visual\n"
-  kbd_s << "key!: Press key once, release before pressing any other keys\n"
-
-  kbd_s << "===============================================\n"
-  kbd_s << vma.kbd.to_s
-  kbd_s << "\n"
-  kbd_s << "===============================================\n"
-  b = create_new_buffer(kbd_s, "key-bindings")
-  gui_set_file_lang(b.id, "hyperplaintext")
-  #
-end
-
-def diff_buffer()
-  bufstr = ""
-  orig_path = vma.buf.fname
-  infile = Tempfile.new("out")
-  infile = Tempfile.new("in")
-  infile.write(vma.buf.to_s)
-  infile.flush
-  cmd = "diff -w '#{orig_path}' #{infile.path}"
-  # debug cmd
-  bufstr << run_cmd(cmd)
-  # debug bufstr
-  infile.close; infile.unlink
-  create_new_file(nil, bufstr)
+def if_cmd_exists(cmd)
+  cmd = cmd.gsub(/[^a-zA-Z0-9_\-]/, '')
+  if !system("which #{cmd} > /dev/null 2>&1")
+    message("Command \"#{cmd}\" not found!")
+    return false
+  end
+ return true
 end
 
 def invoke_command()
@@ -412,14 +435,14 @@ end
 
 def minibuffer_end()
   debug "minibuffer_end"
-  $kbd.set_mode(:command)
+  vma.kbd.set_mode(:command)
   minibuffer_input = $minibuffer.to_s[0..-2]
   return $minibuffer.call_func.call(minibuffer_input)
 end
 
 def minibuffer_cancel()
   debug "minibuffer_cancel"
-  $kbd.set_mode(:command)
+  vma.kbd.set_mode(:command)
   minibuffer_input = $minibuffer.to_s[0..-2]
   # $minibuffer.call_func.call('')
 end
@@ -597,6 +620,7 @@ def open_new_file(filename, file_contents = "")
     fname = filename
     bu = load_buffer(fname)
     vma.buffers.set_current_buffer_by_id(bu.id)
+    bu.check_autosave_load
   end
   return bu
 end
@@ -659,3 +683,49 @@ def find_project_dir_of_cur_buffer()
   # debug "Proj dir of current file: #{pdir}"
   return pdir
 end
+
+def reload_customrb
+  custom_fn = get_dot_path("custom.rb")
+  custom_script = read_file("", custom_fn)
+  eval(custom_script) if custom_script
+  message("Reloaded #{custom_fn}")
+end
+
+def save_settings_to_file
+  settings_path = get_dot_path("settings.rb")
+  lines = SETTINGS_DEFS.flat_map { |section| section[:settings] }.map do |s|
+    key_str = "cnf." + s[:key].join(".")
+    val = get(s[:key])
+    "#{key_str} = #{val.inspect}"
+  end
+  IO.write(settings_path, lines.join("\n") + "\n")
+  message("Settings saved to #{settings_path}")
+end
+
+DEMO_FILES = ["demo.txt", "sheep.jpg", "README.md"]
+
+def install_demo_files
+  dest_dir = File.expand_path("~/Documents/VimamsaDemo")
+  mkdir_if_not_exists dest_dir
+  title = "Install demo files to #{dest_dir}?"
+  Gui.confirm(title, proc { |x| install_demo_files_callback(x) })
+end
+
+def install_demo_files_callback(x)
+  return unless x["yes_btn"] == "submit"
+  src_dir = File.expand_path("../..", __dir__)
+  dest_dir = File.expand_path("~/Documents/VimamsaDemo")
+  FileUtils.mkdir_p(dest_dir)
+  DEMO_FILES.each do |fname|
+    src = File.join(src_dir, fname)
+    dst = File.join(dest_dir, fname)
+    if File.exist?(src)
+      FileUtils.cp(src, dst)
+    else
+      message("Demo file not found: #{src}")
+    end
+  end
+  open_new_file(File.join(dest_dir, "demo.txt"))
+  message("Demo files installed to #{dest_dir}")
+end
+

data/lib/vimamsa/file_manager.rb

@@ -18,7 +18,7 @@ class FileManager
   end
 
   def self.init()
-    reg_act(:start_file_selector, proc { FileManager.new.run; vma.kbd.set_mode(:file_exp); }, "File selector")
+    reg_act(:start_file_selector, proc { FileManager.new.run; vma.kbd.set_mode(:file_exp) }, "File selector")
 
     reg_act(:fexp_chdir_parent, proc { FileManager.chdir_parent }, "File selector")
     reg_act(:fexp_select, proc { buf.module.select_line }, "")
@@ -162,13 +162,14 @@ class FileManager
     #TODO:
   end
 
+  # Main inteface, show contents of current dir
   def dir_to_buf(dirpath, b = nil)
     # File.stat("testfile").mtime
 
     debug "last file: #{vma.buffers.last_file}", 2
     lastf = vma.buffers.last_file
     jumpto = nil
-    if File.dirname(lastf) == dirpath
+    if !lastf.nil? and File.dirname(lastf) == dirpath
       jumpto = File.basename(lastf)
     end
     vma.buffers.last_dir = dirpath
@@ -231,6 +232,13 @@ class FileManager
     else
       @buf.set_line_and_column_pos(@header.size, 0)
     end
+
+    if @cdirs.size > 0
+      r = vma.buf.line_range(2, @cdirs.size+1)
+      
+      # Hilight works only if done after buffer is drawn
+      run_as_idle proc { Gui.hilight_range(vma.buf, r, color: "#4488ffff") }
+    end
   end
 
   def fullp(fn)
@@ -267,7 +275,6 @@ class FileManager
       jump_to_file(fn)
       # vma.buffers.set_current_buffer(idx)
       vma.buffers.close_other_buffer(@buf.id)
-
     else
       open_with_default_program(fn)
     end

data/lib/vimamsa/gui.rb

@@ -148,6 +148,12 @@ def gui_create_buffer(id, bufo)
   $vmag.buffers[id] = view
 end
 
+def gui_close_buffer(id)
+  view = vma.gui.buffers.delete(id)
+  return if view.nil?
+  view.unparent if view.parent
+end
+
 def gui_set_file_lang(id, lname)
   view = $vmag.buffers[id]
   lm = GtkSource::LanguageManager.new
@@ -183,7 +189,8 @@ def gui_set_current_buffer(id)
 end
 
 def gui_set_window_title(wtitle, subtitle = "")
-  $vmag.window.title = wtitle
+  wtitle = wtitle[0..150]
+  $vmag.window.title = "Vimamsa - #{wtitle}"
   # $vmag.subtitle.markup = "<span weight='ultrabold'>#{subtitle}</span>"
   $vmag.subtitle.markup = "<span weight='light' size='small'>#{subtitle}</span>"
   #  $vmag.window.titlebar.subtitle = subtitle #TODO:gtk4
@@ -191,7 +198,7 @@ end
 
 class VMAgui
   attr_accessor :buffers, :sw1, :sw2, :view, :buf1, :window, :delex, :statnfo, :overlay, :sws, :two_c
-  attr_reader :two_column, :windows, :subtitle, :app, :active_window
+  attr_reader :two_column, :windows, :subtitle, :app, :active_window, :action_trail_label, :file_panel
 
   def initialize()
     @two_column = false
@@ -348,88 +355,35 @@ class VMAgui
     sw.set_child(view)
   end
 
-    #TODO: implement in gtk4
+  def make_header_button(action_id, icon, cb)
+    act = Gio::SimpleAction.new(action_id)
+    @app.add_action(act)
+    act.signal_connect("activate") { |_a, _p| cb.call }
+    btn = Gtk::Button.new
+    btn.set_child(Gtk::Image.new(icon_name: icon))
+    btn.action_name = "app.#{action_id}"
+    btn
+  end
+
   def init_header_bar()
     header = Gtk::HeaderBar.new
     @header = header
-    header.show_close_button = true
-    # header.title = ""#TODO:gtk4
-    # header.has_subtitle = true#TODO:gtk4
-    header.subtitle = ""
-
-    # icon = Gio::ThemedIcon.new("mail-send-receive-symbolic")
-    # icon = Gio::ThemedIcon.new("document-open-symbolic")
-    # icon = Gio::ThemedIcon.new("dialog-password")
-
-    #edit-redo edit-paste edit-find-replace edit-undo edit-find edit-cut edit-copy
-    #document-open document-save document-save-as document-properties document-new
-    # document-revert-symbolic
-    #
-
-    #TODO:
-    # button = Gtk::Button.new
-    # icon = Gio::ThemedIcon.new("open-menu-symbolic")
-    # image = Gtk::Image.new(:icon => icon, :size => :button)
-    # button.add(image)
-    # header.append(button)
-
-    button = Gtk::Button.new
-    icon = Gio::ThemedIcon.new("document-open-symbolic")
-    image = Gtk::Image.new(:icon => icon, :size => :button)
-    button.add(image)
-    header.append(button)
-
-    button.signal_connect "clicked" do |_widget|
-      open_file_dialog
-    end
-
-    button = Gtk::Button.new
-    icon = Gio::ThemedIcon.new("document-save-symbolic")
-    image = Gtk::Image.new(:icon => icon, :size => :button)
-    button.add(image)
-    header.append(button)
-    button.signal_connect "clicked" do |_widget|
-      buf.save
-    end
-
-    button = Gtk::Button.new
-    icon = Gio::ThemedIcon.new("document-new-symbolic")
-    image = Gtk::Image.new(:icon => icon, :size => :button)
-    button.add(image)
-    header.append(button)
-    button.signal_connect "clicked" do |_widget|
-      create_new_file
-    end
-
-    box = Gtk::Box.new(:horizontal, 0)
-    box.style_context.add_class("linked")
 
-    button = Gtk::Button.new
-    image = Gtk::Image.new(:icon_name => "pan-start-symbolic", :size => :button)
-    button.add(image)
-    box.add(button)
-    button.signal_connect "clicked" do |_widget|
-      history_switch_backwards
-    end
+    file_box = Gtk::Box.new(:horizontal, 0)
+    file_box.style_context.add_class("linked")
+    file_box.append(make_header_button("hdr-open", "document-open-symbolic", proc { open_file_dialog }))
+    file_box.append(make_header_button("hdr-save", "document-save-symbolic", proc { buf.save }))
+    file_box.append(make_header_button("hdr-new",  "document-new-symbolic",  proc { create_new_file }))
+    header.pack_start(file_box)
 
-    button = Gtk::Button.new
-    image = Gtk::Image.new(:icon_name => "pan-end-symbolic", :size => :button)
-    button.add(image)
-    box.add(button)
-    button.signal_connect "clicked" do |_widget|
-      history_switch_forwards
-    end
+    nav_box = Gtk::Box.new(:horizontal, 0)
+    nav_box.style_context.add_class("linked")
+    nav_box.append(make_header_button("hdr-prev",  "pan-start-symbolic", proc { history_switch_backwards }))
+    nav_box.append(make_header_button("hdr-next",  "pan-end-symbolic",   proc { history_switch_forwards }))
+    header.pack_start(nav_box)
 
-    button = Gtk::Button.new
-    icon = Gio::ThemedIcon.new("window-close-symbolic")
-    image = Gtk::Image.new(:icon => icon, :size => :button)
-    button.add(image)
-    box.add(button)
-    button.signal_connect "clicked" do |_widget|
-      bufs.close_current_buffer
-    end
+    header.pack_end(make_header_button("hdr-close", "window-close-symbolic", proc { bufs.close_current_buffer }))
 
-    header.pack_start(box)
     @window.titlebar = header
   end
 
@@ -555,6 +509,8 @@ class VMAgui
     @last_debug_idle = Time.now
     app = Gtk::Application.new("net.samiddhi.vimamsa.r#{rand(1000)}", :flags_none)
     @app = app
+    
+    
 
     Gtk::Settings.default.gtk_application_prefer_dark_theme = true
     Gtk::Settings.default.gtk_theme_name = "Adwaita"
@@ -569,7 +525,7 @@ class VMAgui
       @vpaned = Gtk::Paned.new(:vertical)
 
       @vbox = Gtk::Grid.new()
-      @window.add(@vbox)
+      @window.set_child(@vbox)
 
       Thread.new {
         GLib::Idle.add(proc { debug_idle_func })
@@ -577,17 +533,36 @@ class VMAgui
 
       reset_controllers
 
+      focus_controller = Gtk::EventControllerFocus.new
+
+      focus_controller.signal_connect("enter") do
+        debug "Gained focus"
+        draw_cursor_bug_workaround
+      end
+      @window.add_controller(focus_controller)
+
+      motion_controller = Gtk::EventControllerMotion.new
+      motion_controller.signal_connect("motion") do |controller, x, y|
+        # label.set_text("Mouse at: (%.1f, %.1f)" % [x, y])
+        # puts "MOVE #{x} #{y}"
+        
+        # Cursor vanishes when hovering over menubar
+        draw_cursor_bug_workaround if y < 30 
+        @last_cursor = [x, y]
+        @cursor_move_time = Time.now
+      end
+      @window.add_controller(motion_controller)
+
       @windows[1] = new_window(1)
 
       @last_adj_time = Time.now
 
-
       # To show keyboard key binding state
       @statnfo = Gtk::Label.new
-      
+
       # To show e.g. current folder
       @subtitle = Gtk::Label.new("")
-      
+
       @statbox = Gtk::Box.new(:horizontal, 2)
       @statnfo.set_size_request(150, 10)
       @statbox.append(@subtitle)
@@ -609,15 +584,35 @@ class VMAgui
       init_minibuffer
 
       menubar = Gio::Menu.new
-      app.menubar = menubar
-      @window.show_menubar = true
-
       @menubar = menubar
 
+      # TODO: Doesn't work, why?:
+      # menubar_bar = Gtk::PopoverMenuBar.new(menu_model: menubar)
+      
+      menubar_bar = Gtk::PopoverMenuBar.new()
+      menubar_bar.set_menu_model(menubar)
+      
+      menubar_bar.hexpand = true
+      @action_trail_label = Gtk::Label.new("")
+      @action_trail_label.add_css_class("action-trail")
+      menubar_row = Gtk::Box.new(:horizontal, 0)
+      menubar_row.append(menubar_bar)
+      menubar_row.append(@action_trail_label)
+      @vbox.attach(menubar_row, 0, 0, 2, 1)
+
       @active_window = @windows[1]
 
+      init_header_bar
+      file_panel_init
+
       @window.show
 
+      surface = @window.native.surface
+      tt = Time.now
+      surface.signal_connect("layout") do
+        # puts "Window resized or moved, other redraw."
+      end
+
       run_as_idle proc { idle_set_size }
 
       prov = Gtk::CssProvider.new
@@ -645,7 +640,9 @@ class VMAgui
         min-width: 15px;
       }
   
- popover background > contents { padding: 8px; border-radius: 20px; } 
+ popover background > contents { padding: 8px; border-radius: 20px; }
+
+ label.action-trail { font-family: monospace; font-size: 10pt; margin-right: 8px; color: #aaaaaa; }
          ")
       @window.style_context.add_provider(prov)
 
@@ -666,9 +663,9 @@ class VMAgui
     return true if Time.now - @monitor_time < 0.2
     # Detect element resize
     if swa.width != @sw_width
-      # puts "@sw.width=#{@sw.width}"
+      debug "Width change sw_width #{@sw_width}"
       @sw_width = swa.width
-      DelayExecutioner.exec(id: :scale_images, wait: 0.7, callable: proc { vma.gui.scale_all_images })
+      DelayExecutioner.exec(id: :scale_images, wait: 0.7, callable: proc { debug ":scale_images"; vma.gui.scale_all_images })
     end
     @monitor_time = Time.now
     return true
@@ -915,4 +912,43 @@ class VMAgui
     # view.place_cursor_onscreen #TODO: needed?
     view.draw_cursor
   end
+
+  def file_panel_init
+    @file_panel = FileTreePanel.new
+    @file_panel_shown = false
+  end
+
+  def file_panel_refresh
+    return unless @file_panel_shown
+    @file_panel.refresh
+  end
+
+  def show_file_panel
+    return if @file_panel_shown
+    inner = @two_column ? @pane : @windows[1][:overlay]
+    @vbox.remove(inner)
+    @file_panel_pane = Gtk::Paned.new(:horizontal)
+    @file_panel_pane.hexpand = true
+    @file_panel_pane.vexpand = true
+    @file_panel_pane.set_start_child(@file_panel.widget)
+    @file_panel_pane.set_end_child(inner)
+    @file_panel_pane.set_position(180)
+    @vbox.attach(@file_panel_pane, 0, 2, 2, 1)
+    @file_panel_shown = true
+    @file_panel.refresh
+  end
+
+  def hide_file_panel
+    return unless @file_panel_shown
+    inner = @file_panel_pane.end_child
+    @file_panel_pane.set_start_child(nil)
+    @file_panel_pane.set_end_child(nil)
+    @vbox.remove(@file_panel_pane)
+    @vbox.attach(inner, 0, 2, 2, 1)
+    @file_panel_shown = false
+  end
+
+  def toggle_file_panel
+    @file_panel_shown ? hide_file_panel : show_file_panel
+  end
 end

data/lib/vimamsa/gui_dialog.rb

@@ -39,6 +39,8 @@ end
 class OneInputAction
   def initialize(main_window, title, field_label, button_title, callback, opt = {})
     @window = Gtk::Window.new()
+    @window.set_transient_for($vmag.window) if $vmag&.window
+    @window.modal = true
     # @window.screen = main_window.screen
     @window.title = ""
     # @window.width_request = 800

data/lib/vimamsa/gui_file_panel.rb

@@ -0,0 +1,93 @@
+class FileTreePanel
+  COL_LABEL = 0
+  COL_BUF_ID = 1  # 0 = folder row (not selectable)
+
+  def initialize
+    @store = Gtk::TreeStore.new(String, Integer)
+    @tree = Gtk::TreeView.new(@store)
+    @tree.headers_visible = false
+    @tree.activate_on_single_click = true
+
+    renderer = Gtk::CellRendererText.new
+    renderer.ellipsize = Pango::EllipsizeMode::START
+    col = Gtk::TreeViewColumn.new("", renderer, text: COL_LABEL)
+    col.expand = true
+    @tree.append_column(col)
+
+    @tree.signal_connect("row-activated") do |tv, path, _col|
+      iter = @store.get_iter(path)
+      next if iter.nil?
+      buf_id = iter[COL_BUF_ID]
+      next if buf_id.nil? || buf_id == 0
+      vma.buffers.set_current_buffer(buf_id)
+    end
+
+    @context_menu = nil
+    rightclick = Gtk::GestureClick.new
+    rightclick.button = 3
+    @tree.add_controller(rightclick)
+    rightclick.signal_connect("pressed") do |gesture, n_press, x, y|
+      result = @tree.get_path_at_pos(x.to_i, y.to_i)
+      next unless result
+      iter = @store.get_iter(result[0])
+      next unless iter
+      buf_id = iter[COL_BUF_ID]
+      next unless buf_id && buf_id != 0
+      @context_buf_id = buf_id
+      show_context_menu(x, y)
+    end
+
+    @sw = Gtk::ScrolledWindow.new
+    @sw.set_policy(:never, :automatic)
+    @sw.set_child(@tree)
+    @sw.set_size_request(180, -1)
+    @sw.vexpand = true
+  end
+
+  def widget
+    @sw
+  end
+
+  def init_context_menu
+    act = Gio::SimpleAction.new("fp_close_buffer")
+    vma.gui.app.add_action(act)
+    act.signal_connect("activate") { vma.buffers.close_buffer(@context_buf_id) if @context_buf_id }
+    @context_menu = Gtk::PopoverMenu.new
+    @context_menu.set_parent(@tree)
+    @context_menu.has_arrow = false
+  end
+
+  def show_context_menu(x, y)
+    init_context_menu if @context_menu.nil?
+    menu = Gio::Menu.new
+    menu.append("Close file", "app.fp_close_buffer")
+    @context_menu.set_menu_model(menu)
+    @context_menu.set_pointing_to(Gdk::Rectangle.new(x.to_i, y.to_i, 1, 1))
+    @context_menu.popup
+  end
+
+  def refresh
+    @store.clear
+    bh = {}
+    vma.buffers.list.each do |b|
+      dname = b.fname ? File.dirname(b.fname) : "*"
+      bname = b.fname ? File.basename(b.fname) : (b.list_str || "(untitled)")
+      bh[dname] ||= []
+      bh[dname] << { bname: bname, buf: b }
+    end
+
+    bh.keys.sort.each do |dname|
+      dir_iter = @store.append(nil)
+      dir_iter[COL_LABEL] = "📂 #{tilde_path(dname)}"
+      dir_iter[COL_BUF_ID] = 0
+      bh[dname].sort_by { |x| x[:bname] }.each do |bnfo|
+        active_mark = bnfo[:buf].is_active? ? "● " : "  "
+        file_iter = @store.append(dir_iter)
+        file_iter[COL_LABEL] = "#{active_mark}#{bnfo[:bname]}"
+        file_iter[COL_BUF_ID] = bnfo[:buf].id
+      end
+    end
+
+    @tree.expand_all
+  end
+end

data/lib/vimamsa/gui_form_generator.rb

@@ -25,6 +25,8 @@ class PopupFormGenerator
 
     @callback = params[:callback]
     @window.title = ""
+    @window.set_transient_for($vmag.window) if $vmag&.window
+    @window.modal = true
 
     frame = Gtk::Frame.new()
     frame.margin_bottom = 8
@@ -56,7 +58,7 @@ class PopupFormGenerator
     @vals = {}
     @default_button = nil
 
-    for id, elem in params["inputs"]
+    params["inputs"].each do |id, elem|
       if elem[:type] == :button
         button = Gtk::Button.new(:label => elem[:label])
         hbox.append(button)
@@ -92,7 +94,7 @@ class PopupFormGenerator
           end
         end
       end
-    end
+    end  # each
 
     vbox.append(hbox)