Skip to content

Commit 66b810b

Browse files
authored
make menu entries Show embedded PDF large/small consistent (#3931)
1 parent 1755c72 commit 66b810b

File tree

3 files changed

+17
-4
lines changed

3 files changed

+17
-4
lines changed

src/pdfviewer/PDFDocument.cpp

-1
Original file line numberDiff line numberDiff line change
@@ -2880,7 +2880,6 @@ PDFDocument::PDFDocument(PDFDocumentConfig *const pdfConfig, bool embedded)
28802880
if (embeddedMode && globalConfig->autoHideToolbars) {
28812881
setAutoHideToolbars(true);
28822882
}
2883-
28842883
}
28852884

28862885
PDFDocument::~PDFDocument()

src/texstudio.cpp

+16-3
Original file line numberDiff line numberDiff line change
@@ -1403,9 +1403,10 @@ void Texstudio::setupMenus()
14031403
}
14041404
}
14051405

1406-
newManagedAction(menu, "enlargePDF", tr("Show embedded PDF large"), SLOT(enlargeEmbeddedPDFViewer()));
1407-
newManagedAction(menu, "shrinkPDF", tr("Show embedded PDF small"), SLOT(shrinkEmbeddedPDFViewer()));
1408-
1406+
act=newManagedAction(menu, "enlargePDF", tr("Show embedded PDF large"), SLOT(enlargeEmbeddedPDFViewer()));
1407+
act->setEnabled(false);
1408+
act=newManagedAction(menu, "shrinkPDF", tr("Show embedded PDF small"), SLOT(shrinkEmbeddedPDFViewer()));
1409+
act->setEnabled(false);
14091410
newManagedAction(menu, "closeelement", tr("Close Element"), SLOT(viewCloseElement()), Qt::Key_Escape);
14101411

14111412
menu->addSeparator();
@@ -6215,6 +6216,7 @@ void Texstudio::runInternalPdfViewer(const QFileInfo &master, const QString &opt
62156216
viewer->setStateEnlarged(true);
62166217
centralVSplitter->hide();
62176218
}
6219+
setEnabledMenusEnlargeShrink(viewer->embeddedMode && !configManager.viewerEnlarged, viewer->embeddedMode && configManager.viewerEnlarged);
62186220

62196221
if (preserveDuplicates) break;
62206222
}
@@ -7739,6 +7741,7 @@ void Texstudio::pdfClosed()
77397741
PDFDocument *from = qobject_cast<PDFDocument *>(sender());
77407742
if (from) {
77417743
if (from->embeddedMode) {
7744+
setEnabledMenusEnlargeShrink(false, false);
77427745
shrinkEmbeddedPDFViewer(true);
77437746
QList<int> sz = mainHSplitter->sizes(); // set widths to 50%, eventually restore user setting
77447747
int sum = 0;
@@ -11379,6 +11382,7 @@ void Texstudio::enlargeEmbeddedPDFViewer()
1137911382
enlargedViewer=true;
1138011383
pdfConfig->followFromScroll=false;
1138111384
viewer->setStateEnlarged(true);
11385+
setEnabledMenusEnlargeShrink(false, true);
1138211386
#endif
1138311387
}
1138411388
/*!
@@ -11403,11 +11407,20 @@ void Texstudio::shrinkEmbeddedPDFViewer(bool preserveConfig)
1140311407
enlargedViewer=false;
1140411408
}
1140511409
viewer->setStateEnlarged(false);
11410+
setEnabledMenusEnlargeShrink(true, false);
1140611411
#else
1140711412
Q_UNUSED(preserveConfig)
1140811413
#endif
1140911414
}
1141011415

11416+
void Texstudio::setEnabledMenusEnlargeShrink(bool enabledEnlarge, bool enabledShrink)
11417+
{
11418+
QAction *act=configManager.getManagedAction("main/view/enlargePDF");
11419+
act->setEnabled(enabledEnlarge);
11420+
act=configManager.getManagedAction("main/view/shrinkPDF");
11421+
act->setEnabled(enabledShrink);
11422+
}
11423+
1141111424
void Texstudio::showStatusbar()
1141211425
{
1141311426
QAction *act = qobject_cast<QAction *>(sender());

src/texstudio.h

+1
Original file line numberDiff line numberDiff line change
@@ -560,6 +560,7 @@ protected slots:
560560
void focusViewer();
561561
void enlargeEmbeddedPDFViewer();
562562
void shrinkEmbeddedPDFViewer(bool preserveConfig = false);
563+
void setEnabledMenusEnlargeShrink(bool enabledEnlarge, bool enabledShrink);
563564

564565
void showStatusbar();
565566
void viewCloseElement();

0 commit comments

Comments
 (0)