From 3ad81e8d394d46b3da0a6bdbd6a105dee5f3dce2 Mon Sep 17 00:00:00 2001 From: vanhofen Date: Mon, 28 Aug 2017 13:18:35 +0200 Subject: [PATCH 1/3] Revert "CTimerList: adjust label width in footer dependent by count of buttons" This reverts commit d8caaaf75815f98af6d4a1758025f68b827c446b. Origin commit data ------------------ Commit: https://github.com/neutrino-images/ni-neutrino/commit/3dbbd378f0a774905bb9d4d1abf30b612b456eb0 Author: vanhofen Date: 2017-08-28 (Mon, 28 Aug 2017) --- src/gui/timerlist.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/gui/timerlist.cpp b/src/gui/timerlist.cpp index 1fe55a361..f51cb68df 100644 --- a/src/gui/timerlist.cpp +++ b/src/gui/timerlist.cpp @@ -1420,9 +1420,9 @@ void CTimerList::paintFoot() footer.enableShadow(CC_SHADOW_ON, -1, true); if (timerlist.empty()) - footer.paintButtons(x, y + height - OFFSET_SHADOW - footer_height, width, footer_height, 2, &(TimerListButtons[1]), width/(2+1)); + footer.paintButtons(x, y + height - OFFSET_SHADOW - footer_height, width, footer_height, 2, &(TimerListButtons[1])); else - footer.paintButtons(x, y + height - OFFSET_SHADOW - footer_height, width, footer_height, c, TimerListButtons, width/(c-1)); + footer.paintButtons(x, y + height - OFFSET_SHADOW - footer_height, width, footer_height, c, TimerListButtons); } void CTimerList::paint() From 42d68f122ce111c44c860ab7c95886a4c088fd34 Mon Sep 17 00:00:00 2001 From: vanhofen Date: Mon, 28 Aug 2017 14:04:00 +0200 Subject: [PATCH 2/3] capmt: reduce console-spam, remove additional linefeeds from INFO-lines Origin commit data ------------------ Commit: https://github.com/neutrino-images/ni-neutrino/commit/108476a8b2bf32acf7d94356fdcf75e063a66dac Author: vanhofen Date: 2017-08-28 (Mon, 28 Aug 2017) Origin message was: ------------------ - capmt: reduce console-spam, remove additional linefeeds from INFO-lines --- src/zapit/src/capmt.cpp | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/zapit/src/capmt.cpp b/src/zapit/src/capmt.cpp index d04a92a58..9844372c8 100644 --- a/src/zapit/src/capmt.cpp +++ b/src/zapit/src/capmt.cpp @@ -265,7 +265,7 @@ bool CCamManager::SetMode(t_channel_id channel_id, enum runmode mode, bool start //INFO("source %d old mask %d new mask %d force update %s", source, oldmask, newmask, force_update ? "yes" : "no"); if((oldmask != newmask) || force_update) { - INFO(" ##NI: (oldmask != newmask) || force_update)"); + //INFO(" ##NI: (oldmask != newmask) || force_update)"); cam->setCaMask(newmask); cam->setSource(source); if(newmask != 0 && (!filter_channels || !channel->bUseCI)) { @@ -275,7 +275,7 @@ bool CCamManager::SetMode(t_channel_id channel_id, enum runmode mode, bool start } if(newmask == 0) { - INFO(" ##NI: (newmask == 0)"); + //INFO(" ##NI: (newmask == 0)"); /* FIXME: back to live channel from playback dont parse pmt and call setCaPmt * (see CMD_SB_LOCK / UNLOCK PLAYBACK */ //channel->setRawPmt(NULL);//FIXME @@ -300,7 +300,7 @@ bool CCamManager::SetMode(t_channel_id channel_id, enum runmode mode, bool start if(start) { if ((tunerno >= 0 && tunerno == cDemux::GetSource(cam->getSource())) || (filter_channels && channel->bUseCI)) { rmode = true; - INFO(" ##NI: rmode"); + //INFO(" ##NI: rmode"); } } else @@ -316,7 +316,7 @@ bool CCamManager::SetMode(t_channel_id channel_id, enum runmode mode, bool start list = CCam::CAPMT_ADD; #ifdef BOXMODEL_CS_HD2 - INFO(" ##NI: channel_map.size() %d",channel_map.size()); + //INFO(" ##NI: channel_map.size() %d",channel_map.size()); int ci_use_count = 0; for (it = channel_map.begin(); it != channel_map.end(); ++it) { @@ -334,7 +334,7 @@ bool CCamManager::SetMode(t_channel_id channel_id, enum runmode mode, bool start ci_use_count++; } if (ci_use_count == 0) { - INFO("CI: not used for [%s], disabling TS\n",channel->getName().c_str()); + INFO("CI: not used for [%s], disabling TS",channel->getName().c_str()); cCA::GetInstance()->SetTS(CA_DVBCI_TS_INPUT_DISABLED); } #endif @@ -358,12 +358,12 @@ bool CCamManager::SetMode(t_channel_id channel_id, enum runmode mode, bool start cam->sendCaPmt(channel->getChannelID(), buffer, len, CA_SLOT_TYPE_SMARTCARD); if (tunerno >= 0 && tunerno != cDemux::GetSource(cam->getSource())) { - INFO("CI: configured tuner %d do not match %d, skip [%s]\n", tunerno, cam->getSource(), channel->getName().c_str()); + INFO("CI: configured tuner %d do not match %d, skip [%s]", tunerno, cam->getSource(), channel->getName().c_str()); } else if (filter_channels && !channel->bUseCI) { - INFO("CI: filter enabled, CI not used for [%s]\n", channel->getName().c_str()); + INFO("CI: filter enabled, CI not used for [%s]", channel->getName().c_str()); } else { useCI = true; //NI - INFO("CI: use CI for [%s]\n", channel->getName().c_str()); + INFO("CI: use CI for [%s]", channel->getName().c_str()); cam->sendCaPmt(channel->getChannelID(), buffer, len, CA_SLOT_TYPE_CI); } //list = CCam::CAPMT_MORE; From a39aa78a4c6bd6cbb53a34c5d61a75dcfe629c08 Mon Sep 17 00:00:00 2001 From: vanhofen Date: Tue, 29 Aug 2017 14:38:26 +0200 Subject: [PATCH 3/3] locale: small changes in update locales Origin commit data ------------------ Commit: https://github.com/neutrino-images/ni-neutrino/commit/f1393b5bd570e76bd7adba8a421b9943e7b6c6e1 Author: vanhofen Date: 2017-08-29 (Tue, 29 Aug 2017) Origin message was: ------------------ - locale: small changes in update locales --- data/locale/deutsch.locale | 4 ++-- data/locale/english.locale | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/data/locale/deutsch.locale b/data/locale/deutsch.locale index f8348e7cb..87b048c50 100644 --- a/data/locale/deutsch.locale +++ b/data/locale/deutsch.locale @@ -650,7 +650,7 @@ flashupdate.apply_settings Sollen die aktuellen Einstellungen in das neue Image flashupdate.autocheck Beim Start nach Updates suchen flashupdate.cantopenfile kann Datei nicht öffnen flashupdate.cantopenmtd kann MTD nicht öffnen -flashupdate.checkupdate_internet Online nach Updates suchen +flashupdate.checkupdate_internet Online-Update flashupdate.checkupdate_local Lokales Update flashupdate.copy_image Kopiere Image in den Arbeitsspeicher flashupdate.createimage Image speichern @@ -704,7 +704,7 @@ flashupdate.namemode2_hostname_time ++.img flashupdate.new_found Updates verfügbar! flashupdate.new_notfound Keine Updates verfügbar! flashupdate.ng_noflash USB-Image aktiv, Update nicht möglich! -flashupdate.noversion Bei Updates werden Versionsüberprüfungen derzeit nur über Web-Updates unterstützt.\nWollen Sie das ausgewählte Image wirklich installieren? +flashupdate.noversion Eine Versionsüberprüfungen ist nur über das Online-Update möglich.\nWollen Sie das ausgewählte Image trotzdem installieren? flashupdate.programmingflash programmiere Flash flashupdate.proxypassword Passwort flashupdate.proxypassword_hint1 Geben sie das Proxy-Passwort ein diff --git a/data/locale/english.locale b/data/locale/english.locale index 261d2e6c8..448b5fbeb 100644 --- a/data/locale/english.locale +++ b/data/locale/english.locale @@ -650,7 +650,7 @@ flashupdate.apply_settings Import current settings into new image? flashupdate.autocheck Auto-check updates on boot flashupdate.cantopenfile can't open file flashupdate.cantopenmtd can't open MTD -flashupdate.checkupdate_internet Check for online updates +flashupdate.checkupdate_internet Online update flashupdate.checkupdate_local Local update flashupdate.copy_image Copy Image to main memory flashupdate.createimage Save image @@ -704,7 +704,7 @@ flashupdate.namemode2_hostname_time +