]> git.lyx.org Git - lyx.git/blobdiff - src/frontends/xforms/FormCitation.C
Bugfixes: checkboxes to radiobuttons (from J�rgen S) and remove a little
[lyx.git] / src / frontends / xforms / FormCitation.C
index 7da7f348e0707cf51eebf39849ae484fc3cf65df..ac5ad5ccd306a98d593b6151accaee1e1261126d 100644 (file)
@@ -4,9 +4,12 @@
  *
  *           LyX, The Document Processor
  *
- *           Copyright 2000 The LyX Team.
+ *           Copyright 2000-2001 The LyX Team.
  *
  * ======================================================
+ *
+ * \file FormCitation.C
+ * \author Angus Leeming, a.leeming@ic.ac.uk
  */
 
 #include <config.h>
 #pragma implementation
 #endif
 
-
-#include "Dialogs.h"
+#include "xformsBC.h"
+#include "ControlCitation.h"
 #include "FormCitation.h"
-#include "LyXView.h"
-#include "buffer.h"
 #include "form_citation.h"
-#include "lyxfunc.h"
-#include "support/filetools.h"
+#include "gettext.h"
+#include "support/lstrings.h"
+#include "helper_funcs.h"
+#include "xforms_helpers.h"
 
 using std::find;
 using std::max;
@@ -32,320 +35,219 @@ using std::pair;
 using std::sort;
 using std::vector;
 
+namespace {
 
-FormCitation::FormCitation(LyXView * lv, Dialogs * d)
-       : FormCommand(lv, d, _("Citation"), new NoRepeatedApplyReadOnlyPolicy),
-         dialog_(0)
+// shamelessly stolen from Menubar_pimpl.C
+int string_width(string const & str) 
 {
-       // let the dialog be shown
-       // These are permanent connections so we won't bother
-       // storing a copy because we won't be disconnecting.
-       d->showCitation.connect(slot(this, &FormCitation::showInset));
-       d->createCitation.connect(slot(this, &FormCitation::createInset));
+       return fl_get_string_widthTAB(FL_NORMAL_STYLE, FL_NORMAL_SIZE,
+                                     str.c_str(),
+                                     static_cast<int>(str.length()));
 }
 
 
-FormCitation::~FormCitation()
+void fillChoice(FD_form_citation * dialog, vector<string> vec)
 {
-       delete dialog_;
-}
+       // Check whether the current contents of the browser will be
+       // changed by loading the contents of the vec...
+       vector<string> const choice_style =
+               getVectorFromChoice(dialog->choice_style);
 
+       if (vec == choice_style)
+               return;
 
-FL_FORM * FormCitation::form() const
-{
-       if (dialog_) return dialog_->form;
-       return 0;
-}
+       // They will be changed. Proceed
+       string const str = " " + getStringFromVector(vec, " | ") + " ";
 
+       fl_clear_choice(dialog->choice_style);
+       fl_addto_choice(dialog->choice_style, str.c_str());
 
-void FormCitation::connect()
-{
-       //fl_set_form_maxsize(dialog_->form, 3*minw_, minh_);
-       FormCommand::connect();
-}
+       // 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));
+       }
 
-void FormCitation::disconnect()
-{
-       citekeys.clear();
-       bibkeys.clear();
-       bibkeysInfo.clear();
+       int const dx =
+               max(5, int(0.5 * (dialog->frame_style->w - width)));
 
-       FormCommand::disconnect();
+       fl_set_object_geometry(dialog->choice_style,
+                              dialog->frame_style->x + dx,
+                              dialog->choice_style->y,
+                              width,
+                              dialog->choice_style->h);
 }
 
 
