- size tweak for OColorButton

- new convenience methods in OFontSelector
author: sandman <sandman> 2002-09-27 00:54:58 (UTC)
committer: sandman <sandman> 2002-09-27 00:54:58 (UTC)
commit: dcd5eb6949787321c278b10772bd75a27ec6d508 (patch) (unidiff)
tree: 12525523ac676e6b43419f742afb6b1d007d61da
parent: aec4806d28c0422e9d0572e9601d6dc41a9cdd61 (diff)
download: opie-dcd5eb6949787321c278b10772bd75a27ec6d508.zip
opie-dcd5eb6949787321c278b10772bd75a27ec6d508.tar.gz
opie-dcd5eb6949787321c278b10772bd75a27ec6d508.tar.bz2
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
@@ -1,118 +1,121 @@
 /*
 � � � � � � � �=.            This file is part of the OPIE Project
 � � � � � � �.=l.            Copyright (c)  2002 Robert Griebl <sandman@handhelds.org>
 � � � � � �.>+-=
 �_;:, � � .> � �:=|.         This library is free software; you can
 .> <`_, � > �. � <=          redistribute it and/or  modify it under
 :`=1 )Y*s>-.-- � :           the terms of the GNU Library General Public
 .="- .-=="i, � � .._         License as published by the Free Software
 �- . � .-<_> � � .<>         Foundation; either version 2 of the License,
 � � �._= =} � � � :          or (at your option) any later version.
 � � .%`+i> � � � _;_.
 � � .i_,=:_. � � �-<s.       This library is distributed in the hope that
 � � �+ �. �-:. � � � =       it will be useful,  but WITHOUT ANY WARRANTY;
 � � : .. � �.:, � � . . .    without even the implied warranty of
 � � =_ � � � �+ � � =;=|`    MERCHANTABILITY or FITNESS FOR A
 � _.=:. � � � : � �:=>`:     PARTICULAR PURPOSE. See the GNU
 ..}^=.= � � � = � � � ;      Library General Public License for more
 ++= � -. � � .` � � .:       details.
 �: � � = �...= . :.=-
 �-. � .:....=;==+<;          You should have received a copy of the GNU
 � -_. . . � )=. �=           Library General Public License along with
 � � -- � � � �:-=`           this library; see the file COPYING.LIB.
                             If not, write to the Free Software Foundation,
                             Inc., 59 Temple Place - Suite 330,
                             Boston, MA 02111-1307, USA.
 */
 #include <opie/colorpopupmenu.h>
 #include <opie/ocolorbutton.h>
 #include <qcolor.h>
 #include <qpixmap.h>
 #include <qimage.h>
        
        #include <qpe/resource.h>
        
 class OColorButtonPrivate {
 public:
        QPopupMenu *m_menu;
        QColor m_color;
 };
 OColorButton::OColorButton ( QWidget *parent, const char *name ) 
        : QPushButton ( parent, 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
 {
        return d-> m_color;
 }
 void OColorButton::setColor ( const QColor &c )
 {
        updateColor ( c );
 }
 void OColorButton::updateColor ( const QColor &c )
 {
        d-> m_color = c;
        
        QImage img ( 16, 16, 32 );
        img. fill ( 0 );
        
        int r, g, b;
        c. rgb ( &r, &g, &b );
        
        int w = img. width ( );
        int h = img. height ( );
        
        int dx = w * 20 / 100; // 15%
        int dy = h * 20 / 100;
        
        for ( int y = 0; y < h; y++ ) {
                for ( int x = 0; x < w; x++ ) {
                        double alpha = 1.0;
                        if ( x < dx )
                                alpha *= ( double ( x + 1 ) / dx );
                        else if ( x >= w - dx )
                                alpha *= ( double ( w - x ) / dx );
                        if ( y < dy )
                                alpha *= ( double ( y + 1 ) / dy );
                        else if ( y >= h - dy )
                                alpha *= ( double ( h - y ) / dy );
                                
                        int a = int ( alpha * 255.0 );
                        if ( a < 0 )
                                a = 0;
                        if ( a > 255 )
                                a = 255;
                        img. setPixel ( x, y, qRgba ( r, g, b, a ));
                }
        }
        img. setAlphaBuffer ( true );
        QPixmap pix;
        pix. convertFromImage ( img );
                setPixmap ( pix );
        emit colorSelected ( c );
 }
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
diff --git a/libopie/ofontselector.h b/libopie/ofontselector.h
index 2011e43..b3aa862 100644
--- a/libopie/ofontselector.h
+++ b/libopie/ofontselector.h
@@ -1,81 +1,82 @@
 /*
 � � � � � � � �=.            This file is part of the OPIE Project
 � � � � � � �.=l.            Copyright (c)  2002 Robert Griebl <sandman@handhelds.org>
 � � � � � �.>+-=
 �_;:, � � .> � �:=|.         This library is free software; you can
 .> <`_, � > �. � <=          redistribute it and/or  modify it under
 :`=1 )Y*s>-.-- � :           the terms of the GNU Library General Public
 .="- .-=="i, � � .._         License as published by the Free Software
 �- . � .-<_> � � .<>         Foundation; either version 2 of the License,
 � � �._= =} � � � :          or (at your option) any later version.
 � � .%`+i> � � � _;_.
 � � .i_,=:_. � � �-<s.       This library is distributed in the hope that
 � � �+ �. �-:. � � � =       it will be useful,  but WITHOUT ANY WARRANTY;
 � � : .. � �.:, � � . . .    without even the implied warranty of
 � � =_ � � � �+ � � =;=|`    MERCHANTABILITY or FITNESS FOR A
 � _.=:. � � � : � �:=>`:     PARTICULAR PURPOSE. See the GNU
 ..}^=.= � � � = � � � ;      Library General Public License for more
 ++= � -. � � .` � � .:       details.
 �: � � = �...= . :.=-
 �-. � .:....=;==+<;          You should have received a copy of the GNU
 � -_. . . � )=. �=           Library General Public License along with
 � � -- � � � �:-=`           this library; see the file COPYING.LIB.
                             If not, write to the Free Software Foundation,
                             Inc., 59 Temple Place - Suite 330,
                             Boston, MA 02111-1307, USA.
 */
 #ifndef __OPIE_FONTSELECTOR_H__
 #define __OPIE_FONTSELECTOR_H__
 #include <qwidget.h>
 #include <qpe/fontdatabase.h>
 class QComboBox;
 class QListBox;
 class QFont;
 class OFontSelector : public QWidget
 {
    Q_OBJECT
 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:
        void fontSelected ( const QFont & );
 protected slots:
    virtual void fontFamilyClicked ( int );
    virtual void fontStyleClicked ( int );
    virtual void fontSizeClicked ( int );
 private:
        void loadFonts ( QListBox * );
    void changeFont ( );
        
 private:
    QListBox *    m_font_family_list;
    QComboBox *   m_font_style_list;
    QComboBox *   m_font_size_list;
    
    FontDatabase  m_fdb;
 };
 #endif
author	sandman <sandman>	2002-09-27 00:54:58 (UTC)
committer	sandman <sandman>	2002-09-27 00:54:58 (UTC)
commit	dcd5eb6949787321c278b10772bd75a27ec6d508 (patch) (unidiff)
tree	12525523ac676e6b43419f742afb6b1d007d61da
parent	aec4806d28c0422e9d0572e9601d6dc41a9cdd61 (diff)
download	opie-dcd5eb6949787321c278b10772bd75a27ec6d508.zip opie-dcd5eb6949787321c278b10772bd75a27ec6d508.tar.gz opie-dcd5eb6949787321c278b10772bd75a27ec6d508.tar.bz2