author | mickeyl <mickeyl> | 2005-07-09 13:14:45 (UTC) |
---|---|---|
committer | mickeyl <mickeyl> | 2005-07-09 13:14:45 (UTC) |
commit | df81736967930c523b3c1be163f830e9120b7b27 (patch) (side-by-side diff) | |
tree | dc84749b3b5fd2c636e1876820b6f8fc2efc1397 | |
parent | 27286d2b951428e61836e522b3a31f8c13808516 (diff) | |
download | opie-df81736967930c523b3c1be163f830e9120b7b27.zip opie-df81736967930c523b3c1be163f830e9120b7b27.tar.gz opie-df81736967930c523b3c1be163f830e9120b7b27.tar.bz2 |
put a slight bit of sanity into those .ui files
-rw-r--r-- | noncore/net/opietooth/manager/bluetoothbase.ui | 198 | ||||
-rw-r--r-- | noncore/net/opietooth/manager/devicedialog.ui | 189 |
2 files changed, 152 insertions, 235 deletions
diff --git a/noncore/net/opietooth/manager/bluetoothbase.ui b/noncore/net/opietooth/manager/bluetoothbase.ui index a900212..2d14b8f 100644 --- a/noncore/net/opietooth/manager/bluetoothbase.ui +++ b/noncore/net/opietooth/manager/bluetoothbase.ui @@ -13,4 +13,4 @@ <y>0</y> - <width>370</width> - <height>328</height> + <width>297</width> + <height>382</height> </rect> @@ -27,6 +27,6 @@ </property> - <vbox> + <grid> <property stdset="1"> <name>margin</name> - <number>11</number> + <number>4</number> </property> @@ -34,5 +34,5 @@ <name>spacing</name> - <number>6</number> + <number>2</number> </property> - <widget> + <widget row="0" column="0" > <class>QTabWidget</class> @@ -61,3 +61,3 @@ <name>margin</name> - <number>2</number> + <number>4</number> </property> @@ -117,3 +117,3 @@ <name>text</name> - <string>Scan for Devices</string> + <string>&Rescan Devices</string> </property> @@ -135,3 +135,3 @@ <name>margin</name> - <number>2</number> + <number>4</number> </property> @@ -202,40 +202,6 @@ </attribute> - <vbox> - <property stdset="1"> - <name>margin</name> - <number>11</number> - </property> - <property stdset="1"> - <name>spacing</name> - <number>6</number> - </property> - <widget> - <class>QGroupBox</class> - <property stdset="1"> - <name>name</name> - <cstring>GroupBox1</cstring> - </property> - <property stdset="1"> - <name>title</name> - <string>Bluetooth Basic Config</string> - </property> - <vbox> - <property stdset="1"> - <name>margin</name> - <number>11</number> - </property> - <property stdset="1"> - <name>spacing</name> - <number>6</number> - </property> - <widget> - <class>QLayoutWidget</class> - <property stdset="1"> - <name>name</name> - <cstring>Layout7</cstring> - </property> - <hbox> + <grid> <property stdset="1"> <name>margin</name> - <number>0</number> + <number>4</number> </property> @@ -243,24 +209,9 @@ <name>spacing</name> - <number>6</number> - </property> - <widget> - <class>QLayoutWidget</class> - <property stdset="1"> - <name>name</name> - <cstring>Layout6</cstring> - </property> - <vbox> - <property stdset="1"> - <name>margin</name> - <number>0</number> - </property> - <property stdset="1"> - <name>spacing</name> - <number>6</number> + <number>2</number> </property> - <widget> - <class>QLabel</class> + <widget row="1" column="0" > + <class>QPushButton</class> <property stdset="1"> <name>name</name> - <cstring>deviceNameLabel</cstring> + <cstring>rfcommBindButton</cstring> </property> @@ -268,28 +219,25 @@ <name>text</name> - <string>Device Name</string> + <string>&Edit RFCOMM Bind Table</string> </property> </widget> - <widget> - <class>QLabel</class> + <widget row="0" column="0" > + <class>QGroupBox</class> <property stdset="1"> <name>name</name> - <cstring>passkeyLabel</cstring> + <cstring>GroupBox1</cstring> </property> <property stdset="1"> - <name>text</name> - <string>Default Passkey</string> + <name>title</name> + <string>Bluetooth Basic Config</string> </property> - </widget> - </vbox> - </widget> - <widget> - <class>QLayoutWidget</class> - <property stdset="1"> - <name>name</name> - <cstring>Layout5</cstring> + <property> + <name>layoutMargin</name> </property> - <vbox> + <property> + <name>layoutSpacing</name> + </property> + <grid> <property stdset="1"> <name>margin</name> - <number>0</number> + <number>4</number> </property> @@ -297,42 +245,16 @@ <name>spacing</name> - <number>6</number> - </property> - <widget> - <class>QLineEdit</class> - <property stdset="1"> - <name>name</name> - <cstring>deviceNameLine</cstring> + <number>2</number> </property> - </widget> - <widget> - <class>QLineEdit</class> + <widget row="6" column="0" rowspan="1" colspan="2" > + <class>QPushButton</class> <property stdset="1"> <name>name</name> - <cstring>passkeyLine</cstring> + <cstring>configApplyButton</cstring> </property> <property stdset="1"> - <name>echoMode</name> - <enum>Password</enum> + <name>text</name> + <string>Apply</string> </property> </widget> - </vbox> - </widget> - </hbox> - </widget> - <widget> - <class>QLayoutWidget</class> - <property stdset="1"> - <name>name</name> - <cstring>Layout5</cstring> - </property> - <vbox> - <property stdset="1"> - <name>margin</name> - <number>0</number> - </property> - <property stdset="1"> - <name>spacing</name> - <number>6</number> - </property> - <widget> + <widget row="2" column="0" rowspan="1" colspan="2" > <class>QCheckBox</class> @@ -347,3 +269,3 @@ </widget> - <widget> + <widget row="3" column="0" rowspan="1" colspan="2" > <class>QCheckBox</class> @@ -358,3 +280,3 @@ </widget> - <widget> + <widget row="4" column="0" rowspan="1" colspan="2" > <class>QCheckBox</class> @@ -369,3 +291,3 @@ </widget> - <widget> + <widget row="5" column="0" rowspan="1" colspan="2" > <class>QCheckBox</class> @@ -380,9 +302,18 @@ </widget> - </vbox> + <widget row="0" column="0" > + <class>QLabel</class> + <property stdset="1"> + <name>name</name> + <cstring>deviceNameLabel</cstring> + </property> + <property stdset="1"> + <name>text</name> + <string>Device Name</string> + </property> </widget> - <widget> - <class>QPushButton</class> + <widget row="1" column="0" > + <class>QLabel</class> <property stdset="1"> <name>name</name> - <cstring>configApplyButton</cstring> + <cstring>passkeyLabel</cstring> </property> @@ -390,19 +321,26 @@ <name>text</name> - <string>Apply</string> + <string>Default Passkey</string> </property> </widget> - </vbox> + <widget row="0" column="1" > + <class>QLineEdit</class> + <property stdset="1"> + <name>name</name> + <cstring>deviceNameLine</cstring> + </property> </widget> - <widget> - <class>QPushButton</class> + <widget row="1" column="1" > + <class>QLineEdit</class> <property stdset="1"> <name>name</name> - <cstring>rfcommBindButton</cstring> + <cstring>passkeyLine</cstring> </property> <property stdset="1"> - <name>text</name> - <string>Rfcomm Bind Table</string> + <name>echoMode</name> + <enum>Password</enum> </property> </widget> - </vbox> + </grid> + </widget> + </grid> </widget> @@ -421,3 +359,3 @@ <name>margin</name> - <number>2</number> + <number>4</number> </property> @@ -441,3 +379,3 @@ </widget> - </vbox> + </grid> </widget> diff --git a/noncore/net/opietooth/manager/devicedialog.ui b/noncore/net/opietooth/manager/devicedialog.ui index e5750ed..2ecfd4c 100644 --- a/noncore/net/opietooth/manager/devicedialog.ui +++ b/noncore/net/opietooth/manager/devicedialog.ui @@ -13,4 +13,4 @@ <y>0</y> - <width>584</width> - <height>480</height> + <width>275</width> + <height>323</height> </rect> @@ -21,23 +21,18 @@ </property> - <widget> - <class>QLabel</class> - <property stdset="1"> - <name>name</name> - <cstring>TextLabel4</cstring> + <property> + <name>layoutMargin</name> + </property> + <property> + <name>layoutSpacing</name> </property> + <grid> <property stdset="1"> - <name>geometry</name> - <rect> - <x>0</x> - <y>0</y> - <width>170</width> - <height>20</height> - </rect> + <name>margin</name> + <number>6</number> </property> <property stdset="1"> - <name>text</name> - <string>Devicename</string> + <name>spacing</name> + <number>3</number> </property> - </widget> - <widget> + <widget row="0" column="0" > <class>QTabWidget</class> @@ -47,10 +42,7 @@ </property> - <property stdset="1"> - <name>geometry</name> - <rect> - <x>-10</x> - <y>0</y> - <width>240</width> - <height>320</height> - </rect> + <property> + <name>layoutMargin</name> + </property> + <property> + <name>layoutSpacing</name> </property> @@ -66,3 +58,12 @@ </attribute> - <widget> + <grid> + <property stdset="1"> + <name>margin</name> + <number>4</number> + </property> + <property stdset="1"> + <name>spacing</name> + <number>3</number> + </property> + <widget row="1" column="0" > <class>QPushButton</class> @@ -73,16 +74,7 @@ <property stdset="1"> - <name>geometry</name> - <rect> - <x>50</x> - <y>200</y> - <width>129</width> - <height>31</height> - </rect> - </property> - <property stdset="1"> <name>text</name> - <string>change settings</string> + <string>&Apply Changes</string> </property> </widget> - <widget> + <widget row="0" column="0" > <class>QListView</class> @@ -120,12 +112,4 @@ </property> - <property stdset="1"> - <name>geometry</name> - <rect> - <x>10</x> - <y>10</y> - <width>220</width> - <height>180</height> - </rect> - </property> </widget> + </grid> </widget> @@ -141,24 +125,12 @@ </attribute> - <widget> - <class>QLabel</class> + <grid> <property stdset="1"> - <name>name</name> - <cstring>TextLabel5</cstring> + <name>margin</name> + <number>4</number> </property> <property stdset="1"> - <name>geometry</name> - <rect> - <x>10</x> - <y>0</y> - <width>110</width> - <height>50</height> - </rect> + <name>spacing</name> + <number>3</number> </property> - <property stdset="1"> - <name>text</name> - <string>Change device -name</string> - </property> - </widget> - <widget> + <widget row="1" column="0" > <class>QLabel</class> @@ -169,17 +141,7 @@ name</string> <property stdset="1"> - <name>geometry</name> - <rect> - <x>8</x> - <y>53</y> - <width>100</width> - <height>40</height> - </rect> - </property> - <property stdset="1"> <name>text</name> - <string>Default PIN -Code</string> + <string>Default PIN Code</string> </property> </widget> - <widget> + <widget row="1" column="1" > <class>QLineEdit</class> @@ -187,30 +149,45 @@ Code</string> <name>name</name> - <cstring>LineEdit1</cstring> + <cstring>LineEdit6</cstring> </property> + </widget> + <widget row="0" column="1" > + <class>QLineEdit</class> <property stdset="1"> - <name>geometry</name> - <rect> - <x>120</x> - <y>10</y> - <width>110</width> - <height>22</height> - </rect> + <name>name</name> + <cstring>LineEdit1</cstring> </property> </widget> - <widget> - <class>QLineEdit</class> + <widget row="0" column="0" > + <class>QLabel</class> <property stdset="1"> <name>name</name> - <cstring>LineEdit6</cstring> + <cstring>TextLabel5</cstring> </property> <property stdset="1"> - <name>geometry</name> - <rect> - <x>120</x> - <y>50</y> - <width>110</width> - <height>22</height> - </rect> + <name>text</name> + <string>Change device name</string> </property> </widget> + <spacer row="2" column="0" > + <property> + <name>name</name> + <cstring>Spacer1</cstring> + </property> + <property stdset="1"> + <name>orientation</name> + <enum>Vertical</enum> + </property> + <property stdset="1"> + <name>sizeType</name> + <enum>Expanding</enum> + </property> + <property> + <name>sizeHint</name> + <size> + <width>20</width> + <height>20</height> + </size> + </property> + </spacer> + </grid> </widget> @@ -226,3 +203,12 @@ Code</string> </attribute> - <widget> + <grid> + <property stdset="1"> + <name>margin</name> + <number>4</number> + </property> + <property stdset="1"> + <name>spacing</name> + <number>2</number> + </property> + <widget row="0" column="0" > <class>QLabel</class> @@ -233,11 +219,2 @@ Code</string> <property stdset="1"> - <name>geometry</name> - <rect> - <x>18</x> - <y>13</y> - <width>210</width> - <height>230</height> - </rect> - </property> - <property stdset="1"> <name>text</name> @@ -246,4 +223,6 @@ Code</string> </widget> + </grid> </widget> </widget> + </grid> </widget> |