summaryrefslogtreecommitdiff
authorhrw <hrw>2005-09-16 20:31:28 (UTC)
committer hrw <hrw>2005-09-16 20:31:28 (UTC)
commit6fb2ee0976a4b6c67b9f0c59cfd5d85143208bd4 (patch) (unidiff)
tree3817ebb22724f7135d144ccede9891d7b07dee2e
parent12c40601c1abc01640a1d058b4ed781390eae372 (diff)
downloadopie-6fb2ee0976a4b6c67b9f0c59cfd5d85143208bd4.zip
opie-6fb2ee0976a4b6c67b9f0c59cfd5d85143208bd4.tar.gz
opie-6fb2ee0976a4b6c67b9f0c59cfd5d85143208bd4.tar.bz2
removed hardcoded font size from wellenreiter
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--ChangeLog1
-rw-r--r--noncore/net/wellenreiter/gui/packetview.cpp7
2 files changed, 6 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 3b0f1d9..ebd9d92 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,22 +1,23 @@
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)
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
@@ -11,56 +11,59 @@
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
34using namespace Opie::Net; 35using namespace Opie::Net;
35using namespace Opie::Core; 36using namespace Opie::Core;
36using namespace Opie::Ui; 37using namespace Opie::Ui;
37 38
38PacketView::PacketView( QWidget * parent, const char * name, WFlags f ) 39PacketView::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* ) ) );