-rw-r--r-- | libopie/ofontselector.cpp | 162 |
1 files changed, 95 insertions, 67 deletions
diff --git a/libopie/ofontselector.cpp b/libopie/ofontselector.cpp index 39440af..e1090b5 100644 --- a/libopie/ofontselector.cpp +++ b/libopie/ofontselector.cpp @@ -34,4 +34,17 @@ +#include <qpe/fontdatabase.h> + #include "ofontselector.h" +class OFontSelectorPrivate { +public: + QListBox * m_font_family_list; + QComboBox * m_font_style_list; + QComboBox * m_font_size_list; + + bool m_pointbug; + + FontDatabase m_fdb; +}; + @@ -82,2 +95,9 @@ static int findItemCB ( QComboBox *box, const QString &str ) +static int qt_version ( ) +{ + const char *qver = qVersion ( ); + + return ( qver [0] - '0' ) * 100 + ( qver [2] - '0' ) * 10 + ( qver [4] - '0' ); +} + @@ -85,2 +105,4 @@ OFontSelector::OFontSelector ( QWidget *parent, const char *name, WFlags fl ) : { + d = new OFontSelectorPrivate ( ); + QGridLayout *gridLayout = new QGridLayout ( this, 0, 0, 4, 4 ); @@ -88,5 +110,5 @@ OFontSelector::OFontSelector ( QWidget *parent, const char *name, WFlags fl ) : - m_font_family_list = new QListBox( this, "FontListBox" ); - gridLayout->addMultiCellWidget( m_font_family_list, 0, 4, 0, 0 ); - connect( m_font_family_list, SIGNAL( highlighted( int ) ), this, SLOT( fontFamilyClicked( int ) ) ); + d-> m_font_family_list = new QListBox( this, "FontListBox" ); + gridLayout->addMultiCellWidget( d-> m_font_family_list, 0, 4, 0, 0 ); + connect( d-> m_font_family_list, SIGNAL( highlighted( int ) ), this, SLOT( fontFamilyClicked( int ) ) ); @@ -95,5 +117,5 @@ OFontSelector::OFontSelector ( QWidget *parent, const char *name, WFlags fl ) : - m_font_style_list = new QComboBox( this, "StyleListBox" ); - connect( m_font_style_list, SIGNAL( activated( int ) ), this, SLOT( fontStyleClicked( int ) ) ); - gridLayout->addWidget( m_font_style_list, 1, 1 ); + d-> m_font_style_list = new QComboBox( this, "StyleListBox" ); + connect( d-> m_font_style_list, SIGNAL( activated( int ) ), this, SLOT( fontStyleClicked( int ) ) ); + gridLayout->addWidget( d-> m_font_style_list, 1, 1 ); @@ -102,8 +124,10 @@ OFontSelector::OFontSelector ( QWidget *parent, const char *name, WFlags fl ) : - m_font_size_list = new QComboBox( this, "SizeListBox" ); - connect( m_font_size_list, SIGNAL( activated( int ) ), + d-> m_font_size_list = new QComboBox( this, "SizeListBox" ); + connect( d-> m_font_size_list, SIGNAL( activated( int ) ), this, SLOT( fontSizeClicked( int ) ) ); - gridLayout->addWidget( m_font_size_list, 3, 1 ); + gridLayout->addWidget( d-> m_font_size_list, 3, 1 ); + + d-> m_pointbug = ( qt_version ( ) <= 233 ); - loadFonts ( m_font_family_list ); + loadFonts ( d-> m_font_family_list ); } @@ -112,2 +136,3 @@ OFontSelector::~OFontSelector ( ) { + delete d; } @@ -116,3 +141,3 @@ bool OFontSelector::setSelectedFont ( const QFont &f ) { - return setSelectedFont ( f. family ( ), m_fdb. styleString ( f ), f. pointSize ( ), QFont::encodingName ( f. charSet ( ))); + return setSelectedFont ( f. family ( ), d-> m_fdb. styleString ( f ), f. pointSize ( ), QFont::encodingName ( f. charSet ( ))); } @@ -123,29 +148,27 @@ bool OFontSelector::setSelectedFont ( const QString &familyStr, const QString &s - QListBoxItem *family = m_font_family_list-> findItem ( familyStr ); + QListBoxItem *family = d-> m_font_family_list-> findItem ( familyStr ); if ( !family ) - family = m_font_family_list-> findItem ( "Helvetica" ); + family = d-> m_font_family_list-> findItem ( "Helvetica" ); if ( !family ) - family = m_font_family_list-> firstItem ( ); - m_font_family_list-> setCurrentItem ( family ); - fontFamilyClicked ( m_font_family_list-> index ( family )); + family = d-> m_font_family_list-> firstItem ( ); + d-> m_font_family_list-> setCurrentItem ( family ); + fontFamilyClicked ( d-> m_font_family_list-> index ( family )); - int style = findItemCB ( m_font_style_list, styleStr ); + int style = findItemCB ( d-> m_font_style_list, styleStr ); if ( style < 0 ) - style = findItemCB ( m_font_style_list, "Regular" ); - if ( style < 0 && m_font_style_list-> count ( ) > 0 ) + style = findItemCB ( d-> m_font_style_list, "Regular" ); + if ( style < 0 && d-> m_font_style_list-> count ( ) > 0 ) style = 0; - m_font_style_list-> setCurrentItem ( style ); + d-> m_font_style_list-> setCurrentItem ( style ); fontStyleClicked ( style ); - int size = findItemCB ( m_font_size_list, sizeStr ); + int size = findItemCB ( d-> m_font_size_list, sizeStr ); if ( size < 0 ) - size = findItemCB ( m_font_size_list, "10" ); - if ( size < 0 && m_font_size_list-> count ( ) > 0 ) + size = findItemCB ( d-> m_font_size_list, "10" ); + if ( size < 0 && d-> m_font_size_list-> count ( ) > 0 ) size = 0; - m_font_size_list-> setCurrentItem ( size ); + d-> m_font_size_list-> setCurrentItem ( size ); fontSizeClicked ( size ); - return (( family ) && - ( style >= 0 ) && - ( size >= 0 )); + return (( family ) && ( style >= 0 ) && ( size >= 0 )); } @@ -161,3 +184,3 @@ QString OFontSelector::fontFamily ( ) const { - FontListItem *fli = (FontListItem *) m_font_family_list-> item ( m_font_family_list-> currentItem ( )); + FontListItem *fli = (FontListItem *) d-> m_font_family_list-> item ( d-> m_font_family_list-> currentItem ( )); @@ -168,4 +191,4 @@ QString OFontSelector::fontStyle ( ) const { - FontListItem *fli = (FontListItem *) m_font_family_list-> item ( m_font_family_list-> currentItem ( )); - int fst = m_font_style_list-> currentItem ( ); + FontListItem *fli = (FontListItem *) d-> m_font_family_list-> item ( d-> m_font_family_list-> currentItem ( )); + int fst = d-> m_font_style_list-> currentItem ( ); @@ -176,4 +199,4 @@ int OFontSelector::fontSize ( ) const { - FontListItem *fli = (FontListItem *) m_font_family_list-> item ( m_font_family_list-> currentItem ( )); - int fsi = m_font_size_list-> currentItem ( ); + FontListItem *fli = (FontListItem *) d-> m_font_family_list-> item ( d-> m_font_family_list-> currentItem ( )); + int fsi = d-> m_font_size_list-> currentItem ( ); @@ -184,5 +207,5 @@ QString OFontSelector::fontCharSet ( ) const { - FontListItem *fli = (FontListItem *) m_font_family_list-> item ( m_font_family_list-> currentItem ( )); + FontListItem *fli = (FontListItem *) d-> m_font_family_list-> item ( d-> m_font_family_list-> currentItem ( )); - return fli ? m_fdb. charSets ( fli-> family ( )) [0] : QString::null; + return fli ? d-> m_fdb. charSets ( fli-> family ( )) [0] : QString::null; } @@ -191,7 +214,7 @@ bool OFontSelector::selectedFont ( QString &family, QString &style, int &size, Q { - int ffa = m_font_family_list-> currentItem ( ); - int fst = m_font_style_list-> currentItem ( ); - int fsi = m_font_size_list-> currentItem ( ); + int ffa = d-> m_font_family_list-> currentItem ( ); + int fst = d-> m_font_style_list-> currentItem ( ); + int fsi = d-> m_font_size_list-> currentItem ( ); - FontListItem *fli = (FontListItem *) m_font_family_list-> item ( ffa ); + FontListItem *fli = (FontListItem *) d-> m_font_family_list-> item ( ffa ); @@ -201,3 +224,3 @@ bool OFontSelector::selectedFont ( QString &family, QString &style, int &size, Q size = fsi >= 0 ? fli-> sizes ( ) [fsi] : 10; - charset = m_fdb. charSets ( fli-> family ( )) [0]; + charset = d-> m_fdb. charSets ( fli-> family ( )) [0]; @@ -214,6 +237,14 @@ void OFontSelector::loadFonts ( QListBox *list ) { - QStringList f = m_fdb. families ( ); + QStringList f = d-> m_fdb. families ( ); + + for ( QStringList::ConstIterator it = f. begin ( ); it != f. end ( ); ++it ) { + QValueList <int> ps = d-> m_fdb. pointSizes ( *it ); - for ( QStringList::ConstIterator it = f. begin ( ); it != f. end ( ); ++it ) - list-> insertItem ( new FontListItem ( *it, m_fdb. styles ( *it ), m_fdb. pointSizes ( *it ))); + if ( d-> m_pointbug ) { + for ( QValueList <int>::Iterator it = ps. begin ( ); it != ps. end ( ); it++ ) + *it /= 10; + } + + list-> insertItem ( new FontListItem ( *it, d-> m_fdb. styles ( *it ), ps )); + } } @@ -222,10 +253,10 @@ void OFontSelector::fontFamilyClicked ( int index ) { - QString oldstyle = m_font_style_list-> currentText ( ); - QString oldsize = m_font_size_list-> currentText ( ); + QString oldstyle = d-> m_font_style_list-> currentText ( ); + QString oldsize = d-> m_font_size_list-> currentText ( ); - FontListItem *fli = (FontListItem *) m_font_family_list-> item ( index ); + FontListItem *fli = (FontListItem *) d-> m_font_family_list-> item ( index ); - m_font_style_list-> clear ( ); - m_font_style_list-> insertStringList ( fli-> styles ( )); - m_font_style_list-> setEnabled ( !fli-> styles ( ). isEmpty ( )); + d-> m_font_style_list-> clear ( ); + d-> m_font_style_list-> insertStringList ( fli-> styles ( )); + d-> m_font_style_list-> setEnabled ( !fli-> styles ( ). isEmpty ( )); @@ -233,6 +264,6 @@ void OFontSelector::fontFamilyClicked ( int index ) - i = findItemCB ( m_font_style_list, oldstyle ); + i = findItemCB ( d-> m_font_style_list, oldstyle ); if ( i < 0 ) - i = findItemCB ( m_font_style_list, "Regular" ); - if (( i < 0 ) && ( m_font_style_list-> count ( ) > 0 )) + i = findItemCB ( d-> m_font_style_list, "Regular" ); + if (( i < 0 ) && ( d-> m_font_style_list-> count ( ) > 0 )) i = 0; @@ -240,3 +271,3 @@ void OFontSelector::fontFamilyClicked ( int index ) if ( i >= 0 ) { - m_font_style_list-> setCurrentItem ( i ); + d-> m_font_style_list-> setCurrentItem ( i ); fontStyleClicked ( i ); @@ -244,3 +275,3 @@ void OFontSelector::fontFamilyClicked ( int index ) - m_font_size_list-> clear ( ); + d-> m_font_size_list-> clear ( ); QValueList<int> sl = fli-> sizes ( ); @@ -248,8 +279,8 @@ void OFontSelector::fontFamilyClicked ( int index ) for ( QValueList<int>::Iterator it = sl. begin ( ); it != sl. end ( ); ++it ) - m_font_size_list-> insertItem ( QString::number ( *it )); + d-> m_font_size_list-> insertItem ( QString::number ( *it )); - i = findItemCB ( m_font_size_list, oldsize ); + i = findItemCB ( d-> m_font_size_list, oldsize ); if ( i < 0 ) - i = findItemCB ( m_font_size_list, "10" ); - if (( i < 0 ) && ( m_font_size_list-> count ( ) > 0 )) + i = findItemCB ( d-> m_font_size_list, "10" ); + if (( i < 0 ) && ( d-> m_font_size_list-> count ( ) > 0 )) i = 0; @@ -257,3 +288,3 @@ void OFontSelector::fontFamilyClicked ( int index ) if ( i >= 0 ) { - m_font_size_list-> setCurrentItem ( i ); + d-> m_font_size_list-> setCurrentItem ( i ); fontSizeClicked ( i ); @@ -281,13 +312,13 @@ QFont OFontSelector::selectedFont ( ) { - int ffa = m_font_family_list-> currentItem ( ); - int fst = m_font_style_list-> currentItem ( ); - int fsi = m_font_size_list-> currentItem ( ); + int ffa = d-> m_font_family_list-> currentItem ( ); + int fst = d-> m_font_style_list-> currentItem ( ); + int fsi = d-> m_font_size_list-> currentItem ( ); - FontListItem *fli = (FontListItem *) m_font_family_list-> item ( ffa ); + FontListItem *fli = (FontListItem *) d-> m_font_family_list-> item ( ffa ); if ( fli ) { - return m_fdb. font ( fli-> family ( ), \ + return d-> m_fdb. font ( fli-> family ( ), \ fst >= 0 ? fli-> styles ( ) [fst] : QString::null, \ fsi >= 0 ? fli-> sizes ( ) [fsi] : 10, \ - m_fdb. charSets ( fli-> family ( )) [0] ); + d-> m_fdb. charSets ( fli-> family ( )) [0] ); } @@ -296,4 +327 @@ QFont OFontSelector::selectedFont ( ) } - - -
\ No newline at end of file |