Fixed bug #744 where non mapped buttons in buttonsettings were not saved by introducing the "

ignore" statement.
Also removed unsed debug code

5 files changed, 39 insertions, 12 deletions

diff --git a/core/launcher/desktop.cpp b/core/launcher/desktop.cpp
index 59f2aea..fbcce7c 100644
--- a/core/launcher/desktop.cpp
+++ b/core/launcher/desktop.cpp
@@ -297,126 +297,135 @@ void DesktopApplication::reloadPowerWarnSettings ( )
 	cfg. setGroup ( "Warnings" );
 
 	int iv = cfg. readNumEntry ( "checkinterval", 10000 );
 
 	m_apm_timer-> stop ( );	
 	if ( iv )
 		m_apm_timer-> start ( iv );
 		
 	m_powerVeryLow  = cfg. readNumEntry ( "powerverylow", 10 );
 	m_powerCritical = cfg. readNumEntry ( "powervcritical", 5 );
 }
 
 
 enum MemState { Unknown, VeryLow, Low, Normal } memstate = Unknown;
 
 
 void DesktopApplication::launcherMessage( const QCString & msg, const QByteArray & data )
 {
 	QDataStream stream ( data, IO_ReadOnly );
 
 	if ( msg == "deviceButton(int,int,int)" ) {
 		int keycode, press, autoRepeat;
 		stream >> keycode >> press >> autoRepeat;
 		
 		const ODeviceButton *db = ODevice::inst ( )-> buttonForKeycode ( keycode );
 		
 		if ( db )
 	    	checkButtonAction ( db, keycode, press, autoRepeat );
 	}
 	else if ( msg == "keyRegister(int,QCString,QCString)" ) {
 		int k;
 		QCString c, m;
 		stream >> k >> c >> m;
 
 		keyRegisterList.append ( QCopKeyRegister ( k, c, m ));
 	}
 }
 
 void DesktopApplication::sendHeldAction ( )
 {
 	if ( m_last_button ) {
 		m_last_button-> heldAction ( ). send ( );
 		m_last_button = 0;
 	}
 }
 
 
 
