port the graphics dialog to the new scheme and get rid of the ControlInset

[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 33a430186b5cbcaaa033f5040c4477c5117c1858..34ac0f1207a9a156061d489d7cd1f5c9a26cc61d 100644 (file)
--- a/src/frontends/controllers/helper_funcs.C
+++ b/src/frontends/controllers/helper_funcs.C
@@ -1,21 +1,15 @@
-/* This file is part of
- * ====================================================== 
- *
- *           LyX, The Document Processor
- *
- *           Copyright 2001 The LyX Team.
+/**
+ * \file helper_funcs.C
+ * This file is part of LyX, the document processor.
+ * Licence details can be found in the file COPYING.
  *
- * ======================================================
+ * \author Angus Leeming
  *
- * \file helper_funcs.C
- * \author Angus Leeming <a.leeming@ic.ac.uk>
+ * Full author contact details are available in file CREDITS
  */
 
 #include <vector>
 
-#ifdef __GNUG__
-#pragma implementation
-#endif
 
 #include <config.h>
 #include "LString.h"
@@ -32,74 +26,37 @@ using std::vector;
 using std::make_pair;
 
 
-string const getStringFromVector(vector<string> const & vec,
-                                string const & delim)
-{
-       string str;
-       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;
-}
-
-vector<string> const getVectorFromString(string const & str,
-                                        string const & delim)
-{
-       vector<string> vec;
-       if (str.empty())
-               return vec;
-
-       string keys(strip(str));
-
-       for(;;) {
-               string::size_type const idx = keys.find(delim);
-               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);
-       }
-
-       return vec;
-}
-
-string const browseFile(LyXView * lv, string const & filename,
+string const browseFile(string const & filename,
                        string const & title,
-                       string const & pattern, 
+                       string const & pattern,
+                       bool save,
                        pair<string,string> const & dir1,
                        pair<string,string> const & dir2)
 {
-       string lastPath = ".";
+       string lastPath(".");
        if (!filename.empty())
                lastPath = OnlyPath(filename);
 
-       FileDialog fileDlg(lv, title, LFUN_SELECT_FILE_SYNC, dir1, dir2);
+       FileDialog fileDlg(title, LFUN_SELECT_FILE_SYNC, dir1, dir2);
 
        FileDialog::Result result;
- 
-       while (1) {
-               result = fileDlg.Select(lastPath, pattern, OnlyFilename(filename));
 
-               if (result.second.empty()) 
+       while (true) {
+               if (save)
+                       result = fileDlg.save(lastPath, pattern,
+                               OnlyFilename(filename));
+               else
+                       result = fileDlg.open(lastPath, pattern,
+                               OnlyFilename(filename));
+
+               if (result.second.empty())
                        return result.second;
 
                lastPath = OnlyPath(result.second);
 
                if (result.second.find_first_of("#~$% ") == string::npos)
-                       break; 
- 
+                       break;
+
                Alert::alert(_("Filename can't contain any "
                        "of these characters:"),
                        _("space, '#', '~', '$' or '%'."));
@@ -109,32 +66,68 @@ string const browseFile(LyXView * lv, string const & filename,
 }
 
 
-string const browseRelFile(LyXView * lv, string const & filename,
+string const browseRelFile(string const & filename,
                        string const & refpath,
                        string const & title,
-                       string const & pattern, 
+                       string const & pattern,
+                       bool save,
                        pair<string,string> const & dir1,
                        pair<string,string> const & dir2)
 {
        string const fname = MakeAbsPath(filename, refpath);
-       
-       string const outname = browseFile(lv, fname, title, pattern, dir1);
+
+       string const outname = browseFile(fname, title, pattern, save,
+                                         dir1, dir2);
        string const reloutname = MakeRelPath(outname, refpath);
-       if(prefixIs(reloutname, "../"))
+       if (prefixIs(reloutname, "../"))
                return outname;
        else
                return reloutname;
 }
 
 
+string const browseDir(string const & pathname,
+                       string const & title,
+                       pair<string,string> const & dir1,
+                       pair<string,string> const & dir2)
+{
+       string lastPath(".");
+       if (!pathname.empty())
+               lastPath = OnlyPath(pathname);
+
+       FileDialog fileDlg(title, LFUN_SELECT_FILE_SYNC, dir1, dir2);
+
+       FileDialog::Result result;
+
+       while (true) {
+               result = fileDlg.opendir(lastPath,
+                               OnlyFilename(pathname));
+
+               if (result.second.empty())
+                       return result.second;
+
+               lastPath = OnlyPath(result.second);
+
+               if (result.second.find_first_of("#~$% ") == string::npos)
+                       break;
+
+               Alert::alert(_("directory name can't contain any "
+                       "of these characters:"),
+                       _("space, '#', '~', '$' or '%'."));
+       }
+
+       return result.second;
+}
+
+
 // sorry this is just a temporary hack we should include vspace.h! (Jug)
 extern const char * stringFromUnit(int);
 
 vector<string> const getLatexUnits()
 {
        vector<string> units;
-       const char * str;
-       for(int i=0; (str = stringFromUnit(i)); ++i)
+       char const * str;
+       for (int i = 0; (str = stringFromUnit(i)); ++i)
            units.push_back(str);
 
        return units;