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
@@ -16,31 +16,32 @@
   _.=:.       :    :=>`:     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;
@@ -144,30 +145,33 @@ ButtonSettings::ButtonSettings ( QWidget *parent , const char *,  bool, WFlags
 }
 
 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;
 }