Skip to content

Commit d973abf

Browse files
barry-ranbarry-ran
committed
update:调整资源文件
1 parent 1260264 commit d973abf

39 files changed

+781
-727
lines changed

‎QtScrcpy/QtScrcpy.pro

+1-1
Original file line numberDiff line numberDiff line change
@@ -161,5 +161,5 @@ linux {
161161
# message("test")
162162

163163
RESOURCES += \
164-
res.qrc
164+
res/res.qrc
165165

‎QtScrcpy/fontawesome/iconhelper.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ IconHelper* IconHelper::_instance = 0;
44
IconHelper::IconHelper(QObject*):
55
QObject(qApp)
66
{
7-
int fontId = QFontDatabase::addApplicationFont(":/res/fontawesome-webfont.ttf");
7+
int fontId = QFontDatabase::addApplicationFont(":/font/fontawesome-webfont.ttf");
88
QString fontName = QFontDatabase::applicationFontFamilies(fontId).at(0);
99
iconFont = QFont(fontName);
1010
}

‎QtScrcpy/i18n/QtScrcpy_en.qm

-2.18 KB
Binary file not shown.

‎QtScrcpy/i18n/QtScrcpy_zh.qm

-1.72 KB
Binary file not shown.

‎QtScrcpy/main.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ int main(int argc, char *argv[])
3939
#endif
4040

4141
//加载样式表
42-
QFile file(":/res/psblack.css");
42+
QFile file(":/qss/psblack.css");
4343
if (file.open(QFile::ReadOnly)) {
4444
QString qss = QLatin1String(file.readAll());
4545
QString paletteColor = qss.mid(20, 7);
@@ -62,7 +62,7 @@ void installTranslator() {
6262
static QTranslator translator;
6363
QLocale locale;
6464
QLocale::Language language = locale.language();
65-
QString languagePath = ":i18n/";
65+
QString languagePath = ":/i18n/";
6666
switch (language) {
6767
case QLocale::Chinese:
6868
languagePath += "QtScrcpy_zh.qm";

‎QtScrcpy/res.qrc

-12
This file was deleted.

‎QtScrcpy/res/fontawesome-webfont.ttf ‎QtScrcpy/res/font/fontawesome-webfont.ttf

File renamed without changes.

‎QtScrcpy/res/fontawesome-webfont.pdf

-231 KB
Binary file not shown.

‎QtScrcpy/res/i18n/QtScrcpy_en.qm

2.37 KB
Binary file not shown.

‎QtScrcpy/i18n/QtScrcpy_en.ts ‎QtScrcpy/res/i18n/QtScrcpy_en.ts

+51-32
Original file line numberDiff line numberDiff line change
@@ -4,164 +4,183 @@
44
<context>
55
<name>Dialog</name>
66
<message>
7-
<location filename="../dialog.ui" line="86"/>
7+
<location filename="../../dialog.ui" line="86"/>
88
<source>Wireless</source>
99
<translation>Wireless</translation>
1010
</message>
1111
<message>
12-
<location filename="../dialog.ui" line="131"/>
12+
<location filename="../../dialog.ui" line="131"/>
1313
<source>wireless connect</source>
1414
<translation>wireless connect</translation>
1515
</message>
1616
<message>
17-
<location filename="../dialog.ui" line="138"/>
17+
<location filename="../../dialog.ui" line="138"/>
1818
<source>wireless disconnect</source>
1919
<translation>wireless disconnect</translation>
2020
</message>
2121
<message>
22-
<location filename="../dialog.ui" line="195"/>
22+
<location filename="../../dialog.ui" line="198"/>
2323
<source>record save path:</source>
2424
<translation>record save psth:</translation>
2525
</message>
2626
<message>
27-
<location filename="../dialog.ui" line="209"/>
28-
<location filename="../dialog.cpp" line="202"/>
27+
<location filename="../../dialog.ui" line="212"/>
28+
<location filename="../../dialog.cpp" line="219"/>
2929
<source>select path</source>
3030
<translation>select path</translation>
3131
</message>
3232
<message>
33-
<location filename="../dialog.ui" line="32"/>
33+
<location filename="../../dialog.ui" line="219"/>
34+
<source>record format：</source>
35+
<translation>record format:</translation>
36+
</message>
37+
<message>
38+
<location filename="../../dialog.ui" line="226"/>
39+
<source>always top</source>
40+
<translation>always top</translation>
41+
</message>
42+
<message>
43+
<location filename="../../dialog.ui" line="236"/>
44+
<source>close screen</source>
45+
<translation>close screen</translation>
46+
</message>
47+
<message>
48+
<location filename="../../dialog.ui" line="32"/>
3449
<source>USB line</source>
3550
<translation>USB line</translation>
3651
</message>
3752
<message>
38-
<location filename="../dialog.ui" line="45"/>
53+
<location filename="../../dialog.ui" line="45"/>
3954
<source>stop server</source>
4055
<translation>stop server</translation>
4156
</message>
4257
<message>
43-
<location filename="../dialog.ui" line="76"/>
58+
<location filename="../../dialog.ui" line="76"/>
4459
<source>start server</source>
4560
<translation>start server</translation>
4661
</message>
4762
<message>
48-
<location filename="../dialog.ui" line="66"/>
63+
<location filename="../../dialog.ui" line="66"/>
4964
<source>device serial:</source>
5065
<translation>device serial:</translation>
5166
</message>
5267
<message>
53-
<location filename="../dialog.ui" line="158"/>
68+
<location filename="../../dialog.ui" line="158"/>
5469
<source>Config</source>
5570
<translation>Config</translation>
5671
</message>
5772
<message>
58-
<location filename="../dialog.ui" line="188"/>
73+
<location filename="../../dialog.ui" line="191"/>
5974
<source>bit rate:</source>
6075
<translation>bit rate:</translation>
6176
</message>
6277
<message>
63-
<location filename="../dialog.ui" line="181"/>
78+
<location filename="../../dialog.ui" line="167"/>
6479
<source>video size:</source>
6580
<translation>video size:</translation>
6681
</message>
6782
<message>
68-
<location filename="../dialog.ui" line="59"/>
83+
<location filename="../../dialog.ui" line="59"/>
6984
<source>start adbd</source>
7085
<translation>start adbd</translation>
7186
</message>
7287
<message>
73-
<location filename="../dialog.ui" line="38"/>
88+
<location filename="../../dialog.ui" line="38"/>
7489
<source>get device ip</source>
7590
<translation>get device ip</translation>
7691
</message>
7792
<message>
78-
<location filename="../dialog.ui" line="52"/>
93+
<location filename="../../dialog.ui" line="52"/>
7994
<source>update device</source>
8095
<translation>update device</translation>
8196
</message>
8297
</context>
8398
<context>
8499
<name>ToolForm</name>
85100
<message>
86-
<location filename="../toolform.ui" line="14"/>
101+
<location filename="../../toolform.ui" line="14"/>
87102
<source>Tool</source>
88103
<translation>Tool</translation>
89104
</message>
90105
<message>
91-
<location filename="../toolform.ui" line="20"/>
106+
<location filename="../../toolform.ui" line="26"/>
92107
<source>full screen</source>
93108
<translation>full screen</translation>
94109
</message>
95110
<message>
96-
<location filename="../toolform.ui" line="43"/>
111+
<location filename="../../toolform.ui" line="49"/>
112+
<source>expand notify</source>
113+
<translation>expand notify</translation>
114+
</message>
115+
<message>
116+
<location filename="../../toolform.ui" line="59"/>
97117
<source>turn off</source>
98118
<translation>turn off</translation>
99119
</message>
100120
<message>
101-
<location filename="../toolform.ui" line="53"/>
121+
<location filename="../../toolform.ui" line="69"/>
102122
<source>turn on</source>
103123
<translation>turn on</translation>
104124
</message>
105125
<message>
106-
<location filename="../toolform.ui" line="63"/>
126+
<location filename="../../toolform.ui" line="79"/>
107127
<source>volume up</source>
108128
<translation>volume up</translation>
109129
</message>
110130
<message>
111-
<location filename="../toolform.ui" line="73"/>
131+
<location filename="../../toolform.ui" line="89"/>
112132
<source>volume down</source>
113133
<translation>volume down</translation>
114134
</message>
115135
<message>
116-
<location filename="../toolform.ui" line="83"/>
136+
<location filename="../../toolform.ui" line="99"/>
117137
<source>app switch</source>
118138
<translation>app switch</translation>
119139
</message>
120140
<message>
121-
<location filename="../toolform.ui" line="93"/>
141+
<location filename="../../toolform.ui" line="109"/>
122142
<source>menu</source>
123143
<translation>menu</translation>
124144
</message>
125145
<message>
126-
<location filename="../toolform.ui" line="103"/>
146+
<location filename="../../toolform.ui" line="119"/>
127147
<source>home</source>
128148
<translation>home</translation>
129149
</message>
130150
<message>
131-
<location filename="../toolform.ui" line="113"/>
151+
<location filename="../../toolform.ui" line="129"/>
132152
<source>return</source>
133153
<translation>return</translation>
134154
</message>
135155
</context>
136156
<context>
137157
<name>VideoForm</name>
138158
<message>
139-
<location filename="../videoform.cpp" line="100"/>
159+
<location filename="../../videoform.cpp" line="143"/>
140160
<source>wait current file transfer to complete</source>
141161
<translation>wait current file transfer to complete</translation>
142162
</message>
143163
<message>
144-
<location filename="../videoform.cpp" line="103"/>
164+
<location filename="../../videoform.cpp" line="146"/>
145165
<source>file transfer complete</source>
146166
<translation>file transfer complete</translation>
147167
</message>
148168
<message>
149-
<location filename="../videoform.cpp" line="106"/>
169+
<location filename="../../videoform.cpp" line="149"/>
150170
<source>file transfer failed</source>
151171
<translation>file transfer failed</translation>
152172
</message>
153173
<message>
154-
<location filename="../videoform.cpp" line="441"/>
174+
<location filename="../../videoform.cpp" line="584"/>
155175
<source>file does not exist</source>
156176
<translation>file does not exist</translation>
157177
</message>
158178
</context>
159179
<context>
160180
<name>videoForm</name>
161181
<message>
162-
<location filename="../videoform.ui" line="78"/>
163182
<source>qrc:/qml/pinwheel.qml</source>
164-
<translation>qrc:/qml/pinwheel.qml</translation>
183+
<translation type="vanished">qrc:/qml/pinwheel.qml</translation>
165184
</message>
166185
</context>
167186
</TS>

‎QtScrcpy/res/i18n/QtScrcpy_zh.qm

1.84 KB
Binary file not shown.

0 commit comments

Comments
 (0)