Merge lp:~adamreichold/qpdfview/add-split-view into lp:qpdfview

[Adam Reichold]

Adds basic support for split views, i.e. tabs that actually contain several tabs managed by QSplitter. This is done by adding context menu actions to split an existing tab and some refactoring that allows the main window to handle the fact that there might be more than a one tab behind a single tab widget index. The currently active tab in such a split view is tracked using the keyboard focus so that there should also always be one current tab both w.r.t. to the tab widget as well as the split views within.

[lp:~adamreichold/qpdfview/add-split-view]

2050. By Adam Reichold on 2017-04-16

Instead of disconnecting and reconnecting slots to avoid redundant updates, block the signle relevant slot using a simple flag variable and an RAII helper.

2051. By Adam Reichold on 2017-04-17

Add an action to close only the current view and make sure to wire up a newly added tab's signals.

2052. By Adam Reichold on 2017-04-18

Tighten up the tab interaction in a few more places.

2053. By Adam Reichold on 2017-04-19

Fix usage of QList in the bookmark and search models and various small performance issues reported by the clazy tool using the checks of "level0,level1,level2,no-missing-qobject-macro,no-qstring-allocations,no-copyable-polymorphic,no-ctor-missing-parent-argument,no-reserve-candidates".

=== modified file 'sources/bookmarkmodel.cpp'
--- sources/bookmarkmodel.cpp	2015-01-10 23:45:56 +0000
+++ sources/bookmarkmodel.cpp	2017-04-19 21:02:47 +0000
@@ -70,10 +70,10 @@
 
 void BookmarkModel::addBookmark(const BookmarkItem& bookmark)
 {
-    QList< BookmarkItem >::iterator at = qBinaryFind(m_bookmarks.begin(), m_bookmarks.end(), bookmark.page);
-    int row = at - m_bookmarks.begin();
+    const QVector< BookmarkItem >::iterator at = qLowerBound(m_bookmarks.begin(), m_bookmarks.end(), bookmark.page);
+    const int row = at - m_bookmarks.begin();
 
-    if(at != m_bookmarks.end())
+    if(at != m_bookmarks.end() && at->page == bookmark.page)
     {
         *at = bookmark;
 
@@ -81,9 +81,6 @@
     }
     else
     {
-        at = qUpperBound(m_bookmarks.begin(), m_bookmarks.end(), bookmark.page);
-        row = at - m_bookmarks.begin();
-
         beginInsertRows(QModelIndex(), row, row);
 
         m_bookmarks.insert(at, bookmark);
@@ -94,7 +91,7 @@
 
 void BookmarkModel::removeBookmark(const BookmarkItem& bookmark)
 {
-    const QList< BookmarkItem >::iterator at = qBinaryFind(m_bookmarks.begin(), m_bookmarks.end(), bookmark.page);
+    const QVector< BookmarkItem >::iterator at = qBinaryFind(m_bookmarks.begin(), m_bookmarks.end(), bookmark.page);
     const int row = at - m_bookmarks.begin();
 
     if(at != m_bookmarks.end())
@@ -109,7 +106,7 @@
 
 void BookmarkModel::findBookmark(BookmarkItem& bookmark) const
 {
-    const QList< BookmarkItem >::const_iterator at = qBinaryFind(m_bookmarks.constBegin(), m_bookmarks.constEnd(), bookmark.page);
+    const QVector< BookmarkItem >::const_iterator at = qBinaryFind(m_bookmarks.constBegin(), m_bookmarks.constEnd(), bookmark.page);
 
     if(at != m_bookmarks.constEnd())
     {

=== modified file 'sources/bookmarkmodel.h'
--- sources/bookmarkmodel.h	2015-02-08 17:20:20 +0000
+++ sources/bookmarkmodel.h	2017-04-19 21:02:47 +0000
@@ -38,7 +38,7 @@
     QString comment;
     QDateTime modified;
 
-    BookmarkItem(int page, const QString& label = QString(), const QString& comment = QString(), const QDateTime& modified = QDateTime::currentDateTime()) :
+    BookmarkItem(int page = -1, const QString& label = QString(), const QString& comment = QString(), const QDateTime& modified = QDateTime::currentDateTime()) :
         page(page),
         label(label),
         comment(comment),
@@ -46,6 +46,13 @@
 
 };
 
+} // namespace qpdfview
+
+Q_DECLARE_TYPEINFO(qpdfview::BookmarkItem, Q_MOVABLE_TYPE);
+
+namespace qpdfview
+{
+
 class BookmarkModel : public QAbstractListModel
 {
     Q_OBJECT
@@ -88,7 +95,7 @@
     static QHash< QString, BookmarkModel* > s_instances;
     BookmarkModel(QObject* parent = 0);
 
-    QList< BookmarkItem > m_bookmarks;
+    QVector< BookmarkItem > m_bookmarks;
 
 };
 

=== modified file 'sources/database.cpp'
--- sources/database.cpp	2016-05-04 13:47:11 +0000
+++ sources/database.cpp	2017-04-19 21:02:47 +0000
@@ -1,7 +1,7 @@
 /*
 
 Copyright 2014 S. Razi Alavizadeh
-Copyright 2012-2015 Adam Reichold
+Copyright 2012-2017 Adam Reichold
 Copyright 2012 Michał Trybus
 
 This file is part of qpdfview.
@@ -392,7 +392,7 @@
 #endif // WITH_SQL
 }
 
-void Database::saveTabs(const QList< DocumentView* >& tabs)
+void Database::saveTabs(const QVector< DocumentView* >& tabs)
 {
 #ifdef WITH_SQL
 

=== modified file 'sources/database.h'
--- sources/database.h	2016-05-04 13:47:11 +0000
+++ sources/database.h	2017-04-19 21:02:47 +0000
@@ -1,7 +1,7 @@
 /*
 
 Copyright 2014 S. Razi Alavizadeh
-Copyright 2013-2015 Adam Reichold
+Copyright 2013-2017 Adam Reichold
 
 This file is part of qpdfview.
 
@@ -56,7 +56,7 @@
     };
 
     void restoreTabs(const RestoreTab& restoreTab);
-    void saveTabs(const QList< DocumentView* >& tabs);
+    void saveTabs(const QVector< DocumentView* >& tabs);
     void clearTabs();
 
     void restoreBookmarks();

=== modified file 'sources/djvumodel.cpp'
--- sources/djvumodel.cpp	2017-04-02 09:36:22 +0000
+++ sources/djvumodel.cpp	2017-04-19 21:02:47 +0000
@@ -118,7 +118,7 @@
     }
 }
 
-QPainterPath loadLinkBoundary(const QString& type, miniexp_t boundaryExp, const QSizeF& size)
+QPainterPath loadLinkBoundary(const QString& type, miniexp_t boundaryExp, QSizeF size)
 {
     QPainterPath boundary;
 
@@ -215,7 +215,7 @@
     }
 }
 
-QList< Link* > loadLinks(miniexp_t linkExp, const QSizeF& size, int index, const QHash< QString, int >& pageByName)
+QList< Link* > loadLinks(miniexp_t linkExp, QSizeF size, int index, const QHash< QString, int >& pageByName)
 {
     QList< Link* > links;
 
@@ -257,7 +257,7 @@
     return links;
 }
 
-QString loadText(miniexp_t textExp, const QSizeF& size, const QRectF& rect)
+QString loadText(miniexp_t textExp, QSizeF size, const QRectF& rect)
 {
     if(miniexp_length(textExp) < 6 && !miniexp_symbolp(miniexp_car(textExp)))
     {
@@ -297,7 +297,7 @@
     return QString();
 }
 
-QList< QRectF > findText(miniexp_t pageTextExp, const QSizeF& size, const QTransform& transform, const QStringList& words, bool matchCase, bool wholeWords)
+QList< QRectF > findText(miniexp_t pageTextExp, QSizeF size, const QTransform& transform, const QStringList& words, bool matchCase, bool wholeWords)
 {
     if(words.isEmpty())
     {
@@ -514,7 +514,7 @@
     return 72.0 / m_resolution * m_size;
 }
 
-QImage DjVuPage::render(qreal horizontalResolution, qreal verticalResolution, Rotation rotation, const QRect& boundingRect) const
+QImage DjVuPage::render(qreal horizontalResolution, qreal verticalResolution, Rotation rotation, QRect boundingRect) const
 {
     LOCK_PAGE
 

=== modified file 'sources/djvumodel.h'
--- sources/djvumodel.h	2017-04-02 09:36:22 +0000
+++ sources/djvumodel.h	2017-04-19 21:02:47 +0000
@@ -51,7 +51,7 @@
 
         QSizeF size() const;
 
-        QImage render(qreal horizontalResolution, qreal verticalResolution, Rotation rotation, const QRect& boundingRect) const;
+        QImage render(qreal horizontalResolution, qreal verticalResolution, Rotation rotation, QRect boundingRect) const;
 
         QString label() const;
 

=== modified file 'sources/documentview.cpp'
--- sources/documentview.cpp	2017-04-02 09:36:22 +0000
+++ sources/documentview.cpp	2017-04-19 21:02:47 +0000
@@ -240,7 +240,7 @@
 
 #ifdef WITH_SYNCTEX
 
-DocumentView::SourceLink scanForSourceLink(const QString& filePath, const int page, const QPointF& pos)
+DocumentView::SourceLink scanForSourceLink(const QString& filePath, const int page, QPointF pos)
 {
     DocumentView::SourceLink sourceLink;
 
@@ -265,7 +265,7 @@
 
 #endif // WITH_SYNCTEX
 
-inline bool modifiersAreActive(const QWheelEvent* event, const Qt::KeyboardModifiers& modifiers)
+inline bool modifiersAreActive(const QWheelEvent* event, Qt::KeyboardModifiers modifiers)
 {
     if(modifiers == Qt::NoModifier)
     {
@@ -658,6 +658,27 @@
 namespace qpdfview
 {
 
+class DocumentView::VerticalScrollBarChangedBlocker
+{
+    Q_DISABLE_COPY(VerticalScrollBarChangedBlocker)
+
+private:
+    DocumentView* const that;
+
+public:
+
+    VerticalScrollBarChangedBlocker(DocumentView* that) : that(that)
+    {
+        that->m_verticalScrollBarChangedBlocked = true;
+    }
+
+    ~VerticalScrollBarChangedBlocker()
+    {
+        that->m_verticalScrollBarChangedBlocked = false;
+    }
+
+};
+
 Settings* DocumentView::s_settings = 0;
 ShortcutHandler* DocumentView::s_shortcutHandler = 0;
 SearchModel* DocumentView::s_searchModel = 0;
@@ -690,6 +711,7 @@
     m_thumbnailsScene(0),
     m_outlineModel(0),
     m_propertiesModel(0),
+    m_verticalScrollBarChangedBlocked(false),
     m_currentResult(),
     m_searchTask(0)
 {
@@ -710,10 +732,11 @@
 
     setScene(new QGraphicsScene(this));
 
+    setFocusPolicy(Qt::StrongFocus);
     setAcceptDrops(false);
     setDragMode(QGraphicsView::ScrollHandDrag);
 
-    reconnectVerticalScrollBar();
+    connect(verticalScrollBar(), SIGNAL(valueChanged(int)), this, SLOT(on_verticalScrollBar_valueChanged()));
 
     m_thumbnailsScene = new QGraphicsScene(this);
 
@@ -1215,7 +1238,7 @@
     }
 }
 
-void DocumentView::setThumbnailsViewportSize(const QSize& thumbnailsViewportSize)
+void DocumentView::setThumbnailsViewportSize(QSize thumbnailsViewportSize)
 {
     if(m_thumbnailsViewportSize != thumbnailsViewportSize)
     {
@@ -1307,7 +1330,7 @@
     return url;
 }
 
-DocumentView::SourceLink DocumentView::sourceLink(const QPoint& pos)
+DocumentView::SourceLink DocumentView::sourceLink(QPoint pos)
 {
     SourceLink sourceLink;
 
@@ -1795,7 +1818,7 @@
 
 void DocumentView::on_verticalScrollBar_valueChanged()
 {
-    if(!m_continuousMode)
+    if(m_verticalScrollBarChangedBlocked || !m_continuousMode)
     {
         return;
     }
@@ -1989,7 +2012,7 @@
     jumpToPage(page, false, rect.left(), rect.top());
 }
 
-void DocumentView::on_pages_openInSourceEditor(int page, const QPointF& pos)
+void DocumentView::on_pages_openInSourceEditor(int page, QPointF pos)
 {
 #ifdef WITH_SYNCTEX
 
@@ -2630,16 +2653,6 @@
     }
 }
 
-void DocumentView::disconnectVerticalScrollBar()
-{
-    disconnect(verticalScrollBar(), SIGNAL(valueChanged(int)), this, SLOT(on_verticalScrollBar_valueChanged()));
-}
-
-void DocumentView::reconnectVerticalScrollBar()
-{
-    connect(verticalScrollBar(), SIGNAL(valueChanged(int)), this, SLOT(on_verticalScrollBar_valueChanged()));
-}
-
 void DocumentView::prepareDocument(Model::Document* document, const QVector< Model::Page* >& pages)
 {
     m_prefetchTimer->blockSignals(true);
@@ -3006,9 +3019,11 @@
 
     m_highlight->setVisible(true);
 
-    disconnectVerticalScrollBar();
-    centerOn(m_highlight);
-    reconnectVerticalScrollBar();
+    {
+        VerticalScrollBarChangedBlocker verticalScrollBarChangedBlocker(this);
+
+        centerOn(m_highlight);
+    }
 
     viewport()->update();
 }

=== modified file 'sources/documentview.h'
--- sources/documentview.h	2016-03-25 17:45:56 +0000
+++ sources/documentview.h	2017-04-19 21:02:47 +0000
@@ -127,7 +127,7 @@
     void setRubberBandMode(RubberBandMode rubberBandMode);
 
     QSize thumbnailsViewportSize() const { return m_thumbnailsViewportSize; }
-    void setThumbnailsViewportSize(const QSize& thumbnailsViewportSize);
+    void setThumbnailsViewportSize(QSize thumbnailsViewportSize);
 
     Qt::Orientation thumbnailsOrientation() const { return m_thumbnailsOrientation; }
     void setThumbnailsOrientation(Qt::Orientation thumbnailsOrientation);
@@ -162,7 +162,7 @@
 
     };
 
-    SourceLink sourceLink(const QPoint& pos);
+    SourceLink sourceLink(QPoint pos);
     void openInSourceEditor(const SourceLink& sourceLink);
 
 signals:
@@ -260,7 +260,7 @@
     void on_pages_rubberBandFinished();
 
     void on_pages_zoomToSelection(int page, const QRectF& rect);
-    void on_pages_openInSourceEditor(int page, const QPointF& pos);
+    void on_pages_openInSourceEditor(int page, QPointF pos);
 
     void on_pages_wasModified();
 
@@ -347,8 +347,10 @@
     void loadDocumentDefaults();
 
     void adjustScrollBarPolicy();
-    void disconnectVerticalScrollBar();
-    void reconnectVerticalScrollBar();
+
+    bool m_verticalScrollBarChangedBlocked;
+
+    class VerticalScrollBarChangedBlocker;
 
     void prepareDocument(Model::Document* document, const QVector< Model::Page* >& pages);
     void preparePages();

=== modified file 'sources/fitzmodel.cpp'
--- sources/fitzmodel.cpp	2017-04-02 09:36:22 +0000
+++ sources/fitzmodel.cpp	2017-04-19 21:02:47 +0000
@@ -98,7 +98,7 @@
     return QSizeF(rect.x1 - rect.x0, rect.y1 - rect.y0);
 }
 
-QImage FitzPage::render(qreal horizontalResolution, qreal verticalResolution, Rotation rotation, const QRect& boundingRect) const
+QImage FitzPage::render(qreal horizontalResolution, qreal verticalResolution, Rotation rotation, QRect boundingRect) const
 {
     QMutexLocker mutexLocker(&m_parent->m_mutex);
 

=== modified file 'sources/fitzmodel.h'
--- sources/fitzmodel.h	2017-04-02 09:36:22 +0000
+++ sources/fitzmodel.h	2017-04-19 21:02:47 +0000
@@ -52,7 +52,7 @@
 
         QSizeF size() const;
 
-        QImage render(qreal horizontalResolution, qreal verticalResolution, Rotation rotation, const QRect& boundingRect) const;
+        QImage render(qreal horizontalResolution, qreal verticalResolution, Rotation rotation, QRect boundingRect) const;
 
         QList< Link* > links() const;
 

=== modified file 'sources/formfieldwidgets.cpp'
--- sources/formfieldwidgets.cpp	2014-10-18 14:25:30 +0000
+++ sources/formfieldwidgets.cpp	2017-04-19 21:02:47 +0000
@@ -128,7 +128,7 @@
 
     if(!m_formField->currentChoices().isEmpty())
     {
-        setCurrentIndex(m_formField->currentChoices().first());
+        setCurrentIndex(m_formField->currentChoices().constFirst());
     }
 
     connect(this, SIGNAL(currentIndexChanged(int)), SLOT(on_currentIndexChanged(int)));

=== modified file 'sources/imagemodel.cpp'
--- sources/imagemodel.cpp	2017-04-02 09:36:22 +0000
+++ sources/imagemodel.cpp	2017-04-19 21:02:47 +0000
@@ -48,7 +48,7 @@
 namespace Model
 {
 
-ImagePage::ImagePage(QImage image) :
+ImagePage::ImagePage(const QImage& image) :
     m_image(image)
 {
 }
@@ -59,7 +59,7 @@
                   m_image.height() * 72.0 / dotsPerInchY(m_image));
 }
 
-QImage ImagePage::render(qreal horizontalResolution, qreal verticalResolution, Rotation rotation, const QRect& boundingRect) const
+QImage ImagePage::render(qreal horizontalResolution, qreal verticalResolution, Rotation rotation, QRect boundingRect) const
 {
     QTransform transform;
 
@@ -92,7 +92,7 @@
     return image;
 }
 
-ImageDocument::ImageDocument(QImage image) :
+ImageDocument::ImageDocument(const QImage& image) :
     m_image(image)
 {
 }

=== modified file 'sources/imagemodel.h'
--- sources/imagemodel.h	2017-04-02 09:36:22 +0000
+++ sources/imagemodel.h	2017-04-19 21:02:47 +0000
@@ -40,12 +40,12 @@
     public:
         QSizeF size() const;
 
-        QImage render(qreal horizontalResolution, qreal verticalResolution, Rotation rotation, const QRect& boundingRect) const;
+        QImage render(qreal horizontalResolution, qreal verticalResolution, Rotation rotation, QRect boundingRect) const;
 
     private:
         Q_DISABLE_COPY(ImagePage)
 
-        ImagePage(QImage image);
+        ImagePage(const QImage& image);
 
         QImage m_image;
 
@@ -72,7 +72,7 @@
     private:
         Q_DISABLE_COPY(ImageDocument)
 
-        ImageDocument(QImage image);
+        ImageDocument(const QImage& image);
 
         QImage m_image;
 

=== modified file 'sources/mainwindow.cpp'
--- sources/mainwindow.cpp	2017-01-26 15:18:35 +0000
+++ sources/mainwindow.cpp	2017-04-19 21:02:47 +0000
@@ -1,8 +1,7 @@
-
 /*
 
 Copyright 2014-2015 S. Razi Alavizadeh
-Copyright 2012-2016 Adam Reichold
+Copyright 2012-2017 Adam Reichold
 Copyright 2014 Dorian Scholz
 Copyright 2012 Michał Trybus
 Copyright 2012 Alexander Volkov
@@ -216,12 +215,69 @@
 
 };
 
+DocumentView* findCurrentTab(QObject* const object)
+{
+    if(DocumentView* const tab = qobject_cast< DocumentView* >(object))
+    {
+        return tab;
+    }
+
+    if(Splitter* const splitter = qobject_cast< Splitter* >(object))
+    {
+        return findCurrentTab(splitter->currentWidget());
+    }
+
+    return 0;
+}
+
+QVector< DocumentView* > findAllTabs(QObject* const object)
+{
+    QVector< DocumentView* > tabs;
+
+    if(DocumentView* const tab = qobject_cast< DocumentView* >(object))
+    {
+        tabs.append(tab);
+    }
+
+    if(Splitter* const splitter = qobject_cast< Splitter* >(object))
+    {
+        for(int index = 0, count = splitter->count(); index < count; ++index)
+        {
+            tabs.append(findAllTabs(splitter->widget(index)));
+        }
+    }
+
+    return tabs;
+}
+
 } // anonymous
 
+class MainWindow::CurrentTabChangeBlocker
+{
+    Q_DISABLE_COPY(CurrentTabChangeBlocker)
+
+private:
+    MainWindow* const that;
+
+public:
+    CurrentTabChangeBlocker(MainWindow* const that) : that(that)
+    {
+        that->m_currentTabChangedBlocked = true;
+    }
+
+    ~CurrentTabChangeBlocker()
+    {
+        that->m_currentTabChangedBlocked = false;
+
+        that->on_tabWidget_currentChanged(that->m_tabWidget->currentIndex());
+    }
+
+};
+
 class MainWindow::RestoreTab : public Database::RestoreTab
 {
 private:
-    MainWindow* that;
+    MainWindow* const that;
 
 public:
     RestoreTab(MainWindow* that) : that(that) {}
@@ -243,7 +299,7 @@
 class MainWindow::TextValueMapper : public MappingSpinBox::TextValueMapper
 {
 private:
-    MainWindow* that;
+    MainWindow* const that;
 
 public:
     TextValueMapper(MainWindow* that) : that(that) {}
@@ -382,27 +438,30 @@
 
 bool MainWindow::open(const QString& filePath, int page, const QRectF& highlight, bool quiet)
 {
-    if(m_tabWidget->currentIndex() != -1)
+    if(DocumentView* const tab = currentTab())
     {
-        saveModifications(currentTab());
-
-        if(currentTab()->open(filePath))
-        {
-            s_settings->mainWindow().setOpenPath(currentTab()->fileInfo().absolutePath());
-            m_recentlyUsedMenu->addOpenAction(currentTab()->fileInfo());
-
-            m_tabWidget->setTabText(m_tabWidget->currentIndex(), currentTab()->title());
-            m_tabWidget->setTabToolTip(m_tabWidget->currentIndex(), currentTab()->fileInfo().absoluteFilePath());
-
-            s_database->restorePerFileSettings(currentTab());
+        if(!saveModifications(tab))
+        {
+            return false;
+        }
+
+        if(tab->open(filePath))
+        {
+            s_settings->mainWindow().setOpenPath(tab->fileInfo().absolutePath());
+            m_recentlyUsedMenu->addOpenAction(tab->fileInfo());
+
+            m_tabWidget->setCurrentTabText(tab->title());
+            m_tabWidget->setCurrentTabToolTip(tab->fileInfo().absoluteFilePath());
+
+            s_database->restorePerFileSettings(tab);
             scheduleSaveTabs();
 
-            currentTab()->jumpToPage(page, false);
-            currentTab()->setFocus();
+            tab->jumpToPage(page, false);
+            tab->setFocus();
 
             if(!highlight.isNull())
             {
-                currentTab()->temporaryHighlight(page, highlight);
+                tab->temporaryHighlight(page, highlight);
             }
 
             return true;
@@ -421,58 +480,16 @@
 
 bool MainWindow::openInNewTab(const QString& filePath, int page, const QRectF& highlight, bool quiet)
 {
-    DocumentView* newTab = new DocumentView(this);
+    DocumentView* const newTab = new DocumentView(this);
 
     if(newTab->open(filePath))
     {
         s_settings->mainWindow().setOpenPath(newTab->fileInfo().absolutePath());
         m_recentlyUsedMenu->addOpenAction(newTab->fileInfo());
 
-        const int index = addTab(newTab);
-
-        QAction* tabAction = new QAction(m_tabWidget->tabText(index), newTab);
-        tabAction->setToolTip(newTab->fileInfo().absoluteFilePath());
-        connect(tabAction, SIGNAL(triggered()), SLOT(on_tabAction_triggered()));
-
-        tabAction->setData(true); // Flag action for search-as-you-type
-
-        m_tabsMenu->addAction(tabAction);
-
-        on_thumbnails_dockLocationChanged(dockWidgetArea(m_thumbnailsDock));
-
-        connect(newTab, SIGNAL(documentChanged()), SLOT(on_currentTab_documentChanged()));
-        connect(newTab, SIGNAL(documentModified()), SLOT(on_currentTab_documentModified()));
-
-        connect(newTab, SIGNAL(numberOfPagesChanged(int)), SLOT(on_currentTab_numberOfPagesChaned(int)));
-        connect(newTab, SIGNAL(currentPageChanged(int)), SLOT(on_currentTab_currentPageChanged(int)));
-
-        connect(newTab, SIGNAL(canJumpChanged(bool,bool)), SLOT(on_currentTab_canJumpChanged(bool,bool)));
-
-        connect(newTab, SIGNAL(continuousModeChanged(bool)), SLOT(on_currentTab_continuousModeChanged(bool)));
-        connect(newTab, SIGNAL(layoutModeChanged(LayoutMode)), SLOT(on_currentTab_layoutModeChanged(LayoutMode)));
-        connect(newTab, SIGNAL(rightToLeftModeChanged(bool)), SLOT(on_currentTab_rightToLeftModeChanged(bool)));
-        connect(newTab, SIGNAL(scaleModeChanged(ScaleMode)), SLOT(on_currentTab_scaleModeChanged(ScaleMode)));
-        connect(newTab, SIGNAL(scaleFactorChanged(qreal)), SLOT(on_currentTab_scaleFactorChanged(qreal)));
-        connect(newTab, SIGNAL(rotationChanged(Rotation)), SLOT(on_currentTab_rotationChanged(Rotation)));
-
-        connect(newTab, SIGNAL(linkClicked(int)), SLOT(on_currentTab_linkClicked(int)));
-        connect(newTab, SIGNAL(linkClicked(bool,QString,int)), SLOT(on_currentTab_linkClicked(bool,QString,int)));
-
-        connect(newTab, SIGNAL(renderFlagsChanged(qpdfview::RenderFlags)), SLOT(on_currentTab_renderFlagsChanged(qpdfview::RenderFlags)));
-
-        connect(newTab, SIGNAL(invertColorsChanged(bool)), SLOT(on_currentTab_invertColorsChanged(bool)));
-        connect(newTab, SIGNAL(convertToGrayscaleChanged(bool)), SLOT(on_currentTab_convertToGrayscaleChanged(bool)));
-        connect(newTab, SIGNAL(trimMarginsChanged(bool)), SLOT(on_currentTab_trimMarginsChanged(bool)));
-
-        connect(newTab, SIGNAL(compositionModeChanged(CompositionMode)), SLOT(on_currentTab_compositionModeChanged(CompositionMode)));
-
-        connect(newTab, SIGNAL(highlightAllChanged(bool)), SLOT(on_currentTab_highlightAllChanged(bool)));
-        connect(newTab, SIGNAL(rubberBandModeChanged(RubberBandMode)), SLOT(on_currentTab_rubberBandModeChanged(RubberBandMode)));
-
-        connect(newTab, SIGNAL(searchFinished()), SLOT(on_currentTab_searchFinished()));
-        connect(newTab, SIGNAL(searchProgressChanged(int)), SLOT(on_currentTab_searchProgressChanged(int)));
-
-        connect(newTab, SIGNAL(customContextMenuRequested(QPoint)), SLOT(on_currentTab_customContextMenuRequested(QPoint)));
+        addTab(newTab);
+        addTabAction(newTab);
+        connectTab(newTab);
 
         newTab->show();
 
@@ -508,27 +525,30 @@
 
     for(int index = 0, count = m_tabWidget->count(); index < count; ++index)
     {
-        if(tab(index)->fileInfo() == fileInfo)
+        foreach(DocumentView* tab, allTabs(index))
         {
-            m_tabWidget->setCurrentIndex(index);
-
-            if(refreshBeforeJump)
-            {
-                if(!currentTab()->refresh())
-                {
-                    return false;
-                }
-            }
-
-            currentTab()->jumpToPage(page);
-            currentTab()->setFocus();
-
-            if(!highlight.isNull())
-            {
-                currentTab()->temporaryHighlight(page, highlight);
-            }
-
-            return true;
+            if(tab->fileInfo() == fileInfo)
+            {
+                m_tabWidget->setCurrentIndex(index);
+
+                if(refreshBeforeJump)
+                {
+                    if(!tab->refresh())
+                    {
+                        return false;
+                    }
+                }
+
+                tab->jumpToPage(page);
+                tab->setFocus();
+
+                if(!highlight.isNull())
+                {
+                    tab->temporaryHighlight(page, highlight);
+                }
+
+                return true;
+            }
         }
     }
 
@@ -537,14 +557,14 @@
 
 void MainWindow::startSearch(const QString& text)
 {
-    if(m_tabWidget->currentIndex() != -1)
+    if(DocumentView* const tab = currentTab())
     {
         m_searchDock->setVisible(true);
 
         m_searchLineEdit->setText(text);
         m_searchLineEdit->startSearch();
 
-        currentTab()->setFocus();
+        tab->setFocus();
     }
 }
 
@@ -555,11 +575,13 @@
 
 void MainWindow::on_tabWidget_currentChanged(int index)
 {
+    if(m_currentTabChangedBlocked)
+    {
+        return;
+    }
+
     const bool hasCurrent = index != -1;
 
-    m_openCopyInNewTabAction->setEnabled(hasCurrent);
-    m_openContainingFolderAction->setEnabled(hasCurrent);
-    m_moveToInstanceAction->setEnabled(hasCurrent);
     m_refreshAction->setEnabled(hasCurrent);
     m_printAction->setEnabled(hasCurrent);
 
@@ -622,6 +644,13 @@
     m_wholeWordsCheckBox->setEnabled(hasCurrent);
     m_highlightAllCheckBox->setEnabled(hasCurrent);
 
+    m_openCopyInNewTabAction->setEnabled(hasCurrent);
+    m_openContainingFolderAction->setEnabled(hasCurrent);
+    m_moveToInstanceAction->setEnabled(hasCurrent);
+    m_splitViewHorizontallyAction->setEnabled(hasCurrent);
+    m_splitViewVerticallyAction->setEnabled(hasCurrent);
+    m_closeCurrentViewAction->setEnabled(hasCurrent);
+
     m_searchDock->toggleViewAction()->setEnabled(hasCurrent);
 
     if(hasCurrent)
@@ -639,6 +668,8 @@
 
         m_bookmarksView->setModel(bookmarkModelForCurrentTab());
 
+        on_thumbnails_dockLocationChanged(dockWidgetArea(m_thumbnailsDock));
+
         m_thumbnailsView->setScene(currentTab()->thumbnailsScene());
         currentTab()->setThumbnailsViewportSize(m_thumbnailsView->viewport()->size());
 
@@ -715,23 +746,20 @@
 
 void MainWindow::on_tabWidget_tabCloseRequested(int index)
 {
-    if(saveModifications(tab(index)))
-    {
-        closeTab(tab(index));
-    }
+    on_closeTabs_triggered(allTabs(index));
 }
 
 void MainWindow::on_tabWidget_tabDragRequested(int index)
 {
     QMimeData* mimeData = new QMimeData();
-    mimeData->setUrls(QList< QUrl >() << QUrl::fromLocalFile(tab(index)->fileInfo().absoluteFilePath()));
+    mimeData->setUrls(QList< QUrl >() << QUrl::fromLocalFile(currentTab(index)->fileInfo().absoluteFilePath()));
 
     QDrag* drag = new QDrag(this);
     drag->setMimeData(mimeData);
     drag->exec();
 }
 
-void MainWindow::on_tabWidget_tabContextMenuRequested(const QPoint& globalPos, int index)
+void MainWindow::on_tabWidget_tabContextMenuRequested(QPoint globalPos, int index)
 {
     QMenu menu;
 
@@ -739,6 +767,9 @@
     SignalBlocker openCopyInNewTabSignalBlocker(m_openCopyInNewTabAction);
     SignalBlocker openContainingFolderSignalBlocker(m_openContainingFolderAction);
     SignalBlocker moveToInstanceSignalBlocker(m_moveToInstanceAction);
+    SignalBlocker splitViewHorizontallySignalBlocker(m_splitViewHorizontallyAction);
+    SignalBlocker splitViewVerticallySignalBlocker(m_splitViewVerticallyAction);
+    SignalBlocker closeCurrentViewSignalBlocker(m_closeCurrentViewAction);
 
     QAction* copyFilePathAction = createTemporaryAction(&menu, tr("Copy file path"), QLatin1String("copyFilePath"));
     QAction* selectFilePathAction = createTemporaryAction(&menu, tr("Select file path"), QLatin1String("selectFilePath"));
@@ -753,6 +784,7 @@
     QList< QAction* > actions;
 
     actions << m_openCopyInNewTabAction << m_openContainingFolderAction << m_moveToInstanceAction
+            << m_splitViewHorizontallyAction << m_splitViewVerticallyAction << m_closeCurrentViewAction
             << copyFilePathAction << selectFilePathAction
             << closeAllTabsAction << closeAllTabsButThisOneAction
             << closeAllTabsToTheLeftAction << closeAllTabsToTheRightAction;
@@ -761,104 +793,80 @@
 
     const QAction* action = menu.exec(globalPos);
 
-    DocumentView* selectedTab = tab(index);
-    QList< DocumentView* > tabsToClose;
+    DocumentView* const tab = currentTab(index);
 
     if(action == m_openCopyInNewTabAction)
     {
-        on_openCopyInNewTab_triggered(selectedTab);
-        return;
+        on_openCopyInNewTab_triggered(tab);
     }
     else if(action == m_openContainingFolderAction)
     {
-        on_openContainingFolder_triggered(selectedTab);
-        return;
+        on_openContainingFolder_triggered(tab);
     }
     else if(action == m_moveToInstanceAction)
     {
-        on_moveToInstance_triggered(selectedTab);
-        return;
+        on_moveToInstance_triggered(tab);
+    }
+    else if(action == m_splitViewHorizontallyAction)
+    {
+        on_splitView_split_triggered(Qt::Horizontal, index);
+    }
+    else if(action == m_splitViewVerticallyAction)
+    {
+        on_splitView_split_triggered(Qt::Vertical, index);
+    }
+    else if(action == m_closeCurrentViewAction)
+    {
+        on_splitView_closeCurrent_triggered(index);
     }
     else if(action == copyFilePathAction)
     {
-        QApplication::clipboard()->setText(selectedTab->fileInfo().absoluteFilePath());
-        return;
+        QApplication::clipboard()->setText(tab->fileInfo().absoluteFilePath());
     }
     else if(action == selectFilePathAction)
     {
-        QApplication::clipboard()->setText(selectedTab->fileInfo().absoluteFilePath(), QClipboard::Selection);
-        return;
+        QApplication::clipboard()->setText(tab->fileInfo().absoluteFilePath(), QClipboard::Selection);
     }
     else if(action == closeAllTabsAction)
     {
-        tabsToClose = tabs();
+        on_closeAllTabs_triggered();
     }
     else if(action == closeAllTabsButThisOneAction)
     {
-        const int count = m_tabWidget->count();
-
-        for(int indexToClose = 0; indexToClose < count; ++indexToClose)
-        {
-            if(indexToClose != index)
-            {
-                tabsToClose.append(tab(indexToClose));
-            }
-        }
+        on_closeAllTabsButThisOne_triggered(index);
     }
     else if(action == closeAllTabsToTheLeftAction)
     {
-        for(int indexToClose = 0; indexToClose < index; ++indexToClose)
-        {
-            tabsToClose.append(tab(indexToClose));
-        }
+        on_closeAllTabsToTheLeft_triggered(index);
     }
     else if(action == closeAllTabsToTheRightAction)
     {
-        const int count = m_tabWidget->count();
-
-        for(int indexToClose = count - 1; indexToClose > index; --indexToClose)
-        {
-            tabsToClose.append(tab(indexToClose));
-        }
-    }
-    else
-    {
-        return;
-    }
-
-    disconnectCurrentTabChanged();
-
-    foreach(DocumentView* tab, tabsToClose)
-    {
-        if(saveModifications(tab))
-        {
-            closeTab(tab);
-        }
-    }
-
-    reconnectCurrentTabChanged();
+        on_closeAllTabsToTheRight_triggered(index);
+    }
 }
 
 #define ONLY_IF_SENDER_IS_CURRENT_TAB if(!senderIsCurrentTab()) { return; }
 
 void MainWindow::on_currentTab_documentChanged()
 {
+    DocumentView* const senderTab = findCurrentTab(sender());
+
     for(int index = 0, count = m_tabWidget->count(); index < count; ++index)
     {
-        if(sender() == m_tabWidget->widget(index))
-        {
-            m_tabWidget->setTabText(index, tab(index)->title());
-            m_tabWidget->setTabToolTip(index, tab(index)->fileInfo().absoluteFilePath());
-
-            foreach(QAction* tabAction, m_tabsMenu->actions())
-            {
-                if(tabAction->parent() == m_tabWidget->widget(index))
-                {
-                    tabAction->setText(m_tabWidget->tabText(index));
-
-                    break;
-                }
-            }
+        if(senderTab == currentTab(index))
+        {
+            m_tabWidget->setTabText(index, senderTab->title());
+            m_tabWidget->setTabToolTip(index, senderTab->fileInfo().absoluteFilePath());
+
+            break;
+        }
+    }
+
+    foreach(QAction* tabAction, m_tabsMenu->actions())
+    {
+        if(senderTab == tabAction->parent())
+        {
+            tabAction->setText(senderTab->title());
 
             break;
         }
@@ -1119,7 +1127,7 @@
     m_searchLineEdit->setProgress(progress);
 }
 
-void MainWindow::on_currentTab_customContextMenuRequested(const QPoint& pos)
+void MainWindow::on_currentTab_customContextMenuRequested(QPoint pos)
 {
     ONLY_IF_SENDER_IS_CURRENT_TAB
 
@@ -1130,6 +1138,7 @@
     QList< QAction* > actions;
 
     actions << m_openCopyInNewTabAction << m_openContainingFolderAction << m_moveToInstanceAction
+            << m_splitViewHorizontallyAction << m_splitViewVerticallyAction << m_closeCurrentViewAction
             << m_previousPageAction << m_nextPageAction
             << m_firstPageAction << m_lastPageAction
             << m_jumpToPageAction << m_jumpBackwardAction << m_jumpForwardAction
@@ -1153,11 +1162,102 @@
     }
 }
 
+void MainWindow::on_splitView_splitHorizontally_triggered()
+{
+    on_splitView_split_triggered(Qt::Horizontal, m_tabWidget->currentIndex());
+}
+
+void MainWindow::on_splitView_splitVertically_triggered()
+{
+    on_splitView_split_triggered(Qt::Vertical, m_tabWidget->currentIndex());
+}
+
+void MainWindow::on_splitView_split_triggered(Qt::Orientation orientation, int index)
+{
+    const QString path = s_settings->mainWindow().openPath();
+    const QString filePath = QFileDialog::getOpenFileName(this, tr("Open"), path, DocumentView::openFilter().join(";;"));
+
+    if(filePath.isEmpty())
+    {
+        return;
+    }
+
+    DocumentView* const newTab = new DocumentView(this);
+
+    if(!newTab->open(filePath))
+    {
+        delete newTab;
+        return;
+    }
+
+    Splitter* splitter = new Splitter(orientation, this);
+    connect(splitter, SIGNAL(currentWidgetChanged(QWidget*)), this, SLOT(on_splitView_currentWidgetChanged(QWidget*)));
+
+    QWidget* const tab = m_tabWidget->widget(index);
+    const QString tabText = m_tabWidget->tabText(index);
+    const QString tabToolTip = m_tabWidget->tabToolTip(index);
+
+    m_tabWidget->removeTab(index);
+
+    splitter->addWidget(tab);
+    splitter->addWidget(newTab);
+
+    m_tabWidget->insertTab(index, splitter, tabText);
+    m_tabWidget->setTabToolTip(index, tabToolTip);
+
+    addTabAction(newTab);
+    connectTab(newTab);
+
+    m_tabWidget->setCurrentIndex(index);
+    tab->setFocus();
+
+    splitter->setUniformSizes();
+    tab->show();
+    newTab->show();
+
+    if(s_settings->mainWindow().synchronizeSplitViews())
+    {
+        DocumentView* const oldTab = findCurrentTab(tab);
+
+        connect(oldTab, SIGNAL(currentPageChanged(int,bool)), newTab, SLOT(jumpToPage(int,bool)));
+        connect(oldTab->horizontalScrollBar(), SIGNAL(valueChanged(int)), newTab->horizontalScrollBar(), SLOT(setValue(int)));
+        connect(oldTab->verticalScrollBar(), SIGNAL(valueChanged(int)), newTab->verticalScrollBar(), SLOT(setValue(int)));
+    }
+}
+
+void MainWindow::on_splitView_closeCurrent_triggered()
+{
+    on_splitView_closeCurrent_triggered(m_tabWidget->currentIndex());
+}
+
+void MainWindow::on_splitView_closeCurrent_triggered(int index)
+{
+    DocumentView* const tab = currentTab(index);
+
+    if(saveModifications(tab))
+    {
+        closeTab(tab);
+    }
+}
+
+void MainWindow::on_splitView_currentWidgetChanged(QWidget* currentWidget)
+{
+    for(QWidget* parentWidget = currentWidget->parentWidget(); parentWidget != 0; parentWidget = parentWidget->parentWidget())
+    {
+        if(parentWidget == m_tabWidget->currentWidget())
+        {
+            on_tabWidget_currentChanged(m_tabWidget->currentIndex());
+
+            return;
+        }
+    }
+}
+
 #undef ONLY_IF_SENDER_IS_CURRENT_TAB
 
 void MainWindow::on_currentPage_editingFinished()
 {
-    if(m_tabWidget->currentIndex() != -1)
+    if(m_tabWidget->hasCurrent())
     {
         currentTab()->jumpToPage(m_currentPageSpinBox->value());
     }
@@ -1195,7 +1295,7 @@
 
 void MainWindow::on_scaleFactor_editingFinished()
 {
-    if(m_tabWidget->currentIndex() != -1)
+    if(m_tabWidget->hasCurrent())
     {
         bool ok = false;
         qreal scaleFactor = m_scaleFactorComboBox->lineEdit()->text().toInt(&ok) / 100.0;
@@ -1221,7 +1321,7 @@
 
 void MainWindow::on_open_triggered()
 {
-    if(m_tabWidget->currentIndex() != -1)
+    if(m_tabWidget->hasCurrent())
     {
         const QString path = s_settings->mainWindow().openPath();
         const QString filePath = QFileDialog::getOpenFileName(this, tr("Open"), path, DocumentView::openFilter().join(";;"));
@@ -1244,14 +1344,12 @@
 
     if(!filePaths.isEmpty())
     {
-        disconnectCurrentTabChanged();
+        CurrentTabChangeBlocker currentTabChangeBlocker(this);
 
         foreach(const QString& filePath, filePaths)
         {
             openInNewTab(filePath);
         }
-
-        reconnectCurrentTabChanged();
     }
 }
 
@@ -1517,9 +1615,9 @@
     m_searchLineEdit->stopTimer();
     m_searchLineEdit->setProgress(0);
 
-    for(int index = 0, count = m_tabWidget->count(); index < count; ++index)
+    foreach(DocumentView* tab, allTabs())
     {
-        tab(index)->cancelSearch();
+        tab->cancelSearch();
     }
 
     if(!s_settings->mainWindow().extendedSearchDock())
@@ -1558,9 +1656,9 @@
 
     m_saveDatabaseTimer->setInterval(s_settings->mainWindow().saveDatabaseInterval());
 
-    for(int index = 0, count = m_tabWidget->count(); index < count; ++index)
+    foreach(DocumentView* tab, allTabs())
     {
-        if(!tab(index)->refresh())
+        if(!tab->refresh())
         {
             QMessageBox::warning(this, tr("Warning"), tr("Could not refresh '%1'.").arg(currentTab()->fileInfo().filePath()));
         }
@@ -1691,76 +1789,79 @@
 
 void MainWindow::on_previousTab_triggered()
 {
-    if(m_tabWidget->currentIndex() > 0)
-    {
-        m_tabWidget->setCurrentIndex(m_tabWidget->currentIndex() - 1);
-    }
-    else
-    {
-        m_tabWidget->setCurrentIndex(m_tabWidget->count() - 1);
-    }
+    m_tabWidget->previousTab();
 }
 
 void MainWindow::on_nextTab_triggered()
 {
-    if(m_tabWidget->currentIndex() < m_tabWidget->count() - 1)
-    {
-        m_tabWidget->setCurrentIndex(m_tabWidget->currentIndex() + 1);
-    }
-    else
-    {
-        m_tabWidget->setCurrentIndex(0);
-    }
+    m_tabWidget->nextTab();
 }
 
 void MainWindow::on_closeTab_triggered()
 {
-    if(saveModifications(currentTab()))
-    {
-        closeTab(currentTab());
-    }
+    on_closeTabs_triggered(allTabs(m_tabWidget->currentIndex()));
 }
 
 void MainWindow::on_closeAllTabs_triggered()
 {
-    disconnectCurrentTabChanged();
-
-    foreach(DocumentView* tab, tabs())
-    {
-        if(saveModifications(tab))
-        {
-            closeTab(tab);
-        }
-    }
-
-    reconnectCurrentTabChanged();
+    on_closeTabs_triggered(allTabs());
 }
 
 void MainWindow::on_closeAllTabsButCurrentTab_triggered()
 {
-    disconnectCurrentTabChanged();
-
-    DocumentView* tab = currentTab();
-
-    const int oldIndex = m_tabWidget->currentIndex();
-    const QString tabText = m_tabWidget->tabText(oldIndex);
-    const QString tabToolTip = m_tabWidget->tabToolTip(oldIndex);
-
-    m_tabWidget->removeTab(oldIndex);
-
-    foreach(DocumentView* tab, tabs())
+    on_closeAllTabsButThisOne_triggered(m_tabWidget->currentIndex());
+}
+
+void MainWindow::on_closeAllTabsButThisOne_triggered(int thisIndex)
+{
+    QVector< DocumentView* > tabs;
+
+    for(int index = 0, count = m_tabWidget->count(); index < count; ++index)
+    {
+        if(index != thisIndex)
+        {
+            tabs.append(allTabs(index));
+        }
+    }
+
+    on_closeTabs_triggered(tabs);
+}
+
+void MainWindow::on_closeAllTabsToTheLeft_triggered(int ofIndex)
+{
+    QVector< DocumentView* > tabs;
+
+    for(int index = 0; index < ofIndex; ++index)
+    {
+        tabs.append(allTabs(index));
+    }
+
+    on_closeTabs_triggered(tabs);
+}
+
+void MainWindow::on_closeAllTabsToTheRight_triggered(int ofIndex)
+{
+    QVector< DocumentView* > tabs;
+
+    for(int index = ofIndex + 1, count = m_tabWidget->count(); index < count; ++index)
+    {
+        tabs.append(allTabs(index));
+    }
+
+    on_closeTabs_triggered(tabs);
+}
+
+void MainWindow::on_closeTabs_triggered(const QVector< DocumentView* >& tabs)
+{
+    CurrentTabChangeBlocker currentTabChangeBlocker(this);
+
+    foreach(DocumentView* tab, tabs)
     {
         if(saveModifications(tab))
         {
             closeTab(tab);
         }
     }
-
-    const int newIndex = m_tabWidget->addTab(tab, tabText);
-    m_tabWidget->setTabToolTip(newIndex, tabToolTip);
-    m_tabWidget->setCurrentIndex(newIndex);
-
-    reconnectCurrentTabChanged();
 }
 
 void MainWindow::on_restoreMostRecentlyClosedTab_triggered()
@@ -1781,11 +1882,14 @@
 
 void MainWindow::on_tabAction_triggered()
 {
+    DocumentView* const senderTab = static_cast< DocumentView* >(sender()->parent());
+
     for(int index = 0, count = m_tabWidget->count(); index < count; ++index)
     {
-        if(sender()->parent() == m_tabWidget->widget(index))
+        if(allTabs(index).contains(senderTab))
         {
             m_tabWidget->setCurrentIndex(index);
+            senderTab->setFocus();
 
             break;
         }
@@ -1967,7 +2071,7 @@
 
 void MainWindow::on_bookmark_openTriggered(const QString& absoluteFilePath)
 {
-    if(m_tabWidget->currentIndex() != -1)
+    if(m_tabWidget->hasCurrent())
     {
         open(absoluteFilePath);
     }
@@ -2092,15 +2196,15 @@
         return;
     }
 
-    const bool allTabs = s_settings->mainWindow().extendedSearchDock() ? !modified : modified;
+    const bool forAllTabs = s_settings->mainWindow().extendedSearchDock() ? !modified : modified;
     const bool matchCase = m_matchCaseCheckBox->isChecked();
     const bool wholeWords = m_wholeWordsCheckBox->isChecked();
 
-    if(allTabs)
+    if(forAllTabs)
     {
-        for(int index = 0, count = m_tabWidget->count(); index < count; ++index)
+        foreach(DocumentView* tab, allTabs())
         {
-            tab(index)->startSearch(text, matchCase, wholeWords);
+            tab->startSearch(text, matchCase, wholeWords);
         }
     }
     else
@@ -2194,9 +2298,9 @@
 
 void MainWindow::on_thumbnails_dockLocationChanged(Qt::DockWidgetArea area)
 {
-    for(int index = 0, count = m_tabWidget->count(); index < count; ++index)
+    foreach(DocumentView* tab, allTabs())
     {
-        tab(index)->setThumbnailsOrientation(area == Qt::TopDockWidgetArea || area == Qt::BottomDockWidgetArea ? Qt::Horizontal : Qt::Vertical);
+        tab->setThumbnailsOrientation(area == Qt::TopDockWidgetArea || area == Qt::BottomDockWidgetArea ? Qt::Horizontal : Qt::Vertical);
     }
 }
 
@@ -2243,7 +2347,7 @@
     }
 }
 
-void MainWindow::on_bookmarks_contextMenuRequested(const QPoint& pos)
+void MainWindow::on_bookmarks_contextMenuRequested(QPoint pos)
 {
     QMenu menu;
 
@@ -2363,26 +2467,38 @@
         m_searchLineEdit->stopTimer();
         m_searchLineEdit->setProgress(0);
 
-        for(int index = 0, count = m_tabWidget->count(); index < count; ++index)
+        foreach(DocumentView* tab, allTabs())
         {
-            tab(index)->cancelSearch();
-            tab(index)->clearResults();
+            tab->cancelSearch();
+            tab->clearResults();
         }
 
-        if(m_tabWidget->currentWidget() != 0)
+        if(DocumentView* tab = currentTab())
         {
-            m_tabWidget->currentWidget()->setFocus();
+            tab->setFocus();
         }
     }
 }
 
-void MainWindow::on_search_clicked(const QModelIndex& index)
+void MainWindow::on_search_clicked(const QModelIndex& clickedIndex)
 {
-    DocumentView* tab = SearchModel::instance()->viewForIndex(index);
-
-    m_tabWidget->setCurrentWidget(tab);
-
-    tab->findResult(index);
+    DocumentView* const clickedTab = SearchModel::instance()->viewForIndex(clickedIndex);
+
+    for(int index = 0, count = m_tabWidget->count(); index < count; ++index)
+    {
+        foreach(DocumentView* tab, allTabs(index))
+        {
+            if(tab == clickedTab)
+            {
+                m_tabWidget->setCurrentIndex(index);
+                tab->setFocus();
+
+                clickedTab->findResult(clickedIndex);
+
+                return;
+            }
+        }
+    }
 }
 
 void MainWindow::on_search_rowsInserted(const QModelIndex& parent, int first, int last)
@@ -2407,7 +2523,7 @@
 {
     if(s_settings->mainWindow().restoreTabs())
     {
-        s_database->saveTabs(tabs());
+        s_database->saveTabs(allTabs());
     }
 
     if(s_settings->mainWindow().restoreBookmarks())
@@ -2417,7 +2533,7 @@
 
     if(s_settings->mainWindow().restorePerFileSettings())
     {
-        foreach(DocumentView* tab, tabs())
+        foreach(DocumentView* tab, allTabs())
         {
             s_database->savePerFileSettings(tab);
         }
@@ -2458,18 +2574,22 @@
 
     for(int index = 0, count = m_tabWidget->count(); index < count; ++index)
     {
-        if(!saveModifications(tab(index)))
+        foreach(DocumentView* tab, allTabs(index))
         {
-            m_tabWidget->setCurrentIndex(index);
+            if(!saveModifications(tab))
+            {
+                m_tabWidget->setCurrentIndex(index);
+                tab->setFocus();
 
-            event->setAccepted(false);
-            return;
+                event->setAccepted(false);
+                return;
+            }
         }
     }
 
     if(s_settings->mainWindow().restoreTabs())
     {
-        s_database->saveTabs(tabs());
+        s_database->saveTabs(allTabs());
     }
     else
     {
@@ -2510,7 +2630,7 @@
     {
         event->acceptProposedAction();
 
-        disconnectCurrentTabChanged();
+        CurrentTabChangeBlocker currentTabChangeBlocker(this);
 
         foreach(const QUrl& url, event->mimeData()->urls())
         {
@@ -2523,8 +2643,6 @@
                 openInNewTab(url.toLocalFile());
             }
         }
-
-        reconnectCurrentTabChanged();
     }
 }
 
@@ -2549,21 +2667,26 @@
 
 inline DocumentView* MainWindow::currentTab() const
 {
-    return qobject_cast< DocumentView* >(m_tabWidget->currentWidget());
-}
-
-inline DocumentView* MainWindow::tab(int index) const
-{
-    return qobject_cast< DocumentView* >(m_tabWidget->widget(index));
-}
-
-QList< DocumentView* > MainWindow::tabs() const
-{
-    QList< DocumentView* > tabs;
+    return findCurrentTab(m_tabWidget->currentWidget());
+}
+
+inline DocumentView* MainWindow::currentTab(int index) const
+{
+    return findCurrentTab(m_tabWidget->widget(index));
+}
+
+inline QVector< DocumentView* > MainWindow::allTabs(int index) const
+{
+    return findAllTabs(m_tabWidget->widget(index));
+}
+
+QVector< DocumentView* > MainWindow::allTabs() const
+{
+    QVector< DocumentView* > tabs;
 
     for(int index = 0, count = m_tabWidget->count(); index < count; ++index)
     {
-        tabs.append(tab(index));
+        tabs.append(allTabs(index));
     }
 
     return tabs;
@@ -2571,50 +2694,61 @@
 
 bool MainWindow::senderIsCurrentTab() const
 {
-     return sender() == m_tabWidget->currentWidget() || qobject_cast< DocumentView* >(sender()) == 0;
-}
-
-int MainWindow::addTab(DocumentView* tab)
-{
-    const int index = s_settings->mainWindow().newTabNextToCurrentTab() ?
-                m_tabWidget->insertTab(m_tabWidget->currentIndex() + 1, tab, tab->title()) :
-                m_tabWidget->addTab(tab, tab->title());
-
-    m_tabWidget->setTabToolTip(index, tab->fileInfo().absoluteFilePath());
-    m_tabWidget->setCurrentIndex(index);
-
-    return index;
-}
-
-void MainWindow::closeTab(DocumentView* tab)
-{
-    if(s_settings->mainWindow().keepRecentlyClosed())
-    {
-        foreach(QAction* tabAction, m_tabsMenu->actions())
-        {
-            if(tabAction->parent() == tab)
-            {
-                m_tabsMenu->removeAction(tabAction);
-                m_tabWidget->removeTab(m_tabWidget->indexOf(tab));
-
-                tab->setParent(this);
-                tab->setVisible(false);
-
-                m_recentlyClosedMenu->addTabAction(tabAction);
-
-                break;
-            }
-        }
-    }
-    else
-    {
-        delete tab;
-    }
-
-    if(s_settings->mainWindow().exitAfterLastTab() && m_tabWidget->count() == 0)
-    {
-        close();
-    }
+     return sender() == currentTab() || qobject_cast< DocumentView* >(sender()) == 0;
+}
+
+void MainWindow::addTab(DocumentView* tab)
+{
+    m_tabWidget->addTab(tab, s_settings->mainWindow().newTabNextToCurrentTab(),
+                        tab->title(), tab->fileInfo().absoluteFilePath());
+}
+
+void MainWindow::addTabAction(DocumentView* tab)
+{
+    QAction* tabAction = new QAction(tab->title(), tab);
+    tabAction->setToolTip(tab->fileInfo().absoluteFilePath());
+    tabAction->setData(true); // Flag action for search-as-you-type
+
+    connect(tabAction, SIGNAL(triggered()), SLOT(on_tabAction_triggered()));
+
+    m_tabsMenu->addAction(tabAction);
+}
+
+void MainWindow::connectTab(DocumentView* tab)
+{
+    connect(tab, SIGNAL(documentChanged()), SLOT(on_currentTab_documentChanged()));
+    connect(tab, SIGNAL(documentModified()), SLOT(on_currentTab_documentModified()));
+
+    connect(tab, SIGNAL(numberOfPagesChanged(int)), SLOT(on_currentTab_numberOfPagesChaned(int)));
+    connect(tab, SIGNAL(currentPageChanged(int)), SLOT(on_currentTab_currentPageChanged(int)));
+
+    connect(tab, SIGNAL(canJumpChanged(bool,bool)), SLOT(on_currentTab_canJumpChanged(bool,bool)));
+
+    connect(tab, SIGNAL(continuousModeChanged(bool)), SLOT(on_currentTab_continuousModeChanged(bool)));
+    connect(tab, SIGNAL(layoutModeChanged(LayoutMode)), SLOT(on_currentTab_layoutModeChanged(LayoutMode)));
+    connect(tab, SIGNAL(rightToLeftModeChanged(bool)), SLOT(on_currentTab_rightToLeftModeChanged(bool)));
+    connect(tab, SIGNAL(scaleModeChanged(ScaleMode)), SLOT(on_currentTab_scaleModeChanged(ScaleMode)));
+    connect(tab, SIGNAL(scaleFactorChanged(qreal)), SLOT(on_currentTab_scaleFactorChanged(qreal)));
+    connect(tab, SIGNAL(rotationChanged(Rotation)), SLOT(on_currentTab_rotationChanged(Rotation)));
+
+    connect(tab, SIGNAL(linkClicked(int)), SLOT(on_currentTab_linkClicked(int)));
+    connect(tab, SIGNAL(linkClicked(bool,QString,int)), SLOT(on_currentTab_linkClicked(bool,QString,int)));
+
+    connect(tab, SIGNAL(renderFlagsChanged(qpdfview::RenderFlags)), SLOT(on_currentTab_renderFlagsChanged(qpdfview::RenderFlags)));
+
+    connect(tab, SIGNAL(invertColorsChanged(bool)), SLOT(on_currentTab_invertColorsChanged(bool)));
+    connect(tab, SIGNAL(convertToGrayscaleChanged(bool)), SLOT(on_currentTab_convertToGrayscaleChanged(bool)));
+    connect(tab, SIGNAL(trimMarginsChanged(bool)), SLOT(on_currentTab_trimMarginsChanged(bool)));
+
+    connect(tab, SIGNAL(compositionModeChanged(CompositionMode)), SLOT(on_currentTab_compositionModeChanged(CompositionMode)));
+
+    connect(tab, SIGNAL(highlightAllChanged(bool)), SLOT(on_currentTab_highlightAllChanged(bool)));
+    connect(tab, SIGNAL(rubberBandModeChanged(RubberBandMode)), SLOT(on_currentTab_rubberBandModeChanged(RubberBandMode)));
+
+    connect(tab, SIGNAL(searchFinished()), SLOT(on_currentTab_searchFinished()));
+    connect(tab, SIGNAL(searchProgressChanged(int)), SLOT(on_currentTab_searchProgressChanged(int)));
+
+    connect(tab, SIGNAL(customContextMenuRequested(QPoint)), SLOT(on_currentTab_customContextMenuRequested(QPoint)));
 }
 
 bool MainWindow::saveModifications(DocumentView* tab)
@@ -2653,16 +2787,51 @@
     return true;
 }
 
-void MainWindow::disconnectCurrentTabChanged()
-{
-    disconnect(m_tabWidget, SIGNAL(currentChanged(int)), this, SLOT(on_tabWidget_currentChanged(int)));
-}
-
-void MainWindow::reconnectCurrentTabChanged()
-{
-    connect(m_tabWidget, SIGNAL(currentChanged(int)), this, SLOT(on_tabWidget_currentChanged(int)));
-
-    on_tabWidget_currentChanged(m_tabWidget->currentIndex());
+void MainWindow::closeTab(DocumentView* tab)
+{
+    const int tabIndex = m_tabWidget->indexOf(tab);
+
+    if(s_settings->mainWindow().keepRecentlyClosed() && tabIndex != -1)
+    {
+        foreach(QAction* tabAction, m_tabsMenu->actions())
+        {
+            if(tabAction->parent() == tab)
+            {
+                m_tabsMenu->removeAction(tabAction);
+                m_tabWidget->removeTab(tabIndex);
+
+                tab->setParent(this);
+                tab->setVisible(false);
+
+                m_recentlyClosedMenu->addTabAction(tabAction);
+
+                break;
+            }
+        }
+    }
+    else
+    {
+        Splitter* const splitter = qobject_cast< Splitter* >(tab->parentWidget());
+
+        delete tab;
+
+        if(splitter != 0)
+        {
+            if(splitter->count() > 0)
+            {
+                splitter->widget(0)->setFocus();
+            }
+            else
+            {
+                delete splitter;
+            }
+        }
+
+        if(s_settings->mainWindow().exitAfterLastTab() && m_tabWidget->count() == 0)
+        {
+            close();
+        }
+    }
 }
 
 void MainWindow::setWindowTitleForCurrentTab()
@@ -2670,16 +2839,16 @@
     QString tabText;
     QString instanceText;
 
-    if(m_tabWidget->currentIndex() != -1)
+    if(DocumentView* tab = currentTab())
     {
         QString currentPage;
 
         if(s_settings->mainWindow().currentPageInWindowTitle())
         {
-            currentPage = QString(" (%1 / %2)").arg(currentTab()->currentPage()).arg(currentTab()->numberOfPages());
+            currentPage = QString(" (%1 / %2)").arg(tab->currentPage()).arg(tab->numberOfPages());
         }
 
-        tabText = m_tabWidget->tabText(m_tabWidget->currentIndex()) + currentPage + QLatin1String("[*] - ");
+        tabText = m_tabWidget->currentTabText() + currentPage + QLatin1String("[*] - ");
     }
 
     const QString instanceName = qApp->objectName();
@@ -2696,19 +2865,19 @@
 {
     QString suffix;
 
-    if(m_tabWidget->currentIndex() != -1)
+    if(DocumentView* tab = currentTab())
     {
-        const int currentPage = currentTab()->currentPage();
-        const int numberOfPages = currentTab()->numberOfPages();
-
-        const QString& defaultPageLabel = currentTab()->defaultPageLabelFromNumber(currentPage);
-        const QString& pageLabel = currentTab()->pageLabelFromNumber(currentPage);
-
-        const QString& lastDefaultPageLabel = currentTab()->defaultPageLabelFromNumber(numberOfPages);
-
-        if((s_settings->mainWindow().usePageLabel() || currentTab()->hasFrontMatter()) && defaultPageLabel != pageLabel)
+        const int currentPage = tab->currentPage();
+        const int numberOfPages = tab->numberOfPages();
+
+        const QString& defaultPageLabel = tab->defaultPageLabelFromNumber(currentPage);
+        const QString& pageLabel = tab->pageLabelFromNumber(currentPage);
+
+        const QString& lastDefaultPageLabel = tab->defaultPageLabelFromNumber(numberOfPages);
+
+        if((s_settings->mainWindow().usePageLabel() || tab->hasFrontMatter()) && defaultPageLabel != pageLabel)
         {
-            suffix = QString(" (%1 / %2)").arg(defaultPageLabel).arg(lastDefaultPageLabel);
+            suffix = QString(" (%1 / %2)").arg(defaultPageLabel, lastDefaultPageLabel);
         }
         else
         {
@@ -2728,7 +2897,7 @@
     return BookmarkModel::fromPath(currentTab()->fileInfo().absoluteFilePath(), create);
 }
 
-QAction* MainWindow::sourceLinkActionForCurrentTab(QObject* parent, const QPoint& pos)
+QAction* MainWindow::sourceLinkActionForCurrentTab(QObject* parent, QPoint pos)
 {
     QAction* action = createTemporaryAction(parent, QString(), QLatin1String("openSourceLink"));
 
@@ -2808,6 +2977,8 @@
 
     setCentralWidget(m_tabWidget);
 
+    m_currentTabChangedBlocked = false;
+
     connect(m_tabWidget, SIGNAL(currentChanged(int)), SLOT(on_tabWidget_currentChanged(int)));
     connect(m_tabWidget, SIGNAL(tabCloseRequested(int)), SLOT(on_tabWidget_tabCloseRequested(int)));
     connect(m_tabWidget, SIGNAL(tabDragRequested(int)), SLOT(on_tabWidget_tabDragRequested(int)));
@@ -2926,9 +3097,6 @@
 
     m_openAction = createAction(tr("&Open..."), QLatin1String("open"), QLatin1String("document-open"), QKeySequence::Open, SLOT(on_open_triggered()));
     m_openInNewTabAction = createAction(tr("Open in new &tab..."), QLatin1String("openInNewTab"), QLatin1String("tab-new"), QKeySequence::AddTab, SLOT(on_openInNewTab_triggered()));
-    m_openCopyInNewTabAction = createAction(tr("Open &copy in new tab"), QLatin1String("openCopyInNewTab"), QLatin1String("tab-new"), QKeySequence(), SLOT(on_openCopyInNewTab_triggered()));
-    m_openContainingFolderAction = createAction(tr("Open containing &folder"), QLatin1String("openContainingFolder"), QLatin1String("folder"), QKeySequence(), SLOT(on_openContainingFolder_triggered()));
-    m_moveToInstanceAction = createAction(tr("Move to &instance..."), QLatin1String("moveToInstance"), QIcon(), QKeySequence(), SLOT(on_moveToInstance_triggered()));
     m_refreshAction = createAction(tr("&Refresh"), QLatin1String("refresh"), QLatin1String("view-refresh"), QKeySequence::Refresh, SLOT(on_refresh_triggered()));
     m_saveAction = createAction(tr("&Save"), QLatin1String("save"), QLatin1String("document-save"), QKeySequence::Save, SLOT(on_save_triggered()));
     m_saveAsAction = createAction(tr("Save &as..."), QLatin1String("saveAs"), QLatin1String("document-save-as"), QKeySequence::SaveAs, SLOT(on_saveAs_triggered()));
@@ -3035,6 +3203,15 @@
     m_contentsAction = createAction(tr("&Contents"), QLatin1String("contents"), QIcon::fromTheme("help-contents"), QKeySequence::HelpContents, SLOT(on_contents_triggered()));
     m_aboutAction = createAction(tr("&About"), QString(), QIcon::fromTheme("help-about"), QKeySequence(), SLOT(on_about_triggered()));
 
+    // context
+
+    m_openCopyInNewTabAction = createAction(tr("Open &copy in new tab"), QLatin1String("openCopyInNewTab"), QLatin1String("tab-new"), QKeySequence(), SLOT(on_openCopyInNewTab_triggered()));
+    m_openContainingFolderAction = createAction(tr("Open containing &folder"), QLatin1String("openContainingFolder"), QLatin1String("folder"), QKeySequence(), SLOT(on_openContainingFolder_triggered()));
+    m_moveToInstanceAction = createAction(tr("Move to &instance..."), QLatin1String("moveToInstance"), QIcon(), QKeySequence(), SLOT(on_moveToInstance_triggered()));
+    m_splitViewHorizontallyAction = createAction(tr("Split view horizontally..."), QLatin1String("splitViewHorizontally"), QIcon(), QKeySequence(), SLOT(on_splitView_splitHorizontally_triggered()));
+    m_splitViewVerticallyAction = createAction(tr("Split view vertically..."), QLatin1String("splitViewVertically"), QIcon(), QKeySequence(), SLOT(on_splitView_splitVertically_triggered()));
+    m_closeCurrentViewAction = createAction(tr("Close current view"), QLatin1String("closeCurrentView"), QIcon(), QKeySequence(), SLOT(on_splitView_closeCurrent_triggered()));
+
     // tool bars and menu bar
 
     m_toggleToolBarsAction = createAction(tr("Toggle tool bars"), QLatin1String("toggleToolBars"), QIcon(), QKeySequence(Qt::SHIFT + Qt::ALT + Qt::Key_T), SLOT(on_toggleToolBars_triggered(bool)), true, true);
@@ -3609,7 +3786,7 @@
 
     const QFileInfo fileInfo(absoluteFilePath);
 
-    foreach(DocumentView* tab, mainWindow()->tabs())
+    foreach(DocumentView* tab, mainWindow()->allTabs())
     {
         if(tab->fileInfo() == fileInfo)
         {

=== modified file 'sources/mainwindow.h'
--- sources/mainwindow.h	2016-11-03 09:05:49 +0000
+++ sources/mainwindow.h	2017-04-19 21:02:47 +0000
@@ -1,7 +1,7 @@
 /*
 
 Copyright 2014 S. Razi Alavizadeh
-Copyright 2012-2015 Adam Reichold
+Copyright 2012-2017 Adam Reichold
 Copyright 2012 Michał Trybus
 Copyright 2012 Alexander Volkov
 
@@ -97,7 +97,7 @@
     void on_tabWidget_currentChanged(int index);
     void on_tabWidget_tabCloseRequested(int index);
     void on_tabWidget_tabDragRequested(int index);
-    void on_tabWidget_tabContextMenuRequested(const QPoint& globalPos, int index);
+    void on_tabWidget_tabContextMenuRequested(QPoint globalPos, int index);
 
     void on_currentTab_documentChanged();
     void on_currentTab_documentModified();
@@ -131,7 +131,14 @@
     void on_currentTab_searchFinished();
     void on_currentTab_searchProgressChanged(int progress);
 
-    void on_currentTab_customContextMenuRequested(const QPoint& pos);
+    void on_currentTab_customContextMenuRequested(QPoint pos);
+
+    void on_splitView_splitHorizontally_triggered();
+    void on_splitView_splitVertically_triggered();
+    void on_splitView_split_triggered(Qt::Orientation orientation, int index);
+    void on_splitView_closeCurrent_triggered();
+    void on_splitView_closeCurrent_triggered(int index);
+    void on_splitView_currentWidgetChanged(QWidget* currentWidget);
 
     void on_currentPage_editingFinished();
     void on_currentPage_returnPressed();
@@ -211,6 +218,10 @@
     void on_closeTab_triggered();
     void on_closeAllTabs_triggered();
     void on_closeAllTabsButCurrentTab_triggered();
+    void on_closeAllTabsButThisOne_triggered(int thisIndex);
+    void on_closeAllTabsToTheLeft_triggered(int ofIndex);
+    void on_closeAllTabsToTheRight_triggered(int ofIndex);
+    void on_closeTabs_triggered(const QVector< DocumentView* >& tabs);
 
     void on_restoreMostRecentlyClosedTab_triggered();
 
@@ -256,7 +267,7 @@
 
     void on_bookmarks_sectionCountChanged();
     void on_bookmarks_clicked(const QModelIndex& index);
-    void on_bookmarks_contextMenuRequested(const QPoint& pos);
+    void on_bookmarks_contextMenuRequested(QPoint pos);
 
     void on_search_sectionCountChanged();
     void on_search_dockLocationChanged(Qt::DockWidgetArea area);
@@ -287,25 +298,29 @@
     TabWidget* m_tabWidget;
 
     DocumentView* currentTab() const;
-    DocumentView* tab(int index) const;
-    QList< DocumentView* > tabs() const;
+    DocumentView* currentTab(int index) const;
+    QVector< DocumentView* > allTabs(int index) const;
+    QVector< DocumentView* > allTabs() const;
 
     bool senderIsCurrentTab() const;
 
-    int addTab(DocumentView* tab);
+    bool m_currentTabChangedBlocked;
+
+    class CurrentTabChangeBlocker;
+
+    void addTab(DocumentView* tab);
+    void addTabAction(DocumentView* tab);
+    void connectTab(DocumentView* tab);
+
+    bool saveModifications(DocumentView* tab);
     void closeTab(DocumentView* tab);
 
-    bool saveModifications(DocumentView* tab);
-
-    void disconnectCurrentTabChanged();
-    void reconnectCurrentTabChanged();
-
     void setWindowTitleForCurrentTab();
     void setCurrentPageSuffixForCurrentTab();
 
     BookmarkModel* bookmarkModelForCurrentTab(bool create = false);
 
-    QAction* sourceLinkActionForCurrentTab(QObject* parent, const QPoint& pos);
+    QAction* sourceLinkActionForCurrentTab(QObject* parent, QPoint pos);
 
     class RestoreTab;
 
@@ -338,9 +353,6 @@
 
     QAction* m_openAction;
     QAction* m_openInNewTabAction;
-    QAction* m_openCopyInNewTabAction;
-    QAction* m_openContainingFolderAction;
-    QAction* m_moveToInstanceAction;
     QAction* m_refreshAction;
     QAction* m_saveAction;
     QAction* m_saveAsAction;
@@ -419,6 +431,13 @@
     QAction* m_contentsAction;
     QAction* m_aboutAction;
 
+    QAction* m_openCopyInNewTabAction;
+    QAction* m_openContainingFolderAction;
+    QAction* m_moveToInstanceAction;
+    QAction* m_splitViewHorizontallyAction;
+    QAction* m_splitViewVerticallyAction;
+    QAction* m_closeCurrentViewAction;
+
     QAction* createAction(const QString& text, const QString& objectName, const QIcon& icon, const QList< QKeySequence >& shortcuts, const char* member, bool checkable = false, bool checked = false);
     QAction* createAction(const QString& text, const QString& objectName, const QIcon& icon, const QKeySequence& shortcut, const char* member, bool checkable = false, bool checked = false);
     QAction* createAction(const QString& text, const QString& objectName, const QString& iconName, const QList< QKeySequence >& shortcuts, const char* member, bool checkable = false, bool checked = false);

=== modified file 'sources/miscellaneous.cpp'
--- sources/miscellaneous.cpp	2017-01-28 18:50:24 +0000
+++ sources/miscellaneous.cpp	2017-04-19 21:02:47 +0000
@@ -1,7 +1,7 @@
 /*
 
 Copyright 2014 S. Razi Alavizadeh
-Copyright 2012-2015 Adam Reichold
+Copyright 2012-2017 Adam Reichold
 Copyright 2014 Dorian Scholz
 
 This file is part of qpdfview.
@@ -304,6 +304,19 @@
     setTabBar(tabBar);
 }
 
+int TabWidget::addTab(QWidget* const widget, const bool nextToCurrent,
+                      const QString& label, const QString& toolTip)
+{
+    const int index = nextToCurrent
+            ? insertTab(currentIndex() + 1, widget, label)
+            : QTabWidget::addTab(widget, label);
+
+    setTabToolTip(index, toolTip);
+    setCurrentIndex(index);
+
+    return index;
+}
+
 TabWidget::TabBarPolicy TabWidget::tabBarPolicy() const
 {
     return m_tabBarPolicy;
@@ -343,7 +356,31 @@
     }
 }
 
-void TabWidget::on_tabBar_customContextMenuRequested(const QPoint& pos)
+void TabWidget::previousTab()
+{
+    int index = currentIndex();
+
+    if(index < 0)
+    {
+        index = count() - 1;
+    }
+
+    setCurrentIndex(index);
+}
+
+void TabWidget::nextTab()
+{
+    int index = currentIndex();
+
+    if(index >= count())
+    {
+        index = 0;
+    }
+
+    setCurrentIndex(index);
+}
+
+void TabWidget::on_tabBar_customContextMenuRequested(QPoint pos)
 {
     const int index = tabBar()->tabAt(pos);
 
@@ -865,11 +902,80 @@
     emit searchInitiated(text());
 }
 
-void SearchLineEdit::on_returnPressed(const Qt::KeyboardModifiers& modifiers)
+void SearchLineEdit::on_returnPressed(Qt::KeyboardModifiers modifiers)
 {
     stopTimer();
 
     emit searchInitiated(text(), modifiers == Qt::ShiftModifier);
 }
 
+Splitter::Splitter(Qt::Orientation orientation, QWidget* parent) : QSplitter(orientation, parent),
+    m_currentIndex(0)
+{
+    connect(qApp, SIGNAL(focusChanged(QWidget*,QWidget*)), this, SLOT(on_focusChanged(QWidget*,QWidget*)));
+}
+
+QWidget* Splitter::currentWidget() const
+{
+    return widget(m_currentIndex);
+}
+
+void Splitter::setCurrentWidget(QWidget* const currentWidget)
+{
+    for(int index = 0, count = this->count(); index < count; ++index)
+    {
+        QWidget* const widget = this->widget(index);
+
+        if(currentWidget == widget)
+        {
+            if(m_currentIndex != index)
+            {
+                m_currentIndex = index;
+
+                emit currentWidgetChanged(currentWidget);
+            }
+
+            return;
+        }
+    }
+}
+
+void Splitter::setUniformSizes()
+{
+    int size;
+
+    switch(orientation())
+    {
+    default:
+    case Qt::Horizontal:
+        size = width();
+        break;
+    case Qt::Vertical:
+        size = height();
+        break;
+    }
+
+    QList< int > sizes;
+
+    for(int index = 0, count = this->count(); index < count; ++index)
+    {
+        sizes.append(size / count);
+    }
+
+    setSizes(sizes);
+}
+
+void Splitter::on_focusChanged(QWidget* /* old */, QWidget* now)
+{
+    for(QWidget* currentWidget = now; currentWidget != 0; currentWidget = currentWidget->parentWidget())
+    {
+        if(currentWidget->parentWidget() == this)
+        {
+            setCurrentWidget(currentWidget);
+
+            return;
+        }
+    }
+}
+
 } // qpdfview

=== modified file 'sources/miscellaneous.h'
--- sources/miscellaneous.h	2017-01-26 15:18:35 +0000
+++ sources/miscellaneous.h	2017-04-19 21:02:47 +0000
@@ -1,7 +1,7 @@
 /*
 
 Copyright 2014 S. Razi Alavizadeh
-Copyright 2012-2015 Adam Reichold
+Copyright 2012-2017 Adam Reichold
 Copyright 2014 Dorian Scholz
 
 This file is part of qpdfview.
@@ -31,6 +31,7 @@
 #include <QPainter>
 #include <QProxyStyle>
 #include <QSpinBox>
+#include <QSplitter>
 #include <QTreeView>
 
 class QTextLayout;
@@ -149,6 +150,17 @@
 public:
     explicit TabWidget(QWidget* parent = 0);
 
+    bool hasCurrent() const { return currentIndex() != -1; }
+
+    QString currentTabText() const { return tabText(currentIndex()); }
+    void setCurrentTabText(const QString& text) { setTabText(currentIndex(), text); }
+
+    QString currentTabToolTip() const { return tabToolTip(currentIndex()); }
+    void setCurrentTabToolTip(const QString& toolTip) { setTabToolTip(currentIndex(), toolTip); }
+
+    int addTab(QWidget* const widget, const bool nextToCurrent,
+               const QString& label, const QString& toolTip);
+
     enum TabBarPolicy
     {
         TabBarAsNeeded = 0,
@@ -162,12 +174,16 @@
     bool spreadTabs() const;
     void setSpreadTabs(bool spreadTabs);
 
+public slots:
+    void previousTab();
+    void nextTab();
+
 signals:
     void tabDragRequested(int index);
-    void tabContextMenuRequested(const QPoint& globalPos, int index);
+    void tabContextMenuRequested(QPoint globalPos, int index);
 
 protected slots:
-    void on_tabBar_customContextMenuRequested(const QPoint& pos);
+    void on_tabBar_customContextMenuRequested(QPoint pos);
 
 protected:
     void tabInserted(int index);
@@ -319,7 +335,7 @@
     void setProgress(int progress);
 
 signals:
-    void returnPressed(const Qt::KeyboardModifiers& modifiers);
+    void returnPressed(Qt::KeyboardModifiers modifiers);
 
 protected:
     void paintEvent(QPaintEvent* event);
@@ -352,7 +368,7 @@
 
 protected slots:
     void on_timeout();
-    void on_returnPressed(const Qt::KeyboardModifiers& modifiers);
+    void on_returnPressed(Qt::KeyboardModifiers modifiers);
 
 private:
     Q_DISABLE_COPY(SearchLineEdit)
@@ -361,6 +377,33 @@
 
 };
 
+// splitter
+
+class Splitter : public QSplitter
+{
+    Q_OBJECT
+
+public:
+    explicit Splitter(Qt::Orientation orientation, QWidget* parent = 0);
+
+    QWidget* currentWidget() const;
+    void setCurrentWidget(QWidget* const currentWidget);
+
+    void setUniformSizes();
+
+signals:
+    void currentWidgetChanged(QWidget* currentWidget);
+
+protected slots:
+    void on_focusChanged(QWidget* old, QWidget* now);
+
+private:
+    Q_DISABLE_COPY(Splitter)
+
+    int m_currentIndex;
+
+};
+
 // fallback icons
 
 inline QIcon loadIconWithFallback(const QString& name)

=== modified file 'sources/model.h'
--- sources/model.h	2017-04-02 09:36:22 +0000
+++ sources/model.h	2017-04-19 21:02:47 +0000
@@ -84,7 +84,7 @@
         Q_OBJECT
 
     public:
-        Annotation() : QObject() {}
+        Annotation(QObject* parent = 0) : QObject(parent) {}
         virtual ~Annotation() {}
 
         virtual QRectF boundary() const = 0;
@@ -102,7 +102,7 @@
         Q_OBJECT
 
     public:
-        FormField() : QObject() {}
+        FormField(QObject* parent = 0) : QObject(parent) {}
         virtual ~FormField() {}
 
         virtual QRectF boundary() const = 0;
@@ -122,7 +122,7 @@
 
         virtual QSizeF size() const = 0;
 
-        virtual QImage render(qreal horizontalResolution = 72.0, qreal verticalResolution = 72.0, Rotation rotation = RotateBy0, const QRect& boundingRect = QRect()) const = 0;
+        virtual QImage render(qreal horizontalResolution = 72.0, qreal verticalResolution = 72.0, Rotation rotation = RotateBy0, QRect boundingRect = QRect()) const = 0;
 
         virtual QString label() const { return QString(); }
 

=== modified file 'sources/pageitem.cpp'
--- sources/pageitem.cpp	2016-11-20 18:29:29 +0000
+++ sources/pageitem.cpp	2017-04-19 21:02:47 +0000
@@ -52,7 +52,7 @@
 
 const qreal proxyPadding = 2.0;
 
-inline bool modifiersAreActive(const QGraphicsSceneMouseEvent* event, const Qt::KeyboardModifiers& modifiers)
+inline bool modifiersAreActive(const QGraphicsSceneMouseEvent* event, Qt::KeyboardModifiers modifiers)
 {
     if(modifiers == Qt::NoModifier)
     {
@@ -770,7 +770,7 @@
     m_formFields = formFields;
 }
 
-void PageItem::copyToClipboard(const QPoint& screenPos)
+void PageItem::copyToClipboard(QPoint screenPos)
 {
     QMenu menu;
 
@@ -823,7 +823,7 @@
     }
 }
 
-void PageItem::addAnnotation(const QPoint& screenPos)
+void PageItem::addAnnotation(QPoint screenPos)
 {
     if(m_page->canAddAndRemoveAnnotations())
     {
@@ -866,7 +866,7 @@
     }
 }
 
-void PageItem::showLinkContextMenu(Model::Link* link, const QPoint& screenPos)
+void PageItem::showLinkContextMenu(Model::Link* link, QPoint screenPos)
 {
     if(link->page == -1)
     {
@@ -890,7 +890,7 @@
     }
 }
 
-void PageItem::showAnnotationContextMenu(Model::Annotation* annotation, const QPoint& screenPos)
+void PageItem::showAnnotationContextMenu(Model::Annotation* annotation, QPoint screenPos)
 {
     if(m_page->canAddAndRemoveAnnotations())
     {

=== modified file 'sources/pageitem.h'
--- sources/pageitem.h	2016-03-20 12:54:12 +0000
+++ sources/pageitem.h	2017-04-19 21:02:47 +0000
@@ -91,8 +91,8 @@
     const QTransform& transform() const { return m_transform; }
     const QTransform& normalizedTransform() const { return m_normalizedTransform; }
 
-    QPointF sourcePos(const QPointF& point) const { return m_transform.inverted().map(point); }
-    QPointF normalizedSourcePos(const QPointF& point) const { return m_normalizedTransform.inverted().map(point); }
+    QPointF sourcePos(QPointF point) const { return m_transform.inverted().map(point); }
+    QPointF normalizedSourcePos(QPointF point) const { return m_normalizedTransform.inverted().map(point); }
 
 signals:
     void cropRectChanged();
@@ -105,7 +105,7 @@
     void rubberBandFinished();
 
     void zoomToSelection(int page, const QRectF& rect);
-    void openInSourceEditor(int page, const QPointF& pos);
+    void openInSourceEditor(int page, QPointF pos);
 
     void wasModified();
 
@@ -174,11 +174,11 @@
     RubberBandMode m_rubberBandMode;
     QRectF m_rubberBand;
 
-    void copyToClipboard(const QPoint& screenPos);
-    void addAnnotation(const QPoint& screenPos);
+    void copyToClipboard(QPoint screenPos);
+    void addAnnotation(QPoint screenPos);
 
-    void showLinkContextMenu(Model::Link* link, const QPoint& screenPos);
-    void showAnnotationContextMenu(Model::Annotation* annotation, const QPoint& screenPos);
+    void showLinkContextMenu(Model::Link* link, QPoint screenPos);
+    void showAnnotationContextMenu(Model::Annotation* annotation, QPoint screenPos);
 
     // overlay
 

=== modified file 'sources/pdfmodel.cpp'
--- sources/pdfmodel.cpp	2017-04-02 09:36:22 +0000
+++ sources/pdfmodel.cpp	2017-04-19 21:02:47 +0000
@@ -225,10 +225,46 @@
 typedef QSharedPointer< Poppler::TextBox > TextBox;
 typedef QList< TextBox > TextBoxList;
 
-QCache< const PdfPage*,  TextBoxList > textCache(1 << 12);
-QMutex textCacheMutex;
-
-#define LOCK_TEXT_CACHE QMutexLocker mutexLocker(&textCacheMutex);
+class TextCache
+{
+public:
+    TextCache() : m_mutex(), m_cache(1 << 12) {}
+
+    bool object(const PdfPage* page, TextBoxList& textBoxes) const
+    {
+        QMutexLocker mutexLocker(&m_mutex);
+
+        if(TextBoxList* const object = m_cache.object(page))
+        {
+            textBoxes = *object;
+
+            return true;
+        }
+
+        return false;
+    }
+
+    void insert(const PdfPage* page, const TextBoxList& textBoxes)
+    {
+        QMutexLocker mutexLocker(&m_mutex);
+
+        m_cache.insert(page, new TextBoxList(textBoxes), textBoxes.count());
+    }
+
+    void remove(const PdfPage* page)
+    {
+        QMutexLocker mutexLocker(&m_mutex);
+
+        m_cache.remove(page);
+    }
+
+private:
+    mutable QMutex m_mutex;
+    QCache< const PdfPage*, TextBoxList > m_cache;
+
+};
+
+Q_GLOBAL_STATIC(TextCache, textCache)
 
 namespace Defaults
 {
@@ -403,11 +439,7 @@
 
 PdfPage::~PdfPage()
 {
-    {
-        LOCK_TEXT_CACHE
-
-        textCache.remove(this);
-    }
+    textCache->remove(this);
 
     delete m_page;
 }
@@ -419,7 +451,7 @@
     return m_page->pageSizeF();
 }
 
-QImage PdfPage::render(qreal horizontalResolution, qreal verticalResolution, Rotation rotation, const QRect& boundingRect) const
+QImage PdfPage::render(qreal horizontalResolution, qreal verticalResolution, Rotation rotation, QRect boundingRect) const
 {
     LOCK_PAGE
 
@@ -540,21 +572,9 @@
 
 QString PdfPage::cachedText(const QRectF& rect) const
 {
-    bool wasCached = false;
     TextBoxList textBoxes;
 
-    {
-        LOCK_TEXT_CACHE
-
-        if(const TextBoxList* object = textCache.object(this))
-        {
-            wasCached = true;
-
-            textBoxes = *object;
-        }
-    }
-
-    if(!wasCached)
+    if(!textCache->object(this, textBoxes))
     {
         {
             LOCK_PAGE
@@ -565,9 +585,7 @@
             }
         }
 
-        LOCK_TEXT_CACHE
-
-        textCache.insert(this, new TextBoxList(textBoxes), textBoxes.count());
+        textCache->insert(this, textBoxes);
     }
 
     QString text;

=== modified file 'sources/pdfmodel.h'
--- sources/pdfmodel.h	2017-04-02 09:36:22 +0000
+++ sources/pdfmodel.h	2017-04-19 21:02:47 +0000
@@ -108,7 +108,7 @@
 
         QSizeF size() const;
 
-        QImage render(qreal horizontalResolution, qreal verticalResolution, Rotation rotation, const QRect& boundingRect) const;
+        QImage render(qreal horizontalResolution, qreal verticalResolution, Rotation rotation, QRect boundingRect) const;
 
         QString label() const;
 

=== modified file 'sources/psmodel.cpp'
--- sources/psmodel.cpp	2017-04-02 09:36:22 +0000
+++ sources/psmodel.cpp	2017-04-19 21:02:47 +0000
@@ -77,7 +77,7 @@
     return QSizeF(w, h);
 }
 
-QImage PsPage::render(qreal horizontalResolution, qreal verticalResolution, Rotation rotation, const QRect& boundingRect) const
+QImage PsPage::render(qreal horizontalResolution, qreal verticalResolution, Rotation rotation, QRect boundingRect) const
 {
     QMutexLocker mutexLocker(m_mutex);
 

=== modified file 'sources/psmodel.h'
--- sources/psmodel.h	2017-04-02 09:36:22 +0000
+++ sources/psmodel.h	2017-04-19 21:02:47 +0000
@@ -52,7 +52,7 @@
 
         QSizeF size() const;
 
-        QImage render(qreal horizontalResolution, qreal verticalResolution, Rotation rotation, const QRect& boundingRect) const;
+        QImage render(qreal horizontalResolution, qreal verticalResolution, Rotation rotation, QRect boundingRect) const;
 
     private:
         Q_DISABLE_COPY(PsPage)

=== modified file 'sources/recentlyclosedmenu.cpp'
--- sources/recentlyclosedmenu.cpp	2017-01-26 15:18:35 +0000
+++ sources/recentlyclosedmenu.cpp	2017-04-19 21:02:47 +0000
@@ -44,7 +44,7 @@
 {
     if(m_tabActionGroup->actions().count() >= m_count)
     {
-        QAction* first = m_tabActionGroup->actions().first();
+        QAction* first = m_tabActionGroup->actions().constFirst();
 
         removeAction(first);
         m_tabActionGroup->removeAction(first);
@@ -52,7 +52,7 @@
         first->parent()->deleteLater();
     }
 
-    insertAction(actions().first(), tabAction);
+    insertAction(actions().constFirst(), tabAction);
     m_tabActionGroup->addAction(tabAction);
 }
 

=== modified file 'sources/recentlyusedmenu.cpp'
--- sources/recentlyusedmenu.cpp	2017-01-26 15:18:35 +0000
+++ sources/recentlyusedmenu.cpp	2017-04-19 21:02:47 +0000
@@ -56,7 +56,7 @@
             removeAction(action);
             m_openActionGroup->removeAction(action);
 
-            insertAction(actions().first(), action);
+            insertAction(actions().constFirst(), action);
             m_openActionGroup->addAction(action);
 
             return;
@@ -65,7 +65,7 @@
 
     if(m_openActionGroup->actions().count() >= m_count)
     {
-        QAction* first = m_openActionGroup->actions().first();
+        QAction* first = m_openActionGroup->actions().constFirst();
 
         removeAction(first);
         m_openActionGroup->removeAction(first);
@@ -77,7 +77,7 @@
     action->setToolTip(fileInfo.absoluteFilePath());
     action->setData(fileInfo.absoluteFilePath());
 
-    insertAction(actions().first(), action);
+    insertAction(actions().constFirst(), action);
     m_openActionGroup->addAction(action);
 }
 

=== modified file 'sources/searchmodel.cpp'
--- sources/searchmodel.cpp	2015-05-04 16:33:33 +0000
+++ sources/searchmodel.cpp	2017-04-19 21:02:47 +0000
@@ -323,15 +323,21 @@
 
 void SearchModel::clearResults(DocumentView* view)
 {
-    foreach(const TextCacheKey& key, m_textWatchers.keys())
+    typedef QHash< TextCacheKey, TextWatcher* >::iterator WatcherIterator;
+
+    for(WatcherIterator iterator = m_textWatchers.begin(); iterator != m_textWatchers.end(); ++iterator)
     {
+        const TextCacheKey& key = iterator.key();
+
         if(key.first == view)
         {
-            TextWatcher* watcher = m_textWatchers.take(key);
-
+            TextWatcher* const watcher = iterator.value();
             watcher->cancel();
             watcher->waitForFinished();
             watcher->deleteLater();
+
+            iterator = m_textWatchers.erase(iterator);
+            continue;
         }
     }
 
@@ -343,7 +349,7 @@
         }
     }
 
-    const QList< DocumentView* >::iterator at = qBinaryFind(m_views.begin(), m_views.end(), view);
+    const QVector< DocumentView* >::iterator at = qBinaryFind(m_views.begin(), m_views.end(), view);
     const int row = at - m_views.begin();
 
     if(at == m_views.end())
@@ -408,7 +414,7 @@
 
 QModelIndex SearchModel::findView(DocumentView *view) const
 {
-    const QList< DocumentView* >::const_iterator at = qBinaryFind(m_views.constBegin(), m_views.constEnd(), view);
+    const QVector< DocumentView* >::const_iterator at = qBinaryFind(m_views.constBegin(), m_views.constEnd(), view);
     const int row = at - m_views.constBegin();
 
     if(at == m_views.constEnd())
@@ -421,14 +427,11 @@
 
 QModelIndex SearchModel::findOrInsertView(DocumentView* view)
 {
-    QList< DocumentView* >::iterator at = qBinaryFind(m_views.begin(), m_views.end(), view);
-    int row = at - m_views.begin();
+    const QVector< DocumentView* >::iterator at = qLowerBound(m_views.begin(), m_views.end(), view);
+    const int row = at - m_views.begin();
 
-    if(at == m_views.end())
+    if(at == m_views.end() || *at != view)
     {
-        at = qUpperBound(m_views.begin(), m_views.end(), view);
-        row = at - m_views.begin();
-
         beginInsertRows(QModelIndex(), row, row);
 
         m_views.insert(at, view);

=== modified file 'sources/searchmodel.h'
--- sources/searchmodel.h	2015-01-24 16:32:08 +0000
+++ sources/searchmodel.h	2017-04-19 21:02:47 +0000
@@ -95,7 +95,7 @@
     static SearchModel* s_instance;
     SearchModel(QObject* parent = 0);
 
-    QList< DocumentView* > m_views;
+    QVector< DocumentView* > m_views;
 
     QModelIndex findView(DocumentView* view) const;
     QModelIndex findOrInsertView(DocumentView* view);

=== modified file 'sources/settings.cpp'
--- sources/settings.cpp	2017-01-10 16:34:28 +0000
+++ sources/settings.cpp	2017-04-19 21:02:47 +0000
@@ -211,7 +211,7 @@
     return static_cast< Qt::KeyboardModifiers >(m_settings->value("pageItem/copyToClipboardModifiers", static_cast< int >(Defaults::PageItem::copyToClipboardModifiers())).toInt());
 }
 
-void Settings::PageItem::setCopyToClipboardModifiers(const Qt::KeyboardModifiers& modifiers)
+void Settings::PageItem::setCopyToClipboardModifiers(Qt::KeyboardModifiers modifiers)
 {
     m_settings->setValue("pageItem/copyToClipboardModifiers", static_cast< int >(modifiers));
 }
@@ -221,7 +221,7 @@
     return static_cast< Qt::KeyboardModifiers >(m_settings->value("pageItem/addAnnotationModifiers", static_cast< int >(Defaults::PageItem::addAnnotationModifiers())).toInt());
 }
 
-void Settings::PageItem::setAddAnnotationModifiers(const Qt::KeyboardModifiers& modifiers)
+void Settings::PageItem::setAddAnnotationModifiers(Qt::KeyboardModifiers modifiers)
 {
     m_settings->setValue("pageItem/addAnnotationModifiers", static_cast< int >(modifiers));
 }
@@ -231,7 +231,7 @@
     return static_cast< Qt::KeyboardModifiers>(m_settings->value("pageItem/zoomToSelectionModifiers", static_cast< int >(Defaults::PageItem::zoomToSelectionModifiers())).toInt());
 }
 
-void Settings::PageItem::setZoomToSelectionModifiers(const Qt::KeyboardModifiers& modifiers)
+void Settings::PageItem::setZoomToSelectionModifiers(Qt::KeyboardModifiers modifiers)
 {
     m_settings->setValue("pageItem/zoomToSelectionModifiers", static_cast< int >(modifiers));
 }
@@ -241,7 +241,7 @@
     return static_cast< Qt::KeyboardModifiers >(m_settings->value("pageItem/openInSourceEditorModifiers", static_cast< int >(Defaults::PageItem::openInSourceEditorModifiers())).toInt());
 }
 
-void Settings::PageItem::setOpenInSourceEditorModifiers(const Qt::KeyboardModifiers& modifiers)
+void Settings::PageItem::setOpenInSourceEditorModifiers(Qt::KeyboardModifiers modifiers)
 {
     m_settings->setValue("pageItem/openInSourceEditorModifiers", static_cast< int >(modifiers));
 }
@@ -523,7 +523,7 @@
     return static_cast< Qt::KeyboardModifiers >(m_settings->value("documentView/zoomModifiers", static_cast< int >(Defaults::DocumentView::zoomModifiers())).toInt());
 }
 
-void Settings::DocumentView::setZoomModifiers(const Qt::KeyboardModifiers& zoomModifiers)
+void Settings::DocumentView::setZoomModifiers(Qt::KeyboardModifiers zoomModifiers)
 {
     m_settings->setValue("documentView/zoomModifiers", static_cast< int >(zoomModifiers));
 }
@@ -533,7 +533,7 @@
     return static_cast< Qt::KeyboardModifiers >(m_settings->value("documentView/rotateModifiers", static_cast< int >(Defaults::DocumentView::rotateModifiers())).toInt());
 }
 
-void Settings::DocumentView::setRotateModifiers(const Qt::KeyboardModifiers& rotateModifiers)
+void Settings::DocumentView::setRotateModifiers(Qt::KeyboardModifiers rotateModifiers)
 {
     m_settings->setValue("documentView/rotateModifiers", static_cast< int >(rotateModifiers));
 }
@@ -543,7 +543,7 @@
     return static_cast< Qt::KeyboardModifiers >(m_settings->value("documentView/scrollModifiers", static_cast< int >(Defaults::DocumentView::scrollModifiers())).toInt());
 }
 
-void Settings::DocumentView::setScrollModifiers(const Qt::KeyboardModifiers& scrollModifiers)
+void Settings::DocumentView::setScrollModifiers(Qt::KeyboardModifiers scrollModifiers)
 {
     m_settings->setValue("documentView/scrollModifiers", static_cast< int >(scrollModifiers));
 }
@@ -863,7 +863,7 @@
 
 void Settings::MainWindow::setExtendedSearchDock(bool extendedSearchDock)
 {
-    return m_settings->setValue("mainWindow/extendedSearchDock", extendedSearchDock);
+    m_settings->setValue("mainWindow/extendedSearchDock", extendedSearchDock);
 }
 
 bool Settings::MainWindow::usePageLabel() const
@@ -886,6 +886,16 @@
     m_settings->setValue("mainWindow/synchronizeOutlineView", synchronizeOutlineView);
 }
 
+bool Settings::MainWindow::synchronizeSplitViews() const
+{
+    return m_settings->value("mainWindow/synchronizeSplitViews", Defaults::MainWindow::synchronizeSplitViews()).toBool();
+}
+
+void Settings::MainWindow::setSynchronizeSplitViews(bool synchronizeSplitViews)
+{
+    m_settings->setValue("mainWindow/synchronizeSplitViews", synchronizeSplitViews);
+}
+
 QStringList Settings::MainWindow::fileToolBar() const
 {
     return m_settings->value("mainWindow/fileToolBar", Defaults::MainWindow::fileToolBar()).toStringList();
@@ -1026,32 +1036,32 @@
     m_settings->setValue("mainWindow/savePath", savePath);
 }
 
-QSize Settings::MainWindow::settingsDialogSize(const QSize& sizeHint) const
+QSize Settings::MainWindow::settingsDialogSize(QSize sizeHint) const
 {
     return m_settings->value("mainWindow/settingsDialogSize", sizeHint).toSize();
 }
 
-void Settings::MainWindow::setSettingsDialogSize(const QSize& settingsDialogSize)
+void Settings::MainWindow::setSettingsDialogSize(QSize settingsDialogSize)
 {
     m_settings->setValue("mainWindow/settingsDialogSize", settingsDialogSize);
 }
 
-QSize Settings::MainWindow::fontsDialogSize(const QSize& sizeHint) const
+QSize Settings::MainWindow::fontsDialogSize(QSize sizeHint) const
 {
     return m_settings->value("mainWindow/fontsDialogSize", sizeHint).toSize();
 }
 
-void Settings::MainWindow::setFontsDialogSize(const QSize& fontsDialogSize)
+void Settings::MainWindow::setFontsDialogSize(QSize fontsDialogSize)
 {
     m_settings->setValue("mainWindow/fontsDialogSize", fontsDialogSize);
 }
 
-QSize Settings::MainWindow::contentsDialogSize(const QSize& sizeHint) const
+QSize Settings::MainWindow::contentsDialogSize(QSize sizeHint) const
 {
     return m_settings->value("mainWindow/contentsDialogSize", sizeHint).toSize();
 }
 
-void Settings::MainWindow::setContentsDialogSize(const QSize& contentsDialogSize)
+void Settings::MainWindow::setContentsDialogSize(QSize contentsDialogSize)
 {
     m_settings->setValue("mainWindow/contentsDialogSize", contentsDialogSize);
 }

=== modified file 'sources/settings.h'
--- sources/settings.h	2017-01-10 16:34:28 +0000
+++ sources/settings.h	2017-04-19 21:02:47 +0000
@@ -95,16 +95,16 @@
         void setAnnotationColor(const QColor& annotationColor);
 
         Qt::KeyboardModifiers copyToClipboardModifiers() const;
-        void setCopyToClipboardModifiers(const Qt::KeyboardModifiers& modifiers);
+        void setCopyToClipboardModifiers(Qt::KeyboardModifiers modifiers);
 
         Qt::KeyboardModifiers addAnnotationModifiers() const;
-        void setAddAnnotationModifiers(const Qt::KeyboardModifiers& modifiers);
+        void setAddAnnotationModifiers(Qt::KeyboardModifiers modifiers);
 
         Qt::KeyboardModifiers zoomToSelectionModifiers() const;
-        void setZoomToSelectionModifiers(const Qt::KeyboardModifiers& modifiers);
+        void setZoomToSelectionModifiers(Qt::KeyboardModifiers modifiers);
 
         Qt::KeyboardModifiers openInSourceEditorModifiers() const;
-        void setOpenInSourceEditorModifiers(const Qt::KeyboardModifiers& modifiers);
+        void setOpenInSourceEditorModifiers(Qt::KeyboardModifiers modifiers);
 
         bool annotationOverlay() const;
         void setAnnotationOverlay(bool overlay);
@@ -228,13 +228,13 @@
         void setSourceEditor(const QString& sourceEditor);
 
         Qt::KeyboardModifiers zoomModifiers() const;
-        void setZoomModifiers(const Qt::KeyboardModifiers& zoomModifiers);
+        void setZoomModifiers(Qt::KeyboardModifiers zoomModifiers);
 
         Qt::KeyboardModifiers rotateModifiers() const;
-        void setRotateModifiers(const Qt::KeyboardModifiers& rotateModifiers);
+        void setRotateModifiers(Qt::KeyboardModifiers rotateModifiers);
 
         Qt::KeyboardModifiers scrollModifiers() const;
-        void setScrollModifiers(const Qt::KeyboardModifiers& scrollModifiers);
+        void setScrollModifiers(Qt::KeyboardModifiers scrollModifiers);
 
         // per-tab settings
 
@@ -361,6 +361,9 @@
         bool synchronizeOutlineView() const;
         void setSynchronizeOutlineView(bool synchronizeOutlineView);
 
+        bool synchronizeSplitViews() const;
+        void setSynchronizeSplitViews(bool synchronizeSplitViews);
+
         QStringList fileToolBar() const;
         void setFileToolBar(const QStringList& fileToolBar);
 
@@ -403,14 +406,14 @@
         QString savePath() const;
         void setSavePath(const QString& savePath);
 
-        QSize settingsDialogSize(const QSize& sizeHint) const;
-        void setSettingsDialogSize(const QSize& settingsDialogSize);
-
-        QSize fontsDialogSize(const QSize& sizeHint) const;
-        void setFontsDialogSize(const QSize& fontsDialogSize);
-
-        QSize contentsDialogSize(const QSize& sizeHint) const;
-        void setContentsDialogSize(const QSize& contentsDialogSize);
+        QSize settingsDialogSize(QSize sizeHint) const;
+        void setSettingsDialogSize(QSize settingsDialogSize);
+
+        QSize fontsDialogSize(QSize sizeHint) const;
+        void setFontsDialogSize(QSize fontsDialogSize);
+
+        QSize contentsDialogSize(QSize sizeHint) const;
+        void setContentsDialogSize(QSize contentsDialogSize);
 
     private:
         MainWindow(QSettings* settings);
@@ -640,13 +643,14 @@
         static bool usePageLabel() { return true; }
 
         static bool synchronizeOutlineView() { return false; }
+        static bool synchronizeSplitViews() { return true; }
 
         static QStringList fileToolBar() { return QStringList() << "openInNewTab" << "refresh"; }
         static QStringList editToolBar() { return QStringList() << "currentPage" << "previousPage" << "nextPage"; }
         static QStringList viewToolBar() { return QStringList() << "scaleFactor" << "zoomIn" << "zoomOut"; }
 
         static QStringList documentContextMenu() { return QStringList() << "previousPage" << "nextPage" << "firstPage" << "lastPage" << "separator" << "jumpToPage" << "jumpBackward" << "jumpForward" << "separator" << "setFirstPage" << "separator" << "findPrevious" << "findNext" << "cancelSearch"; }
-        static QStringList tabContexntMenu() { return QStringList() << "openCopyInNewTab" << "openContainingFolder" << "separator" << "closeAllTabs" << "closeAllTabsButThisOne" << "closeAllTabsToTheLeft" << "closeAllTabsToTheRight"; }
+        static QStringList tabContexntMenu() { return QStringList() << "openCopyInNewTab" << "openContainingFolder" << "separator" << "splitViewHorizontally" << "splitViewVertically" << "closeCurrentView" << "separator" << "closeAllTabs" << "closeAllTabsButThisOne" << "closeAllTabsToTheLeft" << "closeAllTabsToTheRight"; }
 
         static bool scrollableMenus() { return false; }
         static bool searchableMenus() { return false; }

=== modified file 'sources/settingsdialog.cpp'
--- sources/settingsdialog.cpp	2017-01-10 16:34:28 +0000
+++ sources/settingsdialog.cpp	2017-04-19 21:02:47 +0000
@@ -78,7 +78,7 @@
     return color.isValid() ? color : defaultColor;
 }
 
-void setCurrentIndexFromKeyboardModifiers(QComboBox* comboBox, const Qt::KeyboardModifiers& modifiers)
+void setCurrentIndexFromKeyboardModifiers(QComboBox* comboBox, Qt::KeyboardModifiers modifiers)
 {
     comboBox->setCurrentIndex(comboBox->findData(static_cast< int >(modifiers)));
 }
@@ -288,6 +288,9 @@
     m_synchronizeOutlineViewCheckBox = addCheckBox(m_behaviorLayout, tr("Synchronize outline view:"), QString(),
                                                    s_settings->mainWindow().synchronizeOutlineView());
 
+    m_synchronizeSplitViewsCheckBox = addCheckBox(m_behaviorLayout, tr("Synchronize split views:"), QString(),
+                                                  s_settings->mainWindow().synchronizeSplitViews());
+
 
     m_minimalScrollingCheckBox = addCheckBox(m_behaviorLayout, tr("Minimal scrolling:"), QString(),
                                              s_settings->documentView().minimalScrolling());
@@ -331,6 +334,7 @@
     s_settings->presentationView().setScreen(m_presentationScreenSpinBox->value());
 
     s_settings->mainWindow().setSynchronizeOutlineView(m_synchronizeOutlineViewCheckBox->isChecked());
+    s_settings->mainWindow().setSynchronizeSplitViews(m_synchronizeSplitViewsCheckBox->isChecked());
 
     s_settings->documentView().setMinimalScrolling(m_minimalScrollingCheckBox->isChecked());
     s_settings->documentView().setZoomFactor(m_zoomFactorSpinBox->value());
@@ -361,6 +365,7 @@
     m_presentationScreenSpinBox->setValue(Defaults::PresentationView::screen());
 
     m_synchronizeOutlineViewCheckBox->setChecked(Defaults::MainWindow::synchronizeOutlineView());
+    m_synchronizeSplitViewsCheckBox->setChecked(Defaults::MainWindow::synchronizeSplitViews());
 
     m_minimalScrollingCheckBox->setChecked(Defaults::DocumentView::minimalScrolling());
     m_zoomFactorSpinBox->setValue(Defaults::DocumentView::zoomFactor());
@@ -849,7 +854,7 @@
     return comboBox;
 }
 
-QComboBox* SettingsDialog::addModifiersComboBox(QFormLayout* layout, const QString& label, const QString& toolTip, const Qt::KeyboardModifiers& modifiers)
+QComboBox* SettingsDialog::addModifiersComboBox(QFormLayout* layout, const QString& label, const QString& toolTip, Qt::KeyboardModifiers modifiers)
 {
     QComboBox* comboBox = new QComboBox(this);
     comboBox->addItem(QShortcut::tr("Shift"), static_cast< int >(Qt::ShiftModifier));

=== modified file 'sources/settingsdialog.h'
--- sources/settingsdialog.h	2017-01-10 16:34:28 +0000
+++ sources/settingsdialog.h	2017-04-19 21:02:47 +0000
@@ -102,6 +102,7 @@
     QSpinBox* m_presentationScreenSpinBox;
 
     QCheckBox* m_synchronizeOutlineViewCheckBox;
+    QCheckBox* m_synchronizeSplitViewsCheckBox;
 
     QCheckBox* m_minimalScrollingCheckBox;
     QDoubleSpinBox* m_zoomFactorSpinBox;
@@ -212,7 +213,7 @@
     QComboBox* addComboBox(QFormLayout* layout, const QString& label, const QString& toolTip, const QStringList& text, const QList< int >& data, int value);
     QComboBox* addDataSizeComboBox(QFormLayout* layout, const QString& label, const QString& toolTip, int initialDataSize);
     QComboBox* addColorComboBox(QFormLayout* layout, const QString& label, const QString& toolTip, const QColor& color);
-    QComboBox* addModifiersComboBox(QFormLayout* layout, const QString& label, const QString& toolTip, const Qt::KeyboardModifiers& modifiers);
+    QComboBox* addModifiersComboBox(QFormLayout* layout, const QString& label, const QString& toolTip, Qt::KeyboardModifiers modifiers);
 
 };
 

=== modified file 'sources/tileitem.cpp'
--- sources/tileitem.cpp	2016-11-26 18:32:17 +0000
+++ sources/tileitem.cpp	2017-04-19 21:02:47 +0000
@@ -84,7 +84,7 @@
 
 void TileItem::dropCachedPixmaps(PageItem* page)
 {
-    foreach(CacheKey key, s_cache.keys())
+    foreach(const CacheKey& key, s_cache.keys())
     {
         if(key.first == page)
         {
@@ -93,7 +93,7 @@
     }
 }
 
-bool TileItem::paint(QPainter* painter, const QPointF& topLeft)
+bool TileItem::paint(QPainter* painter, QPointF topLeft)
 {
     const QPixmap& pixmap = takePixmap();
 
@@ -201,8 +201,8 @@
 }
 
 void TileItem::on_finished(const RenderParam& renderParam,
-                             const QRect& rect, bool prefetch,
-                             const QImage& image, const QRectF& cropRect)
+                           const QRect& rect, bool prefetch,
+                           const QImage& image, const QRectF& cropRect)
 {
     if(m_page->m_renderParam != renderParam || m_rect != rect)
     {

=== modified file 'sources/tileitem.h'
--- sources/tileitem.h	2016-11-26 18:32:17 +0000
+++ sources/tileitem.h	2017-04-19 21:02:47 +0000
@@ -40,7 +40,7 @@
     ~TileItem();
 
     const QRect& rect() const { return m_rect; }
-    void setRect(const QRect& rect) { m_rect = rect; }
+    void setRect(QRect rect) { m_rect = rect; }
 
     const QRectF& cropRect() const { return m_cropRect; }
     void resetCropRect() { m_cropRect = QRectF(); }
@@ -51,7 +51,7 @@
 
     static void dropCachedPixmaps(PageItem* page);
 
-    bool paint(QPainter* painter, const QPointF& topLeft);
+    bool paint(QPainter* painter, QPointF topLeft);
 
 public:
     void refresh(bool keepObsoletePixmaps = false);