UI: Fix compiler/Acri warnings
parent
703ad3157b
commit
5f7f2c1c97
|
@ -42,7 +42,6 @@ QWidget {
|
||||||
outline: none;
|
outline: none;
|
||||||
font-family: "Open Sans", "Tahoma", "Arial", sans-serif;
|
font-family: "Open Sans", "Tahoma", "Arial", sans-serif;
|
||||||
font-size: 12px;
|
font-size: 12px;
|
||||||
overflow: auto;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
#menubar {
|
#menubar {
|
||||||
|
@ -651,14 +650,6 @@ QSlider::handle:disabled {
|
||||||
|
|
||||||
/* Volume Control */
|
/* Volume Control */
|
||||||
|
|
||||||
/* Old Meters */
|
|
||||||
VolumeMeter {
|
|
||||||
qproperty-bkColor: rgb(8,8,11);
|
|
||||||
qproperty-magColor:;
|
|
||||||
qproperty-peakColor:;
|
|
||||||
qproperty-peakHoldColor: rgb(225,224,225);
|
|
||||||
}
|
|
||||||
|
|
||||||
VolumeMeter {
|
VolumeMeter {
|
||||||
|
|
||||||
qproperty-backgroundNominalColor: #42740c;
|
qproperty-backgroundNominalColor: #42740c;
|
||||||
|
|
|
@ -207,6 +207,9 @@ void on_preview_scene_changed(enum obs_frontend_event event, void *param)
|
||||||
|
|
||||||
void render_preview_source(void *param, uint32_t cx, uint32_t cy)
|
void render_preview_source(void *param, uint32_t cx, uint32_t cy)
|
||||||
{
|
{
|
||||||
|
UNUSED_PARAMETER(cx);
|
||||||
|
UNUSED_PARAMETER(cy);
|
||||||
|
|
||||||
auto ctx = (struct preview_output *)param;
|
auto ctx = (struct preview_output *)param;
|
||||||
|
|
||||||
if (!ctx->current_source)
|
if (!ctx->current_source)
|
||||||
|
|
|
@ -115,7 +115,7 @@
|
||||||
</layout>
|
</layout>
|
||||||
</item>
|
</item>
|
||||||
<item>
|
<item>
|
||||||
<widget class="QLabel" name="label">
|
<widget class="QLabel" name="keyerLabel">
|
||||||
<property name="text">
|
<property name="text">
|
||||||
<string>Keyer output requires RGB mode in advanced settings.</string>
|
<string>Keyer output requires RGB mode in advanced settings.</string>
|
||||||
</property>
|
</property>
|
||||||
|
|
|
@ -7,7 +7,6 @@ void RecordButton::resizeEvent(QResizeEvent *event)
|
||||||
if (!main->pause)
|
if (!main->pause)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
QSize newSize = event->size();
|
|
||||||
QSize pauseSize = main->pause->size();
|
QSize pauseSize = main->pause->size();
|
||||||
int height = main->ui->recordButton->size().height();
|
int height = main->ui->recordButton->size().height();
|
||||||
|
|
||||||
|
@ -15,4 +14,6 @@ void RecordButton::resizeEvent(QResizeEvent *event)
|
||||||
main->pause->setMinimumSize(height, height);
|
main->pause->setMinimumSize(height, height);
|
||||||
main->pause->setMaximumSize(height, height);
|
main->pause->setMaximumSize(height, height);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
event->accept();
|
||||||
}
|
}
|
||||||
|
|
|
@ -514,6 +514,7 @@ void VolumeMeter::setPeakMeterType(enum obs_peak_meter_type peakMeterType)
|
||||||
void VolumeMeter::mousePressEvent(QMouseEvent *event)
|
void VolumeMeter::mousePressEvent(QMouseEvent *event)
|
||||||
{
|
{
|
||||||
setFocus(Qt::MouseFocusReason);
|
setFocus(Qt::MouseFocusReason);
|
||||||
|
event->accept();
|
||||||
}
|
}
|
||||||
|
|
||||||
void VolumeMeter::wheelEvent(QWheelEvent *event)
|
void VolumeMeter::wheelEvent(QWheelEvent *event)
|
||||||
|
|
|
@ -153,8 +153,8 @@ OBSBasicProperties::OBSBasicProperties(QWidget *parent, OBSSource source_)
|
||||||
uint32_t colorA = 0xFFB26F52;
|
uint32_t colorA = 0xFFB26F52;
|
||||||
uint32_t colorB = 0xFF6FB252;
|
uint32_t colorB = 0xFF6FB252;
|
||||||
|
|
||||||
CreateTransitionScene(sourceA, "A", colorA);
|
CreateTransitionScene(sourceA, (char *)"A", colorA);
|
||||||
CreateTransitionScene(sourceB, "B", colorB);
|
CreateTransitionScene(sourceB, (char *)"B", colorB);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* The cloned source is made from scratch, rather than using
|
* The cloned source is made from scratch, rather than using
|
||||||
|
|
|
@ -4519,6 +4519,41 @@ void OBSBasicSettings::on_disableOSXVSync_clicked()
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
|
QIcon OBSBasicSettings::GetGeneralIcon() const
|
||||||
|
{
|
||||||
|
return generalIcon;
|
||||||
|
}
|
||||||
|
|
||||||
|
QIcon OBSBasicSettings::GetStreamIcon() const
|
||||||
|
{
|
||||||
|
return streamIcon;
|
||||||
|
}
|
||||||
|
|
||||||
|
QIcon OBSBasicSettings::GetOutputIcon() const
|
||||||
|
{
|
||||||
|
return outputIcon;
|
||||||
|
}
|
||||||
|
|
||||||
|
QIcon OBSBasicSettings::GetAudioIcon() const
|
||||||
|
{
|
||||||
|
return audioIcon;
|
||||||
|
}
|
||||||
|
|
||||||
|
QIcon OBSBasicSettings::GetVideoIcon() const
|
||||||
|
{
|
||||||
|
return videoIcon;
|
||||||
|
}
|
||||||
|
|
||||||
|
QIcon OBSBasicSettings::GetHotkeysIcon() const
|
||||||
|
{
|
||||||
|
return hotkeysIcon;
|
||||||
|
}
|
||||||
|
|
||||||
|
QIcon OBSBasicSettings::GetAdvancedIcon() const
|
||||||
|
{
|
||||||
|
return advancedIcon;
|
||||||
|
}
|
||||||
|
|
||||||
void OBSBasicSettings::SetGeneralIcon(const QIcon &icon)
|
void OBSBasicSettings::SetGeneralIcon(const QIcon &icon)
|
||||||
{
|
{
|
||||||
ui->listWidget->item(0)->setIcon(icon);
|
ui->listWidget->item(0)->setIcon(icon);
|
||||||
|
|
|
@ -84,14 +84,20 @@ using OBSFFFormatDesc = std::unique_ptr<const ff_format_desc, OBSFFDeleter>;
|
||||||
|
|
||||||
class OBSBasicSettings : public QDialog {
|
class OBSBasicSettings : public QDialog {
|
||||||
Q_OBJECT
|
Q_OBJECT
|
||||||
Q_PROPERTY(QIcon generalIcon WRITE SetGeneralIcon NOTIFY SetGeneralIcon)
|
Q_PROPERTY(QIcon generalIcon READ GetGeneralIcon WRITE SetGeneralIcon
|
||||||
Q_PROPERTY(QIcon streamIcon WRITE SetStreamIcon NOTIFY SetStreamIcon)
|
DESIGNABLE true)
|
||||||
Q_PROPERTY(QIcon outputIcon WRITE SetOutputIcon NOTIFY SetOutputIcon)
|
Q_PROPERTY(QIcon streamIcon READ GetStreamIcon WRITE SetStreamIcon
|
||||||
Q_PROPERTY(QIcon audioIcon WRITE SetAudioIcon NOTIFY SetAudioIcon)
|
DESIGNABLE true)
|
||||||
Q_PROPERTY(QIcon videoIcon WRITE SetVideoIcon NOTIFY SetVideoIcon)
|
Q_PROPERTY(QIcon outputIcon READ GetOutputIcon WRITE SetOutputIcon
|
||||||
Q_PROPERTY(QIcon hotkeysIcon WRITE SetHotkeysIcon NOTIFY SetHotkeysIcon)
|
DESIGNABLE true)
|
||||||
Q_PROPERTY(
|
Q_PROPERTY(QIcon audioIcon READ GetAudioIcon WRITE SetAudioIcon
|
||||||
QIcon advancedIcon WRITE SetAdvancedIcon NOTIFY SetAdvancedIcon)
|
DESIGNABLE true)
|
||||||
|
Q_PROPERTY(QIcon videoIcon READ GetVideoIcon WRITE SetVideoIcon
|
||||||
|
DESIGNABLE true)
|
||||||
|
Q_PROPERTY(QIcon hotkeysIcon READ GetHotkeysIcon WRITE SetHotkeysIcon
|
||||||
|
DESIGNABLE true)
|
||||||
|
Q_PROPERTY(QIcon advancedIcon READ GetAdvancedIcon WRITE SetAdvancedIcon
|
||||||
|
DESIGNABLE true)
|
||||||
|
|
||||||
private:
|
private:
|
||||||
OBSBasic *main;
|
OBSBasic *main;
|
||||||
|
@ -278,6 +284,22 @@ private:
|
||||||
|
|
||||||
void RecalcOutputResPixels(const char *resText);
|
void RecalcOutputResPixels(const char *resText);
|
||||||
|
|
||||||
|
QIcon generalIcon;
|
||||||
|
QIcon streamIcon;
|
||||||
|
QIcon outputIcon;
|
||||||
|
QIcon audioIcon;
|
||||||
|
QIcon videoIcon;
|
||||||
|
QIcon hotkeysIcon;
|
||||||
|
QIcon advancedIcon;
|
||||||
|
|
||||||
|
QIcon GetGeneralIcon() const;
|
||||||
|
QIcon GetStreamIcon() const;
|
||||||
|
QIcon GetOutputIcon() const;
|
||||||
|
QIcon GetAudioIcon() const;
|
||||||
|
QIcon GetVideoIcon() const;
|
||||||
|
QIcon GetHotkeysIcon() const;
|
||||||
|
QIcon GetAdvancedIcon() const;
|
||||||
|
|
||||||
private slots:
|
private slots:
|
||||||
void on_theme_activated(int idx);
|
void on_theme_activated(int idx);
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue