[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE/kdeedu/ktouch/src
From:       Anne-Marie Mahfouf <annma () kde ! org>
Date:       2008-07-13 18:43:27
Message-ID: 1215974607.432907.4121.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 831978 by annma:

a few EBN fixes


 M  +1 -1      ktouch.cpp  
 M  +3 -6      ktouchkeyboardeditordialog.cpp  
 M  +1 -0      ktouchtextlinewidget.cpp  
 M  +1 -0      ktouchtextlinewidget.h  


--- trunk/KDE/kdeedu/ktouch/src/ktouch.cpp #831977:831978
@@ -14,7 +14,7 @@
 #include "ktouch.moc"
 
 // Qt Header
-#include <QtXml>
+ #include <QDomDocument>
 
 // KDE Header
 #include <kselectaction.h>
--- trunk/KDE/kdeedu/ktouch/src/ktouchkeyboardeditordialog.cpp #831977:831978
@@ -252,8 +252,7 @@
 		bool ok;
 		unicode = conUnicodeEdit->text().toInt(&ok,10);
 		if (!ok) {
-			// TODO : Fixme
-			QMessageBox::warning(this, i18n("KTouch keyboard editor"), i18n("This is not a \
valid unicode number. Please correct the number or enter a character.")); \
+			KMessageBox::warningContinueCancel(this, i18n("KTouch keyboard editor"), \
i18n("This is not a valid unicode number. Please correct the number or enter a \
character."));  return;
 		}
 	}
@@ -261,8 +260,7 @@
 		error = true;
 	}
 	if (error) {
-			// TODO : Fixme
-		QMessageBox::warning(this, i18n("KTouch keyboard editor"), i18n("Please enter \
either a character or a unicode number!")); \
+		KMessageBox::warningContinueCancel(this, i18n("KTouch keyboard editor"), \
i18n("Please enter either a character or a unicode number!"));  return;
 	}
 	m_keyboard->m_connectors[unicode] = KTouchKeyConnector(unicode, m_currentEditKey, \
m_currentModifierKey); @@ -374,8 +372,7 @@
 			if (selectFingerKeyButton->isChecked()) {
 				// check if the key is actually a finger key
 				if (k->m_type != KTouchKey::Finger) {
-					// FIXME
-					QMessageBox::warning(this, i18n("KTouch keyboard editor error"), i18n("The \
selected key is not a finger key.")); +					KMessageBox::warningContinueCancel(this, \
i18n("KTouch keyboard editor error"), i18n("The selected key is not a finger key.")); \
return;  }
 				else {
--- trunk/KDE/kdeedu/ktouch/src/ktouchtextlinewidget.cpp #831977:831978
@@ -1,5 +1,6 @@
 /***************************************************************************
  *   Copyright (C) 2007 by Håvard Frøiland                                 *
+ *   havard@student.unsw.edu.au                                            *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
  *   it under the terms of the GNU General Public License as published by  *
--- trunk/KDE/kdeedu/ktouch/src/ktouchtextlinewidget.h #831977:831978
@@ -1,5 +1,6 @@
 /***************************************************************************
  *   Copyright (C) 2007 by Håvard Frøiland                                 *
+ *   havard@student.unsw.edu.au                                            *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
  *   it under the terms of the GNU General Public License as published by  *


[prev in list] [next in list] [prev in thread] [next in thread]