Skip to content

Commit

Permalink
MythVideo: Move two top level menu items into submenus.
Browse files Browse the repository at this point in the history
"Enable File Browse Mode" and "Enable Flat View" probably shouldn't even exist.  But if they must for now, move them into the "Change View" menu where they make sense in context and aren't as easy to mistakenly activate and cause trouble.
  • Loading branch information
Robert McNamara committed Dec 9, 2010
1 parent de7acc4 commit 1e7ebbf
Showing 1 changed file with 14 additions and 14 deletions.
28 changes: 14 additions & 14 deletions mythplugins/mythvideo/mythvideo/videodlg.cpp
Expand Up @@ -2514,20 +2514,6 @@ void VideoDialog::DisplayMenu()

m_menuPopup->AddButton(tr("Change View"), SLOT(ViewMenu()), true);

if (m_d->m_isFileBrowser)
m_menuPopup->AddButton(tr("Disable File Browse Mode"),
SLOT(ToggleBrowseMode()));
else
m_menuPopup->AddButton(tr("Enable File Browse Mode"),
SLOT(ToggleBrowseMode()));

if (m_d->m_isFlatList)
m_menuPopup->AddButton(tr("Disable Flat View"),
SLOT(ToggleFlatView()));
else
m_menuPopup->AddButton(tr("Enable Flat View"),
SLOT(ToggleFlatView()));

m_menuPopup->AddButton(tr("Settings"), SLOT(SettingsMenu()), true);
}

Expand Down Expand Up @@ -2560,6 +2546,20 @@ void VideoDialog::ViewMenu()
if (!(m_d->m_type & DLG_MANAGER))
m_menuPopup->AddButton(tr("Switch to Manage View"),
SLOT(SwitchManager()));

if (m_d->m_isFileBrowser)
m_menuPopup->AddButton(tr("Disable File Browse Mode"),
SLOT(ToggleBrowseMode()));
else
m_menuPopup->AddButton(tr("Enable File Browse Mode"),
SLOT(ToggleBrowseMode()));

if (m_d->m_isFlatList)
m_menuPopup->AddButton(tr("Disable Flat View"),
SLOT(ToggleFlatView()));
else
m_menuPopup->AddButton(tr("Enable Flat View"),
SLOT(ToggleFlatView()));
}

/** \fn VideoDialog::SettingsMenu()
Expand Down

0 comments on commit 1e7ebbf

Please sign in to comment.