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: <ma...@us...> - 2003-08-16 13:17:34
|
Update of /cvsroot/krusader/krusader_kde3/krusader/Dialogs In directory sc8-pr-cvs1:/tmp/cvs-serv27586/krusader/Dialogs Modified Files: krspecialwidgets.h Log Message: added: infrastructure for quicksearch Index: krspecialwidgets.h =================================================================== RCS file: /cvsroot/krusader/krusader_kde3/krusader/Dialogs/krspecialwidgets.h,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** krspecialwidgets.h 15 Apr 2002 18:48:13 -0000 1.1.1.1 --- krspecialwidgets.h 16 Aug 2003 13:17:23 -0000 1.2 *************** *** 1,31 **** /*************************************************************************** ! krspecialwidgets.h ! ------------------- ! copyright : (C) 2000 by Shie Erlich & Rafi Yanai ! e-mail : kru...@us... ! web site : http://krusader.sourceforge.net ! --------------------------------------------------------------------------- ! Description ! *************************************************************************** ! A ! db dD d8888b. db db .d8888. .d8b. d8888b. d88888b d8888b. ! 88 ,8P' 88 `8D 88 88 88' YP d8' `8b 88 `8D 88' 88 `8D ! 88,8P 88oobY' 88 88 `8bo. 88ooo88 88 88 88ooooo 88oobY' ! 88`8b 88`8b 88 88 `Y8b. 88~~~88 88 88 88~~~~~ 88`8b ! 88 `88. 88 `88. 88b d88 db 8D 88 88 88 .8D 88. 88 `88. ! YP YD 88 YD ~Y8888P' `8888Y' YP YP Y8888D' Y88888P 88 YD ! H e a d e r F i l e ! *************************************************************************** ! * * ! * This program is free software; you can redistribute it and/or modify * ! * it under the terms of the GNU General Public License as published by * ! * the Free Software Foundation; either version 2 of the License, or * ! * (at your option) any later version. * ! * * ! ***************************************************************************/ --- 1,31 ---- /*************************************************************************** ! krspecialwidgets.h ! ------------------- ! copyright : (C) 2000 by Shie Erlich & Rafi Yanai ! e-mail : kru...@us... ! web site : http://krusader.sourceforge.net ! --------------------------------------------------------------------------- ! Description ! *************************************************************************** ! A ! db dD d8888b. db db .d8888. .d8b. d8888b. d88888b d8888b. ! 88 ,8P' 88 `8D 88 88 88' YP d8' `8b 88 `8D 88' 88 `8D ! 88,8P 88oobY' 88 88 `8bo. 88ooo88 88 88 88ooooo 88oobY' ! 88`8b 88`8b 88 88 `Y8b. 88~~~88 88 88 88~~~~~ 88`8b ! 88 `88. 88 `88. 88b d88 db 8D 88 88 88 .8D 88. 88 `88. ! YP YD 88 YD ~Y8888P' `8888Y' YP YP Y8888D' Y88888P 88 YD ! H e a d e r F i l e ! *************************************************************************** ! * * ! * This program is free software; you can redistribute it and/or modify * ! * it under the terms of the GNU General Public License as published by * ! * the Free Software Foundation; either version 2 of the License, or * ! * (at your option) any later version. * ! * * ! ***************************************************************************/ *************** *** 37,99 **** #include <qcolor.h> #include <qlist.h> class KRPieSlice; ! class KRPie : public QWidget { ! Q_OBJECT ! public: ! KRPie(long _totalSize, QWidget *parent=0); ! void addSlice(long size,QString label); ! ! protected: ! void paintEvent(QPaintEvent *); ! ! private: ! QList<KRPieSlice> slices; ! long totalSize,sizeLeft; ! static QColor colors[12]; }; class KRFSDisplay : public QWidget { ! Q_OBJECT ! public: ! // this constructor is used for a mounted filesystem ! KRFSDisplay(QWidget *parent, QString _alias, QString _realName, ! long _total, long _free); ! // this one is for an unmounted/supermount file system ! KRFSDisplay(QWidget *parent, QString _alias, QString _realName, bool sm=false); ! // the last one is used inside MountMan(R), when no filesystem is selected ! KRFSDisplay(QWidget *parent); ! inline void setTotalSpace(long t) { totalSpace=t; } ! inline void setFreeSpace(long t) { freeSpace=t; } ! inline void setAlias(QString a) { alias=a; } ! inline void setRealName(QString r) { realName=r; } ! inline void setMounted(bool m) { mounted=m; } ! inline void setEmpty(bool e) { empty=e; } ! inline void setSupermount(bool s) { supermount=s; } ! ! protected: ! void paintEvent(QPaintEvent *); ! private: ! long totalSpace,freeSpace; ! QString alias,realName; ! bool mounted,empty,supermount; }; class KRPieSlice { ! public: ! KRPieSlice(float _perct, QColor _color, QString _label) : ! perct(_perct), color(_color), label(_label) {} ! inline QColor getColor() { return color; } ! inline float getPerct() { return perct; } ! inline QString getLabel() { return label; } ! inline void setPerct(float _perct) { perct=_perct; } ! inline void setLabel(QString _label) { label=_label; } ! ! private: ! float perct; ! QColor color; ! QString label; }; --- 37,112 ---- #include <qcolor.h> #include <qlist.h> + #include <klineedit.h> + #include <qevent.h> class KRPieSlice; ! class KRPie : public QWidget { ! Q_OBJECT ! public: ! KRPie( long _totalSize, QWidget *parent = 0 ); ! void addSlice( long size, QString label ); ! ! protected: ! void paintEvent( QPaintEvent * ); ! ! private: ! QList<KRPieSlice> slices; ! long totalSize, sizeLeft; ! static QColor colors[ 12 ]; }; class KRFSDisplay : public QWidget { ! Q_OBJECT ! public: ! // this constructor is used for a mounted filesystem ! KRFSDisplay( QWidget *parent, QString _alias, QString _realName, ! long _total, long _free ); ! // this one is for an unmounted/supermount file system ! KRFSDisplay( QWidget *parent, QString _alias, QString _realName, bool sm = false ); ! // the last one is used inside MountMan(R), when no filesystem is selected ! KRFSDisplay( QWidget *parent ); ! inline void setTotalSpace( long t ) { totalSpace = t; } ! inline void setFreeSpace( long t ) { freeSpace = t; } ! inline void setAlias( QString a ) { alias = a; } ! inline void setRealName( QString r ) { realName = r; } ! inline void setMounted( bool m ) { mounted = m; } ! inline void setEmpty( bool e ) { empty = e; } ! inline void setSupermount( bool s ) { supermount = s; } ! protected: ! void paintEvent( QPaintEvent * ); ! ! private: ! long totalSpace, freeSpace; ! QString alias, realName; ! bool mounted, empty, supermount; }; class KRPieSlice { ! public: ! KRPieSlice( float _perct, QColor _color, QString _label ) : ! perct( _perct ), color( _color ), label( _label ) {} ! inline QColor getColor() { return color; } ! inline float getPerct() { return perct; } ! inline QString getLabel() { return label; } ! inline void setPerct( float _perct ) { perct = _perct; } ! inline void setLabel( QString _label ) { label = _label; } ! ! private: ! float perct; ! QColor color; ! QString label; ! }; ! ! class KrQuickSearch: public KLineEdit { ! Q_OBJECT ! public: ! KrQuickSearch(QWidget *parent, const char * name = 0); ! void addText(const QString &str) { setText(text()+str); } ! void myKeyPressEvent(QKeyEvent *e); ! ! signals: ! void stop(QKeyEvent *e); }; |
From: <ma...@us...> - 2003-08-16 13:16:54
|
Update of /cvsroot/krusader/krusader_kde3/krusader/Panel In directory sc8-pr-cvs1:/tmp/cvs-serv27497/krusader/Panel Modified Files: listpanel.h Log Message: added: infrastructure for quicksearch Index: listpanel.h =================================================================== RCS file: /cvsroot/krusader/krusader_kde3/krusader/Panel/listpanel.h,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** listpanel.h 2 Aug 2003 21:04:39 -0000 1.7 --- listpanel.h 16 Aug 2003 13:16:51 -0000 1.8 *************** *** 63,66 **** --- 63,67 ---- class KURLRequester; class BookmarksButton; + class KrQuickSearch; class ListPanel : public QWidget { *************** *** 122,125 **** --- 123,127 ---- QGuardedPtr<QObject> statsAgent; KrSqueezedTextLabel *status,*totals; + KrQuickSearch *quickSearch; KURLRequester *origin; QGridLayout *layout; |
From: <ma...@us...> - 2003-08-16 13:16:40
|
Update of /cvsroot/krusader/krusader_kde3/krusader/Panel In directory sc8-pr-cvs1:/tmp/cvs-serv27477/krusader/Panel Modified Files: listpanel.cpp Log Message: added: infrastructure for quicksearch Index: listpanel.cpp =================================================================== RCS file: /cvsroot/krusader/krusader_kde3/krusader/Panel/listpanel.cpp,v retrieving revision 1.25 retrieving revision 1.26 diff -C2 -d -r1.25 -r1.26 *** listpanel.cpp 15 Aug 2003 23:00:25 -0000 1.25 --- listpanel.cpp 16 Aug 2003 13:16:35 -0000 1.26 *************** *** 1,31 **** /*************************************************************************** ! listpanel.cpp ! ------------------- ! copyright : (C) 2000 by Shie Erlich & Rafi Yanai ! e-mail : kru...@us... ! web site : http://krusader.sourceforge.net ! --------------------------------------------------------------------------- ! Description ! *************************************************************************** ! [...1241 lines suppressed...] ! return ; } else e->ignore(); case Key_Down : ! if ( e->state() == ControlButton ) { // give the keyboard focus to the command line if ( krApp->mainView->cmdLine->isVisible() ) krApp->mainView->cmdLineFocus(); *************** *** 705,709 **** // if we got this, it means that the view is not doing // the quick search thing, so send the characters to the commandline ! krApp->mainView->cmdLine->addText(e->text()); //e->ignore(); } --- 656,660 ---- // if we got this, it means that the view is not doing // the quick search thing, so send the characters to the commandline ! krApp->mainView->cmdLine->addText( e->text() ); //e->ignore(); } |
From: <ma...@us...> - 2003-08-16 13:16:21
|
Update of /cvsroot/krusader/krusader_kde3/krusader/Panel In directory sc8-pr-cvs1:/tmp/cvs-serv27441/krusader/Panel Modified Files: krdetailedview.cpp Log Message: added: infrastructure for quicksearch Index: krdetailedview.cpp =================================================================== RCS file: /cvsroot/krusader/krusader_kde3/krusader/Panel/krdetailedview.cpp,v retrieving revision 1.24 retrieving revision 1.25 diff -C2 -d -r1.24 -r1.25 *** krdetailedview.cpp 15 Aug 2003 23:00:42 -0000 1.24 --- krdetailedview.cpp 16 Aug 2003 13:16:18 -0000 1.25 *************** *** 1,23 **** /*************************************************************************** ! krdetailedview.cpp ! ------------------- ! copyright : (C) 2000-2002 by Shie Erlich & Rafi Yanai ! e-mail : kru...@us... ! web site : http://krusader.sourceforge.net --------------------------------------------------------------------------- ! Description *************************************************************************** ! ! A ! ! db dD d8888b. db db .d8888. .d8b. d8888b. d88888b d8888b. ! 88 ,8P' 88 `8D 88 88 88' YP d8' `8b 88 `8D 88' 88 `8D ! 88,8P 88oobY' 88 88 `8bo. 88ooo88 88 88 88ooooo 88oobY' ! 88`8b 88`8b 88 88 `Y8b. 88~~~88 88 88 88~~~~~ 88`8b ! 88 `88. 88 `88. 88b d88 db 8D 88 88 88 .8D 88. 88 `88. ! YP YD 88 YD ~Y8888P' `8888Y' YP YP Y8888D' Y88888P 88 YD ! ! S o u r c e F i l e ! *************************************************************************** * * --- 1,23 ---- /*************************************************************************** ! krdetailedview.cpp ! ------------------- ! copyright : (C) 2000-2002 by Shie Erlich & Rafi Yanai ! e-mail : kru...@us... ! web site : http://krusader.sourceforge.net --------------------------------------------------------------------------- ! Description *************************************************************************** ! ! A ! ! db dD d8888b. db db .d8888. .d8b. d8888b. d88888b d8888b. ! 88 ,8P' 88 `8D 88 88 88' YP d8' `8b 88 `8D 88' 88 `8D ! 88,8P 88oobY' 88 88 `8bo. 88ooo88 88 88 88ooooo 88oobY' ! 88`8b 88`8b 88 88 `Y8b. 88~~~88 88 88 88~~~~~ 88`8b ! 88 `88. 88 `88. 88b d88 db 8D 88 88 88 .8D 88. 88 `88. ! YP YD 88 YD ~Y8888P' `8888Y' YP YP Y8888D' Y88888P 88 YD ! ! S o u r c e F i l e ! *************************************************************************** * * *************** *** 36,39 **** --- 36,40 ---- #include "../VFS/krpermhandler.h" #include "../GUI/kcmdline.h" + #include "../Dialogs/krspecialwidgets.h" #include "listpanel.h" #include "panelfunc.h" *************** *** 53,71 **** // // Ext Column ! #define _ExtColumn true // Mime Column ! #define _MimeColumn false // Size Column ! #define _SizeColumn true // DateTime Column ! #define _DateTimeColumn true // Perm Column #define _PermColumn false // KrPerm Column ! #define _KrPermColumn true // Owner Column ! #define _OwnerColumn false // Group Column ! #define _GroupColumn false // Do Quicksearch #define _DoQuicksearch true --- 54,72 ---- // // Ext Column ! #define _ExtColumn true // Mime Column ! #define _MimeColumn false // Size Column ! #define _SizeColumn true // DateTime Column ! #define _DateTimeColumn true // Perm Column #define _PermColumn false // KrPerm Column ! #define _KrPermColumn true // Owner Column ! #define _OwnerColumn false // Group Column ! #define _GroupColumn false // Do Quicksearch #define _DoQuicksearch true *************** *** 75,85 **** QString KrDetailedView::ColumnName[] = { i18n( "Name" ), i18n( "Ext" ), i18n( "Type" ), ! i18n( "Size" ), i18n( "Modified" ), i18n( "Perms" ), i18n( "rwx" ), ! i18n( "Owner" ), i18n( "Group" ) }; KrDetailedView::KrDetailedView( QWidget *parent, bool left, KConfig *cfg, const char *name ) : KListView( parent, name ), KrView( cfg ), _focused( false ), _currDragItem( 0L ), ! _nameInKConfig(QString("KrDetailedView")+QString((left?"Left":"Right"))), _left(left) ! { KConfigGroupSaver grpSvr( _config, nameInKConfig() ); // setup the default sort and filter --- 76,85 ---- QString KrDetailedView::ColumnName[] = { i18n( "Name" ), i18n( "Ext" ), i18n( "Type" ), ! i18n( "Size" ), i18n( "Modified" ), i18n( "Perms" ), i18n( "rwx" ), ! i18n( "Owner" ), i18n( "Group" ) }; KrDetailedView::KrDetailedView( QWidget *parent, bool left, KConfig *cfg, const char *name ) : KListView( parent, name ), KrView( cfg ), _focused( false ), _currDragItem( 0L ), ! _nameInKConfig( QString( "KrDetailedView" ) + QString( ( left ? "Left" : "Right" ) ) ), _left( left ) { KConfigGroupSaver grpSvr( _config, nameInKConfig() ); // setup the default sort and filter *************** *** 104,108 **** connect( this, SIGNAL( onItem( QListViewItem* ) ), this, SLOT( slotItemDescription( QListViewItem* ) ) ); connect( this, SIGNAL( contextMenuRequested( QListViewItem*, const QPoint&, int ) ), ! this, SLOT( handleContextMenu( QListViewItem*, const QPoint&, int ) ) ); } --- 104,108 ---- connect( this, SIGNAL( onItem( QListViewItem* ) ), this, SLOT( slotItemDescription( QListViewItem* ) ) ); connect( this, SIGNAL( contextMenuRequested( QListViewItem*, const QPoint&, int ) ), ! this, SLOT( handleContextMenu( QListViewItem*, const QPoint&, int ) ) ); } *************** *** 113,130 **** newColumn( Name ); // we always have a name setColumnWidthMode( column( Name ), QListView::Manual ); ! if ( _config->readBoolEntry( "Ext Column", _ExtColumn ) ) ! { newColumn( Extention ); setColumnWidthMode( column( Extention ), QListView::Manual ); setColumnWidth( column( Extention ), QFontMetrics( font() ).width( "tar.bz2" ) ); } ! if ( _config->readBoolEntry( "Mime Column", _MimeColumn ) ) ! { newColumn( Mime ); setColumnWidthMode( column( Mime ), QListView::Manual ); setColumnWidth( column( Mime ), QFontMetrics( font() ).width( 'X' ) * 6 ); } ! if ( _config->readBoolEntry( "Size Column", _SizeColumn ) ) ! { newColumn( Size ); setColumnWidthMode( column( Size ), QListView::Manual ); --- 113,127 ---- newColumn( Name ); // we always have a name setColumnWidthMode( column( Name ), QListView::Manual ); ! if ( _config->readBoolEntry( "Ext Column", _ExtColumn ) ) { newColumn( Extention ); setColumnWidthMode( column( Extention ), QListView::Manual ); setColumnWidth( column( Extention ), QFontMetrics( font() ).width( "tar.bz2" ) ); } ! if ( _config->readBoolEntry( "Mime Column", _MimeColumn ) ) { newColumn( Mime ); setColumnWidthMode( column( Mime ), QListView::Manual ); setColumnWidth( column( Mime ), QFontMetrics( font() ).width( 'X' ) * 6 ); } ! if ( _config->readBoolEntry( "Size Column", _SizeColumn ) ) { newColumn( Size ); setColumnWidthMode( column( Size ), QListView::Manual ); *************** *** 132,163 **** setColumnAlignment( column( Size ), Qt::AlignRight ); // right-align numbers } ! if ( _config->readBoolEntry( "DateTime Column", _DateTimeColumn ) ) ! { newColumn( DateTime ); setColumnWidthMode( column( DateTime ), QListView::Manual ); //setColumnWidth( column( DateTime ), QFontMetrics( font() ).width( "99/99/99 99:99" ) ); ! setColumnWidth( column( DateTime ), QFontMetrics( font() ).width( KGlobal::locale()->formatDateTime( ! QDateTime (QDate(2099, 12, 29), QTime(23, 59))) ) + 3 ); } ! if ( _config->readBoolEntry( "Perm Column", _PermColumn ) ) ! { newColumn( Permissions ); setColumnWidthMode( column( Permissions ), QListView::Manual ); setColumnWidth( column( Permissions ), QFontMetrics( font() ).width( "drwxrwxrwx" ) ); } ! if ( _config->readBoolEntry( "KrPerm Column", _KrPermColumn ) ) ! { newColumn( KrPermissions ); setColumnWidthMode( column( KrPermissions ), QListView::Manual ); setColumnWidth( column( KrPermissions ), QFontMetrics( font() ).width( "RWX" ) ); } ! if ( _config->readBoolEntry( "Owner Column", _OwnerColumn ) ) ! { newColumn( Owner ); setColumnWidthMode( column( Owner ), QListView::Manual ); setColumnWidth( column( Owner ), QFontMetrics( font() ).width( 'X' ) * 6 ); } ! if ( _config->readBoolEntry( "Group Column", _GroupColumn ) ) ! { newColumn( Group ); setColumnWidthMode( column( Group ), QListView::Manual ); --- 129,155 ---- setColumnAlignment( column( Size ), Qt::AlignRight ); // right-align numbers } ! if ( _config->readBoolEntry( "DateTime Column", _DateTimeColumn ) ) { newColumn( DateTime ); setColumnWidthMode( column( DateTime ), QListView::Manual ); //setColumnWidth( column( DateTime ), QFontMetrics( font() ).width( "99/99/99 99:99" ) ); ! setColumnWidth( column( DateTime ), QFontMetrics( font() ).width( KGlobal::locale() ->formatDateTime( ! QDateTime ( QDate( 2099, 12, 29 ), QTime( 23, 59 ) ) ) ) + 3 ); } ! if ( _config->readBoolEntry( "Perm Column", _PermColumn ) ) { newColumn( Permissions ); setColumnWidthMode( column( Permissions ), QListView::Manual ); setColumnWidth( column( Permissions ), QFontMetrics( font() ).width( "drwxrwxrwx" ) ); } ! if ( _config->readBoolEntry( "KrPerm Column", _KrPermColumn ) ) { newColumn( KrPermissions ); setColumnWidthMode( column( KrPermissions ), QListView::Manual ); setColumnWidth( column( KrPermissions ), QFontMetrics( font() ).width( "RWX" ) ); } ! if ( _config->readBoolEntry( "Owner Column", _OwnerColumn ) ) { newColumn( Owner ); setColumnWidthMode( column( Owner ), QListView::Manual ); setColumnWidth( column( Owner ), QFontMetrics( font() ).width( 'X' ) * 6 ); } ! if ( _config->readBoolEntry( "Group Column", _GroupColumn ) ) { newColumn( Group ); setColumnWidthMode( column( Group ), QListView::Manual ); *************** *** 175,194 **** header() ->setStretchEnabled( true, column( Name ) ); // allow in-place renaming ! setItemsRenameable(true); ! setRenameable(column(Name), true); ! connect(renameLineEdit(), SIGNAL(done(QListViewItem *, int)), ! this, SLOT(inplaceRenameFinished(QListViewItem*, int))); ! connect(this, SIGNAL(renameItem(const QString &, const QString &)), ! dynamic_cast<ListPanel*>(parent)->func, SLOT(rename(const QString &, const QString &))); restoreSettings(); } ! KrDetailedView::~KrDetailedView() ! { //saveSettings(); } ! void KrDetailedView::newColumn( ColumnType type ) ! { int i; for ( i = 0; i < MAX_COLUMNS; i++ ) --- 167,192 ---- header() ->setStretchEnabled( true, column( Name ) ); // allow in-place renaming ! setItemsRenameable( true ); ! setRenameable( column( Name ), true ); ! connect( renameLineEdit(), SIGNAL( done( QListViewItem *, int ) ), ! this, SLOT( inplaceRenameFinished( QListViewItem*, int ) ) ); ! connect( this, SIGNAL( renameItem( const QString &, const QString & ) ), ! dynamic_cast<ListPanel*>( parent ) ->func, SLOT( rename( const QString &, const QString & ) ) ); ! // connect quicksearch ! connect( dynamic_cast<ListPanel*>(parent)->quickSearch, SIGNAL(textChanged(const QString&)), ! this, SLOT(quickSearch(const QString&))); ! connect( dynamic_cast<ListPanel*>(parent)->quickSearch, SIGNAL(stop(QKeyEvent*)), ! this, SLOT(stopQuickSearch(QKeyEvent*))); ! ! ! setFocusPolicy(StrongFocus); restoreSettings(); } ! KrDetailedView::~KrDetailedView() { //saveSettings(); } ! void KrDetailedView::newColumn( ColumnType type ) { int i; for ( i = 0; i < MAX_COLUMNS; i++ ) *************** *** 206,211 **** * if such values are not presented in the view, -1 is returned. */ ! int KrDetailedView::column( ColumnType type ) ! { for ( int i = 0; i < MAX_COLUMNS; i++ ) if ( _columns[ i ] == type ) --- 204,208 ---- * if such values are not presented in the view, -1 is returned. */ ! int KrDetailedView::column( ColumnType type ) { for ( int i = 0; i < MAX_COLUMNS; i++ ) if ( _columns[ i ] == type ) *************** *** 214,219 **** } ! void KrDetailedView::addItems( vfs *v, bool addUpDir ) ! { QListViewItem * item = firstChild(); QListViewItem *currentItem = item; --- 211,215 ---- } ! void KrDetailedView::addItems( vfs *v, bool addUpDir ) { QListViewItem * item = firstChild(); QListViewItem *currentItem = item; *************** *** 221,226 **** // add the up-dir arrow if needed ! if ( addUpDir ) ! { KListViewItem * item = new KrDetailedViewItem( this, ( QListViewItem* ) 0L, ( vfile* ) 0L ); item->setText( column( Name ), ".." ); --- 217,221 ---- // add the up-dir arrow if needed ! if ( addUpDir ) { KListViewItem * item = new KrDetailedViewItem( this, ( QListViewItem* ) 0L, ( vfile* ) 0L ); item->setText( column( Name ), ".." ); *************** *** 240,245 **** setSorting( -1 ); // disable sorting ! for ( vfile * vf = v->vfs_getFirstFile(); vf != 0 ; vf = v->vfs_getNextFile() ) ! { size = KRpermHandler::parseSize( vf->vfile_getSize() ); name = vf->vfile_getName(); --- 235,239 ---- setSorting( -1 ); // disable sorting ! for ( vfile * vf = v->vfs_getFirstFile(); vf != 0 ; vf = v->vfs_getNextFile() ) { size = KRpermHandler::parseSize( vf->vfile_getSize() ); name = vf->vfile_getName(); *************** *** 260,267 **** }*/ ! if ( !isDir || ( isDir && ( _filter & ApplyToDirs ) ) ) ! { ! switch ( _filter ) ! { case KrView::All : break; --- 254,259 ---- }*/ ! if ( !isDir || ( isDir && ( _filter & ApplyToDirs ) ) ) { ! switch ( _filter ) { case KrView::All : break; *************** *** 318,323 **** } ! QString KrDetailedView::getCurrentItem() const ! { QListViewItem * it = currentItem(); if ( !it ) --- 310,314 ---- } ! QString KrDetailedView::getCurrentItem() const { QListViewItem * it = currentItem(); if ( !it ) *************** *** 327,336 **** } ! void KrDetailedView::setCurrentItem( const QString& name ) ! { for ( QListViewItem * it = firstChild(); it != 0; it = it->itemBelow() ) if ( dynamic_cast<KrViewItem*>( it ) -> ! name() == name ) ! { KListView::setCurrentItem( it ); break; --- 318,325 ---- } ! void KrDetailedView::setCurrentItem( const QString& name ) { for ( QListViewItem * it = firstChild(); it != 0; it = it->itemBelow() ) if ( dynamic_cast<KrViewItem*>( it ) -> ! name() == name ) { KListView::setCurrentItem( it ); break; *************** *** 338,349 **** } ! void KrDetailedView::clear() ! { KListView::clear(); _count = _numSelected = _numDirs = _selectedSize = _countSize = 0; } ! void KrDetailedView::setSortMode( SortSpec mode ) ! { _sortMode = mode; // the KrViewItems will check it by themselves bool ascending = !( mode & KrView::Descending ); --- 327,336 ---- } ! void KrDetailedView::clear() { KListView::clear(); _count = _numSelected = _numDirs = _selectedSize = _countSize = 0; } ! void KrDetailedView::setSortMode( SortSpec mode ) { _sortMode = mode; // the KrViewItems will check it by themselves bool ascending = !( mode & KrView::Descending ); *************** *** 376,384 **** } ! void KrDetailedView::slotClicked( QListViewItem *item ) ! { KConfigGroupSaver grpSvr( _config, nameInKConfig() ); ! if ( _config->readBoolEntry( "Single Click Selects", _SingleClickSelects ) ) ! { if ( !item ) return ; --- 363,369 ---- } ! void KrDetailedView::slotClicked( QListViewItem *item ) { KConfigGroupSaver grpSvr( _config, nameInKConfig() ); ! if ( _config->readBoolEntry( "Single Click Selects", _SingleClickSelects ) ) { if ( !item ) return ; *************** *** 388,396 **** } ! void KrDetailedView::slotDoubleClicked( QListViewItem *item ) ! { KConfigGroupSaver grpSvr( _config, nameInKConfig() ); ! if ( !_config->readBoolEntry( "Single Click Selects", _SingleClickSelects ) ) ! { if ( !item ) return ; --- 373,379 ---- } ! void KrDetailedView::slotDoubleClicked( QListViewItem *item ) { KConfigGroupSaver grpSvr( _config, nameInKConfig() ); ! if ( !_config->readBoolEntry( "Single Click Selects", _SingleClickSelects ) ) { if ( !item ) return ; *************** *** 400,416 **** } ! void KrDetailedView::prepareForActive() ! { setFocus(); _focused = true; } ! void KrDetailedView::prepareForPassive() ! { _focused = false; } ! void KrDetailedView::slotItemDescription( QListViewItem *item ) ! { KrViewItem * it = dynamic_cast<KrViewItem*>( item ); if ( !it ) --- 383,396 ---- } ! void KrDetailedView::prepareForActive() { setFocus(); _focused = true; } ! void KrDetailedView::prepareForPassive() { _focused = false; } ! void KrDetailedView::slotItemDescription( QListViewItem *item ) { KrViewItem * it = dynamic_cast<KrViewItem*>( item ); if ( !it ) *************** *** 420,425 **** } ! void KrDetailedView::slotCurrentChanged( QListViewItem *item ) ! { if ( !item ) return ; --- 400,404 ---- } ! void KrDetailedView::slotCurrentChanged( QListViewItem *item ) { if ( !item ) return ; *************** *** 427,432 **** } ! void KrDetailedView::contentsMousePressEvent( QMouseEvent *e ) ! { if ( !_focused ) emit needFocus(); --- 406,410 ---- } ! void KrDetailedView::contentsMousePressEvent( QMouseEvent *e ) { if ( !_focused ) emit needFocus(); *************** *** 434,439 **** } ! void KrDetailedView::contentsWheelEvent( QWheelEvent *e ) ! { if ( !_focused ) emit needFocus(); --- 412,416 ---- } ! void KrDetailedView::contentsWheelEvent( QWheelEvent *e ) { if ( !_focused ) emit needFocus(); *************** *** 441,446 **** } ! void KrDetailedView::handleContextMenu( QListViewItem* it, const QPoint& pos, int ) ! { if ( !_focused ) emit needFocus(); --- 418,422 ---- } ! void KrDetailedView::handleContextMenu( QListViewItem* it, const QPoint& pos, int ) { if ( !_focused ) emit needFocus(); *************** *** 453,458 **** } ! void KrDetailedView::startDrag() ! { QStringList items; getSelectedItems( &items ); --- 429,433 ---- } ! void KrDetailedView::startDrag() { QStringList items; getSelectedItems( &items ); *************** *** 467,482 **** } ! KrViewItem *KrDetailedView::getKrViewItemAt( const QPoint &vp ) ! { return dynamic_cast<KrViewItem*>( KListView::itemAt( vp ) ); } ! bool KrDetailedView::acceptDrag( QDropEvent* ) const ! { return true; } ! void KrDetailedView::contentsDropEvent( QDropEvent *e ) ! { /* if (_currDragItem) dynamic_cast<KListViewItem*>(_currDragItem)->setPixmap(column(Name), FL_LOADICON("folder"));*/ --- 442,454 ---- } ! KrViewItem *KrDetailedView::getKrViewItemAt( const QPoint &vp ) { return dynamic_cast<KrViewItem*>( KListView::itemAt( vp ) ); } ! bool KrDetailedView::acceptDrag( QDropEvent* ) const { return true; } ! void KrDetailedView::contentsDropEvent( QDropEvent *e ) { /* if (_currDragItem) dynamic_cast<KListViewItem*>(_currDragItem)->setPixmap(column(Name), FL_LOADICON("folder"));*/ *************** *** 486,491 **** } ! void KrDetailedView::contentsDragMoveEvent( QDragMoveEvent *e ) ! { /* KrViewItem *i=getKrViewItemAt(contentsToViewport(e->pos())); // reset the last used icon --- 458,462 ---- } ! void KrDetailedView::contentsDragMoveEvent( QDragMoveEvent *e ) { /* KrViewItem *i=getKrViewItemAt(contentsToViewport(e->pos())); // reset the last used icon *************** *** 513,527 **** } ! void KrDetailedView::keyPressEvent( QKeyEvent *e ) ! { KConfigGroupSaver grpSvr( _config, nameInKConfig() ); if ( !e || !firstChild() ) return ; // subclass bug ! switch ( e->key() ) ! { case Key_Enter : ! case Key_Return : ! { KrViewItem * i = getCurrentKrViewItem(); QString tmp = i->name(); --- 484,495 ---- } ! void KrDetailedView::keyPressEvent( QKeyEvent *e ) { KConfigGroupSaver grpSvr( _config, nameInKConfig() ); if ( !e || !firstChild() ) return ; // subclass bug ! switch ( e->key() ) { case Key_Enter : ! case Key_Return : { KrViewItem * i = getCurrentKrViewItem(); QString tmp = i->name(); *************** *** 530,547 **** } case Key_Right : ! if (e->state() == ControlButton) ! { // let the panel handle it e->ignore(); break; ! } ! else ! { // just a normal click - do a lynx-like moving thing KrViewItem *i = getCurrentKrViewItem(); ! if ( i->name() == ".." ) ! { // if clicking on the ".." entry SLOTS->dirUp(); // ask krusader to move up a directory return ; } ! if ( i->isDir() ) ! { // we create a return-pressed event, QString tmp = i->name(); emit executed( tmp ); // thereby emulating a chdir --- 498,510 ---- } case Key_Right : ! if ( e->state() == ControlButton ) { // let the panel handle it e->ignore(); break; ! } else { // just a normal click - do a lynx-like moving thing KrViewItem *i = getCurrentKrViewItem(); ! if ( i->name() == ".." ) { // if clicking on the ".." entry SLOTS->dirUp(); // ask krusader to move up a directory return ; } ! if ( i->isDir() ) { // we create a return-pressed event, QString tmp = i->name(); emit executed( tmp ); // thereby emulating a chdir *************** *** 550,603 **** } case Key_Left : ! if (e->state() == ControlButton) ! { // let the panel handle it e->ignore(); break; ! } ! else ! { // a normal click - do a lynx-like moving thing SLOTS->dirUp(); // ask krusader to move up a directory return ; // safety } ! case Key_Up : ! KListView::keyPressEvent( e ); ! break; case Key_Down : ! if ( e->state() == ControlButton ) ! { // let the panel handle it e->ignore(); break; ! } ! else KListView::keyPressEvent( e ); break; ! case Key_Delete : // kill file SLOTS->deleteFiles(); return ; ! case Key_Space : ! { ! KrDetailedViewItem * viewItem = dynamic_cast<KrDetailedViewItem *> (getCurrentKrViewItem()); ! if (!viewItem || !(viewItem->isDir() && viewItem->size()<=0)) ! { ! KListView::keyPressEvent(e); ! return; // wrong type } long long totalSize = 0; long totalFiles = 0, totalDirs = 0; QStringList names; ! names.push_back(viewItem->name()); ! krApp->mainView->activePanel->func->calcSpace(names, totalSize, totalFiles, totalDirs); ! viewItem->setSize(totalSize); ! _countSize+=totalSize; viewItem->repaintItem(); ! KListView::keyPressEvent(new QKeyEvent(QKeyEvent::KeyPress, Key_Insert, 0, 0)); } break; default: ! // are we doing quicksearch? if not, send keys to panel ! if ( _config->readBoolEntry( "Do Quicksearch", _DoQuicksearch ) ) { ! // are we using krusader's classic quicksearch, or wincmd style? ! if (_config->readBoolEntry( "Classic Quicksearch", _ClassicQuicksearch)) ! KListView::keyPressEvent( e ); ! else {} ! } else e->ignore(); // send to panel return ; --- 513,581 ---- } case Key_Left : ! if ( e->state() == ControlButton ) { // let the panel handle it e->ignore(); break; ! } else { // a normal click - do a lynx-like moving thing SLOTS->dirUp(); // ask krusader to move up a directory return ; // safety } ! //case Key_Up : ! //KListView::keyPressEvent( e ); ! //break; case Key_Down : ! if ( e->state() == ControlButton ) { // let the panel handle it e->ignore(); break; ! } else KListView::keyPressEvent( e ); break; ! case Key_Delete : // kill file SLOTS->deleteFiles(); return ; ! case Key_Space : { ! KrDetailedViewItem * viewItem = dynamic_cast<KrDetailedViewItem *> ( getCurrentKrViewItem() ); ! if ( !viewItem || !( viewItem->isDir() && viewItem->size() <= 0 ) ) { ! KListView::keyPressEvent( e ); ! return ; // wrong type } long long totalSize = 0; long totalFiles = 0, totalDirs = 0; QStringList names; ! names.push_back( viewItem->name() ); ! krApp->mainView->activePanel->func->calcSpace( names, totalSize, totalFiles, totalDirs ); ! viewItem->setSize( totalSize ); ! _countSize += totalSize; viewItem->repaintItem(); ! KListView::keyPressEvent( new QKeyEvent( QKeyEvent::KeyPress, Key_Insert, 0, 0 ) ); } break; default: ! // if the key is A..Z or 1..0 do quick search otherwise... ! if ( (e->key()>=Key_A && e->key()<=Key_Z) || ! (e->key()>=Key_0 && e->key()<=Key_9) || ! (e->key() == Key_Backspace) || ! (e->key() == Key_Down) ) { ! // are we doing quicksearch? if not, send keys to panel ! if ( _config->readBoolEntry( "Do Quicksearch", _DoQuicksearch ) ) { ! // are we using krusader's classic quicksearch, or wincmd style? ! if ( _config->readBoolEntry( "Classic Quicksearch", _ClassicQuicksearch ) ) ! KListView::keyPressEvent( e ); ! else { ! // first, show the quicksearch if its hidden ! if ( krApp->mainView->activePanel->quickSearch->isHidden() ) { ! krApp->mainView->activePanel->quickSearch->show(); ! // second, we need to disable the dirup action - hack! ! krDirUp->setEnabled(false); ! } ! // now, send the key to the quicksearch ! krApp->mainView->activePanel->quickSearch->myKeyPressEvent(e); ! } ! } else e->ignore(); // send to panel ! } else { ! if (krApp->mainView->activePanel->quickSearch->isShown()) { ! krApp->mainView->activePanel->quickSearch->hide(); ! krApp->mainView->activePanel->quickSearch->clear(); ! krDirUp->setEnabled(true); ! } ! KListView::keyPressEvent(e); ! } return ; *************** *** 605,637 **** } ! void KrDetailedView::renameCurrentItem() ! { int c; QString newName, fileName; KrViewItem *it = getCurrentKrViewItem(); ! if (it) fileName = it->name(); ! else return; // quit if no current item available // determine which column is inplace renameable ! for (c=0; c<columns(); c++) ! if (isRenameable(c)) break; // one MUST be renamable ! if (!isRenameable(c)) c = -1; // failsafe ! if (c >= 0) ! { // do we have an EXT column? if so, handle differently: // copy the contents of the EXT column over to the name ! if (column(Extention) != -1) ! { ! dynamic_cast<QListViewItem*>(it)->setText(column(Name), fileName); ! dynamic_cast<QListViewItem*>(it)->setText(column(Extention), QString::null); ! repaintItem(dynamic_cast<QListViewItem*>(it)); } ! rename(dynamic_cast<QListViewItem*>(it), c); // signal will be emited when renaming is done, and finalization // will occur in inplaceRenameFinished() ! } ! else ! { // do this in case inplace renaming is disabled // good old dialog box bool ok = false; --- 583,610 ---- } ! void KrDetailedView::renameCurrentItem() { int c; QString newName, fileName; KrViewItem *it = getCurrentKrViewItem(); ! if ( it ) fileName = it->name(); ! else return ; // quit if no current item available // determine which column is inplace renameable ! for ( c = 0; c < columns(); c++ ) ! if ( isRenameable( c ) ) break; // one MUST be renamable ! if ( !isRenameable( c ) ) c = -1; // failsafe ! if ( c >= 0 ) { // do we have an EXT column? if so, handle differently: // copy the contents of the EXT column over to the name ! if ( column( Extention ) != -1 ) { ! dynamic_cast<QListViewItem*>( it ) ->setText( column( Name ), fileName ); ! dynamic_cast<QListViewItem*>( it ) ->setText( column( Extention ), QString::null ); ! repaintItem( dynamic_cast<QListViewItem*>( it ) ); } ! rename( dynamic_cast<QListViewItem*>( it ), c ); // signal will be emited when renaming is done, and finalization // will occur in inplaceRenameFinished() ! } else { // do this in case inplace renaming is disabled // good old dialog box bool ok = false; *************** *** 640,670 **** if ( !ok || newName == fileName ) return ; ! emit renameItem(it->name(), newName); } } ! void KrDetailedView::inplaceRenameFinished(QListViewItem *it, int col) ! { ! if (!it) ! { // major failure - call developers kdWarning() << "Major failure at inplaceRenameFinished(): item is null" << endl; ! exit(0); } // check if the item was indeed renamed ! if (it->text(column(Name)) != dynamic_cast<KrDetailedViewItem*>(it)->name()) // was renamed ! emit renameItem(dynamic_cast<KrDetailedViewItem*>(it)->name(), it->text(column(Name))); ! else if (column(Extention) != -1) ! { // nothing happened, restore the view (if needed) int i; ! QString ext, name = dynamic_cast<KrDetailedViewItem*>(it)->name(); ! if ((i = name.findRev('.')) > 0) ! { ! ext = name.mid(i+1); ! name = name.mid(0, i); } ! it->setText(column(Name), name); ! it->setText(column(Extention), ext); ! repaintItem(it); } setFocus(); } --- 613,660 ---- if ( !ok || newName == fileName ) return ; ! emit renameItem( it->name(), newName ); } } ! void KrDetailedView::inplaceRenameFinished( QListViewItem *it, int col ) { ! if ( !it ) { // major failure - call developers kdWarning() << "Major failure at inplaceRenameFinished(): item is null" << endl; ! exit( 0 ); } // check if the item was indeed renamed ! if ( it->text( column( Name ) ) != dynamic_cast<KrDetailedViewItem*>( it ) ->name() ) // was renamed ! emit renameItem( dynamic_cast<KrDetailedViewItem*>( it ) ->name(), it->text( column( Name ) ) ); ! else if ( column( Extention ) != -1 ) { // nothing happened, restore the view (if needed) int i; ! QString ext, name = dynamic_cast<KrDetailedViewItem*>( it ) ->name(); ! if ( ( i = name.findRev( '.' ) ) > 0 ) { ! ext = name.mid( i + 1 ); ! name = name.mid( 0, i ); } ! it->setText( column( Name ), name ); ! it->setText( column( Extention ), ext ); ! repaintItem( it ); } setFocus(); + } + + void KrDetailedView::quickSearch(const QString &str) { + QString target = str; + QListViewItem *it; + + while ( (it = findItem(target, column(Name), Qt::BeginsWith)) == 0 ) { + if (target == QString::null) break; + target = target.mid(0, target.length()-1); + } + if (it) { + setCurrentItem(dynamic_cast<KrViewItem*>(it)->name()); + ensureItemVisible(it); + } + } + + void KrDetailedView::stopQuickSearch(QKeyEvent *e) { + krApp->mainView->activePanel->quickSearch->hide(); + krApp->mainView->activePanel->quickSearch->clear(); + krDirUp->setEnabled(true); + keyPressEvent(e); } |
From: <ma...@us...> - 2003-08-16 13:16:02
|
Update of /cvsroot/krusader/krusader_kde3/krusader/Panel In directory sc8-pr-cvs1:/tmp/cvs-serv27382/krusader/Panel Modified Files: krdetailedview.h Log Message: added: infrastructure for quicksearch Index: krdetailedview.h =================================================================== RCS file: /cvsroot/krusader/krusader_kde3/krusader/Panel/krdetailedview.h,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** krdetailedview.h 15 Jul 2003 12:09:26 -0000 1.8 --- krdetailedview.h 16 Aug 2003 13:15:59 -0000 1.9 *************** *** 1,31 **** /*************************************************************************** ! krdetailedview.h ! ------------------- ! copyright : (C) 2000-2002 by Shie Erlich & Rafi Yanai ! e-mail : kru...@us... ! web site : http://krusader.sourceforge.net ! --------------------------------------------------------------------------- ! Description ! *************************************************************************** ! A ! db dD d8888b. db db .d8888. .d8b. d8888b. d88888b d8888b. ! 88 ,8P' 88 `8D 88 88 88' YP d8' `8b 88 `8D 88' 88 `8D ! 88,8P 88oobY' 88 88 `8bo. 88ooo88 88 88 88ooooo 88oobY' ! 88`8b 88`8b 88 88 `Y8b. 88~~~88 88 88 88~~~~~ 88`8b ! 88 `88. 88 `88. 88b d88 db 8D 88 88 88 .8D 88. 88 `88. ! YP YD 88 YD ~Y8888P' `8888Y' YP YP Y8888D' Y88888P 88 YD ! H e a d e r F i l e ! *************************************************************************** ! * * ! * This program is free software; you can redistribute it and/or modify * ! * it under the terms of the GNU General Public License as published by * ! * the Free Software Foundation; either version 2 of the License, or * ! * (at your option) any later version. * ! * * ! ***************************************************************************/ #ifndef KRDETAILEDVIEW_H #define KRDETAILEDVIEW_H --- 1,31 ---- /*************************************************************************** ! krdetailedview.h ! ------------------- ! copyright : (C) 2000-2002 by Shie Erlich & Rafi Yanai ! e-mail : kru...@us... ! web site : http://krusader.sourceforge.net ! --------------------------------------------------------------------------- ! Description ! *************************************************************************** ! A ! db dD d8888b. db db .d8888. .d8b. d8888b. d88888b d8888b. ! 88 ,8P' 88 `8D 88 88 88' YP d8' `8b 88 `8D 88' 88 `8D ! 88,8P 88oobY' 88 88 `8bo. 88ooo88 88 88 88ooooo 88oobY' ! 88`8b 88`8b 88 88 `Y8b. 88~~~88 88 88 88~~~~~ 88`8b ! 88 `88. 88 `88. 88b d88 db 8D 88 88 88 .8D 88. 88 `88. ! YP YD 88 YD ~Y8888P' `8888Y' YP YP Y8888D' Y88888P 88 YD ! H e a d e r F i l e ! *************************************************************************** ! * * ! * This program is free software; you can redistribute it and/or modify * ! * it under the terms of the GNU General Public License as published by * ! * the Free Software Foundation; either version 2 of the License, or * ! * (at your option) any later version. * ! * * ! ***************************************************************************/ #ifndef KRDETAILEDVIEW_H #define KRDETAILEDVIEW_H *************** *** 47,119 **** */ class KrDetailedView : public KListView, public KrView { ! Q_OBJECT #define MAX_COLUMNS 9 ! friend class KrDetailedViewItem; ! public: ! enum ColumnType { Name=0x0, Extention=0x1, Mime=0x2, Size=0x3, DateTime=0x4, ! Permissions=0x5, KrPermissions=0x6, Owner=0x7, Group=0x8, Unused=0x9 }; ! ! KrDetailedView(QWidget *parent, bool left, KConfig *cfg = krConfig, const char *name=0); ! ~KrDetailedView(); ! virtual int column(ColumnType type); ! inline KrViewItem *getFirst() { return dynamic_cast<KrViewItem*>(firstChild()); } ! inline KrViewItem *getNext(KrViewItem *current) { return dynamic_cast<KrViewItem*>(dynamic_cast<KListViewItem*>(current)->itemBelow()); } ! inline KrViewItem *getPrev(KrViewItem *current) { return dynamic_cast<KrViewItem*>(dynamic_cast<KListViewItem*>(current)->itemAbove()); } ! inline KrViewItem *getCurrentKrViewItem() { return dynamic_cast<KrViewItem*>(currentItem()); } ! virtual KrViewItem *getKrViewItemAt(const QPoint &vp); ! virtual void addItems(vfs *v, bool addUpDir = true); ! QString getCurrentItem() const; ! inline void makeItemVisible(const KrViewItem *item) { ensureItemVisible(dynamic_cast<const QListViewItem*>(item)); } ! void setCurrentItem(const QString& name); ! virtual void updateView() { triggerUpdate(); emit selectionChanged(); } ! virtual void clear(); ! virtual void sort() { KListView::sort(); } ! virtual void setSortMode(SortSpec mode); ! virtual void prepareForActive(); ! virtual void prepareForPassive(); ! virtual void saveSettings() { KListView::saveLayout(_config, nameInKConfig()); } ! virtual void restoreSettings() { KListView::restoreLayout(_config, nameInKConfig()); } ! virtual QString nameInKConfig() { return _nameInKConfig; } ! QString itemToFilename(QListViewItem *it) { return dynamic_cast<KrViewItem*>(it)->name(); }//remove ! virtual void renameCurrentItem(); ! ///////////////////////// todo /////////////////////////////////// ! // virtual void setFilter(FilterSpec filter) {} ! signals: ! void executed(QString &name); ! void itemDescription(QString &desc); ! void needFocus(); ! void contextMenu(const QPoint &point); ! void letsDrag(QStringList items, QPixmap icon); ! void gotDrop(QDropEvent *e); ! void renameItem(const QString &oldName, const QString &newName); ! protected: ! void newColumn(ColumnType type); ! virtual void keyPressEvent(QKeyEvent *e); ! virtual void contentsMousePressEvent(QMouseEvent *e); ! virtual void contentsWheelEvent(QWheelEvent *e); ! virtual bool acceptDrag(QDropEvent* e) const; ! virtual void contentsDropEvent(QDropEvent *e); ! virtual void contentsDragMoveEvent(QDragMoveEvent *e); ! virtual void startDrag(); ! protected slots: ! void slotClicked(QListViewItem *item); ! void slotDoubleClicked(QListViewItem *item); ! void slotItemDescription(QListViewItem *item); ! void slotCurrentChanged(QListViewItem *item); ! void handleContextMenu(QListViewItem*, const QPoint&, int); ! void inplaceRenameFinished(QListViewItem *it, int col); ! private: ! ColumnType _columns[MAX_COLUMNS]; ! static QString ColumnName[MAX_COLUMNS]; ! bool _withIcons, _focused; ! KrViewItem *_currDragItem; ! QString _nameInKConfig; ! bool _left; }; --- 47,121 ---- */ class KrDetailedView : public KListView, public KrView { ! Q_OBJECT #define MAX_COLUMNS 9 ! friend class KrDetailedViewItem; ! public: ! enum ColumnType { Name = 0x0, Extention = 0x1, Mime = 0x2, Size = 0x3, DateTime = 0x4, ! Permissions = 0x5, KrPermissions = 0x6, Owner = 0x7, Group = 0x8, Unused = 0x9 }; ! KrDetailedView( QWidget *parent, bool left, KConfig *cfg = krConfig, const char *name = 0 ); ! ~KrDetailedView(); ! virtual int column( ColumnType type ); ! inline KrViewItem *getFirst() { return dynamic_cast<KrViewItem*>( firstChild() ); } ! inline KrViewItem *getNext( KrViewItem *current ) { return dynamic_cast<KrViewItem*>( dynamic_cast<KListViewItem*>( current ) ->itemBelow() ); } ! inline KrViewItem *getPrev( KrViewItem *current ) { return dynamic_cast<KrViewItem*>( dynamic_cast<KListViewItem*>( current ) ->itemAbove() ); } ! inline KrViewItem *getCurrentKrViewItem() { return dynamic_cast<KrViewItem*>( currentItem() ); } ! virtual KrViewItem *getKrViewItemAt( const QPoint &vp ); ! virtual void addItems( vfs *v, bool addUpDir = true ); ! QString getCurrentItem() const; ! inline void makeItemVisible( const KrViewItem *item ) { ensureItemVisible( dynamic_cast<const QListViewItem*>( item ) ); } ! void setCurrentItem( const QString& name ); ! virtual void updateView() { triggerUpdate(); emit selectionChanged(); } ! virtual void clear(); ! virtual void sort() { KListView::sort(); } ! virtual void setSortMode( SortSpec mode ); ! virtual void prepareForActive(); ! virtual void prepareForPassive(); ! virtual void saveSettings() { KListView::saveLayout( _config, nameInKConfig() ); } ! virtual void restoreSettings() { KListView::restoreLayout( _config, nameInKConfig() ); } ! virtual QString nameInKConfig() { return _nameInKConfig; } ! QString itemToFilename( QListViewItem *it ) { return dynamic_cast<KrViewItem*>( it ) ->name(); } //remove ! virtual void renameCurrentItem(); ! ///////////////////////// todo /////////////////////////////////// ! // virtual void setFilter(FilterSpec filter) {} ! signals: ! void executed( QString &name ); ! void itemDescription( QString &desc ); ! void needFocus(); ! void contextMenu( const QPoint &point ); ! void letsDrag( QStringList items, QPixmap icon ); ! void gotDrop( QDropEvent *e ); ! void renameItem( const QString &oldName, const QString &newName ); ! protected: ! void newColumn( ColumnType type ); ! virtual void keyPressEvent( QKeyEvent *e ); ! virtual void contentsMousePressEvent( QMouseEvent *e ); ! virtual void contentsWheelEvent( QWheelEvent *e ); ! virtual bool acceptDrag( QDropEvent* e ) const; ! virtual void contentsDropEvent( QDropEvent *e ); ! virtual void contentsDragMoveEvent( QDragMoveEvent *e ); ! virtual void startDrag(); ! protected slots: ! void slotClicked( QListViewItem *item ); ! void slotDoubleClicked( QListViewItem *item ); ! void slotItemDescription( QListViewItem *item ); ! void slotCurrentChanged( QListViewItem *item ); ! void handleContextMenu( QListViewItem*, const QPoint&, int ); ! void inplaceRenameFinished( QListViewItem *it, int col ); ! void quickSearch(const QString &); ! void stopQuickSearch(QKeyEvent*); ! ! private: ! ColumnType _columns[ MAX_COLUMNS ]; ! static QString ColumnName[ MAX_COLUMNS ]; ! bool _withIcons, _focused; ! KrViewItem *_currDragItem; ! QString _nameInKConfig; ! bool _left; }; |
From: <ma...@us...> - 2003-08-16 13:15:43
|
Update of /cvsroot/krusader/krusader_kde3/krusader In directory sc8-pr-cvs1:/tmp/cvs-serv27355/krusader Modified Files: krusader.h Log Message: added: infrastructure for quicksearch Index: krusader.h =================================================================== RCS file: /cvsroot/krusader/krusader_kde3/krusader/krusader.h,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** krusader.h 2 Aug 2003 21:03:55 -0000 1.8 --- krusader.h 16 Aug 2003 13:15:39 -0000 1.9 *************** *** 98,102 **** static KAction *actHomeTerminal, *actFTPConnect, *actFTPNewConnect, *actFTPDisconnect; static KAction *actExecFilter, *actCustomFilter, *actMountMan, *actNewTool; ! static KAction *actKonfigurator, *actToolsSetup, *actBack, *actRoot, *actFind; static KAction *actSelectColorMask, *actMultiRename, *actAllFilter, *actOpenLeftBm, *actOpenRightBm; static KToggleAction *actToggleTerminal; --- 98,102 ---- static KAction *actHomeTerminal, *actFTPConnect, *actFTPNewConnect, *actFTPDisconnect; static KAction *actExecFilter, *actCustomFilter, *actMountMan, *actNewTool; ! static KAction *actKonfigurator, *actToolsSetup, *actBack, *actRoot, *actFind, *actDirUp; static KAction *actSelectColorMask, *actMultiRename, *actAllFilter, *actOpenLeftBm, *actOpenRightBm; static KToggleAction *actToggleTerminal; *************** *** 165,168 **** --- 165,169 ---- #define krOpenLeftBm Krusader::App->actOpenLeftBm // open left bookmarks #define krOpenRightBm Krusader::App->actOpenRightBm // open left bookmarks + #define krDirUp Krusader::App->actDirUp #endif |
From: <ma...@us...> - 2003-08-16 13:15:26
|
Update of /cvsroot/krusader/krusader_kde3/krusader In directory sc8-pr-cvs1:/tmp/cvs-serv27336/krusader Modified Files: krusader.cpp Log Message: added: infrastructure for quicksearch Index: krusader.cpp =================================================================== RCS file: /cvsroot/krusader/krusader_kde3/krusader/krusader.cpp,v retrieving revision 1.22 retrieving revision 1.23 diff -C2 -d -r1.22 -r1.23 *** krusader.cpp 2 Aug 2003 21:03:55 -0000 1.22 --- krusader.cpp 16 Aug 2003 13:15:23 -0000 1.23 *************** *** 101,104 **** --- 101,105 ---- KAction *Krusader::actOpenLeftBm = 0; KAction *Krusader::actOpenRightBm = 0; + KAction *Krusader::actDirUp = 0; KToggleAction *Krusader::actToggleTerminal = 0; *************** *** 287,291 **** // second, the KDE standard action ! KStdAction::up( SLOTS, SLOT( dirUp() ), actionCollection(), "std_up" )->setShortcut(Key_Backspace); KStdAction::home( SLOTS, SLOT( home() ), actionCollection(), "std_home" )->setShortcut(Key_QuoteLeft); KStdAction::redisplay( SLOTS, SLOT( refresh() ), actionCollection(), "std_redisplay" ); --- 288,292 ---- // second, the KDE standard action ! //KStdAction::up( SLOTS, SLOT( dirUp() ), actionCollection(), "std_up" )->setShortcut(Key_Backspace); KStdAction::home( SLOTS, SLOT( home() ), actionCollection(), "std_home" )->setShortcut(Key_QuoteLeft); KStdAction::redisplay( SLOTS, SLOT( refresh() ), actionCollection(), "std_redisplay" ); *************** *** 318,321 **** --- 319,324 ---- // and then the DONE actions + actDirUp = new KAction( i18n("Up"), "up", Key_Backspace, SLOTS, SLOT(dirUp()), actionCollection(), "dirUp"); + actSelectColorMask = new KAction( i18n( "Co&nfigure compare-mode" ), 0, SLOTS, SLOT( selectCompareMask() ), actionCollection(), "select colormask" ); |
From: <ma...@us...> - 2003-08-16 13:14:29
|
Update of /cvsroot/krusader/krusader_kde3/krusader In directory sc8-pr-cvs1:/tmp/cvs-serv27181/krusader Modified Files: krusaderui.rc Log Message: Index: krusaderui.rc =================================================================== RCS file: /cvsroot/krusader/krusader_kde3/krusader/krusaderui.rc,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** krusaderui.rc 2 Aug 2003 21:03:55 -0000 1.6 --- krusaderui.rc 16 Aug 2003 13:14:24 -0000 1.7 *************** *** 73,77 **** <ToolBar noMerge="1" name="mainToolBar" fullWidth="true" > <Action name="back" /> ! <Action name="std_up" /> <Action name="std_home" /> <Action name="std_redisplay" /> --- 73,77 ---- <ToolBar noMerge="1" name="mainToolBar" fullWidth="true" > <Action name="back" /> ! <Action name="dirUp" /> <Action name="std_home" /> <Action name="std_redisplay" /> |
From: <ma...@us...> - 2003-08-15 23:16:35
|
Update of /cvsroot/krusader/krusader_kde3/krusader/Panel In directory sc8-pr-cvs1:/tmp/cvs-serv24413/krusader/Panel Modified Files: listpanel.cpp Log Message: added: support for future "dump keys to cmdline" feature Index: listpanel.cpp =================================================================== RCS file: /cvsroot/krusader/krusader_kde3/krusader/Panel/listpanel.cpp,v retrieving revision 1.24 retrieving revision 1.25 diff -C2 -d -r1.24 -r1.25 *** listpanel.cpp 2 Aug 2003 21:04:38 -0000 1.24 --- listpanel.cpp 15 Aug 2003 23:00:25 -0000 1.25 *************** *** 703,707 **** default: ! e->ignore(); } } --- 703,710 ---- default: ! // if we got this, it means that the view is not doing ! // the quick search thing, so send the characters to the commandline ! krApp->mainView->cmdLine->addText(e->text()); ! //e->ignore(); } } |
From: <ma...@us...> - 2003-08-15 23:09:54
|
Update of /cvsroot/krusader/krusader_kde3/krusader/GUI In directory sc8-pr-cvs1:/tmp/cvs-serv24227/krusader/GUI Modified Files: kcmdline.h Log Message: added: support for future "dump keys to cmdline" feature Index: kcmdline.h =================================================================== RCS file: /cvsroot/krusader/krusader_kde3/krusader/GUI/kcmdline.h,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** kcmdline.h 18 Nov 2002 22:08:35 -0000 1.2 --- kcmdline.h 15 Aug 2003 23:00:02 -0000 1.3 *************** *** 95,98 **** --- 95,99 ---- void slotHistoryDown(); void setCmdLineText(int id); + void addText(QString text) { cmdLine->setText(cmdLine->text()+text); } private: |
From: <ma...@us...> - 2003-08-15 23:06:52
|
Update of /cvsroot/krusader/krusader_kde3/krusader/Panel In directory sc8-pr-cvs1:/tmp/cvs-serv24460/krusader/Panel Modified Files: krdetailedview.cpp Log Message: added: support for future "dump keys to cmdline" feature Index: krdetailedview.cpp =================================================================== RCS file: /cvsroot/krusader/krusader_kde3/krusader/Panel/krdetailedview.cpp,v retrieving revision 1.23 retrieving revision 1.24 diff -C2 -d -r1.23 -r1.24 *** krdetailedview.cpp 1 Aug 2003 10:39:48 -0000 1.23 --- krdetailedview.cpp 15 Aug 2003 23:00:42 -0000 1.24 *************** *** 68,71 **** --- 68,75 ---- // Group Column #define _GroupColumn false + // Do Quicksearch + #define _DoQuicksearch true + // Classic Quicksearch + #define _ClassicQuicksearch true ////////////////////////////////////////////////////////////////////////// *************** *** 90,102 **** /////////////////////////////// listview //////////////////////////////////// ! krConfig->setGroup( "Look&Feel" ); ! setFont( _config->readFontEntry( "Filelist Font", _FilelistFont ) ); ! // a change in the selection needs to update totals ! connect( this, SIGNAL( clicked( QListViewItem* ) ), this, SLOT( slotClicked( QListViewItem* ) ) ); ! connect( this, SIGNAL( doubleClicked( QListViewItem* ) ), this, SLOT( slotDoubleClicked( QListViewItem* ) ) ); ! connect( this, SIGNAL( returnPressed( QListViewItem* ) ), this, SIGNAL( executed( QListViewItem* ) ) ); ! connect( this, SIGNAL( onItem( QListViewItem* ) ), this, SLOT( slotItemDescription( QListViewItem* ) ) ); ! connect( this, SIGNAL( contextMenuRequested( QListViewItem*, const QPoint&, int ) ), ! this, SLOT( handleContextMenu( QListViewItem*, const QPoint&, int ) ) ); setWidget( this ); --- 94,109 ---- /////////////////////////////// listview //////////////////////////////////// ! { // use the {} so that KConfigGroupSaver will work correctly! ! KConfigGroupSaver grpSvr( _config, "Look&Feel" ); ! krConfig->setGroup( "Look&Feel" ); ! setFont( _config->readFontEntry( "Filelist Font", _FilelistFont ) ); ! // a change in the selection needs to update totals ! connect( this, SIGNAL( clicked( QListViewItem* ) ), this, SLOT( slotClicked( QListViewItem* ) ) ); ! connect( this, SIGNAL( doubleClicked( QListViewItem* ) ), this, SLOT( slotDoubleClicked( QListViewItem* ) ) ); ! connect( this, SIGNAL( returnPressed( QListViewItem* ) ), this, SIGNAL( executed( QListViewItem* ) ) ); ! connect( this, SIGNAL( onItem( QListViewItem* ) ), this, SLOT( slotItemDescription( QListViewItem* ) ) ); ! connect( this, SIGNAL( contextMenuRequested( QListViewItem*, const QPoint&, int ) ), ! this, SLOT( handleContextMenu( QListViewItem*, const QPoint&, int ) ) ); ! } setWidget( this ); *************** *** 508,511 **** --- 515,520 ---- void KrDetailedView::keyPressEvent( QKeyEvent *e ) { + KConfigGroupSaver grpSvr( _config, nameInKConfig() ); + if ( !e || !firstChild() ) return ; // subclass bug *************** *** 584,589 **** break; default: ! KListView::keyPressEvent( e ); ! //updateView(); return ; } --- 593,604 ---- break; default: ! // are we doing quicksearch? if not, send keys to panel ! if ( _config->readBoolEntry( "Do Quicksearch", _DoQuicksearch ) ) { ! // are we using krusader's classic quicksearch, or wincmd style? ! if (_config->readBoolEntry( "Classic Quicksearch", _ClassicQuicksearch)) ! KListView::keyPressEvent( e ); ! else {} ! } else e->ignore(); // send to panel ! return ; } |
From: <des...@us...> - 2003-08-12 22:34:28
|
Update of /cvsroot/krusader/krusader_kde3 In directory sc8-pr-cvs1:/tmp/cvs-serv30603 Modified Files: ChangeLog Log Message: Index: ChangeLog =================================================================== RCS file: /cvsroot/krusader/krusader_kde3/ChangeLog,v retrieving revision 1.59 retrieving revision 1.60 diff -C2 -d -r1.59 -r1.60 *** ChangeLog 11 Aug 2003 21:04:16 -0000 1.59 --- ChangeLog 12 Aug 2003 22:05:26 -0000 1.60 *************** *** 7,10 **** --- 7,11 ---- FIXED: the @ in ftp passwords bug. UPDATED: Slovak translation + UPDATED: Dutch translation 1.21-beta1 |
From: <des...@us...> - 2003-08-12 22:25:20
|
Update of /cvsroot/krusader/krusader_kde3/po In directory sc8-pr-cvs1:/tmp/cvs-serv30292/po Modified Files: nl.po Log Message: Index: nl.po =================================================================== RCS file: /cvsroot/krusader/krusader_kde3/po/nl.po,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** nl.po 4 Jul 2003 11:18:17 -0000 1.2 --- nl.po 12 Aug 2003 22:03:49 -0000 1.3 *************** *** 6,12 **** msgid "" msgstr "" ! "Project-Id-Version: Krusader-nl\n" ! "POT-Creation-Date: 2003-05-29 23:09+0300\n" ! "PO-Revision-Date: 2003-06-21 23:30+0200\n" "Last-Translator: Frank Schoolmeesters <fra...@ya...>\n" "Language-Team: DUTCH (nl) <nl...@li...>\n" --- 6,12 ---- msgid "" msgstr "" [...1076 lines suppressed...] *** 2474,2482 **** "archief verwijzen, en het is meestal een fout om dit wel te doen!" ! #: krslots.cpp:311 msgid "Can't find \"KsysCtrl\". Please install KDE admin package" msgstr "Kan \"KsysCtrl\" niet vinden. Installeer a.u.b. het KDE admin pakket" ! #: krslots.cpp:319 msgid "" "Can't find a batch renamer tool.\n" --- 2485,2493 ---- "archief verwijzen, en het is meestal een fout om dit wel te doen!" ! #: krslots.cpp:313 msgid "Can't find \"KsysCtrl\". Please install KDE admin package" msgstr "Kan \"KsysCtrl\" niet vinden. Installeer a.u.b. het KDE admin pakket" ! #: krslots.cpp:321 msgid "" "Can't find a batch renamer tool.\n" |
From: <ya...@us...> - 2003-08-11 22:38:58
|
Update of /cvsroot/krusader/krusader_kde3/krusader/VFS In directory sc8-pr-cvs1:/tmp/cvs-serv6284/krusader/VFS Modified Files: ftp_vfs.cpp Log Message: Fixed the bug that displayed the password when the user name contains more than one @ Index: ftp_vfs.cpp =================================================================== RCS file: /cvsroot/krusader/krusader_kde3/krusader/VFS/ftp_vfs.cpp,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** ftp_vfs.cpp 11 Aug 2003 20:51:54 -0000 1.14 --- ftp_vfs.cpp 11 Aug 2003 22:04:51 -0000 1.15 *************** *** 69,89 **** // breakdown the url; /* FIXME: untill KDE fixes the bug we have to check for ! passwords with @ in them... */ bool bugfix = origin.find("@") != origin.findRev("@"); if(bugfix){ ! int passStart = origin.find( ":",origin.find(":")+1 )+1; ! int passLen = origin.findRev("@")-passStart; ! password = origin.mid(passStart,passLen); ! origin = origin.remove(passStart-1,passLen+1); } KURL url = origin; port = url.port(); ! loginName = url.user(); ! if(password.isEmpty()) password = url.pass(); if(bugfix){ ! url.setPass(password); } - vfs_type = "ftp"; vfs_origin = url.prettyURL(-1); --- 69,98 ---- // breakdown the url; /* FIXME: untill KDE fixes the bug we have to check for ! passwords and users with @ in them... */ bool bugfix = origin.find("@") != origin.findRev("@"); if(bugfix){ ! if(origin.find(":") != origin.findRev(":")){ ! int passStart = origin.find( ":",origin.find(":")+1 )+1; ! int passLen = origin.findRev("@")-passStart; ! password = origin.mid(passStart,passLen); ! origin = origin.remove(passStart-1,passLen+1); ! } ! if(origin.find("@") != origin.findRev("@")){ ! int usrStart = origin.find( "/" )+1; ! if(origin.at(usrStart) == '/') ++usrStart; ! int usrLen = origin.findRev("@")-usrStart; ! loginName = origin.mid(usrStart,usrLen); ! origin = origin.remove(usrStart,usrLen+1); ! } } KURL url = origin; port = url.port(); ! if(loginName.isEmpty()) loginName = url.user(); ! if(password.isEmpty()) password = url.pass(); if(bugfix){ ! url.setPass(password); ! url.setUser(loginName); } vfs_type = "ftp"; vfs_origin = url.prettyURL(-1); *************** *** 172,184 **** KURL url = origin; - if( !loginName.isEmpty()) url.setUser(loginName); - if( !password.isEmpty() ) url.setPass(password); - //if( port ) url.setPort(port); - QString errorMsg = QString::null; if ( url.isMalformed() ) errorMsg = i18n("Malformed URL:\n%1").arg(url.url()); if( !KProtocolInfo::supportsListing(url) ) ! errorMsg = i18n("Protocol not supported by Krusader:\n").arg(url.url()); if( !errorMsg.isEmpty() ){ --- 181,189 ---- KURL url = origin; QString errorMsg = QString::null; if ( url.isMalformed() ) errorMsg = i18n("Malformed URL:\n%1").arg(url.url()); if( !KProtocolInfo::supportsListing(url) ) ! errorMsg = i18n("Protocol not supported by Krusader:\n%1").arg(url.url()); if( !errorMsg.isEmpty() ){ *************** *** 188,191 **** --- 193,199 ---- } + if( !loginName.isEmpty()) url.setUser(loginName); + if( !password.isEmpty() ) url.setPass(password); + // clear the the list and back up out current situation vfs_filesP2->clear(); |
From: <ya...@us...> - 2003-08-11 21:28:26
|
Update of /cvsroot/krusader/krusader_kde3 In directory sc8-pr-cvs1:/tmp/cvs-serv25009 Modified Files: ChangeLog Log Message: Index: ChangeLog =================================================================== RCS file: /cvsroot/krusader/krusader_kde3/ChangeLog,v retrieving revision 1.58 retrieving revision 1.59 diff -C2 -d -r1.58 -r1.59 *** ChangeLog 10 Aug 2003 21:26:35 -0000 1.58 --- ChangeLog 11 Aug 2003 21:04:16 -0000 1.59 *************** *** 5,8 **** --- 5,9 ---- FIXED: width of modified column for i18n (thanks to heiner) FIXED: dirUp() bug - selection goes to top. + FIXED: the @ in ftp passwords bug. UPDATED: Slovak translation |
From: <ya...@us...> - 2003-08-11 20:57:52
|
Update of /cvsroot/krusader/krusader_kde3/krusader/Panel In directory sc8-pr-cvs1:/tmp/cvs-serv23373/krusader/Panel Modified Files: panelfunc.cpp panelfunc.h Log Message: openUrl() no longer has a type argument, but finds the type by itself... Index: panelfunc.cpp =================================================================== RCS file: /cvsroot/krusader/krusader_kde3/krusader/Panel/panelfunc.cpp,v retrieving revision 1.31 retrieving revision 1.32 diff -C2 -d -r1.31 -r1.32 *** panelfunc.cpp 4 Aug 2003 20:52:43 -0000 1.31 --- panelfunc.cpp 11 Aug 2003 20:56:07 -0000 1.32 *************** *** 77,84 **** } ! void ListPanelFunc::openUrl( const QString& path, const QString& type ) { panel->slotFocusOnMe(); ! QString mytype = type, mypath = path; // make sure local urls are handles ok --- 77,84 ---- } ! void ListPanelFunc::openUrl( const QString& path) { panel->slotFocusOnMe(); ! QString mypath = path; // make sure local urls are handles ok *************** *** 91,103 **** QString archive = mypath.left( mypath.find( '\\' ) ); QString directory = mypath.mid( mypath.findRev( '\\' ) + 1 ); ! if ( mytype.isEmpty() ) { ! QString mime = KMimeType::findByURL( archive ) ->name(); ! mytype = mime.right( 4 ); ! if ( mytype == "-rpm" ) ! mytype = "+rpm"; // open the rpm as normal archive ! if ( mime.contains( "-rar" ) ) ! mytype = "-rar"; ! } ! changeVFS( mytype, archive ); // add warning to the backStack if ( backStack.last() != "//WARNING//" ) --- 91,101 ---- QString archive = mypath.left( mypath.find( '\\' ) ); QString directory = mypath.mid( mypath.findRev( '\\' ) + 1 ); ! // find the archive type ! QString type; ! QString mime = KMimeType::findByURL( archive ) ->name(); ! type = mime.right( 4 ); ! if ( type == "-rpm" ) type = "+rpm"; // open the rpm as normal archive ! if ( mime.contains( "-rar" ) ) type = "-rar"; ! changeVFS( type, archive ); // add warning to the backStack if ( backStack.last() != "//WARNING//" ) *************** *** 578,582 **** path = path+"\\"; } ! openUrl( path, type ); } else { KURL url; --- 576,580 ---- path = path+"\\"; } ! openUrl( path ); } else { KURL url; *************** *** 643,648 **** return ; } ! ! // save the current vfs files() ->blockSignals( true ); --- 641,645 ---- return ; } ! // save the current vfs files() ->blockSignals( true ); Index: panelfunc.h =================================================================== RCS file: /cvsroot/krusader/krusader_kde3/krusader/Panel/panelfunc.h,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** panelfunc.h 15 Jul 2003 12:09:26 -0000 1.11 --- panelfunc.h 11 Aug 2003 20:56:07 -0000 1.12 *************** *** 42,46 **** public slots: void execute(QString&); ! void openUrl(const QString& path,const QString& type=QString::null ); void refresh(){ refresh(panel->virtualPath); } // re-read the files void rename(const QString &oldname, const QString &newname); --- 42,46 ---- public slots: void execute(QString&); ! void openUrl(const QString& path); void refresh(){ refresh(panel->virtualPath); } // re-read the files void rename(const QString &oldname, const QString &newname); |
From: <ya...@us...> - 2003-08-11 20:57:25
|
Update of /cvsroot/krusader/krusader_kde3/krusader/VFS In directory sc8-pr-cvs1:/tmp/cvs-serv22572/krusader/VFS Modified Files: ftp_vfs.cpp Log Message: Fixed a the @ in passwords bugs and added a delay needed to avoid a crash with the new bookmark system. Index: ftp_vfs.cpp =================================================================== RCS file: /cvsroot/krusader/krusader_kde3/krusader/VFS/ftp_vfs.cpp,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** ftp_vfs.cpp 19 Jul 2003 13:16:33 -0000 1.13 --- ftp_vfs.cpp 11 Aug 2003 20:51:54 -0000 1.14 *************** *** 33,36 **** --- 33,37 ---- #include <qdir.h> #include <qregexp.h> + #include <qtimer.h> // KDE includes #include <kmimetype.h> *************** *** 59,64 **** // set the writable attribute isWritable = true; ! int bugFixLoc = origin.find("@"); ! vfs_filesP = &vfs_files; vfs_files.setAutoDelete(true); --- 60,64 ---- // set the writable attribute isWritable = true; ! vfs_filesP = &vfs_files; vfs_files.setAutoDelete(true); *************** *** 70,81 **** /* FIXME: untill KDE fixes the bug we have to check for passwords with @ in them... */ ! bool bugfix = origin.find("@") != origin.findRev("@"); ! if(bugfix) origin = origin.remove(bugFixLoc,1); ! KURL url = origin; port = url.port(); loginName = url.user(); ! password = url.pass(); if(bugfix){ - origin.insert(bugFixLoc,"@"); url.setPass(password); } --- 70,85 ---- /* FIXME: untill KDE fixes the bug we have to check for passwords with @ in them... */ ! bool bugfix = origin.find("@") != origin.findRev("@"); ! if(bugfix){ ! int passStart = origin.find( ":",origin.find(":")+1 )+1; ! int passLen = origin.findRev("@")-passStart; ! password = origin.mid(passStart,passLen); ! origin = origin.remove(passStart-1,passLen+1); ! } ! KURL url = origin; port = url.port(); loginName = url.user(); ! if(password.isEmpty()) password = url.pass(); if(bugfix){ url.setPass(password); } *************** *** 85,89 **** vfs_origin = url.prettyURL(-1); ! vfs_refresh(vfs_origin); } --- 89,94 ---- vfs_origin = url.prettyURL(-1); ! QTimer::singleShot(500,this,SLOT(vfs_refresh())); ! //vfs_refresh(vfs_origin); } *************** *** 190,193 **** --- 195,204 ---- vfs_url_backup = vfs_url; vfs_url = url; + + // The following is needed because the new bookmark system + // is using KIO which in some mysterious way is causing a crash... + while( qApp->hasPendingEvents() ) qApp->processEvents(); + while( qApp->hasPendingEvents() ) qApp->processEvents(); + while( qApp->hasPendingEvents() ) qApp->processEvents(); // Open the directory marked by origin |
From: <ya...@us...> - 2003-08-11 20:48:38
|
Update of /cvsroot/krusader/krusader_kde3/krusader/BookMan In directory sc8-pr-cvs1:/tmp/cvs-serv21967/krusader/BookMan Modified Files: kbookmarkhandler.cpp Log Message: Removed debug message Index: kbookmarkhandler.cpp =================================================================== RCS file: /cvsroot/krusader/krusader_kde3/krusader/BookMan/kbookmarkhandler.cpp,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** kbookmarkhandler.cpp 2 Aug 2003 21:06:01 -0000 1.1 --- kbookmarkhandler.cpp 11 Aug 2003 20:48:35 -0000 1.2 *************** *** 58,62 **** void KBookmarkHandler::openBookmarkURL(const QString& url) { ! kdDebug() << "Opening url: " << url << endl; emit openUrl( url ); } --- 58,62 ---- void KBookmarkHandler::openBookmarkURL(const QString& url) { ! //kdDebug() << "Opening url: " << url << endl; emit openUrl( url ); } |
From: <ma...@us...> - 2003-08-10 21:27:19
|
Update of /cvsroot/krusader/krusader_kde3/krusader/MountMan In directory sc8-pr-cvs1:/tmp/cvs-serv14871/krusader/MountMan Modified Files: kmountman.cpp Log Message: fixed: mountman bug with trailing slash Index: kmountman.cpp =================================================================== RCS file: /cvsroot/krusader/krusader_kde3/krusader/MountMan/kmountman.cpp,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** kmountman.cpp 7 May 2003 15:38:51 -0000 1.6 --- kmountman.cpp 10 Aug 2003 21:27:17 -0000 1.7 *************** *** 198,201 **** --- 198,204 ---- system->setType(temp[1][j]); system->setMntPoint(temp[2][j]); + // remove trailing spaces (since mtab removes them) + if (system->mntPoint()[system->mntPoint().length()-1] == '/' && system->mntPoint() != "/") // also skip root! + system->setMntPoint(system->mntPoint().left(system->mntPoint().length()-1)); system->supermount=(temp[4][j]=="supermount" ? true : false); system->options=temp[3][j]; *************** *** 208,212 **** } } ! kdDebug() << "Mt.Man: found the followning:\n" << forDebugOnly << "Trying DF..." << endl; #ifdef BSD --- 211,215 ---- } } ! kdDebug() << "Mt.Man: found the following:\n" << forDebugOnly << "Trying DF..." << endl; #ifdef BSD |
From: <ma...@us...> - 2003-08-10 21:26:38
|
Update of /cvsroot/krusader/krusader_kde3 In directory sc8-pr-cvs1:/tmp/cvs-serv14672 Modified Files: ChangeLog Log Message: Index: ChangeLog =================================================================== RCS file: /cvsroot/krusader/krusader_kde3/ChangeLog,v retrieving revision 1.57 retrieving revision 1.58 diff -C2 -d -r1.57 -r1.58 *** ChangeLog 8 Aug 2003 19:37:01 -0000 1.57 --- ChangeLog 10 Aug 2003 21:26:35 -0000 1.58 *************** *** 2,5 **** --- 2,6 ---- ADDED: new Hungarian translation, thanks to Kukk Zoltán ADDED: Finally, the new bookmark system is here! courtasy of Jan Halasa + FIXED: mountMan bug - didn't allow to umount/mount filesystem with trailing / FIXED: width of modified column for i18n (thanks to heiner) FIXED: dirUp() bug - selection goes to top. |
From: <jan...@us...> - 2003-08-08 21:19:27
|
Update of /cvsroot/krusader/krusader_kde3/krusader/BookMan In directory sc8-pr-cvs1:/tmp/cvs-serv6393/krusader_kde3/krusader/BookMan Modified Files: kbookmarkmenu.cpp Log Message: it does not send URL-encoded paths now Index: kbookmarkmenu.cpp =================================================================== RCS file: /cvsroot/krusader/krusader_kde3/krusader/BookMan/kbookmarkmenu.cpp,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** kbookmarkmenu.cpp 2 Aug 2003 21:06:01 -0000 1.1 --- kbookmarkmenu.cpp 8 Aug 2003 21:19:24 -0000 1.2 *************** *** 390,394 **** Q_ASSERT(!bookmark.isGroup()); ! m_pOwner->openBookmarkURL( bookmark.url().url() ); } --- 390,394 ---- Q_ASSERT(!bookmark.isGroup()); ! m_pOwner->openBookmarkURL( bookmark.url().prettyURL() ); } |
From: <jan...@us...> - 2003-08-08 21:16:09
|
Update of /cvsroot/krusader/krusader_kde3/krusader/BookMan In directory sc8-pr-cvs1:/tmp/cvs-serv6019/krusader_kde3/krusader/BookMan Modified Files: bookmarksbutton.cpp Log Message: new method openPopup() takes care of Alt+Arrow shortcut Index: bookmarksbutton.cpp =================================================================== RCS file: /cvsroot/krusader/krusader_kde3/krusader/BookMan/bookmarksbutton.cpp,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** bookmarksbutton.cpp 2 Aug 2003 21:06:01 -0000 1.1 --- bookmarksbutton.cpp 8 Aug 2003 21:16:06 -0000 1.2 *************** *** 42,45 **** } ! BookmarksButton::~BookmarksButton(){ } --- 42,49 ---- } ! BookmarksButton::~BookmarksButton() { ! } ! ! void BookmarksButton::openPopup() { ! popup()->exec(mapToGlobal(QPoint(0, height()))); } |
From: <jan...@us...> - 2003-08-08 21:13:56
|
Update of /cvsroot/krusader/krusader_kde3/krusader/BookMan In directory sc8-pr-cvs1:/tmp/cvs-serv5700/krusader_kde3/krusader/BookMan Modified Files: bookmarksbutton.h Log Message: I added method openPopup() Index: bookmarksbutton.h =================================================================== RCS file: /cvsroot/krusader/krusader_kde3/krusader/BookMan/bookmarksbutton.h,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** bookmarksbutton.h 2 Aug 2003 21:06:01 -0000 1.1 --- bookmarksbutton.h 8 Aug 2003 21:13:54 -0000 1.2 *************** *** 37,40 **** --- 37,42 ---- BookmarksButton(QWidget *parent); ~BookmarksButton(); + + void openPopup(); private: KBookmarkHandler *bookmarkHandler; |
From: <des...@us...> - 2003-08-08 19:37:03
|
Update of /cvsroot/krusader/krusader_kde3 In directory sc8-pr-cvs1:/tmp/cvs-serv21937 Modified Files: ChangeLog Log Message: Index: ChangeLog =================================================================== RCS file: /cvsroot/krusader/krusader_kde3/ChangeLog,v retrieving revision 1.56 retrieving revision 1.57 diff -C2 -d -r1.56 -r1.57 *** ChangeLog 8 Aug 2003 19:26:25 -0000 1.56 --- ChangeLog 8 Aug 2003 19:37:01 -0000 1.57 *************** *** 2,6 **** ADDED: new Hungarian translation, thanks to Kukk Zoltán ADDED: Finally, the new bookmark system is here! courtasy of Jan Halasa ! FIXED: width of modified column for i18n (thanks to heiner) FIXED: dirUp() bug - selection goes to top. UPDATED: Slovak translation --- 2,6 ---- ADDED: new Hungarian translation, thanks to Kukk Zoltán ADDED: Finally, the new bookmark system is here! courtasy of Jan Halasa ! FIXED: width of modified column for i18n (thanks to heiner) FIXED: dirUp() bug - selection goes to top. UPDATED: Slovak translation |
From: <des...@us...> - 2003-08-08 19:26:28
|
Update of /cvsroot/krusader/krusader_kde3 In directory sc8-pr-cvs1:/tmp/cvs-serv20419 Modified Files: ChangeLog Log Message: Index: ChangeLog =================================================================== RCS file: /cvsroot/krusader/krusader_kde3/ChangeLog,v retrieving revision 1.55 retrieving revision 1.56 diff -C2 -d -r1.55 -r1.56 *** ChangeLog 4 Aug 2003 21:35:20 -0000 1.55 --- ChangeLog 8 Aug 2003 19:26:25 -0000 1.56 *************** *** 2,7 **** ADDED: new Hungarian translation, thanks to Kukk Zoltán ADDED: Finally, the new bookmark system is here! courtasy of Jan Halasa ! FIXED: width of modified column for i18n (thanks to heiner) FIXED: dirUp() bug - selection goes to top. 1.21-beta1 --- 2,8 ---- ADDED: new Hungarian translation, thanks to Kukk Zoltán ADDED: Finally, the new bookmark system is here! courtasy of Jan Halasa ! FIXED: width of modified column for i18n (thanks to heiner) FIXED: dirUp() bug - selection goes to top. + UPDATED: Slovak translation 1.21-beta1 |