all repos — fluxbox @ 94acb4a27e758904a0d973129dfbdc9e686977f1

custom fork of the fluxbox windowmanager

use fbsetroot in default styles
mathias mathias
commit

94acb4a27e758904a0d973129dfbdc9e686977f1

parent

4684693f3ce7185cab25e9c192ddb780db450454

M ChangeLogChangeLog

@@ -1,4 +1,8 @@

(Format: Year/Month/Day) +Changes for 0.9.15: + * Use fbsetroot in Default-Styles (Mathias) + data/styles/* +------------------------------------------------------------- Changes for 0.9.14: *05/09/12: * Fixes #1281708, MenuIcon doesnt scale properly (thanx Erik-Jan)
M data/styles/Artwizdata/styles/Artwiz

@@ -104,7 +104,7 @@ bevelWidth: 2

borderWidth: 1 handleWidth: 5 -rootCommand: bsetroot -mod 4 4 -bg rgb:10/18/20 -fg rgb:30/38/40 +rootCommand: ffbsetroot -mod 4 4 -bg rgb:10/18/20 -fg rgb:30/38/40 *Font: -*-lucidatypewriter-medium-r-*-*-*-100-*-*-*-*-*-* !*Font: vera-7
M data/styles/BlueNightdata/styles/BlueNight

@@ -5,7 +5,7 @@ style.credits:

style.comments: Modified/tweaked by skypher -rootCommand: bsetroot -solid rgb:6A/9A/AF +rootCommand: fbsetroot -solid rgb:6A/9A/AF ! Toolbar settings... toolbar.button: Gradient Diagonal
M data/styles/Carbondioxidedata/styles/Carbondioxide

@@ -132,4 +132,4 @@ bevelWidth: 2

borderWidth: 1 handleWidth: 3 -rootCommand: bsetroot -gradient flatverticalgradient -from black -to white +rootCommand: fbsetroot -gradient flatverticalgradient -from black -to white
M data/styles/Cleandata/styles/Clean

@@ -114,4 +114,4 @@ bevelWidth: 1

borderWidth: 1 handleWidth: 2 -rootCommand: bsetroot -solid rgb:9A/9A/90 +rootCommand: fbsetroot -solid rgb:9A/9A/90
M data/styles/Cthulhaindata/styles/Cthulhain

@@ -117,7 +117,7 @@ bevelWidth: 2

handleWidth: 4 frameWidth: 0 -rootCommand: bsetroot -solid "#3a404b" +rootCommand: fbsetroot -solid "#3a404b" ! ***** bbpager ***** bbpager.frame: sunken gradient crossdiagonal
M data/styles/Fluxdata/styles/Flux

@@ -88,4 +88,4 @@

*textColor: grey20 *Font: lucidasans-10 -rootCommand: bsetroot -solid rgb:4/4/38 +rootCommand: fbsetroot -solid rgb:4/4/38
M data/styles/LemonSpacedata/styles/LemonSpace

@@ -125,4 +125,4 @@ window.tab.label.unfocus.textColor: rgb:5a/5a/5a

window.tab.label.focus.textColor: rgb:1a/04/08 ! - -rootCommand: bsetroot -solid rgb:db/bc/83 +rootCommand: fbsetroot -solid rgb:db/bc/83
M data/styles/Makrodata/styles/Makro

@@ -113,4 +113,4 @@ bevelWidth: 2

borderWidth: 1 handleWidth: 3 -rootCommand: bsetroot -solid rgb:9A/9A/90 +rootCommand: fbsetroot -solid rgb:9A/9A/90
M data/styles/MerleyKaydata/styles/MerleyKay

@@ -131,4 +131,4 @@ bevelWidth: 2

borderWidth: 2 handleWidth: 3 -rootCommand: bsetroot -mod 5 5 -fg rgb:62/70/85 -bg rgb:52/60/75 +rootCommand: fbsetroot -mod 5 5 -fg rgb:62/70/85 -bg rgb:52/60/75
M data/styles/Metadata/styles/Meta

@@ -124,5 +124,5 @@ bevelWidth: 1

frameWidth: 1 handleWidth: 4 -rootCommand: bsetroot -solid "#d6d7e7" +rootCommand: fbsetroot -solid "#d6d7e7" *font: glisp
M data/styles/Minimaldata/styles/Minimal

@@ -76,4 +76,4 @@ handleWidth: 4

*Font: -*-helvetica-*-r-*-*-12-*-*-*-*-*-*-* -rootCommand: bsetroot -solid SlateGrey +rootCommand: fbsetroot -solid SlateGrey
M data/styles/Nyzdata/styles/Nyz

@@ -100,4 +100,4 @@

*textColor: grey85 *Font: lucidasans-10 -rootCommand: bsetroot -solid grey20 +rootCommand: fbsetroot -solid grey20
M data/styles/Operationdata/styles/Operation

@@ -83,7 +83,7 @@

*textColor: grey85 *Font: lucidasans-10 -rootCommand: bsetroot -gradient flatcrossdiagonalgradient -from rgb:4/6/8 -to rgb:3/48/6 +rootCommand: fbsetroot -gradient flatcrossdiagonalgradient -from rgb:4/6/8 -to rgb:3/48/6 bbpager.desktop.focus: flat interlaced crossdiagonal gradient bbpager.desktop.focus.color: rgb:6/9/c
M data/styles/Outcomesdata/styles/Outcomes

@@ -107,7 +107,7 @@ borderWidth: 1

bevelWidth: 2 handleWidth: 4 -rootCommand: bsetroot -mod 4 4 -fg rgb:54/6/6 -bg grey20 +rootCommand: fbsetroot -mod 4 4 -fg rgb:54/6/6 -bg grey20 ! for the bbtools menuFont: lucidasans-10
M data/styles/Rampagedata/styles/Rampage

@@ -99,4 +99,4 @@

*font: -b&h-lucida-medium-r-normal-*-*-100-*-*-p-*-iso8859-* *textColor: black -rootCommand: bsetroot -mod 16 8 -bg rgb:0/8/8 -fg rgb:0/9/9 +rootCommand: fbsetroot -mod 16 8 -bg rgb:0/8/8 -fg rgb:0/9/9
M data/styles/Resultsdata/styles/Results

@@ -107,7 +107,7 @@ borderWidth: 1

bevelWidth: 2 handleWidth: 4 -rootCommand: bsetroot -mod 4 4 -fg rgb:6/6/5c -bg grey20 +rootCommand: fbsetroot -mod 4 4 -fg rgb:6/6/5c -bg grey20 ! for the bbtools menuFont: lucidasans-10
M data/styles/Shadedata/styles/Shade

@@ -88,4 +88,4 @@

*textColor: grey20 *Font: lucidasans-10 -rootCommand: bsetroot -solid rgb:4/4/4 +rootCommand: fbsetroot -solid rgb:4/4/4
M data/styles/Spiffdata/styles/Spiff

@@ -104,6 +104,6 @@ bevelWidth: 1

borderWidth: 1 handleWidth: 3 -rootCommand: bsetroot -mod 2 2 -fg rgb:48/50/68 -bg rgb:50/58/70 +rootCommand: fbsetroot -mod 2 2 -fg rgb:48/50/68 -bg rgb:50/58/70 *Font: lucidasans-10
M data/styles/Twicedata/styles/Twice

@@ -100,4 +100,4 @@

*textColor: grey85 *Font: lucidasans-10 -rootCommand: bsetroot -solid grey20 +rootCommand: fbsetroot -solid grey20
M data/styles/qnx-photondata/styles/qnx-photon

@@ -131,4 +131,4 @@ borderWidth: 1

bevelWidth: 2 handleWidth: 4 frameWidth: 0 -rootCommand: bsetroot -solid white +rootCommand: fbsetroot -solid white
M src/ScreenResources.ccsrc/ScreenResources.cc

@@ -30,11 +30,6 @@ #include <string>

using namespace std; template <> -void FbTk::Resource<BScreen::PlacementPolicy>::setDefaultValue() { - *(*this) = BScreen::ROWSMARTPLACEMENT; -} - -template <> void FbTk::Resource<BScreen::PlacementPolicy>::setFromString(const char *str) { if (strcasecmp("RowSmartPlacement", str) == 0) *(*this) = BScreen::ROWSMARTPLACEMENT;

@@ -63,11 +58,6 @@ return "CascadePlacement";

} return "RowSmartPlacement"; -} - -template <> -void FbTk::Resource<BScreen::RowDirection>::setDefaultValue() { - *(*this) = BScreen::LEFTRIGHT; } template <>

@@ -95,11 +85,6 @@ }

template <> -void FbTk::Resource<BScreen::ColumnDirection>::setDefaultValue() { - *(*this) = BScreen::TOPBOTTOM; -} - -template <> void FbTk::Resource<BScreen::ColumnDirection>::setFromString(const char *str) { if (strcasecmp("TopToBottom", str) == 0) *(*this) = BScreen::TOPBOTTOM;

@@ -120,11 +105,6 @@ return "BottomToTop";

} return "TopToBottom"; -} - -template <> -void FbTk::Resource<FbTk::MenuTheme::MenuMode>::setDefaultValue() { - *(*this) = FbTk::MenuTheme::DELAY_OPEN; } template <>

@@ -316,11 +296,6 @@ else if (strcasecmp(strval, "JoinBevel") == 0)

m_value = FbTk::GContext::JOINBEVEL; else setDefaultValue(); -} - -template<> -void FbTk::Resource<FbTk::GContext::CapStyle>::setDefaultValue() { - *(*this) = FbTk::GContext::CAPNOTLAST; } template<>