Bugfixes: checkboxes to radiobuttons (from J�rgen S) and remove a little

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

diff --git a/src/frontends/xforms/FormBibtex.C b/src/frontends/xforms/FormBibtex.C
index 923b147684262f894c02e7daa7ba3a62ce808498..591a33068b89bca91a40eb80eaeb8dc4c678b60d 100644 (file)
--- a/src/frontends/xforms/FormBibtex.C
+++ b/src/frontends/xforms/FormBibtex.C
@@ -5,6 +5,7 @@
  *
  * \author Angus Leeming
  * \author John Levon
+ * \author Herbert Voss <voss@lyx.org>
  */
 
 #ifdef __GNUG__
@@ -18,6 +19,10 @@
 #include "form_bibtex.h"
 #include "gettext.h"
 #include "debug.h"
+#include "helper_funcs.h"
+#include "support/lstrings.h"
+#include "support/filetools.h"
+
 
 typedef FormCB<ControlBibtex, FormDB<FD_form_bibtex> > base_class;
 
@@ -37,16 +42,50 @@ void FormBibtex::build()
        bc().setOK(dialog_->button_ok);
        bc().setCancel(dialog_->button_cancel);
 
+       bc().addReadOnly(dialog_->database_browse);
        bc().addReadOnly(dialog_->database);
+       bc().addReadOnly(dialog_->style_browse);
        bc().addReadOnly(dialog_->style);
+       bc().addReadOnly(dialog_->radio_bibtotoc);
 }
 
 
-ButtonPolicy::SMInput FormBibtex::input(FL_OBJECT *, long)
+ButtonPolicy::SMInput FormBibtex::input(FL_OBJECT * ob, long)
 {
-       // minimal validation 
-       if (!compare(fl_get_input(dialog_->database),""))
+       if (ob == dialog_->database_browse) {
+               // When browsing, take the first file only 
+               string const in_name = fl_get_input(dialog_->database);
+               string out_name = 
+                       controller().Browse("",
+                                           "Select Database",
+                                           "*.bib| BibTeX Databases (*.bib)");
+               if (!out_name.empty()) {
+                       // add the database to any existing ones
+                       if (!in_name.empty())
+                               out_name = in_name + ", " + out_name;
+
+                       fl_freeze_form(form()); 
+                       fl_set_input(dialog_->database, out_name.c_str());
+                       fl_unfreeze_form(form()); 
+               }
+       }
+
+       if (ob == dialog_->style_browse) {
+               string const in_name = fl_get_input(dialog_->style);
+               string out_name = 
+                       controller().Browse(in_name,
+                                           "Select BibTeX-Style",
+                                           "*.bst| BibTeX Styles (*.bst)");
+               if (!out_name.empty()) {
+                       fl_freeze_form(form()); 
+                       fl_set_input(dialog_->style, out_name.c_str());
+                       fl_unfreeze_form(form()); 
+               }
+       }
+  
+       if (!compare(fl_get_input(dialog_->database),"")) {
                return ButtonPolicy::SMI_NOOP;
+       }
 
        return ButtonPolicy::SMI_VALID;
 }
@@ -56,13 +95,80 @@ void FormBibtex::update()
 {
        fl_set_input(dialog_->database,
                     controller().params().getContents().c_str());
-       fl_set_input(dialog_->style,
-                    controller().params().getOptions().c_str());
+        string bibtotoc = "bibtotoc";
+       string bibstyle (controller().params().getOptions().c_str());
+       if (prefixIs(bibstyle,bibtotoc)) { // bibtotoc exists?
+               fl_set_button(dialog_->radio_bibtotoc,1);
+               if (contains(bibstyle,',')) { // bibstyle exists?
+                       bibstyle = split(bibstyle,bibtotoc,',');
+               } else {
+                       bibstyle = "";
+               }
+
+               fl_set_input(dialog_->style,bibstyle.c_str());
+
+       } else {
+               fl_set_button(dialog_->radio_bibtotoc,0);
+               fl_set_input(dialog_->style,bibstyle.c_str());
+       }
+}
+
+namespace {
+
+// Remove all duplicate entries in c.
+// Taken stright out of Stroustrup
+template<class C> void eliminate_duplicates(C & c)
+{
+       std::sort(c.begin(), c.end()); // sort
+       typename C::iterator p = std::unique(c.begin(), c.end()); // compact
+       c.erase(p, c.end()); // shrink
+}
+
+string const unique_and_no_extensions(string const & str_in)
+{
+       std::vector<string> dbase = getVectorFromString(str_in);
+       for (std::vector<string>::iterator it = dbase.begin();
+            it != dbase.end(); ++it) {
+               *it = ChangeExtension(*it, "");
+       }
+       eliminate_duplicates(dbase);
+       return subst(getStringFromVector(dbase),",",", ");
 }
+ 
+} // namespace anon
 
 
 void FormBibtex::apply()
 {
-       controller().params().setContents(fl_get_input(dialog_->database));
-       controller().params().setOptions(fl_get_input(dialog_->style));
+       string const db = fl_get_input(dialog_->database);
+       if (db.empty()) {
+               // no database -> no bibtex-command and no options!
+               controller().params().setContents("");
+               controller().params().setOptions("");
+               return;
+       }
+       
+       controller().params().setContents(unique_and_no_extensions(db));
+
+       // empty is valid!
+       string bibstyle = fl_get_input(dialog_->style);
+       if (!bibstyle.empty()) {
+               // save the BibTeX style without any ".bst" extension
+               bibstyle = ChangeExtension(OnlyFilename(bibstyle), "");
+       }
+
+       bool const bibtotoc = fl_get_button(dialog_->radio_bibtotoc);
+       
+       if (bibtotoc && (!bibstyle.empty())) {
+               // both bibtotoc and style
+               controller().params().setOptions("bibtotoc,"+bibstyle);
+
+       } else if (bibtotoc) {
+               // bibtotoc and no style
+               controller().params().setOptions("bibtotoc");
+
+       } else if (!bibstyle.empty()){
+               // only style
+               controller().params().setOptions(bibstyle);
+       }
 }