Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
尘离序散
obs-studio
提交
07380352
O
obs-studio
项目概览
尘离序散
/
obs-studio
与 Fork 源项目一致
从无法访问的项目Fork
通知
30
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
O
obs-studio
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
未验证
提交
07380352
编写于
9月 01, 2018
作者:
J
Jim
提交者:
GitHub
9月 01, 2018
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #1455 from Andersama/delete-shortcut-filters
UI: Add various shortcuts for filters window
上级
3b212799
975722f4
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
72 addition
and
0 deletion
+72
-0
UI/forms/OBSBasicFilters.ui
UI/forms/OBSBasicFilters.ui
+36
-0
UI/window-basic-filters.cpp
UI/window-basic-filters.cpp
+32
-0
UI/window-basic-filters.hpp
UI/window-basic-filters.hpp
+4
-0
未找到文件。
UI/forms/OBSBasicFilters.ui
浏览文件 @
07380352
...
...
@@ -425,6 +425,42 @@
</layout>
</item>
</layout>
<action
name=
"actionRemoveFilter"
>
<property
name=
"icon"
>
<iconset
resource=
"obs.qrc"
>
<normaloff>
:/res/images/list_remove.png
</normaloff>
:/res/images/list_remove.png
</iconset>
</property>
<property
name=
"text"
>
<string>
Remove
</string>
</property>
<property
name=
"shortcut"
>
<string>
Del
</string>
</property>
</action>
<action
name=
"actionMoveUp"
>
<property
name=
"icon"
>
<iconset
resource=
"obs.qrc"
>
<normaloff>
:/res/images/up.png
</normaloff>
:/res/images/up.png
</iconset>
</property>
<property
name=
"text"
>
<string>
Basic.MainMenu.Edit.Order.MoveUp
</string>
</property>
<property
name=
"shortcut"
>
<string>
Ctrl+Up
</string>
</property>
</action>
<action
name=
"actionMoveDown"
>
<property
name=
"icon"
>
<iconset
resource=
"obs.qrc"
>
<normaloff>
:/res/images/down.png
</normaloff>
:/res/images/down.png
</iconset>
</property>
<property
name=
"text"
>
<string>
Basic.MainMenu.Edit.Order.MoveDown
</string>
</property>
<property
name=
"shortcut"
>
<string>
Ctrl+Down
</string>
</property>
</action>
</widget>
<customwidgets>
<customwidget>
...
...
UI/window-basic-filters.cpp
浏览文件 @
07380352
...
...
@@ -72,6 +72,14 @@ OBSBasicFilters::OBSBasicFilters(QWidget *parent, OBSSource source_)
const
char
*
name
=
obs_source_get_name
(
source
);
setWindowTitle
(
QTStr
(
"Basic.Filters.Title"
).
arg
(
QT_UTF8
(
name
)));
#ifndef QT_NO_SHORTCUT
ui
->
actionRemoveFilter
->
setShortcut
(
QApplication
::
translate
(
"OBSBasicFilters"
,
"Del"
,
nullptr
));
#endif // QT_NO_SHORTCUT
addAction
(
ui
->
actionRemoveFilter
);
addAction
(
ui
->
actionMoveUp
);
addAction
(
ui
->
actionMoveDown
);
installEventFilter
(
CreateShortcutFilter
());
connect
(
ui
->
asyncFilters
->
itemDelegate
(),
...
...
@@ -659,6 +667,30 @@ void OBSBasicFilters::on_effectFilters_currentRowChanged(int row)
UpdatePropertiesView
(
row
,
false
);
}
void
OBSBasicFilters
::
on_actionRemoveFilter_triggered
()
{
if
(
ui
->
asyncFilters
->
hasFocus
())
on_removeAsyncFilter_clicked
();
else
if
(
ui
->
effectFilters
->
hasFocus
())
on_removeEffectFilter_clicked
();
}
void
OBSBasicFilters
::
on_actionMoveUp_triggered
()
{
if
(
ui
->
asyncFilters
->
hasFocus
())
on_moveAsyncFilterUp_clicked
();
else
if
(
ui
->
effectFilters
->
hasFocus
())
on_moveEffectFilterUp_clicked
();
}
void
OBSBasicFilters
::
on_actionMoveDown_triggered
()
{
if
(
ui
->
asyncFilters
->
hasFocus
())
on_moveAsyncFilterDown_clicked
();
else
if
(
ui
->
effectFilters
->
hasFocus
())
on_moveEffectFilterDown_clicked
();
}
void
OBSBasicFilters
::
CustomContextMenu
(
const
QPoint
&
pos
,
bool
async
)
{
QListWidget
*
list
=
async
?
ui
->
asyncFilters
:
ui
->
effectFilters
;
...
...
UI/window-basic-filters.hpp
浏览文件 @
07380352
...
...
@@ -100,6 +100,10 @@ private slots:
void
on_effectFilters_customContextMenuRequested
(
const
QPoint
&
pos
);
void
on_effectFilters_GotFocus
();
void
on_actionRemoveFilter_triggered
();
void
on_actionMoveUp_triggered
();
void
on_actionMoveDown_triggered
();
void
AsyncFilterNameEdited
(
QWidget
*
editor
,
QAbstractItemDelegate
::
EndEditHint
endHint
);
void
EffectFilterNameEdited
(
QWidget
*
editor
,
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录