Menu
▾
▴
[Mp-plugins-svn] SF.net SVN: mp-plugins: [911] trunk/plugins/myGUIProgramsAlt
|
From: <nor...@us...> - 2007-09-10 19:28:58
|
Revision: 911
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=911&view=rev
Author: northern_sky
Date: 2007-09-10 12:28:56 -0700 (Mon, 10 Sep 2007)
Log Message:
-----------
fixed some sort stuff for filteritems
Modified Paths:
--------------
trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/ProgramViews.cs
trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/GUIProgramsAlt.cs
trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/GUIProgramsAltFileInfo.cs
trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/ProgramSort.cs
trunk/plugins/myGUIProgramsAlt/README.txt
Modified: trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/ProgramViews.cs
===================================================================
--- trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/ProgramViews.cs 2007-09-10 16:07:01 UTC (rev 910)
+++ trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/ProgramViews.cs 2007-09-10 19:28:56 UTC (rev 911)
@@ -194,7 +194,7 @@
{
"Name",
"Title",
- "Filename",
+ "Filepath",
"Rating",
"LaunchCount",
"LastTimeLaunched",
Modified: trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/GUIProgramsAlt.cs
===================================================================
--- trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/GUIProgramsAlt.cs 2007-09-10 16:07:01 UTC (rev 910)
+++ trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/GUIProgramsAlt.cs 2007-09-10 19:28:56 UTC (rev 911)
@@ -331,12 +331,18 @@
btnViewAs.Label = GetViewLayoutAsText();
+ //as for now only title are availble for appitems/filteritem
+ if ((DoesListOnlyContainsItemOfType<FilterItem>()) || (DoesListOnlyContainsItemOfType<ApplicationItem>()))
+ {
+ CurrentSortMethod = ProgramSort.SortMethod.Title;
+ }
+
switch (CurrentSortMethod)
{
case ProgramSort.SortMethod.Title:
sortBy = GUILocalizeStrings.Get(268);
break;
- case ProgramSort.SortMethod.Filename:
+ case ProgramSort.SortMethod.Filepath:
sortBy = GUILocalizeStrings.Get(363);
break;
case ProgramSort.SortMethod.Rating:
@@ -760,7 +766,7 @@
if (DoesListOnlyContainsItemOfType<FileItem>())
{
- dlg.AddLocalizedString(363); // filename
+ dlg.AddLocalizedString(363); // filepath
dlg.AddLocalizedString(367); // rating
dlg.Add("Sort by: Times launched");//"LaunchCount"//whats the mapping to these???
dlg.Add("Sort by: Date launched");
@@ -778,7 +784,7 @@
CurrentSortMethod = ProgramSort.SortMethod.Title;
break;
case 363:
- CurrentSortMethod = ProgramSort.SortMethod.Filename;
+ CurrentSortMethod = ProgramSort.SortMethod.Filepath;
break;
case 367:
CurrentSortMethod = ProgramSort.SortMethod.Rating;
Modified: trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/GUIProgramsAltFileInfo.cs
===================================================================
--- trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/GUIProgramsAltFileInfo.cs 2007-09-10 16:07:01 UTC (rev 910)
+++ trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/GUIProgramsAltFileInfo.cs 2007-09-10 19:28:56 UTC (rev 911)
@@ -99,8 +99,6 @@
return Load(GUIGraphicsContext.Skin + @"\myProgramsAltFileInfo.xml");
}
- //TO DO
- //Fix this method//move it
void ImportFileItemInfo(FileItem curFile)
{
int minRelevance = 40;
Modified: trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/ProgramSort.cs
===================================================================
--- trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/ProgramSort.cs 2007-09-10 16:07:01 UTC (rev 910)
+++ trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/ProgramSort.cs 2007-09-10 19:28:56 UTC (rev 911)
@@ -44,7 +44,7 @@
public enum SortMethod
{
Title = 0,
- Filename = 1,
+ Filepath = 1,
Rating = 2,
LaunchCount = 3,
LastTimeLaunched = 4,
@@ -64,17 +64,11 @@
public int Compare(GUIListItem item1, GUIListItem item2)
{
if (item1 == item2) return 0;
- if (item1 == null) return -1;
- if (item2 == null) return -1;
- if (item1.MusicTag == null) return -1;
- if (item2.MusicTag == null) return -1;
- if (item1.MusicTag.GetType().Name == "FilterItem") return -1;//quick fix for not allowing filteritems...
- if (item2.MusicTag.GetType().Name == "FilterItem") return -1;//quick fix for not allowing filteritems...
+ if ((item1 == null) || (item2 == null)) return -1;
+ if ((item1.MusicTag == null) || (item2.MusicTag == null)) return -1;
+ if ((item1.Label == "..") || (item2.Label == "..")) return -1; // if the .. item has no musicTag then, it is already catched at the beginning of this method
- if (item1.Label == "..") return -1; // if the .. item has no musicTag then, it is already catched at the beginning of this method
- if (item2.Label == "..") return -1;
-
//applicationitem sort only allows by title for now
if ((item1.MusicTag is ApplicationItem) && (item2.MusicTag is ApplicationItem))
@@ -94,15 +88,26 @@
}
}
+ //filteritem sort only allows by title for now
+ else if ((item1.MusicTag is FilterItem) && (item2.MusicTag is FilterItem))
+ {
+ FilterItem Item1 = item1.MusicTag as FilterItem;
+ FilterItem Item2 = item2.MusicTag as FilterItem;
+ switch (currentSortMethod)
+ {
+ case SortMethod.Title:
+ if (sortAscending)
+ return String.Compare(Item1.Title, Item2.Title, true);
+ else
+ return String.Compare(Item2.Title, Item1.Title, true);
+ default:
+ return -1;
+ }
+ }
- string strSize1 = "";
- string strSize2 = "";
- if (item1.FileInfo != null) strSize1 = MediaPortal.Util.Utils.GetSize(item1.FileInfo.Length);
- if (item2.FileInfo != null) strSize2 = MediaPortal.Util.Utils.GetSize(item2.FileInfo.Length);
-
//fileitem sort
- if ((item1.MusicTag is FileItem) && (item2.MusicTag is FileItem))
+ else if ((item1.MusicTag is FileItem) && (item2.MusicTag is FileItem))
{
FileItem fileItem1 = item1.MusicTag as FileItem;
FileItem fileItem2 = item2.MusicTag as FileItem;
@@ -117,7 +122,7 @@
else
return String.Compare(fileItem2.Title, fileItem1.Title, true);
- case SortMethod.Filename:
+ case SortMethod.Filepath:
if (sortAscending)
return String.Compare(fileItem1.filePath, fileItem2.filePath, true);
else
Modified: trunk/plugins/myGUIProgramsAlt/README.txt
===================================================================
--- trunk/plugins/myGUIProgramsAlt/README.txt 2007-09-10 16:07:01 UTC (rev 910)
+++ trunk/plugins/myGUIProgramsAlt/README.txt 2007-09-10 19:28:56 UTC (rev 911)
@@ -37,12 +37,9 @@
-Change graphics for fileinfobackground (it says mymovies...)
--Add sort for filteritems too.
-
-
BUGS:
-- Just add em....
+- goes here..
FEATURES:
Add some more specific emulator support..
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
