Check-in [cd42089549]
Not logged in

Many hyperlinks are disabled.
Use anonymous login to enable hyperlinks.

Overview
Comment:merge with trunk
Timelines: family | ancestors | descendants | both | wtf-8-experiment
Files: files | file ages | folders
SHA1: cd42089549a11a8570af3907df37555375c98c1e
User & Date: chw 2019-12-03 21:49:05.019
Context
2019-12-04
06:47
merge with trunk check-in: 3020b516a5 user: chw tags: wtf-8-experiment
2019-12-03
21:49
merge with trunk check-in: cd42089549 user: chw tags: wtf-8-experiment
21:38
update awthemes to version 7.3 check-in: a4782b3770 user: chw tags: trunk
2019-12-02
18:11
merge with trunk check-in: 88c7c67f5b user: chw tags: wtf-8-experiment
Changes
Unified Diff Ignore Whitespace Patch
Changes to assets/awthemes7/README.txt.
8
9
10
11
12
13
14



15
16
17
18
19
20
21
  # application scaling
  tclsh demottk.tcl winxpblue -fontscale 1.2
  # tk scaling only
  tclsh demottk.tcl winxpblue -ttkscale 2.0
  # user with high dpi, smaller font
  tclsh demottk.tcl winxpblue -ttkscale 2.0 -fontscale 0.7




7.2 (2019-12-2)
   - setBackground will not do anything if the background color is unchanged.
   - fixed a bug with graphical buttons.
   - make setbackground more robust.

7.1 (2019-12-1)
   - fix border/padding scaling, needed for rounded buttons/tabs.







>
>
>







8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
  # application scaling
  tclsh demottk.tcl winxpblue -fontscale 1.2
  # tk scaling only
  tclsh demottk.tcl winxpblue -ttkscale 2.0
  # user with high dpi, smaller font
  tclsh demottk.tcl winxpblue -ttkscale 2.0 -fontscale 0.7

7.3 (2019-12-2)
   - fix spinbox scaled styling

7.2 (2019-12-2)
   - setBackground will not do anything if the background color is unchanged.
   - fixed a bug with graphical buttons.
   - make setbackground more robust.

7.1 (2019-12-1)
   - fix border/padding scaling, needed for rounded buttons/tabs.
Changes to assets/awthemes7/awthemes.tcl.
62
63
64
65
66
67
68


69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
#   To style the scrollbars, use:
#        ttk::scrollbar .sb -style Vertical.TScrollbar
#     or ttk::scrollbar .sb -style Horizontal.TScrollbar
#   This will turn off the aqua styling and use the theme styling.
#   Also note that the styling for the scrollbar cannot be configured
#     afterwards, it must be configured when the scrollbar is created.
#


# 7.2
#   - setBackground will not do anything if the background color is unchanged.
#   - fixed a bug with graphical buttons.
#   - make setbackground more robust.
# 7.1
#   - fix border/padding scaling, needed for rounded buttons/tabs.
# 7.0
#   - clean up .svg files to use alpha channel for disabled colors.
#   - calculate some disabled colors.
#   - fix doc.
#   - split out theme specific code into separate files.
#   - Fix scaledStyle set of treeview indicator.
#   - make the tab topbar a generalized option.
#   - merge themeutils package
#   - clean up notebook tabs.
#   - winxpblue: notebook tab graphics.
#   - winxpblue: disabled images.
#   - black: disabled cb/rb images.
#   - black: add labelframe color.
# 6.0
#   - fix !focus colors
#   - slider border color
#   - various styling fixes and improvements
#   - separate scrollbar color
#   - optional scrollbar grip
#   - button images are now supported
#   - added winxpblue scalable theme







>
>
|



|

|












|







62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
#   To style the scrollbars, use:
#        ttk::scrollbar .sb -style Vertical.TScrollbar
#     or ttk::scrollbar .sb -style Horizontal.TScrollbar
#   This will turn off the aqua styling and use the theme styling.
#   Also note that the styling for the scrollbar cannot be configured
#     afterwards, it must be configured when the scrollbar is created.
#
# 7.3 (2019-12-2)
#   - fix spinbox scaled styling
# 7.2 (2019-12-2)
#   - setBackground will not do anything if the background color is unchanged.
#   - fixed a bug with graphical buttons.
#   - make setbackground more robust.
# 7.1 (2019-12-1)
#   - fix border/padding scaling, needed for rounded buttons/tabs.
# 7.0 (2019-11-30)
#   - clean up .svg files to use alpha channel for disabled colors.
#   - calculate some disabled colors.
#   - fix doc.
#   - split out theme specific code into separate files.
#   - Fix scaledStyle set of treeview indicator.
#   - make the tab topbar a generalized option.
#   - merge themeutils package
#   - clean up notebook tabs.
#   - winxpblue: notebook tab graphics.
#   - winxpblue: disabled images.
#   - black: disabled cb/rb images.
#   - black: add labelframe color.
# 6.0 (2019-11-23)
#   - fix !focus colors
#   - slider border color
#   - various styling fixes and improvements
#   - separate scrollbar color
#   - optional scrollbar grip
#   - button images are now supported
#   - added winxpblue scalable theme
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
#   - added setMenuColors helper routine
#   - cleaned up the radiobutton image
#   - resized checkbutton and radiobutton images.
# 0.1
#   - initial coding
#

