Added kwallet support for passwords storage. Works smoothly: kwallet has a

  really nice (and well documented) API! Passwords of protected files are
  stored in the 'KPdf' folder of the Network wallet.
Updated todo.

svn path=/branches/kpdf_annotations/kdegraphics/kpdf/; revision=391251

TODO

@@ -5,42 +5,31 @@ Legend:
     FIX - FIXed (bug or regression)
     MRG - MeRGed (code from a branch or a patch)
 
-Status (last 3 updates):
--> 2005-02-12: HEAD for bugfixes only. created a branch for development.
--> 2005-02-03+: Fixing bugs until 3.4 release.. reports are welcome!!!
--> 2005-02-02: Features for 3.4 done. Ready for bugfixes.
--> 2005-01-27: Stable and leakchecked. Usability: needs testing.
-
 In progress:
-  -- Branch 'kpdf_annotations' opened on 2005-Feb-12 --
-  HEAD: fixing bugs as they come.
-  BRANCH: implementing Annotations (and maybe other stuff).
-  please foreport fixes to the branch too.
+-> screen editing (annotations): framework (BR67300,BR62793)
+-> screen editing (annotations): tools (BR67300), yellow notes 'post-it' like
+-> se: investigate popup disappearing
+-> se: display tooltip only the first time
+-> se: check tools not working after a certain time (pretty nice bug :-)
 
 More items (first items will enter 'In progress list' first):
-  -- THIS LIST IS FROZEN FOR 3.4 RELEASE --
--> good viewport support in presentation (dynamic obs notify) and viewport queuing for
-   hidden widgets
 -> search: google search in the page
 -> pageview: add scrollbar marks for bookmarks (like kate)
--> screen editing (annotations): framework (BR67300,BR62793)
--> screen editing (annotations): tools (BR67300), yellow notes 'post-it' like
--> go to next/previous bookmark actions (showing in thumbnailslist rmb popup too)
+-> bookmarks: fastmarks (new bookmark concept with tab-like signs, shortcuts, etc)
+-> bookmarks: go to next/previous actions (showing in thumbnailslist rmb popup too)
 -> viewport restoring: sometimes it seems to restore the viewport a bit under where it was
 -> viewport restoring: save the page width setting between runs (save/restore zoom factor)
 -> presentation: provide a pageX/totalPages indicator in addition to the circle one
--> cleanup code and update README.png
 -> search: use shortcut for 'find next' action (not the default one) in find-ahead
