From f6b9f9d17ae076df511f1fe0bc66a3bda44d9020 Mon Sep 17 00:00:00 2001 From: Albert Astals Cid Date: Sun, 20 Feb 2005 21:24:25 +0000 Subject: [PATCH] Typo: continous -> continuous BUGS: 99859 svn path=/trunk/kdegraphics/kpdf/; revision=391513 --- TODO | 4 ++-- conf/kpdf.kcfg | 2 +- part.rc | 4 ++-- ui/pageview.cpp | 36 ++++++++++++++++++------------------ ui/pageview.h | 4 ++-- ui/presentationwidget.cpp | 2 +- 6 files changed, 26 insertions(+), 26 deletions(-) diff --git a/TODO b/TODO index 642436f9f..49ee7449f 100644 --- a/TODO +++ b/TODO @@ -130,7 +130,7 @@ Done (newest features come first): -> ADD: Presentation View (only the 'glitter' transition implemented for now) -> FIX: FixPack1 [dyn_zoom repaints, initial panel width, zoom_lineedit focus proxy, searchwidget refactor{thumbs restoring on clear, buttons size, less code}, hilight bookmarked thumbnails] -> FIX: Some fullScreen loving, if we are on fullscreen put an action on RMB menu ti get out of it, if we were on fullScreen mode on exit bring back correctly if we were also seeing toolbar or menubar --> FIX: When in non continous mode and scrolling up a page, set the viewport at the bottom of the page (Albert) +-> FIX: When in non continuous mode and scrolling up a page, set the viewport at the bottom of the page (Albert) -> ADD: Show the window maximized when the user opens the program for the very first time (Albert) -> ADD: Use 'Generators' as providers for contents generation -> ADD: Add properties dialog (Albert) @@ -156,7 +156,7 @@ Done (newest features come first): -> ADD: autoscroll page with Shift+Up/Dn keys (exact konqueror's behavior) -> CHG: remake single page mode -> FIX: zoom buttons in sync with text --> ADD: continous mode +-> ADD: continuous mode -> ADD: multiple pages per view (gui selects 1 or 2 ppv) -> MRG: the option to open password protected files (from head) -> MRG: the Table Of Contents (from head) diff --git a/conf/kpdf.kcfg b/conf/kpdf.kcfg index 8855faadb..12a92b8c0 100644 --- a/conf/kpdf.kcfg +++ b/conf/kpdf.kcfg @@ -67,7 +67,7 @@ true - + true diff --git a/part.rc b/part.rc index d7824af1e..abcd1225d 100644 --- a/part.rc +++ b/part.rc @@ -20,7 +20,7 @@ - + &Go @@ -55,7 +55,7 @@ - + diff --git a/ui/pageview.cpp b/ui/pageview.cpp index 724bce90f..45d51fce2 100644 --- a/ui/pageview.cpp +++ b/ui/pageview.cpp @@ -65,7 +65,7 @@ public: QValueVector< PageViewItem * > items; QValueList< PageViewItem * > visibleItems; - // view layout (columns and continous in Settings), zoom and mouse + // view layout (columns and continuous in Settings), zoom and mouse PageView::ZoomMode zoomMode; float zoomFactor; PageView::MouseMode mouseMode; @@ -104,7 +104,7 @@ public: KToggleAction * aZoomFitPage; KToggleAction * aZoomFitText; KToggleAction * aViewTwoPages; - KToggleAction * aViewContinous; + KToggleAction * aViewContinuous; KAction * aPrevAction; }; @@ -115,7 +115,7 @@ public: * 160 - constructor and creating actions plus their connected slots (empty stuff) * 70 - DocumentObserver inherited methodes (important) * 550 - events: mouse, keyboard, drag/drop - * 170 - slotRelayoutPages: set contents of the scrollview on continous/single modes + * 170 - slotRelayoutPages: set contents of the scrollview on continuous/single modes * 100 - zoom: zooming pages in different ways, keeping update the toolbar actions, etc.. * other misc functions: only slotRequestVisiblePixmaps and pickItemOnPoint noticeable, * and many insignificant stuff like this comment :-) @@ -198,9 +198,9 @@ void PageView::setupActions( KActionCollection * ac ) connect( d->aViewTwoPages, SIGNAL( toggled( bool ) ), SLOT( slotTwoPagesToggled( bool ) ) ); d->aViewTwoPages->setChecked( Settings::viewColumns() > 1 ); - d->aViewContinous = new KToggleAction( i18n("&Continous"), "view_text", 0, ac, "view_continous" ); - connect( d->aViewContinous, SIGNAL( toggled( bool ) ), SLOT( slotContinousToggled( bool ) ) ); - d->aViewContinous->setChecked( Settings::viewContinous() ); + d->aViewContinuous = new KToggleAction( i18n("&Continuous"), "view_text", 0, ac, "view_continuous" ); + connect( d->aViewContinuous, SIGNAL( toggled( bool ) ), SLOT( slotContinuousToggled( bool ) ) ); + d->aViewContinuous->setChecked( Settings::viewContinuous() ); // Mouse-Mode actions d->aMouseNormal = new KRadioAction( i18n("&Normal"), "mouse", 0, this, SLOT( slotSetMouseNormal() ), ac, "mouse_drag" ); @@ -304,7 +304,7 @@ void PageView::notifyViewportChanged( bool smoothMove ) // relayout in "Single Pages" mode or if a relayout is pending d->blockPixmapsRequest = true; - if ( !Settings::viewContinous() || d->dirtyLayout ) + if ( !Settings::viewContinuous() || d->dirtyLayout ) slotRelayoutPages(); // restore viewport center or use default {x-center,v-top} alignment @@ -629,7 +629,7 @@ void PageView::keyPressEvent( QKeyEvent * e ) case Key_Up: case Key_PageUp: // if in single page mode and at the top of the screen, go to previous page - if ( Settings::viewContinous() || verticalScrollBar()->value() > verticalScrollBar()->minValue() ) + if ( Settings::viewContinuous() || verticalScrollBar()->value() > verticalScrollBar()->minValue() ) { if ( e->key() == Key_Up ) verticalScrollBar()->subtractLine(); @@ -649,7 +649,7 @@ void PageView::keyPressEvent( QKeyEvent * e ) case Key_Down: case Key_PageDown: // if in single page mode and at the bottom of the screen, go to next page - if ( Settings::viewContinous() || verticalScrollBar()->value() < verticalScrollBar()->maxValue() ) + if ( Settings::viewContinuous() || verticalScrollBar()->value() < verticalScrollBar()->maxValue() ) { if ( e->key() == Key_Down ) verticalScrollBar()->addLine(); @@ -1087,7 +1087,7 @@ void PageView::wheelEvent( QWheelEvent *e ) else slotZoomIn(); } - else if ( delta <= -120 && !Settings::viewContinous() && vScroll == verticalScrollBar()->maxValue() ) + else if ( delta <= -120 && !Settings::viewContinuous() && vScroll == verticalScrollBar()->maxValue() ) { // go to next page if ( d->document->currentPage() < d->items.count() - 1 ) @@ -1100,7 +1100,7 @@ void PageView::wheelEvent( QWheelEvent *e ) d->document->setViewport( newViewport ); } } - else if ( delta >= 120 && !Settings::viewContinous() && vScroll == verticalScrollBar()->minValue() ) + else if ( delta >= 120 && !Settings::viewContinuous() && vScroll == verticalScrollBar()->minValue() ) { // go to prev page if ( d->document->currentPage() > 0 ) @@ -1446,7 +1446,7 @@ void PageView::updateCursor( const QPoint &p ) //BEGIN private SLOTS void PageView::slotRelayoutPages() -// called by: notifySetup, viewportResizeEvent, slotTwoPagesToggled, slotContinousToggled, updateZoom +// called by: notifySetup, viewportResizeEvent, slotTwoPagesToggled, slotContinuousToggled, updateZoom { // set an empty container if we have no pages int pageCount = d->items.count(); @@ -1473,8 +1473,8 @@ void PageView::slotRelayoutPages() fullHeight = 0; QRect viewportRect( contentsX(), contentsY(), viewportWidth, viewportHeight ); - // set all items geometry and resize contents. handle 'continous' and 'single' modes separately - if ( Settings::viewContinous() ) + // set all items geometry and resize contents. handle 'continuous' and 'single' modes separately + if ( Settings::viewContinuous() ) { // Here we find out column's width and row's height to compute a table // so we can place widgets 'centered in virtual cells'. @@ -1540,7 +1540,7 @@ void PageView::slotRelayoutPages() delete [] colWidth; delete [] rowHeight; } - else // viewContinous is FALSE + else // viewContinuous is FALSE { PageViewItem * currentItem = d->items[ QMAX( 0, (int)d->document->currentPage() ) ]; @@ -1842,11 +1842,11 @@ void PageView::slotTwoPagesToggled( bool on ) } } -void PageView::slotContinousToggled( bool on ) +void PageView::slotContinuousToggled( bool on ) { - if ( Settings::viewContinous() != on ) + if ( Settings::viewContinuous() != on ) { - Settings::setViewContinous( on ); + Settings::setViewContinuous( on ); if ( d->document->pages() > 0 ) slotRelayoutPages(); } diff --git a/ui/pageview.h b/ui/pageview.h index 15d334174..a232316f5 100644 --- a/ui/pageview.h +++ b/ui/pageview.h @@ -31,7 +31,7 @@ class PageViewItem; class PageViewPrivate; /** - * @short The main view. Handles zoom and continous mode.. oh, and page + * @short The main view. Handles zoom and continuous mode.. oh, and page * @short display of course :-) * ... */ @@ -124,7 +124,7 @@ class PageView : public QScrollView, public DocumentObserver void slotFitToPageToggled( bool ); void slotFitToTextToggled( bool ); void slotTwoPagesToggled( bool ); - void slotContinousToggled( bool ); + void slotContinuousToggled( bool ); void slotSetMouseNormal(); void slotSetMouseZoom(); void slotSetMouseSelect(); diff --git a/ui/presentationwidget.cpp b/ui/presentationwidget.cpp index 7a0fdf1f0..1980006b7 100644 --- a/ui/presentationwidget.cpp +++ b/ui/presentationwidget.cpp @@ -483,7 +483,7 @@ void PresentationWidget::generateOverlay() // draw PIE SLICES in blue levels (the levels will then be the alpha component) int pages = m_document->pages(); if ( pages > 36 ) - { // draw continous slices + { // draw continuous slices int degrees = (int)( 360 * (float)(m_frameIndex + 1) / (float)pages ); pixmapPainter.setPen( 0x20 ); pixmapPainter.setBrush( 0x10 ); -- GitLab