author | kergoth <kergoth> | 2003-04-14 23:31:22 (UTC) |
---|---|---|
committer | kergoth <kergoth> | 2003-04-14 23:31:22 (UTC) |
commit | fb07cc161b4adc5bc250569599a7164af2d7caba (patch) (side-by-side diff) | |
tree | 1f391e35146e81835af5e0a395896b3fe3c0d46b /noncore/settings/networksettings/wlan/wlan.ui | |
parent | 68c558ca78e5416145b64ca87fd01361f033ef34 (diff) | |
download | opie-fb07cc161b4adc5bc250569599a7164af2d7caba.zip opie-fb07cc161b4adc5bc250569599a7164af2d7caba.tar.gz opie-fb07cc161b4adc5bc250569599a7164af2d7caba.tar.bz2 |
Add new wireless parser that uses the wireless-tools if-pre-up.d
script to handle wireless configuration, as opposed to pcmcia-cs
wireless.opts. This has a number of benefits. In addition to
improving clarity, this means one can now configure their wireless
non-pcmcia interfaces using networksettings. The only real question
is, how to handle the fact that its largely useless without the
if-pre-up.d script? I'll adapt the existing wlanimp.(cpp|h) to
the new .ui, and leave it as a compiletime selection for now.
Diffstat (limited to 'noncore/settings/networksettings/wlan/wlan.ui') (more/less context) (show whitespace changes)
-rw-r--r-- | noncore/settings/networksettings/wlan/wlan.ui | 482 |
1 files changed, 329 insertions, 153 deletions
diff --git a/noncore/settings/networksettings/wlan/wlan.ui b/noncore/settings/networksettings/wlan/wlan.ui index 744c559..e7c8dbb 100644 --- a/noncore/settings/networksettings/wlan/wlan.ui +++ b/noncore/settings/networksettings/wlan/wlan.ui @@ -10,15 +10,15 @@ <name>geometry</name> <rect> <x>0</x> <y>0</y> - <width>239</width> - <height>277</height> + <width>255</width> + <height>299</height> </rect> </property> <property stdset="1"> <name>caption</name> - <string>Wireless LAN Setting</string> + <string>Wireless Configuration</string> </property> <property stdset="1"> <name>sizeGripEnabled</name> <bool>true</bool> @@ -54,137 +54,218 @@ <attribute> <name>title</name> <string>General</string> </attribute> - <vbox> + <spacer> + <property> + <name>name</name> + <cstring>Spacer31</cstring> + </property> <property stdset="1"> - <name>margin</name> - <number>11</number> + <name>orientation</name> + <enum>Vertical</enum> </property> <property stdset="1"> - <name>spacing</name> - <number>6</number> + <name>sizeType</name> + <enum>Expanding</enum> + </property> + <property> + <name>sizeHint</name> + <size> + <width>20</width> + <height>20</height> + </size> </property> + </spacer> <widget> - <class>QCheckBox</class> + <class>QLabel</class> <property stdset="1"> <name>name</name> - <cstring>essAny</cstring> + <cstring>modeLabel</cstring> + </property> + <property stdset="1"> + <name>enabled</name> + <bool>true</bool> + </property> + <property stdset="1"> + <name>geometry</name> + <rect> + <x>11</x> + <y>11</y> + <width>84</width> + <height>29</height> + </rect> + </property> + <property stdset="1"> + <name>sizePolicy</name> + <sizepolicy> + <hsizetype>1</hsizetype> + <vsizetype>1</vsizetype> + </sizepolicy> </property> <property stdset="1"> <name>text</name> - <string>&Specify Access Point</string> + <string>Mode</string> </property> </widget> <widget> - <class>QGroupBox</class> + <class>QLabel</class> <property stdset="1"> <name>name</name> - <cstring>GroupBox1</cstring> + <cstring>essidLabel</cstring> </property> <property stdset="1"> <name>enabled</name> - <bool>false</bool> + <bool>true</bool> </property> <property stdset="1"> - <name>title</name> - <string>Specific &Access Point Settings</string> + <name>geometry</name> + <rect> + <x>11</x> + <y>46</y> + <width>84</width> + <height>29</height> + </rect> </property> - <grid> <property stdset="1"> - <name>margin</name> - <number>11</number> + <name>sizePolicy</name> + <sizepolicy> + <hsizetype>1</hsizetype> + <vsizetype>1</vsizetype> + </sizepolicy> </property> <property stdset="1"> - <name>spacing</name> - <number>6</number> + <name>text</name> + <string>ESS-ID</string> </property> - <widget row="0" column="0" > - <class>QLabel</class> + </widget> + <widget> + <class>QSpinBox</class> <property stdset="1"> <name>name</name> - <cstring>TextLabel1</cstring> + <cstring>networkChannel</cstring> </property> <property stdset="1"> - <name>text</name> - <string>ESS-ID</string> + <name>enabled</name> + <bool>false</bool> </property> - </widget> - <widget row="1" column="0" > - <class>QLabel</class> <property stdset="1"> - <name>name</name> - <cstring>TextLabel2</cstring> + <name>geometry</name> + <rect> + <x>146</x> + <y>139</y> + <width>58</width> + <height>25</height> + </rect> </property> <property stdset="1"> - <name>text</name> - <string>Network Type</string> + <name>maxValue</name> + <number>15</number> + </property> + <property stdset="1"> + <name>minValue</name> + <number>1</number> + </property> + <property stdset="1"> + <name>value</name> + <number>1</number> </property> </widget> - <widget row="0" column="1" rowspan="1" colspan="2" > + <widget> <class>QLineEdit</class> <property stdset="1"> <name>name</name> - <cstring>essSpecificLineEdit</cstring> + <cstring>macEdit</cstring> </property> - </widget> - <widget row="1" column="1" rowspan="1" colspan="2" > - <class>QComboBox</class> - <item> - <property> - <name>text</name> - <string>Infrastructure</string> + <property stdset="1"> + <name>enabled</name> + <bool>false</bool> </property> - </item> - <item> - <property> - <name>text</name> - <string>Ad-Hoc</string> + <property stdset="1"> + <name>geometry</name> + <rect> + <x>56</x> + <y>108</y> + <width>182</width> + <height>25</height> + </rect> </property> - </item> <property stdset="1"> - <name>name</name> - <cstring>networkType</cstring> + <name>sizePolicy</name> + <sizepolicy> + <hsizetype>5</hsizetype> + <vsizetype>1</vsizetype> + </sizepolicy> </property> </widget> - <widget row="2" column="0" > + <widget> <class>QLabel</class> <property stdset="1"> <name>name</name> - <cstring>channelLabel</cstring> + <cstring>macLabel</cstring> + </property> + <property stdset="1"> + <name>enabled</name> + <bool>false</bool> + </property> + <property stdset="1"> + <name>geometry</name> + <rect> + <x>11</x> + <y>108</y> + <width>39</width> + <height>25</height> + </rect> </property> <property stdset="1"> <name>text</name> - <string>Channel</string> + <string>MAC</string> </property> </widget> - <widget row="2" column="1" > - <class>QSpinBox</class> + <widget> + <class>QCheckBox</class> <property stdset="1"> <name>name</name> - <cstring>networkChannel</cstring> + <cstring>specifyAp</cstring> </property> <property stdset="1"> - <name>enabled</name> - <bool>false</bool> + <name>geometry</name> + <rect> + <x>11</x> + <y>81</y> + <width>227</width> + <height>21</height> + </rect> </property> <property stdset="1"> - <name>maxValue</name> - <number>15</number> + <name>text</name> + <string>Specify &Access Point</string> + </property> + </widget> + <widget> + <class>QCheckBox</class> + <property stdset="1"> + <name>name</name> + <cstring>specifyChan</cstring> </property> <property stdset="1"> - <name>minValue</name> - <number>1</number> + <name>geometry</name> + <rect> + <x>11</x> + <y>141</y> + <width>129</width> + <height>21</height> + </rect> </property> <property stdset="1"> - <name>value</name> - <number>6</number> + <name>text</name> + <string>Specify &Channel</string> </property> </widget> - <spacer row="2" column="2" > + <spacer> <property> <name>name</name> - <cstring>Spacer4</cstring> + <cstring>Spacer10</cstring> </property> <property stdset="1"> <name>orientation</name> <enum>Horizontal</enum> @@ -200,115 +281,155 @@ <height>20</height> </size> </property> </spacer> - </grid> - </widget> - <spacer> + <widget> + <class>QComboBox</class> + <item> <property> + <name>text</name> + <string>Auto</string> + </property> + </item> + <item> + <property> + <name>text</name> + <string>Managed</string> + </property> + </item> + <item> + <property> + <name>text</name> + <string>Ad-Hoc</string> + </property> + </item> + <property stdset="1"> <name>name</name> - <cstring>Spacer31</cstring> + <cstring>mode</cstring> </property> <property stdset="1"> - <name>orientation</name> - <enum>Vertical</enum> + <name>enabled</name> + <bool>true</bool> </property> <property stdset="1"> - <name>sizeType</name> - <enum>Expanding</enum> + <name>geometry</name> + <rect> + <x>101</x> + <y>11</y> + <width>103</width> + <height>29</height> + </rect> </property> - <property> - <name>sizeHint</name> - <size> - <width>20</width> - <height>20</height> - </size> + <property stdset="1"> + <name>sizePolicy</name> + <sizepolicy> + <hsizetype>1</hsizetype> + <vsizetype>0</vsizetype> + </sizepolicy> </property> - </spacer> - </vbox> </widget> <widget> - <class>QWidget</class> + <class>QComboBox</class> + <item> + <property> + <name>text</name> + <string>any</string> + </property> + </item> <property stdset="1"> <name>name</name> - <cstring>WepPage</cstring> + <cstring>essid</cstring> </property> - <attribute> - <name>title</name> - <string>Encryption</string> - </attribute> - <vbox> <property stdset="1"> - <name>margin</name> - <number>11</number> + <name>geometry</name> + <rect> + <x>101</x> + <y>46</y> + <width>103</width> + <height>29</height> + </rect> </property> <property stdset="1"> - <name>spacing</name> - <number>6</number> + <name>sizePolicy</name> + <sizepolicy> + <hsizetype>7</hsizetype> + <vsizetype>0</vsizetype> + </sizepolicy> </property> - <widget> - <class>QCheckBox</class> <property stdset="1"> - <name>name</name> - <cstring>wepEnabled</cstring> + <name>editable</name> + <bool>true</bool> </property> <property stdset="1"> - <name>text</name> - <string>&Enable WEP</string> + <name>currentItem</name> + <number>0</number> </property> - </widget> - <widget> - <class>QButtonGroup</class> <property stdset="1"> - <name>name</name> - <cstring>ButtonGroup43</cstring> + <name>sizeLimit</name> + <number>5</number> </property> <property stdset="1"> - <name>enabled</name> + <name>autoCompletion</name> + <bool>true</bool> + </property> + <property stdset="1"> + <name>duplicatesEnabled</name> <bool>false</bool> </property> + </widget> + </widget> + <widget> + <class>QWidget</class> <property stdset="1"> - <name>title</name> - <string>&Authentication Type</string> + <name>name</name> + <cstring>WepPage</cstring> </property> - <hbox> + <attribute> + <name>title</name> + <string>Encryption</string> + </attribute> + <grid> <property stdset="1"> <name>margin</name> <number>11</number> </property> <property stdset="1"> <name>spacing</name> <number>6</number> </property> - <widget> - <class>QRadioButton</class> - <property stdset="1"> + <spacer row="0" column="0" > + <property> <name>name</name> - <cstring>authOpen</cstring> + <cstring>Spacer30</cstring> </property> <property stdset="1"> - <name>text</name> - <string>&Open System</string> + <name>orientation</name> + <enum>Vertical</enum> </property> <property stdset="1"> - <name>checked</name> - <bool>true</bool> + <name>sizeType</name> + <enum>Expanding</enum> </property> - </widget> - <widget> - <class>QRadioButton</class> + <property> + <name>sizeHint</name> + <size> + <width>20</width> + <height>20</height> + </size> + </property> + </spacer> + <widget row="0" column="0" > + <class>QCheckBox</class> <property stdset="1"> <name>name</name> - <cstring>authShared</cstring> + <cstring>wepEnabled</cstring> </property> <property stdset="1"> <name>text</name> - <string>&Shared Key</string> + <string>&Enable Encryption</string> </property> </widget> - </hbox> - </widget> - <widget> + <widget row="1" column="0" > <class>QButtonGroup</class> <property stdset="1"> <name>name</name> <cstring>KeyButtonGroup</cstring> @@ -381,9 +502,9 @@ <cstring>keyRadio0</cstring> </property> <property stdset="1"> <name>text</name> - <string>Key 1</string> + <string>Key &1</string> </property> <property stdset="1"> <name>checked</name> <bool>true</bool> @@ -396,9 +517,9 @@ <cstring>keyRadio1</cstring> </property> <property stdset="1"> <name>text</name> - <string>Key 2</string> + <string>Key &2</string> </property> </widget> <widget row="2" column="0" > <class>QRadioButton</class> @@ -407,9 +528,9 @@ <cstring>keyRadio2</cstring> </property> <property stdset="1"> <name>text</name> - <string>Key 3</string> + <string>Key &3</string> </property> </widget> <widget row="3" column="0" > <class>QRadioButton</class> @@ -418,44 +539,98 @@ <cstring>keyRadio3</cstring> </property> <property stdset="1"> <name>text</name> - <string>Key 4</string> + <string>Key &4</string> </property> </widget> </grid> </widget> - <spacer> - <property> + <widget row="2" column="0" > + <class>QButtonGroup</class> + <property stdset="1"> <name>name</name> - <cstring>Spacer30</cstring> + <cstring>NonEncButtonGroup</cstring> </property> <property stdset="1"> - <name>orientation</name> - <enum>Vertical</enum> + <name>enabled</name> + <bool>false</bool> </property> <property stdset="1"> - <name>sizeType</name> - <enum>Expanding</enum> + <name>title</name> + <string>Non-encrypted Packets</string> </property> - <property> - <name>sizeHint</name> - <size> - <width>20</width> - <height>20</height> - </size> + <property stdset="1"> + <name>radioButtonExclusive</name> + <bool>true</bool> </property> - </spacer> - </vbox> + <grid> + <property stdset="1"> + <name>margin</name> + <number>11</number> + </property> + <property stdset="1"> + <name>spacing</name> + <number>6</number> + </property> + <widget row="0" column="0" > + <class>QRadioButton</class> + <property stdset="1"> + <name>name</name> + <cstring>acceptNonEnc</cstring> + </property> + <property stdset="1"> + <name>text</name> + <string>&Accept</string> + </property> + <property stdset="1"> + <name>checked</name> + <bool>true</bool> + </property> + <property stdset="1"> + <name>buttonGroupId</name> + <number>0</number> + </property> + </widget> + <widget row="0" column="1" > + <class>QRadioButton</class> + <property stdset="1"> + <name>name</name> + <cstring>rejectNonEnc</cstring> + </property> + <property stdset="1"> + <name>text</name> + <string>&Reject</string> + </property> + <property stdset="1"> + <name>buttonGroupId</name> + <number>1</number> + </property> + </widget> + </grid> + </widget> + </grid> </widget> </widget> </vbox> </widget> <connections> <connection> - <sender>wepEnabled</sender> + <sender>specifyAp</sender> + <signal>toggled(bool)</signal> + <receiver>macLabel</receiver> + <slot>setEnabled(bool)</slot> + </connection> + <connection> + <sender>specifyAp</sender> + <signal>toggled(bool)</signal> + <receiver>macEdit</receiver> + <slot>setEnabled(bool)</slot> + </connection> + <connection> + <sender>specifyChan</sender> <signal>toggled(bool)</signal> - <receiver>ButtonGroup43</receiver> + <receiver>networkChannel</receiver> <slot>setEnabled(bool)</slot> </connection> <connection> <sender>wepEnabled</sender> @@ -463,29 +638,30 @@ <receiver>KeyButtonGroup</receiver> <slot>setEnabled(bool)</slot> </connection> <connection> - <sender>essAny</sender> + <sender>wepEnabled</sender> <signal>toggled(bool)</signal> - <receiver>GroupBox1</receiver> + <receiver>NonEncButtonGroup</receiver> <slot>setEnabled(bool)</slot> </connection> </connections> <tabstops> <tabstop>tabWidget</tabstop> - <tabstop>essAny</tabstop> - <tabstop>essSpecificLineEdit</tabstop> - <tabstop>networkType</tabstop> - <tabstop>networkChannel</tabstop> <tabstop>wepEnabled</tabstop> - <tabstop>authOpen</tabstop> - <tabstop>authShared</tabstop> <tabstop>keyRadio0</tabstop> <tabstop>keyLineEdit0</tabstop> <tabstop>keyRadio1</tabstop> <tabstop>keyLineEdit1</tabstop> <tabstop>keyRadio2</tabstop> <tabstop>keyLineEdit2</tabstop> <tabstop>keyRadio3</tabstop> <tabstop>keyLineEdit3</tabstop> + <tabstop>acceptNonEnc</tabstop> + <tabstop>mode</tabstop> + <tabstop>essid</tabstop> + <tabstop>specifyAp</tabstop> + <tabstop>macEdit</tabstop> + <tabstop>specifyChan</tabstop> + <tabstop>networkChannel</tabstop> </tabstops> </UI> |