← Back to branch summary

~ubuntu-branches/ubuntu/quantal/ark/quantal

« back to all changes in this revision

Viewing changes to plugins/cli7zplugin/cliplugin.cpp

  • Committer: Package Import Robot
  • Author(s): Felix Geyer
  • Date: 2012-06-06 18:50:49 UTC
  • mfrom: (1.1.7)
  • Revision ID: package-import@ubuntu.com-20120606185049-z43lsy5wwp3wtrgt
Tags: 4:4.8.80-0ubuntu1
* Merge with Debian git repository, remaining changes:
  - Suggest instead of recommend p7zip-full
  - Add and install utilities-file-archiver.xpm
* New upstream beta release.

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugins/cli7zplugin/cliplugin.cpp
2
2
 * ark -- archiver for the KDE project
3
3
 *
4
4
 * Copyright (C) 2009 Harald Hvaal <haraldhv@stud.ntnu.no>
5
 
 * Copyright (C) 2009-2011 Raphael Kubo da Costa <kubito@gmail.com>
 
5
 * Copyright (C) 2009-2011 Raphael Kubo da Costa <rakuco@FreeBSD.org>
6
6
 *
7
7
 * This program is free software; you can redistribute it and/or
8
8
 * modify it under the terms of the GNU General Public License
50
50
 
51
51
    if (p.isEmpty()) {
52
52
        //p[CaptureProgress] = true;
53
 
        p[ListProgram] = p[ExtractProgram] = p[DeleteProgram] = p[AddProgram] = QLatin1String( "7z" );
 
53
        p[ListProgram] = p[ExtractProgram] = p[DeleteProgram] = p[AddProgram] = QStringList() << QLatin1String( "7zr" ) << QLatin1String( "7za" ) << QLatin1String( "7z" );
54
54
 
55
55
        p[ListArgs] = QStringList() << QLatin1String( "l" ) << QLatin1String( "-slt" ) << QLatin1String( "$Archive" );
56
56
        p[ExtractArgs] = QStringList() << QLatin1String( "$PreservePathSwitch" ) << QLatin1String( "$PasswordSwitch" ) << QLatin1String( "$Archive" ) << QLatin1String( "$Files" );
166
166
            m_currentArchiveEntry[ IsPasswordProtected ] = (line.at(12) == QLatin1Char( '+' ));
167
167
        } else if (line.startsWith(QLatin1String("Block = "))) {
168
168
            if (m_currentArchiveEntry.contains(FileName)) {
169
 
                entry(m_currentArchiveEntry);
 
169
                emit entry(m_currentArchiveEntry);
170
170
            }
171
171
        }
172
172
        break;