mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
* ext/tk/sample/demos-jp/widget, ext/tk/sample/demos-en/widget: fail
to rerun 'showCode' when a 'code' window exists. * ext/tk/sample/demos-en/toolbar.rb, ext/tk/sample/demos-en/ttkprogress.rb: fail to show UTF-8 chars. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@16701 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nagai
parent
fd6066f4ce
commit
fd98eab86a
4 changed files with 45 additions and 42 deletions
|
|
@ -18,11 +18,12 @@ $toolbar_demo = TkToplevel.new {|w|
|
|||
base_frame = Ttk::Frame.new($toolbar_demo).pack(:fill=>:both, :expand=>true)
|
||||
|
||||
if Tk.windowingsystem != 'aqua'
|
||||
msg = Ttk::Label.new(base_frame, :wraplength=>'4i', :text=><<EOL)
|
||||
msg = Ttk::Label.new(base_frame, :wraplength=>'4i',
|
||||
:text=>Tk::UTF8_String.new(<<EOL))
|
||||
This is a demonstration of how to do \
|
||||
a toolbar that is styled correctly \
|
||||
and which can be torn off (this feature reqrires Tcl/Tk8.5). \
|
||||
The buttons are configured to be \u201Ctoolbar style\u201D buttons by \
|
||||
The buttons are configured to be \\u201Ctoolbar style\\u201D buttons by \
|
||||
telling them that they are to use the Toolbutton style. At the left \
|
||||
end of the toolbar is a simple marker that the cursor changes to a \
|
||||
movement icon over; drag that away from the toolbar to tear off the \
|
||||
|
|
@ -31,10 +32,11 @@ toolbar is no longer needed, just close it like any normal toplevel \
|
|||
and it will reattach to the window it was torn off from.
|
||||
EOL
|
||||
else
|
||||
msg = Ttk::Label.new(base_frame, :wraplength=>'4i', :text=><<EOL)
|
||||
msg = Ttk::Label.new(base_frame, :wraplength=>'4i',
|
||||
:text=>Tk::UTF8_String.new(<<EOL))
|
||||
This is a demonstration of how to do \
|
||||
a toolbar that is styled correctly. The buttons are configured to \
|
||||
be \u201Ctoolbar style\u201D buttons by telling them that they are \
|
||||
be \\u201Ctoolbar style\\u201D buttons by telling them that they are \
|
||||
to use the Toolbutton style.
|
||||
EOL
|
||||
end
|
||||
|
|
|
|||
|
|
@ -18,11 +18,11 @@ $ttkprogress_demo = TkToplevel.new {|w|
|
|||
base_frame = TkFrame.new($ttkprogress_demo).pack(:fill=>:both, :expand=>true)
|
||||
|
||||
Ttk::Label.new(base_frame, :font=>$font, :wraplength=>'4i', :justify=>:left,
|
||||
:text=><<EOL).pack(:side=>:top, :fill=>:x)
|
||||
:text=>Tk::UTF8_String.new(<<EOL)).pack(:side=>:top, :fill=>:x)
|
||||
Below are two progress bars. \
|
||||
The top one is a \u201Cdeterminate\u201D progress bar, \
|
||||
The top one is a \\u201Cdeterminate\\u201D progress bar, \
|
||||
which is used for showing how far through a defined task the program has got. \
|
||||
The bottom one is an \u201Cindeterminate\u201D progress bar, \
|
||||
The bottom one is an \\u201Cindeterminate\\u201D progress bar, \
|
||||
which is used to show that the program is busy \
|
||||
but does not know how long for. Both are run here in self-animated mode, \
|
||||
which can be turned on and off using the buttons underneath.
|
||||
|
|
|
|||
|
|
@ -775,6 +775,12 @@ def showCode1(demo)
|
|||
TkLabel.new(f,'text'=>' pos:').pack('side'=>'left')
|
||||
posnum =TkLabel.new(f,'text'=>'').pack('side'=>'left')
|
||||
|
||||
$set_linenum = proc{|w|
|
||||
line, pos = w.index('insert').split('.')
|
||||
linenum.text = line
|
||||
posnum.text = pos
|
||||
}
|
||||
|
||||
f.pack('side'=>'bottom', 'expand'=>'true', 'fill'=>'x')
|
||||
|
||||
if $tk_version =~ /^4\.[01]/
|
||||
|
|
@ -837,20 +843,15 @@ def showCode1(demo)
|
|||
|
||||
btag = TkBindTag.new
|
||||
|
||||
set_linenum = proc{|w|
|
||||
line, pos = w.index('insert').split('.')
|
||||
linenum.text = line
|
||||
posnum.text = pos
|
||||
}
|
||||
|
||||
btag.bind('Key', set_linenum, '%W')
|
||||
btag.bind('Button', set_linenum, '%W')
|
||||
btag.bind('Key', $set_linenum, '%W')
|
||||
btag.bind('Button', $set_linenum, '%W')
|
||||
|
||||
btags = $code_text.bindtags
|
||||
btags.insert(btags.index($code_text.class) + 1, btag)
|
||||
$code_text.bindtags = btags
|
||||
|
||||
set_linenum.call($code_text)
|
||||
$set_linenum.call($code_text)
|
||||
|
||||
fid.close
|
||||
end
|
||||
|
|
@ -879,6 +880,12 @@ def showCode2(demo)
|
|||
TkLabel.new(lf, :text=>' pos:').pack(:side=>:left)
|
||||
posnum =TkLabel.new(lf, :text=>'').pack(:side=>:left)
|
||||
|
||||
$set_linenum = proc{|w|
|
||||
line, pos = w.index('insert').split('.')
|
||||
linenum.text = line
|
||||
posnum.text = pos
|
||||
}
|
||||
|
||||
b_dis = TkButton.new(bf, :text=>'Dismiss', :default=>:active,
|
||||
:command=>proc{
|
||||
$code_window.destroy
|
||||
|
|
@ -923,20 +930,14 @@ def showCode2(demo)
|
|||
|
||||
btag = TkBindTag.new
|
||||
|
||||
set_linenum = proc{|w|
|
||||
line, pos = w.index('insert').split('.')
|
||||
linenum.text = line
|
||||
posnum.text = pos
|
||||
}
|
||||
|
||||
btag.bind('Key', set_linenum, '%W')
|
||||
btag.bind('Button', set_linenum, '%W')
|
||||
btag.bind('Key', $set_linenum, '%W')
|
||||
btag.bind('Button', $set_linenum, '%W')
|
||||
|
||||
btags = $code_text.bindtags
|
||||
btags.insert(btags.index($code_text.class) + 1, btag)
|
||||
$code_text.bindtags = btags
|
||||
|
||||
set_linenum.call($code_text)
|
||||
$set_linenum.call($code_text)
|
||||
|
||||
fid.close
|
||||
end
|
||||
|
|
|
|||
|
|
@ -814,6 +814,12 @@ def showCode1(demo)
|
|||
TkLabel.new(f,'text'=>' pos:').pack('side'=>'left')
|
||||
posnum =TkLabel.new(f,'text'=>'').pack('side'=>'left')
|
||||
|
||||
$set_linenum = proc{|w|
|
||||
line, pos = w.index('insert').split('.')
|
||||
linenum.text = line
|
||||
posnum.text = pos
|
||||
}
|
||||
|
||||
f.pack('side'=>'bottom', 'expand'=>'true', 'fill'=>'x')
|
||||
|
||||
if $tk_version =~ /^4\.[01]/
|
||||
|
|
@ -875,20 +881,14 @@ def showCode1(demo)
|
|||
|
||||
btag = TkBindTag.new
|
||||
|
||||
set_linenum = proc{|w|
|
||||
line, pos = w.index('insert').split('.')
|
||||
linenum.text = line
|
||||
posnum.text = pos
|
||||
}
|
||||
|
||||
btag.bind('Key', set_linenum, '%W')
|
||||
btag.bind('Button', set_linenum, '%W')
|
||||
btag.bind('Key', $set_linenum, '%W')
|
||||
btag.bind('Button', $set_linenum, '%W')
|
||||
|
||||
btags = $code_text.bindtags
|
||||
btags.insert(btags.index($code_text.class) + 1, btag)
|
||||
$code_text.bindtags = btags
|
||||
|
||||
set_linenum.call($code_text)
|
||||
$set_linenum.call($code_text)
|
||||
|
||||
fid.close
|
||||
end
|
||||
|
|
@ -917,6 +917,12 @@ def showCode2(demo)
|
|||
TkLabel.new(lf, :text=>' pos:').pack(:side=>:left)
|
||||
posnum =TkLabel.new(lf, :text=>'').pack(:side=>:left)
|
||||
|
||||
$set_linenum = proc{|w|
|
||||
line, pos = w.index('insert').split('.')
|
||||
linenum.text = line
|
||||
posnum.text = pos
|
||||
}
|
||||
|
||||
#b_dis = TkButton.new(bf, :text=>'λ²ò', :default=>:active,
|
||||
b_dis = TkButton.new(bf, :text=>'ÊĤ¸¤ë', :default=>:active,
|
||||
:command=>proc{
|
||||
|
|
@ -962,20 +968,14 @@ def showCode2(demo)
|
|||
|
||||
btag = TkBindTag.new
|
||||
|
||||
set_linenum = proc{|w|
|
||||
line, pos = w.index('insert').split('.')
|
||||
linenum.text = line
|
||||
posnum.text = pos
|
||||
}
|
||||
|
||||
btag.bind('Key', set_linenum, '%W')
|
||||
btag.bind('Button', set_linenum, '%W')
|
||||
btag.bind('Key', $set_linenum, '%W')
|
||||
btag.bind('Button', $set_linenum, '%W')
|
||||
|
||||
btags = $code_text.bindtags
|
||||
btags.insert(btags.index($code_text.class) + 1, btag)
|
||||
$code_text.bindtags = btags
|
||||
|
||||
set_linenum.call($code_text)
|
||||
$set_linenum.call($code_text)
|
||||
|
||||
fid.close
|
||||
end
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue