Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
尘离序散
obs-studio
提交
4d02563d
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,发现更多精彩内容 >>
提交
4d02563d
编写于
8月 15, 2014
作者:
J
Jim
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #235 from Socapex/master
Alert user when using existing source name.
上级
69b9e722
6597206d
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
20 addition
and
8 deletion
+20
-8
obs/data/locale/en-US.ini
obs/data/locale/en-US.ini
+2
-1
obs/window-basic-main.cpp
obs/window-basic-main.cpp
+16
-5
obs/window-basic-source-select.cpp
obs/window-basic-source-select.cpp
+2
-2
未找到文件。
obs/data/locale/en-US.ini
浏览文件 @
4d02563d
...
...
@@ -30,7 +30,8 @@ DroppedFrames="Dropped Frames %1 (%2%)"
NameExists.Title
=
"Name already exists"
NameExists.Text
=
"The name is already in use."
NoNameEntered
=
"Please enter a valid name"
NoNameEntered.Title
=
"Please enter a valid name"
NoNameEntered.Text
=
"You cannot use empty names."
# confirm delete dialog box
ConfirmRemove.Title
=
"Confirm Remove"
...
...
obs/window-basic-main.cpp
浏览文件 @
4d02563d
...
...
@@ -1480,8 +1480,8 @@ void OBSBasic::on_actionAddScene_triggered()
if
(
accepted
)
{
if
(
name
.
empty
())
{
QMessageBox
::
information
(
this
,
QTStr
(
"NoNameEntered"
),
QTStr
(
"NoNameEntered"
));
QTStr
(
"NoNameEntered
.Title
"
),
QTStr
(
"NoNameEntered
.Text
"
));
on_actionAddScene_triggered
();
return
;
}
...
...
@@ -1818,7 +1818,7 @@ void OBSBasic::logUploadFinished()
logDialog
.
exec
();
}
static
void
RenameListItem
(
QListWidget
*
listWidget
,
obs_source_t
source
,
static
void
RenameListItem
(
OBSBasic
*
parent
,
QListWidget
*
listWidget
,
obs_source_t
source
,
const
string
&
name
)
{
const
char
*
prevName
=
obs_source_get_name
(
source
);
...
...
@@ -1827,6 +1827,17 @@ static void RenameListItem(QListWidget *listWidget, obs_source_t source,
if
(
foundSource
||
name
.
compare
(
prevName
)
==
0
||
name
.
empty
())
{
listItem
->
setText
(
QT_UTF8
(
prevName
));
if
(
foundSource
||
name
.
compare
(
prevName
)
==
0
)
{
QMessageBox
::
information
(
parent
,
QTStr
(
"NameExists.Title"
),
QTStr
(
"NameExists.Text"
));
}
else
if
(
name
.
empty
())
{
QMessageBox
::
information
(
parent
,
QTStr
(
"NoNameEntered.Title"
),
QTStr
(
"NoNameEntered.Text"
));
}
obs_source_release
(
foundSource
);
}
else
{
listItem
->
setText
(
QT_UTF8
(
name
.
c_str
()));
...
...
@@ -1845,7 +1856,7 @@ void OBSBasic::SceneNameEdited(QWidget *editor,
return
;
obs_source_t
source
=
obs_scene_get_source
(
scene
);
RenameListItem
(
ui
->
scenes
,
source
,
text
);
RenameListItem
(
this
,
ui
->
scenes
,
source
,
text
);
UNUSED_PARAMETER
(
endHint
);
}
...
...
@@ -1861,7 +1872,7 @@ void OBSBasic::SceneItemNameEdited(QWidget *editor,
return
;
obs_source_t
source
=
obs_sceneitem_get_source
(
item
);
RenameListItem
(
ui
->
sources
,
source
,
text
);
RenameListItem
(
this
,
ui
->
sources
,
source
,
text
);
UNUSED_PARAMETER
(
endHint
);
}
...
...
obs/window-basic-source-select.cpp
浏览文件 @
4d02563d
...
...
@@ -140,8 +140,8 @@ void OBSBasicSourceSelect::on_buttonBox_accepted()
}
else
{
if
(
ui
->
sourceName
->
text
().
isEmpty
())
{
QMessageBox
::
information
(
this
,
QTStr
(
"NoNameEntered"
),
QTStr
(
"NoNameEntered"
));
QTStr
(
"NoNameEntered
.Title
"
),
QTStr
(
"NoNameEntered
.Text
"
));
return
;
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录