author | eilers <eilers> | 2004-07-18 14:37:20 (UTC) |
---|---|---|
committer | eilers <eilers> | 2004-07-18 14:37:20 (UTC) |
commit | 30775961a5c33d4721395eb07d11c4fcc142ce96 (patch) (side-by-side diff) | |
tree | 99858db337e64689f31b0099c48a26a41e1fc136 /noncore/tools/pimconverter | |
parent | f37561246bc7d8bf4cf791ce156afdf098552dca (diff) | |
download | opie-30775961a5c33d4721395eb07d11c4fcc142ce96.zip opie-30775961a5c33d4721395eb07d11c4fcc142ce96.tar.gz opie-30775961a5c33d4721395eb07d11c4fcc142ce96.tar.bz2 |
Fixed bugreport #1370 and
added check, whether source and destdatabase is the same..
-rw-r--r-- | noncore/tools/pimconverter/converter.cpp | 34 | ||||
-rwxr-xr-x | noncore/tools/pimconverter/converter.h | 3 |
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 @@ -13,17 +13,19 @@ #include <qdatetime.h> #include <qprogressbar.h> #include <qcombobox.h> #include <qcheckbox.h> +#include <qmessagebox.h> using namespace Opie; using namespace Pim; Converter::Converter(): m_selectedDatabase( ADDRESSBOOK ), m_selectedSourceFormat( XML ), - m_selectedDestFormat( SQL ) + m_selectedDestFormat( SQL ), + m_criticalState( false ) { m_dataBaseSelector -> setCurrentItem( m_selectedDatabase ); m_sourceFormatSelector -> setCurrentItem( m_selectedSourceFormat ); m_destFormatSelector -> setCurrentItem( m_selectedDestFormat ); @@ -50,8 +52,19 @@ void Converter::start_conversion(){ // Creating backends to the requested databases.. OPimBase* sourceDB; OPimBase* destDB; + 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 ){ case XML: odebug << "XMLSourceDB = " << m_selectedDatabase << "" << oendl; switch( m_selectedDatabase ){ @@ -141,8 +154,10 @@ void Converter::start_conversion(){ if ( !sourceDB || !destDB ) return; + m_criticalState = true; + sourceDB -> load(); destDB -> load(); QTime t; @@ -168,8 +183,10 @@ void Converter::start_conversion(){ // Now commit data.. destDB -> save(); + m_criticalState = false; + // Delete the frontends. Backends will be deleted automatically, too ! // We have to cast them back to delete them properly ! switch( m_selectedDatabase ){ case ADDRESSBOOK: @@ -192,8 +209,23 @@ void Converter::start_conversion(){ owarn << "Conversion is finished and needed " << t.elapsed() << " ms !" << oendl; } +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 ) { QPEApplication a( argc, 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 @@ -13,8 +13,10 @@ public: void start_conversion(); void selectedDatabase( int num ); void selectedDestFormat( int num ); void selectedSourceFormat( int num ); + + void closeEvent( QCloseEvent *e ); private: // Caution: // The order and value of the following enums must be regarding @@ -32,8 +34,9 @@ private: int m_selectedDatabase; int m_selectedSourceFormat; int m_selectedDestFormat; + bool m_criticalState; }; |