author | llornkcor <llornkcor> | 2002-07-02 11:56:46 (UTC) |
---|---|---|
committer | llornkcor <llornkcor> | 2002-07-02 11:56:46 (UTC) |
commit | 2ffc9e4a46ec40075e6ee55e4583120e6964168d (patch) (unidiff) | |
tree | 0a38d56cd249d71075a9cb784e3461b3dda1551a /library | |
parent | 75b6c4bb13fcc6d54a249b7885b212f473d654a3 (diff) | |
download | opie-2ffc9e4a46ec40075e6ee55e4583120e6964168d.zip opie-2ffc9e4a46ec40075e6ee55e4583120e6964168d.tar.gz opie-2ffc9e4a46ec40075e6ee55e4583120e6964168d.tar.bz2 |
attempt to fix bug #95, now it checks for existing file before trying to delete
-rw-r--r-- | library/lnkproperties.cpp | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/library/lnkproperties.cpp b/library/lnkproperties.cpp index 28a71e9..bd43e21 100644 --- a/library/lnkproperties.cpp +++ b/library/lnkproperties.cpp | |||
@@ -114,38 +114,39 @@ LnkProperties::LnkProperties( AppLnk* l, QWidget* parent ) | |||
114 | d->preload->setChecked( apps.contains(l->exec()) ); | 114 | d->preload->setChecked( apps.contains(l->exec()) ); |
115 | if ( Global::isBuiltinCommand(lnk->exec()) ) | 115 | if ( Global::isBuiltinCommand(lnk->exec()) ) |
116 | d->preload->hide(); // builtins are always fast | 116 | d->preload->hide(); // builtins are always fast |
117 | 117 | ||
118 | currentLocation = 0; // apps not movable (yet) | 118 | currentLocation = 0; // apps not movable (yet) |
119 | } | 119 | } |
120 | setCaption( l->file()); | 120 | setCaption( l->file()); |
121 | } | 121 | } |
122 | 122 | ||
123 | LnkProperties::~LnkProperties() | 123 | LnkProperties::~LnkProperties() |
124 | { | 124 | { |
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 | if ( QFile::exists(lnk->file()) ) |
131 | if ( QFile::exists(lnk->file()) ) { | 131 | lnk->removeFiles(); |
132 | QMessageBox::warning( this, tr("Delete"), tr("File deletion failed.") ); | 132 | if ( QFile::exists(lnk->file()) ) { |
133 | } else { | 133 | QMessageBox::warning( this, tr("Delete"), tr("File deletion failed.") ); |
134 | reject(); | 134 | } else { |
135 | } | 135 | reject(); |
136 | } | ||
136 | } | 137 | } |
137 | } | 138 | } |
138 | 139 | ||
139 | 140 | ||
140 | /* | 141 | /* |
141 | * remove only the link from documents, not also the file | 142 | * remove only the link from documents, not also the file |
142 | */ | 143 | */ |
143 | void LnkProperties::unlinkIcon() | 144 | void LnkProperties::unlinkIcon() |
144 | { | 145 | { |
145 | if ( QPEMessageBox::confirmDelete( this, tr("Delete Icon and leave file"), lnk->name() ) ) { | 146 | if ( QPEMessageBox::confirmDelete( this, tr("Delete Icon and leave file"), lnk->name() ) ) { |
146 | lnk->removeLinkFile(); | 147 | lnk->removeLinkFile(); |
147 | if ( QFile::exists(lnk->linkFile()) ) { | 148 | if ( QFile::exists(lnk->linkFile()) ) { |
148 | QMessageBox::warning( this, tr("Delete"), tr("Icon deletion failed.") ); | 149 | QMessageBox::warning( this, tr("Delete"), tr("Icon deletion failed.") ); |
149 | } else { | 150 | } else { |
150 | reject(); | 151 | reject(); |
151 | } | 152 | } |