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
106 lines
2.8 KiB
Ruby
106 lines
2.8 KiB
Ruby
# -*- coding: euc-jp -*-
|
|
#
|
|
# widget demo 'load image' (called by 'widget')
|
|
#
|
|
|
|
# toplevel widget が存在すれば削除する
|
|
if defined?($image2_demo) && $image2_demo
|
|
$image2_demo.destroy
|
|
$image2_demo = nil
|
|
end
|
|
|
|
# demo 用の toplevel widget を生成
|
|
$image2_demo = TkToplevel.new {|w|
|
|
title('Image Demonstration #2')
|
|
iconname("Image2")
|
|
positionWindow(w)
|
|
}
|
|
|
|
base_frame = TkFrame.new($image2_demo).pack(:fill=>:both, :expand=>true)
|
|
|
|
# label 生成
|
|
msg = TkLabel.new(base_frame) {
|
|
font $font
|
|
wraplength '4i'
|
|
justify 'left'
|
|
text "このデモではTkの photo image を使用して画像を見ることができます。最初にエントリ内ににディレクトリ名を入れて下さい。次に下のリストボックスにこのディレクトリをロードするため、リターンを押してください。その後、画像を選択するためにリストボックスの中のファイル名をダブルクリックして下さい。"
|
|
}
|
|
msg.pack('side'=>'top')
|
|
|
|
# frame 生成
|
|
TkFrame.new(base_frame) {|frame|
|
|
TkButton.new(frame) {
|
|
#text '了解'
|
|
text '閉じる'
|
|
command proc{
|
|
tmppath = $image2_demo
|
|
$image2_demo = nil
|
|
tmppath.destroy
|
|
}
|
|
}.pack('side'=>'left', 'expand'=>'yes')
|
|
|
|
TkButton.new(frame) {
|
|
text 'コード参照'
|
|
command proc{showCode 'image2'}
|
|
}.pack('side'=>'left', 'expand'=>'yes')
|
|
|
|
}.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
|
|
|
|
# 変数生成
|
|
$dirName = TkVariable.new([$demo_dir,'..','images'].join(File::Separator))
|
|
|
|
# image 生成
|
|
$image2a = TkPhotoImage.new
|
|
|
|
# ファイル名入力部
|
|
TkLabel.new(base_frame, 'text'=>'ディレクトリ:')\
|
|
.pack('side'=>'top', 'anchor'=>'w')
|
|
|
|
image2_e = TkEntry.new(base_frame) {
|
|
width 30
|
|
textvariable $dirName
|
|
}.pack('side'=>'top', 'anchor'=>'w')
|
|
|
|
TkFrame.new(base_frame, 'height'=>'3m', 'width'=>20)\
|
|
.pack('side'=>'top', 'anchor'=>'w')
|
|
|
|
TkLabel.new(base_frame, 'text'=>'ファイル:')\
|
|
.pack('side'=>'top', 'anchor'=>'w')
|
|
|
|
TkFrame.new(base_frame){|w|
|
|
s = TkScrollbar.new(w)
|
|
l = TkListbox.new(w) {
|
|
width 20
|
|
height 10
|
|
yscrollcommand proc{|first,last| s.set first,last}
|
|
}
|
|
s.command(proc{|*args| l.yview(*args)})
|
|
l.pack('side'=>'left', 'expand'=>'yes', 'fill'=>'y')
|
|
s.pack('side'=>'left', 'expand'=>'yes', 'fill'=>'y')
|
|
#l.insert(0,'earth.gif', 'earthris.gif', 'mickey.gif', 'teapot.ppm')
|
|
l.insert(0,'earth.gif', 'earthris.gif', 'teapot.ppm')
|
|
l.bind('Double-1', proc{|x,y| loadImage $image2a,l,x,y}, '%x %y')
|
|
|
|
image2_e.bind 'Return', proc{loadDir l}
|
|
|
|
}.pack('side'=>'top', 'anchor'=>'w')
|
|
|
|
# image 配置
|
|
[ TkFrame.new(base_frame, 'height'=>'3m', 'width'=>20),
|
|
TkLabel.new(base_frame, 'text'=>'画像:'),
|
|
# TkLabel.new(base_frame, 'image'=>$image2a)
|
|
Tk::Label.new(base_frame, 'image'=>$image2a)
|
|
].each{|w| w.pack('side'=>'top', 'anchor'=>'w')}
|
|
|
|
# メソッド定義
|
|
def loadDir(w)
|
|
w.delete(0,'end')
|
|
Dir.glob([$dirName,'*'].join(File::Separator)).sort.each{|f|
|
|
w.insert('end',File.basename(f))
|
|
}
|
|
end
|
|
|
|
def loadImage(img,w,x,y)
|
|
img.file([$dirName, w.get("@#{x},#{y}")].join(File::Separator))
|
|
end
|
|
|