package provide awthemes 7.2

package require Tk
# set ::notksvg to true for testing purposes
if { ! [info exists ::notksvg] || ! $::notksvg } {
  catch { package require tksvg }
}








|







191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
#   - added setMenuColors helper routine
#   - cleaned up the radiobutton image
#   - resized checkbutton and radiobutton images.
# 0.1
#   - initial coding
#

package provide awthemes 7.3

package require Tk
# set ::notksvg to true for testing purposes
if { ! [info exists ::notksvg] || ! $::notksvg } {
  catch { package require tksvg }
}

1685
1686
1687
1688
1689
1690
1691
1692

1693
1694
1695
1696
1697
1698
1699
          disabled  $images(spin-arrow-bg-up-d${sfx})]
      ttk::style element create ${pfx}Spinbox.downarrow image \
          [list $images(spin-arrow-bg-down-n${sfx}) \
          disabled  $images(spin-arrow-bg-down-d${sfx})]

      if { $pfx ne {} } {
        set layout [ttk::style layout TSpinbox]
        regsub {(Spinbox.[a-z]*arrow)} $layout "${pfx}\\1" layout

        ttk::style layout ${pfx}TSpinbox $layout
      }
    }

    ttk::style configure ${pfx}TSpinbox \
        -borderwidth 1 \
        -relief none \







|
>







1687
1688
1689
1690
1691
1692
1693
1694
1695
1696
1697
1698
1699
1700
1701
1702
          disabled  $images(spin-arrow-bg-up-d${sfx})]
      ttk::style element create ${pfx}Spinbox.downarrow image \
          [list $images(spin-arrow-bg-down-n${sfx}) \
          disabled  $images(spin-arrow-bg-down-d${sfx})]

      if { $pfx ne {} } {
        set layout [ttk::style layout TSpinbox]
        regsub {(Spinbox.uparrow)} $layout "${pfx}\\1" layout
        regsub {(Spinbox.downarrow)} $layout "${pfx}\\1" layout
        ttk::style layout ${pfx}TSpinbox $layout
      }
    }

    ttk::style configure ${pfx}TSpinbox \
        -borderwidth 1 \
        -relief none \
Added assets/awthemes7/demoscaled.tcl.














































































































































































































































































































































































































































>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
#!/usr/bin/tclsh

package require Tk

if { 1 } {
  set ap [file normalize [file join [file dirname [info script]] .. code]]
  if { $ap ni $::auto_path } {
    lappend ::auto_path $ap
  }
  unset ap
}

if { [llength $::argv] < 1 } {
  puts "Usage: demottk.tcl <theme> \[-ttkscale <scale-factor>] \[-scale <scale-factor>] \[-fontscale <scale-factor>] \[-highlightcolor <color>] \[-notksvg]"
  exit 1
}

lappend ::auto_path [file dirname [info script]]

set theme [lindex $::argv 0]

set ::notksvg false
set fontscale 1.0 ; # default
set sf 1.0
set gc {}
for {set idx 1} {$idx < [llength $::argv]} {incr idx} {
  if { [lindex $::argv $idx] eq "-ttkscale" } {
    incr idx
    tk scaling [lindex $::argv $idx]
  }
  if { [lindex $::argv $idx] eq "-scale" } {
    incr idx
    set sf [lindex $::argv $idx]
  }
  if { [lindex $::argv $idx] eq "-highlightcolor" } {
    incr idx
    set gc [lindex $::argv $idx]
  }
  if { [lindex $::argv $idx] eq "-fontscale" } {
    incr idx
    set fontscale [lindex $::argv $idx]
  }
  if { [lindex $::argv $idx] eq "-notksvg" } {
    set ::notksvg true
  }
}

# now do the requires so that -notksvg has an effect.
package require colorutils
package require awthemes

if { $gc ne {} } {
  ::themeutils::setThemeColors $theme \
      graphics.color $gc
}
::themeutils::setThemeColors $theme \
    scale.factor $sf

if { ! $::notksvg } {
  catch { package require tksvg }
}

set fn data/bll-tecra/tkscale.txt
if { [file exists $fn] } {
  set fh [open $fn r]
  set scale [gets $fh]
  close $fh
  tk scaling -displayof . $scale
}

set calcdpi [expr {round([tk scaling]*72.0)}]
set scalefactor [expr {$calcdpi/100.0}]

