author | mickeyl <mickeyl> | 2003-02-23 16:45:09 (UTC) |
---|---|---|
committer | mickeyl <mickeyl> | 2003-02-23 16:45:09 (UTC) |
commit | 2f897267b4d3ec5b1c7dafdc0700a8e91cbb3321 (patch) (unidiff) | |
tree | 9f32fb9e22a26188c6f1c1092c74b1bf47aa418c /noncore/net/wellenreiter/gui/mainwindow.cpp | |
parent | 3a3c703d9bdf57f50b3f47aa14c858ef1026e3d3 (diff) | |
download | opie-2f897267b4d3ec5b1c7dafdc0700a8e91cbb3321.zip opie-2f897267b4d3ec5b1c7dafdc0700a8e91cbb3321.tar.gz opie-2f897267b4d3ec5b1c7dafdc0700a8e91cbb3321.tar.bz2 |
simplification and fixes for the standalone X11 build
Diffstat (limited to 'noncore/net/wellenreiter/gui/mainwindow.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | noncore/net/wellenreiter/gui/mainwindow.cpp | 27 |
1 files changed, 24 insertions, 3 deletions
diff --git a/noncore/net/wellenreiter/gui/mainwindow.cpp b/noncore/net/wellenreiter/gui/mainwindow.cpp index b67376c..b2d3a71 100644 --- a/noncore/net/wellenreiter/gui/mainwindow.cpp +++ b/noncore/net/wellenreiter/gui/mainwindow.cpp | |||
@@ -40,17 +40,27 @@ WellenreiterMainWindow::WellenreiterMainWindow( QWidget * parent, const char * n | |||
40 | 40 | ||
41 | // setup icon sets | 41 | // setup icon sets |
42 | 42 | ||
43 | searchIconSet = new QIconSet( Resource::loadPixmap( "wellenreiter/SearchIcon" ) ); | ||
44 | infoIconSet = new QIconSet( Resource::loadPixmap( "wellenreiter/InfoIcon" ) ); | 43 | infoIconSet = new QIconSet( Resource::loadPixmap( "wellenreiter/InfoIcon" ) ); |
45 | settingsIconSet = new QIconSet( Resource::loadPixmap( "wellenreiter/SettingsIcon" ) ); | 44 | settingsIconSet = new QIconSet( Resource::loadPixmap( "wellenreiter/SettingsIcon" ) ); |
45 | #ifdef QWS | ||
46 | searchIconSet = new QIconSet( Resource::loadPixmap( "wellenreiter/SearchIcon" ) ); | ||
46 | cancelIconSet = new QIconSet( Resource::loadPixmap( "wellenreiter/CancelIcon" ) ); | 47 | cancelIconSet = new QIconSet( Resource::loadPixmap( "wellenreiter/CancelIcon" ) ); |
48 | #else | ||
49 | startStopIconSet = new QIconSet(); | ||
50 | startStopIconSet->setPixmap( Resource::loadPixmap( "wellenreiter/SearchIcon" ), QIconSet::Automatic, QIconSet::Normal, QIconSet::Off ); | ||
51 | startStopIconSet->setPixmap( Resource::loadPixmap( "wellenreiter/CancelIcon" ), QIconSet::Automatic, QIconSet::Normal, QIconSet::On ); | ||
52 | #endif | ||
47 | 53 | ||
48 | // setup tool buttons | 54 | // setup tool buttons |
49 | 55 | ||
50 | startStopButton = new QToolButton( 0 ); | 56 | startStopButton = new QToolButton( 0 ); |
51 | startStopButton->setAutoRaise( true ); | 57 | startStopButton->setAutoRaise( true ); |
58 | #ifdef QWS | ||
52 | startStopButton->setOnIconSet( *cancelIconSet ); | 59 | startStopButton->setOnIconSet( *cancelIconSet ); |
53 | startStopButton->setOffIconSet( *searchIconSet ); | 60 | startStopButton->setOffIconSet( *searchIconSet ); |
61 | #else | ||
62 | startStopButton->setIconSet( *startStopIconSet ); | ||
63 | #endif | ||
54 | startStopButton->setToggleButton( true ); | 64 | startStopButton->setToggleButton( true ); |
55 | connect( startStopButton, SIGNAL( clicked() ), mw, SLOT( startStopClicked() ) ); | 65 | connect( startStopButton, SIGNAL( clicked() ), mw, SLOT( startStopClicked() ) ); |
56 | startStopButton->setEnabled( false ); | 66 | startStopButton->setEnabled( false ); |
@@ -89,9 +99,15 @@ WellenreiterMainWindow::WellenreiterMainWindow( QWidget * parent, const char * n | |||
89 | id = mb->insertItem( "&Sniffer", sniffer ); | 99 | id = mb->insertItem( "&Sniffer", sniffer ); |
90 | mb->setItemEnabled( id, false ); | 100 | mb->setItemEnabled( id, false ); |
91 | 101 | ||
102 | #ifdef QWS | ||
92 | mb->insertItem( startStopButton ); | 103 | mb->insertItem( startStopButton ); |
93 | mb->insertItem( c ); | 104 | mb->insertItem( c ); |
94 | mb->insertItem( d ); | 105 | mb->insertItem( d ); |
106 | #else // Qt3 changed the insertion order. It's now totally random :( | ||
107 | mb->insertItem( d ); | ||
108 | mb->insertItem( c ); | ||
109 | mb->insertItem( startStopButton ); | ||
110 | #endif | ||
95 | 111 | ||
96 | // setup status bar (for now only on X11) | 112 | // setup status bar (for now only on X11) |
97 | 113 | ||
@@ -105,7 +121,9 @@ void WellenreiterMainWindow::showConfigure() | |||
105 | { | 121 | { |
106 | qDebug( "show configure..." ); | 122 | qDebug( "show configure..." ); |
107 | cw->setCaption( tr( "Configure" ) ); | 123 | cw->setCaption( tr( "Configure" ) ); |
124 | #ifdef QWS | ||
108 | cw->showMaximized(); | 125 | cw->showMaximized(); |
126 | #endif | ||
109 | int result = cw->exec(); | 127 | int result = cw->exec(); |
110 | 128 | ||
111 | if ( result ) | 129 | if ( result ) |
@@ -128,11 +146,14 @@ void WellenreiterMainWindow::showConfigure() | |||
128 | WellenreiterMainWindow::~WellenreiterMainWindow() | 146 | WellenreiterMainWindow::~WellenreiterMainWindow() |
129 | { | 147 | { |
130 | 148 | ||
131 | delete searchIconSet; | ||
132 | delete infoIconSet; | 149 | delete infoIconSet; |
133 | delete settingsIconSet; | 150 | delete settingsIconSet; |
151 | #ifdef QWS | ||
152 | delete searchIconSet; | ||
134 | delete cancelIconSet; | 153 | delete cancelIconSet; |
135 | 154 | #else | |
155 | delete startStopIconSet; | ||
156 | #endif | ||
136 | 157 | ||
137 | }; | 158 | }; |
138 | 159 | ||