- support compilation for Qt/X11

7 files changed, 119 insertions, 12 deletions

diff --git a/noncore/net/wellenreiter/gui/gui-x11.pro b/noncore/net/wellenreiter/gui/gui-x11.pro
new file mode 100644
index 0000000..0cddd22
--- a/dev/null
+++ b/noncore/net/wellenreiter/gui/gui-x11.pro
@@ -0,0 +1,11 @@
+DESTDIR         = .
+TEMPLATE        = app
+CONFIG          = qt warn_on debug
+#CONFIG         = qt warn_on release
+HEADERS         = wellenreiterbase.h wellenreiter.h scanlistitem.h scanlist.h logwindow.h hexwindow.h configwindow.h resource.h
+SOURCES         = main.cpp wellenreiterbase.cpp wellenreiter.cpp scanlistitem.cpp scanlist.cpp logwindow.cpp hexwindow.cpp configwindow.cpp resource.cpp
+INCLUDEPATH     += ../daemon
+DEPENDPATH      += ../daemon
+LIBS            += -lwellenreiter
+INTERFACES      = configbase.ui
+TARGET          = wellenreiter
diff --git a/noncore/net/wellenreiter/gui/main.cpp b/noncore/net/wellenreiter/gui/main.cpp
index 4b8d489..3307d49 100644
--- a/noncore/net/wellenreiter/gui/main.cpp
+++ b/noncore/net/wellenreiter/gui/main.cpp
@@ -37,4 +37,5 @@ int main( int argc, char **argv )
 #else
     a.setMainWidget(&e);
+    e.show();
 #endif
 
diff --git a/noncore/net/wellenreiter/gui/resource.cpp b/noncore/net/wellenreiter/gui/resource.cpp
new file mode 100644
index 0000000..58c6bed
--- a/dev/null
+++ b/noncore/net/wellenreiter/gui/resource.cpp
@@ -0,0 +1,35 @@
+/**********************************************************************
+** Copyright (C) 2002 Michael 'Mickey' Lauer.  All rights reserved.
+**
+** This file is part of Opie Environment.
+**
+** This file may be distributed and/or modified under the terms of the
+** GNU General Public License version 2 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.
+**
+** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
+** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+**
+**********************************************************************/
+
+#include "resource.h"
+
+#define PIXMAPPATH "/home/mickey/work/opie/pics"
+
+namespace Resource
+{
+
+QPixmap loadPixmap( const QString& pix )
+{
+    QString filename;
+    filename.sprintf( "%s/%s.png", (const char*) PIXMAPPATH, (const char*) pix );
+    QPixmap pixmap( filename );
+    if ( pixmap.isNull() )
+    {
+        qDebug( "Wellenreiter::Resource: can't find pixmap " + filename );
+    }
+    return pixmap;
+};
+
+};
diff --git a/noncore/net/wellenreiter/gui/resource.h b/noncore/net/wellenreiter/gui/resource.h
new file mode 100644
index 0000000..6a3cc99
--- a/dev/null
+++ b/noncore/net/wellenreiter/gui/resource.h
@@ -0,0 +1,26 @@
+/**********************************************************************
+** Copyright (C) 2002 Michael 'Mickey' Lauer.  All rights reserved.
+**
+** This file is part of Opie Environment.
+**
+** This file may be distributed and/or modified under the terms of the
+** GNU General Public License version 2 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.
+**
+** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
+** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+**
+**********************************************************************/
+
+#ifndef RESOURCE_H
+#define RESOURCE_H
+
+#include <qpixmap.h>
+
+namespace Resource
+{
+    QPixmap loadPixmap( const QString& );
+}
+
+#endif // RESOURCE_H
diff --git a/noncore/net/wellenreiter/gui/scanlistitem.cpp b/noncore/net/wellenreiter/gui/scanlistitem.cpp
index 398b42d..1e2a52e 100644
--- a/noncore/net/wellenreiter/gui/scanlistitem.cpp
+++ b/noncore/net/wellenreiter/gui/scanlistitem.cpp
@@ -15,8 +15,13 @@
 
 #include "scanlistitem.h"
-#include <qpe/resource.h>
 #include <assert.h>
 #include <qpixmap.h>
 
+#ifdef QWS
+#include <qpe/resource.h>
+#else
+#include "resource.h"
+#endif
+
 const int col_type = 0;
 const int col_essid = 0;
diff --git a/noncore/net/wellenreiter/gui/wellenreiterbase.cpp b/noncore/net/wellenreiter/gui/wellenreiterbase.cpp
index aa94c81..5017b08 100644
--- a/noncore/net/wellenreiter/gui/wellenreiterbase.cpp
+++ b/noncore/net/wellenreiter/gui/wellenreiterbase.cpp
@@ -21,5 +21,4 @@
 #include <qmultilineedit.h>
 #include <qpushbutton.h>
-#include <opie/otabwidget.h>
 #include <qlayout.h>
 #include <qvariant.h>
