From 8fb134c7b3563ffd9f518c2c75271ee5d2063998 Mon Sep 17 00:00:00 2001 From: dgp Date: Wed, 5 Dec 2007 18:11:40 +0000 Subject: merge updates from HEAD --- ChangeLog | 80 ++++++++++++++++------------ doc/ttk_style.n | 9 ++-- library/msgs/da.msg | 77 +++++++++++++++++++++++++++ library/msgs/en.msg | 150 ++++++++++++++++++++++++++-------------------------- unix/configure.in | 4 +- 5 files changed, 204 insertions(+), 116 deletions(-) create mode 100644 library/msgs/da.msg diff --git a/ChangeLog b/ChangeLog index d1bb92d..6b9ef2c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,48 +1,59 @@ +2007-12-04 Joe English + + * doc/ttk_style.n: Remove nonsense about "this manpage has + not yet been written"; everything supported is documented. + +2007-12-04 Donal K. Fellows + + * library/msgs/en.msg: Added missing messages. [Patch 1800744] + + * library/msgs/da.msg: Added Danish messages. [Patch 1844143]. Many + thanks to Torsten Berg . + 2007-12-03 Jeff Hobbs * win/configure, win/tcl.m4 (LIBS_GUI): remove ole32.lib oleaut32.lib (LIBS): add ws2_32.lib for static builds with Tcl. - + 2007-12-01 Joe English * generic/ttk/ttkTheme.h, generic/ttk/ttkThemeInt.h, - generic/ttk/ttkTheme.c, generic/ttk/ttkLayout.c, - generic/ttk/ttkClamTheme.c, generic/ttk/ttkClassicTheme.c, - generic/ttk/ttkTreeview.c, macosx/ttkMacOSXTheme.c, - win/ttkWinTheme.c, win/ttkWinXPTheme.c: Improved macrology for + * generic/ttk/ttkTheme.c, generic/ttk/ttkLayout.c, + * generic/ttk/ttkClamTheme.c, generic/ttk/ttkClassicTheme.c, + * generic/ttk/ttkTreeview.c, macosx/ttkMacOSXTheme.c, + * win/ttkWinTheme.c, win/ttkWinXPTheme.c: Improved macrology for statically-initialized layout template tables. 2007-11-28 Don Porter * unix/tkUnixPort.h: When unix/configure determines whether the intptr_t type is available, it has the header present. - It's only fair that we let Tk have it too. + It's only fair that we let Tk have it too. 2007-11-26 Kevin Kenny - * generic/tkImgPPM.c (StringReadPPM): Corrected a comparison - whose sense was reversed that resulted in reading beyond the - end of the input buffer on malformed PPM data. [Bug #1822391] - * library/tkfbox.tcl (VerifyFileName): Corrected a couple - of typos in handling of bad file names. [Bug #1822076] - Thanks to Christoph Bauer (fridolin@users.sf.net) for the - patch. - * tests/filebox.test (filebox-7.1, filebox-7.2): Added - test cases that exercise [Bug #1822076]. - * tests/imgPPM.test (imgPPM-4.1): Added test case that - exercises [Bug #1822391]. - + * generic/tkImgPPM.c (StringReadPPM): Corrected a comparison whose + sense was reversed that resulted in reading beyond the end of the + input buffer on malformed PPM data. [Bug 1822391] + * library/tkfbox.tcl (VerifyFileName): Corrected a couple of typos in + handling of bad file names. [Bug 1822076] Thanks to Christoph Bauer + (fridolin@users.sf.net) for the patch. + * tests/filebox.test (filebox-7.1, filebox-7.2): Added test cases that + exercise [Bug 1822076]. + * tests/imgPPM.test (imgPPM-4.1): Added test case that exercises [Bug + 1822391]. + 2007-11-25 Joe English * generic/ttk/ttkManager.h, generic/ttk/ttkManager.c, - generic/ttk/ttkFrame.c, generic/ttk/ttkNotebook.c, - generic/ttk/ttkPanedwindow.c: Internal Ttk_Manager API - updates; Fixed [Bug 1343984]; Added [$nb hide] method; - [$nb add] on already-managed windows no longer throws - an error, can be used to re-add a hidden tab. + * generic/ttk/ttkFrame.c, generic/ttk/ttkNotebook.c, + * generic/ttk/ttkPanedwindow.c: Internal Ttk_Manager API updates; + Fixed [Bug 1343984]; Added [$nb hide] method; [$nb add] on + already-managed windows no longer throws an error, can be used to + re-add a hidden tab. * doc/ttk_notebook.n, tests/ttk/notebook.test, - tests/ttk/panedwindow.test: Updated docs and test suite. + * tests/ttk/panedwindow.test: Updated docs and test suite. 2007-11-23 Donal K. Fellows @@ -423,7 +434,7 @@ * macosx/tkMacOSXDefault.h: Trims border sizes, cleaner X11 look * unix/tkUnixDefault.h: with minor modifications for Win32/Aqua. * win/tkWinDefault.h: Uses Tk*Font definitions throughout for - * win/tkWinFont.c: classic widgets. [Bug #1820344] + * win/tkWinFont.c: classic widgets. [Bug 1820344] * library/obsolete.tcl (::tk::classic::restore): This restores changes made to defaults in 8.5 using the 'option' command, segmented into logical groups. @@ -847,7 +858,7 @@ 2007-09-17 Joe English * unix/tcl.m4: use '${CC} -shared' instead of 'ld -Bshareable' to - build shared libraries on current NetBSDs. [#1749251] + build shared libraries on current NetBSDs. [Bug 1749251] * unix/configure: regenerated (autoconf-2.59). 2007-09-17 Don Porter @@ -866,7 +877,7 @@ 2007-09-17 Joe English * library/ttk/combobox.tcl: Try to improve combobox appearance on - OSX + Tk 8.5 [#1780286]. + OSX + Tk 8.5 [Bug 1780286]. 2007-09-15 Daniel Steffen @@ -2195,13 +2206,14 @@ * generic/ttk/ttkTreeview.c, library/ttk/treeview.tcl, doc/treeview.n: Added column '-stretch' and '-minwidth' options. Improved column drag - and resize behavior. Added horizontal scrolling [#1518650]. Row height - and child indent specifiable on Treeview style. Decreased default row - height, no default -padding. Use correct heading height [#1163349]. - Apply tag settings to tree item as well as to data columns [NOTE: 'tag - configure' still buggy]. Fix off-by-one condition when moving nodes - forward [#1618142] - * generic/ttk/ttkScroll.c (TtkScrollTo): Prevent overscroll [#1173434] + and resize behavior. Added horizontal scrolling [Bug 1518650]. Row + height and child indent specifiable on Treeview style. Decreased + default row height, no default -padding. Use correct heading height + [Bug 1163349]. Apply tag settings to tree item as well as to data + columns [NOTE: 'tag configure' still buggy]. Fix off-by-one condition + when moving nodes forward [Bug 1618142] + * generic/ttk/ttkScroll.c (TtkScrollTo): Prevent overscroll [Bug + 1173434] * library/ttk/altTheme.tcl, library/ttk/aquaTheme.tcl, * library/ttk/clamTheme.tcl, library/ttk/classicTheme.tcl, * library/ttk/defaults.tcl, library/ttk/winTheme.tcl, diff --git a/doc/ttk_style.n b/doc/ttk_style.n index a5dd626..4804d1b 100644 --- a/doc/ttk_style.n +++ b/doc/ttk_style.n @@ -4,23 +4,20 @@ '\" See the file "license.terms" for information on usage and redistribution '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES. '\" -'\" RCS: @(#) $Id: ttk_style.n,v 1.3.2.3 2007/11/01 16:37:16 dgp Exp $ +'\" RCS: @(#) $Id: ttk_style.n,v 1.3.2.4 2007/12/05 18:11:41 dgp Exp $ '\" .so man.macros .TH ttk::style n 8.5 Tk "Tk Themed Widget" .BS .SH NAME -ttk::style \- Control overall look and feel of widgets +ttk::style \- Manipulate style database .SH SYNOPSIS \fBttk::style\fR \fIoption\fR ?\fIargs\fR? .BE .SH NOTES -.PP -This manpage has not been written yet. -Please see the Tcl'2004 conference presentation, +See also the Tcl'2004 conference presentation, available at http://tktable.sourceforge.net/tile/tile-tcl2004.pdf .SH DEFINITIONS -.PP Each widget is assigned a \fIstyle\fR, which specifies the set of elements making up the widget and how they are arranged, along with dynamic and default diff --git a/library/msgs/da.msg b/library/msgs/da.msg new file mode 100644 index 0000000..c749608 --- /dev/null +++ b/library/msgs/da.msg @@ -0,0 +1,77 @@ +namespace eval ::tk { + ::msgcat::mcset da "&Abort" "&Afbryd" + ::msgcat::mcset da "&About..." "&Om..." + ::msgcat::mcset da "All Files" "Alle filer" + ::msgcat::mcset da "Application Error" "Programfejl" + ::msgcat::mcset da "&Blue" "&Bl\u00E5" + ::msgcat::mcset da "&Cancel" "&Annuller" + ::msgcat::mcset da "Cannot change to the directory \"%1\$s\".\nPermission denied." "Kan ikke skifte til katalog \"%1\$s\".\nIngen rettigheder." + ::msgcat::mcset da "Choose Directory" "V\u00E6lg katalog" + ::msgcat::mcset da "&Clear" "&Ryd" + ::msgcat::mcset da "&Clear Console" "&Ryd konsolen" + ::msgcat::mcset da "Color" "Farve" + ::msgcat::mcset da "Console" "Konsol" + ::msgcat::mcset da "&Copy" "&Kopier" + ::msgcat::mcset da "Cu&t" "Kli&p" + ::msgcat::mcset da "&Delete" "&Slet" + ::msgcat::mcset da "Details >>" "Detailer" + ::msgcat::mcset da "Directory \"%1\$s\" does not exist." "Katalog \"%1\$s\" findes ikke." + ::msgcat::mcset da "&Directory:" "&Katalog:" + ::msgcat::mcset da "&Edit" "&Rediger" + ::msgcat::mcset da "Error: %1\$s" "Fejl: %1\$s" + ::msgcat::mcset da "E&xit" "&Afslut" + ::msgcat::mcset da "&File" "&Fil" + ::msgcat::mcset da "File \"%1\$s\" already exists.\nDo you want to overwrite it?" "Filen \"%1\$s\" findes allerede.\nSkal den overskrives?" + ::msgcat::mcset da "File \"%1\$s\" already exists.\n\n" "Filen \"%1\$s\" findes allerede.\n\n" + ::msgcat::mcset da "File \"%1\$s\" does not exist." "Filen \"%1\$s\" findes ikke." + ::msgcat::mcset da "File &name:" "Fil&navn:" + ::msgcat::mcset da "File &names:" "Fil&navne:" + ::msgcat::mcset da "Files of &type:" "Fil&typer:" + ::msgcat::mcset da "Fi&les:" "Fi&ler:" + ::msgcat::mcset da "&Filter" + ::msgcat::mcset da "Fil&ter:" + ::msgcat::mcset da "&Green" "&Gr\u00F8n" + ::msgcat::mcset da "&Help" "&Hj\u00E6lp" + ::msgcat::mcset da "Hi" "Hej" + ::msgcat::mcset da "&Hide Console" "Skjul &konsol" + ::msgcat::mcset da "&Ignore" "&Ignorer" + ::msgcat::mcset da "Invalid file name \"%1\$s\"." "Ugyldig fil navn \"%1\$s\"." + ::msgcat::mcset da "Log Files" "Logfiler" + ::msgcat::mcset da "&No" "&Nej" + ::msgcat::mcset da "OK" "O.K." + ::msgcat::mcset da "&OK" "&O.K." + ::msgcat::mcset da "Ok" + ::msgcat::mcset da "Open" "\u00C5bn" + ::msgcat::mcset da "&Open" "&\u00C5bn" + ::msgcat::mcset da "Open Multiple Files" "\u00C5bn flere filer" + ::msgcat::mcset da "P&aste" "&Inds\u00E6t" + ::msgcat::mcset da "&Quit" "&Afslut" + ::msgcat::mcset da "&Red" "&R\u00F8d" + ::msgcat::mcset da "Replace existing file?" "Erstat eksisterende fil?" + ::msgcat::mcset da "&Retry" "&Gentag" + ::msgcat::mcset da "&Save" "&Gem" + ::msgcat::mcset da "Save As" "Gem som" + ::msgcat::mcset da "Save To Log" "Gem i log" + ::msgcat::mcset da "Select Log File" "V\u00E6lg logfil" + ::msgcat::mcset da "Select a file to source" "V\u00E6lg k\u00F8rbar fil" + ::msgcat::mcset da "&Selection:" "&Udvalg:" + ::msgcat::mcset da "Show &Hidden Directories" "Vis &skjulte kataloger" + ::msgcat::mcset da "Show &Hidden Files and Directories" "Vis &skjulte filer og kataloger" + ::msgcat::mcset da "Skip Messages" "Overspring beskeder" + ::msgcat::mcset da "&Source..." "&K\u00F8r..." + ::msgcat::mcset da "Tcl Scripts" "Tcl-Skripter" + ::msgcat::mcset da "Tcl for Windows" "Tcl for Windows" + ::msgcat::mcset da "Text Files" "Tekstfiler" + ::msgcat::mcset da "&Yes" "&Ja" + ::msgcat::mcset da "abort" "afbryd" + ::msgcat::mcset da "blue" "bl\u00E5" + ::msgcat::mcset da "cancel" "afbryd" + ::msgcat::mcset da "extension" + ::msgcat::mcset da "extensions" + ::msgcat::mcset da "green" "gr\u00F8n" + ::msgcat::mcset da "ignore" "ignorer" + ::msgcat::mcset da "ok" + ::msgcat::mcset da "red" "r\u00F8d" + ::msgcat::mcset da "retry" "gentag" + ::msgcat::mcset da "yes" "ja" +} diff --git a/library/msgs/en.msg b/library/msgs/en.msg index 7434d71..d2d0f96 100644 --- a/library/msgs/en.msg +++ b/library/msgs/en.msg @@ -1,74 +1,76 @@ -namespace eval ::tk { - ::msgcat::mcset en "&Abort" - ::msgcat::mcset en "&About..." - ::msgcat::mcset en "All Files" - ::msgcat::mcset en "Application Error" - ::msgcat::mcset en "&Blue" - ::msgcat::mcset en "&Cancel" - ::msgcat::mcset en "Cannot change to the directory \"%1\$s\".\nPermission denied." - ::msgcat::mcset en "Choose Directory" - ::msgcat::mcset en "Cl&ear" - ::msgcat::mcset en "&Clear Console" - ::msgcat::mcset en "Color" - ::msgcat::mcset en "Console" - ::msgcat::mcset en "&Copy" - ::msgcat::mcset en "Cu&t" - ::msgcat::mcset en "&Delete" - ::msgcat::mcset en "Details >>" - ::msgcat::mcset en "Directory \"%1\$s\" does not exist." - ::msgcat::mcset en "&Directory:" - ::msgcat::mcset en "&Edit" - ::msgcat::mcset en "Error: %1\$s" - ::msgcat::mcset en "E&xit" - ::msgcat::mcset en "&File" - ::msgcat::mcset en "File \"%1\$s\" already exists.\nDo you want to overwrite it?" - ::msgcat::mcset en "File \"%1\$s\" already exists.\n\n" - ::msgcat::mcset en "File \"%1\$s\" does not exist." - ::msgcat::mcset en "File &name:" - ::msgcat::mcset en "File &names:" - ::msgcat::mcset en "Files of &type:" - ::msgcat::mcset en "Fi&les:" - ::msgcat::mcset en "&Filter" - ::msgcat::mcset en "Fil&ter:" - ::msgcat::mcset en "&Green" - ::msgcat::mcset en "&Help" - ::msgcat::mcset en "Hi" - ::msgcat::mcset en "&Hide Console" - ::msgcat::mcset en "&Ignore" - ::msgcat::mcset en "Invalid file name \"%1\$s\"." - ::msgcat::mcset en "Log Files" - ::msgcat::mcset en "&No" - ::msgcat::mcset en "&OK" - ::msgcat::mcset en "Ok" - ::msgcat::mcset en "Open" - ::msgcat::mcset en "&Open" - ::msgcat::mcset en "Open Multiple Files" - ::msgcat::mcset en "P&aste" - ::msgcat::mcset en "&Quit" - ::msgcat::mcset en "&Red" - ::msgcat::mcset en "Replace existing file?" - ::msgcat::mcset en "&Retry" - ::msgcat::mcset en "&Save" - ::msgcat::mcset en "Save As" - ::msgcat::mcset en "Save To Log" - ::msgcat::mcset en "Select Log File" - ::msgcat::mcset en "Select a file to source" - ::msgcat::mcset en "&Selection:" - ::msgcat::mcset en "Skip Messages" - ::msgcat::mcset en "&Source..." - ::msgcat::mcset en "Tcl Scripts" - ::msgcat::mcset en "Tcl for Windows" - ::msgcat::mcset en "Text Files" - ::msgcat::mcset en "&Yes" - ::msgcat::mcset en "abort" - ::msgcat::mcset en "blue" - ::msgcat::mcset en "cancel" - ::msgcat::mcset en "extension" - ::msgcat::mcset en "extensions" - ::msgcat::mcset en "green" - ::msgcat::mcset en "ignore" - ::msgcat::mcset en "ok" - ::msgcat::mcset en "red" - ::msgcat::mcset en "retry" - ::msgcat::mcset en "yes" -} +namespace eval ::tk { + ::msgcat::mcset en "&Abort" + ::msgcat::mcset en "&About..." + ::msgcat::mcset en "All Files" + ::msgcat::mcset en "Application Error" + ::msgcat::mcset en "&Blue" + ::msgcat::mcset en "&Cancel" + ::msgcat::mcset en "Cannot change to the directory \"%1\$s\".\nPermission denied." + ::msgcat::mcset en "Choose Directory" + ::msgcat::mcset en "Cl&ear" + ::msgcat::mcset en "&Clear Console" + ::msgcat::mcset en "Color" + ::msgcat::mcset en "Console" + ::msgcat::mcset en "&Copy" + ::msgcat::mcset en "Cu&t" + ::msgcat::mcset en "&Delete" + ::msgcat::mcset en "Details >>" + ::msgcat::mcset en "Directory \"%1\$s\" does not exist." + ::msgcat::mcset en "&Directory:" + ::msgcat::mcset en "&Edit" + ::msgcat::mcset en "Error: %1\$s" + ::msgcat::mcset en "E&xit" + ::msgcat::mcset en "&File" + ::msgcat::mcset en "File \"%1\$s\" already exists.\nDo you want to overwrite it?" + ::msgcat::mcset en "File \"%1\$s\" already exists.\n\n" + ::msgcat::mcset en "File \"%1\$s\" does not exist." + ::msgcat::mcset en "File &name:" + ::msgcat::mcset en "File &names:" + ::msgcat::mcset en "Files of &type:" + ::msgcat::mcset en "Fi&les:" + ::msgcat::mcset en "&Filter" + ::msgcat::mcset en "Fil&ter:" + ::msgcat::mcset en "&Green" + ::msgcat::mcset en "&Help" + ::msgcat::mcset en "Hi" + ::msgcat::mcset en "&Hide Console" + ::msgcat::mcset en "&Ignore" + ::msgcat::mcset en "Invalid file name \"%1\$s\"." + ::msgcat::mcset en "Log Files" + ::msgcat::mcset en "&No" + ::msgcat::mcset en "&OK" + ::msgcat::mcset en "Ok" + ::msgcat::mcset en "Open" + ::msgcat::mcset en "&Open" + ::msgcat::mcset en "Open Multiple Files" + ::msgcat::mcset en "P&aste" + ::msgcat::mcset en "&Quit" + ::msgcat::mcset en "&Red" + ::msgcat::mcset en "Replace existing file?" + ::msgcat::mcset en "&Retry" + ::msgcat::mcset en "&Save" + ::msgcat::mcset en "Save As" + ::msgcat::mcset en "Save To Log" + ::msgcat::mcset en "Select Log File" + ::msgcat::mcset en "Select a file to source" + ::msgcat::mcset en "&Selection:" + ::msgcat::mcset en "Show &Hidden Directories" + ::msgcat::mcset en "Show &Hidden Files and Directories" + ::msgcat::mcset en "Skip Messages" + ::msgcat::mcset en "&Source..." + ::msgcat::mcset en "Tcl Scripts" + ::msgcat::mcset en "Tcl for Windows" + ::msgcat::mcset en "Text Files" + ::msgcat::mcset en "&Yes" + ::msgcat::mcset en "abort" + ::msgcat::mcset en "blue" + ::msgcat::mcset en "cancel" + ::msgcat::mcset en "extension" + ::msgcat::mcset en "extensions" + ::msgcat::mcset en "green" + ::msgcat::mcset en "ignore" + ::msgcat::mcset en "ok" + ::msgcat::mcset en "red" + ::msgcat::mcset en "retry" + ::msgcat::mcset en "yes" +} diff --git a/unix/configure.in b/unix/configure.in index 0739a21..c517c81 100644 --- a/unix/configure.in +++ b/unix/configure.in @@ -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 Tk installation dnl to configure the system for the local environment. # -# RCS: @(#) $Id: configure.in,v 1.134.2.9 2007/11/21 16:46:30 dgp Exp $ +# RCS: @(#) $Id: configure.in,v 1.134.2.10 2007/12/05 18:11:41 dgp Exp $ AC_INIT([tk],[8.5]) AC_PREREQ(2.59) @@ -29,7 +29,7 @@ TK_MAJOR_VERSION=8 TK_MINOR_VERSION=5 TK_PATCH_LEVEL=".0" VERSION=${TK_VERSION} -LOCALES="cs de el en en_gb eo es fr hu it nl pl pt ru sv" +LOCALES="cs da de el en en_gb eo es fr hu it nl pl pt ru sv" #-------------------------------------------------------------------- # Find and load the tclConfig.sh file -- cgit v0.12