Menu
▾
▴
krusader-commits
You can subscribe to this list here.
| 2003 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
(98) |
Sep
(138) |
Oct
(100) |
Nov
(49) |
Dec
(131) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2004 |
Jan
(94) |
Feb
(65) |
Mar
(100) |
Apr
(83) |
May
(72) |
Jun
(29) |
Jul
(167) |
Aug
(127) |
Sep
(131) |
Oct
(269) |
Nov
(122) |
Dec
(100) |
| 2005 |
Jan
(228) |
Feb
(266) |
Mar
(63) |
Apr
(135) |
May
(157) |
Jun
(52) |
Jul
(25) |
Aug
(49) |
Sep
(184) |
Oct
(159) |
Nov
(75) |
Dec
(37) |
| 2006 |
Jan
(60) |
Feb
(129) |
Mar
(110) |
Apr
(34) |
May
(31) |
Jun
(42) |
Jul
(72) |
Aug
(90) |
Sep
(57) |
Oct
(66) |
Nov
(42) |
Dec
(90) |
| 2007 |
Jan
(106) |
Feb
(54) |
Mar
(93) |
Apr
(27) |
May
(21) |
Jun
(17) |
Jul
(19) |
Aug
(22) |
Sep
(25) |
Oct
(2) |
Nov
(1) |
Dec
(1) |
| 2008 |
Jan
(65) |
Feb
(70) |
Mar
(29) |
Apr
(45) |
May
(91) |
Jun
(20) |
Jul
(11) |
Aug
(24) |
Sep
(23) |
Oct
(13) |
Nov
(23) |
Dec
(39) |
| 2009 |
Jan
(23) |
Feb
(39) |
Mar
(15) |
Apr
(56) |
May
(5) |
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: <ck...@us...> - 2004-01-14 20:25:06
|
Update of /cvsroot/krusader/krusader_kde3/krusader
In directory sc8-pr-cvs1:/tmp/cvs-serv29654/krusader_kde3/krusader
Modified Files:
krusader.cpp
Log Message:
FIXED: krusader icon is on at startup
Index: krusader.cpp
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/krusader/krusader.cpp,v
retrieving revision 1.54
retrieving revision 1.55
diff -C2 -d -r1.54 -r1.55
*** krusader.cpp 10 Jan 2004 00:03:24 -0000 1.54
--- krusader.cpp 14 Jan 2004 20:25:03 -0000 1.55
***************
*** 194,198 ****
sysTray = new KSystemTray( this );
sysTray->setPixmap( iconLoader->loadIcon( "krusader", KIcon::Panel, 22 ) );
! sysTray->show();
}
--- 194,198 ----
sysTray = new KSystemTray( this );
sysTray->setPixmap( iconLoader->loadIcon( "krusader", KIcon::Panel, 22 ) );
! sysTray->hide();
}
|
|
From: <ck...@us...> - 2004-01-10 22:05:15
|
Update of /cvsroot/krusader/krusader_kde3/krusader/Panel
In directory sc8-pr-cvs1:/tmp/cvs-serv29476/krusader_kde3/krusader/Panel
Modified Files:
krdetailedviewitem.cpp
Log Message:
FIXED: crash at the root directory
Index: krdetailedviewitem.cpp
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/krusader/Panel/krdetailedviewitem.cpp,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** krdetailedviewitem.cpp 7 Jan 2004 20:04:15 -0000 1.17
--- krdetailedviewitem.cpp 10 Jan 2004 22:05:11 -0000 1.18
***************
*** 55,59 ****
void KrDetailedViewItem::remove(){
_vf = 0;
- _view->takeItem( this );
}
--- 55,58 ----
***************
*** 187,190 ****
--- 186,193 ----
QPixmap& KrDetailedViewItem::icon() {
QPixmap *p;
+
+ if( _vf == 0 )
+ return *p;
+
if (_view->_withIcons)
p = new QPixmap(*(pixmap(_view->column(KrDetailedView::Name))));
***************
*** 251,255 ****
QString KrDetailedViewItem::description() const {
if (name()=="..") return i18n("Climb up the directory tree");
! else{
QString text = _vf->vfile_getName();
QString comment = KMimeType::mimeType(_vf->vfile_getMime())->comment(text, false);
--- 254,258 ----
QString KrDetailedViewItem::description() const {
if (name()=="..") return i18n("Climb up the directory tree");
! else if(_vf){
QString text = _vf->vfile_getName();
QString comment = KMimeType::mimeType(_vf->vfile_getMime())->comment(text, false);
***************
*** 283,286 ****
--- 286,291 ----
return text;
}
+
+ return "";
}
|
|
From: <ck...@us...> - 2004-01-10 21:40:45
|
Update of /cvsroot/krusader/krusader_kde3/krusader/Panel
In directory sc8-pr-cvs1:/tmp/cvs-serv18645/krusader_kde3/krusader/Panel
Modified Files:
krview.cpp
Log Message:
FIXED: translation: forcing non-english languages with a strange structure
(commited because searcher also broke the translations)
Index: krview.cpp
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/krusader/Panel/krview.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** krview.cpp 10 Jan 2004 16:35:02 -0000 1.4
--- krview.cpp 10 Jan 2004 21:40:42 -0000 1.5
***************
*** 128,132 ****
_selectedSize += it->size();
}
! QString tmp = QString( "%1 " + i18n( "out of" ) + " %2 " + i18n( "selected" ) + ", %3 " + i18n( "out of" ) + " %4" )
.arg( _numSelected ).arg( _count ).arg( KIO::convertSize( _selectedSize ) )
.arg( KIO::convertSize( _countSize ) );
--- 128,132 ----
_selectedSize += it->size();
}
! QString tmp = QString(i18n("%1 out of %2 selected, %3 out of %4"))
.arg( _numSelected ).arg( _count ).arg( KIO::convertSize( _selectedSize ) )
.arg( KIO::convertSize( _countSize ) );
|
|
From: <ck...@us...> - 2004-01-10 21:40:45
|
Update of /cvsroot/krusader/krusader_kde3/krusader/MountMan
In directory sc8-pr-cvs1:/tmp/cvs-serv18645/krusader_kde3/krusader/MountMan
Modified Files:
kmountman.cpp
Log Message:
FIXED: translation: forcing non-english languages with a strange structure
(commited because searcher also broke the translations)
Index: kmountman.cpp
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/krusader/MountMan/kmountman.cpp,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** kmountman.cpp 29 Nov 2003 17:14:07 -0000 1.15
--- kmountman.cpp 10 Jan 2004 21:40:42 -0000 1.16
***************
*** 661,668 ****
return;
}
! QString tmp=KIO::convertSizeFromKB(d->freeBlks())+i18n(" free out of ")+
! KIO::convertSizeFromKB(d->totalBlks())+" (";
! stats.sprintf("%d",(100-d->usedPerct()));
! stats=tmp+stats+i18n("%) on [ ")+d->mntPoint()+" ("+d->type()+") ]";
emit gotStats(stats);
delete d;
--- 661,668 ----
return;
}
! stats=i18n("%1 free out of %2 (%3%) on %4 [ (%5) ]")
! .arg( KIO::convertSizeFromKB(d->freeBlks()) )
! .arg( KIO::convertSizeFromKB(d->totalBlks()) ).arg( 100-d->usedPerct())
! .arg( d->mntPoint() ).arg( d->type() );
emit gotStats(stats);
delete d;
|
|
From: <ck...@us...> - 2004-01-10 21:40:45
|
Update of /cvsroot/krusader/krusader_kde3
In directory sc8-pr-cvs1:/tmp/cvs-serv18645/krusader_kde3
Modified Files:
ChangeLog
Log Message:
FIXED: translation: forcing non-english languages with a strange structure
(commited because searcher also broke the translations)
Index: ChangeLog
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/ChangeLog,v
retrieving revision 1.164
retrieving revision 1.165
diff -C2 -d -r1.164 -r1.165
*** ChangeLog 10 Jan 2004 17:45:40 -0000 1.164
--- ChangeLog 10 Jan 2004 21:40:42 -0000 1.165
***************
*** 7,10 ****
--- 7,11 ----
ADDED: file splitter
ADDED: a missing credit for Frank in the about box
+ FIXED: translation: forcing non-english languages with a strange structure
FIXED: freeze at modal dialogs and icon tray
FIXED: crash at rename if the directory is refreshed by the watcher
|
|
From: <ck...@us...> - 2004-01-10 17:45:43
|
Update of /cvsroot/krusader/krusader_kde3/krusader/Search
In directory sc8-pr-cvs1:/tmp/cvs-serv26726/krusader_kde3/krusader/Search
Modified Files:
krsearchdialog.cpp krsearchdialog.h
Log Message:
ADDED: edit/view files in KrSearch result window (F3, F4, right click)
Index: krsearchdialog.cpp
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/krusader/Search/krsearchdialog.cpp,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** krsearchdialog.cpp 27 Dec 2003 16:50:17 -0000 1.14
--- krsearchdialog.cpp 10 Jan 2004 17:45:40 -0000 1.15
***************
*** 42,45 ****
--- 42,46 ----
#include "../Dialogs/krdialogs.h"
#include "../VFS/krpermhandler.h"
+ #include "../KViewer/krviewer.h"
#include "krsearchmod.h"
#include "krsearchdialog.h"
***************
*** 67,70 ****
--- 68,73 ----
#include <klocale.h>
#include <kdeversion.h>
+ #include <kpopupmenu.h>
+ #include <qcursor.h>
// private functions - used as services /////////////////////
***************
*** 611,618 ****
--- 614,699 ----
}
}
+ if( resultsList->hasFocus() )
+ {
+ if( e->key() == Key_F4 )
+ {
+ editCurrent();
+ return;
+ }
+ else if( e->key() == Key_F3 )
+ {
+ viewCurrent();
+ return;
+ }
+ }
QDialog::keyPressEvent( e );
}
+ void KrSearchDialog::editCurrent()
+ {
+ QListViewItem *current = resultsList->currentItem();
+ if( current )
+ {
+ KURL url = vfs::fromPathOrURL(current->text(1));
+ url.setFileName( current->text(0) );
+
+ krConfig->setGroup( "General" );
+ QString edit = krConfig->readEntry( "Editor", _Editor );
+
+ if ( edit == "internal editor" )
+ KrViewer::edit( url, true );
+ else
+ {
+ KProcess proc;
+ proc << edit << url.prettyURL(0,KURL::StripFileProtocol);
+ if ( !proc.start( KProcess::DontCare ) )
+ KMessageBox::sorry( krApp, i18n( "Can't open " ) + url.prettyURL(0,KURL::StripFileProtocol) );
+ }
+ }
+ }
+
+ void KrSearchDialog::viewCurrent()
+ {
+ QListViewItem *current = resultsList->currentItem();
+ if( current )
+ {
+ KURL url = vfs::fromPathOrURL(current->text(1));
+ url.setFileName( current->text(0) );
+ KrViewer::view( url );
+ }
+ }
+
+ void KrSearchDialog::rightClickMenu(QListViewItem *item, const QPoint&, int)
+ {
+ // these are the values that will exist in the menu
+ #define EDIT_FILE_ID 110
+ #define VIEW_FILE_ID 111
+ //////////////////////////////////////////////////////////
+ if (!item)
+ return;
+
+ // create the menu
+ KPopupMenu popup;
+ popup.insertTitle(i18n("Krusader Search"));
+
+ popup.insertItem(i18n("View File (F3)"),VIEW_FILE_ID);
+ popup.insertItem(i18n("Edit File (F4)"),EDIT_FILE_ID);
+
+ int result=popup.exec(QCursor::pos());
+
+ // check out the user's option
+ switch (result)
+ {
+ case VIEW_FILE_ID:
+ viewCurrent();
+ break;
+ case EDIT_FILE_ID:
+ editCurrent();
+ break;
+ default: // the user clicked outside of the menu
+ break;
+ }
+ }
#include "krsearchdialog.moc"
Index: krsearchdialog.h
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/krusader/Search/krsearchdialog.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** krsearchdialog.h 1 Oct 2003 11:41:08 -0000 1.5
--- krsearchdialog.h 10 Jan 2004 17:45:40 -0000 1.6
***************
*** 71,74 ****
--- 71,75 ----
virtual void keyPressEvent(QKeyEvent *e);
virtual void closeEvent(QCloseEvent *e);
+ virtual void rightClickMenu(QListViewItem*, const QPoint&, int);
protected slots:
***************
*** 82,85 ****
--- 83,88 ----
void query2gui();
void deleteSelectedItems( QListBox * );
+ void editCurrent();
+ void viewCurrent();
private:
|
|
From: <ck...@us...> - 2004-01-10 17:45:43
|
Update of /cvsroot/krusader/krusader_kde3
In directory sc8-pr-cvs1:/tmp/cvs-serv26726/krusader_kde3
Modified Files:
ChangeLog
Log Message:
ADDED: edit/view files in KrSearch result window (F3, F4, right click)
Index: ChangeLog
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/ChangeLog,v
retrieving revision 1.163
retrieving revision 1.164
diff -C2 -d -r1.163 -r1.164
*** ChangeLog 10 Jan 2004 00:03:24 -0000 1.163
--- ChangeLog 10 Jan 2004 17:45:40 -0000 1.164
***************
*** 1,2 ****
--- 1,3 ----
+ ADDED: KrSearch edit/view file in the result list window (F3, F4, right click)
ADDED: a folder-history button, a-la-total commander. thanks to Hans Loffler!
ADDED: selectall at rename
|
|
From: <er...@us...> - 2004-01-10 16:35:50
|
Update of /cvsroot/krusader/krusader_kde3/krusader/Panel
In directory sc8-pr-cvs1:/tmp/cvs-serv16140/krusader/Panel
Modified Files:
krview.h
Log Message:
add: getItemsByMask()
Index: krview.h
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/krusader/Panel/krview.h,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** krview.h 4 Jan 2004 16:39:01 -0000 1.9
--- krview.h 10 Jan 2004 16:35:39 -0000 1.10
***************
*** 102,106 ****
// void letsDrag(QStringList items, QPixmap icon);
// void gotDrop(QDropEvent *);
! // void selectionChanged();
//////////////////////////////////////////////////////
--- 102,106 ----
// void letsDrag(QStringList items, QPixmap icon);
// void gotDrop(QDropEvent *);
! // void selectionChanged();
//////////////////////////////////////////////////////
***************
*** 115,118 ****
--- 115,119 ----
virtual KIO::filesize_t countSize() const { return _countSize; }
virtual void getSelectedItems(QStringList* names);
+ virtual void getItemsByMask(QString mask, QStringList* names, bool dirs = true, bool files = true);
virtual void getSelectedKrViewItems(KrViewItemList *items);
virtual void select(const QString& filter = "*") { changeSelection(filter, true); }
|
|
From: <er...@us...> - 2004-01-10 16:35:06
|
Update of /cvsroot/krusader/krusader_kde3/krusader/Panel In directory sc8-pr-cvs1:/tmp/cvs-serv16002/krusader/Panel Modified Files: krview.cpp Log Message: add: getItemsByMask(), used mainly by user menu Index: krview.cpp =================================================================== RCS file: /cvsroot/krusader/krusader_kde3/krusader/Panel/krview.cpp,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** krview.cpp 4 Jan 2004 16:39:01 -0000 1.3 --- krview.cpp 10 Jan 2004 16:35:02 -0000 1.4 *************** *** 1,31 **** /*************************************************************************** ! krview.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 ! *************************************************************************** ! * * ! * This program is free software; you can redistribute it and/or modify * ! * it under the terms of the GNU General Public License as published by * ! * the Free Software Foundation; either version 2 of the License, or * ! * (at your option) any later version. * ! * * ! ***************************************************************************/ #include "krview.h" #include "../kicons.h" --- 1,31 ---- /*************************************************************************** ! krview.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 ! *************************************************************************** ! * * ! * This program is free software; you can redistribute it and/or modify * ! * it under the terms of the GNU General Public License as published by * ! * the Free Software Foundation; either version 2 of the License, or * ! * (at your option) any later version. * ! * * ! ***************************************************************************/ #include "krview.h" #include "../kicons.h" *************** *** 38,88 **** #include <klocale.h> ! KrView::KrView(KConfig *cfg): _config(cfg), _nameToMakeCurrent(QString::null), ! _numSelected(0), _count(0), _numDirs(0), _countSize(0), _selectedSize(0) {} ! QPixmap KrView::getIcon(vfile *vf/*, KRListItem::cmpColor color*/) { ! //krConfig->setGroup("Advanced"); ! ////////////////////////////// ! QPixmap icon; ! QString mime = vf->vfile_getMime(); ! //QPixmapCache::setCacheLimit( krConfig->readNumEntry("Icon Cache Size",_IconCacheSize) ); ! ! // first try the cache ! if (!QPixmapCache::find(mime,icon)){ ! // get the icon. ! if ( mime == "Broken Link !" ) ! icon = FL_LOADICON("file_broken"); ! else { ! icon = FL_LOADICON(KMimeType::mimeType(mime)->icon(QString::null,true)); ! } ! // insert it into the cache ! QPixmapCache::insert(mime,icon); ! } ! // if it's a symlink - add an arrow overlay ! if(vf->vfile_isSymLink()){ ! QPixmap link(link_xpm); ! bitBlt (&icon,0,icon.height()-11,&link,0,21,10,11,Qt::CopyROP,false); ! icon.setMask( icon.createHeuristicMask(false) ); ! } ! // color-coding for compare mode ! /* if (color != KRListItem::none) { ! QPixmap block; ! switch (color) { ! case KRListItem::exclusive : block = QPixmap(blue_xpm); ! break; ! case KRListItem::newer : block = QPixmap(green_xpm); ! break; ! case KRListItem::older : block = QPixmap(red_xpm); ! break; ! case KRListItem::identical : block = QPixmap(yellow_xpm); ! break; ! } ! ! bitBlt (&icon,icon.width()-11,0,&block,0,21,10,11,CopyROP,false); ! icon.setMask( icon.createHeuristicMask(false) ); ! }*/ ! ! return icon; } --- 38,88 ---- #include <klocale.h> ! KrView::KrView( KConfig *cfg ) : _config( cfg ), _nameToMakeCurrent( QString::null ), ! _numSelected( 0 ), _count( 0 ), _numDirs( 0 ), _countSize( 0 ), _selectedSize( 0 ) {} ! QPixmap KrView::getIcon( vfile *vf /*, KRListItem::cmpColor color*/ ) { ! //krConfig->setGroup("Advanced"); ! ////////////////////////////// ! QPixmap icon; ! QString mime = vf->vfile_getMime(); ! //QPixmapCache::setCacheLimit( krConfig->readNumEntry("Icon Cache Size",_IconCacheSize) ); ! // first try the cache ! if ( !QPixmapCache::find( mime, icon ) ) { ! // get the icon. ! if ( mime == "Broken Link !" ) ! icon = FL_LOADICON( "file_broken" ); ! else { ! icon = FL_LOADICON( KMimeType::mimeType( mime ) ->icon( QString::null, true ) ); ! } ! // insert it into the cache ! QPixmapCache::insert( mime, icon ); ! } ! // if it's a symlink - add an arrow overlay ! if ( vf->vfile_isSymLink() ) { ! QPixmap link( link_xpm ); ! bitBlt ( &icon, 0, icon.height() - 11, &link, 0, 21, 10, 11, Qt::CopyROP, false ); ! icon.setMask( icon.createHeuristicMask( false ) ); ! } ! ! // color-coding for compare mode ! /* if (color != KRListItem::none) { ! QPixmap block; ! switch (color) { ! case KRListItem::exclusive : block = QPixmap(blue_xpm); ! break; ! case KRListItem::newer : block = QPixmap(green_xpm); ! break; ! case KRListItem::older : block = QPixmap(red_xpm); ! break; ! case KRListItem::identical : block = QPixmap(yellow_xpm); ! break; ! } ! ! bitBlt (&icon,icon.width()-11,0,&block,0,21,10,11,CopyROP,false); ! icon.setMask( icon.createHeuristicMask(false) ); ! }*/ ! ! return icon; } *************** *** 91,183 **** * it assumes the list is ready and doesn't initialize it, or clears it */ ! void KrView::getSelectedItems(QStringList *names) { ! for (KrViewItem *it=getFirst(); it != 0; it=getNext(it)) ! if (it->isSelected() && (it->name() != "..")) names->append(it->name()); ! ! // if all else fails, take the current item ! if (names->empty() && (getCurrentItem() != "..")) names->append(getCurrentItem()); } ! void KrView::getSelectedKrViewItems(KrViewItemList *items) { ! for (KrViewItem *it=getFirst(); it != 0; it=getNext(it)) ! if (it->isSelected() && (it->name() != "..")) items->append(it); ! ! // if all else fails, take the current item ! if (items->empty() && (getCurrentItem() != "..")) items->append(getCurrentKrViewItem()); } QString KrView::statistics() { ! _numSelected = _selectedSize = 0; ! for (KrViewItem *it=getFirst(); it != 0; it=getNext(it)) ! if (it->isSelected()) { ! ++_numSelected; ! _selectedSize += it->size(); ! } ! QString tmp = QString("%1 "+i18n("out of")+" %2 "+i18n("selected")+", %3 "+i18n("out of")+" %4") ! .arg(_numSelected).arg(_count).arg(KIO::convertSize(_selectedSize)) ! .arg(KIO::convertSize(_countSize)); ! return tmp; } ! void KrView::changeSelection(const QString& filter, bool select) { ! KConfigGroupSaver grpSvr(_config, "Look&Feel"/*nameInKConfig()*/); ! bool markDirs = _config->readBoolEntry("Mark Dirs",_MarkDirs); ! KrViewItem *temp=getCurrentKrViewItem(); ! for (KrViewItem *it=getFirst(); it != 0; it=getNext(it)) { ! if (it->name() == "..") continue; ! if (it->isDir() && !markDirs) continue; ! if (QDir::match(filter, it->name())) { ! // we're increasing/decreasing the number of selected files ! if (select) { ! if (!it->isSelected()) { ! ++_numSelected; ! _selectedSize += it->size(); ! } ! } else { ! if (it->isSelected()) { ! --_numSelected; ! _selectedSize -= it->size(); ! } } ! it->setSelected(select); ! } ! } ! updateView(); ! makeItemVisible(temp); } void KrView::invertSelection() { ! KConfigGroupSaver grpSvr(_config, "Look&Feel"/*nameInKConfig()*/); ! bool markDirs = _config->readBoolEntry("Mark Dirs",_MarkDirs); ! KrViewItem *temp=getCurrentKrViewItem(); ! for (KrViewItem *it=getFirst(); it != 0; it=getNext(it)) { ! if (it->name() == "..") continue; ! if (it->isDir() && !markDirs && !it->isSelected()) continue; ! if (it->isSelected()) { ! --_numSelected; ! _selectedSize -= it->size(); ! } else { ! ++_numSelected; ! _selectedSize += it->size(); ! } ! it->setSelected(!it->isSelected()); ! } ! updateView(); ! makeItemVisible(temp); } QString KrView::firstUnmarkedBelowCurrent() { ! KrViewItem *iterator=getNext(getCurrentKrViewItem()); ! while(iterator && iterator->isSelected()) ! iterator=getNext(iterator); ! if (!iterator) ! { ! iterator=getPrev(getCurrentKrViewItem()); ! while(iterator && iterator->isSelected()) ! iterator=getPrev(iterator); ! } ! if (!iterator) return QString::null; ! return iterator->name(); } --- 91,196 ---- * it assumes the list is ready and doesn't initialize it, or clears it */ ! void KrView::getItemsByMask( QString mask, QStringList* names, bool dirs, bool files ) { ! for ( KrViewItem * it = getFirst(); it != 0; it = getNext( it ) ) { ! if ( ( it->name() == ".." ) || !QDir::match( mask, it->name() ) ) continue; ! // if we got here, than the item fits the mask ! if ( it->isDir() && !dirs ) continue; // do we need to skip folders? ! if ( !it->isDir() && !files ) continue; // do we need to skip files ! names->append( it->name() ); ! } } ! /** ! * this function ADDs a list of selected item names into 'names'. ! * it assumes the list is ready and doesn't initialize it, or clears it ! */ ! void KrView::getSelectedItems( QStringList *names ) { ! for ( KrViewItem * it = getFirst(); it != 0; it = getNext( it ) ) ! if ( it->isSelected() && ( it->name() != ".." ) ) names->append( it->name() ); ! ! // if all else fails, take the current item ! if ( names->empty() && ( getCurrentItem() != ".." ) ) names->append( getCurrentItem() ); ! } ! ! void KrView::getSelectedKrViewItems( KrViewItemList *items ) { ! for ( KrViewItem * it = getFirst(); it != 0; it = getNext( it ) ) ! if ( it->isSelected() && ( it->name() != ".." ) ) items->append( it ); ! ! // if all else fails, take the current item ! if ( items->empty() && ( getCurrentItem() != ".." ) ) items->append( getCurrentKrViewItem() ); } QString KrView::statistics() { ! _numSelected = _selectedSize = 0; ! for ( KrViewItem * it = getFirst(); it != 0; it = getNext( it ) ) ! if ( it->isSelected() ) { ! ++_numSelected; ! _selectedSize += it->size(); ! } ! QString tmp = QString( "%1 " + i18n( "out of" ) + " %2 " + i18n( "selected" ) + ", %3 " + i18n( "out of" ) + " %4" ) ! .arg( _numSelected ).arg( _count ).arg( KIO::convertSize( _selectedSize ) ) ! .arg( KIO::convertSize( _countSize ) ); ! return tmp; } ! void KrView::changeSelection( const QString& filter, bool select ) { ! KConfigGroupSaver grpSvr( _config, "Look&Feel" /*nameInKConfig()*/ ); ! bool markDirs = _config->readBoolEntry( "Mark Dirs", _MarkDirs ); ! KrViewItem *temp = getCurrentKrViewItem(); ! for ( KrViewItem * it = getFirst(); it != 0; it = getNext( it ) ) { ! if ( it->name() == ".." ) continue; ! if ( it->isDir() && !markDirs ) continue; ! if ( QDir::match( filter, it->name() ) ) { ! // we're increasing/decreasing the number of selected files ! if ( select ) { ! if ( !it->isSelected() ) { ! ++_numSelected; ! _selectedSize += it->size(); ! } ! } else { ! if ( it->isSelected() ) { ! --_numSelected; ! _selectedSize -= it->size(); ! } ! } ! it->setSelected( select ); } ! } ! updateView(); ! makeItemVisible( temp ); } void KrView::invertSelection() { ! KConfigGroupSaver grpSvr( _config, "Look&Feel" /*nameInKConfig()*/ ); ! bool markDirs = _config->readBoolEntry( "Mark Dirs", _MarkDirs ); ! KrViewItem *temp = getCurrentKrViewItem(); ! for ( KrViewItem * it = getFirst(); it != 0; it = getNext( it ) ) { ! if ( it->name() == ".." ) continue; ! if ( it->isDir() && !markDirs && !it->isSelected() ) continue; ! if ( it->isSelected() ) { ! --_numSelected; ! _selectedSize -= it->size(); ! } else { ! ++_numSelected; ! _selectedSize += it->size(); ! } ! it->setSelected( !it->isSelected() ); ! } ! updateView(); ! makeItemVisible( temp ); } QString KrView::firstUnmarkedBelowCurrent() { ! KrViewItem * iterator = getNext( getCurrentKrViewItem() ); ! while ( iterator && iterator->isSelected() ) ! iterator = getNext( iterator ); ! if ( !iterator ) { ! iterator = getPrev( getCurrentKrViewItem() ); ! while ( iterator && iterator->isSelected() ) ! iterator = getPrev( iterator ); ! } ! if ( !iterator ) return QString::null; ! return iterator->name(); } |
|
From: <er...@us...> - 2004-01-10 16:34:30
|
Update of /cvsroot/krusader/krusader_kde3/krusader/UserMenu
In directory sc8-pr-cvs1:/tmp/cvs-serv15913/krusader/UserMenu
Modified Files:
usermenu.cpp
Log Message:
more expanders
Index: usermenu.cpp
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/krusader/UserMenu/usermenu.cpp,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** usermenu.cpp 10 Jan 2004 01:01:50 -0000 1.14
--- usermenu.cpp 10 Jan 2004 16:34:27 -0000 1.15
***************
*** 45,63 ****
%_and% - number of folders
%_an% - number of files and folders
!
%_c% - current file (or folder). Note: current != selected
%_s% - selected files and folders
- %_cs% - selected files including current file (if it's not already selected)
%_afd% - all files and folders
%_af% - all files (not including folders)
%_ad% - all folders (not including files)
- %_fm% - filter mask (for example: *, *.cpp, *.h etc.)
*/
UMCmd UserMenu::expressions[ UserMenu::numOfExps ] = {
! {"%_p%", "panel's path", exp_p},
! {"%_anf%", "no. of files", exp_anf},
! {"%_and%", "no. of folders", exp_and},
! {"%_an%", "no. of files and folders", exp_an}
};
--- 45,67 ----
%_and% - number of folders
%_an% - number of files and folders
! %_fm% - filter mask (for example: *, *.cpp, *.h etc.)
%_c% - current file (or folder). Note: current != selected
%_s% - selected files and folders
%_afd% - all files and folders
%_af% - all files (not including folders)
%_ad% - all folders (not including files)
*/
UMCmd UserMenu::expressions[ UserMenu::numOfExps ] = {
! {"%_p%", i18n("panel's path"), exp_p},
! {"%_anf%", i18n("no. of files"), exp_anf},
! {"%_and%", i18n("no. of folders"), exp_and},
! {"%_an%", i18n("no. of files and folders"), exp_an},
! {"%_fm%", i18n("filter mask (*.h, *.cpp ...)"), exp_fm},
! {"%_c%", i18n("current file (!= selected file)"), exp_c},
! {"%_s%", i18n("selected files and folders"), exp_s},
! {"%_afd%", i18n("all files and folders"), exp_afd},
! {"%_af%", i18n("all files (not folders)"), exp_af},
! {"%_ad%", i18n("all folders (not files)"), exp_ad}
};
***************
*** 66,69 ****
--- 70,74 ----
#define GETPANEL (str.lower()[1]=='a' ? ACTIVE : OTHER)
+ ///////// expander functions //////////////////////////////////////////////////////////
QString UserMenu::exp_p( const QString& str, const bool& useUrl ) {
if (useUrl) return GETPANEL->func->files()->vfs_getOrigin().url();
***************
*** 71,85 ****
}
! QString UserMenu::exp_anf( const QString& str, const bool& useUrl ) {
return QString("%1").arg(GETPANEL->view->numFiles());
}
! QString UserMenu::exp_and( const QString& str, const bool& useUrl ) {
return QString("%1").arg(GETPANEL->view->numDirs());
}
! QString UserMenu::exp_an( const QString& str, const bool& useUrl ) {
return QString("%1").arg(GETPANEL->view->numDirs()+GETPANEL->view->numFiles());
}
void UserMenu::exec() {
--- 76,162 ----
}
! QString UserMenu::exp_anf( const QString& str, const bool& ) {
return QString("%1").arg(GETPANEL->view->numFiles());
}
! QString UserMenu::exp_and( const QString& str, const bool& ) {
return QString("%1").arg(GETPANEL->view->numDirs());
}
! QString UserMenu::exp_an( const QString& str, const bool& ) {
return QString("%1").arg(GETPANEL->view->numDirs()+GETPANEL->view->numFiles());
}
+
+ QString UserMenu::exp_fm( const QString& str, const bool& ) {
+ return GETPANEL->view->filterMask();
+ }
+
+ QString UserMenu::exp_c( const QString& str, const bool& useUrl ) {
+ KURL url = GETPANEL->func->files()->vfs_getFile(GETPANEL->view->getCurrentItem());
+ if (useUrl) return url.url();
+ else return url.path();
+ }
+
+ // items are separated by ';'
+ QString UserMenu::exp_s( const QString& str, const bool& useUrl ) {
+ // get selected items from view
+ QStringList items;
+ GETPANEL->view->getSelectedItems(&items);
+ // translate to urls using vfs
+ KURL::List* list = GETPANEL->func->files()->vfs_getFiles(&items);
+ // parse everything to a single qstring
+ QString result;
+ for (KURL::List::Iterator it = list->begin(); it != list->end(); it++)
+ result += ((useUrl ? (*it).url() : (*it).path()) + ';');
+
+ return result;
+ }
+
+ // items are separated by ';'
+ QString UserMenu::exp_afd( const QString& str, const bool& useUrl ) {
+ // get all items
+ QStringList items;
+ GETPANEL->view->getItemsByMask("*", &items);
+ // translate to urls using vfs
+ KURL::List* list = GETPANEL->func->files()->vfs_getFiles(&items);
+ // parse everything to a single qstring
+ QString result;
+ for (KURL::List::Iterator it = list->begin(); it != list->end(); it++)
+ result += ((useUrl ? (*it).url() : (*it).path()) + ';');
+
+ return result;
+ }
+
+ // items are separated by ';'
+ QString UserMenu::exp_af( const QString& str, const bool& useUrl ) {
+ // get all items
+ QStringList items;
+ GETPANEL->view->getItemsByMask("*", &items, false, true);
+ // translate to urls using vfs
+ KURL::List* list = GETPANEL->func->files()->vfs_getFiles(&items);
+ // parse everything to a single qstring
+ QString result;
+ for (KURL::List::Iterator it = list->begin(); it != list->end(); it++)
+ result += ((useUrl ? (*it).url() : (*it).path()) + ';');
+
+ return result;
+ }
+
+ // items are separated by ';'
+ QString UserMenu::exp_ad( const QString& str, const bool& useUrl ) {
+ // get all items
+ QStringList items;
+ GETPANEL->view->getItemsByMask("*", &items, true, false);
+ // translate to urls using vfs
+ KURL::List* list = GETPANEL->func->files()->vfs_getFiles(&items);
+ // parse everything to a single qstring
+ QString result;
+ for (KURL::List::Iterator it = list->begin(); it != list->end(); it++)
+ result += ((useUrl ? (*it).url() : (*it).path()) + ';');
+
+ return result;
+ }
+
+ ////////// end of expander functions /////////////////////////////////////////////////
void UserMenu::exec() {
|
|
From: <er...@us...> - 2004-01-10 16:34:01
|
Update of /cvsroot/krusader/krusader_kde3/krusader/UserMenu
In directory sc8-pr-cvs1:/tmp/cvs-serv15809/krusader/UserMenu
Modified Files:
usermenu.h
Log Message:
more expanders
Index: usermenu.h
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/krusader/UserMenu/usermenu.h,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** usermenu.h 10 Jan 2004 01:02:04 -0000 1.12
--- usermenu.h 10 Jan 2004 16:33:57 -0000 1.13
***************
*** 135,146 ****
! static const int numOfExps = 4;
static UMCmd expressions[ numOfExps ];
protected:
! static QString exp_p( const QString& str, const bool& useUrl );
! static QString exp_anf( const QString& str, const bool& useUrl );
! static QString exp_and( const QString& str, const bool& useUrl );
! static QString exp_an( const QString& str, const bool& useUrl );
private:
--- 135,152 ----
! static const int numOfExps = 10;
static UMCmd expressions[ numOfExps ];
protected:
! static QString exp_p( const QString& str, const bool& );
! static QString exp_anf( const QString& str, const bool& );
! static QString exp_and( const QString& str, const bool& );
! static QString exp_an( const QString& str, const bool& );
! static QString exp_fm( const QString& str, const bool& );
! static QString exp_c( const QString& str, const bool& );
! static QString exp_s( const QString& str, const bool& );
! static QString exp_afd( const QString& str, const bool& );
! static QString exp_af( const QString& str, const bool& );
! static QString exp_ad( const QString& str, const bool& );
private:
|
|
From: <er...@us...> - 2004-01-10 14:49:54
|
Update of /cvsroot/krusader/krusader_kde3/krusader/Dialogs
In directory sc8-pr-cvs1:/tmp/cvs-serv26292/krusader/Dialogs
Modified Files:
krspecialwidgets.cpp krspecialwidgets.h
Log Message:
quicksearch is updated
Index: krspecialwidgets.cpp
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/krusader/Dialogs/krspecialwidgets.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** krspecialwidgets.cpp 20 Sep 2003 11:35:43 -0000 1.5
--- krspecialwidgets.cpp 10 Jan 2004 14:49:50 -0000 1.6
***************
*** 218,232 ****
void KrQuickSearch::myKeyPressEvent(QKeyEvent *e) {
switch (e->key()) {
- case Key_Up:
- case Key_Down:
case Key_Escape:
case Key_Enter:
emit stop(e);
break;
default:
! kdWarning()<<"got " << e->text() << endl;
keyPressEvent(e);
}
}
--- 218,240 ----
void KrQuickSearch::myKeyPressEvent(QKeyEvent *e) {
switch (e->key()) {
case Key_Escape:
+ case Key_Return:
case Key_Enter:
+ case Key_Tab:
emit stop(e);
break;
+ case Key_Down:
+ otherMatching(text(), 1);
+ break;
+ case Key_Up:
+ otherMatching(text(), -1);
+ break;
+
default:
! kdWarning()<<"got " << e->ascii() << ":" << e->text() << endl;
keyPressEvent(e);
}
}
+
Index: krspecialwidgets.h
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/krusader/Dialogs/krspecialwidgets.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** krspecialwidgets.h 6 Dec 2003 13:11:30 -0000 1.5
--- krspecialwidgets.h 10 Jan 2004 14:49:50 -0000 1.6
***************
*** 110,113 ****
--- 110,114 ----
signals:
void stop(QKeyEvent *e);
+ void otherMatching(const QString &, int);
};
|
|
From: <er...@us...> - 2004-01-10 14:49:53
|
Update of /cvsroot/krusader/krusader_kde3/krusader/Panel
In directory sc8-pr-cvs1:/tmp/cvs-serv26292/krusader/Panel
Modified Files:
krdetailedview.cpp krdetailedview.h
Log Message:
quicksearch is updated
Index: krdetailedview.cpp
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/krusader/Panel/krdetailedview.cpp,v
retrieving revision 1.53
retrieving revision 1.54
diff -C2 -d -r1.53 -r1.54
*** krdetailedview.cpp 4 Jan 2004 23:38:04 -0000 1.53
--- krdetailedview.cpp 10 Jan 2004 14:49:50 -0000 1.54
***************
*** 72,76 ****
#define _DoQuicksearch true
// Classic Quicksearch
! #define _ClassicQuicksearch true
//////////////////////////////////////////////////////////////////////////
--- 72,76 ----
#define _DoQuicksearch true
// Classic Quicksearch
! #define _ClassicQuicksearch true
//////////////////////////////////////////////////////////////////////////
***************
*** 195,198 ****
--- 195,200 ----
connect( dynamic_cast<ListPanel*>( parent ) ->quickSearch, SIGNAL( textChanged( const QString& ) ),
this, SLOT( quickSearch( const QString& ) ) );
+ connect( dynamic_cast<ListPanel*>( parent ) ->quickSearch, SIGNAL( otherMatching( const QString&, int ) ),
+ this, SLOT( quickSearch( const QString& , int ) ) );
connect( dynamic_cast<ListPanel*>( parent ) ->quickSearch, SIGNAL( stop( QKeyEvent* ) ),
this, SLOT( stopQuickSearch( QKeyEvent* ) ) );
***************
*** 411,414 ****
--- 413,419 ----
void KrDetailedView::prepareForPassive() {
+ //if ( krApp && krApp->mainView && krApp->mainView->activePanel &&
+ // krApp->mainView->activePanel->quickSearch && krApp->mainView->activePanel->quickSearch->isShown() )
+ // stopQuickSearch(0);
_focused = false;
}
***************
*** 511,514 ****
--- 516,524 ----
if ( !e || !firstChild() )
return ; // subclass bug
+ if ( krApp->mainView->activePanel->quickSearch->isShown() )
+ {
+ krApp->mainView->activePanel->quickSearch->myKeyPressEvent( e );
+ return;
+ }
switch ( e->key() ) {
case Key_Enter :
***************
*** 713,728 ****
}
! 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 );
}
}
--- 723,749 ----
}
! void KrDetailedView::quickSearch( const QString & str, int direction )
! {
! KrViewItem * item = getCurrentKrViewItem();
! if (!direction)
! {
! if (item->name().startsWith(str))
! return;
! direction = 1;
}
! KrViewItem * startItem = item;
! while (true)
! {
! item = (direction > 0)?getNext(item):getPrev(item);
! if (!item)
! item = (direction > 0)?getFirst():getLast();
! if (item == startItem)
! return;
! if (item->name().startsWith(str))
! {
! makeItemVisible(item);
! setCurrentItem(item->name());
! return;
! }
}
}
***************
*** 732,737 ****
krApp->mainView->activePanel->quickSearch->clear();
krDirUp->setEnabled( true );
! keyPressEvent( e );
}
void KrDetailedView::setNameToMakeCurrent( QListViewItem * it ) {
--- 753,766 ----
krApp->mainView->activePanel->quickSearch->clear();
krDirUp->setEnabled( true );
! if (e)
! keyPressEvent( e );
}
+
+ //void KrDetailedView::focusOutEvent( QFocusEvent * e )
+ //{
+ // if ( krApp->mainView->activePanel->quickSearch->isShown() )
+ // stopQuickSearch(0);
+ // KListView::focusOutEvent( e );
+ //}
void KrDetailedView::setNameToMakeCurrent( QListViewItem * it ) {
Index: krdetailedview.h
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/krusader/Panel/krdetailedview.h,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** krdetailedview.h 24 Oct 2003 16:39:44 -0000 1.18
--- krdetailedview.h 10 Jan 2004 14:49:50 -0000 1.19
***************
*** 61,64 ****
--- 61,65 ----
virtual int column( ColumnType type );
virtual KrViewItem *getFirst() { return dynamic_cast<KrViewItem*>( firstChild() ); }
+ virtual KrViewItem *getLast() { return dynamic_cast<KrViewItem*>( lastChild() ); }
virtual KrViewItem *getNext( KrViewItem *current ) { return dynamic_cast<KrViewItem*>( dynamic_cast<KListViewItem*>( current ) ->itemBelow() ); }
virtual KrViewItem *getPrev( KrViewItem *current ) { return dynamic_cast<KrViewItem*>( dynamic_cast<KListViewItem*>( current ) ->itemAbove() ); }
***************
*** 100,103 ****
--- 101,105 ----
virtual void contentsDragMoveEvent( QDragMoveEvent *e );
virtual void startDrag();
+ //virtual void focusOutEvent( QFocusEvent * );
protected slots:
***************
*** 109,113 ****
void handleContextMenu( QListViewItem*, const QPoint&, int );
void inplaceRenameFinished( QListViewItem *it, int col );
! void quickSearch(const QString &);
void stopQuickSearch(QKeyEvent*);
void setNameToMakeCurrent(QListViewItem *it);
--- 111,115 ----
void handleContextMenu( QListViewItem*, const QPoint&, int );
void inplaceRenameFinished( QListViewItem *it, int col );
! void quickSearch(const QString &, int = 0);
void stopQuickSearch(QKeyEvent*);
void setNameToMakeCurrent(QListViewItem *it);
|
|
From: <er...@us...> - 2004-01-10 01:02:58
|
Update of /cvsroot/krusader/krusader_kde3/krusader/UserMenu
In directory sc8-pr-cvs1:/tmp/cvs-serv2072/krusader/UserMenu
Modified Files:
usermenuadd.ui
Log Message:
user menu framework is finished (almost)
Index: usermenuadd.ui
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/krusader/UserMenu/usermenuadd.ui,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** usermenuadd.ui 3 Jan 2004 14:24:49 -0000 1.4
--- usermenuadd.ui 10 Jan 2004 01:02:56 -0000 1.5
***************
*** 10,14 ****
<y>0</y>
<width>572</width>
! <height>520</height>
</rect>
</property>
--- 10,14 ----
<y>0</y>
<width>572</width>
! <height>492</height>
</rect>
</property>
***************
*** 37,41 ****
<cstring>unnamed</cstring>
</property>
! <widget class="QButtonGroup" row="6" column="0" rowspan="1" colspan="3">
<property name="name">
<cstring>buttonGroup1</cstring>
--- 37,41 ----
<cstring>unnamed</cstring>
</property>
! <widget class="QButtonGroup" row="6" column="0" rowspan="1" colspan="2">
<property name="name">
<cstring>buttonGroup1</cstring>
***************
*** 96,100 ****
</grid>
</widget>
! <widget class="QButtonGroup" row="5" column="0" rowspan="1" colspan="3">
<property name="name">
<cstring>buttonGroup1_2</cstring>
--- 96,100 ----
</grid>
</widget>
! <widget class="QButtonGroup" row="5" column="0" rowspan="1" colspan="2">
<property name="name">
<cstring>buttonGroup1_2</cstring>
***************
*** 109,116 ****
<widget class="QRadioButton" row="1" column="0" rowspan="1" colspan="2">
<property name="name">
! <cstring>acceptLocalURLs</cstring>
</property>
<property name="text">
! <string>Local files (URLs)</string>
</property>
</widget>
--- 109,116 ----
<widget class="QRadioButton" row="1" column="0" rowspan="1" colspan="2">
<property name="name">
! <cstring>acceptURLs</cstring>
</property>
<property name="text">
! <string>URLs (local and remote)</string>
</property>
</widget>
***************
*** 126,140 ****
</property>
</widget>
- <widget class="QRadioButton" row="2" column="0" rowspan="1" colspan="2">
- <property name="name">
- <cstring>acceptRemote</cstring>
- </property>
- <property name="text">
- <string>Local and remote files (URLs)</string>
- </property>
- </widget>
</grid>
</widget>
! <widget class="QButtonGroup" row="4" column="0" rowspan="1" colspan="3">
<property name="name">
<cstring>buttonGroup1_3</cstring>
--- 126,132 ----
</property>
</widget>
</grid>
</widget>
! <widget class="QButtonGroup" row="4" column="0" rowspan="1" colspan="2">
<property name="name">
<cstring>buttonGroup1_3</cstring>
***************
*** 187,191 ****
</grid>
</widget>
! <widget class="QToolButton" row="3" column="2">
<property name="name">
<cstring>addButton</cstring>
--- 179,183 ----
</grid>
</widget>
! <widget class="QToolButton" row="3" column="1">
<property name="name">
<cstring>addButton</cstring>
***************
*** 203,207 ****
</property>
</widget>
! <widget class="QLabel" row="2" column="0" rowspan="1" colspan="2">
<property name="name">
<cstring>textLabel1</cstring>
--- 195,199 ----
</property>
</widget>
! <widget class="QLabel" row="2" column="0">
<property name="name">
<cstring>textLabel1</cstring>
***************
*** 219,223 ****
</property>
</widget>
! <widget class="KLineEdit" row="3" column="0" rowspan="1" colspan="2">
<property name="name">
<cstring>cmdLine</cstring>
--- 211,215 ----
</property>
</widget>
! <widget class="KLineEdit" row="3" column="0">
<property name="name">
<cstring>cmdLine</cstring>
|
|
From: <er...@us...> - 2004-01-10 01:02:32
|
Update of /cvsroot/krusader/krusader_kde3/krusader/UserMenu
In directory sc8-pr-cvs1:/tmp/cvs-serv1988/krusader/UserMenu
Modified Files:
usermenuaddimpl.h
Log Message:
user menu framework is finished (almost)
Index: usermenuaddimpl.h
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/krusader/UserMenu/usermenuaddimpl.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** usermenuaddimpl.h 27 Dec 2003 13:21:54 -0000 1.3
--- usermenuaddimpl.h 10 Jan 2004 01:02:29 -0000 1.4
***************
*** 40,44 ****
signals:
void newEntry(QString name, QString cmdline, UserMenuProc::ExecType execType, bool separateStderr,
! bool acceptURLs, bool acceptRemote, bool showEverywhere, QStringList showIn = 0);
private:
--- 40,44 ----
signals:
void newEntry(QString name, QString cmdline, UserMenuProc::ExecType execType, bool separateStderr,
! bool acceptURLs, bool showEverywhere, QStringList showIn = 0);
private:
|
|
From: <er...@us...> - 2004-01-10 01:02:21
|
Update of /cvsroot/krusader/krusader_kde3/krusader/UserMenu
In directory sc8-pr-cvs1:/tmp/cvs-serv1963/krusader/UserMenu
Modified Files:
usermenuaddimpl.cpp
Log Message:
user menu framework is finished (almost)
Index: usermenuaddimpl.cpp
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/krusader/UserMenu/usermenuaddimpl.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** usermenuaddimpl.cpp 3 Jan 2004 15:47:39 -0000 1.4
--- usermenuaddimpl.cpp 10 Jan 2004 01:02:17 -0000 1.5
***************
*** 63,68 ****
emit newEntry( cmdName->text().simplifyWhiteSpace(), cmdLine->text().simplifyWhiteSpace(),
! type, separateStderr->isChecked(), acceptLocalURLs->isChecked() || acceptRemote->isChecked(),
! acceptRemote->isChecked(), showEverywhere->isChecked(),
QStringList::split(';', showIn->text().simplifyWhiteSpace()));
}
--- 63,68 ----
emit newEntry( cmdName->text().simplifyWhiteSpace(), cmdLine->text().simplifyWhiteSpace(),
! type, separateStderr->isChecked(), acceptURLs->isChecked(),
! showEverywhere->isChecked(),
QStringList::split(';', showIn->text().simplifyWhiteSpace()));
}
|
|
From: <er...@us...> - 2004-01-10 01:02:10
|
Update of /cvsroot/krusader/krusader_kde3/krusader/UserMenu
In directory sc8-pr-cvs1:/tmp/cvs-serv1925/krusader/UserMenu
Modified Files:
usermenu.h
Log Message:
user menu framework is finished (almost)
Index: usermenu.h
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/krusader/UserMenu/usermenu.h,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** usermenu.h 3 Jan 2004 16:28:34 -0000 1.11
--- usermenu.h 10 Jan 2004 01:02:04 -0000 1.12
***************
*** 82,86 ****
protected slots:
void addEntry( QString name, QString cmdline, UserMenuProc::ExecType execType, bool separateStderr,
! bool acceptURLs, bool acceptRemote, bool showEverywhere, QStringList showIn = 0 );
void createMenu();
--- 82,86 ----
protected slots:
void addEntry( QString name, QString cmdline, UserMenuProc::ExecType execType, bool separateStderr,
! bool acceptURLs, bool showEverywhere, QStringList showIn = 0 );
void createMenu();
***************
*** 94,98 ****
// an expander is a function that receives a QString input, expands
// it and returns a new QString output containing the expanded expression
! typedef QString ( *EXPANDER ) ( const QString& );
// a UMCmd is an entry containing the expression and its expanding function
--- 94,98 ----
// an expander is a function that receives a QString input, expands
// it and returns a new QString output containing the expanded expression
! typedef QString ( *EXPANDER ) ( const QString&, const bool& );
// a UMCmd is an entry containing the expression and its expanding function
***************
*** 110,114 ****
bool separateStderr;
bool acceptURLs;
- bool acceptRemote;
bool showEverywhere;
QStringList showIn;
--- 110,113 ----
***************
*** 131,135 ****
* data from krusader. return the expanded string
*/
! static QString expand( QString str );
UserMenu( QWidget *parent = 0, const char *name = 0 );
--- 130,134 ----
* data from krusader. return the expanded string
*/
! static QString expand( QString str, bool useUrl );
UserMenu( QWidget *parent = 0, const char *name = 0 );
***************
*** 140,147 ****
protected:
! static QString exp_p( const QString& str );
! static QString exp_anf( const QString& str );
! static QString exp_and( const QString& str );
! static QString exp_an( const QString& str );
private:
--- 139,146 ----
protected:
! static QString exp_p( const QString& str, const bool& useUrl );
! static QString exp_anf( const QString& str, const bool& useUrl );
! static QString exp_and( const QString& str, const bool& useUrl );
! static QString exp_an( const QString& str, const bool& useUrl );
private:
|
|
From: <er...@us...> - 2004-01-10 01:01:57
|
Update of /cvsroot/krusader/krusader_kde3/krusader/UserMenu
In directory sc8-pr-cvs1:/tmp/cvs-serv1847/krusader/UserMenu
Modified Files:
usermenu.cpp
Log Message:
user menu framework is finished (almost)
Index: usermenu.cpp
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/krusader/UserMenu/usermenu.cpp,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** usermenu.cpp 10 Jan 2004 00:36:24 -0000 1.13
--- usermenu.cpp 10 Jan 2004 01:01:50 -0000 1.14
***************
*** 66,82 ****
#define GETPANEL (str.lower()[1]=='a' ? ACTIVE : OTHER)
! QString UserMenu::exp_p( const QString& str ) {
! return GETPANEL->func->files()->vfs_getOrigin().path();
}
! QString UserMenu::exp_anf( const QString& str ) {
return QString("%1").arg(GETPANEL->view->numFiles());
}
! QString UserMenu::exp_and( const QString& str ) {
return QString("%1").arg(GETPANEL->view->numDirs());
}
! QString UserMenu::exp_an( const QString& str ) {
return QString("%1").arg(GETPANEL->view->numDirs()+GETPANEL->view->numFiles());
}
--- 66,83 ----
#define GETPANEL (str.lower()[1]=='a' ? ACTIVE : OTHER)
! QString UserMenu::exp_p( const QString& str, const bool& useUrl ) {
! if (useUrl) return GETPANEL->func->files()->vfs_getOrigin().url();
! else return GETPANEL->func->files()->vfs_getOrigin().path();
}
! QString UserMenu::exp_anf( const QString& str, const bool& useUrl ) {
return QString("%1").arg(GETPANEL->view->numFiles());
}
! QString UserMenu::exp_and( const QString& str, const bool& useUrl ) {
return QString("%1").arg(GETPANEL->view->numDirs());
}
! QString UserMenu::exp_an( const QString& str, const bool& useUrl ) {
return QString("%1").arg(GETPANEL->view->numDirs()+GETPANEL->view->numFiles());
}
***************
*** 87,91 ****
// replace %% and prepare string
! cmd = expand( cmd.cmdline );
//kdWarning() << cmd << endl;
--- 88,92 ----
// replace %% and prepare string
! cmd = expand( cmd.cmdline, cmd.acceptURLs );
//kdWarning() << cmd << endl;
***************
*** 104,108 ****
}
! QString UserMenu::expand( QString str ) {
QString result = QString::null, exp = QString::null;
int beg, end, i;
--- 105,109 ----
}
! QString UserMenu::expand( QString str, bool useUrl ) {
QString result = QString::null, exp = QString::null;
int beg, end, i;
***************
*** 121,125 ****
for ( i = 0; i < numOfExps; ++i )
if ( str.mid( beg, end - beg + 1 ).replace( 1, 1, '_' ) == expressions[ i ].expression ) {
! result += ( expressions[ i ].expFunc ) ( exp );
break;
}
--- 122,126 ----
for ( i = 0; i < numOfExps; ++i )
if ( str.mid( beg, end - beg + 1 ).replace( 1, 1, '_' ) == expressions[ i ].expression ) {
! result += ( expressions[ i ].expFunc ) ( exp, useUrl );
break;
}
***************
*** 167,174 ****
eidx = data.find(',', sidx);
acceptURLs = data.mid(sidx, eidx-sidx).toInt();
- // acceptRemote
- sidx = eidx+1;
- eidx = data.find(',', sidx);
- acceptRemote = data.mid(sidx, eidx-sidx).toInt();
// showEverywhere
sidx = eidx+1;
--- 168,171 ----
***************
*** 190,195 ****
// create the 'add entry' gui
_addgui = new UserMenuAddImpl(menu, this);
! connect(_addgui, SIGNAL(newEntry(QString, QString, UserMenuProc::ExecType, bool, bool, bool, bool, QStringList )),
! this, SLOT(addEntry(QString, QString, UserMenuProc::ExecType, bool, bool, bool, bool, QStringList )));
}
--- 187,192 ----
// create the 'add entry' gui
_addgui = new UserMenuAddImpl(menu, this);
! connect(_addgui, SIGNAL(newEntry(QString, QString, UserMenuProc::ExecType, bool, bool, bool, QStringList )),
! this, SLOT(addEntry(QString, QString, UserMenuProc::ExecType, bool, bool, bool, QStringList )));
}
***************
*** 263,267 ****
void UserMenuGui::addEntry(QString name, QString cmdline, UserMenuProc::ExecType execType, bool separateStderr,
! bool acceptURLs, bool acceptRemote, bool showEverywhere, QStringList showIn) {
// save a new entry in the following form:
// {"name","cmdline",execType,separateStderr,acceptURLs,acceptRemote,showEverywhere,showIn}
--- 260,264 ----
void UserMenuGui::addEntry(QString name, QString cmdline, UserMenuProc::ExecType execType, bool separateStderr,
! bool acceptURLs, bool showEverywhere, QStringList showIn) {
// save a new entry in the following form:
// {"name","cmdline",execType,separateStderr,acceptURLs,acceptRemote,showEverywhere,showIn}
***************
*** 271,280 ****
if ( file.open( IO_WriteOnly | IO_Append ) ) {
QTextStream stream( &file );
! QString line = QString("{%1,%2,%3,%4,%5,%6,%7,%8}").arg(name)
.arg(cmdline)
.arg(execType)
.arg(separateStderr)
.arg(acceptURLs)
- .arg(acceptRemote)
.arg(showEverywhere)
.arg(showIn.join(";"));
--- 268,276 ----
if ( file.open( IO_WriteOnly | IO_Append ) ) {
QTextStream stream( &file );
! QString line = QString("{%1,%2,%3,%4,%5,%6,%7}").arg(name)
.arg(cmdline)
.arg(execType)
.arg(separateStderr)
.arg(acceptURLs)
.arg(showEverywhere)
.arg(showIn.join(";"));
|
|
From: <er...@us...> - 2004-01-10 00:36:28
|
Update of /cvsroot/krusader/krusader_kde3/krusader/UserMenu
In directory sc8-pr-cvs1:/tmp/cvs-serv29049/krusader/UserMenu
Modified Files:
usermenu.cpp
Log Message:
implemented the 'show only in...' feature
Index: usermenu.cpp
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/krusader/UserMenu/usermenu.cpp,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** usermenu.cpp 3 Jan 2004 16:28:18 -0000 1.12
--- usermenu.cpp 10 Jan 2004 00:36:24 -0000 1.13
***************
*** 22,29 ****
--- 22,31 ----
#include "../defaults.h"
#include "../Panel/listpanel.h"
+ #include "../Panel/panelfunc.h"
#include <kdebug.h>
#include <kstandarddirs.h>
#include <klocale.h>
#include <qvbox.h>
+ #include <kurl.h>
/**
***************
*** 65,69 ****
QString UserMenu::exp_p( const QString& str ) {
! return GETPANEL->virtualPath;
}
--- 67,71 ----
QString UserMenu::exp_p( const QString& str ) {
! return GETPANEL->func->files()->vfs_getOrigin().path();
}
***************
*** 227,230 ****
--- 229,253 ----
UserMenuEntry UserMenuGui::run() {
+ // disable the entries that should not appear in this folder
+ for (uint i=1; i<count(); ++i) {
+ if (_entries[i-1].showEverywhere)
+ setItemVisible(i, true); // enable the item, it is displayed everywhere
+ else { // see if the current path is in the listpanel
+ bool showHere = false;
+ QString currentPath = ACTIVE->func->files()->vfs_getOrigin().path();
+ for ( QStringList::Iterator it = _entries[i-1].showIn.begin();
+ it != _entries[i-1].showIn.end();
+ ++it ) {
+ // is the folder == current path? (don't forget to remove trailing /s
+ if (currentPath == ((*it).right(1)=="/" ? (*it).left((*it).length()-1) : (*it))) {
+ showHere = true;
+ break;
+ }
+ }
+ setItemVisible(i, showHere);
+ }
+ }
+
+
int idx = exec();
if ( idx == -1 ) return QString::null; // nothing was selected
***************
*** 234,240 ****
}
! // idx is {1..n} while _entries is {0..n-1}X2
! // so, normalize idx to _entries, and add 1 since we want
! // the command part of the {description,command} pair
return _entries[idx-1];
}
--- 257,262 ----
}
! // don't forget: index 0 is reserved for the 'add entry' command. that's why
! // the entries is 0..n-1 and actual menu is 1..n
return _entries[idx-1];
}
|
|
From: <er...@us...> - 2004-01-10 00:03:27
|
Update of /cvsroot/krusader/krusader_kde3/krusader/Panel
In directory sc8-pr-cvs1:/tmp/cvs-serv23613/krusader/Panel
Modified Files:
listpanel.cpp listpanel.h
Log Message:
add: directory history module
Index: listpanel.cpp
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/krusader/Panel/listpanel.cpp,v
retrieving revision 1.50
retrieving revision 1.51
diff -C2 -d -r1.50 -r1.51
*** listpanel.cpp 4 Jan 2004 16:39:01 -0000 1.50
--- listpanel.cpp 10 Jan 2004 00:03:24 -0000 1.51
***************
*** 80,83 ****
--- 80,85 ----
#include "krdetailedview.h"
#include "krpreviewpopup.h"
+ #include "../GUI/dirhistorybutton.h"
+ #include "../GUI/dirhistoryqueue.h"
typedef QValueList<KServiceOffer> OfferList;
***************
*** 91,95 ****
func = new ListPanelFunc( this );
setAcceptDrops( true );
! layout = new QGridLayout( this, 3, 2 );
status = new KrSqueezedTextLabel( this );
--- 93,97 ----
func = new ListPanelFunc( this );
setAcceptDrops( true );
! layout = new QGridLayout( this, 3, 3 );
status = new KrSqueezedTextLabel( this );
***************
*** 108,111 ****
--- 110,119 ----
connect( status, SIGNAL( clicked() ), this, SLOT( slotFocusOnMe() ) );
+ // ... create the history button
+ dirHistoryQueue = new DirHistoryQueue(this);
+ historyButton = new DirHistoryButton(dirHistoryQueue, this, "historyButton");
+ connect(historyButton, SIGNAL( pressed() ), this, SLOT( slotFocusOnMe() ) );
+ connect(historyButton, SIGNAL(openUrl(const KURL&)), func, SLOT( openUrl( const KURL& ) ) );
+
// ... create the bookmark list
bookmarksButton = new BookmarksButton( this );
***************
*** 164,174 ****
// finish the layout
! layout->addMultiCellWidget( origin, 0, 0, 0, 1 );
layout->addWidget( status, 1, 0 );
! layout->addWidget( bookmarksButton, 1, 1 );
! layout->addMultiCellWidget( dynamic_cast<KrDetailedView*>( view ) ->widget(), 2, 2, 0, 1 );
! layout->addMultiCellWidget( quickSearch, 3, 3, 0, 1 );
quickSearch->hide();
! layout->addMultiCellWidget( totals, 4, 4, 0, 1 );
//filter = ALL;
--- 172,183 ----
// finish the layout
! layout->addMultiCellWidget( origin, 0, 0, 0, 2 );
layout->addWidget( status, 1, 0 );
! layout->addWidget(historyButton, 1, 1);
! layout->addWidget( bookmarksButton, 1, 2 );
! layout->addMultiCellWidget( dynamic_cast<KrDetailedView*>( view ) ->widget(), 2, 2, 0, 2 );
! layout->addMultiCellWidget( quickSearch, 3, 3, 0, 2 );
quickSearch->hide();
! layout->addMultiCellWidget( totals, 4, 4, 0, 2 );
//filter = ALL;
Index: listpanel.h
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/krusader/Panel/listpanel.h,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** listpanel.h 25 Dec 2003 23:55:35 -0000 1.14
--- listpanel.h 10 Jan 2004 00:03:24 -0000 1.15
***************
*** 64,67 ****
--- 64,69 ----
class BookmarksButton;
class KrQuickSearch;
+ class DirHistoryButton;
+ class DirHistoryQueue;
class ListPanel : public QWidget {
***************
*** 127,130 ****
--- 129,134 ----
QGridLayout *layout;
BookmarksButton *bookmarksButton;
+ DirHistoryQueue* dirHistoryQueue;
+ DirHistoryButton* historyButton;
private:
|
|
From: <er...@us...> - 2004-01-10 00:03:27
|
Update of /cvsroot/krusader/krusader_kde3/krusader
In directory sc8-pr-cvs1:/tmp/cvs-serv23613/krusader
Modified Files:
Makefile.am krslots.h krusader.cpp
Log Message:
add: directory history module
Index: Makefile.am
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/krusader/Makefile.am,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** Makefile.am 3 Jan 2004 13:38:08 -0000 1.13
--- Makefile.am 10 Jan 2004 00:03:24 -0000 1.14
***************
*** 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
--- 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 GUI/libGUI.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
Index: krslots.h
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/krusader/krslots.h,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** krslots.h 12 Dec 2003 21:35:13 -0000 1.20
--- krslots.h 10 Jan 2004 00:03:24 -0000 1.21
***************
*** 41,44 ****
--- 41,45 ----
#include "BookMan/bookmarksbutton.h"
#include "GUI/kcmdline.h"
+ #include "GUI/dirhistorybutton.h"
class ListPanel;
***************
*** 107,110 ****
--- 108,113 ----
void openRightBookmarks() { krApp->mainView->right->bookmarksButton->openPopup(); }
void openLeftBookmarks() { krApp->mainView->left->bookmarksButton->openPopup(); }
+ void openLeftHistory() { krApp->mainView->left->historyButton->openPopup(); }
+ void openRightHistory() { krApp->mainView->right->historyButton->openPopup(); }
void cmdlinePopup() { krApp->mainView->cmdLine->popup(); }
void duplicateTab();
Index: krusader.cpp
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/krusader/krusader.cpp,v
retrieving revision 1.53
retrieving revision 1.54
diff -C2 -d -r1.53 -r1.54
*** krusader.cpp 8 Jan 2004 18:20:08 -0000 1.53
--- krusader.cpp 10 Jan 2004 00:03:24 -0000 1.54
***************
*** 450,453 ****
--- 450,457 ----
new KAction( i18n( "Left bookmarks" ), ALT+Key_Left,
SLOTS, SLOT( openLeftBookmarks() ), actionCollection(), "left bookmarks" );
+ new KAction(i18n("History"), ALT+CTRL+Key_Left,
+ SLOTS, SLOT(openLeftHistory()), actionCollection(), "left history");
+ new KAction(i18n("History"), ALT+CTRL+Key_Right,
+ SLOTS, SLOT(openRightHistory()), actionCollection(), "right history");
actNewTab = new KAction(i18n("New tab"), ALT+CTRL+Key_N, SLOTS,
SLOT(newTab()), actionCollection(), "new tab");
|
|
From: <er...@us...> - 2004-01-10 00:03:27
|
Update of /cvsroot/krusader/krusader_kde3
In directory sc8-pr-cvs1:/tmp/cvs-serv23613
Modified Files:
ChangeLog krusader.kdevprj
Log Message:
add: directory history module
Index: ChangeLog
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/ChangeLog,v
retrieving revision 1.162
retrieving revision 1.163
diff -C2 -d -r1.162 -r1.163
*** ChangeLog 9 Jan 2004 14:12:23 -0000 1.162
--- ChangeLog 10 Jan 2004 00:03:24 -0000 1.163
***************
*** 1,2 ****
--- 1,3 ----
+ ADDED: a folder-history button, a-la-total commander. thanks to Hans Loffler!
ADDED: selectall at rename
ADDED: a paritialy working user menu (try alt+~)
***************
*** 4,7 ****
--- 5,9 ----
ADDED: directory synchronizer
ADDED: file splitter
+ ADDED: a missing credit for Frank in the about box
FIXED: freeze at modal dialogs and icon tray
FIXED: crash at rename if the directory is refreshed by the watcher
Index: krusader.kdevprj
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/krusader.kdevprj,v
retrieving revision 1.46
retrieving revision 1.47
diff -C2 -d -r1.46 -r1.47
*** krusader.kdevprj 3 Jan 2004 13:36:24 -0000 1.46
--- krusader.kdevprj 10 Jan 2004 00:03:24 -0000 1.47
***************
*** 23,31 ****
cppflags=-DKDE_NO_COMPAT -D_LARGEFILE64_SOURCE
cxxflags=\s-O0 -Wall
! ldadd=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)
! ldflags=\s \s
[General]
! AMChanged=true
author=Shie Erlich & Rafi Yanai
configure_args=\s--build=i386-linux --host=i386-linux --target=i386-linux --prefix=/usr\s
--- 23,31 ----
cppflags=-DKDE_NO_COMPAT -D_LARGEFILE64_SOURCE
cxxflags=\s-O0 -Wall
! ldadd=UserMenu/libUserMenu.a VFS/libVFS.a KViewer/libKViewer.a Dialogs/libDialogs.a BookMan/libBookMan.a GUI/libGUI.a $(LIB_KPARTS) $(LIB_KFILE) $(LIB_KHTML) $(LIB_KDEUI) $(LIB_KDECORE) $(LIB_QT)
! ldflags=\s \s
[General]
! AMChanged=false
author=Shie Erlich & Rafi Yanai
configure_args=\s--build=i386-linux --host=i386-linux --target=i386-linux --prefix=/usr\s
***************
*** 516,524 ****
[krusader/GUI/Makefile.am]
! files=krusader/GUI/kcmdline.cpp,krusader/GUI/kcmdline.h,krusader/GUI/kfnkeys.cpp,krusader/GUI/kfnkeys.h,krusader/GUI/krusaderstatus.cpp,krusader/GUI/krusaderstatus.h
sharedlib_LDFLAGS=-version-info 0:0:0
sharedlib_rootname=GUI
sub_dirs=
type=static_library
[krusader/GUI/kcmdline.cpp]
--- 516,548 ----
[krusader/GUI/Makefile.am]
! files=krusader/GUI/kcmdline.cpp,krusader/GUI/kcmdline.h,krusader/GUI/kfnkeys.cpp,krusader/GUI/kfnkeys.h,krusader/GUI/krusaderstatus.cpp,krusader/GUI/krusaderstatus.h,krusader/GUI/dirhistorybutton.cpp,krusader/GUI/dirhistorybutton.h,krusader/GUI/dirhistoryqueue.cpp,krusader/GUI/dirhistoryqueue.h
sharedlib_LDFLAGS=-version-info 0:0:0
sharedlib_rootname=GUI
sub_dirs=
type=static_library
+
+ [krusader/GUI/dirhistorybutton.cpp]
+ dist=true
+ install=false
+ install_location=
+ type=SOURCE
+
+ [krusader/GUI/dirhistorybutton.h]
+ dist=true
+ install=false
+ install_location=
+ type=HEADER
+
+ [krusader/GUI/dirhistoryqueue.cpp]
+ dist=true
+ install=false
+ install_location=
+ type=SOURCE
+
+ [krusader/GUI/dirhistoryqueue.h]
+ dist=true
+ install=false
+ install_location=
+ type=HEADER
[krusader/GUI/kcmdline.cpp]
|
Update of /cvsroot/krusader/krusader_kde3/krusader/GUI
In directory sc8-pr-cvs1:/tmp/cvs-serv23430/krusader/GUI
Modified Files:
Makefile.am
Added Files:
dirhistorybutton.cpp dirhistorybutton.h dirhistoryqueue.cpp
dirhistoryqueue.h
Log Message:
add: directory history module
--- NEW FILE: dirhistorybutton.cpp ---
/***************************************************************************
dirhistorybutton.cpp - description
-------------------
begin : Sun Jan 4 2004
copyright : (C) 2004 by Shie Erlich & Rafi Yanai
email :
***************************************************************************/
/***************************************************************************
* *
* This program is free software; you can redistribute it and/or modify *
* it under the terms of the GNU General Public License as published by *
* the Free Software Foundation; either version 2 of the License, or *
* (at your option) any later version. *
* *
***************************************************************************/
#include "dirhistorybutton.h"
#include "dirhistoryqueue.h"
#include "../VFS/vfs.h"
#include <qpopupmenu.h>
#include <klocale.h>
#include <kiconloader.h>
#include <kdebug.h>
DirHistoryButton::DirHistoryButton(DirHistoryQueue* hQ, QWidget *parent, const char *name) : QToolButton(parent,name)
{
KIconLoader *iconLoader = new KIconLoader();
QPixmap icon = iconLoader->loadIcon("history", KIcon::Toolbar, 16);
setFixedSize(icon.width() + 4, icon.height() + 4);
setPixmap(icon);
setTextLabel(i18n("Open the directory history list"), true);
setPopupDelay(10); // 0.01 seconds press
setAcceptDrops(false);
popupMenu = new QPopupMenu(this);
Q_CHECK_PTR(popupMenu);
// popupMenu->insertItem("Test", this, SLOT(slotPopup()));
// popupMenu->insertItem("Test2", this, SLOT(slotPopup()));
setPopup(popupMenu);
historyQueue = hQ;
connect(popupMenu, SIGNAL(aboutToShow()), this, SLOT(slotAboutToShow()));
connect(popupMenu, SIGNAL(activated(int)), this, SLOT(slotPopupActivated(int)));
}
DirHistoryButton::~DirHistoryButton(){
}
void DirHistoryButton::openPopup()
{
QPopupMenu* pP = popup();
if (pP)
{
popup()->exec(mapToGlobal(QPoint(0, height())));
}
kdDebug() << "History popup" << endl;
}
/** No descriptions */
void DirHistoryButton::slotPopup(){
kdDebug() << "History slot" << endl;
}
/** No descriptions */
void DirHistoryButton::slotAboutToShow(){
kdDebug() << "about to show" << endl;
popupMenu->clear();
QStringList::iterator it;
int id = 0;
for (it=historyQueue->pathQueue.begin(); it!=historyQueue->pathQueue.end(); ++it)
{
// popupMenu->insertItem(*it, this, SLOT(slotPopup()), 0, id++);
popupMenu->insertItem(*it, id++);
}
}
/** No descriptions */
void DirHistoryButton::slotPopupActivated(int id){
kdDebug() << "popup activated" << endl;
KURL url(historyQueue->pathQueue[id]);
emit openUrl( vfs::fromPathOrURL( url.prettyURL() ) );
// emit openUrl(historyQueue->pathQueue[id]);
}
--- NEW FILE: dirhistorybutton.h ---
/***************************************************************************
dirhistorybutton.h - description
-------------------
begin : Sun Jan 4 2004
copyright : (C) 2004 by Shie Erlich & Rafi Yanai
email :
***************************************************************************/
/***************************************************************************
* *
* This program is free software; you can redistribute it and/or modify *
* it under the terms of the GNU General Public License as published by *
* the Free Software Foundation; either version 2 of the License, or *
* (at your option) any later version. *
* *
***************************************************************************/
#ifndef DIRHISTORYBUTTON_H
#define DIRHISTORYBUTTON_H
#include <qwidget.h>
#include <qtoolbutton.h>
#include <kurl.h>
class QPopupMenu;
class DirHistoryQueue;
/**
*@author Shie Erlich & Rafi Yanai
*/
class DirHistoryButton : public QToolButton {
Q_OBJECT
public:
DirHistoryButton(DirHistoryQueue* hQ, QWidget *parent=0, const char *name=0);
~DirHistoryButton();
void openPopup();
private:
QPopupMenu* popupMenu;
DirHistoryQueue* historyQueue;
public slots: // Public slots
/** No descriptions */
void slotPopup();
/** No descriptions */
void slotAboutToShow();
/** No descriptions */
void slotPopupActivated(int id);
signals: // Signals
/** No descriptions */
void openUrl(const KURL&);
};
#endif
--- NEW FILE: dirhistoryqueue.cpp ---
/***************************************************************************
dirhistoryqueue.cpp - description
-------------------
begin : Thu Jan 1 2004
copyright : (C) 2004 by Shie Erlich & Rafi Yanai
email :
***************************************************************************/
/***************************************************************************
* *
* This program is free software; you can redistribute it and/or modify *
* it under the terms of the GNU General Public License as published by *
* the Free Software Foundation; either version 2 of the License, or *
* (at your option) any later version. *
* *
***************************************************************************/
#include "dirhistoryqueue.h"
#include "../Panel/listpanel.h"
#include <kdebug.h>
DirHistoryQueue::DirHistoryQueue(ListPanel* p){
panel = p;
connect(panel, SIGNAL(pathChanged(ListPanel*)), this, SLOT(slotPathChanged(ListPanel*)));
}
DirHistoryQueue::~DirHistoryQueue(){
}
/** No descriptions */
void DirHistoryQueue::slotPathChanged(ListPanel* p){
int dummy = 1;
AddPath(p->getPath());
}
void DirHistoryQueue::AddPath(const QString& path)
{
if (pathQueue.findIndex(path) == -1)
{
if (pathQueue.size() > 12)
{
pathQueue.pop_front();
}
// DumpQueue();
}
else
{
pathQueue.remove(path);
}
// prevent non file paths from occuring in the list: prevent
// infinite loop when calling such a path from the history menu
KURL url(path);
if (url.protocol() == "file")
{
pathQueue.push_front(path);
}
}
void DirHistoryQueue::DumpQueue()
{
QStringList::iterator it;
kdDebug() << "path: " << endl;
for (it=pathQueue.begin(); it!=pathQueue.end(); ++it)
{
kdDebug() << *it << endl;
}
}
--- NEW FILE: dirhistoryqueue.h ---
/***************************************************************************
dirhistoryqueue.h - description
-------------------
begin : Thu Jan 1 2004
copyright : (C) 2004 by Shie Erlich & Rafi Yanai
email :
***************************************************************************/
/***************************************************************************
* *
* This program is free software; you can redistribute it and/or modify *
* it under the terms of the GNU General Public License as published by *
* the Free Software Foundation; either version 2 of the License, or *
* (at your option) any later version. *
* *
***************************************************************************/
#ifndef DIRHISTORYQUEUE_H
#define DIRHISTORYQUEUE_H
#include <qobject.h>
#include <qstringlist.h>
class ListPanel;
/**
*@author Shie Erlich & Rafi Yanai
*/
class DirHistoryQueue : public QObject {
Q_OBJECT
public:
DirHistoryQueue(ListPanel* p);
~DirHistoryQueue();
QStringList pathQueue;
private:
void AddPath(const QString& path);
void DumpQueue();
ListPanel* panel;
public slots: // Public slots
/** No descriptions */
void slotPathChanged(ListPanel* p);
};
#endif
Index: Makefile.am
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/krusader/GUI/Makefile.am,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** Makefile.am 12 Jun 2003 22:41:36 -0000 1.3
--- Makefile.am 10 Jan 2004 00:02:07 -0000 1.4
***************
*** 6,13 ****
libGUI_a_METASOURCES = AUTO
! libGUI_a_SOURCES = krusaderstatus.cpp kfnkeys.cpp kcmdline.cpp
! EXTRA_DIST = kcmdline.cpp kcmdline.h kfnkeys.cpp kfnkeys.h krusaderstatus.cpp krusaderstatus.h
####### kdevelop will overwrite this part!!! (end)############
--- 6,13 ----
libGUI_a_METASOURCES = AUTO
! libGUI_a_SOURCES = dirhistoryqueue.cpp dirhistorybutton.cpp krusaderstatus.cpp kfnkeys.cpp kcmdline.cpp
! EXTRA_DIST = kcmdline.cpp kcmdline.h kfnkeys.cpp kfnkeys.h krusaderstatus.cpp krusaderstatus.h dirhistorybutton.cpp dirhistorybutton.h dirhistoryqueue.cpp dirhistoryqueue.h
####### kdevelop will overwrite this part!!! (end)############
|
|
From: <er...@us...> - 2004-01-09 22:03:56
|
Update of /cvsroot/krusader/krusader_kde3/krusader
In directory sc8-pr-cvs1:/tmp/cvs-serv31534/krusader
Modified Files:
main.cpp
Log Message:
a missing credit for frank
Index: main.cpp
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/krusader/main.cpp,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** main.cpp 29 Sep 2003 17:18:16 -0000 1.20
--- main.cpp 9 Jan 2004 22:03:53 -0000 1.21
***************
*** 63,69 ****
aboutData.addAuthor("Shie Erlich","Author", "ma...@us...");
aboutData.addAuthor("Dirk Eschler", "Webmaster and i18n coordinator", "hom...@gm...", 0);
- aboutData.addAuthor("Jan Halasa", "Developer", "xh...@fi...", 0);
aboutData.addAuthor("Karai Csaba", "Developer", "ck...@us...", 0);
aboutData.addCredit("Heiner Eichmann","The 6th Beatle: FreeBSD port, patches and general help", "h.e...@gm...", 0);
aboutData.addCredit("Mikolaj Machowski", "Usability and QA", "<mi...@wp...>", 0);
aboutData.addCredit("Cristi Dumitrescu","QA, bug-hunting, patches and general help","cr...@ch...",0);
--- 63,70 ----
aboutData.addAuthor("Shie Erlich","Author", "ma...@us...");
aboutData.addAuthor("Dirk Eschler", "Webmaster and i18n coordinator", "hom...@gm...", 0);
aboutData.addAuthor("Karai Csaba", "Developer", "ck...@us...", 0);
+ aboutData.addAuthor("Frank Schoolmeesters", "Documentation Manager", "fra...@fa...", 0);
aboutData.addCredit("Heiner Eichmann","The 6th Beatle: FreeBSD port, patches and general help", "h.e...@gm...", 0);
+ aboutData.addCredit("Jan Halasa", "Bookmark Module", "xh...@fi...", 0);
aboutData.addCredit("Mikolaj Machowski", "Usability and QA", "<mi...@wp...>", 0);
aboutData.addCredit("Cristi Dumitrescu","QA, bug-hunting, patches and general help","cr...@ch...",0);
|
|
From: <des...@us...> - 2004-01-09 14:12:26
|
Update of /cvsroot/krusader/krusader_kde3/po In directory sc8-pr-cvs1:/tmp/cvs-serv32700/po Modified Files: ja.po Log Message: Index: ja.po =================================================================== RCS file: /cvsroot/krusader/krusader_kde3/po/ja.po,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** ja.po 5 Jul 2003 16:31:39 -0000 1.1 --- ja.po 9 Jan 2004 14:12:22 -0000 1.2 *************** *** 1,11 **** - # translation of krusader-0529-ja.po to # translation of krusader-ja.po to Japanese ! # UTUMI Hirosi <ut...@mx...>, 2003 msgid "" msgstr "" "Project-Id-Version: krusader-ja\n" ! "POT-Creation-Date: 2003-05-28 01:53+0300\n" ! "PO-Revision-Date: 2003-05-29 14:28+0900\n" ! "Last-Translator: UTUMI Hirosi <ut...@mx...>\n" "Language-Team: Japanese <ja...@li...>\n" [...3305 lines suppressed...] + + #~ msgid "Move into archive" + #~ msgstr "æ¸åº«å ã«ç§»å" + #~ msgid "" #~ " is not empty !\n" *************** *** 2497,2507 **** #~ msgid "&Tree Panel" #~ msgstr "ããªã¼ããã«(&T)" - - #~ msgid "" - #~ "A directory or a file with this name\n" - #~ "already exists." - #~ msgstr "" - #~ "ãã®ååã®ãã£ã¬ã¯ããª/ãã¡ã¤ã«ã¯\n" - #~ "æ¢ã«åå¨ãã¦ãã¾ã" #~ msgid "" --- 2699,2702 ---- |
7 messages has been excluded from this view by a project administrator.
