Diffstat (limited to 'core/apps/textedit/textedit.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | core/apps/textedit/textedit.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/core/apps/textedit/textedit.cpp b/core/apps/textedit/textedit.cpp index 0e3254f..be18140 100644 --- a/core/apps/textedit/textedit.cpp +++ b/core/apps/textedit/textedit.cpp | |||
@@ -18,25 +18,25 @@ | |||
18 | #include <opie/ofileselector.h> | 18 | #include <opie/ofileselector.h> |
19 | #include <opie/ofiledialog.h> | 19 | #include <opie/ofiledialog.h> |
20 | #include <opie/ofontselector.h> | 20 | #include <opie/ofontselector.h> |
21 | 21 | ||
22 | #include <qpe/fontdatabase.h> | 22 | #include <qpe/fontdatabase.h> |
23 | #include <qpe/global.h> | 23 | #include <qpe/global.h> |
24 | #include <qpe/fileselector.h> | 24 | #include <qpe/fileselector.h> |
25 | #include <qpe/applnk.h> | 25 | #include <qpe/applnk.h> |
26 | #include <qpe/resource.h> | 26 | #include <qpe/resource.h> |
27 | #include <qpe/config.h> | 27 | #include <qpe/config.h> |
28 | #include <qpe/qpeapplication.h> | 28 | #include <qpe/qpeapplication.h> |
29 | #include <qmenubar.h> | 29 | #include <qmenubar.h> |
30 | #include <qpe/qpetoolbar.h> | 30 | #include <qtoolbar.h> |
31 | #include <qpe/qcopenvelope_qws.h> | 31 | #include <qpe/qcopenvelope_qws.h> |
32 | 32 | ||
33 | #include <qpoint.h> | 33 | #include <qpoint.h> |
34 | #include <qtextstream.h> | 34 | #include <qtextstream.h> |
35 | #include <qdatetime.h> | 35 | #include <qdatetime.h> |
36 | #include <qclipboard.h> | 36 | #include <qclipboard.h> |
37 | #include <qstringlist.h> | 37 | #include <qstringlist.h> |
38 | #include <qaction.h> | 38 | #include <qaction.h> |
39 | #include <qcolordialog.h> | 39 | #include <qcolordialog.h> |
40 | #include <qfileinfo.h> | 40 | #include <qfileinfo.h> |
41 | #include <qlineedit.h> | 41 | #include <qlineedit.h> |
42 | #include <qmessagebox.h> | 42 | #include <qmessagebox.h> |
@@ -173,36 +173,36 @@ TextEdit::TextEdit( QWidget *parent, const char *name, WFlags f ) | |||
173 | edited=false; | 173 | edited=false; |
174 | fromSetDocument=false; | 174 | fromSetDocument=false; |
175 | 175 | ||
176 | setToolBarsMovable( false ); | 176 | setToolBarsMovable( false ); |
177 | connect( qApp,SIGNAL( aboutToQuit()),SLOT( cleanUp()) ); | 177 | connect( qApp,SIGNAL( aboutToQuit()),SLOT( cleanUp()) ); |
178 | 178 | ||
179 | channel = new QCopChannel( "QPE/Application/textedit", this ); | 179 | channel = new QCopChannel( "QPE/Application/textedit", this ); |
180 | connect( channel, SIGNAL(received(const QCString&, const QByteArray&)), | 180 | connect( channel, SIGNAL(received(const QCString&, const QByteArray&)), |
181 | this, SLOT(receive(const QCString&, const QByteArray&)) ); | 181 | this, SLOT(receive(const QCString&, const QByteArray&)) ); |
182 | 182 | ||
183 | setIcon( Resource::loadPixmap( "TextEditor" ) ); | 183 | setIcon( Resource::loadPixmap( "TextEditor" ) ); |
184 | 184 | ||
185 | QPEToolBar *bar = new QPEToolBar( this ); | 185 | QToolBar *bar = new QToolBar( this ); |
186 | bar->setHorizontalStretchable( true ); | 186 | bar->setHorizontalStretchable( true ); |
187 | menu = bar; | 187 | menu = bar; |
188 | 188 | ||
189 | QMenuBar *mb = new QMenuBar( bar ); | 189 | QMenuBar *mb = new QMenuBar( bar ); |
190 | QPopupMenu *file = new QPopupMenu( this ); | 190 | QPopupMenu *file = new QPopupMenu( this ); |
191 | QPopupMenu *edit = new QPopupMenu( this ); | 191 | QPopupMenu *edit = new QPopupMenu( this ); |
192 | QPopupMenu *advancedMenu = new QPopupMenu(this); | 192 | QPopupMenu *advancedMenu = new QPopupMenu(this); |
193 | 193 | ||
194 | font = new QPopupMenu( this ); | 194 | font = new QPopupMenu( this ); |
195 | 195 | ||
196 | bar = new QPEToolBar( this ); | 196 | bar = new QToolBar( this ); |
197 | editBar = bar; | 197 | editBar = bar; |
198 | 198 | ||
199 | QAction *a = new QAction( tr( "New" ), Resource::loadPixmap( "new" ), | 199 | QAction *a = new QAction( tr( "New" ), Resource::loadPixmap( "new" ), |
200 | QString::null, 0, this, 0 ); | 200 | QString::null, 0, this, 0 ); |
201 | connect( a, SIGNAL( activated() ), this, SLOT( fileNew() ) ); | 201 | connect( a, SIGNAL( activated() ), this, SLOT( fileNew() ) ); |
202 | // a->addTo( bar ); | 202 | // a->addTo( bar ); |
203 | a->addTo( file ); | 203 | a->addTo( file ); |
204 | 204 | ||
205 | a = new QAction( tr( "Open" ), Resource::loadPixmap( "fileopen" ), | 205 | a = new QAction( tr( "Open" ), Resource::loadPixmap( "fileopen" ), |
206 | QString::null, 0, this, 0 ); | 206 | QString::null, 0, this, 0 ); |
207 | connect( a, SIGNAL( activated() ), this, SLOT( fileOpen() ) ); | 207 | connect( a, SIGNAL( activated() ), this, SLOT( fileOpen() ) ); |
208 | a->addTo( bar ); | 208 | a->addTo( bar ); |
@@ -323,25 +323,25 @@ TextEdit::TextEdit( QWidget *parent, const char *name, WFlags f ) | |||
323 | nAutoSave->setToggleAction(true); | 323 | nAutoSave->setToggleAction(true); |
324 | nAutoSave->addTo( advancedMenu); | 324 | nAutoSave->addTo( advancedMenu); |
325 | 325 | ||
326 | 326 | ||
327 | //font->insertSeparator(); | 327 | //font->insertSeparator(); |
328 | 328 | ||
329 | //font->insertItem(tr("About"), this, SLOT( doAbout()) ); | 329 | //font->insertItem(tr("About"), this, SLOT( doAbout()) ); |
330 | 330 | ||
331 | mb->insertItem( tr( "File" ), file ); | 331 | mb->insertItem( tr( "File" ), file ); |
332 | mb->insertItem( tr( "Edit" ), edit ); | 332 | mb->insertItem( tr( "Edit" ), edit ); |
333 | mb->insertItem( tr( "View" ), font ); | 333 | mb->insertItem( tr( "View" ), font ); |
334 | 334 | ||
335 | searchBar = new QPEToolBar(this); | 335 | searchBar = new QToolBar(this); |
336 | addToolBar( searchBar, "Search", QMainWindow::Top, true ); | 336 | addToolBar( searchBar, "Search", QMainWindow::Top, true ); |
337 | 337 | ||
338 | searchBar->setHorizontalStretchable( true ); | 338 | searchBar->setHorizontalStretchable( true ); |
339 | 339 | ||
340 | searchEdit = new QLineEdit( searchBar, "searchEdit" ); | 340 | searchEdit = new QLineEdit( searchBar, "searchEdit" ); |
341 | searchBar->setStretchableWidget( searchEdit ); | 341 | searchBar->setStretchableWidget( searchEdit ); |
342 | connect( searchEdit, SIGNAL( textChanged( const QString & ) ), | 342 | connect( searchEdit, SIGNAL( textChanged( const QString & ) ), |
343 | this, SLOT( search() ) ); | 343 | this, SLOT( search() ) ); |
344 | 344 | ||
345 | a = new QAction( tr( "Find Next" ), Resource::loadPixmap( "next" ), | 345 | a = new QAction( tr( "Find Next" ), Resource::loadPixmap( "next" ), |
346 | QString::null, 0, this, 0 ); | 346 | QString::null, 0, this, 0 ); |
347 | connect( a, SIGNAL( activated() ), this, SLOT( findNext() ) ); | 347 | connect( a, SIGNAL( activated() ), this, SLOT( findNext() ) ); |