做一些函数以及变量名字的修改
Merge branch 'master' of https://github.com/muyr/pyqt_topic