Fix to the URL inset stuff

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@933 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/ChangeLog b/ChangeLog
index 35b95434ee19a80053ae387c90ba0cad8c9a2896..5ff837006f28834135324b252a4911000323ad53 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2000-07-27  Jean-Marc Lasgouttes  <Jean-Marc.Lasgouttes@inria.fr>
+
+       * src/frontends/xforms/forms/makefile (.c.C): change call to fdfix.sh.
+
+       * src/frontends/xforms/Makefile.am (libxforms_la_SOURCES): add a
+       few files.
+
+       * src/frontends/xforms/form_url.[Ch]: added.
+
 2000-07-27  Lars Gullik Bjønnes  <larsbj@lyx.org>
 
        * src/insets/insetbib.h: fixed bug in previous commit

diff --git a/po/POTFILES.in b/po/POTFILES.in
index e9d20613e486eddf540739507d1199212ce5277f..4f138f32155c68df30c62cb5850c2f78b17f34b6 100644 (file)
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -37,6 +37,7 @@ src/frontends/xforms/form_print.C
 src/frontends/xforms/FormTabular.C
 src/frontends/xforms/form_tabular.C
 src/frontends/xforms/FormUrl.C
+src/frontends/xforms/form_url.C
 src/frontends/xforms/Menubar_pimpl.C
 src/gettext.h
 src/insets/figinset.C

diff --git a/src/frontends/xforms/form_url.C b/src/frontends/xforms/form_url.C
new file mode 100644 (file)
index 0000000..90903fc
--- /dev/null
+++ b/src/frontends/xforms/form_url.C
@@ -0,0 +1,51 @@
+// File modified by fdfix.sh for use by lyx (with xforms >= 0.86) and gettext
+#include <config.h>
+#include "lyx_gui_misc.h"
+#include "gettext.h"
+
+/* Form definition file generated with fdesign. */
+
+#include FORMS_H_LOCATION
+#include <stdlib.h>
+#include "form_url.h"
+#include "FormUrl.h" 
+
+FD_form_url * FormUrl::build_url()
+{
+  FL_OBJECT *obj;
+  FD_form_url *fdui = new FD_form_url;
+
+  fdui->form_url = fl_bgn_form(FL_NO_BOX, 520, 140);
+  fdui->form_url->u_vdata = this;
+  obj = fl_add_box(FL_UP_BOX, 0, 0, 520, 140, "");
+  fdui->url = obj = fl_add_input(FL_NORMAL_INPUT, 70, 20, 440, 30, _("URL"));
+    fl_set_input_shortcut(obj, scex(_("Url|#U")), 1);
+    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
+    fl_set_object_gravity(obj, FL_NorthWest, FL_NorthEast);
+    fl_set_object_resize(obj, FL_RESIZE_X);
+  fdui->name = obj = fl_add_input(FL_NORMAL_INPUT, 70, 60, 440, 30, _("Name"));
+    fl_set_input_shortcut(obj, scex(_("Name|#N")), 1);
+    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
+    fl_set_object_gravity(obj, FL_NorthWest, FL_NorthEast);
+    fl_set_object_resize(obj, FL_RESIZE_X);
+  fdui->radio_html = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 70, 100, 230, 30, _("HTML type"));
+    fl_set_button_shortcut(obj, scex(_("HTML type|#H")), 1);
+    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
+    fl_set_object_gravity(obj, FL_NorthWest, FL_NorthEast);
+    fl_set_object_resize(obj, FL_RESIZE_X);
+  fdui->cancel = obj = fl_add_button(FL_NORMAL_BUTTON, 410, 100, 100, 30, _("Cancel"));
+    fl_set_button_shortcut(obj, _("^["), 1);
+    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
+    fl_set_object_gravity(obj, FL_SouthEast, FL_SouthEast);
+    fl_set_object_callback(obj, C_FormUrlCancelCB, 0);
+  fdui->ok = obj = fl_add_button(FL_RETURN_BUTTON, 300, 100, 100, 30, _("OK"));
+    fl_set_object_gravity(obj, FL_SouthEast, FL_SouthEast);
+    fl_set_object_callback(obj, C_FormUrlOKCB, 0);
+  fl_end_form();
+
+  fdui->form_url->fdui = fdui;
+
+  return fdui;
+}
+/*---------------------------------------*/
+

diff --git a/src/frontends/xforms/form_url.h b/src/frontends/xforms/form_url.h
new file mode 100644 (file)
index 0000000..7621a3c
--- /dev/null
+++ b/src/frontends/xforms/form_url.h
@@ -0,0 +1,22 @@
+/** Header file generated with fdesign on Thu Jul 27 12:19:49 2000.**/
+
+#ifndef FD_form_url_h_
+#define FD_form_url_h_
+
+/** Callbacks, globals and object handlers **/
+extern  "C" void C_FormUrlCancelCB(FL_OBJECT *, long);
+extern  "C" void C_FormUrlOKCB(FL_OBJECT *, long);
+
+
+/**** Forms and Objects ****/
+struct FD_form_url {
+
+       FL_FORM *form_url;
+       FL_OBJECT *url;
+       FL_OBJECT *name;
+       FL_OBJECT *radio_html;
+       FL_OBJECT *cancel;
+       FL_OBJECT *ok;
+};
+
+#endif /* FD_form_url_h_ */

diff --git a/src/frontends/xforms/forms/makefile b/src/frontends/xforms/forms/makefile
index 5fdde9b160ef4354611b0ee512cc997fc7a202aa..d85a1d526d3009a1f558a874d3b237af7152fb02 100644 (file)
--- a/src/frontends/xforms/forms/makefile
+++ b/src/frontends/xforms/forms/makefile
@@ -67,7 +67,7 @@ updatesrc: d e
        $(FDESIGN) -convert $<
 
 .c.C:
-       ./fdfix.sh $< $@
+       ${SHELL} ./fdfix.sh $< $@
        rm $<
 
 clean: