aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--ChangeLog4
-rw-r--r--data/styles/Artwiz2
-rw-r--r--data/styles/BlueNight2
-rw-r--r--data/styles/Carbondioxide2
-rw-r--r--data/styles/Clean2
-rw-r--r--data/styles/Cthulhain2
-rw-r--r--data/styles/Flux2
-rw-r--r--data/styles/LemonSpace2
-rw-r--r--data/styles/Makro2
-rw-r--r--data/styles/MerleyKay2
-rw-r--r--data/styles/Meta2
-rw-r--r--data/styles/Minimal2
-rw-r--r--data/styles/Nyz2
-rw-r--r--data/styles/Operation2
-rw-r--r--data/styles/Outcomes2
-rw-r--r--data/styles/Rampage2
-rw-r--r--data/styles/Results2
-rw-r--r--data/styles/Shade2
-rw-r--r--data/styles/Spiff2
-rw-r--r--data/styles/Twice2
-rw-r--r--data/styles/qnx-photon2
-rw-r--r--src/ScreenResources.cc25
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 @@
1(Format: Year/Month/Day) 1(Format: Year/Month/Day)
2Changes for 0.9.15:
3 * Use fbsetroot in Default-Styles (Mathias)
4 data/styles/*
5-------------------------------------------------------------
2Changes for 0.9.14: 6Changes for 0.9.14:
3*05/09/12: 7*05/09/12:
4 * Fixes #1281708, MenuIcon doesnt scale properly (thanx Erik-Jan) 8 * 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
104borderWidth: 1 104borderWidth: 1
105handleWidth: 5 105handleWidth: 5
106 106
107rootCommand: bsetroot -mod 4 4 -bg rgb:10/18/20 -fg rgb:30/38/40 107rootCommand: ffbsetroot -mod 4 4 -bg rgb:10/18/20 -fg rgb:30/38/40
108 108
109*Font: -*-lucidatypewriter-medium-r-*-*-*-100-*-*-*-*-*-* 109*Font: -*-lucidatypewriter-medium-r-*-*-*-100-*-*-*-*-*-*
110!*Font: vera-7 110!*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:
5style.comments: Modified/tweaked by skypher 5style.comments: Modified/tweaked by skypher
6 6
7 7
8rootCommand: bsetroot -solid rgb:6A/9A/AF 8rootCommand: fbsetroot -solid rgb:6A/9A/AF
9 9
10! Toolbar settings... 10! Toolbar settings...
11toolbar.button: Gradient Diagonal 11toolbar.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
132borderWidth: 1 132borderWidth: 1
133handleWidth: 3 133handleWidth: 3
134 134
135rootCommand: bsetroot -gradient flatverticalgradient -from black -to white 135rootCommand: 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
114borderWidth: 1 114borderWidth: 1
115handleWidth: 2 115handleWidth: 2
116 116
117rootCommand: bsetroot -solid rgb:9A/9A/90 117rootCommand: 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
117handleWidth: 4 117handleWidth: 4
118frameWidth: 0 118frameWidth: 0
119 119
120rootCommand: bsetroot -solid "#3a404b" 120rootCommand: fbsetroot -solid "#3a404b"
121 121
122! ***** bbpager ***** 122! ***** bbpager *****
123bbpager.frame: sunken gradient crossdiagonal 123bbpager.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
88*textColor: grey20 88*textColor: grey20
89*Font: lucidasans-10 89*Font: lucidasans-10
90 90
91rootCommand: bsetroot -solid rgb:4/4/38 91rootCommand: 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
125window.tab.label.focus.textColor: rgb:1a/04/08 125window.tab.label.focus.textColor: rgb:1a/04/08
126! - 126! -
127 127
128rootCommand: bsetroot -solid rgb:db/bc/83 128rootCommand: 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
113borderWidth: 1 113borderWidth: 1
114handleWidth: 3 114handleWidth: 3
115 115
116rootCommand: bsetroot -solid rgb:9A/9A/90 116rootCommand: 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
131borderWidth: 2 131borderWidth: 2
132handleWidth: 3 132handleWidth: 3
133 133
134rootCommand: bsetroot -mod 5 5 -fg rgb:62/70/85 -bg rgb:52/60/75 134rootCommand: 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
124frameWidth: 1 124frameWidth: 1
125handleWidth: 4 125handleWidth: 4
126 126
127rootCommand: bsetroot -solid "#d6d7e7" 127rootCommand: fbsetroot -solid "#d6d7e7"
128*font: glisp 128*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
76 76
77*Font: -*-helvetica-*-r-*-*-12-*-*-*-*-*-*-* 77*Font: -*-helvetica-*-r-*-*-12-*-*-*-*-*-*-*
78 78
79rootCommand: bsetroot -solid SlateGrey 79rootCommand: 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
100*textColor: grey85 100*textColor: grey85
101*Font: lucidasans-10 101*Font: lucidasans-10
102 102
103rootCommand: bsetroot -solid grey20 103rootCommand: 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
83*textColor: grey85 83*textColor: grey85
84*Font: lucidasans-10 84*Font: lucidasans-10
85 85
86rootCommand: bsetroot -gradient flatcrossdiagonalgradient -from rgb:4/6/8 -to rgb:3/48/6 86rootCommand: fbsetroot -gradient flatcrossdiagonalgradient -from rgb:4/6/8 -to rgb:3/48/6
87 87
88bbpager.desktop.focus: flat interlaced crossdiagonal gradient 88bbpager.desktop.focus: flat interlaced crossdiagonal gradient
89bbpager.desktop.focus.color: rgb:6/9/c 89bbpager.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
107bevelWidth: 2 107bevelWidth: 2
108handleWidth: 4 108handleWidth: 4
109 109
110rootCommand: bsetroot -mod 4 4 -fg rgb:54/6/6 -bg grey20 110rootCommand: fbsetroot -mod 4 4 -fg rgb:54/6/6 -bg grey20
111 111
112! for the bbtools 112! for the bbtools
113menuFont: lucidasans-10 113menuFont: 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
99*font: -b&h-lucida-medium-r-normal-*-*-100-*-*-p-*-iso8859-* 99*font: -b&h-lucida-medium-r-normal-*-*-100-*-*-p-*-iso8859-*
100*textColor: black 100*textColor: black
101 101
102rootCommand: bsetroot -mod 16 8 -bg rgb:0/8/8 -fg rgb:0/9/9 102rootCommand: 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
107bevelWidth: 2 107bevelWidth: 2
108handleWidth: 4 108handleWidth: 4
109 109
110rootCommand: bsetroot -mod 4 4 -fg rgb:6/6/5c -bg grey20 110rootCommand: fbsetroot -mod 4 4 -fg rgb:6/6/5c -bg grey20
111 111
112! for the bbtools 112! for the bbtools
113menuFont: lucidasans-10 113menuFont: 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
88*textColor: grey20 88*textColor: grey20
89*Font: lucidasans-10 89*Font: lucidasans-10
90 90
91rootCommand: bsetroot -solid rgb:4/4/4 91rootCommand: 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
104borderWidth: 1 104borderWidth: 1
105handleWidth: 3 105handleWidth: 3
106 106
107rootCommand: bsetroot -mod 2 2 -fg rgb:48/50/68 -bg rgb:50/58/70 107rootCommand: fbsetroot -mod 2 2 -fg rgb:48/50/68 -bg rgb:50/58/70
108 108
109*Font: lucidasans-10 109*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
100*textColor: grey85 100*textColor: grey85
101*Font: lucidasans-10 101*Font: lucidasans-10
102 102
103rootCommand: bsetroot -solid grey20 103rootCommand: 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
131bevelWidth: 2 131bevelWidth: 2
132handleWidth: 4 132handleWidth: 4
133frameWidth: 0 133frameWidth: 0
134rootCommand: bsetroot -solid white 134rootCommand: 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 @@
30using namespace std; 30using namespace std;
31 31
32template <> 32template <>
33void FbTk::Resource<BScreen::PlacementPolicy>::setDefaultValue() {
34 *(*this) = BScreen::ROWSMARTPLACEMENT;
35}
36
37template <>
38void FbTk::Resource<BScreen::PlacementPolicy>::setFromString(const char *str) { 33void FbTk::Resource<BScreen::PlacementPolicy>::setFromString(const char *str) {
39 if (strcasecmp("RowSmartPlacement", str) == 0) 34 if (strcasecmp("RowSmartPlacement", str) == 0)
40 *(*this) = BScreen::ROWSMARTPLACEMENT; 35 *(*this) = BScreen::ROWSMARTPLACEMENT;
@@ -66,11 +61,6 @@ string FbTk::Resource<BScreen::PlacementPolicy>::getString() {
66} 61}
67 62
68template <> 63template <>
69void FbTk::Resource<BScreen::RowDirection>::setDefaultValue() {
70 *(*this) = BScreen::LEFTRIGHT;
71}
72
73template <>
74void FbTk::Resource<BScreen::RowDirection>::setFromString(const char *str) { 64void FbTk::Resource<BScreen::RowDirection>::setFromString(const char *str) {
75 if (strcasecmp("LeftToRight", str) == 0) 65 if (strcasecmp("LeftToRight", str) == 0)
76 *(*this) = BScreen::LEFTRIGHT; 66 *(*this) = BScreen::LEFTRIGHT;
@@ -95,11 +85,6 @@ string FbTk::Resource<BScreen::RowDirection>::getString() {
95 85
96 86
97template <> 87template <>
98void FbTk::Resource<BScreen::ColumnDirection>::setDefaultValue() {
99 *(*this) = BScreen::TOPBOTTOM;
100}
101
102template <>
103void FbTk::Resource<BScreen::ColumnDirection>::setFromString(const char *str) { 88void FbTk::Resource<BScreen::ColumnDirection>::setFromString(const char *str) {
104 if (strcasecmp("TopToBottom", str) == 0) 89 if (strcasecmp("TopToBottom", str) == 0)
105 *(*this) = BScreen::TOPBOTTOM; 90 *(*this) = BScreen::TOPBOTTOM;
@@ -123,11 +108,6 @@ string FbTk::Resource<BScreen::ColumnDirection>::getString() {
123} 108}
124 109
125template <> 110template <>
126void FbTk::Resource<FbTk::MenuTheme::MenuMode>::setDefaultValue() {
127 *(*this) = FbTk::MenuTheme::DELAY_OPEN;
128}
129
130template <>
131string FbTk::Resource<FbTk::MenuTheme::MenuMode>::getString() { 111string FbTk::Resource<FbTk::MenuTheme::MenuMode>::getString() {
132 switch (*(*this)) { 112 switch (*(*this)) {
133 case FbTk::MenuTheme::DELAY_OPEN: 113 case FbTk::MenuTheme::DELAY_OPEN:
@@ -319,11 +299,6 @@ void FbTk::Resource<FbTk::GContext::JoinStyle>
319} 299}
320 300
321template<> 301template<>
322void FbTk::Resource<FbTk::GContext::CapStyle>::setDefaultValue() {
323 *(*this) = FbTk::GContext::CAPNOTLAST;
324}
325
326template<>
327std::string FbTk::Resource<FbTk::GContext::CapStyle>::getString() { 302std::string FbTk::Resource<FbTk::GContext::CapStyle>::getString() {
328 switch(m_value) { 303 switch(m_value) {
329 case FbTk::GContext::CAPNOTLAST: 304 case FbTk::GContext::CAPNOTLAST:
generated by cgit v0.11.2 at 2024-11-03 17:59:07 (GMT)