author | mickeyl <mickeyl> | 2003-10-27 19:51:32 (UTC) |
---|---|---|
committer | mickeyl <mickeyl> | 2003-10-27 19:51:32 (UTC) |
commit | 951d1d4125a80dc814f95d2956853bf53ca52e9a (patch) (unidiff) | |
tree | 46c7a70b80a7eebb54cd59c46204c28335f3821c /noncore/apps/opie-write | |
parent | f0a15a9866f9eddfe10596e63a1e6300b92b9e3f (diff) | |
download | opie-951d1d4125a80dc814f95d2956853bf53ca52e9a.zip opie-951d1d4125a80dc814f95d2956853bf53ca52e9a.tar.gz opie-951d1d4125a80dc814f95d2956853bf53ca52e9a.tar.bz2 |
merge noncore/apps/* except
- advancedfm (ljp, please...)
- odict (tille, please...)
-rw-r--r-- | noncore/apps/opie-write/main.cpp | 13 | ||||
-rw-r--r-- | noncore/apps/opie-write/mainwindow.cpp | 4 | ||||
-rw-r--r-- | noncore/apps/opie-write/mainwindow.h | 4 | ||||
-rw-r--r-- | noncore/apps/opie-write/opie-write.pro | 23 |
4 files changed, 9 insertions, 35 deletions
diff --git a/noncore/apps/opie-write/main.cpp b/noncore/apps/opie-write/main.cpp index 027af38..2cdfa55 100644 --- a/noncore/apps/opie-write/main.cpp +++ b/noncore/apps/opie-write/main.cpp | |||
@@ -15,23 +15,14 @@ | |||
15 | ** Agreements. | 15 | ** Agreements. |
16 | ** | 16 | ** |
17 | ** Contact info@trolltech.com if any conditions of this licensing are | 17 | ** Contact info@trolltech.com if any conditions of this licensing are |
18 | ** not clear to you. | 18 | ** not clear to you. |
19 | ** | 19 | ** |
20 | **********************************************************************/ | 20 | **********************************************************************/ |
21 | 21 | ||
22 | #include <qpe/qpeapplication.h> | 22 | #include <qpe/qpeapplication.h> |
23 | #include <qpe/fileselector.h> | 23 | #include <opie/oapplicationfactory.h> |
24 | #include "mainwindow.h" | 24 | #include "mainwindow.h" |
25 | 25 | ||
26 | int main( int argc, char ** argv ) | 26 | OPIE_EXPORT_APP( OApplicationFactory<MainWindow> ) |
27 | { | ||
28 | QPEApplication a( argc, argv ); | ||
29 | 27 | ||
30 | MainWindow e; | ||
31 | a.showMainDocumentWidget(&e); | ||
32 | 28 | ||
33 | QObject::connect( &a, SIGNAL( lastWindowClosed() ), | ||
34 | &a, SLOT( quit() ) ); | ||
35 | |||
36 | a.exec(); | ||
37 | } | ||
diff --git a/noncore/apps/opie-write/mainwindow.cpp b/noncore/apps/opie-write/mainwindow.cpp index 4a49abf..6bb524f 100644 --- a/noncore/apps/opie-write/mainwindow.cpp +++ b/noncore/apps/opie-write/mainwindow.cpp | |||
@@ -95,18 +95,18 @@ protected: | |||
95 | } | 95 | } |
96 | 96 | ||
97 | private: | 97 | private: |
98 | int current; | 98 | int current; |
99 | }; | 99 | }; |
100 | 100 | ||
101 | //=========================================================================== | 101 | //=========================================================================== |
102 | 102 | ||
103 | MainWindow::MainWindow( QWidget *parent, const char *name ) | 103 | MainWindow::MainWindow( QWidget *parent, const char *name, WFlags fl ) |
104 | : QMainWindow( parent, name ), | 104 | : QMainWindow( parent, name, fl ), |
105 | doc( 0 ) | 105 | doc( 0 ) |
106 | { | 106 | { |
107 | setRightJustification(TRUE); | 107 | setRightJustification(TRUE); |
108 | 108 | ||
109 | editorStack = new QWidgetStack( this ); | 109 | editorStack = new QWidgetStack( this ); |
110 | 110 | ||
111 | fileSelector = new FileSelector( "text/html", | 111 | fileSelector = new FileSelector( "text/html", |
112 | editorStack, "fileselector" ); | 112 | editorStack, "fileselector" ); |
diff --git a/noncore/apps/opie-write/mainwindow.h b/noncore/apps/opie-write/mainwindow.h index 565ad05..17713d8 100644 --- a/noncore/apps/opie-write/mainwindow.h +++ b/noncore/apps/opie-write/mainwindow.h | |||
@@ -40,19 +40,21 @@ class QTextEdit; | |||
40 | 40 | ||
41 | } | 41 | } |
42 | 42 | ||
43 | class MainWindow : public QMainWindow | 43 | class MainWindow : public QMainWindow |
44 | { | 44 | { |
45 | Q_OBJECT | 45 | Q_OBJECT |
46 | 46 | ||
47 | public: | 47 | public: |
48 | MainWindow( QWidget *parent = 0, const char *name = 0 ); | 48 | MainWindow( QWidget *parent = 0, const char *name = 0 , WFlags fl = 0); |
49 | ~MainWindow(); | 49 | ~MainWindow(); |
50 | 50 | ||
51 | static QString appName() { return QString::fromLatin1("opie-write"); } | ||
52 | |||
51 | protected: | 53 | protected: |
52 | void closeEvent( QCloseEvent *e ); | 54 | void closeEvent( QCloseEvent *e ); |
53 | 55 | ||
54 | private slots: | 56 | private slots: |
55 | // new file functions | 57 | // new file functions |
56 | void fileOpen(); | 58 | void fileOpen(); |
57 | void fileRevert(); | 59 | void fileRevert(); |
58 | void fileNew(); | 60 | void fileNew(); |
diff --git a/noncore/apps/opie-write/opie-write.pro b/noncore/apps/opie-write/opie-write.pro index 21a3c3a..bbaacd3 100644 --- a/noncore/apps/opie-write/opie-write.pro +++ b/noncore/apps/opie-write/opie-write.pro | |||
@@ -1,12 +1,11 @@ | |||
1 | TEMPLATE= app | ||
2 | CONFIG += qt warn_on release | ||
3 | 1 | ||
4 | DESTDIR = $(OPIEDIR)/bin | 2 | CONFIG += qt warn on release quick-app |
3 | |||
5 | 4 | ||
6 | HEADERS =qcleanuphandler.h \ | 5 | HEADERS =qcleanuphandler.h \ |
7 | qcomplextext_p.h \ | 6 | qcomplextext_p.h \ |
8 | qrichtext_p.h \ | 7 | qrichtext_p.h \ |
9 | qstylesheet.h \ | 8 | qstylesheet.h \ |
10 | qtextedit.h \ | 9 | qtextedit.h \ |
11 | mainwindow.h | 10 | mainwindow.h |
12 | 11 | ||
@@ -19,28 +18,10 @@ SOURCES = qcomplextext.cpp \ | |||
19 | mainwindow.cpp | 18 | mainwindow.cpp |
20 | 19 | ||
21 | INCLUDEPATH+= $(OPIEDIR)/include | 20 | INCLUDEPATH+= $(OPIEDIR)/include |
22 | DEPENDPATH+= $(OPIEDIR)/include | 21 | DEPENDPATH+= $(OPIEDIR)/include |
23 | LIBS += -lqpe | 22 | LIBS += -lqpe |
24 | 23 | ||
25 | TARGET = opie-write | 24 | TARGET = opie-write |
26 | 25 | ||
27 | TRANSLATIONS = ../../../i18n/de/opie-write.ts \ | ||
28 | ../../../i18n/nl/opie-write.ts \ | ||
29 | ../../../i18n/da/opie-write.ts \ | ||
30 | ../../../i18n/xx/opie-write.ts \ | ||
31 | ../../../i18n/en/opie-write.ts \ | ||
32 | ../../../i18n/es/opie-write.ts \ | ||
33 | ../../../i18n/fr/opie-write.ts \ | ||
34 | ../../../i18n/hu/opie-write.ts \ | ||
35 | ../../../i18n/ja/opie-write.ts \ | ||
36 | ../../../i18n/ko/opie-write.ts \ | ||
37 | ../../../i18n/no/opie-write.ts \ | ||
38 | ../../../i18n/pl/opie-write.ts \ | ||
39 | ../../../i18n/pt/opie-write.ts \ | ||
40 | ../../../i18n/pt_BR/opie-write.ts \ | ||
41 | ../../../i18n/sl/opie-write.ts \ | ||
42 | ../../../i18n/zh_CN/opie-write.ts \ | ||
43 | ../../../i18n/zh_TW/opie-write.ts | ||
44 | |||
45 | 26 | ||
46 | include ( $(OPIEDIR)/include.pro ) | 27 | include ( $(OPIEDIR)/include.pro ) |