Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
尘离序散
obs-studio
提交
2080051b
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,发现更多精彩内容 >>
提交
2080051b
编写于
3月 11, 2019
作者:
C
Clayton Groeneveld
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
UI: Use icons from theme on Linux
上级
f27a00d2
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
12 addition
and
6 deletion
+12
-6
UI/obs-app.cpp
UI/obs-app.cpp
+2
-0
UI/window-basic-main.cpp
UI/window-basic-main.cpp
+6
-4
UI/window-basic-stats.cpp
UI/window-basic-stats.cpp
+2
-1
UI/window-projector.cpp
UI/window-projector.cpp
+2
-1
未找到文件。
UI/obs-app.cpp
浏览文件 @
2080051b
...
...
@@ -1045,6 +1045,8 @@ OBSApp::OBSApp(int &argc, char **argv, profiler_name_store_t *store)
profilerNameStore
(
store
)
{
sleepInhibitor
=
os_inhibit_sleep_create
(
"OBS Video/audio"
);
setWindowIcon
(
QIcon
::
fromTheme
(
"obs"
,
QIcon
(
":/res/images/obs.png"
)));
}
OBSApp
::~
OBSApp
()
...
...
UI/window-basic-main.cpp
浏览文件 @
2080051b
...
...
@@ -4977,7 +4977,8 @@ inline void OBSBasic::OnActivate()
UpdateProcessPriority
();
if
(
trayIcon
)
trayIcon
->
setIcon
(
QIcon
(
":/res/images/tray_active.png"
));
trayIcon
->
setIcon
(
QIcon
::
fromTheme
(
"obs-tray-active"
,
QIcon
(
":/res/images/tray_active.png"
)));
}
}
...
...
@@ -4990,7 +4991,8 @@ inline void OBSBasic::OnDeactivate()
ClearProcessPriority
();
if
(
trayIcon
)
trayIcon
->
setIcon
(
QIcon
(
":/res/images/obs.png"
));
trayIcon
->
setIcon
(
QIcon
::
fromTheme
(
"obs-tray"
,
QIcon
(
":/res/images/obs.png"
)));
}
}
...
...
@@ -6639,8 +6641,8 @@ void OBSBasic::ToggleShowHide()
void
OBSBasic
::
SystemTrayInit
()
{
trayIcon
.
reset
(
new
QSystemTrayIcon
(
QIcon
(
":/res/images/obs.png"
)
,
this
));
trayIcon
.
reset
(
new
QSystemTrayIcon
(
QIcon
::
fromTheme
(
"obs-tray"
,
QIcon
(
":/res/images/obs.png"
)),
this
));
trayIcon
->
setToolTip
(
"OBS Studio"
);
showHide
=
new
QAction
(
QTStr
(
"Basic.SystemTray.Show"
),
...
...
UI/window-basic-stats.cpp
浏览文件 @
2080051b
...
...
@@ -139,7 +139,8 @@ OBSBasicStats::OBSBasicStats(QWidget *parent, bool closeable)
resize
(
800
,
280
);
setWindowTitle
(
QTStr
(
"Basic.Stats"
));
setWindowIcon
(
QIcon
(
":/res/images/obs.png"
));
setWindowIcon
(
QIcon
::
fromTheme
(
"obs"
,
QIcon
(
":/res/images/obs.png"
)));
setWindowModality
(
Qt
::
NonModal
);
setAttribute
(
Qt
::
WA_DeleteOnClose
,
true
);
...
...
UI/window-projector.cpp
浏览文件 @
2080051b
...
...
@@ -30,7 +30,8 @@ OBSProjector::OBSProjector(QWidget *widget, obs_source_t *source_, int monitor,
type
=
type_
;
if
(
isWindow
)
{
setWindowIcon
(
QIcon
(
":/res/images/obs.png"
));
setWindowIcon
(
QIcon
::
fromTheme
(
"obs"
,
QIcon
(
":/res/images/obs.png"
)));
UpdateProjectorTitle
(
projectorTitle
);
windowedProjectors
.
push_back
(
this
);
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录