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

Merge remote-tracking branch 'origin/KDE/4.11'

Browse source 
Conflicts:
	generators/txt/libokularGenerator_txt.desktop
This commit is contained in:
Albert Astals Cid 2013-10-13 23:56:10 +02:00
parent a995fdf1b4 cfa37065c2
commit 049a3a8fe5
3 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
generators/comicbook/unrar.cpp
View file

@ -11,6 +11,7 @@
#include <QtCore/QEventLoop>
#include <QtCore/QFile>
#include <QtCore/QFileInfo>
#include <QtCore/QRegExp>
#include <kdebug.h>
@ -133,8 +134,11 @@ QStringList Unrar::list()
const QStringList listFiles = helper->kind->processListing( QString::fromLocal8Bit( mStdOutData ).split( '\n', QString::SkipEmptyParts ) );
QStringList newList;
Q_FOREACH ( const QString &f, listFiles ) {
if ( QFile::exists( mTempDir->name() + f ) ) {
newList.append( f );
// Extract all the files to mTempDir regardless of their path inside the archive
// This will break if ever an arvhice with two files with the same name in different subfolders
QFileInfo fi( f );
if ( QFile::exists( mTempDir->name() + fi.fileName() ) ) {
newList.append( fi.fileName() );
}
}
return newList;

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

@ -152,7 +152,7 @@ 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[gl]=PS, PostScript
X-KDE-Keywords[hu]=PS, PostScript
X-KDE-Keywords[ia]=PS, PostScript
X-KDE-Keywords[is]=PS, PostScript

2
generators/spectre/okularApplication_ghostview.desktop
View file

@ -141,7 +141,7 @@ 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[gl]=PS, PostScript
X-KDE-Keywords[hu]=PS, PostScript
X-KDE-Keywords[ia]=PS, PostScript
X-KDE-Keywords[is]=PS, PostScript