From 5862ea6dc8df338dcf9ada2e5cc82dee0dfdc716 Mon Sep 17 00:00:00 2001
From: Pino Toscano <pino@kde.org>
Date: Thu, 2 Nov 2006 22:19:32 +0000
Subject: [PATCH] create an Identity settings section and move the author field
 there

svn path=/trunk/playground/graphics/okular/; revision=601335
---
 conf/okular.kcfg         | 4 +++-
 ui/pageviewannotator.cpp | 6 +++---
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/conf/okular.kcfg b/conf/okular.kcfg
index d6162be24..79117df5c 100644
--- a/conf/okular.kcfg
+++ b/conf/okular.kcfg
@@ -128,7 +128,6 @@
   </entry>
  </group>
  <group name="General" >
-  <entry key="AnnotationsAuthor" type="String" />
   <entry key="ObeyDRM" type="Bool" >
    <default>true</default>
   </entry>	  	
@@ -205,4 +204,7 @@
     <max>4.0</max>
   </entry>
  </group>
+ <group name="Identity" >
+  <entry key="IdentityAuthor" type="String" />
+ </group>
 </kcfg>
diff --git a/ui/pageviewannotator.cpp b/ui/pageviewannotator.cpp
index 787856afc..cfc4fa119 100644
--- a/ui/pageviewannotator.cpp
+++ b/ui/pageviewannotator.cpp
@@ -605,7 +605,7 @@ void PageViewAnnotator::setEnabled( bool on )
     m_toolBar->showItems( (PageViewToolBar::Side)Okular::Settings::editToolBarPlacement(), items );
 
     // ask for Author's name if not already set
-    if ( Okular::Settings::annotationsAuthor().isEmpty() )
+    if ( Okular::Settings::identityAuthor().isEmpty() )
     {
         // get default username from the kdelibs/kdecore/KUser
         KUser currentUser;
@@ -620,7 +620,7 @@ void PageViewAnnotator::setEnabled( bool on )
             firstTry = false;
         }
         // save the name
-        Okular::Settings::setAnnotationsAuthor( userName );
+        Okular::Settings::setIdentityAuthor( userName );
         Okular::Settings::writeConfig();
     }
 }
@@ -695,7 +695,7 @@ QRect PageViewAnnotator::routeEvent( QMouseEvent * e, PageViewItem * item )
             if ( !annotation ) continue;
 
             annotation->creationDate = annotation->modifyDate = QDateTime::currentDateTime();
-            annotation->author = Okular::Settings::annotationsAuthor();
+            annotation->author = Okular::Settings::identityAuthor();
             m_document->addPageAnnotation( m_lockedItem->pageNumber(), annotation );
         }