XBMC Media Center

Revision: 8685
          http://svn.sourceforge.net/xbmc/?rev=8685&view=rev
Author:   jmarshallnz
Date:     2007-04-28 15:28:52 -0700 (Sat, 28 Apr 2007)

Log Message:
-----------
fixed: Slash at end of filefolders (eg playlists) in getMediaLocation().

Modified Paths:
--------------
    trunk/XBMC/xbmc/lib/libGoAhead/XBMChttp.cpp

Modified: trunk/XBMC/xbmc/lib/libGoAhead/XBMChttp.cpp
===================================================================
--- trunk/XBMC/xbmc/lib/libGoAhead/XBMChttp.cpp	2007-04-28 18:58:52 UTC (rev 8684)
+++ trunk/XBMC/xbmc/lib/libGoAhead/XBMChttp.cpp	2007-04-28 22:28:52 UTC (rev 8685)
@@ -759,7 +759,7 @@
     CStdString strPath = item->m_strPath;
     strPath.Replace(";",";;");
     CStdString strFolder = "0";
-    if (item->m_bIsFolder)
+    if (item->m_bIsFolder && !item->IsFileFolder())
     {
       if (!CUtil::HasSlashAtEnd(strPath))
         CUtil::AddSlashAtEnd(strPath);


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 8684
          http://svn.sourceforge.net/xbmc/?rev=8684&view=rev
Author:   jezz_x
Date:     2007-04-28 11:58:52 -0700 (Sat, 28 Apr 2007)

Log Message:
-----------
Added : PM3 Music rating Stars to Full screen Visualization Music Info.  Also added too Following Media view types when sorted by rating "List, List2, Album and  BigList" 

Modified Paths:
--------------
    trunk/XBMC/skin/Project Mayhem III/PAL/CommonViewTypes.xml
    trunk/XBMC/skin/Project Mayhem III/PAL/MusicVisualisation.xml
    trunk/XBMC/skin/Project Mayhem III/PAL16x9/CommonViewTypes.xml
    trunk/XBMC/skin/Project Mayhem III/PAL16x9/MusicVisualisation.xml

Added Paths:
-----------
    trunk/XBMC/skin/Project Mayhem III/media/songrating0.png
    trunk/XBMC/skin/Project Mayhem III/media/songrating1.png
    trunk/XBMC/skin/Project Mayhem III/media/songrating2.png
    trunk/XBMC/skin/Project Mayhem III/media/songrating3.png
    trunk/XBMC/skin/Project Mayhem III/media/songrating4.png
    trunk/XBMC/skin/Project Mayhem III/media/songrating5.png

Modified: trunk/XBMC/skin/Project Mayhem III/PAL/CommonViewTypes.xml
===================================================================
--- trunk/XBMC/skin/Project Mayhem III/PAL/CommonViewTypes.xml	2007-04-28 17:17:02 UTC (rev 8683)
+++ trunk/XBMC/skin/Project Mayhem III/PAL/CommonViewTypes.xml	2007-04-28 18:58:52 UTC (rev 8684)
@@ -31,6 +31,7 @@
 					<include>listselectedcolor</include>
 					<align>left</align>
 					<info>ListItem.Label</info>
+					<visible>!Container.Sort(SongRating)</visible>
 				</control>
 				<control type="label">
 					<posx>475</posx>
@@ -43,7 +44,31 @@
 					<textcolor>60ffffff</textcolor>
 					<align>right</align>
 					<info>ListItem.Label2</info>
+					<visible>!Container.Sort(SongRating)</visible>
 				</control>
+				<control type="label">
+					<posx>30</posx>
+					<posy>3</posy>
+					<width>345</width>
+					<height>22</height>
+					<font>font13</font>
+					<aligny>center</aligny>
+					<include>listselectedcolor</include>
+					<align>left</align>
+					<info>ListItem.Label</info>
+					<visible>Container.Sort(SongRating)</visible>
+				</control>
+				<control type="image" id="1">
+					<description>Song Rating Image</description>
+					<height>21</height>
+					<width>121</width>
+					<posx>380</posx>
+					<posy>4</posy>
+					<info>listitem.rating</info>
+					<aspectratio>stretch</aspectratio>
+					<texture flipx="true" /> 
+					<visible>Container.Sort(SongRating)</visible>
+				</control>
 			</itemlayout>
 			<focusedlayout height="29">
 				<control type="image">
@@ -66,11 +91,12 @@
 					<posy>3</posy>
 					<width>430</width>
 					<height>22</height>
+					<font>font13</font>
 					<aligny>center</aligny>
-					<font>font13</font>
 					<include>listselectedcolor</include>
 					<align>left</align>
 					<info>ListItem.Label</info>
+					<visible>!Container.Sort(SongRating)</visible>
 				</control>
 				<control type="label">
 					<posx>475</posx>
@@ -83,7 +109,31 @@
 					<textcolor>60ffffff</textcolor>
 					<align>right</align>
 					<info>ListItem.Label2</info>
+					<visible>!Container.Sort(SongRating)</visible>
 				</control>
+				<control type="label">
+					<posx>30</posx>
+					<posy>3</posy>
+					<width>345</width>
+					<height>22</height>
+					<font>font13</font>
+					<aligny>center</aligny>
+					<include>listselectedcolor</include>
+					<align>left</align>
+					<info>ListItem.Label</info>
+					<visible>Container.Sort(SongRating)</visible>
+				</control>
+				<control type="image" id="1">
+					<description>Song Rating Image</description>
+					<height>21</height>
+					<width>121</width>
+					<posx>380</posx>
+					<posy>4</posy>
+					<info>listitem.rating</info>
+					<aspectratio>stretch</aspectratio>
+					<texture flipx="true" /> 
+					<visible>Container.Sort(SongRating)</visible>
+				</control>
 			</focusedlayout>
 		</control>
 	</include>
@@ -289,7 +339,19 @@
 					<aligny>center</aligny>
 					<include>listselectedcolor</include>
 					<info>ListItem.Label2</info>
+					<visible>!Container.Sort(SongRating)</visible>
 				</control>
+				<control type="image" id="1">
+					<description>Song Rating Image</description>
+					<height>21</height>
+					<width>126</width>
+					<posx>375</posx>
+					<posy>110</posy>
+					<info>listitem.rating</info>
+					<aspectratio>stretch</aspectratio>
+					<texture flipx="true" /> 
+					<visible>Container.Sort(SongRating)</visible>
+				</control>
 			</itemlayout>
 			<focusedlayout height="141">
 				<control type="image">
@@ -365,7 +427,19 @@
 					<aligny>center</aligny>
 					<include>listselectedcolor</include>
 					<info>ListItem.Label2</info>
+					<visible>!Container.Sort(SongRating)</visible>
 				</control>
+				<control type="image" id="1">
+					<description>Song Rating Image</description>
+					<height>21</height>
+					<width>126</width>
+					<posx>375</posx>
+					<posy>110</posy>
+					<info>listitem.rating</info>
+					<aspectratio>stretch</aspectratio>
+					<texture flipx="true" /> 
+					<visible>Container.Sort(SongRating)</visible>
+				</control>
 			</focusedlayout>
 		</control>
 	</include>
@@ -912,6 +986,7 @@
 					<include>listselectedcolor</include>
 					<align>left</align>
 					<info>ListItem.Label</info>
+					<visible>!Container.Sort(SongRating)</visible>
 				</control>
 				<control type="label">
 					<posx>475</posx>
@@ -924,7 +999,31 @@
 					<textcolor>60ffffff</textcolor>
 					<align>right</align>
 					<info>ListItem.Label2</info>
+					<visible>!Container.Sort(SongRating)</visible>
 				</control>
+				<control type="label">
+					<posx>30</posx>
+					<posy>3</posy>
+					<width>345</width>
+					<height>22</height>
+					<font>font13</font>
+					<aligny>center</aligny>
+					<include>listselectedcolor</include>
+					<align>left</align>
+					<info>ListItem.Label</info>
+					<visible>Container.Sort(SongRating)</visible>
+				</control>
+				<control type="image" id="1">
+					<description>Song Rating Image</description>
+					<height>21</height>
+					<width>121</width>
+					<posx>380</posx>
+					<posy>4</posy>
+					<info>listitem.rating</info>
+					<aspectratio>stretch</aspectratio>
+					<texture flipx="true" /> 
+					<visible>Container.Sort(SongRating)</visible>
+				</control>
 			</itemlayout>
 			<focusedlayout height="75">
 				<control type="image">
@@ -978,7 +1077,19 @@
 					<aligny>center</aligny>
 					<include>listselectedcolor</include>
 					<info>ListItem.Label2</info>
+					<visible>!Container.Sort(SongRating)</visible>
 				</control>
+				<control type="image" id="1">
+					<description>Song Rating Image</description>
+					<height>21</height>
+					<width>121</width>
+					<posx>380</posx>
+					<posy>52</posy>
+					<info>listitem.rating</info>
+					<aspectratio>stretch</aspectratio>
+					<texture flipx="true" /> 
+					<visible>Container.Sort(SongRating)</visible>
+				</control>
 			</focusedlayout>
 		</control>
 	</include>
@@ -1653,9 +1764,19 @@
 			<include>textcolorlightgrey</include>
 			<scroll>true</scroll>
 			<info>ListItem.Label2</info>
-			<visible>Control.IsVisible(56)</visible>
+			<visible>!Container.Sort(SongRating) + Control.IsVisible(56)</visible>
 			<include>contentpanelslide</include>
 		</control>
+		<control type="image" id="1">
+			<description>Song Rating Image</description>
+			<height>21</height>
+			<width>121</width>
+			<posx>238</posx>
+			<posy>495</posy>
+			<info>listitem.rating</info>
+			<visible>Container.Sort(SongRating) + Control.IsVisible(56)</visible>
+			<include>contentpanelslide</include>
+		</control>
 	</include>
 	<include name="VideoLibraryWideIcon_Small">
 		<control type="list" id="57">

Modified: trunk/XBMC/skin/Project Mayhem III/PAL/MusicVisualisation.xml
===================================================================
--- trunk/XBMC/skin/Project Mayhem III/PAL/MusicVisualisation.xml	2007-04-28 17:17:02 UTC (rev 8683)
+++ trunk/XBMC/skin/Project Mayhem III/PAL/MusicVisualisation.xml	2007-04-28 18:58:52 UTC (rev 8684)
@@ -111,15 +111,23 @@
 				<align>left</align>
 				<font>special13</font>
 			</control>
-			<control type="label" id="1">
+			<control type="fadelabel" id="1">
 				<description>Album label</description>
-				<width>500</width>
+				<width>380</width>
 				<posx>180</posx>
 				<posy>60</posy>
 				<info>MusicPlayer.Album</info>
 				<align>left</align>
 				<font>font10</font>
 			</control>
+			<control type="image" id="1">
+				<description>Song Rating Image</description>
+				<height>20</height>
+				<width>120</width>
+				<posx>565</posx>
+				<posy>55</posy>
+				<info>musicplayer.rating</info>
+			</control>
 			<control type="label" id="1">
 				<description>time label</description>
 				<width>430</width>

Modified: trunk/XBMC/skin/Project Mayhem III/PAL16x9/CommonViewTypes.xml
===================================================================
--- trunk/XBMC/skin/Project Mayhem III/PAL16x9/CommonViewTypes.xml	2007-04-28 17:17:02 UTC (rev 8683)
+++ trunk/XBMC/skin/Project Mayhem III/PAL16x9/CommonViewTypes.xml	2007-04-28 18:58:52 UTC (rev 8684)
@@ -31,6 +31,7 @@
 					<include>listselectedcolor</include>
 					<align>left</align>
 					<info>ListItem.Label</info>
+					<visible>!Container.Sort(SongRating)</visible>
 				</control>
 				<control type="label">
 					<posx>475</posx>
@@ -43,7 +44,31 @@
 					<textcolor>60ffffff</textcolor>
 					<align>right</align>
 					<info>ListItem.Label2</info>
+					<visible>!Container.Sort(SongRating)</visible>
 				</control>
+				<control type="label">
+					<posx>30</posx>
+					<posy>3</posy>
+					<width>360</width>
+					<height>22</height>
+					<font>font13</font>
+					<aligny>center</aligny>
+					<include>listselectedcolor</include>
+					<align>left</align>
+					<info>ListItem.Label</info>
+					<visible>Container.Sort(SongRating)</visible>
+				</control>
+				<control type="image" id="1">
+					<description>Song Rating Image</description>
+					<height>21</height>
+					<width>105</width>
+					<posx>395</posx>
+					<posy>4</posy>
+					<info>listitem.rating</info>
+					<aspectratio>stretch</aspectratio>
+					<texture flipx="true" /> 
+					<visible>Container.Sort(SongRating)</visible>
+				</control>
 			</itemlayout>
 			<focusedlayout height="29">
 				<control type="image">
@@ -71,6 +96,7 @@
 					<include>listselectedcolor</include>
 					<align>left</align>
 					<info>ListItem.Label</info>
+					<visible>!Container.Sort(SongRating)</visible>
 				</control>
 				<control type="label">
 					<posx>475</posx>
@@ -83,7 +109,31 @@
 					<textcolor>60ffffff</textcolor>
 					<align>right</align>
 					<info>ListItem.Label2</info>
+					<visible>!Container.Sort(SongRating)</visible>
 				</control>
+				<control type="label">
+					<posx>30</posx>
+					<posy>3</posy>
+					<width>360</width>
+					<height>22</height>
+					<font>font13</font>
+					<aligny>center</aligny>
+					<include>listselectedcolor</include>
+					<align>left</align>
+					<info>ListItem.Label</info>
+					<visible>Container.Sort(SongRating)</visible>
+				</control>
+				<control type="image" id="1">
+					<description>Song Rating Image</description>
+					<height>21</height>
+					<width>105</width>
+					<posx>395</posx>
+					<posy>4</posy>
+					<aspectratio>stretch</aspectratio>
+					<info>listitem.rating</info>
+					<texture flipx="true" /> 
+					<visible>Container.Sort(SongRating)</visible>
+				</control>
 			</focusedlayout>
 		</control>
 	</include>
@@ -289,7 +339,19 @@
 					<aligny>center</aligny>
 					<include>listselectedcolor</include>
 					<info>ListItem.Label2</info>
+					<visible>!Container.Sort(SongRating)</visible>
 				</control>
+				<control type="image" id="1">
+					<description>Song Rating Image</description>
+					<height>21</height>
+					<width>105</width>
+					<posx>390</posx>
+					<posy>110</posy>
+					<info>listitem.rating</info>
+					<aspectratio>stretch</aspectratio>
+					<texture flipx="true" /> 
+					<visible>Container.Sort(SongRating)</visible>
+				</control>
 			</itemlayout>
 			<focusedlayout height="141">
 				<control type="image">
@@ -365,7 +427,19 @@
 					<aligny>center</aligny>
 					<include>listselectedcolor</include>
 					<info>ListItem.Label2</info>
+					<visible>!Container.Sort(SongRating)</visible>
 				</control>
+				<control type="image" id="1">
+					<description>Song Rating Image</description>
+					<height>21</height>
+					<width>105</width>
+					<posx>390</posx>
+					<posy>110</posy>
+					<info>listitem.rating</info>
+					<aspectratio>stretch</aspectratio>
+					<texture flipx="true" /> 
+					<visible>Container.Sort(SongRating)</visible>
+				</control>
 			</focusedlayout>
 		</control>
 	</include>
@@ -912,6 +986,7 @@
 					<include>listselectedcolor</include>
 					<align>left</align>
 					<info>ListItem.Label</info>
+					<visible>!Container.Sort(SongRating)</visible>
 				</control>
 				<control type="label">
 					<posx>475</posx>
@@ -924,7 +999,31 @@
 					<textcolor>60ffffff</textcolor>
 					<align>right</align>
 					<info>ListItem.Label2</info>
+					<visible>!Container.Sort(SongRating)</visible>
 				</control>
+				<control type="label">
+					<posx>30</posx>
+					<posy>3</posy>
+					<width>360</width>
+					<height>22</height>
+					<font>font13</font>
+					<aligny>center</aligny>
+					<include>listselectedcolor</include>
+					<align>left</align>
+					<info>ListItem.Label</info>
+					<visible>Container.Sort(SongRating)</visible>
+				</control>
+				<control type="image" id="1">
+					<description>Song Rating Image</description>
+					<height>21</height>
+					<width>105</width>
+					<posx>395</posx>
+					<posy>4</posy>
+					<aspectratio>stretch</aspectratio>
+					<info>listitem.rating</info>
+					<texture flipx="true" /> 
+					<visible>Container.Sort(SongRating)</visible>
+				</control>
 			</itemlayout>
 			<focusedlayout height="75">
 				<control type="image">
@@ -978,7 +1077,19 @@
 					<aligny>center</aligny>
 					<include>listselectedcolor</include>
 					<info>ListItem.Label2</info>
+					<visible>!Container.Sort(SongRating)</visible>
 				</control>
+				<control type="image" id="1">
+					<description>Song Rating Image</description>
+					<height>21</height>
+					<width>105</width>
+					<posx>395</posx>
+					<posy>52</posy>
+					<info>listitem.rating</info>
+					<aspectratio>stretch</aspectratio>
+					<texture flipx="true" /> 
+					<visible>Container.Sort(SongRating)</visible>
+				</control>
 			</focusedlayout>
 		</control>
 	</include>
@@ -1653,9 +1764,19 @@
 			<include>textcolorlightgrey</include>
 			<scroll>true</scroll>
 			<info>ListItem.Label2</info>
-			<visible>Control.IsVisible(56)</visible>
+			<visible>!Container.Sort(SongRating) + Control.IsVisible(56)</visible>
 			<include>contentpanelslide</include>
 		</control>
+		<control type="image" id="1">
+			<description>Song Rating Image</description>
+			<height>21</height>
+			<width>105</width>
+			<posx>240</posx>
+			<posy>495</posy>
+			<info>listitem.rating</info>
+			<visible>Container.Sort(SongRating) + Control.IsVisible(56)</visible>
+			<include>contentpanelslide</include>
+		</control>
 	</include>
 	<include name="VideoLibraryWideIcon_Small">
 		<control type="list" id="57">

Modified: trunk/XBMC/skin/Project Mayhem III/PAL16x9/MusicVisualisation.xml
===================================================================
--- trunk/XBMC/skin/Project Mayhem III/PAL16x9/MusicVisualisation.xml	2007-04-28 17:17:02 UTC (rev 8683)
+++ trunk/XBMC/skin/Project Mayhem III/PAL16x9/MusicVisualisation.xml	2007-04-28 18:58:52 UTC (rev 8684)
@@ -111,15 +111,23 @@
 				<align>left</align>
 				<font>special13</font>
 			</control>
-			<control type="label" id="1">
+			<control type="fadelabel" id="1">
 				<description>Album label</description>
-				<width>520</width>
+				<width>420</width>
 				<posx>160</posx>
 				<posy>60</posy>
 				<info>MusicPlayer.Album</info>
 				<align>left</align>
 				<font>font10</font>
 			</control>
+			<control type="image" id="1">
+				<description>Song Rating Image</description>
+				<height>20</height>
+				<width>100</width>
+				<posx>585</posx>
+				<posy>55</posy>
+				<info>musicplayer.rating</info>
+			</control>
 			<control type="label" id="1">
 				<description>time label</description>
 				<width>520</width>
@@ -130,6 +138,15 @@
 				<font>font10</font>
 			</control>
 			<control type="label" id="1">
+				<description>time label</description>
+				<width>520</width>
+				<posx>160</posx>
+				<posy>80</posy>
+				<label>$INFO[musicplayer.Time]$INFO[musicplayer.Duration, / ]</label>
+				<align>left</align>
+				<font>font10</font>
+			</control>
+			<control type="label" id="1">
 				<description>Playlist Pos No</description>
 				<width>200</width>
 				<posx>680</posx>

Added: trunk/XBMC/skin/Project Mayhem III/media/songrating0.png
===================================================================
(Binary files differ)


Property changes on: trunk/XBMC/skin/Project Mayhem III/media/songrating0.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/XBMC/skin/Project Mayhem III/media/songrating1.png
===================================================================
(Binary files differ)


Property changes on: trunk/XBMC/skin/Project Mayhem III/media/songrating1.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/XBMC/skin/Project Mayhem III/media/songrating2.png
===================================================================
(Binary files differ)


Property changes on: trunk/XBMC/skin/Project Mayhem III/media/songrating2.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/XBMC/skin/Project Mayhem III/media/songrating3.png
===================================================================
(Binary files differ)


Property changes on: trunk/XBMC/skin/Project Mayhem III/media/songrating3.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/XBMC/skin/Project Mayhem III/media/songrating4.png
===================================================================
(Binary files differ)


Property changes on: trunk/XBMC/skin/Project Mayhem III/media/songrating4.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/XBMC/skin/Project Mayhem III/media/songrating5.png
===================================================================
(Binary files differ)


Property changes on: trunk/XBMC/skin/Project Mayhem III/media/songrating5.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 8683
          http://svn.sourceforge.net/xbmc/?rev=8683&view=rev
Author:   Nuka1195
Date:     2007-04-28 10:17:02 -0700 (Sat, 28 Apr 2007)

Log Message:
-----------
fixed: WindowXML fallback media path did not work on the xbox. Slash at end issue.

Modified Paths:
--------------
    trunk/XBMC/xbmc/lib/libPython/xbmcmodule/GUIPythonWindowXML.cpp

Modified: trunk/XBMC/xbmc/lib/libPython/xbmcmodule/GUIPythonWindowXML.cpp
===================================================================
--- trunk/XBMC/xbmc/lib/libPython/xbmcmodule/GUIPythonWindowXML.cpp	2007-04-28 08:08:13 UTC (rev 8682)
+++ trunk/XBMC/xbmc/lib/libPython/xbmcmodule/GUIPythonWindowXML.cpp	2007-04-28 17:17:02 UTC (rev 8683)
@@ -247,6 +247,7 @@
   {
     CStdString fallbackMediaPath;
     CUtil::GetParentPath(tmpDir, fallbackMediaPath);
+    CUtil::RemoveSlashAtEnd(fallbackMediaPath);
     g_graphicsContext.SetMediaDir(fallbackMediaPath);
     m_fallbackPath = fallbackMediaPath;
     //CLog::Log(LOGDEBUG, "CGUIPythonWindowXML::AllocResources called: %s", fallbackMediaPath.c_str());


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 8682
          http://svn.sourceforge.net/xbmc/?rev=8682&view=rev
Author:   jmarshallnz
Date:     2007-04-28 01:08:13 -0700 (Sat, 28 Apr 2007)

Log Message:
-----------
added: Container.Sort(SongRating) info condition.

Modified Paths:
--------------
    trunk/XBMC/xbmc/FileItem.h
    trunk/XBMC/xbmc/GUIMediaWindow.h
    trunk/XBMC/xbmc/utils/GUIInfoManager.cpp
    trunk/XBMC/xbmc/utils/GUIInfoManager.h

Modified: trunk/XBMC/xbmc/FileItem.h
===================================================================
--- trunk/XBMC/xbmc/FileItem.h	2007-04-28 04:15:36 UTC (rev 8681)
+++ trunk/XBMC/xbmc/FileItem.h	2007-04-28 08:08:13 UTC (rev 8682)
@@ -317,8 +317,8 @@
   bool Contains(const CStdString& fileName);
   bool GetFastLookup() { return m_fastLookup; };
   void Stack();
-  SORT_ORDER GetSortOrder() { return m_sortOrder; }
-  SORT_METHOD GetSortMethod() { return m_sortMethod; }
+  SORT_ORDER GetSortOrder() const { return m_sortOrder; }
+  SORT_METHOD GetSortMethod() const { return m_sortMethod; }
   bool Load();
   bool Save();
   void SetCacheToDisc(bool bYesNo) { m_bCacheToDisc=bYesNo; }

Modified: trunk/XBMC/xbmc/GUIMediaWindow.h
===================================================================
--- trunk/XBMC/xbmc/GUIMediaWindow.h	2007-04-28 04:15:36 UTC (rev 8681)
+++ trunk/XBMC/xbmc/GUIMediaWindow.h	2007-04-28 08:08:13 UTC (rev 8682)
@@ -18,7 +18,7 @@
   virtual void OnWindowUnload();
   virtual void OnInitWindow();
   virtual CFileItem *GetCurrentListItem();
-  const CFileItem &CurrentDirectory() const { return m_vecItems;};
+  const CFileItemList &CurrentDirectory() const { return m_vecItems;};
 
 protected:
   CGUIControl *GetFirstFocusableControl(int id);

Modified: trunk/XBMC/xbmc/utils/GUIInfoManager.cpp
===================================================================
--- trunk/XBMC/xbmc/utils/GUIInfoManager.cpp	2007-04-28 04:15:36 UTC (rev 8681)
+++ trunk/XBMC/xbmc/utils/GUIInfoManager.cpp	2007-04-28 08:08:13 UTC (rev 8682)
@@ -423,6 +423,14 @@
     else if (strTest.Left(18).Equals("container.content("))
       return AddMultiInfo(GUIInfo(bNegate ? -CONTAINER_CONTENT : CONTAINER_CONTENT, ConditionalStringParameter(strTest.Mid(18,strTest.size()-19)), 0));
     else if (strTest.Equals("container.hasthumb")) ret = CONTAINER_HAS_THUMB;
+    else if (strTest.Left(15).Equals("container.sort("))
+    {
+      SORT_METHOD sort = SORT_METHOD_NONE;
+      CStdString method(strTest.Mid(15, strTest.GetLength() - 16));
+      if (method.Equals("songrating")) sort = SORT_METHOD_SONG_RATING;
+      if (sort != SORT_METHOD_NONE)
+        return AddMultiInfo(GUIInfo(bNegate ? -CONTAINER_SORT_METHOD : CONTAINER_SORT_METHOD, sort));
+    }
   }
   else if (strCategory.Equals("listitem"))
   {
@@ -1503,6 +1511,18 @@
     case CONTAINER_CONTENT:
       bReturn = m_stringParameters[info.m_data1].Equals(m_content);
       break;
+    case CONTAINER_SORT_METHOD:
+    {
+      CGUIWindow *window = m_gWindowManager.GetWindow(dwContextWindow);
+      if( !window ) window = m_gWindowManager.GetWindow(m_gWindowManager.GetActiveWindow());
+      if (window && window->IsMediaWindow())
+      {
+        const CFileItemList &item = ((CGUIMediaWindow*)window)->CurrentDirectory();
+        SORT_METHOD method = item.GetSortMethod();
+        bReturn = (method == info.m_data1);
+      }
+      break;
+    }
   }
   return (info.m_info < 0) ? !bReturn : bReturn;
 }
