彻底改版2.0

feiyangqingyun · Nov 17, 2021 · ebfd531 · ebfd531
1 parent a7f4347
commit ebfd531
Show file tree

Hide file tree

Showing 2,622 changed files with 8,915 additions and 7,263 deletions.
diff --git a/0snap/base64.png b/0snap/base64.png
diff --git a/0snap/battery.gif b/0snap/battery.gif
diff --git a/0snap/bgdemo.gif b/0snap/bgdemo.gif
diff --git a/0snap/colorwidget.gif b/0snap/colorwidget.gif
diff --git a/0snap/comtool.jpg b/0snap/comtool.jpg
diff --git a/0snap/countcode.gif b/0snap/countcode.gif
diff --git a/0snap/dbpage.png b/0snap/dbpage.png
diff --git a/0snap/designer.png b/0snap/designer.png
diff --git a/0snap/devicebutton.gif b/0snap/devicebutton.gif
diff --git a/0snap/devicesizetable.gif b/0snap/devicesizetable.gif
diff --git a/0snap/echartgauge.gif b/0snap/echartgauge.gif
diff --git a/0snap/emailtool.jpg b/0snap/emailtool.jpg
diff --git a/0snap/ffmpegdemo.png b/0snap/ffmpegdemo.png
diff --git a/0snap/flatui.gif b/0snap/flatui.gif
diff --git a/0snap/frameless.gif b/0snap/frameless.gif
diff --git a/0snap/framelesswidget.gif b/0snap/framelesswidget.gif
diff --git a/0snap/gifwidget.gif b/0snap/gifwidget.gif
diff --git a/0snap/hotkey.gif b/0snap/hotkey.gif
diff --git a/0snap/imageswitch.gif b/0snap/imageswitch.gif
diff --git a/0snap/ipaddress.gif b/0snap/ipaddress.gif
diff --git a/0snap/key.png b/0snap/key.png
diff --git a/0snap/lightbutton.gif b/0snap/lightbutton.gif
diff --git a/0snap/lineeditnext.gif b/0snap/lineeditnext.gif
diff --git a/0snap/live.png b/0snap/live.png
diff --git a/0snap/lunarcalendarwidget.gif b/0snap/lunarcalendarwidget.gif
diff --git a/0snap/maskwidget.gif b/0snap/maskwidget.gif
diff --git a/0snap/miniblink.jpg b/0snap/miniblink.jpg
diff --git a/0snap/moneytool.jpg b/0snap/moneytool.jpg
diff --git a/0snap/mouseline.gif b/0snap/mouseline.gif
diff --git a/0snap/movewidget.gif b/0snap/movewidget.gif
diff --git a/0snap/navbutton.gif b/0snap/navbutton.gif
diff --git a/0snap/netserver.jpg b/0snap/netserver.jpg
diff --git a/0snap/nettool.gif b/0snap/nettool.gif
diff --git a/0snap/ntpclient.gif b/0snap/ntpclient.gif
diff --git a/0snap/pngtool.gif b/0snap/pngtool.gif
diff --git a/0snap/qwt.png b/0snap/qwt.png
diff --git a/0snap/qwtdemo.jpg b/0snap/qwtdemo.jpg
diff --git a/0snap/savelog.jpg b/0snap/savelog.jpg
diff --git a/0snap/saveruntime.jpg b/0snap/saveruntime.jpg
diff --git a/0snap/screenwidget.gif b/0snap/screenwidget.gif
diff --git a/0snap/smoothcurve.gif b/0snap/smoothcurve.gif
diff --git a/0snap/styledemo_flatwhite.png b/0snap/styledemo_flatwhite.png
diff --git a/0snap/styledemo_lightblue.png b/0snap/styledemo_lightblue.png
diff --git a/0snap/styledemo_psblack.png b/0snap/styledemo_psblack.png
diff --git a/0snap/videopanel.gif b/0snap/videopanel.gif
diff --git a/0snap/videowidget.gif b/0snap/videowidget.gif
diff --git a/0snap/vlcdemo.png b/0snap/vlcdemo.png
diff --git a/0snap/zhtopy.gif b/0snap/zhtopy.gif
diff --git a/QWidgetDemo.pro b/QWidgetDemo.pro
@@ -1,69 +1,10 @@
 TEMPLATE = subdirs
