* ext/tk/tcltklib.c: SEGV when tcltk-stubs is enabled.
* 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
2008-06-10 16:59:10 -04:00
|
|
|
# toolbar.rb --
|
|
|
|
#
|
|
|
|
# This demonstration script creates a toolbar that can be torn off.
|
|
|
|
#
|
|
|
|
# based on "Id: toolbar.tcl,v 1.3 2007/12/13 15:27:07 dgp Exp"
|
|
|
|
|
|
|
|
if defined?($toolbar_demo) && $toolbar_demo
|
|
|
|
$toolbar_demo.destroy
|
|
|
|
$toolbar_demo = nil
|
|
|
|
end
|
|
|
|
|
|
|
|
$toolbar_demo = TkToplevel.new {|w|
|
|
|
|
title("Ttk Menu Buttons")
|
|
|
|
iconname("toolbar")
|
|
|
|
positionWindow(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=>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 \
|
|
|
|
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 \
|
|
|
|
whole toolbar into a separate toplevel widget. When the dragged-off \
|
|
|
|
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=>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 \
|
|
|
|
to use the Toolbutton style.
|
|
|
|
EOL
|
|
|
|
end
|
|
|
|
|
|
|
|
## Set up the toolbar hull
|
|
|
|
tbar_base = Tk::Frame.new(base_frame, # Must be a starndard Tk frame!
|
|
|
|
:widgetname=>'toolbar') # for window title
|
|
|
|
sep = Ttk::Separator.new(base_frame)
|
|
|
|
to_base = Ttk::Frame.new(tbar_base, :cursor=>'fleur')
|
|
|
|
if Tk.windowingsystem != 'aqua'
|
|
|
|
to = Ttk::Separator.new(to_base, :orient=>:vertical)
|
|
|
|
to2 = Ttk::Separator.new(to_base, :orient=>:vertical)
|
|
|
|
to.pack(:fill=>:y, :expand=>true, :padx=>2, :side=>:left)
|
|
|
|
to2.pack(:fill=>:y, :expand=>true, :side=>:left)
|
|
|
|
end
|
|
|
|
|
|
|
|
contents = Ttk::Frame.new(tbar_base)
|
|
|
|
Tk.grid(to_base, contents, :sticky=>'nsew')
|
|
|
|
tbar_base.grid_columnconfigure(contents, :weight=>1)
|
|
|
|
contents.grid_columnconfigure(1000, :weight=>1)
|
|
|
|
|
|
|
|
if Tk.windowingsystem != 'aqua'
|
|
|
|
## Bindings so that the toolbar can be torn off and reattached
|
|
|
|
to_base.bind('B1-Motion', '%X %Y'){|x, y| tbar_base.tearoff(to_base, x, y)}
|
|
|
|
to. bind('B1-Motion', '%X %Y'){|x, y| tbar_base.tearoff(to_base, x, y)}
|
|
|
|
to2. bind('B1-Motion', '%X %Y'){|x, y| tbar_base.tearoff(to_base, x, y)}
|
|
|
|
def tbar_base.tearoff(w, x, y)
|
|
|
|
on_win = TkWinfo.containing(x, y)
|
|
|
|
return unless (on_win && on_win.path =~ /^#{@path}(\.|$)/)
|
|
|
|
self.grid_remove
|
|
|
|
w.grid_remove
|
|
|
|
self.wm_manage
|
|
|
|
# self.wm_title('Toolbar') # if you don't want to use its widget name as a window title.
|
2008-06-16 14:50:53 -04:00
|
|
|
self.wm_protocol('WM_DELETE_WINDOW'){ self.untearoff(w) }
|
* ext/tk/tcltklib.c: SEGV when tcltk-stubs is enabled.
* 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
2008-06-10 16:59:10 -04:00
|
|
|
end
|
|
|
|
def tbar_base.untearoff(w)
|
|
|
|
self.wm_forget
|
|
|
|
w.grid
|
|
|
|
self.grid
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
## Some content for the rest of the toplevel
|
|
|
|
text = TkText.new(base_frame, :width=>40, :height=>10)
|
|
|
|
|
|
|
|
## Toolbar contents
|
|
|
|
tb_btn = Ttk::Button.new(tbar_base, :text=>'Button', :style=>'Toolbutton',
|
|
|
|
:command=>proc{text.insert(:end, "Button Pressed\n")})
|
|
|
|
tb_chk = Ttk::Checkbutton.new(tbar_base, :text=>'Check', :style=>'Toolbutton',
|
|
|
|
:variable=>(check = TkVariable.new),
|
|
|
|
:command=>proc{
|
|
|
|
text.insert(:end, "Check is #{check.value}\n")
|
|
|
|
})
|
|
|
|
tb_mbtn = Ttk::Menubutton.new(tbar_base, :text=>'Menu')
|
|
|
|
tb_combo = Ttk::Combobox.new(tbar_base, :value=>TkFont.families,
|
|
|
|
:state=>:readonly)
|
|
|
|
tb_mbtn.menu(menu = Tk::Menu.new(tb_mbtn))
|
|
|
|
menu.add(:command, :label=>'Just', :command=>proc{text.insert(:end, "Just\n")})
|
|
|
|
menu.add(:command, :label=>'An', :command=>proc{text.insert(:end, "An\n")})
|
|
|
|
menu.add(:command, :label=>'Example',
|
|
|
|
:command=>proc{text.insert(:end, "Example\n")})
|
|
|
|
tb_combo.bind('<ComboboxSelected>'){ text.font.family = tb_combo.get }
|
|
|
|
|
|
|
|
## Arrange contents
|
|
|
|
Tk.grid(tb_btn, tb_chk, tb_mbtn, tb_combo,
|
|
|
|
:in=>contents, :padx=>2, :sticky=>'ns')
|
|
|
|
Tk.grid(tbar_base, :sticky=>'ew')
|
|
|
|
Tk.grid(sep, :sticky=>'ew')
|
|
|
|
Tk.grid(msg, :sticky=>'ew')
|
|
|
|
Tk.grid(text, :sticky=>'nsew')
|
|
|
|
base_frame.grid_rowconfigure(text, :weight=>1)
|
|
|
|
base_frame.grid_columnconfigure(text, :weight=>1)
|
|
|
|
|
|
|
|
## See Code / Dismiss buttons
|
|
|
|
Ttk::Frame.new(base_frame) {|frame|
|
|
|
|
sep = Ttk::Separator.new(frame)
|
|
|
|
Tk.grid(sep, :columnspan=>4, :row=>0, :sticky=>'ew', :pady=>2)
|
|
|
|
TkGrid('x',
|
|
|
|
Ttk::Button.new(frame, :text=>'See Code',
|
|
|
|
:image=>$image['view'], :compound=>:left,
|
|
|
|
:command=>proc{showCode 'toolbar'}),
|
|
|
|
Ttk::Button.new(frame, :text=>'Dismiss',
|
|
|
|
:image=>$image['delete'], :compound=>:left,
|
|
|
|
:command=>proc{
|
|
|
|
$toolbar_demo.destroy
|
|
|
|
$toolbar_demo = nil
|
|
|
|
}),
|
|
|
|
:padx=>4, :pady=>4)
|
|
|
|
grid_columnconfigure(0, :weight=>1)
|
|
|
|
Tk.grid(frame, :sticky=>'ew')
|
|
|
|
}
|