Merged revisions 720689-721023 via svnmerge from

svn+ssh://dfaure@svn.kde.org/home/kde/trunk/KDE + resolved conflicts, fixed compilation in a number of places. svn path=/branches/work/kde4_jobflags/KDE/kdegraphics/okular/; revision=721065
2024-10-12 10:53:09 +00:00 · 2007-10-04 13:23:29 +00:00 · 2007-10-04 13:23:29 +00:00 · 1a463cb358
parent 56eecebe3f d5dc96cb3b
commit 1a463cb358
41 changed files with 118 additions and 47 deletions
--- a/conf/dlgidentitybase.ui
+++ b/conf/dlgidentitybase.ui
@ -10,22 +10,43 @@
   </rect>
  </property>
  <layout class="QVBoxLayout" >
-   <property name="margin" >
-    <number>0</number>
-   </property>
   <property name="spacing" >
    <number>6</number>
   </property>
+   <property name="leftMargin" >
+    <number>0</number>
+   </property>
+   <property name="topMargin" >
+    <number>0</number>
+   </property>
+   <property name="rightMargin" >
+    <number>0</number>
+   </property>
+   <property name="bottomMargin" >
+    <number>0</number>
+   </property>
   <item>
    <widget class="QGroupBox" name="groupBox" >
     <property name="title" >
      <string>Identity</string>
     </property>
     <layout class="QGridLayout" >
-      <property name="margin" >
+      <property name="leftMargin" >
       <number>9</number>
      </property>
-      <property name="spacing" >
+      <property name="topMargin" >
+       <number>9</number>
+      </property>
+      <property name="rightMargin" >
+       <number>9</number>
+      </property>
+      <property name="bottomMargin" >
+       <number>9</number>
+      </property>
+      <property name="horizontalSpacing" >
+       <number>6</number>
+      </property>
+      <property name="verticalSpacing" >
       <number>6</number>
      </property>
      <item row="0" column="0" >
@ -47,7 +68,7 @@
      <item row="1" column="0" colspan="2" >
       <widget class="QLabel" name="label_2" >
        <property name="text" >
-         <string>&lt;b>Note&lt;/b>: the information here are used only for comments and reviews. Information inserted here will be transmitted only under your knowledge.</string>
+         <string>&lt;b>Note&lt;/b>: the information here is used only for comments and reviews. Information inserted here will not be transmitted without your knowledge.</string>
        </property>
        <property name="alignment" >
         <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