@@ -1567,7 +1587,7 @@
       CFileItem* item;
 
       if (info == CONTAINER_FOLDERTHUMB)
-        item = &const_cast<CFileItem&>(((CGUIMediaWindow*)window)->CurrentDirectory());
+        item = &const_cast<CFileItemList&>(((CGUIMediaWindow*)window)->CurrentDirectory());
       else
         item = window->GetCurrentListItem();
       if (item)

Modified: trunk/XBMC/xbmc/utils/GUIInfoManager.h
===================================================================
--- trunk/XBMC/xbmc/utils/GUIInfoManager.h	2007-04-28 04:15:36 UTC (rev 8681)
+++ trunk/XBMC/xbmc/utils/GUIInfoManager.h	2007-04-28 08:08:13 UTC (rev 8682)
@@ -223,6 +223,7 @@
 #define CONTAINER_FOLDERPATH        361
 #define CONTAINER_CONTENT           362
 #define CONTAINER_HAS_THUMB         363
+#define CONTAINER_SORT_METHOD       364
 
 #define PLAYLIST_LENGTH             390
 #define PLAYLIST_POSITION           391


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 8681
          http://svn.sourceforge.net/xbmc/?rev=8681&view=rev
Author:   jezz_x
Date:     2007-04-27 21:15:36 -0700 (Fri, 27 Apr 2007)

