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
131 lines
3.3 KiB
Ruby
131 lines
3.3 KiB
Ruby
# -*- coding: euc-jp -*-
|
||
#
|
||
# widet demo 'puzzle' (called by 'widget')
|
||
#
|
||
|
||
# toplevel widget が存在すれば削除する
|
||
if defined?($puzzle_demo) && $puzzle_demo
|
||
$puzzle_demo.destroy
|
||
$puzzle_demo = nil
|
||
end
|
||
|
||
# demo 用の toplevel widget を生成
|
||
$puzzle_demo = TkToplevel.new {|w|
|
||
title("15-Puzzle Demonstration")
|
||
iconname("15-Puzzle")
|
||
positionWindow(w)
|
||
}
|
||
|
||
base_frame = TkFrame.new($puzzle_demo).pack(:fill=>:both, :expand=>true)
|
||
|
||
# label 生成
|
||
msg = TkLabel.new(base_frame) {
|
||
font $font
|
||
wraplength '4i'
|
||
justify 'left'
|
||
text "下の15-パズルはボタンを集めてできています。空いている所の隣のピースをクリックすると、そのピースがその空いている場所にスライドします。この操作を続け、ピースがその数の順に上から下、左から右に並ぶようにしてください。"
|
||
}
|
||
msg.pack('side'=>'top')
|
||
|
||
# frame 生成
|
||
TkFrame.new(base_frame) {|frame|
|
||
TkButton.new(frame) {
|
||
#text '了解'
|
||
text '閉じる'
|
||
command proc{
|
||
tmppath = $puzzle_demo
|
||
$puzzle_demo = nil
|
||
tmppath.destroy
|
||
}
|
||
}.pack('side'=>'left', 'expand'=>'yes')
|
||
|
||
TkButton.new(frame) {
|
||
text 'コード参照'
|
||
command proc{showCode 'puzzle'}
|
||
}.pack('side'=>'left', 'expand'=>'yes')
|
||
|
||
}.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
|
||
|
||
# frame 生成
|
||
#
|
||
# Special trick: scrollbar widget を生成してその trough color を用いることで
|
||
# 空白部分のための暗色を選択し,設定する
|
||
#
|
||
begin
|
||
if Tk.windowingsystem() == 'aqua'
|
||
frameWidth = 168
|
||
frameHeight = 168
|
||
elsif Tk.default_widget_set == :Ttk
|
||
frameWidth = 148
|
||
frameHeight = 124
|
||
else
|
||
frameWidth = 120
|
||
frameHeight = 120
|
||
end
|
||
rescue
|
||
frameWidth = 120
|
||
frameHeight = 120
|
||
end
|
||
|
||
# depend_on_button_width = true
|
||
depend_on_button_width = false
|
||
|
||
s = TkScrollbar.new(base_frame)
|
||
base = TkFrame.new(base_frame) {
|
||
width frameWidth
|
||
height frameHeight
|
||
borderwidth 2
|
||
relief 'sunken'
|
||
bg s['troughcolor']
|
||
}
|
||
s.destroy
|
||
base.pack('side'=>'top', 'padx'=>'1c', 'pady'=>'1c')
|
||
|
||
# proc のスコープを閉じるため,proc 生成メソッドを用意
|
||
# こうしておかねば,ループ中で値が変化する num の影響を受けて
|
||
# puzzleSwitch の第 2 引数が変化してしまい,期待通りにはならない.
|
||
def def_puzzleswitch_proc(w, num)
|
||
proc{puzzleSwitch w, num}
|
||
end
|
||
|
||
$xpos = {}
|
||
$ypos = {}
|
||
order = [3,1,6,2,5,7,15,13,4,11,8,9,14,10,12]
|
||
(0..14).each{|i|
|
||
num = order[i]
|
||
$xpos[num] = (i % 4) * 0.25
|
||
$ypos[num] = (i / 4) * 0.25
|
||
TkButton.new(base) {|w|
|
||
relief 'raised'
|
||
text num
|
||
highlightthickness 0
|
||
command def_puzzleswitch_proc(w, num)
|
||
if depend_on_button_width && (w.winfo_reqwidth * 4 > base.width)
|
||
base.width = w.winfo_reqwidth * 4
|
||
end
|
||
}.place('relx'=>$xpos[num], 'rely'=>$ypos[num],
|
||
'relwidth'=>0.25, 'relheight'=>0.25)
|
||
}
|
||
$xpos['space'] = 0.75
|
||
$ypos['space'] = 0.75
|
||
|
||
############
|
||
def puzzleSwitch(w, num)
|
||
if ( ($ypos[num] >= ($ypos['space'] - 0.01)) \
|
||
&& ($ypos[num] <= ($ypos['space'] + 0.01)) \
|
||
&& ($xpos[num] >= ($xpos['space'] - 0.26)) \
|
||
&& ($xpos[num] <= ($xpos['space'] + 0.26))) \
|
||
|| (($xpos[num] >= ($xpos['space'] - 0.01)) \
|
||
&& ($xpos[num] <= ($xpos['space'] + 0.01)) \
|
||
&& ($ypos[num] >= ($ypos['space'] - 0.26)) \
|
||
&& ($ypos[num] <= ($ypos['space'] + 0.26)))
|
||
tmp = $xpos['space']
|
||
$xpos['space'] = $xpos[num]
|
||
$xpos[num] = tmp
|
||
tmp = $ypos['space']
|
||
$ypos['space'] = $ypos[num]
|
||
$ypos[num] = tmp
|
||
w.place('relx'=>$xpos[num], 'rely'=>$ypos[num])
|
||
end
|
||
end
|
||
|