anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-09-21 15:18:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

white-space changes to FormCitation.

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@1525 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Angus Leeming 2001-02-16 18:50:28 +00:00
parent eab19a9927
commit eb5f9093b4
6 changed files with 245 additions and 265 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/frontends/xforms/ChangeLog
View File

@ -1,3 +1,17 @@
2001-02-16 Angus Leeming <a.leeming@ic.ac.uk>
* FormCitation.C: lots of white-space changes to make file consistent
with LyX style.
(input): use the FL_OBJECT * parameter to decide what to do, not the
long parameter.
* FormCitation.h: removed most entries in enum.
* forms/form_citation.fd: change names of variables, consistent with
Allan's naming scheme.
Don't pass any particular arguments to the InputCB function.
choice_style now triggers a callback and looks like other choices.
2001-02-16 Lars Gullik Bjønnes <larsbj@lyx.org> 2001-02-16 Lars Gullik Bjønnes <larsbj@lyx.org>
* other: use compare instead of strcmp/strncmp * other: use compare instead of strcmp/strncmp

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

@ -53,14 +53,14 @@ FormCitation::~FormCitation()
FL_FORM * FormCitation::form() const FL_FORM * FormCitation::form() const
{ {
if (dialog_ ) return dialog_->form; if (dialog_) return dialog_->form;
return 0; return 0;
} }
void FormCitation::connect() void FormCitation::connect()
{ {
//fl_set_form_maxsize( dialog_->form, 3*minw_, minh_ ); //fl_set_form_maxsize(dialog_->form, 3*minw_, minh_);
FormCommand::connect(); FormCommand::connect();
} }
@ -90,15 +90,15 @@ void FormCitation::build()
bc_.setUndoAll(dialog_->button_restore); bc_.setUndoAll(dialog_->button_restore);
bc_.refresh(); bc_.refresh();
bc_.addReadOnly(dialog_->addBtn); bc_.addReadOnly(dialog_->button_add);
bc_.addReadOnly(dialog_->delBtn); bc_.addReadOnly(dialog_->button_del);
bc_.addReadOnly(dialog_->upBtn); bc_.addReadOnly(dialog_->button_up);
bc_.addReadOnly(dialog_->downBtn); bc_.addReadOnly(dialog_->button_down);
bc_.addReadOnly(dialog_->textBefore); bc_.addReadOnly(dialog_->input_before);
bc_.addReadOnly(dialog_->textAftr); bc_.addReadOnly(dialog_->input_after);
bc_.addDontTriggerChange(dialog_->citeBrsr); bc_.addDontTriggerChange(dialog_->browser_cite);
bc_.addDontTriggerChange(dialog_->bibBrsr); bc_.addDontTriggerChange(dialog_->browser_bib);
} }
@ -118,58 +118,58 @@ void FormCitation::update()
bibkeysInfo.push_back(blist[i].second); bibkeysInfo.push_back(blist[i].second);
} }
blist.clear(); blist.clear();
updateBrowser(dialog_->browser_bib, bibkeys);
// Ditto for the keys cited in this inset
citekeys.clear(); citekeys.clear();
string tmp, keys( params.getContents() ); string tmp, keys(params.getContents());
keys = frontStrip( split(keys, tmp, ',') ); keys = frontStrip(split(keys, tmp, ','));
while (!tmp.empty()) { while (!tmp.empty()) {
citekeys.push_back( tmp ); citekeys.push_back(tmp);
keys = frontStrip( split(keys, tmp, ',') ); keys = frontStrip(split(keys, tmp, ','));
} }
updateBrowser(dialog_->browser_cite, citekeys);
updateBrowser( dialog_->bibBrsr, bibkeys );
updateBrowser( dialog_->citeBrsr, citekeys );
fl_clear_browser( dialog_->infoBrsr );
// No keys have been selected yet, so... // No keys have been selected yet, so...
setBibButtons( OFF ); fl_clear_browser(dialog_->browser_info);
setCiteButtons( OFF ); setBibButtons(OFF);
setCiteButtons(OFF);
int noKeys = static_cast<int>( max( bibkeys.size(), citekeys.size() ) ); int noKeys = static_cast<int>(max(bibkeys.size(), citekeys.size()));
// Place bounds, so that 4 <= noKeys <= 10 // Place bounds, so that 4 <= noKeys <= 10
noKeys = max(4, min(10, noKeys) ); noKeys = max(4, min(10, noKeys));
// Re-size the form to accommodate the new browser size // Re-size the form to accommodate the new browser size
int size = 20 * noKeys; int size = 20 * noKeys;
bool bibPresent = ( bibkeys.size() > 0 ); bool bibPresent = (bibkeys.size() > 0);
setSize( size, bibPresent ); setSize(size, bibPresent);
fl_set_input( dialog_->textAftr, params.getOptions().c_str()); fl_set_input(dialog_->input_after, params.getOptions().c_str());
} }
void FormCitation::updateBrowser( FL_OBJECT * browser, void FormCitation::updateBrowser(FL_OBJECT * browser,
vector<string> const & keys ) const vector<string> const & keys) const
{ {
fl_clear_browser( browser ); fl_clear_browser(browser);
for (unsigned int i = 0; i < keys.size(); ++i ) for (unsigned int i = 0; i < keys.size(); ++i)
fl_add_browser_line( browser, keys[i].c_str()); fl_add_browser_line(browser, keys[i].c_str());
} }
void FormCitation::setBibButtons( State status ) const void FormCitation::setBibButtons(State status) const
{ {
switch (status) { switch (status) {
case ON: case ON:
fl_activate_object( dialog_->addBtn ); fl_activate_object(dialog_->button_add);
fl_set_object_lcol( dialog_->addBtn, FL_BLACK ); fl_set_object_lcol(dialog_->button_add, FL_BLACK);
break; break;
case OFF: case OFF:
fl_deactivate_object( dialog_->addBtn ); fl_deactivate_object(dialog_->button_add);
fl_set_object_lcol( dialog_->addBtn, FL_INACTIVE ); fl_set_object_lcol(dialog_->button_add, FL_INACTIVE);
break; break;
default: default:
@ -178,44 +178,44 @@ void FormCitation::setBibButtons( State status ) const
} }
void FormCitation::setCiteButtons( State status ) const void FormCitation::setCiteButtons(State status) const
{ {
switch (status) { switch (status) {
case ON: case ON:
{ {
fl_activate_object( dialog_->delBtn ); fl_activate_object(dialog_->button_del);
fl_set_object_lcol( dialog_->delBtn, FL_BLACK ); fl_set_object_lcol(dialog_->button_del, FL_BLACK);
int sel = fl_get_browser( dialog_->citeBrsr ); int sel = fl_get_browser(dialog_->browser_cite);
if (sel != 1) { if (sel != 1) {
fl_activate_object( dialog_->upBtn ); fl_activate_object(dialog_->button_up);
fl_set_object_lcol( dialog_->upBtn, FL_BLACK ); fl_set_object_lcol(dialog_->button_up, FL_BLACK);
} else { } else {
fl_deactivate_object( dialog_->upBtn ); fl_deactivate_object(dialog_->button_up);
fl_set_object_lcol( dialog_->upBtn, FL_INACTIVE ); fl_set_object_lcol(dialog_->button_up, FL_INACTIVE);
} }
if (sel != fl_get_browser_maxline(dialog_->citeBrsr)) { if (sel != fl_get_browser_maxline(dialog_->browser_cite)) {
fl_activate_object( dialog_->downBtn ); fl_activate_object(dialog_->button_down);
fl_set_object_lcol( dialog_->downBtn, FL_BLACK ); fl_set_object_lcol(dialog_->button_down, FL_BLACK);
} else { } else {
fl_deactivate_object( dialog_->downBtn ); fl_deactivate_object(dialog_->button_down);
fl_set_object_lcol( dialog_->downBtn, FL_INACTIVE ); fl_set_object_lcol(dialog_->button_down, FL_INACTIVE);
} }
break; break;
} }
case OFF: case OFF:
{ {
fl_deactivate_object( dialog_->delBtn ); fl_deactivate_object(dialog_->button_del);
fl_set_object_lcol( dialog_->delBtn, FL_INACTIVE ); fl_set_object_lcol(dialog_->button_del, FL_INACTIVE);
fl_deactivate_object( dialog_->upBtn ); fl_deactivate_object(dialog_->button_up);
fl_set_object_lcol( dialog_->upBtn, FL_INACTIVE ); fl_set_object_lcol(dialog_->button_up, FL_INACTIVE);
fl_deactivate_object( dialog_->downBtn ); fl_deactivate_object(dialog_->button_down);
fl_set_object_lcol( dialog_->downBtn, FL_INACTIVE ); fl_set_object_lcol(dialog_->button_down, FL_INACTIVE);
} }
default: default:
break; break;
@ -223,10 +223,10 @@ void FormCitation::setCiteButtons( State status ) const
} }
void FormCitation::setSize( int hbrsr, bool bibPresent ) const void FormCitation::setSize(int hbrsr, bool bibPresent) const
{ {
bool const natbib = false; // will eventually be input bool const natbib = false; // will eventually be input
hbrsr = max( hbrsr, 175 ); // limit max size of cite/bib brsrs hbrsr = max(hbrsr, 175); // limit max size of cite/bib brsrs
// dh1, dh2, dh3 are the vertical separation between elements. // dh1, dh2, dh3 are the vertical separation between elements.
// These can be specified because the browser height is fixed // These can be specified because the browser height is fixed
@ -234,237 +234,213 @@ void FormCitation::setSize( int hbrsr, bool bibPresent ) const
static int const dh1 = 30; // top of form to top of cite/bib brsrs; static int const dh1 = 30; // top of form to top of cite/bib brsrs;
// bottom of cite/bib brsrs to top of info; // bottom of cite/bib brsrs to top of info;
// bottom of info to top next element; // bottom of info to top next element;
// bottom of style to top textBefore; // bottom of style to top input_before;
// bottom of text to top ok/cancel buttons. // bottom of text to top ok/cancel buttons.
static int const dh2 = 10; // bottom of textBefore to top textAftr; static int const dh2 = 10; // bottom of input_before to top input_after;
// bottom of ok/cancel buttons to bottom form // bottom of ok/cancel buttons to bottom form
static int const dh3 = 5; // spacing between add/delete/... buttons. static int const dh3 = 5; // spacing between add/delete/... buttons.
int const wbrsr = dialog_->citeBrsr->w; int const wbrsr = dialog_->browser_cite->w;
static int const hinfo = dialog_->infoBrsr->h; static int const hinfo = dialog_->browser_info->h;
static int const hstyle = dialog_->style->h; static int const hstyle = dialog_->choice_style->h;
static int const htext = dialog_->textAftr->h; static int const htext = dialog_->input_after->h;
static int const hok = dialog_->button_ok->h; static int const hok = dialog_->button_ok->h;
int hform = dh1 + hbrsr + dh1; int hform = dh1 + hbrsr + dh1;
if (bibPresent ) hform += hinfo + dh1; if (bibPresent) hform += hinfo + dh1;
if (natbib ) hform += hstyle + dh1 + htext + dh2; if (natbib) hform += hstyle + dh1 + htext + dh2;
hform += htext + dh1 + hok + dh2; hform += htext + dh1 + hok + dh2;
if (hform != minh_) { if (hform != minh_) {
minh_ = hform; minh_ = hform;
fl_set_form_size( dialog_->form, minw_, minh_ ); fl_set_form_size(dialog_->form, minw_, minh_);
} else } else
return; return;
int x = 0; int x = 0;
int y = 0; int y = 0;
fl_set_object_geometry( dialog_->box, x, y, minw_, minh_ ); fl_set_object_geometry(dialog_->box, x, y, minw_, minh_);
x = dialog_->citeBrsr->x; x = dialog_->browser_cite->x;
y += dh1; y += dh1;
fl_set_object_geometry( dialog_->citeBrsr, x, y, wbrsr, hbrsr ); fl_set_object_geometry(dialog_->browser_cite, x, y, wbrsr, hbrsr);
x = dialog_->bibBrsr->x; x = dialog_->browser_bib->x;
fl_set_object_geometry( dialog_->bibBrsr, x, y, wbrsr, hbrsr ); fl_set_object_geometry(dialog_->browser_bib, x, y, wbrsr, hbrsr);
x = dialog_->addBtn->x; x = dialog_->button_add->x;
fl_set_object_position( dialog_->addBtn, x, y ); fl_set_object_position(dialog_->button_add, x, y);
y += dh3 + dialog_->addBtn->h; y += dh3 + dialog_->button_add->h;
fl_set_object_position( dialog_->delBtn, x, y ); fl_set_object_position(dialog_->button_del, x, y);
y += dh3 + dialog_->delBtn->h; y += dh3 + dialog_->button_del->h;
fl_set_object_position( dialog_->upBtn, x, y ); fl_set_object_position(dialog_->button_up, x, y);
y += dh3 + dialog_->upBtn->h; y += dh3 + dialog_->button_up->h;
fl_set_object_position( dialog_->downBtn, x, y ); fl_set_object_position(dialog_->button_down, x, y);
y = dh1 + hbrsr + dh1; // in position for next element y = dh1 + hbrsr + dh1; // in position for next element
if (bibPresent) { if (bibPresent) {
x = dialog_->infoBrsr->x; x = dialog_->browser_info->x;
fl_set_object_position( dialog_->infoBrsr, x, y ); fl_set_object_position(dialog_->browser_info, x, y);
fl_show_object( dialog_->infoBrsr ); fl_show_object(dialog_->browser_info);
y += hinfo + dh1; y += hinfo + dh1;
} else } else
fl_hide_object( dialog_->infoBrsr ); fl_hide_object(dialog_->browser_info);
if (natbib) { if (natbib) {
x = dialog_->style->x; x = dialog_->choice_style->x;
fl_set_object_position( dialog_->style, x, y ); fl_set_object_position(dialog_->choice_style, x, y);
fl_show_object( dialog_->style ); fl_show_object(dialog_->choice_style);
x = dialog_->textBefore->x; x = dialog_->input_before->x;
y += hstyle + dh1; y += hstyle + dh1;
fl_set_object_position( dialog_->textBefore, x, y ); fl_set_object_position(dialog_->input_before, x, y);
fl_show_object( dialog_->textBefore ); fl_show_object(dialog_->input_before);
y += htext + dh2; y += htext + dh2;
} else { } else {
fl_hide_object( dialog_->style ); fl_hide_object(dialog_->choice_style);
fl_hide_object( dialog_->textBefore ); fl_hide_object(dialog_->input_before);
} }
x = dialog_->textAftr->x; x = dialog_->input_after->x;
fl_set_object_position( dialog_->textAftr, x, y ); fl_set_object_position(dialog_->input_after, x, y);
y += htext + dh1; y += htext + dh1;
x = dialog_->button_restore->x; x = dialog_->button_restore->x;
fl_set_object_position( dialog_->button_restore, x, y ); fl_set_object_position(dialog_->button_restore, x, y);
x = dialog_->button_ok->x; x = dialog_->button_ok->x;
fl_set_object_position( dialog_->button_ok, x, y ); fl_set_object_position(dialog_->button_ok, x, y);
x = dialog_->button_apply->x; x = dialog_->button_apply->x;
fl_set_object_position( dialog_->button_apply, x, y ); fl_set_object_position(dialog_->button_apply, x, y);
x = dialog_->button_cancel->x; x = dialog_->button_cancel->x;
fl_set_object_position( dialog_->button_cancel, x, y ); fl_set_object_position(dialog_->button_cancel, x, y);
} }
#ifdef WITH_WARNINGS bool FormCitation::input(FL_OBJECT * ob, long)
#warning convert this to use the buttoncontroller
#endif
bool FormCitation::input( FL_OBJECT *, long data )
{ {
bool activate = false; bool activate = false;
State cb = static_cast<State>( data );
switch (cb) { if (ob == dialog_->browser_bib) {
case BIBBRSR: fl_deselect_browser(dialog_->browser_cite);
{
fl_deselect_browser( dialog_->citeBrsr );
unsigned int sel = fl_get_browser( dialog_->bibBrsr ); unsigned int sel = fl_get_browser(dialog_->browser_bib);
if (sel < 1 || sel > bibkeys.size() ) break; if (sel < 1 || sel > bibkeys.size()) return false;
// Put into infoBrsr the additional info associated with // Put into browser_info the additional info associated with
// the selected bibBrsr key // the selected browser_bib key
fl_clear_browser( dialog_->infoBrsr ); fl_clear_browser(dialog_->browser_info);
fl_add_browser_line( dialog_->infoBrsr, fl_add_browser_line(dialog_->browser_info,
bibkeysInfo[sel - 1].c_str() ); bibkeysInfo[sel - 1].c_str());
// Highlight the selected bibBrsr key in citeBrsr if present // Highlight the selected browser_bib key in browser_cite if present
vector<string>::iterator it = vector<string>::iterator it =
find( citekeys.begin(), citekeys.end(), bibkeys[sel-1] ); find(citekeys.begin(), citekeys.end(), bibkeys[sel-1]);
if (it != citekeys.end()) { if (it != citekeys.end()) {
int n = static_cast<int>( it - citekeys.begin() ); int n = static_cast<int>(it - citekeys.begin());
fl_select_browser_line( dialog_->citeBrsr, n+1 ); fl_select_browser_line(dialog_->browser_cite, n+1);
fl_set_browser_topline( dialog_->citeBrsr, n+1 ); fl_set_browser_topline(dialog_->browser_cite, n+1);
} }
if (!lv_->buffer()->isReadonly()) { if (!lv_->buffer()->isReadonly()) {
if (it != citekeys.end()) { if (it != citekeys.end()) {
setBibButtons( OFF ); setBibButtons(OFF);
setCiteButtons( ON ); setCiteButtons(ON);
} else { } else {
setBibButtons( ON ); setBibButtons(ON);
setCiteButtons( OFF ); setCiteButtons(OFF);
} }
} }
}
break; } else if (ob == dialog_->browser_cite) {
case CITEBRSR: unsigned int sel = fl_get_browser(dialog_->browser_cite);
{ if (sel < 1 || sel > citekeys.size()) return false;
unsigned int sel = fl_get_browser( dialog_->citeBrsr );
if (sel < 1 || sel > citekeys.size() ) break;
if (!lv_->buffer()->isReadonly()) { if (!lv_->buffer()->isReadonly()) {
setBibButtons( OFF ); setBibButtons(OFF);
setCiteButtons( ON ); setCiteButtons(ON);
} }
// Highlight the selected citeBrsr key in bibBrsr // Highlight the selected browser_cite key in browser_bib
vector<string>::iterator it = vector<string>::iterator it =
find( bibkeys.begin(), bibkeys.end(), citekeys[sel-1] ); find(bibkeys.begin(), bibkeys.end(), citekeys[sel-1]);
if (it != bibkeys.end()) { if (it != bibkeys.end()) {
int n = static_cast<int>( it - bibkeys.begin() ); int n = static_cast<int>(it - bibkeys.begin());
fl_select_browser_line( dialog_->bibBrsr, n+1 ); fl_select_browser_line(dialog_->browser_bib, n+1);
fl_set_browser_topline( dialog_->bibBrsr, n+1 ); fl_set_browser_topline(dialog_->browser_bib, n+1);
// Put into infoBrsr the additional info associated with // Put into browser_info the additional info associated with
// the selected citeBrsr key // the selected browser_cite key
fl_clear_browser( dialog_->infoBrsr ); fl_clear_browser(dialog_->browser_info);
fl_add_browser_line( dialog_->infoBrsr, fl_add_browser_line(dialog_->browser_info,
bibkeysInfo[n].c_str() ); bibkeysInfo[n].c_str());
} }
}
break;
case ADD:
{
if (lv_->buffer()->isReadonly() ) break;
unsigned int sel = fl_get_browser( dialog_->bibBrsr ); } else if (ob == dialog_->button_add) {
if (sel < 1 || sel > bibkeys.size() ) break; unsigned int sel = fl_get_browser(dialog_->browser_bib);
if (sel < 1 || sel > bibkeys.size()) return false;
// Add the selected bibBrsr key to citeBrsr // Add the selected browser_bib key to browser_cite
fl_addto_browser( dialog_->citeBrsr, fl_addto_browser(dialog_->browser_cite,
bibkeys[sel-1].c_str() ); bibkeys[sel-1].c_str());
citekeys.push_back( bibkeys[sel-1] ); citekeys.push_back(bibkeys[sel-1]);
int n = static_cast<int>( citekeys.size() ); int n = static_cast<int>(citekeys.size());
fl_select_browser_line( dialog_->citeBrsr, n ); fl_select_browser_line(dialog_->browser_cite, n);
setBibButtons( OFF ); setBibButtons(OFF);
setCiteButtons( ON ); setCiteButtons(ON);
activate = true; activate = true;
}
break;
case DELETE:
{
if (lv_->buffer()->isReadonly() ) break;
unsigned int sel = fl_get_browser( dialog_->citeBrsr ); } else if (ob == dialog_->button_del) {
if (sel < 1 || sel > citekeys.size() ) break; unsigned int sel = fl_get_browser(dialog_->browser_cite);
if (sel < 1 || sel > citekeys.size()) return false;
// Remove the selected key from citeBrsr // Remove the selected key from browser_cite
fl_delete_browser_line( dialog_->citeBrsr, sel ) ; fl_delete_browser_line(dialog_->browser_cite, sel) ;
citekeys.erase( citekeys.begin() + sel-1 ); citekeys.erase(citekeys.begin() + sel-1);
setBibButtons( ON ); setBibButtons(ON);
setCiteButtons( OFF ); setCiteButtons(OFF);
activate = true; activate = true;
}
break;
case UP:
{
if (lv_->buffer()->isReadonly() ) break;
unsigned int sel = fl_get_browser( dialog_->citeBrsr ); } else if (ob == dialog_->button_up) {
if (sel < 2 || sel > citekeys.size() ) break; unsigned int sel = fl_get_browser(dialog_->browser_cite);
if (sel < 2 || sel > citekeys.size()) return false;
// Move the selected key up one line // Move the selected key up one line
vector<string>::iterator it = citekeys.begin() + sel-1; vector<string>::iterator it = citekeys.begin() + sel-1;
string tmp = *it; string tmp = *it;
fl_delete_browser_line( dialog_->citeBrsr, sel ); fl_delete_browser_line(dialog_->browser_cite, sel);
citekeys.erase( it ); citekeys.erase(it);
fl_insert_browser_line( dialog_->citeBrsr, sel-1, tmp.c_str() ); fl_insert_browser_line(dialog_->browser_cite, sel-1, tmp.c_str());
fl_select_browser_line( dialog_->citeBrsr, sel-1 ); fl_select_browser_line(dialog_->browser_cite, sel-1);
citekeys.insert( it-1, tmp ); citekeys.insert(it-1, tmp);
setCiteButtons( ON ); setCiteButtons(ON);
activate = true; activate = true;
}
break;
case DOWN:
{
if (lv_->buffer()->isReadonly() ) break;
unsigned int sel = fl_get_browser( dialog_->citeBrsr ); } else if (ob == dialog_->button_down) {
if (sel < 1 || sel > citekeys.size()-1 ) break; unsigned int sel = fl_get_browser(dialog_->browser_cite);
if (sel < 1 || sel > citekeys.size()-1) return false;
// Move the selected key down one line // Move the selected key down one line
vector<string>::iterator it = citekeys.begin() + sel-1; vector<string>::iterator it = citekeys.begin() + sel-1;
string tmp = *it; string tmp = *it;
fl_delete_browser_line( dialog_->citeBrsr, sel ); fl_delete_browser_line(dialog_->browser_cite, sel);
citekeys.erase( it ); citekeys.erase(it);
fl_insert_browser_line( dialog_->citeBrsr, sel+1, tmp.c_str() ); fl_insert_browser_line(dialog_->browser_cite, sel+1, tmp.c_str());
fl_select_browser_line( dialog_->citeBrsr, sel+1 ); fl_select_browser_line(dialog_->browser_cite, sel+1);
citekeys.insert( it+1, tmp ); citekeys.insert(it+1, tmp);
setCiteButtons( ON ); setCiteButtons(ON);
activate = true;
} else if (ob == dialog_->choice_style ||
ob == dialog_->input_before ||
ob == dialog_->input_after) {
activate = true; activate = true;
}
break;
default:
break;
} }
return activate; return activate;
} }
@ -481,7 +457,7 @@ void FormCitation::apply()
} }
params.setContents(contents); params.setContents(contents);
params.setOptions(fl_get_input(dialog_->textAftr)); params.setOptions(fl_get_input(dialog_->input_after));
if (inset_ != 0) { if (inset_ != 0) {
// Only update if contents have changed // Only update if contents have changed

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

@ -30,19 +30,6 @@ public:
private: private:
/// ///
enum State { enum State {
///
DOWN,
///
UP,
///
DELETE,
///
ADD,
///
BIBBRSR,
///
CITEBRSR,
///
ON, ON,
/// ///
OFF OFF
@ -55,7 +42,7 @@ private:
/// Build the dialog /// Build the dialog
virtual void build(); virtual void build();
/// Filter the inputs /// Filter the inputs
virtual bool input( FL_OBJECT *, long ); virtual bool input(FL_OBJECT *, long);
/// Update dialog before showing it /// Update dialog before showing it
virtual void update(); virtual void update();
/// Apply from dialog (modify or create inset) /// Apply from dialog (modify or create inset)
@ -64,13 +51,13 @@ private:
virtual FL_FORM * form() const; virtual FL_FORM * form() const;
/// ///
void updateBrowser( FL_OBJECT *, std::vector<string> const & ) const; void updateBrowser(FL_OBJECT *, std::vector<string> const &) const;
/// ///
void setBibButtons( State ) const; void setBibButtons(State) const;
/// ///
void setCiteButtons( State ) const; void setCiteButtons(State) const;
/// ///
void setSize( int, bool ) const; void setSize(int, bool) const;
/// Type definition from the fdesign produced header file. /// Type definition from the fdesign produced header file.
FD_form_citation * build_citation(); FD_form_citation * build_citation();

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

@ -27,68 +27,71 @@ FD_form_citation * FormCitation::build_citation()
fdui->box = obj = fl_add_box(FL_UP_BOX, 0, 0, 435, 665, ""); fdui->box = obj = fl_add_box(FL_UP_BOX, 0, 0, 435, 665, "");
{ {
char const * const dummy = N_("Inset keys|#I"); char const * const dummy = N_("Inset keys|#I");
fdui->citeBrsr = obj = fl_add_browser(FL_HOLD_BROWSER, 10, 30, 180, 300, idex(_(dummy))); fdui->browser_cite = obj = fl_add_browser(FL_HOLD_BROWSER, 10, 30, 180, 300, idex(_(dummy)));
fl_set_button_shortcut(obj, scex(_(dummy)), 1); fl_set_button_shortcut(obj, scex(_(dummy)), 1);
} }
fl_set_object_lalign(obj, FL_ALIGN_TOP_LEFT); fl_set_object_lalign(obj, FL_ALIGN_TOP_LEFT);
fl_set_object_gravity(obj, FL_NorthWest, FL_South); fl_set_object_gravity(obj, FL_NorthWest, FL_South);
fl_set_object_resize(obj, FL_RESIZE_X); fl_set_object_resize(obj, FL_RESIZE_X);
fl_set_object_callback(obj, C_FormBaseInputCB, CITEBRSR); fl_set_object_callback(obj, C_FormBaseInputCB, 0);
{ {
char const * const dummy = N_("Bibliography keys|#B"); char const * const dummy = N_("Bibliography keys|#B");
fdui->bibBrsr = obj = fl_add_browser(FL_HOLD_BROWSER, 240, 30, 180, 300, idex(_(dummy))); fdui->browser_bib = obj = fl_add_browser(FL_HOLD_BROWSER, 240, 30, 180, 300, idex(_(dummy)));
fl_set_button_shortcut(obj, scex(_(dummy)), 1); fl_set_button_shortcut(obj, scex(_(dummy)), 1);
} }
fl_set_object_lalign(obj, FL_ALIGN_TOP_LEFT); fl_set_object_lalign(obj, FL_ALIGN_TOP_LEFT);
fl_set_object_gravity(obj, FL_North, FL_SouthEast); fl_set_object_gravity(obj, FL_North, FL_SouthEast);
fl_set_object_resize(obj, FL_RESIZE_X); fl_set_object_resize(obj, FL_RESIZE_X);
fl_set_object_callback(obj, C_FormBaseInputCB, BIBBRSR); fl_set_object_callback(obj, C_FormBaseInputCB, 0);
fdui->addBtn = obj = fl_add_button(FL_NORMAL_BUTTON, 200, 30, 30, 30, _("@4->")); fdui->button_add = obj = fl_add_button(FL_NORMAL_BUTTON, 200, 30, 30, 30, _("@4->"));
fl_set_button_shortcut(obj, _("#&D"), 1); fl_set_button_shortcut(obj, _("#&D"), 1);
fl_set_object_gravity(obj, FL_North, FL_North); fl_set_object_gravity(obj, FL_North, FL_North);
fl_set_object_resize(obj, FL_RESIZE_NONE); fl_set_object_resize(obj, FL_RESIZE_NONE);
fl_set_object_callback(obj, C_FormBaseInputCB, ADD); fl_set_object_callback(obj, C_FormBaseInputCB, 0);
fdui->delBtn = obj = fl_add_button(FL_NORMAL_BUTTON, 200, 65, 30, 30, _("@9+")); fdui->button_del = obj = fl_add_button(FL_NORMAL_BUTTON, 200, 65, 30, 30, _("@9+"));
fl_set_button_shortcut(obj, _("#X"), 1); fl_set_button_shortcut(obj, _("#X"), 1);
fl_set_object_gravity(obj, FL_North, FL_North); fl_set_object_gravity(obj, FL_North, FL_North);
fl_set_object_resize(obj, FL_RESIZE_NONE); fl_set_object_resize(obj, FL_RESIZE_NONE);
fl_set_object_callback(obj, C_FormBaseInputCB, DELETE); fl_set_object_callback(obj, C_FormBaseInputCB, 0);
fdui->upBtn = obj = fl_add_button(FL_NORMAL_BUTTON, 200, 100, 30, 30, _("@8->")); fdui->button_up = obj = fl_add_button(FL_NORMAL_BUTTON, 200, 100, 30, 30, _("@8->"));
fl_set_button_shortcut(obj, _("#&A"), 1); fl_set_button_shortcut(obj, _("#&A"), 1);
fl_set_object_gravity(obj, FL_North, FL_North); fl_set_object_gravity(obj, FL_North, FL_North);
fl_set_object_resize(obj, FL_RESIZE_NONE); fl_set_object_resize(obj, FL_RESIZE_NONE);
fl_set_object_callback(obj, C_FormBaseInputCB, UP); fl_set_object_callback(obj, C_FormBaseInputCB, 0);
fdui->downBtn = obj = fl_add_button(FL_NORMAL_BUTTON, 200, 135, 30, 30, _("@2->")); fdui->button_down = obj = fl_add_button(FL_NORMAL_BUTTON, 200, 135, 30, 30, _("@2->"));
fl_set_button_shortcut(obj, _("#&B"), 1); fl_set_button_shortcut(obj, _("#&B"), 1);
fl_set_object_gravity(obj, FL_North, FL_North); fl_set_object_gravity(obj, FL_North, FL_North);
fl_set_object_resize(obj, FL_RESIZE_NONE); fl_set_object_resize(obj, FL_RESIZE_NONE);
fl_set_object_callback(obj, C_FormBaseInputCB, DOWN); fl_set_object_callback(obj, C_FormBaseInputCB, 0);
fdui->infoBrsr = obj = fl_add_browser(FL_NORMAL_BROWSER, 10, 360, 410, 80, _("Info")); fdui->browser_info = obj = fl_add_browser(FL_NORMAL_BROWSER, 10, 360, 410, 80, _("Info"));
fl_set_object_lalign(obj, FL_ALIGN_TOP_LEFT); fl_set_object_lalign(obj, FL_ALIGN_TOP_LEFT);
fl_set_object_gravity(obj, FL_SouthWest, FL_SouthEast); fl_set_object_gravity(obj, FL_SouthWest, FL_SouthEast);
fl_set_object_resize(obj, FL_RESIZE_NONE); fl_set_object_resize(obj, FL_RESIZE_NONE);
{ {
char const * const dummy = N_("Citation style|#s"); char const * const dummy = N_("Citation style|#s");
fdui->style = obj = fl_add_choice(FL_NORMAL_CHOICE, 160, 470, 130, 30, idex(_(dummy))); fdui->choice_style = obj = fl_add_choice(FL_NORMAL_CHOICE, 160, 470, 130, 30, idex(_(dummy)));
fl_set_button_shortcut(obj, scex(_(dummy)), 1); fl_set_button_shortcut(obj, scex(_(dummy)), 1);
} }
fl_set_object_boxtype(obj, FL_DOWN_BOX); fl_set_object_boxtype(obj, FL_FRAME_BOX);
fl_set_object_gravity(obj, FL_SouthWest, FL_SouthEast); fl_set_object_gravity(obj, FL_SouthWest, FL_SouthEast);
fl_set_object_resize(obj, FL_RESIZE_NONE); fl_set_object_resize(obj, FL_RESIZE_NONE);
fl_set_object_callback(obj, C_FormBaseInputCB, 0);
{ {
char const * const dummy = N_("Text before|#T"); char const * const dummy = N_("Text before|#T");
fdui->textBefore = obj = fl_add_input(FL_NORMAL_INPUT, 100, 520, 250, 30, idex(_(dummy))); fdui->input_before = obj = fl_add_input(FL_NORMAL_INPUT, 100, 520, 250, 30, idex(_(dummy)));
fl_set_button_shortcut(obj, scex(_(dummy)), 1); fl_set_button_shortcut(obj, scex(_(dummy)), 1);
} }
fl_set_object_gravity(obj, FL_SouthWest, FL_SouthEast); fl_set_object_gravity(obj, FL_SouthWest, FL_SouthEast);
fl_set_object_resize(obj, FL_RESIZE_NONE); fl_set_object_resize(obj, FL_RESIZE_NONE);
fl_set_object_callback(obj, C_FormBaseInputCB, 0);
{ {
char const * const dummy = N_("Text after|#e"); char const * const dummy = N_("Text after|#e");
fdui->textAftr = obj = fl_add_input(FL_NORMAL_INPUT, 100, 570, 250, 30, idex(_(dummy))); fdui->input_after = obj = fl_add_input(FL_NORMAL_INPUT, 100, 570, 250, 30, idex(_(dummy)));
fl_set_button_shortcut(obj, scex(_(dummy)), 1); fl_set_button_shortcut(obj, scex(_(dummy)), 1);
} }
fl_set_object_gravity(obj, FL_SouthWest, FL_SouthEast); fl_set_object_gravity(obj, FL_SouthWest, FL_SouthEast);
fl_set_object_resize(obj, FL_RESIZE_NONE); fl_set_object_resize(obj, FL_RESIZE_NONE);
fl_set_object_callback(obj, C_FormBaseInputCB, 0);
{ {
char const * const dummy = N_("Restore|#R"); char const * const dummy = N_("Restore|#R");
fdui->button_restore = obj = fl_add_button(FL_NORMAL_BUTTON, 10, 630, 90, 30, idex(_(dummy))); fdui->button_restore = obj = fl_add_button(FL_NORMAL_BUTTON, 10, 630, 90, 30, idex(_(dummy)));

20
src/frontends/xforms/form_citation.h
View File

@ -18,16 +18,16 @@ struct FD_form_citation {
FL_FORM *form; FL_FORM *form;
FL_OBJECT *box; FL_OBJECT *box;
FL_OBJECT *citeBrsr; FL_OBJECT *browser_cite;
FL_OBJECT *bibBrsr; FL_OBJECT *browser_bib;
FL_OBJECT *addBtn; FL_OBJECT *button_add;
FL_OBJECT *delBtn; FL_OBJECT *button_del;
FL_OBJECT *upBtn; FL_OBJECT *button_up;
FL_OBJECT *downBtn; FL_OBJECT *button_down;
FL_OBJECT *infoBrsr; FL_OBJECT *browser_info;
FL_OBJECT *style; FL_OBJECT *choice_style;
FL_OBJECT *textBefore; FL_OBJECT *input_before;
FL_OBJECT *textAftr; FL_OBJECT *input_after;
FL_OBJECT *button_restore; FL_OBJECT *button_restore;
FL_OBJECT *button_ok; FL_OBJECT *button_ok;
FL_OBJECT *button_apply; FL_OBJECT *button_apply;

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

@ -44,9 +44,9 @@ label: Inset keys|#I
shortcut: shortcut:
resize: FL_RESIZE_X resize: FL_RESIZE_X
gravity: FL_NorthWest FL_South gravity: FL_NorthWest FL_South
name: citeBrsr name: browser_cite
callback: C_FormBaseInputCB callback: C_FormBaseInputCB
argument: CITEBRSR argument: 0
-------------------- --------------------
class: FL_BROWSER class: FL_BROWSER
@ -62,9 +62,9 @@ label: Bibliography keys|#B
shortcut: shortcut:
resize: FL_RESIZE_X resize: FL_RESIZE_X
gravity: FL_North FL_SouthEast gravity: FL_North FL_SouthEast
name: bibBrsr name: browser_bib
callback: C_FormBaseInputCB callback: C_FormBaseInputCB
argument: BIBBRSR argument: 0
-------------------- --------------------
class: FL_BUTTON class: FL_BUTTON
@ -80,9 +80,9 @@ label: @4->
shortcut: #&D shortcut: #&D
resize: FL_RESIZE_NONE resize: FL_RESIZE_NONE
gravity: FL_North FL_North gravity: FL_North FL_North
name: addBtn name: button_add
callback: C_FormBaseInputCB callback: C_FormBaseInputCB
argument: ADD argument: 0
-------------------- --------------------
class: FL_BUTTON class: FL_BUTTON
@ -98,9 +98,9 @@ label: @9+
shortcut: #X shortcut: #X
resize: FL_RESIZE_NONE resize: FL_RESIZE_NONE
gravity: FL_North FL_North gravity: FL_North FL_North
name: delBtn name: button_del
callback: C_FormBaseInputCB callback: C_FormBaseInputCB
argument: DELETE argument: 0
-------------------- --------------------
class: FL_BUTTON class: FL_BUTTON
@ -116,9 +116,9 @@ label: @8->
shortcut: #&A shortcut: #&A
resize: FL_RESIZE_NONE resize: FL_RESIZE_NONE
gravity: FL_North FL_North gravity: FL_North FL_North
name: upBtn name: button_up
callback: C_FormBaseInputCB callback: C_FormBaseInputCB
argument: UP argument: 0
-------------------- --------------------
class: FL_BUTTON class: FL_BUTTON
@ -134,9 +134,9 @@ label: @2->
shortcut: #&B shortcut: #&B
resize: FL_RESIZE_NONE resize: FL_RESIZE_NONE
gravity: FL_North FL_North gravity: FL_North FL_North
name: downBtn name: button_down
callback: C_FormBaseInputCB callback: C_FormBaseInputCB
argument: DOWN argument: 0
-------------------- --------------------
class: FL_BROWSER class: FL_BROWSER
@ -152,7 +152,7 @@ label: Info
shortcut: shortcut:
resize: FL_RESIZE_NONE resize: FL_RESIZE_NONE
gravity: FL_SouthWest FL_SouthEast gravity: FL_SouthWest FL_SouthEast
name: infoBrsr name: browser_info
callback: callback:
argument: argument:
@ -160,7 +160,7 @@ argument:
class: FL_CHOICE class: FL_CHOICE
type: NORMAL_CHOICE type: NORMAL_CHOICE
box: 160 470 130 30 box: 160 470 130 30
boxtype: FL_DOWN_BOX boxtype: FL_FRAME_BOX
colors: FL_COL1 FL_BLACK colors: FL_COL1 FL_BLACK
alignment: FL_ALIGN_LEFT alignment: FL_ALIGN_LEFT
style: FL_NORMAL_STYLE style: FL_NORMAL_STYLE
@ -170,9 +170,9 @@ label: Citation style|#s
shortcut: shortcut:
resize: FL_RESIZE_NONE resize: FL_RESIZE_NONE
gravity: FL_SouthWest FL_SouthEast gravity: FL_SouthWest FL_SouthEast
name: style name: choice_style
callback: callback: C_FormBaseInputCB
argument: argument: 0
-------------------- --------------------
class: FL_INPUT class: FL_INPUT
@ -188,9 +188,9 @@ label: Text before|#T
shortcut: shortcut:
resize: FL_RESIZE_NONE resize: FL_RESIZE_NONE
gravity: FL_SouthWest FL_SouthEast gravity: FL_SouthWest FL_SouthEast
name: textBefore name: input_before
callback: callback: C_FormBaseInputCB
argument: argument: 0
-------------------- --------------------
class: FL_INPUT class: FL_INPUT
@ -206,9 +206,9 @@ label: Text after|#e
shortcut: shortcut:
resize: FL_RESIZE_NONE resize: FL_RESIZE_NONE
gravity: FL_SouthWest FL_SouthEast gravity: FL_SouthWest FL_SouthEast
name: textAftr name: input_after
callback: callback: C_FormBaseInputCB
argument: argument: 0
-------------------- --------------------
class: FL_BUTTON class: FL_BUTTON