[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: KDE/kdegraphics/okular/ui
From: Pino Toscano <pino () kde ! org>
Date: 2008-05-31 20:45:30
Message-ID: 1212266730.991437.16407.nullmailer () svn ! kde ! org
[Download RAW message or body]
SVN commit 814984 by pino:
implement the ZoomModality capability (as View),
and stop using the zoom level and mode from the global settings
M +17 -6 pageview.cpp
--- trunk/KDE/kdegraphics/okular/ui/pageview.cpp #814983:814984
@@ -296,8 +296,8 @@
d->aRotateCounterClockwise = 0;
d->aRotateOriginal = 0;
d->aViewMode = 0;
- d->zoomMode = (PageView::ZoomMode) Okular::Settings::zoomMode();
- d->zoomFactor = Okular::Settings::zoomFactor();
+ d->zoomMode = PageView::ZoomFitPage;
+ d->zoomFactor = 1.0;
d->mouseMode = MouseNormal;
d->mouseMidZooming = false;
d->mouseSelecting = false;
@@ -1029,6 +1029,7 @@
switch ( capability )
{
case Zoom:
+ case ZoomModality:
return true;
}
return false;
@@ -1039,6 +1040,7 @@
switch ( capability )
{
case Zoom:
+ case ZoomModality:
return CapabilityRead | CapabilityWrite;
}
return 0;
@@ -1050,6 +1052,8 @@
{
case Zoom:
return d->zoomFactor;
+ case ZoomModality:
+ return d->zoomMode;
}
return QVariant();
}
@@ -1069,6 +1073,17 @@
}
break;
}
+ case ZoomModality:
+ {
+ bool ok = true;
+ int mode = option.toInt( &ok );
+ if ( ok )
+ {
+ if ( mode >= 0 && mode < 3 )
+ updateZoom( (ZoomMode)mode );
+ }
+ break;
+ }
}
}
@@ -2574,10 +2589,6 @@
d->aZoomFitPage->setChecked( checkedZoomAction == d->aZoomFitPage );
// d->aZoomFitText->setChecked( checkedZoomAction == d->aZoomFitText );
}
- // store zoom settings
- Okular::Settings::setZoomMode( newZoomMode );
- Okular::Settings::setZoomFactor( newFactor );
- Okular::Settings::self()->writeConfig();
}
d->aZoomIn->setEnabled( d->zoomFactor < 3.9 );
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic