Skip to content

Commit 7a19b41

Browse files
committed
update
1 parent 221c3f9 commit 7a19b41

File tree

8 files changed

+20
-12
lines changed

8 files changed

+20
-12
lines changed
102 KB
Binary file not shown.
198 KB
Binary file not shown.

.settings/org.eclipse.core.resources.prefs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
eclipse.preferences.version=1
2+
encoding//Resources/Data/Projects/PyQt/Demo/FacePoints.py=utf-8
23
encoding//Test/CustomCursor.py=utf-8
34
encoding//Test/GenerateLanguage.py=utf-8
45
encoding//Test/RunCode.py=utf-8

README.md

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,21 @@ The project is currently under development. It requires both PyQt 5.10 and QtWeb
66

77
## Installing
88

9+
1.install requirements
910
```
10-
pip install pygit2==0.27.2
1111
pip install requests
12+
pip install pygit2==0.27.2
1213
pip install PyQt5==5.10.1
1314
pip install PyQt3D==5.10.1
1415
pip install PyQtChart==5.10.1
1516
pip install PyQtDataVisualization==5.10.1
1617
pip install PyQtPurchasing==5.10.1
1718
```
1819

19-
Then download [QtWebKit](https://github.com/annulen/webkit/releases/) and extract to PYTHONPATH/Lib/site-packages/PyQt5/Qt
20+
2.install QtWebKit
21+
22+
download [QtWebKit](https://github.com/annulen/webkit/releases/) and extract to PYTHONPATH/Lib/site-packages/PyQt5/Qt
23+
24+
3.install QtWebKit pyd
25+
26+
copy .Data/site-packages to PYTHONPATH/Lib/site-packages

Utils/GitThread.py

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ def get_avatar(self, uid, avatar_url):
8888
else:
8989
AppLog.warn('can not load from image data')
9090
except Exception as e:
91-
AppLog.warn(str(e))
91+
AppLog.exception(e)
9292

9393
def run(self):
9494
AppLog.info('start login github')
@@ -121,15 +121,15 @@ def run(self):
121121
except ConnectTimeout as e:
122122
Signals.loginErrored.emit(QCoreApplication.translate(
123123
'Repository', 'Connect Timeout'))
124-
AppLog.warn(str(e))
124+
AppLog.exception(e)
125125
except ConnectionError as e:
126126
Signals.loginErrored.emit(QCoreApplication.translate(
127127
'Repository', 'Connection Error'))
128-
AppLog.warn(str(e))
128+
AppLog.exception(e)
129129
except Exception as e:
130130
Signals.loginErrored.emit(QCoreApplication.translate(
131131
'Repository', 'Unknown Error'))
132-
AppLog.warn(str(e))
132+
AppLog.exception(e)
133133

134134
AppLog.info('login thread end')
135135

@@ -253,7 +253,7 @@ def run(self):
253253
self.pull(repo)
254254
Signals.progressStoped.emit()
255255
except Exception as e:
256-
AppLog.warn(str(e))
256+
AppLog.exception(e)
257257

258258
AppLog.info('clone thread end')
259259
Signals.progressStoped.emit()
@@ -347,5 +347,5 @@ def run(self):
347347
except Exception as e:
348348
Signals.updateFinished.emit(
349349
self.tr('update failed: {}').format(str(e)))
350-
AppLog.warn(str(e))
350+
AppLog.exception(e)
351351
AppLog.info('update thread end')

Utils/ThemeManager.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ def loadTheme(cls):
9595
open(path, 'rb').read().decode('utf-8', errors='ignore'))
9696
return 1
9797
except Exception as e:
98-
AppLog.error(str(e))
98+
AppLog.exception(e)
9999

100100
@classmethod
101101
def loadUserTheme(cls, theme='Default'):
@@ -139,7 +139,7 @@ def loadPictureTheme(cls, image=None):
139139
*color)
140140
QApplication.instance().setStyleSheet(styleSheet)
141141
except Exception as e:
142-
AppLog.error(str(e))
142+
AppLog.exception(e)
143143

144144
@classmethod
145145
def loadCursor(cls, widget, name='default.png'):

Widgets/Dialogs/LoginDialog.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ def on_lineEditAccount_textChanged(self, account):
8080
self._accounts[account][1].encode()).decode())
8181
except Exception as e:
8282
self.lineEditPassword.setText('')
83-
AppLog.warn(str(e))
83+
AppLog.exception(e)
8484
# 更新头像
8585
path = os.path.join(Constants.ImageDir, self._accounts[account][0]).replace(
8686
'\\', '/') + '.jpg'

requirements.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
pygit2==0.27.2
21
requests
2+
pygit2==0.27.2
33
PyQt5==5.10.1
44
PyQt3D==5.10.1
55
PyQtChart==5.10.1

0 commit comments

Comments
 (0)