insert a no-op entry "No Branch in Document!". Makes the branch
feature more discorevable
(expandDocuments, expandFormats, expandFloatListInsert):
(expandCharStyleInsert, expandToc, expandBranches): fix message
when no document is open.
* lib/ui/stdmenus.inc: the insert>branch menu does not need to be
optional.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@18591
a592a061-630c-0410-9148-
cb99ea01b6c8
Submenu "List / TOC|i" "insert_toc"
Submenu "Float|a" "insert_float"
Submenu "Note|N" "insert_note"
Submenu "List / TOC|i" "insert_toc"
Submenu "Float|a" "insert_float"
Submenu "Note|N" "insert_note"
- OptSubmenu "Branch|B" "insert_branches"
+ Submenu "Branch|B" "insert_branches"
Submenu "File|e" "insert_file"
Item "Box" "box-insert Frameless"
Separator
Submenu "File|e" "insert_file"
Item "Box" "box-insert Frameless"
Separator
Strings const names = theBufferList().getFileNames();
if (names.empty()) {
Strings const names = theBufferList().getFileNames();
if (names.empty()) {
- tomenu.add(MenuItem(MenuItem::Command, _("No Documents Open!"),
+ tomenu.add(MenuItem(MenuItem::Command, _("No Document Open!"),
FuncRequest(LFUN_NOACTION)));
return;
}
FuncRequest(LFUN_NOACTION)));
return;
}
{
if (!buf && kind != MenuItem::ImportFormats) {
tomenu.add(MenuItem(MenuItem::Command,
{
if (!buf && kind != MenuItem::ImportFormats) {
tomenu.add(MenuItem(MenuItem::Command,
- _("No Documents Open!"),
+ _("No Document Open!"),
FuncRequest(LFUN_NOACTION)));
return;
}
FuncRequest(LFUN_NOACTION)));
return;
}
{
if (!buf) {
tomenu.add(MenuItem(MenuItem::Command,
{
if (!buf) {
tomenu.add(MenuItem(MenuItem::Command,
- _("No Documents Open!"),
+ _("No Document Open!"),
FuncRequest(LFUN_NOACTION)));
return;
}
FuncRequest(LFUN_NOACTION)));
return;
}
{
if (!buf) {
tomenu.add(MenuItem(MenuItem::Command,
{
if (!buf) {
tomenu.add(MenuItem(MenuItem::Command,
- _("No Documents Open!"),
+ _("No Document Open!"),
FuncRequest(LFUN_NOACTION)));
return;
}
FuncRequest(LFUN_NOACTION)));
return;
}
{
if (!buf) {
tomenu.add(MenuItem(MenuItem::Command,
{
if (!buf) {
tomenu.add(MenuItem(MenuItem::Command,
- _("No Documents Open!"),
+ _("No Document Open!"),
FuncRequest(LFUN_NOACTION)));
return;
}
FuncRequest(LFUN_NOACTION)));
return;
}
if (!buf) {
tomenu.add(MenuItem(MenuItem::Command,
if (!buf) {
tomenu.add(MenuItem(MenuItem::Command,
- _("No Documents Open!"),
+ _("No Document Open!"),
FuncRequest(LFUN_NOACTION)));
return;
}
FuncRequest(LFUN_NOACTION)));
return;
}
void expandBranches(Menu & tomenu, Buffer const * buf)
{
void expandBranches(Menu & tomenu, Buffer const * buf)
{
+ if (!buf) {
+ tomenu.add(MenuItem(MenuItem::Command,
+ _("No Document Open!"),
+ FuncRequest(LFUN_NOACTION)));
BufferParams const & params = buf->getMasterBuffer()->params();
BufferParams const & params = buf->getMasterBuffer()->params();
+ if (params.branchlist().empty()) {
+ tomenu.add(MenuItem(MenuItem::Command,
+ _("No Branch in Document!"),
+ FuncRequest(LFUN_NOACTION)));
+ return;
+ }
BranchList::const_iterator cit = params.branchlist().begin();
BranchList::const_iterator end = params.branchlist().end();
BranchList::const_iterator cit = params.branchlist().begin();
BranchList::const_iterator end = params.branchlist().end();