Scale icons appropriately

1 files changed, 9 insertions, 5 deletions

diff --git a/core/settings/button/buttonsettings.cpp b/core/settings/button/buttonsettings.cpp
index d286369..779f6ef 100644
--- a/core/settings/button/buttonsettings.cpp
+++ b/core/settings/button/buttonsettings.cpp
@@ -1,82 +1,83 @@
 /*
                =.            This file is part of the OPIE Project
              .=l.            Copyright (c)  2002 Robert Griebl <sandman@handhelds.org>
            .>+-=
  _;:,     .>    :=|.         This file is free software; you can
 .> <`_,   >  .   <=          redistribute it and/or modify it under
 :`=1 )Y*s>-.--   :           the terms of the GNU 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 file 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 General
 ..}^=.=       =       ;      Public License for more details.
 ++=   -.     .`     .:
  :     =  ...= . :.=-        You should have received a copy of the GNU
  -.   .:....=;==+<;          General Public License along with this file;
   -_. . .   )=.  =           see the file COPYING. If not, write to the
     --        :-=`           Free Software Foundation, Inc.,
                              59 Temple Place - Suite 330,
                              Boston, MA 02111-1307, USA.
 
 */
 
+#include <opie2/odevice.h>
+
+#include <qpe/applnk.h>
+
 #include <qlayout.h>
 #include <qlabel.h>
 #include <qtimer.h>
 
-
-#include <opie2/odevice.h>
-
 #include "buttonsettings.h"
 #include "buttonutils.h"
 #include "remapdlg.h"
 
 using namespace Opie::Core;
 
 struct buttoninfo {
 	const ODeviceButton *m_button;
 	int          m_index;
 
 	OQCopMessage m_pmsg;
 	QLabel      *m_picon;
 	QLabel      *m_plabel;
 
 	OQCopMessage m_hmsg;
 	QLabel      *m_hicon;
 	QLabel      *m_hlabel;
 
 	bool        m_pdirty : 1;
 	bool        m_hdirty : 1;
 };
 
 
 ButtonSettings::ButtonSettings ( QWidget *parent , const char *,  bool, WFlags  )
 	: QDialog ( parent, "ButtonSettings", false, WStyle_ContextHelp )
 {
 	const QValueList <ODeviceButton> &buttons = ODevice::inst ( )-> buttons ( );
 	(void) ButtonUtils::inst ( ); // initialise
 
 	setCaption ( tr( "Button Settings" ));
 
 	QVBoxLayout *toplay = new QVBoxLayout ( this, 3, 3 );
 
 	QLabel *l = new QLabel ( tr( "<center>Press or hold the button you want to remap.</center>" ), this );
 	toplay-> addWidget ( l );
 
 	QGridLayout *lay = new QGridLayout ( toplay );
 	lay-> setMargin ( 0 );
 	lay-> setColStretch ( 0, 0 );
 	lay-> setColStretch ( 1, 0 );
 	lay-> setColStretch ( 2, 0 );
 	lay-> setColStretch ( 3, 10 );
 
 	m_infos. setAutoDelete ( true );
 
 	int i = 1;
 	int index = 0;
 	for ( QValueList<ODeviceButton>::ConstIterator it = buttons. begin ( ); it != buttons. end ( ); it++ ) {
@@ -108,102 +109,105 @@ ButtonSettings::ButtonSettings ( QWidget *parent , const char *,  bool, WFlags
 		l = new QLabel ( this );
 		l-> setFixedSize ( 16, 16 );
 		lay-> addWidget ( l, i, 2, AlignLeft | AlignBottom );
 		bi-> m_picon = l;
 
 		l = new QLabel ( this );
 		l-> setAlignment ( AlignLeft | AlignVCenter | SingleLine );
 		lay-> addWidget ( l, i, 3, AlignLeft | AlignBottom );
 		bi-> m_plabel = l;
 
 		l = new QLabel ( this );
 		l-> setFixedSize ( 16, 16 );
 		lay-> addWidget ( l, i + 1, 2, AlignLeft | AlignTop );
 		bi-> m_hicon = l;
 
 		l = new QLabel ( this );
 		l-> setAlignment ( AlignLeft | AlignVCenter | SingleLine );
 		lay-> addWidget ( l, i + 1, 3, AlignLeft | AlignTop );
 		bi-> m_hlabel = l;
 
 		i += 2;
 
 		m_infos. append ( bi );
 	}
 
 	toplay-> addStretch ( 10 );
 
 	m_last_button = 0;
 	m_lock = false;
 
 	m_timer = new QTimer ( this );
 	connect ( m_timer, SIGNAL( timeout()), this, SLOT( keyTimeout()));
 
 	updateLabels ( );
 
 	QPEApplication::grabKeyboard ( );
 }
 
 ButtonSettings::~ButtonSettings ( )
 {
 	QPEApplication::ungrabKeyboard ( );
 }
 
 void ButtonSettings::updateLabels ( )
 {
 	for ( QListIterator <buttoninfo> it ( m_infos ); *it; ++it ) {
 		qCopInfo cip = ButtonUtils::inst ( )-> messageToInfo ((*it)-> m_pmsg );
 
-		(*it)-> m_picon-> setPixmap ( cip. m_icon );
+		QPixmap pic;
+		pic.convertFromImage( cip.m_icon.convertToImage().smoothScale( AppLnk::smallIconSize(), AppLnk::smallIconSize() ) );
+		(*it)-> m_picon-> setPixmap ( pic );
 		(*it)-> m_plabel-> setText ( cip. m_name );
 
 		qCopInfo cih = ButtonUtils::inst ( )-> messageToInfo ((*it)-> m_hmsg );
 
-		(*it)-> m_hicon-> setPixmap ( cih. m_icon );
+		pic.convertFromImage( cih.m_icon.convertToImage().smoothScale( AppLnk::smallIconSize(), AppLnk::smallIconSize() ) );
+		(*it)-> m_hicon-> setPixmap ( pic );
 		(*it)-> m_hlabel-> setText ( cih. m_name );
 	}
 }
 
 buttoninfo *ButtonSettings::buttonInfoForKeycode ( ushort key )
 {
 	for ( QListIterator <buttoninfo> it ( m_infos ); *it; ++it ) {
 		if ((*it)-> m_button-> keycode ( ) == key )
 			return *it;
 	}
 	return 0;
 }
 
 void ButtonSettings::keyPressEvent ( QKeyEvent *e )
 {
 	buttoninfo *bi = buttonInfoForKeycode ( e-> key ( ));
 
 	if ( bi && !e-> isAutoRepeat ( )) {
 		m_timer-> stop ( );
 		m_last_button = bi;
 		m_timer-> start ( ODevice::inst ( )-> buttonHoldTime ( ), true );
 	}
 	else
 		QDialog::keyPressEvent ( e );
 }
 
 void ButtonSettings::keyReleaseEvent ( QKeyEvent *e )
 {
 	buttoninfo *bi = buttonInfoForKeycode ( e-> key ( ));
 
 	if ( bi && !e-> isAutoRepeat ( ) && m_timer-> isActive ( )) {
 		m_timer-> stop ( );
 		edit ( bi, false );
 	}
 	else
 		QDialog::keyReleaseEvent ( e );
 }
 
 void ButtonSettings::keyTimeout ( )
 {
 	if ( m_last_button ) {
 		edit ( m_last_button, true );
 		m_last_button = false;
 	}
 }
 
 void ButtonSettings::edit ( buttoninfo *bi, bool hold )
 {