diff --git a/words/part/KWCanvas.cpp b/words/part/KWCanvas.cpp --- a/words/part/KWCanvas.cpp +++ b/words/part/KWCanvas.cpp @@ -139,7 +139,7 @@ m_view->goToNextPage(e->modifiers()); } if(e->key() == Qt::Key_Escape) - m_view->exitDistractioFreeMode(); + m_view->exitFullscreenMode(); } diff --git a/words/part/KWView.h b/words/part/KWView.h --- a/words/part/KWView.h +++ b/words/part/KWView.h @@ -146,8 +146,8 @@ void goToPreviousPage(Qt::KeyboardModifiers modifiers = Qt::NoModifier); /// go to next page void goToNextPage(Qt::KeyboardModifiers modifiers = Qt::NoModifier); - /// Call when "Exit Distraction-Free Mode" in status bar clicked. - void exitDistractioFreeMode(); + /// Call when "Exit Fullscreen Mode" in status bar clicked. + void exitFullscreenMode(); protected: /// reimplemented method from superclass @@ -209,12 +209,12 @@ /// "hasAnnotations" has changed ("notes" in the UI) - will cause showNotes above to change too void hasNotes(bool has); /** - * Set view into distraction free mode, hide menu bar, status bar, tool bar, dockers + * Set view into fullscreen mode, hide menu bar, status bar, tool bar, dockers * and set view into full screen mode. */ - void setDistractionFreeMode(bool); /// Call after 4 seconds, user doesn't move cursor. + void setFullscreenMode(bool); /// Call after 4 seconds, user doesn't move cursor. void hideCursor(); - /// Hide status bar and scroll bars after seconds in Distraction-Free mode. + /// Hide status bar and scroll bars after seconds in fullscreen mode. void hideUI(); private: @@ -256,9 +256,9 @@ void buildAssociatedWidget(); KWStatisticsWidget *wordCount; - bool m_isDistractionFreeMode; + bool m_isFullscreenMode; QTimer *m_hideCursorTimer; - // The button will add to status bar in distraction-free mode to let user come + // The button will add to status bar in fullscreen mode to let user come // back to standard view. QPushButton *m_dfmExitButton; }; diff --git a/words/part/KWView.cpp b/words/part/KWView.cpp --- a/words/part/KWView.cpp +++ b/words/part/KWView.cpp @@ -122,7 +122,7 @@ , m_textMaxX(600) , m_minPageNum(1) , m_maxPageNum(1) - , m_isDistractionFreeMode(false) + , m_isFullscreenMode(false) { setAcceptDrops(true); @@ -189,14 +189,14 @@ m_zoomController->setZoom(m_document->config().zoomMode(), m_document->config().zoom() / 100.); connect(m_zoomController, SIGNAL(zoomChanged(KoZoomMode::Mode,qreal)), this, SLOT(zoomChanged(KoZoomMode::Mode,qreal))); - //Timer start in Distraction-Free mode view. + //Timer start in Fullscreen mode view. m_hideCursorTimer = new QTimer(this); connect(m_hideCursorTimer, SIGNAL(timeout()), this, SLOT(hideCursor())); - m_dfmExitButton = new QPushButton(i18n("Exit Distraction-Free Mode")); + m_dfmExitButton = new QPushButton(i18n("Exit Fullscreen Mode")); addStatusBarItem(m_dfmExitButton, 0); m_dfmExitButton->setVisible(false); - connect(m_dfmExitButton, SIGNAL(clicked()), this, SLOT(exitDistractioFreeMode())); + connect(m_dfmExitButton, SIGNAL(clicked()), this, SLOT(exitFullscreenMode())); #ifdef SHOULD_BUILD_RDF if (KoDocumentRdf *rdf = dynamic_cast(m_document->documentRdf())) { @@ -374,11 +374,11 @@ connect(tAction, SIGNAL(toggled(bool)), this, SLOT(showStatusBar(bool))); mainWindow()->actionCollection()->action("view_fullscreen")->setEnabled(false); - tAction = new KToggleAction(i18n("Distraction Free Mode"), this); - tAction->setToolTip(i18n("Set view in distraction free mode")); + tAction = new KToggleAction(i18n("Fullscreen Mode"), this); + tAction->setToolTip(i18n("Set view in fullscreen mode")); tAction->setShortcut(QKeySequence(Qt::CTRL + Qt::SHIFT + Qt::Key_F)); - actionCollection()->addAction("view_distractionfreemode", tAction); - connect(tAction, SIGNAL(toggled(bool)), this, SLOT(setDistractionFreeMode(bool))); + actionCollection()->addAction("view_fullscreen", tAction); + connect(tAction, SIGNAL(toggled(bool)), this, SLOT(setFullscreenMode(bool))); #ifdef SHOULD_BUILD_RDF action = new QAction(i18n("Semantic Stylesheets..."), this); @@ -649,9 +649,9 @@ if (statusBar()) statusBar()->setVisible(toggled); } -void KWView::setDistractionFreeMode(bool status) +void KWView::setFullscreenMode(bool status) { - m_isDistractionFreeMode = status; + m_isFullscreenMode = status; mainWindow()->toggleDockersVisibility(!status); mainWindow()->menuBar()->setVisible(!status); @@ -670,7 +670,7 @@ static_cast(m_gui->canvasController())->setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOn); static_cast(m_gui->canvasController())->setHorizontalScrollBarPolicy(Qt::ScrollBarAsNeeded); } - // Exit Distraction-Free mode button. + // Exit Fullscreen mode button. m_dfmExitButton->setVisible(status); //Hide cursor. @@ -685,7 +685,7 @@ // From time to time you can end up in a situation where the shape manager suddenly // looses track of the current shape selection. So, we trick it here. Logically, // it also makes sense to just make sure the text tool is active anyway when - // switching to/from distraction free (since that's explicitly for typing things + // switching to/from fullscreen (since that's explicitly for typing things // out, not layouting) const QList selection = m_canvas->shapeManager()->selection()->selectedShapes(); m_canvas->shapeManager()->selection()->deselectAll(); @@ -696,7 +696,7 @@ void KWView::hideUI() { - if (m_isDistractionFreeMode) { + if (m_isFullscreenMode) { mainWindow()->statusBar()->setVisible(false); // Hide vertical and horizontal scroll bar. static_cast(m_gui->canvasController())->setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOff); @@ -709,19 +709,19 @@ m_gui->setCursor(Qt::BlankCursor); } -void KWView::exitDistractioFreeMode() +void KWView::exitFullscreenMode() { - if (m_isDistractionFreeMode) { - QAction *action = actionCollection()->action("view_distractionfreemode"); + if (m_isFullscreenMode) { + QAction *action = actionCollection()->action("view_fullscreen"); action->setChecked(false); m_gui->setCursor(Qt::ArrowCursor); - setDistractionFreeMode(false); + setFullscreenMode(false); } } void KWView::viewMouseMoveEvent(QMouseEvent *e) { - if (!m_isDistractionFreeMode) + if (!m_isFullscreenMode) return; m_gui->setCursor(Qt::ArrowCursor); diff --git a/words/part/calligrawords.rc b/words/part/calligrawords.rc --- a/words/part/calligrawords.rc +++ b/words/part/calligrawords.rc @@ -56,7 +56,6 @@ -