xingzi
/
QtScrcpy
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update:调整资源文件

Browse Source
dev
Barry 7 years ago
parent d67a178288
commit 278d153f0e
39 changed files with 781 additions and 727 deletions
Show Stats Download Patch File Download Diff File

2
QtScrcpy/QtScrcpy.pro
Unescape View File

@ -161,5 +161,5 @@ linux {
# message("test")
RESOURCES += \
res.qrc
res/res.qrc

2
QtScrcpy/fontawesome/iconhelper.cpp
Unescape View File

@ -4,7 +4,7 @@ IconHelper* IconHelper::_instance = 0;
IconHelper::IconHelper(QObject*):
QObject(qApp)
{
int fontId = QFontDatabase::addApplicationFont(":/res/fontawesome-webfont.ttf");
int fontId = QFontDatabase::addApplicationFont(":/font/fontawesome-webfont.ttf");
QString fontName = QFontDatabase::applicationFontFamilies(fontId).at(0);
iconFont = QFont(fontName);
}

BIN
QtScrcpy/i18n/QtScrcpy_en.qm
View File

Binary file not shown.

BIN
QtScrcpy/i18n/QtScrcpy_zh.qm
View File

Binary file not shown.

4
QtScrcpy/main.cpp
Unescape View File

@ -39,7 +39,7 @@ int main(int argc, char *argv[])
#endif
//加载样式表
QFile file(":/res/psblack.css");
QFile file(":/qss/psblack.css");
if (file.open(QFile::ReadOnly)) {
QString qss = QLatin1String(file.readAll());
QString paletteColor = qss.mid(20, 7);
@ -62,7 +62,7 @@ void installTranslator() {
static QTranslator translator;
QLocale locale;
QLocale::Language language = locale.language();
QString languagePath = ":i18n/";
QString languagePath = ":/i18n/";
switch (language) {
case QLocale::Chinese:
languagePath += "QtScrcpy_zh.qm";

12
QtScrcpy/res.qrc
Unescape View File

@ -1,12 +0,0 @@
<RCC>
<qresource prefix="/">
<file>res/psblack.css</file>
<file>res/fontawesome-webfont.ttf</file>
<file>res/phone-h.png</file>
<file>res/phone-v.png</file>
<file>qml/pinwheel.qml</file>
<file>qml/images/pinwheel.png</file>
<file>i18n/QtScrcpy_en.qm</file>
<file>i18n/QtScrcpy_zh.qm</file>
</qresource>
</RCC>

0
QtScrcpy/res/fontawesome-webfont.ttf → QtScrcpy/res/font/fontawesome-webfont.ttf
Unescape View File

BIN
QtScrcpy/res/fontawesome-webfont.pdf
View File

Binary file not shown.

BIN
QtScrcpy/res/i18n/QtScrcpy_en.qm
View File

Binary file not shown.

83
QtScrcpy/i18n/QtScrcpy_en.ts → QtScrcpy/res/i18n/QtScrcpy_en.ts
Unescape View File

@ -4,78 +4,93 @@
<context>
<name>Dialog</name>
<message>
<location filename="../dialog.ui" line="86"/>
<location filename="../../dialog.ui" line="86"/>
<source>Wireless</source>
<translation>Wireless</translation>
</message>
<message>
<location filename="../dialog.ui" line="131"/>
<location filename="../../dialog.ui" line="131"/>
<source>wireless connect</source>
<translation>wireless connect</translation>
</message>
<message>
<location filename="../dialog.ui" line="138"/>
<location filename="../../dialog.ui" line="138"/>
<source>wireless disconnect</source>
<translation>wireless disconnect</translation>
</message>
<message>
<location filename="../dialog.ui" line="195"/>
<location filename="../../dialog.ui" line="198"/>
<source>record save path:</source>
<translation>record save psth:</translation>
</message>
<message>
<location filename="../dialog.ui" line="209"/>
<location filename="../dialog.cpp" line="202"/>
<location filename="../../dialog.ui" line="212"/>
<location filename="../../dialog.cpp" line="219"/>
<source>select path</source>
<translation>select path</translation>
</message>
<message>
<location filename="../dialog.ui" line="32"/>
<location filename="../../dialog.ui" line="219"/>
<source>record format：</source>
<translation>record format:</translation>
</message>
<message>
<location filename="../../dialog.ui" line="226"/>
<source>always top</source>
<translation>always top</translation>
</message>
<message>
<location filename="../../dialog.ui" line="236"/>
<source>close screen</source>
<translation>close screen</translation>
</message>
<message>
<location filename="../../dialog.ui" line="32"/>
<source>USB line</source>
<translation>USB line</translation>
</message>
<message>
<location filename="../dialog.ui" line="45"/>
<location filename="../../dialog.ui" line="45"/>
<source>stop server</source>
<translation>stop server</translation>
</message>
<message>
<location filename="../dialog.ui" line="76"/>
<location filename="../../dialog.ui" line="76"/>
<source>start server</source>
<translation>start server</translation>
</message>
<message>
<location filename="../dialog.ui" line="66"/>
<location filename="../../dialog.ui" line="66"/>
<source>device serial:</source>
<translation>device serial:</translation>
</message>
<message>
<location filename="../dialog.ui" line="158"/>
<location filename="../../dialog.ui" line="158"/>
<source>Config</source>
<translation>Config</translation>
</message>
<message>
<location filename="../dialog.ui" line="188"/>
<location filename="../../dialog.ui" line="191"/>
<source>bit rate:</source>
<translation>bit rate:</translation>
</message>
<message>
<location filename="../dialog.ui" line="181"/>
<location filename="../../dialog.ui" line="167"/>
<source>video size:</source>
<translation>video size:</translation>
</message>
<message>
<location filename="../dialog.ui" line="59"/>
<location filename="../../dialog.ui" line="59"/>
<source>start adbd</source>
<translation>start adbd</translation>
</message>
<message>
<location filename="../dialog.ui" line="38"/>
<location filename="../../dialog.ui" line="38"/>
<source>get device ip</source>
<translation>get device ip</translation>
</message>
<message>
<location filename="../dialog.ui" line="52"/>
<location filename="../../dialog.ui" line="52"/>
<source>update device</source>
<translation>update device</translation>
</message>
@ -83,52 +98,57 @@
<context>
<name>ToolForm</name>
<message>
<location filename="../toolform.ui" line="14"/>
<location filename="../../toolform.ui" line="14"/>
<source>Tool</source>
<translation>Tool</translation>
</message>
<message>
<location filename="../toolform.ui" line="20"/>
<location filename="../../toolform.ui" line="26"/>
<source>full screen</source>
<translation>full screen</translation>
</message>
<message>
<location filename="../toolform.ui" line="43"/>
<location filename="../../toolform.ui" line="49"/>
<source>expand notify</source>
<translation>expand notify</translation>
</message>
<message>
<location filename="../../toolform.ui" line="59"/>
<source>turn off</source>
<translation>turn off</translation>
</message>
<message>
<location filename="../toolform.ui" line="53"/>
<location filename="../../toolform.ui" line="69"/>
<source>turn on</source>
<translation>turn on</translation>
</message>
<message>
<location filename="../toolform.ui" line="63"/>
<location filename="../../toolform.ui" line="79"/>
<source>volume up</source>
<translation>volume up</translation>
</message>
<message>
<location filename="../toolform.ui" line="73"/>
<location filename="../../toolform.ui" line="89"/>
<source>volume down</source>
<translation>volume down</translation>
</message>
<message>
<location filename="../toolform.ui" line="83"/>
<location filename="../../toolform.ui" line="99"/>
<source>app switch</source>
<translation>app switch</translation>
</message>
<message>
<location filename="../toolform.ui" line="93"/>
<location filename="../../toolform.ui" line="109"/>
<source>menu</source>
<translation>menu</translation>
</message>
<message>
<location filename="../toolform.ui" line="103"/>
<location filename="../../toolform.ui" line="119"/>
<source>home</source>
<translation>home</translation>
</message>
<message>
<location filename="../toolform.ui" line="113"/>
<location filename="../../toolform.ui" line="129"/>
<source>return</source>
<translation>return</translation>
</message>
@ -136,22 +156,22 @@
<context>
<name>VideoForm</name>
<message>
<location filename="../videoform.cpp" line="100"/>
<location filename="../../videoform.cpp" line="143"/>
<source>wait current file transfer to complete</source>
<translation>wait current file transfer to complete</translation>
</message>
<message>
<location filename="../videoform.cpp" line="103"/>
<location filename="../../videoform.cpp" line="146"/>
<source>file transfer complete</source>
<translation>file transfer complete</translation>
</message>
<message>
<location filename="../videoform.cpp" line="106"/>
<location filename="../../videoform.cpp" line="149"/>
<source>file transfer failed</source>
<translation>file transfer failed</translation>
</message>
<message>
<location filename="../videoform.cpp" line="441"/>
<location filename="../../videoform.cpp" line="584"/>
<source>file does not exist</source>
<translation>file does not exist</translation>
</message>
@ -159,9 +179,8 @@
<context>
<name>videoForm</name>
<message>
<location filename="../videoform.ui" line="78"/>
<source>qrc:/qml/pinwheel.qml</source>
<translation>qrc:/qml/pinwheel.qml</translation>
<translation type="vanished">qrc:/qml/pinwheel.qml</translation>
</message>
</context>
</TS>

BIN
QtScrcpy/res/i18n/QtScrcpy_zh.qm
View File

Binary file not shown.

83
QtScrcpy/i18n/QtScrcpy_zh.ts → QtScrcpy/res/i18n/QtScrcpy_zh.ts
Unescape View File

@ -4,78 +4,93 @@
<context>
<name>Dialog</name>
<message>
<location filename="../dialog.ui" line="86"/>
<location filename="../../dialog.ui" line="86"/>
<source>Wireless</source>
<translation>无线</translation>
</message>
<message>
<location filename="../dialog.ui" line="131"/>
<location filename="../../dialog.ui" line="131"/>
<source>wireless connect</source>
<translation>无线连接</translation>
</message>
<message>
<location filename="../dialog.ui" line="138"/>
<location filename="../../dialog.ui" line="138"/>
<source>wireless disconnect</source>
<translation>无线断开</translation>
</message>
<message>
<location filename="../dialog.ui" line="195"/>
<location filename="../../dialog.ui" line="198"/>
<source>record save path:</source>
<translation>录像保存路径：</translation>
</message>
<message>
<location filename="../dialog.ui" line="209"/>
<location filename="../dialog.cpp" line="202"/>
<location filename="../../dialog.ui" line="212"/>
<location filename="../../dialog.cpp" line="219"/>
<source>select path</source>
<translation>选择路径</translation>
</message>
<message>
<location filename="../dialog.ui" line="32"/>
<location filename="../../dialog.ui" line="219"/>
<source>record format：</source>
<translation>录制格式：</translation>
</message>
<message>
<location filename="../../dialog.ui" line="226"/>
<source>always top</source>
<translation>置顶</translation>
</message>
<message>
<location filename="../../dialog.ui" line="236"/>
<source>close screen</source>
<translation>关闭屏幕</translation>
</message>
<message>
<location filename="../../dialog.ui" line="32"/>
<source>USB line</source>
<translation>USB线</translation>
</message>
<message>
<location filename="../dialog.ui" line="45"/>
<location filename="../../dialog.ui" line="45"/>
<source>stop server</source>
<translation>停止服务</translation>
</message>
<message>
<location filename="../dialog.ui" line="76"/>
<location filename="../../dialog.ui" line="76"/>
<source>start server</source>
<translation>启动服务</translation>
</message>
<message>
<location filename="../dialog.ui" line="66"/>
<location filename="../../dialog.ui" line="66"/>
<source>device serial:</source>
<translation>设备序列号：</translation>
</message>
<message>
<location filename="../dialog.ui" line="158"/>
<location filename="../../dialog.ui" line="158"/>
<source>Config</source>
<translation>配置</translation>
</message>
<message>
<location filename="../dialog.ui" line="188"/>
<location filename="../../dialog.ui" line="191"/>
<source>bit rate:</source>
<translation>比特率：</translation>
</message>
<message>
<location filename="../dialog.ui" line="181"/>
<location filename="../../dialog.ui" line="167"/>
<source>video size:</source>
<translation>视频尺寸：</translation>
</message>
<message>
<location filename="../dialog.ui" line="59"/>
<location filename="../../dialog.ui" line="59"/>
<source>start adbd</source>
<translation>启动adbd</translation>
</message>
<message>
<location filename="../dialog.ui" line="38"/>
<location filename="../../dialog.ui" line="38"/>
<source>get device ip</source>
<translation>获取设备IP</translation>
</message>
<message>
<location filename="../dialog.ui" line="52"/>
<location filename="../../dialog.ui" line="52"/>
<source>update device</source>
<translation>刷新设备列表</translation>
</message>
@ -83,52 +98,57 @@
<context>
<name>ToolForm</name>
<message>
<location filename="../toolform.ui" line="14"/>
<location filename="../../toolform.ui" line="14"/>
<source>Tool</source>
<translation>工具</translation>
</message>
<message>
<location filename="../toolform.ui" line="20"/>
<location filename="../../toolform.ui" line="26"/>
<source>full screen</source>
<translation>全屏</translation>
</message>
<message>
<location filename="../toolform.ui" line="43"/>
<location filename="../../toolform.ui" line="49"/>
<source>expand notify</source>
<translation>下拉通知</translation>
</message>
<message>
<location filename="../../toolform.ui" line="59"/>
<source>turn off</source>
<translation>锁屏</translation>
</message>
<message>
<location filename="../toolform.ui" line="53"/>
<location filename="../../toolform.ui" line="69"/>
<source>turn on</source>
<translation>解锁</translation>
</message>
<message>
<location filename="../toolform.ui" line="63"/>
<location filename="../../toolform.ui" line="79"/>
<source>volume up</source>
<translation>音量加</translation>
</message>
<message>
<location filename="../toolform.ui" line="73"/>
<location filename="../../toolform.ui" line="89"/>
<source>volume down</source>
<translation>音量减</translation>
</message>
<message>
<location filename="../toolform.ui" line="83"/>
<location filename="../../toolform.ui" line="99"/>
<source>app switch</source>
<translation>切换应用</translation>
</message>
<message>
<location filename="../toolform.ui" line="93"/>
<location filename="../../toolform.ui" line="109"/>
<source>menu</source>
<translation>菜单</translation>
</message>
<message>
<location filename="../toolform.ui" line="103"/>
<location filename="../../toolform.ui" line="119"/>
<source>home</source>
<translation>主界面</translation>
</message>
<message>
<location filename="../toolform.ui" line="113"/>
<location filename="../../toolform.ui" line="129"/>
<source>return</source>
<translation>返回</translation>
</message>
@ -136,22 +156,22 @@
<context>
<name>VideoForm</name>
<message>
<location filename="../videoform.cpp" line="100"/>
<location filename="../../videoform.cpp" line="143"/>
<source>wait current file transfer to complete</source>
<translation>等待当前文件传输完成</translation>
</message>
<message>
<location filename="../videoform.cpp" line="103"/>
<location filename="../../videoform.cpp" line="146"/>
<source>file transfer complete</source>
<translation>文件传输完成</translation>
</message>
<message>
<location filename="../videoform.cpp" line="106"/>
<location filename="../../videoform.cpp" line="149"/>
<source>file transfer failed</source>
<translation>文件传输失败</translation>
</message>
<message>
<location filename="../videoform.cpp" line="441"/>
<location filename="../../videoform.cpp" line="584"/>
<source>file does not exist</source>
<translation>文件不存在</translation>
</message>
@ -159,9 +179,8 @@
<context>
<name>videoForm</name>
<message>
<location filename="../videoform.ui" line="78"/>
<source>qrc:/qml/pinwheel.qml</source>
<translation>qrc:/qml/pinwheel.qml</translation>
<translation type="vanished">qrc:/qml/pinwheel.qml</translation>
</message>
</context>
</TS>

0
QtScrcpy/res/phone-h.png → QtScrcpy/res/image/videoform/phone-h.png
Unescape View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 301 KiB

After

Width:  |  Height:  |  Size: 301 KiB

0
QtScrcpy/res/phone-v.png → QtScrcpy/res/image/videoform/phone-v.png
Unescape View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 293 KiB

After

Width:  |  Height:  |  Size: 293 KiB

0
QtScrcpy/qml/images/pinwheel.png → QtScrcpy/res/qml/images/pinwheel.png
Unescape View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 11 KiB

After

Width:  |  Height:  |  Size: 11 KiB

0
QtScrcpy/qml/pinwheel.qml → QtScrcpy/res/qml/pinwheel.qml
Unescape View File

0
QtScrcpy/res/psblack.css → QtScrcpy/res/qss/psblack.css
Unescape View File

BIN
QtScrcpy/res/qss/psblack/add_bottom.png
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 201 B

BIN
QtScrcpy/res/qss/psblack/add_left.png
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 233 B

BIN
QtScrcpy/res/qss/psblack/add_right.png
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 235 B

BIN
QtScrcpy/res/qss/psblack/add_top.png
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 197 B

BIN
QtScrcpy/res/qss/psblack/branch_close.png
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 177 B

BIN
QtScrcpy/res/qss/psblack/branch_open.png
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 275 B

BIN
QtScrcpy/res/qss/psblack/calendar_nextmonth.png
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 318 B

BIN
QtScrcpy/res/qss/psblack/calendar_prevmonth.png
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 314 B

BIN
QtScrcpy/res/qss/psblack/checkbox_checked.png
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 307 B

BIN
QtScrcpy/res/qss/psblack/checkbox_checked_disable.png
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 338 B

BIN
QtScrcpy/res/qss/psblack/checkbox_parcial.png
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 188 B

BIN
QtScrcpy/res/qss/psblack/checkbox_parcial_disable.png
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 251 B

BIN
QtScrcpy/res/qss/psblack/checkbox_unchecked.png
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 150 B

BIN
QtScrcpy/res/qss/psblack/checkbox_unchecked_disable.png
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 152 B

BIN
QtScrcpy/res/qss/psblack/radiobutton_checked.png
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 756 B

BIN
QtScrcpy/res/qss/psblack/radiobutton_checked_disable.png
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 932 B

BIN
QtScrcpy/res/qss/psblack/radiobutton_unchecked.png
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 564 B

BIN
QtScrcpy/res/qss/psblack/radiobutton_unchecked_disable.png
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 715 B

30
QtScrcpy/res/res.qrc
Unescape View File

@ -0,0 +1,30 @@
<RCC>
<qresource prefix="/">
<file>font/fontawesome-webfont.ttf</file>
<file>image/videoform/phone-h.png</file>
<file>image/videoform/phone-v.png</file>
<file>qml/pinwheel.qml</file>
<file>qml/images/pinwheel.png</file>
<file>qss/psblack.css</file>
<file>qss/psblack/add_bottom.png</file>
<file>qss/psblack/add_left.png</file>
<file>qss/psblack/add_right.png</file>
<file>qss/psblack/add_top.png</file>
<file>qss/psblack/branch_close.png</file>
<file>qss/psblack/branch_open.png</file>
<file>qss/psblack/calendar_nextmonth.png</file>
<file>qss/psblack/calendar_prevmonth.png</file>
<file>qss/psblack/checkbox_checked.png</file>
<file>qss/psblack/checkbox_checked_disable.png</file>
<file>qss/psblack/checkbox_parcial.png</file>
<file>qss/psblack/checkbox_parcial_disable.png</file>
<file>qss/psblack/checkbox_unchecked.png</file>
<file>qss/psblack/checkbox_unchecked_disable.png</file>
<file>qss/psblack/radiobutton_checked.png</file>
<file>qss/psblack/radiobutton_checked_disable.png</file>
<file>qss/psblack/radiobutton_unchecked.png</file>
<file>qss/psblack/radiobutton_unchecked_disable.png</file>
<file>i18n/QtScrcpy_en.qm</file>
<file>i18n/QtScrcpy_zh.qm</file>
</qresource>
</RCC>

4
QtScrcpy/videoform.cpp
Unescape View File

@ -235,7 +235,7 @@ void VideoForm::updateStyleSheet(bool vertical)
if (vertical) {
setStyleSheet(R"(
#videoForm {
border-image: url(:/res/phone-v.png) 150px 142px 85px 142px;
border-image: url(:/image/videoform/phone-v.png) 150px 142px 85px 142px;
border-width: 150px 142px 85px 142px;
}
)");
@ -243,7 +243,7 @@ void VideoForm::updateStyleSheet(bool vertical)
} else {
setStyleSheet(R"(
#videoForm {
border-image: url(:/res/phone-h.png) 142px 85px 142px 150px;
border-image: url(:/image/videoform/phone-h.png) 142px 85px 142px 150px;
border-width: 142px 85px 142px 150px;
}
)");

2
TODO.txt
Unescape View File

@ -11,8 +11,6 @@ b35733edb6df2a00b6af9b1c98627d344c377963
只录制不启动窗口（先重构，目前启动流程在videoform里）
跳过帧改为动态配置，而不是静态编译 https://github.com/Genymobile/scrcpy/commit/ebccb9f6cc111e8acfbe10d656cac5c1f1b744a0
复制粘贴问题对比
复制粘贴中文测试
国际化
单独线程打印帧率 https://github.com/Genymobile/scrcpy/commit/e2a272bf99ecf48fcb050177113f903b3fb323c4
重构input

4
all.pro
Unescape View File

@ -3,5 +3,5 @@ SUBDIRS = QtScrcpy
# 多语言翻译文件
TRANSLATIONS = \
$$PWD/QtScrcpy/i18n/QtScrcpy_zh.ts \
$$PWD/QtScrcpy/i18n/QtScrcpy_en.ts
$$PWD/QtScrcpy/res/i18n/QtScrcpy_zh.ts \
$$PWD/QtScrcpy/res/i18n/QtScrcpy_en.ts

Write Preview
Loading…
Cancel
Save