Log Message:
-----------
Fixed : PM3 "DVD Icons" and "Album Icon" views navigation didn't wrap top to bottom and bottom to top

Modified Paths:
--------------
    trunk/XBMC/skin/Project Mayhem III/PAL/CommonViewTypes.xml
    trunk/XBMC/skin/Project Mayhem III/PAL16x9/CommonViewTypes.xml

Modified: trunk/XBMC/skin/Project Mayhem III/PAL/CommonViewTypes.xml
===================================================================
--- trunk/XBMC/skin/Project Mayhem III/PAL/CommonViewTypes.xml	2007-04-27 23:21:34 UTC (rev 8680)
+++ trunk/XBMC/skin/Project Mayhem III/PAL/CommonViewTypes.xml	2007-04-28 04:15:36 UTC (rev 8681)
@@ -1146,8 +1146,8 @@
 			<height>425</height>
 			<onleft>9000</onleft>
 			<onright>60</onright>
-			<onup>52</onup>
-			<ondown>52</ondown>
+			<onup>54</onup>
+			<ondown>54</ondown>
 			<scrolltime>200</scrolltime>
 			<viewtype label="541">icon</viewtype>
 			<pagecontrol>60</pagecontrol>
@@ -1273,8 +1273,8 @@
 			<height>425</height>
 			<onleft>9000</onleft>
 			<onright>60</onright>
