vimamsa 0.1.10 → 0.1.12

data/lib/vimamsa/gui_image.rb

@@ -1,4 +1,3 @@
-
 # Following this example:
 # https://gabmus.org/posts/create_an_auto-resizing_image_widget_with_gtk3_and_python/
 class ResizableImage < Gtk::DrawingArea
@@ -18,26 +17,33 @@ class ResizableImage < Gtk::DrawingArea
   def scale_image()
     pb = @pixbuf
     view = @view
-    imglimit = view.visible_rect.width - 10
+    if view.visible_rect.width > 0
+      imglimit = view.visible_rect.width - 50
+    else
+      imglimit = 500
+    end
 
     if @oldimg.width > imglimit or @oldimg.width < imglimit - 10
       nwidth = imglimit
       nwidth = pb.width if pb.width < imglimit
       nheight = (pb.height * (nwidth.to_f / pb.width)).to_i
+      # Ripl.start :binding => binding
+
       pb = pb.scale_simple(nwidth, nheight, GdkPixbuf::InterpType::HYPER)
     else
       pb = @oldimg
     end
     @draw_image = pb
     @oldimg = pb
-    self.set_size_request(pb.width, pb.height)
-
+    #TODO: Should be better way to compensate for the gutter
+    self.set_size_request(pb.width+@view.gutter_width, pb.height)
   end
 
   def do_draw(da, cr)
     # puts @fpath
-    cr.set_source_pixbuf(@draw_image, 0, 0)
+    # Ripl.start :binding => binding
+
+    cr.set_source_pixbuf(@draw_image, @view.gutter_width, 0)
     cr.paint
   end
 end
-

data/lib/vimamsa/gui_menu.rb

@@ -16,7 +16,6 @@ module Vimamsa
     end
 
     def add_menu_items()
-    
       add_to_menu "File.Example", { :label => "<span foreground='#888888'>Action, [mode] key binding</span>", :action => nil }
       add_to_menu "File.Save", { :label => "Save", :action => :buf_save }
       add_to_menu "File.Save as", { :label => "Save As...", :action => :buf_save_as }
@@ -40,14 +39,17 @@ module Vimamsa
       add_to_menu "Actions.FileHistoryFinder", { :label => "Search files in history", :action => :gui_file_history_finder }
 
       add_to_menu "Actions.experimental.Diff", { :label => "Show Diff of\nunsaved changes", :action => :diff_buffer }
-      
+
       add_to_menu "Actions.experimental.EnableDebug", { :label => "Enable debug", :action => :enable_debug }
       add_to_menu "Actions.experimental.DisableDebug", { :label => "Disable debug", :action => :disable_debug }
       add_to_menu "Actions.experimental.ShowImages", { :label => "Show images ⟦img:path⟧", :action => :show_images }
       
+      
+      add_to_menu "View.TwoColumn", { :label => "Start two column mode", :action => :toggle_two_column }
+      
+
       add_to_menu "Actions.EncryptFile", { :label => "Encrypt file", :action => :encrypt_file }
       add_to_menu "Help.KeyBindings", { :label => "Show key bindings", :action => :show_key_bindings }
-      
 
       #TODO: :auto_indent_buffer
 
@@ -55,26 +57,19 @@ module Vimamsa
 
     end
 
-    def initialize(menubar)
-      # nfo["file"] = { :items => {}, :label => "File" }
-      # nfo["actions"] = { :items => {}, :label => "Actions" }
-      # nfo["help"] = { :items => {}, :label => "Help" }
-
+    def initialize(menubar, _app)
+      @app = _app
       @nfo = {}
 
       add_menu_items
 
-      # add_to_menu("help.extra.keybindings", { :label => "Show keybindings" })
-      # add_to_menu("help.extra.nfo.keybindings", { :label => "Show keybindings" })
-      # add_to_menu("help.keybindings", { :label => "Show keybindings <span foreground='#888888'  >C ? k</span>" }) #font='12' weight='ultrabold'
-
       for k, v in @nfo
         build_menu(v, menubar)
       end
     end
 
     def build_menu(nfo, parent)
-      menu = Gtk::Menu.new
+      menu = Gio::Menu.new
       if nfo[:action]
         kbd_str = ""
         for mode_str in ["C", "V"]
@@ -86,24 +81,38 @@ module Vimamsa
         end
 
         label_str = nfo[:label] + kbd_str
-        menuitem = Gtk::MenuItem.new(:label => label_str)
-        menuitem.children[0].set_markup(label_str)
-
-        menuitem.signal_connect("activate") do
+        actkey = nfo[:action].to_s
+        menuitem = Gio::MenuItem.new(label_str, "app.#{actkey}")
+        
+        # This worked in GTK3:
+        # But seems there is no way to access the Label object in GTK4
+        # menuitem.children[0].set_markup(label_str)
+
+        act = Gio::SimpleAction.new(actkey)
+        @app.add_action(act)
+        act.signal_connect "activate" do |_simple_action, _parameter|
           call_action(nfo[:action])
         end
       else
-        menuitem = Gtk::MenuItem.new(:label => nfo[:label])
-        menuitem.children[0].set_markup(nfo[:label])
+        menuitem = Gio::MenuItem.new(nfo[:label], nil)
       end
 
