summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--noncore/applets/notesapplet/notes.cpp29
-rw-r--r--noncore/applets/notesapplet/notes.h4
-rw-r--r--noncore/applets/notesapplet/notesappletimpl.cpp1
3 files changed, 17 insertions, 17 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
@@ -79,8 +79,8 @@ static char * notes_xpm[] = {
79" . "}; 79" . "};
80 80
81 81
82NotesControl::NotesControl( QWidget *parent, const char *name ) 82NotesControl::NotesControl( QWidget *, const char * )
83 : QFrame( parent, name,/* WDestructiveClose | */WStyle_StaysOnTop ) 83 : QVBox( 0, "NotesControl",/* WDestructiveClose | */WStyle_StaysOnTop )
84// : QFrame( parent, name, WDestructiveClose | WStyle_StaysOnTop | WType_Popup ) 84// : QFrame( parent, name, WDestructiveClose | WStyle_StaysOnTop | WType_Popup )
85{ 85{
86 QDir d( QDir::homeDirPath()+"/notes"); 86 QDir d( QDir::homeDirPath()+"/notes");
@@ -98,12 +98,12 @@ NotesControl::NotesControl( QWidget *parent, const char *name )
98 edited=false; 98 edited=false;
99 doPopulate=true; 99 doPopulate=true;
100 isNew=false; 100 isNew=false;
101 QVBoxLayout *vbox = new QVBoxLayout( this,0, -1, "Vlayout" ); 101 QVBox *vbox = new QVBox( this, "Vlayout" );
102 QHBoxLayout *hbox = new QHBoxLayout( this, 0, -1, "HLayout" ); 102 QHBox *hbox = new QHBox( this, "HLayout" );
103 103
104 view = new QMultiLineEdit(this, "OpieNotesView"); 104 view = new QMultiLineEdit(vbox, "OpieNotesView");
105 105
106 box = new QListBox(this, "OpieNotesBox"); 106 box = new QListBox(vbox, "OpieNotesBox");
107 107
108 QPEApplication::setStylusOperation( box->viewport(),QPEApplication::RightOnHold); 108 QPEApplication::setStylusOperation( box->viewport(),QPEApplication::RightOnHold);
109 109
@@ -112,24 +112,22 @@ NotesControl::NotesControl( QWidget *parent, const char *name )
112 vbox->setMargin( 6 ); 112 vbox->setMargin( 6 );
113 vbox->setSpacing( 3 ); 113 vbox->setSpacing( 3 );
114 114
115 vbox->addWidget( view); 115
116 vbox->addWidget( box);
117 116
118 setFocusPolicy(QWidget::StrongFocus); 117 setFocusPolicy(QWidget::StrongFocus);
119 118
120 newButton= new QPushButton( this, "newButton" ); 119 newButton= new QPushButton( hbox, "newButton" );
121 newButton->setText(tr("New")); 120 newButton->setText(tr("New"));
122 hbox->addWidget( newButton);
123 121
124 saveButton= new QPushButton( this, "saveButton" ); 122
123 saveButton= new QPushButton( hbox, "saveButton" );
125 saveButton->setText(tr("Save")); 124 saveButton->setText(tr("Save"));
126 hbox->addWidget( saveButton);
127 125
128 deleteButton= new QPushButton( this, "deleteButton" ); 126
127 deleteButton= new QPushButton( hbox, "deleteButton" );
129 deleteButton->setText(tr("Delete")); 128 deleteButton->setText(tr("Delete"));
130 hbox->addWidget( deleteButton);
131 129
132 vbox->addItem(hbox); 130
133 131
134 connect( box, SIGNAL( mouseButtonPressed( int, QListBoxItem *, const QPoint&)), 132 connect( box, SIGNAL( mouseButtonPressed( int, QListBoxItem *, const QPoint&)),
135 this,SLOT( boxPressed(int, QListBoxItem *, const QPoint&)) ); 133 this,SLOT( boxPressed(int, QListBoxItem *, const QPoint&)) );
@@ -468,6 +466,7 @@ NotesApplet::NotesApplet( QWidget *parent, const char *name )
468} 466}
469 467
470NotesApplet::~NotesApplet() { 468NotesApplet::~NotesApplet() {
469 delete vc;
471} 470}
472 471
473void NotesApplet::mousePressEvent( QMouseEvent *) { 472void NotesApplet::mousePressEvent( QMouseEvent *) {
diff --git a/noncore/applets/notesapplet/notes.h b/noncore/applets/notesapplet/notes.h
index c428efe..08253cb 100644
--- a/noncore/applets/notesapplet/notes.h
+++ b/noncore/applets/notesapplet/notes.h
@@ -16,7 +16,7 @@
16#define __NOTES_APPLET_H__ 16#define __NOTES_APPLET_H__
17 17
18#include <qwidget.h> 18#include <qwidget.h>
19#include <qframe.h> 19#include <qvbox.h>
20#include <qpixmap.h> 20#include <qpixmap.h>
21#include <qguardedptr.h> 21#include <qguardedptr.h>
22#include <qtimer.h> 22#include <qtimer.h>
@@ -31,7 +31,7 @@ class QPushButton;
31class QMultiLineEdit; 31class QMultiLineEdit;
32class QListBox; 32class QListBox;
33class QListBoxItem; 33class QListBoxItem;
34class NotesControl : public QFrame { 34class NotesControl : public QVBox {
35 Q_OBJECT 35 Q_OBJECT
36public: 36public:
37 NotesControl( QWidget *parent=0, const char *name=0 ); 37 NotesControl( QWidget *parent=0, const char *name=0 );
diff --git a/noncore/applets/notesapplet/notesappletimpl.cpp b/noncore/applets/notesapplet/notesappletimpl.cpp
index 93e1e97..0526bad 100644
--- a/noncore/applets/notesapplet/notesappletimpl.cpp
+++ b/noncore/applets/notesapplet/notesappletimpl.cpp
@@ -18,6 +18,7 @@ NotesAppletImpl::NotesAppletImpl()
18} 18}
19 19
20NotesAppletImpl::~NotesAppletImpl() { 20NotesAppletImpl::~NotesAppletImpl() {
21 // not needed though cause we should have a valid parent
21 delete notes; 22 delete notes;
22} 23}
23 24