# Tk defaults to pixels.  Sigh.
# Use points so that the fonts scale.
font configure TkDefaultFont -size 11
set origfontsz [font metrics TkDefaultFont -ascent]
font configure TkDefaultFont -size [expr {round(12.0*$fontscale)}]

set newfontsz [font metrics TkDefaultFont -ascent]
if { $origfontsz != $newfontsz } {
  set appscale [expr {double($newfontsz)/double($origfontsz)}]
  ::themeutils::setThemeColors $theme \
      scale.factor $appscale
}

set loaded false
if { 1 } {
  set fn [file join $::env(HOME) s ballroomdj code themes themeloader.tcl]
  if { [file exists $fn] } {
    source $fn
    themeloader::loadTheme $theme
    set loaded true
  }
}

set havetksvg false
if { ! [catch {package present tksvg}] } {
  set havetksvg true
}

set ttheme $theme
if { ($havetksvg && $theme eq "black") ||
    ($havetksvg && $theme eq "winxpblue") } {
  set ttheme aw${theme}
}
if { [file exists $ttheme.tcl] && ! $loaded } {
  source $ttheme.tcl
}

ttk::style theme use $theme

set val 55
set valb $theme
set off 0
set on 1

. configure -background [ttk::style lookup TFrame -background]

if { [info commands ::ttk::theme::${theme}::scaledStyle] ne {} } {
  font create SmallFont
  font configure SmallFont -size [expr {round(8.0*$fontscale)}]
  ttk::theme::${theme}::scaledStyle Small TkDefaultFont SmallFont
}

ttk::style configure TFrame -borderwidth 0

foreach {k} {{} Small} {
  set tfont TkDefaultFont
  set s {}
  if { $k ne {} } {
    set tfont SmallFont
    set s Small.
  }

  ttk::labelframe .lf${k} \
      -text " Normal " \
      -style ${s}TLabelframe
  ttk::style configure ${s}TLabelframe.Label -font $tfont

  ttk::frame .bf$k
  ttk::label .lb$k -text $theme -style ${s}TLabel
  ttk::style configure ${s}TLabel -font $tfont
  ttk::button .b$k -text $theme -style ${s}TButton
  ttk::style configure ${s}TButton -font $tfont
  pack .lb$k .b$k -in .bf$k -side left -padx 3p

  ttk::combobox .combo$k -values \
      [list aaa bbb ccc ddd eee fff ggg hhh iii jjj kkk lll mmm nnn ooo ppp] \
      -textvariable valb \
      -width 15 \
      -height 5 \
      -font $tfont \
      -style ${s}TCombobox
  option add *TCombobox*Listbox.font $tfont

  ttk::frame .cbf$k
  ttk::checkbutton .cboff$k -text off -variable off -style ${s}TCheckbutton
  ttk::checkbutton .cbon$k -text on -variable on -style ${s}TCheckbutton
  pack .cboff$k .cbon$k -in .cbf$k -side left -padx 3p

  ttk::separator .sep$k -style ${s}TSeparator

  ttk::frame .rbf$k
  ttk::radiobutton .rboff$k -text off -variable on -value 0 -style ${s}TRadiobutton
  ttk::radiobutton .rbon$k -text on -variable on -value 1 -style ${s}TRadiobutton
  pack .rboff$k .rbon$k -in .rbf$k -side left -padx 3p

  pack .bf$k .combo$k .cbf$k .sep$k .rbf$k \
      -in .lf$k -side top -anchor w -padx 3p -pady 3p
  pack configure .sep$k -fill x -expand true

  ttk::frame .hf$k
  ttk::scale .sc$k \
      -from 0 \
      -to 100 \
      -variable val \
      -length [expr {round(100*$scalefactor)}] \
      -style ${s}Horizontal.TScale
  ttk::progressbar .pb$k \
      -mode determinate \
      -variable val \
      -length [expr {round(100*$scalefactor)}] \
      -style ${s}Horizontal.TProgressbar
  ttk::entry .ent$k -textvariable valb \
      -width 15 \
      -font $tfont \
      -style ${s}TEntry
  ttk::spinbox .sbox$k -textvariable val \
      -width 5 \
      -from 1 -to 100 -increment 0.1 \
      -font $tfont \
      -style ${s}TSpinbox
  pack .sc$k .pb$k .ent$k .sbox$k \
      -in .hf$k -side top -anchor w -padx 3p -pady 3p

  ttk::frame .vf$k
  ttk::scale .scv$k \
      -orient vertical \
      -from 0 -to 100 \
      -variable val \
      -length [expr {round(100*$scalefactor)}] \
      -style ${s}Vertical.TScale
  ttk::progressbar .pbv$k -orient vertical \
      -mode determinate \
      -variable val \
      -length [expr {round(100*$scalefactor)}] \
      -style ${s}Vertical.TProgressbar
  pack .scv$k .pbv$k -in .vf$k -side right -padx 3p -pady 3p

  pack .hf$k .vf$k -in .lf$k -side left -anchor e
}
.lfSmall configure -text " Scaled "
pack .lf .lfSmall -in . -side left -padx 3p -pady 3p -expand 1 -fill both

