From 70d0d3be91f655f8ae97ec29b70c2a415acc39e9 Mon Sep 17 00:00:00 2001 From: treectrl Date: Mon, 21 Jul 2008 18:49:31 +0000 Subject: Added option -showrootchildbuttons. Bumped version to 2.2.7. --- configure | 2 +- configure.ac | 4 +- demos/demo.tcl | 15 +- doc/What's New in TkTreeCtrl.html | 2227 +++---------------------------------- doc/treectrl.html | 13 +- doc/treectrl.man | 12 +- doc/treectrl.n | 14 +- generic/tkTreeCtrl.c | 23 +- generic/tkTreeCtrl.h | 7 +- generic/tkTreeItem.c | 31 +- shellicon/configure | 2 +- shellicon/configure.ac | 4 +- 12 files changed, 215 insertions(+), 2139 deletions(-) diff --git a/configure b/configure index 20f54b3..c2710b2 100644 --- a/configure +++ b/configure @@ -1782,7 +1782,7 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $ ac_compiler_gnu=$ac_cv_c_compiler_gnu -PACKAGE_PATCHLEVEL=2.2.6 +PACKAGE_PATCHLEVEL=2.2.7 cat >>confdefs.h <<_ACEOF #define PACKAGE_PATCHLEVEL "$PACKAGE_PATCHLEVEL" diff --git a/configure.ac b/configure.ac index 82a8ca6..98c7698 100644 --- a/configure.ac +++ b/configure.ac @@ -3,7 +3,7 @@ dnl This file is an input file used by the GNU "autoconf" program to dnl generate the file "configure", which is run during Tcl installation dnl to configure the system for the local environment. # -# RCS: @(#) $Id: configure.ac,v 1.26 2008/02/29 21:14:31 treectrl Exp $ +# RCS: @(#) $Id: configure.ac,v 1.27 2008/07/21 18:49:31 treectrl Exp $ #----------------------------------------------------------------------- # Sample configure.in for Tcl Extensions. @@ -20,7 +20,7 @@ dnl to configure the system for the local environment. #----------------------------------------------------------------------- AC_INIT([treectrl], [2.2]) -AC_SUBST([PACKAGE_PATCHLEVEL], [2.2.6]) +AC_SUBST([PACKAGE_PATCHLEVEL], [2.2.7]) AC_DEFINE_UNQUOTED(PACKAGE_PATCHLEVEL, "$PACKAGE_PATCHLEVEL") TEA_INIT([3.5]) diff --git a/demos/demo.tcl b/demos/demo.tcl index 8138b29..f5cd9ac 100644 --- a/demos/demo.tcl +++ b/demos/demo.tcl @@ -1,8 +1,8 @@ #!/bin/wish84.exe -# RCS: @(#) $Id: demo.tcl,v 1.68 2008/02/29 21:14:32 treectrl Exp $ +# RCS: @(#) $Id: demo.tcl,v 1.69 2008/07/21 18:49:32 treectrl Exp $ -set VERSION 2.2.6 +set VERSION 2.2.7 package require Tk 8.4 @@ -999,12 +999,14 @@ proc MakeListPopup {T} { -command {$Popup(T) configure -showheader $Popup(showheader)} $m2 add checkbutton -label "Lines" -variable Popup(showlines) \ -command {$Popup(T) configure -showlines $Popup(showlines)} - $m2 add checkbutton -label "Root Lines" -variable Popup(showrootlines) \ - -command {$Popup(T) configure -showrootlines $Popup(showrootlines)} $m2 add checkbutton -label "Root" -variable Popup(showroot) \ -command {$Popup(T) configure -showroot $Popup(showroot)} $m2 add checkbutton -label "Root Button" -variable Popup(showrootbutton) \ -command {$Popup(T) configure -showrootbutton $Popup(showrootbutton)} + $m2 add checkbutton -label "Root Child Buttons" -variable Popup(showrootchildbuttons) \ + -command {$Popup(T) configure -showrootchildbuttons $Popup(showrootchildbuttons)} + $m2 add checkbutton -label "Root Child Lines" -variable Popup(showrootlines) \ + -command {$Popup(T) configure -showrootlines $Popup(showrootlines)} $m add cascade -label Show -menu $m2 set m2 [menu $m.mSpan -tearoff no] @@ -1154,9 +1156,10 @@ proc ShowPopup {T x y X Y} { set Popup(showbuttons) [$T cget -showbuttons] set Popup(showheader) [$T cget -showheader] set Popup(showlines) [$T cget -showlines] - set Popup(showrootlines) [$T cget -showrootlines] set Popup(showroot) [$T cget -showroot] set Popup(showrootbutton) [$T cget -showrootbutton] + set Popup(showrootchildbuttons) [$T cget -showrootchildbuttons] + set Popup(showrootlines) [$T cget -showrootlines] set m $menu.mVisible $m delete 0 end foreach C [$T column list] { @@ -1512,7 +1515,7 @@ proc DemoClear {} { -yscrollincrement 0 -itemheight 0 -showheader yes \ -background white -scrollmargin 0 -xscrolldelay 50 -yscrolldelay 50 \ -buttonbitmap "" -buttonimage "" -backgroundmode row \ - -indent 19 -backgroundimage "" \ + -indent 19 -backgroundimage "" -showrootchildbuttons yes \ -showrootlines yes -minitemheight 0 -borderwidth [expr {$::tileFull ? 0 : 6}] \ -highlightthickness [expr {$::tileFull ? 0 : 3}] -usetheme yes -cursor {} \ -itemwidth 0 -itemwidthequal no -itemwidthmultiple 0 \ diff --git a/doc/What's New in TkTreeCtrl.html b/doc/What's New in TkTreeCtrl.html index 5a90444..16edd63 100644 --- a/doc/What's New in TkTreeCtrl.html +++ b/doc/What's New in TkTreeCtrl.html @@ -1,47 +1,141 @@ - + - - + - - - What's New in TkTreeCtrl + + +

