summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--HISTORY5
-rw-r--r--baserender.c72
-rw-r--r--baserender.h15
-rw-r--r--displaychannel.c25
-rw-r--r--displaychannel.h4
-rw-r--r--displaymenu.c9
-rw-r--r--displayreplay.c61
-rw-r--r--displayreplay.h6
-rw-r--r--displayvolume.c27
-rw-r--r--displayvolume.h5
-rw-r--r--flat.h48
-rwxr-xr-xgenerate_theme.sh38
-rw-r--r--skinflat.c2
-rw-r--r--themes/flat-white.theme14
14 files changed, 174 insertions, 157 deletions
diff --git a/HISTORY b/HISTORY
index f88327e..0ba17b5 100644
--- a/HISTORY
+++ b/HISTORY
@@ -1,5 +1,10 @@
VDR Plugin 'skinflat' Revision History
---------------------------------------
+2013-30-08: Version 0.0.2
+- [add] replay marks
+- [change] colors
+- [change] progressbar
+
2013-29-07: Version 0.0.1
- Erste Version
diff --git a/baserender.c b/baserender.c
index 75d4ba2..ccbdd58 100644
--- a/baserender.c
+++ b/baserender.c
@@ -17,12 +17,15 @@ cFlatBaseRender::cFlatBaseRender(void) {
marginOsd = 5;
marginItem = 10;
+ progressBarHeight = 20;
+
buttonsHeight = 0;
topBarPixmap = NULL;
buttonsPixmap = NULL;
messagePixmap = NULL;
contentPixmap = NULL;
+ progressBarPixmap = NULL;
}
cFlatBaseRender::~cFlatBaseRender(void) {
@@ -40,6 +43,8 @@ cFlatBaseRender::~cFlatBaseRender(void) {
osd->DestroyPixmap(messagePixmap);
if( contentPixmap )
osd->DestroyPixmap(contentPixmap);
+ if( progressBarPixmap )
+ osd->DestroyPixmap(progressBarPixmap);
delete osd;
}
@@ -274,3 +279,70 @@ void cFlatBaseRender::contentDraw(void) {
contentPixmap->DrawText(cPoint(0, currentHeight), contentWrapper.GetLine(i), contentColorFg, contentColorBg, font, contentWidth);
}
}
+
+void cFlatBaseRender::ProgressBarCreate(int Left, int Top, int Width, tColor ColorFg, tColor ColorBarFg, tColor ColorBg) {
+ progressBarTop = Top;
+ progressBarWidth = Width;
+
+ progressBarColorFg = ColorFg;
+ progressBarColorBarFg = ColorBarFg;
+ progressBarColorBg = ColorBg;
+
+ progressBarPixmap = osd->CreatePixmap(2, cRect(Left, Top, Width, progressBarHeight));
+ progressBarPixmap->Fill(clrTransparent);
+}
+
+void cFlatBaseRender::ProgressBarDraw(int Current, int Total) {
+ progressBarCurrent = Current;
+ progressBarTotal = Total;
+ int top = progressBarHeight / 2 - 3;
+ double percentLeft = ((double)Current) / (double)Total;
+
+ progressBarPixmap->Fill( progressBarColorBg );
+
+ progressBarPixmap->DrawRectangle(cRect( 0, top + 2, progressBarWidth, 2), progressBarColorFg);
+ if (Current > 0)
+ progressBarPixmap->DrawRectangle(cRect( 0, top, (progressBarWidth * percentLeft), 6), progressBarColorBarFg);
+}
+
+int cFlatBaseRender::ProgressBarHeight(void) {
+ return progressBarHeight;
+}
+
+
+void cFlatBaseRender::ProgressBarDrawMarks(const cMarks *Marks, tColor Color, tColor ColorCurrent) {
+ progressBarColorMark = Color;
+ progressBarColorMarkCurrent = ColorCurrent;
+
+ if( Marks ) {
+ bool Start = true;
+ for( const cMark *m = Marks->First(); m; m = Marks->Next(m) ) {
+ int p1 = ProgressBarMarkPos( m->Position() );
+ ProgressBarDrawMark(p1, Start, m->Position() == progressBarCurrent);
+ Start = !Start;
+ }
+ }
+}
+
+int cFlatBaseRender::ProgressBarMarkPos(int P) {
+ return P * progressBarWidth / progressBarTotal;
+}
+
+void cFlatBaseRender::ProgressBarDrawMark(int X, bool Start, bool Current)
+{
+ if( Start )
+ if( Current )
+ progressBarPixmap->DrawRectangle(cRect( X-5, 0, 10, 3), progressBarColorMarkCurrent);
+ else
+ progressBarPixmap->DrawRectangle(cRect( X-3, 0, 6, 3), progressBarColorMark);
+ else
+ if( Current )
+ progressBarPixmap->DrawRectangle(cRect( X-5, progressBarHeight - 3, 10, 3), progressBarColorMarkCurrent);
+ else
+ progressBarPixmap->DrawRectangle(cRect( X-3, progressBarHeight - 3, 6, 3), progressBarColorMark);
+
+ if( Current )
+ progressBarPixmap->DrawRectangle(cRect( X-1, 0, 2, progressBarHeight), progressBarColorMarkCurrent);
+ else
+ progressBarPixmap->DrawRectangle(cRect( X-1, 0, 2, progressBarHeight), progressBarColorMark);
+}
diff --git a/baserender.h b/baserender.h
index 9f0f823..0a712c1 100644
--- a/baserender.h
+++ b/baserender.h
@@ -26,6 +26,13 @@ class cFlatBaseRender
cString topBarLastDate;
int topBarHeight;
+ // Progressbar
+ cPixmap *progressBarPixmap;
+ int progressBarHeight, progressBarTop, progressBarWidth;
+ int progressBarCurrent, progressBarTotal;
+ tColor progressBarColorFg, progressBarColorBarFg, progressBarColorBg;
+ tColor progressBarColorMark, progressBarColorMarkCurrent;
+
// Buttons rot, grün, gelb, blau
cPixmap *buttonsPixmap;
int buttonsWidth, buttonsHeight;
@@ -46,6 +53,9 @@ class cFlatBaseRender
void contentDraw(void);
double ScrollbarSize(void);
+ void ProgressBarDrawMark(int X, bool Start, bool Current);
+ int ProgressBarMarkPos(int P);
+
public:
cImageLoader imgLoader;
@@ -66,6 +76,11 @@ class cFlatBaseRender
void MessageSet(eMessageType Type, const char *Text);
void MessageClear(void);
+ void ProgressBarCreate(int Left, int Top, int Width, tColor ColorFg, tColor ColorBarFg, tColor ColorBg);
+ void ProgressBarDraw(int Current, int Total);
+ int ProgressBarHeight(void);
+ void ProgressBarDrawMarks(const cMarks *Marks, tColor Color, tColor ColorCurrent);
+
void ContentCreate(int Left, int Top, int Width, int Height);
void ContentSet(const char *Text, tColor ColorFg, tColor ColorBg);
bool ContentIsShown(void);
diff --git a/displaychannel.c b/displaychannel.c
index ff1c430..a9ef0c5 100644
--- a/displaychannel.c
+++ b/displaychannel.c
@@ -12,16 +12,15 @@ cFlatDisplayChannel::cFlatDisplayChannel(bool WithInfo) {
// von unten noch oben
// 2 * EPG + 2 * EPGsml
- progressBarHeight = 20;
- heightBottom = (fontHeight * 2) + (fontSmlHeight * 2) + progressBarHeight; // Top, Buttom, Between
+ heightBottom = (fontHeight * 2) + (fontSmlHeight * 2) + ProgressBarHeight(); // Top, Buttom, Between
int heightTop = fontHeight;
int height = heightBottom;
chanInfoBottomPixmap = osd->CreatePixmap(1, cRect(0, osdHeight - height, osdWidth, heightBottom));
- height += progressBarHeight;
- chanInfoProgressPixmap = osd->CreatePixmap(2, cRect(0, osdHeight - height, osdWidth, progressBarHeight));
- chanInfoProgressPixmap->Fill( Theme.Color(clrChannelBg) );
+ height += ProgressBarHeight();
+ ProgressBarCreate(0, osdHeight - height, osdWidth,
+ Theme.Color(clrChannelProgressFg), Theme.Color(clrChannelProgressBarFg), Theme.Color(clrChannelProgressBg));
height += heightTop;
chanInfoTopPixmap = osd->CreatePixmap(1, cRect(0, osdHeight - height, osdWidth, heightTop));
@@ -30,7 +29,6 @@ cFlatDisplayChannel::cFlatDisplayChannel(bool WithInfo) {
cFlatDisplayChannel::~cFlatDisplayChannel() {
if (osd) {
osd->DestroyPixmap(chanInfoTopPixmap);
- osd->DestroyPixmap(chanInfoProgressPixmap);
osd->DestroyPixmap(chanInfoBottomPixmap);
}
}
@@ -154,19 +152,6 @@ void cFlatDisplayChannel::SetEvents(const cEvent *Present, const cEvent *Followi
}
}
-void cFlatDisplayChannel::DrawProgressBar(int Current, int Total) {
- int top = progressBarHeight / 2 - 3;
- int barFullWidth = chanInfoProgressPixmap->ViewPort().Width();
- double percentLeft = ((double)Current) / (double)Total;
-
- chanInfoProgressPixmap->Fill( Theme.Color(clrChannelBg) );
-
- if (Current > 0) {
- chanInfoProgressPixmap->DrawRectangle(cRect( 0, top + 2, barFullWidth, 2), Theme.Color(clrChannelProgressBg));
- chanInfoProgressPixmap->DrawRectangle(cRect( 0, top, (barFullWidth * percentLeft), 6), Theme.Color(clrChannelProgressFg));
- }
-}
-
void cFlatDisplayChannel::SetMessage(eMessageType Type, const char *Text) {
// Wenn es einen Text gibt, diesen Anzeigen ansonsten Message ausblenden
if( Text )
@@ -183,7 +168,7 @@ void cFlatDisplayChannel::Flush(void) {
if (t > present->StartTime())
Current = t - present->StartTime();
Total = present->Duration();
- DrawProgressBar(Current, Total);
+ ProgressBarDraw(Current, Total);
}
TopBarUpdate();
osd->Flush();
diff --git a/displaychannel.h b/displaychannel.h
index 9dec39a..28b9c9e 100644
--- a/displaychannel.h
+++ b/displaychannel.h
@@ -9,13 +9,9 @@ class cFlatDisplayChannel : public cFlatBaseRender, public cSkinDisplayChannel {
cString channelName;
cPixmap *chanInfoTopPixmap;
- cPixmap *chanInfoProgressPixmap;
cPixmap *chanInfoBottomPixmap;
int heightBottom;
- int progressBarHeight;
-
- void DrawProgressBar(int Current, int Total);
public:
cFlatDisplayChannel(bool WithInfo);
virtual ~cFlatDisplayChannel();
diff --git a/displaymenu.c b/displaymenu.c
index 02eec41..4cc6f66 100644
--- a/displaymenu.c
+++ b/displaymenu.c
@@ -8,11 +8,11 @@ cFlatDisplayMenu::cFlatDisplayMenu(void) {
itemHeight = fontHeight + 2;
- scrollBarWidth = 10;
+ scrollBarWidth = 20;
scrollBarHeight = osdHeight - (topBarHeight + buttonsHeight + marginItem*2 );
scrollBarTop = topBarHeight + marginItem;
- menuWidth = osdWidth - scrollBarWidth - marginItem;
+ menuWidth = osdWidth - scrollBarWidth;
menuPixmap = osd->CreatePixmap(1, cRect(0, topBarHeight + marginItem, menuWidth, scrollBarHeight ));
@@ -36,9 +36,10 @@ void cFlatDisplayMenu::DrawScrollbar(int Total, int Offset, int Shown, int Top,
int scrollTop = min(int(Top + (Height) * double(Offset) / Total + 0.5), Top + Height - scrollHeight);
scrollbarPixmap->Fill(clrTransparent);
+ scrollbarPixmap->DrawRectangle(cRect(5, Top, scrollBarWidth-5, Height), Theme.Color(clrScrollbarBg));
- scrollbarPixmap->DrawRectangle(cRect(0, Top, 2, Height), Theme.Color(clrScrollbarBg));
- scrollbarPixmap->DrawRectangle(cRect(0, scrollTop, 5, scrollHeight), Theme.Color(clrScrollbarFg));
+ scrollbarPixmap->DrawRectangle(cRect(15, Top, 2, Height), Theme.Color(clrScrollbarFg));
+ scrollbarPixmap->DrawRectangle(cRect(15, scrollTop, 5, scrollHeight), Theme.Color(clrScrollbarBarFg));
}
}
diff --git a/displayreplay.c b/displayreplay.c
index e256730..39ed9e6 100644
--- a/displayreplay.c
+++ b/displayreplay.c
@@ -1,24 +1,24 @@
#include "displayreplay.h"
cFlatDisplayReplay::cFlatDisplayReplay(bool ModeOnly) {
- progressBarHeight = 20;
labelHeight = fontHeight;
current = "";
total = "";
+
CreateFullOsd();
TopBarCreate();
MessageCreate();
labelPixmap = osd->CreatePixmap(1, cRect(0, osdHeight - labelHeight, osdWidth, labelHeight));
- progressBarPixmap = osd->CreatePixmap(1, cRect(0, osdHeight - labelHeight - progressBarHeight, osdWidth, progressBarHeight));
+
+ ProgressBarCreate(0, osdHeight - labelHeight - ProgressBarHeight() - marginItem, osdWidth,
+ Theme.Color(clrReplayProgressFg), Theme.Color(clrReplayProgressBarFg), Theme.Color(clrReplayProgressBg));
labelPixmap->Fill(Theme.Color(clrReplayBg));
- progressBarPixmap->Fill(clrTransparent);
}
cFlatDisplayReplay::~cFlatDisplayReplay() {
osd->DestroyPixmap(labelPixmap);
- osd->DestroyPixmap(progressBarPixmap);
}
void cFlatDisplayReplay::SetRecording(const cRecording *Recording) {
@@ -89,57 +89,10 @@ void cFlatDisplayReplay::SetMode(bool Play, bool Forward, int Speed) {
}
}
-void cFlatDisplayReplay::DrawProgressBar(int Current, int Total) {
- int top = progressBarHeight / 2 - 3;
- int barFullWidth = progressBarPixmap->ViewPort().Width();
- double percentLeft = ((double)Current) / (double)Total;
-
- progressBarPixmap->Fill( Theme.Color(clrReplayBg) );
-
- if (Current > 0) {
- progressBarPixmap->DrawRectangle(cRect( 0, top + 2, barFullWidth, 2), Theme.Color(clrReplayProgressBg));
- progressBarPixmap->DrawRectangle(cRect( 0, top, (barFullWidth * percentLeft), 6), Theme.Color(clrReplayProgressFg));
- }
- if( Total > 0 )
- DrawProgressBarMarks(Current, Total);
-}
-
-void cFlatDisplayReplay::DrawProgressBarMarks(int Current, int Total) {
- if( marks ) {
- bool Start = true;
- for( const cMark *m = marks->First(); m; m = marks->Next(m) ) {
- int p1 = DrawProgressBarMarkPos( m->Position(), Total );
- DrawProgressBarMark(p1, Start, m->Position() == Current);
- Start = !Start;
- }
- }
-}
-
-int cFlatDisplayReplay::DrawProgressBarMarkPos(int P, int Total) {
- return P * progressBarPixmap->ViewPort().Width() / Total;
-}
-
-void cFlatDisplayReplay::DrawProgressBarMark(int X, bool Start, bool Current)
-{
- if( Start )
- if( Current )
- progressBarPixmap->DrawRectangle(cRect( X-5, 0, 10, 3), Theme.Color(clrReplayMarkCurrentFg));
- else
- progressBarPixmap->DrawRectangle(cRect( X-3, 0, 6, 3), Theme.Color(clrReplayMarkFg));
- else
- if( Current )
- progressBarPixmap->DrawRectangle(cRect( X-5, progressBarHeight - 3, 10, 3), Theme.Color(clrReplayMarkCurrentFg));
- else
- progressBarPixmap->DrawRectangle(cRect( X-3, progressBarHeight - 3, 6, 3), Theme.Color(clrReplayMarkFg));
-
- if( Current )
- progressBarPixmap->DrawRectangle(cRect( X-1, 0, 2, progressBarHeight), Theme.Color(clrReplayMarkCurrentFg));
- else
- progressBarPixmap->DrawRectangle(cRect( X-1, 0, 2, progressBarHeight), Theme.Color(clrReplayMarkFg));
-}
-
void cFlatDisplayReplay::SetProgress(int Current, int Total) {
- DrawProgressBar(Current, Total);
+ ProgressBarDraw(Current, Total);
+ if( Total > 0 )
+ ProgressBarDrawMarks(marks, Theme.Color(clrReplayMarkFg), Theme.Color(clrReplayMarkCurrentFg));
}
void cFlatDisplayReplay::SetCurrent(const char *Current) {
diff --git a/displayreplay.h b/displayreplay.h
index b332b56..d46a144 100644
--- a/displayreplay.h
+++ b/displayreplay.h
@@ -7,14 +7,8 @@ class cFlatDisplayReplay : public cFlatBaseRender, public cSkinDisplayReplay {
cString current, total;
int labelHeight;
- int progressBarHeight;
- cPixmap *progressBarPixmap;
cPixmap *labelPixmap;
- void DrawProgressBar(int Current, int Total);
- void DrawProgressBarMarks(int Current, int Total);
- void DrawProgressBarMark(int X, bool Start, bool Current);
- int DrawProgressBarMarkPos(int P, int Total);
void UpdateInfo(void);
public:
cFlatDisplayReplay(bool ModeOnly);
diff --git a/displayvolume.c b/displayvolume.c
index f67bd30..d9b2546 100644
--- a/displayvolume.c
+++ b/displayvolume.c
@@ -3,13 +3,16 @@
cFlatDisplayVolume::cFlatDisplayVolume(void) {
muted = false;
- progressBarHeight = 20;
labelHeight = fontHeight;
CreateFullOsd();
TopBarCreate();
-
- progressBarPixmap = osd->CreatePixmap(1, cRect(0, osdHeight - 50 - progressBarHeight, osdWidth, progressBarHeight));
+ int width = osdWidth / 4 * 3;
+ int left = osdWidth - width;
+ left /= 2;
+
+ ProgressBarCreate(left, osdHeight - 50 - ProgressBarHeight(), width,
+ Theme.Color(clrVolumeProgressFg), Theme.Color(clrVolumeProgressBarFg), Theme.Color(clrVolumeProgressBg));
labelPixmap = osd->CreatePixmap(1, cRect(0, osdHeight - 50 - progressBarHeight - labelHeight - marginItem, osdWidth, labelHeight));
}
@@ -32,23 +35,7 @@ void cFlatDisplayVolume::SetVolume(int Current, int Total, bool Mute) {
labelPixmap->DrawImage( cPoint(left + maxlabelWidth + marginItem, 0), imgLoader.GetImage() );
}
}
- DrawProgressBar(Current, Total);
-}
-
-void cFlatDisplayVolume::DrawProgressBar(int Current, int Total) {
- int top = progressBarHeight / 2 - 3;
- int barFullWidth = osdWidth * 3 / 4;
- int left = osdWidth - barFullWidth;
- left /= 2;
- double percentLeft = ((double)Current) / (double)Total;
-
- progressBarPixmap->Fill( clrTransparent );
- progressBarPixmap->DrawRectangle(cRect( left, 0, barFullWidth, progressBarHeight), Theme.Color(clrVolumeBg));
-
- if (Current > 0) {
- progressBarPixmap->DrawRectangle(cRect( left, top + 2, barFullWidth, 2), Theme.Color(clrVolumeProgressBg));
- progressBarPixmap->DrawRectangle(cRect( left, top, (barFullWidth * percentLeft), 6), Theme.Color(clrVolumeProgressFg));
- }
+ ProgressBarDraw(Current, Total);
}
void cFlatDisplayVolume::Flush(void) {
diff --git a/displayvolume.h b/displayvolume.h
index cba37a8..96823d4 100644
--- a/displayvolume.h
+++ b/displayvolume.h
@@ -6,13 +6,8 @@ class cFlatDisplayVolume : public cFlatBaseRender, public cSkinDisplayVolume {
private:
bool muted;
- cPixmap *progressBarPixmap;
- int progressBarHeight;
-
cPixmap *labelPixmap;
int labelHeight;
-
- void DrawProgressBar(int Current, int Total);
public:
cFlatDisplayVolume(void);
virtual ~cFlatDisplayVolume();
diff --git a/flat.h b/flat.h
index 1dc9a81..2ee68b9 100644
--- a/flat.h
+++ b/flat.h
@@ -13,18 +13,18 @@ extern cTheme Theme;
#define CLR_BUTTONBLUE 0x990000BB
// MESSAGES
-#define CLR_MESSAGESTATUS 0x900000FF
-#define CLR_MESSAGEINFO 0x90009900
-#define CLR_MESSAGEWARNING 0x90BBBB00
-#define CLR_MESSAGEERROR 0x90BB0000
+#define CLR_MESSAGESTATUS 0xBB0000FF
+#define CLR_MESSAGEINFO 0xBB009900
+#define CLR_MESSAGEWARNING 0xBBBBBB00
+#define CLR_MESSAGEERROR 0xBBBB0000
// TopBar
-THEME_CLR(Theme, clrTopBarBg, 0x90222222);
+THEME_CLR(Theme, clrTopBarBg, 0xBB101010);
THEME_CLR(Theme, clrTopBarFont, 0xFFEEEEEE);
THEME_CLR(Theme, clrTopBarDateTimeFont, 0xFFEEEEEE);
// Buttons
-THEME_CLR(Theme, clrButtonBg, 0x90222222);
+THEME_CLR(Theme, clrButtonBg, 0xBB101010);
THEME_CLR(Theme, clrButtonFont, 0xFFEEEEEE);
THEME_CLR(Theme, clrButtonRed, CLR_BUTTONRED);
THEME_CLR(Theme, clrButtonGreen, CLR_BUTTONGREEN);
@@ -32,7 +32,7 @@ THEME_CLR(Theme, clrButtonYellow, CLR_BUTTONYELLOW);
THEME_CLR(Theme, clrButtonBlue, CLR_BUTTONBLUE);
// Messages
-THEME_CLR(Theme, clrMessageBg, 0x90222222);
+THEME_CLR(Theme, clrMessageBg, 0xBB101010);
THEME_CLR(Theme, clrMessageFont, 0xFFEEEEEE);
THEME_CLR(Theme, clrMessageStatus, CLR_MESSAGESTATUS);
@@ -41,52 +41,56 @@ THEME_CLR(Theme, clrMessageWarning, CLR_MESSAGEWARNING);
THEME_CLR(Theme, clrMessageError, CLR_MESSAGEERROR);
// Channel
-THEME_CLR(Theme, clrChannelBg, 0x90222222);
+THEME_CLR(Theme, clrChannelBg, 0xBB101010);
THEME_CLR(Theme, clrChannelFontTitle, 0xFFEEEEEE);
THEME_CLR(Theme, clrChannelFontEpg, 0xFFEEEEEE);
THEME_CLR(Theme, clrChannelProgressFg, 0xFFEEEEEE);
-THEME_CLR(Theme, clrChannelProgressBg, 0xFFEEEEEE);
+THEME_CLR(Theme, clrChannelProgressBarFg, 0xFFEEEEEE);
+THEME_CLR(Theme, clrChannelProgressBg, 0xBB101010);
// Menu
-THEME_CLR(Theme, clrItemBg, 0x90909090);
+THEME_CLR(Theme, clrItemBg, 0xBB909090);
THEME_CLR(Theme, clrItemFont, 0xFFEEEEEE);
-THEME_CLR(Theme, clrItemCurrentBg, 0x903090B0);
+THEME_CLR(Theme, clrItemCurrentBg, 0xBB3090B0);
THEME_CLR(Theme, clrItemCurrentFont, 0xFFEEEEEE);
-THEME_CLR(Theme, clrItemSelableBg, 0x90222222);
+THEME_CLR(Theme, clrItemSelableBg, 0xBB101010);
THEME_CLR(Theme, clrItemSelableFont, 0xFFEEEEEE);
THEME_CLR(Theme, clrScrollbarFg, 0xFFEEEEEE);
-THEME_CLR(Theme, clrScrollbarBg, 0xFFEEEEEE);
+THEME_CLR(Theme, clrScrollbarBarFg, 0xFFEEEEEE);
+THEME_CLR(Theme, clrScrollbarBg, 0xBB101010);
// Menu Event
-THEME_CLR(Theme, clrMenuEventBg, 0x90222222);
+THEME_CLR(Theme, clrMenuEventBg, 0xBB101010);
THEME_CLR(Theme, clrMenuEventFontTitle, 0xFFEEEEEE);
THEME_CLR(Theme, clrMenuEventFontInfo, 0xFFEEEEEE);
// Menu Recording
-THEME_CLR(Theme, clrMenuRecBg, 0x90222222);
+THEME_CLR(Theme, clrMenuRecBg, 0xBB101010);
THEME_CLR(Theme, clrMenuRecFontTitle, 0xFFEEEEEE);
THEME_CLR(Theme, clrMenuRecFontInfo, 0xFFEEEEEE);
// Menu Text (Multiline)
-THEME_CLR(Theme, clrMenuTextBg, 0x90222222);
+THEME_CLR(Theme, clrMenuTextBg, 0xBB101010);
THEME_CLR(Theme, clrMenuTextFont, 0xFFEEEEEE);
// Replay
-THEME_CLR(Theme, clrReplayBg, 0x90222222);
+THEME_CLR(Theme, clrReplayBg, 0xBB101010);
THEME_CLR(Theme, clrReplayFont, 0xFFEEEEEE);
THEME_CLR(Theme, clrReplayProgressFg, 0xFFEEEEEE);
-THEME_CLR(Theme, clrReplayProgressBg, 0xFFEEEEEE);
+THEME_CLR(Theme, clrReplayProgressBarFg, 0xFFEEEEEE);
+THEME_CLR(Theme, clrReplayProgressBg, 0xBB101010);
THEME_CLR(Theme, clrReplayMarkFg, 0xFFEEEEEE);
THEME_CLR(Theme, clrReplayMarkCurrentFg, 0xFF3090B0);
// Tracks
-THEME_CLR(Theme, clrTrackItemBg, 0x90909090);
+THEME_CLR(Theme, clrTrackItemBg, 0xBB909090);
THEME_CLR(Theme, clrTrackItemFont, 0xFFEEEEEE);
-THEME_CLR(Theme, clrTrackItemCurrentBg, 0x903090B0);
+THEME_CLR(Theme, clrTrackItemCurrentBg, 0xBB3090B0);
THEME_CLR(Theme, clrTrackItemCurrentFont, 0xFFEEEEEE);
// Volume
-THEME_CLR(Theme, clrVolumeBg, 0x90222222);
+THEME_CLR(Theme, clrVolumeBg, 0xBB101010);
THEME_CLR(Theme, clrVolumeFont, 0xFFEEEEEE);
THEME_CLR(Theme, clrVolumeProgressFg, 0xFFEEEEEE);
-THEME_CLR(Theme, clrVolumeProgressBg, 0xFFEEEEEE);
+THEME_CLR(Theme, clrVolumeProgressBarFg, 0xFFEEEEEE);
+THEME_CLR(Theme, clrVolumeProgressBg, 0xBB101010);
class cFlat : public cSkin {
private:
diff --git a/generate_theme.sh b/generate_theme.sh
index aea6338..135afa0 100755
--- a/generate_theme.sh
+++ b/generate_theme.sh
@@ -1,8 +1,8 @@
#!/bin/bash
echo "*********************************"
-echo "* theme generator version 0.1 *"
-echo "* for skinflat version <= 0.0.1 *"
+echo "* theme generator version 0.0.2 *"
+echo "* for skinflat version = 0.0.2 *"
echo "*********************************"
echo ""
@@ -14,7 +14,7 @@ echo " you only need 4 colors"
echo " + Backround "
echo " + Foreground (Font, Scrollbar, Progressbar) "
echo " + Current (current menu item background) "
-echo " + Selable (selable menu item background) "
+echo " + Nonselable (nonselable menu item background) "
echo ""
echo "normale mode: "
echo " you need 10 colors"
@@ -43,16 +43,16 @@ then
read Foreground
echo -n "Menu item current background color: "
read ItemCurBG
- echo -n "Menu item selectable background color: "
- read ItemSelableBG
+ echo -n "Menu item not selectable background color: "
+ read ItemBG
Font=$Foreground
TitleFont=$Foreground
- ProgressBG=$Foreground
+ ProgressBarFG=$Foreground
ProgressFG=$Foreground
- ScrollbarBG=$Foreground
+ ScrollbarBarFG=$Foreground
ScrollbarFG=$Foreground
- ItemBG=$Background
+ ItemSelableBG=$Background
else
echo -n "Name: "
@@ -69,12 +69,12 @@ else
read ItemCurBG
echo -n "Menu item selectable background color: "
read ItemSelableBG
- echo -n "Progressbar background color: "
- read ProgressBG
+ echo -n "Progressbar bar foreground color: "
+ read ProgressBarFG
echo -n "Progressbar foreground color: "
read ProgressFG
- echo -n "Scrollbar background color: "
- read ScrollbarBG
+ echo -n "Scrollbar bar foreground color: "
+ read ScrollbarBarFG
echo -n "Scrollbar foreground color: "
read ScrollbarFG
fi
@@ -101,7 +101,8 @@ echo "clrChannelBg = $Background" >> $FILE
echo "clrChannelFontTitle = $TitleFont" >> $FILE
echo "clrChannelFontEpg = $Font" >> $FILE
echo "clrChannelProgressFg = $ProgressFG" >> $FILE
-echo "clrChannelProgressBg = $ProgressBG" >> $FILE
+echo "clrChannelProgressBarFg = $ProgressBarFG" >> $FILE
+echo "clrChannelProgressBg = $Background" >> $FILE
echo "clrItemBg = $ItemBG" >> $FILE
echo "clrItemFont = $Font" >> $FILE
echo "clrItemCurrentBg = $ItemCurBG" >> $FILE
@@ -109,7 +110,8 @@ echo "clrItemCurrentFont = $Font" >> $FILE
echo "clrItemSelableBg = $ItemSelableBG" >> $FILE
echo "clrItemSelableFont = $Font" >> $FILE
echo "clrScrollbarFg = $ScrollbarFG" >> $FILE
-echo "clrScrollbarBg = $ScrollbarBG" >> $FILE
+echo "clrScrollbarBarFg = $ScrollbarBarFG" >> $FILE
+echo "clrScrollbarBg = $Background" >> $FILE
echo "clrMenuEventBg = $Background" >> $FILE
echo "clrMenuEventFontTitle = $TitleFont" >> $FILE
echo "clrMenuEventFontInfo = $Font" >> $FILE
@@ -121,7 +123,10 @@ echo "clrMenuTextFont = $Font" >> $FILE
echo "clrReplayBg = $Background" >> $FILE
echo "clrReplayFont = $Font" >> $FILE
echo "clrReplayProgressFg = $ProgressFG" >> $FILE
-echo "clrReplayProgressBg = $ProgressBG" >> $FILE
+echo "clrReplayProgressBarFg = $ProgressBarFG" >> $FILE
+echo "clrReplayProgressBg = $Background" >> $FILE
+echo "clrReplayMarkFg = $ProgressFG" >> $FILE
+echo "clrReplayMarkCurrentFg = $ProgressFG" >> $FILE
echo "clrTrackItemBg = $ItemBG" >> $FILE
echo "clrTrackItemFont = $Font" >> $FILE
echo "clrTrackItemCurrentBg = $ItemCurBG" >> $FILE
@@ -129,7 +134,8 @@ echo "clrTrackItemCurrentFont = $Font" >> $FILE
echo "clrVolumeBg = $Background" >> $FILE
echo "clrVolumeFont = $Font" >> $FILE
echo "clrVolumeProgressFg = $ProgressFG" >> $FILE
-echo "clrVolumeProgressBg = $ProgressBG" >> $FILE
+echo "clrVolumeProgressBarFg = $ProgressBarFG" >> $FILE
+echo "clrVolumeProgressBg = $Background" >> $FILE
echo ""
echo "Theme <${FILE}> saved"
diff --git a/skinflat.c b/skinflat.c
index a336815..bc7ae91 100644
--- a/skinflat.c
+++ b/skinflat.c
@@ -14,7 +14,7 @@
#include "flat.h"
-static const char *VERSION = "0.0.1";
+static const char *VERSION = "0.0.2";
static const char *DESCRIPTION = "skin flat";
class cPluginFlat : public cPlugin {
diff --git a/themes/flat-white.theme b/themes/flat-white.theme
index d94ec88..6092cd2 100644
--- a/themes/flat-white.theme
+++ b/themes/flat-white.theme
@@ -18,7 +18,8 @@ clrChannelBg = 90CCCCCC
clrChannelFontTitle = FF222222
clrChannelFontEpg = FF222222
clrChannelProgressFg = FF222222
-clrChannelProgressBg = FF222222
+clrChannelProgressBarFg = FF222222
+clrChannelProgressBg = 90CCCCCC
clrItemBg = 90808080
clrItemFont = FF222222
clrItemCurrentBg = 903090B0
@@ -26,7 +27,8 @@ clrItemCurrentFont = FF222222
clrItemSelableBg = 90CCCCCC
clrItemSelableFont = FF222222
clrScrollbarFg = FF222222
-clrScrollbarBg = FF222222
+clrScrollbarBg = 90CCCCCC
+clrScrollbarBarFg = FF222222
clrMenuEventBg = 90CCCCCC
clrMenuEventFontTitle = FF222222
clrMenuEventFontInfo = FF222222
@@ -38,8 +40,9 @@ clrMenuTextFont = FF222222
clrReplayBg = 90CCCCCC
clrReplayFont = FF222222
clrReplayProgressFg = FF222222
-clrReplayProgressBg = FF222222
-clrReplayMarkFg = FFFFFFFF
+clrReplayProgressBarFg = FF222222
+clrReplayProgressBg = 90CCCCCC
+clrReplayMarkFg = FF222222
clrReplayMarkCurrentFg = FF3090B0
clrTrackItemBg = 90CCCCCC
clrTrackItemFont = FF222222
@@ -48,4 +51,5 @@ clrTrackItemCurrentFont = FF222222
clrVolumeBg = 90CCCCCC
clrVolumeFont = FF222222
clrVolumeProgressFg = FF222222
-clrVolumeProgressBg = FF222222
+clrVolumeProgressBarFg = FF222222
+clrVolumeProgressBg = 90CCCCCC
generated by cgit v1.2.3 (git 2.25.1) at 2025-04-24 23:02:05 +0000