scroll speed with up / down configurable (lines per click)

8 files changed, 43 insertions, 17 deletions

diff --git a/HISTORY b/HISTORY
index a3d22ec..0e5e860 100644
--- a/HISTORY
+++ b/HISTORY
@@ -423,4 +423,4 @@ Version 1.1.2
 
 - Restructured detailed EPG and recordings view
 - fixed naming of reruns tab when displaying recordings
-
+- scroll speed with up / down configurable (lines per click)
diff --git a/config.c b/config.c
index a2c13ab..982112b 100644
--- a/config.c
+++ b/config.c
@@ -115,6 +115,7 @@ void cNopacityConfig::LoadDefaults(void) {
     conf.insert(std::pair<std::string, int>("borderDetailedRecordings", 30));
     conf.insert(std::pair<std::string, int>("headerDetailedEPG", 20));
     conf.insert(std::pair<std::string, int>("headerDetailedRecordings", 20));
+    conf.insert(std::pair<std::string, int>("detailedViewScrollStep", 1));
     conf.insert(std::pair<std::string, int>("menuSchedulesWindowMode", 1));
     conf.insert(std::pair<std::string, int>("menuRecordingsWindowMode", 1));
     conf.insert(std::pair<std::string, int>("menuTimersWindowMode", 1));
diff --git a/detailview.c b/detailview.c
index 5d25200..aea4006 100644
--- a/detailview.c
+++ b/detailview.c
@@ -369,11 +369,15 @@ bool cNopacityView::KeyUp(void) {
         return false;

     int aktHeight = pixmapContent->DrawPort().Point().Y();

     int lineHeight = font->Height();

-    if (aktHeight < 0) {

-        pixmapContent->SetDrawPortPoint(cPoint(0, aktHeight + lineHeight));

-        return true;

+    if (aktHeight >= 0) {

+        return false;

     }

-    return false;

+    int step = config.GetValue("detailedViewScrollStep") * font->Height();

+    int newY = aktHeight + step;

+    if (newY > 0)

+        newY = 0;

+    pixmapContent->SetDrawPortPoint(cPoint(0, newY));

+    return true;

 }

 

 bool cNopacityView::KeyDown(void) { 

@@ -382,12 +386,16 @@ bool cNopacityView::KeyDown(void) {
     int aktHeight = pixmapContent->DrawPort().Point().Y();

     int totalHeight = pixmapContent->DrawPort().Height();

     int screenHeight = pixmapContent->ViewPort().Height();

-    int lineHeight = font->Height();

-    if (totalHeight - ((-1)*aktHeight) > screenHeight) {

-        pixmapContent->SetDrawPortPoint(cPoint(0, aktHeight - lineHeight));

-        return true;

-    }

-    return false;

+    

+    if (totalHeight - ((-1)*aktHeight) == screenHeight) {

+        return false;

+    } 

+    int step = config.GetValue("detailedViewScrollStep") * font->Height();

+    int newY = aktHeight - step;

+    if ((-1)*newY > totalHeight - screenHeight)

+        newY = (-1)*(totalHeight - screenHeight);

+    pixmapContent->SetDrawPortPoint(cPoint(0, newY));

+    return true;

 }

 

 /********************************************************************************************

@@ -791,7 +799,9 @@ void cNopacitySeriesView::Action(void) {
         osd->Flush();

         headerDrawn = true;

     }

-    SetTabs();

+    if (tabs.size() == 0) {

+        SetTabs();

+    }

     DrawTabs();

     int randomPoster = GetRandomPoster();

     switch (activeView) {

@@ -1026,7 +1036,9 @@ void cNopacityMovieView::Action(void) {
         osd->Flush();

         headerDrawn = true;

     }

-    SetTabs();

+    if (tabs.size() == 0) {

+        SetTabs();

+    }

     DrawTabs();

     bool posterAvailable = (movie.poster.path.size() > 0 && movie.poster.width > 0 && movie.poster.height > 0) ? true : false;

     switch (activeView) {

diff --git a/po/ca_ES.po b/po/ca_ES.po
index e286f27..d616f60 100644
--- a/po/ca_ES.po
+++ b/po/ca_ES.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: 2014-04-25 14:39+0200\n"
+"POT-Creation-Date: 2014-04-27 14:25+0200\n"
 "PO-Revision-Date: 2013-03-19 22:56+0100\n"
 "Last-Translator: Gabychan <gbonich@gmail.com>\n"
 "Language-Team: \n"
@@ -425,6 +425,9 @@ msgstr "Alçada Finestra Info EPG (% alçada OSD)"
 msgid "Border around detailed EPG view"
 msgstr "Vora al voltant de vista detallada EPG"
 
+msgid "Detailed EPG view Scroll Speed (number of lines)"
+msgstr ""
+
 msgid "Header Height detailed EPG view (Perc. of OSD Height)"
 msgstr ""
 
diff --git a/po/de_DE.po b/po/de_DE.po
index a778d11..365a4ef 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: 2014-04-25 14:39+0200\n"
+"POT-Creation-Date: 2014-04-27 14:25+0200\n"
 "PO-Revision-Date: 2012-11-11 17:49+0200\n"
 "Last-Translator: louis\n"
 "Language-Team: \n"
@@ -422,6 +422,9 @@ msgstr "Höhe des EPG Info Fensters (% der OSD Höhe)"
 msgid "Border around detailed EPG view"
 msgstr "Rahmen um detailierte EPG Ansicht"
 
+msgid "Detailed EPG view Scroll Speed (number of lines)"
+msgstr ""
+
 msgid "Header Height detailed EPG view (Perc. of OSD Height)"
 msgstr "Header Höhe im det. EPG Ansicht (% OSD Höhe)"
 
diff --git a/po/it_IT.po b/po/it_IT.po
index 5156c0a..ba64246 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: 2014-04-25 14:39+0200\n"
+"POT-Creation-Date: 2014-04-27 14:25+0200\n"
 "PO-Revision-Date: 2013-03-19 22:56+0100\n"
 "Last-Translator: Diego Pierotto <vdr-italian@tiscali.it>\n"
 "Language-Team: \n"
@@ -425,6 +425,9 @@ msgstr "Altezza di Finestra info EPG (% altezza OSD)"
 msgid "Border around detailed EPG view"
 msgstr ""
 
+msgid "Detailed EPG view Scroll Speed (number of lines)"
+msgstr ""
+
 msgid "Header Height detailed EPG view (Perc. of OSD Height)"
 msgstr ""
 
diff --git a/po/sk_SK.po b/po/sk_SK.po
index a8c902c..98fc397 100644
--- a/po/sk_SK.po
+++ b/po/sk_SK.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: vdr-skinnopacity\n"
 "Report-Msgid-Bugs-To: <see README>\n"
-"POT-Creation-Date: 2014-04-25 14:39+0200\n"
+"POT-Creation-Date: 2014-04-27 14:25+0200\n"
 "PO-Revision-Date: 2013-11-11 20:52+0100\n"
 "Last-Translator: Milan Hrala <hrala.milan@gmail.com>\n"
 "Language-Team: \n"
@@ -422,6 +422,9 @@ msgstr "Vý¹ka informaèného EPG okna (Percent z OSD vý¹ky)"
 msgid "Border around detailed EPG view"
 msgstr "Okraj okolo podrobného zobrazenia EPG"
 
+msgid "Detailed EPG view Scroll Speed (number of lines)"
+msgstr ""
+
 msgid "Header Height detailed EPG view (Perc. of OSD Height)"
 msgstr ""
 
diff --git a/setup.c b/setup.c
index 0735bb6..d7c219a 100644
--- a/setup.c
+++ b/setup.c
@@ -252,6 +252,7 @@ void cNopacitySetupMenuDisplaySchedules::Set(void) {
     Add(new cMenuEditStraItem(tr("EPG Window Text Scrolling Speed"), tmpConf->GetValueRef("menuInfoScrollSpeed"), 4, scrollSpeed));
     Add(new cMenuEditIntItem(tr("Height of EPG Info Window (Percent of OSD Height)"), tmpConf->GetValueRef("menuHeightInfoWindow"), 10, 100));
     Add(new cMenuEditIntItem(tr("Border around detailed EPG view"), tmpConf->GetValueRef("borderDetailedEPG"), 1, 300));
+    Add(new cMenuEditIntItem(tr("Detailed EPG view Scroll Speed (number of lines)"), tmpConf->GetValueRef("detailedViewScrollStep"), 1, 30));
     Add(new cMenuEditIntItem(tr("Header Height detailed EPG view (Perc. of OSD Height)"), tmpConf->GetValueRef("headerDetailedEPG"), 10, 50));
     Add(new cMenuEditBoolItem(tr("Display Reruns in detailed EPG View"), tmpConf->GetValueRef("displayRerunsDetailEPGView")));
     if (tmpConf->GetValue("displayRerunsDetailEPGView")) {