Renamed "Identity" -> "Annotations" config panel

It only contained an option to set annotations' author name

CMakeLists.txt

@@ -141,7 +141,7 @@ set(okularpart_SRCS
    conf/dlgdebug.cpp
    conf/dlgeditor.cpp
    conf/dlggeneral.cpp
-   conf/dlgidentity.cpp
+   conf/dlgannotations.cpp
    conf/dlgperformance.cpp
    conf/dlgpresentation.cpp
    ui/embeddedfilesdialog.cpp
@@ -186,7 +186,7 @@ kde4_add_ui_files(okularpart_SRCS
    conf/dlgaccessibilitybase.ui
    conf/dlgeditorbase.ui
    conf/dlggeneralbase.ui
-   conf/dlgidentitybase.ui
+   conf/dlgannotationsbase.ui
    conf/dlgperformancebase.ui
    conf/dlgpresentationbase.ui
 )

conf/dlgannotations.cpp

@@ -7,13 +7,13 @@
  *   (at your option) any later version.                                   *
  ***************************************************************************/
 
-#include "dlgidentity.h"
+#include "dlgannotations.h"
 
-#include "ui_dlgidentitybase.h"
+#include "ui_dlgannotationsbase.h"
 
-DlgIdentity::DlgIdentity( QWidget * parent )
+DlgAnnotations::DlgAnnotations( QWidget * parent )
     : QWidget( parent )
 {
-    Ui_DlgIdentityBase dlg;
+    Ui_DlgAnnotationsBase dlg;
     dlg.setupUi( this );
 }

conf/dlgannotations.h

@@ -7,16 +7,16 @@
  *   (at your option) any later version.                                   *
  ***************************************************************************/
 
-#ifndef _DLGIDENTITY_H_
-#define _DLGIDENTITY_H_
+#ifndef _DLGANNOTATIONS_H_
+#define _DLGANNOTATIONS_H_
 
 #include <qwidget.h>
 
 
-class DlgIdentity : public QWidget
+class DlgAnnotations : public QWidget
 {
     public:
-        DlgIdentity( QWidget * parent = 0 );
+        DlgAnnotations( QWidget * parent = 0 );
 };
 
 #endif

conf/dlgannotationsbase.ui

@@ -1,6 +1,6 @@
 <ui version="4.0" >
- <class>DlgIdentityBase</class>
- <widget class="QWidget" name="DlgIdentityBase" >
+ <class>DlgAnnotationsBase</class>
+ <widget class="QWidget" name="DlgAnnotationsBase" >
   <property name="geometry" >
    <rect>
     <x>0</x>

conf/preferencesdialog.cpp

@@ -17,7 +17,7 @@
 #include "dlgperformance.h"
 #include "dlgaccessibility.h"
 #include "dlgpresentation.h"
-#include "dlgidentity.h"
+#include "dlgannotations.h"
 #include "dlgeditor.h"
 #include "dlgdebug.h"
 
@@ -28,7 +28,7 @@ PreferencesDialog::PreferencesDialog( QWidget * parent, KConfigSkeleton * skelet
     m_performance = new DlgPerformance( this );
     m_accessibility = new DlgAccessibility( this );
     m_presentation = 0;
-    m_identity = 0;
+    m_annotations = 0;
     m_editor = 0;
 #ifdef OKULAR_DEBUG_CONFIGPAGE
     m_debug = new DlgDebug( this );
@@ -44,12 +44,11 @@ PreferencesDialog::PreferencesDialog( QWidget * parent, KConfigSkeleton * skelet
     else
     {
         m_presentation = new DlgPresentation( this );
-        m_identity = new DlgIdentity( this );
+        m_annotations = new DlgAnnotations( this );
         m_editor = new DlgEditor( this );
         addPage( m_presentation, i18n("Presentation"), "view-presentation",
                  i18n("Options for Presentation Mode") );
-        addPage( m_identity, i18n("Identity"), "preferences-desktop-personal",
-                 i18n("Identity Settings") );
+        addPage( m_annotations, i18n("Annotations"), "draw-freehand", i18n("Annotation Options") );
         addPage( m_editor, i18n("Editor"), "accessories-text-editor", i18n("Editor Options") );
     }
 #ifdef OKULAR_DEBUG_CONFIGPAGE

conf/preferencesdialog.h

@@ -21,7 +21,7 @@ class DlgGeneral;
 class DlgPerformance;
 class DlgAccessibility;
 class DlgPresentation;
-class DlgIdentity;
+class DlgAnnotations;
 class DlgEditor;
 class DlgDebug;
 
@@ -43,7 +43,7 @@ class PreferencesDialog : public KConfigDialog
         DlgPerformance * m_performance;
         DlgAccessibility * m_accessibility;
         DlgPresentation * m_presentation;
-        DlgIdentity * m_identity;
+        DlgAnnotations * m_annotations;
         DlgEditor * m_editor;
         DlgDebug * m_debug;
 };