mirror of
https://github.com/ruby/ruby.git
synced 2025-09-18 01:54:00 +02:00

* ext/tk/lib/tkextlib/tile.rb: [incompatible] remove TileWidgets' instate/state/identify method to avoid the conflict with standard widget options. Those methods are renamed to ttk_instate/ttk_state/ ttk_identify (tile_instate/tile_state/tile_identify are available too). Although I don't recommend, if you realy need old methods, please define "Tk::USE_OBSOLETE_TILE_STATE_METHOD = true" before "require 'tkextlib/tile'". * ext/tk/lib/tkextlib/tile.rb: "Tk::Tile::__Import_Tile_Widgets__!" is obsolete. It outputs warning. To control default widget set, use "Tk.default_widget_set = :Ttk". * ext/tk/lib/tk.rb: __IGNORE_UNKNOWN_CONFIGURE_OPTION__ method and __set_IGNORE_UNKNOWN_CONFIGURE_OPTION__!(mode) method are defind as module methods of TkConfigMethod. It may help users to wrap old Ruby/Tk scripts (use standard widgets) to force to use Ttk widgets. Ttk widgets don't have some options of standard widgets which are control the view of widgets. When set ignore-mode true, configure method tries to ignoure such unknown options with no exception. Of course, it may raise other troubles on the GUI design. So, those are a little danger methods. * ext/tk/lib/tk/itemconfig.rb: __IGNORE_UNKNOWN_CONFIGURE_OPTION__ method and __set_IGNORE_UNKNOWN_CONFIGURE_OPTION__!(mode) method are defind as module methods of TkItemConfigMethod as the same purpose as TkConfigMethod's ones. * ext/tk/sample/ttk_wrapper.rb: A new example. This is a tool for wrapping old Ruby/Tk scripts (which use standard widgets) to use Ttk (Tile) widgets as default. * ext/tk/sample/tkextlib/tile/demo.rb: use ttk_instate/ttk_state method instead of instate/state method. * ext/tk/lib/tk/root, ext/tk/lib/tk/namespace.rb, ext/tk/lib/tk/text.rb, ext/tk/lib/tkextlib/*: some 'instance_eval's are replaced to "instance_exec(self)". * ext/tk/lib/tk/event.rb: bug fix on KEY_TBL and PROC_TBL (?x is not a character code on Ruby1.9). * ext/tk/lib/tk/variable.rb: support new style of operation argument on Tcl/Tk's 'trace' command for variables. * ext/tk/sample/demos-jp/widget, ext/tk/sample/demos-en/widget: bug fix * ext/tk/sammple/demos-jp/textpeer.rb, ext/tk/sammple/demos-en/textpeer.rb: new widget demo. * ext/tk/tcltklib.c: decrase SEGV troubles (probably) * ext/tk/lib/tk.rb: remove Thread.critical access if Ruby1.9 * ext/tk/lib/tk/multi-tk.rb: support Ruby1.9 (probably) * ext/tk/lib/tkextlib/tile.rb: add method to define Tcl/Tk command to make Tcl/Tk theme sources (based on different version of Tile extension) available. (Tk::Tile::__define_LoadImages_proc_for_comaptibility__) * ext/tk/lib/tk.rb, ext/tk/lib/tk/wm.rb: support dockable frames (Tcl/Tk8.5 feature). 'wm' command can treat many kinds of widgets as toplevel widgets. * ext/tk/lib/tkextlib/tile/style.rb: ditto. (Tk::Tile::Style.__define_wrapper_proc_for_compatibility__) * ext/tk/lib/tk/font.rb: add actual_hash and metrics_hash to get properties as a hash. metrics_hash method returns a boolean value for 'fixed' option. But metrics method returns numeric value (0 or 1) for 'fixed' option, because of backward compatibility. * ext/tk/lib/tk/timer.rb: somtimes fail to set callback procedure. * ext/tk/lib/tk.rb: add Tk.sleep and Tk.wakeup method. Tk.sleep doesn't block the eventloop. It will be better to use the method in event callbacks. * ext/tk/sample/tksleep_sample.rb: sample script about Tk.sleep. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@15849 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
103 lines
2.7 KiB
Ruby
103 lines
2.7 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)
|
|
}
|
|
|
|
# label 生成
|
|
msg = TkLabel.new($image2_demo) {
|
|
font $font
|
|
wraplength '4i'
|
|
justify 'left'
|
|
text "このデモではTkの photo image を使用して画像を見ることができます。最初にエントリ内ににディレクトリ名を入れて下さい。次に下のリストボックスにこのディレクトリをロードするため、リターンを押してください。その後、画像を選択するためにリストボックスの中のファイル名をダブルクリックして下さい。"
|
|
}
|
|
msg.pack('side'=>'top')
|
|
|
|
# frame 生成
|
|
TkFrame.new($image2_demo) {|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($image2_demo, 'text'=>'ディレクトリ:')\
|
|
.pack('side'=>'top', 'anchor'=>'w')
|
|
|
|
image2_e = TkEntry.new($image2_demo) {
|
|
width 30
|
|
textvariable $dirName
|
|
}.pack('side'=>'top', 'anchor'=>'w')
|
|
|
|
TkFrame.new($image2_demo, 'height'=>'3m', 'width'=>20)\
|
|
.pack('side'=>'top', 'anchor'=>'w')
|
|
|
|
TkLabel.new($image2_demo, 'text'=>'ファイル:')\
|
|
.pack('side'=>'top', 'anchor'=>'w')
|
|
|
|
TkFrame.new($image2_demo){|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($image2_demo, 'height'=>'3m', 'width'=>20),
|
|
TkLabel.new($image2_demo, 'text'=>'画像:'),
|
|
TkLabel.new($image2_demo, '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
|
|
|