author | mickeyl <mickeyl> | 2003-10-27 18:45:36 (UTC) |
---|---|---|
committer | mickeyl <mickeyl> | 2003-10-27 18:45:36 (UTC) |
commit | df9d9d818c9667ba8e614e5c09f0e121e9225dfd (patch) (side-by-side diff) | |
tree | fff36af7df853c64c68c839f5fdd9d065ff14e86 /noncore/applets/notesapplet | |
parent | 96a577bb03db6ccbf1a10b03116d3b868233df0e (diff) | |
download | opie-df9d9d818c9667ba8e614e5c09f0e121e9225dfd.zip opie-df9d9d818c9667ba8e614e5c09f0e121e9225dfd.tar.gz opie-df9d9d818c9667ba8e614e5c09f0e121e9225dfd.tar.bz2 |
merge noncore/applets/*
-rw-r--r-- | noncore/applets/notesapplet/notes.cpp | 45 | ||||
-rw-r--r-- | noncore/applets/notesapplet/notes.h | 10 | ||||
-rw-r--r-- | noncore/applets/notesapplet/notesappletimpl.cpp | 1 |
3 files changed, 28 insertions, 28 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 @@ -81,4 +81,4 @@ 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 ) @@ -93,3 +93,3 @@ NotesControl::NotesControl( QWidget *parent, const char *name ) cfg.setGroup("Options"); - showMax = cfg.readBoolEntry("ShowMax", false); + showMax = cfg.readBoolEntry("ShowMax", false); @@ -100,8 +100,8 @@ NotesControl::NotesControl( QWidget *parent, const char *name ) 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"); @@ -114,4 +114,3 @@ NotesControl::NotesControl( QWidget *parent, const char *name ) - vbox->addWidget( view); - vbox->addWidget( box); + @@ -119,15 +118,14 @@ NotesControl::NotesControl( QWidget *parent, const char *name ) - 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); + + @@ -149,3 +147,3 @@ NotesControl::NotesControl( QWidget *parent, const char *name ) setCaption("Notes"); - // parent->setFocus(); + // parent->setFocus(); } @@ -161,3 +159,3 @@ void NotesControl::slotDeleteButtonClicked() { ,tr("Yes"),tr("No"),0,1,1) ) { - case 0: + case 0: slotDeleteButton(); @@ -201,3 +199,3 @@ void NotesControl::slotDeleteButton() { if( !f.remove()) qDebug(".desktop file not removed"); - + } @@ -205,3 +203,3 @@ void NotesControl::slotDeleteButton() { view->clear(); - + populateBox(); @@ -337,4 +335,4 @@ void NotesControl::save() { cfg.writeEntry( "LastDoc",oldDocName ); - cfg.write(); - + cfg.write(); + } @@ -470,2 +468,3 @@ NotesApplet::NotesApplet( QWidget *parent, const char *name ) NotesApplet::~NotesApplet() { + delete vc; } 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 @@ -18,3 +18,3 @@ #include <qwidget.h> -#include <qframe.h> +#include <qvbox.h> #include <qpixmap.h> @@ -33,3 +33,3 @@ class QListBox; class QListBoxItem; -class NotesControl : public QFrame { +class NotesControl : public QVBox { Q_OBJECT @@ -48,3 +48,3 @@ public: void load(); - + private: @@ -78,3 +78,3 @@ public: ~NotesApplet(); - NotesControl *vc; + NotesControl *vc; public slots: @@ -88,3 +88,3 @@ private slots: - + }; 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 @@ -20,2 +20,3 @@ NotesAppletImpl::NotesAppletImpl() NotesAppletImpl::~NotesAppletImpl() { + // not needed though cause we should have a valid parent delete notes; |