-void DesktopApplication::checkButtonAction ( const ODeviceButton *db, int /*keycode*/, bool press, bool autoRepeat )
+bool DesktopApplication::checkButtonAction ( const ODeviceButton *db, int /*keycode*/, bool press, bool autoRepeat )
 {		
 	if ( db ) {
 		if ( !press && !autoRepeat && m_button_timer-> isActive ( )) {
 			m_button_timer-> stop ( );
-			if ( !db-> pressedAction ( ). channel ( ). isEmpty ( )) {
+			
+			if (!db-> pressedAction ( ). channel ( ) .isEmpty())
+			{
+				if ( db-> pressedAction ( ). channel ( )!="ignore") {
 				db-> pressedAction ( ). send ( );
 			}
+				else return false;
+			}
 		}
 		else if ( press && !autoRepeat ) {
 			m_button_timer-> stop ( );
+			if (!db-> pressedAction ( ). channel ( ) .isEmpty())
+			{
 			
-			if ( !db-> heldAction ( ). channel ( ). isEmpty ( )) {
+				if ( db-> heldAction ( ). channel ( )!="ignore") {
 				m_last_button = db;
 				m_button_timer-> start ( ODevice::inst ( )-> buttonHoldTime ( ), true );
 			}
+				else return false;
 		}
 	}
 }
+	return true;
+}
 
 bool DesktopApplication::eventFilter ( QObject *o, QEvent *e )
 {
 	if ( e-> type ( ) == QEvent::KeyPress || e-> type ( ) == QEvent::KeyRelease ) {
 		QKeyEvent *ke = (QKeyEvent *) e;
 	
 		const ODeviceButton *db = ODevice::inst ( )-> buttonForKeycode ( ke-> key ( ));
         
 		if ( db ) {
-			checkButtonAction ( db, ke-> key ( ), e-> type ( ) == QEvent::KeyPress, ke-> isAutoRepeat ( ));
-			return true;
+			return checkButtonAction ( db, ke-> key ( ), e-> type ( ) == QEvent::KeyPress, ke-> isAutoRepeat ( ));
 		}
 	}
 	return QPEApplication::eventFilter ( o, e );
 }
 
 #ifdef Q_WS_QWS
 
 bool DesktopApplication::qwsEventFilter( QWSEvent *e )
 {
 	qpedesktop->checkMemory();
 
 	if ( e->type == QWSEvent::Key ) {
 		QWSKeyEvent * ke = (QWSKeyEvent *) e;
 		ushort keycode = ke-> simpleData. keycode;
 
 		if ( !loggedin && keycode != Key_F34 )
 			return true;
 			
 		bool press = ke-> simpleData. is_press;
 		bool autoRepeat = ke-> simpleData. is_auto_repeat;
 
 		if ( !keyboardGrabbed ( )) {
 			// app that registers key/message to be sent back to the app, when it doesn't have focus,
 			// when user presses key, unless keyboard has been requested from app.
 			// will not send multiple repeats if user holds key
 			// i.e. one shot
 		 
 			if ( keycode != 0 && press && !autoRepeat ) {
 				for ( KeyRegisterList::Iterator it = keyRegisterList.begin(); it != keyRegisterList.end(); ++it ) {
 					if (( *it ). getKeyCode ( ) == keycode ) {
 						QCopEnvelope (( *it ). getChannel ( ), ( *it ). getMessage ( ));
 						return true;
 					}
 				}
 			}
 		}
 
 		if ( keycode == HardKey_Suspend ) {
 			if ( press )
 				emit power ( );
 			return true;
 		}
 		else if ( keycode == HardKey_Backlight ) {
 			if ( press )
 				emit backlight ( );
 			return true;
 		}
 		else if ( keycode == Key_F32 ) {
diff --git a/core/launcher/desktop.h b/core/launcher/desktop.h
index db0173e..4024c38 100644
--- a/core/launcher/desktop.h
+++ b/core/launcher/desktop.h
@@ -38,97 +38,97 @@ class QCopBridge;
 class TransferServer;
 class DesktopPowerAlerter;
 class PackageSlave;
 class OpieScreenSaver;
 
 class DesktopApplication : public QPEApplication
 {
 	Q_OBJECT
 public:
 	DesktopApplication( int& argc, char **argv, Type t );
 	~DesktopApplication();
 
 	static void switchLCD ( bool on ); // only for togglePower in Desktop
 
 	static void soundAlarm(); // only because QCop soundAlarm() is defined in QPE/TaskBar
 
 signals:
 	void menu();
 	void home();
 	void launch();
 	void backlight();
 	void power();
 	void symbol();
 	void numLockStateToggle();
 	void capsLockStateToggle();
 	void prepareForRestart();
 
 protected:
 #ifdef Q_WS_QWS
 
 	bool qwsEventFilter( QWSEvent * );
 #endif
 
 	void shutdown();
 	void restart();
 
 public slots:
 	virtual void systemMessage ( const QCString &msg, const QByteArray &data );
 	virtual void launcherMessage ( const QCString &msg, const QByteArray &data );
 	void rereadVolumes();
 
 protected slots:
 	void shutdown ( ShutdownImpl::Type );
 	void apmTimeout ( );
 	void sendHeldAction ( );
 
 protected:
 	virtual bool eventFilter ( QObject *o, QEvent *e );
-	void checkButtonAction ( const Opie::ODeviceButton *db, int keycode, bool press, bool autoRepeat );
+	bool checkButtonAction ( const Opie::ODeviceButton *db, int keycode, bool press, bool autoRepeat );
 	
 private:
 	static DesktopApplication *me ( );
 	
 private:
 	void reloadPowerWarnSettings();
 	DesktopPowerAlerter *pa;
 	PowerStatus *m_ps, *m_ps_last;
 	QTimer *cardSendTimer;
 	QCopChannel *channel;
 	OpieScreenSaver *m_screensaver;
 	QTimer * m_apm_timer;
 	int m_powerVeryLow;
 	int m_powerCritical;
 	int m_currentPowerLevel;
 
 	const Opie::ODeviceButton *m_last_button;
 	QTimer *m_button_timer;	
 
 	bool m_keyclick_sound  : 1;
 	bool m_screentap_sound : 1;
 	bool m_alarm_sound     : 1;
 };
 
 
 class Desktop : public QWidget
 {
 	Q_OBJECT
 public:
 	Desktop();
 	~Desktop();
 
 	static bool screenLocked();
 
 	void show();
 	void checkMemory();
 
 public slots:
 	void execAutoStart();
 	void togglePower();
 	void toggleLight();
 	void toggleNumLockState();
 	void toggleCapsLockState();
 	void toggleSymbolInput();
 	void terminateServers();
 
 protected:
 	void executeOrModify( const QString& appLnkFile );
diff --git a/core/settings/button/buttonsettings.cpp b/core/settings/button/buttonsettings.cpp
index eabb779..942d5e4 100644
--- a/core/settings/button/buttonsettings.cpp
+++ b/core/settings/button/buttonsettings.cpp
@@ -163,95 +163,94 @@ void ButtonSettings::updateLabels ( )
 		(*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 )
 {
-	qDebug ( "remap %s for %s", hold ? "hold" : "press", bi-> m_button-> userText ( ). latin1 ( )); 	
 	
 	if ( m_lock )
 		return;
 	m_lock = true;
 	
 	RemapDlg *d = new RemapDlg ( bi-> m_button, hold, this );
 
 	d-> showMaximized ( );	
 	if ( d-> exec ( ) == QDialog::Accepted ) {
-		qDebug ( " -> %s %s", d-> message ( ). channel ( ). data ( ), d-> message ( ). message ( ). data ( ));
+
 	
 		if ( hold ) {
 			bi-> m_hmsg = d-> message ( );
 			bi-> m_hdirty = true;
 		}
 		else {
 			bi-> m_pmsg = d-> message ( );
 			bi-> m_pdirty = true;
 		}
 	
 		updateLabels ( );
 	}
 		
 	delete d;
 	
 	m_lock = false;
 }
 
 void ButtonSettings::accept ( )
 {
 	for ( QListIterator <buttoninfo> it ( m_infos ); *it; ++it ) {
 		buttoninfo *bi = *it;
 		
 		if ( bi-> m_pdirty )
 			ODevice::inst ( )-> remapPressedAction ( bi-> m_index, bi-> m_pmsg );
 		if ( bi-> m_hdirty )
 			ODevice::inst ( )-> remapHeldAction ( bi-> m_index, bi-> m_hmsg );
 	}
 	QDialog::accept ( );
 }
 
 void ButtonSettings::done ( int r )
 {
 	QDialog::done ( r );
 	close ( );
 }
diff --git a/core/settings/button/buttonutils.cpp b/core/settings/button/buttonutils.cpp
index 91d2af3..27a2f38 100644
--- a/core/settings/button/buttonutils.cpp
+++ b/core/settings/button/buttonutils.cpp
@@ -20,97 +20,98 @@ struct predef_qcop {
 static const predef_qcop predef [] = {
 
 	{ QT_TRANSLATE_NOOP( "ButtonSettings", "Beam VCard" ),       "beam",                  "QPE/Application/addressbook", "beamBusinessCard()" },
 	{ QT_TRANSLATE_NOOP( "ButtonSettings", "Send eMail" ),       "buttonsettings/mail",   "QPE/Application/mail",        "newMail()"          },
         
 
 	{ QT_TRANSLATE_NOOP( "ButtonSettings", "Toggle Menu" ),      "buttonsettings/menu",   "QPE/TaskBar",  "toggleMenu()"      },
 	{ QT_TRANSLATE_NOOP( "ButtonSettings", "Toggle O-Menu" ),    "buttonsettings/omenu",  "QPE/TaskBar",  "toggleStartMenu()" },
 	{ QT_TRANSLATE_NOOP( "ButtonSettings", "Show Desktop" ),     "home",                  "QPE/Launcher", "home()"            },
 	{ QT_TRANSLATE_NOOP( "ButtonSettings", "Toggle Recording" ), "buttonsettings/record", "QPE/VMemo",    "toggleRecord()"    },
        
     { 0, 0, 0, 0 }                                                          
 };
 
 
 
 
 ButtonUtils *ButtonUtils::ButtonUtils::inst ( )
 {
 	static ButtonUtils *p = 0;
 	
 	if ( !p ) {
 		p = new ButtonUtils ( );
 		::atexit ( cleanup );
 	}
 	return p;
 }
 
 void ButtonUtils::cleanup ( )
 {
 	delete inst ( );
 }
 
 ButtonUtils::ButtonUtils ( )
 {
 	m_apps = new AppLnkSet( MimeType::appsFolderName ( ));
 }
 
 ButtonUtils::~ButtonUtils ( )
 {
 	delete m_apps;
 }
 
 qCopInfo ButtonUtils::messageToInfo ( const OQCopMessage &c )
 {
 	QCString ch = c. channel ( );
 	QCString f  = c. message ( ); 
 
-	if ( ch. isNull ( ))
+	
+	if ( ch == "ignore" )
 		return qCopInfo ( qApp-> translate ( "ButtonSettings", "<nobr>Ignored</nobr>" ));
 	
 	for ( const predef_qcop *p = predef; p-> m_text; p++ ) {
 		if (( ch == p-> m_channel ) && ( f == p-> m_function ))
 			return qCopInfo ( qApp-> translate ( "ButtonSettings", p-> m_text ), Resource::loadPixmap ( p-> m_pixmap ));
 	}	
 	
 	if ( ch. left ( 16 ) == "QPE/Application/" ) {
 		QString app = ch. mid ( 16 );
 		const AppLnk *applnk = m_apps-> findExec ( app );
 		if ( applnk )
 			app = applnk-> name ( );
 			
 		if (( f == "raise()" ) || ( f == "nextView()" ))
 			return qCopInfo ( qApp-> translate ( "ButtonSettings", "<nobr>Show <b>%1</b></nobr>" ). arg ( app ), applnk ? applnk-> pixmap ( ) : QPixmap ( ));
 		else
 			return qCopInfo ( qApp-> translate ( "ButtonSettings", "<nobr>Call <b>%1</b>: <i>%2</i></nobr>" ). arg ( app ). arg ( f ), applnk ? applnk-> pixmap ( ) : QPixmap ( ));
 	}
 	else {
 		return qCopInfo ( qApp-> translate ( "ButtonSettings", "<nobr>Call <b>%1</b> <i>%2</i></nobr>" ). arg (( ch. left ( 4 ) == "QPE/" ) ? ch. mid ( 4 ) : ch ). arg ( f ));
 	}
 }
 
 
 void ButtonUtils::insertActions ( QListViewItem *here )
 {
 	for ( const predef_qcop *p = predef; p-> m_text; p++ ) {
 		QListViewItem *item = new QListViewItem ( here, qApp-> translate ( "ButtonSettings", p-> m_text ), p-> m_channel, p-> m_function );
 		item-> setPixmap ( 0, Resource::loadPixmap ( p-> m_pixmap ));
 	}		
 }
 
 
 void ButtonUtils::insertAppLnks ( QListViewItem *here )
 {
 	QStringList types = m_apps-> types ( );   
 	QListViewItem *typeitem [types. count ( )];
    
    	int i = 0;
 	for ( QStringList::Iterator it = types. begin ( ); it != types. end ( ); ++it ) {
 		QListViewItem *item = new QListViewItem ( here, m_apps-> typeName ( *it ));
 		item-> setPixmap ( 0, m_apps-> typePixmap ( *it ));
 	
 		typeitem [i++] = item;	
 	}	
 	
 	for ( QListIterator <AppLnk> appit ( m_apps-> children ( )); *appit; ++appit ) {
 		AppLnk *l = *appit;
diff --git a/core/settings/button/remapdlg.cpp b/core/settings/button/remapdlg.cpp
index a251bd4..b6ee60b 100644
--- a/core/settings/button/remapdlg.cpp
+++ b/core/settings/button/remapdlg.cpp
@@ -14,119 +14,137 @@ public:
 		: QListViewItem ( lv, str, s1, s2 )
 	{
 		m_key = QString ( QChar ( 'a' + pos ));
 		m_def = false;
 	}
 	
 	void setDefault ( bool b )
 	{
 		m_def = b;
 	}
 	
 	virtual QString key ( int /*column*/, bool /*ascending*/ ) const
 	{
 		return m_key;
 	}
 	
 	virtual void paintCell ( QPainter * p, const QColorGroup & cg, int column, int width, int align ) 
 	{
 		if ( m_def ) {
 			QFont f ( listView ( )-> font ( ));			
 			f. setBold ( true );		
 			p-> setFont ( f );
 		}
 		QListViewItem::paintCell ( p, cg, column, width, align );	
 	}
 	
 private:
 	QString m_key;
 	bool m_def;
 };
 
 
 RemapDlg::RemapDlg ( const Opie::ODeviceButton *b, bool hold, QWidget *parent, const char *name )
 	: RemapDlgBase ( parent, name, true, WStyle_ContextHelp )
 {
 	setCaption ( tr( "%1 %2", "(hold|press) buttoname" ). arg( hold ? tr( "Held" ) : tr( "Pressed" )). arg ( b-> userText ( )));
 
 	m_current = 0;
 	
 	static const char * const def_channels [] = { "QPE/Application/", "QPE/Launcher", "QPE/System", "QPE/TaskBar", "QPE/", 0 };
 	w_channel-> insertStrList ((const char **) def_channels );
 	
 	m_msg = hold ? b-> heldAction ( ) : b-> pressedAction ( );
 	m_msg_preset = hold ? b-> factoryPresetHeldAction ( ) : b-> factoryPresetPressedAction ( );
 	
 	m_map_none   = new NoSortItem ( w_list, 0, tr( "No mapping" ));
 	m_map_preset = new NoSortItem ( w_list, 1, tr( "Default" ), m_msg_preset. channel ( ), m_msg_preset. message ( ));
 	((NoSortItem *) m_map_preset )-> setDefault ( true );
+	
+	if (m_msg. channel ( ) == "ignore")
+	{
+		m_map_custom = new NoSortItem ( w_list, 2, tr( "Custom" ), m_msg_preset. channel ( ), m_msg_preset. message ( ));
+		
+		m_current = m_map_none;
+	}
+	else
+	{
 	m_map_custom = new NoSortItem ( w_list, 2, tr( "Custom" ), m_msg. channel ( ), m_msg. message ( ));
+		m_current = m_map_custom;
+	}
 	
 	QListViewItem *it = new NoSortItem ( w_list, 3, tr( "Actions" ));	
 	ButtonUtils::inst ( )-> insertActions ( it );
 	it-> setOpen ( true );
 	
 	m_map_show = new NoSortItem ( w_list, 4, tr( "Show" ));	
 	
-	m_current = m_map_custom;
 	w_list-> setCurrentItem ( m_current );
 	
 	QTimer::singleShot ( 0, this, SLOT( delayedInit ( )));
 }
 
 RemapDlg::~RemapDlg ( )
 {
 }
 
 void RemapDlg::delayedInit ( )
 {
 	bool b = w_list-> viewport ( )-> isUpdatesEnabled ( );
 	w_list-> viewport ( )-> setUpdatesEnabled ( false );
 	
 	ButtonUtils::inst ( )-> insertAppLnks ( m_map_show );
 	
 	w_list-> viewport ( )-> setUpdatesEnabled ( b );
 	
 	m_map_show-> repaint ( );
 }
 
 void RemapDlg::itemChanged ( QListViewItem *it )
 {
 	bool enabled = false;
 	OQCopMessage m;
 	
 	m_current = it;
 
 	if ( it == m_map_none )
-		m_msg = m = OQCopMessage ( 0, 0 );
+	{
+		m_msg = m = OQCopMessage ( "ignore", 0 );
+		qDebug ("***ignoring");
+	}
 	else if ( it == m_map_preset )
+	{
 		m_msg = m = m_msg_preset;
-	else if ( it && !it-> childCount ( )) {
+		qDebug ("***Preset");
+	}
+	else if ( it && !it-> childCount ( )) 
+	{
+		qDebug ("***Custom: %s %s ",it-> text ( 1 ). latin1 ( ), it-> text ( 2 ). latin1 ( ));
 		enabled = ( it == m_map_custom );
 		m_msg = m = OQCopMessage ( it-> text ( 1 ). latin1 ( ), it-> text ( 2 ). latin1 ( ));
 	}
 	
 	w_channel-> setEnabled ( enabled );
 	w_message-> setEnabled ( enabled );
 	
 	w_channel-> setEditText ( m. channel ( ));
 	w_message-> setEditText ( m. message ( ));
 }
 
 void RemapDlg::textChanged ( const QString &str )
 {
 	if ( !m_current )
 		return;
 
 	QComboBox *which = (QComboBox *) sender ( );
 
 	if ( which == w_channel )
 		m_current-> setText ( 1, str );
 	else if ( which == w_message )
 		m_current-> setText ( 2, str );
 }
 
 OQCopMessage RemapDlg::message ( )
 {
 	return m_msg;
 }