diff --git a/README.md b/README.md
index 928f7fb..ac7afb0 100644
--- a/README.md
+++ b/README.md
@@ -1,11 +1,10 @@
-#### 一、特别说明
+#### 一、特别说明
1. 可以选择打开QWidgetDemo.pro一次性编译所有的,也可以到目录下打开pro编译。
2. 如果发现有些子项目没有加载请打开对应目录下的.pro仔细看里面的注释。
3. 编译好的可执行文件在源码同级目录下的bin目录。
4. 亲测Qt4.6到Qt6.2所有版本,亲测win、linux、mac、uos等系统。
5. 有少部分项目不支持部分Qt版本比如Qt6,会自动跳过。
-6. **本项目开源的是下面表格中描述的内容,并未开源左侧的树状导航菜单控件,只是方便展示演示效果图,直接用的自定义控件大全的效果图,懒得重新截图。**
-7. **建议用git命令行下载,压缩包下载后重新解压文件可能会有问题,不知为何。**
+6. **建议用git命令行下载,压缩包下载后重新解压文件可能会有问题,不知为何。**
8. **强烈推荐各位搭配Qt开发经验一起学习 [https://gitee.com/feiyangqingyun/qtkaifajingyan](https://gitee.com/feiyangqingyun/qtkaifajingyan)**
#### 二、目录说明
diff --git a/control/0snap/battery.jpg b/control/0snap/battery.jpg
index 545c6d3..261d432 100644
Binary files a/control/0snap/battery.jpg and b/control/0snap/battery.jpg differ
diff --git a/control/0snap/devicebutton.jpg b/control/0snap/devicebutton.jpg
index 8889fb2..4b5f770 100644
Binary files a/control/0snap/devicebutton.jpg and b/control/0snap/devicebutton.jpg differ
diff --git a/control/0snap/devicesizetable.jpg b/control/0snap/devicesizetable.jpg
index 76d6037..5f81f5d 100644
Binary files a/control/0snap/devicesizetable.jpg and b/control/0snap/devicesizetable.jpg differ
diff --git a/control/0snap/imageswitch.jpg b/control/0snap/imageswitch.jpg
index dec7adb..81ac048 100644
Binary files a/control/0snap/imageswitch.jpg and b/control/0snap/imageswitch.jpg differ
diff --git a/control/0snap/ipaddress.jpg b/control/0snap/ipaddress.jpg
index c1ffc40..3afe1e6 100644
Binary files a/control/0snap/ipaddress.jpg and b/control/0snap/ipaddress.jpg differ
diff --git a/control/0snap/lightbutton.jpg b/control/0snap/lightbutton.jpg
index ee0d4a3..210453a 100644
Binary files a/control/0snap/lightbutton.jpg and b/control/0snap/lightbutton.jpg differ
diff --git a/control/0snap/navbutton.jpg b/control/0snap/navbutton.jpg
index 8e22868..846483c 100644
Binary files a/control/0snap/navbutton.jpg and b/control/0snap/navbutton.jpg differ
diff --git a/control/0snap/savelog.jpg b/control/0snap/savelog.jpg
index 1419d72..f3978a0 100644
Binary files a/control/0snap/savelog.jpg and b/control/0snap/savelog.jpg differ
diff --git a/control/0snap/saveruntime.jpg b/control/0snap/saveruntime.jpg
index 328c767..9744710 100644
Binary files a/control/0snap/saveruntime.jpg and b/control/0snap/saveruntime.jpg differ
diff --git a/control/0snap/smoothcurve.jpg b/control/0snap/smoothcurve.jpg
index dbb1a88..53ffa7b 100644
Binary files a/control/0snap/smoothcurve.jpg and b/control/0snap/smoothcurve.jpg differ
diff --git a/control/0snap/zhtopy.jpg b/control/0snap/zhtopy.jpg
index 4281eea..c2c78ce 100644
Binary files a/control/0snap/zhtopy.jpg and b/control/0snap/zhtopy.jpg differ
diff --git a/control/zhtopy/frmzhtopy.ui b/control/zhtopy/frmzhtopy.ui
index 235a907..aa72b9b 100644
--- a/control/zhtopy/frmzhtopy.ui
+++ b/control/zhtopy/frmzhtopy.ui
@@ -13,90 +13,68 @@
Form
-
- -
-
-
-
- 0
+
+
+
+ 11
+ 11
+ 481
+ 63
+
+
+
+
+ 0
+
+
+ 0
+
+
+ 0
+
+
+ 0
+
+
-
+
+
+ 转全拼
-
- 0
+
+
+ -
+
+
+ 飞扬青云 QQ:517216493
-
- 0
+
+
+ -
+
+
+ 汉字
-
- 0
+
+
+ -
+
+
+ -
+
+
+ 结果
-
-
-
-
- 转全拼
-
-
-
- -
-
-
- 飞扬青云 QQ:517216493
-
-
-
- -
-
-
- 汉字
-
-
-
- -
-
-
- -
-
-
- 结果
-
-
-
- -
-
-
- 转简拼
-
-
-
-
-
-
- -
-
-
- Qt::Horizontal
-
-
-
- 59
- 20
-
-
-
-
- -
-
-
- Qt::Vertical
-
-
-
- 20
- 203
-
-
-
-
-
+
+
+ -
+
+
+ 转简拼
+
+
+
+
+
diff --git a/other/0snap/bgdemo.jpg b/other/0snap/bgdemo.jpg
index 4312120..3fe97fe 100644
Binary files a/other/0snap/bgdemo.jpg and b/other/0snap/bgdemo.jpg differ
diff --git a/other/0snap/dbpage.jpg b/other/0snap/dbpage.jpg
index 7630610..dc5f6a2 100644
Binary files a/other/0snap/dbpage.jpg and b/other/0snap/dbpage.jpg differ
diff --git a/other/0snap/echartgauge.jpg b/other/0snap/echartgauge.jpg
index 4d66ef9..5c70f7d 100644
Binary files a/other/0snap/echartgauge.jpg and b/other/0snap/echartgauge.jpg differ
diff --git a/other/0snap/lineeditnext.jpg b/other/0snap/lineeditnext.jpg
index f4a82d9..b0cda24 100644
Binary files a/other/0snap/lineeditnext.jpg and b/other/0snap/lineeditnext.jpg differ
diff --git a/other/0snap/mouseline.jpg b/other/0snap/mouseline.jpg
index 5dcabec..ea82b26 100644
Binary files a/other/0snap/mouseline.jpg and b/other/0snap/mouseline.jpg differ
diff --git a/other/0snap/ntpclient.jpg b/other/0snap/ntpclient.jpg
index b9eb63d..0a6838b 100644
Binary files a/other/0snap/ntpclient.jpg and b/other/0snap/ntpclient.jpg differ
diff --git a/other/0snap/trayicon.jpg b/other/0snap/trayicon.jpg
index bc88a63..8460202 100644
Binary files a/other/0snap/trayicon.jpg and b/other/0snap/trayicon.jpg differ
diff --git a/other/echartgauge/main.cpp b/other/echartgauge/main.cpp
index 3079619..c578744 100644
--- a/other/echartgauge/main.cpp
+++ b/other/echartgauge/main.cpp
@@ -6,6 +6,7 @@
int main(int argc, char *argv[])
{
QApplication a(argc, argv);
+ a.setFont(QFont("Microsoft Yahei", 9));
Widget w;
w.setWindowTitle("Echart图表JS交互示例 (QQ: 517216493 WX: feiyangqingyun)");
diff --git a/other/lineeditnext/main.cpp b/other/lineeditnext/main.cpp
index e3e4502..8c301cb 100644
--- a/other/lineeditnext/main.cpp
+++ b/other/lineeditnext/main.cpp
@@ -6,6 +6,7 @@
int main(int argc, char *argv[])
{
QApplication a(argc, argv);
+ a.setFont(QFont("Microsoft Yahei", 9));
Widget w;
w.setWindowTitle("回车自动跳转 (QQ: 517216493 WX: feiyangqingyun)");
diff --git a/other/lineeditnext/widget.ui b/other/lineeditnext/widget.ui
index 0e6dcfc..04508db 100644
--- a/other/lineeditnext/widget.ui
+++ b/other/lineeditnext/widget.ui
@@ -6,8 +6,8 @@
0
0
- 400
- 300
+ 800
+ 600
@@ -15,30 +15,39 @@
10
10
- 113
+ 181
20
+
+ Qt自定义控件大全
+
10
40
- 113
+ 181
20
+
+ QQ:517216493
+
10
70
- 113
+ 181
20
+
+ WX:feiyangqingyun
+
diff --git a/other/mouseline/main.cpp b/other/mouseline/main.cpp
index 2b15f20..352cfab 100644
--- a/other/mouseline/main.cpp
+++ b/other/mouseline/main.cpp
@@ -6,6 +6,7 @@
int main(int argc, char *argv[])
{
QApplication a(argc, argv);
+ a.setFont(QFont("Microsoft Yahei", 9));
Widget w;
w.setWindowTitle("鼠标十字线 (QQ: 517216493 WX: feiyangqingyun)");
diff --git a/other/mouseline/widget.ui b/other/mouseline/widget.ui
index 3cc2c01..3227497 100644
--- a/other/mouseline/widget.ui
+++ b/other/mouseline/widget.ui
@@ -6,8 +6,8 @@
0
0
- 400
- 300
+ 800
+ 600
diff --git a/third/0snap/hotkey.jpg b/third/0snap/hotkey.jpg
index 09d1f33..3fac2a6 100644
Binary files a/third/0snap/hotkey.jpg and b/third/0snap/hotkey.jpg differ
diff --git a/third/0snap/miniblink.jpg b/third/0snap/miniblink.jpg
index 318a091..3ca6fb2 100644
Binary files a/third/0snap/miniblink.jpg and b/third/0snap/miniblink.jpg differ
diff --git a/third/0snap/qwtdemo.jpg b/third/0snap/qwtdemo.jpg
index 3633594..7207d63 100644
Binary files a/third/0snap/qwtdemo.jpg and b/third/0snap/qwtdemo.jpg differ
diff --git a/third/0snap/shortcut.jpg b/third/0snap/shortcut.jpg
index 09d1f33..47c86dc 100644
Binary files a/third/0snap/shortcut.jpg and b/third/0snap/shortcut.jpg differ
diff --git a/third/hotkey/frmhotkey.ui b/third/hotkey/frmhotkey.ui
index 6e96f30..919a809 100644
--- a/third/hotkey/frmhotkey.ui
+++ b/third/hotkey/frmhotkey.ui
@@ -6,8 +6,8 @@
0
0
- 400
- 300
+ 800
+ 600
diff --git a/third/hotkey/main.cpp b/third/hotkey/main.cpp
index a0e4bb3..bb76894 100644
--- a/third/hotkey/main.cpp
+++ b/third/hotkey/main.cpp
@@ -6,6 +6,7 @@
int main(int argc, char *argv[])
{
QApplication a(argc, argv);
+ a.setFont(QFont("Microsoft Yahei", 9));
frmHotKey w;
w.setWindowTitle("全局热键示例 (QQ: 517216493 WX: feiyangqingyun)");
diff --git a/third/miniblink/main.cpp b/third/miniblink/main.cpp
index e4c847a..d0b28f6 100644
--- a/third/miniblink/main.cpp
+++ b/third/miniblink/main.cpp
@@ -5,7 +5,8 @@
int main(int argc, char *argv[])
{
- QApplication a(argc, argv);
+ QApplication a(argc, argv);
+ a.setFont(QFont("Microsoft Yahei", 9));
Widget w;
w.setWindowTitle("miniblink使用示例 (QQ: 517216493 WX: feiyangqingyun)");
diff --git a/third/qwtdemo/frmmain.ui b/third/qwtdemo/frmmain.ui
index dc6a498..a8db999 100644
--- a/third/qwtdemo/frmmain.ui
+++ b/third/qwtdemo/frmmain.ui
@@ -6,8 +6,8 @@
0
0
- 749
- 456
+ 800
+ 600
diff --git a/third/shortcut/frmshortcut.ui b/third/shortcut/frmshortcut.ui
index 7703fb7..d35f0fa 100644
--- a/third/shortcut/frmshortcut.ui
+++ b/third/shortcut/frmshortcut.ui
@@ -6,8 +6,8 @@
0
0
- 400
- 300
+ 800
+ 600
diff --git a/third/shortcut/main.cpp b/third/shortcut/main.cpp
index 0592029..d85e26d 100644
--- a/third/shortcut/main.cpp
+++ b/third/shortcut/main.cpp
@@ -6,6 +6,7 @@
int main(int argc, char *argv[])
{
QApplication a(argc, argv);
+ a.setFont(QFont("Microsoft Yahei", 9));
frmShortCut w;
w.setWindowTitle("全局热键示例 (QQ: 517216493 WX: feiyangqingyun)");
diff --git a/tool/0snap/base64helper.jpg b/tool/0snap/base64helper.jpg
index 538af2e..f830a21 100644
Binary files a/tool/0snap/base64helper.jpg and b/tool/0snap/base64helper.jpg differ
diff --git a/tool/0snap/countcode.jpg b/tool/0snap/countcode.jpg
index 4b7ca82..a0a188e 100644
Binary files a/tool/0snap/countcode.jpg and b/tool/0snap/countcode.jpg differ
diff --git a/tool/0snap/emailtool.jpg b/tool/0snap/emailtool.jpg
index f2f513c..f827297 100644
Binary files a/tool/0snap/emailtool.jpg and b/tool/0snap/emailtool.jpg differ
diff --git a/tool/0snap/keydemo.jpg b/tool/0snap/keydemo.jpg
index a5ebc44..2bba60f 100644
Binary files a/tool/0snap/keydemo.jpg and b/tool/0snap/keydemo.jpg differ
diff --git a/tool/0snap/keytool.jpg b/tool/0snap/keytool.jpg
index 651267b..a8cd3c2 100644
Binary files a/tool/0snap/keytool.jpg and b/tool/0snap/keytool.jpg differ
diff --git a/tool/0snap/livedemo.jpg b/tool/0snap/livedemo.jpg
index 613dc73..a4bb1a2 100644
Binary files a/tool/0snap/livedemo.jpg and b/tool/0snap/livedemo.jpg differ
diff --git a/tool/0snap/moneytool.jpg b/tool/0snap/moneytool.jpg
index 27a6a8d..9116703 100644
Binary files a/tool/0snap/moneytool.jpg and b/tool/0snap/moneytool.jpg differ
diff --git a/tool/0snap/pngtool.jpg b/tool/0snap/pngtool.jpg
index e922d21..af23e53 100644
Binary files a/tool/0snap/pngtool.jpg and b/tool/0snap/pngtool.jpg differ
diff --git a/tool/keydemo/frmmain.ui b/tool/keydemo/frmmain.ui
index b3cb5e6..8252d78 100644
--- a/tool/keydemo/frmmain.ui
+++ b/tool/keydemo/frmmain.ui
@@ -6,29 +6,66 @@
0
0
- 400
- 300
+ 800
+ 600
frmMain
-
- -
+
+
-
- -
-
-
- 测试设备
+
-
+
+
+
+ 150
+ 0
+
-
-
- -
-
-
- 添加
+
+
+ 150
+ 16777215
+
+
+ QFrame::Box
+
+
+ QFrame::Sunken
+
+
+
-
+
+
+ 测试设备
+
+
+
+ -
+
+
+ 添加
+
+
+
+ -
+
+
+ Qt::Vertical
+
+
+
+ 20
+ 486
+
+
+
+
+
diff --git a/tool/keytool/frmmain.ui b/tool/keytool/frmmain.ui
index 622a854..d59b2de 100644
--- a/tool/keytool/frmmain.ui
+++ b/tool/keytool/frmmain.ui
@@ -6,13 +6,10 @@
0
0
- 334
- 129
+ 800
+ 600
-
- frmMain
-
-
diff --git a/tool/livedemo/frmmain.ui b/tool/livedemo/frmmain.ui
index 9317247..0757192 100644
--- a/tool/livedemo/frmmain.ui
+++ b/tool/livedemo/frmmain.ui
@@ -6,8 +6,8 @@
0
0
- 400
- 300
+ 800
+ 600
diff --git a/tool/moneytool/main.cpp b/tool/moneytool/main.cpp
index a84b602..badd9a7 100644
--- a/tool/moneytool/main.cpp
+++ b/tool/moneytool/main.cpp
@@ -6,6 +6,7 @@
int main(int argc, char *argv[])
{
QApplication a(argc, argv);
+ a.setFont(QFont("Microsoft Yahei", 9));
Widget w;
w.setWindowTitle("存款计算器 (QQ: 517216493 WX: feiyangqingyun)");
diff --git a/tool/moneytool/widget.ui b/tool/moneytool/widget.ui
index 24e0224..9fe738a 100644
--- a/tool/moneytool/widget.ui
+++ b/tool/moneytool/widget.ui
@@ -6,19 +6,19 @@
0
0
- 400
- 300
+ 800
+ 600
存款计算器
-
+
10
10
- 381
+ 431
86
diff --git a/ui/0snap/flatui.jpg b/ui/0snap/flatui.jpg
index 946a44a..aa5474a 100644
Binary files a/ui/0snap/flatui.jpg and b/ui/0snap/flatui.jpg differ
diff --git a/ui/0snap/uidemo09.jpg b/ui/0snap/uidemo09.jpg
index 6ca4562..0994af8 100644
Binary files a/ui/0snap/uidemo09.jpg and b/ui/0snap/uidemo09.jpg differ
diff --git a/ui/0snap/uidemo10.jpg b/ui/0snap/uidemo10.jpg
index 0dbe46c..f05df5e 100644
Binary files a/ui/0snap/uidemo10.jpg and b/ui/0snap/uidemo10.jpg differ
diff --git a/ui/uidemo10/form/frmmain.cpp b/ui/uidemo10/form/frmmain.cpp
index cf30d35..0599cc9 100644
--- a/ui/uidemo10/form/frmmain.cpp
+++ b/ui/uidemo10/form/frmmain.cpp
@@ -17,9 +17,9 @@ frmMain::~frmMain()
void frmMain::initForm()
{
- int iconSize = 50;
- int iconWidth = 100;
- int iconHeight = 80;
+ int iconSize = 100;
+ int iconWidth = 150;
+ int iconHeight = 130;
QList listColorBg;
listColorBg << "#FF3739" << "#1A9FE0" << "#41BB1A" << "#1570A5" << "#FE781F" << "#9B59BB";
@@ -40,7 +40,7 @@ void frmMain::initForm()
QPixmap pix = IconHelper::getPixmap(listColorText.at(i), icons.at(i), iconSize, iconWidth, iconHeight);
btn->setIcon(QIcon(pix));
btn->setText(names.at(i));
- btn->setStyleSheet(QString("QToolButton{font:%1pt;color:%2;background-color:%3;border:none;border-radius:0px;}")
+ btn->setStyleSheet(QString("QToolButton{font:%1px;color:%2;background-color:%3;border:none;border-radius:0px;}")
.arg(iconSize / 2).arg(listColorText.at(i)).arg(listColorBg.at(i)));
connect(btn, SIGNAL(clicked(bool)), this, SLOT(buttonClicked()));
diff --git a/ui/uidemo10/form/frmmain.ui b/ui/uidemo10/form/frmmain.ui
index b9a879e..65d0a75 100644
--- a/ui/uidemo10/form/frmmain.ui
+++ b/ui/uidemo10/form/frmmain.ui
@@ -6,8 +6,8 @@
0
0
- 644
- 342
+ 800
+ 480
diff --git a/video/0snap/playffmpeg.jpg b/video/0snap/playffmpeg.jpg
index ea83bf7..17299ea 100644
Binary files a/video/0snap/playffmpeg.jpg and b/video/0snap/playffmpeg.jpg differ
diff --git a/video/0snap/plaympv.jpg b/video/0snap/plaympv.jpg
index 87c7924..9a53052 100644
Binary files a/video/0snap/plaympv.jpg and b/video/0snap/plaympv.jpg differ
diff --git a/video/0snap/playvlc.jpg b/video/0snap/playvlc.jpg
index 9f41db9..e6c52ad 100644
Binary files a/video/0snap/playvlc.jpg and b/video/0snap/playvlc.jpg differ
diff --git a/video/0snap/videobox.jpg b/video/0snap/videobox.jpg
index f7a7854..38b6319 100644
Binary files a/video/0snap/videobox.jpg and b/video/0snap/videobox.jpg differ
diff --git a/video/0snap/videopanel.jpg b/video/0snap/videopanel.jpg
index f46c109..39d041d 100644
Binary files a/video/0snap/videopanel.jpg and b/video/0snap/videopanel.jpg differ
diff --git a/video/0snap/videowidget.jpg b/video/0snap/videowidget.jpg
index 15ae550..d943117 100644
Binary files a/video/0snap/videowidget.jpg and b/video/0snap/videowidget.jpg differ
diff --git a/video/playffmpeg/main.cpp b/video/playffmpeg/main.cpp
index 359eed3..a5e8fcc 100644
--- a/video/playffmpeg/main.cpp
+++ b/video/playffmpeg/main.cpp
@@ -9,11 +9,7 @@ int main(int argc, char *argv[])
QCoreApplication::setAttribute(Qt::AA_EnableHighDpiScaling);
#endif
QApplication a(argc, argv);
-
- QFont font;
- font.setFamily("MicroSoft Yahei");
- font.setPixelSize(12);
- a.setFont(font);
+ a.setFont(QFont("Microsoft Yahei", 9));
#if (QT_VERSION <= QT_VERSION_CHECK(5,0,0))
#if _MSC_VER
@@ -31,6 +27,7 @@ int main(int argc, char *argv[])
Widget w;
w.setWindowTitle("视频流播放ffmpeg内核 (QQ: 517216493 WX: feiyangqingyun)");
+ w.resize(800, 600);
w.show();
return a.exec();
diff --git a/video/playffmpeg/widget.cpp b/video/playffmpeg/widget.cpp
index 7f0e1ef..ccf8763 100644
--- a/video/playffmpeg/widget.cpp
+++ b/video/playffmpeg/widget.cpp
@@ -9,12 +9,8 @@ Widget::Widget(QWidget *parent) : QWidget(parent), ui(new Ui::Widget)
QStringList urls;
urls << "https://hls01open.ys7.com/openlive/6e0b2be040a943489ef0b9bb344b96b8.hd.m3u8";
urls << "rtsp://wowzaec2demo.streamlock.net/vod/mp4:BigBuckBunny_115k.mov";
- urls << "rtsp://admin:Admin123456@192.168.0.64:554/Streaming/Channels/102?transportmode=unicast&profile=Profile_2";
- urls << "rtsp://192.168.1.108:554/cam/realmonitor?channel=1&subtype=0&unicast=true&proto=Onvif";
- urls << "rtsp://192.168.1.15:554/media/video1";
- urls << "rtsp://192.168.1.15:554/media/video2";
- urls << "rtsp://192.168.1.247:554/av0_0";
- urls << "rtsp://192.168.1.247:554/av0_1";
+ urls << "http://vfx.mtime.cn/Video/2019/02/04/mp4/190204084208765161.mp4";
+ urls << "rtsp://admin:Admin123456@192.168.0.15:554/media/video1";
ui->cboxUrl->addItems(urls);
ui->cboxUrl->setCurrentIndex(0);
}
diff --git a/video/plaympv/main.cpp b/video/plaympv/main.cpp
index 4185b15..cf29f5d 100644
--- a/video/plaympv/main.cpp
+++ b/video/plaympv/main.cpp
@@ -6,11 +6,7 @@
int main(int argc, char *argv[])
{
QApplication a(argc, argv);
-
- QFont font;
- font.setFamily("MicroSoft Yahei");
- font.setPixelSize(12);
- a.setFont(font);
+ a.setFont(QFont("Microsoft Yahei", 9));
#if (QT_VERSION <= QT_VERSION_CHECK(5,0,0))
#if _MSC_VER
@@ -28,7 +24,7 @@ int main(int argc, char *argv[])
Widget w;
w.setWindowTitle("视频流播放mpv内核 (QQ: 517216493 WX: feiyangqingyun)");
- w.show();
+ w.show();
return a.exec();
}
diff --git a/video/plaympv/widget.cpp b/video/plaympv/widget.cpp
index 7d31ed7..ccf8763 100644
--- a/video/plaympv/widget.cpp
+++ b/video/plaympv/widget.cpp
@@ -9,12 +9,8 @@ Widget::Widget(QWidget *parent) : QWidget(parent), ui(new Ui::Widget)
QStringList urls;
urls << "https://hls01open.ys7.com/openlive/6e0b2be040a943489ef0b9bb344b96b8.hd.m3u8";
urls << "rtsp://wowzaec2demo.streamlock.net/vod/mp4:BigBuckBunny_115k.mov";
- urls << "rtsp://admin:Admin123456@192.168.1.64:554/Streaming/Channels/102?transportmode=unicast&profile=Profile_2";
- urls << "rtsp://192.168.1.108:554/cam/realmonitor?channel=1&subtype=0&unicast=true&proto=Onvif";
- urls << "rtsp://192.168.1.15:554/media/video1";
- urls << "rtsp://192.168.1.15:554/media/video2";
- urls << "rtsp://192.168.1.247:554/av0_0";
- urls << "rtsp://192.168.1.247:554/av0_1";
+ urls << "http://vfx.mtime.cn/Video/2019/02/04/mp4/190204084208765161.mp4";
+ urls << "rtsp://admin:Admin123456@192.168.0.15:554/media/video1";
ui->cboxUrl->addItems(urls);
ui->cboxUrl->setCurrentIndex(0);
}
diff --git a/video/playvlc/main.cpp b/video/playvlc/main.cpp
index 95ece56..c301696 100644
--- a/video/playvlc/main.cpp
+++ b/video/playvlc/main.cpp
@@ -6,11 +6,7 @@
int main(int argc, char *argv[])
{
QApplication a(argc, argv);
-
- QFont font;
- font.setFamily("MicroSoft Yahei");
- font.setPixelSize(12);
- a.setFont(font);
+ a.setFont(QFont("Microsoft Yahei", 9));
#if (QT_VERSION <= QT_VERSION_CHECK(5,0,0))
#if _MSC_VER
diff --git a/video/playvlc/widget.cpp b/video/playvlc/widget.cpp
index 7d31ed7..ccf8763 100644
--- a/video/playvlc/widget.cpp
+++ b/video/playvlc/widget.cpp
@@ -9,12 +9,8 @@ Widget::Widget(QWidget *parent) : QWidget(parent), ui(new Ui::Widget)
QStringList urls;
urls << "https://hls01open.ys7.com/openlive/6e0b2be040a943489ef0b9bb344b96b8.hd.m3u8";
urls << "rtsp://wowzaec2demo.streamlock.net/vod/mp4:BigBuckBunny_115k.mov";
- urls << "rtsp://admin:Admin123456@192.168.1.64:554/Streaming/Channels/102?transportmode=unicast&profile=Profile_2";
- urls << "rtsp://192.168.1.108:554/cam/realmonitor?channel=1&subtype=0&unicast=true&proto=Onvif";
- urls << "rtsp://192.168.1.15:554/media/video1";
- urls << "rtsp://192.168.1.15:554/media/video2";
- urls << "rtsp://192.168.1.247:554/av0_0";
- urls << "rtsp://192.168.1.247:554/av0_1";
+ urls << "http://vfx.mtime.cn/Video/2019/02/04/mp4/190204084208765161.mp4";
+ urls << "rtsp://admin:Admin123456@192.168.0.15:554/media/video1";
ui->cboxUrl->addItems(urls);
ui->cboxUrl->setCurrentIndex(0);
}
diff --git a/widget/0snap/colorwidget.jpg b/widget/0snap/colorwidget.jpg
index eb79f43..4a821c9 100644
Binary files a/widget/0snap/colorwidget.jpg and b/widget/0snap/colorwidget.jpg differ
diff --git a/widget/0snap/framelesswidget.jpg b/widget/0snap/framelesswidget.jpg
index 0fc185f..effa921 100644
Binary files a/widget/0snap/framelesswidget.jpg and b/widget/0snap/framelesswidget.jpg differ
diff --git a/widget/0snap/gifwidget.jpg b/widget/0snap/gifwidget.jpg
index 4fe6ca8..0539b4c 100644
Binary files a/widget/0snap/gifwidget.jpg and b/widget/0snap/gifwidget.jpg differ
diff --git a/widget/0snap/lunarcalendarwidget.jpg b/widget/0snap/lunarcalendarwidget.jpg
index ed5bfdf..6a3fedb 100644
Binary files a/widget/0snap/lunarcalendarwidget.jpg and b/widget/0snap/lunarcalendarwidget.jpg differ
diff --git a/widget/0snap/maskwidget.jpg b/widget/0snap/maskwidget.jpg
index 10615a6..30d8746 100644
Binary files a/widget/0snap/maskwidget.jpg and b/widget/0snap/maskwidget.jpg differ
diff --git a/widget/0snap/movewidget.jpg b/widget/0snap/movewidget.jpg
index 79668b7..72678ae 100644
Binary files a/widget/0snap/movewidget.jpg and b/widget/0snap/movewidget.jpg differ
diff --git a/widget/0snap/screenwidget.jpg b/widget/0snap/screenwidget.jpg
index 087ebc3..c611532 100644
Binary files a/widget/0snap/screenwidget.jpg and b/widget/0snap/screenwidget.jpg differ