office/okular
office/okular
1
0
Fork 0
mirror of https://invent.kde.org/graphics/okular synced 2024-08-27 19:50:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into configurable-review-tools

Browse source 
Conflicts:
	conf/settings.kcfgc
	ui/pageviewannotator.cpp
This commit is contained in:
Fabio D'Urso 2013-05-18 14:02:44 +02:00
parent 38a5a3f526 a7cb8e1d3c
commit a5cadb28c1
64 changed files with 183 additions and 147 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Mainpage.dox
View file

@ -329,7 +329,7 @@ MimeType=application/x-magic;
Terminal=false
Name=okular
GenericName=Document Viewer
Exec=okular %U %i -caption "%c"
Exec=okular %U %i -caption %c
Icon=okular
Type=Application
InitialPreference=7

3
active/app/active-documentviewer.desktop
View file

@ -14,6 +14,7 @@ Name[ga]=Léitheoir
Name[gl]=Lector
Name[hu]=Olvasó
Name[ia]=Lector
Name[is]=Lesari
Name[it]=Lettore
Name[kk]=Оқу құралы
Name[ko]=리더
@ -54,6 +55,7 @@ GenericName[ga]=Amharcán cáipéisí
GenericName[gl]=Visor de documentos
GenericName[hu]=Dokumentummegjelenítő
GenericName[ia]=Visor de documento
GenericName[is]=Skjalaskoðari
GenericName[it]=Visore di documenti
GenericName[kk]=Құжатты қарау құралы
GenericName[ko]=문서 뷰어
@ -94,6 +96,7 @@ Comment[ga]=Amharcán le haghaidh cáipéisí éagsúla
Comment[gl]=Visor de varios tipos de documentos.
Comment[hu]=Megjelenítő különféle típusú dokumentumokhoz
Comment[ia]=Visor pro varie typos de documento
Comment[is]=Skoðari fyrir ýmsar gerðir skjala
Comment[it]=Visore per vari tipi di documenti
Comment[kk]=Түрлі құжаттар қарау құралы
Comment[ko]=여러 형식의 문서 뷰어

16
active/app/package/contents/ui/FullScreenDelegate.qml
View file

