From 0be696bff0994edfb1524f7150783b0faf6d1f63 Mon Sep 17 00:00:00 2001 From: Michael Schmitt Date: Thu, 6 Jul 2006 19:28:59 +0000 Subject: [PATCH] * remove various xforms relicts, in particular: * src/frontends/controllers/ControlPreamble.[Ch]: remove files, since this controller was only used by the xforms frontend git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@14352 a592a061-630c-0410-9148-cb99ea01b6c8 --- NEWS | 20 ------- README | 5 -- config/lyxinclude.m4 | 2 +- src/PrinterParams.h | 5 +- src/frontends/controllers/ControlPreamble.C | 64 --------------------- src/frontends/controllers/ControlPreamble.h | 47 --------------- src/frontends/controllers/Makefile.am | 2 - src/frontends/gtk/Dialogs.C | 2 +- src/frontends/gtk/GCharacter.h | 2 +- src/frontends/gtk/GDocument.C | 2 +- 10 files changed, 6 insertions(+), 145 deletions(-) delete mode 100644 src/frontends/controllers/ControlPreamble.C delete mode 100644 src/frontends/controllers/ControlPreamble.h diff --git a/NEWS b/NEWS index 978437fd29..f5fe25fd8e 100644 --- a/NEWS +++ b/NEWS @@ -279,26 +279,6 @@ Note that if Qt is using Xft2/fontconfig, you may need to install the latex-xft-fonts package at ftp://ftp.lyx.org/pub/lyx/contrib to get maths symbols displayed properly. -** Xforms frontend - -The advent of the Qt frontend does not mean that the historical xforms -frontend is dead. Actually, it is still the one which is the best -implemented, because we have had more time to polish it. In this release, -most of the dialogs have been redesigned to be tighter. - -Note also that the xforms library has been very recently updated to -version 1.0. This version has been released under the LGPL (Lesser -General Public License), and the availability of the source means that -many bugs that have been plaguing LyX have been fixed in xforms. You -are advised to upgrade to xforms 1.0 to enjoy all these new fixes. -In fact, LyX 1.3.0 no longer supports versions of xforms older than 0.89.5. - -In most cases the dialogs have been designed to make it impossible to input -invalid parameters. The exception to this rule is the input of length data. -Power LaTeX users can still input obtuse "glue lengths", but the widgets are -highlighted in red if this input is invalid or incomplete. This visual -feedback makes it easy to see why LyX won't allow you to Apply your changes. - ** Gnome frontend Unfortunately, the development of the Gnome frontend has mostly diff --git a/README b/README index c7ec816d93..1d87f7bfa2 100644 --- a/README +++ b/README @@ -78,11 +78,6 @@ What do I need to compile LyX from the source distribution? gcc/g++, but some others work also. As of LyX 1.4.0, you need at least gcc 3.x. - Either: - * The Xforms library, version 1.0. - * LibXpm, version 4.7 or newer. - - Or: * The Qt library, version 3.0 or newer. Read the file "INSTALL" for more information on compiling. diff --git a/config/lyxinclude.m4 b/config/lyxinclude.m4 index 4550e91bee..777e782d21 100644 --- a/config/lyxinclude.m4 +++ b/config/lyxinclude.m4 @@ -554,7 +554,7 @@ AC_DEFUN([LYX_USE_FRONTENDS], [AC_MSG_CHECKING([what frontend should be used for the GUI]) AC_ARG_WITH(frontend, [ --with-frontend=THIS Use THIS frontend as main GUI: - Possible values: xforms, qt, gtk(EXPERIMENTAL)], + Possible values: qt, gtk(EXPERIMENTAL)], [FRONTENDS="$withval"]) if test "x$FRONTENDS" = x ; then AC_MSG_RESULT(none) diff --git a/src/PrinterParams.h b/src/PrinterParams.h index c31ec1a741..32f468d02f 100644 --- a/src/PrinterParams.h +++ b/src/PrinterParams.h @@ -70,9 +70,8 @@ public: // bool duplex; /** Test that all the fields contain valid entries. It's unlikely - that the internal code will get this wrong (at least for the - xforms code anyway) however new ports and external scripts - might drive the wrong values in. + that the internal code will get this wrong however new ports + and external scripts might drive the wrong values in. */ void testInvariant() const; /// diff --git a/src/frontends/controllers/ControlPreamble.C b/src/frontends/controllers/ControlPreamble.C deleted file mode 100644 index 6f779099fc..0000000000 --- a/src/frontends/controllers/ControlPreamble.C +++ /dev/null @@ -1,64 +0,0 @@ -/** - * \file ControlPreamble.C - * This file is part of LyX, the document processor. - * Licence details can be found in the file COPYING. - * - * \author Edwin Leuven - * - * Full author contact details are available in file CREDITS. - */ - -#include - -#include "ControlPreamble.h" - -#include "buffer.h" -#include "bufferparams.h" - -using std::string; - -namespace lyx { -namespace frontend { - -ControlPreamble::ControlPreamble(Dialog & parent) - : Dialog::Controller(parent) -{} - - -bool ControlPreamble::initialiseParams(std::string const &) -{ - params_ = kernel().buffer().params().preamble; - return true; -} - - -void ControlPreamble::clearParams() -{ - params_.erase(); -} - - -void ControlPreamble::dispatchParams() -{ - // This can stay because we're going to throw the class away - // as soon as xforms 1.1 is released. - // Ie, there's no need to define LFUN_BUFFERPREAMBLE_APPLY. - Buffer & buffer = kernel().buffer(); - buffer.params().preamble = params(); - buffer.markDirty(); -} - - -string const & ControlPreamble::params() const -{ - return params_; -} - - -void ControlPreamble::params(string const & newparams) -{ - params_ = newparams; -} - -} // namespace frontend -} // namespace lyx diff --git a/src/frontends/controllers/ControlPreamble.h b/src/frontends/controllers/ControlPreamble.h deleted file mode 100644 index 7a70ddec19..0000000000 --- a/src/frontends/controllers/ControlPreamble.h +++ /dev/null @@ -1,47 +0,0 @@ -// -*- C++ -*- -/** - * \file ControlPreamble.h - * This file is part of LyX, the document processor. - * Licence details can be found in the file COPYING. - * - * \author Edwin Leuven - * - * Full author contact details are available in file CREDITS. - */ - -#ifndef CONTROLPREAMBLE_H -#define CONTROLPREAMBLE_H - -#include "Dialog.h" - -namespace lyx { -namespace frontend { - -/** A controller for Preamble dialogs. - */ -class ControlPreamble : public Dialog::Controller { -public: - /// - ControlPreamble(Dialog &); - /// - virtual bool initialiseParams(std::string const &); - /// - virtual void clearParams(); - /// - virtual void dispatchParams(); - /// - virtual bool isBufferDependent() const { return true; } - - /// - std::string const & params() const; - /// - void params(std::string const & newparams); -private: - /// - std::string params_; -}; - -} // namespace frontend -} // namespace lyx - -#endif // CONTROLPREAMBLE_H diff --git a/src/frontends/controllers/Makefile.am b/src/frontends/controllers/Makefile.am index 2d5f9469a4..aecdeaabd8 100644 --- a/src/frontends/controllers/Makefile.am +++ b/src/frontends/controllers/Makefile.am @@ -71,8 +71,6 @@ libcontrollers_la_SOURCES= \ ControlNote.h \ ControlParagraph.C \ ControlParagraph.h \ - ControlPreamble.C \ - ControlPreamble.h \ ControlPrefs.C \ ControlPrefs.h \ ControlPrint.C \ diff --git a/src/frontends/gtk/Dialogs.C b/src/frontends/gtk/Dialogs.C index 7321a2ef72..65abdfbf4d 100644 --- a/src/frontends/gtk/Dialogs.C +++ b/src/frontends/gtk/Dialogs.C @@ -1,5 +1,5 @@ /** -// * \file xforms/Dialogs.C +// * \file gtk/Dialogs.C * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * diff --git a/src/frontends/gtk/GCharacter.h b/src/frontends/gtk/GCharacter.h index fa5b366181..e4902818c7 100644 --- a/src/frontends/gtk/GCharacter.h +++ b/src/frontends/gtk/GCharacter.h @@ -5,7 +5,7 @@ * Licence details can be found in the file COPYING. * * \author John Spray - * Based on version from xforms frontend + * Based on version from former xforms frontend * * Full author contact details are available in file CREDITS. */ diff --git a/src/frontends/gtk/GDocument.C b/src/frontends/gtk/GDocument.C index 5263d9577f..067364ecb5 100644 --- a/src/frontends/gtk/GDocument.C +++ b/src/frontends/gtk/GDocument.C @@ -793,7 +793,7 @@ void GDocument::apply() newbranch->setSelected((*row)[branchColActivated_]); Glib::ustring const color = (*row)[branchColColor_]; // FIXME: The color should be editable via a color - // chooser, not a text field (see qt/xforms frontends) + // chooser, not a text field (see qt frontends) // setColor will silently ignore an invalid color and // use the normal background color for now. newbranch->setColor(color);