X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Ffrontends%2Fcontrollers%2Fhelper_funcs.C;h=34ac0f1207a9a156061d489d7cd1f5c9a26cc61d;hb=120c89f24fae05379fbdc8539d3cfae574c2aecd;hp=e7966fd862579e50511872d0448575d090a62086;hpb=6fac1dc98003a6a6e02765f078b3d3426d426508;p=lyx.git

diff --git a/src/frontends/controllers/helper_funcs.C b/src/frontends/controllers/helper_funcs.C
index e7966fd862..34ac0f1207 100644
--- a/src/frontends/controllers/helper_funcs.C
+++ b/src/frontends/controllers/helper_funcs.C
@@ -1,6 +1,7 @@
 /**
  * \file helper_funcs.C
- * See the file COPYING.
+ * This file is part of LyX, the document processor.
+ * Licence details can be found in the file COPYING.
  *
  * \author Angus Leeming
  *
@@ -9,9 +10,6 @@
 
 #include <vector>
 
-#ifdef __GNUG__
-#pragma implementation
-#endif
 
 #include <config.h>
 #include "LString.h"
@@ -27,22 +25,29 @@ using std::pair;
 using std::vector;
 using std::make_pair;
 
-string const browseFile(LyXView * lv, string const & filename,
+
+string const browseFile(string const & filename,
 			string const & title,
 			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));
+	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;
@@ -61,16 +66,17 @@ 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,
+			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,
+	string const outname = browseFile(fname, title, pattern, save,
 					  dir1, dir2);
 	string const reloutname = MakeRelPath(outname, refpath);
 	if (prefixIs(reloutname, "../"))
@@ -80,14 +86,48 @@ string const browseRelFile(LyXView * lv, string const & filename,
 }
 
 
+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;