#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 <QApplication>
#include <QCheckBox>
#include <QComboBox>
#include <QLineEdit>
#include <QLocale>
#include <QPalette>
#include <QSet>
+#include <QTextLayout>
+#include <QTextDocument>
+#include <QToolTip>
#include <algorithm>
#include <fstream>
// for FileFilter.
// FIXME: Remove
#include "support/regex.h"
-#include <boost/tokenizer.hpp>
using namespace std;
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, search_mode mode)
+{
+ string tmp = fromqstr(dir);
+ 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 {
string widgetsToLength(QLineEdit const * input, LengthCombo const * combo)
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) {
}
}
+
+void focusAndHighlight(QAbstractItemView * w)
+{
+ w->setFocus();
+ w->setCurrentIndex(w->currentIndex());
+ w->scrollTo(w->currentIndex());
+}
+
+
+void setMessageColour(list<QWidget *> highlighted, list<QWidget *> plain)
+{
+ QPalette pal = QApplication::palette();
+ QPalette newpal(pal.color(QPalette::Active, QPalette::HighlightedText),
+ pal.color(QPalette::Active, QPalette::Highlight));
+ for (QWidget * w : highlighted)
+ w->setPalette(newpal);
+ for (QWidget * w : plain)
+ w->setPalette(pal);
+}
+
+
+/// 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
static string const convert_brace_glob(string const & glob)
{
// Matches " *.{abc,def,ghi}", storing "*." as group 1 and
- // "abc,def,ghi" as group 2.
- static lyx::regex const glob_re(" *([^ {]*)\\{([^ }]+)\\}");
- // Matches "abc" and "abc,", storing "abc" as group 1.
- static lyx::regex const block_re("([^,}]+),?");
+ // "abc,def,ghi" as group 2, while allowing spaces in group 2.
+ static lyx::regex const glob_re(" *([^ {]*)\\{([^}]+)\\}");
+ // Matches "abc" and "abc,", storing "abc" as group 1,
+ // while ignoring surrounding spaces.
+ static lyx::regex const block_re(" *([^ ,}]+) *,? *");
string pattern;
Filter::Filter(docstring const & description, string const & globs)
: desc_(description)
{
- typedef boost::tokenizer<boost::char_separator<char> > Tokenizer;
- boost::char_separator<char> const separator(" ");
-
// Given "<glob> <glob> ... *.{abc,def} <glob>", expand to
// "<glob> <glob> ... *.abc *.def <glob>"
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());
+ globs_ = getVectorFromString(expanded_globs, " ");
}
{
QString s;
- bool const has_description = desc_.empty();
+ bool const has_description = !desc_.empty();
if (has_description) {
s += toqstr(desc_);
s += " (";
}
- for (size_t i = 0; i != globs_.size(); ++i) {
- if (i > 0)
- s += ' ';
- s += toqstr(globs_[i]);
- }
+ s += toqstr(getStringFromVector(globs_, " "));
if (has_description)
s += ')';
// Everything from the start of the input to
// the start of the match.
- parse_filter(string(what[-1].first, what[-1].second));
+ parse_filter(string(it, what[0].first));
// Increment the iterator to the end of the match.
it += distance(it, what[0].second);
void FileFilterList::parse_filter(string const & filter)
{
- // Matches "TeX documents (*.tex)",
- // storing "TeX documents " as group 1 and "*.tex" as group 2.
- static lyx::regex const filter_re("([^(]*)\\(([^)]+)\\) *$");
+ // Matches "TeX documents (plain) (*.tex)",
+ // storing "TeX documents (plain) " as group 1 and "*.tex" as group 2.
+ static lyx::regex const filter_re("(.*)\\(([^()]+)\\) *$");
match_results<string::const_iterator> what;
if (!lyx::regex_search(filter, what, filter_re)) {
}
-QString guiName(string const & type, BufferParams const & bp)
-{
- if (type == "tableofcontents")
- return qt_("Table of Contents");
- if (type == "child")
- return qt_("Child Documents");
- if (type == "graphics")
- return qt_("List of Graphics");
- if (type == "equation")
- return qt_("List of Equations");
- if (type == "footnote")
- return qt_("List of Footnotes");
- if (type == "listing")
- return qt_("List of Listings");
- if (type == "index")
- return qt_("List of Indexes");
- if (type == "marginalnote")
- return qt_("List of Marginal notes");
- if (type == "note")
- return qt_("List of Notes");
- if (type == "citation")
- return qt_("List of Citations");
- if (type == "label")
- return qt_("Labels and References");
- if (type == "branch")
- return qt_("List of Branches");
- if (type == "change")
- return qt_("List of Changes");
-
- FloatList const & floats = bp.documentClass().floats();
- if (floats.typeExist(type))
- return qt_(floats.getType(type).listName());
-
- return qt_(type);
+QString formatToolTip(QString text, int em)
+{
+ // 1. QTooltip activates word wrapping only if mightBeRichText()
+ // is true. So we convert the text to rich text.
+ //
+ // 2. The default width is way too small. Setting the width is tricky; first
+ // one has to compute the ideal width, and then force it with special
+ // html markup.
+
+ // do nothing if empty or already formatted
+ if (text.isEmpty() || text.startsWith(QString("<html>")))
+ return text;
+ // Convert to rich text if it is not already
+ if (!Qt::mightBeRichText(text))
+ text = Qt::convertFromPlainText(text, Qt::WhiteSpaceNormal);
+ // Compute desired width in pixels
+ QFont const font = QToolTip::font();
+ int const px_width = em * QFontMetrics(font).width("M");
+ // Determine the ideal width of the tooltip
+ QTextDocument td("");
+ td.setHtml(text);
+ td.setDefaultFont(QToolTip::font());
+ td.setTextWidth(px_width);
+ double best_width = td.idealWidth();
+ // Set the line wrapping with appropriate width
+ return QString("<html><body><table><tr>"
+ "<td align=justify width=%1>%2</td>"
+ "</tr></table></body></html>")
+ .arg(QString::number(int(best_width) + 1), text);
+}
+
+
+QString qtHtmlToPlainText(QString const & html)
+{
+ if (!Qt::mightBeRichText(html))
+ return html;
+ QTextDocument td;
+ td.setHtml(html);
+ return td.toPlainText();
}
projects / lyx.git / blobdiff