-void FormCitation::build()
+void updateStyle(FD_form_citation * dialog, string command)
 {
-       dialog_ = build_citation();
+       // Find the style of the citekeys
+       vector<biblio::CiteStyle> const & styles =
+               ControlCitation::getCiteStyles();
+       biblio::CitationStyle cs = biblio::getCitationStyle(command);
+
+       vector<biblio::CiteStyle>::const_iterator cit =
+               find(styles.begin(), styles.end(), cs.style);
+
+       // Use this to initialise the GUI
+       if (cit == styles.end()) {
+               fl_set_choice(dialog->choice_style, 1);
+               fl_set_button(dialog->button_full_author_list, 0);
+               fl_set_button(dialog->button_force_uppercase, 0);
+       } else {
+               int const i = int(cit - styles.begin());
+               fl_set_choice(dialog->choice_style, i+1);
+               fl_set_button(dialog->button_full_author_list,  cs.full);
+               fl_set_button(dialog->button_force_uppercase, cs.forceUCase);
+       }
+}
 
-       // Workaround dumb xforms sizing bug
-       minw_ = form()->w;
-       minh_ = form()->h;
+} // namespace anon
 
-       fl_set_input_return(dialog_->input_after,  FL_RETURN_CHANGED);
-       fl_set_input_return(dialog_->input_before, FL_RETURN_CHANGED);
+typedef FormCB<ControlCitation, FormDB<FD_form_citation> > base_class;
 
-        // Manage the ok, apply, restore and cancel/close buttons
-       bc_.setOK(dialog_->button_ok);
-       bc_.setApply(dialog_->button_apply);
-       bc_.setCancel(dialog_->button_cancel);
-       bc_.setUndoAll(dialog_->button_restore);
-       bc_.refresh();
-
-       bc_.addReadOnly(dialog_->button_add);
-       bc_.addReadOnly(dialog_->button_del);
-       bc_.addReadOnly(dialog_->button_up);
-       bc_.addReadOnly(dialog_->button_down);
-       bc_.addReadOnly(dialog_->input_before);
-       bc_.addReadOnly(dialog_->input_after);
-
-       bc_.addDontTriggerChange(dialog_->browser_cite);
-       bc_.addDontTriggerChange(dialog_->browser_bib);
-}
+FormCitation::FormCitation(ControlCitation & c)
+       : base_class(c, _("Citation"), false)
+{}
 
 
-void FormCitation::update()
+void FormCitation::apply()
 {
-       bc_.readOnly(lv_->buffer()->isReadonly());
+       vector<biblio::CiteStyle> const & styles =
+               ControlCitation::getCiteStyles();
 
-       bibkeys.clear();
-       bibkeysInfo.clear();
+       int const choice = fl_get_choice(dialog_->choice_style) - 1;
+       bool const full  = fl_get_button(dialog_->button_full_author_list);
+       bool const force = fl_get_button(dialog_->button_force_uppercase);
 
-       vector<pair<string,string> > blist =
-               lv_->buffer()->getBibkeyList();
-       sort(blist.begin(), blist.end());
+       string const command =
+               biblio::getCiteCommand(styles[choice], full, force);
 
-       for (unsigned int i = 0; i < blist.size(); ++i) {
-               bibkeys.push_back(blist[i].first);
-               bibkeysInfo.push_back(blist[i].second);
-       }
-       blist.clear();
-       updateBrowser(dialog_->browser_bib, bibkeys);
+       controller().params().setCmdName(command);
+       controller().params().setContents(getStringFromVector(citekeys));
 
-       // Ditto for the keys cited in this inset
-       citekeys.clear();
-       string tmp, keys(params.getContents());
-       keys = frontStrip(split(keys, tmp, ','));
-       while (!tmp.empty()) {
-               citekeys.push_back(tmp);
-               keys = frontStrip(split(keys, tmp, ','));
-       }
-       updateBrowser(dialog_->browser_cite, citekeys);
-
-       // No keys have been selected yet, so...
-       fl_clear_browser(dialog_->browser_info);
-       setBibButtons(OFF);
-       setCiteButtons(OFF);
-
-       int noKeys = static_cast<int>(max(bibkeys.size(), citekeys.size()));
+       string const after  = fl_get_input(dialog_->input_after);
+       controller().params().setOptions(after);
+}
 
-       // Place bounds, so that 4 <= noKeys <= 10
-       noKeys = max(4, min(10, noKeys));
 
-       // Re-size the form to accommodate the new browser size
-       int size = 20 * noKeys;
-       bool bibPresent = (bibkeys.size() > 0);
-       setSize(size, bibPresent);
+void FormCitation::hide()
+{
+       citekeys.clear();
+       bibkeys.clear();
 
-       fl_set_input(dialog_->input_after, params.getOptions().c_str());
+       FormBase::hide();
 }
 
 
