Merge remote-tracking branch 'origin/master' into frameworks

Conflicts: part.cpp
11 years ago · 61628e5bc7
parent c4f224f1e8 24006bb951
commit 61628e5bc7
11 changed files with 12 additions and 10 deletions
--- a/generators/comicbook/active-documentviewer_comicbook.desktop
+++ b/generators/comicbook/active-documentviewer_comicbook.desktop
@ -196,6 +196,6 @@ X-KDE-Keywords[sr@latin]=cbr, cbz, cbt, Comic Book,ComicBook
 X-KDE-Keywords[sv]=cbr, cbz, cbt, Comic Book
 X-KDE-Keywords[tr]=cbr, cbz, cbt, Comic Book
 X-KDE-Keywords[uk]=cbr,cbz,cbt,Comic Book,комікс
-X-KDE-Keywords[x-test]=xxcbr, cbz, cbt, Comic Bookxx
+X-KDE-Keywords[x-test]=xxcbrxx,xx cbzxx,xx cbtxx,xx Comic Bookxx
 X-KDE-Keywords[zh_CN]=cbr, cbz, cbt, Comic Book,漫画书,漫画,连环画
 X-KDE-Keywords[zh_TW]=cbr, cbz, cbt, Comic Book
--- a/generators/comicbook/okularApplication_comicbook.desktop
+++ b/generators/comicbook/okularApplication_comicbook.desktop
@ -176,6 +176,6 @@ X-KDE-Keywords[sr@latin]=cbr, cbz, cbt, Comic Book,ComicBook
 X-KDE-Keywords[sv]=cbr, cbz, cbt, Comic Book
 X-KDE-Keywords[tr]=cbr, cbz, cbt, Comic Book
 X-KDE-Keywords[uk]=cbr,cbz,cbt,Comic Book,комікс
-X-KDE-Keywords[x-test]=xxcbr, cbz, cbt, Comic Bookxx
+X-KDE-Keywords[x-test]=xxcbrxx,xx cbzxx,xx cbtxx,xx Comic Bookxx
 X-KDE-Keywords[zh_CN]=cbr, cbz, cbt, Comic Book,漫画书,漫画,连环画
 X-KDE-Keywords[zh_TW]=cbr, cbz, cbt, Comic Book
--- a/generators/epub/active-documentviewer_epub.desktop
+++ b/generators/epub/active-documentviewer_epub.desktop
@ -196,6 +196,6 @@ X-KDE-Keywords[sr@latin]=epub, e-book,EPUB,e‑knjiga
 X-KDE-Keywords[sv]=epub, e-bok
 X-KDE-Keywords[tr]=epub, e-book
 X-KDE-Keywords[uk]=epub,e-book,електронна,книга
-X-KDE-Keywords[x-test]=xxepub, e-bookxx
+X-KDE-Keywords[x-test]=xxepubxx,xx e-bookxx
 X-KDE-Keywords[zh_CN]=epub, e-book,电子书
 X-KDE-Keywords[zh_TW]=epub, e-book
--- a/generators/epub/okularApplication_epub.desktop
+++ b/generators/epub/okularApplication_epub.desktop
@ -176,6 +176,6 @@ X-KDE-Keywords[sr@latin]=epub, e-book,EPUB,e‑knjiga
 X-KDE-Keywords[sv]=epub, e-bok
 X-KDE-Keywords[tr]=epub, e-book
 X-KDE-Keywords[uk]=epub,e-book,електронна,книга
-X-KDE-Keywords[x-test]=xxepub, e-bookxx
+X-KDE-Keywords[x-test]=xxepubxx,xx e-bookxx
 X-KDE-Keywords[zh_CN]=epub, e-book,电子书
 X-KDE-Keywords[zh_TW]=epub, e-book
--- a/generators/fictionbook/active-documentviewer_fb.desktop
+++ b/generators/fictionbook/active-documentviewer_fb.desktop
@ -196,6 +196,6 @@ X-KDE-Keywords[sr@latin]=FictionBook, e-book, fb2,FictionBook,e‑knjiga
 X-KDE-Keywords[sv]=FictionBook, e-bok, fb2
 X-KDE-Keywords[tr]=FictionBook, e-book, fb2
 X-KDE-Keywords[uk]=FictionBook,fb2,електронна,книга
-X-KDE-Keywords[x-test]=xxFictionBook, e-book, fb2xx
+X-KDE-Keywords[x-test]=xxFictionBookxx,xx e-bookxx,xx fb2xx
 X-KDE-Keywords[zh_CN]=FictionBook, e-book, fb2,电子书,虚拟书籍
 X-KDE-Keywords[zh_TW]=FictionBook, e-book, fb2