Changes to assets/awthemes7/pkgIndex.tcl.
1
2
3
4
5
6
7
8
package ifneeded awthemes 7.2 \
    [list source [file join $dir awthemes.tcl]] 
package ifneeded colorutils 4.4 \
    [list source [file join $dir colorutils.tcl]] 

package ifneeded awdark 7.0 \
    [list source [file join $dir awdark.tcl]]
package ifneeded awlight 7.0 \
|







1
2
3
4
5
6
7
8
package ifneeded awthemes 7.3 \
    [list source [file join $dir awthemes.tcl]] 
package ifneeded colorutils 4.4 \
    [list source [file join $dir colorutils.tcl]] 

package ifneeded awdark 7.0 \
    [list source [file join $dir awdark.tcl]]
package ifneeded awlight 7.0 \
Name change from assets/bwidget1.9.13/CHANGES.txt to assets/bwidget1.9.14/CHANGES.txt.
Name change from assets/bwidget1.9.13/ChangeLog to assets/bwidget1.9.14/ChangeLog.




1
2
3
4
5
6
7




2019-11-12 Harald Oehlmann <oehhar@users.sourceforge.net>
	spinbox.tcl: fix error about unsupported option
	-disabledforeground when using themed widgets.
	Thanks to Gerhard Reithofer and Christian Werner.
	Ticket [071fc80f14]

2019-05-06 Harald Oehlmann <oehhar@users.sourceforge.net>
>
>
>
>







1
2
3
4
5
6
7
8
9
10
11
2019-12-03 Harald Oehlmann <oehhar@users.sourceforge.net>

	**** BWidget 1.9.14 tagged ****

2019-11-12 Harald Oehlmann <oehhar@users.sourceforge.net>
	spinbox.tcl: fix error about unsupported option
	-disabledforeground when using themed widgets.
	Thanks to Gerhard Reithofer and Christian Werner.
	Ticket [071fc80f14]

2019-05-06 Harald Oehlmann <oehhar@users.sourceforge.net>
Name change from assets/bwidget1.9.13/LICENSE.txt to assets/bwidget1.9.14/LICENSE.txt.
Name change from assets/bwidget1.9.13/README.txt to assets/bwidget1.9.14/README.txt.
Name change from assets/bwidget1.9.13/arrow.tcl to assets/bwidget1.9.14/arrow.tcl.
Name change from assets/bwidget1.9.13/bitmap.tcl to assets/bwidget1.9.14/bitmap.tcl.
Name change from assets/bwidget1.9.13/button.tcl to assets/bwidget1.9.14/button.tcl.
Name change from assets/bwidget1.9.13/buttonbox.tcl to assets/bwidget1.9.14/buttonbox.tcl.
Name change from assets/bwidget1.9.13/color.tcl to assets/bwidget1.9.14/color.tcl.
Name change from assets/bwidget1.9.13/combobox.tcl to assets/bwidget1.9.14/combobox.tcl.
Name change from assets/bwidget1.9.13/demo/basic.tcl to assets/bwidget1.9.14/demo/basic.tcl.
Name change from assets/bwidget1.9.13/demo/bwidget.xbm to assets/bwidget1.9.14/demo/bwidget.xbm.
Name change from assets/bwidget1.9.13/demo/demo.tcl to assets/bwidget1.9.14/demo/demo.tcl.
Name change from assets/bwidget1.9.13/demo/dnd.tcl to assets/bwidget1.9.14/demo/dnd.tcl.
Name change from assets/bwidget1.9.13/demo/manager.tcl to assets/bwidget1.9.14/demo/manager.tcl.
Name change from assets/bwidget1.9.13/demo/select.tcl to assets/bwidget1.9.14/demo/select.tcl.
Name change from assets/bwidget1.9.13/demo/tmpldlg.tcl to assets/bwidget1.9.14/demo/tmpldlg.tcl.
Name change from assets/bwidget1.9.13/demo/tree.tcl to assets/bwidget1.9.14/demo/tree.tcl.
Name change from assets/bwidget1.9.13/demo/x1.xbm to assets/bwidget1.9.14/demo/x1.xbm.
Name change from assets/bwidget1.9.13/dialog.tcl to assets/bwidget1.9.14/dialog.tcl.
Name change from assets/bwidget1.9.13/dragsite.tcl to assets/bwidget1.9.14/dragsite.tcl.
Name change from assets/bwidget1.9.13/dropsite.tcl to assets/bwidget1.9.14/dropsite.tcl.
Name change from assets/bwidget1.9.13/dynhelp.tcl to assets/bwidget1.9.14/dynhelp.tcl.
Name change from assets/bwidget1.9.13/entry.tcl to assets/bwidget1.9.14/entry.tcl.
Name change from assets/bwidget1.9.13/font.tcl to assets/bwidget1.9.14/font.tcl.
Name change from assets/bwidget1.9.13/images/bold.gif to assets/bwidget1.9.14/images/bold.gif.

