Fixed bugreport #1370 and

added check, whether source and destdatabase is the same..

2 files changed, 36 insertions, 1 deletions

diff --git a/noncore/tools/pimconverter/converter.cpp b/noncore/tools/pimconverter/converter.cpp
index 7d34b24..ded59b6 100644
--- a/noncore/tools/pimconverter/converter.cpp
+++ b/noncore/tools/pimconverter/converter.cpp
@@ -16,2 +16,3 @@
 #include <qcheckbox.h>
+#include <qmessagebox.h>
 
@@ -24,3 +25,4 @@ Converter::Converter():
     m_selectedSourceFormat( XML ),
-    m_selectedDestFormat( SQL )
+    m_selectedDestFormat( SQL ),
+    m_criticalState( false )
 {
@@ -53,2 +55,13 @@ void Converter::start_conversion(){
 
+    odebug << "SourceFormat: " <<  m_selectedSourceFormat << oendl;
+    odebug << "DestFormat: " << m_selectedDestFormat << oendl;
+    if ( m_selectedSourceFormat == m_selectedDestFormat ){
+	    
+	    QMessageBox::warning( this, "PimConverter",
+				  tr( "It is not a good idea to use\n" )
+				  +tr( "the same source and destformat !" ),
+				  tr( "Ok" ) ); 
+	    return;
+    }
+
     switch( m_selectedSourceFormat ){
@@ -144,2 +157,4 @@ void Converter::start_conversion(){
 
+    m_criticalState = true;
+
     sourceDB -> load();
@@ -171,2 +186,4 @@ void Converter::start_conversion(){
 
+    m_criticalState = false;
+
     // Delete the frontends. Backends will be deleted automatically, too !
@@ -195,2 +212,17 @@ void Converter::start_conversion(){
 
+void Converter::closeEvent( QCloseEvent *e )
+{
+	
+	/* Due to the fact that we don't have multitasking here, this
+	 * critical handling don't make sense, but the future..
+	 */
+	if ( m_criticalState ){
+		e->ignore();
+		return;
+	}
+	e->accept();
+}
+
+
+
 int main( int argc, char** argv ) {
diff --git a/noncore/tools/pimconverter/converter.h b/noncore/tools/pimconverter/converter.h
index 27d7fb2..a78c6bc 100755
--- a/noncore/tools/pimconverter/converter.h
+++ b/noncore/tools/pimconverter/converter.h
@@ -17,2 +17,4 @@ public:
 	
+	void closeEvent( QCloseEvent *e );
+	
 private:
@@ -35,2 +37,3 @@ private:
 	int m_selectedDestFormat;
+	bool m_criticalState;