try this for distinguishing inner and outer tabs

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

diff --git a/src/frontends/xforms/form_index.C b/src/frontends/xforms/form_index.C
index a644864fdd1243ad3f225d2f9d7ee4a1ce9e6c10..a1ff9c7b37cea22e1e5e90a7aab2a958c523388e 100644 (file)
--- a/src/frontends/xforms/form_index.C
+++ b/src/frontends/xforms/form_index.C
@@ -8,31 +8,61 @@
 #include FORMS_H_LOCATION
 #include <stdlib.h>
 #include "form_index.h"
-#include "FormIndex.h" 
+#include "FormIndex.h"
+
+FD_form_index::~FD_form_index()
+{
+  if ( form->visible ) fl_hide_form( form );
+  fl_free_form( form );
+}
+
 
 FD_form_index * FormIndex::build_index()
 {
   FL_OBJECT *obj;
   FD_form_index *fdui = new FD_form_index;
 
-  fdui->form_index = fl_bgn_form(FL_NO_BOX, 520, 100);
-  fdui->form_index->u_vdata = this;
+  fdui->form = fl_bgn_form(FL_NO_BOX, 520, 100);
+  fdui->form->u_vdata = this;
   obj = fl_add_box(FL_UP_BOX, 0, 0, 520, 100, "");
-  fdui->key = obj = fl_add_input(FL_NORMAL_INPUT, 90, 10, 420, 30, _("Keyword"));
-    fl_set_input_shortcut(obj, scex(_("Keyword|#K#k")), 1);
+  {
+    char const * const dummy = N_("Keyword|#K");
+    fdui->input_key = obj = fl_add_input(FL_NORMAL_INPUT, 90, 10, 420, 30, idex(_(dummy)));
+    fl_set_button_shortcut(obj, scex(_(dummy)), 1);
+  }
     fl_set_object_lsize(obj, FL_NORMAL_SIZE);
     fl_set_object_resize(obj, FL_RESIZE_X);
-  fdui->cancel = obj = fl_add_button(FL_NORMAL_BUTTON, 410, 60, 100, 30, _("Cancel"));
-    fl_set_button_shortcut(obj, _("^["), 1);
+    fl_set_object_callback(obj, C_FormBaseInputCB, 0);
+  {
+    char const * const dummy = N_("Restore|#R");
+    fdui->button_restore = obj = fl_add_button(FL_NORMAL_BUTTON, 10, 60, 100, 30, idex(_(dummy)));
+    fl_set_button_shortcut(obj, scex(_(dummy)), 1);
+  }
     fl_set_object_lsize(obj, FL_NORMAL_SIZE);
+    fl_set_object_gravity(obj, FL_SouthWest, FL_SouthWest);
+    fl_set_object_callback(obj, C_FormBaseRestoreCB, 0);
+  fdui->button_ok = obj = fl_add_button(FL_RETURN_BUTTON, 190, 60, 100, 30, _("OK"));
     fl_set_object_gravity(obj, FL_SouthEast, FL_SouthEast);
-    fl_set_object_callback(obj, C_FormCommandCancelCB, 0);
-  fdui->ok = obj = fl_add_button(FL_RETURN_BUTTON, 300, 60, 100, 30, _("OK"));
+    fl_set_object_callback(obj, C_FormBaseOKCB, 0);
+  {
+    char const * const dummy = N_("Apply|#A");
+    fdui->button_apply = obj = fl_add_button(FL_NORMAL_BUTTON, 300, 60, 100, 30, idex(_(dummy)));
+    fl_set_button_shortcut(obj, scex(_(dummy)), 1);
+  }
+    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
+    fl_set_object_gravity(obj, FL_SouthEast, FL_SouthEast);
+    fl_set_object_callback(obj, C_FormBaseApplyCB, 0);
+  {
+    char const * const dummy = N_("Cancel|^[");
+    fdui->button_cancel = obj = fl_add_button(FL_NORMAL_BUTTON, 410, 60, 100, 30, idex(_(dummy)));
+    fl_set_button_shortcut(obj, scex(_(dummy)), 1);
+  }
+    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
     fl_set_object_gravity(obj, FL_SouthEast, FL_SouthEast);
-    fl_set_object_callback(obj, C_FormCommandOKCB, 0);
+    fl_set_object_callback(obj, C_FormBaseCancelCB, 0);
   fl_end_form();
 
-  fdui->form_index->fdui = fdui;
+  fdui->form->fdui = fdui;
 
   return fdui;
 }