-rw-r--r-- | ChangeLog | 1 | ||||
-rw-r--r-- | noncore/net/wellenreiter/gui/packetview.cpp | 7 |
2 files changed, 6 insertions, 2 deletions
@@ -1,42 +1,43 @@ | |||
1 | 2005-??-??Opie 1.2.2 | 1 | 2005-??-??Opie 1.2.2 |
2 | 2 | ||
3 | 3 | ||
4 | New Features | 4 | New Features |
5 | ------------ | 5 | ------------ |
6 | 6 | ||
7 | 7 | ||
8 | Fixed Bugs | 8 | Fixed Bugs |
9 | ---------- | 9 | ---------- |
10 | * #1695 - Date selector use too small fontsize on VGA screen (hrw) | 10 | * #1695 - Date selector use too small fontsize on VGA screen (hrw) |
11 | * n.a. - remove hardcoded font size from wellenreiter (hrw) | ||
11 | 12 | ||
12 | 2005-09-11Opie 1.2.1 | 13 | 2005-09-11Opie 1.2.1 |
13 | 14 | ||
14 | 15 | ||
15 | New Features | 16 | New Features |
16 | ------------ | 17 | ------------ |
17 | * OpieStumbler: Scans WiFi networks using the wireless extension scanning (skyhusker) | 18 | * OpieStumbler: Scans WiFi networks using the wireless extension scanning (skyhusker) |
18 | * Opie-Reader: Support for document formats ArriereGo and Reb, add flite output (tim,pohly) | 19 | * Opie-Reader: Support for document formats ArriereGo and Reb, add flite output (tim,pohly) |
19 | * Opie-Networksettings: Add support for wlan-ng devices and improve WEP handling (Dirk Opfer) | 20 | * Opie-Networksettings: Add support for wlan-ng devices and improve WEP handling (Dirk Opfer) |
20 | * Wellenreiter: Remove Joining networks - use OpieStumbler for that (mickeyl) | 21 | * Wellenreiter: Remove Joining networks - use OpieStumbler for that (mickeyl) |
21 | * Opie-Mobilemsg has gone unsupported - it never really worked and there will be a replacement (mickeyl) | 22 | * Opie-Mobilemsg has gone unsupported - it never really worked and there will be a replacement (mickeyl) |
22 | * Opie-Tabmanager has gone unsupported - it barely works and there is not much of a use of it anyway (mickeyl) | 23 | * Opie-Tabmanager has gone unsupported - it barely works and there is not much of a use of it anyway (mickeyl) |
23 | * Checkbook: Added configuration option to use smaller font for checkbook transaction tab (hrw) | 24 | * Checkbook: Added configuration option to use smaller font for checkbook transaction tab (hrw) |
24 | * ZSafe: Made UI conform to Opie standards (drw) | 25 | * ZSafe: Made UI conform to Opie standards (drw) |
25 | * Today Addressbook plugin: Fixed configuration to show/not show birthdays, use checkboxes for selection (hrw) | 26 | * Today Addressbook plugin: Fixed configuration to show/not show birthdays, use checkboxes for selection (hrw) |
26 | * Opie-Console: Read initial fixed font configuration from qpe.conf (mickeyl) | 27 | * Opie-Console: Read initial fixed font configuration from qpe.conf (mickeyl) |
27 | * Opie-PcmciaApplet: Configure insert/resume actions and bind unsupported cards (mickeyl) | 28 | * Opie-PcmciaApplet: Configure insert/resume actions and bind unsupported cards (mickeyl) |
28 | * SysInfo: Remove CPU tab and add Devices tab instead (mickeyl) | 29 | * SysInfo: Remove CPU tab and add Devices tab instead (mickeyl) |
29 | * Opie-smb: Added Opie front end for Samba (ljp) | 30 | * Opie-smb: Added Opie front end for Samba (ljp) |
30 | * Opie-Bluetooth: Replace obex send implementation and patch libopieobex and the bluetoothapplet (Michael Haynie) | 31 | * Opie-Bluetooth: Replace obex send implementation and patch libopieobex and the bluetoothapplet (Michael Haynie) |
31 | * Opieplayer: rudimentary podcast support (ljp) | 32 | * Opieplayer: rudimentary podcast support (ljp) |
32 | 33 | ||
33 | Fixed Bugs | 34 | Fixed Bugs |
34 | ---------- | 35 | ---------- |
35 | * #1377 - Suspend Powermanagement when switched to another VT (mickeyl) | 36 | * #1377 - Suspend Powermanagement when switched to another VT (mickeyl) |
36 | - We actually suspend the complete Opie now in that case. | 37 | - We actually suspend the complete Opie now in that case. |
37 | * #1384 - Battery status updated improperly when charging (skyhusker) | 38 | * #1384 - Battery status updated improperly when charging (skyhusker) |
38 | * #1476 - Wrong order of application entries in the O-menu (skyhusker) | 39 | * #1476 - Wrong order of application entries in the O-menu (skyhusker) |
39 | * #1514 - Remove usage of cardmon/pcmcia picture in applications. pcmcia is now an inline picture (mickeyl) | 40 | * #1514 - Remove usage of cardmon/pcmcia picture in applications. pcmcia is now an inline picture (mickeyl) |
40 | * #1535- Missing line break and unnecessary location shown with Today-Calendar plugin (deller) | 41 | * #1535- Missing line break and unnecessary location shown with Today-Calendar plugin (deller) |
41 | * #1543 - Time Settings: "predict" tab is displayed twice after reopen (hrw) | 42 | * #1543 - Time Settings: "predict" tab is displayed twice after reopen (hrw) |
42 | * #1546 - Battery applet popup is not always large enough to show jacket remaining info (skyhusker) | 43 | * #1546 - Battery applet popup is not always large enough to show jacket remaining info (skyhusker) |
diff --git a/noncore/net/wellenreiter/gui/packetview.cpp b/noncore/net/wellenreiter/gui/packetview.cpp index d71111f..ffe2f01 100644 --- a/noncore/net/wellenreiter/gui/packetview.cpp +++ b/noncore/net/wellenreiter/gui/packetview.cpp | |||
@@ -1,86 +1,89 @@ | |||
1 | /********************************************************************** | 1 | /********************************************************************** |
2 | ** Copyright (C) 2002-2004 Michael 'Mickey' Lauer. All rights reserved. | 2 | ** Copyright (C) 2002-2004 Michael 'Mickey' Lauer. All rights reserved. |
3 | ** | 3 | ** |
4 | ** This file is part of Wellenreiter II. | 4 | ** This file is part of Wellenreiter II. |
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 "packetview.h" | 16 | #include "packetview.h" |
17 | 17 | ||
18 | /* OPIE */ | 18 | /* OPIE */ |
19 | #include <opie2/opcap.h> | 19 | #include <opie2/opcap.h> |
20 | #include <opie2/odebug.h> | 20 | #include <opie2/odebug.h> |
21 | #include <opie2/olistview.h> | 21 | #include <opie2/olistview.h> |
22 | #include <opie2/oapplication.h> | 22 | #include <opie2/oapplication.h> |
23 | #include <qpe/config.h> | ||
23 | 24 | ||
24 | /* QT */ | 25 | /* QT */ |
25 | #include <qfont.h> | 26 | #include <qfont.h> |
26 | #include <qlabel.h> | 27 | #include <qlabel.h> |
27 | #include <qlayout.h> | 28 | #include <qlayout.h> |
28 | #include <qlist.h> | 29 | #include <qlist.h> |
29 | #include <qlistview.h> | 30 | #include <qlistview.h> |
30 | #include <qobjectlist.h> | 31 | #include <qobjectlist.h> |
31 | #include <qspinbox.h> | 32 | #include <qspinbox.h> |
32 | #include <qtextview.h> | 33 | #include <qtextview.h> |
33 | 34 | ||
34 | using namespace Opie::Net; | 35 | using namespace Opie::Net; |
35 | using namespace Opie::Core; | 36 | using namespace Opie::Core; |
36 | using namespace Opie::Ui; | 37 | using namespace Opie::Ui; |
37 | 38 | ||
38 | PacketView::PacketView( QWidget * parent, const char * name, WFlags f ) | 39 | PacketView::PacketView( QWidget * parent, const char * name, WFlags f ) |
39 | :QFrame( parent, name, f ) | 40 | :QFrame( parent, name, f ) |
40 | { | 41 | { |
42 | Config c( "qpe" ); | ||
43 | c.setGroup( "Appearance" ); | ||
44 | |||
41 | _number = new QSpinBox( this ); | 45 | _number = new QSpinBox( this ); |
42 | _number->setPrefix( "Pkt# " ); | 46 | _number->setPrefix( "Pkt# " ); |
43 | _label = new QLabel( this ); | 47 | _label = new QLabel( this ); |
44 | _list = new OListView( this ); | 48 | _list = new OListView( this ); |
45 | _list->addColumn( "#" ); | 49 | _list->addColumn( "#" ); |
46 | _list->addColumn( "Packet Type" ); | 50 | _list->addColumn( "Packet Type" ); |
47 | _list->setColumnAlignment( 0, Qt::AlignCenter ); | 51 | _list->setColumnAlignment( 0, Qt::AlignCenter ); |
48 | _list->setColumnAlignment( 1, Qt::AlignLeft ); | 52 | _list->setColumnAlignment( 1, Qt::AlignLeft ); |
49 | _list->setAllColumnsShowFocus( true ); | 53 | _list->setAllColumnsShowFocus( true ); |
50 | _list->setFont( QFont( "Fixed", 8 ) ); | ||
51 | 54 | ||
52 | _hex = new QTextView( this ); | 55 | _hex = new QTextView( this ); |
53 | _hex->setMargin( 0 ); | 56 | _hex->setMargin( 0 ); |
54 | _hex->setFont( QFont( "Fixed", 8 ) ); | 57 | _hex->setFont( QFont( c.readEntry( "FixedFontFamily", "Fixed" ), c.readNumEntry( "FixedFontSize", 8 ) ) ); |
55 | 58 | ||
56 | QVBoxLayout* vb = new QVBoxLayout( this, 2, 2 ); | 59 | QVBoxLayout* vb = new QVBoxLayout( this, 2, 2 ); |
57 | QHBoxLayout* hb = new QHBoxLayout( vb, 2 ); | 60 | QHBoxLayout* hb = new QHBoxLayout( vb, 2 ); |
58 | hb->addWidget( _label, 5 ); | 61 | hb->addWidget( _label, 5 ); |
59 | hb->addWidget( _number, 2 ); | 62 | hb->addWidget( _number, 2 ); |
60 | vb->addWidget( _list, 3 ); | 63 | vb->addWidget( _list, 3 ); |
61 | vb->addWidget( _hex, 4 ); // allow a bit (4/3) more space | 64 | vb->addWidget( _hex, 4 ); // allow a bit (4/3) more space |
62 | 65 | ||
63 | _packets.setAutoDelete( true ); | 66 | _packets.setAutoDelete( true ); |
64 | 67 | ||
65 | connect( _number, SIGNAL( valueChanged( int ) ), this, SLOT( showPacket( int ) ) ); | 68 | connect( _number, SIGNAL( valueChanged( int ) ), this, SLOT( showPacket( int ) ) ); |
66 | connect( parent, SIGNAL( currentChanged( QWidget *) ), this, SLOT( activated( QWidget* ) ) ); | 69 | connect( parent, SIGNAL( currentChanged( QWidget *) ), this, SLOT( activated( QWidget* ) ) ); |
67 | 70 | ||
68 | clear(); | 71 | clear(); |
69 | 72 | ||
70 | } | 73 | } |
71 | 74 | ||
72 | void PacketView::add( const OPacket* p, int size ) | 75 | void PacketView::add( const OPacket* p, int size ) |
73 | { | 76 | { |
74 | /* | 77 | /* |
75 | * don't scroll away when somebody views packages | 78 | * don't scroll away when somebody views packages |
76 | * while scanning | 79 | * while scanning |
77 | */ | 80 | */ |
78 | int value = _number->value(); | 81 | int value = _number->value(); |
79 | bool last = (value == static_cast<int>( _packets.count() ) ); | 82 | bool last = (value == static_cast<int>( _packets.count() ) ); |
80 | 83 | ||
81 | odebug << "PacketView::add() size = " << size << oendl; | 84 | odebug << "PacketView::add() size = " << size << oendl; |
82 | if ( size == -1 ) // unlimited buffer | 85 | if ( size == -1 ) // unlimited buffer |
83 | { | 86 | { |
84 | _packets.append( p ); | 87 | _packets.append( p ); |
85 | } | 88 | } |
86 | else | 89 | else |