summaryrefslogtreecommitdiff
authoreilers <eilers>2004-07-18 14:37:20 (UTC)
committer eilers <eilers>2004-07-18 14:37:20 (UTC)
commit30775961a5c33d4721395eb07d11c4fcc142ce96 (patch) (side-by-side diff)
tree99858db337e64689f31b0099c48a26a41e1fc136
parentf37561246bc7d8bf4cf791ce156afdf098552dca (diff)
downloadopie-30775961a5c33d4721395eb07d11c4fcc142ce96.zip
opie-30775961a5c33d4721395eb07d11c4fcc142ce96.tar.gz
opie-30775961a5c33d4721395eb07d11c4fcc142ce96.tar.bz2
Fixed bugreport #1370 and
added check, whether source and destdatabase is the same..
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--noncore/tools/pimconverter/converter.cpp34
-rwxr-xr-xnoncore/tools/pimconverter/converter.h3
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
@@ -11,21 +11,23 @@
/* QT */
#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 );
m_eraseDB -> setChecked( true ); // Default erase on copy
}
@@ -48,12 +50,23 @@ void Converter::selectedSourceFormat( int num )
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 ){
case ADDRESSBOOK:{
sourceDB = OPimAccessFactory<OPimContactAccess>::create( OPimGlobal::CONTACTLIST, OPimGlobal::XML, "converter" );
@@ -139,12 +152,14 @@ void Converter::start_conversion(){
return;
}
if ( !sourceDB || !destDB )
return;
+ m_criticalState = true;
+
sourceDB -> load();
destDB -> load();
QTime t;
t.start();
@@ -166,12 +181,14 @@ void Converter::start_conversion(){
m_progressBar->setProgress( ++count );
}
// 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:
delete static_cast<OPimContactAccess*> (sourceDB);
delete static_cast<OPimContactAccess*> (destDB);
@@ -190,12 +207,27 @@ 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 );
Converter dlg;
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
@@ -12,12 +12,14 @@ public:
// Slots defined in the ui-description file
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
// the predefinition in the UI-File !!
enum DataBases{
ADDRESSBOOK = 0,
@@ -30,11 +32,12 @@ private:
SQL = 1,
};
int m_selectedDatabase;
int m_selectedSourceFormat;
int m_selectedDestFormat;
+ bool m_criticalState;
};
#endif