add lang and modify search button

Author: 892768447

Diff for: .settings/org.eclipse.core.resources.prefs

@@ -20,11 +20,12 @@ encoding//Test/TestSkinDialog.py=utf-8
 encoding//Test/TestToolTip.py=utf-8
 encoding//Test/TestTreeView.py=utf-8
 encoding//Test/TestWaterWidget.py=utf-8
-encoding//Test/Ui2Py.py=utf-8
-encoding//Test/buildexetest/PyQtClient.py=utf-8
-encoding//Test/buildexetest/setup_win.py=utf-8
-encoding//Test/buildzip.py=utf-8
-encoding//Test/compilepy.py=utf-8
+encoding//Tools/Ui2Py.py=utf-8
+encoding//Tools/buildexetest/PyQtClient.py=utf-8
+encoding//Tools/buildexetest/setup_win.py=utf-8
+encoding//Tools/buildzip.py=utf-8
+encoding//Tools/compilepy.py=utf-8
+encoding//Tools/makelang.py=utf-8
 encoding//UiFiles/Ui_ErrorDialog.py=utf-8
 encoding//UiFiles/Ui_LoginDialog.py=utf-8
 encoding//UiFiles/Ui_MainWindow.py=utf-8

Diff for: PyQtClient.pro

@@ -0,0 +1,41 @@
+SOURCES         =                   UiFiles/Ui_DonateDialog.py\
+                  UiFiles/Ui_ErrorDialog.py\
+                  UiFiles/Ui_IssuesDialog.py\
+                  UiFiles/Ui_LoginDialog.py\
+                  UiFiles/Ui_MainWindow.py\
+                  UiFiles/Ui_PreviewWidget.py\
+                  UiFiles/Ui_ScrollArea.py\
+                  UiFiles/Ui_SkinDialog.py\
+                  UiFiles/Ui_UpdateDialog.py\
+                  Utils/Application.py\
+                  Utils/ColorThief.py\
+                  Utils/CommonUtil.py\
+                  Utils/Constants.py\
+                  Utils/GitThread.py\
+                  Utils/GradientUtils.py\
+                  Utils/NetworkAccessManager.py\
+                  Utils/SortFilterModel.py\
+                  Utils/TestColourfulWidget.py\
+                  Utils/ThemeManager.py\
+                  Utils/ThemeThread.py\
+                  Utils/Version.py\
+                  Widgets/FramelessWindow.py\
+                  Widgets/MainWindow.py\
+                  Widgets/MainWindowBase.py\
+                  Widgets/ToolTip.py\
+                  Widgets/TreeView.py\
+                  Widgets/WaterWidget.py\
+
+FORMS         =                   UiFiles/DonateDialog.ui\
+                  UiFiles/ErrorDialog.ui\
+                  UiFiles/IssuesDialog.ui\
+                  UiFiles/LoginDialog.ui\
+                  UiFiles/MainWindow.ui\
+                  UiFiles/PreviewWidget.ui\
+                  UiFiles/ScrollArea.ui\
+                  UiFiles/SkinDialog.ui\
+                  UiFiles/UpdateDialog.ui\
+
+TRANSLATIONS    = pyqtclient_zh_CN.ts
+CODECFORTR      = UTF-8
+CODECFORSRC     = UTF-8

Diff for: Resources/Themes/Dark/style.qss

@@ -114,7 +114,7 @@ QLineEdit {
     border-bottom-left-radius: 15px;
 }
 /*搜索框中的按钮*/
-#buttonSearch {
+#buttonClear {
     min-width: 26px;
     max-width: 26px;
     min-height: 26px;
@@ -124,7 +124,7 @@ QLineEdit {
     qproperty-bgColor: rgba(38, 38, 38, 255);
     outline: none;
     font-family: "pyqtclient";
-    qproperty-text: "\5100";
+    qproperty-text: "\2103";
 }
 
 /*目录树*/

Diff for: Resources/Themes/Default/style.qss

@@ -114,7 +114,7 @@ QLineEdit {
     border-bottom-left-radius: 15px;
 }
 /*搜索框中的按钮*/
-#buttonSearch {
+#buttonClear {
     min-width: 26px;
     max-width: 26px;
     min-height: 26px;
@@ -124,7 +124,7 @@ QLineEdit {
     qproperty-bgColor: rgba(39, 174, 97, 255);
     outline: none;
     font-family: "pyqtclient";
-    qproperty-text: "\5100";
+    qproperty-text: "\2103";
 }
 
 /*目录树*/

Diff for: Resources/Themes/春节/style.qss

@@ -115,7 +115,7 @@ QLineEdit {
     border-bottom-left-radius: 15px;
 }
 /*搜索框中的按钮*/
-#buttonSearch {
+#buttonClear {
     min-width: 26px;
     max-width: 26px;
     min-height: 26px;
@@ -125,7 +125,7 @@ QLineEdit {
     qproperty-bgColor: rgba(200, 47, 10, 255);
     outline: none;
     font-family: "pyqtclient";
-    qproperty-text: "\5100";
+    qproperty-text: "\2103";
 }
 
 /*目录树*/

Diff for: Test/Ui2Py.py renamed to Tools/Ui2Py.py

@@ -0,0 +1,4 @@
+cd %~dp0
+cd ..
+pylupdate5 PyQtClient.pro
+cd Tools

Diff for: Test/buildexetest/PyQtClient.py renamed to Tools/buildexetest/PyQtClient.py

@@ -0,0 +1,43 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+
+"""
+Created on 2018年3月29日
+@author: Irony
+@site: https://github.com/892768447
+@email: [email protected]
+@file: 生成多语言文件
+@description: 
+"""
+import os
+
+
+__Author__ = """By: Irony
+QQ: 892768447
+Email: [email protected]"""
+__Copyright__ = "Copyright (c) 2018 Irony"
+__Version__ = "Version 1.0"
+
+os.chdir('../')
+
+fp = open('PyQtClient.pro', 'wb')
+
+fp.write(b'SOURCES         = ')
+for path in ('UiFiles', 'Utils', 'Widgets'):
+    for name in os.listdir(path):
+        if name.find('__init__') > -1 or not name.endswith('.py'):
+            continue
+        fp.write('                  {}/{}\\\n'.format(path, name).encode())
+
+fp.write(b'\n')
+fp.write(b'FORMS         = ')
+path = 'UiFiles'
+for name in os.listdir(path):
+    if not name.endswith('.ui'):
+        continue
+    fp.write('                  {}/{}\\\n'.format(path, name).encode())
+
+fp.write(b'\n')
+fp.write(b'TRANSLATIONS    = pyqtclient_zh_CN.ts\n')
+fp.write(b'CODECFORTR      = UTF-8\n')
+fp.write(b'CODECFORSRC     = UTF-8\n')

Diff for: Test/buildexetest/app.ico renamed to Tools/buildexetest/app.ico

@@ -245,7 +245,7 @@
                 </widget>
                </item>
                <item>
-                <widget class="RubberBandButton" name="buttonSearch">
+                <widget class="RubberBandButton" name="buttonClear">
                  <property name="text">
                   <string/>
                  </property>

Diff for: Test/buildexetest/build_win.bat renamed to Tools/buildexetest/build_win.bat

@@ -94,10 +94,10 @@ def setupUi(self, FormMainWindow):
         self.lineEditSearch.setAlignment(QtCore.Qt.AlignCenter)
         self.lineEditSearch.setObjectName("lineEditSearch")
         self.horizontalLayout_3.addWidget(self.lineEditSearch)
-        self.buttonSearch = RubberBandButton(self.widgetSearch)
-        self.buttonSearch.setText("")
-        self.buttonSearch.setObjectName("buttonSearch")
-        self.horizontalLayout_3.addWidget(self.buttonSearch)
+        self.buttonClear = RubberBandButton(self.widgetSearch)
+        self.buttonClear.setText("")
+        self.buttonClear.setObjectName("buttonClear")
+        self.horizontalLayout_3.addWidget(self.buttonClear)
         self.verticalLayout_4.addWidget(self.widgetSearch)
         self.treeViewCatalogs = TreeView(self.widgetCatalogs)
         self.treeViewCatalogs.setFrameShape(QtWidgets.QFrame.NoFrame)

Diff for: Test/buildexetest/setup_win.py renamed to Tools/buildexetest/setup_win.py

@@ -39,3 +39,16 @@ def lessThan(self, source_left, source_right):
         # return super(SortFilterModel, self).lessThan(source_left,
         # source_right)
         return len(leftData) < len(rightData)
+
+    def filterAcceptsRow(self, sourceRow, sourceParent):
+        # 过滤
+        result = super(SortFilterModel, self).filterAcceptsRow(
+            sourceRow, sourceParent)
+        if result:
+            return result
+        else:
+            sourceIndex = self.sourceModel().index(sourceRow, 0, sourceParent)
+            for k in range(self.sourceModel().rowCount(sourceIndex)):
+                if self.filterAcceptsRow(k, sourceIndex):
+                    return True
+        return False

Diff for: Test/buildzip.py renamed to Tools/buildzip.py

@@ -42,7 +42,7 @@
 }}
 
 /*搜索框中的按钮*/
-#buttonSearch {{
+#buttonClear {{
     qproperty-bgColor: rgba({0}, {1}, {2}, 255);
 }}
 
@@ -149,7 +149,7 @@
 }}
 
 /*搜索框中的按钮*/
-#buttonSearch {{
+#buttonClear {{
     qproperty-bgColor: rgba({0}, {1}, {2}, 255);
 }}
 

Diff for: Test/compilepy.py renamed to Tools/compilepy.py

@@ -42,6 +42,7 @@ class MainWindow(FramelessWindow, MainWindowBase, Ui_FormMainWindow):
     def __init__(self, *args, **kwargs):
         super(MainWindow, self).__init__(*args, **kwargs)
         Setting.init(self)
+        self._initLanguage()
         self._initUi()
         self._initSignals()
         # 加载窗口大小并恢复

Diff for: Tools/makelang.bat

@@ -12,10 +12,11 @@
 import os
 import webbrowser
 
-from PyQt5.QtCore import pyqtSlot, QUrl
+from PyQt5.QtCore import pyqtSlot, QUrl, QLocale, QTranslator
 from PyQt5.QtGui import QColor
 from PyQt5.QtWebKit import QWebSettings
 from PyQt5.QtWebKitWidgets import QWebPage
+from PyQt5.QtWidgets import QApplication
 
 from Utils import Constants
 from Utils.CommonUtil import Signals, Setting, AppLog
@@ -43,7 +44,7 @@ def _initUi(self):
         ThemeManager.loadCursor(self.widgetMain)
         ThemeManager.setPointerCursors([
             self.buttonHead,            # 主界面头像
-            self.buttonSearch,          # 主界面搜索按钮
+            self.buttonClear,           # 主界面清空按钮
             self.buttonGithub,          # Github按钮
             self.buttonQQ,              # QQ按钮
             self.buttonGroup,           # 群按钮
@@ -89,6 +90,15 @@ def _initSignals(self):
         Signals.progressUpdated.connect(self.widgetCatalogs.setValue)
         Signals.updateDialogShowed.connect(self._initUpdate)
 
+    def _initLanguage(self):
+        """加载国际化翻译
+        """
+        if QLocale.system().language() in (QLocale.China, QLocale.Chinese, QLocale.Taiwan, QLocale.HongKong):
+            # 加载中文
+            translator = QTranslator(self)
+            translator.load('translations/pyqtclient_zh_CN.qm')
+            QApplication.instance().installTranslator(translator)
+
     def _initWebView(self):
         """初始化网页"""
         settings = self.webViewContent.settings()
@@ -157,14 +167,13 @@ def on_buttonHead_clicked(self):
     def on_lineEditSearch_textChanged(self, text):
         """过滤筛选
         """
-        return
         Signals.filterChanged.emit(text)
 
     @pyqtSlot()
-    def on_buttonSearch_clicked(self):
-        """点击搜索按钮
+    def on_buttonClear_clicked(self):
+        """点击清空按钮
         """
-        pass
+        self.lineEditSearch.setText('')
 
     @pyqtSlot()
     def on_buttonGithub_clicked(self):