anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-06 00:10:59 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Dekel's lyxrc.example; Angus's FormDocument; John's build-listerrors; POTFILES.in and ext_l10n.h now handled by Makefile rules

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@1084 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Allan Rae 2000-10-05 07:57:00 +00:00
parent 8d463d54ce
commit 2c80c7bdd1
25 changed files with 684 additions and 699 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.cvsignore
View File

@ -8,3 +8,4 @@ acinclude.m4
aclocal.m4
lyx.1
libtool
lyx-*

49
ChangeLog
View File

@ -1,3 +1,52 @@
2000-10-05 Allan Rae <rae@lyx.org>
* src/BufferView_pimpl.C (buffer): don't hide all buffer dependent
dialogs when switching buffers update them instead. It's up to each
dialog to decide if it should still be visible or not.
update() should return a bool to control visiblity within show().
Or perhaps better to set a member variable and use that to control
visibility.
* lib/build-listerrors: create an empty "listerrors" file just to stop
make trying to regenerate it all the time if you don't have noweb
installed.
* .cvsignore: ignore distdir and dist.tar.gz using rule lyx-*
* po/Makefile.in.in (ext_l10n.h): added a rule to build
$(top_builddir)/src/ext_l10n.h. The rule has to go here because po/
is built before src/ and ext_l10n.h isn't actually needed to build lyx.
(POTFILES.in): added a rule to build POTFILES.in. It is also now safe
to rebuild POTFILES.in with scrap *.[hC] files in xforms/forms/.
* autogen.sh: po/POTFILES.in and src/ext_l10n.h now generated by make.
2000-10-04 Angus Leeming <a.leeming@ic.ac.uk>
* src/BufferView_pimpl.C (buffer): emit hideBufferDependent when
deleting buffer. Closes all buffer-dependent dialogs.
* src/frontends/xforms/FormBase.[Ch] (input): modified to pass
FL_OBJECT * also.
* src/frontends/xforms/FormCitation.[Ch]:
* src/frontends/xforms/FormPreferences.[Ch]:
* src/frontends/xforms/FormPrint.[Ch]:
* src/frontends/xforms/FormRef.[Ch]:
* src/frontends/xforms/FormUrl.[Ch]: ditto
* src/frontends/xforms/FormDocument.[Ch]:
* src/frontends/xforms/forms/form_document.C.patch:
* src/frontends/xforms/forms/form_document.fd: all input callbacks now
pass through a single input() function.
2000-10-04 John Levon <moz@compsoc.man.ac.uk>
* lib/build-listerrors: return status as OK
2000-10-04 Dekel Tsur <dekelts@tau.ac.il>
* lib/lyxrc.example: Updated to new export code
2000-10-04 Jean-Marc Lasgouttes <Jean-Marc.Lasgouttes@inria.fr>
* src/mathed/math_parser.C (LexInitCodes): set lexcode of "@" to

29
autogen.sh
View File