cannot compute difference between binary files

Name change from assets/bwidget1.9.13/images/copy.gif to assets/bwidget1.9.14/images/copy.gif.

cannot compute difference between binary files

Name change from assets/bwidget1.9.13/images/cut.gif to assets/bwidget1.9.14/images/cut.gif.

cannot compute difference between binary files

Name change from assets/bwidget1.9.13/images/dragfile.gif to assets/bwidget1.9.14/images/dragfile.gif.

cannot compute difference between binary files

Name change from assets/bwidget1.9.13/images/dragicon.gif to assets/bwidget1.9.14/images/dragicon.gif.

cannot compute difference between binary files

Name change from assets/bwidget1.9.13/images/error.gif to assets/bwidget1.9.14/images/error.gif.

cannot compute difference between binary files

Name change from assets/bwidget1.9.13/images/file.gif to assets/bwidget1.9.14/images/file.gif.

cannot compute difference between binary files

Name change from assets/bwidget1.9.13/images/folder.gif to assets/bwidget1.9.14/images/folder.gif.

cannot compute difference between binary files

Name change from assets/bwidget1.9.13/images/hourglass.gif to assets/bwidget1.9.14/images/hourglass.gif.

cannot compute difference between binary files

Name change from assets/bwidget1.9.13/images/info.gif to assets/bwidget1.9.14/images/info.gif.

cannot compute difference between binary files

Name change from assets/bwidget1.9.13/images/italic.gif to assets/bwidget1.9.14/images/italic.gif.

cannot compute difference between binary files

Name change from assets/bwidget1.9.13/images/minus.xbm to assets/bwidget1.9.14/images/minus.xbm.
Name change from assets/bwidget1.9.13/images/new.gif to assets/bwidget1.9.14/images/new.gif.

cannot compute difference between binary files

Name change from assets/bwidget1.9.13/images/opcopy.xbm to assets/bwidget1.9.14/images/opcopy.xbm.
Name change from assets/bwidget1.9.13/images/open.gif to assets/bwidget1.9.14/images/open.gif.

cannot compute difference between binary files

Name change from assets/bwidget1.9.13/images/openfold.gif to assets/bwidget1.9.14/images/openfold.gif.

cannot compute difference between binary files

Name change from assets/bwidget1.9.13/images/oplink.xbm to assets/bwidget1.9.14/images/oplink.xbm.
Name change from assets/bwidget1.9.13/images/opmove.xbm to assets/bwidget1.9.14/images/opmove.xbm.
Name change from assets/bwidget1.9.13/images/overstrike.gif to assets/bwidget1.9.14/images/overstrike.gif.

cannot compute difference between binary files

Name change from assets/bwidget1.9.13/images/palette.gif to assets/bwidget1.9.14/images/palette.gif.

cannot compute difference between binary files

Name change from assets/bwidget1.9.13/images/passwd.gif to assets/bwidget1.9.14/images/passwd.gif.

cannot compute difference between binary files

Name change from assets/bwidget1.9.13/images/paste.gif to assets/bwidget1.9.14/images/paste.gif.

cannot compute difference between binary files

Name change from assets/bwidget1.9.13/images/plus.xbm to assets/bwidget1.9.14/images/plus.xbm.
Name change from assets/bwidget1.9.13/images/print.gif to assets/bwidget1.9.14/images/print.gif.

cannot compute difference between binary files

Name change from assets/bwidget1.9.13/images/question.gif to assets/bwidget1.9.14/images/question.gif.

cannot compute difference between binary files

Name change from assets/bwidget1.9.13/images/redo.gif to assets/bwidget1.9.14/images/redo.gif.

cannot compute difference between binary files

Name change from assets/bwidget1.9.13/images/save.gif to assets/bwidget1.9.14/images/save.gif.

cannot compute difference between binary files

Name change from assets/bwidget1.9.13/images/target.xbm to assets/bwidget1.9.14/images/target.xbm.
Name change from assets/bwidget1.9.13/images/underline.gif to assets/bwidget1.9.14/images/underline.gif.

cannot compute difference between binary files

Name change from assets/bwidget1.9.13/images/undo.gif to assets/bwidget1.9.14/images/undo.gif.

cannot compute difference between binary files

Name change from assets/bwidget1.9.13/images/warning.gif to assets/bwidget1.9.14/images/warning.gif.

cannot compute difference between binary files

