rkumar-rbcurse 0.1.1 → 0.1.2

data/examples/testtable.rb

@@ -83,10 +83,6 @@ if $0 == __FILE__
         #
         ## key bindings fo texta
         # column widths 
-        $log.debug " tcm #{tcm.inspect}"
-        $log.debug " tcms #{tcm.columns}"
-        $log.debug " tcm0 #{tcm.column(0).identifier}"
-        $log.debug " tcm0 #{tcm.column(0).width}"
           tcm.column(0).width 24
           tcm.column(1).width 5
           tcm.column(2).width 18

data/examples/testtabp.rb

@@ -20,6 +20,7 @@ class TestTabbedPane
         width  50
         row 5
         col 10
+        button_type :ok
       end
       @tab1 = @tp.add_tab "&Language" 
       f1 = @tab1.form
@@ -95,6 +96,7 @@ if $0 == __FILE__
     $log = Logger.new("view.log")
     $log.level = Logger::DEBUG
     n = TestTabbedPane.new
+    n.run
   rescue => ex
   ensure
     VER::stop_ncurses

data/examples/testtodo.rb

@@ -13,23 +13,53 @@ require 'rbcurse/keylabelprinter'
 require 'rbcurse/applicationheader'
 require 'rbcurse/action'
 
+# TODO move the csv to a database so you can update. this sucketh.
+#
 class TodoList
   def initialize file
     @file = file
   end
   def load 
-    @todomap = YAML::load(File.open(@file));
+    #@todomap = YAML::load(File.open(@file));
+    @data =[]
+    @statuses=[]
+    @categories=[]
+    @modules=[]
+    require 'csv'
+    CSV::Reader.parse(File.open(@file, 'r')) do |row|
+      @data << row
+      $log.debug " #{row.inspect} "
+      @categories << row[0] unless @categories.include? row[0]
+      @statuses << row[4] unless @statuses.include? row[4]
+      @modules << row[1] unless @modules.include? row[1]
+    end
+    $log.debug " MOD #{@modules}"
   end
   def get_statuses
-    @todomap['__STATUSES']
+    #    @todomap['__STATUSES']
+    @statuses
   end
   def get_modules
-    @todomap['__MODULES'].sort
+    #@todomap['__MODULES'].sort
+    @modules.sort
   end
   def get_categories
-    @todomap.keys.delete_if {|k| k.match(/^__/) }
+    #@todomap.keys.delete_if {|k| k.match(/^__/) }
+    @categories
   end
   def get_tasks_for_category categ