@ -33,6 +33,12 @@ MouseEventListener {
property int delta
property Item flickable: mainFlickable
property bool pageSwitchEnabled: false
property alias document: mainPage.document
property alias pageNumber: mainPage.pageNumber
property Item pageItem: mainPage
onWheelMoved: {
if (wheel.modifiers == Qt.ControlModifier) {
var factor = wheel.delta > 0 ? 1.1 : 0.9
@ -41,16 +47,10 @@ MouseEventListener {
}
}
}
property Item flickable: mainFlickable
property bool pageSwitchEnabled: false
property alias document: mainPage.document
property alias pageNumber: mainPage.pageNumber
property Item pageItem: mainPage
function scale(zoom, absolute)
{
function scale(zoom, absolute) {
var newScale = absolute ? zoom : (mainPage.width / mainPage.implicitWidth) * zoom;
if (newScale < 0.3 || newScale > 2) {
if (newScale < 0.3 || newScale > 3) {
return false
}

1
active/app/package/metadata.desktop
View file

@ -14,6 +14,7 @@ Name[ga]=Amharcán cáipéisí
Name[gl]=Visor de documentos
Name[hu]=Dokumentummegjelenítő
Name[ia]=Visor de documento
Name[is]=Skjalaskoðari
Name[it]=Visore di documenti
Name[kk]=Құжатты қарау құралы
Name[ko]=문서 뷰어

2
conf/settings.kcfgc
View file

@ -4,6 +4,6 @@ File=okular.kcfg
Inherits=SettingsCore
Mutators=true
Singleton=true
IncludeFiles=core/okular_export.h, settings_core.h
IncludeFiles=settings_core.h
SourceIncludeFiles=kstandarddirs.h,qdom.h
MemberVariables=dpointer

69
core/annotations.cpp
View file

@ -92,13 +92,17 @@ QDomElement AnnotationUtils::findChildElement( const QDomNode & parentNode,
QRect AnnotationUtils::annotationGeometry( const Annotation * ann,
double scaledWidth, double scaledHeight )
{
const QRect rect = ann->transformedBoundingRectangle().geometry( (int)scaledWidth, (int)scaledHeight );
if ( ann->subType() == Annotation::AText && ( ( (TextAnnotation*)ann )->textType() == TextAnnotation::Linked ) )
{
return QRect( (int)( ann->transformedBoundingRectangle().left * scaledWidth ),
(int)( ann->transformedBoundingRectangle().top * scaledHeight ), 24, 24 );
// To be honest i have no clue of why the 24,24 is here, maybe to make sure it's not too small?
// But why only for linked text?
const QRect rect24 = QRect( (int)( ann->transformedBoundingRectangle().left * scaledWidth ),
(int)( ann->transformedBoundingRectangle().top * scaledHeight ), 24, 24 );
return rect24.united(rect);
}
return ann->transformedBoundingRectangle().geometry( (int)scaledWidth, (int)scaledHeight );
return rect;
}
//END AnnotationUtils implementation
@ -269,7 +273,6 @@ class Annotation::Window::Private
int m_height;
QString m_title;
QString m_summary;
QString m_text;
};
Annotation::Window::Window()
@ -356,17 +359,6 @@ QString Annotation::Window::summary() const
return d->m_summary;
}
void Annotation::Window::setText( const QString &text )
{
d->m_text = text;
}
QString Annotation::Window::text() const
{
return d->m_text;
}
class Annotation::Revision::Private
{
public:
@ -711,7 +703,7 @@ void Annotation::store( QDomNode & annNode, QDomDocument & document ) const
// Sub-Node-4 - window
if ( d->m_window.flags() != -1 || !d->m_window.title().isEmpty() ||
!d->m_window.summary().isEmpty() || !d->m_window.text().isEmpty() )
!d->m_window.summary().isEmpty() )
{
QDomElement wE = document.createElement( "window" );
e.appendChild( wE );
@ -722,14 +714,6 @@ void Annotation::store( QDomNode & annNode, QDomDocument & document ) const
wE.setAttribute( "height", d->m_window.height() );
wE.setAttribute( "title", d->m_window.title() );
wE.setAttribute( "summary", d->m_window.summary() );
// store window.text as a subnode, because we need escaped data
if ( !d->m_window.text().isEmpty() )
{
QDomElement escapedText = document.createElement( "text" );
wE.appendChild( escapedText );
QDomCDATASection textCData = document.createCDATASection( d->m_window.text() );
escapedText.appendChild( textCData );
}
}
// create [revision] element of the annotation node (if any)
@ -782,6 +766,9 @@ void Annotation::setAnnotationProperties( const QDomNode& node )
d_ptr->m_nativeId = nativeID;
d_ptr->m_flags = d_ptr->m_flags | internalFlags;
d_ptr->m_disposeFunc = disposeFunc;
// Transform annotation to current page rotation
d_ptr->transform( d_ptr->m_page->rotationMatrix() );
}
void AnnotationPrivate::annotationTransform( const QTransform &matrix )
@ -887,14 +874,6 @@ void AnnotationPrivate::setAnnotationProperties( const QDomNode& node )
m_window.setHeight( ee.attribute( "height" ).toInt() );
m_window.setTitle( ee.attribute( "title" ) );
m_window.setSummary( ee.attribute( "summary" ) );
// parse window subnodes
QDomNode winNode = ee.firstChild();
for ( ; winNode.isElement(); winNode = winNode.nextSibling() )
{
QDomElement winElement = winNode.toElement();
if ( winElement.tagName() == "text" )
m_window.setText( winElement.firstChild().toCDATASection().data() );
}
}
}
@ -947,7 +926,6 @@ class Okular::TextAnnotationPrivate : public Okular::AnnotationPrivate
QString m_textIcon;
QFont m_textFont;
int m_inplaceAlign;
QString m_inplaceText;
NormalizedPoint m_inplaceCallout[3];
NormalizedPoint m_transformedInplaceCallout[3];
TextAnnotation::InplaceIntent m_inplaceIntent;
@ -1018,18 +996,6 @@ int TextAnnotation::inplaceAlignment() const
return d->m_inplaceAlign;
}
void TextAnnotation::setInplaceText( const QString &text )
{
Q_D( TextAnnotation );
d->m_inplaceText = text;
}
QString TextAnnotation::inplaceText() const
{
Q_D( const TextAnnotation );
return d->m_inplaceText;
}
void TextAnnotation::setInplaceCallout( const NormalizedPoint &point, int index )
{
if ( index < 0 || index > 2 )
@ -1096,16 +1062,7 @@ void TextAnnotation::store( QDomNode & node, QDomDocument & document ) const
if ( d->m_inplaceIntent != Unknown )
textElement.setAttribute( "intent", (int)d->m_inplaceIntent );
// Sub-Node-1 - escapedText
if ( !d->m_inplaceText.isEmpty() )
{
QDomElement escapedText = document.createElement( "escapedText" );
textElement.appendChild( escapedText );
QDomCDATASection textCData = document.createCDATASection( d->m_inplaceText );
escapedText.appendChild( textCData );
}
// Sub-Node-2 - callout
// Sub-Node - callout
if ( d->m_inplaceCallout[0].x != 0.0 )
{
QDomElement calloutElement = document.createElement( "callout" );
@ -1200,7 +1157,7 @@ void TextAnnotationPrivate::setAnnotationProperties( const QDomNode& node )
if ( ee.tagName() == "escapedText" )
{
m_inplaceText = ee.firstChild().toCDATASection().data();
m_contents = ee.firstChild().toCDATASection().data();
}
else if ( ee.tagName() == "callout" )
{

20
core/annotations.h
View file

@ -512,16 +512,6 @@ class OKULAR_EXPORT Annotation
*/
QString summary() const;
/**
* Sets the @p text of the window.
*/
void setText( const QString &text );
/**
* Returns the text of the window.
*/
QString text() const;
private:
class Private;
Private* const d;
@ -815,16 +805,6 @@ class OKULAR_EXPORT TextAnnotation : public Annotation
*/
int inplaceAlignment() const;
/**
* Sets the inplace @p text of the text annotation.
*/
void setInplaceText( const QString &text );
/**
* Returns the inplace text of the text annotation.
*/
QString inplaceText() const;
/**
* Sets the inplace callout @p point at @p index.
*

12
core/document.cpp
View file

@ -1151,14 +1151,7 @@ void DocumentPrivate::performSetAnnotationContents( const QString & newContents,
{
bool appearanceChanged = false;
// Set window text
if ( !annot->window().text().isEmpty() )
{
annot->window().setText( newContents );
return;
}
// Handle special cases
// Check if appearanceChanged should be true
switch ( annot->subType() )
{
// If it's an in-place TextAnnotation, set the inplace text
@ -1167,7 +1160,6 @@ void DocumentPrivate::performSetAnnotationContents( const QString & newContents,
Okular::TextAnnotation * txtann = static_cast< Okular::TextAnnotation * >( annot );
if ( txtann->textType() == Okular::TextAnnotation::InPlace )
{
txtann->setInplaceText( newContents );
appearanceChanged = true;
}
break;
@ -1555,8 +1547,6 @@ void DocumentPrivate::refreshPixmaps( int pageNumber )
for ( ; it != itEnd; ++it )
{
QSize size = (*it).m_pixmap->size();
if ( (*it).m_rotation % 2 )
size.transpose();
PixmapRequest * p = new PixmapRequest( it.key(), pageNumber, size.width(), size.height(), 1, PixmapRequest::Asynchronous );
p->d->mForce = true;
requestedPixmaps.push_back( p );

2
core/okularGenerator.desktop
View file

@ -45,7 +45,7 @@ Comment[pt_BR]=Infraestrutura de formato de arquivo para o Okular
Comment[ro]=Platformă Okular pentru formate de fișiere
Comment[ru]=Модуль поддержки формата для Okular
Comment[sk]=Backend formátu súborov pre Okular
Comment[sl]=Hrbtenica za vrste datotek za Okular
Comment[sl]=Zaledje za vrste datotek za Okular
Comment[sq]=Mbështetës për formatet e skedarëve në Okular
Comment[sr]=Позадина формата фајла за Окулар
Comment[sr@ijekavian]=Позадина формата фајла за Окулар

2
doc/index.docbook
View file

@ -1747,7 +1747,7 @@ Add a 'Find Previous' entry
<term><guilabel>Show hints and info messages</guilabel></term>
<listitem>
<para>Whether to show some informative messages on startup, file
load, &etc;.</para>
load, &etc;</para>
</listitem>
</varlistentry>
<varlistentry>

4
generators/chm/active-documentviewer_chm.desktop
View file

@ -14,6 +14,7 @@ Name[ga]=Léitheoir
Name[gl]=Lector
Name[hu]=Olvasó
Name[ia]=Lector
Name[is]=Lesari
Name[it]=Lettore
Name[kk]=Оқу құралы
Name[ko]=리더
@ -54,6 +55,7 @@ GenericName[ga]=Amharcán cáipéisí
GenericName[gl]=Visor de documentos
GenericName[hu]=Dokumentummegjelenítő
GenericName[ia]=Visor de documento
GenericName[is]=Skjalaskoðari
GenericName[it]=Visore di documenti
GenericName[kk]=Құжатты қарау құралы
GenericName[ko]=문서 뷰어
@ -94,6 +96,7 @@ Comment[ga]=Amharcán le haghaidh cáipéisí éagsúla
Comment[gl]=Visor de varios tipos de documentos.
Comment[hu]=Megjelenítő különféle típusú dokumentumokhoz
Comment[ia]=Visor pro varie typos de documento
Comment[is]=Skoðari fyrir ýmsar gerðir skjala
Comment[it]=Visore per vari tipi di documenti
Comment[kk]=Түрлі құжаттар қарау құралы
Comment[ko]=여러 형식의 문서 뷰어
@ -147,6 +150,7 @@ X-KDE-Keywords[ga]=chm
X-KDE-Keywords[gl]=chm
X-KDE-Keywords[hu]=chm
X-KDE-Keywords[ia]=chm
X-KDE-Keywords[is]=chm
X-KDE-Keywords[it]=chm
X-KDE-Keywords[kk]=chm
X-KDE-Keywords[km]=chm

2
generators/chm/libokularGenerator_chmlib.desktop
View file

@ -106,7 +106,7 @@ Comment[pt_BR]=Infraestrutura do Windows HTMLHelp para o Okular
Comment[ro]=Platformă HTMLHelp din Windows pentru Okular
Comment[ru]=Модуль поддержки формата Windows HTMLHelp для Okular
Comment[sk]=Backend Windows HTMLHelp pre Okular
Comment[sl]=Hrbtenica za Windows pomoč v obliki HTML za Okular
Comment[sl]=Zaledje za Windows pomoč v obliki HTML za Okular
Comment[sq]=Një mbështetës për Windows HTMLHelp për Okular
Comment[sr]=Позадина винхелпа за Окулар
Comment[sr@ijekavian]=Позадина винхелпа за Окулар

3
generators/chm/okularApplication_chm.desktop
View file

@ -124,7 +124,7 @@ GenericName[uk]=Переглядач документів
GenericName[x-test]=xxDocument Viewerxx
GenericName[zh_CN]=文档查看器
GenericName[zh_TW]=文件檢視器
Exec=okular %U %i -caption "%c"
Exec=okular %U %i -caption %c
Icon=okular
Type=Application
InitialPreference=3
@ -148,6 +148,7 @@ X-KDE-Keywords[ga]=chm
X-KDE-Keywords[gl]=chm
X-KDE-Keywords[hu]=chm
X-KDE-Keywords[ia]=chm
X-KDE-Keywords[is]=chm
X-KDE-Keywords[it]=chm
X-KDE-Keywords[kk]=chm
X-KDE-Keywords[km]=chm

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

@ -15,6 +15,7 @@ Name[ga]=Léitheoir
Name[gl]=Lector
Name[hu]=Olvasó
Name[ia]=Lector
Name[is]=Lesari
Name[it]=Lettore
Name[kk]=Оқу құралы
Name[ko]=리더
@ -55,6 +56,7 @@ GenericName[ga]=Amharcán cáipéisí
GenericName[gl]=Visor de documentos
GenericName[hu]=Dokumentummegjelenítő
GenericName[ia]=Visor de documento
GenericName[is]=Skjalaskoðari
GenericName[it]=Visore di documenti
GenericName[kk]=Құжатты қарау құралы
GenericName[ko]=문서 뷰어
@ -95,6 +97,7 @@ Comment[ga]=Amharcán le haghaidh cáipéisí éagsúla
Comment[gl]=Visor de varios tipos de documentos.
Comment[hu]=Megjelenítő különféle típusú dokumentumokhoz
Comment[ia]=Visor pro varie typos de documento
Comment[is]=Skoðari fyrir ýmsar gerðir skjala
Comment[it]=Visore per vari tipi di documenti
Comment[kk]=Түрлі құжаттар қарау құралы
Comment[ko]=여러 형식의 문서 뷰어
@ -147,6 +150,7 @@ X-KDE-Keywords[ga]=cbr, cbz, cbt, Comic Book
X-KDE-Keywords[gl]=cbr, cbz, cbt, Comic Book
X-KDE-Keywords[hu]=cbr, cbz, cbt, Képregény
X-KDE-Keywords[ia]=cbr, cbz, cbt, Comic Book
X-KDE-Keywords[is]=cbr, cbz, cbt, Comic Book
X-KDE-Keywords[it]=cbr, cbz, cbt, Comic Book
X-KDE-Keywords[kk]=cbr, cbz, cbt, Comic Book
X-KDE-Keywords[km]=cbr, cbz, cbt, Comic Book

2
generators/comicbook/libokularGenerator_comicbook.desktop
View file

@ -106,7 +106,7 @@ Comment[pt_BR]=Infraestrutura Comic book para o Okular
Comment[ro]=Platformă de benzi desenate pentru Okular
Comment[ru]=Модуль поддержки формата Comic Book для Okular
Comment[sk]=Backend knihy komiksov pre Okular
Comment[sl]=Hrbtenica za stripe za Okular
Comment[sl]=Zaledje za stripe za Okular
Comment[sq]=Mbështetje për librat komikë për Okular
Comment[sr]=Позадина комикбука за Окулар
Comment[sr@ijekavian]=Позадина комикбука за Окулар

3
generators/comicbook/okularApplication_comicbook.desktop
View file

@ -124,7 +124,7 @@ GenericName[uk]=Переглядач документів
GenericName[x-test]=xxDocument Viewerxx
GenericName[zh_CN]=文档查看器
GenericName[zh_TW]=文件檢視器
Exec=okular %U %i -caption "%c"
Exec=okular %U %i -caption %c
Icon=okular
Type=Application
InitialPreference=7
@ -148,6 +148,7 @@ X-KDE-Keywords[ga]=cbr, cbz, cbt, Comic Book
X-KDE-Keywords[gl]=cbr, cbz, cbt, Comic Book
X-KDE-Keywords[hu]=cbr, cbz, cbt, Képregény
X-KDE-Keywords[ia]=cbr, cbz, cbt, Comic Book
X-KDE-Keywords[is]=cbr, cbz, cbt, Comic Book
X-KDE-Keywords[it]=cbr, cbz, cbt, Comic Book
X-KDE-Keywords[kk]=cbr, cbz, cbt, Comic Book
X-KDE-Keywords[km]=cbr, cbz, cbt, Comic Book

4
generators/djvu/active-documentviewer_djvu.desktop
View file

@ -15,6 +15,7 @@ Name[ga]=Léitheoir
Name[gl]=Lector
Name[hu]=Olvasó
Name[ia]=Lector
Name[is]=Lesari
Name[it]=Lettore
Name[kk]=Оқу құралы
Name[ko]=리더
@ -55,6 +56,7 @@ GenericName[ga]=Amharcán cáipéisí
GenericName[gl]=Visor de documentos
GenericName[hu]=Dokumentummegjelenítő
GenericName[ia]=Visor de documento
GenericName[is]=Skjalaskoðari
GenericName[it]=Visore di documenti
GenericName[kk]=Құжатты қарау құралы
GenericName[ko]=문서 뷰어
@ -95,6 +97,7 @@ Comment[ga]=Amharcán le haghaidh cáipéisí éagsúla
Comment[gl]=Visor de varios tipos de documentos.
Comment[hu]=Megjelenítő különféle típusú dokumentumokhoz
Comment[ia]=Visor pro varie typos de documento
Comment[is]=Skoðari fyrir ýmsar gerðir skjala
Comment[it]=Visore per vari tipi di documenti
Comment[kk]=Түрлі құжаттар қарау құралы
Comment[ko]=여러 형식의 문서 뷰어
@ -147,6 +150,7 @@ X-KDE-Keywords[ga]=djvu
X-KDE-Keywords[gl]=djvu
X-KDE-Keywords[hu]=djvu
X-KDE-Keywords[ia]=djvu
X-KDE-Keywords[is]=djvu
X-KDE-Keywords[it]=djvu
X-KDE-Keywords[kk]=djvu
X-KDE-Keywords[km]=djvu

2
generators/djvu/generator_djvu.cpp
View file

@ -424,7 +424,7 @@ Okular::Annotation* DjVuGenerator::convertKDjVuAnnotation( int w, int h, KDjVu::
newtxtann->setTextType( txtann->inlineText() ? Okular::TextAnnotation::InPlace : Okular::TextAnnotation::Linked );
newtxtann->style().setOpacity( txtann->color().alphaF() );
// FIXME remove once the annotation text handling is fixed
newtxtann->setInplaceText( ann->comment() );
newtxtann->setContents( ann->comment() );
newann = newtxtann;
break;
}

2
generators/djvu/libokularGenerator_djvu.desktop
View file

@ -107,7 +107,7 @@ Comment[pt_BR]=Infraestrutura DjVu para o Okular
Comment[ro]=Platformă DjVu pentru Okular
Comment[ru]=Модуль поддержки формата DjVu для Okular
Comment[sk]=Backend DjVu pre Okular
Comment[sl]=Hrbtenica za DjVu za Okular
Comment[sl]=Zaledje za DjVu za Okular
Comment[sq]=Mbështetje për DjVu në Okular
Comment[sr]=Позадина ДјВуа за Окулар
Comment[sr@ijekavian]=Позадина ДјВуа за Окулар

3
generators/djvu/okularApplication_djvu.desktop
View file

@ -124,7 +124,7 @@ GenericName[uk]=Переглядач документів
GenericName[x-test]=xxDocument Viewerxx
GenericName[zh_CN]=文档查看器
GenericName[zh_TW]=文件檢視器
Exec=okular %U %i -caption "%c"
Exec=okular %U %i -caption %c
Icon=okular
Type=Application
InitialPreference=7
@ -148,6 +148,7 @@ X-KDE-Keywords[ga]=djvu
X-KDE-Keywords[gl]=djvu
X-KDE-Keywords[hu]=djvu
X-KDE-Keywords[ia]=djvu
X-KDE-Keywords[is]=djvu
X-KDE-Keywords[it]=djvu
X-KDE-Keywords[kk]=djvu
X-KDE-Keywords[km]=djvu

4
generators/dvi/active-documentviewer_dvi.desktop
View file

@ -15,6 +15,7 @@ Name[ga]=Léitheoir
Name[gl]=Lector
Name[hu]=Olvasó
Name[ia]=Lector
Name[is]=Lesari
Name[it]=Lettore
Name[kk]=Оқу құралы
Name[ko]=리더
@ -55,6 +56,7 @@ GenericName[ga]=Amharcán cáipéisí
GenericName[gl]=Visor de documentos
GenericName[hu]=Dokumentummegjelenítő
GenericName[ia]=Visor de documento
GenericName[is]=Skjalaskoðari
GenericName[it]=Visore di documenti
GenericName[kk]=Құжатты қарау құралы
GenericName[ko]=문서 뷰어
@ -95,6 +97,7 @@ Comment[ga]=Amharcán le haghaidh cáipéisí éagsúla
Comment[gl]=Visor de varios tipos de documentos.
Comment[hu]=Megjelenítő különféle típusú dokumentumokhoz
Comment[ia]=Visor pro varie typos de documento
Comment[is]=Skoðari fyrir ýmsar gerðir skjala
Comment[it]=Visore per vari tipi di documenti
Comment[kk]=Түрлі құжаттар қарау құралы
Comment[ko]=여러 형식의 문서 뷰어
@ -147,6 +150,7 @@ X-KDE-Keywords[ga]=dvi
X-KDE-Keywords[gl]=dvi
X-KDE-Keywords[hu]=dvi
X-KDE-Keywords[ia]=dvi
X-KDE-Keywords[is]=dvi
X-KDE-Keywords[it]=dvi
X-KDE-Keywords[kk]=dvi
X-KDE-Keywords[km]=dvi

2
generators/dvi/libokularGenerator_dvi.desktop
View file

@ -107,7 +107,7 @@ Comment[pt_BR]=Infraestrutura DVI para o Okular
Comment[ro]=Platformă DVI pentru Okular
Comment[ru]=Модуль поддержки формата DVI для Okular
Comment[sk]=Backend DVI pre Okular
Comment[sl]=Hrbtenica za DVI za Okular
Comment[sl]=Zaledje za DVI za Okular
Comment[sq]=Mbështetje për DVI në Okular
Comment[sr]=Позадина ДВИ‑ја за Окулар
Comment[sr@ijekavian]=Позадина ДВИ‑ја за Окулар

3
generators/dvi/okularApplication_dvi.desktop
View file

@ -124,7 +124,7 @@ GenericName[uk]=Переглядач документів
GenericName[x-test]=xxDocument Viewerxx
GenericName[zh_CN]=文档查看器
GenericName[zh_TW]=文件檢視器
Exec=okular %U %i -caption "%c"
Exec=okular %U %i -caption %c
Icon=okular
Type=Application
InitialPreference=7
@ -148,6 +148,7 @@ X-KDE-Keywords[ga]=dvi
X-KDE-Keywords[gl]=dvi
X-KDE-Keywords[hu]=dvi
X-KDE-Keywords[ia]=dvi
X-KDE-Keywords[is]=dvi
X-KDE-Keywords[it]=dvi
X-KDE-Keywords[kk]=dvi
X-KDE-Keywords[km]=dvi

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

@ -15,6 +15,7 @@ Name[ga]=Léitheoir
Name[gl]=Lector
Name[hu]=Olvasó
Name[ia]=Lector
Name[is]=Lesari
Name[it]=Lettore
Name[kk]=Оқу құралы
Name[ko]=리더
@ -55,6 +56,7 @@ GenericName[ga]=Amharcán cáipéisí
GenericName[gl]=Visor de documentos
GenericName[hu]=Dokumentummegjelenítő
GenericName[ia]=Visor de documento
GenericName[is]=Skjalaskoðari
GenericName[it]=Visore di documenti
GenericName[kk]=Құжатты қарау құралы
GenericName[ko]=문서 뷰어
@ -95,6 +97,7 @@ Comment[ga]=Amharcán le haghaidh cáipéisí éagsúla
Comment[gl]=Visor de varios tipos de documentos.
Comment[hu]=Megjelenítő különféle típusú dokumentumokhoz
Comment[ia]=Visor pro varie typos de documento
Comment[is]=Skoðari fyrir ýmsar gerðir skjala
Comment[it]=Visore per vari tipi di documenti
Comment[kk]=Түрлі құжаттар қарау құралы
Comment[ko]=여러 형식의 문서 뷰어
@ -147,6 +150,7 @@ X-KDE-Keywords[ga]=epub, ríomhleabhar, r-leabhar
X-KDE-Keywords[gl]=epub, e-book,libro dixital
X-KDE-Keywords[hu]=epub, e-book
X-KDE-Keywords[ia]=epub, e-book
X-KDE-Keywords[is]=epub, e-book, rafbók
X-KDE-Keywords[it]=epub, e-book
X-KDE-Keywords[kk]=epub, e-book
X-KDE-Keywords[km]=epub, e-book

2
generators/epub/libokularGenerator_epub.desktop
View file

@ -102,7 +102,7 @@ Comment[pt_BR]=Infraestrutura EPub para o Okular
Comment[ro]=Platformă EPub pentru Okular
Comment[ru]=Модуль поддержки формата EPub для Okular
Comment[sk]=Backend EPub pre Okular
Comment[sl]=Hrbtenica za EPub za Okular
Comment[sl]=Zaledje za EPub za Okular
Comment[sq]=Mbështetje për EPub në Okular
Comment[sr]=Позадина ЕПУБ‑а за Окулар
Comment[sr@ijekavian]=Позадина ЕПУБ‑а за Окулар

3
generators/epub/okularApplication_epub.desktop
View file

@ -124,7 +124,7 @@ GenericName[uk]=Переглядач документів
GenericName[x-test]=xxDocument Viewerxx
GenericName[zh_CN]=文档查看器
GenericName[zh_TW]=文件檢視器
Exec=okular %U %i -caption "%c"
Exec=okular %U %i -caption %c
Icon=okular
Type=Application
InitialPreference=1
@ -148,6 +148,7 @@ X-KDE-Keywords[ga]=epub, ríomhleabhar, r-leabhar
X-KDE-Keywords[gl]=epub, e-book,libro dixital
X-KDE-Keywords[hu]=epub, e-book
X-KDE-Keywords[ia]=epub, e-book
X-KDE-Keywords[is]=epub, e-book, rafbók
X-KDE-Keywords[it]=epub, e-book
X-KDE-Keywords[kk]=epub, e-book
X-KDE-Keywords[km]=epub, e-book

3
generators/fax/active-documentviewer_fax.desktop
View file

@ -15,6 +15,7 @@ Name[ga]=Léitheoir
Name[gl]=Lector
Name[hu]=Olvasó
Name[ia]=Lector
Name[is]=Lesari
Name[it]=Lettore
Name[kk]=Оқу құралы
Name[ko]=리더
@ -55,6 +56,7 @@ GenericName[ga]=Amharcán cáipéisí
GenericName[gl]=Visor de documentos
GenericName[hu]=Dokumentummegjelenítő
GenericName[ia]=Visor de documento
GenericName[is]=Skjalaskoðari
GenericName[it]=Visore di documenti
GenericName[kk]=Құжатты қарау құралы
GenericName[ko]=문서 뷰어
@ -95,6 +97,7 @@ Comment[ga]=Amharcán le haghaidh cáipéisí éagsúla
Comment[gl]=Visor de varios tipos de documentos.
Comment[hu]=Megjelenítő különféle típusú dokumentumokhoz
Comment[ia]=Visor pro varie typos de documento
Comment[is]=Skoðari fyrir ýmsar gerðir skjala
Comment[it]=Visore per vari tipi di documenti
Comment[kk]=Түрлі құжаттар қарау құралы
Comment[ko]=여러 형식의 문서 뷰어

2
generators/fax/libokularGenerator_fax.desktop
View file

@ -102,7 +102,7 @@ Comment[pt_BR]=Infraestrutura de fax G3/G4 para o Okular
Comment[ro]=Platformă fax G3/G4 pentru Okular
Comment[ru]=Модуль поддержки формата G3/G4 Fax для Okular
Comment[sk]=Backend faxu G3/G4 pre Okular
Comment[sl]=Hrbtenica za fakse G3/G4 za Okular
Comment[sl]=Zaledje za fakse G3/G4 za Okular
Comment[sq]=G3/G4 Faks mbështetje për Okular
Comment[sr]=Позадина Г3/Г4 факсова за Окулар
Comment[sr@ijekavian]=Позадина Г3/Г4 факсова за Окулар

2
generators/fax/okularApplication_fax.desktop
View file

@ -124,7 +124,7 @@ GenericName[uk]=Переглядач документів
GenericName[x-test]=xxDocument Viewerxx
GenericName[zh_CN]=文档查看器
GenericName[zh_TW]=文件檢視器
Exec=okular %U %i -caption "%c"
Exec=okular %U %i -caption %c
Icon=okular
Type=Application
InitialPreference=1

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

@ -15,6 +15,7 @@ Name[ga]=Léitheoir
Name[gl]=Lector
Name[hu]=Olvasó
Name[ia]=Lector
Name[is]=Lesari
Name[it]=Lettore
Name[kk]=Оқу құралы
Name[ko]=리더
@ -55,6 +56,7 @@ GenericName[ga]=Amharcán cáipéisí
GenericName[gl]=Visor de documentos
GenericName[hu]=Dokumentummegjelenítő
GenericName[ia]=Visor de documento
GenericName[is]=Skjalaskoðari
GenericName[it]=Visore di documenti
GenericName[kk]=Құжатты қарау құралы
GenericName[ko]=문서 뷰어
@ -95,6 +97,7 @@ Comment[ga]=Amharcán le haghaidh cáipéisí éagsúla
Comment[gl]=Visor de varios tipos de documentos.
Comment[hu]=Megjelenítő különféle típusú dokumentumokhoz
Comment[ia]=Visor pro varie typos de documento
Comment[is]=Skoðari fyrir ýmsar gerðir skjala
Comment[it]=Visore per vari tipi di documenti
Comment[kk]=Түрлі құжаттар қарау құралы
Comment[ko]=여러 형식의 문서 뷰어
@ -147,6 +150,7 @@ X-KDE-Keywords[ga]=FictionBook, r-leabhar, ríomhleabhar, fb2
X-KDE-Keywords[gl]=FictionBook, e-book, fb2, libro dixital
X-KDE-Keywords[hu]=FictionBook, e-book, fb2
X-KDE-Keywords[ia]=FictionBook, e-book, fb2
X-KDE-Keywords[is]=FictionBook, e-book, fb2
X-KDE-Keywords[it]=FictionBook, e-book, fb2
X-KDE-Keywords[kk]=FictionBook, e-book, fb2
X-KDE-Keywords[km]=FictionBook, e-book, fb2

2
generators/fictionbook/libokularGenerator_fb.desktop
View file

@ -105,7 +105,7 @@ Comment[pt_BR]=Infraestrutura FictionBook para o Okular
Comment[ro]=Platformă FictionBook pentru Okular
Comment[ru]=Модуль поддержки формата FictionBook для Okular
Comment[sk]=Backend FictionBook pre Okular
Comment[sl]=Hrbtenica za FictionBook za Okular
Comment[sl]=Zaledje za FictionBook za Okular
Comment[sq]=FictionBook mbështetje për Okular
Comment[sr]=Позадина фикшнбука за Окулар
Comment[sr@ijekavian]=Позадина фикшнбука за Окулар

3
generators/fictionbook/okularApplication_fb.desktop
View file

@ -124,7 +124,7 @@ GenericName[uk]=Переглядач документів
GenericName[x-test]=xxDocument Viewerxx
GenericName[zh_CN]=文档查看器
GenericName[zh_TW]=文件檢視器
Exec=okular %U %i -caption "%c"
Exec=okular %U %i -caption %c
Icon=okular
Type=Application
InitialPreference=7
@ -148,6 +148,7 @@ X-KDE-Keywords[ga]=FictionBook, r-leabhar, ríomhleabhar, fb2
X-KDE-Keywords[gl]=FictionBook, e-book, fb2, libro dixital
X-KDE-Keywords[hu]=FictionBook, e-book, fb2
X-KDE-Keywords[ia]=FictionBook, e-book, fb2
X-KDE-Keywords[is]=FictionBook, e-book, fb2
X-KDE-Keywords[it]=FictionBook, e-book, fb2
X-KDE-Keywords[kk]=FictionBook, e-book, fb2
X-KDE-Keywords[km]=FictionBook, e-book, fb2

3
generators/kimgio/active-documentviewer_kimgio.desktop
View file

@ -15,6 +15,7 @@ Name[ga]=Léitheoir
Name[gl]=Lector
Name[hu]=Olvasó
Name[ia]=Lector
Name[is]=Lesari
Name[it]=Lettore
Name[kk]=Оқу құралы
Name[ko]=리더
@ -55,6 +56,7 @@ GenericName[ga]=Amharcán cáipéisí
GenericName[gl]=Visor de documentos
GenericName[hu]=Dokumentummegjelenítő
GenericName[ia]=Visor de documento
GenericName[is]=Skjalaskoðari
GenericName[it]=Visore di documenti
GenericName[kk]=Құжатты қарау құралы
GenericName[ko]=문서 뷰어
@ -95,6 +97,7 @@ Comment[ga]=Amharcán le haghaidh cáipéisí éagsúla
Comment[gl]=Visor de varios tipos de documentos.
Comment[hu]=Megjelenítő különféle típusú dokumentumokhoz
Comment[ia]=Visor pro varie typos de documento
Comment[is]=Skoðari fyrir ýmsar gerðir skjala
Comment[it]=Visore per vari tipi di documenti
Comment[kk]=Түрлі құжаттар қарау құралы
Comment[ko]=여러 형식의 문서 뷰어

2
generators/kimgio/libokularGenerator_kimgio.desktop
View file

@ -107,7 +107,7 @@ Comment[pt_BR]=Infraestrutura de imagens para o Okular
Comment[ro]=Platformă de imagini pentru Okular
Comment[ru]=Модуль поддержки форматов изображений для Okular
Comment[sk]=Backend obrázkov pre Okular
Comment[sl]=Hrbtenica za slike za Okular
Comment[sl]=Zaledje za slike za Okular
Comment[sq]=Mbështetje imazhesh për Okular
Comment[sr]=Позадина слика за Окулар
Comment[sr@ijekavian]=Позадина слика за Окулар

2
generators/kimgio/okularApplication_kimgio.desktop
View file

@ -124,7 +124,7 @@ GenericName[uk]=Переглядач документів
GenericName[x-test]=xxDocument Viewerxx
GenericName[zh_CN]=文档查看器
GenericName[zh_TW]=文件檢視器
Exec=okular %U %i -caption "%c"
Exec=okular %U %i -caption %c
Icon=okular
Type=Application
InitialPreference=1

3
generators/ooo/active-documentviewer_ooo.desktop
View file

@ -15,6 +15,7 @@ Name[ga]=Léitheoir
Name[gl]=Lector
Name[hu]=Olvasó
Name[ia]=Lector
Name[is]=Lesari
Name[it]=Lettore
Name[kk]=Оқу құралы
Name[ko]=리더
@ -55,6 +56,7 @@ GenericName[ga]=Amharcán cáipéisí
GenericName[gl]=Visor de documentos
GenericName[hu]=Dokumentummegjelenítő
GenericName[ia]=Visor de documento
GenericName[is]=Skjalaskoðari
GenericName[it]=Visore di documenti
GenericName[kk]=Құжатты қарау құралы
GenericName[ko]=문서 뷰어
@ -95,6 +97,7 @@ Comment[ga]=Amharcán le haghaidh cáipéisí éagsúla
Comment[gl]=Visor de varios tipos de documentos.
Comment[hu]=Megjelenítő különféle típusú dokumentumokhoz
Comment[ia]=Visor pro varie typos de documento
Comment[is]=Skoðari fyrir ýmsar gerðir skjala
Comment[it]=Visore per vari tipi di documenti
Comment[kk]=Түрлі құжаттар қарау құралы
Comment[ko]=여러 형식의 문서 뷰어

2
generators/ooo/libokularGenerator_ooo.desktop
View file

@ -106,7 +106,7 @@ Comment[pt_BR]=Infraestrutura OpenDocument para o Okular
Comment[ro]=Platformă OpenDocument pentru Okular
Comment[ru]=Модуль поддержки формата OpenDocument для Okular
Comment[sk]=Backend OpenDocument pre Okular
Comment[sl]=Hrbtenica za OpenDocument za Okular
Comment[sl]=Zaledje za OpenDocument za Okular
Comment[sq]=Mbështetje OpenDocument për Okular
Comment[sr]=Позадина ОДФ‑а за Окулар
Comment[sr@ijekavian]=Позадина ОДФ‑а за Окулар

2
generators/ooo/okularApplication_ooo.desktop
View file

@ -124,7 +124,7 @@ GenericName[uk]=Переглядач документів
GenericName[x-test]=xxDocument Viewerxx
GenericName[zh_CN]=文档查看器
GenericName[zh_TW]=文件檢視器
Exec=okular %U %i -caption "%c"
Exec=okular %U %i -caption %c
Icon=okular
Type=Application
InitialPreference=2

4
generators/plucker/active-documentviewer_plucker.desktop
View file

@ -15,6 +15,7 @@ Name[ga]=Léitheoir
Name[gl]=Lector
Name[hu]=Olvasó
Name[ia]=Lector
Name[is]=Lesari
Name[it]=Lettore
Name[kk]=Оқу құралы
Name[ko]=리더
@ -55,6 +56,7 @@ GenericName[ga]=Amharcán cáipéisí
GenericName[gl]=Visor de documentos
GenericName[hu]=Dokumentummegjelenítő
GenericName[ia]=Visor de documento
GenericName[is]=Skjalaskoðari
GenericName[it]=Visore di documenti
GenericName[kk]=Құжатты қарау құралы
GenericName[ko]=문서 뷰어
@ -95,6 +97,7 @@ Comment[ga]=Amharcán le haghaidh cáipéisí éagsúla
Comment[gl]=Visor de varios tipos de documentos.
Comment[hu]=Megjelenítő különféle típusú dokumentumokhoz
Comment[ia]=Visor pro varie typos de documento
Comment[is]=Skoðari fyrir ýmsar gerðir skjala
Comment[it]=Visore per vari tipi di documenti
Comment[kk]=Түрлі құжаттар қарау құралы
Comment[ko]=여러 형식의 문서 뷰어
@ -147,6 +150,7 @@ X-KDE-Keywords[ga]=plucker
X-KDE-Keywords[gl]=plucker
X-KDE-Keywords[hu]=plucker
X-KDE-Keywords[ia]=plucker
X-KDE-Keywords[is]=plucker
X-KDE-Keywords[it]=plucker
X-KDE-Keywords[kk]=plucker
X-KDE-Keywords[km]=plucker

2
generators/plucker/libokularGenerator_plucker.desktop
View file

@ -106,7 +106,7 @@ Comment[pt_BR]=Infraestrutura Plucker para o Okular
Comment[ro]=Platformă Plucker pentru Okular
Comment[ru]=Модуль поддержки формата Plucker для Okular
Comment[sk]=Backend Plucker pre Okular
Comment[sl]=Hrbtenica za Plucker za Okular
Comment[sl]=Zaledje za Plucker za Okular
Comment[sq]=Mbështetje për Plucker në Okular
Comment[sr]=Позадина Плакера за Окулар
Comment[sr@ijekavian]=Позадина Плакера за Окулар

3
generators/plucker/okularApplication_plucker.desktop
View file

@ -124,7 +124,7 @@ GenericName[uk]=Переглядач документів
GenericName[x-test]=xxDocument Viewerxx
GenericName[zh_CN]=文档查看器
GenericName[zh_TW]=文件檢視器
Exec=okular %U %i -caption "%c"
Exec=okular %U %i -caption %c
Icon=okular
Type=Application
InitialPreference=7
@ -148,6 +148,7 @@ X-KDE-Keywords[ga]=plucker
X-KDE-Keywords[gl]=plucker
X-KDE-Keywords[hu]=plucker
X-KDE-Keywords[ia]=plucker
X-KDE-Keywords[is]=plucker
X-KDE-Keywords[it]=plucker
X-KDE-Keywords[kk]=plucker
X-KDE-Keywords[km]=plucker

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

@ -15,6 +15,7 @@ Name[ga]=Léitheoir
Name[gl]=Lector
Name[hu]=Olvasó
Name[ia]=Lector
Name[is]=Lesari
Name[it]=Lettore
Name[kk]=Оқу құралы
Name[ko]=리더
@ -55,6 +56,7 @@ GenericName[ga]=Amharcán cáipéisí
GenericName[gl]=Visor de documentos
GenericName[hu]=Dokumentummegjelenítő
GenericName[ia]=Visor de documento
GenericName[is]=Skjalaskoðari
GenericName[it]=Visore di documenti
GenericName[kk]=Құжатты қарау құралы
GenericName[ko]=문서 뷰어
@ -95,6 +97,7 @@ Comment[ga]=Amharcán le haghaidh cáipéisí éagsúla
Comment[gl]=Visor de varios tipos de documentos.
Comment[hu]=Megjelenítő különféle típusú dokumentumokhoz
Comment[ia]=Visor pro varie typos de documento
Comment[is]=Skoðari fyrir ýmsar gerðir skjala
Comment[it]=Visore per vari tipi di documenti
Comment[kk]=Түрлі құжаттар қарау құралы
Comment[ko]=여러 형식의 문서 뷰어
@ -147,6 +150,7 @@ X-KDE-Keywords[ga]=PDF, Portable Document Format
X-KDE-Keywords[gl]=PDF, Formato portátil de documentos
X-KDE-Keywords[hu]=PDF, Portable Document Format
X-KDE-Keywords[ia]=PDF, Formato de Documento Portabile
X-KDE-Keywords[is]=PDF, Portable Document Format
X-KDE-Keywords[it]=PDF, Portable Document Format, formato per documenti portabile
X-KDE-Keywords[kk]=PDF, Portable Document Format
X-KDE-Keywords[km]=PDF, Portable Document Format

11
generators/poppler/annots.cpp
View file

@ -176,8 +176,6 @@ void PopplerAnnotationProxy::notifyModification( const Okular::Annotation *okl_a
ppl_txtann->setTextIcon( okl_txtann->textIcon() );
ppl_txtann->setTextFont( okl_txtann->textFont() );
ppl_txtann->setInplaceAlign( okl_txtann->inplaceAlignment() );
if ( okl_txtann->textType() == Okular::TextAnnotation::InPlace )
ppl_txtann->setContents( okl_txtann->inplaceText() ); // overrides contents
ppl_txtann->setCalloutPoints( QVector<QPointF>() );
ppl_txtann->setInplaceIntent( (Poppler::TextAnnotation::InplaceIntent)okl_txtann->inplaceIntent() );
break;
@ -400,14 +398,7 @@ Okular::Annotation* createAnnotationFromPopplerAnnotation( Poppler::Annotation *
{
Okular::TextAnnotation * txtann = static_cast<Okular::TextAnnotation*>( annotation );
if ( txtann->textType() == Okular::TextAnnotation::InPlace )
{
#ifndef HAVE_POPPLER_0_20
// Poppler before 0.20 returns the inplaceText in contents
txtann->setInplaceText( txtann->contents() );
#endif
}
else if ( txtann->textType() == Okular::TextAnnotation::Linked )
if ( txtann->textType() == Okular::TextAnnotation::Linked )
{
Poppler::TextAnnotation * ppl_txtann = static_cast<Poppler::TextAnnotation*>( ann );

2
generators/poppler/generator_pdf.cpp
View file

@ -1789,7 +1789,7 @@ const Okular::SourceReference * PDFGenerator::dynamicSourceReference( int pageNr
}
const char *name = synctex_scanner_get_name( synctex_scanner, synctex_node_tag( node ) );
Okular::SourceReference * sourceRef = new Okular::SourceReference( QString::fromLocal8Bit( name ), line, col );
Okular::SourceReference * sourceRef = new Okular::SourceReference( QFile::decodeName( name ), line, col );
return sourceRef;
}
}

2
generators/poppler/libokularGenerator_poppler.desktop
View file

@ -106,7 +106,7 @@ Comment[pt_BR]=Infraestrutura PDF para o Okular usando o poppler
Comment[ro]=Platformă PDF pentru Okular utilizînd poppler
Comment[ru]=Модуль поддержки формата PDF для Okular посредством poppler
Comment[sk]=Backend PDF pre Okular použitím poppler
Comment[sl]=Hrbtenica za PDF za Okular (uporablja Poppler)
Comment[sl]=Zaledje za PDF za Okular (uporablja Poppler)
Comment[sq]=Mbështetje për PDF në Okular duke përdorur poppler
Comment[sr]=Позадина ПДФ‑а за Окулар, кроз Поплер
Comment[sr@ijekavian]=Позадина ПДФ‑а за Окулар, кроз Поплер

3
generators/poppler/okularApplication_pdf.desktop
View file

@ -124,7 +124,7 @@ GenericName[uk]=Переглядач документів
GenericName[x-test]=xxDocument Viewerxx
GenericName[zh_CN]=文档查看器
GenericName[zh_TW]=文件檢視器
Exec=okular %U %i -caption "%c"
Exec=okular %U %i -caption %c
Icon=okular
Type=Application
InitialPreference=8
@ -147,6 +147,7 @@ X-KDE-Keywords[ga]=PDF, Portable Document Format
X-KDE-Keywords[gl]=PDF, Formato portátil de documentos
X-KDE-Keywords[hu]=PDF, Portable Document Format
X-KDE-Keywords[ia]=PDF, Formato de Documento Portabile
X-KDE-Keywords[is]=PDF, Portable Document Format
X-KDE-Keywords[it]=PDF, Portable Document Format, formato per documenti portabile
X-KDE-Keywords[kk]=PDF, Portable Document Format
X-KDE-Keywords[km]=PDF, Portable Document Format

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

@ -15,6 +15,7 @@ Name[ga]=Léitheoir
Name[gl]=Lector
Name[hu]=Olvasó
Name[ia]=Lector
Name[is]=Lesari
Name[it]=Lettore
Name[kk]=Оқу құралы
Name[ko]=리더
@ -55,6 +56,7 @@ GenericName[ga]=Amharcán cáipéisí
GenericName[gl]=Visor de documentos
GenericName[hu]=Dokumentummegjelenítő
GenericName[ia]=Visor de documento
GenericName[is]=Skjalaskoðari
GenericName[it]=Visore di documenti
GenericName[kk]=Құжатты қарау құралы
GenericName[ko]=문서 뷰어
@ -95,6 +97,7 @@ Comment[ga]=Amharcán le haghaidh cáipéisí éagsúla
Comment[gl]=Visor de varios tipos de documentos.
Comment[hu]=Megjelenítő különféle típusú dokumentumokhoz
Comment[ia]=Visor pro varie typos de documento
Comment[is]=Skoðari fyrir ýmsar gerðir skjala
Comment[it]=Visore per vari tipi di documenti
Comment[kk]=Түрлі құжаттар қарау құралы
Comment[ko]=여러 형식의 문서 뷰어
@ -137,9 +140,13 @@ X-KDE-Keywords[de]=PS, PostScript
X-KDE-Keywords[el]=PS, PostScript
X-KDE-Keywords[es]=PS, PostScript
X-KDE-Keywords[fi]=PS, PostScript
X-KDE-Keywords[fr]=PS, PostScript
X-KDE-Keywords[gl]=PS, Ghostscript
X-KDE-Keywords[hu]=PS, PostScript
X-KDE-Keywords[ia]=PS, PostScript
X-KDE-Keywords[is]=PS, PostScript
X-KDE-Keywords[kk]=PS, PostScript
X-KDE-Keywords[lt]=PS, PostScript
X-KDE-Keywords[mr]=PS, पोस्ट स्क्रिप्ट
X-KDE-Keywords[nb]=PS, PostScript
X-KDE-Keywords[nl]=PS, PostScript
@ -148,6 +155,7 @@ X-KDE-Keywords[pt]=PS, PostScript
X-KDE-Keywords[pt_BR]=PS, PostScript
X-KDE-Keywords[ru]=PS, PostScript
X-KDE-Keywords[sk]=PS, PostScript
X-KDE-Keywords[sl]=PS, PostScript
X-KDE-Keywords[sr]=PS,PostScript,постскрипт,ПС
X-KDE-Keywords[sr@ijekavian]=PS,PostScript,постскрипт,ПС
X-KDE-Keywords[sr@ijekavianlatin]=PS,PostScript,PostScript,PS

2
generators/spectre/libokularGenerator_ghostview.desktop
View file

@ -106,7 +106,7 @@ Comment[pt_BR]=Infraestrutura Ghostscript PS/PDF para o Okular
Comment[ro]=Platformă PS/PDF Ghostscript pentru Okular
Comment[ru]=Модуль поддержки форматов PS/PDF для Okular посредством Ghostscript
Comment[sk]=Backend Ghostscript PS/PDF pre Okular
Comment[sl]=Hrbtenica Ghostscript za PS in PDF za Okular
Comment[sl]=Zaledje Ghostscript za PS in PDF za Okular
Comment[sq]=Ghostscript PS/PDF mbështetje për Okular
Comment[sr]=Позадина ПС‑а и ПДФ‑а за Окулар, кроз Гостскрипт
Comment[sr@ijekavian]=Позадина ПС‑а и ПДФ‑а за Окулар, кроз Гостскрипт

7
generators/spectre/okularApplication_ghostview.desktop
View file

@ -124,7 +124,7 @@ GenericName[uk]=Переглядач документів
GenericName[x-test]=xxDocument Viewerxx
GenericName[zh_CN]=文档查看器
GenericName[zh_TW]=文件檢視器
Exec=okular %U %i -caption "%c"
Exec=okular %U %i -caption %c
Icon=okular
Type=Application
InitialPreference=7
@ -137,9 +137,13 @@ X-KDE-Keywords[de]=PS, PostScript
X-KDE-Keywords[el]=PS, PostScript
X-KDE-Keywords[es]=PS, PostScript
X-KDE-Keywords[fi]=PS, PostScript
X-KDE-Keywords[fr]=PS, PostScript
X-KDE-Keywords[gl]=PS, Ghostscript
X-KDE-Keywords[hu]=PS, PostScript
X-KDE-Keywords[ia]=PS, PostScript
X-KDE-Keywords[is]=PS, PostScript
X-KDE-Keywords[kk]=PS, PostScript
X-KDE-Keywords[lt]=PS, PostScript
X-KDE-Keywords[mr]=PS, पोस्ट स्क्रिप्ट
X-KDE-Keywords[nb]=PS, PostScript
X-KDE-Keywords[nl]=PS, PostScript
@ -148,6 +152,7 @@ X-KDE-Keywords[pt]=PS, PostScript
X-KDE-Keywords[pt_BR]=PS, PostScript
X-KDE-Keywords[ru]=PS, PostScript
X-KDE-Keywords[sk]=PS, PostScript
X-KDE-Keywords[sl]=PS, PostScript
X-KDE-Keywords[sr]=PS,PostScript,постскрипт,ПС
X-KDE-Keywords[sr@ijekavian]=PS,PostScript,постскрипт,ПС
X-KDE-Keywords[sr@ijekavianlatin]=PS,PostScript,PostScript,PS

3
generators/tiff/active-documentviewer_tiff.desktop
View file

@ -15,6 +15,7 @@ Name[ga]=Léitheoir
Name[gl]=Lector
Name[hu]=Olvasó
Name[ia]=Lector
Name[is]=Lesari
Name[it]=Lettore
Name[kk]=Оқу құралы
Name[ko]=리더
@ -55,6 +56,7 @@ GenericName[ga]=Amharcán cáipéisí
GenericName[gl]=Visor de documentos
GenericName[hu]=Dokumentummegjelenítő
GenericName[ia]=Visor de documento
GenericName[is]=Skjalaskoðari
GenericName[it]=Visore di documenti
GenericName[kk]=Құжатты қарау құралы
GenericName[ko]=문서 뷰어
@ -95,6 +97,7 @@ Comment[ga]=Amharcán le haghaidh cáipéisí éagsúla
Comment[gl]=Visor de varios tipos de documentos.
Comment[hu]=Megjelenítő különféle típusú dokumentumokhoz
Comment[ia]=Visor pro varie typos de documento
Comment[is]=Skoðari fyrir ýmsar gerðir skjala
Comment[it]=Visore per vari tipi di documenti
Comment[kk]=Түрлі құжаттар қарау құралы
Comment[ko]=여러 형식의 문서 뷰어

2
generators/tiff/libokularGenerator_tiff.desktop
View file

@ -102,7 +102,7 @@ Comment[pt_BR]=Infraestrutura TIFF para o Okular
Comment[ro]=Platformă TIFF pentru Okular
Comment[ru]=Модуль поддержки формата TIFF для Okular
Comment[sk]=Backend TIFF pre Okular
Comment[sl]=Hrbtenica za TIFF za Okular
Comment[sl]=Zaledje za TIFF za Okular
Comment[sq]=Mbështetje TIFF për Okular
Comment[sr]=Позадина ТИФФ‑а за Окулар
Comment[sr@ijekavian]=Позадина ТИФФ‑а за Окулар

2
generators/tiff/okularApplication_tiff.desktop
View file

@ -124,7 +124,7 @@ GenericName[uk]=Переглядач документів
GenericName[x-test]=xxDocument Viewerxx
GenericName[zh_CN]=文档查看器
GenericName[zh_TW]=文件檢視器
Exec=okular %U %i -caption "%c"
Exec=okular %U %i -caption %c
Icon=okular
Type=Application
InitialPreference=1

2
generators/txt/CMakeLists.txt
View file

@ -14,7 +14,7 @@ set(okularGenerator_txt_SRCS
kde4_add_plugin(okularGenerator_txt ${okularGenerator_txt_SRCS})
target_link_libraries(okularGenerator_txt okularcore ${KDE4_KDECORE_LIBS} ${QT_QTGUI_LIBRARY} ${QT_QTXML_LIBRARY})
target_link_libraries(okularGenerator_txt okularcore ${KDE4_KDECORE_LIBS} ${QT_QTGUI_LIBRARY})
install(TARGETS okularGenerator_txt DESTINATION ${PLUGIN_INSTALL_DIR})

6
generators/txt/active-documentviewer_txt.desktop
View file

@ -15,6 +15,7 @@ Name[ga]=Léitheoir
Name[gl]=Lector
Name[hu]=Olvasó
Name[ia]=Lector
Name[is]=Lesari
Name[it]=Lettore
Name[kk]=Оқу құралы
Name[ko]=리더
@ -55,6 +56,7 @@ GenericName[ga]=Amharcán cáipéisí
GenericName[gl]=Visor de documentos
GenericName[hu]=Dokumentummegjelenítő
GenericName[ia]=Visor de documento
GenericName[is]=Skjalaskoðari
GenericName[it]=Visore di documenti
GenericName[kk]=Құжатты қарау құралы
GenericName[ko]=문서 뷰어
@ -95,6 +97,7 @@ Comment[ga]=Amharcán le haghaidh cáipéisí éagsúla
Comment[gl]=Visor de varios tipos de documentos.
Comment[hu]=Megjelenítő különféle típusú dokumentumokhoz
Comment[ia]=Visor pro varie typos de documento
Comment[is]=Skoðari fyrir ýmsar gerðir skjala
Comment[it]=Visore per vari tipi di documenti
Comment[kk]=Түрлі құжаттар қарау құралы
Comment[ko]=여러 형식의 문서 뷰어
@ -139,6 +142,8 @@ X-KDE-Keywords[fi]=txt
X-KDE-Keywords[fr]=txt
X-KDE-Keywords[hu]=txt
X-KDE-Keywords[ia]=txt
X-KDE-Keywords[is]=txt
X-KDE-Keywords[lt]=txt
X-KDE-Keywords[mr]=txt
X-KDE-Keywords[nb]=txt
X-KDE-Keywords[nl]=txt
@ -147,6 +152,7 @@ X-KDE-Keywords[pt]=txt
X-KDE-Keywords[pt_BR]=txt
X-KDE-Keywords[ru]=txt
X-KDE-Keywords[sk]=txt
X-KDE-Keywords[sl]=txt
X-KDE-Keywords[sr]=txt;обични;текст
X-KDE-Keywords[sr@ijekavian]=txt;обични;текст
X-KDE-Keywords[sr@ijekavianlatin]=txt;obični;tekst

6
generators/txt/libokularGenerator_txt.desktop
View file

@ -10,6 +10,8 @@ Name[fi]=txt
Name[fr]=txt
Name[hu]=txt
Name[ia]=txt
Name[is]=txt
Name[lt]=txt
Name[mr]=txt
Name[nb]=tekst
Name[nl]=tekst
@ -18,6 +20,7 @@ Name[pt]=txt
Name[pt_BR]=txt
Name[ru]=txt
Name[sk]=txt
Name[sl]=txt
Name[sr]=обични текст
Name[sr@ijekavian]=обични текст
Name[sr@ijekavianlatin]=obični tekst
@ -37,6 +40,8 @@ Comment[fi]=TXT-taustaosa Okularille
Comment[fr]=Interface d'Okular pour les fichiers txt
Comment[hu]=Txt-bővítmény az Okularhoz
Comment[ia]=Retro-administration per Txt pro Okular
Comment[is]=TXT stuðningur fyrir Okular
Comment[lt]=Txt programinė sąsaja, skirta Okular
Comment[mr]=ओक्युलर करिता Txt बॅकएन्ड
Comment[nb]=Txt-motor for Okular
Comment[nl]=Tekst-backend voor Okular
@ -45,6 +50,7 @@ Comment[pt]=Infra-estrutura de TXT para o Okular
Comment[pt_BR]=Infraestrutura txt para o Okular
Comment[ru]=Модуль поддержки формата Txt для Okular
Comment[sk]=Txt backend pre Okular
Comment[sl]=Zaledje za txt za Okular
Comment[sr]=Позадина обичног текста за Окулар
Comment[sr@ijekavian]=Позадина обичног текста за Окулар
Comment[sr@ijekavianlatin]=Pozadina običnog teksta za Okular

5
generators/txt/okularApplication_txt.desktop
View file

@ -124,7 +124,7 @@ GenericName[uk]=Переглядач документів
GenericName[x-test]=xxDocument Viewerxx
GenericName[zh_CN]=文档查看器
GenericName[zh_TW]=文件檢視器
Exec=okular %U %i -caption "%c"
Exec=okular %U %i -caption %c
Icon=okular
Type=Application
InitialPreference=3
@ -140,6 +140,8 @@ X-KDE-Keywords[fi]=txt
X-KDE-Keywords[fr]=txt
X-KDE-Keywords[hu]=txt
X-KDE-Keywords[ia]=txt
X-KDE-Keywords[is]=txt
X-KDE-Keywords[lt]=txt
X-KDE-Keywords[mr]=txt
X-KDE-Keywords[nb]=txt
X-KDE-Keywords[nl]=txt
@ -148,6 +150,7 @@ X-KDE-Keywords[pt]=txt
X-KDE-Keywords[pt_BR]=txt
X-KDE-Keywords[ru]=txt
X-KDE-Keywords[sk]=txt
X-KDE-Keywords[sl]=txt
X-KDE-Keywords[sr]=txt;обични;текст
X-KDE-Keywords[sr@ijekavian]=txt;обични;текст
X-KDE-Keywords[sr@ijekavianlatin]=txt;obični;tekst

4
generators/xps/active-documentviewer_xps.desktop
View file

@ -15,6 +15,7 @@ Name[ga]=Léitheoir
Name[gl]=Lector
Name[hu]=Olvasó
Name[ia]=Lector
Name[is]=Lesari
Name[it]=Lettore
Name[kk]=Оқу құралы
Name[ko]=리더
@ -55,6 +56,7 @@ GenericName[ga]=Amharcán cáipéisí
GenericName[gl]=Visor de documentos
GenericName[hu]=Dokumentummegjelenítő
GenericName[ia]=Visor de documento
GenericName[is]=Skjalaskoðari
GenericName[it]=Visore di documenti
GenericName[kk]=Құжатты қарау құралы
GenericName[ko]=문서 뷰어
@ -95,6 +97,7 @@ Comment[ga]=Amharcán le haghaidh cáipéisí éagsúla
Comment[gl]=Visor de varios tipos de documentos.
Comment[hu]=Megjelenítő különféle típusú dokumentumokhoz
Comment[ia]=Visor pro varie typos de documento
Comment[is]=Skoðari fyrir ýmsar gerðir skjala
Comment[it]=Visore per vari tipi di documenti
Comment[kk]=Түрлі құжаттар қарау құралы
Comment[ko]=여러 형식의 문서 뷰어
@ -147,6 +150,7 @@ X-KDE-Keywords[ga]=XPS
X-KDE-Keywords[gl]=XPS
X-KDE-Keywords[hu]=XPS
X-KDE-Keywords[ia]=XPS
X-KDE-Keywords[is]=XPS
X-KDE-Keywords[it]=XPS
X-KDE-Keywords[kk]=XPS
X-KDE-Keywords[km]=XPS

2
generators/xps/libokularGenerator_xps.desktop
View file

@ -102,7 +102,7 @@ Comment[pt_BR]=Infraestrutura XPS para o Okular
Comment[ro]=Platformă XPS pentru Okular
Comment[ru]=Модуль поддержки формата XPS для Okular
Comment[sk]=Backend XPS pre Okular
Comment[sl]=Hrbtenica za XPS za Okular
Comment[sl]=Zaledje za XPS za Okular
Comment[sq]=Mbështetje XPS për Okular
Comment[sr]=Позадина ИксПС‑а за Окулар
Comment[sr@ijekavian]=Позадина ИксПС‑а за Окулар

3
generators/xps/okularApplication_xps.desktop
View file

@ -124,7 +124,7 @@ GenericName[uk]=Переглядач документів
GenericName[x-test]=xxDocument Viewerxx
GenericName[zh_CN]=文档查看器
GenericName[zh_TW]=文件檢視器
Exec=okular %U %i -caption "%c"
Exec=okular %U %i -caption %c
Icon=okular
Type=Application
InitialPreference=7
@ -147,6 +147,7 @@ X-KDE-Keywords[ga]=XPS
X-KDE-Keywords[gl]=XPS
X-KDE-Keywords[hu]=XPS
X-KDE-Keywords[ia]=XPS
X-KDE-Keywords[is]=XPS
X-KDE-Keywords[it]=XPS
X-KDE-Keywords[kk]=XPS
X-KDE-Keywords[km]=XPS

2
part.cpp
View file

@ -2036,7 +2036,7 @@ void Part::slotSaveFileAs()
}
}
KUrl saveUrl = KFileDialog::getSaveUrl( KUrl("kfiledialog:///okular/" + url().fileName()),
KUrl saveUrl = KFileDialog::getSaveUrl( url(),
QString(), widget(), QString(),
KFileDialog::ConfirmOverwrite );
if ( !saveUrl.isValid() || saveUrl.isEmpty() )

2
shell/okular.desktop
View file

@ -123,7 +123,7 @@ GenericName[uk]=Переглядач документів
GenericName[x-test]=xxDocument Viewerxx
GenericName[zh_CN]=文档查看器
GenericName[zh_TW]=文件檢視器
Exec=okular %U %i -caption "%c"
Exec=okular %U %i -caption %c
Icon=okular
Type=Application
X-DocPath=okular/index.html

30
tests/modifyannotationpropertiestest.cpp
View file

@ -30,6 +30,7 @@ private slots:
void cleanup();
void testModifyAnnotationProperties();
void testModifyDefaultAnnotationProperties();
void testModifyAnnotationPropertiesWithRotation_Bug318828();
private:
Okular::Document *m_document;
Okular::TextAnnotation *m_annot1;
@ -134,5 +135,34 @@ void ModifyAnnotationPropertiesTest::testModifyDefaultAnnotationProperties()
QCOMPARE( origLine1Xml, TestingUtils::getAnnotationXml( m_annot1 ) );
}
void ModifyAnnotationPropertiesTest::testModifyAnnotationPropertiesWithRotation_Bug318828()
{
Okular::NormalizedRect boundingRect = Okular::NormalizedRect( 0.1, 0.1, 0.15, 0.15 );
Okular::NormalizedRect transformedBoundingRect;
m_annot1->setBoundingRectangle( boundingRect );
m_document->addPageAnnotation( 0, m_annot1 );
transformedBoundingRect = m_annot1->transformedBoundingRectangle();
// Before page rotation boundingRect and transformedBoundingRect should be equal
QCOMPARE( boundingRect, transformedBoundingRect );
m_document->setRotation( 1 );
// After rotation boundingRect should remain unchanged but
// transformedBoundingRect should no longer equal boundingRect
QCOMPARE( boundingRect, m_annot1->boundingRectangle() );
transformedBoundingRect = m_annot1->transformedBoundingRectangle();
QVERIFY( !( boundingRect == transformedBoundingRect ) );
// Modifying the properties of m_annot1 while page is rotated shouldn't
// alter either boundingRect or transformedBoundingRect
m_document->prepareToModifyAnnotationProperties( m_annot1 );
m_annot1->style().setOpacity( 0.5 );
m_document->modifyPageAnnotationProperties( 0, m_annot1 );
QCOMPARE( boundingRect, m_annot1->boundingRectangle() );
QCOMPARE( transformedBoundingRect, m_annot1->transformedBoundingRectangle() );
}
QTEST_KDEMAIN( ModifyAnnotationPropertiesTest, GUI )
#include "modifyannotationpropertiestest.moc"

2
ui/pagepainter.cpp
View file

@ -700,7 +700,7 @@ void PagePainter::paintCroppedPageOnPainter( QPainter * destPainter, const Okula
painter.scale( 1.0 * scaledWidth / page->width(), 1.0 * scaledHeight / page->height() );
painter.drawText( 2, 2, image.width() - 2, image.height() - 2,
Qt::AlignTop | halign | Qt::TextWordWrap,
text->inplaceText() );
text->contents() );
painter.resetTransform();
painter.drawRect( 0, 0, image.width() - 1, image.height() - 1 );
painter.end();

5
ui/pageviewannotator.cpp
View file

@ -165,7 +165,7 @@ class PickPointEngine : public AnnotatorEngine
//add note
Okular::TextAnnotation * ta = new Okular::TextAnnotation();
ann = ta;
ta->setInplaceText( note );
ta->setContents( note );
ta->setTextType( Okular::TextAnnotation::InPlace );
//set font
if ( m_annotElement.hasAttribute( "font" ) )
@ -183,7 +183,7 @@ class PickPointEngine : public AnnotatorEngine
static int padding = 2;
const QFontMetricsF mf(ta->textFont());
const QRectF rcf = mf.boundingRect( Okular::NormalizedRect( rect.left, rect.top, 1.0, 1.0 ).geometry( (int)pagewidth, (int)pageheight ).adjusted( padding, padding, -padding, -padding ),
Qt::AlignTop | Qt::AlignLeft | Qt::TextWordWrap, ta->inplaceText() );
Qt::AlignTop | Qt::AlignLeft | Qt::TextWordWrap, ta->contents() );
rect.right = qMax(rect.right, rect.left+(rcf.width()+padding*2)/pagewidth);
rect.bottom = qMax(rect.bottom, rect.top+(rcf.height()+padding*2)/pageheight);
ta->window().setSummary( i18n( "Inline Note" ) );
@ -195,7 +195,6 @@ class PickPointEngine : public AnnotatorEngine
ann = ta;
ta->setTextType( Okular::TextAnnotation::Linked );
ta->setTextIcon( iconName );
ta->window().setText( QString() );
//ta->window.flags &= ~(Okular::Annotation::Hidden);
const double iconhei=0.03;
rect.left = point.x;