Name change from assets/bwidget1.9.13/init.tcl to assets/bwidget1.9.14/init.tcl.
Name change from assets/bwidget1.9.13/label.tcl to assets/bwidget1.9.14/label.tcl.
Name change from assets/bwidget1.9.13/labelentry.tcl to assets/bwidget1.9.14/labelentry.tcl.
Name change from assets/bwidget1.9.13/labelframe.tcl to assets/bwidget1.9.14/labelframe.tcl.
Name change from assets/bwidget1.9.13/lang/da.rc to assets/bwidget1.9.14/lang/da.rc.
Name change from assets/bwidget1.9.13/lang/de.rc to assets/bwidget1.9.14/lang/de.rc.
Name change from assets/bwidget1.9.13/lang/en.rc to assets/bwidget1.9.14/lang/en.rc.
Name change from assets/bwidget1.9.13/lang/es.rc to assets/bwidget1.9.14/lang/es.rc.
Name change from assets/bwidget1.9.13/lang/fr.rc to assets/bwidget1.9.14/lang/fr.rc.
Name change from assets/bwidget1.9.13/lang/hu.rc to assets/bwidget1.9.14/lang/hu.rc.
Name change from assets/bwidget1.9.13/lang/nl.rc to assets/bwidget1.9.14/lang/nl.rc.
Name change from assets/bwidget1.9.13/lang/no.rc to assets/bwidget1.9.14/lang/no.rc.
Name change from assets/bwidget1.9.13/lang/pl.rc to assets/bwidget1.9.14/lang/pl.rc.
Name change from assets/bwidget1.9.13/listbox.tcl to assets/bwidget1.9.14/listbox.tcl.
Name change from assets/bwidget1.9.13/mainframe.tcl to assets/bwidget1.9.14/mainframe.tcl.
Name change from assets/bwidget1.9.13/messagedlg.tcl to assets/bwidget1.9.14/messagedlg.tcl.
Name change from assets/bwidget1.9.13/notebook.tcl to assets/bwidget1.9.14/notebook.tcl.
Name change from assets/bwidget1.9.13/pagesmgr.tcl to assets/bwidget1.9.14/pagesmgr.tcl.
Name change from assets/bwidget1.9.13/panedw.tcl to assets/bwidget1.9.14/panedw.tcl.
Name change from assets/bwidget1.9.13/panelframe.tcl to assets/bwidget1.9.14/panelframe.tcl.
Name change from assets/bwidget1.9.13/passwddlg.tcl to assets/bwidget1.9.14/passwddlg.tcl.
Name change from assets/bwidget1.9.13/pkgIndex.tcl to assets/bwidget1.9.14/pkgIndex.tcl.
1
2
3
4
5
6
7
8
9
10
11
12
13
if {[catch {package require Tcl}]} return
# NOTE: auto_loaded top-level commands shall not be qualified (no leading ::)
# but all others should.  See auto_qualify for details.
package ifneeded BWidget 1.9.13 "\
    package require Tk 8.1.1;\
    [list tclPkgSetup $dir BWidget 1.9.13 {
	{arrow.tcl       source {ArrowButton ::ArrowButton::create ::ArrowButton::use}}
	{labelframe.tcl  source {LabelFrame ::LabelFrame::create ::LabelFrame::use}}
	{labelentry.tcl  source {LabelEntry ::LabelEntry::create ::LabelEntry::use}}
	{bitmap.tcl      source {::Bitmap::get ::Bitmap::use}}
	{button.tcl      source {Button ::Button::create ::Button::use}}
	{buttonbox.tcl   source {ButtonBox ::ButtonBox::create ::ButtonBox::use}}
	{combobox.tcl    source {ComboBox ::ComboBox::create ::ComboBox::use}}



|

|







1
2
3
4
5
6
7
8
9
10
11
12
13
if {[catch {package require Tcl}]} return
# NOTE: auto_loaded top-level commands shall not be qualified (no leading ::)
# but all others should.  See auto_qualify for details.
package ifneeded BWidget 1.9.14 "\
    package require Tk 8.1.1;\
    [list tclPkgSetup $dir BWidget 1.9.14 {
	{arrow.tcl       source {ArrowButton ::ArrowButton::create ::ArrowButton::use}}
	{labelframe.tcl  source {LabelFrame ::LabelFrame::create ::LabelFrame::use}}
	{labelentry.tcl  source {LabelEntry ::LabelEntry::create ::LabelEntry::use}}
	{bitmap.tcl      source {::Bitmap::get ::Bitmap::use}}
	{button.tcl      source {Button ::Button::create ::Button::use}}
	{buttonbox.tcl   source {ButtonBox ::ButtonBox::create ::ButtonBox::use}}
	{combobox.tcl    source {ComboBox ::ComboBox::create ::ComboBox::use}}
