#include "BufferParams.h"
#include "FloatList.h"
+#include "IndicesList.h"
#include "Language.h"
#include "Length.h"
#include "TextClass.h"
#include "support/convert.h"
#include "support/debug.h"
-#include "support/filetools.h"
#include "support/foreach.h"
#include "support/gettext.h"
#include "support/lstrings.h"
#include "support/lyxalgo.h"
#include "support/os.h"
#include "support/Package.h"
-#include "support/Path.h"
+#include "support/PathChanger.h"
#include "support/Systemcall.h"
#include <QCheckBox>
namespace lyx {
FileName libFileSearch(QString const & dir, QString const & name,
- QString const & ext)
+ QString const & ext, search_mode mode)
{
- return support::libFileSearch(fromqstr(dir), fromqstr(name), fromqstr(ext));
+ return support::libFileSearch(fromqstr(dir), fromqstr(name), fromqstr(ext), mode);
}
FileName imageLibFileSearch(QString & dir, QString const & name,
- QString const & ext)
+ QString const & ext, search_mode mode)
{
string tmp = fromqstr(dir);
- FileName fn = support::imageLibFileSearch(tmp, fromqstr(name), fromqstr(ext));
+ FileName fn = support::imageLibFileSearch(tmp, fromqstr(name), fromqstr(ext), mode);
dir = toqstr(tmp);
return fn;
}
+namespace {
+
+double locstringToDouble(QString const & str)
+{
+ QLocale loc;
+ bool ok;
+ double res = loc.toDouble(str, &ok);
+ if (!ok) {
+ // Fall back to C
+ QLocale c(QLocale::C);
+ res = c.toDouble(str);
+ }
+ return res;
+}
+
+} // namespace anon
+
namespace frontend {
Length::UNIT const unit = combo->currentLengthItem();
- return Length(length.trimmed().toDouble(), unit).asString();
+ return Length(locstringToDouble(length.trimmed()), unit).asString();
}
}
}
- return Length(length.trimmed().toDouble(), unit);
+ return Length(locstringToDouble(length.trimmed()), unit);
}
void lengthToWidgets(QLineEdit * input, LengthCombo * combo,
- Length const & len, Length::UNIT /*defaultUnit*/)
+ Length const & len, Length::UNIT /*defaultUnit*/)
{
- combo->setCurrentItem(len.unit());
- QLocale loc;
- loc.setNumberOptions(QLocale::OmitGroupSeparator);
- input->setText(loc.toString(Length(len).value()));
+ if (len.empty()) {
+ // no length (UNIT_NONE)
+ combo->setCurrentItem(Length::defaultUnit());
+ input->setText("");
+ } else {
+ combo->setCurrentItem(len.unit());
+ QLocale loc;
+ loc.setNumberOptions(QLocale::OmitGroupSeparator);
+ input->setText(formatLocFPNumber(Length(len).value()));
+ }
}
QString const text = input->text();
if (text.isEmpty())
return 0.0;
-
- return text.trimmed().toDouble();
+
+ return locstringToDouble(text.trimmed());
}
string widgetToDoubleStr(QLineEdit const * input)
{
- QString const text = input->text();
- if (text.isEmpty())
- return string();
-
- return convert<string>(text.trimmed().toDouble());
+ return convert<string>(widgetToDouble(input));
}
}
+QString formatLocFPNumber(double d)
+{
+ QString result = toqstr(formatFPNumber(d));
+ QLocale loc;
+ result.replace('.', loc.decimalPoint());
+ return result;
+}
+
+
+bool ColorSorter(ColorCode lhs, ColorCode rhs)
+{
+ return compare_no_case(lcolor.getGUIName(lhs), lcolor.getGUIName(rhs)) < 0;
+}
+
+
void setValid(QWidget * widget, bool valid)
{
if (valid) {
}
}
+/// wrapper to hide the change of method name to setSectionResizeMode
+void setSectionResizeMode(QHeaderView * view,
+ int logicalIndex, QHeaderView::ResizeMode mode) {
+#if (QT_VERSION >= 0x050000)
+ view->setSectionResizeMode(logicalIndex, mode);
+#else
+ view->setResizeMode(logicalIndex, mode);
+#endif
+}
+
+void setSectionResizeMode(QHeaderView * view, QHeaderView::ResizeMode mode) {
+#if (QT_VERSION >= 0x050000)
+ view->setSectionResizeMode(mode);
+#else
+ view->setResizeMode(mode);
+#endif
+}
} // namespace frontend
QString const qt_(char const * str, const char *)
}
-void rescanTexStyles()
+QString const qt_(QString const & qstr)
+{
+ return toqstr(_(fromqstr(qstr)));
+}
+
+
+void rescanTexStyles(string const & arg)
{
// Run rescan in user lyx directory
PathChanger p(package().user_support());
- FileName const command = support::libFileSearch("scripts", "TeXFiles.py");
+ FileName const prog = support::libFileSearch("scripts", "TeXFiles.py");
Systemcall one;
- int const status = one.startscript(Systemcall::Wait,
- os::python() + ' ' +
- quoteName(command.toFilesystemEncoding()));
+ string const command = os::python() + ' ' +
+ quoteName(prog.toFilesystemEncoding()) + ' ' +
+ arg;
+ int const status = one.startscript(Systemcall::Wait, command);
if (status == 0)
return;
// FIXME UNICODE
frontend::Alert::error(_("Could not update TeX information"),
- bformat(_("The script `%1$s' failed."), from_utf8(command.absFileName())));
+ bformat(_("The script `%1$s' failed."), from_utf8(prog.absFileName())));
}
QString const externalLineEnding(docstring const & str)
{
-#ifdef Q_WS_MACX
+#ifdef Q_OS_MAC
// The MAC clipboard uses \r for lineendings, and we use \n
return toqstr(subst(str, '\n', '\r'));
-#elif defined(Q_WS_WIN)
+#elif defined(Q_OS_WIN) || defined(Q_CYGWIN_WIN)
// Windows clipboard uses \r\n for lineendings, and we use \n
return toqstr(subst(str, from_ascii("\n"), from_ascii("\r\n")));
#else
string const expanded_globs = convert_brace_glob(globs);
// Split into individual globs.
- vector<string> matches;
Tokenizer const tokens(expanded_globs, separator);
globs_ = vector<string>(tokens.begin(), tokens.end());
}
if (type == "child")
return qt_("Child Documents");
if (type == "graphics")
- return qt_("List of Graphics");
+ return qt_("Graphics");
if (type == "equation")
- return qt_("List of Equations");
+ return qt_("Equations");
+ if (type == "external")
+ return qt_("External material");
if (type == "footnote")
- return qt_("List of Footnotes");
+ return qt_("Footnotes");
if (type == "listing")
- return qt_("List of Listings");
+ return qt_("Listings");
if (type == "index")
- return qt_("List of Indexes");
+ return qt_("Index Entries");
if (type == "marginalnote")
- return qt_("List of Marginal notes");
+ return qt_("Marginal notes");
+ if (type == "math-macro")
+ return qt_("Math macros");
+ if (type == "nomencl")
+ return qt_("Nomenclature Entries");
if (type == "note")
- return qt_("List of Notes");
+ return qt_("Notes");
if (type == "citation")
- return qt_("List of Citations");
+ return qt_("Citations");
if (type == "label")
return qt_("Labels and References");
if (type == "branch")
- return qt_("List of Branches");
+ return qt_("Branches");
if (type == "change")
- return qt_("List of Changes");
+ return qt_("Changes");
+ if (type == "senseless")
+ return qt_("Senseless");
+ if (prefixIs(type, "index:")) {
+ string const itype = split(type, ':');
+ IndicesList const & indiceslist = bp.indiceslist();
+ Index const * index = indiceslist.findShortcut(from_utf8(itype));
+ docstring indextype = _("unknown type!");
+ if (index)
+ indextype = index->index();
+ return toqstr(bformat(_("Index Entries (%1$s)"), indextype));
+ }
FloatList const & floats = bp.documentClass().floats();
if (floats.typeExist(type))
projects / lyx.git / blobdiff