-rw-r--r-- | noncore/apps/opie-write/mainwindow.cpp | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/noncore/apps/opie-write/mainwindow.cpp b/noncore/apps/opie-write/mainwindow.cpp index ed95e83..bcafd16 100644 --- a/noncore/apps/opie-write/mainwindow.cpp +++ b/noncore/apps/opie-write/mainwindow.cpp | |||
@@ -23,6 +23,8 @@ | |||
23 | #include <qpe/fileselector.h> | 23 | #include <qpe/fileselector.h> |
24 | #include <qpe/applnk.h> | 24 | #include <qpe/applnk.h> |
25 | #include <qpe/resource.h> | 25 | #include <qpe/resource.h> |
26 | #include <qpe/fontdatabase.h> | ||
27 | |||
26 | //#include "qspellchecker.h" | 28 | //#include "qspellchecker.h" |
27 | #include "qtextedit.h" | 29 | #include "qtextedit.h" |
28 | #include <qaction.h> | 30 | #include <qaction.h> |
@@ -208,11 +210,13 @@ void MainWindow::setupActions() | |||
208 | tbFont->setHorizontalStretchable(TRUE); | 210 | tbFont->setHorizontalStretchable(TRUE); |
209 | 211 | ||
210 | comboFont = new QComboBox( FALSE, tbFont ); | 212 | comboFont = new QComboBox( FALSE, tbFont ); |
211 | QFontDatabase db; | 213 | FontDatabase db; |
214 | QStringList f= db.families(); | ||
212 | comboFont->insertStringList( db.families() ); | 215 | comboFont->insertStringList( db.families() ); |
213 | connect( comboFont, SIGNAL( activated( const QString & ) ), | 216 | connect( comboFont, SIGNAL( activated( const QString & ) ), |
214 | this, SLOT( textFamily( const QString & ) ) ); | 217 | this, SLOT( textFamily( const QString & ) ) ); |
215 | comboFont->setCurrentItem( comboFont->listBox()->index( comboFont->listBox()->findItem( QApplication::font().family() ) ) ); | 218 | comboFont->setCurrentItem( comboFont->listBox()->index( comboFont->listBox()->findItem( QApplication::font().family() ) ) ); |
219 | comboFont->setMaximumWidth(90); | ||
216 | 220 | ||
217 | comboSize = new QComboBox( TRUE, tbFont ); | 221 | comboSize = new QComboBox( TRUE, tbFont ); |
218 | QValueList<int> sizes = db.standardSizes(); | 222 | QValueList<int> sizes = db.standardSizes(); |
@@ -277,7 +281,7 @@ void MainWindow::doConnections( Qt3::QTextEdit *e ) | |||
277 | void MainWindow::updateFontSizeCombo( const QFont &f ) | 281 | void MainWindow::updateFontSizeCombo( const QFont &f ) |
278 | { | 282 | { |
279 | comboSize->clear(); | 283 | comboSize->clear(); |
280 | QFontDatabase fdb; | 284 | FontDatabase fdb; |
281 | QValueList<int> sizes = fdb.pointSizes( f.family() ); | 285 | QValueList<int> sizes = fdb.pointSizes( f.family() ); |
282 | QValueList<int>::Iterator it = sizes.begin(); | 286 | QValueList<int>::Iterator it = sizes.begin(); |
283 | for ( ; it != sizes.end(); ++it ) | 287 | for ( ; it != sizes.end(); ++it ) |