Diffstat (limited to 'core/apps/textedit/textedit.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | core/apps/textedit/textedit.cpp | 31 |
1 files changed, 16 insertions, 15 deletions
diff --git a/core/apps/textedit/textedit.cpp b/core/apps/textedit/textedit.cpp index 63709dd..ca760bb 100644 --- a/core/apps/textedit/textedit.cpp +++ b/core/apps/textedit/textedit.cpp | |||
@@ -17,13 +17,14 @@ | |||
17 | 17 | ||
18 | /* OPIE */ | 18 | /* OPIE */ |
19 | #include <opie2/odebug.h> | 19 | #include <opie2/odebug.h> |
20 | #include <opie2/ofileselector.h> | 20 | #include <opie2/ofileselector.h> |
21 | #include <opie2/ofiledialog.h> | 21 | #include <opie2/ofiledialog.h> |
22 | #include <opie2/ofontselector.h> | 22 | #include <opie2/ofontselector.h> |
23 | #include <qpe/resource.h> | 23 | #include <opie2/oresource.h> |
24 | |||
24 | #include <qpe/config.h> | 25 | #include <qpe/config.h> |
25 | #include <qpe/qpeapplication.h> | 26 | #include <qpe/qpeapplication.h> |
26 | 27 | ||
27 | 28 | ||
28 | /* QT */ | 29 | /* QT */ |
29 | #include <qmenubar.h> | 30 | #include <qmenubar.h> |
@@ -166,13 +167,13 @@ TextEdit::TextEdit( QWidget *parent, const char *name, WFlags f ) | |||
166 | connect( qApp,SIGNAL( aboutToQuit()),SLOT( cleanUp()) ); | 167 | connect( qApp,SIGNAL( aboutToQuit()),SLOT( cleanUp()) ); |
167 | 168 | ||
168 | channel = new QCopChannel( "QPE/Application/textedit", this ); | 169 | channel = new QCopChannel( "QPE/Application/textedit", this ); |
169 | connect( channel, SIGNAL(received(const QCString&,const QByteArray&)), | 170 | connect( channel, SIGNAL(received(const QCString&,const QByteArray&)), |
170 | this, SLOT(receive(const QCString&,const QByteArray&)) ); | 171 | this, SLOT(receive(const QCString&,const QByteArray&)) ); |
171 | 172 | ||
172 | setIcon( Resource::loadPixmap( "textedit/TextEditor" ) ); | 173 | setIcon( Opie::Core::OResource::loadPixmap( "textedit/TextEditor", Opie::Core::OResource::SmallIcon ) ); |
173 | 174 | ||
174 | QToolBar *bar = new QToolBar( this ); | 175 | QToolBar *bar = new QToolBar( this ); |
175 | bar->setHorizontalStretchable( true ); | 176 | bar->setHorizontalStretchable( true ); |
176 | menu = bar; | 177 | menu = bar; |
177 | 178 | ||
178 | QMenuBar *mb = new QMenuBar( bar ); | 179 | QMenuBar *mb = new QMenuBar( bar ); |
@@ -182,69 +183,69 @@ TextEdit::TextEdit( QWidget *parent, const char *name, WFlags f ) | |||
182 | 183 | ||
183 | font = new QPopupMenu( this ); | 184 | font = new QPopupMenu( this ); |
184 | 185 | ||
185 | bar = new QToolBar( this ); | 186 | bar = new QToolBar( this ); |
186 | editBar = bar; | 187 | editBar = bar; |
187 | 188 | ||
188 | QAction *a = new QAction( tr( "New" ), Resource::loadPixmap( "new" ), | 189 | QAction *a = new QAction( tr( "New" ), Opie::Core::OResource::loadPixmap( "new", Opie::Core::OResource::SmallIcon ), |
189 | QString::null, 0, this, 0 ); | 190 | QString::null, 0, this, 0 ); |
190 | connect( a, SIGNAL( activated() ), this, SLOT( fileNew() ) ); | 191 | connect( a, SIGNAL( activated() ), this, SLOT( fileNew() ) ); |
191 | // a->addTo( bar ); | 192 | // a->addTo( bar ); |
192 | a->addTo( file ); | 193 | a->addTo( file ); |
193 | 194 | ||
194 | a = new QAction( tr( "Open" ), Resource::loadPixmap( "fileopen" ), | 195 | a = new QAction( tr( "Open" ), Opie::Core::OResource::loadPixmap( "fileopen", Opie::Core::OResource::SmallIcon ), |
195 | QString::null, 0, this, 0 ); | 196 | QString::null, 0, this, 0 ); |
196 | connect( a, SIGNAL( activated() ), this, SLOT( fileOpen() ) ); | 197 | connect( a, SIGNAL( activated() ), this, SLOT( fileOpen() ) ); |
197 | a->addTo( bar ); | 198 | a->addTo( bar ); |
198 | a->addTo( file ); | 199 | a->addTo( file ); |
199 | 200 | ||
200 | a = new QAction( tr( "Save" ), Resource::loadPixmap("save") , | 201 | a = new QAction( tr( "Save" ), Opie::Core::OResource::loadPixmap( "save", Opie::Core::OResource::SmallIcon ), |
201 | QString::null, 0, this, 0 ); | 202 | QString::null, 0, this, 0 ); |
202 | connect( a, SIGNAL( activated() ), this, SLOT( save() ) ); | 203 | connect( a, SIGNAL( activated() ), this, SLOT( save() ) ); |
203 | file->insertSeparator(); | 204 | file->insertSeparator(); |
204 | a->addTo( bar ); | 205 | a->addTo( bar ); |
205 | a->addTo( file ); | 206 | a->addTo( file ); |
206 | 207 | ||
207 | a = new QAction( tr( "Save As" ), Resource::loadPixmap("save") , | 208 | a = new QAction( tr( "Save As" ), Opie::Core::OResource::loadPixmap( "save", Opie::Core::OResource::SmallIcon ), |
208 | QString::null, 0, this, 0 ); | 209 | QString::null, 0, this, 0 ); |
209 | connect( a, SIGNAL( activated() ), this, SLOT( saveAs() ) ); | 210 | connect( a, SIGNAL( activated() ), this, SLOT( saveAs() ) ); |
210 | a->addTo( file ); | 211 | a->addTo( file ); |
211 | 212 | ||
212 | a = new QAction( tr( "Cut" ), Resource::loadPixmap( "cut" ), | 213 | a = new QAction( tr( "Cut" ), Opie::Core::OResource::loadPixmap( "cut", Opie::Core::OResource::SmallIcon ), |
213 | QString::null, 0, this, 0 ); | 214 | QString::null, 0, this, 0 ); |
214 | connect( a, SIGNAL( activated() ), this, SLOT( editCut() ) ); | 215 | connect( a, SIGNAL( activated() ), this, SLOT( editCut() ) ); |
215 | a->addTo( editBar ); | 216 | a->addTo( editBar ); |
216 | a->addTo( edit ); | 217 | a->addTo( edit ); |
217 | 218 | ||
218 | a = new QAction( tr( "Copy" ), Resource::loadPixmap( "copy" ), | 219 | a = new QAction( tr( "Copy" ), Opie::Core::OResource::loadPixmap( "copy", Opie::Core::OResource::SmallIcon ), |
219 | QString::null, 0, this, 0 ); | 220 | QString::null, 0, this, 0 ); |
220 | connect( a, SIGNAL( activated() ), this, SLOT( editCopy() ) ); | 221 | connect( a, SIGNAL( activated() ), this, SLOT( editCopy() ) ); |
221 | a->addTo( editBar ); | 222 | a->addTo( editBar ); |
222 | a->addTo( edit ); | 223 | a->addTo( edit ); |
223 | 224 | ||
224 | a = new QAction( tr( "Paste" ), Resource::loadPixmap( "paste" ), | 225 | a = new QAction( tr( "Paste" ), Opie::Core::OResource::loadPixmap( "paste", Opie::Core::OResource::SmallIcon ), |
225 | QString::null, 0, this, 0 ); | 226 | QString::null, 0, this, 0 ); |
226 | connect( a, SIGNAL( activated() ), this, SLOT( editPaste() ) ); | 227 | connect( a, SIGNAL( activated() ), this, SLOT( editPaste() ) ); |
227 | a->addTo( editBar ); | 228 | a->addTo( editBar ); |
228 | a->addTo( edit ); | 229 | a->addTo( edit ); |
229 | 230 | ||
230 | 231 | ||
231 | #ifndef QT_NO_CLIPBOARD | 232 | #ifndef QT_NO_CLIPBOARD |
232 | a = new QAction( tr( "Insert Time and Date" ), Resource::loadPixmap( "paste" ), | 233 | a = new QAction( tr( "Insert Time and Date" ), Opie::Core::OResource::loadPixmap( "paste", Opie::Core::OResource::SmallIcon ), |
233 | QString::null, 0, this, 0 ); | 234 | QString::null, 0, this, 0 ); |
234 | connect( a, SIGNAL( activated() ), this, SLOT( editPasteTimeDate() ) ); | 235 | connect( a, SIGNAL( activated() ), this, SLOT( editPasteTimeDate() ) ); |
235 | a->addTo( edit ); | 236 | a->addTo( edit ); |
236 | #endif | 237 | #endif |
237 | 238 | ||
238 | a = new QAction( tr( "Goto Line..." ), Resource::loadPixmap( "find" ), | 239 | a = new QAction( tr( "Goto Line..." ), Opie::Core::OResource::loadPixmap( "find", Opie::Core::OResource::SmallIcon ), |
239 | QString::null, 0, this, 0 ); | 240 | QString::null, 0, this, 0 ); |
240 | connect( a, SIGNAL( activated() ), this, SLOT( gotoLine() ) ); | 241 | connect( a, SIGNAL( activated() ), this, SLOT( gotoLine() ) ); |
241 | edit->insertSeparator(); | 242 | edit->insertSeparator(); |
242 | a->addTo( edit ); | 243 | a->addTo( edit ); |
243 | 244 | ||
244 | a = new QAction( tr( "Find..." ), Resource::loadPixmap( "find" ), | 245 | a = new QAction( tr( "Find..." ), Opie::Core::OResource::loadPixmap( "find", Opie::Core::OResource::SmallIcon ), |
245 | QString::null, 0, this, 0 ); | 246 | QString::null, 0, this, 0 ); |
246 | connect( a, SIGNAL( activated() ), this, SLOT( editFind() ) ); | 247 | connect( a, SIGNAL( activated() ), this, SLOT( editFind() ) ); |
247 | a->addTo( bar ); | 248 | a->addTo( bar ); |
248 | a->addTo( edit ); | 249 | a->addTo( edit ); |
249 | 250 | ||
250 | zin = new QAction( tr("Zoom in"), QString::null, 0, this, 0 ); | 251 | zin = new QAction( tr("Zoom in"), QString::null, 0, this, 0 ); |
@@ -328,25 +329,25 @@ TextEdit::TextEdit( QWidget *parent, const char *name, WFlags f ) | |||
328 | 329 | ||
329 | searchEdit = new QLineEdit( searchBar, "searchEdit" ); | 330 | searchEdit = new QLineEdit( searchBar, "searchEdit" ); |
330 | searchBar->setStretchableWidget( searchEdit ); | 331 | searchBar->setStretchableWidget( searchEdit ); |
331 | connect( searchEdit, SIGNAL( textChanged(const QString&) ), | 332 | connect( searchEdit, SIGNAL( textChanged(const QString&) ), |
332 | this, SLOT( search() ) ); | 333 | this, SLOT( search() ) ); |
333 | 334 | ||
334 | a = new QAction( tr( "Find Next" ), Resource::loadPixmap( "next" ), | 335 | a = new QAction( tr( "Find Next" ), Opie::Core::OResource::loadPixmap( "next", Opie::Core::OResource::SmallIcon ), |
335 | QString::null, 0, this, 0 ); | 336 | QString::null, 0, this, 0 ); |
336 | connect( a, SIGNAL( activated() ), this, SLOT( findNext() ) ); | 337 | connect( a, SIGNAL( activated() ), this, SLOT( findNext() ) ); |
337 | a->addTo( searchBar ); | 338 | a->addTo( searchBar ); |
338 | a->addTo( edit ); | 339 | a->addTo( edit ); |
339 | 340 | ||
340 | a = new QAction( tr( "Close Find" ), Resource::loadPixmap( "close" ), | 341 | a = new QAction( tr( "Close Find" ), Opie::Core::OResource::loadPixmap( "close", Opie::Core::OResource::SmallIcon ), |
341 | QString::null, 0, this, 0 ); | 342 | QString::null, 0, this, 0 ); |
342 | connect( a, SIGNAL( activated() ), this, SLOT( findClose() ) ); | 343 | connect( a, SIGNAL( activated() ), this, SLOT( findClose() ) ); |
343 | a->addTo( searchBar ); | 344 | a->addTo( searchBar ); |
344 | 345 | ||
345 | edit->insertSeparator(); | 346 | edit->insertSeparator(); |
346 | a = new QAction( tr( "Delete" ), Resource::loadPixmap( "close" ), | 347 | a = new QAction( tr( "Delete" ), Opie::Core::OResource::loadPixmap( "close", Opie::Core::OResource::SmallIcon ), |
347 | QString::null, 0, this, 0 ); | 348 | QString::null, 0, this, 0 ); |
348 | connect( a, SIGNAL( activated() ), this, SLOT( editDelete() ) ); | 349 | connect( a, SIGNAL( activated() ), this, SLOT( editDelete() ) ); |
349 | a->addTo( edit ); | 350 | a->addTo( edit ); |
350 | 351 | ||
351 | searchBar->hide(); | 352 | searchBar->hide(); |
352 | 353 | ||