TaisyncSettings.qml 28.7 KB
Newer Older
1 2 3 4 5 6 7 8 9 10
/****************************************************************************
 *
 *   (c) 2009-2016 QGROUNDCONTROL PROJECT <http://www.qgroundcontrol.org>
 *
 * QGroundControl is licensed according to the terms in the file
 * COPYING.md in the root of the source code directory.
 *
 ****************************************************************************/


11 12 13 14 15 16 17 18 19
import QtGraphicalEffects       1.0
import QtMultimedia             5.5
import QtQuick                  2.3
import QtQuick.Controls         1.2
import QtQuick.Controls.Styles  1.4
import QtQuick.Dialogs          1.2
import QtQuick.Layouts          1.2
import QtLocation               5.3
import QtPositioning            5.3
20 21

import QGroundControl                       1.0
22
import QGroundControl.Controllers           1.0
23
import QGroundControl.Controls              1.0
24 25
import QGroundControl.FactControls          1.0
import QGroundControl.FactSystem            1.0
26
import QGroundControl.Palette               1.0
27 28
import QGroundControl.ScreenTools           1.0
import QGroundControl.SettingsManager       1.0
29

30
Rectangle {
31
    id:                 _root
32 33
    color:              qgcPal.window
    anchors.fill:       parent
34
    anchors.margins:    ScreenTools.defaultFontPixelWidth
35 36 37

    property real _labelWidth:                  ScreenTools.defaultFontPixelWidth * 26
    property real _valueWidth:                  ScreenTools.defaultFontPixelWidth * 20
38
    property real _panelWidth:                  _root.width * _internalWidthRatio
39 40
    property Fact _taisyncEnabledFact:          QGroundControl.settingsManager.appSettings.enableTaisync
    property Fact _taisyncVideoEnabledFact:     QGroundControl.settingsManager.appSettings.enableTaisyncVideo
Gus Grubba's avatar
Gus Grubba committed
41
    property bool _taisyncEnabled:              _taisyncEnabledFact.rawValue
42 43 44

    readonly property real _internalWidthRatio:          0.8

45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68
    QGCFlickable {
        clip:               true
        anchors.fill:       parent
        contentHeight:      settingsColumn.height
        contentWidth:       settingsColumn.width
        Column {
            id:                 settingsColumn
            width:              _root.width
            spacing:            ScreenTools.defaultFontPixelHeight * 0.5
            anchors.margins:    ScreenTools.defaultFontPixelWidth
            QGCLabel {
                text:           qsTr("Reboot ground unit for changes to take effect.")
                color:          qgcPal.colorOrange
                visible:        QGroundControl.taisyncManager.needReboot
                font.family:    ScreenTools.demiboldFontFamily
                anchors.horizontalCenter:   parent.horizontalCenter
            }
            //-----------------------------------------------------------------
            //-- General
            Item {
                width:                      _panelWidth
                height:                     generalLabel.height
                anchors.margins:            ScreenTools.defaultFontPixelWidth
                anchors.horizontalCenter:   parent.horizontalCenter
Gus Grubba's avatar
Gus Grubba committed
69
                QGCLabel {
70 71
                    id:             generalLabel
                    text:           qsTr("General")
Gus Grubba's avatar
Gus Grubba committed
72 73
                    font.family:    ScreenTools.demiboldFontFamily
                }
74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98
            }
            Rectangle {
                height:                     generalRow.height + (ScreenTools.defaultFontPixelHeight * 2)
                width:                      _panelWidth
                color:                      qgcPal.windowShade
                anchors.margins:            ScreenTools.defaultFontPixelWidth
                anchors.horizontalCenter:   parent.horizontalCenter
                Row {
                    id:                 generalRow
                    spacing:            ScreenTools.defaultFontPixelWidth * 4
                    anchors.centerIn:   parent
                    Column {
                        spacing:        ScreenTools.defaultFontPixelWidth
                        FactCheckBox {
                            text:       qsTr("Enable Taisync")
                            fact:       _taisyncEnabledFact
                            enabled:    !QGroundControl.taisyncManager.needReboot
                            visible:    _taisyncEnabledFact.visible
                        }
                        FactCheckBox {
                            text:       qsTr("Enable Taisync Video")
                            fact:       _taisyncVideoEnabledFact
                            visible:    _taisyncVideoEnabledFact.visible
                            enabled:    _taisyncEnabled && !QGroundControl.taisyncManager.needReboot
                        }
99 100
                    }
                }
101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159
            }
            //-----------------------------------------------------------------
            //-- Connection Status
            Item {
                width:                      _panelWidth
                height:                     statusLabel.height
                anchors.margins:            ScreenTools.defaultFontPixelWidth
                anchors.horizontalCenter:   parent.horizontalCenter
                visible:                    _taisyncEnabled
                QGCLabel {
                    id:                     statusLabel
                    text:                   qsTr("Connection Status")
                    font.family:            ScreenTools.demiboldFontFamily
                }
            }
            Rectangle {
                height:                     statusCol.height + (ScreenTools.defaultFontPixelHeight * 2)
                width:                      _panelWidth
                color:                      qgcPal.windowShade
                visible:                    _taisyncEnabled
                anchors.margins:            ScreenTools.defaultFontPixelWidth
                anchors.horizontalCenter:   parent.horizontalCenter
                Column {
                    id:                     statusCol
                    spacing:                ScreenTools.defaultFontPixelHeight * 0.5
                    width:                  parent.width
                    anchors.centerIn:       parent
                    GridLayout {
                        anchors.margins:    ScreenTools.defaultFontPixelHeight
                        columnSpacing:      ScreenTools.defaultFontPixelWidth * 2
                        anchors.horizontalCenter: parent.horizontalCenter
                        columns: 2
                        QGCLabel {
                            text:           qsTr("Ground Unit:")
                            Layout.minimumWidth: _labelWidth
                        }
                        QGCLabel {
                            text:           QGroundControl.taisyncManager.connected ? qsTr("Connected") : qsTr("Not Connected")
                            color:          QGroundControl.taisyncManager.connected ? qgcPal.colorGreen : qgcPal.colorRed
                            Layout.minimumWidth: _valueWidth
                        }
                        QGCLabel {
                            text:           qsTr("Air Unit:")
                        }
                        QGCLabel {
                            text:           QGroundControl.taisyncManager.linkConnected ? qsTr("Connected") : qsTr("Not Connected")
                            color:          QGroundControl.taisyncManager.linkConnected ? qgcPal.colorGreen : qgcPal.colorRed
                        }
                        QGCLabel {
                            text:           qsTr("Uplink RSSI:")
                        }
                        QGCLabel {
                            text:           QGroundControl.taisyncManager.linkConnected ? QGroundControl.taisyncManager.uplinkRSSI : ""
                        }
                        QGCLabel {
                            text:           qsTr("Downlink RSSI:")
                        }
                        QGCLabel {
                            text:           QGroundControl.taisyncManager.linkConnected ? QGroundControl.taisyncManager.downlinkRSSI : ""
160 161 162
                        }
                    }
                }
163 164 165 166 167 168 169 170 171 172 173 174 175
            }
            //-----------------------------------------------------------------
            //-- Device Info
            Item {
                width:                      _panelWidth
                height:                     devInfoLabel.height
                anchors.margins:            ScreenTools.defaultFontPixelWidth
                anchors.horizontalCenter:   parent.horizontalCenter
                visible:                    _taisyncEnabled && QGroundControl.taisyncManager.connected
                QGCLabel {
                    id:                     devInfoLabel
                    text:                   qsTr("Device Info")
                    font.family:            ScreenTools.demiboldFontFamily
176
                }
177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199
            }
            Rectangle {
                height:                     devInfoCol.height + (ScreenTools.defaultFontPixelHeight * 2)
                width:                      _panelWidth
                color:                      qgcPal.windowShade
                visible:                    _taisyncEnabled && QGroundControl.taisyncManager.connected
                anchors.margins:            ScreenTools.defaultFontPixelWidth
                anchors.horizontalCenter:   parent.horizontalCenter
                Column {
                    id:                     devInfoCol
                    spacing:                ScreenTools.defaultFontPixelHeight * 0.5
                    width:                  parent.width
                    anchors.centerIn:       parent
                    GridLayout {
                        anchors.margins:    ScreenTools.defaultFontPixelHeight
                        columnSpacing:      ScreenTools.defaultFontPixelWidth * 2
                        anchors.horizontalCenter: parent.horizontalCenter
                        columns: 2
                        QGCLabel {
                            text:           qsTr("Serial Number:")
                            Layout.minimumWidth: _labelWidth
                        }
                        QGCLabel {
200
                            text:           QGroundControl.taisyncManager.connected ? QGroundControl.taisyncManager.serialNumber : ""
201 202 203 204 205 206
                            Layout.minimumWidth: _valueWidth
                        }
                        QGCLabel {
                            text:           qsTr("Firmware Version:")
                        }
                        QGCLabel {
207
                            text:           QGroundControl.taisyncManager.connected ? QGroundControl.taisyncManager.fwVersion : ""
208 209 210
                        }
                    }
                }
211 212 213 214 215 216 217 218 219 220 221 222 223
            }
            //-----------------------------------------------------------------
            //-- Radio Settings
            Item {
                width:                      _panelWidth
                height:                     radioSettingsLabel.height
                anchors.margins:            ScreenTools.defaultFontPixelWidth
                anchors.horizontalCenter:   parent.horizontalCenter
                visible:                    _taisyncEnabled && QGroundControl.taisyncManager.linkConnected
                QGCLabel {
                    id:                     radioSettingsLabel
                    text:                   qsTr("Radio Settings")
                    font.family:            ScreenTools.demiboldFontFamily
224
                }
225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260
            }
            Rectangle {
                height:                     radioSettingsCol.height + (ScreenTools.defaultFontPixelHeight * 2)
                width:                      _panelWidth
                color:                      qgcPal.windowShade
                visible:                    _taisyncEnabled && QGroundControl.taisyncManager.linkConnected
                anchors.margins:            ScreenTools.defaultFontPixelWidth
                anchors.horizontalCenter:   parent.horizontalCenter
                Column {
                    id:                     radioSettingsCol
                    spacing:                ScreenTools.defaultFontPixelHeight * 0.5
                    width:                  parent.width
                    anchors.centerIn:       parent
                    GridLayout {
                        anchors.margins:    ScreenTools.defaultFontPixelHeight
                        columnSpacing:      ScreenTools.defaultFontPixelWidth * 2
                        anchors.horizontalCenter: parent.horizontalCenter
                        columns: 2
                        QGCLabel {
                            text:           qsTr("Radio Mode:")
                            Layout.minimumWidth: _labelWidth
                        }
                        FactComboBox {
                            fact:           QGroundControl.taisyncManager.radioMode
                            indexModel:     true
                            enabled:        QGroundControl.taisyncManager.linkConnected && !QGroundControl.taisyncManager.needReboot
                            Layout.minimumWidth: _valueWidth
                        }
                        QGCLabel {
                            text:           qsTr("Radio Frequency:")
                        }
                        FactComboBox {
                            fact:           QGroundControl.taisyncManager.radioChannel
                            indexModel:     true
                            enabled:        QGroundControl.taisyncManager.linkConnected && QGroundControl.taisyncManager.radioMode.rawValue > 0 && !QGroundControl.taisyncManager.needReboot
                            Layout.minimumWidth: _valueWidth
261 262 263
                        }
                    }
                }
264 265 266 267 268 269 270 271 272 273 274 275 276
            }
            //-----------------------------------------------------------------
            //-- Video Settings
            Item {
                width:                      _panelWidth
                height:                     videoSettingsLabel.height
                anchors.margins:            ScreenTools.defaultFontPixelWidth
                anchors.horizontalCenter:   parent.horizontalCenter
                visible:                    _taisyncEnabled && QGroundControl.taisyncManager.linkConnected
                QGCLabel {
                    id:                     videoSettingsLabel
                    text:                   qsTr("Video Settings")
                    font.family:            ScreenTools.demiboldFontFamily
277
                }
278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 317 318 319 320 321 322
            }
            Rectangle {
                height:                     videoSettingsCol.height + (ScreenTools.defaultFontPixelHeight * 2)
                width:                      _panelWidth
                color:                      qgcPal.windowShade
                visible:                    _taisyncEnabled && QGroundControl.taisyncManager.linkConnected
                anchors.margins:            ScreenTools.defaultFontPixelWidth
                anchors.horizontalCenter:   parent.horizontalCenter
                Column {
                    id:                     videoSettingsCol
                    spacing:                ScreenTools.defaultFontPixelHeight * 0.5
                    width:                  parent.width
                    anchors.centerIn:       parent
                    GridLayout {
                        anchors.margins:    ScreenTools.defaultFontPixelHeight
                        columnSpacing:      ScreenTools.defaultFontPixelWidth * 2
                        anchors.horizontalCenter: parent.horizontalCenter
                        columns: 2
                        QGCLabel {
                            text:           qsTr("Video Output:")
                            Layout.minimumWidth: _labelWidth
                        }
                        FactComboBox {
                            fact:           QGroundControl.taisyncManager.videoOutput
                            indexModel:     true
                            enabled:        QGroundControl.taisyncManager.linkConnected && !QGroundControl.taisyncManager.needReboot
                            Layout.minimumWidth: _valueWidth
                        }
                        QGCLabel {
                            text:           qsTr("Encoder:")
                        }
                        FactComboBox {
                            fact:           QGroundControl.taisyncManager.videoMode
                            indexModel:     true
                            enabled:        QGroundControl.taisyncManager.linkConnected && !QGroundControl.taisyncManager.needReboot
                            Layout.minimumWidth: _valueWidth
                        }
                        QGCLabel {
                            text:           qsTr("Bit Rate:")
                        }
                        FactComboBox {
                            fact:           QGroundControl.taisyncManager.videoRate
                            indexModel:     true
                            enabled:        QGroundControl.taisyncManager.linkConnected && !QGroundControl.taisyncManager.needReboot
                            Layout.minimumWidth: _valueWidth
323 324 325
                        }
                    }
                }
326 327 328 329 330 331 332 333 334 335 336 337 338
            }
            //-----------------------------------------------------------------
            //-- RTSP Settings
            Item {
                width:                      _panelWidth
                height:                     rtspSettingsLabel.height
                anchors.margins:            ScreenTools.defaultFontPixelWidth
                anchors.horizontalCenter:   parent.horizontalCenter
                visible:                    _taisyncEnabled && QGroundControl.taisyncManager.connected
                QGCLabel {
                    id:                     rtspSettingsLabel
                    text:                   qsTr("Streaming Settings")
                    font.family:            ScreenTools.demiboldFontFamily
Gus Grubba's avatar
Gus Grubba committed
339
                }
340 341 342 343 344 345 346 347 348 349 350 351 352 353 354 355 356 357 358 359 360 361 362 363 364 365 366 367 368 369 370 371 372 373 374 375 376 377 378 379 380 381 382 383 384 385 386
            }
            Rectangle {
                height:                     rtspSettingsCol.height + (ScreenTools.defaultFontPixelHeight * 2)
                width:                      _panelWidth
                color:                      qgcPal.windowShade
                visible:                    _taisyncEnabled && QGroundControl.taisyncManager.connected
                anchors.margins:            ScreenTools.defaultFontPixelWidth
                anchors.horizontalCenter:   parent.horizontalCenter
                Column {
                    id:                     rtspSettingsCol
                    spacing:                ScreenTools.defaultFontPixelHeight * 0.5
                    width:                  parent.width
                    anchors.centerIn:       parent
                    GridLayout {
                        anchors.margins:    ScreenTools.defaultFontPixelHeight
                        columnSpacing:      ScreenTools.defaultFontPixelWidth * 2
                        anchors.horizontalCenter: parent.horizontalCenter
                        columns: 2
                        QGCLabel {
                            text:           qsTr("RTSP URI:")
                            Layout.minimumWidth: _labelWidth
                        }
                        QGCTextField {
                            id:             rtspURI
                            text:           QGroundControl.taisyncManager.rtspURI
                            enabled:        QGroundControl.taisyncManager.connected && !QGroundControl.taisyncManager.needReboot
                            inputMethodHints:    Qt.ImhUrlCharactersOnly
                            Layout.minimumWidth: _valueWidth
                        }
                        QGCLabel {
                            text:           qsTr("Account:")
                        }
                        QGCTextField {
                            id:             rtspAccount
                            text:           QGroundControl.taisyncManager.rtspAccount
                            enabled:        QGroundControl.taisyncManager.connected && !QGroundControl.taisyncManager.needReboot
                            Layout.minimumWidth: _valueWidth
                        }
                        QGCLabel {
                            text:           qsTr("Password:")
                        }
                        QGCTextField {
                            id:             rtspPassword
                            text:           QGroundControl.taisyncManager.rtspPassword
                            enabled:        QGroundControl.taisyncManager.connected && !QGroundControl.taisyncManager.needReboot
                            inputMethodHints:    Qt.ImhHiddenText
                            Layout.minimumWidth: _valueWidth
Gus Grubba's avatar
Gus Grubba committed
387 388
                        }
                    }
389 390 391
                    Item {
                        width:  1
                        height: ScreenTools.defaultFontPixelHeight
Gus Grubba's avatar
Gus Grubba committed
392
                    }
393 394 395 396 397 398 399 400 401 402 403
                    QGCButton {
                        function testEnabled() {
                            if(!QGroundControl.taisyncManager.connected)
                                return false
                            if(rtspPassword.text === QGroundControl.taisyncManager.rtspPassword &&
                                rtspAccount.text === QGroundControl.taisyncManager.rtspAccount &&
                                rtspURI.text     === QGroundControl.taisyncManager.rtspURI)
                                return false
                            if(rtspURI === "")
                                return false
                            return true
Gus Grubba's avatar
Gus Grubba committed
404
                        }
405 406 407 408 409 410 411 412 413 414 415 416 417 418 419 420 421 422
                        enabled:            testEnabled() && !QGroundControl.taisyncManager.needReboot
                        text:               qsTr("Apply")
                        anchors.horizontalCenter:   parent.horizontalCenter
                        onClicked: {
                            setRTSPDialog.open()
                        }
                        MessageDialog {
                            id:                 setRTSPDialog
                            icon:               StandardIcon.Warning
                            standardButtons:    StandardButton.Yes | StandardButton.No
                            title:              qsTr("Set Streaming Settings")
                            text:               qsTr("Once changed, you will need to reboot the ground unit for the changes to take effect.\n\nConfirm change?")
                            onYes: {
                                QGroundControl.taisyncManager.setRTSPSettings(rtspURI.text, rtspAccount.text, rtspPassword.text)
                                setRTSPDialog.close()
                            }
                            onNo: {
                                setRTSPDialog.close()
Gus Grubba's avatar
Gus Grubba committed
423 424 425 426
                            }
                        }
                    }
                }
427 428 429 430 431 432 433 434 435 436 437 438 439
            }
            //-----------------------------------------------------------------
            //-- IP Settings
            Item {
                width:                      _panelWidth
                height:                     ipSettingsLabel.height
                anchors.margins:            ScreenTools.defaultFontPixelWidth
                anchors.horizontalCenter:   parent.horizontalCenter
                visible:                    _taisyncEnabled && (!ScreenTools.isiOS && !ScreenTools.isAndroid)
                QGCLabel {
                    id:                     ipSettingsLabel
                    text:                   qsTr("Network Settings")
                    font.family:            ScreenTools.demiboldFontFamily
Gus Grubba's avatar
Gus Grubba committed
440
                }
441 442 443 444 445 446 447 448 449 450 451 452 453 454 455 456 457 458 459 460 461
            }
            Rectangle {
                height:                     ipSettingsCol.height + (ScreenTools.defaultFontPixelHeight * 2)
                width:                      _panelWidth
                color:                      qgcPal.windowShade
                visible:                    _taisyncEnabled && (!ScreenTools.isiOS && !ScreenTools.isAndroid)
                anchors.margins:            ScreenTools.defaultFontPixelWidth
                anchors.horizontalCenter:   parent.horizontalCenter
                Column {
                    id:                     ipSettingsCol
                    spacing:                ScreenTools.defaultFontPixelHeight * 0.5
                    width:                  parent.width
                    anchors.centerIn:       parent
                    GridLayout {
                        anchors.margins:    ScreenTools.defaultFontPixelHeight
                        columnSpacing:      ScreenTools.defaultFontPixelWidth * 2
                        anchors.horizontalCenter: parent.horizontalCenter
                        columns: 2
                        QGCLabel {
                            text:           qsTr("Local IP Address:")
                            Layout.minimumWidth: _labelWidth
Gus Grubba's avatar
Gus Grubba committed
462
                        }
463 464 465 466 467 468
                        QGCTextField {
                            id:             localIP
                            text:           QGroundControl.taisyncManager.localIPAddr
                            enabled:        !QGroundControl.taisyncManager.needReboot
                            inputMethodHints:    Qt.ImhFormattedNumbersOnly
                            Layout.minimumWidth: _valueWidth
Gus Grubba's avatar
Gus Grubba committed
469
                        }
470 471 472 473 474 475 476 477 478 479 480 481 482 483 484 485 486 487 488 489 490 491 492 493 494 495 496 497
                        QGCLabel {
                            text:           qsTr("Ground Unit IP Address:")
                        }
                        QGCTextField {
                            id:             remoteIP
                            text:           QGroundControl.taisyncManager.remoteIPAddr
                            enabled:        !QGroundControl.taisyncManager.needReboot
                            inputMethodHints:    Qt.ImhFormattedNumbersOnly
                            Layout.minimumWidth: _valueWidth
                        }
                        QGCLabel {
                            text:           qsTr("Network Mask:")
                        }
                        QGCTextField {
                            id:             netMask
                            text:           QGroundControl.taisyncManager.netMask
                            enabled:        !QGroundControl.taisyncManager.needReboot
                            inputMethodHints:    Qt.ImhFormattedNumbersOnly
                            Layout.minimumWidth: _valueWidth
                        }
                    }
                    Item {
                        width:  1
                        height: ScreenTools.defaultFontPixelHeight
                    }
                    QGCButton {
                        function validateIPaddress(ipaddress) {
                            if (/^(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$/.test(ipaddress))
Gus Grubba's avatar
Gus Grubba committed
498
                                return true
499 500 501 502 503 504 505 506 507 508 509 510 511 512 513 514 515 516 517 518 519 520 521 522 523 524 525 526 527 528
                            return false
                        }
                        function testEnabled() {
                            if(localIP.text   === QGroundControl.taisyncManager.localIPAddr &&
                                remoteIP.text === QGroundControl.taisyncManager.remoteIPAddr &&
                                netMask.text  === QGroundControl.taisyncManager.netMask)
                                return false
                            if(!validateIPaddress(localIP.text))  return false
                            if(!validateIPaddress(remoteIP.text)) return false
                            if(!validateIPaddress(netMask.text))  return false
                            return true
                        }
                        enabled:            testEnabled() && !QGroundControl.taisyncManager.needReboot
                        text:               qsTr("Apply")
                        anchors.horizontalCenter:   parent.horizontalCenter
                        onClicked: {
                            setIPDialog.open()
                        }
                        MessageDialog {
                            id:                 setIPDialog
                            icon:               StandardIcon.Warning
                            standardButtons:    StandardButton.Yes | StandardButton.No
                            title:              qsTr("Set Network Settings")
                            text:               qsTr("Once changed, you will need to reboot the ground unit for the changes to take effect. The local IP address must match the one entered (%1).\n\nConfirm change?").arg(localIP.text)
                            onYes: {
                                QGroundControl.taisyncManager.setIPSettings(localIP.text, remoteIP.text, netMask.text)
                                setIPDialog.close()
                            }
                            onNo: {
                                setIPDialog.close()
Gus Grubba's avatar
Gus Grubba committed
529 530 531 532
                            }
                        }
                    }
                }
533
            }
534 535 536
        }
    }
}