Commit f6b9f9d1 authored by Albert Astals Cid's avatar Albert Astals Cid

Typo: continous -> continuous

BUGS: 99859

svn path=/trunk/kdegraphics/kpdf/; revision=391513
parent 67f4c2b3
...@@ -130,7 +130,7 @@ Done (newest features come first): ...@@ -130,7 +130,7 @@ Done (newest features come first):
-> ADD: Presentation View (only the 'glitter' transition implemented for now) -> 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: 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: 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: 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: Use 'Generators' as providers for contents generation
-> ADD: Add properties dialog (Albert) -> ADD: Add properties dialog (Albert)
...@@ -156,7 +156,7 @@ Done (newest features come first): ...@@ -156,7 +156,7 @@ Done (newest features come first):
-> ADD: autoscroll page with Shift+Up/Dn keys (exact konqueror's behavior) -> ADD: autoscroll page with Shift+Up/Dn keys (exact konqueror's behavior)
-> CHG: remake single page mode -> CHG: remake single page mode
-> FIX: zoom buttons in sync with text -> FIX: zoom buttons in sync with text
-> ADD: continous mode -> ADD: continuous mode
-> ADD: multiple pages per view (gui selects 1 or 2 ppv) -> ADD: multiple pages per view (gui selects 1 or 2 ppv)
-> MRG: the option to open password protected files (from head) -> MRG: the option to open password protected files (from head)
-> MRG: the Table Of Contents (from head) -> MRG: the Table Of Contents (from head)
......
...@@ -67,7 +67,7 @@ ...@@ -67,7 +67,7 @@
<entry key="ShowScrollBars" type="Bool" > <entry key="ShowScrollBars" type="Bool" >
<default>true</default> <default>true</default>
</entry> </entry>
<entry key="ViewContinous" type="Bool" > <entry key="ViewContinuous" type="Bool" >
<default>true</default> <default>true</default>
</entry> </entry>
<entry key="ViewColumns" type="UInt" > <entry key="ViewColumns" type="UInt" >
......
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
<Action name="zoom_fit_page"/> <Action name="zoom_fit_page"/>
<Action name="zoom_fit_rect"/> <Action name="zoom_fit_rect"/>
<Separator/> <Separator/>
<Action name="view_continous"/> <Action name="view_continuous"/>
<Action name="view_twopages"/> <Action name="view_twopages"/>
</Menu> </Menu>
<Menu name="go"><text>&amp;Go</text> <Menu name="go"><text>&amp;Go</text>
...@@ -55,7 +55,7 @@ ...@@ -55,7 +55,7 @@
<!--Action name="zoom_fit_width"/--> <!--Action name="zoom_fit_width"/-->
<!--Action name="zoom_fit_page"/--> <!--Action name="zoom_fit_page"/-->
<Separator/> <Separator/>
<Action name="view_continous"/> <Action name="view_continuous"/>
<Action name="view_twopages"/> <Action name="view_twopages"/>
<Separator/> <Separator/>
<Action name="mouse_drag"/> <Action name="mouse_drag"/>
......
...@@ -65,7 +65,7 @@ public: ...@@ -65,7 +65,7 @@ public:
QValueVector< PageViewItem * > items; QValueVector< PageViewItem * > items;
QValueList< PageViewItem * > visibleItems; 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; PageView::ZoomMode zoomMode;
float zoomFactor; float zoomFactor;
PageView::MouseMode mouseMode; PageView::MouseMode mouseMode;
...@@ -104,7 +104,7 @@ public: ...@@ -104,7 +104,7 @@ public:
KToggleAction * aZoomFitPage; KToggleAction * aZoomFitPage;
KToggleAction * aZoomFitText; KToggleAction * aZoomFitText;
KToggleAction * aViewTwoPages; KToggleAction * aViewTwoPages;
KToggleAction * aViewContinous; KToggleAction * aViewContinuous;
KAction * aPrevAction; KAction * aPrevAction;
}; };
...@@ -115,7 +115,7 @@ public: ...@@ -115,7 +115,7 @@ public:
* 160 - constructor and creating actions plus their connected slots (empty stuff) * 160 - constructor and creating actions plus their connected slots (empty stuff)
* 70 - DocumentObserver inherited methodes (important) * 70 - DocumentObserver inherited methodes (important)
* 550 - events: mouse, keyboard, drag/drop * 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.. * 100 - zoom: zooming pages in different ways, keeping update the toolbar actions, etc..
* other misc functions: only slotRequestVisiblePixmaps and pickItemOnPoint noticeable, * other misc functions: only slotRequestVisiblePixmaps and pickItemOnPoint noticeable,
* and many insignificant stuff like this comment :-) * and many insignificant stuff like this comment :-)
...@@ -198,9 +198,9 @@ void PageView::setupActions( KActionCollection * ac ) ...@@ -198,9 +198,9 @@ void PageView::setupActions( KActionCollection * ac )
connect( d->aViewTwoPages, SIGNAL( toggled( bool ) ), SLOT( slotTwoPagesToggled( bool ) ) ); connect( d->aViewTwoPages, SIGNAL( toggled( bool ) ), SLOT( slotTwoPagesToggled( bool ) ) );
d->aViewTwoPages->setChecked( Settings::viewColumns() > 1 ); d->aViewTwoPages->setChecked( Settings::viewColumns() > 1 );
d->aViewContinous = new KToggleAction( i18n("&Continous"), "view_text", 0, ac, "view_continous" ); d->aViewContinuous = new KToggleAction( i18n("&Continuous"), "view_text", 0, ac, "view_continuous" );
connect( d->aViewContinous, SIGNAL( toggled( bool ) ), SLOT( slotContinousToggled( bool ) ) ); connect( d->aViewContinuous, SIGNAL( toggled( bool ) ), SLOT( slotContinuousToggled( bool ) ) );
d->aViewContinous->setChecked( Settings::viewContinous() ); d->aViewContinuous->setChecked( Settings::viewContinuous() );
// Mouse-Mode actions // Mouse-Mode actions
d->aMouseNormal = new KRadioAction( i18n("&Normal"), "mouse", 0, this, SLOT( slotSetMouseNormal() ), ac, "mouse_drag" ); d->aMouseNormal = new KRadioAction( i18n("&Normal"), "mouse", 0, this, SLOT( slotSetMouseNormal() ), ac, "mouse_drag" );
...@@ -304,7 +304,7 @@ void PageView::notifyViewportChanged( bool smoothMove ) ...@@ -304,7 +304,7 @@ void PageView::notifyViewportChanged( bool smoothMove )
// relayout in "Single Pages" mode or if a relayout is pending // relayout in "Single Pages" mode or if a relayout is pending
d->blockPixmapsRequest = true; d->blockPixmapsRequest = true;
if ( !Settings::viewContinous() || d->dirtyLayout ) if ( !Settings::viewContinuous() || d->dirtyLayout )
slotRelayoutPages(); slotRelayoutPages();
// restore viewport center or use default {x-center,v-top} alignment // restore viewport center or use default {x-center,v-top} alignment
...@@ -629,7 +629,7 @@ void PageView::keyPressEvent( QKeyEvent * e ) ...@@ -629,7 +629,7 @@ void PageView::keyPressEvent( QKeyEvent * e )
case Key_Up: case Key_Up:
case Key_PageUp: case Key_PageUp:
// if in single page mode and at the top of the screen, go to previous page // 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 ) if ( e->key() == Key_Up )
verticalScrollBar()->subtractLine(); verticalScrollBar()->subtractLine();
...@@ -649,7 +649,7 @@ void PageView::keyPressEvent( QKeyEvent * e ) ...@@ -649,7 +649,7 @@ void PageView::keyPressEvent( QKeyEvent * e )
case Key_Down: case Key_Down:
case Key_PageDown: case Key_PageDown:
// if in single page mode and at the bottom of the screen, go to next page // 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 ) if ( e->key() == Key_Down )
verticalScrollBar()->addLine(); verticalScrollBar()->addLine();
...@@ -1087,7 +1087,7 @@ void PageView::wheelEvent( QWheelEvent *e ) ...@@ -1087,7 +1087,7 @@ void PageView::wheelEvent( QWheelEvent *e )
else else
slotZoomIn(); slotZoomIn();
} }
else if ( delta <= -120 && !Settings::viewContinous() && vScroll == verticalScrollBar()->maxValue() ) else if ( delta <= -120 && !Settings::viewContinuous() && vScroll == verticalScrollBar()->maxValue() )
{ {
// go to next page // go to next page
if ( d->document->currentPage() < d->items.count() - 1 ) if ( d->document->currentPage() < d->items.count() - 1 )
...@@ -1100,7 +1100,7 @@ void PageView::wheelEvent( QWheelEvent *e ) ...@@ -1100,7 +1100,7 @@ void PageView::wheelEvent( QWheelEvent *e )
d->document->setViewport( newViewport ); 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 // go to prev page
if ( d->document->currentPage() > 0 ) if ( d->document->currentPage() > 0 )
...@@ -1446,7 +1446,7 @@ void PageView::updateCursor( const QPoint &p ) ...@@ -1446,7 +1446,7 @@ void PageView::updateCursor( const QPoint &p )
//BEGIN private SLOTS //BEGIN private SLOTS
void PageView::slotRelayoutPages() 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 // set an empty container if we have no pages
int pageCount = d->items.count(); int pageCount = d->items.count();
...@@ -1473,8 +1473,8 @@ void PageView::slotRelayoutPages() ...@@ -1473,8 +1473,8 @@ void PageView::slotRelayoutPages()
fullHeight = 0; fullHeight = 0;
QRect viewportRect( contentsX(), contentsY(), viewportWidth, viewportHeight ); QRect viewportRect( contentsX(), contentsY(), viewportWidth, viewportHeight );
// set all items geometry and resize contents. handle 'continous' and 'single' modes separately // set all items geometry and resize contents. handle 'continuous' and 'single' modes separately
if ( Settings::viewContinous() ) if ( Settings::viewContinuous() )
{ {
// Here we find out column's width and row's height to compute a table // Here we find out column's width and row's height to compute a table
// so we can place widgets 'centered in virtual cells'. // so we can place widgets 'centered in virtual cells'.
...@@ -1540,7 +1540,7 @@ void PageView::slotRelayoutPages() ...@@ -1540,7 +1540,7 @@ void PageView::slotRelayoutPages()
delete [] colWidth; delete [] colWidth;
delete [] rowHeight; delete [] rowHeight;
} }
else // viewContinous is FALSE else // viewContinuous is FALSE
{ {
PageViewItem * currentItem = d->items[ QMAX( 0, (int)d->document->currentPage() ) ]; PageViewItem * currentItem = d->items[ QMAX( 0, (int)d->document->currentPage() ) ];
...@@ -1842,11 +1842,11 @@ void PageView::slotTwoPagesToggled( bool on ) ...@@ -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 ) if ( d->document->pages() > 0 )
slotRelayoutPages(); slotRelayoutPages();
} }
......
...@@ -31,7 +31,7 @@ class PageViewItem; ...@@ -31,7 +31,7 @@ class PageViewItem;
class PageViewPrivate; 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 :-) * @short display of course :-)
* ... * ...
*/ */
...@@ -124,7 +124,7 @@ class PageView : public QScrollView, public DocumentObserver ...@@ -124,7 +124,7 @@ class PageView : public QScrollView, public DocumentObserver
void slotFitToPageToggled( bool ); void slotFitToPageToggled( bool );
void slotFitToTextToggled( bool ); void slotFitToTextToggled( bool );
void slotTwoPagesToggled( bool ); void slotTwoPagesToggled( bool );
void slotContinousToggled( bool ); void slotContinuousToggled( bool );
void slotSetMouseNormal(); void slotSetMouseNormal();
void slotSetMouseZoom(); void slotSetMouseZoom();
void slotSetMouseSelect(); void slotSetMouseSelect();
......
...@@ -483,7 +483,7 @@ void PresentationWidget::generateOverlay() ...@@ -483,7 +483,7 @@ void PresentationWidget::generateOverlay()
// draw PIE SLICES in blue levels (the levels will then be the alpha component) // draw PIE SLICES in blue levels (the levels will then be the alpha component)
int pages = m_document->pages(); int pages = m_document->pages();
if ( pages > 36 ) if ( pages > 36 )
{ // draw continous slices { // draw continuous slices
int degrees = (int)( 360 * (float)(m_frameIndex + 1) / (float)pages ); int degrees = (int)( 360 * (float)(m_frameIndex + 1) / (float)pages );
pixmapPainter.setPen( 0x20 ); pixmapPainter.setPen( 0x20 );
pixmapPainter.setBrush( 0x10 ); pixmapPainter.setBrush( 0x10 );
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment