[Mediaportal-svn] r27829 - in branches/ajp8164_13: . Tools/InstallationScripts/include TvEngine3/TVLibrary/TVServer.Base/TuningParameters/dvbt TvEngine3/TVLibrary/TvPlugin/TvPlugin mediaportal/Configuration/Resources mediaportal/MediaPortal.Base/skin/Blue3 mediaportal/MediaPortal.Base/skin/Blue3/Media mediaportal/MediaPortal.Base/skin/Blue3wide mediaportal/MiniDisplayLibrary mediaportal/ProcessPlugins/MiniDisplay

[<aj...@su...>]

Author: ajp5199
Date: 2011-04-23 00:17:48 +0200 (Sat, 23 Apr 2011)
New Revision: 27829

Added:
   branches/ajp8164_13/TvEngine3/TVLibrary/TVServer.Base/TuningParameters/dvbt/Portugal.All Regions.xml
Modified:
   branches/ajp8164_13/
   branches/ajp8164_13/Tools/InstallationScripts/include/MediaPortalCurrentVersion.nsh
   branches/ajp8164_13/TvEngine3/TVLibrary/TVServer.Base/TuningParameters/dvbt/UK.Sandy Heath.xml
   branches/ajp8164_13/TvEngine3/TVLibrary/TvPlugin/TvPlugin/TVConflictDialog.cs
   branches/ajp8164_13/TvEngine3/TVLibrary/TvPlugin/TvPlugin/TVNotifyYesNoDialog.cs
   branches/ajp8164_13/TvEngine3/TVLibrary/TvPlugin/TvPlugin/TVProgramDescription.cs
   branches/ajp8164_13/TvEngine3/TVLibrary/TvPlugin/TvPlugin/TvSetup.cs
   branches/ajp8164_13/mediaportal/Configuration/Resources/remote.Mce2004.png
   branches/ajp8164_13/mediaportal/Configuration/Resources/remote.Mce2005TT.png
   branches/ajp8164_13/mediaportal/MediaPortal.Base/skin/Blue3/
   branches/ajp8164_13/mediaportal/MediaPortal.Base/skin/Blue3/Media/hover_LastFmRadio.png
   branches/ajp8164_13/mediaportal/MediaPortal.Base/skin/Blue3wide/
   branches/ajp8164_13/mediaportal/MiniDisplayLibrary/
   branches/ajp8164_13/mediaportal/ProcessPlugins/MiniDisplay/MiniDisplay.lcd.gif
   branches/ajp8164_13/mediaportal/ProcessPlugins/MiniDisplay/MiniDisplay.lcd_deactivated.gif
Log:
Update with merges from trunk.


Property changes on: branches/ajp8164_13
___________________________________________________________________
Modified: svn:mergeinfo
   - /trunk:27133-27822
   + /trunk:27133-27828

Modified: branches/ajp8164_13/Tools/InstallationScripts/include/MediaPortalCurrentVersion.nsh
===================================================================
--- branches/ajp8164_13/Tools/InstallationScripts/include/MediaPortalCurrentVersion.nsh	2011-04-22 21:06:09 UTC (rev 27828)
+++ branches/ajp8164_13/Tools/InstallationScripts/include/MediaPortalCurrentVersion.nsh	2011-04-22 22:17:48 UTC (rev 27829)
@@ -32,7 +32,7 @@
 
 !define VER_MAJOR       1
 !define VER_MINOR       1
-!define VER_REVISION    6
+!define VER_REVISION    7
 !ifndef VER_BUILD
     !define VER_BUILD   0
 !endif

Copied: branches/ajp8164_13/TvEngine3/TVLibrary/TVServer.Base/TuningParameters/dvbt/Portugal.All Regions.xml (from rev 27828, trunk/TvEngine3/TVLibrary/TVServer.Base/TuningParameters/dvbt/Portugal.All Regions.xml)
===================================================================
--- branches/ajp8164_13/TvEngine3/TVLibrary/TVServer.Base/TuningParameters/dvbt/Portugal.All Regions.xml	                        (rev 0)
+++ branches/ajp8164_13/TvEngine3/TVLibrary/TVServer.Base/TuningParameters/dvbt/Portugal.All Regions.xml	2011-04-22 22:17:48 UTC (rev 27829)
@@ -0,0 +1,248 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ArrayOfDVBTTuning xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+  <DVBTTuning>
+    <Frequency>474000</Frequency>
+    <BandWidth>8</BandWidth>
+    <Offset>125</Offset>
+  </DVBTTuning>
+  <DVBTTuning>
+    <Frequency>482000</Frequency>
+    <BandWidth>8</BandWidth>
+    <Offset>125</Offset>
+  </DVBTTuning>
+  <DVBTTuning>
+    <Frequency>490000</Frequency>
+    <BandWidth>8</BandWidth>
+    <Offset>125</Offset>
+  </DVBTTuning>
+  <DVBTTuning>
+    <Frequency>498000</Frequency>
+    <BandWidth>8</BandWidth>
+    <Offset>125</Offset>
+  </DVBTTuning>
+  <DVBTTuning>
+    <Frequency>506000</Frequency>
+    <BandWidth>8</BandWidth>
+    <Offset>125</Offset>
+  </DVBTTuning>
+  <DVBTTuning>
+    <Frequency>514000</Frequency>
+    <BandWidth>8</BandWidth>
+    <Offset>125</Offset>
+  </DVBTTuning>
+  <DVBTTuning>
+    <Frequency>522000</Frequency>
+    <BandWidth>8</BandWidth>
+    <Offset>125</Offset>
+  </DVBTTuning>
+  <DVBTTuning>
+    <Frequency>530000</Frequency>
+    <BandWidth>8</BandWidth>
+    <Offset>125</Offset>
+  </DVBTTuning>
+  <DVBTTuning>
+    <Frequency>538000</Frequency>
+    <BandWidth>8</BandWidth>
+    <Offset>125</Offset>
+  </DVBTTuning>
+  <DVBTTuning>
+    <Frequency>546000</Frequency>
+    <BandWidth>8</BandWidth>
+    <Offset>125</Offset>
+  </DVBTTuning>
+  <DVBTTuning>
+    <Frequency>554000</Frequency>
+    <BandWidth>8</BandWidth>
+    <Offset>125</Offset>
+  </DVBTTuning>
+  <DVBTTuning>
+    <Frequency>562000</Frequency>
+    <BandWidth>8</BandWidth>
+    <Offset>125</Offset>
+  </DVBTTuning>
+  <DVBTTuning>
+    <Frequency>570000</Frequency>
+    <BandWidth>8</BandWidth>
+    <Offset>125</Offset>
+  </DVBTTuning>
+  <DVBTTuning>
+    <Frequency>578000</Frequency>
+    <BandWidth>8</BandWidth>
+    <Offset>125</Offset>
+  </DVBTTuning>
+  <DVBTTuning>
+    <Frequency>586000</Frequency>
+    <BandWidth>8</BandWidth>
+    <Offset>125</Offset>
+  </DVBTTuning>
+  <DVBTTuning>
+    <Frequency>594000</Frequency>
+    <BandWidth>8</BandWidth>
+    <Offset>125</Offset>
+  </DVBTTuning>
+  <DVBTTuning>
+    <Frequency>602000</Frequency>
+    <BandWidth>8</BandWidth>
+    <Offset>125</Offset>
+  </DVBTTuning>
+  <DVBTTuning>
+    <Frequency>610000</Frequency>
+    <BandWidth>8</BandWidth>
+    <Offset>125</Offset>
+  </DVBTTuning>
+  <DVBTTuning>
+    <Frequency>618000</Frequency>
+    <BandWidth>8</BandWidth>
+    <Offset>125</Offset>
+  </DVBTTuning>
+  <DVBTTuning>
+    <Frequency>626000</Frequency>
+    <BandWidth>8</BandWidth>
+    <Offset>125</Offset>
+  </DVBTTuning>
+  <DVBTTuning>
+    <Frequency>634000</Frequency>
+    <BandWidth>8</BandWidth>
+    <Offset>125</Offset>
+  </DVBTTuning>
+  <DVBTTuning>
+    <Frequency>642000</Frequency>
+    <BandWidth>8</BandWidth>
+    <Offset>125</Offset>
+  </DVBTTuning>
+  <DVBTTuning>
+    <Frequency>650000</Frequency>
+    <BandWidth>8</BandWidth>
+    <Offset>125</Offset>
+  </DVBTTuning>
+  <DVBTTuning>
+    <Frequency>658000</Frequency>
+    <BandWidth>8</BandWidth>
+    <Offset>125</Offset>
+  </DVBTTuning>
+  <DVBTTuning>
+    <Frequency>666000</Frequency>
+    <BandWidth>8</BandWidth>
+    <Offset>125</Offset>
+  </DVBTTuning>
+  <DVBTTuning>
+    <Frequency>674000</Frequency>
+    <BandWidth>8</BandWidth>
+    <Offset>125</Offset>
+  </DVBTTuning>
+  <DVBTTuning>
+    <Frequency>682000</Frequency>
+    <BandWidth>8</BandWidth>
+    <Offset>125</Offset>
+  </DVBTTuning>
+  <DVBTTuning>
+    <Frequency>690000</Frequency>
+    <BandWidth>8</BandWidth>
+    <Offset>125</Offset>
+  </DVBTTuning>
+  <DVBTTuning>
+    <Frequency>698000</Frequency>
+    <BandWidth>8</BandWidth>
+    <Offset>125</Offset>
+  </DVBTTuning>
+  <DVBTTuning>
+    <Frequency>706000</Frequency>
+    <BandWidth>8</BandWidth>
+    <Offset>125</Offset>
+  </DVBTTuning>
+  <DVBTTuning>
+    <Frequency>714000</Frequency>
+    <BandWidth>8</BandWidth>
+    <Offset>125</Offset>
+  </DVBTTuning>
+  <DVBTTuning>
+    <Frequency>722000</Frequency>
+    <BandWidth>8</BandWidth>
+    <Offset>125</Offset>
+  </DVBTTuning>
+  <DVBTTuning>
+    <Frequency>730000</Frequency>
+    <BandWidth>8</BandWidth>
+    <Offset>125</Offset>
+  </DVBTTuning>
+  <DVBTTuning>
+    <Frequency>738000</Frequency>
+    <BandWidth>8</BandWidth>
+    <Offset>125</Offset>
+  </DVBTTuning>
+  <DVBTTuning>
+    <Frequency>746000</Frequency>
+    <BandWidth>8</BandWidth>
+    <Offset>125</Offset>
+  </DVBTTuning>
+  <DVBTTuning>
+    <Frequency>754000</Frequency>
+    <BandWidth>8</BandWidth>
+    <Offset>125</Offset>
+  </DVBTTuning>
+  <DVBTTuning>
+    <Frequency>762000</Frequency>
+    <BandWidth>8</BandWidth>
+    <Offset>125</Offset>
+  </DVBTTuning>
+  <DVBTTuning>
+    <Frequency>777000</Frequency>
+    <BandWidth>8</BandWidth>
+    <Offset>125</Offset>
+  </DVBTTuning>
+  <DVBTTuning>
+    <Frequency>778000</Frequency>
+    <BandWidth>8</BandWidth>
+    <Offset>125</Offset>
+  </DVBTTuning>
+  <DVBTTuning>
+	<Frequency>786000</Frequency>
+    <BandWidth>8</BandWidth>
+    <Offset>125</Offset>
+  </DVBTTuning>
+  <DVBTTuning>
+    <Frequency>794000</Frequency>
+    <BandWidth>8</BandWidth>
+    <Offset>125</Offset>
+  </DVBTTuning>
+  <DVBTTuning>
+    <Frequency>802000</Frequency>
+    <BandWidth>8</BandWidth>
+    <Offset>125</Offset>
+  </DVBTTuning>
+  <DVBTTuning>
+    <Frequency>810000</Frequency>
+    <BandWidth>8</BandWidth>
+    <Offset>125</Offset>
+  </DVBTTuning>
+  <DVBTTuning>
+    <Frequency>818000</Frequency>
+    <BandWidth>8</BandWidth>
+    <Offset>125</Offset>
+  </DVBTTuning>
+  <DVBTTuning>
+    <Frequency>826000</Frequency>
+    <BandWidth>8</BandWidth>
+    <Offset>125</Offset>
+  </DVBTTuning>
+  <DVBTTuning>
+    <Frequency>834000</Frequency>
+    <BandWidth>8</BandWidth>
+    <Offset>125</Offset>
+  </DVBTTuning>
+  <DVBTTuning>
+    <Frequency>842000</Frequency>
+    <BandWidth>8</BandWidth>
+    <Offset>125</Offset>
+  </DVBTTuning>
+  <DVBTTuning>
+    <Frequency>850000</Frequency>
+    <BandWidth>8</BandWidth>
+    <Offset>125</Offset>
+  </DVBTTuning>
+  <DVBTTuning>
+    <Frequency>858000</Frequency>
+    <BandWidth>8</BandWidth>
+    <Offset>125</Offset>
+  </DVBTTuning>
+</ArrayOfDVBTTuning>
\ No newline at end of file

Modified: branches/ajp8164_13/TvEngine3/TVLibrary/TVServer.Base/TuningParameters/dvbt/UK.Sandy Heath.xml
===================================================================
--- branches/ajp8164_13/TvEngine3/TVLibrary/TVServer.Base/TuningParameters/dvbt/UK.Sandy Heath.xml	2011-04-22 21:06:09 UTC (rev 27828)
+++ branches/ajp8164_13/TvEngine3/TVLibrary/TVServer.Base/TuningParameters/dvbt/UK.Sandy Heath.xml	2011-04-22 22:17:48 UTC (rev 27829)
@@ -41,6 +41,11 @@
     <Offset>167</Offset>
   </DVBTTuning>
   <DVBTTuning>
+    <Frequency>706000</Frequency>
+    <BandWidth>8</BandWidth>
+    <Offset>167</Offset>
+  </DVBTTuning>
+  <DVBTTuning>
     <Frequency>714000</Frequency>
     <BandWidth>8</BandWidth>
     <Offset>167</Offset>
@@ -50,4 +55,34 @@
     <BandWidth>8</BandWidth>
     <Offset>167</Offset>
   </DVBTTuning>
+  <DVBTTuning>
+    <Frequency>730000</Frequency>
+    <BandWidth>8</BandWidth>
+    <Offset>167</Offset>
+  </DVBTTuning>
+  <DVBTTuning>
+    <Frequency>746000</Frequency>
+    <BandWidth>8</BandWidth>
+    <Offset>167</Offset>
+  </DVBTTuning>
+  <DVBTTuning>
+    <Frequency>762000</Frequency>
+    <BandWidth>8</BandWidth>
+    <Offset>167</Offset>
+  </DVBTTuning>
+  <DVBTTuning>
+    <Frequency>778000</Frequency>
+    <BandWidth>8</BandWidth>
+    <Offset>167</Offset>
+  </DVBTTuning>
+  <DVBTTuning>
+    <Frequency>785000</Frequency>
+    <BandWidth>8</BandWidth>
+    <Offset>167</Offset>
+  </DVBTTuning>
+  <DVBTTuning>
+    <Frequency>842000</Frequency>
+    <BandWidth>8</BandWidth>
+    <Offset>167</Offset>
+  </DVBTTuning>
 </ArrayOfDVBTTuning>
