修改settle_dlg的布局
Merge remote-tracking branch 'origin/master'