set label for overview items in the video and music databases - partially addresses...

diff --git a/xbmc/filesystem/MusicDatabaseDirectory.cpp b/xbmc/filesystem/MusicDatabaseDirectory.cpp
index 1defcc7..13294b9 100644 (file)
--- a/xbmc/filesystem/MusicDatabaseDirectory.cpp
+++ b/xbmc/filesystem/MusicDatabaseDirectory.cpp
@@ -60,6 +60,7 @@ bool CMusicDatabaseDirectory::GetDirectory(const CStdString& strPath, CFileItemL
         item->SetIconImage(strImage);
     }
   }
+  items.SetLabel(pNode->GetLocalizedName());
 
   return bResult;
 }

diff --git a/xbmc/filesystem/MusicDatabaseDirectory/DirectoryNode.cpp b/xbmc/filesystem/MusicDatabaseDirectory/DirectoryNode.cpp
index b11966c..46a39f0 100644 (file)
--- a/xbmc/filesystem/MusicDatabaseDirectory/DirectoryNode.cpp
+++ b/xbmc/filesystem/MusicDatabaseDirectory/DirectoryNode.cpp
@@ -165,6 +165,11 @@ int CDirectoryNode::GetID() const
   return atoi(m_strName.c_str());
 }
 
+CStdString CDirectoryNode::GetLocalizedName() const
+{
+  return "";
+}
+
 //  Current node type
 NODE_TYPE CDirectoryNode::GetType()
 {

diff --git a/xbmc/filesystem/MusicDatabaseDirectory/DirectoryNode.h b/xbmc/filesystem/MusicDatabaseDirectory/DirectoryNode.h
index 6275ad5..5e82b3a 100644 (file)
--- a/xbmc/filesystem/MusicDatabaseDirectory/DirectoryNode.h
+++ b/xbmc/filesystem/MusicDatabaseDirectory/DirectoryNode.h
@@ -73,6 +73,7 @@ namespace XFILE
 
       bool GetChilds(CFileItemList& items);
       virtual NODE_TYPE GetChildType();
+      virtual CStdString GetLocalizedName() const;
 
       CDirectoryNode* GetParent();
       bool CanCache();

diff --git a/xbmc/filesystem/MusicDatabaseDirectory/DirectoryNodeOverview.cpp b/xbmc/filesystem/MusicDatabaseDirectory/DirectoryNodeOverview.cpp
index acde23a..d5e0a09 100644 (file)
--- a/xbmc/filesystem/MusicDatabaseDirectory/DirectoryNodeOverview.cpp
+++ b/xbmc/filesystem/MusicDatabaseDirectory/DirectoryNodeOverview.cpp
@@ -60,6 +60,14 @@ NODE_TYPE CDirectoryNodeOverview::GetChildType()
   return NODE_TYPE_NONE;
 }
 
+CStdString CDirectoryNodeOverview::GetLocalizedName() const
+{
+  for (unsigned int i = 0; i < sizeof(OverviewChildren) / sizeof(Node); ++i)
+    if (GetID() == OverviewChildren[i].id)
+      return g_localizeStrings.Get(OverviewChildren[i].label);
+  return "";
+}
+
 bool CDirectoryNodeOverview::GetContent(CFileItemList& items)
 {
   CMusicDatabase musicDatabase;

diff --git a/xbmc/filesystem/MusicDatabaseDirectory/DirectoryNodeOverview.h b/xbmc/filesystem/MusicDatabaseDirectory/DirectoryNodeOverview.h
index 32e81d4..04b7999 100644 (file)
--- a/xbmc/filesystem/MusicDatabaseDirectory/DirectoryNodeOverview.h
+++ b/xbmc/filesystem/MusicDatabaseDirectory/DirectoryNodeOverview.h
@@ -33,6 +33,7 @@ namespace XFILE
     protected:
       virtual NODE_TYPE GetChildType();
       virtual bool GetContent(CFileItemList& items);
+      virtual CStdString GetLocalizedName() const;
     };
   }
 }

diff --git a/xbmc/filesystem/MusicDatabaseDirectory/DirectoryNodeTop100.cpp b/xbmc/filesystem/MusicDatabaseDirectory/DirectoryNodeTop100.cpp
index 38978fd..eec2b76 100644 (file)
--- a/xbmc/filesystem/MusicDatabaseDirectory/DirectoryNodeTop100.cpp
+++ b/xbmc/filesystem/MusicDatabaseDirectory/DirectoryNodeTop100.cpp
@@ -46,6 +46,14 @@ NODE_TYPE CDirectoryNodeTop100::GetChildType()
   return NODE_TYPE_NONE;
 }
 
+CStdString CDirectoryNodeTop100::GetLocalizedName() const
+{
+  for (unsigned int i = 0; i < sizeof(Top100Children) / sizeof(Node); ++i)
+    if (GetID() == Top100Children[i].id)
+      return g_localizeStrings.Get(Top100Children[i].label);
+  return "";
+}
+
 bool CDirectoryNodeTop100::GetContent(CFileItemList& items)
 {
   for (unsigned int i = 0; i < sizeof(Top100Children) / sizeof(Node); ++i)

diff --git a/xbmc/filesystem/MusicDatabaseDirectory/DirectoryNodeTop100.h b/xbmc/filesystem/MusicDatabaseDirectory/DirectoryNodeTop100.h
index 566f637..5b0ab3e 100644 (file)
--- a/xbmc/filesystem/MusicDatabaseDirectory/DirectoryNodeTop100.h
+++ b/xbmc/filesystem/MusicDatabaseDirectory/DirectoryNodeTop100.h
@@ -33,6 +33,7 @@ namespace XFILE
     protected:
       virtual NODE_TYPE GetChildType();
       virtual bool GetContent(CFileItemList& items);
+      virtual CStdString GetLocalizedName() const;
     };
   }
 }

diff --git a/xbmc/filesystem/VideoDatabaseDirectory.cpp b/xbmc/filesystem/VideoDatabaseDirectory.cpp
index f63fc5b..d5eb90e 100644 (file)
--- a/xbmc/filesystem/VideoDatabaseDirectory.cpp
+++ b/xbmc/filesystem/VideoDatabaseDirectory.cpp
@@ -61,6 +61,7 @@ bool CVideoDatabaseDirectory::GetDirectory(const CStdString& strPath, CFileItemL
         item->SetIconImage(strImage);
     }
   }
+  items.SetLabel(pNode->GetLocalizedName());
 
   return bResult;
 }

diff --git a/xbmc/filesystem/VideoDatabaseDirectory/DirectoryNode.cpp b/xbmc/filesystem/VideoDatabaseDirectory/DirectoryNode.cpp
index 785e6bd..150fe6c 100644 (file)
--- a/xbmc/filesystem/VideoDatabaseDirectory/DirectoryNode.cpp
+++ b/xbmc/filesystem/VideoDatabaseDirectory/DirectoryNode.cpp
@@ -170,6 +170,11 @@ int CDirectoryNode::GetID() const
   return atoi(m_strName.c_str());
 }
 
+CStdString CDirectoryNode::GetLocalizedName() const
+{
+  return "";
+}
+
 //  Current node type
 NODE_TYPE CDirectoryNode::GetType()
 {

diff --git a/xbmc/filesystem/VideoDatabaseDirectory/DirectoryNode.h b/xbmc/filesystem/VideoDatabaseDirectory/DirectoryNode.h
index f628b82..a158f49 100644 (file)
--- a/xbmc/filesystem/VideoDatabaseDirectory/DirectoryNode.h
+++ b/xbmc/filesystem/VideoDatabaseDirectory/DirectoryNode.h
@@ -74,6 +74,7 @@ namespace XFILE
 
       bool GetChilds(CFileItemList& items);
       virtual NODE_TYPE GetChildType();
+      virtual CStdString GetLocalizedName() const;
 
       CDirectoryNode* GetParent();
 

diff --git a/xbmc/filesystem/VideoDatabaseDirectory/DirectoryNodeMoviesOverview.cpp b/xbmc/filesystem/VideoDatabaseDirectory/DirectoryNodeMoviesOverview.cpp
index ba3517d..46b8de3 100644 (file)
--- a/xbmc/filesystem/VideoDatabaseDirectory/DirectoryNodeMoviesOverview.cpp
+++ b/xbmc/filesystem/VideoDatabaseDirectory/DirectoryNodeMoviesOverview.cpp
@@ -53,6 +53,14 @@ NODE_TYPE CDirectoryNodeMoviesOverview::GetChildType()
   return NODE_TYPE_NONE;
 }
 
+CStdString CDirectoryNodeMoviesOverview::GetLocalizedName() const
+{
+  for (unsigned int i = 0; i < sizeof(MovieChildren) / sizeof(Node); ++i)
+    if (GetID() == MovieChildren[i].id)
+      return g_localizeStrings.Get(MovieChildren[i].label);
+  return "";
+}
+
 bool CDirectoryNodeMoviesOverview::GetContent(CFileItemList& items)
 {
   for (unsigned int i = 0; i < sizeof(MovieChildren) / sizeof(Node); ++i)

diff --git a/xbmc/filesystem/VideoDatabaseDirectory/DirectoryNodeMoviesOverview.h b/xbmc/filesystem/VideoDatabaseDirectory/DirectoryNodeMoviesOverview.h
index 743b787..c597cf0 100644 (file)
--- a/xbmc/filesystem/VideoDatabaseDirectory/DirectoryNodeMoviesOverview.h
+++ b/xbmc/filesystem/VideoDatabaseDirectory/DirectoryNodeMoviesOverview.h
@@ -33,6 +33,7 @@ namespace XFILE
     protected:
       virtual NODE_TYPE GetChildType();
       virtual bool GetContent(CFileItemList& items);
+      virtual CStdString GetLocalizedName() const;
     };
   }
 }

diff --git a/xbmc/filesystem/VideoDatabaseDirectory/DirectoryNodeMusicVideosOverview.cpp b/xbmc/filesystem/VideoDatabaseDirectory/DirectoryNodeMusicVideosOverview.cpp
index 2fd4edd..c748b99 100644 (file)
--- a/xbmc/filesystem/VideoDatabaseDirectory/DirectoryNodeMusicVideosOverview.cpp
+++ b/xbmc/filesystem/VideoDatabaseDirectory/DirectoryNodeMusicVideosOverview.cpp
@@ -50,6 +50,14 @@ NODE_TYPE CDirectoryNodeMusicVideosOverview::GetChildType()
   return NODE_TYPE_NONE;
 }
 
+CStdString CDirectoryNodeMusicVideosOverview::GetLocalizedName() const
+{
+  for (unsigned int i = 0; i < sizeof(MusicVideoChildren) / sizeof(Node); ++i)
+    if (GetID() == MusicVideoChildren[i].id)
+      return g_localizeStrings.Get(MusicVideoChildren[i].label);
+  return "";
+}
+
 bool CDirectoryNodeMusicVideosOverview::GetContent(CFileItemList& items)
 {
   for (unsigned int i = 0; i < sizeof(MusicVideoChildren) / sizeof(Node); ++i)

diff --git a/xbmc/filesystem/VideoDatabaseDirectory/DirectoryNodeMusicVideosOverview.h b/xbmc/filesystem/VideoDatabaseDirectory/DirectoryNodeMusicVideosOverview.h
index 566be2a..eae6b7c 100644 (file)
--- a/xbmc/filesystem/VideoDatabaseDirectory/DirectoryNodeMusicVideosOverview.h
+++ b/xbmc/filesystem/VideoDatabaseDirectory/DirectoryNodeMusicVideosOverview.h
@@ -33,6 +33,7 @@ namespace XFILE
     protected:
       virtual NODE_TYPE GetChildType();
       virtual bool GetContent(CFileItemList& items);
+      virtual CStdString GetLocalizedName() const;
     };
   }
 }

