anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2025-01-13 20:09:59 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

ws cleanup

Browse Source 
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/frontends/ChangeLog
View File

@ -1,5 +1,7 @@
2002-03-21 Lars Gullik Bjønnes <larsbj@birdstep.com>
* most files: ws cleanup
* Makefile.am: remove ld -r stuff
2002-03-20 Lars Gullik Bjønnes <larsbj@birdstep.com>

4
src/frontends/Dialogs.h
View File

@ -129,8 +129,8 @@ public:
SigC::Signal1<void, InsetInfo *> showInfo;
/// show the LaTeX log or build file
SigC::Signal0<void> showLogFile;
/// display the top-level maths panel
SigC::Signal0<void> showMathPanel;
/// display the top-level maths panel
SigC::Signal0<void> showMathPanel;
///
SigC::Signal1<void, InsetMinipage *> showMinipage;
///

4
src/frontends/Liason.h
View File

@ -59,7 +59,3 @@ namespace Liason {
} // namespace Liason
#endif

6
src/frontends/Toolbar.h
View File

@ -41,15 +41,15 @@ public:
frame, where you can change the toolbar realtime. */
void edit();
/// 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
void add(string const & , bool doclean = true);
/// invokes the n'th icon in the toolbar
void push(int);
/// activates the toolbar
void activate();
void activate();
/// deactivates the toolbar
void deactivate();
void deactivate();
/// update the state of the icons
void update();

4
src/frontends/controllers/ChangeLog
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>
* biblio.C (getInfo): string::c_str() never returns NULL. Don't test

1
src/frontends/controllers/ControlAboutlyx.h
View File

@ -48,4 +48,3 @@ private:
};
#endif // CONTROLABOUTLYX_H

2
src/frontends/controllers/ControlBibtex.C
View File

@ -62,7 +62,7 @@ void ControlBibtex::applyParamsNoInset()
string const ControlBibtex::Browse(string const & in_name,
string const & title,
string const & title,
string const & pattern)
{
pair<string, string> dir1(N_("Documents|#o#O"), string(lyxrc.document_path));

2
src/frontends/controllers/ControlButtons.C
View File

@ -60,5 +60,5 @@ void ControlButtons::RestoreButton()
bool ControlButtons::IconifyWithMain() const
{
return lyxrc.dialogs_iconify_with_main;
return lyxrc.dialogs_iconify_with_main;
}

1
src/frontends/controllers/ControlCommand.C
View File

@ -59,4 +59,3 @@ void ControlCommand::applyParamsNoInset()
if (action_ == LFUN_NOACTION) return;
lv_.getLyXFunc()->dispatch(action_, params().getAsString());
}

2
src/frontends/controllers/ControlConnections.C
View File

@ -75,7 +75,7 @@ ControlConnectBase::DocTypes ControlConnectBase::docType() const
ControlConnectBI::ControlConnectBI(LyXView & lv, Dialogs & d)
: ControlConnectBase(lv, d)
: ControlConnectBase(lv, d)
{}

4
src/frontends/controllers/ControlConnections.h
View File

@ -99,8 +99,8 @@ protected:
class ControlConnectBI : public ControlConnectBase
{
public:
///
ControlConnectBI(LyXView &, Dialogs &);
///
ControlConnectBI(LyXView &, Dialogs &);
protected:
///

1
src/frontends/controllers/ControlError.C
View File

@ -38,4 +38,3 @@ string const ControlError::getParams(InsetError const & inset)
{
return inset.getContents();
}

1
src/frontends/controllers/ControlForks.C
View File

@ -93,4 +93,3 @@ void ControlForks::clearParams()
pids_.clear();
childrenChanged_.disconnect();
}

14
src/frontends/controllers/ControlGraphics.C
View File

@ -89,12 +89,12 @@ string const ControlGraphics::Browse(string const & in_name)
// FIXME: currently we need the second '|' to prevent mis-interpretation
string const pattern = "*.(ps|eps|png|jpeg|jpg|gif|gz)|";
// Does user clipart directory exist?
string clipdir = AddName (user_lyxdir, "clipart");
FileInfo fileInfo(clipdir);
if (!(fileInfo.isOK() && fileInfo.isDir()))
// No - bail out to system clipart directory
clipdir = AddName (system_lyxdir, "clipart");
// Does user clipart directory exist?
string clipdir = AddName (user_lyxdir, "clipart");
FileInfo fileInfo(clipdir);
if (!(fileInfo.isOK() && fileInfo.isDir()))
// No - bail out to system clipart directory
clipdir = AddName (system_lyxdir, "clipart");
pair<string, string> dir1(N_("Clipart|#C#c"), clipdir);
pair<string, string> dir2(N_("Documents|#o#O"), string(lyxrc.document_path));
// Show the file browser dialog
@ -109,7 +109,7 @@ string const ControlGraphics::readBB(string const & file)
// to check a bit more.
// on the other hand some plot programs write the bb at the
// end of the file. Than we have in the header a
// %%BoundingBox: (atend)
// %%BoundingBox: (atend)
// In this case we must check until the end.
string file_ = file;
if (zippedFile(file_))

1
src/frontends/controllers/ControlGraphics.h
View File

@ -54,4 +54,3 @@ private:
};
#endif // CONTROLGRAPHICS_H

1
src/frontends/controllers/ControlInclude.C
View File

@ -92,4 +92,3 @@ bool ControlInclude::fileExists(string const & file)
Alert::alert(_("Specified file doesn't exist !"));
return false;
}

6
src/frontends/controllers/ControlSearch.C
View File

