Menu
▾
▴
krusader-commits
You can subscribe to this list here.
| 2003 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
(98) |
Sep
(138) |
Oct
(100) |
Nov
(49) |
Dec
(131) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2004 |
Jan
(94) |
Feb
(65) |
Mar
(100) |
Apr
(83) |
May
(72) |
Jun
(29) |
Jul
(167) |
Aug
(127) |
Sep
(131) |
Oct
(269) |
Nov
(122) |
Dec
(100) |
| 2005 |
Jan
(228) |
Feb
(266) |
Mar
(63) |
Apr
(135) |
May
(157) |
Jun
(52) |
Jul
(25) |
Aug
(49) |
Sep
(184) |
Oct
(159) |
Nov
(75) |
Dec
(37) |
| 2006 |
Jan
(60) |
Feb
(129) |
Mar
(110) |
Apr
(34) |
May
(31) |
Jun
(42) |
Jul
(72) |
Aug
(90) |
Sep
(57) |
Oct
(66) |
Nov
(42) |
Dec
(90) |
| 2007 |
Jan
(106) |
Feb
(54) |
Mar
(93) |
Apr
(27) |
May
(21) |
Jun
(17) |
Jul
(19) |
Aug
(22) |
Sep
(25) |
Oct
(2) |
Nov
(1) |
Dec
(1) |
| 2008 |
Jan
(65) |
Feb
(70) |
Mar
(29) |
Apr
(45) |
May
(91) |
Jun
(20) |
Jul
(11) |
Aug
(24) |
Sep
(23) |
Oct
(13) |
Nov
(23) |
Dec
(39) |
| 2009 |
Jan
(23) |
Feb
(39) |
Mar
(15) |
Apr
(56) |
May
(5) |
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: Shie E. <er...@us...> - 2004-09-17 12:59:32
|
Update of /cvsroot/krusader/krusader_kde3/krusader/Synchronizer In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21041/krusader/Synchronizer Modified Files: synchronizer.cpp Log Message: missing #include Index: synchronizer.cpp =================================================================== RCS file: /cvsroot/krusader/krusader_kde3/krusader/Synchronizer/synchronizer.cpp,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -d -r1.17 -r1.18 *** synchronizer.cpp 17 Aug 2004 12:31:16 -0000 1.17 --- synchronizer.cpp 17 Sep 2004 12:59:22 -0000 1.18 *************** *** 49,52 **** --- 49,53 ---- #include <qeventloop.h> #include <qprogressdialog.h> + #include <kprocess.h> #define DISPLAY_UPDATE_PERIOD 2 |
|
From: Shie E. <er...@us...> - 2004-09-17 12:21:29
|
Update of /cvsroot/krusader/krusader_kde3/krusader/MountMan In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12508/krusader/MountMan Modified Files: kmountman.cpp Log Message: more old code removed Index: kmountman.cpp =================================================================== RCS file: /cvsroot/krusader/krusader_kde3/krusader/MountMan/kmountman.cpp,v retrieving revision 1.31 retrieving revision 1.32 diff -C2 -d -r1.31 -r1.32 *** kmountman.cpp 17 Sep 2004 12:06:02 -0000 1.31 --- kmountman.cpp 17 Sep 2004 12:21:13 -0000 1.32 *************** *** 756,764 **** bool KMountMan::ejectable( QString path ) { #if !defined(BSD) && !defined(_OS_SOLARIS_) ! fsData * it; ! for ( it = filesystems.first() ; ( it != 0 ) ; it = filesystems.next() ) ! if ( it->mntPoint() == path && ! ( it->type() == "iso9660" || followLink( it->name() ).left( 2 ) == "cd" ) ) ! return KrServices::cmdExist( "eject" ); #endif --- 756,767 ---- bool KMountMan::ejectable( QString path ) { #if !defined(BSD) && !defined(_OS_SOLARIS_) ! KMountPoint::List possible = KMountPoint::possibleMountPoints(); ! KMountPoint *m; ! for ( KMountPoint::List::iterator it = possible.begin(); it != possible.end(); ++it ) { ! m = *it; ! if (m->mountPoint() == path && ! (m->mountType()=="iso9660" || m->mountedFrom().left(7)=="/dev/cd")) ! return KrServices::cmdExist( "eject" ); ! } #endif |
|
From: Shie E. <er...@us...> - 2004-09-17 12:06:16
|
Update of /cvsroot/krusader/krusader_kde3/krusader/MountMan In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9423/krusader/MountMan Modified Files: kmountman.cpp Log Message: start to remove the old codebase of mountman, and use kdelib's code (btw: taken from us ;-) Index: kmountman.cpp =================================================================== RCS file: /cvsroot/krusader/krusader_kde3/krusader/MountMan/kmountman.cpp,v retrieving revision 1.30 retrieving revision 1.31 diff -C2 -d -r1.30 -r1.31 *** kmountman.cpp 17 Aug 2004 17:03:39 -0000 1.30 --- kmountman.cpp 17 Sep 2004 12:06:02 -0000 1.31 *************** *** 449,460 **** KMountMan::mntStatus KMountMan::getStatus( QString mntPoint ) { ! // parse the mount table and search for mntPoint ! bool mounted = ( devFromMtab( mntPoint ) != QString::null ); ! if ( mounted ) ! return KMountMan::MOUNTED; ! if ( mountPoints.findIndex( mntPoint ) == -1 ) // no such mountPoint is /etc/fstab ! return KMountMan::DOESNT_EXIST; ! else ! return KMountMan::NOT_MOUNTED; } --- 449,474 ---- KMountMan::mntStatus KMountMan::getStatus( QString mntPoint ) { ! KMountPoint::List::iterator it; ! KMountPoint *m; ! ! // 1: is it already mounted ! KMountPoint::List current = KMountPoint::currentMountPoints(); ! for ( it = current.begin(); it != current.end(); ++it ) { ! m = *it; ! if (m->mountPoint() == mntPoint) ! return KMountMan::MOUNTED; ! } ! ! // 2: is it a mount point but not mounted? ! KMountPoint::List possible = KMountPoint::possibleMountPoints(); ! for ( it = possible.begin(); it != possible.end(); ++it ) { ! m = *it; ! if (m->mountPoint() == mntPoint) { ! return KMountMan::NOT_MOUNTED; ! } ! } ! ! // 3: unknown ! return KMountMan::DOESNT_EXIST; } |
|
From: Karai C. <ck...@us...> - 2004-09-16 19:15:34
|
Update of /cvsroot/krusader/krusader_kde3/krusader/VFS In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11029/krusader_kde3/krusader/VFS Modified Files: vfs.cpp vfs.h Log Message: FIXED: incremental refresh doesn't update the disk free space Index: vfs.h =================================================================== RCS file: /cvsroot/krusader/krusader_kde3/krusader/VFS/vfs.h,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** vfs.h 28 Aug 2004 20:28:17 -0000 1.16 --- vfs.h 16 Sep 2004 19:15:25 -0000 1.17 *************** *** 109,112 **** --- 109,113 ---- signals: void startUpdate(); //< emitted when the VFS starts to refresh its list of vfiles. + void incrementalRefreshFinished( QString ); //< emitted when the incremental refresh was finished void addedVfile(vfile* vf); void deletedVfile(const QString& name); Index: vfs.cpp =================================================================== RCS file: /cvsroot/krusader/krusader_kde3/krusader/VFS/vfs.cpp,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** vfs.cpp 30 Aug 2004 15:35:14 -0000 1.14 --- vfs.cpp 16 Sep 2004 19:15:25 -0000 1.15 *************** *** 42,45 **** --- 42,46 ---- if ( panel ){ connect(this,SIGNAL(startUpdate()),panel,SLOT(slotStartUpdate())); + connect(this,SIGNAL(incrementalRefreshFinished( QString )),panel,SLOT(slotGetStats( QString ))); } else quietMode = true; *************** *** 162,165 **** --- 163,167 ---- vfs_filesP = vfs_searchP; delete temp; + emit incrementalRefreshFinished( vfs_origin.isLocalFile() ? vfs_origin.path() : vfs_origin.prettyURL() ); return res; |
|
From: Karai C. <ck...@us...> - 2004-09-16 17:18:44
|
Update of /cvsroot/krusader/krusader_kde3/krusader/VFS In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16923/krusader_kde3/krusader/VFS Modified Files: vfile.cpp Log Message: FIXED: invalid group name in File/Properties Index: vfile.cpp =================================================================== RCS file: /cvsroot/krusader/krusader_kde3/krusader/VFS/vfile.cpp,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** vfile.cpp 28 Aug 2004 20:28:16 -0000 1.13 --- vfile.cpp 16 Sep 2004 17:18:35 -0000 1.14 *************** *** 150,154 **** atom.m_uds = KIO::UDS_GROUP; ! atom.m_str = vfile_getOwner(); entry.append(atom); --- 150,154 ---- atom.m_uds = KIO::UDS_GROUP; ! atom.m_str = vfile_getGroup(); entry.append(atom); |
|
From: Karai C. <ck...@us...> - 2004-09-16 17:18:44
|
Update of /cvsroot/krusader/krusader_kde3 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16923/krusader_kde3 Modified Files: ChangeLog Log Message: FIXED: invalid group name in File/Properties Index: ChangeLog =================================================================== RCS file: /cvsroot/krusader/krusader_kde3/ChangeLog,v retrieving revision 1.301 retrieving revision 1.302 diff -C2 -d -r1.301 -r1.302 *** ChangeLog 14 Sep 2004 22:14:30 -0000 1.301 --- ChangeLog 16 Sep 2004 17:18:35 -0000 1.302 *************** *** 1,5 **** ====================== ADDED: dropping on the tree panel (copy,move,link) ! ADDED: packing / unpacking to/from remote URL-s ADDED: short tab names ADDED: compare directories (mark menu) --- 1,5 ---- ====================== ADDED: dropping on the tree panel (copy,move,link) ! ADDED: packing / unpacking to/from remote URL-s ADDED: short tab names ADDED: compare directories (mark menu) *************** *** 36,39 **** --- 36,40 ---- REACTIVATED: usermenu (now using the new useraction-system) + FIXED: the File/Properties function writes incorrect group name FIXED: krarc doesn't keep the date/time information at extracting to local fs FIXED: jar files aren't handled + problems with dirs in windows zips |
Update of /cvsroot/krusader/krusader_kde3/krusader/Dialogs In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29265 Modified Files: Makefile.am krspwidgets.h Removed Files: colormaskdialog.cpp colormaskdialog.h colormaskdialogbase.cpp colormaskdialogbase.h Log Message: removed the old compare mode code --- colormaskdialog.cpp DELETED --- Index: krspwidgets.h =================================================================== RCS file: /cvsroot/krusader/krusader_kde3/krusader/Dialogs/krspwidgets.h,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** krspwidgets.h 15 Sep 2004 12:14:29 -0000 1.2 --- krspwidgets.h 15 Sep 2004 12:55:11 -0000 1.3 *************** *** 32,36 **** #include "krmaskchoice.h" #include "newftpgui.h" - #include "colormaskdialog.h" #ifndef KRSPWIDGETS_H --- 32,35 ---- --- colormaskdialogbase.cpp DELETED --- --- colormaskdialogbase.h DELETED --- --- colormaskdialog.h DELETED --- Index: Makefile.am =================================================================== RCS file: /cvsroot/krusader/krusader_kde3/krusader/Dialogs/Makefile.am,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** Makefile.am 12 Jun 2003 22:41:36 -0000 1.2 --- Makefile.am 15 Sep 2004 12:55:11 -0000 1.3 *************** *** 6,13 **** libDialogs_a_METASOURCES = AUTO ! libDialogs_a_SOURCES = krsqueezedtextlabel.cpp krprogress.cpp packgui.cpp packguibase.cpp newftpgui.cpp krspwidgets.cpp krspecialwidgets.cpp krpleasewait.cpp krmaskchoice.cpp krdialogs.cpp colormaskdialog.cpp colormaskdialogbase.cpp ! EXTRA_DIST = colormaskdialogbase.cpp colormaskdialogbase.h colormaskdialog.cpp colormaskdialog.h krdialogs.cpp krdialogs.h krmaskchoice.cpp krmaskchoice.h krpleasewait.cpp krpleasewait.h krspecialwidgets.cpp krspecialwidgets.h krspwidgets.cpp krspwidgets.h newftpgui.cpp newftpgui.h packguibase.cpp packguibase.h packgui.cpp packgui.h krprogress.cpp krprogress.h krsqueezedtextlabel.cpp krsqueezedtextlabel.h ####### kdevelop will overwrite this part!!! (end)############ --- 6,13 ---- libDialogs_a_METASOURCES = AUTO ! libDialogs_a_SOURCES = krsqueezedtextlabel.cpp krprogress.cpp packgui.cpp packguibase.cpp newftpgui.cpp krspwidgets.cpp krspecialwidgets.cpp krpleasewait.cpp krmaskchoice.cpp krdialogs.cpp ! EXTRA_DIST = krdialogs.cpp krdialogs.h krmaskchoice.cpp krmaskchoice.h krpleasewait.cpp krpleasewait.h krspecialwidgets.cpp krspecialwidgets.h krspwidgets.cpp krspwidgets.h newftpgui.cpp newftpgui.h packguibase.cpp packguibase.h packgui.cpp packgui.h krprogress.cpp krprogress.h krsqueezedtextlabel.cpp krsqueezedtextlabel.h ####### kdevelop will overwrite this part!!! (end)############ |
|
From: Shie E. <er...@us...> - 2004-09-15 12:14:41
|
Update of /cvsroot/krusader/krusader_kde3/krusader/Dialogs In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19419 Modified Files: krspwidgets.cpp krspwidgets.h Log Message: removed the old compare mode code Index: krspwidgets.h =================================================================== RCS file: /cvsroot/krusader/krusader_kde3/krusader/Dialogs/krspwidgets.h,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** krspwidgets.h 15 Apr 2002 18:48:16 -0000 1.1.1.1 --- krspwidgets.h 15 Sep 2004 12:14:29 -0000 1.2 *************** *** 49,53 **** static QString getMask(QString caption); // get file-mask for (un)selecting files static QString newFTP(); - static void selectCompareColorMask(int *, int *); private: --- 49,52 ---- Index: krspwidgets.cpp =================================================================== RCS file: /cvsroot/krusader/krusader_kde3/krusader/Dialogs/krspwidgets.cpp,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** krspwidgets.cpp 8 Jun 2004 21:17:30 -0000 1.8 --- krspwidgets.cpp 15 Sep 2004 12:14:29 -0000 1.9 *************** *** 61,97 **** } - void KRSpWidgets::selectCompareColorMask(int *left, int *right) { - // int l = krApp->mainView->left->colorMask; - // int r = krApp->mainView->right->colorMask; - - // create the dialog, and fill in the data according to current color mask - colorMaskDialog *dlg = new colorMaskDialog(); - /* dlg->newerLeft->setChecked(l & KRListItem::newer); - dlg->olderLeft->setChecked(l & KRListItem::older); - dlg->identicalLeft->setChecked(l & KRListItem::identical); - dlg->exclusiveLeft->setChecked(l & KRListItem::exclusive); - dlg->newerRight->setChecked(r & KRListItem::newer); - dlg->olderRight->setChecked(r & KRListItem::older); - dlg->identicalRight->setChecked(r & KRListItem::identical); - dlg->exclusiveRight->setChecked(r & KRListItem::exclusive);*/ - - if (!dlg->exec()) { - *left = *right = -1; - return; - } - - // create masks - (*left) = 0; (*right) = 0; - /* (*left) |= (dlg->newerLeft->isChecked() ? KRListItem::newer : 0); - (*left) |= (dlg->olderLeft->isChecked() ? KRListItem::older : 0); - (*left) |= (dlg->identicalLeft->isChecked() ? KRListItem::identical : 0); - (*left) |= (dlg->exclusiveLeft->isChecked() ? KRListItem::exclusive : 0); - - (*right) |= (dlg->newerRight->isChecked() ? KRListItem::newer : 0); - (*right) |= (dlg->olderRight->isChecked() ? KRListItem::older : 0); - (*right) |= (dlg->identicalRight->isChecked() ? KRListItem::identical : 0); - (*right) |= (dlg->exclusiveRight->isChecked() ? KRListItem::exclusive : 0);*/ - } - /////////////////////////// newFTP //////////////////////////////////////// QString KRSpWidgets::newFTP() { --- 61,64 ---- *************** *** 175,188 **** selection->lineEdit()->selectAll(); selection->setFocus(); - // use compare-mode if available - if (krApp->krCompareDirs->isChecked()) { - // an ugly hack - use the (compare mode) string as a way to distinguish - // normal entries --> this should be fixed so that the dialog will know - preSelections->insertItem(i18n("Newer files (compare mode)")); - preSelections->insertItem(i18n("Older files (compare mode)")); - preSelections->insertItem(i18n("Identical files (compare mode)")); - preSelections->insertItem(i18n("Exclusive files (compare mode)")); - preSelections->update(); - } } --- 142,145 ---- |
|
From: Shie E. <er...@us...> - 2004-09-15 12:11:28
|
Update of /cvsroot/krusader/krusader_kde3/krusader In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18898 Modified Files: krusader.cpp krusader.h krslots.cpp krslots.h Log Message: removed the old compare mode code Index: krusader.cpp =================================================================== RCS file: /cvsroot/krusader/krusader_kde3/krusader/krusader.cpp,v retrieving revision 1.86 retrieving revision 1.87 diff -C2 -d -r1.86 -r1.87 *** krusader.cpp 31 Aug 2004 23:46:38 -0000 1.86 --- krusader.cpp 15 Sep 2004 12:11:16 -0000 1.87 *************** *** 411,417 **** // the toggle actions - actCompareDirs = new KToggleAction( i18n( "Com&pare Mode" ), "view_left_right", - CTRL + Key_Equal, SLOTS, SLOT( compareDirectories() ), actionCollection(), "compare mode" ); - actCompareDirs->setChecked( false ); actToggleFnkeys = new KToggleAction( i18n( "Show &FN Keys Bar" ), 0, SLOTS, SLOT( toggleFnkeys() ), actionCollection(), "toggle fn bar" ); --- 411,414 ---- *************** *** 438,443 **** new KAction( i18n( "Start &Root Mode Krusader" ), "krusader_red", ALT + Key_K, SLOTS, SLOT( rootKrusader() ), actionCollection(), "root krusader" ); - actSelectColorMask = new KAction( i18n( "Co&nfigure compare-mode" ), 0, - SLOTS, SLOT( selectCompareMask() ), actionCollection(), "select colormask" ); actTest = new KAction( i18n( "T&est Archive(s)" ), "ark", ALT + Key_E, SLOTS, SLOT( testArchive() ), actionCollection(), "test archives" ); --- 435,438 ---- Index: krusader.h =================================================================== RCS file: /cvsroot/krusader/krusader_kde3/krusader/krusader.h,v retrieving revision 1.26 retrieving revision 1.27 diff -C2 -d -r1.26 -r1.27 *** krusader.h 14 Sep 2004 22:13:37 -0000 1.26 --- krusader.h 15 Sep 2004 12:11:16 -0000 1.27 *************** *** 155,159 **** #define krTest Krusader::App->actTest // test archive #define krCompare Krusader::App->actCompare // compare 2 files by content - #define krCompareDirs Krusader::App->actCompareDirs // compare 2 directories #define krCalculate Krusader::App->actCalculate // calculate occupied space #define krSelect Krusader::App->actSelect // select a group by filter --- 155,158 ---- *************** *** 178,182 **** #define krFind Krusader::App->actFind // find files #define krMultiRename Krusader::App->actMultiRename - #define krSelectColorMask Krusader::App->actSelectColorMask// select compare-mask #define krToggleTerminal Krusader::App->actToggleTerminal #define krToggleSortByExt Krusader::App->actToggleSortByExt// Sort by extention --- 177,180 ---- Index: krslots.cpp =================================================================== RCS file: /cvsroot/krusader/krusader_kde3/krusader/krslots.cpp,v retrieving revision 1.61 retrieving revision 1.62 diff -C2 -d -r1.61 -r1.62 *** krslots.cpp 14 Sep 2004 22:10:45 -0000 1.61 --- krslots.cpp 15 Sep 2004 12:11:16 -0000 1.62 *************** *** 84,118 **** krApp->mainView->rightMng) - - void KRslots::selectCompareMask() { - int left=0,right=0; - KRSpWidgets::selectCompareColorMask(&left, &right); - if (left>0 && right>0) { // safeguard - MAIN_VIEW->left->colorMask = left; - MAIN_VIEW->right->colorMask = right; - if (krCompareDirs->isChecked() ) { - ((ListPanel*)MAIN_VIEW->left)->view->clear(); - ((ListPanel*)MAIN_VIEW->left)->slotUpdate(); - ((ListPanel*)MAIN_VIEW->right)->view->clear(); - ((ListPanel*)MAIN_VIEW->right)->slotUpdate(); - } - } - } - - void KRslots::compareDirectories() { - KMessageBox::sorry(0, i18n("Compare mode is temporarily disabled. sorry")); - - if (!krCompareDirs->isChecked()) { - ACTIVE_PANEL->compareMode = false; - ACTIVE_PANEL->otherPanel->compareMode = false; - REFRESH_BOTH_PANELS; - return; - } // else is implied - - ACTIVE_PANEL->compareMode = true; - ACTIVE_PANEL->otherPanel->compareMode = true; - REFRESH_BOTH_PANELS; - } - void KRslots::sendFileByEmail(QString filename) { QString mailProg; --- 84,87 ---- Index: krslots.h =================================================================== RCS file: /cvsroot/krusader/krusader_kde3/krusader/krslots.h,v retrieving revision 1.28 retrieving revision 1.29 diff -C2 -d -r1.28 -r1.29 *** krslots.h 31 Aug 2004 20:51:29 -0000 1.28 --- krslots.h 15 Sep 2004 12:11:16 -0000 1.29 *************** *** 56,61 **** public slots: - void selectCompareMask(); - void compareDirectories(); void sendFileByEmail( QString filename ); void compareContent(); --- 56,59 ---- |
|
From: Shie E. <er...@us...> - 2004-09-15 12:10:32
|
Update of /cvsroot/krusader/krusader_kde3/krusader/Panel In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18134 Modified Files: krdetailedview.cpp krview.cpp Log Message: removed the old compare mode code Index: krdetailedview.cpp =================================================================== RCS file: /cvsroot/krusader/krusader_kde3/krusader/Panel/krdetailedview.cpp,v retrieving revision 1.92 retrieving revision 1.93 diff -C2 -d -r1.92 -r1.93 *** krdetailedview.cpp 9 Sep 2004 16:52:52 -0000 1.92 --- krdetailedview.cpp 15 Sep 2004 12:10:23 -0000 1.93 *************** *** 348,366 **** name = vf->vfile_getName(); bool isDir = vf->vfile_isDir(); - /*KRListItem::cmpColor color = KRListItem::none; - if( otherPanel->type == "list" && compareMode ){ - vfile* ovf = otherPanel->files->vfs_search(vf->vfile_getName()); - if (ovf == 0 ) color = KRListItem::exclusive; // this file doesn't exist on the other panel - else{ // if we found such a file - QString date1 = KRpermHandler::date2qstring(vf->vfile_getDateTime()); - QString date2 = KRpermHandler::date2qstring(ovf->vfile_getDateTime()); - if (date1 > date2) color = KRListItem::newer; // this file is newer than the other - else - if (date1 < date2) color = KRListItem::older; // this file is older than the other - else - if (date1 == date2) color = KRListItem::identical; // the files are the same - } - }*/ - if ( !isDir || ( isDir && ( _filter & ApplyToDirs ) ) ) { switch ( _filter ) { --- 348,351 ---- *************** *** 383,387 **** break; // no-op, stop compiler complaints } - /*if ( compareMode && !(color & colorMask) ) continue;*/ } --- 368,371 ---- Index: krview.cpp =================================================================== RCS file: /cvsroot/krusader/krusader_kde3/krusader/Panel/krview.cpp,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** krview.cpp 23 May 2004 20:08:35 -0000 1.7 --- krview.cpp 15 Sep 2004 12:10:23 -0000 1.8 *************** *** 66,87 **** } - // color-coding for compare mode - /* if (color != KRListItem::none) { - QPixmap block; - switch (color) { - case KRListItem::exclusive : block = QPixmap(blue_xpm); - break; - case KRListItem::newer : block = QPixmap(green_xpm); - break; - case KRListItem::older : block = QPixmap(red_xpm); - break; - case KRListItem::identical : block = QPixmap(yellow_xpm); - break; - } - - bitBlt (&icon,icon.width()-11,0,&block,0,21,10,11,CopyROP,false); - icon.setMask( icon.createHeuristicMask(false) ); - }*/ - return icon; } --- 66,69 ---- |
|
From: Shie E. <er...@us...> - 2004-09-15 11:22:30
|
Update of /cvsroot/krusader/krusader_kde3/krusader/Panel In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8562 Modified Files: panelpopup.cpp Log Message: minor fix in the tree panel Index: panelpopup.cpp =================================================================== RCS file: /cvsroot/krusader/krusader_kde3/krusader/Panel/panelpopup.cpp,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** panelpopup.cpp 14 Sep 2004 22:09:43 -0000 1.10 --- panelpopup.cpp 15 Sep 2004 11:22:21 -0000 1.11 *************** *** 80,93 **** stack->addWidget( tree, Tree ); tree->addColumn( "" ); ! tree->addBranch( "/", i18n( "Root Folder" ) ); ! tree->setDirOnlyMode( tree->branch( i18n( "Root Folder" ) ), true ); tree->setShowFolderOpenPixmap(true); ! tree->branch( i18n( "Root Folder" ) ) ->setChildRecurse(false); ! tree->branch( i18n( "Root Folder" ) ) ->setOpen( true ); tree->header() ->setHidden( true ); connect(tree, SIGNAL(executed(QListViewItem*)), this, SLOT(treeSelection(QListViewItem*))); // start listing the tree ! tree->branch( i18n( "Root Folder" ) ) ->root(); // create the quickview part ------ --- 80,93 ---- stack->addWidget( tree, Tree ); tree->addColumn( "" ); ! tree->addBranch( "/", i18n( "/" ) ); ! tree->setDirOnlyMode( tree->branch( i18n( "/" ) ), true ); tree->setShowFolderOpenPixmap(true); ! tree->branch( i18n( "/" ) ) ->setChildRecurse(false); ! tree->branch( i18n( "/" ) ) ->setOpen( true ); tree->header() ->setHidden( true ); connect(tree, SIGNAL(executed(QListViewItem*)), this, SLOT(treeSelection(QListViewItem*))); // start listing the tree ! tree->branch( i18n( "/" ) ) ->root(); // create the quickview part ------ |
|
From: Karai C. <ck...@us...> - 2004-09-15 05:26:43
|
Update of /cvsroot/krusader/krusader_kde3/krusader/Panel In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16940/krusader_kde3/krusader/Panel Modified Files: panelfunc.cpp Log Message: Missing delete Index: panelfunc.cpp =================================================================== RCS file: /cvsroot/krusader/krusader_kde3/krusader/Panel/panelfunc.cpp,v retrieving revision 1.86 retrieving revision 1.87 diff -C2 -d -r1.86 -r1.87 *** panelfunc.cpp 15 Sep 2004 05:01:27 -0000 1.86 --- panelfunc.cpp 15 Sep 2004 05:26:34 -0000 1.87 *************** *** 675,678 **** --- 675,679 ---- KURL::List *urlList = files() ->vfs_getFiles( &fileNames ); KIO::NetAccess::dircopy( *urlList, vfs::fromPathOrURL( arcDir ), 0 ); + delete urlList; } |
|
From: Karai C. <ck...@us...> - 2004-09-15 05:01:38
|
Update of /cvsroot/krusader/krusader_kde3/krusader/Panel In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13874/krusader_kde3/krusader/Panel Modified Files: panelfunc.cpp Log Message: Packing from remote fs Index: panelfunc.cpp =================================================================== RCS file: /cvsroot/krusader/krusader_kde3/krusader/Panel/panelfunc.cpp,v retrieving revision 1.85 retrieving revision 1.86 diff -C2 -d -r1.85 -r1.86 *** panelfunc.cpp 14 Sep 2004 21:21:49 -0000 1.85 --- panelfunc.cpp 15 Sep 2004 05:01:27 -0000 1.86 *************** *** 662,672 **** } // pack the files // we must chdir() first because we supply *names* not URL's QString save = getcwd( 0, 0 ); ! chdir( files() ->vfs_workingDir().local8Bit() ); KRarcHandler::pack( fileNames, PackGUI::type, arcFile, totalFiles + totalDirs ); chdir( save.local8Bit() ); // copy from the temp file to it's right place if( tempDestFile ) --- 662,691 ---- } + // download remote URL-s if necessary + QString arcDir; + KTempDir *tempDir = 0; + + if( files() ->vfs_getOrigin().isLocalFile() ) + arcDir = files() ->vfs_workingDir(); + else + { + tempDir = new KTempDir(); + tempDir->setAutoDelete( true ); + arcDir = tempDir->name(); + KURL::List *urlList = files() ->vfs_getFiles( &fileNames ); + KIO::NetAccess::dircopy( *urlList, vfs::fromPathOrURL( arcDir ), 0 ); + } + // pack the files // we must chdir() first because we supply *names* not URL's QString save = getcwd( 0, 0 ); ! chdir( arcDir.local8Bit() ); KRarcHandler::pack( fileNames, PackGUI::type, arcFile, totalFiles + totalDirs ); chdir( save.local8Bit() ); + // delete the temporary directory if created + if( tempDir ) + delete tempDir; + // copy from the temp file to it's right place if( tempDestFile ) |
|
From: Shie E. <er...@us...> - 2004-09-14 22:15:30
|
Update of /cvsroot/krusader/krusader_kde3 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8981 Modified Files: CVSNEWS Log Message: Index: CVSNEWS =================================================================== RCS file: /cvsroot/krusader/krusader_kde3/CVSNEWS,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** CVSNEWS 28 Aug 2004 21:51:07 -0000 1.12 --- CVSNEWS 14 Sep 2004 22:15:20 -0000 1.13 *************** *** 3,6 **** --- 3,8 ---- in some way an extension to the changelog. ------------------------------------------------------ + you can now drag'n'drop to the new tree view + shift+left/right changes tabs (thanks to Dmitry Suzdalev) |
|
From: Shie E. <er...@us...> - 2004-09-14 22:14:42
|
Update of /cvsroot/krusader/krusader_kde3 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8769 Modified Files: ChangeLog Log Message: Index: ChangeLog =================================================================== RCS file: /cvsroot/krusader/krusader_kde3/ChangeLog,v retrieving revision 1.300 retrieving revision 1.301 diff -C2 -d -r1.300 -r1.301 *** ChangeLog 14 Sep 2004 21:21:48 -0000 1.300 --- ChangeLog 14 Sep 2004 22:14:30 -0000 1.301 *************** *** 1,4 **** ====================== ! ADDED: packing / unpacking to/from remote URL-s ADDED: short tab names ADDED: compare directories (mark menu) --- 1,5 ---- ====================== ! ADDED: dropping on the tree panel (copy,move,link) ! ADDED: packing / unpacking to/from remote URL-s ADDED: short tab names ADDED: compare directories (mark menu) |
|
From: Shie E. <er...@us...> - 2004-09-14 22:13:46
|
Update of /cvsroot/krusader/krusader_kde3/krusader In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8588/krusader Modified Files: krusader.h Log Message: moved ACTIVE_PANEL and ACTIVE_FUNC from slots Index: krusader.h =================================================================== RCS file: /cvsroot/krusader/krusader_kde3/krusader/krusader.h,v retrieving revision 1.25 retrieving revision 1.26 diff -C2 -d -r1.25 -r1.26 *** krusader.h 31 Aug 2004 21:34:32 -0000 1.25 --- krusader.h 14 Sep 2004 22:13:37 -0000 1.26 *************** *** 145,148 **** --- 145,152 ---- #define SLOTS Krusader::App->slot #define krLoader Krusader::App->iconLoader + #define ACTIVE_PANEL (krApp->mainView->activePanel) + #define ACTIVE_FUNC (krApp->mainView->activePanel->func) + #define MAIN_VIEW (krApp->mainView) + // krusader's actions - things krusader can do! #define krProperties Krusader::App->actProperties // file properties |
|
From: Shie E. <er...@us...> - 2004-09-14 22:11:10
|
Update of /cvsroot/krusader/krusader_kde3/krusader In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8049/krusader Modified Files: krslots.cpp Log Message: moved ACTIVE_PANEL and ACTIVE_FUNC to krusader.h Index: krslots.cpp =================================================================== RCS file: /cvsroot/krusader/krusader_kde3/krusader/krslots.cpp,v retrieving revision 1.60 retrieving revision 1.61 diff -C2 -d -r1.60 -r1.61 *** krslots.cpp 31 Aug 2004 20:51:29 -0000 1.60 --- krslots.cpp 14 Sep 2004 22:10:45 -0000 1.61 *************** *** 77,83 **** #include "krservices.h" - #define ACTIVE_PANEL (krApp->mainView->activePanel) - #define ACTIVE_FUNC (krApp->mainView->activePanel->func) - #define MAIN_VIEW (krApp->mainView) #define REFRESH_BOTH_PANELS { ListPanel *p=ACTIVE_PANEL; \ MAIN_VIEW->left->func->refresh(); \ --- 77,80 ---- |
|
From: Shie E. <er...@us...> - 2004-09-14 22:10:21
|
Update of /cvsroot/krusader/krusader_kde3/krusader/Panel In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7858/krusader/Panel Modified Files: panelpopup.h Log Message: add: enable drop on the tree panel (copy/move/link) Index: panelpopup.h =================================================================== RCS file: /cvsroot/krusader/krusader_kde3/krusader/Panel/panelpopup.h,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** panelpopup.h 28 Aug 2004 23:04:02 -0000 1.6 --- panelpopup.h 14 Sep 2004 22:10:05 -0000 1.7 *************** *** 39,43 **** void tabSelected(int id); void treeSelection(QListViewItem*); ! void slotDroppedOnTree(KURL::List &lst, KURL &url); void quickSelect(); --- 39,43 ---- void tabSelected(int id); void treeSelection(QListViewItem*); ! void slotDroppedOnTree(QWidget *widget, QDropEvent *e, KURL::List &lst, KURL &); void quickSelect(); *************** *** 54,58 **** QButtonGroup *btns; KLineEdit *quickFilter; ! KComboBox *quickSelectCombo; }; --- 54,58 ---- QButtonGroup *btns; KLineEdit *quickFilter; ! KComboBox *quickSelectCombo; }; |
|
From: Shie E. <er...@us...> - 2004-09-14 22:09:52
|
Update of /cvsroot/krusader/krusader_kde3/krusader/Panel In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7705/krusader/Panel Modified Files: panelpopup.cpp Log Message: add: enable drop on the tree panel (copy/move/link) Index: panelpopup.cpp =================================================================== RCS file: /cvsroot/krusader/krusader_kde3/krusader/Panel/panelpopup.cpp,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** panelpopup.cpp 28 Aug 2004 23:03:36 -0000 1.9 --- panelpopup.cpp 14 Sep 2004 22:09:43 -0000 1.10 *************** *** 5,12 **** --- 5,14 ---- #include "../defaults.h" #include "../krslots.h" + #include "panelfunc.h" #include <qbuttongroup.h> #include <qtoolbutton.h> #include <kfiletreeview.h> #include <klocale.h> + #include <qcursor.h> #include <qlayout.h> #include <qlabel.h> *************** *** 74,78 **** tree = new KFileTreeView( stack ); tree->setAcceptDrops(true); ! connect(tree, SIGNAL(dropped (KURL::List &, KURL &)), this, SLOT(slotDroppedOnTree(KURL::List&, KURL& ))); stack->addWidget( tree, Tree ); tree->addColumn( "" ); --- 76,81 ---- tree = new KFileTreeView( stack ); tree->setAcceptDrops(true); ! connect(tree, SIGNAL(dropped (QWidget *, QDropEvent *, KURL::List &, KURL &)), ! this, SLOT(slotDroppedOnTree(QWidget *, QDropEvent *, KURL::List&, KURL& ))); stack->addWidget( tree, Tree ); tree->addColumn( "" ); *************** *** 98,110 **** // --- quick select QLabel *selectLabel = new QLabel(i18n("Quick Select"), quickPanel); ! quickSelectCombo = new KComboBox( quickPanel ); ! quickSelectCombo->setEditable( true ); ! krConfig->setGroup( "Private" ); ! QStrList lst; ! int i = krConfig->readListEntry( "Predefined Selections", lst ); ! if ( i > 0 ) ! quickSelectCombo->insertStrList( lst ); ! quickSelectCombo->setCurrentText( "*" ); ! quickSelectCombo->setSizePolicy( QSizePolicy( QSizePolicy::Expanding, QSizePolicy::Preferred ) ); connect(quickSelectCombo, SIGNAL(returnPressed(const QString& )), --- 101,113 ---- // --- quick select QLabel *selectLabel = new QLabel(i18n("Quick Select"), quickPanel); ! quickSelectCombo = new KComboBox( quickPanel ); ! quickSelectCombo->setEditable( true ); ! krConfig->setGroup( "Private" ); ! QStrList lst; ! int i = krConfig->readListEntry( "Predefined Selections", lst ); ! if ( i > 0 ) ! quickSelectCombo->insertStrList( lst ); ! quickSelectCombo->setCurrentText( "*" ); ! quickSelectCombo->setSizePolicy( QSizePolicy( QSizePolicy::Expanding, QSizePolicy::Preferred ) ); connect(quickSelectCombo, SIGNAL(returnPressed(const QString& )), *************** *** 112,131 **** QToolButton *qselectBtn = new QToolButton(quickPanel); ! qselectBtn->setPixmap(krLoader->loadIcon( "kr_selectall", KIcon::Toolbar, 16 )); ! qselectBtn->setFixedSize(20, 20); ! QToolTip::add( qselectBtn, i18n("apply the selection") ); connect(qselectBtn, SIGNAL(clicked()), this, SLOT(quickSelect())); ! QToolButton *qstoreBtn = new QToolButton(quickPanel); ! qstoreBtn->setPixmap(krLoader->loadIcon( "filesave", KIcon::Toolbar, 16 )); ! qstoreBtn->setFixedSize(20, 20); ! QToolTip::add( qstoreBtn, i18n("store the current selection") ); ! connect(qstoreBtn, SIGNAL(clicked()), this, SLOT(quickSelectStore())); ! ! QToolButton *qsettingsBtn = new QToolButton(quickPanel); ! qsettingsBtn->setPixmap(krLoader->loadIcon( "configure", KIcon::Toolbar, 16 )); ! qsettingsBtn->setFixedSize(20, 20); ! QToolTip::add( qsettingsBtn, i18n("select group dialog") ); ! connect(qsettingsBtn, SIGNAL(clicked()), krSelect, SLOT(activate())); qlayout->addWidget(selectLabel,0,0); --- 115,134 ---- QToolButton *qselectBtn = new QToolButton(quickPanel); ! qselectBtn->setPixmap(krLoader->loadIcon( "kr_selectall", KIcon::Toolbar, 16 )); ! qselectBtn->setFixedSize(20, 20); ! QToolTip::add( qselectBtn, i18n("apply the selection") ); connect(qselectBtn, SIGNAL(clicked()), this, SLOT(quickSelect())); ! QToolButton *qstoreBtn = new QToolButton(quickPanel); ! qstoreBtn->setPixmap(krLoader->loadIcon( "filesave", KIcon::Toolbar, 16 )); ! qstoreBtn->setFixedSize(20, 20); ! QToolTip::add( qstoreBtn, i18n("store the current selection") ); ! connect(qstoreBtn, SIGNAL(clicked()), this, SLOT(quickSelectStore())); ! ! QToolButton *qsettingsBtn = new QToolButton(quickPanel); ! qsettingsBtn->setPixmap(krLoader->loadIcon( "configure", KIcon::Toolbar, 16 )); ! qsettingsBtn->setFixedSize(20, 20); ! QToolTip::add( qsettingsBtn, i18n("select group dialog") ); ! connect(qsettingsBtn, SIGNAL(clicked()), krSelect, SLOT(activate())); qlayout->addWidget(selectLabel,0,0); *************** *** 240,249 **** } ! void PanelPopup::slotDroppedOnTree(KURL::List &lst, KURL &url) { ! kdWarning() << "dest: " << url.url() << endl; ! for (KURL::List::Iterator it = lst.begin(); it!=lst.end(); ++it) { ! kdWarning() << (*it).url() << endl; ! } ! KIO::CopyJob *job = KIO::copy(lst, url, true); } --- 243,275 ---- } ! void PanelPopup::slotDroppedOnTree(QWidget *widget, QDropEvent *e, KURL::List &lst, KURL &) { ! // KFileTreeView is buggy: when dropped, it might not give us the correct ! // destination, but actually, it's parent. workaround: don't use ! // the destination in the signal, but take the current item ! KURL dest = tree->currentURL(); ! // ask the user what to do: copy, move or link? ! QPopupMenu popup( this ); ! popup.insertItem( i18n( "Copy Here" ), 1 ); ! popup.insertItem( i18n( "Move Here" ), 2 ); ! popup.insertItem( i18n( "Link Here" ), 3 ); ! popup.insertItem( i18n( "Cancel" ), 4 ); ! QPoint tmp = widget->mapToGlobal( e->pos() ); ! int result = popup.exec( QCursor::pos() ); ! ! KIO::CopyJob *job; ! switch ( result ) { ! case 1 : ! job = KIO::copy(lst, dest, true); ! break; ! case 2 : ! job = KIO::move(lst, dest, true); ! break; ! case 3 : ! job = KIO::link(lst, dest, true); ! break; ! case - 1 : // user pressed outside the menu ! case 4: ! return ; // cancel was pressed; ! } } |
|
From: Karai C. <ck...@us...> - 2004-09-14 21:21:59
|
Update of /cvsroot/krusader/krusader_kde3 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26875/krusader_kde3 Modified Files: ChangeLog Log Message: ADDED: packing/unpacking to/from remote URL-s Index: ChangeLog =================================================================== RCS file: /cvsroot/krusader/krusader_kde3/ChangeLog,v retrieving revision 1.299 retrieving revision 1.300 diff -C2 -d -r1.299 -r1.300 *** ChangeLog 13 Sep 2004 19:13:11 -0000 1.299 --- ChangeLog 14 Sep 2004 21:21:48 -0000 1.300 *************** *** 1,3 **** --- 1,4 ---- ====================== + ADDED: packing / unpacking to/from remote URL-s ADDED: short tab names ADDED: compare directories (mark menu) |
|
From: Karai C. <ck...@us...> - 2004-09-14 21:21:59
|
Update of /cvsroot/krusader/krusader_kde3/krusader/Panel In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26875/krusader_kde3/krusader/Panel Modified Files: panelfunc.cpp Log Message: ADDED: packing/unpacking to/from remote URL-s Index: panelfunc.cpp =================================================================== RCS file: /cvsroot/krusader/krusader_kde3/krusader/Panel/panelfunc.cpp,v retrieving revision 1.84 retrieving revision 1.85 diff -C2 -d -r1.84 -r1.85 *** panelfunc.cpp 3 Sep 2004 21:22:43 -0000 1.84 --- panelfunc.cpp 14 Sep 2004 21:21:49 -0000 1.85 *************** *** 46,49 **** --- 46,52 ---- #include <kinputdialog.h> #include <kdebug.h> + #include <kio/netaccess.h> + #include <kstandarddirs.h> + #include <ktempdir.h> // Krusader Includes #include "panelfunc.h" *************** *** 625,629 **** bool packToOtherPanel = ( PackGUI::destination == panel->otherPanel->virtualPath ); ! QString arcFile = PackGUI::destination + "/" + PackGUI::filename + "." + PackGUI::type; if ( PackGUI::type != "zip" && QFileInfo( arcFile ).exists() ) { --- 628,644 ---- bool packToOtherPanel = ( PackGUI::destination == panel->otherPanel->virtualPath ); ! // on remote URL-s first pack into a temp file then copy to its right place ! KURL destURL = vfs::fromPathOrURL( PackGUI::destination + "/" + PackGUI::filename + "." + PackGUI::type ); ! KTempFile *tempDestFile = 0; ! QString arcFile; ! if( destURL.isLocalFile() ) ! arcFile = destURL.path(); ! else ! { ! tempDestFile = new KTempFile( QString::null, "." + PackGUI::type ); ! tempDestFile->setAutoDelete( true ); ! arcFile = tempDestFile->name(); ! QFile::remove( arcFile ); ! } if ( PackGUI::type != "zip" && QFileInfo( arcFile ).exists() ) { *************** *** 654,657 **** --- 669,679 ---- chdir( save.local8Bit() ); + // copy from the temp file to it's right place + if( tempDestFile ) + { + KIO::NetAccess::file_move( vfs::fromPathOrURL( arcFile ), destURL ); + delete tempDestFile; + } + if ( packToOtherPanel ) panel->otherPanel->func->refresh(); *************** *** 664,669 **** if ( arcName == ".." ) return ; // safety ! QString type = files() ->vfs_search( arcName ) ->vfile_getMime().right( 4 ); ! // check we that archive is supported if ( !KRarcHandler::arcSupported( type ) ) { --- 686,704 ---- if ( arcName == ".." ) return ; // safety ! ! KURL arcURL = files() ->vfs_getFile( arcName ); ! QString type = files() ->vfs_search( arcName )->vfile_getMime().right( 4 ); ! QString url = QString::null; ! ! // download the file if it's on a remote filesystem ! if( !arcURL.isLocalFile() ) ! { ! url = locateLocal( "tmp", QString( arcName ) ); ! if( !KIO::NetAccess::download( arcURL, url, 0 ) ){ ! KMessageBox::sorry(krApp,i18n("Krusader is unable to download: ")+arcURL.fileName()); ! return; ! } ! }else url = arcURL.path(-1); ! // check we that archive is supported if ( !KRarcHandler::arcSupported( type ) ) { *************** *** 671,680 **** return ; } ! // test the archive ! if ( KRarcHandler::test( files()->vfs_getFile(arcName).path(-1), type ) ) KMessageBox::information( krApp, i18n( "%1, test passed." ).arg( arcName ) ); else KMessageBox::error( krApp, i18n( "%1, test failed !" ).arg( arcName ) ); } --- 706,719 ---- return ; } ! // test the archive ! if ( KRarcHandler::test( url, type ) ) KMessageBox::information( krApp, i18n( "%1, test passed." ).arg( arcName ) ); else KMessageBox::error( krApp, i18n( "%1, test failed !" ).arg( arcName ) ); + + // remove the downloaded file if necessary + if( url != arcURL.path( -1 ) ) + QFile( url ).remove(); } *************** *** 707,710 **** --- 746,776 ---- return ; // safety + // download the file if it's on a remote filesystem + KURL arcURL = files() ->vfs_getFile( arcName ); + QString url = QString::null; + if( !arcURL.isLocalFile() ) + { + url = locateLocal( "tmp", QString( arcName ) ); + if( !KIO::NetAccess::download( arcURL, url, 0 ) ){ + KMessageBox::sorry(krApp,i18n("Krusader is unable to download: ")+arcURL.fileName()); + continue; + } + }else url = arcURL.path(-1); + + // if the destination is in remote directory use temporary one instead + if( !dest.endsWith( "/" ) ) dest += "/"; + KURL destURL = vfs::fromPathOrURL( dest ); + KURL originalDestURL; + KTempDir *tempDir = 0; + + if( !destURL.isLocalFile() ) + { + originalDestURL = destURL; + tempDir = new KTempDir(); + tempDir->setAutoDelete( true ); + destURL = tempDir->name(); + } + + // determining the type QString mime = files() ->vfs_search( arcName ) ->vfile_getMime(); QString type = mime.right( 4 ); *************** *** 718,722 **** } // unpack the files ! KRarcHandler::unpack( files()->vfs_getFile(arcName).path(-1), type, dest ); } if ( packToOtherPanel ) --- 784,805 ---- } // unpack the files ! KRarcHandler::unpack( url, type, destURL.path(-1) ); ! ! // remove the downloaded file if necessary ! if( url != arcURL.path( -1 ) ) ! QFile( url ).remove(); ! ! // copy files to the destination directory at remote files ! if( tempDir ) ! { ! QStringList nameList = QDir( destURL.path( -1 ) ).entryList(); ! KURL::List urlList; ! for( unsigned int i=0; i!= nameList.count(); i++ ) ! if( nameList[ i ] != "." && nameList[ i ] != ".." ) ! urlList.append( vfs::fromPathOrURL( destURL.path( 1 ) + nameList[ i ] ) ); ! if( urlList.count() > 0 ) ! KIO::NetAccess::dircopy( urlList, originalDestURL, 0 ); ! delete tempDir; ! } } if ( packToOtherPanel ) |
|
From: Karai C. <ck...@us...> - 2004-09-14 21:05:09
|
Update of /cvsroot/krusader/krusader_kde3/krArc In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21681/krusader_kde3/krArc Modified Files: krarc.cpp Log Message: FIXED: safety: krarc stores files in its temp directory instead of the current Index: krarc.cpp =================================================================== RCS file: /cvsroot/krusader/krusader_kde3/krArc/krarc.cpp,v retrieving revision 1.26 retrieving revision 1.27 diff -C2 -d -r1.26 -r1.27 *** krarc.cpp 14 Sep 2004 17:44:29 -0000 1.26 --- krarc.cpp 14 Sep 2004 21:05:01 -0000 1.27 *************** *** 596,600 **** // write the temp file KShellProcess proc; ! KTempFile temp("krarc","tmp"); temp.setAutoDelete(true); if( arcType != "bzip2" ){ --- 596,600 ---- // write the temp file KShellProcess proc; ! KTempFile temp( QString::null, "tmp" ); temp.setAutoDelete(true); if( arcType != "bzip2" ){ |
|
From: Karai C. <ck...@us...> - 2004-09-14 17:44:41
|
Update of /cvsroot/krusader/krusader_kde3/krArc In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10056/krusader_kde3/krArc Modified Files: krarc.cpp krarc.h Log Message: FIXED: necessary modifications for copying from krarc to krarc Index: krarc.cpp =================================================================== RCS file: /cvsroot/krusader/krusader_kde3/krArc/krarc.cpp,v retrieving revision 1.25 retrieving revision 1.26 diff -C2 -d -r1.25 -r1.26 *** krarc.cpp 13 Sep 2004 19:13:11 -0000 1.25 --- krarc.cpp 14 Sep 2004 17:44:29 -0000 1.26 *************** *** 49,53 **** f.open(IO_WriteOnly | IO_Append); \ QTextStream stream( &f ); \ ! stream <<__FUNCTION__<<"(" <<__LINE__<<"): "; \ stream << X << endl; \ f.close(); \ --- 49,53 ---- f.open(IO_WriteOnly | IO_Append); \ QTextStream stream( &f ); \ ! stream << "Pid:" << (int)getpid() << " " <<__FUNCTION__<<"(" <<__LINE__<<"): "; \ stream << X << endl; \ f.close(); \ *************** *** 110,114 **** --- 110,120 ---- void kio_krarcProtocol::mkdir(const KURL& url,int permissions){ KRDEBUG(url.path()); + setArcFile(url.path()); + if( newArchiveURL && !initDirDict(url) ){ + error(ERR_CANNOT_ENTER_DIRECTORY,url.path()); + return; + } + if( putCmd.isEmpty() ){ error(ERR_UNSUPPORTED_ACTION, *************** *** 158,161 **** --- 164,172 ---- KRDEBUG(url.path()); setArcFile(url.path()); + if( newArchiveURL && !initDirDict(url) ){ + error(ERR_CANNOT_ENTER_DIRECTORY,url.path()); + return; + } + if( putCmd.isEmpty() ){ error(ERR_UNSUPPORTED_ACTION, *************** *** 214,218 **** --- 225,235 ---- bool isArjGet = false; KRDEBUG(url.path()); + if( !setArcFile(url.path()) ) return; + if( newArchiveURL && !initDirDict(url) ){ + error(ERR_CANNOT_ENTER_DIRECTORY,url.path()); + return; + } + if( getCmd.isEmpty() ){ error(ERR_UNSUPPORTED_ACTION, *************** *** 347,351 **** --- 364,374 ---- void kio_krarcProtocol::del(KURL const & url, bool isFile){ KRDEBUG(url.path()); + setArcFile(url.path()); + if( newArchiveURL && !initDirDict(url) ){ + error(ERR_CANNOT_ENTER_DIRECTORY,url.path()); + return; + } + if( delCmd.isEmpty() ){ error(ERR_UNSUPPORTED_ACTION, *************** *** 376,379 **** --- 399,407 ---- KRDEBUG(url.path()); if( !setArcFile(url.path()) ) return; + if( newArchiveURL && !initDirDict(url) ){ + error(ERR_CANNOT_ENTER_DIRECTORY,url.path()); + return; + } + if( listCmd.isEmpty() ){ error(ERR_UNSUPPORTED_ACTION, *************** *** 412,416 **** --- 440,452 ---- do { + if( url.fileName() != dest.fileName() ) + break; + setArcFile(url.path()); + if( newArchiveURL && !initDirDict(url) ){ + error(ERR_CANNOT_ENTER_DIRECTORY,url.path()); + return; + } + UDSEntry* entry = findFileEntry(url); if( copyCmd.isEmpty() || !entry ) *************** *** 491,496 **** --- 527,534 ---- time_t currTime = time( 0 ); archiveChanged = true; + newArchiveURL = true; // is the file already set ? if( arcFile && arcFile->url().path(-1) == path.left(arcFile->url().path(-1).length()) ){ + newArchiveURL = false; // Has it changed ? KFileItem* newArcFile = new KFileItem(arcFile->url(),QString::null,0); Index: krarc.h =================================================================== RCS file: /cvsroot/krusader/krusader_kde3/krArc/krarc.h,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** krarc.h 13 Sep 2004 19:13:11 -0000 1.7 --- krarc.h 14 Sep 2004 17:44:29 -0000 1.8 *************** *** 80,83 **** --- 80,84 ---- bool archiveChanged; //< true if the archive was changed. bool archiveChanging; //< true if the archive is currently changing. + bool newArchiveURL; //< true if new archive was entered for the protocol KFileItem* arcFile; //< the archive file item. QString arcPath; //< the archive location |
|
From: Karai C. <ck...@us...> - 2004-09-13 19:13:51
|
Update of /cvsroot/krusader/krusader_kde3/krArc In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29033/krusader_kde3/krArc Modified Files: krarc.cpp krarc.h krarc.protocol Log Message: FIXED: handling jar files + krarc keeps the date / time info at extracting Index: krarc.cpp =================================================================== RCS file: /cvsroot/krusader/krusader_kde3/krArc/krarc.cpp,v retrieving revision 1.24 retrieving revision 1.25 diff -C2 -d -r1.24 -r1.25 *** krarc.cpp 10 Sep 2004 16:16:32 -0000 1.24 --- krarc.cpp 13 Sep 2004 19:13:11 -0000 1.25 *************** *** 25,28 **** --- 25,29 ---- #include <qfileinfo.h> #include <qregexp.h> + #include <qdir.h> #include <kfileitem.h> *************** *** 405,408 **** --- 406,449 ---- } + void kio_krarcProtocol::copy (const KURL &url, const KURL &dest, int, bool) { + KRDEBUG(url.path()); + + if( dest.isLocalFile() ) + do + { + setArcFile(url.path()); + UDSEntry* entry = findFileEntry(url); + if( copyCmd.isEmpty() || !entry ) + break; + + QString file = url.path().mid(arcFile->url().path().length()+1); + + QString destDir = dest.path( -1 ); + if( !QDir( destDir ).exists() ) + { + int ndx = destDir.findRev( '/' ); + if( ndx != -1 ) + destDir.truncate( ndx+1 ); + } + + QDir::setCurrent( destDir.local8Bit() ); + + KShellProcess proc; + proc << copyCmd << "\""+arcFile->url().path()+"\" " << "\""+file+"\""; + if( arcType == "ace" && QFile( "/dev/ptmx" ).exists() ) // Don't remove, unace crashes if missing!!! + proc << "<" << "/dev/ptmx"; + + infoMessage(i18n("Unpacking %1 ...").arg( url.fileName() ) ); + proc.start(KProcess::Block); + + processedSize( KFileItem(*entry,url).size() ); + finished(); + QDir::setCurrent( "/" ); /* for being able to umount devices after copying*/ + return; + }while( 0 ); + + error( ERR_UNSUPPORTED_ACTION, unsupportedActionErrorString(mProtocol, CMD_COPY)); + } + void kio_krarcProtocol::listDir(const KURL& url){ KRDEBUG(url.path()); *************** *** 498,501 **** --- 539,546 ---- arcType = arcFile->mimetype(); arcType = arcType.mid(arcType.findRev("-")+1); + + if( arcType == "jar" ) + arcType = "zip"; + arcPath = "\""+arcFile->url().path(-1)+"\""; arcPath.replace(QRegExp(" "),"\\ "); *************** *** 742,747 **** // permissions perm = nextWord(line); - if(perm.length() != 10) perm = (perm.at(0)=='d')? "drwxr-xr-x" : "-rw-r--r--" ; - mode = parsePermString(perm); // ignore the next 2 fields nextWord(line); nextWord(line); --- 787,790 ---- *************** *** 757,760 **** --- 800,807 ---- // full name fullName = nextWord(line,'\n'); + + if(perm.length() != 10) + perm = (perm.at(0)=='d' || fullName.endsWith( "/" )) ? "drwxr-xr-x" : "-rw-r--r--" ; + mode = parsePermString(perm); } if(arcType == "rar"){ *************** *** 977,980 **** --- 1024,1028 ---- listCmd = fullPathName( "unzip" ) + " -ZTs-z-t-h "; getCmd = fullPathName( "unzip" ) + " -p "; + copyCmd = fullPathName( "unzip" ) + " -j "; if( KStandardDirs::findExe( "zip" ).isEmpty() ) { *************** *** 989,992 **** --- 1037,1041 ---- { getCmd += "-P '"+password+"' "; + copyCmd += "-P '"+password+"' "; putCmd += "-P '"+password+"' "; } *************** *** 997,1000 **** --- 1046,1050 ---- listCmd = fullPathName( "unrar" ) + " -c- v "; getCmd = fullPathName( "unrar" ) + " p -ierr -idp -c- -y "; + copyCmd = fullPathName( "unrar" ) + " e "; delCmd = QString::null; putCmd = QString::null; *************** *** 1005,1008 **** --- 1055,1059 ---- listCmd = fullPathName( "rar" ) + " -c- v "; getCmd = fullPathName( "rar" ) + " p -ierr -idp -c- -y "; + copyCmd = fullPathName( "rar" ) + " e "; delCmd = fullPathName( "rar" ) + " d "; putCmd = fullPathName( "rar" ) + " -r a "; *************** *** 1014,1021 **** --- 1065,1074 ---- delCmd = QString::null; putCmd = QString::null; + copyCmd = QString::null; } else if(arcType == "gzip"){ cmd = fullPathName( "gzip" ); listCmd = fullPathName( "gzip" ) + " -l"; getCmd = fullPathName( "gzip" ) + " -dc"; + copyCmd = QString::null; delCmd = QString::null; putCmd = QString::null; *************** *** 1024,1027 **** --- 1077,1081 ---- listCmd = fullPathName( "bzip2" ); getCmd = fullPathName( "bzip2" ) + " -dc"; + copyCmd = QString::null; delCmd = QString::null; putCmd = QString::null; *************** *** 1030,1033 **** --- 1084,1088 ---- listCmd = fullPathName( "arj" ) + " v "; getCmd = fullPathName( "arj" ) + " -jyo e "; + copyCmd = fullPathName( "arj" ) + " -jyo e "; delCmd = fullPathName( "arj" ) + " d "; putCmd = fullPathName( "arj" ) + " -r a "; *************** *** 1036,1039 **** --- 1091,1095 ---- listCmd = fullPathName( "lha" ) + " l "; getCmd = fullPathName( "lha" ) + " pq "; + copyCmd = fullPathName( "lha" ) + " ei "; delCmd = fullPathName( "lha" ) + " d "; putCmd = fullPathName( "lha" ) + " a "; *************** *** 1042,1045 **** --- 1098,1102 ---- listCmd = fullPathName( "unace" ) + " v"; getCmd = fullPathName( "unace" ) + " e"; + copyCmd = fullPathName( "unace" ) + " e"; delCmd = QString::null; putCmd = QString::null; *************** *** 1048,1051 **** --- 1105,1109 ---- listCmd = QString::null; getCmd = QString::null; + copyCmd = QString::null; delCmd = QString::null; putCmd = QString::null; Index: krarc.protocol =================================================================== RCS file: /cvsroot/krusader/krusader_kde3/krArc/krarc.protocol,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** krarc.protocol 17 Sep 2003 17:32:46 -0000 1.3 --- krarc.protocol 13 Sep 2004 19:13:11 -0000 1.4 *************** *** 13,16 **** --- 13,17 ---- linking=false moving=false + copyToFile=true Icon=ark Description=Mutiple archive handler that currently supports: zip,rar. Index: krarc.h =================================================================== RCS file: /cvsroot/krusader/krusader_kde3/krArc/krarc.h,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** krarc.h 19 Aug 2004 16:38:15 -0000 1.6 --- krarc.h 13 Sep 2004 19:13:11 -0000 1.7 *************** *** 44,47 **** --- 44,48 ---- virtual void listDir(const KURL& url); virtual void del(KURL const & url, bool isFile); + virtual void copy (const KURL &src, const KURL &dest, int permissions, bool overwrite); public slots: *************** *** 60,64 **** QString getCmd; ///< unpack files command. QString delCmd; ///< delete files command. ! QString putCmd; ///< add file commnad. private: --- 61,66 ---- QString getCmd; ///< unpack files command. QString delCmd; ///< delete files command. ! QString putCmd; ///< add file command. ! QString copyCmd; ///< copy to file command. private: |
|
From: Karai C. <ck...@us...> - 2004-09-13 19:13:50
|
Update of /cvsroot/krusader/krusader_kde3/krusader/Konfigurator In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29033/krusader_kde3/krusader/Konfigurator Modified Files: kgprotocols.cpp Log Message: FIXED: handling jar files + krarc keeps the date / time info at extracting Index: kgprotocols.cpp =================================================================== RCS file: /cvsroot/krusader/krusader_kde3/krusader/Konfigurator/kgprotocols.cpp,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** kgprotocols.cpp 8 Sep 2004 06:42:41 -0000 1.4 --- kgprotocols.cpp 13 Sep 2004 19:13:11 -0000 1.5 *************** *** 44,50 **** QString KgProtocols::defaultKrarcMimes = "application/x-ace,application/x-arj," "application/x-bzip2,application/x-cpio," ! "application/x-gzip,application/x-lha," ! "application/x-rar,application/x-rpm," ! "application/x-zip"; QString KgProtocols::defaultTarMimes = "application/x-tar,application/x-tarz," "application/x-tbz,application/x-tgz"; --- 44,50 ---- QString KgProtocols::defaultKrarcMimes = "application/x-ace,application/x-arj," "application/x-bzip2,application/x-cpio," ! "application/x-gzip,application/x-jar," ! "application/x-lha,application/x-rar," ! "application/x-rpm,application/x-zip"; QString KgProtocols::defaultTarMimes = "application/x-tar,application/x-tarz," "application/x-tbz,application/x-tgz"; |
7 messages has been excluded from this view by a project administrator.