+    @data.select do |row|
+      row[0] == categ
+    end
+  end
+  def insert_task_for_category task, categ
+    task[0] = categ
+    @data << task
+  end
+  def delete_task task
+    @data.delete task
+  end
+  def oldget_tasks_for_category categ
     c = @todomap[categ]
     d = []
     c.each_pair {|k,v|
@@ -44,6 +74,14 @@ class TodoList
     return d
   end
   def set_tasks_for_category categ, data
+  $log.debug " def set_tasks_for_category #{categ}, #{data.size} old #{@data.size}"
+    @data.delete_if { |row| row[0] == categ }
+  $log.debug " 2 def set_tasks_for_category #{categ}, #{data.size} old #{@data.size}"
+  data.each { |row| row[0] = categ }
+    @data.insert -1, *data
+  $log.debug " 3 def set_tasks_for_category #{categ}, #{data.size} old #{@data.size}"
+  end
+  def old_set_tasks_for_category categ, data
     d = {}
     data.each do |row|
       #key = row.delete_at 0
@@ -55,6 +93,7 @@ class TodoList
     $log.debug " NEW DATA #{categ}: #{data}"
   end
   def convert_to_text
+=begin
     d = []
     cats = get_categories
     cats.each do |c|
@@ -65,8 +104,10 @@ class TodoList
         d << n
       end
     end
-    File.open("todo.csv", "w") { |f| YAML.dump( d, f )}
+    #File.open("todo.yml", "w") { |f| YAML.dump( d, f )}
     buf =''
+=end
+    d = @data
     require 'csv'
     CSV.open('todocsv.csv', 'w') do |writer|     
       #writer << [nil, nil]                  
@@ -105,7 +146,7 @@ class TodoApp
     @window = VER::Window.root_window
     @form = Form.new @window
 
-    @todo = TodoList.new "todo.yml"
+    @todo = TodoList.new "todocsv.csv"
     @todo.load
   end
   def make_popup table
@@ -218,14 +259,14 @@ class TodoApp
     data = todo.get_tasks_for_category 'TODO'
     @data = data
     $log.debug " data is #{data}"
-    colnames = %w[ Module Prior Task Status]
+    colnames = %w[ Categ Module Prior Task Status]
 
     table_ht = 15
     atable = Table.new @form do
       name   "tasktable" 
       row  r+2
       col  c
-      width 78
+      width 84
       height table_ht
       #title "A Table"
       #title_attrib (Ncurses::A_REVERSE | Ncurses::A_BOLD)
@@ -238,8 +279,8 @@ class TodoApp
     data = todo.get_tasks_for_category fld.getvalue; 
     @data = data
     $log.debug " DATA is #{data.inspect} : #{data.length}"
-    data = [[nil, 5, "NEW ", "TODO", Time.now]] if data.nil? or data.empty? or data.size == 0
-    $log.debug " DATA is #{data.inspect} : #{data.length}"
+    data = [['FIXME',nil, 5, "NEW ", "TODO", Time.now]] if data.nil? or data.empty? or data.size == 0
+    #$log.debug " DATA is #{data.inspect} : #{data.length}"
     atable.table_model.data = data
     end
 
@@ -247,12 +288,15 @@ class TodoApp
     #
     ## key bindings fo atable
     # column widths 
-    $log.debug " tcm #{tcm.inspect}"
-    $log.debug " tcms #{tcm.columns}"
-    tcm.column(0).width 8
-    tcm.column(1).width 5
-    tcm.column(2).width 50
-    tcm.column(3).width 8
+    #$log.debug " tcm #{tcm.inspect}"
+    #$log.debug " tcms #{tcm.columns}"
+    tcm.column(0).width 5
+    tcm.column(0).editable false
+    tcm.column(1).width 8
+    tcm.column(2).width 5
+    tcm.column(3).width 50
+    tcm.column(3).edit_length 80
+    tcm.column(4).width 8
     app = self
     atable.configure() do
       #bind_key(330) { atable.remove_column(tcm.column(atable.focussed_col)) rescue ""  }
@@ -303,11 +347,11 @@ class TodoApp
     atable.set_default_cell_renderer_for_class "Float", num_renderer
     atable.set_default_cell_renderer_for_class "TrueClass", bool_renderer
     atable.set_default_cell_renderer_for_class "FalseClass", bool_renderer
-    atable.get_table_column_model.column(3).cell_editor =  combo_editor
-    atable.get_table_column_model.column(0).cell_editor =  combo_editor1
+    atable.get_table_column_model.column(4).cell_editor =  combo_editor
+    atable.get_table_column_model.column(1).cell_editor =  combo_editor1
     ce = atable.get_default_cell_editor_for_class "String"
     # increase the maxlen of task
-    ce.component.maxlen = 80
+    # ce.component.maxlen = 80 # this is obsolete, use edit_length
     # I want up and down to go up and down rows inside the combo box, i can use M-down for changing.
     combo_editor.component.unbind_key(KEY_UP)
     combo_editor.component.unbind_key(KEY_DOWN)
@@ -416,17 +460,21 @@ class TodoApp
       amod = mods[@mb.selected_index]
       row = atable.focussed_row
       d = todo.get_tasks_for_category amod
+      $log.debug " retrieved #{d.size} rows for #{amod}"
       r = []
-      tcm = atable.get_table_column_model
+      tcm = atable.table_column_model
       tcm.each_with_index do |acol, colix|
         r << atable.get_value_at(row, colix)
       end
       # here i ignore the 5th row tht coud have been added
       r << Time.now
       d << r
+      $log.debug " sending #{d.size} rows for #{amod}"
       todo.set_tasks_for_category amod, d
+      $log.debug " MOVE #{data.size} rows for #{categ.getvalue}"
       tm = atable.table_model
       ret = tm.delete_at row
+      $log.debug " MOVE after del #{data.size} rows for #{categ.getvalue}"
       todo.set_tasks_for_category categ.getvalue, data
       alert("Moved row #{row} to #{amod}.")
     }