What's New in TkTreeCtrl 2.2.7

+ + +

TreeCtrl Configuration Options

+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +

New	Comment
-showrootchildbuttons	Similar to -showrootlines, +this boolean option controls the display of expand/collapse buttons +next to child items of the root item. + + +

+ + +

Indentation change/fix

+ + +

Previously with -showroot=0, -showbuttons=0, and -showrootlines=0 +there was still an extra level of indentation displayed to the left of +the root's children. The only way to remove all indentation +from the +root's children was to set -showlines=0 +as well. This is no longer the case and now behaves +as expected. With the new -showrootchildbuttons +option it is now possible to remove all indentation from the root's +children without affecting the display of buttons/lines on deeper items.

+ +

Library Script Changes

+ +

treectrl.tcl:

+ + +

The <Left> and <Right> key bindings will collapse and expand the active item if -orient=vertical and -wrap={}. Otherwise the previous behavior of setting the active item to an adjacent item is used.

Bug Fixes

Fixed corruption/crash with ".t column configure -foo" with no option value if -foo is an invalid option.

+ + +

What's New in TkTreeCtrl 2.2.6

+ +

Bug Fixes

+ +

Fixed ".t item bbox" returning bogus values when asking for the + + +
Fixed ".t item bbox" returning bogus values when asking for +the bounds of a column or element in a list with many items (integer overflow).
Fixed a segfault on Win64 machines when the system theme changed.
Fixed a segfault on Win64 machines when the system theme +changed.
Fixed a panic on Win64 when drawing the the marquee and +drag-image dotted rectangles due to a too-small struct.

+ +

What's New in TkTreeCtrl 2.2.5

