summaryrefslogtreecommitdiff
authorllornkcor <llornkcor>2002-07-02 11:56:46 (UTC)
committer llornkcor <llornkcor>2002-07-02 11:56:46 (UTC)
commit2ffc9e4a46ec40075e6ee55e4583120e6964168d (patch) (unidiff)
tree0a38d56cd249d71075a9cb784e3461b3dda1551a
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 (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
@@ -34,198 +34,199 @@
34#include <qpe/config.h> 34#include <qpe/config.h>
35#include <qpe/storage.h> 35#include <qpe/storage.h>
36#include <qpe/qpemessagebox.h> 36#include <qpe/qpemessagebox.h>
37 37
38#include <qlineedit.h> 38#include <qlineedit.h>
39#include <qtoolbutton.h> 39#include <qtoolbutton.h>
40#include <qpushbutton.h> 40#include <qpushbutton.h>
41#include <qgroupbox.h> 41#include <qgroupbox.h>
42#include <qcheckbox.h> 42#include <qcheckbox.h>
43#include <qlabel.h> 43#include <qlabel.h>
44#include <qlayout.h> 44#include <qlayout.h>
45#include <qfile.h> 45#include <qfile.h>
46#include <qfileinfo.h> 46#include <qfileinfo.h>
47#include <qmessagebox.h> 47#include <qmessagebox.h>
48#include <qsize.h> 48#include <qsize.h>
49#include <qcombobox.h> 49#include <qcombobox.h>
50#include <qregexp.h> 50#include <qregexp.h>
51 51
52#include <stdlib.h> 52#include <stdlib.h>
53 53
54LnkProperties::LnkProperties( AppLnk* l, QWidget* parent ) 54LnkProperties::LnkProperties( AppLnk* l, QWidget* parent )
55 : QDialog( parent, 0, TRUE ), lnk(l), fileSize( 0 ) 55 : QDialog( parent, 0, TRUE ), lnk(l), fileSize( 0 )
56{ 56{
57 QVBoxLayout *vbox = new QVBoxLayout( this ); 57 QVBoxLayout *vbox = new QVBoxLayout( this );
58 d = new LnkPropertiesBase( this ); 58 d = new LnkPropertiesBase( this );
59 vbox->add( d ); 59 vbox->add( d );
60 60
61 d->docname->setText(l->name()); 61 d->docname->setText(l->name());
62 QString inf; 62 QString inf;
63 if ( l->type().isEmpty() ) { 63 if ( l->type().isEmpty() ) {
64 d->type->hide(); 64 d->type->hide();
65 d->typeLabel->hide(); 65 d->typeLabel->hide();
66 } else { 66 } else {
67 d->type->setText( l->type() ); 67 d->type->setText( l->type() );
68 } 68 }
69 69
70 if ( l->comment().isEmpty() ) { 70 if ( l->comment().isEmpty() ) {
71 d->comment->hide(); 71 d->comment->hide();
72 d->commentLabel->hide(); 72 d->commentLabel->hide();
73 } else { 73 } else {
74 d->comment->setText( l->comment() ); 74 d->comment->setText( l->comment() );
75 } 75 }
76 76
77 connect(d->beam,SIGNAL(clicked()),this,SLOT(beamLnk())); 77 connect(d->beam,SIGNAL(clicked()),this,SLOT(beamLnk()));
78 if ( lnk->type().contains('/') ) { // A document? (#### better predicate needed) 78 if ( lnk->type().contains('/') ) { // A document? (#### better predicate needed)
79 connect(d->unlink,SIGNAL(clicked()),this,SLOT(unlinkLnk())); 79 connect(d->unlink,SIGNAL(clicked()),this,SLOT(unlinkLnk()));
80 connect(d->duplicate,SIGNAL(clicked()),this,SLOT(duplicateLnk())); 80 connect(d->duplicate,SIGNAL(clicked()),this,SLOT(duplicateLnk()));
81 connect(d->delicon,SIGNAL(clicked()),this,SLOT(unlinkIcon())); 81 connect(d->delicon,SIGNAL(clicked()),this,SLOT(unlinkIcon()));
82 82
83 d->docname->setReadOnly( FALSE ); 83 d->docname->setReadOnly( FALSE );
84 d->preload->hide(); 84 d->preload->hide();
85 d->spacer->hide(); 85 d->spacer->hide();
86 86
87 // ### THIS MUST GO, FIX WIERD BUG in QLAYOUT 87 // ### THIS MUST GO, FIX WIERD BUG in QLAYOUT
88 d->categoryEdit->kludge(); 88 d->categoryEdit->kludge();
89 89
90 d->categoryEdit->setCategories( lnk->categories(), 90 d->categoryEdit->setCategories( lnk->categories(),
91 "Document View", 91 "Document View",
92 tr("Document View") ); 92 tr("Document View") );
93 setupLocations(); 93 setupLocations();
94 } else { 94 } else {
95 d->unlink->hide(); 95 d->unlink->hide();
96 d->duplicate->hide(); 96 d->duplicate->hide();
97 d->beam->hide(); 97 d->beam->hide();
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;
168 for ( ; it.current(); ++it ) { 169 for ( ; it.current(); ++it ) {
169 // we add 10k to the file size so we are sure we can also save the desktop file 170 // 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 ) { 171 if ( (*it)->availBlocks() * (*it)->blockSize() > fileSize + 10000 ) {
171 if ( (*it)->isRemovable() || 172 if ( (*it)->isRemovable() ||
172 (*it)->disk() == "/dev/mtdblock1" || 173 (*it)->disk() == "/dev/mtdblock1" ||
173 (*it)->disk() == "/dev/mtdblock/1" || (*it)->disk().left(13) == "/dev/mtdblock" ) { 174 (*it)->disk() == "/dev/mtdblock/1" || (*it)->disk().left(13) == "/dev/mtdblock" ) {
174 d->locationCombo->insertItem( (*it)->name(), index ); 175 d->locationCombo->insertItem( (*it)->name(), index );
175 locations.append( ((*it)->isRemovable() ? (*it)->path() : homeDir) ); 176 locations.append( ((*it)->isRemovable() ? (*it)->path() : homeDir) );
176 if ( lnk->file().contains( (*it)->path() ) ) { 177 if ( lnk->file().contains( (*it)->path() ) ) {
177 d->locationCombo->setCurrentItem( index ); 178 d->locationCombo->setCurrentItem( index );
178 currentLocation = index; 179 currentLocation = index;
179 } 180 }
180 index++; 181 index++;
181 } else if ( (*it)->name().contains( "Hard Disk") && 182 } else if ( (*it)->name().contains( "Hard Disk") &&
182 homeDir.contains( (*it)->path() ) && 183 homeDir.contains( (*it)->path() ) &&
183 (*it)->path().length() > hardDiskHome.length() ) { 184 (*it)->path().length() > hardDiskHome.length() ) {
184 hardDiskHome = (*it)->name(); 185 hardDiskHome = (*it)->name();
185 hardDiskPath = (*it)->path(); 186 hardDiskPath = (*it)->path();
186 } 187 }
187 } 188 }
188 } 189 }
189 if ( !hardDiskHome.isEmpty() ) { 190 if ( !hardDiskHome.isEmpty() ) {
190 d->locationCombo->insertItem( hardDiskHome ); 191 d->locationCombo->insertItem( hardDiskHome );
191 locations.append( hardDiskPath ); 192 locations.append( hardDiskPath );
192 if ( currentLocation == -1 ) { // assume it's the hard disk 193 if ( currentLocation == -1 ) { // assume it's the hard disk
193 d->locationCombo->setCurrentItem( index ); 194 d->locationCombo->setCurrentItem( index );
194 currentLocation = index; 195 currentLocation = index;
195 } 196 }
196 } 197 }
197} 198}
198 199
199void LnkProperties::duplicateLnk() 200void LnkProperties::duplicateLnk()
200{ 201{
201 // The duplicate takes the new properties. 202 // The duplicate takes the new properties.
202 DocLnk newdoc( *((DocLnk *)lnk) ); 203 DocLnk newdoc( *((DocLnk *)lnk) );
203 if ( d->docname->text() == lnk->name() ) 204 if ( d->docname->text() == lnk->name() )
204 newdoc.setName(tr("Copy of ")+d->docname->text()); 205 newdoc.setName(tr("Copy of ")+d->docname->text());
205 else 206 else
206 newdoc.setName(d->docname->text()); 207 newdoc.setName(d->docname->text());
207 208
208 if ( !copyFile( newdoc ) ) { 209 if ( !copyFile( newdoc ) ) {
209 QMessageBox::warning( this, tr("Duplicate"), tr("File copy failed.") ); 210 QMessageBox::warning( this, tr("Duplicate"), tr("File copy failed.") );
210 return; 211 return;
211 } 212 }
212 reject(); 213 reject();
213} 214}
214 215
215bool LnkProperties::moveLnk() 216bool LnkProperties::moveLnk()
216{ 217{
217 DocLnk newdoc( *((DocLnk *)lnk) ); 218 DocLnk newdoc( *((DocLnk *)lnk) );
218 newdoc.setName(d->docname->text()); 219 newdoc.setName(d->docname->text());
219 220
220 if ( !copyFile( newdoc ) ) { 221 if ( !copyFile( newdoc ) ) {
221 QMessageBox::warning( this, tr("Details"), tr("Moving Document failed.") ); 222 QMessageBox::warning( this, tr("Details"), tr("Moving Document failed.") );
222 return FALSE; 223 return FALSE;
223 } 224 }
224 // remove old lnk 225 // remove old lnk
225 lnk->removeFiles(); 226 lnk->removeFiles();
226 227
227 return TRUE; 228 return TRUE;
228} 229}
229 230
230void LnkProperties::beamLnk() 231void LnkProperties::beamLnk()
231{ 232{