anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-09 18:31:04 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Hide the zoom in the status bar from the status bar context menu

Browse Source 
Fix for #12420.
This commit is contained in:
Daniel Ramoeller 2021-11-02 09:12:03 +01:00 committed by Scott Kostyshak
parent 7ab3c59f00
commit eae56b1194
2 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lib/ui/stdcontext.inc
View File

@ -724,11 +724,12 @@ Menuset
End End
# #
# Zoom context menu # Status bar context menu
# #
Menu "context-zoom" Menu "context-statusbar"
ZoomOptions ZoomOptions
Separator Separator
Item "Show Zoom|Z" "ui-toggle zoom"
Item "Show Zoom Slider|S" "ui-toggle zoomslider" Item "Show Zoom Slider|S" "ui-toggle zoomslider"
End End

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

@ -690,9 +690,9 @@ GuiView::GuiView(int id)
zoom_value_->setText(toqstr(bformat(_("[[ZOOM]]%1$d%"), zoom))); zoom_value_->setText(toqstr(bformat(_("[[ZOOM]]%1$d%"), zoom)));
statusBar()->addPermanentWidget(zoom_value_); statusBar()->addPermanentWidget(zoom_value_);
zoom_value_->setEnabled(currentBufferView()); zoom_value_->setEnabled(currentBufferView());
zoom_value_->setContextMenuPolicy(Qt::CustomContextMenu);
connect(zoom_value_, SIGNAL(customContextMenuRequested(QPoint)), statusBar()->setContextMenuPolicy(Qt::CustomContextMenu);
connect(statusBar(), SIGNAL(customContextMenuRequested(QPoint)),
this, SLOT(showZoomContextMenu())); this, SLOT(showZoomContextMenu()));
int const iconheight = max(int(d.normalIconSize), fm.height()); int const iconheight = max(int(d.normalIconSize), fm.height());
@ -826,7 +826,7 @@ void GuiView::zoomOutPressed()
void GuiView::showZoomContextMenu() void GuiView::showZoomContextMenu()
{ {
QMenu * menu = guiApp->menus().menu(toqstr("context-zoom"), * this); QMenu * menu = guiApp->menus().menu(toqstr("context-statusbar"), * this);
if (!menu) if (!menu)
return; return;
menu->exec(QCursor::pos()); menu->exec(QCursor::pos());
@ -946,6 +946,7 @@ void GuiView::saveLayout() const
settings.setValue("geometry", saveGeometry()); settings.setValue("geometry", saveGeometry());
settings.setValue("layout", saveState(0)); settings.setValue("layout", saveState(0));
settings.setValue("icon_size", toqstr(d.iconSize(iconSize()))); settings.setValue("icon_size", toqstr(d.iconSize(iconSize())));
settings.setValue("zoom_value_visible", zoom_value_->isVisible());
settings.setValue("zoom_slider_visible", zoom_slider_->isVisible()); settings.setValue("zoom_slider_visible", zoom_slider_->isVisible());
} }
@ -990,6 +991,8 @@ bool GuiView::restoreLayout()
//code below is skipped when when ~/.config/LyX is (re)created //code below is skipped when when ~/.config/LyX is (re)created
setIconSize(d.iconSize(settings.value(icon_key).toString())); setIconSize(d.iconSize(settings.value(icon_key).toString()));
zoom_value_->setVisible(settings.value("zoom_value_visible", true).toBool());
bool const show_zoom_slider = settings.value("zoom_slider_visible", true).toBool(); bool const show_zoom_slider = settings.value("zoom_slider_visible", true).toBool();
zoom_slider_->setVisible(show_zoom_slider); zoom_slider_->setVisible(show_zoom_slider);
zoom_in_->setVisible(show_zoom_slider); zoom_in_->setVisible(show_zoom_slider);
@ -2352,7 +2355,10 @@ bool GuiView::getStatus(FuncRequest const & cmd, FuncStatus & flag)
break; break;
case LFUN_UI_TOGGLE: case LFUN_UI_TOGGLE:
if (cmd.argument() == "zoomslider") { if (cmd.argument() == "zoom") {
enable = doc_buffer;
flag.setOnOff(zoom_value_ ? zoom_value_->isVisible() : false);
} else if (cmd.argument() == "zoomslider") {
enable = doc_buffer; enable = doc_buffer;
flag.setOnOff(zoom_slider_ ? zoom_slider_->isVisible() : false); flag.setOnOff(zoom_slider_ ? zoom_slider_->isVisible() : false);
} else } else
@ -4861,6 +4867,8 @@ bool GuiView::lfunUiToggle(string const & ui_component)
statusBar()->setVisible(!statusBar()->isVisible()); statusBar()->setVisible(!statusBar()->isVisible());
} else if (ui_component == "menubar") { } else if (ui_component == "menubar") {
menuBar()->setVisible(!menuBar()->isVisible()); menuBar()->setVisible(!menuBar()->isVisible());
} else if (ui_component == "zoom") {
zoom_value_->setVisible(!zoom_value_->isVisible());
} else if (ui_component == "zoomslider") { } else if (ui_component == "zoomslider") {
zoom_slider_->setVisible(!zoom_slider_->isVisible()); zoom_slider_->setVisible(!zoom_slider_->isVisible());
zoom_in_->setVisible(zoom_slider_->isVisible()); zoom_in_->setVisible(zoom_slider_->isVisible());