Diffstat (limited to 'noncore/applets/notesapplet/notes.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | noncore/applets/notesapplet/notes.cpp | 45 |
1 files changed, 22 insertions, 23 deletions
diff --git a/noncore/applets/notesapplet/notes.cpp b/noncore/applets/notesapplet/notes.cpp index 4e98b31..e2b0c2a 100644 --- a/noncore/applets/notesapplet/notes.cpp +++ b/noncore/applets/notesapplet/notes.cpp @@ -76,63 +76,61 @@ static char * notes_xpm[] = { " ..=**=#&=&=.. ", " ..=*=&=.. ", " ..=.. ", " . "}; -NotesControl::NotesControl( QWidget *parent, const char *name ) - : QFrame( parent, name,/* WDestructiveClose | */WStyle_StaysOnTop ) +NotesControl::NotesControl( QWidget *, const char * ) + : QVBox( 0, "NotesControl",/* WDestructiveClose | */WStyle_StaysOnTop ) // : QFrame( parent, name, WDestructiveClose | WStyle_StaysOnTop | WType_Popup ) { QDir d( QDir::homeDirPath()+"/notes"); if( !d.exists()) { qDebug("make dir"); if(!d.mkdir( QDir::homeDirPath()+"/notes", true)) qDebug("<<<<<<<<<<<<<<<<<<<<<<<<<<<make dir failed"); } Config cfg("Notes"); cfg.setGroup("Options"); - showMax = cfg.readBoolEntry("ShowMax", false); + showMax = cfg.readBoolEntry("ShowMax", false); 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" ); + QVBox *vbox = new QVBox( this, "Vlayout" ); + QHBox *hbox = new QHBox( this, "HLayout" ); - view = new QMultiLineEdit(this, "OpieNotesView"); + view = new QMultiLineEdit(vbox, "OpieNotesView"); - box = new QListBox(this, "OpieNotesBox"); + box = new QListBox(vbox, "OpieNotesBox"); QPEApplication::setStylusOperation( box->viewport(),QPEApplication::RightOnHold); box->setFixedHeight(50); vbox->setMargin( 6 ); vbox->setSpacing( 3 ); - vbox->addWidget( view); - vbox->addWidget( box); + setFocusPolicy(QWidget::StrongFocus); - newButton= new QPushButton( this, "newButton" ); + newButton= new QPushButton( hbox, "newButton" ); newButton->setText(tr("New")); - hbox->addWidget( newButton); - saveButton= new QPushButton( this, "saveButton" ); + + saveButton= new QPushButton( hbox, "saveButton" ); saveButton->setText(tr("Save")); - hbox->addWidget( saveButton); - deleteButton= new QPushButton( this, "deleteButton" ); + + deleteButton= new QPushButton( hbox, "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 &))); @@ -144,25 +142,25 @@ NotesControl::NotesControl( QWidget *parent, const char *name ) connect(saveButton, SIGNAL(clicked()), this, SLOT(slotSaveButton())); connect(deleteButton, SIGNAL(clicked()), this, SLOT(slotDeleteButtonClicked())); populateBox(); load(); setCaption("Notes"); - // parent->setFocus(); + // parent->setFocus(); } void NotesControl::slotSaveButton() { slotNewButton(); populateBox(); } void NotesControl::slotDeleteButtonClicked() { switch ( QMessageBox::warning(this,tr("Delete?") ,tr("Do you really want to<BR><B> delete</B> this note ?") ,tr("Yes"),tr("No"),0,1,1) ) { - case 0: + case 0: slotDeleteButton(); break; }; } void NotesControl::slotDeleteButton() { @@ -196,17 +194,17 @@ void NotesControl::slotDeleteButton() { 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(); @@ -332,14 +330,14 @@ void NotesControl::save() { edited=false; // qDebug("save"); if (doPopulate) populateBox(); } cfg.writeEntry( "LastDoc",oldDocName ); - cfg.write(); - + cfg.write(); + } } void NotesControl::populateBox() { box->clear(); // qDebug("populate"); @@ -465,12 +463,13 @@ NotesApplet::NotesApplet( QWidget *parent, const char *name ) setFixedHeight( 18 ); setFixedWidth( 14 ); vc = new NotesControl; } NotesApplet::~NotesApplet() { + delete vc; } void NotesApplet::mousePressEvent( QMouseEvent *) { if( !vc->isHidden()) { vc->doPopulate=false; vc->save(); |