author | mickeyl <mickeyl> | 2003-10-27 18:45:36 (UTC) |
---|---|---|
committer | mickeyl <mickeyl> | 2003-10-27 18:45:36 (UTC) |
commit | df9d9d818c9667ba8e614e5c09f0e121e9225dfd (patch) (unidiff) | |
tree | fff36af7df853c64c68c839f5fdd9d065ff14e86 | |
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 | |||
@@ -78,10 +78,10 @@ static char * notes_xpm[] = { | |||
78 | " ..=.. ", | 78 | " ..=.. ", |
79 | " . "}; | 79 | " . "}; |
80 | 80 | ||
81 | 81 | ||
82 | NotesControl::NotesControl( QWidget *parent, const char *name ) | 82 | NotesControl::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"); |
87 | if( !d.exists()) { | 87 | if( !d.exists()) { |
@@ -90,47 +90,45 @@ NotesControl::NotesControl( QWidget *parent, const char *name ) | |||
90 | qDebug("<<<<<<<<<<<<<<<<<<<<<<<<<<<make dir failed"); | 90 | qDebug("<<<<<<<<<<<<<<<<<<<<<<<<<<<make dir failed"); |
91 | } | 91 | } |
92 | Config cfg("Notes"); | 92 | Config cfg("Notes"); |
93 | cfg.setGroup("Options"); | 93 | cfg.setGroup("Options"); |
94 | showMax = cfg.readBoolEntry("ShowMax", false); | 94 | showMax = cfg.readBoolEntry("ShowMax", false); |
95 | 95 | ||
96 | setFrameStyle( QFrame::PopupPanel | QFrame::Raised ); | 96 | setFrameStyle( QFrame::PopupPanel | QFrame::Raised ); |
97 | loaded=false; | 97 | loaded=false; |
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 | ||
110 | box->setFixedHeight(50); | 110 | box->setFixedHeight(50); |
111 | 111 | ||
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); | 129 | |
131 | 130 | ||
132 | vbox->addItem(hbox); | ||
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&)) ); |
136 | 134 | ||
@@ -146,9 +144,9 @@ NotesControl::NotesControl( QWidget *parent, const char *name ) | |||
146 | 144 | ||
147 | populateBox(); | 145 | populateBox(); |
148 | load(); | 146 | load(); |
149 | setCaption("Notes"); | 147 | setCaption("Notes"); |
150 | // parent->setFocus(); | 148 | // parent->setFocus(); |
151 | } | 149 | } |
152 | 150 | ||
153 | void NotesControl::slotSaveButton() { | 151 | void NotesControl::slotSaveButton() { |
154 | slotNewButton(); | 152 | slotNewButton(); |
@@ -158,9 +156,9 @@ void NotesControl::slotSaveButton() { | |||
158 | void NotesControl::slotDeleteButtonClicked() { | 156 | void NotesControl::slotDeleteButtonClicked() { |
159 | switch ( QMessageBox::warning(this,tr("Delete?") | 157 | switch ( QMessageBox::warning(this,tr("Delete?") |
160 | ,tr("Do you really want to<BR><B> delete</B> this note ?") | 158 | ,tr("Do you really want to<BR><B> delete</B> this note ?") |
161 | ,tr("Yes"),tr("No"),0,1,1) ) { | 159 | ,tr("Yes"),tr("No"),0,1,1) ) { |
162 | case 0: | 160 | case 0: |
163 | slotDeleteButton(); | 161 | slotDeleteButton(); |
164 | break; | 162 | break; |
165 | }; | 163 | }; |
166 | } | 164 | } |
@@ -198,13 +196,13 @@ void NotesControl::slotDeleteButton() { | |||
198 | qDebug(fi); | 196 | qDebug(fi); |
199 | 197 | ||
200 | QFile f( fi); | 198 | QFile f( fi); |
201 | if( !f.remove()) qDebug(".desktop file not removed"); | 199 | if( !f.remove()) qDebug(".desktop file not removed"); |
202 | 200 | ||
203 | } | 201 | } |
204 | } | 202 | } |
205 | view->clear(); | 203 | view->clear(); |
206 | 204 | ||
207 | populateBox(); | 205 | populateBox(); |
208 | } | 206 | } |
209 | } | 207 | } |
210 | 208 | ||
@@ -334,10 +332,10 @@ void NotesControl::save() { | |||
334 | if (doPopulate) | 332 | if (doPopulate) |
335 | populateBox(); | 333 | populateBox(); |
336 | } | 334 | } |
337 | cfg.writeEntry( "LastDoc",oldDocName ); | 335 | cfg.writeEntry( "LastDoc",oldDocName ); |
338 | cfg.write(); | 336 | cfg.write(); |
339 | 337 | ||
340 | } | 338 | } |
341 | } | 339 | } |
342 | 340 | ||
343 | void NotesControl::populateBox() { | 341 | void NotesControl::populateBox() { |
@@ -467,8 +465,9 @@ NotesApplet::NotesApplet( QWidget *parent, const char *name ) | |||
467 | vc = new NotesControl; | 465 | vc = new NotesControl; |
468 | } | 466 | } |
469 | 467 | ||
470 | NotesApplet::~NotesApplet() { | 468 | NotesApplet::~NotesApplet() { |
469 | delete vc; | ||
471 | } | 470 | } |
472 | 471 | ||
473 | void NotesApplet::mousePressEvent( QMouseEvent *) { | 472 | void NotesApplet::mousePressEvent( QMouseEvent *) { |
474 | if( !vc->isHidden()) { | 473 | if( !vc->isHidden()) { |
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 | |||
@@ -15,9 +15,9 @@ | |||
15 | #ifndef __NOTES_APPLET_H__ | 15 | #ifndef __NOTES_APPLET_H__ |
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> |
23 | #include <qpe/filemanager.h> | 23 | #include <qpe/filemanager.h> |
@@ -30,9 +30,9 @@ class QSpinBox; | |||
30 | class QPushButton; | 30 | class QPushButton; |
31 | class QMultiLineEdit; | 31 | class QMultiLineEdit; |
32 | class QListBox; | 32 | class QListBox; |
33 | class QListBoxItem; | 33 | class QListBoxItem; |
34 | class NotesControl : public QFrame { | 34 | class NotesControl : public QVBox { |
35 | Q_OBJECT | 35 | Q_OBJECT |
36 | public: | 36 | public: |
37 | NotesControl( QWidget *parent=0, const char *name=0 ); | 37 | NotesControl( QWidget *parent=0, const char *name=0 ); |
38 | 38 | ||
@@ -45,9 +45,9 @@ public: | |||
45 | bool showMax; | 45 | bool showMax; |
46 | void save(); | 46 | void save(); |
47 | void populateBox(); | 47 | void populateBox(); |
48 | void load(); | 48 | void load(); |
49 | 49 | ||
50 | private: | 50 | private: |
51 | QTimer menuTimer; | 51 | QTimer menuTimer; |
52 | DocLnk *doc; | 52 | DocLnk *doc; |
53 | QString oldDocName; | 53 | QString oldDocName; |
@@ -75,9 +75,9 @@ class NotesApplet : public QWidget { | |||
75 | Q_OBJECT | 75 | Q_OBJECT |
76 | public: | 76 | public: |
77 | NotesApplet( QWidget *parent = 0, const char *name=0 ); | 77 | NotesApplet( QWidget *parent = 0, const char *name=0 ); |
78 | ~NotesApplet(); | 78 | ~NotesApplet(); |
79 | NotesControl *vc; | 79 | NotesControl *vc; |
80 | public slots: | 80 | public slots: |
81 | private: | 81 | private: |
82 | void mousePressEvent( QMouseEvent * ); | 82 | void mousePressEvent( QMouseEvent * ); |
83 | void paintEvent( QPaintEvent* ); | 83 | void paintEvent( QPaintEvent* ); |
@@ -85,9 +85,9 @@ private: | |||
85 | private: | 85 | private: |
86 | QPixmap notesPixmap; | 86 | QPixmap notesPixmap; |
87 | private slots: | 87 | private slots: |
88 | 88 | ||
89 | 89 | ||
90 | }; | 90 | }; |
91 | 91 | ||
92 | #endif // __NOTES_APPLET_H__ | 92 | #endif // __NOTES_APPLET_H__ |
93 | 93 | ||
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 | |||
@@ -17,8 +17,9 @@ NotesAppletImpl::NotesAppletImpl() | |||
17 | : notes(0), ref(0) { | 17 | : notes(0), ref(0) { |
18 | } | 18 | } |
19 | 19 | ||
20 | NotesAppletImpl::~NotesAppletImpl() { | 20 | NotesAppletImpl::~NotesAppletImpl() { |
21 | // not needed though cause we should have a valid parent | ||
21 | delete notes; | 22 | delete notes; |
22 | } | 23 | } |
23 | 24 | ||
24 | QWidget *NotesAppletImpl::applet( QWidget *parent ) { | 25 | QWidget *NotesAppletImpl::applet( QWidget *parent ) { |