Change glob() API to accept a dir parameter.

[lyx.git] / src / frontends / xforms / FormCitation.C

diff --git a/src/frontends/xforms/FormCitation.C b/src/frontends/xforms/FormCitation.C
index 10c855ac75a573682b342a41b02ad284e430ab72..87829f432463bf81d1e434581be05c73feafabaf 100644 (file)
--- a/src/frontends/xforms/FormCitation.C
+++ b/src/frontends/xforms/FormCitation.C
@@ -19,14 +19,12 @@
 #include "xforms_helpers.h"
 #include "xformsBC.h"
 
+#include "bufferparams.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;
 
@@ -34,6 +32,14 @@ using std::vector;
 using std::string;
 
 
+namespace lyx {
+
+using support::getStringFromVector;
+using support::getVectorFromString;
+using support::trim;
+
+namespace frontend {
+
 namespace {
 
 // shamelessly stolen from Menubar_pimpl.C
@@ -69,7 +75,7 @@ void updateStyle(FD_citation * dialog, string command)
        // Find the style of the citekeys
        vector<biblio::CiteStyle> const & styles =
                ControlCitation::getCiteStyles();
-       biblio::CitationStyle cs = biblio::getCitationStyle(command);
+       biblio::CitationStyle const cs(command);
 
        vector<biblio::CiteStyle>::const_iterator cit =
                find(styles.begin(), styles.end(), cs.style);
@@ -109,7 +115,10 @@ void FormCitation::apply()
                bool const force =
                        fl_get_button(dialog_->check_force_uppercase);
 
-               command = biblio::getCiteCommand(styles[choice], full, force);
+               command =
+                       biblio::CitationStyle(styles[choice], full, force)
+                       .asLatexStr();
+
        }
 
        controller().params().setCmdName(command);
@@ -425,6 +434,10 @@ ButtonPolicy::SMInput FormCitation::input(FL_OBJECT * ob, long)
                fl_set_choice(dialog_->choice_style, choice);
        }
 
+       // Invalid if no citation has been chosen
+       if (fl_get_browser_maxline(dialog_->browser_cite) < 1)
+               activate = ButtonPolicy::SMI_INVALID;
+
        return activate;
 }
 
@@ -517,3 +530,6 @@ void FormCitation::setCiteButtons(State status) const
        setEnabled(dialog_->button_up,   activate_up);
        setEnabled(dialog_->button_down, activate_down);
 }
+
+} // namespace frontend
+} // namespace lyx