summaryrefslogtreecommitdiff
authorllornkcor <llornkcor>2002-04-24 03:22:24 (UTC)
committer llornkcor <llornkcor>2002-04-24 03:22:24 (UTC)
commit219994e9d1de70b44c994ccee57060741f22d428 (patch) (side-by-side diff)
tree2acfcae2a6bfc432266ee1d0cb76285a95fe683f
parentc9159a3d5192799f5b2911d13337f04f50b1ac5a (diff)
downloadopie-219994e9d1de70b44c994ccee57060741f22d428.zip
opie-219994e9d1de70b44c994ccee57060741f22d428.tar.gz
opie-219994e9d1de70b44c994ccee57060741f22d428.tar.bz2
fixed location combo showing redundant directories and multiple seperators
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--libopie/ofileselector.cc123
-rw-r--r--libopie/ofileselector.h15
2 files changed, 111 insertions, 27 deletions
diff --git a/libopie/ofileselector.cc b/libopie/ofileselector.cc
index cb18039..d1f1e1f 100644
--- a/libopie/ofileselector.cc
+++ b/libopie/ofileselector.cc
@@ -39,12 +39,14 @@
#include <qheader.h>
#include <qdir.h>
#include <qpainter.h>
#include <qaction.h>
#include <qpopupmenu.h>
#include <qcursor.h>
+#include <qstringlist.h>
+#include <qmessagebox.h>
#include <qpe/qpeapplication.h>
#include <qpe/fileselector.h>
#include <qpe/applnk.h>
#include <qpe/global.h>
#include <qpe/mimetype.h>
@@ -131,12 +133,13 @@ OFileSelector::OFileSelector(QWidget *wid, int mode, int selector, const QString
initPics();
m_lay = new QVBoxLayout(this);
init();
m_edit->setText( fileName );
}
+
void OFileSelector::initPics()
{
qWarning("init pics" );
m_pixmaps = new QMap<QString,QPixmap>;
QPixmap pm = Resource::loadPixmap( "folder" );
QPixmap lnk = Resource::loadPixmap( "opie/symlink" );
@@ -148,13 +151,14 @@ void OFileSelector::initPics()
QPixmap pm2 = Resource::loadPixmap( "lockedfolder" );
QPainter pen(&pm2 );
pen.drawPixmap(pm2.width()-lnk.width(), pm2.height()-lnk.height(), lnk );
pm2.setMask( pm2.createHeuristicMask( FALSE ) );
m_pixmaps->insert("symlinkedlocked", pm2 );
-};
+}
+
// let's initialize the gui
/**
--------------------
| cmbBox Button |
--------------------
| FileSlector |
@@ -176,12 +180,13 @@ void OFileSelector::delItems()
{
QLayoutIterator it = m_lay->iterator();
while ( it.current() != 0 ){
it.deleteCurrent();
}
}
+
void OFileSelector::init()
{
m_stack = new QWidgetStack(this, "wstack" );
if( m_selector == NORMAL ){
QString currMime;
@@ -213,13 +218,13 @@ void OFileSelector::init()
initializeChooser();
if(m_shYesNo )
initializeYes();
-};
+}
void OFileSelector::setYesCancelVisible( bool show )
{
if ( show == m_shYesNo )
return;
m_shYesNo = show;
@@ -258,12 +263,13 @@ void OFileSelector::setPermissionBarVisible( bool show )
return;
m_shPerm = show;
updateLay();
}
+
void OFileSelector::setLineEditVisible( bool show )
{
if( show == m_shLne )
return;
m_shLne = show;
@@ -273,12 +279,13 @@ void OFileSelector::setLineEditVisible( bool show )
m_edit = 0;
m_fnLabel = 0;
//delete m_boxName; will be deleted
}
updateLay();
}
+
void OFileSelector::setChooserVisible( bool show )
{
if( show = m_shChooser )
return;
m_shChooser = show;
if( !show ){
@@ -286,43 +293,50 @@ void OFileSelector::setChooserVisible( bool show )
delete m_viewCheck;
m_mimeCheck = 0;
m_viewCheck = 0;
}
updateLay();
}
+
QCheckBox* OFileSelector::permissionCheckbox( )
{
return m_checkPerm;
}
+
void OFileSelector::setCaseSensetive( bool caSe )
{
m_case = caSe;
reparse();
}
+
void OFileSelector::setShowFiles(bool files ){
m_files = files;
reparse();
}
+
void OFileSelector::setPopupMenu(QPopupMenu *pop )
{
//delete oldpopup;
m_custom = pop;
}
+
bool OFileSelector::setPermission( ) const
{
if( m_checkPerm == 0 )
return false;
else
return m_checkPerm->isChecked();
}
+
void OFileSelector::setPermissionChecked( bool check )
{
if( m_checkPerm == 0 )
return;
m_checkPerm->setChecked( check );
}
+
QString OFileSelector::selectedName( )const
{
QString string;
if( m_selector == NORMAL ){
const DocLnk *lnk = m_select->selected();
string = lnk->file();
@@ -331,17 +345,19 @@ QString OFileSelector::selectedName( )const
if(item != 0 ){
string = m_currentDir + "/" + item->text( 1 );
}
}
return string;
}
+
QStringList OFileSelector::selectedNames()const
{
QStringList list;
return list;
}
+
DocLnk OFileSelector::selectedDocument( )const
{
DocLnk lnk;
return lnk;
}
void OFileSelector::updateLay()
@@ -382,12 +398,13 @@ void OFileSelector::updateLay()
init();
if( m_shLne )
m_edit->setText(text );
if( m_shPerm )
m_checkPerm->setChecked(check );
}
+
// let's update the mimetypes. Use the current mimefilter for the 2nd QDir retrieve
// insert QListViewItems with the right options
bool OFileSelector::compliesMime(const QString &path, const QString &mime )
{
if( mime == "All" )
return true;
@@ -429,12 +446,13 @@ void OFileSelector::reparse()
}
m_mimetypes.prepend("All" );
m_mimeCheck->insertStringList(m_mimetypes );
// set it to the current mimetype
m_mimeCheck->setCurrentItem( indexByString( m_mimeCheck, currMime ) );
};
+
QDir dir( m_currentDir );
//dir.setFilter(-1 );
int sort = QDir::Name | QDir::DirsFirst | QDir::Reversed;
if( m_case )
sort = QDir::IgnoreCase;
dir.setSorting( sort );
@@ -494,24 +512,29 @@ void OFileSelector::reparse()
addFile(currMime, fi );
}
++it;
}
m_View->sort();
}
+
QString OFileSelector::directory()const
{
- return m_currentDir;
+ QDir d( m_currentDir);
+ return d.absPath();
}
+
int OFileSelector::fileCount()
{
return 0;
}
+
void OFileSelector::slotOk( )
{
emit ok();
}
+
void OFileSelector::slotCancel( )
{
emit cancel();
}
void OFileSelector::initializeName()
@@ -523,12 +546,13 @@ void OFileSelector::initializeName()
m_boxName->addWidget(m_fnLabel );
m_boxName->insertSpacing(1, 8 );
m_boxName->addWidget(m_edit, 100 );
m_lay->addLayout(m_boxName);
}
+
void OFileSelector::initializeYes()
{
m_ok = new QPushButton("&Save", this, "save" );
m_cancel = new QPushButton("C&ancel", this, "cancel" );
m_boxOk = new QHBoxLayout(this );
m_boxOk->addWidget( m_ok, Qt::AlignHCenter );
@@ -538,12 +562,13 @@ void OFileSelector::initializeYes()
connect(m_ok, SIGNAL(clicked() ),
this, SLOT(slotOk() ) );
connect(m_cancel, SIGNAL(clicked() ),
this, SLOT(slotCancel() ) );
}
+
void OFileSelector::initializeChooser()
{
m_boxView = new QHBoxLayout(this );
m_mimeCheck = new QComboBox(this, "mime check");
m_viewCheck = new QComboBox(this, "view check");
@@ -567,12 +592,13 @@ void OFileSelector::initializeChooser()
connect( m_viewCheck, SIGNAL(activated(const QString &) ),
this, SLOT(slotViewCheck(const QString & ) ) );
connect( m_mimeCheck, SIGNAL(activated(const QString &) ),
this, SLOT(slotMimeCheck(const QString & ) ) );
}
+
void OFileSelector::slotMimeCheck(const QString &view ){
if(m_selector == NORMAL ){
delete m_select;
m_select = new FileSelector(view == "All" ? QString::null : view
, m_stack, "fileselector", FALSE, FALSE );
m_stack->addWidget( m_select, NORMAL );
@@ -642,13 +668,13 @@ void OFileSelector::slotViewCheck(const QString &view ){
m_View = 0;
m_selector = EXTENDED_ALL;
initializeListView();
reparse();
};
-};
+}
void OFileSelector::updateMimes() // lets check which mode is active
// check the current dir for items then
{
m_mimetypes.clear();
@@ -662,13 +688,14 @@ void OFileSelector::updateMimes() // lets check which mode is active
m_mimetypes.append( (*dit)->type() );
}
}else{
// should be allreday updatet
;
}
-};
+}
+
void OFileSelector::initializeListView()
{
// just to make sure but clean it up better FIXME
delete m_View;
m_View = 0;
delete m_boxToolbar;
@@ -690,12 +717,13 @@ void OFileSelector::initializeListView()
m_pseudo = new QWidget(m_stack, "Pseudo Widget");
m_pseudoLayout = new QVBoxLayout(m_pseudo );
if(m_shTool ){
m_boxToolbar = new QHBoxLayout( );
m_boxToolbar->setAutoAdd( true );
m_location = new QComboBox(m_pseudo );
+ connect( m_location, SIGNAL(activated(const QString &) ), this, SLOT( locationComboActivated(const QString & ) ) );
m_up = new QPushButton(Resource::loadIconSet("up"),"", m_pseudo,"cdUpButton");
m_up->setFixedSize( QSize( 20, 20 ) );
connect(m_up ,SIGNAL(clicked()),this,SLOT(cdUP() ) );
m_up->setFlat(TRUE);
@@ -802,12 +830,13 @@ void OFileSelector::addFile(const QString &mime, QFileInfo *info, bool symlink )
}
new OFileSelectorItem( m_View, pix, name,
info->lastModified().toString(),
QString::number( info->size() ),
dir, locked );
}
+
void OFileSelector::addDir(const QString &mime, QFileInfo *info, bool symlink )
{
if(!m_dir )
return;
//if( showDirs )
{
@@ -839,12 +868,13 @@ void OFileSelector::addDir(const QString &mime, QFileInfo *info, bool symlink )
new OFileSelectorItem(m_View, pix,
name, info->lastModified().toString(),
QString::number(info->size() ),info->dirPath(true), locked, true );
}
}
+
void OFileSelector::setShowDirs(bool dir )
{
m_dir = dir;
reparse();
}
@@ -853,22 +883,25 @@ void OFileSelector::slotFileSelected(const QString &string )
if(m_shLne )
m_edit->setText( string );
emit fileSelected( string );
// do AppLnk stuff
}
+
void OFileSelector::slotFileBridgeSelected( const DocLnk &lnk )
{
slotFileSelected(lnk.name() );
emit fileSelected( lnk );
}
+
void OFileSelector::slotSelectionChanged() // get the current items
// fixme
{
qWarning("selection changed" );
}
+
void OFileSelector::slotCurrentChanged(QListViewItem *item )
{
qWarning("current changed" );
if( item == 0 )
return;
@@ -882,12 +915,13 @@ void OFileSelector::slotCurrentChanged(QListViewItem *item )
}
}
}else {
qWarning("mode not extended" );
}
}
+
// either select or change dir
void OFileSelector::slotClicked( int button, QListViewItem *item, const QPoint &point, int )
{
if( item == 0 )
return;
@@ -898,35 +932,37 @@ void OFileSelector::slotClicked( int button, QListViewItem *item, const QPoint &
if(m_selector == EXTENDED || m_selector == EXTENDED_ALL ){
qWarning("inside" );
OFileSelectorItem *sel = (OFileSelectorItem*)item;
if(!sel->isLocked() ){ // not locked either changedir or open
QStringList str = QStringList::split("->", sel->text(1) );
if(sel->isDir() ){
- cd( sel->directory() + "/" + str[0] );
- }else{
- qWarning("file" );
- if(m_shLne )
- m_edit->setText(str[0] );
- emit fileSelected(str[0] );
- // emit DocLnk need to do it
+ cd( sel->directory() + "/" + str[0] );
+ } else {
+ qWarning("file" );
+ if(m_shLne )
+ m_edit->setText(str[0] );
+ emit fileSelected(str[0] );
+ // emit DocLnk need to do it
}
- }else{
+ } else {
qWarning( "locked" );
}
};
}
+
void OFileSelector::slotRightButton(int button, QListViewItem *item, const QPoint &, int )
{
if (item == 0 )
return;
if( button != Qt::RightButton )
return;
qWarning("right button" );
slotContextMenu(item);
}
+
void OFileSelector::slotContextMenu(QListViewItem *item)
{
qWarning("context menu" );
if( item ==0 || !m_showPopup )
return;
@@ -972,62 +1008,88 @@ void OFileSelector::slotContextMenu(QListViewItem *item)
connect(&delItem, SIGNAL(activated() ),
this, SLOT(slotDelete() ) );
menu.exec(QCursor::pos() );
}
}
+
bool OFileSelector::cd(const QString &str )
{
qWarning(" dir %s", str.latin1() );
QDir dir( str);
if(dir.exists() ){
- m_currentDir = str;
+ m_currentDir = dir.absPath();
reparse();
if(m_shTool ){
- int count = m_location->count();
- m_location->insertItem(str );
+ int count = m_location->count();
+ insertLocationPath( str ,count );
m_location->setCurrentItem( count );
}
return true;
}
return false;
}
+void OFileSelector::insertLocationPath(const QString &currentPath, int count) {
+ QStringList pathList;
+ for(int i=0;i<count;i++) {
+ pathList << m_location->text(i);
+ }
+ if( pathList.grep( currentPath,TRUE).isEmpty() ) {
+ m_location->clear();
+ if( currentPath.left(2)=="//")
+ pathList.append( currentPath.right(currentPath.length()-1) );
+ else
+ pathList.append( currentPath );
+ m_location->insertStringList( pathList,-1);
+ }
+}
+
void OFileSelector::slotChangedDir()
{
OFileSelectorItem *sel = (OFileSelectorItem*)m_View->currentItem();
if(sel->isDir() ){
QStringList str = QStringList::split("->", sel->text(1) );
cd( sel->directory() + "/" + str[0] );
+
}
}
+
void OFileSelector::slotOpen()
{
OFileSelectorItem *sel = (OFileSelectorItem*)m_View->currentItem();
if(!sel->isDir() ){
QStringList str = QStringList::split("->", sel->text(1) );
slotFileSelected( str[0] );
}
}
+
void OFileSelector::slotRescan()
{
reparse();
}
+
void OFileSelector::slotRename()
{
// rename inline
}
+
void OFileSelector::slotDelete()
{
qWarning("delete slot" );
OFileSelectorItem *sel = (OFileSelectorItem*)m_View->currentItem();
QStringList list = QStringList::split("->", sel->text(1) );
if( sel->isDir() ){
- QString str = QString::fromLatin1("rm -rf ") + list[0];
- ::system(str.utf8().data() );
- }else{
+ QString str = QString::fromLatin1("rm -rf ") + list[0]; //better safe than sorry
+ switch ( QMessageBox::warning(this,tr("Delete"),tr("Do you really want to delete\n")+list[0],
+ tr("Yes"),tr("No"),0,1,1) ) {
+ case 0:
+ ::system(str.utf8().data() );
+ break;
+ }
+ } else {
QFile::remove( list[0] );
}
m_View->takeItem( sel );
delete sel;
}
@@ -1036,22 +1098,41 @@ void OFileSelector::cdUP()
QDir dir( m_currentDir );
dir.cdUp();
if(dir.exists() ){
m_currentDir = dir.absPath();
reparse();
int count = m_location->count();
- m_location->insertItem(m_currentDir );
- m_location->setCurrentItem( count );
+ insertLocationPath( m_currentDir,count );
+ m_location->setCurrentItem( indexFromString(m_currentDir ));
+//this wont work in all instances
+ // FIXME
}
}
+
+int OFileSelector::indexFromString(const QString &str) {
+
+ for(int i=0;i< m_location->count();i++) {
+ if(str == m_location->text(i))
+ return i;
+ }
+ return 0;
+}
+
void OFileSelector::slotHome()
{
cd(QDir::homeDirPath() );
}
+
void OFileSelector::slotDoc()
{
cd(QDir::homeDirPath() + "/Documents" );
}
+
void OFileSelector::slotNavigate()
{
}
+
+void OFileSelector::locationComboActivated(const QString & file ) {
+ cd(file.left(file.find("<-",0,TRUE)));
+ reparse();
+}
diff --git a/libopie/ofileselector.h b/libopie/ofileselector.h
index 5e98a1e..81a9e63 100644
--- a/libopie/ofileselector.h
+++ b/libopie/ofileselector.h
@@ -64,14 +64,14 @@ class QVBoxLayout;
class QPopupMenu;
class QFileInfo;
//
class OFileSelectorItem : public QListViewItem {
public:
OFileSelectorItem(QListView *view, const QPixmap &pixmap, const QString &path,
- const QString &date, const QString &size, const QString &mDir,
- bool isLocked=false, bool isDir=false ): QListViewItem(view) {
+ const QString &date, const QString &size, const QString &mDir,
+ bool isLocked=false, bool isDir=false ): QListViewItem(view) {
setPixmap(0, pixmap );
setText(1, path );
setText(2, size );
setText(3, date );
//setText(4, mDir );
m_dir = mDir;
@@ -91,17 +91,17 @@ class OFileSelectorItem : public QListViewItem {
return text(1 );
}
QString key(int id, bool )const {
QString ke;
if( id == 0 || id == 1 ){ // name
if( dir ){
- ke.append("0" );
- ke.append( text(1) );
+ ke.append("0" );
+ ke.append( text(1) );
}else{
- ke.append("1" );
- ke.append( text(1) );
+ ke.append("1" );
+ ke.append( text(1) );
}
}else if( id == 2 ){ // size
return text(2);
}else if( id == 3 ){ // date
return text(3);
}
@@ -187,12 +187,15 @@ class OFileSelector : public QWidget {
protected slots:
void slotOk();
void slotCancel();
void slotViewCheck(const QString & );
void slotMimeCheck(const QString & );
+ void locationComboActivated(const QString & );
+ void insertLocationPath(const QString &, int);
+ int indexFromString(const QString &);
protected:
void init();
void updateMimes();
protected: