summaryrefslogtreecommitdiff
authorllornkcor <llornkcor>2002-06-24 13:03:30 (UTC)
committer llornkcor <llornkcor>2002-06-24 13:03:30 (UTC)
commit2a6e2c554e9a1b647fa9d6827948c38fdbaf3f2a (patch) (unidiff)
treedc2f59a5f5ac841c962db050f7db94f821f56b7c
parent428959b4974f51d55c088c0f6d73ee24b726a702 (diff)
downloadopie-2a6e2c554e9a1b647fa9d6827948c38fdbaf3f2a.zip
opie-2a6e2c554e9a1b647fa9d6827948c38fdbaf3f2a.tar.gz
opie-2a6e2c554e9a1b647fa9d6827948c38fdbaf3f2a.tar.bz2
small fix sent some time ago by Max Weninger, for non familiar 'standard' file layout
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--library/lnkproperties.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/library/lnkproperties.cpp b/library/lnkproperties.cpp
index ebfd4bf..28a71e9 100644
--- a/library/lnkproperties.cpp
+++ b/library/lnkproperties.cpp
@@ -149,49 +149,49 @@ void LnkProperties::unlinkIcon()
149 } else { 149 } else {
150 reject(); 150 reject();
151 } 151 }
152 } 152 }
153} 153}
154 154
155void LnkProperties::setupLocations() 155void LnkProperties::setupLocations()
156{ 156{
157 QFileInfo fi( lnk->file() ); 157 QFileInfo fi( lnk->file() );
158 fileSize = fi.size(); 158 fileSize = fi.size();
159 StorageInfo storage; 159 StorageInfo storage;
160 const QList<FileSystem> &fs = storage.fileSystems(); 160 const QList<FileSystem> &fs = storage.fileSystems();
161 QListIterator<FileSystem> it ( fs ); 161 QListIterator<FileSystem> it ( fs );
162 QString s; 162 QString s;
163 QString homeDir = getenv("HOME"); 163 QString homeDir = getenv("HOME");
164 QString hardDiskHome; 164 QString hardDiskHome;
165 QString hardDiskPath; 165 QString hardDiskPath;
166 int index = 0; 166 int index = 0;
167 currentLocation = -1; 167 currentLocation = -1;
168 for ( ; it.current(); ++it ) { 168 for ( ; it.current(); ++it ) {
169 // we add 10k to the file size so we are sure we can also save the desktop file 169 // we add 10k to the file size so we are sure we can also save the desktop file
170 if ( (*it)->availBlocks() * (*it)->blockSize() > fileSize + 10000 ) { 170 if ( (*it)->availBlocks() * (*it)->blockSize() > fileSize + 10000 ) {
171 if ( (*it)->isRemovable() || 171 if ( (*it)->isRemovable() ||
172 (*it)->disk() == "/dev/mtdblock1" || 172 (*it)->disk() == "/dev/mtdblock1" ||
173 (*it)->disk() == "/dev/mtdblock/1" ) { 173 (*it)->disk() == "/dev/mtdblock/1" || (*it)->disk().left(13) == "/dev/mtdblock" ) {
174 d->locationCombo->insertItem( (*it)->name(), index ); 174 d->locationCombo->insertItem( (*it)->name(), index );
175 locations.append( ((*it)->isRemovable() ? (*it)->path() : homeDir) ); 175 locations.append( ((*it)->isRemovable() ? (*it)->path() : homeDir) );
176 if ( lnk->file().contains( (*it)->path() ) ) { 176 if ( lnk->file().contains( (*it)->path() ) ) {
177 d->locationCombo->setCurrentItem( index ); 177 d->locationCombo->setCurrentItem( index );
178 currentLocation = index; 178 currentLocation = index;
179 } 179 }
180 index++; 180 index++;
181 } else if ( (*it)->name().contains( "Hard Disk") && 181 } else if ( (*it)->name().contains( "Hard Disk") &&
182 homeDir.contains( (*it)->path() ) && 182 homeDir.contains( (*it)->path() ) &&
183 (*it)->path().length() > hardDiskHome.length() ) { 183 (*it)->path().length() > hardDiskHome.length() ) {
184 hardDiskHome = (*it)->name(); 184 hardDiskHome = (*it)->name();
185 hardDiskPath = (*it)->path(); 185 hardDiskPath = (*it)->path();
186 } 186 }
187 } 187 }
188 } 188 }
189 if ( !hardDiskHome.isEmpty() ) { 189 if ( !hardDiskHome.isEmpty() ) {
190 d->locationCombo->insertItem( hardDiskHome ); 190 d->locationCombo->insertItem( hardDiskHome );
191 locations.append( hardDiskPath ); 191 locations.append( hardDiskPath );
192 if ( currentLocation == -1 ) { // assume it's the hard disk 192 if ( currentLocation == -1 ) { // assume it's the hard disk
193 d->locationCombo->setCurrentItem( index ); 193 d->locationCombo->setCurrentItem( index );
194 currentLocation = index; 194 currentLocation = index;
195 } 195 }
196 } 196 }
197} 197}