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 /noncore/net/wellenreiter/gui/mainwindow.cpp | |
parent | b86723182311fa621451c2641acf62b3b89dceeb (diff) | |
download | opie-1be8e6534619e409f51af90695dc00373d5a1e59.zip opie-1be8e6534619e409f51af90695dc00373d5a1e59.tar.gz opie-1be8e6534619e409f51af90695dc00373d5a1e59.tar.bz2 |
Resource -> OResource
Diffstat (limited to 'noncore/net/wellenreiter/gui/mainwindow.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | noncore/net/wellenreiter/gui/mainwindow.cpp | 17 |
1 files changed, 11 insertions, 6 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 | |||
@@ -14,25 +14,25 @@ | |||
14 | **********************************************************************/ | 14 | **********************************************************************/ |
15 | 15 | ||
16 | #include "configwindow.h" | 16 | #include "configwindow.h" |
17 | #include "gps.h" | 17 | #include "gps.h" |
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 | ||
35 | /* QT */ | 35 | /* QT */ |
36 | #include <qcombobox.h> | 36 | #include <qcombobox.h> |
37 | #include <qdatastream.h> | 37 | #include <qdatastream.h> |
38 | #include <qfile.h> | 38 | #include <qfile.h> |
@@ -59,63 +59,68 @@ using namespace Opie::Net; | |||
59 | using namespace Opie::Ui; | 59 | using namespace Opie::Ui; |
60 | 60 | ||
61 | WellenreiterMainWindow::WellenreiterMainWindow( QWidget * parent, const char * name, WFlags f ) | 61 | WellenreiterMainWindow::WellenreiterMainWindow( QWidget * parent, const char * name, WFlags f ) |
62 | :QMainWindow( parent, name, f ) | 62 | :QMainWindow( parent, name, f ) |
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 | ||
118 | QMenuBar* mb = menuBar(); | 123 | QMenuBar* mb = menuBar(); |
119 | 124 | ||
120 | QPopupMenu* fileSave = new QPopupMenu( mb ); | 125 | QPopupMenu* fileSave = new QPopupMenu( mb ); |
121 | fileSave->insertItem( tr( "&Session..." ), this, SLOT( fileSaveSession() ) ); | 126 | fileSave->insertItem( tr( "&Session..." ), this, SLOT( fileSaveSession() ) ); |