mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
e6697a6405
* ext/tk/tcltklib.c: avoid error on a shared object. * ext/tk/extconf.rb: support --with-tcltkversion * ext/tk/README.tcltklib: add document about --with-tcltkversion * ext/tk/lib/tk.rb, ext/tk/lib/multi-tk.rb, ext/tk/lib/remote-tk.rb: not work on $SAFE==4 * ext/tk/lib/multi-tk.rb: Object#methods returns Symbols on Ruby1.9. * ext/tk/lib/tk/timer.rb: add TkTimer#at_end(proc) to register the procedure which called at end of the timer. * ext/tk/lib/tk.rb, ext/tk/lib/tk/itemfont.rb, ext/tk/lib/font.rb: support __IGNORE_UNKNOWN_CONFIGURE_OPTION__ about font options. * ext/tk/lib/*: treat __IGNORE_UNKNOWN_CONFIGURE_OPTION__ * ext/tk/lib/tkextlib/iwidgets/scrolledcanvas.rb, ext/tk/lib/tkextlib/iwidgets/scrolledlistbox.rb, ext/tk/lib/tkextlib/iwidgets/scrolledtext.rb: bug fix. * ext/tk/lib/tk/text.rb: typo. call a wrong method. * ext/tk/lib/tk/itemconfig.rb: ditto. * ext/tk/lib/tk.rb, ext/tk/lib/tk/itemconfig.rb, ext/tk/lib/tk/canvas.rb: support alias names of option keys. * ext/tk/lib/tk/grid.rb: lack of module-method definitions. * ext/tk/lib/tk/pack.rb, ext/tk/lib/tk/grid.rb: increase supported parameter patterns of configure method. * ext/tk/lib/tk.rb: add TkWindow#grid_anchor, grid_column, grid_row. * ext/tk/lib/tk/wm.rb: methods of Tk::Wm_for_General module cannot pass the given block to methods of Tk::Wm module. * ext/tk/lib/tk/wm.rb: Wm#overrideredirect overwrites arguemnt to an invalid value. * ext/tk/lib/tk.rb: fix memory (object) leak bug. * ext/tk/tcltklib.c, ext/tk/tkutil/tkutil.c: fix memory leak. * ext/tk/sample/demos-jp/aniwave.rb, ext/tk/sample/demos-en/aniwave.rb: bug fix. * ext/tk/lib/tkextlib/blt/component.rb, ext/tk/lib/tkextlib/tile/tentry.rb, ext/tk/lib/tkextlib/tile/treeview.rb: ditto. * ext/tk/lib/tkextlib/tile/tpaned.rb: improve TPaned#add. * ext/tk/sample/demos-jp/widget, ext/tk/sample/demos-en/widget, ext/tk/sample/demos-jp/style.rb, ext/tk/sample/demos-en/style.rb, ext/tk/sample/demos-jp/bind.rb, ext/tk/sample/demos-en/bind.rb: bug fix. * ext/tk/sample/ttk_wrapper.rb: ditto. * ext/tk/sample/ttk_wrapper.rb: support "if __FILE__ == $0" idiom. * ext/tk/sample/tktextio.rb: add binding for 'Ctrl-u' at console mode. * ext/tk/lib/tkextlib/tile.rb, ext/tk/lib/tkextlib/tile/style.rb, ext/tk/sample/ttk_wrapper.rb: improve treating and control themes. add Tk::Tile.themes and Tk::Tile.set_theme(theme). * ext/tk/lib/tkextlib/tile.rb: lack of autoload definitions. * ext/tk/lib/tkextlib/tile/tnotebook.rb: cannot use kanji (not UTF-8) characters for headings. * ext/tk/lib/tkextlib/tkDND/shape.rb: wrong package name. * ext/tk/tkutil/tkutil.c: improve handling callback-subst-keys. Now, support longnam-keys (e.g. '%CTT' on tkdnd-2.0; however, still not support tkdnd-2.0 on tkextlib), and symbols of parameters (e.g. :widget=>'%W', :keycode=>'%k', '%x'=>:x, '%X'=>:root_x, and so on; those are attributes of event object). It means that Ruby/Tk accepts not only "widget.bind(ev, '%W', '%k', ...){|w, k, ...| ... }", but also "widget.bind(ev, :widget, :keycode, ...){|w, k, ...| ... }". It is potentially incompatible, when user passes symbols to the arguments of the callback block (the block receives the symbols as strings). I think that is very rare case (probably, used by Ruby/Tk experts only). When causes such trouble, please give strings instead of such symbol parameters (e.g. call Symbol#to_s method). * ext/tk/lib/tk/event.rb, ext/tk/lib/tk/validation.rb, ext/tk/lib/tkextlib/blt/treeview.rb, ext/tk/lib/tkextlib/winico/winico.rb: ditto. * ext/tk/tkutil/tkutil.c: strings are available on subst_tables on TkUtil::CallbackSubst class (it is useful on Ruby 1.9). * ext/tk/lib/tk/spinbox.rb, ext/tk/lib/tkextlib/iwidgets/hierarchy.rb, ext/tk/lib/tkextlib/iwidgets/spinner.rb, ext/tk/lib/tkextlib/iwidgets/entryfield.rb, ext/tk/lib/tkextlib/iwidgets/calendar.rb, ext/tk/lib/tkextlib/blt/dragdrop.rb, ext/tk/lib/tkextlib/tkDND/tkdnd.rb, ext/tk/lib/tkextlib/treectrl/tktreectrl.rb, ext/tk/lib/tkextlib/tktable/tktable.rb: disable code piece became unnecessary by reason of the changes of ext/tk/tkutil/tkutil.c. * ext/tk/lib/tk.rb, ext/tk/lib/multi-tk.rb: change strategy to define the constant WITH_ENCODING. * ext/tk/lib/tk.rb: fix bug on Tk::Encoding.tk_encoding_names. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@17083 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
117 lines
4.1 KiB
Ruby
117 lines
4.1 KiB
Ruby
# mclist.rb --
|
|
#
|
|
# This demonstration script creates a toplevel window containing a Ttk
|
|
# tree widget configured as a multi-column listbox.
|
|
#
|
|
# based on "Id: mclist.tcl,v 1.3 2007/12/13 15:27:07 dgp Exp"
|
|
|
|
if defined?($mclist_demo) && $mclist_demo
|
|
$mclist_demo.destroy
|
|
$mclist_demo = nil
|
|
end
|
|
|
|
$mclist_demo = TkToplevel.new {|w|
|
|
title("Multi-Column List")
|
|
iconname("mclist")
|
|
positionWindow(w)
|
|
}
|
|
|
|
base_frame = TkFrame.new($mclist_demo).pack(:fill=>:both, :expand=>true)
|
|
|
|
## Explanatory text
|
|
Ttk::Label.new(base_frame, :font=>$font, :wraplength=>'4i',
|
|
:justify=>:left, :anchor=>'n', :padding=>[10, 2, 10, 6],
|
|
:text=><<EOL).pack(:fill=>:x)
|
|
Ttk is the new Tk themed widget set. \
|
|
One of the widgets it includes is a tree widget, \
|
|
which can be configured to display multiple columns of informational data \
|
|
without displaying the tree itself. \
|
|
This is a simple way to build a listbox that has multiple columns. \
|
|
Clicking on the heading for a column will sort the data by that column. \
|
|
You can also change the width of the columns \
|
|
by dragging the boundary between them.
|
|
EOL
|
|
|
|
## See Code / Dismiss
|
|
Ttk::Frame.new(base_frame) {|frame|
|
|
sep = Ttk::Separator.new(frame)
|
|
Tk.grid(sep, :columnspan=>4, :row=>0, :sticky=>'ew', :pady=>2)
|
|
TkGrid('x',
|
|
Ttk::Button.new(frame, :text=>'See Code',
|
|
:image=>$image['view'], :compound=>:left,
|
|
:command=>proc{showCode 'mclist'}),
|
|
Ttk::Button.new(frame, :text=>'Dismiss',
|
|
:image=>$image['delete'], :compound=>:left,
|
|
:command=>proc{
|
|
$mclist_demo.destroy
|
|
$mclist_demo = nil
|
|
}),
|
|
:padx=>4, :pady=>4)
|
|
grid_columnconfigure(0, :weight=>1)
|
|
pack(:side=>:bottom, :fill=>:x)
|
|
}
|
|
|
|
container = Ttk::Frame.new(base_frame)
|
|
tree = Ttk::Treeview.new(base_frame, :columns=>%w(country capital currency),
|
|
:show=>:headings)
|
|
if Tk.windowingsystem != 'aqua'
|
|
vsb = tree.yscrollbar(Ttk::Scrollbar.new(base_frame))
|
|
hsb = tree.xscrollbar(Ttk::Scrollbar.new(base_frame))
|
|
else
|
|
vsb = tree.yscrollbar(Tk::Scrollbar.new(base_frame))
|
|
hsb = tree.xscrollbar(Tk::Scrollbar.new(base_frame))
|
|
end
|
|
|
|
container.pack(:fill=>:both, :expand=>true)
|
|
Tk.grid(tree, vsb, :in=>container, :sticky=>'nsew')
|
|
Tk.grid(hsb, :in=>container, :sticky=>'nsew')
|
|
container.grid_columnconfigure(0, :weight=>1)
|
|
container.grid_rowconfigure(0, :weight=>1)
|
|
|
|
## The data we're going to insert
|
|
data = [
|
|
['Argentina', 'Buenos Aires', 'ARS'],
|
|
['Australia', 'Canberra', 'AUD'],
|
|
['Brazil', 'Brazilia', 'BRL'],
|
|
['Canada', 'Ottawa', 'CAD'],
|
|
['China', 'Beijing', 'CNY'],
|
|
['France', 'Paris', 'EUR'],
|
|
['Germany', 'Berlin', 'EUR'],
|
|
['India', 'New Delhi', 'INR'],
|
|
['Italy', 'Rome', 'EUR'],
|
|
['Japan', 'Tokyo', 'JPY'],
|
|
['Mexico', 'Mexico City', 'MXN'],
|
|
['Russia', 'Moscow', 'RUB'],
|
|
['South Africa', 'Pretoria', 'ZAR'],
|
|
['United Kingdom', 'London', 'GBP'],
|
|
['United States', 'Washington, D.C.', 'USD'],
|
|
]
|
|
|
|
## Code to insert the data nicely
|
|
font = Ttk::Style.lookup(tree[:style], :font)
|
|
cols = %w(country capital currency)
|
|
cols.zip(%w(Country Capital Currency)).each{|col, name|
|
|
tree.heading_configure(col, :text=>name,
|
|
:command=>proc{sort_by(tree, col, false)})
|
|
tree.column_configure(col, :width=>TkFont.measure(font, name))
|
|
}
|
|
|
|
data.each{|country, capital, currency|
|
|
#tree.insert('', :end, :values=>[country, capital, currency])
|
|
tree.insert(nil, :end, :values=>[country, capital, currency])
|
|
cols.zip([country, capital, currency]).each{|col, val|
|
|
len = TkFont.measure(font, "#{val} ")
|
|
if tree.column_cget(col, :width) < len
|
|
tree.column_configure(col, :width=>len)
|
|
end
|
|
}
|
|
}
|
|
|
|
## Code to do the sorting of the tree contents when clicked on
|
|
def sort_by(tree, col, direction)
|
|
tree.children(nil).map!{|row| [tree.get(row, col), row.id]} .
|
|
sort(&((direction)? proc{|x, y| y <=> x}: proc{|x, y| x <=> y})) .
|
|
each_with_index{|info, idx| tree.move(info[1], nil, idx)}
|
|
|
|
tree.heading_configure(col, :command=>proc{sort_by(tree, col, ! direction)})
|
|
end
|