- size tweak for OColorButton

- new convenience methods in OFontSelector

1 files changed, 5 insertions, 0 deletions

diff --git a/libopie/ofontselector.cpp b/libopie/ofontselector.cpp
index d32aeb4..39440af 100644
--- a/libopie/ofontselector.cpp
+++ b/libopie/ofontselector.cpp
@@ -51,128 +51,133 @@ public:
 	QString family ( ) const
 	{
 		return m_name;
 	}
 	
 	const QStringList &styles ( ) const
 	{
 		return m_styles;
 	}
 	
 	const QValueList<int> &sizes ( ) const
 	{
 		return m_sizes;
 	}
 	
 private:
 	QStringList m_styles;
 	QValueList<int> m_sizes;
 	QString m_name;
 };
 
 
 static int findItemCB ( QComboBox *box, const QString &str )
 {
 	for ( int i = 0; i < box-> count ( ); i++ ) {
 		if ( box-> text ( i ) == str )
 			return i;
 	}
 	return -1;
 }
 
 
 
 OFontSelector::OFontSelector ( QWidget *parent, const char *name, WFlags fl ) : QWidget ( parent, name, fl )
 {
     QGridLayout *gridLayout = new QGridLayout ( this, 0, 0, 4, 4 );
     gridLayout->setRowStretch ( 4, 10 );
 
     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 ) ) );
 
     QLabel *label = new QLabel( tr( "Style" ), this );
     gridLayout->addWidget( label, 0, 1 );
 
     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 );
 
     label = new QLabel( tr( "Size" ), this );
     gridLayout->addWidget( label, 2, 1 );
 
     m_font_size_list = new QComboBox( this, "SizeListBox" );
     connect( m_font_size_list, SIGNAL(  activated( int ) ),
              this, SLOT( fontSizeClicked( int ) ) );
     gridLayout->addWidget( m_font_size_list, 3, 1 );
 
 	loadFonts ( m_font_family_list );
 }
 
 OFontSelector::~OFontSelector ( )
 {
 }
 
+bool OFontSelector::setSelectedFont ( const QFont &f )
+{
+	return setSelectedFont ( f. family ( ), m_fdb. styleString ( f ), f. pointSize ( ), QFont::encodingName ( f. charSet ( )));
+}
+
 bool OFontSelector::setSelectedFont ( const QString &familyStr, const QString &styleStr, int sizeVal, const QString & /*charset*/ )
 {
 	QString sizeStr = QString::number ( sizeVal );
 
 	QListBoxItem *family = m_font_family_list-> findItem ( familyStr );
 	if ( !family )
 		family = 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 ));
 
 	int style = findItemCB ( 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 = 0;
 	m_font_style_list-> setCurrentItem ( style );
 	fontStyleClicked ( style );
 
 	int size = findItemCB ( 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 = 0;
 	m_font_size_list-> setCurrentItem ( size );
 	fontSizeClicked ( size );
 	
 	return (( family ) &&
 	        ( style >= 0 ) &&
 	        ( size >= 0 ));
 }
 
 bool OFontSelector::selectedFont ( QString &family, QString &style, int &size )
 {
 	QString dummy;
 	return selectedFont ( family, style, size, dummy );
 }
 
 
 QString OFontSelector::fontFamily ( ) const
 {
 	FontListItem *fli = (FontListItem *) m_font_family_list-> item ( m_font_family_list-> currentItem ( ));
 	
 	return fli ? fli-> family ( ) : QString::null;
 }
 
 QString OFontSelector::fontStyle ( ) const
 {
 	FontListItem *fli = (FontListItem *) m_font_family_list-> item ( m_font_family_list-> currentItem ( ));
     int fst = m_font_style_list-> currentItem ( ); 
 
 	return ( fli && fst >= 0 ) ? fli-> styles ( ) [fst] : QString::null;
 }
 
 int OFontSelector::fontSize ( ) const
 {
 	FontListItem *fli = (FontListItem *) m_font_family_list-> item ( m_font_family_list-> currentItem ( ));
     int fsi = m_font_size_list-> currentItem ( ); 
 
 	return ( fli && fsi >= 0 ) ? fli-> sizes ( ) [fsi] : 10;
 }
 
 QString OFontSelector::fontCharSet ( ) const