-#定义了ordered表示子项目按照添加的顺序来编译
-CONFIG  += ordered
-
-#挨个添加子项目
-SUBDIRS += lightbutton      #高亮按钮控件
-SUBDIRS += movewidget       #通用控件移动类
-SUBDIRS += flatui           #模仿flatui类
-SUBDIRS += countcode        #代码统计组件
-SUBDIRS += gifwidget        #屏幕录制控件
-SUBDIRS += comtool          #串口调试助手
-SUBDIRS += nettool          #网络调试助手
-SUBDIRS += devicesizetable  #硬盘容量控件
-SUBDIRS += styledemo        #高仿PS黑色+扁平白色+淡蓝色风格主题
-SUBDIRS += navbutton        #导航按钮控件
-SUBDIRS += videopanel       #视频监控画面分割demo
-SUBDIRS += framelesswidget  #跨平台无边框窗体
-SUBDIRS += ipaddress        #IP地址输入控件
-SUBDIRS += bgdemo           #无边框背景透明窗体
-SUBDIRS += dbpage           #通用数据库翻页查询
-SUBDIRS += pngtool          #PNG图片警告去除工具
-SUBDIRS += savelog          #日志重定向输出类
-SUBDIRS += saveruntime      #运行时间记录类
-SUBDIRS += colorwidget      #颜色拾取器
-SUBDIRS += maskwidget       #遮罩层窗体
-SUBDIRS += battery          #电池电量控件
-SUBDIRS += lineeditnext     #文本框回车焦点下移
-SUBDIRS += zhtopy           #汉字转拼音
-SUBDIRS += devicebutton     #设备按钮地图效果
-SUBDIRS += mouseline        #鼠标定位十字线
-SUBDIRS += emailtool        #邮件发送工具
-SUBDIRS += ntpclient        #NTP服务器时间同步
-SUBDIRS += lunarcalendarwidget#农历控件
-SUBDIRS += videowidget      #通用视频控件
-SUBDIRS += screenwidget     #屏幕截图控件
-SUBDIRS += imageswitch      #图片开关控件
-SUBDIRS += netserver        #网络中转服务器
-SUBDIRS += base64helper     #图片文字base64互换
-SUBDIRS += smoothcurve      #平滑曲线
-SUBDIRS += moneytool        #存款计算器
-SUBDIRS += hotkey           #全局热键示例 目前只支持Qt5
-
-#限定windows系统加载下面的项目
-win32 {
-SUBDIRS += ffmpegdemo       #视频流播放ffmpeg内核
-SUBDIRS += vlcdemo          #视频流播放vlc内核
-SUBDIRS += mpvdemo          #视频流播放mpv内核
-SUBDIRS += miniblink        #miniblink示例
-}
-
-#如果你电脑对应的Qt版本有webkit或者webengine组件可以自行打开
-#SUBDIRS += echartgauge      #echart仪表盘含交互支持webkit及webengine
-
-#这个项目依赖QtDesigner模块,一般在arm上默认没有这个模块需要自行编译
-#所以arm上如果没有QtDesigner模块不要加载下面这个子项目
-lessThan(QT_MAJOR_VERSION, 5) {
-SUBDIRS += designer         #QtDesigner4源码
-}
-
-#qwt项目需要等官方适配了qwt组件才能适配
-lessThan(QT_MAJOR_VERSION, 6) {
-SUBDIRS += qwtdemo          #qwt的源码版本，无需插件，直接源码集成到你的项目即可
-}
-
-#6.0到6.2之间的版本还有点问题等待正式发布的时候再试试
-greaterThan(QT_MAJOR_VERSION, 5) {
-SUBDIRS -= emailtool
-SUBDIRS -= hotkey
-}
+SUBDIRS += control
+SUBDIRS += tool
+SUBDIRS += video
+SUBDIRS += widget
+SUBDIRS += ui
+SUBDIRS += other
+SUBDIRS += third
+#网友提交的可能很多Qt版本不支持需要自行打开验证
+#SUBDIRS += netfriend
diff --git a/README.md b/README.md
diff --git a/comtool/api/api.pri b/comtool/api/api.pri
diff --git a/control/0snap/battery.jpg b/control/0snap/battery.jpg
diff --git a/control/0snap/devicebutton.jpg b/control/0snap/devicebutton.jpg
diff --git a/control/0snap/devicesizetable.jpg b/control/0snap/devicesizetable.jpg
diff --git a/control/0snap/imageswitch.jpg b/control/0snap/imageswitch.jpg
diff --git a/control/0snap/ipaddress.jpg b/control/0snap/ipaddress.jpg
diff --git a/control/0snap/lightbutton.jpg b/control/0snap/lightbutton.jpg
diff --git a/control/0snap/navbutton.jpg b/control/0snap/navbutton.jpg
diff --git a/control/0snap/savelog.jpg b/control/0snap/savelog.jpg
diff --git a/control/0snap/saveruntime.jpg b/control/0snap/saveruntime.jpg
diff --git a/control/0snap/smoothcurve.jpg b/control/0snap/smoothcurve.jpg
diff --git a/control/0snap/zhtopy.jpg b/control/0snap/zhtopy.jpg
diff --git a/battery/battery.cpp → control/battery/battery.cpp b/battery/battery.cpp → control/battery/battery.cpp
diff --git a/battery/battery.h → control/battery/battery.h b/battery/battery.h → control/battery/battery.h
diff --git a/battery/battery.pro → control/battery/battery.pro b/battery/battery.pro → control/battery/battery.pro
diff --git a/battery/frmbattery.cpp → control/battery/frmbattery.cpp b/battery/frmbattery.cpp → control/battery/frmbattery.cpp
diff --git a/battery/frmbattery.h → control/battery/frmbattery.h b/battery/frmbattery.h → control/battery/frmbattery.h
diff --git a/battery/frmbattery.ui → control/battery/frmbattery.ui b/battery/frmbattery.ui → control/battery/frmbattery.ui
diff --git a/battery/main.cpp → control/battery/main.cpp b/battery/main.cpp → control/battery/main.cpp
diff --git a/control/control.pro b/control/control.pro
@@ -0,0 +1,12 @@
+TEMPLATE = subdirs
+SUBDIRS += battery
+SUBDIRS += devicebutton
+SUBDIRS += devicesizetable
+SUBDIRS += imageswitch
+SUBDIRS += ipaddress
+SUBDIRS += lightbutton
+SUBDIRS += navbutton
+SUBDIRS += savelog
+SUBDIRS += saveruntime
+SUBDIRS += smoothcurve
+SUBDIRS += zhtopy
diff --git a/devicebutton/devicebutton.cpp → control/devicebutton/devicebutton.cpp b/devicebutton/devicebutton.cpp → control/devicebutton/devicebutton.cpp
diff --git a/devicebutton/devicebutton.h → control/devicebutton/devicebutton.h b/devicebutton/devicebutton.h → control/devicebutton/devicebutton.h
diff --git a/devicebutton/devicebutton.pro → control/devicebutton/devicebutton.pro b/devicebutton/devicebutton.pro → control/devicebutton/devicebutton.pro
diff --git a/devicebutton/frmdevicebutton.cpp → control/devicebutton/frmdevicebutton.cpp b/devicebutton/frmdevicebutton.cpp → control/devicebutton/frmdevicebutton.cpp
diff --git a/devicebutton/frmdevicebutton.h → control/devicebutton/frmdevicebutton.h b/devicebutton/frmdevicebutton.h → control/devicebutton/frmdevicebutton.h
diff --git a/devicebutton/frmdevicebutton.ui → control/devicebutton/frmdevicebutton.ui b/devicebutton/frmdevicebutton.ui → control/devicebutton/frmdevicebutton.ui
diff --git a/devicebutton/image/bg_call.jpg → control/devicebutton/image/bg_call.jpg b/devicebutton/image/bg_call.jpg → control/devicebutton/image/bg_call.jpg
diff --git a/...evicebutton/devicebutton_black_bubble.png → ...evicebutton/devicebutton_black_bubble.png b/...evicebutton/devicebutton_black_bubble.png → ...evicebutton/devicebutton_black_bubble.png
diff --git a/...vicebutton/devicebutton_black_bubble2.png → ...vicebutton/devicebutton_black_bubble2.png b/...vicebutton/devicebutton_black_bubble2.png → ...vicebutton/devicebutton_black_bubble2.png
diff --git a/...evicebutton/devicebutton_black_circle.png → ...evicebutton/devicebutton_black_circle.png b/...evicebutton/devicebutton_black_circle.png → ...evicebutton/devicebutton_black_circle.png
diff --git a/...e/devicebutton/devicebutton_black_msg.png → ...e/devicebutton/devicebutton_black_msg.png b/...e/devicebutton/devicebutton_black_msg.png → ...e/devicebutton/devicebutton_black_msg.png
diff --git a/.../devicebutton/devicebutton_black_msg2.png → .../devicebutton/devicebutton_black_msg2.png b/.../devicebutton/devicebutton_black_msg2.png → .../devicebutton/devicebutton_black_msg2.png
diff --git a/...evicebutton/devicebutton_black_police.png → ...evicebutton/devicebutton_black_police.png b/...evicebutton/devicebutton_black_police.png → ...evicebutton/devicebutton_black_police.png
diff --git a/...devicebutton/devicebutton_blue_bubble.png → ...devicebutton/devicebutton_blue_bubble.png b/...devicebutton/devicebutton_blue_bubble.png → ...devicebutton/devicebutton_blue_bubble.png
diff --git a/...evicebutton/devicebutton_blue_bubble2.png → ...evicebutton/devicebutton_blue_bubble2.png b/...evicebutton/devicebutton_blue_bubble2.png → ...evicebutton/devicebutton_blue_bubble2.png
diff --git a/...devicebutton/devicebutton_blue_circle.png → ...devicebutton/devicebutton_blue_circle.png b/...devicebutton/devicebutton_blue_circle.png → ...devicebutton/devicebutton_blue_circle.png
diff --git a/...ge/devicebutton/devicebutton_blue_msg.png → ...ge/devicebutton/devicebutton_blue_msg.png b/...ge/devicebutton/devicebutton_blue_msg.png → ...ge/devicebutton/devicebutton_blue_msg.png
diff --git a/...e/devicebutton/devicebutton_blue_msg2.png → ...e/devicebutton/devicebutton_blue_msg2.png b/...e/devicebutton/devicebutton_blue_msg2.png → ...e/devicebutton/devicebutton_blue_msg2.png
diff --git a/...devicebutton/devicebutton_blue_police.png → ...devicebutton/devicebutton_blue_police.png b/...devicebutton/devicebutton_blue_police.png → ...devicebutton/devicebutton_blue_police.png
diff --git a/...devicebutton/devicebutton_gray_bubble.png → ...devicebutton/devicebutton_gray_bubble.png b/...devicebutton/devicebutton_gray_bubble.png → ...devicebutton/devicebutton_gray_bubble.png
diff --git a/...evicebutton/devicebutton_gray_bubble2.png → ...evicebutton/devicebutton_gray_bubble2.png b/...evicebutton/devicebutton_gray_bubble2.png → ...evicebutton/devicebutton_gray_bubble2.png
diff --git a/...devicebutton/devicebutton_gray_circle.png → ...devicebutton/devicebutton_gray_circle.png b/...devicebutton/devicebutton_gray_circle.png → ...devicebutton/devicebutton_gray_circle.png
diff --git a/...ge/devicebutton/devicebutton_gray_msg.png → ...ge/devicebutton/devicebutton_gray_msg.png b/...ge/devicebutton/devicebutton_gray_msg.png → ...ge/devicebutton/devicebutton_gray_msg.png
diff --git a/...e/devicebutton/devicebutton_gray_msg2.png → ...e/devicebutton/devicebutton_gray_msg2.png b/...e/devicebutton/devicebutton_gray_msg2.png → ...e/devicebutton/devicebutton_gray_msg2.png
diff --git a/...devicebutton/devicebutton_gray_police.png → ...devicebutton/devicebutton_gray_police.png b/...devicebutton/devicebutton_gray_police.png → ...devicebutton/devicebutton_gray_police.png
diff --git a/...evicebutton/devicebutton_green_bubble.png → ...evicebutton/devicebutton_green_bubble.png b/...evicebutton/devicebutton_green_bubble.png → ...evicebutton/devicebutton_green_bubble.png
diff --git a/...vicebutton/devicebutton_green_bubble2.png → ...vicebutton/devicebutton_green_bubble2.png b/...vicebutton/devicebutton_green_bubble2.png → ...vicebutton/devicebutton_green_bubble2.png
diff --git a/...evicebutton/devicebutton_green_circle.png → ...evicebutton/devicebutton_green_circle.png b/...evicebutton/devicebutton_green_circle.png → ...evicebutton/devicebutton_green_circle.png
diff --git a/...e/devicebutton/devicebutton_green_msg.png → ...e/devicebutton/devicebutton_green_msg.png b/...e/devicebutton/devicebutton_green_msg.png → ...e/devicebutton/devicebutton_green_msg.png
diff --git a/.../devicebutton/devicebutton_green_msg2.png → .../devicebutton/devicebutton_green_msg2.png b/.../devicebutton/devicebutton_green_msg2.png → .../devicebutton/devicebutton_green_msg2.png
diff --git a/...evicebutton/devicebutton_green_police.png → ...evicebutton/devicebutton_green_police.png b/...evicebutton/devicebutton_green_police.png → ...evicebutton/devicebutton_green_police.png
diff --git a/...vicebutton/devicebutton_purple_bubble.png → ...vicebutton/devicebutton_purple_bubble.png b/...vicebutton/devicebutton_purple_bubble.png → ...vicebutton/devicebutton_purple_bubble.png
diff --git a/...icebutton/devicebutton_purple_bubble2.png → ...icebutton/devicebutton_purple_bubble2.png b/...icebutton/devicebutton_purple_bubble2.png → ...icebutton/devicebutton_purple_bubble2.png
diff --git a/...vicebutton/devicebutton_purple_circle.png → ...vicebutton/devicebutton_purple_circle.png b/...vicebutton/devicebutton_purple_circle.png → ...vicebutton/devicebutton_purple_circle.png
diff --git a/.../devicebutton/devicebutton_purple_msg.png → .../devicebutton/devicebutton_purple_msg.png b/.../devicebutton/devicebutton_purple_msg.png → .../devicebutton/devicebutton_purple_msg.png
diff --git a/...devicebutton/devicebutton_purple_msg2.png → ...devicebutton/devicebutton_purple_msg2.png b/...devicebutton/devicebutton_purple_msg2.png → ...devicebutton/devicebutton_purple_msg2.png
diff --git a/...vicebutton/devicebutton_purple_police.png → ...vicebutton/devicebutton_purple_police.png b/...vicebutton/devicebutton_purple_police.png → ...vicebutton/devicebutton_purple_police.png
diff --git a/.../devicebutton/devicebutton_red_bubble.png → .../devicebutton/devicebutton_red_bubble.png b/.../devicebutton/devicebutton_red_bubble.png → .../devicebutton/devicebutton_red_bubble.png
diff --git a/...devicebutton/devicebutton_red_bubble2.png → ...devicebutton/devicebutton_red_bubble2.png b/...devicebutton/devicebutton_red_bubble2.png → ...devicebutton/devicebutton_red_bubble2.png
diff --git a/.../devicebutton/devicebutton_red_circle.png → .../devicebutton/devicebutton_red_circle.png b/.../devicebutton/devicebutton_red_circle.png → .../devicebutton/devicebutton_red_circle.png
diff --git a/...age/devicebutton/devicebutton_red_msg.png → ...age/devicebutton/devicebutton_red_msg.png b/...age/devicebutton/devicebutton_red_msg.png → ...age/devicebutton/devicebutton_red_msg.png
diff --git a/...ge/devicebutton/devicebutton_red_msg2.png → ...ge/devicebutton/devicebutton_red_msg2.png b/...ge/devicebutton/devicebutton_red_msg2.png → ...ge/devicebutton/devicebutton_red_msg2.png
diff --git a/.../devicebutton/devicebutton_red_police.png → .../devicebutton/devicebutton_red_police.png b/.../devicebutton/devicebutton_red_police.png → .../devicebutton/devicebutton_red_police.png
diff --git a/...vicebutton/devicebutton_yellow_bubble.png → ...vicebutton/devicebutton_yellow_bubble.png b/...vicebutton/devicebutton_yellow_bubble.png → ...vicebutton/devicebutton_yellow_bubble.png
diff --git a/...icebutton/devicebutton_yellow_bubble2.png → ...icebutton/devicebutton_yellow_bubble2.png b/...icebutton/devicebutton_yellow_bubble2.png → ...icebutton/devicebutton_yellow_bubble2.png
diff --git a/...vicebutton/devicebutton_yellow_circle.png → ...vicebutton/devicebutton_yellow_circle.png b/...vicebutton/devicebutton_yellow_circle.png → ...vicebutton/devicebutton_yellow_circle.png
diff --git a/.../devicebutton/devicebutton_yellow_msg.png → .../devicebutton/devicebutton_yellow_msg.png b/.../devicebutton/devicebutton_yellow_msg.png → .../devicebutton/devicebutton_yellow_msg.png
diff --git a/...devicebutton/devicebutton_yellow_msg2.png → ...devicebutton/devicebutton_yellow_msg2.png b/...devicebutton/devicebutton_yellow_msg2.png → ...devicebutton/devicebutton_yellow_msg2.png
diff --git a/...vicebutton/devicebutton_yellow_police.png → ...vicebutton/devicebutton_yellow_police.png b/...vicebutton/devicebutton_yellow_police.png → ...vicebutton/devicebutton_yellow_police.png
diff --git a/devicebutton/main.cpp → control/devicebutton/main.cpp b/devicebutton/main.cpp → control/devicebutton/main.cpp
diff --git a/devicebutton/main.qrc → control/devicebutton/main.qrc b/devicebutton/main.qrc → control/devicebutton/main.qrc
diff --git a/devicesizetable/devicesizetable.cpp → control/devicesizetable/devicesizetable.cpp b/devicesizetable/devicesizetable.cpp → control/devicesizetable/devicesizetable.cpp
diff --git a/devicesizetable/devicesizetable.h → control/devicesizetable/devicesizetable.h b/devicesizetable/devicesizetable.h → control/devicesizetable/devicesizetable.h
diff --git a/devicesizetable/devicesizetable.pro → control/devicesizetable/devicesizetable.pro b/devicesizetable/devicesizetable.pro → control/devicesizetable/devicesizetable.pro
diff --git a/devicesizetable/frmdevicesizetable.cpp → ...ol/devicesizetable/frmdevicesizetable.cpp b/devicesizetable/frmdevicesizetable.cpp → ...ol/devicesizetable/frmdevicesizetable.cpp
diff --git a/devicesizetable/frmdevicesizetable.h → control/devicesizetable/frmdevicesizetable.h b/devicesizetable/frmdevicesizetable.h → control/devicesizetable/frmdevicesizetable.h
diff --git a/devicesizetable/frmdevicesizetable.ui → ...rol/devicesizetable/frmdevicesizetable.ui b/devicesizetable/frmdevicesizetable.ui → ...rol/devicesizetable/frmdevicesizetable.ui
diff --git a/devicesizetable/main.cpp → control/devicesizetable/main.cpp b/devicesizetable/main.cpp → control/devicesizetable/main.cpp
diff --git a/imageswitch/frmimageswitch.cpp → control/imageswitch/frmimageswitch.cpp b/imageswitch/frmimageswitch.cpp → control/imageswitch/frmimageswitch.cpp
diff --git a/imageswitch/frmimageswitch.h → control/imageswitch/frmimageswitch.h b/imageswitch/frmimageswitch.h → control/imageswitch/frmimageswitch.h
diff --git a/imageswitch/frmimageswitch.ui → control/imageswitch/frmimageswitch.ui b/imageswitch/frmimageswitch.ui → control/imageswitch/frmimageswitch.ui
diff --git a/...switch/image/imageswitch/btncheckoff1.png → ...switch/image/imageswitch/btncheckoff1.png b/...switch/image/imageswitch/btncheckoff1.png → ...switch/image/imageswitch/btncheckoff1.png
diff --git a/...switch/image/imageswitch/btncheckoff2.png → ...switch/image/imageswitch/btncheckoff2.png b/...switch/image/imageswitch/btncheckoff2.png → ...switch/image/imageswitch/btncheckoff2.png
diff --git a/...switch/image/imageswitch/btncheckoff3.png → ...switch/image/imageswitch/btncheckoff3.png b/...switch/image/imageswitch/btncheckoff3.png → ...switch/image/imageswitch/btncheckoff3.png
diff --git a/...eswitch/image/imageswitch/btncheckon1.png → ...eswitch/image/imageswitch/btncheckon1.png b/...eswitch/image/imageswitch/btncheckon1.png → ...eswitch/image/imageswitch/btncheckon1.png
diff --git a/...eswitch/image/imageswitch/btncheckon2.png → ...eswitch/image/imageswitch/btncheckon2.png b/...eswitch/image/imageswitch/btncheckon2.png → ...eswitch/image/imageswitch/btncheckon2.png
diff --git a/...eswitch/image/imageswitch/btncheckon3.png → ...eswitch/image/imageswitch/btncheckon3.png b/...eswitch/image/imageswitch/btncheckon3.png → ...eswitch/image/imageswitch/btncheckon3.png
diff --git a/imageswitch/imageswitch.cpp → control/imageswitch/imageswitch.cpp b/imageswitch/imageswitch.cpp → control/imageswitch/imageswitch.cpp
diff --git a/imageswitch/imageswitch.h → control/imageswitch/imageswitch.h b/imageswitch/imageswitch.h → control/imageswitch/imageswitch.h
diff --git a/imageswitch/imageswitch.pro → control/imageswitch/imageswitch.pro b/imageswitch/imageswitch.pro → control/imageswitch/imageswitch.pro
diff --git a/imageswitch/main.cpp → control/imageswitch/main.cpp b/imageswitch/main.cpp → control/imageswitch/main.cpp
diff --git a/imageswitch/main.qrc → control/imageswitch/main.qrc b/imageswitch/main.qrc → control/imageswitch/main.qrc
diff --git a/ipaddress/frmipaddress.cpp → control/ipaddress/frmipaddress.cpp b/ipaddress/frmipaddress.cpp → control/ipaddress/frmipaddress.cpp
diff --git a/ipaddress/frmipaddress.h → control/ipaddress/frmipaddress.h b/ipaddress/frmipaddress.h → control/ipaddress/frmipaddress.h
@@ -22,7 +22,6 @@ private slots:
     void on_btnSetIP_clicked();
     void on_btnGetIP_clicked();
     void on_btnClear_clicked();
