From 94acb4a27e758904a0d973129dfbdc9e686977f1 Mon Sep 17 00:00:00 2001 From: mathias <mathias> Date: Fri, 16 Sep 2005 05:39:12 +0000 Subject: use fbsetroot in default styles --- ChangeLog | 4 ++++ data/styles/Artwiz | 2 +- data/styles/BlueNight | 2 +- data/styles/Carbondioxide | 2 +- data/styles/Clean | 2 +- data/styles/Cthulhain | 2 +- data/styles/Flux | 2 +- data/styles/LemonSpace | 2 +- data/styles/Makro | 2 +- data/styles/MerleyKay | 2 +- data/styles/Meta | 2 +- data/styles/Minimal | 2 +- data/styles/Nyz | 2 +- data/styles/Operation | 2 +- data/styles/Outcomes | 2 +- data/styles/Rampage | 2 +- data/styles/Results | 2 +- data/styles/Shade | 2 +- data/styles/Spiff | 2 +- data/styles/Twice | 2 +- data/styles/qnx-photon | 2 +- src/ScreenResources.cc | 25 ------------------------- 22 files changed, 24 insertions(+), 45 deletions(-) diff --git a/ChangeLog b/ChangeLog index ecb4bfb..6327e7f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -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) diff --git a/data/styles/Artwiz b/data/styles/Artwiz index 86819b9..5ef8ce7 100644 --- a/data/styles/Artwiz +++ b/data/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 diff --git a/data/styles/BlueNight b/data/styles/BlueNight index ee12564..3efbebd 100644 --- a/data/styles/BlueNight +++ b/data/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 diff --git a/data/styles/Carbondioxide b/data/styles/Carbondioxide index 288741a..5eb74e4 100644 --- a/data/styles/Carbondioxide +++ b/data/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 diff --git a/data/styles/Clean b/data/styles/Clean index b0eb1b4..cfe6d32 100644 --- a/data/styles/Clean +++ b/data/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 diff --git a/data/styles/Cthulhain b/data/styles/Cthulhain index 4c940c3..6278f75 100644 --- a/data/styles/Cthulhain +++ b/data/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 diff --git a/data/styles/Flux b/data/styles/Flux index 5bdca87..03d74c8 100644 --- a/data/styles/Flux +++ b/data/styles/Flux @@ -88,4 +88,4 @@ handleWidth: 3 *textColor: grey20 *Font: lucidasans-10 -rootCommand: bsetroot -solid rgb:4/4/38 +rootCommand: fbsetroot -solid rgb:4/4/38 diff --git a/data/styles/LemonSpace b/data/styles/LemonSpace index 1dcd328..0eb306b 100644 --- a/data/styles/LemonSpace +++ b/data/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 diff --git a/data/styles/Makro b/data/styles/Makro index e360ffc..0b543e8 100644 --- a/data/styles/Makro +++ b/data/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 diff --git a/data/styles/MerleyKay b/data/styles/MerleyKay index 63ceb60..c8d8e26 100644 --- a/data/styles/MerleyKay +++ b/data/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 diff --git a/data/styles/Meta b/data/styles/Meta index c5daa99..93e989c 100644 --- a/data/styles/Meta +++ b/data/styles/Meta @@ -124,5 +124,5 @@ bevelWidth: 1 frameWidth: 1 handleWidth: 4 -rootCommand: bsetroot -solid "#d6d7e7" +rootCommand: fbsetroot -solid "#d6d7e7" *font: glisp diff --git a/data/styles/Minimal b/data/styles/Minimal index ca0d2c1..7fb3b9a 100644 --- a/data/styles/Minimal +++ b/data/styles/Minimal @@ -76,4 +76,4 @@ handleWidth: 4 *Font: -*-helvetica-*-r-*-*-12-*-*-*-*-*-*-* -rootCommand: bsetroot -solid SlateGrey +rootCommand: fbsetroot -solid SlateGrey diff --git a/data/styles/Nyz b/data/styles/Nyz index 0313abf..2c7fc4a 100644 --- a/data/styles/Nyz +++ b/data/styles/Nyz @@ -100,4 +100,4 @@ handleWidth: 4 *textColor: grey85 *Font: lucidasans-10 -rootCommand: bsetroot -solid grey20 +rootCommand: fbsetroot -solid grey20 diff --git a/data/styles/Operation b/data/styles/Operation index affa806..bef9654 100644 --- a/data/styles/Operation +++ b/data/styles/Operation @@ -83,7 +83,7 @@ handleWidth: 4 *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 diff --git a/data/styles/Outcomes b/data/styles/Outcomes index b0ad159..de97c33 100644 --- a/data/styles/Outcomes +++ b/data/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 diff --git a/data/styles/Rampage b/data/styles/Rampage index b0704e7..4e363b6 100644 --- a/data/styles/Rampage +++ b/data/styles/Rampage @@ -99,4 +99,4 @@ handleWidth: 5 *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 diff --git a/data/styles/Results b/data/styles/Results index 8f06b6b..702a586 100644 --- a/data/styles/Results +++ b/data/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 diff --git a/data/styles/Shade b/data/styles/Shade index 06e772e..579f37e 100644 --- a/data/styles/Shade +++ b/data/styles/Shade @@ -88,4 +88,4 @@ handleWidth: 3 *textColor: grey20 *Font: lucidasans-10 -rootCommand: bsetroot -solid rgb:4/4/4 +rootCommand: fbsetroot -solid rgb:4/4/4 diff --git a/data/styles/Spiff b/data/styles/Spiff index 6a3b382..f0c5e34 100644 --- a/data/styles/Spiff +++ b/data/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 diff --git a/data/styles/Twice b/data/styles/Twice index 1d6fa01..ed190d2 100644 --- a/data/styles/Twice +++ b/data/styles/Twice @@ -100,4 +100,4 @@ handleWidth: 4 *textColor: grey85 *Font: lucidasans-10 -rootCommand: bsetroot -solid grey20 +rootCommand: fbsetroot -solid grey20 diff --git a/data/styles/qnx-photon b/data/styles/qnx-photon index cde8970..096bc26 100644 --- a/data/styles/qnx-photon +++ b/data/styles/qnx-photon @@ -131,4 +131,4 @@ borderWidth: 1 bevelWidth: 2 handleWidth: 4 frameWidth: 0 -rootCommand: bsetroot -solid white +rootCommand: fbsetroot -solid white diff --git a/src/ScreenResources.cc b/src/ScreenResources.cc index db92b19..03514ad 100644 --- a/src/ScreenResources.cc +++ b/src/ScreenResources.cc @@ -30,11 +30,6 @@ 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; @@ -66,11 +61,6 @@ string FbTk::Resource<BScreen::PlacementPolicy>::getString() { } template <> -void FbTk::Resource<BScreen::RowDirection>::setDefaultValue() { - *(*this) = BScreen::LEFTRIGHT; -} - -template <> void FbTk::Resource<BScreen::RowDirection>::setFromString(const char *str) { if (strcasecmp("LeftToRight", str) == 0) *(*this) = BScreen::LEFTRIGHT; @@ -95,11 +85,6 @@ string FbTk::Resource<BScreen::RowDirection>::getString() { 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; @@ -123,11 +108,6 @@ string FbTk::Resource<BScreen::ColumnDirection>::getString() { } template <> -void FbTk::Resource<FbTk::MenuTheme::MenuMode>::setDefaultValue() { - *(*this) = FbTk::MenuTheme::DELAY_OPEN; -} - -template <> string FbTk::Resource<FbTk::MenuTheme::MenuMode>::getString() { switch (*(*this)) { case FbTk::MenuTheme::DELAY_OPEN: @@ -319,11 +299,6 @@ void FbTk::Resource<FbTk::GContext::JoinStyle> } template<> -void FbTk::Resource<FbTk::GContext::CapStyle>::setDefaultValue() { - *(*this) = FbTk::GContext::CAPNOTLAST; -} - -template<> std::string FbTk::Resource<FbTk::GContext::CapStyle>::getString() { switch(m_value) { case FbTk::GContext::CAPNOTLAST: -- cgit v0.11.2