remove redundant "View" menu
This commit is contained in:
@ -207,9 +207,7 @@ ImageViewer::ImageViewer(const QString &fileName, LammpsWrapper *_lammps, QWidge
|
|||||||
resize(image.width() + 20, image.height() + 50);
|
resize(image.width() + 20, image.height() + 50);
|
||||||
|
|
||||||
scrollArea->setVisible(true);
|
scrollArea->setVisible(true);
|
||||||
fitToWindowAct->setEnabled(true);
|
|
||||||
updateActions();
|
updateActions();
|
||||||
if (!fitToWindowAct->isChecked()) imageLabel->adjustSize();
|
|
||||||
setLayout(mainLayout);
|
setLayout(mainLayout);
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -464,30 +462,6 @@ void ImageViewer::saveAs()
|
|||||||
|
|
||||||
void ImageViewer::copy() {}
|
void ImageViewer::copy() {}
|
||||||
|
|
||||||
void ImageViewer::zoomIn()
|
|
||||||
{
|
|
||||||
scaleImage(1.25);
|
|
||||||
}
|
|
||||||
|
|
||||||
void ImageViewer::zoomOut()
|
|
||||||
{
|
|
||||||
scaleImage(0.8);
|
|
||||||
}
|
|
||||||
|
|
||||||
void ImageViewer::normalSize()
|
|
||||||
{
|
|
||||||
imageLabel->adjustSize();
|
|
||||||
scaleFactor = 1.0;
|
|
||||||
}
|
|
||||||
|
|
||||||
void ImageViewer::fitToWindow()
|
|
||||||
{
|
|
||||||
bool fitToWindow = fitToWindowAct->isChecked();
|
|
||||||
scrollArea->setWidgetResizable(fitToWindow);
|
|
||||||
if (!fitToWindow) normalSize();
|
|
||||||
updateActions();
|
|
||||||
}
|
|
||||||
|
|
||||||
void ImageViewer::saveFile(const QString &fileName)
|
void ImageViewer::saveFile(const QString &fileName)
|
||||||
{
|
{
|
||||||
if (!fileName.isEmpty()) image.save(fileName);
|
if (!fileName.isEmpty()) image.save(fileName);
|
||||||
@ -509,39 +483,12 @@ void ImageViewer::createActions()
|
|||||||
QAction *exitAct = fileMenu->addAction("&Close", this, &QWidget::close);
|
QAction *exitAct = fileMenu->addAction("&Close", this, &QWidget::close);
|
||||||
exitAct->setIcon(QIcon(":/window-close.png"));
|
exitAct->setIcon(QIcon(":/window-close.png"));
|
||||||
exitAct->setShortcut(QKeySequence::fromString("Ctrl+W"));
|
exitAct->setShortcut(QKeySequence::fromString("Ctrl+W"));
|
||||||
|
|
||||||
QMenu *viewMenu = menuBar->addMenu("&View");
|
|
||||||
|
|
||||||
zoomInAct = viewMenu->addAction("Image Zoom &In (25%)", this, &ImageViewer::zoomIn);
|
|
||||||
zoomInAct->setShortcut(QKeySequence::ZoomIn);
|
|
||||||
zoomInAct->setIcon(QIcon(":/gtk-zoom-in.png"));
|
|
||||||
zoomInAct->setEnabled(false);
|
|
||||||
|
|
||||||
zoomOutAct = viewMenu->addAction("Image Zoom &Out (25%)", this, &ImageViewer::zoomOut);
|
|
||||||
zoomOutAct->setShortcut(QKeySequence::ZoomOut);
|
|
||||||
zoomOutAct->setIcon(QIcon(":/gtk-zoom-out.png"));
|
|
||||||
zoomOutAct->setEnabled(false);
|
|
||||||
|
|
||||||
normalSizeAct = viewMenu->addAction("&Reset Image Size", this, &ImageViewer::normalSize);
|
|
||||||
normalSizeAct->setShortcut(QKeySequence::fromString("Ctrl+0"));
|
|
||||||
normalSizeAct->setIcon(QIcon(":/gtk-zoom-fit.png"));
|
|
||||||
normalSizeAct->setEnabled(false);
|
|
||||||
|
|
||||||
viewMenu->addSeparator();
|
|
||||||
|
|
||||||
fitToWindowAct = viewMenu->addAction("&Fit to Window", this, &ImageViewer::fitToWindow);
|
|
||||||
fitToWindowAct->setEnabled(false);
|
|
||||||
fitToWindowAct->setCheckable(true);
|
|
||||||
fitToWindowAct->setShortcut(QKeySequence::fromString("Ctrl+="));
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void ImageViewer::updateActions()
|
void ImageViewer::updateActions()
|
||||||
{
|
{
|
||||||
saveAsAct->setEnabled(!image.isNull());
|
saveAsAct->setEnabled(!image.isNull());
|
||||||
copyAct->setEnabled(!image.isNull());
|
copyAct->setEnabled(!image.isNull());
|
||||||
zoomInAct->setEnabled(!fitToWindowAct->isChecked());
|
|
||||||
zoomOutAct->setEnabled(!fitToWindowAct->isChecked());
|
|
||||||
normalSizeAct->setEnabled(!fitToWindowAct->isChecked());
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void ImageViewer::scaleImage(double factor)
|
void ImageViewer::scaleImage(double factor)
|
||||||
@ -555,8 +502,6 @@ void ImageViewer::scaleImage(double factor)
|
|||||||
|
|
||||||
adjustScrollBar(scrollArea->horizontalScrollBar(), factor);
|
adjustScrollBar(scrollArea->horizontalScrollBar(), factor);
|
||||||
adjustScrollBar(scrollArea->verticalScrollBar(), factor);
|
adjustScrollBar(scrollArea->verticalScrollBar(), factor);
|
||||||
zoomInAct->setEnabled(scaleFactor < 3.0);
|
|
||||||
zoomOutAct->setEnabled(scaleFactor > 0.333);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void ImageViewer::adjustScrollBar(QScrollBar *scrollBar, double factor)
|
void ImageViewer::adjustScrollBar(QScrollBar *scrollBar, double factor)
|
||||||
|
|||||||
@ -40,10 +40,6 @@ public:
|
|||||||
private slots:
|
private slots:
|
||||||
void saveAs();
|
void saveAs();
|
||||||
void copy();
|
void copy();
|
||||||
void zoomIn();
|
|
||||||
void zoomOut();
|
|
||||||
void normalSize();
|
|
||||||
void fitToWindow();
|
|
||||||
|
|
||||||
void edit_size();
|
void edit_size();
|
||||||
void reset_view();
|
void reset_view();
|
||||||
|
|||||||
Reference in New Issue
Block a user