#include "lastfiles.h"
#include "lyx_main.h" // for lastfiles
#include "bufferlist.h"
+#include "buffer.h"
#include "converter.h"
#include "exporter.h"
#include "importer.h"
}
+MenuItem::MenuItem(Kind kind, string const & label, int action, bool optional)
+ : kind_(kind), label_(label), action_(action), submenuname_(),
+ optional_(optional)
+{}
+
+
MenuItem::~MenuItem()
{}
+void MenuItem::submenu(Menu * menu)
+{
+ submenu_.reset(menu);
+}
+
+
string const MenuItem::label() const
{
return token(label_, '|', 0);
LFUN_NOACTION));
return;
}
-
+
int ii = 1;
Strings::const_iterator docit = names.begin();
Strings::const_iterator end = names.end();
tomenu.add(MenuItem(MenuItem::Command,
_("No Documents Open!"), LFUN_NOACTION));
return;
- }
-
+ }
+
typedef vector<Format const *> Formats;
Formats formats;
kb_action action;
-
+
switch (kind) {
case MenuItem::ImportFormats:
formats = Importer::GetImportableFormats();
}
-void expandFloatListInsert(Menu & tomenu)
+void expandFloatListInsert(Menu & tomenu, Buffer const * buf)
{
- FloatList::const_iterator cit = floatList.begin();
- FloatList::const_iterator end = floatList.end();
+ if (!buf) {
+ tomenu.add(MenuItem(MenuItem::Command,
+ _("No Documents Open!"), LFUN_NOACTION));
+ return;
+ }
+
+ FloatList const & floats = buf->params.getLyXTextClass().floats();
+ FloatList::const_iterator cit = floats.begin();
+ FloatList::const_iterator end = floats.end();
for (; cit != end; ++cit) {
int const action = lyxaction
.getPseudoAction(LFUN_FLOAT_LIST, cit->second.type());
}
-void expandFloatInsert(Menu & tomenu)
+void expandFloatInsert(Menu & tomenu, Buffer const * buf)
{
- FloatList::const_iterator cit = floatList.begin();
- FloatList::const_iterator end = floatList.end();
+ if (!buf) {
+ tomenu.add(MenuItem(MenuItem::Command,
+ _("No Documents Open!"), LFUN_NOACTION));
+ return;
+ }
+
+ FloatList const & floats = buf->params.getLyXTextClass().floats();
+ FloatList::const_iterator cit = floats.begin();
+ FloatList::const_iterator end = floats.end();
for (; cit != end; ++cit) {
// normal float
int const action =
void expandToc(Menu & tomenu, Buffer const * buf)
{
+ if (!buf) {
+ tomenu.add(MenuItem(MenuItem::Command,
+ _("No Documents Open!"), LFUN_NOACTION));
+ return;
+ }
+
+ FloatList const & floats = buf->params.getLyXTextClass().floats();
toc::TocList toc_list = toc::getTocList(buf);
toc::TocList::const_iterator cit = toc_list.begin();
toc::TocList::const_iterator end = toc_list.end();
label, ccit->action()));
}
MenuItem item(MenuItem::Submenu,
- floatList[cit->first]->second.name());
+ floats[cit->first]->second.name());
item.submenu(menu);
tomenu.add(item);
}
for (Menu::const_iterator cit = frommenu.begin();
cit != frommenu.end() ; ++cit) {
switch (cit->kind()) {
- case MenuItem::Lastfiles:
+ case MenuItem::Lastfiles:
expandLastfiles(tomenu);
break;
break;
case MenuItem::FloatListInsert:
- expandFloatListInsert(tomenu);
+ expandFloatListInsert(tomenu, buf);
break;
case MenuItem::FloatInsert:
- expandFloatInsert(tomenu);
+ expandFloatInsert(tomenu, buf);
break;
case MenuItem::Toc:
tomenu.add(item);
}
break;
-
+
default:
tomenu.add(*cit);
}
{
const_iterator cit = find_if(begin(), end(),
lyx::compare_memfun(&Menu::name, name));
+ if (cit == end())
+ lyxerr << "No submenu named " << name << endl;
lyx::Assert(cit != end());
return (*cit);
}