author | llornkcor <llornkcor> | 2002-07-28 15:05:31 (UTC) |
---|---|---|
committer | llornkcor <llornkcor> | 2002-07-28 15:05:31 (UTC) |
commit | 1619cf87bd1db9e991dd22f528798e1463344d4c (patch) (unidiff) | |
tree | 0a8a4edc1967cf194a3ed0e974ad8ee17fcd9a86 | |
parent | a0e8d4d1d1e442b7d11723d055e49f46167d24c1 (diff) | |
download | opie-1619cf87bd1db9e991dd22f528798e1463344d4c.zip opie-1619cf87bd1db9e991dd22f528798e1463344d4c.tar.gz opie-1619cf87bd1db9e991dd22f528798e1463344d4c.tar.bz2 |
added Insert Time adn Date to edit menu
-rw-r--r-- | core/apps/textedit/textedit.cpp | 24 | ||||
-rw-r--r-- | core/apps/textedit/textedit.h | 1 |
2 files changed, 23 insertions, 2 deletions
diff --git a/core/apps/textedit/textedit.cpp b/core/apps/textedit/textedit.cpp index 9e6ba8d..107695a 100644 --- a/core/apps/textedit/textedit.cpp +++ b/core/apps/textedit/textedit.cpp | |||
@@ -28,41 +28,45 @@ | |||
28 | 28 | ||
29 | #include <qpe/fontdatabase.h> | 29 | #include <qpe/fontdatabase.h> |
30 | #include <qpe/global.h> | 30 | #include <qpe/global.h> |
31 | #include <qpe/fileselector.h> | 31 | #include <qpe/fileselector.h> |
32 | #include <qpe/applnk.h> | 32 | #include <qpe/applnk.h> |
33 | #include <qpe/resource.h> | 33 | #include <qpe/resource.h> |
34 | #include <qpe/config.h> | 34 | #include <qpe/config.h> |
35 | #include <qpe/qpeapplication.h> | 35 | #include <qpe/qpeapplication.h> |
36 | #include <qpe/qpemenubar.h> | 36 | #include <qpe/qpemenubar.h> |
37 | #include <qpe/qpetoolbar.h> | 37 | #include <qpe/qpetoolbar.h> |
38 | #include <qpe/qcopenvelope_qws.h> | 38 | #include <qpe/qcopenvelope_qws.h> |
39 | 39 | ||
40 | #include <qdatetime.h> | ||
41 | #include <qclipboard.h> | ||
40 | #include <qstringlist.h> | 42 | #include <qstringlist.h> |
41 | #include <qaction.h> | 43 | #include <qaction.h> |
42 | #include <qcolordialog.h> | 44 | #include <qcolordialog.h> |
43 | #include <qfileinfo.h> | 45 | #include <qfileinfo.h> |
44 | #include <qlineedit.h> | 46 | #include <qlineedit.h> |
45 | #include <qmessagebox.h> | 47 | #include <qmessagebox.h> |
46 | #include <qobjectlist.h> | 48 | #include <qobjectlist.h> |
47 | #include <qpopupmenu.h> | 49 | #include <qpopupmenu.h> |
48 | #include <qspinbox.h> | 50 | #include <qspinbox.h> |
49 | #include <qtoolbutton.h> | 51 | #include <qtoolbutton.h> |
50 | #include <qwidgetstack.h> | 52 | #include <qwidgetstack.h> |
51 | #include <qcheckbox.h> | 53 | #include <qcheckbox.h> |
52 | #include <qcombo.h> | 54 | #include <qcombo.h> |
55 | |||
53 | #include <unistd.h> | 56 | #include <unistd.h> |
54 | #include <sys/stat.h> | 57 | #include <sys/stat.h> |
55 | |||
56 | #include <stdlib.h> //getenv | 58 | #include <stdlib.h> //getenv |
59 | |||
60 | |||
57 | /* XPM */ | 61 | /* XPM */ |
58 | static char * filesave_xpm[] = { | 62 | static char * filesave_xpm[] = { |
59 | "16 16 78 1", | 63 | "16 16 78 1", |
60 | " c None", | 64 | " c None", |
61 | ". c #343434", | 65 | ". c #343434", |
62 | "+ c #A0A0A0", | 66 | "+ c #A0A0A0", |
63 | "@ c #565656", | 67 | "@ c #565656", |
64 | "# c #9E9E9E", | 68 | "# c #9E9E9E", |
65 | "$ c #525252", | 69 | "$ c #525252", |
66 | "% c #929292", | 70 | "% c #929292", |
67 | "& c #676767", | 71 | "& c #676767", |
68 | "* c #848484", | 72 | "* c #848484", |
@@ -281,24 +285,31 @@ TextEdit::TextEdit( QWidget *parent, const char *name, WFlags f ) | |||
281 | a->addTo( edit ); | 285 | a->addTo( edit ); |
282 | 286 | ||
283 | a = new QAction( tr( "Copy" ), Resource::loadPixmap( "copy" ), QString::null, 0, this, 0 ); | 287 | a = new QAction( tr( "Copy" ), Resource::loadPixmap( "copy" ), QString::null, 0, this, 0 ); |
284 | connect( a, SIGNAL( activated() ), this, SLOT( editCopy() ) ); | 288 | connect( a, SIGNAL( activated() ), this, SLOT( editCopy() ) ); |
285 | a->addTo( editBar ); | 289 | a->addTo( editBar ); |
286 | a->addTo( edit ); | 290 | a->addTo( edit ); |
287 | 291 | ||
288 | a = new QAction( tr( "Paste" ), Resource::loadPixmap( "paste" ), QString::null, 0, this, 0 ); | 292 | a = new QAction( tr( "Paste" ), Resource::loadPixmap( "paste" ), QString::null, 0, this, 0 ); |
289 | connect( a, SIGNAL( activated() ), this, SLOT( editPaste() ) ); | 293 | connect( a, SIGNAL( activated() ), this, SLOT( editPaste() ) ); |
290 | a->addTo( editBar ); | 294 | a->addTo( editBar ); |
291 | a->addTo( edit ); | 295 | a->addTo( edit ); |
292 | 296 | ||
297 | |||
298 | #ifndef QT_NO_CLIPBOARD | ||
299 | a = new QAction( tr( "Insert Time and Date" ), Resource::loadPixmap( "paste" ), QString::null, 0, this, 0 ); | ||
300 | connect( a, SIGNAL( activated() ), this, SLOT( editPasteTimeDate() ) ); | ||
301 | a->addTo( edit ); | ||
302 | #endif | ||
303 | |||
293 | a = new QAction( tr( "Find..." ), Resource::loadPixmap( "find" ), QString::null, 0, this, 0 ); | 304 | a = new QAction( tr( "Find..." ), Resource::loadPixmap( "find" ), QString::null, 0, this, 0 ); |
294 | connect( a, SIGNAL( activated() ), this, SLOT( editFind() ) ); | 305 | connect( a, SIGNAL( activated() ), this, SLOT( editFind() ) ); |
295 | edit->insertSeparator(); | 306 | edit->insertSeparator(); |
296 | a->addTo( bar ); | 307 | a->addTo( bar ); |
297 | a->addTo( edit ); | 308 | a->addTo( edit ); |
298 | 309 | ||
299 | int defsize; | 310 | int defsize; |
300 | bool defb, defi, wrap; | 311 | bool defb, defi, wrap; |
301 | 312 | ||
302 | Config cfg("TextEdit"); | 313 | Config cfg("TextEdit"); |
303 | cfg.setGroup("View"); | 314 | cfg.setGroup("View"); |
304 | defsize = cfg.readNumEntry("FontSize",10); | 315 | defsize = cfg.readNumEntry("FontSize",10); |
@@ -502,25 +513,25 @@ void TextEdit::setWordWrap(bool y) | |||
502 | void TextEdit::fileNew() | 513 | void TextEdit::fileNew() |
503 | { | 514 | { |
504 | // if( !bFromDocView ) { | 515 | // if( !bFromDocView ) { |
505 | // saveAs(); | 516 | // saveAs(); |
506 | // } | 517 | // } |
507 | newFile(DocLnk()); | 518 | newFile(DocLnk()); |
508 | } | 519 | } |
509 | 520 | ||
510 | void TextEdit::fileOpen() | 521 | void TextEdit::fileOpen() |
511 | { | 522 | { |
512 | Config cfg("TextEdit"); | 523 | Config cfg("TextEdit"); |
513 | cfg.setGroup("View"); | 524 | cfg.setGroup("View"); |
514 | bool b=FALSE; | 525 | // bool b=FALSE; |
515 | 526 | ||
516 | QMap<QString, QStringList> map; | 527 | QMap<QString, QStringList> map; |
517 | map.insert(tr("All"), QStringList() ); | 528 | map.insert(tr("All"), QStringList() ); |
518 | QStringList text; | 529 | QStringList text; |
519 | text << "text/*"; | 530 | text << "text/*"; |
520 | map.insert(tr("Text"), text ); | 531 | map.insert(tr("Text"), text ); |
521 | text << "*"; | 532 | text << "*"; |
522 | map.insert(tr("All"), text ); | 533 | map.insert(tr("All"), text ); |
523 | QString str = OFileDialog::getOpenFileName( 2,"/", QString::null, map); | 534 | QString str = OFileDialog::getOpenFileName( 2,"/", QString::null, map); |
524 | if(!str.isEmpty() ) | 535 | if(!str.isEmpty() ) |
525 | openFile( str ); | 536 | openFile( str ); |
526 | 537 | ||
@@ -973,12 +984,21 @@ void TextEdit::doAbout() { | |||
973 | QMessageBox::about(0,"Text Edit","Text Edit is copyright\n" | 984 | QMessageBox::about(0,"Text Edit","Text Edit is copyright\n" |
974 | "2000 Trolltech AS, and\n" | 985 | "2000 Trolltech AS, and\n" |
975 | "2002 by L.J.Potter \nljp@llornkcor.com\n" | 986 | "2002 by L.J.Potter \nljp@llornkcor.com\n" |
976 | "and is licensed under the GPL"); | 987 | "and is licensed under the GPL"); |
977 | } | 988 | } |
978 | 989 | ||
979 | void TextEdit::doAdvanced(bool b) { | 990 | void TextEdit::doAdvanced(bool b) { |
980 | useAdvancedFeatures=b; | 991 | useAdvancedFeatures=b; |
981 | Config cfg("TextEdit"); | 992 | Config cfg("TextEdit"); |
982 | cfg.setGroup("View"); | 993 | cfg.setGroup("View"); |
983 | cfg.writeEntry("AdvancedFeatures",b); | 994 | cfg.writeEntry("AdvancedFeatures",b); |
984 | } | 995 | } |
996 | |||
997 | void TextEdit::editPasteTimeDate() { | ||
998 | #ifndef QT_NO_CLIPBOARD | ||
999 | QClipboard *cb = QApplication::clipboard(); | ||
1000 | QDateTime dt = QDateTime::currentDateTime(); | ||
1001 | cb->setText( dt.toString()); | ||
1002 | editor->paste(); | ||
1003 | #endif | ||
1004 | } | ||
diff --git a/core/apps/textedit/textedit.h b/core/apps/textedit/textedit.h index aec6427..a2badaa 100644 --- a/core/apps/textedit/textedit.h +++ b/core/apps/textedit/textedit.h | |||
@@ -60,24 +60,25 @@ public: | |||
60 | QAction *nStart, *nFileDlgOpt, *nAdvanced; | 60 | QAction *nStart, *nFileDlgOpt, *nAdvanced; |
61 | bool edited, edited1; | 61 | bool edited, edited1; |
62 | void openFile( const QString & ); | 62 | void openFile( const QString & ); |
63 | QCopChannel * channel; | 63 | QCopChannel * channel; |
64 | public slots: | 64 | public slots: |
65 | void editorChanged(); | 65 | void editorChanged(); |
66 | void receive(const QCString&, const QByteArray&); | 66 | void receive(const QCString&, const QByteArray&); |
67 | protected: | 67 | protected: |
68 | bool fileIs, useAdvancedFeatures; | 68 | bool fileIs, useAdvancedFeatures; |
69 | void closeEvent( QCloseEvent *e ); | 69 | void closeEvent( QCloseEvent *e ); |
70 | void doSearchBar(); | 70 | void doSearchBar(); |
71 | private slots: | 71 | private slots: |
72 | void editPasteTimeDate(); | ||
72 | void doAdvanced(bool); | 73 | void doAdvanced(bool); |
73 | void doAbout(); | 74 | void doAbout(); |
74 | void setDocument(const QString&); | 75 | void setDocument(const QString&); |
75 | void changeFont(); | 76 | void changeFont(); |
76 | void fileNew(); | 77 | void fileNew(); |
77 | void fileRevert(); | 78 | void fileRevert(); |
78 | void fileOpen(); | 79 | void fileOpen(); |
79 | void changeStartConfig(bool); | 80 | void changeStartConfig(bool); |
80 | bool save(); | 81 | bool save(); |
81 | bool saveAs(); | 82 | bool saveAs(); |
82 | void cleanUp(); | 83 | void cleanUp(); |
83 | 84 | ||