Name change from assets/bwidget1.9.13/progressbar.tcl to assets/bwidget1.9.14/progressbar.tcl.
Name change from assets/bwidget1.9.13/progressdlg.tcl to assets/bwidget1.9.14/progressdlg.tcl.
Name change from assets/bwidget1.9.13/scrollframe.tcl to assets/bwidget1.9.14/scrollframe.tcl.
Name change from assets/bwidget1.9.13/scrollview.tcl to assets/bwidget1.9.14/scrollview.tcl.
Name change from assets/bwidget1.9.13/scrollw.tcl to assets/bwidget1.9.14/scrollw.tcl.
Name change from assets/bwidget1.9.13/separator.tcl to assets/bwidget1.9.14/separator.tcl.
Name change from assets/bwidget1.9.13/spinbox.tcl to assets/bwidget1.9.14/spinbox.tcl.
Name change from assets/bwidget1.9.13/statusbar.tcl to assets/bwidget1.9.14/statusbar.tcl.
Name change from assets/bwidget1.9.13/titleframe.tcl to assets/bwidget1.9.14/titleframe.tcl.
Name change from assets/bwidget1.9.13/tree.tcl to assets/bwidget1.9.14/tree.tcl.
Name change from assets/bwidget1.9.13/utils.tcl to assets/bwidget1.9.14/utils.tcl.
Name change from assets/bwidget1.9.13/widget.tcl to assets/bwidget1.9.14/widget.tcl.
Name change from assets/bwidget1.9.13/wizard.tcl to assets/bwidget1.9.14/wizard.tcl.
Name change from assets/bwidget1.9.13/xpm2image.tcl to assets/bwidget1.9.14/xpm2image.tcl.
Changes to assets/tclws2.6.0/ClientSide.tcl.
1
2
3
4
5
6
7
8
9
10
###############################################################################
##                                                                           ##
##  Copyright (c) 2016-2017, Harald Oehlmann                                 ##
##  Copyright (c) 2006-2013, Gerald W. Lester                                ##
##  Copyright (c) 2008, Georgios Petasis                                     ##
##  Copyright (c) 2006, Visiprise Software, Inc                              ##
##  Copyright (c) 2006, Arnulf Wiedemann                                     ##
##  Copyright (c) 2006, Colin McCormack                                      ##
##  Copyright (c) 2006, Rolf Ade                                             ##
##  Copyright (c) 2001-2006, Pat Thoyts                                      ##


|







1
2
3
4
5
6
7
8
9
10
###############################################################################
##                                                                           ##
##  Copyright (c) 2016-2019, Harald Oehlmann                                 ##
##  Copyright (c) 2006-2013, Gerald W. Lester                                ##
##  Copyright (c) 2008, Georgios Petasis                                     ##
##  Copyright (c) 2006, Visiprise Software, Inc                              ##
##  Copyright (c) 2006, Arnulf Wiedemann                                     ##
##  Copyright (c) 2006, Colin McCormack                                      ##
##  Copyright (c) 2006, Rolf Ade                                             ##
##  Copyright (c) 2001-2006, Pat Thoyts                                      ##
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
package require Tcl 8.4
package require WS::Utils 2.4 ; # dict, lassign, logsubst
package require tdom 0.8
package require http 2
package require log
package require uri

package provide WS::Client 2.6.0

