-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 | |||
@@ -37,6 +37,8 @@ | |||
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> |
@@ -50,10 +52,12 @@ | |||
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", |
@@ -290,6 +294,13 @@ TextEdit::TextEdit( QWidget *parent, const char *name, WFlags f ) | |||
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(); |
@@ -511,7 +522,7 @@ 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() ); |
@@ -982,3 +993,12 @@ void TextEdit::doAdvanced(bool b) { | |||
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 | |||
@@ -69,6 +69,7 @@ protected: | |||
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&); |