* bind/*.bind: do the same correctly for all files :)
+2001-07-13 Edwin Leuven <leuven@fee.uva.nl>
+
+ * ui/default.ui: remove credits/version/copyright add about lyx
+
2001-07-12 Juergen Vigna <jug@sad.it>
* bind/cua.bind: moved C-l from mode-tex to ert-insert
Item "Known Bugs|K" "help-open BUGS"
Item "LaTeX Configuration|L" "help-open LaTeXConfig"
Separator
- Item "Copyright and Warranty...|o" "help-copyright"
- Item "Credits...|d" "help-credits"
- Item "Version...|V" "help-version"
+ Item "About LyX|X" "help-aboutlyx"
End
End
+2001-07-13 Angus Leeming <a.leeming@ic.ac.uk>
+
+ Consistent use of Lsstream.h:
+ * Lsstream.h: added using std::stringstream for consistencies sake.
+
+ * buffer.C: removed using std::stringstream
+
+ * lyxfont.C (stateText):
+ * paragraph.C (asString):
+ * text.C (selectNextWord, selectSelectedWord):
+ * text2.C (setCounter):
+ * vspace.C (asString, asLatexString):
+ std::ostringstream -> ostringstream.
+
+2001-07-13 Edwin Leuven <leuven@fee.uva.nl>
+
+ * LyXAction.C: add LFUN_HELP_ABOUTLYX
+ * commandtags.h: add LFUN_HELP_ABOUTLYX
+ * lyxfunc.C: add about lyx remove credits/copyright/version stuff
+
2001-07-13 Edwin Leuven <leuven@fee.uva.nl>
* BufferView_pimpl.C: sigchldchecker instead of sigchldhandeler in
using std::istringstream;
using std::ostringstream;
+using std::stringstream;
#endif
{ LFUN_TRANSPOSE_CHARS, "chars-transpose", "", Noop },
{ LFUN_FLOAT_LIST, "float-list", "Insert a float list", Noop },
{ LFUN_ESCAPE, "escape", "", Noop },
+ { LFUN_HELP_ABOUTLYX, "help-aboutlyx",
+ N_("Display information about LyX"), NoBuffer },
{ LFUN_NOACTION, "", "", Noop }
};
#include "BufferView.h"
#include "ParagraphParameters.h"
-using std::stringstream;
using std::ostream;
using std::ofstream;
using std::ifstream;
if (c == Paragraph::META_INSET) {
Inset * inset = par->getInset(i);
- std::ostringstream ost;
+ ostringstream ost;
inset->docBook(this, ost);
string tmp_out = ost.str().c_str();
LFUN_MESSAGE_PUSH, // Lgb 20010410
LFUN_MESSAGE_POP, // Lgb 20010410
LFUN_TRANSPOSE_CHARS, // Lgb 20010425
- LFUN_ESCAPE, // Lgb 20010517
+ LFUN_ESCAPE, // 260 // Lgb 20010517
+ LFUN_HELP_ABOUTLYX, // Edwin 20010712
LFUN_LASTACTION /* this marks the end of the table */
};
+2001-07-13 Edwin Leuven <leuven@fee.uva.nl>
+
+ * Dialogs.h: add showAboutlyx and remove showCredits and Copyright
+
2001-07-13 Edwin Leuven <leuven@fee.uva.nl>
* Dialogs.h: added showSpellchecker
//@{
/// Do we really have to push this?
SigC::Signal1<void, std::vector<string> const &> SetDocumentClassChoice;
+ ///
+ SigC::Signal0<void> showAboutlyx;
/// show the key and label of a bibliography entry
SigC::Signal1<void, InsetCommand *> showBibitem;
/// show the bibtex dialog
///
SigC::Signal1<void, string const &> createCitation;
///
- SigC::Signal0<void> showCopyright;
- ///
- SigC::Signal0<void> showCredits;
- ///
SigC::Signal0<void> showDocument;
///
SigC::Signal1<void, InsetError *> showError;
+2001-07-13 Angus Leeming <a.leeming@ic.ac.uk>
+
+ Consistent use of Lsstream.h:
+ * ControlAboutlyx.[Ch] (getCredits):
+ * ControlVCLog.[Ch] (getVCLogFile): std::stringstream -> stringstream.
+
+2001-07-13 Edwin Leuven <leuven@fee.uva.nl>
+
+ * ControlCredits.[Ch]: removed
+ * ControlCopyright.[Ch]: removed
+ * ControlAboutlyx.[Ch]: added (replaces previous)
+ * GUI.h: removed credits and copyright added about lyx stuff
+
2001-07-13 Jean-Marc Lasgouttes <Jean-Marc.Lasgouttes@inria.fr>
* ControlSpellchecker.C (getSuggestion):
(getWord): add std:: qualifier
-2001-07-13 Edwin Leuven <leuven@fee.uva.nl>
+>001-07-13 Edwin Leuven <leuven@fee.uva.nl>
* ControlSpellchecker.[Ch]: added
* ViewBase.h: added partialUpdate(int) member
* *.[h]: added // -*- C++ -*-
* *.[C]: removed // -*- C++ -*-
- * ControlCharacter.[Ch]: added // -*- C++ -*-
- (setParams): Check contents of font_ to activate Apply button.
+ * ControlCharacter.[Ch]: (setParams): Check contents of font_ to
+ activate Apply button.
(clearParams): removed.
font_ is now stored as a boost::scoped_ptr.
font_ is no longer deleted on hide(), so it's contents can now be used
--- /dev/null
+/**
+ * \file ControlAboutlyx.C
+ * Copyright 2001 The LyX Team.
+ * See the file COPYING.
+ *
+ * \author Edwin Leuven, leuven@fee.uva.nl
+ * \author Angus Leeming, a.leeming@.ac.uk
+ */
+
+#include <config.h>
+#include <fstream>
+
+#ifdef __GNUG__
+#pragma implementation
+#endif
+
+#include "ViewBase.h"
+#include "ButtonControllerBase.h"
+#include "ControlAboutlyx.h"
+#include "Dialogs.h"
+#include "LyXView.h"
+#include "Lsstream.h"
+#include "BufferView.h"
+#include "gettext.h"
+#include "support/filetools.h" // FileSearch
+#include "version.h"
+
+// needed for the browser
+extern string system_lyxdir;
+extern string user_lyxdir;
+
+ControlAboutlyx::ControlAboutlyx(LyXView & lv, Dialogs & d)
+ : ControlDialog<ControlConnectBI>(lv, d)
+{
+ d_.showAboutlyx.connect(SigC::slot(this, &ControlAboutlyx::show));
+}
+
+
+stringstream & ControlAboutlyx::getCredits(stringstream & ss) const
+{
+ string const name = FileSearch(system_lyxdir, "CREDITS");
+
+ bool found(!name.empty());
+
+ if (found) {
+ std::ifstream in(name.c_str());
+ found = (in.get());
+
+ if (found) {
+ in.seekg(0, std::ios::beg); // rewind to the beginning
+
+ ss << in.rdbuf();
+ found = (ss.good());
+ }
+ }
+
+ if (!found) {
+ ss << _("ERROR: LyX wasn't able to read CREDITS file\n")
+ << _("Please install correctly to estimate the great\n")
+ << _("amount of work other people have done for the LyX project.");
+ }
+
+ return ss;
+}
+
+string const ControlAboutlyx::getCopyright() const
+{
+ return _("LyX is Copyright (C) 1995 by Matthias Ettrich,\n1995-2001 LyX Team");
+}
+
+string const ControlAboutlyx::getLicense() const
+{
+ return _("This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.");
+}
+
+string const ControlAboutlyx::getDisclaimer() const
+{
+ return _("LyX is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\nSee the GNU General Public License for more details.\nYou should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.");
+}
+
+string const ControlAboutlyx::getVersion() const
+{
+ stringstream ss;
+
+ ss << _("LyX Version ")
+ << LYX_VERSION
+ << " of "
+ << LYX_RELEASE
+ << "\n"
+ << ("Library directory: ")
+ << MakeDisplayPath(system_lyxdir)
+ << "\n"
+ << _("User directory: ")
+ << MakeDisplayPath(user_lyxdir);
+
+ return ss.str().c_str();
+}
--- /dev/null
+// -*- C++ -*-
+/**
+ * \file ControlAboutLyX.h
+ * Copyright 2001 The LyX Team.
+ * See the file COPYING.
+ *
+ * \author Edwin Leuven, leuven@fee.uva.nl
+ * \author Angus Leeming <a.leeming@ic.ac.uk>
+ */
+
+#ifndef CONTROLABOUTLYX_H
+#define CONTROLABOUTLYX_H
+
+#include "Lsstream.h"
+
+#ifdef __GNUG__
+#pragma interface
+#endif
+
+#include "ControlDialogs.h"
+
+/** A controller for the About LyX dialogs.
+ */
+class ControlAboutlyx : public ControlDialog<ControlConnectBI> {
+public:
+ ///
+ ControlAboutlyx(LyXView &, Dialogs &);
+
+ ///
+ stringstream & getCredits(stringstream &) const;
+
+ ///
+ string const getCopyright() const;
+
+ ///
+ string const getLicense() const;
+
+ ///
+ string const getDisclaimer() const;
+
+ ///
+ string const getVersion() const;
+
+
+private:
+ /// not needed.
+ virtual void apply() {}
+};
+
+#endif // CONTROLABOUTLYX_H
+
-/*
- * \file ControlCopyright.C
- * Copyright 2000-2001 The LyX Team.
- * See the file COPYING.
- *
- * \author Allan Rae
- * \author Angus Leeming, a.leeming@.ac.uk
- */
-
-#ifdef __GNUG__
-#pragma implementation
-#endif
-
-#include <config.h>
-
-#include "ViewBase.h"
-#include "ButtonControllerBase.h"
-#include "ControlCopyright.h"
-#include "Dialogs.h"
-#include "LyXView.h"
-#include "BufferView.h"
-#include "gettext.h"
-
-using SigC::slot;
-
-ControlCopyright::ControlCopyright(LyXView & lv, Dialogs & d)
- : ControlDialog<ControlConnectBI>(lv, d)
-{
- d_.showCopyright.connect(slot(this, &ControlCopyright::show));
-}
-
-
-string const ControlCopyright::getCopyright() const
-{
- return _("LyX is Copyright (C) 1995 by Matthias Ettrich,\n1995-2001 LyX Team");
-}
-
-string const ControlCopyright::getLicence() const
-{
- return _("This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.");
-}
-
-string const ControlCopyright::getDisclaimer() const
-{
- return _("LyX is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\nSee the GNU General Public License for more details.\nYou should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.");
-}
-// -*- C++ -*-
-/*
- * \file ControlCopyright.C
- * Copyright 2000-2001 The LyX Team.
- * See the file COPYING.
- *
- * \author Allan Rae
- * \author Angus Leeming, a.leeming@.ac.uk
- */
-
-#ifndef CONTROLCOPYRIGHT_H
-#define CONTROLCOPYRIGHT_H
-
-#ifdef __GNUG__
-#pragma interface
-#endif
-
-#include "ControlDialogs.h"
-
-/** A controller for Copyright dialogs.
- */
-class ControlCopyright : public ControlDialog<ControlConnectBI> {
-public:
- ///
- ControlCopyright(LyXView &, Dialogs &);
-
- ///
- string const getCopyright() const;
- ///
- string const getLicence() const;
- ///
- string const getDisclaimer() const;
-
-private:
- /// not needed.
- virtual void apply() {}
-};
-
-#endif // CONTROLCOPYRIGHT_H
-/**
- * \file ControlCredits.C
- * Copyright 2001 The LyX Team.
- * See the file COPYING.
- *
- * \author Edwin Leuven, leuven@fee.uva.nl
- * \author Angus Leeming, a.leeming@.ac.uk
- */
-
-#include <config.h>
-#include <fstream>
-
-#ifdef __GNUG__
-#pragma implementation
-#endif
-
-#include "ViewBase.h"
-#include "ButtonControllerBase.h"
-#include "ControlCredits.h"
-#include "Dialogs.h"
-#include "LyXView.h"
-#include "BufferView.h"
-#include "gettext.h"
-#include "support/filetools.h" // FileSearch
-
-// needed for the browser
-extern string system_lyxdir;
-
-
-ControlCredits::ControlCredits(LyXView & lv, Dialogs & d)
- : ControlDialog<ControlConnectBI>(lv, d)
-{
- d_.showCredits.connect(SigC::slot(this, &ControlCredits::show));
-}
-
-
-std::stringstream & ControlCredits::getCredits(std::stringstream & ss) const
-{
- string const name = FileSearch(system_lyxdir, "CREDITS");
-
- bool found(!name.empty());
-
- if (found) {
- std::ifstream in(name.c_str());
- found = (in.get());
-
- if (found) {
- in.seekg(0, std::ios::beg); // rewind to the beginning
-
- ss << in.rdbuf();
- found = (ss.good());
- }
- }
-
- if (!found) {
- ss << _("ERROR: LyX wasn't able to read CREDITS file\n")
- << _("Please install correctly to estimate the great\n")
- << _("amount of work other people have done for the LyX project.");
- }
-
- return ss;
-}
-// -*- C++ -*-
-/**
- * \file ControlCredits.h
- * Copyright 2001 The LyX Team.
- * See the file COPYING.
- *
- * \author Edwin Leuven, leuven@fee.uva.nl
- * \author Angus Leeming <a.leeming@ic.ac.uk>
- */
-
-#ifndef CONTROLCREDITS_H
-#define CONTROLCREDITS_H
-
-#include "Lsstream.h"
-
-#ifdef __GNUG__
-#pragma interface
-#endif
-
-#include "ControlDialogs.h"
-
-/** A controller for the Credits dialogs.
- */
-class ControlCredits : public ControlDialog<ControlConnectBI> {
-public:
- ///
- ControlCredits(LyXView &, Dialogs &);
-
- ///
- std::stringstream & getCredits(std::stringstream &) const;
-
-private:
- /// not needed.
- virtual void apply() {}
-};
-
-#endif // CONTROLCREDITS_H
-
}
-std::stringstream & ControlVCLog::getVCLogFile(std::stringstream & ss) const
+stringstream & ControlVCLog::getVCLogFile(stringstream & ss) const
{
string const name = lv_.view()->buffer()->lyxvc.getLogFile();
/**
* A controller for the Version Control log viewer.
*/
-class stringstream;
-
class ControlVCLog : public ControlDialog<ControlConnectBD> {
public:
///
ControlVCLog(LyXView &, Dialogs &);
/// get a stringstream containing the log file
- std::stringstream & getVCLogFile(std::stringstream & ss) const;
+ stringstream & getVCLogFile(stringstream & ss) const;
/// get the filename of the buffer
string const getBufferFileName() const;
class OkCancelReadOnlyPolicy;
class NoRepeatedApplyReadOnlyPolicy;
+/** Specialization for About LyX dialog
+ */
+class ControlAboutlyx;
+
+template <class GUIview, class GUIbc>
+class GUIAboutlyx :
+ public GUI<ControlAboutlyx, GUIview, OkCancelPolicy, GUIbc> {
+public:
+ ///
+ GUIAboutlyx(LyXView & lv, Dialogs & d)
+ : GUI<ControlAboutlyx, GUIview, OkCancelPolicy, GUIbc>(lv, d) {}
+};
/** Specialization for Bibitem dialog
*/
};
-/** Specialization for Copyright dialog
- */
-class ControlCopyright;
-
-template <class GUIview, class GUIbc>
-class GUICopyright :
- public GUI<ControlCopyright, GUIview, OkCancelPolicy, GUIbc> {
-public:
- ///
- GUICopyright(LyXView & lv, Dialogs & d)
- : GUI<ControlCopyright, GUIview, OkCancelPolicy, GUIbc>(lv, d) {}
-};
-
-
-/** Specialization for Credits dialog
- */
-class ControlCredits;
-
-template <class GUIview, class GUIbc>
-class GUICredits :
- public GUI<ControlCredits, GUIview, OkCancelPolicy, GUIbc> {
-public:
- ///
- GUICredits(LyXView & lv, Dialogs & d)
- : GUI<ControlCredits, GUIview, OkCancelPolicy, GUIbc>(lv, d) {}
-};
-
-
/** Specialization for Error dialog
*/
class ControlError;
ButtonControllerBase.h \
ButtonPolicies.C \
ButtonPolicies.h \
+ ControlAboutlyx.C \
+ ControlAboutlyx.h \
ControlBibitem.C \
ControlBibitem.h \
ControlBibtex.C \
ControlCommand.h \
ControlConnections.C \
ControlConnections.h \
- ControlCopyright.C \
- ControlCopyright.h \
- ControlCredits.h \
- ControlCredits.C \
ControlDialogs.h \
ControlError.h \
ControlError.C \
/** Defaults to nothing. Can be used by the Controller, however, to
indicate to the View that something has changed and that the
dialog therefore needs updating. */
- virtual void partialUpdate(int id) {}
+ virtual void partialUpdate(int) {}
protected:
/// The view is, after all, controlled!
+2001-07-13 Angus Leeming <a.leeming@ic.ac.uk>
+
+ Consistent use of Lsstream.h:
+ * FormCredits.C (build): std::stringstream -> stringstream.
+
2001-06-16 Angus Leeming <a.leeming@ic.ac.uk>
* gnomeBC.h: clean-up of included files.
text()->freeze();
// Get the credits into the string stream
- std::stringstream ss;
+ stringstream ss;
string credits = controller().getCredits(ss).str();
// Create the strings that we need to detect.
+2001-07-13 Angus Leeming <a.leeming@ic.ac.uk>
+
+ Consistent use of Lsstream.h:
+ * FormCredits.C (build): std::stringstream -> stringstream.
+
2001-06-17 Angus Leeming <a.leeming@ic.ac.uk>
* FormCitation.C (build): removed bc().refresh() call as the controller
bc().setCancel(dialog_->okPB);
bc().refresh();
- std::stringstream ss;
+ stringstream ss;
QString xformscredits = controller().getCredits( ss ).str().c_str();
QStringList xformslist = QStringList::split( '\n', controller().getCredits( ss ).str().c_str(), true );
for( QStringList::Iterator it = xformslist.begin(); it != xformslist.end(); ++it ) {
+2001-07-13 Angus Leeming <a.leeming@ic.ac.uk>
+
+ Consistent use of Lsstream.h:
+ * FormAboutlyx.C (build):
+ * FormVCLog.C (update): std::ostringstream -> ostringstream.
+
+ * FormMathsDelim.C (apply):
+ * FormMathsMatrix.C (apply): std::stringstream -> stringstream.
+
+2001-07-13 Edwin Leuven <leuven@fee.uva.nl>
+
+ * implement 1 about lyx dialog instead of 3 separate ones
+
+ * FormCredits.[Ch]: removed
+ * FormCopyright.[Ch]: removed
+ * form_credits.[Ch]: removed
+ * forms/form_credits.fd: removed
+ * form_copyright.[Ch]: removed
+ * forms/form_copyright.fd: removed
+ * FormAboutlyx.[Ch]: added
+ * form_aboutlyx.[Ch]: added
+ * forms/form_aboutlyx.fd: added
+ * Dialogs.C: add about lyx stuff
+
2001-07-13 Edwin Leuven <leuven@fee.uva.nl>
* add spellchecker
#include "xformsBC.h"
+#include "ControlAboutlyx.h"
#include "ControlBibitem.h"
#include "ControlBibtex.h"
#include "ControlCharacter.h"
#include "ControlCitation.h"
-#include "ControlCopyright.h"
-#include "ControlCredits.h"
#include "ControlError.h"
#include "ControlExternal.h"
#include "ControlGraphics.h"
#include "GUI.h"
#include "combox.h" // needed for clean destruction of boost::scoped_ptr
+#include "form_aboutlyx.h"
#include "form_bibitem.h"
#include "form_bibtex.h"
#include "form_browser.h"
#include "form_character.h"
#include "form_citation.h"
-#include "form_copyright.h"
-#include "form_credits.h"
#include "form_error.h"
#include "form_external.h"
#include "form_graphics.h"
#include "form_toc.h"
#include "form_url.h"
+#include "FormAboutlyx.h"
#include "FormBibitem.h"
#include "FormBibtex.h"
#include "FormCharacter.h"
#include "FormCitation.h"
-#include "FormCopyright.h"
-#include "FormCredits.h"
#include "FormError.h"
#include "FormExternal.h"
#include "FormGraphics.h"
{
splash_.reset(new GUISplash<FormSplash>(*this));
+ add(new GUIAboutlyx<FormAboutlyx, xformsBC>(*lv, *this));
add(new GUIBibitem<FormBibitem, xformsBC>(*lv, *this));
add(new GUIBibtex<FormBibtex, xformsBC>(*lv, *this));
add(new GUICharacter<FormCharacter, xformsBC>(*lv, *this));
add(new GUICitation<FormCitation, xformsBC>(*lv, *this));
- add(new GUICopyright<FormCopyright, xformsBC>(*lv, *this));
- add(new GUICredits<FormCredits, xformsBC>(*lv, *this));
add(new GUIError<FormError, xformsBC>(*lv, *this));
add(new GUIExternal<FormExternal, xformsBC>(*lv, *this));
add(new GUIGraphics<FormGraphics, xformsBC>(*lv, *this));
--- /dev/null
+/**
+ * \file FormAboutlyx.C
+ * Copyright 2001 The LyX Team.
+ * See the file COPYING.
+ *
+ * \author Edwin Leuven, leuven@fee.uva.nl
+ * \author Angus Leeming, a.leeming@.ac.uk
+ */
+
+#ifdef __GNUG__
+#pragma implementation
+#endif
+
+#include <config.h>
+
+#include "xformsBC.h"
+#include "ControlAboutlyx.h"
+#include "FormAboutlyx.h"
+#include "form_aboutlyx.h"
+#include "xforms_helpers.h"
+#include "Lsstream.h"
+
+using std::getline;
+
+typedef FormCB<ControlAboutlyx, FormDB<FD_form_aboutlyx> > base_class;
+
+FormAboutlyx::FormAboutlyx(ControlAboutlyx & c)
+ : base_class(c, _("About LyX"))
+{}
+
+FL_FORM * FormAboutlyx::form() const
+{
+ if (dialog_.get()) return dialog_->form;
+ return 0;
+}
+
+void FormAboutlyx::build()
+{
+ dialog_.reset(build_aboutlyx());
+
+ // create version tab
+ version_.reset(build_tab_version());
+ fl_set_object_label(version_->text_version,
+ controller().getVersion().c_str());
+ fl_set_object_label(version_->text_copyright,
+ controller().getCopyright().c_str());
+
+ // create license and warranty tab
+ license_.reset(build_tab_license());
+
+ string str = formatted(controller().getLicense(),
+ license_->text_license->w-10);
+ fl_set_object_label(license_->text_license, str.c_str());
+
+ str = formatted(controller().getDisclaimer(),
+ license_->text_warranty->w-10);
+ fl_set_object_label(license_->text_warranty, str.c_str());
+
+ // create credits
+ credits_.reset(build_tab_credits());
+ stringstream ss;
+ fl_add_browser_line(credits_->browser_credits,
+ controller().getCredits(ss).str().c_str());
+
+ // stack tabs
+ fl_addto_tabfolder(dialog_->tabbed_folder,_("Copyright and Version"),
+ version_->form);
+ fl_addto_tabfolder(dialog_->tabbed_folder,_("License and Warranty"),
+ license_->form);
+ fl_addto_tabfolder(dialog_->tabbed_folder,_("Credits"),
+ credits_->form);
+
+ fl_set_form_maxsize( dialog_->form,
+ dialog_->form->w, dialog_->form->h);
+
+ // Manage the cancel/close button
+ bc().setCancel(dialog_->close);
+}
+
+
+
+
+
--- /dev/null
+// -*- C++ -*-
+/**
+ * \file FormAboutlyx.h
+ * Copyright 2001 The LyX Team.
+ * See the file COPYING.
+ *
+ * \author Edwin Leuven <leuven@fee.uva.nl>
+ * \author Angus Leeming <a.leeming@.ac.uk>
+ */
+
+#ifndef FORMABOUTLYX_H
+#define FORMABOUTLYX_H
+
+#include <vector>
+#include <boost/smart_ptr.hpp>
+
+#ifdef __GNUG__
+#pragma interface
+#endif
+
+
+#include "FormBase.h"
+
+class ControlAboutlyx;
+struct FD_form_aboutlyx;
+struct FD_form_tab_version;
+struct FD_form_tab_credits;
+struct FD_form_tab_license;
+
+/** This class provides an XForms implementation of the FormAboutlyx Dialog.
+ */
+class FormAboutlyx : public FormCB<ControlAboutlyx, FormDB<FD_form_aboutlyx> > {
+public:
+ ///
+ FormAboutlyx(ControlAboutlyx &);
+
+private:
+ /// not needed.
+ virtual void apply() {}
+ /// not needed.
+ virtual void update() {}
+ /// Build the dialog
+ virtual void build();
+
+ ///
+ virtual FL_FORM * form() const;
+
+ /// Fdesign generated method
+ FD_form_aboutlyx * build_aboutlyx();
+ ///
+ FD_form_tab_version * build_tab_version();
+ ///
+ FD_form_tab_credits * build_tab_credits();
+ ///
+ FD_form_tab_license * build_tab_license();
+
+ /// Real GUI implementation.
+ boost::scoped_ptr<FD_form_aboutlyx> dialog_;
+ ///
+ boost::scoped_ptr<FD_form_tab_version> version_;
+ ///
+ boost::scoped_ptr<FD_form_tab_credits> credits_;
+ ///
+ boost::scoped_ptr<FD_form_tab_license> license_;
+};
+
+#endif // FORMABOUTLYX_H
+
-/*
- * \file FormCopyright.C
- * Copyright 2000-2001 The LyX Team.
- * See the file COPYING.
- *
- * \author Allan Rae, rae@lyx.org
- * \author Angus Leeming, a.leeming@.ac.uk
- */
-
-#ifdef __GNUG__
-#pragma implementation
-#endif
-
-#include <config.h>
-
-#include "xformsBC.h"
-#include "ControlCopyright.h"
-#include "FormCopyright.h"
-#include "form_copyright.h"
-#include "xforms_helpers.h"
-
-typedef FormCB<ControlCopyright, FormDB<FD_form_copyright> > base_class;
-
-FormCopyright::FormCopyright(ControlCopyright & c)
- : base_class(c, _("Copyright and Warranty"))
-{}
-
-
-void FormCopyright::build()
-{
- dialog_.reset(build_copyright());
-
- string str = formatted(controller().getCopyright(),
- dialog_->text_copyright->w-10);
-
- fl_set_object_label(dialog_->text_copyright, str.c_str());
-
- str = formatted(controller().getLicence(),
- dialog_->text_licence->w-10);
-
- fl_set_object_label(dialog_->text_licence, str.c_str());
-
- str = formatted(controller().getDisclaimer(),
- dialog_->text_disclaimer->w-10);
-
- fl_set_object_label(dialog_->text_disclaimer, str.c_str());
-
- // Manage the cancel/close button
- bc().setCancel(dialog_->button_cancel);
-}
-// -*- C++ -*-
-/**
- * \file FormCopyright.h
- * This file is part of
- * ======================================================
- *
- * LyX, The Document Processor
- *
- * Copyright 1995 Matthias Ettrich
- * Copyright 1995-2001 The LyX Team.
- *
- * This file Copyright 2000-2001
- * Allan Rae
- * ======================================================
- *
- * \author Allan Rae
- * \author Angus Leeming, a.leeming@.ac.uk
- */
-
-#ifndef FORMCOPYRIGHT_H
-#define FORMCOPYRIGHT_H
-
-#ifdef __GNUG__
-#pragma interface
-#endif
-
-#include "FormBase.h"
-
-class ControlCopyright;
-struct FD_form_copyright;
-
-/** This class provides an XForms implementation of the FormCopyright Dialog.
- */
-class FormCopyright
- : public FormCB<ControlCopyright, FormDB<FD_form_copyright> > {
-public:
- ///
- FormCopyright(ControlCopyright &);
-
-private:
- /// not needed.
- virtual void apply() {}
- /// Build the dialog
- virtual void build();
- /// not needed.
- virtual void update() {}
-
- /// Fdesign generated method
- FD_form_copyright * build_copyright();
-};
-
-#endif // FORMCOPYRIGHT_H
-/**
- * \file FormCredits.C
- * Copyright 2001 The LyX Team.
- * See the file COPYING.
- *
- * \author Edwin Leuven, leuven@fee.uva.nl
- * \author Angus Leeming, a.leeming@.ac.uk
- */
-
-#ifdef __GNUG__
-#pragma implementation
-#endif
-
-#include <config.h>
-
-#include "xformsBC.h"
-#include "ControlCredits.h"
-#include "FormCredits.h"
-#include "form_credits.h"
-#include "xforms_helpers.h"
-#include "Lsstream.h"
-
-using std::getline;
-
-typedef FormCB<ControlCredits, FormDB<FD_form_credits> > base_class;
-
-FormCredits::FormCredits(ControlCredits & c)
- : base_class(c, _("Credits"))
-{}
-
-
-void FormCredits::build()
-{
- dialog_.reset(build_credits());
-
- // Manage the cancel/close button
- bc().setCancel(dialog_->button_cancel);
-
- std::stringstream ss;
- fl_add_browser_line(dialog_->browser_credits,
- controller().getCredits(ss).str().c_str());
-}
-// -*- C++ -*-
-/**
- * \file FormCredits.h
- * Copyright 2001 The LyX Team.
- * See the file COPYING.
- *
- * \author Edwin Leuven, leuven@fee.uva.nl
- * \author Angus Leeming, a.leeming@.ac.uk
- */
-
-#ifndef FORMCREDITS_H
-#define FORMCREDITS_H
-
-#ifdef __GNUG__
-#pragma interface
-#endif
-
-#include "FormBase.h"
-
-class ControlCredits;
-struct FD_form_credits;
-
-/** This class provides an XForms implementation of the FormCredits Dialog.
- */
-class FormCredits : public FormCB<ControlCredits, FormDB<FD_form_credits> > {
-public:
- ///
- FormCredits(ControlCredits &);
-
-private:
- /// not needed.
- virtual void apply() {}
- /// not needed.
- virtual void update() {}
- /// Build the dialog
- virtual void build();
-
- /// Fdesign generated method
- FD_form_credits * build_credits();
-};
-
-#endif
-
int const left = int(dialog_->radio_left->u_ldata);
int const right= int(dialog_->radio_right->u_ldata);
- std::ostringstream ost;
+ ostringstream ost;
ost << delim_values[left] << ' ' << delim_values[right];
lv_->getLyXFunc()->Dispatch(LFUN_MATH_DELIM, ost.str().c_str());
int const nx = int(fl_get_slider_value(dialog_->slider_columns) + 0.5);
int const ny = int(fl_get_slider_value(dialog_->slider_rows) + 0.5);
- std::ostringstream ost;
+ ostringstream ost;
ost << nx << ' ' << ny << ' ' << c << sh;
lv_->getLyXFunc()->Dispatch(LFUN_INSERT_MATRIX, ost.str().c_str());
* John Levon, moz@compsoc.man.ac.uk
*/
+#include <config.h>
+#include "Lsstream.h"
+
#ifdef __GNUG__
#pragma implementation
#endif
-#include <config.h>
#include "xformsBC.h"
#include "ControlVCLog.h"
#include "FormVCLog.h"
#include "form_browser.h"
#include "gettext.h"
-#include "Lsstream.h"
FormVCLog::FormVCLog(ControlVCLog & c)
: FormCB<ControlVCLog, FormBrowser>(c, _("Version Control Log"))
{
fl_clear_browser(dialog_->browser);
- std::stringstream ss;
+ stringstream ss;
fl_add_browser_line(dialog_->browser,
controller().getVCLogFile(ss).str().c_str());
form_filedialog.C \
form_filedialog.h \
GUIRunTime.C \
+ FormAboutlyx.C \
+ FormAboutlyx.h \
+ form_aboutlyx.C \
+ form_aboutlyx.h \
FormBase.C \
FormBase.h \
FormBaseDeprecated.C \
FormCitation.h \
form_citation.C \
form_citation.h \
- FormCopyright.C \
- FormCopyright.h \
- form_copyright.C \
- form_copyright.h \
- FormCredits.C \
- FormCredits.h \
- form_credits.C \
- form_credits.h \
FormDocument.C \
FormDocument.h \
form_document.C \
--- /dev/null
+// File modified by fdfix.sh for use by lyx (with xforms >= 0.88) 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_aboutlyx.h"
+#include "FormAboutlyx.h"
+
+FD_form_aboutlyx::~FD_form_aboutlyx()
+{
+ if ( form->visible ) fl_hide_form( form );
+ fl_free_form( form );
+}
+
+
+FD_form_aboutlyx * FormAboutlyx::build_aboutlyx()
+{
+ FL_OBJECT *obj;
+ FD_form_aboutlyx *fdui = new FD_form_aboutlyx;
+
+ fdui->form = fl_bgn_form(FL_NO_BOX, 450, 370);
+ fdui->form->u_vdata = this;
+ obj = fl_add_box(FL_UP_BOX, 0, 0, 450, 370, "");
+ {
+ char const * const dummy = N_("Close|#C");
+ fdui->close = obj = fl_add_button(FL_NORMAL_BUTTON, 320, 330, 120, 30, idex(_(dummy)));
+ fl_set_button_shortcut(obj, scex(_(dummy)), 1);
+ }
+ fl_set_object_lsize(obj, FL_NORMAL_SIZE);
+ fl_set_object_callback(obj, C_FormBaseCancelCB, 0);
+ fdui->tabbed_folder = obj = fl_add_tabfolder(FL_TOP_TABFOLDER, 10, 20, 430, 300, "");
+ fl_set_object_lsize(obj, FL_NORMAL_SIZE);
+ fl_end_form();
+
+ fdui->form->fdui = fdui;
+
+ return fdui;
+}
+/*---------------------------------------*/
+
+FD_form_tab_version::~FD_form_tab_version()
+{
+ if ( form->visible ) fl_hide_form( form );
+ fl_free_form( form );
+}
+
+
+FD_form_tab_version * FormAboutlyx::build_tab_version()
+{
+ FL_OBJECT *obj;
+ FD_form_tab_version *fdui = new FD_form_tab_version;
+
+ fdui->form = fl_bgn_form(FL_NO_BOX, 430, 280);
+ fdui->form->u_vdata = this;
+ obj = fl_add_box(FL_UP_BOX, 0, 0, 430, 280, "");
+ fdui->text_version = obj = fl_add_text(FL_NORMAL_TEXT, 10, 120, 410, 150, _("Text"));
+ 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->text_copyright = obj = fl_add_text(FL_NORMAL_TEXT, 10, 10, 410, 100, _("Text"));
+ fl_set_object_boxtype(obj, FL_FRAME_BOX);
+ fl_set_object_lalign(obj, FL_ALIGN_CENTER|FL_ALIGN_INSIDE);
+ fl_end_form();
+
+ fdui->form->fdui = fdui;
+
+ return fdui;
+}
+/*---------------------------------------*/
+
+FD_form_tab_credits::~FD_form_tab_credits()
+{
+ if ( form->visible ) fl_hide_form( form );
+ fl_free_form( form );
+}
+
+
+FD_form_tab_credits * FormAboutlyx::build_tab_credits()
+{
+ FL_OBJECT *obj;
+ FD_form_tab_credits *fdui = new FD_form_tab_credits;
+
+ fdui->form = fl_bgn_form(FL_NO_BOX, 430, 280);
+ fdui->form->u_vdata = this;
+ obj = fl_add_box(FL_UP_BOX, 0, 0, 430, 280, "");
+ fdui->browser_credits = obj = fl_add_browser(FL_NORMAL_BROWSER, 10, 10, 410, 260, "");
+ fl_set_object_lsize(obj, FL_NORMAL_SIZE);
+ fl_set_object_callback(obj, C_FormBaseInputCB, 0);
+ fl_end_form();
+
+ fdui->form->fdui = fdui;
+
+ return fdui;
+}
+/*---------------------------------------*/
+
+FD_form_tab_license::~FD_form_tab_license()
+{
+ if ( form->visible ) fl_hide_form( form );
+ fl_free_form( form );
+}
+
+
+FD_form_tab_license * FormAboutlyx::build_tab_license()
+{
+ FL_OBJECT *obj;
+ FD_form_tab_license *fdui = new FD_form_tab_license;
+
+ fdui->form = fl_bgn_form(FL_NO_BOX, 430, 280);
+ fdui->form->u_vdata = this;
+ obj = fl_add_box(FL_UP_BOX, 0, 0, 430, 280, "");
+ fdui->text_license = obj = fl_add_text(FL_NORMAL_TEXT, 10, 10, 410, 100, _("Text"));
+ fl_set_object_boxtype(obj, FL_FRAME_BOX);
+ fl_set_object_lalign(obj, FL_ALIGN_CENTER|FL_ALIGN_INSIDE);
+ fdui->text_warranty = obj = fl_add_text(FL_NORMAL_TEXT, 10, 120, 410, 150, _("Text"));
+ fl_set_object_boxtype(obj, FL_FRAME_BOX);
+ fl_set_object_lalign(obj, FL_ALIGN_CENTER|FL_ALIGN_INSIDE);
+ fl_end_form();
+
+ fdui->form->fdui = fdui;
+
+ return fdui;
+}
+/*---------------------------------------*/
+
--- /dev/null
+// File modified by fdfix.sh for use by lyx (with xforms >= 0.88) and gettext
+/** Header file generated with fdesign **/
+
+#ifndef FD_form_aboutlyx_h_
+#define FD_form_aboutlyx_h_
+
+/** Callbacks, globals and object handlers **/
+extern "C" void C_FormBaseCancelCB(FL_OBJECT *, long);
+
+
+extern "C" void C_FormBaseInputCB(FL_OBJECT *, long);
+
+
+
+/**** Forms and Objects ****/
+struct FD_form_aboutlyx {
+ ~FD_form_aboutlyx();
+
+ FL_FORM *form;
+ FL_OBJECT *close;
+ FL_OBJECT *tabbed_folder;
+};
+struct FD_form_tab_version {
+ ~FD_form_tab_version();
+
+ FL_FORM *form;
+ FL_OBJECT *text_version;
+ FL_OBJECT *text_copyright;
+};
+struct FD_form_tab_credits {
+ ~FD_form_tab_credits();
+
+ FL_FORM *form;
+ FL_OBJECT *browser_credits;
+};
+struct FD_form_tab_license {
+ ~FD_form_tab_license();
+
+ FL_FORM *form;
+ FL_OBJECT *text_license;
+ FL_OBJECT *text_warranty;
+};
+
+#endif /* FD_form_aboutlyx_h_ */
-// File modified by fdfix.sh for use by lyx (with xforms >= 0.88) 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_copyright.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 = fl_bgn_form(FL_NO_BOX, 450, 430);
- fdui->form->u_vdata = this;
- obj = fl_add_box(FL_UP_BOX, 0, 0, 450, 430, "");
- 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);
- 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->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_FormBaseCancelCB, 0);
- fl_end_form();
-
- fdui->form->fdui = fdui;
-
- return fdui;
-}
-/*---------------------------------------*/
-
-// File modified by fdfix.sh for use by lyx (with xforms >= 0.88) and gettext
-/** Header file generated with fdesign **/
-
-#ifndef FD_form_copyright_h_
-#define FD_form_copyright_h_
-
-/** Callbacks, globals and object handlers **/
-extern "C" void C_FormBaseCancelCB(FL_OBJECT *, long);
-
-
-/**** Forms and Objects ****/
-struct FD_form_copyright {
- ~FD_form_copyright();
-
- FL_FORM *form;
- FL_OBJECT *text_copyright;
- FL_OBJECT *text_licence;
- FL_OBJECT *text_disclaimer;
- FL_OBJECT *button_cancel;
-};
-
-#endif /* FD_form_copyright_h_ */
-// File modified by fdfix.sh for use by lyx (with xforms >= 0.88) 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_credits.h"
-#include "FormCredits.h"
-
-FD_form_credits::~FD_form_credits()
-{
- if ( form->visible ) fl_hide_form( form );
- fl_free_form( form );
-}
-
-
-FD_form_credits * FormCredits::build_credits()
-{
- FL_OBJECT *obj;
- FD_form_credits *fdui = new FD_form_credits;
-
- fdui->form = fl_bgn_form(FL_NO_BOX, 500, 330);
- fdui->form->u_vdata = this;
- obj = fl_add_box(FL_UP_BOX, 0, 0, 500, 330, "");
- fdui->button_cancel = obj = fl_add_button(FL_RETURN_BUTTON, 180, 290, 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_FormBaseCancelCB, 0);
- obj = fl_add_text(FL_NORMAL_TEXT, 10, 40, 480, 30, _("Matthias"));
- fl_set_object_lsize(obj, FL_NORMAL_SIZE);
- fl_set_object_lalign(obj, FL_ALIGN_CENTER|FL_ALIGN_INSIDE);
- fl_set_object_lstyle(obj, FL_ITALIC_STYLE);
- fl_set_object_gravity(obj, FL_NorthWest, FL_NorthEast);
- obj = fl_add_text(FL_NORMAL_TEXT, 10, 10, 480, 30, _("All these people have contributed to the LyX project. Thanks, "));
- 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);
- fdui->browser_credits = obj = fl_add_browser(FL_NORMAL_BROWSER, 10, 80, 480, 200, "");
- fl_set_object_gravity(obj, FL_NorthWest, FL_SouthEast);
- fl_end_form();
-
- fdui->form->fdui = fdui;
-
- return fdui;
-}
-/*---------------------------------------*/
-
-// File modified by fdfix.sh for use by lyx (with xforms >= 0.88) and gettext
-/** Header file generated with fdesign **/
-
-#ifndef FD_form_credits_h_
-#define FD_form_credits_h_
-
-/** Callbacks, globals and object handlers **/
-extern "C" void C_FormBaseCancelCB(FL_OBJECT *, long);
-
-
-/**** Forms and Objects ****/
-struct FD_form_credits {
- ~FD_form_credits();
-
- FL_FORM *form;
- FL_OBJECT *button_cancel;
- FL_OBJECT *browser_credits;
-};
-
-#endif /* FD_form_credits_h_ */
--- /dev/null
+Magic: 13000
+
+Internal Form Definition File
+ (do not change)
+
+Number of forms: 4
+Unit of measure: FL_COORD_PIXEL
+
+=============== FORM ===============
+Name: form_aboutlyx
+Width: 450
+Height: 370
+Number of Objects: 3
+
+--------------------
+class: FL_BOX
+type: UP_BOX
+box: 0 0 450 370
+boxtype: FL_UP_BOX
+colors: FL_COL1 FL_COL1
+alignment: FL_ALIGN_CENTER
+style: FL_NORMAL_STYLE
+size: FL_DEFAULT_SIZE
+lcol: FL_BLACK
+label:
+shortcut:
+resize: FL_RESIZE_ALL
+gravity: FL_NoGravity FL_NoGravity
+name:
+callback:
+argument:
+
+--------------------
+class: FL_BUTTON
+type: NORMAL_BUTTON
+box: 320 330 120 30
+boxtype: FL_UP_BOX
+colors: FL_COL1 FL_COL1
+alignment: FL_ALIGN_CENTER
+style: FL_NORMAL_STYLE
+size: FL_NORMAL_SIZE
+lcol: FL_BLACK
+label: Close|#C
+shortcut:
+resize: FL_RESIZE_ALL
+gravity: FL_NoGravity FL_NoGravity
+name: close
+callback: C_FormBaseCancelCB
+argument: 0
+
+--------------------
+class: FL_TABFOLDER
+type: TOP_TABFOLDER
+box: 10 20 430 300
+boxtype: FL_UP_BOX
+colors: FL_COL1 FL_COL1
+alignment: FL_ALIGN_TOP_LEFT
+style: FL_NORMAL_STYLE
+size: FL_NORMAL_SIZE
+lcol: FL_BLACK
+label:
+shortcut:
+resize: FL_RESIZE_NONE
+gravity: FL_NoGravity FL_NoGravity
+name: tabbed_folder
+callback:
+argument:
+
+=============== FORM ===============
+Name: form_tab_version
+Width: 430
+Height: 280
+Number of Objects: 3
+
+--------------------
+class: FL_BOX
+type: UP_BOX
+box: 0 0 430 280
+boxtype: FL_UP_BOX
+colors: FL_COL1 FL_COL1
+alignment: FL_ALIGN_CENTER
+style: FL_NORMAL_STYLE
+size: FL_DEFAULT_SIZE
+lcol: FL_BLACK
+label:
+shortcut:
+resize: FL_RESIZE_ALL
+gravity: FL_NoGravity FL_NoGravity
+name:
+callback:
+argument:
+
+--------------------
+class: FL_TEXT
+type: NORMAL_TEXT
+box: 10 120 410 150
+boxtype: FL_FRAME_BOX
+colors: FL_COL1 FL_MCOL
+alignment: FL_ALIGN_CENTER|FL_ALIGN_INSIDE
+style: FL_NORMAL_STYLE
+size: FL_NORMAL_SIZE
+lcol: FL_BLACK
+label: Text
+shortcut:
+resize: FL_RESIZE_ALL
+gravity: FL_NoGravity FL_NoGravity
+name: text_version
+callback:
+argument:
+
+--------------------
+class: FL_TEXT
+type: NORMAL_TEXT
+box: 10 10 410 100
+boxtype: FL_FRAME_BOX
+colors: FL_COL1 FL_MCOL
+alignment: FL_ALIGN_CENTER|FL_ALIGN_INSIDE
+style: FL_NORMAL_STYLE
+size: FL_DEFAULT_SIZE
+lcol: FL_BLACK
+label: Text
+shortcut:
+resize: FL_RESIZE_ALL
+gravity: FL_NoGravity FL_NoGravity
+name: text_copyright
+callback:
+argument:
+
+=============== FORM ===============
+Name: form_tab_credits
+Width: 430
+Height: 280
+Number of Objects: 2
+
+--------------------
+class: FL_BOX
+type: UP_BOX
+box: 0 0 430 280
+boxtype: FL_UP_BOX
+colors: FL_COL1 FL_COL1
+alignment: FL_ALIGN_CENTER
+style: FL_NORMAL_STYLE
+size: FL_DEFAULT_SIZE
+lcol: FL_BLACK
+label:
+shortcut:
+resize: FL_RESIZE_ALL
+gravity: FL_NoGravity FL_NoGravity
+name:
+callback:
+argument:
+
+--------------------
+class: FL_BROWSER
+type: NORMAL_BROWSER
+box: 10 10 410 260
+boxtype: FL_DOWN_BOX
+colors: FL_COL1 FL_YELLOW
+alignment: FL_ALIGN_BOTTOM
+style: FL_NORMAL_STYLE
+size: FL_NORMAL_SIZE
+lcol: FL_BLACK
+label:
+shortcut:
+resize: FL_RESIZE_ALL
+gravity: FL_NoGravity FL_NoGravity
+name: browser_credits
+callback: C_FormBaseInputCB
+argument: 0
+
+=============== FORM ===============
+Name: form_tab_license
+Width: 430
+Height: 280
+Number of Objects: 3
+
+--------------------
+class: FL_BOX
+type: UP_BOX
+box: 0 0 430 280
+boxtype: FL_UP_BOX
+colors: FL_COL1 FL_COL1
+alignment: FL_ALIGN_CENTER
+style: FL_NORMAL_STYLE
+size: FL_DEFAULT_SIZE
+lcol: FL_BLACK
+label:
+shortcut:
+resize: FL_RESIZE_ALL
+gravity: FL_NoGravity FL_NoGravity
+name:
+callback:
+argument:
+
+--------------------
+class: FL_TEXT
+type: NORMAL_TEXT
+box: 10 10 410 100
+boxtype: FL_FRAME_BOX
+colors: FL_COL1 FL_MCOL
+alignment: FL_ALIGN_CENTER|FL_ALIGN_INSIDE
+style: FL_NORMAL_STYLE
+size: FL_DEFAULT_SIZE
+lcol: FL_BLACK
+label: Text
+shortcut:
+resize: FL_RESIZE_ALL
+gravity: FL_NoGravity FL_NoGravity
+name: text_license
+callback:
+argument:
+
+--------------------
+class: FL_TEXT
+type: NORMAL_TEXT
+box: 10 120 410 150
+boxtype: FL_FRAME_BOX
+colors: FL_COL1 FL_MCOL
+alignment: FL_ALIGN_CENTER|FL_ALIGN_INSIDE
+style: FL_NORMAL_STYLE
+size: FL_DEFAULT_SIZE
+lcol: FL_BLACK
+label: Text
+shortcut:
+resize: FL_RESIZE_ALL
+gravity: FL_NoGravity FL_NoGravity
+name: text_warranty
+callback:
+argument:
+
+==============================
+create_the_forms
-Magic: 13000
-
-Internal Form Definition File
- (do not change)
-
-Number of forms: 1
-Unit of measure: FL_COORD_PIXEL
-
-=============== FORM ===============
-Name: form_copyright
-Width: 450
-Height: 430
-Number of Objects: 5
-
---------------------
-class: FL_BOX
-type: UP_BOX
-box: 0 0 450 430
-boxtype: FL_UP_BOX
-colors: FL_COL1 FL_COL1
-alignment: FL_ALIGN_CENTER
-style: FL_NORMAL_STYLE
-size: FL_DEFAULT_SIZE
-lcol: FL_BLACK
-label:
-shortcut:
-resize: FL_RESIZE_ALL
-gravity: FL_NoGravity FL_NoGravity
-name:
-callback:
-argument:
-
---------------------
-class: FL_TEXT
-type: NORMAL_TEXT
-box: 10 10 430 50
-boxtype: FL_FRAME_BOX
-colors: FL_COL1 FL_MCOL
-alignment: FL_ALIGN_CENTER|FL_ALIGN_INSIDE
-style: FL_NORMAL_STYLE
-size: FL_NORMAL_SIZE
-lcol: FL_BLACK
-label:
-shortcut:
-resize: FL_RESIZE_ALL
-gravity: FL_NoGravity FL_NoGravity
-name: text_copyright
-callback:
-argument:
-
---------------------
-class: FL_TEXT
-type: NORMAL_TEXT
-box: 10 70 430 110
-boxtype: FL_FRAME_BOX
-colors: FL_COL1 FL_MCOL
-alignment: FL_ALIGN_CENTER|FL_ALIGN_INSIDE
-style: FL_NORMAL_STYLE
-size: FL_NORMAL_SIZE
-lcol: FL_BLACK
-label:
-shortcut:
-resize: FL_RESIZE_ALL
-gravity: FL_NoGravity FL_NoGravity
-name: text_licence
-callback:
-argument:
-
---------------------
-class: FL_TEXT
-type: NORMAL_TEXT
-box: 10 190 430 190
-boxtype: FL_FRAME_BOX
-colors: FL_COL1 FL_MCOL
-alignment: FL_ALIGN_CENTER|FL_ALIGN_INSIDE
-style: FL_NORMAL_STYLE
-size: FL_NORMAL_SIZE
-lcol: FL_BLACK
-label:
-shortcut:
-resize: FL_RESIZE_ALL
-gravity: FL_NoGravity FL_NoGravity
-name: text_disclaimer
-callback:
-argument:
-
---------------------
-class: FL_BUTTON
-type: RETURN_BUTTON
-box: 160 390 140 30
-boxtype: FL_UP_BOX
-colors: FL_COL1 FL_COL1
-alignment: FL_ALIGN_CENTER
-style: FL_NORMAL_STYLE
-size: FL_NORMAL_SIZE
-lcol: FL_BLACK
-label: Close|^[^M
-shortcut:
-resize: FL_RESIZE_NONE
-gravity: FL_South FL_South
-name: button_cancel
-callback: C_FormBaseCancelCB
-argument: 0
-
-==============================
-create_the_forms
-Magic: 13000
-
-Internal Form Definition File
- (do not change)
-
-Number of forms: 1
-Unit of measure: FL_COORD_PIXEL
-
-=============== FORM ===============
-Name: form_credits
-Width: 500
-Height: 330
-Number of Objects: 5
-
---------------------
-class: FL_BOX
-type: UP_BOX
-box: 0 0 500 330
-boxtype: FL_UP_BOX
-colors: FL_COL1 FL_COL1
-alignment: FL_ALIGN_CENTER
-style: FL_NORMAL_STYLE
-size: FL_DEFAULT_SIZE
-lcol: FL_BLACK
-label:
-shortcut:
-resize: FL_RESIZE_ALL
-gravity: FL_NoGravity FL_NoGravity
-name:
-callback:
-argument:
-
---------------------
-class: FL_BUTTON
-type: RETURN_BUTTON
-box: 180 290 140 30
-boxtype: FL_UP_BOX
-colors: FL_COL1 FL_COL1
-alignment: FL_ALIGN_CENTER
-style: FL_NORMAL_STYLE
-size: FL_NORMAL_SIZE
-lcol: FL_BLACK
-label: OK
-shortcut: ^M
-resize: FL_RESIZE_NONE
-gravity: FL_South FL_South
-name: button_cancel
-callback: C_FormBaseCancelCB
-argument: 0
-
---------------------
-class: FL_TEXT
-type: NORMAL_TEXT
-box: 10 40 480 30
-boxtype: FL_FLAT_BOX
-colors: FL_COL1 FL_MCOL
-alignment: FL_ALIGN_CENTER|FL_ALIGN_INSIDE
-style: FL_ITALIC_STYLE
-size: FL_NORMAL_SIZE
-lcol: FL_BLACK
-label: Matthias
-shortcut:
-resize: FL_RESIZE_ALL
-gravity: FL_NorthWest FL_NorthEast
-name:
-callback:
-argument:
-
---------------------
-class: FL_TEXT
-type: NORMAL_TEXT
-box: 10 10 480 30
-boxtype: FL_FLAT_BOX
-colors: FL_COL1 FL_MCOL
-alignment: FL_ALIGN_CENTER|FL_ALIGN_INSIDE
-style: FL_NORMAL_STYLE
-size: FL_NORMAL_SIZE
-lcol: FL_BLACK
-label: All these people have contributed to the LyX project. Thanks,
-shortcut:
-resize: FL_RESIZE_ALL
-gravity: FL_NorthWest FL_NorthEast
-name:
-callback:
-argument:
-
---------------------
-class: FL_BROWSER
-type: NORMAL_BROWSER
-box: 10 80 480 200
-boxtype: FL_DOWN_BOX
-colors: FL_COL1 FL_YELLOW
-alignment: FL_ALIGN_BOTTOM
-style: FL_NORMAL_STYLE
-size: FL_DEFAULT_SIZE
-lcol: FL_BLACK
-label:
-shortcut:
-resize: FL_RESIZE_ALL
-gravity: FL_NorthWest FL_SouthEast
-name: browser_credits
-callback:
-argument:
-
-==============================
-create_the_forms
SHELL = /bin/sh
.SUFFIXES: .fd .c
-SRCS = form_bibitem.fd \
+SRCS = form_aboutlyx.fd \
+ form_bibitem.fd \
+ form_bibtex.fd \
form_bibtex.fd \
form_browser.fd \
form_character.fd \
form_citation.fd \
- form_copyright.fd \
- form_credits.fd \
form_document.fd \
form_error.fd \
form_external.fd \
+2001-07-13 Angus Leeming <a.leeming@ic.ac.uk>
+
+ Consistent use of Lsstream.h:
+ * figinset.C: removed using std::ostringstream directive.
+
+ * insetgraphics.C (createLatexOptions):
+ * insetinclude.C (unique_id):
+ std::ostringstream -> ostringstream.
+ * insettext.C (localDispatch): std::istringstream -> istringstream.
+
2001-07-13 Juergen Vigna <jug@sad.it>
* insetfloat.C (insertInsetAllowed): added missing const_cast.
using std::find;
using std::flush;
using std::endl;
-using std::ostringstream;
using std::copy;
using std::pair;
using std::make_pair;
// Calculate the options part of the command, we must do it to a string
// stream since we might have a trailing comma that we would like to remove
// before writing it to the output stream.
- std::ostringstream options;
+ ostringstream options;
formatResize(options, "width", params.widthResize, params.widthSize);
formatResize(options, "height", params.heightResize, params.heightSize);
{
static unsigned int seed = 1000;
- std::ostringstream ost;
+ ostringstream ost;
ost << "file" << ++seed;
// Needed if we use lyxstring.
cur_value = par->params().spacing().getValue();
}
- std::istringstream istr(arg.c_str());
+ istringstream istr(arg.c_str());
string tmp;
istr >> tmp;
Spacing::Space new_spacing = cur_spacing;
/// Build GUI description of font state
string const LyXFont::stateText(BufferParams * params) const
{
- std::ostringstream ost;
+ ostringstream ost;
if (family() != INHERIT_FAMILY)
ost << _(GUIFamilyNames[family()]) << ", ";
if (series() != INHERIT_SERIES)
#warning Find another implementation here (or another lyxfunc)!
#endif
#endif
- case LFUN_HELP_COPYRIGHT:
- owner->getDialogs()->showCopyright();
+ case LFUN_HELP_ABOUTLYX:
+ owner->getDialogs()->showAboutlyx();
break;
+ case LFUN_HELP_COPYRIGHT:
case LFUN_HELP_CREDITS:
- owner->getDialogs()->showCredits();
- break;
+
case LFUN_HELP_OPEN:
{
break;
}
- case LFUN_HELP_VERSION: {
- owner->prohibitInput();
- string msg(_("LyX Version "));
- msg += LYX_VERSION;
- msg += " of ";
- msg += LYX_RELEASE;
- fl_show_message(msg.c_str(),
- (_("Library directory: ")
- + MakeDisplayPath(system_lyxdir)).c_str(),
- (_("User directory: ")
- + MakeDisplayPath(user_lyxdir)).c_str());
- owner->allowInput();
- break;
- }
+ case LFUN_HELP_VERSION:
// --- version control -------------------------------
case LFUN_VC_REGISTER:
+2001-07-13 Angus Leeming <a.leeming@ic.ac.uk>
+
+ Consistent use of Lsstream.h:
+ * formula.C: removed using std::ostringstream directive.
+ * math_cursor.C: std::istringstream -> istringstream.
+
2001-07-13 Jean-Marc Lasgouttes <Jean-Marc.Lasgouttes@inria.fr>
* math_decorationinset.h: add std:: qualifier
#include "math_matrixinset.h"
#include "mathed/support.h"
-using std::ostringstream;
using std::ostream;
using std::ifstream;
using std::istream;
int n = 1;
string v_align;
string h_align;
- std::istringstream is(s.substr(7).c_str());
+ istringstream is(s.substr(7).c_str());
is >> m >> n >> v_align >> h_align;
m = std::max(1, m);
n = std::max(1, n);
s += c;
else if (c == META_INSET &&
getInset(i)->lyxCode() == Inset::MATH_CODE) {
- std::ostringstream ost;
+ ostringstream ost;
getInset(i)->ascii(buffer, ost);
s += subst(ost.str().c_str(),'\n',' ');
}
Paragraph::size_type beg,
Paragraph::size_type end)
{
- std::ostringstream ost;
+ ostringstream ost;
if (beg == 0 && !params().labelString().empty())
ost << params().labelString() << ' ';
+2001-07-13 Angus Leeming <a.leeming@ic.ac.uk>
+
+ Consistent use of Lsstream.h:
+ * filetools.C (GetFileContents): std::ostringstream -> ostringstream.
+
2001-07-12 Lars Gullik Bjønnes <larsbj@birdstep.com>
* translator.h: (*it). -> it->
FileInfo finfo(fname);
if (finfo.exist()) {
ifstream ifs(fname.c_str());
- std::ostringstream ofs;
+ ostringstream ofs;
if (ifs && ofs) {
ofs << ifs.rdbuf();
ifs.close();
// Start the selection from here
selection.cursor = cursor;
- std::ostringstream latex;
+ ostringstream latex;
// and find the end of the word
// (optional hyphens are part of a word)
// set the sel cursor
selection.cursor = cursor;
- std::ostringstream latex;
+ ostringstream latex;
// now find the end of the word
while (cursor.pos() < cursor.par()->size()
par->params().labelString(string());
}
- std::ostringstream s;
+ ostringstream s;
if (!par->params().appendix()) {
switch (2 * LABEL_COUNTER_CHAPTER -
par->incCounter(i + par->enumdepth);
int number = par->getCounter(i + par->enumdepth);
- std::ostringstream s;
+ ostringstream s;
switch (par->enumdepth) {
case 1:
string const LyXLength::asString() const
{
- std::ostringstream buffer;
+ ostringstream buffer;
buffer << val << unit_name[uni]; // setw?
return buffer.str().c_str();
}
string const LyXLength::asLatexString() const
{
- std::ostringstream buffer;
+ ostringstream buffer;
switch(uni) {
case PW:
case PE:
string const LyXGlueLength::asString() const
{
- std::ostringstream buffer;
+ ostringstream buffer;
if (plus_val != 0.0)
if (minus_val != 0.0)
string const LyXGlueLength::asLatexString() const
{
- std::ostringstream buffer;
+ ostringstream buffer;
if (plus_val != 0.0)
if (minus_val != 0.0)
projects / features.git / commitdiff