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

Rob's dialog clean-up and Martin's 'disfucation' of insetgraphics.

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@5238 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Angus Leeming 2002-09-09 09:49:47 +00:00
parent 4122d9ae40
commit b261483f24
19 changed files with 568 additions and 509 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/frontends/xforms/ChangeLog
View File

@ -1,3 +1,27 @@
2002-09-09 Rob Lahaye <lahaye@snu.ac.kr>
* FormBase.C:
* FormBaseDeprecated.C: use "LyX: " prefix to dialog window title;
set minimized title (without "LyX: ") and its icon.
* FormSpellchecker.C:
* FormSearch.C:
* FormThesaurus.C: remove "LyX: " from dialog window title.
* FormRef.[Ch]: add proper switch for "Go to" button.
* FormBibitem.C:
* forms/form_bibitem.fd:
* FormCitation.C:
* forms/form_citation.fd:
* FormRef.C:
* forms/form_ref.fd:
* FormSpellchecker.[Ch]:
* forms/form_spellchecker.fd:
* forms/form_toc.fd:
* forms/form_url.fd: less bulky dialogs; use proper gravity and
resize policy; add few tooltips.
2002-09-06 Alain Castera <castera@in2p3.fr>
* FormTabular.C: leave the horizontal alignment buttons alive

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

@ -20,7 +20,10 @@
#include "xformsBC.h"
#include "xforms_resize.h"
#include "Tooltips.h"
#include "support/LAssert.h"
#include "support/filetools.h" // LibFileSearch
#include FORMS_H_LOCATION
extern "C" {
@ -111,13 +114,34 @@ void FormBase::show()
if (!allow_resize_)
fl_set_form_maxsize(form(), minw_, minh_);
int const iconify = getController().IconifyWithMain() ?
FL_TRANSIENT : 0;
string const maximize_title = "LyX: " + title_;
int const iconify_policy = getController().IconifyWithMain() ?
FL_TRANSIENT : 0;
fl_show_form(form(),
FL_PLACE_MOUSE | FL_FREE_SIZE,
iconify,
title_.c_str());
iconify_policy,
maximize_title.c_str());
if (iconify_policy == 0) {
// set title for minimized form
string const minimize_title = title_;
fl_winicontitle(form()->window, minimize_title.c_str());
// assign an icon to form
string const iconname = LibFileSearch("images", "lyx", "xpm");
if (!iconname.empty()) {
unsigned int w, h;
Pixmap icon_mask;
Pixmap const icon_p = fl_read_pixmapfile(fl_root,
iconname.c_str(),
&w,
&h,
&icon_mask,
0, 0, 0); // this leaks
fl_set_form_icon(form(), icon_p, icon_mask);
}
}
}
tooltips().set();

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

@ -26,6 +26,7 @@
#include "frontends/LyXView.h"
#include "support/LAssert.h"
#include "support/filetools.h" // LibFileSearch
#include <boost/bind.hpp>
@ -124,10 +125,34 @@ void FormBaseDeprecated::show()
if (!allow_resize_)
fl_set_form_maxsize(form(), minw_, minh_);
string const maximize_title = "LyX: " + title_;
int const iconify_policy = lyxrc.dialogs_iconify_with_main ?
FL_TRANSIENT : 0;
fl_show_form(form(),
FL_PLACE_MOUSE | FL_FREE_SIZE,
(lyxrc.dialogs_iconify_with_main ? FL_TRANSIENT : 0),
title_.c_str());
iconify_policy,
maximize_title.c_str());
if (iconify_policy == 0) {
// set title for minimized form
string const minimize_title = title_;
fl_winicontitle(form()->window, minimize_title.c_str());
// assign an icon to form
string const iconname = LibFileSearch("images", "lyx", "xpm");
if (!iconname.empty()) {
unsigned int w, h;
Pixmap icon_mask;
Pixmap const icon_p = fl_read_pixmapfile(fl_root,
iconname.c_str(),
&w,
&h,
&icon_mask,
0, 0, 0); // this leaks
fl_set_form_icon(form(), icon_p, icon_mask);
}
}
}
tooltips().set();

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

@ -17,6 +17,7 @@
#include "xformsBC.h"
#include "ControlBibitem.h"
#include "FormBibitem.h"
#include "Tooltips.h"
#include "forms/form_bibitem.h"
#include FORMS_H_LOCATION
#include "gettext.h"
@ -45,6 +46,12 @@ void FormBibitem::build()
bc().addReadOnly(dialog_->input_key);
bc().addReadOnly(dialog_->input_label);
// set up the tooltips
string str = _("Key used within LyX document.");
tooltips().init(dialog_->input_key, str);
str = _("Label used for final output.");
tooltips().init(dialog_->input_label, str);
}

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

@ -67,24 +67,6 @@ void fillChoice(FD_citation * dialog, vector<string> vec)
setEnabled(dialog->choice_style, !vec.empty());
if (vec.empty())
return;
// The width of the choice varies with the contents.
// Ensure that it is centred in the frame.
int width = 0;
for (vector<string>::const_iterator it = vec.begin();
it != vec.end(); ++it) {
width = max(width, string_width(*it));
}
int const dx =
max(5, int(0.5 * (dialog->frame_style->w - width)));
fl_set_object_geometry(dialog->choice_style,
dialog->frame_style->x + dx,
dialog->choice_style->y,
width,
dialog->choice_style->h);
}
@ -118,7 +100,7 @@ typedef FormCB<ControlCitation, FormDB<FD_citation> > base_class;
FormCitation::FormCitation()
: base_class(_("Citation"), false)
: base_class(_("Citation"))
{}

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