@ -33,15 +33,6 @@ for fil in config/libtool.m4 ; do
done
echo "done."
# Generate the ext_l10n.h
echo -n "Generate the ext_l10n file..."
rm -f src/ext_l10n.h
# first the ui file(s)
grep -i -E "submenu|item|optitem" < lib/ui/default.ui | cut -d '"' -f 2 | awk '{printf "_(\"%s\");\n", $0}' > src/ext_l10n.h
# then the layout files
cat lib/layouts/*.layout lib/layouts/*.inc | grep -i -E "[ ]*style .+$" | cut -d ' ' -f 2 | sort | uniq | awk '{printf "_(\"%s\");\n", $0}' >> src/ext_l10n.h
echo "done."
# Generate the Makefiles and configure files
if ( aclocal --version ) </dev/null > /dev/null 2>&1; then
echo -n "Building macros... "
@ -91,26 +82,6 @@ else
exit
fi
echo -n "Creating POTFILES.in... "
cat <<EOF > tmppot
#
# This file is automatically generated by autogen.sh. This command was
# used to extract the files from the sources:
#
# grep -E "_\(\".*\"\)" \`find src -name \*.[hHC]\` | \\
# awk 'BEGIN {FS= ":"} {print $1}' | sort | uniq
#
# This must be done when standing in lyx/
#
# This is all the files that contains internationalization strings.
EOF
grep -l -E "_\(\".*\"\)" `find src -name \*.[hHC]` | \
awk 'BEGIN {FS= ":"} {print $1}' | sort -f -d | uniq >> tmppot
mv tmppot po/POTFILES.in
echo "done"
echo
echo 'run "./configure ; make"'
echo

6
lib/build-listerrors
View File

@ -27,4 +27,10 @@ if [ -f $dir/examples/Literate.nw ]
then
mv $dir/examples/Literate.nw Literate.nw
which notangle 2>/dev/null && notangle -Rbuild-script Literate.nw | sh
else
# you don't have noweb installed so we'll produce a dummy file
# just so make doesn't keep trying to output it.
touch listerrors
fi
exit 0

128
lib/lyxrc.example
View File

@ -94,14 +94,6 @@
# seems slow to you, by uncommenting this line:
#\display_shortcuts false
# Define which program to use to view dvi files here.
# You can include any options you need by "quoting" the entire command.
# The default is "xdvi".
# Example: the next line would use xdvi and display with shrink 2:
#\view_dvi_command "xdvi -s 2"
# It can get more involved. Expert users might prefer something like:
#\view_dvi_command "xdvi -s 2 -expert -geometry 1014x720+0+0 -keep -margins 1.5"
# \view_dvi_paper_option allows to specify a paper option to the dvi
# viewer. By default LyX specifies the paper size of the document to
# the dvi viewer via the command line option -paper size, where size
@ -119,24 +111,6 @@
# executive, a3, a4, a5, or b5 as the default papersize.
#\default_papersize "a4"
# Define which program to use to view pdf files here.
# You can include any options you need by "quoting" the entire command
# The default is auto-detected, but you might want to override it.
# Usual values are: xpdf, acroread, gv, ghostscript.
# Warning: This option is not functional!
#\view_pdf_command "xpdf"
# Define which program to use to view postscript files here.
# You can include any options you need by "quoting" the entire command
# The default is auto-detected, but you might want to override it.
# It is possible to get nice anti-aliased text (slower, but as nice as
# xdvi) by using something like
#\view_ps_command "ghostview -swap -sDEVICE=x11alpha"
# Define which program to use to full screen view included postscript
# pictures. You can not include any options. The default is auto-detected.
#\view_pspic_command ghostview
# Define which program to use to use as postscript interpreter for included
# images.
# You can not include any options. The default is "gs" if it can be found.
@ -151,18 +125,6 @@
# Example: use this to ignore warnings about using "\ldots" instead of "..."
#\chktex_command "chktex -n11 -n1 -n3 -n6 -n9 -22 -n25 -n30 -n38"
# Define which program to use to translate latex to HTML.
# You should include options. The default is autodetected: the programs
# checked are tth, latex2html and hevea, and the default command lines
# used are:
#\html_command "tth -t < '$$FName' > '$$OutName'"
#\html_command "latex2html -no_subdir -split 0 -show_section_numbers '$$FName'"
#\html_command "hevea -s '$$FName'"
# The variable name $$FName is replaced with the name of the .tex
# file, and $$OutName is replaced with the name of the html file.
# Example: use this to let math be italic with tth.
#\html_command "tth -t -i < '$$FName' > '$$OutName'"
# Keyboard Mapping. Use this to set the correct mapping file for your
# keyboard, that is if you need one. You'll need one if you for instance
# want to type German documents on an American keyboard. In that case,
@ -375,50 +337,48 @@
#\print_collcopies_flag -c
#\print_adapt_output false
#
# EXPORT SECTION ########################################################
#
# The \converter command defines a converter between two formats.
# LyX uses the defined converters for generating output in varius formats.
# The converter command has 4 arguments: The source format, the target format,
# the command, and additional flags.
# For example, the following defines a DVI->Postscript converter:
#\converter dvi ps "dvips -o $$OutName $$FName" ""
# The variable name $$FName is replaced with the name of the source file,
# and $$OutName is replaced with the name of the target file.
# The flags argument is a list of comma separated flags.
# Known flags are
# - originaldir : The converter must be invoked in the directory of the lyx
# file and not in the temporary directory. This is needed for tex->html
# converters in order to be able to read the eps files.
# - needaux : The converted uses the .aux file, so we need to call latex
# before running the converter.
# - resultdir=dir : The converter put all the files in dir.
# Using "resultdir" is same as "resultdir=$$Basename".
# Note: When exporting, the whole directory will be moved from the temporary
# directory to the target directory.
# - resultfile=file : Name of main file in the result directory, for example
# "index.html" or "$$BaseName.html"
# If "resultfile" is omitted, the name of this file is assumed to be
# "index.format"
# For example:
# \converter tex html "latex2html -split 0 $$FName"
# "originaldir,needaux,resultdir"
# With this you can send a LyX-Document to a User-defined program. You
# can specify by adding the tag $$FName where the filename should be
# put on the defined command. if no $$FName is specified the file is
# sent in standard input (stdin). There is no default command
# specified. Example:
#\custom_export_command "kghostview $$FName"
#
# A more elaborate example to create pdf files with ps2pdf would be:
#\custom_export_command "ps2pdf '$$FName' `basename '$$FName' .ps_tmp`.pdf"
# This is the default for the type of contents to be sent to the export
# command: possible values are lyx, dvi, tex, ps and ascii.
#\custom_export_format ps
# The \viewer command is used to define viewers for new file-formats,
# or to change the already defined viewers.
# For example, to use xdvi as the viewer to dvi files use
#\viewer dvi "xdvi"
# It can get more involved. Expert users might prefer something like:
#\viewer dvi "xdvi -s 2 -expert -geometry 1014x720+0+0 -keep -margins 1.5"
#
# TEX SECTION ###########################################################
#
# LyX tries to auto-detect which command to use to invoke LaTeX(2e).
# If the auto-detection for some reasons fail, you can override it
# here:
#\latex_command latex2e
# The command used to generate pdf files directly from a latex file.
# A program that works in anyother way is not guarantied to work.
# Warning: This option is not functional!
#\pdflatex_command pdflatex
# The command used to generate postscript files from pdf files.
# Warning: This option is not functional!
#\pdf_to_ps_command pdf2ps
# If to use pdf as native export format instead of dvi. This makes LyX use
# pdflatex, pdf2ps and other utility programs. Default is false.
# Warning: This option is not functional!
#\pdf_mode false
# The font encoding used for the LaTeX2e fontenc package.
# T1 is highly recommended for non-English languages. LyX uses T1 as a
# default if you have the ec fonts installed on your system.
@ -426,37 +386,13 @@
# Choose "default" if T1 doesn't work for you for some reason:
#\font_encoding default
#
# LINUXDOC SECTION #######################################################
#
# If you want to pass extra flags to the LinuxDoc sgml scripts, insert them
# here.
# Example: the next line activates iso-latin1 support:
#\linuxdoc_to_latex_command "sgml2latex -c latin"
# Here you have the command to convert from linuxdoc to html.
# Example: one html file only.
#\linuxdoc_to_html_command "sgml2html -s 0 '$$FName'"
# The LinuxDoc to LyX converter
#\linuxdoc_to_lyx_command "sgml2lyx"
#
# DOCBOOK SECTION ########################################################
#
# Command to convert a docbook file to dvi
#\docbook_to_dvi_command "sgmltools -b dvi"
# Command to convert a docbook file to html
#\docbook_to_html_command "sgmltools -b html '$$FName'"
# Command to convert a docbook file to pdf
#\docbook_to_pdf_command ""
#
# FILE SECTION ##########################################################
#

28
po/Makefile.in.in
View File

@ -16,6 +16,8 @@ srcdir = @srcdir@
top_srcdir = @top_srcdir@
VPATH = @srcdir@
top_builddir = ..
prefix = @prefix@
exec_prefix = @exec_prefix@
datadir = $(prefix)/@DATADIRNAME@
@ -49,7 +51,9 @@ GMOFILES = @GMOFILES@
DISTFILES = ChangeLog Makefile.in.in POTFILES.in $(PACKAGE).pot \
stamp-cat-id $(POFILES) $(GMOFILES) $(SOURCES)
POTFILES = \
POTFILE_IN_DEPS := $(shell find $(top_srcdir)/src -name Makefile.am)
POTFILES = $(top_builddir)/src/ext_l10n.h \
CATALOGS = @CATALOGS@
CATOBJEXT = @CATOBJEXT@
@ -86,7 +90,7 @@ all-yes: cat-id-tbl.c $(CATALOGS)
all-no:
$(srcdir)/$(PACKAGE).pot: $(POTFILES)
$(XGETTEXT) --default-domain=$(PACKAGE) --directory=$(top_srcdir) \
$(XGETTEXT) --default-domain=$(PACKAGE) --directory=$(srcdir) \
--add-comments --keyword=_ --keyword=N_ \
--files-from=$(srcdir)/POTFILES.in \
&& test ! -f $(PACKAGE).po \
@ -107,6 +111,9 @@ $(srcdir)/stamp-cat-id: $(PACKAGE).pot
fi
cd $(srcdir) && rm -f stamp-cat-id && echo timestamp > stamp-cat-id
$(top_builddir)/src/ext_l10n.h: $(top_srcdir)/lib/layouts/*.layout $(top_srcdir)/lib/layouts/*.inc $(top_srcdir)/lib/ui/default.ui
grep -i -E "submenu|item|optitem" < $(top_srcdir)/lib/ui/default.ui | cut -d '"' -f 2 | awk '{printf "_(\"%s\");\n", $$0}' > $@
cat $(top_srcdir)/lib/layouts/*.layout $(top_srcdir)/lib/layouts/*.inc | grep -i -E "[ ]*style .+$$" | cut -d ' ' -f 2 | sort | uniq | awk '{printf "_(\"%s\");\n", $$0}' >> $@
install: install-exec install-data
install-exec:
@ -228,15 +235,16 @@ update-po: Makefile
fi; \
done
POTFILES.in: $(top_builddir)/src/ext_l10n.h $(POTFILE_IN_DEPS)
grep -l -E "_\(\".*\"\)" `find $(top_srcdir)/src -name \*.[hHC]` $< | \
awk 'BEGIN {FS= ":"} {print $$1}' | sed -e '/xforms.forms/d' | \
sort -f -d | uniq > POTFILES.in
POTFILES: POTFILES.in
( if test 'x$(srcdir)' != 'x.'; then \
posrcprefix='$(top_srcdir)/'; \
else \
posrcprefix="../"; \
fi; \
rm -f $@-t $@ \
&& (sed -e '/^#/d' -e '/^[ ]*$$/d' \
-e "s@.*@ $$posrcprefix& \\\\@" < $(srcdir)/$@.in \
( rm -f $@-t $@ \
&& (sed < $(srcdir)/$@.in \
-e '/^#/d' -e '/^[ ]*$$/d' \
-e "s@.*@ & \\\\@" \
| sed -e '$$s/\\$$//') > $@-t \
&& chmod a-w $@-t \
&& mv $@-t $@ )

265
po/POTFILES.in
View File

@ -1,138 +1,127 @@
#
# This file is automatically generated by autogen.sh. This command was
# used to extract the files from the sources:
#
# grep -E "_\(\".*\"\)" `find src -name \*.[hHC]` | \
# awk 'BEGIN {FS= ":"} {print }' | sort | uniq
#
# This must be done when standing in lyx/
#
# This is all the files that contains internationalization strings.
src/buffer.C
src/bufferlist.C
src/BufferView2.C
src/bufferview_funcs.C
src/BufferView_pimpl.C
src/Chktex.C
src/ColorHandler.C
src/combox.C
src/converter.C
src/credits.C
src/credits_form.C
src/CutAndPaste.C
src/exporter.C
src/ext_l10n.h
src/filedlg.C
src/FontLoader.C
src/form1.C
src/frontends/gnome/FormCitation.C
src/frontends/gnome/FormIndex.C
src/frontends/gnome/FormPrint.C
src/frontends/gnome/FormToc.C
src/frontends/gnome/FormUrl.C
src/frontends/gnome/Menubar_pimpl.C
src/frontends/kde/FormCitation.C
src/frontends/kde/formcitationdialog.C
src/frontends/kde/FormCopyright.C
src/frontends/kde/FormIndex.C
src/frontends/kde/formindexdialog.C
src/frontends/kde/FormRef.C
src/frontends/kde/formrefdialog.C
src/frontends/kde/FormToc.C
src/frontends/kde/formtocdialog.C
src/frontends/kde/FormUrl.C
src/frontends/kde/formurldialog.C
src/frontends/xforms/FormBase.h
src/frontends/xforms/FormCitation.C
src/frontends/xforms/form_citation.C
src/frontends/xforms/FormCopyright.C
src/frontends/xforms/form_copyright.C
src/frontends/xforms/FormDocument.C
src/frontends/xforms/form_document.C
src/frontends/xforms/FormError.C
src/frontends/xforms/form_error.C
src/frontends/xforms/FormGraphics.C
src/frontends/xforms/form_graphics.C
src/frontends/xforms/FormIndex.C
src/frontends/xforms/form_index.C
src/frontends/xforms/FormParagraph.C
src/frontends/xforms/form_paragraph.C
src/frontends/xforms/FormPreferences.C
src/frontends/xforms/form_preferences.C
src/frontends/xforms/FormPrint.C
src/frontends/xforms/form_print.C
src/frontends/xforms/FormRef.C
src/frontends/xforms/form_ref.C
src/frontends/xforms/FormTabular.C
src/frontends/xforms/form_tabular.C
src/frontends/xforms/FormToc.C
src/frontends/xforms/form_toc.C
src/frontends/xforms/FormUrl.C
src/frontends/xforms/form_url.C
src/frontends/xforms/Menubar_pimpl.C
src/gettext.h
src/insets/figinset.C
src/insets/form_graphics.C
src/insets/insetbib.C
src/insets/inset.C
src/insets/inseterror.C
src/insets/insetert.C
src/insets/insetexternal.C
src/insets/insetfloat.C
src/insets/insetfoot.C
src/insets/insetgraphics.C
src/insets/insetinclude.C
src/insets/insetindex.C
src/insets/insetinfo.C
src/insets/insetlabel.C
src/insets/insetlist.C
src/insets/insetmarginal.C
src/insets/insetminipage.C
src/insets/insetparent.C
src/insets/insettabular.C
src/insets/insettext.C
src/insets/insettheorem.C
src/insets/insettoc.C
src/insets/inseturl.C
src/intl.C
src/kbsequence.C
src/language.C
src/LaTeX.C
src/LaTeXLog.C
src/layout.C
src/layout_forms.C
src/LColor.C
src/log_form.C
src/LyXAction.C
src/lyx.C
src/lyx_cb.C
src/lyxfont.C
src/lyxfr0.C
src/lyxfr1.C
src/lyxfunc.C
src/lyx_gui.C
src/lyx_gui_misc.C
src/lyx_main.C
src/lyx_sendfax.C
src/lyx_sendfax_main.C
src/LyXSendto.C
src/lyxvc.C
src/LyXView.C
src/mathed/formula.C
src/mathed/formulamacro.C
src/mathed/math_forms.C
src/mathed/math_panel.C
src/MenuBackend.C
src/minibuffer.C
src/paragraph.C
src/print_form.C
src/spellchecker.C
src/sp_form.C
src/support/filetools.C
src/support/getUserName.C
src/support/path.C
src/support/path.h
src/tabular.C
src/text2.C
src/text.C
../src/buffer.C
../src/bufferlist.C
../src/BufferView2.C
../src/bufferview_funcs.C
../src/BufferView_pimpl.C
../src/Chktex.C
../src/ColorHandler.C
../src/combox.C
../src/converter.C
../src/credits.C
../src/credits_form.C
../src/CutAndPaste.C
../src/exporter.C
../src/ext_l10n.h
../src/filedlg.C
../src/FontLoader.C
../src/form1.C
../src/frontends/gnome/FormCitation.C
../src/frontends/gnome/FormIndex.C
../src/frontends/gnome/FormPrint.C
../src/frontends/gnome/FormToc.C
../src/frontends/gnome/FormUrl.C
../src/frontends/gnome/Menubar_pimpl.C
../src/frontends/kde/FormCitation.C
../src/frontends/kde/formcitationdialog.C
../src/frontends/kde/FormCopyright.C
../src/frontends/kde/FormIndex.C
../src/frontends/kde/formindexdialog.C
../src/frontends/kde/FormRef.C
../src/frontends/kde/formrefdialog.C
../src/frontends/kde/FormToc.C
../src/frontends/kde/formtocdialog.C
../src/frontends/kde/FormUrl.C
../src/frontends/kde/formurldialog.C
../src/frontends/xforms/FormBase.h
../src/frontends/xforms/FormCitation.C
../src/frontends/xforms/form_citation.C
../src/frontends/xforms/FormCopyright.C
../src/frontends/xforms/form_copyright.C
../src/frontends/xforms/FormDocument.C
../src/frontends/xforms/form_document.C
../src/frontends/xforms/FormError.C
../src/frontends/xforms/form_error.C
../src/frontends/xforms/FormGraphics.C
../src/frontends/xforms/form_graphics.C
../src/frontends/xforms/FormIndex.C
../src/frontends/xforms/form_index.C
../src/frontends/xforms/FormParagraph.C
../src/frontends/xforms/form_paragraph.C
../src/frontends/xforms/FormPreferences.C
../src/frontends/xforms/form_preferences.C
../src/frontends/xforms/FormPrint.C
../src/frontends/xforms/form_print.C
../src/frontends/xforms/FormRef.C
../src/frontends/xforms/form_ref.C
../src/frontends/xforms/FormTabular.C
../src/frontends/xforms/form_tabular.C
../src/frontends/xforms/FormToc.C
../src/frontends/xforms/form_toc.C
../src/frontends/xforms/FormUrl.C
../src/frontends/xforms/form_url.C
../src/frontends/xforms/Menubar_pimpl.C
../src/gettext.h
../src/insets/figinset.C
../src/insets/form_graphics.C
../src/insets/insetbib.C
../src/insets/inset.C
../src/insets/inseterror.C
../src/insets/insetert.C
../src/insets/insetexternal.C
../src/insets/insetfloat.C
../src/insets/insetfoot.C
../src/insets/insetgraphics.C
../src/insets/insetinclude.C
../src/insets/insetindex.C
../src/insets/insetinfo.C
../src/insets/insetlabel.C
../src/insets/insetlist.C
../src/insets/insetmarginal.C
../src/insets/insetminipage.C
../src/insets/insetparent.C
../src/insets/insettabular.C
../src/insets/insettext.C
../src/insets/insettheorem.C
../src/insets/insettoc.C
../src/insets/inseturl.C
../src/intl.C
../src/kbsequence.C
../src/language.C
../src/LaTeX.C
../src/LaTeXLog.C
../src/layout.C
../src/layout_forms.C
../src/LColor.C
../src/log_form.C
../src/LyXAction.C
../src/lyx.C
../src/lyx_cb.C
../src/lyxfont.C
../src/lyxfr0.C
../src/lyxfr1.C
../src/lyxfunc.C
../src/lyx_gui.C
../src/lyx_gui_misc.C
../src/lyx_main.C
../src/lyx_sendfax.C
../src/lyx_sendfax_main.C
../src/LyXSendto.C
../src/lyxvc.C
../src/LyXView.C
../src/mathed/formula.C
../src/mathed/formulamacro.C
../src/mathed/math_forms.C
../src/mathed/math_panel.C
../src/MenuBackend.C
../src/minibuffer.C
../src/paragraph.C
../src/print_form.C
../src/spellchecker.C
../src/sp_form.C
../src/support/filetools.C
../src/support/getUserName.C
../src/support/path.C
../src/support/path.h
../src/tabular.C
../src/text2.C
../src/text.C

3
src/BufferView_pimpl.C
View File

@ -143,6 +143,9 @@ void BufferView::Pimpl::buffer(Buffer * b)
delete screen_;
screen_ = 0;
// Similarly, buffer-dependent dialogs should be updated.
owner_->getDialogs()->updateBufferDependent();
// If we are closing the buffer, use the first buffer as current
if (!buffer_) {
buffer_ = bufferlist.first();

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

@ -145,7 +145,7 @@ void FormBase::CancelCB(FL_OBJECT * ob, long)
void FormBase::InputCB(FL_OBJECT * ob, long data )
{
FormBase * pre = static_cast<FormBase*>(ob->form->u_vdata);
pre->bc_.valid( pre->input( data ) );
pre->bc_.valid( pre->input( ob, data ) );
}

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

@ -80,7 +80,7 @@ protected:
/** Filter the inputs on callback from xforms
Return true if inputs are valid.
*/
virtual bool input( long ) {
virtual bool input( FL_OBJECT *, long ) {
return true;
}
/// Update dialog before showing it

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

@ -289,9 +289,9 @@ void FormCitation::setSize( int hbrsr, bool bibPresent ) const
#ifdef WITH_WARNINGS
#warning convert this to use the buttoncontroller
#endif
bool FormCitation::input( long data )
bool FormCitation::input( FL_OBJECT *, long data )
{
State cb = static_cast<FormCitation::State>( data );
State cb = static_cast<State>( data );
switch( cb ) {
case BIBBRSR:

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

@ -50,7 +50,7 @@ private:
/// Build the dialog
virtual void build();
/// Filter the inputs
virtual bool input( long );
virtual bool input( FL_OBJECT *, long );
/// Update dialog before showing it
virtual void update();
/// Apply from dialog (modify or create inset)

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

@ -21,7 +21,6 @@
#include "FormDocument.h"
#include "form_document.h"
#include "xform_macros.h"
#include "Dialogs.h"
#include "layout.h"
#include "combox.h"
@ -39,24 +38,12 @@
#include "CutAndPaste.h"
#include "bufferview_funcs.h"
#ifdef SIGC_CXX_NAMESPACES
using SigC::slot;
#endif
#ifdef CXX_WORKING_NAMESPACES
using Liason::setMinibuffer;
#endif
#define USE_CLASS_COMBO 1
C_GENERICCB(FormDocument, InputCB)
C_GENERICCB(FormDocument, ChoiceClassCB)
C_GENERICCB(FormDocument, BulletPanelCB)
C_GENERICCB(FormDocument, BulletDepthCB)
C_GENERICCB(FormDocument, InputBulletLaTeXCB)
C_GENERICCB(FormDocument, ChoiceBulletSizeCB)
FormDocument::FormDocument(LyXView * lv, Dialogs * d)
: FormBase(lv, d, BUFFER_DEPENDENT, _("Document Layout"),
new NoRepeatedApplyReadOnlyPolicy),
@ -300,6 +287,94 @@ void FormDocument::apply()
}
void FormDocument::cancel()
{
// this avoids confusion when reopening
BufferParams & param = lv_->buffer()->params;
param.temp_bullets[0] = param.user_defined_bullets[0];
param.temp_bullets[1] = param.user_defined_bullets[1];
param.temp_bullets[2] = param.user_defined_bullets[2];
param.temp_bullets[3] = param.user_defined_bullets[3];
hide();
}
void FormDocument::update()
{
if (!dialog_)
return;
checkReadOnly();
BufferParams const & params = lv_->buffer()->params;
class_update(params);
paper_update(params);
language_update(params);
options_update(params);
bullets_update(params);
}
bool FormDocument::input( FL_OBJECT * ob, long data )
{
State cb = static_cast<State>( data );
switch( cb ) {
case CHECKCHOICECLASS:
CheckChoiceClass(ob, 0);
break;
case CHOICEBULLETSIZE:
ChoiceBulletSize(ob, 0);
break;
case INPUTBULLETLATEX:
InputBulletLaTeX(ob, 0);
break;
case BULLETDEPTH1:
case BULLETDEPTH2:
case BULLETDEPTH3:
case BULLETDEPTH4:
BulletDepth(ob, cb);
break;
case BULLETPANEL1:
case BULLETPANEL2:
case BULLETPANEL3:
case BULLETPANEL4:
case BULLETPANEL5:
case BULLETPANEL6:
BulletPanel(ob, cb);
break;
case BULLETBMTABLE:
BulletBMTable(ob, 0);
break;
default:
break;
}
switch( data ) {
case INPUT:
case CHECKCHOICECLASS:
case CHOICEBULLETSIZE:
case INPUTBULLETLATEX:
case BULLETBMTABLE:
return CheckDocumentInput(ob, 0);
default:
break;
}
return true;
}
void FormDocument::ComboInputCB(int, void * v, Combox * combox)
{
FormDocument * pre = static_cast<FormDocument*>(v);
if (combox == pre->combo_doc_class)
pre->CheckChoiceClass(0, 0);
pre->bc_.valid(pre->CheckDocumentInput(0,0));
}
bool FormDocument::class_apply()
{
bool redo = false;
@ -541,35 +616,6 @@ void FormDocument::bullets_apply()
}
void FormDocument::cancel()
{
// this avoids confusion when reopening
BufferParams & param = lv_->buffer()->params;
param.temp_bullets[0] = param.user_defined_bullets[0];
param.temp_bullets[1] = param.user_defined_bullets[1];
param.temp_bullets[2] = param.user_defined_bullets[2];
param.temp_bullets[3] = param.user_defined_bullets[3];
hide();
}
void FormDocument::update()
{
if (!dialog_)
return;
checkReadOnly();
BufferParams const & params = lv_->buffer()->params;
class_update(params);
paper_update(params);
language_update(params);
options_update(params);
bullets_update(params);
}
void FormDocument::class_update(BufferParams const & params)
{
if (!class_)
@ -749,30 +795,6 @@ void FormDocument::bullets_update(BufferParams const & params)
}
void FormDocument::InputCB(FL_OBJECT * ob, long)
{
FormDocument * pre = static_cast<FormDocument*>(ob->form->u_vdata);
pre->bc_.valid(pre->CheckDocumentInput(ob,0));
}
void FormDocument::ComboInputCB(int, void * v, Combox * combox)
{
FormDocument * pre = static_cast<FormDocument*>(v);
if (combox == pre->combo_doc_class)
pre->CheckChoiceClass(0, 0);
pre->bc_.valid(pre->CheckDocumentInput(0,0));
}
void FormDocument::ChoiceClassCB(FL_OBJECT * ob, long)
{
FormDocument * pre = static_cast<FormDocument*>(ob->form->u_vdata);
pre->CheckChoiceClass(ob,0);
pre->bc_.valid(pre->CheckDocumentInput(ob,0));
}
void FormDocument::checkReadOnly()
{
if (bc_.readOnly(lv_->buffer()->isReadonly())) {
@ -895,14 +917,6 @@ bool FormDocument::CheckDocumentInput(FL_OBJECT * ob, long)
}
void FormDocument::ChoiceBulletSizeCB(FL_OBJECT * ob, long)
{
FormDocument * pre = static_cast<FormDocument*>(ob->form->u_vdata);
pre->ChoiceBulletSize(ob,0);
pre->bc_.valid(pre->CheckDocumentInput(ob,0));
}
void FormDocument::ChoiceBulletSize(FL_OBJECT * ob, long /*data*/ )
{
BufferParams & param = lv_->buffer()->params;
@ -914,14 +928,6 @@ void FormDocument::ChoiceBulletSize(FL_OBJECT * ob, long /*data*/ )
}
void FormDocument::InputBulletLaTeXCB(FL_OBJECT * ob, long)
{
FormDocument * pre = static_cast<FormDocument*>(ob->form->u_vdata);
pre->InputBulletLaTeX(ob,0);
pre->bc_.valid(pre->CheckDocumentInput(ob,0));
}
void FormDocument::InputBulletLaTeX(FL_OBJECT *, long)
{
BufferParams & param = lv_->buffer()->params;
@ -931,14 +937,7 @@ void FormDocument::InputBulletLaTeX(FL_OBJECT *, long)
}
void FormDocument::BulletDepthCB(FL_OBJECT * ob, long data)
{
FormDocument * pre = static_cast<FormDocument*>(ob->form->u_vdata);
pre->BulletDepth(ob, data);
}
void FormDocument::BulletDepth(FL_OBJECT * ob, long data)
void FormDocument::BulletDepth(FL_OBJECT * ob, State cb)
{
/* Should I do the following: */
/* 1. change to the panel that the current bullet belongs in */
@ -950,9 +949,19 @@ void FormDocument::BulletDepth(FL_OBJECT * ob, long data)
/* maybe try to support the others later */
BufferParams & param = lv_->buffer()->params;
int data;
if( cb == BULLETDEPTH1 )
data = 0;
else if ( cb == BULLETDEPTH2 )
data = 1;
else if ( cb == BULLETDEPTH3 )
data = 2;
else if ( cb == BULLETDEPTH4 )
data = 3;
switch (fl_get_button_numb(ob)) {
case 3:
// right mouse button resets to default
// right mouse button resets to default
param.temp_bullets[data] = ITEMIZE_DEFAULTS[data];
default:
current_bullet_depth = data;
@ -964,18 +973,25 @@ void FormDocument::BulletDepth(FL_OBJECT * ob, long data)
}
void FormDocument::BulletPanelCB(FL_OBJECT * ob, long data)
{
FormDocument * pre = static_cast<FormDocument*>(ob->form->u_vdata);
pre->BulletPanel(ob,data);
}
void FormDocument::BulletPanel(FL_OBJECT * /*ob*/, long data)
void FormDocument::BulletPanel(FL_OBJECT * /*ob*/, State cb)
{
/* Here we have to change the background pixmap to that selected */
/* by the user. (eg. standard.xpm, psnfss1.xpm etc...) */
int data;
if( cb == BULLETPANEL1 )
data = 0;
else if ( cb == BULLETPANEL2 )
data = 1;
else if ( cb == BULLETPANEL3 )
data = 2;
else if ( cb == BULLETPANEL4 )
data = 3;
else if ( cb == BULLETPANEL5 )
data = 4;
else if ( cb == BULLETPANEL6 )
data = 5;
if (data != current_bullet_panel) {
fl_freeze_form(bullets_->form);
current_bullet_panel = data;
@ -983,24 +999,24 @@ void FormDocument::BulletPanel(FL_OBJECT * /*ob*/, long data)
/* free the current pixmap */
fl_free_bmtable_pixmap(bullets_->bmtable_bullet_panel);
string new_panel;
switch (data) {
switch (cb) {
/* display the new one */
case 0 :
case BULLETPANEL1 :
new_panel = "standard";
break;
case 1 :
case BULLETPANEL2 :
new_panel = "amssymb";
break;
case 2 :
case BULLETPANEL3 :
new_panel = "psnfss1";
break;
case 3 :
case BULLETPANEL4 :
new_panel = "psnfss2";
break;
case 4 :
case BULLETPANEL5 :
new_panel = "psnfss3";
break;
case 5 :
case BULLETPANEL6 :
new_panel = "psnfss4";
break;
default :
@ -1019,14 +1035,6 @@ void FormDocument::BulletPanel(FL_OBJECT * /*ob*/, long data)
}
void FormDocument::BulletBMTableCB(FL_OBJECT * ob, long)
{
FormDocument * pre = static_cast<FormDocument*>(ob->form->u_vdata);
pre->BulletBMTable(ob,0);
pre->bc_.valid(pre->CheckDocumentInput(ob,0));
}
void FormDocument::BulletBMTable(FL_OBJECT * ob, long /*data*/ )
{
/* handle the user input by setting the current bullet depth's pixmap */

248
src/frontends/xforms/FormDocument.h
View File

@ -37,123 +37,147 @@ struct FD_form_doc_bullet;
*/
class FormDocument : public FormBase {
public:
/// #FormDocument x(Communicator ..., Popups ...);#
FormDocument(LyXView *, Dialogs *);
///
~FormDocument();
/// this operates very differently to FormBase::InputCB
static void InputCB(FL_OBJECT *, long);
///
static void ComboInputCB(int, void *, Combox *);
///
static void ChoiceClassCB(FL_OBJECT *, long);
///
static void ChoiceBulletSizeCB(FL_OBJECT * ob, long);
///
static void InputBulletLaTeXCB(FL_OBJECT * ob, long);
///
static void BulletDepthCB(FL_OBJECT * ob, long);
///
static void BulletPanelCB(FL_OBJECT * ob, long);
///
static void BulletBMTableCB(FL_OBJECT * ob, long);
/// #FormDocument x(Communicator ..., Popups ...);#
FormDocument(LyXView *, Dialogs *);
///
~FormDocument();
///
static void ComboInputCB(int, void *, Combox *);
private:
///
bool CheckDocumentInput(FL_OBJECT * ob, long);
///
void ChoiceBulletSize(FL_OBJECT * ob, long);
///
void InputBulletLaTeX(FL_OBJECT * ob, long);
///
void BulletDepth(FL_OBJECT * ob, long);
///
void BulletPanel(FL_OBJECT * ob, long);
///
void BulletBMTable(FL_OBJECT * ob, long);
///
void checkMarginValues();
///
void checkReadOnly();
///
void CheckChoiceClass(FL_OBJECT * ob, long);
///
void UpdateLayoutDocument(BufferParams const & params);
///
enum State {
///
INPUT,
///
CHECKCHOICECLASS,
///
CHOICEBULLETSIZE,
///
INPUTBULLETLATEX,
///
BULLETDEPTH1,
///
BULLETDEPTH2,
///
BULLETDEPTH3,
///
BULLETDEPTH4,
///
BULLETPANEL1,
///
BULLETPANEL2,
///
BULLETPANEL3,
///
BULLETPANEL4,
///
BULLETPANEL5,
///
BULLETPANEL6,
///
BULLETBMTABLE
};
/// Build the dialog
virtual void build();
/// Filter the inputs
virtual bool input( FL_OBJECT *, long );
/// Update the popup.
virtual void update();
/// Apply from popup
virtual void apply();
/// Cancel from popup
virtual void cancel();
///
virtual void restore() {
update();
}
/// Update the popup.
virtual void update();
///
void paper_update(BufferParams const &);
///
void class_update(BufferParams const &);
///
void language_update(BufferParams const &);
///
void options_update(BufferParams const &);
///
void bullets_update(BufferParams const &);
/// Apply from popup
virtual void apply();
///
void paper_apply();
///
bool class_apply();
///
bool language_apply();
///
bool options_apply();
///
void bullets_apply();
/// Cancel from popup
virtual void cancel();
///
virtual void restore() {
update();
}
/// Build the popup
virtual void build();
///
virtual FL_FORM * form() const;
///
virtual FL_FORM * form() const;
/// Typedefinitions from the fdesign produced Header file
FD_form_tabbed_document * build_tabbed_document();
///
FD_form_doc_paper * build_doc_paper();
///
FD_form_doc_class * build_doc_class();
///
FD_form_doc_language * build_doc_language();
///
FD_form_doc_options * build_doc_options();
///
FD_form_doc_bullet * build_doc_bullet();
///
bool CheckDocumentInput(FL_OBJECT * ob, long);
///
void ChoiceBulletSize(FL_OBJECT * ob, long);
///
void InputBulletLaTeX(FL_OBJECT * ob, long);
///
void BulletDepth(FL_OBJECT * ob, State);
///
void BulletPanel(FL_OBJECT * ob, State);
///
void BulletBMTable(FL_OBJECT * ob, long);
///
void checkMarginValues();
///
void checkReadOnly();
///
void CheckChoiceClass(FL_OBJECT * ob, long);
///
void UpdateLayoutDocument(BufferParams const & params);
/// Real GUI implementation.
FD_form_tabbed_document * dialog_;
///
FD_form_doc_paper * paper_;
///
FD_form_doc_class * class_;
///
FD_form_doc_language * language_;
///
FD_form_doc_options * options_;
///
FD_form_doc_bullet * bullets_;
///
int ActCell;
///
int Confirmed;
///
int current_bullet_panel;
///
int current_bullet_depth;
///
FL_OBJECT * fbullet;
///
Combox * combo_language;
///
Combox * combo_doc_class;
///
void paper_update(BufferParams const &);
///
void class_update(BufferParams const &);
///
void language_update(BufferParams const &);
///
void options_update(BufferParams const &);
///
void bullets_update(BufferParams const &);
///
void paper_apply();
///
bool class_apply();
///
bool language_apply();
///
bool options_apply();
///
void bullets_apply();
/// Typedefinitions from the fdesign produced Header file
FD_form_tabbed_document * build_tabbed_document();
///
FD_form_doc_paper * build_doc_paper();
///
FD_form_doc_class * build_doc_class();
///
FD_form_doc_language * build_doc_language();
///
FD_form_doc_options * build_doc_options();
///
FD_form_doc_bullet * build_doc_bullet();
/// Real GUI implementation.
FD_form_tabbed_document * dialog_;
///
FD_form_doc_paper * paper_;
///
FD_form_doc_class * class_;
///
FD_form_doc_language * language_;
///
FD_form_doc_options * options_;
///
FD_form_doc_bullet * bullets_;
///
int ActCell;
///
int Confirmed;
///
int current_bullet_panel;
///
int current_bullet_depth;
///
FL_OBJECT * fbullet;
///
Combox * combo_language;
///
Combox * combo_doc_class;
};
#endif

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

@ -461,7 +461,7 @@ void FormPreferences::update()
}
bool FormPreferences::input(long)
bool FormPreferences::input(FL_OBJECT *, long)
{
bool activate = true;
//

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

@ -55,7 +55,7 @@ private:
/// Restore from dialog
virtual void restore();
/// Filter the inputs -- return true if entries are valid
virtual bool input(long);
virtual bool input(FL_OBJECT *, long);
/// Build the dialog
virtual void build();
///

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

@ -206,7 +206,7 @@ void FormPrint::update()
// It would be nice if we checked for cases like:
// Print only-odd-pages and from_page == an even number
//
bool FormPrint::input(long)
bool FormPrint::input(FL_OBJECT *, long)
{
bool activate = true;

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

@ -44,7 +44,7 @@ private:
/// Apply from dialog
virtual void apply();
/// Filter the inputs
virtual bool input(long);
virtual bool input(FL_OBJECT *, long);
///
virtual void connect();
/// Pointer to the actual instantiation of the xform's form

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

@ -249,7 +249,7 @@ void FormRef::apply()
// Seems okay except that goref and goback shouldn't
// affect the status of ok.
#endif
bool FormRef::input( long data )
bool FormRef::input( FL_OBJECT *, long data )
{
bool activate( true );
switch( data ) {

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

@ -54,7 +54,7 @@ private:
/// Build the dialog
virtual void build();
/// Filter the input
virtual bool input( long );
virtual bool input( FL_OBJECT *, long );
/// Update dialog before showing it
virtual void update();
/// Not used but must be instantiated

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

@ -42,6 +42,13 @@ FormUrl::~FormUrl()
}
FL_FORM * FormUrl::form() const
{
if ( dialog_ ) return dialog_->form;
return 0;
}
void FormUrl::build()
{
dialog_ = build_url();
@ -52,13 +59,6 @@ void FormUrl::build()
}
FL_FORM * FormUrl::form() const
{
if ( dialog_ ) return dialog_->form;
return 0;
}
void FormUrl::update()
{
fl_set_form_minsize(form(), minw, minh);

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

@ -11,9 +11,6 @@
#include "FormDocument.h"
#include "bmtable.h"
#include "support/filetools.h"
#include "xform_macros.h"
C_GENERICCB(FormDocument, BulletBMTableCB)
FD_form_tabbed_document::~FD_form_tabbed_document()
{
@ -35,20 +32,20 @@ FD_form_tabbed_document * FormDocument::build_tabbed_document()
fdui->button_cancel = obj = fl_add_button(FL_NORMAL_BUTTON, 355, 410, 100, 30, idex(_("Cancel|^[")));
fl_set_button_shortcut(obj, scex(_("Cancel|^[")), 1);
fl_set_object_lsize(obj, FL_NORMAL_SIZE);
fl_set_object_callback(obj, C_FormBaseCancelCB, 0);
fl_set_object_callback(obj, C_FormBaseCancelCB, INPUT);
fdui->button_apply = obj = fl_add_button(FL_NORMAL_BUTTON, 245, 410, 100, 30, idex(_("Apply|#A")));
fl_set_button_shortcut(obj, scex(_("Apply|#A")), 1);
fl_set_object_lsize(obj, FL_NORMAL_SIZE);
fl_set_object_callback(obj, C_FormBaseApplyCB, 0);
fl_set_object_callback(obj, C_FormBaseApplyCB, INPUT);
fdui->button_ok = obj = fl_add_button(FL_RETURN_BUTTON, 135, 410, 100, 30, _("OK"));
fl_set_object_lsize(obj, FL_NORMAL_SIZE);
fl_set_object_callback(obj, C_FormBaseOKCB, 0);
fl_set_object_callback(obj, C_FormBaseOKCB, INPUT);
fdui->text_warning = obj = fl_add_text(FL_NORMAL_TEXT, 20, 380, 435, 30, "");
fl_set_object_lalign(obj, FL_ALIGN_LEFT|FL_ALIGN_INSIDE);
fdui->button_restore = obj = fl_add_button(FL_NORMAL_BUTTON, 10, 410, 100, 30, idex(_("Restore|#R")));
fl_set_button_shortcut(obj, scex(_("Restore|#R")), 1);
fl_set_object_lsize(obj, FL_NORMAL_SIZE);
fl_set_object_callback(obj, C_FormBaseRestoreCB, 0);
fl_set_object_callback(obj, C_FormBaseRestoreCB, INPUT);
fl_end_form();
fdui->form->fdui = fdui;
@ -79,7 +76,7 @@ FD_form_doc_paper * FormDocument::build_doc_paper()
fl_set_button_shortcut(obj, scex(_("Special:|#S")), 1);
fl_set_object_boxtype(obj, FL_FRAME_BOX);
fl_set_object_lsize(obj, FL_NORMAL_SIZE);
fl_set_object_callback(obj, C_FormDocumentInputCB, 0);
fl_set_object_callback(obj, C_FormBaseInputCB, INPUT);
obj = fl_add_frame(FL_ENGRAVED_FRAME, 230, 205, 200, 130, "");
fl_set_object_color(obj, FL_COL1, FL_COL1);
fl_set_object_lalign(obj, FL_ALIGN_TOP_LEFT);
@ -110,18 +107,18 @@ FD_form_doc_paper * FormDocument::build_doc_paper()
fdui->radio_portrait = obj = fl_add_checkbutton(FL_RADIO_BUTTON, 20, 90, 120, 30, idex(_("Portrait|#o")));
fl_set_button_shortcut(obj, scex(_("Portrait|#o")), 1);
fl_set_object_lsize(obj, FL_NORMAL_SIZE);
fl_set_object_callback(obj, C_FormDocumentInputCB, 0);
fl_set_object_callback(obj, C_FormBaseInputCB, INPUT);
fdui->radio_landscape = obj = fl_add_checkbutton(FL_RADIO_BUTTON, 20, 120, 120, 30, idex(_("Landscape|#L")));
fl_set_button_shortcut(obj, scex(_("Landscape|#L")), 1);
fl_set_object_lsize(obj, FL_NORMAL_SIZE);
fl_set_object_callback(obj, C_FormDocumentInputCB, 0);
fl_set_object_callback(obj, C_FormBaseInputCB, INPUT);
fl_end_group();
fdui->choice_papersize2 = obj = fl_add_choice(FL_NORMAL_CHOICE, 70, 15, 160, 30, idex(_("Papersize:|#P")));
fl_set_button_shortcut(obj, scex(_("Papersize:|#P")), 1);
fl_set_object_boxtype(obj, FL_FRAME_BOX);
fl_set_object_lsize(obj, FL_NORMAL_SIZE);
fl_set_object_callback(obj, C_FormDocumentInputCB, 0);
fl_set_object_callback(obj, C_FormBaseInputCB, INPUT);
obj = fl_add_text(FL_NORMAL_TEXT, 240, 75, 150, 20, _("Custom Papersize"));
fl_set_object_lsize(obj, FL_NORMAL_SIZE);
fl_set_object_lalign(obj, FL_ALIGN_LEFT|FL_ALIGN_INSIDE);
@ -129,43 +126,43 @@ FD_form_doc_paper * FormDocument::build_doc_paper()
fdui->push_use_geometry = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 20, 45, 170, 30, idex(_("Use Geometry Package|#U")));
fl_set_button_shortcut(obj, scex(_("Use Geometry Package|#U")), 1);
fl_set_object_lsize(obj, FL_NORMAL_SIZE);
fl_set_object_callback(obj, C_FormDocumentInputCB, 0);
fl_set_object_callback(obj, C_FormBaseInputCB, INPUT);
fdui->input_custom_width = obj = fl_add_input(FL_NORMAL_INPUT, 330, 100, 90, 30, idex(_("Width:|#W")));
fl_set_button_shortcut(obj, scex(_("Width:|#W")), 1);
fl_set_object_lsize(obj, FL_NORMAL_SIZE);
fl_set_object_callback(obj, C_FormDocumentInputCB, 0);
fl_set_object_callback(obj, C_FormBaseInputCB, INPUT);
fdui->input_custom_height = obj = fl_add_input(FL_NORMAL_INPUT, 330, 140, 90, 30, idex(_("Height:|#H")));
fl_set_button_shortcut(obj, scex(_("Height:|#H")), 1);
fl_set_object_lsize(obj, FL_NORMAL_SIZE);
fl_set_object_callback(obj, C_FormDocumentInputCB, 0);
fl_set_object_callback(obj, C_FormBaseInputCB, INPUT);
fdui->input_top_margin = obj = fl_add_input(FL_NORMAL_INPUT, 100, 175, 90, 30, idex(_("Top:|#T")));
fl_set_button_shortcut(obj, scex(_("Top:|#T")), 1);
fl_set_object_lsize(obj, FL_NORMAL_SIZE);
fl_set_object_callback(obj, C_FormDocumentInputCB, 0);
fl_set_object_callback(obj, C_FormBaseInputCB, INPUT);
fdui->input_bottom_margin = obj = fl_add_input(FL_NORMAL_INPUT, 100, 215, 90, 30, idex(_("Bottom:|#B")));
fl_set_button_shortcut(obj, scex(_("Bottom:|#B")), 1);
fl_set_object_lsize(obj, FL_NORMAL_SIZE);
fl_set_object_callback(obj, C_FormDocumentInputCB, 0);
fl_set_object_callback(obj, C_FormBaseInputCB, INPUT);
fdui->input_left_margin = obj = fl_add_input(FL_NORMAL_INPUT, 100, 255, 90, 30, idex(_("Left:|#e")));
fl_set_button_shortcut(obj, scex(_("Left:|#e")), 1);
fl_set_object_lsize(obj, FL_NORMAL_SIZE);
fl_set_object_callback(obj, C_FormDocumentInputCB, 0);
fl_set_object_callback(obj, C_FormBaseInputCB, INPUT);
fdui->input_right_margin = obj = fl_add_input(FL_NORMAL_INPUT, 100, 295, 90, 30, idex(_("Right:|#R")));
fl_set_button_shortcut(obj, scex(_("Right:|#R")), 1);
fl_set_object_lsize(obj, FL_NORMAL_SIZE);
fl_set_object_callback(obj, C_FormDocumentInputCB, 0);
fl_set_object_callback(obj, C_FormBaseInputCB, INPUT);
fdui->input_head_height = obj = fl_add_input(FL_NORMAL_INPUT, 330, 215, 90, 30, idex(_("Headheight:|#i")));
fl_set_button_shortcut(obj, scex(_("Headheight:|#i")), 1);
fl_set_object_lsize(obj, FL_NORMAL_SIZE);
fl_set_object_callback(obj, C_FormDocumentInputCB, 0);
fl_set_object_callback(obj, C_FormBaseInputCB, INPUT);
fdui->input_head_sep = obj = fl_add_input(FL_NORMAL_INPUT, 330, 255, 90, 30, idex(_("Headsep:|#d")));
fl_set_button_shortcut(obj, scex(_("Headsep:|#d")), 1);
fl_set_object_lsize(obj, FL_NORMAL_SIZE);
fl_set_object_callback(obj, C_FormDocumentInputCB, 0);
fl_set_object_callback(obj, C_FormBaseInputCB, INPUT);
fdui->input_foot_skip = obj = fl_add_input(FL_NORMAL_INPUT, 330, 295, 90, 30, idex(_("Footskip:|#F")));
fl_set_button_shortcut(obj, scex(_("Footskip:|#F")), 1);
fl_set_object_lsize(obj, FL_NORMAL_SIZE);
fl_set_object_callback(obj, C_FormDocumentInputCB, 0);
fl_set_object_callback(obj, C_FormBaseInputCB, INPUT);
fdui->text_warning = obj = fl_add_text(FL_NORMAL_TEXT, 10, 360, 420, 20, "");
fl_set_object_lsize(obj, FL_NORMAL_SIZE);
fl_set_object_lalign(obj, FL_ALIGN_LEFT|FL_ALIGN_INSIDE);
@ -206,49 +203,49 @@ FD_form_doc_class * FormDocument::build_doc_class()
fl_set_button_shortcut(obj, scex(_("Fonts:|#F")), 1);
fl_set_object_boxtype(obj, FL_FRAME_BOX);
fl_set_object_lsize(obj, FL_NORMAL_SIZE);
fl_set_object_callback(obj, C_FormDocumentInputCB, 0);
fl_set_object_callback(obj, C_FormBaseInputCB, INPUT);
fdui->choice_doc_fontsize = obj = fl_add_choice(FL_NORMAL_CHOICE, 120, 140, 160, 30, idex(_("Font Size:|#O")));
fl_set_button_shortcut(obj, scex(_("Font Size:|#O")), 1);
fl_set_object_boxtype(obj, FL_FRAME_BOX);
fl_set_object_lsize(obj, FL_NORMAL_SIZE);
fl_set_object_callback(obj, C_FormDocumentInputCB, 0);
fl_set_object_callback(obj, C_FormBaseInputCB, INPUT);
fdui->choice_doc_class = obj = fl_add_choice(FL_NORMAL_CHOICE, 120, 20, 160, 30, idex(_("Class:|#C")));
fl_set_button_shortcut(obj, scex(_("Class:|#C")), 1);
fl_set_object_boxtype(obj, FL_FRAME_BOX);
fl_set_object_lsize(obj, FL_NORMAL_SIZE);
fl_set_object_callback(obj, C_FormDocumentChoiceClassCB, 0);
fl_set_object_callback(obj, C_FormBaseInputCB, CHECKCHOICECLASS);
fdui->choice_doc_pagestyle = obj = fl_add_choice(FL_NORMAL_CHOICE, 120, 60, 160, 30, idex(_("Pagestyle:|#P")));
fl_set_button_shortcut(obj, scex(_("Pagestyle:|#P")), 1);
fl_set_object_boxtype(obj, FL_FRAME_BOX);
fl_set_object_lsize(obj, FL_NORMAL_SIZE);
fl_set_object_callback(obj, C_FormDocumentInputCB, 0);
fl_set_object_callback(obj, C_FormBaseInputCB, INPUT);
fdui->choice_doc_spacing = obj = fl_add_choice(FL_NORMAL_CHOICE, 120, 290, 160, 30, idex(_("Spacing|#g")));
fl_set_button_shortcut(obj, scex(_("Spacing|#g")), 1);
fl_set_object_boxtype(obj, FL_FRAME_BOX);
fl_set_object_lsize(obj, FL_NORMAL_SIZE);
fl_set_object_callback(obj, C_FormDocumentInputCB, 0);
fl_set_object_callback(obj, C_FormBaseInputCB, INPUT);
fdui->input_doc_extra = obj = fl_add_input(FL_NORMAL_INPUT, 120, 185, 160, 30, idex(_("Extra Options:|#X")));
fl_set_button_shortcut(obj, scex(_("Extra Options:|#X")), 1);
fl_set_object_lsize(obj, FL_NORMAL_SIZE);
fl_set_object_callback(obj, C_FormDocumentInputCB, 0);
fl_set_object_callback(obj, C_FormBaseInputCB, INPUT);
fdui->input_doc_skip = obj = fl_add_input(FL_NORMAL_INPUT, 220, 225, 60, 30, "");
fl_set_object_lsize(obj, FL_NORMAL_SIZE);
fl_set_object_callback(obj, C_FormDocumentInputCB, 0);
fl_set_object_callback(obj, C_FormBaseInputCB, INPUT);
fdui->choice_doc_skip = obj = fl_add_choice(FL_NORMAL_CHOICE, 120, 225, 90, 30, idex(_("Default Skip:|#u")));
fl_set_button_shortcut(obj, scex(_("Default Skip:|#u")), 1);
fl_set_object_boxtype(obj, FL_FRAME_BOX);
fl_set_object_lsize(obj, FL_NORMAL_SIZE);
fl_set_object_callback(obj, C_FormDocumentInputCB, 0);
fl_set_object_callback(obj, C_FormBaseInputCB, INPUT);
fdui->group_doc_sides = fl_bgn_group();
fdui->radio_doc_sides_one = obj = fl_add_checkbutton(FL_RADIO_BUTTON, 300, 30, 120, 30, idex(_("One|#n")));
fl_set_button_shortcut(obj, scex(_("One|#n")), 1);
fl_set_object_lsize(obj, FL_NORMAL_SIZE);
fl_set_object_callback(obj, C_FormDocumentInputCB, 0);
fl_set_object_callback(obj, C_FormBaseInputCB, INPUT);
fdui->radio_doc_sides_two = obj = fl_add_checkbutton(FL_RADIO_BUTTON, 300, 60, 120, 30, idex(_("Two|#T")));
fl_set_button_shortcut(obj, scex(_("Two|#T")), 1);
fl_set_object_lsize(obj, FL_NORMAL_SIZE);
fl_set_object_callback(obj, C_FormDocumentInputCB, 0);
fl_set_object_callback(obj, C_FormBaseInputCB, INPUT);
fl_end_group();
@ -256,11 +253,11 @@ FD_form_doc_class * FormDocument::build_doc_class()
fdui->radio_doc_columns_one = obj = fl_add_checkbutton(FL_RADIO_BUTTON, 300, 120, 110, 30, idex(_("One|#e")));
fl_set_button_shortcut(obj, scex(_("One|#e")), 1);
fl_set_object_lsize(obj, FL_NORMAL_SIZE);
fl_set_object_callback(obj, C_FormDocumentInputCB, 0);
fl_set_object_callback(obj, C_FormBaseInputCB, INPUT);
fdui->radio_doc_columns_two = obj = fl_add_checkbutton(FL_RADIO_BUTTON, 300, 150, 110, 30, idex(_("Two|#w")));
fl_set_button_shortcut(obj, scex(_("Two|#w")), 1);
fl_set_object_lsize(obj, FL_NORMAL_SIZE);
fl_set_object_callback(obj, C_FormDocumentInputCB, 0);
fl_set_object_callback(obj, C_FormBaseInputCB, INPUT);
fl_end_group();
@ -268,17 +265,17 @@ FD_form_doc_class * FormDocument::build_doc_class()
fdui->radio_doc_indent = obj = fl_add_checkbutton(FL_RADIO_BUTTON, 300, 210, 110, 30, idex(_("Indent|#I")));
fl_set_button_shortcut(obj, scex(_("Indent|#I")), 1);
fl_set_object_lsize(obj, FL_NORMAL_SIZE);
fl_set_object_callback(obj, C_FormDocumentInputCB, 0);
fl_set_object_callback(obj, C_FormBaseInputCB, INPUT);
fdui->radio_doc_skip = obj = fl_add_checkbutton(FL_RADIO_BUTTON, 300, 240, 110, 30, idex(_("Skip|#K")));
fl_set_button_shortcut(obj, scex(_("Skip|#K")), 1);
fl_set_object_lsize(obj, FL_NORMAL_SIZE);
fl_set_object_callback(obj, C_FormDocumentInputCB, 0);
fl_set_object_callback(obj, C_FormBaseInputCB, INPUT);
fl_set_button(obj, 1);
fl_end_group();
fdui->input_doc_spacing = obj = fl_add_input(FL_NORMAL_INPUT, 300, 290, 120, 30, "");
fl_set_object_lsize(obj, FL_NORMAL_SIZE);
fl_set_object_callback(obj, C_FormDocumentInputCB, 0);
fl_set_object_callback(obj, C_FormBaseInputCB, INPUT);
fl_end_form();
fdui->form->fdui = fdui;
@ -307,28 +304,28 @@ FD_form_doc_language * FormDocument::build_doc_language()
fl_set_button_shortcut(obj, scex(_("Encoding:|#D")), 1);
fl_set_object_boxtype(obj, FL_FRAME_BOX);
fl_set_object_lsize(obj, FL_NORMAL_SIZE);
fl_set_object_callback(obj, C_FormDocumentInputCB, 0);
fl_set_object_callback(obj, C_FormBaseInputCB, INPUT);
fdui->choice_quotes_language = obj = fl_add_choice(FL_NORMAL_CHOICE, 110, 140, 190, 30, idex(_("Type:|#T")));
fl_set_button_shortcut(obj, scex(_("Type:|#T")), 1);
fl_set_object_boxtype(obj, FL_FRAME_BOX);
fl_set_object_lsize(obj, FL_NORMAL_SIZE);
fl_set_object_callback(obj, C_FormDocumentInputCB, 0);
fl_set_object_callback(obj, C_FormBaseInputCB, INPUT);
fl_bgn_group();
fdui->radio_single = obj = fl_add_checkbutton(FL_RADIO_BUTTON, 110, 180, 90, 30, idex(_("Single|#S")));
fl_set_button_shortcut(obj, scex(_("Single|#S")), 1);
fl_set_object_lsize(obj, FL_NORMAL_SIZE);
fl_set_object_callback(obj, C_FormDocumentInputCB, 0);
fl_set_object_callback(obj, C_FormBaseInputCB, INPUT);
fdui->radio_double = obj = fl_add_checkbutton(FL_RADIO_BUTTON, 210, 180, 90, 30, idex(_("Double|#D")));
fl_set_button_shortcut(obj, scex(_("Double|#D")), 1);
fl_set_object_lsize(obj, FL_NORMAL_SIZE);
fl_set_object_callback(obj, C_FormDocumentInputCB, 0);
fl_set_object_callback(obj, C_FormBaseInputCB, INPUT);
fl_end_group();
fdui->choice_language = obj = fl_add_choice(FL_NORMAL_CHOICE, 120, 35, 190, 30, idex(_("Language:|#L")));
fl_set_button_shortcut(obj, scex(_("Language:|#L")), 1);
fl_set_object_boxtype(obj, FL_FRAME_BOX);
fl_set_object_lsize(obj, FL_NORMAL_SIZE);
fl_set_object_callback(obj, C_FormDocumentInputCB, 0);
fl_set_object_callback(obj, C_FormBaseInputCB, INPUT);
fl_end_form();
fdui->form->fdui = fdui;
@ -355,24 +352,24 @@ FD_form_doc_options * FormDocument::build_doc_options()
fdui->input_float_placement = obj = fl_add_input(FL_NORMAL_INPUT, 155, 60, 120, 30, idex(_("Float Placement:|#L")));
fl_set_button_shortcut(obj, scex(_("Float Placement:|#L")), 1);
fl_set_object_lsize(obj, FL_NORMAL_SIZE);
fl_set_object_callback(obj, C_FormDocumentInputCB, 0);
fl_set_object_callback(obj, C_FormBaseInputCB, INPUT);
fdui->slider_secnumdepth = obj = fl_add_counter(FL_SIMPLE_COUNTER, 155, 110, 80, 30, _("Section number depth"));
fl_set_object_lsize(obj, FL_NORMAL_SIZE);
fl_set_object_lalign(obj, FL_ALIGN_LEFT);
fl_set_object_callback(obj, C_FormDocumentInputCB, 0);
fl_set_object_callback(obj, C_FormBaseInputCB, INPUT);
fdui->slider_tocdepth = obj = fl_add_counter(FL_SIMPLE_COUNTER, 155, 150, 80, 30, _("Table of contents depth"));
fl_set_object_lsize(obj, FL_NORMAL_SIZE);
fl_set_object_lalign(obj, FL_ALIGN_LEFT);
fl_set_object_callback(obj, C_FormDocumentInputCB, 0);
fl_set_object_callback(obj, C_FormBaseInputCB, INPUT);
fdui->choice_postscript_driver = obj = fl_add_choice(FL_NORMAL_CHOICE, 155, 205, 190, 30, idex(_("PS Driver:|#S")));
fl_set_button_shortcut(obj, scex(_("PS Driver:|#S")), 1);
fl_set_object_boxtype(obj, FL_FRAME_BOX);
fl_set_object_lsize(obj, FL_NORMAL_SIZE);
fl_set_object_callback(obj, C_FormDocumentInputCB, 0);
fl_set_object_callback(obj, C_FormBaseInputCB, INPUT);
fdui->check_use_amsmath = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 140, 250, 200, 30, idex(_("Use AMS Math|#M")));
fl_set_button_shortcut(obj, scex(_("Use AMS Math|#M")), 1);
fl_set_object_lsize(obj, FL_NORMAL_SIZE);
fl_set_object_callback(obj, C_FormDocumentInputCB, 0);
fl_set_object_callback(obj, C_FormBaseInputCB, INPUT);
fl_end_form();
fdui->form->fdui = fdui;
@ -399,7 +396,7 @@ FD_form_doc_bullet * FormDocument::build_doc_bullet()
obj = fl_add_box(FL_FLAT_BOX, 0, 0, 440, 345, "");
fl_set_border_width(-3);
fdui->bmtable_bullet_panel = obj = fl_add_bmtable(1, 90, 105, 265, 180, "");
fl_set_object_callback(obj, C_FormDocumentBulletBMTableCB, 0);
fl_set_object_callback(obj, C_FormBaseInputCB, BULLETBMTABLE);
fl_set_object_lcol(obj, FL_BLUE);
fl_set_object_boxtype(obj, FL_UP_BOX);
fl_set_bmtable_pixmap_file(obj, 6, 6,
@ -413,31 +410,31 @@ FD_form_doc_bullet * FormDocument::build_doc_bullet()
fl_set_object_boxtype(obj, FL_FRAME_BOX);
fl_set_object_lsize(obj, FL_NORMAL_SIZE);
fl_set_object_lalign(obj, FL_ALIGN_TOP);
fl_set_object_callback(obj, C_FormDocumentChoiceBulletSizeCB, 0);
fl_set_object_callback(obj, C_FormBaseInputCB, CHOICEBULLETSIZE);
fdui->input_bullet_latex = obj = fl_add_input(FL_NORMAL_INPUT, 80, 300, 275, 30, idex(_("LaTeX|#L")));
fl_set_button_shortcut(obj, scex(_("LaTeX|#L")), 1);
fl_set_object_lsize(obj, FL_NORMAL_SIZE);
fl_set_object_lstyle(obj, FL_FIXED_STYLE);
fl_set_object_callback(obj, C_FormDocumentInputBulletLaTeXCB, 0);
fl_set_object_callback(obj, C_FormBaseInputCB, INPUTBULLETLATEX);
fdui->radio_bullet_depth = fl_bgn_group();
fdui->radio_bullet_depth_1 = obj = fl_add_button(FL_RADIO_BUTTON, 105, 35, 55, 40, idex(_("1|#1")));
fl_set_button_shortcut(obj, scex(_("1|#1")), 1);
fl_set_object_lsize(obj, FL_LARGE_SIZE);
fl_set_object_callback(obj, C_FormDocumentBulletDepthCB, 0);
fl_set_object_callback(obj, C_FormBaseInputCB, BULLETDEPTH1);
fl_set_button(obj, 1);
fdui->radio_bullet_depth_2 = obj = fl_add_button(FL_RADIO_BUTTON, 165, 35, 55, 40, idex(_("2|#2")));
fl_set_button_shortcut(obj, scex(_("2|#2")), 1);
fl_set_object_lsize(obj, FL_LARGE_SIZE);
fl_set_object_callback(obj, C_FormDocumentBulletDepthCB, 1);
fl_set_object_callback(obj, C_FormBaseInputCB, BULLETDEPTH2);
fdui->radio_bullet_depth_3 = obj = fl_add_button(FL_RADIO_BUTTON, 225, 35, 55, 40, idex(_("3|#3")));
fl_set_button_shortcut(obj, scex(_("3|#3")), 1);
fl_set_object_lsize(obj, FL_LARGE_SIZE);
fl_set_object_callback(obj, C_FormDocumentBulletDepthCB, 2);
fl_set_object_callback(obj, C_FormBaseInputCB, BULLETDEPTH3);
fdui->radio_bullet_depth_4 = obj = fl_add_button(FL_RADIO_BUTTON, 285, 35, 55, 40, idex(_("4|#4")));
fl_set_button_shortcut(obj, scex(_("4|#4")), 1);
fl_set_object_lsize(obj, FL_LARGE_SIZE);
fl_set_object_callback(obj, C_FormDocumentBulletDepthCB, 3);
fl_set_object_callback(obj, C_FormBaseInputCB, BULLETDEPTH4);
fl_end_group();
obj = fl_add_text(FL_NORMAL_TEXT, 105, 10, 85, 20, _("Bullet Depth"));
@ -449,33 +446,33 @@ FD_form_doc_bullet * FormDocument::build_doc_bullet()
fl_set_button_shortcut(obj, scex(_("Standard|#S")), 1);
fl_set_object_lsize(obj, FL_NORMAL_SIZE);
fl_set_object_resize(obj, FL_RESIZE_NONE);
fl_set_object_callback(obj, C_FormDocumentBulletPanelCB, 0);
fl_set_object_callback(obj, C_FormBaseInputCB, BULLETPANEL1);
fl_set_button(obj, 1);
fdui->radio_bullet_panel_maths = obj = fl_add_button(FL_RADIO_BUTTON, 15, 135, 65, 30, idex(_("Maths|#M")));
fl_set_button_shortcut(obj, scex(_("Maths|#M")), 1);
fl_set_object_lsize(obj, FL_NORMAL_SIZE);
fl_set_object_resize(obj, FL_RESIZE_NONE);
fl_set_object_callback(obj, C_FormDocumentBulletPanelCB, 1);
fl_set_object_callback(obj, C_FormBaseInputCB, BULLETPANEL2);
fdui->radio_bullet_panel_ding2 = obj = fl_add_button(FL_RADIO_BUTTON, 15, 195, 65, 30, idex(_("Ding 2|#i")));
fl_set_button_shortcut(obj, scex(_("Ding 2|#i")), 1);
fl_set_object_lsize(obj, FL_NORMAL_SIZE);
fl_set_object_resize(obj, FL_RESIZE_NONE);
fl_set_object_callback(obj, C_FormDocumentBulletPanelCB, 3);
fl_set_object_callback(obj, C_FormBaseInputCB, BULLETPANEL3);
fdui->radio_bullet_panel_ding3 = obj = fl_add_button(FL_RADIO_BUTTON, 15, 225, 65, 30, idex(_("Ding 3|#n")));
fl_set_button_shortcut(obj, scex(_("Ding 3|#n")), 1);
fl_set_object_lsize(obj, FL_NORMAL_SIZE);
fl_set_object_resize(obj, FL_RESIZE_NONE);
fl_set_object_callback(obj, C_FormDocumentBulletPanelCB, 4);
fl_set_object_callback(obj, C_FormBaseInputCB, BULLETPANEL4);
fdui->radio_bullet_panel_ding4 = obj = fl_add_button(FL_RADIO_BUTTON, 15, 255, 65, 30, idex(_("Ding 4|#g")));
fl_set_button_shortcut(obj, scex(_("Ding 4|#g")), 1);
fl_set_object_lsize(obj, FL_NORMAL_SIZE);
fl_set_object_resize(obj, FL_RESIZE_NONE);
fl_set_object_callback(obj, C_FormDocumentBulletPanelCB, 5);
fl_set_object_callback(obj, C_FormBaseInputCB, BULLETPANEL5);
fdui->radio_bullet_panel_ding1 = obj = fl_add_button(FL_RADIO_BUTTON, 15, 165, 65, 30, idex(_("Ding 1|#D")));
fl_set_button_shortcut(obj, scex(_("Ding 1|#D")), 1);
fl_set_object_lsize(obj, FL_NORMAL_SIZE);
fl_set_object_resize(obj, FL_RESIZE_NONE);
fl_set_object_callback(obj, C_FormDocumentBulletPanelCB, 2);
fl_set_object_callback(obj, C_FormBaseInputCB, BULLETPANEL6);
fl_end_group();
fl_end_form();

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

@ -10,19 +10,15 @@ extern "C" void C_FormBaseApplyCB(FL_OBJECT *, long);
extern "C" void C_FormBaseOKCB(FL_OBJECT *, long);
extern "C" void C_FormBaseRestoreCB(FL_OBJECT *, long);
extern "C" void C_FormDocumentInputCB(FL_OBJECT *, long);
extern "C" void C_FormBaseInputCB(FL_OBJECT *, long);
extern "C" void C_FormDocumentInputCB(FL_OBJECT *, long);
extern "C" void C_FormDocumentChoiceClassCB(FL_OBJECT *, long);
extern "C" void C_FormBaseInputCB(FL_OBJECT *, long);
extern "C" void C_FormDocumentInputCB(FL_OBJECT *, long);
extern "C" void C_FormBaseInputCB(FL_OBJECT *, long);
extern "C" void C_FormDocumentInputCB(FL_OBJECT *, long);
extern "C" void C_FormBaseInputCB(FL_OBJECT *, long);
extern "C" void C_FormDocumentChoiceBulletSizeCB(FL_OBJECT *, long);
extern "C" void C_FormDocumentInputBulletLaTeXCB(FL_OBJECT *, long);
extern "C" void C_FormDocumentBulletDepthCB(FL_OBJECT *, long);
extern "C" void C_FormDocumentBulletPanelCB(FL_OBJECT *, long);
extern "C" void C_FormBaseInputCB(FL_OBJECT *, long);
/**** Forms and Objects ****/

13
src/frontends/xforms/forms/form_document.C.patch
View File

@ -1,18 +1,15 @@
--- form_document.C.orig Mon Aug 14 13:17:32 2000
+++ form_document.C Mon Aug 14 13:22:59 2000
@@ -9,6 +9,11 @@
--- form_document.C Wed Oct 4 18:07:46 2000
+++ form_document.C.orig Wed Oct 4 18:07:23 2000
@@ -9,6 +9,8 @@
#include <stdlib.h>
#include "form_document.h"
#include "FormDocument.h"
+#include "bmtable.h"
+#include "support/filetools.h"
+#include "xform_macros.h"
+
+C_GENERICCB(FormDocument, BulletBMTableCB)
FD_form_tabbed_document::~FD_form_tabbed_document()
{
@@ -363,10 +365,18 @@
@@ -390,10 +392,18 @@
fdui->form = fl_bgn_form(FL_NO_BOX, 440, 345);
fdui->form->u_vdata = this;
@ -23,7 +20,7 @@
- fl_set_pixmapbutton_file(obj, _("/nfs/sinco/source/lyx/lyx-devel/lib/images/psnfss2.xpm"));
+ fl_set_border_width(-3);
+ fdui->bmtable_bullet_panel = obj = fl_add_bmtable(1, 90, 105, 265, 180, "");
+ fl_set_object_callback(obj, C_FormDocumentBulletBMTableCB, 0);
+ fl_set_object_callback(obj, C_FormBaseInputCB, BULLETBMTABLE);
+ fl_set_object_lcol(obj, FL_BLUE);
+ fl_set_object_boxtype(obj, FL_UP_BOX);
+ fl_set_bmtable_pixmap_file(obj, 6, 6,

212
src/frontends/xforms/forms/form_document.fd
View File

@ -65,7 +65,7 @@ resize: FL_RESIZE_ALL
gravity: FL_NoGravity FL_NoGravity
name: button_cancel
callback: C_FormBaseCancelCB
argument: 0
argument: INPUT
--------------------
class: FL_BUTTON
@ -83,7 +83,7 @@ resize: FL_RESIZE_ALL
gravity: FL_NoGravity FL_NoGravity
name: button_apply
callback: C_FormBaseApplyCB
argument: 0
argument: INPUT
--------------------
class: FL_BUTTON
@ -101,7 +101,7 @@ resize: FL_RESIZE_ALL
gravity: FL_NoGravity FL_NoGravity
name: button_ok
callback: C_FormBaseOKCB
argument: 0
argument: INPUT
--------------------
class: FL_TEXT
@ -137,7 +137,7 @@ resize: FL_RESIZE_ALL
gravity: FL_NoGravity FL_NoGravity
name: button_restore
callback: C_FormBaseRestoreCB
argument: 0
argument: INPUT
=============== FORM ===============
Name: form_doc_paper
@ -196,8 +196,8 @@ shortcut:
resize: FL_RESIZE_ALL
gravity: FL_NoGravity FL_NoGravity
name: choice_paperpackage
callback: C_FormDocumentInputCB
argument: 0
callback: C_FormBaseInputCB
argument: INPUT
--------------------
class: FL_FRAME
@ -376,8 +376,8 @@ shortcut:
resize: FL_RESIZE_ALL
gravity: FL_NoGravity FL_NoGravity
name: radio_portrait
callback: C_FormDocumentInputCB
argument: 0
callback: C_FormBaseInputCB
argument: INPUT
--------------------
class: FL_CHECKBUTTON
@ -394,8 +394,8 @@ shortcut:
resize: FL_RESIZE_ALL
gravity: FL_NoGravity FL_NoGravity
name: radio_landscape
callback: C_FormDocumentInputCB
argument: 0
callback: C_FormBaseInputCB
argument: INPUT
--------------------
class: FL_END_GROUP
@ -430,8 +430,8 @@ shortcut:
resize: FL_RESIZE_ALL
gravity: FL_NoGravity FL_NoGravity
name: choice_papersize2
callback: C_FormDocumentInputCB
argument: 0
callback: C_FormBaseInputCB
argument: INPUT
--------------------
class: FL_TEXT
@ -466,8 +466,8 @@ shortcut:
resize: FL_RESIZE_ALL
gravity: FL_NoGravity FL_NoGravity
name: push_use_geometry
callback: C_FormDocumentInputCB
argument: 0
callback: C_FormBaseInputCB
argument: INPUT
--------------------
class: FL_INPUT
@ -484,8 +484,8 @@ shortcut:
resize: FL_RESIZE_ALL
gravity: FL_NoGravity FL_NoGravity
name: input_custom_width
callback: C_FormDocumentInputCB
argument: 0
callback: C_FormBaseInputCB
argument: INPUT
--------------------
class: FL_INPUT
@ -502,8 +502,8 @@ shortcut:
resize: FL_RESIZE_ALL
gravity: FL_NoGravity FL_NoGravity
name: input_custom_height
callback: C_FormDocumentInputCB
argument: 0
callback: C_FormBaseInputCB
argument: INPUT
--------------------
class: FL_INPUT
@ -520,8 +520,8 @@ shortcut:
resize: FL_RESIZE_ALL
gravity: FL_NoGravity FL_NoGravity
name: input_top_margin
callback: C_FormDocumentInputCB
argument: 0
callback: C_FormBaseInputCB
argument: INPUT
--------------------
class: FL_INPUT
@ -538,8 +538,8 @@ shortcut:
resize: FL_RESIZE_ALL
gravity: FL_NoGravity FL_NoGravity
name: input_bottom_margin
callback: C_FormDocumentInputCB
argument: 0
callback: C_FormBaseInputCB
argument: INPUT
--------------------
class: FL_INPUT
@ -556,8 +556,8 @@ shortcut:
resize: FL_RESIZE_ALL
gravity: FL_NoGravity FL_NoGravity
name: input_left_margin
callback: C_FormDocumentInputCB
argument: 0
callback: C_FormBaseInputCB
argument: INPUT
--------------------
class: FL_INPUT
@ -574,8 +574,8 @@ shortcut:
resize: FL_RESIZE_ALL
gravity: FL_NoGravity FL_NoGravity
name: input_right_margin
callback: C_FormDocumentInputCB
argument: 0
callback: C_FormBaseInputCB
argument: INPUT
--------------------
class: FL_INPUT
@ -592,8 +592,8 @@ shortcut:
resize: FL_RESIZE_ALL
gravity: FL_NoGravity FL_NoGravity
name: input_head_height
callback: C_FormDocumentInputCB
argument: 0
callback: C_FormBaseInputCB
argument: INPUT
--------------------
class: FL_INPUT
@ -610,8 +610,8 @@ shortcut:
resize: FL_RESIZE_ALL
gravity: FL_NoGravity FL_NoGravity
name: input_head_sep
callback: C_FormDocumentInputCB
argument: 0
callback: C_FormBaseInputCB
argument: INPUT
--------------------
class: FL_INPUT
@ -628,8 +628,8 @@ shortcut:
resize: FL_RESIZE_ALL
gravity: FL_NoGravity FL_NoGravity
name: input_foot_skip
callback: C_FormDocumentInputCB
argument: 0
callback: C_FormBaseInputCB
argument: INPUT
--------------------
class: FL_TEXT
@ -742,8 +742,8 @@ shortcut:
resize: FL_RESIZE_ALL
gravity: FL_NoGravity FL_NoGravity
name: choice_doc_fonts
callback: C_FormDocumentInputCB
argument: 0
callback: C_FormBaseInputCB
argument: INPUT
--------------------
class: FL_CHOICE
@ -760,8 +760,8 @@ shortcut:
resize: FL_RESIZE_ALL
gravity: FL_NoGravity FL_NoGravity
name: choice_doc_fontsize
callback: C_FormDocumentInputCB
argument: 0
callback: C_FormBaseInputCB
argument: INPUT
--------------------
class: FL_CHOICE
@ -778,8 +778,8 @@ shortcut:
resize: FL_RESIZE_ALL
gravity: FL_NoGravity FL_NoGravity
name: choice_doc_class
callback: C_FormDocumentChoiceClassCB
argument: 0
callback: C_FormBaseInputCB
argument: CHECKCHOICECLASS
--------------------
class: FL_CHOICE
@ -796,8 +796,8 @@ shortcut:
resize: FL_RESIZE_ALL
gravity: FL_NoGravity FL_NoGravity
name: choice_doc_pagestyle
callback: C_FormDocumentInputCB
argument: 0
callback: C_FormBaseInputCB
argument: INPUT
--------------------
class: FL_CHOICE
@ -814,8 +814,8 @@ shortcut:
resize: FL_RESIZE_ALL
gravity: FL_NoGravity FL_NoGravity
name: choice_doc_spacing
callback: C_FormDocumentInputCB
argument: 0
callback: C_FormBaseInputCB
argument: INPUT
--------------------
class: FL_INPUT
@ -832,8 +832,8 @@ shortcut:
resize: FL_RESIZE_ALL
gravity: FL_NoGravity FL_NoGravity
name: input_doc_extra
callback: C_FormDocumentInputCB
argument: 0
callback: C_FormBaseInputCB
argument: INPUT
--------------------
class: FL_INPUT
@ -850,8 +850,8 @@ shortcut:
resize: FL_RESIZE_ALL
gravity: FL_NoGravity FL_NoGravity
name: input_doc_skip
callback: C_FormDocumentInputCB
argument: 0
callback: C_FormBaseInputCB
argument: INPUT
--------------------
class: FL_CHOICE
@ -868,8 +868,8 @@ shortcut:
resize: FL_RESIZE_ALL
gravity: FL_NoGravity FL_NoGravity
name: choice_doc_skip
callback: C_FormDocumentInputCB
argument: 0
callback: C_FormBaseInputCB
argument: INPUT
--------------------
class: FL_BEGIN_GROUP
@ -904,8 +904,8 @@ shortcut:
resize: FL_RESIZE_ALL
gravity: FL_NoGravity FL_NoGravity
name: radio_doc_sides_one
callback: C_FormDocumentInputCB
argument: 0
callback: C_FormBaseInputCB
argument: INPUT
--------------------
class: FL_CHECKBUTTON
@ -922,8 +922,8 @@ shortcut:
resize: FL_RESIZE_ALL
gravity: FL_NoGravity FL_NoGravity
name: radio_doc_sides_two
callback: C_FormDocumentInputCB
argument: 0
callback: C_FormBaseInputCB
argument: INPUT
--------------------
class: FL_END_GROUP
@ -976,8 +976,8 @@ shortcut:
resize: FL_RESIZE_ALL
gravity: FL_NoGravity FL_NoGravity
name: radio_doc_columns_one
callback: C_FormDocumentInputCB
argument: 0
callback: C_FormBaseInputCB
argument: INPUT
--------------------
class: FL_CHECKBUTTON
@ -994,8 +994,8 @@ shortcut:
resize: FL_RESIZE_ALL
gravity: FL_NoGravity FL_NoGravity
name: radio_doc_columns_two
callback: C_FormDocumentInputCB
argument: 0
callback: C_FormBaseInputCB
argument: INPUT
--------------------
class: FL_END_GROUP
@ -1048,8 +1048,8 @@ shortcut:
resize: FL_RESIZE_ALL
gravity: FL_NoGravity FL_NoGravity
name: radio_doc_indent
callback: C_FormDocumentInputCB
argument: 0
callback: C_FormBaseInputCB
argument: INPUT
--------------------
class: FL_CHECKBUTTON
@ -1066,8 +1066,8 @@ shortcut:
resize: FL_RESIZE_ALL
gravity: FL_NoGravity FL_NoGravity
name: radio_doc_skip
callback: C_FormDocumentInputCB
argument: 0
callback: C_FormBaseInputCB
argument: INPUT
value: 1
--------------------
@ -1103,8 +1103,8 @@ shortcut:
resize: FL_RESIZE_ALL
gravity: FL_NoGravity FL_NoGravity
name: input_doc_spacing
callback: C_FormDocumentInputCB
argument: 0
callback: C_FormBaseInputCB
argument: INPUT
=============== FORM ===============
Name: form_doc_language
@ -1163,8 +1163,8 @@ shortcut:
resize: FL_RESIZE_ALL
gravity: FL_NoGravity FL_NoGravity
name: choice_inputenc
callback: C_FormDocumentInputCB
argument: 0
callback: C_FormBaseInputCB
argument: INPUT
--------------------
class: FL_CHOICE
@ -1181,8 +1181,8 @@ shortcut:
resize: FL_RESIZE_ALL
gravity: FL_NoGravity FL_NoGravity
name: choice_quotes_language
callback: C_FormDocumentInputCB
argument: 0
callback: C_FormBaseInputCB
argument: INPUT
--------------------
class: FL_BEGIN_GROUP
@ -1217,8 +1217,8 @@ shortcut:
resize: FL_RESIZE_ALL
gravity: FL_NoGravity FL_NoGravity
name: radio_single
callback: C_FormDocumentInputCB
argument: 0
callback: C_FormBaseInputCB
argument: INPUT
--------------------
class: FL_CHECKBUTTON
@ -1235,8 +1235,8 @@ shortcut:
resize: FL_RESIZE_ALL
gravity: FL_NoGravity FL_NoGravity
name: radio_double
callback: C_FormDocumentInputCB
argument: 0
callback: C_FormBaseInputCB
argument: INPUT
--------------------
class: FL_END_GROUP
@ -1271,8 +1271,8 @@ shortcut:
resize: FL_RESIZE_ALL
gravity: FL_NoGravity FL_NoGravity
name: choice_language
callback: C_FormDocumentInputCB
argument: 0
callback: C_FormBaseInputCB
argument: INPUT
=============== FORM ===============
Name: form_doc_options
@ -1313,8 +1313,8 @@ shortcut:
resize: FL_RESIZE_ALL
gravity: FL_NoGravity FL_NoGravity
name: input_float_placement
callback: C_FormDocumentInputCB
argument: 0
callback: C_FormBaseInputCB
argument: INPUT
--------------------
class: FL_COUNTER
@ -1331,8 +1331,8 @@ shortcut:
resize: FL_RESIZE_ALL
gravity: FL_NoGravity FL_NoGravity
name: slider_secnumdepth
callback: C_FormDocumentInputCB
argument: 0
callback: C_FormBaseInputCB
argument: INPUT
--------------------
class: FL_COUNTER
@ -1349,8 +1349,8 @@ shortcut:
resize: FL_RESIZE_ALL
gravity: FL_NoGravity FL_NoGravity
name: slider_tocdepth
callback: C_FormDocumentInputCB
argument: 0
callback: C_FormBaseInputCB
argument: INPUT
--------------------
class: FL_CHOICE
@ -1367,8 +1367,8 @@ shortcut:
resize: FL_RESIZE_ALL
gravity: FL_NoGravity FL_NoGravity
name: choice_postscript_driver
callback: C_FormDocumentInputCB
argument: 0
callback: C_FormBaseInputCB
argument: INPUT
--------------------
class: FL_CHECKBUTTON
@ -1385,8 +1385,8 @@ shortcut:
resize: FL_RESIZE_ALL
gravity: FL_NoGravity FL_NoGravity
name: check_use_amsmath
callback: C_FormDocumentInputCB
argument: 0
callback: C_FormBaseInputCB
argument: INPUT
=============== FORM ===============
Name: form_doc_bullet
@ -1465,8 +1465,8 @@ shortcut:
resize: FL_RESIZE_ALL
gravity: FL_NoGravity FL_NoGravity
name: choice_bullet_size
callback: C_FormDocumentChoiceBulletSizeCB
argument: 0
callback: C_FormBaseInputCB
argument: CHOICEBULLETSIZE
--------------------
class: FL_INPUT
@ -1483,8 +1483,8 @@ shortcut:
resize: FL_RESIZE_ALL
gravity: FL_NoGravity FL_NoGravity
name: input_bullet_latex
callback: C_FormDocumentInputBulletLaTeXCB
argument: 0
callback: C_FormBaseInputCB
argument: INPUTBULLETLATEX
--------------------
class: FL_BEGIN_GROUP
@ -1519,8 +1519,8 @@ shortcut:
resize: FL_RESIZE_ALL
gravity: FL_NoGravity FL_NoGravity
name: radio_bullet_depth_1
callback: C_FormDocumentBulletDepthCB
argument: 0
callback: C_FormBaseInputCB
argument: BULLETDEPTH1
value: 1
--------------------
@ -1538,8 +1538,8 @@ shortcut:
resize: FL_RESIZE_ALL
gravity: FL_NoGravity FL_NoGravity
name: radio_bullet_depth_2
callback: C_FormDocumentBulletDepthCB
argument: 1
callback: C_FormBaseInputCB
argument: BULLETDEPTH2
--------------------
class: FL_BUTTON
@ -1556,8 +1556,8 @@ shortcut:
resize: FL_RESIZE_ALL
gravity: FL_NoGravity FL_NoGravity
name: radio_bullet_depth_3
callback: C_FormDocumentBulletDepthCB
argument: 2
callback: C_FormBaseInputCB
argument: BULLETDEPTH3
--------------------
class: FL_BUTTON
@ -1574,8 +1574,8 @@ shortcut:
resize: FL_RESIZE_ALL
gravity: FL_NoGravity FL_NoGravity
name: radio_bullet_depth_4
callback: C_FormDocumentBulletDepthCB
argument: 3
callback: C_FormBaseInputCB
argument: BULLETDEPTH4
--------------------
class: FL_END_GROUP
@ -1646,8 +1646,8 @@ shortcut:
resize: FL_RESIZE_NONE
gravity: FL_NoGravity FL_NoGravity
name: radio_bullet_panel_standard
callback: C_FormDocumentBulletPanelCB
argument: 0
callback: C_FormBaseInputCB
argument: BULLETPANEL1
value: 1
--------------------
@ -1665,8 +1665,8 @@ shortcut:
resize: FL_RESIZE_NONE
gravity: FL_NoGravity FL_NoGravity
name: radio_bullet_panel_maths
callback: C_FormDocumentBulletPanelCB
argument: 1
callback: C_FormBaseInputCB
argument: BULLETPANEL2
--------------------
class: FL_BUTTON
@ -1683,8 +1683,8 @@ shortcut:
resize: FL_RESIZE_NONE
gravity: FL_NoGravity FL_NoGravity
name: radio_bullet_panel_ding2
callback: C_FormDocumentBulletPanelCB
argument: 3
callback: C_FormBaseInputCB
argument: BULLETPANEL3
--------------------
class: FL_BUTTON
@ -1701,8 +1701,8 @@ shortcut:
resize: FL_RESIZE_NONE
gravity: FL_NoGravity FL_NoGravity
name: radio_bullet_panel_ding3
callback: C_FormDocumentBulletPanelCB
argument: 4
callback: C_FormBaseInputCB
argument: BULLETPANEL4
--------------------
class: FL_BUTTON
@ -1719,8 +1719,8 @@ shortcut:
resize: FL_RESIZE_NONE
gravity: FL_NoGravity FL_NoGravity
name: radio_bullet_panel_ding4
callback: C_FormDocumentBulletPanelCB
argument: 5
callback: C_FormBaseInputCB
argument: BULLETPANEL5
--------------------
class: FL_BUTTON
@ -1737,8 +1737,8 @@ shortcut:
resize: FL_RESIZE_NONE
gravity: FL_NoGravity FL_NoGravity
name: radio_bullet_panel_ding1
callback: C_FormDocumentBulletPanelCB
argument: 2
callback: C_FormBaseInputCB
argument: BULLETPANEL6
--------------------
class: FL_END_GROUP