summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorkamel5 <vdr.kamel5 (at) gmx (dot) net>2020-03-28 14:51:21 +0100
committerkamel5 <vdr.kamel5 (at) gmx (dot) net>2020-03-29 11:51:39 +0200
commit883584db77a55610e6003303fb58b5e45bff0886 (patch)
tree1327ce7c50b00f1d2a02f582ca17b0de271ed9d3
parent97a994ac366bd3772e3f535a767fffc3bcf1c4ba (diff)
downloadskin-lcarsng-883584db77a55610e6003303fb58b5e45bff0886.tar.gz
skin-lcarsng-883584db77a55610e6003303fb58b5e45bff0886.tar.bz2
Cleanup
-rw-r--r--config.c6
-rw-r--r--config.h2
-rw-r--r--displaychannel.c37
-rw-r--r--displaychannel.h23
-rw-r--r--displaymenu.c93
-rw-r--r--displaymenu.h39
-rw-r--r--displaymessage.c3
-rw-r--r--displaymessage.h3
-rw-r--r--displayreplay.c39
-rw-r--r--displayreplay.h23
-rw-r--r--displaytracks.c1
-rw-r--r--displaytracks.h4
-rw-r--r--displayvolume.c1
-rw-r--r--displayvolume.h3
-rw-r--r--lcarsng.c14
-rw-r--r--lcarsng.h13
-rw-r--r--lcarsng.obin301992 -> 301976 bytes
-rw-r--r--setup.c4
-rw-r--r--skinlcarsng.c29
-rw-r--r--themes/lcarsng-390Lb.theme110
-rw-r--r--themes/lcarsng-BlueGlass.theme104
-rw-r--r--themes/lcarsng-LbSense.theme105
-rw-r--r--themes/lcarsng-default.theme75
-rw-r--r--themes/lcarsng-mein.theme75
-rw-r--r--themes/lcarsng-meins.theme79
25 files changed, 46 insertions, 839 deletions
diff --git a/config.c b/config.c
index 1d3384b..cd90eda 100644
--- a/config.c
+++ b/config.c
@@ -1,7 +1,3 @@
-/*
- * See the README file for copyright information and how to reach the author.
- */
-
#include <vdr/plugin.h>
#include "config.h"
@@ -51,7 +47,7 @@ bool cLCARSNGConfig::SetupParse(const char *Name, const char *Value)
else if (!strcasecmp(Name, "ChannelMenue")) mcChannelScaled = atoi(Value);
else if (!strcasecmp(Name, "TimerMenue")) mcTimerScaled = atoi(Value);
else if (!strcasecmp(Name, "RecordingMenue")) mcRecordingScaled = atoi(Value);
-// else if (!strcasecmp(Name, "PluginMenue")) mcPluginScaled = atoi(Value);
+ else if (!strcasecmp(Name, "PluginMenue")) mcPluginScaled = atoi(Value);
else if (!strcasecmp(Name, "SetupMenue")) mcSetupScaled = atoi(Value);
else if (!strcasecmp(Name, "CommandMenue")) mcCommandScaled = atoi(Value);
else if (!strcasecmp(Name, "EventMenue")) mcEventScaled = atoi(Value);
diff --git a/config.h b/config.h
index 67d0742..5237473 100644
--- a/config.h
+++ b/config.h
@@ -1,5 +1,3 @@
-#include <vdr/menu.h>
-
enum viewMode {
escaledvideo = 0,
efullscreen,
diff --git a/displaychannel.c b/displaychannel.c
index 815123f..cc473d0 100644
--- a/displaychannel.c
+++ b/displaychannel.c
@@ -1,27 +1,6 @@
-/*
- * skinlcars.c: A VDR skin with Star Trek's "LCARS" layout
- *
- * See the main source file 'vdr.c' for copyright information and
- * how to reach the author.
- *
- * $Id: skinlcars.c 4.1 2015/09/01 10:07:07 kls Exp $
- */
-
+#include "config.h"
#include "lcarsng.h"
#include "displaychannel.h"
-#include "config.h"
-#include <vdr/font.h>
-#include <vdr/menu.h>
-#include <vdr/osd.h>
-#if APIVERSNUM > 20101
-#include <vdr/positioner.h>
-#endif
-#include <vdr/themes.h>
-#include <vdr/thread.h>
-#include <vdr/tools.h>
-#include <vdr/videodir.h>
-#include <sys/statvfs.h>
-#include <string>
cBitmap cLCARSNGDisplayChannel::bmTeletext(teletext_xpm);
cBitmap cLCARSNGDisplayChannel::bmRadio(radio_xpm);
@@ -227,14 +206,14 @@ void cLCARSNGDisplayChannel::DrawSeen(int Current, int Total)
if (initial || Seen != lastSeen) {
int y0 = yc0A - (yc0A - yc0B) / 2 + Gap / 2;
int y1 = yc0A - ShowSeenExtent;
- // Fortschrittsbalken
+ // progress bar
osd->DrawRectangle(xc06, y0, xc11 - 1, y1 - 1, Theme.Color(clrSeen));
osd->DrawRectangle(xc06 + Seen + 2, y0 + 2, xc11 - 3, y1 - 3, frameColorBg);
- // Restzeit anzeigen
+ // display time remaining
cString time = ((Current / 60.0) > 0.1) ? cString::sprintf("-%d", max((int)ceil((Total - Current) / 60.0), 0)) : "";
int w = cFont::GetFont(fontSml)->Width(time);
osd->DrawRectangle(xc10 + Margin, yc03 + lineHeight + 2 * Margin + Gap / 2, xc10m - 1 - 2 * Margin, yc04 - Margin, Theme.Color(clrBackground)); //Backgroung time remaining
- osd->DrawText(xc10 + Margin + (xc10m - xc10 - 1 - 2 * Margin - w), yc03 + lineHeight + 2 * Margin + Gap / 2, time, frameColorFg, textColorBg, cFont::GetFont(fontSml), w, lineHeight - 2 * Margin, taRight | taBorder); // Time remaining
+ osd->DrawText(xc10 + Margin + (xc10m - xc10 - 1 - 2 * Margin - w), yc03 + lineHeight + 2 * Margin + Gap / 2, time, Theme.Color(clrEventShortText), textColorBg, cFont::GetFont(fontSml), w, lineHeight - 2 * Margin, taRight | taBorder); // time remaining
lastSeen = Seen;
}
}
@@ -346,11 +325,11 @@ void cLCARSNGDisplayChannel::DrawTimer(void)
#endif
osd->DrawText(xc01, y + y1 + Margin, cString::sprintf("%d", Channel->Number()), frameColorFg, frameColorBg, cFont::GetFont(fontSml), xc02 - xc01 - Gap - 1, lineHeight - 3 * Margin, taRight | taBorder);
osd->DrawText(xc04, y + y1, cString::sprintf("%s", *Date), timerColor, textColorBg, cFont::GetFont(fontSml), xc06a - xc04 - Gap - 1, lineHeight - Gap / 2, taRight | taBorder);
- int w = cFont::GetFont(fontSml)->Width(Event->Title()) + 4; // Width from fontSml to short
+ int w = cFont::GetFont(fontSml)->Width(Event->Title()) + 4; // fontSml width to short
osd->DrawRectangle(xc06a, y + y1, xc06k - 1, y + y1 + lineHeight - Gap / 2, Theme.Color(clrBackground));
osd->DrawText(xc06a, y + y1, cString::sprintf("%s", Event->Title()), timerColor, textColorBg, cFont::GetFont(fontSml), min(w, xc06k - xc06a - 1), lineHeight - Gap / 2, taLeft | taBorder);
}
- if (isRecording) // && Number)
+ if (isRecording)
osd->DrawText(xc04, y + y1, cString::sprintf("Rec: #%s", *Number), Theme.Color(clrChannelSymbolRecBg), textColorBg, cFont::GetFont(fontSml), xc05 - xc04 - Gap - 1, lineHeight - Gap / 2, taRight | taBorder);
i++;
}
@@ -378,7 +357,7 @@ void cLCARSNGDisplayChannel::SetChannel(const cChannel *Channel, int Number)
x -= bmRadio.Width() + SymbolSpacing;
osd->DrawBitmap(x, yc11 + (yc12 - yc11 - bmRadio.Height()) / 2, bmRadio, Theme.Color(clrChannelSymbolOn), frameColorBr);
}
- initial = true; // to have DrawBlinkingRec() refresh the Recording Icon
+ initial = true; // make shure DrawBlinkingRec() refreshs recording icon
}
cString ChNumber("");
cString ChName("");
@@ -480,7 +459,7 @@ void cLCARSNGDisplayChannel::SetPositioner(const cPositioner *Positioner)
}
else {
lastCurrentPosition = -1;
- initial = true; // to have DrawSeen() refresh the progress bar
+ initial = true; // make shure DrawSeen() refreshs progress bar
}
return;
}
diff --git a/displaychannel.h b/displaychannel.h
index 91db0d8..bb44585 100644
--- a/displaychannel.h
+++ b/displaychannel.h
@@ -1,26 +1,3 @@
-/*
- * skinlcars.c: A VDR skin with Star Trek's "LCARS" layout
- *
- * See the main source file 'vdr.c' for copyright information and
- * how to reach the author.
- *
- * $Id: skinlcars.c 4.1 2015/09/01 10:07:07 kls Exp $
- */
-
-#include "lcarsng.h"
-#include <vdr/font.h>
-#include <vdr/menu.h>
-#include <vdr/osd.h>
-#if APIVERSNUM > 20101
-#include <vdr/positioner.h>
-#endif
-#include <vdr/themes.h>
-#include <vdr/thread.h>
-#include <vdr/tools.h>
-#include <vdr/videodir.h>
-#include <sys/statvfs.h>
-#include <string>
-
// --- cLCARSNGDisplayChannel ----------------------------------------------
class cLCARSNGDisplayChannel : public cSkinDisplayChannel, cThread {
diff --git a/displaymenu.c b/displaymenu.c
index 3843451..290c995 100644
--- a/displaymenu.c
+++ b/displaymenu.c
@@ -1,27 +1,6 @@
-/*
- * skinlcars.c: A VDR skin with Star Trek's "LCARS" layout
- *
- * See the main source file 'vdr.c' for copyright information and
- * how to reach the author.
- *
- * $Id: skinlcars.c 4.1 2015/09/01 10:07:07 kls Exp $
- */
-
+#include "config.h"
#include "lcarsng.h"
#include "displaymenu.h"
-#include "config.h"
-#include <vdr/font.h>
-#include <vdr/menu.h>
-#include <vdr/osd.h>
-#if APIVERSNUM > 20101
-#include <vdr/positioner.h>
-#endif
-#include <vdr/themes.h>
-#include <vdr/thread.h>
-#include <vdr/tools.h>
-#include <vdr/videodir.h>
-#include <sys/statvfs.h>
-#include <string>
cBitmap cLCARSNGDisplayMenu::bmArrowUp(arrowup_xpm);
cBitmap cLCARSNGDisplayMenu::bmArrowDown(arrowdown_xpm);
@@ -478,7 +457,6 @@ void cLCARSNGDisplayMenu::DrawMainButton(const char *Text, int x0, int x1, int x
{
int h = y1 - y0;
osd->DrawEllipse(x0, y0, x1 - 1, y1 - 1, ColorBg, 7);
-// osd->DrawText(x1, y0, Text, ColorFg, ColorBg, Font, x2 - x1, h, taBottom | taRight);
osd->DrawText(x1, y0, Text, ColorFg, ColorBg, Font, x2 - x1, h, taCenter);
osd->DrawEllipse(x2, y0, x3 - 1, y1 - 1, ColorBg, 5);
}
@@ -490,25 +468,20 @@ void cLCARSNGDisplayMenu::DrawMenuFrame(void)
DrawRectangleOutline(osd, xa00, yt05, xa01 - 1, yt06 - 1, frameColorBr, frameColorBg, 9);
DrawRectangleOutline(osd, xa01, yt00, xa02 - 1, yt06 - 1, frameColorBr, frameColorBg, 14);
DrawRectangleOutline(osd, xa02 - Margin, yt00, xa05 - 1, yt01 - 1, frameColorBr, frameColorBg, 14);
-// osd->DrawRectangle(xa00, yt00, xa01 - 1, yt05 - 1, clrTransparent);
osd->DrawEllipse (xa00, yt00, xa01 - 1, yt05 - 1, frameColorBr, 2);
osd->DrawEllipse (xa00 + Margin, yt00 + Margin, xa01 - 1, yt05 - 1, frameColorBg, 2);
osd->DrawEllipse (xa02, yt01, xa04 - 1, yt03 - 1, frameColorBr, -2);
osd->DrawEllipse (xa02 - Margin, yt01 - Margin, xa04 - 1, yt03 - 1, frameColorBg, -2);
-// osd->DrawRectangle(xa06, yt00, xa07 - 1, yt01 - 1, frameColor);
DrawRectangleOutline(osd, xa08, yt00, xa08 + lineHeight / 2 - 1, yt01 - 1, frameColorBr, frameColorBg, 11);
osd->DrawRectangle(xa08 + lineHeight / 2, yt00, xa09 - 1, yt00 + lineHeight / 2 - 1, clrTransparent);
osd->DrawEllipse (xa08 + lineHeight / 2, yt00, xa09 - 1, yt01 - 1, frameColorBr, 5);
osd->DrawEllipse (xa08 + lineHeight / 2, yt00 + Margin, xa09 - 1 - Margin, yt01 - 1 - Margin, frameColorBg, 5);
// Center part:
-// osd->DrawRectangle(xa00, yt06 + Gap, xa02 - 1, yc00 - 1 - Gap, frameColor);
-// osd->DrawRectangle(xa00, yc00, xa02 - 1, yc11 - 1, frameColor);
DrawRectangleOutline(osd, xa00, yt06 + Gap, xa02 - 1, yb00 - 1 - Gap, frameColorBr, frameColorBg, 15);
// Lower elbow:
DrawRectangleOutline(osd, xa00, yb10, xa01 - 1, yb11 - 1, frameColorBr, frameColorBg, 3);
DrawRectangleOutline(osd, xa01, yb10, xa02 - 1, yb15 - 1, frameColorBr, frameColorBg, 14);
DrawRectangleOutline(osd, xa02 - Margin, yb14, xa05 - 1, yb15 - 1, frameColorBr, frameColorBg, 14);
-// osd->DrawRectangle(xa00, yb11, xa01 - 1, yb15 - 1, clrTransparent);
osd->DrawEllipse (xa00, yb11, xa01 - 1, yb15 - 1, frameColorBr, 3);
osd->DrawEllipse (xa00 + Margin, yb11, xa01 - 1, yb15 - 1 - Margin, frameColorBg, 3);
osd->DrawEllipse (xa02, yb12, xa04 - 1, yb14 - 1, frameColorBr, -3);
@@ -593,10 +566,10 @@ void cLCARSNGDisplayMenu::DrawNumRecordingsInPath(void)
LOCK_RECORDINGS_READ;
NumRecordingsInPath = Recordings->GetNumRecordingsInPath(cMenuRecordings::GetActualPath());
}
-#endif
-#endif
if (NumRecordingsInPath > 0)
osd->DrawText(xm04 + Margin, yc06 + Margin, cString::sprintf("%i", NumRecordingsInPath), frameColorFg, frameColorBg, font, xm08 - xm04 - 1 - 2 * Margin, lineHeight - Margin, taBottom | taRight | taBorder);
+#endif
+#endif
}
void cLCARSNGDisplayMenu::DrawCountRecordings(void)
@@ -650,10 +623,10 @@ void cLCARSNGDisplayMenu::DrawMainBracket(void)
y3 = y2 + Gap;
}
else {
- y0 = ym00; //yc08
- y1 = ym01; //ym00 + lineHeight / 2
- y2 = ym02; //ym01 + lineHeight / 2
- y3 = ym03; //ym02 + Gap
+ y0 = ym00;
+ y1 = ym01;
+ y2 = ym02;
+ y3 = ym03;
}
if (MenuCategory() == mcMain || MenuCategory() == mcSetup || MenuCategory() == mcChannel) {
osd->DrawRectangle(xm00, y0, xm01 - 1, y1 - 1, Color);
@@ -706,28 +679,26 @@ void cLCARSNGDisplayMenu::DrawStatusElbows(void)
void cLCARSNGDisplayMenu::DrawFrameDisplay(void)
{
-// if (MenuCategory() != mcChannel) {
- if (initial) {
- osd->DrawRectangle(xa00, yb00, xa02 - 1, yb01 - 1, frameColorBr);
- if (yb02) // DISK
- osd->DrawRectangle(xa00, yb02, xa02 - 1, yb03 - 1, frameColorBr);
- if (yb04) // LOAD
- osd->DrawRectangle(xa00, yb04, xa02 - 1, yb05 - 1, frameColorBr);
- if (yb06) // RECORDINGS
- osd->DrawRectangle(xa00, yb06, xa02 - 1, yb07 - 1, frameColorBr);
- if (yb08) // TIMER
- osd->DrawRectangle(xa00, yb08, xa02 - 1, yb081 - 1, frameColorBr);
- if (yb082)
- DrawRectangleOutline(osd, xa00, yb082, xa02 - 1, yb09 - 1, frameColorBr, frameColorBg, 15);
- }
- DrawDate();
- DrawDisk();
- DrawLoad();
- DrawCountRecordings();
- DrawCountTimers();
- if ((MenuCategory() == mcRecording) && viewmode != efullscreen)
- DrawNumRecordingsInPath();
-// }
+ if (initial) {
+ osd->DrawRectangle(xa00, yb00, xa02 - 1, yb01 - 1, frameColorBr);
+ if (yb02) // DISK
+ osd->DrawRectangle(xa00, yb02, xa02 - 1, yb03 - 1, frameColorBr);
+ if (yb04) // LOAD
+ osd->DrawRectangle(xa00, yb04, xa02 - 1, yb05 - 1, frameColorBr);
+ if (yb06) // RECORDINGS
+ osd->DrawRectangle(xa00, yb06, xa02 - 1, yb07 - 1, frameColorBr);
+ if (yb08) // TIMER
+ osd->DrawRectangle(xa00, yb08, xa02 - 1, yb081 - 1, frameColorBr);
+ if (yb082)
+ DrawRectangleOutline(osd, xa00, yb082, xa02 - 1, yb09 - 1, frameColorBr, frameColorBg, 15);
+ }
+ DrawDate();
+ DrawDisk();
+ DrawLoad();
+ DrawCountRecordings();
+ DrawCountTimers();
+ if ((MenuCategory() == mcRecording) && viewmode != efullscreen)
+ DrawNumRecordingsInPath();
}
void cLCARSNGDisplayMenu::DrawScrollbar(int Total, int Offset, int Shown, bool CanScrollUp, bool CanScrollDown)
@@ -1054,7 +1025,7 @@ void cLCARSNGDisplayMenu::DrawLive(const cChannel *Channel)
lastChannelName = Channel->Name();
DrawSeen(0, 0);
}
- // The current programme:
+ // The current programm:
#if APIVERSNUM > 20300
LOCK_SCHEDULES_READ;
if (const cSchedule *Schedule = Schedules->GetSchedule(Channel)) {
@@ -1119,7 +1090,7 @@ void cLCARSNGDisplayMenu::DrawPlay(cControl *Control)
int Total = 0;
if (Control->GetIndex(Current, Total))
DrawSeen(Current, Total);
- // The current programme:
+ // The current recording:
if (const cRecording *Recording = Control->GetRecording()) {
if (initial || Recording != lastRecording) {
const cFont *font = cFont::GetFont(fontOsd);
@@ -1173,7 +1144,7 @@ void cLCARSNGDisplayMenu::DrawInfo(const cEvent *Event, bool WithTime)
void cLCARSNGDisplayMenu::DrawSeen(int Current, int Total)
{
-// Fortschrittsbalken
+// progress bar
int x = (!(viewmode == escaledvideo) && (MenuCategory() == mcMain)) ? xm08 : xm03;
int Seen = (Total > 0) ? min(x - xm02, int((x - xm02) * double(Current) / Total)) : 0;
@@ -1259,7 +1230,6 @@ void cLCARSNGDisplayMenu::SetButtons(const char *Red, const char *Green, const c
if (viewmode == escaledvideo)
x = xm05 - xa09;
if (MenuCategory() == mcChannel) {
-// x = xa09 - xm05;
y = yb15 - yc04;
}
const cFont *font = cFont::GetFont(fontSml);
@@ -1319,8 +1289,7 @@ void cLCARSNGDisplayMenu::SetItem(const char *Text, int Index, bool Current, boo
else {
ColorFg = Theme.Color(Selectable ? clrMenuItemSelectable : clrMenuItemNonSelectable);
ColorBg = (viewmode == escaledvideo) ? Theme.Color(clrBackground) : textColorBg;
-// if (currentIndex == Index)
- osd->DrawRectangle(xi00, y, xi03 - 1, y + lineHeight - 1, Theme.Color(clrBackground));
+ osd->DrawRectangle(xi00, y, xi03 - 1, y + lineHeight - 1, Theme.Color(clrBackground));
}
const cFont *font = cFont::GetFont(fontOsd);
for (int i = 0; i < MaxTabs; i++) {
diff --git a/displaymenu.h b/displaymenu.h
index d416d14..147bd04 100644
--- a/displaymenu.h
+++ b/displaymenu.h
@@ -1,42 +1,3 @@
-/*
- * skinlcars.c: A VDR skin with Star Trek's "LCARS" layout
- *
- * See the main source file 'vdr.c' for copyright information and
- * how to reach the author.
- *
- * $Id: skinlcars.c 4.1 2015/09/01 10:07:07 kls Exp $
- */
-
-// "Star Trek: The Next Generation"(R) is a registered trademark of Paramount Pictures,
-// registered in the United States Patent and Trademark Office, all rights reserved.
-// The LCARS system is based upon the designs of Michael Okuda and his Okudagrams.
-//
-// "LCARS" is short for "Library Computer Access and Retrieval System".
-// Some resources used for writing this skin can be found at
-// http://www.lcars.org.uk
-// http://www.lcarsdeveloper.com
-// http://www.lcarscom.net
-// http://lds-jedi.deviantart.com/art/LCARS-Swept-Tutorial-213936938
-// http://lds-jedi.deviantart.com/art/LCARS-Button-Tutorial-210783437
-// http://zelldenver.deviantart.com/art/LCARS-Color-Standard-179565780
-// http://www.lcars47.com
-// http://www.bracercom.com/tutorial/content/CoherentLCARSInterface/LCARSCoherentInterface.html
-// http://www.bracercom.com/tutorial/content/lcars_manifesto/the_lcars_manifesto.html
-
-#include "lcarsng.h"
-#include <vdr/font.h>
-#include <vdr/menu.h>
-#include <vdr/osd.h>
-#if APIVERSNUM > 20101
-#include <vdr/positioner.h>
-#endif
-#include <vdr/themes.h>
-#include <vdr/thread.h>
-#include <vdr/tools.h>
-#include <vdr/videodir.h>
-#include <sys/statvfs.h>
-#include <string>
-
// --- cLCARSNGDisplayMenu -------------------------------------------------
class cLCARSNGDisplayMenu : public cSkinDisplayMenu {
diff --git a/displaymessage.c b/displaymessage.c
index 531fe54..8dc9c36 100644
--- a/displaymessage.c
+++ b/displaymessage.c
@@ -1,7 +1,6 @@
+#include "config.h"
#include "lcarsng.h"
#include "displaymessage.h"
-#include "config.h"
-#include <vdr/font.h>
// --- cLCARSNGDisplayMessage ----------------------------------------------
diff --git a/displaymessage.h b/displaymessage.h
index 7b55b48..90f56f7 100644
--- a/displaymessage.h
+++ b/displaymessage.h
@@ -1,6 +1,3 @@
-#include "lcarsng.h"
-#include <vdr/font.h>
-
// --- cLCARSNGDisplayMessage ----------------------------------------------
class cLCARSNGDisplayMessage : public cSkinDisplayMessage {
diff --git a/displayreplay.c b/displayreplay.c
index 4dab7ca..f3b15cf 100644
--- a/displayreplay.c
+++ b/displayreplay.c
@@ -1,43 +1,6 @@
-/*
- * skinlcars.c: A VDR skin with Star Trek's "LCARS" layout
- *
- * See the main source file 'vdr.c' for copyright information and
- * how to reach the author.
- *
- * $Id: skinlcars.c 4.1 2015/09/01 10:07:07 kls Exp $
- */
-
-// "Star Trek: The Next Generation"(R) is a registered trademark of Paramount Pictures,
-// registered in the United States Patent and Trademark Office, all rights reserved.
-// The LCARS system is based upon the designs of Michael Okuda and his Okudagrams.
-//
-// "LCARS" is short for "Library Computer Access and Retrieval System".
-// Some resources used for writing this skin can be found at
-// http://www.lcars.org.uk
-// http://www.lcarsdeveloper.com
-// http://www.lcarscom.net
-// http://lds-jedi.deviantart.com/art/LCARS-Swept-Tutorial-213936938
-// http://lds-jedi.deviantart.com/art/LCARS-Button-Tutorial-210783437
-// http://zelldenver.deviantart.com/art/LCARS-Color-Standard-179565780
-// http://www.lcars47.com
-// http://www.bracercom.com/tutorial/content/CoherentLCARSInterface/LCARSCoherentInterface.html
-// http://www.bracercom.com/tutorial/content/lcars_manifesto/the_lcars_manifesto.html
-
+#include "config.h"
#include "lcarsng.h"
#include "displayreplay.h"
-#include "config.h"
-#include <vdr/font.h>
-#include <vdr/menu.h>
-#include <vdr/osd.h>
-#if APIVERSNUM > 20101
-#include <vdr/positioner.h>
-#endif
-#include <vdr/themes.h>
-#include <vdr/thread.h>
-#include <vdr/tools.h>
-#include <vdr/videodir.h>
-#include <sys/statvfs.h>
-#include <string>
cBitmap cLCARSNGDisplayReplay::bmTeletext(teletext_xpm);
cBitmap cLCARSNGDisplayReplay::bmRadio(radio_xpm);
diff --git a/displayreplay.h b/displayreplay.h
index 27e6d47..6d37ef8 100644
--- a/displayreplay.h
+++ b/displayreplay.h
@@ -1,26 +1,3 @@
-/*
- * skinlcars.c: A VDR skin with Star Trek's "LCARS" layout
- *
- * See the main source file 'vdr.c' for copyright information and
- * how to reach the author.
- *
- * $Id: skinlcars.c 4.1 2015/09/01 10:07:07 kls Exp $
- */
-
-#include "lcarsng.h"
-#include <vdr/font.h>
-#include <vdr/menu.h>
-#include <vdr/osd.h>
-#if APIVERSNUM > 20101
-#include <vdr/positioner.h>
-#endif
-#include <vdr/themes.h>
-#include <vdr/thread.h>
-#include <vdr/tools.h>
-#include <vdr/videodir.h>
-#include <sys/statvfs.h>
-#include <string>
-
// --- cLCARSNGDisplayReplay -----------------------------------------------
class cLCARSNGDisplayReplay : public cSkinDisplayReplay, cThread {
diff --git a/displaytracks.c b/displaytracks.c
index 46c0d1b..b6aaef0 100644
--- a/displaytracks.c
+++ b/displaytracks.c
@@ -1,7 +1,6 @@
#include "lcarsng.h"
#include "displaytracks.h"
#include "config.h"
-#include <vdr/font.h>
// --- cLCARSNGDisplayTracks -----------------------------------------------
diff --git a/displaytracks.h b/displaytracks.h
index e7c3d0b..1ef8594 100644
--- a/displaytracks.h
+++ b/displaytracks.h
@@ -1,7 +1,3 @@
-#include "lcarsng.h"
-#include <vdr/font.h>
-#include <vdr/menu.h>
-
// --- cLCARSNGDisplayTracks -----------------------------------------------
class cLCARSNGDisplayTracks : public cSkinDisplayTracks {
diff --git a/displayvolume.c b/displayvolume.c
index 025e3d6..dcd3781 100644
--- a/displayvolume.c
+++ b/displayvolume.c
@@ -1,7 +1,6 @@
#include "lcarsng.h"
#include "config.h"
#include "displayvolume.h"
-#include <vdr/font.h>
// --- cLCARSNGDisplayVolume -----------------------------------------------
diff --git a/displayvolume.h b/displayvolume.h
index 7220dba..f440b89 100644
--- a/displayvolume.h
+++ b/displayvolume.h
@@ -1,6 +1,3 @@
-#include "lcarsng.h"
-#include <vdr/font.h>
-
// --- cLCARSNGDisplayVolume -----------------------------------------------
class cLCARSNGDisplayVolume : public cSkinDisplayVolume {
diff --git a/lcarsng.c b/lcarsng.c
index 038311d..ff1b03d 100644
--- a/lcarsng.c
+++ b/lcarsng.c
@@ -31,20 +31,8 @@
#include "displayreplay.h"
#include "displaytracks.h"
#include "displayvolume.h"
-#include <vdr/font.h>
-#include <vdr/menu.h>
-#include <vdr/osd.h>
-#if APIVERSNUM > 20101
-#include <vdr/positioner.h>
-#endif
-#include <vdr/themes.h>
-#include <vdr/thread.h>
-#include <vdr/tools.h>
-#include <vdr/videodir.h>
-#include <sys/statvfs.h>
-#include <string>
-//cTheme Theme;
+cTheme Theme;
bool TwoColors = false;
diff --git a/lcarsng.h b/lcarsng.h
index cbbc9b9..047e64e 100644
--- a/lcarsng.h
+++ b/lcarsng.h
@@ -1,12 +1,3 @@
-/*
- * skinlcars.h: A VDR skin with Star Trek's "LCARS" layout
- *
- * See the main source file 'vdr.c' for copyright information and
- * how to reach the author.
- *
- * $Id: skinlcars.h 3.0 2012/04/15 13:17:35 kls Exp $
- */
-
#ifndef __SKINLCARS_H
#define __SKINLCARS_H
@@ -57,7 +48,6 @@
#include "symbols/volume.xpm"
#define Gap (Setup.FontOsdSize / 5 & ~1) // must be even
-//#define Margin (Gap / 2)
#define TextFrame (Setup.FontOsdSize / TEXT_ALIGN_BORDER)
#define TextSpacing (2 * TextFrame)
#define SymbolSpacing TextSpacing
@@ -68,8 +58,7 @@
#define DISKUSAGEALERTLIMIT 95 // percent of disk usage above which the display goes into alert mode
#define SIGNALDISPLAYDELTA 2 // seconds between subsequent device signal displays
-//extern cTheme Theme;
-cTheme Theme;
+extern cTheme Theme;
// Color domains:
diff --git a/lcarsng.o b/lcarsng.o
index 3563921..dfe3f3e 100644
--- a/lcarsng.o
+++ b/lcarsng.o
Binary files differ
diff --git a/setup.c b/setup.c
index 428e908..b66ddcf 100644
--- a/setup.c
+++ b/setup.c
@@ -1,7 +1,3 @@
-/*
- * See the README file for copyright information and how to reach the author.
- */
-
#include "config.h"
#include "setup.h"
diff --git a/skinlcarsng.c b/skinlcarsng.c
index e6035f4..86f7396 100644
--- a/skinlcarsng.c
+++ b/skinlcarsng.c
@@ -1,21 +1,13 @@
-/*
- * skinflat.c: A plugin for the Video Disk Recorder
- *
- * See the README file for copyright information and how to reach the author.
- *
- * $Id$
- */
#include <getopt.h>
#include <vdr/plugin.h>
#include "config.h"
#include "setup.h"
+#include "lcarsng.h"
#if defined(APIVERSNUM) && APIVERSNUM < 10734
#error "VDR-1.7.34 API version or greater is required!"
#endif
-#include "lcarsng.h"
-
static const char *VERSION = "0.2.7";
static const char *DESCRIPTION = "skin lcarsng";
@@ -53,26 +45,10 @@ cPluginLCARSNG::~cPluginLCARSNG() {
}
const char *cPluginLCARSNG::CommandLineHelp(void) {
- return NULL; //" -l <LOGOPATH>, --logopath=<LOGOPATH> Set directory where Channel Logos are stored.\n";
+ return NULL;
}
bool cPluginLCARSNG::ProcessArgs(int argc, char *argv[]) {
- // Implement command line argument processing here if applicable.
-/* static const struct option long_options[] = {
- { "logopath", required_argument, NULL, 'l' },
- { NULL }
- };
-
- int c;
- while ((c = getopt_long(argc, argv, "l:", long_options, NULL)) != -1) {
- switch (c) {
- case 'l':
-// Config.SetLogoPath(cString(optarg));
- break;
- default:
- return false;
- }
- } */
return true;
}
@@ -114,7 +90,6 @@ cOsdObject *cPluginLCARSNG::MainMenuAction(void) {
cMenuSetupPage *cPluginLCARSNG::SetupMenu(void) {
return new cLCARSNGSetup();
- return NULL;
}
bool cPluginLCARSNG::SetupParse(const char *Name, const char *Value) {
diff --git a/themes/lcarsng-390Lb.theme b/themes/lcarsng-390Lb.theme
deleted file mode 100644
index f608c24..0000000
--- a/themes/lcarsng-390Lb.theme
+++ /dev/null
@@ -1,110 +0,0 @@
-Description = 390Lb
-clrBackground = A0141717
-
-clrTrackName = FFFFCC66
-clrAlertFg = FFFFFFFF
-clrAlertBg = FFFF0000
-clrChannelName = FF99CCFF
-clrEventTitle = FF99CCFF
-clrEventTime = FFFFCC66
-clrEventShortText = FFFFCC66
-clrEventDescription = FF99CCFF
-
-
-clrButtonRedFg = FF000000
-clrButtonRedBg = FFf97d7d
-clrButtonGreenFg = FF000000
-clrButtonGreenBg = FF9df97d
-clrButtonYellowFg = FF000000
-clrButtonYellowBg = FFf9f47d
-clrButtonBlueFg = FF000000
-clrButtonBlueBg = FF7db4f9
-
-
-clrMessageStatusFg = FFFFFFFF
-clrMessageStatusBg = FF0000B2
-clrMessageInfoFg = FF000000
-clrMessageInfoBg = FF00B200
-clrMessageWarningFg = FF000000
-clrMessageWarningBg = FFB2B200
-clrMessageErrorFg = FFFFFFFF
-clrMessageErrorBg = FFB20000
-clrVolumeFrame = FFF1DF6F
-clrVolumeSymbol = FF000000
-clrVolumeBarUpper = FFC1B259
-clrVolumeBarLower = FF00B200
-
-clrChannelFrameFg = FF000000
-clrChannelFrameBg = FF8a9ec9
-
-clrChannelSymbolOn = FF50638b
-clrChannelSymbolOff = FF738ec9
-clrChannelSymbolRecFg = FFFFFFFF
-clrChannelSymbolRecBg = FFB20000
-
-
-#Pegel Text
-clrDeviceFg = FFff9900
-#Pegel Hintergrund
-clrDeviceBg = A0141717
-#Pegel Balken
-clrSignalValue = FFff9966
-#Pegel Hintergrund
-clrSignalRest = FFffcc99
-#Timer Text
-clrTimerFg = FF000000
-#Timer hintergrund
-clrTimerBg = FF99CCFF
-#Sendungsfortschritt
-clrSeen = FFCC99CC
-#Datum Vordergrund
-clrDateFg = FF000000
-#Datum Hintergrund
-clrDateBg = FF99CCFF
-#Umrandung unten Vordergrund
-clrMenuFrameFg = FF202740
-#Umrandung unten Hintergrund
-#c#lrMenuFrameBg = FFe0606d
-clrMenuFrameBg = FFFF9966
-#Menue Titel Text
-clrMenuTitle = FFea962d
-
-#Menu Liste
-clrMenuMainBracket = FF9999ff
-#Liste Aktiv Vordergrund
-clrMenuItemCurrentFg = FFffa201
-#Liste Aktiv Hintergrund
-clrMenuItemCurrentBg = FF202740
-#Liste Eintrag
-clrMenuItemSelectable = FF8a9ec9
-#Liste Eintrag (inaktiv)
-clrMenuItemNonSelectable = FF99CCFF
-
-
-
-
-clrMenuTimerRecording = FFF1B1AF
-clrMenuDeviceRecording = FF99CCFF
-
-
-clrMenuScrollbarTotal = FFFFBC57
-clrMenuScrollbarShown = FFCC99CC
-clrMenuScrollbarArrow = FF000000
-clrMenuText = FFff00ff
-
-clrReplayFrameFg = FF000000
-clrReplayFrameBg = FFCC6666
-clrReplayPosition = FFCC99CC
-clrReplayJumpFg = FF000000
-clrReplayJumpBg = FFCC99CC
-clrReplayProgressSeen = FFCC99CC
-clrReplayProgressRest = FFCCCCCC
-clrReplayProgressSelected = FF990000
-clrReplayProgressMark = FF000000
-clrReplayProgressCurrent = FF990000
-clrTrackFrameFg = FF000000
-clrTrackFrameBg = FFFFCC66
-clrTrackItemFg = FF000000
-clrTrackItemBg = FFFFE6B3
-clrTrackItemCurrentFg = FF000000
-clrTrackItemCurrentBg = FFFFCC66
diff --git a/themes/lcarsng-BlueGlass.theme b/themes/lcarsng-BlueGlass.theme
deleted file mode 100644
index 59dc3db..0000000
--- a/themes/lcarsng-BlueGlass.theme
+++ /dev/null
@@ -1,104 +0,0 @@
-Description = BlueGlass
-clrBackground = 8C1B1B1B
-
-clrTrackName = FFFFCC66
-clrAlertFg = FFFFFFFF
-clrAlertBg = DCFF0000
-clrChannelName = FFFFFFFF
-clrEventTitle = FF99CCFF
-clrEventTime = FFFFFFFF #FFCC66
-clrEventShortText = FFFFCC66
-clrEventDescription = FF99CCFF
-
-# Pulsanti
-clrButtonRedFg = FF000000
-clrButtonRedBg = DCf97d7d
-clrButtonGreenFg = FF000000
-clrButtonGreenBg = DC9df97d
-clrButtonYellowFg = FF000000
-clrButtonYellowBg = DCf9f47d
-clrButtonBlueFg = FF000000
-clrButtonBlueBg = DC7db4f9
-
-# Messaggi di stato
-clrMessageStatusFg = FFFFFFFF
-clrMessageStatusBg = DC0000B2
-clrMessageInfoFg = FF000000
-clrMessageInfoBg = DC00B200
-clrMessageWarningFg = FF000000
-clrMessageWarningBg = DC005B9A #B2B200
-clrMessageErrorFg = FFFFFFFF
-clrMessageErrorBg = DCB20000
-
-# Volume
-clrVolumeFrame = DCFFFFFF #sfondo volume
-clrVolumeSymbol = FF000000
-clrVolumeBarUpper = DCC0C0C0 #barra volume non attivo
-clrVolumeBarLower = FF336699 #barra volume attivo
-
-# Menu info canale
-clrChannelFrameFg = FFFFFFFF #numero canale e orario programma
-clrChannelFrameBg = DC323D68 #cornice
-clrChannelSymbolOn = FFFFFFFF #50638b
-clrChannelSymbolOff = DC666666
-clrChannelSymbolRecFg = FFFFFFFF
-clrChannelSymbolRecBg = FFB20000
-
-# Device
-clrDeviceFg = FFff9900 #testo
-clrDeviceBg = A01B1B1B #sfondo
-clrSignalValue = DCFFCC00 #livello segnale
-clrSignalRest = A0000000 #resto segnale
-
-# Timer Text
-clrTimerFg = FF000000 #testo
-clrTimerBg = DCE9E0DB #sfondo
-
-# Progressbar
-clrSeen = A0F9F6F4
-
-# Data e ora
-clrDateFg = FF000000 #testo
-clrDateBg = DCE9E0DB #sfondo
-
-# Menu principale
-clrMenuFrameFg = FFFFCC99 #testo
-clrMenuFrameBg = DC21244B #cornice
-clrMenuTitle = FFEA962D #testo titoli
-
-# Menu lista voci
-clrMenuMainBracket = DC202740 #cornice sup/inf
-clrMenuItemCurrentFg = FFffcc99 #Voce selezionata (testo)
-clrMenuItemCurrentBg = FF202740 #Voce selezionata (barra)
-clrMenuItemSelectable = FF99CCFF #Lista delle voci selezionabili
-clrMenuItemNonSelectable = FF8C8C8C #lista delle voci (non selezionabili)
-
-# Tempo registrazione
-clrMenuTimerRecording = FFF6A03D #FFF1B1AF
-clrMenuDeviceRecording = A01B1B1B #FF99CCFF #A0141717
-
-# Scrollbar
-clrMenuScrollbarTotal = A0202740
-clrMenuScrollbarShown = FF202740
-clrMenuScrollbarArrow = FF000000
-clrMenuText = FFFFFFFF #FFff00ff
-
-# Replay OSD
-clrReplayFrameFg = FFFFFFFF #FF000000
-clrReplayFrameBg = DC007090
-clrReplayPosition = FFCC99CC
-clrReplayJumpFg = FF000000
-clrReplayJumpBg = FFCC99CC
-clrReplayProgressSeen = FFF6A03D #CC99CC
-clrReplayProgressRest = FFCCCCCC
-clrReplayProgressSelected = FF990000
-clrReplayProgressMark = FF000000
-clrReplayProgressCurrent = FF990000
-
-# Audio
-clrTrackFrameFg = FFFFFFFF
-clrTrackFrameBg = DC323D68 #Audio skin
-clrTrackItemFg = DC858585
-clrTrackItemBg = A0FFFFFF #Audio no select
-clrTrackItemCurrentFg = FF000000
-clrTrackItemCurrentBg = FFFFFFFF #Audio select
diff --git a/themes/lcarsng-LbSense.theme b/themes/lcarsng-LbSense.theme
deleted file mode 100644
index faed2f1..0000000
--- a/themes/lcarsng-LbSense.theme
+++ /dev/null
@@ -1,105 +0,0 @@
-Description = LbSense
-clrBackground = A0141717
-
-clrTrackName = FFFFCC66
-clrAlertFg = FFFFFFFF
-clrAlertBg = FFFF0000
-clrChannelName = FFFFFFFF #FF99CCFF
-clrEventTitle = FFFFCC99 #99CCFF
-clrEventTime = FFFFCC66
-clrEventShortText = FF99CCFF #FFCC66
-clrEventDescription = FF99CCFF #99CCFF
-
-# Pulsanti
-clrButtonRedFg = FF000000
-clrButtonRedBg = FFf97d7d
-clrButtonGreenFg = FF000000
-clrButtonGreenBg = FF9df97d
-clrButtonYellowFg = FF000000
-clrButtonYellowBg = FFf9f47d
-clrButtonBlueFg = FF000000
-clrButtonBlueBg = FF7db4f9
-
-# Messaggi di stato
-clrMessageStatusFg = FFFFFFFF
-clrMessageStatusBg = FF0000B2
-clrMessageInfoFg = FF000000
-clrMessageInfoBg = FF00B200
-clrMessageWarningFg = FF000000
-clrMessageWarningBg = FFB2B200
-clrMessageErrorFg = FFFFFFFF
-clrMessageErrorBg = FFB20000
-
-# Volume
-clrVolumeFrame = DCFFFFFF #FF99CCFF #FFF1DF6F
-clrVolumeSymbol = FF000000
-clrVolumeBarUpper = A08C8C8C #DCFFCC99 #FFC1B259
-clrVolumeBarLower = DC7DB4F9 #FF8A9EC9 #FF9966 #FF00B200
-
-# Menu info canale
-clrChannelFrameFg = FF000000
-clrChannelFrameBg = FF8A9EC9
-clrChannelSymbolOn = FF202740 #FFFFFF #50638b
-clrChannelSymbolOff = FF738ec9
-clrChannelSymbolRecFg = FFFFFFFF
-clrChannelSymbolRecBg = FFB20000
-
-# Device
-clrDeviceFg = FFff9900
-clrDeviceBg = A0141717
-clrSignalValue = FFff9966
-clrSignalRest = FFffcc99
-
-# Timer Text
-clrTimerFg = FF000000
-clrTimerBg = FF99CCFF
-
-# Progressbar
-clrSeen = FFCC99CC
-
-# Data e ora
-clrDateFg = FF000000
-clrDateBg = FF99CCFF
-
-# Menu principale
-clrMenuFrameFg = FF202740
-clrMenuFrameBg = FFFFCC99 #FFFF9966
-clrMenuTitle = FFea962d
-
-# Menu lista voci
-clrMenuMainBracket = FF9999ff
-clrMenuItemCurrentFg = FFffcc99 #FFffa201
-clrMenuItemCurrentBg = FF202740
-clrMenuItemSelectable = FF99CCFF #8A9EC9
-clrMenuItemNonSelectable = FF99CCFF
-
-# Tempo registrazione
-clrMenuTimerRecording = FFF1B1AF
-clrMenuDeviceRecording = FF99CCFF
-
-# Scrollbar
-clrMenuScrollbarTotal = FF9999ff #FFFFBC57
-clrMenuScrollbarShown = FFCC99CC
-clrMenuScrollbarArrow = FF000000
-clrMenuText = FFff00ff
-
-# Replay OSD
-clrReplayFrameFg = FF000000
-clrReplayFrameBg = FFCC6666
-clrReplayPosition = FFCC99CC
-clrReplayJumpFg = FF000000
-clrReplayJumpBg = FFCC99CC
-clrReplayProgressSeen = FFCC99CC
-clrReplayProgressRest = FFCCCCCC
-clrReplayProgressSelected = FF990000
-clrReplayProgressMark = FF000000
-clrReplayProgressCurrent = FF990000
-
-# Audio
-clrTrackFrameFg = FF000000
-clrTrackFrameBg = FFFFFCC99 #skin
-clrTrackItemFg = DC858585
-clrTrackItemBg = A0FFFFFF #Audio no select
-clrTrackItemCurrentFg = FF000000
-clrTrackItemCurrentBg = FF99CCFF #Audio select
-
diff --git a/themes/lcarsng-default.theme b/themes/lcarsng-default.theme
deleted file mode 100644
index e83206a..0000000
--- a/themes/lcarsng-default.theme
+++ /dev/null
@@ -1,75 +0,0 @@
-Description = Default
-clrBackground = 99000000
-clrDateFg = FF000000
-clrDateBg = FF99CCFF
-clrTimerFg = FF000000
-clrTimerBg = FF99CCFF
-clrDeviceFg = FF000000
-clrDeviceBg = FFF1B1AF
-clrSignalValue = FFA0FF99
-clrSignalRest = FFCC6666
-clrSeen = FFCC99CC
-clrTrackName = FFFFCC66
-clrAlertFg = FFFFFFFF
-clrAlertBg = FFFF0000
-clrChannelName = FF99CCFF
-clrEventTitle = FF99CCFF
-clrEventTime = FFFFCC66
-clrEventShortText = FFFFCC66
-clrEventDescription = FF99CCFF
-clrButtonRedFg = FF000000
-clrButtonRedBg = FFCC6666
-clrButtonGreenFg = FF000000
-clrButtonGreenBg = FFA0FF99
-clrButtonYellowFg = FF000000
-clrButtonYellowBg = FFF1DF60
-clrButtonBlueFg = FF000000
-clrButtonBlueBg = FF9A99FF
-clrMessageStatusFg = FF000000
-clrMessageStatusBg = FF9A99FF
-clrMessageInfoFg = FF000000
-clrMessageInfoBg = FFA0FF99
-clrMessageWarningFg = FF000000
-clrMessageWarningBg = FFF1DF60
-clrMessageErrorFg = FF000000
-clrMessageErrorBg = FFCC6666
-clrVolumeFrame = FFFF9966
-clrVolumeSymbol = FF000000
-clrVolumeBarUpper = FFCC7A52
-clrVolumeBarLower = FFA0FF99
-clrChannelFrameFg = FF000000
-clrChannelFrameBg = FF8A9EC9
-clrChannelSymbolOn = FF000000
-clrChannelSymbolOff = FF6E7EA1
-clrChannelSymbolRecFg = FFFFFFFF
-clrChannelSymbolRecBg = FFCC6666
-clrMenuFrameFg = FF000000
-clrMenuFrameBg = FFFF9966
-clrMenuTitle = FFFF9966
-clrMenuMainBracket = FF9999FF
-clrMenuTimerRecording = FFF1B1AF
-clrMenuDeviceRecording = FF99CCFF
-clrMenuItemCurrentFg = FFFF9966
-clrMenuItemCurrentBg = FF4D4D80
-clrMenuItemSelectable = FF9999FF
-clrMenuItemNonSelectable = FF99CCFF
-clrMenuScrollbarTotal = FFFFAD85
-clrMenuScrollbarShown = FFCC99CC
-clrMenuScrollbarArrow = FF000000
-clrMenuText = FF99CCFF
-clrReplayFrameFg = FF000000
-clrReplayFrameBg = FFCC6666
-clrReplayPosition = FFCC99CC
-clrReplayJumpFg = FF000000
-clrReplayJumpBg = FFCC99CC
-clrReplayProgressSeen = FFCC99CC
-clrReplayProgressRest = FFCCCCCC
-clrReplayProgressSelected = FF990000
-clrReplayProgressMark = FF000000
-clrReplayProgressCurrent = FF990000
-clrTrackFrameFg = FF000000
-clrTrackFrameBg = FFFFCC66
-clrTrackItemFg = FF000000
-clrTrackItemBg = FFFFE6B3
-clrTrackItemCurrentFg = FF000000
-clrTrackItemCurrentBg = FFFFCC66
diff --git a/themes/lcarsng-mein.theme b/themes/lcarsng-mein.theme
deleted file mode 100644
index fd58057..0000000
--- a/themes/lcarsng-mein.theme
+++ /dev/null
@@ -1,75 +0,0 @@
-Description = mein
-clrBackground = 90000000
-clrDateFg = FF000000
-clrDateBg = FF99CCFF
-clrTimerFg = FF000000
-clrTimerBg = FF99CCFF
-clrDeviceFg = FF000000
-clrDeviceBg = FFF1B1AF
-clrSignalValue = FFA0FF99
-clrSignalRest = FFCC6666
-clrSeen = FFCC99CC
-clrTrackName = FFFFCC66
-clrAlertFg = FFFFFFFF
-clrAlertBg = FFFF0000
-clrChannelName = FF99CCFF
-clrEventTitle = FF99CCFF
-clrEventTime = FFFFCC66
-clrEventShortText = FFFFCC66
-clrEventDescription = FF99CCFF
-clrButtonRedFg = FF000000
-clrButtonRedBg = FFCC6666
-clrButtonGreenFg = FF000000
-clrButtonGreenBg = FFA0FF99
-clrButtonYellowFg = FF000000
-clrButtonYellowBg = FFF1DF60
-clrButtonBlueFg = FF000000
-clrButtonBlueBg = FF9A99FF
-clrMessageStatusFg = FFFFFFFF
-clrMessageStatusBg = FF9A99FF
-clrMessageInfoFg = FF000000
-clrMessageInfoBg = FFA0FF99
-clrMessageWarningFg = FF000000
-clrMessageWarningBg = FFF1DF60
-clrMessageErrorFg = FFFFFFFF
-clrMessageErrorBg = FFCC6666
-clrVolumeFrame = FFF1DF6F
-clrVolumeSymbol = FF000000
-clrVolumeBarUpper = FFC1B259
-clrVolumeBarLower = FFA0FF99
-clrChannelFrameFg = FF000000
-clrChannelFrameBg = FFFFCC99
-clrChannelSymbolOn = FF000000
-clrChannelSymbolOff = FFCCA37A
-clrChannelSymbolRecFg = FFFFFFFF
-clrChannelSymbolRecBg = FFCC6666
-clrMenuFrameFg = FF000000
-clrMenuFrameBg = FFF1DF6F
-clrMenuTitle = FFF1DF6F
-clrMenuMainBracket = FFFFBC57
-clrMenuTimerRecording = FFF1B1AF
-clrMenuDeviceRecording = FF99CCFF
-clrMenuItemCurrentFg = FF000000
-clrMenuItemCurrentBg = FFFFBC57
-clrMenuItemSelectable = FFFFBC57
-clrMenuItemNonSelectable = FF99CCFF
-clrMenuScrollbarTotal = FFFFBC57
-clrMenuScrollbarShown = FFCC99CC
-clrMenuScrollbarArrow = FF000000
-clrMenuText = FF99CCFF
-clrReplayFrameFg = FF000000
-clrReplayFrameBg = FFCC6666
-clrReplayPosition = FFCC99CC
-clrReplayJumpFg = FF000000
-clrReplayJumpBg = FFCC99CC
-clrReplayProgressSeen = FFCC99CC
-clrReplayProgressRest = FFCCCCCC
-clrReplayProgressSelected = FF990000
-clrReplayProgressMark = FF000000
-clrReplayProgressCurrent = FF990000
-clrTrackFrameFg = FF000000
-clrTrackFrameBg = FFFFCC66
-clrTrackItemFg = FF000000
-clrTrackItemBg = FFFFE6B3
-clrTrackItemCurrentFg = FF000000
-clrTrackItemCurrentBg = FFFFCC66
diff --git a/themes/lcarsng-meins.theme b/themes/lcarsng-meins.theme
deleted file mode 100644
index 29a52b6..0000000
--- a/themes/lcarsng-meins.theme
+++ /dev/null
@@ -1,79 +0,0 @@
-Description = meins
-clrBackground = 01000000
-clrDateFg = FFFFA060
-clrDateBg = FF990000
-clrTimerFg = FF000000
-clrTimerBg = FF99CCFF
-clrDeviceFg = FF000000
-clrDeviceBg = FFF1B1AF
-clrSignalValue = FFA0FF99
-clrSignalRest = FFCC6666
-clrSeen = FFCC99CC
-clrTrackName = FFFFCC66
-clrAlertFg = FFFFFFFF
-clrAlertBg = FFFF0000
-clrChannelName = FF99CCFF
-clrEventTitle = FF99CCFF
-clrEventTime = FFFFCC66
-clrEventShortText = FFFFCC66
-clrEventDescription = FF99CCFF
-clrButtonRedFg = FF000000
-clrButtonRedBg = FFCC6666
-clrButtonGreenFg = FF000000
-clrButtonGreenBg = FFA0FF99
-clrButtonYellowFg = FF000000
-clrButtonYellowBg = FFF1DF60
-clrButtonBlueFg = FF000000
-clrButtonBlueBg = FF9A99FF
-clrMessageStatusFg = FFFFFFFF
-clrMessageStatusBg = FF9A99FF
-clrMessageInfoFg = FFA0FF99
-clrMessageInfoBg = 99404040
-clrMessageWarningFg = FFF1DF60
-clrMessageWarningBg = 99404040
-clrMessageErrorFg = FFFFFFFF
-clrMessageErrorBg = FFCC6666
-clrVolumeFrame = FFF1DF6F
-clrVolumeSymbol = FF000000
-clrVolumeBarUpper = FFC1B259
-clrVolumeBarLower = FFA0FF99
-clrChannelFrameFg = FFFFA060
-clrChannelFrameBg = 99404040
-clrChannelFrameMg = FF306040
-clrChannelSymbolOn = FFFFA060
-clrChannelSymbolOff = FF000000
-clrChannelSymbolRecFg = FFFFFFFF
-clrChannelSymbolRecBg = FFCC6666
-clrMenuFrameFg = FFFFA060
-clrMenuFrameBg = 99404040
-clrMenuFrameMg = FF604040
-clrMenuTitle = FFF1DF6F
-clrMenuMainBracket = FFFFA060
-clrMenuTimerRecording = FFF1B1AF
-clrMenuDeviceRecording = FF99CCFF
-clrMenuItemCurrentFg = FF000000
-clrMenuItemCurrentBg = FFFFA060
-clrMenuItemSelectable = FFFFA060
-clrMenuItemNonSelectable = FF99CCFF
-clrMenuScrollbarTotal = FFFFA060
-clrMenuScrollbarShown = FFCC99CC
-clrMenuScrollbarArrow = FF000000
-clrMenuText = FF99CCFF
-clrReplayFrameFg = FFFFA060
-clrReplayFrameBg = 99404040
-clrReplayFrameMg = FF804030
-clrReplayPosition = FFCC99CC
-clrReplayJumpFg = FF000000
-clrReplayJumpBg = FFCC99CC
-clrReplayProgressSeen = FFCC99CC
-clrReplayProgressRest = FFCCCCCC
-clrReplayProgressSelected = FF990000
-clrReplayProgressMark = FF000000
-clrReplayProgressCurrent = FF990000
-clrTrackFrameFg = FFFFA060
-clrTrackFrameBg = 99404040
-clrTrackFrameMg = FF604040
-clrTrackItemFg = FFFFE6B3
-clrTrackItemBg = FF404040
-clrTrackItemCurrentFg = FFFFA060
-clrTrackItemCurrentBg = FF303030