\ No newline at end of file


Property changes on: branches/ajp8164_13/TvEngine3/TVLibrary/TvPlugin/TvPlugin/TVConflictDialog.cs
___________________________________________________________________
Modified: svn:mergeinfo
   - /trunk/TvEngine3/TVLibrary/TvPlugin/TvPlugin/TVConflictDialog.cs:2-27822
   + /trunk/TvEngine3/TVLibrary/TvPlugin/TvPlugin/TVConflictDialog.cs:2-27828


Property changes on: branches/ajp8164_13/TvEngine3/TVLibrary/TvPlugin/TvPlugin/TVNotifyYesNoDialog.cs
___________________________________________________________________
Modified: svn:mergeinfo
   - /trunk/TvEngine3/TVLibrary/TvPlugin/TvPlugin/TVNotifyYesNoDialog.cs:2-27822
   + /trunk/TvEngine3/TVLibrary/TvPlugin/TvPlugin/TVNotifyYesNoDialog.cs:2-27828


Property changes on: branches/ajp8164_13/TvEngine3/TVLibrary/TvPlugin/TvPlugin/TVProgramDescription.cs
___________________________________________________________________
Modified: svn:mergeinfo
   - /trunk/TvEngine3/TVLibrary/TvPlugin/TvPlugin/TVProgramDescription.cs:2-27822
   + /trunk/TvEngine3/TVLibrary/TvPlugin/TvPlugin/TVProgramDescription.cs:2-27828


