X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Ffrontends%2Fxforms%2FToolbar_pimpl.C;h=db5c7d0a0bccfaca4698faf8f670ea4c3d3d224d;hb=eba67bc3120dc301bf193c3f3b570f51f00a4654;hp=ff42a6bc30106f0771138c380b5b31e40771d8ff;hpb=b8072fd6f77ebd592ecd514dadc04839516b8a8b;p=lyx.git diff --git a/src/frontends/xforms/Toolbar_pimpl.C b/src/frontends/xforms/Toolbar_pimpl.C index ff42a6bc30..db5c7d0a0b 100644 --- a/src/frontends/xforms/Toolbar_pimpl.C +++ b/src/frontends/xforms/Toolbar_pimpl.C @@ -27,11 +27,12 @@ #include "buffer.h" #include "LyXAction.h" #include "support/filetools.h" +#include "gettext.h" using std::endl; // this one is not "C" because combox callbacks are really C++ %-| -extern void LayoutsCB(int, void *); +extern void LayoutsCB(int, void *, Combox *); extern char const ** get_pixmap_from_symbol(char const * arg, int, int); extern LyXAction lyxaction; @@ -62,7 +63,14 @@ void Toolbar::Pimpl::toolbarItem::clean() { Toolbar::Pimpl::toolbarItem & -Toolbar::Pimpl::toolbarItem::operator=(const toolbarItem & ti) { +Toolbar::Pimpl::toolbarItem::operator=(toolbarItem const & ti) { + // Are we assigning the object onto itself? + if (this == &ti) + return *this; + + // If we already have an icon, release it. + clean(); + // do we have to check icon too? action = ti.action; icon = 0; // locally we need to get the icon anew @@ -112,13 +120,13 @@ int BubblePost(FL_OBJECT *ob, int event, 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(); } @@ -138,7 +146,8 @@ extern "C" int C_Toolbar_BubblePost(FL_OBJECT * ob, int event, void Toolbar::Pimpl::activate() { ToolbarList::const_iterator p = toollist.begin(); - for (; p != toollist.end(); ++p) { + ToolbarList::const_iterator end = toollist.end(); + for (; p != end; ++p) { if (p->icon) { fl_activate_object(p->icon); } @@ -149,7 +158,8 @@ void Toolbar::Pimpl::activate() void Toolbar::Pimpl::deactivate() { ToolbarList::const_iterator p = toollist.begin(); - for (; p != toollist.end(); ++p) { + ToolbarList::const_iterator end = toollist.end(); + for (; p != end; ++p) { if (p->icon) { fl_deactivate_object(p->icon); } @@ -159,7 +169,8 @@ void Toolbar::Pimpl::deactivate() void Toolbar::Pimpl::update() { ToolbarList::const_iterator p = toollist.begin(); - for (; p != toollist.end(); ++p) { + ToolbarList::const_iterator end = toollist.end(); + for (; p != end; ++p) { if (p->icon) { int status = owner->getLyXFunc()->getStatus(p->action); if (status & LyXFunc::ToggleOn) { @@ -205,18 +216,20 @@ void Toolbar::Pimpl::updateLayoutList(bool force) LyXTextClass const & tc = textclasslist.TextClass(owner->buffer()-> params.textclass); + LyXTextClass::const_iterator end = tc.end(); for (LyXTextClass::const_iterator cit = tc.begin(); - cit != tc.end(); ++cit) { + cit != end; ++cit) { if ((*cit).obsoleted_by().empty()) - combox->addline((*cit).name().c_str()); + combox->addline(_((*cit).name())); else - combox->addline(("@N" + (*cit).name()).c_str()); + combox->addline("@N" + _((*cit).name())); } } // we need to do this. combox->Redraw(); } + void Toolbar::Pimpl::clearLayoutList() { if (combox) { @@ -225,19 +238,21 @@ void Toolbar::Pimpl::clearLayoutList() } } + void Toolbar::Pimpl::openLayoutList() { if (combox) combox->Show(); } + static void ToolbarCB(FL_OBJECT * ob, long ac) { LyXView * owner = static_cast(ob->u_vdata); string res = owner->getLyXFunc()->Dispatch(int(ac)); - if(!res.empty()) + if (!res.empty()) lyxerr[Debug::GUI] << "ToolbarCB: Function returned: " << res << endl; } @@ -248,11 +263,12 @@ extern "C" void C_Toolbar_ToolbarCB(FL_OBJECT * ob, long data) ToolbarCB(ob, data); } + #if 0 // What are we supposed to do with that?? int Toolbar::get_toolbar_func(string const & func) { - int action = lyxaction.LookupFunc(func.c_str()); + int action = lyxaction.LookupFunc(func); if (action == -1) { if (func == "separator"){ action = TOOL_SEPARATOR; @@ -290,12 +306,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; @@ -327,8 +347,9 @@ void Toolbar::Pimpl::set(bool doingmain) #endif ToolbarList::iterator item = toollist.begin(); - for (; item != toollist.end(); ++item) { - switch(item->action){ + ToolbarList::iterator end = toollist.end(); + for (; item != end; ++item) { + switch (item->action){ case ToolbarDefaults::SEPARATOR: xpos += sepspace; break; @@ -416,7 +437,8 @@ void Toolbar::Pimpl::add(int action, bool doclean) fl_freeze_form(owner->getForm()); ToolbarList::iterator p = toollist.begin(); - for (; p != toollist.end(); ++p) { + ToolbarList::iterator end = toollist.end(); + for (; p != end; ++p) { p->clean(); }