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
|
Update of /cvsroot/krusader/krusader_kde3/krusader/Synchronizer
In directory sc8-pr-cvs1:/tmp/cvs-serv27278/krusader_kde3/krusader/Synchronizer
Modified Files:
synchronizedialog.cpp synchronizer.cpp synchronizer.h
synchronizergui.cpp synchronizergui.h
Log Message:
FIXED: syncronizer: performance bugfix, immediate stop, progress bar bugfix
Index: synchronizedialog.cpp
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/krusader/Synchronizer/synchronizedialog.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** synchronizedialog.cpp 13 Dec 2003 23:19:59 -0000 1.3
--- synchronizedialog.cpp 16 Dec 2003 16:35:03 -0000 1.4
***************
*** 138,141 ****
--- 138,146 ----
this, SLOT( processedSizes( int, KIO::filesize_t, int, KIO::filesize_t, int, KIO::filesize_t) ) );
connect( synchronizer, SIGNAL( pauseAccepted() ), this, SLOT( pauseAccepted() ) );
+
+ if( !cbRightToLeft->isChecked() ) leftCopySize = 0;
+ if( !cbLeftToRight->isChecked() ) rightCopySize = 0;
+ if( !cbDeletable->isChecked() ) deleteSize = 0;
+
synchronizer->synchronize( cbRightToLeft->isChecked(), cbLeftToRight->isChecked(),
cbDeletable->isChecked(), !cbOverwrite->isChecked() );
Index: synchronizer.cpp
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/krusader/Synchronizer/synchronizer.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** synchronizer.cpp 15 Dec 2003 18:03:34 -0000 1.3
--- synchronizer.cpp 16 Dec 2003 16:35:03 -0000 1.4
***************
*** 54,59 ****
}
! void Synchronizer::compare( QString leftURL, QString rightURL, QString filter, bool subDirs,
! bool symLinks, bool igDate, bool asymm, bool cmpByCnt )
{
resultList.clear();
--- 54,59 ----
}
! int Synchronizer::compare( QString leftURL, QString rightURL, QString filter, bool subDirs,
! bool symLinks, bool igDate, bool asymm, bool cmpByCnt, bool autoSc )
{
resultList.clear();
***************
*** 64,67 ****
--- 64,68 ----
asymmetric = asymm;
cmpByContent = cmpByCnt;
+ autoScroll = autoSc;
fileFilter = filter;
stopped = false;
***************
*** 75,78 ****
--- 76,80 ----
emit statusInfo( i18n( "File number:%1" ).arg( fileCount ) );
+ return fileCount;
}
***************
*** 100,104 ****
/* walking through in the left directory */
! for( left_file=left_directory->vfs_getFirstFile(); left_file != 0 ;
left_file=left_directory->vfs_getNextFile() )
{
--- 102,106 ----
/* walking through in the left directory */
! for( left_file=left_directory->vfs_getFirstFile(); left_file != 0 && !stopped ;
left_file=left_directory->vfs_getNextFile() )
{
***************
*** 124,128 ****
/* walking through in the right directory */
! for( right_file=right_directory->vfs_getFirstFile(); right_file != 0 ;
right_file=right_directory->vfs_getNextFile() )
{
--- 126,130 ----
/* walking through in the right directory */
! for( right_file=right_directory->vfs_getFirstFile(); right_file != 0 && !stopped ;
right_file=right_directory->vfs_getNextFile() )
{
***************
*** 142,146 ****
if( recurseSubDirs )
{
! for( left_file=left_directory->vfs_getFirstFile(); left_file != 0 ;
left_file=left_directory->vfs_getNextFile() )
{
--- 144,148 ----
if( recurseSubDirs )
{
! for( left_file=left_directory->vfs_getFirstFile(); left_file != 0 && !stopped ;
left_file=left_directory->vfs_getNextFile() )
{
***************
*** 158,162 ****
}
! for( right_file=right_directory->vfs_getFirstFile(); right_file != 0 ;
right_file=right_directory->vfs_getNextFile() )
{
--- 160,165 ----
}
! /* walking through the the right side subdirectories */
! for( right_file=right_directory->vfs_getFirstFile(); right_file != 0 && !stopped ;
right_file=right_directory->vfs_getNextFile() )
{
***************
*** 221,225 ****
}
! emit statusInfo( i18n( "Scanned directories:%1" ).arg( scannedDirs++ ) );
return v;
--- 224,228 ----
}
! emit statusInfo( i18n( "Scanned directories:%1" ).arg( ++scannedDirs ) );
return v;
***************
*** 238,242 ****
time_t leftDate, time_t rightDate, TaskType tsk, bool isDir )
{
! bool marked = isMarked( tsk, existsLeft && existsRight );
SynchronizerFileItem *item = new SynchronizerFileItem( file_name, dir, marked,
existsLeft, existsRight, leftSize, rightSize, leftDate, rightDate, tsk, isDir, parent );
--- 241,245 ----
time_t leftDate, time_t rightDate, TaskType tsk, bool isDir )
{
! bool marked = autoScroll ? isMarked( tsk, existsLeft && existsRight ) : false;
SynchronizerFileItem *item = new SynchronizerFileItem( file_name, dir, marked,
existsLeft, existsRight, leftSize, rightSize, leftDate, rightDate, tsk, isDir, parent );
***************
*** 248,255 ****
markParentDirectories( item );
fileCount++;
- emit comparedFileData( item );
}
! if( displayUpdateCount++ % DISPLAY_UPDATE_PERIOD == (DISPLAY_UPDATE_PERIOD-1) )
qApp->processEvents();
--- 251,259 ----
markParentDirectories( item );
fileCount++;
}
! emit comparedFileData( item );
!
! if( marked && (displayUpdateCount++ % DISPLAY_UPDATE_PERIOD == (DISPLAY_UPDATE_PERIOD-1) ) )
qApp->processEvents();
***************
*** 323,327 ****
/* walking through the directory files */
! for( file=directory->vfs_getFirstFile(); file != 0 ; file = directory->vfs_getNextFile() )
{
if ( file->vfile_isDir() || file->vfile_isSymLink() )
--- 327,331 ----
/* walking through the directory files */
! for( file=directory->vfs_getFirstFile(); file != 0 && !stopped; file = directory->vfs_getNextFile() )
{
if ( file->vfile_isDir() || file->vfile_isSymLink() )
***************
*** 340,344 ****
/* walking through the subdirectories */
! for( file=directory->vfs_getFirstFile(); file != 0 ; file=directory->vfs_getNextFile() )
{
if ( file->vfile_isDir() && (followSymLinks || !file->vfile_isSymLink()) )
--- 344,348 ----
/* walking through the subdirectories */
! for( file=directory->vfs_getFirstFile(); file != 0 && !stopped; file=directory->vfs_getNextFile() )
{
if ( file->vfile_isDir() && (followSymLinks || !file->vfile_isSymLink()) )
***************
*** 396,407 ****
markParentDirectories( item->parent() );
item->parent()->setMarked( true );
fileCount++;
! emit comparedFileData( item->parent() );
}
! void Synchronizer::refresh()
{
- int step = 0;
fileCount = 0;
--- 400,411 ----
markParentDirectories( item->parent() );
+
item->parent()->setMarked( true );
fileCount++;
! emit markChanged( item->parent() );
}
! int Synchronizer::refresh()
{
fileCount = 0;
***************
*** 410,413 ****
--- 414,419 ----
while( item )
{
+ item->noteMark();
+
bool marked = isMarked( item->task(), item->existsInLeft() && item->existsInRight() );
item->setMarked( marked );
***************
*** 417,430 ****
markParentDirectories( item );
fileCount++;
- emit comparedFileData( item );
}
- if( step++ % DISPLAY_UPDATE_PERIOD == (DISPLAY_UPDATE_PERIOD-1) )
- qApp->processEvents();
-
item = resultList.next();
}
emit statusInfo( i18n( "File number:%1" ).arg( fileCount ) );
}
--- 423,442 ----
markParentDirectories( item );
fileCount++;
}
item = resultList.next();
}
+ item = resultList.first();
+ while( item )
+ {
+ if( item->isMarkChanged() )
+ emit markChanged( item );
+
+ item = resultList.next();
+ }
+
emit statusInfo( i18n( "File number:%1" ).arg( fileCount ) );
+ return fileCount;
}
***************
*** 776,780 ****
compareArray = QByteArray();
! compareFinished = errorPrinted = false;
compareResult = true;
waitWindow = 0;
--- 788,792 ----
compareArray = QByteArray();
! compareFinished = errorPrinted = statusLineChanged = false;
compareResult = true;
waitWindow = 0;
***************
*** 782,786 ****
rightReadJob->suspend();
! QTimer *timer = new QTimer( this );
connect( timer, SIGNAL(timeout()), SLOT(putWaitWindow()) );
timer->start( 1500, true );
--- 794,798 ----
rightReadJob->suspend();
! timer = new QTimer( this );
connect( timer, SIGNAL(timeout()), SLOT(putWaitWindow()) );
timer->start( 1500, true );
***************
*** 794,798 ****
if( waitWindow )
delete waitWindow;
!
return compareResult;
}
--- 806,813 ----
if( waitWindow )
delete waitWindow;
!
! if( statusLineChanged )
! emit statusInfo( i18n( "Scanned directories:%1" ).arg( scannedDirs ) );
!
return compareResult;
}
***************
*** 860,863 ****
--- 875,879 ----
if( job->error() && job->error() != KIO::ERR_USER_CANCELED && !errorPrinted )
{
+ timer->stop();
errorPrinted = true;
KMessageBox::error(0, i18n("IO error at comparing file %1 with %2!")
***************
*** 886,898 ****
void Synchronizer::putWaitWindow()
{
! waitWindow = new QProgressDialog( 0, "SynchronizerWait", true );
! waitWindow->setLabelText( i18n( "Comparing file %1..." ).arg( leftURL.fileName() ) );
! waitWindow->setTotalSteps( 100 );
! waitWindow->setAutoClose( false );
! waitWindow->show();
! if( leftReadJob )
! connect(leftReadJob, SIGNAL(percent (KIO::Job *, unsigned long)),
! this, SLOT(comparePercent(KIO::Job *, unsigned long)));
}
--- 902,922 ----
void Synchronizer::putWaitWindow()
{
! if( autoScroll )
! {
! waitWindow = new QProgressDialog( 0, "SynchronizerWait", true );
! waitWindow->setLabelText( i18n( "Comparing file %1..." ).arg( leftURL.fileName() ) );
! waitWindow->setTotalSteps( 100 );
! waitWindow->setAutoClose( false );
! waitWindow->show();
! if( leftReadJob )
! connect(leftReadJob, SIGNAL(percent (KIO::Job *, unsigned long)),
! this, SLOT(comparePercent(KIO::Job *, unsigned long)));
! }
! else
! {
! emit statusInfo ( i18n( "Comparing file %1..." ).arg( leftURL.fileName() ) );
! statusLineChanged = true;
! }
}
Index: synchronizer.h
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/krusader/Synchronizer/synchronizer.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** synchronizer.h 15 Dec 2003 18:03:35 -0000 1.3
--- synchronizer.h 16 Dec 2003 16:35:03 -0000 1.4
***************
*** 64,67 ****
--- 64,68 ----
bool m_overWrite; // overwrite flag
QString m_destination; // the destination URL at rename
+ bool m_lastMark; // the previous mark flag
public:
***************
*** 75,79 ****
m_rightDate( rightDate ),m_task( tsk ), m_isDir( isDir ),
m_parent(parent), m_userData( 0 ), m_overWrite( false ),
! m_destination( QString::null ) {}
inline bool isMarked() {return m_marked;}
--- 76,80 ----
m_rightDate( rightDate ),m_task( tsk ), m_isDir( isDir ),
m_parent(parent), m_userData( 0 ), m_overWrite( false ),
! m_destination( QString::null ), m_lastMark( false ) {}
inline bool isMarked() {return m_marked;}
***************
*** 96,99 ****
--- 97,102 ----
inline QString destination() {return m_destination;}
inline void setDestination(QString d) {m_destination = d;}
+ inline void noteMark() {m_lastMark = m_marked;}
+ inline bool isMarkChanged() {return m_lastMark != m_marked;}
};
***************
*** 107,115 ****
public:
Synchronizer();
! void compare( QString leftURL, QString rightURL, QString filter, bool subDirs, bool symLinks,
! bool igDate, bool asymm, bool cmpByCnt );
void stop() {stopped = true;}
void setMarkFlags( bool left, bool equal, bool differs, bool right, bool dup, bool sing, bool del );
! void refresh();
bool totalSizes( int *, KIO::filesize_t *, int *, KIO::filesize_t *, int *, KIO::filesize_t * );
void synchronize( bool leftCopyEnabled, bool rightCopyEnabled, bool deleteEnabled, bool overWrite );
--- 110,118 ----
public:
Synchronizer();
! int compare( QString leftURL, QString rightURL, QString filter, bool subDirs, bool symLinks,
! bool igDate, bool asymm, bool cmpByCnt, bool autoSc );
void stop() {stopped = true;}
void setMarkFlags( bool left, bool equal, bool differs, bool right, bool dup, bool sing, bool del );
! int refresh();
bool totalSizes( int *, KIO::filesize_t *, int *, KIO::filesize_t *, int *, KIO::filesize_t * );
void synchronize( bool leftCopyEnabled, bool rightCopyEnabled, bool deleteEnabled, bool overWrite );
***************
*** 121,124 ****
--- 124,128 ----
signals:
void comparedFileData( SynchronizerFileItem * );
+ void markChanged( SynchronizerFileItem * );
void synchronizationFinished();
void processedSizes( int, KIO::filesize_t, int, KIO::filesize_t, int, KIO::filesize_t );
***************
*** 165,168 ****
--- 169,173 ----
bool asymmetric; // asymmetric directory update
bool cmpByContent; // compare the files by content
+ bool autoScroll; // automatic update of the directory
QPtrList<SynchronizerFileItem> resultList; // the found files
QString leftBaseDir; // the left-side base directory
***************
*** 204,207 ****
--- 209,213 ----
bool compareFinished;// flag indicates, that comparation is finished
bool compareResult; // the result of the comparation
+ bool statusLineChanged; // true if the status line was changed
bool errorPrinted; // flag indicates error
QProgressDialog *waitWindow; // the wait window
***************
*** 209,212 ****
--- 215,219 ----
KIO::TransferJob *rightReadJob; // compare right read job
QByteArray compareArray; // the array for comparing
+ QTimer *timer; // timer to show the process dialog at compare by content
};
Index: synchronizergui.cpp
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/krusader/Synchronizer/synchronizergui.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** synchronizergui.cpp 15 Dec 2003 18:03:35 -0000 1.5
--- synchronizergui.cpp 16 Dec 2003 16:35:03 -0000 1.6
***************
*** 828,831 ****
--- 828,833 ----
cbAsymmetric = new QCheckBox( i18n( "Asymmetric" ), optionGrid, "cbAsymmetric" );
cbAsymmetric->setChecked( krConfig->readBoolEntry( "Asymmetric", _Asymmetric ) );
+ cbAutoScroll = new QCheckBox( i18n( "Automatic Scrolling" ), optionGrid, "cbAutoScroll" );
+ cbAutoScroll->setChecked( krConfig->readBoolEntry( "Automatic Scrolling", _AutoScroll ) );
/* =========================== Show options groupbox ============================= */
***************
*** 993,996 ****
--- 995,1000 ----
connect( &synchronizer, SIGNAL( comparedFileData( SynchronizerFileItem * ) ), this,
SLOT( addFile( SynchronizerFileItem * ) ) );
+ connect( &synchronizer, SIGNAL( markChanged( SynchronizerFileItem * ) ), this,
+ SLOT( markChanged( SynchronizerFileItem * ) ) );
connect( &synchronizer, SIGNAL( statusInfo( QString ) ), this, SLOT( statusInfo( QString ) ) );
***************
*** 1060,1063 ****
--- 1064,1068 ----
krConfig->writeEntry("Ignore Date", cbIgnoreDate->isChecked() );
krConfig->writeEntry("Asymmetric", cbAsymmetric->isChecked() );
+ krConfig->writeEntry("Automatic Scrolling", cbAutoScroll->isChecked() );
krConfig->writeEntry("LeftToRight Button", btnLeftToRight->isOn() );
krConfig->writeEntry("Equals Button", btnEquals->isOn() );
***************
*** 1073,1076 ****
--- 1078,1083 ----
void SynchronizerGUI::compare()
{
+ bool autoScrolling = cbAutoScroll->isChecked();
+
syncList->clear();
lastItem = 0;
***************
*** 1086,1100 ****
btnSynchronize->setEnabled( false );
disableMarkButtons();
! synchronizer.compare(leftLocation->currentText(), rightLocation->currentText(), fileFilter->currentText(),
! cbSubdirs->isChecked(), cbSymlinks->isChecked(), cbIgnoreDate->isChecked(),
! cbAsymmetric->isChecked(), cbByContent->isChecked() );
enableMarkButtons();
btnStopComparing->setEnabled( isComparing = false );
btnCompareDirs->setEnabled( true );
! if( syncList->childCount() )
btnSynchronize->setEnabled( true );
if( wasClosed )
closeDialog();
}
--- 1093,1111 ----
btnSynchronize->setEnabled( false );
disableMarkButtons();
! int fileCount = synchronizer.compare(leftLocation->currentText(), rightLocation->currentText(),
! fileFilter->currentText(), cbSubdirs->isChecked(), cbSymlinks->isChecked(),
! cbIgnoreDate->isChecked(), cbAsymmetric->isChecked(), cbByContent->isChecked(),
! autoScrolling );
enableMarkButtons();
btnStopComparing->setEnabled( isComparing = false );
btnCompareDirs->setEnabled( true );
! if( fileCount )
btnSynchronize->setEnabled( true );
if( wasClosed )
closeDialog();
+
+ if( !autoScrolling )
+ refresh();
}
***************
*** 1154,1157 ****
--- 1165,1170 ----
if( listItem )
{
+ if( !item->isMarked() )
+ listItem->setVisible( false );
listItem->setPixmap(0, isDir ? folderIcon : fileIcon);
syncList->ensureItemVisible( listItem );
***************
*** 1159,1162 ****
--- 1172,1182 ----
}
+ void SynchronizerGUI::markChanged( SynchronizerFileItem *item )
+ {
+ SyncViewItem *listItem = (SyncViewItem *)item->userData();
+ if( listItem )
+ listItem->setVisible( item->isMarked() );
+ }
+
void SynchronizerGUI::subdirsChecked( bool isOn )
{
***************
*** 1206,1218 ****
if( !isComparing )
{
- syncList->clear();
setMarkFlags();
btnCompareDirs->setEnabled( false );
btnSynchronize->setEnabled( false );
disableMarkButtons();
! synchronizer.refresh();
enableMarkButtons();
btnCompareDirs->setEnabled( true );
! if( syncList->childCount() )
btnSynchronize->setEnabled( true );
}
--- 1226,1237 ----
if( !isComparing )
{
setMarkFlags();
btnCompareDirs->setEnabled( false );
btnSynchronize->setEnabled( false );
disableMarkButtons();
! int fileCount = synchronizer.refresh();
enableMarkButtons();
btnCompareDirs->setEnabled( true );
! if( fileCount )
btnSynchronize->setEnabled( true );
}
***************
*** 1245,1247 ****
--- 1264,1267 ----
{
statusLabel->setText( info );
+ qApp->processEvents();
}
Index: synchronizergui.h
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/krusader/Synchronizer/synchronizergui.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** synchronizergui.h 13 Dec 2003 17:49:49 -0000 1.3
--- synchronizergui.h 16 Dec 2003 16:35:03 -0000 1.4
***************
*** 96,105 ****
void closeDialog();
void refresh();
! void subdirsChecked( bool );
! void statusInfo( QString );
!
protected slots:
void reject();
void addFile( SynchronizerFileItem * );
private:
--- 96,106 ----
void closeDialog();
void refresh();
!
protected slots:
void reject();
void addFile( SynchronizerFileItem * );
+ void markChanged( SynchronizerFileItem * );
+ void statusInfo( QString );
+ void subdirsChecked( bool );
private:
***************
*** 122,125 ****
--- 123,127 ----
QCheckBox *cbIgnoreDate;
QCheckBox *cbAsymmetric;
+ QCheckBox *cbAutoScroll;
QPushButton *btnCompareDirs;
|
|
From: <ck...@us...> - 2003-12-16 16:35:07
|
Update of /cvsroot/krusader/krusader_kde3/krusader In directory sc8-pr-cvs1:/tmp/cvs-serv27278/krusader_kde3/krusader Modified Files: defaults.h Log Message: FIXED: syncronizer: performance bugfix, immediate stop, progress bar bugfix Index: defaults.h =================================================================== RCS file: /cvsroot/krusader/krusader_kde3/krusader/defaults.h,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** defaults.h 12 Dec 2003 22:23:20 -0000 1.5 --- defaults.h 16 Dec 2003 16:35:03 -0000 1.6 *************** *** 192,195 **** --- 192,197 ---- // Asymmetric Client-File Server compare mode ///////////// #define _Asymmetric false + // Auto scrolling during comparing ///////////// + #define _AutoScroll false // The right arrow button is turned on ///////////// #define _BtnLeftToRight true |
|
From: <er...@us...> - 2003-12-15 22:05:45
|
Update of /cvsroot/krusader/krusader_kde3/krusader/UserMenu
In directory sc8-pr-cvs1:/tmp/cvs-serv5693/krusader/UserMenu
Modified Files:
usermenu.cpp
Log Message:
add: actually run a line
Index: usermenu.cpp
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/krusader/UserMenu/usermenu.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** usermenu.cpp 15 Dec 2003 21:01:27 -0000 1.4
--- usermenu.cpp 15 Dec 2003 22:05:42 -0000 1.5
***************
*** 1,8 ****
/***************************************************************************
! usermenu.cpp - description
! -------------------
! begin : Sat Dec 6 2003
! copyright : (C) 2003 by Shie Erlich & Rafi Yanai
! email :
***************************************************************************/
--- 1,8 ----
/***************************************************************************
! usermenu.cpp - description
! -------------------
! begin : Sat Dec 6 2003
! copyright : (C) 2003 by Shie Erlich & Rafi Yanai
! email :
***************************************************************************/
***************
*** 19,22 ****
--- 19,23 ----
#include "../krusaderview.h"
#include "../krusader.h"
+ #include "../defaults.h"
#include "../Panel/listpanel.h"
#include <kdebug.h>
***************
*** 24,38 ****
/**
!
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
--- 25,39 ----
/**
!
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
***************
*** 46,50 ****
%_and% - number of folders
%_fm% - filter mask (for example: *, *.cpp, *.h etc.)
!
*/
UMCmd UserMenu::_expressions[ NUM_EXPS ] = {
--- 47,51 ----
%_and% - number of folders
%_fm% - filter mask (for example: *, *.cpp, *.h etc.)
!
*/
UMCmd UserMenu::_expressions[ NUM_EXPS ] = {
***************
*** 68,79 ****
// replace %% and prepare string
! cmd = expand(cmd);
! //kdWarning() << "expanded " << cmd << endl;
! // run the cmd from the shell
}
QString UserMenu::expand( QString str ) {
! QString result=QString::null, exp=QString::null;
int beg, end, i;
unsigned int idx = 0;
--- 69,90 ----
// replace %% and prepare string
! cmd = expand( cmd );
! //kdWarning() << cmd << endl;
! // ............... run the cmd from the shell .............
! QString save = getcwd( 0, 0 );
! KShellProcess proc;
! //===> chdir( panelPath.local8Bit() ); // run the command in the panel's path
!
! // run in terminal
! proc.setUseShell(true);
! proc << "konsole" << "--noclose" << "-e" << cmd;
!
! proc.start( KProcess::DontCare );
! //===> chdir( save.local8Bit() ); // chdir back
}
QString UserMenu::expand( QString str ) {
! QString result = QString::null, exp = QString::null;
int beg, end, i;
unsigned int idx = 0;
***************
*** 84,99 ****
return QString::null;
}
! result+=str.mid(idx,beg-idx); // copy until the start of %exp%
// get the expression, and expand it using the correct expander function
// ... 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;
}
--- 95,110 ----
return QString::null;
}
! result += str.mid( idx, beg - idx ); // copy until the start of %exp%
// get the expression, and expand it using the correct expander function
// ... 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;
}
***************
*** 101,110 ****
}
// copy the rest of the string
! result+=str.mid(idx);
return result;
}
! UserMenu::UserMenu( QWidget *parent, const char *name ) : QWidget( parent, name ) {}
//////////////////////////////////////////////////////////////////////////////////////////////////////
--- 112,121 ----
}
// copy the rest of the string
! result += str.mid( idx );
return result;
}
! UserMenu::UserMenu( QWidget * parent, const char * name ) : QWidget( parent, name ) {}
//////////////////////////////////////////////////////////////////////////////////////////////////////
***************
*** 112,116 ****
//////////////////////////////////////////////////////////////////////////////////////////////////////
! UserMenuGui::UserMenuGui( QWidget *parent ) : KPopupMenu( parent ) {
insertTitle( "User Menu" );
--- 123,127 ----
//////////////////////////////////////////////////////////////////////////////////////////////////////
! UserMenuGui::UserMenuGui( QWidget * parent ) : KPopupMenu( parent ) {
insertTitle( "User Menu" );
***************
*** 152,156 ****
}
// do we need to remove last entry?
! if (i>0 && i%2 != 0) _entries.pop_back();
}
--- 163,167 ----
}
// do we need to remove last entry?
! if ( i > 0 && i % 2 != 0 ) _entries.pop_back();
}
|
|
From: <er...@us...> - 2003-12-15 21:01:57
|
Update of /cvsroot/krusader/krusader_kde3/krusader
In directory sc8-pr-cvs1:/tmp/cvs-serv24178/krusader
Modified Files:
krslots.cpp
Log Message:
fix: small issue for user menu
Index: krslots.cpp
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/krusader/krslots.cpp,v
retrieving revision 1.36
retrieving revision 1.37
diff -C2 -d -r1.36 -r1.37
*** krslots.cpp 13 Dec 2003 17:49:49 -0000 1.36
--- krslots.cpp 15 Dec 2003 21:01:54 -0000 1.37
***************
*** 600,604 ****
void KRslots::userMenu() {
UserMenu um;
! QString cmd = um.exec();
}
--- 600,604 ----
void KRslots::userMenu() {
UserMenu um;
! um.exec();
}
|
|
From: <er...@us...> - 2003-12-15 21:01:39
|
Update of /cvsroot/krusader/krusader_kde3/krusader/UserMenu
In directory sc8-pr-cvs1:/tmp/cvs-serv24070/krusader/UserMenu
Modified Files:
usermenu.cpp
Log Message:
add: expander-logic
Index: usermenu.cpp
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/krusader/UserMenu/usermenu.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** usermenu.cpp 9 Dec 2003 21:26:44 -0000 1.3
--- usermenu.cpp 15 Dec 2003 21:01:27 -0000 1.4
***************
*** 24,38 ****
/**
!
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
--- 24,38 ----
/**
!
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
***************
*** 46,50 ****
%_and% - number of folders
%_fm% - filter mask (for example: *, *.cpp, *.h etc.)
!
*/
UMCmd UserMenu::_expressions[ NUM_EXPS ] = {
--- 46,50 ----
%_and% - number of folders
%_fm% - filter mask (for example: *, *.cpp, *.h etc.)
!
*/
UMCmd UserMenu::_expressions[ NUM_EXPS ] = {
***************
*** 63,88 ****
}
! /**
! * only interface function. Executes the menu, does the work and returns a QString
! * containing a command to run. Run that command from a shell and that's it.
! */
! QString UserMenu::exec() {
// execute menu and wait for selection
QString cmd = _popup.run();
// replace %% and prepare string
! //cmd = expand(cmd);
//kdWarning() << "expanded " << cmd << endl;
! return cmd;
}
- /**
- * cycle through the input line, replacing every %% expression with valid
- * data from krusader. return the expanded string
- */
QString UserMenu::expand( QString str ) {
! QString result;
! int beg, end;
unsigned int idx = 0;
while ( idx < str.length() ) {
--- 63,80 ----
}
! void UserMenu::exec() {
// execute menu and wait for selection
QString cmd = _popup.run();
// replace %% and prepare string
! cmd = expand(cmd);
//kdWarning() << "expanded " << cmd << endl;
! // run the cmd from the shell
}
QString UserMenu::expand( QString str ) {
! QString result=QString::null, exp=QString::null;
! int beg, end, i;
unsigned int idx = 0;
while ( idx < str.length() ) {
***************
*** 92,103 ****
return QString::null;
}
! kdWarning() << str.mid( beg, end - beg + 1 ) << endl;
idx = end + 1;
}
}
UserMenu::UserMenu( QWidget *parent, const char *name ) : QWidget( parent, name ) {}
-
- UserMenu::~UserMenu() {}
//////////////////////////////////////////////////////////////////////////////////////////////////////
--- 84,110 ----
return QString::null;
}
! result+=str.mid(idx,beg-idx); // copy until the start of %exp%
!
! // get the expression, and expand it using the correct expander function
! // ... 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;
! }
idx = end + 1;
}
+ // copy the rest of the string
+ result+=str.mid(idx);
+
+ return result;
}
UserMenu::UserMenu( QWidget *parent, const char *name ) : QWidget( parent, name ) {}
//////////////////////////////////////////////////////////////////////////////////////////////////////
|
|
From: <er...@us...> - 2003-12-15 21:01:10
|
Update of /cvsroot/krusader/krusader_kde3/krusader/UserMenu
In directory sc8-pr-cvs1:/tmp/cvs-serv23981/krusader/UserMenu
Modified Files:
usermenu.h
Log Message:
add: expander-logic
Index: usermenu.h
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/krusader/UserMenu/usermenu.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** usermenu.h 12 Dec 2003 20:57:13 -0000 1.4
--- usermenu.h 15 Dec 2003 21:01:07 -0000 1.5
***************
*** 1,9 ****
/***************************************************************************
! usermenu.h - description
! -------------------
! begin : Sat Dec 6 2003
! copyright : (C) 2003 by Shie Erlich & Rafi Yanai
! email :
! ***************************************************************************/
/***************************************************************************
--- 1,9 ----
/***************************************************************************
! usermenu.h - description
! -------------------
! begin : Sat Dec 6 2003
! copyright : (C) 2003 by Shie Erlich & Rafi Yanai
! email :
! ***************************************************************************/
/***************************************************************************
***************
*** 25,38 ****
class UserMenuGui: public KPopupMenu {
! Q_OBJECT
! public:
! UserMenuGui(QWidget *parent=0);
! QString run();
! protected:
! void readEntries();
!
! private:
! QStringList _entries;
};
--- 25,38 ----
class UserMenuGui: public KPopupMenu {
! Q_OBJECT
! public:
! UserMenuGui( QWidget *parent = 0 );
! QString run();
! protected:
! void readEntries();
!
! private:
! QStringList _entries;
};
***************
*** 41,68 ****
// an expander is a function that receives a QString input, expands
// it and returns a new QString output containing the expanded expression
! typedef QString (*EXPANDER)(const QString&);
// a UMCmd is an entry containing the expression and its expanding function
typedef struct UserMenuCmd {
! QString lc_expression;
! EXPANDER expFunc;
! } UMCmd;
! class UserMenu : public QWidget {
#define NUM_EXPS 1
! Q_OBJECT
! public:
! QString exec();
! UserMenu(QWidget *parent=0, const char *name=0);
! ~UserMenu();
! protected:
! static QString expand(QString str);
! static QString expPath(const QString& str);
! private:
! UserMenuGui _popup;
! static UMCmd _expressions[NUM_EXPS];
};
--- 41,78 ----
// an expander is a function that receives a QString input, expands
// it and returns a new QString output containing the expanded expression
! typedef QString ( *EXPANDER ) ( const QString& );
// a UMCmd is an entry containing the expression and its expanding function
typedef struct UserMenuCmd {
! QString expression;
! EXPANDER expFunc;
! }
! UMCmd;
! class UserMenu : public QWidget {
#define NUM_EXPS 1
! Q_OBJECT
! public:
! /**
! * Executes the menu, does the work and returns a QString
! * containing a command to run. Run that command from a shell and that's it.
! */
! void exec();
! /**
! * cycle through the input line, replacing every %% expression with valid
! * data from krusader. return the expanded string
! */
! static QString expand( QString str );
! UserMenu( QWidget *parent = 0, const char *name = 0 );
!
! protected:
! static QString expPath( const QString& str );
!
! private:
! UserMenuGui _popup;
! static UMCmd _expressions[ NUM_EXPS ];
};
|
|
From: <ck...@us...> - 2003-12-15 18:03:38
|
Update of /cvsroot/krusader/krusader_kde3/krusader/Synchronizer
In directory sc8-pr-cvs1:/tmp/cvs-serv16821/krusader_kde3/krusader/Synchronizer
Modified Files:
synchronizer.cpp synchronizer.h synchronizergui.cpp
Log Message:
ADDED: synchronizer, compare by content
Index: synchronizer.cpp
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/krusader/Synchronizer/synchronizer.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** synchronizer.cpp 13 Dec 2003 17:49:49 -0000 1.2
--- synchronizer.cpp 15 Dec 2003 18:03:34 -0000 1.3
***************
*** 33,36 ****
--- 33,37 ----
#include "../VFS/normal_vfs.h"
#include "../VFS/vfile.h"
+ #include "../krusader.h"
#include <kurl.h>
#include <kmessagebox.h>
***************
*** 54,58 ****
void Synchronizer::compare( QString leftURL, QString rightURL, QString filter, bool subDirs,
! bool symLinks, bool igDate, bool asymm )
{
resultList.clear();
--- 55,59 ----
void Synchronizer::compare( QString leftURL, QString rightURL, QString filter, bool subDirs,
! bool symLinks, bool igDate, bool asymm, bool cmpByCnt )
{
resultList.clear();
***************
*** 62,65 ****
--- 63,67 ----
ignoreDate = igDate;
asymmetric = asymm;
+ cmpByContent = cmpByCnt;
fileFilter = filter;
stopped = false;
***************
*** 208,212 ****
{
qApp->processEvents();
! usleep( 100 );
}
}
--- 210,214 ----
{
qApp->processEvents();
! usleep( 10000 );
}
}
***************
*** 275,282 ****
TaskType task;
! if( isDir || ( leftSize == rightSize && (ignoreDate || leftDate == rightDate) ) )
! task = TT_EQUALS;
! else
{
if( asymmetric )
task = TT_COPY_TO_LEFT;
--- 277,291 ----
TaskType task;
! do
{
+ if( isDir || leftSize == rightSize && (ignoreDate || leftDate == rightDate) )
+ {
+ if( isDir || !cmpByContent || compareByContent(file_name, dir) )
+ task = TT_EQUALS;
+ else
+ task = asymmetric ? TT_COPY_TO_LEFT : TT_DIFFERS;
+ break;
+ }
+
if( asymmetric )
task = TT_COPY_TO_LEFT;
***************
*** 288,294 ****
task = TT_COPY_TO_LEFT;
else
! task = TT_DIFFERS; /* TODO TODO TODO TODO */
! }
return addItem( parent, file_name, dir, true, true, leftSize, rightSize, leftDate, rightDate, task, isDir );
}
--- 297,304 ----
task = TT_COPY_TO_LEFT;
else
! task = TT_DIFFERS;
+ }while( false );
+
return addItem( parent, file_name, dir, true, true, leftSize, rightSize, leftDate, rightDate, task, isDir );
}
***************
*** 743,745 ****
--- 753,902 ----
return url;
+ }
+
+ bool Synchronizer::compareByContent( QString file_name, QString dir )
+ {
+ if( !dir.isEmpty() )
+ dir += "/";
+
+ leftURL = fromPathOrURL( leftBaseDir + dir + file_name );
+ rightURL = fromPathOrURL( rightBaseDir + dir + file_name );
+
+ leftReadJob = KIO::get( leftURL, false, false );
+ rightReadJob = KIO::get( rightURL, false, false );
+
+ connect(leftReadJob, SIGNAL(data(KIO::Job *, const QByteArray &)),
+ this, SLOT(slotDataReceived(KIO::Job *, const QByteArray &)));
+ connect(rightReadJob, SIGNAL(data(KIO::Job *, const QByteArray &)),
+ this, SLOT(slotDataReceived(KIO::Job *, const QByteArray &)));
+ connect(leftReadJob, SIGNAL(result(KIO::Job*)),
+ this, SLOT(slotFinished(KIO::Job *)));
+ connect(rightReadJob, SIGNAL(result(KIO::Job*)),
+ this, SLOT(slotFinished(KIO::Job *)));
+
+ compareArray = QByteArray();
+ compareFinished = errorPrinted = false;
+ compareResult = true;
+ waitWindow = 0;
+
+ rightReadJob->suspend();
+
+ QTimer *timer = new QTimer( this );
+ connect( timer, SIGNAL(timeout()), SLOT(putWaitWindow()) );
+ timer->start( 1500, true );
+
+ while( !compareFinished )
+ qApp->processEvents();
+
+ timer->stop();
+ delete timer;
+
+ if( waitWindow )
+ delete waitWindow;
+
+ return compareResult;
+ }
+
+ void Synchronizer::slotDataReceived(KIO::Job *job, const QByteArray &data)
+ {
+ int bufferLen = compareArray.size();
+ int dataLen = data.size();
+
+ do
+ {
+ if( bufferLen == 0 )
+ {
+ compareArray.duplicate( data.data(), dataLen );
+ break;
+ }
+
+ int minSize = ( dataLen < bufferLen ) ? dataLen : bufferLen;
+
+ for( int i = 0; i != minSize; i++ )
+ if( data[i] != compareArray[i] )
+ {
+ abortContentComparing();
+ return;
+ }
+
+ if( minSize == bufferLen )
+ {
+ compareArray.duplicate( data.data() + bufferLen, dataLen - bufferLen );
+ if( dataLen == bufferLen )
+ return;
+ break;
+ }
+ else
+ {
+ compareArray.duplicate( compareArray.data() + dataLen, bufferLen - dataLen );
+ return;
+ }
+
+ }while ( false );
+
+ KIO::TransferJob *otherJob = ( job == leftReadJob ) ? rightReadJob : leftReadJob;
+
+ if( otherJob == 0 )
+ abortContentComparing();
+ else
+ {
+ ((KIO::TransferJob *)job)->suspend();
+ otherJob->resume();
+ }
+ }
+
+ void Synchronizer::slotFinished(KIO::Job *job)
+ {
+ KIO::TransferJob *otherJob = ( job == leftReadJob ) ? rightReadJob : leftReadJob;
+
+ if( job == leftReadJob )
+ leftReadJob = 0;
+ else
+ rightReadJob = 0;
+
+ if( otherJob )
+ otherJob->resume();
+
+ if( job->error() && job->error() != KIO::ERR_USER_CANCELED && !errorPrinted )
+ {
+ errorPrinted = true;
+ KMessageBox::error(0, i18n("IO error at comparing file %1 with %2!")
+ .arg( leftURL.path() ).arg( rightURL.path() ) );
+ abortContentComparing();
+ }
+
+ if( leftReadJob == 0 && rightReadJob == 0 )
+ {
+ if( compareArray.size() )
+ compareResult = false;
+ compareFinished = true;
+ }
+ }
+
+ void Synchronizer::abortContentComparing()
+ {
+ if( leftReadJob )
+ leftReadJob->kill( false );
+ if( rightReadJob )
+ rightReadJob->kill( false );
+
+ compareResult = false;
+ }
+
+ void Synchronizer::putWaitWindow()
+ {
+ waitWindow = new QProgressDialog( 0, "SynchronizerWait", true );
+ waitWindow->setLabelText( i18n( "Comparing file %1..." ).arg( leftURL.fileName() ) );
+ waitWindow->setTotalSteps( 100 );
+ waitWindow->setAutoClose( false );
+ waitWindow->show();
+
+ if( leftReadJob )
+ connect(leftReadJob, SIGNAL(percent (KIO::Job *, unsigned long)),
+ this, SLOT(comparePercent(KIO::Job *, unsigned long)));
+ }
+
+ void Synchronizer::comparePercent(KIO::Job *, unsigned long percent)
+ {
+ waitWindow->setProgress( percent );
}
Index: synchronizer.h
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/krusader/Synchronizer/synchronizer.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** synchronizer.h 13 Dec 2003 17:49:49 -0000 1.2
--- synchronizer.h 15 Dec 2003 18:03:35 -0000 1.3
***************
*** 35,38 ****
--- 35,39 ----
#include <qobject.h>
#include <qptrvector.h>
+ #include <qprogressdialog.h>
typedef enum
***************
*** 107,111 ****
Synchronizer();
void compare( QString leftURL, QString rightURL, QString filter, bool subDirs, bool symLinks,
! bool igDate, bool asymm );
void stop() {stopped = true;}
void setMarkFlags( bool left, bool equal, bool differs, bool right, bool dup, bool sing, bool del );
--- 108,112 ----
Synchronizer();
void compare( QString leftURL, QString rightURL, QString filter, bool subDirs, bool symLinks,
! bool igDate, bool asymm, bool cmpByCnt );
void stop() {stopped = true;}
void setMarkFlags( bool left, bool equal, bool differs, bool right, bool dup, bool sing, bool del );
***************
*** 128,131 ****
--- 129,136 ----
void slotTaskFinished(KIO::Job*);
void slotProcessedSize( KIO::Job * , KIO::filesize_t );
+ void slotDataReceived(KIO::Job *job, const QByteArray &data);
+ void slotFinished(KIO::Job *job);
+ void putWaitWindow();
+ void comparePercent(KIO::Job *, unsigned long);
private:
***************
*** 151,155 ****
void executeTask();
KURL fromPathOrURL( QString url );
!
protected:
bool recurseSubDirs; // walk through subdirectories also
--- 156,162 ----
void executeTask();
KURL fromPathOrURL( QString url );
! bool compareByContent( QString, QString );
! void abortContentComparing();
!
protected:
bool recurseSubDirs; // walk through subdirectories also
***************
*** 157,160 ****
--- 164,168 ----
bool ignoreDate; // don't use date info at comparing
bool asymmetric; // asymmetric directory update
+ bool cmpByContent; // compare the files by content
QPtrList<SynchronizerFileItem> resultList; // the found files
QString leftBaseDir; // the left-side base directory
***************
*** 193,196 ****
--- 201,212 ----
KURL leftURL; // the currently processed URL (left)
KURL rightURL; // the currently processed URL (right)
+
+ bool compareFinished;// flag indicates, that comparation is finished
+ bool compareResult; // the result of the comparation
+ bool errorPrinted; // flag indicates error
+ QProgressDialog *waitWindow; // the wait window
+ KIO::TransferJob *leftReadJob; // compare left read job
+ KIO::TransferJob *rightReadJob; // compare right read job
+ QByteArray compareArray; // the array for comparing
};
Index: synchronizergui.cpp
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/krusader/Synchronizer/synchronizergui.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** synchronizergui.cpp 13 Dec 2003 17:49:49 -0000 1.4
--- synchronizergui.cpp 15 Dec 2003 18:03:35 -0000 1.5
***************
*** 824,828 ****
cbByContent = new QCheckBox( i18n( "Compare by content" ), optionGrid, "cbByContent" );
cbByContent->setChecked( krConfig->readBoolEntry( "Compare By Content", _CompareByContent ) );
- cbByContent->setEnabled( false ); /* TODO TODO TODO TODO TODO */
cbIgnoreDate = new QCheckBox( i18n( "Ignore Date" ), optionGrid, "cbIgnoreDate" );
cbIgnoreDate->setChecked( krConfig->readBoolEntry( "Ignore Date", _IgnoreDate ) );
--- 824,827 ----
***************
*** 1089,1093 ****
synchronizer.compare(leftLocation->currentText(), rightLocation->currentText(), fileFilter->currentText(),
cbSubdirs->isChecked(), cbSymlinks->isChecked(), cbIgnoreDate->isChecked(),
! cbAsymmetric->isChecked() );
enableMarkButtons();
btnStopComparing->setEnabled( isComparing = false );
--- 1088,1092 ----
synchronizer.compare(leftLocation->currentText(), rightLocation->currentText(), fileFilter->currentText(),
cbSubdirs->isChecked(), cbSymlinks->isChecked(), cbIgnoreDate->isChecked(),
! cbAsymmetric->isChecked(), cbByContent->isChecked() );
enableMarkButtons();
btnStopComparing->setEnabled( isComparing = false );
|
|
From: <ck...@us...> - 2003-12-15 18:03:37
|
Update of /cvsroot/krusader/krusader_kde3
In directory sc8-pr-cvs1:/tmp/cvs-serv16821/krusader_kde3
Modified Files:
ChangeLog
Log Message:
ADDED: synchronizer, compare by content
Index: ChangeLog
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/ChangeLog,v
retrieving revision 1.147
retrieving revision 1.148
diff -C2 -d -r1.147 -r1.148
*** ChangeLog 13 Dec 2003 23:19:58 -0000 1.147
--- ChangeLog 15 Dec 2003 18:03:34 -0000 1.148
***************
*** 1,3 ****
! ADDED: directory synchronizer beta (no right click, no compare by content)
ADDED: file splitter
FIXED: obsolete QT header files
--- 1,3 ----
! ADDED: directory synchronizer beta (no right click)
ADDED: file splitter
FIXED: obsolete QT header files
|
|
From: <ck...@us...> - 2003-12-14 09:50:10
|
Update of /cvsroot/krusader/krusader_kde3/krusader
In directory sc8-pr-cvs1:/tmp/cvs-serv17939/krusader_kde3/krusader
Modified Files:
krslots.cpp
Log Message:
ADDED: synchronizer status line, FIXED: little bugs
Index: krslots.cpp
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/krusader/krslots.cpp,v
retrieving revision 1.35
retrieving revision 1.36
diff -C2 -d -r1.35 -r1.36
*** krslots.cpp 12 Dec 2003 21:35:13 -0000 1.35
--- krslots.cpp 13 Dec 2003 17:49:49 -0000 1.36
***************
*** 281,285 ****
void KRslots::calcSpace() { ACTIVE_FUNC->calcSpace(); }
void KRslots::FTPDisconnect() { ACTIVE_FUNC->FTPDisconnect(); }
! void KRslots::newFTPconnection(){ newFTPconnection(); }
// run external modules / programs
--- 281,285 ----
void KRslots::calcSpace() { ACTIVE_FUNC->calcSpace(); }
void KRslots::FTPDisconnect() { ACTIVE_FUNC->FTPDisconnect(); }
! void KRslots::newFTPconnection(){ ACTIVE_FUNC->newFTPconnection(); }
// run external modules / programs
***************
*** 607,612 ****
ACTIVE_PANEL->func->files()->vfs_getOrigin().path(),
ACTIVE_PANEL->otherPanel->func->files()->vfs_getOrigin().path() );
delete sync;
! REFRESH_BOTH_PANELS;
}
--- 607,616 ----
ACTIVE_PANEL->func->files()->vfs_getOrigin().path(),
ACTIVE_PANEL->otherPanel->func->files()->vfs_getOrigin().path() );
+
+ bool refresh = sync->wasSynchronization();
delete sync;
!
! if( refresh )
! REFRESH_BOTH_PANELS;
}
|
|
From: <ck...@us...> - 2003-12-14 09:48:32
|
Update of /cvsroot/krusader/krusader_kde3/krusader/Synchronizer
In directory sc8-pr-cvs1:/tmp/cvs-serv17449/krusader_kde3/krusader/Synchronizer
Modified Files:
synchronizedialog.cpp
Log Message:
ADDED: sync directories icon, FIXED: synchronizer left/right swap bug
Index: synchronizedialog.cpp
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/krusader/Synchronizer/synchronizedialog.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** synchronizedialog.cpp 12 Dec 2003 22:23:20 -0000 1.2
--- synchronizedialog.cpp 13 Dec 2003 23:19:59 -0000 1.3
***************
*** 50,54 ****
QVBoxLayout *layout = new QVBoxLayout( this, 11, 6, "SynchronizeDialogLayout" );
! cbRightToLeft = new QCheckBox( i18n( "Left to right: Copy %1 files (%2 bytes)" )
.arg( leftCopyNr ).arg( KRpermHandler::parseSize( leftCopySize ).stripWhiteSpace() ),
this, "labelRightToLeft" );
--- 50,54 ----
QVBoxLayout *layout = new QVBoxLayout( this, 11, 6, "SynchronizeDialogLayout" );
! cbRightToLeft = new QCheckBox( i18n( "Right to left: Copy %1 files (%2 bytes)" )
.arg( leftCopyNr ).arg( KRpermHandler::parseSize( leftCopySize ).stripWhiteSpace() ),
this, "labelRightToLeft" );
***************
*** 63,67 ****
layout->addWidget( lbRightToLeft );
! cbLeftToRight = new QCheckBox( i18n( "Right to left: Copy %1 files (%2 bytes)" )
.arg( rightCopyNr ).arg( KRpermHandler::parseSize( rightCopySize ).stripWhiteSpace() ),
this, "cbLeftToRight" );
--- 63,67 ----
layout->addWidget( lbRightToLeft );
! cbLeftToRight = new QCheckBox( i18n( "Left to right: Copy %1 files (%2 bytes)" )
.arg( rightCopyNr ).arg( KRpermHandler::parseSize( rightCopySize ).stripWhiteSpace() ),
this, "cbLeftToRight" );
***************
*** 76,80 ****
layout->addWidget( lbLeftToRight );
! cbDeletable = new QCheckBox( i18n( "Right: Delete %1 files (%2 bytes)" )
.arg( deleteNr ).arg( KRpermHandler::parseSize( deleteSize ).stripWhiteSpace() ),
this, "cbDeletable" );
--- 76,80 ----
layout->addWidget( lbLeftToRight );
! cbDeletable = new QCheckBox( i18n( "Left: Delete %1 files (%2 bytes)" )
.arg( deleteNr ).arg( KRpermHandler::parseSize( deleteSize ).stripWhiteSpace() ),
this, "cbDeletable" );
|
|
From: <ck...@us...> - 2003-12-14 09:41:37
|
Update of /cvsroot/krusader/krusader_kde3/krusader/Synchronizer
In directory sc8-pr-cvs1:/tmp/cvs-serv17939/krusader_kde3/krusader/Synchronizer
Modified Files:
synchronizer.cpp synchronizer.h synchronizergui.cpp
synchronizergui.h
Log Message:
ADDED: synchronizer status line, FIXED: little bugs
Index: synchronizer.cpp
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/krusader/Synchronizer/synchronizer.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** synchronizer.cpp 11 Dec 2003 14:10:30 -0000 1.1
--- synchronizer.cpp 13 Dec 2003 17:49:49 -0000 1.2
***************
*** 67,72 ****
if( !leftURL.endsWith("/" )) leftURL+="/";
if( !rightURL.endsWith("/" )) rightURL+="/";
!
compareDirectory( 0, leftBaseDir = leftURL, rightBaseDir = rightURL, "" );
}
--- 67,76 ----
if( !leftURL.endsWith("/" )) leftURL+="/";
if( !rightURL.endsWith("/" )) rightURL+="/";
!
! scannedDirs = fileCount = 0;
!
compareDirectory( 0, leftBaseDir = leftURL, rightBaseDir = rightURL, "" );
+
+ emit statusInfo( i18n( "File number:%1" ).arg( fileCount ) );
}
***************
*** 195,199 ****
}
! bool result;
if( isNormalVFS )
--- 199,203 ----
}
! bool result = true;
if( isNormalVFS )
***************
*** 215,218 ****
--- 219,224 ----
}
+ emit statusInfo( i18n( "Scanned directories:%1" ).arg( scannedDirs++ ) );
+
return v;
}
***************
*** 239,242 ****
--- 245,249 ----
{
markParentDirectories( item );
+ fileCount++;
emit comparedFileData( item );
}
***************
*** 380,383 ****
--- 387,391 ----
markParentDirectories( item->parent() );
item->parent()->setMarked( true );
+ fileCount++;
emit comparedFileData( item->parent() );
}
***************
*** 386,389 ****
--- 394,398 ----
{
int step = 0;
+ fileCount = 0;
SynchronizerFileItem *item = resultList.first();
***************
*** 397,400 ****
--- 406,410 ----
{
markParentDirectories( item );
+ fileCount++;
emit comparedFileData( item );
}
***************
*** 405,408 ****
--- 415,420 ----
item = resultList.next();
}
+
+ emit statusInfo( i18n( "File number:%1" ).arg( fileCount ) );
}
Index: synchronizer.h
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/krusader/Synchronizer/synchronizer.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** synchronizer.h 11 Dec 2003 14:10:30 -0000 1.1
--- synchronizer.h 13 Dec 2003 17:49:49 -0000 1.2
***************
*** 123,126 ****
--- 123,127 ----
void processedSizes( int, KIO::filesize_t, int, KIO::filesize_t, int, KIO::filesize_t );
void pauseAccepted();
+ void statusInfo( QString );
public slots:
***************
*** 184,187 ****
--- 185,191 ----
KIO::filesize_t deleteSize; // the size of the deleted files
+ int scannedDirs; // the number of scanned directories
+ int fileCount; // the number of counted files
+
SynchronizerFileItem * currentTask; // the current task to process
Index: synchronizergui.cpp
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/krusader/Synchronizer/synchronizergui.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** synchronizergui.cpp 12 Dec 2003 23:26:20 -0000 1.3
--- synchronizergui.cpp 13 Dec 2003 17:49:49 -0000 1.4
***************
*** 36,40 ****
#include <qlayout.h>
#include <kurlrequester.h>
- #include <qlabel.h>
#include <klocale.h>
#include <qgrid.h>
--- 36,39 ----
***************
*** 746,750 ****
SynchronizerGUI::SynchronizerGUI(QWidget* parent, QString leftDirectory, QString rightDirectory ) :
! QDialog( parent, "Krusader::SynchronizerGUI", true, 0 ), isComparing( false ), wasClosed( false )
{
setCaption( i18n("Krusader::Synchronize Directories") );
--- 745,750 ----
SynchronizerGUI::SynchronizerGUI(QWidget* parent, QString leftDirectory, QString rightDirectory ) :
! QDialog( parent, "Krusader::SynchronizerGUI", true, 0 ), isComparing( false ), wasClosed( false ),
! wasSync( false )
{
setCaption( i18n("Krusader::Synchronize Directories") );
***************
*** 953,956 ****
--- 953,959 ----
buttons->setMargin( 0 );
+ statusLabel = new QLabel( this, "statusLabel" );
+ buttons->addWidget( statusLabel );
+
QSpacerItem* spacer = new QSpacerItem( 20, 20, QSizePolicy::Expanding, QSizePolicy::Minimum );
buttons->addItem( spacer );
***************
*** 991,994 ****
--- 994,998 ----
connect( &synchronizer, SIGNAL( comparedFileData( SynchronizerFileItem * ) ), this,
SLOT( addFile( SynchronizerFileItem * ) ) );
+ connect( &synchronizer, SIGNAL( statusInfo( QString ) ), this, SLOT( statusInfo( QString ) ) );
connect( btnLeftToRight, SIGNAL( toggled(bool) ), this, SLOT( refresh() ) );
***************
*** 1232,1240 ****
copyToRightSize, deleteNr, deleteSize );
! bool syncStarted = sd->wasSyncronizationStarted();
delete sd;
! if( syncStarted )
closeDialog();
}
--- 1236,1248 ----
copyToRightSize, deleteNr, deleteSize );
! wasSync = sd->wasSyncronizationStarted();
delete sd;
! if( wasSync )
closeDialog();
}
+ void SynchronizerGUI::statusInfo( QString info )
+ {
+ statusLabel->setText( info );
+ }
Index: synchronizergui.h
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/krusader/Synchronizer/synchronizergui.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** synchronizergui.h 12 Dec 2003 23:26:20 -0000 1.2
--- synchronizergui.h 13 Dec 2003 17:49:49 -0000 1.3
***************
*** 39,42 ****
--- 39,43 ----
#include <qcheckbox.h>
#include <qmap.h>
+ #include <qlabel.h>
class SynchronizerGUI : QDialog
***************
*** 86,89 ****
--- 87,92 ----
~SynchronizerGUI();
+ inline bool wasSynchronization() {return wasSync;}
+
public slots:
void rightMouseClicked(QListViewItem *);
***************
*** 94,97 ****
--- 97,101 ----
void refresh();
void subdirsChecked( bool );
+ void statusInfo( QString );
protected slots:
***************
*** 130,133 ****
--- 134,139 ----
QPushButton *btnDuplicates;
QPushButton *btnSingles;
+
+ QLabel *statusLabel;
private:
***************
*** 136,139 ****
--- 142,146 ----
bool isComparing;
bool wasClosed;
+ bool wasSync;
SyncViewItem *lastItem;
};
|
|
From: <ck...@us...> - 2003-12-14 08:43:09
|
Update of /cvsroot/krusader/krusader_kde3/pics In directory sc8-pr-cvs1:/tmp/cvs-serv17449/krusader_kde3/pics Modified Files: Makefile.am Added Files: kr_syncdirs16x16.png kr_syncdirs22x22.png kr_syncdirs32x32.png Log Message: ADDED: sync directories icon, FIXED: synchronizer left/right swap bug --- NEW FILE: kr_syncdirs16x16.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: kr_syncdirs22x22.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: kr_syncdirs32x32.png --- (This appears to be a binary file; contents omitted.) Index: Makefile.am =================================================================== RCS file: /cvsroot/krusader/krusader_kde3/pics/Makefile.am,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** Makefile.am 9 Dec 2003 23:05:58 -0000 1.3 --- Makefile.am 13 Dec 2003 23:19:59 -0000 1.4 *************** *** 2,6 **** ! EXTRA_DIST = about.png arc_pack16x16.png arc_pack22x22.png arc_pack32x32.png arc_test16x16.png arc_test22x22.png arc_test32x32.png arc_unpack16x16.png arc_unpack22x22.png arc_unpack32x32.png calc16x16.png calc22x22.png calc32x32.png compare16x16.png compare22x22.png compare32x32.png comparedirs16x16.png comparedirs22x22.png comparedirs32x32.png ftp_connect16x16.png ftp_connect22x22.png ftp_connect32x32.png ftp_disconnect16x16.png ftp_disconnect22x22.png ftp_disconnect32x32.png ftp_new16x16.png ftp_new22x22.png ftp_new32x32.png konfig_small.jpg kr_addbookmark16x16.png kr_addbookmark22x22.png kr_addbookmark32x32.png kr_bookman16x16.png kr_bookman22x22.png kr_bookman32x32.png kr_bookmark16x16.png kr_bookmark22x22.png kr_bookmark32x32.png kr_fullview16x16.png kr_fullview22x22.png kr_fullview32x32.png kr_hwinfo16x16.png kr_hwinfo22x22.png kr_hwinfo32x32.png kr_invert16x16.png kr_invert22x22.png kr_invert32x32.png kr_treeview16x16.png kr_treeview22x22.png kr_treeview32x32.png kr_unselect16x16.png kr_unselect22x22.png kr_unselect32x32.png Makefile Makefile.am Makefile.in mountman16x16.png mountman22x22.png mountman32x32.png properties16x16.png properties22x22.png properties32x32.png select16x16.png select22x22.png select32x32.png selectall16x16.png selectall22x22.png selectall32x32.png terminal16x16.png terminal22x22.png terminal32x32.png unselectall16x16.png unselectall22x22.png unselectall32x32.png kr_split16x16.png kr_split22x22.png kr_split32x32.png kr_combine16x16.png kr_combine22x22.png kr_combine32x32.png install-data-local: --- 2,6 ---- ! EXTRA_DIST = about.png arc_pack16x16.png arc_pack22x22.png arc_pack32x32.png arc_test16x16.png arc_test22x22.png arc_test32x32.png arc_unpack16x16.png arc_unpack22x22.png arc_unpack32x32.png calc16x16.png calc22x22.png calc32x32.png compare16x16.png compare22x22.png compare32x32.png comparedirs16x16.png comparedirs22x22.png comparedirs32x32.png ftp_connect16x16.png ftp_connect22x22.png ftp_connect32x32.png ftp_disconnect16x16.png ftp_disconnect22x22.png ftp_disconnect32x32.png ftp_new16x16.png ftp_new22x22.png ftp_new32x32.png konfig_small.jpg kr_addbookmark16x16.png kr_addbookmark22x22.png kr_addbookmark32x32.png kr_bookman16x16.png kr_bookman22x22.png kr_bookman32x32.png kr_bookmark16x16.png kr_bookmark22x22.png kr_bookmark32x32.png kr_fullview16x16.png kr_fullview22x22.png kr_fullview32x32.png kr_hwinfo16x16.png kr_hwinfo22x22.png kr_hwinfo32x32.png kr_invert16x16.png kr_invert22x22.png kr_invert32x32.png kr_treeview16x16.png kr_treeview22x22.png kr_treeview32x32.png kr_unselect16x16.png kr_unselect22x22.png kr_unselect32x32.png Makefile Makefile.am Makefile.in mountman16x16.png mountman22x22.png mountman32x32.png properties16x16.png properties22x22.png properties32x32.png select16x16.png select22x22.png select32x32.png selectall16x16.png selectall22x22.png selectall32x32.png terminal16x16.png terminal22x22.png terminal32x32.png unselectall16x16.png unselectall22x22.png unselectall32x32.png kr_split16x16.png kr_split22x22.png kr_split32x32.png kr_combine16x16.png kr_combine22x22.png kr_combine32x32.png kr_syncdirs16x16.png kr_syncdirs22x22.png kr_syncdirs32x32.png install-data-local: *************** *** 159,162 **** --- 159,168 ---- $(mkinstalldirs) $(kde_datadir)/krusader/icons/hicolor/32x32/actions/ $(INSTALL_DATA) $(srcdir)/kr_combine32x32.png $(kde_datadir)/krusader/icons/hicolor/32x32/actions/kr_combine.png + $(mkinstalldirs) $(kde_datadir)/krusader/icons/hicolor/16x16/actions/ + $(INSTALL_DATA) $(srcdir)/kr_syncdirs16x16.png $(kde_datadir)/krusader/icons/hicolor/16x16/actions/kr_syncdirs.png + $(mkinstalldirs) $(kde_datadir)/krusader/icons/hicolor/22x22/actions/ + $(INSTALL_DATA) $(srcdir)/kr_syncdirs22x22.png $(kde_datadir)/krusader/icons/hicolor/22x22/actions/kr_syncdirs.png + $(mkinstalldirs) $(kde_datadir)/krusader/icons/hicolor/32x32/actions/ + $(INSTALL_DATA) $(srcdir)/kr_syncdirs32x32.png $(kde_datadir)/krusader/icons/hicolor/32x32/actions/kr_syncdirs.png uninstall-local: *************** *** 238,241 **** --- 244,250 ---- -rm -f $(kde_datadir)/krusader/icons/hicolor/22x22/actions/kr_combine.png -rm -f $(kde_datadir)/krusader/icons/hicolor/32x32/actions/kr_combine.png + -rm -f $(kde_datadir)/krusader/icons/hicolor/16x16/actions/kr_syncdirs.png + -rm -f $(kde_datadir)/krusader/icons/hicolor/22x22/actions/kr_syncdirs.png + -rm -f $(kde_datadir)/krusader/icons/hicolor/32x32/actions/kr_syncdirs.png ####### kdevelop will overwrite this part!!! (end)############ |
|
From: <ck...@us...> - 2003-12-14 08:43:08
|
Update of /cvsroot/krusader/krusader_kde3/krusader
In directory sc8-pr-cvs1:/tmp/cvs-serv17449/krusader_kde3/krusader
Modified Files:
krusader.cpp
Log Message:
ADDED: sync directories icon, FIXED: synchronizer left/right swap bug
Index: krusader.cpp
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/krusader/krusader.cpp,v
retrieving revision 1.47
retrieving revision 1.48
diff -C2 -d -r1.47 -r1.48
*** krusader.cpp 12 Dec 2003 21:35:13 -0000 1.47
--- krusader.cpp 13 Dec 2003 23:19:58 -0000 1.48
***************
*** 389,393 ****
actFind = new KAction( i18n( "&Search" ), "filefind", CTRL + Key_S,
SLOTS, SLOT( search() ), actionCollection(), "find" );
! actSyncDirs = new KAction( i18n( "Synchronize &Directories" ), 0, CTRL + Key_D,
SLOTS, SLOT( slotSynchronizeDirs() ), actionCollection(), "sync dirs" );
actInvert = new KAction( i18n( "&Invert Selection" ), "kr_invert", ALT + Key_Asterisk,
--- 389,393 ----
actFind = new KAction( i18n( "&Search" ), "filefind", CTRL + Key_S,
SLOTS, SLOT( search() ), actionCollection(), "find" );
! actSyncDirs = new KAction( i18n( "Synchronize &Directories" ), "kr_syncdirs", CTRL + Key_D,
SLOTS, SLOT( slotSynchronizeDirs() ), actionCollection(), "sync dirs" );
actInvert = new KAction( i18n( "&Invert Selection" ), "kr_invert", ALT + Key_Asterisk,
|
|
From: <ck...@us...> - 2003-12-14 08:43:07
|
Update of /cvsroot/krusader/krusader_kde3
In directory sc8-pr-cvs1:/tmp/cvs-serv17449/krusader_kde3
Modified Files:
ChangeLog krusader.kdevprj
Log Message:
ADDED: sync directories icon, FIXED: synchronizer left/right swap bug
Index: ChangeLog
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/ChangeLog,v
retrieving revision 1.146
retrieving revision 1.147
diff -C2 -d -r1.146 -r1.147
*** ChangeLog 12 Dec 2003 21:35:13 -0000 1.146
--- ChangeLog 13 Dec 2003 23:19:58 -0000 1.147
***************
*** 1,3 ****
! ADDED: directory synchronizer beta (no right click, no icon, no compare by content)
ADDED: file splitter
FIXED: obsolete QT header files
--- 1,3 ----
! ADDED: directory synchronizer beta (no right click, no compare by content)
ADDED: file splitter
FIXED: obsolete QT header files
Index: krusader.kdevprj
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/krusader.kdevprj,v
retrieving revision 1.42
retrieving revision 1.43
diff -C2 -d -r1.42 -r1.43
*** krusader.kdevprj 12 Dec 2003 19:59:45 -0000 1.42
--- krusader.kdevprj 13 Dec 2003 23:19:58 -0000 1.43
***************
*** 1322,1326 ****
[pics/Makefile.am]
dist=true
! files=pics/about.png,pics/arc_pack16x16.png,pics/arc_pack22x22.png,pics/arc_pack32x32.png,pics/arc_test16x16.png,pics/arc_test22x22.png,pics/arc_test32x32.png,pics/arc_unpack16x16.png,pics/arc_unpack22x22.png,pics/arc_unpack32x32.png,pics/calc16x16.png,pics/calc22x22.png,pics/calc32x32.png,pics/compare16x16.png,pics/compare22x22.png,pics/compare32x32.png,pics/comparedirs16x16.png,pics/comparedirs22x22.png,pics/comparedirs32x32.png,pics/ftp_connect16x16.png,pics/ftp_connect22x22.png,pics/ftp_connect32x32.png,pics/ftp_disconnect16x16.png,pics/ftp_disconnect22x22.png,pics/ftp_disconnect32x32.png,pics/ftp_new16x16.png,pics/ftp_new22x22.png,pics/ftp_new32x32.png,pics/konfig_small.jpg,pics/kr_addbookmark16x16.png,pics/kr_addbookmark22x22.png,pics/kr_addbookmark32x32.png,pics/kr_bookman16x16.png,pics/kr_bookman22x22.png,pics/kr_bookman32x32.png,pics/kr_bookmark16x16.png,pics/kr_bookmark22x22.png,pics/kr_bookmark32x32.png,pics/kr_fullview16x16.png,pics/kr_fullview22x22.png,pics/kr_fullview32x32.png,pics/kr_hwinfo16x16.png,pics/kr_hwinfo22x22.png,pics/kr_hwinfo32x32.png,pics/kr_invert16x16.png,pics/kr_invert22x22.png,pics/kr_invert32x32.png,pics/kr_treeview16x16.png,pics/kr_treeview22x22.png,pics/kr_treeview32x32.png,pics/kr_unselect16x16.png,pics/kr_unselect22x22.png,pics/kr_unselect32x32.png,pics/Makefile,pics/Makefile.am,pics/Makefile.in,pics/mountman16x16.png,pics/mountman22x22.png,pics/mountman32x32.png,pics/properties16x16.png,pics/properties22x22.png,pics/properties32x32.png,pics/select16x16.png,pics/select22x22.png,pics/select32x32.png,pics/selectall16x16.png,pics/selectall22x22.png,pics/selectall32x32.png,pics/terminal16x16.png,pics/terminal22x22.png,pics/terminal32x32.png,pics/unselectall16x16.png,pics/unselectall22x22.png,pics/unselectall32x32.png,pics/kr_split16x16.png,pics/kr_split22x22.png,pics/kr_split32x32.png,pics/kr_combine16x16.png,pics/kr_combine22x22.png,pics/kr_combine32x32.png
install=false
install_location=
--- 1322,1326 ----
[pics/Makefile.am]
dist=true
! files=pics/about.png,pics/arc_pack16x16.png,pics/arc_pack22x22.png,pics/arc_pack32x32.png,pics/arc_test16x16.png,pics/arc_test22x22.png,pics/arc_test32x32.png,pics/arc_unpack16x16.png,pics/arc_unpack22x22.png,pics/arc_unpack32x32.png,pics/calc16x16.png,pics/calc22x22.png,pics/calc32x32.png,pics/compare16x16.png,pics/compare22x22.png,pics/compare32x32.png,pics/comparedirs16x16.png,pics/comparedirs22x22.png,pics/comparedirs32x32.png,pics/ftp_connect16x16.png,pics/ftp_connect22x22.png,pics/ftp_connect32x32.png,pics/ftp_disconnect16x16.png,pics/ftp_disconnect22x22.png,pics/ftp_disconnect32x32.png,pics/ftp_new16x16.png,pics/ftp_new22x22.png,pics/ftp_new32x32.png,pics/konfig_small.jpg,pics/kr_addbookmark16x16.png,pics/kr_addbookmark22x22.png,pics/kr_addbookmark32x32.png,pics/kr_bookman16x16.png,pics/kr_bookman22x22.png,pics/kr_bookman32x32.png,pics/kr_bookmark16x16.png,pics/kr_bookmark22x22.png,pics/kr_bookmark32x32.png,pics/kr_fullview16x16.png,pics/kr_fullview22x22.png,pics/kr_fullview32x32.png,pics/kr_hwinfo16x16.png,pics/kr_hwinfo22x22.png,pics/kr_hwinfo32x32.png,pics/kr_invert16x16.png,pics/kr_invert22x22.png,pics/kr_invert32x32.png,pics/kr_treeview16x16.png,pics/kr_treeview22x22.png,pics/kr_treeview32x32.png,pics/kr_unselect16x16.png,pics/kr_unselect22x22.png,pics/kr_unselect32x32.png,pics/Makefile,pics/Makefile.am,pics/Makefile.in,pics/mountman16x16.png,pics/mountman22x22.png,pics/mountman32x32.png,pics/properties16x16.png,pics/properties22x22.png,pics/properties32x32.png,pics/select16x16.png,pics/select22x22.png,pics/select32x32.png,pics/selectall16x16.png,pics/selectall22x22.png,pics/selectall32x32.png,pics/terminal16x16.png,pics/terminal22x22.png,pics/terminal32x32.png,pics/unselectall16x16.png,pics/unselectall22x22.png,pics/unselectall32x32.png,pics/kr_split16x16.png,pics/kr_split22x22.png,pics/kr_split32x32.png,pics/kr_combine16x16.png,pics/kr_combine22x22.png,pics/kr_combine32x32.png,pics/kr_syncdirs16x16.png,pics/kr_syncdirs22x22.png,pics/kr_syncdirs32x32.png
install=false
install_location=
***************
*** 1794,1797 ****
--- 1794,1815 ----
install=true
install_location=$$(kde_datadir)/krusader/icons/hicolor/32x32/actions/kr_unselectall.png
+ type=DATA
+
+ [pics/kr_syncdirs16x16.png]
+ dist=true
+ install=true
+ install_location=$$(kde_datadir)/krusader/icons/hicolor/16x16/actions/kr_syncdirs.png
+ type=DATA
+
+ [pics/kr_syncdirs22x22.png]
+ dist=true
+ install=true
+ install_location=$$(kde_datadir)/krusader/icons/hicolor/22x22/actions/kr_syncdirs.png
+ type=DATA
+
+ [pics/kr_syncdirs32x32.png]
+ dist=true
+ install=true
+ install_location=$$(kde_datadir)/krusader/icons/hicolor/32x32/actions/kr_syncdirs.png
type=DATA
|
|
From: <ck...@us...> - 2003-12-12 23:26:23
|
Update of /cvsroot/krusader/krusader_kde3/krusader/Synchronizer
In directory sc8-pr-cvs1:/tmp/cvs-serv5211/krusader_kde3/krusader/Synchronizer
Modified Files:
synchronizergui.cpp synchronizergui.h
Log Message:
FIXED: disable mark buttons at compare/refresh + possible crash fix
Index: synchronizergui.cpp
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/krusader/Synchronizer/synchronizergui.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** synchronizergui.cpp 12 Dec 2003 22:23:20 -0000 1.2
--- synchronizergui.cpp 12 Dec 2003 23:26:20 -0000 1.3
***************
*** 1082,1088 ****
--- 1082,1090 ----
btnStopComparing->setEnabled( isComparing = true );
btnSynchronize->setEnabled( false );
+ disableMarkButtons();
synchronizer.compare(leftLocation->currentText(), rightLocation->currentText(), fileFilter->currentText(),
cbSubdirs->isChecked(), cbSymlinks->isChecked(), cbIgnoreDate->isChecked(),
cbAsymmetric->isChecked() );
+ enableMarkButtons();
btnStopComparing->setEnabled( isComparing = false );
btnCompareDirs->setEnabled( true );
***************
*** 1123,1127 ****
}
! SyncViewItem *listItem;
SyncViewItem *dirItem;
--- 1125,1129 ----
}
! SyncViewItem *listItem = 0;
SyncViewItem *dirItem;
***************
*** 1142,1152 ****
leftDate, Synchronizer::getTaskTypeName( item->task() ),
rightDate, rightSize, rightName );
}
-
- dirItem->setLastItem( listItem );
}
! listItem->setPixmap(0, isDir ? folderIcon : fileIcon);
! syncList->ensureItemVisible( listItem );
}
--- 1144,1157 ----
leftDate, Synchronizer::getTaskTypeName( item->task() ),
rightDate, rightSize, rightName );
+
+ dirItem->setLastItem( listItem );
}
}
! if( listItem )
! {
! listItem->setPixmap(0, isDir ? folderIcon : fileIcon);
! syncList->ensureItemVisible( listItem );
! }
}
***************
*** 1156,1159 ****
--- 1161,1186 ----
}
+ void SynchronizerGUI::disableMarkButtons()
+ {
+ btnLeftToRight->setEnabled( false );
+ btnEquals->setEnabled( false );
+ btnDifferents->setEnabled( false );
+ btnRightToLeft->setEnabled( false );
+ btnDeletable->setEnabled( false );
+ btnDuplicates->setEnabled( false );
+ btnSingles->setEnabled( false );
+ }
+
+ void SynchronizerGUI::enableMarkButtons()
+ {
+ btnLeftToRight->setEnabled( true );
+ btnEquals->setEnabled( true );
+ btnDifferents->setEnabled( true );
+ btnRightToLeft->setEnabled( true );
+ btnDeletable->setEnabled( true );
+ btnDuplicates->setEnabled( true );
+ btnSingles->setEnabled( true );
+ }
+
QString SynchronizerGUI::convertTime(time_t time) const
{
***************
*** 1180,1184 ****
--- 1207,1213 ----
btnCompareDirs->setEnabled( false );
btnSynchronize->setEnabled( false );
+ disableMarkButtons();
synchronizer.refresh();
+ enableMarkButtons();
btnCompareDirs->setEnabled( true );
if( syncList->childCount() )
Index: synchronizergui.h
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/krusader/Synchronizer/synchronizergui.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** synchronizergui.h 11 Dec 2003 14:10:30 -0000 1.1
--- synchronizergui.h 12 Dec 2003 23:26:20 -0000 1.2
***************
*** 102,105 ****
--- 102,107 ----
QString convertTime(time_t time) const;
void setMarkFlags();
+ void disableMarkButtons();
+ void enableMarkButtons();
protected:
|
|
From: <ck...@us...> - 2003-12-12 22:23:23
|
Update of /cvsroot/krusader/krusader_kde3/krusader/Synchronizer
In directory sc8-pr-cvs1:/tmp/cvs-serv26392/krusader_kde3/krusader/Synchronizer
Modified Files:
synchronizedialog.cpp synchronizergui.cpp
Log Message:
FIXED: placed the default krConfig values into defaults.h
Index: synchronizedialog.cpp
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/krusader/Synchronizer/synchronizedialog.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** synchronizedialog.cpp 11 Dec 2003 14:10:30 -0000 1.1
--- synchronizedialog.cpp 12 Dec 2003 22:23:20 -0000 1.2
***************
*** 37,44 ****
#include <klocale.h>
- /* TODO TODO TODO TODO TODO */
- #define _ConfirmOverWrites false
- /* TODO TODO TODO TODO TODO */
-
SynchronizeDialog::SynchronizeDialog( QWidget* parent, const char* name, bool modal, WFlags fl,
Synchronizer *sync, int pleftCopyNr, KIO::filesize_t pleftCopySize,
--- 37,40 ----
Index: synchronizergui.cpp
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/krusader/Synchronizer/synchronizergui.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** synchronizergui.cpp 11 Dec 2003 14:10:30 -0000 1.1
--- synchronizergui.cpp 12 Dec 2003 22:23:20 -0000 1.2
***************
*** 44,62 ****
#include <kmessagebox.h>
- /* TODO TODO TODO TODO TODO */
- #define _RecurseSubdirs true
- #define _FollowSymlinks false
- #define _CompareByContent false
- #define _IgnoreDate false
- #define _Asymmetric false
- #define _BtnLeftToRight true
- #define _BtnEquals true
- #define _BtnDifferents true
- #define _BtnRightToLeft true
- #define _BtnDeletable true
- #define _BtnDuplicates true
- #define _BtnSingles true
- /* TODO TODO TODO TODO TODO */
-
static const char * const right_arrow_button_data[] = {
"18 18 97 2",
--- 44,47 ----
|
|
From: <ck...@us...> - 2003-12-12 22:23:22
|
Update of /cvsroot/krusader/krusader_kde3/krusader In directory sc8-pr-cvs1:/tmp/cvs-serv26392/krusader_kde3/krusader Modified Files: defaults.h Log Message: FIXED: placed the default krConfig values into defaults.h Index: defaults.h =================================================================== RCS file: /cvsroot/krusader/krusader_kde3/krusader/defaults.h,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** defaults.h 5 Jul 2003 16:37:01 -0000 1.4 --- defaults.h 12 Dec 2003 22:23:20 -0000 1.5 *************** *** 177,178 **** --- 177,208 ---- // lastHomeLeft - Save the last place the left list panel was showing // lastUsedPacker - used by packGUI to remember the last used packer + + + /////////////////////// [Synchronize directories] + // Don't overwrite automatically ///////////// + #define _ConfirmOverWrites false + // Recursive search in the subdirectories ///////////// + #define _RecurseSubdirs true + // The searcher follows symlinks ///////////// + #define _FollowSymlinks false + // Files with similar size are compared by content ///////////// + #define _CompareByContent false + // The date information is ignored at synchronization ///////////// + #define _IgnoreDate false + // Asymmetric Client-File Server compare mode ///////////// + #define _Asymmetric false + // The right arrow button is turned on ///////////// + #define _BtnLeftToRight true + // The equals button is turned on ///////////// + #define _BtnEquals true + // The not equals button is turned on ///////////// + #define _BtnDifferents true + // The left arrow button is turned on ///////////// + #define _BtnRightToLeft true + // The trash button is turned on ///////////// + #define _BtnDeletable true + // The duplicates button is turned on ///////////// + #define _BtnDuplicates true + // The singles button is turned on ///////////// + #define _BtnSingles true + |
|
From: <ck...@us...> - 2003-12-12 21:35:21
|
Update of /cvsroot/krusader/krusader_kde3
In directory sc8-pr-cvs1:/tmp/cvs-serv16237/krusader_kde3
Modified Files:
ChangeLog
Log Message:
ADDED: synchronize directories beta
Index: ChangeLog
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/ChangeLog,v
retrieving revision 1.145
retrieving revision 1.146
diff -C2 -d -r1.145 -r1.146
*** ChangeLog 6 Dec 2003 13:16:38 -0000 1.145
--- ChangeLog 12 Dec 2003 21:35:13 -0000 1.146
***************
*** 1,2 ****
--- 1,3 ----
+ ADDED: directory synchronizer beta (no right click, no icon, no compare by content)
ADDED: file splitter
FIXED: obsolete QT header files
|
|
From: <ck...@us...> - 2003-12-12 21:35:21
|
Update of /cvsroot/krusader/krusader_kde3/krusader
In directory sc8-pr-cvs1:/tmp/cvs-serv16237/krusader_kde3/krusader
Modified Files:
krslots.cpp krslots.h krusader.cpp krusader.h
Log Message:
ADDED: synchronize directories beta
Index: krslots.cpp
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/krusader/krslots.cpp,v
retrieving revision 1.34
retrieving revision 1.35
diff -C2 -d -r1.34 -r1.35
*** krslots.cpp 9 Dec 2003 23:05:56 -0000 1.34
--- krslots.cpp 12 Dec 2003 21:35:13 -0000 1.35
***************
*** 71,74 ****
--- 71,75 ----
#include "Splitter/combiner.h"
#include "UserMenu/usermenu.h"
+ #include "Synchronizer/synchronizergui.h"
#define ACTIVE_PANEL (krApp->mainView->activePanel)
***************
*** 600,603 ****
--- 601,612 ----
UserMenu um;
QString cmd = um.exec();
+ }
+
+ void KRslots::slotSynchronizeDirs() {
+ SynchronizerGUI *sync = new SynchronizerGUI( MAIN_VIEW,
+ ACTIVE_PANEL->func->files()->vfs_getOrigin().path(),
+ ACTIVE_PANEL->otherPanel->func->files()->vfs_getOrigin().path() );
+ delete sync;
+ REFRESH_BOTH_PANELS;
}
Index: krslots.h
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/krusader/krslots.h,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** krslots.h 9 Dec 2003 23:05:56 -0000 1.19
--- krslots.h 12 Dec 2003 21:35:13 -0000 1.20
***************
*** 115,118 ****
--- 115,119 ----
void slotCombine();
void userMenu();
+ void slotSynchronizeDirs();
// F2
Index: krusader.cpp
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/krusader/krusader.cpp,v
retrieving revision 1.46
retrieving revision 1.47
diff -C2 -d -r1.46 -r1.47
*** krusader.cpp 6 Dec 2003 13:56:51 -0000 1.46
--- krusader.cpp 12 Dec 2003 21:35:13 -0000 1.47
***************
*** 389,392 ****
--- 389,394 ----
actFind = new KAction( i18n( "&Search" ), "filefind", CTRL + Key_S,
SLOTS, SLOT( search() ), actionCollection(), "find" );
+ actSyncDirs = new KAction( i18n( "Synchronize &Directories" ), 0, CTRL + Key_D,
+ SLOTS, SLOT( slotSynchronizeDirs() ), actionCollection(), "sync dirs" );
actInvert = new KAction( i18n( "&Invert Selection" ), "kr_invert", ALT + Key_Asterisk,
SLOTS, SLOT( invert() ), actionCollection(), "invert" );
Index: krusader.h
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/krusader/krusader.h,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** krusader.h 6 Dec 2003 13:56:35 -0000 1.16
--- krusader.h 12 Dec 2003 21:35:13 -0000 1.17
***************
*** 103,107 ****
static KToggleAction *actToggleTerminal;
KToggleAction *actToggleFnkeys, *actToggleCmdline, *actShowToolBar, *actToggleSwapPanels,
! *actShowStatusBar, *actToggleHidden, *actCompareDirs;
// return a path to a temp dir or file we can use.
--- 103,107 ----
static KToggleAction *actToggleTerminal;
KToggleAction *actToggleFnkeys, *actToggleCmdline, *actShowToolBar, *actToggleSwapPanels,
! *actShowStatusBar, *actToggleHidden, *actCompareDirs, *actSyncDirs;
// return a path to a temp dir or file we can use.
|
|
From: <ck...@us...> - 2003-12-12 20:57:17
|
Update of /cvsroot/krusader/krusader_kde3/krusader/UserMenu In directory sc8-pr-cvs1:/tmp/cvs-serv9848/krusader_kde3/krusader/UserMenu Modified Files: usermenu.h Log Message: FIXED: usermenu compile bug Index: usermenu.h =================================================================== RCS file: /cvsroot/krusader/krusader_kde3/krusader/UserMenu/usermenu.h,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** usermenu.h 9 Dec 2003 21:26:22 -0000 1.3 --- usermenu.h 12 Dec 2003 20:57:13 -0000 1.4 *************** *** 41,45 **** // an expander is a function that receives a QString input, expands // it and returns a new QString output containing the expanded expression ! typedef QString (EXPANDER)(const QString&); // a UMCmd is an entry containing the expression and its expanding function --- 41,45 ---- // an expander is a function that receives a QString input, expands // it and returns a new QString output containing the expanded expression ! typedef QString (*EXPANDER)(const QString&); // a UMCmd is an entry containing the expression and its expanding function *************** *** 59,64 **** protected: ! QString expand(QString str); ! QString expPath(const QString& str); private: --- 59,64 ---- protected: ! static QString expand(QString str); ! static QString expPath(const QString& str); private: |
|
From: <ck...@us...> - 2003-12-12 20:44:40
|
Update of /cvsroot/krusader/krusader_kde3/krusader/Splitter
In directory sc8-pr-cvs1:/tmp/cvs-serv7376/krusader_kde3/krusader/Splitter
Modified Files:
combiner.cpp
Log Message:
FIXED: crash because of an uninitialized variable
Index: combiner.cpp
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/krusader/Splitter/combiner.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** combiner.cpp 29 Nov 2003 09:09:08 -0000 1.1
--- combiner.cpp 12 Dec 2003 20:44:37 -0000 1.2
***************
*** 39,43 ****
QProgressDialog( parent, "Krusader::Combiner", true, 0 ), hasValidSplitFile( false ),
fileCounter ( 0 ), permissions( -1 ), receivedSize( 0 ),
! combineWriteJob( 0 )
{
fileName = fileNameIn;
--- 39,43 ----
QProgressDialog( parent, "Krusader::Combiner", true, 0 ), hasValidSplitFile( false ),
fileCounter ( 0 ), permissions( -1 ), receivedSize( 0 ),
! combineReadJob( 0 ), combineWriteJob( 0 )
{
fileName = fileNameIn;
|
|
From: <ck...@us...> - 2003-12-12 19:59:49
|
Update of /cvsroot/krusader/krusader_kde3 In directory sc8-pr-cvs1:/tmp/cvs-serv31067/krusader_kde3 Modified Files: krusader.kdevprj Log Message: FIXED: compiler bug Index: krusader.kdevprj =================================================================== RCS file: /cvsroot/krusader/krusader_kde3/krusader.kdevprj,v retrieving revision 1.41 retrieving revision 1.42 diff -C2 -d -r1.41 -r1.42 *** krusader.kdevprj 11 Dec 2003 14:59:52 -0000 1.41 --- krusader.kdevprj 12 Dec 2003 19:59:45 -0000 1.42 *************** *** 34,38 **** lfv_open_groups= make_options=\s-j1 ! makefiles=Makefile.am,krusader/Makefile.am,doc/Makefile.am,doc/en/Makefile.am,po/Makefile.am,pics/Makefile.am,doc/pics/Makefile.am,krusader/BookMan/Makefile.am,krusader/Dialogs/Makefile.am,krusader/GUI/Makefile.am,krusader/Konfigurator/Makefile.am,krusader/KViewer/Makefile.am,krusader/MountMan/Makefile.am,krusader/Panel/Makefile.am,krusader/RemoteMan/Makefile.am,krusader/VFS/Makefile.am,krusader/Search/Makefile.am,krusader/Splitter/Makefile.am,krusader/Synchronizer/Makefile.am modifyMakefiles=true project_name=Krusader --- 34,38 ---- lfv_open_groups= make_options=\s-j1 ! makefiles=Makefile.am,krusader/Makefile.am,doc/Makefile.am,doc/en/Makefile.am,po/Makefile.am,pics/Makefile.am,doc/pics/Makefile.am,krusader/BookMan/Makefile.am,krusader/Dialogs/Makefile.am,krusader/GUI/Makefile.am,krusader/Konfigurator/Makefile.am,krusader/KViewer/Makefile.am,krusader/MountMan/Makefile.am,krusader/Panel/Makefile.am,krusader/RemoteMan/Makefile.am,krusader/VFS/Makefile.am,krusader/Search/Makefile.am,krusader/Splitter/Makefile.am,krusader/Synchronizer/Makefile.am,krusader/UserMenu/Makefile.am modifyMakefiles=true project_name=Krusader *************** *** 730,734 **** [krusader/Makefile.am] files=krusader/krusader.desktop,krusader/lo32-app-krusader.png,krusader/lo16-app-krusader.png,krusader/defaults.h,krusader/kicons.cpp,krusader/kicons.h,krusader/krslots.cpp,krusader/krslots.h,krusader/krusader.cpp,krusader/krusader.h,krusader/krusaderui.rc,krusader/krusaderview.cpp,krusader/krusaderview.h,krusader/lo32-app-krusader2.png,krusader/main.cpp,krusader/resources.h,krusader/x-ace.desktop,krusader/krservices.cpp,krusader/krservices.h,krusader/panelmanager.cpp,krusader/panelmanager.h,krusader/paneltabbar.cpp,krusader/paneltabbar.h ! sub_dirs=BookMan,Dialogs,GUI,Konfigurator,KViewer,MountMan,Panel,RemoteMan,VFS,Search,Splitter,Synchronizer type=prog_main --- 730,734 ---- [krusader/Makefile.am] files=krusader/krusader.desktop,krusader/lo32-app-krusader.png,krusader/lo16-app-krusader.png,krusader/defaults.h,krusader/kicons.cpp,krusader/kicons.h,krusader/krslots.cpp,krusader/krslots.h,krusader/krusader.cpp,krusader/krusader.h,krusader/krusaderui.rc,krusader/krusaderview.cpp,krusader/krusaderview.h,krusader/lo32-app-krusader2.png,krusader/main.cpp,krusader/resources.h,krusader/x-ace.desktop,krusader/krservices.cpp,krusader/krservices.h,krusader/panelmanager.cpp,krusader/panelmanager.h,krusader/paneltabbar.cpp,krusader/paneltabbar.h ! sub_dirs=BookMan,Dialogs,GUI,Konfigurator,KViewer,MountMan,Panel,RemoteMan,VFS,Search,Splitter,Synchronizer,UserMenu type=prog_main *************** *** 1025,1028 **** --- 1025,1047 ---- [krusader/Synchronizer/synchronizergui.h] + dist=true + install=false + install_location= + type=HEADER + + [krusader/UserMenu/Makefile.am] + files=krusader/UserMenu/usermenu.cpp,krusader/UserMenu/usermenu.h + sharedlib_LDFLAGS=-version-info 0:0:0 + sharedlib_rootname=UserMenu + sub_dirs= + type=static_library + + [krusader/UserMenu/usermenu.cpp] + dist=true + install=false + install_location= + type=SOURCE + + [krusader/UserMenu/usermenu.h] dist=true install=false |
|
From: <ck...@us...> - 2003-12-12 19:59:49
|
Update of /cvsroot/krusader/krusader_kde3/krusader In directory sc8-pr-cvs1:/tmp/cvs-serv31067/krusader_kde3/krusader Modified Files: Makefile.am Log Message: FIXED: compiler bug Index: Makefile.am =================================================================== RCS file: /cvsroot/krusader/krusader_kde3/krusader/Makefile.am,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** Makefile.am 11 Dec 2003 14:59:52 -0000 1.11 --- Makefile.am 12 Dec 2003 19:59:46 -0000 1.12 *************** *** 5,11 **** 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 ./Splitter/libSplitter.a ./Synchronizer/libSynchronizer.a VFS/libVFS.a KViewer/libKViewer.a Dialogs/libDialogs.a BookMan/libBookMan.a $(LIB_KPARTS) $(LIB_KFILE) $(LIB_KHTML) $(LIB_KDEUI) $(LIB_KDECORE) $(LIB_QT) $(LIBSOCKET) ! SUBDIRS = BookMan Dialogs GUI Konfigurator KViewer MountMan Panel RemoteMan VFS Search Splitter Synchronizer 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 --- 5,11 ---- 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 ./Splitter/libSplitter.a ./Synchronizer/libSynchronizer.a ./UserMenu/libUserMenu.a VFS/libVFS.a KViewer/libKViewer.a Dialogs/libDialogs.a BookMan/libBookMan.a $(LIB_KPARTS) $(LIB_KFILE) $(LIB_KHTML) $(LIB_KDEUI) $(LIB_KDECORE) $(LIB_QT) $(LIBSOCKET) ! SUBDIRS = BookMan Dialogs GUI Konfigurator KViewer MountMan Panel RemoteMan VFS Search Splitter Synchronizer UserMenu 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 |
|
From: <ck...@us...> - 2003-12-11 14:59:56
|
Update of /cvsroot/krusader/krusader_kde3/krusader In directory sc8-pr-cvs1:/tmp/cvs-serv16358/krusader_kde3/krusader Modified Files: Makefile.am Log Message: ADDED: synchronizer files into the build. Index: Makefile.am =================================================================== RCS file: /cvsroot/krusader/krusader_kde3/krusader/Makefile.am,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** Makefile.am 9 Dec 2003 18:21:02 -0000 1.10 --- Makefile.am 11 Dec 2003 14:59:52 -0000 1.11 *************** *** 5,11 **** 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 ./Splitter/libSplitter.a ./UserMenu/libUserMenu.a VFS/libVFS.a KViewer/libKViewer.a Dialogs/libDialogs.a BookMan/libBookMan.a UserMenu/libUserMenu.a $(LIB_KPARTS) $(LIB_KFILE) $(LIB_KHTML) $(LIB_KDEUI) $(LIB_KDECORE) $(LIB_QT) $(LIBSOCKET) ! SUBDIRS = BookMan Dialogs GUI Konfigurator KViewer MountMan Panel RemoteMan VFS Search Splitter UserMenu 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 --- 5,11 ---- 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 ./Splitter/libSplitter.a ./Synchronizer/libSynchronizer.a VFS/libVFS.a KViewer/libKViewer.a Dialogs/libDialogs.a BookMan/libBookMan.a $(LIB_KPARTS) $(LIB_KFILE) $(LIB_KHTML) $(LIB_KDEUI) $(LIB_KDECORE) $(LIB_QT) $(LIBSOCKET) ! SUBDIRS = BookMan Dialogs GUI Konfigurator KViewer MountMan Panel RemoteMan VFS Search Splitter Synchronizer 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 |
|
From: <ck...@us...> - 2003-12-11 14:59:56
|
Update of /cvsroot/krusader/krusader_kde3 In directory sc8-pr-cvs1:/tmp/cvs-serv16358/krusader_kde3 Modified Files: krusader.kdevprj Log Message: ADDED: synchronizer files into the build. Index: krusader.kdevprj =================================================================== RCS file: /cvsroot/krusader/krusader_kde3/krusader.kdevprj,v retrieving revision 1.40 retrieving revision 1.41 diff -C2 -d -r1.40 -r1.41 *** krusader.kdevprj 9 Dec 2003 23:05:56 -0000 1.40 --- krusader.kdevprj 11 Dec 2003 14:59:52 -0000 1.41 *************** *** 34,38 **** lfv_open_groups= make_options=\s-j1 ! makefiles=Makefile.am,krusader/Makefile.am,doc/Makefile.am,doc/en/Makefile.am,po/Makefile.am,pics/Makefile.am,doc/pics/Makefile.am,krusader/BookMan/Makefile.am,krusader/Dialogs/Makefile.am,krusader/GUI/Makefile.am,krusader/Konfigurator/Makefile.am,krusader/KViewer/Makefile.am,krusader/MountMan/Makefile.am,krusader/Panel/Makefile.am,krusader/RemoteMan/Makefile.am,krusader/VFS/Makefile.am,krusader/Search/Makefile.am,krusader/Splitter/Makefile.am modifyMakefiles=true project_name=Krusader --- 34,38 ---- lfv_open_groups= make_options=\s-j1 ! makefiles=Makefile.am,krusader/Makefile.am,doc/Makefile.am,doc/en/Makefile.am,po/Makefile.am,pics/Makefile.am,doc/pics/Makefile.am,krusader/BookMan/Makefile.am,krusader/Dialogs/Makefile.am,krusader/GUI/Makefile.am,krusader/Konfigurator/Makefile.am,krusader/KViewer/Makefile.am,krusader/MountMan/Makefile.am,krusader/Panel/Makefile.am,krusader/RemoteMan/Makefile.am,krusader/VFS/Makefile.am,krusader/Search/Makefile.am,krusader/Splitter/Makefile.am,krusader/Synchronizer/Makefile.am modifyMakefiles=true project_name=Krusader *************** *** 730,734 **** [krusader/Makefile.am] files=krusader/krusader.desktop,krusader/lo32-app-krusader.png,krusader/lo16-app-krusader.png,krusader/defaults.h,krusader/kicons.cpp,krusader/kicons.h,krusader/krslots.cpp,krusader/krslots.h,krusader/krusader.cpp,krusader/krusader.h,krusader/krusaderui.rc,krusader/krusaderview.cpp,krusader/krusaderview.h,krusader/lo32-app-krusader2.png,krusader/main.cpp,krusader/resources.h,krusader/x-ace.desktop,krusader/krservices.cpp,krusader/krservices.h,krusader/panelmanager.cpp,krusader/panelmanager.h,krusader/paneltabbar.cpp,krusader/paneltabbar.h ! sub_dirs=BookMan,Dialogs,GUI,Konfigurator,KViewer,MountMan,Panel,RemoteMan,VFS,Search,Splitter type=prog_main --- 730,734 ---- [krusader/Makefile.am] files=krusader/krusader.desktop,krusader/lo32-app-krusader.png,krusader/lo16-app-krusader.png,krusader/defaults.h,krusader/kicons.cpp,krusader/kicons.h,krusader/krslots.cpp,krusader/krslots.h,krusader/krusader.cpp,krusader/krusader.h,krusader/krusaderui.rc,krusader/krusaderview.cpp,krusader/krusaderview.h,krusader/lo32-app-krusader2.png,krusader/main.cpp,krusader/resources.h,krusader/x-ace.desktop,krusader/krservices.cpp,krusader/krservices.h,krusader/panelmanager.cpp,krusader/panelmanager.h,krusader/paneltabbar.cpp,krusader/paneltabbar.h ! sub_dirs=BookMan,Dialogs,GUI,Konfigurator,KViewer,MountMan,Panel,RemoteMan,VFS,Search,Splitter,Synchronizer type=prog_main *************** *** 982,985 **** --- 982,1028 ---- [krusader/Splitter/splittergui.h] + dist=true + install=false + install_location= + type=HEADER + + [krusader/Synchronizer/Makefile.am] + files=krusader/Synchronizer/synchronizedialog.cpp,krusader/Synchronizer/synchronizedialog.h,krusader/Synchronizer/synchronizer.cpp,krusader/Synchronizer/synchronizer.h,krusader/Synchronizer/synchronizergui.cpp,krusader/Synchronizer/synchronizergui.h + sharedlib_LDFLAGS=-version-info 0:0:0 + sharedlib_rootname=Synchronizer + sub_dirs= + type=static_library + + [krusader/Synchronizer/synchronizedialog.cpp] + dist=true + install=false + install_location= + type=SOURCE + + [krusader/Synchronizer/synchronizedialog.h] + dist=true + install=false + install_location= + type=HEADER + + [krusader/Synchronizer/synchronizer.cpp] + dist=true + install=false + install_location= + type=SOURCE + + [krusader/Synchronizer/synchronizer.h] + dist=true + install=false + install_location= + type=HEADER + + [krusader/Synchronizer/synchronizergui.cpp] + dist=true + install=false + install_location= + type=SOURCE + + [krusader/Synchronizer/synchronizergui.h] dist=true install=false |
7 messages has been excluded from this view by a project administrator.
