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: <ck...@us...> - 2003-12-28 17:11:55
|
Update of /cvsroot/krusader/krusader_kde3/krusader
In directory sc8-pr-cvs1:/tmp/cvs-serv26039/krusader_kde3/krusader
Modified Files:
krslots.cpp
Log Message:
FIXED: KURL::path() -> KURL::prettyURL() fix in Synchronizer and Splitter
Index: krslots.cpp
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/krusader/krslots.cpp,v
retrieving revision 1.40
retrieving revision 1.41
diff -C2 -d -r1.40 -r1.41
*** krslots.cpp 27 Dec 2003 16:50:16 -0000 1.40
--- krslots.cpp 28 Dec 2003 17:11:47 -0000 1.41
***************
*** 249,253 ****
if( full_path ){
! QString path=ACTIVE_FUNC->files()->vfs_getOrigin().path(1);
filename = path+filename;
}
--- 249,253 ----
if( full_path ){
! QString path=ACTIVE_FUNC->files()->vfs_getOrigin().prettyURL(1,KURL::StripFileProtocol);
filename = path+filename;
}
***************
*** 511,515 ****
}
! QString fileName = ACTIVE_FUNC->files()->vfs_getFile(name).path(-1);
if( fileName == QString::null )
return;
--- 511,515 ----
}
! QString fileName = ACTIVE_FUNC->files()->vfs_getFile(name).prettyURL(-1,KURL::StripFileProtocol);
if( fileName == QString::null )
return;
***************
*** 520,524 ****
}
! QString destDir = ACTIVE_PANEL->otherPanel->func->files()->vfs_getOrigin().path(-1);
SplitterGUI splitterGUI( MAIN_VIEW, fileName, destDir );
--- 520,524 ----
}
! QString destDir = ACTIVE_PANEL->otherPanel->func->files()->vfs_getOrigin().prettyURL(-1,KURL::StripFileProtocol);
SplitterGUI splitterGUI( MAIN_VIEW, fileName, destDir );
***************
*** 555,559 ****
for ( QStringList::Iterator it = list.begin(); it != list.end(); ++it )
{
! QString name = ACTIVE_FUNC->files()->vfs_getFile(*it).path(-1);
if( name == QString::null )
return;
--- 555,559 ----
for ( QStringList::Iterator it = list.begin(); it != list.end(); ++it )
{
! QString name = ACTIVE_FUNC->files()->vfs_getFile(*it).prettyURL(-1,KURL::StripFileProtocol);
if( name == QString::null )
return;
***************
*** 626,630 ****
{
commonName = shorter;
! fileName = ACTIVE_FUNC->files()->vfs_getOrigin().path(1) + testFile;
}
}
--- 626,630 ----
{
commonName = shorter;
! fileName = ACTIVE_FUNC->files()->vfs_getOrigin().prettyURL(1,KURL::StripFileProtocol) + testFile;
}
}
***************
*** 669,674 ****
void KRslots::slotSynchronizeDirs() {
SynchronizerGUI *sync = new SynchronizerGUI( MAIN_VIEW,
! ACTIVE_PANEL->func->files()->vfs_getOrigin().path(),
! ACTIVE_PANEL->otherPanel->func->files()->vfs_getOrigin().path() );
bool refresh = sync->wasSynchronization();
--- 669,674 ----
void KRslots::slotSynchronizeDirs() {
SynchronizerGUI *sync = new SynchronizerGUI( MAIN_VIEW,
! ACTIVE_PANEL->func->files()->vfs_getOrigin().prettyURL(0,KURL::StripFileProtocol),
! ACTIVE_PANEL->otherPanel->func->files()->vfs_getOrigin().prettyURL(0,KURL::StripFileProtocol) );
bool refresh = sync->wasSynchronization();
|
|
From: <ck...@us...> - 2003-12-27 16:50:21
|
Update of /cvsroot/krusader/krusader_kde3/krusader/Synchronizer
In directory sc8-pr-cvs1:/tmp/cvs-serv17058/krusader_kde3/krusader/Synchronizer
Modified Files:
synchronizer.cpp synchronizer.h synchronizergui.cpp
Log Message:
FIXED: ftp and ftp proxy bug with the new VFS
Index: synchronizer.cpp
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/krusader/Synchronizer/synchronizer.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** synchronizer.cpp 26 Dec 2003 00:00:55 -0000 1.8
--- synchronizer.cpp 27 Dec 2003 16:50:17 -0000 1.9
***************
*** 198,202 ****
}
! bool result = v->vfs_refresh( url );
if ( !result )
--- 198,202 ----
}
! bool result = v->vfs_refresh( vfs::fromPathOrURL( url ) );
if ( !result )
***************
*** 682,687 ****
dirName += "/";
! leftURL = fromPathOrURL( leftBaseDir + dirName + currentTask->name() );
! rightURL = fromPathOrURL( rightBaseDir + dirName + currentTask->name() );
switch( task )
--- 682,687 ----
dirName += "/";
! leftURL = vfs::fromPathOrURL( leftBaseDir + dirName + currentTask->name() );
! rightURL = vfs::fromPathOrURL( rightBaseDir + dirName + currentTask->name() );
switch( task )
***************
*** 697,701 ****
KURL destURL( leftURL );
if( !currentTask->destination().isNull() )
! destURL = fromPathOrURL( currentTask->destination() );
KIO::FileCopyJob *job = KIO::file_copy(rightURL, destURL, -1,
--- 697,701 ----
KURL destURL( leftURL );
if( !currentTask->destination().isNull() )
! destURL = vfs::fromPathOrURL( currentTask->destination() );
KIO::FileCopyJob *job = KIO::file_copy(rightURL, destURL, -1,
***************
*** 716,720 ****
KURL destURL( rightURL );
if( !currentTask->destination().isNull() )
! destURL = fromPathOrURL( currentTask->destination() );
KIO::FileCopyJob *job = KIO::file_copy(leftURL, destURL, -1,
--- 716,720 ----
KURL destURL( rightURL );
if( !currentTask->destination().isNull() )
! destURL = vfs::fromPathOrURL( currentTask->destination() );
KIO::FileCopyJob *job = KIO::file_copy(leftURL, destURL, -1,
***************
*** 896,933 ****
}
- KURL Synchronizer::fromPathOrURL( QString origin )
- {
- QString password, loginName;
-
- // breakdown the url;
- /* FIXME: untill KDE fixes the bug we have to check for
- passwords and users with @ in them... */
- bool bugfix = origin.find("@") != origin.findRev("@");
- if(bugfix){
- if(origin.find(":") != origin.findRev(":")){
- int passStart = origin.find( ":",origin.find(":")+1 )+1;
- int passLen = origin.findRev("@")-passStart;
- password = origin.mid(passStart,passLen);
- origin = origin.remove(passStart-1,passLen+1);
- }
- if(origin.find("@") != origin.findRev("@")){
- int usrStart = origin.find( "/" )+1;
- if(origin.at(usrStart) == '/') ++usrStart;
- int usrLen = origin.findRev("@")-usrStart;
- loginName = origin.mid(usrStart,usrLen);
- origin = origin.remove(usrStart,usrLen+1);
- }
- }
- KURL url = origin;
- if(loginName.isEmpty()) loginName = url.user();
- if(password.isEmpty()) password = url.pass();
- if(bugfix){
- url.setPass(password);
- url.setUser(loginName);
- }
-
- return url;
- }
-
bool Synchronizer::compareByContent( QString file_name, QString dir )
{
--- 896,899 ----
***************
*** 935,940 ****
dir += "/";
! leftURL = fromPathOrURL( leftBaseDir + dir + file_name );
! rightURL = fromPathOrURL( rightBaseDir + dir + file_name );
leftReadJob = KIO::get( leftURL, false, false );
--- 901,906 ----
dir += "/";
! leftURL = vfs::fromPathOrURL( leftBaseDir + dir + file_name );
! rightURL = vfs::fromPathOrURL( rightBaseDir + dir + file_name );
leftReadJob = KIO::get( leftURL, false, false );
Index: synchronizer.h
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/krusader/Synchronizer/synchronizer.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** synchronizer.h 21 Dec 2003 19:04:45 -0000 1.7
--- synchronizer.h 27 Dec 2003 16:50:17 -0000 1.8
***************
*** 132,136 ****
void deleteLeft( SynchronizerFileItem * );
- KURL fromPathOrURL( QString url );
QString leftBaseDirectory();
QString rightBaseDirectory();
--- 132,135 ----
Index: synchronizergui.cpp
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/krusader/Synchronizer/synchronizergui.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** synchronizergui.cpp 21 Dec 2003 19:04:45 -0000 1.7
--- synchronizergui.cpp 27 Dec 2003 16:50:17 -0000 1.8
***************
*** 1068,1073 ****
QString dirName = item->directory().isEmpty() ? "" : item->directory() + "/";
! KURL leftURL = synchronizer.fromPathOrURL( synchronizer.leftBaseDirectory() + dirName + item->name() );
! KURL rightURL = synchronizer.fromPathOrURL( synchronizer.rightBaseDirectory() + dirName + item->name() );
// create the menu
--- 1068,1073 ----
QString dirName = item->directory().isEmpty() ? "" : item->directory() + "/";
! KURL leftURL = vfs::fromPathOrURL( synchronizer.leftBaseDirectory() + dirName + item->name() );
! KURL rightURL = vfs::fromPathOrURL( synchronizer.rightBaseDirectory() + dirName + item->name() );
// create the menu
|
|
From: <ck...@us...> - 2003-12-27 16:50:21
|
Update of /cvsroot/krusader/krusader_kde3/krusader/VFS
In directory sc8-pr-cvs1:/tmp/cvs-serv17058/krusader_kde3/krusader/VFS
Modified Files:
ftp_vfs.cpp krvfshandler.cpp normal_vfs.cpp vfs.cpp vfs.h
Log Message:
FIXED: ftp and ftp proxy bug with the new VFS
Index: ftp_vfs.cpp
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/krusader/VFS/ftp_vfs.cpp,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -d -r1.23 -r1.24
*** ftp_vfs.cpp 25 Dec 2003 23:56:54 -0000 1.23
--- ftp_vfs.cpp 27 Dec 2003 16:50:17 -0000 1.24
***************
*** 158,162 ****
startLister();
! while( 0 && busy ){
qApp->processEvents();
qApp->eventLoop()->processEvents( QEventLoop::AllEvents|QEventLoop::WaitForMore);
--- 158,162 ----
startLister();
! while( busy ){
qApp->processEvents();
qApp->eventLoop()->processEvents( QEventLoop::AllEvents|QEventLoop::WaitForMore);
Index: krvfshandler.cpp
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/krusader/VFS/krvfshandler.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** krvfshandler.cpp 25 Dec 2003 23:56:54 -0000 1.2
--- krvfshandler.cpp 27 Dec 2003 16:50:17 -0000 1.3
***************
*** 32,36 ****
vfs::VFS_TYPE KrVfsHandler::getVfsType(const KURL& url){
! if( url.isLocalFile() || QDir(url.path(-1)).exists() ){
return vfs::NORMAL;
}
--- 32,36 ----
vfs::VFS_TYPE KrVfsHandler::getVfsType(const KURL& url){
! if( url.isLocalFile() /*|| QDir(url.path(-1)).exists()*/ ){ // commented out because of FTP->NormalVFS problem!!!
return vfs::NORMAL;
}
Index: normal_vfs.cpp
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/krusader/VFS/normal_vfs.cpp,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -d -r1.21 -r1.22
*** normal_vfs.cpp 25 Dec 2003 23:56:54 -0000 1.21
--- normal_vfs.cpp 27 Dec 2003 16:50:17 -0000 1.22
***************
*** 202,206 ****
else url = vfs_workingDir()+"/"+name;
! return KURL::fromPathOrURL(url);
}
--- 202,206 ----
else url = vfs_workingDir()+"/"+name;
! return vfs::fromPathOrURL(url);
}
Index: vfs.cpp
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/krusader/VFS/vfs.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** vfs.cpp 25 Dec 2003 23:56:54 -0000 1.5
--- vfs.cpp 27 Dec 2003 16:50:17 -0000 1.6
***************
*** 74,77 ****
--- 74,111 ----
}
+ KURL vfs::fromPathOrURL( const QString &originIn )
+ {
+ QString password, loginName, origin = originIn;
+
+ // breakdown the url;
+ /* FIXME: untill KDE fixes the bug we have to check for
+ passwords and users with @ in them... */
+ bool bugfix = origin.find("@") != origin.findRev("@");
+ if(bugfix){
+ if(origin.find(":") != origin.findRev(":")){
+ int passStart = origin.find( ":",origin.find(":")+1 )+1;
+ int passLen = origin.findRev("@")-passStart;
+ password = origin.mid(passStart,passLen);
+ origin = origin.remove(passStart-1,passLen+1);
+ }
+ if(origin.find("@") != origin.findRev("@")){
+ int usrStart = origin.find( "/" )+1;
+ if(origin.at(usrStart) == '/') ++usrStart;
+ int usrLen = origin.findRev("@")-usrStart;
+ loginName = origin.mid(usrStart,usrLen);
+ origin = origin.remove(usrStart,usrLen+1);
+ }
+ }
+ KURL url = origin;
+ if(loginName.isEmpty()) loginName = url.user();
+ if(password.isEmpty()) password = url.pass();
+ if(bugfix){
+ url.setPass(password);
+ url.setUser(loginName);
+ }
+
+ return url;
+ }
+
#if 0
QString vfs::round(int i){
***************
*** 103,107 ****
QDate date = datetime.date();
QTime time = datetime.time();
!
// construct the string
dateTime=round(date.day())+"/"+round(date.month())+
--- 137,141 ----
QDate date = datetime.date();
QTime time = datetime.time();
!
// construct the string
dateTime=round(date.day())+"/"+round(date.month())+
***************
*** 110,113 ****
--- 144,148 ----
return dateTime;
}
+
#endif
Index: vfs.h
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/krusader/VFS/vfs.h,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** vfs.h 25 Dec 2003 23:56:54 -0000 1.10
--- vfs.h 27 Dec 2003 16:50:17 -0000 1.11
***************
*** 95,98 ****
--- 95,101 ----
/// Return the the next file in the list and advance the iterator.
inline vfile* vfs_getNextFile() { return (vfs_filesP->next()); }
+ // KDE FTP proxy bug correction
+ static KURL fromPathOrURL( const QString &originIn );
+
public slots:
|
|
From: <ck...@us...> - 2003-12-27 16:50:21
|
Update of /cvsroot/krusader/krusader_kde3/krusader/Splitter
In directory sc8-pr-cvs1:/tmp/cvs-serv17058/krusader_kde3/krusader/Splitter
Modified Files:
combiner.cpp splitter.cpp splittergui.cpp
Log Message:
FIXED: ftp and ftp proxy bug with the new VFS
Index: combiner.cpp
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/krusader/Splitter/combiner.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** combiner.cpp 18 Dec 2003 23:05:40 -0000 1.3
--- combiner.cpp 27 Dec 2003 16:50:17 -0000 1.4
***************
*** 30,33 ****
--- 30,34 ----
#include "combiner.h"
+ #include "../VFS/vfs.h"
#include <klocale.h>
#include <kmessagebox.h>
***************
*** 68,72 ****
/* check whether the .crc file exists */
! splURL = KURL::fromPathOrURL( fileName + ".crc" );
KFileItem file(KFileItem::Unknown, KFileItem::Unknown, splURL );
file.refresh();
--- 69,73 ----
/* check whether the .crc file exists */
! splURL = vfs::fromPathOrURL( fileName + ".crc" );
KFileItem file(KFileItem::Unknown, KFileItem::Unknown, splURL );
file.refresh();
***************
*** 175,179 ****
}
! readURL = KURL::fromPathOrURL( readFileName );
/* creating a write job */
--- 176,180 ----
}
! readURL = vfs::fromPathOrURL( readFileName );
/* creating a write job */
***************
*** 202,210 ****
if( combineWriteJob == 0 )
{
! writeURL = KURL::fromPathOrURL(destinationDir + KURL::fromPathOrURL( fileName ).fileName() );
if( hasValidSplitFile )
writeURL.setFileName( expectedFileName );
else if( unixNaming )
! writeURL.setFileName( KURL::fromPathOrURL( fileName ).fileName() + ".out" );
combineWriteJob = KIO::put( writeURL, permissions, true, false, false );
--- 203,211 ----
if( combineWriteJob == 0 )
{
! writeURL = vfs::fromPathOrURL(destinationDir + vfs::fromPathOrURL( fileName ).fileName() );
if( hasValidSplitFile )
writeURL.setFileName( expectedFileName );
else if( unixNaming )
! writeURL.setFileName( vfs::fromPathOrURL( fileName ).fileName() + ".out" );
combineWriteJob = KIO::put( writeURL, permissions, true, false, false );
Index: splitter.cpp
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/krusader/Splitter/splitter.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** splitter.cpp 18 Dec 2003 23:05:40 -0000 1.2
--- splitter.cpp 27 Dec 2003 16:50:17 -0000 1.3
***************
*** 30,33 ****
--- 30,34 ----
#include "splitter.h"
+ #include "../VFS/vfs.h"
#include <qlayout.h>
#include <klocale.h>
***************
*** 40,44 ****
QProgressDialog( parent, "Krusader::Splitter", true, 0 ), splitSize( 0 )
{
! fileName = KURL::fromPathOrURL( fileNameIn );
destinationDir = destinationDirIn;
--- 41,45 ----
QProgressDialog( parent, "Krusader::Splitter", true, 0 ), splitSize( 0 )
{
! fileName = vfs::fromPathOrURL( fileNameIn );
destinationDir = destinationDirIn;
***************
*** 147,151 ****
index = index.arg(++fileNumber).rightJustify( 3, '0' );
QString outFileName = fileName.fileName() + "." + index;
! writeURL = KURL::fromPathOrURL( destinationDir + outFileName );
/* creating a write job */
--- 148,152 ----
index = index.arg(++fileNumber).rightJustify( 3, '0' );
QString outFileName = fileName.fileName() + "." + index;
! writeURL = vfs::fromPathOrURL( destinationDir + outFileName );
/* creating a write job */
***************
*** 208,212 ****
{
/* writing the split information file out */
! writeURL = KURL::fromPathOrURL( destinationDir + fileName.fileName() + ".crc" );
splitWriteJob = KIO::put( writeURL, permissions, true, false, false );
connect(splitWriteJob, SIGNAL(dataReq(KIO::Job *, QByteArray &)),
--- 209,213 ----
{
/* writing the split information file out */
! writeURL = vfs::fromPathOrURL( destinationDir + fileName.fileName() + ".crc" );
splitWriteJob = KIO::put( writeURL, permissions, true, false, false );
connect(splitWriteJob, SIGNAL(dataReq(KIO::Job *, QByteArray &)),
Index: splittergui.cpp
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/krusader/Splitter/splittergui.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** splittergui.cpp 29 Nov 2003 09:09:08 -0000 1.1
--- splittergui.cpp 27 Dec 2003 16:50:17 -0000 1.2
***************
*** 30,33 ****
--- 30,34 ----
#include "splittergui.h"
+ #include "../VFS/vfs.h"
#include <klocale.h>
#include <qlayout.h>
***************
*** 186,190 ****
void SplitterGUI::splitPressed()
{
! if( KURL::fromPathOrURL( urlReq->url() ).isMalformed() )
{
KMessageBox::error( this, i18n("The directory path URL is malformed!") );
--- 187,191 ----
void SplitterGUI::splitPressed()
{
! if( vfs::fromPathOrURL( urlReq->url() ).isMalformed() )
{
KMessageBox::error( this, i18n("The directory path URL is malformed!") );
|
|
From: <ck...@us...> - 2003-12-27 16:50:20
|
Update of /cvsroot/krusader/krusader_kde3/krusader/Search
In directory sc8-pr-cvs1:/tmp/cvs-serv17058/krusader_kde3/krusader/Search
Modified Files:
krsearchdialog.cpp
Log Message:
FIXED: ftp and ftp proxy bug with the new VFS
Index: krsearchdialog.cpp
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/krusader/Search/krsearchdialog.cpp,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** krsearchdialog.cpp 9 Dec 2003 23:05:57 -0000 1.13
--- krsearchdialog.cpp 27 Dec 2003 16:50:17 -0000 1.14
***************
*** 550,554 ****
void KrSearchDialog::resultClicked(QListViewItem* i) {
! krApp->mainView->activePanel->func->openUrl(KURL::fromPathOrURL(i->text(1)),i->text(0));
showMinimized();
}
--- 550,554 ----
void KrSearchDialog::resultClicked(QListViewItem* i) {
! krApp->mainView->activePanel->func->openUrl(vfs::fromPathOrURL(i->text(1)),i->text(0));
showMinimized();
}
|
|
From: <ck...@us...> - 2003-12-27 16:50:20
|
Update of /cvsroot/krusader/krusader_kde3/krusader/Panel
In directory sc8-pr-cvs1:/tmp/cvs-serv17058/krusader_kde3/krusader/Panel
Modified Files:
listpanel.cpp panelfunc.cpp
Log Message:
FIXED: ftp and ftp proxy bug with the new VFS
Index: listpanel.cpp
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/krusader/Panel/listpanel.cpp,v
retrieving revision 1.45
retrieving revision 1.46
diff -C2 -d -r1.45 -r1.46
*** listpanel.cpp 25 Dec 2003 23:55:35 -0000 1.45
--- listpanel.cpp 27 Dec 2003 16:50:16 -0000 1.46
***************
*** 267,271 ****
realPath = virtualPath;
! func->openUrl( KURL::fromPathOrURL(virtualPath) );
}
--- 267,271 ----
realPath = virtualPath;
! func->openUrl( vfs::fromPathOrURL(virtualPath) );
}
Index: panelfunc.cpp
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/krusader/Panel/panelfunc.cpp,v
retrieving revision 1.47
retrieving revision 1.48
diff -C2 -d -r1.47 -r1.48
*** panelfunc.cpp 26 Dec 2003 11:58:26 -0000 1.47
--- panelfunc.cpp 27 Dec 2003 16:50:16 -0000 1.48
***************
*** 200,204 ****
void ListPanelFunc::openUrl( const QString& url,const QString& nameToMakeCurrent) {
! openUrl( KURL::fromPathOrURL(url),nameToMakeCurrent);
}
--- 200,204 ----
void ListPanelFunc::openUrl( const QString& url,const QString& nameToMakeCurrent) {
! openUrl( vfs::fromPathOrURL(url),nameToMakeCurrent);
}
|
|
From: <ck...@us...> - 2003-12-27 16:50:20
|
Update of /cvsroot/krusader/krusader_kde3/krusader
In directory sc8-pr-cvs1:/tmp/cvs-serv17058/krusader_kde3/krusader
Modified Files:
krslots.cpp
Log Message:
FIXED: ftp and ftp proxy bug with the new VFS
Index: krslots.cpp
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/krusader/krslots.cpp,v
retrieving revision 1.39
retrieving revision 1.40
diff -C2 -d -r1.39 -r1.40
*** krslots.cpp 26 Dec 2003 15:34:49 -0000 1.39
--- krslots.cpp 27 Dec 2003 16:50:16 -0000 1.40
***************
*** 269,273 ****
void KRslots::invert() { ACTIVE_PANEL->invertSelection(); }
! void KRslots::root() { ACTIVE_FUNC->openUrl(KURL::fromPathOrURL("/"));}
void KRslots::refresh(const KURL& u){ ACTIVE_FUNC->openUrl(u); }
void KRslots::home() { ACTIVE_FUNC->openUrl(QDir::homeDirPath()); }
--- 269,273 ----
void KRslots::invert() { ACTIVE_PANEL->invertSelection(); }
! void KRslots::root() { ACTIVE_FUNC->openUrl(vfs::fromPathOrURL("/"));}
void KRslots::refresh(const KURL& u){ ACTIVE_FUNC->openUrl(u); }
void KRslots::home() { ACTIVE_FUNC->openUrl(QDir::homeDirPath()); }
***************
*** 319,323 ****
if (host==QString::null) return;
// otherwise, attempt a connection
! ACTIVE_FUNC->openUrl(KURL::fromPathOrURL(host));
}
--- 319,323 ----
if (host==QString::null) return;
// otherwise, attempt a connection
! ACTIVE_FUNC->openUrl(vfs::fromPathOrURL(host));
}
***************
*** 438,446 ****
else
{
! /* KURL::fromPathOrURL requires fullpath, so we check whether it is relative */
if ( !dest.contains( ":/" ) && !dest.startsWith( "/" ) )
dest = ACTIVE_FUNC->files()->vfs_getOrigin().prettyURL(1)+dest; /* it's full path now */
! KrViewer::view( KURL::fromPathOrURL(dest) ); // view the file
}
// nothing more to it!
--- 438,446 ----
else
{
! /* vfs::fromPathOrURL requires fullpath, so we check whether it is relative */
if ( !dest.contains( ":/" ) && !dest.startsWith( "/" ) )
dest = ACTIVE_FUNC->files()->vfs_getOrigin().prettyURL(1)+dest; /* it's full path now */
! KrViewer::view( vfs::fromPathOrURL(dest) ); // view the file
}
// nothing more to it!
***************
*** 455,459 ****
else
{
! /* KURL::fromPathOrURL requires fullpath, so we check whether it is relative */
if ( !dest.contains( ":/" ) && !dest.startsWith( "/" ) )
dest = ACTIVE_FUNC->files()->vfs_getOrigin().prettyURL(1) + dest; /* it's full path now */
--- 455,459 ----
else
{
! /* vfs::fromPathOrURL requires fullpath, so we check whether it is relative */
if ( !dest.contains( ":/" ) && !dest.startsWith( "/" ) )
dest = ACTIVE_FUNC->files()->vfs_getOrigin().prettyURL(1) + dest; /* it's full path now */
***************
*** 463,467 ****
if ( edit == "internal editor" )
! KrViewer::edit( KURL::fromPathOrURL( dest ), true );
else {
KProcess proc;
--- 463,467 ----
if ( edit == "internal editor" )
! KrViewer::edit( vfs::fromPathOrURL( dest ), true );
else {
KProcess proc;
|
|
From: <er...@us...> - 2003-12-27 13:22:54
|
Update of /cvsroot/krusader/krusader_kde3/krusader/UserMenu
In directory sc8-pr-cvs1:/tmp/cvs-serv16737/krusader/UserMenu
Modified Files:
usermenuaddimpl.cpp
Log Message:
finished the 'add entry' gui
Index: usermenuaddimpl.cpp
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/krusader/UserMenu/usermenuaddimpl.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** usermenuaddimpl.cpp 26 Dec 2003 15:35:18 -0000 1.2
--- usermenuaddimpl.cpp 27 Dec 2003 13:22:51 -0000 1.3
***************
*** 1,9 ****
/***************************************************************************
! usermenuaddimpl.cpp - description
! -------------------
! begin : Fri Dec 26 2003
! copyright : (C) 2003 by Shie Erlich & Rafi Yanai
! email :
! ***************************************************************************/
/***************************************************************************
--- 1,9 ----
/***************************************************************************
! usermenuaddimpl.cpp - description
! -------------------
! begin : Fri Dec 26 2003
! copyright : (C) 2003 by Shie Erlich & Rafi Yanai
! email :
! ***************************************************************************/
/***************************************************************************
***************
*** 19,45 ****
#include <klocale.h>
#include <qtoolbutton.h>
! #define EXECUTABLE_ID 10
! UserMenuAddImpl::UserMenuAddImpl(QWidget *parent, const char *name ) : UserMenuAdd(parent,name) {
// create the 'add' popup menu
! _popup = new KPopupMenu(this);
! _activeSub = new KPopupMenu(_popup);
! _otherSub = new KPopupMenu(_popup);
! _popup->insertItem(i18n("Active panel"), _activeSub);
! _popup->insertItem(i18n("Other panel"), _otherSub);
! _popup->insertItem(i18n("Executable"), EXECUTABLE_ID);
! }
! UserMenuAddImpl::~UserMenuAddImpl(){
}
void UserMenuAddImpl::accept() {
! emit newEntry("testname", "test cmdline", UserMenuProc::Terminal, false,
! false, false, false);
UserMenuAdd::accept();
}
void UserMenuAddImpl::popupAddMenu() {
! _popup->exec(mapToGlobal(QPoint(addButton->pos().x()+addButton->width(), addButton->pos().y())));
}
--- 19,92 ----
#include <klocale.h>
#include <qtoolbutton.h>
+ #include <klineedit.h>
+ #include <kfiledialog.h>
+ #include <kmessagebox.h>
+ #include <qcheckbox.h>
+ #include <qradiobutton.h>
! #define ACTIVE_MASK 0x1000
! #define OTHER_MASK 0x2000
! #define EXECUTABLE_ID 0x3000
! UserMenuAddImpl::UserMenuAddImpl( UserMenu *menu, QWidget *parent, const char *name ) : UserMenuAdd( parent, name ) {
// create the 'add' popup menu
! _popup = new KPopupMenu( this );
! _activeSub = new KPopupMenu( _popup );
! _otherSub = new KPopupMenu( _popup );
! _popup->insertItem( i18n( "Active panel" ), _activeSub );
! _popup->insertItem( i18n( "Other panel" ), _otherSub );
! _popup->insertItem( i18n( "Executable" ), EXECUTABLE_ID );
!
! // read the expressions array from the user menu and populate menus
! for ( int i = 0; i < UserMenu::numOfExps; i++ ) {
! _activeSub->insertItem( UserMenu::expressions[ i ].description, ( i | ACTIVE_MASK ) );
! _otherSub->insertItem( UserMenu::expressions[ i ].description, ( i | OTHER_MASK ) );
! }
}
+ UserMenuAddImpl::~UserMenuAddImpl() {}
void UserMenuAddImpl::accept() {
! // check that we have a command line and a name
! if (cmdName->text().simplifyWhiteSpace().isEmpty()) {
! KMessageBox::error(this, i18n("Please set a name for the menu entry"));
! return;
! } else if (cmdLine->text().simplifyWhiteSpace().isEmpty()) {
! KMessageBox::error(this, i18n("Command line is empty"));
! return;
! } else {
! // set the execution type
! UserMenuProc::ExecType type = UserMenuProc::None;
! if (runInTerminal->isChecked()) type = UserMenuProc::Terminal;
! else if (collectOutput->isChecked()) type = UserMenuProc::OutputOnly;
!
! emit newEntry( cmdName->text().simplifyWhiteSpace(), cmdLine->text().simplifyWhiteSpace(),
! type, separateStderr->isChecked(), acceptLocalURLs->isChecked() || acceptRemote->isChecked(),
! acceptRemote->isChecked(), showEverywhere->isChecked(),
! QStringList::split(';', showOnlyIn->text().simplifyWhiteSpace()));
! }
UserMenuAdd::accept();
}
void UserMenuAddImpl::popupAddMenu() {
! int res = _popup->exec( mapToGlobal( QPoint( addButton->pos().x() + addButton->width() * 3 / 2,
! addButton->pos().y() + addButton->height() / 2 ) ) );
! if ( res == -1 ) return ;
! // add the selected flag to the command line
! if ( res == EXECUTABLE_ID ) { // did the user need an executable ?
! // select an executable
! QString filename = KFileDialog::getOpenFileName(QString::null, QString::null, this);
! if (filename != QString::null) cmdLine->insert(filename+' ');
! } else { // user selected something from the menus
! QString exp = UserMenu::expressions[ res & ~( ACTIVE_MASK | OTHER_MASK ) ].expression;
! // replace the '_' with 'a' or 'o'.
! if ( res & ACTIVE_MASK ) exp.replace( '_', 'a' );
! else exp.replace( '_', 'o' ); // it can only be ACTIVE_MASK or OTHER_MASK
! cmdLine->insert( exp+' ' ); // with extra space
! }
! }
!
! void UserMenuAddImpl::addShowInFolder() {
! QString folder = KFileDialog::getExistingDirectory(QString::null, this);
! if (folder != QString::null) showIn->insert(folder+';');
}
|
|
From: <er...@us...> - 2003-12-27 13:22:37
|
Update of /cvsroot/krusader/krusader_kde3/krusader/UserMenu
In directory sc8-pr-cvs1:/tmp/cvs-serv16710/krusader/UserMenu
Modified Files:
usermenu.cpp
Log Message:
finished the 'add entry' gui
Index: usermenu.cpp
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/krusader/UserMenu/usermenu.cpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** usermenu.cpp 26 Dec 2003 15:37:16 -0000 1.9
--- usermenu.cpp 27 Dec 2003 13:22:34 -0000 1.10
***************
*** 52,57 ****
*/
! UMCmd UserMenu::_expressions[ NUM_EXPS ] = {
! {"%_p%", expPath}
};
--- 52,57 ----
*/
! UMCmd UserMenu::expressions[ UserMenu::numOfExps ] = {
! {"%_p%", "panel's path", expPath}
};
***************
*** 69,73 ****
void UserMenu::exec() {
// execute menu and wait for selection
! QString cmd = _popup.run();
// replace %% and prepare string
--- 69,73 ----
void UserMenu::exec() {
// execute menu and wait for selection
! QString cmd = _popup->run();
// replace %% and prepare string
***************
*** 104,113 ****
// ... replace first char with _ to ease the checking
exp = str.mid( beg, end - beg + 1 );
! for ( i = 0; i < NUM_EXPS; ++i )
! if ( str.mid( beg, end - beg + 1 ).replace( 1, 1, '_' ) == _expressions[ i ].expression ) {
! result += ( _expressions[ i ].expFunc ) ( exp );
break;
}
! if ( i == NUM_EXPS ) { // didn't find an expander
kdWarning() << "Error: unrecognized " << exp << " in UserMenu::expand" << endl;
return QString::null;
--- 104,113 ----
// ... replace first char with _ to ease the checking
exp = str.mid( beg, end - beg + 1 );
! for ( i = 0; i < numOfExps; ++i )
! if ( str.mid( beg, end - beg + 1 ).replace( 1, 1, '_' ) == expressions[ i ].expression ) {
! result += ( expressions[ i ].expFunc ) ( exp );
break;
}
! if ( i == numOfExps ) { // didn't find an expander
kdWarning() << "Error: unrecognized " << exp << " in UserMenu::expand" << endl;
return QString::null;
***************
*** 121,125 ****
}
! UserMenu::UserMenu( QWidget * parent, const char * name ) : QWidget( parent, name ) {}
//////////////////////////////////////////////////////////////////////////////////////////////////////
--- 121,127 ----
}
! UserMenu::UserMenu( QWidget * parent, const char * name ) : QWidget( parent, name ) {
! _popup = new UserMenuGui(this);
! }
//////////////////////////////////////////////////////////////////////////////////////////////////////
***************
*** 127,131 ****
//////////////////////////////////////////////////////////////////////////////////////////////////////
! UserMenuGui::UserMenuGui( QWidget * parent ) : KPopupMenu( parent ) {
insertTitle( "User Menu" );
--- 129,133 ----
//////////////////////////////////////////////////////////////////////////////////////////////////////
! UserMenuGui::UserMenuGui( UserMenu *menu, QWidget * parent ) : KPopupMenu( parent ) {
insertTitle( "User Menu" );
***************
*** 146,149 ****
--- 148,157 ----
insertSeparator();
insertItem( "Add new entry", 0 );
+
+ // create the 'add entry' gui
+ _addgui = new UserMenuAddImpl(menu, this);
+ connect(_addgui, SIGNAL(newEntry(QString, QString, UserMenuProc::ExecType, bool, bool, bool, bool, QStringList )),
+ this, SLOT(addEntry(QString, QString, UserMenuProc::ExecType, bool, bool, bool, bool, QStringList )));
+
}
***************
*** 175,183 ****
if ( idx == -1 ) return QString::null; // nothing was selected
if ( idx == 0 ) {
! UserMenuAddImpl *addgui = new UserMenuAddImpl(this);
! connect(addgui, SIGNAL(newEntry(QString, QString, UserMenuProc::ExecType, bool, bool, bool, bool, QStringList )),
! this, SLOT(addEntry(QString, QString, UserMenuProc::ExecType, bool, bool, bool, bool, QStringList )));
! addgui->exec();
! delete addgui;
return QString::null;
}
--- 183,187 ----
if ( idx == -1 ) return QString::null; // nothing was selected
if ( idx == 0 ) {
! _addgui->exec();
return QString::null;
}
|
|
From: <er...@us...> - 2003-12-27 13:22:18
|
Update of /cvsroot/krusader/krusader_kde3/krusader/UserMenu
In directory sc8-pr-cvs1:/tmp/cvs-serv16648/krusader/UserMenu
Modified Files:
usermenu.h
Log Message:
finished the 'add entry' gui
Index: usermenu.h
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/krusader/UserMenu/usermenu.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** usermenu.h 26 Dec 2003 15:36:47 -0000 1.8
--- usermenu.h 27 Dec 2003 13:22:15 -0000 1.9
***************
*** 1,5 ****
/***************************************************************************
! usermenu.h - description
! -------------------
begin : Sat Dec 6 2003
copyright : (C) 2003 by Shie Erlich & Rafi Yanai
--- 1,5 ----
/***************************************************************************
! usermenu.h - description
! -------------------
begin : Sat Dec 6 2003
copyright : (C) 2003 by Shie Erlich & Rafi Yanai
***************
*** 28,31 ****
--- 28,33 ----
class KDialogBase;
+ class UserMenuAddImpl;
+ class UserMenu;
class UserMenuProcDlg: public KDialogBase {
***************
*** 48,52 ****
enum ExecType { Terminal, OutputOnly, None };
! UserMenuProc(ExecType execType = Terminal, bool enableStderr = false);
~UserMenuProc();
bool start( QString cmdLine );
--- 50,54 ----
enum ExecType { Terminal, OutputOnly, None };
! UserMenuProc( ExecType execType = Terminal, bool enableStderr = false );
~UserMenuProc();
bool start( QString cmdLine );
***************
*** 70,74 ****
Q_OBJECT
public:
! UserMenuGui( QWidget *parent = 0 );
QString run();
--- 72,76 ----
Q_OBJECT
public:
! UserMenuGui( UserMenu* menu, QWidget *parent = 0 );
QString run();
***************
*** 77,85 ****
protected slots:
! void addEntry(QString name, QString cmdline, UserMenuProc::ExecType execType, bool separateStderr,
! bool acceptURLs, bool acceptRemote, bool showEverywhere, QStringList showIn = 0);
private:
QStringList _entries;
};
--- 79,88 ----
protected slots:
! void addEntry( QString name, QString cmdline, UserMenuProc::ExecType execType, bool separateStderr,
! bool acceptURLs, bool acceptRemote, bool showEverywhere, QStringList showIn = 0 );
private:
QStringList _entries;
+ UserMenuAddImpl *_addgui;
};
***************
*** 93,96 ****
--- 96,100 ----
typedef struct UserMenuCmd {
QString expression;
+ QString description;
EXPANDER expFunc;
}
***************
*** 98,103 ****
class UserMenu : public QWidget {
- #define NUM_EXPS 1
-
Q_OBJECT
public:
--- 102,105 ----
***************
*** 116,125 ****
UserMenu( QWidget *parent = 0, const char *name = 0 );
protected:
static QString expPath( const QString& str );
private:
! UserMenuGui _popup;
! static UMCmd _expressions[ NUM_EXPS ];
};
--- 118,130 ----
UserMenu( QWidget *parent = 0, const char *name = 0 );
+
+ static const int numOfExps = 1;
+ static UMCmd expressions[ numOfExps ];
+
protected:
static QString expPath( const QString& str );
private:
! UserMenuGui* _popup;
};
|
|
From: <er...@us...> - 2003-12-27 13:21:59
|
Update of /cvsroot/krusader/krusader_kde3/krusader/UserMenu
In directory sc8-pr-cvs1:/tmp/cvs-serv16576/krusader/UserMenu
Modified Files:
usermenuaddimpl.h
Log Message:
finished the 'add entry' gui
Index: usermenuaddimpl.h
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/krusader/UserMenu/usermenuaddimpl.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** usermenuaddimpl.h 26 Dec 2003 15:35:44 -0000 1.2
--- usermenuaddimpl.h 27 Dec 2003 13:21:54 -0000 1.3
***************
*** 29,33 ****
Q_OBJECT
public:
! UserMenuAddImpl(QWidget *parent=0, const char *name=0);
~UserMenuAddImpl();
--- 29,33 ----
Q_OBJECT
public:
! UserMenuAddImpl(UserMenu *menu, QWidget *parent=0, const char *name=0);
~UserMenuAddImpl();
***************
*** 36,39 ****
--- 36,40 ----
void accept();
void popupAddMenu();
+ void addShowInFolder();
signals:
|
|
From: <ck...@us...> - 2003-12-26 21:44:27
|
Update of /cvsroot/krusader/krusader_kde3/krusader In directory sc8-pr-cvs1:/tmp/cvs-serv24463/krusader_kde3/krusader Modified Files: krusader.cpp Log Message: FIXED: compile error Index: krusader.cpp =================================================================== RCS file: /cvsroot/krusader/krusader_kde3/krusader/krusader.cpp,v retrieving revision 1.49 retrieving revision 1.50 diff -C2 -d -r1.49 -r1.50 *** krusader.cpp 26 Dec 2003 15:33:47 -0000 1.49 --- krusader.cpp 26 Dec 2003 21:44:23 -0000 1.50 *************** *** 112,115 **** --- 112,116 ---- KAction *Krusader::actCombine = 0; KAction *Krusader::actUserMenu = 0; + KAction *Krusader::actSyncDirs = 0; KToggleAction *Krusader::actToggleTerminal = 0; UserMenu *Krusader::userMenu = 0; |
|
From: <er...@us...> - 2003-12-26 15:37:19
|
Update of /cvsroot/krusader/krusader_kde3/krusader/UserMenu
In directory sc8-pr-cvs1:/tmp/cvs-serv1378/krusader/UserMenu
Modified Files:
usermenu.cpp
Log Message:
Index: usermenu.cpp
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/krusader/UserMenu/usermenu.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** usermenu.cpp 26 Dec 2003 13:28:14 -0000 1.8
--- usermenu.cpp 26 Dec 2003 15:37:16 -0000 1.9
***************
*** 17,20 ****
--- 17,21 ----
#include "usermenu.h"
+ #include "usermenuaddimpl.h"
#include "../krusaderview.h"
#include "../krusader.h"
***************
*** 173,177 ****
int idx = exec();
if ( idx == -1 ) return QString::null; // nothing was selected
! if ( idx == 0 ) return QString::null; // todo: insert gui here
// idx is {1..n} while _entries is {0..n-1}X2
--- 174,185 ----
int idx = exec();
if ( idx == -1 ) return QString::null; // nothing was selected
! if ( idx == 0 ) {
! UserMenuAddImpl *addgui = new UserMenuAddImpl(this);
! connect(addgui, SIGNAL(newEntry(QString, QString, UserMenuProc::ExecType, bool, bool, bool, bool, QStringList )),
! this, SLOT(addEntry(QString, QString, UserMenuProc::ExecType, bool, bool, bool, bool, QStringList )));
! addgui->exec();
! delete addgui;
! return QString::null;
! }
// idx is {1..n} while _entries is {0..n-1}X2
***************
*** 179,182 ****
--- 187,195 ----
// the command part of the {description,command} pair
return _entries[ ( idx -1 ) * 2 + 1 ];
+ }
+
+ void UserMenuGui::addEntry(QString name, QString cmdline, UserMenuProc::ExecType execType, bool separateStderr,
+ bool acceptURLs, bool acceptRemote, bool showEverywhere, QStringList showIn = 0) {
+ kdWarning() << "UserMenuGui::addEntry" << endl;
}
|
|
From: <er...@us...> - 2003-12-26 15:36:52
|
Update of /cvsroot/krusader/krusader_kde3/krusader/UserMenu
In directory sc8-pr-cvs1:/tmp/cvs-serv1281/krusader/UserMenu
Modified Files:
usermenu.h
Log Message:
Index: usermenu.h
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/krusader/UserMenu/usermenu.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** usermenu.h 23 Dec 2003 21:55:41 -0000 1.7
--- usermenu.h 26 Dec 2003 15:36:47 -0000 1.8
***************
*** 76,79 ****
--- 76,83 ----
void readEntries();
+ protected slots:
+ void addEntry(QString name, QString cmdline, UserMenuProc::ExecType execType, bool separateStderr,
+ bool acceptURLs, bool acceptRemote, bool showEverywhere, QStringList showIn = 0);
+
private:
QStringList _entries;
|
|
From: <er...@us...> - 2003-12-26 15:35:47
|
Update of /cvsroot/krusader/krusader_kde3/krusader/UserMenu
In directory sc8-pr-cvs1:/tmp/cvs-serv1146/krusader/UserMenu
Modified Files:
usermenuaddimpl.h
Log Message:
Index: usermenuaddimpl.h
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/krusader/UserMenu/usermenuaddimpl.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** usermenuaddimpl.h 26 Dec 2003 13:28:14 -0000 1.1
--- usermenuaddimpl.h 26 Dec 2003 15:35:44 -0000 1.2
***************
*** 21,34 ****
#include <qwidget.h>
#include <usermenuadd.h>
! /**
! *@author Shie Erlich & Rafi Yanai
! */
class UserMenuAddImpl : public UserMenuAdd {
Q_OBJECT
! public:
UserMenuAddImpl(QWidget *parent=0, const char *name=0);
~UserMenuAddImpl();
};
--- 21,46 ----
#include <qwidget.h>
#include <usermenuadd.h>
+ #include <qstringlist.h>
+ #include "usermenu.h"
! class KPopupMenu;
class UserMenuAddImpl : public UserMenuAdd {
Q_OBJECT
! public:
UserMenuAddImpl(QWidget *parent=0, const char *name=0);
~UserMenuAddImpl();
+
+
+ public slots:
+ void accept();
+ void popupAddMenu();
+
+ signals:
+ void newEntry(QString name, QString cmdline, UserMenuProc::ExecType execType, bool separateStderr,
+ bool acceptURLs, bool acceptRemote, bool showEverywhere, QStringList showIn = 0);
+
+ private:
+ KPopupMenu *_popup, *_activeSub, *_otherSub;
};
|
|
From: <er...@us...> - 2003-12-26 15:35:21
|
Update of /cvsroot/krusader/krusader_kde3/krusader/UserMenu
In directory sc8-pr-cvs1:/tmp/cvs-serv1062/krusader/UserMenu
Modified Files:
usermenuaddimpl.cpp
Log Message:
Index: usermenuaddimpl.cpp
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/krusader/UserMenu/usermenuaddimpl.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** usermenuaddimpl.cpp 26 Dec 2003 13:28:14 -0000 1.1
--- usermenuaddimpl.cpp 26 Dec 2003 15:35:18 -0000 1.2
***************
*** 17,23 ****
--- 17,45 ----
#include "usermenuaddimpl.h"
+ #include <klocale.h>
+ #include <qtoolbutton.h>
+
+ #define EXECUTABLE_ID 10
UserMenuAddImpl::UserMenuAddImpl(QWidget *parent, const char *name ) : UserMenuAdd(parent,name) {
+ // create the 'add' popup menu
+ _popup = new KPopupMenu(this);
+ _activeSub = new KPopupMenu(_popup);
+ _otherSub = new KPopupMenu(_popup);
+
+ _popup->insertItem(i18n("Active panel"), _activeSub);
+ _popup->insertItem(i18n("Other panel"), _otherSub);
+ _popup->insertItem(i18n("Executable"), EXECUTABLE_ID);
}
UserMenuAddImpl::~UserMenuAddImpl(){
+ }
+
+ void UserMenuAddImpl::accept() {
+ emit newEntry("testname", "test cmdline", UserMenuProc::Terminal, false,
+ false, false, false);
+ UserMenuAdd::accept();
+ }
+
+ void UserMenuAddImpl::popupAddMenu() {
+ _popup->exec(mapToGlobal(QPoint(addButton->pos().x()+addButton->width(), addButton->pos().y())));
}
|
|
From: <er...@us...> - 2003-12-26 15:34:52
|
Update of /cvsroot/krusader/krusader_kde3/krusader
In directory sc8-pr-cvs1:/tmp/cvs-serv968/krusader
Modified Files:
krslots.cpp
Log Message:
fix: user menu is now static
Index: krslots.cpp
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/krusader/krslots.cpp,v
retrieving revision 1.38
retrieving revision 1.39
diff -C2 -d -r1.38 -r1.39
*** krslots.cpp 18 Dec 2003 23:05:40 -0000 1.38
--- krslots.cpp 26 Dec 2003 15:34:49 -0000 1.39
***************
*** 662,667 ****
void KRslots::userMenu() {
! UserMenu um;
! um.exec();
}
--- 662,668 ----
void KRslots::userMenu() {
! //UserMenu um;
! //um.exec();
! krApp->userMenu->exec();
}
|
|
From: <er...@us...> - 2003-12-26 15:34:26
|
Update of /cvsroot/krusader/krusader_kde3/krusader
In directory sc8-pr-cvs1:/tmp/cvs-serv935/krusader
Modified Files:
krusader.h
Log Message:
fix: user menu is now static
Index: krusader.h
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/krusader/krusader.h,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** krusader.h 12 Dec 2003 21:35:13 -0000 1.17
--- krusader.h 26 Dec 2003 15:34:23 -0000 1.18
***************
*** 10,16 ****
The main application ! what's more to say ?
***************************************************************************
!
A
!
db dD d8888b. db db .d8888. .d8b. d8888b. d88888b d8888b.
88 ,8P' 88 `8D 88 88 88' YP d8' `8b 88 `8D 88' 88 `8D
--- 10,16 ----
The main application ! what's more to say ?
***************************************************************************
!
A
!
db dD d8888b. db db .d8888. .d8b. d8888b. d88888b d8888b.
88 ,8P' 88 `8D 88 88 88' YP d8' `8b 88 `8D 88' 88 `8D
***************
*** 55,58 ****
--- 55,59 ----
class KIconLoader;
class KSystemTray;
+ class UserMenu;
class Krusader : public KParts::MainWindow {
***************
*** 100,107 ****
static KAction *actKonfigurator, *actToolsSetup, *actBack, *actRoot, *actFind, *actDirUp;
static KAction *actSelectColorMask, *actMultiRename, *actAllFilter, *actOpenLeftBm, *actOpenRightBm;
! static KAction *actNewTab, *actDupTab, *actCloseTab, *actSplit, *actCombine, *actUserMenu;
static KToggleAction *actToggleTerminal;
KToggleAction *actToggleFnkeys, *actToggleCmdline, *actShowToolBar, *actToggleSwapPanels,
! *actShowStatusBar, *actToggleHidden, *actCompareDirs, *actSyncDirs;
// return a path to a temp dir or file we can use.
--- 101,108 ----
static KAction *actKonfigurator, *actToolsSetup, *actBack, *actRoot, *actFind, *actDirUp;
static KAction *actSelectColorMask, *actMultiRename, *actAllFilter, *actOpenLeftBm, *actOpenRightBm;
! static KAction *actNewTab, *actDupTab, *actCloseTab, *actSplit, *actCombine, *actUserMenu, *actSyncDirs;
static KToggleAction *actToggleTerminal;
KToggleAction *actToggleFnkeys, *actToggleCmdline, *actShowToolBar, *actToggleSwapPanels,
! *actShowStatusBar, *actToggleHidden, *actCompareDirs;
// return a path to a temp dir or file we can use.
***************
*** 117,120 ****
--- 118,122 ----
KRslots *slot;
KAccel *accels; // global accelerators
+ static UserMenu *userMenu;
signals:
|
|
From: <er...@us...> - 2003-12-26 15:33:51
|
Update of /cvsroot/krusader/krusader_kde3/krusader
In directory sc8-pr-cvs1:/tmp/cvs-serv869/krusader
Modified Files:
krusader.cpp
Log Message:
fix: user menu is static now
Index: krusader.cpp
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/krusader/krusader.cpp,v
retrieving revision 1.48
retrieving revision 1.49
diff -C2 -d -r1.48 -r1.49
*** krusader.cpp 13 Dec 2003 23:19:58 -0000 1.48
--- krusader.cpp 26 Dec 2003 15:33:47 -0000 1.49
***************
*** 48,52 ****
#include <qprinter.h>
#include <qprogressdialog.h>
! #include <qvaluelist.h>
#include <qwhatsthis.h>
// Krusader includes
--- 48,52 ----
#include <qprinter.h>
#include <qprogressdialog.h>
! #include <qvaluelist.h>
#include <qwhatsthis.h>
// Krusader includes
***************
*** 68,71 ****
--- 68,72 ----
#include "krslots.h"
#include "krservices.h"
+ #include "UserMenu/usermenu.h"
// define the static members
***************
*** 111,116 ****
KAction *Krusader::actCombine = 0;
KAction *Krusader::actUserMenu = 0;
-
KToggleAction *Krusader::actToggleTerminal = 0;
bool showTrayIcon = false;
--- 112,117 ----
KAction *Krusader::actCombine = 0;
KAction *Krusader::actUserMenu = 0;
KToggleAction *Krusader::actToggleTerminal = 0;
+ UserMenu *Krusader::userMenu = 0;
bool showTrayIcon = false;
***************
*** 174,177 ****
--- 175,181 ----
mainView = new KrusaderView( this );
mainView->start(leftPath, rightPath);
+
+ // create the user menu
+ userMenu = new UserMenu(this);
// setup keyboard accelerators
|
Update of /cvsroot/krusader/krusader_kde3/krusader/UserMenu
In directory sc8-pr-cvs1:/tmp/cvs-serv16105/krusader/UserMenu
Modified Files:
Makefile.am usermenu.cpp usermenuadd.ui
Added Files:
usermenuaddimpl.cpp usermenuaddimpl.h
Log Message:
--- NEW FILE: usermenuaddimpl.cpp ---
/***************************************************************************
usermenuaddimpl.cpp - description
-------------------
begin : Fri Dec 26 2003
copyright : (C) 2003 by Shie Erlich & Rafi Yanai
email :
***************************************************************************/
/***************************************************************************
* *
* 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. *
* *
***************************************************************************/
#include "usermenuaddimpl.h"
UserMenuAddImpl::UserMenuAddImpl(QWidget *parent, const char *name ) : UserMenuAdd(parent,name) {
}
UserMenuAddImpl::~UserMenuAddImpl(){
}
--- NEW FILE: usermenuaddimpl.h ---
/***************************************************************************
usermenuaddimpl.h - description
-------------------
begin : Fri Dec 26 2003
copyright : (C) 2003 by Shie Erlich & Rafi Yanai
email :
***************************************************************************/
/***************************************************************************
* *
* 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. *
* *
***************************************************************************/
#ifndef USERMENUADDIMPL_H
#define USERMENUADDIMPL_H
#include <qwidget.h>
#include <usermenuadd.h>
/**
*@author Shie Erlich & Rafi Yanai
*/
class UserMenuAddImpl : public UserMenuAdd {
Q_OBJECT
public:
UserMenuAddImpl(QWidget *parent=0, const char *name=0);
~UserMenuAddImpl();
};
#endif
Index: Makefile.am
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/krusader/UserMenu/Makefile.am,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Makefile.am 6 Dec 2003 13:14:00 -0000 1.1
--- Makefile.am 26 Dec 2003 13:28:14 -0000 1.2
***************
*** 6,13 ****
libUserMenu_a_METASOURCES = AUTO
! libUserMenu_a_SOURCES = usermenu.cpp
! EXTRA_DIST = usermenu.cpp usermenu.h
####### kdevelop will overwrite this part!!! (end)############
--- 6,13 ----
libUserMenu_a_METASOURCES = AUTO
! libUserMenu_a_SOURCES = usermenuaddimpl.cpp usermenuadd.ui usermenu.cpp
! EXTRA_DIST = usermenu.cpp usermenu.h usermenuadd.ui usermenuaddimpl.cpp usermenuaddimpl.h
####### kdevelop will overwrite this part!!! (end)############
Index: usermenu.cpp
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/krusader/UserMenu/usermenu.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** usermenu.cpp 23 Dec 2003 21:55:22 -0000 1.7
--- usermenu.cpp 26 Dec 2003 13:28:14 -0000 1.8
***************
*** 27,41 ****
/**
!
Command: %xYYY%
x - can be either 'a' for active panel, or 'o' for other panel
YYY - the specific command
!
For example:
%ap% - active panel path
%op% - other panel path
!
In the following commands, we'll use '_' instead of 'a'/'o'. Please substitute as needed.
!
%_p% - panel path
%_c% - current file (or folder). Note: current != selected
--- 27,41 ----
/**
!
Command: %xYYY%
x - can be either 'a' for active panel, or 'o' for other panel
YYY - the specific command
!
For example:
%ap% - active panel path
%op% - other panel path
!
In the following commands, we'll use '_' instead of 'a'/'o'. Please substitute as needed.
!
%_p% - panel path
%_c% - current file (or folder). Note: current != selected
***************
*** 49,53 ****
%_and% - number of folders
%_fm% - filter mask (for example: *, *.cpp, *.h etc.)
!
*/
UMCmd UserMenu::_expressions[ NUM_EXPS ] = {
--- 49,53 ----
%_and% - number of folders
%_fm% - filter mask (for example: *, *.cpp, *.h etc.)
!
*/
UMCmd UserMenu::_expressions[ NUM_EXPS ] = {
***************
*** 75,79 ****
// ............... run the cmd from the shell .............
! QString save = getcwd( 0, 0 );
//===> chdir( panelPath.local8Bit() ); // run the command in the panel's path
--- 75,79 ----
// ............... run the cmd from the shell .............
! //QString save = getcwd( 0, 0 );
//===> chdir( panelPath.local8Bit() ); // run the command in the panel's path
Index: usermenuadd.ui
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/krusader/UserMenu/usermenuadd.ui,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** usermenuadd.ui 26 Dec 2003 12:19:11 -0000 1.1
--- usermenuadd.ui 26 Dec 2003 13:28:14 -0000 1.2
***************
*** 10,14 ****
<y>0</y>
<width>572</width>
! <height>476</height>
</rect>
</property>
--- 10,14 ----
<y>0</y>
<width>572</width>
! <height>520</height>
</rect>
</property>
***************
*** 37,75 ****
<cstring>unnamed</cstring>
</property>
! <widget class="QLabel" row="0" column="0">
! <property name="name">
! <cstring>textLabel1</cstring>
! </property>
! <property name="text">
! <string>Command line</string>
! </property>
! </widget>
! <widget class="KLineEdit" row="1" column="0">
! <property name="name">
! <cstring>cmdLine</cstring>
! </property>
! </widget>
! <widget class="QToolButton" row="1" column="1">
! <property name="name">
! <cstring>addButton</cstring>
! </property>
! <property name="sizePolicy">
! <sizepolicy>
! <hsizetype>0</hsizetype>
! <vsizetype>1</vsizetype>
! <horstretch>0</horstretch>
! <verstretch>0</verstretch>
! </sizepolicy>
! </property>
! <property name="text">
! <string>Add</string>
! </property>
! </widget>
! <widget class="QButtonGroup" row="2" column="0" rowspan="1" colspan="2">
<property name="name">
! <cstring>buttonGroup1_3</cstring>
</property>
<property name="title">
! <string>Execution mode</string>
</property>
<grid>
--- 37,46 ----
<cstring>unnamed</cstring>
</property>
! <widget class="QButtonGroup" row="6" column="0" rowspan="1" colspan="3">
<property name="name">
! <cstring>buttonGroup1</cstring>
</property>
<property name="title">
! <string>Show this entry</string>
</property>
<grid>
***************
*** 77,121 ****
<cstring>unnamed</cstring>
</property>
! <widget class="QRadioButton" row="1" column="0">
<property name="name">
! <cstring>collectOutput</cstring>
</property>
<property name="text">
! <string>Collect output</string>
</property>
</widget>
! <widget class="QRadioButton" row="0" column="0">
<property name="name">
! <cstring>runInTerminal</cstring>
</property>
<property name="text">
! <string>Run in terminal</string>
! </property>
! <property name="checked">
! <bool>true</bool>
</property>
</widget>
! <widget class="QRadioButton" row="2" column="0">
<property name="name">
! <cstring>noOutput</cstring>
</property>
! <property name="text">
! <string>No output collection</string>
</property>
</widget>
! <widget class="QCheckBox" row="0" column="1" rowspan="3" colspan="1">
<property name="name">
! <cstring>separateStderr</cstring>
</property>
<property name="enabled">
<bool>false</bool>
</property>
<property name="text">
! <string>Separate standard error</string>
</property>
</widget>
</grid>
</widget>
! <widget class="QButtonGroup" row="3" column="0" rowspan="1" colspan="2">
<property name="name">
<cstring>buttonGroup1_2</cstring>
--- 48,100 ----
<cstring>unnamed</cstring>
</property>
! <widget class="QRadioButton" row="0" column="0" rowspan="1" colspan="2">
<property name="name">
! <cstring>showEverywhere</cstring>
</property>
<property name="text">
! <string>everywhere</string>
! </property>
! <property name="checked">
! <bool>true</bool>
</property>
</widget>
! <widget class="QRadioButton" row="1" column="0">
<property name="name">
! <cstring>showOnlyIn</cstring>
</property>
<property name="text">
! <string>only in</string>
</property>
</widget>
! <widget class="KLineEdit" row="1" column="1">
<property name="name">
! <cstring>showIn</cstring>
</property>
! <property name="enabled">
! <bool>false</bool>
</property>
</widget>
! <widget class="QToolButton" row="1" column="2">
<property name="name">
! <cstring>toolButton2</cstring>
</property>
<property name="enabled">
<bool>false</bool>
</property>
+ <property name="sizePolicy">
+ <sizepolicy>
+ <hsizetype>0</hsizetype>
+ <vsizetype>1</vsizetype>
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
<property name="text">
! <string>Add</string>
</property>
</widget>
</grid>
</widget>
! <widget class="QButtonGroup" row="5" column="0" rowspan="1" colspan="3">
<property name="name">
<cstring>buttonGroup1_2</cstring>
***************
*** 157,166 ****
</grid>
</widget>
! <widget class="QButtonGroup" row="4" column="0" rowspan="1" colspan="2">
<property name="name">
! <cstring>buttonGroup1</cstring>
</property>
<property name="title">
! <string>Show this entry</string>
</property>
<grid>
--- 136,145 ----
</grid>
</widget>
! <widget class="QButtonGroup" row="4" column="0" rowspan="1" colspan="3">
<property name="name">
! <cstring>buttonGroup1_3</cstring>
</property>
<property name="title">
! <string>Execution mode</string>
</property>
<grid>
***************
*** 168,219 ****
<cstring>unnamed</cstring>
</property>
! <widget class="QRadioButton" row="0" column="0" rowspan="1" colspan="2">
<property name="name">
! <cstring>showEverywhere</cstring>
</property>
<property name="text">
! <string>everywhere</string>
! </property>
! <property name="checked">
! <bool>true</bool>
</property>
</widget>
! <widget class="QRadioButton" row="1" column="0">
<property name="name">
! <cstring>showOnlyIn</cstring>
</property>
<property name="text">
! <string>only in</string>
</property>
</widget>
! <widget class="KLineEdit" row="1" column="1">
<property name="name">
! <cstring>showIn</cstring>
</property>
! <property name="enabled">
! <bool>true</bool>
</property>
</widget>
! <widget class="QToolButton" row="1" column="2">
<property name="name">
! <cstring>toolButton2</cstring>
</property>
<property name="enabled">
! <bool>true</bool>
! </property>
! <property name="sizePolicy">
! <sizepolicy>
! <hsizetype>0</hsizetype>
! <vsizetype>1</vsizetype>
! <horstretch>0</horstretch>
! <verstretch>0</verstretch>
! </sizepolicy>
</property>
<property name="text">
! <string>Add</string>
</property>
</widget>
</grid>
</widget>
</grid>
</widget>
--- 147,232 ----
<cstring>unnamed</cstring>
</property>
! <widget class="QRadioButton" row="1" column="0">
<property name="name">
! <cstring>collectOutput</cstring>
</property>
<property name="text">
! <string>Collect output</string>
</property>
</widget>
! <widget class="QRadioButton" row="0" column="0">
<property name="name">
! <cstring>runInTerminal</cstring>
</property>
<property name="text">
! <string>Run in terminal</string>
! </property>
! <property name="checked">
! <bool>true</bool>
</property>
</widget>
! <widget class="QRadioButton" row="2" column="0">
<property name="name">
! <cstring>noOutput</cstring>
</property>
! <property name="text">
! <string>No output collection</string>
</property>
</widget>
! <widget class="QCheckBox" row="0" column="1" rowspan="3" colspan="1">
<property name="name">
! <cstring>separateStderr</cstring>
</property>
<property name="enabled">
! <bool>false</bool>
</property>
<property name="text">
! <string>Separate standard error</string>
</property>
</widget>
</grid>
</widget>
+ <widget class="QToolButton" row="3" column="2">
+ <property name="name">
+ <cstring>addButton</cstring>
+ </property>
+ <property name="sizePolicy">
+ <sizepolicy>
+ <hsizetype>0</hsizetype>
+ <vsizetype>1</vsizetype>
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="text">
+ <string>Add</string>
+ </property>
+ </widget>
+ <widget class="QLabel" row="2" column="0" rowspan="1" colspan="2">
+ <property name="name">
+ <cstring>textLabel1</cstring>
+ </property>
+ <property name="text">
+ <string>Command line</string>
+ </property>
+ </widget>
+ <widget class="QLabel" row="0" column="0">
+ <property name="name">
+ <cstring>textLabel1_2</cstring>
+ </property>
+ <property name="text">
+ <string>Name</string>
+ </property>
+ </widget>
+ <widget class="KLineEdit" row="3" column="0" rowspan="1" colspan="2">
+ <property name="name">
+ <cstring>cmdLine</cstring>
+ </property>
+ </widget>
+ <widget class="KLineEdit" row="1" column="0">
+ <property name="name">
+ <cstring>cmdName</cstring>
+ </property>
+ </widget>
</grid>
</widget>
***************
*** 286,292 ****
--- 299,333 ----
<slot>setEnabled(bool)</slot>
</connection>
+ <connection>
+ <sender>showOnlyIn</sender>
+ <signal>toggled(bool)</signal>
+ <receiver>showIn</receiver>
+ <slot>setEnabled(bool)</slot>
+ </connection>
+ <connection>
+ <sender>showOnlyIn</sender>
+ <signal>toggled(bool)</signal>
+ <receiver>toolButton2</receiver>
+ <slot>setEnabled(bool)</slot>
+ </connection>
+ <connection>
+ <sender>cancelButton</sender>
+ <signal>clicked()</signal>
+ <receiver>UserMenuAdd</receiver>
+ <slot>reject()</slot>
+ </connection>
+ <connection>
+ <sender>okButton</sender>
+ <signal>clicked()</signal>
+ <receiver>UserMenuAdd</receiver>
+ <slot>accept()</slot>
+ </connection>
</connections>
+ <slots>
+ <slot>saveEntry()</slot>
+ </slots>
<layoutdefaults spacing="6" margin="11"/>
<includehints>
+ <includehint>klineedit.h</includehint>
<includehint>klineedit.h</includehint>
<includehint>klineedit.h</includehint>
|
|
From: <er...@us...> - 2003-12-26 12:19:16
|
Update of /cvsroot/krusader/krusader_kde3/krusader/UserMenu
In directory sc8-pr-cvs1:/tmp/cvs-serv7751/krusader/UserMenu
Added Files:
usermenuadd.ui
Log Message:
--- NEW FILE: usermenuadd.ui ---
<!DOCTYPE UI><UI version="3.1" stdsetdef="1">
<class>UserMenuAdd</class>
<widget class="QDialog">
<property name="name">
<cstring>UserMenuAdd</cstring>
</property>
<property name="geometry">
<rect>
<x>0</x>
<y>0</y>
<width>572</width>
<height>476</height>
</rect>
</property>
<property name="caption">
<string>Add a new entry</string>
</property>
<grid>
<property name="name">
<cstring>unnamed</cstring>
</property>
<widget class="QGroupBox" row="0" column="0">
<property name="name">
<cstring>groupBox1</cstring>
</property>
<property name="frameShadow">
<enum>Sunken</enum>
</property>
<property name="title">
<string>Entry</string>
</property>
<property name="flat">
<bool>false</bool>
</property>
<grid>
<property name="name">
<cstring>unnamed</cstring>
</property>
<widget class="QLabel" row="0" column="0">
<property name="name">
<cstring>textLabel1</cstring>
</property>
<property name="text">
<string>Command line</string>
</property>
</widget>
<widget class="KLineEdit" row="1" column="0">
<property name="name">
<cstring>cmdLine</cstring>
</property>
</widget>
<widget class="QToolButton" row="1" column="1">
<property name="name">
<cstring>addButton</cstring>
</property>
<property name="sizePolicy">
<sizepolicy>
<hsizetype>0</hsizetype>
<vsizetype>1</vsizetype>
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string>Add</string>
</property>
</widget>
<widget class="QButtonGroup" row="2" column="0" rowspan="1" colspan="2">
<property name="name">
<cstring>buttonGroup1_3</cstring>
</property>
<property name="title">
<string>Execution mode</string>
</property>
<grid>
<property name="name">
<cstring>unnamed</cstring>
</property>
<widget class="QRadioButton" row="1" column="0">
<property name="name">
<cstring>collectOutput</cstring>
</property>
<property name="text">
<string>Collect output</string>
</property>
</widget>
<widget class="QRadioButton" row="0" column="0">
<property name="name">
<cstring>runInTerminal</cstring>
</property>
<property name="text">
<string>Run in terminal</string>
</property>
<property name="checked">
<bool>true</bool>
</property>
</widget>
<widget class="QRadioButton" row="2" column="0">
<property name="name">
<cstring>noOutput</cstring>
</property>
<property name="text">
<string>No output collection</string>
</property>
</widget>
<widget class="QCheckBox" row="0" column="1" rowspan="3" colspan="1">
<property name="name">
<cstring>separateStderr</cstring>
</property>
<property name="enabled">
<bool>false</bool>
</property>
<property name="text">
<string>Separate standard error</string>
</property>
</widget>
</grid>
</widget>
<widget class="QButtonGroup" row="3" column="0" rowspan="1" colspan="2">
<property name="name">
<cstring>buttonGroup1_2</cstring>
</property>
<property name="title">
<string>Command accepts</string>
</property>
<grid>
<property name="name">
<cstring>unnamed</cstring>
</property>
<widget class="QRadioButton" row="1" column="0" rowspan="1" colspan="2">
<property name="name">
<cstring>acceptLocalURLs</cstring>
</property>
<property name="text">
<string>Local files (URLs)</string>
</property>
</widget>
<widget class="QRadioButton" row="0" column="0">
<property name="name">
<cstring>acceptLocals</cstring>
</property>
<property name="text">
<string>Local files (no URLs)</string>
</property>
<property name="checked">
<bool>true</bool>
</property>
</widget>
<widget class="QRadioButton" row="2" column="0" rowspan="1" colspan="2">
<property name="name">
<cstring>acceptRemote</cstring>
</property>
<property name="text">
<string>Local and remote files (URLs)</string>
</property>
</widget>
</grid>
</widget>
<widget class="QButtonGroup" row="4" column="0" rowspan="1" colspan="2">
<property name="name">
<cstring>buttonGroup1</cstring>
</property>
<property name="title">
<string>Show this entry</string>
</property>
<grid>
<property name="name">
<cstring>unnamed</cstring>
</property>
<widget class="QRadioButton" row="0" column="0" rowspan="1" colspan="2">
<property name="name">
<cstring>showEverywhere</cstring>
</property>
<property name="text">
<string>everywhere</string>
</property>
<property name="checked">
<bool>true</bool>
</property>
</widget>
<widget class="QRadioButton" row="1" column="0">
<property name="name">
<cstring>showOnlyIn</cstring>
</property>
<property name="text">
<string>only in</string>
</property>
</widget>
<widget class="KLineEdit" row="1" column="1">
<property name="name">
<cstring>showIn</cstring>
</property>
<property name="enabled">
<bool>true</bool>
</property>
</widget>
<widget class="QToolButton" row="1" column="2">
<property name="name">
<cstring>toolButton2</cstring>
</property>
<property name="enabled">
<bool>true</bool>
</property>
<property name="sizePolicy">
<sizepolicy>
<hsizetype>0</hsizetype>
<vsizetype>1</vsizetype>
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string>Add</string>
</property>
</widget>
</grid>
</widget>
</grid>
</widget>
<widget class="QLayoutWidget" row="1" column="0">
<property name="name">
<cstring>layout3</cstring>
</property>
<hbox>
<property name="name">
<cstring>unnamed</cstring>
</property>
<spacer>
<property name="name">
<cstring>spacer2</cstring>
</property>
<property name="orientation">
<enum>Horizontal</enum>
</property>
<property name="sizeType">
<enum>Expanding</enum>
</property>
<property name="sizeHint">
<size>
<width>361</width>
<height>31</height>
</size>
</property>
</spacer>
<widget class="KPushButton">
<property name="name">
<cstring>okButton</cstring>
</property>
<property name="sizePolicy">
<sizepolicy>
<hsizetype>1</hsizetype>
<vsizetype>0</vsizetype>
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string>Ok</string>
</property>
</widget>
<widget class="KPushButton">
<property name="name">
<cstring>cancelButton</cstring>
</property>
<property name="sizePolicy">
<sizepolicy>
<hsizetype>1</hsizetype>
<vsizetype>0</vsizetype>
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string>Cancel</string>
</property>
</widget>
</hbox>
</widget>
</grid>
</widget>
<connections>
<connection>
<sender>collectOutput</sender>
<signal>toggled(bool)</signal>
<receiver>separateStderr</receiver>
<slot>setEnabled(bool)</slot>
</connection>
</connections>
<layoutdefaults spacing="6" margin="11"/>
<includehints>
<includehint>klineedit.h</includehint>
<includehint>klineedit.h</includehint>
<includehint>kpushbutton.h</includehint>
<includehint>kpushbutton.h</includehint>
</includehints>
</UI>
|
|
From: <er...@us...> - 2003-12-26 11:58:29
|
Update of /cvsroot/krusader/krusader_kde3/krusader/Panel
In directory sc8-pr-cvs1:/tmp/cvs-serv5091/krusader/Panel
Modified Files:
panelfunc.cpp
Log Message:
fixed: dirUp and goBack bugs
Index: panelfunc.cpp
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/krusader/Panel/panelfunc.cpp,v
retrieving revision 1.46
retrieving revision 1.47
diff -C2 -d -r1.46 -r1.47
*** panelfunc.cpp 25 Dec 2003 23:55:35 -0000 1.46
--- panelfunc.cpp 26 Dec 2003 11:58:26 -0000 1.47
***************
*** 205,209 ****
void ListPanelFunc::openUrl( const KURL& url,const QString& nameToMakeCurrent) {
! kdDebug() << "openUrl: " << url.url() << endl;
// check for special cases:
--- 205,209 ----
void ListPanelFunc::openUrl( const KURL& url,const QString& nameToMakeCurrent) {
! //kdDebug() << "openUrl: " << url.url() << endl;
// check for special cases:
***************
*** 242,246 ****
delete vfsP;
vfsP = v; // v != 0 so this is safe
! }
if( vfsP->vfs_refresh(u) ) break; // we have a valid refreshed URL now
}
--- 242,246 ----
delete vfsP;
vfsP = v; // v != 0 so this is safe
! }
if( vfsP->vfs_refresh(u) ) break; // we have a valid refreshed URL now
}
***************
*** 264,268 ****
urlStack.pop();
! openUrl( urlStack.top() );
if ( urlStack.isEmpty() ) krBack->setEnabled( false );
--- 264,268 ----
urlStack.pop();
! openUrl( urlStack.top(), files()->vfs_getOrigin().fileName());
if ( urlStack.isEmpty() ) krBack->setEnabled( false );
***************
*** 670,674 ****
void ListPanelFunc::dirUp() {
! openUrl(files()->vfs_getOrigin().upURL());
}
--- 670,674 ----
void ListPanelFunc::dirUp() {
! openUrl(files()->vfs_getOrigin().upURL(), files()->vfs_getOrigin().fileName());
}
|
|
From: <ya...@us...> - 2003-12-26 00:00:59
|
Update of /cvsroot/krusader/krusader_kde3/krusader/Search
In directory sc8-pr-cvs1:/tmp/cvs-serv20652/krusader/Search
Modified Files:
krsearchmod.cpp
Log Message:
adjusted to the new VFS API
Index: krsearchmod.cpp
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/krusader/Search/krsearchmod.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** krsearchmod.cpp 9 Dec 2003 23:05:57 -0000 1.8
--- krsearchmod.cpp 26 Dec 2003 00:00:56 -0000 1.9
***************
*** 236,250 ****
}
! ftp_vfs *v = new ftp_vfs(url,0);
- if ( v->vfs_error() ){
- kdWarning() << "Failed to open vfs: " << archive.local8Bit() << endl;
- delete v;
- return;
- }
emit searching(archive);
- while(v->isBusy()) qApp->processEvents();
! unScanedUrls.push(v->vfs_getOrigin());
while( !unScanedUrls.isEmpty() ) scanURL(v,unScanedUrls.pop());
delete v;
--- 236,244 ----
}
! ftp_vfs *v = new ftp_vfs(0);
emit searching(archive);
! unScanedUrls.push(url);
while( !unScanedUrls.isEmpty() ) scanURL(v,unScanedUrls.pop());
delete v;
***************
*** 253,258 ****
void KRSearchMod::scanURL( ftp_vfs* v, KURL url){
if( !v->vfs_refresh(url) ) return;
-
- while(v->isBusy()) qApp->processEvents();
if( scanedDirs.contains(v->vfs_getOrigin().url() ) ) return; // don't re-scan urls..
--- 247,250 ----
|
|
From: <ya...@us...> - 2003-12-26 00:00:59
|
Update of /cvsroot/krusader/krusader_kde3/krusader/Synchronizer
In directory sc8-pr-cvs1:/tmp/cvs-serv20652/krusader/Synchronizer
Modified Files:
synchronizer.cpp
Log Message:
adjusted to the new VFS API
Index: synchronizer.cpp
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/krusader/Synchronizer/synchronizer.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** synchronizer.cpp 21 Dec 2003 19:04:45 -0000 1.7
--- synchronizer.cpp 26 Dec 2003 00:00:55 -0000 1.8
***************
*** 188,225 ****
vfs *v;
- bool isNormalVFS;
if( url.startsWith( "/" ) || url.startsWith( "file:/" )) /* is it normal vfs? */
{
! v = new normal_vfs(url,0);
! isNormalVFS = true;
}
else /* ftp vfs */
{
! v = new ftp_vfs(url,0);
! isNormalVFS = false;
! }
!
! if ( v->vfs_error() )
! {
! KMessageBox::error(0, i18n("Error at opening URL:%1!").arg( url ));
! delete v;
! return 0;
}
! bool result = true;
!
! if( isNormalVFS )
! result = v->vfs_refresh( url );
! else
! {
! while( ((ftp_vfs *)v)->isBusy() )
! {
! qApp->processEvents();
! qApp->eventLoop()->processEvents( QEventLoop::AllEvents|QEventLoop::WaitForMore);
! }
! }
! if ( !result || v->vfs_error() )
{
KMessageBox::error(0, i18n("Error at opening URL:%1!").arg( url ));
--- 188,204 ----
vfs *v;
if( url.startsWith( "/" ) || url.startsWith( "file:/" )) /* is it normal vfs? */
{
! v = new normal_vfs(0);
}
else /* ftp vfs */
{
! v = new ftp_vfs(0);
}
! bool result = v->vfs_refresh( url );
! if ( !result )
{
KMessageBox::error(0, i18n("Error at opening URL:%1!").arg( url ));
|
Update of /cvsroot/krusader/krusader_kde3/krusader/VFS
In directory sc8-pr-cvs1:/tmp/cvs-serv19819/krusader/VFS
Modified Files:
arc_vfs.cpp ftp_vfs.cpp ftp_vfs.h krvfshandler.cpp
krvfshandler.h normal_vfs.cpp normal_vfs.h temp_vfs.cpp
vfs.cpp vfs.h
Log Message:
Major code clean up and re-write of the refresh mechanism
Index: arc_vfs.cpp
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/krusader/VFS/arc_vfs.cpp,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** arc_vfs.cpp 9 Dec 2003 23:05:58 -0000 1.14
--- arc_vfs.cpp 25 Dec 2003 23:56:54 -0000 1.15
***************
*** 468,472 ****
if (!quietMode) emit startUpdate();
- if (!quietMode) emit endUpdate();
return true;
}
--- 468,471 ----
Index: ftp_vfs.cpp
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/krusader/VFS/ftp_vfs.cpp,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -d -r1.22 -r1.23
*** ftp_vfs.cpp 9 Dec 2003 23:05:58 -0000 1.22
--- ftp_vfs.cpp 25 Dec 2003 23:56:54 -0000 1.23
***************
*** 35,38 ****
--- 35,39 ----
#include <qregexp.h>
#include <qtimer.h>
+ #include <qeventloop.h>
// KDE includes
#include <kmimetype.h>
***************
*** 52,62 ****
#include "../resources.h"
! template <class X> void kr_swap(X &a, X &b){
! X t = a;
! a = b;
! b = t;
! }
!
! ftp_vfs::ftp_vfs(const KURL& origin,QWidget* panel):vfs(panel),busy(false){
// set the writable attribute
isWritable = true;
--- 53,57 ----
#include "../resources.h"
! ftp_vfs::ftp_vfs(QObject* panel):vfs(panel),busy(false){
// set the writable attribute
isWritable = true;
***************
*** 64,119 ****
vfs_filesP = &vfs_files;
vfs_files.setAutoDelete(true);
- vfs_filesP2 = &vfs_files2;
- vfs_files2.setAutoDelete(true);
- notConnected = true;
-
- KURL url = separateUserAndPassword( origin.url() );
vfs_type = FTP;
- vfs_origin = url;
-
- vfs_refresh(vfs_origin);
- }
-
- KURL ftp_vfs::separateUserAndPassword( QString origin )
- {
- // breakdown the url;
- /* FIXME: untill KDE fixes the bug we have to check for
- passwords and users with @ in them... */
- bool bugfix = origin.find("@") != origin.findRev("@");
- if(bugfix){
- if(origin.find(":") != origin.findRev(":")){
- int passStart = origin.find( ":",origin.find(":")+1 )+1;
- int passLen = origin.findRev("@")-passStart;
- password = origin.mid(passStart,passLen);
- origin = origin.remove(passStart-1,passLen+1);
- }
- if(origin.find("@") != origin.findRev("@")){
- int usrStart = origin.find( "/" )+1;
- if(origin.at(usrStart) == '/') ++usrStart;
- int usrLen = origin.findRev("@")-usrStart;
- loginName = origin.mid(usrStart,usrLen);
- origin = origin.remove(usrStart,usrLen+1);
- }
- }
- KURL url = origin;
- port = url.port();
- if(loginName.isEmpty()) loginName = url.user();
- if(password.isEmpty()) password = url.pass();
- if(bugfix){
- url.setPass(password);
- url.setUser(loginName);
- }
-
- return url;
}
void ftp_vfs::slotAddFiles(KIO::Job *, const KIO::UDSEntryList& entries){
- // remove trailing "/"
- //if(vfs_origin.right(1) == "/" ) vfs_origin = vfs_origin.left(vfs_origin.length()-1);
- // but don't turn ftp://server/ to ftp://server !
- //if(vfs_origin.find("/",vfs_origin.find(":/")+3) < 0 )
- // vfs_origin = vfs_origin+"/";
-
KIO::UDSEntryListConstIterator it = entries.begin();
KIO::UDSEntryListConstIterator end = entries.end();
--- 59,67 ----
***************
*** 150,195 ****
// update the origin
vfs_origin = url;
- vfs_origin = KURL::decode_string(url.prettyURL());
- password = url.pass();
- loginName = url.user();
- port = url.port();
}
void ftp_vfs::slotListResult(KIO::Job *job){
! if( job && job->error()){
QString msg= KIO::buildErrorString(job->error(),vfs_origin.prettyURL());
! if ( !msg.isEmpty() && !quietMode )
! KMessageBox::sorry(krApp,msg);
! if( notConnected ){ // no option to revert
! error = true;
! if( !quietMode ) emit startUpdate();
! }
! else {
! kr_swap(vfs_filesP2,vfs_filesP);
! vfs_origin=origin_backup;
}
- busy = false;
- return;
}
- // if we got so far - so good
- notConnected = false;
busy = false;
! // tell the panel to get ready
! if (!quietMode) {
! emit startUpdate();
! emit endUpdate();
! }
}
bool ftp_vfs::vfs_refresh(const KURL& origin) {
error = false;
- KURL url = separateUserAndPassword( origin.url() );
QString errorMsg = QString::null;
! if ( url.isMalformed() )
! errorMsg = i18n("Malformed URL:\n%1").arg(url.url());
! if( !KProtocolInfo::supportsListing(url) )
! errorMsg = i18n("Protocol not supported by Krusader:\n%1").arg(url.url());
if( !errorMsg.isEmpty() ){
--- 98,145 ----
// update the origin
vfs_origin = url;
}
void ftp_vfs::slotListResult(KIO::Job *job){
! if( job && job->error()){
! // we failed to refresh
QString msg= KIO::buildErrorString(job->error(),vfs_origin.prettyURL());
! // display error message
! if ( !msg.isEmpty() && !quietMode ) KMessageBox::sorry(krApp,msg);
! error = true;
! }
! else {
! // if we got so far - so good
! error = false;
! // tell the panel to refresh
! if (!quietMode) {
! emit startUpdate();
}
}
busy = false;
+ }
! void ftp_vfs::startLister() {
! // Open the directory marked by origin
! krConfig->setGroup("Look&Feel");
! KIO::Job *job = new KIO::ListJob(vfs_origin,false,false,QString::null,
! krConfig->readBoolEntry("Show Hidden",_ShowHidden));
! connect(job,SIGNAL(entries(KIO::Job*,const KIO::UDSEntryList&)),
! this,SLOT(slotAddFiles(KIO::Job*,const KIO::UDSEntryList&)));
! connect(job,SIGNAL(redirection(KIO::Job*,const KURL&)),
! this,SLOT(slotRedirection(KIO::Job*,const KURL&)));
! connect(job,SIGNAL(result(KIO::Job*)),
! this,SLOT(slotListResult(KIO::Job*)));
!
! if( !quietMode ) new KrProgress(job);
}
bool ftp_vfs::vfs_refresh(const KURL& origin) {
error = false;
QString errorMsg = QString::null;
! if ( origin.isMalformed() )
! errorMsg = i18n("Malformed URL:\n%1").arg(origin.url());
! if( !KProtocolInfo::supportsListing(origin) )
! errorMsg = i18n("Protocol not supported by Krusader:\n%1").arg(origin.url());
if( !errorMsg.isEmpty() ){
***************
*** 200,226 ****
busy = true;
-
- if( !loginName.isEmpty()) url.setUser(loginName);
- if( !password.isEmpty() ) url.setPass(password);
// clear the the list and back up out current situation
! vfs_filesP2->clear();
! kr_swap(vfs_filesP2,vfs_filesP);
! origin_backup = vfs_origin;
vfs_origin = origin;
- vfs_origin = url;
! // Open the directory marked by origin
! krConfig->setGroup("Look&Feel");
! KIO::Job *job = new KIO::ListJob(url,false,false,QString::null,
! krConfig->readBoolEntry("Show Hidden",_ShowHidden));
! connect(job,SIGNAL(entries(KIO::Job*,const KIO::UDSEntryList&)),
! this,SLOT(slotAddFiles(KIO::Job*,const KIO::UDSEntryList&)));
! connect(job,SIGNAL(redirection(KIO::Job*,const KURL&)),
! this,SLOT(slotRedirection(KIO::Job*,const KURL&)));
! connect(job,SIGNAL(result(KIO::Job*)),
! this,SLOT(slotListResult(KIO::Job*)));
! if( !quietMode ) new KrProgress(job);
return true;
--- 150,167 ----
busy = true;
// clear the the list and back up out current situation
! vfs_files.clear();
vfs_origin = origin;
! //QTimer::singleShot( 0,this,SLOT(startLister()) );
! startLister();
! while( 0 && busy ){
! qApp->processEvents();
! qApp->eventLoop()->processEvents( QEventLoop::AllEvents|QEventLoop::WaitForMore);
! }
!
! if( error ) return false;
return true;
***************
*** 231,241 ****
void ftp_vfs::vfs_addFiles(KURL::List *fileUrls,KIO::CopyJob::CopyMode mode,QObject* toNotify,QString dir){
KURL destUrl = vfs_origin;
- if(dir != "") destUrl.addPath(dir);
- destUrl.setUser(loginName);
- destUrl.setPass(password);
- if ( port ) destUrl.setPort(port);
-
KIO::Job* job = new KIO::CopyJob(*fileUrls,destUrl,mode,false,true );
connect(job,SIGNAL(result(KIO::Job*)),this,SLOT(vfs_refresh(KIO::Job*)) );
--- 172,178 ----
void ftp_vfs::vfs_addFiles(KURL::List *fileUrls,KIO::CopyJob::CopyMode mode,QObject* toNotify,QString dir){
KURL destUrl = vfs_origin;
+ if(dir != "") destUrl.addPath(dir);
KIO::Job* job = new KIO::CopyJob(*fileUrls,destUrl,mode,false,true );
connect(job,SIGNAL(result(KIO::Job*)),this,SLOT(vfs_refresh(KIO::Job*)) );
***************
*** 246,264 ****
// remove a file from the vfs (physical)
void ftp_vfs::vfs_delFiles(QStringList *fileNames){
! KURL::List filesUrls;
! KURL url;
! // names -> urls
! for(uint i=0 ; i<fileNames->count(); ++i){
! QString filename = (*fileNames)[i];
! url = vfs_origin;
url.addPath(filename);
- url.setUser(loginName);
- url.setPass(password);
- if ( port ) url.setPort(port);
filesUrls.append( url );
! }
! KIO::Job *job = new KIO::DeleteJob(filesUrls, false, true);
! connect(job,SIGNAL(result(KIO::Job*)),this,SLOT(vfs_refresh(KIO::Job*)));
}
--- 183,198 ----
// remove a file from the vfs (physical)
void ftp_vfs::vfs_delFiles(QStringList *fileNames){
! KURL::List filesUrls;
! KURL url;
! // names -> urls
! for(uint i=0 ; i<fileNames->count(); ++i){
! QString filename = (*fileNames)[i];
! url = vfs_origin;
url.addPath(filename);
filesUrls.append( url );
! }
! KIO::Job *job = new KIO::DeleteJob(filesUrls, false, true);
! connect(job,SIGNAL(result(KIO::Job*)),this,SLOT(vfs_refresh(KIO::Job*)));
}
***************
*** 269,275 ****
for(QStringList::Iterator name = names->begin(); name != names->end(); ++name){
url = vfs_getFile(*name);
- url.setUser(loginName);
- url.setPass(password);
- if ( port ) url.setPort(port);
urls->append(url);
}
--- 203,206 ----
***************
*** 280,290 ****
// return a path to the file
KURL ftp_vfs::vfs_getFile(const QString& name){
! KURL url = vfs_origin;
!
! url.addPath(name);
! url.setUser(loginName);
! url.setPass(password);
! if ( port ) url.setPort(port);
return url;
--- 211,217 ----
// return a path to the file
KURL ftp_vfs::vfs_getFile(const QString& name){
! KURL url = vfs_origin;
! url.addPath(name);
return url;
***************
*** 293,330 ****
void ftp_vfs::vfs_mkdir(const QString& name){
KURL url = vfs_origin;
! url.addPath(name);
! url.setUser(loginName);
! url.setPass(password);
! if ( port ) url.setPort(port);
! KIO::SimpleJob* job = KIO::mkdir(url);
! connect(job,SIGNAL(result(KIO::Job*)),this,SLOT(vfs_refresh(KIO::Job*)));
}
-
void ftp_vfs::vfs_rename(const QString& fileName,const QString& newName){
KURL::List fileUrls;
! KURL url = vfs_origin;
! url.addPath(fileName) ;
! url.setUser(loginName);
! url.setPass(password);
! fileUrls.append(url);
! KURL dest = vfs_origin;
! dest.addPath(newName);
! dest.setUser(loginName);
! dest.setPass(password);
! if ( port ) dest.setPort(port);
! KIO::Job *job = new KIO::CopyJob(fileUrls,dest,KIO::CopyJob::Move,false,true );
connect(job,SIGNAL(result(KIO::Job*)),this,SLOT(vfs_refresh(KIO::Job*)));
}
QString ftp_vfs::vfs_workingDir(){
! QString ret = vfs_origin.prettyURL();
! if ( !password.isEmpty() ) ret.replace(QRegExp("@"),":"+password+"@");
! return ret;
}
!
#include "ftp_vfs.moc"
--- 220,251 ----
void ftp_vfs::vfs_mkdir(const QString& name){
KURL url = vfs_origin;
! url.addPath(name);
! KIO::SimpleJob* job = KIO::mkdir(url);
! connect(job,SIGNAL(result(KIO::Job*)),this,SLOT(vfs_refresh(KIO::Job*)));
}
void ftp_vfs::vfs_rename(const QString& fileName,const QString& newName){
KURL::List fileUrls;
! KURL oldUrl = vfs_origin;
! oldUrl.addPath(fileName) ;
! fileUrls.append(oldUrl);
! KURL newUrl = vfs_origin;
! newUrl.addPath(newName);
! KIO::Job *job = new KIO::CopyJob(fileUrls,newUrl,KIO::CopyJob::Move,false,true );
connect(job,SIGNAL(result(KIO::Job*)),this,SLOT(vfs_refresh(KIO::Job*)));
}
QString ftp_vfs::vfs_workingDir(){
! return vfs_origin.url(-1);
}
!
! // to be implemented
! void ftp_vfs::vfs_calcSpace(QString ,KIO::filesize_t*,unsigned long*,unsigned long*, bool*){
!
! }
!
#include "ftp_vfs.moc"
Index: ftp_vfs.h
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/krusader/VFS/ftp_vfs.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** ftp_vfs.h 9 Dec 2003 23:05:58 -0000 1.8
--- ftp_vfs.h 25 Dec 2003 23:56:54 -0000 1.9
***************
*** 42,46 ****
public:
// the constructor simply uses the inherited constructor
! ftp_vfs(const KURL& origin,QWidget* panel);
~ftp_vfs(){}
--- 42,46 ----
public:
// the constructor simply uses the inherited constructor
! ftp_vfs(QObject* panel);
~ftp_vfs(){}
***************
*** 59,68 ****
/// Calculate the amount of space occupied by a file or directory (recursive).
/// Not implemted (yet) in ftp_vfs
! virtual void vfs_calcSpace(QString name ,KIO::filesize_t *totalSize,unsigned long *totalFiles,unsigned long *totalDirs, bool * stop = 0){};
/// Return the VFS working dir
QString vfs_workingDir();
- /// Return true while the VFS is refreshing itself
- inline bool isBusy(){ return busy; }
public slots:
--- 59,66 ----
/// Calculate the amount of space occupied by a file or directory (recursive).
/// Not implemted (yet) in ftp_vfs
! virtual void vfs_calcSpace(QString name ,KIO::filesize_t *totalSize,unsigned long *totalFiles,unsigned long *totalDirs, bool * stop = 0);
/// Return the VFS working dir
QString vfs_workingDir();
public slots:
***************
*** 76,93 ****
bool vfs_refresh(const KURL& origin);
protected:
QList<vfile> vfs_files; //< List of pointers to vfile.
! QList<vfile> vfs_files2; //< The second list of pointers to vfiles.
! QList<vfile> *vfs_filesP2; //< pointer to the second list
KURL origin_backup; //< used to backup the old URL when refreshing to a new one,
- bool notConnected;
-
- QString loginName;
- QString password;
- QString hostName;
- int port;
-
- KURL separateUserAndPassword( QString origin );
bool busy;
};
--- 74,85 ----
bool vfs_refresh(const KURL& origin);
+ void startLister();
+
protected:
QList<vfile> vfs_files; //< List of pointers to vfile.
! //QList<vfile> vfs_files2; //< The second list of pointers to vfiles.
! //QList<vfile> *vfs_filesP2; //< pointer to the second list
KURL origin_backup; //< used to backup the old URL when refreshing to a new one,
bool busy;
};
Index: krvfshandler.cpp
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/krusader/VFS/krvfshandler.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** krvfshandler.cpp 10 Dec 2003 20:37:46 -0000 1.1
--- krvfshandler.cpp 25 Dec 2003 23:56:54 -0000 1.2
***************
*** 17,20 ****
--- 17,28 ----
#include "krvfshandler.h"
+ #include "normal_vfs.h"
+ #include "temp_vfs.h"
+ #include "ftp_vfs.h"
+
+ #include <qdir.h>
+
+ #include <kdebug.h>
+
KrVfsHandler::KrVfsHandler(){
***************
*** 24,28 ****
vfs::VFS_TYPE KrVfsHandler::getVfsType(const KURL& url){
! if(url.isLocalFile() ) return vfs::NORMAL;
else{
if(url.protocol() == "virt") return vfs::VIRT;
--- 32,38 ----
vfs::VFS_TYPE KrVfsHandler::getVfsType(const KURL& url){
! if( url.isLocalFile() || QDir(url.path(-1)).exists() ){
! return vfs::NORMAL;
! }
else{
if(url.protocol() == "virt") return vfs::VIRT;
***************
*** 32,40 ****
}
! vfs* KrVfsHandler::getVfs(const KURL& url,vfs* oldVfs){
vfs::VFS_TYPE newType,oldType = vfs::ERROR;
if(oldVfs) oldType = oldVfs->vfs_getType();
! return 0;
}
--- 42,63 ----
}
! vfs* KrVfsHandler::getVfs(const KURL& url,QObject* parent,vfs* oldVfs){
vfs::VFS_TYPE newType,oldType = vfs::ERROR;
+
if(oldVfs) oldType = oldVfs->vfs_getType();
+ newType = getVfsType(url);
+
+ vfs* newVfs = oldVfs;
! if( oldType != newType ){
! switch( newType ){
! case (vfs::NORMAL) : newVfs = new normal_vfs(parent); break;
! case (vfs::FTP ) : newVfs = new ftp_vfs(parent) ; break;
! // case (vfs::TEMP ) : newVfs = new temp_vfs(parent) ; break;
! case (vfs::ERROR ) : newVfs = 0 ; break;
! }
! }
!
! return newVfs;
}
Index: krvfshandler.h
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/krusader/VFS/krvfshandler.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** krvfshandler.h 10 Dec 2003 20:37:46 -0000 1.1
--- krvfshandler.h 25 Dec 2003 23:56:54 -0000 1.2
***************
*** 35,39 ****
static vfs::VFS_TYPE getVfsType(const KURL& url);
! static vfs* getVfs(const KURL& url,vfs* oldVfs);
};
--- 35,39 ----
static vfs::VFS_TYPE getVfsType(const KURL& url);
! static vfs* getVfs(const KURL& url,QObject* parent=0,vfs* oldVfs=0);
};
Index: normal_vfs.cpp
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/krusader/VFS/normal_vfs.cpp,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** normal_vfs.cpp 9 Dec 2003 23:05:58 -0000 1.20
--- normal_vfs.cpp 25 Dec 2003 23:56:54 -0000 1.21
***************
*** 56,64 ****
#include "../resources.h"
! normal_vfs::normal_vfs(QString url,QWidget* panel):vfs(panel){
vfs_filesP = &vfs_files;
vfs_files.setAutoDelete(true);
- vfs_origin = KURL::fromPathOrURL(url);
vfs_type=NORMAL;
--- 56,63 ----
#include "../resources.h"
! normal_vfs::normal_vfs(QObject* panel):vfs(panel){
vfs_filesP = &vfs_files;
vfs_files.setAutoDelete(true);
vfs_type=NORMAL;
***************
*** 94,101 ****
// set the origin...
vfs_origin = origin;
vfs_origin.cleanPath();
// clear the the list
vfs_files.clear();
-
DIR* dir = opendir(path.local8Bit());
--- 93,100 ----
// set the origin...
vfs_origin = origin;
+ vfs_origin.setProtocol("file"); // do not remove !
vfs_origin.cleanPath();
// clear the the list
vfs_files.clear();
DIR* dir = opendir(path.local8Bit());
***************
*** 105,110 ****
chdir(path.local8Bit());
- if (!quietMode) emit startUpdate();
-
struct dirent* dirEnt;
QString name;
--- 104,107 ----
***************
*** 150,154 ****
closedir(dir);
! if (!quietMode) emit endUpdate();
watcher.startScan();
--- 147,151 ----
closedir(dir);
! if (!quietMode) emit startUpdate();
watcher.startScan();
Index: normal_vfs.h
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/krusader/VFS/normal_vfs.h,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** normal_vfs.h 9 Dec 2003 23:05:58 -0000 1.10
--- normal_vfs.h 25 Dec 2003 23:56:54 -0000 1.11
***************
*** 49,53 ****
public:
// the constructor simply uses the inherited constructor
! normal_vfs(QString origin,QWidget* panel);
~normal_vfs(){}
--- 49,53 ----
public:
// the constructor simply uses the inherited constructor
! normal_vfs(QObject* panel);
~normal_vfs(){}
Index: temp_vfs.cpp
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/krusader/VFS/temp_vfs.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** temp_vfs.cpp 9 Dec 2003 23:05:58 -0000 1.5
--- temp_vfs.cpp 25 Dec 2003 23:56:54 -0000 1.6
***************
*** 41,45 ****
temp_vfs::temp_vfs( QString origin, QString type, QWidget* panel, bool ):
! normal_vfs(origin,panel){
vfs_type=TEMP;
// first we need to create a temp diretory
--- 41,45 ----
temp_vfs::temp_vfs( QString origin, QString type, QWidget* panel, bool ):
! normal_vfs(panel){
vfs_type=TEMP;
// first we need to create a temp diretory
***************
*** 51,60 ****
// then we must get the files from the origin to the tmp dir
! if( type == "-arj" || type == "-ace" )
! handleAceArj(origin,type);
! else if( type == "-rpm" )
! handleRpm(origin);
! else if( type == "-iso" )
! handleIso(origin);
else{
if (!quietMode) KMessageBox::error(krApp,"Unknown temp_vfs type.");
--- 51,57 ----
// then we must get the files from the origin to the tmp dir
! if( type == "-arj" || type == "-ace" ) handleAceArj(origin,type);
! else if( type == "-rpm" ) handleRpm(origin);
! else if( type == "-iso" ) handleIso(origin);
else{
if (!quietMode) KMessageBox::error(krApp,"Unknown temp_vfs type.");
Index: vfs.cpp
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/krusader/VFS/vfs.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** vfs.cpp 9 Dec 2003 23:05:58 -0000 1.4
--- vfs.cpp 25 Dec 2003 23:56:54 -0000 1.5
***************
*** 40,44 ****
if ( panel ){
connect(this,SIGNAL(startUpdate()),panel,SLOT(slotStartUpdate()));
- connect(this,SIGNAL(endUpdate()),panel,SLOT(slotEndUpdate()));
}
else quietMode = true;
--- 40,43 ----
Index: vfs.h
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/krusader/VFS/vfs.h,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** vfs.h 9 Dec 2003 23:05:58 -0000 1.9
--- vfs.h 25 Dec 2003 23:56:54 -0000 1.10
***************
*** 107,111 ****
signals:
void startUpdate(); //< emitted when the VFS starts to refresh its list of vfiles.
- void endUpdate(); //< emmitted when the the vfile list is stable.
protected:
--- 107,110 ----
|
7 messages has been excluded from this view by a project administrator.
