anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-29 05:01:49 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Toom value: back to QLabel, this time with custom context menu

Browse Source
This commit is contained in:
Juergen Spitzmueller 2021-03-14 12:03:42 +01:00
parent f3365a8fa9
commit d29d2f48fd
2 changed files with 26 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/frontends/qt/GuiView.cpp
View File

@ -672,29 +672,29 @@ GuiView::GuiView(int id)
connect(zoom_in_, SIGNAL(clicked()), this, SLOT(zoomInPressed()));
connect(zoom_out_, SIGNAL(clicked()), this, SLOT(zoomOutPressed()));
zoom_value_ = new QToolButton(statusBar());
zoom_value_->setToolButtonStyle(Qt::ToolButtonTextOnly);
zoom_value_->setAutoRaise(true);
zoom_value_->setPopupMode(QToolButton::InstantPopup);
zoom_value_ = new QLabel(statusBar());
zoom_value_->setFixedHeight(fm.height());
// Get sensible minimum width to heep the size constant
zoom_value_->setText(toqstr("000%"));
int const mw = zoom_value_->width();
zoom_value_->setMinimumWidth(mw);
#if (QT_VERSION >= QT_VERSION_CHECK(5, 11, 0))
zoom_value_->setMinimumWidth(fm.horizontalAdvance("000%"));
#else
zoom_value_->setMinimumWidth(fm.width("000%"));
#endif
zoom_value_->setText(toqstr(bformat(_("[[ZOOM]]%1$d%"), zoom)));
statusBar()->addPermanentWidget(zoom_value_);
zoom_value_->setEnabled(currentBufferView());
zoom_value_->setContextMenuPolicy(Qt::CustomContextMenu);
ZoomMenu * zoom_menu = new ZoomMenu(statusBar());
act_zoom_default_ = new QAction(toqstr(bformat(_("&Reset to default (%1$d%)"),
lyxrc.defaultZoom)), this);
act_zoom_in_ = new QAction(qt_("Zoom &in"), this);
act_zoom_out_ = new QAction(qt_("Zoom &out"), this);
act_zoom_show_ = new QAction(qt_("Show zoom slider"), this);
act_zoom_show_->setCheckable(true);
zoom_value_->addAction(act_zoom_default_);
zoom_value_->addAction(act_zoom_in_);
zoom_value_->addAction(act_zoom_out_);
zoom_value_->addAction(act_zoom_show_);
zoom_value_->setText(toqstr(bformat(_("[[ZOOM]]%1$d%"), zoom)));
zoom_menu->addAction(act_zoom_default_);
zoom_menu->addAction(act_zoom_in_);
zoom_menu->addAction(act_zoom_out_);
zoom_menu->addAction(act_zoom_show_);
enableZoomOptions();
connect(act_zoom_default_, SIGNAL(triggered()),
this, SLOT(resetDefaultZoom()));
@ -704,6 +704,8 @@ GuiView::GuiView(int id)
this, SLOT(zoomOutPressed()));
connect(act_zoom_show_, SIGNAL(triggered()),
this, SLOT(toogleZoomSlider()));
connect(zoom_value_, SIGNAL(customContextMenuRequested(QPoint)),
zoom_menu, SLOT(showMenu(QPoint)));
int const iconheight = max(int(d.normalIconSize), fm.height());
QSize const iconsize(iconheight, iconheight);

13
src/frontends/qt/GuiView.h
View File

@ -29,7 +29,6 @@ class QPushButton;
class QLabel;
class QShowEvent;
class QSlider;
class QToolButton;
namespace lyx {
@ -507,7 +506,7 @@ private:
/// Statusbar widget that shows version control status
QLabel * version_control_;
/// Statusbar widget that shows zoom value
QToolButton * zoom_value_;
QLabel * zoom_value_;
/// The zoom slider widget
QSlider * zoom_slider_;
/// Zoom in ("+") Button
@ -547,6 +546,16 @@ public Q_SLOTS:
void showMenu(QPoint const &) { exec(QCursor::pos()); }
};
class ZoomMenu : public QMenu
{
Q_OBJECT
public:
explicit ZoomMenu(QWidget *) {};
public Q_SLOTS:
void showMenu(QPoint const &) { exec(QCursor::pos()); }
};
} // namespace frontend
} // namespace lyx