namespace eval ::WS::Client {
    # register https only if not yet registered
    if {[catch { http::unregister https } lPortCmd]} {
        # not registered -> register on my own
        if {[catch {
            package require tls







|







43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
package require Tcl 8.4
package require WS::Utils 2.4 ; # dict, lassign, logsubst
package require tdom 0.8
package require http 2
package require log
package require uri

package provide WS::Client 2.6.3

namespace eval ::WS::Client {
    # register https only if not yet registered
    if {[catch { http::unregister https } lPortCmd]} {
        # not registered -> register on my own
        if {[catch {
            package require tls
2050
2051
2052
2053
2054
2055
2056

2057
2058
2059
2060
2061
2062
2063
2064
2065
2066
2067
2068
2069
2070

2071
2072
2073
2074
2075
2076
2077
2078
2079
2080

2081
2082

2083

2084
2085
2086
2087
2088
2089
2090
2091
2092
2093
2094
2095
    set body [::http::data $token]
    ::log::logsubst info {\nReceived: $body}
    set results {}
    if {[::http::status $token] ne {ok} ||
        ( [::http::ncode $token] != 200 && $body eq {} )} {
        set errorCode [list WS CLIENT HTTPERROR [::http::code $token]]
        set hadError 1

        set errorInfo [FormatHTTPError $token]
    } else {
        SaveAndSetOptions $serviceName
        if {[catch {set hadError [catch {parseResults $serviceName $operationName $body} results]} err]} {
            RestoreSavedOptions $serviceName
            return -code error -errorcode $::errorCode -errorinfo $::errorInfo $err
        } else {
            RestoreSavedOptions $serviceName
        }
        if {$hadError} {
            set errorCode $::errorCode
            set errorInfo $::errorInfo
        }
    }


    ##
    ## Call the appropriate callback
    ##
    if {$hadError} {
        set cmd $errorCmd
        lappend cmd $errorCode $errorInfo
    } else {
        set cmd $succesCmd
    }

    lappend cmd $results
    catch $cmd



    ##
    ## All done
    ##
    ::http::cleanup $token
    return;
}

###########################################################################
#
# Private Procedure Header - as this procedure is modified, please be sure
#                            that you update this header block. Thanks.
#







>
|


|
|
<
<
<
<





>










>
|
|
>
|
>



<
|







2050
2051
2052
2053
2054
2055
2056
2057
2058
2059
2060
2061
2062




2063
2064
2065
2066
2067
2068
2069
2070
2071
2072
2073
2074
2075
2076
2077
2078
2079
2080
2081
2082
2083
2084
2085
2086
2087

2088
2089
2090
2091
2092
2093
2094
2095
    set body [::http::data $token]
    ::log::logsubst info {\nReceived: $body}
    set results {}
    if {[::http::status $token] ne {ok} ||
        ( [::http::ncode $token] != 200 && $body eq {} )} {
        set errorCode [list WS CLIENT HTTPERROR [::http::code $token]]
        set hadError 1
        set results [FormatHTTPError $token]
        set errorInfo ""
    } else {
        SaveAndSetOptions $serviceName
        set hadError [catch {parseResults $serviceName $operationName $body} results]
        RestoreSavedOptions $serviceName




        if {$hadError} {
            set errorCode $::errorCode
            set errorInfo $::errorInfo
        }
    }
    ::http::cleanup $token

    ##
    ## Call the appropriate callback
    ##
    if {$hadError} {
        set cmd $errorCmd
        lappend cmd $errorCode $errorInfo
    } else {
        set cmd $succesCmd
    }
    if {$cmd ne ""} {
        lappend cmd $results
        if {[catch $cmd cmdErr]} {
            ::log::log error "Error invoking callback '$cmd': $cmdErr" 
        }
    }
    ##
    ## All done
    ##

    return
}

###########################################################################
#
# Private Procedure Header - as this procedure is modified, please be sure
#                            that you update this header block. Thanks.
#
Changes to assets/tclws2.6.0/pkgIndex.tcl.
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
# Tcl package index file, version 1.1
# This file is generated by the "pkg_mkIndex -direct" command
# and sourced either when an application starts up or
# by a "package unknown" script.  It invokes the
# "package ifneeded" command to set up package-related
# information so that packages will be loaded automatically
# in response to "package require" commands.  When this
# script is sourced, the variable $dir must contain the
# full path name of this file's directory.

package ifneeded WS::AOLserver 2.4.0 [list source [file join $dir AOLserver.tcl]]
package ifneeded WS::Channel 2.4.0 [list source [file join $dir ChannelServer.tcl]]
package ifneeded WS::Client 2.6.0 [list source [file join $dir ClientSide.tcl]]
package ifneeded WS::Embeded 2.6.0 [list source [file join $dir Embedded.tcl]]
package ifneeded WS::Embedded 2.6.0 [list source [file join $dir Embedded.tcl]]
package ifneeded WS::Server 2.6.0 [list source [file join $dir ServerSide.tcl]]
package ifneeded WS::Utils 2.6.2 [list source [file join $dir Utilities.tcl]]
package ifneeded WS::Wub 2.4.0 [list source [file join $dir WubServer.tcl]]
package ifneeded Wsdl 2.4.0 [list source [file join $dir WubServer.tcl]]












|






1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
# Tcl package index file, version 1.1
# This file is generated by the "pkg_mkIndex -direct" command
# and sourced either when an application starts up or
# by a "package unknown" script.  It invokes the
# "package ifneeded" command to set up package-related
# information so that packages will be loaded automatically
# in response to "package require" commands.  When this
# script is sourced, the variable $dir must contain the
# full path name of this file's directory.

package ifneeded WS::AOLserver 2.4.0 [list source [file join $dir AOLserver.tcl]]
package ifneeded WS::Channel 2.4.0 [list source [file join $dir ChannelServer.tcl]]
package ifneeded WS::Client 2.6.3 [list source [file join $dir ClientSide.tcl]]
package ifneeded WS::Embeded 2.6.0 [list source [file join $dir Embedded.tcl]]
package ifneeded WS::Embedded 2.6.0 [list source [file join $dir Embedded.tcl]]
package ifneeded WS::Server 2.6.0 [list source [file join $dir ServerSide.tcl]]
package ifneeded WS::Utils 2.6.2 [list source [file join $dir Utilities.tcl]]
package ifneeded WS::Wub 2.4.0 [list source [file join $dir WubServer.tcl]]
package ifneeded Wsdl 2.4.0 [list source [file join $dir WubServer.tcl]]