@@ -469,15 +517,17 @@ class TodoApp
     #@new_act = Action.new("New Row", "mnemonic"=>"N") { 
     @new_act = Action.new("&New Row") { 
       mod = nil
+      cat = 'TODO'
       cc = atable.get_table_column_model.column_count
       if atable.row_count < 1
         frow = 0
       else
         frow = atable.focussed_row
         #frow += 1 # why ?
-        mod = atable.get_value_at(frow,0) unless frow.nil?
+        cat = atable.get_value_at(frow,0) unless frow.nil?
+        mod = atable.get_value_at(frow,1) unless frow.nil?
       end
-      tmp = [mod, 5, "", "TODO", Time.now]
+      tmp = [cat,mod, 5, "", "TODO", Time.now]
       tm = atable.table_model
       tm.insert frow, tmp
       atable.set_focus_on frow
@@ -488,7 +538,7 @@ class TodoApp
     @save_cmd = lambda {
         todo.set_tasks_for_category categ, data
         todo.dump
-        alert("Rewritten yaml file")
+        alert("Rewritten csv file")
     }
     @del_cmd = lambda { 
       row = atable.focussed_row

data/examples/todocsv.csv

@@ -0,0 +1,28 @@
+FIXME,MSGBOX,5,Confirm dialog: box vertical line overwritten in 2 spots,TODO
+FIXME,MSGBOX,5,Confirm dialog: use normal key as hotkey also,TODO,Tue Jan 20 11:44:49 +0530 2009
+FIXME,MSGBOX,5,Confirm dialog: arrow keys not navigating anylonger,TODO,Tue Jan 20 11:45:27 +0530 2009
+FIXME,GEN,9,Message Box sizing,TODO,Thu Jan 22 20:39:21 +0530 2009
+DONE,LIST,5,case insensitive char search in list and combo,TESTED,Sat Feb 21 20:43:05 +0530 2009
+DONE,TABLE,5,increase the maxlen of this field please. Let us see how it goes.,TESTED
+DONE,TABLE,5,Can we disable down arrow in Chkbox in table?,TESTED,Mon Jan 19 00:00:00 +0530 2009
+DONE,TABLE,0,editing on enter,TESTED,Mon Jan 19 01:37:00 +0530 2009
+DONE,TABLE,5,cell editors pcol is not being reset each time,TESTED,Mon Jan 19 17:47:00 +0530 2009
+DONE,TABLE,5,Use TAB for intercell navig. use M-TAB for next f,TESTED,Tue Jan 20 00:38:19 +0530 2009
+DONE,TABLE,5,Searching,TESTED,Sat Feb 21 20:42:10 +0530 2009
+DONE,TABLE,3,Columns editable or not,TESTED,Sat Feb 21 20:43:10 +0530 2009
+DONE,TABLE,1,Any way to start a table with no data and pop late,TODO,Sat Feb 21 20:43:33 +0530 2009
+DONE,GEN,5,Make  widget of Keylabelprinter,TESTED,Tue Jan 20 00:38:43 +0530 2009
+DONE,GEN,5,Added Action class shared by Button Menuitem ,TESTED,Thu Jan 22 18:08:28 +0530 2009
+DONE,GEN,5,Added PopupMenu 2009-01-22 18:09 ,TESTED,Thu Jan 22 18:09:34 +0530 2009
+DONE,LIST,0,call on_enter and on_leave of component,TOTEST,Sun Feb 22 12:19:38 +0530 2009
+TODO,TABLE,1,table.set_data should check if models already created.,TODO
+TODO,TABLE,5,"Set column_class in TableColumn, to avoid hassles",TODO
+TODO,TABLE,2,Table sorting and filtering is required - using VIEW,TODO
+TODO,TABLE,5,Table height and col widths auto sizing or FILLING extra space.,TODO
+TODO,TEXTAREA,9,"Textarea: wrap options NONE, COLUMN",TODO,Tue Jan 20 01:04:15 +0530 2009
+TODO,GEN,5,"Modified should check if value changed, not UP etc",TOTEST
+TODO,GEN,5,Give a decent FileChooser and FileSaver,TODO
+TODO,GEN,5,Focus Traversable vs focusable,TODO
+TODO,GEN,5,Action class: fire event for listeners,TODO,Thu Jan 22 20:09:50 +0530 2009
+TODO,FIELD,5,Field: OVERWRITE Mode,TODO
+TODO,FIELD,5,Field: Auto-skip when reaching end of maxlen,TODO

data/lib/rbcurse.rb

@@ -3,5 +3,5 @@ require 'ver/window'
 require 'rbcurse/rwidget'
 require 'rbcurse/rdialogs'
 class Rbcurse
-  VERSION = '0.1.0'
+  VERSION = '0.1.2'
 end

data/lib/rbcurse/defaultlistselectionmodel.rb

@@ -1,3 +1,6 @@
+require 'rbcurse/listselectable'
+##
+# Added ListSelectionEvents on 2009-02-13 23:33 
 module RubyCurses
   class DefaultListSelectionModel
     include EventHandler
@@ -9,10 +12,15 @@ module RubyCurses
       @anchor_selection_index = -1
       @lead_selection_index = -1
       @selection_mode = :MULTIPLE
+      $log.debug " created DefaultListSelectionModel XXX"
     end
 
     def clear_selection
+      ix0 = @selected_indices.first
+      ix1 = @selected_indices.last
       @selected_indices=[]
+      lse = ListSelectionEvent.new(ix0, ix1, self, :DELETE)
+      fire_handler :LIST_SELECTION_EVENT, lse
     end
     def is_selected_index ix
       @selected_indices.include? ix
@@ -28,17 +36,23 @@ module RubyCurses
     end
     ## TODO should go in sorted, and no dupes
     def add_selection_interval ix0, ix1
+      $log.debug " def add_selection_interval #{ix0}, ix1"
       if @selection_mode != :MULTIPLE
         clear_selection
       end
       @anchor_selection_index = ix0
       @lead_selection_index = ix1
       ix0.upto(ix1) {|i| @selected_indices  << i unless @selected_indices.include? i }
+      lse = ListSelectionEvent.new(ix0, ix1, self, :INSERT)
+      fire_handler :LIST_SELECTION_EVENT, lse
+      $log.debug " DLSM firing LIST_SELECTION EVENT #{lse}"
     end
     def remove_selection_interval ix0, ix1
       @anchor_selection_index = ix0
       @lead_selection_index = ix1
       @selected_indices.delete_if {|x| x >= ix0 and x <= ix1}
+      lse = ListSelectionEvent.new(ix0, ix1, self, :DELETE)
+      fire_handler :LIST_SELECTION_EVENT, lse
     end
     def insert_index_interval ix0, len
       @anchor_selection_index = ix0

data/lib/rbcurse/listcellrenderer.rb

@@ -93,6 +93,13 @@ module RubyCurses
           graphic.printstring r, c, str % [len, _value], @color_pair,@attr
           r += 1
         end
+=begin
+        if @parent.search_found_ix == row_index
+          if !@parent.find_offset.nil?
+            graphic.mvchgat(y=r, x=@parent.find_offset, @parent.find_offset1, Ncurses::A_NORMAL, $reversecolor, nil)
+          end
+        end
+=end
     end
   # ADD HERE 
   end

data/lib/rbcurse/listkeys.rb

@@ -5,14 +5,17 @@ module RubyCurses
     # any changes to the vars after construction won't have an effect.
     def install_list_keys
       @KEY_ROW_SELECTOR ||= ?\C-x
+      @KEY_BLOCK_SELECTOR ||= ?\M-x
       @KEY_GOTO_TOP ||= ?\M-0
       @KEY_GOTO_BOTTOM ||= ?\M-9
-      @KEY_ASK_FIND_FORWARD ||= ?\M-f
-      @KEY_ASK_FIND_BACKWARD ||= ?\M-F
-      @KEY_FIND_NEXT ||= ?\M-g
-      @KEY_FIND_PREV ||= ?\M-G
+      #@KEY_ASK_FIND_FORWARD ||= ?\M-f
+      #@KEY_ASK_FIND_BACKWARD ||= ?\M-F
+      #@KEY_FIND_NEXT ||= ?\M-g
+      #@KEY_FIND_PREV ||= ?\M-G
       @KEY_SCROLL_FORWARD ||= ?\C-n
       @KEY_SCROLL_BACKWARD ||= ?\C-p
+      @KEY_SCROLL_RIGHT ||= ?\M-8
+      @KEY_SCROLL_LEFT ||= ?\M-7
 
       @KEY_CLEAR_SELECTION ||= ?\M-e
       @KEY_PREV_SELECTION ||= ?\M-"

data/lib/rbcurse/listscrollable.rb

@@ -8,6 +8,7 @@
 #   @pcol (used for horiz scrolling, starts at 0)
 #
 module ListScrollable
+  attr_reader :search_found_ix, :find_offset, :find_offset1
   def previous_row
     @oldrow = @current_index
     @current_index -= 1 if @current_index > 0
@@ -61,9 +62,9 @@ module ListScrollable
   def bounds_check
     h = scrollatrow()
     rc = row_count
-    $log.debug " PRE CURR:#{@current_index}, TR: #{@toprow} RC: #{rc} H:#{h}"
+    #$log.debug " PRE CURR:#{@current_index}, TR: #{@toprow} RC: #{rc} H:#{h}"
     @current_index = 0 if @current_index < 0  # not lt 0
-    @current_index = rc-1 if @current_index >= rc # not gt rowcount
+    @current_index = rc-1 if @current_index >= rc and rc>0 # not gt rowcount
     @toprow = rc-h-1 if rc > h and @toprow > rc - h - 1 # toprow shows full page if possible
     # curr has gone below table,  move toprow forward
     if @current_index - @toprow > h
@@ -74,11 +75,12 @@ module ListScrollable
     end
     #$log.debug " POST CURR:#{@current_index}, TR: #{@toprow} RC: #{rc} H:#{h}"
     if @oldrow != @current_index
-      $log.debug "going to call on leave and on enter"
+      #$log.debug "going to call on leave and on enter"
       on_leave_row @oldrow if respond_to? :on_leave_row     # to be defined by widget that has included this
       on_enter_row @current_index   if respond_to? :on_enter_row  # to be defined by widget that has included this
     end
     set_form_row
+    #set_form_col 0 # added 2009-02-15 23:33  # this works for lists but we don't want this in TextArea's
     @repaint_required = true
   end
   # the cursor should be appropriately positioned
@@ -129,13 +131,13 @@ module ListScrollable
       when KEY_UP
         #select_prev_row
         #up
-        $log.debug " GOT KEY UP NEW SCROLL"
+        #$log.debug " GOT KEY UP NEW SCROLL"
         previous_row
       when KEY_LEFT
       when KEY_RIGHT
       when KEY_DOWN
         #down
-        $log.debug " GOT KEY DOWN NEW SCROLL"
+        #$log.debug " GOT KEY DOWN NEW SCROLL"
         next_row
       when KEY_ENTER, 10, 13
         if respond_to? :fire
@@ -203,14 +205,149 @@ module ListScrollable
     sar = scrollatrow + 1
     @toprow = (@current_index / sar) * sar
 
-    $log.debug "1 set_focus #{total}, sar #{sar}, toprow #{@toprow}, current_index #{@current_index}"
+    #$log.debug "1 set_focus #{total}, sar #{sar}, toprow #{@toprow}, current_index #{@current_index}"
     if total - @toprow < sar
       @toprow = (total - sar) 
     end
-    $log.debug "2 set_focus #{total}, sar #{sar}, toprow #{@toprow}, current_index #{@current_index}"
+    #$log.debug "2 set_focus #{total}, sar #{sar}, toprow #{@toprow}, current_index #{@current_index}"
     set_form_row # 2009-01-17 12:44 
     @repaint_required = true
     #bounds_check
   end
+    def install_keys
+=begin
+      @KEY_ASK_FIND_FORWARD ||= ?\M-f
+      @KEY_ASK_FIND_BACKWARD ||= ?\M-F
+      @KEY_FIND_NEXT ||= ?\M-g
+      @KEY_FIND_PREV ||= ?\M-G
+=end
+      @KEY_ASK_FIND ||= ?\M-f
+      @KEY_FIND_MORE ||= ?\M-g
+    end
+    def ask_search
+      options = ["Search backwards", "case insensitive", "Wrap around"]
+      sel,regex,hash =  get_string_with_options("Enter regex to search", 20, @last_regex||"", "checkboxes"=>options, "checkbox_defaults"=>[@search_direction_prev,@search_case,@search_wrap])
+      return if sel != 0
+      @search_direction_prev =  hash[options[0]]
+      @search_case = hash[options[1]]
+      @search_wrap = hash[options[2]]
+      if @search_direction_prev == true
+        ix = _find_prev regex, @current_index
+      else
+        ix = _find_next regex, @current_index
+      end
+      if ix.nil?
+        alert("No matching data for: #{regex}")
+      else
+        set_focus_on(ix)
+        set_form_col @find_offset1
+        @cell_editor.component.curpos = (@find_offset||0) if @cell_editing_allowed
+      end
+    end
+    def find_more
+      if @search_direction_prev 
+        find_prev
+      else
+        find_next
+      end
+    end
+    # find forwards
+    # Using this to start a search or continue search
+    def _find_next regex=@last_regex, start = @search_found_ix 
+      raise "No previous search" if regex.nil?
+      #$log.debug " _find_next #{@search_found_ix} : #{@current_index}"
+      fend = @list.size-1
+      if start != fend
+      start += 1 unless start == fend
+      @last_regex = regex
+      @search_start_ix = start
+      regex = Regexp.new(regex, Regexp::IGNORECASE) if @search_case
+      start.upto(fend) do |ix| 
+        row = @list[ix]
+        m=row.match(regex)
+        if !m.nil?
+          @find_offset = m.offset(0)[0]
+          @find_offset1 = m.offset(0)[1]
+          @search_found_ix = ix
+          return ix 
+        end
+      end
+      end
+      fend = start-1
+      start = 0
+      if @search_wrap
+        start.upto(fend) do |ix| 
+          row = @list[ix]
+          m=row.match(regex)
+          if !m.nil?
+            @find_offset = m.offset(0)[0]
+            @find_offset1 = m.offset(0)[1]
+            @search_found_ix = ix
+            return ix 
+          end
+        end
+      end
+      return nil
+    end
+    def find_next
+        ix = _find_next
+        regex = @last_regex 
+        if ix.nil?
+          alert("No more matching data for: #{regex}")
+        else
+          set_focus_on(ix) 
+          set_form_col @find_offset1
+        @cell_editor.component.curpos = (@find_offset||0) if @cell_editing_allowed
+        end
+    end
+    def find_prev
+        ix = _find_prev
+        regex = @last_regex 
+        if ix.nil?
+          alert("No previous matching data for: #{regex}")
+        else
+          set_focus_on(ix)
+          set_form_col @find_offset
+          @cell_editor.component.curpos = (@find_offset||0) if @cell_editing_allowed
+        end
+    end
+    ##
+    # find backwards
+    # Using this to start a search or continue search
+    def _find_prev regex=@last_regex, start = @search_found_ix 
+      raise "No previous search" if regex.nil?
+      #$log.debug " _find_prev #{@search_found_ix} : #{@current_index}"
+      if start != 0
+      start -= 1 unless start == 0
+      @last_regex = regex
+      @search_start_ix = start
+      regex = Regexp.new(regex, Regexp::IGNORECASE) if @search_case
+      start.downto(0) do |ix| 
+        row = @list[ix]
+        m=row.match(regex)
+        if !m.nil?
+          @find_offset = m.offset(0)[0]
+          @find_offset1 = m.offset(0)[1]
+          @search_found_ix = ix
+          return ix 
+        end
+      end
+      end
+      fend = start-1
+      start = @list.size-1
+      if @search_wrap
+        start.downto(fend) do |ix| 
+          row = @list[ix]
+          m=row.match(regex)
+          if !m.nil?
+            @find_offset = m.offset(0)[0]
+          @find_offset1 = m.offset(0)[1]
+            @search_found_ix = ix
+            return ix 
+          end
+        end
+      end
+      return nil
+    end
 
 end