Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
小白菜888
Obs Studio
提交
c878bfcb
O
Obs Studio
项目概览
小白菜888
/
Obs Studio
通知
4
Star
1
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
O
Obs Studio
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
c878bfcb
编写于
4月 07, 2020
作者:
M
Matt Gajownik
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
UI: Differentiate between crash & session log dialogs
上级
8f0d2cb8
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
39 addition
and
10 deletion
+39
-10
UI/window-basic-main.cpp
UI/window-basic-main.cpp
+33
-7
UI/window-basic-main.hpp
UI/window-basic-main.hpp
+3
-1
UI/window-log-reply.cpp
UI/window-log-reply.cpp
+2
-1
UI/window-log-reply.hpp
UI/window-log-reply.hpp
+1
-1
未找到文件。
UI/window-basic-main.cpp
浏览文件 @
c878bfcb
...
...
@@ -5016,7 +5016,7 @@ static BPtr<char> ReadLogFile(const char *subdir, const char *log)
return
file
;
}
void
OBSBasic
::
UploadLog
(
const
char
*
subdir
,
const
char
*
file
)
void
OBSBasic
::
UploadLog
(
const
char
*
subdir
,
const
char
*
file
,
const
bool
crash
)
{
BPtr
<
char
>
fileString
{
ReadLogFile
(
subdir
,
file
)};
...
...
@@ -5027,6 +5027,7 @@ void OBSBasic::UploadLog(const char *subdir, const char *file)
return
;
ui
->
menuLogFiles
->
setEnabled
(
false
);
ui
->
menuCrashLogs
->
setEnabled
(
false
);
stringstream
ss
;
ss
<<
"OBS "
<<
App
()
->
GetVersionString
()
<<
" log file uploaded at "
...
...
@@ -5042,8 +5043,13 @@ void OBSBasic::UploadLog(const char *subdir, const char *file)
"text/plain"
,
ss
.
str
().
c_str
());
logUploadThread
.
reset
(
thread
);
connect
(
thread
,
&
RemoteTextThread
::
Result
,
this
,
&
OBSBasic
::
logUploadFinished
);
if
(
crash
)
{
connect
(
thread
,
&
RemoteTextThread
::
Result
,
this
,
&
OBSBasic
::
crashUploadFinished
);
}
else
{
connect
(
thread
,
&
RemoteTextThread
::
Result
,
this
,
&
OBSBasic
::
logUploadFinished
);
}
logUploadThread
->
start
();
}
...
...
@@ -5059,12 +5065,12 @@ void OBSBasic::on_actionShowLogs_triggered()
void
OBSBasic
::
on_actionUploadCurrentLog_triggered
()
{
UploadLog
(
"obs-studio/logs"
,
App
()
->
GetCurrentLog
());
UploadLog
(
"obs-studio/logs"
,
App
()
->
GetCurrentLog
()
,
false
);
}
void
OBSBasic
::
on_actionUploadLastLog_triggered
()
{
UploadLog
(
"obs-studio/logs"
,
App
()
->
GetLastLog
());
UploadLog
(
"obs-studio/logs"
,
App
()
->
GetLastLog
()
,
false
);
}
void
OBSBasic
::
on_actionViewCurrentLog_triggered
()
...
...
@@ -5095,7 +5101,7 @@ void OBSBasic::on_actionShowCrashLogs_triggered()
void
OBSBasic
::
on_actionUploadLastCrashLog_triggered
()
{
UploadLog
(
"obs-studio/crashes"
,
App
()
->
GetLastCrashLog
());
UploadLog
(
"obs-studio/crashes"
,
App
()
->
GetLastCrashLog
()
,
true
);
}
void
OBSBasic
::
on_actionCheckForUpdates_triggered
()
...
...
@@ -5106,6 +5112,21 @@ void OBSBasic::on_actionCheckForUpdates_triggered()
void
OBSBasic
::
logUploadFinished
(
const
QString
&
text
,
const
QString
&
error
)
{
ui
->
menuLogFiles
->
setEnabled
(
true
);
ui
->
menuCrashLogs
->
setEnabled
(
true
);
if
(
text
.
isEmpty
())
{
OBSMessageBox
::
critical
(
this
,
QTStr
(
"LogReturnDialog.ErrorUploadingLog"
),
error
);
return
;
}
openLogDialog
(
text
,
false
);
}
void
OBSBasic
::
crashUploadFinished
(
const
QString
&
text
,
const
QString
&
error
)
{
ui
->
menuLogFiles
->
setEnabled
(
true
);
ui
->
menuCrashLogs
->
setEnabled
(
true
);
if
(
text
.
isEmpty
())
{
OBSMessageBox
::
critical
(
...
...
@@ -5113,13 +5134,18 @@ void OBSBasic::logUploadFinished(const QString &text, const QString &error)
error
);
return
;
}
openLogDialog
(
text
,
true
);
}
void
OBSBasic
::
openLogDialog
(
const
QString
&
text
,
const
bool
crash
)
{
obs_data_t
*
returnData
=
obs_data_create_from_json
(
QT_TO_UTF8
(
text
));
string
resURL
=
obs_data_get_string
(
returnData
,
"url"
);
QString
logURL
=
resURL
.
c_str
();
obs_data_release
(
returnData
);
OBSLogReply
logDialog
(
this
,
logURL
);
OBSLogReply
logDialog
(
this
,
logURL
,
crash
);
logDialog
.
exec
();
}
...
...
UI/window-basic-main.hpp
浏览文件 @
c878bfcb
...
...
@@ -292,7 +292,7 @@ private:
void
UpdateVolumeControlsPeakMeterType
();
void
ClearVolumeControls
();
void
UploadLog
(
const
char
*
subdir
,
const
char
*
file
);
void
UploadLog
(
const
char
*
subdir
,
const
char
*
file
,
const
bool
crash
);
void
Save
(
const
char
*
file
);
void
Load
(
const
char
*
file
);
...
...
@@ -923,6 +923,8 @@ private slots:
void
PauseToggled
();
void
logUploadFinished
(
const
QString
&
text
,
const
QString
&
error
);
void
crashUploadFinished
(
const
QString
&
text
,
const
QString
&
error
);
void
openLogDialog
(
const
QString
&
text
,
const
bool
crash
);
void
updateCheckFinished
();
...
...
UI/window-log-reply.cpp
浏览文件 @
c878bfcb
...
...
@@ -19,7 +19,7 @@
#include "window-log-reply.hpp"
#include "obs-app.hpp"
OBSLogReply
::
OBSLogReply
(
QWidget
*
parent
,
const
QString
&
url
)
OBSLogReply
::
OBSLogReply
(
QWidget
*
parent
,
const
QString
&
url
,
const
bool
crash
)
:
QDialog
(
parent
),
ui
(
new
Ui
::
OBSLogReply
)
{
setWindowFlags
(
windowFlags
()
&
~
Qt
::
WindowContextHelpButtonHint
);
...
...
@@ -27,6 +27,7 @@ OBSLogReply::OBSLogReply(QWidget *parent, const QString &url)
ui
->
urlEdit
->
setText
(
url
);
installEventFilter
(
CreateShortcutFilter
());
UNUSED_PARAMETER
(
crash
);
}
void
OBSLogReply
::
on_copyURL_clicked
()
...
...
UI/window-log-reply.hpp
浏览文件 @
c878bfcb
...
...
@@ -27,7 +27,7 @@ private:
std
::
unique_ptr
<
Ui
::
OBSLogReply
>
ui
;
public:
OBSLogReply
(
QWidget
*
parent
,
const
QString
&
url
);
OBSLogReply
(
QWidget
*
parent
,
const
QString
&
url
,
const
bool
crash
);
private
slots
:
void
on_copyURL_clicked
();
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录