changed: Re-add the "Addon Settings" option to the context menu both on and within...

git-svn-id: https://xbmc.svn.sourceforge.net/svnroot/xbmc/trunk@33294 568bbfeb-2a22-0410-94d2-cc84cf5bfa90

diff --git a/language/English/strings.xml b/language/English/strings.xml
index 64eef59..02a52dc 100644 (file)
--- a/language/English/strings.xml
+++ b/language/English/strings.xml
@@ -732,7 +732,7 @@
   <string id="1042">Retrieved %i of %i items</string>
   <string id="1043">Program Add-ons</string>
   <string id="1044">Set plugin thumb</string>
-  <string id="1045">Plugin settings</string>
+  <string id="1045">Addon settings</string>
   <string id="1046">Access points</string>
   <string id="1047">Other...</string>
   <string id="1048">- Username</string>

diff --git a/xbmc/GUIWindowMusicNav.cpp b/xbmc/GUIWindowMusicNav.cpp
index c852e8d..4a0391a 100644 (file)
--- a/xbmc/GUIWindowMusicNav.cpp
+++ b/xbmc/GUIWindowMusicNav.cpp
@@ -528,6 +528,9 @@ void CGUIWindowMusicNav::GetContextButtons(int itemNumber, CContextButtons &butt
     if (inPlaylists && !CUtil::GetFileName(item->m_strPath).Equals("PartyMode.xsp")
                     && (item->IsPlayList() || item->IsSmartPlayList()))
       buttons.Add(CONTEXT_BUTTON_DELETE, 117);
+
+    if (item->IsPlugin() || item->m_strPath.Left(9).Equals("script://") || m_vecItems->IsPlugin())
+      buttons.Add(CONTEXT_BUTTON_PLUGIN_SETTINGS, 1045);
   }
   // noncontextual buttons
 

diff --git a/xbmc/GUIWindowMusicSongs.cpp b/xbmc/GUIWindowMusicSongs.cpp
index a9e7c77..2161eb4 100644 (file)
--- a/xbmc/GUIWindowMusicSongs.cpp
+++ b/xbmc/GUIWindowMusicSongs.cpp
@@ -372,6 +372,8 @@ void CGUIWindowMusicSongs::GetContextButtons(int itemNumber, CContextButtons &bu
         buttons.Add(CONTEXT_BUTTON_SCAN, 13352);
       }
     }
+    if (item->IsPlugin() || item->m_strPath.Left(9).Equals("script://") || m_vecItems->IsPlugin())
+      buttons.Add(CONTEXT_BUTTON_PLUGIN_SETTINGS, 1045);
   }
   if (!m_vecItems->IsVirtualDirectoryRoot())
     buttons.Add(CONTEXT_BUTTON_SWITCH_MEDIA, 523);

diff --git a/xbmc/GUIWindowPictures.cpp b/xbmc/GUIWindowPictures.cpp
index 5e84409..6598ff6 100644 (file)
--- a/xbmc/GUIWindowPictures.cpp
+++ b/xbmc/GUIWindowPictures.cpp
@@ -405,6 +405,10 @@ void CGUIWindowPictures::GetContextButtons(int itemNumber, CContextButtons &butt
           buttons.Add(CONTEXT_BUTTON_RENAME, 118);
         }
       }
+
+      if (item->IsPlugin() || item->m_strPath.Left(9).Equals("script://") || m_vecItems->IsPlugin())
+        buttons.Add(CONTEXT_BUTTON_PLUGIN_SETTINGS, 1045);
+
       buttons.Add(CONTEXT_BUTTON_GOTO_ROOT, 20128);
       buttons.Add(CONTEXT_BUTTON_SWITCH_MEDIA, 523);
     }

diff --git a/xbmc/GUIWindowPrograms.cpp b/xbmc/GUIWindowPrograms.cpp
index 1fe8dcc..e2bfdca 100644 (file)
--- a/xbmc/GUIWindowPrograms.cpp
+++ b/xbmc/GUIWindowPrograms.cpp
@@ -150,6 +150,10 @@ void CGUIWindowPrograms::GetContextButtons(int itemNumber, CContextButtons &butt
             buttons.Add(CONTEXT_BUTTON_RENAME, 520); // edit xbe title
         }
       }
+
+      if (item->IsPlugin() || item->m_strPath.Left(9).Equals("script://") || m_vecItems->IsPlugin())
+        buttons.Add(CONTEXT_BUTTON_PLUGIN_SETTINGS, 1045);
+
       buttons.Add(CONTEXT_BUTTON_GOTO_ROOT, 20128); // Go to Root
     }
   }

diff --git a/xbmc/GUIWindowVideoFiles.cpp b/xbmc/GUIWindowVideoFiles.cpp
index d8d5775..0931b3d 100644 (file)
--- a/xbmc/GUIWindowVideoFiles.cpp
+++ b/xbmc/GUIWindowVideoFiles.cpp
@@ -489,6 +489,8 @@ void CGUIWindowVideoFiles::GetContextButtons(int itemNumber, CContextButtons &bu
         else
           buttons.Add(CONTEXT_BUTTON_MARK_WATCHED, 16103);   //Mark as Watched
       }
+      if (item->IsPlugin() || item->m_strPath.Left(9).Equals("script://") || m_vecItems->IsPlugin())
+        buttons.Add(CONTEXT_BUTTON_PLUGIN_SETTINGS, 1045);
     }
   }
   else

diff --git a/xbmc/GUIWindowVideoNav.cpp b/xbmc/GUIWindowVideoNav.cpp
index f179021..32d6b30 100644 (file)
--- a/xbmc/GUIWindowVideoNav.cpp
+++ b/xbmc/GUIWindowVideoNav.cpp
@@ -974,6 +974,8 @@ void CGUIWindowVideoNav::GetContextButtons(int itemNumber, CContextButtons &butt
           buttons.Add(CONTEXT_BUTTON_RENAME, 118);
         }
       }
+      if (item->IsPlugin() || item->m_strPath.Left(9).Equals("script://") || m_vecItems->IsPlugin())
+        buttons.Add(CONTEXT_BUTTON_PLUGIN_SETTINGS, 1045);
     }
   }
   CGUIWindowVideoBase::GetNonContextButtons(itemNumber, buttons);