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.4 KiB
Ruby
117 lines
2.4 KiB
Ruby
#
|
|
# tnotebook widget
|
|
# by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
|
|
#
|
|
require 'tk'
|
|
require 'tkextlib/tile.rb'
|
|
|
|
module Tk
|
|
module Tile
|
|
class TNotebook < TkWindow
|
|
end
|
|
Notebook = TNotebook
|
|
end
|
|
end
|
|
|
|
Tk.__set_toplevel_aliases__(:Ttk, Tk::Tile::Notebook, :TkNotebook)
|
|
|
|
|
|
class Tk::Tile::TNotebook < TkWindow
|
|
################################
|
|
include TkItemConfigMethod
|
|
|
|
def __item_cget_cmd(id)
|
|
[self.path, 'tab', id]
|
|
end
|
|
private :__item_cget_cmd
|
|
|
|
def __item_config_cmd(id)
|
|
[self.path, 'tab', id]
|
|
end
|
|
private :__item_config_cmd
|
|
|
|
def __item_listval_optkeys(id)
|
|
[]
|
|
end
|
|
private :__item_listval_optkeys
|
|
|
|
def __item_methodcall_optkeys(id) # { key=>method, ... }
|
|
{}
|
|
end
|
|
private :__item_methodcall_optkeys
|
|
|
|
#alias tabcget itemcget
|
|
alias tabconfigure itemconfigure
|
|
alias tabconfiginfo itemconfiginfo
|
|
alias current_tabconfiginfo current_itemconfiginfo
|
|
|
|
def tabcget(tagOrId, option)
|
|
tabconfigure(tagOrId, option)[-1]
|
|
end
|
|
################################
|
|
|
|
include Tk::Tile::TileWidget
|
|
|
|
if Tk::Tile::USE_TTK_NAMESPACE
|
|
TkCommandNames = ['::ttk::notebook'.freeze].freeze
|
|
else
|
|
TkCommandNames = ['::tnotebook'.freeze].freeze
|
|
end
|
|
WidgetClassName = 'TNotebook'.freeze
|
|
WidgetClassNames[WidgetClassName] = self
|
|
|
|
def self.style(*args)
|
|
[self::WidgetClassName, *(args.map!{|a| _get_eval_string(a)})].join('.')
|
|
end
|
|
|
|
def enable_traversal()
|
|
if Tk::Tile::TILE_SPEC_VERSION_ID < 5
|
|
tk_call_without_enc('::tile::enableNotebookTraversal', @path)
|
|
elsif Tk::Tile::TILE_SPEC_VERSION_ID < 7
|
|
tk_call_without_enc('::tile::notebook::enableTraversal', @path)
|
|
else
|
|
tk_call_without_enc('::ttk::notebook::enableTraversal', @path)
|
|
end
|
|
self
|
|
end
|
|
|
|
def add(child, keys=nil)
|
|
if keys && keys != None
|
|
tk_send_without_enc('add', _epath(child), *hash_kv(keys))
|
|
else
|
|
tk_send_without_enc('add', _epath(child))
|
|
end
|
|
self
|
|
end
|
|
|
|
def forget(idx)
|
|
tk_send('forget', idx)
|
|
self
|
|
end
|
|
|
|
def index(idx)
|
|
number(tk_send('index', idx))
|
|
end
|
|
|
|
def insert(idx, subwin, keys=nil)
|
|
if keys && keys != None
|
|
tk_send('insert', idx, subwin, *hash_kv(keys))
|
|
else
|
|
tk_send('insert', idx, subwin)
|
|
end
|
|
self
|
|
end
|
|
|
|
def select(idx)
|
|
tk_send('select', idx)
|
|
self
|
|
end
|
|
|
|
def selected
|
|
window(tk_send_without_enc('select'))
|
|
end
|
|
|
|
def tabs
|
|
list(tk_send('tabs'))
|
|
end
|
|
end
|