author | hrw <hrw> | 2005-10-12 21:08:35 (UTC) |
---|---|---|
committer | hrw <hrw> | 2005-10-12 21:08:35 (UTC) |
commit | 611de84768e4825d6851dc833bd6402efd572383 (patch) (unidiff) | |
tree | e8eeb258651884f7b3f6b4aecf7f46a06fb12c43 | |
parent | 6d3c752d2e93f5a43a4b5156f9968e07b3144c0a (diff) | |
download | opie-611de84768e4825d6851dc833bd6402efd572383.zip opie-611de84768e4825d6851dc833bd6402efd572383.tar.gz opie-611de84768e4825d6851dc833bd6402efd572383.tar.bz2 |
fixed bug #1624: Button settngs changes are applied only after restart
-rw-r--r-- | ChangeLog | 1 | ||||
-rw-r--r-- | core/settings/button/buttonsettings.cpp | 3 |
2 files changed, 3 insertions, 1 deletions
@@ -1,23 +1,24 @@ | |||
1 | 2005-??-??Opie 1.2.2 | 1 | 2005-??-??Opie 1.2.2 |
2 | 2 | ||
3 | 3 | ||
4 | New Features | 4 | New Features |
5 | ------------ | 5 | ------------ |
6 | 6 | ||
7 | 7 | ||
8 | Fixed Bugs | 8 | Fixed Bugs |
9 | ---------- | 9 | ---------- |
10 | * #1695 - Date selector use too small fontsize on VGA screen (hrw) | 10 | * #1695 - Date selector use too small fontsize on VGA screen (hrw) |
11 | * #1686 - opie-console lack UI setting for switching scrollbar (hrw) | 11 | * #1686 - opie-console lack UI setting for switching scrollbar (hrw) |
12 | * #1624 - Button settngs changes are applied only after restart (hrw) | ||
12 | * n.a. - remove hardcoded font size from wellenreiter (hrw) | 13 | * n.a. - remove hardcoded font size from wellenreiter (hrw) |
13 | * n.a. - added patch to build QT/E 2.3.10 with gc 4.x.x (hrw) | 14 | * n.a. - added patch to build QT/E 2.3.10 with gc 4.x.x (hrw) |
14 | 15 | ||
15 | 2005-09-11Opie 1.2.1 | 16 | 2005-09-11Opie 1.2.1 |
16 | 17 | ||
17 | 18 | ||
18 | New Features | 19 | New Features |
19 | ------------ | 20 | ------------ |
20 | * OpieStumbler: Scans WiFi networks using the wireless extension scanning (skyhusker) | 21 | * OpieStumbler: Scans WiFi networks using the wireless extension scanning (skyhusker) |
21 | * Opie-Reader: Support for document formats ArriereGo and Reb, add flite output (tim,pohly) | 22 | * Opie-Reader: Support for document formats ArriereGo and Reb, add flite output (tim,pohly) |
22 | * Opie-Networksettings: Add support for wlan-ng devices and improve WEP handling (Dirk Opfer) | 23 | * Opie-Networksettings: Add support for wlan-ng devices and improve WEP handling (Dirk Opfer) |
23 | * Wellenreiter: Remove Joining networks - use OpieStumbler for that (mickeyl) | 24 | * Wellenreiter: Remove Joining networks - use OpieStumbler for that (mickeyl) |
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 | ||
42 | using namespace Opie::Core; | 42 | using namespace Opie::Core; |
43 | 43 | ||
44 | struct buttoninfo { | 44 | struct 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 | ||
157 | ButtonSettings::~ButtonSettings ( ) | 157 | ButtonSettings::~ButtonSettings ( ) |
158 | { | 158 | { |
159 | QPEApplication::ungrabKeyboard ( ); | 159 | QPEApplication::ungrabKeyboard ( ); |
160 | QCopChannel::send ("QPE/System", "deviceButtonMappingChanged()" ); | ||
160 | } | 161 | } |
161 | 162 | ||
162 | void ButtonSettings::updateLabels ( ) | 163 | void 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 | ||