diff options
Diffstat (limited to 'ext/tk/sample/tkextlib/tile')
| -rw-r--r-- | ext/tk/sample/tkextlib/tile/demo.rb | 37 | ||||
| -rw-r--r-- | ext/tk/sample/tkextlib/tile/themes/blue/pkgIndex.tcl | 2 | ||||
| -rw-r--r-- | ext/tk/sample/tkextlib/tile/themes/kroc.rb | 30 |
3 files changed, 52 insertions, 17 deletions
diff --git a/ext/tk/sample/tkextlib/tile/demo.rb b/ext/tk/sample/tkextlib/tile/demo.rb index b604410da4..1a9c029701 100644 --- a/ext/tk/sample/tkextlib/tile/demo.rb +++ b/ext/tk/sample/tkextlib/tile/demo.rb @@ -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 diff --git a/ext/tk/sample/tkextlib/tile/themes/blue/pkgIndex.tcl b/ext/tk/sample/tkextlib/tile/themes/blue/pkgIndex.tcl index 19ddda7c73..4facac70d8 100644 --- a/ext/tk/sample/tkextlib/tile/themes/blue/pkgIndex.tcl +++ b/ext/tk/sample/tkextlib/tile/themes/blue/pkgIndex.tcl @@ -1,6 +1,6 @@ # Package index for tile demo pixmap themes. if {[file isdirectory [file join $dir blue]]} { - package ifneeded tile::theme::blue 0.0.1 \ + package ifneeded tile::theme::blue 0.7 \ [list source [file join $dir blue.tcl]] } diff --git a/ext/tk/sample/tkextlib/tile/themes/kroc.rb b/ext/tk/sample/tkextlib/tile/themes/kroc.rb index f67ce7a897..27006d847f 100644 --- a/ext/tk/sample/tkextlib/tile/themes/kroc.rb +++ b/ext/tk/sample/tkextlib/tile/themes/kroc.rb @@ -95,8 +95,35 @@ def kroc_rb_settings # # Elements: # - if TkPackage.vcompare(Tk::Tile.package_version, '0.5') >= 0 + if Tk::Tile::TILE_SPEC_VERSION_ID >= 8 + Tk::Tile::Style.element_create('Button.button', + :image, + [ $images['button-n'], + :pressed, $images['button-p'], + :active, $images['button-h'], + ], :border=>3, :sticky=>:ew) + + Tk::Tile::Style.element_create('Checkbutton.indicator', + :image, + [ $images['check-nu'], + [:pressed, :selected],$images['check-nc'], + :pressed, $images['check-nu'], + [:active, :selected], $images['check-hc'], + :active, $images['check-hu'], + :selected, $images['check-nc'], + ], :sticky=>:w) + Tk::Tile::Style.element_create('Radiobutton.indicator', + :image, + [ $images['radio-nu'], + [:pressed,:selected],$images['radio-nc'], + :pressed, $images['radio-nu'], + [:active,:selected], $images['radio-hc'], + :active, $images['radio-hu'], + :selected, $images['radio-nc'], + ], :sticky=>:w) + + elsif TkPackage.vcompare(Tk::Tile.package_version, '0.5') >= 0 Tk::Tile::Style.element_create('Button.button', :image, $images['button-n'], :map=>[ @@ -125,7 +152,6 @@ def kroc_rb_settings ], :sticky=>:w) else # tile 0.4 or earlier - Tk::Tile::Style.element_create('Button.button', :pixmap, :images=>[ :pressed, $images['button-p'], |