-void FormCitation::updateBrowser(FL_OBJECT * browser,
-                                 vector<string> const & keys) const
+void FormCitation::build()
 {
-       fl_clear_browser(browser);
+       dialog_.reset(build_citation());
 
-       for (unsigned int i = 0; i < keys.size(); ++i)
-               fl_add_browser_line(browser, keys[i].c_str());
-}
+       fl_set_input_return(dialog_->input_after,  FL_RETURN_CHANGED);
+       fl_set_input_return(dialog_->input_before, FL_RETURN_CHANGED);
+       fl_set_input_return(dialog_->input_search, FL_RETURN_END);
 
+       fl_set_button(dialog_->button_search_case, 0);
+       fl_set_button(dialog_->button_search_type, 0);
 
-void FormCitation::setBibButtons(State status) const
-{
-       switch (status) {
-       case ON:
-               fl_activate_object(dialog_->button_add);
-               fl_set_object_lcol(dialog_->button_add, FL_BLACK);
-               break;
-
-       case OFF:
-               fl_deactivate_object(dialog_->button_add);
-               fl_set_object_lcol(dialog_->button_add, FL_INACTIVE);
-               break;
-
-       default:
-               break;
-       }
+        // Manage the ok, apply, restore and cancel/close buttons
+       bc().setOK(dialog_->button_ok);
+       bc().setApply(dialog_->button_apply);
+       bc().setCancel(dialog_->button_cancel);
+       bc().setRestore(dialog_->button_restore);
+
+       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_->button_full_author_list);
+       bc().addReadOnly(dialog_->button_force_uppercase);
 }
 
 
-void FormCitation::setCiteButtons(State status) const
+void FormCitation::findBiblio(biblio::Direction const dir)
 {
-       switch (status) {
-       case ON:
-        {
-               fl_activate_object(dialog_->button_del);
-               fl_set_object_lcol(dialog_->button_del, FL_BLACK);
-
-               int sel = fl_get_browser(dialog_->browser_cite);
-
-               if (sel != 1) {
-                       fl_activate_object(dialog_->button_up);
-                       fl_set_object_lcol(dialog_->button_up, FL_BLACK);
-               } else {
-                       fl_deactivate_object(dialog_->button_up);
-                       fl_set_object_lcol(dialog_->button_up, FL_INACTIVE);
-               }
-
-               if (sel != fl_get_browser_maxline(dialog_->browser_cite)) {
-                       fl_activate_object(dialog_->button_down);
-                       fl_set_object_lcol(dialog_->button_down, FL_BLACK);
-               } else {
-                       fl_deactivate_object(dialog_->button_down);
-                       fl_set_object_lcol(dialog_->button_down, FL_INACTIVE);
-               }
+       string const str = fl_get_input(dialog_->input_search);
+       biblio::InfoMap const & theMap = controller().bibkeysInfo();
+       bool const caseSensitive =
+               fl_get_button(dialog_->button_search_case);
+       biblio::Search const type =
+               fl_get_button(dialog_->button_search_type) ?
+               biblio::REGEX : biblio::SIMPLE;
 
-               break;
-       }
-       case OFF:
-       {
-               fl_deactivate_object(dialog_->button_del);
-               fl_set_object_lcol(dialog_->button_del, FL_INACTIVE);
+       vector<string>::const_iterator start = bibkeys.begin();
+       int const sel = fl_get_browser(dialog_->browser_bib);
+       if (sel >= 1 && sel <= int(bibkeys.size()))
+               start += sel - 1;
 
-               fl_deactivate_object(dialog_->button_up);
-               fl_set_object_lcol(dialog_->button_up, FL_INACTIVE);
+       // Find the NEXT instance...
+       (dir == biblio::FORWARD) ? ++start : --start;
 
-               fl_deactivate_object(dialog_->button_down);
-               fl_set_object_lcol(dialog_->button_down, FL_INACTIVE);
-       }
-       default:
-               break;
-       }
-}
 
