fix: 合并分支,解决冲突
commit
01c4ad2a20
Binary file not shown.
After Width: | Height: | Size: 6.5 KiB |
Binary file not shown.
After Width: | Height: | Size: 4.9 KiB |
Binary file not shown.
After Width: | Height: | Size: 6.4 KiB |
Binary file not shown.
After Width: | Height: | Size: 4.8 KiB |
@ -0,0 +1,37 @@
|
||||
#include "videoControl.h"
|
||||
#include "ui_videoControl.h"
|
||||
|
||||
VideoControl::VideoControl(QWidget *parent) :
|
||||
QWidget(parent),
|
||||
ui(new Ui::VideoControl)
|
||||
{
|
||||
ui->setupUi(this);
|
||||
// 其他初始化代码...
|
||||
|
||||
|
||||
ui->pbPlayer->setIcon(QIcon(":/images/playMedio.png"));
|
||||
ui->pbPlayer->setIconSize(QSize(56,56));
|
||||
ui->pbPlayer->setFixedSize(64, 64);
|
||||
ui->pbPlayer->setObjectName("medio");
|
||||
// ui->pbPlayer->set
|
||||
ui->pbStop->setIcon(QIcon(":/images/stop.png"));
|
||||
ui->pbStop->setIconSize(QSize(42,42));
|
||||
ui->pbStop->setFixedSize(50, 50);
|
||||
ui->pbStop->setObjectName("medio");
|
||||
|
||||
ui->pbFast->setIcon(QIcon(":/images/playFast.png"));
|
||||
ui->pbFast->setIconSize(QSize(42,42));
|
||||
ui->pbFast->setFixedSize(50, 50);
|
||||
ui->pbFast->setObjectName("medio");
|
||||
|
||||
|
||||
ui->pbSlow->setIcon(QIcon(":/images/playSlow.png"));
|
||||
ui->pbSlow->setIconSize(QSize(42,42));
|
||||
ui->pbSlow->setFixedSize(50, 50);
|
||||
ui->pbSlow->setObjectName("medio");
|
||||
}
|
||||
|
||||
VideoControl::~VideoControl()
|
||||
{
|
||||
delete ui;
|
||||
}
|
@ -0,0 +1,30 @@
|
||||
#ifndef VIDEOCONTROL_H
|
||||
#define VIDEOCONTROL_H
|
||||
|
||||
#include <QWidget>
|
||||
|
||||
|
||||
namespace Ui {
|
||||
class VideoControl;
|
||||
}
|
||||
|
||||
|
||||
class VideoControl : public QWidget {
|
||||
Q_OBJECT
|
||||
|
||||
|
||||
|
||||
public:
|
||||
explicit VideoControl(QWidget *parent = nullptr);
|
||||
~VideoControl();
|
||||
|
||||
|
||||
private:
|
||||
Ui::VideoControl *ui;
|
||||
|
||||
};
|
||||
|
||||
|
||||
#endif // VIDEOCONTROL_H
|
||||
|
||||
|
@ -0,0 +1,103 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<ui version="4.0">
|
||||
<class>VideoControl</class>
|
||||
<widget class="QWidget" name="VideoControl">
|
||||
<property name="geometry">
|
||||
<rect>
|
||||
<x>0</x>
|
||||
<y>0</y>
|
||||
<width>713</width>
|
||||
<height>91</height>
|
||||
</rect>
|
||||
</property>
|
||||
<property name="windowTitle">
|
||||
<string>Form</string>
|
||||
</property>
|
||||
<layout class="QHBoxLayout" name="horizontalLayout_2" stretch="1,5,1">
|
||||
<item>
|
||||
<spacer name="horizontalSpacer">
|
||||
<property name="orientation">
|
||||
<enum>Qt::Horizontal</enum>
|
||||
</property>
|
||||
<property name="sizeHint" stdset="0">
|
||||
<size>
|
||||
<width>40</width>
|
||||
<height>20</height>
|
||||
</size>
|
||||
</property>
|
||||
</spacer>
|
||||
</item>
|
||||
<item>
|
||||
<widget class="QWidget" name="widget" native="true">
|
||||
<layout class="QHBoxLayout" name="horizontalLayout_4">
|
||||
<item>
|
||||
<layout class="QHBoxLayout" name="horizontalLayout" stretch="0,0,0,0">
|
||||
<property name="spacing">
|
||||
<number>6</number>
|
||||
</property>
|
||||
<property name="sizeConstraint">
|
||||
<enum>QLayout::SetDefaultConstraint</enum>
|
||||
</property>
|
||||
<item>
|
||||
<widget class="QPushButton" name="pbSlow">
|
||||
<property name="text">
|
||||
<string/>
|
||||
</property>
|
||||
<property name="flat">
|
||||
<bool>false</bool>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item>
|
||||
<widget class="QPushButton" name="pbPlayer">
|
||||
<property name="text">
|
||||
<string/>
|
||||
</property>
|
||||
<property name="flat">
|
||||
<bool>false</bool>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item>
|
||||
<widget class="QPushButton" name="pbStop">
|
||||
<property name="text">
|
||||
<string/>
|
||||
</property>
|
||||
<property name="flat">
|
||||
<bool>false</bool>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item>
|
||||
<widget class="QPushButton" name="pbFast">
|
||||
<property name="text">
|
||||
<string/>
|
||||
</property>
|
||||
<property name="flat">
|
||||
<bool>false</bool>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
</layout>
|
||||
</item>
|
||||
</layout>
|
||||
</widget>
|
||||
</item>
|
||||
<item>
|
||||
<spacer name="horizontalSpacer_2">
|
||||
<property name="orientation">
|
||||
<enum>Qt::Horizontal</enum>
|
||||
</property>
|
||||
<property name="sizeHint" stdset="0">
|
||||
<size>
|
||||
<width>40</width>
|
||||
<height>20</height>
|
||||
</size>
|
||||
</property>
|
||||
</spacer>
|
||||
</item>
|
||||
</layout>
|
||||
</widget>
|
||||
<resources/>
|
||||
<connections/>
|
||||
</ui>
|
Loading…
Reference in New Issue