author | llornkcor <llornkcor> | 2002-10-17 03:47:16 (UTC) |
---|---|---|
committer | llornkcor <llornkcor> | 2002-10-17 03:47:16 (UTC) |
commit | 8f6dc7fd4aca312bc615bf4f85755b82d29b250d (patch) (side-by-side diff) | |
tree | 34e9be456b07b7678a3d4b812eec8471317fe641 /noncore | |
parent | 11cde43ced1c85ad350cd32ca72b75dcfbce5fce (diff) | |
download | opie-8f6dc7fd4aca312bc615bf4f85755b82d29b250d.zip opie-8f6dc7fd4aca312bc615bf4f85755b82d29b250d.tar.gz opie-8f6dc7fd4aca312bc615bf4f85755b82d29b250d.tar.bz2 |
force removal of desktop file when deleting note
-rw-r--r-- | noncore/applets/notesapplet/notes.cpp | 30 |
1 files changed, 23 insertions, 7 deletions
diff --git a/noncore/applets/notesapplet/notes.cpp b/noncore/applets/notesapplet/notes.cpp index 92fdb0a..90c2550 100644 --- a/noncore/applets/notesapplet/notes.cpp +++ b/noncore/applets/notesapplet/notes.cpp @@ -84,12 +84,13 @@ NotesControl::NotesControl( QWidget *parent, const char *name ) // : QFrame( parent, name, WDestructiveClose | WStyle_StaysOnTop | WType_Popup ) { setFrameStyle( QFrame::PopupPanel | QFrame::Raised ); loaded=false; edited=false; doPopulate=true; + isNew=false; QVBoxLayout *vbox = new QVBoxLayout( this,0, -1, "Vlayout" ); QHBoxLayout *hbox = new QHBoxLayout( this, 0, -1, "HLayout" ); view = new QMultiLineEdit(this, "OpieNotesView"); box = new QListBox(this, "OpieNotesBox"); @@ -184,22 +185,32 @@ void NotesControl::slotDeleteButton() { cfg.writeEntry("NumberOfFiles", noOfFiles-1 ); entryName.sprintf( "File%i", noOfFiles ); cfg.removeEntry(entryName); cfg.write(); DocLnk nf(selectedText); nf.removeFiles(); + QString fi=QPEApplication::documentDir()+"/text/plain/"+selectedText+".desktop"; + qDebug(fi); + + QFile f( fi); + if( !f.remove()) qDebug(".desktop file not removed"); + } } + view->clear(); + populateBox(); } } void NotesControl::slotNewButton() { if(edited) save(); view->clear(); - view->setFocus(); + view->setFocus(); + edited=false; + isNew=false; } void NotesControl::slotBeamButton() { Ir ir; if(!ir.supported()){ } else { @@ -266,14 +277,15 @@ void NotesControl::focusOutEvent ( QFocusEvent * e) { } void NotesControl::save() { Config cfg("Notes"); cfg.setGroup("Docs"); if( edited) { +// qDebug("is edited"); QString rt = view->text(); - if(!rt.isEmpty()) { + if( rt.length()>1) { QString pt = rt.simplifyWhiteSpace(); int i = pt.find( ' ' ); QString docname = pt; if ( i > 0 ) docname = pt.left( i ); // remove "." at the beginning @@ -283,30 +295,34 @@ void NotesControl::save() { // cut the length. filenames longer than that don't make sense // and something goes wrong when they get too long. if ( docname.length() > 40 ) docname = docname.left(40); if ( docname.isEmpty() ) docname = "Empty Text"; - qDebug(docname); +// qDebug(docname); if( oldDocName != docname) { int noOfFiles = cfg.readNumEntry("NumberOfFiles", 0 ); QString entryName; entryName.sprintf( "File%i", noOfFiles + 1 ); cfg.writeEntry( entryName,docname ); cfg.writeEntry("NumberOfFiles", noOfFiles+1 ); cfg.write(); } - else - qDebug("oldname equals docname"); +// else +// qDebug("oldname equals docname"); + + doc = new DocLnk(docname); + if(QFile(doc->linkFile()).exists()) + qDebug("puppie"); doc->setType("text/plain"); - doc->setFile(docname); + doc->setFile(QDir::homeDirPath()+"/"+docname); doc->setName(docname); - + FileManager fm; if ( !fm.saveFile( *doc, rt ) ) { } oldDocName=docname; edited=false; |