-rw-r--r-- | library/lnkproperties.cpp | 2 |
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 | |||
@@ -125,97 +125,97 @@ LnkProperties::~LnkProperties() | |||
125 | } | 125 | } |
126 | 126 | ||
127 | void LnkProperties::unlinkLnk() | 127 | void LnkProperties::unlinkLnk() |
128 | { | 128 | { |
129 | if ( QPEMessageBox::confirmDelete( this, tr("Delete"), lnk->name() ) ) { | 129 | if ( QPEMessageBox::confirmDelete( this, tr("Delete"), lnk->name() ) ) { |
130 | lnk->removeFiles(); | 130 | lnk->removeFiles(); |
131 | if ( QFile::exists(lnk->file()) ) { | 131 | if ( QFile::exists(lnk->file()) ) { |
132 | QMessageBox::warning( this, tr("Delete"), tr("File deletion failed.") ); | 132 | QMessageBox::warning( this, tr("Delete"), tr("File deletion failed.") ); |
133 | } else { | 133 | } else { |
134 | reject(); | 134 | reject(); |
135 | } | 135 | } |
136 | } | 136 | } |
137 | } | 137 | } |
138 | 138 | ||
139 | 139 | ||
140 | /* | 140 | /* |
141 | * remove only the link from documents, not also the file | 141 | * remove only the link from documents, not also the file |
142 | */ | 142 | */ |
143 | void LnkProperties::unlinkIcon() | 143 | void LnkProperties::unlinkIcon() |
144 | { | 144 | { |
145 | if ( QPEMessageBox::confirmDelete( this, tr("Delete Icon and leave file"), lnk->name() ) ) { | 145 | if ( QPEMessageBox::confirmDelete( this, tr("Delete Icon and leave file"), lnk->name() ) ) { |
146 | lnk->removeLinkFile(); | 146 | lnk->removeLinkFile(); |
147 | if ( QFile::exists(lnk->linkFile()) ) { | 147 | if ( QFile::exists(lnk->linkFile()) ) { |
148 | QMessageBox::warning( this, tr("Delete"), tr("Icon deletion failed.") ); | 148 | QMessageBox::warning( this, tr("Delete"), tr("Icon deletion failed.") ); |
149 | } else { | 149 | } else { |
150 | reject(); | 150 | reject(); |
151 | } | 151 | } |
152 | } | 152 | } |
153 | } | 153 | } |
154 | 154 | ||
155 | void LnkProperties::setupLocations() | 155 | void 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 | } |
198 | 198 | ||
199 | void LnkProperties::duplicateLnk() | 199 | void LnkProperties::duplicateLnk() |
200 | { | 200 | { |
201 | // The duplicate takes the new properties. | 201 | // The duplicate takes the new properties. |
202 | DocLnk newdoc( *((DocLnk *)lnk) ); | 202 | DocLnk newdoc( *((DocLnk *)lnk) ); |
203 | if ( d->docname->text() == lnk->name() ) | 203 | if ( d->docname->text() == lnk->name() ) |
204 | newdoc.setName(tr("Copy of ")+d->docname->text()); | 204 | newdoc.setName(tr("Copy of ")+d->docname->text()); |
205 | else | 205 | else |
206 | newdoc.setName(d->docname->text()); | 206 | newdoc.setName(d->docname->text()); |
207 | 207 | ||
208 | if ( !copyFile( newdoc ) ) { | 208 | if ( !copyFile( newdoc ) ) { |
209 | QMessageBox::warning( this, tr("Duplicate"), tr("File copy failed.") ); | 209 | QMessageBox::warning( this, tr("Duplicate"), tr("File copy failed.") ); |
210 | return; | 210 | return; |
211 | } | 211 | } |
212 | reject(); | 212 | reject(); |
213 | } | 213 | } |
214 | 214 | ||
215 | bool LnkProperties::moveLnk() | 215 | bool LnkProperties::moveLnk() |
216 | { | 216 | { |
217 | DocLnk newdoc( *((DocLnk *)lnk) ); | 217 | DocLnk newdoc( *((DocLnk *)lnk) ); |
218 | newdoc.setName(d->docname->text()); | 218 | newdoc.setName(d->docname->text()); |
219 | 219 | ||
220 | if ( !copyFile( newdoc ) ) { | 220 | if ( !copyFile( newdoc ) ) { |
221 | QMessageBox::warning( this, tr("Details"), tr("Moving Document failed.") ); | 221 | QMessageBox::warning( this, tr("Details"), tr("Moving Document failed.") ); |