summaryrefslogtreecommitdiff
authormickeyl <mickeyl>2002-12-14 18:30:49 (UTC)
committer mickeyl <mickeyl>2002-12-14 18:30:49 (UTC)
commit57918323f3b2e1377d9cf97ed6466e31b260d24a (patch) (side-by-side diff)
treede2cc333e1239464d3af1f23fbe5a6006bcc8e85
parentade8c5fddf3f125ee276c4c19d1646a9ef4cab08 (diff)
downloadopie-57918323f3b2e1377d9cf97ed6466e31b260d24a.zip
opie-57918323f3b2e1377d9cf97ed6466e31b260d24a.tar.gz
opie-57918323f3b2e1377d9cf97ed6466e31b260d24a.tar.bz2
- support compilation for Qt/X11
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/net/wellenreiter/gui/gui-x11.pro11
-rw-r--r--noncore/net/wellenreiter/gui/main.cpp1
-rw-r--r--noncore/net/wellenreiter/gui/resource.cpp35
-rw-r--r--noncore/net/wellenreiter/gui/resource.h26
-rw-r--r--noncore/net/wellenreiter/gui/scanlistitem.cpp7
-rw-r--r--noncore/net/wellenreiter/gui/wellenreiterbase.cpp40
-rw-r--r--noncore/net/wellenreiter/gui/wellenreiterbase.h11
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
@@ -35,8 +35,9 @@ int main( int argc, char **argv )
#ifdef QWS
a.showMainWidget(&e);
#else
a.setMainWidget(&e);
+ e.show();
#endif
return a.exec();
}
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
@@ -13,12 +13,17 @@
**
**********************************************************************/
#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;
const int col_sig = 1;
const int col_ap = 2;
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
@@ -19,9 +19,8 @@
#include <qlabel.h>
#include <qlistview.h>
#include <qmultilineedit.h>
#include <qpushbutton.h>
-#include <opie/otabwidget.h>
#include <qlayout.h>
#include <qvariant.h>
#include <qtooltip.h>
#include <qwhatsthis.h>
@@ -31,9 +30,15 @@
#include "logwindow.h"
#include "hexwindow.h"
#include "configwindow.h"
+#ifdef QWS
#include <qpe/resource.h>
+#include <opie/otabwidget.h>
+#else
+#include "resource.h"
+#include <qtabwidget.h>
+#endif
/*
* Constructs a WellenreiterBase which is a child of 'parent', with the
@@ -48,11 +53,13 @@ WellenreiterBase::WellenreiterBase( QWidget* parent, const char* name, WFlags f
setCaption( tr( "Wellenreiter" ) );
WellenreiterBaseLayout = new QVBoxLayout( this );
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 );
apLayout->setSpacing( 2 );
apLayout->setMargin( 2 );
@@ -76,24 +83,22 @@ WellenreiterBase::WellenreiterBase( QWidget* parent, const char* name, WFlags f
netview->setFrameShape( QListView::StyledPanel );
netview->setFrameShadow( QListView::Sunken );
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 --------------
about = new QWidget( TabWidget, "about" );
@@ -128,17 +133,32 @@ WellenreiterBase::WellenreiterBase( QWidget* parent, const char* name, WFlags f
"</p>" ) );
TextLabel1_4_2->setAlignment( int( QLabel::AlignCenter ) );
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
@@ -24,22 +24,31 @@ class QGridLayout;
class QLabel;
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
{
Q_OBJECT
public:
WellenreiterBase( QWidget* parent = 0, const char* name = 0, WFlags fl = 0 );
~WellenreiterBase();
+#ifdef QWS
OTabWidget* TabWidget;
+#else
+ QTabWidget* TabWidget;
+#endif
QWidget* ap;
QListView* netview;
MLogWindow* logwindow;
MHexWindow* hexwindow;