@@ -33,5 +32,11 @@
 #include "configwindow.h"
 
+#ifdef QWS
 #include <qpe/resource.h>
+#include <opie/otabwidget.h>
+#else
+#include "resource.h"
+#include <qtabwidget.h>
+#endif
 
 
@@ -50,7 +55,9 @@ WellenreiterBase::WellenreiterBase( QWidget* parent,  const char* name, WFlags f
     WellenreiterBaseLayout->setSpacing( 2 );
     WellenreiterBaseLayout->setMargin( 0 );
-
+#ifdef QWS
     TabWidget = new OTabWidget( this, "TabWidget", OTabWidget::Global );
-
+#else
+    TabWidget = new QTabWidget( this, "TabWidget" );
+#endif
     ap = new QWidget( TabWidget, "ap" );
     apLayout = new QVBoxLayout( ap ); 
@@ -78,20 +85,18 @@ WellenreiterBase::WellenreiterBase( QWidget* parent,  const char* name, WFlags f
     netview->setRootIsDecorated( TRUE );
     apLayout->addWidget( netview );
-    TabWidget->addTab( ap, "wellenreiter/networks", tr( "Networks" ) );
+    
 
     //--------- LOG TAB --------------
     
     logwindow = new MLogWindow( TabWidget, "Log" );
-    TabWidget->addTab( logwindow, "wellenreiter/log", tr( "Log" ) );
+    
 
     //--------- HEX TAB --------------
     
     hexwindow = new MHexWindow( TabWidget, "Hex" );
-    TabWidget->addTab( hexwindow, "wellenreiter/hex", tr( "Hex" ) );
 
     //--------- CONFIG TAB --------------
     
     configwindow = new WellenreiterConfigWindow( TabWidget, "Config" );
-    TabWidget->addTab( configwindow, "wellenreiter/config", tr( "Config" ) );
     
     //--------- ABOUT TAB --------------
@@ -130,13 +135,28 @@ WellenreiterBase::WellenreiterBase( QWidget* parent,  const char* name, WFlags f
 
     aboutLayout->addWidget( TextLabel1_4_2, 1, 0 );
-    TabWidget->addTab( about, "wellenreiter/about", tr( "About" ) );
-    WellenreiterBaseLayout->addWidget( TabWidget );
    
     button = new QPushButton( this, "button" );
     button->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)1, (QSizePolicy::SizeType)0, button->sizePolicy().hasHeightForWidth() ) );
     button->setText( tr( "Start Scanning" ) );
-    WellenreiterBaseLayout->addWidget( button );
 
+#ifdef QWS    
+    TabWidget->addTab( ap, "wellenreiter/networks", tr( "Networks" ) );
+    TabWidget->addTab( logwindow, "wellenreiter/log", tr( "Log" ) );
+    TabWidget->addTab( hexwindow, "wellenreiter/hex", tr( "Hex" ) );
+    TabWidget->addTab( configwindow, "wellenreiter/config", tr( "Config" ) );
+    TabWidget->addTab( about, "wellenreiter/about", tr( "About" ) );
+#else
+    TabWidget->addTab( ap, /* "wellenreiter/networks", */ tr( "Networks" ) );
+    TabWidget->addTab( logwindow, /* "wellenreiter/log", */ tr( "Log" ) );
+    TabWidget->addTab( hexwindow, /* "wellenreiter/hex", */ tr( "Hex" ) );
+    TabWidget->addTab( configwindow, /* "wellenreiter/config", */ tr( "Config" ) );
+    TabWidget->addTab( about, /* "wellenreiter/about", */ tr( "About" ) );
+#endif   
+    WellenreiterBaseLayout->addWidget( TabWidget );
+    WellenreiterBaseLayout->addWidget( button );
+   
+#ifdef QWS   
     TabWidget->setCurrentTab( tr( "Networks" ) );
+#endif
 
 }
diff --git a/noncore/net/wellenreiter/gui/wellenreiterbase.h b/noncore/net/wellenreiter/gui/wellenreiterbase.h
index 4e5ca94..fce25d1 100644
--- a/noncore/net/wellenreiter/gui/wellenreiterbase.h
+++ b/noncore/net/wellenreiter/gui/wellenreiterbase.h
@@ -26,9 +26,14 @@ class QListView;
 class QListViewItem;
 class QPushButton;
-class OTabWidget;
 class MLogWindow;
 class MHexWindow;
 class WellenreiterConfigWindow;
 
+#ifdef QWS
+class OTabWidget;
+#else
+class QTabWidget;
+#endif
+
 class WellenreiterBase : public QWidget
 { 
@@ -39,5 +44,9 @@ public:
     ~WellenreiterBase();
 
+#ifdef QWS
     OTabWidget* TabWidget;
+#else
+    QTabWidget* TabWidget;
+#endif
     QWidget* ap;
     QListView* netview;