-			<onup>53</onup>
-			<ondown>53</ondown>
+			<onup>54</onup>
+			<ondown>54</ondown>
 			<scrolltime>200</scrolltime>
 			<viewtype label="542">bigicon</viewtype>
 			<pagecontrol>60</pagecontrol>

Modified: trunk/XBMC/skin/Project Mayhem III/PAL16x9/CommonViewTypes.xml
===================================================================
--- trunk/XBMC/skin/Project Mayhem III/PAL16x9/CommonViewTypes.xml	2007-04-27 23:21:34 UTC (rev 8680)
+++ trunk/XBMC/skin/Project Mayhem III/PAL16x9/CommonViewTypes.xml	2007-04-28 04:15:36 UTC (rev 8681)
@@ -1146,8 +1146,8 @@
 			<height>425</height>
 			<onleft>9000</onleft>
 			<onright>60</onright>
-			<onup>52</onup>
-			<ondown>52</ondown>
+			<onup>54</onup>
+			<ondown>54</ondown>
 			<scrolltime>200</scrolltime>
 			<viewtype label="541">icon</viewtype>
 			<pagecontrol>60</pagecontrol>
@@ -1273,8 +1273,8 @@
 			<height>425</height>
 			<onleft>9000</onleft>
 			<onright>60</onright>
-			<onup>53</onup>
-			<ondown>53</ondown>
+			<onup>54</onup>
+			<ondown>54</ondown>
 			<scrolltime>200</scrolltime>
 			<viewtype label="542">bigicon</viewtype>
 			<pagecontrol>60</pagecontrol>


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.