summaryrefslogtreecommitdiff
authorzecke <zecke>2002-04-17 17:22:50 (UTC)
committer zecke <zecke>2002-04-17 17:22:50 (UTC)
commitb94bcfb586b838885d7d0503623ea36ee0054464 (patch) (side-by-side diff)
treeda2f5fb0e422e38d6fae0ab8f8572b332e7da08b
parentb382414bf0446b6facd11d35df5dc097edbd5396 (diff)
downloadopie-b94bcfb586b838885d7d0503623ea36ee0054464.zip
opie-b94bcfb586b838885d7d0503623ea36ee0054464.tar.gz
opie-b94bcfb586b838885d7d0503623ea36ee0054464.tar.bz2
include the current directory in the filename
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--libopie/ofileselector.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/libopie/ofileselector.cc b/libopie/ofileselector.cc
index 968541a..ea19143 100644
--- a/libopie/ofileselector.cc
+++ b/libopie/ofileselector.cc
@@ -204,257 +204,257 @@ void OFileSelector::init()
}
if(m_shPerm ){
m_checkPerm = new QCheckBox(tr("Set Permission"), this, "Permission" );
m_checkPerm->setChecked( false );
m_lay->addWidget(m_checkPerm );
}
if( m_shChooser )
initializeChooser();
if(m_shYesNo )
initializeYes();
};
void OFileSelector::setYesCancelVisible( bool show )
{
if ( show == m_shYesNo )
return;
m_shYesNo = show;
if( !show ){
delete m_ok;
delete m_cancel;
m_ok = 0;
m_cancel = 0;
// delete m_boxOk; all ready deleted in delItems
}
updateLay(); // recreate it and save the other states
}
void OFileSelector::setToolbarVisible( bool show )
{
if ( m_shTool == show )
return;
if(!m_shTool ){
delete m_boxToolbar;
delete m_homeButton;
delete m_docButton;
delete m_location;
delete m_up;
m_boxToolbar = 0;
m_homeButton = 0;
m_docButton = 0;
m_location = 0;
m_up = 0;
};
updateLay();// overkill fix it
}
void OFileSelector::setPermissionBarVisible( bool show )
{
if( show == m_shPerm )
return;
m_shPerm = show;
updateLay();
}
void OFileSelector::setLineEditVisible( bool show )
{
if( show == m_shLne )
return;
m_shLne = show;
if( !show ){
delete m_edit;
delete m_fnLabel;
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 ){
delete m_mimeCheck;
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();
}else if(m_selector == EXTENDED || m_selector == EXTENDED_ALL ) {
QListViewItem *item = m_View->currentItem();
if(item != 0 ){
- string = item->text( 1 );
+ 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()
{
/* if( m_shTool )
//
else
// hide
*/
// save the state
bool check = false;
if( m_checkPerm != 0 )
check = m_checkPerm->isChecked();
QString text;
if( m_edit != 0 )
text = m_edit->text();
// save current mimetype
delItems();
delete m_checkPerm;
m_checkPerm = 0;
delete m_edit;
m_edit = 0;
delete m_fnLabel;
m_fnLabel = 0;
delete m_ok;
m_ok = 0;
delete m_cancel;
m_cancel = 0;
delete m_mimeCheck;
m_mimeCheck = 0;
delete m_viewCheck;
m_viewCheck = 0;
delete m_select; // test
delete m_stack;
//delete m_list;
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;
MimeType type( path );
if( type.id() == mime )
return true;
return false;
}
void OFileSelector::reparse()
{
if(m_View== 0 || m_selector == NORMAL)
return;
m_View->clear();
QString currMime =m_mimeCheck->currentText();
// update the mimetype now
if( m_autoMime ) {
QDir dir( m_currentDir );
m_mimetypes.clear();
m_mimeCheck->clear();
dir.setFilter( QDir::Files | QDir::Readable );
dir.setSorting(QDir::Size );
const QFileInfoList *list = dir.entryInfoList();
QFileInfoListIterator it( *list );
QFileInfo *fi;
while( (fi=it.current()) ){
if(fi->extension() == QString::fromLatin1("desktop") ){
++it;
continue;
}
MimeType type(fi->filePath() );
if( !m_mimetypes.contains( type.id() ) )
m_mimetypes.append( type.id() );
++it;
}
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 );
int filter;
/* if( m_dir && !m_files)
filter |= QDir::Dirs;
else if( !m_dir && m_files )
filter |= QDir::Files;
else
filter |= QDir::All;
*/
if( m_selector == EXTENDED_ALL )
filter = QDir::Files | QDir::Dirs | QDir::Hidden | QDir::All;
else
filter = QDir::Files | QDir::Dirs | QDir::All;
dir.setFilter( filter );
const QFileInfoList *list = dir.entryInfoList();
QFileInfoListIterator it( *list );
QFileInfo *fi;
while( (fi=it.current()) ){
if(fi->fileName() == ".." || fi->fileName() == "." ){