+       vector<string>::const_iterator const cit =
+       biblio::searchKeys(theMap, bibkeys, str,
+                          start, type, dir, caseSensitive);
 
-void FormCitation::setSize(int hbrsr, bool bibPresent) const
-{
-       bool const natbib = false; // will eventually be input
-       hbrsr = max(hbrsr, 175); // limit max size of cite/bib brsrs
-
-       // dh1, dh2, dh3 are the vertical separation between elements.
-       // These can be specified because the browser height is fixed
-       // so they are not changed by dynamic resizing
-       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 info to top next element;
-                                  // bottom of style to top input_before;
-                                  // bottom of text to top ok/cancel buttons.
-       static int const dh2 = 10; // bottom of input_before to top input_after;
-                                  // bottom of ok/cancel buttons to bottom form
-       static int const dh3 = 5;  // spacing between add/delete/... buttons.
-
-       int const wbrsr  = dialog_->browser_cite->w;
-       static int const hinfo  = dialog_->browser_info->h;
-       static int const hstyle = dialog_->choice_style->h;
-       static int const htext  = dialog_->input_after->h;
-       static int const hok    = dialog_->button_ok->h;
-
-       int hform = dh1 + hbrsr + dh1;
-       if (bibPresent) hform += hinfo + dh1;
-       if (natbib) hform += hstyle + dh1 + htext + dh2;
-       hform += htext + dh1 + hok + dh2;
-
-       if (hform != minh_) {
-               minh_ = hform;
-               fl_set_form_size(dialog_->form, minw_, minh_);
-       } else
+       if (cit == bibkeys.end())
                return;
 
-       int x = 0;
-       int y = 0;
-       fl_set_object_geometry(dialog_->box, x, y, minw_, minh_);
-
-       x = dialog_->browser_cite->x;
-       y += dh1; 
-       fl_set_object_geometry(dialog_->browser_cite, x, y, wbrsr, hbrsr);
-       x = dialog_->browser_bib->x;
-       fl_set_object_geometry(dialog_->browser_bib,  x, y, wbrsr, hbrsr);
-
-       x = dialog_->button_add->x;
-       fl_set_object_position(dialog_->button_add,  x, y);
-       y += dh3 + dialog_->button_add->h;
-       fl_set_object_position(dialog_->button_del,  x, y);
-       y += dh3 + dialog_->button_del->h;
-       fl_set_object_position(dialog_->button_up,   x, y);
-       y += dh3 + dialog_->button_up->h;
-       fl_set_object_position(dialog_->button_down, x, y);
-
-       y = dh1 + hbrsr + dh1; // in position for next element
-
-       if (bibPresent) {
-               x = dialog_->browser_info->x;
-               fl_set_object_position(dialog_->browser_info, x, y);
-               fl_show_object(dialog_->browser_info);
-               y += hinfo + dh1;
-       } else
-               fl_hide_object(dialog_->browser_info);
-
-       if (natbib) {
-               x = dialog_->choice_style->x;
-               fl_set_object_position(dialog_->choice_style, x, y);
-               fl_show_object(dialog_->choice_style);
-               x = dialog_->input_before->x;
-               y += hstyle + dh1;
-               fl_set_object_position(dialog_->input_before, x, y);
-               fl_show_object(dialog_->input_before);
-               y += htext + dh2;
-       } else {
-               fl_hide_object(dialog_->choice_style);
-               fl_hide_object(dialog_->input_before);
-       }
+       int const found = int(cit - bibkeys.begin()) + 1;
+       if (found == sel)
+               return;
 
-       x = dialog_->input_after->x;
-       fl_set_object_position(dialog_->input_after, x, y);
-
-       y += htext + dh1;
-       x = dialog_->button_restore->x;
-       fl_set_object_position(dialog_->button_restore,     x, y);
-       x = dialog_->button_ok->x;
-       fl_set_object_position(dialog_->button_ok,     x, y);
-       x = dialog_->button_apply->x;
-       fl_set_object_position(dialog_->button_apply,  x, y);
-       x = dialog_->button_cancel->x;
-       fl_set_object_position(dialog_->button_cancel, x, y);
+       // Update the display
+       int const top = max(found - 5, 1);
+       fl_set_browser_topline(dialog_->browser_bib, top);
+       fl_select_browser_line(dialog_->browser_bib, found);
+       input(dialog_->browser_bib, 0);
 }
 
-
-bool FormCitation::input(FL_OBJECT * ob, long)
+ButtonPolicy::SMInput FormCitation::input(FL_OBJECT * ob, long)
 {
-       bool activate = false;
+       ButtonPolicy::SMInput activate = ButtonPolicy::SMI_NOOP;
+
+       biblio::InfoMap const & theMap = controller().bibkeysInfo();
+
+       string topCitekey;
+       if (!citekeys.empty()) topCitekey = citekeys[0];
 
        if (ob == dialog_->browser_bib) {
                fl_deselect_browser(dialog_->browser_cite);
-               
-               unsigned int sel = fl_get_browser(dialog_->browser_bib);
-               if (sel < 1 || sel > bibkeys.size()) return false;
+
+               unsigned int const sel = fl_get_browser(dialog_->browser_bib);
+               if (sel < 1 || sel > bibkeys.size())
+                       return ButtonPolicy::SMI_NOOP;
 
                // Put into browser_info the additional info associated with
                // the selected browser_bib key
                fl_clear_browser(dialog_->browser_info);
-               fl_add_browser_line(dialog_->browser_info,
-                                    bibkeysInfo[sel - 1].c_str());
 
-               // Highlight the selected browser_bib key in browser_cite if present
-               vector<string>::iterator it =
+               string const tmp = formatted(biblio::getInfo(theMap,
+                                                            bibkeys[sel-1]),
+                                             dialog_->browser_info->w-10 );
+               fl_add_browser_line(dialog_->browser_info, tmp.c_str());
+
+               // Highlight the selected browser_bib key in browser_cite if
+               // present
+               vector<string>::const_iterator cit =
                        find(citekeys.begin(), citekeys.end(), bibkeys[sel-1]);
 
-               if (it != citekeys.end()) {
-                       int n = static_cast<int>(it - citekeys.begin());
+               if (cit != citekeys.end()) {
+                       int const n = int(cit - citekeys.begin());
                        fl_select_browser_line(dialog_->browser_cite, n+1);
                        fl_set_browser_topline(dialog_->browser_cite, n+1);
                }
 
-               if (!lv_->buffer()->isReadonly()) {
-                       if (it != citekeys.end()) {
+               if (!controller().isReadonly()) {
+                       if (cit != citekeys.end()) {
                                setBibButtons(OFF);
                                setCiteButtons(ON);
                        } else {
@@ -355,49 +257,55 @@ bool FormCitation::input(FL_OBJECT * ob, long)
                }
 
        } else if (ob == dialog_->browser_cite) {
-               unsigned int sel = fl_get_browser(dialog_->browser_cite);
-               if (sel < 1 || sel > citekeys.size()) return false;
+               unsigned int const sel = fl_get_browser(dialog_->browser_cite);
+               if (sel < 1 || sel > citekeys.size())
+                       return ButtonPolicy::SMI_NOOP;
 
-               if (!lv_->buffer()->isReadonly()) {
+               if (!controller().isReadonly()) {
                        setBibButtons(OFF);
                        setCiteButtons(ON);
                }
 
                // Highlight the selected browser_cite key in browser_bib
-               vector<string>::iterator it =
+               vector<string>::const_iterator cit =
                        find(bibkeys.begin(), bibkeys.end(), citekeys[sel-1]);
 
-               if (it != bibkeys.end()) {
-                       int n = static_cast<int>(it - bibkeys.begin());
+               if (cit != bibkeys.end()) {
+                       int const n = int(cit - bibkeys.begin());
                        fl_select_browser_line(dialog_->browser_bib, n+1);
                        fl_set_browser_topline(dialog_->browser_bib, n+1);
 
-                       // Put into browser_info the additional info associated with
-                       // the selected browser_cite key
+                       // Put into browser_info the additional info associated
+                       // with the selected browser_cite key
                        fl_clear_browser(dialog_->browser_info);
-                       fl_add_browser_line(dialog_->browser_info,
-                                            bibkeysInfo[n].c_str());
+                       string const tmp =
+                               formatted(biblio::getInfo(theMap,
+                                                         citekeys[sel-1]),
+                                         dialog_->browser_info->w-10);
+                       fl_add_browser_line(dialog_->browser_info, tmp.c_str());
                }
 
        } else if (ob == dialog_->button_add) {
-               unsigned int sel = fl_get_browser(dialog_->browser_bib);
-               if (sel < 1 || sel > bibkeys.size()) return false;
+               unsigned int const sel = fl_get_browser(dialog_->browser_bib);
+               if (sel < 1 || sel > bibkeys.size())
+                       return ButtonPolicy::SMI_NOOP;
 
                // Add the selected browser_bib key to browser_cite
                fl_addto_browser(dialog_->browser_cite,
                                  bibkeys[sel-1].c_str());
                citekeys.push_back(bibkeys[sel-1]);
 
-               int n = static_cast<int>(citekeys.size());
+               int const n = int(citekeys.size());
                fl_select_browser_line(dialog_->browser_cite, n);
 
                setBibButtons(OFF);
                setCiteButtons(ON);
-               activate = true;
+               activate = ButtonPolicy::SMI_VALID;
 
        } else if (ob == dialog_->button_del) {
-               unsigned int sel = fl_get_browser(dialog_->browser_cite);
-               if (sel < 1 || sel > citekeys.size()) return false;
+               unsigned int const sel = fl_get_browser(dialog_->browser_cite);
+               if (sel < 1 || sel > citekeys.size())
+                       return ButtonPolicy::SMI_NOOP;
 
                // Remove the selected key from browser_cite
                fl_delete_browser_line(dialog_->browser_cite, sel) ;
@@ -405,15 +313,16 @@ bool FormCitation::input(FL_OBJECT * ob, long)
 
                setBibButtons(ON);
                setCiteButtons(OFF);
-               activate = true;
+               activate = ButtonPolicy::SMI_VALID;
 
        } else if (ob == dialog_->button_up) {
-               unsigned int sel = fl_get_browser(dialog_->browser_cite);
-               if (sel < 2 || sel > citekeys.size()) return false;
+               unsigned int const sel = fl_get_browser(dialog_->browser_cite);
+               if (sel < 2 || sel > citekeys.size())
+                       return ButtonPolicy::SMI_NOOP;
 
                // Move the selected key up one line
                vector<string>::iterator it = citekeys.begin() + sel-1;
-               string tmp = *it;
+               string const tmp = *it;
 
                fl_delete_browser_line(dialog_->browser_cite, sel);
                citekeys.erase(it);
@@ -422,15 +331,16 @@ bool FormCitation::input(FL_OBJECT * ob, long)
                fl_select_browser_line(dialog_->browser_cite, sel-1);
                citekeys.insert(it-1, tmp);
                setCiteButtons(ON);
-               activate = true;
+               activate = ButtonPolicy::SMI_VALID;
 
        } else if (ob == dialog_->button_down) {
-               unsigned int sel = fl_get_browser(dialog_->browser_cite);
-               if (sel < 1 || sel > citekeys.size()-1) return false;
+               unsigned int const sel = fl_get_browser(dialog_->browser_cite);
+               if (sel < 1 || sel > citekeys.size()-1)
+                       return ButtonPolicy::SMI_NOOP;
 
                // Move the selected key down one line
                vector<string>::iterator it = citekeys.begin() + sel-1;
-               string tmp = *it;
+               string const tmp = *it;
 
                fl_delete_browser_line(dialog_->browser_cite, sel);
                citekeys.erase(it);
@@ -439,37 +349,113 @@ bool FormCitation::input(FL_OBJECT * ob, long)
                fl_select_browser_line(dialog_->browser_cite, sel+1);
                citekeys.insert(it+1, tmp);
                setCiteButtons(ON);
-               activate = true;
+               activate = ButtonPolicy::SMI_VALID;
+
+       } else if (ob == dialog_->button_previous) {
+               findBiblio(biblio::BACKWARD);
+       } else if (ob == dialog_->button_next) {
+               findBiblio(biblio::FORWARD);
+       } else if (ob == dialog_->input_search) {
+               findBiblio(biblio::FORWARD);
        } else if (ob == dialog_->choice_style ||
+                  ob == dialog_->button_full_author_list ||
+                  ob == dialog_->button_force_uppercase ||
                   ob == dialog_->input_before ||
                   ob == dialog_->input_after) {
-               activate = true;
+               activate = ButtonPolicy::SMI_VALID;
        }
+
+       string currentCitekey;
+       if (!citekeys.empty())
+               currentCitekey = citekeys[0];
+
+       if (topCitekey != currentCitekey) {
+               int choice = fl_get_choice(dialog_->choice_style);
+               fillChoice(dialog_.get(),
+                          controller().getCiteStrings(currentCitekey));
+               fl_set_choice(dialog_->choice_style, choice);
+       }
+
        return activate;
 }
 
 
-void FormCitation::apply()
+void FormCitation::update()
 {
-       if (lv_->buffer()->isReadonly()) return;
+       // Make the list of all available bibliography keys
+       bibkeys = biblio::getKeys(controller().bibkeysInfo());
+       updateBrowser(dialog_->browser_bib, bibkeys);
 
-       string contents;
-       for (unsigned int i = 0; i < citekeys.size(); ++i) {
-               if (i > 0) contents += ", ";
-               contents += citekeys[i];
-       }
+       // Ditto for the keys cited in this inset
+       citekeys = getVectorFromString(controller().params().getContents());
+       updateBrowser(dialog_->browser_cite, citekeys);
 
-       params.setContents(contents);
-       params.setOptions(fl_get_input(dialog_->input_after));
+       // Use the first citekey to fill choice_style
+       string key;
+       if (!citekeys.empty()) key = citekeys[0];
 
-       if (inset_ != 0) {
-               // Only update if contents have changed
-               if (params != inset_->params()) {
-                       inset_->setParams(params);
-                       lv_->view()->updateInset(inset_, true);
-               }
-       } else {
-               lv_->getLyXFunc()->Dispatch(LFUN_CITATION_INSERT,
-                                           params.getAsString());
+       fillChoice(dialog_.get(), controller().getCiteStrings(key));
+
+       // Use the citation command to update the GUI
+       updateStyle(dialog_.get(), controller().params().getCmdName());
+
+       bool const natbib = controller().usingNatbib();
+       setEnabled(dialog_->button_full_author_list, natbib);
+       setEnabled(dialog_->button_force_uppercase, natbib);
+       setEnabled(dialog_->choice_style, natbib);
+       
+       // No keys have been selected yet, so...
+       fl_clear_browser(dialog_->browser_info);
+       setBibButtons(OFF);
+       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);
+}
+
+
+void FormCitation::updateBrowser(FL_OBJECT * browser,
+                                vector<string> const & keys) const
+{
+       // Check whether the current contents of the browser will be
+       // changed by loading the contents of the vec...
+       vector<string> browser_keys = getVectorFromBrowser(browser);
+
+       if (browser_keys == keys)
+               return;
+
+       // They will be changed. Proceed.
+       fl_clear_browser(browser);
+
+       for (vector<string>::const_iterator it = keys.begin();
+            it < keys.end(); ++it) {
+               string key = frontStrip(strip(*it));
+               if (!key.empty())
+                       fl_add_browser_line(browser, key.c_str());
        }
 }
+
+
+void FormCitation::setBibButtons(State status) const
+{
+       setEnabled(dialog_->button_add, (status == ON));
+}
+
+
+void FormCitation::setCiteButtons(State status) const
+{
+       int const sel     = fl_get_browser(dialog_->browser_cite);
+       int const maxline = fl_get_browser_maxline(dialog_->browser_cite);
+       bool const activate      = (status == ON);
+       bool const activate_up   = (activate && sel != 1);
+       bool const activate_down = (activate && sel != maxline);
+
+       setEnabled(dialog_->button_del,  activate);
+       setEnabled(dialog_->button_up,   activate_up);
+       setEnabled(dialog_->button_down, activate_down);
+}