mirror of
https://github.com/obsproject/obs-studio.git
synced 2024-07-19 17:49:14 +00:00
UI: Fix menu actions missing shortcuts
The scene and source rename/remove actions were missing shortcuts in the context menu.
This commit is contained in:
parent
177b3f5a0f
commit
016ce128b7
|
@ -1691,6 +1691,9 @@
|
||||||
<property name="shortcutContext">
|
<property name="shortcutContext">
|
||||||
<enum>Qt::WidgetWithChildrenShortcut</enum>
|
<enum>Qt::WidgetWithChildrenShortcut</enum>
|
||||||
</property>
|
</property>
|
||||||
|
<property name="iconVisibleInMenu">
|
||||||
|
<bool>false</bool>
|
||||||
|
</property>
|
||||||
<property name="themeID" stdset="0">
|
<property name="themeID" stdset="0">
|
||||||
<string notr="true">removeIconSmall</string>
|
<string notr="true">removeIconSmall</string>
|
||||||
</property>
|
</property>
|
||||||
|
@ -1712,6 +1715,9 @@
|
||||||
<property name="shortcutContext">
|
<property name="shortcutContext">
|
||||||
<enum>Qt::WidgetWithChildrenShortcut</enum>
|
<enum>Qt::WidgetWithChildrenShortcut</enum>
|
||||||
</property>
|
</property>
|
||||||
|
<property name="iconVisibleInMenu">
|
||||||
|
<bool>false</bool>
|
||||||
|
</property>
|
||||||
<property name="themeID" stdset="0">
|
<property name="themeID" stdset="0">
|
||||||
<string notr="true">removeIconSmall</string>
|
<string notr="true">removeIconSmall</string>
|
||||||
</property>
|
</property>
|
||||||
|
|
|
@ -398,12 +398,12 @@ OBSBasic::OBSBasic(QWidget *parent)
|
||||||
connect(diskFullTimer, SIGNAL(timeout()), this,
|
connect(diskFullTimer, SIGNAL(timeout()), this,
|
||||||
SLOT(CheckDiskSpaceRemaining()));
|
SLOT(CheckDiskSpaceRemaining()));
|
||||||
|
|
||||||
renameScene = new QAction(ui->scenesDock);
|
renameScene = new QAction(QTStr("Rename"), ui->scenesDock);
|
||||||
renameScene->setShortcutContext(Qt::WidgetWithChildrenShortcut);
|
renameScene->setShortcutContext(Qt::WidgetWithChildrenShortcut);
|
||||||
connect(renameScene, SIGNAL(triggered()), this, SLOT(EditSceneName()));
|
connect(renameScene, SIGNAL(triggered()), this, SLOT(EditSceneName()));
|
||||||
ui->scenesDock->addAction(renameScene);
|
ui->scenesDock->addAction(renameScene);
|
||||||
|
|
||||||
renameSource = new QAction(ui->sourcesDock);
|
renameSource = new QAction(QTStr("Rename"), ui->sourcesDock);
|
||||||
renameSource->setShortcutContext(Qt::WidgetWithChildrenShortcut);
|
renameSource->setShortcutContext(Qt::WidgetWithChildrenShortcut);
|
||||||
connect(renameSource, SIGNAL(triggered()), this,
|
connect(renameSource, SIGNAL(triggered()), this,
|
||||||
SLOT(EditSceneItemName()));
|
SLOT(EditSceneItemName()));
|
||||||
|
@ -5395,9 +5395,8 @@ void OBSBasic::on_scenes_customContextMenuRequested(const QPoint &pos)
|
||||||
popup.addAction(copyFilters);
|
popup.addAction(copyFilters);
|
||||||
popup.addAction(pasteFilters);
|
popup.addAction(pasteFilters);
|
||||||
popup.addSeparator();
|
popup.addSeparator();
|
||||||
popup.addAction(QTStr("Rename"), this, SLOT(EditSceneName()));
|
popup.addAction(renameScene);
|
||||||
popup.addAction(QTStr("Remove"), this,
|
popup.addAction(ui->actionRemoveScene);
|
||||||
SLOT(RemoveSelectedScene()));
|
|
||||||
popup.addSeparator();
|
popup.addSeparator();
|
||||||
|
|
||||||
order.addAction(QTStr("Basic.MainMenu.Edit.Order.MoveUp"), this,
|
order.addAction(QTStr("Basic.MainMenu.Edit.Order.MoveUp"), this,
|
||||||
|
@ -5921,10 +5920,8 @@ void OBSBasic::CreateSourcePopupMenu(int idx, bool preview)
|
||||||
colorSelect = new ColorSelect(colorMenu);
|
colorSelect = new ColorSelect(colorMenu);
|
||||||
popup.addMenu(AddBackgroundColorMenu(
|
popup.addMenu(AddBackgroundColorMenu(
|
||||||
colorMenu, colorWidgetAction, colorSelect, sceneItem));
|
colorMenu, colorWidgetAction, colorSelect, sceneItem));
|
||||||
popup.addAction(QTStr("Rename"), this,
|
popup.addAction(renameSource);
|
||||||
SLOT(EditSceneItemName()));
|
popup.addAction(ui->actionRemoveSource);
|
||||||
popup.addAction(QTStr("Remove"), this,
|
|
||||||
SLOT(on_actionRemoveSource_triggered()));
|
|
||||||
popup.addSeparator();
|
popup.addSeparator();
|
||||||
|
|
||||||
popup.addMenu(ui->orderMenu);
|
popup.addMenu(ui->orderMenu);
|
||||||
|
|
Loading…
Reference in a new issue