X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Finsets%2Finsetindex.C;h=03e844d5d5021a270962d923aea1780bfa19b1aa;hb=3c8aba3b556871fb1100a2f98cd93d5d4e3f70c9;hp=a46d471e2d7cea918e3fd7b2fdec249f7d2cc508;hpb=dfe1bc44b44903faf77ef454c98c4c3e56c1d5e3;p=lyx.git diff --git a/src/insets/insetindex.C b/src/insets/insetindex.C index a46d471e2d..03e844d5d5 100644 --- a/src/insets/insetindex.C +++ b/src/insets/insetindex.C @@ -13,10 +13,9 @@ #include "LaTeXFeatures.h" #include "gettext.h" #include "LString.h" -#include "lyx_gui_misc.h" // WarnReadonly() +#include "lyx_gui_misc.h" // WarnReadonly extern BufferView * current_view; -extern void UpdateInset(Inset * inset, bool mark_dirty = true); FD_index_form * index_form = 0; @@ -26,12 +25,12 @@ extern "C" void index_cb(FL_OBJECT *, long data) switch (data) { case 1: // OK - if(!current_view->currentBuffer()->isReadonly()) { + if(!current_view->buffer()->isReadonly()) { string tmp = fl_get_input(index_form->key); if(tmp != inset->getContents()) { inset->setContents(tmp); fl_hide_form(index_form->index_form); - UpdateInset(inset); + current_view->updateInset(inset, true); break; } } // fall through to Cancel on RO @@ -48,19 +47,19 @@ FD_index_form * create_form_index_form() FD_index_form *fdui = (FD_index_form *) fl_calloc(1, sizeof(FD_index_form)); fdui->index_form = fl_bgn_form(FL_NO_BOX, 258, 196); - obj = fl_add_box(FL_UP_BOX,0,0,258,196,""); - fdui->key = obj = fl_add_input(FL_NORMAL_INPUT,93,26,130,30, + obj = fl_add_box(FL_UP_BOX, 0, 0, 258, 196, ""); + fdui->key = obj = fl_add_input(FL_NORMAL_INPUT, 93, 26, 130, 30, idex(_("Keyword:|#K"))); - fl_set_object_shortcut(obj,scex(_("Keyword:|#K")),1); - fl_set_object_lsize(obj,FL_NORMAL_SIZE); - obj = fl_add_button(FL_RETURN_BUTTON,50,140,80,30,_("OK")); + fl_set_object_shortcut(obj, scex(_("Keyword:|#K")), 1); + fl_set_object_lsize(obj, FL_NORMAL_SIZE); + obj = fl_add_button(FL_RETURN_BUTTON, 50, 140, 80, 30, _("OK")); obj->u_vdata = index_form; - fl_set_object_callback(obj,index_cb,1); - obj = fl_add_button(FL_NORMAL_BUTTON,150,140,80,30, + fl_set_object_callback(obj, index_cb, 1); + obj = fl_add_button(FL_NORMAL_BUTTON, 150, 140, 80, 30, idex(_("Cancel|^["))); - fl_set_object_shortcut(obj,scex(_("Cancel|^[")),1); + fl_set_object_shortcut(obj, scex(_("Cancel|^[")), 1); obj->u_vdata = index_form; - fl_set_object_callback(obj,index_cb,0); + fl_set_object_callback(obj, index_cb, 0); fl_end_form(); return fdui; @@ -86,10 +85,10 @@ InsetIndex::~InsetIndex() } -void InsetIndex::Edit(int, int) +void InsetIndex::Edit(BufferView * bv, int, int, unsigned int) { - if(current_view->currentBuffer()->isReadonly()) - WarnReadonly(); + if(bv->buffer()->isReadonly()) + WarnReadonly(bv->buffer()->fileName()); if (!index_form) index_form = create_form_index_form();