Mirrors/obs-aitum-multistream
1
0
Fork 0
mirror of https://github.com/Aitum/obs-aitum-multistream.git synced 2024-11-21 18:02:33 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Support OBS 31 icons
Some checks failed
Push to master / Check Formatting 🔍 (push) Has been cancelled
Details
Push to master / Build Project 🧱 (push) Has been cancelled
Details
Push to master / Create Release 🛫 (push) Has been cancelled
Details

Browse Source
This commit is contained in:
Exeldro 2024-10-06 21:11:02 +02:00
parent c0b501c81a
commit bd1598d331
No known key found for this signature in database
GPG Key ID: 97269A83FC715751
2 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
config-dialog.cpp
View File

@ -60,6 +60,7 @@ OBSBasicSettings::OBSBasicSettings(QMainWindow *parent) : QDialog(parent)
QListWidgetItem *listwidgetitem = new QListWidgetItem(listWidget); QListWidgetItem *listwidgetitem = new QListWidgetItem(listWidget);
listwidgetitem->setIcon(QIcon(QString::fromUtf8(":/settings/images/settings/general.svg"))); listwidgetitem->setIcon(QIcon(QString::fromUtf8(":/settings/images/settings/general.svg")));
//listwidgetitem->setProperty("themeID", QVariant(QString::fromUtf8("configIconSmall"))); //listwidgetitem->setProperty("themeID", QVariant(QString::fromUtf8("configIconSmall")));
//listwidgetitem->setProperty("class", "icon-gear");
//cogsIcon //cogsIcon
listwidgetitem->setText(QString::fromUtf8(obs_module_text("General"))); listwidgetitem->setText(QString::fromUtf8(obs_module_text("General")));
@ -211,6 +212,7 @@ OBSBasicSettings::OBSBasicSettings(QMainWindow *parent) : QDialog(parent)
auto addButton = new QPushButton(QIcon(":/res/images/plus.svg"), QString::fromUtf8(obs_module_text("AddOutput"))); auto addButton = new QPushButton(QIcon(":/res/images/plus.svg"), QString::fromUtf8(obs_module_text("AddOutput")));
addButton->setProperty("themeID", QVariant(QString::fromUtf8("addIconSmall"))); addButton->setProperty("themeID", QVariant(QString::fromUtf8("addIconSmall")));
addButton->setProperty("class", "icon-plus");
connect(addButton, &QPushButton::clicked, [this] { connect(addButton, &QPushButton::clicked, [this] {
QStringList otherNames; QStringList otherNames;
@ -295,6 +297,7 @@ OBSBasicSettings::OBSBasicSettings(QMainWindow *parent) : QDialog(parent)
//guide_link->setOpenExternalLinks(true); //guide_link->setOpenExternalLinks(true);
// addButton = new QPushButton(QIcon(":/res/images/plus.svg"), QString::fromUtf8(obs_module_text("AddOutput"))); // addButton = new QPushButton(QIcon(":/res/images/plus.svg"), QString::fromUtf8(obs_module_text("AddOutput")));
// addButton->setProperty("themeID", QVariant(QString::fromUtf8("addIconSmall"))); // addButton->setProperty("themeID", QVariant(QString::fromUtf8("addIconSmall")));
// addButton->setProperty("class", "icon-plus");
// connect(addButton, &QPushButton::clicked, [this] { // connect(addButton, &QPushButton::clicked, [this] {
// if (!vertical_outputs) // if (!vertical_outputs)
// return; // return;
@ -307,6 +310,7 @@ OBSBasicSettings::OBSBasicSettings(QMainWindow *parent) : QDialog(parent)
verticalAddButton = new QPushButton(QIcon(":/res/images/plus.svg"), QString::fromUtf8(obs_module_text("AddOutput"))); verticalAddButton = new QPushButton(QIcon(":/res/images/plus.svg"), QString::fromUtf8(obs_module_text("AddOutput")));
verticalAddButton->setProperty("themeID", QVariant(QString::fromUtf8("addIconSmall"))); verticalAddButton->setProperty("themeID", QVariant(QString::fromUtf8("addIconSmall")));
verticalAddButton->setProperty("class", "icon-plus");
connect(verticalAddButton, &QPushButton::clicked, [this] { connect(verticalAddButton, &QPushButton::clicked, [this] {
QStringList otherNames; QStringList otherNames;
@ -374,6 +378,7 @@ OBSBasicSettings::OBSBasicSettings(QMainWindow *parent) : QDialog(parent)
newVersion = new QLabel; newVersion = new QLabel;
newVersion->setProperty("themeID", "warning"); newVersion->setProperty("themeID", "warning");
newVersion->setProperty("class", "text-warning");
newVersion->setVisible(false); newVersion->setVisible(false);
newVersion->setOpenExternalLinks(true); newVersion->setOpenExternalLinks(true);
newVersion->setSizePolicy(QSizePolicy::Ignored, QSizePolicy::Fixed); newVersion->setSizePolicy(QSizePolicy::Ignored, QSizePolicy::Fixed);
@ -896,6 +901,7 @@ void OBSBasicSettings::AddServer(QFormLayout *outputsLayout, obs_data_t *setting
auto advancedButton = new QPushButton(QString::fromUtf8(obs_module_text("EditEncoderSettings"))); auto advancedButton = new QPushButton(QString::fromUtf8(obs_module_text("EditEncoderSettings")));
advancedButton->setProperty("themeID", "configIconSmall"); advancedButton->setProperty("themeID", "configIconSmall");
advancedButton->setProperty("class", "icon-gear");
advancedButton->setCheckable(true); advancedButton->setCheckable(true);
advancedButton->setChecked(advanced); advancedButton->setChecked(advanced);
connect(advancedButton, &QPushButton::clicked, [advancedButton, advancedGroup, settings] { connect(advancedButton, &QPushButton::clicked, [advancedButton, advancedGroup, settings] {
@ -913,6 +919,7 @@ void OBSBasicSettings::AddServer(QFormLayout *outputsLayout, obs_data_t *setting
auto removeButton = auto removeButton =
new QPushButton(QIcon(":/res/images/minus.svg"), QString::fromUtf8(obs_frontend_get_locale_string("Remove"))); new QPushButton(QIcon(":/res/images/minus.svg"), QString::fromUtf8(obs_frontend_get_locale_string("Remove")));
removeButton->setProperty("themeID", QVariant(QString::fromUtf8("removeIconSmall"))); removeButton->setProperty("themeID", QVariant(QString::fromUtf8("removeIconSmall")));
removeButton->setProperty("class", "icon-minus");
connect(removeButton, &QPushButton::clicked, [this, outputsLayout, serverGroup, settings, outputs] { connect(removeButton, &QPushButton::clicked, [this, outputsLayout, serverGroup, settings, outputs] {
outputsLayout->removeWidget(serverGroup); outputsLayout->removeWidget(serverGroup);
RemoveWidget(serverGroup); RemoveWidget(serverGroup);
@ -931,6 +938,7 @@ void OBSBasicSettings::AddServer(QFormLayout *outputsLayout, obs_data_t *setting
// Edit button // Edit button
auto editButton = new QPushButton(QString::fromUtf8(obs_module_text("EditServerSettings"))); auto editButton = new QPushButton(QString::fromUtf8(obs_module_text("EditServerSettings")));
editButton->setProperty("themeID", "configIconSmall"); editButton->setProperty("themeID", "configIconSmall");
editButton->setProperty("class", "icon-gear");
connect(editButton, &QPushButton::clicked, [this, settings, outputs] { connect(editButton, &QPushButton::clicked, [this, settings, outputs] {
QStringList otherNames; QStringList otherNames;

1
multistream.cpp
View File

@ -331,6 +331,7 @@ MultistreamDock::MultistreamDock(QWidget *parent) : QFrame(parent)
configButton = new QPushButton; configButton = new QPushButton;
configButton->setMinimumHeight(30); configButton->setMinimumHeight(30);
configButton->setProperty("themeID", "configIconSmall"); configButton->setProperty("themeID", "configIconSmall");
configButton->setProperty("class", "icon-gear");
configButton->setFlat(true); configButton->setFlat(true);
configButton->setAutoDefault(false); configButton->setAutoDefault(false);
//configButton->setSizePolicy(sp2); //configButton->setSizePolicy(sp2);