author | mickeyl <mickeyl> | 2004-01-07 23:04:55 (UTC) |
---|---|---|
committer | mickeyl <mickeyl> | 2004-01-07 23:04:55 (UTC) |
commit | cfb7335c5b65a79f5817b393e5a8b3345558f220 (patch) (unidiff) | |
tree | a8d2d2bcc0bd29a6aac7fec7325f058f148d466e /noncore/net/wellenreiter/gui | |
parent | c4d6574e85f74d6086c1709ecf0d117df7417222 (diff) | |
download | opie-cfb7335c5b65a79f5817b393e5a8b3345558f220.zip opie-cfb7335c5b65a79f5817b393e5a8b3345558f220.tar.gz opie-cfb7335c5b65a79f5817b393e5a8b3345558f220.tar.bz2 |
A bunch of miscellaneous changes and improvements. read the ChangeLog :)
Oh and it's WIP - not everything mentioned there works already. Will soon, though.
Diffstat (limited to 'noncore/net/wellenreiter/gui') (more/less context) (ignore whitespace changes)
-rw-r--r-- | noncore/net/wellenreiter/gui/configbase.ui | 287 | ||||
-rw-r--r-- | noncore/net/wellenreiter/gui/configwindow.cpp | 103 | ||||
-rw-r--r-- | noncore/net/wellenreiter/gui/configwindow.h | 7 | ||||
-rw-r--r-- | noncore/net/wellenreiter/gui/gps.cpp | 8 | ||||
-rw-r--r-- | noncore/net/wellenreiter/gui/scanlist.cpp | 20 | ||||
-rw-r--r-- | noncore/net/wellenreiter/gui/scanlist.h | 3 | ||||
-rw-r--r-- | noncore/net/wellenreiter/gui/wellenreiter.cpp | 8 |
7 files changed, 347 insertions, 89 deletions
diff --git a/noncore/net/wellenreiter/gui/configbase.ui b/noncore/net/wellenreiter/gui/configbase.ui index 2c335df..de6abfc 100644 --- a/noncore/net/wellenreiter/gui/configbase.ui +++ b/noncore/net/wellenreiter/gui/configbase.ui | |||
@@ -12,6 +12,6 @@ | |||
12 | <x>0</x> | 12 | <x>0</x> |
13 | <y>0</y> | 13 | <y>0</y> |
14 | <width>303</width> | 14 | <width>250</width> |
15 | <height>343</height> | 15 | <height>371</height> |
16 | </rect> | 16 | </rect> |
17 | </property> | 17 | </property> |
@@ -707,9 +707,9 @@ | |||
707 | <property stdset="1"> | 707 | <property stdset="1"> |
708 | <name>margin</name> | 708 | <name>margin</name> |
709 | <number>6</number> | 709 | <number>5</number> |
710 | </property> | 710 | </property> |
711 | <property stdset="1"> | 711 | <property stdset="1"> |
712 | <name>spacing</name> | 712 | <name>spacing</name> |
713 | <number>6</number> | 713 | <number>3</number> |
714 | </property> | 714 | </property> |
715 | <widget> | 715 | <widget> |
@@ -775,72 +775,249 @@ | |||
775 | <property stdset="1"> | 775 | <property stdset="1"> |
776 | <name>enabled</name> | 776 | <name>enabled</name> |
777 | <bool>false</bool> | 777 | <bool>true</bool> |
778 | </property> | 778 | </property> |
779 | <property stdset="1"> | 779 | <property stdset="1"> |
780 | <name>title</name> | 780 | <name>title</name> |
781 | <string>Action On Detecting</string> | 781 | <string>Action on detecting a new</string> |
782 | </property> | ||
783 | <property> | ||
784 | <name>layoutMargin</name> | ||
785 | </property> | ||
786 | <property> | ||
787 | <name>layoutSpacing</name> | ||
782 | </property> | 788 | </property> |
783 | <grid> | 789 | <grid> |
784 | <property stdset="1"> | 790 | <property stdset="1"> |
785 | <name>margin</name> | 791 | <name>margin</name> |
786 | <number>11</number> | 792 | <number>3</number> |
787 | </property> | 793 | </property> |
788 | <property stdset="1"> | 794 | <property stdset="1"> |
789 | <name>spacing</name> | 795 | <name>spacing</name> |
790 | <number>6</number> | 796 | <number>0</number> |
791 | </property> | 797 | </property> |
792 | <widget row="1" column="0" > | ||
793 | <class>QLabel</class> | ||
794 | <property stdset="1"> | ||
795 | <name>name</name> | ||
796 | <cstring>TextLabel2</cstring> | ||
797 | </property> | ||
798 | <property stdset="1"> | ||
799 | <name>text</name> | ||
800 | <string>New Wireless Station</string> | ||
801 | </property> | ||
802 | </widget> | ||
803 | <widget row="0" column="0" > | 798 | <widget row="0" column="0" > |
804 | <class>QLabel</class> | 799 | <class>QLayoutWidget</class> |
805 | <property stdset="1"> | ||
806 | <name>name</name> | ||
807 | <cstring>TextLabel1_3</cstring> | ||
808 | </property> | ||
809 | <property stdset="1"> | ||
810 | <name>text</name> | ||
811 | <string>New Network</string> | ||
812 | </property> | ||
813 | </widget> | ||
814 | <widget row="0" column="1" > | ||
815 | <class>QComboBox</class> | ||
816 | <property stdset="1"> | ||
817 | <name>name</name> | ||
818 | <cstring>newNetwork</cstring> | ||
819 | </property> | ||
820 | </widget> | ||
821 | <widget row="1" column="1" > | ||
822 | <class>QComboBox</class> | ||
823 | <property stdset="1"> | ||
824 | <name>name</name> | ||
825 | <cstring>newWirelessStation</cstring> | ||
826 | </property> | ||
827 | </widget> | ||
828 | <widget row="2" column="1" > | ||
829 | <class>QComboBox</class> | ||
830 | <property stdset="1"> | 800 | <property stdset="1"> |
831 | <name>name</name> | 801 | <name>name</name> |
832 | <cstring>newStation</cstring> | 802 | <cstring>Layout6</cstring> |
833 | </property> | 803 | </property> |
834 | </widget> | 804 | <property> |
835 | <widget row="2" column="0" > | 805 | <name>layoutMargin</name> |
836 | <class>QLabel</class> | ||
837 | <property stdset="1"> | ||
838 | <name>name</name> | ||
839 | <cstring>TextLabel3</cstring> | ||
840 | </property> | 806 | </property> |
841 | <property stdset="1"> | 807 | <property> |
842 | <name>text</name> | 808 | <name>layoutSpacing</name> |
843 | <string>New Station</string> | ||
844 | </property> | 809 | </property> |
810 | <grid> | ||
811 | <property stdset="1"> | ||
812 | <name>margin</name> | ||
813 | <number>2</number> | ||
814 | </property> | ||
815 | <property stdset="1"> | ||
816 | <name>spacing</name> | ||
817 | <number>2</number> | ||
818 | </property> | ||
819 | <widget row="4" column="0" > | ||
820 | <class>QLabel</class> | ||
821 | <property stdset="1"> | ||
822 | <name>name</name> | ||
823 | <cstring>TextLabel3</cstring> | ||
824 | </property> | ||
825 | <property stdset="1"> | ||
826 | <name>text</name> | ||
827 | <string>Wired Station:</string> | ||
828 | </property> | ||
829 | </widget> | ||
830 | <widget row="0" column="0" > | ||
831 | <class>QLabel</class> | ||
832 | <property stdset="1"> | ||
833 | <name>name</name> | ||
834 | <cstring>TextLabel1_3</cstring> | ||
835 | </property> | ||
836 | <property stdset="1"> | ||
837 | <name>text</name> | ||
838 | <string>Network:</string> | ||
839 | </property> | ||
840 | </widget> | ||
841 | <widget row="2" column="1" > | ||
842 | <class>QComboBox</class> | ||
843 | <item> | ||
844 | <property> | ||
845 | <name>text</name> | ||
846 | <string><Ignore></string> | ||
847 | </property> | ||
848 | </item> | ||
849 | <item> | ||
850 | <property> | ||
851 | <name>text</name> | ||
852 | <string>Play Alarm</string> | ||
853 | </property> | ||
854 | </item> | ||
855 | <item> | ||
856 | <property> | ||
857 | <name>text</name> | ||
858 | <string>Play Click</string> | ||
859 | </property> | ||
860 | </item> | ||
861 | <item> | ||
862 | <property> | ||
863 | <name>text</name> | ||
864 | <string>Blink LED</string> | ||
865 | </property> | ||
866 | </item> | ||
867 | <item> | ||
868 | <property> | ||
869 | <name>text</name> | ||
870 | <string>Run Script</string> | ||
871 | </property> | ||
872 | </item> | ||
873 | <property stdset="1"> | ||
874 | <name>name</name> | ||
875 | <cstring>newClientAction</cstring> | ||
876 | </property> | ||
877 | <property stdset="1"> | ||
878 | <name>sizePolicy</name> | ||
879 | <sizepolicy> | ||
880 | <hsizetype>7</hsizetype> | ||
881 | <vsizetype>0</vsizetype> | ||
882 | </sizepolicy> | ||
883 | </property> | ||
884 | </widget> | ||
885 | <widget row="3" column="0" rowspan="1" colspan="2" > | ||
886 | <class>QLineEdit</class> | ||
887 | <property stdset="1"> | ||
888 | <name>name</name> | ||
889 | <cstring>newClientScript</cstring> | ||
890 | </property> | ||
891 | <property stdset="1"> | ||
892 | <name>enabled</name> | ||
893 | <bool>true</bool> | ||
894 | </property> | ||
895 | </widget> | ||
896 | <widget row="2" column="0" > | ||
897 | <class>QLabel</class> | ||
898 | <property stdset="1"> | ||
899 | <name>name</name> | ||
900 | <cstring>TextLabel2</cstring> | ||
901 | </property> | ||
902 | <property stdset="1"> | ||
903 | <name>text</name> | ||
904 | <string>Wireless Station:</string> | ||
905 | </property> | ||
906 | </widget> | ||
907 | <widget row="4" column="1" > | ||
908 | <class>QComboBox</class> | ||
909 | <item> | ||
910 | <property> | ||
911 | <name>text</name> | ||
912 | <string><Ignore></string> | ||
913 | </property> | ||
914 | </item> | ||
915 | <item> | ||
916 | <property> | ||
917 | <name>text</name> | ||
918 | <string>Play Alarm</string> | ||
919 | </property> | ||
920 | </item> | ||
921 | <item> | ||
922 | <property> | ||
923 | <name>text</name> | ||
924 | <string>Play Click</string> | ||
925 | </property> | ||
926 | </item> | ||
927 | <item> | ||
928 | <property> | ||
929 | <name>text</name> | ||
930 | <string>Blink LED</string> | ||
931 | </property> | ||
932 | </item> | ||
933 | <item> | ||
934 | <property> | ||
935 | <name>text</name> | ||
936 | <string>Run Script</string> | ||
937 | </property> | ||
938 | </item> | ||
939 | <property stdset="1"> | ||
940 | <name>name</name> | ||
941 | <cstring>newStationAction</cstring> | ||
942 | </property> | ||
943 | <property stdset="1"> | ||
944 | <name>sizePolicy</name> | ||
945 | <sizepolicy> | ||
946 | <hsizetype>7</hsizetype> | ||
947 | <vsizetype>0</vsizetype> | ||
948 | </sizepolicy> | ||
949 | </property> | ||
950 | </widget> | ||
951 | <widget row="0" column="1" > | ||
952 | <class>QComboBox</class> | ||
953 | <item> | ||
954 | <property> | ||
955 | <name>text</name> | ||
956 | <string><Ignore></string> | ||
957 | </property> | ||
958 | </item> | ||
959 | <item> | ||
960 | <property> | ||
961 | <name>text</name> | ||
962 | <string>Play Alarm</string> | ||
963 | </property> | ||
964 | </item> | ||
965 | <item> | ||
966 | <property> | ||
967 | <name>text</name> | ||
968 | <string>Play Click</string> | ||
969 | </property> | ||
970 | </item> | ||
971 | <item> | ||
972 | <property> | ||
973 | <name>text</name> | ||
974 | <string>Blink LED</string> | ||
975 | </property> | ||
976 | </item> | ||
977 | <item> | ||
978 | <property> | ||
979 | <name>text</name> | ||
980 | <string>Run Script</string> | ||
981 | </property> | ||
982 | </item> | ||
983 | <property stdset="1"> | ||
984 | <name>name</name> | ||
985 | <cstring>newNetworkAction</cstring> | ||
986 | </property> | ||
987 | <property stdset="1"> | ||
988 | <name>sizePolicy</name> | ||
989 | <sizepolicy> | ||
990 | <hsizetype>7</hsizetype> | ||
991 | <vsizetype>0</vsizetype> | ||
992 | </sizepolicy> | ||
993 | </property> | ||
994 | <property stdset="1"> | ||
995 | <name>editable</name> | ||
996 | <bool>false</bool> | ||
997 | </property> | ||
998 | </widget> | ||
999 | <widget row="1" column="0" rowspan="1" colspan="2" > | ||
1000 | <class>QLineEdit</class> | ||
1001 | <property stdset="1"> | ||
1002 | <name>name</name> | ||
1003 | <cstring>newNetworkScript</cstring> | ||
1004 | </property> | ||
1005 | <property stdset="1"> | ||
1006 | <name>enabled</name> | ||
1007 | <bool>true</bool> | ||
1008 | </property> | ||
1009 | </widget> | ||
1010 | <widget row="5" column="0" rowspan="1" colspan="2" > | ||
1011 | <class>QLineEdit</class> | ||
1012 | <property stdset="1"> | ||
1013 | <name>name</name> | ||
1014 | <cstring>newStationScript</cstring> | ||
1015 | </property> | ||
1016 | <property stdset="1"> | ||
1017 | <name>enabled</name> | ||
1018 | <bool>true</bool> | ||
1019 | </property> | ||
1020 | </widget> | ||
1021 | </grid> | ||
845 | </widget> | 1022 | </widget> |
846 | </grid> | 1023 | </grid> |
diff --git a/noncore/net/wellenreiter/gui/configwindow.cpp b/noncore/net/wellenreiter/gui/configwindow.cpp index f536f4e..1341d03 100644 --- a/noncore/net/wellenreiter/gui/configwindow.cpp +++ b/noncore/net/wellenreiter/gui/configwindow.cpp | |||
@@ -18,4 +18,11 @@ | |||
18 | #include "mainwindow.h" | 18 | #include "mainwindow.h" |
19 | 19 | ||
20 | /* OPIE */ | ||
21 | #include <opie2/onetwork.h> | ||
22 | #ifdef QWS | ||
23 | #include <opie2/oapplication.h> | ||
24 | #include <opie2/oconfig.h> | ||
25 | #endif | ||
26 | |||
20 | /* QT */ | 27 | /* QT */ |
21 | #include <qapplication.h> | 28 | #include <qapplication.h> |
@@ -27,15 +34,9 @@ | |||
27 | #include <qmap.h> | 34 | #include <qmap.h> |
28 | #include <qpushbutton.h> | 35 | #include <qpushbutton.h> |
36 | #include <qtabwidget.h> | ||
29 | #include <qtoolbutton.h> | 37 | #include <qtoolbutton.h> |
30 | #include <qspinbox.h> | 38 | #include <qspinbox.h> |
31 | #include <qtextstream.h> | 39 | #include <qtextstream.h> |
32 | 40 | ||
33 | /* OPIE */ | ||
34 | #include <opie2/onetwork.h> | ||
35 | |||
36 | #ifdef QWS | ||
37 | #include <opie2/oapplication.h> | ||
38 | #include <opie2/oconfig.h> | ||
39 | #endif | ||
40 | 41 | ||
41 | WellenreiterConfigWindow* WellenreiterConfigWindow::_instance = 0; | 42 | WellenreiterConfigWindow* WellenreiterConfigWindow::_instance = 0; |
@@ -73,4 +74,7 @@ WellenreiterConfigWindow::WellenreiterConfigWindow( QWidget * parent, const char | |||
73 | 74 | ||
74 | connect( deviceType, SIGNAL( activated(int) ), this, SLOT( changedDeviceType(int) ) ); | 75 | connect( deviceType, SIGNAL( activated(int) ), this, SLOT( changedDeviceType(int) ) ); |
76 | connect( newNetworkAction, SIGNAL( activated(int) ), this, SLOT( changedNetworkAction(int) ) ); | ||
77 | connect( newClientAction, SIGNAL( activated(int) ), this, SLOT( changedClientAction(int) ) ); | ||
78 | connect( newStationAction, SIGNAL( activated(int) ), this, SLOT( changedStationAction(int) ) ); | ||
75 | connect( getCaptureFileName, SIGNAL( clicked() ), this, SLOT( getCaptureFileNameClicked() ) ); | 79 | connect( getCaptureFileName, SIGNAL( clicked() ), this, SLOT( getCaptureFileNameClicked() ) ); |
76 | 80 | ||
@@ -79,4 +83,7 @@ WellenreiterConfigWindow::WellenreiterConfigWindow( QWidget * parent, const char | |||
79 | 83 | ||
80 | connect( autodetect, SIGNAL( clicked() ), this, SLOT( performAutodetection() ) ); | 84 | connect( autodetect, SIGNAL( clicked() ), this, SLOT( performAutodetection() ) ); |
85 | |||
86 | // hide tab4 (parse) until Wellenreiter 1.2 | ||
87 | tab->removePage( tab_4 ); | ||
81 | }; | 88 | }; |
82 | 89 | ||
@@ -186,4 +193,34 @@ void WellenreiterConfigWindow::changedDeviceType(int t) | |||
186 | 193 | ||
187 | 194 | ||
195 | void WellenreiterConfigWindow::synchronizeActionsAndScripts() | ||
196 | { | ||
197 | if ( newNetworkAction->currentItem() == 4 ) newNetworkScript->show(); else newNetworkScript->hide(); | ||
198 | if ( newClientAction->currentItem() == 4 ) newClientScript->show(); else newClientScript->hide(); | ||
199 | if ( newStationAction->currentItem() == 4 ) newStationScript->show(); else newStationScript->hide(); | ||
200 | |||
201 | //newNetworkScript->setEnabled( newNetworkAction->currentItem() == 4 ); | ||
202 | //newClientScript->setEnabled( newClientAction->currentItem() == 4 ); | ||
203 | //newStationScript->setEnabled( newStationAction->currentItem() == 4 ); | ||
204 | } | ||
205 | |||
206 | |||
207 | void WellenreiterConfigWindow::changedNetworkAction(int t) | ||
208 | { | ||
209 | synchronizeActionsAndScripts(); | ||
210 | } | ||
211 | |||
212 | |||
213 | void WellenreiterConfigWindow::changedClientAction(int t) | ||
214 | { | ||
215 | synchronizeActionsAndScripts(); | ||
216 | } | ||
217 | |||
218 | |||
219 | void WellenreiterConfigWindow::changedStationAction(int t) | ||
220 | { | ||
221 | synchronizeActionsAndScripts(); | ||
222 | } | ||
223 | |||
224 | |||
188 | void WellenreiterConfigWindow::getCaptureFileNameClicked() | 225 | void WellenreiterConfigWindow::getCaptureFileNameClicked() |
189 | { | 226 | { |
@@ -236,4 +273,43 @@ int WellenreiterConfigWindow::gpsPort() const | |||
236 | 273 | ||
237 | 274 | ||
275 | void WellenreiterConfigWindow::performAction( const QString& type ) | ||
276 | { | ||
277 | int action; | ||
278 | QString script; | ||
279 | |||
280 | if ( type == "network" ) | ||
281 | { | ||
282 | action = newNetworkAction->currentItem(); | ||
283 | script = newNetworkScript->text(); | ||
284 | } | ||
285 | else if ( type == "managed" || type == "adhoc" ) | ||
286 | { | ||
287 | action = newClientAction->currentItem(); | ||
288 | script = newClientScript->text(); | ||
289 | } | ||
290 | else if ( type == "station" ) | ||
291 | { | ||
292 | action = newStationAction->currentItem(); | ||
293 | script = newStationScript->text(); | ||
294 | } | ||
295 | else | ||
296 | { | ||
297 | qWarning( "WellenreiterConfigWindow::performAction(): unknown type '%s'", (const char*) type ); | ||
298 | return; | ||
299 | } | ||
300 | |||
301 | qDebug( "going to perform action %d (script='%s')", action, (const char*) script ); | ||
302 | |||
303 | /* | ||
304 | |||
305 | if ( sound == "Ignore" ) return; | ||
306 | else if ( sound == "Touch" ) ODevice::inst()->touchSound(); | ||
307 | else if ( sound == "Key" ) ODevice::inst()->keySound(); | ||
308 | else if ( sound == "Alarm" ) ODevice::inst()->alarmSound(); | ||
309 | |||
310 | */ | ||
311 | } | ||
312 | |||
313 | |||
238 | void WellenreiterConfigWindow::load() | 314 | void WellenreiterConfigWindow::load() |
239 | { | 315 | { |
@@ -291,4 +367,11 @@ void WellenreiterConfigWindow::load() | |||
291 | openTree->setChecked( c->readBoolEntry( "openTree", true ) ); | 367 | openTree->setChecked( c->readBoolEntry( "openTree", true ) ); |
292 | disablePM->setChecked( c->readBoolEntry( "disablePM", true ) ); | 368 | disablePM->setChecked( c->readBoolEntry( "disablePM", true ) ); |
369 | newNetworkAction->setCurrentItem( c->readNumEntry( "newNetworkAction", 0 ) ); | ||
370 | newNetworkScript->setText( c->readEntry( "newNetworkScript", "" ) ); | ||
371 | newClientAction->setCurrentItem( c->readNumEntry( "newClientAction", 0 ) ); | ||
372 | newClientScript->setText( c->readEntry( "newClientScript", "" ) ); | ||
373 | newStationAction->setCurrentItem( c->readNumEntry( "newStationAction", 0 ) ); | ||
374 | newStationScript->setText( c->readEntry( "newStationScript", "" ) ); | ||
375 | synchronizeActionsAndScripts(); // needed for showing/hiding the script QLineEdit on demand | ||
293 | 376 | ||
294 | c->setGroup( "GPS" ); | 377 | c->setGroup( "GPS" ); |
@@ -334,4 +417,10 @@ void WellenreiterConfigWindow::save() | |||
334 | c->writeEntry( "openTree", openTree->isChecked() ); | 417 | c->writeEntry( "openTree", openTree->isChecked() ); |
335 | c->writeEntry( "disablePM", disablePM->isChecked() ); | 418 | c->writeEntry( "disablePM", disablePM->isChecked() ); |
419 | c->writeEntry( "newNetworkAction", newNetworkAction->currentItem() ); | ||
420 | c->writeEntry( "newNetworkScript", newNetworkScript->text() ); | ||
421 | c->writeEntry( "newClientAction", newClientAction->currentItem() ); | ||
422 | c->writeEntry( "newClientScript", newClientScript->text() ); | ||
423 | c->writeEntry( "newStationAction", newStationAction->currentItem() ); | ||
424 | c->writeEntry( "newStationScript", newStationScript->text() ); | ||
336 | 425 | ||
337 | c->setGroup( "GPS" ); | 426 | c->setGroup( "GPS" ); |
diff --git a/noncore/net/wellenreiter/gui/configwindow.h b/noncore/net/wellenreiter/gui/configwindow.h index 80b4d2b..b082331 100644 --- a/noncore/net/wellenreiter/gui/configwindow.h +++ b/noncore/net/wellenreiter/gui/configwindow.h | |||
@@ -58,7 +58,14 @@ class WellenreiterConfigWindow : public WellenreiterConfigBase | |||
58 | public slots: | 58 | public slots: |
59 | void changedDeviceType(int); | 59 | void changedDeviceType(int); |
60 | void changedNetworkAction(int t); | ||
61 | void changedClientAction(int t); | ||
62 | void changedStationAction(int t); | ||
60 | void getCaptureFileNameClicked(); | 63 | void getCaptureFileNameClicked(); |
61 | void performAutodetection(); | 64 | void performAutodetection(); |
62 | void channelAllClicked(int); | 65 | void channelAllClicked(int); |
66 | void performAction( const QString& ); | ||
67 | |||
68 | protected: | ||
69 | void synchronizeActionsAndScripts(); | ||
63 | 70 | ||
64 | protected: | 71 | protected: |
diff --git a/noncore/net/wellenreiter/gui/gps.cpp b/noncore/net/wellenreiter/gui/gps.cpp index 31f95ce..b814427 100644 --- a/noncore/net/wellenreiter/gui/gps.cpp +++ b/noncore/net/wellenreiter/gui/gps.cpp | |||
@@ -59,8 +59,8 @@ GpsLocation GPS::position() const | |||
59 | QString str; | 59 | QString str; |
60 | stream.readRawBytes( &buf[0], 7 ); | 60 | stream.readRawBytes( &buf[0], 7 ); |
61 | float lat = -111.111; | 61 | float lat = -111; |
62 | stream >> lat; | 62 | stream >> lat; |
63 | stream.skipWhiteSpace(); | 63 | stream.skipWhiteSpace(); |
64 | float lon = -111.111; | 64 | float lon = -111; |
65 | stream >> lon; | 65 | stream >> lon; |
66 | stream.readRawBytes( &buf[0], 200 ); // read and discard the stuff until EOF | 66 | stream.readRawBytes( &buf[0], 200 ); // read and discard the stuff until EOF |
@@ -69,5 +69,5 @@ GpsLocation GPS::position() const | |||
69 | } | 69 | } |
70 | } | 70 | } |
71 | return GpsLocation( -111.111, -111.111 ); | 71 | return GpsLocation( -111, -111 ); |
72 | } | 72 | } |
73 | 73 | ||
@@ -75,5 +75,5 @@ GpsLocation GPS::position() const | |||
75 | QString GpsLocation::dmsPosition() const | 75 | QString GpsLocation::dmsPosition() const |
76 | { | 76 | { |
77 | if ( _latitude == -111.111 || _longitude == -111.11 ) | 77 | if ( _latitude == -111 || _longitude == -111 ) |
78 | return "N/A"; | 78 | return "N/A"; |
79 | if ( _latitude == 0.0 && _longitude == 0.0 ) | 79 | if ( _latitude == 0.0 && _longitude == 0.0 ) |
diff --git a/noncore/net/wellenreiter/gui/scanlist.cpp b/noncore/net/wellenreiter/gui/scanlist.cpp index d89c71f..470646d 100644 --- a/noncore/net/wellenreiter/gui/scanlist.cpp +++ b/noncore/net/wellenreiter/gui/scanlist.cpp | |||
@@ -27,9 +27,6 @@ | |||
27 | #ifdef QWS | 27 | #ifdef QWS |
28 | #include <qpe/qpeapplication.h> | 28 | #include <qpe/qpeapplication.h> |
29 | #include <opie/odevice.h> | ||
30 | using namespace Opie; | ||
31 | #endif | 29 | #endif |
32 | 30 | ||
33 | |||
34 | #ifdef QWS | 31 | #ifdef QWS |
35 | #include <qpe/resource.h> | 32 | #include <qpe/resource.h> |
@@ -422,6 +419,8 @@ MScanListItem::MScanListItem( QListView* parent, QString type, QString essid, QS | |||
422 | qDebug( "creating scanlist item" ); | 419 | qDebug( "creating scanlist item" ); |
423 | #endif | 420 | #endif |
424 | if ( WellenreiterConfigWindow::instance() && type == "network" ) | 421 | |
425 | playSound( WellenreiterConfigWindow::instance()->soundOnNetwork() ); | 422 | if ( WellenreiterConfigWindow::instance() ) |
423 | WellenreiterConfigWindow::instance()->performAction( type ); // better use signal/slot combination here | ||
424 | |||
426 | decorateItem( type, essid, macaddr, wep, channel, signal ); | 425 | decorateItem( type, essid, macaddr, wep, channel, signal ); |
427 | } | 426 | } |
@@ -540,15 +539,4 @@ void MScanListItem::setLocation( const QString& location ) | |||
540 | 539 | ||
541 | 540 | ||
542 | void MScanListItem::playSound( const QString& sound ) const | ||
543 | { | ||
544 | #ifdef QWS | ||
545 | if ( sound == "Ignore" ) return; | ||
546 | else if ( sound == "Touch" ) ODevice::inst()->touchSound(); | ||
547 | else if ( sound == "Key" ) ODevice::inst()->keySound(); | ||
548 | else if ( sound == "Alarm" ) ODevice::inst()->alarmSound(); | ||
549 | #endif | ||
550 | } | ||
551 | |||
552 | |||
553 | void MScanListItem::receivedBeacon() | 541 | void MScanListItem::receivedBeacon() |
554 | { | 542 | { |
diff --git a/noncore/net/wellenreiter/gui/scanlist.h b/noncore/net/wellenreiter/gui/scanlist.h index 6cd8fc0..42f35c2 100644 --- a/noncore/net/wellenreiter/gui/scanlist.h +++ b/noncore/net/wellenreiter/gui/scanlist.h | |||
@@ -110,7 +110,4 @@ class MScanListItem: public OListViewItem | |||
110 | virtual void serializeFrom( QDataStream& s ); | 110 | virtual void serializeFrom( QDataStream& s ); |
111 | 111 | ||
112 | protected: | ||
113 | void playSound( const QString& ) const; | ||
114 | |||
115 | private: | 112 | private: |
116 | QString _type; | 113 | QString _type; |
diff --git a/noncore/net/wellenreiter/gui/wellenreiter.cpp b/noncore/net/wellenreiter/gui/wellenreiter.cpp index 45d7142..25632f3 100644 --- a/noncore/net/wellenreiter/gui/wellenreiter.cpp +++ b/noncore/net/wellenreiter/gui/wellenreiter.cpp | |||
@@ -182,5 +182,5 @@ void Wellenreiter::handleManagementFrame( OPacket* p, OWaveLanManagementPacket* | |||
182 | 182 | ||
183 | OWaveLanManagementSSID* ssid = static_cast<OWaveLanManagementSSID*>( p->child( "802.11 SSID" ) ); | 183 | OWaveLanManagementSSID* ssid = static_cast<OWaveLanManagementSSID*>( p->child( "802.11 SSID" ) ); |
184 | QString essid = ssid ? ssid->ID() : QString("<unknown>"); | 184 | QString essid = ssid ? ssid->ID( true /* decloak */ ) : QString("<unknown>"); |
185 | OWaveLanManagementDS* ds = static_cast<OWaveLanManagementDS*>( p->child( "802.11 DS" ) ); | 185 | OWaveLanManagementDS* ds = static_cast<OWaveLanManagementDS*>( p->child( "802.11 DS" ) ); |
186 | int channel = ds ? ds->channel() : -1; | 186 | int channel = ds ? ds->channel() : -1; |
@@ -188,5 +188,5 @@ void Wellenreiter::handleManagementFrame( OPacket* p, OWaveLanManagementPacket* | |||
188 | OWaveLanPacket* header = static_cast<OWaveLanPacket*>( p->child( "802.11" ) ); | 188 | OWaveLanPacket* header = static_cast<OWaveLanPacket*>( p->child( "802.11" ) ); |
189 | 189 | ||
190 | GpsLocation loc( -111.111, -111.111 ); | 190 | GpsLocation loc( -111, -111 ); |
191 | if ( configwindow->enableGPS->isChecked() ) | 191 | if ( configwindow->enableGPS->isChecked() ) |
192 | { | 192 | { |
@@ -217,5 +217,5 @@ void Wellenreiter::handleControlFrame( OPacket* p, OWaveLanControlPacket* contro | |||
217 | if ( control->controlType() == "Acknowledge" ) | 217 | if ( control->controlType() == "Acknowledge" ) |
218 | { | 218 | { |
219 | netView()->addNewItem( "adhoc", "???", header->macAddress1(), false, -1, 0, GpsLocation( -111.111, -111.111 ) ); | 219 | netView()->addNewItem( "adhoc", "???", header->macAddress1(), false, -1, 0, GpsLocation( -111, -111 ) ); |
220 | } | 220 | } |
221 | else | 221 | else |
@@ -261,5 +261,5 @@ void Wellenreiter::handleEthernetData( OPacket* p, OEthernetPacket* data, OMacAd | |||
261 | to = data->destinationAddress(); | 261 | to = data->destinationAddress(); |
262 | 262 | ||
263 | netView()->addNewItem( "station", "<wired>", from, false, -1, 0, GpsLocation( -111.111, -111.111 ) ); | 263 | netView()->addNewItem( "station", "<wired>", from, false, -1, 0, GpsLocation( -111, -111 ) ); |
264 | } | 264 | } |
265 | 265 | ||