merge the C branch into HEAD

1 files changed, 0 insertions, 149 deletions

diff --git a/data/styles/trisb b/data/styles/trisb
deleted file mode 100644
index 66d4450d..00000000
--- a/data/styles/trisb
+++ /dev/null
@@ -1,149 +0,0 @@
-style.name:	trisb
-style.author:	miklos
-style.date:	March 25, 2002
-style.credits:	
-style.comments:			
-		
-!*font:		mints-strong
-*font:		-adobe-helvetica-medium-r-*-*-*-100-*-*-*-*-*-*
-
-*xft.font:	Trebuchet MS
-*xft.size:	9
-menu*xft.size:	11
-
-rootCommand:	bsetbg -solid "#4b4b4b"
-
-! Toolbar settings...
-toolbar.button:	Flat Gradient Vertical
-toolbar.button.color:	#d5d5d5
-toolbar.button.colorTo:	#b4b4b4
-toolbar.button.picColor:	#343434
-
-toolbar.button.pressed:	Sunken Bevel1 Solid Vertical
-toolbar.button.pressed.color:	#c8c8c8
-toolbar.button.pressed.colorTo:	#ffffff
-
-toolbar.label:	Flat Gradient Vertical
-toolbar.label.color:	#d5d5d5
-toolbar.label.colorTo:	#b4b4b4
-toolbar.label.textColor:	#343434
-
-toolbar.windowLabel:	Flat Gradient Vertical
-toolbar.windowLabel.color:	#d5d5d5
-toolbar.windowLabel.colorTo:	#b4b4b4
-toolbar.windowLabel.textColor:	#343434
-
-toolbar.clock:	Flat Gradient Vertical
-toolbar.clock.color:	#d5d5d5
-toolbar.clock.colorTo:	#b4b4b4
-toolbar.clock.textColor:	#343434
-
-toolbar:	Flat Gradient Vertical
-toolbar.color:	#d5d5d5
-toolbar.colorTo:	#b4b4b4
-toolbar.textColor:	#ffffff
-toolbar.justify:	Center
-
-
-! Menu settings...
-menu.frame:	Flat Gradient CrossDiagonal
-menu.frame.color:	#d5d5d5
-menu.frame.colorTo:	#b4b4b4
-menu.frame.textColor:	#343434
-menu.frame.justify:	Right
-
-menu.title:	Flat Gradient Vertical
-menu.title.color:	#8e8e8e
-menu.title.colorTo:	#5f5f5f
-menu.title.textColor:	#c8c8c8
-menu.title.justify:	Center
-
-menu.hilite:	Flat Gradient Vertical
-menu.hilite.color:	#3b90dc
-menu.hilite.colorTo:	#2c5f8c
-menu.hilite.textColor:	#8efdff
-
-menu.bullet:	Triangle
-menu.bullet.position:	Right
-menu.frame.disableColor:	#ffffff
-
-! Window settings...
-window.button.focus:	Flat Gradient Vertical
-window.button.focus.color:	#3b90dc
-window.button.focus.colorTo:	#2c5f8c
-window.button.focus.picColor:	#8efdff
-
-window.button.unfocus:	Flat Gradient Vertical
-window.button.unfocus.color:	#8e8e8e
-window.button.unfocus.colorTo:	#5f5f5f
-window.button.unfocus.picColor:	#aaaaaa
-
-window.grip.focus:	Flat Solid Vertical
-window.grip.focus.color:	#3b90dc
-window.grip.focus.colorto:	#2c5f8c
-
-window.grip.unfocus:	Flat Gradient Vertical
-window.grip.unfocus.color:	#8e8e8e
-window.grip.unfocus.colorTo:	#5f5f5f
-
-window.handle.focus:	Flat Gradient Vertical
-window.handle.focus.color:	#3b90dc
-window.handle.focus.colorTo:	#2c5f8c
-
-window.handle.unfocus:	Flat Gradient Vertical
-window.handle.unfocus.color:	#7a7a7a
-window.handle.unfocus.colorTo:	#555555
-
-window.label.focus:	Flat Gradient Vertical
-window.label.focus.color:	#3b90dc
-window.label.focus.colorTo:	#2c5f8c
-window.label.focus.textColor:	#8efdff
-window.label.focus.justify:	Center
-
-window.justify:	Center
-window.label.unfocus:	Flat Gradient Vertical
-window.label.unfocus.color:	#8e8e8e
-window.label.unfocus.colorTo:	#5f5f5f
-window.label.unfocus.textColor:	#aaaaaa
-
-window.title.focus:	Flat Gradient Vertical
-window.title.focus.color:	#3b90dc
-window.title.focus.colorTo:	#2c5f8c
-
-window.title.unfocus:	Flat Gradient Vertical
-window.title.unfocus.color:	#8e8e8e
-window.title.unfocus.colorTo:	#5f5f5f
-
-window.button.pressed:	Sunken Bevel1 Solid Vertical
-window.button.pressed.color:	#3b90dc
-
-window.frame.focusColor:	#343434
-window.frame.unfocusColor:	#000000
-handleWidth:	3
-frameWidth:	0
-bevelWidth:	1
-borderWidth:	1
-borderColor:	#121212
-
-bbpager.frame:                          flat solid
-    bbpager.frame.color:                #4b4b4b
-
-bbpager.desktop:                        sunken solid
-    bbpager.desktop.color:              #4b4b4b
-
-bbpager.desktop.focus:                  raised solid
-    bbpager.desktop.focus.color:        #ffffff
-
-bbpager.window.focus:                   raised gradient vertical
-    bbpager.window.focus.color:         #3b90dc
-    bbpager.window.focus.colorTo:       #2c5f8c
-
-bbpager.window:                         flat gradient vertical
-    bbpager.window.color:               #8e8e8e
-    bbpager.window.colorTo:             #5f5f5f
-
-bbpager.desktop.focusStyle:             border
-bbpager.active.window.borderColor:      #202020
-bbpager.inactive.window.borderColor:    #000000
-bbpager.active.desktop.borderColor:     #73787e
-