ws cleanup

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@3806 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Lars Gullik Bjønnes 2002-03-21 21:21:28 +00:00
parent 76d81111af
commit f7ba7c8e9f
374 changed files with 2477 additions and 2538 deletions

View File

@ -11,12 +11,12 @@
#include "Alert.h" #include "Alert.h"
#include "debug.h" #include "debug.h"
#include "lyxrc.h" #include "lyxrc.h"
#include "Alert_pimpl.h" #include "Alert_pimpl.h"
#include <cerrno> #include <cerrno>
using std::endl; using std::endl;
using std::pair; using std::pair;
using std::make_pair; using std::make_pair;
@ -28,7 +28,7 @@ void Alert::alert(string const & s1, string const & s2, string const & s3)
lyxerr << "------------------------------" << endl lyxerr << "------------------------------" << endl
<< s1 << endl << s2 << endl << s3 << endl << s1 << endl << s2 << endl << s3 << endl
<< "------------------------------" << endl; << "------------------------------" << endl;
} else { } else {
alert_pimpl(s1, s2, s3); alert_pimpl(s1, s2, s3);
} }
} }

View File

@ -17,23 +17,23 @@
namespace Alert { namespace Alert {
/// show an alert message /// show an alert message
void alert(string const & s1, string const & s2 = string(), void alert(string const & s1, string const & s2 = string(),
string const & s3 = string()); string const & s3 = string());
/// show an alert message and strerror(errno) /// show an alert message and strerror(errno)
void err_alert(string const & s1, string const & s2 = string()); void err_alert(string const & s1, string const & s2 = string());
/// ask a question /// ask a question
bool askQuestion(string const & s1, string const & s2 = string(), bool askQuestion(string const & s1, string const & s2 = string(),
string const & s3 = string(), bool default_value = true); string const & s3 = string(), bool default_value = true);
/// Returns 1 for yes, 2 for no, 3 for cancel. /// Returns 1 for yes, 2 for no, 3 for cancel.
int askConfirmation(string const & s1, string const & s2 = string(), int askConfirmation(string const & s1, string const & s2 = string(),
string const & s3 = string(), int default_value = 1); string const & s3 = string(), int default_value = 1);
/// Asks for a text /// Asks for a text
std::pair<bool, string> const std::pair<bool, string> const
askForText(string const & msg, askForText(string const & msg,
string const & dflt = string()); string const & dflt = string());
} }

View File

@ -7,7 +7,7 @@
*/ */
#include "debug.h" #include "debug.h"
// GUI-specific implementations // GUI-specific implementations
void alert_pimpl(string const & s1, string const & s2, string const & s3); void alert_pimpl(string const & s1, string const & s2, string const & s3);
bool askQuestion_pimpl(string const & s1, string const & s2, string const & s3); bool askQuestion_pimpl(string const & s1, string const & s2, string const & s3);

View File

@ -1,5 +1,7 @@
2002-03-21 Lars Gullik Bjønnes <larsbj@birdstep.com> 2002-03-21 Lars Gullik Bjønnes <larsbj@birdstep.com>
* most files: ws cleanup
* Makefile.am: remove ld -r stuff * Makefile.am: remove ld -r stuff
2002-03-20 Lars Gullik Bjønnes <larsbj@birdstep.com> 2002-03-20 Lars Gullik Bjønnes <larsbj@birdstep.com>
@ -61,17 +63,17 @@
2001-12-19 Jean-Marc Lasgouttes <lasgouttes@freesurf.fr> 2001-12-19 Jean-Marc Lasgouttes <lasgouttes@freesurf.fr>
* Timeout.h: * Timeout.h:
* FileDialog.h: do not include <config.h> in header files. * FileDialog.h: do not include <config.h> in header files.
2001-12-12 Angus Leeming <a.leeming@ic.ac.uk> 2001-12-12 Angus Leeming <a.leeming@ic.ac.uk>
* Alert.h: remove spurious semi-colon at the end of the namespace * Alert.h: remove spurious semi-colon at the end of the namespace
scope. scope.
2001-11-22 John Levon <moz@compsoc.man.ac.uk> 2001-11-22 John Levon <moz@compsoc.man.ac.uk>
* Makefile.am: * Makefile.am:
* Alert.h: * Alert.h:
* Alert.C: * Alert.C:
* Alert_pimpl.h: alerts etc. * Alert_pimpl.h: alerts etc.
@ -88,12 +90,12 @@
2001-08-27 John Levon <moz@compsoc.man.ac.uk> 2001-08-27 John Levon <moz@compsoc.man.ac.uk>
* GUIRunTime.h: initApplication() should take a & to argc * GUIRunTime.h: initApplication() should take a & to argc
2001-08-01 John Levon <moz@compsoc.man.ac.uk> 2001-08-01 John Levon <moz@compsoc.man.ac.uk>
* Liason.C: IsDirWriteable changed * Liason.C: IsDirWriteable changed
2001-07-30 Jean-Marc Lasgouttes <Jean-Marc.Lasgouttes@inria.fr> 2001-07-30 Jean-Marc Lasgouttes <Jean-Marc.Lasgouttes@inria.fr>
* Liason.C: #include LAssert.h * Liason.C: #include LAssert.h
@ -101,20 +103,20 @@
2001-07-24 John Levon <moz@compsoc.man.ac.uk> 2001-07-24 John Levon <moz@compsoc.man.ac.uk>
* Dialogs.h: add showThesaurus * Dialogs.h: add showThesaurus
2001-07-13 Edwin Leuven <leuven@fee.uva.nl> 2001-07-13 Edwin Leuven <leuven@fee.uva.nl>
* Dialogs.h: add showAboutlyx and remove showCredits and Copyright * Dialogs.h: add showAboutlyx and remove showCredits and Copyright
2001-07-13 Edwin Leuven <leuven@fee.uva.nl> 2001-07-13 Edwin Leuven <leuven@fee.uva.nl>
* Dialogs.h: added showSpellchecker * Dialogs.h: added showSpellchecker
2001-07-03 Jean-Marc Lasgouttes <Jean-Marc.Lasgouttes@inria.fr> 2001-07-03 Jean-Marc Lasgouttes <Jean-Marc.Lasgouttes@inria.fr>
* GUIRunTime.h: (x11Display): * GUIRunTime.h: (x11Display):
(x11Screen): (x11Screen):
(x11Colormap): (x11Colormap):
(x11VisualDepth): new methods (x11VisualDepth): new methods
2001-07-03 Lars Gullik Bjønnes <larsbj@birdstep.com> 2001-07-03 Lars Gullik Bjønnes <larsbj@birdstep.com>
@ -128,7 +130,7 @@
2001-06-22 John Levon <moz@compsoc.man.ac.uk> 2001-06-22 John Levon <moz@compsoc.man.ac.uk>
* Makefile.am: remove kde frontend * Makefile.am: remove kde frontend
2001-06-15 Angus Leeming <a.leeming@ic.ac.uk> 2001-06-15 Angus Leeming <a.leeming@ic.ac.uk>
* Dialogs.h: removed unused signal showCharacter. * Dialogs.h: removed unused signal showCharacter.
@ -201,7 +203,7 @@
* DialogBase.h: commented out abstract method show(). * DialogBase.h: commented out abstract method show().
* Dialogs.h: The dialogs are now stored as a * Dialogs.h: The dialogs are now stored as a
std::vector<boost::shared_ptr<DialogBase> >. std::vector<boost::shared_ptr<DialogBase> >.
Removed using directives. Removed using directives.
(d-tor) removed. (d-tor) removed.

View File

@ -3,7 +3,7 @@
* Abstract base class of all dialogs. * Abstract base class of all dialogs.
* Author: Allan Rae <rae@lyx.org> * Author: Allan Rae <rae@lyx.org>
* This file is part of * This file is part of
* ====================================================== * ======================================================
* *
* LyX, The Document Processor * LyX, The Document Processor
* *

View File

@ -1,8 +1,8 @@
/* This file is part of /* This file is part of
* ====================================================== * ======================================================
* *
* LyX, The Document Processor * LyX, The Document Processor
* *
* Copyright 1995 Matthias Ettrich * Copyright 1995 Matthias Ettrich
* Copyright 1995-2001 The LyX Team. * Copyright 1995-2001 The LyX Team.
* *

View File

@ -77,10 +77,10 @@ public:
//@{ //@{
/// Hide all visible dialogs /// Hide all visible dialogs
SigC::Signal0<void> hideAll; SigC::Signal0<void> hideAll;
/// Hide any dialogs that require a buffer for them to operate /// Hide any dialogs that require a buffer for them to operate
SigC::Signal0<void> hideBufferDependent; SigC::Signal0<void> hideBufferDependent;
/** Update visible, buffer-dependent dialogs /** Update visible, buffer-dependent dialogs
If the bool is true then a buffer change has occurred If the bool is true then a buffer change has occurred
else its still the same buffer. else its still the same buffer.
@ -112,7 +112,7 @@ public:
/// ///
SigC::Signal1<void, InsetError *> showError; SigC::Signal1<void, InsetError *> showError;
/// show the external inset dialog /// show the external inset dialog
SigC::Signal1<void, InsetExternal *> showExternal; SigC::Signal1<void, InsetExternal *> showExternal;
/// show the contents of a file. /// show the contents of a file.
SigC::Signal1<void, string const &> showFile; SigC::Signal1<void, string const &> showFile;
/// show all forked child processes /// show all forked child processes
@ -129,8 +129,8 @@ public:
SigC::Signal1<void, InsetInfo *> showInfo; SigC::Signal1<void, InsetInfo *> showInfo;
/// show the LaTeX log or build file /// show the LaTeX log or build file
SigC::Signal0<void> showLogFile; SigC::Signal0<void> showLogFile;
/// display the top-level maths panel /// display the top-level maths panel
SigC::Signal0<void> showMathPanel; SigC::Signal0<void> showMathPanel;
/// ///
SigC::Signal1<void, InsetMinipage *> showMinipage; SigC::Signal1<void, InsetMinipage *> showMinipage;
/// ///
@ -172,7 +172,7 @@ public:
/// show the TexInfo /// show the TexInfo
SigC::Signal0<void> showTexinfo; SigC::Signal0<void> showTexinfo;
/// show the thesaurus dialog /// show the thesaurus dialog
SigC::Signal1<void, string const &> showThesaurus; SigC::Signal1<void, string const &> showThesaurus;
/// ///
SigC::Signal1<void, InsetCommand *> showTOC; SigC::Signal1<void, InsetCommand *> showTOC;
/// ///

View File

@ -57,14 +57,14 @@ public:
kb_action a = LFUN_SELECT_FILE_SYNC, kb_action a = LFUN_SELECT_FILE_SYNC,
Button b1 = Button(string(), string()), Button b1 = Button(string(), string()),
Button b2 = Button(string(), string())); Button b2 = Button(string(), string()));
~FileDialog(); ~FileDialog();
/** /**
* Choose a file for selection, starting in directory \param * Choose a file for selection, starting in directory \param
* path, with the file selection \param mask. The \param mask * path, with the file selection \param mask. The \param mask
* string is of the form : * string is of the form :
* *
* <regular expression to match> | <description> * <regular expression to match> | <description>
* *

View File

@ -1,7 +1,7 @@
// -*- C++ -*- // -*- C++ -*-
/* This file is part of /* This file is part of
* ====================================================== * ======================================================
* *
* LyX, The Document Processor * LyX, The Document Processor
* *
* Copyright 2000-2001 The LyX Team. * Copyright 2000-2001 The LyX Team.
@ -24,7 +24,7 @@ class LyXView;
*/ */
class GUIRunTime { class GUIRunTime {
public: public:
/// initialise the toolkit /// initialise the toolkit
static static
int initApplication(int & argc, char * argv[]); int initApplication(int & argc, char * argv[]);
/// process pending events /// process pending events
@ -59,6 +59,6 @@ public:
int x11VisualDepth(); int x11VisualDepth();
/// the server's DPI estimate /// the server's DPI estimate
static static
float getScreenDPI(); float getScreenDPI();
}; };
#endif #endif

View File

@ -1,8 +1,8 @@
/* This file is part of /* This file is part of
* ====================================================== * ======================================================
* *
* LyX, The Document Processor * LyX, The Document Processor
* *
* Copyright 1995 Matthias Ettrich * Copyright 1995 Matthias Ettrich
* Copyright 1995-2001 The LyX Team. * Copyright 1995-2001 The LyX Team.
* *
@ -45,10 +45,10 @@ PrinterParams getPrinterParams(Buffer * buffer)
} }
bool printBuffer(Buffer * buffer, PrinterParams const & pp) bool printBuffer(Buffer * buffer, PrinterParams const & pp)
{ {
string command(lyxrc.print_command + ' '); string command(lyxrc.print_command + ' ');
if (pp.target == PrinterParams::PRINTER if (pp.target == PrinterParams::PRINTER
&& lyxrc.print_adapt_output // dvips wants a printer name && lyxrc.print_adapt_output // dvips wants a printer name
&& !pp.printer_name.empty()) {// printer name given && !pp.printer_name.empty()) {// printer name given
@ -65,7 +65,7 @@ bool printBuffer(Buffer * buffer, PrinterParams const & pp)
case PrinterParams::ODD: case PrinterParams::ODD:
command += lyxrc.print_oddpage_flag + ' '; command += lyxrc.print_oddpage_flag + ' ';
break; break;
default: default:
// only option left is print all of them // only option left is print all of them
break; break;

View File

@ -41,7 +41,7 @@ class BufferParams;
until XTL and the compilers of the world are ready for something more until XTL and the compilers of the world are ready for something more
elaborate. This is basically the Communicator class from the lyx cvs module elaborate. This is basically the Communicator class from the lyx cvs module
all over again. all over again.
Eventually, we will switch back to the XTL+LyXFunc combination that Eventually, we will switch back to the XTL+LyXFunc combination that
worked so nicely on a very small number of compilers and systems. worked so nicely on a very small number of compilers and systems.
See the "dialogbase" branch of lyx-devel cvs module for xtl implementation. See the "dialogbase" branch of lyx-devel cvs module for xtl implementation.
@ -59,7 +59,3 @@ namespace Liason {
} // namespace Liason } // namespace Liason
#endif #endif

View File

@ -1,6 +1,6 @@
/* This file is part of /* This file is part of
* ====================================================== * ======================================================
* *
* LyX, The Document Processor * LyX, The Document Processor
* *
* Copyright 1995 Matthias Ettrich * Copyright 1995 Matthias Ettrich

View File

@ -1,7 +1,7 @@
// -*- C++ -*- // -*- C++ -*-
/* This file is part of /* This file is part of
* ====================================================== * ======================================================
* *
* LyX, The Document Processor * LyX, The Document Processor
* Copyright 1995 Matthias Ettrich * Copyright 1995 Matthias Ettrich
* Copyright 1995-2001 The LyX Team. * Copyright 1995-2001 The LyX Team.
@ -24,7 +24,7 @@ class LyXView;
class MenuBackend; class MenuBackend;
/** The LyX GUI independent menubar class /** The LyX GUI independent menubar class
The GUI interface is implemented in the corresponding Menubar_pimpl class. The GUI interface is implemented in the corresponding Menubar_pimpl class.
*/ */
class Menubar { class Menubar {
public: public:

View File

@ -1,6 +1,6 @@
/* This file is part of /* This file is part of
* ====================================================== * ======================================================
* *
* LyX, The Document Processor * LyX, The Document Processor
* *
* Copyright 1995 Matthias Ettrich * Copyright 1995 Matthias Ettrich
@ -87,7 +87,7 @@ void Toolbar::updateLayoutList(bool force)
pimpl_->updateLayoutList(force); pimpl_->updateLayoutList(force);
} }
void Toolbar::openLayoutList() void Toolbar::openLayoutList()
{ {
pimpl_->openLayoutList(); pimpl_->openLayoutList();
@ -112,7 +112,7 @@ void Toolbar::add(string const & func, bool doclean)
if (tf == -1) { if (tf == -1) {
lyxerr << "Toolbar::add: no LyX command called`" lyxerr << "Toolbar::add: no LyX command called`"
<< func << "'exists!" << endl; << func << "'exists!" << endl;
} else { } else {
pimpl_->add(tf, doclean); pimpl_->add(tf, doclean);
} }

View File

@ -1,7 +1,7 @@
// -*- C++ -*- // -*- C++ -*-
/* This file is part of /* This file is part of
* ====================================================== * ======================================================
* *
* LyX, The Document Processor * LyX, The Document Processor
* Copyright 1995 Matthias Ettrich * Copyright 1995 Matthias Ettrich
* Copyright 1995-2001 The LyX Team. * Copyright 1995-2001 The LyX Team.
@ -24,7 +24,7 @@ class LyXView;
class ToolbarDefaults; class ToolbarDefaults;
/** The LyX GUI independent toolbar class /** The LyX GUI independent toolbar class
The GUI interface is implemented in the corresponding Toolbar_pimpl class. The GUI interface is implemented in the corresponding Toolbar_pimpl class.
*/ */
class Toolbar { class Toolbar {
public: public:
@ -33,7 +33,7 @@ public:
/// ///
~Toolbar(); ~Toolbar();
/// (re)sets the toolbar /// (re)sets the toolbar
void set(bool doingmain = false); void set(bool doingmain = false);
@ -41,15 +41,15 @@ public:
frame, where you can change the toolbar realtime. */ frame, where you can change the toolbar realtime. */
void edit(); void edit();
/// add a new button to the toolbar. /// add a new button to the toolbar.
void add(int , bool doclean = true); void add(int , bool doclean = true);
/// name of func instead of kb_action /// name of func instead of kb_action
void add(string const & , bool doclean = true); void add(string const & , bool doclean = true);
/// invokes the n'th icon in the toolbar /// invokes the n'th icon in the toolbar
void push(int); void push(int);
/// activates the toolbar /// activates the toolbar
void activate(); void activate();
/// deactivates the toolbar /// deactivates the toolbar
void deactivate(); void deactivate();
/// update the state of the icons /// update the state of the icons
void update(); void update();

View File

@ -29,11 +29,11 @@ public:
/// ///
GuiBC(string const & cancel, string const & close); GuiBC(string const & cancel, string const & close);
/// ///
void setOK(Button * obj) { okay_ = obj; } void setOK(Button * obj) { okay_ = obj; }
/// ///
void setApply(Button * obj) { apply_ = obj; } void setApply(Button * obj) { apply_ = obj; }
/// ///
void setCancel(Button * obj) { cancel_ = obj; } void setCancel(Button * obj) { cancel_ = obj; }
/// ///
void setRestore(Button * obj) { restore_ = obj; } void setRestore(Button * obj) { restore_ = obj; }
@ -59,7 +59,7 @@ private:
Button * apply_; Button * apply_;
Button * cancel_; Button * cancel_;
Button * restore_; Button * restore_;
typedef std::list<Widget *> Widgets; typedef std::list<Widget *> Widgets;
Widgets read_only_; Widgets read_only_;
}; };

View File

@ -1,5 +1,5 @@
/* This file is part of /* This file is part of
* ====================================================== * ======================================================
* *
* LyX, The Document Processor * LyX, The Document Processor
* *
@ -18,7 +18,7 @@
#include <config.h> #include <config.h>
#include "ButtonControllerBase.h" #include "ButtonControllerBase.h"
#include "support/LAssert.h" #include "support/LAssert.h"
#include "debug.h" #include "debug.h"
ButtonControllerBase::ButtonControllerBase(string const & cancel, ButtonControllerBase::ButtonControllerBase(string const & cancel,
@ -84,7 +84,7 @@ void ButtonControllerBase::invalid()
bool ButtonControllerBase::readOnly(bool ro) bool ButtonControllerBase::readOnly(bool ro)
{ {
lyxerr[Debug::GUI] << "Setting controller ro: " << ro << std::endl; lyxerr[Debug::GUI] << "Setting controller ro: " << ro << std::endl;
if (ro) { if (ro) {
bp().input(ButtonPolicy::SMI_READ_ONLY); bp().input(ButtonPolicy::SMI_READ_ONLY);
} else { } else {

View File

@ -1,6 +1,6 @@
// -*- C++ -*- // -*- C++ -*-
/* This file is part of /* This file is part of
* ====================================================== * ======================================================
* *
* LyX, The Document Processor * LyX, The Document Processor
* *
@ -78,7 +78,7 @@ protected:
/// ///
string cancel_label_; string cancel_label_;
/// ///
string close_label_; string close_label_;
}; };
#endif // BUTTONCONTROLLERBASE_H #endif // BUTTONCONTROLLERBASE_H

View File

@ -38,7 +38,7 @@ void nextState(ButtonPolicy::State & state,
lyxerr[Debug::GUI] << "Transition from state " lyxerr[Debug::GUI] << "Transition from state "
<< state << " to state " << tmp << " after input " << state << " to state " << tmp << " after input "
<< in << std::endl; << in << std::endl;
if (ButtonPolicy::BOGUS != tmp) { if (ButtonPolicy::BOGUS != tmp) {
state = tmp; state = tmp;
} else { } else {
@ -112,7 +112,7 @@ void PreferencesPolicy::input(SMInput input)
//lyxerr << "PreferencesPolicy::input" << endl; //lyxerr << "PreferencesPolicy::input" << endl;
// CANCEL and HIDE always take us to INITIAL for all cases. // CANCEL and HIDE always take us to INITIAL for all cases.
// Note that I didn't put that special case in the helper function // Note that I didn't put that special case in the helper function
// because it doesn't belong there. Some other // because it doesn't belong there. Some other
// This is probably optimising for the wrong case since it occurs as the // This is probably optimising for the wrong case since it occurs as the
// dialog will be hidden. It would have saved a little memory in the // dialog will be hidden. It would have saved a little memory in the
// state machine if I could have gotten map working. ARRae 20000813 // state machine if I could have gotten map working. ARRae 20000813
@ -172,7 +172,7 @@ OkCancelPolicy::OkCancelPolicy()
void OkCancelPolicy::input(SMInput input) void OkCancelPolicy::input(SMInput input)
{ {
//lyxerr << "OkCancelPolicy::input" << endl; //lyxerr << "OkCancelPolicy::input" << endl;
// CANCEL and HIDE always take us to INITIAL for all cases // CANCEL and HIDE always take us to INITIAL for all cases
if (SMI_CANCEL == input if (SMI_CANCEL == input
|| SMI_HIDE == input) { || SMI_HIDE == input) {
@ -246,7 +246,7 @@ OkCancelReadOnlyPolicy::OkCancelReadOnlyPolicy()
void OkCancelReadOnlyPolicy::input(SMInput input) void OkCancelReadOnlyPolicy::input(SMInput input)
{ {
//lyxerr << "OkCancelReadOnlyPolicy::input" << endl; //lyxerr << "OkCancelReadOnlyPolicy::input" << endl;
// CANCEL and HIDE always take us to INITIAL for all cases // CANCEL and HIDE always take us to INITIAL for all cases
if (SMI_CANCEL == input if (SMI_CANCEL == input
|| SMI_HIDE == input) { || SMI_HIDE == input) {
@ -324,7 +324,7 @@ NoRepeatedApplyReadOnlyPolicy::NoRepeatedApplyReadOnlyPolicy()
void NoRepeatedApplyReadOnlyPolicy::input(SMInput input) void NoRepeatedApplyReadOnlyPolicy::input(SMInput input)
{ {
//lyxerr << "NoReapeatedApplyReadOnlyPolicy::input" << endl; //lyxerr << "NoReapeatedApplyReadOnlyPolicy::input" << endl;
// CANCEL and HIDE always take us to INITIAL for all cases // CANCEL and HIDE always take us to INITIAL for all cases
if (SMI_CANCEL == input if (SMI_CANCEL == input
|| SMI_HIDE == input) { || SMI_HIDE == input) {
@ -416,7 +416,7 @@ OkApplyCancelReadOnlyPolicy::OkApplyCancelReadOnlyPolicy()
void OkApplyCancelReadOnlyPolicy::input(SMInput input) void OkApplyCancelReadOnlyPolicy::input(SMInput input)
{ {
//lyxerr << "OkApplyCancelReadOnlyPolicy::input" << endl; //lyxerr << "OkApplyCancelReadOnlyPolicy::input" << endl;
// CANCEL and HIDE always take us to INITIAL for all cases // CANCEL and HIDE always take us to INITIAL for all cases
if (SMI_CANCEL == input if (SMI_CANCEL == input
|| SMI_HIDE == input) { || SMI_HIDE == input) {
@ -482,7 +482,7 @@ OkApplyCancelPolicy::OkApplyCancelPolicy()
void OkApplyCancelPolicy::input(SMInput input) void OkApplyCancelPolicy::input(SMInput input)
{ {
//lyxerr << "OkApplyCancelPolicy::input" << endl; //lyxerr << "OkApplyCancelPolicy::input" << endl;
// CANCEL and HIDE always take us to INITIAL for all cases // CANCEL and HIDE always take us to INITIAL for all cases
if (SMI_CANCEL == input if (SMI_CANCEL == input
|| SMI_HIDE == input) { || SMI_HIDE == input) {
@ -540,7 +540,7 @@ NoRepeatedApplyPolicy::NoRepeatedApplyPolicy()
void NoRepeatedApplyPolicy::input(SMInput input) void NoRepeatedApplyPolicy::input(SMInput input)
{ {
//lyxerr << "NoRepeatedApplyPolicy::input" << endl; //lyxerr << "NoRepeatedApplyPolicy::input" << endl;
// CANCEL and HIDE always take us to INITIAL for all cases // CANCEL and HIDE always take us to INITIAL for all cases
if (SMI_CANCEL == input if (SMI_CANCEL == input
|| SMI_HIDE == input) { || SMI_HIDE == input) {

View File

@ -98,7 +98,7 @@ public:
/// ///
BOGUS = 55 BOGUS = 55
}; };
/// The various button types. /// The various button types.
enum Button { enum Button {
/// ///
@ -115,7 +115,7 @@ public:
/// ///
static const Button ALL_BUTTONS = static const Button ALL_BUTTONS =
Button(OKAY | APPLY | CANCEL | RESTORE); Button(OKAY | APPLY | CANCEL | RESTORE);
/** State machine inputs. /** State machine inputs.
All the policies so far have both CANCEL and HIDE always going to All the policies so far have both CANCEL and HIDE always going to
INITIAL. This won't necessarily be true for all [future] policies INITIAL. This won't necessarily be true for all [future] policies
@ -131,7 +131,7 @@ public:
SMI_INVALID, SMI_INVALID,
/// an apply-and-hide action has happened /// an apply-and-hide action has happened
SMI_OKAY, SMI_OKAY,
/// an apply action has happened /// an apply action has happened
SMI_APPLY, SMI_APPLY,
/// a cancel action has happened /// a cancel action has happened
SMI_CANCEL, SMI_CANCEL,
@ -143,7 +143,7 @@ public:
SMI_READ_ONLY, SMI_READ_ONLY,
/// the dialog contents can be modified /// the dialog contents can be modified
SMI_READ_WRITE, SMI_READ_WRITE,
/// the state of the dialog contents has not changed /// the state of the dialog contents has not changed
SMI_NOOP, SMI_NOOP,
/// for internal use /// for internal use
SMI_TOTAL SMI_TOTAL
@ -195,7 +195,7 @@ public:
OkCancelPolicy(); OkCancelPolicy();
/// ///
//virtual ~OkCancelPolicy() {} //virtual ~OkCancelPolicy() {}
/// Trigger a transition with this input. /// Trigger a transition with this input.
virtual void input(SMInput); virtual void input(SMInput);
/** Activation status of a button. /** Activation status of a button.
@ -238,7 +238,7 @@ public:
OkCancelReadOnlyPolicy(); OkCancelReadOnlyPolicy();
/// ///
//virtual ~OkCancelReadOnlyPolicy() {} //virtual ~OkCancelReadOnlyPolicy() {}
/// Trigger a transition with this input. /// Trigger a transition with this input.
virtual void input(SMInput); virtual void input(SMInput);
/// Activation status of a button. /// Activation status of a button.
@ -284,7 +284,7 @@ public:
NoRepeatedApplyReadOnlyPolicy(); NoRepeatedApplyReadOnlyPolicy();
/// ///
//virtual ~NoRepeatedApplyReadOnlyPolicy() {} //virtual ~NoRepeatedApplyReadOnlyPolicy() {}
/// Trigger a transition with this input. /// Trigger a transition with this input.
virtual void input(SMInput); virtual void input(SMInput);
/// Activation status of a button. /// Activation status of a button.
@ -327,7 +327,7 @@ public:
OkApplyCancelReadOnlyPolicy(); OkApplyCancelReadOnlyPolicy();
/// ///
//virtual ~OkApplyCancelReadOnlyPolicy() {} //virtual ~OkApplyCancelReadOnlyPolicy() {}
/// Trigger a transition with this input. /// Trigger a transition with this input.
virtual void input(SMInput); virtual void input(SMInput);
/// Activation status of a button. /// Activation status of a button.
@ -363,7 +363,7 @@ public:
OkApplyCancelPolicy(); OkApplyCancelPolicy();
/// ///
//virtual ~OkApplyCancelPolicy() {} //virtual ~OkApplyCancelPolicy() {}
/// Trigger a transition with this input. /// Trigger a transition with this input.
virtual void input(SMInput); virtual void input(SMInput);
/// Activation status of a button. /// Activation status of a button.
@ -396,7 +396,7 @@ public:
NoRepeatedApplyPolicy(); NoRepeatedApplyPolicy();
/// ///
//virtual ~NoRepeatedApplyPolicy() {} //virtual ~NoRepeatedApplyPolicy() {}
/// Trigger a transition with this input. /// Trigger a transition with this input.
virtual void input(SMInput); virtual void input(SMInput);
/// Activation status of a button. /// Activation status of a button.
@ -430,7 +430,7 @@ public:
PreferencesPolicy(); PreferencesPolicy();
/// ///
//virtual ~PreferencesPolicy() {} //virtual ~PreferencesPolicy() {}
/// Trigger a transition with this input. /// Trigger a transition with this input.
virtual void input(SMInput); virtual void input(SMInput);
/// Activation status of a button. /// Activation status of a button.
@ -460,7 +460,7 @@ private:
class IgnorantPolicy : public ButtonPolicy { class IgnorantPolicy : public ButtonPolicy {
public: public:
//virtual ~IgnorantPolicy() {} //virtual ~IgnorantPolicy() {}
/// Trigger a transition with this input. /// Trigger a transition with this input.
virtual void input(SMInput) {} virtual void input(SMInput) {}
/// Activation status of a button. /// Activation status of a button.

View File

@ -1,3 +1,7 @@
2002-03-21 Lars Gullik Bjønnes <larsbj@birdstep.com>
* most files: ws cleanup
2002-03-18 Angus Leeming <a.leeming@ic.ac.uk> 2002-03-18 Angus Leeming <a.leeming@ic.ac.uk>
* biblio.C (getInfo): string::c_str() never returns NULL. Don't test * biblio.C (getInfo): string::c_str() never returns NULL. Don't test
@ -7,7 +11,7 @@
* ControlGraphics.C: * ControlGraphics.C:
* ControlInclude.C: better error messages * ControlInclude.C: better error messages
2002-03-11 Herbert Voss <voss@lyx.org> 2002-03-11 Herbert Voss <voss@lyx.org>
* biblio.C (parseBibTeX): fix another minibug with an * biblio.C (parseBibTeX): fix another minibug with an
@ -20,7 +24,7 @@
2002-03-09 Herbert Voss <voss@lyx.org> 2002-03-09 Herbert Voss <voss@lyx.org>
* ControlGraphics.[Ch]: adding checkFilename() for testing * ControlGraphics.[Ch]: adding checkFilename() for testing
of non-existing files of non-existing files
2002-03-07 Lars Gullik Bjønnes <larsbj@birdstep.com> 2002-03-07 Lars Gullik Bjønnes <larsbj@birdstep.com>
@ -35,7 +39,7 @@
2002-03-05 Herbert Voss <voss@lyx.org> 2002-03-05 Herbert Voss <voss@lyx.org>
* biblio.C (getInfo): simplify if using paragraph layout * biblio.C (getInfo): simplify if using paragraph layout
"bibliography". "bibliography".
2002-03-05 Angus Leeming <a.leeming@ic.ac.uk> 2002-03-05 Angus Leeming <a.leeming@ic.ac.uk>
@ -80,7 +84,7 @@
* ControlGraphics.C: remove #include "support/syscall.h" as it's not * ControlGraphics.C: remove #include "support/syscall.h" as it's not
used. used.
* ControlTexinfo.C: * ControlTexinfo.C:
change Systemcalls::System to Systemcalls::Wait and change Systemcalls::System to Systemcalls::Wait and
No change of functionality, just reflects the stripped down Systemcalls No change of functionality, just reflects the stripped down Systemcalls
class. class.
@ -105,7 +109,7 @@
* ControlSpellchecker.C: clear any selection left * ControlSpellchecker.C: clear any selection left
(bug #211) (bug #211)
2002-02-01 Herbert Voss <voss@lyx.org> 2002-02-01 Herbert Voss <voss@lyx.org>
* ControlGraphics.[C] (readBB): search only, if it is a * ControlGraphics.[C] (readBB): search only, if it is a
@ -153,7 +157,7 @@
* biblio.C (getInfo): fix bug when no author is given * biblio.C (getInfo): fix bug when no author is given
* biblio.C (parseBibTeX): change the parsing, so that * biblio.C (parseBibTeX): change the parsing, so that
'#'-characters in a bibtex entry are no more a problem. '#'-characters in a bibtex entry are no more a problem.
2002-01-19 Jean-Marc Lasgouttes <lasgouttes@freesurf.fr> 2002-01-19 Jean-Marc Lasgouttes <lasgouttes@freesurf.fr>
@ -233,7 +237,7 @@
Rename ControlDialogs.h as ControlDialog.h. Rename ControlDialogs.h as ControlDialog.h.
Add ButtonController.tmpl ControlDialog.tmpl ControlInset.tmpl to Add ButtonController.tmpl ControlDialog.tmpl ControlInset.tmpl to
EXTRA_DIST. EXTRA_DIST.
2002-01-15 Angus Leeming <a.leeming@ic.ac.uk> 2002-01-15 Angus Leeming <a.leeming@ic.ac.uk>
* ControlInset.h (apply): fix bug unearthed by Michael Koziarski. * ControlInset.h (apply): fix bug unearthed by Michael Koziarski.
@ -259,15 +263,15 @@
* helper_funcs.h (browseFile): add default empty button descriptions. * helper_funcs.h (browseFile): add default empty button descriptions.
* ControlGraphics.C (Browse): * ControlGraphics.C (Browse):
* ControlBibtex.C (Browse): * ControlBibtex.C (Browse):
* ControlInclude.C (Browse): add shortcuts to directory buttons * ControlInclude.C (Browse): add shortcuts to directory buttons
2002-01-12 John Levon <moz@compsoc.man.ac.uk> 2002-01-12 John Levon <moz@compsoc.man.ac.uk>
* ControlThesaurus.h: * ControlThesaurus.h:
* ControlThesaurus.C: update to Aiksaurus 0.14 * ControlThesaurus.C: update to Aiksaurus 0.14
2002-01-07 Angus Leeming <a.leeming@ic.ac.uk> 2002-01-07 Angus Leeming <a.leeming@ic.ac.uk>
* ControlSpellchecker.C (clearParams): show the closing message * ControlSpellchecker.C (clearParams): show the closing message
@ -286,11 +290,11 @@
2001-11-04 John Levon <moz@compsoc.man.ac.uk> 2001-11-04 John Levon <moz@compsoc.man.ac.uk>
* ControlToc.C: changes for floatlist * ControlToc.C: changes for floatlist
2001-11-04 John Levon <moz@compsoc.man.ac.uk> 2001-11-04 John Levon <moz@compsoc.man.ac.uk>
* ControlVCLog.C: use _() * ControlVCLog.C: use _()
2001-10-23 Jean-Marc Lasgouttes <Jean-Marc.Lasgouttes@inria.fr> 2001-10-23 Jean-Marc Lasgouttes <Jean-Marc.Lasgouttes@inria.fr>
* ControlSpellchecker.C: include <sys/types.h> since FreeBSD needs * ControlSpellchecker.C: include <sys/types.h> since FreeBSD needs
@ -316,7 +320,7 @@
* ControlTexinfo.C: new path for the shellscript TeXFiles.sh * ControlTexinfo.C: new path for the shellscript TeXFiles.sh
and some more stuff from FormTexinfo.C and some more stuff from FormTexinfo.C
* ControlShowFile.C: hiding the update-button * ControlShowFile.C: hiding the update-button
2001-10-09 Herbert Voss <voss@perce.de> 2001-10-09 Herbert Voss <voss@perce.de>
@ -428,16 +432,16 @@
* ControlDialogs.h: remove bc() hack, now fixed in * ControlDialogs.h: remove bc() hack, now fixed in
Qt2 frontend. use member dialog_built_ instead of shared Qt2 frontend. use member dialog_built_ instead of shared
static. static.
* ButtonController.h: * ButtonController.h:
* ButtonPolicies.C: more debug info * ButtonPolicies.C: more debug info
* ButtonControllerBase.C: call refresh() when setting readOnly ! * ButtonControllerBase.C: call refresh() when setting readOnly !
* GUI.h: External form has apply, use the right policy * GUI.h: External form has apply, use the right policy
* character.C: fix two off-by-one errors when latex font was removed * character.C: fix two off-by-one errors when latex font was removed
2001-08-15 Angus Leeming <a.leeming@ic.ac.uk> 2001-08-15 Angus Leeming <a.leeming@ic.ac.uk>
* ControlInset.h (apply): tentative fix for the press Apply multiple * ControlInset.h (apply): tentative fix for the press Apply multiple
@ -447,11 +451,11 @@
* ControlCharacter.C: fix typo * ControlCharacter.C: fix typo
* ViewBase.h: * ViewBase.h:
* ControlDialogs.C: * ControlDialogs.C:
* ControlInsets.C: make sure dialog is built before it is shown, so * ControlInsets.C: make sure dialog is built before it is shown, so
it works properly the very first time it is shown it works properly the very first time it is shown
2001-08-20 Herbert Voss <voss@perce.de> 2001-08-20 Herbert Voss <voss@perce.de>
* ControlBibtex.[Ch]: enhanced bibtex-data gui to browse for databases * ControlBibtex.[Ch]: enhanced bibtex-data gui to browse for databases
@ -472,7 +476,7 @@
2001-08-09 Allan Rae <rae@lyx.org> 2001-08-09 Allan Rae <rae@lyx.org>
* Makefile.am (SUBDIRS, dist-hook): remove bogus entries. * Makefile.am (SUBDIRS, dist-hook): remove bogus entries.
2001-08-07 Angus Leeming <a.leeming@ic.ac.uk> 2001-08-07 Angus Leeming <a.leeming@ic.ac.uk>
@ -532,7 +536,7 @@
* ControlInclude.h: * ControlInclude.h:
* ControlInclude.C: implement ability to load file * ControlInclude.C: implement ability to load file
2001-07-18 Juergen Vigna <jug@sad.it> 2001-07-18 Juergen Vigna <jug@sad.it>
* ControlSearch.C (replace): changes to lyxfind.h function calls. * ControlSearch.C (replace): changes to lyxfind.h function calls.
@ -568,7 +572,7 @@
2001-07-17 Edwin Leuven <leuven@fee.uva.nl> 2001-07-17 Edwin Leuven <leuven@fee.uva.nl>
* ControlSpellchecker.[Ch]: remove member quit() and some cleaning * ControlSpellchecker.[Ch]: remove member quit() and some cleaning
2001-07-16 Juergen Vigna <jug@sad.it> 2001-07-16 Juergen Vigna <jug@sad.it>
* ControlSpellchecker.C (show): use the lyxrc.use_pspell flag (if * ControlSpellchecker.C (show): use the lyxrc.use_pspell flag (if
@ -590,7 +594,7 @@
2001-07-13 Jean-Marc Lasgouttes <Jean-Marc.Lasgouttes@inria.fr> 2001-07-13 Jean-Marc Lasgouttes <Jean-Marc.Lasgouttes@inria.fr>
* ControlSpellchecker.C (getSuggestion): * ControlSpellchecker.C (getSuggestion):
(getWord): add std:: qualifier (getWord): add std:: qualifier
2001-07-13 Edwin Leuven <leuven@fee.uva.nl> 2001-07-13 Edwin Leuven <leuven@fee.uva.nl>
@ -598,7 +602,7 @@
* ControlSpellchecker.[Ch]: added * ControlSpellchecker.[Ch]: added
* ViewBase.h: added partialUpdate(int) member * ViewBase.h: added partialUpdate(int) member
* GUI.h: added spell stuff * GUI.h: added spell stuff
2001-07-12 Lars Gullik Bjønnes <larsbj@birdstep.com> 2001-07-12 Lars Gullik Bjønnes <larsbj@birdstep.com>
* ControlExternal.C: (*it). -> it-> * ControlExternal.C: (*it). -> it->
@ -698,11 +702,11 @@
2001-04-17 Lars Gullik Bjønnes <larsbj@birdstep.com> 2001-04-17 Lars Gullik Bjønnes <larsbj@birdstep.com>
* ButtonControllerBase.h: C++ mode, inherit privately from * ButtonControllerBase.h: C++ mode, inherit privately from
noncopyable noncopyable
* ButtonPolicies.h: ditto * ButtonPolicies.h: ditto
* ButtonController.h: C++ mode, swap init order of restore_ and * ButtonController.h: C++ mode, swap init order of restore_ and
cancel_ cancel_
2001-04-06 John Levon <moz@compsoc.man.ac.uk> 2001-04-06 John Levon <moz@compsoc.man.ac.uk>
@ -724,16 +728,16 @@
2001-04-05 Jean-Marc Lasgouttes <Jean-Marc.Lasgouttes@inria.fr> 2001-04-05 Jean-Marc Lasgouttes <Jean-Marc.Lasgouttes@inria.fr>
* ControlToc.C: * ControlToc.C:
* ControlSearch.C: * ControlSearch.C:
* ControlPrint.C: * ControlPrint.C:
* ControlPreamble.C: * ControlPreamble.C:
* ControlInclude.C: * ControlInclude.C:
* ControlGraphics.C: * ControlGraphics.C:
* ControlExternal.C: * ControlExternal.C:
* ControlCopyright.C: include gettext.h * ControlCopyright.C: include gettext.h
* ControlCharacter.C: * ControlCharacter.C:
* character.C: include gettext.h and language.h * character.C: include gettext.h and language.h
2001-04-03 John Levon <moz@compsoc.man.ac.uk> 2001-04-03 John Levon <moz@compsoc.man.ac.uk>
@ -779,7 +783,7 @@
* ViewBase.h: * ViewBase.h:
* ControlConnections.h: associated change in #include and class names. * ControlConnections.h: associated change in #include and class names.
* ControlExternal.[Ch]: new files; a controller for the External * ControlExternal.[Ch]: new files; a controller for the External
Material popup. Material popup.
@ -931,7 +935,7 @@
2001-03-23 Jean-Marc Lasgouttes <Jean-Marc.Lasgouttes@inria.fr> 2001-03-23 Jean-Marc Lasgouttes <Jean-Marc.Lasgouttes@inria.fr>
* ControlCredits.C (getCredits): remove std:: qualifier for * ControlCredits.C (getCredits): remove std:: qualifier for
getline(). getline().
2001-03-23 Lars Gullik Bjønnes <larsbj@trylle.birdstep.com> 2001-03-23 Lars Gullik Bjønnes <larsbj@trylle.birdstep.com>
@ -1052,9 +1056,9 @@
* ControlCommand.h (c-tor): give kb_action a default value of * ControlCommand.h (c-tor): give kb_action a default value of
LFUN_NOACTION. LFUN_NOACTION.
* ControlCommand.C (apply): do nothing if kb_action is LFUN_NOACTION. * ControlCommand.C (apply): do nothing if kb_action is LFUN_NOACTION.
* ControlCitation.[Ch]: moved search functions out of class. * ControlCitation.[Ch]: moved search functions out of class.
(bibkeysInfo): new method. Returns const reference to private data. (bibkeysInfo): new method. Returns const reference to private data.
(searchKeys): added case-sensitive switch. Used only by simpleSearch (searchKeys): added case-sensitive switch. Used only by simpleSearch
@ -1115,7 +1119,7 @@
* ControlCitation.h: the templatised class GUICitation instantiates * ControlCitation.h: the templatised class GUICitation instantiates
the methods view() and bc(). It also stores the instances of the the methods view() and bc(). It also stores the instances of the
View and ButtonController. View and ButtonController.
2001-02-23 Angus Leeming <a.leeming@ic.ac.uk> 2001-02-23 Angus Leeming <a.leeming@ic.ac.uk>
* ButtonControllerBase.[Ch]: renamed as ButtonController.[Ch]. Class * ButtonControllerBase.[Ch]: renamed as ButtonController.[Ch]. Class

View File

@ -92,6 +92,6 @@ string const ControlAboutlyx::getVersion() const
<< "\n" << "\n"
<< _("User directory: ") << _("User directory: ")
<< MakeDisplayPath(user_lyxdir); << MakeDisplayPath(user_lyxdir);
return ss.str().c_str(); return ss.str().c_str();
} }

View File

@ -28,7 +28,7 @@ public:
/// ///
stringstream & getCredits(stringstream &) const; stringstream & getCredits(stringstream &) const;
/// ///
string const getCopyright() const; string const getCopyright() const;
@ -40,7 +40,7 @@ public:
/// ///
string const getVersion() const; string const getVersion() const;
private: private:
/// not needed. /// not needed.
@ -48,4 +48,3 @@ private:
}; };
#endif // CONTROLABOUTLYX_H #endif // CONTROLABOUTLYX_H

View File

@ -1,5 +1,5 @@
/* This file is part of /* This file is part of
* ====================================================== * ======================================================
* *
* LyX, The Document Processor * LyX, The Document Processor
* *

View File

@ -1,6 +1,6 @@
// -*- C++ -*- // -*- C++ -*-
/* This file is part of /* This file is part of
* ====================================================== * ======================================================
* *
* LyX, The Document Processor * LyX, The Document Processor
* *

View File

@ -1,5 +1,5 @@
/* This file is part of /* This file is part of
* ====================================================== * ======================================================
* *
* LyX, The Document Processor * LyX, The Document Processor
* *
@ -61,8 +61,8 @@ void ControlBibtex::applyParamsNoInset()
{} {}
string const ControlBibtex::Browse(string const & in_name, string const ControlBibtex::Browse(string const & in_name,
string const & title, string const & title,
string const & pattern) string const & pattern)
{ {
pair<string, string> dir1(N_("Documents|#o#O"), string(lyxrc.document_path)); pair<string, string> dir1(N_("Documents|#o#O"), string(lyxrc.document_path));

View File

@ -1,6 +1,6 @@
// -*- C++ -*- // -*- C++ -*-
/* This file is part of /* This file is part of
* ====================================================== * ======================================================
* *
* LyX, The Document Processor * LyX, The Document Processor
* *
@ -31,11 +31,11 @@ public:
ControlBibtex(LyXView &, Dialogs &); ControlBibtex(LyXView &, Dialogs &);
/// Browse for a file /// Browse for a file
string const Browse(string const &, string const &, string const &); string const Browse(string const &, string const &, string const &);
private: private:
/// Dispatch the changed parameters to the kernel. /// Dispatch the changed parameters to the kernel.
virtual void applyParamsToInset(); virtual void applyParamsToInset();
/// ///
virtual void applyParamsNoInset(); virtual void applyParamsNoInset();
}; };

View File

@ -1,5 +1,5 @@
/* This file is part of /* This file is part of
* ====================================================== * ======================================================
* *
* LyX, The Document Processor * LyX, The Document Processor
* *
@ -60,5 +60,5 @@ void ControlButtons::RestoreButton()
bool ControlButtons::IconifyWithMain() const bool ControlButtons::IconifyWithMain() const
{ {
return lyxrc.dialogs_iconify_with_main; return lyxrc.dialogs_iconify_with_main;
} }

View File

@ -1,6 +1,6 @@
// -*- C++ -*- // -*- C++ -*-
/* This file is part of /* This file is part of
* ====================================================== * ======================================================
* *
* LyX, The Document Processor * LyX, The Document Processor
* *
@ -89,7 +89,7 @@ protected:
private: private:
/// ///
bool is_closing_; bool is_closing_;
}; };
#endif // CONTROLBUTTONS_H #endif // CONTROLBUTTONS_H

View File

@ -1,5 +1,5 @@
/* This file is part of /* This file is part of
* ====================================================== * ======================================================
* *
* LyX, The Document Processor * LyX, The Document Processor
* *

View File

@ -1,6 +1,6 @@
// -*- C++ -*- // -*- C++ -*-
/* This file is part of /* This file is part of
* ====================================================== * ======================================================
* *
* LyX, The Document Processor * LyX, The Document Processor
* *
@ -45,7 +45,7 @@ public:
private: private:
/// create the InfoMap of keys and data /// create the InfoMap of keys and data
virtual void setDaughterParams(); virtual void setDaughterParams();
/// ///
virtual void clearDaughterParams(); virtual void clearDaughterParams();
/** disconnect from the inset when the Apply button is pressed. /** disconnect from the inset when the Apply button is pressed.

View File

@ -1,5 +1,5 @@
/* This file is part of /* This file is part of
* ====================================================== * ======================================================
* *
* LyX, The Document Processor * LyX, The Document Processor
* *
@ -59,4 +59,3 @@ void ControlCommand::applyParamsNoInset()
if (action_ == LFUN_NOACTION) return; if (action_ == LFUN_NOACTION) return;
lv_.getLyXFunc()->dispatch(action_, params().getAsString()); lv_.getLyXFunc()->dispatch(action_, params().getAsString());
} }

View File

@ -1,6 +1,6 @@
// -*- C++ -*- // -*- C++ -*-
/* This file is part of /* This file is part of
* ====================================================== * ======================================================
* *
* LyX, The Document Processor * LyX, The Document Processor
* *
@ -17,7 +17,7 @@
* The class is likely to be changed as other Inset controllers are created * The class is likely to be changed as other Inset controllers are created
* and it becomes clear just what functionality can be moved back into * and it becomes clear just what functionality can be moved back into
* ControlInset. * ControlInset.
* *
*/ */
#ifndef CONTROLCOMMAND_H #ifndef CONTROLCOMMAND_H
@ -31,7 +31,7 @@
#include "insets/insetcommand.h" #include "insets/insetcommand.h"
#include "commandtags.h" // kb_action #include "commandtags.h" // kb_action
/** The Inset dialog controller. Connects/disconnects signals, launches /** The Inset dialog controller. Connects/disconnects signals, launches
GUI-dependent View and returns the output from this View to the kernel. GUI-dependent View and returns the output from this View to the kernel.
*/ */
class ControlCommand : public ControlInset<InsetCommand, InsetCommandParams> class ControlCommand : public ControlInset<InsetCommand, InsetCommandParams>
@ -43,7 +43,7 @@ public:
private: private:
/// Dispatch the changed parameters to the kernel. /// Dispatch the changed parameters to the kernel.
virtual void applyParamsToInset(); virtual void applyParamsToInset();
/// ///
virtual void applyParamsNoInset(); virtual void applyParamsNoInset();
/// get the parameters from the string passed to createInset. /// get the parameters from the string passed to createInset.
virtual InsetCommandParams const getParams(string const &); virtual InsetCommandParams const getParams(string const &);

View File

@ -1,5 +1,5 @@
/* This file is part of /* This file is part of
* ====================================================== * ======================================================
* *
* LyX, The Document Processor * LyX, The Document Processor
* *
@ -75,7 +75,7 @@ ControlConnectBase::DocTypes ControlConnectBase::docType() const
ControlConnectBI::ControlConnectBI(LyXView & lv, Dialogs & d) ControlConnectBI::ControlConnectBI(LyXView & lv, Dialogs & d)
: ControlConnectBase(lv, d) : ControlConnectBase(lv, d)
{} {}

View File

@ -1,6 +1,6 @@
// -*- C++ -*- // -*- C++ -*-
/* This file is part of /* This file is part of
* ====================================================== * ======================================================
* *
* LyX, The Document Processor * LyX, The Document Processor
* *
@ -62,7 +62,7 @@ public:
ControlConnectBase(LyXView &, Dialogs &); ControlConnectBase(LyXView &, Dialogs &);
/// The View may need to know if the buffer is read-only. /// The View may need to know if the buffer is read-only.
bool isReadonly() const; bool isReadonly() const;
/// ///
DocTypes docType() const; DocTypes docType() const;
protected: protected:
@ -99,8 +99,8 @@ protected:
class ControlConnectBI : public ControlConnectBase class ControlConnectBI : public ControlConnectBase
{ {
public: public:
/// ///
ControlConnectBI(LyXView &, Dialogs &); ControlConnectBI(LyXView &, Dialogs &);
protected: protected:
/// ///

View File

@ -7,8 +7,8 @@
* \author Angus Leeming <a.leeming@ic.ac.uk> * \author Angus Leeming <a.leeming@ic.ac.uk>
* *
* ControlDialog is to be used as a parent class for dialogs that are not * ControlDialog is to be used as a parent class for dialogs that are not
* views onto parameters of insets. (An ugly description I know, but I hope * views onto parameters of insets. (An ugly description I know, but I hope
* the meaning is clear! Can anyone do any better?) Examples would be the * the meaning is clear! Can anyone do any better?) Examples would be the
* Document and Paragraph dialogs. * Document and Paragraph dialogs.
*/ */

View File

@ -20,7 +20,7 @@ class Dialogs;
class LyXView; class LyXView;
class ControlDialogBD : public ControlDialog<ControlConnectBD> class ControlDialogBD : public ControlDialog<ControlConnectBD>
{ {
public: public:
/// ///

View File

@ -1,5 +1,5 @@
/* This file is part of /* This file is part of
* ====================================================== * ======================================================
* *
* LyX, The Document Processor * LyX, The Document Processor
* *

View File

@ -1,9 +1,9 @@
// -*- C++ -*- // -*- C++ -*-
/* This file is part of /* This file is part of
* ====================================================== * ======================================================
* *
* LyX, The Document Processor * LyX, The Document Processor
* *
* Copyright 2001 The LyX Team. * Copyright 2001 The LyX Team.
* *
*====================================================== *======================================================
@ -54,7 +54,7 @@ public:
private: private:
/// Dispatch the changed parameters to the kernel. /// Dispatch the changed parameters to the kernel.
virtual void applyParamsToInset(); virtual void applyParamsToInset();
/// ///
virtual void applyParamsNoInset(); virtual void applyParamsNoInset();
/// get the parameters from the string passed to createInset. /// get the parameters from the string passed to createInset.
virtual ERTParams const getParams(string const &) virtual ERTParams const getParams(string const &)

View File

@ -1,5 +1,5 @@
/* This file is part of /* This file is part of
* ====================================================== * ======================================================
* *
* LyX, The Document Processor * LyX, The Document Processor
* *
@ -38,4 +38,3 @@ string const ControlError::getParams(InsetError const & inset)
{ {
return inset.getContents(); return inset.getContents();
} }

View File

@ -2,7 +2,7 @@
/* /*
* \file ControlError.h * \file ControlError.h
* This file is part of * This file is part of
* ====================================================== * ======================================================
* *
* LyX, The Document Processor * LyX, The Document Processor
* *
@ -35,7 +35,7 @@ public:
private: private:
/// not needed. /// not needed.
virtual void applyParamsToInset() {} virtual void applyParamsToInset() {}
/// ///
virtual void applyParamsNoInset() {} virtual void applyParamsNoInset() {}
/// get the parameters from the string passed to createInset. /// get the parameters from the string passed to createInset.
virtual string const getParams(string const &) { return string(); } virtual string const getParams(string const &) { return string(); }

View File

@ -1,5 +1,5 @@
/* This file is part of /* This file is part of
* ====================================================== * ======================================================
* *
* LyX, The Document Processor * LyX, The Document Processor
* *
@ -53,7 +53,7 @@ InsetExternal::Params const ControlExternal::getParams(string const &)
return InsetExternal::Params(); return InsetExternal::Params();
} }
InsetExternal::Params const InsetExternal::Params const
ControlExternal::getParams(InsetExternal const & inset) ControlExternal::getParams(InsetExternal const & inset)
{ {
return inset.params(); return inset.params();

View File

@ -1,6 +1,6 @@
// -*- C++ -*- // -*- C++ -*-
/* This file is part of /* This file is part of
* ====================================================== * ======================================================
* *
* LyX, The Document Processor * LyX, The Document Processor
* *
@ -25,7 +25,7 @@
#include "insets/insetexternal.h" #include "insets/insetexternal.h"
/** A controller for External dialogs. /** A controller for External dialogs.
*/ */
class ControlExternal class ControlExternal
: public ControlInset<InsetExternal, InsetExternal::Params> : public ControlInset<InsetExternal, InsetExternal::Params>
{ {
@ -49,7 +49,7 @@ public:
string const Browse(string const &) const; string const Browse(string const &) const;
private: private:
/// ///
virtual void applyParamsToInset(); virtual void applyParamsToInset();
/// not needed. /// not needed.
virtual void applyParamsNoInset() {} virtual void applyParamsNoInset() {}

View File

@ -1,5 +1,5 @@
/* This file is part of /* This file is part of
* ====================================================== * ======================================================
* *
* LyX, The Document Processor * LyX, The Document Processor
* *
@ -64,6 +64,6 @@ FloatParams::FloatParams()
FloatParams::FloatParams(InsetFloat const & inset) FloatParams::FloatParams(InsetFloat const & inset)
: placement(inset.placement()), : placement(inset.placement()),
allow_here_definitely(!inset.wide()) allow_here_definitely(!inset.wide())
{} {}

View File

@ -1,9 +1,9 @@
// -*- C++ -*- // -*- C++ -*-
/* This file is part of /* This file is part of
* ====================================================== * ======================================================
* *
* LyX, The Document Processor * LyX, The Document Processor
* *
* Copyright 2001 The LyX Team. * Copyright 2001 The LyX Team.
* *
*====================================================== *======================================================
@ -38,14 +38,14 @@ struct FloatParams {
inline inline
bool operator==(FloatParams const & p1, FloatParams const & p2) bool operator==(FloatParams const & p1, FloatParams const & p2)
{ {
return p1.placement == p2.placement && p1.allow_here_definitely == p2.allow_here_definitely; return p1.placement == p2.placement && p1.allow_here_definitely == p2.allow_here_definitely;
} }
inline inline
bool operator!=(FloatParams const & p1, FloatParams const & p2) bool operator!=(FloatParams const & p1, FloatParams const & p2)
{ {
return !(p1 == p2); return !(p1 == p2);
} }
@ -60,7 +60,7 @@ public:
private: private:
/// Dispatch the changed parameters to the kernel. /// Dispatch the changed parameters to the kernel.
virtual void applyParamsToInset(); virtual void applyParamsToInset();
/// ///
virtual void applyParamsNoInset(); virtual void applyParamsNoInset();
/// get the parameters from the string passed to createInset. /// get the parameters from the string passed to createInset.
virtual FloatParams const getParams(string const &) virtual FloatParams const getParams(string const &)

View File

@ -1,4 +1,4 @@
/** /**
* \file ControlForks.C * \file ControlForks.C
* Copyright 2001 The LyX Team * Copyright 2001 The LyX Team
* Read COPYING * Read COPYING
@ -93,4 +93,3 @@ void ControlForks::clearParams()
pids_.clear(); pids_.clear();
childrenChanged_.disconnect(); childrenChanged_.disconnect();
} }

View File

@ -1,5 +1,5 @@
// -*- C++ -*- // -*- C++ -*-
/** /**
* \file ControlForks.h * \file ControlForks.h
* Copyright 2001 The LyX Team * Copyright 2001 The LyX Team
* Read COPYING * Read COPYING

View File

@ -1,5 +1,5 @@
/* This file is part of /* This file is part of
* ====================================================== * ======================================================
* *
* LyX, The Document Processor * LyX, The Document Processor
* *
@ -12,12 +12,12 @@
* \author Herbert Voss <voss@perce.de> * \author Herbert Voss <voss@perce.de>
*/ */
#include <config.h> #include <config.h>
#include <fstream> #include <fstream>
#ifdef __GNUG__ #ifdef __GNUG__
#pragma implementation #pragma implementation
#endif #endif
#include "ViewBase.h" #include "ViewBase.h"
#include "ButtonControllerBase.h" #include "ButtonControllerBase.h"
@ -81,41 +81,41 @@ void ControlGraphics::applyParamsNoInset()
// We need these in the file browser. // We need these in the file browser.
extern string system_lyxdir; extern string system_lyxdir;
extern string user_lyxdir; extern string user_lyxdir;
string const ControlGraphics::Browse(string const & in_name) string const ControlGraphics::Browse(string const & in_name)
{ {
string const title = N_("Select graphics file"); string const title = N_("Select graphics file");
// FIXME: currently we need the second '|' to prevent mis-interpretation // FIXME: currently we need the second '|' to prevent mis-interpretation
string const pattern = "*.(ps|eps|png|jpeg|jpg|gif|gz)|"; string const pattern = "*.(ps|eps|png|jpeg|jpg|gif|gz)|";
// Does user clipart directory exist? // Does user clipart directory exist?
string clipdir = AddName (user_lyxdir, "clipart"); string clipdir = AddName (user_lyxdir, "clipart");
FileInfo fileInfo(clipdir); FileInfo fileInfo(clipdir);
if (!(fileInfo.isOK() && fileInfo.isDir())) if (!(fileInfo.isOK() && fileInfo.isDir()))
// No - bail out to system clipart directory // No - bail out to system clipart directory
clipdir = AddName (system_lyxdir, "clipart"); clipdir = AddName (system_lyxdir, "clipart");
pair<string, string> dir1(N_("Clipart|#C#c"), clipdir); pair<string, string> dir1(N_("Clipart|#C#c"), clipdir);
pair<string, string> dir2(N_("Documents|#o#O"), string(lyxrc.document_path)); pair<string, string> dir2(N_("Documents|#o#O"), string(lyxrc.document_path));
// Show the file browser dialog // Show the file browser dialog
return browseFile(&lv_, in_name, title, pattern, dir1, dir2); return browseFile(&lv_, in_name, title, pattern, dir1, dir2);
} }
string const ControlGraphics::readBB(string const & file) string const ControlGraphics::readBB(string const & file)
{ {
// in a file it's an entry like %%BoundingBox:23 45 321 345 // in a file it's an entry like %%BoundingBox:23 45 321 345
// the first number can following without a space, so we have // the first number can following without a space, so we have
// to check a bit more. // to check a bit more.
// on the other hand some plot programs write the bb at the // on the other hand some plot programs write the bb at the
// end of the file. Than we have in the header a // end of the file. Than we have in the header a
// %%BoundingBox: (atend) // %%BoundingBox: (atend)
// In this case we must check until the end. // In this case we must check until the end.
string file_ = file; string file_ = file;
if (zippedFile(file_)) if (zippedFile(file_))
file_ = unzipFile(file_); file_ = unzipFile(file_);
std::ifstream is(file_.c_str()); std::ifstream is(file_.c_str());
if (!contains(getExtFromContents(file_),"ps")) // bb exists? if (!contains(getExtFromContents(file_),"ps")) // bb exists?
return string(); return string();
while (is) { while (is) {
string s; string s;
@ -124,7 +124,7 @@ string const ControlGraphics::readBB(string const & file)
string a, b, c, d; string a, b, c, d;
is >> a >> b >> c >> d; is >> a >> b >> c >> d;
if (is && !contains(a,"atend")) { // bb at the end? if (is && !contains(a,"atend")) { // bb at the end?
if (s != "%%BoundingBox:") if (s != "%%BoundingBox:")
return (s.substr(14)+" "+a+" "+b+" "+c+" "); return (s.substr(14)+" "+a+" "+b+" "+c+" ");
else else
return (a+" "+b+" "+c+" "+d+" "); return (a+" "+b+" "+c+" "+d+" ");

View File

@ -1,6 +1,6 @@
// -*- C++ -*- // -*- C++ -*-
/* This file is part of /* This file is part of
* ====================================================== * ======================================================
* *
* LyX, The Document Processor * LyX, The Document Processor
* *
@ -18,7 +18,7 @@
#ifdef __GNUG__ #ifdef __GNUG__
#pragma interface #pragma interface
#endif #endif
#include "ControlInset.h" #include "ControlInset.h"
@ -45,7 +45,7 @@ public:
private: private:
/// Dispatch the changed parameters to the kernel. /// Dispatch the changed parameters to the kernel.
virtual void applyParamsToInset(); virtual void applyParamsToInset();
/// ///
virtual void applyParamsNoInset(); virtual void applyParamsNoInset();
/// get the parameters from the string passed to createInset. /// get the parameters from the string passed to createInset.
virtual InsetGraphicsParams const getParams(string const &); virtual InsetGraphicsParams const getParams(string const &);
@ -54,4 +54,3 @@ private:
}; };
#endif // CONTROLGRAPHICS_H #endif // CONTROLGRAPHICS_H

View File

@ -53,7 +53,7 @@ string const ControlInclude::Browse(string const & in_name, Type in_type)
string const title = _("Select document to include"); string const title = _("Select document to include");
// input TeX, verbatim, or LyX file ? // input TeX, verbatim, or LyX file ?
string pattern; string pattern;
switch (in_type) { switch (in_type) {
case INPUT: case INPUT:
pattern = _("*.tex| LaTeX Documents (*.tex)"); pattern = _("*.tex| LaTeX Documents (*.tex)");
@ -67,12 +67,12 @@ string const ControlInclude::Browse(string const & in_name, Type in_type)
pattern = _("*.lyx| LyX Documents (*.lyx)"); pattern = _("*.lyx| LyX Documents (*.lyx)");
break; break;
} }
pair<string, string> dir1(N_("Documents|#o#O"), pair<string, string> dir1(N_("Documents|#o#O"),
string(lyxrc.document_path)); string(lyxrc.document_path));
string const docpath = OnlyPath(params().masterFilename_); string const docpath = OnlyPath(params().masterFilename_);
return browseRelFile(&lv_, in_name, docpath, title, pattern, dir1); return browseRelFile(&lv_, in_name, docpath, title, pattern, dir1);
} }
@ -85,11 +85,10 @@ void ControlInclude::load(string const & file)
bool ControlInclude::fileExists(string const & file) bool ControlInclude::fileExists(string const & file)
{ {
string const fileWithAbsPath = MakeAbsPath(file, OnlyPath(params().masterFilename_)); string const fileWithAbsPath = MakeAbsPath(file, OnlyPath(params().masterFilename_));
if (IsFileReadable(fileWithAbsPath)) if (IsFileReadable(fileWithAbsPath))
return true; return true;
else else
Alert::alert(_("Specified file doesn't exist !")); Alert::alert(_("Specified file doesn't exist !"));
return false; return false;
} }

View File

@ -41,10 +41,10 @@ public:
string const Browse(string const &, Type); string const Browse(string const &, Type);
/// load a file /// load a file
void load(string const & file); void load(string const & file);
/// test if file exist /// test if file exist
bool fileExists(string const & file); bool fileExists(string const & file);
private: private:
/// Dispatch the changed parameters to the kernel. /// Dispatch the changed parameters to the kernel.

View File

@ -1,5 +1,5 @@
/* This file is part of /* This file is part of
* ====================================================== * ======================================================
* *
* LyX, The Document Processor * LyX, The Document Processor
* *

View File

@ -1,6 +1,6 @@
// -*- C++ -*- // -*- C++ -*-
/* This file is part of /* This file is part of
* ====================================================== * ======================================================
* *
* LyX, The Document Processor * LyX, The Document Processor
* *

View File

@ -1,6 +1,6 @@
// -*- C++ -*- // -*- C++ -*-
/* This file is part of /* This file is part of
* ====================================================== * ======================================================
* *
* LyX, The Document Processor * LyX, The Document Processor
* *
@ -72,7 +72,7 @@ private:
virtual bool disconnectOnApply() { return false; } virtual bool disconnectOnApply() { return false; }
/// Instantiation of ControlButtons virtual methods. /// Instantiation of ControlButtons virtual methods.
/// Get changed parameters and Dispatch them to the kernel. /// Get changed parameters and Dispatch them to the kernel.
@ -92,7 +92,7 @@ private:
void connectInset(Inset * = 0); void connectInset(Inset * = 0);
/// pointer to the inset passed through connectInset /// pointer to the inset passed through connectInset
Inset * inset_; Inset * inset_;
/// inset::hide connection. /// inset::hide connection.
SigC::Connection ih_; SigC::Connection ih_;
/** A local copy of the inset's params. /** A local copy of the inset's params.
@ -102,7 +102,7 @@ private:
/// is the dialog built ? /// is the dialog built ?
bool dialog_built_; bool dialog_built_;
}; };

View File

@ -1,5 +1,5 @@
/* This file is part of /* This file is part of
* ====================================================== * ======================================================
* *
* LyX, The Document Processor * LyX, The Document Processor
* *

View File

@ -1,6 +1,6 @@
// -*- C++ -*- // -*- C++ -*-
/* This file is part of /* This file is part of
* ====================================================== * ======================================================
* *
* LyX, The Document Processor * LyX, The Document Processor
* *

View File

@ -1,5 +1,5 @@
/* This file is part of /* This file is part of
* ====================================================== * ======================================================
* *
* LyX, The Document Processor * LyX, The Document Processor
* *

View File

@ -1,9 +1,9 @@
// -*- C++ -*- // -*- C++ -*-
/* This file is part of /* This file is part of
* ====================================================== * ======================================================
* *
* LyX, The Document Processor * LyX, The Document Processor
* *
* Copyright 2001 The LyX Team. * Copyright 2001 The LyX Team.
* *
*====================================================== *======================================================
@ -56,7 +56,7 @@ public:
private: private:
/// Dispatch the changed parameters to the kernel. /// Dispatch the changed parameters to the kernel.
virtual void applyParamsToInset(); virtual void applyParamsToInset();
/// ///
virtual void applyParamsNoInset(); virtual void applyParamsNoInset();
/// get the parameters from the string passed to createInset. /// get the parameters from the string passed to createInset.
virtual MinipageParams const getParams(string const &) virtual MinipageParams const getParams(string const &)

View File

@ -36,7 +36,7 @@ void ControlPreamble::apply()
{ {
if (!lv_.view()->available()) if (!lv_.view()->available())
return; return;
view().apply(); view().apply();
lv_.buffer()->params.preamble = params(); lv_.buffer()->params.preamble = params();

View File

@ -33,7 +33,7 @@ private:
virtual void setParams(); virtual void setParams();
/// clean-up on hide. /// clean-up on hide.
virtual void clearParams(); virtual void clearParams();
/// ///
string * params_; string * params_;
}; };

View File

@ -1,8 +1,8 @@
/* This file is part of /* This file is part of
* ====================================================== * ======================================================
* *
* LyX, The Document Processor * LyX, The Document Processor
* *
* Copyright 2001 The LyX Team. * Copyright 2001 The LyX Team.
* *
*====================================================== *======================================================
@ -49,7 +49,7 @@ void ControlPrint::apply()
{ {
if (!lv_.view()->available()) if (!lv_.view()->available())
return; return;
view().apply(); view().apply();
if (!printBuffer(lv_.buffer(), params())) { if (!printBuffer(lv_.buffer(), params())) {

View File

@ -1,9 +1,9 @@
// -*- C++ -*- // -*- C++ -*-
/* This file is part of /* This file is part of
* ====================================================== * ======================================================
* *
* LyX, The Document Processor * LyX, The Document Processor
* *
* Copyright 2001 The LyX Team. * Copyright 2001 The LyX Team.
* *
*====================================================== *======================================================
@ -27,7 +27,7 @@ class PrinterParams;
*/ */
class ControlPrint : public ControlDialogBD { class ControlPrint : public ControlDialogBD {
public: public:
/// ///
ControlPrint(LyXView &, Dialogs &); ControlPrint(LyXView &, Dialogs &);
/// Browse for a file /// Browse for a file
@ -42,7 +42,7 @@ private:
virtual void setParams(); virtual void setParams();
/// clean-up on hide. /// clean-up on hide.
virtual void clearParams(); virtual void clearParams();
/// ///
PrinterParams * params_; PrinterParams * params_;
}; };

View File

@ -1,5 +1,5 @@
/* This file is part of /* This file is part of
* ====================================================== * ======================================================
* *
* LyX, The Document Processor * LyX, The Document Processor
* *
@ -66,7 +66,7 @@ void ControlRef::gotoBookmark() const
vector<string> const ControlRef::getBufferList() const vector<string> const ControlRef::getBufferList() const
{ {
vector<string> buffers = bufferlist.getFileNames(); vector<string> buffers = bufferlist.getFileNames();
for (vector<string>::iterator it = buffers.begin(); for (vector<string>::iterator it = buffers.begin();
it != buffers.end(); ++it) { it != buffers.end(); ++it) {

View File

@ -1,6 +1,6 @@
// -*- C++ -*- // -*- C++ -*-
/* This file is part of /* This file is part of
* ====================================================== * ======================================================
* *
* LyX, The Document Processor * LyX, The Document Processor
* *

View File

@ -1,5 +1,5 @@
/* This file is part of /* This file is part of
* ====================================================== * ======================================================
* *
* LyX, The Document Processor * LyX, The Document Processor
* *
@ -48,8 +48,8 @@ void ControlSearch::find(string const & search,
bool casesensitive, bool matchword, bool forward) const bool casesensitive, bool matchword, bool forward) const
{ {
bool const found = LyXFind(lv_.view(), search, bool const found = LyXFind(lv_.view(), search,
forward, false, casesensitive, matchword); forward, false, casesensitive, matchword);
if (!found) if (!found)
setMinibuffer(&lv_, _("String not found!")); setMinibuffer(&lv_, _("String not found!"));
} }
@ -63,9 +63,9 @@ void ControlSearch::replace(string const & search, string const & replace,
// changed // changed
bool const once = !all; bool const once = !all;
int const replace_count = LyXReplace(lv_.view(), int const replace_count = LyXReplace(lv_.view(),
search, replace, true, casesensitive, search, replace, true, casesensitive,
matchword, all, once); matchword, all, once);
if (replace_count == 0) { if (replace_count == 0) {
setMinibuffer(&lv_, _("String not found!")); setMinibuffer(&lv_, _("String not found!"));
} else { } else {

View File

@ -1,6 +1,6 @@
// -*- C++ -*- // -*- C++ -*-
/* This file is part of /* This file is part of
* ====================================================== * ======================================================
* *
* LyX, The Document Processor * LyX, The Document Processor
* *
@ -28,7 +28,7 @@ class ControlSearch : public ControlDialogBD {
public: public:
/// ///
ControlSearch(LyXView &, Dialogs &); ControlSearch(LyXView &, Dialogs &);
/// Searches occurence of string /// Searches occurence of string
void find(string const & search, void find(string const & search,
bool casesensitive, bool matchword, bool forward) const; bool casesensitive, bool matchword, bool forward) const;

View File

@ -106,7 +106,7 @@ void ControlSendto::apply()
{ {
if (!lv_.view()->available()) if (!lv_.view()->available())
return; return;
view().apply(); view().apply();
if (command_.empty() || !format_) if (command_.empty() || !format_)
@ -126,7 +126,7 @@ void ControlSendto::apply()
} else { } else {
Exporter::Export(lv_.buffer(), format_->name(), true, filename); Exporter::Export(lv_.buffer(), format_->name(), true, filename);
} }
// Substitute $$FName for filename // Substitute $$FName for filename
string command = command_; string command = command_;
@ -138,4 +138,3 @@ void ControlSendto::apply()
Systemcall call; Systemcall call;
call.startscript(Systemcall::DontWait, command); call.startscript(Systemcall::DontWait, command);
} }

View File

@ -1,5 +1,5 @@
/* This file is part of /* This file is part of
* ====================================================== * ======================================================
* *
* LyX, The Document Processor * LyX, The Document Processor
* *
@ -33,7 +33,7 @@
#include "buffer.h" #include "buffer.h"
#include "lyxrc.h" #include "lyxrc.h"
#include "BufferView.h" #include "BufferView.h"
#include "LyXView.h" #include "LyXView.h"
#include "lyxtext.h" #include "lyxtext.h"
#include "gettext.h" #include "gettext.h"
#include "support/lstrings.h" #include "support/lstrings.h"
@ -72,18 +72,18 @@ void ControlSpellchecker::setParams()
if (lyxrc.use_pspell) { if (lyxrc.use_pspell) {
tmp = (lyxrc.isp_use_alt_lang) ? tmp = (lyxrc.isp_use_alt_lang) ?
lyxrc.isp_alt_lang : lv_.buffer()->params.language->code(); lyxrc.isp_alt_lang : lv_.buffer()->params.language->code();
speller_ = new PSpell(lv_.view()->buffer()->params, tmp); speller_ = new PSpell(lv_.view()->buffer()->params, tmp);
} else { } else {
#endif #endif
tmp = (lyxrc.isp_use_alt_lang) ? tmp = (lyxrc.isp_use_alt_lang) ?
lyxrc.isp_alt_lang : lv_.buffer()->params.language->lang(); lyxrc.isp_alt_lang : lv_.buffer()->params.language->lang();
speller_ = new ISpell(lv_.view()->buffer()->params, tmp); speller_ = new ISpell(lv_.view()->buffer()->params, tmp);
#ifdef USE_PSPELL #ifdef USE_PSPELL
} }
#endif #endif
if (lyxrc.isp_use_alt_lang) { if (lyxrc.isp_use_alt_lang) {
Language const * lang = languages.getLanguage(tmp); Language const * lang = languages.getLanguage(tmp);
if (lang) if (lang)
@ -91,7 +91,7 @@ void ControlSpellchecker::setParams()
} else { } else {
rtl_ = lv_.buffer()->params.language->RightToLeft(); rtl_ = lv_.buffer()->params.language->RightToLeft();
} }
if (speller_->error() != 0) { if (speller_->error() != 0) {
#if 0 #if 0
message_ = speller_->error(); message_ = speller_->error();
@ -109,21 +109,21 @@ void ControlSpellchecker::check()
{ {
result_ = SpellBase::ISP_OK; result_ = SpellBase::ISP_OK;
stop_ = false; stop_ = false;
// clear any old selection // clear any old selection
LyXText * text = lv_.view()->getLyXText(); LyXText * text = lv_.view()->getLyXText();
lv_.view()->toggleSelection(true); lv_.view()->toggleSelection(true);
lv_.view()->update(text, BufferView::SELECT); lv_.view()->update(text, BufferView::SELECT);
while ((result_==SpellBase::ISP_OK || result_==SpellBase::ISP_IGNORE) && while ((result_==SpellBase::ISP_OK || result_==SpellBase::ISP_IGNORE) &&
!stop_) { !stop_) {
word_ = lv_.view()->nextWord(newval_); word_ = lv_.view()->nextWord(newval_);
if (word_.empty()) { if (word_.empty()) {
clearParams(); clearParams();
break; break;
} }
++count_; ++count_;
// Update slider if and only if value has changed // Update slider if and only if value has changed
@ -133,12 +133,12 @@ void ControlSpellchecker::check()
// set progress bar // set progress bar
view().partialUpdate(0); view().partialUpdate(0);
} }
if (!speller_->alive()) clearParams(); if (!speller_->alive()) clearParams();
result_ = speller_->check(word_); result_ = speller_->check(word_);
} }
if (!stop_ && !word_.empty()) if (!stop_ && !word_.empty())
lv_.view()->selectLastWord(); lv_.view()->selectLastWord();
@ -176,12 +176,12 @@ string ControlSpellchecker::getSuggestion()
// segfaults when nextMiss is 0 // segfaults when nextMiss is 0
string tmp; string tmp;
char const * w = speller_->nextMiss(); char const * w = speller_->nextMiss();
if (w!=0) { if (w!=0) {
tmp = w; tmp = w;
if (rtl_) std::reverse(tmp.begin(), tmp.end()); if (rtl_) std::reverse(tmp.begin(), tmp.end());
} }
return tmp; return tmp;
} }
@ -211,7 +211,7 @@ void ControlSpellchecker::stop()
void ControlSpellchecker::clearParams() void ControlSpellchecker::clearParams()
{ {
if (!speller_) return; if (!speller_) return;
if (speller_->alive()) { if (speller_->alive()) {
speller_->close(); speller_->close();
message_ = tostr(count_); message_ = tostr(count_);
@ -234,9 +234,9 @@ void ControlSpellchecker::clearParams()
// make sure that the dialog is not launched // make sure that the dialog is not launched
emergency_exit_ = true; emergency_exit_ = true;
} }
delete speller_; delete speller_;
lv_.view()->endOfSpellCheck(); lv_.view()->endOfSpellCheck();
// show closing message if any words were checked. // show closing message if any words were checked.

View File

@ -1,6 +1,6 @@
// -*- C++ -*- // -*- C++ -*-
/* This file is part of /* This file is part of
* ====================================================== * ======================================================
* *
* LyX, The Document Processor * LyX, The Document Processor
* *
@ -40,7 +40,7 @@ public:
/// ignore all occurances of word /// ignore all occurances of word
void ignoreAll(); void ignoreAll();
/// stop checking /// stop checking
void stop(); void stop();
@ -49,7 +49,7 @@ public:
/// spell options /// spell options
void options(); void options();
/// get suggestion /// get suggestion
string getSuggestion(); string getSuggestion();
@ -58,16 +58,16 @@ public:
/// returns progress value /// returns progress value
int getProgress() { int getProgress() {
return oldval_; return oldval_;
} }
/// returns exit message /// returns exit message
string getMessage() { string getMessage() {
return message_; return message_;
} }
private: private:
/// set the params before show or update /// set the params before show or update
void setParams(); void setParams();
/// clean-up on hide. /// clean-up on hide.
@ -101,7 +101,7 @@ private:
/// The actual spellchecker object /// The actual spellchecker object
SpellBase * speller_; SpellBase * speller_;
}; };
#endif // CONTROLSPELLCHECKER_H #endif // CONTROLSPELLCHECKER_H

View File

@ -1,5 +1,5 @@
/* This file is part of /* This file is part of
* ====================================================== * ======================================================
* *
* LyX, The Document Processor * LyX, The Document Processor
* *
@ -49,10 +49,10 @@ void ControlTabularCreate::apply()
{ {
if (!lv_.view()->available()) if (!lv_.view()->available())
return; return;
view().apply(); view().apply();
string const val(tostr(params().first) + " " + tostr(params().second)); string const val(tostr(params().first) + " " + tostr(params().second));
lv_.getLyXFunc()->dispatch(LFUN_INSET_TABULAR, val); lv_.getLyXFunc()->dispatch(LFUN_INSET_TABULAR, val);
} }

View File

@ -1,9 +1,9 @@
// -*- C++ -*- // -*- C++ -*-
/* This file is part of /* This file is part of
* ====================================================== * ======================================================
* *
* LyX, The Document Processor * LyX, The Document Processor
* *
* Copyright 2001 The LyX Team. * Copyright 2001 The LyX Team.
* *
*====================================================== *======================================================
@ -15,7 +15,7 @@
#define CONTROLTABULARCREATE_H #define CONTROLTABULARCREATE_H
#include <utility> #include <utility>
#ifdef __GNUG__ #ifdef __GNUG__
#pragma interface #pragma interface
#endif #endif
@ -26,9 +26,9 @@
*/ */
class ControlTabularCreate : public ControlDialogBD { class ControlTabularCreate : public ControlDialogBD {
public: public:
/// ///
ControlTabularCreate(LyXView &, Dialogs &); ControlTabularCreate(LyXView &, Dialogs &);
typedef std::pair<unsigned int, unsigned int> rowsCols; typedef std::pair<unsigned int, unsigned int> rowsCols;
/// ///
@ -40,7 +40,7 @@ private:
/// set the params before show or update /// set the params before show or update
virtual void setParams(); virtual void setParams();
/// rows, cols params /// rows, cols params
rowsCols params_; rowsCols params_;
}; };

View File

@ -1,5 +1,5 @@
/* This file is part of /* This file is part of
* ====================================================== * ======================================================
* *
* LyX, The Document Processor * LyX, The Document Processor
* *
@ -61,9 +61,9 @@ void ControlTexinfo::runTexhash() const
//path to texhash through system //path to texhash through system
Systemcall one; Systemcall one;
one.startscript(Systemcall::Wait, "texhash"); one.startscript(Systemcall::Wait, "texhash");
p.pop(); p.pop();
// Alert::alert(_("texhash run!"), // Alert::alert(_("texhash run!"),
// _("rebuilding of the TeX-tree could only be successfull"), // _("rebuilding of the TeX-tree could only be successfull"),
// _("if you have had user-write-permissions to the tex-dir.")); // _("if you have had user-write-permissions to the tex-dir."));
} }
@ -74,10 +74,10 @@ namespace {
string const sortEntries(string & str_in) string const sortEntries(string & str_in)
{ {
std::vector<string> dbase = getVectorFromString(str_in,"\n"); std::vector<string> dbase = getVectorFromString(str_in,"\n");
std::sort(dbase.begin(), dbase.end()); // sort entries std::sort(dbase.begin(), dbase.end()); // sort entries
std::vector<string>::iterator p = std::vector<string>::iterator p =
std::unique(dbase.begin(), dbase.end()); // compact std::unique(dbase.begin(), dbase.end()); // compact
dbase.erase(p, dbase.end()); // shrink dbase.erase(p, dbase.end()); // shrink
return getStringFromVector(dbase,"\n"); return getStringFromVector(dbase,"\n");
} }
@ -93,7 +93,7 @@ ControlTexinfo::getContents(texFileSuffix type, bool withFullPath) const
string filename; string filename;
switch (type) { switch (type) {
case bst: case bst:
filename = bstFilename; filename = bstFilename;
break; break;
case cls: case cls:
@ -127,4 +127,3 @@ void ControlTexinfo::viewFile(string const filename) const
{ {
lv_.getDialogs()->showFile(filename); lv_.getDialogs()->showFile(filename);
} }

View File

@ -1,6 +1,6 @@
// -*- C++ -*- // -*- C++ -*-
/* This file is part of /* This file is part of
* ====================================================== * ======================================================
* *
* LyX, The Document Processor * LyX, The Document Processor
* *

View File

@ -27,7 +27,7 @@ class ControlThesaurus : public ControlDialogBD {
public: public:
/// ///
ControlThesaurus(LyXView &, Dialogs &); ControlThesaurus(LyXView &, Dialogs &);
/// replace the particular string /// replace the particular string
void replace(string const & newstr); void replace(string const & newstr);
@ -36,7 +36,7 @@ public:
/// get meanings /// get meanings
Thesaurus::Meanings const & getMeanings(string const & str); Thesaurus::Meanings const & getMeanings(string const & str);
/// the text /// the text
string const & text() { string const & text() {
return oldstr_; return oldstr_;

View File

@ -1,5 +1,5 @@
/* This file is part of /* This file is part of
* ====================================================== * ======================================================
* *
* LyX, The Document Processor * LyX, The Document Processor
* *
@ -84,7 +84,7 @@ Buffer::SingleList const ControlToc::getContents(string const & type) const
} }
namespace toc namespace toc
{ {
string const getType(string const & cmdName) string const getType(string const & cmdName)
@ -97,5 +97,5 @@ string const getType(string const & cmdName)
return type; return type;
} }
} // namespace toc } // namespace toc

View File

@ -1,6 +1,6 @@
// -*- C++ -*- // -*- C++ -*-
/* This file is part of /* This file is part of
* ====================================================== * ======================================================
* *
* LyX, The Document Processor * LyX, The Document Processor
* *
@ -40,7 +40,7 @@ public:
Buffer::SingleList const getContents(string const & type) const; Buffer::SingleList const getContents(string const & type) const;
}; };
namespace toc namespace toc
{ {
/** Given the cmdName of the TOC param, returns the type used /** Given the cmdName of the TOC param, returns the type used
by ControlToc::getContents() */ by ControlToc::getContents() */

View File

@ -1,5 +1,5 @@
/* This file is part of /* This file is part of
* ====================================================== * ======================================================
* *
* LyX, The Document Processor * LyX, The Document Processor
* *

View File

@ -1,6 +1,6 @@
// -*- C++ -*- // -*- C++ -*-
/* This file is part of /* This file is part of
* ====================================================== * ======================================================
* *
* LyX, The Document Processor * LyX, The Document Processor
* *
@ -23,7 +23,7 @@
/** A controller for the Url Dialog. /** A controller for the Url Dialog.
*/ */
class ControlUrl : public ControlCommand class ControlUrl : public ControlCommand
{ {
public: public:
/// ///

View File

@ -60,7 +60,7 @@ stringstream & ControlVCLog::getVCLogFile(stringstream & ss) const
ss << in.rdbuf(); ss << in.rdbuf();
found = ss.good(); found = ss.good();
} }
if (!found) if (!found)
ss << _("No version control log file found.") << endl; ss << _("No version control log file found.") << endl;

View File

@ -1,6 +1,6 @@
// -*- C++ -*- // -*- C++ -*-
/* This file is part of /* This file is part of
* ====================================================== * ======================================================
* *
* LyX, The Document Processor * LyX, The Document Processor
* *

View File

@ -345,7 +345,7 @@ public:
template <class GUIview, class GUIbc> template <class GUIview, class GUIbc>
class GUITabularCreate : class GUITabularCreate :
public GUI<ControlTabularCreate, GUIview, public GUI<ControlTabularCreate, GUIview,
OkApplyCancelReadOnlyPolicy, GUIbc> { OkApplyCancelReadOnlyPolicy, GUIbc> {
public: public:
/// ///
GUITabularCreate(LyXView & lv, Dialogs & d) GUITabularCreate(LyXView & lv, Dialogs & d)
@ -370,7 +370,7 @@ public:
template <class GUIview, class GUIbc> template <class GUIview, class GUIbc>
class GUIThesaurus : class GUIThesaurus :
public GUI<ControlThesaurus, GUIview, public GUI<ControlThesaurus, GUIview,
OkApplyCancelReadOnlyPolicy, GUIbc> { OkApplyCancelReadOnlyPolicy, GUIbc> {
public: public:
/// ///
GUIThesaurus(LyXView & lv, Dialogs & d) GUIThesaurus(LyXView & lv, Dialogs & d)
@ -378,7 +378,7 @@ public:
OkApplyCancelReadOnlyPolicy, GUIbc>(lv, d) {} OkApplyCancelReadOnlyPolicy, GUIbc>(lv, d) {}
}; };
/** Specialization for Url dialog /** Specialization for Url dialog
*/ */
template <class GUIview, class GUIbc> template <class GUIview, class GUIbc>

View File

@ -1,6 +1,6 @@
// -*- C++ -*- // -*- C++ -*-
/* This file is part of /* This file is part of
* ====================================================== * ======================================================
* *
* LyX, The Document Processor * LyX, The Document Processor
* *
@ -19,9 +19,9 @@
class ViewBase { class ViewBase {
public: public:
/// ///
ViewBase(ControlButtons & c) : controller_(c) {} ViewBase(ControlButtons & c) : controller_(c) {}
/// ///
virtual ~ViewBase() {} virtual ~ViewBase() {}
/// Apply changes to LyX data from dialog. /// Apply changes to LyX data from dialog.
@ -40,20 +40,20 @@ public:
/** These shortcuts allow (e.g. xform's) global callback functions /** These shortcuts allow (e.g. xform's) global callback functions
access to the buttons without making the whole controller_ public. access to the buttons without making the whole controller_ public.
*/ */
/// ///
void ApplyButton() { controller_.ApplyButton(); } void ApplyButton() { controller_.ApplyButton(); }
/// ///
void OKButton() { controller_.OKButton(); } void OKButton() { controller_.OKButton(); }
/// ///
void CancelButton() { controller_.CancelButton(); } void CancelButton() { controller_.CancelButton(); }
/// ///
void RestoreButton() { controller_.RestoreButton(); } void RestoreButton() { controller_.RestoreButton(); }
/** Defaults to nothing. Can be used by the Controller, however, to /** Defaults to nothing. Can be used by the Controller, however, to
indicate to the View that something has changed and that the indicate to the View that something has changed and that the
dialog therefore needs updating. */ dialog therefore needs updating. */
virtual void partialUpdate(int) {} virtual void partialUpdate(int) {}
protected: protected:
/// The view is, after all, controlled! /// The view is, after all, controlled!
ControlButtons & controller_; ControlButtons & controller_;

View File

@ -1,5 +1,5 @@
/* This file is part of /* This file is part of
* ====================================================== * ======================================================
* *
* LyX, The Document Processor * LyX, The Document Processor
* *
@ -34,15 +34,15 @@ using std::min;
using std::vector; using std::vector;
using std::sort; using std::sort;
namespace biblio namespace biblio
{ {
namespace { namespace {
using namespace biblio; using namespace biblio;
char const * const citeCommands[] = { char const * const citeCommands[] = {
"cite", "citet", "citep", "citealt", "citealp", "citeauthor", "cite", "citet", "citep", "citealt", "citealp", "citeauthor",
"citeyear", "citeyearpar" }; "citeyear", "citeyearpar" };
unsigned int const nCiteCommands = unsigned int const nCiteCommands =
@ -66,7 +66,7 @@ CiteStyle const citeStylesUCase[] = {
unsigned int const nCiteStylesUCase = unsigned int const nCiteStylesUCase =
sizeof(citeStylesUCase) / sizeof(CiteStyle); sizeof(citeStylesUCase) / sizeof(CiteStyle);
// The functions doing the dirty work for the search. // The functions doing the dirty work for the search.
vector<string>::const_iterator vector<string>::const_iterator
@ -107,14 +107,14 @@ simpleSearch(InfoMap const & theMap,
break; break;
} }
} }
if (found) return it; if (found) return it;
} }
return keys.end(); return keys.end();
} }
vector<string>::const_iterator vector<string>::const_iterator
regexSearch(InfoMap const & theMap, regexSearch(InfoMap const & theMap,
vector<string> const & keys, vector<string> const & keys,
@ -158,7 +158,7 @@ string const familyName(string const & name)
idx = fname.rfind("."); idx = fname.rfind(".");
if (idx != string::npos) if (idx != string::npos)
fname = frontStrip(fname.substr(idx+1)); fname = frontStrip(fname.substr(idx+1));
return fname; return fname;
} }
@ -167,7 +167,7 @@ string const getAbbreviatedAuthor(InfoMap const & map, string const & key)
{ {
lyx::Assert(!map.empty()); lyx::Assert(!map.empty());
InfoMap::const_iterator it = map.find(key); InfoMap::const_iterator it = map.find(key);
string author; string author;
if (it != map.end()) { if (it != map.end()) {
@ -204,7 +204,7 @@ string const getYear(InfoMap const & map, string const & key)
{ {
lyx::Assert(!map.empty()); lyx::Assert(!map.empty());
InfoMap::const_iterator it = map.find(key); InfoMap::const_iterator it = map.find(key);
string year; string year;
@ -213,16 +213,16 @@ string const getYear(InfoMap const & map, string const & key)
if (year.empty()) if (year.empty())
year = "50BC"; year = "50BC";
return year; return year;
} }
} // namespace anon } // namespace anon
// A functor for use with std::sort, leading to case insensitive sorting // A functor for use with std::sort, leading to case insensitive sorting
struct compareNoCase: public std::binary_function<string, string, bool> struct compareNoCase: public std::binary_function<string, string, bool>
{ {
bool operator()(string const & s1, string const & s2) const { bool operator()(string const & s1, string const & s2) const {
return compare_no_case(s1, s2) < 0; return compare_no_case(s1, s2) < 0;
@ -246,7 +246,7 @@ string const getInfo(InfoMap const & map, string const & key)
{ {
lyx::Assert(!map.empty()); lyx::Assert(!map.empty());
InfoMap::const_iterator it = map.find(key); InfoMap::const_iterator it = map.find(key);
if (it == map.end()) if (it == map.end())
return string(); return string();
// is the entry a BibTeX one or one from lyx-layout "bibliography"? // is the entry a BibTeX one or one from lyx-layout "bibliography"?
@ -301,7 +301,7 @@ string const getInfo(InfoMap const & map, string const & key)
// This should never happen (or at least be very unusual!) // This should never happen (or at least be very unusual!)
return it->second; return it->second;
} }
vector<string>::const_iterator vector<string>::const_iterator
searchKeys(InfoMap const & theMap, searchKeys(InfoMap const & theMap,
@ -315,7 +315,7 @@ searchKeys(InfoMap const & theMap,
// Preliminary checks // Preliminary checks
if (start < keys.begin() || start >= keys.end()) if (start < keys.begin() || start >= keys.end())
return keys.end(); return keys.end();
string search_expr = frontStrip(strip(expr)); string search_expr = frontStrip(strip(expr));
if (search_expr.empty()) if (search_expr.empty())
return keys.end(); return keys.end();
@ -358,10 +358,10 @@ string const parseBibTeX(string data, string const & findkey)
return string(); return string();
// now get only the important line of the bibtex entry. // now get only the important line of the bibtex entry.
// all entries are devided by ',' except the last one. // all entries are devided by ',' except the last one.
data += ','; // now we have same behaviour for all entries data += ','; // now we have same behaviour for all entries
// because the last one is "blah ... }" // because the last one is "blah ... }"
Entries = 0; Entries = 0;
dummy = token(data, ',', Entries); dummy = token(data, ',', Entries);
while (!contains(lowercase(dummy), findkey) && !dummy.empty()) while (!contains(lowercase(dummy), findkey) && !dummy.empty())
dummy = token(data, ',', ++Entries); dummy = token(data, ',', ++Entries);
@ -376,7 +376,7 @@ string const parseBibTeX(string data, string const & findkey)
keyvalue += (',' + dummy); keyvalue += (',' + dummy);
dummy = token(data, ',', ++Entries); dummy = token(data, ',', ++Entries);
} }
data = keyvalue; // now we have the important line data = keyvalue; // now we have the important line
data = strip(data, ' '); // all spaces data = strip(data, ' '); // all spaces
if (!contains(data, '{')) // no opening '{' if (!contains(data, '{')) // no opening '{'
data = strip(data, '}');// maybe there is a main closing '}' data = strip(data, '}');// maybe there is a main closing '}'
@ -407,18 +407,18 @@ string const parseBibTeX(string data, string const & findkey)
} else { } else {
// no {} and no "", pure data but with a // no {} and no "", pure data but with a
// possible ',' at the end // possible ',' at the end
return strip(data,','); return strip(data,',');
} }
string tmp = data.substr(keypos); string tmp = data.substr(keypos);
while (tmp.find('{') != string::npos && while (tmp.find('{') != string::npos &&
tmp.find('}') != string::npos && tmp.find('}') != string::npos &&
tmp.find('{') < tmp.find('}') && tmp.find('{') < tmp.find('}') &&
tmp.find('{') < tmp.find(enclosing)) { tmp.find('{') < tmp.find(enclosing)) {
keypos += tmp.find('{') + 1; keypos += tmp.find('{') + 1;
tmp = data.substr(keypos); tmp = data.substr(keypos);
keypos += tmp.find('}') + 1; keypos += tmp.find('}') + 1;
tmp = data.substr(keypos); tmp = data.substr(keypos);
} }
if (tmp.find(enclosing) == string::npos) if (tmp.find(enclosing) == string::npos)
return data; return data;
@ -434,7 +434,7 @@ string const parseBibTeX(string data, string const & findkey)
CitationStyle const getCitationStyle(string const & command) CitationStyle const getCitationStyle(string const & command)
{ {
if (command.empty()) return CitationStyle(); if (command.empty()) return CitationStyle();
CitationStyle cs; CitationStyle cs;
string cmd = command; string cmd = command;
@ -479,7 +479,7 @@ string const getCiteCommand(CiteStyle command, bool full, bool forceUCase)
return cite; return cite;
} }
vector<CiteStyle> const getCiteStyles(bool usingNatbib) vector<CiteStyle> const getCiteStyles(bool usingNatbib)
{ {
unsigned int nStyles = 1; unsigned int nStyles = 1;
@ -510,12 +510,12 @@ getNumericalStrings(string const & key,
vec[0] = _("No database"); vec[0] = _("No database");
return vec; return vec;
} }
vector<string> vec(styles.size()); vector<string> vec(styles.size());
string const author = getAbbreviatedAuthor(map, key); string const author = getAbbreviatedAuthor(map, key);
string const year = getYear(map, key); string const year = getYear(map, key);
for (vector<string>::size_type i = 0; i != vec.size(); ++i) { for (vector<string>::size_type i = 0; i != vec.size(); ++i) {
string str; string str;
@ -524,27 +524,27 @@ getNumericalStrings(string const & key,
case CITEP: case CITEP:
str = "[#ID]"; str = "[#ID]";
break; break;
case CITET: case CITET:
str = author + " [#ID]"; str = author + " [#ID]";
break; break;
case CITEALT: case CITEALT:
str = author + " #ID"; str = author + " #ID";
break; break;
case CITEALP: case CITEALP:
str = "#ID"; str = "#ID";
break; break;
case CITEAUTHOR: case CITEAUTHOR:
str = author; str = author;
break; break;
case CITEYEAR: case CITEYEAR:
str = year; str = year;
break; break;
case CITEYEARPAR: case CITEYEARPAR:
str = "(" + year + ")"; str = "(" + year + ")";
break; break;
@ -552,7 +552,7 @@ getNumericalStrings(string const & key,
vec[i] = str; vec[i] = str;
} }
return vec; return vec;
} }
@ -566,12 +566,12 @@ getAuthorYearStrings(string const & key,
vec[0] = _("No database"); vec[0] = _("No database");
return vec; return vec;
} }
vector<string> vec(styles.size()); vector<string> vec(styles.size());
string const author = getAbbreviatedAuthor(map, key); string const author = getAbbreviatedAuthor(map, key);
string const year = getYear(map, key); string const year = getYear(map, key);
for (vector<string>::size_type i = 0; i != vec.size(); ++i) { for (vector<string>::size_type i = 0; i != vec.size(); ++i) {
string str; string str;
@ -579,28 +579,28 @@ getAuthorYearStrings(string const & key,
case CITET: case CITET:
str = author + " (" + year + ")"; str = author + " (" + year + ")";
break; break;
case CITE: case CITE:
case CITEP: case CITEP:
str = "(" + author + ", " + year + ")"; str = "(" + author + ", " + year + ")";
break; break;
case CITEALT: case CITEALT:
str = author + " " + year ; str = author + " " + year ;
break; break;
case CITEALP: case CITEALP:
str = author + ", " + year ; str = author + ", " + year ;
break; break;
case CITEAUTHOR: case CITEAUTHOR:
str = author; str = author;
break; break;
case CITEYEAR: case CITEYEAR:
str = year; str = year;
break; break;
case CITEYEARPAR: case CITEYEARPAR:
str = "(" + year + ")"; str = "(" + year + ")";
break; break;
@ -608,8 +608,8 @@ getAuthorYearStrings(string const & key,
vec[i] = str; vec[i] = str;
} }
return vec; return vec;
} }
} // namespace biblio } // namespace biblio

View File

@ -1,6 +1,6 @@
// -*- C++ -*- // -*- C++ -*-
/* This file is part of /* This file is part of
* ====================================================== * ======================================================
* *
* LyX, The Document Processor * LyX, The Document Processor
* *
@ -22,7 +22,7 @@
#endif #endif
/** Functions of use to citation and bibtex GUI controllers and views */ /** Functions of use to citation and bibtex GUI controllers and views */
namespace biblio namespace biblio
{ {
/// ///
enum CiteStyle { enum CiteStyle {
@ -118,7 +118,7 @@ namespace biblio
[XX] is used in place of the actual reference [XX] is used in place of the actual reference
Eg, the vector will contain: [XX], Jones et al. [XX], ... Eg, the vector will contain: [XX], Jones et al. [XX], ...
User supplies : User supplies :
the key, the key,
the InfoMap of bibkeys info, the InfoMap of bibkeys info,
@ -132,10 +132,10 @@ namespace biblio
/** /**
"Translates" the available Citation Styles into strings for this key. "Translates" the available Citation Styles into strings for this key.
The returned string is displayed by the GUI. The returned string is displayed by the GUI.
Eg, the vector will contain: Eg, the vector will contain:
Jones et al. (1990), (Jones et al. 1990), Jones et al. 1990, ... Jones et al. (1990), (Jones et al. 1990), Jones et al. 1990, ...
User supplies : User supplies :
the key, the key,
the InfoMap of bibkeys info, the InfoMap of bibkeys info,
@ -145,6 +145,6 @@ namespace biblio
getAuthorYearStrings(string const & key, getAuthorYearStrings(string const & key,
InfoMap const & map, InfoMap const & map,
std::vector<CiteStyle> const & styles); std::vector<CiteStyle> const & styles);
} // namespace biblio } // namespace biblio
#endif // BIBLIOHELPERS_H #endif // BIBLIOHELPERS_H

View File

@ -1,5 +1,5 @@
/* This file is part of /* This file is part of
* ====================================================== * ======================================================
* *
* LyX, The Document Processor * LyX, The Document Processor
* *
@ -59,7 +59,7 @@ vector<SeriesPair> const getSeriesData()
series[2] = pr; series[2] = pr;
pr.first = _("Reset"); pr.second = LyXFont::INHERIT_SERIES; pr.first = _("Reset"); pr.second = LyXFont::INHERIT_SERIES;
series[3] = pr; series[3] = pr;
return series; return series;
} }
@ -81,7 +81,7 @@ vector<ShapePair> const getShapeData()
shape[4] = pr; shape[4] = pr;
pr.first = _("Reset"); pr.second = LyXFont::INHERIT_SHAPE; pr.first = _("Reset"); pr.second = LyXFont::INHERIT_SHAPE;
shape[5] = pr; shape[5] = pr;
return shape; return shape;
} }
@ -119,7 +119,7 @@ vector<SizePair> const getSizeData()
size[12] = pr; size[12] = pr;
pr.first = _("Reset"); pr.second = LyXFont::INHERIT_SIZE; pr.first = _("Reset"); pr.second = LyXFont::INHERIT_SIZE;
size[13] = pr; size[13] = pr;
return size; return size;
} }
@ -139,7 +139,7 @@ vector<BarPair> const getBarData()
bar[3] = pr; bar[3] = pr;
pr.first = _("Reset"); pr.second = INHERIT; pr.first = _("Reset"); pr.second = INHERIT;
bar[4] = pr; bar[4] = pr;
return bar; return bar;
} }
@ -171,7 +171,7 @@ vector<ColorPair> const getColorData()
color[9] = pr; color[9] = pr;
pr.first = _("Reset"); pr.second = LColor::inherit; pr.first = _("Reset"); pr.second = LColor::inherit;
color[10] = pr; color[10] = pr;
return color; return color;
} }
@ -184,12 +184,12 @@ vector<string> const getLanguageData()
langs[1] = _("Reset"); langs[1] = _("Reset");
vector<string>::size_type i = 1; vector<string>::size_type i = 1;
for (Languages::const_iterator cit = languages.begin(); for (Languages::const_iterator cit = languages.begin();
cit != languages.end(); ++cit) { cit != languages.end(); ++cit) {
langs[++i] = cit->second.lang(); langs[++i] = cit->second.lang();
} }
return langs; return langs;
} }
} // namespace character } // namespace character

View File

@ -1,6 +1,6 @@
// -*- C++ -*- // -*- C++ -*-
/* This file is part of /* This file is part of
* ====================================================== * ======================================================
* *
* LyX, The Document Processor * LyX, The Document Processor
* *

View File

@ -1,5 +1,5 @@
/* This file is part of /* This file is part of
* ====================================================== * ======================================================
* *
* LyX, The Document Processor * LyX, The Document Processor
* *
@ -77,7 +77,7 @@ vector<string> const getVectorFromString(string const & str,
string const browseFile(LyXView * lv, string const & filename, string const browseFile(LyXView * lv, string const & filename,
string const & title, string const & title,
string const & pattern, string const & pattern,
pair<string,string> const & dir1, pair<string,string> const & dir1,
pair<string,string> const & dir2) pair<string,string> const & dir2)
{ {
@ -88,18 +88,18 @@ string const browseFile(LyXView * lv, string const & filename,
FileDialog fileDlg(lv, title, LFUN_SELECT_FILE_SYNC, dir1, dir2); FileDialog fileDlg(lv, title, LFUN_SELECT_FILE_SYNC, dir1, dir2);
FileDialog::Result result; FileDialog::Result result;
while (1) { while (1) {
result = fileDlg.Select(lastPath, pattern, OnlyFilename(filename)); result = fileDlg.Select(lastPath, pattern, OnlyFilename(filename));
if (result.second.empty()) if (result.second.empty())
return result.second; return result.second;
lastPath = OnlyPath(result.second); lastPath = OnlyPath(result.second);
if (result.second.find_first_of("#~$% ") == string::npos) if (result.second.find_first_of("#~$% ") == string::npos)
break; break;
Alert::alert(_("Filename can't contain any " Alert::alert(_("Filename can't contain any "
"of these characters:"), "of these characters:"),
_("space, '#', '~', '$' or '%'.")); _("space, '#', '~', '$' or '%'."));
@ -112,12 +112,12 @@ string const browseFile(LyXView * lv, string const & filename,
string const browseRelFile(LyXView * lv, string const & filename, string const browseRelFile(LyXView * lv, string const & filename,
string const & refpath, string const & refpath,
string const & title, string const & title,
string const & pattern, string const & pattern,
pair<string,string> const & dir1, pair<string,string> const & dir1,
pair<string,string> const & dir2) pair<string,string> const & dir2)
{ {
string const fname = MakeAbsPath(filename, refpath); string const fname = MakeAbsPath(filename, refpath);
string const outname = browseFile(lv, fname, title, pattern, string const outname = browseFile(lv, fname, title, pattern,
dir1, dir2); dir1, dir2);
string const reloutname = MakeRelPath(outname, refpath); string const reloutname = MakeRelPath(outname, refpath);

View File

@ -1,6 +1,6 @@
// -*- C++ -*- // -*- C++ -*-
/* This file is part of /* This file is part of
* ====================================================== * ======================================================
* *
* LyX, The Document Processor * LyX, The Document Processor
* *
@ -32,7 +32,7 @@ std::vector<string> const
getVectorFromString(string const & str, string const & delim=","); getVectorFromString(string const & str, string const & delim=",");
class LyXView; class LyXView;
/** Launch a file dialog and return the chosen file. /** Launch a file dialog and return the chosen file.
filename: a suggested filename. filename: a suggested filename.
title: the title of the dialog. title: the title of the dialog.
@ -41,7 +41,7 @@ class LyXView;
*/ */
string const browseFile(LyXView *lv, string const & filename, string const browseFile(LyXView *lv, string const & filename,
string const & title, string const & title,
string const & pattern, string const & pattern,
std::pair<string,string> const & dir1 = std::make_pair(string(), string()), std::pair<string,string> const & dir1 = std::make_pair(string(), string()),
std::pair<string,string> const & dir2 = std::make_pair(string(), string())); std::pair<string,string> const & dir2 = std::make_pair(string(), string()));
@ -55,7 +55,7 @@ string const browseFile(LyXView *lv, string const & filename,
string const browseRelFile(LyXView *lv, string const & filename, string const browseRelFile(LyXView *lv, string const & filename,
string const & refpath, string const & refpath,
string const & title, string const & title,
string const & pattern, string const & pattern,
std::pair<string,string> const & dir1 = std::make_pair(string(), string()), std::pair<string,string> const & dir1 = std::make_pair(string(), string()),
std::pair<string,string> const & dir2 = std::make_pair(string(), string())); std::pair<string,string> const & dir2 = std::make_pair(string(), string()));
@ -81,7 +81,7 @@ struct seconder {
typedef typename Pair::second_type second_type; typedef typename Pair::second_type second_type;
second_type const & operator()(Pair const & p) { return p.second; } second_type const & operator()(Pair const & p) { return p.second; }
}; };
} }
/// ///

View File

@ -1,14 +1,18 @@
2002-03-21 Lars Gullik Bjønnes <larsbj@birdstep.com>
* most files: ws cleanup
2002-03-16 Michael A. Koziarski <michael@koziarski.com> 2002-03-16 Michael A. Koziarski <michael@koziarski.com>
* Makefile.am: Cleanup and linking fix. * Makefile.am: Cleanup and linking fix.
* README: Added procedure for adding a new dialog. * README: Added procedure for adding a new dialog.
* Dialogs.C (tooltipsEnable): new method. * Dialogs.C (tooltipsEnable): new method.
2002-03-14 Michael A. Koziarski <michael@koziarski.org> 2002-03-14 Michael A. Koziarski <michael@koziarski.org>
* Timeout_pimpl.C * Timeout_pimpl.C
* Timeout_pimpl.h: implemented running to fix compilation, linking * Timeout_pimpl.h: implemented running to fix compilation, linking
fix still to come fix still to come
2002-03-11 Lars Gullik Bjønnes <larsbj@birdstep.com> 2002-03-11 Lars Gullik Bjønnes <larsbj@birdstep.com>
@ -29,7 +33,7 @@
2002-03-02 Lars Gullik Bjønnes <larsbj@birdstep.com> 2002-03-02 Lars Gullik Bjønnes <larsbj@birdstep.com>
* Makefile.am: get rid of LYX_LIBS * Makefile.am: get rid of LYX_LIBS
2002-02-10 Michael A. Koziarski <michael@koziarski.com> 2002-02-10 Michael A. Koziarski <michael@koziarski.com>
@ -54,7 +58,7 @@
2002-01-12 Michael A. Koziarski <michael@koziarski.com> 2002-01-12 Michael A. Koziarski <michael@koziarski.com>
* various: Cleaned out the old stuff, standardised the new * various: Cleaned out the old stuff, standardised the new
stuff. stuff.
* GnomeBase.C * GnomeBase.C
* GnomeBase.h: Changed the constructor to take one argument. The * GnomeBase.h: Changed the constructor to take one argument. The
dialog name. The path and name of the glade files can be dialog name. The path and name of the glade files can be
@ -67,7 +71,7 @@
* FormTabularCreate.C * FormTabularCreate.C
* FormTabularCreate.h: updated them to use the new system. * FormTabularCreate.h: updated them to use the new system.
Removed Local inline *Clicked functions as they're now in the base Removed Local inline *Clicked functions as they're now in the base
class. class.
* README: new, brief outline of what I'm doing here. * README: new, brief outline of what I'm doing here.
* accessors.py: Described in README, generates the accessor * accessors.py: Described in README, generates the accessor
functions from the glade file. functions from the glade file.
@ -83,7 +87,7 @@
2002-01-08 Martin Vermeer <martin.vermeer@hut.fi> 2002-01-08 Martin Vermeer <martin.vermeer@hut.fi>
* Menubar_pimpl.C (composeUIInfo): * Menubar_pimpl.C (composeUIInfo):
(update): use FuncStatus (update): use FuncStatus
2002-01-03 Michael Koziarski <michael@koziarski.com> 2002-01-03 Michael Koziarski <michael@koziarski.com>
@ -115,7 +119,7 @@
2001-08-27 John Levon <moz@compsoc.man.ac.uk> 2001-08-27 John Levon <moz@compsoc.man.ac.uk>
* GUIRunTime.C: initApplication() should take a int & argc, add debug * GUIRunTime.C: initApplication() should take a int & argc, add debug
2001-07-19 Baruch Even <baruch@lyx.org> 2001-07-19 Baruch Even <baruch@lyx.org>
* Menubar_pimpl.C: Renamed LyXFunc::Dispatch to LyXFunc::dispatch. * Menubar_pimpl.C: Renamed LyXFunc::Dispatch to LyXFunc::dispatch.
@ -129,7 +133,7 @@
* Makefile.am: * Makefile.am:
* Dialogs.C: Removed Citation and Copyright dialogs from build. Left them * Dialogs.C: Removed Citation and Copyright dialogs from build. Left them
in repository until they get redone as About Dialog. in repository until they get redone as About Dialog.
* FileDialog.C: * FileDialog.C:
* Menubar_pimpl.C: * Menubar_pimpl.C:
* Menubar_pimpl.h: * Menubar_pimpl.h:
@ -188,10 +192,10 @@
2001-04-16 Allan Rae <rae@lyx.org> 2001-04-16 Allan Rae <rae@lyx.org>
* gnomeBC.C (setButtonLabel): * gnomeBC.C (setButtonLabel):
* Menubar_pimpl.C (updateAllLists): * Menubar_pimpl.C (updateAllLists):
* GnomeBase.C (loadXML): #warning triggers an error on Sun CC 6.0 as * GnomeBase.C (loadXML): #warning triggers an error on Sun CC 6.0 as
an unrecognised preprocessor directive. So ensure they're wrapped. an unrecognised preprocessor directive. So ensure they're wrapped.
2001-04-03 Baruch Even <baruch@lyx.org> 2001-04-03 Baruch Even <baruch@lyx.org>
@ -205,7 +209,7 @@
* GnomeBase.C: * GnomeBase.C:
* GnomeBase.h: s/ControlButton/ControlButtons/ * GnomeBase.h: s/ControlButton/ControlButtons/
s/UndoAll/Restore/ s/UndoAll/Restore/
2001-04-02 Michael Koziarski <michael@koziarski.org> 2001-04-02 Michael Koziarski <michael@koziarski.org>
* FormCopyright.[Ch]: Reimplemented as an MVC dialog. * FormCopyright.[Ch]: Reimplemented as an MVC dialog.
@ -268,7 +272,7 @@
2001-03-26 Baruch Even <baruch@lyx.org> 2001-03-26 Baruch Even <baruch@lyx.org>
* Various files: Fixes to get the gnome frontend to compile again. * Various files: Fixes to get the gnome frontend to compile again.
Removed most xforms dialogs in order to reduce compilation breaks caused Removed most xforms dialogs in order to reduce compilation breaks caused
by the moves to MVC in the xforms frontend. by the moves to MVC in the xforms frontend.

View File

@ -46,7 +46,7 @@
#include "FormVCLog.h" #include "FormVCLog.h"
#include "FormDocument.h" #include "FormDocument.h"
#include "FormExternal.h" #include "FormExternal.h"
#include "FormGraphics.h" #include "FormGraphics.h"
#include "FormInclude.h" #include "FormInclude.h"
#include "FormIndex.h" #include "FormIndex.h"
@ -74,7 +74,7 @@ Dialogs::Dialogs(LyXView * lv)
add(new GUITabularCreate<FormTabularCreate, gnomeBC>(*lv, *this)); add(new GUITabularCreate<FormTabularCreate, gnomeBC>(*lv, *this));
add(new GUIERT<FormERT, gnomeBC>(*lv, *this)); add(new GUIERT<FormERT, gnomeBC>(*lv, *this));
/* /*
add(new GUIBibitem<FormBibitem, xformsBC>(*lv, *this)); add(new GUIBibitem<FormBibitem, xformsBC>(*lv, *this));
add(new GUIBibtex<FormBibtex, xformsBC>(*lv, *this)); add(new GUIBibtex<FormBibtex, xformsBC>(*lv, *this));
add(new GUICharacter<FormCharacter, xformsBC>(*lv, *this)); add(new GUICharacter<FormCharacter, xformsBC>(*lv, *this));
@ -84,13 +84,13 @@ Dialogs::Dialogs(LyXView * lv)
// For now we use the gnome non MVC dialogs // For now we use the gnome non MVC dialogs
add(new FormCitation(lv, this)); add(new FormCitation(lv, this));
add(new FormDocument(lv, this)); add(new FormDocument(lv, this));
add(new FormExternal(lv, this)); add(new FormExternal(lv, this));
add(new FormGraphics(lv, this)); add(new FormGraphics(lv, this));
add(new FormInclude(lv, this)); add(new FormInclude(lv, this));
add(new FormIndex(lv, this)); add(new FormIndex(lv, this));
add(new FormMathsPanel(lv, this)); add(new FormMathsPanel(lv, this));
add(new FormParagraph(lv, this)); add(new FormParagraph(lv, this));
add(new FormPreamble(lv, this)); add(new FormPreamble(lv, this));
add(new FormPreferences(lv, this)); add(new FormPreferences(lv, this));
@ -126,9 +126,9 @@ A. To avoid a segfault.
the newly created Dialogs instance using `this'. the newly created Dialogs instance using `this'.
(*) -- I'm using signals exclusively to guarantee that the gui code (*) -- I'm using signals exclusively to guarantee that the gui code
remains hidden from the rest of the system. In fact the only remains hidden from the rest of the system. In fact the only
header related to dialogs that anything in the non-gui-specific header related to dialogs that anything in the non-gui-specific
code gets to see is Dialogs.h! Even Dialogs.h doesn't know what a code gets to see is Dialogs.h! Even Dialogs.h doesn't know what a
FormCopyright class looks like or that its even going to be used! FormCopyright class looks like or that its even going to be used!
No other gui dialog headers are seen outside of the gui-specific No other gui dialog headers are seen outside of the gui-specific
@ -144,31 +144,31 @@ A. To avoid a segfault.
by adding a specific show or update signal. For example, spellchecker by adding a specific show or update signal. For example, spellchecker
needs to set the next suspect word and its options/replacements so we needs to set the next suspect word and its options/replacements so we
need a: need a:
Signal0<void> updateSpellChecker; Signal0<void> updateSpellChecker;
Since we would have to have a Since we would have to have a
Signal0<void> showSpellChecker; Signal0<void> showSpellChecker;
in order to just see the spellchecker and let the user push the [Start] in order to just see the spellchecker and let the user push the [Start]
button then the updateSpellChecker signal will make the SpellChecker button then the updateSpellChecker signal will make the SpellChecker
dialog get the new word and replacements list from LyX. If you really, dialog get the new word and replacements list from LyX. If you really,
really wanted to you could define a signal that would pass the new really wanted to you could define a signal that would pass the new
word and replacements: word and replacements:
Signal2<void, string, vector<string> > updateSpellChecker; Signal2<void, string, vector<string> > updateSpellChecker;
(or something similar) but, why bother when the spellchecker can get (or something similar) but, why bother when the spellchecker can get
it anyway with a LyXFunc call or two. Besides if someone extends it anyway with a LyXFunc call or two. Besides if someone extends
what a dialog does then they also have to change code in the rest of what a dialog does then they also have to change code in the rest of
LyX to pass more parameters or get the extra info via a function LyX to pass more parameters or get the extra info via a function
call anyway. Thus reducing the independence of the two code bases. call anyway. Thus reducing the independence of the two code bases.
We don't need a separate update signal for each dialog because most of We don't need a separate update signal for each dialog because most of
them will be changed only when the buffer is changed (either by closing them will be changed only when the buffer is changed (either by closing
the current open buffer or switching to another buffer in the current the current open buffer or switching to another buffer in the current
LyXView -- different BufferView same LyXView or same BufferView same LyXView -- different BufferView same LyXView or same BufferView same
LyXView). LyXView).
So we minimise signals but maximise independence and programming So we minimise signals but maximise independence and programming
simplicity, understandability and maintainability. It's also simplicity, understandability and maintainability. It's also
extremely easy to add support for Qt or gtk-- because they use extremely easy to add support for Qt or gtk-- because they use
signals already. Guis that use callbacks, like xforms, must have their signals already. Guis that use callbacks, like xforms, must have their

View File

@ -1,12 +1,12 @@
/* This file is part of /* This file is part of
* ================================================= * =================================================
* *
* LyX, The Document Processor * LyX, The Document Processor
* Copyright 1995-2000 The LyX Team. * Copyright 1995-2000 The LyX Team.
* *
* ================================================= * =================================================
* *
* \author Baruch Even * \author Baruch Even
**/ **/
#ifdef __GNUG__ #ifdef __GNUG__
@ -40,7 +40,7 @@ public:
void button_clicked(bool canceled); void button_clicked(bool canceled);
void ok_clicked() { button_clicked(false); } void ok_clicked() { button_clicked(false); }
void cancel_clicked() { button_clicked(true); } void cancel_clicked() { button_clicked(true); }
private: private:
Gtk::FileSelection sel_; Gtk::FileSelection sel_;
bool modal_; bool modal_;
@ -48,11 +48,11 @@ private:
}; };
FileDialog::Private::Private(string const & title) FileDialog::Private::Private(string const & title)
: sel_(title), modal_(false) : sel_(title), modal_(false)
{ {
sel_.get_ok_button()->clicked.connect(slot(this, sel_.get_ok_button()->clicked.connect(slot(this,
&FileDialog::Private::ok_clicked)); &FileDialog::Private::ok_clicked));
sel_.get_cancel_button()->clicked.connect(slot(this, sel_.get_cancel_button()->clicked.connect(slot(this,
&FileDialog::Private::cancel_clicked)); &FileDialog::Private::cancel_clicked));
} }
@ -63,7 +63,7 @@ string const FileDialog::Private::exec()
sel_.show(); sel_.show();
Gnome::Main::run(); Gnome::Main::run();
// Find if its canceled or oked and return as needed. // Find if its canceled or oked and return as needed.
if (canceled_) if (canceled_)
return string(); return string();
else else
@ -79,7 +79,7 @@ void FileDialog::Private::button_clicked(bool canceled)
// FileDialog // FileDialog
FileDialog::FileDialog(LyXView * lv, string const & title, kb_action a, FileDialog::FileDialog(LyXView * lv, string const & title, kb_action a,
Button /*b1*/, Button /*b2*/) Button /*b1*/, Button /*b2*/)
: private_(new Private(title)) : private_(new Private(title))
, lv_(lv), title_(title), success_(a) , lv_(lv), title_(title), success_(a)
@ -94,8 +94,8 @@ FileDialog::~FileDialog()
} }
FileDialog::Result const FileDialog::Result const
FileDialog::Select(string const & path, string const & mask, FileDialog::Select(string const & path, string const & mask,
string const & suggested) string const & suggested)
{ {
// For some reason we need to ignore the asynchronous method... // For some reason we need to ignore the asynchronous method...
@ -108,14 +108,14 @@ FileDialog::Select(string const & path, string const & mask,
} }
#endif #endif
lyxerr << "Synchronous file dialog." << std::endl; lyxerr << "Synchronous file dialog." << std::endl;
lyxerr << "Path: " << path << "\nMask: " << mask << "\nSuggested: " << suggested << std::endl; lyxerr << "Path: " << path << "\nMask: " << mask << "\nSuggested: " << suggested << std::endl;
string filter = mask; string filter = mask;
rsplit(mask, filter, '|'); rsplit(mask, filter, '|');
private_->set_complete(mask); private_->set_complete(mask);
private_->set_filename(path+suggested); private_->set_filename(path+suggested);
lv_->prohibitInput(); lv_->prohibitInput();
string const filename = private_->exec(); string const filename = private_->exec();
lv_->allowInput(); lv_->allowInput();

View File

@ -1,5 +1,5 @@
/* This file is part of /* This file is part of
* ====================================================== * ======================================================
* *
* LyX, The Document Processor * LyX, The Document Processor
* *
@ -88,13 +88,13 @@ FormCitation::~FormCitation()
void FormCitation::showInset( InsetCommand * const inset ) void FormCitation::showInset( InsetCommand * const inset )
{ {
if( dialog_!=0 || inset == 0 ) return; if( dialog_!=0 || inset == 0 ) return;
inset_ = inset; inset_ = inset;
ih_ = inset_->hideDialog.connect(SigC::slot(this, &FormCitation::hide)); ih_ = inset_->hideDialog.connect(SigC::slot(this, &FormCitation::hide));
u_ = d_->updateBufferDependent.connect(SigC::slot(this, &FormCitation::updateSlot)); u_ = d_->updateBufferDependent.connect(SigC::slot(this, &FormCitation::updateSlot));
h_ = d_->hideBufferDependent.connect(SigC::slot(this, &FormCitation::hide)); h_ = d_->hideBufferDependent.connect(SigC::slot(this, &FormCitation::hide));
params = inset->params(); params = inset->params();
if ( params.getContents().empty() ) showStageSearch(); if ( params.getContents().empty() ) showStageSearch();
@ -105,10 +105,10 @@ void FormCitation::showInset( InsetCommand * const inset )
void FormCitation::createInset( string const & arg ) void FormCitation::createInset( string const & arg )
{ {
if( dialog_!=0 ) return; if( dialog_!=0 ) return;
u_ = d_->updateBufferDependent.connect(SigC::slot(this, &FormCitation::updateSlot)); u_ = d_->updateBufferDependent.connect(SigC::slot(this, &FormCitation::updateSlot));
h_ = d_->hideBufferDependent.connect(SigC::slot(this, &FormCitation::hide)); h_ = d_->hideBufferDependent.connect(SigC::slot(this, &FormCitation::hide));
params.setFromString( arg ); params.setFromString( arg );
showStageSearch(); showStageSearch();
} }
@ -122,13 +122,13 @@ void parseBibTeX(string const & dat,
{ {
unsigned int i; unsigned int i;
string data(dat); string data(dat);
keyvalue = ""; keyvalue = "";
for (i=0; i<data.length(); ++i) for (i=0; i<data.length(); ++i)
if (data[i]=='\n' || data[i]=='\t') if (data[i]=='\n' || data[i]=='\t')
data[i] = ' '; data[i] = ' ';
data = frontStrip(data); data = frontStrip(data);
while (!data.empty() while (!data.empty()
&& data[0]!='=' && data[0]!='='
@ -140,7 +140,7 @@ void parseBibTeX(string const & dat,
string value; string value;
string tmp; string tmp;
char enclosing; char enclosing;
data = data.substr(keypos, data.length()-1); data = data.substr(keypos, data.length()-1);
data = frontStrip(strip(data)); data = frontStrip(strip(data));
if (data.length() > 1 && data[0]=='=') if (data.length() > 1 && data[0]=='=')
@ -193,13 +193,13 @@ void parseBibTeX(string const & dat,
keypos = data.find(','); keypos = data.find(',');
value = data.substr(0, keypos); value = data.substr(0, keypos);
if (keypos+1<data.length()-1) data = frontStrip(data.substr(keypos+1, data.length()-1)); if (keypos+1<data.length()-1) data = frontStrip(data.substr(keypos+1, data.length()-1));
else data = ""; else data = "";
} }
else return; else return;
if (findkey == key) { keyvalue = value; return; } if (findkey == key) { keyvalue = value; return; }
data = frontStrip(frontStrip(data,',')); data = frontStrip(frontStrip(data,','));
} }
@ -276,7 +276,7 @@ void FormCitation::initWidgets()
w = path + "/" + CONF_COLUMN + "_" + tostr(i) + CONF_COLUMN_DEFAULT; w = path + "/" + CONF_COLUMN + "_" + tostr(i) + CONF_COLUMN_DEFAULT;
clist_bib_->column(i).set_width( gnome_config_get_int(w.c_str()) ); clist_bib_->column(i).set_width( gnome_config_get_int(w.c_str()) );
} }
// retrieving data // retrieving data
vector<pair<string,string> > blist = lv_->buffer()->getBibkeyList(); vector<pair<string,string> > blist = lv_->buffer()->getBibkeyList();
@ -286,9 +286,9 @@ void FormCitation::initWidgets()
bibkeys.push_back(blist[i].first); bibkeys.push_back(blist[i].first);
bibkeysInfo.push_back(blist[i].second); bibkeysInfo.push_back(blist[i].second);
} }
blist.clear(); blist.clear();
// updating list // updating list
search(); search();
@ -312,7 +312,7 @@ void FormCitation::initWidgets()
r.clear(); r.clear();
r.push_back(tmp); r.push_back(tmp);
clist_selected_->rows().push_back(r); clist_selected_->rows().push_back(r);
keys = frontStrip( split(keys, tmp, ',') ); keys = frontStrip( split(keys, tmp, ',') );
} }
@ -341,7 +341,7 @@ void FormCitation::storeWidgets()
gnome_config_set_int(w.c_str(), button_regexp_->get_active()); gnome_config_set_int(w.c_str(), button_regexp_->get_active());
} }
if (paned_info_ != 0) if (paned_info_ != 0)
{ {
string w = path + "/" + CONF_PANE_INFO; string w = path + "/" + CONF_PANE_INFO;
gnome_config_set_int(w.c_str(), paned_info_->width() - info_->width()); gnome_config_set_int(w.c_str(), paned_info_->width() - info_->width());
@ -382,7 +382,7 @@ void FormCitation::showStageAction()
// set up spacing // set up spacing
bbox->set_spacing(4); bbox->set_spacing(4);
bbox->set_layout(GTK_BUTTONBOX_SPREAD); bbox->set_layout(GTK_BUTTONBOX_SPREAD);
bbox->children().push_back(Element(*b_add, false, false)); bbox->children().push_back(Element(*b_add, false, false));
bbox->children().push_back(Element(*b_edit, false, false)); bbox->children().push_back(Element(*b_edit, false, false));
bbox->children().push_back(Element(*b_cancel, false, false)); bbox->children().push_back(Element(*b_cancel, false, false));
@ -394,13 +394,13 @@ void FormCitation::showStageAction()
b_add->add_accelerator("clicked", *accel, b_add->get_accelkey(), 0, GTK_ACCEL_VISIBLE); b_add->add_accelerator("clicked", *accel, b_add->get_accelkey(), 0, GTK_ACCEL_VISIBLE);
b_edit->add_accelerator("clicked", *accel, b_edit->get_accelkey(), 0, GTK_ACCEL_VISIBLE); b_edit->add_accelerator("clicked", *accel, b_edit->get_accelkey(), 0, GTK_ACCEL_VISIBLE);
// packing dialog to main window // packing dialog to main window
dialog_ = mbox; dialog_ = mbox;
mainAppWin->add_action(*dialog_, _(" Citation: Select action "), false, accel); mainAppWin->add_action(*dialog_, _(" Citation: Select action "), false, accel);
initWidgets(); initWidgets();
// setting focus // setting focus
gtk_widget_grab_focus (GTK_WIDGET(b_add->gtkobj())); gtk_widget_grab_focus (GTK_WIDGET(b_add->gtkobj()));
@ -420,7 +420,7 @@ void FormCitation::moveFromActionToSearch()
// stores configuration and cleans all widgets // stores configuration and cleans all widgets
storeWidgets(); storeWidgets();
cleanupWidgets(); cleanupWidgets();
// moves to stage "search" // moves to stage "search"
mainAppWin->remove_action(); mainAppWin->remove_action();
showStageSearch(); showStageSearch();
@ -432,7 +432,7 @@ void FormCitation::moveFromActionToEdit()
// stores configuration and cleans all widgets // stores configuration and cleans all widgets
storeWidgets(); storeWidgets();
cleanupWidgets(); cleanupWidgets();
// moves to stage "edit" // moves to stage "edit"
mainAppWin->remove_action(); mainAppWin->remove_action();
showStageEdit(); showStageEdit();
@ -448,14 +448,14 @@ void FormCitation::showStageSearch()
Gtk::Box * mbox = manage( new Gtk::HBox() ); Gtk::Box * mbox = manage( new Gtk::HBox() );
Gtk::ButtonBox * bbox = manage( new Gtk::HButtonBox() ); Gtk::ButtonBox * bbox = manage( new Gtk::HButtonBox() );
Gtk::Separator * sep = manage( new Gtk::VSeparator() ); Gtk::Separator * sep = manage( new Gtk::VSeparator() );
search_text_ = manage( new Gnome::Entry() ); search_text_ = manage( new Gnome::Entry() );
button_regexp_ = manage( new Gtk::CheckButton(_("Use Regular Expression")) ); button_regexp_ = manage( new Gtk::CheckButton(_("Use Regular Expression")) );
b_ok = manage( new Gtk::Button(_("Search")) ); b_ok = manage( new Gtk::Button(_("Search")) );
b_cancel = Gtk::wrap( GTK_BUTTON( gnome_stock_button(GNOME_STOCK_BUTTON_CANCEL) ) ); b_cancel = Gtk::wrap( GTK_BUTTON( gnome_stock_button(GNOME_STOCK_BUTTON_CANCEL) ) );
// set up spacing // set up spacing
mbox->set_spacing(4); mbox->set_spacing(4);
bbox->set_spacing(4); bbox->set_spacing(4);
@ -474,7 +474,7 @@ void FormCitation::showStageSearch()
mainAppWin->add_action(*dialog_, _(" Insert Citation: Enter keyword(s) or regular expression ")); mainAppWin->add_action(*dialog_, _(" Insert Citation: Enter keyword(s) or regular expression "));
initWidgets(); initWidgets();
// setting focus // setting focus
GTK_WIDGET_SET_FLAGS (GTK_WIDGET(search_text_->get_entry()->gtkobj()), GTK_CAN_DEFAULT); GTK_WIDGET_SET_FLAGS (GTK_WIDGET(search_text_->get_entry()->gtkobj()), GTK_CAN_DEFAULT);
gtk_widget_grab_focus (GTK_WIDGET(search_text_->get_entry()->gtkobj())); gtk_widget_grab_focus (GTK_WIDGET(search_text_->get_entry()->gtkobj()));
@ -497,7 +497,7 @@ void FormCitation::moveFromSearchToSelect()
// stores configuration and cleans all widgets // stores configuration and cleans all widgets
storeWidgets(); storeWidgets();
cleanupWidgets(); cleanupWidgets();
// moves to stage "select" // moves to stage "select"
mainAppWin->remove_action(); mainAppWin->remove_action();
showStageSelect(); showStageSelect();
@ -518,7 +518,7 @@ void FormCitation::showStageSelect()
info_ = manage( new Gnome::Less() ); info_ = manage( new Gnome::Less() );
paned_info_ = manage( new Gtk::HPaned() ); paned_info_ = manage( new Gtk::HPaned() );
text_after_ = manage( new Gnome::Entry() ); text_after_ = manage( new Gnome::Entry() );
b_ok = Gtk::wrap( GTK_BUTTON( gnome_stock_button(GNOME_STOCK_BUTTON_OK) ) ); b_ok = Gtk::wrap( GTK_BUTTON( gnome_stock_button(GNOME_STOCK_BUTTON_OK) ) );
b_cancel = Gtk::wrap( GTK_BUTTON( gnome_stock_button(GNOME_STOCK_BUTTON_CANCEL) ) ); b_cancel = Gtk::wrap( GTK_BUTTON( gnome_stock_button(GNOME_STOCK_BUTTON_CANCEL) ) );
@ -535,7 +535,7 @@ void FormCitation::showStageSelect()
clist_bib_ = manage( new Gtk::CList(colnames) ); clist_bib_ = manage( new Gtk::CList(colnames) );
bbox->set_layout(GTK_BUTTONBOX_END); bbox->set_layout(GTK_BUTTONBOX_END);
// set up spacing // set up spacing
mbox->set_spacing(4); mbox->set_spacing(4);
bbox->set_spacing(4); bbox->set_spacing(4);
@ -557,13 +557,13 @@ void FormCitation::showStageSelect()
mbox->children().push_back(Element(*paned_info_,true,true)); mbox->children().push_back(Element(*paned_info_,true,true));
mbox->children().push_back(Element(*sep, false, false)); mbox->children().push_back(Element(*sep, false, false));
mbox->children().push_back(Element(*tbox, false, false)); mbox->children().push_back(Element(*tbox, false, false));
// packing dialog to main window // packing dialog to main window
dialog_ = mbox; dialog_ = mbox;
mainAppWin->add_action(*dialog_, _(" Insert Citation: Select citation "), true); mainAppWin->add_action(*dialog_, _(" Insert Citation: Select citation "), true);
initWidgets(); initWidgets();
// setting focus // setting focus
GTK_WIDGET_SET_FLAGS (GTK_WIDGET(b_ok->gtkobj()), GTK_CAN_DEFAULT); GTK_WIDGET_SET_FLAGS (GTK_WIDGET(b_ok->gtkobj()), GTK_CAN_DEFAULT);
GTK_WIDGET_SET_FLAGS (GTK_WIDGET(b_cancel->gtkobj()), GTK_CAN_DEFAULT); GTK_WIDGET_SET_FLAGS (GTK_WIDGET(b_cancel->gtkobj()), GTK_CAN_DEFAULT);
@ -604,9 +604,9 @@ void FormCitation::showStageEdit()
colnames.push_back(" "); colnames.push_back(" ");
clist_selected_ = manage( new Gtk::CList(colnames) ); clist_selected_ = manage( new Gtk::CList(colnames) );
clist_selected_->column_titles_hide(); clist_selected_->column_titles_hide();
text_after_ = manage( new Gnome::Entry() ); text_after_ = manage( new Gnome::Entry() );
button_unselect_ = manage( new Gnome::PixButton( _("_Remove"), GNOME_STOCK_PIXMAP_TRASH ) ); button_unselect_ = manage( new Gnome::PixButton( _("_Remove"), GNOME_STOCK_PIXMAP_TRASH ) );
button_up_ = manage( new Gnome::PixButton( _("_Up"), GNOME_STOCK_PIXMAP_UP ) ); button_up_ = manage( new Gnome::PixButton( _("_Up"), GNOME_STOCK_PIXMAP_UP ) );
button_down_ = manage( new Gnome::PixButton( _("_Down"), GNOME_STOCK_PIXMAP_DOWN ) ); button_down_ = manage( new Gnome::PixButton( _("_Down"), GNOME_STOCK_PIXMAP_DOWN ) );
@ -618,7 +618,7 @@ void FormCitation::showStageEdit()
bbox->set_layout(GTK_BUTTONBOX_END); bbox->set_layout(GTK_BUTTONBOX_END);
actbbox->set_layout(GTK_BUTTONBOX_START); actbbox->set_layout(GTK_BUTTONBOX_START);
// set up spacing // set up spacing
mbox->set_spacing(4); mbox->set_spacing(4);
bbox->set_spacing(4); bbox->set_spacing(4);
@ -647,7 +647,7 @@ void FormCitation::showStageEdit()
mbox->children().push_back(Element(*t2box,true,true)); mbox->children().push_back(Element(*t2box,true,true));
mbox->children().push_back(Element(*manage(new Gtk::HSeparator()), false, false)); mbox->children().push_back(Element(*manage(new Gtk::HSeparator()), false, false));
mbox->children().push_back(Element(*tbox, false, false)); mbox->children().push_back(Element(*tbox, false, false));
// accelerators // accelerators
Gtk::AccelGroup * accel = Gtk::AccelGroup::create(); Gtk::AccelGroup * accel = Gtk::AccelGroup::create();
@ -678,7 +678,7 @@ void FormCitation::showStageEdit()
button_unselect_->clicked.connect(SigC::slot(this, &FormCitation::removeCitation)); button_unselect_->clicked.connect(SigC::slot(this, &FormCitation::removeCitation));
button_up_->clicked.connect(SigC::slot(this, &FormCitation::moveCitationUp)); button_up_->clicked.connect(SigC::slot(this, &FormCitation::moveCitationUp));
button_down_->clicked.connect(SigC::slot(this, &FormCitation::moveCitationDown)); button_down_->clicked.connect(SigC::slot(this, &FormCitation::moveCitationDown));
clist_selected_->select_row.connect(SigC::bind(SigC::slot(this, &FormCitation::selectionToggled), clist_selected_->select_row.connect(SigC::bind(SigC::slot(this, &FormCitation::selectionToggled),
true, true)); true, true));
@ -700,15 +700,15 @@ void FormCitation::addItemToBibList(int i)
// don't change the order of these first two items: // don't change the order of these first two items:
// callback functions depend on the data stored in the first column (its hided) // callback functions depend on the data stored in the first column (its hided)
// and in the second column (shown to user) // and in the second column (shown to user)
r.push_back( tostr(i) ); r.push_back( tostr(i) );
r.push_back( key ); r.push_back( key );
// this can be changed (configured by user?) // this can be changed (configured by user?)
parseBibTeX( info, "author", val); r.push_back(val); parseBibTeX( info, "author", val); r.push_back(val);
parseBibTeX( info, "title", val); r.push_back(val); parseBibTeX( info, "title", val); r.push_back(val);
parseBibTeX( info, "year", val); r.push_back(val); parseBibTeX( info, "year", val); r.push_back(val);
parseBibTeX( info, "journal", val); r.push_back(val); parseBibTeX( info, "journal", val); r.push_back(val);
clist_bib_->rows().push_back(r); clist_bib_->rows().push_back(r);
} }
@ -748,7 +748,7 @@ void FormCitation::selectionToggled(gint row,
{ {
bool keyfound = false; bool keyfound = false;
string info; string info;
// the first column in clist_bib_ contains the index // the first column in clist_bib_ contains the index
keyfound = true; keyfound = true;
info = bibkeysInfo[ strToInt(clist_bib_->cell(row,0).get_text()) ]; info = bibkeysInfo[ strToInt(clist_bib_->cell(row,0).get_text()) ];
@ -813,14 +813,14 @@ void FormCitation::applySelect()
string contents = frontStrip( strip(params.getContents()) ); string contents = frontStrip( strip(params.getContents()) );
if (!contents.empty()) contents += ", "; if (!contents.empty()) contents += ", ";
int sz = clist_bib_->selection().size(); int sz = clist_bib_->selection().size();
for (int i=0; i < sz; ++i) for (int i=0; i < sz; ++i)
{ {
if (i > 0) contents += ", "; if (i > 0) contents += ", ";
contents += clist_bib_->selection()[i][1].get_text(); contents += clist_bib_->selection()[i][1].get_text();
} }
params.setContents( contents ); params.setContents( contents );
params.setOptions( text_after_->get_entry()->get_text() ); params.setOptions( text_after_->get_entry()->get_text() );
@ -873,7 +873,7 @@ void FormCitation::applyEdit()
lv_->getLyXFunc()->Dispatch( LFUN_CITATION_INSERT, lv_->getLyXFunc()->Dispatch( LFUN_CITATION_INSERT,
params.getAsString() ); params.getAsString() );
} }
// close dialog // close dialog
storeWidgets(); storeWidgets();
hide(); hide();
@ -896,7 +896,7 @@ void FormCitation::searchReg()
{ {
string rexptxt(search_string_); string rexptxt(search_string_);
rexptxt = frontStrip( strip( rexptxt ) ); rexptxt = frontStrip( strip( rexptxt ) );
LRegex reg(rexptxt); LRegex reg(rexptxt);
// populating clist_bib_ // populating clist_bib_
@ -912,7 +912,7 @@ void FormCitation::searchReg()
if (rexptxt.empty()) additem = true; if (rexptxt.empty()) additem = true;
else additem = (reg.exec(data).size() > 0); else additem = (reg.exec(data).size() > 0);
if ( additem ) addItemToBibList(i); if ( additem ) addItemToBibList(i);
} }
@ -933,7 +933,7 @@ void FormCitation::searchSimple()
searchwords.push_back(tmp); searchwords.push_back(tmp);
stext = frontStrip( split(stext, tmp, ' ') ); stext = frontStrip( split(stext, tmp, ' ') );
} }
// populating clist_bib_ // populating clist_bib_
clist_bib_->rows().clear(); clist_bib_->rows().clear();
@ -949,7 +949,7 @@ void FormCitation::searchSimple()
for (int j = 0; additem && j < szs; ++j) for (int j = 0; additem && j < szs; ++j)
if (data.find(searchwords[j]) == string::npos) if (data.find(searchwords[j]) == string::npos)
additem = false; additem = false;
if (additem) addItemToBibList(i); if (additem) addItemToBibList(i);
} }

View File

@ -1,6 +1,6 @@
// -*- C++ -*- // -*- C++ -*-
/* This file is part of /* This file is part of
* ====================================================== * ======================================================
* *
* LyX, The Document Processor * LyX, The Document Processor
* *
@ -75,7 +75,7 @@ private:
void moveFromActionToSearch(); void moveFromActionToSearch();
/// moves from Action to Edit "stage" /// moves from Action to Edit "stage"
void moveFromActionToEdit(); void moveFromActionToEdit();
/// sort biblist /// sort biblist
void sortBibList(gint); void sortBibList(gint);
/// update state of the buttons /// update state of the buttons
@ -110,7 +110,7 @@ private:
void initWidgets(); void initWidgets();
/// stores configuration of all non-0 member widgets /// stores configuration of all non-0 member widgets
void storeWidgets(); void storeWidgets();
/** Which LyXFunc do we use? /** Which LyXFunc do we use?
We could modify Dialogs to have a visible LyXFunc* instead and We could modify Dialogs to have a visible LyXFunc* instead and
save a couple of bytes per dialog. save a couple of bytes per dialog.
@ -147,12 +147,12 @@ private:
Gnome::PixButton * button_up_; Gnome::PixButton * button_up_;
Gnome::PixButton * button_down_; Gnome::PixButton * button_down_;
Gtk::CheckButton * button_regexp_; Gtk::CheckButton * button_regexp_;
Gtk::CList * clist_selected_; Gtk::CList * clist_selected_;
Gtk::CList * clist_bib_; Gtk::CList * clist_bib_;
Gtk::Paned * paned_info_; Gtk::Paned * paned_info_;
std::vector<string> bibkeys; std::vector<string> bibkeys;
/// ///
std::vector<string> bibkeysInfo; std::vector<string> bibkeysInfo;

View File

@ -1,10 +1,10 @@
/* This file is part of /* This file is part of
* ================================================= * =================================================
* *
* LyX, The Document Processor * LyX, The Document Processor
* Copyright 1995-2000 The LyX Team. * Copyright 1995-2000 The LyX Team.
* *
* ================================================= * =================================================
* *
* \author Michael Koziarski <michael@koziarski.org> * \author Michael Koziarski <michael@koziarski.org>
*/ */

View File

@ -1,12 +1,12 @@
// -*- C++ -*- // -*- C++ -*-
/* This file is part of /* This file is part of
* ================================================= * =================================================
* *
* LyX, The Document Processor * LyX, The Document Processor
* Copyright 1995 Matthias Ettrich. * Copyright 1995 Matthias Ettrich.
* Copyright 1995-2000 The LyX Team. * Copyright 1995-2000 The LyX Team.
* *
* ================================================= * =================================================
* *
* \author Michael Koziarski <michael@koziarski.org> * \author Michael Koziarski <michael@koziarski.org>
* */ * */
@ -36,11 +36,11 @@ public:
/// ///
~FormCopyright() {}; ~FormCopyright() {};
void apply() {}; void apply() {};
void update() {}; void update() {};
private: private:
/// Build the dialog /// Build the dialog
void build(); void build();
Gtk::Button * ok(); Gtk::Button * ok();
@ -49,7 +49,7 @@ private:
Gtk::Label * copyright(); Gtk::Label * copyright();
Gtk::Label * license(); Gtk::Label * license();
/// The ok button /// The ok button
}; };
#endif #endif

View File

@ -1,10 +1,10 @@
/* This file is part of /* This file is part of
* ================================================= * =================================================
* *
* LyX, The Document Processor * LyX, The Document Processor
* Copyright 1995-2000 The LyX Team. * Copyright 1995-2000 The LyX Team.
* *
* ================================================= * =================================================
* *
* \author Michael Koziarski <michael@koziarski.org> * \author Michael Koziarski <michael@koziarski.org>
*/ */
@ -39,7 +39,7 @@ void FormCredits::build()
// Do not update the dialog when we insert the text // Do not update the dialog when we insert the text
text()->freeze(); text()->freeze();
// Get the credits into the string stream // Get the credits into the string stream
stringstream ss; stringstream ss;
string credits = controller().getCredits(ss).str(); string credits = controller().getCredits(ss).str();
@ -64,7 +64,7 @@ void FormCredits::build()
string const r("R-"); string const r("R-");
index = italic.find(r); index = italic.find(r);
italic.replace(index, r.size()-1, "i"); italic.replace(index, r.size()-1, "i");
//lyxerr << "Bold: " << bold << "\nItalic: " << italic << std::endl; //lyxerr << "Bold: " << bold << "\nItalic: " << italic << std::endl;
c_bold.set_font(Gdk_Font(bold)); c_bold.set_font(Gdk_Font(bold));
c_italic.set_font(Gdk_Font(italic)); c_italic.set_font(Gdk_Font(italic));
@ -75,9 +75,9 @@ void FormCredits::build()
std::string::size_type end = credits.find('\n'); std::string::size_type end = credits.find('\n');
string const line = credits.substr(0, ++end); string const line = credits.substr(0, ++end);
credits = credits.substr(end); credits = credits.substr(end);
// lyxerr << "Line got: '" << line << "'\nend = " << end << std::endl; // lyxerr << "Line got: '" << line << "'\nend = " << end << std::endl;
string const prefix = line.substr(0, 2); string const prefix = line.substr(0, 2);
if (prefix == bold) { if (prefix == bold) {
text()->insert(c_bold, line.substr(2)); text()->insert(c_bold, line.substr(2));
@ -87,7 +87,7 @@ void FormCredits::build()
text()->insert(line); text()->insert(line);
} }
} }
// Allow the text area to be drawn. // Allow the text area to be drawn.
text()->thaw(); text()->thaw();
} }

View File

@ -1,12 +1,12 @@
// -*- C++ -*- // -*- C++ -*-
/* This file is part of /* This file is part of
* ================================================= * =================================================
* *
* LyX, The Document Processor * LyX, The Document Processor
* Copyright 1995 Matthias Ettrich. * Copyright 1995 Matthias Ettrich.
* Copyright 1995-2000 The LyX Team. * Copyright 1995-2000 The LyX Team.
* *
* ================================================= * =================================================
* *
* \author Michael Koziarski <michael@koziarski.org> * \author Michael Koziarski <michael@koziarski.org>
* */ * */
@ -38,9 +38,9 @@ public:
void apply() {}; void apply() {};
void update() {}; void update() {};
private: private:
/// Build the dialog /// Build the dialog
void build(); void build();
@ -48,7 +48,7 @@ private:
/// The ok button /// The ok button
Gtk::Button * ok(); Gtk::Button * ok();
Gtk::Text * text(); Gtk::Text * text();
}; };

View File

@ -1,10 +1,10 @@
/* This file is part of /* This file is part of
* ================================================= * =================================================
* *
* LyX, The Document Processor * LyX, The Document Processor
* Copyright 1995-2000 The LyX Team. * Copyright 1995-2000 The LyX Team.
* *
* ================================================= * =================================================
* *
* \author Michael Koziarski <michael@koziarski.org> * \author Michael Koziarski <michael@koziarski.org>
*/ */
@ -44,7 +44,7 @@ void FormERT::build()
// Make sure everything is in the correct state. // Make sure everything is in the correct state.
bc().refresh(); bc().refresh();
// Manage the read-only aware widgets. // Manage the read-only aware widgets.
bc().addReadOnly(open()); bc().addReadOnly(open());
bc().addReadOnly(inlined()); bc().addReadOnly(inlined());
@ -76,7 +76,7 @@ void FormERT::apply()
controller().params().status = InsetERT::Open; controller().params().status = InsetERT::Open;
else if (collapsed()->get_active()) else if (collapsed()->get_active())
controller().params().status = InsetERT::Collapsed; controller().params().status = InsetERT::Collapsed;
else else
controller().params().status = InsetERT::Inlined; controller().params().status = InsetERT::Inlined;
} }
@ -106,27 +106,27 @@ bool FormERT::validate() const
} }
Gtk::Button * FormERT::ok_btn() const Gtk::Button * FormERT::ok_btn() const
{ {
return getWidget<Gtk::Button>("r_ok_btn"); return getWidget<Gtk::Button>("r_ok_btn");
} }
Gtk::Button * FormERT::apply_btn() const Gtk::Button * FormERT::apply_btn() const
{ {
return getWidget<Gtk::Button>("r_apply_btn"); return getWidget<Gtk::Button>("r_apply_btn");
} }
Gtk::Button * FormERT::cancel_btn() const Gtk::Button * FormERT::cancel_btn() const
{ {
return getWidget<Gtk::Button>("r_cancel_btn"); return getWidget<Gtk::Button>("r_cancel_btn");
} }
Gtk::RadioButton * FormERT::open() const Gtk::RadioButton * FormERT::open() const
{ {
return getWidget<Gtk::RadioButton>("r_open"); return getWidget<Gtk::RadioButton>("r_open");
} }
Gtk::RadioButton * FormERT::collapsed() const Gtk::RadioButton * FormERT::collapsed() const
{ {
return getWidget<Gtk::RadioButton>("r_collapsed"); return getWidget<Gtk::RadioButton>("r_collapsed");
} }
Gtk::RadioButton * FormERT::inlined() const Gtk::RadioButton * FormERT::inlined() const
{ {
return getWidget<Gtk::RadioButton>("r_inlined"); return getWidget<Gtk::RadioButton>("r_inlined");
} }

View File

@ -1,12 +1,12 @@
// -*- C++ -*- // -*- C++ -*-
/* This file is part of /* This file is part of
* ================================================= * =================================================
* *
* LyX, The Document Processor * LyX, The Document Processor
* Copyright 1995 Matthias Ettrich. * Copyright 1995 Matthias Ettrich.
* Copyright 1995-2000 The LyX Team. * Copyright 1995-2000 The LyX Team.
* *
* ================================================= * =================================================
* *
* \author Michael Koziarski <michael@koziarski.org> * \author Michael Koziarski <michael@koziarski.org>
* */ * */
@ -38,7 +38,7 @@ public:
void apply(); void apply();
void update(); void update();
private: private:
/// Build the dialog /// Build the dialog
void build(); void build();
@ -63,7 +63,7 @@ private:
Gtk::RadioButton * collapsed() const; Gtk::RadioButton * collapsed() const;
/// generated by accessors.py /// generated by accessors.py
Gtk::RadioButton * inlined() const; Gtk::RadioButton * inlined() const;
/// do input validation /// do input validation
SigC::Connection slot_open; SigC::Connection slot_open;

View File

@ -1,10 +1,10 @@
/* This file is part of /* This file is part of
* ================================================= * =================================================
* *
* LyX, The Document Processor * LyX, The Document Processor
* Copyright 1995-2000 The LyX Team. * Copyright 1995-2000 The LyX Team.
* *
* ================================================= * =================================================
* *
* \author Baruch Even * \author Baruch Even
*/ */
@ -44,12 +44,12 @@ void FormError::update()
textarea()->insert(controller().params()); textarea()->insert(controller().params());
} }
Gtk::Button * FormError::button_close() const Gtk::Button * FormError::button_close() const
{ {
return getWidget<Gtk::Button>("r_button_close"); return getWidget<Gtk::Button>("r_button_close");
} }
Gtk::Text * FormError::textarea() const Gtk::Text * FormError::textarea() const
{ {
return getWidget<Gtk::Text>("r_textarea"); return getWidget<Gtk::Text>("r_textarea");
} }

Some files were not shown because too many files have changed in this diff Show More