summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--core/apps/textedit/textedit.cpp11
-rw-r--r--core/apps/textedit/textedit.h3
-rw-r--r--core/apps/textedit/textedit.pro4
3 files changed, 12 insertions, 6 deletions
diff --git a/core/apps/textedit/textedit.cpp b/core/apps/textedit/textedit.cpp
index d3f5fb4..f56d5d3 100644
--- a/core/apps/textedit/textedit.cpp
+++ b/core/apps/textedit/textedit.cpp
@@ -215,48 +215,49 @@ void QpeEditor::find ( const QString &txt, bool caseSensitive,
215 } 215 }
216 216
217 } 217 }
218 218
219} 219}
220 220
221 221
222#else 222#else
223 223
224#error "Must make a QpeEditor that inherits QTextEdit" 224#error "Must make a QpeEditor that inherits QTextEdit"
225 225
226#endif 226#endif
227 227
228 228
229static const int nfontsizes = 6; 229static const int nfontsizes = 6;
230static const int fontsize[nfontsizes] = {8,10,12,14,18,24}; 230static const int fontsize[nfontsizes] = {8,10,12,14,18,24};
231 231
232TextEdit::TextEdit( QWidget *parent, const char *name, WFlags f ) 232TextEdit::TextEdit( QWidget *parent, const char *name, WFlags f )
233 : QMainWindow( parent, name, f ), bFromDocView( FALSE ) 233 : QMainWindow( parent, name, f ), bFromDocView( FALSE )
234{ 234{
235 doc = 0; 235 doc = 0;
236 edited=FALSE; 236 edited=FALSE;
237 edited1=FALSE; 237 edited1=FALSE;
238 setToolBarsMovable( FALSE ); 238 setToolBarsMovable( FALSE );
239 connect( qApp,SIGNAL( aboutToQuit()),SLOT( cleanUp()) );
239 240
240 setIcon( Resource::loadPixmap( "TextEditor" ) ); 241 setIcon( Resource::loadPixmap( "TextEditor" ) );
241 242
242 QPEToolBar *bar = new QPEToolBar( this ); 243 QPEToolBar *bar = new QPEToolBar( this );
243 bar->setHorizontalStretchable( TRUE ); 244 bar->setHorizontalStretchable( TRUE );
244 menu = bar; 245 menu = bar;
245 246
246 QPEMenuBar *mb = new QPEMenuBar( bar ); 247 QPEMenuBar *mb = new QPEMenuBar( bar );
247 QPopupMenu *file = new QPopupMenu( this ); 248 QPopupMenu *file = new QPopupMenu( this );
248 QPopupMenu *edit = new QPopupMenu( this ); 249 QPopupMenu *edit = new QPopupMenu( this );
249 font = new QPopupMenu( this ); 250 font = new QPopupMenu( this );
250 251
251 bar = new QPEToolBar( this ); 252 bar = new QPEToolBar( this );
252 editBar = bar; 253 editBar = bar;
253 254
254 QAction *a = new QAction( tr( "New" ), Resource::loadPixmap( "new" ), QString::null, 0, this, 0 ); 255 QAction *a = new QAction( tr( "New" ), Resource::loadPixmap( "new" ), QString::null, 0, this, 0 );
255 connect( a, SIGNAL( activated() ), this, SLOT( fileNew() ) ); 256 connect( a, SIGNAL( activated() ), this, SLOT( fileNew() ) );
256 a->addTo( bar ); 257 a->addTo( bar );
257 a->addTo( file ); 258 a->addTo( file );
258 259
259 a = new QAction( tr( "Open" ), Resource::loadPixmap( "fileopen" ), QString::null, 0, this, 0 ); 260 a = new QAction( tr( "Open" ), Resource::loadPixmap( "fileopen" ), QString::null, 0, this, 0 );
260 connect( a, SIGNAL( activated() ), this, SLOT( fileOpen() ) ); 261 connect( a, SIGNAL( activated() ), this, SLOT( fileOpen() ) );
261 a->addTo( bar ); 262 a->addTo( bar );
262 a->addTo( file ); 263 a->addTo( file );
@@ -386,60 +387,64 @@ TextEdit::TextEdit( QWidget *parent, const char *name, WFlags f )
386 QFontInfo fontInfo(defaultFont); 387 QFontInfo fontInfo(defaultFont);
387 388
388 cfg.setGroup("Font"); 389 cfg.setGroup("Font");
389 QString family = cfg.readEntry("Family", fontInfo.family()); 390 QString family = cfg.readEntry("Family", fontInfo.family());
390 QString style = cfg.readEntry("Style", fdb.styleString(defaultFont)); 391 QString style = cfg.readEntry("Style", fdb.styleString(defaultFont));
391 int i_size = cfg.readNumEntry("Size", fontInfo.pointSize()/10); 392 int i_size = cfg.readNumEntry("Size", fontInfo.pointSize()/10);
392 QString charSet = cfg.readEntry("CharSet", QFont::encodingName( fontInfo.charSet()) ); 393 QString charSet = cfg.readEntry("CharSet", QFont::encodingName( fontInfo.charSet()) );
393 394
394 defaultFont = fdb.font(family,style,i_size,charSet); 395 defaultFont = fdb.font(family,style,i_size,charSet);
395 editor->setFont( defaultFont); 396 editor->setFont( defaultFont);
396 397
397 wa->setOn(wrap); 398 wa->setOn(wrap);
398 updateCaption(); 399 updateCaption();
399 400
400 cfg.setGroup("View"); 401 cfg.setGroup("View");
401 if(cfg.readEntry("startNew","TRUE") == "TRUE") { 402 if(cfg.readEntry("startNew","TRUE") == "TRUE") {
402 nStart->setOn(TRUE); 403 nStart->setOn(TRUE);
403 fileNew(); 404 fileNew();
404 } else { 405 } else {
405 fileOpen(); 406 fileOpen();
406 } 407 }
407 viewSelection = cfg.readNumEntry( "FileView", 0 ); 408 viewSelection = cfg.readNumEntry( "FileView", 0 );
408} 409}
409 410
410TextEdit::~TextEdit() 411void TextEdit::cleanUp()
411{ 412{
412// save(); 413// save();
413
414 Config cfg("TextEdit"); 414 Config cfg("TextEdit");
415 cfg.setGroup("View"); 415 cfg.setGroup("View");
416 QFont f = editor->font(); 416 QFont f = editor->font();
417 cfg.writeEntry("FontSize",f.pointSize()); 417 cfg.writeEntry("FontSize",f.pointSize());
418 cfg.writeEntry("Bold",f.bold()); 418 cfg.writeEntry("Bold",f.bold());
419 cfg.writeEntry("Italic",f.italic()); 419 cfg.writeEntry("Italic",f.italic());
420 cfg.writeEntry("Wrap",editor->wordWrap() == QMultiLineEdit::WidgetWidth); 420 cfg.writeEntry("Wrap",editor->wordWrap() == QMultiLineEdit::WidgetWidth);
421 cfg.writeEntry( "FileView", viewSelection ); 421 cfg.writeEntry( "FileView", viewSelection );
422
423}
424
425TextEdit::~TextEdit()
426{
422} 427}
423 428
424void TextEdit::zoomIn() 429void TextEdit::zoomIn()
425{ 430{
426 setFontSize(editor->font().pointSize()+1,FALSE); 431 setFontSize(editor->font().pointSize()+1,FALSE);
427} 432}
428 433
429void TextEdit::zoomOut() 434void TextEdit::zoomOut()
430{ 435{
431 setFontSize(editor->font().pointSize()-1,TRUE); 436 setFontSize(editor->font().pointSize()-1,TRUE);
432} 437}
433 438
434 439
435void TextEdit::setFontSize(int sz, bool round_down_not_up) 440void TextEdit::setFontSize(int sz, bool round_down_not_up)
436{ 441{
437 int s=10; 442 int s=10;
438 for (int i=0; i<nfontsizes; i++) { 443 for (int i=0; i<nfontsizes; i++) {
439 if ( fontsize[i] == sz ) { 444 if ( fontsize[i] == sz ) {
440 s = sz; 445 s = sz;
441 break; 446 break;
442 } else if ( round_down_not_up ) { 447 } else if ( round_down_not_up ) {
443 if ( fontsize[i] < sz ) 448 if ( fontsize[i] < sz )
444 s = fontsize[i]; 449 s = fontsize[i];
445 } else { 450 } else {
diff --git a/core/apps/textedit/textedit.h b/core/apps/textedit/textedit.h
index aca2933..a70b581 100644
--- a/core/apps/textedit/textedit.h
+++ b/core/apps/textedit/textedit.h
@@ -50,70 +50,71 @@ class TextEdit : public QMainWindow
50 Q_OBJECT 50 Q_OBJECT
51 51
52public: 52public:
53 TextEdit( QWidget *parent = 0, const char *name = 0, WFlags f = 0 ); 53 TextEdit( QWidget *parent = 0, const char *name = 0, WFlags f = 0 );
54 ~TextEdit(); 54 ~TextEdit();
55 QPopupMenu *font; 55 QPopupMenu *font;
56 QAction *nStart; 56 QAction *nStart;
57 bool edited, edited1; 57 bool edited, edited1;
58 void openFile( const QString & ); 58 void openFile( const QString & );
59public slots: 59public slots:
60 void editorChanged(); 60 void editorChanged();
61 61
62protected: 62protected:
63 void closeEvent( QCloseEvent *e ); 63 void closeEvent( QCloseEvent *e );
64 64
65private slots: 65private slots:
66 void setDocument(const QString&); 66 void setDocument(const QString&);
67 void changeFont(); 67 void changeFont();
68 void fileNew(); 68 void fileNew();
69 void fileRevert(); 69 void fileRevert();
70 void fileOpen(); 70 void fileOpen();
71 void changeStartConfig(bool); 71 void changeStartConfig(bool);
72 bool save(); 72 bool save();
73 bool saveAs(); 73 bool saveAs();
74 void cleanUp();
74 75
75 76
76 void editCut(); 77 void editCut();
77 void editCopy(); 78 void editCopy();
78 void editPaste(); 79 void editPaste();
79 void editFind(); 80 void editFind();
80 void editDelete(); 81 void editDelete();
81 82
82 void findNext(); 83 void findNext();
83 void findClose(); 84 void findClose();
84 85
85 void search(); 86 void search();
86 void accept(); 87 void accept();
87 88
88 void newFile( const DocLnk & ); 89 void newFile( const DocLnk & );
89 void openFile( const DocLnk & ); 90 void openFile( const DocLnk & );
90 void showEditTools(); 91 void showEditTools();
91 92
92 void zoomIn(); 93 void zoomIn();
93 void zoomOut(); 94 void zoomOut();
94 void setBold(bool y); 95 void setBold(bool y);
95 void setItalic(bool y); 96 void setItalic(bool y);
96 void setWordWrap(bool y); 97 void setWordWrap(bool y);
97 98
98private: 99private:
99 void colorChanged( const QColor &c ); 100 void colorChanged( const QColor &c );
100 void clear(); 101 void clear();
101 void updateCaption( const QString &name=QString::null ); 102 void updateCaption( const QString &name=QString::null );
102 void setFontSize(int sz, bool round_down_not_up); 103 void setFontSize(int sz, bool round_down_not_up);
103 104
104private: 105private:
105 fileSaver *fileSaveDlg; 106 fileSaver *fileSaveDlg;
106 fileBrowser *browseForFiles; 107 fileBrowser *browseForFiles;
107 108
108 QpeEditor* editor; 109 QpeEditor* editor;
109 QToolBar *menu, *editBar, *searchBar; 110 QToolBar *menu, *editBar, *searchBar;
110 QLineEdit *searchEdit; 111 QLineEdit *searchEdit;
111 DocLnk *doc; 112 DocLnk *doc;
112 bool searchVisible; 113 bool searchVisible;
113 bool bFromDocView; 114 bool bFromDocView;
114 int viewSelection; 115 int viewSelection;
115 QAction *zin, *zout; 116 QAction *zin, *zout;
116 QString currentFileName; 117 QString currentFileName;
117}; 118};
118 119
119#endif 120#endif
diff --git a/core/apps/textedit/textedit.pro b/core/apps/textedit/textedit.pro
index 1301aed..37ddf15 100644
--- a/core/apps/textedit/textedit.pro
+++ b/core/apps/textedit/textedit.pro
@@ -1,15 +1,15 @@
1TEMPLATE = app 1TEMPLATE = app
2CONFIG += qt warn_on release 2CONFIG += qt warn_on release
3 3
4DESTDIR = $(OPIEDIR)/bin 4DESTDIR = $(OPIEDIR)/bin
5HEADERS = textedit.h fileBrowser.h fontDialog.h fileSaver.h filePermissions.h inputDialog.h 5HEADERS = textedit.h fileBrowser.h fontDialog.h fileSaver.h filePermissions.h inputDialog.h
6SOURCES = main.cpp textedit.cpp fileBrowser.cpp fontDialog.cpp fileSaver.cpp filePermissions.cpp inputDialog.cpp 6SOURCES = main.cpp textedit.cpp fileBrowser.cpp fontDialog.cpp fileSaver.cpp filePermissions.cpp inputDialog.cpp
7 7
8INCLUDEPATH += $(OPIEDIR)/include 8INCLUDEPATH += $(OPIEDIR)/include
9DEPENDPATH += $(OPIEDIR)/include 9DEPENDPATH += $(OPIEDIR)/include
10LIBS += -lqpe 10LIBS += -lqpe
11 11
12TARGET = textedit 12TARGET = textedit
13 13
14TRANSLATIONS = ../i18n/de/textedit.ts 14TRANSLATIONS += ../i18n/de/textedit.ts
15TRANSLATIONS = ../i18n/pt_BR/textedit.ts 15TRANSLATIONS += ../i18n/pt_BR/textedit.ts