summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--core/apps/textedit/fontDialog.cpp237
-rw-r--r--core/apps/textedit/fontDialog.h63
-rw-r--r--core/apps/textedit/textedit.cpp124
-rw-r--r--core/apps/textedit/textedit.pro4
4 files changed, 49 insertions, 379 deletions
diff --git a/core/apps/textedit/fontDialog.cpp b/core/apps/textedit/fontDialog.cpp
deleted file mode 100644
index 5cdf538..0000000
--- a/core/apps/textedit/fontDialog.cpp
+++ b/dev/null
@@ -1,237 +0,0 @@
1/****************************************************************************
2** Created: Sun Jan 27 11:03:24 2002 fileDialog.cpp
3copyright 2002 by L.J. Potter ljp@llornkcor.com
4
5** This file may be distributed and/or modified under the terms of the
6** GNU General Public License version 2 as published by the Free Software
7** Foundation and appearing in the file LICENSE.GPL included in the
8** packaging of this file.
9**
10** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
11** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
12**
13****************************************************************************/
14#include "fontDialog.h"
15
16#include <qpe/fontdatabase.h>
17#include <qpe/config.h>
18
19#include <qstringlist.h>
20#include <qfontinfo.h>
21#include <qvaluelist.h>
22#include <qpe/qpeapplication.h>
23
24#include <qgroupbox.h>
25#include <qlabel.h>
26#include <qlistbox.h>
27#include <qmultilineedit.h>
28#include <qpushbutton.h>
29#include <qlayout.h>
30#include <qvariant.h>
31#include <qtooltip.h>
32#include <qwhatsthis.h>
33
34FontDialog::FontDialog( QWidget * parent, const char* name , bool modal, WFlags fl )
35 :QDialog /*QWidget*/( parent, name , modal, fl )
36{
37 if ( !name )
38 setName( tr("FontDialog") );
39 setCaption( tr( "Font Dialog" ) );
40 FontTextLabel4 = new QLabel( this, "TextLabel4" );
41 FontTextLabel4->setGeometry( QRect( 145, 100, 30, 19 /*192, 0, 43, 19*/ ) );
42 FontTextLabel4->setText( tr( "Size" ) );
43
44 FamilyGroup = new QGroupBox( this, "FamilyGroup" );
45 FamilyGroup->setGeometry( QRect( 5, 5, 115, 135 /*0, 6, 185, 131 */) );
46 FamilyGroup->setTitle( tr( "Font" ) );
47
48 familyListBox = new QListBox( FamilyGroup, "familyListBox" );
49 familyListBox->setGeometry( QRect( 5, 20, 100, 105 /* 6, 18, 170, 105 */) );
50
51 GroupBox2 = new QGroupBox( this, "GroupBox2" );
52 GroupBox2->setGeometry( QRect( 120, 5, 100, 90/* 0, 138, 170, 90*/ ) );
53 GroupBox2->setTitle( tr( "Font Style" ) );
54
55 styleListBox = new QListBox( GroupBox2, "styleListBox" );
56 styleListBox->setGeometry( QRect( 5, 20, 90, 60 /*10, 20, 150, 61*/ ) );
57
58 sizeListBox = new QListBox( this, "sizeListBox" );
59 sizeListBox->setGeometry( QRect( 180, 100, 40, 60 /* 192, 24, 40, 108 */) );
60
61 MultiLineEdit1 = new QMultiLineEdit( this, "MultiLineEdit1" );
62 MultiLineEdit1->setGeometry( QRect( 5, 165, 215, 45 /* 6, 234, 222, 55*/ ) );
63 MultiLineEdit1->setText( tr( "The Quick Brown Fox Jumps Over The Lazy Dog" ) );
64 MultiLineEdit1->setWordWrap(QMultiLineEdit::WidgetWidth);
65
66 connect( familyListBox,SIGNAL( highlighted( const QString &)),SLOT( familyListBoxSlot(const QString &) ));
67 connect( styleListBox,SIGNAL( highlighted( const QString &)),SLOT( styleListBoxSlot(const QString &) ));
68 connect( sizeListBox,SIGNAL( highlighted( const QString &)),SLOT( sizeListBoxSlot(const QString &) ));
69
70 populateLists();
71// MultiLineEdit1
72// connect();
73// move(5,15);
74 showMaximized();
75}
76
77FontDialog::~FontDialog()
78{
79}
80
81void FontDialog::familyListBoxSlot(const QString & text)
82{
83 int styleInt=styleListBox->currentItem();
84 int sizeInt=sizeListBox->currentItem();
85
86 styleListBox->clear();
87 sizeListBox->clear();
88 family= text;
89// qDebug(family);
90 QStringList styles = fdb.styles( family ); // string list of styles of our current font family
91 styleListBox->insertStringList( styles);
92 QString dstyle;// = "\t" + style + " (";
93 QValueList<int> smoothies = fdb.smoothSizes( family, styleListBox->text(0) );
94 for ( QValueList<int>::Iterator points = smoothies.begin(); points != smoothies.end(); ++points ) {
95 dstyle = QString::number( *points );
96 sizeListBox ->insertItem( dstyle.left( dstyle.length() - 1 ));
97 }
98 if(styleInt == -1 || styleInt > styleListBox->count() )
99 styleListBox->setCurrentItem(0);
100 else
101 styleListBox->setCurrentItem(styleInt);
102
103 if(sizeInt == -1 || sizeInt > sizeListBox->count())
104 sizeListBox->setCurrentItem(0);
105 else
106 sizeListBox->setCurrentItem(sizeInt);
107
108 changeText();
109}
110
111void FontDialog::styleListBoxSlot(const QString &text)
112{
113 changeText();
114}
115
116void FontDialog::sizeListBoxSlot(const QString & text)
117{
118 changeText();
119}
120
121void FontDialog::populateLists()
122{
123// QFont defaultFont=MultiLineEdit1->font();
124// QFont defaultFont=Lview->font();
125// QFontInfo fontInfo(defaultFont);
126 Config config("TextEdit");
127 config.setGroup("Font");
128 QString familyStr = config.readEntry("Family", "fixed");
129 QString styleStr = config.readEntry("Style", "Regular");
130 QString sizeStr = config.readEntry("Size", "10");
131 QString charSetStr = config.readEntry("CharSet", "iso10646-1" );
132 bool ok;
133 int i_size=sizeStr.toInt(&ok,10);
134 selectedFont = fdb.font(familyStr,styleStr,i_size,charSetStr);
135// defaultFont.setItalic(TRUE);
136 families = fdb.families();
137 for ( QStringList::Iterator f = families.begin(); f != families.end();++f ) {
138 QString family = *f;
139// if(family == defaultFont.family())
140// qDebug(family);
141 familyListBox->insertItem( family);
142
143 if( familyListBox->text(0) == family) {
144 QStringList styles = fdb.styles( family ); // string list of styles of our current font family
145 styleListBox->insertStringList( styles);
146 for ( QStringList::Iterator s = styles.begin(); s != styles.end();++s ) { // for each font style
147 style = *s;
148 QString dstyle;// = "\t" + style + " (";
149 if(styleListBox->text(0) == style) {
150 QValueList<int> smoothies = fdb.smoothSizes( family, style );
151 for ( QValueList<int>::Iterator points = smoothies.begin(); points != smoothies.end(); ++points ) {
152 dstyle = QString::number( *points ) + " ";
153
154 sizeListBox ->insertItem( dstyle.left( dstyle.length() - 1 ));
155 }
156 dstyle = dstyle.left( dstyle.length() - 1 ) + ")";
157 }
158 } // styles
159 }
160 }
161 for(int i=0;i < familyListBox->count();i++) {
162 if( familyListBox->text(i) == familyStr)
163 familyListBox->setSelected( i, TRUE);
164 }
165
166 for(int i=0;i < styleListBox->count();i++) {
167 if( styleListBox->text(i) == styleStr)
168 styleListBox->setSelected( i, TRUE);
169 }
170
171 for(int i=0;i < sizeListBox->count();i++) {
172 if( sizeListBox->text(i) == sizeStr)
173 sizeListBox->setSelected( i, TRUE);
174 }
175 changeText();
176}
177
178void FontDialog::clearListBoxes() {
179 familyListBox->clear();
180 sizeListBox->clear();
181 styleListBox->clear();
182}
183
184void FontDialog::changeText()
185{
186 if( familyListBox->currentItem() == -1)
187 family= familyListBox->text(0);
188 else {
189 family = familyListBox->currentText();
190 }
191// qDebug("Font family is "+family);
192 if( styleListBox->currentItem() == -1)
193 style=styleListBox->text(0);
194 else {
195 style = styleListBox->currentText();
196 }
197// qDebug("font style is "+style);
198 if( sizeListBox->currentItem() == -1 )
199 size= sizeListBox->text(0);
200 else {
201 size = sizeListBox->currentText();
202 }
203
204// qDebug("Font size is "+size);
205 bool ok;
206 int i_size= size.toInt(&ok,10);
207 QStringList charSetList= fdb.charSets(family);
208// QStringList styles = fdb.styles( family ); // string list of styles of our current font family
209 QString charSet;
210 for ( QStringList::Iterator s = charSetList.begin(); s != charSetList.end();++s ) { // for each font style
211 charSet = *s;
212// qDebug(charSet);
213 }
214 selectedFont = fdb.font(family,style,i_size,charSet);
215 QFontInfo fontInfo( selectedFont);
216// if(fontInfo.italic() ) qDebug("italic");
217 selectedFont.setWeight(fontInfo.weight() );
218// qDebug("Style are "+style+" %d ",fontInfo.weight());
219 Config cfg("TextEdit");
220 cfg.setGroup("Font");
221 cfg.writeEntry("Family",family);
222 cfg.writeEntry("Style",style);
223 cfg.writeEntry("Size",size);
224 cfg.writeEntry("CharSet",charSet);
225
226 if(style.find("Italic",0,TRUE) != -1) {
227 selectedFont = fdb.font(family,"Regular",i_size,charSet);
228 selectedFont.setItalic(TRUE); //ya right
229 cfg.writeEntry("Italic","TRUE");
230// qDebug("Style is "+styleListBox->currentText());
231 } else
232 cfg.writeEntry("Italic","FALSE");
233 changedFonts=TRUE;
234 MultiLineEdit1->setFont( selectedFont);
235 MultiLineEdit1->update();
236}
237
diff --git a/core/apps/textedit/fontDialog.h b/core/apps/textedit/fontDialog.h
deleted file mode 100644
index ef930df..0000000
--- a/core/apps/textedit/fontDialog.h
+++ b/dev/null
@@ -1,63 +0,0 @@
1/****************************************************************************
2** Created: Sun Jan 27 11:02:59 2002 fileDialog.h
3copyright 2002 by L.J. Potter ljp@llornkcor.com
4
5** This file may be distributed and/or modified under the terms of the
6** GNU General Public License version 2 as published by the Free Software
7** Foundation and appearing in the file LICENSE.GPL included in the
8** packaging of this file.
9**
10** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
11** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
12**
13****************************************************************************/
14#ifndef FONTDIALOG_H
15#define FONTDIALOG_H
16
17#include <qvariant.h>
18#include <qdialog.h>
19#include <qpe/fontdatabase.h>
20#include <qfont.h>
21
22class QVBoxLayout;
23class QHBoxLayout;
24class QGridLayout;
25class QLabel;
26class QListBox;
27class QListBoxItem;
28class QPushButton;
29class QGroupBox;
30class QMultiLineEdit;
31
32class FontDialog : public QDialog// QWidget
33{
34 Q_OBJECT
35
36public:
37 FontDialog( QWidget * parent = 0, const char* name = 0 , bool modal=FALSE, WFlags fl = 0 );
38 ~FontDialog();
39
40 QLabel *FontTextLabel4;
41 QGroupBox *FamilyGroup, *GroupBox2;
42 QListBox *familyListBox, *styleListBox, *sizeListBox;
43 QMultiLineEdit *MultiLineEdit1;
44 QPushButton *PushButtonOk,*PushButtonCancel;
45 QStringList families;
46
47 FontDatabase fdb;
48 QString family, style, size;
49 QFont selectedFont;
50 bool changedFonts;
51 void populateLists();
52 void clearListBoxes();
53 void changeText();
54protected slots:
55
56 void familyListBoxSlot(const QString &);
57 void styleListBoxSlot(const QString &);
58 void sizeListBoxSlot(const QString &);
59
60
61};
62
63#endif // FONTDIALOG_H
diff --git a/core/apps/textedit/textedit.cpp b/core/apps/textedit/textedit.cpp
index f6a869a..7b50a6c 100644
--- a/core/apps/textedit/textedit.cpp
+++ b/core/apps/textedit/textedit.cpp
@@ -26,10 +26,11 @@
26 */ 26 */
27#include "textedit.h" 27#include "textedit.h"
28#include "filePermissions.h" 28#include "filePermissions.h"
29#include "fontDialog.h" 29//#include "fontDialog.h"
30 30
31#include <opie/ofileselector.h> 31#include <opie/ofileselector.h>
32#include <opie/ofiledialog.h> 32#include <opie/ofiledialog.h>
33#include <opie/ofontselector.h>
33 34
34#include <qpe/fontdatabase.h> 35#include <qpe/fontdatabase.h>
35#include <qpe/global.h> 36#include <qpe/global.h>
@@ -57,6 +58,7 @@
57#include <qwidgetstack.h> 58#include <qwidgetstack.h>
58#include <qcheckbox.h> 59#include <qcheckbox.h>
59#include <qcombo.h> 60#include <qcombo.h>
61#include <qlayout.h>
60 62
61#include <unistd.h> 63#include <unistd.h>
62#include <sys/stat.h> 64#include <sys/stat.h>
@@ -312,15 +314,6 @@ TextEdit::TextEdit( QWidget *parent, const char *name, WFlags f )
312 a->addTo( bar ); 314 a->addTo( bar );
313 a->addTo( edit ); 315 a->addTo( edit );
314 316
315 int defsize;
316 bool defb, defi, wrap;
317
318 Config cfg("TextEdit");
319 cfg.setGroup("View");
320 defsize = cfg.readNumEntry("FontSize",10);
321 defb = cfg.readBoolEntry("Bold",FALSE);
322 defi = cfg.readBoolEntry("Italic",FALSE);
323 wrap = cfg.readBoolEntry("Wrap",TRUE);
324 317
325 zin = new QAction( tr("Zoom in"), QString::null, 0, this, 0 ); 318 zin = new QAction( tr("Zoom in"), QString::null, 0, this, 0 );
326 connect( zin, SIGNAL( activated() ), this, SLOT( zoomIn() ) ); 319 connect( zin, SIGNAL( activated() ), this, SLOT( zoomIn() ) );
@@ -332,23 +325,6 @@ TextEdit::TextEdit( QWidget *parent, const char *name, WFlags f )
332 325
333 font->insertSeparator(); 326 font->insertSeparator();
334 327
335#if 0
336 QAction *ba = new QAction( tr("Bold"), QString::null, 0, this, 0 );
337 connect( ba, SIGNAL( toggled(bool) ), this, SLOT( setBold(bool) ) );
338 ba->setToggleAction(TRUE);
339 ba->addTo( font );
340
341 QAction *ia = new QAction( tr("Italic"), QString::null, 0, this, 0 );
342 connect( ia, SIGNAL( toggled(bool) ), this, SLOT( setItalic(bool) ) );
343 ia->setToggleAction(TRUE);
344 ia->addTo( font );
345
346 ba->setOn(defb);
347 ia->setOn(defi);
348
349 font->insertSeparator();
350#endif
351
352 QAction *wa = new QAction( tr("Wrap lines"), QString::null, 0, this, 0 ); 328 QAction *wa = new QAction( tr("Wrap lines"), QString::null, 0, this, 0 );
353 connect( wa, SIGNAL( toggled(bool) ), this, SLOT( setWordWrap(bool) ) ); 329 connect( wa, SIGNAL( toggled(bool) ), this, SLOT( setWordWrap(bool) ) );
354 wa->setToggleAction(TRUE); 330 wa->setToggleAction(TRUE);
@@ -369,12 +345,6 @@ TextEdit::TextEdit( QWidget *parent, const char *name, WFlags f )
369 nAdvanced->setToggleAction(TRUE); 345 nAdvanced->setToggleAction(TRUE);
370 nAdvanced->addTo( font ); 346 nAdvanced->addTo( font );
371 347
372 if(cfg.readBoolEntry("AdvancedFeatures")) {
373 qDebug("using advanced features");
374 useAdvancedFeatures = true;
375 nAdvanced->setOn(TRUE);
376 } else
377 useAdvancedFeatures = false;
378 348
379 font->insertSeparator(); 349 font->insertSeparator();
380 350
@@ -415,26 +385,33 @@ TextEdit::TextEdit( QWidget *parent, const char *name, WFlags f )
415 editor->setFrameStyle( QFrame::Panel | QFrame::Sunken ); 385 editor->setFrameStyle( QFrame::Panel | QFrame::Sunken );
416 connect( editor, SIGNAL( textChanged() ), this, SLOT( editorChanged() ) ); 386 connect( editor, SIGNAL( textChanged() ), this, SLOT( editorChanged() ) );
417 387
418// resize( 200, 300 ); 388 Config cfg("TextEdit");
389
390 cfg. setGroup ( "Font" );
419 391
420// setFontSize(defsize,TRUE); 392 QFont defaultFont = editor-> font ( );
421 FontDatabase fdb;
422 QFont defaultFont=editor->font();
423 QFontInfo fontInfo(defaultFont);
424 393
425 cfg.setGroup("Font"); 394 QString family = cfg. readEntry ( "Family", defaultFont. family ( ));
426 QString family = cfg.readEntry("Family", fontInfo.family()); 395 int size = cfg. readNumEntry ( "Size", defaultFont. pointSize ( ));
427 QString style = cfg.readEntry("Style", fdb.styleString(defaultFont)); 396 int weight = cfg. readNumEntry ( "Weight", defaultFont. weight ( ));
428 int i_size = cfg.readNumEntry("Size", fontInfo.pointSize()/10); 397 bool italic = cfg. readBoolEntry ( "Italic", defaultFont. italic ( ));
429 QString charSet = cfg.readEntry("CharSet", QFont::encodingName( fontInfo.charSet()) );
430 398
431 defaultFont = fdb.font(family,style,i_size,charSet); 399 defaultFont = QFont ( family, size, weight, italic );
432 editor->setFont( defaultFont); 400 editor-> setFont ( defaultFont );
433 401
434 wa->setOn(wrap);
435 updateCaption(); 402 updateCaption();
436 403
437 cfg.setGroup("View"); 404 cfg.setGroup ( "View" );
405
406 useAdvancedFeatures = cfg. readBoolEntry ( "AdvancedFeatures", false );
407
408 if ( useAdvancedFeatures )
409 nAdvanced-> setOn ( true );
410
411 bool wrap = cfg. readBoolEntry ( "Wrap", true );
412 wa-> setOn ( wrap );
413 setWordWrap ( wrap );
414
438 if(cfg.readEntry("startNew","TRUE") == "TRUE") { 415 if(cfg.readEntry("startNew","TRUE") == "TRUE") {
439 nStart->setOn(TRUE); 416 nStart->setOn(TRUE);
440 fileNew(); 417 fileNew();
@@ -451,15 +428,20 @@ TextEdit::~TextEdit() {
451} 428}
452 429
453void TextEdit::cleanUp() { 430void TextEdit::cleanUp() {
454qDebug("cleanUp");// save(); 431 qDebug("cleanUp");// save();
455 Config cfg("TextEdit"); 432
456 cfg.setGroup("View"); 433 Config cfg ( "TextEdit" );
434 cfg. setGroup ( "Font" );
457 QFont f = editor->font(); 435 QFont f = editor->font();
458 cfg.writeEntry("FontSize",f.pointSize()); 436 cfg. writeEntry ( "Family", f. family ( ));
459 cfg.writeEntry("Bold",f.bold()); 437 cfg. writeEntry ( "Size", f. pointSize ( ));
460 cfg.writeEntry("Italic",f.italic()); 438 cfg. writeEntry ( "Weight", f. weight ( ));
461 cfg.writeEntry("Wrap",editor->wordWrap() == QMultiLineEdit::WidgetWidth); 439 cfg. writeEntry ( "Italic", f. italic ( ));
462 cfg.writeEntry( "FileView", viewSelection ); 440
441 cfg. setGroup ( "View" );
442 cfg. writeEntry ( "Wrap", editor-> wordWrap ( ) == QMultiLineEdit::WidgetWidth );
443 cfg. writeEntry ( "FileView", viewSelection );
444 cfg. writeEntry ( "AdvancedFeatures", useAdvancedFeatures );
463} 445}
464 446
465 447
@@ -900,26 +882,17 @@ void TextEdit::closeEvent( QCloseEvent *e ) {
900} 882}
901 883
902void TextEdit::changeFont() { 884void TextEdit::changeFont() {
903 FontDatabase fdb; 885 QDialog *d = new QDialog ( this, "FontDialog", true );
904 QFont defaultFont=editor->font(); 886 d-> setCaption ( tr( "Choose font" ));
905 QFontInfo fontInfo(defaultFont); 887 QBoxLayout *lay = new QVBoxLayout ( d );
906 Config cfg("TextEdit"); 888 OFontSelector *ofs = new OFontSelector ( true, d );
907 cfg.setGroup("Font"); 889 lay-> addWidget ( ofs );
908 QString family = cfg.readEntry("Family", fontInfo.family()); 890 ofs-> setSelectedFont ( editor-> font ( ));
909 QString style = cfg.readEntry("Style", fdb.styleString(defaultFont));
910 int i_size = cfg.readNumEntry("Size", fontInfo.pointSize()/10);
911 QString charSet = cfg.readEntry("CharSet", QFont::encodingName( fontInfo.charSet()) );
912
913 defaultFont = fdb.font(family,style,i_size,charSet);
914
915 FontDialog *fontDlg;
916 fontDlg=new FontDialog(this,tr("FontDialog"),TRUE);
917 891
918 fontDlg->exec(); 892 d-> showMaximized ( );
919 893 if ( d-> exec ( ) == QDialog::Accepted )
920 QFont myFont=fontDlg->selectedFont; 894 editor-> setFont ( ofs-> selectedFont ( ));
921 editor->setFont( myFont); 895 delete d;
922 delete fontDlg;
923 896
924} 897}
925 898
@@ -975,9 +948,6 @@ void TextEdit::doAbout() {
975 948
976void TextEdit::doAdvanced(bool b) { 949void TextEdit::doAdvanced(bool b) {
977 useAdvancedFeatures=b; 950 useAdvancedFeatures=b;
978 Config cfg("TextEdit");
979 cfg.setGroup("View");
980 cfg.writeEntry("AdvancedFeatures",b);
981} 951}
982 952
983void TextEdit::editPasteTimeDate() { 953void TextEdit::editPasteTimeDate() {
diff --git a/core/apps/textedit/textedit.pro b/core/apps/textedit/textedit.pro
index f6e6530..500abde 100644
--- a/core/apps/textedit/textedit.pro
+++ b/core/apps/textedit/textedit.pro
@@ -1,8 +1,8 @@
1TEMPLATE = app 1TEMPLATE = app
2CONFIG += qt warn_on release 2CONFIG += qt warn_on release
3DESTDIR = $(OPIEDIR)/bin 3DESTDIR = $(OPIEDIR)/bin
4HEADERS = textedit.h fontDialog.h filePermissions.h 4HEADERS = textedit.h filePermissions.h
5SOURCES = main.cpp textedit.cpp fontDialog.cpp filePermissions.cpp 5SOURCES = main.cpp textedit.cpp filePermissions.cpp
6INCLUDEPATH += $(OPIEDIR)/include 6INCLUDEPATH += $(OPIEDIR)/include
7DEPENDPATH += $(OPIEDIR)/include 7DEPENDPATH += $(OPIEDIR)/include
8LIBS += -lqpe -lopie 8LIBS += -lqpe -lopie