X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Ffrontends%2Fqt4%2Fqt_helpers.h;h=dd284a8655099af9de1b77028d41ad0993e43911;hb=425d092204118ea6c24c28e85fdf03fcf2bb51a4;hp=216e876fa26d1db253b2dc9a48c6ed85f7195132;hpb=88293cbcfb546a8aa5484f2c62a8b9b3ce3b4317;p=lyx.git

diff --git a/src/frontends/qt4/qt_helpers.h b/src/frontends/qt4/qt_helpers.h
index 216e876fa2..dd284a8655 100644
--- a/src/frontends/qt4/qt_helpers.h
+++ b/src/frontends/qt4/qt_helpers.h
@@ -15,21 +15,24 @@
 
 #include "Length.h"
 #include "support/qstring_helpers.h"
-#include "support/strfwd.h"
+#include "qt_i18n.h"
 
-#include <vector>
+#include <QString>
 
 class QComboBox;
 class QLineEdit;
 class QCheckBox;
 class QString;
 class QWidget;
+template <class T> class QList;
 
 class LengthCombo;
 
 namespace lyx {
 
-namespace support { class FileFilterList; }
+namespace support { class FileName; }
+
+class BufferParams;
 
 namespace frontend {
 
@@ -45,9 +48,20 @@ Length const & len, Length::UNIT default_unit);
 /// method to set widgets from a string
 void lengthToWidgets(QLineEdit * input, LengthCombo * combo,
 std::string const & len, Length::UNIT default_unit);
-/// method to set widgets from a Length with optional "auto" if zero
-void lengthAutoToWidgets(QLineEdit * input, LengthCombo * combo,
-Length const & len, Length::UNIT defaultUnit);
+/// method to set widgets from a docstring
+void lengthToWidgets(QLineEdit * input, LengthCombo * combo,
+docstring const & len, Length::UNIT default_unit);
+
+/// method to get a double value from a localized widget (QLineEdit)
+double widgetToDouble(QLineEdit const * input);
+/// method to get a double value from a localized widget (QLineEdit)
+std::string widgetToDoubleStr(QLineEdit const * input);
+/// method to set a (localized) double value in a widget (QLineEdit)
+void doubleToWidget(QLineEdit * input, double const & value,
+	char f = 'g', int prec = 6);
+/// method to set a (localized) double value in a widget (QLineEdit)
+void doubleToWidget(QLineEdit * input, std::string const & value,
+	char f = 'g', int prec = 6);
 
 /// colors a widget red if invalid
 void setValid(QWidget * widget, bool valid);
@@ -55,14 +69,6 @@ void setValid(QWidget * widget, bool valid);
 } // namespace frontend
 
 
-/**
-* qt_ - i18nize string and convert to QString
- *
- * Use this in qt4/ instead of _()
- */
-QString const qt_(char const * str, const char * comment = 0);
-
-
 /**
  * qt_ - i18nize string and convert to QString
  *
@@ -71,12 +77,8 @@ QString const qt_(char const * str, const char * comment = 0);
 QString const qt_(std::string const & str);
 
 ///
-typedef std::pair<docstring, std::string> LanguagePair;
-
-/** If the caller is the character dialog, add "No change" and "Reset"
-*  to the vector.
-*/
-std::vector<LanguagePair> const getLanguageData(bool character_dlg);
+support::FileName libFileSearch(QString const & dir, QString const & name,
+				QString const & ext = QString());
 
 /** Wrapper around browseFile which tries to provide a filename
 	relative to relpath.  If the relative path is of the form "foo.txt"
@@ -84,15 +86,15 @@ std::vector<LanguagePair> const getLanguageData(bool character_dlg);
 	of the form "../baz/foo.txt", an absolute path is returned. This is
 	intended to be useful for insets which encapsulate files/
 */
-docstring browseRelFile(docstring const & filename,
-	docstring const & refpath,
-	docstring const & title,
-	support::FileFilterList const & filters,
+QString browseRelFile(QString const & filename,
+	QString const & refpath,
+	QString const & title,
+	QStringList const & filters,
 	bool save = false,
-	docstring const & label1 = docstring(),
-	docstring const & dir1 = docstring(),
-	docstring const & label2 = docstring(),
-	docstring const & dir2 = docstring());
+	QString const & label1 = QString(),
+	QString const & dir1 = QString(),
+	QString const & label2 = QString(),
+	QString const & dir2 = QString());
 
 
 /** Build filelists of all availabe bst/cls/sty-files. Done through
@@ -103,12 +105,40 @@ void rescanTexStyles();
 /** Fill \c contents from one of the three texfiles.
  *  Each entry in the file list is returned as a name_with_path
  */
-void getTexFileList(std::string const & filename, std::vector<std::string> & contents);
+QStringList texFileList(QString const & filename);
+
+/// Convert internal line endings to line endings as expected by the OS
+QString const externalLineEnding(docstring const & str);
+
+/// Convert line endings in any formnat to internal line endings
+docstring const internalLineEnding(QString const & str);
 
 // wrapper around the docstring versions
-QString internalPath(const QString &);
-QString onlyFilename(const QString & str);
-QString onlyPath(const QString & str);
+QString internalPath(QString const &);
+QString onlyFilename(QString const & str);
+QString onlyPath(QString const & str);
+QStringList fileFilters(QString const & description);
+
+QString changeExtension(QString const & oldname, QString const & extension);
+
+/// Remove the extension from \p name
+QString removeExtension(QString const & name);
+
+/** Add the extension \p ext to \p name.
+ Use this instead of changeExtension if you know that \p name is without
+ extension, because changeExtension would wrongly interpret \p name if it
+ contains a dot.
+ */
+QString addExtension(QString const & name, QString const & extension);
+
+/// Return the extension of the file (not including the .)
+QString getExtension(QString const & name);
+QString makeAbsPath(QString const & relpath, QString const & base);
+QString changeExtension(QString const & oldname, QString const & ext);
+
+/// \return the display string associated with given type and buffer
+/// parameter.
+QString guiName(std::string const & type, BufferParams const & bp);
 
 } // namespace lyx