update:调整资源文件

AprilLemon · Jun 19, 2019 · d973abf · d973abf
1 parent 1260264
commit d973abf
Show file tree

Hide file tree

Showing 39 changed files with 781 additions and 727 deletions.
diff --git a/QtScrcpy/QtScrcpy.pro b/QtScrcpy/QtScrcpy.pro
@@ -161,5 +161,5 @@ linux {
 # message("test")
 
 RESOURCES += \
-    res.qrc
+    res/res.qrc
 
diff --git a/QtScrcpy/fontawesome/iconhelper.cpp b/QtScrcpy/fontawesome/iconhelper.cpp
@@ -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);
 }

diff --git a/QtScrcpy/i18n/QtScrcpy_en.qm b/QtScrcpy/i18n/QtScrcpy_en.qm
diff --git a/QtScrcpy/i18n/QtScrcpy_zh.qm b/QtScrcpy/i18n/QtScrcpy_zh.qm
diff --git a/QtScrcpy/main.cpp b/QtScrcpy/main.cpp
@@ -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";

diff --git a/QtScrcpy/res.qrc b/QtScrcpy/res.qrc
diff --git a/QtScrcpy/res/fontawesome-webfont.ttf → QtScrcpy/res/font/fontawesome-webfont.ttf b/QtScrcpy/res/fontawesome-webfont.ttf → QtScrcpy/res/font/fontawesome-webfont.ttf
diff --git a/QtScrcpy/res/fontawesome-webfont.pdf b/QtScrcpy/res/fontawesome-webfont.pdf
diff --git a/QtScrcpy/res/i18n/QtScrcpy_en.qm b/QtScrcpy/res/i18n/QtScrcpy_en.qm
diff --git a/QtScrcpy/i18n/QtScrcpy_en.ts → QtScrcpy/res/i18n/QtScrcpy_en.ts b/QtScrcpy/i18n/QtScrcpy_en.ts → QtScrcpy/res/i18n/QtScrcpy_en.ts
@@ -4,164 +4,183 @@
 <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>
 </context>
 <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>
 </context>
 <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>
 </context>
 <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>
diff --git a/QtScrcpy/res/i18n/QtScrcpy_zh.qm b/QtScrcpy/res/i18n/QtScrcpy_zh.qm