The reference dialog now disconnects from the inset on Apply. Its behaviour

[lyx.git] / src / frontends / controllers / helper_funcs.C

diff --git a/src/frontends/controllers/helper_funcs.C b/src/frontends/controllers/helper_funcs.C
index 96b40435b6c62f7f1ffa0669806e9663276ae2b5..60601b48c8ad1bc2b9fab9b5af7a94158b6084fc 100644 (file)
--- a/src/frontends/controllers/helper_funcs.C
+++ b/src/frontends/controllers/helper_funcs.C
@@ -21,15 +21,29 @@
 #include "LString.h"
 #include "helper_funcs.h"
 
+#include "frontends/FileDialog.h"
+#include "support/filetools.h" // OnlyPath, OnlyFilename
+#include "support/lstrings.h"
+#include "gettext.h" // _()
+#include "lyx_gui_misc.h" // WriteAlert
+
+using std::pair;
 using std::vector;
+using std::make_pair;
+
 
 string const getStringFromVector(vector<string> const & vec,
                                 string const & delim)
 {
        string str;
-       for (vector<string>::size_type i=0; i<vec.size(); ++i) {
-               if (i > 0) str += delim;
-               str += vec[i];
+       int i = 0;
+       for (vector<string>::const_iterator it = vec.begin();
+            it != vec.end(); ++it) {
+               string item = strip(frontStrip(*it));
+               if (item.empty()) continue;
+
+               if (i++ > 0) str += delim;
+               str += item;
        }
        return str;
 }
@@ -38,13 +52,21 @@ vector<string> const getVectorFromString(string const & str,
                                         string const & delim)
 {
        vector<string> vec;
-       string keys(str);
+       if (str.empty())
+               return vec;
+
+       string keys(strip(str));
 
        for(;;) {
                string::size_type const idx = keys.find(delim);
-               if (idx == string::npos) break;
-               
-               vec.push_back(keys.substr(0, idx));
+               if (idx == string::npos) {
+                       vec.push_back(frontStrip(keys));
+                       break;
+               }
+
+               string const key = strip(frontStrip(keys.substr(0, idx)));
+               if (!key.empty())
+                       vec.push_back(key);
 
                string::size_type const start = idx + delim.size();
                keys = keys.substr(start);
@@ -53,3 +75,36 @@ vector<string> const getVectorFromString(string const & str,
        return vec;
 }
 
+string const browseFile(LyXView * lv, string const & filename,
+                       string const & title,
+                       string const & pattern, 
+                       pair<string,string> const & dir1,
+                       pair<string,string> const & dir2)
+{
+       string lastPath = ".";
+       if (!filename.empty()) lastPath = OnlyPath(filename);
+
+       FileDialog fileDlg(lv, title, LFUN_SELECT_FILE_SYNC, dir1, dir2);
+
+       FileDialog::Result result;
+ 
+       while (1) {
+               result = fileDlg.Select(lastPath, pattern, OnlyFilename(filename));
+
+               if (result.second.empty()) 
+                       return result.second;
+
+               lastPath = OnlyPath(result.second);
+
+               if (result.second.find_first_of("#~$% ") == string::npos)
+                       break; 
+ 
+               WriteAlert(_("Filename can't contain any "
+                       "of these characters:"),
+                       _("space, '#', '~', '$' or '%'."));
+       }
+
+       return result.second;
+}
+
+