@ -48,7 +48,7 @@ void ControlSearch::find(string const & search,
bool casesensitive, bool matchword, bool forward) const
{
bool const found = LyXFind(lv_.view(), search,
forward, false, casesensitive, matchword);
forward, false, casesensitive, matchword);
if (!found)
setMinibuffer(&lv_, _("String not found!"));
@ -63,8 +63,8 @@ void ControlSearch::replace(string const & search, string const & replace,
// changed
bool const once = !all;
int const replace_count = LyXReplace(lv_.view(),
search, replace, true, casesensitive,
matchword, all, once);
search, replace, true, casesensitive,
matchword, all, once);
if (replace_count == 0) {
setMinibuffer(&lv_, _("String not found!"));

3
src/frontends/controllers/ControlSendto.C
View File

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

7
src/frontends/controllers/ControlTexinfo.C
View File

@ -74,10 +74,10 @@ namespace {
string const sortEntries(string & str_in)
{
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::unique(dbase.begin(), dbase.end()); // compact
dbase.erase(p, dbase.end()); // shrink
std::unique(dbase.begin(), dbase.end()); // compact
dbase.erase(p, dbase.end()); // shrink
return getStringFromVector(dbase,"\n");
}
@ -127,4 +127,3 @@ void ControlTexinfo::viewFile(string const filename) const
{
lv_.getDialogs()->showFile(filename);
}

4
src/frontends/controllers/GUI.h
View File

@ -345,7 +345,7 @@ public:
template <class GUIview, class GUIbc>
class GUITabularCreate :
public GUI<ControlTabularCreate, GUIview,
OkApplyCancelReadOnlyPolicy, GUIbc> {
OkApplyCancelReadOnlyPolicy, GUIbc> {
public:
///
GUITabularCreate(LyXView & lv, Dialogs & d)
@ -370,7 +370,7 @@ public:
template <class GUIview, class GUIbc>
class GUIThesaurus :
public GUI<ControlThesaurus, GUIview,
OkApplyCancelReadOnlyPolicy, GUIbc> {
OkApplyCancelReadOnlyPolicy, GUIbc> {
public:
///
GUIThesaurus(LyXView & lv, Dialogs & d)

16
src/frontends/controllers/ViewBase.h
View File

@ -40,14 +40,14 @@ public:
/** These shortcuts allow (e.g. xform's) global callback functions
access to the buttons without making the whole controller_ public.
*/
///
void ApplyButton() { controller_.ApplyButton(); }
///
void OKButton() { controller_.OKButton(); }
///
void CancelButton() { controller_.CancelButton(); }
///
void RestoreButton() { controller_.RestoreButton(); }
///
void ApplyButton() { controller_.ApplyButton(); }
///
void OKButton() { controller_.OKButton(); }
///
void CancelButton() { controller_.CancelButton(); }
///
void RestoreButton() { controller_.RestoreButton(); }
/** Defaults to nothing. Can be used by the Controller, however, to
indicate to the View that something has changed and that the

8
src/frontends/controllers/biblio.C
View File

@ -167,7 +167,7 @@ string const getAbbreviatedAuthor(InfoMap const & map, string const & key)
{
lyx::Assert(!map.empty());
InfoMap::const_iterator it = map.find(key);
InfoMap::const_iterator it = map.find(key);
string author;
if (it != map.end()) {
@ -204,7 +204,7 @@ string const getYear(InfoMap const & map, string const & key)
{
lyx::Assert(!map.empty());
InfoMap::const_iterator it = map.find(key);
InfoMap::const_iterator it = map.find(key);
string year;
@ -246,7 +246,7 @@ string const getInfo(InfoMap const & map, string const & key)
{
lyx::Assert(!map.empty());
InfoMap::const_iterator it = map.find(key);
InfoMap::const_iterator it = map.find(key);
if (it == map.end())
return string();
// is the entry a BibTeX one or one from lyx-layout "bibliography"?
@ -418,7 +418,7 @@ string const parseBibTeX(string data, string const & findkey)
keypos += tmp.find('{') + 1;
tmp = data.substr(keypos);
keypos += tmp.find('}') + 1;
tmp = data.substr(keypos);
tmp = data.substr(keypos);
}
if (tmp.find(enclosing) == string::npos)
return data;

4
src/frontends/gnome/ChangeLog
View File

@ -1,3 +1,7 @@
2002-03-21 Lars Gullik Bjønnes <larsbj@birdstep.com>
* most files: ws cleanup
2002-03-16 Michael A. Koziarski <michael@koziarski.com>
* Makefile.am: Cleanup and linking fix.

8
src/frontends/gnome/Dialogs.C
View File

@ -90,7 +90,7 @@ Dialogs::Dialogs(LyXView * lv)
add(new FormGraphics(lv, this));
add(new FormInclude(lv, this));
add(new FormIndex(lv, this));
add(new FormMathsPanel(lv, this));
add(new FormMathsPanel(lv, this));
add(new FormParagraph(lv, this));
add(new FormPreamble(lv, this));
add(new FormPreferences(lv, this));
@ -144,17 +144,17 @@ A. To avoid a segfault.
by adding a specific show or update signal. For example, spellchecker
needs to set the next suspect word and its options/replacements so we
need a:
Signal0<void> updateSpellChecker;
Signal0<void> updateSpellChecker;
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]
button then the updateSpellChecker signal will make the SpellChecker
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
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
it anyway with a LyXFunc call or two. Besides if someone extends

12
src/frontends/gnome/FormERT.C
View File

@ -108,25 +108,25 @@ bool FormERT::validate() 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
{
return getWidget<Gtk::Button>("r_apply_btn");
return getWidget<Gtk::Button>("r_apply_btn");
}
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
{
return getWidget<Gtk::RadioButton>("r_open");
return getWidget<Gtk::RadioButton>("r_open");
}
Gtk::RadioButton * FormERT::collapsed() const
{
return getWidget<Gtk::RadioButton>("r_collapsed");
return getWidget<Gtk::RadioButton>("r_collapsed");
}
Gtk::RadioButton * FormERT::inlined() const
{
return getWidget<Gtk::RadioButton>("r_inlined");
return getWidget<Gtk::RadioButton>("r_inlined");
}

4
src/frontends/gnome/FormError.C
View File

@ -46,10 +46,10 @@ void FormError::update()
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
{
return getWidget<Gtk::Text>("r_textarea");
return getWidget<Gtk::Text>("r_textarea");
}

1
src/frontends/gnome/FormIndex.C
View File

@ -199,4 +199,3 @@ void FormIndex::apply()
// hide the dialog
hide();
}

2
src/frontends/gnome/FormRef.C
View File

@ -281,7 +281,7 @@ void FormRef::showStageAction()
choice_-> set_menu ( *menu );
switch ( getType() ) {
case REF: { choice_-> set_history(0); break; }
case REF: { choice_-> set_history(0); break; }
case PAGEREF: { choice_-> set_history(1); break; }
case VREF: { choice_-> set_history(2); break; }
case VPAGEREF: { choice_-> set_history(3); break; }

17
src/frontends/gnome/FormTabularCreate.C
View File

@ -40,11 +40,11 @@ void FormTabularCreate::build()
{
// Connect the buttons.
ok_btn()->clicked.connect(SigC::slot(this,
&FormTabularCreate::OKClicked));
&FormTabularCreate::OKClicked));
cancel_btn()->clicked.connect(SigC::slot(this,
&FormTabularCreate::CancelClicked));
&FormTabularCreate::CancelClicked));
apply_btn()->clicked.connect(SigC::slot(this,
&FormTabularCreate::ApplyClicked));
&FormTabularCreate::ApplyClicked));
// Manage the buttons state
bc().setOK(ok_btn());
@ -78,22 +78,21 @@ bool FormTabularCreate::validate() const
Gtk::Button * FormTabularCreate::ok_btn() const
{
return getWidget<Gtk::Button>("r_ok_btn");
return getWidget<Gtk::Button>("r_ok_btn");
}
Gtk::Button * FormTabularCreate::apply_btn() const
{
return getWidget<Gtk::Button>("r_apply_btn");
return getWidget<Gtk::Button>("r_apply_btn");
}
Gtk::Button * FormTabularCreate::cancel_btn() const
{
return getWidget<Gtk::Button>("r_cancel_btn");
return getWidget<Gtk::Button>("r_cancel_btn");
}
Gtk::SpinButton * FormTabularCreate::rows() const
{
return getWidget<Gtk::SpinButton>("r_rows");
return getWidget<Gtk::SpinButton>("r_rows");
}
Gtk::SpinButton * FormTabularCreate::cols() const
{
return getWidget<Gtk::SpinButton>("r_cols");
return getWidget<Gtk::SpinButton>("r_cols");
}

1
src/frontends/gnome/FormToc.C
View File

@ -264,4 +264,3 @@ void FormToc::free()
ih_.disconnect();
}
}

16
src/frontends/gnome/FormUrl.C
View File

@ -115,31 +115,29 @@ bool FormUrl::validate() const
Gtk::Button * FormUrl::restore_btn() const
{
return getWidget<Gtk::Button>("r_restore_btn");
return getWidget<Gtk::Button>("r_restore_btn");
}
Gtk::Button * FormUrl::ok_btn() const
{
return getWidget<Gtk::Button>("r_ok_btn");
return getWidget<Gtk::Button>("r_ok_btn");
}
Gtk::Button * FormUrl::apply_btn() const
{
return getWidget<Gtk::Button>("r_apply_btn");
return getWidget<Gtk::Button>("r_apply_btn");
}
Gtk::Button * FormUrl::cancel_btn() const
{
return getWidget<Gtk::Button>("r_cancel_btn");
return getWidget<Gtk::Button>("r_cancel_btn");
}
Gtk::Entry * FormUrl::url() const
{
return getWidget<Gtk::Entry>("r_url");
return getWidget<Gtk::Entry>("r_url");
}
Gtk::Entry * FormUrl::name() const
{
return getWidget<Gtk::Entry>("r_name");
return getWidget<Gtk::Entry>("r_name");
}
Gtk::CheckButton * FormUrl::html_cb() const
{
return getWidget<Gtk::CheckButton>("r_html_cb");
return getWidget<Gtk::CheckButton>("r_html_cb");
}

1
src/frontends/gnome/GUIRunTime.C
View File

@ -1,4 +1,3 @@
/* This file is part of
* ======================================================
*

2
src/frontends/gnome/Timeout_pimpl.C
View File

@ -31,7 +31,7 @@ void Timeout::Pimpl::reset()
bool Timeout::Pimpl::running() const
{
return running_;
return running_;
}
void Timeout::Pimpl::start()

10
src/frontends/gnome/Timeout_pimpl.h
View File

@ -31,9 +31,9 @@ public:
/// stop the timer
void stop();
/// reset
void reset();
/// Is the timer running?
bool running() const;
void reset();
/// Is the timer running?
bool running() const;
public:
@ -44,8 +44,8 @@ private:
Timeout * owner_;
/// Timer connection
SigC::Connection conn_;
/// Used for running as SigC::Connection::connected() isn't const
bool running_;
/// Used for running as SigC::Connection::connected() isn't const
bool running_;
};
#endif

1
src/frontends/gnome/pixbutton.h
View File

@ -55,4 +55,3 @@ namespace Gnome
}
#endif

7
src/frontends/gnome/support.h
View File

@ -15,7 +15,7 @@
* you want returned.
*/
GtkWidget* lookup_widget (GtkWidget *widget,
const gchar *widget_name);
const gchar *widget_name);
/* get_widget() is deprecated. Use lookup_widget instead. */
#define get_widget lookup_widget
@ -27,8 +27,7 @@ GtkWidget* lookup_widget (GtkWidget *widget,
/* This is used to create the pixmaps in the interface. */
GtkWidget* create_pixmap (GtkWidget *widget,
const gchar *filename,
gboolean gnome_pixmap);
const gchar *filename,
gboolean gnome_pixmap);
GdkImlibImage* create_image (const gchar *filename);

8
src/frontends/qt2/ChangeLog
View File

@ -1,3 +1,7 @@
2002-03-21 Lars Gullik Bjønnes <larsbj@birdstep.com>
* most files: ws cleanup
2002-03-11 Lars Gullik Bjønnes <larsbj@birdstep.com>
* docygen fixes.
@ -574,9 +578,9 @@
* Makefile.am:
* Qt2BC.h:
* Qt2BC.C:
* QAbout.C:
* QAbout.C:
* QCitation.C:
* QDocument.h:
* QDocument.h:
* Qt2Base.C:
* Qt2Base.h: rename qt2BC -> Qt2BC, set focus for widget enable

2
src/frontends/qt2/Dialogs.C
View File

@ -114,7 +114,7 @@ Dialogs::Dialogs(LyXView * lv)
// dialogs not yet MVCd
add(new FormDocument(lv, this));
add(new FormMathsPanel(lv, this));
add(new FormMathsPanel(lv, this));
add(new FormParagraph(lv, this));
add(new FormPreferences(lv, this));
add(new FormTabular(lv, this));

2
src/frontends/qt2/FileDialog.C
View File

@ -57,7 +57,7 @@ FileDialog::Result const FileDialog::Select(string const & path, string const &
if (res == QDialog::Accepted)
result.second = string(dlg->selectedFile().data());
delete dlg;
return result;
return result;
}
dlg->show();
return make_pair(FileDialog::Later, string());

2
src/frontends/qt2/QBibtex.C
View File

@ -62,7 +62,7 @@ void QBibtex::update_contents()
dialog_->databaseLB->inSort(bib.c_str());
}
string bibtotoc = "bibtotoc";
string bibtotoc = "bibtotoc";
string bibstyle(controller().params().getOptions().c_str());
// bibtotoc exists?

6
src/frontends/qt2/QCitation.C
View File

@ -55,8 +55,8 @@ void QCitation::apply()
bool const full = dialog_->fulllistCB->isChecked();
bool const force = dialog_->forceuppercaseCB->isChecked();
string const command =
biblio::getCiteCommand(styles[choice], full, force);
string const command =
biblio::getCiteCommand(styles[choice], full, force);
controller().params().setCmdName(command);
controller().params().setContents(getStringFromVector(citekeys));
@ -126,7 +126,7 @@ void QCitation::updateStyle()
// Find the style of the citekeys
vector<biblio::CiteStyle> const & styles =
ControlCitation::getCiteStyles();
biblio::CitationStyle cs = biblio::getCitationStyle(command);
biblio::CitationStyle cs = biblio::getCitationStyle(command);
vector<biblio::CiteStyle>::const_iterator cit =
find(styles.begin(), styles.end(), cs.style);

20
src/frontends/qt2/QDocument.h
View File

@ -72,8 +72,8 @@ private:
virtual Qt2BC & bc();
/// Build the dialog
virtual void build_dialog();
// /// Filter the inputs
// virtual bool input( FL_OBJECT *, long );
// /// Filter the inputs
// virtual bool input( FL_OBJECT *, long );
/// Update the dialog.
virtual void update_contents();
/// Apply from dialog
@ -81,8 +81,8 @@ private:
/// Cancel from dialog
virtual void cancel();
// ///
// virtual QDialog* form() const;
// ///
// virtual QDialog* form() const;
#if 0
///
@ -151,12 +151,12 @@ private:
int current_bullet_panel;
///
int current_bullet_depth;
// ///
// FL_OBJECT * fbullet;
// ///
// boost::scoped_ptr<Combox> combo_language;
// ///
// boost::scoped_ptr<Combox> combo_doc_class;
// ///
// FL_OBJECT * fbullet;
// ///
// boost::scoped_ptr<Combox> combo_language;
// ///
// boost::scoped_ptr<Combox> combo_doc_class;
/// The ButtonController
ButtonController<NoRepeatedApplyReadOnlyPolicy, Qt2BC> bc_;
};

4
src/frontends/qt2/QFloat.h
View File

@ -38,7 +38,3 @@ private:
};
#endif // QFLOAT_H

1
src/frontends/qt2/QFloatDialog.C
View File

@ -43,4 +43,3 @@ void QFloatDialog::closeEvent(QCloseEvent * e)
form_->slotWMHide();
e->accept();
}

3
src/frontends/qt2/QFloatDialog.h
View File

@ -32,6 +32,3 @@ private:
};
#endif // QFLOATDIALOG_H

2
src/frontends/qt2/QGraphics.C
View File

@ -295,5 +295,3 @@ bool QGraphics::isValid()
{
return !string(dialog_->filename->text().latin1()).empty();
}

6
src/frontends/qt2/QGraphics.h
View File

@ -48,9 +48,3 @@ private:
};
#endif // QGRAPHICS_H

1
src/frontends/qt2/QGraphicsDialog.C
View File

@ -58,4 +58,3 @@ void QGraphicsDialog::get_clicked()
{
form_->get();
}

2
src/frontends/qt2/QShowFile.C
View File

@ -44,5 +44,3 @@ void QShowFile::update_contents()
dialog_->text->setText(contents.c_str());
}

2
src/frontends/qt2/QToc.C
View File

@ -44,7 +44,7 @@ void QToc::build_dialog()
{
dialog_.reset(new QTocDialog(this));
// Manage the cancel/close button
// Manage the cancel/close button
bc().setCancel(dialog_->closePB);
}

2
src/frontends/qt2/Qt2Base.h
View File

@ -87,7 +87,7 @@ private:
private:
/// dialog title, displayed by WM.
QString title_;
QString title_;
};

32
src/frontends/qt2/qttableview.C
View File

@ -1,5 +1,5 @@
/**********************************************************************
** $Id: qttableview.C,v 1.2 2001/12/05 08:04:18 larsbj Exp $
** $Id: qttableview.C,v 1.3 2002/03/21 21:19:37 larsbj Exp $
**
** Implementation of QtTableView class
**
@ -1084,8 +1084,8 @@ void QtTableView::coverCornerSquare( bool enable )
Q_CHECK_PTR( cornerSquare );
cornerSquare->setGeometry( maxViewX() + frameWidth() + 1,
maxViewY() + frameWidth() + 1,
VSBEXT,
HSBEXT);
VSBEXT,
HSBEXT);
}
if ( autoUpdate() && cornerSquare ) {
if ( enable )
@ -1289,7 +1289,7 @@ void QtTableView::paintEvent( QPaintEvent *e )
if ( !contentsRect().contains( updateR, TRUE ) ) {// update frame ?
drawFrame( &paint );
if ( updateR.left() < frameWidth() ) //###
if ( updateR.left() < frameWidth() ) //###
updateR.setLeft( frameWidth() );
if ( updateR.top() < frameWidth() )
updateR.setTop( frameWidth() );
@ -1451,7 +1451,7 @@ QScrollBar *QtTableView::verticalScrollBar() const
#ifndef QT_NO_CURSOR
sb->setCursor( arrowCursor );
#endif
sb->resize( sb->sizeHint() ); // height is irrelevant
sb->resize( sb->sizeHint() ); // height is irrelevant
Q_CHECK_PTR(sb);
sb->setTracking( FALSE );
sb->setFocusPolicy( NoFocus );
@ -1848,8 +1848,8 @@ int QtTableView::minViewY() const
int QtTableView::maxViewX() const
{
return width() - 1 - frameWidth()
- (tFlags & Tbl_vScrollBar ? VSBEXT
: 0);
- (tFlags & Tbl_vScrollBar ? VSBEXT
: 0);
}
@ -1864,8 +1864,8 @@ int QtTableView::maxViewX() const
int QtTableView::maxViewY() const
{
return height() - 1 - frameWidth()
- (tFlags & Tbl_hScrollBar ? HSBEXT
: 0);
- (tFlags & Tbl_hScrollBar ? HSBEXT
: 0);
}
@ -1998,8 +1998,8 @@ void QtTableView::updateScrollBars( uint f )
if ( testTableFlags(Tbl_hScrollBar) && (sbDirty & horMask) != 0 ) {
if ( sbDirty & horGeometry )
hScrollBar->setGeometry( 0,height() - HSBEXT,
viewWidth() + frameWidth()*2,
HSBEXT);
viewWidth() + frameWidth()*2,
HSBEXT);
if ( sbDirty & horSteps ) {
if ( cellW )
@ -2022,8 +2022,8 @@ void QtTableView::updateScrollBars( uint f )
if ( testTableFlags(Tbl_vScrollBar) && (sbDirty & verMask) != 0 ) {
if ( sbDirty & verGeometry )
vScrollBar->setGeometry( width() - VSBEXT, 0,
VSBEXT,
viewHeight() + frameWidth()*2 );
VSBEXT,
viewHeight() + frameWidth()*2 );
if ( sbDirty & verSteps ) {
if ( cellH )
@ -2055,16 +2055,16 @@ void QtTableView::updateScrollBars( uint f )
void QtTableView::updateFrameSize()
{
int rw = width() - ( testTableFlags(Tbl_vScrollBar) ?
VSBEXT : 0 );
VSBEXT : 0 );
int rh = height() - ( testTableFlags(Tbl_hScrollBar) ?
HSBEXT : 0 );
HSBEXT : 0 );
if ( rw < 0 )
rw = 0;
if ( rh < 0 )
rh = 0;
if ( autoUpdate() ) {
int fh = frameRect().height();
int fh = frameRect().height();
int fw = frameRect().width();
setFrameRect( QRect(0,0,rw,rh) );

4
src/frontends/xforms/Alert_pimpl.C
View File

@ -43,10 +43,10 @@ int askConfirmation_pimpl(string const & s1, string const & s2, string const & s
fl_set_choices_shortcut(scex(_("Yes|Yy#y")),
scex(_("No|Nn#n")),
scex(_("Cancel|^[")));
return fl_show_choice(s1.c_str(), s2.c_str(), s3.c_str(),
return fl_show_choice(s1.c_str(), s2.c_str(), s3.c_str(),
3, idex(_("Yes|Yy#y")),
idex(_("No|Nn#n")),
idex(_("Cancel|^[")), 3);
idex(_("Cancel|^[")), 3);
}

49
src/frontends/xforms/ChangeLog
View File

@ -1,3 +1,7 @@
2002-03-21 Lars Gullik Bjønnes <larsbj@birdstep.com>
* several files: ws cleanup
2002-03-20 Angus Leeming <a.leeming@ic.ac.uk>
* lots: whitespace changes.
@ -708,18 +712,18 @@
2002-1-15 Martin Vermeer <martin.vermeer@hut.fi>
* FormMathsDelim.C:
* form_maths_delim_C:
* form_maths_delim.h:
* form_maths_delin.fd:
Put three radio buttons on the delimiters pop-up. It works as follows:
* FormMathsDelim.C:
* form_maths_delim_C:
* form_maths_delim.h:
* form_maths_delin.fd:
Put three radio buttons on the delimiters pop-up. It works as follows:
left mouse middle mouse right mouse
----------------------------------------------------------------------
Left radio button | ( () )
Middle radio button | () () )
Right radio button | ) ) )
----------------------------------------------------------------------
left mouse middle mouse right mouse
----------------------------------------------------------------------
Left radio button | ( () )
Middle radio button | () () )
Right radio button | ) ) )
----------------------------------------------------------------------
Where
@ -1116,8 +1120,8 @@
2001-10-19 Jürgen Spitzmüller <j.spitzmueller@gmx.de>
* forms/form_document.fd:
Class: add a value choice for Default Skip.
Some rearrangements (minor tweaks).
Class: add a value choice for Default Skip.
Some rearrangements (minor tweaks).
* FormDocument.C: Handle that choice, minor tweaks.
* forms/form_paragraph.fd: Add value choices
* FormParagraph.C: Handle that choices.
@ -2411,7 +2415,7 @@
2001-03-07 Edwin Leuven <leuven@fee.uva.nl>
* added credits:
* added credits:
* Dialogs.C:
* Makefile.am:
* FormCredits.[Ch]:
@ -2545,13 +2549,13 @@
2001-02-20 Edwin Leuven <leuven@fee.uva.nl>
* src/frontends/xforms/Dialogs.C: added preamble
* src/frontends/xforms/FormPreamble.C: added
* src/frontends/xforms/FormPreamble.h: added
* src/frontends/xforms/Makefile.am: added
* src/frontends/xforms/form_preamble.C: added
* src/frontends/xforms/form_preamble.h: added
* src/frontends/xforms/form_preamble.fd: added
* src/frontends/xforms/Dialogs.C: added preamble
* src/frontends/xforms/FormPreamble.C: added
* src/frontends/xforms/FormPreamble.h: added
* src/frontends/xforms/Makefile.am: added
* src/frontends/xforms/form_preamble.C: added
* src/frontends/xforms/form_preamble.h: added
* src/frontends/xforms/form_preamble.fd: added
2001-02-19 Angus Leeming <a.leeming@ic.ac.uk>
@ -2726,7 +2730,7 @@
2001-01-21 Dekel Tsur <dekelts@tau.ac.il>
* FormRef.C (update): Do not update dialog_->{ref,name,type}
if inset_ == 0.
if inset_ == 0.
Deactivate the type button when buffer is LinuxDoc/Docbook
(build): Uncomment calls to addReadOnly().
(updateBrowser) Do not disable the update button when there are no
@ -2742,4 +2746,3 @@
2001-01-17 Dekel Tsur <dekelts@tau.ac.il>
* FormRef.C (input): Fix the behavior of goto reference button.

2
src/frontends/xforms/Dialogs.C
View File

@ -124,7 +124,7 @@ Dialogs::Dialogs(LyXView * lv)
add(new GUIVCLog<FormVCLog, xformsBC>(*lv, *this));
add(new FormDocument(lv, this));
add(new FormMathsPanel(lv, this));
add(new FormMathsPanel(lv, this));
add(new FormParagraph(lv, this));
add(new FormPreferences(lv, this));
add(new FormTabular(lv, this));

2
src/frontends/xforms/DropDown.C
View File

@ -47,7 +47,7 @@ DropDown::DropDown(LyXView * lv, FL_OBJECT * ob)
fl_add_box(FL_UP_BOX, 0, 0, ob->w, 100, "");
browser_ = fl_add_browser(FL_SELECT_BROWSER, 0, 0, ob->w, 100, "");
form_->u_vdata = this;
browser_->u_vdata = this;
browser_->u_vdata = this;
fl_set_object_callback(browser_, C_CompletedCB, 0);
fl_register_raw_callback(form_, KeyPressMask|ButtonPressMask, C_PeekCB);
fl_end_form();

2
src/frontends/xforms/FormBase.h
View File

@ -79,7 +79,7 @@ private:
/// Can the dialog be resized after it has been created?
bool allow_resize_;
/// dialog title, displayed by WM.
string title_;
string title_;
///
Tooltips * tooltips_;
};

18
src/frontends/xforms/FormBaseDeprecated.C
View File

@ -98,15 +98,15 @@ void FormBaseDeprecated::show()
if (form()->visible) {
fl_raise_form(form());
/* This XMapWindow() will hopefully ensure that
* iconified dialogs are de-iconified. Mad props
* out to those crazy Xlib guys for forgetting a
* XDeiconifyWindow(). At least WindowMaker, when
* being notified of the redirected MapRequest will
* specifically de-iconify. From source, fvwm2 seems
* to do the same.
*/
XMapWindow(fl_get_display(), form()->window);
/* This XMapWindow() will hopefully ensure that
* iconified dialogs are de-iconified. Mad props
* out to those crazy Xlib guys for forgetting a
* XDeiconifyWindow(). At least WindowMaker, when
* being notified of the redirected MapRequest will
* specifically de-iconify. From source, fvwm2 seems
* to do the same.
*/
XMapWindow(fl_get_display(), form()->window);
} else {
connect();

2
src/frontends/xforms/FormBaseDeprecated.h
View File

@ -124,7 +124,7 @@ protected: // methods
/// Redraw connection.
SigC::Connection r_;
/// dialog title, displayed by WM.
string title_;
string title_;
private:
/// The dialog's minimum allowable dimensions.

2
src/frontends/xforms/FormBibitem.C
View File

@ -36,7 +36,7 @@ void FormBibitem::build()
setPrehandler(dialog_->input_key);
setPrehandler(dialog_->input_label);
// Manage the ok, apply, restore and cancel/close buttons
// Manage the ok, apply, restore and cancel/close buttons
bc().setOK(dialog_->button_ok);
bc().setCancel(dialog_->button_close);

4
src/frontends/xforms/FormBibtex.C
View File

@ -48,7 +48,7 @@ void FormBibtex::build()
setPrehandler(dialog_->input_database);
setPrehandler(dialog_->input_style);
// Manage the ok, apply, restore and cancel/close buttons
// Manage the ok, apply, restore and cancel/close buttons
bc().setOK(dialog_->button_ok);
bc().setCancel(dialog_->button_close);
@ -118,7 +118,7 @@ void FormBibtex::update()
{
fl_set_input(dialog_->input_database,
controller().params().getContents().c_str());
string bibtotoc = "bibtotoc";
string bibtotoc = "bibtotoc";
string bibstyle (controller().params().getOptions().c_str());
if (prefixIs(bibstyle,bibtotoc)) { // bibtotoc exists?
fl_set_button(dialog_->check_bibtotoc,1);

2
src/frontends/xforms/FormCitation.C
View File

@ -156,7 +156,7 @@ void FormCitation::build()
setPrehandler(dialog_->input_before);
setPrehandler(dialog_->input_after);
// Manage the ok, apply, restore and cancel/close buttons
// Manage the ok, apply, restore and cancel/close buttons
bc().setOK(dialog_->button_ok);
bc().setApply(dialog_->button_apply);
bc().setCancel(dialog_->button_close);

4
src/frontends/xforms/FormDocument.C
View File

@ -694,7 +694,7 @@ bool FormDocument::class_apply(BufferParams &params)
case 2:
params.setDefSkip(VSpace(VSpace::MEDSKIP));
break;
case 3:
case 3:
params.setDefSkip(VSpace(VSpace::BIGSKIP));
break;
case 4:
@ -1282,7 +1282,7 @@ bool FormDocument::CheckDocumentInput(FL_OBJECT * ob, long)
if (!ok) {
postWarning(_("Invalid Length (valid example: 10mm)"));
return false;
} else {
} else {
clearMessage();
return true;
}

2
src/frontends/xforms/FormError.C
View File

@ -29,7 +29,7 @@ void FormError::build()
{
dialog_.reset(build_error());
// Manage the cancel/close button
// Manage the cancel/close button
bc().setCancel(dialog_->button_close);
}

16
src/frontends/xforms/FormFiledialog.C
View File

@ -265,7 +265,7 @@ void FileDialog::Private::Reread()
// If the pattern doesn't start with a dot, skip hidden files
if (!pszMask.empty() && pszMask[0] != '.' &&
pDirEntry->d_name[0] == '.')
continue;
continue;
// Gets filename
string fname = pDirEntry->d_name;
@ -285,7 +285,7 @@ void FileDialog::Private::Reread()
fileInfo.modeString(szMode);
unsigned int nlink = fileInfo.getNumberOfLinks();
string user = lyxUserCache.find(fileInfo.getUid());
string user = lyxUserCache.find(fileInfo.getUid());
string group = lyxGroupCache.find(fileInfo.getGid());
time_t modtime = fileInfo.getModificationTime();
@ -448,7 +448,7 @@ FileDialog::Private::Private()
// Make sure pressing the close box doesn't crash LyX. (RvdK)
fl_set_form_atclose(pFileDlgForm->form,
C_LyXFileDlg_CancelCB, 0);
// Register doubleclick callback
// Register doubleclick callback
fl_set_browser_dblclick_callback(pFileDlgForm->List,
C_LyXFileDlg_DoubleClickCB,
0);
@ -523,11 +523,11 @@ bool FileDialog::Private::RunDialog()
force_cancel = false;
force_ok = false;
// event loop
while (true) {
FL_OBJECT * pObject = fl_do_forms();
// event loop
while (true) {
FL_OBJECT * pObject = fl_do_forms();
if (pObject == pFileDlgForm->Ready) {
if (pObject == pFileDlgForm->Ready) {
if (HandleOK())
return x_sync_kludge(true);
@ -709,7 +709,7 @@ int FileDialog::Private::CancelCB(FL_FORM *, void *)
{
// Simulate a click on the cancel button
pCurrentDlg->Force(true);
return FL_IGNORE;
return FL_IGNORE;
}

2
src/frontends/xforms/FormForks.C
View File

@ -44,7 +44,7 @@ void FormForks::build() {
fl_clear_browser(dialog_->browser_children);
fl_clear_browser(dialog_->browser_kill);
// Manage the ok, apply, restore and cancel/close buttons
// Manage the ok, apply, restore and cancel/close buttons
bc().setOK(dialog_->button_ok);
bc().setApply(dialog_->button_apply);
bc().setCancel(dialog_->button_close);

128
src/frontends/xforms/FormGraphics.C
View File

@ -74,7 +74,7 @@ void FormGraphics::build()
// Allow the base class to control messages
setMessageWidget(dialog_->text_warning);
// Manage the ok, apply, restore and cancel/close buttons
// Manage the ok, apply, restore and cancel/close buttons
bc().setOK(dialog_->button_ok);
bc().setApply(dialog_->button_apply);
bc().setCancel(dialog_->button_close);
@ -309,7 +309,7 @@ void FormGraphics::update() {
fl_get_button(file_->check_subcaption));
fl_set_button(file_->check_rotate, igp.rotate);
fl_set_input(file_->input_rotate_angle,
tostr(igp.rotateAngle).c_str());
tostr(igp.rotateAngle).c_str());
if (igp.rotateOrigin.empty())
fl_set_choice(file_->choice_origin,1);
else
@ -338,7 +338,7 @@ void FormGraphics::update() {
case InsetGraphicsParams::NONE:
fl_set_button(lyxview_->radio_nodisplay, 1);
break;
}
}
updateWidgetsFromLength(lyxview_->input_lyxwidth,
lyxview_->choice_width_lyxwidth, igp.lyxwidth, defaultUnit);
updateWidgetsFromLength(lyxview_->input_lyxheight,
@ -438,7 +438,7 @@ void FormGraphics::update() {
fl_set_input(bbox_->input_bb_y1, bb.c_str());
}
fl_set_choice(bbox_->choice_bb_units, 1); // "pt"
} else { // get the values from the inset
} else { // get the values from the inset
lyxerr[Debug::GRAPHICS] << "update:: igp has BoundingBox" << endl;
controller().bbChanged = true;
LyXLength anyLength;
@ -485,75 +485,75 @@ ButtonPolicy::SMInput FormGraphics::input(FL_OBJECT * ob, long)
fl_set_input(file_->input_filename, out_name.c_str());
}
} else if (ob == file_->check_subcaption) {
setEnabled(file_->input_subcaption,
setEnabled(file_->input_subcaption,
fl_get_button(file_->check_subcaption));
} else if (ob == file_->check_rotate) {
setEnabled(file_->input_rotate_angle,
setEnabled(file_->input_rotate_angle,
fl_get_button(file_->check_rotate));
setEnabled(file_->choice_origin,
setEnabled(file_->choice_origin,
fl_get_button(file_->check_rotate));
// the lyxview section
} else if (ob == lyxview_->radio_lyxasis) {
setEnabled(lyxview_->input_lyxwidth, 0);
setEnabled(lyxview_->choice_width_lyxwidth, 0);
setEnabled(lyxview_->input_lyxheight, 0);
setEnabled(lyxview_->choice_width_lyxheight, 0);
setEnabled(lyxview_->input_lyxscale, 0);
setEnabled(lyxview_->input_lyxwidth, 0);
setEnabled(lyxview_->choice_width_lyxwidth, 0);
setEnabled(lyxview_->input_lyxheight, 0);
setEnabled(lyxview_->choice_width_lyxheight, 0);
setEnabled(lyxview_->input_lyxscale, 0);
} else if (ob == lyxview_->radio_lyxwh) {
setEnabled(lyxview_->input_lyxwidth, 1);
setEnabled(lyxview_->choice_width_lyxwidth, 1);
setEnabled(lyxview_->input_lyxheight, 1);
setEnabled(lyxview_->choice_width_lyxheight, 1);
setEnabled(lyxview_->input_lyxscale, 0);
setEnabled(lyxview_->input_lyxwidth, 1);
setEnabled(lyxview_->choice_width_lyxwidth, 1);
setEnabled(lyxview_->input_lyxheight, 1);
setEnabled(lyxview_->choice_width_lyxheight, 1);
setEnabled(lyxview_->input_lyxscale, 0);
} else if (ob == lyxview_->radio_lyxscale) {
setEnabled(lyxview_->input_lyxwidth, 0);
setEnabled(lyxview_->choice_width_lyxwidth, 0);
setEnabled(lyxview_->input_lyxheight, 0);
setEnabled(lyxview_->choice_width_lyxheight, 0);
setEnabled(lyxview_->input_lyxscale, 1);
setEnabled(lyxview_->input_lyxwidth, 0);
setEnabled(lyxview_->choice_width_lyxwidth, 0);
setEnabled(lyxview_->input_lyxheight, 0);
setEnabled(lyxview_->choice_width_lyxheight, 0);
setEnabled(lyxview_->input_lyxscale, 1);
} else if (ob == lyxview_->button_latex_values) {
if (contains(fl_get_choice_text(size_->choice_width_units),'%'))
Alert::alert(_("Warning!"),
_("The units t%, p%, c% and l% are not allowed here."),
_("Cannot use the values from LaTeX size!"));
else {
LyXLength dummy =
LyXLength dummy =
getLyXLengthFromWidgets(size_->input_width,
size_->choice_width_units);
updateWidgetsFromLength(lyxview_->input_lyxwidth,
updateWidgetsFromLength(lyxview_->input_lyxwidth,
lyxview_->choice_width_lyxwidth,
dummy, defaultUnit);
dummy = getLyXLengthFromWidgets(size_->input_height,
dummy = getLyXLengthFromWidgets(size_->input_height,
size_->choice_height_units);
updateWidgetsFromLength(lyxview_->input_lyxheight,
updateWidgetsFromLength(lyxview_->input_lyxheight,
lyxview_->choice_width_lyxheight,
dummy, defaultUnit);
string const scale = getStringFromInput(size_->input_scale);
fl_set_input(lyxview_->input_lyxscale, scale.c_str());
if (fl_get_button (size_->radio_asis) == 1) {
fl_set_button (lyxview_->radio_lyxasis, 1);
string const scale = getStringFromInput(size_->input_scale);
fl_set_input(lyxview_->input_lyxscale, scale.c_str());
if (fl_get_button (size_->radio_asis) == 1) {
fl_set_button (lyxview_->radio_lyxasis, 1);
setEnabled(lyxview_->input_lyxwidth, 0);
setEnabled(lyxview_->choice_width_lyxwidth, 0);
setEnabled(lyxview_->input_lyxheight, 0);
setEnabled(lyxview_->choice_width_lyxheight, 0);
setEnabled(lyxview_->input_lyxscale, 0);
} else if (fl_get_button (size_->radio_wh) == 1) {
fl_set_button (lyxview_->radio_lyxwh, 1);
setEnabled(lyxview_->input_lyxwidth, 1);
setEnabled(lyxview_->choice_width_lyxwidth, 1);
setEnabled(lyxview_->input_lyxheight, 1);
setEnabled(lyxview_->choice_width_lyxheight, 1);
setEnabled(lyxview_->input_lyxscale, 0);
} else if (fl_get_button (size_->radio_scale) ==1) {
fl_set_button (lyxview_->radio_lyxscale, 1);
setEnabled(lyxview_->input_lyxwidth, 0);
setEnabled(lyxview_->choice_width_lyxwidth, 0);
setEnabled(lyxview_->input_lyxheight, 0);
setEnabled(lyxview_->choice_width_lyxheight, 0);
setEnabled(lyxview_->input_lyxscale, 1);
}
setEnabled(lyxview_->choice_width_lyxwidth, 0);
setEnabled(lyxview_->input_lyxheight, 0);
setEnabled(lyxview_->choice_width_lyxheight, 0);
setEnabled(lyxview_->input_lyxscale, 0);
} else if (fl_get_button (size_->radio_wh) == 1) {
fl_set_button (lyxview_->radio_lyxwh, 1);
setEnabled(lyxview_->input_lyxwidth, 1);
setEnabled(lyxview_->choice_width_lyxwidth, 1);
setEnabled(lyxview_->input_lyxheight, 1);
setEnabled(lyxview_->choice_width_lyxheight, 1);
setEnabled(lyxview_->input_lyxscale, 0);
} else if (fl_get_button (size_->radio_scale) ==1) {
fl_set_button (lyxview_->radio_lyxscale, 1);
setEnabled(lyxview_->input_lyxwidth, 0);
setEnabled(lyxview_->choice_width_lyxwidth, 0);
setEnabled(lyxview_->input_lyxheight, 0);
setEnabled(lyxview_->choice_width_lyxheight, 0);
setEnabled(lyxview_->input_lyxscale, 1);
}
}
// the bb section
@ -586,26 +586,26 @@ ButtonPolicy::SMInput FormGraphics::input(FL_OBJECT * ob, long)
// the size section
} else if (ob == size_->radio_asis) {
setEnabled(size_->input_width, 0);
setEnabled(size_->choice_width_units, 0);
setEnabled(size_->input_height, 0);
setEnabled(size_->choice_height_units, 0);
setEnabled(size_->input_width, 0);
setEnabled(size_->choice_width_units, 0);
setEnabled(size_->input_height, 0);
setEnabled(size_->choice_height_units, 0);
setEnabled(size_->check_aspectratio, 0);
setEnabled(size_->input_scale, 0);
setEnabled(size_->input_scale, 0);
} else if (ob == size_->radio_wh) {
setEnabled(size_->input_width, 1);
setEnabled(size_->choice_width_units, 1);
setEnabled(size_->input_height, 1);
setEnabled(size_->choice_height_units, 1);
setEnabled(size_->input_width, 1);
setEnabled(size_->choice_width_units, 1);
setEnabled(size_->input_height, 1);
setEnabled(size_->choice_height_units, 1);
setEnabled(size_->check_aspectratio, 1);
setEnabled(size_->input_scale, 0);
setEnabled(size_->input_scale, 0);
} else if (ob == size_->radio_scale) {
setEnabled(size_->input_width, 0);
setEnabled(size_->choice_width_units, 0);
setEnabled(size_->input_height, 0);
setEnabled(size_->choice_height_units, 0);
setEnabled(size_->input_width, 0);
setEnabled(size_->choice_width_units, 0);
setEnabled(size_->input_height, 0);
setEnabled(size_->choice_height_units, 0);
setEnabled(size_->check_aspectratio, 0);
setEnabled(size_->input_scale, 1);
setEnabled(size_->input_scale, 1);
} else if (ob == size_->button_lyx_values) {
LyXLength dummy = getLyXLengthFromWidgets(lyxview_->input_lyxwidth,
lyxview_->choice_width_lyxwidth);

2
src/frontends/xforms/FormIndex.C
View File

@ -32,7 +32,7 @@ void FormIndex::build()
fl_set_input_return(dialog_->input_key, FL_RETURN_CHANGED);
setPrehandler(dialog_->input_key);
// Manage the ok, apply, restore and cancel/close buttons
// Manage the ok, apply, restore and cancel/close buttons
bc().setOK(dialog_->button_ok);
bc().setApply(dialog_->button_apply);
bc().setCancel(dialog_->button_close);

2
src/frontends/xforms/FormInset.h
View File

@ -61,7 +61,7 @@ protected:
/// pointer to the inset passed through showInset
InsetCommand * inset_;
/// the nitty-griity. What is modified and passed back
InsetCommandParams params;
InsetCommandParams params;
};
#endif

2
src/frontends/xforms/FormMathsDeco.C
View File

@ -44,7 +44,7 @@ FormMathsDeco::FormMathsDeco(LyXView * lv, Dialogs * d,
FL_FORM * FormMathsDeco::form() const
{
if (dialog_.get())
return dialog_->form;
return dialog_->form;
return 0;
}

2
src/frontends/xforms/FormMathsDelim.C
View File

@ -49,7 +49,7 @@ FormMathsDelim::FormMathsDelim(LyXView * lv, Dialogs * d,
FL_FORM * FormMathsDelim::form() const
{
if (dialog_.get())
return dialog_->form;
return dialog_->form;
return 0;
}

2
src/frontends/xforms/FormMathsMatrix.C
View File

@ -60,7 +60,7 @@ FormMathsMatrix::FormMathsMatrix(LyXView * lv, Dialogs * d,
FL_FORM * FormMathsMatrix::form() const
{
if (dialog_.get())
return dialog_->form;
return dialog_->form;
return 0;
}

2
src/frontends/xforms/FormMathsPanel.C
View File

@ -159,7 +159,7 @@ FormMathsPanel::FormMathsPanel(LyXView * lv, Dialogs * d)
FL_FORM * FormMathsPanel::form() const
{
if (dialog_.get())
return dialog_->form;
return dialog_->form;
return 0;
}

2
src/frontends/xforms/FormMathsSpace.C
View File

@ -30,7 +30,7 @@ FormMathsSpace::FormMathsSpace(LyXView * lv, Dialogs * d,
FL_FORM * FormMathsSpace::form() const
{
if (dialog_.get())
return dialog_->form;
return dialog_->form;
return 0;
}

2
src/frontends/xforms/FormMathsStyle.C
View File

@ -46,7 +46,7 @@ FormMathsStyle::FormMathsStyle(LyXView * lv, Dialogs * d,
FL_FORM * FormMathsStyle::form() const
{
if (dialog_.get())
return dialog_->form;
return dialog_->form;
return 0;
}

4
src/frontends/xforms/FormPreferences.C
View File

@ -1660,7 +1660,7 @@ void FormPreferences::Language::build()
// to use its address in a block-if statement.
// No it's not! Leads to crash.
// setPrehandler(
// reinterpret_cast<FL_OBJECT *>(combo_default_lang),
// reinterpret_cast<FL_OBJECT *>(combo_default_lang),
// C_FormPreferencesFeedbackCB);
setPrehandler(dialog_->input_kbmap1);
@ -2023,7 +2023,7 @@ void FormPreferences::OutputsMisc::update()
fl_set_input(dialog_->input_checktex,
lyxrc.chktex_command.c_str());
fl_set_input(dialog_->input_paperoption,
lyxrc.view_dvi_paper_option.c_str());
lyxrc.view_dvi_paper_option.c_str());
fl_set_button(dialog_->check_autoreset_classopt,
lyxrc.auto_reset_options);

4
src/frontends/xforms/FormPreferences.h
View File

@ -73,8 +73,8 @@ private:
virtual void build();
/// Pointer to the actual instantiation of the xforms form.
virtual FL_FORM * form() const;
/// control which feedback message is output
string const getFeedback(FL_OBJECT *);
/// control which feedback message is output
string const getFeedback(FL_OBJECT *);
///
void browse(FL_OBJECT * input,
string const & title, string const & pattern,

4
src/frontends/xforms/FormRef.C
View File

@ -39,7 +39,7 @@ void FormRef::build()
{
dialog_.reset(build_ref());
for (int i = 0; !InsetRef::types[i].latex_name.empty(); ++i)
for (int i = 0; !InsetRef::types[i].latex_name.empty(); ++i)
fl_addto_choice(dialog_->choice_type,
_(InsetRef::types[i].gui_name.c_str()));
@ -187,7 +187,7 @@ ButtonPolicy::SMInput FormRef::input(FL_OBJECT * ob, long)
at_ref_ = !at_ref_;
if (at_ref_) {
controller().gotoRef(fl_get_input(dialog_->input_ref));
fl_set_object_label(dialog_->button_go, _("Go back"));
fl_set_object_label(dialog_->button_go, _("Go back"));
} else {
controller().gotoBookmark();
fl_set_object_label(dialog_->button_go,

2
src/frontends/xforms/FormSendto.C
View File

@ -37,7 +37,7 @@ void FormSendto::build()
fl_set_input_return(dialog_->input_command, FL_RETURN_CHANGED);
setPrehandler(dialog_->input_command);
// Manage the ok, apply, restore and cancel/close buttons
// Manage the ok, apply, restore and cancel/close buttons
bc().setOK(dialog_->button_ok);
bc().setApply(dialog_->button_apply);
bc().setCancel(dialog_->button_close);

86
src/frontends/xforms/FormTabular.C
View File

@ -123,29 +123,29 @@ void FormTabular::build()
longtable_options_.reset(build_longtable_options());
fl_set_input_return(column_options_->input_column_width,
FL_RETURN_END);
FL_RETURN_END);
fl_set_input_return(column_options_->input_special_alignment,
FL_RETURN_END);
FL_RETURN_END);
setPrehandler(column_options_->input_column_width);
setPrehandler(column_options_->input_special_alignment);
fl_set_input_return(cell_options_->input_mcolumn_width,
FL_RETURN_END);
FL_RETURN_END);
fl_set_input_return(cell_options_->input_special_multialign,
FL_RETURN_END);
FL_RETURN_END);
setPrehandler(cell_options_->input_mcolumn_width);
setPrehandler(cell_options_->input_special_multialign);
fl_addto_tabfolder(dialog_->tabfolder, _("Tabular"),
tabular_options_->form);
tabular_options_->form);
fl_addto_tabfolder(dialog_->tabfolder, _("Column/Row"),
column_options_->form);
column_options_->form);
fl_addto_tabfolder(dialog_->tabfolder, _("Cell"),
cell_options_->form);
cell_options_->form);
fl_addto_tabfolder(dialog_->tabfolder, _("LongTable"),
longtable_options_->form);
longtable_options_->form);
// Create the contents of the unit choices
// Don't include the "%" terms...
@ -159,16 +159,16 @@ void FormTabular::build()
#else
vector<string>::iterator ret =
remove_if(units_vec.begin(), units_vec.end(),
bind2nd(contains_functor(), "%"));
bind2nd(contains_functor(), "%"));
units_vec.erase(ret, units_vec.end());
#endif
string units = getStringFromVector(units_vec, "|");
fl_addto_choice(column_options_->choice_value_column_width,
units.c_str());
units.c_str());
fl_addto_choice(cell_options_->choice_value_mcolumn_width,
units.c_str());
units.c_str());
}
@ -204,10 +204,10 @@ void FormTabular::update()
if (tabular->IsMultiColumn(cell)) {
fl_set_button(cell_options_->check_multicolumn, 1);
fl_set_button(cell_options_->check_border_top,
tabular->TopLine(cell)?1:0);
tabular->TopLine(cell)?1:0);
setEnabled(cell_options_->check_border_top, true);
fl_set_button(cell_options_->check_border_bottom,
tabular->BottomLine(cell)?1:0);
tabular->BottomLine(cell)?1:0);
setEnabled(cell_options_->check_border_bottom, true);
// pay attention to left/right lines they are only allowed
// to set if we are in first/last cell of row or if the left/right
@ -255,8 +255,8 @@ void FormTabular::update()
bool const metric = lyxrc.default_papersize > 3;
string const default_unit = metric ? "cm" : "in";
updateWidgetsFromLength(cell_options_->input_mcolumn_width,
cell_options_->choice_value_mcolumn_width,
pwidth, default_unit);
cell_options_->choice_value_mcolumn_width,
pwidth, default_unit);
if (!lv_->buffer()->isReadonly()) {
setEnabled(cell_options_->input_special_multialign, true);
@ -341,8 +341,8 @@ void FormTabular::update()
bool const metric = lyxrc.default_papersize > 3;
string const default_unit = metric ? "cm" : "in";
updateWidgetsFromLength(column_options_->input_column_width,
column_options_->choice_value_column_width,
pwidth, default_unit);
column_options_->choice_value_column_width,
pwidth, default_unit);
setEnabled(column_options_->input_column_width, !isReadonly);
setEnabled(column_options_->choice_value_column_width, !isReadonly);
@ -385,7 +385,7 @@ void FormTabular::update()
setEnabled(column_options_->radio_valign_center, !pwidth.zero());
fl_set_button(tabular_options_->check_longtable,
tabular->IsLongTabular());
tabular->IsLongTabular());
bool const enable = tabular->IsLongTabular();
@ -412,9 +412,9 @@ void FormTabular::update()
fl_set_button(longtable_options_->check_lt_head, row_set);
if (ltt.set) {
fl_set_button(longtable_options_->check_head_2border_above,
ltt.topDL);
ltt.topDL);
fl_set_button(longtable_options_->check_head_2border_above,
ltt.topDL);
ltt.topDL);
use_empty = true;
} else {
setEnabled(longtable_options_->check_head_2border_above, 0);
@ -430,9 +430,9 @@ void FormTabular::update()
fl_set_button(longtable_options_->check_lt_firsthead, row_set);
if (ltt.set && (!ltt.empty || !use_empty)) {
fl_set_button(longtable_options_->check_1head_2border_above,
ltt.topDL);
ltt.topDL);
fl_set_button(longtable_options_->check_1head_2border_above,
ltt.topDL);
ltt.topDL);
} else {
setEnabled(longtable_options_->check_1head_2border_above, 0);
setEnabled(longtable_options_->check_1head_2border_below, 0);
@ -449,9 +449,9 @@ void FormTabular::update()
fl_set_button(longtable_options_->check_lt_foot, row_set);
if (ltt.set) {
fl_set_button(longtable_options_->check_foot_2border_above,
ltt.topDL);
ltt.topDL);
fl_set_button(longtable_options_->check_foot_2border_above,
ltt.topDL);
ltt.topDL);
use_empty = true;
} else {
setEnabled(longtable_options_->check_foot_2border_above, 0);
@ -467,9 +467,9 @@ void FormTabular::update()
fl_set_button(longtable_options_->check_lt_lastfoot, row_set);
if (ltt.set && (!ltt.empty || !use_empty)) {
fl_set_button(longtable_options_->check_lastfoot_2border_above,
ltt.topDL);
ltt.topDL);
fl_set_button(longtable_options_->check_lastfoot_2border_above,
ltt.topDL);
ltt.topDL);
} else {
setEnabled(longtable_options_->check_lastfoot_2border_above,0);
setEnabled(longtable_options_->check_lastfoot_2border_below,0);
@ -477,13 +477,13 @@ void FormTabular::update()
fl_set_button(longtable_options_->check_lastfoot_2border_above, 0);
if (use_empty) {
fl_set_button(longtable_options_->check_lastfoot_empty,
ltt.empty);
ltt.empty);
if (ltt.empty)
setEnabled(longtable_options_->check_lt_lastfoot, 0);
}
}
fl_set_button(longtable_options_->check_lt_newpage,
tabular->GetLTNewPage(row));
tabular->GetLTNewPage(row));
} else {
fl_set_button(longtable_options_->check_lt_firsthead, 0);
fl_set_button(longtable_options_->check_1head_2border_above, 0);
@ -502,7 +502,7 @@ void FormTabular::update()
fl_set_button(longtable_options_->check_lt_newpage, 0);
}
fl_set_button(tabular_options_->check_rotate_tabular,
tabular->GetRotateTabular());
tabular->GetRotateTabular());
}
@ -532,7 +532,7 @@ bool FormTabular::input(FL_OBJECT * ob, long)
if (str1 != str2)
input(column_options_->input_column_width, 0);
str1 = getLengthFromWidgets(cell_options_->input_mcolumn_width,
cell_options_->choice_value_mcolumn_width);
cell_options_->choice_value_mcolumn_width);
llen = tabular->GetMColumnPWidth(cell);
if (llen.zero())
str2 = "";
@ -656,19 +656,19 @@ bool FormTabular::input(FL_OBJECT * ob, long)
num = LyXTabular::SET_USEBOX;
special = "2";
} else if ((ob == longtable_options_->check_lt_firsthead) ||
(ob == longtable_options_->check_1head_2border_above) ||
(ob == longtable_options_->check_1head_2border_below) ||
(ob == longtable_options_->check_1head_empty) ||
(ob == longtable_options_->check_lt_head) ||
(ob == longtable_options_->check_head_2border_above) ||
(ob == longtable_options_->check_head_2border_below) ||
(ob == longtable_options_->check_lt_foot) ||
(ob == longtable_options_->check_foot_2border_above) ||
(ob == longtable_options_->check_foot_2border_below) ||
(ob == longtable_options_->check_lt_lastfoot) ||
(ob == longtable_options_->check_lastfoot_2border_above) ||
(ob == longtable_options_->check_lastfoot_2border_below) ||
(ob == longtable_options_->check_lastfoot_empty)) {
(ob == longtable_options_->check_1head_2border_above) ||
(ob == longtable_options_->check_1head_2border_below) ||
(ob == longtable_options_->check_1head_empty) ||
(ob == longtable_options_->check_lt_head) ||
(ob == longtable_options_->check_head_2border_above) ||
(ob == longtable_options_->check_head_2border_below) ||
(ob == longtable_options_->check_lt_foot) ||
(ob == longtable_options_->check_foot_2border_above) ||
(ob == longtable_options_->check_foot_2border_below) ||
(ob == longtable_options_->check_lt_lastfoot) ||
(ob == longtable_options_->check_lastfoot_2border_above) ||
(ob == longtable_options_->check_lastfoot_2border_below) ||
(ob == longtable_options_->check_lastfoot_empty)) {
num = static_cast<LyXTabular::Feature>(checkLongtableOptions(ob, special));
} else if (ob == longtable_options_->check_lt_newpage) {
num = LyXTabular::SET_LTNEWPAGE;

2
src/frontends/xforms/FormTabularCreate.C
View File

@ -41,7 +41,7 @@ void FormTabularCreate::build()
fl_set_slider_precision(dialog_->slider_rows, 0);
fl_set_slider_precision(dialog_->slider_columns, 0);
// Manage the ok, apply and cancel/close buttons
// Manage the ok, apply and cancel/close buttons
bc().setOK(dialog_->button_ok);
bc().setApply(dialog_->button_apply);
bc().setCancel(dialog_->button_close);

2
src/frontends/xforms/FormToc.C
View File

@ -41,7 +41,7 @@ void FormToc::build()
" " + getStringFromVector(controller().getTypes(), " | ") + " ";
fl_addto_choice(dialog_->choice_toc_type, choice.c_str());
// Manage the cancel/close button
// Manage the cancel/close button
bc().setCancel(dialog_->button_close);
}

