delete button so I dont have to explain so much about the hold-menu delete

1 files changed, 22 insertions, 10 deletions

diff --git a/noncore/applets/notesapplet/notes.cpp b/noncore/applets/notesapplet/notes.cpp
index a4aa093..cc5245c 100644
--- a/noncore/applets/notesapplet/notes.cpp
+++ b/noncore/applets/notesapplet/notes.cpp
@@ -24,340 +24,352 @@
 #include <qpe/qpeapplication.h>
 #include <qpe/timestring.h>
 #include <qpe/resource.h>
 #include <qpe/config.h>
 #include <qpe/applnk.h>
 #include <qpe/config.h>
 #include <qsocket.h>
 
 #include <qmultilineedit.h>
 #include <qlistbox.h>
 #include <qpopupmenu.h>
 #include <qmessagebox.h>
 
 #include <qdir.h>
 #include <qpoint.h>
 #include <qpushbutton.h>
 #include <qpainter.h>
 #include <qlayout.h>
 #include <qframe.h>
 #include <qpixmap.h>
 #include <qstring.h>
 #include <qtimer.h>
 
 /* XPM */
 static char * notes_xpm[] = {
 "16 16 11 1",
 "   c None",
 ".  c #000000",
 "+  c #7F7F7F",
 "@  c #BFBFBF",
 "#  c #BFC1FF",
 "$  c #FF0000",
 "%  c #FFFFFF",
 "&  c #00037F",
 "*  c #0006FF",
 "=  c #0005BF",
 "-  c #7F0000",
 "            ..  ",
 "            ..  ",
 "           ...  ",
 "           .+   ",
 "          .@.   ",
 "        . .+    ",
 "      ..#.@.    ",
 "    ..###.+..   ",
 "  ..###$...##.. ",
 "..###$$$%+$$##&.",
 ".*=####$-###&=&.",
 ".=**=###==&=&=..",
 " ..=**=#&=&=..  ",
 "   ..=*=&=..    ",
 "     ..=..      ",
 "       .        "};
 
 
 NotesControl::NotesControl( QWidget *parent, const char *name )
         : QFrame( parent, name,/* WDestructiveClose | */WStyle_StaysOnTop )
 //        : QFrame( parent, name, WDestructiveClose | WStyle_StaysOnTop | WType_Popup )
 {
     setFrameStyle( QFrame::PopupPanel | QFrame::Raised );
     loaded=false;
     edited=false;
     doPopulate=true;
     QVBoxLayout *vbox = new QVBoxLayout( this,0, -1, "Vlayout" );
-    QHBoxLayout *hbox = new QHBoxLayout( this );
+    QHBoxLayout *hbox = new QHBoxLayout( this, 0, -1, "HLayout" );
 
     view = new QMultiLineEdit(this, "OpieNotesView");
 
     box = new QListBox(this, "OpieNotesBox");
     QPEApplication::setStylusOperation( box->viewport(),QPEApplication::RightOnHold);
     box->setFixedHeight(50);
 
     vbox->setMargin( 6 );
     vbox->setSpacing( 3 );
 
     vbox->addWidget( view);
     vbox->addWidget( box);
 
     setFixedHeight(180);
     QWidget *wid = QPEApplication::desktop();
     setFixedWidth( wid->width()-10 /*200*/);
 
     setFocusPolicy(QWidget::StrongFocus);
 
     newButton= new QPushButton( this, "newButton" );
     newButton->setText(tr("New"));
     hbox->addWidget( newButton);
+
+    deleteButton= new QPushButton( this, "deleteButton" );
+    deleteButton->setText(tr("Delete"));
+    hbox->addWidget( deleteButton);
+
     vbox->addItem(hbox);
 
     connect( box, SIGNAL( mouseButtonPressed( int, QListBoxItem *, const QPoint&)),
              this,SLOT( boxPressed(int, QListBoxItem *, const QPoint&)) );
     connect(box, SIGNAL(highlighted(const QString&)), this, SLOT(slotBoxSelected(const QString &)));
     connect( &menuTimer, SIGNAL( timeout() ), SLOT( showMenu() ) );
 
     connect(view,SIGNAL( textChanged() ), this, SLOT(slotViewEdited() ) );
     connect(newButton, SIGNAL(clicked()), this, SLOT(slotNewButton()));
+    connect(deleteButton, SIGNAL(clicked()), this, SLOT(slotDeleteButton()));
     populateBox();
     load();
     setCaption("Notes");
       //  parent->setFocus();    
 }
 
 void NotesControl::slotDeleteButton() {
+
     QString selectedText = box->currentText();
     qDebug("deleting "+selectedText);
+
+    if( !selectedText.isEmpty()) {
     Config cfg("Notes");
     cfg.setGroup("Docs");
     int noOfFiles = cfg.readNumEntry("NumberOfFiles", 0 );
     QString entryName, entryName2;;
     for ( int i = 0; i < noOfFiles; i++ ) {
         entryName.sprintf( "File%i", i + 1 );
         if(selectedText == cfg.readEntry( entryName )) {
             qDebug("removing %s, %d", selectedText.latin1(), i);
             for ( int j = i; j < noOfFiles; j++ ) {
                 entryName.sprintf( "File%i", i + 1  );
                 entryName2.sprintf( "File%i", i + 2 );
                 QString temp = cfg.readEntry(entryName2);
                 qDebug("move "+temp);
                 cfg.writeEntry(entryName, temp);
                 i++;
             }
             cfg.writeEntry("NumberOfFiles", noOfFiles-1 );
             entryName.sprintf( "File%i", noOfFiles );
             cfg.removeEntry(entryName);
             cfg.write();
             DocLnk nf(selectedText);
             nf.removeFiles();
         }
     }
     populateBox();
+    }
 }
 
 void NotesControl::slotNewButton() {
     if(edited) save();
     view->clear();
     view->setFocus();    
 }
 
 void NotesControl::boxPressed(int mouse, QListBoxItem *item, const QPoint&) {
   switch (mouse) {
     case 1:{
     }
     break;
   case 2:
     menuTimer.start( 500, TRUE );
     break;
   };
 }
 
 void NotesControl::slotBoxSelected(const QString &itemString) {
     if(edited) {
         save();
     }
     loaded=false;
     edited=false;
     load(itemString);
 }
 
 
 void NotesControl::showMenu() {
   QPopupMenu *m = new QPopupMenu(0);
 
   m->insertItem(  tr( "Delete" ), this,  SLOT( slotDeleteButton() ));
 
   m->setFocus();
   m->exec( QCursor::pos() );
 
   if(m) delete m;
 
 }
 
 void NotesControl::focusOutEvent ( QFocusEvent * e) {
     if( e->reason() == QFocusEvent::Popup)
         save();
     else {
         if(!loaded) {
         populateBox();
         load();
         }
     }
     QWidget::focusOutEvent(e);
 }
 
 void NotesControl::save() {
     Config cfg("Notes");
     cfg.setGroup("Docs");
     if( edited) {
         QString rt = view->text();
         if(!rt.isEmpty()) {
             QString pt = rt.simplifyWhiteSpace();
             int i = pt.find( ' ' );
             QString docname = pt;
             if ( i > 0 )
                 docname = pt.left( i );
               // remove "." at the beginning
             while( docname.startsWith( "." ) )
                 docname = docname.mid( 1 );
             docname.replace( QRegExp("/"), "_" );
               // 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);
 
             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();
             }
             doc = new DocLnk(docname);
 
             doc->setType("text/plain");
             doc->setFile(docname);
             doc->setName(docname);
     
             FileManager fm;
             if ( !fm.saveFile( *doc, rt ) ) {
             }
 
             oldDocName=docname;
             edited=false;
+            qDebug("save");
+            if (doPopulate)
+                populateBox();
         }
-        qDebug("save");
-        if (doPopulate)
-            populateBox();
-    }
     cfg.writeEntry( "LastDoc",oldDocName );
     cfg.write();    
