From 7c5f5f63f63af4e81e3812bbe19b6bf8ad8a62d9 Mon Sep 17 00:00:00 2001 From: Peter Klausing Date: Mon, 1 Apr 2019 13:29:15 +0200 Subject: [PATCH] make parameter name consistent --- src/control/Control.cpp | 28 ++++++++++++++-------------- src/control/Control.h | 4 ++-- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/src/control/Control.cpp b/src/control/Control.cpp index 3909f386..47dd43dd 100644 --- a/src/control/Control.cpp +++ b/src/control/Control.cpp @@ -1529,23 +1529,23 @@ void Control::changePageBackgroundColor() } } -void Control::setViewPairedPages(bool pairedPages) +void Control::setViewPairedPages(bool enabled) { XOJ_CHECK_TYPE(Control); - settings->setShowPairedPages(pairedPages); - fireActionSelected(GROUP_PAIRED_PAGES, pairedPages ? ACTION_VIEW_PAIRED_PAGES : ACTION_NOT_SELECTED); + settings->setShowPairedPages(enabled); + fireActionSelected(GROUP_PAIRED_PAGES, enabled ? ACTION_VIEW_PAIRED_PAGES : ACTION_NOT_SELECTED); int currentPage = getCurrentPageNo(); win->getXournal()->layoutPages(); scrollHandler->scrollToPage(currentPage); } -void Control::setViewPresentationMode(bool presentationMode) +void Control::setViewPresentationMode(bool enabled) { XOJ_CHECK_TYPE(Control); - if(presentationMode) + if(enabled) { // Disable PresentationMode if ZoomValue could not calculated correctly zoom->updateZoomPresentationValue(); @@ -1554,18 +1554,18 @@ void Control::setViewPresentationMode(bool presentationMode) setViewRows(0); setViewColumns(0); } - zoom->setZoomPresentationMode(presentationMode); - settings->setPresentationMode(presentationMode); + zoom->setZoomPresentationMode(enabled); + settings->setPresentationMode(enabled); - fireActionSelected(GROUP_PRESENTATION_MODE, presentationMode ? ACTION_VIEW_PRESENTATION_MODE : ACTION_NOT_SELECTED); - fireEnableAction(ACTION_ZOOM_IN, !presentationMode); - fireEnableAction(ACTION_ZOOM_OUT, !presentationMode); - fireEnableAction(ACTION_ZOOM_FIT, !presentationMode); - fireEnableAction(ACTION_ZOOM_100, !presentationMode); - fireEnableAction(ACTION_FOOTER_ZOOM_SLIDER, !presentationMode); + fireActionSelected(GROUP_PRESENTATION_MODE, enabled ? ACTION_VIEW_PRESENTATION_MODE : ACTION_NOT_SELECTED); + fireEnableAction(ACTION_ZOOM_IN, !enabled); + fireEnableAction(ACTION_ZOOM_OUT, !enabled); + fireEnableAction(ACTION_ZOOM_FIT, !enabled); + fireEnableAction(ACTION_ZOOM_100, !enabled); + fireEnableAction(ACTION_FOOTER_ZOOM_SLIDER, !enabled); selectDefaultTool(); - fireEnableAction(ACTION_TOOL_HAND, !presentationMode); + fireEnableAction(ACTION_TOOL_HAND, !enabled); int currentPage = getCurrentPageNo(); win->getXournal()->layoutPages(); diff --git a/src/control/Control.h b/src/control/Control.h index 54022fa4..e5fe2414 100644 --- a/src/control/Control.h +++ b/src/control/Control.h @@ -126,8 +126,8 @@ public: void saveSettings(); void updateWindowTitle(); - void setViewPairedPages(bool continous); - void setViewPresentationMode(bool); + void setViewPairedPages(bool enabled); + void setViewPresentationMode(bool enabled); void setPairsOffset(int numOffset); void setViewColumns(int numColumns); void setViewRows(int numRows);