2
src/frontends/xforms/FormUrl.C
View File

@ -35,7 +35,7 @@ void FormUrl::build()
setPrehandler(dialog_->input_name);
setPrehandler(dialog_->input_url);
// Manage the ok, apply, restore and cancel/close buttons
// Manage the ok, apply, restore and cancel/close buttons
bc().setOK(dialog_->button_ok);
bc().setApply(dialog_->button_apply);
bc().setCancel(dialog_->button_close);

8
src/frontends/xforms/Menubar_pimpl.C
View File

@ -544,10 +544,10 @@ int Menubar::Pimpl::create_submenu(Window win, LyXView * view,
void Menubar::Pimpl::MenuCallback(FL_OBJECT * ob, long button)
{
ItemInfo * iteminfo = static_cast<ItemInfo *>(ob->u_vdata);
// lyxerr << "MenuCallback: ItemInfo address=" << iteminfo
// << "Val=(pimpl_=" << iteminfo->pimpl_
// << ", item_=" << iteminfo->item_
// << ", obj_=" << iteminfo->obj_ << ")" <<endl;
// lyxerr << "MenuCallback: ItemInfo address=" << iteminfo
// << "Val=(pimpl_=" << iteminfo->pimpl_
// << ", item_=" << iteminfo->item_
// << ", obj_=" << iteminfo->obj_ << ")" <<endl;
LyXView * view = iteminfo->pimpl_->owner_;
MenuItem const * item = iteminfo->item_.get();

8
src/frontends/xforms/Menubar_pimpl.h
View File

@ -51,11 +51,11 @@ public:
std::vector<int> & smn, Window win);
///
int create_submenu(Window win, LyXView * view,
string const & menuname,
std::vector<int> & smn);
string const & menuname,
std::vector<int> & smn);
/// update the state of the menuitems
void update() {}
/// update the state of the menuitems
void update() {}
private:
//
void makeMenubar(Menu const &menu);

