author | drw <drw> | 2005-06-15 19:17:11 (UTC) |
---|---|---|
committer | drw <drw> | 2005-06-15 19:17:11 (UTC) |
commit | 1be8e6534619e409f51af90695dc00373d5a1e59 (patch) (unidiff) | |
tree | 534f98ceccfa378667620632a92f81c45627c393 | |
parent | b86723182311fa621451c2641acf62b3b89dceeb (diff) | |
download | opie-1be8e6534619e409f51af90695dc00373d5a1e59.zip opie-1be8e6534619e409f51af90695dc00373d5a1e59.tar.gz opie-1be8e6534619e409f51af90695dc00373d5a1e59.tar.bz2 |
Resource -> OResource
-rw-r--r-- | noncore/net/wellenreiter/gui/mainwindow.cpp | 17 | ||||
-rw-r--r-- | noncore/net/wellenreiter/gui/scanlist.cpp | 12 | ||||
-rw-r--r-- | noncore/net/wellenreiter/gui/wellenreiterbase.cpp | 12 |
3 files changed, 23 insertions, 18 deletions
diff --git a/noncore/net/wellenreiter/gui/mainwindow.cpp b/noncore/net/wellenreiter/gui/mainwindow.cpp index 3e18531..ccb3ec0 100644 --- a/noncore/net/wellenreiter/gui/mainwindow.cpp +++ b/noncore/net/wellenreiter/gui/mainwindow.cpp | |||
@@ -18,17 +18,17 @@ | |||
18 | #include "logwindow.h" | 18 | #include "logwindow.h" |
19 | #include "packetview.h" | 19 | #include "packetview.h" |
20 | #include "mainwindow.h" | 20 | #include "mainwindow.h" |
21 | #include "wellenreiter.h" | 21 | #include "wellenreiter.h" |
22 | #include "scanlist.h" | 22 | #include "scanlist.h" |
23 | 23 | ||
24 | /* OPIE */ | 24 | /* OPIE */ |
25 | #ifdef QWS | 25 | #ifdef QWS |
26 | #include <qpe/resource.h> | 26 | #include <opie2/oresource.h> |
27 | #include <opie2/odebug.h> | 27 | #include <opie2/odebug.h> |
28 | #include <opie2/ofiledialog.h> | 28 | #include <opie2/ofiledialog.h> |
29 | #else | 29 | #else |
30 | #include "resource.h" | 30 | #include "resource.h" |
31 | #include <qapplication.h> | 31 | #include <qapplication.h> |
32 | #include <qfiledialog.h> | 32 | #include <qfiledialog.h> |
33 | #endif | 33 | #endif |
34 | 34 | ||
@@ -63,55 +63,60 @@ WellenreiterMainWindow::WellenreiterMainWindow( QWidget * parent, const char * n | |||
63 | { | 63 | { |
64 | cw = new WellenreiterConfigWindow( this ); | 64 | cw = new WellenreiterConfigWindow( this ); |
65 | mw = new Wellenreiter( this ); | 65 | mw = new Wellenreiter( this ); |
66 | mw->setConfigWindow( cw ); | 66 | mw->setConfigWindow( cw ); |
67 | setCentralWidget( mw ); | 67 | setCentralWidget( mw ); |
68 | 68 | ||
69 | // setup application icon | 69 | // setup application icon |
70 | 70 | ||
71 | setIcon( Resource::loadPixmap( "wellenreiter/appicon-trans" ) ); | 71 | setIcon( Opie::Core::OResource::loadPixmap( "wellenreiter/appicon-trans", Opie::Core::OResource::SmallIcon ) ); |
72 | #ifndef QWS | 72 | #ifndef QWS |
73 | setIconText( "Wellenreiter/X11" ); | 73 | setIconText( "Wellenreiter/X11" ); |
74 | #endif | 74 | #endif |
75 | 75 | ||
76 | // setup tool buttons | 76 | // setup tool buttons |
77 | bool useBigIcon = qApp->desktop()->size().width() > 330; | ||
77 | 78 | ||
78 | startButton = new QToolButton( 0 ); | 79 | startButton = new QToolButton( 0 ); |
80 | startButton->setUsesBigPixmap( useBigIcon ); | ||
79 | QWhatsThis::add( startButton, tr( "Click here to start scanning." ) ); | 81 | QWhatsThis::add( startButton, tr( "Click here to start scanning." ) ); |
80 | #ifdef QWS | 82 | #ifdef QWS |
81 | startButton->setAutoRaise( true ); | 83 | startButton->setAutoRaise( true ); |
82 | #endif | 84 | #endif |
83 | startButton->setIconSet( Resource::loadIconSet( "wellenreiter/SearchIcon" ) ); | 85 | startButton->setIconSet( Opie::Core::OResource::loadPixmap( "wellenreiter/SearchIcon", Opie::Core::OResource::SmallIcon ) ); |
84 | startButton->setEnabled( false ); | 86 | startButton->setEnabled( false ); |
85 | connect( startButton, SIGNAL( clicked() ), mw, SLOT( startClicked() ) ); | 87 | connect( startButton, SIGNAL( clicked() ), mw, SLOT( startClicked() ) ); |
86 | 88 | ||
87 | stopButton = new QToolButton( 0 ); | 89 | stopButton = new QToolButton( 0 ); |
90 | stopButton->setUsesBigPixmap( useBigIcon ); | ||
88 | QWhatsThis::add( stopButton, tr( "Click here to stop scanning." ) ); | 91 | QWhatsThis::add( stopButton, tr( "Click here to stop scanning." ) ); |
89 | #ifdef QWS | 92 | #ifdef QWS |
90 | stopButton->setAutoRaise( true ); | 93 | stopButton->setAutoRaise( true ); |
91 | #endif | 94 | #endif |
92 | stopButton->setIconSet( Resource::loadIconSet( "wellenreiter/CancelIcon" ) ); | 95 | stopButton->setIconSet( Opie::Core::OResource::loadPixmap( "wellenreiter/CancelIcon", Opie::Core::OResource::SmallIcon ) ); |
93 | stopButton->setEnabled( false ); | 96 | stopButton->setEnabled( false ); |
94 | connect( stopButton, SIGNAL( clicked() ), mw, SLOT( stopClicked() ) ); | 97 | connect( stopButton, SIGNAL( clicked() ), mw, SLOT( stopClicked() ) ); |
95 | 98 | ||
96 | QToolButton* d = new QToolButton( 0 ); | 99 | QToolButton* d = new QToolButton( 0 ); |
100 | d->setUsesBigPixmap( useBigIcon ); | ||
97 | QWhatsThis::add( d, tr( "Click here to open the configure dialog." ) ), | 101 | QWhatsThis::add( d, tr( "Click here to open the configure dialog." ) ), |
98 | #ifdef QWS | 102 | #ifdef QWS |
99 | d->setAutoRaise( true ); | 103 | d->setAutoRaise( true ); |
100 | #endif | 104 | #endif |
101 | d->setIconSet( Resource::loadIconSet( "wellenreiter/SettingsIcon" ) ); | 105 | d->setIconSet( Opie::Core::OResource::loadPixmap( "wellenreiter/SettingsIcon", Opie::Core::OResource::SmallIcon ) ); |
102 | connect( d, SIGNAL( clicked() ), this, SLOT( showConfigure() ) ); | 106 | connect( d, SIGNAL( clicked() ), this, SLOT( showConfigure() ) ); |
103 | 107 | ||
104 | uploadButton = new QToolButton( 0 ); | 108 | uploadButton = new QToolButton( 0 ); |
109 | uploadButton->setUsesBigPixmap( useBigIcon ); | ||
105 | QWhatsThis::add( uploadButton, tr( "Click here to upload a capture session." ) ); | 110 | QWhatsThis::add( uploadButton, tr( "Click here to upload a capture session." ) ); |
106 | #ifdef QWS | 111 | #ifdef QWS |
107 | uploadButton->setAutoRaise( true ); | 112 | uploadButton->setAutoRaise( true ); |
108 | #endif | 113 | #endif |
109 | uploadButton->setIconSet( Resource::loadIconSet( "up" ) ); | 114 | uploadButton->setIconSet( Opie::Core::OResource::loadPixmap( "up", Opie::Core::OResource::SmallIcon ) ); |
110 | uploadButton->setEnabled( false ); | 115 | uploadButton->setEnabled( false ); |
111 | //uploadButton->setEnabled( true ); // DEBUGGING | 116 | //uploadButton->setEnabled( true ); // DEBUGGING |
112 | connect( uploadButton, SIGNAL( clicked() ), this, SLOT( uploadSession() ) ); | 117 | connect( uploadButton, SIGNAL( clicked() ), this, SLOT( uploadSession() ) ); |
113 | 118 | ||
114 | // setup menu bar | 119 | // setup menu bar |
115 | 120 | ||
116 | int id; | 121 | int id; |
117 | 122 | ||
diff --git a/noncore/net/wellenreiter/gui/scanlist.cpp b/noncore/net/wellenreiter/gui/scanlist.cpp index 587faad..a61e808 100644 --- a/noncore/net/wellenreiter/gui/scanlist.cpp +++ b/noncore/net/wellenreiter/gui/scanlist.cpp | |||
@@ -15,18 +15,18 @@ | |||
15 | 15 | ||
16 | #include "scanlist.h" | 16 | #include "scanlist.h" |
17 | #include "configwindow.h" | 17 | #include "configwindow.h" |
18 | #include "logwindow.h" | 18 | #include "logwindow.h" |
19 | 19 | ||
20 | /* OPIE */ | 20 | /* OPIE */ |
21 | #ifdef QWS | 21 | #ifdef QWS |
22 | #include <opie2/odebug.h> | 22 | #include <opie2/odebug.h> |
23 | #include <opie2/oresource.h> | ||
23 | #include <qpe/qpeapplication.h> | 24 | #include <qpe/qpeapplication.h> |
24 | #include <qpe/resource.h> | ||
25 | #else | 25 | #else |
26 | #include "resource.h" | 26 | #include "resource.h" |
27 | #endif | 27 | #endif |
28 | 28 | ||
29 | 29 | ||
30 | /* QT */ | 30 | /* QT */ |
31 | #include <qcursor.h> | 31 | #include <qcursor.h> |
32 | #include <qdatetime.h> | 32 | #include <qdatetime.h> |
@@ -472,44 +472,44 @@ void MScanListItem::serializeFrom( QDataStream& s ) | |||
472 | OListViewItem::serializeFrom( s ); | 472 | OListViewItem::serializeFrom( s ); |
473 | 473 | ||
474 | Q_UINT8 wep; | 474 | Q_UINT8 wep; |
475 | s >> _type; | 475 | s >> _type; |
476 | s >> wep; | 476 | s >> wep; |
477 | _wep = (wep == 'y'); | 477 | _wep = (wep == 'y'); |
478 | 478 | ||
479 | QString name = QString( "wellenreiter/"+ _type ); | 479 | QString name = QString( "wellenreiter/"+ _type ); |
480 | setPixmap( col_type, Resource::loadPixmap( name ) ); | 480 | setPixmap( col_type, Opie::Core::OResource::loadPixmap( name, Opie::Core::OResource::SmallIcon ) ); |
481 | if ( _wep ) | 481 | if ( _wep ) |
482 | setPixmap( col_wep, Resource::loadPixmap( "wellenreiter/cracked" ) ); //FIXME: rename the pixmap! | 482 | setPixmap( col_wep, Opie::Core::OResource::loadPixmap( "wellenreiter/cracked", Opie::Core::OResource::SmallIcon ) ); //FIXME: rename the pixmap! |
483 | listView()->triggerUpdate(); | 483 | listView()->triggerUpdate(); |
484 | } | 484 | } |
485 | 485 | ||
486 | void MScanListItem::decorateItem( QString type, QString essid, QString macaddr, bool wep, int channel, int signal, bool probed ) | 486 | void MScanListItem::decorateItem( QString type, QString essid, QString macaddr, bool wep, int channel, int signal, bool probed ) |
487 | { | 487 | { |
488 | #ifdef DEBUG | 488 | #ifdef DEBUG |
489 | odebug << "decorating scanlist item " << type << " / " | 489 | odebug << "decorating scanlist item " << type << " / " |
490 | << essid << " / " << macaddr | 490 | << essid << " / " << macaddr |
491 | << "[" << channel << "]" << oendl; | 491 | << "[" << channel << "]" << oendl; |
492 | #endif | 492 | #endif |
493 | 493 | ||
494 | // set icon for managed or adhoc mode | 494 | // set icon for managed or adhoc mode |
495 | QString name; | 495 | QString name; |
496 | name.sprintf( "wellenreiter/"+ type ); | 496 | name.sprintf( "wellenreiter/"+ type ); |
497 | setPixmap( col_type, Resource::loadPixmap( name ) ); | 497 | setPixmap( col_type, Opie::Core::OResource::loadPixmap( name, Opie::Core::OResource::SmallIcon ) ); |
498 | 498 | ||
499 | // special case for probed networks FIXME: This is ugly at present | 499 | // special case for probed networks FIXME: This is ugly at present |
500 | if ( type == "network" && probed ) | 500 | if ( type == "network" && probed ) |
501 | { | 501 | { |
502 | setPixmap( col_type, Resource::loadPixmap( "wellenreiter/network-probed.png" ) ); | 502 | setPixmap( col_type, Opie::Core::OResource::loadPixmap( "wellenreiter/network-probed", Opie::Core::OResource::SmallIcon ) ); |
503 | } | 503 | } |
504 | 504 | ||
505 | // set icon for wep (wireless encryption protocol) | 505 | // set icon for wep (wireless encryption protocol) |
506 | if ( wep ) | 506 | if ( wep ) |
507 | setPixmap( col_wep, Resource::loadPixmap( "wellenreiter/cracked" ) ); //FIXME: rename the pixmap! | 507 | setPixmap( col_wep, Opie::Core::OResource::loadPixmap( "wellenreiter/cracked", Opie::Core::OResource::SmallIcon ) ); //FIXME: rename the pixmap! |
508 | 508 | ||
509 | // set channel and signal text | 509 | // set channel and signal text |
510 | 510 | ||
511 | if ( signal != -1 ) | 511 | if ( signal != -1 ) |
512 | setText( col_sig, QString::number( signal ) ); | 512 | setText( col_sig, QString::number( signal ) ); |
513 | if ( channel != -1 ) | 513 | if ( channel != -1 ) |
514 | setText( col_channel, QString::number( channel ) ); | 514 | setText( col_channel, QString::number( channel ) ); |
515 | 515 | ||
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 | |||
@@ -20,17 +20,17 @@ | |||
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 | /* |
@@ -38,20 +38,20 @@ using namespace Opie; | |||
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" ) ); |
@@ -100,17 +100,17 @@ WellenreiterBase::WellenreiterBase( QWidget* parent, const char* name, WFlags f | |||
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 ) ); |