Skip to content

Commit 2c58526

Browse files
committed
fix(app): scope pause-sorting PR to issue #86 only
Remove two-page spread order menu action and handler that belong in the P0 bundle (#133 / #62). Fixes CI build after rebase on master.
1 parent 3077cea commit 2c58526

2 files changed

Lines changed: 0 additions & 29 deletions

File tree

src/app/MainWindow.cpp

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -308,7 +308,6 @@ MainWindow::MainWindow()
308308
});
309309

310310
connect(actionFixDpi, SIGNAL(triggered(bool)), SLOT(fixDpiDialogRequested()));
311-
connect(actionReverseTwoPageOrder, SIGNAL(triggered(bool)), SLOT(toggleTwoPageSpreadReadingOrder()));
312311
connect(actionRelinking, SIGNAL(triggered(bool)), SLOT(showRelinkingDialog()));
313312
#ifdef ENABLE_DEBUG_FEATURES
314313
connect(actionDebug, SIGNAL(toggled(bool)), SLOT(debugToggled(bool)));
@@ -1053,18 +1052,6 @@ void MainWindow::pageContextMenuRequested(const PageInfo& pageInfo_, const QPoin
10531052
}
10541053
} // MainWindow::pageContextMenuRequested
10551054

1056-
void MainWindow::toggleTwoPageSpreadReadingOrder() {
1057-
if (!isProjectLoaded() || !m_pages) {
1058-
return;
1059-
}
1060-
const Qt::LayoutDirection nextDir
1061-
= (m_pages->layoutDirection() == Qt::LeftToRight) ? Qt::RightToLeft : Qt::LeftToRight;
1062-
m_pages->setLayoutDirection(nextDir);
1063-
m_outFileNameGen.setLayoutDirection(nextDir);
1064-
resetThumbSequence(currentPageOrderProvider(), ThumbnailSequence::KEEP_SELECTION);
1065-
invalidateAllThumbnails();
1066-
}
1067-
10681055
void MainWindow::pastLastPageContextMenuRequested(const QPoint& screenPos) {
10691056
if (!isProjectLoaded()) {
10701057
return;
@@ -1608,7 +1595,6 @@ void MainWindow::updateProjectActions() {
16081595
actionSaveProjectAs->setEnabled(loaded);
16091596
actionFixDpi->setEnabled(loaded);
16101597
actionRelinking->setEnabled(loaded);
1611-
actionReverseTwoPageOrder->setEnabled(loaded);
16121598
}
16131599

16141600
bool MainWindow::isBatchProcessingInProgress() const {

src/app/MainWindow.ui

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,6 @@
7575
</widget>
7676
<addaction name="actionFixDpi"/>
7777
<addaction name="actionRelinking"/>
78-
<addaction name="actionReverseTwoPageOrder"/>
7978
<addaction name="separator"/>
8079
<addaction name="actionDebug"/>
8180
<addaction name="separator"/>
@@ -1271,20 +1270,6 @@ QToolButton:pressed {
12711270
<bool>false</bool>
12721271
</property>
12731272
</action>
1274-
<action name="actionReverseTwoPageOrder">
1275-
<property name="text">
1276-
<string>Reverse two-page spread order</string>
1277-
</property>
1278-
<property name="toolTip">
1279-
<string>Swap left/right page order for two-page scans (e.g. Japanese book reading order).</string>
1280-
</property>
1281-
<property name="shortcut">
1282-
<string notr="true"/>
1283-
</property>
1284-
<property name="autoRepeat">
1285-
<bool>false</bool>
1286-
</property>
1287-
</action>
12881273
<action name="actionSwitchFilter1">
12891274
<property name="text">
12901275
<string>Switch filter to orientation</string>

0 commit comments

Comments
 (0)