summaryrefslogtreecommitdiff
path: root/library
authorllornkcor <llornkcor>2002-07-02 11:56:46 (UTC)
committer llornkcor <llornkcor>2002-07-02 11:56:46 (UTC)
commit2ffc9e4a46ec40075e6ee55e4583120e6964168d (patch) (unidiff)
tree0a38d56cd249d71075a9cb784e3461b3dda1551a /library
parent75b6c4bb13fcc6d54a249b7885b212f473d654a3 (diff)
downloadopie-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
Diffstat (limited to 'library') (more/less context) (ignore whitespace changes)
-rw-r--r--library/lnkproperties.cpp13
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
@@ -98,70 +98,71 @@ LnkProperties::LnkProperties( AppLnk* l, QWidget* parent )
98 d->hline->hide(); 98 d->hline->hide();
99 d->locationLabel->hide(); 99 d->locationLabel->hide();
100 d->locationCombo->hide(); 100 d->locationCombo->hide();
101 101
102 // Can't edit categories, since the app .desktop files are global, 102 // Can't edit categories, since the app .desktop files are global,
103 // possibly read-only. 103 // possibly read-only.
104 d->categoryEdit->hide(); 104 d->categoryEdit->hide();
105 105
106 d->docname->setReadOnly( TRUE ); 106 d->docname->setReadOnly( TRUE );
107 107
108 if ( l->property("CanFastload") == "0" ) 108 if ( l->property("CanFastload") == "0" )
109 d->preload->hide(); 109 d->preload->hide();
110 110
111 Config cfg("Launcher"); 111 Config cfg("Launcher");
112 cfg.setGroup("Preload"); 112 cfg.setGroup("Preload");
113 QStringList apps = cfg.readListEntry("Apps",','); 113 QStringList apps = cfg.readListEntry("Apps",',');
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
123LnkProperties::~LnkProperties() 123LnkProperties::~LnkProperties()
124{ 124{
125} 125}
126 126
127void LnkProperties::unlinkLnk() 127void 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 */
143void LnkProperties::unlinkIcon() 144void 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 }
152 } 153 }
153} 154}
154 155
155void LnkProperties::setupLocations() 156void LnkProperties::setupLocations()
156{ 157{
157 QFileInfo fi( lnk->file() ); 158 QFileInfo fi( lnk->file() );
158 fileSize = fi.size(); 159 fileSize = fi.size();
159 StorageInfo storage; 160 StorageInfo storage;
160 const QList<FileSystem> &fs = storage.fileSystems(); 161 const QList<FileSystem> &fs = storage.fileSystems();
161 QListIterator<FileSystem> it ( fs ); 162 QListIterator<FileSystem> it ( fs );
162 QString s; 163 QString s;
163 QString homeDir = getenv("HOME"); 164 QString homeDir = getenv("HOME");
164 QString hardDiskHome; 165 QString hardDiskHome;
165 QString hardDiskPath; 166 QString hardDiskPath;
166 int index = 0; 167 int index = 0;
167 currentLocation = -1; 168 currentLocation = -1;