mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
* ext/tk/*: full update Ruby/Tk to support Ruby(1.9|1.8) and Tc/Tk8.5.
* 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
This commit is contained in:
parent
b62af05a98
commit
3024ffdc3a
121 changed files with 7879 additions and 2218 deletions
|
@ -20,6 +20,12 @@ def version?(ver)
|
|||
TkPackage.vcompare(Tk::Tile.package_version, ver) >= 0
|
||||
end
|
||||
|
||||
# define Tcl/Tk procedures for compatibility
|
||||
Tk::Tile.__define_LoadImages_proc_for_compatibility__!
|
||||
Tk::Tile::Style.__define_wrapper_proc_for_compatibility__!
|
||||
|
||||
Tk::Tile::Style.theme_create('step')
|
||||
|
||||
Tk.load_tclscript(File.join(demodir, 'toolbutton.tcl'))
|
||||
Tk.load_tclscript(File.join(demodir, 'repeater.tcl'))
|
||||
|
||||
|
@ -55,7 +61,7 @@ $V = TkVariable.new_hash(:THEME => 'default',
|
|||
:CHOICE => 2)
|
||||
|
||||
# Add in any available loadable themes.
|
||||
TkPackage.names.find_all{|n| n =~ /^tile::theme::/}.each{|pkg|
|
||||
TkPackage.names.find_all{|n| n =~ /^(tile|ttk)::theme::/}.each{|pkg|
|
||||
name = pkg.split('::')[-1]
|
||||
unless $THEMELIST.assoc(name)
|
||||
$THEMELIST << [name, Tk.tk_call('string', 'totitle', name)]
|
||||
|
@ -66,7 +72,8 @@ TkPackage.names.find_all{|n| n =~ /^tile::theme::/}.each{|pkg|
|
|||
$RUBY_THEMELIST = []
|
||||
begin
|
||||
load(File.join(demodir, 'themes', 'kroc.rb'), true)
|
||||
rescue
|
||||
rescue => e
|
||||
raise e
|
||||
$RUBY_THEMELIST << ['kroc-rb', 'Kroc (by Ruby)', false]
|
||||
else
|
||||
$RUBY_THEMELIST << ['kroc-rb', 'Kroc (by Ruby)', true]
|
||||
|
@ -79,8 +86,8 @@ def makeThemeControl(parent)
|
|||
:variable=>$V.ref(:THEME),
|
||||
:command=>proc{setTheme(theme)})
|
||||
b.grid(:sticky=>:ew)
|
||||
unless (TkPackage.names.find{|n| n == "tile::theme::#{theme}"})
|
||||
b.state(:disabled)
|
||||
unless (TkPackage.names.find{|n| n =~ /(tile|ttk)::theme::#{theme}/})
|
||||
b.ttk_state(:disabled)
|
||||
end
|
||||
}
|
||||
$RUBY_THEMELIST.each{|theme, name, available|
|
||||
|
@ -88,7 +95,7 @@ def makeThemeControl(parent)
|
|||
:variable=>$V.ref(:THEME),
|
||||
:command=>proc{setTheme(theme)})
|
||||
b.grid(:sticky=>:ew)
|
||||
b.state(:disabled) unless available
|
||||
b.ttk_state(:disabled) unless available
|
||||
}
|
||||
c
|
||||
end
|
||||
|
@ -98,7 +105,7 @@ def makeThemeMenu(parent)
|
|||
$THEMELIST.each{|theme, name|
|
||||
m.add(:radiobutton, :label=>name, :variable=>$V.ref(:THEME),
|
||||
:value=>theme, :command=>proc{setTheme(theme)})
|
||||
unless (TkPackage.names.find{|n| n == "tile::theme::#{theme}"})
|
||||
unless (TkPackage.names.find{|n| n =~ /(tile|ttk)::theme::#{theme}/})
|
||||
m.entryconfigure(:end, :state=>:disabled)
|
||||
end
|
||||
}
|
||||
|
@ -111,8 +118,10 @@ def makeThemeMenu(parent)
|
|||
end
|
||||
|
||||
def setTheme(theme)
|
||||
if (TkPackage.names.find{|n| n == "tile::theme::#{theme}"})
|
||||
TkPackage.require("tile::theme::#{theme}")
|
||||
if (pkg = TkPackage.names.find{|n| n =~ /(tile|ttk)::theme::#{theme}/})
|
||||
unless Tk::Tile::Style.theme_names.find{|n| n == theme}
|
||||
TkPackage.require(pkg)
|
||||
end
|
||||
end
|
||||
Tk::Tile::Style.theme_use(theme)
|
||||
end
|
||||
|
@ -675,7 +684,7 @@ values = %w(list abc def ghi jkl mno pqr stu vwx yz)
|
|||
combo, :values=>values, :textvariable=>$V.ref(:COMBO))
|
||||
cb.pack(:side=>:top, :padx=>2, :pady=>2, :expand=>false, :fill=>:x)
|
||||
if i == 1
|
||||
cb.state :readonly
|
||||
cb.ttk_state :readonly
|
||||
begin
|
||||
cb.current = 3 # ignore if unsupported (tile0.4)
|
||||
rescue
|
||||
|
@ -922,11 +931,11 @@ end
|
|||
def updateStates
|
||||
$states_list.each{|st|
|
||||
begin
|
||||
$State[st] = $Widget.window.instate(st)
|
||||
$State[st] = $Widget.window.ttk_instate(st)
|
||||
rescue
|
||||
$states_btns[st].state('disabled')
|
||||
$states_btns[st].ttk_state('disabled')
|
||||
else
|
||||
$states_btns[st].state('!disabled')
|
||||
$states_btns[st].ttk_state('!disabled')
|
||||
end
|
||||
}
|
||||
end
|
||||
|
@ -934,9 +943,9 @@ end
|
|||
def changeState(st)
|
||||
if $Widget.value != ''
|
||||
if $State.bool_element(st)
|
||||
$Widget.window.state(st)
|
||||
$Widget.window.ttk_state(st)
|
||||
else
|
||||
$Widget.window.state("!#{st}")
|
||||
$Widget.window.ttk_state("!#{st}")
|
||||
end
|
||||
end
|
||||
end
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue