mirror of
https://git.lyx.org/repos/lyx.git
synced 2025-01-03 08:28:25 +00:00
ws changes
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@5758 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
parent
271b807e8b
commit
13349032cb
@ -1,3 +1,7 @@
|
|||||||
|
2002-12-01 Lars Gullik Bjønnes <larsbj@gullik.net>
|
||||||
|
|
||||||
|
* several files: ws changes
|
||||||
|
|
||||||
2002-12-01 Lars Gullik Bjønnes <larsbj@gullik.net>
|
2002-12-01 Lars Gullik Bjønnes <larsbj@gullik.net>
|
||||||
|
|
||||||
* text2.C (setCounter): clean up a bit, use boost.format.
|
* text2.C (setCounter): clean up a bit, use boost.format.
|
||||||
|
@ -259,7 +259,7 @@ bool Encodings::IsComposeChar_hebrew(unsigned char c)
|
|||||||
|
|
||||||
bool Encodings::is_arabic_special(unsigned char c)
|
bool Encodings::is_arabic_special(unsigned char c)
|
||||||
{
|
{
|
||||||
return (c >= 0xc1 && c <= 0xc5) ||
|
return (c >= 0xc1 && c <= 0xc5) ||
|
||||||
c == 0xc7 || c == 0xc9 ||
|
c == 0xc7 || c == 0xc9 ||
|
||||||
c == 0xcf || c == 0xe8 ||
|
c == 0xcf || c == 0xe8 ||
|
||||||
(c >= 0xd0 && c <= 0xd2) ||
|
(c >= 0xd0 && c <= 0xd2) ||
|
||||||
|
@ -19,4 +19,3 @@ class FuncRequest;
|
|||||||
Inset * createInset(FuncRequest const & cmd);
|
Inset * createInset(FuncRequest const & cmd);
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
@ -1,3 +1,7 @@
|
|||||||
|
2002-12-01 Lars Gullik Bjønnes <larsbj@gullik.net>
|
||||||
|
|
||||||
|
* several files: ws changes
|
||||||
|
|
||||||
2002-11-17 John Levon <levon@movementarian.org>
|
2002-11-17 John Levon <levon@movementarian.org>
|
||||||
|
|
||||||
* FileDialog.h: split Select() into open()/save() for
|
* FileDialog.h: split Select() into open()/save() for
|
||||||
@ -5,7 +9,7 @@
|
|||||||
|
|
||||||
2002-11-01 Herbert Voss <voss@perce.de>
|
2002-11-01 Herbert Voss <voss@perce.de>
|
||||||
|
|
||||||
* ControlGraphics.C: "Default" is now a part of the rotate-list
|
* ControlGraphics.C: "Default" is now a part of the rotate-list
|
||||||
|
|
||||||
2002-11-04 Lars Gullik Bjønnes <larsbj@gullik.net>
|
2002-11-04 Lars Gullik Bjønnes <larsbj@gullik.net>
|
||||||
|
|
||||||
|
@ -22,23 +22,23 @@
|
|||||||
template<typename Signal>
|
template<typename Signal>
|
||||||
class BugfixSignal {
|
class BugfixSignal {
|
||||||
public:
|
public:
|
||||||
Signal & operator()() { return thesignal(); }
|
Signal & operator()() { return thesignal(); }
|
||||||
Signal const & operator()() const { return thesignal(); }
|
Signal const & operator()() const { return thesignal(); }
|
||||||
|
|
||||||
private:
|
private:
|
||||||
Signal & thesignal() const
|
Signal & thesignal() const
|
||||||
{
|
{
|
||||||
if (!signal_.get())
|
if (!signal_.get())
|
||||||
signal_.reset(new Signal);
|
signal_.reset(new Signal);
|
||||||
return *signal_;
|
return *signal_;
|
||||||
}
|
}
|
||||||
|
|
||||||
mutable boost::scoped_ptr<Signal> signal_;
|
mutable boost::scoped_ptr<Signal> signal_;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
boost::signal0<void> & Dialogs::redrawGUI()
|
boost::signal0<void> & Dialogs::redrawGUI()
|
||||||
{
|
{
|
||||||
static BugfixSignal<boost::signal0<void> > thesignal;
|
static BugfixSignal<boost::signal0<void> > thesignal;
|
||||||
return thesignal();
|
return thesignal();
|
||||||
}
|
}
|
||||||
|
@ -125,4 +125,3 @@ bool ButtonControllerBase::checkWidgets()
|
|||||||
// return valid status after checking ALL widgets
|
// return valid status after checking ALL widgets
|
||||||
return valid;
|
return valid;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1,3 +1,7 @@
|
|||||||
|
2002-12-01 Lars Gullik Bjønnes <larsbj@gullik.net>
|
||||||
|
|
||||||
|
* several files: ws changes
|
||||||
|
|
||||||
2002-12-01 Lars Gullik Bjønnes <larsbj@gullik.net>
|
2002-12-01 Lars Gullik Bjønnes <larsbj@gullik.net>
|
||||||
|
|
||||||
* ControlDocument.C (classApply): use boost.format
|
* ControlDocument.C (classApply): use boost.format
|
||||||
|
@ -73,7 +73,7 @@ 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,
|
||||||
bool save,
|
bool save,
|
||||||
pair<string,string> const & dir1,
|
pair<string,string> const & dir1,
|
||||||
pair<string,string> const & dir2)
|
pair<string,string> const & dir2)
|
||||||
{
|
{
|
||||||
|
@ -1,3 +1,7 @@
|
|||||||
|
2002-12-01 Lars Gullik Bjønnes <larsbj@gullik.net>
|
||||||
|
|
||||||
|
* several files: ws changes
|
||||||
|
|
||||||
2002-09-25 Angus Leeming <leeming@lyx.org>
|
2002-09-25 Angus Leeming <leeming@lyx.org>
|
||||||
|
|
||||||
* Dialogs.C:
|
* Dialogs.C:
|
||||||
@ -44,7 +48,7 @@
|
|||||||
|
|
||||||
2002-06-02 Michael A. Koziarski <michael@koziarski.com>
|
2002-06-02 Michael A. Koziarski <michael@koziarski.com>
|
||||||
|
|
||||||
== Gtkmm2 upgrade ==
|
== Gtkmm2 upgrade ==
|
||||||
|
|
||||||
* dialogs/*: Updated to glade-2 format.
|
* dialogs/*: Updated to glade-2 format.
|
||||||
* Dialogs.C: add() calls updated
|
* Dialogs.C: add() calls updated
|
||||||
|
@ -1,4 +1,3 @@
|
|||||||
|
|
||||||
// -*- C++ -*-
|
// -*- C++ -*-
|
||||||
/**
|
/**
|
||||||
* \file GAbout.h
|
* \file GAbout.h
|
||||||
|
@ -101,17 +101,17 @@ void GERT::update()
|
|||||||
|
|
||||||
Gtk::Button * GERT::close_btn() const
|
Gtk::Button * GERT::close_btn() const
|
||||||
{
|
{
|
||||||
return getWidget<Gtk::Button>("r_close_btn");
|
return getWidget<Gtk::Button>("r_close_btn");
|
||||||
}
|
}
|
||||||
Gtk::RadioButton * GERT::open() const
|
Gtk::RadioButton * GERT::open() const
|
||||||
{
|
{
|
||||||
return getWidget<Gtk::RadioButton>("r_open");
|
return getWidget<Gtk::RadioButton>("r_open");
|
||||||
}
|
}
|
||||||
Gtk::RadioButton * GERT::collapsed() const
|
Gtk::RadioButton * GERT::collapsed() const
|
||||||
{
|
{
|
||||||
return getWidget<Gtk::RadioButton>("r_collapsed");
|
return getWidget<Gtk::RadioButton>("r_collapsed");
|
||||||
}
|
}
|
||||||
Gtk::RadioButton * GERT::inlined() const
|
Gtk::RadioButton * GERT::inlined() const
|
||||||
{
|
{
|
||||||
return getWidget<Gtk::RadioButton>("r_inlined");
|
return getWidget<Gtk::RadioButton>("r_inlined");
|
||||||
}
|
}
|
||||||
|
@ -48,10 +48,10 @@ void GErrorDialog::update()
|
|||||||
|
|
||||||
Gtk::Button * GErrorDialog::button_close() const
|
Gtk::Button * GErrorDialog::button_close() const
|
||||||
{
|
{
|
||||||
return getWidget<Gtk::Button>("r_button_close");
|
return getWidget<Gtk::Button>("r_button_close");
|
||||||
}
|
}
|
||||||
|
|
||||||
Gtk::TextView * GErrorDialog::textarea() const
|
Gtk::TextView * GErrorDialog::textarea() const
|
||||||
{
|
{
|
||||||
return getWidget<Gtk::TextView>("r_textarea");
|
return getWidget<Gtk::TextView>("r_textarea");
|
||||||
}
|
}
|
||||||
|
@ -1,4 +1,3 @@
|
|||||||
|
|
||||||
// -*- C++ -*-
|
// -*- C++ -*-
|
||||||
/**
|
/**
|
||||||
* \file GFloat.h
|
* \file GFloat.h
|
||||||
|
@ -79,13 +79,13 @@ void GLog::update()
|
|||||||
|
|
||||||
Gtk::Button * GLog::refresh_btn() const
|
Gtk::Button * GLog::refresh_btn() const
|
||||||
{
|
{
|
||||||
return getWidget<Gtk::Button>("r_refresh_btn");
|
return getWidget<Gtk::Button>("r_refresh_btn");
|
||||||
}
|
}
|
||||||
Gtk::Button * GLog::close_btn() const
|
Gtk::Button * GLog::close_btn() const
|
||||||
{
|
{
|
||||||
return getWidget<Gtk::Button>("r_close_btn");
|
return getWidget<Gtk::Button>("r_close_btn");
|
||||||
}
|
}
|
||||||
Gtk::TextView * GLog::log_text() const
|
Gtk::TextView * GLog::log_text() const
|
||||||
{
|
{
|
||||||
return getWidget<Gtk::TextView>("r_log_text");
|
return getWidget<Gtk::TextView>("r_log_text");
|
||||||
}
|
}
|
||||||
|
@ -1,4 +1,3 @@
|
|||||||
|
|
||||||
// -*- C++ -*-
|
// -*- C++ -*-
|
||||||
/**
|
/**
|
||||||
* \file GLog.h
|
* \file GLog.h
|
||||||
|
@ -71,17 +71,17 @@ void GPreamble::disconnect_signals()
|
|||||||
|
|
||||||
Gtk::Button * GPreamble::ok_btn() const
|
Gtk::Button * GPreamble::ok_btn() const
|
||||||
{
|
{
|
||||||
return getWidget<Gtk::Button>("r_ok_btn");
|
return getWidget<Gtk::Button>("r_ok_btn");
|
||||||
}
|
}
|
||||||
Gtk::Button * GPreamble::apply_btn() const
|
Gtk::Button * GPreamble::apply_btn() const
|
||||||
{
|
{
|
||||||
return getWidget<Gtk::Button>("r_apply_btn");
|
return getWidget<Gtk::Button>("r_apply_btn");
|
||||||
}
|
}
|
||||||
Gtk::Button * GPreamble::cancel_btn() const
|
Gtk::Button * GPreamble::cancel_btn() const
|
||||||
{
|
{
|
||||||
return getWidget<Gtk::Button>("r_cancel_btn");
|
return getWidget<Gtk::Button>("r_cancel_btn");
|
||||||
}
|
}
|
||||||
Gtk::TextView * GPreamble::preamble() const
|
Gtk::TextView * GPreamble::preamble() const
|
||||||
{
|
{
|
||||||
return getWidget<Gtk::TextView>("r_preamble");
|
return getWidget<Gtk::TextView>("r_preamble");
|
||||||
}
|
}
|
||||||
|
@ -34,11 +34,11 @@ void GTabularCreate::build()
|
|||||||
{
|
{
|
||||||
// Connect the buttons.
|
// Connect the buttons.
|
||||||
ok_btn()->signal_clicked().connect(SigC::slot(*this,
|
ok_btn()->signal_clicked().connect(SigC::slot(*this,
|
||||||
>abularCreate::OKClicked));
|
>abularCreate::OKClicked));
|
||||||
cancel_btn()->signal_clicked().connect(SigC::slot(*this,
|
cancel_btn()->signal_clicked().connect(SigC::slot(*this,
|
||||||
>abularCreate::CancelClicked));
|
>abularCreate::CancelClicked));
|
||||||
apply_btn()->signal_clicked().connect(SigC::slot(*this,
|
apply_btn()->signal_clicked().connect(SigC::slot(*this,
|
||||||
>abularCreate::ApplyClicked));
|
>abularCreate::ApplyClicked));
|
||||||
|
|
||||||
// Manage the buttons state
|
// Manage the buttons state
|
||||||
bc().setOK(ok_btn());
|
bc().setOK(ok_btn());
|
||||||
@ -72,22 +72,21 @@ bool GTabularCreate::validate() const
|
|||||||
|
|
||||||
Gtk::Button * GTabularCreate::ok_btn() const
|
Gtk::Button * GTabularCreate::ok_btn() const
|
||||||
{
|
{
|
||||||
return getWidget<Gtk::Button>("r_ok_btn");
|
return getWidget<Gtk::Button>("r_ok_btn");
|
||||||
}
|
}
|
||||||
Gtk::Button * GTabularCreate::apply_btn() const
|
Gtk::Button * GTabularCreate::apply_btn() const
|
||||||
{
|
{
|
||||||
return getWidget<Gtk::Button>("r_apply_btn");
|
return getWidget<Gtk::Button>("r_apply_btn");
|
||||||
}
|
}
|
||||||
Gtk::Button * GTabularCreate::cancel_btn() const
|
Gtk::Button * GTabularCreate::cancel_btn() const
|
||||||
{
|
{
|
||||||
return getWidget<Gtk::Button>("r_cancel_btn");
|
return getWidget<Gtk::Button>("r_cancel_btn");
|
||||||
}
|
}
|
||||||
Gtk::SpinButton * GTabularCreate::rows() const
|
Gtk::SpinButton * GTabularCreate::rows() const
|
||||||
{
|
{
|
||||||
return getWidget<Gtk::SpinButton>("r_rows");
|
return getWidget<Gtk::SpinButton>("r_rows");
|
||||||
}
|
}
|
||||||
Gtk::SpinButton * GTabularCreate::cols() const
|
Gtk::SpinButton * GTabularCreate::cols() const
|
||||||
{
|
{
|
||||||
return getWidget<Gtk::SpinButton>("r_cols");
|
return getWidget<Gtk::SpinButton>("r_cols");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -107,31 +107,29 @@ bool GUrl::validate() const
|
|||||||
|
|
||||||
Gtk::Button * GUrl::restore_btn() const
|
Gtk::Button * GUrl::restore_btn() const
|
||||||
{
|
{
|
||||||
return getWidget<Gtk::Button>("r_restore_btn");
|
return getWidget<Gtk::Button>("r_restore_btn");
|
||||||
}
|
}
|
||||||
Gtk::Button * GUrl::ok_btn() const
|
Gtk::Button * GUrl::ok_btn() const
|
||||||
{
|
{
|
||||||
return getWidget<Gtk::Button>("r_ok_btn");
|
return getWidget<Gtk::Button>("r_ok_btn");
|
||||||
}
|
}
|
||||||
Gtk::Button * GUrl::apply_btn() const
|
Gtk::Button * GUrl::apply_btn() const
|
||||||
{
|
{
|
||||||
return getWidget<Gtk::Button>("r_apply_btn");
|
return getWidget<Gtk::Button>("r_apply_btn");
|
||||||
}
|
}
|
||||||
Gtk::Button * GUrl::cancel_btn() const
|
Gtk::Button * GUrl::cancel_btn() const
|
||||||
{
|
{
|
||||||
return getWidget<Gtk::Button>("r_cancel_btn");
|
return getWidget<Gtk::Button>("r_cancel_btn");
|
||||||
}
|
}
|
||||||
Gtk::Entry * GUrl::url() const
|
Gtk::Entry * GUrl::url() const
|
||||||
{
|
{
|
||||||
return getWidget<Gtk::Entry>("r_url");
|
return getWidget<Gtk::Entry>("r_url");
|
||||||
}
|
}
|
||||||
Gtk::Entry * GUrl::name() const
|
Gtk::Entry * GUrl::name() const
|
||||||
{
|
{
|
||||||
return getWidget<Gtk::Entry>("r_name");
|
return getWidget<Gtk::Entry>("r_name");
|
||||||
}
|
}
|
||||||
Gtk::CheckButton * GUrl::html_cb() const
|
Gtk::CheckButton * GUrl::html_cb() const
|
||||||
{
|
{
|
||||||
return getWidget<Gtk::CheckButton>("r_html_cb");
|
return getWidget<Gtk::CheckButton>("r_html_cb");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
@ -12,4 +12,3 @@
|
|||||||
|
|
||||||
|
|
||||||
#include "gnome_helpers.h"
|
#include "gnome_helpers.h"
|
||||||
|
|
||||||
|
@ -17,7 +17,7 @@
|
|||||||
namespace key_modifier {
|
namespace key_modifier {
|
||||||
enum state {
|
enum state {
|
||||||
none = 0, //< no modifiers held
|
none = 0, //< no modifiers held
|
||||||
ctrl = 1, //< control button held
|
ctrl = 1, //< control button held
|
||||||
alt = 2, //< alt/meta key held
|
alt = 2, //< alt/meta key held
|
||||||
shift = 4 //< shift key held
|
shift = 4 //< shift key held
|
||||||
};
|
};
|
||||||
@ -33,7 +33,7 @@ inline state operator|(state const & s1, state const & s2)
|
|||||||
|
|
||||||
inline void operator|=(state & s1, state s2)
|
inline void operator|=(state & s1, state s2)
|
||||||
{
|
{
|
||||||
s1 = static_cast<state>(s1 | s2);
|
s1 = static_cast<state>(s1 | s2);
|
||||||
}
|
}
|
||||||
|
|
||||||
} // namespace key_modifier
|
} // namespace key_modifier
|
||||||
|
@ -170,4 +170,3 @@ void BulletsModule::setlevel4()
|
|||||||
{
|
{
|
||||||
le_ = bullet4LE;
|
le_ = bullet4LE;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1,3 +1,7 @@
|
|||||||
|
2002-12-01 Lars Gullik Bjønnes <larsbj@gullik.net>
|
||||||
|
|
||||||
|
* several files: ws changes
|
||||||
|
|
||||||
2002-11-30 John Levon <levon@movementarian.org>
|
2002-11-30 John Levon <levon@movementarian.org>
|
||||||
|
|
||||||
* QParagraph.C: another fix from Otto Tronarp
|
* QParagraph.C: another fix from Otto Tronarp
|
||||||
|
@ -44,7 +44,7 @@ public:
|
|||||||
int exec(QWidget const * trigger);
|
int exec(QWidget const * trigger);
|
||||||
|
|
||||||
signals:
|
signals:
|
||||||
void selected(int, int);
|
void selected(int, int);
|
||||||
|
|
||||||
protected:
|
protected:
|
||||||
virtual void keyPressEvent(QKeyEvent * e);
|
virtual void keyPressEvent(QKeyEvent * e);
|
||||||
|
@ -192,7 +192,7 @@ QPrefsDialog::QPrefsDialog(QPrefs * form)
|
|||||||
screenfontsModule->screenRomanCO->insertItem(*it);
|
screenfontsModule->screenRomanCO->insertItem(*it);
|
||||||
screenfontsModule->screenSansCO->insertItem(*it);
|
screenfontsModule->screenSansCO->insertItem(*it);
|
||||||
screenfontsModule->screenTypewriterCO->insertItem(*it);
|
screenfontsModule->screenTypewriterCO->insertItem(*it);
|
||||||
}
|
}
|
||||||
|
|
||||||
connect(uiModule->uiFilePB, SIGNAL(clicked()), this, SLOT(select_ui()));
|
connect(uiModule->uiFilePB, SIGNAL(clicked()), this, SLOT(select_ui()));
|
||||||
connect(uiModule->bindFilePB, SIGNAL(clicked()), this, SLOT(select_bind()));
|
connect(uiModule->bindFilePB, SIGNAL(clicked()), this, SLOT(select_bind()));
|
||||||
@ -454,14 +454,14 @@ void QPrefsDialog::modify_format()
|
|||||||
string const name(fileformatsModule->formatED->text().latin1());
|
string const name(fileformatsModule->formatED->text().latin1());
|
||||||
form_->formats_.erase(oldformat.name());
|
form_->formats_.erase(oldformat.name());
|
||||||
|
|
||||||
string const prettyname = fileformatsModule->guiNameED->text().latin1();
|
string const prettyname = fileformatsModule->guiNameED->text().latin1();
|
||||||
string const extension = fileformatsModule->extensionED->text().latin1();
|
string const extension = fileformatsModule->extensionED->text().latin1();
|
||||||
string const shortcut = fileformatsModule->shortcutED->text().latin1();
|
string const shortcut = fileformatsModule->shortcutED->text().latin1();
|
||||||
string const viewer = fileformatsModule->viewerED->text().latin1();
|
string const viewer = fileformatsModule->viewerED->text().latin1();
|
||||||
|
|
||||||
form_->formats_.add(name, extension, prettyname, shortcut);
|
form_->formats_.add(name, extension, prettyname, shortcut);
|
||||||
form_->formats_.sort();
|
form_->formats_.sort();
|
||||||
form_->formats_.setViewer(name, viewer);
|
form_->formats_.setViewer(name, viewer);
|
||||||
|
|
||||||
fileformatsModule->formatsLB->setUpdatesEnabled(false);
|
fileformatsModule->formatsLB->setUpdatesEnabled(false);
|
||||||
updateFormats();
|
updateFormats();
|
||||||
|
@ -1,5 +1,3 @@
|
|||||||
|
|
||||||
|
|
||||||
#include "bulletstrings.h"
|
#include "bulletstrings.h"
|
||||||
|
|
||||||
char const * bullets_standard[36] = {
|
char const * bullets_standard[36] = {
|
||||||
|
@ -57,4 +57,3 @@ void LengthCombo::setEnabled(bool b)
|
|||||||
{
|
{
|
||||||
QComboBox::setEnabled(b);
|
QComboBox::setEnabled(b);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
/**********************************************************************
|
/**********************************************************************
|
||||||
** $Id: qgridview.h,v 1.1 2002/10/09 08:59:02 leuven Exp $
|
** $Id: qgridview.h,v 1.2 2002/12/01 22:59:19 larsbj Exp $
|
||||||
**
|
**
|
||||||
** Definition of QGridView class
|
** Definition of QGridView class
|
||||||
**
|
**
|
||||||
|
@ -1,3 +1,7 @@
|
|||||||
|
2002-12-01 Lars Gullik Bjønnes <larsbj@gullik.net>
|
||||||
|
|
||||||
|
* sevral files: ws changes
|
||||||
|
|
||||||
2002-12-01 Lars Gullik Bjønnes <larsbj@gullik.net>
|
2002-12-01 Lars Gullik Bjønnes <larsbj@gullik.net>
|
||||||
|
|
||||||
* checkedwidgets.C (setWidget): make sure that FL_LCOL and FL_COL1
|
* checkedwidgets.C (setWidget): make sure that FL_LCOL and FL_COL1
|
||||||
|
@ -268,21 +268,21 @@ WrapDialog;
|
|||||||
struct Dialogs::Impl {
|
struct Dialogs::Impl {
|
||||||
Impl(LyXView & lv, Dialogs & d);
|
Impl(LyXView & lv, Dialogs & d);
|
||||||
|
|
||||||
AboutlyxDialog aboutlyx;
|
AboutlyxDialog aboutlyx;
|
||||||
BibitemDialog bibitem;
|
BibitemDialog bibitem;
|
||||||
BibtexDialog bibtex;
|
BibtexDialog bibtex;
|
||||||
CharacterDialog character;
|
CharacterDialog character;
|
||||||
CitationDialog citation;
|
CitationDialog citation;
|
||||||
DocumentDialog document;
|
DocumentDialog document;
|
||||||
ErrorDialog error;
|
ErrorDialog error;
|
||||||
ERTDialog ert;
|
ERTDialog ert;
|
||||||
ExternalDialog external;
|
ExternalDialog external;
|
||||||
FileDialog file;
|
FileDialog file;
|
||||||
FloatDialog floats;
|
FloatDialog floats;
|
||||||
ForksDialog forks;
|
ForksDialog forks;
|
||||||
GraphicsDialog graphics;
|
GraphicsDialog graphics;
|
||||||
IncludeDialog include;
|
IncludeDialog include;
|
||||||
IndexDialog index;
|
IndexDialog index;
|
||||||
LogFileDialog logfile;
|
LogFileDialog logfile;
|
||||||
MathPanelDialog mathpanel;
|
MathPanelDialog mathpanel;
|
||||||
MinipageDialog minipage;
|
MinipageDialog minipage;
|
||||||
|
@ -118,7 +118,7 @@ void FormMathsBitmap::build()
|
|||||||
|
|
||||||
fdui->form->fdui = fdui;
|
fdui->form->fdui = fdui;
|
||||||
|
|
||||||
dialog_.reset(fdui);
|
dialog_.reset(fdui);
|
||||||
bc().setCancel(dialog_->button_close);
|
bc().setCancel(dialog_->button_close);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -223,10 +223,10 @@ ButtonPolicy::SMInput FormMathsPanel::input(FL_OBJECT * ob, long)
|
|||||||
} else if (ob == dialog_->button_sub) {
|
} else if (ob == dialog_->button_sub) {
|
||||||
controller().dispatchFunc(LFUN_SUBSCRIPT);
|
controller().dispatchFunc(LFUN_SUBSCRIPT);
|
||||||
|
|
||||||
// } else if (ob == dialog_->???) {
|
// } else if (ob == dialog_->???) {
|
||||||
// controller().dispatchFunc(LFUN_SUBSCRIPT);
|
// controller().dispatchFunc(LFUN_SUBSCRIPT);
|
||||||
// controller().dispatchFunc(LFUN_LEFT);
|
// controller().dispatchFunc(LFUN_LEFT);
|
||||||
// controller().dispatchFunc(LFUN_SUPERSCRIPT);
|
// controller().dispatchFunc(LFUN_SUPERSCRIPT);
|
||||||
|
|
||||||
} else if (ob == dialog_->button_equation) {
|
} else if (ob == dialog_->button_equation) {
|
||||||
controller().dispatchFunc(LFUN_MATH_DISPLAY);
|
controller().dispatchFunc(LFUN_MATH_DISPLAY);
|
||||||
|
@ -69,7 +69,7 @@ void Tooltips::init(FL_OBJECT * ob, string const & tip)
|
|||||||
lyx::Assert(ob && ob->form);
|
lyx::Assert(ob && ob->form);
|
||||||
|
|
||||||
// Store the tooltip string
|
// Store the tooltip string
|
||||||
string const str = formatted(trim(tip), 400);
|
string const str = formatted(trim(tip), 400);
|
||||||
tooltipsMap[ob] = str;
|
tooltipsMap[ob] = str;
|
||||||
|
|
||||||
// Set the tooltip
|
// Set the tooltip
|
||||||
|
@ -94,7 +94,7 @@ Painter & XPainter::lines(int const * xp, int const * yp,
|
|||||||
points[i].y = yp[i];
|
points[i].y = yp[i];
|
||||||
}
|
}
|
||||||
|
|
||||||
XDrawLines(fl_get_display(), owner_.getPixmap(),
|
XDrawLines(fl_get_display(), owner_.getPixmap(),
|
||||||
lyxColorHandler->getGCLinepars(ls, lw, col),
|
lyxColorHandler->getGCLinepars(ls, lw, col),
|
||||||
points.get(), np, CoordModeOrigin);
|
points.get(), np, CoordModeOrigin);
|
||||||
|
|
||||||
@ -147,10 +147,10 @@ Painter & XPainter::arc(int x, int y,
|
|||||||
unsigned int w, unsigned int h,
|
unsigned int w, unsigned int h,
|
||||||
int a1, int a2, LColor::color col)
|
int a1, int a2, LColor::color col)
|
||||||
{
|
{
|
||||||
XDrawArc(fl_get_display(), owner_.getPixmap(),
|
XDrawArc(fl_get_display(), owner_.getPixmap(),
|
||||||
lyxColorHandler->getGCForeground(col),
|
lyxColorHandler->getGCForeground(col),
|
||||||
x, y, w, h, a1, a2);
|
x, y, w, h, a1, a2);
|
||||||
return *this;
|
return *this;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
@ -131,7 +131,7 @@ int width(char const * s, size_t n, LyXFont const & f)
|
|||||||
Uchar c = encoding->ucs(s[i]);
|
Uchar c = encoding->ucs(s[i]);
|
||||||
xs[i].byte1 = c >> 8;
|
xs[i].byte1 = c >> 8;
|
||||||
xs[i].byte2 = c & 0xff;
|
xs[i].byte2 = c & 0xff;
|
||||||
}
|
}
|
||||||
int result = xfont_metrics::width(xs.get(), n, font);
|
int result = xfont_metrics::width(xs.get(), n, font);
|
||||||
return result;
|
return result;
|
||||||
}
|
}
|
||||||
|
@ -1,3 +1,7 @@
|
|||||||
|
2002-12-01 Lars Gullik Bjønnes <larsbj@gullik.net>
|
||||||
|
|
||||||
|
* several files: ws changes
|
||||||
|
|
||||||
2002-11-21 Angus Leeming <leeming@lyx.org>
|
2002-11-21 Angus Leeming <leeming@lyx.org>
|
||||||
|
|
||||||
* GraphicsConverter.C (build_script, move_file):
|
* GraphicsConverter.C (build_script, move_file):
|
||||||
|
@ -58,4 +58,3 @@ Image::getScaledDimensions(Params const & params) const
|
|||||||
}
|
}
|
||||||
|
|
||||||
} // namespace grfx
|
} // namespace grfx
|
||||||
|
|
||||||
|
@ -1,3 +1,7 @@
|
|||||||
|
2002-12-01 Lars Gullik Bjønnes <larsbj@gullik.net>
|
||||||
|
|
||||||
|
* several files: ws changes
|
||||||
|
|
||||||
2002-12-01 Lars Gullik Bjønnes <larsbj@gullik.net>
|
2002-12-01 Lars Gullik Bjønnes <larsbj@gullik.net>
|
||||||
|
|
||||||
* insetquotes.C (dispString): use string::insert for prepending a
|
* insetquotes.C (dispString): use string::insert for prepending a
|
||||||
|
@ -350,8 +350,8 @@ public:
|
|||||||
// paragraphs with "Standard" layout?
|
// paragraphs with "Standard" layout?
|
||||||
virtual bool forceDefaultParagraphs(Inset const *) const;
|
virtual bool forceDefaultParagraphs(Inset const *) const;
|
||||||
/** returns true if, when outputing LaTeX, font changes should
|
/** returns true if, when outputing LaTeX, font changes should
|
||||||
be closed before generating this inset. This is needed for
|
be closed before generating this inset. This is needed for
|
||||||
insets that may contain several paragraphs */
|
insets that may contain several paragraphs */
|
||||||
virtual bool noFontChange() const { return false; }
|
virtual bool noFontChange() const { return false; }
|
||||||
//
|
//
|
||||||
virtual void getDrawFont(LyXFont &) const {}
|
virtual void getDrawFont(LyXFont &) const {}
|
||||||
|
@ -40,7 +40,7 @@ int InsetButton::ascent(BufferView * bv, LyXFont const &) const
|
|||||||
int descent;
|
int descent;
|
||||||
string const s = getScreenLabel(bv->buffer());
|
string const s = getScreenLabel(bv->buffer());
|
||||||
|
|
||||||
if (editable()) {
|
if (editable()) {
|
||||||
font_metrics::buttonText(s, font, width, ascent, descent);
|
font_metrics::buttonText(s, font, width, ascent, descent);
|
||||||
} else {
|
} else {
|
||||||
font_metrics::rectText(s, font, width, ascent, descent);
|
font_metrics::rectText(s, font, width, ascent, descent);
|
||||||
@ -62,7 +62,7 @@ int InsetButton::descent(BufferView * bv, LyXFont const &) const
|
|||||||
int descent;
|
int descent;
|
||||||
string const s = getScreenLabel(bv->buffer());
|
string const s = getScreenLabel(bv->buffer());
|
||||||
|
|
||||||
if (editable()) {
|
if (editable()) {
|
||||||
font_metrics::buttonText(s, font, width, ascent, descent);
|
font_metrics::buttonText(s, font, width, ascent, descent);
|
||||||
} else {
|
} else {
|
||||||
font_metrics::rectText(s, font, width, ascent, descent);
|
font_metrics::rectText(s, font, width, ascent, descent);
|
||||||
@ -84,7 +84,7 @@ int InsetButton::width(BufferView * bv, LyXFont const &) const
|
|||||||
int descent;
|
int descent;
|
||||||
string const s = getScreenLabel(bv->buffer());
|
string const s = getScreenLabel(bv->buffer());
|
||||||
|
|
||||||
if (editable()) {
|
if (editable()) {
|
||||||
font_metrics::buttonText(s, font, width, ascent, descent);
|
font_metrics::buttonText(s, font, width, ascent, descent);
|
||||||
} else {
|
} else {
|
||||||
font_metrics::rectText(s, font, width, ascent, descent);
|
font_metrics::rectText(s, font, width, ascent, descent);
|
||||||
|
@ -54,8 +54,8 @@ public:
|
|||||||
///
|
///
|
||||||
bool insetAllowed(Inset::Code) const;
|
bool insetAllowed(Inset::Code) const;
|
||||||
/** returns true if, when outputing LaTeX, font changes should
|
/** returns true if, when outputing LaTeX, font changes should
|
||||||
be closed before generating this inset. This is needed for
|
be closed before generating this inset. This is needed for
|
||||||
insets that may contain several paragraphs */
|
insets that may contain several paragraphs */
|
||||||
bool noFontChange() const { return true; }
|
bool noFontChange() const { return true; }
|
||||||
///
|
///
|
||||||
string const & type() const;
|
string const & type() const;
|
||||||
|
@ -34,8 +34,8 @@ public:
|
|||||||
///
|
///
|
||||||
bool insetAllowed(Inset::Code) const;
|
bool insetAllowed(Inset::Code) const;
|
||||||
/** returns true if, when outputing LaTeX, font changes should
|
/** returns true if, when outputing LaTeX, font changes should
|
||||||
be closed before generating this inset. This is needed for
|
be closed before generating this inset. This is needed for
|
||||||
insets that may contain several paragraphs */
|
insets that may contain several paragraphs */
|
||||||
bool noFontChange() const { return true; }
|
bool noFontChange() const { return true; }
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -87,8 +87,8 @@ public:
|
|||||||
///
|
///
|
||||||
bool needFullRow() const { return false; }
|
bool needFullRow() const { return false; }
|
||||||
/** returns true if, when outputing LaTeX, font changes should
|
/** returns true if, when outputing LaTeX, font changes should
|
||||||
be closed before generating this inset. This is needed for
|
be closed before generating this inset. This is needed for
|
||||||
insets that may contain several paragraphs */
|
insets that may contain several paragraphs */
|
||||||
bool noFontChange() const { return true; }
|
bool noFontChange() const { return true; }
|
||||||
///
|
///
|
||||||
bool showInsetDialog(BufferView *) const;
|
bool showInsetDialog(BufferView *) const;
|
||||||
|
@ -130,8 +130,8 @@ public:
|
|||||||
///
|
///
|
||||||
bool isTextInset() const { return true; }
|
bool isTextInset() const { return true; }
|
||||||
/** returns true if, when outputing LaTeX, font changes should
|
/** returns true if, when outputing LaTeX, font changes should
|
||||||
be closed before generating this inset. This is needed for
|
be closed before generating this inset. This is needed for
|
||||||
insets that may contain several paragraphs */
|
insets that may contain several paragraphs */
|
||||||
bool noFontChange() const { return true; }
|
bool noFontChange() const { return true; }
|
||||||
///
|
///
|
||||||
bool display() const { return tabular->IsLongTabular(); }
|
bool display() const { return tabular->IsLongTabular(); }
|
||||||
|
@ -58,8 +58,8 @@ public:
|
|||||||
string const & type() const;
|
string const & type() const;
|
||||||
///
|
///
|
||||||
LyXLength const & pageWidth() const;
|
LyXLength const & pageWidth() const;
|
||||||
///
|
///
|
||||||
void pageWidth(LyXLength const &);
|
void pageWidth(LyXLength const &);
|
||||||
///
|
///
|
||||||
void placement(string const & p);
|
void placement(string const & p);
|
||||||
///
|
///
|
||||||
|
@ -1,3 +1,7 @@
|
|||||||
|
2002-12-01 Lars Gullik Bjønnes <larsbj@gullik.net>
|
||||||
|
|
||||||
|
* several files: ws changes
|
||||||
|
|
||||||
2002-11-27 Lars Gullik Bjønnes <larsbj@gullik.net>
|
2002-11-27 Lars Gullik Bjønnes <larsbj@gullik.net>
|
||||||
|
|
||||||
* math_inferinset.C: remove unused "using std::max"
|
* math_inferinset.C: remove unused "using std::max"
|
||||||
|
@ -96,10 +96,10 @@ public:
|
|||||||
|
|
||||||
///
|
///
|
||||||
virtual bool searchForward(BufferView *, string const &,
|
virtual bool searchForward(BufferView *, string const &,
|
||||||
bool = true, bool = false);
|
bool = true, bool = false);
|
||||||
///
|
///
|
||||||
virtual bool searchBackward(BufferView *, string const &,
|
virtual bool searchBackward(BufferView *, string const &,
|
||||||
bool = true, bool = false);
|
bool = true, bool = false);
|
||||||
///
|
///
|
||||||
virtual bool isTextInset() const { return true; }
|
virtual bool isTextInset() const { return true; }
|
||||||
///
|
///
|
||||||
|
@ -1,4 +1,3 @@
|
|||||||
|
|
||||||
#ifdef __GNUG__
|
#ifdef __GNUG__
|
||||||
#pragma implementation
|
#pragma implementation
|
||||||
#endif
|
#endif
|
||||||
@ -46,4 +45,3 @@ void MathErtInset::infoize(std::ostream & os) const
|
|||||||
{
|
{
|
||||||
os << "Box: Ert";
|
os << "Box: Ert";
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1,4 +1,3 @@
|
|||||||
|
|
||||||
#ifdef __GNUG__
|
#ifdef __GNUG__
|
||||||
#pragma implementation
|
#pragma implementation
|
||||||
#endif
|
#endif
|
||||||
|
@ -1,5 +1,3 @@
|
|||||||
|
|
||||||
|
|
||||||
#ifdef __GNUG__
|
#ifdef __GNUG__
|
||||||
#pragma implementation
|
#pragma implementation
|
||||||
#endif
|
#endif
|
||||||
|
@ -45,5 +45,3 @@ void MathLefteqnInset::infoize(std::ostream & os) const
|
|||||||
{
|
{
|
||||||
os << "Lefteqn ";
|
os << "Lefteqn ";
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
@ -1,4 +1,3 @@
|
|||||||
|
|
||||||
#ifdef __GNUG__
|
#ifdef __GNUG__
|
||||||
#pragma implementation
|
#pragma implementation
|
||||||
#endif
|
#endif
|
||||||
|
@ -1,4 +1,3 @@
|
|||||||
|
|
||||||
#ifdef __GNUG__
|
#ifdef __GNUG__
|
||||||
#pragma implementation
|
#pragma implementation
|
||||||
#endif
|
#endif
|
||||||
@ -367,4 +366,3 @@ NormalStream & operator<<(NormalStream & ns, int i)
|
|||||||
|
|
||||||
|
|
||||||
//////////////////////////////////////////////////////////////////////
|
//////////////////////////////////////////////////////////////////////
|
||||||
|
|
||||||
|
@ -1,4 +1,3 @@
|
|||||||
|
|
||||||
#ifdef __GNUG__
|
#ifdef __GNUG__
|
||||||
#pragma implementation
|
#pragma implementation
|
||||||
#endif
|
#endif
|
||||||
@ -104,9 +103,9 @@ MathStyleChanger::MathStyleChanger(MathMetricsBase & mb, MathStyles style)
|
|||||||
: MathChanger<MathMetricsBase>(mb)
|
: MathChanger<MathMetricsBase>(mb)
|
||||||
{
|
{
|
||||||
static const int diff[4][4] = { { 0, 0, -3, -5 },
|
static const int diff[4][4] = { { 0, 0, -3, -5 },
|
||||||
{ 0, 0, -3, -5 },
|
{ 0, 0, -3, -5 },
|
||||||
{ 3, 3, 0, -2 },
|
{ 3, 3, 0, -2 },
|
||||||
{ 5, 5, 2, 0 } };
|
{ 5, 5, 2, 0 } };
|
||||||
save_ = mb;
|
save_ = mb;
|
||||||
int t = diff[mb.style][style];
|
int t = diff[mb.style][style];
|
||||||
if (t > 0)
|
if (t > 0)
|
||||||
@ -152,4 +151,3 @@ MathWidthChanger::~MathWidthChanger()
|
|||||||
{
|
{
|
||||||
orig_ = save_;
|
orig_ = save_;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1,4 +1,3 @@
|
|||||||
|
|
||||||
#ifdef __GNUG__
|
#ifdef __GNUG__
|
||||||
#pragma implementation
|
#pragma implementation
|
||||||
#endif
|
#endif
|
||||||
@ -67,4 +66,3 @@ void MathParboxInset::infoize(std::ostream & os) const
|
|||||||
{
|
{
|
||||||
os << "Box: Parbox " << tex_width_;
|
os << "Box: Parbox " << tex_width_;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1,4 +1,3 @@
|
|||||||
|
|
||||||
#ifdef __GNUG__
|
#ifdef __GNUG__
|
||||||
#pragma implementation
|
#pragma implementation
|
||||||
#endif
|
#endif
|
||||||
|
@ -1,4 +1,3 @@
|
|||||||
|
|
||||||
#ifdef __GNUG__
|
#ifdef __GNUG__
|
||||||
#pragma implementation
|
#pragma implementation
|
||||||
#endif
|
#endif
|
||||||
|
@ -1,4 +1,3 @@
|
|||||||
|
|
||||||
#ifdef __GNUG__
|
#ifdef __GNUG__
|
||||||
#pragma implementation
|
#pragma implementation
|
||||||
#endif
|
#endif
|
||||||
|
@ -1,3 +1,7 @@
|
|||||||
|
2002-12-01 Lars Gullik Bjønnes <larsbj@gullik.net>
|
||||||
|
|
||||||
|
* several files: ws changes
|
||||||
|
|
||||||
2002-11-27 Lars Gullik Bjønnes <larsbj@birdstep.com>
|
2002-11-27 Lars Gullik Bjønnes <larsbj@birdstep.com>
|
||||||
|
|
||||||
* filetools.C (DirList): remove all ugly hacks and do it nice
|
* filetools.C (DirList): remove all ugly hacks and do it nice
|
||||||
|
@ -30,7 +30,7 @@
|
|||||||
*
|
*
|
||||||
* if (blah) {
|
* if (blah) {
|
||||||
* Path p("/tmp/blah");
|
* Path p("/tmp/blah");
|
||||||
* ...
|
* ...
|
||||||
* }
|
* }
|
||||||
*
|
*
|
||||||
* At the end of p's scope the cwd is reset to its previous value.
|
* At the end of p's scope the cwd is reset to its previous value.
|
||||||
|
Loading…
Reference in New Issue
Block a user