Merge lp:~adamreichold/qpdfview/extend-search-dock2 into lp:~srazi/qpdfview/extend-search-dock2

[Adam Reichold]

Fixes a compilation problem using GCC, reduces the amount of boiler plate code in the search delegate and removes this first column in the search model.

[lp:~adamreichold/qpdfview/extend-search-dock2]

1710. By Adam Reichold <email address hidden> on 2014-09-28

Add a missing const and improve method naming.

[Razi Alavizadeh (srazi)]

review: Approve

=== modified file 'sources/mainwindow.cpp'
--- sources/mainwindow.cpp	2014-09-26 08:56:12 +0000
+++ sources/mainwindow.cpp	2014-09-28 13:18:11 +0000
@@ -431,7 +431,7 @@
         m_bookmarksView->setModel(bookmarkModelForCurrentTab());
         m_thumbnailsView->setScene(currentTab()->thumbnailsScene());
 
-        m_searchDelegate->setKeyword(currentTab()->searchModel()->lastPhrase());
+        m_searchDelegate->setPhrase(currentTab()->searchModel()->lastPhrase());
         m_searchView->setModel(currentTab()->searchModel());
 
         on_currentTab_documentChanged();
@@ -1100,7 +1100,7 @@
 
 void MainWindow::on_cancelSearch_triggered()
 {
-    m_searchDelegate->setKeyword(QString());
+    m_searchDelegate->setPhrase(QString());
 
     m_searchLineEdit->stopTimer();
     m_searchLineEdit->setProgress(0);
@@ -1697,7 +1697,7 @@
 {
     if(!text.isEmpty())
     {
-        m_searchDelegate->setKeyword(text);
+        m_searchDelegate->setPhrase(text);
 
         if(allTabs)
         {
@@ -1997,27 +1997,21 @@
 
 void MainWindow::on_searchView_sectionCountChanged()
 {
-    if(m_searchView->horizontalHeader()->count() > 0 && currentTab())
-    {
-        const int textMargin = m_searchView->style()->pixelMetric(QStyle::PM_FocusFrameHMargin) + 1;
-        m_searchView->setColumnWidth(0, 2 * textMargin + m_searchView->fontMetrics().width(QString::number(currentTab()->numberOfPages())));
-    }
-
-    if(m_searchView->horizontalHeader()->count() > 1)
+    if(m_searchView->horizontalHeader()->count() > 0)
     {
 #if QT_VERSION >= QT_VERSION_CHECK(5,0,0)
 
-        m_searchView->horizontalHeader()->setSectionResizeMode(1, QHeaderView::Stretch);
+        m_searchView->horizontalHeader()->setSectionResizeMode(0, QHeaderView::ResizeToContents);
 
 #else
 
-        m_searchView->horizontalHeader()->setResizeMode(1, QHeaderView::Stretch);
+        m_searchView->horizontalHeader()->setResizeMode(0, QHeaderView::ResizeToContents);
 
 #endif // QT_VERSION
     }
 
     m_searchView->horizontalHeader()->setMinimumSectionSize(0);
-    m_searchView->horizontalHeader()->setStretchLastSection(true);
+    m_searchView->horizontalHeader()->setStretchLastSection(false);
     m_searchView->horizontalHeader()->setVisible(false);
 
     if(m_searchView->verticalHeader()->count() > 0)

=== modified file 'sources/miscellaneous.cpp'
--- sources/miscellaneous.cpp	2014-09-25 14:49:35 +0000
+++ sources/miscellaneous.cpp	2014-09-28 13:18:11 +0000
@@ -487,133 +487,92 @@
 }
 
 
-SearchDelegate::SearchDelegate(QWidget* parent) : QStyledItemDelegate(parent)
+SearchDelegate::SearchDelegate(QObject* parent) : QStyledItemDelegate(parent)
 {
 }
 
 void SearchDelegate::paint(QPainter* painter, const QStyleOptionViewItem& option, const QModelIndex& index) const
 {
-    QStyledItemDelegate::paint(painter, option, index);
-
     const QString text = index.data().toString();
 
-    if (text.isEmpty())
+    if(text.isEmpty())
     {
+        QStyledItemDelegate::paint(painter, option, index);
+
         return;
     }
 
     const int textMargin = QApplication::style()->pixelMetric(QStyle::PM_FocusFrameHMargin) + 1;
-    QRect textRect = option.rect.adjusted(textMargin, 0, -textMargin, 0);
-    QString elidedText = option.fontMetrics.elidedText(text, option.textElideMode, textRect.width());
-
-    m_textOption.setWrapMode(QTextOption::NoWrap);
-    m_textOption.setTextDirection(text.isRightToLeft() ? Qt::RightToLeft : Qt::LeftToRight);
-    m_textOption.setAlignment(QStyle::visualAlignment(m_textOption.textDirection(), option.displayAlignment));
-
-    m_textLayout.setTextOption(m_textOption);
-    m_textLayout.setFont(option.font);
-    m_textLayout.setText(elidedText);
-
-    QSizeF textLayoutSize = doTextLayout(textRect.width());
-
-    if (m_textLayout.lineCount() <= 0) {
+    const QRect textRect = option.rect.adjusted(textMargin, 0, -textMargin, 0);
+    const QString elidedText = option.fontMetrics.elidedText(text, option.textElideMode, textRect.width());
+
+    QTextOption textOption;
+    textOption.setWrapMode(QTextOption::NoWrap);
+    textOption.setTextDirection(text.isRightToLeft() ? Qt::RightToLeft : Qt::LeftToRight);
+    textOption.setAlignment(QStyle::visualAlignment(textOption.textDirection(), option.displayAlignment));
+
+    QTextLayout textLayout;
+    textLayout.setTextOption(textOption);
+    textLayout.setText(elidedText);
+    textLayout.setFont(option.font);
+
+    emphasizePhrase(textLayout);
+
+    textLayout.beginLayout();
+
+    QTextLine textLine = textLayout.createLine();
+
+    if(!textLine.isValid())
+    {
         return;
     }
 
-    QTextLine textLine = m_textLayout.lineAt(0);
-
-    const QSize layoutSize(textRect.width(), int(textLayoutSize.height()));
+    textLine.setLineWidth(textRect.width());
+
+    textLayout.endLayout();
+
+    const QSize layoutSize(textRect.width(), qFloor(textLine.height()));
     const QRect layoutRect = QStyle::alignedRect(option.direction, option.displayAlignment, layoutSize, textRect);
-    const QPointF &position = layoutRect.topLeft();
 
     painter->save();
+
+    painter->setClipping(true);
     painter->setClipRect(layoutRect);
-    textLine.draw(painter, position);
+
+    textLine.draw(painter, layoutRect.topLeft());
+
     painter->restore();
 }
 
-void SearchDelegate::initStyleOption(QStyleOptionViewItem* option, const QModelIndex& index) const
-{
-    QStyledItemDelegate::initStyleOption(option, index);
-
-    QStyleOptionViewItemV4* v4 = qstyleoption_cast< QStyleOptionViewItemV4* >(option);
-
-    if (v4)
-    {
-        v4->text.clear();
-    }
-}
-
-// taken and modified from qitemdelegate.cpp
-QSizeF SearchDelegate::doTextLayout(int lineWidth) const
-{
-    updateAdditionalFormats();
-
-    qreal height = 0;
-    qreal widthUsed = 0;
-
-    m_textLayout.beginLayout();
-
-    while (true)
-    {
-        QTextLine line = m_textLayout.createLine();
-
-        if (!line.isValid())
-        {
-            break;
-        }
-
-        line.setLineWidth(lineWidth);
-        line.setPosition(QPointF(0, height));
-        height += line.height();
-        widthUsed = qMax(widthUsed, line.naturalTextWidth());
-    }
-
-    m_textLayout.endLayout();
-
-    return QSizeF(widthUsed, height);
-}
-
-void SearchDelegate::updateAdditionalFormats() const
-{
-    m_additionalFormats.clear();
-    m_textLayout.clearAdditionalFormats();
-
-    QFont layoutFont(m_textLayout.font());
-    layoutFont.setWeight(QFont::Light);
-    m_textLayout.setFont(layoutFont);
-
-    const QString text = m_textLayout.text();
-
-    if (m_keyword.isEmpty())
+void SearchDelegate::emphasizePhrase(QTextLayout& textLayout) const
+{
+    if(m_phrase.isEmpty())
     {
         return;
     }
 
-    int pos = 0;
-
-    while ((pos = text.indexOf(m_keyword, pos, Qt::CaseInsensitive)) != -1)
-    {
-        QTextLayout::FormatRange fr;
-        fr.start = pos;
-        fr.length = m_keyword.length();
-
-        pos += fr.length;
-
-        fr.format.setFontWeight(99);
-
-        m_additionalFormats << fr;
-    }
-
-    if (!m_additionalFormats.isEmpty())
-    {
-        m_textLayout.setAdditionalFormats(m_additionalFormats);
-    }
-}
-
-void SearchDelegate::setKeyword(const QString& text)
-{
-    m_keyword = text;
+    QFont font = textLayout.font();
+    font.setWeight(QFont::Light);
+    textLayout.setFont(font);
+
+    QList< QTextLayout::FormatRange > additionalFormats;
+
+    const QString text = textLayout.text();
+    int position = 0;
+
+    while((position = text.indexOf(m_phrase, position, Qt::CaseInsensitive)) != -1)
+    {
+        QTextLayout::FormatRange formatRange;
+        formatRange.start = position;
+        formatRange.length = m_phrase.length();
+        formatRange.format.setFontWeight(QFont::Bold);
+
+        additionalFormats.append(formatRange);
+
+        position += m_phrase.length();
+    }
+
+    textLayout.setAdditionalFormats(additionalFormats);
 }
 
 } // qpdfview

=== modified file 'sources/miscellaneous.h'
--- sources/miscellaneous.h	2014-09-25 14:49:35 +0000
+++ sources/miscellaneous.h	2014-09-28 13:18:11 +0000
@@ -279,30 +279,24 @@
                     int value = 0, int min = -2147483647, int max = 2147483647,
                     bool* ok = 0, Qt::WindowFlags flags = 0);
 
+// search delegate
 
 class SearchDelegate : public QStyledItemDelegate
 {
     Q_OBJECT
 
 public:
-    SearchDelegate(QWidget* parent = 0);
+    explicit SearchDelegate(QObject* parent = 0);
+
     void paint(QPainter* painter, const QStyleOptionViewItem& option, const QModelIndex& index) const;
 
-protected:
-    void initStyleOption(QStyleOptionViewItem* option, const QModelIndex& index) const;
+    inline QString phrase() const { return m_phrase; }
+    inline void setPhrase(const QString& phrase) { m_phrase = phrase; }
 
 private:
-    QSizeF doTextLayout(int lineWidth) const;
-    void updateAdditionalFormats() const;
-
-    QString m_keyword;
-
-    mutable QTextLayout m_textLayout;
-    mutable QTextOption m_textOption;
-    mutable QList<QTextLayout::FormatRange> m_additionalFormats;
-
-public slots:
-    void setKeyword(const QString& text);
+    QString m_phrase;
+
+    void emphasizePhrase(QTextLayout& textLayout) const;
 
 };
 

=== modified file 'sources/searchmodel.cpp'
--- sources/searchmodel.cpp	2014-09-26 08:56:12 +0000
+++ sources/searchmodel.cpp	2014-09-28 13:18:11 +0000
@@ -34,6 +34,11 @@
 
 }
 
+static uint qHash(const QRect& rect)
+{
+    return qHash(QString("%1%2%3%4").arg(rect.x()).arg(rect.y()).arg(rect.width()).arg(rect.height()));
+}
+
 namespace qpdfview
 {
 
@@ -88,7 +93,7 @@
 
 int SearchModel::columnCount(const QModelIndex&) const
 {
-    return 2;
+    return 1;
 }
 
 int SearchModel::rowCount(const QModelIndex& parent) const
@@ -114,21 +119,14 @@
     case RectRole:
         return result.second;
     case Qt::DisplayRole:
-        return index.column() == 0 ? QString::number(result.first) : lineText(result.first, result.second);
+    case Qt::ToolTipRole:
     case ContainingLineRole:
-    case Qt::ToolTipRole:
         return lineText(result.first, result.second);
-
     case Qt::TextAlignmentRole:
         return int(Qt::AlignLeft | Qt::AlignVCenter);
     }
 }
 
-uint qHash(const QPair< int, QRect >& pair)
-{
-    return qHash(QString("%1%2%3%4%5").arg(pair.first).arg(pair.second.x()).arg(pair.second.y()).arg(pair.second.width()).arg(pair.second.height()));
-}
-
 QString SearchModel::lineText(int page, const QRectF& rect) const
 {
     if (m_document == 0)