-Issues regarding the incompatibility of 8.4 built TkTreeCtrl working in 8.5 -were resolved. The Mac OS X API issues noted for 2.2.4 remain (they +Issues regarding the incompatibility of 8.4 built TkTreeCtrl working in +8.5 +were resolved. The Mac OS X API issues noted for 2.2.4 remain (they relate to difficult to reconcile core drawing changes).

-A Windows DLL manifest is now embedded to address native theme drawing issues. +A Windows DLL manifest is now embedded to address native theme drawing +issues.

@@ -49,13 +143,12 @@ A Windows DLL manifest is now embedded to address native theme drawing issues.

What's New in TkTreeCtrl 2.2.4

- -

NOTE regarding Tk version compatibility

-Under Mac OSX some internal changes to Tk 8.4.15 and Tk 8.4.17 result in +Under Mac OSX some internal changes to Tk 8.4.15 and Tk 8.4.17 result +in incompatibilities:

@@ -63,66 +156,48 @@ incompatibilities:

This version of TkTreeCtrl built for Tk 8.4.15 will work with Tk 8.4.15 and 8.4.16 only (under Mac OSX).
This version of TkTreeCtrl built for Tk 8.4.15 will work +with Tk 8.4.15 and 8.4.16 only + (under Mac OSX).
This version of TkTreeCtrl built for Tk 8.4.17 will work with Tk 8.4.17 only (under Mac OSX).
This version of TkTreeCtrl built for Tk 8.4.17 will work +with Tk 8.4.17 only (under Mac OSX).

TreeCtrl Configuration Options

- - - - - - - - - - - - - - - - - - - - - - - -

New	Comment
-columntagexpr - - -itemtagexpr	These boolean options can be used to turn off tag expressions in column descriptions and item descriptions. When the value of these options is false the @@ -132,238 +207,156 @@ descriptions. This is useful for applications which may have arbitrary tags applied to columns or items.

-
- -

Bug Fixes

- -

Fixed partially-exposed transparent photo images not being redrawn when scrolling under X11.
Fixed potential crash with Windows theme if the system theme was changed.
Fixed ".t item cget -button" always returning 0 when the value of this option wasn't auto.
Fixed a drawing issue under Mac OSX where parts of the window would not be erased properly under Tk 8.4.15+ and Tk 8.5a7+.
Fixed crashes under Mac OSX with Tk 8.4.17 and Tk 8.5.0.
Fixed an old bug caused by a MSVC compiler optimization bug that + +
Fixed an old bug caused by a MSVC compiler optimization bug +that stopped items being redrawn when the only change in appearance was the expand/collapse button needing to be redrawn.

- -

Misc Changes

- -

Changed the item sort code to be a "stable" sort. This means that the pre-sort order of two equal items is used as a tie-breaker.

- -

Demo Changes

- -

Added "Increase Font Size" and "Decrease Font Size" menu -commands. Also the Console font is not changed when running under Tk 8.5.

- -

What's New in TkTreeCtrl 2.2.3

- -

Build Changes

- -

When building with configure on Windows the --enable-shellicon option will run configure in the shellicon/ subdirectory.
'make dist' will create the source distribution tktreectrl-VERSION.tar.gz.
'make dist-win' will create the Windows binary distribution tktreectrl-VERSION-win32.zip.

- -

Bug Fixes

- -

Fixed flickering when redrawing the borders with "-doublebuffer window" when the widget was resized or parts of it were exposed.
Fixed undefined reference to vsnprintf when building with the MS compiler under Windows; it should be _vsnprintf.
Fixed a symbol conflict with Python 2.5 on ELF-based systems which also defines a symbol "Ellipsis".

- -

What's New in TkTreeCtrl 2.2.2

- -

Column Configuration Options

- - - - - - - - - - - - - - - - - - - - - - - -

New	Comment
-itemjustify	This option allows item styles to be justified separately from the image/text in the column header. If the value of this @@ -372,108 +365,68 @@ according to the -justify option of the column.

- -

Item Configuration Options

- - - - - - - - - - - - - - - - - - - - - - - -

Usage Changed	How it changed
-button	The value of this option can now be the word auto (or any abbreviation) in which case a button is drawn only when the item has at least one child item with its item option -visible set to true.

- -

Style Layout Changes

- -

The element option -draw of every element type is now deprecated. Use the new style layout option -draw instead.
The new per-state style layout option -visible controls the visibility of an element. When the value of this option evaluates to false for a given state, the element consumes no space in @@ -483,55 +436,35 @@ layout are visible, then the element with -unio displayed.

- -

Item Descriptions

- -

The index argument to the child and sibling modifiers can now take the form "end?-integer?".

- -

.t item id "root child end-1" ; # get the second-to-last child of the root item

- -

Bug Fixes

- -

Text elements were requesting some height from the style layout when displaying an empty string. If you were depending on this @@ -541,16 +474,12 @@ or -height style layout options.
Window elements might not be scrolled along with the rest of the list if the area needing to be redrawn due to scrolling was obscurred by other windows. This could only happen on Win32.
The ellipsis "..." in text elements is now always displayed if the text element has less space than is needed to display its string. @@ -558,774 +487,470 @@ Previously the ellipsis would disappear when there wasn't room for a single character plus the ellipsis.
Fixed a layout bug with multi-line text elements when the unsqueezed element did not require a multi-line layout but the squeezed element did.

- -

What's New in TkTreeCtrl 2.2.1

- -

Bug Fixes

- -

Fixed panic with -xscrollincrement=0, -showheader=yes, no visible items and headers wider than the window.
Fixed the wrong loop variable being used when calculating onscreen columns for an item which resulted in a random crash.
Fixed a crash when invalidating a column of an item if the column wasn't the first in a span.
Fixed a leak on X11 where the clipping region was not being freed after drawing dotted rectangles.

- -

What's New in TkTreeCtrl 2.2

- -

TreeCtrl Configuration Options

- - - - - - - - - - - - - - - - - - - - - - - -

Deprecated	What to use instead
-defaultstyle	The -itemstyle option of a column.

- -

TreeCtrl Command

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

Arguments/Result Changed	What changed
contentbox	The return value is an empty string if the content area is totally obscurred by column headers, borders, and/or locked columns. Typically this will only happen if the window is too small.
selection get	Accepts 2 optional arguments to allow in-place lindex and lrange queries of the selection. For example: - - - - .t selection get 0 ; # the first selected item .t selection get end ; # the last selected item .t selection get 1 end-1 ; # every selected item except the first and last - -
New	Comment
bbox	Returns the bounding box of different areas of the window. For example: - - - - .t bbox - - will return the bounds of the window, and: - - - - .t bbox header - - will return the bounds of the column headers, and: - - - - .t bbox content - - will return the same result as the [contentbox] command, and: - - - - .t bbox left .t bbox right - - will return the bounds of the left-locked and right-locked columns.

- -

Column Configuration Options

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

Renamed - -	New name
-tag	-tags
New	Comment
-lock	This option allows columns to stick to the left or right edge of the window. Locked columns can scroll vertically but not horizontally. Valid values for this option are none (the default), left or right.
-itemstyle	Specifies the name of a style to set in this column for newly-created items. This option replaces the treectrl option -defaultstyle.
-uniform	These two options operate the same as the grid geometry manager options of the same name. For example: - - - - .t column configure 0 -uniform a .t column configure 1 -uniform a - - will give columns 0 and 1 the same requested width, whichever is the larger of the two columns. And: - - - - .t column configure 0 -uniform a -weight 2 .t column configure 1 -uniform a - - will give column 0 twice the maximum of the requested widths of columns 0 and 1. And: - - - - .t column configure 0 -expand yes -weight 2 .t column configure 1 -expand yes - - will give column 0 twice the extra space as column 1.
-weight

- -

Column Command

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

Arguments/Result Changed	What changed
column count	Takes an optional column-description argument; the result is the number of columns that match the column description. For example: - - - - .t column count visible - - will return the number of columns whose -visible option is true, and: - - - - .t column count {tag a^b} - - will return the number of columns with either tag "a" or "b", but not both.
New	Comment
column tag add	Columns can have a list of tag names. Previously only a single tag was allowed. The tail column no longer has the word "tail" as a tag, but it is still referred to by the word "tail" in column descriptions.
column tag expr
column tag names
column tag remove

- -

Item Configuration Options

- - - - - - - - - - - - - - - - - - - - - - - -

New	Comment
-tags	Tags are textual labels applied to items to group them. Tags do not affect the appearance or behaviour of items. Tags can be used in @@ -1333,429 +958,255 @@ item descriptions to operate on multiple items. More information can be found in the man page.

- -

Item Command

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

Arguments/Result Changed	What changed
item count	Takes an optional item-description argument; the result is the number of items that match the item description. For example: - - - - .t item count visible - - will return the number of items that are displayed (i.e., those whose ancestors are all expanded, -visible options are true, etc), and: - - - - .t item count {tag a^b} - - will return the number of items with either tag "a" or "b", but not both.
item create	New option -tags specifies an initial list of tags for created items.
item id	Returns a list of item ids if the item description matches multiple items. For example: - - - - .t item id all - - will return a list of ids for all items, and: - - - - .t item id "$item children" - - will return the ids of every child of an item.
New	Comment
item descendants	Returns the ids of the children, grandchildren, etc of an item.
item enabled	Gets and sets the enabled state for items. All items are enabled when first created. Disabled items cannot be selected, and are ignored by the default key-navigation and mouse bindings.
item tag add	Add tags to items. For example: - - - - .t item tag add all {a b c} - - will add tags "a", "b" and "c" to every item. - -
item tag expr	Evaluate a tag expression against items. For example: - - - - .t item tag expr $item a - - returns 1 if an item has tag "a". Also: - - - - .t item tag expr $item a\|\|b - - returns 1 if an item has tag "a" or "b".
item tag names	Return a list of tag names assigned to items. For example: - - - - .t item tag names $item - - returns the tag list for an item, and: - - - - .t item tag names all - - returns every tag assigned to any item.
item tag remove	Remove tags from items. For example: - - - - .t item tag remove all {b c} - - will remove tags "b" and "c" from any items that have them.

- -

Text Element

- - The new option -underline draws an underline under a single character of the displayed text.
- -

Window Element

- - Window elements can now be properly clipped so they don't draw over the column header, borders, or outside the bounds of the item columns they occupy. This is accomplished by making the window you want @@ -1764,23 +1215,15 @@ window element to TRUE. So if your program displays a canvas widget in a window element, you would change this code:
- -

set canvas [canvas .t.canvas ...]
.t item element configure $item $column myElement -window $canvas

- - to this:
- -

set frame [frame .t.clip -borderwidth 0]
set canvas [canvas $frame.canvas ...]
.t item element configure $item $column myElement -window $frame -clip yes

- - The -clip option tells the window element to manage the geometry of both the -window widget (i.e, @@ -1791,261 +1234,165 @@ demos.

Item Descriptions

- - New keywords were added to allow multiple items to be specified by an item description:
- -

The keyword list specifies a list of other item descriptions: - -
```
.t item id "list [list $a $b $c]"
```
- -
The keyword range operates like the item range command: - -
```
.t item id "range $first $last"
```
- -

- - New modifiers were added to match multiple items:

The modifier ancestors operates like the item ancestors command: - -
```
.t item id "$item ancestors"
```
- -
The modifier children operates like the item children command: - -
```
.t item id "$item children"
```
- -
The modifier descendants operates like the item descendants command: - -
```
.t item id "$item descendants"
```
- -

- - New qualifiers were added to refine which items are matched:
- -

The qualifier depth matches items at a given depth in the heirarchy:

- -

.t item id "all depth 2" ; # find all items that are children of the root's children
.t item id "depth 2" ; # ditto

- -

The qualifier !visible matches items that are not displayed: - -
```
.t item id "first !visible" ; # find the first item that is not displayed
```
- -
The qualifier state matches items that have certain states set (or not set if '!' is used): - -
```
.t item id "first state {selected !open}" ; # find the first item that is selected and collapsed
```
- -

The qualifier tag matches items that meet a tag expression: - -

.t item id "$item children tag {a && !b}" ; # find children of $item that have tag "a" but not tag "b"

- -

- -
- - The keyword all may now be followed by a list of qualifiers. For example:
- -

.t item id "all !visible state myState" ; # find every item that is not displayed with user-defined state "myState"

- - A list of qualifiers may be used as the first part of an item description. This gives the same result as "all" followed by the qualifiers. For example:
- -

.t item id "!visible state myState" ; # same as the previous example

- -

Column Descriptions

- - New keywords list and range can be used to match multiple columns.
- - New qualifiers state, tag, !tail and !visible can be used to restrict which columns are specified.
- - The keyword all may be followed by a list of qualifiers.
- - A list of qualifiers may used as the first part of a column description. This gives the same result as "all" followed by the @@ -2053,8 +1400,6 @@ qualifiers.

Multi-item and multi-column commands

- - Many commands can now operate on multiple items and/or columns by using the improved item descriptions and column descriptions mentioned above. For example: @@ -2062,64 +1407,42 @@ For example:

.t column configure "range 1 10" -tags {a b c}
.t column delete "tag a"
.t column id "tag {a || b}"
.t item configure "depth 1" -button yes
.t item count visible
.t item element configure "root children" all elem1 -text "Hello"
.t item id "visible"
.t item image all all image1
.t item style map "tag {a && !b}" "tag c" style2 {style1.elem1 style2.elem2}
.t item style set all all style1
.t item state forcolumn all all state1
.t item state set "tag current" ~mouseover
.t item remove "state selected"
.t item span "range 1 10" "range 10 last" 2
.t item text "root children" all "Hello"

- - - -

Demo Changes

- -

New demo "My Computer". Demonstrates disabled items used as headers.
New demo "Column Locking". Demonstrates columns that do not scroll horizontally.
The "Big List" and "Firefox Privacy" demos were changed to use the new -clip option of window elements.

- -

Misc Changes

- -

The tail column header will not be drawn if the tail column's -visible option is false. This can look nicer with some themes.
The -itembackground colors for a column are now extended below any items in the simplest (and most typical) case where the treectrl's -orient option is @@ -2129,50 +1452,34 @@ options; if neither of those options is specified, then -itembackground colors are specified for the tail column, then they are drawn.
Memory usage is improved, especially for text elements.

- -

Bug Fixes

- -

item create: Fixed bug where -nextsibling and -prevsibling options could specify an orphan item.
item delete: Stopped items possibly being double-deleted by nested calls through <Selection> and <ItemDelete> binding scripts.
item expand, item collapse, item toggle: Only operate on items which exist when the command is called, not any that might get created by <Expand> @@ -2180,178 +1487,114 @@ or <Collapse> binding scripts.
Fixed a crash and a redisplay problem when a master element was configured with a -textvariable and the associated variable changed.
When a style with window elements spanned more than one column, the window might be improperly sized during display updates.
Windows in window elements would not always be unmapped if columns or items were hidden, or if the span of an item-column changed.
The disclosure triangles (i.e., the item buttons) are drawn without a white background under OSX.

- -

What's New in TkTreeCtrl 2.1.1

- -

Column Command

- - - - - - - - - - - - - - - - - - - - - - - -

Arguments/Result Changed	What changed
column delete - -	Added an optional second argument allowing a range of columns to be deleted.

- -

Bug Fixes

- -

The item sort command will be much faster in many cases. There was a silly error in the pivot-finding code of quicksort which resulted in the slow-down.
A column header will be redisplayed if an image in the header is altered.
Fixed bus errors on some Unix systems due to alignment problems.

- -

Other Changes

- -

The Tk caret is now positioned over the active item when it changes. The Tk caret is used for the Magnifier accessibility application and IME on Windows, as well as XIM under Unix.
Improved the appearance of the column headers under OSX.
Added <MouseWheel> support to OSX.
Changing the -visible option of an item could be slow if any items were selected. That is because non-visible items may not be part @@ -2360,630 +1603,388 @@ caused by modifying the -visible option of an item do not occur until the next display update.

- -

Demo Changes

- -

New demo "Column Spanning". Demonstrates a 100-column list where styles span from 1 to 20 columns each.
The loupe command (which performs screen capture to an image) is now implemented on Windows and OSX thanks to Jeff Hobbs.
The screen-magnifier image now resizes with the "loupe" window.

- -

What's New in TkTreeCtrl 2.1

- - This version should be backwards compatible with 2.0, except for a few obscure changes.
- -

TreeCtrl Configuration Options

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

New	Comment
-itemwidth	- -
-itemwidthequal	Deprecates the column -widthhack option.
-itemwidthmultiple	Deprecates the column -stepwidth option.

- -

Column Configuration Options

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

Deprecated	What to use instead
-stepwidth	treectrl's -itemwidthmultiple option
-widthhack	treectrl's -itemwidthequal option

- -

Element Command

- - - - - - - - - - - - - - - - - - - - - - - -

New	Comment
element perstate	Like [item element perstate].

- -

Item Configuration Options

- - - - - - - - - - - - - - - - - - - - - - - -

New	Comment
-height	Overrides the treectrl's -itemheight option

- -

Item Command

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

Deprecated	What to use instead
item element actual	item element perstate
item complex	item element configure
Behaviour Changed	What changed
item bbox	No longer returns an error if no style had been assigned to the column.
item state forcolumn	No longer returns an error if no style had been assigned to the column.
item style set	Does nothing when replacing a style with the same style. Previously the old style was freed before assigning the new style, losing the element config info if the old and new styles were the same. - - Potential incompatibility
Arguments/Result Changed	What changed
item create	Added options: -count -height, -nextsibling, -open, -parent, -prevsibling, and -returnid. Multiple items may be created with one call using the -count option.
item element configure	Multiple elements in multiple columns may be configured with a single call. Use '+' to separate elements, and ',' to separate columns. See the docs.
item style set	When no column is specified, returns a list of one style name per column. Previously, the list would have less values than the number @@ -2991,90 +1992,56 @@ of columns if no styles had ever been assigned to the rightmost column(s). - - Potential incompatibility
item text	When no column is specified, returns a list of one string per column.
New	Comment
item image	Partner to the [item text] command.
item element perstate	Not really new, just renamed from [item element actual] to better describe what it does. Accepts a new optional argument which @@ -3082,254 +2049,156 @@ specifies the state to use when determining the value of the per-state option. - - - - The following options no longer return a default value if the per-state option itself does not have a value specified: - - - - - - bitmap -foreground, -background - - border -relief - - text -fill, -font - - - - - - Potential incompatibility
item span	A style may now be displayed over multiple adjacent columns. - -

- -

Notify Command

- - - - - - - - - - - - - - - - - - - - - - - -

New	Comment
notify unbind - -	Let's you unbind all scripts from an object with one call.

- -

Style Layout Changes

- -

Column justification will now affect the position of elements in 2 situations which previously had no effect (Potential incompatibility):

- -

If a -detach element had a fixed width larger than the other elements.
If an element had -iexpand x specified as well as -maxwidth, leaving some space available.

- -

Element Changes

- -

Bitmap, image and text elements are drawn clipped if given less space than they need.
Fixed line wrapping of text elements. It did not work for single lines of text at all (Potential incompatibility).
The text -wrap option can now be none to disable line wrapping.

- -

Event Changes

- -

The new static event <ItemVisibility> is generated when items become visible on screen and when items are no longer visible on screen. @@ -3339,228 +2208,144 @@ SUBSTITUTIONS section in the help file, and the new demo "Big List".

- -

Other Changes

- -

On WinXP, the column header sort arrow is drawn like Explorer draws it if -usetheme is true.

- -

Demo Changes

- -

New demo "Big List". Demonstrates the new <ItemVisibility> event, using <Expand-before> to add items on demand, and column spanning.
The context menu has a Span submenu that lets you manipulate column spanning in items. See the item span command in the help file.
Under WinXP, the "Explorer" demos will use the new shellicon extension if available. This extension allows a treectrl to display file/folder icons using the Win32 Shell API. It may work on other versions of Windows but it hasn't been tested.

- -

What's New in TkTreeCtrl 2.0

- -

TreeCtrl Configuration Options

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

Replaced	What to use instead
-openbuttonimage	-buttonimage
-closedbuttonimage	-buttonimage
-openbuttonbitmap	-buttonbitmap
-closedbuttonbitmap	-buttonbitmap
Usage Changed	How it changed
-backgroundmode	The values "index" and "visindex" are deprecated. The value "order" should be used instead of "index", and @@ -3569,23 +2354,15 @@ agreement with the new "item order" command which replaces the "item index" command.
-treecolumn	This used to be any integer value which may or may not have corresponded to an actual column. Now the value must be a valid column @@ -3593,1451 +2370,873 @@ description, or an empty string to indicate no column should display buttons/lines.
New
-backgroundimage
-columnprefix
-columnresizemode
-itemprefix
-minitemheight
-usetheme

- -

TreeCtrl Commands

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

Deprecated	What to use instead
compare	item compare
index	item id
numcolumns	column count
numitems	item count
range	item range

- -

Column Configuration Options

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - + + - + + - + + - -

Removed	What to use instead
-relief - -	-state
-sunken	-state
Renamed - -	New name
-arrowpad	-arrowpadx
Usage Changed	How it changed
-background	This is now a per-state option. See COLUMNS in the help file for valid state names.
New - -
-arrowbitmap - -
-arrowimage
-arrowpady
-maxwidth
-resize
-state
-state	-textlines

-textlines

- -

Column Command

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

Deprecated	What to use instead
column index	column id
Arguments/Result Changed	What changed
column configure - -	A column description of "all" is allowed if at least one option-value pair is given. - -
column create	The result is a unique identifier. Previously the result was an index in the list of columns.
column delete	A column description of "all" is allowed.
New	Comment
column compare
column count	replaces "numcolumns"
column dragconfigure
column dragcget
column id	replaces "column index"
column list
column order

- -

Item Command

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

Removed	What to use instead
item index	item order
New	Comment
item compare	replaces "compare"
item count	replaces "numitems"
item id	replaces "index"
item order	replaces "item index"
item range	replaces "range"

- -

Notify Command

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

Arguments/Result Changed	What changed
notify generate - -	Added optional percentsCommand argument
notify install	Old syntax (supported but deprecated): - - - - notify install event eventName - - - - notify install detail eventName detail - - New syntax: - - - - notify install <eventName> - - - - notify install <eventName-detail> - -
notify linkage	Old syntax (supported but deprecated): - - - - - - notify linkage eventName - - - - notify linkage eventName detail - - - - New syntax: - - - - - - notify linkage <eventName> - - - - notify linkage <eventName-detail> - - - -
notify uninstall	see notify install above

- -

Style Layout Options

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

Usage Changed	How it changed
-iexpand	Two new flags "x' and "y" are allowed. Previously, only the -ipadx and -ipady padding could be expanded by this option. The new xy @@ -5045,257 +3244,155 @@ flags expand the display area of the element, not the padding. To update your code, you will probably want to change this: - - - - - - $T style layout $S $E -iexpand we - - - - to this: - - - - - - $T style layout $S $E -iexpand x - - - - Keep in mind that -union elements are not affected by -iexpand xy, since the size of a -union element is determined by the elements it surrounds.
New - -
-height
-maxheight
-maxwidth
-minheight
-minwidth
-sticky
-width

- -

Element Changes

- -

A new element type window was added. See the new demo "Firefox Privacy" and the ELEMENTS section in the help file.
All element types have a new per-state boolean option called -draw.
The text element type has a new option called -textvariable. @@ -5303,23 +3400,15 @@ See the new demo "Textvariable" and the ELEMENTS section in the help file.

- -

Event Changes

- -

2 new %-substitution characters %P and %? are allowed in binding @@ -5327,105 +3416,71 @@ scripts. See the EVENTS AND SCRIPT SUBSTITUTIONS section in the help file.
The new static event <ItemDelete> is generated when items are deleted. See the EVENTS AND SCRIPT SUBSTITUTIONS section in the help file.

- -

Library Script Changes

- -

filelist-bindings.tcl:

- -

The Priv(edit) variable, which is used to specify which text elements may be edited, now has the same format as Priv(sensitive). Previously only elements in the first column could be edited.
3 new commands in the TreeCtrl namespace should be used to access the Priv(dragimage), Priv(edit) and Priv(sensitive) variables. The commands are SetDragImage, SetEditable and SetSensitive.
Two new dynamic events <Edit-begin> and <Edit-end> are generated when editing a file name.

- -

treectrl.tcl:

- -

On OSX/Aqua, the Command key is used to perform discontinuous selection. Previously the Control key was used but Command is specified by Apple's user-interface guidelines.

- -

Other Changes

- -

On WinXP, the column headers and open/close buttons are drawn using the system theme if -usetheme is true. The sort arrow is drawn the old-fashioned way.
On OSX/Aqua, the column headers and open/close buttons are drawn @@ -5436,46 +3491,32 @@ and -arrowgravity options.
Columns can be moved by drag-and-drop. See column dragconfigure in the help file.
Columns can be specified in new ways. See the COLUMN DESCRIPTION section in the help file.
Added new section DYNAMIC EVENTS to the help file.
Added new section PER-STATE OPTIONS to the help file.
The new style layout option -indent allows elements to be displayed in the button/line area. See the style layout command in the help file and the new demo "Firefox Privacy".
The new item description end is equivalent to last.
If you have version 1.1 installed, replace the old pkgIndex.tcl file with the one from this @@ -5485,62 +3526,42 @@ set the TREECTRL_LIBRARY variable which will override where the library scripts are found.

- -

Demo Changes

- -

New demo "Firefox Privacy". Demonstrates the new window element type and -indent style layout option.
New demo "Textvariable". Demonstrates the new -textvariable option of the text element.
Added a new Event Browser window to display events generated by the main treectrl widget.
The context menu can be popped up in all the demo lists. A <Control-ButtonPress-1> binding for this was added under OSX/Aqua.
In the "Explorer" demos, the file name is hidden while editing the file name.

- - diff --git a/doc/treectrl.html b/doc/treectrl.html index 1de14ed..884eda8 100644 --- a/doc/treectrl.html +++ b/doc/treectrl.html @@ -1,10 +1,10 @@ - treectrl - Tk Commands - @@ -636,6 +636,15 @@ root item. The default value is false. The item option -button determines whether the root item has a button.

+

Command-Line Switch: -showrootchildbuttons
+Database Name: showRootChildButtons
+Database Class: ShowRootChildButtons
+

+Specifies a boolean value that determines whether this widget +should draw the expand/collapse buttons next to children of the root item. +The default value is true. + +

Command-Line Switch: -showrootlines
Database Name: showRootLines
Database Class: ShowRootLines
diff --git a/doc/treectrl.man b/doc/treectrl.man index 76e3d14..fdc4be4 100644 --- a/doc/treectrl.man +++ b/doc/treectrl.man @@ -3,11 +3,12 @@ See the file "license.terms" for information on usage and redistribution of this file, and for a DISCLAIMER OF ALL WARRANTIES. - $Id: treectrl.man,v 1.55 2008/02/29 21:14:33 treectrl Exp $} -][manpage_begin treectrl n 2.2.6] + $Id: treectrl.man,v 1.56 2008/07/21 18:49:34 treectrl Exp $} +] +[manpage_begin treectrl n 2.2.7] [moddesc {Tk Commands}] [titledesc {Create and manipulate hierarchical multicolumn widgets}] -[require treectrl 2.2.6] +[require treectrl 2.2.7] [description] [list_begin definitions] @@ -294,6 +295,11 @@ leaves indentation space to display the expand/collapse button next to the root item. The default value is false. The item option [option -button] determines whether the root item has a button. +[tkoption_def -showrootchildbuttons showRootChildButtons ShowRootChildButtons] +Specifies a boolean value that determines whether this widget +should draw the expand/collapse buttons next to children of the root item. +The default value is true. + [tkoption_def -showrootlines showRootLines ShowRootLines] Specifies a boolean value that determines whether this widget should draw the connecting lines between children of the root item. diff --git a/doc/treectrl.n b/doc/treectrl.n index 4672c3f..7ac3da6 100644 --- a/doc/treectrl.n +++ b/doc/treectrl.n @@ -6,7 +6,7 @@ '\" See the file "license.terms" for information on usage and redistribution '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES. '\" -'\" $Id: treectrl.n,v 1.72 2008/02/29 21:14:33 treectrl Exp $ +'\" $Id: treectrl.n,v 1.73 2008/07/21 18:49:34 treectrl Exp $ .so man.macros .TH "treectrl" n 2.2.6 treectrl "Tk Commands" .BS @@ -876,6 +876,18 @@ The item option \fB-button\fR determines whether the root item has a button. .LP .nf .ta 6c +Command-Line Switch: \fB-showrootchildbuttons\fR +Database Name: \fBshowRootChildButtons\fR +Database Class: \fBShowRootChildButtons\fR + +.fi +.IP +Specifies a boolean value that determines whether this widget +should draw the expand/collapse buttons next to children of the root item. +The default value is true. +.LP +.nf +.ta 6c Command-Line Switch: \fB-showrootlines\fR Database Name: \fBshowRootLines\fR Database Class: \fBShowRootLines\fR diff --git a/generic/tkTreeCtrl.c b/generic/tkTreeCtrl.c index adbc543..26d8eb0 100644 --- a/generic/tkTreeCtrl.c +++ b/generic/tkTreeCtrl.c @@ -7,7 +7,7 @@ * Copyright (c) 2002-2003 Christian Krone * Copyright (c) 2003-2005 ActiveState, a division of Sophos * - * RCS: @(#) $Id: tkTreeCtrl.c,v 1.107 2008/01/22 01:03:02 treectrl Exp $ + * RCS: @(#) $Id: tkTreeCtrl.c,v 1.108 2008/07/21 18:49:32 treectrl Exp $ */ #include "tkTreeCtrl.h" @@ -236,6 +236,9 @@ static Tk_OptionSpec optionSpecs[] = { {TK_OPTION_BOOLEAN, "-showrootbutton", "showRootButton", "ShowRootButton", "0", -1, Tk_Offset(TreeCtrl, showRootButton), 0, (ClientData) NULL, TREE_CONF_RELAYOUT}, + {TK_OPTION_BOOLEAN, "-showrootchildbuttons", "showRootChildButtons", + "ShowRootChildButtons", "1", -1, Tk_Offset(TreeCtrl, showRootChildButtons), + 0, (ClientData) NULL, TREE_CONF_RELAYOUT}, {TK_OPTION_STRING, "-takefocus", "takeFocus", "TakeFocus", DEF_LISTBOX_TAKE_FOCUS, -1, Tk_Offset(TreeCtrl, takeFocus), TK_OPTION_NULL_OK, 0, 0}, @@ -905,12 +908,18 @@ static int TreeWidgetCmd( sprintf(buf, "item %s%d", tree->itemPrefix, TreeItem_GetID(tree, item)); /* TreeItem_ToObj() */ depth = TreeItem_GetDepth(tree, item); - if (tree->showRoot || tree->showButtons || tree->showLines) - depth++; - if (tree->showRoot && tree->showButtons && tree->showRootButton) - depth++; if (item == tree->root) depth = (tree->showButtons && tree->showRootButton) ? 1 : 0; + else if (tree->showRoot) + { + depth++; + if (tree->showButtons && tree->showRootButton) + depth++; + } + else if (tree->showButtons && tree->showRootChildButtons) + depth += 1; + else if (tree->showLines && tree->showRootLines) + depth += 1; lock = (hit == TREE_AREA_LEFT) ? COLUMN_LOCK_LEFT : (hit == TREE_AREA_RIGHT) ? COLUMN_LOCK_RIGHT : @@ -3229,11 +3238,11 @@ A_YviewCmd( break; } - /* Don't scroll too far left */ + /* Don't scroll too far up */ if (index < 0) index = 0; - /* Don't scroll too far right */ + /* Don't scroll too far down */ if (index > indexMax) index = indexMax; diff --git a/generic/tkTreeCtrl.h b/generic/tkTreeCtrl.h index 97f4ca6..cbca317 100644 --- a/generic/tkTreeCtrl.h +++ b/generic/tkTreeCtrl.h @@ -7,7 +7,7 @@ * Copyright (c) 2002-2003 Christian Krone * Copyright (c) 2003 ActiveState Corporation * - * RCS: @(#) $Id: tkTreeCtrl.h,v 1.94 2008/03/12 19:12:47 treectrl Exp $ + * RCS: @(#) $Id: tkTreeCtrl.h,v 1.95 2008/07/21 18:49:32 treectrl Exp $ */ #include "tkPort.h" @@ -124,6 +124,9 @@ typedef struct TreePtrList TreePtrList; typedef TreePtrList TreeItemList; typedef TreePtrList TreeColumnList; struct TreePtrList { +#ifdef TREECTRL_DEBUG + char magic[4]; +#endif TreeCtrl *tree; ClientData *pointers; /* NULL-terminated list of pointers. */ int count; /* Number of items. */ @@ -202,6 +205,8 @@ struct TreeCtrl int showRoot; /* boolean: Draw the unique root item */ int showRootButton; /* boolean: Draw expand/collapse button for * root item */ + int showRootChildButtons; /* boolean: Draw expand/collapse buttons for + * children of the root item */ int showHeader; /* boolean: show column titles */ Tcl_Obj *indentObj; /* pixels: offset of child relative to * parent */ diff --git a/generic/tkTreeItem.c b/generic/tkTreeItem.c index 8f9b0a7..32e9e72 100644 --- a/generic/tkTreeItem.c +++ b/generic/tkTreeItem.c @@ -5,7 +5,7 @@ * * Copyright (c) 2002-2008 Tim Baker * - * RCS: @(#) $Id: tkTreeItem.c,v 1.105 2008/02/29 20:49:22 treectrl Exp $ + * RCS: @(#) $Id: tkTreeItem.c,v 1.106 2008/07/21 18:49:33 treectrl Exp $ */ #include "tkTreeCtrl.h" @@ -946,7 +946,8 @@ TreeItem_UndefineState( * * Determine whether an item should have a button displayed next to * it. This considers the value of the item option -button as well - * as the treectrl options -showbuttons and -showrootbutton. + * as the treectrl options -showbuttons, -showrootchildbuttons and + * -showrootbutton. * * Results: * None. @@ -965,6 +966,8 @@ TreeItem_HasButton( { if (!tree->showButtons || (IS_ROOT(item) && !tree->showRootButton)) return 0; + if (item->parent == tree->root && !tree->showRootChildButtons) + return 0; if (item->flags & ITEM_FLAG_BUTTON) return 1; if (item->flags & ITEM_FLAG_BUTTON_AUTO) { @@ -3610,19 +3613,27 @@ int TreeItem_Indent( TreeItem item /* Item token. */ ) { - int indent; + int depth; if (IS_ROOT(item)) - return (tree->showRoot && tree->showButtons && tree->showRootButton) ? tree->useIndent : 0; + return (tree->showRoot && tree->showButtons && tree->showRootButton) + ? tree->useIndent : 0; Tree_UpdateItemIndex(tree); - indent = tree->useIndent * item->depth; - if (tree->showRoot || tree->showButtons || tree->showLines) - indent += tree->useIndent; - if (tree->showRoot && tree->showButtons && tree->showRootButton) - indent += tree->useIndent; - return indent; + depth = item->depth; + if (tree->showRoot) + { + depth += 1; + if (tree->showButtons && tree->showRootButton) + depth += 1; + } + else if (tree->showButtons && tree->showRootChildButtons) + depth += 1; + else if (tree->showLines && tree->showRootLines) + depth += 1; + + return tree->useIndent * depth; } /* diff --git a/shellicon/configure b/shellicon/configure index ba7fa18..dc519ab 100644 --- a/shellicon/configure +++ b/shellicon/configure @@ -1772,7 +1772,7 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $ ac_compiler_gnu=$ac_cv_c_compiler_gnu -PACKAGE_PATCHLEVEL=2.2.6 +PACKAGE_PATCHLEVEL=2.2.7 cat >>confdefs.h <<_ACEOF #define PACKAGE_PATCHLEVEL "$PACKAGE_PATCHLEVEL" diff --git a/shellicon/configure.ac b/shellicon/configure.ac index 4bc5f55..740fd7c 100644 --- a/shellicon/configure.ac +++ b/shellicon/configure.ac @@ -3,7 +3,7 @@ dnl This file is an input file used by the GNU "autoconf" program to dnl generate the file "configure", which is run during Tcl installation dnl to configure the system for the local environment. # -# RCS: @(#) $Id: configure.ac,v 1.5 2008/02/29 21:14:32 treectrl Exp $ +# RCS: @(#) $Id: configure.ac,v 1.6 2008/07/21 18:49:32 treectrl Exp $ #----------------------------------------------------------------------- # Sample configure.in for Tcl Extensions. @@ -20,7 +20,7 @@ dnl to configure the system for the local environment. #----------------------------------------------------------------------- AC_INIT([shellicon], [2.2]) -AC_SUBST([PACKAGE_PATCHLEVEL], [2.2.6]) +AC_SUBST([PACKAGE_PATCHLEVEL], [2.2.7]) AC_DEFINE_UNQUOTED(PACKAGE_PATCHLEVEL, "$PACKAGE_PATCHLEVEL") TEA_INIT([3.5]) -- cgit v0.12