mirror of
https://github.com/ruby/ruby.git
synced 2025-09-18 10:03:59 +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
117 lines
2.9 KiB
Ruby
117 lines
2.9 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)
|
||
}
|
||
|
||
# label 生成
|
||
msg = TkLabel.new($puzzle_demo) {
|
||
font $font
|
||
wraplength '4i'
|
||
justify 'left'
|
||
text "下の15-パズルはボタンを集めてできています。空いている所の隣のピースをクリックすると、そのピースがその空いている場所にスライドします。この操作を続け、ピースがその数の順に上から下、左から右に並ぶようにしてください。"
|
||
}
|
||
msg.pack('side'=>'top')
|
||
|
||
# frame 生成
|
||
TkFrame.new($puzzle_demo) {|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'
|
||
frameSize = 160
|
||
else
|
||
frameSize = 120
|
||
end
|
||
rescue
|
||
frameSize = 120
|
||
end
|
||
|
||
s = TkScrollbar.new($puzzle_demo)
|
||
base = TkFrame.new($puzzle_demo) {
|
||
width frameSize
|
||
height frameSize
|
||
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)
|
||
}.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
|
||
|