Subversion Repositories Scribus

Compare Revisions

Ignore whitespace Rev 24847 → Rev 24848

/trunk/Scribus/scribus/pageitem_textframe.cpp
5756,7 → 5756,7
else if (nF->isAutoNoteFrame() || nF->isEndNotesFrame())
m_notesFramesMap.remove(nF);
}
m_notesFramesMap.unite(notesMap);
m_notesFramesMap.insert(notesMap);
}
if (docWasChanged)
{
/trunk/Scribus/scribus/ui/unicodesearch.cpp
8,6 → 8,7
#include <QDebug>
#include <QFile>
#include <QHeaderView>
#include <QRegularExpression>
#include <QSortFilterProxyModel>
#include "unicodesearch.h"
211,15 → 212,16
QApplication::changeOverrideCursor(QCursor(Qt::WaitCursor));
QString s(searchEdit->text());
if (s.isEmpty())
m_proxyModel->setFilterRegExp(QRegExp("*",
Qt::CaseInsensitive,
QRegExp::Wildcard));
{
QString wildcardExp = QRegularExpression::wildcardToRegularExpression(QString("*"));
QRegularExpression regExp(wildcardExp, QRegularExpression::CaseInsensitiveOption);
m_proxyModel->setFilterRegularExpression(regExp);
}
else
{
QRegExp regExp(QString("*%1*").arg(s),
Qt::CaseInsensitive,
QRegExp::Wildcard);
m_proxyModel->setFilterRegExp(regExp);
QString wildcardExp = QRegularExpression::wildcardToRegularExpression(QString("*%1*").arg(s));
QRegularExpression regExp(wildcardExp, QRegularExpression::CaseInsensitiveOption);
m_proxyModel->setFilterRegularExpression(regExp);
}
tableView->setFocus(Qt::OtherFocusReason);
tableView->selectRow(0);