+        
+    }
 }
 
 void NotesControl::populateBox() {
     box->clear();
     qDebug("populate");
     Config cfg("Notes");
     cfg.setGroup("Docs");
     int noOfFiles = cfg.readNumEntry("NumberOfFiles", 0 );
     QStringList list;
     QString entryName;
     for ( int i = 0; i < noOfFiles; i++ ) {
         entryName.sprintf( "File%i", i + 1 );
         list.append(cfg.readEntry( entryName ));
     }
     list.sort();
     box->insertStringList(list,-1);
     doPopulate=false;
 }
 
 void NotesControl::load() {
 
-    Config cfg("Notes");
-    cfg.setGroup("Docs");
     if(!loaded) {
+        Config cfg("Notes");
+        cfg.setGroup("Docs");
         QString lastDoc=cfg.readEntry( "LastDoc","");
         DocLnk nf;
         nf.setType("text/plain");
         nf.setFile(lastDoc);
 
         loadDoc(nf);
         loaded=true;
         oldDocName=lastDoc;
-    }    
-    cfg.writeEntry( "LastDoc",oldDocName );
-    cfg.write();
+        cfg.writeEntry( "LastDoc",oldDocName );
+        cfg.write();
+    }
 }
 
 void NotesControl::load(const QString & file) {
     qDebug("loading "+file);
     if(!loaded) {
         DocLnk nf;
         nf.setType("text/plain");
         nf.setFile( file);
 
         loadDoc(nf);
         loaded=true;
     }
 //    view->setFocus();
     oldDocName=file;
     Config cfg("Notes");
     cfg.setGroup("Docs");
     cfg.writeEntry( "LastDoc",oldDocName );
     cfg.write();
 }
 
 void NotesControl::loadDoc( const DocLnk &f) {
     FileManager fm;
     QString txt;
     if ( !fm.loadFile( f, txt ) ) {
         return;
     }
     view->setText(txt);
 }
 
 void NotesControl::slotViewEdited() {
      if(loaded) {
          edited=true;
      }
 }
 
 //===========================================================================
 
 NotesApplet::NotesApplet( QWidget *parent, const char *name )
         : QWidget( parent, name ) {
     setFixedHeight( 18 );
     setFixedWidth( 14 );
    vc = new NotesControl;
 }
 
 NotesApplet::~NotesApplet() {
 }
 
 void NotesApplet::mousePressEvent( QMouseEvent *) {
     if( !vc->isHidden()) {
         vc->doPopulate=false;
         vc->save();
         vc->close();
     } else {
 //    vc = new NotesControl;
 //    QPoint curPos = mapToGlobal( rect().topLeft() );
         vc->show();
         vc->move( 5, 18);
         vc->doPopulate=true;
         vc->populateBox();
         vc->doPopulate=false;
+        vc->loaded=false;
 
         vc->load();
 //        this->setFocus();
         vc->view->setFocus();
     }
 }
 
 void NotesApplet::paintEvent( QPaintEvent* ) {
     QPainter p(this);
     p.drawPixmap( 0, 1,  ( const char** ) notes_xpm );
 }