--- a/generators/fictionbook/okularApplication_fb.desktop
+++ b/generators/fictionbook/okularApplication_fb.desktop
@ -176,6 +176,6 @@ X-KDE-Keywords[sr@latin]=FictionBook, e-book, fb2,FictionBook,e‑knjiga
 X-KDE-Keywords[sv]=FictionBook, e-bok, fb2
 X-KDE-Keywords[tr]=FictionBook, e-book, fb2
 X-KDE-Keywords[uk]=FictionBook,fb2,електронна,книга
-X-KDE-Keywords[x-test]=xxFictionBook, e-book, fb2xx
+X-KDE-Keywords[x-test]=xxFictionBookxx,xx e-bookxx,xx fb2xx
 X-KDE-Keywords[zh_CN]=FictionBook, e-book, fb2,电子书,虚拟书籍
 X-KDE-Keywords[zh_TW]=FictionBook, e-book, fb2
--- a/generators/poppler/active-documentviewer_pdf.desktop
+++ b/generators/poppler/active-documentviewer_pdf.desktop
@ -196,6 +196,6 @@ X-KDE-Keywords[sr@latin]=PDF, Portable Document Format,PDF
 X-KDE-Keywords[sv]=PDF, Portabelt dokumentformat
 X-KDE-Keywords[tr]=PDF, Taşınabilir Belge Biçimi
 X-KDE-Keywords[uk]=PDF,Portable Document Format,пдф
-X-KDE-Keywords[x-test]=xxPDF, Portable Document Formatxx
+X-KDE-Keywords[x-test]=xxPDFxx,xx Portable Document Formatxx
 X-KDE-Keywords[zh_CN]=PDF, Portable Document Format,开放文档格式
 X-KDE-Keywords[zh_TW]=PDF, Portable Document Format
--- a/generators/poppler/okularApplication_pdf.desktop
+++ b/generators/poppler/okularApplication_pdf.desktop
@ -175,7 +175,7 @@ X-KDE-Keywords[sr@latin]=PDF, Portable Document Format,PDF
 X-KDE-Keywords[sv]=PDF, Portabelt dokumentformat
 X-KDE-Keywords[tr]=PDF, Taşınabilir Belge Biçimi
 X-KDE-Keywords[uk]=PDF,Portable Document Format,пдф
-X-KDE-Keywords[x-test]=xxPDF, Portable Document Formatxx
+X-KDE-Keywords[x-test]=xxPDFxx,xx Portable Document Formatxx
 X-KDE-Keywords[zh_CN]=PDF, Portable Document Format,开放文档格式
 X-KDE-Keywords[zh_TW]=PDF, Portable Document Format
 NoDisplay=true
--- a/generators/spectre/active-documentviewer_ghostview.desktop
+++ b/generators/spectre/active-documentviewer_ghostview.desktop
@ -191,6 +191,6 @@ X-KDE-Keywords[sr@latin]=PS,PostScript,PostScript,PS
 X-KDE-Keywords[sv]=PS, Postscript
 X-KDE-Keywords[tr]=PS, PostScript
 X-KDE-Keywords[uk]=PS, PostScript
-X-KDE-Keywords[x-test]=xxPS, PostScriptxx
+X-KDE-Keywords[x-test]=xxPSxx,xx PostScriptxx
 X-KDE-Keywords[zh_CN]=PS, PostScript
 X-KDE-Keywords[zh_TW]=PS, PostScript
--- a/generators/spectre/okularApplication_ghostview.desktop
+++ b/generators/spectre/okularApplication_ghostview.desktop
@ -170,7 +170,7 @@ X-KDE-Keywords[sr@latin]=PS,PostScript,PostScript,PS
 X-KDE-Keywords[sv]=PS, Postscript
 X-KDE-Keywords[tr]=PS, PostScript
 X-KDE-Keywords[uk]=PS, PostScript
-X-KDE-Keywords[x-test]=xxPS, PostScriptxx
+X-KDE-Keywords[x-test]=xxPSxx,xx PostScriptxx
 X-KDE-Keywords[zh_CN]=PS, PostScript
 X-KDE-Keywords[zh_TW]=PS, PostScript
 NoDisplay=true
--- a/part.cpp
+++ b/part.cpp
@ -1623,6 +1623,8 @@ void Part::guiActivateEvent(KParts::GUIActivateEvent *event)
    updateViewActions();

    KParts::ReadWritePart::guiActivateEvent(event);
+
+    setWindowTitleFromDocument();
 }

 void Part::close()