Skip to content
This repository
Browse code

[pvr] invert pvrplayback.confirmchannelswitch setting, and use the va…

…lue of pvrplayback.channelentrytimeout as autoclose value. closes #13480
  • Loading branch information...
commit adb0a32f30ed116ca49191917184f4fb07b79f3b 1 parent 4bbf77e
Lars Op den Kamp authored November 21, 2012
8  language/English/strings.po
@@ -7006,9 +7006,7 @@ msgctxt "#19167"
7006 7006
 msgid "Scan for missing icons"
7007 7007
 msgstr ""
7008 7008
 
7009  
-msgctxt "#19168"
7010  
-msgid "Switch channel without pressing OK"
7011  
-msgstr ""
  7009
+#empty string with id 19168
7012 7010
 
7013 7011
 msgctxt "#19169"
7014 7012
 msgid "Hide video information box"
@@ -7462,6 +7460,10 @@ msgctxt "#19280"
7462 7460
 msgid "Client specific settings"
7463 7461
 msgstr ""
7464 7462
 
  7463
+msgctxt "#19281"
  7464
+msgid "Confirm channel switches by pressing OK"
  7465
+msgstr ""
  7466
+
7465 7467
 #empty strings from id 19281 to 19498
7466 7468
 
7467 7469
 msgctxt "#19499"
2  xbmc/settings/GUISettings.cpp
@@ -975,10 +975,10 @@ void CGUISettings::Initialize()
975 975
   CSettingsCategory* pvrp = AddCategory(SETTINGS_PVR, "pvrplayback", 19177);
976 976
   AddBool(pvrp, "pvrplayback.playminimized", 19171, true);
977 977
   AddInt(pvrp, "pvrplayback.startlast", 19189, START_LAST_CHANNEL_OFF, START_LAST_CHANNEL_OFF, 1, START_LAST_CHANNEL_ON, SPIN_CONTROL_TEXT);
978  
-  AddBool(pvrp, "pvrplayback.switchautoclose", 19168, true);
979 978
   AddBool(pvrp, "pvrplayback.signalquality", 19037, true);
980 979
   AddSeparator(pvrp, "pvrplayback.sep1");
981 980
   AddInt(pvrp, "pvrplayback.scantime", 19170, 10, 1, 1, 60, SPIN_CONTROL_INT_PLUS, MASK_SECS);
  981
+  AddBool(pvrp, "pvrplayback.confirmchannelswitch", 19281, false);
982 982
   AddInt(pvrp, "pvrplayback.channelentrytimeout", 19073, 0, 0, 250, 2000, SPIN_CONTROL_INT_PLUS, MASK_MS);
983 983
 
984 984
   CSettingsCategory* pvrr = AddCategory(SETTINGS_PVR, "pvrrecord", 19043);
2  xbmc/video/windows/GUIWindowFullScreen.cpp
@@ -396,7 +396,7 @@ bool CGUIWindowFullScreen::OnAction(const CAction &action)
396 396
         }
397 397
         else
398 398
         {
399  
-          int autoCloseTime = g_guiSettings.GetBool("pvrplayback.switchautoclose") ? 1500 : 0;
  399
+          int autoCloseTime = g_guiSettings.GetBool("pvrplayback.confirmchannelswitch") ? 0 : g_guiSettings.GetInt("pvrplayback.channelentrytimeout");
400 400
           CStdString strChannel;
401 401
           strChannel.Format("%i", action.GetID() - REMOTE_0);
402 402
           if (CGUIDialogNumeric::ShowAndGetNumber(strChannel, g_localizeStrings.Get(19000), autoCloseTime) || autoCloseTime)

0 notes on commit adb0a32

Please sign in to comment.
Something went wrong with that request. Please try again.