-rw-r--r-- | noncore/net/wellenreiter/cornucopia/README | 127 | ||||
-rw-r--r-- | noncore/net/wellenreiter/cornucopia/olistview.cpp | 151 | ||||
-rw-r--r-- | noncore/net/wellenreiter/cornucopia/olistview.h | 87 | ||||
-rw-r--r-- | noncore/net/wellenreiter/gui/gui.pro | 2 | ||||
-rw-r--r-- | noncore/net/wellenreiter/gui/mainwindow.cpp | 36 | ||||
-rw-r--r-- | noncore/net/wellenreiter/gui/mainwindow.h | 1 | ||||
-rw-r--r-- | noncore/net/wellenreiter/gui/scanlist.cpp | 130 | ||||
-rw-r--r-- | noncore/net/wellenreiter/gui/scanlist.h | 77 | ||||
-rw-r--r-- | noncore/net/wellenreiter/gui/scanlistitem.cpp | 121 | ||||
-rw-r--r-- | noncore/net/wellenreiter/gui/scanlistitem.h | 83 | ||||
-rw-r--r-- | noncore/net/wellenreiter/gui/wellenreiter.cpp | 8 |
11 files changed, 578 insertions, 245 deletions
diff --git a/noncore/net/wellenreiter/cornucopia/README b/noncore/net/wellenreiter/cornucopia/README index 36a6954..486dc67 100644 --- a/noncore/net/wellenreiter/cornucopia/README +++ b/noncore/net/wellenreiter/cornucopia/README | |||
@@ -1,3 +1,124 @@ | |||
1 | --------------------------------------------------------------- | 1 | /******************************************************************** |
2 | Dies ist ein Testballon für opielibs1.2 - Codename: Cornucopia | 2 | /* This is an overview of the opielibs 1.2 project |
3 | --------------------------------------------------------------- | 3 | /********************************************************************/ |
4 | |||
5 | Origin: opielibs is about creating classes to | ||
6 | * optimize Qt classes for the embedded environment | ||
7 | * provide sophisticated abstractions for developers | ||
8 | * provide complete documentation and working examples | ||
9 | * provide end users with a common look and feel | ||
10 | * reduce memory footprint through sharing code | ||
11 | * reduce possible bugs through reusing tested code | ||
12 | |||
13 | -------------------------------------------------------- | ||
14 | 1. General Overview | ||
15 | -------------------------------------------------------- | ||
16 | |||
17 | Separation into the following libraries: | ||
18 | - libopiecore | ||
19 | - libopieui | ||
20 | - libopiepim | ||
21 | - libopienet | ||
22 | |||
23 | 1.1 Contents of libopiecore [ opiecore ] | ||
24 | -------------------------------------------------------- | ||
25 | |||
26 | - oprocctrl | ||
27 | - oprocess | ||
28 | - odevice | ||
29 | - odevicebutton | ||
30 | |||
31 | - oconfig | ||
32 | - oconfiggroupsaver | ||
33 | - ocompletionbase | ||
34 | - ocompletion | ||
35 | - ocomptreenodelist | ||
36 | - ocomptreenode | ||
37 | - ocompletionwrapper | ||
38 | - oglobal | ||
39 | - oglobalsettings | ||
40 | - osortableitem | ||
41 | - osortablevaluelist | ||
42 | |||
43 | 1.2 Contents of libopieui [ opieui ] | ||
44 | -------------------------------------------------------- | ||
45 | |||
46 | - oapplication | ||
47 | |||
48 | - ofiledialog | ||
49 | - colordialog | ||
50 | - oclickablelabel | ||
51 | - ocolorbutton | ||
52 | - colorpopupmenu | ||
53 | - otabinfo | ||
54 | - otabbar | ||
55 | - otabwidget | ||
56 | - ofontmenu | ||
57 | - ofontselector | ||
58 | - ofileview | ||
59 | - oticker | ||
60 | |||
61 | - olistview | ||
62 | - olistviewitem | ||
63 | - oversatileview | ||
64 | - oversatileviewitem | ||
65 | - ocompletionbox | ||
66 | - olineedit | ||
67 | - ocombobox | ||
68 | - ohistorycombo | ||
69 | |||
70 | - omessagebox | ||
71 | - odialogbase | ||
72 | |||
73 | - todayconfigwidget (rather into opiepim?) | ||
74 | - orecurrancewidget (rather into opiepim?) | ||
75 | - otimepicker (rather into opiepim?) | ||
76 | |||
77 | 1.3 Contents of libopiepim [ opiepim ] | ||
78 | -------------------------------------------------------- | ||
79 | |||
80 | - ocheckitem | ||
81 | - todoevent | ||
82 | - todoresource | ||
83 | - todayplugininterface | ||
84 | - todovcalresource | ||
85 | |||
86 | 1.4 Contents of libopiedb [ opiedb ] | ||
87 | -------------------------------------------------------- | ||
88 | |||
89 | - tododb | ||
90 | - xmltree | ||
91 | |||
92 | 1.5 Contents of libopienet [ opienet ] | ||
93 | -------------------------------------------------------- | ||
94 | |||
95 | <libmail stuff> | ||
96 | <libbend stuff> | ||
97 | <libftp stuff> | ||
98 | |||
99 | -------------------------------------------------------- | ||
100 | 2.0 Feature Description | ||
101 | -------------------------------------------------------- | ||
102 | |||
103 | 2.1 libopiecore | ||
104 | |||
105 | ... | ||
106 | |||
107 | 2.2 libopieui | ||
108 | |||
109 | ... | ||
110 | |||
111 | 2.2.x OListView, OListViewItem, OListViewFactory | ||
112 | |||
113 | ... | ||
114 | |||
115 | 2.3 libopiepim | ||
116 | |||
117 | ... | ||
118 | |||
119 | 2.4 libopiedb | ||
120 | |||
121 | ... | ||
122 | |||
123 | 2.5 libopienet | ||
124 | |||
diff --git a/noncore/net/wellenreiter/cornucopia/olistview.cpp b/noncore/net/wellenreiter/cornucopia/olistview.cpp index 8bc59de..f2d3730 100644 --- a/noncore/net/wellenreiter/cornucopia/olistview.cpp +++ b/noncore/net/wellenreiter/cornucopia/olistview.cpp | |||
@@ -114,24 +114,100 @@ void OListView::setAlternateBackground( const QColor &c ) | |||
114 | 114 | ||
115 | const QPen& OListView::columnSeparator() const | 115 | const QPen& OListView::columnSeparator() const |
116 | { | 116 | { |
117 | return m_columnSeparator; | 117 | return m_columnSeparator; |
118 | } | 118 | } |
119 | 119 | ||
120 | void OListView::setColumnSeparator( const QPen& p ) | 120 | void OListView::setColumnSeparator( const QPen& p ) |
121 | { | 121 | { |
122 | m_columnSeparator = p; | 122 | m_columnSeparator = p; |
123 | repaint(); | 123 | repaint(); |
124 | } | 124 | } |
125 | 125 | ||
126 | #ifndef QT_NO_DATASTREAM | ||
127 | void OListView::serializeTo( QDataStream& s ) const | ||
128 | { | ||
129 | #warning Caution... the binary format is still under construction... | ||
130 | qDebug( "storing OListView..." ); | ||
131 | |||
132 | // store number of columns and the labels | ||
133 | s << columns(); | ||
134 | for ( int i = 0; i < columns(); ++i ) | ||
135 | s << columnText( i ); | ||
136 | |||
137 | // calculate the number of top-level items to serialize | ||
138 | int items = 0; | ||
139 | QListViewItem* item = firstChild(); | ||
140 | while ( item ) | ||
141 | { | ||
142 | item = item->nextSibling(); | ||
143 | items++; | ||
144 | } | ||
145 | |||
146 | // store number of items and the items itself | ||
147 | s << items; | ||
148 | item = firstChild(); | ||
149 | for ( int i = 0; i < items; ++i ) | ||
150 | { | ||
151 | s << *static_cast<OListViewItem*>( item ); | ||
152 | item = item->nextSibling(); | ||
153 | } | ||
154 | |||
155 | qDebug( "OListview stored." ); | ||
156 | } | ||
157 | |||
158 | void OListView::serializeFrom( QDataStream& s ) | ||
159 | { | ||
160 | #warning Caution... the binary format is still under construction... | ||
161 | qDebug( "loading OListView..." ); | ||
162 | |||
163 | int cols; | ||
164 | s >> cols; | ||
165 | qDebug( "read number of columns = %d", cols ); | ||
166 | |||
167 | while ( columns() < cols ) addColumn( QString::null ); | ||
168 | |||
169 | for ( int i = 0; i < cols; ++i ) | ||
170 | { | ||
171 | QString coltext; | ||
172 | s >> coltext; | ||
173 | qDebug( "read text '%s' for column %d", (const char*) coltext, i ); | ||
174 | setColumnText( i, coltext ); | ||
175 | } | ||
176 | |||
177 | int items; | ||
178 | s >> items; | ||
179 | qDebug( "read number of items = %d", items ); | ||
180 | |||
181 | for ( int i = 0; i < items; ++i ) | ||
182 | { | ||
183 | OListViewItem* item = new OListViewItem( this ); | ||
184 | s >> *item; | ||
185 | } | ||
186 | |||
187 | qDebug( "OListView loaded." ); | ||
188 | |||
189 | } | ||
190 | |||
191 | QDataStream& operator<<( QDataStream& s, const OListView& lv ) | ||
192 | { | ||
193 | lv.serializeTo( s ); | ||
194 | } | ||
195 | |||
196 | QDataStream& operator>>( QDataStream& s, OListView& lv ) | ||
197 | { | ||
198 | lv.serializeFrom( s ); | ||
199 | } | ||
200 | #endif // QT_NO_DATASTREAM | ||
201 | |||
126 | //****************************** OListViewItem *********************************************************************** | 202 | //****************************** OListViewItem *********************************************************************** |
127 | 203 | ||
128 | OListViewItem::OListViewItem(QListView *parent) | 204 | OListViewItem::OListViewItem(QListView *parent) |
129 | : QListViewItem(parent) | 205 | : QListViewItem(parent) |
130 | { | 206 | { |
131 | init(); | 207 | init(); |
132 | } | 208 | } |
133 | 209 | ||
134 | OListViewItem::OListViewItem(QListViewItem *parent) | 210 | OListViewItem::OListViewItem(QListViewItem *parent) |
135 | : QListViewItem(parent) | 211 | : QListViewItem(parent) |
136 | { | 212 | { |
137 | init(); | 213 | init(); |
@@ -236,27 +312,96 @@ bool OListViewItem::isAlternate() | |||
236 | /* if (!item.inherits( "OListViewItem" ) ) break; */ | 312 | /* if (!item.inherits( "OListViewItem" ) ) break; */ |
237 | } | 313 | } |
238 | } | 314 | } |
239 | return m_odd; | 315 | return m_odd; |
240 | } | 316 | } |
241 | 317 | ||
242 | void OListViewItem::paintCell(QPainter *p, const QColorGroup &cg, int column, int width, int alignment) | 318 | void OListViewItem::paintCell(QPainter *p, const QColorGroup &cg, int column, int width, int alignment) |
243 | { | 319 | { |
244 | QColorGroup _cg = cg; | 320 | QColorGroup _cg = cg; |
245 | const QPixmap *pm = listView()->viewport()->backgroundPixmap(); | 321 | const QPixmap *pm = listView()->viewport()->backgroundPixmap(); |
246 | if (pm && !pm->isNull()) | 322 | if (pm && !pm->isNull()) |
247 | { | 323 | { |
248 | _cg.setBrush(QColorGroup::Base, QBrush(backgroundColor(), *pm)); | 324 | _cg.setBrush( QColorGroup::Base, QBrush(backgroundColor(), *pm) ); |
249 | p->setBrushOrigin( -listView()->contentsX(), -listView()->contentsY() ); | 325 | p->setBrushOrigin( -listView()->contentsX(), -listView()->contentsY() ); |
250 | } | 326 | } |
251 | else if ( isAlternate() ) | 327 | else if ( isAlternate() ) |
252 | { | 328 | { |
253 | _cg.setColor( QColorGroup::Base, static_cast<OListView*>( listView() )->alternateBackground() ); | 329 | _cg.setColor( QColorGroup::Base, static_cast<OListView*>( listView() )->alternateBackground() ); |
254 | } | 330 | } |
255 | QListViewItem::paintCell(p, _cg, column, width, alignment); | 331 | QListViewItem::paintCell( p, _cg, column, width, alignment ); |
256 | 332 | ||
257 | //FIXME: Use styling here? | 333 | //FIXME: Use styling here! |
258 | 334 | ||
259 | const QPen& pen = static_cast<OListView*>( listView() )->columnSeparator(); | 335 | const QPen& pen = static_cast<OListView*>( listView() )->columnSeparator(); |
260 | p->setPen( pen ); | 336 | p->setPen( pen ); |
261 | p->drawLine( width-1, 0, width-1, height() ); | 337 | p->drawLine( width-1, 0, width-1, height() ); |
262 | } | 338 | } |
339 | |||
340 | #ifndef QT_NO_DATASTREAM | ||
341 | void OListViewItem::serializeTo( QDataStream& s ) const | ||
342 | { | ||
343 | #warning Caution... the binary format is still under construction... | ||
344 | qDebug( "storing OListViewItem..." ); | ||
345 | |||
346 | // store item text | ||
347 | for ( int i = 0; i < listView()->columns(); ++i ) | ||
348 | { | ||
349 | s << text( i ); | ||
350 | } | ||
351 | |||
352 | // calculate the number of children to serialize | ||
353 | int items = 0; | ||
354 | QListViewItem* item = firstChild(); | ||
355 | while ( item ) | ||
356 | { | ||
357 | item = item->nextSibling(); | ||
358 | items++; | ||
359 | } | ||
360 | |||
361 | // store number of items and the items itself | ||
362 | s << items; | ||
363 | item = firstChild(); | ||
364 | for ( int i = 0; i < items; ++i ) | ||
365 | { | ||
366 | s << *static_cast<OListViewItem*>( item ); | ||
367 | item = item->nextSibling(); | ||
368 | } | ||
369 | |||
370 | qDebug( "OListviewItem stored." ); | ||
371 | } | ||
372 | void OListViewItem::serializeFrom( QDataStream& s ) | ||
373 | { | ||
374 | #warning Caution... the binary format is still under construction... | ||
375 | qDebug( "loading OListViewItem..." ); | ||
376 | |||
377 | for ( int i = 0; i < listView()->columns(); ++i ) | ||
378 | { | ||
379 | QString coltext; | ||
380 | s >> coltext; | ||
381 | qDebug( "read text '%s' for column %d", (const char*) coltext, i ); | ||
382 | setText( i, coltext ); | ||
383 | } | ||
384 | |||
385 | int items; | ||
386 | s >> items; | ||
387 | qDebug( "read number of items = %d", items ); | ||
388 | |||
389 | for ( int i = 0; i < items; ++i ) | ||
390 | { | ||
391 | OListViewItem* item = new OListViewItem( this ); | ||
392 | s >> (*item); | ||
393 | } | ||
394 | |||
395 | qDebug( "OListViewItem loaded." ); | ||
396 | } | ||
397 | |||
398 | QDataStream& operator<<( QDataStream& s, const OListViewItem& lvi ) | ||
399 | { | ||
400 | lvi.serializeTo( s ); | ||
401 | } | ||
402 | |||
403 | QDataStream& operator>>( QDataStream& s, OListViewItem& lvi ) | ||
404 | { | ||
405 | lvi.serializeFrom( s ); | ||
406 | } | ||
407 | #endif // QT_NO_DATASTREAM | ||
diff --git a/noncore/net/wellenreiter/cornucopia/olistview.h b/noncore/net/wellenreiter/cornucopia/olistview.h index 4b9e4b0..9df5500 100644 --- a/noncore/net/wellenreiter/cornucopia/olistview.h +++ b/noncore/net/wellenreiter/cornucopia/olistview.h | |||
@@ -24,32 +24,35 @@ | |||
24 | -. .:....=;==+<; You should have received a copy of the GNU | 24 | -. .:....=;==+<; You should have received a copy of the GNU |
25 | -_. . . )=. = Library General Public License along with | 25 | -_. . . )=. = Library General Public License along with |
26 | -- :-=` this library; see the file COPYING.LIB. | 26 | -- :-=` this library; see the file COPYING.LIB. |
27 | If not, write to the Free Software Foundation, | 27 | If not, write to the Free Software Foundation, |
28 | Inc., 59 Temple Place - Suite 330, | 28 | Inc., 59 Temple Place - Suite 330, |
29 | Boston, MA 02111-1307, USA. | 29 | Boston, MA 02111-1307, USA. |
30 | 30 | ||
31 | */ | 31 | */ |
32 | 32 | ||
33 | #ifndef OLISTVIEW_H | 33 | #ifndef OLISTVIEW_H |
34 | #define OLISTVIEW_H | 34 | #define OLISTVIEW_H |
35 | 35 | ||
36 | #include <qlistview.h> | ||
37 | #include <qcolor.h> | 36 | #include <qcolor.h> |
37 | #include <qlistview.h> | ||
38 | #include <qpen.h> | 38 | #include <qpen.h> |
39 | #include <qdatastream.h> | ||
40 | |||
41 | class OListViewFactory; | ||
39 | 42 | ||
40 | /** | 43 | /** |
41 | * A @ref QListView variant featuring visual enhancements | 44 | * A @ref QListView variant featuring visual and functional enhancements |
42 | * like an alternate background for odd rows and an autostretch | 45 | * like an alternate background for odd rows, an autostretch mode |
43 | * mode for the width of the widget. | 46 | * for the width of the widget ( >= Qt 3 only ) and persistence capabilities. |
44 | * | 47 | * |
45 | * @author Michael 'Mickey' Lauer <mickey@tm.informatik.uni-frankfurt.de> | 48 | * @author Michael 'Mickey' Lauer <mickey@tm.informatik.uni-frankfurt.de> |
46 | * @short OListView list/tree widget. | 49 | * @short OListView list/tree widget. |
47 | */ | 50 | */ |
48 | class OListView: public QListView | 51 | class OListView: public QListView |
49 | { | 52 | { |
50 | public: | 53 | public: |
51 | /** | 54 | /** |
52 | * Constructor. | 55 | * Constructor. |
53 | * | 56 | * |
54 | * The parameters @p parent and @p name are handled by | 57 | * The parameters @p parent and @p name are handled by |
55 | * @ref QListView, as usual. | 58 | * @ref QListView, as usual. |
@@ -103,31 +106,69 @@ | |||
103 | void setColumnSeparator( const QPen &p ); | 106 | void setColumnSeparator( const QPen &p ); |
104 | 107 | ||
105 | /** | 108 | /** |
106 | * @return the alternate background color | 109 | * @return the alternate background color |
107 | */ | 110 | */ |
108 | const QColor& alternateBackground() const; | 111 | const QColor& alternateBackground() const; |
109 | 112 | ||
110 | /** | 113 | /** |
111 | * @return the column separator pen | 114 | * @return the column separator pen |
112 | */ | 115 | */ |
113 | const QPen& columnSeparator() const; | 116 | const QPen& columnSeparator() const; |
114 | 117 | ||
118 | #ifndef QT_NO_DATASTREAM | ||
119 | /** | ||
120 | * serialize this object to a @ref QDataStream | ||
121 | * @param s the stream used to serialize this object. | ||
122 | */ | ||
123 | virtual void serializeTo( QDataStream& s ) const; | ||
124 | |||
125 | /** | ||
126 | * serialize this object from a @ref QDataStream | ||
127 | * @param s the stream used to serialize this object. | ||
128 | */ | ||
129 | virtual void serializeFrom( QDataStream& s ); | ||
130 | #endif | ||
131 | |||
132 | /** | ||
133 | * returns a factory for OListView classes | ||
134 | * creates one on the fly if it doesn't exist | ||
135 | * @return the XML Factory | ||
136 | */ | ||
137 | #ifndef QT_NO_XML | ||
138 | //OListViewFactory* Factory(); | ||
139 | #endif | ||
140 | |||
115 | private: | 141 | private: |
116 | QColor m_alternateBackground; | 142 | QColor m_alternateBackground; |
117 | bool m_fullWidth; | 143 | bool m_fullWidth; |
118 | QPen m_columnSeparator; | 144 | QPen m_columnSeparator; |
119 | 145 | #ifndef QT_NO_XML | |
146 | //OListViewFactory* m_Factory; | ||
147 | #endif | ||
120 | }; | 148 | }; |
121 | 149 | ||
150 | #ifndef QT_NO_DATASTREAM | ||
151 | /** | ||
152 | * \relates QListView | ||
153 | * Writes a listview to the stream and returns a reference to the stream. | ||
154 | */ | ||
155 | QDataStream& operator<<( QDataStream& s, const OListView& lv ); | ||
156 | /** | ||
157 | * \relates QListView | ||
158 | * Reads a listview from the stream and returns a reference to the stream. | ||
159 | */ | ||
160 | QDataStream& operator>>( QDataStream& s, OListView& lv ); | ||
161 | #endif // QT_NO_DATASTREAM | ||
162 | |||
122 | //****************************** OListViewItem ****************************************************************** | 163 | //****************************** OListViewItem ****************************************************************** |
123 | 164 | ||
124 | class OListViewItem: public QListViewItem | 165 | class OListViewItem: public QListViewItem |
125 | { | 166 | { |
126 | public: | 167 | public: |
127 | OListViewItem( QListView * parent ); | 168 | OListViewItem( QListView * parent ); |
128 | OListViewItem( QListViewItem * parent ); | 169 | OListViewItem( QListViewItem * parent ); |
129 | OListViewItem( QListView * parent, QListViewItem * after ); | 170 | OListViewItem( QListView * parent, QListViewItem * after ); |
130 | OListViewItem( QListViewItem * parent, QListViewItem * after ); | 171 | OListViewItem( QListViewItem * parent, QListViewItem * after ); |
131 | 172 | ||
132 | OListViewItem( QListView * parent, | 173 | OListViewItem( QListView * parent, |
133 | QString, QString = QString::null, | 174 | QString, QString = QString::null, |
@@ -137,32 +178,60 @@ class OListViewItem: public QListViewItem | |||
137 | 178 | ||
138 | OListViewItem( QListViewItem * parent, | 179 | OListViewItem( QListViewItem * parent, |
139 | QString, QString = QString::null, | 180 | QString, QString = QString::null, |
140 | QString = QString::null, QString = QString::null, | 181 | QString = QString::null, QString = QString::null, |
141 | QString = QString::null, QString = QString::null, | 182 | QString = QString::null, QString = QString::null, |
142 | QString = QString::null, QString = QString::null ); | 183 | QString = QString::null, QString = QString::null ); |
143 | 184 | ||
144 | OListViewItem( QListView * parent, QListViewItem * after, | 185 | OListViewItem( QListView * parent, QListViewItem * after, |
145 | QString, QString = QString::null, | 186 | QString, QString = QString::null, |
146 | QString = QString::null, QString = QString::null, | 187 | QString = QString::null, QString = QString::null, |
147 | QString = QString::null, QString = QString::null, | 188 | QString = QString::null, QString = QString::null, |
148 | QString = QString::null, QString = QString::null ); | 189 | QString = QString::null, QString = QString::null ); |
149 | 190 | ||
150 | OListViewItem( QListViewItem * parent, QListViewItem * after, | 191 | OListViewItem( QListViewItem * parent, QListViewItem * after, |
151 | QString, QString = QString::null, | 192 | QString, QString = QString::null, |
152 | QString = QString::null, QString = QString::null, | 193 | QString = QString::null, QString = QString::null, |
153 | QString = QString::null, QString = QString::null, | 194 | QString = QString::null, QString = QString::null, |
154 | QString = QString::null, QString = QString::null ); | 195 | QString = QString::null, QString = QString::null ); |
155 | 196 | ||
156 | virtual ~OListViewItem(); | 197 | virtual ~OListViewItem(); |
157 | 198 | ||
158 | const QColor& backgroundColor(); | 199 | const QColor& backgroundColor(); |
159 | bool isAlternate(); | 200 | bool isAlternate(); |
160 | void paintCell( QPainter *p, const QColorGroup &cg, int column, int width, int alignment ); | 201 | void paintCell( QPainter *p, const QColorGroup &cg, int column, int width, int alignment ); |
161 | void init(); | 202 | void init(); |
162 | 203 | ||
204 | #ifndef QT_NO_DATASTREAM | ||
205 | /** | ||
206 | * serialize this object to or from a @ref QDataStream | ||
207 | * @param s the stream used to serialize this object. | ||
208 | */ | ||
209 | virtual void serializeTo( QDataStream& s ) const; | ||
210 | |||
211 | /** | ||
212 | * serialize this object to or from a @ref QDataStream | ||
213 | * @param s the stream used to serialize this object. | ||
214 | */ | ||
215 | virtual void serializeFrom( QDataStream& s ); | ||
216 | #endif | ||
217 | |||
163 | private: | 218 | private: |
164 | bool m_known; | 219 | bool m_known; |
165 | bool m_odd; | 220 | bool m_odd; |
166 | }; | 221 | }; |
167 | 222 | ||
168 | #endif | 223 | #ifndef QT_NO_DATASTREAM |
224 | /** | ||
225 | * \relates QListViewItem | ||
226 | * Writes a listview item and all subitems recursively to the stream | ||
227 | * and returns a reference to the stream. | ||
228 | */ | ||
229 | QDataStream& operator<<( QDataStream &s, const OListViewItem& lvi ); | ||
230 | /** | ||
231 | * \relates QListViewItem | ||
232 | * Reads a listview item from the stream and returns a reference to the stream. | ||
233 | */ | ||
234 | QDataStream& operator>>( QDataStream &s, OListViewItem& lvi ); | ||
235 | #endif // QT_NO_DATASTREAM | ||
236 | |||
237 | #endif // OLISTVIEW_H | ||
diff --git a/noncore/net/wellenreiter/gui/gui.pro b/noncore/net/wellenreiter/gui/gui.pro index 6037661..8861a50 100644 --- a/noncore/net/wellenreiter/gui/gui.pro +++ b/noncore/net/wellenreiter/gui/gui.pro | |||
@@ -1,35 +1,33 @@ | |||
1 | MOC_DIR = ./tmp | 1 | MOC_DIR = ./tmp |
2 | OBJECTS_DIR = ./tmp | 2 | OBJECTS_DIR = ./tmp |
3 | DESTDIR = $(OPIEDIR)/bin | 3 | DESTDIR = $(OPIEDIR)/bin |
4 | TEMPLATE = app | 4 | TEMPLATE = app |
5 | CONFIG = qt warn_on debug | 5 | CONFIG = qt warn_on debug |
6 | 6 | ||
7 | HEADERS = wellenreiterbase.h \ | 7 | HEADERS = wellenreiterbase.h \ |
8 | mainwindow.h \ | 8 | mainwindow.h \ |
9 | wellenreiter.h \ | 9 | wellenreiter.h \ |
10 | scanlistitem.h \ | ||
11 | scanlist.h \ | 10 | scanlist.h \ |
12 | logwindow.h \ | 11 | logwindow.h \ |
13 | hexwindow.h \ | 12 | hexwindow.h \ |
14 | configwindow.h \ | 13 | configwindow.h \ |
15 | wlan.h \ | 14 | wlan.h \ |
16 | cardconfig.h \ | 15 | cardconfig.h \ |
17 | manufacturers.h | 16 | manufacturers.h |
18 | 17 | ||
19 | SOURCES = main.cpp \ | 18 | SOURCES = main.cpp \ |
20 | mainwindow.cpp \ | 19 | mainwindow.cpp \ |
21 | wellenreiterbase.cpp \ | 20 | wellenreiterbase.cpp \ |
22 | wellenreiter.cpp \ | 21 | wellenreiter.cpp \ |
23 | scanlistitem.cpp \ | ||
24 | scanlist.cpp \ | 22 | scanlist.cpp \ |
25 | logwindow.cpp \ | 23 | logwindow.cpp \ |
26 | hexwindow.cpp \ | 24 | hexwindow.cpp \ |
27 | configwindow.cpp \ | 25 | configwindow.cpp \ |
28 | wlan.cpp \ | 26 | wlan.cpp \ |
29 | cardconfig.cpp \ | 27 | cardconfig.cpp \ |
30 | manufacturers.cpp | 28 | manufacturers.cpp |
31 | 29 | ||
32 | INCLUDEPATH += $(OPIEDIR)/include ../ | 30 | INCLUDEPATH += $(OPIEDIR)/include ../ |
33 | DEPENDPATH += $(OPIEDIR)/include ../ | 31 | DEPENDPATH += $(OPIEDIR)/include ../ |
34 | LIBS += -L. -lwellenreiter -lcornucopia | 32 | LIBS += -L. -lwellenreiter -lcornucopia |
35 | INTERFACES = configbase.ui | 33 | INTERFACES = configbase.ui |
diff --git a/noncore/net/wellenreiter/gui/mainwindow.cpp b/noncore/net/wellenreiter/gui/mainwindow.cpp index e388fc5..0ef89d4 100644 --- a/noncore/net/wellenreiter/gui/mainwindow.cpp +++ b/noncore/net/wellenreiter/gui/mainwindow.cpp | |||
@@ -12,47 +12,55 @@ | |||
12 | ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. | 12 | ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. |
13 | ** | 13 | ** |
14 | **********************************************************************/ | 14 | **********************************************************************/ |
15 | 15 | ||
16 | #include "configwindow.h" | 16 | #include "configwindow.h" |
17 | #include "logwindow.h" | 17 | #include "logwindow.h" |
18 | #include "mainwindow.h" | 18 | #include "mainwindow.h" |
19 | #include "wellenreiter.h" | 19 | #include "wellenreiter.h" |
20 | 20 | ||
21 | #include "scanlist.h" | 21 | #include "scanlist.h" |
22 | 22 | ||
23 | #include <qcombobox.h> | 23 | #include <qcombobox.h> |
24 | #include <qdatastream.h> | ||
24 | #include <qfile.h> | 25 | #include <qfile.h> |
25 | #include <qiconset.h> | 26 | #include <qiconset.h> |
26 | #include <qmenubar.h> | 27 | #include <qmenubar.h> |
27 | #include <qmessagebox.h> | 28 | #include <qmessagebox.h> |
28 | #include <qpopupmenu.h> | 29 | #include <qpopupmenu.h> |
29 | #include <qstatusbar.h> | 30 | #include <qstatusbar.h> |
30 | #include <qtextstream.h> | 31 | #include <qtextstream.h> |
31 | #include <qtoolbutton.h> | 32 | #include <qtoolbutton.h> |
32 | 33 | ||
33 | #ifdef QWS | 34 | #ifdef QWS |
34 | #include <qpe/resource.h> | 35 | #include <qpe/resource.h> |
35 | #else | 36 | #else |
36 | #include "resource.h" | 37 | #include "resource.h" |
37 | #endif | 38 | #endif |
38 | 39 | ||
39 | WellenreiterMainWindow::WellenreiterMainWindow( QWidget * parent, const char * name, WFlags f ) | 40 | WellenreiterMainWindow::WellenreiterMainWindow( QWidget * parent, const char * name, WFlags f ) |
40 | :QMainWindow( parent, name, f ) | 41 | :QMainWindow( parent, name, f ) |
41 | { | 42 | { |
42 | cw = new WellenreiterConfigWindow( this ); | 43 | cw = new WellenreiterConfigWindow( this ); |
43 | mw = new Wellenreiter( this ); | 44 | mw = new Wellenreiter( this ); |
44 | mw->setConfigWindow( cw ); | 45 | mw->setConfigWindow( cw ); |
45 | setCentralWidget( mw ); | 46 | setCentralWidget( mw ); |
46 | 47 | ||
48 | // setup application icon | ||
49 | |||
50 | #ifndef QWS | ||
51 | setIcon( Resource::loadPixmap( "wellenreiter/appicon-trans" ) ); | ||
52 | setIconText( "Wellenreiter/X11" ); | ||
53 | #endif | ||
54 | |||
47 | // setup icon sets | 55 | // setup icon sets |
48 | 56 | ||
49 | infoIconSet = new QIconSet( Resource::loadPixmap( "wellenreiter/InfoIcon" ) ); | 57 | infoIconSet = new QIconSet( Resource::loadPixmap( "wellenreiter/InfoIcon" ) ); |
50 | settingsIconSet = new QIconSet( Resource::loadPixmap( "wellenreiter/SettingsIcon" ) ); | 58 | settingsIconSet = new QIconSet( Resource::loadPixmap( "wellenreiter/SettingsIcon" ) ); |
51 | #ifdef QWS | 59 | #ifdef QWS |
52 | searchIconSet = new QIconSet( Resource::loadPixmap( "wellenreiter/SearchIcon" ) ); | 60 | searchIconSet = new QIconSet( Resource::loadPixmap( "wellenreiter/SearchIcon" ) ); |
53 | cancelIconSet = new QIconSet( Resource::loadPixmap( "wellenreiter/CancelIcon" ) ); | 61 | cancelIconSet = new QIconSet( Resource::loadPixmap( "wellenreiter/CancelIcon" ) ); |
54 | #else | 62 | #else |
55 | startStopIconSet = new QIconSet(); | 63 | startStopIconSet = new QIconSet(); |
56 | startStopIconSet->setPixmap( Resource::loadPixmap( "wellenreiter/SearchIcon" ), QIconSet::Automatic, QIconSet::Normal, QIconSet::Off ); | 64 | startStopIconSet->setPixmap( Resource::loadPixmap( "wellenreiter/SearchIcon" ), QIconSet::Automatic, QIconSet::Normal, QIconSet::Off ); |
57 | startStopIconSet->setPixmap( Resource::loadPixmap( "wellenreiter/CancelIcon" ), QIconSet::Automatic, QIconSet::Normal, QIconSet::On ); | 65 | startStopIconSet->setPixmap( Resource::loadPixmap( "wellenreiter/CancelIcon" ), QIconSet::Automatic, QIconSet::Normal, QIconSet::On ); |
58 | #endif | 66 | #endif |
@@ -90,29 +98,28 @@ WellenreiterMainWindow::WellenreiterMainWindow( QWidget * parent, const char * n | |||
90 | // setup menu bar | 98 | // setup menu bar |
91 | 99 | ||
92 | int id; | 100 | int id; |
93 | 101 | ||
94 | QMenuBar* mb = menuBar(); | 102 | QMenuBar* mb = menuBar(); |
95 | 103 | ||
96 | QPopupMenu* fileSave = new QPopupMenu( mb ); | 104 | QPopupMenu* fileSave = new QPopupMenu( mb ); |
97 | fileSave->insertItem( "&Session", this, SLOT( fileSaveSession() ) ); | 105 | fileSave->insertItem( "&Session", this, SLOT( fileSaveSession() ) ); |
98 | fileSave->insertItem( "&Log", this, SLOT( fileSaveLog() ) ); | 106 | fileSave->insertItem( "&Log", this, SLOT( fileSaveLog() ) ); |
99 | 107 | ||
100 | QPopupMenu* fileLoad = new QPopupMenu( mb ); | 108 | QPopupMenu* fileLoad = new QPopupMenu( mb ); |
101 | fileLoad->insertItem( "&Session", this, SLOT( fileLoadSession() ) ); | 109 | fileLoad->insertItem( "&Session", this, SLOT( fileLoadSession() ) ); |
102 | fileLoad->insertItem( "&Log", this, SLOT( fileLoadLog() ) ); | 110 | //fileLoad->insertItem( "&Log", this, SLOT( fileLoadLog() ) ); |
103 | 111 | ||
104 | QPopupMenu* file = new QPopupMenu( mb ); | 112 | QPopupMenu* file = new QPopupMenu( mb ); |
105 | id = file->insertItem( "&Load", fileLoad ); | 113 | id = file->insertItem( "&Load", fileLoad ); |
106 | file->setItemEnabled( id, false ); | ||
107 | file->insertItem( "&Save", fileSave ); | 114 | file->insertItem( "&Save", fileSave ); |
108 | 115 | ||
109 | QPopupMenu* view = new QPopupMenu( mb ); | 116 | QPopupMenu* view = new QPopupMenu( mb ); |
110 | view->insertItem( "&Configure..." ); | 117 | view->insertItem( "&Configure..." ); |
111 | 118 | ||
112 | QPopupMenu* sniffer = new QPopupMenu( mb ); | 119 | QPopupMenu* sniffer = new QPopupMenu( mb ); |
113 | sniffer->insertItem( "&Configure..." ); | 120 | sniffer->insertItem( "&Configure..." ); |
114 | sniffer->insertSeparator(); | 121 | sniffer->insertSeparator(); |
115 | 122 | ||
116 | QPopupMenu* demo = new QPopupMenu( mb ); | 123 | QPopupMenu* demo = new QPopupMenu( mb ); |
117 | demo->insertItem( "&Add something", this, SLOT( demoAddStations() ) ); | 124 | demo->insertItem( "&Add something", this, SLOT( demoAddStations() ) ); |
118 | 125 | ||
@@ -176,25 +183,25 @@ WellenreiterMainWindow::~WellenreiterMainWindow() | |||
176 | #ifdef QWS | 183 | #ifdef QWS |
177 | delete searchIconSet; | 184 | delete searchIconSet; |
178 | delete cancelIconSet; | 185 | delete cancelIconSet; |
179 | #else | 186 | #else |
180 | delete startStopIconSet; | 187 | delete startStopIconSet; |
181 | #endif | 188 | #endif |
182 | 189 | ||
183 | }; | 190 | }; |
184 | 191 | ||
185 | void WellenreiterMainWindow::demoAddStations() | 192 | void WellenreiterMainWindow::demoAddStations() |
186 | { | 193 | { |
187 | mw->netView()->addNewItem( "managed", "Vanille", "00:00:20:EF:A6:43", true, 6, 80 ); | 194 | mw->netView()->addNewItem( "managed", "Vanille", "00:00:20:EF:A6:43", true, 6, 80 ); |
188 | mw->netView()->addNewItem( "managed", "Vanille", "00:00:1c:EF:A6:23", true, 11, 10 ); | 195 | mw->netView()->addNewItem( "managed", "Vanille", "00:30:6D:EF:A6:23", true, 11, 10 ); |
189 | mw->netView()->addNewItem( "adhoc", "ELAN", "00:A0:F8:E7:16:22", false, 3, 10 ); | 196 | mw->netView()->addNewItem( "adhoc", "ELAN", "00:A0:F8:E7:16:22", false, 3, 10 ); |
190 | mw->netView()->addNewItem( "adhoc", "ELAN", "00:AA:01:E7:56:62", false, 3, 15 ); | 197 | mw->netView()->addNewItem( "adhoc", "ELAN", "00:AA:01:E7:56:62", false, 3, 15 ); |
191 | mw->netView()->addNewItem( "adhoc", "ELAN", "00:B0:8E:E7:56:E2", false, 3, 20 ); | 198 | mw->netView()->addNewItem( "adhoc", "ELAN", "00:B0:8E:E7:56:E2", false, 3, 20 ); |
192 | } | 199 | } |
193 | 200 | ||
194 | void WellenreiterMainWindow::fileSaveLog() | 201 | void WellenreiterMainWindow::fileSaveLog() |
195 | { | 202 | { |
196 | const QString fname( "/tmp/log.txt" ); | 203 | const QString fname( "/tmp/log.txt" ); |
197 | QFile f( fname ); | 204 | QFile f( fname ); |
198 | if ( f.open(IO_WriteOnly) ) | 205 | if ( f.open(IO_WriteOnly) ) |
199 | { | 206 | { |
200 | QTextStream t( &f ); | 207 | QTextStream t( &f ); |
@@ -206,35 +213,54 @@ void WellenreiterMainWindow::fileSaveLog() | |||
206 | { | 213 | { |
207 | qDebug( "Problem saving log to file '%s'", (const char*) fname ); | 214 | qDebug( "Problem saving log to file '%s'", (const char*) fname ); |
208 | } | 215 | } |
209 | 216 | ||
210 | } | 217 | } |
211 | 218 | ||
212 | void WellenreiterMainWindow::fileSaveSession() | 219 | void WellenreiterMainWindow::fileSaveSession() |
213 | { | 220 | { |
214 | const QString fname( "/tmp/session.xml" ); | 221 | const QString fname( "/tmp/session.xml" ); |
215 | QFile f( fname ); | 222 | QFile f( fname ); |
216 | if ( f.open(IO_WriteOnly) ) | 223 | if ( f.open(IO_WriteOnly) ) |
217 | { | 224 | { |
218 | QTextStream t( &f ); | 225 | QDataStream t( &f ); |
219 | mw->netView()->dump( t ); | 226 | t << *mw->netView(); |
220 | f.close(); | 227 | f.close(); |
221 | qDebug( "Saved session to file '%s'", (const char*) fname ); | 228 | qDebug( "Saved session to file '%s'", (const char*) fname ); |
222 | } | 229 | } |
223 | else | 230 | else |
224 | { | 231 | { |
225 | qDebug( "Problem saving session to file '%s'", (const char*) fname ); | 232 | qDebug( "Problem saving session to file '%s'", (const char*) fname ); |
226 | } | 233 | } |
227 | } | 234 | } |
228 | 235 | ||
236 | void WellenreiterMainWindow::fileLoadSession() | ||
237 | { | ||
238 | const QString fname( "/tmp/session.xml" ); | ||
239 | QFile f( fname ); | ||
240 | |||
241 | if ( f.open(IO_ReadOnly) ) | ||
242 | { | ||
243 | QDataStream t( &f ); | ||
244 | t >> *mw->netView(); | ||
245 | f.close(); | ||
246 | qDebug( "Loaded session from file '%s'", (const char*) fname ); | ||
247 | } | ||
248 | else | ||
249 | { | ||
250 | qDebug( "Problem loading session from file '%s'", (const char*) fname ); | ||
251 | } | ||
252 | |||
253 | } | ||
254 | |||
229 | void WellenreiterMainWindow::closeEvent( QCloseEvent* e ) | 255 | void WellenreiterMainWindow::closeEvent( QCloseEvent* e ) |
230 | { | 256 | { |
231 | if ( mw->isDaemonRunning() ) | 257 | if ( mw->isDaemonRunning() ) |
232 | { | 258 | { |
233 | QMessageBox::warning( this, "Wellenreiter/Opie", "Sniffing in progress!\nPlease stop sniffing before closing." ); | 259 | QMessageBox::warning( this, "Wellenreiter/Opie", "Sniffing in progress!\nPlease stop sniffing before closing." ); |
234 | e->ignore(); | 260 | e->ignore(); |
235 | } | 261 | } |
236 | else | 262 | else |
237 | { | 263 | { |
238 | QMainWindow::closeEvent( e ); | 264 | QMainWindow::closeEvent( e ); |
239 | } | 265 | } |
240 | } | 266 | } |
diff --git a/noncore/net/wellenreiter/gui/mainwindow.h b/noncore/net/wellenreiter/gui/mainwindow.h index 8bfccf3..59f259d 100644 --- a/noncore/net/wellenreiter/gui/mainwindow.h +++ b/noncore/net/wellenreiter/gui/mainwindow.h | |||
@@ -42,15 +42,16 @@ class WellenreiterMainWindow: public QMainWindow | |||
42 | const QIconSet* cancelIconSet; | 42 | const QIconSet* cancelIconSet; |
43 | 43 | ||
44 | QToolButton* startStopButton; | 44 | QToolButton* startStopButton; |
45 | 45 | ||
46 | protected: | 46 | protected: |
47 | virtual void closeEvent( QCloseEvent* ); | 47 | virtual void closeEvent( QCloseEvent* ); |
48 | 48 | ||
49 | public slots: | 49 | public slots: |
50 | void showConfigure(); | 50 | void showConfigure(); |
51 | void demoAddStations(); | 51 | void demoAddStations(); |
52 | void fileSaveLog(); | 52 | void fileSaveLog(); |
53 | void fileSaveSession(); | 53 | void fileSaveSession(); |
54 | void fileLoadSession(); | ||
54 | }; | 55 | }; |
55 | 56 | ||
56 | #endif | 57 | #endif |
diff --git a/noncore/net/wellenreiter/gui/scanlist.cpp b/noncore/net/wellenreiter/gui/scanlist.cpp index cdc2c48..58a04fb 100644 --- a/noncore/net/wellenreiter/gui/scanlist.cpp +++ b/noncore/net/wellenreiter/gui/scanlist.cpp | |||
@@ -5,30 +5,28 @@ | |||
5 | ** | 5 | ** |
6 | ** This file may be distributed and/or modified under the terms of the | 6 | ** This file may be distributed and/or modified under the terms of the |
7 | ** GNU General Public License version 2 as published by the Free Software | 7 | ** GNU General Public License version 2 as published by the Free Software |
8 | ** Foundation and appearing in the file LICENSE.GPL included in the | 8 | ** Foundation and appearing in the file LICENSE.GPL included in the |
9 | ** packaging of this file. | 9 | ** packaging of this file. |
10 | ** | 10 | ** |
11 | ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE | 11 | ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE |
12 | ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. | 12 | ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. |
13 | ** | 13 | ** |
14 | **********************************************************************/ | 14 | **********************************************************************/ |
15 | 15 | ||
16 | #include "scanlist.h" | 16 | #include "scanlist.h" |
17 | #include "scanlistitem.h" | ||
18 | 17 | ||
19 | #include <assert.h> | 18 | #include <assert.h> |
20 | |||
21 | #include "manufacturers.h" | 19 | #include "manufacturers.h" |
22 | 20 | #include <qdatetime.h> | |
23 | #include <qtextstream.h> | 21 | #include <qtextstream.h> |
24 | 22 | ||
25 | MScanListView::MScanListView( QWidget* parent, const char* name ) | 23 | MScanListView::MScanListView( QWidget* parent, const char* name ) |
26 | :OListView( parent, name ), _manufacturerdb( 0 ) | 24 | :OListView( parent, name ), _manufacturerdb( 0 ) |
27 | { | 25 | { |
28 | 26 | ||
29 | setFrameShape( QListView::StyledPanel ); | 27 | setFrameShape( QListView::StyledPanel ); |
30 | setFrameShadow( QListView::Sunken ); | 28 | setFrameShadow( QListView::Sunken ); |
31 | 29 | ||
32 | addColumn( tr( "Net/Station" ) ); | 30 | addColumn( tr( "Net/Station" ) ); |
33 | setColumnAlignment( 0, AlignLeft || AlignVCenter ); | 31 | setColumnAlignment( 0, AlignLeft || AlignVCenter ); |
34 | addColumn( tr( "B" ) ); | 32 | addColumn( tr( "B" ) ); |
@@ -41,46 +39,58 @@ MScanListView::MScanListView( QWidget* parent, const char* name ) | |||
41 | setColumnAlignment( 4, AlignCenter ); | 39 | setColumnAlignment( 4, AlignCenter ); |
42 | addColumn( tr( "T" ) ); | 40 | addColumn( tr( "T" ) ); |
43 | setColumnAlignment( 5, AlignCenter ); | 41 | setColumnAlignment( 5, AlignCenter ); |
44 | addColumn( tr( "Manufacturer" ) ); | 42 | addColumn( tr( "Manufacturer" ) ); |
45 | setColumnAlignment( 6, AlignCenter ); | 43 | setColumnAlignment( 6, AlignCenter ); |
46 | addColumn( tr( "First Seen" ) ); | 44 | addColumn( tr( "First Seen" ) ); |
47 | setColumnAlignment( 7, AlignCenter ); | 45 | setColumnAlignment( 7, AlignCenter ); |
48 | addColumn( tr( "Last Seen" ) ); | 46 | addColumn( tr( "Last Seen" ) ); |
49 | setColumnAlignment( 8, AlignCenter ); | 47 | setColumnAlignment( 8, AlignCenter ); |
50 | setRootIsDecorated( true ); | 48 | setRootIsDecorated( true ); |
51 | setAllColumnsShowFocus( true ); | 49 | setAllColumnsShowFocus( true ); |
52 | }; | 50 | }; |
53 | 51 | ||
54 | MScanListView::~MScanListView() | 52 | MScanListView::~MScanListView() |
55 | { | 53 | { |
56 | }; | 54 | }; |
57 | 55 | ||
56 | void MScanListView::serializeTo( QDataStream& s) const | ||
57 | { | ||
58 | qDebug( "serializing MScanListView" ); | ||
59 | OListView::serializeTo( s ); | ||
60 | } | ||
61 | |||
62 | void MScanListView::serializeFrom( QDataStream& s) | ||
63 | { | ||
64 | qDebug( "serializing MScanListView" ); | ||
65 | OListView::serializeFrom( s ); | ||
66 | } | ||
67 | |||
58 | void MScanListView::setManufacturerDB( ManufacturerDB* manufacturerdb ) | 68 | void MScanListView::setManufacturerDB( ManufacturerDB* manufacturerdb ) |
59 | { | 69 | { |
60 | _manufacturerdb = manufacturerdb; | 70 | _manufacturerdb = manufacturerdb; |
61 | } | 71 | } |
62 | 72 | ||
63 | void MScanListView::addNewItem( QString type, QString essid, QString macaddr, bool wep, int channel, int signal ) | 73 | void MScanListView::addNewItem( QString type, QString essid, QString macaddr, bool wep, int channel, int signal ) |
64 | { | 74 | { |
65 | // FIXME: scanlistitem needs a proper encapsulation and not such a damn dealing with text(...) | 75 | // FIXME: scanlistitem needs a proper encapsulation and not such a damn dealing with text(...) |
66 | 76 | ||
67 | qDebug( "MScanList::addNewItem( %s / %s / %s [%d]", | 77 | qDebug( "MScanList::addNewItem( %s / %s / %s [%d]", |
68 | (const char*) type, | 78 | (const char*) type, |
69 | (const char*) essid, | 79 | (const char*) essid, |
70 | (const char*) macaddr, | 80 | (const char*) macaddr, |
71 | channel ); | 81 | channel ); |
72 | 82 | ||
73 | // search, if we already have seen this net | 83 | // search, if we already have seen this net |
74 | 84 | ||
75 | QString s; | 85 | QString s; |
76 | MScanListItem* network; | 86 | MScanListItem* network; |
77 | MScanListItem* item = static_cast<MScanListItem*> ( firstChild() ); | 87 | MScanListItem* item = static_cast<MScanListItem*> ( firstChild() ); |
78 | 88 | ||
79 | while ( item && ( item->text( 0 ) != essid ) ) | 89 | while ( item && ( item->text( 0 ) != essid ) ) |
80 | { | 90 | { |
81 | qDebug( "itemtext: %s", (const char*) item->text( 0 ) ); | 91 | qDebug( "itemtext: %s", (const char*) item->text( 0 ) ); |
82 | item = static_cast<MScanListItem*> ( item->itemBelow() ); | 92 | item = static_cast<MScanListItem*> ( item->itemBelow() ); |
83 | } | 93 | } |
84 | if ( item ) | 94 | if ( item ) |
85 | { | 95 | { |
86 | // animate the item | 96 | // animate the item |
@@ -89,40 +99,40 @@ void MScanListView::addNewItem( QString type, QString essid, QString macaddr, bo | |||
89 | 99 | ||
90 | const QPixmap* pixmap = item->pixmap( 0 ); | 100 | const QPixmap* pixmap = item->pixmap( 0 ); |
91 | const QPixmap* nextpixmap = ani2; | 101 | const QPixmap* nextpixmap = ani2; |
92 | if ( pixmap == ani1 ) | 102 | if ( pixmap == ani1 ) |
93 | nextpixmap = ani2; | 103 | nextpixmap = ani2; |
94 | else if ( pixmap == ani2 ) | 104 | else if ( pixmap == ani2 ) |
95 | nextpixmap = ani3; | 105 | nextpixmap = ani3; |
96 | else if ( pixmap == ani3 ) | 106 | else if ( pixmap == ani3 ) |
97 | nextpixmap = ani4; | 107 | nextpixmap = ani4; |
98 | else if ( pixmap == ani4 ) | 108 | else if ( pixmap == ani4 ) |
99 | nextpixmap = ani1; | 109 | nextpixmap = ani1; |
100 | item->setPixmap( 0, *nextpixmap ); */ | 110 | item->setPixmap( 0, *nextpixmap ); */ |
101 | 111 | ||
102 | //qDebug( "current pixmap %d, next %d", pixmap, nextpixmap ); | 112 | //qDebug( "current pixmap %d, next %d", pixmap, nextpixmap ); |
103 | 113 | ||
104 | // we have already seen this net, check all childs if MAC exists | 114 | // we have already seen this net, check all childs if MAC exists |
105 | 115 | ||
106 | network = item; | 116 | network = item; |
107 | 117 | ||
108 | item = static_cast<MScanListItem*> ( item->firstChild() ); | 118 | item = static_cast<MScanListItem*> ( item->firstChild() ); |
109 | assert( item ); // this shouldn't fail | 119 | assert( item ); // this shouldn't fail |
110 | 120 | ||
111 | while ( item && ( item->text( 2 ) != macaddr ) ) | 121 | while ( item && ( item->text( 2 ) != macaddr ) ) |
112 | { | 122 | { |
113 | qDebug( "subitemtext: %s", (const char*) item->text( 2 ) ); | 123 | qDebug( "subitemtext: %s", (const char*) item->text( 2 ) ); |
114 | item = static_cast<MScanListItem*> ( item->itemBelow() ); | 124 | item = static_cast<MScanListItem*> ( item->itemBelow() ); |
115 | } | 125 | } |
116 | 126 | ||
117 | if ( item ) | 127 | if ( item ) |
118 | { | 128 | { |
119 | // we have already seen this item, it's a dupe | 129 | // we have already seen this item, it's a dupe |
120 | #ifdef DEBUG | 130 | #ifdef DEBUG |
121 | qDebug( "%s is a dupe - ignoring...", (const char*) macaddr ); | 131 | qDebug( "%s is a dupe - ignoring...", (const char*) macaddr ); |
122 | #endif | 132 | #endif |
123 | item->receivedBeacon(); | 133 | item->receivedBeacon(); |
124 | return; | 134 | return; |
125 | } | 135 | } |
126 | } | 136 | } |
127 | else | 137 | else |
128 | { | 138 | { |
@@ -144,24 +154,110 @@ void MScanListView::addNewItem( QString type, QString essid, QString macaddr, bo | |||
144 | 154 | ||
145 | if ( type == "managed" ) | 155 | if ( type == "managed" ) |
146 | { | 156 | { |
147 | s.sprintf( "(i) new AP in '%s' [%d]", (const char*) essid, channel ); | 157 | s.sprintf( "(i) new AP in '%s' [%d]", (const char*) essid, channel ); |
148 | } | 158 | } |
149 | else | 159 | else |
150 | { | 160 | { |
151 | s.sprintf( "(i) new adhoc station in '%s' [%d]", (const char*) essid, channel ); | 161 | s.sprintf( "(i) new adhoc station in '%s' [%d]", (const char*) essid, channel ); |
152 | } | 162 | } |
153 | 163 | ||
154 | } | 164 | } |
155 | 165 | ||
156 | void MScanListView::dump( QTextStream& t ) const | 166 | #ifdef QWS |
167 | #include <qpe/resource.h> | ||
168 | #else | ||
169 | #include "resource.h" | ||
170 | #endif | ||
171 | |||
172 | const int col_type = 0; | ||
173 | const int col_essid = 0; | ||
174 | const int col_sig = 1; | ||
175 | const int col_ap = 2; | ||
176 | const int col_channel = 3; | ||
177 | const int col_wep = 4; | ||
178 | const int col_traffic = 5; | ||
179 | const int col_manuf = 6; | ||
180 | const int col_firstseen = 7; | ||
181 | const int col_lastseen = 8; | ||
182 | |||
183 | MScanListItem::MScanListItem( QListView* parent, QString type, QString essid, QString macaddr, | ||
184 | bool wep, int channel, int signal ) | ||
185 | :OListViewItem( parent, essid, QString::null, macaddr, QString::null, QString::null ), | ||
186 | _type( type ), _essid( essid ), _macaddr( macaddr ), _wep( wep ), | ||
187 | _channel( channel ), _signal( signal ), _beacons( 0 ) | ||
157 | { | 188 | { |
158 | qDebug( "dumping scanlist..." ); | 189 | qDebug( "creating scanlist item" ); |
190 | decorateItem( type, essid, macaddr, wep, channel, signal ); | ||
191 | } | ||
159 | 192 | ||
160 | QListViewItemIterator it( const_cast<MScanListView*>( this ) ); | 193 | MScanListItem::MScanListItem( QListViewItem* parent, QString type, QString essid, QString macaddr, |
161 | for ( ; it.current(); ++it ) | 194 | bool wep, int channel, int signal ) |
162 | { | 195 | :OListViewItem( parent, essid, QString::null, macaddr, QString::null, QString::null ) |
163 | static_cast<MScanListItem*>( it.current() )->dump( t ); | 196 | { |
164 | } | 197 | qDebug( "creating scanlist item" ); |
198 | decorateItem( type, essid, macaddr, wep, channel, signal ); | ||
199 | } | ||
165 | 200 | ||
166 | qDebug( "dump finished." ); | 201 | void MScanListItem::serializeTo( QDataStream& s ) const |
202 | { | ||
203 | OListViewItem::serializeTo( s ); | ||
204 | } | ||
205 | |||
206 | void MScanListItem::serializeFrom( QDataStream& s ) | ||
207 | { | ||
208 | OListViewItem::serializeFrom( s ); | ||
167 | } | 209 | } |
210 | |||
211 | void MScanListItem::decorateItem( QString type, QString essid, QString macaddr, bool wep, int channel, int signal ) | ||
212 | { | ||
213 | qDebug( "decorating scanlist item %s / %s / %s [%d]", | ||
214 | (const char*) type, | ||
215 | (const char*) essid, | ||
216 | (const char*) macaddr, | ||
217 | channel ); | ||
218 | |||
219 | // set icon for managed or adhoc mode | ||
220 | QString name; | ||
221 | name.sprintf( "wellenreiter/%s", (const char*) type ); | ||
222 | setPixmap( col_type, Resource::loadPixmap( name ) ); | ||
223 | |||
224 | // set icon for wep (wireless encryption protocol) | ||
225 | if ( wep ) | ||
226 | setPixmap( col_wep, Resource::loadPixmap( "wellenreiter/cracked" ) ); //FIXME: rename the pixmap! | ||
227 | |||
228 | // set channel and signal text | ||
229 | |||
230 | if ( signal != -1 ) | ||
231 | setText( col_sig, QString::number( signal ) ); | ||
232 | if ( channel != -1 ) | ||
233 | setText( col_channel, QString::number( channel ) ); | ||
234 | |||
235 | setText( col_firstseen, QTime::currentTime().toString() ); | ||
236 | //setText( col_lastseen, QTime::currentTime().toString() ); | ||
237 | |||
238 | listView()->triggerUpdate(); | ||
239 | |||
240 | this->type = type; | ||
241 | _type = type; | ||
242 | _essid = essid; | ||
243 | _macaddr = macaddr; | ||
244 | _channel = channel; | ||
245 | _beacons = 0; | ||
246 | _signal = 0; | ||
247 | } | ||
248 | |||
249 | void MScanListItem::setManufacturer( const QString& manufacturer ) | ||
250 | { | ||
251 | setText( col_manuf, manufacturer ); | ||
252 | } | ||
253 | |||
254 | void MScanListItem::receivedBeacon() | ||
255 | { | ||
256 | _beacons++; | ||
257 | #ifdef DEBUG | ||
258 | qDebug( "MScanListItem %s: received beacon #%d", (const char*) _macaddr, _beacons ); | ||
259 | #endif | ||
260 | setText( col_sig, QString::number( _beacons ) ); | ||
261 | setText( col_lastseen, QTime::currentTime().toString() ); | ||
262 | } | ||
263 | |||
diff --git a/noncore/net/wellenreiter/gui/scanlist.h b/noncore/net/wellenreiter/gui/scanlist.h index f06f251..66c701b 100644 --- a/noncore/net/wellenreiter/gui/scanlist.h +++ b/noncore/net/wellenreiter/gui/scanlist.h | |||
@@ -23,24 +23,97 @@ | |||
23 | class QString; | 23 | class QString; |
24 | class ManufacturerDB; | 24 | class ManufacturerDB; |
25 | 25 | ||
26 | class MScanListView: public OListView | 26 | class MScanListView: public OListView |
27 | { | 27 | { |
28 | Q_OBJECT | 28 | Q_OBJECT |
29 | 29 | ||
30 | public: | 30 | public: |
31 | MScanListView( QWidget* parent = 0, const char* name = 0 ); | 31 | MScanListView( QWidget* parent = 0, const char* name = 0 ); |
32 | virtual ~MScanListView(); | 32 | virtual ~MScanListView(); |
33 | 33 | ||
34 | void setManufacturerDB( ManufacturerDB* manufacturerdb ); | 34 | void setManufacturerDB( ManufacturerDB* manufacturerdb ); |
35 | void dump( QTextStream& t ) const; | 35 | |
36 | virtual void serializeTo( QDataStream& s ) const; | ||
37 | virtual void serializeFrom( QDataStream& s ); | ||
36 | 38 | ||
37 | public slots: | 39 | public slots: |
38 | void addNewItem( QString type, QString essid, QString macaddr, bool wep, int channel, int signal ); | 40 | void addNewItem( QString type, QString essid, QString macaddr, bool wep, int channel, int signal ); |
39 | 41 | ||
40 | private: | 42 | private: |
41 | ManufacturerDB* _manufacturerdb; | 43 | ManufacturerDB* _manufacturerdb; |
42 | 44 | ||
43 | }; | 45 | }; |
44 | 46 | ||
47 | //****************************** MScanListItem **************************************************************** | ||
48 | |||
49 | class MScanListItem: public OListViewItem | ||
50 | { | ||
51 | public: | ||
52 | MScanListItem::MScanListItem( QListView* parent, | ||
53 | QString type, | ||
54 | QString essid, | ||
55 | QString macaddr, | ||
56 | bool wep, | ||
57 | int channel, | ||
58 | int signal ); | ||
59 | |||
60 | MScanListItem::MScanListItem( QListViewItem* parent, | ||
61 | QString type, | ||
62 | QString essid, | ||
63 | QString macaddr, | ||
64 | bool wep, | ||
65 | int channel, | ||
66 | int signal ); | ||
67 | |||
68 | |||
69 | protected: | ||
70 | virtual void decorateItem( QString type, QString essid, QString macaddr, bool wep, int channel, int signal ); | ||
71 | |||
72 | public: | ||
73 | QString type; | ||
74 | |||
75 | public: | ||
76 | //const QString& type() { return _type; }; | ||
77 | const QString& essid() { return _essid; }; | ||
78 | const QString& macaddr() { return _macaddr; }; | ||
79 | bool wep() { return _wep; }; | ||
80 | int channel() { return _channel; }; | ||
81 | int signal() { return _signal; }; | ||
82 | int beacons() { return _beacons; }; | ||
83 | |||
84 | void setSignal( int signal ) { /* TODO */ }; | ||
85 | void receivedBeacon(); | ||
86 | |||
87 | void setManufacturer( const QString& manufacturer ); | ||
88 | |||
89 | virtual void serializeTo( QDataStream& s ) const; | ||
90 | virtual void serializeFrom( QDataStream& s ); | ||
91 | |||
92 | private: | ||
93 | QString _type; | ||
94 | QString _essid; | ||
95 | QString _macaddr; | ||
96 | bool _wep; | ||
97 | int _channel; | ||
98 | int _signal; | ||
99 | int _beacons; | ||
100 | |||
101 | }; | ||
102 | |||
103 | //****************************** MScanListViewFactory **************************************************************** | ||
104 | |||
105 | /* | ||
106 | |||
107 | class MScanListViewFactory : public OListViewFactory | ||
108 | { | ||
109 | public: | ||
110 | virtual QListView* listViewFactory(); | ||
111 | virtual QListViewItem* listViewItemFactory( QListView* lv ); | ||
112 | virtual QListViewItem* listViewItemFactory( QListViewItem* lvi ); | ||
113 | virtual void setColumnText( int depth, QListViewItem* lvi, int column, const QString& text ); | ||
114 | virtual void setCustomData( int depth, QListViewItem* lvi, const QString& text ); | ||
115 | } | ||
116 | */ | ||
117 | |||
45 | #endif | 118 | #endif |
46 | 119 | ||
diff --git a/noncore/net/wellenreiter/gui/scanlistitem.cpp b/noncore/net/wellenreiter/gui/scanlistitem.cpp deleted file mode 100644 index 4aecd2b..0000000 --- a/noncore/net/wellenreiter/gui/scanlistitem.cpp +++ b/dev/null | |||
@@ -1,121 +0,0 @@ | |||
1 | /********************************************************************** | ||
2 | ** Copyright (C) 2002 Michael 'Mickey' Lauer. All rights reserved. | ||
3 | ** | ||
4 | ** This file is part of Opie Environment. | ||
5 | ** | ||
6 | ** This file may be distributed and/or modified under the terms of the | ||
7 | ** GNU General Public License version 2 as published by the Free Software | ||
8 | ** Foundation and appearing in the file LICENSE.GPL included in the | ||
9 | ** packaging of this file. | ||
10 | ** | ||
11 | ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE | ||
12 | ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. | ||
13 | ** | ||
14 | **********************************************************************/ | ||
15 | |||
16 | #include "scanlistitem.h" | ||
17 | #include <assert.h> | ||
18 | #include <qdatetime.h> | ||
19 | #include <qpixmap.h> | ||
20 | |||
21 | #ifdef QWS | ||
22 | #include <qpe/resource.h> | ||
23 | #else | ||
24 | #include "resource.h" | ||
25 | #endif | ||
26 | |||
27 | const int col_type = 0; | ||
28 | const int col_essid = 0; | ||
29 | const int col_sig = 1; | ||
30 | const int col_ap = 2; | ||
31 | const int col_channel = 3; | ||
32 | const int col_wep = 4; | ||
33 | const int col_traffic = 5; | ||
34 | const int col_manuf = 6; | ||
35 | const int col_firstseen = 7; | ||
36 | const int col_lastseen = 8; | ||
37 | |||
38 | MScanListItem::MScanListItem( QListView* parent, QString type, QString essid, QString macaddr, | ||
39 | bool wep, int channel, int signal ) | ||
40 | :OListViewItem( parent, essid, QString::null, macaddr, QString::null, QString::null ), | ||
41 | _type( type ), _essid( essid ), _macaddr( macaddr ), _wep( wep ), | ||
42 | _channel( channel ), _signal( signal ), _beacons( 0 ) | ||
43 | { | ||
44 | qDebug( "creating scanlist item" ); | ||
45 | decorateItem( type, essid, macaddr, wep, channel, signal ); | ||
46 | } | ||
47 | |||
48 | MScanListItem::MScanListItem( QListViewItem* parent, QString type, QString essid, QString macaddr, | ||
49 | bool wep, int channel, int signal ) | ||
50 | :OListViewItem( parent, essid, QString::null, macaddr, QString::null, QString::null ) | ||
51 | { | ||
52 | qDebug( "creating scanlist item" ); | ||
53 | decorateItem( type, essid, macaddr, wep, channel, signal ); | ||
54 | } | ||
55 | |||
56 | void MScanListItem::decorateItem( QString type, QString essid, QString macaddr, bool wep, int channel, int signal ) | ||
57 | { | ||
58 | qDebug( "decorating scanlist item %s / %s / %s [%d]", | ||
59 | (const char*) type, | ||
60 | (const char*) essid, | ||
61 | (const char*) macaddr, | ||
62 | channel ); | ||
63 | |||
64 | // set icon for managed or adhoc mode | ||
65 | QString name; | ||
66 | name.sprintf( "wellenreiter/%s", (const char*) type ); | ||
67 | setPixmap( col_type, Resource::loadPixmap( name ) ); | ||
68 | |||
69 | // set icon for wep (wireless encryption protocol) | ||
70 | if ( wep ) | ||
71 | setPixmap( col_wep, Resource::loadPixmap( "wellenreiter/cracked" ) ); //FIXME: rename the pixmap! | ||
72 | |||
73 | // set channel and signal text | ||
74 | |||
75 | if ( signal != -1 ) | ||
76 | setText( col_sig, QString::number( signal ) ); | ||
77 | if ( channel != -1 ) | ||
78 | setText( col_channel, QString::number( channel ) ); | ||
79 | |||
80 | setText( col_firstseen, QTime::currentTime().toString() ); | ||
81 | //setText( col_lastseen, QTime::currentTime().toString() ); | ||
82 | |||
83 | listView()->triggerUpdate(); | ||
84 | |||
85 | this->type = type; | ||
86 | _type = type; | ||
87 | _essid = essid; | ||
88 | _macaddr = macaddr; | ||
89 | _channel = channel; | ||
90 | _beacons = 0; | ||
91 | _signal = 0; | ||
92 | } | ||
93 | |||
94 | void MScanListItem::setManufacturer( const QString& manufacturer ) | ||
95 | { | ||
96 | setText( col_manuf, manufacturer ); | ||
97 | } | ||
98 | |||
99 | void MScanListItem::receivedBeacon() | ||
100 | { | ||
101 | _beacons++; | ||
102 | #ifdef DEBUG | ||
103 | qDebug( "MScanListItem %s: received beacon #%d", (const char*) _macaddr, _beacons ); | ||
104 | #endif | ||
105 | setText( col_sig, QString::number( _beacons ) ); | ||
106 | setText( col_lastseen, QTime::currentTime().toString() ); | ||
107 | } | ||
108 | |||
109 | void MScanListItem::dump( QTextStream& t ) const | ||
110 | { | ||
111 | qDebug( "dumping scanlistitem at <%d>", this ); | ||
112 | t << "<ITEM type=" << _type; | ||
113 | t << " ESSID='" << _essid; | ||
114 | t << "' MAC=" << _macaddr; | ||
115 | t << " WEP=" << _wep; | ||
116 | t << " CHANNEL=" << _channel; | ||
117 | t << " SIGNAL=" << _signal; | ||
118 | t << " BEACONS=" << _beacons; | ||
119 | t << ">\n"; | ||
120 | } | ||
121 | |||
diff --git a/noncore/net/wellenreiter/gui/scanlistitem.h b/noncore/net/wellenreiter/gui/scanlistitem.h deleted file mode 100644 index 5f6ae40..0000000 --- a/noncore/net/wellenreiter/gui/scanlistitem.h +++ b/dev/null | |||
@@ -1,83 +0,0 @@ | |||
1 | /********************************************************************** | ||
2 | ** Copyright (C) 2002 Michael 'Mickey' Lauer. All rights reserved. | ||
3 | ** | ||
4 | ** This file is part of Opie Environment. | ||
5 | ** | ||
6 | ** This file may be distributed and/or modified under the terms of the | ||
7 | ** GNU General Public License version 2 as published by the Free Software | ||
8 | ** Foundation and appearing in the file LICENSE.GPL included in the | ||
9 | ** packaging of this file. | ||
10 | ** | ||
11 | ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE | ||
12 | ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. | ||
13 | ** | ||
14 | **********************************************************************/ | ||
15 | |||
16 | #ifndef SCANLISTITEM_H | ||
17 | #define SCANLISTITEM_H | ||
18 | |||
19 | #include <cornucopia/olistview.h> | ||
20 | |||
21 | #include <qtextstream.h> | ||
22 | |||
23 | class QString; | ||
24 | |||
25 | class MScanListItem: public OListViewItem | ||
26 | { | ||
27 | public: | ||
28 | |||
29 | MScanListItem::MScanListItem( QListView* parent, | ||
30 | QString type, | ||
31 | QString essid, | ||
32 | QString macaddr, | ||
33 | bool wep, | ||
34 | int channel, | ||
35 | int signal ); | ||
36 | |||
37 | MScanListItem::MScanListItem( QListViewItem* parent, | ||
38 | QString type, | ||
39 | QString essid, | ||
40 | QString macaddr, | ||
41 | bool wep, | ||
42 | int channel, | ||
43 | int signal ); | ||
44 | |||
45 | |||
46 | protected: | ||
47 | |||
48 | virtual void decorateItem( QString type, QString essid, QString macaddr, bool wep, int channel, int signal ); | ||
49 | |||
50 | public: | ||
51 | |||
52 | QString type; | ||
53 | |||
54 | public: | ||
55 | |||
56 | //const QString& type() { return _type; }; | ||
57 | const QString& essid() { return _essid; }; | ||
58 | const QString& macaddr() { return _macaddr; }; | ||
59 | bool wep() { return _wep; }; | ||
60 | int channel() { return _channel; }; | ||
61 | int signal() { return _signal; }; | ||
62 | int beacons() { return _beacons; }; | ||
63 | |||
64 | void setSignal( int signal ) { /* TODO */ }; | ||
65 | void receivedBeacon(); | ||
66 | |||
67 | void setManufacturer( const QString& manufacturer ); | ||
68 | |||
69 | void dump( QTextStream& t ) const; | ||
70 | |||
71 | private: | ||
72 | QString _type; | ||
73 | QString _essid; | ||
74 | QString _macaddr; | ||
75 | bool _wep; | ||
76 | int _channel; | ||
77 | int _signal; | ||
78 | int _beacons; | ||
79 | |||
80 | }; | ||
81 | |||
82 | #endif | ||
83 | |||
diff --git a/noncore/net/wellenreiter/gui/wellenreiter.cpp b/noncore/net/wellenreiter/gui/wellenreiter.cpp index 1ccf971..dd8a365 100644 --- a/noncore/net/wellenreiter/gui/wellenreiter.cpp +++ b/noncore/net/wellenreiter/gui/wellenreiter.cpp | |||
@@ -114,29 +114,37 @@ Wellenreiter::Wellenreiter( QWidget* parent ) | |||
114 | netview->setColumnWidthMode( 1, QListView::Manual ); | 114 | netview->setColumnWidthMode( 1, QListView::Manual ); |
115 | 115 | ||
116 | if ( manufacturerdb ) | 116 | if ( manufacturerdb ) |
117 | netview->setManufacturerDB( manufacturerdb ); | 117 | netview->setManufacturerDB( manufacturerdb ); |
118 | 118 | ||
119 | } | 119 | } |
120 | 120 | ||
121 | Wellenreiter::~Wellenreiter() | 121 | Wellenreiter::~Wellenreiter() |
122 | { | 122 | { |
123 | // no need to delete child widgets, Qt does it all for us | 123 | // no need to delete child widgets, Qt does it all for us |
124 | 124 | ||
125 | delete manufacturerdb; | 125 | delete manufacturerdb; |
126 | |||
127 | // X11-only - Hmm... Closing the socket here segfaults on exit, | ||
128 | // Maybe because the notifier still has a handle to it!? Seems not to | ||
129 | // occur on Qt/Embedded | ||
130 | |||
131 | #ifdef QWS | ||
126 | if ( daemon_fd != -1 ) | 132 | if ( daemon_fd != -1 ) |
127 | { | 133 | { |
128 | qDebug( "closing comm socket" ); | 134 | qDebug( "closing comm socket" ); |
129 | close( daemon_fd ); | 135 | close( daemon_fd ); |
130 | } | 136 | } |
137 | #endif | ||
138 | |||
131 | } | 139 | } |
132 | 140 | ||
133 | void Wellenreiter::setConfigWindow( WellenreiterConfigWindow* cw ) | 141 | void Wellenreiter::setConfigWindow( WellenreiterConfigWindow* cw ) |
134 | { | 142 | { |
135 | configwindow = cw; | 143 | configwindow = cw; |
136 | } | 144 | } |
137 | 145 | ||
138 | void Wellenreiter::handleMessage() | 146 | void Wellenreiter::handleMessage() |
139 | { | 147 | { |
140 | // FIXME: receive message and handle it | 148 | // FIXME: receive message and handle it |
141 | 149 | ||
142 | qDebug( "received message from daemon." ); | 150 | qDebug( "received message from daemon." ); |