summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--HISTORY2
-rw-r--r--config.c2
-rw-r--r--config.h1
-rw-r--r--displaymenuview.c6
-rw-r--r--po/de_DE.po11
-rw-r--r--po/it_IT.po11
-rw-r--r--po/sk_SK.po11
-rw-r--r--setup.c4
-rw-r--r--setup.h1
9 files changed, 45 insertions, 4 deletions
diff --git a/HISTORY b/HISTORY
index 2af1bd9..da33cbe 100644
--- a/HISTORY
+++ b/HISTORY
@@ -204,3 +204,5 @@ Version 0.1.2
- Added display of next Schedules in Channel Menu in separate Info Window.
The Number of displayed Schedules can be configured in Plugin Channels
Menu Setup.
+- Display of disc status in main menu configurable: either remaining recording
+ time in hours or free disc space in GB is displayed
diff --git a/config.c b/config.c
index c0544ba..1929e06 100644
--- a/config.c
+++ b/config.c
@@ -95,6 +95,7 @@ cNopacityConfig::cNopacityConfig() {
menuWidthRightItems = 12;
menuSizeDiskUsage = 12;
showDiscUsage = 1;
+ discUsageStyle = 0;
showTimers = 1;
numberTimers = 10;
checkTimerConflict = 1;
@@ -365,6 +366,7 @@ bool cNopacityConfig::SetupParse(const char *Name, const char *Value) {
else if (strcmp(Name, "menuSizeDiskUsage") == 0) menuSizeDiskUsage = atoi(Value);
else if (strcmp(Name, "menuHeightInfoWindow") == 0) menuHeightInfoWindow = atoi(Value);
else if (strcmp(Name, "showDiscUsage") == 0) showDiscUsage = atoi(Value);
+ else if (strcmp(Name, "discUsageStyle") == 0) discUsageStyle = atoi(Value);
else if (strcmp(Name, "showTimers") == 0) showTimers = atoi(Value);
else if (strcmp(Name, "numberTimers") == 0) numberTimers = atoi(Value);
else if (strcmp(Name, "checkTimerConflict") == 0) checkTimerConflict = atoi(Value);
diff --git a/config.h b/config.h
index 9f40da8..793a812 100644
--- a/config.h
+++ b/config.h
@@ -126,6 +126,7 @@ class cNopacityConfig {
int menuWidthRightItems;
int menuSizeDiskUsage;
int showDiscUsage;
+ int discUsageStyle;
int showTimers;
int numberTimers;
int checkTimerConflict;
diff --git a/displaymenuview.c b/displaymenuview.c
index d5979ce..e1f05a0 100644
--- a/displaymenuview.c
+++ b/displaymenuview.c
@@ -659,7 +659,11 @@ void cNopacityDisplayMenuView::DrawDiskUsage(void) {
}
pixmapDiskUsageLabel->Fill(clrTransparent);
cString usage = cString::sprintf("%d%%", DiskUsage);
- cString rest = cString::sprintf("%02d:%02dh %s", cVideoDiskUsage::FreeMinutes() / 60, cVideoDiskUsage::FreeMinutes() % 60, tr("free"));
+ cString rest;
+ if (config.discUsageStyle == 0)
+ rest = cString::sprintf("%02d:%02dh %s", cVideoDiskUsage::FreeMinutes() / 60, cVideoDiskUsage::FreeMinutes() % 60, tr("free"));
+ else
+ rest = cString::sprintf("%d GB %s", cVideoDiskUsage::FreeMB() / 1024, tr("free"));
pixmapDiskUsageLabel->DrawRectangle(cRect((diskUsageWidth - 4)*DiskUsage/100,4*diskUsageHeight/5, (diskUsageWidth - 4) - (diskUsageWidth - 4)*DiskUsage/100, diskUsageHeight/5), 0xDD000000);
pixmapDiskUsageLabel->DrawText(cPoint((diskUsageWidth - fontDiskUsagePercent->Width(*usage))/2, 4*diskUsageHeight/5), *usage, Theme.Color(clrMenuFontDiscUsage), clrTransparent, fontDiskUsagePercent);
pixmapDiskUsageLabel->DrawText(cPoint((diskUsageWidth - fontDiskUsage->Width(*rest))/2, (diskUsageHeight - fontDiskUsage->Height())/2), *rest, Theme.Color(clrMenuFontDiscUsage), clrTransparent, fontDiskUsage);
diff --git a/po/de_DE.po b/po/de_DE.po
index 9137c50..cc4611a 100644
--- a/po/de_DE.po
+++ b/po/de_DE.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: skinnopacity 0.0.1\n"
"Report-Msgid-Bugs-To: <see README>\n"
-"POT-Creation-Date: 2013-04-14 11:28+0200\n"
+"POT-Creation-Date: 2013-04-14 16:39+0200\n"
"PO-Revision-Date: 2012-11-11 17:49+0200\n"
"Last-Translator: louis\n"
"Language-Team: \n"
@@ -191,6 +191,12 @@ msgstr "nur VDR Version"
msgid "no title"
msgstr "kein Titel"
+msgid "free time in hours"
+msgstr "freie Zeit in Stunden"
+
+msgid "free space in GB"
+msgstr "freier Platz in GB"
+
msgid "Use narrow main menu"
msgstr "Schmales Hauptmenü verwenden"
@@ -215,6 +221,9 @@ msgstr "Festplattenstatus anzeigen"
msgid "Size (square, Percent of OSD Width)"
msgstr "Größe (quadr., % der OSD Breite)"
+msgid "Free Disc Display"
+msgstr "Anzeige des verfügbaren Plattenplatzes"
+
msgid "Adjust Font Size - free"
msgstr "Schriftgröße anpassen - frei"
diff --git a/po/it_IT.po b/po/it_IT.po
index cdf3366..4198e24 100644
--- a/po/it_IT.po
+++ b/po/it_IT.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: skinnopacity 0.0.1\n"
"Report-Msgid-Bugs-To: <see README>\n"
-"POT-Creation-Date: 2013-04-14 11:28+0200\n"
+"POT-Creation-Date: 2013-04-14 16:39+0200\n"
"PO-Revision-Date: 2013-03-19 22:56+0100\n"
"Last-Translator: Diego Pierotto <vdr-italian@tiscali.it>\n"
"Language-Team: \n"
@@ -194,6 +194,12 @@ msgstr ""
msgid "no title"
msgstr ""
+msgid "free time in hours"
+msgstr ""
+
+msgid "free space in GB"
+msgstr ""
+
msgid "Use narrow main menu"
msgstr "Usa menu principale ridotto"
@@ -218,6 +224,9 @@ msgstr "Mostra utilizzo disco"
msgid "Size (square, Percent of OSD Width)"
msgstr "Dimensione (quadrato, % larghezza OSD)"
+msgid "Free Disc Display"
+msgstr ""
+
msgid "Adjust Font Size - free"
msgstr "Adatta dim. caratteri - Disponibili"
diff --git a/po/sk_SK.po b/po/sk_SK.po
index 22c39a4..7b45a2f 100644
--- a/po/sk_SK.po
+++ b/po/sk_SK.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: vdr-skinnopacity 0.0.6\n"
"Report-Msgid-Bugs-To: <see README>\n"
-"POT-Creation-Date: 2013-04-14 11:28+0200\n"
+"POT-Creation-Date: 2013-04-14 16:39+0200\n"
"PO-Revision-Date: 2013-03-12 15:59+0100\n"
"Last-Translator: Milan Hrala <hrala.milan@gmail.com>\n"
"Language-Team: \n"
@@ -194,6 +194,12 @@ msgstr ""
msgid "no title"
msgstr ""
+msgid "free time in hours"
+msgstr ""
+
+msgid "free space in GB"
+msgstr ""
+
msgid "Use narrow main menu"
msgstr "Úzke hlavné menu"
@@ -218,6 +224,9 @@ msgstr "Zobrazi» vyu¾itie disku"
msgid "Size (square, Percent of OSD Width)"
msgstr "Veµkos» (do ¹tvorca, percento z OSD ¹írky)"
+msgid "Free Disc Display"
+msgstr ""
+
msgid "Adjust Font Size - free"
msgstr "Nastavenie veµkos»i písma - voµné"
diff --git a/setup.c b/setup.c
index a1beebd..cce3375 100644
--- a/setup.c
+++ b/setup.c
@@ -150,6 +150,7 @@ void cNopacitySetup::Store(void) {
SetupStore("menuInfoScrollDelay", config.menuInfoScrollDelay);
SetupStore("menuInfoScrollSpeed", config.menuInfoScrollSpeed);
SetupStore("showDiscUsage", config.showDiscUsage);
+ SetupStore("discUsageStyle", config.discUsageStyle);
SetupStore("showTimers", config.showTimers);
SetupStore("numberTimers", config.numberTimers);
SetupStore("checkTimerConflict", config.checkTimerConflict);
@@ -286,6 +287,8 @@ cNopacitySetupMenuDisplayMain::cNopacitySetupMenuDisplayMain(cNopacityConfig* da
titleStyle[0] = tr("\"VDR\" plus VDR version");
titleStyle[1] = tr("only VDR version");
titleStyle[2] = tr("no title");
+ discUsageStyle[0] = tr("free time in hours");
+ discUsageStyle[1] = tr("free space in GB");
Set();
}
@@ -306,6 +309,7 @@ void cNopacitySetupMenuDisplayMain::Set(void) {
Add(new cMenuEditBoolItem(tr("Display Disk Usage"), &tmpNopacityConfig->showDiscUsage));
if (tmpNopacityConfig->showDiscUsage) {
Add(new cMenuEditIntItem(cString::sprintf("%s%s", *spacer, tr("Size (square, Percent of OSD Width)")), &tmpNopacityConfig->menuSizeDiskUsage, 5, 30));
+ Add(new cMenuEditStraItem(cString::sprintf("%s%s", *spacer, tr("Free Disc Display")), &tmpNopacityConfig->discUsageStyle, 2, discUsageStyle));
Add(new cMenuEditIntItem(cString::sprintf("%s%s", *spacer, tr("Adjust Font Size - free")), &tmpNopacityConfig->fontDiskUsage, -20, 20));
Add(new cMenuEditIntItem(cString::sprintf("%s%s", *spacer, tr("Adjust Font Size - percent")), &tmpNopacityConfig->fontDiskUsagePercent, -20, 20));
}
diff --git a/setup.h b/setup.h
index 0df7e53..377ca69 100644
--- a/setup.h
+++ b/setup.h
@@ -40,6 +40,7 @@ class cNopacitySetupMenuDisplay : public cMenuSetupSubMenu {
class cNopacitySetupMenuDisplayMain : public cMenuSetupSubMenu {
protected:
const char *titleStyle[3];
+ const char *discUsageStyle[2];
void Set(void);
public:
cNopacitySetupMenuDisplayMain(cNopacityConfig *data);
generated by cgit v1.2.3 (git 2.25.1) at 2025-01-13 02:03:14 +0000