Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 20 additions & 2 deletions src/app/MainWindow.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
#include <QDir>
#include <QFileDialog>
#include <QFileSystemModel>
#include <QMenu>
#include <QMessageBox>
#include <QResource>
#include <QScrollBar>
Expand Down Expand Up @@ -295,6 +296,12 @@ MainWindow::MainWindow()
});
connect(sortingOrderBtn, &QToolButton::clicked, this,
[this](bool) { pageOrderingChanged(m_stages->filterAt(m_curFilter)->selectedPageOrder()); });
connect(pauseSortingBtn, &QToolButton::toggled, this, [this](bool) {
if (!isProjectLoaded()) {
return;
}
resetThumbSequence(currentPageOrderProvider(), ThumbnailSequence::KEEP_SELECTION);
});
connect(deviationHighlightingBtn, &QToolButton::clicked, this, [this, &settings](bool checked) {
settings.setHighlightDeviationEnabled(checked);
m_thumbSequence->invalidateAllThumbnails();
Expand Down Expand Up @@ -599,6 +606,10 @@ bool MainWindow::compareFiles(const QString& fpath1, const QString& fpath2) {
}

std::shared_ptr<const PageOrderProvider> MainWindow::currentPageOrderProvider() const {
if (pauseSortingBtn->isChecked()) {
return nullptr;
}

const int idx = sortOptions->currentIndex();
if (idx < 0) {
return nullptr;
Expand All @@ -623,6 +634,11 @@ void MainWindow::updateSortOptions() {

sortOptions->setVisible(sortOptions->count() > 0);

pauseSortingBtn->setEnabled(sortOptions->count() > 0);
if (sortOptions->count() == 0) {
pauseSortingBtn->setChecked(false);
}

if (sortOptions->count() > 0) {
sortOptions->setCurrentIndex(filter->selectedPageOrder());
}
Expand Down Expand Up @@ -1015,7 +1031,8 @@ void MainWindow::pageContextMenuRequested(const PageInfo& pageInfo_, const QPoin
goToPage(pageInfo.id());
}

QMenu menu;
// Parent widget helps correct multi-monitor placement (issue #75).
QMenu menu(thumbView);

auto& iconProvider = IconProvider::getInstance();
QAction* insBefore = menu.addAction(iconProvider.getIcon("insert-before"), tr("Insert before ..."));
Expand All @@ -1040,7 +1057,7 @@ void MainWindow::pastLastPageContextMenuRequested(const QPoint& screenPos) {
return;
}

QMenu menu;
QMenu menu(thumbView);
menu.addAction(IconProvider::getInstance().getIcon("insert-here"), tr("Insert here ..."));

if (menu.exec(screenPos)) {
Expand Down Expand Up @@ -2156,6 +2173,7 @@ void MainWindow::setupIcons() {
gotoPageBtn->setIcon(iconProvider.getIcon("right-pointing"));
selectionModeBtn->setIcon(iconProvider.getIcon("checkbox-styled"));
thumbColumnViewBtn->setIcon(iconProvider.getIcon("column-view"));
pauseSortingBtn->setIcon(iconProvider.getIcon("stop"));
sortingOrderBtn->setIcon(iconProvider.getIcon("sorting-order"));
deviationHighlightingBtn->setIcon(iconProvider.getIcon("six-spoked-asterisk"));
diminishThumbnailsBtn->setIcon(iconProvider.getIcon("diminishing-glass"));
Expand Down
56 changes: 56 additions & 0 deletions src/app/MainWindow.ui
Original file line number Diff line number Diff line change
Expand Up @@ -713,6 +713,62 @@ QToolButton:pressed {
</property>
</widget>
</item>
<item>
<widget class="QToolButton" name="pauseSortingBtn">
<property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize">
<size>
<width>22</width>
<height>22</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>22</width>
<height>22</height>
</size>
</property>
<property name="toolTip">
<string>Pause automatic thumbnail reordering while thumbnails refresh.</string>
</property>
<property name="styleSheet">
<string notr="true">QToolButton:!hover {
padding: 0;
border: none;
background-color: transparent;
}

QToolButton:hover {
padding: 0;
border: 1px solid palette(highlight);
background-color: palette(base);
}

QToolButton:pressed {
padding: 0;
border: 1px solid palette(highlight);
background-color: palette(alternative-base);
}</string>
</property>
<property name="text">
<string notr="true"/>
</property>
<property name="iconSize">
<size>
<width>16</width>
<height>16</height>
</size>
</property>
<property name="checkable">
<bool>true</bool>
</property>
</widget>
</item>
<item>
<widget class="QToolButton" name="sortingOrderBtn">
<property name="sizePolicy">
Expand Down