X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Ffrontends%2Fxforms%2FToolbar_pimpl.C;h=6bf013398c537dc34623149f3a9dac17b5c5e320;hb=2c3af1475e2a408f725b5eea93583ee13e3d09cc;hp=b13eea114ec8e6f182d6d692aa5175d11c726c4d;hpb=e7401bd8f2310213b4b765c01676459f37adb530;p=lyx.git diff --git a/src/frontends/xforms/Toolbar_pimpl.C b/src/frontends/xforms/Toolbar_pimpl.C index b13eea114e..6bf013398c 100644 --- a/src/frontends/xforms/Toolbar_pimpl.C +++ b/src/frontends/xforms/Toolbar_pimpl.C @@ -4,7 +4,7 @@ * LyX, The Document Processor * * Copyright 1995 Matthias Ettrich - * Copyright 1995-2000 The LyX Team. + * Copyright 1995-2001 The LyX Team. * * This file is Copyright 1996-1998 * Lars Gullik Bjønnes @@ -20,20 +20,22 @@ #endif #include "Toolbar_pimpl.h" -#include "lyxfunc.h" #include "debug.h" -#include "LyXView.h" +#include "XFormsView.h" +#include "lyxfunc.h" +#include "FuncStatus.h" #include "BufferView.h" #include "buffer.h" +#include "lyxtextclasslist.h" #include "LyXAction.h" -#include "support/filetools.h" +#include "MathsSymbols.h" #include "gettext.h" +#include "support/filetools.h" +#include "support/lstrings.h" + using std::endl; -// this one is not "C" because combox callbacks are really C++ %-| -extern void LayoutsCB(int, void *, Combox *); -extern char const ** get_pixmap_from_symbol(char const * arg, int, int); extern LyXAction lyxaction; // some constants @@ -42,18 +44,21 @@ const int sepspace = 6; // extra space const int buttonwidth = 30; // the standard button width const int height = 30; // the height of all items in the toolbar -Toolbar::Pimpl::toolbarItem::toolbarItem() { +Toolbar::Pimpl::toolbarItem::toolbarItem() +{ action = LFUN_NOACTION; icon = 0; } -Toolbar::Pimpl::toolbarItem::~toolbarItem() { +Toolbar::Pimpl::toolbarItem::~toolbarItem() +{ clean(); } -void Toolbar::Pimpl::toolbarItem::clean() { +void Toolbar::Pimpl::toolbarItem::clean() +{ if (icon) { fl_delete_object(icon); fl_free_object(icon); @@ -63,7 +68,8 @@ void Toolbar::Pimpl::toolbarItem::clean() { Toolbar::Pimpl::toolbarItem & -Toolbar::Pimpl::toolbarItem::operator=(toolbarItem const & ti) { +Toolbar::Pimpl::toolbarItem::operator=(toolbarItem const & ti) +{ // Are we assigning the object onto itself? if (this == &ti) return *this; @@ -81,7 +87,7 @@ Toolbar::Pimpl::toolbarItem::operator=(toolbarItem const & ti) { Toolbar::Pimpl::Pimpl(LyXView * o, int x, int y) - : owner(o), sxpos(x), sypos(y) + : owner(static_cast(o)), sxpos(x), sypos(y) { combox = 0; #if FL_REVISION < 89 @@ -90,43 +96,47 @@ Toolbar::Pimpl::Pimpl(LyXView * o, int x, int y) } +namespace { + #if FL_REVISION < 89 // timer-cb for bubble-help (Matthias) -static void BubbleTimerCB(FL_OBJECT *, long data) { FL_OBJECT * ob = reinterpret_cast(data); // The trick we use to get the help text is to read the // argument of the callback that has been registered for // ToolBarCB. (JMarc) - string help = lyxaction.helpText(ob->argument); + string help = _(lyxaction.helpText(ob->argument)); fl_show_oneliner(help.c_str(), ob->form->x + ob->x, ob->form->y + ob->y + ob->h); } -extern "C" void C_Toolbar_BubbleTimerCB(FL_OBJECT * ob, long data) +extern "C" { + +static +void C_Toolbar_BubbleTimerCB(FL_OBJECT * ob, long data) { BubbleTimerCB(ob, data); } +} // post_handler for bubble-help (Matthias) -static int BubblePost(FL_OBJECT *ob, int event, - FL_Coord /*mx*/, FL_Coord /*my*/, - int /*key*/, void */*xev*/) + FL_Coord /*mx*/, FL_Coord /*my*/, + int /*key*/, void * /*xev*/) { FL_OBJECT * bubble_timer = reinterpret_cast(ob->u_cdata); // We do not test for empty help here, since this can never happen - if(event == FL_ENTER){ + if (event == FL_ENTER) { fl_set_object_callback(bubble_timer, C_Toolbar_BubbleTimerCB, reinterpret_cast(ob)); fl_set_timer(bubble_timer, 1); } - else if(event != FL_MOTION){ + else if (event != FL_MOTION) { fl_set_timer(bubble_timer, 0); fl_hide_oneliner(); } @@ -134,14 +144,21 @@ int BubblePost(FL_OBJECT *ob, int event, } -extern "C" int C_Toolbar_BubblePost(FL_OBJECT * ob, int event, - FL_Coord /*mx*/, FL_Coord /*my*/, - int key, void * xev) +extern "C" { + +static +int C_Toolbar_BubblePost(FL_OBJECT * ob, int event, + FL_Coord /*mx*/, FL_Coord /*my*/, + int key, void * xev) { return BubblePost(ob, event, 0, 0, key, xev); } + +} #endif +} // namespace anon + void Toolbar::Pimpl::activate() { @@ -166,14 +183,15 @@ void Toolbar::Pimpl::deactivate() } } + void Toolbar::Pimpl::update() { ToolbarList::const_iterator p = toollist.begin(); ToolbarList::const_iterator end = toollist.end(); for (; p != end; ++p) { if (p->icon) { - int status = owner->getLyXFunc()->getStatus(p->action); - if (status & LyXFunc::ToggleOn) { + FuncStatus status = owner->getLyXFunc()->getStatus(p->action); + if (status.onoff(true)) { // I'd like to use a different color // here, but then the problem is to // know how to use transparency with @@ -185,8 +203,7 @@ void Toolbar::Pimpl::update() fl_set_object_color(p->icon, FL_MCOL, FL_BLUE); fl_set_object_boxtype(p->icon, FL_UP_BOX); } - - if (status & LyXFunc::Disabled) { + if (status.disabled()) { // Is there a way here to specify a // mask in order to show that the // button is disabled? (JMarc) @@ -194,14 +211,53 @@ void Toolbar::Pimpl::update() } else fl_activate_object(p->icon); + } else if (p->action == ToolbarDefaults::LAYOUTS && combox) { + if (owner->getLyXFunc()->getStatus(LFUN_LAYOUT).disabled()) + combox->deactivate(); + else + combox->activate(); } } } -void Toolbar::Pimpl::setLayout(int layout) { - if (combox) - combox->select(layout+1); +// this one is not "C" because combox callbacks are really C++ %-| +void Toolbar::Pimpl::layoutSelectedCB(int, void * arg, Combox *) +{ + Toolbar::Pimpl * tb = reinterpret_cast(arg); + + tb->layoutSelected(); +} + + +void Toolbar::Pimpl::layoutSelected() +{ + string const & layoutguiname = combox->getline(); + LyXTextClass const & tc = + textclasslist.TextClass(owner->buffer()-> + params.textclass); + + LyXTextClass::const_iterator end = tc.end(); + for (LyXTextClass::const_iterator cit = tc.begin(); + cit != end; ++cit) { + if (_(cit->name()) == layoutguiname) { + owner->getLyXFunc()->dispatch(LFUN_LAYOUT, cit->name()); + return; + } + } + lyxerr << "ERROR (Toolbar::Pimpl::layoutSelected): layout not found!" + << endl; +} + + +void Toolbar::Pimpl::setLayout(int layout) +{ + if (combox) { + LyXTextClass const & tc = + textclasslist.TextClass(owner->buffer()-> + params.textclass); + combox->select(_(tc[layout].name())); + } } @@ -219,14 +275,13 @@ void Toolbar::Pimpl::updateLayoutList(bool force) LyXTextClass::const_iterator end = tc.end(); for (LyXTextClass::const_iterator cit = tc.begin(); cit != end; ++cit) { - if ((*cit).obsoleted_by().empty()) - combox->addline(_((*cit).name())); - else - combox->addline("@N" + _((*cit).name())); + // ignore obsolete entries + if (cit->obsoleted_by().empty()) + combox->addline(_(cit->name())); } } // we need to do this. - combox->Redraw(); + combox->redraw(); } @@ -234,7 +289,7 @@ void Toolbar::Pimpl::clearLayoutList() { if (combox) { combox->clear(); - combox->Redraw(); + combox->redraw(); } } @@ -242,59 +297,42 @@ void Toolbar::Pimpl::clearLayoutList() void Toolbar::Pimpl::openLayoutList() { if (combox) - combox->Show(); + combox->show(); } -static +namespace { + void ToolbarCB(FL_OBJECT * ob, long ac) { - LyXView * owner = static_cast(ob->u_vdata); + XFormsView * owner = static_cast(ob->u_vdata); - string res = owner->getLyXFunc()->Dispatch(int(ac)); - if(!res.empty()) - lyxerr[Debug::GUI] << "ToolbarCB: Function returned: " - << res << endl; -} - - -extern "C" void C_Toolbar_ToolbarCB(FL_OBJECT * ob, long data) -{ - ToolbarCB(ob, data); + owner->getLyXFunc()->verboseDispatch(int(ac), true); } -#if 0 -// What are we supposed to do with that?? -int Toolbar::get_toolbar_func(string const & func) -{ - int action = lyxaction.LookupFunc(func); - if (action == -1) { - if (func == "separator"){ - action = TOOL_SEPARATOR; - } else if (func == "layouts"){ - action = TOOL_LAYOUTS; - } else action = 0; +extern "C" { + + static + void C_Toolbar_ToolbarCB(FL_OBJECT * ob, long data) + { + ToolbarCB(ob, data); } - return action; + } -#endif -static -void setPixmap(FL_OBJECT * obj, int action, int buttonwidth, int height) { - string name, arg, xpm_name; - kb_action act; +void setPixmap(FL_OBJECT * obj, int action, int buttonwidth, int height) +{ + string arg; + string xpm_name; - if (lyxaction.isPseudoAction(action)) { - act = lyxaction.retrieveActionArg(action, arg); - name = lyxaction.getActionName(act); + const kb_action act = lyxaction.retrieveActionArg(action, arg); + string const name = lyxaction.getActionName(act); + if (!arg.empty()) xpm_name = subst(name + ' ' + arg, ' ','_'); - } else { - act = (kb_action)action; - name = lyxaction.getActionName(action); + else xpm_name = name; - } string fullname = LibFileSearch("images", xpm_name, "xpm"); @@ -306,12 +344,16 @@ void setPixmap(FL_OBJECT * obj, int action, int buttonwidth, int height) { } if (act == LFUN_INSERT_MATH && !arg.empty()) { - lyxerr[Debug::GUI] << "Using mathed-provided icon" << endl; char const ** pixmap = get_pixmap_from_symbol(arg.c_str(), buttonwidth, height); - fl_set_pixmapbutton_data(obj, const_cast(pixmap)); - return; + if (pixmap) { + lyxerr[Debug::GUI] << "Using mathed-provided icon" + << endl; + fl_set_pixmapbutton_data(obj, + const_cast(pixmap)); + return; + } } lyxerr << "Unable to find icon `" << xpm_name << "'" << endl; @@ -323,6 +365,9 @@ void setPixmap(FL_OBJECT * obj, int action, int buttonwidth, int height) { } } +} // namespace anon + + void Toolbar::Pimpl::set(bool doingmain) { // we shouldn't set if we have not cleaned @@ -345,7 +390,7 @@ void Toolbar::Pimpl::set(bool doingmain) ToolbarList::iterator item = toollist.begin(); ToolbarList::iterator end = toollist.end(); for (; item != end; ++item) { - switch(item->action){ + switch (item->action) { case ToolbarDefaults::SEPARATOR: xpos += sepspace; break; @@ -357,7 +402,7 @@ void Toolbar::Pimpl::set(bool doingmain) if (!combox) combox = new Combox(FL_COMBOX_DROPLIST); combox->add(xpos, ypos, 135, height, 400); - combox->setcallback(LayoutsCB); + combox->setcallback(layoutSelectedCB, this); combox->resize(FL_RESIZE_ALL); combox->gravity(NorthWestGravity, NorthWestGravity); xpos += 135; @@ -380,7 +425,7 @@ void Toolbar::Pimpl::set(bool doingmain) // Set the tooltip #if FL_REVISION >= 89 - string help = lyxaction.helpText(item->action); + string const help(_(lyxaction.helpText(item->action))); fl_set_object_helper(obj, help.c_str()); #else fl_set_object_posthandler(obj, C_Toolbar_BubblePost); @@ -501,6 +546,7 @@ void Toolbar::Pimpl::reset() lightReset(); } + void Toolbar::Pimpl::lightReset() { xpos = sxpos - standardspacing; ypos = sypos;