Menu
▾
▴
krusader-commits
You can subscribe to this list here.
| 2003 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
(98) |
Sep
(138) |
Oct
(100) |
Nov
(49) |
Dec
(131) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2004 |
Jan
(94) |
Feb
(65) |
Mar
(100) |
Apr
(83) |
May
(72) |
Jun
(29) |
Jul
(167) |
Aug
(127) |
Sep
(131) |
Oct
(269) |
Nov
(122) |
Dec
(100) |
| 2005 |
Jan
(228) |
Feb
(266) |
Mar
(63) |
Apr
(135) |
May
(157) |
Jun
(52) |
Jul
(25) |
Aug
(49) |
Sep
(184) |
Oct
(159) |
Nov
(75) |
Dec
(37) |
| 2006 |
Jan
(60) |
Feb
(129) |
Mar
(110) |
Apr
(34) |
May
(31) |
Jun
(42) |
Jul
(72) |
Aug
(90) |
Sep
(57) |
Oct
(66) |
Nov
(42) |
Dec
(90) |
| 2007 |
Jan
(106) |
Feb
(54) |
Mar
(93) |
Apr
(27) |
May
(21) |
Jun
(17) |
Jul
(19) |
Aug
(22) |
Sep
(25) |
Oct
(2) |
Nov
(1) |
Dec
(1) |
| 2008 |
Jan
(65) |
Feb
(70) |
Mar
(29) |
Apr
(45) |
May
(91) |
Jun
(20) |
Jul
(11) |
Aug
(24) |
Sep
(23) |
Oct
(13) |
Nov
(23) |
Dec
(39) |
| 2009 |
Jan
(23) |
Feb
(39) |
Mar
(15) |
Apr
(56) |
May
(5) |
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: Heiner <h.e...@gm...> - 2004-01-03 13:44:28
|
On Saturday 03 January 2004 14:37, kru...@li... wrote: > --__--__-- > > Message: 4 > From: er...@us... > To: kru...@li... > Date: Sat, 03 Jan 2004 05:36:26 -0800 > Subject: [Krusader-commits] krusader_kde3/krusader/Panel > Makefile.am,1.5,1.6 panelfunc.cpp,1.49,1.50 panelfunc.h,1.18,1.19 > > Update of /cvsroot/krusader/krusader_kde3/krusader/Panel > In directory sc8-pr-cvs1:/tmp/cvs-serv6155/krusader/Panel > > Modified Files: > Makefile.am panelfunc.cpp panelfunc.h > Log Message: > misc changes Note: this automated mail is either incomplete, or you forgot to add the files krcalcspacedialog.cpp krcalcspacedialog.h to the cvs! Heiner |
|
From: <er...@us...> - 2004-01-03 13:38:11
|
Update of /cvsroot/krusader/krusader_kde3/krusader In directory sc8-pr-cvs1:/tmp/cvs-serv6520/krusader Modified Files: Makefile.am Log Message: Index: Makefile.am =================================================================== RCS file: /cvsroot/krusader/krusader_kde3/krusader/Makefile.am,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** Makefile.am 12 Dec 2003 19:59:46 -0000 1.12 --- Makefile.am 3 Jan 2004 13:38:08 -0000 1.13 *************** *** 5,9 **** 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 --- 5,9 ---- 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 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 |
|
From: <er...@us...> - 2004-01-03 13:36:27
|
Update of /cvsroot/krusader/krusader_kde3/krusader/Panel
In directory sc8-pr-cvs1:/tmp/cvs-serv6155/krusader/Panel
Modified Files:
Makefile.am panelfunc.cpp panelfunc.h
Log Message:
misc changes
Index: Makefile.am
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/krusader/Panel/Makefile.am,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** Makefile.am 27 Aug 2003 21:22:05 -0000 1.5
--- Makefile.am 3 Jan 2004 13:36:24 -0000 1.6
***************
*** 6,13 ****
libPanel_a_METASOURCES = AUTO
! libPanel_a_SOURCES = krpopupmenu.cpp krpreviewpopup.cpp krview.cpp krdetailedviewitem.cpp krdetailedview.cpp panelfunc.cpp listpanel.cpp
! EXTRA_DIST = listpanel.cpp panelfunc.cpp panelfunc.h listpanel.h krdetailedview.cpp krdetailedview.h krdetailedviewitem.cpp krdetailedviewitem.h krview.cpp krview.h krviewitem.h krpreviewpopup.cpp krpreviewpopup.h krpopupmenu.cpp krpopupmenu.h
####### kdevelop will overwrite this part!!! (end)############
--- 6,13 ----
libPanel_a_METASOURCES = AUTO
! libPanel_a_SOURCES = krcalcspacedialog.cpp krpopupmenu.cpp krpreviewpopup.cpp krview.cpp krdetailedviewitem.cpp krdetailedview.cpp panelfunc.cpp listpanel.cpp
! EXTRA_DIST = listpanel.cpp panelfunc.cpp panelfunc.h listpanel.h krdetailedview.cpp krdetailedview.h krdetailedviewitem.cpp krdetailedviewitem.h krview.cpp krview.h krviewitem.h krpreviewpopup.cpp krpreviewpopup.h krpopupmenu.cpp krpopupmenu.h krcalcspacedialog.cpp krcalcspacedialog.h
####### kdevelop will overwrite this part!!! (end)############
Index: panelfunc.cpp
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/krusader/Panel/panelfunc.cpp,v
retrieving revision 1.49
retrieving revision 1.50
diff -C2 -d -r1.49 -r1.50
*** panelfunc.cpp 2 Jan 2004 16:09:52 -0000 1.49
--- panelfunc.cpp 3 Jan 2004 13:36:24 -0000 1.50
***************
*** 31,39 ****
// Qt Includes
#include <qdir.h>
- #include <qtimer.h>
#include <qtextstream.h>
// KDE Includes
#include <klocale.h>
- #include <kio/jobclasses.h>
#include <kprocess.h>
#include <kpropertiesdialog.h>
--- 31,37 ----
***************
*** 49,52 ****
--- 47,51 ----
// Krusader Includes
#include "panelfunc.h"
+ #include "krcalcspacedialog.h"
#include "../krusader.h"
#include "../krslots.h"
***************
*** 67,193 ****
#include "../resources.h"
- /* --=={ Patch by Heiner <h.e...@gm...> }==-- */
- KrCalcSpaceDialog::CalcThread::CalcThread(KrCalcSpaceDialog * parent, vfs * files, const QStringList & names)
- : m_totalSize(0), m_totalFiles(0), m_totalDirs(0), m_names(names), m_files(files), m_parent(parent)
- , m_threadInUse(true), m_stop(false) {}
-
- void KrCalcSpaceDialog::CalcThread::cleanUp(){
- if (m_threadInUse || !finished())
- m_synchronizeUsageAccess.unlock();
- else{
- m_synchronizeUsageAccess.unlock(); // prevents a resource leak
- // otherwise: no one needs this instance any more: delete it
- delete this;
- }
- }
-
- void KrCalcSpaceDialog::CalcThread::deleteInstance(){
- // synchronize to avoid race condition.
- m_synchronizeUsageAccess.lock();
- m_threadInUse = false;
- cleanUp();
- }
-
- void KrCalcSpaceDialog::CalcThread::run(){
- if ( !m_names.isEmpty() ) // if something to do: do the calculation
- for ( QStringList::ConstIterator name = m_names.begin(); name != m_names.end(); ++name )
- m_files->vfs_calcSpace( *name, &m_totalSize, &m_totalFiles, &m_totalDirs , & m_stop);
- // synchronize to avoid race condition.
- m_synchronizeUsageAccess.lock();
- cleanUp(); // this does not need the instance any more
- }
-
- void KrCalcSpaceDialog::CalcThread::stop(){
- // cancel was pressed
- m_stop = true;
- }
-
- KrCalcSpaceDialog::KrCalcSpaceDialog(QWidget *parent, vfs * files, const QStringList & names, bool autoclose) :
- KDialogBase(parent, "KrCalcSpaceDialog", true, "Calculate Occupied Space", Ok|Cancel),
- m_autoClose(autoclose), m_canceled(false), m_timerCounter(0){
- // the dialog: The Ok button is hidden until it is needed
- showButtonOK(false);
- m_thread = new CalcThread(this, files, names);
- m_pollTimer = new QTimer(this);
- QWidget * mainWidget = new QWidget( this );
- setMainWidget(mainWidget);
- QVBoxLayout *topLayout = new QVBoxLayout( mainWidget, 0, spacingHint() );
-
- m_label = new QLabel( "", mainWidget, "caption" );
- showResult(); // fill m_label with something usefull
- topLayout->addWidget( m_label );
- topLayout->addStretch(10);
- }
-
- void KrCalcSpaceDialog::calculationFinished(){
- // close dialog if auto close is true
- if (m_autoClose){
- done(0);
- return;
- }
- // otherwise hide cancel and show ok button
- showButtonCancel(false);
- showButtonOK(true);
- showResult(); // and show final result
- }
-
- /* This timer has two jobs: it polls the thread if it is finished. Polling is
- better here as it might finish while the dialog builds up. Secondly it refreshes
- the displayed result.
- */
- void KrCalcSpaceDialog::timer(){
- // thread finished?
- if (m_thread->finished()){
- // close dialog or switch buttons
- calculationFinished();
- m_pollTimer->stop(); // stop the polling. No longer needed
- return;
- }
-
- // Every 10 pollings (1 second) refresh the displayed result
- if (++m_timerCounter > 10){
- m_timerCounter = 0;
- showResult();
- }
- }
-
- void KrCalcSpaceDialog::showResult(){
- if (!m_thread) return;
- QString msg;
- QString fileName = ( ( m_thread->getNames().count() == 1 ) ? ( i18n( "Name: " ) + m_thread->getNames().first() + "\n" ) : QString( "" ) );
- msg = fileName + i18n( "Total occupied space: %1\nin %2 directories and %3 files" ).
- arg( KIO::convertSize( m_thread->getTotalSize() ) ).arg( m_thread->getTotalDirs() ).arg( m_thread->getTotalFiles() );
- m_label->setText(msg);
- }
-
- void KrCalcSpaceDialog::slotCancel(){
- m_thread->stop(); // notify teh thread to stop
- m_canceled = true; // set the cancel flag
- KDialogBase::slotCancel(); // close the dialog
- }
-
- KrCalcSpaceDialog::~KrCalcSpaceDialog(){
- CalcThread * tmp = m_thread;
- m_thread = 0; // do not access the thread anymore or core dump if smoe piece of code wrongly does
- tmp->deleteInstance(); // Notify the thread, that the dialog does not need anymore.
- }
-
- void KrCalcSpaceDialog::exec(){
- m_thread->start(); // start the thread
- if (m_autoClose){ // autoclose
- // set the cursor to busy mode and wait 3 seconds or until the thread finishes
- krApp->setCursor( KCursor::waitCursor() );
- bool result = m_thread->wait(3000);
- krApp->setCursor( KCursor::arrowCursor() ); // return the cursor to normal mode
- if (result) return;// thread finished: do not show the dialog
- showResult(); // fill the invisible dialog with usefull data
- }
- // prepare and start the poll timer
- connect(m_pollTimer, SIGNAL(timeout()), this, SLOT(timer()));
- m_pollTimer->start(100);
- KDialogBase::exec(); // show the dialog
- }
- /* --=={ End of patch by Heiner <h.e...@gm...> }==-- */
-
//////////////////////////////////////////////////////////
////// ---------- List Panel ------------- ////////
--- 66,69 ----
***************
*** 197,202 ****
panel( parent ), inRefresh( false ), vfsP(0){
urlStack.push( "file:/" );
-
- connect( &delayTimer, SIGNAL(timeout()), this, SLOT(doOpenUrl()));
}
--- 73,76 ----
***************
*** 256,267 ****
}
- void ListPanelFunc::delayedOpenUrl( const KURL& url ) {
- delayURL = url; /* this function is useful for FTP url-s and bookmarks */
- delayTimer.start( 0, true ); /* to avoid qApp->processEvents() deadlock situaltion */
- }
-
- void ListPanelFunc::doOpenUrl() {
- openUrl( delayURL );
- }
void ListPanelFunc::refresh( const KURL& url ) {
--- 130,133 ----
Index: panelfunc.h
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/krusader/Panel/panelfunc.h,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** panelfunc.h 2 Jan 2004 16:09:52 -0000 1.18
--- panelfunc.h 3 Jan 2004 13:36:24 -0000 1.19
***************
*** 36,97 ****
#include <qobject.h>
#include <qvaluestack.h>
- #include <qthread.h>
- #include <qtimer.h>
-
- /* --=={ Patch by Heiner <h.e...@gm...> }==-- */
- /* Dialog calculating showing the number of files and directories and its total size
- in a dialog. If wanted, the dialog appears after 3 seconds of calculation, to
- avoid a short appearence if the result was found quickly. Computes teh result in
- a different thread.
- */
- class KrCalcSpaceDialog : public KDialogBase{
- Q_OBJECT
- /* Thread which does the actual calculation. Deletes itself, if no longer
- needed. Creator must call finished(), if the thread is no longer needed.
- */
- class CalcThread : public QThread{
- KIO::filesize_t m_totalSize;
- unsigned long m_totalFiles;
- unsigned long m_totalDirs;
- const QStringList m_names;
- vfs * m_files;
- KrCalcSpaceDialog * m_parent;
- QMutex m_synchronizeUsageAccess;
- bool m_threadInUse; // true: caller needs the thread
- bool m_stop;
- void cleanUp(); // Deletes this, if possible
- public:
- KIO::filesize_t getTotalSize() const {return m_totalSize;} // the result
- unsigned long getTotalFiles() const {return m_totalFiles;} // the result
- unsigned long getTotalDirs() const {return m_totalDirs;} // the result
- const QStringList & getNames() const {return m_names;} // list of directories to calculate
- CalcThread(KrCalcSpaceDialog * parent, vfs * files, const QStringList & names);
- void deleteInstance(); // thread is no longer needed.
- void run(); // start calculation
- void stop(); // stop it. Thread continues until vfs_calcSpace returns
- } * m_thread;
- friend class CalcThread;
- class QTimer * m_pollTimer;
- QLabel * m_label;
- bool m_autoClose; // true: wait 3 sec. before showing the dialog. Close it, when done
- bool m_canceled; // true: cancel was pressed
- int m_timerCounter; // internal counter. The timer runs faster as the rehresh (see comment there)
- void calculationFinished(); // called if the calulation is done
- void showResult(); // show the current result in teh dialog
- protected slots:
- void timer(); // poll timer was fired
- void slotCancel(); // cancel was pressed
- public:
- // autoclose: wait 3 sec. before showing the dialog. Close it, when done
- KrCalcSpaceDialog(QWidget *parent, vfs * files, const QStringList & names, bool autoclose);
- ~KrCalcSpaceDialog();
- KIO::filesize_t getTotalSize() const {return m_thread->getTotalSize();} // the result
- unsigned long getTotalFiles() const {return m_thread->getTotalFiles();} // the result
- unsigned long getTotalDirs() const {return m_thread->getTotalDirs();} // the result
- bool wasCanceled() const {return m_canceled;} // cancel was pressed; result is probably wrong
- public slots:
- void exec(); // start calculation
- };
- /* End of patch by Heiner <h.e...@gm...> */
class ListPanelFunc : public QObject{
--- 36,39 ----
***************
*** 102,107 ****
void openUrl(const KURL& path, const QString& nameToMakeCurrent = QString::null);
void openUrl(const QString& path, const QString& nameToMakeCurrent = QString::null);
- void delayedOpenUrl( const KURL& path);
- void doOpenUrl();
void refresh(){ refresh(panel->virtualPath); } // re-read the files
void rename(const QString &oldname, const QString &newname);
--- 44,47 ----
***************
*** 147,153 ****
bool inRefresh; // true when we are in refresh()
vfs* vfsP; // pointer to vfs.
-
- QTimer delayTimer;
- KURL delayURL;
};
--- 87,90 ----
|
|
From: <er...@us...> - 2004-01-03 13:36:27
|
Update of /cvsroot/krusader/krusader_kde3/krusader/Search
In directory sc8-pr-cvs1:/tmp/cvs-serv6155/krusader/Search
Modified Files:
krsearchdialogbase.cpp
Log Message:
misc changes
Index: krsearchdialogbase.cpp
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/krusader/Search/krsearchdialogbase.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** krsearchdialogbase.cpp 25 Nov 2003 21:51:27 -0000 1.6
--- krsearchdialogbase.cpp 3 Jan 2004 13:36:24 -0000 1.7
***************
*** 232,236 ****
GroupBox1_2 = new QGroupBox( tab, "GroupBox1_2" );
! GroupBox1_2->setTitle( i18n( "Don't search in" ) );
GroupBox1_2->setColumnLayout(0, Qt::Vertical );
GroupBox1_2->layout()->setSpacing( 0 );
--- 232,236 ----
GroupBox1_2 = new QGroupBox( tab, "GroupBox1_2" );
! GroupBox1_2->setTitle( i18n( "&Don't search in" ) );
GroupBox1_2->setColumnLayout(0, Qt::Vertical );
GroupBox1_2->layout()->setSpacing( 0 );
***************
*** 251,256 ****
dontSearchInBtnAdd = new QToolButton( GroupBox1_2, "dontSearchInBtnAdd" );
dontSearchInBtnAdd->setText( "" );
! dontSearchInBtnAdd->setPixmap( image2 );
!
GroupBox1_2Layout->addWidget( dontSearchInBtn, 0, 2 );
GroupBox1_2Layout->addWidget( dontSearchInBtnAdd, 0, 1 );
--- 251,256 ----
dontSearchInBtnAdd = new QToolButton( GroupBox1_2, "dontSearchInBtnAdd" );
dontSearchInBtnAdd->setText( "" );
! dontSearchInBtnAdd->setPixmap( image2 );
!
GroupBox1_2Layout->addWidget( dontSearchInBtn, 0, 2 );
GroupBox1_2Layout->addWidget( dontSearchInBtnAdd, 0, 1 );
***************
*** 264,268 ****
GroupBox1 = new QGroupBox( tab, "GroupBox1" );
! GroupBox1->setTitle( i18n( "Search in" ) );
GroupBox1->setColumnLayout(0, Qt::Vertical );
GroupBox1->layout()->setSpacing( 0 );
--- 264,268 ----
GroupBox1 = new QGroupBox( tab, "GroupBox1" );
! GroupBox1->setTitle( i18n( "&Search in" ) );
GroupBox1->setColumnLayout(0, Qt::Vertical );
GroupBox1->layout()->setSpacing( 0 );
***************
*** 314,327 ****
containsWholeWord = new QCheckBox( GroupBox14, "containsWholeWord" );
containsWholeWord->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)5, (QSizePolicy::SizeType)0, containsWholeWord->sizePolicy().hasHeightForWidth() ) );
! containsWholeWord->setText( i18n( "Match whole word only" ) );
containsWholeWord->setChecked( FALSE );
Layout7->addWidget( containsWholeWord );
!
containsTextCase = new QCheckBox( GroupBox14, "containsTextCase" );
containsTextCase->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)5, (QSizePolicy::SizeType)0, containsTextCase->sizePolicy().hasHeightForWidth() ) );
! containsTextCase->setText( i18n( "Case sensetive" ) );
containsTextCase->setChecked( TRUE );
Layout7->addWidget( containsTextCase );
!
GroupBox14Layout->addLayout( Layout7, 1, 0 );
--- 314,327 ----
containsWholeWord = new QCheckBox( GroupBox14, "containsWholeWord" );
containsWholeWord->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)5, (QSizePolicy::SizeType)0, containsWholeWord->sizePolicy().hasHeightForWidth() ) );
! containsWholeWord->setText( i18n( "&Match whole word only" ) );
containsWholeWord->setChecked( FALSE );
Layout7->addWidget( containsWholeWord );
!
containsTextCase = new QCheckBox( GroupBox14, "containsTextCase" );
containsTextCase->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)5, (QSizePolicy::SizeType)0, containsTextCase->sizePolicy().hasHeightForWidth() ) );
! containsTextCase->setText( i18n( "Cas&e sensetive" ) );
containsTextCase->setChecked( TRUE );
Layout7->addWidget( containsTextCase );
!
GroupBox14Layout->addLayout( Layout7, 1, 0 );
***************
*** 332,336 ****
TextLabel2 = new QLabel( GroupBox14, "TextLabel2" );
TextLabel2->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)0, (QSizePolicy::SizeType)1, TextLabel2->sizePolicy().hasHeightForWidth() ) );
! TextLabel2->setText( i18n( "Text:" ) );
Layout8->addWidget( TextLabel2 );
--- 332,336 ----
TextLabel2 = new QLabel( GroupBox14, "TextLabel2" );
TextLabel2->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)0, (QSizePolicy::SizeType)1, TextLabel2->sizePolicy().hasHeightForWidth() ) );
! TextLabel2->setText( i18n( "&Text:" ) );
Layout8->addWidget( TextLabel2 );
***************
*** 338,341 ****
--- 338,342 ----
containsText->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)7, (QSizePolicy::SizeType)0, containsText->sizePolicy().hasHeightForWidth() ) );
Layout8->addWidget( containsText );
+ TextLabel2->setBuddy(containsText);
GroupBox14Layout->addLayout( Layout8, 0, 0 );
***************
*** 354,358 ****
searchForCase = new QCheckBox( GroupBox140, "searchForCase" );
! searchForCase->setText( i18n( "Case sensetive" ) );
searchForCase->setChecked( TRUE );
--- 355,359 ----
searchForCase = new QCheckBox( GroupBox140, "searchForCase" );
! searchForCase->setText( i18n( "&Case sensetive" ) );
searchForCase->setChecked( TRUE );
***************
*** 360,369 ****
TextLabel1 = new QLabel( GroupBox140, "TextLabel1" );
! TextLabel1->setText( i18n( "Search for:" ) );
GroupBox140Layout->addWidget( TextLabel1, 0, 0 );
TextLabel1_2 = new QLabel( GroupBox140, "TextLabel1_2" );
! TextLabel1_2->setText( i18n( "Of type:" ) );
GroupBox140Layout->addWidget( TextLabel1_2, 1, 0 );
--- 361,370 ----
TextLabel1 = new QLabel( GroupBox140, "TextLabel1" );
! TextLabel1->setText( i18n( "Search &for:" ) );
GroupBox140Layout->addWidget( TextLabel1, 0, 0 );
TextLabel1_2 = new QLabel( GroupBox140, "TextLabel1_2" );
! TextLabel1_2->setText( i18n( "&Of type:" ) );
GroupBox140Layout->addWidget( TextLabel1_2, 1, 0 );
***************
*** 372,375 ****
--- 373,377 ----
ofType->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)7, (QSizePolicy::SizeType)0, ofType->sizePolicy().hasHeightForWidth() ) );
ofType->setEditable( FALSE );
+ TextLabel1_2->setBuddy(ofType);
GroupBox140Layout->addWidget( ofType, 1, 1 );
***************
*** 378,381 ****
--- 380,384 ----
searchFor->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)7, (QSizePolicy::SizeType)0, searchFor->sizePolicy().hasHeightForWidth() ) );
searchFor->setEditable( TRUE );
+ TextLabel1->setBuddy(searchFor);
GroupBox140Layout->addMultiCellWidget( searchFor, 0, 0, 1, 2 );
***************
*** 390,394 ****
searchInDirs = new QCheckBox( tab, "searchInDirs" );
! searchInDirs->setText( i18n( "Search in subdirectories" ) );
searchInDirs->setChecked( TRUE );
Layout9_2->addWidget( searchInDirs );
--- 393,397 ----
searchInDirs = new QCheckBox( tab, "searchInDirs" );
! searchInDirs->setText( i18n( "Search in s&ubdirectories" ) );
searchInDirs->setChecked( TRUE );
Layout9_2->addWidget( searchInDirs );
***************
*** 396,408 ****
searchInArchives = new QCheckBox( tab, "searchInArchives" );
searchInArchives->setEnabled( FALSE );
! searchInArchives->setText( i18n( "Search in archives" ) );
Layout9_2->addWidget( searchInArchives );
followLinks = new QCheckBox( tab, "followLinks" );
! followLinks->setText( i18n( "Follow links" ) );
Layout9_2->addWidget( followLinks );
tabLayout->addMultiCellLayout( Layout9_2, 3, 3, 0, 1 );
! TabWidget2->insertTab( tab, i18n( "General" ) );
tab_2 = new QWidget( TabWidget2, "tab_2" );
--- 399,411 ----
searchInArchives = new QCheckBox( tab, "searchInArchives" );
searchInArchives->setEnabled( FALSE );
! searchInArchives->setText( i18n( "Search in arch&ives" ) );
Layout9_2->addWidget( searchInArchives );
followLinks = new QCheckBox( tab, "followLinks" );
! followLinks->setText( i18n( "Follow &links" ) );
Layout9_2->addWidget( followLinks );
tabLayout->addMultiCellLayout( Layout9_2, 3, 3, 0, 1 );
! TabWidget2->insertTab( tab, i18n( "&General" ) );
tab_2 = new QWidget( TabWidget2, "tab_2" );
***************
*** 417,421 ****
smallerThanEnabled = new QCheckBox( GroupBox29, "smallerThanEnabled" );
smallerThanEnabled->setGeometry( QRect( 270, 20, 100, 21 ) );
! smallerThanEnabled->setText( i18n( "Smaller than" ) );
smallerThanAmount = new QLineEdit( GroupBox29, "smallerThanAmount" );
--- 420,424 ----
smallerThanEnabled = new QCheckBox( GroupBox29, "smallerThanEnabled" );
smallerThanEnabled->setGeometry( QRect( 270, 20, 100, 21 ) );
! smallerThanEnabled->setText( i18n( "&Smaller than" ) );
smallerThanAmount = new QLineEdit( GroupBox29, "smallerThanAmount" );
***************
*** 433,437 ****
biggerThanEnabled = new QCheckBox( GroupBox29, "biggerThanEnabled" );
biggerThanEnabled->setGeometry( QRect( 10, 20, 100, 21 ) );
! biggerThanEnabled->setText( i18n( "Bigger than" ) );
biggerThanType = new KComboBox( FALSE, GroupBox29, "biggerThanType" );
--- 436,440 ----
biggerThanEnabled = new QCheckBox( GroupBox29, "biggerThanEnabled" );
biggerThanEnabled->setGeometry( QRect( 10, 20, 100, 21 ) );
! biggerThanEnabled->setText( i18n( "&Bigger than" ) );
biggerThanType = new KComboBox( FALSE, GroupBox29, "biggerThanType" );
***************
*** 474,478 ****
TextLabel2_2 = new QLabel( ButtonGroup2, "TextLabel2_2" );
! TextLabel2_2->setText( i18n( "and" ) );
ButtonGroup2Layout->addWidget( TextLabel2_2, 0, 5 );
--- 477,481 ----
TextLabel2_2 = new QLabel( ButtonGroup2, "TextLabel2_2" );
! TextLabel2_2->setText( i18n( "an&d" ) );
ButtonGroup2Layout->addWidget( TextLabel2_2, 0, 5 );
***************
*** 481,484 ****
--- 484,488 ----
modifiedBetweenData2->setEnabled( FALSE );
modifiedBetweenData2->setText( "" );
+ TextLabel2_2->setBuddy(modifiedBetweenData2);
ButtonGroup2Layout->addWidget( modifiedBetweenData2, 0, 6 );
***************
*** 505,509 ****
modifiedInTheLastEnabled = new QRadioButton( ButtonGroup2, "modifiedInTheLastEnabled" );
! modifiedInTheLastEnabled->setText( "" );
ButtonGroup2->insert( modifiedInTheLastEnabled, 0 );
--- 509,513 ----
modifiedInTheLastEnabled = new QRadioButton( ButtonGroup2, "modifiedInTheLastEnabled" );
! modifiedInTheLastEnabled->setText( "Mod&ified in the last" );
ButtonGroup2->insert( modifiedInTheLastEnabled, 0 );
***************
*** 541,550 ****
TextLabel3_2 = new QLabel( ButtonGroup2, "TextLabel3_2" );
! TextLabel3_2->setText( i18n( "Not modified in the last" ) );
! ButtonGroup2Layout->addWidget( TextLabel3_2, 3, 1 );
notModifiedAfterEnabled = new QRadioButton( ButtonGroup2, "notModifiedAfterEnabled" );
! notModifiedAfterEnabled->setText( i18n( "Not modified after" ) );
ButtonGroup2->insert( notModifiedAfterEnabled, 0 );
--- 545,555 ----
TextLabel3_2 = new QLabel( ButtonGroup2, "TextLabel3_2" );
! TextLabel3_2->setText( i18n( "No&t modified in the last" ) );
! TextLabel3_2->setBuddy(notModifiedInTheLastData);
! ButtonGroup2Layout->addWidget( TextLabel3_2, 3, 0 );
notModifiedAfterEnabled = new QRadioButton( ButtonGroup2, "notModifiedAfterEnabled" );
! notModifiedAfterEnabled->setText( i18n( "&Not modified after" ) );
ButtonGroup2->insert( notModifiedAfterEnabled, 0 );
***************
*** 552,561 ****
modifiedInTheLast = new QLabel( ButtonGroup2, "modifiedInTheLast" );
! modifiedInTheLast->setText( i18n( "Modified in the last" ) );
ButtonGroup2Layout->addWidget( modifiedInTheLast, 2, 1 );
modifiedBetweenEnabled = new QRadioButton( ButtonGroup2, "modifiedBetweenEnabled" );
! modifiedBetweenEnabled->setText( i18n( "Modified between" ) );
ButtonGroup2->insert( modifiedBetweenEnabled, 0 );
--- 557,567 ----
modifiedInTheLast = new QLabel( ButtonGroup2, "modifiedInTheLast" );
! modifiedInTheLast->setText( i18n( "" ) );
ButtonGroup2Layout->addWidget( modifiedInTheLast, 2, 1 );
modifiedBetweenEnabled = new QRadioButton( ButtonGroup2, "modifiedBetweenEnabled" );
! modifiedBetweenEnabled->setText( i18n( "&Modified between" ) );
! modifiedInTheLast->setBuddy(modifiedBetweenEnabled);
ButtonGroup2->insert( modifiedBetweenEnabled, 0 );
***************
*** 579,583 ****
belongsToUserEnabled = new QCheckBox( GroupBox181, "belongsToUserEnabled" );
! belongsToUserEnabled->setText( i18n( "Belongs to user" ) );
Layout10->addWidget( belongsToUserEnabled );
--- 585,589 ----
belongsToUserEnabled = new QCheckBox( GroupBox181, "belongsToUserEnabled" );
! belongsToUserEnabled->setText( i18n( "Belongs to &user" ) );
Layout10->addWidget( belongsToUserEnabled );
***************
*** 588,592 ****
belongsToGroupEnabled = new QCheckBox( GroupBox181, "belongsToGroupEnabled" );
! belongsToGroupEnabled->setText( i18n( "Belongs to group" ) );
Layout10->addWidget( belongsToGroupEnabled );
--- 594,598 ----
belongsToGroupEnabled = new QCheckBox( GroupBox181, "belongsToGroupEnabled" );
! belongsToGroupEnabled->setText( i18n( "Belongs to gr&oup" ) );
Layout10->addWidget( belongsToGroupEnabled );
***************
*** 599,603 ****
GroupBox206 = new QGroupBox( GroupBox181, "GroupBox206" );
! GroupBox206->setTitle( i18n( "Owner" ) );
ownerW = new QComboBox( FALSE, GroupBox206, "ownerW" );
--- 605,609 ----
GroupBox206 = new QGroupBox( GroupBox181, "GroupBox206" );
! GroupBox206->setTitle( i18n( "O&wner" ) );
ownerW = new QComboBox( FALSE, GroupBox206, "ownerW" );
***************
*** 625,634 ****
permissionsEnabled = new QCheckBox( GroupBox181, "permissionsEnabled" );
! permissionsEnabled->setText( i18n( "Permissions" ) );
GroupBox181Layout->addWidget( permissionsEnabled, 1, 0 );
GroupBox206_2 = new QGroupBox( GroupBox181, "GroupBox206_2" );
! GroupBox206_2->setTitle( i18n( "Group" ) );
groupW = new QComboBox( FALSE, GroupBox206_2, "groupW" );
--- 631,640 ----
permissionsEnabled = new QCheckBox( GroupBox181, "permissionsEnabled" );
! permissionsEnabled->setText( i18n( "P&ermissions" ) );
GroupBox181Layout->addWidget( permissionsEnabled, 1, 0 );
GroupBox206_2 = new QGroupBox( GroupBox181, "GroupBox206_2" );
! GroupBox206_2->setTitle( i18n( "Grou&p" ) );
groupW = new QComboBox( FALSE, GroupBox206_2, "groupW" );
***************
*** 656,660 ****
GroupBox206_3 = new QGroupBox( GroupBox181, "GroupBox206_3" );
! GroupBox206_3->setTitle( i18n( "All" ) );
allW = new QComboBox( FALSE, GroupBox206_3, "allW" );
--- 662,666 ----
GroupBox206_3 = new QGroupBox( GroupBox181, "GroupBox206_3" );
! GroupBox206_3->setTitle( i18n( "A&ll" ) );
allW = new QComboBox( FALSE, GroupBox206_3, "allW" );
***************
*** 691,695 ****
tabLayout_2->addWidget( GroupBox181, 2, 0 );
! TabWidget2->insertTab( tab_2, i18n( "Advanced" ) );
tab_3 = new QWidget( TabWidget2, "tab_3" );
--- 697,701 ----
tabLayout_2->addWidget( GroupBox181, 2, 0 );
! TabWidget2->insertTab( tab_2, i18n( "&Advanced" ) );
tab_3 = new QWidget( TabWidget2, "tab_3" );
***************
*** 726,730 ****
tabLayout_3->addWidget( resultsList, 0, 0 );
! TabWidget2->insertTab( tab_3, i18n( "Results" ) );
KrSearchBaseLayout->addWidget( TabWidget2, 0, 0 );
--- 732,736 ----
tabLayout_3->addWidget( resultsList, 0, 0 );
! TabWidget2->insertTab( tab_3, i18n( "&Results" ) );
KrSearchBaseLayout->addWidget( TabWidget2, 0, 0 );
|
|
From: <er...@us...> - 2004-01-03 13:36:27
|
Update of /cvsroot/krusader/krusader_kde3
In directory sc8-pr-cvs1:/tmp/cvs-serv6155
Modified Files:
Krusader.kdevelop krusader.kdevprj
Log Message:
misc changes
Index: Krusader.kdevelop
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/Krusader.kdevelop,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** Krusader.kdevelop 9 Dec 2003 16:54:48 -0000 1.17
--- Krusader.kdevelop 3 Jan 2004 13:36:24 -0000 1.18
***************
*** 3,7 ****
<general>
<author>Shie Erlich and Rafi Yanai</author>
! <email></email>
<version>1.20</version>
<projectmanagement>KDevAutoProject</projectmanagement>
--- 3,7 ----
<general>
<author>Shie Erlich and Rafi Yanai</author>
! <email/>
<version>1.20</version>
<projectmanagement>KDevAutoProject</projectmanagement>
***************
*** 16,20 ****
<projectdirectory>.</projectdirectory>
<absoluteprojectpath>false</absoluteprojectpath>
! <description></description>
<secondaryLanguages/>
</general>
--- 16,20 ----
<projectdirectory>.</projectdirectory>
<absoluteprojectpath>false</absoluteprojectpath>
! <description/>
<secondaryLanguages/>
</general>
***************
*** 26,30 ****
<run>
<mainprogram>krusader/krusader</mainprogram>
! <programargs></programargs>
<terminal>false</terminal>
<envvars/>
--- 26,30 ----
<run>
<mainprogram>krusader/krusader</mainprogram>
! <programargs/>
<terminal>false</terminal>
<envvars/>
***************
*** 41,59 ****
<numberofjobs>2</numberofjobs>
<dontact>false</dontact>
! <makebin></makebin>
</make>
</kdevautoproject>
<kdevdebugger>
<general>
<dbgshell>libtool</dbgshell>
! <programargs></programargs>
! <gdbpath></gdbpath>
<breakonloadinglibs>true</breakonloadinglibs>
<separatetty>false</separatetty>
<floatingtoolbar>false</floatingtoolbar>
<runappinappdirectory>true</runappinappdirectory>
! <configGdbScript></configGdbScript>
! <runShellScript></runShellScript>
! <runGdbScript></runGdbScript>
</general>
<display>
--- 41,77 ----
<numberofjobs>2</numberofjobs>
<dontact>false</dontact>
! <makebin/>
</make>
+ <configurations>
+ <default>
+ <configargs/>
+ <builddir/>
+ <topsourcedir/>
+ <cppflags>-DQT_THREAD_SUPPORT</cppflags>
+ <ldflags/>
+ <ccompiler>kdevgccoptions</ccompiler>
+ <cxxcompiler>kdevgppoptions</cxxcompiler>
+ <f77compiler>kdevpgf77options</f77compiler>
+ <ccompilerbinary/>
+ <cxxcompilerbinary>-DQT_THREAD_SUPPORT</cxxcompilerbinary>
+ <f77compilerbinary/>
+ <cflags/>
+ <cxxflags>-DQT_THREAD_SUPPORT</cxxflags>
+ <f77flags/>
+ </default>
+ </configurations>
</kdevautoproject>
<kdevdebugger>
<general>
<dbgshell>libtool</dbgshell>
! <programargs/>
! <gdbpath/>
<breakonloadinglibs>true</breakonloadinglibs>
<separatetty>false</separatetty>
<floatingtoolbar>false</floatingtoolbar>
<runappinappdirectory>true</runappinappdirectory>
! <configGdbScript/>
! <runShellScript/>
! <runGdbScript/>
</general>
<display>
Index: krusader.kdevprj
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/krusader.kdevprj,v
retrieving revision 1.45
retrieving revision 1.46
diff -C2 -d -r1.45 -r1.46
*** krusader.kdevprj 25 Dec 2003 23:50:00 -0000 1.45
--- krusader.kdevprj 3 Jan 2004 13:36:24 -0000 1.46
***************
*** 27,31 ****
[General]
! AMChanged=false
author=Shie Erlich & Rafi Yanai
configure_args=\s--build=i386-linux --host=i386-linux --target=i386-linux --prefix=/usr\s
--- 27,31 ----
[General]
! AMChanged=true
author=Shie Erlich & Rafi Yanai
configure_args=\s--build=i386-linux --host=i386-linux --target=i386-linux --prefix=/usr\s
***************
*** 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
***************
*** 765,769 ****
[krusader/Panel/Makefile.am]
! files=krusader/Panel/listpanel.cpp,krusader/Panel/panelfunc.cpp,krusader/Panel/panelfunc.h,krusader/Panel/listpanel.h,krusader/Panel/krdetailedview.cpp,krusader/Panel/krdetailedview.h,krusader/Panel/krdetailedviewitem.cpp,krusader/Panel/krdetailedviewitem.h,krusader/Panel/krview.cpp,krusader/Panel/krview.h,krusader/Panel/krviewitem.h,krusader/Panel/krpreviewpopup.cpp,krusader/Panel/krpreviewpopup.h,krusader/Panel/krpopupmenu.cpp,krusader/Panel/krpopupmenu.h
sharedlib_LDFLAGS=-version-info 0:0:0
sharedlib_rootname=Panel
--- 765,769 ----
[krusader/Panel/Makefile.am]
! files=krusader/Panel/listpanel.cpp,krusader/Panel/panelfunc.cpp,krusader/Panel/panelfunc.h,krusader/Panel/listpanel.h,krusader/Panel/krdetailedview.cpp,krusader/Panel/krdetailedview.h,krusader/Panel/krdetailedviewitem.cpp,krusader/Panel/krdetailedviewitem.h,krusader/Panel/krview.cpp,krusader/Panel/krview.h,krusader/Panel/krviewitem.h,krusader/Panel/krpreviewpopup.cpp,krusader/Panel/krpreviewpopup.h,krusader/Panel/krpopupmenu.cpp,krusader/Panel/krpopupmenu.h,krusader/Panel/krcalcspacedialog.cpp,krusader/Panel/krcalcspacedialog.h
sharedlib_LDFLAGS=-version-info 0:0:0
sharedlib_rootname=Panel
***************
*** 771,774 ****
--- 771,786 ----
type=static_library
+ [krusader/Panel/krcalcspacedialog.cpp]
+ dist=true
+ install=false
+ install_location=
+ type=SOURCE
+
+ [krusader/Panel/krcalcspacedialog.h]
+ dist=true
+ install=false
+ install_location=
+ type=HEADER
+
[krusader/Panel/krdetailedview.cpp]
dist=true
***************
*** 1037,1040 ****
--- 1049,1089 ----
[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,krusader/UserMenu/usermenuadd.ui,krusader/UserMenu/usermenuaddimpl.cpp,krusader/UserMenu/usermenuaddimpl.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
+ install_location=
+ type=HEADER
+
+ [krusader/UserMenu/usermenuadd.ui]
+ dist=true
+ install=false
+ install_location=
+ type=SOURCE
+
+ [krusader/UserMenu/usermenuaddimpl.cpp]
+ dist=true
+ install=false
+ install_location=
+ type=SOURCE
+
+ [krusader/UserMenu/usermenuaddimpl.h]
dist=true
install=false
|
|
From: <er...@us...> - 2004-01-03 13:36:27
|
Update of /cvsroot/krusader/krusader_kde3/krusader/UserMenu
In directory sc8-pr-cvs1:/tmp/cvs-serv6155/krusader/UserMenu
Modified Files:
usermenuadd.ui
Log Message:
misc changes
Index: usermenuadd.ui
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/krusader/UserMenu/usermenuadd.ui,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** usermenuadd.ui 26 Dec 2003 13:28:14 -0000 1.2
--- usermenuadd.ui 3 Jan 2004 13:36:24 -0000 1.3
***************
*** 77,81 ****
<widget class="QToolButton" row="1" column="2">
<property name="name">
! <cstring>toolButton2</cstring>
</property>
<property name="enabled">
--- 77,81 ----
<widget class="QToolButton" row="1" column="2">
<property name="name">
! <cstring>addFoldersButton</cstring>
</property>
<property name="enabled">
***************
*** 308,312 ****
<sender>showOnlyIn</sender>
<signal>toggled(bool)</signal>
! <receiver>toolButton2</receiver>
<slot>setEnabled(bool)</slot>
</connection>
--- 308,312 ----
<sender>showOnlyIn</sender>
<signal>toggled(bool)</signal>
! <receiver>addFoldersButton</receiver>
<slot>setEnabled(bool)</slot>
</connection>
***************
*** 323,329 ****
<slot>accept()</slot>
</connection>
</connections>
<slots>
! <slot>saveEntry()</slot>
</slots>
<layoutdefaults spacing="6" margin="11"/>
--- 323,342 ----
<slot>accept()</slot>
</connection>
+ <connection>
+ <sender>addButton</sender>
+ <signal>clicked()</signal>
+ <receiver>UserMenuAdd</receiver>
+ <slot>popupAddMenu()</slot>
+ </connection>
+ <connection>
+ <sender>addFoldersButton</sender>
+ <signal>clicked()</signal>
+ <receiver>UserMenuAdd</receiver>
+ <slot>addShowInFolder()</slot>
+ </connection>
</connections>
<slots>
! <slot>popupAddMenu()</slot>
! <slot>addShowInFolder()</slot>
</slots>
<layoutdefaults spacing="6" margin="11"/>
|
|
From: <ck...@us...> - 2004-01-02 17:59:29
|
Update of /cvsroot/krusader/krusader_kde3/krusader/VFS
In directory sc8-pr-cvs1:/tmp/cvs-serv20793/krusader_kde3/krusader/VFS
Modified Files:
krvfshandler.cpp
Log Message:
FIXED: error at stepping out from an archive file
Index: krvfshandler.cpp
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/krusader/VFS/krvfshandler.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** krvfshandler.cpp 27 Dec 2003 16:50:17 -0000 1.3
--- krvfshandler.cpp 2 Jan 2004 17:59:26 -0000 1.4
***************
*** 32,36 ****
vfs::VFS_TYPE KrVfsHandler::getVfsType(const KURL& url){
! if( url.isLocalFile() /*|| QDir(url.path(-1)).exists()*/ ){ // commented out because of FTP->NormalVFS problem!!!
return vfs::NORMAL;
}
--- 32,42 ----
vfs::VFS_TYPE KrVfsHandler::getVfsType(const KURL& url){
! QString protocol = url.protocol();
!
! if( ( protocol == "krarc" || protocol == "tar" || protocol == "zip" ) &&
! QDir(url.path(-1)).exists() )
! return vfs::NORMAL;
!
! if( url.isLocalFile() ){
return vfs::NORMAL;
}
|
|
From: <ck...@us...> - 2004-01-02 16:09:55
|
Update of /cvsroot/krusader/krusader_kde3/krusader/Panel
In directory sc8-pr-cvs1:/tmp/cvs-serv31115/krusader_kde3/krusader/Panel
Modified Files:
listpanel.cpp panelfunc.cpp panelfunc.h
Log Message:
FIXED: freeze at opening an FTP bookmark
Index: listpanel.cpp
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/krusader/Panel/listpanel.cpp,v
retrieving revision 1.48
retrieving revision 1.49
diff -C2 -d -r1.48 -r1.49
*** listpanel.cpp 28 Dec 2003 23:24:18 -0000 1.48
--- listpanel.cpp 2 Jan 2004 16:09:52 -0000 1.49
***************
*** 111,115 ****
bookmarksButton = new BookmarksButton( this );
connect( bookmarksButton, SIGNAL( pressed() ), this, SLOT( slotFocusOnMe() ) );
! connect( bookmarksButton, SIGNAL( openUrl( const KURL& ) ), func, SLOT( openUrl( const KURL& ) ) );
QWhatsThis::add
( bookmarksButton, i18n( "Open menu with bookmarks. You can also add "
--- 111,115 ----
bookmarksButton = new BookmarksButton( this );
connect( bookmarksButton, SIGNAL( pressed() ), this, SLOT( slotFocusOnMe() ) );
! connect( bookmarksButton, SIGNAL( openUrl( const KURL& ) ), func, SLOT( delayedOpenUrl( const KURL& ) ) );
QWhatsThis::add
( bookmarksButton, i18n( "Open menu with bookmarks. You can also add "
Index: panelfunc.cpp
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/krusader/Panel/panelfunc.cpp,v
retrieving revision 1.48
retrieving revision 1.49
diff -C2 -d -r1.48 -r1.49
*** panelfunc.cpp 27 Dec 2003 16:50:16 -0000 1.48
--- panelfunc.cpp 2 Jan 2004 16:09:52 -0000 1.49
***************
*** 197,200 ****
--- 197,202 ----
panel( parent ), inRefresh( false ), vfsP(0){
urlStack.push( "file:/" );
+
+ connect( &delayTimer, SIGNAL(timeout()), this, SLOT(doOpenUrl()));
}
***************
*** 254,257 ****
--- 256,267 ----
}
+ void ListPanelFunc::delayedOpenUrl( const KURL& url ) {
+ delayURL = url; /* this function is useful for FTP url-s and bookmarks */
+ delayTimer.start( 0, true ); /* to avoid qApp->processEvents() deadlock situaltion */
+ }
+
+ void ListPanelFunc::doOpenUrl() {
+ openUrl( delayURL );
+ }
void ListPanelFunc::refresh( const KURL& url ) {
Index: panelfunc.h
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/krusader/Panel/panelfunc.h,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** panelfunc.h 25 Dec 2003 23:55:35 -0000 1.17
--- panelfunc.h 2 Jan 2004 16:09:52 -0000 1.18
***************
*** 37,40 ****
--- 37,41 ----
#include <qvaluestack.h>
#include <qthread.h>
+ #include <qtimer.h>
/* --=={ Patch by Heiner <h.e...@gm...> }==-- */
***************
*** 101,104 ****
--- 102,107 ----
void openUrl(const KURL& path, const QString& nameToMakeCurrent = QString::null);
void openUrl(const QString& path, const QString& nameToMakeCurrent = QString::null);
+ void delayedOpenUrl( const KURL& path);
+ void doOpenUrl();
void refresh(){ refresh(panel->virtualPath); } // re-read the files
void rename(const QString &oldname, const QString &newname);
***************
*** 144,147 ****
--- 147,153 ----
bool inRefresh; // true when we are in refresh()
vfs* vfsP; // pointer to vfs.
+
+ QTimer delayTimer;
+ KURL delayURL;
};
|
|
From: <ck...@us...> - 2004-01-02 16:09:55
|
Update of /cvsroot/krusader/krusader_kde3/krusader/BookMan
In directory sc8-pr-cvs1:/tmp/cvs-serv31115/krusader_kde3/krusader/BookMan
Modified Files:
kbookmarkhandler.cpp
Log Message:
FIXED: freeze at opening an FTP bookmark
Index: kbookmarkhandler.cpp
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/krusader/BookMan/kbookmarkhandler.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** kbookmarkhandler.cpp 25 Dec 2003 23:51:52 -0000 1.4
--- kbookmarkhandler.cpp 2 Jan 2004 16:09:52 -0000 1.5
***************
*** 19,22 ****
--- 19,23 ----
#include "../krusaderview.h"
#include "../Panel/listpanel.h"
+ #include "../VFS/vfs.h"
#include "kbookmarkhandler.moc"
***************
*** 58,62 ****
void KBookmarkHandler::openBookmarkURL(const KURL& url)
{
! emit openUrl( url );
}
--- 59,63 ----
void KBookmarkHandler::openBookmarkURL(const KURL& url)
{
! emit openUrl( vfs::fromPathOrURL( url.prettyURL() ) );
}
|
|
From: <ck...@us...> - 2003-12-30 20:39:36
|
Update of /cvsroot/krusader/krusader_kde3/krusader/MountMan
In directory sc8-pr-cvs1:/tmp/cvs-serv18535/krusader_kde3/krusader/MountMan
Modified Files:
kmountmangui.cpp kmountmangui.h
Log Message:
FIXED: MountMan double clicking bug
Index: kmountmangui.cpp
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/krusader/MountMan/kmountmangui.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** kmountmangui.cpp 19 Oct 2003 16:37:02 -0000 1.7
--- kmountmangui.cpp 30 Dec 2003 20:39:32 -0000 1.8
***************
*** 37,40 ****
--- 37,41 ----
#include "../kicons.h"
#include "../defaults.h"
+ #include "../VFS/vfs.h"
#include <klocale.h>
#include <qpixmap.h>
***************
*** 183,190 ****
// change the active panel to this mountpoint
fsData *system=krMtMan.location(i->text(0));
! connect((QObject*)this,SIGNAL(refreshPanel(QString)), (QObject*)SLOTS,
! SLOT(refresh(QString)));
! emit refreshPanel(system->mntPoint());
! disconnect(this,SIGNAL(refreshPanel(QString)),0,0);
slotClose();
}
--- 184,191 ----
// change the active panel to this mountpoint
fsData *system=krMtMan.location(i->text(0));
! connect((QObject*)this,SIGNAL(refreshPanel(const KURL &)), (QObject*)SLOTS,
! SLOT(refresh(const KURL &)));
! emit refreshPanel( vfs::fromPathOrURL( system->mntPoint() ) );
! disconnect(this,SIGNAL(refreshPanel(const KURL &)),0,0);
slotClose();
}
Index: kmountmangui.h
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/krusader/MountMan/kmountmangui.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** kmountmangui.h 19 Oct 2003 16:37:02 -0000 1.3
--- kmountmangui.h 30 Dec 2003 20:39:32 -0000 1.4
***************
*** 41,44 ****
--- 41,45 ----
#include <kjanuswidget.h>
#include <qtimer.h>
+ #include <kurl.h>
#define WATCHER_DELAY 500
***************
*** 70,74 ****
signals:
! void refreshPanel(QString);
private:
--- 71,75 ----
signals:
! void refreshPanel(const KURL &);
private:
|
|
From: <cod...@us...> - 2003-12-30 20:21:47
|
Update of /cvsroot/krusader/krusader_kde3/po In directory sc8-pr-cvs1:/tmp/cvs-serv15377/po Modified Files: nl.po Log Message: Dutch translation update, cvs date 29/12/2003 Index: nl.po =================================================================== RCS file: /cvsroot/krusader/krusader_kde3/po/nl.po,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** nl.po 24 Oct 2003 10:27:52 -0000 1.7 --- nl.po 30 Dec 2003 20:21:43 -0000 1.8 *************** *** 6,13 **** msgid "" msgstr "" ! "Project-Id-Version: krusader-1.29-beta1\n" ! "POT-Creation-Date: 2003-10-18 13:19+0200\n" ! "PO-Revision-Date: 2003-10-23 22:02+0200\n" ! "Last-Translator: Frank Schoolmeesters <fra...@ya...>\n" "Language-Team: Dutch <nl...@li...>\n" "MIME-Version: 1.0\n" --- 6,13 ---- msgid "" [...4747 lines suppressed...] + + #~ msgid "When unpacking into archive - you must use the active directory" + #~ msgstr "" + #~ "Wanneer een archief wil uitpakken - moet u de actieve directory gebruiken" + #~ msgid "Sort By E&xtention" #~ msgstr "Op e&xtensie sorteren" #~ msgid "Move into archive" #~ msgstr "Verplaats naar archief" *************** *** 2706,2712 **** #~ "U heeft geen permissie om \n" #~ "te verplaatsen " - - #~ msgid "Newer files" - #~ msgstr "Nieuwere bestanden" #~ msgid "Older files" --- 3298,3301 ---- |
|
From: <cod...@us...> - 2003-12-30 20:21:46
|
Update of /cvsroot/krusader/krusader_kde3
In directory sc8-pr-cvs1:/tmp/cvs-serv15377
Modified Files:
ChangeLog
Log Message:
Dutch translation update, cvs date 29/12/2003
Index: ChangeLog
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/ChangeLog,v
retrieving revision 1.156
retrieving revision 1.157
diff -C2 -d -r1.156 -r1.157
*** ChangeLog 30 Dec 2003 07:42:48 -0000 1.156
--- ChangeLog 30 Dec 2003 20:21:43 -0000 1.157
***************
*** 15,18 ****
--- 15,19 ----
FIXED: ftp port limit changed from 999 to 65535
+ UPDATED: Dutch translation
UPDATED: Czech translation (thanks to Martin Sixta)
UPDATED: Spanish translation
|
Update of /cvsroot/krusader/krusader_kde3/doc/en
In directory sc8-pr-cvs1:/tmp/cvs-serv14594/doc/en
Modified Files:
credits.sgml faq.sgml index.docbook installation.sgml
introduction.sgml using-krusader.sgml
Log Message:
Handbook 1.00.05a
Index: credits.sgml
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/doc/en/credits.sgml,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** credits.sgml 25 Dec 2003 20:50:19 -0000 1.6
--- credits.sgml 30 Dec 2003 20:18:08 -0000 1.7
***************
*** 30,65 ****
&krusader; is developed by a dedicated team of individuals, known as the &krusader; Krew.
<itemizedlist>
! <listitem><para>Shie Erlich, author <email>ma...@us...</email></para></listitem>
! <listitem><para>Rafi Yanai, author <email>ya...@us...</email></para></listitem>
<listitem><para>Dirk Eschler, webmaster and i18n coordinator
! <email>des...@us...</email></para></listitem>
! <listitem><para>Jan Halasa, developer <email>jan...@us...</email></para></listitem>
! <listitem><para>Csaba Karai, developer <email>csa...@no...</email></para></listitem>
<listitem><para>Frank Schoolmeesters, documentation coordinator and patches
! <email>cod...@us...</email></para></listitem>
</itemizedlist>
The project is written using <application>KDevelop</application> and <application>&Qt; Designer</application>.
</para>
! <para>We would especially like to thank Dirk Eschler <email>des...@us...</email>
the &krusader; web master. If you'll visit the &kruwebsite_url;
! you'll appreciate as much as we do the hard work and effort that Dirk has put into
! the site.</para>
! <para>
! Contributors:
We would like to thank all the &krusader; users who submitted bugs, wishes and patches.
! Sorry we can't mention you all.</para>
<para>Special thanks to:
<itemizedlist>
! <listitem><para>Heiner Eichmann <email>h.e...@gm...</email> The 6th Beatle: FreeBSD port, patches and general help</para></listitem>
! <listitem><para>Mark Eatough <email>mar...@ya...</email> &krusader; handbook proof reader
! </para></listitem>
! <listitem><para>Mikolaj Machowski <email>mi...@wp...</email> Usability and QA</para></listitem>
! <listitem><para>Cristi Dumitrescu <email>cr...@ch...</email> QA, bug-hunting, patches and general help</para></listitem>
! <listitem><para>Aurelien Gateau <email>aur...@fr...</email> patch for KViewer</para></listitem>
! <listitem><para>Milan Brabec <email>mb...@vo...</email> the first patch ever !</para></listitem>
</itemizedlist>
! </para>
<para>Thanks to the translators:
--- 30,80 ----
&krusader; is developed by a dedicated team of individuals, known as the &krusader; Krew.
<itemizedlist>
! <listitem><para>Shie Erlich, author
! <email>er...@us...</email></para></listitem>
! <!-- ma...@us... -->
! <listitem><para>Rafi Yanai, author
! <email>ya...@us...</email></para></listitem>
<listitem><para>Dirk Eschler, webmaster and i18n coordinator
! <email>des...@us...</email></para></listitem>
! <listitem><para>Csaba Karai, developer
! <email>csa...@no...</email></para></listitem>
<listitem><para>Frank Schoolmeesters, documentation coordinator and patches
! <email>cod...@us...</email></para></listitem>
! <listitem><para>Mark Eatough, &krusader; handbook proof reader
! <email>mar...@ya...</email>
! </para></listitem>
</itemizedlist>
The project is written using <application>KDevelop</application> and <application>&Qt; Designer</application>.
</para>
!
! <para>
! We would especially like to thank Dirk Eschler <email>des...@us...</email>
the &krusader; web master. If you'll visit the &kruwebsite_url;
! you'll appreciate as much as we do the hard work and effort that Dirk has put into the site.
! </para>
!
! <para>
! Contributors:
We would like to thank all the &krusader; users who submitted bugs, wishes and patches.
! Sorry we can't mention you all.
! </para>
<para>Special thanks to:
<itemizedlist>
! <listitem><para>Heiner Eichmann <email>h.e...@gm...</email>
! The 6th Beatle: FreeBSD port, patches and general help</para></listitem>
! <listitem><para>Jan Halasa <email>jan...@us...</email>
! the new bookmark system since "Krusader 1.25-beta1"</para></listitem>
! <listitem><para>Mikolaj Machowski <email>mi...@wp...</email>
! Usability and QA</para></listitem>
! <listitem><para>Cristi Dumitrescu <email>cr...@ch...</email>
! QA, bug-hunting, patches and general help</para></listitem>
! <listitem><para>Aurelien Gateau <email>aur...@fr...</email>
! patch for KViewer</para></listitem>
! <listitem><para>Milan Brabec <email>mb...@vo...</email>
! the first patch ever !</para></listitem>
</itemizedlist>
! </para>
<para>Thanks to the translators:
Index: faq.sgml
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/doc/en/faq.sgml,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** faq.sgml 25 Dec 2003 20:50:19 -0000 1.5
--- faq.sgml 30 Dec 2003 20:18:08 -0000 1.6
***************
*** 117,122 ****
resize it below a certain size. Basically, it doesn't get much smaller. Why?</para></question>
<answer><para>See the F1, F2 (etc.) buttons ? They are not allowing &krusader; to downsize as
! they have a minimum size. Just disable them (view->Show FN Keys Bar) and you'll be able to
! resize &krusader; to your liking.</para></answer>
</qandaentry>
--- 117,124 ----
resize it below a certain size. Basically, it doesn't get much smaller. Why?</para></question>
<answer><para>See the F1, F2 (etc.) buttons ? They are not allowing &krusader; to downsize as
! they have a minimum size. Just disable them
! <emphasis role="bold"><menuchoice><guimenu>View</guimenu>
! <guimenuitem>Show FN Keys Bar</guimenuitem></menuchoice></emphasis>
! and you'll be able to resize &krusader; to your liking.</para></answer>
</qandaentry>
***************
*** 136,141 ****
<question><para>When i run <command>make</command> it complains about
<filename>libfam.la</filename></para></question>
! <answer><para>The './configure' script does not check for the presence of 'libfam.la', and
! make needs 'libfam.la' to compile &krusader;. Install 'libfam0-devel-foo.rpm'.
Note: when you install Mandrake 9.1 with the default settings, this package is not installed.
If you need more information click
--- 138,145 ----
<question><para>When i run <command>make</command> it complains about
<filename>libfam.la</filename></para></question>
! <answer><para>The <command>./configure</command> script does not check for the presence of
! <filename>libfam.la</filename>, and <command>make</command> needs <filename>libfam.la</filename>
! to compile &krusader;.
! Install <filename>libfam0-devel-foo.rpm</filename>.
Note: when you install Mandrake 9.1 with the default settings, this package is not installed.
If you need more information click
***************
*** 156,160 ****
<answer><para>&krusader; does not handle (yet) Samba ISO 8859-x codepages, if you use a codepage different
than 8859-1 you will have to do a manual configuration.
! Create or modify the file: ~/.smb/smb.conf
<programlisting>
[global]
--- 160,164 ----
<answer><para>&krusader; does not handle (yet) Samba ISO 8859-x codepages, if you use a codepage different
than 8859-1 you will have to do a manual configuration.
! Create or modify the file: <filename>~/.smb/smb.conf</filename>
<programlisting>
[global]
***************
*** 183,187 ****
<answer><para>You are probably behind a firewall/proxy and haven't enabled Passive Mode.
Enable Passive FTP through &kde;'s Control Center and try again.
! Network -> Preferences -> 'Use Passive Mode' has to be checked.
</para></answer>
</qandaentry>
--- 187,193 ----
<answer><para>You are probably behind a firewall/proxy and haven't enabled Passive Mode.
Enable Passive FTP through &kde;'s Control Center and try again.
! <emphasis role="bold"><menuchoice><guimenu>KDE Control Center</guimenu>
! <guimenuitem>Network</guimenuitem><guimenuitem>Preferences</guimenuitem></menuchoice></emphasis> ,
! <guilabel>Enable Passive Mode (PASV)</guilabel> has to be checked.
</para></answer>
</qandaentry>
Index: index.docbook
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/doc/en/index.docbook,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** index.docbook 25 Dec 2003 20:50:19 -0000 1.5
--- index.docbook 30 Dec 2003 20:18:08 -0000 1.6
***************
*** 1,4 ****
--- 1,9 ----
<?xml version="1.0" ?>
+ <!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.1.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [
+
+ <!--
+ Previous used Docbook
<!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.1-Based Variant V1.0//EN" "dtd/kdex.dtd" [
+ -->
<!-- **********************************************************************
***************
*** 90,93 ****
--- 95,103 ----
<!ENTITY newfeaturenote '<note><para>This is a new feature under development, some descriptions can be obsolete when
functionality can change during the development. &bugreport_lnk;</para></note>'>
+ <!ENTITY krusaderrc_ui_text '<para>If &krusader; is upgraded then upgrade the
+ <filename>krusader_source_dir\krusader\krusaderrc.ui</filename> file in
+ <userinput>$KDEDIR/share/apps/krusader</userinput> and
+ <userinput>~/.kde/share/apps/krusader</userinput>
+ , click here for more <link linkend="krusaderrc_ui">info</link>.</para>'>
<!-- each chapter is in a seperate sgml file -->
***************
*** 106,130 ****
<authorgroup>
<author>
- <firstname>Shie</firstname>
- <surname>Erlich</surname>
- <affiliation>
- <address><email>ma...@us...</email></address>
- </affiliation>
- </author>
- <author>
- <firstname>Rafi</firstname>
- <surname>Yanai</surname>
- <affiliation>
- <address><email>ya...@us...</email></address>
- </affiliation>
- </author>
- <author>
<firstname>Frank</firstname>
<surname>Schoolmeesters</surname>
<affiliation>
<address><email>cod...@us...</email></address>
</affiliation>
</author>
</authorgroup>
<copyright>
--- 116,152 ----
<authorgroup>
+ <othercredit role="developer">
+ <firstname>Shie</firstname><surname>Erlich</surname>
+ <contrib>Author and initial Handbook author</contrib>
+ <affiliation><address><email>er...@us...</email></address></affiliation>
+ </othercredit>
+ <othercredit role="developer">
+ <firstname>Rafi</firstname><surname>Yanai</surname>
+ <contrib>Author and initial Handbook author</contrib>
+ <affiliation><address><email>ya...@us...</email></address></affiliation>
+ </othercredit>
+ <othercredit role="developer">
+ <firstname>Dirk</firstname><surname>Eschler</surname>
+ <contrib>Webmaster and i18n coordinator</contrib>
+ <affiliation><address><email>des...@us...</email></address></affiliation>
+ </othercredit>
+ <othercredit role="developer">
+ <firstname>Csaba</firstname><surname>Karai</surname>
+ <contrib>Developer</contrib>
+ <affiliation><address><email>csa...@no...</email></address></affiliation>
+ </othercredit>
<author>
<firstname>Frank</firstname>
<surname>Schoolmeesters</surname>
+ <contrib>Documentation coordinator</contrib>
<affiliation>
<address><email>cod...@us...</email></address>
</affiliation>
</author>
+ <othercredit role="reviewer">
+ <firstname>Mark</firstname><surname>Eatough</surname>
+ <contrib>Handbook proof reader</contrib>
+ <affiliation><address><email>mar...@ya...</email></address></affiliation>
+ </othercredit>
</authorgroup>
<copyright>
***************
*** 137,142 ****
</copyright>
<legalnotice>&FDLNotice;</legalnotice>
! <date>21/12/2003</date>
! <releaseinfo>1.00.05</releaseinfo>
<abstract>
--- 159,164 ----
</copyright>
<legalnotice>&FDLNotice;</legalnotice>
! <date>30/12/2003</date>
! <releaseinfo>1.00.05 a</releaseinfo>
<abstract>
Index: installation.sgml
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/doc/en/installation.sgml,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** installation.sgml 25 Dec 2003 20:50:19 -0000 1.5
--- installation.sgml 30 Dec 2003 20:18:08 -0000 1.6
***************
*** 134,139 ****
<para>
In order to successfully use &krusader;, you need &kde; 3.x.x.</para>
! <para><remark>For &kde; 2.x.x there is &krusader; v1.01, stable but there are no planned changes.</remark></para>
<para>Note: all versions >=1.02 are &kde; 3.x.x only.</para>
<para>&krusader; uses about 10 megs of memory to run, but this may vary depending
on your platform and configuration.
--- 134,141 ----
<para>
In order to successfully use &krusader;, you need &kde; 3.x.x.</para>
! <para><remark>For &kde; 2.x.x there is &krusader; v1.01, stable but there are no planned
! changes.</remark></para>
<para>Note: all versions >=1.02 are &kde; 3.x.x only.</para>
+ <para>A FreeBSD port of &krusader; is available.</para>
<para>&krusader; uses about 10 megs of memory to run, but this may vary depending
on your platform and configuration.
***************
*** 166,172 ****
<prompt>$</prompt> <userinput><command>su -c 'make</command> <option>install'</option></userinput></screen>
<para>Since &krusader; uses <command>autoconf</command> and
! <command>automake</command> you should have no trouble compiling it. Should you
! run into problems please read the detailed installation instructions below.</para>
<para>The next procedure will explain step by step in detail how to install &krusader;.
--- 168,177 ----
<prompt>$</prompt> <userinput><command>su -c 'make</command> <option>install'</option></userinput></screen>
+ &krusaderrc_ui_text;
+
<para>Since &krusader; uses <command>autoconf</command> and
! <command>automake</command> you should have no trouble compiling it.
! Should you run into problems please read the detailed installation instructions below.</para>
!
<para>The next procedure will explain step by step in detail how to install &krusader;.
***************
*** 302,313 ****
to post a help request at our &kruforum_url;.</para></listitem>
<listitem><para>If nothing went wrong, finally install &krusader;.
! <screen><prompt>$</prompt> <userinput><command>su -c 'make</command> <option> install'</option></userinput></screen>
You will be asked to enter your root password.</para></listitem>
! <listitem><para>If you upgraded &krusader; verify that the
! <filename>krusader_source_dir\krusader\krusaderrc.ui</filename> file is upgraded in
! <userinput>$KDEDIR/share/apps/krusader</userinput> and
! <userinput>~/.kde/share/apps/krusader</userinput>
! , click here for more <link linkend="krusaderrc_ui">info</link>.</para></listitem>
<listitem><para>You can if you want: clean up to save some diskspace.
--- 307,316 ----
to post a help request at our &kruforum_url;.</para></listitem>
<listitem><para>If nothing went wrong, finally install &krusader;.
! <screen>
! <prompt>$</prompt> <userinput><command>su -c 'make</command> <option>install'</option></userinput>
! </screen>
You will be asked to enter your root password.</para></listitem>
! <listitem>&krusaderrc_ui_text;</listitem>
<listitem><para>You can if you want: clean up to save some diskspace.
***************
*** 315,319 ****
This step is optional.</para></listitem>
<listitem><para>If you ever want to uninstall &krusader;, just use
! <screen><prompt>$</prompt> <userinput><command>su -c 'make</command> <option> uninstall'</option></userinput></screen>
You will be asked to enter your root password.</para></listitem>
</orderedlist>
--- 318,324 ----
This step is optional.</para></listitem>
<listitem><para>If you ever want to uninstall &krusader;, just use
! <screen>
! <prompt>$</prompt> <userinput><command>su -c 'make</command> <option>uninstall'</option></userinput>
! </screen>
You will be asked to enter your root password.</para></listitem>
</orderedlist>
***************
*** 396,400 ****
its behavior.</para>
! <note><para>Don't wurry about the messages you get in the &konsole;</para></note>
<para><option>--left</option>
--- 401,406 ----
its behavior.</para>
! <note><para>Don't wurry about the messages you get in the &konsole;. These messages are log messages,
! they can be used for debugging &krusader;.</para></note>
<para><option>--left</option>
Index: introduction.sgml
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/doc/en/introduction.sgml,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** introduction.sgml 25 Dec 2003 20:50:19 -0000 1.5
--- introduction.sgml 30 Dec 2003 20:18:08 -0000 1.6
***************
*** 95,98 ****
--- 95,101 ----
</listitem>
<listitem>
+ <para>Built-in Mount-Manager <link linkend="mount-man">MountMan</link>.</para>
+ </listitem>
+ <listitem>
<para><link linkend="multi_rename">Krename</link> support, a very powerfull
external batch renamer for &kde; 3.x.</para>
Index: using-krusader.sgml
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/doc/en/using-krusader.sgml,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** using-krusader.sgml 25 Dec 2003 20:50:19 -0000 1.5
--- using-krusader.sgml 30 Dec 2003 20:18:08 -0000 1.6
***************
*** 637,681 ****
&newfeaturenote;
! <para>NOTE: This discription is not yet complete.</para>
!
! <para>This function allows you to compare the left and the right panel and show the difference between them
after choosing <emphasis role="bold"><menuchoice><guimenu>Commands</guimenu>
<guimenuitem>Synchronize Directories</guimenuitem></menuchoice></emphasis>
or
<keycombo action="simul">&Ctrl;<keycap>D</keycap></keycombo>.
! The left and the right directory can by changed and a filter can be set.
! After the compare function, you can move files/directories so that the directories can be synchronized.
</para>
! <para>Options:
<itemizedlist>
! <listitem><para>Recurce subdirectories</para></listitem>
! <listitem><para>Ignore Date</para></listitem>
! <listitem><para>Asymmetric</para></listitem>
! <listitem><para>Compare by content (not yet available)</para></listitem>
! <listitem><para>Follow symlinks</para></listitem>
</itemizedlist>
</para>
<para>
! Show options:
<itemizedlist>
! <listitem><para>->: left is newer then right</para></listitem>
! <listitem><para>=: equal</para></listitem>
! <listitem><para>not = : not equal</para></listitem>
! <listitem><para><-: right is newer than left</para></listitem>
! <listitem><para>trash</para></listitem>
! <listitem><para>duplicates</para></listitem>
! <listitem><para>singles</para></listitem>
</itemizedlist>
</para>
<para>
! Buttons:
<itemizedlist>
! <listitem><para>Compare: compares the left and right directories</para></listitem>
! <listitem><para>Stop: stop the compare or synchronize process</para></listitem>
! <listitem><para>Synchronize: synchronizes the directories</para></listitem>
! <listitem><para>Close: close the Synchronize Directories window</para></listitem>
</itemizedlist>
</para>
--- 637,708 ----
&newfeaturenote;
! <para>This function compares the left and the right panel and shows the difference between them
after choosing <emphasis role="bold"><menuchoice><guimenu>Commands</guimenu>
<guimenuitem>Synchronize Directories</guimenuitem></menuchoice></emphasis>
or
<keycombo action="simul">&Ctrl;<keycap>D</keycap></keycombo>.
! After the compare function, you can synchronize the files and directories.
</para>
! <para>Procedure: set the left and the right directory, configure the optional file filter and
! set the checkbox options. Then click on the <guibutton>Compare</guibutton> button, the results
! are listed below. The listed results can be filtered with the <guilabel>Show options</guilabel> to
! increase the readability (by default everything is viewed). When you agree with the
! <guibutton>Compare</guibutton> results click on the <guibutton>Synchronize</guibutton> button
! to synchronize the files and directories.
! </para>
!
! <para>Checkbox options:
<itemizedlist>
! <listitem><para><guilabel>Recurse subdirectories</guilabel>:
! compares not only the base directories but their subdirectories as well.</para></listitem>
! <listitem><para><guilabel>Ignore Date</guilabel>:
! ignores the date information at comparing (good if the files were fetched from ftp, smb,
! archive, ... file systems).</para></listitem>
! <listitem><para><guilabel>Asymmetric</guilabel>:
! The left side is the destination, the right is the source directory.
! The files existed only in the left directory will be deleted, the other differing ones
! will be copied from right to left (useful at updating a directory from a file
! server).</para></listitem>
! <listitem><para><guilabel>Compare by content</guilabel>:
! compares the duplicate files with the same size by their content.</para></listitem>
! <listitem><para><guilabel>Follow symlinks</guilabel>:
! follows the symbolic links also at comparing.</para></listitem>
! <listitem><para><guilabel>Automatic Scrolling</guilabel>:
! scrolls the results of comparing (slow).</para></listitem>
</itemizedlist>
</para>
<para>
! Show options (in the compare results list):
<itemizedlist>
! <listitem><para><guibutton>-></guibutton>:
! lists the files marked to copy from left to right.</para></listitem>
! <listitem><para><guibutton>=</guibutton>:
! lists the files considered to be identical.</para></listitem>
! <listitem><para><guibutton>not =</guibutton>:
! lists the excluded files.</para></listitem>
! <listitem><para><guibutton><-</guibutton>:
! lists the files marked to copy from right to left.</para></listitem>
! <listitem><para><guibutton>trash</guibutton>:
! lists the files marked to delete.</para></listitem>
! <listitem><para><guibutton>Duplicates</guibutton>:
! lists those files that exist in both sides.</para></listitem>
! <listitem><para><guibutton>Singles</guibutton>:
! lists those files that exist only in either side.</para></listitem>
</itemizedlist>
</para>
<para>
! Action buttons:
<itemizedlist>
! <listitem><para><guibutton>Compare</guibutton>:
! compares the left and right directories, the results are displayed below.</para></listitem>
! <listitem><para><guibutton>Stop</guibutton>:
! stops the compare or synchronize process.</para></listitem>
! <listitem><para><guibutton>Synchronize</guibutton>:
! synchronizes the files and directories.</para></listitem>
! <listitem><para><guibutton>Close</guibutton>:
! closes the Synchronizer window.</para></listitem>
</itemizedlist>
</para>
|
|
From: <cod...@us...> - 2003-12-30 20:18:11
|
Update of /cvsroot/krusader/krusader_kde3/doc In directory sc8-pr-cvs1:/tmp/cvs-serv14594/doc Modified Files: ChangeLog krusader.1 Log Message: Handbook 1.00.05a Index: ChangeLog =================================================================== RCS file: /cvsroot/krusader/krusader_kde3/doc/ChangeLog,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** ChangeLog 25 Dec 2003 20:48:16 -0000 1.6 --- ChangeLog 30 Dec 2003 20:18:08 -0000 1.7 *************** *** 2,9 **** ------------------------------- 1.00.05 ====================== ! Date:xx.12.2003 ! ADDED: file splitter (using-krusader.sgml) ADDED: directory synchronisation (using-krusader.sgml) --- 2,17 ---- ------------------------------- + + Date: + + UPDATED: manpage + UPDATED: directory synchronisation (using-krusader.sgml) + UPDATED: From: DocBook XML V4.1-Based Variant V1.0//EN + To: DocBook XML V4.1.2-Based Variant V1.1//EN + 1.00.05 ====================== ! Date:21.12.2003 ! FIXED: added package entity for compilation under KDE3.2-beta2 (index.docbook) ADDED: file splitter (using-krusader.sgml) ADDED: directory synchronisation (using-krusader.sgml) Index: krusader.1 =================================================================== RCS file: /cvsroot/krusader/krusader_kde3/doc/krusader.1,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** krusader.1 6 Nov 2003 21:32:40 -0000 1.2 --- krusader.1 30 Dec 2003 20:18:08 -0000 1.3 *************** *** 1,3 **** ! .TH krusader 1 "25 September 2003" Linux "Krusader Manpage" .SH "NAME" krusader \- twin-panel file manager and ftp client for KDE 3.x --- 1,3 ---- ! .TH krusader 1 "30 December 2003" Linux "Krusader Manpage" .SH "NAME" krusader \- twin-panel file manager and ftp client for KDE 3.x *************** *** 78,82 **** Directory comparison and filtering. ! Ftp/Samba/Fish connections. Opens a terminal to the browsed path. --- 78,84 ---- Directory comparison and filtering. ! Quick view and Tree panels. ! ! Ftp/Samba client with a connection manager with SFTP/SCP support. Opens a terminal to the browsed path. *************** *** 86,89 **** --- 88,93 ---- Bookmark module that takes local files and remote ones. + Easy editing of file permissions. + Shows the effective permissions for the current user. *************** *** 103,106 **** --- 107,120 ---- Mountmanager + + Krename support, a very powerfull external batch renamer for KDE 3.x. + + Tabbed Browsing. + + Root mode. + + File splitter & Combine files. + + Synchronize Directories. .SH "LICENSE" Krusader is distributed under the terms of the GNU General Public *************** *** 138,146 **** Dirk Eschler, Webmaster and i18n coordinator <des...@us...> - Jan Halasa, Developer <jan...@us...> - Csaba Karai, Developer <csa...@no...> Frank Schoolmeesters, Documentation and patches <cod...@us...> The project is written using KDevelop and QT Designer. --- 152,160 ---- Dirk Eschler, Webmaster and i18n coordinator <des...@us...> Csaba Karai, Developer <csa...@no...> Frank Schoolmeesters, Documentation and patches <cod...@us...> + + Mark Eatough, Krusader handbook proof reader <mar...@ya...> The project is written using KDevelop and QT Designer. |
|
From: <ck...@us...> - 2003-12-30 07:42:52
|
Update of /cvsroot/krusader/krusader_kde3
In directory sc8-pr-cvs1:/tmp/cvs-serv14726/krusader_kde3
Modified Files:
ChangeLog
Log Message:
FIXED: window size and position saving in maximized mode
Index: ChangeLog
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/ChangeLog,v
retrieving revision 1.155
retrieving revision 1.156
diff -C2 -d -r1.155 -r1.156
*** ChangeLog 29 Dec 2003 17:27:12 -0000 1.155
--- ChangeLog 30 Dec 2003 07:42:48 -0000 1.156
***************
*** 1,4 ****
--- 1,5 ----
ADDED: directory synchronizer
ADDED: file splitter
+ FIXED: window size and position saving at maximized mode
FIXED: more freedom to give FTP proxy URL-s in "New FTP Connection" menu
FIXED: crash at ftp://user@server@proxy:port FTP URL-s
|
|
From: <ck...@us...> - 2003-12-30 07:42:52
|
Update of /cvsroot/krusader/krusader_kde3/krusader
In directory sc8-pr-cvs1:/tmp/cvs-serv14726/krusader_kde3/krusader
Modified Files:
krusader.cpp krusader.h
Log Message:
FIXED: window size and position saving in maximized mode
Index: krusader.cpp
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/krusader/krusader.cpp,v
retrieving revision 1.50
retrieving revision 1.51
diff -C2 -d -r1.50 -r1.51
*** krusader.cpp 26 Dec 2003 21:44:23 -0000 1.50
--- krusader.cpp 30 Dec 2003 07:42:49 -0000 1.51
***************
*** 199,203 ****
setCentralWidget( mainView );
config->setGroup( "Look&Feel" );
- show();
// manage our keyboard short-cuts
--- 199,202 ----
***************
*** 207,212 ****
// first, resize and move to starting point
config->setGroup( "Private" );
! move( krConfig->readPointEntry( "Start Position", _StartPosition ) );
! resize( krConfig->readSizeEntry( "Start Size", _StartSize ) );
// let the good times rool :)
--- 206,216 ----
// first, resize and move to starting point
config->setGroup( "Private" );
! move( oldPos = krConfig->readPointEntry( "Start Position", _StartPosition ) );
! resize( oldSize = krConfig->readSizeEntry( "Start Size", _StartSize ) );
!
! if( krConfig->readBoolEntry( "Maximized" ) )
! showMaximized();
! else
! show();
// let the good times rool :)
***************
*** 271,274 ****
--- 275,288 ----
}
+ void Krusader::moveEvent ( QMoveEvent *e ) {
+ oldPos = e->oldPos();
+ KParts::MainWindow::moveEvent(e);
+ }
+
+ void Krusader::resizeEvent ( QResizeEvent *e ) {
+ oldSize = e->oldSize();
+ KParts::MainWindow::resizeEvent(e);
+ }
+
void Krusader::setupAccels() {
accels = new KAccel( this );
***************
*** 449,454 ****
void Krusader::savePosition() {
config->setGroup( "Private" );
! config->writeEntry( "Start Position", pos() );
! config->writeEntry( "Start Size", size() );
config->writeEntry( "Panel Size", mainView->vert_splitter->sizes() [ 0 ] );
config->writeEntry( "Terminal Size", mainView->vert_splitter->sizes() [ 1 ] );
--- 463,469 ----
void Krusader::savePosition() {
config->setGroup( "Private" );
! config->writeEntry( "Start Position", isMaximized() ? oldPos : pos() );
! config->writeEntry( "Start Size", isMaximized() ? oldSize : size() );
! config->writeEntry( "Maximized", isMaximized() );
config->writeEntry( "Panel Size", mainView->vert_splitter->sizes() [ 0 ] );
config->writeEntry( "Terminal Size", mainView->vert_splitter->sizes() [ 1 ] );
Index: krusader.h
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/krusader/krusader.h,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** krusader.h 26 Dec 2003 15:34:23 -0000 1.18
--- krusader.h 30 Dec 2003 07:42:49 -0000 1.19
***************
*** 86,89 ****
--- 86,91 ----
void showEvent ( QShowEvent * );
void hideEvent ( QHideEvent * );
+ void moveEvent ( QMoveEvent * );
+ void resizeEvent ( QResizeEvent * );
public:
***************
*** 125,128 ****
--- 127,132 ----
private:
KSystemTray *sysTray;
+ QPoint oldPos;
+ QSize oldSize;
};
|
|
From: <ck...@us...> - 2003-12-29 17:27:22
|
Update of /cvsroot/krusader/krusader_kde3/krusader/Dialogs
In directory sc8-pr-cvs1:/tmp/cvs-serv909/krusader_kde3/krusader/Dialogs
Modified Files:
krspwidgets.cpp
Log Message:
FIXED: more freedom for giving FTP proxy URL-s in "New Net Connection" menu
Index: krspwidgets.cpp
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/krusader/Dialogs/krspwidgets.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** krspwidgets.cpp 14 Oct 2003 22:22:21 -0000 1.6
--- krspwidgets.cpp 29 Dec 2003 17:27:12 -0000 1.7
***************
*** 100,110 ****
if (p->url->currentText()=="") return QString::null;
QString URL=p->prefix->currentText();
! if( !p->username->text().isEmpty() ){
! URL = URL + p->username->text();
! if ( !p->password->text().isEmpty() )
! URL = URL + ":" + p->password->text();
URL = URL + "@";
}
! URL = URL + p->url->currentText();
if( p->prefix->currentText().startsWith("ftp") ){
int i = URL.find("/",p->prefix->currentText().length());
--- 100,131 ----
if (p->url->currentText()=="") return QString::null;
QString URL=p->prefix->currentText();
!
! QString url = p->url->currentText();
! QString username = p->username->text();
! QString password = p->password->text();
! int pswStartPos, pswEndPos;
!
! if(( pswEndPos = url.findRev( "@" ) ) != -1 )
! {
! pswStartPos = url.findRev( ":", pswEndPos );
!
! if( pswStartPos != -1 )
! {
! password = ( password.isEmpty() ? QString( "" ) : password+"@" ) + url.mid( pswStartPos+1, pswEndPos-pswStartPos-1 );
! url.remove( pswStartPos, pswEndPos-pswStartPos );
! }
!
! pswEndPos = url.findRev( "@" );
! username = ( username.isEmpty() ? QString( "" ) : username+"@" ) + url.left( pswEndPos );
! url.remove( 0, pswEndPos+1 );
! }
!
! if( !username.isEmpty() ){
! URL = URL + username;
! if ( !password.isEmpty() )
! URL = URL + ":" + password;
URL = URL + "@";
}
! URL = URL + url;
if( p->prefix->currentText().startsWith("ftp") ){
int i = URL.find("/",p->prefix->currentText().length());
|
|
From: <ck...@us...> - 2003-12-29 17:27:21
|
Update of /cvsroot/krusader/krusader_kde3
In directory sc8-pr-cvs1:/tmp/cvs-serv909/krusader_kde3
Modified Files:
ChangeLog
Log Message:
FIXED: more freedom for giving FTP proxy URL-s in "New Net Connection" menu
Index: ChangeLog
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/ChangeLog,v
retrieving revision 1.154
retrieving revision 1.155
diff -C2 -d -r1.154 -r1.155
*** ChangeLog 29 Dec 2003 17:11:46 -0000 1.154
--- ChangeLog 29 Dec 2003 17:27:12 -0000 1.155
***************
*** 1,4 ****
--- 1,5 ----
ADDED: directory synchronizer
ADDED: file splitter
+ FIXED: more freedom to give FTP proxy URL-s in "New FTP Connection" menu
FIXED: crash at ftp://user@server@proxy:port FTP URL-s
FIXED: no parent directory at tar://... and zip://... URL-s
|
|
From: <ck...@us...> - 2003-12-29 17:12:01
|
Update of /cvsroot/krusader/krusader_kde3
In directory sc8-pr-cvs1:/tmp/cvs-serv31152/krusader_kde3
Modified Files:
ChangeLog
Log Message:
FIXED: crash at ftp://user@server@ftpproxy:port FTP proxy URL-s
Index: ChangeLog
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/ChangeLog,v
retrieving revision 1.153
retrieving revision 1.154
diff -C2 -d -r1.153 -r1.154
*** ChangeLog 28 Dec 2003 22:48:26 -0000 1.153
--- ChangeLog 29 Dec 2003 17:11:46 -0000 1.154
***************
*** 1,4 ****
--- 1,5 ----
ADDED: directory synchronizer
ADDED: file splitter
+ FIXED: crash at ftp://user@server@proxy:port FTP URL-s
FIXED: no parent directory at tar://... and zip://... URL-s
FIXED: font size problems in KCmdLine and KrMaskChoice
|
|
From: <ck...@us...> - 2003-12-29 17:12:00
|
Update of /cvsroot/krusader/krusader_kde3/krusader/VFS
In directory sc8-pr-cvs1:/tmp/cvs-serv31152/krusader_kde3/krusader/VFS
Modified Files:
vfs.cpp
Log Message:
FIXED: crash at ftp://user@server@ftpproxy:port FTP proxy URL-s
Index: vfs.cpp
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/krusader/VFS/vfs.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** vfs.cpp 27 Dec 2003 16:50:17 -0000 1.6
--- vfs.cpp 29 Dec 2003 17:11:46 -0000 1.7
***************
*** 83,87 ****
bool bugfix = origin.find("@") != origin.findRev("@");
if(bugfix){
! if(origin.find(":") != origin.findRev(":")){
int passStart = origin.find( ":",origin.find(":")+1 )+1;
int passLen = origin.findRev("@")-passStart;
--- 83,87 ----
bool bugfix = origin.find("@") != origin.findRev("@");
if(bugfix){
! if(origin.find(":") != origin.findRev(":", origin.findRev("@") )){
int passStart = origin.find( ":",origin.find(":")+1 )+1;
int passLen = origin.findRev("@")-passStart;
|
|
From: <ck...@us...> - 2003-12-28 23:24:23
|
Update of /cvsroot/krusader/krusader_kde3/krusader/Panel
In directory sc8-pr-cvs1:/tmp/cvs-serv29839/krusader_kde3/krusader/Panel
Modified Files:
listpanel.cpp
Log Message:
FIXED: missing up dir for tar and zip files II.
Index: listpanel.cpp
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/krusader/Panel/listpanel.cpp,v
retrieving revision 1.47
retrieving revision 1.48
diff -C2 -d -r1.47 -r1.48
*** listpanel.cpp 28 Dec 2003 22:48:26 -0000 1.47
--- listpanel.cpp 28 Dec 2003 23:24:18 -0000 1.48
***************
*** 299,310 ****
void ListPanel::slotUpdate() {
// if we are not at the root add the ".." entery
-
- /* remove the last slash from archives, but take care of ftp://server/ URL-s */
QString protocol = func->files() ->vfs_getOrigin().protocol();
! int removeLastSlash = (protocol == "ftp" || protocol == "smb" || protocol == "sftp" ||
! protocol == "fish" ) ? 0 : -1;
! QString origin = func->files() ->vfs_getOrigin().prettyURL( removeLastSlash );
! if ( origin.right( 1 ) != "/" && !( ( func->files() ->vfs_getType() == vfs::FTP ) &&
origin.find( '/', origin.find( ":/" ) + 3 ) == -1 ) ) {
view->addItems( func->files() );
--- 299,307 ----
void ListPanel::slotUpdate() {
// if we are not at the root add the ".." entery
QString protocol = func->files() ->vfs_getOrigin().protocol();
! bool isFtp = (protocol == "ftp" || protocol == "smb" || protocol == "sftp" || protocol == "fish" );
! QString origin = func->files() ->vfs_getOrigin().prettyURL( -1 );
! if ( origin.right( 1 ) != "/" && !( ( func->files() ->vfs_getType() == vfs::FTP ) && isFtp &&
origin.find( '/', origin.find( ":/" ) + 3 ) == -1 ) ) {
view->addItems( func->files() );
|
|
From: <ck...@us...> - 2003-12-28 22:48:48
|
Update of /cvsroot/krusader/krusader_kde3
In directory sc8-pr-cvs1:/tmp/cvs-serv23824/krusader_kde3
Modified Files:
ChangeLog
Log Message:
FIXED: no parent directory for tar://... and zip://... URL-s
Index: ChangeLog
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/ChangeLog,v
retrieving revision 1.152
retrieving revision 1.153
diff -C2 -d -r1.152 -r1.153
*** ChangeLog 25 Dec 2003 20:14:09 -0000 1.152
--- ChangeLog 28 Dec 2003 22:48:26 -0000 1.153
***************
*** 1,4 ****
--- 1,5 ----
ADDED: directory synchronizer
ADDED: file splitter
+ FIXED: no parent directory at tar://... and zip://... URL-s
FIXED: font size problems in KCmdLine and KrMaskChoice
FIXED: internal editor quits without notification even if the edited file was not saved
|
|
From: <ck...@us...> - 2003-12-28 22:48:47
|
Update of /cvsroot/krusader/krusader_kde3/krusader/Panel
In directory sc8-pr-cvs1:/tmp/cvs-serv23824/krusader_kde3/krusader/Panel
Modified Files:
listpanel.cpp
Log Message:
FIXED: no parent directory for tar://... and zip://... URL-s
Index: listpanel.cpp
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/krusader/Panel/listpanel.cpp,v
retrieving revision 1.46
retrieving revision 1.47
diff -C2 -d -r1.46 -r1.47
*** listpanel.cpp 27 Dec 2003 16:50:16 -0000 1.46
--- listpanel.cpp 28 Dec 2003 22:48:26 -0000 1.47
***************
*** 299,303 ****
void ListPanel::slotUpdate() {
// if we are not at the root add the ".." entery
! QString origin = func->files() ->vfs_getOrigin().prettyURL();
if ( origin.right( 1 ) != "/" && !( ( func->files() ->vfs_getType() == vfs::FTP ) &&
origin.find( '/', origin.find( ":/" ) + 3 ) == -1 ) ) {
--- 299,309 ----
void ListPanel::slotUpdate() {
// if we are not at the root add the ".." entery
!
! /* remove the last slash from archives, but take care of ftp://server/ URL-s */
! QString protocol = func->files() ->vfs_getOrigin().protocol();
! int removeLastSlash = (protocol == "ftp" || protocol == "smb" || protocol == "sftp" ||
! protocol == "fish" ) ? 0 : -1;
!
! QString origin = func->files() ->vfs_getOrigin().prettyURL( removeLastSlash );
if ( origin.right( 1 ) != "/" && !( ( func->files() ->vfs_getType() == vfs::FTP ) &&
origin.find( '/', origin.find( ":/" ) + 3 ) == -1 ) ) {
|
|
From: <ck...@us...> - 2003-12-28 17:11:56
|
Update of /cvsroot/krusader/krusader_kde3/krusader/Splitter
In directory sc8-pr-cvs1:/tmp/cvs-serv26039/krusader_kde3/krusader/Splitter
Modified Files:
combiner.cpp splitter.cpp
Log Message:
FIXED: KURL::path() -> KURL::prettyURL() fix in Synchronizer and Splitter
Index: combiner.cpp
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/krusader/Splitter/combiner.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** combiner.cpp 27 Dec 2003 16:50:17 -0000 1.4
--- combiner.cpp 28 Dec 2003 17:11:47 -0000 1.5
***************
*** 76,80 ****
{
int ret = KMessageBox::questionYesNo(0, i18n("The CRC information file (%1) is missing!\n"
! "Validity checking is impossible without it. Continue combining?").arg( splURL.path() ) );
if( ret == KMessageBox::No )
--- 76,81 ----
{
int ret = KMessageBox::questionYesNo(0, i18n("The CRC information file (%1) is missing!\n"
! "Validity checking is impossible without it. Continue combining?")
! .arg( splURL.prettyURL(0,KURL::StripFileProtocol) ) );
if( ret == KMessageBox::No )
***************
*** 112,116 ****
if( job->error() )
! error = i18n("Error at reading the CRC file (%1)!").arg( splURL.path() );
else
{
--- 113,117 ----
if( job->error() )
! error = i18n("Error at reading the CRC file (%1)!").arg( splURL.prettyURL(0,KURL::StripFileProtocol) );
else
{
***************
*** 276,280 ****
{
combineAbortJobs();
! KMessageBox::error(0, i18n("Error at writing file %1!").arg( writeURL.path() ) );
emit reject();
return;
--- 277,281 ----
{
combineAbortJobs();
! KMessageBox::error(0, i18n("Error at writing file %1!").arg( writeURL.prettyURL(0,KURL::StripFileProtocol) ) );
emit reject();
return;
Index: splitter.cpp
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/krusader/Splitter/splitter.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** splitter.cpp 27 Dec 2003 16:50:17 -0000 1.3
--- splitter.cpp 28 Dec 2003 17:11:47 -0000 1.4
***************
*** 70,74 ****
setCaption( i18n("Krusader::Splitting...") );
! setLabelText( i18n("Splitting the file %1...").arg( fileName.path() ));
if( file.isDir() )
--- 70,74 ----
setCaption( i18n("Krusader::Splitting...") );
! setLabelText( i18n("Splitting the file %1...").arg( fileName.prettyURL(0,KURL::StripFileProtocol) ));
if( file.isDir() )
***************
*** 125,129 ****
{
splitAbortJobs();
! KMessageBox::error(0, i18n("Error at reading file %1!").arg( fileName.path() ) );
emit reject();
return;
--- 125,129 ----
{
splitAbortJobs();
! KMessageBox::error(0, i18n("Error at reading file %1!").arg( fileName.prettyURL(0,KURL::StripFileProtocol) ) );
emit reject();
return;
***************
*** 199,203 ****
{
splitAbortJobs();
! KMessageBox::error(0, i18n("Error at writing file %1!").arg( writeURL.path() ) );
emit reject();
return;
--- 199,203 ----
{
splitAbortJobs();
! KMessageBox::error(0, i18n("Error at writing file %1!").arg( writeURL.prettyURL(0,KURL::StripFileProtocol) ) );
emit reject();
return;
***************
*** 241,245 ****
if( job->error() ) /* any error occurred? */
{
! KMessageBox::error(0, i18n("Error at writing file %1!").arg( writeURL.path() ) );
emit reject();
return;
--- 241,245 ----
if( job->error() ) /* any error occurred? */
{
! KMessageBox::error(0, i18n("Error at writing file %1!").arg( writeURL.prettyURL(0,KURL::StripFileProtocol) ) );
emit reject();
return;
|
|
From: <ck...@us...> - 2003-12-28 17:11:56
|
Update of /cvsroot/krusader/krusader_kde3/krusader/Synchronizer
In directory sc8-pr-cvs1:/tmp/cvs-serv26039/krusader_kde3/krusader/Synchronizer
Modified Files:
synchronizer.cpp synchronizergui.cpp
Log Message:
FIXED: KURL::path() -> KURL::prettyURL() fix in Synchronizer and Splitter
Index: synchronizer.cpp
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/krusader/Synchronizer/synchronizer.cpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** synchronizer.cpp 27 Dec 2003 16:50:17 -0000 1.9
--- synchronizer.cpp 28 Dec 2003 17:11:48 -0000 1.10
***************
*** 751,756 ****
if ( currentTask->task() == TT_COPY_TO_LEFT )
{
! result = Observer::self()->open_RenameDlg ( job, i18n("File Already Exists"), rightURL.path(),
! leftURL.path(), (KIO::RenameDlg_Mode)( KIO::M_OVERWRITE | KIO::M_SKIP | KIO::M_MULTI ), newDest,
currentTask->rightSize(), currentTask->leftSize(), (time_t)-1, (time_t)-1,
currentTask->rightDate(), currentTask->leftDate());
--- 751,757 ----
if ( currentTask->task() == TT_COPY_TO_LEFT )
{
! result = Observer::self()->open_RenameDlg ( job, i18n("File Already Exists"),
! rightURL.prettyURL(0,KURL::StripFileProtocol), leftURL.prettyURL(0,KURL::StripFileProtocol),
! (KIO::RenameDlg_Mode)( KIO::M_OVERWRITE | KIO::M_SKIP | KIO::M_MULTI ), newDest,
currentTask->rightSize(), currentTask->leftSize(), (time_t)-1, (time_t)-1,
currentTask->rightDate(), currentTask->leftDate());
***************
*** 758,763 ****
else
{
! result = Observer::self()->open_RenameDlg ( job, i18n("File Already Exists"), leftURL.path(),
! rightURL.path(), (KIO::RenameDlg_Mode)( KIO::M_OVERWRITE | KIO::M_SKIP | KIO::M_MULTI ), newDest,
currentTask->leftSize(), currentTask->rightSize(), (time_t)-1, (time_t)-1,
currentTask->leftDate(), currentTask->rightDate());
--- 759,765 ----
else
{
! result = Observer::self()->open_RenameDlg ( job, i18n("File Already Exists"),
! leftURL.prettyURL(0,KURL::StripFileProtocol), rightURL.prettyURL(0,KURL::StripFileProtocol),
! (KIO::RenameDlg_Mode)( KIO::M_OVERWRITE | KIO::M_SKIP | KIO::M_MULTI ), newDest,
currentTask->leftSize(), currentTask->rightSize(), (time_t)-1, (time_t)-1,
currentTask->leftDate(), currentTask->rightDate());
***************
*** 797,807 ****
{
case TT_COPY_TO_LEFT:
! error = i18n("Error at copying file %1 to %2!").arg( rightURL.path() ).arg( leftURL.path() );
break;
case TT_COPY_TO_RIGHT:
! error = i18n("Error at copying file %1 to %2!").arg( leftURL.path() ).arg( rightURL.path() );
break;
case TT_DELETE:
! error = i18n("Error at deleting file %1!").arg( leftURL.url() );
break;
default:
--- 799,813 ----
{
case TT_COPY_TO_LEFT:
! error = i18n("Error at copying file %1 to %2!")
! .arg( rightURL.prettyURL(0,KURL::StripFileProtocol) )
! .arg( leftURL .prettyURL(0,KURL::StripFileProtocol) );
break;
case TT_COPY_TO_RIGHT:
! error = i18n("Error at copying file %1 to %2!")
! .arg( leftURL.prettyURL(0,KURL::StripFileProtocol) )
! .arg( rightURL .prettyURL(0,KURL::StripFileProtocol) );
break;
case TT_DELETE:
! error = i18n("Error at deleting file %1!").arg( leftURL.prettyURL(0,KURL::StripFileProtocol) );
break;
default:
***************
*** 1007,1011 ****
errorPrinted = true;
KMessageBox::error(0, i18n("IO error at comparing file %1 with %2!")
! .arg( leftURL.path() ).arg( rightURL.path() ) );
abortContentComparing();
}
--- 1013,1018 ----
errorPrinted = true;
KMessageBox::error(0, i18n("IO error at comparing file %1 with %2!")
! .arg( leftURL. prettyURL(0,KURL::StripFileProtocol) )
! .arg( rightURL.prettyURL(0,KURL::StripFileProtocol) ) );
abortContentComparing();
}
Index: synchronizergui.cpp
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/krusader/Synchronizer/synchronizergui.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** synchronizergui.cpp 27 Dec 2003 16:50:17 -0000 1.8
--- synchronizergui.cpp 28 Dec 2003 17:11:48 -0000 1.9
***************
*** 1403,1407 ****
if (!url1.isLocalFile()) {
if( !KIO::NetAccess::download( url1, tmp1 ) ){
! KMessageBox::sorry(krApp,i18n("Krusader is unable to download: ")+url1.path());
return;
}
--- 1403,1407 ----
if (!url1.isLocalFile()) {
if( !KIO::NetAccess::download( url1, tmp1 ) ){
! KMessageBox::sorry(krApp,i18n("Krusader is unable to download: ")+url1.prettyURL(0,KURL::StripFileProtocol));
return;
}
***************
*** 1409,1413 ****
if (!url2.isLocalFile()) {
if( !KIO::NetAccess::download( url2, tmp2 ) ){
! KMessageBox::sorry(krApp,i18n("Krusader is unable to download: ")+url2.path());
return;
}
--- 1409,1413 ----
if (!url2.isLocalFile()) {
if( !KIO::NetAccess::download( url2, tmp2 ) ){
! KMessageBox::sorry(krApp,i18n("Krusader is unable to download: ")+url2.prettyURL(0,KURL::StripFileProtocol));
return;
}
|
7 messages has been excluded from this view by a project administrator.
