jp9000
/
obs-studio
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #1463 from admshao/shortcut-improvements 

UI: Add rename scene/source shortcut
master
Jim 2018-09-01 17:49:15 -07:00 committed by GitHub
parent f96a24b746 6c17c10e77
commit 3b2127997c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 29 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
UI/source-tree.cpp
View File

@ -244,6 +244,11 @@ void SourceTreeItem::mouseDoubleClickEvent(QMouseEvent *event)
}
}
bool SourceTreeItem::IsEditing()
{
return editor != nullptr;
}
void SourceTreeItem::EnterEditMode()
{
setFocusPolicy(Qt::StrongFocus);
@ -1279,10 +1284,14 @@ void SourceTree::Edit(int row)
if (row < 0 || row >= stm->items.count())
return;
QWidget *widget = indexWidget(stm->createIndex(row, 0));
QModelIndex index = stm->createIndex(row, 0);
QWidget *widget = indexWidget(index);
SourceTreeItem *itemWidget = reinterpret_cast<SourceTreeItem *>(widget);
if (itemWidget->IsEditing())
return;
itemWidget->EnterEditMode();
edit(stm->createIndex(row, 0));
edit(index);
}
bool SourceTree::MultipleBaseSelected() const

1
UI/source-tree.hpp
View File

@ -47,6 +47,7 @@ class SourceTreeItem : public QWidget {
public:
explicit SourceTreeItem(SourceTree *tree, OBSSceneItem sceneitem);
bool IsEditing();
private:
QSpacerItem *spacer = nullptr;

17
UI/window-basic-main.cpp
View File

@ -241,12 +241,29 @@ OBSBasic::OBSBasic(QWidget *parent)
ui->statusbar, SLOT(UpdateCPUUsage()));
cpuUsageTimer->start(3000);
QAction *renameScene = new QAction(ui->scenesDock);
renameScene->setShortcutContext(Qt::WidgetWithChildrenShortcut);
connect(renameScene, SIGNAL(triggered()), this, SLOT(EditSceneName()));
ui->scenesDock->addAction(renameScene);
QAction *renameSource = new QAction(ui->sourcesDock);
renameSource->setShortcutContext(Qt::WidgetWithChildrenShortcut);
connect(renameSource, SIGNAL(triggered()), this,
SLOT(EditSceneItemName()));
ui->sourcesDock->addAction(renameSource);
#ifdef __APPLE__
renameScene->setShortcut({Qt::Key_Return});
renameSource->setShortcut({Qt::Key_Return});
ui->actionRemoveSource->setShortcuts({Qt::Key_Backspace});
ui->actionRemoveScene->setShortcuts({Qt::Key_Backspace});
ui->action_Settings->setMenuRole(QAction::PreferencesRole);
ui->actionE_xit->setMenuRole(QAction::QuitRole);
#else
renameScene->setShortcut({Qt::Key_F2});
renameSource->setShortcut({Qt::Key_F2});
#endif
auto addNudge = [this](const QKeySequence &seq, const char *s)