mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
e6697a6405
* ext/tk/tcltklib.c: avoid error on a shared object. * ext/tk/extconf.rb: support --with-tcltkversion * ext/tk/README.tcltklib: add document about --with-tcltkversion * ext/tk/lib/tk.rb, ext/tk/lib/multi-tk.rb, ext/tk/lib/remote-tk.rb: not work on $SAFE==4 * ext/tk/lib/multi-tk.rb: Object#methods returns Symbols on Ruby1.9. * ext/tk/lib/tk/timer.rb: add TkTimer#at_end(proc) to register the procedure which called at end of the timer. * ext/tk/lib/tk.rb, ext/tk/lib/tk/itemfont.rb, ext/tk/lib/font.rb: support __IGNORE_UNKNOWN_CONFIGURE_OPTION__ about font options. * ext/tk/lib/*: treat __IGNORE_UNKNOWN_CONFIGURE_OPTION__ * ext/tk/lib/tkextlib/iwidgets/scrolledcanvas.rb, ext/tk/lib/tkextlib/iwidgets/scrolledlistbox.rb, ext/tk/lib/tkextlib/iwidgets/scrolledtext.rb: bug fix. * ext/tk/lib/tk/text.rb: typo. call a wrong method. * ext/tk/lib/tk/itemconfig.rb: ditto. * ext/tk/lib/tk.rb, ext/tk/lib/tk/itemconfig.rb, ext/tk/lib/tk/canvas.rb: support alias names of option keys. * ext/tk/lib/tk/grid.rb: lack of module-method definitions. * ext/tk/lib/tk/pack.rb, ext/tk/lib/tk/grid.rb: increase supported parameter patterns of configure method. * ext/tk/lib/tk.rb: add TkWindow#grid_anchor, grid_column, grid_row. * ext/tk/lib/tk/wm.rb: methods of Tk::Wm_for_General module cannot pass the given block to methods of Tk::Wm module. * ext/tk/lib/tk/wm.rb: Wm#overrideredirect overwrites arguemnt to an invalid value. * ext/tk/lib/tk.rb: fix memory (object) leak bug. * ext/tk/tcltklib.c, ext/tk/tkutil/tkutil.c: fix memory leak. * ext/tk/sample/demos-jp/aniwave.rb, ext/tk/sample/demos-en/aniwave.rb: bug fix. * ext/tk/lib/tkextlib/blt/component.rb, ext/tk/lib/tkextlib/tile/tentry.rb, ext/tk/lib/tkextlib/tile/treeview.rb: ditto. * ext/tk/lib/tkextlib/tile/tpaned.rb: improve TPaned#add. * ext/tk/sample/demos-jp/widget, ext/tk/sample/demos-en/widget, ext/tk/sample/demos-jp/style.rb, ext/tk/sample/demos-en/style.rb, ext/tk/sample/demos-jp/bind.rb, ext/tk/sample/demos-en/bind.rb: bug fix. * ext/tk/sample/ttk_wrapper.rb: ditto. * ext/tk/sample/ttk_wrapper.rb: support "if __FILE__ == $0" idiom. * ext/tk/sample/tktextio.rb: add binding for 'Ctrl-u' at console mode. * ext/tk/lib/tkextlib/tile.rb, ext/tk/lib/tkextlib/tile/style.rb, ext/tk/sample/ttk_wrapper.rb: improve treating and control themes. add Tk::Tile.themes and Tk::Tile.set_theme(theme). * ext/tk/lib/tkextlib/tile.rb: lack of autoload definitions. * ext/tk/lib/tkextlib/tile/tnotebook.rb: cannot use kanji (not UTF-8) characters for headings. * ext/tk/lib/tkextlib/tkDND/shape.rb: wrong package name. * ext/tk/tkutil/tkutil.c: improve handling callback-subst-keys. Now, support longnam-keys (e.g. '%CTT' on tkdnd-2.0; however, still not support tkdnd-2.0 on tkextlib), and symbols of parameters (e.g. :widget=>'%W', :keycode=>'%k', '%x'=>:x, '%X'=>:root_x, and so on; those are attributes of event object). It means that Ruby/Tk accepts not only "widget.bind(ev, '%W', '%k', ...){|w, k, ...| ... }", but also "widget.bind(ev, :widget, :keycode, ...){|w, k, ...| ... }". It is potentially incompatible, when user passes symbols to the arguments of the callback block (the block receives the symbols as strings). I think that is very rare case (probably, used by Ruby/Tk experts only). When causes such trouble, please give strings instead of such symbol parameters (e.g. call Symbol#to_s method). * ext/tk/lib/tk/event.rb, ext/tk/lib/tk/validation.rb, ext/tk/lib/tkextlib/blt/treeview.rb, ext/tk/lib/tkextlib/winico/winico.rb: ditto. * ext/tk/tkutil/tkutil.c: strings are available on subst_tables on TkUtil::CallbackSubst class (it is useful on Ruby 1.9). * ext/tk/lib/tk/spinbox.rb, ext/tk/lib/tkextlib/iwidgets/hierarchy.rb, ext/tk/lib/tkextlib/iwidgets/spinner.rb, ext/tk/lib/tkextlib/iwidgets/entryfield.rb, ext/tk/lib/tkextlib/iwidgets/calendar.rb, ext/tk/lib/tkextlib/blt/dragdrop.rb, ext/tk/lib/tkextlib/tkDND/tkdnd.rb, ext/tk/lib/tkextlib/treectrl/tktreectrl.rb, ext/tk/lib/tkextlib/tktable/tktable.rb: disable code piece became unnecessary by reason of the changes of ext/tk/tkutil/tkutil.c. * ext/tk/lib/tk.rb, ext/tk/lib/multi-tk.rb: change strategy to define the constant WITH_ENCODING. * ext/tk/lib/tk.rb: fix bug on Tk::Encoding.tk_encoding_names. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@17083 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
125 lines
3.6 KiB
Ruby
125 lines
3.6 KiB
Ruby
# image3.rb
|
|
#
|
|
# This demonstration script creates a simple collection of widgets
|
|
# that allow you to select and view images in a Tk label.
|
|
#
|
|
# widget demo 'load image' (called by 'widget')
|
|
#
|
|
|
|
# toplevel widget
|
|
if defined?($image3_demo) && $image3_demo
|
|
$image3_demo.destroy
|
|
$image3_demo = nil
|
|
end
|
|
|
|
# demo toplevel widget
|
|
$image3_demo = TkToplevel.new {|w|
|
|
title('Image Demonstration #3')
|
|
iconname("Image3")
|
|
positionWindow(w)
|
|
}
|
|
|
|
base_frame = TkFrame.new($image3_demo).pack(:fill=>:both, :expand=>true)
|
|
|
|
#
|
|
def loadDir3(w)
|
|
w.delete(0,'end')
|
|
Dir.glob([$dirName,'*'].join(File::Separator)).sort.each{|f|
|
|
w.insert('end',File.basename(f))
|
|
}
|
|
end
|
|
|
|
# selectAndLoadDir3 --
|
|
# This procedure pops up a dialog to ask for a directory to load into
|
|
# the listobx and (if the user presses OK) reloads the directory
|
|
# listbox from the directory named in the demo's entry.
|
|
#
|
|
# Arguments:
|
|
# w - Name of the toplevel window of the demo.
|
|
def selectAndLoadDir3(w, lbox)
|
|
dir = Tk.chooseDirectory(:initialdir=>$dirName.value,
|
|
:parent=>w, :mustexist=>true)
|
|
if dir.length > 0
|
|
$dirName.value = dir
|
|
loadDir3(lbox)
|
|
end
|
|
end
|
|
|
|
def loadImage(w,x,y)
|
|
$image3a.file([$dirName, w.get("@#{x},#{y}")].join(File::Separator))
|
|
end
|
|
|
|
|
|
# label
|
|
msg = TkLabel.new(base_frame) {
|
|
font $font
|
|
wraplength '4i'
|
|
justify 'left'
|
|
text "This demonstration allows you to view images using a Tk \"photo\" image. First type a directory name in the listbox, then type Return to load the directory into the listbox. Then double-click on a file name in the listbox to see that image."
|
|
}
|
|
msg.pack('side'=>'top')
|
|
|
|
# frame
|
|
TkFrame.new(base_frame) {|frame|
|
|
TkButton.new(frame) {
|
|
text 'Dismiss'
|
|
command proc{
|
|
tmppath = $image3_demo
|
|
$image3_demo = nil
|
|
tmppath.destroy
|
|
}
|
|
}.pack('side'=>'left', 'expand'=>'yes')
|
|
|
|
TkButton.new(frame) {
|
|
text 'Show Code'
|
|
command proc{showCode 'image3'}
|
|
}.pack('side'=>'left', 'expand'=>'yes')
|
|
|
|
}.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
|
|
|
|
# variable
|
|
$dirName = TkVariable.new([$demo_dir,'..','images'].join(File::Separator))
|
|
|
|
# image
|
|
begin
|
|
$image3a.delete
|
|
rescue
|
|
end
|
|
$image3a = TkPhotoImage.new
|
|
|
|
#
|
|
image3_f = TkFrame.new(base_frame).pack(:fill=>:both, :expand=>true)
|
|
|
|
image3_df = TkLabelFrame.new(base_frame, :text=>'Directory:')
|
|
|
|
image3_ff = TkLabelFrame.new(base_frame, :text=>'File:',
|
|
:padx=>'2m', :pady=>'2m')
|
|
image3_lbx = TkListbox.new(image3_ff, :width=>20, :height=>10) {
|
|
pack(:side=>:left, :fill=>:y, :expand=>true)
|
|
yscrollbar(TkScrollbar.new(image3_ff).pack(:side=>:left, :fill=>:y,
|
|
:expand=>true))
|
|
insert(0, *(%w(earth.gif earthris.gif teapot.ppm)))
|
|
bind('Double-1', proc{|x,y| loadImage(self, x, y)}, '%x %y')
|
|
}
|
|
|
|
image3_ent = TkEntry.new(image3_df, :width=>30, :textvariable=>$dirName){
|
|
pack(:side=>:left, :fill=>:both, :padx=>'2m', :pady=>'2m', :expand=>true)
|
|
bind('Return', proc{loadDir3(image3_lbx)})
|
|
}
|
|
|
|
TkButton.new(image3_df, :pady=>0, :padx=>'2m', :text=>"Select Dir.",
|
|
:command=>proc{selectAndLoadDir3(image3_ent, image3_lbx)}) {
|
|
pack(:side=>:left, :fill=>:y, :padx=>[0, '2m'], :pady=>'2m')
|
|
}
|
|
|
|
image3_if = TkLabelFrame.new(base_frame, :text=>'Image:') {|f|
|
|
# TkLabel.new(f, :image=>$image3a).pack(:padx=>'2m', :pady=>'2m')
|
|
Tk::Label.new(f, :image=>$image3a).pack(:padx=>'2m', :pady=>'2m')
|
|
}
|
|
|
|
Tk.grid(image3_df, '-',
|
|
:sticky=>:ew, :padx=>'1m', :pady=>'1m', :in=>image3_f)
|
|
Tk.grid(image3_ff, image3_if,
|
|
:sticky=>:nw, :padx=>'1m', :pady=>'1m', :in=>image3_f)
|
|
TkGrid.columnconfigure(image3_f, 1, :weight=>1)
|
|
|