summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/net/wellenreiter/gui/configbase.ui187
-rw-r--r--noncore/net/wellenreiter/gui/wellenreiterbase.cpp16
2 files changed, 158 insertions, 45 deletions
diff --git a/noncore/net/wellenreiter/gui/configbase.ui b/noncore/net/wellenreiter/gui/configbase.ui
index 113e783..3a1c258 100644
--- a/noncore/net/wellenreiter/gui/configbase.ui
+++ b/noncore/net/wellenreiter/gui/configbase.ui
@@ -1,38 +1,38 @@
1<!DOCTYPE UI><UI> 1<!DOCTYPE UI><UI>
2<class>WellenreiterConfigBase</class> 2<class>WellenreiterConfigBase</class>
3<widget> 3<widget>
4 <class>QDialog</class> 4 <class>QDialog</class>
5 <property stdset="1"> 5 <property stdset="1">
6 <name>name</name> 6 <name>name</name>
7 <cstring>WellenreiterConfigBase</cstring> 7 <cstring>WellenreiterConfigBase</cstring>
8 </property> 8 </property>
9 <property stdset="1"> 9 <property stdset="1">
10 <name>geometry</name> 10 <name>geometry</name>
11 <rect> 11 <rect>
12 <x>0</x> 12 <x>0</x>
13 <y>0</y> 13 <y>0</y>
14 <width>246</width> 14 <width>250</width>
15 <height>371</height> 15 <height>371</height>
16 </rect> 16 </rect>
17 </property> 17 </property>
18 <property stdset="1"> 18 <property stdset="1">
19 <name>caption</name> 19 <name>caption</name>
20 <string>Wellenreiter II COnfiguration Dialog</string> 20 <string>Wellenreiter II COnfiguration Dialog</string>
21 </property> 21 </property>
22 <property> 22 <property>
23 <name>layoutMargin</name> 23 <name>layoutMargin</name>
24 </property> 24 </property>
25 <property> 25 <property>
26 <name>layoutSpacing</name> 26 <name>layoutSpacing</name>
27 </property> 27 </property>
28 <grid> 28 <grid>
29 <property stdset="1"> 29 <property stdset="1">
30 <name>margin</name> 30 <name>margin</name>
31 <number>2</number> 31 <number>2</number>
32 </property> 32 </property>
33 <property stdset="1"> 33 <property stdset="1">
34 <name>spacing</name> 34 <name>spacing</name>
35 <number>3</number> 35 <number>3</number>
36 </property> 36 </property>
37 <widget row="0" column="0" > 37 <widget row="0" column="0" >
38 <class>QTabWidget</class> 38 <class>QTabWidget</class>
@@ -575,85 +575,48 @@
575 </widget> 575 </widget>
576 </grid> 576 </grid>
577 </widget> 577 </widget>
578 </vbox> 578 </vbox>
579 </widget> 579 </widget>
580 <widget> 580 <widget>
581 <class>QWidget</class> 581 <class>QWidget</class>
582 <property stdset="1"> 582 <property stdset="1">
583 <name>name</name> 583 <name>name</name>
584 <cstring>tab</cstring> 584 <cstring>tab</cstring>
585 </property> 585 </property>
586 <attribute> 586 <attribute>
587 <name>title</name> 587 <name>title</name>
588 <string>Capture</string> 588 <string>Capture</string>
589 </attribute> 589 </attribute>
590 <grid> 590 <grid>
591 <property stdset="1"> 591 <property stdset="1">
592 <name>margin</name> 592 <name>margin</name>
593 <number>5</number> 593 <number>5</number>
594 </property> 594 </property>
595 <property stdset="1"> 595 <property stdset="1">
596 <name>spacing</name> 596 <name>spacing</name>
597 <number>3</number> 597 <number>3</number>
598 </property> 598 </property>
599 <widget row="2" column="0" rowspan="1" colspan="3" >
600 <class>ProtocolListView</class>
601 <property stdset="1">
602 <name>name</name>
603 <cstring>capturePackets</cstring>
604 </property>
605 <property stdset="1">
606 <name>enabled</name>
607 <bool>false</bool>
608 </property>
609 <property stdset="1">
610 <name>sizePolicy</name>
611 <sizepolicy>
612 <hsizetype>7</hsizetype>
613 <vsizetype>7</vsizetype>
614 </sizepolicy>
615 </property>
616 </widget>
617 <widget row="1" column="0" rowspan="1" colspan="3" >
618 <class>QLineEdit</class>
619 <property stdset="1">
620 <name>name</name>
621 <cstring>captureFileName</cstring>
622 </property>
623 <property stdset="1">
624 <name>enabled</name>
625 <bool>false</bool>
626 </property>
627 <property stdset="1">
628 <name>text</name>
629 <string>/tmp/capture</string>
630 </property>
631 <property>
632 <name>whatsThis</name>
633 <string>Configure the name of the capture file.</string>
634 </property>
635 </widget>
636 <widget row="0" column="2" > 599 <widget row="0" column="2" >
637 <class>QToolButton</class> 600 <class>QToolButton</class>
638 <property stdset="1"> 601 <property stdset="1">
639 <name>name</name> 602 <name>name</name>
640 <cstring>getCaptureFileName</cstring> 603 <cstring>getCaptureFileName</cstring>
641 </property> 604 </property>
642 <property stdset="1"> 605 <property stdset="1">
643 <name>enabled</name> 606 <name>enabled</name>
644 <bool>false</bool> 607 <bool>false</bool>
645 </property> 608 </property>
646 <property stdset="1"> 609 <property stdset="1">
647 <name>text</name> 610 <name>text</name>
648 <string>Browse</string> 611 <string>Browse</string>
649 </property> 612 </property>
650 <property> 613 <property>
651 <name>whatsThis</name> 614 <name>whatsThis</name>
652 <string>Click to open a file requester to choose a capture file name.</string> 615 <string>Click to open a file requester to choose a capture file name.</string>
653 </property> 616 </property>
654 </widget> 617 </widget>
655 <spacer row="0" column="1" > 618 <spacer row="0" column="1" >
656 <property> 619 <property>
657 <name>name</name> 620 <name>name</name>
658 <cstring>Spacer2</cstring> 621 <cstring>Spacer2</cstring>
659 </property> 622 </property>
@@ -666,53 +629,195 @@
666 <enum>Expanding</enum> 629 <enum>Expanding</enum>
667 </property> 630 </property>
668 <property> 631 <property>
669 <name>sizeHint</name> 632 <name>sizeHint</name>
670 <size> 633 <size>
671 <width>20</width> 634 <width>20</width>
672 <height>20</height> 635 <height>20</height>
673 </size> 636 </size>
674 </property> 637 </property>
675 </spacer> 638 </spacer>
676 <widget row="0" column="0" > 639 <widget row="0" column="0" >
677 <class>QCheckBox</class> 640 <class>QCheckBox</class>
678 <property stdset="1"> 641 <property stdset="1">
679 <name>name</name> 642 <name>name</name>
680 <cstring>writeCaptureFile</cstring> 643 <cstring>writeCaptureFile</cstring>
681 </property> 644 </property>
682 <property stdset="1"> 645 <property stdset="1">
683 <name>enabled</name> 646 <name>enabled</name>
684 <bool>true</bool> 647 <bool>true</bool>
685 </property> 648 </property>
686 <property stdset="1"> 649 <property stdset="1">
687 <name>text</name> 650 <name>text</name>
688 <string>Write Capture Files To</string> 651 <string>Write Capture Files To</string>
689 </property> 652 </property>
653 <property stdset="1">
654 <name>checked</name>
655 <bool>true</bool>
656 </property>
690 <property> 657 <property>
691 <name>whatsThis</name> 658 <name>whatsThis</name>
692 <string>Check this to write an ethereal compatible capture file.</string> 659 <string>Check this to write an ethereal compatible capture file.</string>
693 </property> 660 </property>
694 </widget> 661 </widget>
662 <widget row="1" column="0" rowspan="1" colspan="3" >
663 <class>QLineEdit</class>
664 <property stdset="1">
665 <name>name</name>
666 <cstring>captureFileName</cstring>
667 </property>
668 <property stdset="1">
669 <name>enabled</name>
670 <bool>false</bool>
671 </property>
672 <property stdset="1">
673 <name>text</name>
674 <string>/tmp/capture</string>
675 </property>
676 <property>
677 <name>whatsThis</name>
678 <string>Configure the name of the capture file.</string>
679 </property>
680 </widget>
681 <widget row="2" column="0" rowspan="1" colspan="3" >
682 <class>ProtocolListView</class>
683 <property stdset="1">
684 <name>name</name>
685 <cstring>capturePackets</cstring>
686 </property>
687 <property stdset="1">
688 <name>enabled</name>
689 <bool>false</bool>
690 </property>
691 <property stdset="1">
692 <name>sizePolicy</name>
693 <sizepolicy>
694 <hsizetype>7</hsizetype>
695 <vsizetype>7</vsizetype>
696 </sizepolicy>
697 </property>
698 </widget>
699 <widget row="3" column="0" rowspan="1" colspan="3" >
700 <class>QButtonGroup</class>
701 <property stdset="1">
702 <name>name</name>
703 <cstring>ButtonGroup1</cstring>
704 </property>
705 <property stdset="1">
706 <name>title</name>
707 <string>Hex View Buffer</string>
708 </property>
709 <property stdset="1">
710 <name>exclusive</name>
711 <bool>true</bool>
712 </property>
713 <property>
714 <name>layoutMargin</name>
715 </property>
716 <property>
717 <name>layoutSpacing</name>
718 </property>
719 <grid>
720 <property stdset="1">
721 <name>margin</name>
722 <number>6</number>
723 </property>
724 <property stdset="1">
725 <name>spacing</name>
726 <number>1</number>
727 </property>
728 <widget row="0" column="0" >
729 <class>QRadioButton</class>
730 <property stdset="1">
731 <name>name</name>
732 <cstring>hexViewBufferUnlimited</cstring>
733 </property>
734 <property stdset="1">
735 <name>text</name>
736 <string>unlimited</string>
737 </property>
738 <property stdset="1">
739 <name>checked</name>
740 <bool>true</bool>
741 </property>
742 </widget>
743 <widget row="1" column="0" >
744 <class>QLayoutWidget</class>
745 <property stdset="1">
746 <name>name</name>
747 <cstring>Layout7</cstring>
748 </property>
749 <hbox>
750 <property stdset="1">
751 <name>margin</name>
752 <number>0</number>
753 </property>
754 <property stdset="1">
755 <name>spacing</name>
756 <number>6</number>
757 </property>
758 <widget>
759 <class>QRadioButton</class>
760 <property stdset="1">
761 <name>name</name>
762 <cstring>hexViewBufferLimited</cstring>
763 </property>
764 <property stdset="1">
765 <name>text</name>
766 <string>limited to</string>
767 </property>
768 </widget>
769 <widget>
770 <class>QSpinBox</class>
771 <property stdset="1">
772 <name>name</name>
773 <cstring>hexViewBufferSize</cstring>
774 </property>
775 <property stdset="1">
776 <name>enabled</name>
777 <bool>false</bool>
778 </property>
779 <property stdset="1">
780 <name>suffix</name>
781 <string> Packets</string>
782 </property>
783 <property stdset="1">
784 <name>maxValue</name>
785 <number>10000</number>
786 </property>
787 <property stdset="1">
788 <name>lineStep</name>
789 <number>100</number>
790 </property>
791 <property stdset="1">
792 <name>value</name>
793 <number>2000</number>
794 </property>
795 </widget>
796 </hbox>
797 </widget>
798 </grid>
799 </widget>
695 </grid> 800 </grid>
696 </widget> 801 </widget>
697 <widget> 802 <widget>
698 <class>QWidget</class> 803 <class>QWidget</class>
699 <property stdset="1"> 804 <property stdset="1">
700 <name>name</name> 805 <name>name</name>
701 <cstring>tab</cstring> 806 <cstring>tab</cstring>
702 </property> 807 </property>
703 <attribute> 808 <attribute>
704 <name>title</name> 809 <name>title</name>
705 <string>Parse</string> 810 <string>Parse</string>
706 </attribute> 811 </attribute>
707 <grid> 812 <grid>
708 <property stdset="1"> 813 <property stdset="1">
709 <name>margin</name> 814 <name>margin</name>
710 <number>5</number> 815 <number>5</number>
711 </property> 816 </property>
712 <property stdset="1"> 817 <property stdset="1">
713 <name>spacing</name> 818 <name>spacing</name>
714 <number>3</number> 819 <number>3</number>
715 </property> 820 </property>
716 <widget row="0" column="0" > 821 <widget row="0" column="0" >
717 <class>ProtocolListView</class> 822 <class>ProtocolListView</class>
718 <property stdset="1"> 823 <property stdset="1">
@@ -1577,26 +1682,32 @@
1577 <connection> 1682 <connection>
1578 <sender>writeCaptureFile</sender> 1683 <sender>writeCaptureFile</sender>
1579 <signal>toggled(bool)</signal> 1684 <signal>toggled(bool)</signal>
1580 <receiver>capturePackets</receiver> 1685 <receiver>capturePackets</receiver>
1581 <slot>setEnabled(bool)</slot> 1686 <slot>setEnabled(bool)</slot>
1582 </connection> 1687 </connection>
1583 <connection> 1688 <connection>
1584 <sender>enableGPS</sender> 1689 <sender>enableGPS</sender>
1585 <signal>toggled(bool)</signal> 1690 <signal>toggled(bool)</signal>
1586 <receiver>gpsdHost</receiver> 1691 <receiver>gpsdHost</receiver>
1587 <slot>setEnabled(bool)</slot> 1692 <slot>setEnabled(bool)</slot>
1588 </connection> 1693 </connection>
1589 <connection> 1694 <connection>
1590 <sender>enableGPS</sender> 1695 <sender>enableGPS</sender>
1591 <signal>toggled(bool)</signal> 1696 <signal>toggled(bool)</signal>
1592 <receiver>gpsdPort</receiver> 1697 <receiver>gpsdPort</receiver>
1593 <slot>setEnabled(bool)</slot> 1698 <slot>setEnabled(bool)</slot>
1594 </connection> 1699 </connection>
1595 <connection> 1700 <connection>
1596 <sender>startGPS</sender> 1701 <sender>startGPS</sender>
1597 <signal>toggled(bool)</signal> 1702 <signal>toggled(bool)</signal>
1598 <receiver>commandGPS</receiver> 1703 <receiver>commandGPS</receiver>
1599 <slot>setEnabled(bool)</slot> 1704 <slot>setEnabled(bool)</slot>
1600 </connection> 1705 </connection>
1706 <connection>
1707 <sender>hexViewBufferLimited</sender>
1708 <signal>toggled(bool)</signal>
1709 <receiver>hexViewBufferSize</receiver>
1710 <slot>setEnabled(bool)</slot>
1711 </connection>
1601</connections> 1712</connections>
1602</UI> 1713</UI>
diff --git a/noncore/net/wellenreiter/gui/wellenreiterbase.cpp b/noncore/net/wellenreiter/gui/wellenreiterbase.cpp
index f035e89..9bdf3e0 100644
--- a/noncore/net/wellenreiter/gui/wellenreiterbase.cpp
+++ b/noncore/net/wellenreiter/gui/wellenreiterbase.cpp
@@ -95,55 +95,57 @@ WellenreiterBase::WellenreiterBase( QWidget* parent, const char* name, WFlags f
95 95
96 about = new QWidget( TabWidget, "about" ); 96 about = new QWidget( TabWidget, "about" );
97 aboutLayout = new QGridLayout( about ); 97 aboutLayout = new QGridLayout( about );
98 aboutLayout->setSpacing( 6 ); 98 aboutLayout->setSpacing( 6 );
99 aboutLayout->setMargin( 11 ); 99 aboutLayout->setMargin( 11 );
100 100
101 PixmapLabel1_3_2 = new QLabel( about, "PixmapLabel1_3_2" ); 101 PixmapLabel1_3_2 = new QLabel( about, "PixmapLabel1_3_2" );
102 PixmapLabel1_3_2->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)0, (QSizePolicy::SizeType)0, PixmapLabel1_3_2->sizePolicy().hasHeightForWidth() ) ); 102 PixmapLabel1_3_2->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)0, (QSizePolicy::SizeType)0, PixmapLabel1_3_2->sizePolicy().hasHeightForWidth() ) );
103 PixmapLabel1_3_2->setFrameShape( QLabel::Panel ); 103 PixmapLabel1_3_2->setFrameShape( QLabel::Panel );
104 PixmapLabel1_3_2->setFrameShadow( QLabel::Sunken ); 104 PixmapLabel1_3_2->setFrameShadow( QLabel::Sunken );
105 PixmapLabel1_3_2->setLineWidth( 2 ); 105 PixmapLabel1_3_2->setLineWidth( 2 );
106 PixmapLabel1_3_2->setMargin( 0 ); 106 PixmapLabel1_3_2->setMargin( 0 );
107 PixmapLabel1_3_2->setMidLineWidth( 0 ); 107 PixmapLabel1_3_2->setMidLineWidth( 0 );
108 PixmapLabel1_3_2->setPixmap( Resource::loadPixmap( "wellenreiter/logo" ) ); 108 PixmapLabel1_3_2->setPixmap( Resource::loadPixmap( "wellenreiter/logo" ) );
109 PixmapLabel1_3_2->setScaledContents( TRUE ); 109 PixmapLabel1_3_2->setScaledContents( TRUE );
110 PixmapLabel1_3_2->setAlignment( int( QLabel::AlignCenter ) ); 110 PixmapLabel1_3_2->setAlignment( int( QLabel::AlignCenter ) );
111 111
112 aboutLayout->addWidget( PixmapLabel1_3_2, 0, 0 ); 112 aboutLayout->addWidget( PixmapLabel1_3_2, 0, 0 );
113 113
114 TextLabel1_4_2 = new QLabel( about, "TextLabel1_4_2" ); 114 TextLabel1_4_2 = new QLabel( about, "TextLabel1_4_2" );
115 QFont TextLabel1_4_2_font( TextLabel1_4_2->font() ); 115 QFont TextLabel1_4_2_font( TextLabel1_4_2->font() );
116 TextLabel1_4_2_font.setFamily( "adobe-helvetica" ); 116 TextLabel1_4_2_font.setFamily( "adobe-helvetica" );
117 TextLabel1_4_2_font.setPointSize( 10 ); 117 TextLabel1_4_2_font.setPointSize( 10 );
118 TextLabel1_4_2->setFont( TextLabel1_4_2_font ); 118 TextLabel1_4_2->setFont( TextLabel1_4_2_font );
119 TextLabel1_4_2->setText( tr( "<p align=center>\n" 119 TextLabel1_4_2->setText(
120"<hr>\n" 120"<p align=center>"
121"Michael 'Mickey' Lauer<br><hr>\n" 121"<hr>"
122"Max Moser<br>\n" 122"<b>(C) Michael 'Mickey' Lauer</b><br>"
123"Martin J. Muench<br>\n" 123"<hr>"
124"<b>www.wellenreiter.net</b>\n" 124"mickey@Vanille.de<br>"
125"</p>" ) ); 125"www.Vanille.de/projects/wellenreiter.html<br>"
126"www.wellenreiter.net"
127"</p>" );
126 TextLabel1_4_2->setAlignment( int( QLabel::AlignCenter ) ); 128 TextLabel1_4_2->setAlignment( int( QLabel::AlignCenter ) );
127 129
128 aboutLayout->addWidget( TextLabel1_4_2, 1, 0 ); 130 aboutLayout->addWidget( TextLabel1_4_2, 1, 0 );
129 131
130#ifdef QWS 132#ifdef QWS
131 TabWidget->addTab( ap, "wellenreiter/networks", tr( "Nets" ) ); 133 TabWidget->addTab( ap, "wellenreiter/networks", tr( "Nets" ) );
132 TabWidget->addTab( graphwindow, "wellenreiter/graph", tr( "Graph" ) ); 134 TabWidget->addTab( graphwindow, "wellenreiter/graph", tr( "Graph" ) );
133 TabWidget->addTab( logwindow, "wellenreiter/log", tr( "Log" ) ); 135 TabWidget->addTab( logwindow, "wellenreiter/log", tr( "Log" ) );
134 TabWidget->addTab( hexwindow, "wellenreiter/hex", tr( "Hex" ) ); 136 TabWidget->addTab( hexwindow, "wellenreiter/hex", tr( "Hex" ) );
135 TabWidget->addTab( statwindow, "wellenreiter/stat", tr( "Stat" ) ); 137 TabWidget->addTab( statwindow, "wellenreiter/stat", tr( "Stat" ) );
136 TabWidget->addTab( about, "wellenreiter/about", tr( "About" ) ); 138 TabWidget->addTab( about, "wellenreiter/about", tr( "About" ) );
137#else 139#else
138 TabWidget->addTab( ap, /* "wellenreiter/networks", */ tr( "Networks" ) ); 140 TabWidget->addTab( ap, /* "wellenreiter/networks", */ tr( "Networks" ) );
139 TabWidget->addTab( graphwindow, /* "wellenreiter/graph", */ tr( "Graph" ) ); 141 TabWidget->addTab( graphwindow, /* "wellenreiter/graph", */ tr( "Graph" ) );
140 TabWidget->addTab( logwindow, /* "wellenreiter/log", */ tr( "Log" ) ); 142 TabWidget->addTab( logwindow, /* "wellenreiter/log", */ tr( "Log" ) );
141 TabWidget->addTab( hexwindow, /* "wellenreiter/hex", */ tr( "Hex" ) ); 143 TabWidget->addTab( hexwindow, /* "wellenreiter/hex", */ tr( "Hex" ) );
142 TabWidget->addTab( statwindow, /* "wellenreiter/hex", */ tr( "Stat" ) ); 144 TabWidget->addTab( statwindow, /* "wellenreiter/hex", */ tr( "Stat" ) );
143 TabWidget->addTab( about, /* "wellenreiter/about", */ tr( "About" ) ); 145 TabWidget->addTab( about, /* "wellenreiter/about", */ tr( "About" ) );
144#endif 146#endif
145 WellenreiterBaseLayout->addWidget( TabWidget ); 147 WellenreiterBaseLayout->addWidget( TabWidget );
146 148
147#ifdef QWS 149#ifdef QWS
148 TabWidget->setCurrentTab( tr( "Nets" ) ); 150 TabWidget->setCurrentTab( tr( "Nets" ) );
149#endif 151#endif