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: <ya...@us...> - 2003-09-20 17:04:59
|
Update of /cvsroot/krusader/krusader_kde3/krusader/KViewer
In directory sc8-pr-cvs1:/tmp/cvs-serv9100/krusader/KViewer
Modified Files:
krviewer.cpp
Log Message:
Removed a compilation warning
Index: krviewer.cpp
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/krusader/KViewer/krviewer.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** krviewer.cpp 20 Sep 2003 13:46:37 -0000 1.8
--- krviewer.cpp 20 Sep 2003 17:04:56 -0000 1.9
***************
*** 127,131 ****
void KrViewer::view(KURL url){
! QString mimetype = KMimeType::findByURL( url )->name();
KrViewer* viewer = new KrViewer(krApp);
--- 127,131 ----
void KrViewer::view(KURL url){
! //QString mimetype = KMimeType::findByURL( url )->name();
KrViewer* viewer = new KrViewer(krApp);
***************
*** 246,250 ****
int bufSize = ((fileSize-address) > 16)? 16 : (fileSize-address);
in.readRawBytes(buf,bufSize);
! fprintf(out,"0x%8.8lx: ",address);
for(int i=0; i<4; ++i){
if(i<(bufSize/4)) fprintf(out,"%8.8x ",pBuff[i]);
--- 246,250 ----
int bufSize = ((fileSize-address) > 16)? 16 : (fileSize-address);
in.readRawBytes(buf,bufSize);
! fprintf(out,"0x%8.8llx: ",address);
for(int i=0; i<4; ++i){
if(i<(bufSize/4)) fprintf(out,"%8.8x ",pBuff[i]);
***************
*** 252,256 ****
}
fprintf(out,"| ");
- /*fprintf(out,"0x%8.8lx: %8.8x %8.8x %8.8x %8.8x | ",address,pBuff[0],pBuff[1],pBuff[2],pBuff[3]); */
for(int i=0; i<bufSize; ++i){
--- 252,255 ----
|
|
From: <ya...@us...> - 2003-09-20 17:02:11
|
Update of /cvsroot/krusader/krusader_kde3/krusader
In directory sc8-pr-cvs1:/tmp/cvs-serv8579/krusader
Modified Files:
krslots.cpp krslots.h krusader.cpp
Log Message:
Added SHIFT-F3 view dialog
Index: krslots.cpp
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/krusader/krslots.cpp,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** krslots.cpp 20 Sep 2003 11:25:22 -0000 1.16
--- krslots.cpp 20 Sep 2003 17:02:06 -0000 1.17
***************
*** 44,47 ****
--- 44,48 ----
#include <kedittoolbar.h>
#include <kdeversion.h>
+ #include <KViewer/krviewer.h>
// Krusader includes
#include "krslots.h"
***************
*** 395,398 ****
--- 396,409 ----
// F9
void KRslots::rename() { ACTIVE_FUNC->rename(); }
+
+ // Shift F3
+ void KRslots::viewDlg(){
+ // ask the user for a url to view
+ KChooseDir *chooser = new KChooseDir( 0,i18n("Enter a URL to view:"), QString::null);
+ QString dest = chooser->dest;
+ if ( dest == QString::null ) return ; // the usr canceled
+ else KrViewer::view( KURL::fromPathOrURL(dest) ); // view the file
+ // nothing more to it!
+ }
#include "krslots.moc"
Index: krslots.h
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/krusader/krslots.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** krslots.h 18 Sep 2003 15:33:29 -0000 1.8
--- krslots.h 20 Sep 2003 17:02:06 -0000 1.9
***************
*** 112,115 ****
--- 112,117 ----
// F3
void view();
+ // Shift F3
+ void viewDlg();
// F4
void edit();
Index: krusader.cpp
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/krusader/krusader.cpp,v
retrieving revision 1.30
retrieving revision 1.31
diff -C2 -d -r1.30 -r1.31
*** krusader.cpp 18 Sep 2003 15:33:29 -0000 1.30
--- krusader.cpp 20 Sep 2003 17:02:06 -0000 1.31
***************
*** 268,271 ****
--- 268,274 ----
accels->insert( "F3_View", i18n( "F3 View" ), QString::null,
Key_F3, SLOTS, SLOT( view() ) );
+ // SHIFT+F3
+ accels->insert( "F3_ViewDlg", i18n( "F3 View Dialog" ), QString::null,
+ SHIFT+Key_F3, SLOTS, SLOT( viewDlg() ) );
// F4
accels->insert( "F4_Edit", i18n( "F4 Edit" ), QString::null,
|
|
From: <ya...@us...> - 2003-09-20 16:48:39
|
Update of /cvsroot/krusader/krusader_kde3/krusader/VFS
In directory sc8-pr-cvs1:/tmp/cvs-serv6344/krusader/VFS
Modified Files:
normal_vfs.cpp
Log Message:
Force a refresh after creating a new directory.
Index: normal_vfs.cpp
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/krusader/VFS/normal_vfs.cpp,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** normal_vfs.cpp 20 Sep 2003 13:46:37 -0000 1.18
--- normal_vfs.cpp 20 Sep 2003 16:48:36 -0000 1.19
***************
*** 214,218 ****
if (!QDir(vfs_workingDir()).mkdir(name))
if (!quietMode) KMessageBox::sorry(krApp,i18n("Can't create a directory check your permissions."));
! else vfs_refresh(vfs_origin);
}
--- 214,218 ----
if (!QDir(vfs_workingDir()).mkdir(name))
if (!quietMode) KMessageBox::sorry(krApp,i18n("Can't create a directory check your permissions."));
! vfs_refresh(vfs_origin);
}
|
|
From: <ck...@us...> - 2003-09-20 16:07:38
|
Update of /cvsroot/krusader/krusader_kde3/krusader/Panel
In directory sc8-pr-cvs1:/tmp/cvs-serv32036/krusader_kde3/krusader/Panel
Modified Files:
krdetailedview.cpp krdetailedview.h
Log Message:
Fixing the single click and double click turmoil at file renaming.
Index: krdetailedview.cpp
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/krusader/Panel/krdetailedview.cpp,v
retrieving revision 1.38
retrieving revision 1.39
diff -C2 -d -r1.38 -r1.39
*** krdetailedview.cpp 20 Sep 2003 12:17:54 -0000 1.38
--- krdetailedview.cpp 20 Sep 2003 16:07:33 -0000 1.39
***************
*** 79,84 ****
i18n( "Owner" ), i18n( "Group" ) };
! QString KrDetailedView::LastSelectedItem = "";
! void * KrDetailedView::LastSelectingView = 0;
KrDetailedView::KrDetailedView( QWidget *parent, bool left, KConfig *cfg, const char *name ) :
--- 79,85 ----
i18n( "Owner" ), i18n( "Group" ) };
! QString KrDetailedView::LastSelectedItem = "";
! void * KrDetailedView::LastSelectingView;
! KrRenameTimerObject * KrDetailedView::WaitedTimer = 0;
KrDetailedView::KrDetailedView( QWidget *parent, bool left, KConfig *cfg, const char *name ) :
***************
*** 96,100 ****
_columns[ i ] = Unused;
! LastSelectedItem = ""; LastSelectingView = 0;
/////////////////////////////// listview ////////////////////////////////////
--- 97,101 ----
_columns[ i ] = Unused;
! LastSelectedItem = ""; LastSelectingView = 0; WaitedTimer = 0;
/////////////////////////////// listview ////////////////////////////////////
***************
*** 373,376 ****
--- 374,390 ----
}
+ void KrDetailedView::renameTimerExpired( KrRenameTimerObject *object, QRect rect )
+ {
+ delete object;
+ if( WaitedTimer == object )
+ {
+ if( rect.contains( QCursor::pos() ) )
+ {
+ LastSelectedItem = ""; LastSelectingView = 0; WaitedTimer = 0;
+ emit renameCurrentItem();
+ }
+ }
+ }
+
void KrDetailedView::slotClicked( QListViewItem *item ) {
if ( !item )
***************
*** 384,393 ****
} else {
if( tmp == LastSelectedItem && (void *)this == LastSelectingView ) {
! LastSelectedItem = ""; LastSelectingView = 0;
! emit renameCurrentItem();
}
else {
LastSelectedItem = tmp;
LastSelectingView = (void *)this;
}
}
--- 398,413 ----
} else {
if( tmp == LastSelectedItem && (void *)this == LastSelectingView ) {
! QRect itemRect = item->listView()->itemRect(item);
! QPoint topLeft = item->listView()->viewport()->mapToGlobal( QPoint( 0, 0) );
!
! itemRect.moveBy( topLeft.x(), topLeft.y() );
!
! WaitedTimer = new KrRenameTimerObject( this, itemRect );
! WaitedTimer->start( 500 );
}
else {
LastSelectedItem = tmp;
LastSelectingView = (void *)this;
+ WaitedTimer = 0;
}
}
***************
*** 395,398 ****
--- 415,419 ----
void KrDetailedView::slotDoubleClicked( QListViewItem *item ) {
+ LastSelectedItem = ""; LastSelectingView = 0; WaitedTimer = 0;
KConfigGroupSaver grpSvr( _config, nameInKConfig() );
if ( !_config->readBoolEntry( "Single Click Selects", _SingleClickSelects ) ) {
***************
*** 643,646 ****
--- 664,670 ----
int c;
QString newName, fileName;
+
+ LastSelectedItem = ""; LastSelectingView = 0; WaitedTimer = 0;
+
KrViewItem *it = getCurrentKrViewItem();
if ( it )
***************
*** 719,723 ****
void KrDetailedView::setNameToMakeCurrent( QListViewItem * it ) {
! LastSelectedItem = ""; LastSelectingView = 0;
KrView::setNameToMakeCurrent( dynamic_cast<KrViewItem*>( it ) ->name() );
}
--- 743,747 ----
void KrDetailedView::setNameToMakeCurrent( QListViewItem * it ) {
! LastSelectedItem = ""; LastSelectingView = 0; WaitedTimer = 0;
KrView::setNameToMakeCurrent( dynamic_cast<KrViewItem*>( it ) ->name() );
}
Index: krdetailedview.h
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/krusader/Panel/krdetailedview.h,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** krdetailedview.h 20 Sep 2003 12:17:54 -0000 1.13
--- krdetailedview.h 20 Sep 2003 16:07:33 -0000 1.14
***************
*** 35,41 ****
--- 35,43 ----
#include <klocale.h>
#include <qwidget.h>
+ #include <qtimer.h>
#include "krview.h"
class QDragMoveEvent;
+ class KrRenameTimerObject;
/**
***************
*** 67,70 ****
--- 69,73 ----
void makeItemVisible( const KrViewItem *item ) { ensureItemVisible( dynamic_cast<const QListViewItem*>( item ) ); }
void setCurrentItem( const QString& name );
+ void renameTimerExpired( KrRenameTimerObject *object, QRect rect );
virtual void updateView() { triggerUpdate(); emit selectionChanged(); }
virtual void clear();
***************
*** 118,125 ****
--- 121,155 ----
static QString LastSelectedItem;
static void * LastSelectingView;
+ static KrRenameTimerObject * WaitedTimer;
bool _withIcons, _focused;
KrViewItem *_currDragItem;
QString _nameInKConfig;
bool _left;
+ };
+
+ class KrRenameTimerObject : public QObject
+ {
+ Q_OBJECT
+ private:
+ KrDetailedView *detailed_view;
+ QRect rectangle;
+
+ public:
+ KrRenameTimerObject( KrDetailedView *caller_view, QRect rect )
+ {
+ detailed_view = caller_view;
+ rectangle = rect;
+ }
+
+ void start( int msec )
+ {
+ QTimer::singleShot( msec, this, SLOT( expired() ) );
+ }
+
+ public slots:
+ void expired()
+ {
+ detailed_view->renameTimerExpired( this, rectangle );
+ }
};
|
|
From: <ya...@us...> - 2003-09-20 13:46:42
|
Update of /cvsroot/krusader/krusader_kde3/krusader/Search
In directory sc8-pr-cvs1:/tmp/cvs-serv10702/krusader/Search
Modified Files:
krsearchmod.cpp
Log Message:
Replaced stat with KDE_stat & struct stat with KDE_struct_stat (large file support)
Index: krsearchmod.cpp
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/krusader/Search/krsearchmod.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** krsearchmod.cpp 20 Sep 2003 10:16:51 -0000 1.4
--- krsearchmod.cpp 20 Sep 2003 13:46:37 -0000 1.5
***************
*** 47,50 ****
--- 47,51 ----
#include <qtextstream.h>
#include <qregexp.h>
+ #include <klargefile.h>
#include <kmimetype.h>
***************
*** 128,133 ****
url.setPath(dir+name);
! struct stat stat_p;
! lstat(dir.local8Bit()+name.local8Bit(),&stat_p);
if( query->recurse ){
if( S_ISLNK(stat_p.st_mode) && query->followLinks ){
--- 129,134 ----
url.setPath(dir+name);
! KDE_struct_stat stat_p;
! KDE_lstat(dir.local8Bit()+name.local8Bit(),&stat_p);
if( query->recurse ){
if( S_ISLNK(stat_p.st_mode) && query->followLinks ){
|
|
From: <ya...@us...> - 2003-09-20 13:46:42
|
Update of /cvsroot/krusader/krusader_kde3/krusader/KViewer
In directory sc8-pr-cvs1:/tmp/cvs-serv10702/krusader/KViewer
Modified Files:
krviewer.cpp
Log Message:
Replaced stat with KDE_stat & struct stat with KDE_struct_stat (large file support)
Index: krviewer.cpp
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/krusader/KViewer/krviewer.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** krviewer.cpp 20 Sep 2003 09:55:00 -0000 1.7
--- krviewer.cpp 20 Sep 2003 13:46:37 -0000 1.8
***************
*** 31,34 ****
--- 31,35 ----
#include <kstatusbar.h>
#include <kdebug.h>
+ #include <klargefile.h>
// Krusader includes
#include "krviewer.h"
***************
*** 234,241 ****
QDataStream in( &f_in );
! FILE *out = fopen(tmpFile.name().mid(tmpFile.name().find("/")).latin1(),"w");
KIO::filesize_t fileSize = f_in.size();
! long address = 0;
char buf[16];
unsigned int* pBuff = (unsigned int*)buf;
--- 235,242 ----
QDataStream in( &f_in );
! FILE *out = KDE_fopen(tmpFile.name().mid(tmpFile.name().find("/")).latin1(),"w");
KIO::filesize_t fileSize = f_in.size();
! KIO::filesize_t address = 0;
char buf[16];
unsigned int* pBuff = (unsigned int*)buf;
|
|
From: <ya...@us...> - 2003-09-20 13:46:41
|
Update of /cvsroot/krusader/krusader_kde3 In directory sc8-pr-cvs1:/tmp/cvs-serv10702 Modified Files: krusader.kdevprj Log Message: Replaced stat with KDE_stat & struct stat with KDE_struct_stat (large file support) Index: krusader.kdevprj =================================================================== RCS file: /cvsroot/krusader/krusader_kde3/krusader.kdevprj,v retrieving revision 1.26 retrieving revision 1.27 diff -C2 -d -r1.26 -r1.27 *** krusader.kdevprj 19 Sep 2003 22:35:32 -0000 1.26 --- krusader.kdevprj 20 Sep 2003 13:46:36 -0000 1.27 *************** *** 20,28 **** addcxxflags=-DKDE_NO_COMPAT -DQT_NO_ASCII_CAST bin_program=krusader ! cflags=-DKDE_NO_COMPAT ! cppflags=-DKDE_NO_COMPAT cxxflags=\s-O0 -Wall ldadd=VFS/libVFS.a KViewer/libKViewer.a Dialogs/libDialogs.a BookMan/libBookMan.a -lm $(LIB_KPARTS) $(LIB_KFILE) $(LIB_KDEUI) $(LIB_KDECORE) $(LIB_QT) ! ldflags=\s \s [General] --- 20,28 ---- addcxxflags=-DKDE_NO_COMPAT -DQT_NO_ASCII_CAST bin_program=krusader ! cflags=-DKDE_NO_COMPAT\s ! cppflags=-DKDE_NO_COMPAT -D__USE_FILE_OFFSET64 -D_LFS64_LARGEFILE cxxflags=\s-O0 -Wall ldadd=VFS/libVFS.a KViewer/libKViewer.a Dialogs/libDialogs.a BookMan/libBookMan.a -lm $(LIB_KPARTS) $(LIB_KFILE) $(LIB_KDEUI) $(LIB_KDECORE) $(LIB_QT) ! ldflags=\s \s [General] |
|
From: <ya...@us...> - 2003-09-20 13:46:41
|
Update of /cvsroot/krusader/krusader_kde3/krArc
In directory sc8-pr-cvs1:/tmp/cvs-serv10702/krArc
Modified Files:
krarc.cpp
Log Message:
Replaced stat with KDE_stat & struct stat with KDE_struct_stat (large file support)
Index: krarc.cpp
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/krArc/krarc.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** krarc.cpp 24 Aug 2003 19:53:27 -0000 1.6
--- krarc.cpp 20 Sep 2003 13:46:37 -0000 1.7
***************
*** 258,263 ****
// we might be stating a real file
if( QFileInfo(path).exists() ){
! struct stat buff;
! ::stat( path.latin1(), &buff );
QString mime = KMimeType::findByPath(path,buff.st_mode)->name();
statEntry(KFileItem(path,mime,buff.st_mode).entry());
--- 258,263 ----
// we might be stating a real file
if( QFileInfo(path).exists() ){
! KDE_struct_stat buff;
! KDE_stat( path.latin1(), &buff );
QString mime = KMimeType::findByPath(path,buff.st_mode)->name();
statEntry(KFileItem(path,mime,buff.st_mode).entry());
|
|
From: <ya...@us...> - 2003-09-20 13:46:41
|
Update of /cvsroot/krusader/krusader_kde3/krusader/VFS
In directory sc8-pr-cvs1:/tmp/cvs-serv10702/krusader/VFS
Modified Files:
arc_vfs.cpp krpermhandler.cpp normal_vfs.cpp
Log Message:
Replaced stat with KDE_stat & struct stat with KDE_struct_stat (large file support)
Index: arc_vfs.cpp
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/krusader/VFS/arc_vfs.cpp,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** arc_vfs.cpp 19 Sep 2003 22:35:32 -0000 1.12
--- arc_vfs.cpp 20 Sep 2003 13:46:37 -0000 1.13
***************
*** 47,50 ****
--- 47,51 ----
#include <kmimetype.h>
#include <kcursor.h>
+ #include <klargefile.h>
// krusader includes
#include "arc_vfs.h"
***************
*** 494,502 ****
register struct dirent* dirEnt;
QString name;
! struct stat stat_p;
while( (dirEnt=readdir(dir)) != NULL ){
name = dirEnt->d_name;
if ( name == ".." || name == "." ) continue;
! if( lstat(tmpDir.local8Bit()+"/"+dir_name.local8Bit()+name.local8Bit(),&stat_p) ) continue;
extFile temp(dir_name+name,stat_p.st_mtime,stat_p.st_size);
// add to the list file that are diffrent than the ones packed
--- 495,503 ----
register struct dirent* dirEnt;
QString name;
! KDE_struct_stat stat_p;
while( (dirEnt=readdir(dir)) != NULL ){
name = dirEnt->d_name;
if ( name == ".." || name == "." ) continue;
! if( KDE_lstat(tmpDir.local8Bit()+"/"+dir_name.local8Bit()+name.local8Bit(),&stat_p) ) continue;
extFile temp(dir_name+name,stat_p.st_mtime,stat_p.st_size);
// add to the list file that are diffrent than the ones packed
***************
*** 549,557 ****
register struct dirent* dirEnt;
QString name;
! struct stat stat_p;
while( (dirEnt=readdir(dir)) != NULL ){
name = dirEnt->d_name;
if ( name == ".." || name == "." ) continue;
! if( lstat(tmpDir.local8Bit()+"/"+dir_name.local8Bit()+name.local8Bit(),&stat_p) ) continue;
extFile temp(dir_name+name,stat_p.st_mtime,stat_p.st_size);
// recurse on all sub dirs
--- 550,558 ----
register struct dirent* dirEnt;
QString name;
! KDE_struct_stat stat_p;
while( (dirEnt=readdir(dir)) != NULL ){
name = dirEnt->d_name;
if ( name == ".." || name == "." ) continue;
! if( KDE_lstat(tmpDir.local8Bit()+"/"+dir_name.local8Bit()+name.local8Bit(),&stat_p) ) continue;
extFile temp(dir_name+name,stat_p.st_mtime,stat_p.st_size);
// recurse on all sub dirs
***************
*** 755,760 ****
// parse gziped files
if(vfs_type == "gzip"){
! struct stat stat_p;
! stat(arcFile.local8Bit(),&stat_p);
nextWord(line);
--- 756,761 ----
// parse gziped files
if(vfs_type == "gzip"){
! KDE_struct_stat stat_p;
! KDE_stat(arcFile.local8Bit(),&stat_p);
nextWord(line);
***************
*** 771,776 ****
// parse bzip2ed files
if( vfs_type == "zip2" ){
! struct stat stat_p;
! stat(arcFile.local8Bit(),&stat_p);
name = qfi.fileName();
--- 772,777 ----
// parse bzip2ed files
if( vfs_type == "zip2" ){
! KDE_struct_stat stat_p;
! KDE_stat(arcFile.local8Bit(),&stat_p);
name = qfi.fileName();
Index: krpermhandler.cpp
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/krusader/VFS/krpermhandler.cpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** krpermhandler.cpp 19 Sep 2003 22:35:32 -0000 1.10
--- krpermhandler.cpp 20 Sep 2003 13:46:37 -0000 1.11
***************
*** 41,44 ****
--- 41,45 ----
#include <klocale.h>
#include <kglobal.h>
+ #include <klargefile.h>
// Qt includes
#include <qdatetime.h>
***************
*** 94,99 ****
bool KRpermHandler::fileWriteable(QString localFile){
! struct stat stat_p;
! if ( stat(localFile.local8Bit(),&stat_p) == -1 ) return false;
mode_t m = stat_p.st_mode;
QString perm = mode2QString(m);
--- 95,100 ----
bool KRpermHandler::fileWriteable(QString localFile){
! KDE_struct_stat stat_p;
! if ( KDE_stat(localFile.local8Bit(),&stat_p) == -1 ) return false;
mode_t m = stat_p.st_mode;
QString perm = mode2QString(m);
***************
*** 102,107 ****
bool KRpermHandler::fileReadable(QString localFile){
! struct stat stat_p;
! if ( stat(localFile.local8Bit(),&stat_p) == -1 ) return false;
mode_t m = stat_p.st_mode;
QString perm = mode2QString(m);
--- 103,108 ----
bool KRpermHandler::fileReadable(QString localFile){
! KDE_struct_stat stat_p;
! if ( KDE_stat(localFile.local8Bit(),&stat_p) == -1 ) return false;
mode_t m = stat_p.st_mode;
QString perm = mode2QString(m);
***************
*** 110,115 ****
bool KRpermHandler::fileExecutable(QString localFile){
! struct stat stat_p;
! if ( stat(localFile.local8Bit(),&stat_p) == -1 ) return false;
mode_t m = stat_p.st_mode;
QString perm = mode2QString(m);
--- 111,116 ----
bool KRpermHandler::fileExecutable(QString localFile){
! KDE_struct_stat stat_p;
! if ( KDE_stat(localFile.local8Bit(),&stat_p) == -1 ) return false;
mode_t m = stat_p.st_mode;
QString perm = mode2QString(m);
Index: normal_vfs.cpp
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/krusader/VFS/normal_vfs.cpp,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** normal_vfs.cpp 19 Sep 2003 22:35:32 -0000 1.17
--- normal_vfs.cpp 20 Sep 2003 13:46:37 -0000 1.18
***************
*** 32,36 ****
--- 32,38 ----
#endif
+ #include <sys/stat.h>
#include <sys/types.h>
+ #include <unistd.h>
#include <dirent.h>
// QT includes
***************
*** 44,47 ****
--- 46,50 ----
#include <kglobalsettings.h>
#include <kdebug.h>
+ #include <klargefile.h>
// Krusader includes
#include "normal_vfs.h"
***************
*** 105,109 ****
//int i = 0;
char symDest[256];
! struct stat stat_p;
while( (dirEnt=readdir(dir)) != NULL ){
name = QString::fromLocal8Bit(dirEnt->d_name);
--- 108,112 ----
//int i = 0;
char symDest[256];
! KDE_struct_stat stat_p;
while( (dirEnt=readdir(dir)) != NULL ){
name = QString::fromLocal8Bit(dirEnt->d_name);
***************
*** 114,118 ****
if (name=="." || name == "..") continue;
! lstat(vfs_workingDir().local8Bit()+"/"+name.local8Bit(),&stat_p);
KIO::filesize_t size = stat_p.st_size;
QString perm = KRpermHandler::mode2QString(stat_p.st_mode);
--- 117,121 ----
if (name=="." || name == "..") continue;
! KDE_lstat(vfs_workingDir().local8Bit()+"/"+name.local8Bit(),&stat_p);
KIO::filesize_t size = stat_p.st_size;
QString perm = KRpermHandler::mode2QString(stat_p.st_mode);
|
|
From: <ck...@us...> - 2003-09-20 12:18:01
|
Update of /cvsroot/krusader/krusader_kde3
In directory sc8-pr-cvs1:/tmp/cvs-serv30140/krusader_kde3
Modified Files:
ChangeLog
Log Message:
ADDED: Total Commander like file renaming (two subsequent single clicks)
Index: ChangeLog
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/ChangeLog,v
retrieving revision 1.88
retrieving revision 1.89
diff -C2 -d -r1.88 -r1.89
*** ChangeLog 19 Sep 2003 22:35:31 -0000 1.88
--- ChangeLog 20 Sep 2003 12:17:54 -0000 1.89
***************
*** 1,3 ****
--- 1,4 ----
======================
+ ADDED: Total Commander like file renaming (two subsequent single clicks on an item)
FIXED: crash when editing a file with # in the filename
FIXED: inplace renaming bug with extention when pressing ctrl+click
|
|
From: <ck...@us...> - 2003-09-20 12:18:01
|
Update of /cvsroot/krusader/krusader_kde3/krusader/Panel
In directory sc8-pr-cvs1:/tmp/cvs-serv30140/krusader_kde3/krusader/Panel
Modified Files:
krdetailedview.cpp krdetailedview.h
Log Message:
ADDED: Total Commander like file renaming (two subsequent single clicks)
Index: krdetailedview.cpp
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/krusader/Panel/krdetailedview.cpp,v
retrieving revision 1.37
retrieving revision 1.38
diff -C2 -d -r1.37 -r1.38
*** krdetailedview.cpp 20 Sep 2003 09:44:36 -0000 1.37
--- krdetailedview.cpp 20 Sep 2003 12:17:54 -0000 1.38
***************
*** 79,82 ****
--- 79,85 ----
i18n( "Owner" ), i18n( "Group" ) };
+ QString KrDetailedView::LastSelectedItem = "";
+ void * KrDetailedView::LastSelectingView = 0;
+
KrDetailedView::KrDetailedView( QWidget *parent, bool left, KConfig *cfg, const char *name ) :
KListView( parent, name ), KrView( cfg ), _focused( false ), _currDragItem( 0L ),
***************
*** 93,96 ****
--- 96,101 ----
_columns[ i ] = Unused;
+ LastSelectedItem = ""; LastSelectingView = 0;
+
/////////////////////////////// listview ////////////////////////////////////
{ // use the {} so that KConfigGroupSaver will work correctly!
***************
*** 369,378 ****
void KrDetailedView::slotClicked( QListViewItem *item ) {
KConfigGroupSaver grpSvr( _config, nameInKConfig() );
if ( _config->readBoolEntry( "Single Click Selects", _SingleClickSelects ) ) {
- if ( !item )
- return ;
- QString tmp = dynamic_cast<KrViewItem*>( item ) ->name();
emit executed( tmp );
}
}
--- 374,394 ----
void KrDetailedView::slotClicked( QListViewItem *item ) {
+ if ( !item )
+ return ;
+
KConfigGroupSaver grpSvr( _config, nameInKConfig() );
+ QString tmp = dynamic_cast<KrViewItem*>( item ) ->name();
+
if ( _config->readBoolEntry( "Single Click Selects", _SingleClickSelects ) ) {
emit executed( tmp );
+ } else {
+ if( tmp == LastSelectedItem && (void *)this == LastSelectingView ) {
+ LastSelectedItem = ""; LastSelectingView = 0;
+ emit renameCurrentItem();
+ }
+ else {
+ LastSelectedItem = tmp;
+ LastSelectingView = (void *)this;
+ }
}
}
***************
*** 703,706 ****
--- 719,723 ----
void KrDetailedView::setNameToMakeCurrent( QListViewItem * it ) {
+ LastSelectedItem = ""; LastSelectingView = 0;
KrView::setNameToMakeCurrent( dynamic_cast<KrViewItem*>( it ) ->name() );
}
Index: krdetailedview.h
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/krusader/Panel/krdetailedview.h,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** krdetailedview.h 19 Sep 2003 10:50:27 -0000 1.12
--- krdetailedview.h 20 Sep 2003 12:17:54 -0000 1.13
***************
*** 116,119 ****
--- 116,121 ----
ColumnType _columns[ MAX_COLUMNS ];
static QString ColumnName[ MAX_COLUMNS ];
+ static QString LastSelectedItem;
+ static void * LastSelectingView;
bool _withIcons, _focused;
KrViewItem *_currDragItem;
|
|
From: <ma...@us...> - 2003-09-20 11:36:18
|
Update of /cvsroot/krusader/krusader_kde3/krusader/Dialogs
In directory sc8-pr-cvs1:/tmp/cvs-serv24988/krusader/Dialogs
Modified Files:
krspecialwidgets.h
Log Message:
KIO::filesize_t
Index: krspecialwidgets.h
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/krusader/Dialogs/krspecialwidgets.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** krspecialwidgets.h 23 Aug 2003 14:56:24 -0000 1.3
--- krspecialwidgets.h 20 Sep 2003 11:36:13 -0000 1.4
***************
*** 39,42 ****
--- 39,43 ----
#include <klineedit.h>
#include <qevent.h>
+ #include <kio/global.h>
class KRPieSlice;
***************
*** 45,50 ****
Q_OBJECT
public:
! KRPie( long _totalSize, QWidget *parent = 0 );
! void addSlice( long size, QString label );
protected:
--- 46,51 ----
Q_OBJECT
public:
! KRPie( KIO::filesize_t _totalSize, QWidget *parent = 0 );
! void addSlice( KIO::filesize_t size, QString label );
protected:
***************
*** 53,57 ****
private:
QList<KRPieSlice> slices;
! long totalSize, sizeLeft;
static QColor colors[ 12 ];
};
--- 54,58 ----
private:
QList<KRPieSlice> slices;
! KIO::filesize_t totalSize, sizeLeft;
static QColor colors[ 12 ];
};
***************
*** 62,72 ****
// this constructor is used for a mounted filesystem
KRFSDisplay( QWidget *parent, QString _alias, QString _realName,
! long _total, long _free );
// this one is for an unmounted/supermount file system
KRFSDisplay( QWidget *parent, QString _alias, QString _realName, bool sm = false );
// the last one is used inside MountMan(R), when no filesystem is selected
KRFSDisplay( QWidget *parent );
! inline void setTotalSpace( long t ) { totalSpace = t; }
! inline void setFreeSpace( long t ) { freeSpace = t; }
inline void setAlias( QString a ) { alias = a; }
inline void setRealName( QString r ) { realName = r; }
--- 63,73 ----
// this constructor is used for a mounted filesystem
KRFSDisplay( QWidget *parent, QString _alias, QString _realName,
! KIO::filesize_t _total, KIO::filesize_t _free );
// this one is for an unmounted/supermount file system
KRFSDisplay( QWidget *parent, QString _alias, QString _realName, bool sm = false );
// the last one is used inside MountMan(R), when no filesystem is selected
KRFSDisplay( QWidget *parent );
! inline void setTotalSpace( KIO::filesize_t t ) { totalSpace = t; }
! inline void setFreeSpace( KIO::filesize_t t ) { freeSpace = t; }
inline void setAlias( QString a ) { alias = a; }
inline void setRealName( QString r ) { realName = r; }
***************
*** 79,83 ****
private:
! long totalSpace, freeSpace;
QString alias, realName;
bool mounted, empty, supermount;
--- 80,84 ----
private:
! KIO::filesize_t totalSpace, freeSpace;
QString alias, realName;
bool mounted, empty, supermount;
|
|
From: <ma...@us...> - 2003-09-20 11:35:49
|
Update of /cvsroot/krusader/krusader_kde3/krusader/Dialogs
In directory sc8-pr-cvs1:/tmp/cvs-serv24898/krusader/Dialogs
Modified Files:
krspecialwidgets.cpp
Log Message:
KIO::filesize_t fix
Index: krspecialwidgets.cpp
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/krusader/Dialogs/krspecialwidgets.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** krspecialwidgets.cpp 23 Aug 2003 14:56:24 -0000 1.4
--- krspecialwidgets.cpp 20 Sep 2003 11:35:43 -0000 1.5
***************
*** 66,70 ****
// This is the full constructor: use it for a mounted filesystem
KRFSDisplay::KRFSDisplay(QWidget *parent, QString _alias, QString _realName,
! long _total, long _free) : QWidget(parent), totalSpace(_total),
freeSpace(_free), alias(_alias), realName(_realName), mounted(true),
empty(false), supermount(false) {
--- 66,70 ----
// This is the full constructor: use it for a mounted filesystem
KRFSDisplay::KRFSDisplay(QWidget *parent, QString _alias, QString _realName,
! KIO::filesize_t _total, KIO::filesize_t _free) : QWidget(parent), totalSpace(_total),
freeSpace(_free), alias(_alias), realName(_realName), mounted(true),
empty(false), supermount(false) {
***************
*** 156,160 ****
////////////////////////////////////////////////////////////////////////////////
! KRPie::KRPie(long _totalSize, QWidget *parent) : QWidget(parent,0), totalSize(_totalSize) {
slices.setAutoDelete(true); // kill items when they are removed
slices.append(new KRPieSlice(100,Qt::yellow,"DEFAULT"));
--- 156,160 ----
////////////////////////////////////////////////////////////////////////////////
! KRPie::KRPie(KIO::filesize_t _totalSize, QWidget *parent) : QWidget(parent,0), totalSize(_totalSize) {
slices.setAutoDelete(true); // kill items when they are removed
slices.append(new KRPieSlice(100,Qt::yellow,"DEFAULT"));
***************
*** 203,207 ****
}
! void KRPie::addSlice(long size,QString label) {
int i=(slices.count() % 12);
slices.removeLast();
--- 203,207 ----
}
! void KRPie::addSlice(KIO::filesize_t size,QString label) {
int i=(slices.count() % 12);
slices.removeLast();
|
|
From: <ck...@us...> - 2003-09-20 11:25:27
|
Update of /cvsroot/krusader/krusader_kde3/krusader
In directory sc8-pr-cvs1:/tmp/cvs-serv23369/krusader_kde3/krusader
Modified Files:
krslots.cpp krusaderview.cpp krusaderview.h
Log Message:
FIXED: Panel Swapping and Panel Manager cooperation.
Index: krslots.cpp
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/krusader/krslots.cpp,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** krslots.cpp 18 Sep 2003 15:33:29 -0000 1.15
--- krslots.cpp 20 Sep 2003 11:25:22 -0000 1.16
***************
*** 64,67 ****
--- 64,68 ----
#include "Search/krsearchdialog.h"
#include "VFS/vfs.h"
+ #include "panelmanager.h"
#define ACTIVE_PANEL (krApp->mainView->activePanel)
***************
*** 277,284 ****
void KRslots::toggleSwapPanels(){
! ListPanel *currentFirst = panel_swap ? krApp->mainView->right : krApp->mainView->left;
! krApp->mainView->horiz_splitter->moveToLast( currentFirst );
krApp->actToggleSwapPanels->setChecked( panel_swap = !panel_swap );
! REFRESH_BOTH_PANELS;
}
--- 278,286 ----
void KRslots::toggleSwapPanels(){
! PanelManager *currentFirst = panel_swap ? MAIN_VIEW->rightMng : MAIN_VIEW->leftMng;
krApp->actToggleSwapPanels->setChecked( panel_swap = !panel_swap );
! MAIN_VIEW->horiz_splitter->moveToLast( currentFirst );
! MAIN_VIEW->left->updateGeometry();
! MAIN_VIEW->right->updateGeometry();
}
Index: krusaderview.cpp
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/krusader/krusaderview.cpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** krusaderview.cpp 19 Sep 2003 16:21:21 -0000 1.9
--- krusaderview.cpp 20 Sep 2003 11:25:22 -0000 1.10
***************
*** 61,66 ****
// add a panel manager for each side of the splitter
! PanelManager *leftMng = new PanelManager(horiz_splitter, true);
! PanelManager *rightMng = new PanelManager(horiz_splitter, false);
// now, create the panels inside the manager
--- 61,66 ----
// add a panel manager for each side of the splitter
! leftMng = new PanelManager(horiz_splitter, true);
! rightMng = new PanelManager(horiz_splitter, false);
// now, create the panels inside the manager
Index: krusaderview.h
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/krusader/krusaderview.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** krusaderview.h 29 Aug 2003 23:23:06 -0000 1.5
--- krusaderview.h 20 Sep 2003 11:25:22 -0000 1.6
***************
*** 47,50 ****
--- 47,51 ----
#include <qhbox.h>
+ class PanelManager;
class ListPanel;
***************
*** 78,81 ****
--- 79,83 ----
ListPanel *activePanel;
ListPanel *left,*right; // the actual panels
+ PanelManager *leftMng, *rightMng; // saving them for panel swaps
KFnKeys *fnKeys; // function keys
KCMDLine *cmdLine; // command line widget
|
|
From: <ma...@us...> - 2003-09-20 10:51:17
|
Update of /cvsroot/krusader/krusader_kde3/krusader/MountMan
In directory sc8-pr-cvs1:/tmp/cvs-serv18247/krusader/MountMan
Modified Files:
kmountman.cpp
Log Message:
KIO::filesize_t fix
Index: kmountman.cpp
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/krusader/MountMan/kmountman.cpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** kmountman.cpp 17 Sep 2003 16:01:00 -0000 1.9
--- kmountman.cpp 20 Sep 2003 10:51:12 -0000 1.10
***************
*** 688,692 ****
// with large filesystems ==> >4GB, it actually recieve size in
// a minimum block of 1024 ==> data is KB not bytes
! QString KMountMan::convertSize( unsigned long size )
{
float fsize;
--- 688,692 ----
// with large filesystems ==> >4GB, it actually recieve size in
// a minimum block of 1024 ==> data is KB not bytes
! QString KMountMan::convertSize( KIO::filesize_t size )
{
float fsize;
|
|
From: <ma...@us...> - 2003-09-20 10:51:02
|
Update of /cvsroot/krusader/krusader_kde3/krusader/MountMan
In directory sc8-pr-cvs1:/tmp/cvs-serv18191/krusader/MountMan
Modified Files:
kmountman.h
Log Message:
KIO::filesize_t fix
Index: kmountman.h
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/krusader/MountMan/kmountman.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** kmountman.h 17 Sep 2003 16:01:00 -0000 1.4
--- kmountman.h 20 Sep 2003 10:50:57 -0000 1.5
***************
*** 40,44 ****
#include <kjanuswidget.h>
#include <kio/jobclasses.h>
! #include <ktempfile.h>
// krusader includes
#include <stdlib.h>
--- 40,45 ----
#include <kjanuswidget.h>
#include <kio/jobclasses.h>
! #include <kio/global.h>
! #include <ktempfile.h>
// krusader includes
#include <stdlib.h>
***************
*** 70,74 ****
static void eject( QString mntPoint );
bool ejectable( QString path );
! QString convertSize( unsigned long size );
//////////////////////////// service functions /////////////////////////////////
static QString nextWord( QString &s );
--- 71,75 ----
static void eject( QString mntPoint );
bool ejectable( QString path );
! QString convertSize( KIO::filesize_t size );
//////////////////////////// service functions /////////////////////////////////
static QString nextWord( QString &s );
***************
*** 161,168 ****
return FreeBlks;
}
! inline long long totalBytes() {
return TotalBlks * 1024;
}
! inline long long freeBytes() {
return FreeBlks * 1024;
}
--- 162,169 ----
return FreeBlks;
}
! inline KIO::filesize_t totalBytes() {
return TotalBlks * 1024;
}
! inline KIO::filesize_t freeBytes() {
return FreeBlks * 1024;
}
|
|
From: <ma...@us...> - 2003-09-20 10:18:14
|
Update of /cvsroot/krusader/krusader_kde3/krusader/Search
In directory sc8-pr-cvs1:/tmp/cvs-serv13618/krusader/Search
Modified Files:
krsearchdialog.cpp
Log Message:
KIO::filesize_t fix
Index: krsearchdialog.cpp
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/krusader/Search/krsearchdialog.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** krsearchdialog.cpp 27 Aug 2003 22:34:44 -0000 1.7
--- krsearchdialog.cpp 20 Sep 2003 10:18:09 -0000 1.8
***************
*** 263,267 ****
}
! void KrSearchDialog::found(QString what, QString where, long size, time_t mtime, QString perm){
// convert the time_t to struct tm
struct tm* t=localtime((time_t *)&mtime);
--- 263,267 ----
}
! void KrSearchDialog::found(QString what, QString where, KIO::filesize_t size, time_t mtime, QString perm){
// convert the time_t to struct tm
struct tm* t=localtime((time_t *)&mtime);
***************
*** 476,481 ****
connect(searcher, SIGNAL(searching(const QString&)),
searchingLabel, SLOT(setText(const QString&)));
! connect(searcher, SIGNAL(found(QString,QString,long,time_t,QString)),
! this, SLOT(found(QString,QString,long,time_t,QString)));
connect(searcher, SIGNAL(finished()), this, SLOT(stopSearch()));
--- 476,481 ----
connect(searcher, SIGNAL(searching(const QString&)),
searchingLabel, SLOT(setText(const QString&)));
! connect(searcher, SIGNAL(found(QString,QString,KIO::filesize_t,time_t,QString)),
! this, SLOT(found(QString,QString,KIO::filesize_t,time_t,QString)));
connect(searcher, SIGNAL(finished()), this, SLOT(stopSearch()));
|
|
From: <ma...@us...> - 2003-09-20 10:17:35
|
Update of /cvsroot/krusader/krusader_kde3/krusader/Search
In directory sc8-pr-cvs1:/tmp/cvs-serv13512/krusader/Search
Modified Files:
krsearchdialog.h
Log Message:
KIO::filesize_t fix
Index: krsearchdialog.h
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/krusader/Search/krsearchdialog.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** krsearchdialog.h 27 Aug 2003 22:05:11 -0000 1.2
--- krsearchdialog.h 20 Sep 2003 10:17:30 -0000 1.3
***************
*** 58,62 ****
void startSearch();
void stopSearch();
! void found(QString what, QString where, long size, time_t mtime, QString perm);
void closeDialog();
void addToSearchIn();
--- 58,62 ----
void startSearch();
void stopSearch();
! void found(QString what, QString where, KIO::filesize_t size, time_t mtime, QString perm);
void closeDialog();
void addToSearchIn();
|
|
From: <ma...@us...> - 2003-09-20 10:17:28
|
Update of /cvsroot/krusader/krusader_kde3/krusader/Search
In directory sc8-pr-cvs1:/tmp/cvs-serv13455/krusader/Search
Modified Files:
krsearchmod.h
Log Message:
KIO::filesize_t fix
Index: krsearchmod.h
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/krusader/Search/krsearchmod.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** krsearchmod.h 27 Aug 2003 22:05:11 -0000 1.2
--- krsearchmod.h 20 Sep 2003 10:17:08 -0000 1.3
***************
*** 37,40 ****
--- 37,41 ----
#include <qstringlist.h>
#include <time.h>
+ #include <kio/global.h>
class KRQuery;
***************
*** 56,60 ****
void finished();
void searching(const QString&);
! void found(QString what, QString where, long size, time_t mtime, QString perm);
private:
--- 57,61 ----
void finished();
void searching(const QString&);
! void found(QString what, QString where, KIO::filesize_t size, time_t mtime, QString perm);
private:
|
|
From: <ma...@us...> - 2003-09-20 10:16:56
|
Update of /cvsroot/krusader/krusader_kde3/krusader/Search
In directory sc8-pr-cvs1:/tmp/cvs-serv13369/krusader/Search
Modified Files:
krsearchmod.cpp
Log Message:
KIO::filesize_t fix
Index: krsearchmod.cpp
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/krusader/Search/krsearchmod.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** krsearchmod.cpp 27 Aug 2003 22:05:11 -0000 1.3
--- krsearchmod.cpp 20 Sep 2003 10:16:51 -0000 1.4
***************
*** 192,196 ****
results.append(dir+name);
// kdWarning() << "Found: " << (dir+name).local8Bit() << endl;
! emit found(name, dir, stat_p.st_size, stat_p.st_mtime,KRpermHandler::mode2QString(stat_p.st_mode) );
qApp->processEvents();
}
--- 192,196 ----
results.append(dir+name);
// kdWarning() << "Found: " << (dir+name).local8Bit() << endl;
! emit found(name, dir, (KIO::filesize_t)stat_p.st_size, stat_p.st_mtime,KRpermHandler::mode2QString(stat_p.st_mode) );
qApp->processEvents();
}
***************
*** 228,232 ****
if( !fileMatch(name) ) continue;
// check that the size fit
! unsigned long size = vf->vfile_getSize();
if( query->minSize && size < query->minSize ) continue;
if( query->maxSize && size > query->maxSize ) continue;
--- 228,232 ----
if( !fileMatch(name) ) continue;
// check that the size fit
! KIO::filesize_t size = vf->vfile_getSize();
if( query->minSize && size < query->minSize ) continue;
if( query->maxSize && size > query->maxSize ) continue;
|
|
From: <ma...@us...> - 2003-09-20 09:55:05
|
Update of /cvsroot/krusader/krusader_kde3/krusader/KViewer
In directory sc8-pr-cvs1:/tmp/cvs-serv9643/krusader/KViewer
Modified Files:
krviewer.cpp
Log Message:
KIO::filesize_t
Index: krviewer.cpp
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/krusader/KViewer/krviewer.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** krviewer.cpp 27 May 2003 19:58:22 -0000 1.6
--- krviewer.cpp 20 Sep 2003 09:55:00 -0000 1.7
***************
*** 236,240 ****
FILE *out = fopen(tmpFile.name().mid(tmpFile.name().find("/")).latin1(),"w");
! long fileSize = f_in.size();
long address = 0;
char buf[16];
--- 236,240 ----
FILE *out = fopen(tmpFile.name().mid(tmpFile.name().find("/")).latin1(),"w");
! KIO::filesize_t fileSize = f_in.size();
long address = 0;
char buf[16];
|
|
From: <ma...@us...> - 2003-09-20 09:44:41
|
Update of /cvsroot/krusader/krusader_kde3/krusader/Panel
In directory sc8-pr-cvs1:/tmp/cvs-serv8204/krusader/Panel
Modified Files:
krdetailedview.cpp
Log Message:
fix: bug when ctrl-clicking a selected file caused inplace renaming
Index: krdetailedview.cpp
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/krusader/Panel/krdetailedview.cpp,v
retrieving revision 1.36
retrieving revision 1.37
diff -C2 -d -r1.36 -r1.37
*** krdetailedview.cpp 19 Sep 2003 22:35:32 -0000 1.36
--- krdetailedview.cpp 20 Sep 2003 09:44:36 -0000 1.37
***************
*** 167,173 ****
setShowSortIndicator( true );
header() ->setStretchEnabled( true, column( Name ) );
// allow in-place renaming
- setItemsRenameable( true );
- setRenameable( column( Name ), true );
connect( renameLineEdit(), SIGNAL( done( QListViewItem *, int ) ),
this, SLOT( inplaceRenameFinished( QListViewItem*, int ) ) );
--- 167,177 ----
setShowSortIndicator( true );
header() ->setStretchEnabled( true, column( Name ) );
+
+ //---- don't enable these lines, as it causes an ugly bug with inplace renaming
+ //--> setItemsRenameable( true );
+ //--> setRenameable( column( Name ), true );
+ //-------------------------------------------------------------------------------
+
// allow in-place renaming
connect( renameLineEdit(), SIGNAL( done( QListViewItem *, int ) ),
this, SLOT( inplaceRenameFinished( QListViewItem*, int ) ) );
***************
*** 609,613 ****
// overridden to make sure EXTENTION won't be lost during rename
void KrDetailedView::rename(QListViewItem *item, int c) {
- kdWarning() << "!!" << endl;
// do we have an EXT column? if so, handle differently:
// copy the contents of the EXT column over to the name
--- 613,616 ----
|
|
From: <ya...@us...> - 2003-09-19 22:35:38
|
Update of /cvsroot/krusader/krusader_kde3/krusader/VFS
In directory sc8-pr-cvs1:/tmp/cvs-serv1378/krusader/VFS
Modified Files:
arc_vfs.cpp arc_vfs.h ftp_vfs.cpp ftp_vfs.h krpermhandler.cpp
krpermhandler.h normal_vfs.cpp normal_vfs.h vfile.cpp vfile.h
vfs.cpp vfs.h
Log Message:
Change the size type from unsigned long to KIO::filesize_t. Clear the view every time a VFS is deleted to avoid a repaint crash
Index: arc_vfs.cpp
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/krusader/VFS/arc_vfs.cpp,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** arc_vfs.cpp 4 Sep 2003 21:00:35 -0000 1.11
--- arc_vfs.cpp 19 Sep 2003 22:35:32 -0000 1.12
***************
*** 310,314 ****
QStringList files;
! unsigned long totalSizeVal = 0 , totalFilesVal = 0;
// names -> urls
--- 310,315 ----
QStringList files;
! KIO::filesize_t totalSizeVal = 0;
! unsigned long totalFilesVal = 0;
// names -> urls
***************
*** 372,376 ****
// names -> urls
QStringList files;
! unsigned long totalSize = 0,totalFiles = 0;
for(QStringList::Iterator name = names->begin(); name != names->end(); ++name ){
processName(*name,&files,&totalSize,&totalFiles);
--- 373,378 ----
// names -> urls
QStringList files;
! KIO::filesize_t totalSize = 0;
! unsigned long totalFiles = 0;
for(QStringList::Iterator name = names->begin(); name != names->end(); ++name ){
processName(*name,&files,&totalSize,&totalFiles);
***************
*** 677,681 ****
// calculate space
! void arc_vfs::vfs_calcSpace(QString name ,long long *totalSize,long *totalFiles, long *totalDirs,bool* stop){
if (stop && *stop) return;
vfile* vf = vfs_search(name);
--- 679,683 ----
// calculate space
! void arc_vfs::vfs_calcSpace(QString name ,KIO::filesize_t *totalSize,unsigned long *totalFiles,unsigned long *totalDirs,bool* stop){
if (stop && *stop) return;
vfile* vf = vfs_search(name);
***************
*** 709,713 ****
}
! void arc_vfs::processName(const QString& name, QStringList *urls,unsigned long *totalSize,unsigned long *totalFiles ){
vfile* vf = vfs_search(name);
if ( vf == 0 ) return;
--- 711,715 ----
}
! void arc_vfs::processName(const QString& name, QStringList *urls,KIO::filesize_t *totalSize,unsigned long *totalFiles ){
vfile* vf = vfs_search(name);
if ( vf == 0 ) return;
***************
*** 740,744 ****
void arc_vfs::parseLine(QString line, QFile* temp){
QString name;
! long size = 0;
QString perm;
QFileInfo qfi(arcFile);
--- 742,746 ----
void arc_vfs::parseLine(QString line, QFile* temp){
QString name;
! KIO::filesize_t size = 0;
QString perm;
QFileInfo qfi(arcFile);
***************
*** 748,752 ****
gid_t group = getgid();
QString dest = "";
! long mode = 0;
--- 750,754 ----
gid_t group = getgid();
QString dest = "";
! mode_t mode = 0;
Index: arc_vfs.h
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/krusader/VFS/arc_vfs.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** arc_vfs.h 4 Sep 2003 21:00:35 -0000 1.4
--- arc_vfs.h 19 Sep 2003 22:35:32 -0000 1.5
***************
*** 59,63 ****
void vfs_rename(QString fileName,QString newName);
// calculate space
! void vfs_calcSpace(QString name ,long long *totalSize,long *totalFiles, long *totalDirs, bool* stop = 0);
// return the working dir
QString vfs_workingDir();
--- 59,63 ----
void vfs_rename(QString fileName,QString newName);
// calculate space
! void vfs_calcSpace(QString name ,KIO::filesize_t *totalSize,unsigned long *totalFiles,unsigned long *totalDirs, bool* stop = 0);
// return the working dir
QString vfs_workingDir();
***************
*** 75,79 ****
QValueList<extFile> extFiles; // the name, time & size of files unpacked from this archive
! void processName(const QString& name,QStringList *urls,unsigned long *totalSize,unsigned long *totalFiles );
bool getDirs(); // fill the dir list
QList<vfile>* findDir(QString name);
--- 75,79 ----
QValueList<extFile> extFiles; // the name, time & size of files unpacked from this archive
! void processName(const QString& name,QStringList *urls,KIO::filesize_t *totalSize,unsigned long *totalFiles );
bool getDirs(); // fill the dir list
QList<vfile>* findDir(QString name);
Index: ftp_vfs.cpp
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/krusader/VFS/ftp_vfs.cpp,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** ftp_vfs.cpp 27 Aug 2003 22:05:11 -0000 1.17
--- ftp_vfs.cpp 19 Sep 2003 22:35:32 -0000 1.18
***************
*** 59,65 ****
ftp_vfs::ftp_vfs(QString origin,QWidget* panel):vfs(panel){
! // set the writable attribute
! isWritable = true;
!
vfs_filesP = &vfs_files;
vfs_files.setAutoDelete(true);
--- 59,65 ----
ftp_vfs::ftp_vfs(QString origin,QWidget* panel):vfs(panel){
! // set the writable attribute
! isWritable = true;
!
vfs_filesP = &vfs_files;
vfs_files.setAutoDelete(true);
***************
*** 67,76 ****
vfs_files2.setAutoDelete(true);
notConnected = true;
!
! // 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;
--- 67,76 ----
vfs_files2.setAutoDelete(true);
notConnected = true;
!
! // 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;
***************
*** 88,109 ****
}
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);
! }
! vfs_type = "ftp";
vfs_origin = url.prettyURL(-1);
! QTimer::singleShot(500,this,SLOT(vfs_refresh()));
! //vfs_refresh(vfs_origin);
}
void ftp_vfs::slotAddFiles(KIO::Job *, const KIO::UDSEntryList& entries){
!
! if(vfs_origin.right(1) == "/" ) vfs_origin = vfs_origin.left(vfs_origin.length()-1);
KIO::UDSEntryListConstIterator it = entries.begin();
--- 88,109 ----
}
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);
! }
! vfs_type = "ftp";
vfs_origin = url.prettyURL(-1);
! //QTimer::singleShot(500,this,SLOT(vfs_refresh()));
! vfs_refresh(vfs_origin);
}
void ftp_vfs::slotAddFiles(KIO::Job *, const KIO::UDSEntryList& entries){
!
! if(vfs_origin.right(1) == "/" ) vfs_origin = vfs_origin.left(vfs_origin.length()-1);
KIO::UDSEntryListConstIterator it = entries.begin();
***************
*** 113,128 ****
for ( ; it != end; ++it ){
KFileItem kfi(*it,vfs_url,false,true);
! /*ftp_*/vfile *temp;
!
// get file statistics
! QString name=kfi.text();
// ignore un-needed entries
! if (name.isEmpty() || name=="." || name == ".." ) continue;
!
! unsigned long size = kfi.size();
time_t mtime = kfi.time(KIO::UDS_MODIFICATION_TIME);
! bool symLink = kfi.isLink();
! mode_t mode = kfi.mode() | kfi.permissions();
! QString perm = KRpermHandler::mode2QString(mode);
// set the mimetype
QString mime = kfi.mimetype();
--- 113,128 ----
for ( ; it != end; ++it ){
KFileItem kfi(*it,vfs_url,false,true);
! vfile *temp;
!
// get file statistics
! QString name=kfi.text();
// ignore un-needed entries
! if (name.isEmpty() || name=="." || name == ".." ) continue;
!
! KIO::filesize_t size = kfi.size();
time_t mtime = kfi.time(KIO::UDS_MODIFICATION_TIME);
! bool symLink = kfi.isLink();
! mode_t mode = kfi.mode() | kfi.permissions();
! QString perm = KRpermHandler::mode2QString(mode);
// set the mimetype
QString mime = kfi.mimetype();
***************
*** 200,211 ****
vfs_url = url;
! // The following is needed because the new bookmark system
! // is using KIO which in some mysterious way is causing a crash...
! while( qApp->hasPendingEvents() ) qApp->processEvents();
! while( qApp->hasPendingEvents() ) qApp->processEvents();
! while( qApp->hasPendingEvents() ) qApp->processEvents();
!
! // 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));
--- 200,205 ----
vfs_url = 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));
Index: ftp_vfs.h
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/krusader/VFS/ftp_vfs.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** ftp_vfs.h 4 Sep 2003 21:00:35 -0000 1.4
--- ftp_vfs.h 19 Sep 2003 22:35:32 -0000 1.5
***************
*** 58,62 ****
QString vfs_workingDir();
// not implemented for ftp !
! void vfs_calcSpace(QString ,long long *,long *, long *,bool*){}
public slots:
--- 58,62 ----
QString vfs_workingDir();
// not implemented for ftp !
! void vfs_calcSpace(QString ,KIO::filesize_t *,unsigned long *,unsigned long *,bool*){}
public slots:
Index: krpermhandler.cpp
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/krusader/VFS/krpermhandler.cpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** krpermhandler.cpp 11 Sep 2003 19:47:37 -0000 1.9
--- krpermhandler.cpp 19 Sep 2003 22:35:32 -0000 1.10
***************
*** 261,271 ****
}
! QString KRpermHandler::parseSize(unsigned long val){
! QString temp,size;
! temp.sprintf("%lu",val);
if(temp.length() <=3 ) return temp+" ";
unsigned int i = temp.length()%3;
if (i==0) i=3;
! size = temp.left(i)+",";
while(i+3 < temp.length()){
size = size + temp.mid(i,3)+",";
--- 261,272 ----
}
! QString KRpermHandler::parseSize(KIO::filesize_t val){
! char buf[25];
! sprintf(buf,"%llu",val);
! QString temp(buf);
if(temp.length() <=3 ) return temp+" ";
unsigned int i = temp.length()%3;
if (i==0) i=3;
! QString size = temp.left(i)+",";
while(i+3 < temp.length()){
size = size + temp.mid(i,3)+",";
Index: krpermhandler.h
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/krusader/VFS/krpermhandler.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** krpermhandler.h 27 Aug 2003 22:05:11 -0000 1.3
--- krpermhandler.h 19 Sep 2003 22:35:32 -0000 1.4
***************
*** 38,41 ****
--- 38,42 ----
#include <qdict.h>
#include <qintdict.h>
+ #include <kio/global.h>
#define NO_PERM 0
***************
*** 73,77 ****
static QString mode2QString(mode_t m);
! static QString parseSize(unsigned long val);
static QString date2qstring(QString date);
static time_t QString2time(QString date);
--- 74,78 ----
static QString mode2QString(mode_t m);
! static QString parseSize(KIO::filesize_t val);
static QString date2qstring(QString date);
static time_t QString2time(QString date);
Index: normal_vfs.cpp
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/krusader/VFS/normal_vfs.cpp,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** normal_vfs.cpp 17 Sep 2003 16:01:00 -0000 1.16
--- normal_vfs.cpp 19 Sep 2003 22:35:32 -0000 1.17
***************
*** 115,119 ****
lstat(vfs_workingDir().local8Bit()+"/"+name.local8Bit(),&stat_p);
! unsigned long size = stat_p.st_size;
QString perm = KRpermHandler::mode2QString(stat_p.st_mode);
bool symLink= S_ISLNK(stat_p.st_mode);
--- 115,119 ----
lstat(vfs_workingDir().local8Bit()+"/"+name.local8Bit(),&stat_p);
! KIO::filesize_t size = stat_p.st_size;
QString perm = KRpermHandler::mode2QString(stat_p.st_mode);
bool symLink= S_ISLNK(stat_p.st_mode);
***************
*** 229,233 ****
}
! void normal_vfs::vfs_calcSpace(QString name ,long long *totalSize,long *totalFiles, long *totalDirs, bool* stop){
if (stop && *stop) return;
if (!name.contains("/")) name = vfs_workingDir()+"/"+name;
--- 229,233 ----
}
! void normal_vfs::vfs_calcSpace(QString name ,KIO::filesize_t *totalSize,unsigned long *totalFiles,unsigned long *totalDirs, bool* stop){
if (stop && *stop) return;
if (!name.contains("/")) name = vfs_workingDir()+"/"+name;
Index: normal_vfs.h
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/krusader/VFS/normal_vfs.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** normal_vfs.h 4 Sep 2003 21:00:35 -0000 1.8
--- normal_vfs.h 19 Sep 2003 22:35:32 -0000 1.9
***************
*** 62,66 ****
void vfs_rename(QString fileName,QString newName);
// calculate space
! void vfs_calcSpace(QString name ,long long *totalSize,long *totalFiles, long *totalDirs, bool * stop = 0);
// return the working dir
inline virtual QString vfs_workingDir() { return vfs_origin; }
--- 62,66 ----
void vfs_rename(QString fileName,QString newName);
// calculate space
! void vfs_calcSpace(QString name ,KIO::filesize_t *totalSize,unsigned long *totalFiles,unsigned long *totalDirs, bool * stop = 0);
// return the working dir
inline virtual QString vfs_workingDir() { return vfs_origin; }
Index: vfile.cpp
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/krusader/VFS/vfile.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** vfile.cpp 27 Aug 2003 22:05:11 -0000 1.6
--- vfile.cpp 19 Sep 2003 22:35:32 -0000 1.7
***************
*** 43,47 ****
vfile::vfile(QString name, // useful construtor
! unsigned long size,
QString perm,
time_t mtime,
--- 43,47 ----
vfile::vfile(QString name, // useful construtor
! KIO::filesize_t size,
QString perm,
time_t mtime,
***************
*** 67,71 ****
vfile::vfile(QString name, // useful construtor
! unsigned long size,
QString perm,
time_t mtime,
--- 67,71 ----
vfile::vfile(QString name, // useful construtor
! KIO::filesize_t size,
QString perm,
time_t mtime,
Index: vfile.h
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/krusader/VFS/vfile.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** vfile.h 27 Aug 2003 22:05:11 -0000 1.6
--- vfile.h 19 Sep 2003 22:35:32 -0000 1.7
***************
*** 44,60 ****
class vfile{
protected:
! // the file information list
! QString vfile_name; // name
! unsigned long vfile_size; // size
! mode_t vfile_mode; // the vfile mode
! uid_t vfile_ownerId; // owner id
! gid_t vfile_groupId; // group id
! QString vfile_owner; // owner name
! QString vfile_group; // group name
! QString vfile_perm; // permissions
! time_t vfile_time_t; // modification in time_t format
! bool vfile_symLink; // true==yes
! QString vfile_mimeType; // file mimetype
! QString vfile_symDest; // if it's a sym link - its detination
public:
--- 44,60 ----
class vfile{
protected:
! // the file information list
! QString vfile_name; // name
! KIO::filesize_t vfile_size; // size
! mode_t vfile_mode; // the vfile mode
! uid_t vfile_ownerId; // owner id
! gid_t vfile_groupId; // group id
! QString vfile_owner; // owner name
! QString vfile_group; // group name
! QString vfile_perm; // permissions
! time_t vfile_time_t; // modification in time_t format
! bool vfile_symLink; // true==yes
! QString vfile_mimeType; // file mimetype
! QString vfile_symDest; // if it's a sym link - its detination
public:
***************
*** 63,67 ****
// owner uid, group uid)
vfile(QString name,
! unsigned long size,
QString perm,
time_t mtime,
--- 63,67 ----
// owner uid, group uid)
vfile(QString name,
! KIO::filesize_t size,
QString perm,
time_t mtime,
***************
*** 74,78 ****
vfile(QString name,
! unsigned long size,
QString perm,
time_t mtime,
--- 74,78 ----
vfile(QString name,
! KIO::filesize_t size,
QString perm,
time_t mtime,
***************
*** 86,90 ****
// following functions give-out file details
inline QString vfile_getName() { return vfile_name; }
! inline unsigned long vfile_getSize() { return vfile_size; }
inline QString vfile_getPerm() { return vfile_perm; }
inline bool vfile_isDir() { return (vfile_perm[0]=='d');}
--- 86,90 ----
// following functions give-out file details
inline QString vfile_getName() { return vfile_name; }
! inline KIO::filesize_t vfile_getSize() { return vfile_size; }
inline QString vfile_getPerm() { return vfile_perm; }
inline bool vfile_isDir() { return (vfile_perm[0]=='d');}
***************
*** 104,144 ****
// used ONLY when calculating a directory's space, needs to change the
// displayed size of the viewitem and thus the vfile. For INTERNAL USE !
! inline void vfile_setSize(unsigned long size) {vfile_size = size;}
virtual ~vfile(){}
};
-
- #if 0
- class ftp_vfile : public vfile {
- protected:
- char canRead;
- char canWrite;
- char canExec;
-
- public:
- ftp_vfile(QString name,
- unsigned long size,
- QString perm,
- QString dateTime,
- bool symLink,
- uid_t owner,
- gid_t group,
- QString mime,
- QString symDest,
- mode_t mode) :
- vfile(name,size,perm,dateTime,symLink,owner,group,mime,symDest,mode){}
-
- virtual ~ftp_vfile(){}
-
- inline void setRead (char b){ canRead=b; }
- inline void setWrite(char b){ canWrite=b; }
- inline void setExec (char b){ canExec=b; }
-
- virtual char vfile_isReadable() { return canRead; }
- virtual char vfile_isWriteable() { return canWrite;}
- virtual char vfile_isExecutable(){ return canExec; }
- };
- #endif
-
#endif
--- 104,111 ----
// used ONLY when calculating a directory's space, needs to change the
// displayed size of the viewitem and thus the vfile. For INTERNAL USE !
! inline void vfile_setSize(KIO::filesize_t size) {vfile_size = size;}
virtual ~vfile(){}
};
#endif
Index: vfs.cpp
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/krusader/VFS/vfs.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** vfs.cpp 12 Jun 2003 22:41:36 -0000 1.2
--- vfs.cpp 19 Sep 2003 22:35:32 -0000 1.3
***************
*** 45,50 ****
}
! long vfs::vfs_totalSize(){
! long temp=0;
class vfile* vf=vfs_getFirstFile();
--- 45,50 ----
}
! KIO::filesize_t vfs::vfs_totalSize(){
! KIO::filesize_t temp=0;
class vfile* vf=vfs_getFirstFile();
Index: vfs.h
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/krusader/VFS/vfs.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** vfs.h 4 Sep 2003 21:00:36 -0000 1.6
--- vfs.h 19 Sep 2003 22:35:32 -0000 1.7
***************
*** 71,75 ****
virtual void vfs_rename(QString fileName,QString newName)=0;
// calculate space
! virtual void vfs_calcSpace(QString name ,long long *totalSize,long *totalFiles, long *totalDirs, bool * stop = 0)=0;
// return the working dir
virtual QString vfs_workingDir()=0;
--- 71,75 ----
virtual void vfs_rename(QString fileName,QString newName)=0;
// calculate space
! virtual void vfs_calcSpace(QString name ,KIO::filesize_t *totalSize,unsigned long *totalFiles,unsigned long *totalDirs, bool * stop = 0)=0;
// return the working dir
virtual QString vfs_workingDir()=0;
***************
*** 78,82 ****
virtual bool vfs_isWritable() { return isWritable; }
! long vfs_totalSize(); // the total size of FILES in the vfs,
vfile* vfs_search(QString name); // return vfile* or 0 if not found
--- 78,82 ----
virtual bool vfs_isWritable() { return isWritable; }
! KIO::filesize_t vfs_totalSize(); // the total size of FILES in the vfs,
vfile* vfs_search(QString name); // return vfile* or 0 if not found
|
Update of /cvsroot/krusader/krusader_kde3/krusader/Panel
In directory sc8-pr-cvs1:/tmp/cvs-serv1378/krusader/Panel
Modified Files:
krdetailedview.cpp krdetailedviewitem.cpp krdetailedviewitem.h
krview.h krviewitem.h panelfunc.cpp panelfunc.h
Log Message:
Change the size type from unsigned long to KIO::filesize_t. Clear the view every time a VFS is deleted to avoid a repaint crash
Index: krdetailedview.cpp
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/krusader/Panel/krdetailedview.cpp,v
retrieving revision 1.35
retrieving revision 1.36
diff -C2 -d -r1.35 -r1.36
*** krdetailedview.cpp 19 Sep 2003 10:50:11 -0000 1.35
--- krdetailedview.cpp 19 Sep 2003 22:35:32 -0000 1.36
***************
*** 553,558 ****
// size will not be correct.
//
! long long totalSize = 0;
! long totalFiles = 0, totalDirs = 0;
QStringList names;
names.push_back( viewItem->name() );
--- 553,558 ----
// size will not be correct.
//
! KIO::filesize_t totalSize = 0;
! unsigned long totalFiles = 0, totalDirs = 0;
QStringList names;
names.push_back( viewItem->name() );
Index: krdetailedviewitem.cpp
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/krusader/Panel/krdetailedviewitem.cpp,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** krdetailedviewitem.cpp 19 Sep 2003 10:12:06 -0000 1.15
--- krdetailedviewitem.cpp 19 Sep 2003 22:35:32 -0000 1.16
***************
*** 46,50 ****
KrDetailedViewItem::KrDetailedViewItem(KrDetailedView *parent, QListViewItem *after, vfile *vf):
! QObject(parent), KListViewItem(parent, after), KrViewItem(), _view(parent), _vf(vf) {
repaintItem();
}
--- 46,50 ----
KrDetailedViewItem::KrDetailedViewItem(KrDetailedView *parent, QListViewItem *after, vfile *vf):
! QObject(parent), KListViewItem(parent, after), KrViewItem(),_vf(vf), _view(parent) {
repaintItem();
}
***************
*** 117,124 ****
}
! QString num2qstring(unsigned long num){
! QString temp;
! temp.sprintf("%015ld",num);
! return temp;
}
--- 117,124 ----
}
! QString num2qstring(KIO::filesize_t num){
! char buf[25];
! sprintf(buf,"%025llu",num);
! return QString(buf);
}
***************
*** 247,251 ****
QString comment = KMimeType::mimeType(_vf->vfile_getMime())->comment(text, false);
QString myLinkDest = _vf->vfile_getSymDest();
! long long mySize = _vf->vfile_getSize();
QString text2 = text.copy();
--- 247,251 ----
QString comment = KMimeType::mimeType(_vf->vfile_getMime())->comment(text, false);
QString myLinkDest = _vf->vfile_getSymDest();
! KIO::filesize_t mySize = _vf->vfile_getSize();
QString text2 = text.copy();
Index: krdetailedviewitem.h
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/krusader/Panel/krdetailedviewitem.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** krdetailedviewitem.h 11 Sep 2003 21:58:35 -0000 1.8
--- krdetailedviewitem.h 19 Sep 2003 22:35:32 -0000 1.9
***************
*** 51,55 ****
bool isDir() const { return (_vf ? _vf->vfile_isDir() : false); }
bool isExecutable() const { return (_vf ? _vf->vfile_isExecutable() : false); }
! unsigned long size() const { return (_vf ? _vf->vfile_getSize() : 0); }
QString dateTime() const;
time_t getTime_t() const { return _vf->vfile_getTime_t(); }
--- 51,55 ----
bool isDir() const { return (_vf ? _vf->vfile_isDir() : false); }
bool isExecutable() const { return (_vf ? _vf->vfile_isExecutable() : false); }
! KIO::filesize_t size() const { return (_vf ? _vf->vfile_getSize() : 0); }
QString dateTime() const;
time_t getTime_t() const { return _vf->vfile_getTime_t(); }
***************
*** 79,83 ****
private:
// used INTERNALLY when calculation of dir size changes the displayed size of the item
! inline void setSize(unsigned long size) { _vf->vfile_setSize(size); }
vfile *_vf;
--- 79,83 ----
private:
// used INTERNALLY when calculation of dir size changes the displayed size of the item
! inline void setSize(KIO::filesize_t size) { _vf->vfile_setSize(size); }
vfile *_vf;
Index: krview.h
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/krusader/Panel/krview.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** krview.h 15 Jul 2003 12:09:26 -0000 1.5
--- krview.h 19 Sep 2003 22:35:32 -0000 1.6
***************
*** 109,117 ****
//////////////////////////////////////////////////////
virtual uint numSelected() const { return _numSelected; }
! virtual long long selectedSize() const { return _selectedSize; }
virtual uint numFiles() const { return _count-_numDirs; }
virtual uint numDirs() const { return _numDirs; }
virtual uint count() const { return _count; }
! virtual long long countSize() const { return _countSize; }
virtual void getSelectedItems(QStringList* names);
virtual void getSelectedKrViewItems(KrViewItemList *items);
--- 109,117 ----
//////////////////////////////////////////////////////
virtual uint numSelected() const { return _numSelected; }
! virtual KIO::filesize_t selectedSize() const { return _selectedSize; }
virtual uint numFiles() const { return _count-_numDirs; }
virtual uint numDirs() const { return _numDirs; }
virtual uint count() const { return _count; }
! virtual KIO::filesize_t countSize() const { return _countSize; }
virtual void getSelectedItems(QStringList* names);
virtual void getSelectedKrViewItems(KrViewItemList *items);
***************
*** 155,159 ****
QString _nameToMakeCurrent;
uint _numSelected, _count, _numDirs;
! long long _countSize, _selectedSize;
bool _left;
};
--- 155,159 ----
QString _nameToMakeCurrent;
uint _numSelected, _count, _numDirs;
! KIO::filesize_t _countSize, _selectedSize;
bool _left;
};
Index: krviewitem.h
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/krusader/Panel/krviewitem.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** krviewitem.h 26 Aug 2003 22:07:03 -0000 1.5
--- krviewitem.h 19 Sep 2003 22:35:32 -0000 1.6
***************
*** 32,35 ****
--- 32,36 ----
#include <sys/types.h>
+ #include <kio/global.h>
class QString;
***************
*** 43,47 ****
virtual bool isDir() const = 0;
virtual bool isExecutable() const = 0;
! virtual unsigned long size() const = 0;
virtual QString dateTime() const = 0;
virtual time_t getTime_t() const = 0;
--- 44,48 ----
virtual bool isDir() const = 0;
virtual bool isExecutable() const = 0;
! virtual KIO::filesize_t size() const = 0;
virtual QString dateTime() const = 0;
virtual time_t getTime_t() const = 0;
Index: panelfunc.cpp
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/krusader/Panel/panelfunc.cpp,v
retrieving revision 1.36
retrieving revision 1.37
diff -C2 -d -r1.36 -r1.37
*** panelfunc.cpp 19 Sep 2003 11:10:30 -0000 1.36
--- panelfunc.cpp 19 Sep 2003 22:35:32 -0000 1.37
***************
*** 206,209 ****
--- 206,212 ----
QString mypath = path;
+ // clear the view - to avoid a repaint crash
+ panel->view->clear();
+
// make sure local urls are handles ok
if ( mypath.lower().startsWith( "file:" ) )
***************
*** 728,731 ****
--- 731,737 ----
}
+ // clear the view - to avoid a repaint crash
+ panel->view->clear();
+
if( changeVFS ){
vfsStack.remove();
***************
*** 828,833 ****
files() ->vfs_getFiles( &fileNames );
! long long totalSize = 0;
! long totalDirs = 0, totalFiles = 0;
for ( QStringList::Iterator file = fileNames.begin(); file != fileNames.end(); ++file ) {
files() ->vfs_calcSpace( ( *file ), &totalSize, &totalFiles, &totalDirs );
--- 834,839 ----
files() ->vfs_getFiles( &fileNames );
! KIO::filesize_t totalSize = 0;
! unsigned long totalDirs = 0, totalFiles = 0;
for ( QStringList::Iterator file = fileNames.begin(); file != fileNames.end(); ++file ) {
files() ->vfs_calcSpace( ( *file ), &totalSize, &totalFiles, &totalDirs );
***************
*** 927,931 ****
}
! bool ListPanelFunc::calcSpace(QStringList & names, long long & totalSize, long & totalFiles, long & totalDirs) {
KrCalcSpaceDialog calc(krApp, files(), names, true);
calc.exec();
--- 933,937 ----
}
! bool ListPanelFunc::calcSpace(QStringList & names,KIO::filesize_t & totalSize,unsigned long & totalFiles,unsigned long & totalDirs) {
KrCalcSpaceDialog calc(krApp, files(), names, true);
calc.exec();
***************
*** 937,940 ****
--- 943,949 ----
void ListPanelFunc::FTPDisconnect() {
+ // clear the view - to avoid a repaint crash
+ panel->view->clear();
+
// you can disconnect only if connected !
if ( files() ->vfs_getType() == "ftp" ) {
***************
*** 1006,1009 ****
--- 1015,1020 ----
ListPanelFunc::~ListPanelFunc() {
+ // clear the view - to avoid a repaint crash
+ panel->view->clear();
while ( vfsStack.remove() )
; // delete all vfs objects
Index: panelfunc.h
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/krusader/Panel/panelfunc.h,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** panelfunc.h 4 Sep 2003 21:00:36 -0000 1.13
--- panelfunc.h 19 Sep 2003 22:35:32 -0000 1.14
***************
*** 50,56 ****
*/
class CalcThread : public QThread{
! long long m_totalSize;
! long m_totalFiles;
! long m_totalDirs;
const QStringList m_names;
vfs * m_files;
--- 50,56 ----
*/
class CalcThread : public QThread{
! KIO::filesize_t m_totalSize;
! unsigned long m_totalFiles;
! unsigned long m_totalDirs;
const QStringList m_names;
vfs * m_files;
***************
*** 61,67 ****
void cleanUp(); // Deletes this, if possible
public:
! long long getTotalSize() const {return m_totalSize;} // the result
! long getTotalFiles() const {return m_totalFiles;} // the result
! long getTotalDirs() const {return m_totalDirs;} // the result
const QStringList & getNames() const {return m_names;} // list of directories to calculate
CalcThread(KrCalcSpaceDialog * parent, vfs * files, const QStringList & names);
--- 61,67 ----
void cleanUp(); // Deletes this, if possible
public:
! KIO::filesize_t getTotalSize() const {return m_totalSize;} // the result
! unsigned long getTotalFiles() const {return m_totalFiles;} // the result
! unsigned long getTotalDirs() const {return m_totalDirs;} // the result
const QStringList & getNames() const {return m_names;} // list of directories to calculate
CalcThread(KrCalcSpaceDialog * parent, vfs * files, const QStringList & names);
***************
*** 85,91 ****
KrCalcSpaceDialog(QWidget *parent, vfs * files, const QStringList & names, bool autoclose);
~KrCalcSpaceDialog();
! long long getTotalSize() const {return m_thread->getTotalSize();} // the result
! long getTotalFiles() const {return m_thread->getTotalFiles();} // the result
! long getTotalDirs() const {return m_thread->getTotalDirs();} // the result
bool wasCanceled() const {return m_canceled;} // cancel was pressed; result is probably wrong
public slots:
--- 85,91 ----
KrCalcSpaceDialog(QWidget *parent, vfs * files, const QStringList & names, bool autoclose);
~KrCalcSpaceDialog();
! KIO::filesize_t getTotalSize() const {return m_thread->getTotalSize();} // the result
! unsigned long getTotalFiles() const {return m_thread->getTotalFiles();} // the result
! unsigned long getTotalDirs() const {return m_thread->getTotalDirs();} // the result
bool wasCanceled() const {return m_canceled;} // cancel was pressed; result is probably wrong
public slots:
***************
*** 131,135 ****
// and disappears, if the calculation is done. Returns true, if the result is ok and false
// otherwise (Cancel was pressed).
! bool calcSpace(QStringList & names, long long & totalSize, long & totalFiles, long & totalDirs);
void FTPDisconnect();
void newFTPconnection(QString host=QString::null);
--- 131,135 ----
// and disappears, if the calculation is done. Returns true, if the result is ok and false
// otherwise (Cancel was pressed).
! bool calcSpace(QStringList & names,KIO::filesize_t & totalSize,unsigned long & totalFiles,unsigned long & totalDirs);
void FTPDisconnect();
void newFTPconnection(QString host=QString::null);
|
|
From: <ya...@us...> - 2003-09-19 22:35:37
|
Update of /cvsroot/krusader/krusader_kde3/krusader In directory sc8-pr-cvs1:/tmp/cvs-serv1378/krusader Modified Files: Makefile.am Log Message: Change the size type from unsigned long to KIO::filesize_t. Clear the view every time a VFS is deleted to avoid a repaint crash Index: Makefile.am =================================================================== RCS file: /cvsroot/krusader/krusader_kde3/krusader/Makefile.am,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** Makefile.am 19 Sep 2003 16:21:21 -0000 1.6 --- Makefile.am 19 Sep 2003 22:35:32 -0000 1.7 *************** *** 4,13 **** ## INCLUDES were found outside kdevelop specific part ! krusader_SOURCES = krservices.cpp main.cpp krusaderview.cpp krusader.cpp krslots.cpp kicons.cpp panelmanager.cpp paneltabbar.cpp krusader_LDADD = ./BookMan/libBookMan.a ./Dialogs/libDialogs.a ./GUI/libGUI.a ./Konfigurator/libKonfigurator.a ./KViewer/libKViewer.a ./MountMan/libMountMan.a ./Panel/libPanel.a ./RemoteMan/libRemoteMan.a ./VFS/libVFS.a ./Search/libSearch.a VFS/libVFS.a KViewer/libKViewer.a Dialogs/libDialogs.a BookMan/libBookMan.a -lm $(LIB_KPARTS) $(LIB_KFILE) $(LIB_KDEUI) $(LIB_KDECORE) $(LIB_QT) $(LIBSOCKET) SUBDIRS = BookMan Dialogs GUI Konfigurator KViewer MountMan Panel RemoteMan VFS Search ! EXTRA_DIST = krusader.desktop lo32-app-krusader.png lo16-app-krusader.png defaults.h kicons.cpp kicons.h krslots.cpp krslots.h krusader.cpp krusader.h krusaderui.rc krusaderview.cpp krusaderview.h lo32-app-krusader2.png main.cpp resources.h x-ace.desktop krservices.cpp krservices.h install-data-local: --- 4,13 ---- ## INCLUDES were found outside kdevelop specific part ! krusader_SOURCES = paneltabbar.cpp panelmanager.cpp krservices.cpp main.cpp krusaderview.cpp krusader.cpp krslots.cpp kicons.cpp krusader_LDADD = ./BookMan/libBookMan.a ./Dialogs/libDialogs.a ./GUI/libGUI.a ./Konfigurator/libKonfigurator.a ./KViewer/libKViewer.a ./MountMan/libMountMan.a ./Panel/libPanel.a ./RemoteMan/libRemoteMan.a ./VFS/libVFS.a ./Search/libSearch.a VFS/libVFS.a KViewer/libKViewer.a Dialogs/libDialogs.a BookMan/libBookMan.a -lm $(LIB_KPARTS) $(LIB_KFILE) $(LIB_KDEUI) $(LIB_KDECORE) $(LIB_QT) $(LIBSOCKET) SUBDIRS = BookMan Dialogs GUI Konfigurator KViewer MountMan Panel RemoteMan VFS Search ! EXTRA_DIST = krusader.desktop lo32-app-krusader.png lo16-app-krusader.png defaults.h kicons.cpp kicons.h krslots.cpp krslots.h krusader.cpp krusader.h krusaderui.rc krusaderview.cpp krusaderview.h lo32-app-krusader2.png main.cpp resources.h x-ace.desktop krservices.cpp krservices.h panelmanager.cpp panelmanager.h paneltabbar.cpp paneltabbar.h install-data-local: |
7 messages has been excluded from this view by a project administrator.
