Attachment 670 Details for Bug 1030 – ALTLinux extension ARK patch

By default, Bugzilla does not search the list of RESOLVED bugs.
You can force it to do so by putting the upper-case word ALL in front of your search query, e.g.: ALL tdelibs
We recommend searching for bugs this way, as you may discover that your bug has already been resolved and fixed in a later release.

[patch] ALTLinux extension ARK patch

ark.patch (text/plain), 37.30 KB, created by Roman Savochenko on 2012-06-16 15:33:05 CDT

(hide)

Description:

Filename:

MIME Type:

Creator: Roman Savochenko

Created: 2012-06-16 15:33:05 CDT

Size: 37.30 KB

patch

obsolete

>diff -uNr ark/addition.ui ark.new/addition.ui
>--- ark/addition.ui	2011-07-19 05:20:59.000000000 +0300
>+++ ark.new/addition.ui	2012-06-16 22:52:36.000000000 +0300
>@@ -16,6 +16,15 @@
>         <property name="name">
>             <cstring>unnamed</cstring>
>         </property>
>+
>+        <widget class="TQCheckBox">
>+            <property name="name">
>+                <cstring>kcfg_askCreatePassword</cstring>
>+            </property>
>+            <property name="text">
>+                <string>Ask for &amp;password when create archive if possible</string>
>+            </property>
>+        </widget>
>         <widget class="TQCheckBox">
>             <property name="name">
>                 <cstring>kcfg_replaceOnlyWithNewer</cstring>
>diff -uNr ark/arch.cpp ark.new/arch.cpp
>--- ark/arch.cpp	2011-08-13 09:25:08.000000000 +0300
>+++ ark.new/arch.cpp	2012-06-16 22:52:36.000000000 +0300
>@@ -33,6 +33,7 @@
> // QT includes
> #include <tqapplication.h>
> #include <tqfile.h>
>+#include <tqtextcodec.h>
> 
> // KDE includes
> #include <kdebug.h>
>@@ -59,6 +60,7 @@
> #include "ar.h"
> #include "sevenzip.h"
> #include "ace.h"
>+#include "arj.h"
> 
> Arch::ArchColumns::ArchColumns( int col, TQRegExp reg, int length, bool opt )
>   : colRef( col ), pattern( reg ), maxLength( length ), optional( opt )
>@@ -288,7 +290,7 @@
> 
>     data[ lfChar ] = '\0';
> 
>-    m_buffer.append( TQString::fromUtf8(data + startChar).latin1() );
>+    m_buffer.append( data + startChar );
> 
>     data[ lfChar ] = '\n';
>     startChar = lfChar + 1;
>@@ -333,12 +335,15 @@
>   unsigned int pos = 0;
>   int strpos, len;
> 
>+  TQTextCodec *codec = TQTextCodec::codecForLocale();
>+  TQString tqunicode_line = codec->toUnicode( line );
>+
>   // Go through our columns, try to pick out data, return silently on failure
>   for ( TQPtrListIterator <ArchColumns>col( m_archCols ); col.current(); ++col )
>   {
>     ArchColumns *curCol = *col;
> 
>-    strpos = curCol->pattern.search( line, pos );
>+    strpos = curCol->pattern.search( tqunicode_line, pos );
>     len = curCol->pattern.matchedLength();
> 
>     if ( ( strpos == -1 ) || ( len > curCol->maxLength ) )
>@@ -354,7 +359,7 @@
> 
>     pos = strpos + len;
> 
>-    columns[curCol->colRef] = TQString::fromLocal8Bit( line.mid(strpos, len) );
>+    columns[curCol->colRef] = tqunicode_line.mid(strpos, len).utf8();
>   }
> 
> 
>@@ -388,6 +393,60 @@
>   return true;
> }
> 
>+void Arch::test()
>+{
>+    emit sigTest(false);
>+    KMessageBox::information(0, i18n("Not implemented."));
>+}
>+
>+void Arch::slotTestExited( KProcess *_kp )
>+{
>+  bool success = ( _kp->normalExit() && ( _kp->exitStatus() == 0 ) );
>+
>+  if( !success )
>+  {
>+    if ( passwordRequired() )
>+    {
>+        TQString msg;
>+        if ( !m_password.isEmpty() )
>+            msg = i18n("The password was incorrect. ");
>+        if (KPasswordDialog::getPassword( m_password, msg+i18n("You must enter a password to extract the file:") ) == KPasswordDialog::Accepted )
>+        {
>+            delete _kp;
>+            _kp = m_currentProcess = 0;
>+            clearShellOutput();
>+            test(); // try to test the archive again with a password
>+            return;
>+        }
>+        m_password = "";
>+        emit sigTest( false );
>+        delete _kp;
>+        _kp = m_currentProcess = 0;
>+        return;
>+    }
>+    else if ( m_password.isEmpty() || _kp->exitStatus() > 1 )
>+    {
>+        QApplication::restoreOverrideCursor();
>+
>+        TQString msg = i18n( "The test operation failed." );
>+
>+        if ( !getLastShellOutput().isNull() )
>+        {
>+            //getLastShellOutput() is a TQString. errorList is expecting TQStringLists to show in multiple lines
>+            TQStringList list = TQStringList::split( "\n", getLastShellOutput() );
>+            KMessageBox::errorList( m_gui, msg, list );
>+            clearShellOutput();
>+        }
>+        else
>+        {
>+            KMessageBox::error( m_gui, msg );
>+        }
>+    }
>+  }
>+  delete _kp;
>+  _kp = m_currentProcess = 0;
>+  emit sigTest( success );
>+}
> 
> Arch *Arch::archFactory( ArchType aType,
>                          ArkWidget *parent, const TQString &filename,
>@@ -422,6 +481,9 @@
>     case ACE_FORMAT:
>       return new AceArch( parent, filename );
> 
>+    case ARJ_FORMAT:
>+      return new ArjArch( parent, filename );
>+
>     case UNKNOWN_FORMAT:
>     default:
>       return 0;
>diff -uNr ark/arch.h ark.new/arch.h
>--- ark/arch.h	2011-08-13 09:25:08.000000000 +0300
>+++ ark.new/arch.h	2012-06-16 22:52:36.000000000 +0300
>@@ -65,7 +65,7 @@
> 
> enum ArchType { UNKNOWN_FORMAT, ZIP_FORMAT, TAR_FORMAT, AA_FORMAT,
>                 LHA_FORMAT, RAR_FORMAT, ZOO_FORMAT, COMPRESSED_FORMAT,
>-                SEVENZIP_FORMAT, ACE_FORMAT };
>+                SEVENZIP_FORMAT, ACE_FORMAT, ARJ_FORMAT };
> 
> typedef TQValueList< TQPair< TQString, TQt::AlignmentFlags > > ColumnList;
> 
>@@ -101,6 +101,7 @@
>     virtual void open() = 0;
>     virtual void create() = 0;
>     virtual void remove( TQStringList * ) = 0;
>+    virtual void test();
> 
>     virtual void addFile( const TQStringList & ) = 0;
>     virtual void addDir( const TQString & ) = 0;
>@@ -150,12 +151,16 @@
>     static Arch *archFactory( ArchType aType, ArkWidget *parent,
>                               const TQString &filename,
>                               const TQString &openAsMimeType = TQString() );
>+    TQString password() { return m_password; }
>+    void setPassword(const TQString & pw) { m_password = pw.local8Bit(); }
>+    virtual void createPassword() {}
> 
>   protected slots:
>     void slotOpenExited( KProcess* );
>     void slotExtractExited( KProcess* );
>     void slotDeleteExited( KProcess* );
>     void slotAddExited( KProcess* );
>+    void slotTestExited( KProcess* );
> 
>     void slotReceivedOutput( KProcess *, char*, int );
> 
>@@ -168,6 +173,7 @@
>     void sigDelete( bool );
>     void sigExtract( bool );
>     void sigAdd( bool );
>+    void sigTest( bool );
>     void headers( const ColumnList& columns );
> 
>   protected:  // data
>diff -uNr ark/archiveformatinfo.cpp ark.new/archiveformatinfo.cpp
>--- ark/archiveformatinfo.cpp	2011-08-13 09:25:08.000000000 +0300
>+++ ark.new/archiveformatinfo.cpp	2012-06-16 22:52:36.000000000 +0300
>@@ -84,6 +84,8 @@
> 
>   addFormatInfo( SEVENZIP_FORMAT, "application/x-7z", ".7z" );
> 
>+  addFormatInfo( ARJ_FORMAT, "application/x-arj", ".arj" );
>+
>   if ( ArkSettings::aceSupport() )
>     addFormatInfo( ACE_FORMAT, "application/x-ace", ".ace" );
> }
>diff -uNr ark/arj.cpp ark.new/arj.cpp
>--- ark/arj.cpp	1970-01-01 03:00:00.000000000 +0300
>+++ ark.new/arj.cpp	2012-06-16 22:52:36.000000000 +0300
>@@ -0,0 +1,326 @@
>+/*
>+
>+ ark -- archiver for the KDE project
>+
>+ Copyright (C)
>+
>+ 1997-1999: Rob Palmbos palm9744@kettering.edu
>+ 1999: Francois-Xavier Duranceau duranceau@kde.org
>+ 1999-2000: Corel Corporation (author: Emily Ezust, emilye@corel.com)
>+ 2001: Corel Corporation (author: Michael Jarrett, michaelj@corel.com)
>+ 2007: ALT Linux (author: Sergey V Turchin, zerg@altlinux.org)
>+
>+ This program is free software; you can redistribute it and/or
>+ modify it under the terms of the GNU General Public License
>+ as published by the Free Software Foundation; either version 2
>+ of the License, or (at your option) any later version.
>+
>+ This program is distributed in the hope that it will be useful,
>+ but WITHOUT ANY WARRANTY; without even the implied warranty of
>+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
>+ GNU General Public License for more details.
>+
>+ You should have received a copy of the GNU General Public License
>+ along with this program; if not, write to the Free Software
>+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
>+
>+*/
>+
>+
>+// Qt includes
>+#include <qdir.h>
>+#include <qtextcodec.h>
>+
>+// KDE includes
>+#include <kdebug.h>
>+#include <klocale.h>
>+#include <kmessagebox.h>
>+#include <kprocess.h>
>+#include <kpassdlg.h>
>+
>+// ark includes
>+#include "arj.h"
>+#include "arkwidget.h"
>+#include "settings.h"
>+
>+
>+ArjArch::ArjArch( ArkWidget *_gui, const QString & _fileName )
>+  : Arch(  _gui, _fileName )
>+{
>+  m_archiver_program = "arj";
>+  m_unarchiver_program = "arj";
>+  verifyCompressUtilityIsAvailable( m_archiver_program );
>+  verifyUncompressUtilityIsAvailable( m_unarchiver_program );
>+
>+  m_headerString = "-----------";
>+  m_numCols = 6;
>+}
>+
>+void ArjArch::setHeaders()
>+{
>+  ColumnList list;
>+  list.append( FILENAME_COLUMN );
>+  list.append( SIZE_COLUMN );
>+  list.append( PACKED_COLUMN );
>+  list.append( RATIO_COLUMN );
>+  list.append( TIMESTAMP_COLUMN );
>+  list.append( PERMISSION_COLUMN );
>+
>+  emit headers( list );
>+}
>+
>+void ArjArch::create()
>+{
>+  emit sigCreate( this, true, m_filename,
>+                  Arch::Extract | Arch::Delete | Arch::Add | Arch::View );
>+}
>+
>+void ArjArch::createPassword()
>+{
>+  if( m_password.isEmpty() && ArkSettings::askCreatePassword() )
>+    KPasswordDialog::getNewPassword( m_password, i18n("Warning!\nUsing KGpg for encryption is more secure.\nCancel this dialog or enter password for %1 archiver:").arg(m_archiver_program) );
>+}
>+
>+
>+void ArjArch::addDir( const QString & _dirName )
>+{
>+  if ( !_dirName.isEmpty() )
>+  {
>+    QStringList list;
>+    list.append( _dirName );
>+    addFile( list );
>+  }
>+}
>+
>+void ArjArch::addFile( const QStringList & urls )
>+{
>+  KProcess *kp = m_currentProcess = new KProcess;
>+
>+  kp->clearArguments();
>+  *kp << m_archiver_program;
>+  *kp << "a";
>+
>+  if ( ArkSettings::replaceOnlyWithNewer() )
>+    *kp << "-u";
>+
>+  if ( ArkSettings::rarRecurseSubdirs() )
>+    *kp << "-r";
>+
>+  if ( !m_password.isEmpty() )
>+    *kp << "-g"+m_password;
>+
>+  *kp << m_filename;
>+
>+  KURL dir( urls.first() );
>+  QDir::setCurrent( dir.directory() );
>+
>+  QStringList::ConstIterator iter;
>+  for ( iter = urls.begin(); iter != urls.end(); ++iter )
>+  {
>+    KURL url( *iter );
>+    *kp << url.fileName();
>+  }
>+
>+  connect( kp, SIGNAL( receivedStdout(KProcess*, char*, int) ),
>+           SLOT( slotReceivedOutput(KProcess*, char*, int) ) );
>+  connect( kp, SIGNAL( receivedStderr(KProcess*, char*, int) ),
>+           SLOT( slotReceivedOutput(KProcess*, char*, int) ) );
>+  connect( kp, SIGNAL( processExited(KProcess*) ),
>+           SLOT( slotAddExited(KProcess*) ) );
>+
>+  if ( !kp->start( KProcess::NotifyOnExit, KProcess::AllOutput ) )
>+  {
>+    KMessageBox::error( 0, i18n( "Could not start a subprocess." ) );
>+    emit sigAdd( false );
>+  }
>+}
>+
>+bool ArjArch::processLine( const QCString &line )
>+{
>+  QString unicode_line;
>+
>+  QTextCodec *codec = QTextCodec::codecForLocale();
>+  QTextCodec *codec_alt = QTextCodec::codecForName("CP1251");
>+  unicode_line = codec->toUnicode( line );
>+
>+  QStringList list;
>+
>+  QStringList l2 = QStringList::split( ' ', line );
>+  if( l2.size() >= 2 && l2[0].endsWith(")") && l2[0].length() == 4 )
>+  {
>+    file_entry = line.mid(4);
>+  }
>+  else if( l2.size() > 3 )
>+  {
>+    if( l2[1] == "UNIX" )
>+	list << codec->toUnicode(file_entry).stripWhiteSpace(); // filename
>+    else
>+	list << codec_alt->toUnicode(file_entry).stripWhiteSpace(); // filename
>+
>+    list << l2[ 2 ]; // size
>+    list << l2[ 3 ]; // packed
>+    double ratio = l2[4].toDouble();
>+    if( ratio == 0 )
>+	ratio = 1;
>+    list << QString("%1").arg(100-100/ratio); // ratio
>+
>+    QStringList date =  QStringList::split( '-', l2[ 5 ] );
>+    list << ArkUtils::fixYear( date[ 0 ].latin1() ) + '-' + date[ 1 ] + '-' + date [ 2 ] + ' ' + l2[6]; // date
>+    list << l2[ 7 ]; // attributes
>+
>+    m_gui->fileList()->addItem( list ); // send to GUI
>+    
>+    file_entry = "";
>+  }
>+
>+  return true;
>+}
>+
>+
>+void ArjArch::open()
>+{
>+  setHeaders();
>+
>+  m_buffer = "";
>+  m_header_removed = false;
>+  m_finished = false;
>+
>+  KProcess *kp = m_currentProcess = new KProcess;
>+
>+  *kp << m_unarchiver_program << "v" << m_filename;
>+
>+  connect( kp, SIGNAL( receivedStdout(KProcess*, char*, int) ),
>+           SLOT( slotReceivedTOC(KProcess*, char*, int) ) );
>+  connect( kp, SIGNAL( receivedStderr(KProcess*, char*, int) ),
>+           SLOT( slotReceivedOutput(KProcess*, char*, int) ) );
>+  connect( kp, SIGNAL( processExited(KProcess*) ),
>+           SLOT( slotOpenExited(KProcess*) ) );
>+
>+  if ( !kp->start( KProcess::NotifyOnExit, KProcess::AllOutput ) )
>+  {
>+    KMessageBox::error( 0, i18n( "Could not start a subprocess." ) );
>+    emit sigOpen( this, false, QString::null, 0 );
>+  }
>+}
>+
>+void ArjArch::unarchFileInternal()
>+{
>+  // if fileList is empty, all files are extracted.
>+  // if destDir is empty, abort with error.
>+  if ( m_destDir.isEmpty() || m_destDir.isNull() )
>+  {
>+    kdError( 1601 ) << "There was no extract directory given." << endl;
>+    return;
>+  }
>+
>+  KProcess *kp = m_currentProcess = new KProcess;
>+  kp->clearArguments();
>+
>+  *kp << m_unarchiver_program;
>+  *kp << "x";
>+
>+  if ( !m_password.isEmpty() )
>+    *kp << "-g" + m_password;
>+
>+  if ( ArkSettings::extractOverwrite() )
>+    *kp << "-jyo";
>+
>+  *kp << "-jycv";
>+
>+  *kp << "-w" + m_destDir;
>+  *kp << "-ht" + m_destDir;
>+
>+  QTextCodec *codec = QTextCodec::codecForLocale();
>+  *kp << codec->fromUnicode(m_filename);
>+
>+  // if the list is empty, no filenames go on the command line,
>+  // and we then extract everything in the archive.
>+  if ( m_fileList )
>+  {
>+    QStringList::Iterator it;
>+
>+    for ( it = m_fileList->begin(); it != m_fileList->end(); ++it )
>+    {
>+      *kp << codec->fromUnicode(*it);
>+    }
>+  }
>+
>+  connect( kp, SIGNAL( receivedStdout(KProcess*, char*, int) ),
>+           SLOT( slotReceivedOutput(KProcess*, char*, int) ) );
>+  connect( kp, SIGNAL( receivedStderr(KProcess*, char*, int) ),
>+           SLOT( slotReceivedOutput(KProcess*, char*, int) ) );
>+  connect( kp, SIGNAL( processExited(KProcess*) ),
>+           SLOT( slotExtractExited(KProcess*) ) );
>+
>+  if ( !kp->start( KProcess::NotifyOnExit, KProcess::AllOutput ) )
>+  {
>+    KMessageBox::error( 0, i18n( "Could not start a subprocess." ) );
>+    emit sigExtract( false );
>+  }
>+}
>+
>+bool ArjArch::passwordRequired()
>+{
>+    return m_lastShellOutput.findRev("File is password encrypted") != -1;
>+}
>+
>+void ArjArch::remove( QStringList *list )
>+{
>+  if ( !list )
>+    return;
>+
>+  KProcess *kp = m_currentProcess = new KProcess;
>+  kp->clearArguments();
>+
>+  *kp << m_archiver_program << "d" << m_filename;
>+
>+  QStringList::Iterator it;
>+  for ( it = list->begin(); it != list->end(); ++it )
>+  {
>+    QString str = *it;
>+    *kp << str;
>+  }
>+
>+  connect( kp, SIGNAL( receivedStdout(KProcess*, char*, int) ),
>+           SLOT( slotReceivedOutput(KProcess*, char*, int) ) );
>+  connect( kp, SIGNAL( receivedStderr(KProcess*, char*, int) ),
>+           SLOT( slotReceivedOutput(KProcess*, char*, int) ) );
>+  connect( kp, SIGNAL( processExited(KProcess*) ),
>+           SLOT( slotDeleteExited(KProcess*) ) );
>+
>+  if ( !kp->start( KProcess::NotifyOnExit, KProcess::AllOutput ) )
>+  {
>+    KMessageBox::error( 0, i18n( "Could not start a subprocess." ) );
>+    emit sigDelete( false );
>+  }
>+}
>+
>+void ArjArch::test()
>+{
>+  clearShellOutput();
>+
>+  KProcess *kp = m_currentProcess = new KProcess;
>+  kp->clearArguments();
>+
>+  *kp << m_unarchiver_program << "t";
>+
>+  if ( !m_password.isEmpty() )
>+    *kp << "-g" + m_password;
>+
>+  *kp << m_filename;
>+
>+  connect( kp, SIGNAL( receivedStdout(KProcess*, char*, int) ),
>+           SLOT( slotReceivedOutput(KProcess*, char*, int) ) );
>+  connect( kp, SIGNAL( receivedStderr(KProcess*, char*, int) ),
>+           SLOT( slotReceivedOutput(KProcess*, char*, int) ) );
>+  connect( kp, SIGNAL( processExited(KProcess*) ),
>+           SLOT( slotTestExited(KProcess*) ) );
>+
>+  if ( !kp->start( KProcess::NotifyOnExit, KProcess::AllOutput ) )
>+  {
>+    KMessageBox::error( 0, i18n( "Could not start a subprocess." ) );
>+    emit sigTest( false );
>+  }
>+}
>+
>+#include "arj.moc"
>diff -uNr ark/arj.h ark.new/arj.h
>--- ark/arj.h	1970-01-01 03:00:00.000000000 +0300
>+++ ark.new/arj.h	2012-06-16 22:52:36.000000000 +0300
>@@ -0,0 +1,65 @@
>+/*
>+
>+  ark -- archiver for the KDE project
>+
>+  Copyright (C)
>+
>+  1997-1999: Rob Palmbos palm9744@kettering.edu
>+  1999: Francois-Xavier Duranceau duranceau@kde.org
>+  1999-2000: Corel Corporation (author: Emily Ezust, emilye@corel.com)
>+  2001: Corel Corporation (author: Michael Jarrett, michaelj@corel.com)
>+  2007: ALT Linux (author: Sergey V Turchin, zerg@altlinux.org)
>+
>+  This program is free software; you can redistribute it and/or
>+  modify it under the terms of the GNU General Public License
>+  as published by the Free Software Foundation; either version 2
>+  of the License, or (at your option) any later version.
>+
>+  This program is distributed in the hope that it will be useful,
>+  but WITHOUT ANY WARRANTY; without even the implied warranty of
>+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
>+  GNU General Public License for more details.
>+
>+  You should have received a copy of the GNU General Public License
>+  along with this program; if not, write to the Free Software
>+  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
>+
>+*/
>+
>+#ifndef ARJARCH_H
>+#define ARJARCH_H
>+
>+#include "arch.h"
>+
>+class QString;
>+class QStringList;
>+
>+class ArkWidget;
>+
>+class ArjArch : public Arch
>+{
>+  Q_OBJECT
>+  public:
>+    ArjArch( ArkWidget *_gui, const QString & _fileName );
>+    virtual ~ArjArch() { }
>+
>+    virtual void open();
>+    virtual void create();
>+    virtual void test();
>+
>+    virtual void remove(QStringList*);
>+    virtual void addFile(const QStringList&);
>+    virtual void addDir(const QString&);
>+
>+    virtual void unarchFileInternal();
>+    virtual bool passwordRequired();
>+    virtual void createPassword();
>+
>+  protected slots:
>+    virtual bool processLine( const QCString & );
>+  private:
>+    QCString file_entry;
>+    void setHeaders();
>+};
>+
>+#endif /* ARJARCH_H */
>diff -uNr ark/arkapp.cpp ark.new/arkapp.cpp
>--- ark/arkapp.cpp	2011-08-13 09:25:08.000000000 +0300
>+++ ark.new/arkapp.cpp	2012-06-16 22:52:36.000000000 +0300
>@@ -32,6 +32,7 @@
> #include <unistd.h>
> #include <tqfile.h>
> #include <errno.h>
>+#include <qtextcodec.h>
> 
> 
> #include "arkapp.h"
>@@ -110,6 +111,7 @@
> {
> 	m_mainwidget = new TQWidget;
> 	setMainWidget(m_mainwidget);
>+	QTextCodec::setCodecForCStrings(QTextCodec::codecForLocale());
> }
> 
> int
>diff -uNr ark/ark_dummy.cpp ark.new/ark_dummy.cpp
>--- ark/ark_dummy.cpp	1970-01-01 03:00:00.000000000 +0300
>+++ ark.new/ark_dummy.cpp	2012-06-16 22:54:00.000000000 +0300
>@@ -0,0 +1,3 @@
>+#include <kdemacros.h>
>+extern "C" int kdemain(int argc, char* argv[]);
>+extern "C" KDE_EXPORT int kdeinitmain(int argc, char* argv[]) { return kdemain(argc,argv); }
>diff -uNr ark/ark.kcfg ark.new/ark.kcfg
>--- ark/ark.kcfg	2010-08-12 06:25:52.000000000 +0300
>+++ ark.new/ark.kcfg	2012-06-16 22:52:36.000000000 +0300
>@@ -18,6 +18,11 @@
> 			<whatsthis>Overwrite any files that have matching names on disk with the one from the archive</whatsthis>
> 			<default>false</default>
> 		</entry>
>+		<entry name="askCreatePassword" type="Bool">
>+			<label>Ask for password when create archive if possible</label>
>+			<whatsthis>Ask for password when create archive if possible</whatsthis>
>+			<default>true</default>
>+		</entry>
> 	</group>
> 	<group name="Tar">
> 		<entry name="preservePerms" type="Bool">
>diff -uNr ark/ark.la.cpp ark.new/ark.la.cpp
>--- ark/ark.la.cpp	1970-01-01 03:00:00.000000000 +0300
>+++ ark.new/ark.la.cpp	2012-06-16 22:54:00.000000000 +0300
>@@ -0,0 +1,2 @@
>+extern "C" int kdemain(int argc, char* argv[]);
>+int main(int argc, char* argv[]) { return kdemain(argc,argv); }
>diff -uNr ark/ark_part.cpp ark.new/ark_part.cpp
>--- ark/ark_part.cpp	2011-08-13 09:25:08.000000000 +0300
>+++ ark.new/ark_part.cpp	2012-06-16 22:52:36.000000000 +0300
>@@ -139,6 +139,9 @@
>     editAction = new KAction(i18n("Edit &With..."), 0, TQT_TQOBJECT(awidget),
>                              TQT_SLOT(action_edit()), actionCollection(), "edit");
> 
>+    testAction = new KAction(i18n("&Test integrity"), 0, awidget,
>+                                TQT_SLOT(action_test()),	actionCollection(), "test");
>+
>     selectAllAction = KStdAction::selectAll(TQT_TQOBJECT(awidget->fileList()), TQT_SLOT(selectAll()), actionCollection(), "select_all");
> 
>     deselectAllAction =  new KAction(i18n("&Unselect All"), 0, TQT_TQOBJECT(awidget->fileList()),TQT_SLOT(unselectAll()), actionCollection(), "deselect_all");
>@@ -189,6 +192,7 @@
>     addDirAction->setEnabled(awidget->isArchiveOpen() &&
>                              !bReadOnly && bAddDirSupported);
>     extractAction->setEnabled(bHaveFiles);
>+    testAction->setEnabled(true);
>     awidget->searchBar()->setEnabled(bHaveFiles);
> 
>     bool b = ( bHaveFiles
>@@ -216,6 +220,7 @@
>     addDirAction->setEnabled(false);
>     openWithAction->setEnabled(false);
>     editAction->setEnabled(false);
>+    testAction->setEnabled(false);
> 
>     awidget->searchBar()->setEnabled(false);
> }
>@@ -234,6 +239,7 @@
>     addDirAction->setEnabled(false);
>     openWithAction->setEnabled(false);
>     editAction->setEnabled(false);
>+    testAction->setEnabled(false);
>     awidget->searchBar()->setEnabled(false);
> }
> 
>diff -uNr ark/ark_part.h ark.new/ark_part.h
>--- ark/ark_part.h	2011-08-13 09:25:08.000000000 +0300
>+++ ark.new/ark_part.h	2012-06-16 22:52:36.000000000 +0300
>@@ -139,6 +139,7 @@
>     KAction *deselectAllAction;
>     KAction *invertSelectionAction;
>     KAction *editAction;
>+    KAction *testAction;
> 
>     // the following have different enable rules from the above KActions
>     KAction *popupViewAction;
>diff -uNr ark/ark_part.rc ark.new/ark_part.rc
>--- ark/ark_part.rc	2010-08-12 06:25:53.000000000 +0300
>+++ ark.new/ark_part.rc	2012-06-16 22:52:36.000000000 +0300
>@@ -21,6 +21,7 @@
>     <Action name="view"/>
>     <Action name="open_with"/>
>     <Action name="edit"/>
>+    <Action name="test"/>
>   </Menu>
>  <Menu noMerge="1" name="settings">
>     <text>&amp;Settings</text>
>diff -uNr ark/ark_part_readonly.rc ark.new/ark_part_readonly.rc
>--- ark/ark_part_readonly.rc	2010-08-12 06:25:53.000000000 +0300
>+++ ark.new/ark_part_readonly.rc	2012-06-16 22:52:36.000000000 +0300
>@@ -17,6 +17,7 @@
>     <Action name="extract"/>
>     <Action name="view"/>
>     <Action name="open_with"/>
>+    <Action name="test"/>
>   </Menu>
>  <Menu noMerge="1" name="settings">
>     <text>&amp;Settings</text>
>diff -uNr ark/arkwidget.cpp ark.new/arkwidget.cpp
>--- ark/arkwidget.cpp	2011-08-13 09:25:08.000000000 +0300
>+++ ark.new/arkwidget.cpp	2012-06-16 22:52:36.000000000 +0300
>@@ -739,7 +739,10 @@
>     m_url = url;
>     //arch->clearShellOutput();
> 
>-    openArchive( strFile );
>+    if( url.hasPass() )
>+	openArchive( strFile, url.pass() );
>+    else
>+	openArchive( strFile );
> }
> 
> 
>@@ -1184,6 +1187,8 @@
>         //simulate reload
>         KURL u;
>         u.setPath( arch->fileName() );
>+	if( !arch->password().isEmpty() )
>+    	    u.setPass( arch->password() );
>         file_close();
>         file_open( u );
>         emit setWindowCaption( u.path() );
>@@ -1682,6 +1687,25 @@
> }
> 
> void
>+ArkWidget::action_test()
>+{
>+    connect( arch, TQT_SIGNAL( sigTest( bool ) ), this,
>+             TQT_SLOT( slotTestDone( bool ) ) );
>+    busy( i18n( "Testing..." ) );
>+    arch->test();
>+}
>+
>+void
>+ArkWidget::slotTestDone(bool ok)
>+{
>+    disconnect( arch, TQT_SIGNAL( sigTest( bool ) ), this,
>+             TQT_SLOT( slotTestDone( bool ) ) );
>+    ready();
>+    if( ok )
>+	KMessageBox::information(0, i18n("Test successful."));
>+}
>+
>+void
> ArkWidget::viewSlotExtractDone( bool success )
> {
>     if ( success )
>@@ -2102,6 +2126,7 @@
>         m_bIsSimpleCompressedFile =
>             (m_archType == COMPRESSED_FORMAT);
>         fixEnables();
>+	arch->createPassword();
>     }
>     else
>     {
>@@ -2115,7 +2140,7 @@
> //////////////////////////////////////////////////////////////////////
> 
> void
>-ArkWidget::openArchive( const TQString & _filename )
>+ArkWidget::openArchive( const TQString & _filename, const TQString & _password )
> {
>     Arch *newArch = 0;
>     ArchType archtype;
>@@ -2172,6 +2197,7 @@
>     busy( i18n( "Opening the archive..." ) );
>     m_fileListView->setUpdatesEnabled( false );
>     arch = newArch;
>+    newArch->setPassword(_password);
>     newArch->open();
>     emit addRecentURL( m_url );
> }
>diff -uNr ark/arkwidget.h ark.new/arkwidget.h
>--- ark/arkwidget.h	2011-08-13 09:25:08.000000000 +0300
>+++ ark.new/arkwidget.h	2012-06-16 22:52:36.000000000 +0300
>@@ -121,6 +121,7 @@
>     bool action_extract();
>     void slotOpenWith();
>     void action_edit();
>+    void action_test();
> 
>     void doPopup(TQListViewItem *, const TQPoint &, int); // right-click menus
>     void viewFile(TQListViewItem*); // doubleClick view files
>@@ -133,6 +134,7 @@
>     void slotExtractRemoteDone(KIO::Job *job);
>     void slotAddDone(bool);
>     void slotEditFinished(KProcess *);
>+    void slotTestDone(bool);
> signals:
>     void openURLRequest( const KURL & url );
>     void request_file_quit();
>@@ -235,7 +237,7 @@
>     void createFileListView();
> 
>     bool createArchive(const TQString & name);
>-    void openArchive(const TQString & name);
>+    void openArchive(const TQString & name, const TQString & pass = "");
> 
>     void showCurrentFile();
> 
>diff -uNr ark/lha.cpp ark.new/lha.cpp
>--- ark/lha.cpp	2011-08-13 09:25:08.000000000 +0300
>+++ ark.new/lha.cpp	2012-06-16 22:52:36.000000000 +0300
>@@ -55,8 +55,10 @@
> LhaArch::LhaArch( ArkWidget *_gui, const TQString & _fileName )
>   : Arch( _gui, _fileName )
> {
>-  m_archiver_program = "lha";
>+  m_archiver_program = m_unarchiver_program = "lha";
>+
>   verifyCompressUtilityIsAvailable( m_archiver_program );
>+  verifyUncompressUtilityIsAvailable( m_unarchiver_program );
> 
>   m_headerString = "----";
> }
>diff -uNr ark/Makefile.am ark.new/Makefile.am
>--- ark/Makefile.am	2010-08-12 06:25:52.000000000 +0300
>+++ ark.new/Makefile.am	2012-06-16 22:52:37.000000000 +0300
>@@ -9,19 +9,19 @@
> lib_LTLIBRARIES =
> 
> ark_la_SOURCES = main.cpp arkapp.cpp mainwindow.cpp
>-ark_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
>-ark_la_LIBADD = libark_common.la $(LIB_KPARTS)
>+ark_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(KDE_PLUGIN)
>+ark_la_LIBADD = -lkdeinit_kded -lDCOP $(LIB_KHTML) $(LIB_KIO) $(LIB_KDEUI) $(LIB_KDECORE) $(LIB_QT)  libark_common.la $(LIB_KPARTS)
> ark_la_COMPILE_FIRST = settings.h
> 
> noinst_LTLIBRARIES = libark_common.la
> 
> libark_common_la_SOURCES = settings.kcfgc archiveformatinfo.cpp
> libark_common_la_LDFLAGS = $(all_libraries) -no-undefined
>-libark_common_la_LIBADD  = $(LIB_KFILE)
>+libark_common_la_LIBADD  = -lkdeinit_kded -lDCOP $(LIB_KHTML) $(LIB_KIO) $(LIB_KDEUI) $(LIB_KDECORE) $(LIB_QT)  $(LIB_KFILE)
> 
> kde_module_LTLIBRARIES = libarkpart.la
> libarkpart_la_LDFLAGS = $(KDE_PLUGIN) $(all_libraries)
>-libarkpart_la_LIBADD = libark_common.la $(LIB_KPARTS)
>+libarkpart_la_LIBADD = -lkdeinit_kded -lDCOP $(LIB_KHTML) $(LIB_KIO) $(LIB_KDEUI) $(LIB_KDECORE) $(LIB_QT)  libark_common.la $(LIB_KPARTS)
> libarkpart_la_COMPILE_FIRST = settings.h
> 
> libarkpart_la_SOURCES = ark_part.cpp arkfactory.cpp zip.cpp tar.cpp \
>@@ -31,7 +31,7 @@
>                         arkwidget.cpp searchbar.cpp \
>                         addition.ui extraction.ui general.ui \
>                         arkviewer.cpp sevenzip.cpp extractiondialog.cpp \
>-                        ace.cpp tarlistingthread.cpp
>+                        ace.cpp tarlistingthread.cpp arj.cpp
> 
> METASOURCES = AUTO
> 
>diff -uNr ark/rar.cpp ark.new/rar.cpp
>--- ark/rar.cpp	2011-08-13 09:25:08.000000000 +0300
>+++ ark.new/rar.cpp	2012-06-16 22:52:36.000000000 +0300
>@@ -107,6 +107,12 @@
> 
>   TQStringList l2 = TQStringList::split( ' ', line );
> 
>+  if( l2[5].startsWith("d") )
>+  {
>+    m_isFirstLine = true;
>+    return true;
>+  }
>+
>   list << m_entryFilename; // filename
>   list << l2[ 0 ]; // size
>   list << l2[ 1 ]; // packed
>@@ -179,6 +185,12 @@
>                   Arch::Extract | Arch::Delete | Arch::Add | Arch::View );
> }
> 
>+void RarArch::createPassword()
>+{
>+  if( m_password.isEmpty() && ArkSettings::askCreatePassword() )
>+    KPasswordDialog::getNewPassword( m_password, i18n("Warning!\nUsing KGpg for encryption is more secure.\nCancel this dialog or enter password for %1 archiver:").arg(m_archiver_program) );
>+}
>+
> void RarArch::addDir( const TQString & _dirName )
> {
>   if ( !_dirName.isEmpty() )
>@@ -206,6 +218,9 @@
>   if ( ArkSettings::rarRecurseSubdirs() )
>     *kp << "-r";
> 
>+  if ( !m_password.isEmpty() )
>+    *kp << "-p"+m_password;
>+
>   *kp << m_filename;
> 
>   KURL dir( urls.first() );
>@@ -291,7 +306,7 @@
> 
> bool RarArch::passwordRequired()
> {
>-    return m_lastShellOutput.findRev("password incorrect ?)")+1;
>+    return m_lastShellOutput.find("Enter password") >= 0;
> }
> 
> void RarArch::remove( TQStringList *list )
>@@ -325,4 +340,32 @@
>   }
> }
> 
>+void RarArch::test()
>+{
>+  clearShellOutput();
>+
>+  KProcess *kp = m_currentProcess = new KProcess;
>+  kp->clearArguments();
>+
>+  *kp << m_unarchiver_program << "t";
>+
>+  if ( !m_password.isEmpty() )
>+    *kp << "-p" + m_password;
>+
>+  *kp << m_filename;
>+
>+  connect( kp, SIGNAL( receivedStdout(KProcess*, char*, int) ),
>+           SLOT( slotReceivedOutput(KProcess*, char*, int) ) );
>+  connect( kp, SIGNAL( receivedStderr(KProcess*, char*, int) ),
>+           SLOT( slotReceivedOutput(KProcess*, char*, int) ) );
>+  connect( kp, SIGNAL( processExited(KProcess*) ),
>+           SLOT( slotTestExited(KProcess*) ) );
>+
>+  if ( !kp->start( KProcess::NotifyOnExit, KProcess::AllOutput ) )
>+  {
>+    KMessageBox::error( 0, i18n( "Could not start a subprocess." ) );
>+    emit sigTest( false );
>+  }
>+}
>+
> #include "rar.moc"
>diff -uNr ark/rar.h ark.new/rar.h
>--- ark/rar.h	2011-06-23 04:58:57.000000000 +0300
>+++ ark.new/rar.h	2012-06-16 22:52:36.000000000 +0300
>@@ -42,6 +42,7 @@
>   
>     virtual void open();
>     virtual void create();
>+    virtual void test();
> 
>     virtual void addFile( const TQStringList & );
>     virtual void addDir( const TQString & );
>@@ -49,6 +50,7 @@
>     virtual void remove( TQStringList * );
>     virtual void unarchFileInternal();
>     virtual bool passwordRequired();
>+    virtual void createPassword();
> 
>   protected slots:
>     virtual bool processLine( const TQCString & );
>diff -uNr ark/sevenzip.cpp ark.new/sevenzip.cpp
>--- ark/sevenzip.cpp	2011-08-13 09:25:08.000000000 +0300
>+++ ark.new/sevenzip.cpp	2012-06-16 22:52:36.000000000 +0300
>@@ -25,6 +25,7 @@
> */
> 
> #include <tqdir.h>
>+#include <tqtextcodec.h>
> 
> #include <kglobal.h>
> #include <klocale.h>
>@@ -120,6 +121,12 @@
>                   Arch::Extract | Arch::Delete | Arch::Add | Arch::View );
> }
> 
>+void SevenZipArch::createPassword()
>+{
>+  if( m_password.isEmpty() && ArkSettings::askCreatePassword() )
>+    KPasswordDialog::getNewPassword( m_password, i18n("Warning!\nUsing KGpg for encryption is more secure.\nCancel this dialog or enter password for %1 archiver:").arg(m_archiver_program) );
>+}
>+
> void SevenZipArch::addFile( const TQStringList & urls )
> {
>   KProcess *kp = m_currentProcess = new KProcess;
>@@ -127,6 +134,9 @@
>   kp->clearArguments();
>   *kp << m_archiver_program << "a" ;
> 
>+  if ( !m_password.isEmpty() )
>+    *kp << "-p" + m_password;
>+
>   KURL url( urls.first() );
>   TQDir::setCurrent( url.directory() );
> 
>@@ -163,6 +173,11 @@
>   }
> }
> 
>+bool SevenZipArch::passwordRequired()
>+{
>+    return m_lastShellOutput.find("Enter password") >= 0;
>+}
>+
> void SevenZipArch::remove( TQStringList *list )
> {
>   if ( !list )
>@@ -212,6 +227,12 @@
>     //*kp << "-ao";
>   }
> 
>+  // FIXME overwrite existing files created with wrong password
>+  *kp << "-y";
>+
>+  if ( !m_password.isEmpty() )
>+    *kp << "-p" + m_password;
>+
>   *kp << m_filename;
> 
>   // if the file list is empty, no filenames go on the command line,
>@@ -243,12 +264,15 @@
> 
> bool SevenZipArch::processLine( const TQCString& _line )
> {
>-  TQCString line( _line );
>+  TQString line;
>   TQString columns[ 11 ];
>   unsigned int pos = 0;
>   int strpos, len;
> 
>-  columns[ 0 ] = line.right( line.length() - m_nameColumnPos +1);
>+  TQTextCodec *codec = TQTextCodec::codecForLocale();
>+  line = codec->toUnicode( _line );
>+
>+  columns[ 0 ] = line.right( line.length() - m_nameColumnPos);
>   line.truncate( m_nameColumnPos );
> 
>   // Go through our columns, try to pick out data, return silently on failure
>@@ -275,6 +299,8 @@
>     columns[ curCol->colRef ] = line.mid( strpos, len );
>   }
> 
>+  // Separated directories pass
>+  if(columns[4].length() && columns[4][0] == 'D') return true;
> 
>   if ( m_dateCol >= 0 )
>   {
>@@ -364,4 +390,32 @@
>   data[ length ] = endchar;
> }
> 
>+void SevenZipArch::test()
>+{
>+  clearShellOutput();
>+
>+  KProcess *kp = m_currentProcess = new KProcess;
>+  kp->clearArguments();
>+
>+  *kp << m_unarchiver_program << "t";
>+
>+  if ( !m_password.isEmpty() )
>+    *kp << "-p" + m_password;
>+
>+  *kp << m_filename;
>+
>+  connect( kp, SIGNAL( receivedStdout(KProcess*, char*, int) ),
>+           SLOT( slotReceivedOutput(KProcess*, char*, int) ) );
>+  connect( kp, SIGNAL( receivedStderr(KProcess*, char*, int) ),
>+           SLOT( slotReceivedOutput(KProcess*, char*, int) ) );
>+  connect( kp, SIGNAL( processExited(KProcess*) ),
>+           SLOT( slotTestExited(KProcess*) ) );
>+
>+  if ( !kp->start( KProcess::NotifyOnExit, KProcess::AllOutput ) )
>+  {
>+    KMessageBox::error( 0, i18n( "Could not start a subprocess." ) );
>+    emit sigTest( false );
>+  }
>+}
>+
> #include "sevenzip.moc"
>diff -uNr ark/sevenzip.h ark.new/sevenzip.h
>--- ark/sevenzip.h	2011-06-23 04:58:57.000000000 +0300
>+++ ark.new/sevenzip.h	2012-06-16 22:52:36.000000000 +0300
>@@ -36,12 +36,15 @@
>   
>     virtual void open();
>     virtual void create();
>+    virtual void test();
> 
>     virtual void addFile( const TQStringList & );
>     virtual void addDir( const TQString & );
> 
>     virtual void remove( TQStringList * );
>     virtual void unarchFileInternal( );
>+    virtual bool passwordRequired();
>+    virtual void createPassword();
> 
>   protected slots:
>     virtual bool processLine( const TQCString& line );
>diff -uNr ark/tar.cpp ark.new/tar.cpp
>--- ark/tar.cpp	2011-08-13 09:25:08.000000000 +0300
>+++ ark.new/tar.cpp	2012-06-16 22:52:36.000000000 +0300
>@@ -785,5 +785,42 @@
>   }
> }
> 
>+void TarArch::test()
>+{
>+  clearShellOutput();
>+
>+  KProcess *kp = m_currentProcess = new KProcess;
>+  kp->clearArguments();
>+
>+  QString uncomp = getUnCompressor();
>+
>+  *kp << uncomp;
>+
>+  if( uncomp == "bunzip2" || uncomp == "gunzip" || uncomp == "lzop" )
>+  {
>+    *kp << "-t";
>+  }
>+  else
>+  {
>+    Arch::test();
>+    return;
>+  }
>+
>+  *kp << m_filename;
>+
>+  connect( kp, SIGNAL( receivedStdout(KProcess*, char*, int) ),
>+           SLOT( slotReceivedOutput(KProcess*, char*, int) ) );
>+  connect( kp, SIGNAL( receivedStderr(KProcess*, char*, int) ),
>+           SLOT( slotReceivedOutput(KProcess*, char*, int) ) );
>+  connect( kp, SIGNAL( processExited(KProcess*) ),
>+           SLOT( slotTestExited(KProcess*) ) );
>+
>+  if ( !kp->start( KProcess::NotifyOnExit, KProcess::AllOutput ) )
>+  {
>+    KMessageBox::error( 0, i18n( "Could not start a subprocess." ) );
>+    emit sigTest( false );
>+  }
>+}
>+
> #include "tar.moc"
> // kate: space-indent on;
>diff -uNr ark/tar.h ark.new/tar.h
>--- ark/tar.h	2011-06-23 04:58:57.000000000 +0300
>+++ ark.new/tar.h	2012-06-16 22:52:36.000000000 +0300
>@@ -64,6 +64,7 @@
> 
> 		virtual void open();
> 		virtual void create();
>+		virtual void test();
> 
> 		virtual void addFile( const TQStringList & );
> 		virtual void addDir( const TQString & );
>diff -uNr ark/zip.cpp ark.new/zip.cpp
>--- ark/zip.cpp	2011-08-13 09:25:08.000000000 +0300
>+++ ark.new/zip.cpp	2012-06-16 22:52:36.000000000 +0300
>@@ -34,6 +34,7 @@
> #include <klocale.h>
> #include <kmessagebox.h>
> #include <kprocess.h>
>+#include <kpassdlg.h>
> 
> // ark includes
> #include "zip.h"
>@@ -114,6 +115,12 @@
>                  Arch::Extract | Arch::Delete | Arch::Add | Arch::View );
> }
> 
>+void ZipArch::createPassword()
>+{
>+  if( m_password.isEmpty() && ArkSettings::askCreatePassword() )
>+    KPasswordDialog::getNewPassword( m_password, i18n("Warning!\nUsing KGpg for encryption is more secure.\nCancel this dialog or enter password for %1 archiver:").arg(m_archiver_program) );
>+}
>+
> void ZipArch::addDir( const TQString & _dirName )
> {
>   if ( !_dirName.isEmpty() )
>@@ -240,7 +247,7 @@
> 
> bool ZipArch::passwordRequired()
> {
>-    return m_lastShellOutput.findRev("unable to get password\n")!=-1 || m_lastShellOutput.endsWith("password inflating\n") || m_lastShellOutput.findRev("password incorrect--reenter:")!=-1 || m_lastShellOutput.endsWith("incorrect password\n");
>+    return m_lastShellOutput.findRev("password:") >= 0 || m_lastShellOutput.findRev("unable to get password\n")!=-1 || m_lastShellOutput.endsWith("password inflating\n") || m_lastShellOutput.findRev("password incorrect--reenter:")!=-1 || m_lastShellOutput.endsWith("incorrect password\n");
> }
> 
> void ZipArch::remove( TQStringList *list )
>@@ -248,6 +255,7 @@
>   if ( !list )
>     return;
> 
>+
>   KProcess *kp = m_currentProcess = new KProcess;
>   kp->clearArguments();
> 
>@@ -274,4 +282,32 @@
>   }
> }
> 
>+void ZipArch::test()
>+{
>+  clearShellOutput();
>+
>+  KProcess *kp = m_currentProcess = new KProcess;
>+  kp->clearArguments();
>+
>+  *kp << m_unarchiver_program << "-t";
>+
>+  if ( !m_password.isEmpty() )
>+    *kp << "-P" << m_password;
>+
>+  *kp << m_filename;
>+
>+  connect( kp, SIGNAL( receivedStdout(KProcess*, char*, int) ),
>+           SLOT( slotReceivedOutput(KProcess*, char*, int) ) );
>+  connect( kp, SIGNAL( receivedStderr(KProcess*, char*, int) ),
>+           SLOT( slotReceivedOutput(KProcess*, char*, int) ) );
>+  connect( kp, SIGNAL( processExited(KProcess*) ),
>+           SLOT( slotTestExited(KProcess*) ) );
>+
>+  if ( !kp->start( KProcess::NotifyOnExit, KProcess::AllOutput ) )
>+  {
>+    KMessageBox::error( 0, i18n( "Could not start a subprocess." ) );
>+    emit sigTest( false );
>+  }
>+}
>+
> #include "zip.moc"
>diff -uNr ark/zip.h ark.new/zip.h
>--- ark/zip.h	2011-06-23 04:58:57.000000000 +0300
>+++ ark.new/zip.h	2012-06-16 22:52:36.000000000 +0300
>@@ -45,6 +45,7 @@
> 
>     virtual void open();
>     virtual void create();
>+    virtual void test();
> 
>     virtual void addFile( const TQStringList & );
>     virtual void addDir( const TQString &  );
>@@ -52,6 +53,7 @@
>     virtual void remove( TQStringList * );
>     virtual void unarchFileInternal();
>     virtual bool passwordRequired();
>+    virtual void createPassword();
>   private:
>     void setHeaders();
> };

Actions: View | Diff

Attachments on bug 1030: 663 | 664 | 667 | 668 | 669 | 670 | 671