[Sciviews-commits] r282 - in pkg/tcltk2: . R inst/tklibs inst/tklibs/ttktheme_keramik inst/tklibs/ttktheme_keramik/keramik inst/tklibs/ttktheme_keramik/keramik_alt inst/tklibs/ttktheme_plastik inst/tklibs/ttktheme_plastik/plastik win/src
noreply at r-forge.r-project.org
noreply at r-forge.r-project.org
Wed Sep 1 15:23:58 CEST 2010
Author: phgrosjean
Date: 2010-09-01 15:23:58 +0200 (Wed, 01 Sep 2010)
New Revision: 282
Added:
pkg/tcltk2/inst/tklibs/ttktheme_keramik/
pkg/tcltk2/inst/tklibs/ttktheme_keramik/keramik.tcl
pkg/tcltk2/inst/tklibs/ttktheme_keramik/keramik/
pkg/tcltk2/inst/tklibs/ttktheme_keramik/keramik/arrowdown-n.gif
pkg/tcltk2/inst/tklibs/ttktheme_keramik/keramik/arrowdown-p.gif
pkg/tcltk2/inst/tklibs/ttktheme_keramik/keramik/arrowleft-n.gif
pkg/tcltk2/inst/tklibs/ttktheme_keramik/keramik/arrowleft-p.gif
pkg/tcltk2/inst/tklibs/ttktheme_keramik/keramik/arrowright-n.gif
pkg/tcltk2/inst/tklibs/ttktheme_keramik/keramik/arrowright-p.gif
pkg/tcltk2/inst/tklibs/ttktheme_keramik/keramik/arrowup-n.gif
pkg/tcltk2/inst/tklibs/ttktheme_keramik/keramik/arrowup-p.gif
pkg/tcltk2/inst/tklibs/ttktheme_keramik/keramik/button-d.gif
pkg/tcltk2/inst/tklibs/ttktheme_keramik/keramik/button-h.gif
pkg/tcltk2/inst/tklibs/ttktheme_keramik/keramik/button-n.gif
pkg/tcltk2/inst/tklibs/ttktheme_keramik/keramik/button-p.gif
pkg/tcltk2/inst/tklibs/ttktheme_keramik/keramik/button-s.gif
pkg/tcltk2/inst/tklibs/ttktheme_keramik/keramik/cbox-a.gif
pkg/tcltk2/inst/tklibs/ttktheme_keramik/keramik/cbox-d.gif
pkg/tcltk2/inst/tklibs/ttktheme_keramik/keramik/cbox-n.gif
pkg/tcltk2/inst/tklibs/ttktheme_keramik/keramik/check-c.gif
pkg/tcltk2/inst/tklibs/ttktheme_keramik/keramik/check-u.gif
pkg/tcltk2/inst/tklibs/ttktheme_keramik/keramik/hsb-a.gif
pkg/tcltk2/inst/tklibs/ttktheme_keramik/keramik/hsb-h.gif
pkg/tcltk2/inst/tklibs/ttktheme_keramik/keramik/hsb-n.gif
pkg/tcltk2/inst/tklibs/ttktheme_keramik/keramik/hsb-p.gif
pkg/tcltk2/inst/tklibs/ttktheme_keramik/keramik/hsb-t.gif
pkg/tcltk2/inst/tklibs/ttktheme_keramik/keramik/hslider-n.gif
pkg/tcltk2/inst/tklibs/ttktheme_keramik/keramik/hslider-t.gif
pkg/tcltk2/inst/tklibs/ttktheme_keramik/keramik/indicator-c.gif
pkg/tcltk2/inst/tklibs/ttktheme_keramik/keramik/indicator-o.gif
pkg/tcltk2/inst/tklibs/ttktheme_keramik/keramik/mbut-a.gif
pkg/tcltk2/inst/tklibs/ttktheme_keramik/keramik/mbut-arrow-n.gif
pkg/tcltk2/inst/tklibs/ttktheme_keramik/keramik/mbut-d.gif
pkg/tcltk2/inst/tklibs/ttktheme_keramik/keramik/mbut-n.gif
pkg/tcltk2/inst/tklibs/ttktheme_keramik/keramik/progress-h.gif
pkg/tcltk2/inst/tklibs/ttktheme_keramik/keramik/progress-v.gif
pkg/tcltk2/inst/tklibs/ttktheme_keramik/keramik/radio-c.gif
pkg/tcltk2/inst/tklibs/ttktheme_keramik/keramik/radio-u.gif
pkg/tcltk2/inst/tklibs/ttktheme_keramik/keramik/spinbox-a.gif
pkg/tcltk2/inst/tklibs/ttktheme_keramik/keramik/spindown-n.gif
pkg/tcltk2/inst/tklibs/ttktheme_keramik/keramik/spindown-p.gif
pkg/tcltk2/inst/tklibs/ttktheme_keramik/keramik/spinup-n.gif
pkg/tcltk2/inst/tklibs/ttktheme_keramik/keramik/spinup-p.gif
pkg/tcltk2/inst/tklibs/ttktheme_keramik/keramik/tab-h.gif
pkg/tcltk2/inst/tklibs/ttktheme_keramik/keramik/tab-n.gif
pkg/tcltk2/inst/tklibs/ttktheme_keramik/keramik/tab-p.gif
pkg/tcltk2/inst/tklibs/ttktheme_keramik/keramik/tbar-a.gif
pkg/tcltk2/inst/tklibs/ttktheme_keramik/keramik/tbar-n.gif
pkg/tcltk2/inst/tklibs/ttktheme_keramik/keramik/tbar-p.gif
pkg/tcltk2/inst/tklibs/ttktheme_keramik/keramik/tree-n.gif
pkg/tcltk2/inst/tklibs/ttktheme_keramik/keramik/tree-p.gif
pkg/tcltk2/inst/tklibs/ttktheme_keramik/keramik/vsb-a.gif
pkg/tcltk2/inst/tklibs/ttktheme_keramik/keramik/vsb-h.gif
pkg/tcltk2/inst/tklibs/ttktheme_keramik/keramik/vsb-n.gif
pkg/tcltk2/inst/tklibs/ttktheme_keramik/keramik/vsb-p.gif
pkg/tcltk2/inst/tklibs/ttktheme_keramik/keramik/vsb-t.gif
pkg/tcltk2/inst/tklibs/ttktheme_keramik/keramik/vslider-n.gif
pkg/tcltk2/inst/tklibs/ttktheme_keramik/keramik/vslider-t.gif
pkg/tcltk2/inst/tklibs/ttktheme_keramik/keramik_alt/
pkg/tcltk2/inst/tklibs/ttktheme_keramik/keramik_alt/hsb-a.gif
pkg/tcltk2/inst/tklibs/ttktheme_keramik/keramik_alt/hsb-h.gif
pkg/tcltk2/inst/tklibs/ttktheme_keramik/keramik_alt/vsb-a.gif
pkg/tcltk2/inst/tklibs/ttktheme_keramik/keramik_alt/vsb-h.gif
pkg/tcltk2/inst/tklibs/ttktheme_keramik/pkgIndex.tcl
pkg/tcltk2/inst/tklibs/ttktheme_plastik/
pkg/tcltk2/inst/tklibs/ttktheme_plastik/pkgIndex.tcl
pkg/tcltk2/inst/tklibs/ttktheme_plastik/plastik.tcl
pkg/tcltk2/inst/tklibs/ttktheme_plastik/plastik/
pkg/tcltk2/inst/tklibs/ttktheme_plastik/plastik/arrow-d.gif
pkg/tcltk2/inst/tklibs/ttktheme_plastik/plastik/arrowdown-n.gif
pkg/tcltk2/inst/tklibs/ttktheme_plastik/plastik/arrowdown-p.gif
pkg/tcltk2/inst/tklibs/ttktheme_plastik/plastik/arrowleft-n.gif
pkg/tcltk2/inst/tklibs/ttktheme_plastik/plastik/arrowleft-p.gif
pkg/tcltk2/inst/tklibs/ttktheme_plastik/plastik/arrowright-n.gif
pkg/tcltk2/inst/tklibs/ttktheme_plastik/plastik/arrowright-p.gif
pkg/tcltk2/inst/tklibs/ttktheme_plastik/plastik/arrowup-n.gif
pkg/tcltk2/inst/tklibs/ttktheme_plastik/plastik/arrowup-p.gif
pkg/tcltk2/inst/tklibs/ttktheme_plastik/plastik/border.gif
pkg/tcltk2/inst/tklibs/ttktheme_plastik/plastik/button-h.gif
pkg/tcltk2/inst/tklibs/ttktheme_plastik/plastik/button-n.gif
pkg/tcltk2/inst/tklibs/ttktheme_plastik/plastik/button-p.gif
pkg/tcltk2/inst/tklibs/ttktheme_plastik/plastik/check-hc.gif
pkg/tcltk2/inst/tklibs/ttktheme_plastik/plastik/check-hu.gif
pkg/tcltk2/inst/tklibs/ttktheme_plastik/plastik/check-nc.gif
pkg/tcltk2/inst/tklibs/ttktheme_plastik/plastik/check-nu.gif
pkg/tcltk2/inst/tklibs/ttktheme_plastik/plastik/check-pc.gif
pkg/tcltk2/inst/tklibs/ttktheme_plastik/plastik/combo-a.gif
pkg/tcltk2/inst/tklibs/ttktheme_plastik/plastik/combo-f.gif
pkg/tcltk2/inst/tklibs/ttktheme_plastik/plastik/combo-fa.gif
pkg/tcltk2/inst/tklibs/ttktheme_plastik/plastik/combo-n.gif
pkg/tcltk2/inst/tklibs/ttktheme_plastik/plastik/combo-r.gif
pkg/tcltk2/inst/tklibs/ttktheme_plastik/plastik/combo-ra.gif
pkg/tcltk2/inst/tklibs/ttktheme_plastik/plastik/entry-f.gif
pkg/tcltk2/inst/tklibs/ttktheme_plastik/plastik/entry-n.gif
pkg/tcltk2/inst/tklibs/ttktheme_plastik/plastik/hprogress-b.gif
pkg/tcltk2/inst/tklibs/ttktheme_plastik/plastik/hprogress-t.gif
pkg/tcltk2/inst/tklibs/ttktheme_plastik/plastik/hsb-g.gif
pkg/tcltk2/inst/tklibs/ttktheme_plastik/plastik/hsb-n.gif
pkg/tcltk2/inst/tklibs/ttktheme_plastik/plastik/hsb-t.gif
pkg/tcltk2/inst/tklibs/ttktheme_plastik/plastik/hslider-n.gif
pkg/tcltk2/inst/tklibs/ttktheme_plastik/plastik/hslider-t.gif
pkg/tcltk2/inst/tklibs/ttktheme_plastik/plastik/notebook-c.gif
pkg/tcltk2/inst/tklibs/ttktheme_plastik/plastik/notebook-ta.gif
pkg/tcltk2/inst/tklibs/ttktheme_plastik/plastik/notebook-tn.gif
pkg/tcltk2/inst/tklibs/ttktheme_plastik/plastik/notebook-ts.gif
pkg/tcltk2/inst/tklibs/ttktheme_plastik/plastik/radio-hc.gif
pkg/tcltk2/inst/tklibs/ttktheme_plastik/plastik/radio-hu.gif
pkg/tcltk2/inst/tklibs/ttktheme_plastik/plastik/radio-nc.gif
pkg/tcltk2/inst/tklibs/ttktheme_plastik/plastik/radio-nu.gif
pkg/tcltk2/inst/tklibs/ttktheme_plastik/plastik/radio-pc.gif
pkg/tcltk2/inst/tklibs/ttktheme_plastik/plastik/spinbox-f.gif
pkg/tcltk2/inst/tklibs/ttktheme_plastik/plastik/spinbox-n.gif
pkg/tcltk2/inst/tklibs/ttktheme_plastik/plastik/spinbut-a.gif
pkg/tcltk2/inst/tklibs/ttktheme_plastik/plastik/spinbut-n.gif
pkg/tcltk2/inst/tklibs/ttktheme_plastik/plastik/spindown-d.gif
pkg/tcltk2/inst/tklibs/ttktheme_plastik/plastik/spindown-n.gif
pkg/tcltk2/inst/tklibs/ttktheme_plastik/plastik/spindown-p.gif
pkg/tcltk2/inst/tklibs/ttktheme_plastik/plastik/spinup-d.gif
pkg/tcltk2/inst/tklibs/ttktheme_plastik/plastik/spinup-n.gif
pkg/tcltk2/inst/tklibs/ttktheme_plastik/plastik/spinup-p.gif
pkg/tcltk2/inst/tklibs/ttktheme_plastik/plastik/tbutton-h.gif
pkg/tcltk2/inst/tklibs/ttktheme_plastik/plastik/tbutton-n.gif
pkg/tcltk2/inst/tklibs/ttktheme_plastik/plastik/tbutton-p.gif
pkg/tcltk2/inst/tklibs/ttktheme_plastik/plastik/tree-n.gif
pkg/tcltk2/inst/tklibs/ttktheme_plastik/plastik/tree-p.gif
pkg/tcltk2/inst/tklibs/ttktheme_plastik/plastik/vprogress-b.gif
pkg/tcltk2/inst/tklibs/ttktheme_plastik/plastik/vsb-g.gif
pkg/tcltk2/inst/tklibs/ttktheme_plastik/plastik/vsb-n.gif
pkg/tcltk2/inst/tklibs/ttktheme_plastik/plastik/vsb-t.gif
pkg/tcltk2/inst/tklibs/ttktheme_plastik/plastik/vslider-n.gif
pkg/tcltk2/inst/tklibs/ttktheme_plastik/plastik/vslider-t.gif
Modified:
pkg/tcltk2/DESCRIPTION
pkg/tcltk2/NEWS
pkg/tcltk2/R/tclVarFun.R
pkg/tcltk2/R/tcltk2-Internal.R
pkg/tcltk2/R/tk2commands.R
pkg/tcltk2/cleanup.win
pkg/tcltk2/win/src/Makevars
pkg/tcltk2/win/src/Winico06.c
Log:
Made compatible with R 2.12 and added plastik, keramik and keramik_alt ttk themes (plastik is now used by default on Linux and Mac OS X.
Modified: pkg/tcltk2/DESCRIPTION
===================================================================
--- pkg/tcltk2/DESCRIPTION 2010-08-16 16:16:17 UTC (rev 281)
+++ pkg/tcltk2/DESCRIPTION 2010-09-01 13:23:58 UTC (rev 282)
@@ -1,15 +1,14 @@
Package: tcltk2
Type: Package
Title: Tcl/Tk Additions
-Depends: R (>= 2.8.0)
-Imports: tcltk
+Depends: R (>= 2.8.0), tcltk
Suggests: utils
SystemRequirements: Tcl/Tk (>= 8.5), Tktable (>= 2.9, optional)
Description: A series of additional Tcl commands and Tk widgets with style
and various functions (under Windows: DDE exchange, access to the
registry and icon manipulation) to supplement the tcltk package
-Version: 1.1-3
-Date: 2010-05-02
+Version: 1.1-4
+Date: 2010-09-31
Author: Philippe Grosjean
Maintainer: Philippe Grosjean <phgrosjean at sciviews.org>
License: file LICENSE
Modified: pkg/tcltk2/NEWS
===================================================================
--- pkg/tcltk2/NEWS 2010-08-16 16:16:17 UTC (rev 281)
+++ pkg/tcltk2/NEWS 2010-09-01 13:23:58 UTC (rev 282)
@@ -1,5 +1,13 @@
= tcltk2 news
+== Version 1.1-4
+
+* Winico.c modified to compile on Windows 64-bit (but still not OK?).
+
+* Added ttk themes plastik, keramik and keramik_alt. Ttk theme plastik is now
+ used by default on other platforms than Windows.
+
+
== Version 1.1-3
* New /win/src/Makevars to make it compatible with the double compilation for
@@ -7,7 +15,9 @@
* Correction of the example in ?tk2reg. Thanks Tony Plate.
+* .onload() now works inside SciViews.
+
== Version 1.1-2
* Patch to .onload() and to source code of Winico0.6.c submitted by Prof. Brian
Modified: pkg/tcltk2/R/tclVarFun.R
===================================================================
--- pkg/tcltk2/R/tclVarFun.R 2010-08-16 16:16:17 UTC (rev 281)
+++ pkg/tcltk2/R/tclVarFun.R 2010-09-01 13:23:58 UTC (rev 282)
@@ -25,6 +25,7 @@
return(names)
}
+### TODO: change this to use closure functions instead!!!
"tclFun" <-
function(f, name = deparse(substitute(f))) {
# Register a simple R function (without arguments) as a callback in Tcl,
Modified: pkg/tcltk2/R/tcltk2-Internal.R
===================================================================
--- pkg/tcltk2/R/tcltk2-Internal.R 2010-08-16 16:16:17 UTC (rev 281)
+++ pkg/tcltk2/R/tcltk2-Internal.R 2010-09-01 13:23:58 UTC (rev 282)
@@ -1,12 +1,6 @@
# tcltk2-Internal.R - Hidden functions for tcltk2
# Copyright (c), Philippe Grosjean (phgrosjean at sciviews.org)
-# Licensed under LGPL 3 or above
#
-# Changes:
-# - 2009-07-02: tcltk2_1.1-0, added .Last.lib(), .TempEnv, .assignTemp() and
-# getTemp() and renamed from zzz.R to tcltk2-Internal.R
-# - 2007-01-01: first version (for tcltk2_1.0-0)
-#
# TODO:
# - Rework the tile stuff
# - .onUnload() function (unload DLLs etc. but there are no DLLs any more!?)
@@ -15,6 +9,15 @@
function(libname, pkgname) {
libdir <- file.path(libname, pkgname, "tklibs")
+ # A slightly modified version of addTclPath() that works also within SciViews
+ addTclPath <- function (path = ".") {
+ if (.Platform$OS.type == "windows")
+ path <- gsub("\\\\", "/", path)
+ a <- tclvalue(tcl("set", "::auto_path"))
+ paths <- strsplit(a, " ", fixed = TRUE)[[1L]]
+ if (!path %in% paths)
+ tcl("lappend", "::auto_path", path)
+ }
res <- addTclPath(libdir) # extend the Tcl/Tk path
### TODO: add path to bin!
### TODO: get windowing system with .Tcl("tk windowingsystem")
@@ -48,7 +51,7 @@
tcl("source", file.path(libdir, "tree1.7", "tree.tcl"))
# Do we try to load the tile widgets? (only if Tcl./Tk < 8.5)
- if (as.numeric(.Tcl("set tcl_version")) < 8.5) {
+ if (as.numeric(.Tcl("set ::tcl_version")) < 8.5) {
# tcl("source", file.path(libdir, "fonts.tcl"))
# Define fonts used in Tk (note: must be done AFTER loading tile!)
## Default values for system fonts are calculated by tile...
@@ -84,6 +87,11 @@
}')
}
}
+ # Try loading addtional ttk themes
+ try(tclRequire("ttk::theme::plastik"), silent = TRUE)
+ try(tclRequire("ttk::theme::keramik"), silent = TRUE)
+ try(tclRequire("ttk::theme::keramik_alt"), silent = TRUE)
+
# Windows only
if (.Platform$OS.type == "windows") {
tclRequire("dde") # Version 1.2.2
@@ -95,7 +103,10 @@
tcl("load", file.path(libname, pkgname, "libs", "Winico06.dll"))
# Also register the DDE server as TclEval|R
tk2dde("R")
- }
+ } else {
+ # Use plastik theme by default
+ try(tk2theme("plastik"), silent = TRUE)
+ }
}
### TO DO: .onUnload() that close downloaded tk items (or unload Tcl completely?)
Modified: pkg/tcltk2/R/tk2commands.R
===================================================================
--- pkg/tcltk2/R/tk2commands.R 2010-08-16 16:16:17 UTC (rev 281)
+++ pkg/tcltk2/R/tk2commands.R 2010-09-01 13:23:58 UTC (rev 282)
@@ -200,6 +200,14 @@
}
return(res)
}
+# Note: to change a style element: .Tcl('ttk::style configure TButton -font "helvetica 24"')
+# Create a derived style: ttk::style configure Emergency.TButton -font "helvetica 24" -foreground red -padding 10
+# Changing different states:
+#ttk::style map TButton \
+# -background [list disabled #d9d9d9 active #ececec] \
+# -foreground [list disabled #a3a3a3] \
+# -relief [list {pressed !disabled} sunken] \
+# ;
"setLanguage" <- function(lang) {
# Change locale for both R and Tcl/Tk
@@ -232,6 +240,6 @@
"is.ttk" <-
function ()
{
- res <- is.tk() && as.numeric(tcl("set", "tk_version")) >= 8.5
+ res <- is.tk() && as.numeric(tcl("set", "::tk_version")) >= 8.5
return(res)
}
Modified: pkg/tcltk2/cleanup.win
===================================================================
--- pkg/tcltk2/cleanup.win 2010-08-16 16:16:17 UTC (rev 281)
+++ pkg/tcltk2/cleanup.win 2010-09-01 13:23:58 UTC (rev 282)
@@ -3,11 +3,11 @@
# With R < 2.9.0, the package dir is in ${DPKG} (*undocumented variable*)!
# Starting from R 2.9.0, it is ${R_PACKAGE_DIR}, and it is documented!
# Tested with R 2.9.1... it doesn't work => temporary disabled!
-if test -z "${R_PACKAGE_DIR}"; then
+#if test -z "${R_PACKAGE_DIR}"; then
cp src/Winico06.dll "${DPKG}/tklibs/winico0.6/Winico06.dll"
-else
- cp src/Winico06.dll "${R_PACKAGE_DIR}/tklibs/winico0.6/Winico06.dll"
-fi
+#else
+# cp src/Winico06.dll "${R_PACKAGE_DIR}/tklibs/winico0.6/Winico06.dll"
+#fi
rm -R -f inst/tklibs/winico0.6
rm -R -f src
Added: pkg/tcltk2/inst/tklibs/ttktheme_keramik/keramik/arrowdown-n.gif
===================================================================
(Binary files differ)
Property changes on: pkg/tcltk2/inst/tklibs/ttktheme_keramik/keramik/arrowdown-n.gif
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: pkg/tcltk2/inst/tklibs/ttktheme_keramik/keramik/arrowdown-p.gif
===================================================================
(Binary files differ)
Property changes on: pkg/tcltk2/inst/tklibs/ttktheme_keramik/keramik/arrowdown-p.gif
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: pkg/tcltk2/inst/tklibs/ttktheme_keramik/keramik/arrowleft-n.gif
===================================================================
(Binary files differ)
Property changes on: pkg/tcltk2/inst/tklibs/ttktheme_keramik/keramik/arrowleft-n.gif
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: pkg/tcltk2/inst/tklibs/ttktheme_keramik/keramik/arrowleft-p.gif
===================================================================
(Binary files differ)
Property changes on: pkg/tcltk2/inst/tklibs/ttktheme_keramik/keramik/arrowleft-p.gif
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: pkg/tcltk2/inst/tklibs/ttktheme_keramik/keramik/arrowright-n.gif
===================================================================
(Binary files differ)
Property changes on: pkg/tcltk2/inst/tklibs/ttktheme_keramik/keramik/arrowright-n.gif
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: pkg/tcltk2/inst/tklibs/ttktheme_keramik/keramik/arrowright-p.gif
===================================================================
(Binary files differ)
Property changes on: pkg/tcltk2/inst/tklibs/ttktheme_keramik/keramik/arrowright-p.gif
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: pkg/tcltk2/inst/tklibs/ttktheme_keramik/keramik/arrowup-n.gif
===================================================================
(Binary files differ)
Property changes on: pkg/tcltk2/inst/tklibs/ttktheme_keramik/keramik/arrowup-n.gif
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: pkg/tcltk2/inst/tklibs/ttktheme_keramik/keramik/arrowup-p.gif
===================================================================
(Binary files differ)
Property changes on: pkg/tcltk2/inst/tklibs/ttktheme_keramik/keramik/arrowup-p.gif
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: pkg/tcltk2/inst/tklibs/ttktheme_keramik/keramik/button-d.gif
===================================================================
(Binary files differ)
Property changes on: pkg/tcltk2/inst/tklibs/ttktheme_keramik/keramik/button-d.gif
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: pkg/tcltk2/inst/tklibs/ttktheme_keramik/keramik/button-h.gif
===================================================================
(Binary files differ)
Property changes on: pkg/tcltk2/inst/tklibs/ttktheme_keramik/keramik/button-h.gif
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: pkg/tcltk2/inst/tklibs/ttktheme_keramik/keramik/button-n.gif
===================================================================
(Binary files differ)
Property changes on: pkg/tcltk2/inst/tklibs/ttktheme_keramik/keramik/button-n.gif
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: pkg/tcltk2/inst/tklibs/ttktheme_keramik/keramik/button-p.gif
===================================================================
(Binary files differ)
Property changes on: pkg/tcltk2/inst/tklibs/ttktheme_keramik/keramik/button-p.gif
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: pkg/tcltk2/inst/tklibs/ttktheme_keramik/keramik/button-s.gif
===================================================================
(Binary files differ)
Property changes on: pkg/tcltk2/inst/tklibs/ttktheme_keramik/keramik/button-s.gif
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: pkg/tcltk2/inst/tklibs/ttktheme_keramik/keramik/cbox-a.gif
===================================================================
(Binary files differ)
Property changes on: pkg/tcltk2/inst/tklibs/ttktheme_keramik/keramik/cbox-a.gif
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: pkg/tcltk2/inst/tklibs/ttktheme_keramik/keramik/cbox-d.gif
===================================================================
(Binary files differ)
Property changes on: pkg/tcltk2/inst/tklibs/ttktheme_keramik/keramik/cbox-d.gif
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: pkg/tcltk2/inst/tklibs/ttktheme_keramik/keramik/cbox-n.gif
===================================================================
(Binary files differ)
Property changes on: pkg/tcltk2/inst/tklibs/ttktheme_keramik/keramik/cbox-n.gif
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: pkg/tcltk2/inst/tklibs/ttktheme_keramik/keramik/check-c.gif
===================================================================
(Binary files differ)
Property changes on: pkg/tcltk2/inst/tklibs/ttktheme_keramik/keramik/check-c.gif
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: pkg/tcltk2/inst/tklibs/ttktheme_keramik/keramik/check-u.gif
===================================================================
(Binary files differ)
Property changes on: pkg/tcltk2/inst/tklibs/ttktheme_keramik/keramik/check-u.gif
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: pkg/tcltk2/inst/tklibs/ttktheme_keramik/keramik/hsb-a.gif
===================================================================
(Binary files differ)
Property changes on: pkg/tcltk2/inst/tklibs/ttktheme_keramik/keramik/hsb-a.gif
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: pkg/tcltk2/inst/tklibs/ttktheme_keramik/keramik/hsb-h.gif
===================================================================
(Binary files differ)
Property changes on: pkg/tcltk2/inst/tklibs/ttktheme_keramik/keramik/hsb-h.gif
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: pkg/tcltk2/inst/tklibs/ttktheme_keramik/keramik/hsb-n.gif
===================================================================
(Binary files differ)
Property changes on: pkg/tcltk2/inst/tklibs/ttktheme_keramik/keramik/hsb-n.gif
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: pkg/tcltk2/inst/tklibs/ttktheme_keramik/keramik/hsb-p.gif
===================================================================
(Binary files differ)
Property changes on: pkg/tcltk2/inst/tklibs/ttktheme_keramik/keramik/hsb-p.gif
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: pkg/tcltk2/inst/tklibs/ttktheme_keramik/keramik/hsb-t.gif
===================================================================
(Binary files differ)
Property changes on: pkg/tcltk2/inst/tklibs/ttktheme_keramik/keramik/hsb-t.gif
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: pkg/tcltk2/inst/tklibs/ttktheme_keramik/keramik/hslider-n.gif
===================================================================
(Binary files differ)
Property changes on: pkg/tcltk2/inst/tklibs/ttktheme_keramik/keramik/hslider-n.gif
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: pkg/tcltk2/inst/tklibs/ttktheme_keramik/keramik/hslider-t.gif
===================================================================
(Binary files differ)
Property changes on: pkg/tcltk2/inst/tklibs/ttktheme_keramik/keramik/hslider-t.gif
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: pkg/tcltk2/inst/tklibs/ttktheme_keramik/keramik/indicator-c.gif
===================================================================
(Binary files differ)
Property changes on: pkg/tcltk2/inst/tklibs/ttktheme_keramik/keramik/indicator-c.gif
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: pkg/tcltk2/inst/tklibs/ttktheme_keramik/keramik/indicator-o.gif
===================================================================
(Binary files differ)
Property changes on: pkg/tcltk2/inst/tklibs/ttktheme_keramik/keramik/indicator-o.gif
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: pkg/tcltk2/inst/tklibs/ttktheme_keramik/keramik/mbut-a.gif
===================================================================
(Binary files differ)
Property changes on: pkg/tcltk2/inst/tklibs/ttktheme_keramik/keramik/mbut-a.gif
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: pkg/tcltk2/inst/tklibs/ttktheme_keramik/keramik/mbut-arrow-n.gif
===================================================================
(Binary files differ)
Property changes on: pkg/tcltk2/inst/tklibs/ttktheme_keramik/keramik/mbut-arrow-n.gif
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: pkg/tcltk2/inst/tklibs/ttktheme_keramik/keramik/mbut-d.gif
===================================================================
(Binary files differ)
Property changes on: pkg/tcltk2/inst/tklibs/ttktheme_keramik/keramik/mbut-d.gif
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: pkg/tcltk2/inst/tklibs/ttktheme_keramik/keramik/mbut-n.gif
===================================================================
(Binary files differ)
Property changes on: pkg/tcltk2/inst/tklibs/ttktheme_keramik/keramik/mbut-n.gif
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: pkg/tcltk2/inst/tklibs/ttktheme_keramik/keramik/progress-h.gif
===================================================================
(Binary files differ)
Property changes on: pkg/tcltk2/inst/tklibs/ttktheme_keramik/keramik/progress-h.gif
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: pkg/tcltk2/inst/tklibs/ttktheme_keramik/keramik/progress-v.gif
===================================================================
(Binary files differ)
Property changes on: pkg/tcltk2/inst/tklibs/ttktheme_keramik/keramik/progress-v.gif
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: pkg/tcltk2/inst/tklibs/ttktheme_keramik/keramik/radio-c.gif
===================================================================
(Binary files differ)
Property changes on: pkg/tcltk2/inst/tklibs/ttktheme_keramik/keramik/radio-c.gif
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: pkg/tcltk2/inst/tklibs/ttktheme_keramik/keramik/radio-u.gif
===================================================================
(Binary files differ)
Property changes on: pkg/tcltk2/inst/tklibs/ttktheme_keramik/keramik/radio-u.gif
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: pkg/tcltk2/inst/tklibs/ttktheme_keramik/keramik/spinbox-a.gif
===================================================================
(Binary files differ)
Property changes on: pkg/tcltk2/inst/tklibs/ttktheme_keramik/keramik/spinbox-a.gif
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: pkg/tcltk2/inst/tklibs/ttktheme_keramik/keramik/spindown-n.gif
===================================================================
(Binary files differ)
Property changes on: pkg/tcltk2/inst/tklibs/ttktheme_keramik/keramik/spindown-n.gif
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: pkg/tcltk2/inst/tklibs/ttktheme_keramik/keramik/spindown-p.gif
===================================================================
(Binary files differ)
Property changes on: pkg/tcltk2/inst/tklibs/ttktheme_keramik/keramik/spindown-p.gif
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: pkg/tcltk2/inst/tklibs/ttktheme_keramik/keramik/spinup-n.gif
===================================================================
(Binary files differ)
Property changes on: pkg/tcltk2/inst/tklibs/ttktheme_keramik/keramik/spinup-n.gif
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: pkg/tcltk2/inst/tklibs/ttktheme_keramik/keramik/spinup-p.gif
===================================================================
(Binary files differ)
Property changes on: pkg/tcltk2/inst/tklibs/ttktheme_keramik/keramik/spinup-p.gif
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: pkg/tcltk2/inst/tklibs/ttktheme_keramik/keramik/tab-h.gif
===================================================================
(Binary files differ)
Property changes on: pkg/tcltk2/inst/tklibs/ttktheme_keramik/keramik/tab-h.gif
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: pkg/tcltk2/inst/tklibs/ttktheme_keramik/keramik/tab-n.gif
===================================================================
(Binary files differ)
Property changes on: pkg/tcltk2/inst/tklibs/ttktheme_keramik/keramik/tab-n.gif
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: pkg/tcltk2/inst/tklibs/ttktheme_keramik/keramik/tab-p.gif
===================================================================
(Binary files differ)
Property changes on: pkg/tcltk2/inst/tklibs/ttktheme_keramik/keramik/tab-p.gif
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: pkg/tcltk2/inst/tklibs/ttktheme_keramik/keramik/tbar-a.gif
===================================================================
(Binary files differ)
Property changes on: pkg/tcltk2/inst/tklibs/ttktheme_keramik/keramik/tbar-a.gif
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: pkg/tcltk2/inst/tklibs/ttktheme_keramik/keramik/tbar-n.gif
===================================================================
(Binary files differ)
Property changes on: pkg/tcltk2/inst/tklibs/ttktheme_keramik/keramik/tbar-n.gif
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: pkg/tcltk2/inst/tklibs/ttktheme_keramik/keramik/tbar-p.gif
===================================================================
(Binary files differ)
Property changes on: pkg/tcltk2/inst/tklibs/ttktheme_keramik/keramik/tbar-p.gif
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: pkg/tcltk2/inst/tklibs/ttktheme_keramik/keramik/tree-n.gif
===================================================================
(Binary files differ)
Property changes on: pkg/tcltk2/inst/tklibs/ttktheme_keramik/keramik/tree-n.gif
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: pkg/tcltk2/inst/tklibs/ttktheme_keramik/keramik/tree-p.gif
===================================================================
(Binary files differ)
Property changes on: pkg/tcltk2/inst/tklibs/ttktheme_keramik/keramik/tree-p.gif
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: pkg/tcltk2/inst/tklibs/ttktheme_keramik/keramik/vsb-a.gif
===================================================================
(Binary files differ)
Property changes on: pkg/tcltk2/inst/tklibs/ttktheme_keramik/keramik/vsb-a.gif
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: pkg/tcltk2/inst/tklibs/ttktheme_keramik/keramik/vsb-h.gif
===================================================================
(Binary files differ)
Property changes on: pkg/tcltk2/inst/tklibs/ttktheme_keramik/keramik/vsb-h.gif
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: pkg/tcltk2/inst/tklibs/ttktheme_keramik/keramik/vsb-n.gif
===================================================================
(Binary files differ)
Property changes on: pkg/tcltk2/inst/tklibs/ttktheme_keramik/keramik/vsb-n.gif
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: pkg/tcltk2/inst/tklibs/ttktheme_keramik/keramik/vsb-p.gif
===================================================================
(Binary files differ)
Property changes on: pkg/tcltk2/inst/tklibs/ttktheme_keramik/keramik/vsb-p.gif
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: pkg/tcltk2/inst/tklibs/ttktheme_keramik/keramik/vsb-t.gif
===================================================================
(Binary files differ)
Property changes on: pkg/tcltk2/inst/tklibs/ttktheme_keramik/keramik/vsb-t.gif
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: pkg/tcltk2/inst/tklibs/ttktheme_keramik/keramik/vslider-n.gif
===================================================================
(Binary files differ)
Property changes on: pkg/tcltk2/inst/tklibs/ttktheme_keramik/keramik/vslider-n.gif
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: pkg/tcltk2/inst/tklibs/ttktheme_keramik/keramik/vslider-t.gif
===================================================================
(Binary files differ)
Property changes on: pkg/tcltk2/inst/tklibs/ttktheme_keramik/keramik/vslider-t.gif
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: pkg/tcltk2/inst/tklibs/ttktheme_keramik/keramik.tcl
===================================================================
--- pkg/tcltk2/inst/tklibs/ttktheme_keramik/keramik.tcl (rev 0)
+++ pkg/tcltk2/inst/tklibs/ttktheme_keramik/keramik.tcl 2010-09-01 13:23:58 UTC (rev 282)
@@ -0,0 +1,370 @@
+# keramik.tcl -
+#
+# A sample pixmap theme for the tile package.
+#
+# Copyright (c) 2004 Googie
+# Copyright (c) 2004 Pat Thoyts <patthoyts at users.sourceforge.net>
+#
+# $Id: keramik.tcl,v 1.12 2009/01/24 13:26:16 sbron Exp $
+
+package require Tk 8.4; # minimum version for Tile
+package require tile 0.8.0; # depends upon tile 0.8.0
+
+namespace eval ttk {
+ namespace eval theme {
+ namespace eval keramik {
+ variable version 0.6.1
+ }
+ namespace eval keramik_alt {
+ variable version 0.6.1
+ }
+ }
+}
+
+namespace eval ttk::theme::keramik {
+
+ variable colors
+ array set colors {
+ -frame "#cccccc"
+ -lighter "#cccccc"
+ -window "#ffffff"
+ -selectbg "#0a5f89"
+ -selectfg "#ffffff"
+ -disabledfg "#aaaaaa"
+ }
+
+ variable hover hover
+ # Need a two-step check as 8.4 doesn't understand beta version numbers
+ if {![package vsatisfies [package present Ttk] 8.6] || \
+ ![package vsatisfies [package present Ttk] 8.6b1]} {
+ # The hover state is not supported prior to 8.6b1
+ set hover active
+ }
+
+ proc LoadImages {imgdir} {
+ variable I
+ foreach file [glob -directory $imgdir *.gif] {
+ set img [file tail [file rootname $file]]
+ set I($img) [image create photo -file $file -format gif89]
+ }
+ }
+
+ LoadImages [file join [file dirname [info script]] keramik]
+
+ ttk::style theme create keramik -parent alt -settings {
+
+
+ # -----------------------------------------------------------------
+ # Theme defaults
+ #
+ ttk::style configure . \
+ -borderwidth 1 \
+ -background $colors(-frame) \
+ -troughcolor $colors(-lighter) \
+ -selectbackground $colors(-selectbg) \
+ -selectforeground $colors(-selectfg) \
+ -fieldbackground $colors(-window) \
+ -font TkDefaultFont \
+ ;
+
+ ttk::style map . -foreground [list disabled $colors(-disabledfg)]
+
+ # -----------------------------------------------------------------
+ # Button elements
+ # - the button has a large rounded border and needs a bit of
+ # horizontal padding.
+ # - the checkbutton and radiobutton have the focus drawn around
+ # the whole widget - hence the new layouts.
+ #
+ ttk::style layout TButton {
+ Button.background
+ Button.button -children {
+ Button.focus -children {
+ Button.label
+ }
+ }
+ }
+ ttk::style layout Toolbutton {
+ Toolbutton.background
+ Toolbutton.button -children {
+ Toolbutton.focus -children {
+ Toolbutton.label
+ }
+ }
+ }
+
+ ttk::style element create button image [list $I(button-n) \
+ {pressed !disabled} $I(button-p) \
+ selected $I(button-s) \
+ {active !disabled} $I(button-h) \
+ disabled $I(button-d)] \
+ -border {8 6 8 16} -padding {6 6} -sticky news
+ ttk::style configure TButton -padding {10 6} -anchor center
+
+ ttk::style element create Toolbutton.button image [list $I(tbar-n) \
+ {pressed !disabled} $I(tbar-p) \
+ selected $I(tbar-p) \
+ {active !disabled} $I(tbar-a)] \
+ -border {2 9 2 18} -padding {2 2} -sticky news
+ ttk::style configure Toolbutton -anchor center
+
+ ttk::style element create Checkbutton.indicator \
+ image [list $I(check-u) selected $I(check-c)] \
+ -width 20 -sticky w
+
+ ttk::style element create Radiobutton.indicator \
+ image [list $I(radio-u) selected $I(radio-c)] \
+ -width 20 -sticky w
+
+ # The layout for the menubutton is modified to have a button element
+ # drawn on top of the background. This means we can have transparent
+ # pixels in the button element. Also, the pixmap has a special
+ # region on the right for the arrow. So we draw the indicator as a
+ # sibling element to the button, and draw it after (ie on top of) the
+ # button image.
+ ttk::style layout TMenubutton {
+ Menubutton.background
+ Menubutton.button -children {
+ Menubutton.focus -children {
+ Menubutton.padding -children {
+ Menubutton.label -side left -expand true
+ }
+ }
+ }
+ Menubutton.indicator -side right
+ }
+ ttk::style element create Menubutton.button image [list $I(mbut-n) \
+ {active !disabled} $I(mbut-a) \
+ {pressed !disabled} $I(mbut-a) \
+ {disabled} $I(mbut-d)] \
+ -border {7 10 29 15} -padding {7 4 29 4} -sticky news
+ ttk::style element create Menubutton.indicator image $I(mbut-arrow-n) \
+ -width 11 -sticky w -padding {0 0 18 0}
+
+ ttk::style element create Combobox.field image [list $I(cbox-n) \
+ [list readonly disabled] $I(mbut-d) \
+ [list readonly $hover] $I(mbut-a) \
+ [list readonly] $I(mbut-n) \
+ [list disabled] $I(cbox-d) \
+ [list $hover] $I(cbox-a) \
+ ] -border {9 10 32 15} -padding {9 4 8 4} -sticky news
+ ttk::style element create Combobox.downarrow image $I(mbut-arrow-n) \
+ -width 11 -sticky e -border {22 0 0 0}
+
+ # -----------------------------------------------------------------
+ # Scrollbars, scale and progress elements
+ # - the scrollbar has three arrow buttons, two at the bottom and
+ # one at the top.
+ #
+ ttk::style layout Vertical.TScrollbar {
+ Scrollbar.background
+ Vertical.Scrollbar.trough -children {
+ Scrollbar.uparrow -side top
+ Scrollbar.downarrow -side bottom
+ Scrollbar.uparrow -side bottom
+ Vertical.Scrollbar.thumb -side top -expand true -sticky ns
+ }
+ }
+
+ ttk::style layout Horizontal.TScrollbar {
+ Scrollbar.background
+ Horizontal.Scrollbar.trough -children {
+ Scrollbar.leftarrow -side left
+ Scrollbar.rightarrow -side right
+ Scrollbar.leftarrow -side right
+ Horizontal.Scrollbar.thumb -side left -expand true -sticky we
+ }
+ }
+
+ ttk::style element create Horizontal.Scrollbar.thumb \
+ image [list $I(hsb-n) {pressed !disabled} $I(hsb-p)] \
+ -border {6 4} -width 15 -height 16 -sticky news
+ ttk::style element create Horizontal.Scrollbar.trough image $I(hsb-t)
+
+ ttk::style element create Vertical.Scrollbar.thumb \
+ image [list $I(vsb-n) {pressed !disabled} $I(vsb-p)] \
+ -border {4 6} -width 16 -height 15 -sticky news
[TRUNCATED]
To get the complete diff run:
svnlook diff /svnroot/sciviews -r 282
More information about the Sciviews-commits
mailing list