Diffstat (limited to 'noncore/net/wellenreiter/gui/wellenreiterbase.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | noncore/net/wellenreiter/gui/wellenreiterbase.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/noncore/net/wellenreiter/gui/wellenreiterbase.cpp b/noncore/net/wellenreiter/gui/wellenreiterbase.cpp index 1d5bd1b..11eb145 100644 --- a/noncore/net/wellenreiter/gui/wellenreiterbase.cpp +++ b/noncore/net/wellenreiter/gui/wellenreiterbase.cpp | |||
@@ -16,46 +16,46 @@ | |||
16 | #include "wellenreiterbase.h" | 16 | #include "wellenreiterbase.h" |
17 | 17 | ||
18 | #include <qlabel.h> | 18 | #include <qlabel.h> |
19 | #include <qlayout.h> | 19 | #include <qlayout.h> |
20 | 20 | ||
21 | #include "logwindow.h" | 21 | #include "logwindow.h" |
22 | #include "packetview.h" | 22 | #include "packetview.h" |
23 | #include "scanlist.h" | 23 | #include "scanlist.h" |
24 | #include "statwindow.h" | 24 | #include "statwindow.h" |
25 | #include "graphwindow.h" | 25 | #include "graphwindow.h" |
26 | 26 | ||
27 | #ifdef QWS | 27 | #ifdef QWS |
28 | #include <qpe/resource.h> | 28 | #include <opie2/oresource.h> |
29 | #include <opie2/otabwidget.h> | 29 | #include <opie2/otabwidget.h> |
30 | using namespace Opie; | 30 | using namespace Opie; |
31 | #else | 31 | #else |
32 | #include "resource.h" | 32 | #include "resource.h" |
33 | #include <qtabwidget.h> | 33 | #include <qtabwidget.h> |
34 | #endif | 34 | #endif |
35 | 35 | ||
36 | /* | 36 | /* |
37 | * Constructs a WellenreiterBase which is a child of 'parent', with the | 37 | * Constructs a WellenreiterBase which is a child of 'parent', with the |
38 | * name 'name' and widget flags set to 'f' | 38 | * name 'name' and widget flags set to 'f' |
39 | */ | 39 | */ |
40 | using namespace Opie::Ui; | 40 | using namespace Opie::Ui; |
41 | using namespace Opie::Ui; | 41 | using namespace Opie::Ui; |
42 | using namespace Opie::Ui; | 42 | using namespace Opie::Ui; |
43 | WellenreiterBase::WellenreiterBase( QWidget* parent, const char* name, WFlags fl ) | 43 | WellenreiterBase::WellenreiterBase( QWidget* parent, const char* name, WFlags fl ) |
44 | : QWidget( parent, name, fl ) | 44 | : QWidget( parent, name, fl ) |
45 | { | 45 | { |
46 | //ani1 = new QPixmap( Resource::loadPixmap( "wellenreiter/networks_rot0" ) ); | 46 | //ani1 = new QPixmap( Opie::Core::OResource::loadPixmap( "wellenreiter/networks_rot0", Opie::Core::OResource::SmallIcon ) ); |
47 | //ani2 = new QPixmap( Resource::loadPixmap( "wellenreiter/networks_rot90" ) ); | 47 | //ani2 = new QPixmap( Opie::Core::OResource::loadPixmap( "wellenreiter/networks_rot90", Opie::Core::OResource::SmallIcon ) ); |
48 | //ani3 = new QPixmap( Resource::loadPixmap( "wellenreiter/networks_rot180" ) ); | 48 | //ani3 = new QPixmap( Opie::Core::OResource::loadPixmap( "wellenreiter/networks_rot180", Opie::Core::OResource::SmallIcon ) ); |
49 | //ani4 = new QPixmap( Resource::loadPixmap( "wellenreiter/networks_rot270" ) ); | 49 | //ani4 = new QPixmap( Opie::Core::OResource::loadPixmap( "wellenreiter/networks_rot270", Opie::Core::OResource::SmallIcon ) ); |
50 | 50 | ||
51 | if ( !name ) | 51 | if ( !name ) |
52 | setName( "WellenreiterBase" ); | 52 | setName( "WellenreiterBase" ); |
53 | resize( 191, 294 ); | 53 | resize( 191, 294 ); |
54 | #ifdef QWS | 54 | #ifdef QWS |
55 | setCaption( tr( "Wellenreiter/Opie" ) ); | 55 | setCaption( tr( "Wellenreiter/Opie" ) ); |
56 | #else | 56 | #else |
57 | setCaption( tr( "Wellenreiter/X11" ) ); | 57 | setCaption( tr( "Wellenreiter/X11" ) ); |
58 | #endif | 58 | #endif |
59 | WellenreiterBaseLayout = new QVBoxLayout( this ); | 59 | WellenreiterBaseLayout = new QVBoxLayout( this ); |
60 | WellenreiterBaseLayout->setSpacing( 2 ); | 60 | WellenreiterBaseLayout->setSpacing( 2 ); |
61 | WellenreiterBaseLayout->setMargin( 0 ); | 61 | WellenreiterBaseLayout->setMargin( 0 ); |
@@ -96,25 +96,25 @@ WellenreiterBase::WellenreiterBase( QWidget* parent, const char* name, WFlags f | |||
96 | aboutLayout = new QGridLayout( about ); | 96 | aboutLayout = new QGridLayout( about ); |
97 | aboutLayout->setSpacing( 6 ); | 97 | aboutLayout->setSpacing( 6 ); |
98 | aboutLayout->setMargin( 11 ); | 98 | aboutLayout->setMargin( 11 ); |
99 | 99 | ||
100 | PixmapLabel1_3_2 = new QLabel( about, "PixmapLabel1_3_2" ); | 100 | PixmapLabel1_3_2 = new QLabel( about, "PixmapLabel1_3_2" ); |
101 | PixmapLabel1_3_2->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)0, (QSizePolicy::SizeType)0, PixmapLabel1_3_2->sizePolicy().hasHeightForWidth() ) ); | 101 | PixmapLabel1_3_2->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)0, (QSizePolicy::SizeType)0, PixmapLabel1_3_2->sizePolicy().hasHeightForWidth() ) ); |
102 | PixmapLabel1_3_2->setFrameShape( QLabel::Panel ); | 102 | PixmapLabel1_3_2->setFrameShape( QLabel::Panel ); |
103 | PixmapLabel1_3_2->setFrameShadow( QLabel::Sunken ); | 103 | PixmapLabel1_3_2->setFrameShadow( QLabel::Sunken ); |
104 | PixmapLabel1_3_2->setLineWidth( 2 ); | 104 | PixmapLabel1_3_2->setLineWidth( 2 ); |
105 | PixmapLabel1_3_2->setMargin( 0 ); | 105 | PixmapLabel1_3_2->setMargin( 0 ); |
106 | PixmapLabel1_3_2->setMidLineWidth( 0 ); | 106 | PixmapLabel1_3_2->setMidLineWidth( 0 ); |
107 | 107 | ||
108 | QPixmap logo = Resource::loadPixmap( "wellenreiter/logo" ); | 108 | QPixmap logo = Opie::Core::OResource::loadPixmap( "wellenreiter/logo" ); |
109 | QPainter draw( &logo ); | 109 | QPainter draw( &logo ); |
110 | draw.setPen( Qt::black ); | 110 | draw.setPen( Qt::black ); |
111 | draw.setFont( QFont( "Fixed", 8 ) ); | 111 | draw.setFont( QFont( "Fixed", 8 ) ); |
112 | draw.drawText( 5, 10, WELLENREITER_VERSION ); | 112 | draw.drawText( 5, 10, WELLENREITER_VERSION ); |
113 | 113 | ||
114 | PixmapLabel1_3_2->setPixmap( logo ); | 114 | PixmapLabel1_3_2->setPixmap( logo ); |
115 | PixmapLabel1_3_2->setScaledContents( TRUE ); | 115 | PixmapLabel1_3_2->setScaledContents( TRUE ); |
116 | PixmapLabel1_3_2->setAlignment( int( QLabel::AlignCenter ) ); | 116 | PixmapLabel1_3_2->setAlignment( int( QLabel::AlignCenter ) ); |
117 | 117 | ||
118 | aboutLayout->addWidget( PixmapLabel1_3_2, 0, 0 ); | 118 | aboutLayout->addWidget( PixmapLabel1_3_2, 0, 0 ); |
119 | 119 | ||
120 | TextLabel1_4_2 = new QLabel( about, "TextLabel1_4_2" ); | 120 | TextLabel1_4_2 = new QLabel( about, "TextLabel1_4_2" ); |