Permalink
Browse files

Merge pull request #8190 from Montellese/remove_settings_context_item

remove "Settings" context menu button from music and pictures views
  • Loading branch information...
2 parents 71e6002 + 577a71e commit 783db620754bf4b89f96247f20f295603f1c8e1a @mkortstiege mkortstiege committed Oct 9, 2015
Showing with 0 additions and 10 deletions.
  1. +0 −5 xbmc/music/windows/GUIWindowMusicBase.cpp
  2. +0 −5 xbmc/pictures/GUIWindowPictures.cpp
@@ -905,7 +905,6 @@ void CGUIWindowMusicBase::GetNonContextButtons(CContextButtons &buttons)
buttons.Add(CONTEXT_BUTTON_GOTO_ROOT, 20128);
if (ActiveAE::CActiveAEDSP::GetInstance().IsProcessing())
buttons.Add(CONTEXT_BUTTON_ACTIVE_ADSP_SETTINGS, 15047);
- buttons.Add(CONTEXT_BUTTON_SETTINGS, 5);
}
bool CGUIWindowMusicBase::OnContextButton(int itemNumber, CONTEXT_BUTTON button)
@@ -988,10 +987,6 @@ bool CGUIWindowMusicBase::OnContextButton(int itemNumber, CONTEXT_BUTTON button)
g_windowManager.ActivateWindow(WINDOW_DIALOG_AUDIO_DSP_OSD_SETTINGS);
return true;
- case CONTEXT_BUTTON_SETTINGS:
- g_windowManager.ActivateWindow(WINDOW_SETTINGS_MYMUSIC);
- return true;
-
case CONTEXT_BUTTON_RIP_CD:
OnRipCD();
return true;
@@ -500,8 +500,6 @@ void CGUIWindowPictures::GetContextButtons(int itemNumber, CContextButtons &butt
}
}
CGUIMediaWindow::GetContextButtons(itemNumber, buttons);
- if (item && !item->GetProperty("pluginreplacecontextitems").asBoolean())
- buttons.Add(CONTEXT_BUTTON_SETTINGS, 5); // Settings
CContextMenuManager::GetInstance().AddVisibleItems(item, buttons);
}
@@ -538,9 +536,6 @@ bool CGUIWindowPictures::OnContextButton(int itemNumber, CONTEXT_BUTTON button)
case CONTEXT_BUTTON_RENAME:
OnRenameItem(itemNumber);
return true;
- case CONTEXT_BUTTON_SETTINGS:
- g_windowManager.ActivateWindow(WINDOW_SETTINGS_MYPICTURES);
- return true;
case CONTEXT_BUTTON_GOTO_ROOT:
Update("");
return true;

0 comments on commit 783db62

Please sign in to comment.