- size tweak for OColorButton

- new convenience methods in OFontSelector

3 files changed, 10 insertions, 1 deletions

diff --git a/libopie/ocolorbutton.cpp b/libopie/ocolorbutton.cpp
index 96e5612..4734c0c 100644
--- a/libopie/ocolorbutton.cpp
+++ b/libopie/ocolorbutton.cpp
@@ -46,17 +46,20 @@ OColorButton::OColorButton ( QWidget *parent, const char *name )
         d = new OColorButtonPrivate;
         
         d-> m_menu = new ColorPopupMenu ( black, 0, 0 );
         setPopup ( d-> m_menu );
         //setPopupDelay ( 0 );
         connect ( d-> m_menu, SIGNAL( colorSelected ( const QColor & )), this, SLOT( updateColor ( const QColor & )));
         
         updateColor ( black );
-        setMinimumSize ( sizeHint ( ) + QSize ( 8, 0 ));
+        
+        QSize s = sizeHint ( ) + QSize ( 12, 0 );
+        setMinimumSize ( s );
+        setMaximumSize ( s. width ( ) * 2, s. height ( )); 
 }
 
 OColorButton::~OColorButton ( )
 {
         delete d;
 }
 
 QColor OColorButton::color ( ) const
diff --git a/libopie/ofontselector.cpp b/libopie/ofontselector.cpp
index d32aeb4..39440af 100644
--- a/libopie/ofontselector.cpp
+++ b/libopie/ofontselector.cpp
@@ -107,16 +107,21 @@ OFontSelector::OFontSelector ( QWidget *parent, const char *name, WFlags fl ) :
 
         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 )
diff --git a/libopie/ofontselector.h b/libopie/ofontselector.h
index 2011e43..b3aa862 100644
--- a/libopie/ofontselector.h
+++ b/libopie/ofontselector.h
@@ -44,16 +44,17 @@ public:
     OFontSelector ( QWidget* parent = 0, const char* name = 0, WFlags fl = 0 );
     virtual ~OFontSelector ( );
 
         bool selectedFont ( QString &family, QString &style, int &size );
         bool selectedFont ( QString &family, QString &style, int &size, QString &charset );
         
         QFont selectedFont ( );
 
+        bool setSelectedFont ( const QFont & );
         bool setSelectedFont ( const QString &family, const QString &style, int size, const QString &charset = 0 );
 
         QString fontFamily ( ) const;
         QString fontStyle ( ) const;
         int fontSize ( ) const;
         QString fontCharSet ( ) const;
 
 signals: