merged patch_053,062 (tinyurl.com/8t5ec)

svn path=/branches/kpdf/annotations/kdegraphics/kpdf/; revision=428592

TODO

@@ -122,6 +122,7 @@ Done (newest features come first):
 -> ADD: annotations: PDF1.6 reader (PDF's annotations -> our data structures)
 -> ADD: Internal data structures for annotations handling.
 -> FIX: rmb when no doc displayed to restore menu
+-> ADD: Save zoom setting on exit
 -> ADD: Put fonts used by the document on the properties dialog
 -> ADD: partial implementation of XYZ links
 -> ADD: google-like search on thumbnails

conf/kpdf.kcfg

@@ -143,6 +143,26 @@
   </entry>
   <entry key="SplitterSizes" type="IntList" />
  </group>
+ <group name="Nav Panel" >
+  <entry key="CurrentPageOnly" type="Bool" >
+   <default>false</default>
+  </entry>
+  <entry key="GroupByAuthor" type="Bool" >
+   <default>true</default>
+  </entry>
+  <entry key="GroupByPage" type="Bool" >
+   <default>true</default>
+  </entry>
+  <entry key="FilterBookmarks" type="Bool" >
+   <default>false</default>
+  </entry>
+  <entry key="ShowSearchBar" type="Bool" >
+   <default>true</default>
+  </entry>
+  <entry key="SyncThumbnailsViewport" type="Bool" >
+   <default>true</default>
+  </entry>
+ </group>
  <group name="PageView" >
   <entry key="CenterFirstPageInRow" type="Bool" >
    <default>false</default>
@@ -161,25 +181,14 @@
   <entry key="ViewContinuous" type="Bool" >
    <default>true</default>
   </entry>
- </group>
- <group name="SideView" >
-  <entry key="CurrentPageOnly" type="Bool" >
-   <default>false</default>
-  </entry>
-  <entry key="GroupByAuthor" type="Bool" >
-   <default>true</default>
-  </entry>
-  <entry key="GroupByPage" type="Bool" >
-   <default>true</default>
-  </entry>
-  <entry key="FilterBookmarks" type="Bool" >
-   <default>false</default>
+  <entry key="ZoomMode" type="UInt" >
+    <default>2</default>
+    <max>2</max>
   </entry>
-  <entry key="ShowSearchBar" type="Bool" >
-   <default>true</default>
-  </entry>
-  <entry key="SyncThumbnailsViewport" type="Bool" >
-   <default>true</default>
+  <entry key="ZoomFactor" type="Double" >
+    <default>1.0</default>
+    <min>0.1</min>
+    <max>4.0</max>
   </entry>
  </group>
 </kcfg>

ui/pageview.cpp

@@ -132,8 +132,8 @@ PageView::PageView( QWidget *parent, KPDFDocument *document )
     // create and initialize private storage structure
     d = new PageViewPrivate();
     d->document = document;
-    d->zoomMode = ZoomFitPage;
-    d->zoomFactor = 1.0;
+    d->zoomMode = (PageView::ZoomMode) Settings::zoomMode();
+    d->zoomFactor = Settings::zoomFactor();
     d->mouseMode = MouseNormal;
     d->mouseMidZooming = false;
     d->mouseSelecting = false;
@@ -1528,6 +1528,9 @@ void PageView::updateZoom( ZoomMode newZoomMode )
         d->aZoomFitWidth->setChecked( checkedZoomAction == d->aZoomFitWidth );
         d->aZoomFitPage->setChecked( checkedZoomAction == d->aZoomFitPage );
         d->aZoomFitText->setChecked( checkedZoomAction == d->aZoomFitText );
+        // store zoom settings
+        Settings::setZoomMode( newZoomMode );
+        Settings::setZoomFactor( newFactor );
     }
 }
 

ui/pageview.h

@@ -44,7 +44,7 @@ class PageView : public QScrollView, public DocumentObserver
         ~PageView();
 
         // Zoom mode ( last 4 are internally used only! )
-        enum ZoomMode { ZoomFixed, ZoomFitWidth, ZoomFitPage, ZoomFitText,
+        enum ZoomMode { ZoomFixed = 0, ZoomFitWidth = 1, ZoomFitPage = 2, ZoomFitText,
                         ZoomIn, ZoomOut, ZoomRefreshCurrent };
         enum MouseMode { MouseNormal, MouseZoom, MouseSelect };