arcadia 0.11.0 → 0.11.1
Sign up to get free protection for your applications and to get access to all the features.
- data/README +5 -13
- data/conf/theme-dark.conf +2 -2
- data/conf/theme-dark.res.rb +51 -66
- data/ext/ae-editor/ae-editor.rb +20 -15
- data/ext/ae-editor/langs/css.lang +5 -0
- data/ext/ae-editor/langs/html.lang +5 -0
- data/lib/a-core.rb +4 -3
- data/tcl/{bwidget-1.9.4 → bwidget-1.9.5}/BWman/ArrowButton.html +0 -0
- data/tcl/{bwidget-1.9.4 → bwidget-1.9.5}/BWman/BWidget.html +0 -0
- data/tcl/{bwidget-1.9.4 → bwidget-1.9.5}/BWman/Button.html +0 -0
- data/tcl/{bwidget-1.9.4 → bwidget-1.9.5}/BWman/ButtonBox.html +0 -0
- data/tcl/{bwidget-1.9.4 → bwidget-1.9.5}/BWman/ComboBox.html +0 -0
- data/tcl/{bwidget-1.9.4 → bwidget-1.9.5}/BWman/Dialog.html +0 -0
- data/tcl/{bwidget-1.9.4 → bwidget-1.9.5}/BWman/DragSite.html +0 -0
- data/tcl/{bwidget-1.9.4 → bwidget-1.9.5}/BWman/DropSite.html +0 -0
- data/tcl/{bwidget-1.9.4 → bwidget-1.9.5}/BWman/DynamicHelp.html +0 -0
- data/tcl/{bwidget-1.9.4 → bwidget-1.9.5}/BWman/Entry.html +0 -0
- data/tcl/{bwidget-1.9.4 → bwidget-1.9.5}/BWman/Label.html +0 -0
- data/tcl/{bwidget-1.9.4 → bwidget-1.9.5}/BWman/LabelEntry.html +0 -0
- data/tcl/{bwidget-1.9.4 → bwidget-1.9.5}/BWman/LabelFrame.html +0 -0
- data/tcl/{bwidget-1.9.4 → bwidget-1.9.5}/BWman/ListBox.html +0 -0
- data/tcl/{bwidget-1.9.4 → bwidget-1.9.5}/BWman/MainFrame.html +6 -0
- data/tcl/{bwidget-1.9.4 → bwidget-1.9.5}/BWman/MessageDlg.html +0 -0
- data/tcl/{bwidget-1.9.4 → bwidget-1.9.5}/BWman/NoteBook.html +0 -0
- data/tcl/{bwidget-1.9.4 → bwidget-1.9.5}/BWman/PagesManager.html +0 -0
- data/tcl/{bwidget-1.9.4 → bwidget-1.9.5}/BWman/PanedWindow.html +0 -0
- data/tcl/{bwidget-1.9.4 → bwidget-1.9.5}/BWman/PanelFrame.html +0 -0
- data/tcl/{bwidget-1.9.4 → bwidget-1.9.5}/BWman/PasswdDlg.html +0 -0
- data/tcl/{bwidget-1.9.4 → bwidget-1.9.5}/BWman/ProgressBar.html +0 -0
- data/tcl/{bwidget-1.9.4 → bwidget-1.9.5}/BWman/ProgressDlg.html +0 -0
- data/tcl/{bwidget-1.9.4 → bwidget-1.9.5}/BWman/ScrollView.html +0 -0
- data/tcl/{bwidget-1.9.4 → bwidget-1.9.5}/BWman/ScrollableFrame.html +0 -0
- data/tcl/{bwidget-1.9.4 → bwidget-1.9.5}/BWman/ScrolledWindow.html +0 -0
- data/tcl/{bwidget-1.9.4 → bwidget-1.9.5}/BWman/SelectColor.html +0 -0
- data/tcl/{bwidget-1.9.4 → bwidget-1.9.5}/BWman/SelectFont.html +0 -0
- data/tcl/{bwidget-1.9.4 → bwidget-1.9.5}/BWman/Separator.html +0 -0
- data/tcl/{bwidget-1.9.4 → bwidget-1.9.5}/BWman/SpinBox.html +0 -0
- data/tcl/{bwidget-1.9.4 → bwidget-1.9.5}/BWman/StatusBar.html +0 -0
- data/tcl/{bwidget-1.9.4 → bwidget-1.9.5}/BWman/TitleFrame.html +0 -0
- data/tcl/{bwidget-1.9.4 → bwidget-1.9.5}/BWman/Tree.html +0 -0
- data/tcl/{bwidget-1.9.4 → bwidget-1.9.5}/BWman/Widget.html +0 -0
- data/tcl/{bwidget-1.9.4 → bwidget-1.9.5}/BWman/contents.html +0 -0
- data/tcl/{bwidget-1.9.4 → bwidget-1.9.5}/BWman/index.html +0 -0
- data/tcl/{bwidget-1.9.4 → bwidget-1.9.5}/BWman/navtree.html +0 -0
- data/tcl/{bwidget-1.9.4 → bwidget-1.9.5}/BWman/options.htm +0 -0
- data/tcl/{bwidget-1.9.4 → bwidget-1.9.5}/CHANGES.txt +0 -0
- data/tcl/{bwidget-1.9.4 → bwidget-1.9.5}/ChangeLog +79 -1
- data/tcl/{bwidget-1.9.4 → bwidget-1.9.5}/LICENSE.txt +0 -0
- data/tcl/{bwidget-1.9.4 → bwidget-1.9.5}/README.txt +0 -0
- data/tcl/{bwidget-1.9.4 → bwidget-1.9.5}/arrow.tcl +0 -0
- data/tcl/{bwidget-1.9.4 → bwidget-1.9.5}/bitmap.tcl +0 -0
- data/tcl/{bwidget-1.9.4 → bwidget-1.9.5}/button.tcl +2 -1
- data/tcl/{bwidget-1.9.4 → bwidget-1.9.5}/buttonbox.tcl +0 -0
- data/tcl/{bwidget-1.9.4 → bwidget-1.9.5}/color.tcl +0 -0
- data/tcl/{bwidget-1.9.4 → bwidget-1.9.5}/combobox.tcl +52 -24
- data/tcl/{bwidget-1.9.4 → bwidget-1.9.5}/demo/basic.tcl +0 -0
- data/tcl/{bwidget-1.9.4 → bwidget-1.9.5}/demo/bwidget.xbm +0 -0
- data/tcl/{bwidget-1.9.4 → bwidget-1.9.5}/demo/demo.tcl +0 -0
- data/tcl/{bwidget-1.9.4 → bwidget-1.9.5}/demo/dnd.tcl +0 -0
- data/tcl/{bwidget-1.9.4 → bwidget-1.9.5}/demo/manager.tcl +0 -0
- data/tcl/{bwidget-1.9.4 → bwidget-1.9.5}/demo/select.tcl +0 -0
- data/tcl/{bwidget-1.9.4 → bwidget-1.9.5}/demo/tmpldlg.tcl +0 -0
- data/tcl/{bwidget-1.9.4 → bwidget-1.9.5}/demo/tree.tcl +0 -0
- data/tcl/{bwidget-1.9.4 → bwidget-1.9.5}/demo/x1.xbm +0 -0
- data/tcl/{bwidget-1.9.4 → bwidget-1.9.5}/dialog.tcl +0 -0
- data/tcl/{bwidget-1.9.4 → bwidget-1.9.5}/dragsite.tcl +0 -0
- data/tcl/{bwidget-1.9.4 → bwidget-1.9.5}/dropsite.tcl +0 -0
- data/tcl/{bwidget-1.9.4 → bwidget-1.9.5}/dynhelp.tcl +0 -0
- data/tcl/{bwidget-1.9.4 → bwidget-1.9.5}/entry.tcl +37 -11
- data/tcl/{bwidget-1.9.4 → bwidget-1.9.5}/font.tcl +5 -1
- data/tcl/{bwidget-1.9.4 → bwidget-1.9.5}/images/bold.gif +0 -0
- data/tcl/{bwidget-1.9.4 → bwidget-1.9.5}/images/copy.gif +0 -0
- data/tcl/{bwidget-1.9.4 → bwidget-1.9.5}/images/cut.gif +0 -0
- data/tcl/{bwidget-1.9.4 → bwidget-1.9.5}/images/dragfile.gif +0 -0
- data/tcl/{bwidget-1.9.4 → bwidget-1.9.5}/images/dragicon.gif +0 -0
- data/tcl/{bwidget-1.9.4 → bwidget-1.9.5}/images/error.gif +0 -0
- data/tcl/{bwidget-1.9.4 → bwidget-1.9.5}/images/file.gif +0 -0
- data/tcl/{bwidget-1.9.4 → bwidget-1.9.5}/images/folder.gif +0 -0
- data/tcl/{bwidget-1.9.4 → bwidget-1.9.5}/images/hourglass.gif +0 -0
- data/tcl/{bwidget-1.9.4 → bwidget-1.9.5}/images/info.gif +0 -0
- data/tcl/{bwidget-1.9.4 → bwidget-1.9.5}/images/italic.gif +0 -0
- data/tcl/{bwidget-1.9.4 → bwidget-1.9.5}/images/minus.xbm +0 -0
- data/tcl/{bwidget-1.9.4 → bwidget-1.9.5}/images/new.gif +0 -0
- data/tcl/{bwidget-1.9.4 → bwidget-1.9.5}/images/opcopy.xbm +0 -0
- data/tcl/{bwidget-1.9.4 → bwidget-1.9.5}/images/open.gif +0 -0
- data/tcl/{bwidget-1.9.4 → bwidget-1.9.5}/images/openfold.gif +0 -0
- data/tcl/{bwidget-1.9.4 → bwidget-1.9.5}/images/oplink.xbm +0 -0
- data/tcl/{bwidget-1.9.4 → bwidget-1.9.5}/images/opmove.xbm +0 -0
- data/tcl/{bwidget-1.9.4 → bwidget-1.9.5}/images/overstrike.gif +0 -0
- data/tcl/{bwidget-1.9.4 → bwidget-1.9.5}/images/palette.gif +0 -0
- data/tcl/{bwidget-1.9.4 → bwidget-1.9.5}/images/passwd.gif +0 -0
- data/tcl/{bwidget-1.9.4 → bwidget-1.9.5}/images/paste.gif +0 -0
- data/tcl/{bwidget-1.9.4 → bwidget-1.9.5}/images/plus.xbm +0 -0
- data/tcl/{bwidget-1.9.4 → bwidget-1.9.5}/images/print.gif +0 -0
- data/tcl/{bwidget-1.9.4 → bwidget-1.9.5}/images/question.gif +0 -0
- data/tcl/{bwidget-1.9.4 → bwidget-1.9.5}/images/redo.gif +0 -0
- data/tcl/{bwidget-1.9.4 → bwidget-1.9.5}/images/save.gif +0 -0
- data/tcl/{bwidget-1.9.4 → bwidget-1.9.5}/images/target.xbm +0 -0
- data/tcl/{bwidget-1.9.4 → bwidget-1.9.5}/images/underline.gif +0 -0
- data/tcl/{bwidget-1.9.4 → bwidget-1.9.5}/images/undo.gif +0 -0
- data/tcl/{bwidget-1.9.4 → bwidget-1.9.5}/images/warning.gif +0 -0
- data/tcl/{bwidget-1.9.4 → bwidget-1.9.5}/init.tcl +0 -0
- data/tcl/{bwidget-1.9.4 → bwidget-1.9.5}/label.tcl +2 -2
- data/tcl/{bwidget-1.9.4 → bwidget-1.9.5}/labelentry.tcl +8 -3
- data/tcl/{bwidget-1.9.4 → bwidget-1.9.5}/labelframe.tcl +18 -8
- data/tcl/{bwidget-1.9.4 → bwidget-1.9.5}/lang/da.rc +13 -7
- data/tcl/{bwidget-1.9.4 → bwidget-1.9.5}/lang/de.rc +13 -7
- data/tcl/{bwidget-1.9.4 → bwidget-1.9.5}/lang/en.rc +13 -7
- data/tcl/{bwidget-1.9.4 → bwidget-1.9.5}/lang/es.rc +12 -7
- data/tcl/{bwidget-1.9.4 → bwidget-1.9.5}/lang/fr.rc +13 -7
- data/tcl/{bwidget-1.9.4 → bwidget-1.9.5}/lang/hu.rc +7 -0
- data/tcl/{bwidget-1.9.4 → bwidget-1.9.5}/lang/nl.rc +13 -7
- data/tcl/{bwidget-1.9.4 → bwidget-1.9.5}/lang/no.rc +13 -7
- data/tcl/{bwidget-1.9.4 → bwidget-1.9.5}/lang/pl.rc +13 -57
- data/tcl/{bwidget-1.9.4 → bwidget-1.9.5}/listbox.tcl +30 -14
- data/tcl/{bwidget-1.9.4 → bwidget-1.9.5}/mainframe.tcl +7 -2
- data/tcl/{bwidget-1.9.4 → bwidget-1.9.5}/messagedlg.tcl +0 -0
- data/tcl/{bwidget-1.9.4 → bwidget-1.9.5}/notebook.tcl +17 -10
- data/tcl/{bwidget-1.9.4 → bwidget-1.9.5}/pagesmgr.tcl +7 -3
- data/tcl/{bwidget-1.9.4 → bwidget-1.9.5}/panedw.tcl +0 -0
- data/tcl/{bwidget-1.9.4 → bwidget-1.9.5}/panelframe.tcl +0 -0
- data/tcl/{bwidget-1.9.4 → bwidget-1.9.5}/passwddlg.tcl +0 -0
- data/tcl/{bwidget-1.9.4 → bwidget-1.9.5}/pkgIndex.tcl +2 -2
- data/tcl/{bwidget-1.9.4 → bwidget-1.9.5}/progressbar.tcl +0 -0
- data/tcl/{bwidget-1.9.4 → bwidget-1.9.5}/progressdlg.tcl +0 -0
- data/tcl/{bwidget-1.9.4 → bwidget-1.9.5}/scrollframe.tcl +0 -0
- data/tcl/{bwidget-1.9.4 → bwidget-1.9.5}/scrollview.tcl +0 -0
- data/tcl/{bwidget-1.9.4 → bwidget-1.9.5}/scrollw.tcl +7 -6
- data/tcl/{bwidget-1.9.4 → bwidget-1.9.5}/separator.tcl +0 -0
- data/tcl/{bwidget-1.9.4 → bwidget-1.9.5}/spinbox.tcl +0 -0
- data/tcl/{bwidget-1.9.4 → bwidget-1.9.5}/statusbar.tcl +0 -0
- data/tcl/{bwidget-1.9.4 → bwidget-1.9.5}/tests/entry.test +0 -0
- data/tcl/{bwidget-1.9.4 → bwidget-1.9.5}/titleframe.tcl +0 -0
- data/tcl/{bwidget-1.9.4 → bwidget-1.9.5}/tree.tcl +3 -9
- data/tcl/{bwidget-1.9.4 → bwidget-1.9.5}/utils.tcl +0 -0
- data/tcl/{bwidget-1.9.4 → bwidget-1.9.5}/widget.tcl +0 -0
- data/tcl/{bwidget-1.9.4 → bwidget-1.9.5}/wizard.tcl +0 -0
- data/tcl/{bwidget-1.9.4 → bwidget-1.9.5}/xpm2image.tcl +0 -0
- metadata +136 -134
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
@@ -1,4 +1,82 @@
|
|
1
|
-
|
1
|
+
2011-06-24 Harald Oehlmann <oehhar@users.sourceforge.net>
|
2
|
+
|
3
|
+
**** BWidget 1.9.5 tagged ****
|
4
|
+
|
5
|
+
2011-06-23 Harald Oehlmann <oehhar@users.sourceforge.net>
|
6
|
+
|
7
|
+
* listbox.tcl (listbox::generate_data) fixed last patch
|
8
|
+
by ryotakatsuki [Bug 3324610]
|
9
|
+
|
10
|
+
2011-06-23 Harald Oehlmann <oehhar@users.sourceforge.net>
|
11
|
+
|
12
|
+
* listbox.tcl Fix of Bug 3000293 broke listbox tags.
|
13
|
+
The bindImage subcommand did not report right tag.
|
14
|
+
Patch by ryotakatsuki [Bug 3324610]
|
15
|
+
|
16
|
+
2011-06-23 Harald Oehlmann <oehhar@users.sourceforge.net>
|
17
|
+
|
18
|
+
* listbox.tcl, tree.tcl (_update_scrollregion) the linewise
|
19
|
+
scrolling did not always scroll up to the end on windows 7.
|
20
|
+
Report and patch by Wojciech Kocjan, review and modification
|
21
|
+
by Koen Danckaert [Bug 3317772]
|
22
|
+
|
23
|
+
2011-05-25 Harald Oehlmann <oehhar@users.sourceforge.net>
|
24
|
+
|
25
|
+
*mainframe.tcl: Add a boolean readonly option -sizegrip
|
26
|
+
to show a sizegrip widget in themed mode.
|
27
|
+
|
28
|
+
2011-05-24 Harald Oehlmann <oehhar@users.sourceforge.net>
|
29
|
+
|
30
|
+
*lang/pl.rc updated by Wojciech Kocjan.
|
31
|
+
|
32
|
+
2011-04-26 Harald Oehlmann <oehhar@users.sourceforge.net>
|
33
|
+
|
34
|
+
*notebook.tcl The user frame of the notebook is now a themed
|
35
|
+
frame in themed mode. The set background color does not apply
|
36
|
+
to the user frame in this case.
|
37
|
+
|
38
|
+
2011-04-26 Harald Oehlmann <oehhar@users.sourceforge.net>
|
39
|
+
|
40
|
+
label.tcl configuring foreground color caused error when
|
41
|
+
themed [Bug 3292977]
|
42
|
+
|
43
|
+
2011-04-20 Harald Oehlmann <oehhar@users.sourceforge.net>
|
44
|
+
|
45
|
+
lang/hu.rc by Rezso updated
|
46
|
+
|
47
|
+
2011-04-20 Harald Oehlmann <oehhar@users.sourceforge.net>
|
48
|
+
|
49
|
+
* font.tcl, lang/*.rc: Add translation possibility
|
50
|
+
for color picker button of font dialog.
|
51
|
+
Used google translater to translate "Color" to all languages.
|
52
|
+
Please check if this is correct. [Bug 3289573] reported by Rezso
|
53
|
+
|
54
|
+
2011-04-19 Harald Oehlmann <oehhar@users.sourceforge.net>
|
55
|
+
|
56
|
+
* lang/*.rc [Bug 3289573] : Add translation (templates) for the
|
57
|
+
Color picker widget text "Base colors" and "User colors".
|
58
|
+
Only german and english locals are provided so far.
|
59
|
+
|
60
|
+
2011-02-14 Harald Oehlmann <oehhar@users.sourceforge.net>
|
61
|
+
|
62
|
+
* combobox.tcl: [Bug 3182287] : ComboBox failes in themed mode
|
63
|
+
due to the use of the themed entry widget. The following options
|
64
|
+
are not supported (and thus called) any more: -relief
|
65
|
+
-highlightbackground -highlightforeground
|
66
|
+
|
67
|
+
2011-02-14 Harald Oehlmann <oehhar@users.sourceforge.net>
|
68
|
+
|
69
|
+
* entry.tcl, labelentry.tcl, labelframe.tcl, mainframe.tcl,
|
70
|
+
pagesmgr.tcl, scrollw.tcl: [Bug 3168761]:
|
71
|
+
entry failes when themed support activated with:
|
72
|
+
unknown option "-highlightthickness" (reported by George
|
73
|
+
on clt 27 Jan., 16:55).
|
74
|
+
The patch by Wojciech Kocjan fixes this and enhances
|
75
|
+
labelentry, labelframe and pagesmgr to also use themed frames.
|
76
|
+
Within scrollw.tcl, a bug for empty background handling is fixed.
|
77
|
+
The scrollbar background is not set any more for not-themed widget.
|
78
|
+
|
79
|
+
2011-01-17 Harald Oehlmann <oehhar@users.sourceforge.net>
|
2
80
|
|
3
81
|
* pkgIndex.tcl: corrected package version in package provide
|
4
82
|
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
@@ -1,7 +1,7 @@
|
|
1
1
|
# ----------------------------------------------------------------------------
|
2
2
|
# combobox.tcl
|
3
3
|
# This file is part of Unifix BWidget Toolkit
|
4
|
-
# $Id: combobox.tcl,v 1.42.2.
|
4
|
+
# $Id: combobox.tcl,v 1.42.2.2 2011/03/02 13:11:12 oehhar Exp $
|
5
5
|
# ----------------------------------------------------------------------------
|
6
6
|
# Index of commands:
|
7
7
|
# - ComboBox::create
|
@@ -86,8 +86,13 @@ proc ComboBox::create { path args } {
|
|
86
86
|
|
87
87
|
bindtags $path [list $path BwComboBox [winfo toplevel $path] all]
|
88
88
|
|
89
|
-
|
90
|
-
|
89
|
+
if {[Widget::theme]} {
|
90
|
+
set entry [eval [list Entry::create $path.e] $maps(.e) \
|
91
|
+
[list -takefocus 1]]
|
92
|
+
} else {
|
93
|
+
set entry [eval [list Entry::create $path.e] $maps(.e) \
|
94
|
+
[list -relief flat -borderwidth 0 -takefocus 1]]
|
95
|
+
}
|
91
96
|
|
92
97
|
::bind $path.e <FocusOut> [list $path _focus_out]
|
93
98
|
::bind $path <<TraverseIn>> [list $path _traverse_in]
|
@@ -477,14 +482,23 @@ proc ComboBox::_create_popup { path } {
|
|
477
482
|
set sw [ScrolledWindow $shell.sw -managed 1 -size $sbwidth -ipad 0]
|
478
483
|
|
479
484
|
if {$bw} {
|
480
|
-
|
481
|
-
|
482
|
-
|
483
|
-
|
484
|
-
|
485
|
-
|
486
|
-
|
487
|
-
|
485
|
+
if {[Widget::theme]} {
|
486
|
+
set listb [ListBox $shell.listb \
|
487
|
+
-relief flat -borderwidth 0 -highlightthickness 0 \
|
488
|
+
-selectmode single -selectfill 1 -autofocus 0 -height $h \
|
489
|
+
-font [Widget::cget $path -font] \
|
490
|
+
-bg [Widget::cget $path -entrybg] \
|
491
|
+
-fg [Widget::cget $path -foreground]]
|
492
|
+
} else {
|
493
|
+
set listb [ListBox $shell.listb \
|
494
|
+
-relief flat -borderwidth 0 -highlightthickness 0 \
|
495
|
+
-selectmode single -selectfill 1 -autofocus 0 -height $h \
|
496
|
+
-font [Widget::cget $path -font] \
|
497
|
+
-bg [Widget::cget $path -entrybg] \
|
498
|
+
-fg [Widget::cget $path -foreground] \
|
499
|
+
-selectbackground [Widget::cget $path -selectbackground] \
|
500
|
+
-selectforeground [Widget::cget $path -selectforeground]]
|
501
|
+
}
|
488
502
|
|
489
503
|
set values [Widget::cget $path -values]
|
490
504
|
set images [Widget::cget $path -images]
|
@@ -498,16 +512,27 @@ proc ComboBox::_create_popup { path } {
|
|
498
512
|
$listb bindImage <Enter> [list $listb selection set]
|
499
513
|
}
|
500
514
|
} else {
|
501
|
-
|
502
|
-
|
503
|
-
|
504
|
-
|
505
|
-
|
506
|
-
|
507
|
-
|
508
|
-
|
509
|
-
|
510
|
-
|
515
|
+
if {[Widget::theme]} {
|
516
|
+
set listb [listbox $shell.listb \
|
517
|
+
-relief flat -borderwidth 0 -highlightthickness 0 \
|
518
|
+
-exportselection false \
|
519
|
+
-font [Widget::cget $path -font] \
|
520
|
+
-height $h \
|
521
|
+
-bg [Widget::cget $path -entrybg] \
|
522
|
+
-fg [Widget::cget $path -foreground] \
|
523
|
+
-listvariable [Widget::varForOption $path -values]]
|
524
|
+
} else {
|
525
|
+
set listb [listbox $shell.listb \
|
526
|
+
-relief flat -borderwidth 0 -highlightthickness 0 \
|
527
|
+
-exportselection false \
|
528
|
+
-font [Widget::cget $path -font] \
|
529
|
+
-height $h \
|
530
|
+
-bg [Widget::cget $path -entrybg] \
|
531
|
+
-fg [Widget::cget $path -foreground] \
|
532
|
+
-selectbackground [Widget::cget $path -selectbackground] \
|
533
|
+
-selectforeground [Widget::cget $path -selectforeground] \
|
534
|
+
-listvariable [Widget::varForOption $path -values]]
|
535
|
+
}
|
511
536
|
::bind $listb <ButtonRelease-1> [list ComboBox::_select $path @%x,%y]
|
512
537
|
|
513
538
|
if {[Widget::cget $path -hottrack]} {
|
@@ -567,9 +592,12 @@ proc ComboBox::_recreate_popup { path } {
|
|
567
592
|
-height $h \
|
568
593
|
-font [Widget::cget $path -font] \
|
569
594
|
-bg [Widget::cget $path -entrybg] \
|
570
|
-
-fg [Widget::cget $path -foreground]
|
571
|
-
|
572
|
-
|
595
|
+
-fg [Widget::cget $path -foreground]
|
596
|
+
if {![Widget::theme]} {
|
597
|
+
$listb configure \
|
598
|
+
-selectbackground [Widget::cget $path -selectbackground] \
|
599
|
+
-selectforeground [Widget::cget $path -selectforeground]
|
600
|
+
}
|
573
601
|
pack $sw -fill both -expand yes
|
574
602
|
$sw setwidget $listb
|
575
603
|
raise $listb
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
@@ -1,7 +1,7 @@
|
|
1
1
|
# ------------------------------------------------------------------------------
|
2
2
|
# entry.tcl
|
3
3
|
# This file is part of Unifix BWidget Toolkit
|
4
|
-
# $Id: entry.tcl,v 1.22
|
4
|
+
# $Id: entry.tcl,v 1.22.2.1 2011/02/14 16:56:09 oehhar Exp $
|
5
5
|
# ------------------------------------------------------------------------------
|
6
6
|
# Index of commands:
|
7
7
|
# - Entry::create
|
@@ -64,9 +64,15 @@ namespace eval Entry {
|
|
64
64
|
COLOR {move {}}
|
65
65
|
}
|
66
66
|
|
67
|
-
|
68
|
-
|
69
|
-
|
67
|
+
if {[Widget::theme]} {
|
68
|
+
foreach event [bind TEntry] {
|
69
|
+
bind BwEntry $event [bind TEntry $event]
|
70
|
+
}
|
71
|
+
} else {
|
72
|
+
foreach event [bind Entry] {
|
73
|
+
bind BwEntry $event [bind Entry $event]
|
74
|
+
}
|
75
|
+
}
|
70
76
|
|
71
77
|
# Copy is kind of a special event. It should be enabled when the
|
72
78
|
# widget is editable but not disabled, and not when the widget is disabled.
|
@@ -92,17 +98,29 @@ proc Entry::create { path args } {
|
|
92
98
|
array set maps [Widget::parseArgs Entry $args]
|
93
99
|
|
94
100
|
set data(afterid) ""
|
95
|
-
|
101
|
+
if {[Widget::theme]} {
|
102
|
+
eval [list ttk::entry $path] $maps(:cmd)
|
103
|
+
} else {
|
104
|
+
eval [list entry $path] $maps(:cmd)
|
105
|
+
}
|
96
106
|
Widget::initFromODB Entry $path $maps(Entry)
|
97
107
|
set state [Widget::getMegawidgetOption $path -state]
|
98
108
|
set editable [Widget::getMegawidgetOption $path -editable]
|
99
109
|
set text [Widget::getMegawidgetOption $path -text]
|
100
110
|
if { $editable && [string equal $state "normal"] } {
|
101
111
|
bindtags $path [list $path BwEntry [winfo toplevel $path] all]
|
102
|
-
|
112
|
+
if {[Widget::theme]} {
|
113
|
+
$path configure -takefocus 1
|
114
|
+
} else {
|
115
|
+
$path configure -takefocus 1 -insertontime 600
|
116
|
+
}
|
103
117
|
} else {
|
104
118
|
bindtags $path [list $path BwDisabledEntry [winfo toplevel $path] all]
|
105
|
-
|
119
|
+
if {[Widget::theme]} {
|
120
|
+
$path configure -takefocus 0
|
121
|
+
} else {
|
122
|
+
$path configure -takefocus 0 -insertontime 0
|
123
|
+
}
|
106
124
|
}
|
107
125
|
if { $editable == 0 } {
|
108
126
|
$path configure -cursor left_ptr
|
@@ -166,20 +184,28 @@ proc Entry::configure { path args } {
|
|
166
184
|
if { $idx != -1 } {
|
167
185
|
bindtags $path [lreplace $btags $idx $idx BwEntry]
|
168
186
|
}
|
169
|
-
|
187
|
+
if {[Widget::theme]} {
|
188
|
+
$path:cmd configure -takefocus 1
|
189
|
+
} else {
|
190
|
+
$path:cmd configure -takefocus 1 -insertontime 600
|
191
|
+
}
|
170
192
|
} else {
|
171
193
|
set idx [lsearch $btags BwEntry]
|
172
194
|
if { $idx != -1 } {
|
173
195
|
bindtags $path [lreplace $btags $idx $idx BwDisabledEntry]
|
174
196
|
}
|
175
|
-
|
197
|
+
if {[Widget::theme]} {
|
198
|
+
$path:cmd configure -takefocus 0
|
199
|
+
} else {
|
200
|
+
$path:cmd configure -takefocus 0 -insertontime 0
|
201
|
+
}
|
176
202
|
if { [string equal [focus] $path] } {
|
177
203
|
focus .
|
178
204
|
}
|
179
205
|
}
|
180
206
|
}
|
181
207
|
|
182
|
-
if { $chstate || $chfg || $chdfg || $chbg || $chdbg } {
|
208
|
+
if { ![Widget::theme] && ($chstate || $chfg || $chdfg || $chbg || $chdbg) } {
|
183
209
|
set state [Widget::getMegawidgetOption $path -state]
|
184
210
|
if { [string equal $state "disabled"] } {
|
185
211
|
$path:cmd configure \
|
@@ -267,7 +293,7 @@ proc Entry::_path_command { path cmd larg } {
|
|
267
293
|
return [eval [linsert $larg 0 Entry::$cmd $path]]
|
268
294
|
}
|
269
295
|
default {
|
270
|
-
return [
|
296
|
+
return [uplevel 2 [linsert $larg 0 $path:cmd $cmd]]
|
271
297
|
}
|
272
298
|
}
|
273
299
|
}
|
@@ -227,8 +227,12 @@ proc SelectFont::create { path args } {
|
|
227
227
|
set script "set [list SelectFont::${path}(fontcolor)] \[tk_chooseColor -parent $colf.button -initialcolor \[set [list SelectFont::${path}(fontcolor)]\]\];\
|
228
228
|
SelectFont::_update [list $path]"
|
229
229
|
|
230
|
+
set name [lindex [BWidget::getname colorPicker] 0]
|
231
|
+
if { $name == "" } {
|
232
|
+
set name "Color..."
|
233
|
+
}
|
230
234
|
set but [button $colf.button -command $script \
|
231
|
-
-text
|
235
|
+
-text $name]
|
232
236
|
|
233
237
|
$lab configure -foreground $thecolor
|
234
238
|
$frc configure -bg $thecolor
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
@@ -1,7 +1,7 @@
|
|
1
1
|
# ------------------------------------------------------------------------------
|
2
2
|
# label.tcl
|
3
3
|
# This file is part of Unifix BWidget Toolkit
|
4
|
-
# $Id: label.tcl,v 1.10.2.
|
4
|
+
# $Id: label.tcl,v 1.10.2.3 2011/04/26 08:24:28 oehhar Exp $
|
5
5
|
# ------------------------------------------------------------------------------
|
6
6
|
# Index of commands:
|
7
7
|
# - Label::create
|
@@ -138,7 +138,7 @@ proc Label::configure { path args } {
|
|
138
138
|
|
139
139
|
if {$::Widget::_theme} {
|
140
140
|
if { $cfg } {
|
141
|
-
$path.l configure -
|
141
|
+
$path.l configure -foreground $fg
|
142
142
|
}
|
143
143
|
if { $cst } {
|
144
144
|
if { $state == "normal" } {
|