-
 };
 
 #endif // FRMADDRESS_H
diff --git a/ipaddress/frmipaddress.ui → control/ipaddress/frmipaddress.ui b/ipaddress/frmipaddress.ui → control/ipaddress/frmipaddress.ui
diff --git a/ipaddress/ipaddress.cpp → control/ipaddress/ipaddress.cpp b/ipaddress/ipaddress.cpp → control/ipaddress/ipaddress.cpp
diff --git a/ipaddress/ipaddress.h → control/ipaddress/ipaddress.h b/ipaddress/ipaddress.h → control/ipaddress/ipaddress.h
diff --git a/ipaddress/ipaddress.pro → control/ipaddress/ipaddress.pro b/ipaddress/ipaddress.pro → control/ipaddress/ipaddress.pro
diff --git a/ipaddress/main.cpp → control/ipaddress/main.cpp b/ipaddress/main.cpp → control/ipaddress/main.cpp
diff --git a/lightbutton/frmlightbutton.cpp → control/lightbutton/frmlightbutton.cpp b/lightbutton/frmlightbutton.cpp → control/lightbutton/frmlightbutton.cpp
diff --git a/lightbutton/frmlightbutton.h → control/lightbutton/frmlightbutton.h b/lightbutton/frmlightbutton.h → control/lightbutton/frmlightbutton.h
diff --git a/lightbutton/frmlightbutton.ui → control/lightbutton/frmlightbutton.ui b/lightbutton/frmlightbutton.ui → control/lightbutton/frmlightbutton.ui
diff --git a/lightbutton/lightbutton.cpp → control/lightbutton/lightbutton.cpp b/lightbutton/lightbutton.cpp → control/lightbutton/lightbutton.cpp
diff --git a/lightbutton/lightbutton.h → control/lightbutton/lightbutton.h b/lightbutton/lightbutton.h → control/lightbutton/lightbutton.h
diff --git a/lightbutton/lightbutton.pro → control/lightbutton/lightbutton.pro b/lightbutton/lightbutton.pro → control/lightbutton/lightbutton.pro
diff --git a/lightbutton/main.cpp → control/lightbutton/main.cpp b/lightbutton/main.cpp → control/lightbutton/main.cpp
diff --git a/...lendarwidget/font/fontawesome-webfont.ttf → ...ol/navbutton/font/fontawesome-webfont.ttf b/...lendarwidget/font/fontawesome-webfont.ttf → ...ol/navbutton/font/fontawesome-webfont.ttf
diff --git a/navbutton/frmnavbutton.cpp → control/navbutton/frmnavbutton.cpp b/navbutton/frmnavbutton.cpp → control/navbutton/frmnavbutton.cpp
diff --git a/navbutton/frmnavbutton.h → control/navbutton/frmnavbutton.h b/navbutton/frmnavbutton.h → control/navbutton/frmnavbutton.h
diff --git a/navbutton/frmnavbutton.ui → control/navbutton/frmnavbutton.ui b/navbutton/frmnavbutton.ui → control/navbutton/frmnavbutton.ui
diff --git a/core_qui/iconhelper.cpp → control/navbutton/iconhelper.cpp b/core_qui/iconhelper.cpp → control/navbutton/iconhelper.cpp
diff --git a/core_qui/iconhelper.h → control/navbutton/iconhelper.h b/core_qui/iconhelper.h → control/navbutton/iconhelper.h
diff --git a/navbutton/main.cpp → control/navbutton/main.cpp b/navbutton/main.cpp → control/navbutton/main.cpp
diff --git a/navbutton/main.qrc → control/navbutton/main.qrc b/navbutton/main.qrc → control/navbutton/main.qrc
diff --git a/navbutton/navbutton.cpp → control/navbutton/navbutton.cpp b/navbutton/navbutton.cpp → control/navbutton/navbutton.cpp
diff --git a/navbutton/navbutton.h → control/navbutton/navbutton.h b/navbutton/navbutton.h → control/navbutton/navbutton.h
diff --git a/navbutton/navbutton.pro → control/navbutton/navbutton.pro b/navbutton/navbutton.pro → control/navbutton/navbutton.pro
diff --git a/savelog/frmsavelog.cpp → control/savelog/frmsavelog.cpp b/savelog/frmsavelog.cpp → control/savelog/frmsavelog.cpp
@@ -166,10 +166,6 @@ void frmSaveLog::on_cboxRow_currentIndexChanged(int index)
 
 void frmSaveLog::on_listType_itemPressed(QListWidgetItem *item)
 {
-    if (item <= 0) {
-        return;
-    }
-
     //切换选中行状态
     item->setCheckState(item->checkState() == Qt::Checked ? Qt::Unchecked : Qt::Checked);
 

diff --git a/savelog/frmsavelog.h → control/savelog/frmsavelog.h b/savelog/frmsavelog.h → control/savelog/frmsavelog.h
diff --git a/savelog/frmsavelog.ui → control/savelog/frmsavelog.ui b/savelog/frmsavelog.ui → control/savelog/frmsavelog.ui
diff --git a/savelog/main.cpp → control/savelog/main.cpp b/savelog/main.cpp → control/savelog/main.cpp
diff --git a/savelog/savelog.cpp → control/savelog/savelog.cpp b/savelog/savelog.cpp → control/savelog/savelog.cpp
diff --git a/savelog/savelog.h → control/savelog/savelog.h b/savelog/savelog.h → control/savelog/savelog.h
diff --git a/savelog/savelog.pro → control/savelog/savelog.pro b/savelog/savelog.pro → control/savelog/savelog.pro
diff --git a/saveruntime/frmsaveruntime.cpp → control/saveruntime/frmsaveruntime.cpp b/saveruntime/frmsaveruntime.cpp → control/saveruntime/frmsaveruntime.cpp
diff --git a/saveruntime/frmsaveruntime.h → control/saveruntime/frmsaveruntime.h b/saveruntime/frmsaveruntime.h → control/saveruntime/frmsaveruntime.h
diff --git a/saveruntime/frmsaveruntime.ui → control/saveruntime/frmsaveruntime.ui b/saveruntime/frmsaveruntime.ui → control/saveruntime/frmsaveruntime.ui
diff --git a/saveruntime/main.cpp → control/saveruntime/main.cpp b/saveruntime/main.cpp → control/saveruntime/main.cpp
diff --git a/saveruntime/saveruntime.cpp → control/saveruntime/saveruntime.cpp b/saveruntime/saveruntime.cpp → control/saveruntime/saveruntime.cpp
diff --git a/saveruntime/saveruntime.h → control/saveruntime/saveruntime.h b/saveruntime/saveruntime.h → control/saveruntime/saveruntime.h
diff --git a/saveruntime/saveruntime.pro → control/saveruntime/saveruntime.pro b/saveruntime/saveruntime.pro → control/saveruntime/saveruntime.pro
diff --git a/smoothcurve/frmsmoothcurve.cpp → control/smoothcurve/frmsmoothcurve.cpp b/smoothcurve/frmsmoothcurve.cpp → control/smoothcurve/frmsmoothcurve.cpp
diff --git a/smoothcurve/frmsmoothcurve.h → control/smoothcurve/frmsmoothcurve.h b/smoothcurve/frmsmoothcurve.h → control/smoothcurve/frmsmoothcurve.h
diff --git a/smoothcurve/frmsmoothcurve.ui → control/smoothcurve/frmsmoothcurve.ui b/smoothcurve/frmsmoothcurve.ui → control/smoothcurve/frmsmoothcurve.ui
diff --git a/smoothcurve/main.cpp → control/smoothcurve/main.cpp b/smoothcurve/main.cpp → control/smoothcurve/main.cpp
diff --git a/smoothcurve/smoothcurve.cpp → control/smoothcurve/smoothcurve.cpp b/smoothcurve/smoothcurve.cpp → control/smoothcurve/smoothcurve.cpp
diff --git a/smoothcurve/smoothcurve.h → control/smoothcurve/smoothcurve.h b/smoothcurve/smoothcurve.h → control/smoothcurve/smoothcurve.h
diff --git a/smoothcurve/smoothcurve.pro → control/smoothcurve/smoothcurve.pro b/smoothcurve/smoothcurve.pro → control/smoothcurve/smoothcurve.pro
diff --git a/zhtopy/image/zhtopy.txt → control/zhtopy/data/zhtopy.txt b/zhtopy/image/zhtopy.txt → control/zhtopy/data/zhtopy.txt
diff --git a/zhtopy/frmzhtopy.cpp → control/zhtopy/frmzhtopy.cpp b/zhtopy/frmzhtopy.cpp → control/zhtopy/frmzhtopy.cpp
@@ -5,7 +5,7 @@
 frmZhToPY::frmZhToPY(QWidget *parent) : QWidget(parent), ui(new Ui::frmZhToPY)
 {
     ui->setupUi(this);
-    ZhToPY::Instance()->loadPY(":/image/zhtopy.txt");
+    ZhToPY::Instance()->loadPY(":/data/zhtopy.txt");
 }
 
 frmZhToPY::~frmZhToPY()

diff --git a/zhtopy/frmzhtopy.h → control/zhtopy/frmzhtopy.h b/zhtopy/frmzhtopy.h → control/zhtopy/frmzhtopy.h
diff --git a/zhtopy/frmzhtopy.ui → control/zhtopy/frmzhtopy.ui b/zhtopy/frmzhtopy.ui → control/zhtopy/frmzhtopy.ui
diff --git a/zhtopy/main.cpp → control/zhtopy/main.cpp b/zhtopy/main.cpp → control/zhtopy/main.cpp
diff --git a/netserver/qrc/main.qrc → control/zhtopy/main.qrc b/netserver/qrc/main.qrc → control/zhtopy/main.qrc
@@ -1,5 +1,5 @@
 <RCC>
     <qresource prefix="/">
-        <file>main.ico</file>
+        <file>data/zhtopy.txt</file>
     </qresource>
 </RCC>
diff --git a/zhtopy/zhtopy.cpp → control/zhtopy/zhtopy.cpp b/zhtopy/zhtopy.cpp → control/zhtopy/zhtopy.cpp
diff --git a/zhtopy/zhtopy.h → control/zhtopy/zhtopy.h b/zhtopy/zhtopy.h → control/zhtopy/zhtopy.h
diff --git a/zhtopy/zhtopy.pro → control/zhtopy/zhtopy.pro b/zhtopy/zhtopy.pro → control/zhtopy/zhtopy.pro
diff --git a/core_qui/quiconfig.cpp b/core_qui/quiconfig.cpp
diff --git a/core_qui/quiconfig.h b/core_qui/quiconfig.h