diff --git a/product/src/gui/plugin/IpcWallWidget/VideoWall.cpp b/product/src/gui/plugin/IpcWallWidget/VideoWall.cpp index 16a3db0b..90f2ef54 100644 --- a/product/src/gui/plugin/IpcWallWidget/VideoWall.cpp +++ b/product/src/gui/plugin/IpcWallWidget/VideoWall.cpp @@ -634,7 +634,7 @@ void VideoWall::loadPtzCtrl() void VideoWall::intiPtzUi() { loadPtzUiQss(); - m_ptzui->setSizePolicy(m_ptzui->sizePolicy().horizontalPolicy(),QSizePolicy::Fixed); + m_ptzui->setSizePolicy(m_ptzui->sizePolicy().horizontalPolicy(),QSizePolicy::Maximum); m_ptzui->setObjectName("ptzui"); QVBoxLayout *vl = new QVBoxLayout(); m_ptzui->setLayout(vl); @@ -644,9 +644,7 @@ void VideoWall::intiPtzUi() hlayout->setContentsMargins(10,10,10,10); m_control_1 = new QWidget(this); - m_control_1->setMaximumHeight(40); m_control_2 = new QWidget(this); - m_control_2->setMaximumHeight(100); m_play = new QPushButton(m_control_1); m_play->setFixedSize(20,20); @@ -693,11 +691,10 @@ void VideoWall::intiPtzUi() m_down = new QPushButton(m_control_2); m_down->setFixedSize(30,20); m_down->setObjectName("down"); - m_ptz.setFixedSize(30,30); + m_ptz.setObjectName("ptz_lab"); m_ptz.setText(tr("ptz")); m_ptz.setAlignment(Qt::AlignCenter); glayout->addWidget(m_up,0,1); - glayout->addWidget(m_left,1,0); glayout->addWidget(&m_ptz,1,1); glayout->addWidget(m_right,1,2); @@ -706,7 +703,7 @@ void VideoWall::intiPtzUi() QGridLayout *glayout2 = new QGridLayout(); { - glayout2->setContentsMargins(10,0,10,0); + glayout2->setContentsMargins(0,0,0,0); m_tj.setText(tr("调焦")); m_tj.setFixedSize(40,20); @@ -781,7 +778,7 @@ void VideoWall::intiPtzUi() vlayout->addLayout(hlayout1); vlayout->addWidget(m_allot); QHBoxLayout *hlayout3 = new QHBoxLayout(); - hlayout3->setContentsMargins(20,0,20,0); + hlayout3->setContentsMargins(20,10,20,20); hlayout3->addLayout(glayout); hlayout3->addStretch(); hlayout3->addLayout(glayout2); @@ -800,7 +797,6 @@ void VideoWall::intiPtzUi() vl->addLayout(hlayout); vl->addWidget(m_control_1); vl->addWidget(m_control_2); - } void VideoWall::loadPtzUiQss() diff --git a/resource/zh/style/dark/ipcPlus.qss b/resource/zh/style/dark/ipcPlus.qss index eecd8bba..17097beb 100644 --- a/resource/zh/style/dark/ipcPlus.qss +++ b/resource/zh/style/dark/ipcPlus.qss @@ -1,10 +1,20 @@ -QPushButton#play,QPushButton#pause, -QPushButton#cap,QPushButton#voiceOpen,QPushButton#voiceClose{ +QPushButton#play, +QPushButton#pause, +QPushButton#cap, +QPushButton#voiceOpen, +QPushButton#voiceClose, +QPushButton#up, +QPushButton#left, +QPushButton#right, +QPushButton#down +{ border:1px; border-radius:0px; background:transparent; padding: 0px; min-height: 0px; + height:20px; + width:20px; } QPushButton#play{ @@ -71,12 +81,20 @@ QPushButton#cap:pressed,QPushButton#play:pressed,QPushButton#pause:pressed,QPush border-color: #5DA5FB; } -QPushButton#draw,QPushButton#tretch,QPushButton#near,QPushButton#far,QPushButton#big,QPushButton#small,QPushButton#allot{ + +QPushButton#draw, +QPushButton#tretch, +QPushButton#near, +QPushButton#far, +QPushButton#big, +QPushButton#small, +QPushButton#allot{ border: 1px solid #6088BA; background-color:transparent; radius:0px; width:50px; height:20px; + padding: 0px; } QPushButton#draw:hover,QPushButton#tretch:hover,QPushButton#near:hover,QPushButton#far:hover,QPushButton#big:hover,QPushButton#small:hover,QPushButton#allot:hover{ @@ -97,6 +115,15 @@ QWidget#IpcPlusWidget,QWidget#control_1,QWidget#control_2{ color:#01a6ec; } QWidget#IpcPlusWidget{ - background-color: #0b2a51); + background-color: #0b2a51; color:#01a6ec; +} + +QWidget#control_2{ + min-height: 160px; +} + +QLabel#ptz_lab{ + min-height: 20px; + max-width: 30px; } \ No newline at end of file