--> show Viewport in ThumbnailsList (blended/contour)
--> Delay TOC (DocumentSynapsis) generation (and move it on thread)
--> add a way to handle "named xpdf links" in KPDFLink instead of resolving all destinations
-   when displaying a page (speedups a lot generation of page with many links)
--> refactor ThumbnailsList to do internal rendering as pageview does (way faster
+-> core: Delay TOC (DocumentSynapsis) generation (and move it on thread)
+-> core: add a way to handle "named xpdf links" in KPDFLink instead of resolving all
+   dests when displaying a page (speedups a lot generation of page with many links)
+-> thumbnailslist: show Viewport in(blended/contour)
+-> thumbnailslist: refactor to do internal rendering as pageview does (way faster
    than using QScrollView + inserted Widgets and saves 8% on document loading)
 -> usability: layout 2PPV [1 2,3 4,5 6] -> [1,2 3,4 5]. add option for 'ebook' style alignment
--> usability: trigger redraw on 'filter text' on current page (need new highligh engine first)
--> abstract TextPage generation (the last xpdf dependant class!). then go dancing in the
-   streets.
+-> core: abstract TextPage generation (the last xpdf dependant class!). then go dancing
+   in the streets. make it new and easy to use for wp-style selections.
 -> Dom framework to cache document metadata. It should archive those types of data:
    (NOTE: already Dom'ed object is marked with 'X')
    - <X> Synopsis will go there after 1st generation (so we can edit it too)
@@ -56,15 +45,12 @@ More items (first items will enter 'In progress list' first):
    in a separated diagram or text file.
 -> add kpdf manual in PDF format loaded on the first startup or on menu->help->manual
    this visually explains basic usage, mouse buttons functions & more..
--> take care of TODOs in code
 -> ADD: click over image allows "save image" [60% done (activerect of type image)]
--> export all text in plain_text/html
--> extract(export?) images (have a look at ImageOutputDev.cc and pdfimages.cc from xpdf (not in our xpdf sources))
--> text selection in wordprocessor style (very hard)
+-> text selection in wordprocessor style (very hard, not impossible)
 -> zoom: fit text (with configurable margin)
 -> bookview: 3d opengl widget for viewing the document as a real book (turning pages, etc..)
 -> open gzipped (.pdf.gz?) files
--> kspeech TTS interface. speech {document / page / selection(done)}
+-> kspeech TTS interface. speech {document(missing) / page(missing) / selection(done)}
 -> automatic online dictionaries / translators (BR80338)
 -> core: pdf forms support
 -> add OCR for building TextPages out of pure graphical (aka scanned) pages
@@ -77,15 +63,22 @@ More items (first items will enter 'In progress list' first):
 -> investigate 'Splash' lack of smoothness at low resolutions (see lines in thumbnails)
 -> add search on the toc widget (a 'prune on type' lineedit like in thumbnails widget)
 -> goto 'logical' page (usually differs from pdf's page) (req. by Luca Burrelli)
--> use wallet for storing passwords of encrypted files
 -> use shortcuts for next and prev page even in presenatation mode (by Tobias Koenig)
 -> move some document related features from part to the document (see find, goto dialog, ...)
 -> Albert: Read pdf specification and see if paths with length = 1 are allowed, in case they are allowed see how to fix 97131 without skipping paths with length = 1
 -> tools: ruler, measure: distance, perimeter, ?area?, color picker
--> export: export to other formats keeping formatting (a dream.. except for PNG :-) (PS is easy, we just have PSOutputDev that does it :-D)
+-> export: all text in plain_text(fast)/html(hard)
+-> export: export to other formats keeping formatting (PS is easy, we just have PSOutputDev that does it :-D. PNG is easy too)
+-> export: extract images (have a look at ImageOutputDev.cc and pdfimages.cc from xpdf (not in our xpdf sources))
 -> history as a toolbox child (collecting Doc's viewport changes notifications)
+-> take care of TODOs in code
+-> cleanup code and update README.png
 
 Done (newest features come first):
+-> ADD: use kde wallet for storing passwords of protected files
+-> The branch 'kpdf_annotations' was created at this point. [2005-Feb-12]
+-> FIX: trigger redraw on 'filter text' on current page (need new highligh engine first)
+-> FIX: fixed viewport saving/restoring (+performance fix) on presentation mode
 -> FIX: leakfix when closing document while thread was running (no more leaks now)
 -> FIX: direct hi-performance pixels manipulation for highlighting (instead of the obsoleted setRasterOp)
 -> CHG: new search api. supports multiple searches at once, multiple highlighs per page

core/generator_pdf/generator_pdf.cpp

@@ -15,6 +15,7 @@
 #include <qapplication.h>
 #include <klocale.h>
 #include <kpassdlg.h>
+#include <kwallet.h>
 #include <kprinter.h>
 #include <ktempfile.h>
 #include <kmessagebox.h>
@@ -82,7 +83,7 @@ PDFGenerator::~PDFGenerator()
 
 
 //BEGIN Generator inherited functions
-bool PDFGenerator::loadDocument( const QString & fileName, QValueVector<KPDFPage*> & pagesVector )
+bool PDFGenerator::loadDocument( const QString & filePath, QValueVector<KPDFPage*> & pagesVector )
 {
 #ifndef NDEBUG
     if ( pdfdoc )
@@ -92,28 +93,62 @@ bool PDFGenerator::loadDocument( const QString & fileName, QValueVector<KPDFPage
     }
 #endif
     // create PDFDoc for the given file
-    pdfdoc = new PDFDoc( new GString( QFile::encodeName( fileName ) ), 0, 0 );
+    pdfdoc = new PDFDoc( new GString( QFile::encodeName( filePath ) ), 0, 0 );
 
     // if the file didn't open correctly it might be encrypted, so ask for a pass
-    bool firstTry = true;
+    bool firstInput = true;
+    bool triedWallet = false;
+    KWallet::Wallet * wallet = 0;
     while ( !pdfdoc->isOk() && pdfdoc->getErrorCode() == errEncrypted )
     {
-        QString prompt;
-        if ( firstTry )
-            prompt = i18n( "Please insert the password to read the document:" );
-        else
-            prompt = i18n( "Incorrect password. Try again:" );
-        firstTry = false;
+        QCString password;
 
-        QCString pwd;
-        if ( KPasswordDialog::getPassword( pwd, prompt ) != KPasswordDialog::Accepted )
-            break;
-        else
+        // 1.A. try to retrieve the first password from the kde wallet system
+        if ( !triedWallet )
+        {
+            QString walletName = KWallet::Wallet::NetworkWallet();
+            wallet = KWallet::Wallet::openWallet( walletName );
+            if ( wallet )
+            {
+                // use the KPdf folder (and create if missing)
+                if ( !wallet->hasFolder( "KPdf" ) )
+                    wallet->createFolder( "KPdf" );
+                wallet->setFolder( "KPdf" );
+
+                // look for the pass in that folder
+                QString retrievedPass;
+                if ( !wallet->readPassword( filePath.section('/', -1, -1), retrievedPass ) )
+                    password = retrievedPass.local8Bit();
+            }
+            triedWallet = true;
+        }
+
+        // 1.B. if not retrieved, ask the password using the kde password dialog
+        if ( password.isNull() )
+        {
+            QString prompt;
+            if ( firstInput )
+                prompt = i18n( "Please insert the password to read the document:" );
+            else
+                prompt = i18n( "Incorrect password. Try again:" );
+            firstInput = false;
+
+            // if the user presses cancel, abort opening
+            if ( KPasswordDialog::getPassword( password, prompt ) != KPasswordDialog::Accepted )
+                break;
+        }
+
+        // 2. reopen the document using the password
+        GString * pwd2 = new GString( password.data() );
+        delete pdfdoc;
+        pdfdoc = new PDFDoc( new GString( QFile::encodeName( filePath ) ), pwd2, pwd2 );
+        delete pwd2;
+
+        // 3. if the password is correct, store it to the wallet
+        if ( pdfdoc->isOk() && wallet && /*safety check*/ wallet->isOpen() )
         {
-            GString * pwd2 = new GString( pwd.data() );
-            delete pdfdoc;
-            pdfdoc = new PDFDoc( new GString( QFile::encodeName( fileName ) ), pwd2, pwd2 );
-            delete pwd2;
+            QString goodPass = QString::fromLocal8Bit( password.data() );
+            wallet->writePassword( filePath.section('/', -1, -1), goodPass );
         }
     }
     if ( !pdfdoc->isOk() )