Skip to content

Commit

Permalink
remove appearance icon warning
Browse files Browse the repository at this point in the history
  • Loading branch information
exeldro committed Aug 26, 2024
1 parent 1217026 commit 38fe4ef
Show file tree
Hide file tree
Showing 2 changed files with 22 additions and 17 deletions.
27 changes: 19 additions & 8 deletions config-dialog.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -828,49 +828,60 @@ OBSBasicSettings::~OBSBasicSettings()

QIcon OBSBasicSettings::GetGeneralIcon() const
{
return generalIcon;
return listWidget->item(0)->icon();
}

QIcon OBSBasicSettings::GetAppearanceIcon() const
{
return QIcon();
}


QIcon OBSBasicSettings::GetStreamIcon() const
{
return streamIcon;
return listWidget->item(1)->icon();
}

QIcon OBSBasicSettings::GetOutputIcon() const
{
return outputIcon;
return listWidget->item(2)->icon();
}

QIcon OBSBasicSettings::GetAudioIcon() const
{
return audioIcon;
return QIcon();
}

QIcon OBSBasicSettings::GetVideoIcon() const
{
return videoIcon;
return QIcon();
}

QIcon OBSBasicSettings::GetHotkeysIcon() const
{
return hotkeysIcon;
return QIcon();
}

QIcon OBSBasicSettings::GetAccessibilityIcon() const
{
return accessibilityIcon;
return QIcon();
}

QIcon OBSBasicSettings::GetAdvancedIcon() const
{
return advancedIcon;
return QIcon();
}

void OBSBasicSettings::SetGeneralIcon(const QIcon &icon)
{
listWidget->item(0)->setIcon(icon);
}

void OBSBasicSettings::SetAppearanceIcon(const QIcon &icon)
{
UNUSED_PARAMETER(icon);
}

void OBSBasicSettings::SetStreamIcon(const QIcon &icon)
{
listWidget->item(1)->setIcon(icon);
Expand Down
12 changes: 3 additions & 9 deletions config-dialog.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ class CanvasDock;
class OBSBasicSettings : public QDialog {
Q_OBJECT
Q_PROPERTY(QIcon generalIcon READ GetGeneralIcon WRITE SetGeneralIcon DESIGNABLE true)
Q_PROPERTY(QIcon appearanceIcon READ GetAppearanceIcon WRITE SetAppearanceIcon DESIGNABLE true)
Q_PROPERTY(QIcon streamIcon READ GetStreamIcon WRITE SetStreamIcon DESIGNABLE true)
Q_PROPERTY(QIcon outputIcon READ GetOutputIcon WRITE SetOutputIcon DESIGNABLE true)
Q_PROPERTY(QIcon audioIcon READ GetAudioIcon WRITE SetAudioIcon DESIGNABLE true)
Expand Down Expand Up @@ -73,16 +74,8 @@ class OBSBasicSettings : public QDialog {

std::vector<OBSHotkeyWidget *> hotkeys;

QIcon generalIcon;
QIcon streamIcon;
QIcon outputIcon;
QIcon audioIcon;
QIcon videoIcon;
QIcon hotkeysIcon;
QIcon accessibilityIcon;
QIcon advancedIcon;

QIcon GetGeneralIcon() const;
QIcon GetAppearanceIcon() const;
QIcon GetStreamIcon() const;
QIcon GetOutputIcon() const;
QIcon GetAudioIcon() const;
Expand All @@ -105,6 +98,7 @@ class OBSBasicSettings : public QDialog {

private slots:
void SetGeneralIcon(const QIcon &icon);
void SetAppearanceIcon(const QIcon &icon);
void SetStreamIcon(const QIcon &icon);
void SetOutputIcon(const QIcon &icon);
void SetAudioIcon(const QIcon &icon);
Expand Down

0 comments on commit 38fe4ef

Please sign in to comment.