diff --git a/xbmc/filesystem/VideoDatabaseDirectory/DirectoryNodeOverview.cpp b/xbmc/filesystem/VideoDatabaseDirectory/DirectoryNodeOverview.cpp
index bcb47f7..8a97a5c 100644 (file)
--- a/xbmc/filesystem/VideoDatabaseDirectory/DirectoryNodeOverview.cpp
+++ b/xbmc/filesystem/VideoDatabaseDirectory/DirectoryNodeOverview.cpp
@@ -54,6 +54,14 @@ NODE_TYPE CDirectoryNodeOverview::GetChildType()
   return NODE_TYPE_NONE;
 }
 
+CStdString CDirectoryNodeOverview::GetLocalizedName() const
+{
+  for (unsigned int i = 0; i < sizeof(OverviewChildren) / sizeof(Node); ++i)
+    if (GetID() == OverviewChildren[i].id)
+      return g_localizeStrings.Get(OverviewChildren[i].label);
+  return "";
+}
+
 bool CDirectoryNodeOverview::GetContent(CFileItemList& items)
 {
   CVideoDatabase database;

diff --git a/xbmc/filesystem/VideoDatabaseDirectory/DirectoryNodeOverview.h b/xbmc/filesystem/VideoDatabaseDirectory/DirectoryNodeOverview.h
index 1f8dc87..5ced341 100644 (file)
--- a/xbmc/filesystem/VideoDatabaseDirectory/DirectoryNodeOverview.h
+++ b/xbmc/filesystem/VideoDatabaseDirectory/DirectoryNodeOverview.h
@@ -33,6 +33,7 @@ namespace XFILE
     protected:
       virtual NODE_TYPE GetChildType();
       virtual bool GetContent(CFileItemList& items);
+      virtual CStdString GetLocalizedName() const;
     };
   }
 }

diff --git a/xbmc/filesystem/VideoDatabaseDirectory/DirectoryNodeTvShowsOverview.cpp b/xbmc/filesystem/VideoDatabaseDirectory/DirectoryNodeTvShowsOverview.cpp
index 7c1a52c..d244931 100644 (file)
--- a/xbmc/filesystem/VideoDatabaseDirectory/DirectoryNodeTvShowsOverview.cpp
+++ b/xbmc/filesystem/VideoDatabaseDirectory/DirectoryNodeTvShowsOverview.cpp
@@ -51,6 +51,14 @@ NODE_TYPE CDirectoryNodeTvShowsOverview::GetChildType()
   return NODE_TYPE_NONE;
 }
 
+CStdString CDirectoryNodeTvShowsOverview::GetLocalizedName() const
+{
+  for (unsigned int i = 0; i < sizeof(TvShowChildren) / sizeof(Node); ++i)
+    if (GetID() == TvShowChildren[i].id)
+      return g_localizeStrings.Get(TvShowChildren[i].label);
+  return "";
+}
+
 bool CDirectoryNodeTvShowsOverview::GetContent(CFileItemList& items)
 {
   for (unsigned int i = 0; i < sizeof(TvShowChildren) / sizeof(Node); ++i)

diff --git a/xbmc/filesystem/VideoDatabaseDirectory/DirectoryNodeTvShowsOverview.h b/xbmc/filesystem/VideoDatabaseDirectory/DirectoryNodeTvShowsOverview.h
index 351fee3..ca88616 100644 (file)
--- a/xbmc/filesystem/VideoDatabaseDirectory/DirectoryNodeTvShowsOverview.h
+++ b/xbmc/filesystem/VideoDatabaseDirectory/DirectoryNodeTvShowsOverview.h
@@ -33,6 +33,7 @@ namespace XFILE
     protected:
       virtual NODE_TYPE GetChildType();
       virtual bool GetContent(CFileItemList& items);
+      virtual CStdString GetLocalizedName() const;
     };
   }
 }