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] ark-3.5.10.patch

ark-3.5.10.patch (text/plain), 4.79 KB, created by Fabio Rossi on 2015-10-26 16:46:34 CDT

(hide)

Description: ark-3.5.10.patch

Filename:

MIME Type:

Creator: Fabio Rossi

Created: 2015-10-26 16:46:34 CDT

Size: 4.79 KB

patch

obsolete

>diff -u ark.orig/filelistview.cpp ark/filelistview.cpp >--- ark.orig/filelistview.cpp 2007-05-14 09:40:46.000000000 +0200 >+++ ark/filelistview.cpp 2015-10-23 10:59:47.096790199 +0200 >@@ -500,6 +500,61 @@ > return size; > } > >+void FileListView::updateItem( const QStringList & entries ) >+{ >+ QStringList ancestorList = QStringList::split( '/', entries[0] ); >+ >+ // Checks if the listview contains the first item in the list of ancestors >+ QListViewItem *item = firstChild(); >+ while ( item ) >+ { >+ if ( item->text( 0 ) == ancestorList[0] ) >+ break; >+ item = item->nextSibling(); >+ } >+ >+ // If the list view does not contain the item ... >+ if ( !item ) >+ { >+ kdError( 1601 ) << ancestorList[0] << " not found" << endl; >+ return; >+ } >+ >+ // We've already dealt with the first item, remove it >+ ancestorList.pop_front(); >+ >+ while ( ancestorList.count() > 0 ) >+ { >+ QString name = ancestorList[0]; >+ >+ FileLVI *parent = static_cast< FileLVI*>( item ); >+ item = parent->firstChild(); >+ while ( item ) >+ { >+ if ( item->text(0) == name ) >+ break; >+ item = item->nextSibling(); >+ } >+ >+ if ( !item ) >+ { >+ kdError( 1601 ) << name << " not found" << endl; >+ return; >+ } >+ >+ ancestorList.pop_front(); >+ } >+ >+ int i = 0; >+ for (QStringList::ConstIterator it = entries.begin(); it != entries.end(); ++it) >+ { >+ item->setText(i, *it); >+ ++i; >+ } >+ >+ item->setOpen( true ); >+} >+ > FileLVI* FileListView::findParent( const TQString& fullname ) > { > TQString name = fullname; >diff -u ark.orig/filelistview.h ark/filelistview.h >--- ark.orig/filelistview.h 2007-05-14 09:40:46.000000000 +0200 >+++ ark/filelistview.h 2015-10-23 10:59:47.096790199 +0200 >@@ -112,6 +112,12 @@ > void addItem( const QStringList & entries ); > > /** >+ * Update a file or folder already included in the listview >+ * @param entries A stringlist of the entries for each column of the list. >+ */ >+ void updateItem( const QStringList & entries ); >+ >+ /** > * Returns the number of files in the archive. > */ > int totalFiles(); >Common subdirectories: ark.orig/pics and ark/pics >diff -u ark.orig/rar.cpp ark/rar.cpp >--- ark.orig/rar.cpp 2015-10-23 10:59:26.215791198 +0200 >+++ ark/rar.cpp 2015-10-23 10:59:47.096790199 +0200 >@@ -84,9 +84,7 @@ > > > >- m_headerString = "-------------------------------------------------------------------------------"; >- >- m_isFirstLine = true; >+ m_headerString = "----------- --------- -------- -----"; > } > > bool RarArch::processLine( const TQCString &line ) >@@ -96,39 +94,36 @@ > TQTextCodec *codec = TQTextCodec::codecForLocale(); > unicode_line = codec->toUnicode( line ); > >- if ( m_isFirstLine ) >- { >- m_entryFilename = TQString::fromLocal8Bit( line ); >- m_entryFilename.remove( 0, 1 ); >- m_isFirstLine = false; >- return true; >- } >- > TQStringList list; > > TQStringList l2 = TQStringList::split( ' ', line ); > >- if( l2[5].startsWith("d") ) >- { >- m_isFirstLine = true; >- return true; >- } >- >+ // filename is after CRC column >+ int idx = line.find(l2[6]) + l2[6].length() + 2; // beginning of file name >+ m_entryFilename = line.mid(idx); > list << m_entryFilename; // filename >- list << l2[ 0 ]; // size >- list << l2[ 1 ]; // packed >- list << l2[ 2 ]; // ratio >- >- TQStringList date = TQStringList::split( '-', l2[ 3 ] ); >- list << ArkUtils::fixYear( date[ 2 ].latin1() ) + '-' + date[ 1 ] + '-' + date [ 0 ] + ' ' + l2[4]; // date >- list << l2[ 5 ]; // attributes >+ >+ list << l2[ 1 ]; // size >+ list << l2[ 2 ]; // packed >+ list << l2[ 3 ]; // ratio >+ >+ TQStringList date = TQStringList::split( '-', l2[ 4 ] ); >+ list << ArkUtils::fixYear( date[ 2 ].latin1() ) + '-' + date[ 1 ] + '-' + date [ 0 ] + ' ' + l2[5]; // date >+ > list << l2[ 6 ]; // crc >- list << l2[ 7 ]; // method >- list << l2[ 8 ]; // Version > >- m_gui->fileList()->addItem( list ); // send to GUI >+ // send to GUI >+ if ( l2[0] == "00000000" ) /* (un)rar v5 only */ >+ { >+ // folders have CRC equal to 00000000 >+ // RAR utilities show the folders at the end of the listing so the folders >+ // have been already added to the listview at this point without specifying >+ // all the columns but name: let's fill the missing infos >+ m_gui->fileList()->updateItem( list ); >+ } >+ else >+ m_gui->fileList()->addItem( list ); > >- m_isFirstLine = true; > return true; > } > >@@ -138,10 +138,7 @@ > list.append( PACKED_COLUMN ); > list.append( RATIO_COLUMN ); > list.append( TIMESTAMP_COLUMN ); >- list.append( PERMISSION_COLUMN ); > list.append( CRC_COLUMN ); >- list.append( METHOD_COLUMN ); >- list.append( VERSION_COLUMN ); > > emit headers( list ); > } >@@ -270,7 +270,7 @@ > > bool RarArch::passwordRequired() > { >- return m_lastShellOutput.find("Enter password") >= 0; >+ return m_lastShellOutput.find("Enter password") >= 0 || m_lastShellOutput.find("encrypted") >= 0; > } > > void RarArch::remove( QStringList *list ) View Attachment As Diff View Attachment As Raw

• • Home
  • | New
  • | Browse
  • | Search
  • |
    [?]
  • | Reports
  • | Help
  • | New Account
  • | Log In
    [x]
  • | Forgot Password
    Login: [x]