author | mickeyl <mickeyl> | 2003-08-07 20:51:50 (UTC) |
---|---|---|
committer | mickeyl <mickeyl> | 2003-08-07 20:51:50 (UTC) |
commit | 55f96e0b87b10150144774409332ef4571abc761 (patch) (unidiff) | |
tree | 72824f4c5122d46ba551bd3ec470fcefa2f87e7d | |
parent | 557e7a9f407e77a3f5bcfda5de9a8408379165ac (diff) | |
download | opie-55f96e0b87b10150144774409332ef4571abc761.zip opie-55f96e0b87b10150144774409332ef4571abc761.tar.gz opie-55f96e0b87b10150144774409332ef4571abc761.tar.bz2 |
add GPS configuration window
-rw-r--r-- | noncore/net/wellenreiter/gui/configbase.ui | 193 | ||||
-rw-r--r-- | noncore/net/wellenreiter/gui/gps.cpp | 17 | ||||
-rw-r--r-- | noncore/net/wellenreiter/gui/gps.h | 19 | ||||
-rw-r--r-- | noncore/net/wellenreiter/gui/gui.pro | 6 |
4 files changed, 231 insertions, 4 deletions
diff --git a/noncore/net/wellenreiter/gui/configbase.ui b/noncore/net/wellenreiter/gui/configbase.ui index 554fc29..c1da98d 100644 --- a/noncore/net/wellenreiter/gui/configbase.ui +++ b/noncore/net/wellenreiter/gui/configbase.ui | |||
@@ -2,26 +2,26 @@ | |||
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>230</width> | 14 | <width>286</width> |
15 | <height>287</height> | 15 | <height>280</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> |
@@ -956,24 +956,195 @@ | |||
956 | <name>editable</name> | 956 | <name>editable</name> |
957 | <bool>true</bool> | 957 | <bool>true</bool> |
958 | </property> | 958 | </property> |
959 | <property stdset="1"> | 959 | <property stdset="1"> |
960 | <name>currentItem</name> | 960 | <name>currentItem</name> |
961 | <number>0</number> | 961 | <number>0</number> |
962 | </property> | 962 | </property> |
963 | </widget> | 963 | </widget> |
964 | </grid> | 964 | </grid> |
965 | </widget> | 965 | </widget> |
966 | </grid> | 966 | </grid> |
967 | </widget> | 967 | </widget> |
968 | <widget> | ||
969 | <class>QWidget</class> | ||
970 | <property stdset="1"> | ||
971 | <name>name</name> | ||
972 | <cstring>tab</cstring> | ||
973 | </property> | ||
974 | <attribute> | ||
975 | <name>title</name> | ||
976 | <string>GPS</string> | ||
977 | </attribute> | ||
978 | <widget> | ||
979 | <class>QLayoutWidget</class> | ||
980 | <property stdset="1"> | ||
981 | <name>name</name> | ||
982 | <cstring>Layout1</cstring> | ||
983 | </property> | ||
984 | <property stdset="1"> | ||
985 | <name>geometry</name> | ||
986 | <rect> | ||
987 | <x>10</x> | ||
988 | <y>40</y> | ||
989 | <width>216</width> | ||
990 | <height>27</height> | ||
991 | </rect> | ||
992 | </property> | ||
993 | <hbox> | ||
994 | <property stdset="1"> | ||
995 | <name>margin</name> | ||
996 | <number>0</number> | ||
997 | </property> | ||
998 | <property stdset="1"> | ||
999 | <name>spacing</name> | ||
1000 | <number>6</number> | ||
1001 | </property> | ||
1002 | <widget> | ||
1003 | <class>QLabel</class> | ||
1004 | <property stdset="1"> | ||
1005 | <name>name</name> | ||
1006 | <cstring>TextLabel1_4</cstring> | ||
1007 | </property> | ||
1008 | <property stdset="1"> | ||
1009 | <name>text</name> | ||
1010 | <string>Host</string> | ||
1011 | </property> | ||
1012 | </widget> | ||
1013 | <widget> | ||
1014 | <class>QComboBox</class> | ||
1015 | <item> | ||
1016 | <property> | ||
1017 | <name>text</name> | ||
1018 | <string>localhost</string> | ||
1019 | </property> | ||
1020 | </item> | ||
1021 | <property stdset="1"> | ||
1022 | <name>name</name> | ||
1023 | <cstring>ComboBox8</cstring> | ||
1024 | </property> | ||
1025 | <property stdset="1"> | ||
1026 | <name>enabled</name> | ||
1027 | <bool>false</bool> | ||
1028 | </property> | ||
1029 | <property stdset="1"> | ||
1030 | <name>editable</name> | ||
1031 | <bool>true</bool> | ||
1032 | </property> | ||
1033 | <property stdset="1"> | ||
1034 | <name>currentItem</name> | ||
1035 | <number>0</number> | ||
1036 | </property> | ||
1037 | </widget> | ||
1038 | <widget> | ||
1039 | <class>QLabel</class> | ||
1040 | <property stdset="1"> | ||
1041 | <name>name</name> | ||
1042 | <cstring>TextLabel2_2</cstring> | ||
1043 | </property> | ||
1044 | <property stdset="1"> | ||
1045 | <name>text</name> | ||
1046 | <string>:</string> | ||
1047 | </property> | ||
1048 | </widget> | ||
1049 | <widget> | ||
1050 | <class>QSpinBox</class> | ||
1051 | <property stdset="1"> | ||
1052 | <name>name</name> | ||
1053 | <cstring>SpinBox2</cstring> | ||
1054 | </property> | ||
1055 | <property stdset="1"> | ||
1056 | <name>enabled</name> | ||
1057 | <bool>false</bool> | ||
1058 | </property> | ||
1059 | <property stdset="1"> | ||
1060 | <name>maxValue</name> | ||
1061 | <number>65535</number> | ||
1062 | </property> | ||
1063 | <property stdset="1"> | ||
1064 | <name>minValue</name> | ||
1065 | <number>1024</number> | ||
1066 | </property> | ||
1067 | <property stdset="1"> | ||
1068 | <name>value</name> | ||
1069 | <number>2947</number> | ||
1070 | </property> | ||
1071 | </widget> | ||
1072 | </hbox> | ||
1073 | </widget> | ||
1074 | <widget> | ||
1075 | <class>QCheckBox</class> | ||
1076 | <property stdset="1"> | ||
1077 | <name>name</name> | ||
1078 | <cstring>enableGPS</cstring> | ||
1079 | </property> | ||
1080 | <property stdset="1"> | ||
1081 | <name>geometry</name> | ||
1082 | <rect> | ||
1083 | <x>10</x> | ||
1084 | <y>10</y> | ||
1085 | <width>199</width> | ||
1086 | <height>21</height> | ||
1087 | </rect> | ||
1088 | </property> | ||
1089 | <property stdset="1"> | ||
1090 | <name>text</name> | ||
1091 | <string>Enable GPS logging w/ gpsd</string> | ||
1092 | </property> | ||
1093 | </widget> | ||
1094 | <widget> | ||
1095 | <class>QCheckBox</class> | ||
1096 | <property stdset="1"> | ||
1097 | <name>name</name> | ||
1098 | <cstring>startGPS</cstring> | ||
1099 | </property> | ||
1100 | <property stdset="1"> | ||
1101 | <name>geometry</name> | ||
1102 | <rect> | ||
1103 | <x>10</x> | ||
1104 | <y>80</y> | ||
1105 | <width>171</width> | ||
1106 | <height>21</height> | ||
1107 | </rect> | ||
1108 | </property> | ||
1109 | <property stdset="1"> | ||
1110 | <name>text</name> | ||
1111 | <string>Start gpsd on localhost</string> | ||
1112 | </property> | ||
1113 | </widget> | ||
1114 | <widget> | ||
1115 | <class>QLineEdit</class> | ||
1116 | <property stdset="1"> | ||
1117 | <name>name</name> | ||
1118 | <cstring>commandGPS</cstring> | ||
1119 | </property> | ||
1120 | <property stdset="1"> | ||
1121 | <name>enabled</name> | ||
1122 | <bool>false</bool> | ||
1123 | </property> | ||
1124 | <property stdset="1"> | ||
1125 | <name>geometry</name> | ||
1126 | <rect> | ||
1127 | <x>10</x> | ||
1128 | <y>110</y> | ||
1129 | <width>210</width> | ||
1130 | <height>22</height> | ||
1131 | </rect> | ||
1132 | </property> | ||
1133 | <property stdset="1"> | ||
1134 | <name>text</name> | ||
1135 | <string>gpsd -p /dev/ttyS3 -s 57600</string> | ||
1136 | </property> | ||
1137 | </widget> | ||
1138 | </widget> | ||
968 | </widget> | 1139 | </widget> |
969 | </grid> | 1140 | </grid> |
970 | </widget> | 1141 | </widget> |
971 | <customwidgets> | 1142 | <customwidgets> |
972 | <customwidget> | 1143 | <customwidget> |
973 | <class>ProtocolListView</class> | 1144 | <class>ProtocolListView</class> |
974 | <header location="local">protolistview.h</header> | 1145 | <header location="local">protolistview.h</header> |
975 | <sizehint> | 1146 | <sizehint> |
976 | <width>100</width> | 1147 | <width>100</width> |
977 | <height>100</height> | 1148 | <height>100</height> |
978 | </sizehint> | 1149 | </sizehint> |
979 | <container>0</container> | 1150 | <container>0</container> |
@@ -1024,14 +1195,32 @@ | |||
1024 | <connection> | 1195 | <connection> |
1025 | <sender>writeCaptureFile</sender> | 1196 | <sender>writeCaptureFile</sender> |
1026 | <signal>toggled(bool)</signal> | 1197 | <signal>toggled(bool)</signal> |
1027 | <receiver>captureFileName</receiver> | 1198 | <receiver>captureFileName</receiver> |
1028 | <slot>setEnabled(bool)</slot> | 1199 | <slot>setEnabled(bool)</slot> |
1029 | </connection> | 1200 | </connection> |
1030 | <connection> | 1201 | <connection> |
1031 | <sender>writeCaptureFile</sender> | 1202 | <sender>writeCaptureFile</sender> |
1032 | <signal>toggled(bool)</signal> | 1203 | <signal>toggled(bool)</signal> |
1033 | <receiver>capturePackets</receiver> | 1204 | <receiver>capturePackets</receiver> |
1034 | <slot>setEnabled(bool)</slot> | 1205 | <slot>setEnabled(bool)</slot> |
1035 | </connection> | 1206 | </connection> |
1207 | <connection> | ||
1208 | <sender>enableGPS</sender> | ||
1209 | <signal>toggled(bool)</signal> | ||
1210 | <receiver>ComboBox8</receiver> | ||
1211 | <slot>setEnabled(bool)</slot> | ||
1212 | </connection> | ||
1213 | <connection> | ||
1214 | <sender>enableGPS</sender> | ||
1215 | <signal>toggled(bool)</signal> | ||
1216 | <receiver>SpinBox2</receiver> | ||
1217 | <slot>setEnabled(bool)</slot> | ||
1218 | </connection> | ||
1219 | <connection> | ||
1220 | <sender>startGPS</sender> | ||
1221 | <signal>toggled(bool)</signal> | ||
1222 | <receiver>commandGPS</receiver> | ||
1223 | <slot>setEnabled(bool)</slot> | ||
1224 | </connection> | ||
1036 | </connections> | 1225 | </connections> |
1037 | </UI> | 1226 | </UI> |
diff --git a/noncore/net/wellenreiter/gui/gps.cpp b/noncore/net/wellenreiter/gui/gps.cpp new file mode 100644 index 0000000..c3bff53 --- a/dev/null +++ b/noncore/net/wellenreiter/gui/gps.cpp | |||
@@ -0,0 +1,17 @@ | |||
1 | /********************************************************************** | ||
2 | ** Copyright (C) 2003 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 "gps.h" | ||
17 | |||
diff --git a/noncore/net/wellenreiter/gui/gps.h b/noncore/net/wellenreiter/gui/gps.h new file mode 100644 index 0000000..e7c3dce --- a/dev/null +++ b/noncore/net/wellenreiter/gui/gps.h | |||
@@ -0,0 +1,19 @@ | |||
1 | /********************************************************************** | ||
2 | ** Copyright (C) 2003 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 GPS_H | ||
17 | #define GPS_H | ||
18 | |||
19 | #endif // GPS_H | ||
diff --git a/noncore/net/wellenreiter/gui/gui.pro b/noncore/net/wellenreiter/gui/gui.pro index ee239a3..5ff4290 100644 --- a/noncore/net/wellenreiter/gui/gui.pro +++ b/noncore/net/wellenreiter/gui/gui.pro | |||
@@ -4,37 +4,39 @@ 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 | scanlist.h \ | 10 | scanlist.h \ |
11 | logwindow.h \ | 11 | logwindow.h \ |
12 | hexwindow.h \ | 12 | hexwindow.h \ |
13 | statwindow.h \ | 13 | statwindow.h \ |
14 | configwindow.h \ | 14 | configwindow.h \ |
15 | graphwindow.h \ | 15 | graphwindow.h \ |
16 | protolistview.h | 16 | protolistview.h \ |
17 | gps.h | ||
17 | 18 | ||
18 | SOURCES = main.cpp \ | 19 | SOURCES = main.cpp \ |
19 | mainwindow.cpp \ | 20 | mainwindow.cpp \ |
20 | wellenreiterbase.cpp \ | 21 | wellenreiterbase.cpp \ |
21 | wellenreiter.cpp \ | 22 | wellenreiter.cpp \ |
22 | scanlist.cpp \ | 23 | scanlist.cpp \ |
23 | logwindow.cpp \ | 24 | logwindow.cpp \ |
24 | hexwindow.cpp \ | 25 | hexwindow.cpp \ |
25 | statwindow.cpp \ | 26 | statwindow.cpp \ |
26 | configwindow.cpp \ | 27 | configwindow.cpp \ |
27 | graphwindow.cpp \ | 28 | graphwindow.cpp \ |
28 | protolistview.cpp | 29 | protolistview.cpp \ |
30 | gps.cpp | ||
29 | 31 | ||
30 | INCLUDEPATH += $(OPIEDIR)/include | 32 | INCLUDEPATH += $(OPIEDIR)/include |
31 | DEPENDPATH += $(OPIEDIR)/include | 33 | DEPENDPATH += $(OPIEDIR)/include |
32 | INTERFACES = configbase.ui | 34 | INTERFACES = configbase.ui |
33 | TARGET = wellenreiter | 35 | TARGET = wellenreiter |
34 | 36 | ||
35 | !contains( platform, x11 ) { | 37 | !contains( platform, x11 ) { |
36 | message( qws ) | 38 | message( qws ) |
37 | include ( $(OPIEDIR)/include.pro ) | 39 | include ( $(OPIEDIR)/include.pro ) |
38 | LIBS += -lqpe -lopie -lopiecore2 -lopieui2 -lopienet2 -lstdc++ | 40 | LIBS += -lqpe -lopie -lopiecore2 -lopieui2 -lopienet2 -lstdc++ |
39 | } | 41 | } |
40 | 42 | ||