summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--ChangeLog1
-rw-r--r--core/settings/button/buttonsettings.cpp3
2 files changed, 3 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index b817062..53a498d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,35 +1,36 @@
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)
24 * Opie-Mobilemsg has gone unsupported - it never really worked and there will be a replacement (mickeyl) 25 * Opie-Mobilemsg has gone unsupported - it never really worked and there will be a replacement (mickeyl)
25 * Opie-Tabmanager has gone unsupported - it barely works and there is not much of a use of it anyway (mickeyl) 26 * Opie-Tabmanager has gone unsupported - it barely works and there is not much of a use of it anyway (mickeyl)
26 * Checkbook: Added configuration option to use smaller font for checkbook transaction tab (hrw) 27 * Checkbook: Added configuration option to use smaller font for checkbook transaction tab (hrw)
27 * ZSafe: Made UI conform to Opie standards (drw) 28 * ZSafe: Made UI conform to Opie standards (drw)
28 * Today Addressbook plugin: Fixed configuration to show/not show birthdays, use checkboxes for selection (hrw) 29 * Today Addressbook plugin: Fixed configuration to show/not show birthdays, use checkboxes for selection (hrw)
29 * Opie-Console: Read initial fixed font configuration from qpe.conf (mickeyl) 30 * Opie-Console: Read initial fixed font configuration from qpe.conf (mickeyl)
30 * Opie-PcmciaApplet: Configure insert/resume actions and bind unsupported cards (mickeyl) 31 * Opie-PcmciaApplet: Configure insert/resume actions and bind unsupported cards (mickeyl)
31 * SysInfo: Remove CPU tab and add Devices tab instead (mickeyl) 32 * SysInfo: Remove CPU tab and add Devices tab instead (mickeyl)
32 * Opie-smb: Added Opie front end for Samba (ljp) 33 * Opie-smb: Added Opie front end for Samba (ljp)
33 * Opie-Bluetooth: Replace obex send implementation and patch libopieobex and the bluetoothapplet (Michael Haynie) 34 * Opie-Bluetooth: Replace obex send implementation and patch libopieobex and the bluetoothapplet (Michael Haynie)
34 * Opieplayer: rudimentary podcast support (ljp) 35 * Opieplayer: rudimentary podcast support (ljp)
35 36
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
@@ -16,49 +16,49 @@ _;:, .> :=|. This file is free software; you can
16 _.=:. : :=>`: PARTICULAR PURPOSE. See the GNU General 16 _.=:. : :=>`: PARTICULAR PURPOSE. See the GNU General
17..}^=.= = ; Public License for more details. 17..}^=.= = ; Public License for more details.
18++= -. .` .: 18++= -. .` .:
19: = ...= . :.=- You should have received a copy of the GNU 19: = ...= . :.=- You should have received a copy of the GNU
20-. .:....=;==+<; General Public License along with this file; 20-. .:....=;==+<; General Public License along with this file;
21 -_. . . )=. = see the file COPYING. If not, write to the 21 -_. . . )=. = see the file COPYING. If not, write to the
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 "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;
53 QLabel *m_hicon; 53 QLabel *m_hicon;
54 QLabel *m_hlabel; 54 QLabel *m_hlabel;
55 55
56 bool m_pdirty : 1; 56 bool m_pdirty : 1;
57 bool m_hdirty : 1; 57 bool m_hdirty : 1;
58}; 58};
59 59
60 60
61ButtonSettings::ButtonSettings ( QWidget *parent , const char *, bool, WFlags ) 61ButtonSettings::ButtonSettings ( QWidget *parent , const char *, bool, WFlags )
62 : QDialog ( parent, "ButtonSettings", false, WStyle_ContextHelp ) 62 : QDialog ( parent, "ButtonSettings", false, WStyle_ContextHelp )
63{ 63{
64 const QValueList <ODeviceButton> &buttons = ODevice::inst ( )-> buttons ( ); 64 const QValueList <ODeviceButton> &buttons = ODevice::inst ( )-> buttons ( );
@@ -136,48 +136,49 @@ ButtonSettings::ButtonSettings ( QWidget *parent , const char *, bool, WFlags
136 lay-> addWidget ( l, i + 1, 3, AlignLeft | AlignTop ); 136 lay-> addWidget ( l, i + 1, 3, AlignLeft | AlignTop );
137 bi-> m_hlabel = l; 137 bi-> m_hlabel = l;
138 138
139 i += 2; 139 i += 2;
140 140
141 m_infos. append ( bi ); 141 m_infos. append ( bi );
142 } 142 }
143 143
144 toplay-> addStretch ( 10 ); 144 toplay-> addStretch ( 10 );
145 145
146 m_last_button = 0; 146 m_last_button = 0;
147 m_lock = false; 147 m_lock = false;
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
172 qCopInfo cih = ButtonUtils::inst ( )-> messageToInfo ((*it)-> m_hmsg ); 173 qCopInfo cih = ButtonUtils::inst ( )-> messageToInfo ((*it)-> m_hmsg );
173 174
174 pic.convertFromImage( cih.m_icon.convertToImage().smoothScale( AppLnk::smallIconSize(), AppLnk::smallIconSize() ) ); 175 pic.convertFromImage( cih.m_icon.convertToImage().smoothScale( AppLnk::smallIconSize(), AppLnk::smallIconSize() ) );
175 (*it)-> m_hicon-> setPixmap ( pic ); 176 (*it)-> m_hicon-> setPixmap ( pic );
176 (*it)-> m_hlabel-> setText ( cih. m_name ); 177 (*it)-> m_hlabel-> setText ( cih. m_name );
177 } 178 }
178} 179}
179 180
180buttoninfo *ButtonSettings::buttonInfoForKeycode ( ushort key ) 181buttoninfo *ButtonSettings::buttonInfoForKeycode ( ushort key )
181{ 182{
182 for ( QListIterator <buttoninfo> it ( m_infos ); *it; ++it ) { 183 for ( QListIterator <buttoninfo> it ( m_infos ); *it; ++it ) {
183 if ((*it)-> m_button-> keycode ( ) == key ) 184 if ((*it)-> m_button-> keycode ( ) == key )