X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Ffrontends%2Fxforms%2Fform_copyright.C;h=371744a8ec3154c61617c320cdcc2e7da3640d61;hb=9f29ab3aa5fb11baca9bc28dc3710076cb3a2645;hp=be07dafc774161dcd6935cd960745336474eaf86;hpb=ef59101fe7f9231107b32b753fc9690474f58785;p=lyx.git

diff --git a/src/frontends/xforms/form_copyright.C b/src/frontends/xforms/form_copyright.C
index be07dafc77..371744a8ec 100644
--- a/src/frontends/xforms/form_copyright.C
+++ b/src/frontends/xforms/form_copyright.C
@@ -8,37 +8,47 @@
 #include FORMS_H_LOCATION
 #include <stdlib.h>
 #include "form_copyright.h"
-#include "FormCopyright.h" 
+#include "FormCopyright.h"
+
+FD_form_copyright::~FD_form_copyright()
+{
+  if ( form->visible ) fl_hide_form( form );
+  fl_free_form( form );
+}
+
 
 FD_form_copyright * FormCopyright::build_copyright()
 {
   FL_OBJECT *obj;
   FD_form_copyright *fdui = new FD_form_copyright;
 
-  fdui->form_copyright = fl_bgn_form(FL_NO_BOX, 450, 430);
-  fdui->form_copyright->u_vdata = this;
+  fdui->form = fl_bgn_form(FL_NO_BOX, 450, 430);
+  fdui->form->u_vdata = this;
   obj = fl_add_box(FL_UP_BOX, 0, 0, 450, 430, "");
-  obj = fl_add_text(FL_NORMAL_TEXT, 10, 10, 430, 50, _("LyX is Copyright (C) 1995 by Matthias Ettrich, \n1995-2000 LyX Team"));
+  fdui->text_copyright = obj = fl_add_text(FL_NORMAL_TEXT, 10, 10, 430, 50, "");
     fl_set_object_boxtype(obj, FL_FRAME_BOX);
     fl_set_object_lsize(obj, FL_NORMAL_SIZE);
     fl_set_object_lalign(obj, FL_ALIGN_CENTER|FL_ALIGN_INSIDE);
-    fl_set_object_gravity(obj, FL_NorthWest, FL_NorthEast);
-  obj = fl_add_text(FL_NORMAL_TEXT, 10, 70, 430, 110, _("This program is free software; you can redistribute it\nand/or modify it under the terms of the GNU General\nPublic License as published by the Free Software\nFoundation; either version 2 of the License, or\n(at your option) any later version."));
+  fdui->text_licence = obj = fl_add_text(FL_NORMAL_TEXT, 10, 70, 430, 110, "");
     fl_set_object_boxtype(obj, FL_FRAME_BOX);
     fl_set_object_lsize(obj, FL_NORMAL_SIZE);
     fl_set_object_lalign(obj, FL_ALIGN_CENTER|FL_ALIGN_INSIDE);
-  fdui->button_ok = obj = fl_add_button(FL_RETURN_BUTTON, 160, 390, 140, 30, _("OK"));
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_gravity(obj, FL_South, FL_South);
-    fl_set_object_resize(obj, FL_RESIZE_NONE);
-    fl_set_object_callback(obj, C_FormCopyrightOKCB, 0);
-  obj = fl_add_text(FL_NORMAL_TEXT, 10, 190, 430, 190, _("LyX is distributed in the hope that it will\nbe useful, but WITHOUT ANY WARRANTY;\nwithout even the implied warranty of MERCHANTABILITY\nor FITNESS FOR A PARTICULAR PURPOSE.\nSee the GNU General Public License for more details.\nYou should have received a copy of\nthe GNU General Public License\nalong with this program; if not, write to\nthe Free Software Foundation, Inc., \n675 Mass Ave, Cambridge, MA 02139, USA."));
+  fdui->text_disclaimer = obj = fl_add_text(FL_NORMAL_TEXT, 10, 190, 430, 190, "");
     fl_set_object_boxtype(obj, FL_FRAME_BOX);
     fl_set_object_lsize(obj, FL_NORMAL_SIZE);
     fl_set_object_lalign(obj, FL_ALIGN_CENTER|FL_ALIGN_INSIDE);
+  {
+    char const * const dummy = N_("Close|^[^M");
+    fdui->button_cancel = obj = fl_add_button(FL_RETURN_BUTTON, 160, 390, 140, 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_South, FL_South);
+    fl_set_object_resize(obj, FL_RESIZE_NONE);
+    fl_set_object_callback(obj, C_FormBaseDeprecatedCancelCB, 0);
   fl_end_form();
 
-  fdui->form_copyright->fdui = fdui;
+  fdui->form->fdui = fdui;
 
   return fdui;
 }