--- a/core/document.cpp
+++ b/core/document.cpp
@ -1260,6 +1260,10 @@ KXMLGUIClient* Document::guiClient()

 void Document::closeDocument()
 {
+    // check if there's anything to close...
+    if ( !d->m_generator )
+        return;
+
    if ( d->m_fontThread )
    {
        disconnect( d->m_fontThread, 0, this, 0 );
--- a/core/okularGenerator.desktop
+++ b/core/okularGenerator.desktop
@ -12,6 +12,7 @@ Comment[gl]=Infraestrutura dun formato de ficheiro para okular
 Comment[is]=Skráasniðsstuðningur fyrir Okular
 Comment[ja]=okular のファイル形式バックエンド
 Comment[ko]=okular용 파일 형식 백엔드
+Comment[nds]=Dateiformaat-Hülpprogramm för Okular
 Comment[ne]=ओकुलरका लागि फाइल ढाँचा ब्याकइन्ड
 Comment[nl]=Bestandsformaat-backend voor Okular
 Comment[pa]=ਓਕੁਲਾਰ ਲਈ ਫਾਇਲ ਫਾਰਮੈਟ ਬੈਕਐਂਡ
--- a/generators/chm/kio-msits/msits.protocol
+++ b/generators/chm/kio-msits/msits.protocol
@ -16,6 +16,7 @@ Description[gl]=Un kioslave para mostrar ficheiros WinHelp
 Description[is]=Kioslave tilað sýna WinHelp skrár
 Description[ja]=WinHelp ファイルを表示するための kioslave
 Description[ko]=WinHelp 파일을 표시하기 위한 KIO 슬레이브
+Description[nds]=En In-/Utgaavmoduul för't Wiesen vun "WinHelp"-Dateien
 Description[ne]=विनहेल्प फाइल प्रदर्शन गर्नका लागि कियोस्लाभ
 Description[nl]=Een kioslave voor het weergeven van WinHelp-bestanden
 Description[pt]=Um 'kioslave' para mostrar ficheiros do WinHelp
--- a/generators/chm/libokularGenerator_chmlib.desktop
+++ b/generators/chm/libokularGenerator_chmlib.desktop
@ -13,6 +13,7 @@ Comment[gl]=Infraestrutura de ficheiros Windows HTMLHelp para okular
 Comment[is]=Windows HTMLHelp stuðningur fyrir Okular
 Comment[ja]=okular の Windows HTMLHelp バックエンド
 Comment[ko]=okular의 윈도 HTMLHelp 백엔드
+Comment[nds]=En Okular-Hülpprogramm för HTML-Hülpdateien vun Windows
 Comment[ne]=ओकुलरका लागि विन्डोज एचटीएमएल मद्दत ब्याकइन्ड
 Comment[nl]=Windows HTMLHelp-backend voor Okular
 Comment[pa]=ਓਕੁਲਾਰ ਲਈ ਵਿੰਡੋ HTMLHelp ਬੈਕਐਂਡ
--- a/generators/chm/okularApplication_chm.desktop
+++ b/generators/chm/okularApplication_chm.desktop
@ -5,6 +5,7 @@ Terminal=false
 Name=okular
 Name[de]=Okular
 Name[es]=Okular
+Name[nds]=Okular
 Name[ne]=ओकुलर
 Name[nl]=Okular
 Name[pa]=ਓਕੁਲਾਰ
@ -23,6 +24,7 @@ GenericName[is]=Skjalaskoðari
 GenericName[ja]=文書ビューア
 GenericName[kk]=Құжатты қарау
 GenericName[ko]=문서 뷰어
+GenericName[nds]=Dokmentkieker
 GenericName[ne]=कागजात दर्शक
 GenericName[nl]=Documentenviewer
 GenericName[pa]=ਦਸਤਾਵੇਜ਼ ਦਰਸ਼ਕ
--- a/generators/chm/okularChm.desktop
+++ b/generators/chm/okularChm.desktop
@ -4,6 +4,7 @@ Icon=okular
 Name=okular
 Name[de]=Okular
 Name[es]=Okular
+Name[nds]=Okular
 Name[ne]=ओकुलर
 Name[nl]=Okular
 Name[pa]=ਓਕੁਲਾਰ
--- a/generators/comicbook/libokularGenerator_comicbook.desktop
+++ b/generators/comicbook/libokularGenerator_comicbook.desktop
@ -6,6 +6,7 @@ Name[de]=Comicbook
 Name[el]=Βιβλίο κόμικ
 Name[gl]=Libro Comic
 Name[ko]=만화책
+Name[nds]=Comicbook
 Name[ne]=कस्मिक किताब
 Name[pa]=ਕਾਮਿਕਸ ਕਿਤਾਬ
 Name[pt]=Banda Desenhada
@ -20,6 +21,7 @@ Comment[es]=Motor Comic Book para Okular
 Comment[gl]=Infraestruturas de tebeos para okular
 Comment[ja]=okular の Comic Book バックエンド
 Comment[ko]=okular의 만화책 백엔드
+Comment[nds]=Billerbook-Hülpprogramm för Okular
 Comment[ne]=ओकुलरका लागि कस्मिक किताब
 Comment[nl]=Comic-book-backend voor Okular
 Comment[pa]=ਓਕੁਲਾਰ ਲਈ ਕਾਮਿਕਸ ਕਿਤਾਬ ਬੈਕਐਂਡ
--- a/generators/comicbook/okularApplication_comicbook.desktop
+++ b/generators/comicbook/okularApplication_comicbook.desktop
@ -5,6 +5,7 @@ Terminal=false
 Name=okular
 Name[de]=Okular
 Name[es]=Okular
+Name[nds]=Okular
 Name[ne]=ओकुलर
 Name[nl]=Okular
 Name[pa]=ਓਕੁਲਾਰ
@ -23,6 +24,7 @@ GenericName[is]=Skjalaskoðari
 GenericName[ja]=文書ビューア
 GenericName[kk]=Құжатты қарау
 GenericName[ko]=문서 뷰어
+GenericName[nds]=Dokmentkieker
 GenericName[ne]=कागजात दर्शक
 GenericName[nl]=Documentenviewer
 GenericName[pa]=ਦਸਤਾਵੇਜ਼ ਦਰਸ਼ਕ
--- a/generators/comicbook/okularComicbook.desktop
+++ b/generators/comicbook/okularComicbook.desktop
@ -4,6 +4,7 @@ Icon=okular
 Name=okular
 Name[de]=Okular
 Name[es]=Okular
+Name[nds]=Okular
 Name[ne]=ओकुलर
 Name[nl]=Okular
 Name[pa]=ਓਕੁਲਾਰ
--- a/generators/djvu/libokularGenerator_djvu.desktop
+++ b/generators/djvu/libokularGenerator_djvu.desktop
@ -12,6 +12,7 @@ Comment[es]=Motor DjVu para Okular
 Comment[gl]=Infraestrutura de DjVu para okular
 Comment[ja]=okular の DjVu バックエンド
 Comment[ko]=okular의 DjVu 백엔드
+Comment[nds]=DjVu-Hülpprogramm för Okular
 Comment[ne]=ओकुलरका लागि DjVu ब्याकइन्ड
 Comment[nl]=DjVu-backend voor Okular
 Comment[pa]=ਓਕੁਲਾਰ ਲਈ DjVu ਬੈਕਐਂਡ
--- a/generators/djvu/okularApplication_djvu.desktop
+++ b/generators/djvu/okularApplication_djvu.desktop
@ -5,6 +5,7 @@ Terminal=false
 Name=okular
 Name[de]=Okular
 Name[es]=Okular
+Name[nds]=Okular
 Name[ne]=ओकुलर
 Name[nl]=Okular
 Name[pa]=ਓਕੁਲਾਰ
@ -23,6 +24,7 @@ GenericName[is]=Skjalaskoðari
 GenericName[ja]=文書ビューア
 GenericName[kk]=Құжатты қарау
 GenericName[ko]=문서 뷰어
+GenericName[nds]=Dokmentkieker
 GenericName[ne]=कागजात दर्शक
 GenericName[nl]=Documentenviewer
 GenericName[pa]=ਦਸਤਾਵੇਜ਼ ਦਰਸ਼ਕ
--- a/generators/djvu/okularDjvu.desktop
+++ b/generators/djvu/okularDjvu.desktop
@ -4,6 +4,7 @@ Icon=okular
 Name=okular
 Name[de]=Okular
 Name[es]=Okular
+Name[nds]=Okular
 Name[ne]=ओकुलर
 Name[nl]=Okular
 Name[pa]=ਓਕੁਲਾਰ
--- a/generators/dvi/libokularGenerator_dvi.desktop
+++ b/generators/dvi/libokularGenerator_dvi.desktop
@ -12,6 +12,7 @@ Comment[es]=Motor DVI para Okular
 Comment[gl]=Infraestrutura de DVI para okular
 Comment[ja]=okular の DVI バックエンド
 Comment[ko]=okular의 DVI 백엔드
+Comment[nds]=DVI-Hülpprogramm för Okular
 Comment[ne]=ओकुलरका लागि डीभीआई ब्याकइन्ड
 Comment[nl]=DVI-backend voor Okular
 Comment[pa]=ਓਕੁਲਾਰ ਲਈ DVI ਬੈਕਐਂਡ
--- a/generators/dvi/okularApplication_dvi.desktop
+++ b/generators/dvi/okularApplication_dvi.desktop
@ -5,6 +5,7 @@ Terminal=false
 Name=okular
 Name[de]=Okular
 Name[es]=Okular
+Name[nds]=Okular
 Name[ne]=ओकुलर
 Name[nl]=Okular
 Name[pa]=ਓਕੁਲਾਰ
@ -23,6 +24,7 @@ GenericName[is]=Skjalaskoðari
 GenericName[ja]=文書ビューア
 GenericName[kk]=Құжатты қарау
 GenericName[ko]=문서 뷰어
+GenericName[nds]=Dokmentkieker
 GenericName[ne]=कागजात दर्शक
 GenericName[nl]=Documentenviewer
 GenericName[pa]=ਦਸਤਾਵੇਜ਼ ਦਰਸ਼ਕ
--- a/generators/dvi/okularDvi.desktop
+++ b/generators/dvi/okularDvi.desktop
@ -4,6 +4,7 @@ Icon=okular
 Name=okular
 Name[de]=Okular
 Name[es]=Okular
+Name[nds]=Okular
 Name[ne]=ओकुलर
 Name[nl]=Okular
 Name[pa]=ਓਕੁਲਾਰ
--- a/generators/fictionbook/libokularGenerator_fb.desktop
+++ b/generators/fictionbook/libokularGenerator_fb.desktop
@ -10,6 +10,7 @@ Name[es]=Documento FictionBook
 Name[gl]=Documento FictionBook
 Name[ja]=FictionBook 文書
 Name[ko]=FictionBook 문서
+Name[nds]=FictionBook-Dokment
 Name[ne]=फिक्सनबुक कागजात
 Name[nl]=FictionBook-document
 Name[pa]=FictionBook ਦਸਤਾਵੇਜ਼
@ -28,6 +29,7 @@ Comment[es]=Motor FictionBook para Okular
 Comment[gl]=Infraestrutura FictionBook para okular
 Comment[ja]=okular の FictionBook バックエンド
 Comment[ko]=okular의 FictoniBook 백엔드
+Comment[nds]=FictionBook-Hülpprogramm för Okular
 Comment[ne]=ओकुलरका लागि फिक्सनबुक ब्याकइन्ड
 Comment[nl]=FictionBook-backend voor Okular
 Comment[pa]=ਓਕੁਲਾਰ ਲਈ FictionBook ਬੈਕਐਂਡ
--- a/generators/fictionbook/okularApplication_fb.desktop
+++ b/generators/fictionbook/okularApplication_fb.desktop
@ -5,6 +5,7 @@ Terminal=false
 Name=okular
 Name[de]=Okular
 Name[es]=Okular
+Name[nds]=Okular
 Name[ne]=ओकुलर
 Name[nl]=Okular
 Name[pa]=ਓਕੁਲਾਰ
@ -23,6 +24,7 @@ GenericName[is]=Skjalaskoðari
 GenericName[ja]=文書ビューア
 GenericName[kk]=Құжатты қарау
 GenericName[ko]=문서 뷰어
+GenericName[nds]=Dokmentkieker
 GenericName[ne]=कागजात दर्शक
 GenericName[nl]=Documentenviewer
 GenericName[pa]=ਦਸਤਾਵੇਜ਼ ਦਰਸ਼ਕ
--- a/generators/fictionbook/okularFb.desktop
+++ b/generators/fictionbook/okularFb.desktop
@ -4,6 +4,7 @@ Icon=okular
 Name=okular
 Name[de]=Okular
 Name[es]=Okular
+Name[nds]=Okular
 Name[ne]=ओकुलर
 Name[nl]=Okular
 Name[pa]=ਓਕੁਲਾਰ
--- a/generators/ghostview/okularApplication_ghostview.desktop
+++ b/generators/ghostview/okularApplication_ghostview.desktop
@ -5,6 +5,7 @@ Terminal=false
 Name=okular
 Name[de]=Okular
 Name[es]=Okular
+Name[nds]=Okular
 Name[ne]=ओकुलर
 Name[nl]=Okular
 Name[pa]=ਓਕੁਲਾਰ
@ -23,6 +24,7 @@ GenericName[is]=Skjalaskoðari
 GenericName[ja]=文書ビューア
 GenericName[kk]=Құжатты қарау
 GenericName[ko]=문서 뷰어
+GenericName[nds]=Dokmentkieker
 GenericName[ne]=कागजात दर्शक
 GenericName[nl]=Documentenviewer
 GenericName[pa]=ਦਸਤਾਵੇਜ਼ ਦਰਸ਼ਕ
--- a/generators/ghostview/okularGhostview.desktop
+++ b/generators/ghostview/okularGhostview.desktop
@ -4,6 +4,7 @@ Icon=okular
 Name=okular
 Name[de]=Okular
 Name[es]=Okular
+Name[nds]=Okular
 Name[ne]=ओकुलर
 Name[nl]=Okular
 Name[pa]=ਓਕੁਲਾਰ
--- a/generators/kimgio/okularApplication_kimgio.desktop
+++ b/generators/kimgio/okularApplication_kimgio.desktop
@ -5,6 +5,7 @@ Terminal=false
 Name=okular
 Name[de]=Okular
 Name[es]=Okular
+Name[nds]=Okular
 Name[ne]=ओकुलर
 Name[nl]=Okular
 Name[pa]=ਓਕੁਲਾਰ
@ -23,6 +24,7 @@ GenericName[is]=Skjalaskoðari
 GenericName[ja]=文書ビューア
 GenericName[kk]=Құжатты қарау
 GenericName[ko]=문서 뷰어
+GenericName[nds]=Dokmentkieker
 GenericName[ne]=कागजात दर्शक
 GenericName[nl]=Documentenviewer
 GenericName[pa]=ਦਸਤਾਵੇਜ਼ ਦਰਸ਼ਕ
--- a/generators/kimgio/okularKimgio.desktop
+++ b/generators/kimgio/okularKimgio.desktop
@ -4,6 +4,7 @@ Icon=okular
 Name=okular
 Name[de]=Okular
 Name[es]=Okular
+Name[nds]=Okular
 Name[ne]=ओकुलर
 Name[nl]=Okular
 Name[pa]=ਓਕੁਲਾਰ
--- a/generators/ooo/okularApplication_ooo.desktop
+++ b/generators/ooo/okularApplication_ooo.desktop
@ -5,6 +5,7 @@ Terminal=false
 Name=okular
 Name[de]=Okular
 Name[es]=Okular
+Name[nds]=Okular
 Name[ne]=ओकुलर
 Name[nl]=Okular
 Name[pa]=ਓਕੁਲਾਰ
@ -23,6 +24,7 @@ GenericName[is]=Skjalaskoðari
 GenericName[ja]=文書ビューア
 GenericName[kk]=Құжатты қарау
 GenericName[ko]=문서 뷰어
+GenericName[nds]=Dokmentkieker
 GenericName[ne]=कागजात दर्शक
 GenericName[nl]=Documentenviewer
 GenericName[pa]=ਦਸਤਾਵੇਜ਼ ਦਰਸ਼ਕ
--- a/generators/ooo/okularOoo.desktop
+++ b/generators/ooo/okularOoo.desktop
@ -4,6 +4,7 @@ Icon=okular
 Name=okular
 Name[de]=Okular
 Name[es]=Okular
+Name[nds]=Okular
 Name[ne]=ओकुलर
 Name[nl]=Okular
 Name[pa]=ਓਕੁਲਾਰ
--- a/generators/plucker/okularApplication_plucker.desktop
+++ b/generators/plucker/okularApplication_plucker.desktop
@ -5,6 +5,7 @@ Terminal=false
 Name=okular
 Name[de]=Okular
 Name[es]=Okular
+Name[nds]=Okular
 Name[ne]=ओकुलर
 Name[nl]=Okular
 Name[pa]=ਓਕੁਲਾਰ
@ -23,6 +24,7 @@ GenericName[is]=Skjalaskoðari
 GenericName[ja]=文書ビューア
 GenericName[kk]=Құжатты қарау
 GenericName[ko]=문서 뷰어
+GenericName[nds]=Dokmentkieker
 GenericName[ne]=कागजात दर्शक
 GenericName[nl]=Documentenviewer
 GenericName[pa]=ਦਸਤਾਵੇਜ਼ ਦਰਸ਼ਕ
--- a/generators/plucker/okularPlucker.desktop
+++ b/generators/plucker/okularPlucker.desktop
@ -4,6 +4,7 @@ Icon=okular
 Name=okular
 Name[de]=Okular
 Name[es]=Okular
+Name[nds]=Okular
 Name[ne]=ओकुलर
 Name[nl]=Okular
 Name[pa]=ਓਕੁਲਾਰ
--- a/generators/poppler/okularApplication_pdf.desktop
+++ b/generators/poppler/okularApplication_pdf.desktop
@ -5,6 +5,7 @@ Terminal=false
 Name=okular
 Name[de]=Okular
 Name[es]=Okular
+Name[nds]=Okular
 Name[ne]=ओकुलर
 Name[nl]=Okular
 Name[pa]=ਓਕੁਲਾਰ
@ -23,6 +24,7 @@ GenericName[is]=Skjalaskoðari
 GenericName[ja]=文書ビューア
 GenericName[kk]=Құжатты қарау
 GenericName[ko]=문서 뷰어
+GenericName[nds]=Dokmentkieker
 GenericName[ne]=कागजात दर्शक
 GenericName[nl]=Documentenviewer
 GenericName[pa]=ਦਸਤਾਵੇਜ਼ ਦਰਸ਼ਕ
--- a/generators/poppler/okularPoppler.desktop
+++ b/generators/poppler/okularPoppler.desktop
@ -4,6 +4,7 @@ Icon=okular
 Name=okular
 Name[de]=Okular
 Name[es]=Okular
+Name[nds]=Okular
 Name[ne]=ओकुलर
 Name[nl]=Okular
 Name[pa]=ਓਕੁਲਾਰ
--- a/generators/tiff/okularApplication_tiff.desktop
+++ b/generators/tiff/okularApplication_tiff.desktop
@ -5,6 +5,7 @@ Terminal=false
 Name=okular
 Name[de]=Okular
 Name[es]=Okular
+Name[nds]=Okular
 Name[ne]=ओकुलर
 Name[nl]=Okular
 Name[pa]=ਓਕੁਲਾਰ
@ -23,6 +24,7 @@ GenericName[is]=Skjalaskoðari
 GenericName[ja]=文書ビューア
 GenericName[kk]=Құжатты қарау
 GenericName[ko]=문서 뷰어
+GenericName[nds]=Dokmentkieker
 GenericName[ne]=कागजात दर्शक
 GenericName[nl]=Documentenviewer
 GenericName[pa]=ਦਸਤਾਵੇਜ਼ ਦਰਸ਼ਕ
--- a/generators/tiff/okularTiff.desktop
+++ b/generators/tiff/okularTiff.desktop
@ -4,6 +4,7 @@ Icon=okular
 Name=okular
 Name[de]=Okular
 Name[es]=Okular
+Name[nds]=Okular
 Name[ne]=ओकुलर
 Name[nl]=Okular
 Name[pa]=ਓਕੁਲਾਰ
--- a/generators/xps/okularApplication_xps.desktop
+++ b/generators/xps/okularApplication_xps.desktop
@ -5,6 +5,7 @@ Terminal=false
 Name=okular
 Name[de]=Okular
 Name[es]=Okular
+Name[nds]=Okular
 Name[ne]=ओकुलर
 Name[nl]=Okular
 Name[pa]=ਓਕੁਲਾਰ
@ -23,6 +24,7 @@ GenericName[is]=Skjalaskoðari
 GenericName[ja]=文書ビューア
 GenericName[kk]=Құжатты қарау
 GenericName[ko]=문서 뷰어
+GenericName[nds]=Dokmentkieker
 GenericName[ne]=कागजात दर्शक
 GenericName[nl]=Documentenviewer
 GenericName[pa]=ਦਸਤਾਵੇਜ਼ ਦਰਸ਼ਕ
--- a/generators/xps/okularXps.desktop
+++ b/generators/xps/okularXps.desktop
@ -4,6 +4,7 @@ Icon=okular
 Name=okular
 Name[de]=Okular
 Name[es]=Okular
+Name[nds]=Okular
 Name[ne]=ओकुलर
 Name[nl]=Okular
 Name[pa]=ਓਕੁਲਾਰ
--- a/okular_part.desktop
+++ b/okular_part.desktop
@ -4,6 +4,7 @@ Icon=okular
 Name=okular
 Name[de]=Okular
 Name[es]=Okular
+Name[nds]=Okular
 Name[ne]=ओकुलर
 Name[nl]=Okular
 Name[pa]=ਓਕੁਲਾਰ
--- a/part.cpp
+++ b/part.cpp
@ -474,6 +474,9 @@ m_cliPresentation(false), m_generatorGuiClient(0)

 Part::~Part()
 {
+    if ( m_document->isOpened() )
+        Part::closeUrl();
+
    delete m_toc;
    delete m_pageView;
    delete m_thumbnailList;
--- a/shell/okular.desktop
+++ b/shell/okular.desktop
@ -4,6 +4,7 @@ Terminal=false
 Name=okular
 Name[de]=Okular
 Name[es]=Okular
+Name[nds]=Okular
 Name[ne]=ओकुलर
 Name[nl]=Okular
 Name[pa]=ਓਕੁਲਾਰ
@ -22,6 +23,7 @@ GenericName[is]=Skjalaskoðari
 GenericName[ja]=文書ビューア
 GenericName[kk]=Құжатты қарау
 GenericName[ko]=문서 뷰어
+GenericName[nds]=Dokmentkieker
 GenericName[ne]=कागजात दर्शक
 GenericName[nl]=Documentenviewer
 GenericName[pa]=ਦਸਤਾਵੇਜ਼ ਦਰਸ਼ਕ
--- a/ui/annotationguiutils.cpp
+++ b/ui/annotationguiutils.cpp
@ -19,8 +19,7 @@ namespace AnnotationGuiUtils {

 QString captionForAnnotation( const Okular::Annotation * ann )
 {
-    if ( !ann )
-        return QString();
+    Q_ASSERT( ann );

    QString ret;
    switch( ann->subType() )
@ -54,16 +53,14 @@ QString captionForAnnotation( const Okular::Annotation * ann )

 QString authorForAnnotation( const Okular::Annotation * ann )
 {
-    if ( !ann )
-        return QString();
+    Q_ASSERT( ann );

    return !ann->author().isEmpty() ? ann->author() : i18nc( "Unknown author", "Unknown" );
 }

 QString contents( const Okular::Annotation * ann )
 {
-    if ( !ann )
-        return QString();
+    Q_ASSERT( ann );

    // 1. window text
    QString ret = ann->window().text();
@ -94,15 +91,14 @@ QString contentsHtml( const Okular::Annotation * ann )

 QString prettyToolTip( const Okular::Annotation * ann )
 {
-    if ( !ann )
-        return QString();
+    Q_ASSERT( ann );

    QString author = authorForAnnotation( ann );
    QString contents = contentsHtml( ann );

    QString tooltip = QString( "<qt><b>" ) + i18n( "Author: %1", author ) + QString( "</b>" );
    if ( !contents.isEmpty() )
-        tooltip += QString( "<hr />" ) + contents;
+        tooltip += QString( "<div style=\"font-size: 4px;\"><hr /></div>" ) + contents;

    tooltip += "</qt>";

@ -111,8 +107,7 @@ QString prettyToolTip( const Okular::Annotation * ann )

 bool canBeMoved( const Okular::Annotation * ann )
 {
-    if ( !ann )
-        return false;
+    Q_ASSERT( ann );

    switch( ann->subType() )
    {
--- a/ui/annotationmodel.cpp
+++ b/ui/annotationmodel.cpp
@ -307,7 +307,7 @@ QVariant AnnotationModel::data( const QModelIndex &index, int role ) const
            return AnnotationGuiUtils::captionForAnnotation( item->annotation );
            break;
        case Qt::DecorationRole:
-            return KIcon( "okular" );
+            return KIcon( "graphics-viewer-document" );
            break;
        case Qt::ToolTipRole:
            return AnnotationGuiUtils::prettyToolTip( item->annotation );
--- a/ui/annotationpropertiesdialog.cpp
+++ b/ui/annotationpropertiesdialog.cpp
@ -75,6 +75,7 @@ AnnotsPropertiesDialog::AnnotsPropertiesDialog( QWidget *parent, Okular::Documen
    m_opacity = new KIntNumInput( page );
    m_opacity->setRange( 0, 100, 1, true );
    m_opacity->setValue( (int)( ann->style().opacity() * 100 ) );
+    m_opacity->setSuffix( i18nc( "Suffix for the opacity level, eg '80 %'", " %" ) );
    m_opacity->setEnabled( canEditAnnotations );
    tmplabel->setBuddy( m_opacity );
    hlay->addWidget( m_opacity );
@ -113,22 +114,6 @@ AnnotsPropertiesDialog::AnnotsPropertiesDialog( QWidget *parent, Okular::Documen

    gridlayout->addItem( new QSpacerItem( 5, 5, QSizePolicy::Fixed, QSizePolicy::MinimumExpanding ), 3, 0 );
    //END tab 2
-    //BEGIN advance properties:
-    page = new QFrame( this );
-    addPage( page, i18n( "&Advanced" ) );
-    gridlayout = new QGridLayout( page );
-    
-    tmplabel = new QLabel( i18n( "Contents:" ), page );
-    gridlayout->addWidget( tmplabel, 0, 0 );
-    m_contents = new QTextEdit( page );
-    gridlayout->addWidget( m_contents, 1, 0 );
-    m_contents->setAcceptRichText( false );
-    m_contents->setReadOnly( true );
-    m_contents->setPlainText( ann->contents() );
-    m_contents->setEnabled( canEditAnnotations );
-
-    gridlayout->addItem( new QSpacerItem( 5, 5, QSizePolicy::Fixed, QSizePolicy::MinimumExpanding ), 4, 0 );
-    //END advance

    //BEGIN connections
    connect( colorBn, SIGNAL( changed( const QColor& ) ), this, SLOT( setModified() ) );
--- a/ui/annotationpropertiesdialog.h
+++ b/ui/annotationpropertiesdialog.h
@ -14,7 +14,6 @@

 class QLabel;
 class QLineEdit;
-class QTextEdit;
 class KColorButton;
 class KIntNumInput;
 class AnnotationWidget;
@ -42,7 +41,6 @@ private:
    KIntNumInput *m_opacity;
    AnnotationWidget *m_annotWidget;
    QLabel *m_modifyDateLabel;
-    QTextEdit *m_contents;
    
    void setCaptionTextbyAnnotType();

--- a/ui/pagepainter.cpp
+++ b/ui/pagepainter.cpp
@ -30,7 +30,7 @@
 #include "core/utils.h"
 #include "settings.h"

-K_GLOBAL_STATIC_WITH_ARGS( QPixmap, busyPixmap, ( KIconLoader::global()->loadIcon("okular", KIconLoader::NoGroup, 32, KIconLoader::DefaultState, QStringList(), 0, true) ) )
+K_GLOBAL_STATIC_WITH_ARGS( QPixmap, busyPixmap, ( KIconLoader::global()->loadIcon("graphics-viewer-document", KIconLoader::NoGroup, 32, KIconLoader::DefaultState, QStringList(), 0, true) ) )

 #define TEXTANNOTATION_ICONSIZE 24

@ -789,15 +789,6 @@ void PagePainter::drawShapeOnImage(
    double fImageWidth = (double)imageWidth;
    double fImageHeight = (double)imageHeight;

-    // create a 'path'
-    QPainterPath path;
-    path.moveTo( normPath[ 0 ].x * fImageWidth, normPath[ 0 ].y * fImageHeight );
-    for ( int i = 1; i < pointsNumber; i++ )
-    {
-        path.lineTo( normPath[ i ].x * fImageWidth, normPath[ i ].y * fImageHeight );
-    }
-    if ( closeShape ) path.closeSubpath();
-
    // stroke outline
    double penWidth = (double)pen.width() * penWidthMultiplier;
    QPainter painter(&image);
@ -811,5 +802,31 @@ void PagePainter::drawShapeOnImage(
        painter.setCompositionMode(QPainter::CompositionMode_Multiply);
    }

-    painter.drawPath(path);
+    if ( brush.style() == Qt::NoBrush )
+    {
+        // create a polygon
+        QPolygonF poly( closeShape ? pointsNumber + 1 : pointsNumber );
+        for ( int i = 0; i < pointsNumber; ++i )
+        {
+            poly[ i ] = QPointF( normPath[ i ].x * fImageWidth, normPath[ i ].y * fImageHeight );
+        }
+        if ( closeShape )
+            poly[ pointsNumber ] = poly[ 0 ];
+
+        painter.drawPolyline( poly );
+    }
+    else
+    {
+        // create a 'path'
+        QPainterPath path;
+        path.moveTo( normPath[ 0 ].x * fImageWidth, normPath[ 0 ].y * fImageHeight );
+        for ( int i = 1; i < pointsNumber; i++ )
+        {
+            path.lineTo( normPath[ i ].x * fImageWidth, normPath[ i ].y * fImageHeight );
+        }
+        if ( closeShape )
+            path.closeSubpath();
+
+        painter.drawPath( path );
+    }
 }