New upstream version 23.2.1+dfsg1

This commit is contained in:
Simon Chopin 2019-07-27 14:47:10 +02:00
parent cdc9a9fc87
commit b14f9eae6d
1017 changed files with 37232 additions and 11111 deletions

View file

@ -272,13 +272,17 @@ void OBSHotkeyWidget::AddEdit(obs_key_combination combo, int idx)
edit->setToolTip(toolTip);
auto revert = new QPushButton;
revert->setProperty("themeID", "hotkeyButtons");
revert->setText(QTStr("Revert"));
revert->setProperty("themeID", "revertIcon");
revert->setToolTip(QTStr("Revert"));
revert->setFixedSize(24, 24);
revert->setFlat(true);
revert->setEnabled(false);
auto clear = new QPushButton;
clear->setProperty("themeID", "hotkeyButtons");
clear->setText(QTStr("Clear"));
clear->setProperty("themeID", "trashIcon");
clear->setToolTip(QTStr("Clear"));
clear->setFixedSize(24, 24);
clear->setFlat(true);
clear->setEnabled(!obs_key_combination_is_empty(combo));
QObject::connect(edit, &OBSHotkeyEdit::KeyChanged,
@ -289,15 +293,15 @@ void OBSHotkeyWidget::AddEdit(obs_key_combination combo, int idx)
});
auto add = new QPushButton;
add->setProperty("themeID", "hotkeyButtons");
add->setText("+");
add->setMinimumWidth(50);
add->setProperty("themeID", "addIconSmall");
add->setFixedSize(24, 24);
add->setFlat(true);
auto remove = new QPushButton;
remove->setProperty("themeID", "hotkeyButtons");
remove->setText("-");
remove->setProperty("themeID", "removeIconSmall");
remove->setEnabled(removeButtons.size() > 0);
remove->setMinimumWidth(50);
remove->setFixedSize(24, 24);
remove->setFlat(true);
auto CurrentIndex = [&, remove]
{
@ -320,6 +324,7 @@ void OBSHotkeyWidget::AddEdit(obs_key_combination combo, int idx)
});
QHBoxLayout *subLayout = new QHBoxLayout;
subLayout->setContentsMargins(0, 4, 0, 0);
subLayout->addWidget(edit);
subLayout->addWidget(revert);
subLayout->addWidget(clear);