-rw-r--r-- | core/settings/button/buttonsettings.cpp | 14 |
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 | |||
@@ -22,19 +22,20 @@ | |||
22 | -- :-=` Free Software Foundation, Inc., | 22 | -- :-=` Free Software Foundation, Inc., |
23 | 59 Temple Place - Suite 330, | 23 | 59 Temple Place - Suite 330, |
24 | Boston, MA 02111-1307, USA. | 24 | Boston, MA 02111-1307, USA. |
25 | 25 | ||
26 | */ | 26 | */ |
27 | 27 | ||
28 | #include <opie2/odevice.h> | ||
29 | |||
30 | #include <qpe/applnk.h> | ||
31 | |||
28 | #include <qlayout.h> | 32 | #include <qlayout.h> |
29 | #include <qlabel.h> | 33 | #include <qlabel.h> |
30 | #include <qtimer.h> | 34 | #include <qtimer.h> |
31 | 35 | ||
32 | |||
33 | #include <opie2/odevice.h> | ||
34 | |||
35 | #include "buttonsettings.h" | 36 | #include "buttonsettings.h" |
36 | #include "buttonutils.h" | 37 | #include "buttonutils.h" |
37 | #include "remapdlg.h" | 38 | #include "remapdlg.h" |
38 | 39 | ||
39 | using namespace Opie::Core; | 40 | using namespace Opie::Core; |
40 | 41 | ||
@@ -150,18 +151,21 @@ ButtonSettings::~ButtonSettings ( ) | |||
150 | 151 | ||
151 | void ButtonSettings::updateLabels ( ) | 152 | void ButtonSettings::updateLabels ( ) |
152 | { | 153 | { |
153 | for ( QListIterator <buttoninfo> it ( m_infos ); *it; ++it ) { | 154 | for ( QListIterator <buttoninfo> it ( m_infos ); *it; ++it ) { |
154 | qCopInfo cip = ButtonUtils::inst ( )-> messageToInfo ((*it)-> m_pmsg ); | 155 | qCopInfo cip = ButtonUtils::inst ( )-> messageToInfo ((*it)-> m_pmsg ); |
155 | 156 | ||
156 | (*it)-> m_picon-> setPixmap ( cip. m_icon ); | 157 | QPixmap pic; |
158 | pic.convertFromImage( cip.m_icon.convertToImage().smoothScale( AppLnk::smallIconSize(), AppLnk::smallIconSize() ) ); | ||
159 | (*it)-> m_picon-> setPixmap ( pic ); | ||
157 | (*it)-> m_plabel-> setText ( cip. m_name ); | 160 | (*it)-> m_plabel-> setText ( cip. m_name ); |
158 | 161 | ||
159 | qCopInfo cih = ButtonUtils::inst ( )-> messageToInfo ((*it)-> m_hmsg ); | 162 | qCopInfo cih = ButtonUtils::inst ( )-> messageToInfo ((*it)-> m_hmsg ); |
160 | 163 | ||
161 | (*it)-> m_hicon-> setPixmap ( cih. m_icon ); | 164 | pic.convertFromImage( cih.m_icon.convertToImage().smoothScale( AppLnk::smallIconSize(), AppLnk::smallIconSize() ) ); |
165 | (*it)-> m_hicon-> setPixmap ( pic ); | ||
162 | (*it)-> m_hlabel-> setText ( cih. m_name ); | 166 | (*it)-> m_hlabel-> setText ( cih. m_name ); |
163 | } | 167 | } |
164 | } | 168 | } |
165 | 169 | ||
166 | buttoninfo *ButtonSettings::buttonInfoForKeycode ( ushort key ) | 170 | buttoninfo *ButtonSettings::buttonInfoForKeycode ( ushort key ) |
167 | { | 171 | { |