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
238 lines
7.4 KiB
Ruby
238 lines
7.4 KiB
Ruby
# -*- coding: euc-jp -*-
|
|
require "tkcanvas"
|
|
|
|
def optionMenu(menubutton, varName, firstValue, *rest)
|
|
varName.value = firstValue
|
|
configoptions = {'textvariable'=>varName,'indicatoron'=>'on',
|
|
'relief'=>'raised','borderwidth'=>2,'highlightthickness'=>2,
|
|
'anchor'=>'c','direction'=>'flush'}
|
|
configoptions.each {|key, value|
|
|
menubutton.configure(key, value)
|
|
}
|
|
menu = TkMenu.new(menubutton) {
|
|
tearoff 'off'
|
|
add 'radio', 'label'=>firstValue, 'variable'=>varName
|
|
}
|
|
menubutton.menu(menu)
|
|
for i in rest
|
|
menu.add 'radio', 'label'=>i, 'variable'=>varName
|
|
end
|
|
|
|
return menu
|
|
end
|
|
|
|
if defined?($menubu_demo) && $menubu_demo
|
|
$menubu_demo.destroy
|
|
$menubu_demo = nil
|
|
end
|
|
|
|
$menubu_demo = TkToplevel.new {|w|
|
|
title("Menu Button Demonstration")
|
|
iconname("menubutton")
|
|
}
|
|
|
|
positionWindow($menubu_demo)
|
|
|
|
base_frame = TkFrame.new($menubu_demo).pack(:fill=>:both, :expand=>true)
|
|
|
|
# version check
|
|
if $tk_version.to_f < 8.0
|
|
|
|
# label 生成
|
|
TkLabel.new(base_frame,'font'=>$font,'wraplength'=>'4i','justify'=>'left') {
|
|
text("実行しようとしたスクリプトは Tk8.0 以上で利用できる機能を利用しているため、あなたの Ruby#{VERSION}/Tk#{$tk_version}#{(Tk::JAPANIZED_TK)? 'jp': ''} では正常に実行できません。よってデモの実行を中止しました。ただし、下のコード参照ボタンを押すことで、実行が中止されたスクリプトのソースを参照することは可能です。")
|
|
}.pack('side'=>'top')
|
|
|
|
# frame 生成
|
|
TkFrame.new(base_frame) {|frame|
|
|
TkButton.new(frame) {
|
|
#text '了解'
|
|
text '閉じる'
|
|
command proc{
|
|
tmppath = $menubu_demo
|
|
$menubu_demo = nil
|
|
tmppath.destroy
|
|
}
|
|
}.pack('side'=>'left', 'expand'=>'yes')
|
|
|
|
TkButton.new(frame) {
|
|
text 'コード参照'
|
|
command proc{showCode 'menubu'}
|
|
}.pack('side'=>'left', 'expand'=>'yes')
|
|
}.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
|
|
|
|
else ; # Tk8.x
|
|
|
|
body = TkFrame.new(base_frame)
|
|
body.pack('expand'=>'yes', 'fill'=>'both')
|
|
|
|
below = TkMenubutton.new(body) {
|
|
text "Below"
|
|
underline 0
|
|
direction 'below'
|
|
relief 'raised'
|
|
}
|
|
belowMenu = TkMenu.new(below) {
|
|
tearoff 0
|
|
add 'command', 'label'=>"Below menu: first item", 'command'=>proc {puts "\"You have selected the first item from the Below menu.\""}
|
|
add 'command', 'label'=>"Below menu: second item", 'command'=>proc {puts "\"You have selected the second item from the Below menu.\""}
|
|
}
|
|
below.menu(belowMenu)
|
|
below.grid('row'=>0, 'column'=>1, 'sticky'=>'n')
|
|
|
|
below = TkMenubutton.new(body) {
|
|
text "Below"
|
|
underline 0
|
|
direction 'below'
|
|
relief 'raised'
|
|
}
|
|
belowMenu = TkMenu.new(below) {
|
|
tearoff 0
|
|
add 'command', 'label'=>"Below menu: first item", 'command'=>proc {puts "\"You have selected the first item from the Below menu.\""}
|
|
add 'command', 'label'=>"Below menu: second item", 'command'=>proc {puts "\"You have selected the second item from the Below menu.\""}
|
|
}
|
|
below.menu(belowMenu)
|
|
below.grid('row'=>0, 'column'=>1, 'sticky'=>'n')
|
|
|
|
below = TkMenubutton.new(body) {
|
|
text "Below"
|
|
underline 0
|
|
direction 'below'
|
|
relief 'raised'
|
|
}
|
|
belowMenu = TkMenu.new(below) {
|
|
tearoff 0
|
|
add 'command', 'label'=>"Below menu: first item", 'command'=>proc {puts "\"You have selected the first item from the Below menu.\""}
|
|
add 'command', 'label'=>"Below menu: second item", 'command'=>proc {puts "\"You have selected the second item from the Below menu.\""}
|
|
}
|
|
below.menu(belowMenu)
|
|
below.grid('row'=>0, 'column'=>1, 'sticky'=>'n')
|
|
|
|
right = TkMenubutton.new(body) {
|
|
text "Right"
|
|
underline 0
|
|
direction 'right'
|
|
relief 'raised'
|
|
}
|
|
rightMenu = TkMenu.new(right) {
|
|
tearoff 0
|
|
add 'command', 'label'=>"Right menu: first item", 'command'=>proc {puts "\"You have selected the first item from the Left menu.\""}
|
|
add 'command', 'label'=>"Right menu: second item", 'command'=>proc {puts "\"You have selected the second item from the Right menu.\""}
|
|
}
|
|
right.menu(rightMenu)
|
|
right.grid('row'=>1, 'column'=>0, 'sticky'=>'w')
|
|
|
|
left = TkMenubutton.new(body) {
|
|
text "Left"
|
|
underline 0
|
|
direction 'left'
|
|
relief 'raised'
|
|
}
|
|
leftMenu = TkMenu.new(left) {
|
|
tearoff 0
|
|
add 'command', 'label'=>"Left menu: first item", 'command'=>proc {puts "\"You have selected the first item from the Left menu.\""}
|
|
add 'command', 'label'=>"Left menu: second item", 'command'=>proc {puts "\"You have selected the second item from the Left menu.\""}
|
|
}
|
|
left.menu(leftMenu)
|
|
left.grid('row'=>1, 'column'=>2, 'sticky'=>'e')
|
|
|
|
center = TkFrame.new(body) {
|
|
grid('row'=>1, 'column'=>1, 'sticky'=>'news')
|
|
}
|
|
|
|
above = TkMenubutton.new(body) {
|
|
text "Above"
|
|
underline 0
|
|
direction 'above'
|
|
relief 'raised'
|
|
}
|
|
aboveMenu = TkMenu.new(above) {
|
|
tearoff 0
|
|
add 'command', 'label'=>"Above menu: first item", 'command'=>proc {puts "\"You have selected the first item from the Above menu.\""}
|
|
add 'command', 'label'=>"Above menu: second item", 'command'=>proc {puts "\"You have selected the second item from the Above menu.\""}
|
|
}
|
|
above.menu(aboveMenu)
|
|
above.grid('row'=>2, 'column'=>1, 'sticky'=>'s')
|
|
|
|
center = TkFrame.new(body) {
|
|
grid('row'=>1, 'column'=>1, 'sticky'=>'news')
|
|
}
|
|
|
|
TkFrame.new(base_frame) {|frame|
|
|
TkButton.new(frame) {
|
|
#text '了解'
|
|
text '閉じる'
|
|
command proc {
|
|
tmppath = $menubu_demo
|
|
$menubu_demo = nil
|
|
tmppath.destroy
|
|
}
|
|
}.pack('side'=>'left', 'expand'=>'yes')
|
|
|
|
TkButton.new(frame) {
|
|
text 'コード参照'
|
|
command proc { showCode 'menubu' }
|
|
}.pack('side'=>'left', 'expand'=>'yes')
|
|
}.pack('side'=>'bottom', 'expand'=>'yes', 'fill'=>'x', 'pady'=>'2m')
|
|
|
|
msg = TkLabel.new(center) {
|
|
# font $font
|
|
wraplength '4i'
|
|
justify 'left'
|
|
text "これはメニューボタンのデモです。\"Below\"のボタンは\
|
|
下にメニューを出し、\"Right\"のボタンは右にメニューを出して、\
|
|
……となります。この文章の下には2つのオプションメニューがあります。\
|
|
1つは普通のメニューで、もう1つは16色のパレットです。"
|
|
}
|
|
msg.pack('side'=>'top', 'padx'=>25, 'pady'=>25)
|
|
|
|
TkFrame.new(center) {|f|
|
|
menubuttonoptions = TkVariable.new
|
|
mbutton = TkMenubutton.new(f)
|
|
options = optionMenu(mbutton, menubuttonoptions,
|
|
'one', 'two', 'three')
|
|
mbutton.pack('side'=>'left', 'padx'=>25, 'pady'=>25)
|
|
paletteColor = TkVariable.new
|
|
colors = ['Black','red4','DarkGreen','NavyBlue', 'gray75',
|
|
'Red','Green','Blue','gray50','Yellow','Cyan','Magenta',
|
|
'White','Brown','DarkSeaGreen','DarkViolet']
|
|
colorMenuButton = TkMenubutton.new(f)
|
|
m = optionMenu(colorMenuButton, paletteColor, *colors)
|
|
begin
|
|
windowingsystem = Tk.windowingsystem()
|
|
rescue
|
|
windowingsystem = ""
|
|
end
|
|
if windowingsystem == "classic" || windowingsystem == "aqua"
|
|
topBorderColor = 'Black'
|
|
bottomBorderColor = 'Black'
|
|
else
|
|
topBorderColor = 'gray50'
|
|
bottomBorderColor = 'gray75'
|
|
end
|
|
for i in 0..15
|
|
image = TkPhotoImage.new('height'=>16, 'width'=>16)
|
|
image.put(topBorderColor, 0, 0, 16, 1)
|
|
image.put(topBorderColor, 0, 1, 1, 16)
|
|
image.put(bottomBorderColor, 0, 15, 16, 16)
|
|
image.put(bottomBorderColor, 15, 1, 16, 16)
|
|
image.put(colors[i], 1, 1, 15, 15)
|
|
|
|
selectimage = TkPhotoImage.new('height'=>16, 'width'=>16)
|
|
selectimage.put('Black', 0, 0, 16, 2)
|
|
selectimage.put('Black', 0, 2, 2, 16)
|
|
selectimage.put('Black', 2, 14, 16, 16)
|
|
selectimage.put('Black', 14, 2, 16, 14)
|
|
selectimage.put(colors[i], 2, 2, 14, 14)
|
|
|
|
m.entryconfigure(i, 'image'=>image, 'selectimage'=>selectimage, 'hidemargin'=>'on')
|
|
end
|
|
m.configure('tearoff', 'on')
|
|
for c in ['Black', 'gray75', 'gray50', 'White']
|
|
m.entryconfigure(c, 'columnbreak'=>1)
|
|
end
|
|
colorMenuButton.pack('side'=>'left', 'padx'=>25, 'pady'=>25)
|
|
pack 'padx'=>25, 'pady'=>25
|
|
}
|
|
|
|
end ; # Tk8.x
|