/**
- * \file xforms/FormCitation.C
+ * \file FormCitation.C
* This file is part of LyX, the document processor.
* Licence details can be found in the file COPYING.
*
* \author Angus Leeming
* \author Rob Lahaye
*
- * Full author contact details are available in file CREDITS
+ * Full author contact details are available in file CREDITS.
*/
#include <config.h>
-#include <algorithm>
-
-#include "xformsBC.h"
-#include "ControlCitation.h"
#include "FormCitation.h"
+#include "ControlCitation.h"
#include "forms/form_citation.h"
+
#include "Tooltips.h"
-#include "helper_funcs.h"
#include "xforms_helpers.h"
-#include FORMS_H_LOCATION
+#include "xformsBC.h"
-#include "gettext.h"
-#include "support/LAssert.h"
#include "support/lstrings.h"
+#include "lyx_forms.h"
+
+using lyx::support::getStringFromVector;
+using lyx::support::getVectorFromString;
+using lyx::support::trim;
+
using std::find;
using std::max;
-using std::min;
-using std::pair;
-using std::sort;
+
using std::vector;
+using std::string;
+
namespace {
{
// Check whether the current contents of the browser will be
// changed by loading the contents of the vec...
- vector<string> const choice_style =
- getVector(dialog->choice_style);
+ vector<string> const choice_style = getVector(dialog->choice_style);
if (vec == choice_style)
return;
} // namespace anon
-typedef FormCB<ControlCitation, FormDB<FD_citation> > base_class;
+typedef FormController<ControlCitation, FormView<FD_citation> > base_class;
-FormCitation::FormCitation()
- : base_class(_("Citation"))
+FormCitation::FormCitation(Dialog & parent)
+ : base_class(parent, _("Citation"))
{}
controller().params().setCmdName(command);
controller().params().setContents(getStringFromVector(citekeys));
+ string const before = getString(dialog_->input_before);
+ controller().params().setSecOptions(before);
+
string const after = getString(dialog_->input_after);
controller().params().setOptions(after);
}
citekeys.clear();
bibkeys.clear();
- FormBase::hide();
+ FormDialogView::hide();
}
dialog_.reset(build_citation(this));
// Manage the ok, apply, restore and cancel/close buttons
- bc().setOK(dialog_->button_ok);
- bc().setApply(dialog_->button_apply);
- bc().setCancel(dialog_->button_close);
- bc().setRestore(dialog_->button_restore);
+ bcview().setOK(dialog_->button_ok);
+ bcview().setApply(dialog_->button_apply);
+ bcview().setCancel(dialog_->button_close);
+ bcview().setRestore(dialog_->button_restore);
// disable for read-only documents
- bc().addReadOnly(dialog_->button_add);
- bc().addReadOnly(dialog_->button_del);
- bc().addReadOnly(dialog_->button_up);
- bc().addReadOnly(dialog_->button_down);
- bc().addReadOnly(dialog_->choice_style);
- bc().addReadOnly(dialog_->input_before);
- bc().addReadOnly(dialog_->input_after);
- bc().addReadOnly(dialog_->check_full_author_list);
- bc().addReadOnly(dialog_->check_force_uppercase);
+ bcview().addReadOnly(dialog_->button_add);
+ bcview().addReadOnly(dialog_->button_del);
+ bcview().addReadOnly(dialog_->button_up);
+ bcview().addReadOnly(dialog_->button_down);
+ bcview().addReadOnly(dialog_->choice_style);
+ bcview().addReadOnly(dialog_->input_before);
+ bcview().addReadOnly(dialog_->input_after);
+ bcview().addReadOnly(dialog_->check_full_author_list);
+ bcview().addReadOnly(dialog_->check_force_uppercase);
// trigger an input event for cut&paste with middle mouse button.
setPrehandler(dialog_->input_search);
str = _("The entries which will be cited. Select them with the arrow buttons from the right browser window.");
tooltips().init(dialog_->browser_cite, str);
+#if FL_VERSION == 0 || (FL_REVISION == 0 && FL_FIXLEVEL == 0)
// Work-around xforms' bug; enable tooltips for browser widgets.
setPrehandler(dialog_->browser_cite);
+#endif
str = _("All entries in the database you have loaded (via \"Insert->Lists&TOC->BibTex Reference\"). Move the ones you want to cite with the arrow buttons into the left browser window.");
tooltips().init(dialog_->browser_bib, str);
+#if FL_VERSION == 0 || (FL_REVISION == 0 && FL_FIXLEVEL == 0)
// Work-around xforms' bug; enable tooltips for browser widgets.
setPrehandler(dialog_->browser_bib);
+#endif
str = _("Information about the selected entry");
tooltips().init(dialog_->browser_info, str);
+#if FL_VERSION == 0 || (FL_REVISION == 0 && FL_FIXLEVEL == 0)
// Work-around xforms' bug; enable tooltips for browser widgets.
setPrehandler(dialog_->browser_info);
+#endif
str = _("Here you may select how the citation label should look inside the text (Natbib).");
tooltips().init(dialog_->choice_style, str);
fl_set_browser_topline(dialog_->browser_cite, n + 1);
}
- if (!controller().bufferIsReadonly()) {
+ if (!kernel().isBufferReadonly()) {
if (cit != citekeys.end()) {
setBibButtons(OFF);
setCiteButtons(ON);
if (sel < 1 || sel > citekeys.size())
return ButtonPolicy::SMI_NOOP;
- if (!controller().bufferIsReadonly()) {
+ if (!kernel().isBufferReadonly()) {
setBibButtons(OFF);
setCiteButtons(ON);
}
// with the selected browser_cite key
fl_clear_browser(dialog_->browser_info);
string const tmp =
- formatted(biblio::getInfo(theMap,
- citekeys[sel - 1]),
+ formatted(biblio::getInfo(theMap, citekeys[sel - 1]),
dialog_->browser_info->w - 10);
fl_add_browser_line(dialog_->browser_info, tmp.c_str());
}
// Use the first citekey to fill choice_style
string key;
- if (!citekeys.empty()) key = citekeys[0];
+ if (!citekeys.empty())
+ key = citekeys[0];
fillChoice(dialog_.get(), controller().getCiteStrings(key));
bool const natbib = controller().usingNatbib();
setEnabled(dialog_->check_full_author_list, natbib);
setEnabled(dialog_->check_force_uppercase, natbib);
- setEnabled(dialog_->choice_style, natbib);
+ setEnabled(dialog_->choice_style, natbib || controller().usingJurabib());
+ setEnabled(dialog_->input_before, natbib || controller().usingJurabib());
// No keys have been selected yet, so...
fl_clear_browser(dialog_->browser_info);
setCiteButtons(OFF);
// Natbib can have comments before and after the citation.
- // This is not yet supported. After only.
fl_set_input(dialog_->input_after,
controller().params().getOptions().c_str());
- fl_set_input(dialog_->input_before, _("Not yet supported"));
- setEnabled(dialog_->input_before, false);
+ fl_set_input(dialog_->input_before,
+ controller().params().getSecOptions().c_str());
}
fl_clear_browser(browser);
for (vector<string>::const_iterator it = keys.begin();
- it < keys.end(); ++it) {
+ it != keys.end(); ++it) {
string key = trim(*it);
if (!key.empty())
fl_add_browser_line(browser, key.c_str());