Property changes on: branches/ajp8164_13/TvEngine3/TVLibrary/TvPlugin/TvPlugin/TvSetup.cs
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/ajp8164_stage/TvEngine3/TVLibrary/TvPlugin/TvPlugin/TvSetup.cs:23820-26119
/trunk/TvEngine3/TVLibrary/TvPlugin/TvPlugin/TvSetup.cs:2-11022,27133-27822
   + /branches/ajp8164_stage/TvEngine3/TVLibrary/TvPlugin/TvPlugin/TvSetup.cs:23820-26119
/trunk/TvEngine3/TVLibrary/TvPlugin/TvPlugin/TvSetup.cs:2-11022,27133-27828


Property changes on: branches/ajp8164_13/mediaportal/Configuration/Resources/remote.Mce2004.png
___________________________________________________________________
Modified: svn:mergeinfo
   - /trunk/mediaportal/Configuration/Resources/remote.Mce2004.png:2-20702,27133-27822
   + /trunk/mediaportal/Configuration/Resources/remote.Mce2004.png:2-20702,27133-27828


Property changes on: branches/ajp8164_13/mediaportal/Configuration/Resources/remote.Mce2005TT.png
___________________________________________________________________
Modified: svn:mergeinfo
   - /trunk/mediaportal/Configuration/Resources/remote.Mce2005TT.png:2-20702,27133-27822
   + /trunk/mediaportal/Configuration/Resources/remote.Mce2005TT.png:2-20702,27133-27828


Property changes on: branches/ajp8164_13/mediaportal/MediaPortal.Base/skin/Blue3
___________________________________________________________________
Modified: svn:mergeinfo
   - /trunk/mediaportal/MediaPortal.Base/skin/Blue3:27782-27822
   + /trunk/mediaportal/MediaPortal.Base/skin/Blue3:27782-27828


Property changes on: branches/ajp8164_13/mediaportal/MediaPortal.Base/skin/Blue3/Media/hover_LastFmRadio.png
___________________________________________________________________
Modified: svn:mergeinfo
   - /trunk/mediaportal/MediaPortal.Base/skin/Blue3/Media/hover_LastFmRadio.png:2-20432,20623-21894,27133-27822
   + /trunk/mediaportal/MediaPortal.Base/skin/Blue3/Media/hover_LastFmRadio.png:2-20432,20623-21894,27133-27828


Property changes on: branches/ajp8164_13/mediaportal/MediaPortal.Base/skin/Blue3wide
___________________________________________________________________
Modified: svn:mergeinfo
   - /trunk/mediaportal/MediaPortal.Base/skin/Blue3wide:27782-27822
   + /trunk/mediaportal/MediaPortal.Base/skin/Blue3wide:27782-27828


Property changes on: branches/ajp8164_13/mediaportal/MiniDisplayLibrary
___________________________________________________________________
Modified: svn:mergeinfo
   - /trunk/mediaportal/MiniDisplayLibrary:2-20901,27133-27822
   + /trunk/mediaportal/MiniDisplayLibrary:2-20901,27133-27828


Property changes on: branches/ajp8164_13/mediaportal/ProcessPlugins/MiniDisplay/MiniDisplay.lcd.gif
___________________________________________________________________
Modified: svn:mergeinfo
   - /trunk/mediaportal/ProcessPlugins/MiniDisplay/MiniDisplay.lcd.gif:2-20901,27133-27822
   + /trunk/mediaportal/ProcessPlugins/MiniDisplay/MiniDisplay.lcd.gif:2-20901,27133-27828


Property changes on: branches/ajp8164_13/mediaportal/ProcessPlugins/MiniDisplay/MiniDisplay.lcd_deactivated.gif
___________________________________________________________________
Modified: svn:mergeinfo
   - /trunk/mediaportal/ProcessPlugins/MiniDisplay/MiniDisplay.lcd_deactivated.gif:2-20901,27133-27822
   + /trunk/mediaportal/ProcessPlugins/MiniDisplay/MiniDisplay.lcd_deactivated.gif:2-20901,27133-27828