summaryrefslogtreecommitdiff
authorhrw <hrw>2005-10-12 21:08:35 (UTC)
committer hrw <hrw>2005-10-12 21:08:35 (UTC)
commit611de84768e4825d6851dc833bd6402efd572383 (patch) (side-by-side diff)
treee8eeb258651884f7b3f6b4aecf7f46a06fb12c43
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 (more/less context) (show 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,27 +1,28 @@
2005-??-?? Opie 1.2.2
New Features
------------
Fixed Bugs
----------
* #1695 - Date selector use too small fontsize on VGA screen (hrw)
* #1686 - opie-console lack UI setting for switching scrollbar (hrw)
+ * #1624 - Button settngs changes are applied only after restart (hrw)
* n.a. - remove hardcoded font size from wellenreiter (hrw)
* n.a. - added patch to build QT/E 2.3.10 with gc 4.x.x (hrw)
2005-09-11 Opie 1.2.1
New Features
------------
* OpieStumbler: Scans WiFi networks using the wireless extension scanning (skyhusker)
* Opie-Reader: Support for document formats ArriereGo and Reb, add flite output (tim,pohly)
* Opie-Networksettings: Add support for wlan-ng devices and improve WEP handling (Dirk Opfer)
* Wellenreiter: Remove Joining networks - use OpieStumbler for that (mickeyl)
* Opie-Mobilemsg has gone unsupported - it never really worked and there will be a replacement (mickeyl)
* Opie-Tabmanager has gone unsupported - it barely works and there is not much of a use of it anyway (mickeyl)
* Checkbook: Added configuration option to use smaller font for checkbook transaction tab (hrw)
* ZSafe: Made UI conform to Opie standards (drw)
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
@@ -24,33 +24,33 @@ _;:, .> :=|. This file is free software; you can
Boston, MA 02111-1307, USA.
*/
#include "buttonsettings.h"
#include "buttonutils.h"
#include "remapdlg.h"
#include <opie2/odevice.h>
#include <qpe/applnk.h>
#include <qlayout.h>
#include <qlabel.h>
#include <qtimer.h>
#include <qscrollview.h>
-
+#include <qcopchannel_qws.h>
using namespace Opie::Core;
struct buttoninfo {
const ODeviceButton *m_button;
int m_index;
OQCopMessage m_pmsg;
QLabel *m_picon;
QLabel *m_plabel;
OQCopMessage m_hmsg;
QLabel *m_hicon;
QLabel *m_hlabel;
bool m_pdirty : 1;
@@ -144,32 +144,33 @@ ButtonSettings::ButtonSettings ( QWidget *parent , const char *, bool, WFlags
toplay-> addStretch ( 10 );
m_last_button = 0;
m_lock = false;
m_timer = new QTimer ( this );
connect ( m_timer, SIGNAL( timeout()), this, SLOT( keyTimeout()));
updateLabels ( );
QPEApplication::grabKeyboard ( );
}
ButtonSettings::~ButtonSettings ( )
{
QPEApplication::ungrabKeyboard ( );
+ QCopChannel::send ("QPE/System", "deviceButtonMappingChanged()" );
}
void ButtonSettings::updateLabels ( )
{
for ( QListIterator <buttoninfo> it ( m_infos ); *it; ++it ) {
qCopInfo cip = ButtonUtils::inst ( )-> messageToInfo ((*it)-> m_pmsg );
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 );
pic.convertFromImage( cih.m_icon.convertToImage().smoothScale( AppLnk::smallIconSize(), AppLnk::smallIconSize() ) );
(*it)-> m_hicon-> setPixmap ( pic );