mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
3024ffdc3a
* 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/trunk@15848 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
175 lines
3.5 KiB
Ruby
175 lines
3.5 KiB
Ruby
#
|
|
# tkextlib/bwidget/dialog.rb
|
|
# by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
|
|
#
|
|
|
|
require 'tk'
|
|
require 'tk/frame'
|
|
require 'tkextlib/bwidget.rb'
|
|
require 'tkextlib/bwidget/buttonbox'
|
|
|
|
module Tk
|
|
module BWidget
|
|
class Dialog < TkWindow
|
|
end
|
|
end
|
|
end
|
|
|
|
class Tk::BWidget::Dialog
|
|
TkCommandNames = ['Dialog'.freeze].freeze
|
|
WidgetClassName = 'Dialog'.freeze
|
|
WidgetClassNames[WidgetClassName] = self
|
|
|
|
include TkItemConfigMethod
|
|
|
|
def __strval_optkeys
|
|
super() << 'title'
|
|
end
|
|
private :__strval_optkeys
|
|
|
|
def __boolval_optkeys
|
|
super() << 'transient' << 'homogeneous'
|
|
end
|
|
private :__boolval_optkeys
|
|
|
|
def initialize(parent=nil, keys=nil)
|
|
@relative = ''
|
|
if parent.kind_of?(Hash)
|
|
keys = _symbolkey2str(parent)
|
|
@relative = keys['parent'] if keys.key?('parent')
|
|
@relative = keys.delete('relative') if keys.key?('relative')
|
|
super(keys)
|
|
elsif keys
|
|
keys = _symbolkey2str(keys)
|
|
@relative = keys.delete('parent') if keys.key?('parent')
|
|
@relative = keys.delete('relative') if keys.key?('relative')
|
|
super(parent, keys)
|
|
else
|
|
super(parent)
|
|
end
|
|
end
|
|
|
|
def create_self(keys)
|
|
cmd = self.class::TkCommandNames[0]
|
|
if keys and keys != None
|
|
tk_call_without_enc(cmd, @path, '-parent', @relative,
|
|
*hash_kv(keys, true))
|
|
else
|
|
tk_call_without_enc(cmd, @path, '-parent', @relative)
|
|
end
|
|
end
|
|
|
|
def cget(slot)
|
|
if slot.to_s == 'relative'
|
|
super('parent')
|
|
else
|
|
super(slot)
|
|
end
|
|
end
|
|
|
|
def configure(slot, value=None)
|
|
if slot.kind_of?(Hash)
|
|
slot = _symbolkey2str(slot)
|
|
slot['parent'] = slot.delete('relative') if slot.key?('relative')
|
|
super(slot)
|
|
else
|
|
if slot.to_s == 'relative'
|
|
super('parent', value)
|
|
else
|
|
super(slot, value)
|
|
end
|
|
end
|
|
end
|
|
|
|
def configinfo(slot=nil)
|
|
if slot
|
|
if slot.to_s == 'relative'
|
|
super('parent')
|
|
else
|
|
super(slot)
|
|
end
|
|
else
|
|
ret = super()
|
|
if TkComm::GET_CONFIGINFO_AS_ARRAY
|
|
ret << ['relative', 'parent']
|
|
else
|
|
ret['relative'] = 'parent'
|
|
end
|
|
end
|
|
end
|
|
|
|
def tagid(tagOrId)
|
|
if tagOrId.kind_of?(Tk::BWidget::Button)
|
|
name = tagOrId[:name]
|
|
return index(name) unless name.empty?
|
|
end
|
|
if tagOrId.kind_of?(Tk::Button)
|
|
return index(tagOrId[:text])
|
|
end
|
|
# index(tagOrId.to_s)
|
|
index(_get_eval_string(tagOrId))
|
|
end
|
|
|
|
def add(keys={}, &b)
|
|
win = window(tk_send('add', *hash_kv(keys)))
|
|
if b
|
|
if TkCore::WITH_RUBY_VM ### Ruby 1.9 !!!!
|
|
win.instance_exec(self, &b)
|
|
else
|
|
win.instance_eval(&b)
|
|
end
|
|
end
|
|
win
|
|
end
|
|
|
|
def get_frame(&b)
|
|
win = window(tk_send('getframe'))
|
|
if b
|
|
if TkCore::WITH_RUBY_VM ### Ruby 1.9 !!!!
|
|
win.instance_exec(self, &b)
|
|
else
|
|
win.instance_eval(&b)
|
|
end
|
|
end
|
|
win
|
|
end
|
|
|
|
def get_buttonbox(&b)
|
|
win = window(@path + '.bbox')
|
|
if b
|
|
if TkCore::WITH_RUBY_VM ### Ruby 1.9 !!!!
|
|
win.instance_exec(self, &b)
|
|
else
|
|
win.instance_eval(&b)
|
|
end
|
|
end
|
|
win
|
|
end
|
|
|
|
def draw(focus_win=None)
|
|
tk_send('draw', focus_win)
|
|
end
|
|
|
|
def enddialog(ret)
|
|
tk_send('enddialog', ret)
|
|
end
|
|
|
|
def index(idx)
|
|
get_buttonbox.index(idx)
|
|
end
|
|
|
|
def invoke(idx)
|
|
tk_send('invoke', tagid(idx))
|
|
self
|
|
end
|
|
|
|
def set_focus(idx)
|
|
tk_send('setfocus', tagid(idx))
|
|
self
|
|
end
|
|
|
|
def withdraw
|
|
tk_send('withdraw')
|
|
self
|
|
end
|
|
end
|