diff --git a/data/locale/deutsch.locale b/data/locale/deutsch.locale index f206ecfca..dca2ec96b 100644 --- a/data/locale/deutsch.locale +++ b/data/locale/deutsch.locale @@ -1121,6 +1121,11 @@ recordingmenu.file Direkt (Datei) recordingmenu.filesettings Direktaufnahme Einstellungen recordingmenu.head Aufnahme Einstellungen recordingmenu.help Aufnahmegeräte:\n-----------------------\nServer:\nauf PC mit Hilfe eines Streaming-Programmes\n\n(analoger) Videorekorder:\nüber VCR-Ausgang\n\nDirekt (Datei):\nauf ein per NFS gemountetes Verzeichnis\noder eine interne Festplatte\nTS: SPTS-Mode Treiber laden(dbox2)\nPES: SPTS-Mode Treiber nicht laden(dbox2)\n\n\nMaximale Dateigröße:\n----------------------\nNFS V2: 2 GB (2048 MB)\nNFS V3: fast unendlich (0 MB)\nFAT: 2 GB (2048 MB)\nFAT32: 4 GB (4096 MB) +recordingmenu.multimenu.ask_stop_all Wirklich alle %d Aufnahmen beenden? +recordingmenu.multimenu.info_stop_all %d Aufnahmen werden beendet. +recordingmenu.multimenu.rec_akt Aufnahme aktueller Kanal +recordingmenu.multimenu.stop_all Alle Aufnahmen beenden +recordingmenu.multimenu.timeshift Timeshift recordingmenu.no_scart Unterdrücke Scart-Umschaltung recordingmenu.off aus recordingmenu.record_in_spts_mode in SPTS-Modus aufnehmen diff --git a/data/locale/english.locale b/data/locale/english.locale index 184b39051..616f20415 100644 --- a/data/locale/english.locale +++ b/data/locale/english.locale @@ -1121,6 +1121,11 @@ recordingmenu.file direct (file) recordingmenu.filesettings direct recording settings recordingmenu.head Recording Settings recordingmenu.help Recording devices:\n--------------------------\nserver:\nusing streaming software on a PC\n\n(analog) vcr:\nusing the vcr outlet\n\ndirect (file):\ndirectly into an NFS mounted directory\nor onto an internal hard drive\nTS: use spts mode(dbox2)\nPES: do not use spts mode(dbox2)\n\n\nMax. file size:\n---------------------\nNFS V2: 2 GB (2048 MB)\nNFS V3: almost unlimited (0 MB)\nFAT: 2 GB (2048 MB)\nFAT32: 4 GB (4096 MB) +recordingmenu.multimenu.ask_stop_all really stop all %d recordings? +recordingmenu.multimenu.info_stop_all %d recordings will be stopped. +recordingmenu.multimenu.rec_akt record current channel +recordingmenu.multimenu.stop_all stop all recordings +recordingmenu.multimenu.timeshift Timeshift recordingmenu.no_scart do not switch to scart mode recordingmenu.off off recordingmenu.record_in_spts_mode switch to spts mode before recording diff --git a/src/driver/record.cpp b/src/driver/record.cpp index 0bfe23f52..563c6d4df 100644 --- a/src/driver/record.cpp +++ b/src/driver/record.cpp @@ -40,7 +40,6 @@ #include #include #include -#include #include #include #include @@ -1032,13 +1031,16 @@ int CRecordManager::exec(CMenuTarget* parent, const std::string & actionKey ) if(actionKey == "StopAll") { char rec_msg[256]; + char rec_msg1[256]; int records = recmap.size(); int i = 0; - snprintf(rec_msg, sizeof(rec_msg)-1, "Wirklich alle %d Aufnahmen beenden?", records); + snprintf(rec_msg1, sizeof(rec_msg1)-1, "%s", g_Locale->getText(LOCALE_RECORDINGMENU_MULTIMENU_ASK_STOP_ALL)); + snprintf(rec_msg, sizeof(rec_msg)-1, rec_msg1, records); if(ShowMsgUTF(LOCALE_SHUTDOWN_RECODING_QUERY, rec_msg, CMessageBox::mbrNo, CMessageBox::mbYes | CMessageBox::mbNo, NULL, 450, 30, false) == CMessageBox::mbrYes) { - snprintf(rec_msg, sizeof(rec_msg)-1, "%d Aufnahmen werden beendet.", records); + snprintf(rec_msg1, sizeof(rec_msg1)-1, "%s", g_Locale->getText(LOCALE_RECORDINGMENU_MULTIMENU_INFO_STOP_ALL)); + snprintf(rec_msg, sizeof(rec_msg)-1, rec_msg1, records); CHintBox * hintBox = new CHintBox(LOCALE_MESSAGEBOX_INFO, rec_msg); hintBox->paint(); int recording_ids[RECORD_MAX_COUNT]; @@ -1121,6 +1123,7 @@ bool CRecordManager::ShowMenu(void) int select = -1, i = 0, shortcut = 1, recmap_size = recmap.size(); char cnt[5]; CMenuForwarderNonLocalized * item; + CMenuForwarder * iteml; t_channel_id channel_ids[RECORD_MAX_COUNT]; int recording_ids[RECORD_MAX_COUNT]; @@ -1130,12 +1133,12 @@ bool CRecordManager::ShowMenu(void) menu.addIntroItems(NONEXISTANT_LOCALE, NONEXISTANT_LOCALE, CMenuWidget::BTN_TYPE_CANCEL); // Record / Timeshift - item = new CMenuForwarderNonLocalized("Aufnahme aktueller Kanal", true, NULL, - this, "Record", CRCInput::RC_red, NEUTRINO_ICON_BUTTON_RED); - menu.addItem(item, false); - item = new CMenuForwarderNonLocalized("Timeshift", true, NULL, - this, "Timeshift", CRCInput::RC_yellow, NEUTRINO_ICON_BUTTON_YELLOW); - menu.addItem(item, false); + iteml = new CMenuForwarder(LOCALE_RECORDINGMENU_MULTIMENU_REC_AKT, true, NULL, + this, "Record", CRCInput::RC_red, NEUTRINO_ICON_BUTTON_RED); + menu.addItem(iteml, false); + iteml = new CMenuForwarder(LOCALE_RECORDINGMENU_MULTIMENU_TIMESHIFT, true, NULL, + this, "Timeshift", CRCInput::RC_yellow, NEUTRINO_ICON_BUTTON_YELLOW); + menu.addItem(iteml, false); if(recmap_size > 0) { @@ -1161,22 +1164,14 @@ bool CRecordManager::ShowMenu(void) if(i > 1) // Menüpunkt "alle Aufn. verenden" { menu.addItem(GenericMenuSeparatorLine); - item = new CMenuForwarderNonLocalized("Alle Aufnahmen beenden", true, NULL, - this, "StopAll", CRCInput::convertDigitToKey(0)); - item->setItemButton(NEUTRINO_ICON_BUTTON_OKAY, true); - menu.addItem(item, false); + iteml = new CMenuForwarder(LOCALE_RECORDINGMENU_MULTIMENU_STOP_ALL, true, NULL, + this, "StopAll", CRCInput::convertDigitToKey(0)); + iteml->setItemButton(NEUTRINO_ICON_BUTTON_OKAY, true); + menu.addItem(iteml, false); } mutex.unlock(); } -#if 0 - if(i == 0) - { - // neutrino.cpp #2458 + #2449 - ShowMsgUTF(LOCALE_MESSAGEBOX_ERROR, "Keine Aufnahme zum Anzeigen oder Stoppen.", - CMessageBox::mbrOk, CMessageBox::mbOk,NEUTRINO_ICON_ERROR, 450, 10); // UTF-8 - return false; - } -#endif + menu.exec(NULL, ""); delete selector; @@ -1434,7 +1429,7 @@ bool CRecordManager::MountDirectory(const char *recordingDir) strcat(msg,recordingDir); ShowMsgUTF(LOCALE_MESSAGEBOX_ERROR, msg, - CMessageBox::mbrOk, CMessageBox::mbOk,NEUTRINO_ICON_ERROR, 450, 10); // UTF-8 + CMessageBox::mbrBack, CMessageBox::mbBack,NEUTRINO_ICON_ERROR, 450, 10); // UTF-8 ret = false; } break; diff --git a/src/system/locals.h b/src/system/locals.h index 7120f3ff5..a8f3ea479 100644 --- a/src/system/locals.h +++ b/src/system/locals.h @@ -1148,6 +1148,11 @@ typedef enum LOCALE_RECORDINGMENU_FILESETTINGS, LOCALE_RECORDINGMENU_HEAD, LOCALE_RECORDINGMENU_HELP, + LOCALE_RECORDINGMENU_MULTIMENU_ASK_STOP_ALL, + LOCALE_RECORDINGMENU_MULTIMENU_INFO_STOP_ALL, + LOCALE_RECORDINGMENU_MULTIMENU_REC_AKT, + LOCALE_RECORDINGMENU_MULTIMENU_STOP_ALL, + LOCALE_RECORDINGMENU_MULTIMENU_TIMESHIFT, LOCALE_RECORDINGMENU_NO_SCART, LOCALE_RECORDINGMENU_OFF, LOCALE_RECORDINGMENU_RECORD_IN_SPTS_MODE, diff --git a/src/system/locals_intern.h b/src/system/locals_intern.h index 73b0ee1a5..07400197c 100644 --- a/src/system/locals_intern.h +++ b/src/system/locals_intern.h @@ -1148,6 +1148,11 @@ const char * locale_real_names[] = "recordingmenu.filesettings", "recordingmenu.head", "recordingmenu.help", + "recordingmenu.multimenu.ask_stop_all", + "recordingmenu.multimenu.info_stop_all", + "recordingmenu.multimenu.rec_akt", + "recordingmenu.multimenu.stop_all", + "recordingmenu.multimenu.timeshift", "recordingmenu.no_scart", "recordingmenu.off", "recordingmenu.record_in_spts_mode",