1
src/frontends/xforms/RadioButtonGroup.C
View File

@ -116,4 +116,3 @@ int RadioButtonGroup::getButton()
// Else return 0.
return 0;
}

6
src/frontends/xforms/Toolbar_pimpl.h
View File

@ -46,13 +46,13 @@ public:
*/
void edit();
/// add a new button to the toolbar.
void add(int, bool doclean = true);
void add(int, bool doclean = true);
/// invokes the n'th icon in the toolbar
void push(int);
/// activates the toolbar
void activate();
void activate();
/// deactivates the toolbar
void deactivate();
void deactivate();
/// update the state of the icons
void update();

1
src/frontends/xforms/bmtable.h
View File

@ -97,4 +97,3 @@ void fl_free_bmtable_pixmap(FL_OBJECT *ob);
#endif
#endif /* BMTABLE_H */

14
src/frontends/xforms/combox.C
View File

@ -193,7 +193,7 @@ void Combox::add(int x, int y, int w, int hmin, int hmax,
fl_set_object_color(obj, FL_MCOL, FL_MCOL);
fl_set_object_dblbuffer(obj, 1);
fl_set_object_callback(obj, C_Combox_combo_cb, 0);
label = obj = fl_add_button(FL_NORMAL_TEXT, x, y, w-22, hmin, "");
label = obj = fl_add_button(FL_NORMAL_TEXT, x, y, w-22, hmin, "");
fl_set_object_boxtype(obj, FL_DOWN_BOX);
fl_set_object_color(obj, FL_MCOL, FL_BLACK);
fl_set_object_lalign(obj, FL_ALIGN_CENTER|FL_ALIGN_INSIDE);
@ -316,7 +316,7 @@ void Combox::show()
fl_set_form_position(form, x, y);
fl_show_form(form, FL_PLACE_POSITION, FL_NOBORDER, "");
if (sel > 0) {
if (sel > 0) {
fl_set_browser_topline(browser, sel);
fl_select_browser_line(browser, sel);
}
@ -339,23 +339,23 @@ void Combox::hide(int who)
fl_get_browser_line(browser, sel));
// if (callback) callback(sel, cb_arg);
}
XUngrabPointer(fl_get_display(), 0);
XUngrabPointer(fl_get_display(), 0);
XFlush(fl_get_display());
if (form) {
if (form) {
fl_hide_form(form);
XSetInputFocus(fl_get_display(), save_window,
RevertToParent, CurrentTime); // BUG-FIX-Dietmar
XFlush(fl_get_display());
}
}
if (button) {
if (type != FL_COMBOX_NORMAL) {
if (type != FL_COMBOX_NORMAL) {
fl_set_object_label(button, "@2->");
fl_redraw_object(button);
}
}
if (!who && browser && label && callback)
callback(sel, cb_arg, this);
if (_post) _post();
if (_post) _post();
}

