summaryrefslogtreecommitdiff
authorzecke <zecke>2004-10-12 12:19:49 (UTC)
committer zecke <zecke>2004-10-12 12:19:49 (UTC)
commit363cc582d2a6c9b6fa1409bccaef861ea1bcce15 (patch) (side-by-side diff)
treea6ae8bf1c0670acee7e9ddc839045e2f078ea6b3
parent04f5d8a14e4f09196242e1ed777b521ed8e72916 (diff)
downloadopie-363cc582d2a6c9b6fa1409bccaef861ea1bcce15.zip
opie-363cc582d2a6c9b6fa1409bccaef861ea1bcce15.tar.gz
opie-363cc582d2a6c9b6fa1409bccaef861ea1bcce15.tar.bz2
-Make converter_base a QWidget
-Provide a C'tor with QWidget,const char* name, WFlags fl -Make it quicklaunchable
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/tools/pimconverter/converter.cpp29
-rwxr-xr-xnoncore/tools/pimconverter/converter.h3
-rw-r--r--noncore/tools/pimconverter/converter.pro5
-rw-r--r--noncore/tools/pimconverter/converter_base.ui2
4 files changed, 13 insertions, 26 deletions
diff --git a/noncore/tools/pimconverter/converter.cpp b/noncore/tools/pimconverter/converter.cpp
index ded59b6..e9de3c3 100644
--- a/noncore/tools/pimconverter/converter.cpp
+++ b/noncore/tools/pimconverter/converter.cpp
@@ -1,8 +1,7 @@
#include "converter.h"
/* OPIE */
-#include <qpe/qpeapplication.h>
-
+#include <opie2/oapplicationfactory.h>
#include <opie2/odebug.h>
#include <opie2/opimglobal.h>
// Include SQL related header files
@@ -17,10 +16,13 @@
#include <qmessagebox.h>
+OPIE_EXPORT_APP( Opie::Core::OApplicationFactory<Converter> )
+
using namespace Opie;
using namespace Pim;
-Converter::Converter():
+Converter::Converter(QWidget *p, const char* n, WFlags fl):
+ converter_base( p, n, fl ),
m_selectedDatabase( ADDRESSBOOK ),
m_selectedSourceFormat( XML ),
m_selectedDestFormat( SQL ),
@@ -56,11 +58,11 @@ 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" ) );
+ tr( "Ok" ) );
return;
}
@@ -212,7 +214,7 @@ 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..
*/
@@ -222,18 +224,3 @@ void Converter::closeEvent( QCloseEvent *e )
}
e->accept();
}
-
-
-
-int main( int argc, char** argv ) {
-
- QPEApplication a( argc, argv );
-
- Converter dlg;
-
- a.showMainWidget( &dlg );
- // dlg. showMaximized ( );
-
- return a.exec();
-
-}
diff --git a/noncore/tools/pimconverter/converter.h b/noncore/tools/pimconverter/converter.h
index a78c6bc..344562a 100755
--- a/noncore/tools/pimconverter/converter.h
+++ b/noncore/tools/pimconverter/converter.h
@@ -7,7 +7,8 @@
class Converter: public converter_base {
public:
- Converter();
+ Converter(QWidget *parent, const char* name, WFlags fl);
+ static QString appName() { return QString::fromLatin1("opimconverter");}
// Slots defined in the ui-description file
void start_conversion();
diff --git a/noncore/tools/pimconverter/converter.pro b/noncore/tools/pimconverter/converter.pro
index 0504a55..4677ee6 100644
--- a/noncore/tools/pimconverter/converter.pro
+++ b/noncore/tools/pimconverter/converter.pro
@@ -1,11 +1,10 @@
-CONFIG = qt warn_on debug
-# CONFIG = qt warn_on release quick-app
+CONFIG = qt quick-app
HEADERS = converter.h
SOURCES = converter.cpp
INTERFACES = converter_base.ui
INCLUDEPATH += $(OPIEDIR)/include
DEPENDPATH += $(OPIEDIR)/include
LIBS += -lqpe -lopiecore2 -lopiepim2 -lopiedb2
-TARGET = $(OPIEDIR)/bin/opimconverter
+TARGET = opimconverter
include ( $(OPIEDIR)/include.pro )
diff --git a/noncore/tools/pimconverter/converter_base.ui b/noncore/tools/pimconverter/converter_base.ui
index c7a2fb5..a5b22c9 100644
--- a/noncore/tools/pimconverter/converter_base.ui
+++ b/noncore/tools/pimconverter/converter_base.ui
@@ -1,7 +1,7 @@
<!DOCTYPE UI><UI>
<class>converter_base</class>
<widget>
- <class>QDialog</class>
+ <class>QWidget</class>
<property stdset="1">
<name>name</name>
<cstring>converter_base</cstring>