@ -18,6 +18,7 @@
#include "xformsBC.h"
#include "ControlRef.h"
#include "FormRef.h"
#include "Tooltips.h"
#include "forms/form_ref.h"
#include "xforms_helpers.h"
#include "insets/insetref.h"
@ -43,7 +44,7 @@ void FormRef::build()
dialog_.reset(build_ref(this));
for (int i = 0; !InsetRef::types[i].latex_name.empty(); ++i)
fl_addto_choice(dialog_->choice_type,
fl_addto_choice(dialog_->choice_format,
_(InsetRef::types[i].gui_name.c_str()));
// Force the user to use the browser to change refs.
@ -64,6 +65,18 @@ void FormRef::build()
bc().addReadOnly(dialog_->button_update);
bc().addReadOnly(dialog_->input_name);
bc().addReadOnly(dialog_->input_ref);
// set up the tooltips
string str = _("Select a document for references.");
tooltips().init(dialog_->choice_document, str);
str = _("Sort the references alphabetically.");
tooltips().init(dialog_->check_sort, str);
str = _("Go to selected reference.");
tooltips().init(dialog_->button_go, str);
str = _("Update the list of references.");
tooltips().init(dialog_->button_update, str);
str = _("Select format style of the reference.");
tooltips().init(dialog_->choice_format, str);
}
@ -73,11 +86,11 @@ void FormRef::update()
controller().params().getContents().c_str());
fl_set_input(dialog_->input_name,
controller().params().getOptions().c_str());
fl_set_choice(dialog_->choice_type,
fl_set_choice(dialog_->choice_format,
InsetRef::getType(controller().params().getCmdName()) + 1);
at_ref_ = false;
fl_set_object_label(dialog_->button_go, _("Go to reference"));
switch_go_button();
// Name is irrelevant to LaTeX/Literate documents
if (controller().docType() == ControlRef::LATEX ||
@ -90,33 +103,33 @@ void FormRef::update()
// type is irrelevant to LinuxDoc/DocBook.
if (controller().docType() == ControlRef::LINUXDOC ||
controller().docType() == ControlRef::DOCBOOK) {
fl_set_choice(dialog_->choice_type, 1);
setEnabled(dialog_->choice_type, false);
fl_set_choice(dialog_->choice_format, 1);
setEnabled(dialog_->choice_format, false);
} else {
setEnabled(dialog_->choice_type, true);
setEnabled(dialog_->choice_format, true);
}
// Get the available buffers
vector<string> const buffers = controller().getBufferList();
vector<string> const choice_buffers =
getVector(dialog_->choice_buffer);
vector<string> const choice_documents =
getVector(dialog_->choice_document);
// If different from the current contents of the choice, then update it
if (buffers != choice_buffers) {
if (buffers != choice_documents) {
// create a string of entries " entry1 | entry2 | entry3 "
// with which to initialise the xforms choice object.
string const choice =
" " + getStringFromVector(buffers, " | ") + " ";
fl_clear_choice(dialog_->choice_buffer);
fl_addto_choice(dialog_->choice_buffer, choice.c_str());
fl_clear_choice(dialog_->choice_document);
fl_addto_choice(dialog_->choice_document, choice.c_str());
fl_set_choice(dialog_->choice_buffer,
fl_set_choice(dialog_->choice_document,
controller().getBufferNum() + 1);
}
string const name = controller().
getBufferName(fl_get_choice(dialog_->choice_buffer) - 1);
getBufferName(fl_get_choice(dialog_->choice_document) - 1);
refs_ = controller().getLabelList(name);
updateBrowser(refs_);
@ -171,7 +184,7 @@ void FormRef::updateBrowser(vector<string> const & akeys) const
void FormRef::apply()
{
int const type = fl_get_choice(dialog_->choice_type) - 1;
int const type = fl_get_choice(dialog_->choice_format) - 1;
controller().params().setCmdName(InsetRef::getName(type));
controller().params().setOptions(fl_get_input(dialog_->input_name));
@ -192,12 +205,10 @@ 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"));
} else {
controller().gotoBookmark();
fl_set_object_label(dialog_->button_go,
_("Go to reference"));
}
switch_go_button();
} else if (ob == dialog_->browser_refs) {
@ -213,20 +224,20 @@ ButtonPolicy::SMInput FormRef::input(FL_OBJECT * ob, long)
if (at_ref_)
controller().gotoBookmark();
at_ref_ = false;
fl_set_object_label(dialog_->button_go, _("Go to reference"));
switch_go_button();
setEnabled(dialog_->choice_type, true);
setEnabled(dialog_->choice_format, true);
setEnabled(dialog_->button_go, true);
fl_set_object_lcol(dialog_->input_ref, FL_BLACK);
} else if (ob == dialog_->button_update ||
ob == dialog_->check_sort ||
ob == dialog_->choice_buffer) {
ob == dialog_->choice_document) {
if (ob == dialog_->button_update ||
ob == dialog_->choice_buffer) {
ob == dialog_->choice_document) {
string const name =
controller().getBufferName(fl_get_choice(dialog_->choice_buffer) - 1);
controller().getBufferName(fl_get_choice(dialog_->choice_document) - 1);
refs_ = controller().getLabelList(name);
}
@ -234,9 +245,9 @@ ButtonPolicy::SMInput FormRef::input(FL_OBJECT * ob, long)
updateBrowser(refs_);
fl_unfreeze_form(form());
} else if (ob == dialog_->choice_type) {
} else if (ob == dialog_->choice_format) {
int const type = fl_get_choice(dialog_->choice_type) - 1;
int const type = fl_get_choice(dialog_->choice_format) - 1;
if (controller().params().getCmdName() ==
InsetRef::getName(type)) {
activate = ButtonPolicy::SMI_NOOP;
@ -245,3 +256,17 @@ ButtonPolicy::SMInput FormRef::input(FL_OBJECT * ob, long)
return activate;
}
void FormRef::switch_go_button()
{
if (at_ref_) {
fl_set_object_label(dialog_->button_go, _("Go back"));
tooltips().init(dialog_->button_go, _("Go back to original place."));
} else {
fl_set_object_label(dialog_->button_go, _("Go to"));
tooltips().init(dialog_->button_go, _("Go to selected reference."));
}
fl_set_button_shortcut(dialog_->button_go, "#G", 1);
fl_show_object(dialog_->button_go);
}

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

@ -39,6 +39,9 @@ private:
///
void updateBrowser(std::vector<string> const &) const;
///
void switch_go_button();
///
bool at_ref_;

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

@ -23,7 +23,7 @@
typedef FormCB<ControlSearch, FormDB<FD_search> > base_class;
FormSearch::FormSearch()
: base_class(_("LyX: Find and Replace"))
: base_class(_("Find and Replace"))
{}

79
src/frontends/xforms/FormSpellchecker.C
View File

@ -14,6 +14,7 @@
#pragma implementation
#endif
#include "Tooltips.h"
#include "xformsBC.h"
#include "xforms_helpers.h"
#include "ControlSpellchecker.h"
@ -24,7 +25,7 @@
typedef FormCB<ControlSpellchecker, FormDB<FD_spellchecker> > base_class;
FormSpellchecker::FormSpellchecker()
: base_class(_("LyX: Spellchecker"), false)
: base_class(_("Spellchecker"))
{}
@ -32,9 +33,6 @@ void FormSpellchecker::build()
{
dialog_.reset(build_spellchecker(this));
fl_set_slider_bounds(dialog_->slider, 0.0, 100.0);
fl_set_slider_step(dialog_->slider, 1.0);
fl_set_browser_dblclick_callback(dialog_->browser,
C_FormBaseInputCB, 2);
@ -45,20 +43,36 @@ void FormSpellchecker::build()
bc().setCancel(dialog_->button_close);
bc().addReadOnly(dialog_->button_replace);
bc().addReadOnly(dialog_->button_accept);
bc().addReadOnly(dialog_->button_insert);
bc().addReadOnly(dialog_->button_add);
bc().addReadOnly(dialog_->button_ignore);
bc().addReadOnly(dialog_->button_start);
bc().addReadOnly(dialog_->button_stop);
bc().addReadOnly(dialog_->browser);
// set up the tooltips
string str = _("Type replacement for unknown word "
" or select from suggestions.");
tooltips().init(dialog_->input, str);
str = _("List of replacement suggestions from dictionary.");
tooltips().init(dialog_->browser, str);
str = _("Start the spellingchecker.");
tooltips().init(dialog_->button_start, str);
str = _("Replace unknown word.");
tooltips().init(dialog_->button_replace, str);
str = _("Ignore unknown word.");
tooltips().init(dialog_->button_ignore, str);
str = _("Accept unknown word as known in this session.");
tooltips().init(dialog_->button_accept, str);
str = _("Add unknown word to personal dictionary.");
tooltips().init(dialog_->button_add, str);
}
void FormSpellchecker::update()
{
string const w;
fl_set_input(dialog_->input, w.c_str());
fl_set_object_label(dialog_->text, w.c_str());
fl_set_input(dialog_->input, "");
fl_set_object_label(dialog_->text, "");
fl_clear_browser(dialog_->browser);
fl_set_slider_value(dialog_->slider, 0);
start(true);
}
ButtonPolicy::SMInput FormSpellchecker::input(FL_OBJECT * obj, long val)
@ -68,12 +82,10 @@ ButtonPolicy::SMInput FormSpellchecker::input(FL_OBJECT * obj, long val)
controller().replace(tmp);
} else if (obj == dialog_->button_start) {
controller().check();
stop(false);
} else if (obj == dialog_->button_stop) {
controller().stop();
stop(true);
if (start())
controller().check();
else
controller().stop();
} else if (obj == dialog_->button_ignore) {
controller().check();
@ -81,7 +93,7 @@ ButtonPolicy::SMInput FormSpellchecker::input(FL_OBJECT * obj, long val)
} else if (obj == dialog_->button_accept) {
controller().ignoreAll();
} else if (obj == dialog_->button_insert) {
} else if (obj == dialog_->button_add) {
controller().insert();
} else if (obj == dialog_->browser) {
@ -141,14 +153,31 @@ void FormSpellchecker::showMessage(const char * msg)
fl_show_message(msg, "", "");
}
void FormSpellchecker::stop(bool stop)
bool FormSpellchecker::start(bool init)
{
setEnabled(dialog_->button_start, stop);
setEnabled(dialog_->button_replace, !stop);
setEnabled(dialog_->button_ignore, !stop);
setEnabled(dialog_->button_accept, !stop);
setEnabled(dialog_->button_insert, !stop);
setEnabled(dialog_->button_stop, !stop);
setEnabled(dialog_->browser, !stop);
setEnabled(dialog_->input, !stop);
static bool running = false;
if (init) {
running = false;
} else {
running = !running;
}
fl_set_object_label(dialog_->button_start,
(running ? _("Stop") : _("Start")));
fl_set_button_shortcut(dialog_->button_start, "#S", 1);
fl_show_object(dialog_->button_start);
string const str = (running ? _("Stop the spellingchecker.") :
_("Start the spellingchecker."));
tooltips().init(dialog_->button_start, str);
setEnabled(dialog_->button_replace, running);
setEnabled(dialog_->button_ignore, running);
setEnabled(dialog_->button_accept, running);
setEnabled(dialog_->button_add, running);
setEnabled(dialog_->browser, running);
setEnabled(dialog_->input, running);
return running;
}

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

@ -35,8 +35,8 @@ private:
///
void update();
/// enable/disable widgets when start/stop
void stop(bool);
/// enable/disable widgets when start/stop; return running status
bool start(bool init = false);
/// update progress bar, set suggestions, exit message
void partialUpdate(int);

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

@ -36,7 +36,7 @@ typedef FormCB<ControlThesaurus, FormDB<FD_thesaurus> > base_class;
FormThesaurus::FormThesaurus()
: base_class(_("LyX: Thesaurus"), false),
: base_class(_("Thesaurus"), false),
clickline_(-1)
{
}

65
src/frontends/xforms/forms/form_bibitem.fd
View File

@ -5,18 +5,19 @@ Internal Form Definition File
Number of forms: 1
Unit of measure: FL_COORD_PIXEL
SnapGrid: 5
=============== FORM ===============
Name: form_bibitem
Width: 220
Height: 130
Width: 195
Height: 110
Number of Objects: 5
--------------------
class: FL_BOX
type: UP_BOX
box: 0 0 220 130
boxtype: FL_UP_BOX
type: FLAT_BOX
box: 0 0 195 110
boxtype: FL_FLAT_BOX
colors: FL_COL1 FL_COL1
alignment: FL_ALIGN_CENTER
style: FL_NORMAL_STYLE
@ -33,7 +34,7 @@ argument:
--------------------
class: FL_INPUT
type: NORMAL_INPUT
box: 80 10 130 30
box: 60 10 130 25
boxtype: FL_DOWN_BOX
colors: FL_COL1 FL_MCOL
alignment: FL_ALIGN_LEFT
@ -42,8 +43,8 @@ size: FL_NORMAL_SIZE
lcol: FL_BLACK
label: Key:|#K
shortcut:
resize: FL_RESIZE_ALL
gravity: FL_NoGravity FL_NoGravity
resize: FL_RESIZE_X
gravity: FL_West FL_East
name: input_key
callback: C_FormBaseInputCB
argument: 0
@ -51,7 +52,7 @@ argument: 0
--------------------
class: FL_BUTTON
type: RETURN_BUTTON
box: 20 90 90 30
box: 5 80 90 25
boxtype: FL_UP_BOX
colors: FL_COL1 FL_COL1
alignment: FL_ALIGN_CENTER
@ -60,34 +61,16 @@ size: FL_NORMAL_SIZE
lcol: FL_BLACK
label: OK
shortcut: ^M
resize: FL_RESIZE_ALL
gravity: FL_NoGravity FL_NoGravity
resize: FL_RESIZE_NONE
gravity: FL_SouthEast FL_SouthEast
name: button_ok
callback: C_FormBaseOKCB
argument: 3
--------------------
class: FL_BUTTON
type: NORMAL_BUTTON
box: 120 90 90 30
boxtype: FL_UP_BOX
colors: FL_COL1 FL_COL1
alignment: FL_ALIGN_CENTER
style: FL_NORMAL_STYLE
size: FL_NORMAL_SIZE
lcol: FL_BLACK
label: Cancel|^[
shortcut:
resize: FL_RESIZE_ALL
gravity: FL_NoGravity FL_NoGravity
name: button_close
callback: C_FormBaseCancelCB
argument: 2
--------------------
class: FL_INPUT
type: NORMAL_INPUT
box: 80 50 130 30
box: 60 45 130 25
boxtype: FL_DOWN_BOX
colors: FL_COL1 FL_MCOL
alignment: FL_ALIGN_LEFT
@ -96,11 +79,29 @@ size: FL_NORMAL_SIZE
lcol: FL_BLACK
label: Label:|#L
shortcut:
resize: FL_RESIZE_ALL
gravity: FL_NoGravity FL_NoGravity
resize: FL_RESIZE_X
gravity: FL_West FL_East
name: input_label
callback: C_FormBaseInputCB
argument: 0
--------------------
class: FL_BUTTON
type: NORMAL_BUTTON
box: 100 80 90 25
boxtype: FL_UP_BOX
colors: FL_COL1 FL_COL1
alignment: FL_ALIGN_CENTER
style: FL_NORMAL_STYLE
size: FL_NORMAL_SIZE
lcol: FL_BLACK
label: Cancel|^[
shortcut:
resize: FL_RESIZE_NONE
gravity: FL_SouthEast FL_SouthEast
name: button_close
callback: C_FormBaseCancelCB
argument: 2
==============================
create_the_forms

249
src/frontends/xforms/forms/form_citation.fd
View File

@ -5,18 +5,19 @@ Internal Form Definition File
Number of forms: 1
Unit of measure: FL_COORD_PIXEL
SnapGrid: 5
=============== FORM ===============
Name: form_citation
Width: 680
Height: 440
Number of Objects: 25
Width: 640
Height: 345
Number of Objects: 23
--------------------
class: FL_BOX
type: UP_BOX
box: 0 0 680 440
boxtype: FL_UP_BOX
type: FLAT_BOX
box: 0 0 640 345
boxtype: FL_FLAT_BOX
colors: FL_COL1 FL_COL1
alignment: FL_ALIGN_CENTER
style: FL_NORMAL_STYLE
@ -25,15 +26,15 @@ lcol: FL_BLACK
label:
shortcut:
resize: FL_RESIZE_ALL
gravity: FL_NoGravity FL_NoGravity
name:
gravity: FL_NorthWest FL_SouthEast
name:
callback:
argument:
--------------------
class: FL_BROWSER
type: HOLD_BROWSER
box: 10 30 150 240
box: 5 25 150 185
boxtype: FL_DOWN_BOX
colors: FL_COL1 FL_YELLOW
alignment: FL_ALIGN_TOP_LEFT
@ -42,7 +43,7 @@ size: FL_NORMAL_SIZE
lcol: FL_BLACK
label: Inset keys|#I
shortcut:
resize: FL_RESIZE_X
resize: FL_RESIZE_ALL
gravity: FL_NorthWest FL_South
name: browser_cite
callback: C_FormBaseInputCB
@ -51,25 +52,61 @@ argument: 0
--------------------
class: FL_BROWSER
type: HOLD_BROWSER
box: 200 30 160 240
box: 195 25 150 185
boxtype: FL_DOWN_BOX
colors: FL_COL1 FL_YELLOW
alignment: FL_ALIGN_TOP_LEFT
style: FL_NORMAL_STYLE
size: FL_NORMAL_SIZE
lcol: FL_BLACK
label: Bibliography keys|#y
label: Bibliography keys|#k
shortcut:
resize: FL_RESIZE_X
resize: FL_RESIZE_ALL
gravity: FL_North FL_SouthEast
name: browser_bib
callback: C_FormBaseInputCB
argument: 0
--------------------
class: FL_BROWSER
type: NORMAL_BROWSER
box: 5 235 340 70
boxtype: FL_DOWN_BOX
colors: FL_COL1 FL_YELLOW
alignment: FL_ALIGN_TOP_LEFT
style: FL_NORMAL_STYLE
size: FL_NORMAL_SIZE
lcol: FL_BLACK
label: Info
shortcut:
resize: FL_RESIZE_NONE
gravity: FL_SouthWest FL_SouthEast
name: browser_info
callback:
argument:
--------------------
class: FL_BUTTON
type: NORMAL_BUTTON
box: 165 30 30 30
box: 5 315 90 25
boxtype: FL_UP_BOX
colors: FL_COL1 FL_COL1
alignment: FL_ALIGN_CENTER
style: FL_NORMAL_STYLE
size: FL_NORMAL_SIZE
lcol: FL_BLACK
label: Restore|#R
shortcut:
resize: FL_RESIZE_NONE
gravity: FL_SouthWest FL_SouthWest
name: button_restore
callback: C_FormBaseRestoreCB
argument: 0
--------------------
class: FL_BUTTON
type: NORMAL_BUTTON
box: 160 30 30 30
boxtype: FL_UP_BOX
colors: FL_COL1 FL_COL1
alignment: FL_ALIGN_CENTER
@ -87,7 +124,7 @@ argument: 0
--------------------
class: FL_BUTTON
type: NORMAL_BUTTON
box: 165 65 30 30
box: 160 65 30 30
boxtype: FL_UP_BOX
colors: FL_COL1 FL_COL1
alignment: FL_ALIGN_CENTER
@ -105,7 +142,7 @@ argument: 0
--------------------
class: FL_BUTTON
type: NORMAL_BUTTON
box: 165 100 30 30
box: 160 100 30 30
boxtype: FL_UP_BOX
colors: FL_COL1 FL_COL1
alignment: FL_ALIGN_CENTER
@ -123,7 +160,7 @@ argument: 0
--------------------
class: FL_BUTTON
type: NORMAL_BUTTON
box: 165 135 30 30
box: 160 135 30 30
boxtype: FL_UP_BOX
colors: FL_COL1 FL_COL1
alignment: FL_ALIGN_CENTER
@ -138,28 +175,10 @@ name: button_down
callback: C_FormBaseInputCB
argument: 0
--------------------
class: FL_BROWSER
type: NORMAL_BROWSER
box: 10 290 350 90
boxtype: FL_DOWN_BOX
colors: FL_COL1 FL_YELLOW
alignment: FL_ALIGN_TOP_LEFT
style: FL_NORMAL_STYLE
size: FL_NORMAL_SIZE
lcol: FL_BLACK
label: Info
shortcut:
resize: FL_RESIZE_NONE
gravity: FL_SouthWest FL_SouthEast
name: browser_info
callback:
argument:
--------------------
class: FL_LABELFRAME
type: ENGRAVED_FRAME
box: 370 30 300 130
box: 355 10 280 110
boxtype: FL_NO_BOX
colors: FL_BLACK FL_COL1
alignment: FL_ALIGN_TOP_LEFT
@ -168,8 +187,8 @@ size: FL_NORMAL_SIZE
lcol: FL_BLACK
label: Search
shortcut:
resize: FL_RESIZE_ALL
gravity: FL_SouthWest FL_SouthEast
resize: FL_RESIZE_Y
gravity: FL_East FL_East
name: frame_search
callback:
argument:
@ -177,7 +196,7 @@ argument:
--------------------
class: FL_INPUT
type: NORMAL_INPUT
box: 380 45 280 30
box: 360 25 265 25
boxtype: FL_DOWN_BOX
colors: FL_COL1 FL_MCOL
alignment: FL_ALIGN_TOP
@ -187,7 +206,7 @@ lcol: FL_BLACK
label:
shortcut:
resize: FL_RESIZE_NONE
gravity: FL_SouthWest FL_SouthEast
gravity: FL_East FL_East
name: input_search
callback:
argument:
@ -195,17 +214,17 @@ argument:
--------------------
class: FL_CHECKBUTTON
type: PUSH_BUTTON
box: 385 90 30 30
box: 360 60 25 25
boxtype: FL_NO_BOX
colors: FL_COL1 FL_YELLOW
alignment: FL_ALIGN_CENTER
style: FL_NORMAL_STYLE
size: FL_NORMAL_SIZE
lcol: FL_BLACK
label: Regular Expression|#R
label: Regular Expression|#x
shortcut:
resize: FL_RESIZE_ALL
gravity: FL_SouthWest FL_SouthWest
resize: FL_RESIZE_NONE
gravity: FL_East FL_East
name: check_search_type
callback:
argument:
@ -213,7 +232,7 @@ argument:
--------------------
class: FL_CHECKBUTTON
type: PUSH_BUTTON
box: 385 120 30 30
box: 360 90 25 25
boxtype: FL_NO_BOX
colors: FL_COL1 FL_YELLOW
alignment: FL_ALIGN_CENTER
@ -223,7 +242,7 @@ lcol: FL_BLACK
label: Case sensitive|#C
shortcut:
resize: FL_RESIZE_NONE
gravity: FL_SouthWest FL_SouthWest
gravity: FL_East FL_East
name: check_search_case
callback:
argument:
@ -231,7 +250,7 @@ argument:
--------------------
class: FL_BUTTON
type: NORMAL_BUTTON
box: 570 85 90 30
box: 535 60 90 25
boxtype: FL_UP_BOX
colors: FL_COL1 FL_COL1
alignment: FL_ALIGN_CENTER
@ -241,7 +260,7 @@ lcol: FL_BLACK
label: Previous|#P
shortcut:
resize: FL_RESIZE_NONE
gravity: FL_SouthEast FL_SouthEast
gravity: FL_East FL_East
name: button_previous
callback: C_FormBaseInputCB
argument: 0
@ -249,7 +268,7 @@ argument: 0
--------------------
class: FL_BUTTON
type: NORMAL_BUTTON
box: 570 120 90 30
box: 535 90 90 25
boxtype: FL_UP_BOX
colors: FL_COL1 FL_COL1
alignment: FL_ALIGN_CENTER
@ -259,43 +278,25 @@ lcol: FL_BLACK
label: Next|#N
shortcut:
resize: FL_RESIZE_NONE
gravity: FL_SouthEast FL_SouthEast
gravity: FL_East FL_East
name: button_next
callback: C_FormBaseInputCB
argument: 0
--------------------
class: FL_LABELFRAME
type: ENGRAVED_FRAME
box: 370 170 300 110
boxtype: FL_NO_BOX
colors: FL_BLACK FL_COL1
alignment: FL_ALIGN_TOP_LEFT
style: FL_NORMAL_STYLE
size: FL_NORMAL_SIZE
lcol: FL_BLACK
label: Citation style
shortcut:
resize: FL_RESIZE_ALL
gravity: FL_NoGravity FL_NoGravity
name: frame_style
callback:
argument:
--------------------
class: FL_CHOICE
type: NORMAL_CHOICE
box: 435 200 170 30
box: 455 135 180 25
boxtype: FL_FRAME_BOX
colors: FL_COL1 FL_BLACK
alignment: FL_ALIGN_TOP
alignment: FL_ALIGN_LEFT
style: FL_NORMAL_STYLE
size: FL_NORMAL_SIZE
lcol: FL_BLACK
label: Style:|#S
shortcut:
resize: FL_RESIZE_NONE
gravity: FL_SouthWest FL_SouthEast
gravity: FL_East FL_East
name: choice_style
callback: C_FormBaseInputCB
argument: 0
@ -303,7 +304,7 @@ argument: 0
--------------------
class: FL_CHECKBUTTON
type: PUSH_BUTTON
box: 375 240 30 30
box: 365 245 25 25
boxtype: FL_NO_BOX
colors: FL_COL1 FL_YELLOW
alignment: FL_ALIGN_RIGHT
@ -312,8 +313,8 @@ size: FL_NORMAL_SIZE
lcol: FL_BLACK
label: Full author list|#F
shortcut:
resize: FL_RESIZE_ALL
gravity: FL_NoGravity FL_NoGravity
resize: FL_RESIZE_NONE
gravity: FL_East FL_East
name: check_full_author_list
callback: C_FormBaseInputCB
argument: 0
@ -321,53 +322,35 @@ argument: 0
--------------------
class: FL_CHECKBUTTON
type: PUSH_BUTTON
box: 515 240 30 30
box: 365 275 25 25
boxtype: FL_NO_BOX
colors: FL_COL1 FL_YELLOW
alignment: FL_ALIGN_RIGHT
style: FL_NORMAL_STYLE
size: FL_NORMAL_SIZE
lcol: FL_BLACK
label: Upper case|#U
label: Force upper case|#u
shortcut:
resize: FL_RESIZE_ALL
gravity: FL_NoGravity FL_NoGravity
resize: FL_RESIZE_NONE
gravity: FL_East FL_East
name: check_force_uppercase
callback: C_FormBaseInputCB
argument: 0
--------------------
class: FL_LABELFRAME
type: ENGRAVED_FRAME
box: 370 290 300 90
boxtype: FL_NO_BOX
colors: FL_BLACK FL_COL1
alignment: FL_ALIGN_TOP_LEFT
style: FL_NORMAL_STYLE
size: FL_NORMAL_SIZE
lcol: FL_BLACK
label: Optional text
shortcut:
resize: FL_RESIZE_ALL
gravity: FL_NoGravity FL_NoGravity
name:
callback:
argument:
--------------------
class: FL_INPUT
type: NORMAL_INPUT
box: 460 305 200 30
box: 455 170 180 25
boxtype: FL_DOWN_BOX
colors: FL_COL1 FL_MCOL
alignment: FL_ALIGN_LEFT
style: FL_NORMAL_STYLE
size: FL_NORMAL_SIZE
lcol: FL_BLACK
label: Before:|#B
label: Text before:|#b
shortcut:
resize: FL_RESIZE_NONE
gravity: FL_SouthWest FL_SouthEast
gravity: FL_East FL_East
name: input_before
callback: C_FormBaseInputCB
argument: 0
@ -375,43 +358,25 @@ argument: 0
--------------------
class: FL_INPUT
type: NORMAL_INPUT
box: 460 340 200 30
box: 455 205 180 25
boxtype: FL_DOWN_BOX
colors: FL_COL1 FL_MCOL
alignment: FL_ALIGN_LEFT
style: FL_NORMAL_STYLE
size: FL_NORMAL_SIZE
lcol: FL_BLACK
label: After:|#e
label: Text after:|#a
shortcut:
resize: FL_RESIZE_NONE
gravity: FL_SouthWest FL_SouthEast
gravity: FL_East FL_East
name: input_after
callback: C_FormBaseInputCB
argument: 0
--------------------
class: FL_BUTTON
type: NORMAL_BUTTON
box: 10 400 100 30
boxtype: FL_UP_BOX
colors: FL_COL1 FL_COL1
alignment: FL_ALIGN_CENTER
style: FL_NORMAL_STYLE
size: FL_NORMAL_SIZE
lcol: FL_BLACK
label: Restore|#R
shortcut:
resize: FL_RESIZE_ALL
gravity: FL_SouthWest FL_SouthWest
name: button_restore
callback: C_FormBaseRestoreCB
argument: 0
--------------------
class: FL_BUTTON
type: RETURN_BUTTON
box: 360 400 90 30
box: 355 315 90 25
boxtype: FL_UP_BOX
colors: FL_COL1 FL_COL1
alignment: FL_ALIGN_CENTER
@ -420,7 +385,7 @@ size: FL_NORMAL_SIZE
lcol: FL_BLACK
label: OK
shortcut: ^M
resize: FL_RESIZE_ALL
resize: FL_RESIZE_NONE
gravity: FL_SouthEast FL_SouthEast
name: button_ok
callback: C_FormBaseOKCB
@ -429,25 +394,7 @@ argument: 0
--------------------
class: FL_BUTTON
type: NORMAL_BUTTON
box: 470 400 90 30
boxtype: FL_UP_BOX
colors: FL_COL1 FL_COL1
alignment: FL_ALIGN_CENTER
style: FL_NORMAL_STYLE
size: FL_NORMAL_SIZE
lcol: FL_BLACK
label: Apply|#A
shortcut:
resize: FL_RESIZE_ALL
gravity: FL_SouthEast FL_SouthEast
name: button_apply
callback: C_FormBaseApplyCB
argument: 0
--------------------
class: FL_BUTTON
type: NORMAL_BUTTON
box: 580 400 90 30
box: 545 315 90 25
boxtype: FL_UP_BOX
colors: FL_COL1 FL_COL1
alignment: FL_ALIGN_CENTER
@ -456,11 +403,29 @@ size: FL_NORMAL_SIZE
lcol: FL_BLACK
label: Cancel|^[
shortcut:
resize: FL_RESIZE_ALL
resize: FL_RESIZE_NONE
gravity: FL_SouthEast FL_SouthEast
name: button_close
callback: C_FormBaseCancelCB
argument: 0
--------------------
class: FL_BUTTON
type: NORMAL_BUTTON
box: 450 315 90 25
boxtype: FL_UP_BOX
colors: FL_COL1 FL_COL1
alignment: FL_ALIGN_CENTER
style: FL_NORMAL_STYLE
size: FL_NORMAL_SIZE
lcol: FL_BLACK
label: Apply|#A
shortcut:
resize: FL_RESIZE_NONE
gravity: FL_SouthEast FL_SouthEast
name: button_apply
callback: C_FormBaseApplyCB
argument: 0
==============================
create_the_forms

228
src/frontends/xforms/forms/form_ref.fd
View File

@ -5,22 +5,23 @@ Internal Form Definition File
Number of forms: 1
Unit of measure: FL_COORD_PIXEL
SnapGrid: 5
=============== FORM ===============
Name: form_ref
Width: 530
Height: 380
Width: 395
Height: 330
Number of Objects: 13
--------------------
class: FL_BOX
type: UP_BOX
box: 0 0 530 380
boxtype: FL_UP_BOX
type: FLAT_BOX
box: 0 0 395 330
boxtype: FL_FLAT_BOX
colors: FL_COL1 FL_COL1
alignment: FL_ALIGN_CENTER
style: FL_NORMAL_STYLE
size: FL_DEFAULT_SIZE
size: FL_NORMAL_SIZE
lcol: FL_BLACK
label:
shortcut:
@ -30,28 +31,10 @@ name:
callback:
argument:
--------------------
class: FL_CHOICE
type: NORMAL_CHOICE
box: 105 10 350 30
boxtype: FL_FRAME_BOX
colors: FL_COL1 FL_BLACK
alignment: FL_ALIGN_LEFT
style: FL_NORMAL_STYLE
size: FL_DEFAULT_SIZE
lcol: FL_BLACK
label: Buffer|#B
shortcut:
resize: FL_RESIZE_NONE
gravity: FL_SouthEast FL_SouthEast
name: choice_buffer
callback: C_FormBaseInputCB
argument: 0
--------------------
class: FL_BROWSER
type: HOLD_BROWSER
box: 10 50 270 240
box: 5 35 385 110
boxtype: FL_DOWN_BOX
colors: FL_COL1 FL_YELLOW
alignment: FL_ALIGN_TOP
@ -61,7 +44,7 @@ lcol: FL_BLACK
label:
shortcut:
resize: FL_RESIZE_ALL
gravity: FL_NorthWest FL_South
gravity: FL_NorthWest FL_SouthEast
name: browser_refs
callback: C_FormBaseInputCB
argument: 0
@ -69,17 +52,17 @@ argument: 0
--------------------
class: FL_BUTTON
type: NORMAL_BUTTON
box: 10 300 100 30
box: 110 155 100 25
boxtype: FL_UP_BOX
colors: FL_COL1 FL_COL1
alignment: FL_ALIGN_CENTER
style: FL_NORMAL_STYLE
size: FL_DEFAULT_SIZE
size: FL_NORMAL_SIZE
lcol: FL_BLACK
label: Update|#U
shortcut:
resize: FL_RESIZE_NONE
gravity: FL_SouthWest FL_SouthWest
gravity: FL_South FL_South
name: button_update
callback: C_FormBaseInputCB
argument: 0
@ -87,107 +70,35 @@ argument: 0
--------------------
class: FL_CHECKBUTTON
type: PUSH_BUTTON
box: 130 300 30 30
box: 5 155 25 25
boxtype: FL_NO_BOX
colors: FL_COL1 FL_YELLOW
alignment: FL_ALIGN_RIGHT
style: FL_NORMAL_STYLE
size: FL_DEFAULT_SIZE
size: FL_NORMAL_SIZE
lcol: FL_BLACK
label: Sort|#S
shortcut:
resize: FL_RESIZE_NONE
gravity: FL_SouthWest FL_SouthWest
gravity: FL_South FL_South
name: check_sort
callback: C_FormBaseInputCB
argument: 0
--------------------
class: FL_INPUT
type: NORMAL_INPUT
box: 370 50 150 40
boxtype: FL_DOWN_BOX
colors: FL_COL1 FL_MCOL
alignment: FL_ALIGN_LEFT
style: FL_NORMAL_STYLE
size: FL_DEFAULT_SIZE
lcol: FL_BLACK
label: Name:|#N
shortcut:
resize: FL_RESIZE_NONE
gravity: FL_NorthEast FL_NorthEast
name: input_name
callback:
argument:
--------------------
class: FL_INPUT
type: NORMAL_INPUT
box: 370 100 150 40
boxtype: FL_DOWN_BOX
colors: FL_COL1 FL_MCOL
alignment: FL_ALIGN_LEFT
style: FL_NORMAL_STYLE
size: FL_DEFAULT_SIZE
lcol: FL_BLACK
label: Ref:
shortcut:
resize: FL_RESIZE_NONE
gravity: FL_NorthEast FL_NorthEast
name: input_ref
callback:
argument:
--------------------
class: FL_CHOICE
type: NORMAL_CHOICE
box: 370 170 150 40
boxtype: FL_FRAME_BOX
colors: FL_COL1 FL_BLACK
alignment: FL_ALIGN_TOP
style: FL_NORMAL_STYLE
size: FL_DEFAULT_SIZE
lcol: FL_BLACK
label: Reference type|#R
shortcut:
resize: FL_RESIZE_NONE
gravity: FL_SouthEast FL_SouthEast
name: choice_type
callback: C_FormBaseInputCB
argument: 0
--------------------
class: FL_BUTTON
type: NORMAL_BUTTON
box: 370 220 150 40
box: 5 300 90 25
boxtype: FL_UP_BOX
colors: FL_COL1 FL_COL1
alignment: FL_ALIGN_CENTER
style: FL_NORMAL_STYLE
size: FL_DEFAULT_SIZE
lcol: FL_BLACK
label: Goto reference|#G
shortcut:
resize: FL_RESIZE_NONE
gravity: FL_SouthEast FL_SouthEast
name: button_go
callback: C_FormBaseInputCB
argument: 0
--------------------
class: FL_BUTTON
type: NORMAL_BUTTON
box: 10 340 100 30
boxtype: FL_UP_BOX
colors: FL_COL1 FL_COL1
alignment: FL_ALIGN_CENTER
style: FL_NORMAL_STYLE
size: FL_DEFAULT_SIZE
size: FL_NORMAL_SIZE
lcol: FL_BLACK
label: Restore|#R
shortcut:
resize: FL_RESIZE_NONE
gravity: FL_SouthEast FL_SouthEast
gravity: FL_SouthWest FL_SouthWest
name: button_restore
callback: C_FormBaseRestoreCB
argument: 0
@ -195,12 +106,12 @@ argument: 0
--------------------
class: FL_BUTTON
type: RETURN_BUTTON
box: 230 340 90 30
box: 110 300 90 25
boxtype: FL_UP_BOX
colors: FL_COL1 FL_COL1
alignment: FL_ALIGN_CENTER
style: FL_NORMAL_STYLE
size: FL_DEFAULT_SIZE
size: FL_NORMAL_SIZE
lcol: FL_BLACK
label: OK
shortcut: ^M
@ -213,12 +124,12 @@ argument: 0
--------------------
class: FL_BUTTON
type: NORMAL_BUTTON
box: 430 340 90 30
box: 300 300 90 25
boxtype: FL_UP_BOX
colors: FL_COL1 FL_COL1
alignment: FL_ALIGN_CENTER
style: FL_NORMAL_STYLE
size: FL_DEFAULT_SIZE
size: FL_NORMAL_SIZE
lcol: FL_BLACK
label: Cancel|^[
shortcut:
@ -231,12 +142,12 @@ argument: 0
--------------------
class: FL_BUTTON
type: NORMAL_BUTTON
box: 330 340 90 30
box: 205 300 90 25
boxtype: FL_UP_BOX
colors: FL_COL1 FL_COL1
alignment: FL_ALIGN_CENTER
style: FL_NORMAL_STYLE
size: FL_DEFAULT_SIZE
size: FL_NORMAL_SIZE
lcol: FL_BLACK
label: Apply|#A
shortcut:
@ -246,5 +157,96 @@ name: button_apply
callback: C_FormBaseApplyCB
argument: 0
--------------------
class: FL_CHOICE
type: NORMAL_CHOICE
box: 95 5 295 25
boxtype: FL_FRAME_BOX
colors: FL_COL1 FL_BLACK
alignment: FL_ALIGN_LEFT
style: FL_NORMAL_STYLE
size: FL_NORMAL_SIZE
lcol: FL_BLACK
label: Document|#D
shortcut:
resize: FL_RESIZE_X
gravity: FL_NorthWest FL_NorthEast
name: choice_document
callback: C_FormBaseInputCB
argument: 0
align: FL_ALIGN_LEFT
--------------------
class: FL_INPUT
type: NORMAL_INPUT
box: 110 265 280 25
boxtype: FL_DOWN_BOX
colors: FL_COL1 FL_MCOL
alignment: FL_ALIGN_LEFT
style: FL_NORMAL_STYLE
size: FL_NORMAL_SIZE
lcol: FL_BLACK
label: Name:|#N
shortcut:
resize: FL_RESIZE_X
gravity: FL_South FL_South
name: input_name
callback:
argument:
--------------------
class: FL_INPUT
type: NORMAL_INPUT
box: 110 195 280 25
boxtype: FL_DOWN_BOX
colors: FL_COL1 FL_MCOL
alignment: FL_ALIGN_LEFT
style: FL_NORMAL_STYLE
size: FL_NORMAL_SIZE
lcol: FL_BLACK
label: Reference:|#e
shortcut:
resize: FL_RESIZE_X
gravity: FL_South FL_South
name: input_ref
callback:
argument:
--------------------
class: FL_CHOICE
type: NORMAL_CHOICE
box: 110 230 280 25
boxtype: FL_FRAME_BOX
colors: FL_COL1 FL_BLACK
alignment: FL_ALIGN_LEFT
style: FL_NORMAL_STYLE
size: FL_NORMAL_SIZE
lcol: FL_BLACK
label: Format|#F
shortcut:
resize: FL_RESIZE_X
gravity: FL_South FL_South
name: choice_format
callback: C_FormBaseInputCB
argument: 0
--------------------
class: FL_BUTTON
type: NORMAL_BUTTON
box: 220 155 100 25
boxtype: FL_UP_BOX
colors: FL_COL1 FL_COL1
alignment: FL_ALIGN_CENTER
style: FL_NORMAL_STYLE
size: FL_NORMAL_SIZE
lcol: FL_BLACK
label: Go to|#G
shortcut:
resize: FL_RESIZE_NONE
gravity: FL_South FL_South
name: button_go
callback: C_FormBaseInputCB
argument: 0
==============================
create_the_forms

168
src/frontends/xforms/forms/form_spellchecker.fd
View File

@ -5,18 +5,19 @@ Internal Form Definition File
Number of forms: 1
Unit of measure: FL_COORD_PIXEL
SnapGrid: 5
=============== FORM ===============
Name: form_spellchecker
Width: 540
Height: 280
Number of Objects: 14
Width: 215
Height: 310
Number of Objects: 12
--------------------
class: FL_BOX
type: UP_BOX
box: 0 0 540 280
boxtype: FL_UP_BOX
type: FLAT_BOX
box: 0 0 215 310
boxtype: FL_FLAT_BOX
colors: FL_COL1 FL_COL1
alignment: FL_ALIGN_CENTER
style: FL_NORMAL_STYLE
@ -33,7 +34,25 @@ argument:
--------------------
class: FL_TEXT
type: NORMAL_TEXT
box: 80 10 220 30
box: 5 3 205 25
boxtype: FL_FLAT_BOX
colors: FL_COL1 FL_MCOL
alignment: FL_ALIGN_LEFT|FL_ALIGN_INSIDE
style: FL_NORMAL_STYLE
size: FL_NORMAL_SIZE
lcol: FL_BLACK
label: Unknown:
shortcut:
resize: FL_RESIZE_X
gravity: FL_NorthWest FL_NorthEast
name:
callback:
argument: 0
--------------------
class: FL_TEXT
type: NORMAL_TEXT
box: 5 25 205 25
boxtype: FL_DOWN_BOX
colors: FL_COL1 FL_MCOL
alignment: FL_ALIGN_LEFT|FL_ALIGN_INSIDE
@ -42,8 +61,8 @@ size: FL_NORMAL_SIZE
lcol: FL_BLACK
label:
shortcut:
resize: FL_RESIZE_ALL
gravity: FL_NoGravity FL_NoGravity
resize: FL_RESIZE_X
gravity: FL_NorthWest FL_NorthEast
name: text
callback: C_FormBaseInputCB
argument: 0
@ -51,17 +70,17 @@ argument: 0
--------------------
class: FL_INPUT
type: NORMAL_INPUT
box: 80 40 220 30
box: 5 70 205 25
boxtype: FL_DOWN_BOX
colors: FL_COL1 FL_MCOL
alignment: FL_ALIGN_LEFT
alignment: FL_ALIGN_TOP_LEFT
style: FL_NORMAL_STYLE
size: FL_NORMAL_SIZE
lcol: FL_BLACK
label: Replace
label: Replacement:|#R
shortcut:
resize: FL_RESIZE_ALL
gravity: FL_NoGravity FL_NoGravity
resize: FL_RESIZE_X
gravity: FL_NorthWest FL_NorthEast
name: input
callback: C_FormBaseInputCB
argument: 0
@ -69,17 +88,17 @@ argument: 0
--------------------
class: FL_BROWSER
type: SELECT_BROWSER
box: 80 70 220 150
box: 5 185 205 75
boxtype: FL_DOWN_BOX
colors: FL_COL1 FL_YELLOW
alignment: FL_ALIGN_LEFT
alignment: FL_ALIGN_TOP_LEFT
style: FL_NORMAL_STYLE
size: FL_NORMAL_SIZE
lcol: FL_BLACK
label: Suggestions
label: Suggestions:|#g
shortcut:
resize: FL_RESIZE_ALL
gravity: FL_NoGravity FL_NoGravity
gravity: FL_NorthWest FL_SouthEast
name: browser
callback: C_FormBaseInputCB
argument: 0
@ -87,17 +106,17 @@ argument: 0
--------------------
class: FL_BUTTON
type: NORMAL_BUTTON
box: 310 10 220 30
box: 5 280 90 25
boxtype: FL_UP_BOX
colors: FL_COL1 FL_COL1
alignment: FL_ALIGN_CENTER
style: FL_NORMAL_STYLE
size: FL_NORMAL_SIZE
lcol: FL_BLACK
label: Start spellchecking|#S
label: Start|#S
shortcut:
resize: FL_RESIZE_ALL
gravity: FL_NoGravity FL_NoGravity
resize: FL_RESIZE_NONE
gravity: FL_SouthWest FL_SouthWest
name: button_start
callback: C_FormBaseInputCB
argument: 0
@ -105,35 +124,35 @@ argument: 0
--------------------
class: FL_BUTTON
type: NORMAL_BUTTON
box: 310 50 220 30
box: 110 135 100 25
boxtype: FL_UP_BOX
colors: FL_COL1 FL_COL1
alignment: FL_ALIGN_CENTER
style: FL_NORMAL_STYLE
size: FL_NORMAL_SIZE
lcol: FL_BLACK
label: Insert in personal dictionary|#I
label: Add|#d
shortcut:
resize: FL_RESIZE_ALL
gravity: FL_NoGravity FL_NoGravity
name: button_insert
resize: FL_RESIZE_X
gravity: FL_North FL_NorthEast
name: button_add
callback: C_FormBaseInputCB
argument: 0
--------------------
class: FL_BUTTON
type: NORMAL_BUTTON
box: 310 110 220 30
box: 110 105 100 25
boxtype: FL_UP_BOX
colors: FL_COL1 FL_COL1
alignment: FL_ALIGN_CENTER
style: FL_NORMAL_STYLE
size: FL_NORMAL_SIZE
lcol: FL_BLACK
label: Ignore word|#g
label: Ignore|#I
shortcut:
resize: FL_RESIZE_ALL
gravity: FL_NoGravity FL_NoGravity
resize: FL_RESIZE_X
gravity: FL_North FL_NorthEast
name: button_ignore
callback: C_FormBaseInputCB
argument: 0
@ -141,17 +160,17 @@ argument: 0
--------------------
class: FL_BUTTON
type: NORMAL_BUTTON
box: 310 80 220 30
box: 5 135 100 25
boxtype: FL_UP_BOX
colors: FL_COL1 FL_COL1
alignment: FL_ALIGN_CENTER
style: FL_NORMAL_STYLE
size: FL_NORMAL_SIZE
lcol: FL_BLACK
label: Accept word in this session|#A
label: Accept|#A
shortcut:
resize: FL_RESIZE_ALL
gravity: FL_NoGravity FL_NoGravity
resize: FL_RESIZE_X
gravity: FL_NorthWest FL_North
name: button_accept
callback: C_FormBaseInputCB
argument: 0
@ -159,89 +178,35 @@ argument: 0
--------------------
class: FL_BUTTON
type: NORMAL_BUTTON
box: 310 200 220 30
box: 120 280 90 25
boxtype: FL_UP_BOX
colors: FL_COL1 FL_COL1
alignment: FL_ALIGN_CENTER
style: FL_NORMAL_STYLE
size: FL_NORMAL_SIZE
lcol: FL_BLACK
label: Stop spellchecking|#T
label: Close|#C^[
shortcut:
resize: FL_RESIZE_ALL
gravity: FL_NoGravity FL_NoGravity
name: button_stop
callback: C_FormBaseInputCB
argument: 0
--------------------
class: FL_BUTTON
type: NORMAL_BUTTON
box: 310 240 220 30
boxtype: FL_UP_BOX
colors: FL_COL1 FL_COL1
alignment: FL_ALIGN_CENTER
style: FL_NORMAL_STYLE
size: FL_NORMAL_SIZE
lcol: FL_BLACK
label: Close Spellchecker|#C^[
shortcut:
resize: FL_RESIZE_ALL
gravity: FL_NoGravity FL_NoGravity
resize: FL_RESIZE_NONE
gravity: FL_SouthEast FL_SouthEast
name: button_close
callback: C_FormBaseCancelCB
argument: 0
--------------------
class: FL_BOX
type: NO_BOX
box: 10 250 50 20
boxtype: FL_NO_BOX
colors: FL_COL1 FL_COL1
alignment: FL_ALIGN_LEFT|FL_ALIGN_INSIDE
style: FL_NORMAL_STYLE
size: FL_NORMAL_SIZE
lcol: FL_BLACK
label: 0 %
shortcut:
resize: FL_RESIZE_ALL
gravity: FL_NoGravity FL_NoGravity
name:
callback:
argument:
--------------------
class: FL_BOX
type: NO_BOX
box: 250 250 50 20
boxtype: FL_NO_BOX
colors: FL_COL1 FL_COL1
alignment: FL_ALIGN_RIGHT|FL_ALIGN_INSIDE
style: FL_NORMAL_STYLE
size: FL_NORMAL_SIZE
lcol: FL_BLACK
label: 100 %
shortcut:
resize: FL_RESIZE_ALL
gravity: FL_NoGravity FL_NoGravity
name:
callback:
argument:
--------------------
class: FL_BUTTON
type: NORMAL_BUTTON
box: 310 140 220 30
box: 5 105 100 25
boxtype: FL_UP_BOX
colors: FL_COL1 FL_COL1
alignment: FL_ALIGN_CENTER
style: FL_NORMAL_STYLE
size: FL_NORMAL_SIZE
lcol: FL_BLACK
label: Replace word|#R
label: Replace|#R
shortcut:
resize: FL_RESIZE_ALL
gravity: FL_NoGravity FL_NoGravity
resize: FL_RESIZE_X
gravity: FL_NorthWest FL_North
name: button_replace
callback: C_FormBaseInputCB
argument: 0
@ -249,7 +214,7 @@ argument: 0
--------------------
class: FL_SLIDER
type: HOR_FILL_SLIDER
box: 10 230 290 20
box: 5 265 205 10
boxtype: FL_DOWN_BOX
colors: FL_BLUE FL_COL1
alignment: FL_ALIGN_LEFT
@ -258,11 +223,14 @@ size: 0
lcol: FL_BLACK
label:
shortcut:
resize: FL_RESIZE_ALL
gravity: FL_NoGravity FL_NoGravity
resize: FL_RESIZE_X
gravity: FL_SouthWest FL_SouthEast
name: slider
callback:
argument:
bounds: 0 100
value: 0
step: 1
==============================
create_the_forms

29
src/frontends/xforms/forms/form_toc.fd
View File

@ -5,18 +5,19 @@ Internal Form Definition File
Number of forms: 1
Unit of measure: FL_COORD_PIXEL
SnapGrid: 5
=============== FORM ===============
Name: form_toc
Width: 420
Height: 340
Width: 375
Height: 250
Number of Objects: 5
--------------------
class: FL_BOX
type: UP_BOX
box: 0 0 420 340
boxtype: FL_UP_BOX
type: FLAT_BOX
box: 0 0 375 250
boxtype: FL_FLAT_BOX
colors: FL_COL1 FL_COL1
alignment: FL_ALIGN_CENTER
style: FL_NORMAL_STYLE
@ -33,7 +34,7 @@ argument:
--------------------
class: FL_BROWSER
type: HOLD_BROWSER
box: 10 10 400 280
box: 5 5 365 205
boxtype: FL_DOWN_BOX
colors: FL_COL1 FL_YELLOW
alignment: FL_ALIGN_BOTTOM
@ -51,7 +52,7 @@ argument: 0
--------------------
class: FL_BUTTON
type: NORMAL_BUTTON
box: 200 300 100 30
box: 185 220 90 25
boxtype: FL_UP_BOX
colors: FL_COL1 FL_COL1
alignment: FL_ALIGN_CENTER
@ -61,7 +62,7 @@ lcol: FL_BLACK
label: Update|#U
shortcut:
resize: FL_RESIZE_NONE
gravity: FL_SouthEast FL_SouthEast
gravity: FL_SouthWest FL_SouthWest
name: button_update
callback: C_FormBaseInputCB
argument: 0
@ -69,25 +70,25 @@ argument: 0
--------------------
class: FL_CHOICE
type: NORMAL_CHOICE
box: 60 300 130 30
box: 60 220 120 25
boxtype: FL_FRAME_BOX
colors: FL_COL1 FL_BLACK
alignment: FL_ALIGN_LEFT
style: FL_NORMAL_STYLE
size: FL_DEFAULT_SIZE
size: FL_NORMAL_SIZE
lcol: FL_BLACK
label: Type|#T
shortcut:
resize: FL_RESIZE_NONE
gravity: FL_SouthEast FL_SouthEast
gravity: FL_SouthWest FL_SouthWest
name: choice_toc_type
callback: C_FormBaseInputCB
argument: 0
--------------------
class: FL_BUTTON
type: RETURN_BUTTON
box: 310 300 100 30
type: NORMAL_BUTTON
box: 280 220 90 25
boxtype: FL_UP_BOX
colors: FL_COL1 FL_COL1
alignment: FL_ALIGN_CENTER
@ -95,7 +96,7 @@ style: FL_NORMAL_STYLE
size: FL_NORMAL_SIZE
lcol: FL_BLACK
label: Close|^[^M
shortcut:
shortcut:
resize: FL_RESIZE_NONE
gravity: FL_SouthEast FL_SouthEast
name: button_close

49
src/frontends/xforms/forms/form_url.fd
View File

@ -5,18 +5,19 @@ Internal Form Definition File
Number of forms: 1
Unit of measure: FL_COORD_PIXEL
SnapGrid: 5
=============== FORM ===============
Name: form_url
Width: 520
Height: 170
Width: 395
Height: 125
Number of Objects: 8
--------------------
class: FL_BOX
type: UP_BOX
box: 0 0 520 170
boxtype: FL_UP_BOX
type: FLAT_BOX
box: 0 0 395 125
boxtype: FL_FLAT_BOX
colors: FL_COL1 FL_COL1
alignment: FL_ALIGN_CENTER
style: FL_NORMAL_STYLE
@ -24,8 +25,8 @@ size: FL_DEFAULT_SIZE
lcol: FL_BLACK
label:
shortcut:
resize: FL_RESIZE_ALL
gravity: FL_NoGravity FL_NoGravity
resize: FL_RESIZE_X
gravity: FL_NorthWest FL_SouthEast
name:
callback:
argument:
@ -33,7 +34,7 @@ argument:
--------------------
class: FL_INPUT
type: NORMAL_INPUT
box: 70 50 440 30
box: 70 30 320 25
boxtype: FL_DOWN_BOX
colors: FL_COL1 FL_MCOL
alignment: FL_ALIGN_LEFT
@ -43,7 +44,7 @@ lcol: FL_BLACK
label: URL|#U
shortcut:
resize: FL_RESIZE_X
gravity: FL_NorthWest FL_NorthEast
gravity: FL_West FL_East
name: input_url
callback: C_FormBaseInputCB
argument: 0
@ -51,7 +52,7 @@ argument: 0
--------------------
class: FL_INPUT
type: NORMAL_INPUT
box: 70 90 440 30
box: 70 60 320 25
boxtype: FL_DOWN_BOX
colors: FL_COL1 FL_MCOL
alignment: FL_ALIGN_LEFT
@ -61,7 +62,7 @@ lcol: FL_BLACK
label: Name|#N
shortcut:
resize: FL_RESIZE_X
gravity: FL_NorthWest FL_NorthEast
gravity: FL_West FL_East
name: input_name
callback: C_FormBaseInputCB
argument: 0
@ -69,17 +70,17 @@ argument: 0
--------------------
class: FL_CHECKBUTTON
type: PUSH_BUTTON
box: 480 10 30 30
box: 70 5 25 25
boxtype: FL_NO_BOX
colors: FL_COL1 FL_YELLOW
alignment: FL_ALIGN_LEFT
alignment: FL_ALIGN_RIGHT
style: FL_NORMAL_STYLE
size: FL_NORMAL_SIZE
lcol: FL_BLACK
label: HTML type|#H
shortcut:
resize: FL_RESIZE_X
gravity: FL_NorthWest FL_NorthEast
resize: FL_RESIZE_NONE
gravity: FL_West FL_West
name: check_html
callback: C_FormBaseInputCB
argument: 0
@ -87,7 +88,7 @@ argument: 0
--------------------
class: FL_BUTTON
type: NORMAL_BUTTON
box: 410 130 100 30
box: 300 95 90 25
boxtype: FL_UP_BOX
colors: FL_COL1 FL_COL1
alignment: FL_ALIGN_CENTER
@ -104,17 +105,17 @@ argument: 0
--------------------
class: FL_BUTTON
type: RETURN_BUTTON
box: 190 130 100 30
type: NORMAL_BUTTON
box: 110 95 90 25
boxtype: FL_UP_BOX
colors: FL_COL1 FL_COL1
alignment: FL_ALIGN_CENTER
style: FL_NORMAL_STYLE
size: FL_DEFAULT_SIZE
size: FL_NORMAL_SIZE
lcol: FL_BLACK
label: OK
shortcut: ^M
resize: FL_RESIZE_ALL
shortcut:
resize: FL_RESIZE_NONE
gravity: FL_SouthEast FL_SouthEast
name: button_ok
callback: C_FormBaseOKCB
@ -123,7 +124,7 @@ argument: 0
--------------------
class: FL_BUTTON
type: NORMAL_BUTTON
box: 300 130 100 30
box: 205 95 90 25
boxtype: FL_UP_BOX
colors: FL_COL1 FL_COL1
alignment: FL_ALIGN_CENTER
@ -141,7 +142,7 @@ argument: 0
--------------------
class: FL_BUTTON
type: NORMAL_BUTTON
box: 10 130 100 30
box: 5 95 90 25
boxtype: FL_UP_BOX
colors: FL_COL1 FL_COL1
alignment: FL_ALIGN_CENTER
@ -151,7 +152,7 @@ lcol: FL_BLACK
label: Restore|#R
shortcut:
resize: FL_RESIZE_NONE
gravity: FL_SouthEast FL_SouthEast
gravity: FL_SouthWest FL_SouthWest
name: button_restore
callback: C_FormBaseRestoreCB
argument: 0

4
src/insets/ChangeLog
View File

@ -1,3 +1,7 @@
2002-09-29 Martin Vermeer <martin.vermeer@hut.fi>
* insetgraphics.C: disfuscated use of ']' in built output string.
2002-09-06 Lars Gullik Bjønnes <larsbj@gullik.net>
* remove all INHERIT_LANG and INHERIT_LANGUAGE commented code.

10
src/insets/insetgraphics.C
View File

@ -684,7 +684,7 @@ int InsetGraphics::latex(Buffer const *buf, ostream & os,
IsFileReadable(file_ + ".eps") || // original.eps
IsFileReadable(file_ + ".ps")); // original.ps
string const message = file_exists ?
string() : string("bb = 0 0 200 100, draft, type=eps]");
string() : string("bb = 0 0 200 100, draft, type=eps");
// if !message.empty() than there was no existing file
// "filename(.(e)ps)" found. In this case LaTeX
// draws only a rectangle with the above bb and the
@ -709,11 +709,9 @@ int InsetGraphics::latex(Buffer const *buf, ostream & os,
lyxerr[Debug::GRAPHICS] << "\tOpts = " << opts << endl;
if (!opts.empty() && !message.empty())
before += ("[%\n" + opts + ',' + message);
else if (!message.empty())
before += ("[%\n" + message);
else if (!opts.empty())
before += ("[%\n" + opts + ']');
before += ("[%\n" + opts + ',' + message + ']');
else if (!opts.empty() || !message.empty())
before += ("[%\n" + opts + message + ']');
lyxerr[Debug::GRAPHICS]
<< "\tBefore = " << before