+      # Apparently requires Gtk 4.6 to work.
+      # According to instructions in: https://discourse.gnome.org/t/gtk4-and-pango-markup-in-menu-items/16082
+      # Boolean true here should work but doesn't yet in GTK 4.6. The string version does work.
+      menuitem.set_attribute_value("use-markup", "true")
+      # menuitem.set_attribute_value("use-markup", true)
+      # This might change in the future(?), but the string version still works in gtk-4.13.0 (gtk/gtkmenutrackeritem.c)
+
+
       if !nfo[:items].nil? and !nfo[:items].empty?
         for k2, item in nfo[:items]
           build_menu(item, menu)
         end
         menuitem.submenu = menu
       end
-      parent.append(menuitem)
+      o = parent.append_item(menuitem)
+
     end
   end #end class
 end

data/lib/vimamsa/gui_select_window.rb

@@ -1,4 +1,4 @@
-def gui_select_update_window(item_list, jump_keys, select_callback, update_callback, opt={})
+def gui_select_update_window(item_list, jump_keys, select_callback, update_callback, opt = {})
   $selup = SelectUpdateWindow.new(nil, item_list, jump_keys, select_callback, update_callback, opt)
   $selup.run
   # opt fields:
@@ -39,7 +39,7 @@ class SelectUpdateWindow
   end
 
   def initialize(main_window, item_list, jump_keys, select_callback, update_callback, opt = {})
-    @window = Gtk::Window.new(:toplevel)
+    @window = Gtk::Window.new()
     # @window.screen = main_window.screen
     @window.title = ""
     if !opt[:title].nil?
@@ -50,12 +50,23 @@ class SelectUpdateWindow
     @opt = opt
 
     debug item_list.inspect
-    @update_callback = method(update_callback)
-    @select_callback = method(select_callback)
+
+    if select_callback.class == Method
+      @select_callback = select_callback
+    else
+      @select_callback = method(select_callback)
+    end
+    if update_callback.class == Method
+      @update_callback = update_callback
+    else
+      @update_callback = method(update_callback)
+    end
     # debug @update_callback_m.call("").inspect
 
     vbox = Gtk::Box.new(:vertical, 8)
-    vbox.margin = 8
+    vbox.margin_bottom = 8
+    vbox.margin_top = 8
+
     @window.add(vbox)
 
     @entry = Gtk::SearchEntry.new
@@ -74,24 +85,31 @@ class SelectUpdateWindow
     # item_list = @update_callback.call("")
     update_item_list(item_list)
 
-    @window.signal_connect("key-press-event") do |_widget, event|
-      # debug "KEYPRESS 1"
-      @entry.handle_event(event)
-    end
+    # @window.signal_connect("key-press-event") do |_widget, event| #TODO:gtk4
+    # debug "KEYPRESS 1"
+    # @entry.handle_event(event)
+    # end
+
+    press = Gtk::EventControllerKey.new
+    press.set_propagation_phase(Gtk::PropagationPhase::CAPTURE)
 
-    @entry.signal_connect("key_press_event") do |widget, event|
-      # debug "KEYPRESS 2"
-      if event.keyval == Gdk::Keyval::KEY_Down
+    @entry.add_controller(press)
+    # @window.add_controller(press)
+    press.signal_connect "key-pressed" do |gesture, keyval, keycode, y|
+      name = Gdk::Keyval.to_name(keyval)
+      uki = Gdk::Keyval.to_unicode(keyval)
+      keystr = uki.chr("UTF-8")
+      debug "keyval=#{keyval}"
+
+      if keyval == Gdk::Keyval::KEY_Down
         debug "DOWN"
         set_selected_row(@selected_row + 1)
-        # fixed = iter[COLUMN_FIXED]
-
         true
-      elsif event.keyval == Gdk::Keyval::KEY_Up
+      elsif keyval == Gdk::Keyval::KEY_Up
         set_selected_row(@selected_row - 1)
         debug "UP"
         true
-      elsif event.keyval == Gdk::Keyval::KEY_Return
+      elsif keyval == Gdk::Keyval::KEY_Return
         path = Gtk::TreePath.new(@selected_row.to_s)
         iter = @model.get_iter(path)
         ret = iter[1]
@@ -99,7 +117,7 @@ class SelectUpdateWindow
         @window.destroy
         # debug iter[1].inspect
         true
-      elsif event.keyval == Gdk::Keyval::KEY_Escape
+      elsif keyval == Gdk::Keyval::KEY_Escape
         @window.destroy
         true
       else
@@ -131,11 +149,12 @@ class SelectUpdateWindow
 
     vbox.pack_start(container, :expand => false, :fill => false, :padding => 0)
     sw = Gtk::ScrolledWindow.new(nil, nil)
-    sw.shadow_type = :etched_in
+    # sw.shadow_type = :etched_in #TODO:gtk4
     sw.set_policy(:never, :automatic)
-    vbox.pack_start(sw, :expand => true, :fill => true, :padding => 0)
+    vbox.pack_end(sw, :expand => true, :fill => true, :padding => 0)
 
-    sw.add(treeview)
+    # sw.add(treeview) #TODO:gtk4
+    sw.set_child(treeview)
 
     if !opt[:columns].nil?
       for col in opt[:columns]
@@ -168,7 +187,7 @@ class SelectUpdateWindow
 
   def run
     if !@window.visible?
-      @window.show_all
+      @window.show
       # add_spinner
     else
       @window.destroy