update patch from Angus

[lyx.git] / src / frontends / xforms / FormIndex.C

diff --git a/src/frontends/xforms/FormIndex.C b/src/frontends/xforms/FormIndex.C
index 8a38f7eeb646e1869fc8055ff422e8bfa8ad06f4..c817ddb169d044b83f5e16bb8809785512aeac41 100644 (file)
--- a/src/frontends/xforms/FormIndex.C
+++ b/src/frontends/xforms/FormIndex.C
@@ -18,7 +18,6 @@
 #endif
 
 
-#include "gettext.h"
 #include "Dialogs.h"
 #include "FormIndex.h"
 #include "LyXView.h"
@@ -27,7 +26,8 @@
 #include "lyxfunc.h"
 
 FormIndex::FormIndex(LyXView * lv, Dialogs * d)
-       : FormCommand(lv, d, _("Index")), dialog_(0)
+       : FormCommand(lv, d, _("Index"), new NoRepeatedApplyPolicy),
+         dialog_(0)
 {
        // let the dialog be shown
        // These are permanent connections so we won't bother
@@ -39,63 +39,69 @@ FormIndex::FormIndex(LyXView * lv, Dialogs * d)
 
 FormIndex::~FormIndex()
 {
-       free();
        delete dialog_;
 }
 
 
+FL_FORM * FormIndex::form() const
+{
+       if (dialog_) return dialog_->form;
+       return 0;
+}
+
+
+void FormIndex::connect()
+{
+       fl_set_form_maxsize(form(), 2 * minw_, minh_);
+       FormCommand::connect();
+}
+       
+
 void FormIndex::build()
 {
        dialog_ = build_index();
 
-       int w = form()->w;
-       int h = form()->h;
+       // Workaround dumb xforms sizing bug
+       minw_ = form()->w;
+       minh_ = form()->h;
 
-       fl_set_form_minsize(form(), w,   h);
-       fl_set_form_maxsize(form(), 2*w, h);
-}
+       fl_set_input_return(dialog_->input_key, FL_RETURN_CHANGED);
 
+        // Manage the ok, apply, restore and cancel/close buttons
+       bc_.setOK(dialog_->button_ok);
+       bc_.setApply(dialog_->button_apply);
+       bc_.setCancel(dialog_->button_cancel);
+       bc_.setUndoAll(dialog_->button_restore);
+       bc_.refresh();
 
-FL_FORM * const FormIndex::form() const
-{
-       if( dialog_ ) // no need to test for dialog_->form_index
-               return dialog_->form_index;
-       else
-               return 0;
+       bc_.addReadOnly(dialog_->input_key);
 }
 
 
 void FormIndex::update()
 {
-       fl_set_input(dialog_->key, params.getContents().c_str());
-
-       if( lv_->buffer()->isReadonly() ) {
-               fl_deactivate_object( dialog_->key );
-               fl_deactivate_object( dialog_->ok );
-               fl_set_object_lcol( dialog_->ok, FL_INACTIVE );
-       } else {
-               fl_activate_object( dialog_->key );
-               fl_activate_object( dialog_->ok );
-               fl_set_object_lcol( dialog_->ok, FL_BLACK );
-       }
+       fl_set_input(dialog_->input_key, params.getContents().c_str());
+       // Surely, this should reset the buttons to their original state?
+       // It doesn't. Instead "Restore" becomes a "Close"
+       //bc_.refresh();
+       bc_.readOnly(lv_->buffer()->isReadonly());
 }
 
 
 void FormIndex::apply()
 {
-       if( lv_->buffer()->isReadonly() ) return;
+       if (lv_->buffer()->isReadonly()) return;
 
-       params.setContents( fl_get_input(dialog_->key) );
+       params.setContents(fl_get_input(dialog_->input_key));
 
-       if( inset_ != 0 )
-       {
+       if (inset_ != 0) {
                // Only update if contents have changed
-               if( params != inset_->params() ) {
-                       inset_->setParams( params );
-                       lv_->view()->updateInset( inset_, true );
+               if (params != inset_->params()) {
+                       inset_->setParams(params);
+                       lv_->view()->updateInset(inset_, true);
                }
        } else {
-               lv_->getLyXFunc()->Dispatch( LFUN_INDEX_INSERT,
-                                            params.getAsString().c_str() );
+               lv_->getLyXFunc()->Dispatch(LFUN_INDEX_INSERT,
+                                           params.getAsString());
        }
 }