author | llornkcor <llornkcor> | 2002-12-20 22:55:01 (UTC) |
---|---|---|
committer | llornkcor <llornkcor> | 2002-12-20 22:55:01 (UTC) |
commit | 48efd0d81aad0c3d0a64baabbc46fde593eb086c (patch) (unidiff) | |
tree | fbf4aa16a389770f065f48e9888e1cd292f81a9f | |
parent | 3e67f4998a4957420d7f890268dc5f816e142468 (diff) | |
download | opie-48efd0d81aad0c3d0a64baabbc46fde593eb086c.zip opie-48efd0d81aad0c3d0a64baabbc46fde593eb086c.tar.gz opie-48efd0d81aad0c3d0a64baabbc46fde593eb086c.tar.bz2 |
sic workaround hack for now. fixes bug #569
-rw-r--r-- | core/apps/textedit/textedit.cpp | 157 |
1 files changed, 99 insertions, 58 deletions
diff --git a/core/apps/textedit/textedit.cpp b/core/apps/textedit/textedit.cpp index 4f4f994..dc0d61b 100644 --- a/core/apps/textedit/textedit.cpp +++ b/core/apps/textedit/textedit.cpp | |||
@@ -1,6 +1,7 @@ | |||
1 | /********************************************************************** | 1 | /********************************************************************** |
2 | // textedit.cpp | ||
2 | ** Copyright (C) 2000 Trolltech AS. All rights reserved. | 3 | ** Copyright (C) 2000 Trolltech AS. All rights reserved. |
3 | ** | 4 | ** |
4 | ** This file is part of Qtopia Environment. | 5 | ** This file is part of Opie Environment. |
5 | ** | 6 | ** |
6 | ** This file may be distributed and/or modified under the terms of the | 7 | ** This file may be distributed and/or modified under the terms of the |
@@ -9,23 +10,9 @@ | |||
9 | ** packaging of this file. | 10 | ** packaging of this file. |
10 | ** | 11 | ** |
11 | ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE | ||
12 | ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. | ||
13 | ** | ||
14 | ** See http://www.trolltech.com/gpl/ for GPL licensing information. | ||
15 | ** | ||
16 | ** Contact info@trolltech.com if any conditions of this licensing are | ||
17 | ** not clear to you. | ||
18 | ** | ||
19 | **********************************************************************/ | 12 | **********************************************************************/ |
20 | // changes added by L. J. Potter Sun 02-17-2002 21:31:31 | 13 | // changes added by L. J. Potter Sun 02-17-2002 21:31:31 |
21 | /* | ||
22 | useAdvancedfeatures = | ||
23 | 1) do not prompt on cancel, even if text is edited. | ||
24 | 2) prompt user is .desktop file | ||
25 | 3) prompt user for File Permissions on saveAs | ||
26 | */ | ||
27 | #include "textedit.h" | 14 | #include "textedit.h" |
28 | #include "filePermissions.h" | 15 | #include "filePermissions.h" |
29 | //#include "fontDialog.h" | 16 | |
30 | 17 | ||
31 | #include <opie/ofileselector.h> | 18 | #include <opie/ofileselector.h> |
@@ -44,4 +31,5 @@ | |||
44 | #include <qpe/qcopenvelope_qws.h> | 31 | #include <qpe/qcopenvelope_qws.h> |
45 | 32 | ||
33 | #include <qpoint.h> | ||
46 | #include <qtextstream.h> | 34 | #include <qtextstream.h> |
47 | #include <qdatetime.h> | 35 | #include <qdatetime.h> |
@@ -170,5 +158,5 @@ static char * filesave_xpm[] = { | |||
170 | class QpeEditor : public QMultiLineEdit | 158 | class QpeEditor : public QMultiLineEdit |
171 | { | 159 | { |
172 | // Q_OBJECT | 160 | |
173 | public: | 161 | public: |
174 | QpeEditor( QWidget *parent, const char * name = 0 ) | 162 | QpeEditor( QWidget *parent, const char * name = 0 ) |
@@ -180,4 +168,10 @@ public: | |||
180 | void find( const QString &txt, bool caseSensitive, | 168 | void find( const QString &txt, bool caseSensitive, |
181 | bool backwards ); | 169 | bool backwards ); |
170 | protected: | ||
171 | bool markIt; | ||
172 | int line1, line2, col1, col2; | ||
173 | void mousePressEvent( QMouseEvent * ); | ||
174 | void mouseReleaseEvent( QMouseEvent * ); | ||
175 | |||
182 | //public slots: | 176 | //public slots: |
183 | /* | 177 | /* |
@@ -191,4 +185,36 @@ private: | |||
191 | }; | 185 | }; |
192 | 186 | ||
187 | void QpeEditor::mousePressEvent( QMouseEvent *e ) { | ||
188 | switch(e->button()) { | ||
189 | case RightButton: | ||
190 | { //rediculous workaround for qt popup menu | ||
191 | //and the hold right click mechanism | ||
192 | this->setSelection( line1, col1, line2, col2); | ||
193 | QMultiLineEdit::mousePressEvent( e ); | ||
194 | markIt = false; | ||
195 | } | ||
196 | break; | ||
197 | default: | ||
198 | { | ||
199 | if(!markIt) { | ||
200 | int line, col; | ||
201 | this->getCursorPosition(&line, &col); | ||
202 | line1=line2=line; | ||
203 | col1=col2=col; | ||
204 | } | ||
205 | QMultiLineEdit::mousePressEvent( e ); | ||
206 | } | ||
207 | break; | ||
208 | }; | ||
209 | } | ||
210 | |||
211 | void QpeEditor::mouseReleaseEvent( QMouseEvent * ) { | ||
212 | if(this->hasMarkedText()) { | ||
213 | markIt = true; | ||
214 | this->getMarkedRegion( &line1, &col1, &line2, & col2 ); | ||
215 | } else { | ||
216 | markIt = false; | ||
217 | } | ||
218 | } | ||
193 | 219 | ||
194 | void QpeEditor::find ( const QString &txt, bool caseSensitive, | 220 | void QpeEditor::find ( const QString &txt, bool caseSensitive, |
@@ -269,15 +295,18 @@ TextEdit::TextEdit( QWidget *parent, const char *name, WFlags f ) | |||
269 | editBar = bar; | 295 | editBar = bar; |
270 | 296 | ||
271 | QAction *a = new QAction( tr( "New" ), Resource::loadPixmap( "new" ), QString::null, 0, this, 0 ); | 297 | QAction *a = new QAction( tr( "New" ), Resource::loadPixmap( "new" ), |
298 | QString::null, 0, this, 0 ); | ||
272 | connect( a, SIGNAL( activated() ), this, SLOT( fileNew() ) ); | 299 | connect( a, SIGNAL( activated() ), this, SLOT( fileNew() ) ); |
273 | // a->addTo( bar ); | 300 | // a->addTo( bar ); |
274 | a->addTo( file ); | 301 | a->addTo( file ); |
275 | 302 | ||
276 | a = new QAction( tr( "Open" ), Resource::loadPixmap( "fileopen" ), QString::null, 0, this, 0 ); | 303 | a = new QAction( tr( "Open" ), Resource::loadPixmap( "fileopen" ), |
304 | QString::null, 0, this, 0 ); | ||
277 | connect( a, SIGNAL( activated() ), this, SLOT( fileOpen() ) ); | 305 | connect( a, SIGNAL( activated() ), this, SLOT( fileOpen() ) ); |
278 | a->addTo( bar ); | 306 | a->addTo( bar ); |
279 | a->addTo( file ); | 307 | a->addTo( file ); |
280 | 308 | ||
281 | a = new QAction( tr( "Save" ), QPixmap(( const char** ) filesave_xpm ) , QString::null, 0, this, 0 ); | 309 | a = new QAction( tr( "Save" ), QPixmap(( const char** ) filesave_xpm ) , |
310 | QString::null, 0, this, 0 ); | ||
282 | connect( a, SIGNAL( activated() ), this, SLOT( save() ) ); | 311 | connect( a, SIGNAL( activated() ), this, SLOT( save() ) ); |
283 | file->insertSeparator(); | 312 | file->insertSeparator(); |
@@ -285,19 +314,23 @@ TextEdit::TextEdit( QWidget *parent, const char *name, WFlags f ) | |||
285 | a->addTo( file ); | 314 | a->addTo( file ); |
286 | 315 | ||
287 | a = new QAction( tr( "Save As" ), QPixmap(( const char** ) filesave_xpm ) , QString::null, 0, this, 0 ); | 316 | a = new QAction( tr( "Save As" ), QPixmap(( const char** ) filesave_xpm ) , |
317 | QString::null, 0, this, 0 ); | ||
288 | connect( a, SIGNAL( activated() ), this, SLOT( saveAs() ) ); | 318 | connect( a, SIGNAL( activated() ), this, SLOT( saveAs() ) ); |
289 | a->addTo( file ); | 319 | a->addTo( file ); |
290 | 320 | ||
291 | a = new QAction( tr( "Cut" ), Resource::loadPixmap( "cut" ), QString::null, 0, this, 0 ); | 321 | a = new QAction( tr( "Cut" ), Resource::loadPixmap( "cut" ), |
322 | QString::null, 0, this, 0 ); | ||
292 | connect( a, SIGNAL( activated() ), this, SLOT( editCut() ) ); | 323 | connect( a, SIGNAL( activated() ), this, SLOT( editCut() ) ); |
293 | a->addTo( editBar ); | 324 | a->addTo( editBar ); |
294 | a->addTo( edit ); | 325 | a->addTo( edit ); |
295 | 326 | ||
296 | a = new QAction( tr( "Copy" ), Resource::loadPixmap( "copy" ), QString::null, 0, this, 0 ); | 327 | a = new QAction( tr( "Copy" ), Resource::loadPixmap( "copy" ), |
328 | QString::null, 0, this, 0 ); | ||
297 | connect( a, SIGNAL( activated() ), this, SLOT( editCopy() ) ); | 329 | connect( a, SIGNAL( activated() ), this, SLOT( editCopy() ) ); |
298 | a->addTo( editBar ); | 330 | a->addTo( editBar ); |
299 | a->addTo( edit ); | 331 | a->addTo( edit ); |
300 | 332 | ||
301 | a = new QAction( tr( "Paste" ), Resource::loadPixmap( "paste" ), QString::null, 0, this, 0 ); | 333 | a = new QAction( tr( "Paste" ), Resource::loadPixmap( "paste" ), |
334 | QString::null, 0, this, 0 ); | ||
302 | connect( a, SIGNAL( activated() ), this, SLOT( editPaste() ) ); | 335 | connect( a, SIGNAL( activated() ), this, SLOT( editPaste() ) ); |
303 | a->addTo( editBar ); | 336 | a->addTo( editBar ); |
@@ -306,10 +339,12 @@ TextEdit::TextEdit( QWidget *parent, const char *name, WFlags f ) | |||
306 | 339 | ||
307 | #ifndef QT_NO_CLIPBOARD | 340 | #ifndef QT_NO_CLIPBOARD |
308 | a = new QAction( tr( "Insert Time and Date" ), Resource::loadPixmap( "paste" ), QString::null, 0, this, 0 ); | 341 | a = new QAction( tr( "Insert Time and Date" ), Resource::loadPixmap( "paste" ), |
342 | QString::null, 0, this, 0 ); | ||
309 | connect( a, SIGNAL( activated() ), this, SLOT( editPasteTimeDate() ) ); | 343 | connect( a, SIGNAL( activated() ), this, SLOT( editPasteTimeDate() ) ); |
310 | a->addTo( edit ); | 344 | a->addTo( edit ); |
311 | #endif | 345 | #endif |
312 | 346 | ||
313 | a = new QAction( tr( "Find..." ), Resource::loadPixmap( "find" ), QString::null, 0, this, 0 ); | 347 | a = new QAction( tr( "Find..." ), Resource::loadPixmap( "find" ), |
348 | QString::null, 0, this, 0 ); | ||
314 | connect( a, SIGNAL( activated() ), this, SLOT( editFind() ) ); | 349 | connect( a, SIGNAL( activated() ), this, SLOT( editFind() ) ); |
315 | edit->insertSeparator(); | 350 | edit->insertSeparator(); |
@@ -327,5 +362,5 @@ TextEdit::TextEdit( QWidget *parent, const char *name, WFlags f ) | |||
327 | 362 | ||
328 | font->insertSeparator(); | 363 | font->insertSeparator(); |
329 | // font->insertSeparator(); | 364 | |
330 | font->insertItem(tr("Font"), this, SLOT(changeFont()) ); | 365 | font->insertItem(tr("Font"), this, SLOT(changeFont()) ); |
331 | 366 | ||
@@ -333,32 +368,44 @@ TextEdit::TextEdit( QWidget *parent, const char *name, WFlags f ) | |||
333 | font->insertItem(tr("Advanced Features"), advancedMenu); | 368 | font->insertItem(tr("Advanced Features"), advancedMenu); |
334 | 369 | ||
335 | QAction *wa = new QAction( tr("Wrap lines"), QString::null, 0, this, 0 ); | 370 | QAction *wa = new QAction( tr("Wrap lines"), |
336 | connect( wa, SIGNAL( toggled(bool) ), this, SLOT( setWordWrap(bool) ) ); | 371 | QString::null, 0, this, 0 ); |
372 | connect( wa, SIGNAL( toggled(bool) ), | ||
373 | this, SLOT( setWordWrap(bool) ) ); | ||
337 | wa->setToggleAction(true); | 374 | wa->setToggleAction(true); |
338 | wa->addTo( advancedMenu); | 375 | wa->addTo( advancedMenu); |
339 | 376 | ||
340 | nStart = new QAction( tr("Start with new file"), QString::null, 0, this, 0 ); | 377 | nStart = new QAction( tr("Start with new file"), |
341 | connect( nStart, SIGNAL( toggled(bool) ), this, SLOT( changeStartConfig(bool) ) ); | 378 | QString::null, 0, this, 0 ); |
379 | connect( nStart, SIGNAL( toggled(bool) ), | ||
380 | this, SLOT( changeStartConfig(bool) ) ); | ||
342 | nStart->setToggleAction(true); | 381 | nStart->setToggleAction(true); |
343 | nStart->addTo( advancedMenu ); | 382 | nStart->addTo( advancedMenu ); |
344 | nStart->setEnabled(false); | 383 | nStart->setEnabled(false); |
345 | 384 | ||
346 | nAdvanced = new QAction( tr("Prompt on Exit"), QString::null, 0, this, 0 ); | 385 | nAdvanced = new QAction( tr("Prompt on Exit"), |
347 | connect( nAdvanced, SIGNAL( toggled(bool) ), this, SLOT( doPrompt(bool) ) ); | 386 | QString::null, 0, this, 0 ); |
387 | connect( nAdvanced, SIGNAL( toggled(bool) ), | ||
388 | this, SLOT( doPrompt(bool) ) ); | ||
348 | nAdvanced->setToggleAction(true); | 389 | nAdvanced->setToggleAction(true); |
349 | nAdvanced->addTo( advancedMenu ); | 390 | nAdvanced->addTo( advancedMenu ); |
350 | 391 | ||
351 | desktopAction = new QAction( tr("Always open linked file"), QString::null, 0, this, 0 ); | 392 | desktopAction = new QAction( tr("Always open linked file"), |
352 | connect( desktopAction, SIGNAL( toggled(bool) ), this, SLOT( doDesktop(bool) ) ); | 393 | QString::null, 0, this, 0 ); |
394 | connect( desktopAction, SIGNAL( toggled(bool) ), | ||
395 | this, SLOT( doDesktop(bool) ) ); | ||
353 | desktopAction->setToggleAction(true); | 396 | desktopAction->setToggleAction(true); |
354 | desktopAction->addTo( advancedMenu); | 397 | desktopAction->addTo( advancedMenu); |
355 | 398 | ||
356 | filePermAction = new QAction( tr("File Permissions"), QString::null, 0, this, 0 ); | 399 | filePermAction = new QAction( tr("File Permissions"), |
357 | connect( filePermAction, SIGNAL( toggled(bool) ), this, SLOT( doFilePerms(bool) ) ); | 400 | QString::null, 0, this, 0 ); |
401 | connect( filePermAction, SIGNAL( toggled(bool) ), | ||
402 | this, SLOT( doFilePerms(bool) ) ); | ||
358 | filePermAction->setToggleAction(true); | 403 | filePermAction->setToggleAction(true); |
359 | filePermAction->addTo( advancedMenu); | 404 | filePermAction->addTo( advancedMenu); |
360 | 405 | ||
361 | searchBarAction = new QAction( tr("Search Bar Open"), QString::null, 0, this, 0 ); | 406 | searchBarAction = new QAction( tr("Search Bar Open"), |
362 | connect( searchBarAction, SIGNAL( toggled(bool) ), this, SLOT( setSearchBar(bool) ) ); | 407 | QString::null, 0, this, 0 ); |
408 | connect( searchBarAction, SIGNAL( toggled(bool) ), | ||
409 | this, SLOT( setSearchBar(bool) ) ); | ||
363 | searchBarAction->setToggleAction(true); | 410 | searchBarAction->setToggleAction(true); |
364 | searchBarAction->addTo( advancedMenu); | 411 | searchBarAction->addTo( advancedMenu); |
@@ -383,15 +430,18 @@ TextEdit::TextEdit( QWidget *parent, const char *name, WFlags f ) | |||
383 | this, SLOT( search() ) ); | 430 | this, SLOT( search() ) ); |
384 | 431 | ||
385 | a = new QAction( tr( "Find Next" ), Resource::loadPixmap( "next" ), QString::null, 0, this, 0 ); | 432 | a = new QAction( tr( "Find Next" ), Resource::loadPixmap( "next" ), |
433 | QString::null, 0, this, 0 ); | ||
386 | connect( a, SIGNAL( activated() ), this, SLOT( findNext() ) ); | 434 | connect( a, SIGNAL( activated() ), this, SLOT( findNext() ) ); |
387 | a->addTo( searchBar ); | 435 | a->addTo( searchBar ); |
388 | a->addTo( edit ); | 436 | a->addTo( edit ); |
389 | 437 | ||
390 | a = new QAction( tr( "Close Find" ), Resource::loadPixmap( "close" ), QString::null, 0, this, 0 ); | 438 | a = new QAction( tr( "Close Find" ), Resource::loadPixmap( "close" ), |
439 | QString::null, 0, this, 0 ); | ||
391 | connect( a, SIGNAL( activated() ), this, SLOT( findClose() ) ); | 440 | connect( a, SIGNAL( activated() ), this, SLOT( findClose() ) ); |
392 | a->addTo( searchBar ); | 441 | a->addTo( searchBar ); |
393 | 442 | ||
394 | edit->insertSeparator(); | 443 | edit->insertSeparator(); |
395 | a = new QAction( tr( "Delete" ), Resource::loadPixmap( "close" ), QString::null, 0, this, 0 ); | 444 | a = new QAction( tr( "Delete" ), Resource::loadPixmap( "close" ), |
445 | QString::null, 0, this, 0 ); | ||
396 | connect( a, SIGNAL( activated() ), this, SLOT( editDelete() ) ); | 446 | connect( a, SIGNAL( activated() ), this, SLOT( editDelete() ) ); |
397 | a->addTo( edit ); | 447 | a->addTo( edit ); |
@@ -402,5 +452,7 @@ TextEdit::TextEdit( QWidget *parent, const char *name, WFlags f ) | |||
402 | setCentralWidget( editor ); | 452 | setCentralWidget( editor ); |
403 | editor->setFrameStyle( QFrame::Panel | QFrame::Sunken ); | 453 | editor->setFrameStyle( QFrame::Panel | QFrame::Sunken ); |
404 | connect( editor, SIGNAL( textChanged() ), this, SLOT( editorChanged() ) ); | 454 | connect( editor, SIGNAL( textChanged() ), |
455 | this, SLOT( editorChanged() ) ); | ||
456 | |||
405 | QPEApplication::setStylusOperation( editor, QPEApplication::RightOnHold); | 457 | QPEApplication::setStylusOperation( editor, QPEApplication::RightOnHold); |
406 | 458 | ||
@@ -450,24 +502,16 @@ TextEdit::TextEdit( QWidget *parent, const char *name, WFlags f ) | |||
450 | } else { | 502 | } else { |
451 | edited1=false; | 503 | edited1=false; |
452 | |||
453 | // if(startWithNew ) { | ||
454 | openDotFile(""); | 504 | openDotFile(""); |
455 | // fileNew(); | ||
456 | // } | ||
457 | // else { | ||
458 | // fileOpen(); | ||
459 | // } | ||
460 | } | 505 | } |
461 | 506 | ||
462 | viewSelection = cfg.readNumEntry( "FileView", 0 ); | 507 | viewSelection = cfg.readNumEntry( "FileView", 0 ); |
463 | // setCaption(tr("Text Editor")); | ||
464 | } | 508 | } |
465 | 509 | ||
466 | TextEdit::~TextEdit() { | 510 | TextEdit::~TextEdit() { |
467 | // qDebug("destr"); | 511 | qWarning("textedit d'tor"); |
512 | delete editor; | ||
468 | } | 513 | } |
469 | 514 | ||
470 | void TextEdit::closeEvent(QCloseEvent *) { | 515 | void TextEdit::closeEvent(QCloseEvent *) { |
471 | // qDebug("closing here"); | ||
472 | if( edited1 && promptExit) | 516 | if( edited1 && promptExit) |
473 | saveAs(); | 517 | saveAs(); |
@@ -476,5 +520,4 @@ void TextEdit::closeEvent(QCloseEvent *) { | |||
476 | 520 | ||
477 | void TextEdit::cleanUp() { | 521 | void TextEdit::cleanUp() { |
478 | // qDebug("cleanUp");// save(); | ||
479 | 522 | ||
480 | Config cfg ( "TextEdit" ); | 523 | Config cfg ( "TextEdit" ); |
@@ -500,5 +543,4 @@ void TextEdit::cleanUp() { | |||
500 | 543 | ||
501 | void TextEdit::accept() { | 544 | void TextEdit::accept() { |
502 | // qDebug("accept"); | ||
503 | if( edited1) | 545 | if( edited1) |
504 | saveAs(); | 546 | saveAs(); |
@@ -791,5 +833,5 @@ bool TextEdit::save() { | |||
791 | if(currentFileName.isEmpty()) { | 833 | if(currentFileName.isEmpty()) { |
792 | saveAs(); | 834 | saveAs(); |
793 | return; | 835 | return false; |
794 | } | 836 | } |
795 | QString file = doc->file(); | 837 | QString file = doc->file(); |
@@ -1054,5 +1096,5 @@ void TextEdit::editorChanged() { | |||
1054 | } | 1096 | } |
1055 | 1097 | ||
1056 | void TextEdit::receive(const QCString&msg, const QByteArray &data) { | 1098 | void TextEdit::receive(const QCString&msg, const QByteArray &) { |
1057 | qDebug("QCop "+msg); | 1099 | qDebug("QCop "+msg); |
1058 | if ( msg == "setDocument(QString)" ) { | 1100 | if ( msg == "setDocument(QString)" ) { |
@@ -1099,3 +1141,2 @@ void TextEdit::editPasteTimeDate() { | |||
1099 | #endif | 1141 | #endif |
1100 | } | 1142 | } |
1101 | |||