-rw-r--r-- | noncore/apps/advancedfm/advancedfmMenu.cpp | 19 |
1 files changed, 14 insertions, 5 deletions
diff --git a/noncore/apps/advancedfm/advancedfmMenu.cpp b/noncore/apps/advancedfm/advancedfmMenu.cpp index 2201960..9f21245 100644 --- a/noncore/apps/advancedfm/advancedfmMenu.cpp +++ b/noncore/apps/advancedfm/advancedfmMenu.cpp | |||
@@ -176,85 +176,94 @@ void AdvancedFm::doDelete() | |||
176 | int count = curFileList.count(); | 176 | int count = curFileList.count(); |
177 | if( count > 0) | 177 | if( count > 0) |
178 | { | 178 | { |
179 | if(count > 1 ) | 179 | if(count > 1 ) |
180 | { | 180 | { |
181 | QString msg; | 181 | QString msg; |
182 | msg=tr("Really delete\n%1 files?").arg(count); | 182 | msg=tr("Really delete\n%1 files?").arg(count); |
183 | switch ( QMessageBox::warning(this,tr("Delete"),msg | 183 | switch ( QMessageBox::warning(this,tr("Delete"),msg |
184 | ,tr("Yes"),tr("No"),0,0,1) ) | 184 | ,tr("Yes"),tr("No"),0,0,1) ) |
185 | { | 185 | { |
186 | case 0: | 186 | case 0: |
187 | doMsg=false; | 187 | doMsg=false; |
188 | break; | 188 | break; |
189 | case 1: | 189 | case 1: |
190 | return; | 190 | return; |
191 | break; | 191 | break; |
192 | }; | 192 | }; |
193 | } | 193 | } |
194 | 194 | ||
195 | QString myFile; | 195 | QString myFile; |
196 | for ( QStringList::Iterator it = curFileList.begin(); it != curFileList.end(); ++it ) | 196 | for ( QStringList::Iterator it = curFileList.begin(); it != curFileList.end(); ++it ) |
197 | { | 197 | { |
198 | myFile = (*it); | 198 | myFile = (*it); |
199 | if( myFile.find(" -> ",0,TRUE) != -1) | 199 | if( myFile.find(" -> ",0,TRUE) != -1) |
200 | myFile = myFile.left( myFile.find(" -> ",0,TRUE)); | 200 | myFile = myFile.left( myFile.find(" -> ",0,TRUE)); |
201 | 201 | ||
202 | QString f = CurrentDir()->canonicalPath(); | 202 | QString f = CurrentDir()->canonicalPath(); |
203 | if(f.right(1).find("/",0,TRUE) == -1) | 203 | if(f.right(1).find("/",0,TRUE) == -1) |
204 | f += "/"; | 204 | f += "/"; |
205 | f += myFile; | 205 | f += myFile; |
206 | if(QDir(f).exists() && !QFileInfo(f).isSymLink() ) //if file is a directory | 206 | if(QDir(f).exists() && !QFileInfo(f).isSymLink() ) //if file is a directory |
207 | { | 207 | { |
208 | switch ( QMessageBox::warning( this, tr("Delete Directory?"), tr("Really delete\n") + f + | 208 | switch ( QMessageBox::warning( this, tr("Delete Directory?"), |
209 | "\nand all it's contents ?" | 209 | tr("Really delete %1\nand all it's contents ?" ).arg( f ) , |
210 | ,tr("Yes"),tr("No"),0,0,1) ) | 210 | tr("Yes"), |
211 | tr("No"), | ||
212 | 0, | ||
213 | 0, | ||
214 | 1) ) | ||
211 | { | 215 | { |
212 | case 0: | 216 | case 0: |
213 | { | 217 | { |
214 | f=f.left(f.length()-1); | 218 | f=f.left(f.length()-1); |
215 | QString cmd="rm -rf "+f; | 219 | QString cmd="rm -rf "+f; |
216 | startProcess( (const QString)cmd.latin1() ); | 220 | startProcess( (const QString)cmd.latin1() ); |
217 | populateView(); | 221 | populateView(); |
218 | } | 222 | } |
219 | break; | 223 | break; |
220 | case 1: | 224 | case 1: |
221 | // exit | 225 | // exit |
222 | break; | 226 | break; |
223 | }; | 227 | }; |
224 | 228 | ||
225 | } else { | 229 | } else { |
226 | if(doMsg) { | 230 | if(doMsg) { |
227 | switch ( QMessageBox::warning(this,tr("Delete"),tr("Really delete\n")+f | 231 | switch ( QMessageBox::warning(this,tr("Delete"), |
228 | +" ?",tr("Yes"),tr("No"),0,0,1) ) { | 232 | tr("Really delete\n%1?").arg( f ), |
233 | tr("Yes"), | ||
234 | tr("No"), | ||
235 | 0, | ||
236 | 0, | ||
237 | 1) ) { | ||
229 | case 1: | 238 | case 1: |
230 | return; | 239 | return; |
231 | break; | 240 | break; |
232 | }; | 241 | }; |
233 | } | 242 | } |
234 | QString cmd="rm "+f; | 243 | QString cmd="rm "+f; |
235 | QFile file(f); | 244 | QFile file(f); |
236 | if(QFileInfo(myFile).fileName().find("../",0,TRUE)==-1) { | 245 | if(QFileInfo(myFile).fileName().find("../",0,TRUE)==-1) { |
237 | qDebug("remove link files "+f); | 246 | qDebug("remove link files "+f); |
238 | // AppLnk lnk(f); | 247 | // AppLnk lnk(f); |
239 | // qDebug(lnk.linkFile()); | 248 | // qDebug(lnk.linkFile()); |
240 | // lnk.removeLinkFile(); | 249 | // lnk.removeLinkFile(); |
241 | file.remove(); | 250 | file.remove(); |
242 | } | 251 | } |
243 | } | 252 | } |
244 | } | 253 | } |
245 | } | 254 | } |
246 | populateView(); | 255 | populateView(); |
247 | } | 256 | } |
248 | 257 | ||
249 | void AdvancedFm::filePerms() | 258 | void AdvancedFm::filePerms() |
250 | { | 259 | { |
251 | QStringList curFileList = getPath(); | 260 | QStringList curFileList = getPath(); |
252 | QString filePath; | 261 | QString filePath; |
253 | 262 | ||
254 | filePath = CurrentDir()->canonicalPath()+"/"; | 263 | filePath = CurrentDir()->canonicalPath()+"/"; |
255 | 264 | ||
256 | for ( QStringList::Iterator it = curFileList.begin(); it != curFileList.end(); ++it ) | 265 | for ( QStringList::Iterator it = curFileList.begin(); it != curFileList.end(); ++it ) |
257 | { | 266 | { |
258 | filePermissions *filePerm; | 267 | filePermissions *filePerm; |
259 | filePerm = new filePermissions(this, "Permissions",true,0,(const QString &)(filePath+*it)); | 268 | filePerm = new filePermissions(this, "Permissions",true,0,(const QString &)(filePath+*it)); |
260 | filePerm->showMaximized(); | 269 | filePerm->showMaximized(); |