office/okular
office/okular
1
0
Fork 0
mirror of https://invent.kde.org/graphics/okular synced 2024-11-05 18:34:53 +00:00
Code Issues Projects Releases Packages Wiki Activity

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

Browse source 
Conflicts:
	part.cpp
This commit is contained in:
Montel Laurent 2015-02-07 13:12:59 +01:00
commit 61628e5bc7
11 changed files with 12 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
generators/comicbook/active-documentviewer_comicbook.desktop
View file

@ -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

2
generators/comicbook/okularApplication_comicbook.desktop
View file

@ -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

2
generators/epub/active-documentviewer_epub.desktop
View file

@ -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

2
generators/epub/okularApplication_epub.desktop
View file

@ -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

2
generators/fictionbook/active-documentviewer_fb.desktop
View file

@ -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

2
generators/fictionbook/okularApplication_fb.desktop
View file

@ -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

2
generators/poppler/active-documentviewer_pdf.desktop
View file

@ -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

2
generators/poppler/okularApplication_pdf.desktop
View file

@ -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

2
generators/spectre/active-documentviewer_ghostview.desktop
View file

@ -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

2
generators/spectre/okularApplication_ghostview.desktop
View file

@ -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

2
part.cpp
View file

@ -1623,6 +1623,8 @@ void Part::guiActivateEvent(KParts::GUIActivateEvent *event)
updateViewActions();
KParts::ReadWritePart::guiActivateEvent(event);
setWindowTitleFromDocument();
}
void Part::close()