Change glob() API to accept a dir parameter.

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

diff --git a/src/frontends/xforms/FormBibtex.C b/src/frontends/xforms/FormBibtex.C
index 4f4e5f48795fac6c24e494a93bfa6b41e2710d6d..3703e07f82708cf34b7ec67ba64724e708ce2668 100644 (file)
--- a/src/frontends/xforms/FormBibtex.C
+++ b/src/frontends/xforms/FormBibtex.C
@@ -22,25 +22,28 @@
 #include "xformsBC.h"
 
 #include "support/filetools.h"
-#include "support/globbing.h"
 #include "support/lstrings.h"
 #include "support/lyxalgo.h"
 
 #include "lyx_forms.h"
 
-using lyx::support::ChangeExtension;
-using lyx::support::compare;
-using lyx::support::contains;
-using lyx::support::FileFilterList;
-using lyx::support::getStringFromVector;
-using lyx::support::getVectorFromString;
-using lyx::support::OnlyFilename;
-using lyx::support::prefixIs;
-using lyx::support::split;
-
 using std::vector;
 using std::string;
 
+namespace lyx {
+
+using support::ChangeExtension;
+using support::compare;
+using support::contains;
+using support::FileFilterList;
+using support::getStringFromVector;
+using support::getVectorFromString;
+using support::OnlyFilename;
+using support::prefixIs;
+using support::split;
+
+namespace frontend {
+
 
 typedef FormController<ControlBibtex, FormView<FD_bibtex> > base_class;
 
@@ -78,7 +81,7 @@ void FormBibtex::build()
        // callback for double click in browser
        fl_set_browser_dblclick_callback(dialog_->browser_styles,
                                         C_FormDialogView_InputCB, 2);
-                                        
+
        fl_addto_choice(dialog_->choice_btprint,
                        _(" all cited references "
                          "| all uncited references "
@@ -113,7 +116,7 @@ void FormBibtex::build()
                "the styles which are in directories where TeX finds them "
                "are listed!");
        tooltips().init(dialog_->button_rescan, str);
-       
+
        str = _("The bibliography section contains...");
        tooltips().init(dialog_->choice_btprint, str);
 }
@@ -124,11 +127,7 @@ ButtonPolicy::SMInput FormBibtex::input(FL_OBJECT * ob, long ob_value)
        if (ob == dialog_->button_database_browse) {
                // When browsing, take the first file only
                string const in_name = getString(dialog_->input_database);
-               FileFilterList const
-                       filter(_("*.bib| BibTeX Databases (*.bib)"));
-               string out_name =
-                       controller().browse("", _("Select Database"),
-                                           filter);
+               string out_name = controller().browseBib("");
                if (!out_name.empty()) {
                        // add the database to any existing ones
                        if (!in_name.empty())
@@ -139,10 +138,7 @@ ButtonPolicy::SMInput FormBibtex::input(FL_OBJECT * ob, long ob_value)
 
        } else if (ob == dialog_->button_style_browse) {
                string const in_name = getString(dialog_->input_style);
-               FileFilterList const
-                       filter(_("*.bst| BibTeX Styles (*.bst)"));
-               string const style = controller()
-                       .browse(in_name, _("Select BibTeX-Style"), filter);
+               string const style = controller().browseBst(in_name);
                if (!style.empty()) {
                        fl_set_input(dialog_->input_style, style.c_str());
                }
@@ -198,14 +194,14 @@ void FormBibtex::update()
                }
        }
        fl_set_input(dialog_->input_style, bibstyle.c_str());
-       
+
        string btprint = controller().params().getSecOptions();
        int btp = 1;
        if (btprint == "btPrintNotCited")
                btp = 2;
        else if (btprint == "btPrintAll")
                btp = 3;
-       
+
        fl_set_choice(dialog_->choice_btprint, btp);
        setEnabled(dialog_->choice_btprint, bibtopic);
 
@@ -226,7 +222,7 @@ string const unique_and_no_extensions(string const & str_in)
             it != dbase.end(); ++it) {
                *it = ChangeExtension(*it, string());
        }
-       lyx::eliminate_duplicates(dbase);
+       eliminate_duplicates(dbase);
        return getStringFromVector(dbase);
 }
 
@@ -260,11 +256,11 @@ void FormBibtex::apply()
                controller().params().setOptions(bibtotoc + ',' + bibstyle);
 
        } else {
-               // At least one of addtotoc and bibstyle is empty. 
+               // At least one of addtotoc and bibstyle is empty.
                // No harm to output both!
                controller().params().setOptions(bibtotoc + bibstyle);
        }
-       
+
        // bibtopic allows three kinds of sections:
        // 1. sections that include all cited references of the database(s)
        // 2. sec. that include all uncited references of the database(s)
@@ -283,7 +279,11 @@ void FormBibtex::apply()
                        break;
                }
        }
-       
+
        else
                controller().params().setSecOptions("");
+
 }
+
+} // namespace frontend
+} // namespace lyx