fixed bug #1624: Button settngs changes are applied only after restart

2 files changed, 3 insertions, 1 deletions

diff --git a/ChangeLog b/ChangeLog
index b817062..53a498d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,75 +1,76 @@
 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)
 	* Today Addressbook plugin: Fixed configuration to show/not show birthdays, use checkboxes for selection (hrw)
 	* Opie-Console: Read initial fixed font configuration from qpe.conf (mickeyl)
 	* Opie-PcmciaApplet: Configure insert/resume actions and bind unsupported cards (mickeyl)
 	* SysInfo: Remove CPU tab and add Devices tab instead (mickeyl)
 	* Opie-smb: Added Opie front end for Samba (ljp)
 	* Opie-Bluetooth: Replace obex send implementation and patch libopieobex and the bluetoothapplet (Michael Haynie)
 	* Opieplayer: rudimentary podcast support (ljp)
 	
 	Fixed Bugs
 	----------
 	* #1377 - Suspend Powermanagement when switched to another VT (mickeyl)
 	        - We actually suspend the complete Opie now in that case.
 	* #1384 - Battery status updated improperly when charging (skyhusker)
 	* #1476 - Wrong order of application entries in the O-menu (skyhusker)
 	* #1514 - Remove usage of cardmon/pcmcia picture in applications. pcmcia is now an inline picture (mickeyl)
 	* #1535	- Missing line break and unnecessary location shown with Today-Calendar plugin (deller)
 	* #1543 - Time Settings: "predict" tab is displayed twice after reopen (hrw)
 	* #1546 - Battery applet popup is not always large enough to show jacket remaining info (skyhusker)
 	* #1557 - Light&Power-Settings don't store warning intervall and warning levels (skyhusker)
 	* #1565 - crash-fix in odevice.cpp while scanning the distribution table (deller)
 	* #1614 - Make Opie-console start in $HOME instead of / (skyhusker)
 	* #1635 - opie-today, datebook-plugin does not show notes (skyhusker)
 	* #1665 - Opie-IRC displays the host prepended to the message when peer is using and ipv6 address (skyhusker)
 	* #1666 - Opie-IRC does not allow to add !channels in config as	autojoin ones (skyhusker)
 	* #1667 - Opie-IRC does not show messages from !channel (skyhusker)
 	* #1679 - Security PIN plugin is QVGA sized (hrw)
 	* #1682 - Properly resize tab control in OTabWidget (drw)
 	* n.a.  - always show volume and wireless applet popups inside visible screen (deller)
 	* n.a.  - scale O-Menu-Applets appropriately (mickeyl)
 	* n.a.  - libopienet: fix bugs in wireless scanning and setting SSID (skyhusker)
 	* n.a.  - Wellenreiter: relax WE version matching test a bit (mickeyl)
 	* n.a.  - scale BluezApplet appropriately and use larger icons (mickeyl)
 	* n.a.  - memoryapplet: fix crash in memoryapplet on kernels without swap support (seneca cunningham)
 	* n.a.  - networksettings: ignore hostap control interfaces wifi* (mickeyl)
 	* n.a.  - Today Addressbook plugin fix configuration to show/not show birthdays, use checkboxes for selection (hrw)
 	* n.a.  - remove hardcoded font size from netsystemtime (hrw)
 	* n.a.  - remove hardcoded font size from checkbook graphs (hrw)
 	* n.a.  - Dagger - fixes for Sword 1.5.8, morph tag x-refs, closing last tab crash (drw)
 	
 
 	Internal
 	--------
 	* Make BluezApplet use OTaskbarApplet (mickeyl)
 	* libopiecore: rewrite OFileNotification to use the Linux 2.6 inotify interface (mickeyl)
 	* libopiecore: add ODirNotification - recursive directory notifications (mickeyl)
 	* libopienet: Skip hostap control interfaces 'wifi' and improve robustness in ONetworkInterface (mickeyl)
 	* libopieui: Remove OVersatileView and OVersatileViewItem (mickeyl)
 	* libopienet: Miscellaneous API cleanups (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
@@ -1,223 +1,224 @@
 /*
        =.            This file is part of the OPIE Project
       .=l.            Copyright (c)  2002 Robert Griebl <sandman@handhelds.org>
      .>+-=
 _;:,   .>  :=|.         This file is free software; you can
 .> <`_,  > .  <=          redistribute it and/or modify it under
 :`=1 )Y*s>-.--  :           the terms of the GNU General Public
 .="- .-=="i,   .._         License as published by the Free Software
 - .  .-<_>   .<>         Foundation; either version 2 of the License,
   ._= =}    :          or (at your option) any later version.
   .%`+i>    _;_.
   .i_,=:_.   -<s.       This file is distributed in the hope that
   + . -:.    =       it will be useful, but WITHOUT ANY WARRANTY;
   : ..  .:,   . . .    without even the implied warranty of
   =_    +   =;=|`    MERCHANTABILITY or FITNESS FOR A
  _.=:.    :  :=>`:     PARTICULAR PURPOSE. See the GNU General
 ..}^=.=    =    ;      Public License for more details.
 ++=  -.   .`   .:
 :   = ...= . :.=-        You should have received a copy of the GNU
 -.  .:....=;==+<;          General Public License along with this file;
  -_. . .  )=. =           see the file COPYING. If not, write to the
   --    :-=`           Free Software Foundation, Inc.,
                              59 Temple Place - Suite 330,
                              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;
     bool        m_hdirty : 1;
 };
 
 
 ButtonSettings::ButtonSettings ( QWidget *parent , const char *,  bool, WFlags  )
     : QDialog ( parent, "ButtonSettings", false, WStyle_ContextHelp )
 {
     const QValueList <ODeviceButton> &buttons = ODevice::inst ( )-> buttons ( );
     (void) ButtonUtils::inst ( ); // initialise
 
     setCaption ( tr( "Button Settings" ));
 
     QVBoxLayout *toplay = new QVBoxLayout ( this, 3, 3 );
     QScrollView*mainview = new QScrollView(this);
     mainview->setResizePolicy( QScrollView::AutoOneFit );
 
     toplay->addWidget(mainview);
     QFrame*framehold=new QFrame(mainview->viewport());
     framehold->setFrameStyle(QFrame::NoFrame|QFrame::Plain);
     mainview->addChild(framehold);
     toplay = new QVBoxLayout (framehold, 3, 3 );
 
     QLabel *l = new QLabel ( tr( "<center>Press or hold the button you want to remap.</center>" ), framehold );
     toplay-> addWidget ( l );
 
     QGridLayout *lay = new QGridLayout ( toplay );
     lay-> setMargin ( 0 );
     lay-> setColStretch ( 0, 0 );
     lay-> setColStretch ( 1, 0 );
     lay-> setColStretch ( 2, 0 );
     lay-> setColStretch ( 3, 10 );
 
     m_infos. setAutoDelete ( true );
 
     int i = 1;
     int index = 0;
     for ( QValueList<ODeviceButton>::ConstIterator it = buttons. begin ( ); it != buttons. end ( ); it++ ) {
         if ( it != buttons. begin ( )) {
             QFrame *f = new QFrame ( framehold );
             f-> setFrameStyle ( QFrame::Sunken | QFrame::VLine );
             lay-> addMultiCellWidget ( f, i, i, 0, 3 );
             i++;
         }
 
         buttoninfo *bi = new buttoninfo ( );
         bi-> m_button = &(*it);
         bi-> m_index = index++;
         bi-> m_pmsg = (*it). pressedAction ( );
         bi-> m_hmsg = (*it). heldAction ( );
         bi-> m_pdirty = false;
         bi-> m_hdirty = false;
 
         l = new QLabel ( framehold );
         l-> setPixmap (( *it ). pixmap ( ));
 
         lay-> addMultiCellWidget ( l, i, i + 1, 0, 0 );
 
         l = new QLabel ( tr( "Press:" ), framehold );
         lay-> addWidget ( l, i, 1, AlignLeft | AlignBottom );
         l = new QLabel ( tr( "Hold:" ), framehold );
         lay-> addWidget ( l, i + 1, 1, AlignLeft | AlignTop );
 
         l = new QLabel ( framehold );
         l-> setFixedSize ( AppLnk::smallIconSize(), AppLnk::smallIconSize() );
         lay-> addWidget ( l, i, 2, AlignLeft | AlignBottom );
         bi-> m_picon = l;
 
         l = new QLabel ( framehold );
         l-> setAlignment ( AlignLeft | AlignVCenter | SingleLine );
         lay-> addWidget ( l, i, 3, AlignLeft | AlignBottom );
         bi-> m_plabel = l;
 
         l = new QLabel ( framehold );
         l-> setFixedSize ( AppLnk::smallIconSize(), AppLnk::smallIconSize() );
         lay-> addWidget ( l, i + 1, 2, AlignLeft | AlignTop );
         bi-> m_hicon = l;
 
         l = new QLabel ( framehold );
         l-> setAlignment ( AlignLeft | AlignVCenter | SingleLine );
         lay-> addWidget ( l, i + 1, 3, AlignLeft | AlignTop );
         bi-> m_hlabel = l;
 
         i += 2;
 
         m_infos. append ( bi );
     }
 
     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 );
         (*it)-> m_hlabel-> setText ( cih. m_name );
     }
 }
 
 buttoninfo *ButtonSettings::buttonInfoForKeycode ( ushort key )
 {
     for ( QListIterator <buttoninfo> it ( m_infos ); *it; ++it ) {
         if ((*it)-> m_button-> keycode ( ) == key )
             return *it;
     }
     return 0;
 }
 
 void ButtonSettings::keyPressEvent ( QKeyEvent *e )
 {
     buttoninfo *bi = buttonInfoForKeycode ( e-> key ( ));
 
     if ( bi && !e-> isAutoRepeat ( )) {
         m_timer-> stop ( );
         m_last_button = bi;
         m_timer-> start ( ODevice::inst ( )-> buttonHoldTime ( ), true );
     }
     else
         QDialog::keyPressEvent ( e );
 }
 
 void ButtonSettings::keyReleaseEvent ( QKeyEvent *e )
 {
     buttoninfo *bi = buttonInfoForKeycode ( e-> key ( ));
 
     if ( bi && !e-> isAutoRepeat ( ) && m_timer-> isActive ( )) {
         m_timer-> stop ( );
         edit ( bi, false );
     }
     else
         QDialog::keyReleaseEvent ( e );
 }
 
 void ButtonSettings::keyTimeout ( )
 {
     if ( m_last_button ) {
         edit ( m_last_button, true );
         m_last_button = false;
     }
 }
 
 void ButtonSettings::edit ( buttoninfo *bi, bool hold )
 {