summaryrefslogtreecommitdiff
path: root/core/settings/button
authorhrw <hrw>2005-10-12 21:08:35 (UTC)
committer hrw <hrw>2005-10-12 21:08:35 (UTC)
commit611de84768e4825d6851dc833bd6402efd572383 (patch) (unidiff)
treee8eeb258651884f7b3f6b4aecf7f46a06fb12c43 /core/settings/button
parent6d3c752d2e93f5a43a4b5156f9968e07b3144c0a (diff)
downloadopie-611de84768e4825d6851dc833bd6402efd572383.zip
opie-611de84768e4825d6851dc833bd6402efd572383.tar.gz
opie-611de84768e4825d6851dc833bd6402efd572383.tar.bz2
fixed bug #1624: Button settngs changes are applied only after restart
Diffstat (limited to 'core/settings/button') (more/less context) (ignore whitespace changes)
-rw-r--r--core/settings/button/buttonsettings.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/core/settings/button/buttonsettings.cpp b/core/settings/button/buttonsettings.cpp
index a476a6b..a600d57 100644
--- a/core/settings/button/buttonsettings.cpp
+++ b/core/settings/button/buttonsettings.cpp
@@ -28,25 +28,25 @@ _;:, .> :=|. This file is free software; you can
28#include "buttonsettings.h" 28#include "buttonsettings.h"
29#include "buttonutils.h" 29#include "buttonutils.h"
30#include "remapdlg.h" 30#include "remapdlg.h"
31 31
32#include <opie2/odevice.h> 32#include <opie2/odevice.h>
33 33
34#include <qpe/applnk.h> 34#include <qpe/applnk.h>
35 35
36#include <qlayout.h> 36#include <qlayout.h>
37#include <qlabel.h> 37#include <qlabel.h>
38#include <qtimer.h> 38#include <qtimer.h>
39#include <qscrollview.h> 39#include <qscrollview.h>
40 40#include <qcopchannel_qws.h>
41 41
42using namespace Opie::Core; 42using namespace Opie::Core;
43 43
44struct buttoninfo { 44struct buttoninfo {
45 const ODeviceButton *m_button; 45 const ODeviceButton *m_button;
46 int m_index; 46 int m_index;
47 47
48 OQCopMessage m_pmsg; 48 OQCopMessage m_pmsg;
49 QLabel *m_picon; 49 QLabel *m_picon;
50 QLabel *m_plabel; 50 QLabel *m_plabel;
51 51
52 OQCopMessage m_hmsg; 52 OQCopMessage m_hmsg;
@@ -148,24 +148,25 @@ ButtonSettings::ButtonSettings ( QWidget *parent , const char *, bool, WFlags
148 148
149 m_timer = new QTimer ( this ); 149 m_timer = new QTimer ( this );
150 connect ( m_timer, SIGNAL( timeout()), this, SLOT( keyTimeout())); 150 connect ( m_timer, SIGNAL( timeout()), this, SLOT( keyTimeout()));
151 151
152 updateLabels ( ); 152 updateLabels ( );
153 153
154 QPEApplication::grabKeyboard ( ); 154 QPEApplication::grabKeyboard ( );
155} 155}
156 156
157ButtonSettings::~ButtonSettings ( ) 157ButtonSettings::~ButtonSettings ( )
158{ 158{
159 QPEApplication::ungrabKeyboard ( ); 159 QPEApplication::ungrabKeyboard ( );
160 QCopChannel::send ("QPE/System", "deviceButtonMappingChanged()" );
160} 161}
161 162
162void ButtonSettings::updateLabels ( ) 163void ButtonSettings::updateLabels ( )
163{ 164{
164 for ( QListIterator <buttoninfo> it ( m_infos ); *it; ++it ) { 165 for ( QListIterator <buttoninfo> it ( m_infos ); *it; ++it ) {
165 qCopInfo cip = ButtonUtils::inst ( )-> messageToInfo ((*it)-> m_pmsg ); 166 qCopInfo cip = ButtonUtils::inst ( )-> messageToInfo ((*it)-> m_pmsg );
166 167
167 QPixmap pic; 168 QPixmap pic;
168 pic.convertFromImage( cip.m_icon.convertToImage().smoothScale( AppLnk::smallIconSize(), AppLnk::smallIconSize() ) ); 169 pic.convertFromImage( cip.m_icon.convertToImage().smoothScale( AppLnk::smallIconSize(), AppLnk::smallIconSize() ) );
169 (*it)-> m_picon-> setPixmap ( pic ); 170 (*it)-> m_picon-> setPixmap ( pic );
170 (*it)-> m_plabel-> setText ( cip. m_name ); 171 (*it)-> m_plabel-> setText ( cip. m_name );
171 172