14
src/frontends/xforms/combox.h
View File

@ -83,7 +83,7 @@ public:
/// Select an arbitrary item
void select(int);
///
bool select(string const &);
bool select(string const &);
/// Clear all the list
void clear();
@ -101,7 +101,7 @@ public:
*/
void setcallback(FL_COMBO_CB, void *);
/// Pre handler
/// Pre handler
void setpre(FL_COMBO_PRE_POST);
/// Post handler
void setpost(FL_COMBO_PRE_POST);
@ -115,7 +115,7 @@ public:
///
void deactivate();
///
void shortcut(string const &, int);
void shortcut(string const &, int);
///
void redraw();
///
@ -125,9 +125,9 @@ public:
///
static void input_cb(FL_OBJECT *, long);
///
static int peek_event(FL_FORM *, void *);
static int peek_event(FL_FORM *, void *);
protected:
/// At least Hide should not be public
/// At least Hide should not be public
void hide(int who = 0);
///
FL_OBJECT * browser;
@ -135,7 +135,7 @@ public:
///
combox_type type;
///
int bw;
int bw;
///
int bh;
///
@ -155,7 +155,7 @@ public:
///
FL_OBJECT * label;
///
FL_FORM* form;
FL_FORM* form;
///
FL_OBJECT * tabfolder1;
///

1
src/frontends/xforms/form_aboutlyx.C
View File

@ -126,4 +126,3 @@ FD_form_tab_license * FormAboutlyx::build_tab_license()
return fdui;
}
/*---------------------------------------*/

1
src/frontends/xforms/form_bibitem.C
View File

@ -56,4 +56,3 @@ FD_form_bibitem * FormBibitem::build_bibitem()
return fdui;
}
/*---------------------------------------*/

1
src/frontends/xforms/form_bibtex.C
View File

@ -74,4 +74,3 @@ FD_form_bibtex * FormBibtex::build_bibtex()
return fdui;
}
/*---------------------------------------*/

1
src/frontends/xforms/form_browser.C
View File

@ -50,4 +50,3 @@ FD_form_browser * FormBrowser::build_browser()
return fdui;
}
/*---------------------------------------*/

1
src/frontends/xforms/form_character.C
View File

@ -135,4 +135,3 @@ FD_form_character * FormCharacter::build_character()
return fdui;
}
/*---------------------------------------*/

1
src/frontends/xforms/form_citation.C
View File

@ -197,4 +197,3 @@ FD_form_citation * FormCitation::build_citation()
return fdui;
}
/*---------------------------------------*/

1
src/frontends/xforms/form_document.C
View File

@ -685,4 +685,3 @@ FD_form_doc_bullet * FormDocument::build_doc_bullet()
return fdui;
}
/*---------------------------------------*/

1
src/frontends/xforms/form_error.C
View File

@ -42,4 +42,3 @@ FD_form_error * FormError::build_error()
return fdui;
}
/*---------------------------------------*/

1
src/frontends/xforms/form_ert.C
View File

@ -79,4 +79,3 @@ FD_form_ert * FormERT::build_ert()
return fdui;
}
/*---------------------------------------*/

1
src/frontends/xforms/form_external.C
View File

@ -113,4 +113,3 @@ FD_form_external * FormExternal::build_external()
return fdui;
}
/*---------------------------------------*/

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