[elvystrac] r1788 - unzoom to the normal mode on timer timeout

From: elvys@xxxxxxxxxxxxxxxxxxxxxx
To: elvystrac@xxxxxxxxxxxxx
Date: Thu, 18 Feb 2010 22:20:42 +0100
Author: JirkaH
Date: 2010-02-18 22:20:41 +0100 (Thu, 18 Feb 2010)
New Revision: 1788

Modified:
   trunk/client/elvys-client/src/appconfigdata.cpp
   trunk/client/elvys-client/src/pdfcommonviewer.cpp
   trunk/client/elvys-client/src/pdfcommonviewer.h
   trunk/client/elvys-client/src/pdfpresentationviewer.cpp
   trunk/client/elvys-client/src/pdfpresentationviewer.h
   trunk/client/elvys-client/src/pdfviewer.cpp
   trunk/client/elvys-client/src/pdfviewer.h
Log:
unzoom to the normal mode on timer timeout


Modified: trunk/client/elvys-client/src/appconfigdata.cpp
===================================================================
--- trunk/client/elvys-client/src/appconfigdata.cpp     2010-02-18 20:56:11 UTC 
(rev 1787)
+++ trunk/client/elvys-client/src/appconfigdata.cpp     2010-02-18 21:20:41 UTC 
(rev 1788)
@@ -14,7 +14,7 @@
        httpTimeout = 1000000; //v ms
        tempDir = "/tmp/";
        localDataDir = "/home/elvys/";
-       documentTimeOut = 90;
+       documentTimeOut = 10;
        serialPortName = "/dev/ttyS0";
        machineID = 0;
        appConfigPeriod = 60000;

Modified: trunk/client/elvys-client/src/pdfcommonviewer.cpp
===================================================================
--- trunk/client/elvys-client/src/pdfcommonviewer.cpp   2010-02-18 20:56:11 UTC 
(rev 1787)
+++ trunk/client/elvys-client/src/pdfcommonviewer.cpp   2010-02-18 21:20:41 UTC 
(rev 1788)
@@ -81,7 +81,7 @@
 
 void PDFCommonViewer::closeEnlargement() {
        if ( timeOpened >= AppConfig::getInstance()->getDocumentTimeOut() ) {
-               unzoom();
+               totallyUnZoom();
        } else {
                timeOpened++;
        }

Modified: trunk/client/elvys-client/src/pdfcommonviewer.h
===================================================================
--- trunk/client/elvys-client/src/pdfcommonviewer.h     2010-02-18 20:56:11 UTC 
(rev 1787)
+++ trunk/client/elvys-client/src/pdfcommonviewer.h     2010-02-18 21:20:41 UTC 
(rev 1788)
@@ -53,6 +53,7 @@
                virtual QString getPageKey(const QSize & size, const QString & 
identifier = "");
                virtual void zoom() = 0;
                virtual void unzoom() = 0;
+               virtual void totallyUnZoom() = 0;
                virtual void showPDF() = 0;
 
 

Modified: trunk/client/elvys-client/src/pdfpresentationviewer.cpp
===================================================================
--- trunk/client/elvys-client/src/pdfpresentationviewer.cpp     2010-02-18 
20:56:11 UTC (rev 1787)
+++ trunk/client/elvys-client/src/pdfpresentationviewer.cpp     2010-02-18 
21:20:41 UTC (rev 1788)
@@ -428,6 +428,10 @@
 }
 
 
+void PDFPresentationViewer::totallyUnZoom() {
+       unzoom();
+}
+
 void PDFPresentationViewer::unzoom() {
        if ( zoomed ) {
                emit unZoomEvent();

Modified: trunk/client/elvys-client/src/pdfpresentationviewer.h
===================================================================
--- trunk/client/elvys-client/src/pdfpresentationviewer.h       2010-02-18 
20:56:11 UTC (rev 1787)
+++ trunk/client/elvys-client/src/pdfpresentationviewer.h       2010-02-18 
21:20:41 UTC (rev 1788)
@@ -64,6 +64,7 @@
                QRect getZoomedGeometry();              
                void zoom();
                void unzoom();
+               void totallyUnZoom();
                void showPDF(); 
 
                QString pageKeyCur;

Modified: trunk/client/elvys-client/src/pdfviewer.cpp
===================================================================
--- trunk/client/elvys-client/src/pdfviewer.cpp 2010-02-18 20:56:11 UTC (rev 
1787)
+++ trunk/client/elvys-client/src/pdfviewer.cpp 2010-02-18 21:20:41 UTC (rev 
1788)
@@ -339,6 +339,13 @@
        return value;
 }
 
+void PDFViewer::totallyUnZoom() {
+       while (zoomed) {
+               unzoom();
+       }
+}
+
+
 void PDFViewer::unzoom() {     
        int val1, val2;
 

Modified: trunk/client/elvys-client/src/pdfviewer.h
===================================================================
--- trunk/client/elvys-client/src/pdfviewer.h   2010-02-18 20:56:11 UTC (rev 
1787)
+++ trunk/client/elvys-client/src/pdfviewer.h   2010-02-18 21:20:41 UTC (rev 
1788)
@@ -54,6 +54,7 @@
                QRect getScrollGeometry();                              
                virtual void zoom();
                virtual void unzoom();
+               virtual void totallyUnZoom();
                virtual void showPDF();
                int adjustScrollBar(QScrollBar * scrollBar, double factor);
                void scrollByOnePage(ElvysNs::Direction);
[elvystrac] r1788 - unzoom to the normal mode on timer timeout

Other related posts:
