Skip to content

Commit 50a6ba5

Browse files
tonquertonquer
committed
update
1 parent 9b6ce92 commit 50a6ba5

41 files changed

Lines changed: 45149 additions & 22553 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.github/workflows/CI.yml‎

Lines changed: 0 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -45,45 +45,6 @@ jobs:
4545
name: ${{ env.PACKAGENAME }}
4646
path: ${{ env.PACKAGENAME }}
4747
retention-days: 7
48-
49-
windows7:
50-
runs-on: windows-latest
51-
env:
52-
PACKAGENAME: jmcomic_py38_windows7_x64
53-
steps:
54-
- uses: actions/checkout@v4
55-
- name: Set up Python 3.8
56-
uses: actions/setup-python@v5
57-
with:
58-
python-version: 3.8
59-
- name: Install dependencies
60-
run: |
61-
python -m pip install --upgrade pip
62-
pip install pyinstaller
63-
pip install sr-vulkan
64-
pip install sr-vulkan-model-waifu2x
65-
pip install sr-vulkan-model-realcugan
66-
pip install sr-vulkan-model-realesrgan
67-
pip install -r src\requirements_win7.txt
68-
- name: Build
69-
run: |
70-
python script/build_qrc.py
71-
cd src
72-
cp ..\res\icon\icon.ico .\
73-
pyinstaller --hidden-import=_cffi_backend --collect-data curl_cffi --add-data "..\lib\win\*;." -F -w -i icon.ico start.py
74-
mv dist jmcomic
75-
cp ..\LICENSE jmcomic\
76-
cp ..\CHANGELOG jmcomic\
77-
cd ..
78-
mkdir ${{ env.PACKAGENAME }}
79-
mv src\jmcomic ${{ env.PACKAGENAME }}
80-
7z a -r "$($Env:PACKAGENAME + '.zip')" "jmcomic"
81-
- name: Upload
82-
uses: actions/upload-artifact@v4
83-
with:
84-
name: ${{ env.PACKAGENAME }}
85-
path: ${{ env.PACKAGENAME }}
86-
retention-days: 7
8748

8849
ubuntu:
8950
runs-on: ubuntu-latest

‎.github/workflows/release.yml‎

Lines changed: 0 additions & 112 deletions
Original file line numberDiff line numberDiff line change
@@ -292,118 +292,6 @@ jobs:
292292
asset_name: ${{ env.PACKAGENAME }}.7z
293293
asset_content_type: application/x-7z-compressed
294294

295-
windows7:
296-
if: github.event_name == 'push' || github.event.inputs.build_windows7 == 'true'
297-
needs: [setup, release]
298-
runs-on: windows-latest
299-
env:
300-
PACKAGENAME: ${{ needs.setup.outputs.PACKAGE_PREFIX }}_windows7_x64
301-
EXE_NAME: start.exe
302-
steps:
303-
- uses: actions/checkout@v4
304-
- name: Set up Python 3.8
305-
uses: actions/setup-python@v5
306-
with:
307-
python-version: 3.8
308-
309-
- name: Install dependencies
310-
run: |
311-
python -m pip install --upgrade pip
312-
pip install pyinstaller
313-
pip install sr-vulkan
314-
pip install sr-vulkan-model-waifu2x
315-
pip install sr-vulkan-model-realcugan
316-
pip install sr-vulkan-model-realesrgan
317-
pip install -r src\requirements_win7.txt
318-
Invoke-WebRequest -Uri "https://github.com/upx/upx/releases/download/v5.0.1/upx-5.0.1-win64.zip" -OutFile "upx.zip"
319-
Expand-Archive -Path "upx.zip" -DestinationPath "D:\"
320-
Remove-Item "upx.zip"
321-
- name: Build
322-
run: |
323-
python script/build_qrc.py
324-
cd src
325-
cp ..\res\icon\icon.ico .\
326-
pyinstaller --hidden-import=_cffi_backend --collect-data curl_cffi --add-data "..\lib\win\*;." -F -w -i icon.ico start.py --upx-dir "D:\upx-5.0.1-win64"
327-
$pkg = "jmcomic"
328-
Remove-Item -Recurse -Force $pkg -ErrorAction SilentlyContinue
329-
New-Item $pkg -ItemType Directory
330-
Move-Item "dist\$env:EXE_NAME" "$pkg\start.exe"
331-
Copy-Item ..\LICENSE $pkg\
332-
Copy-Item ..\CHANGELOG $pkg\
333-
7z a -t7z -mx9 "$env:PACKAGENAME.7z" $pkg
334-
Move-Item "${env:PACKAGENAME}.7z" ..\
335-
cd ..
336-
337-
- name: Upload artifact
338-
uses: actions/upload-artifact@v4
339-
with:
340-
name: ${{ env.PACKAGENAME }}
341-
path: ${{ env.PACKAGENAME }}.7z
342-
343-
- name: upload-win
344-
uses: actions/upload-release-asset@v1
345-
env:
346-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
347-
with:
348-
upload_url: ${{ needs.release.outputs.Up_Url }}
349-
asset_path: ${{ env.PACKAGENAME }}.7z
350-
asset_name: ${{ env.PACKAGENAME }}.7z
351-
asset_content_type: application/x-7z-compressed
352-
353-
windows7-nosr:
354-
if: github.event_name == 'push' || github.event.inputs.build_windows7_nosr == 'true'
355-
needs: [setup, release]
356-
runs-on: windows-latest
357-
env:
358-
PACKAGENAME: ${{ needs.setup.outputs.PACKAGE_PREFIX }}_windows7_x64_nosr
359-
EXE_NAME: start.exe
360-
steps:
361-
- uses: actions/checkout@v4
362-
- name: Set up Python 3.8
363-
uses: actions/setup-python@v5
364-
with:
365-
python-version: 3.8
366-
367-
- name: Install dependencies
368-
run: |
369-
python -m pip install --upgrade pip
370-
pip install pyinstaller
371-
pip install -r src\requirements_win7.txt
372-
Invoke-WebRequest -Uri "https://github.com/upx/upx/releases/download/v5.0.1/upx-5.0.1-win64.zip" -OutFile "upx.zip"
373-
Expand-Archive -Path "upx.zip" -DestinationPath "D:\"
374-
Remove-Item "upx.zip"
375-
- name: Build
376-
run: |
377-
python script/build_qrc.py
378-
cd src
379-
cp ..\res\icon\icon.ico .\
380-
pyinstaller --hidden-import=_cffi_backend --collect-data curl_cffi --add-data "..\lib\win\*;." -F -w -i icon.ico start.py --upx-dir "D:\upx-5.0.1-win64"
381-
$pkg = "jmcomic"
382-
Remove-Item -Recurse -Force $pkg -ErrorAction SilentlyContinue
383-
New-Item $pkg -ItemType Directory
384-
Move-Item "dist\$env:EXE_NAME" "$pkg\start.exe"
385-
Copy-Item ..\LICENSE $pkg\
386-
Copy-Item ..\CHANGELOG $pkg\
387-
7z a -t7z -mx9 "$env:PACKAGENAME.7z" $pkg
388-
Move-Item "${env:PACKAGENAME}.7z" ..\
389-
cd ..
390-
391-
- name: Upload artifact
392-
uses: actions/upload-artifact@v4
393-
with:
394-
name: ${{ env.PACKAGENAME }}
395-
path: ${{ env.PACKAGENAME }}.7z
396-
397-
- name: upload-win
398-
uses: actions/upload-release-asset@v1
399-
env:
400-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
401-
with:
402-
upload_url: ${{ needs.release.outputs.Up_Url }}
403-
asset_path: ${{ env.PACKAGENAME }}.7z
404-
asset_name: ${{ env.PACKAGENAME }}.7z
405-
asset_content_type: application/x-7z-compressed
406-
407295
# ubuntu:
408296
# needs: [setup, release]
409297
# runs-on: ubuntu-latest

‎res/icon/error.svg‎

Lines changed: 1 addition & 0 deletions
Loading

‎res/icon/right.svg‎

Lines changed: 1 addition & 0 deletions
Loading

‎res/images.qrc‎

Lines changed: 153 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,9 +69,11 @@
6969
<file>icon/loading/loading_8.png</file>
7070
<file>icon/loading/loading_9.png</file>
7171
<file>icon/loading/loading_10.png</file>
72+
<file>icon/right.svg</file>
73+
<file>icon/error.svg</file>
7274
</qresource>
7375
<qresource prefix="icon">
74-
<file>theme/dark_orange/disabled/base.svg</file>
76+
<file>theme/dark_orange/disabled/base.svg</file>
7577
<file>theme/dark_orange/disabled/branch-closed.svg</file>
7678
<file>theme/dark_orange/disabled/branch-end.svg</file>
7779
<file>theme/dark_orange/disabled/branch-more.svg</file>
@@ -219,6 +221,154 @@
219221
<file>theme/light_orange/primary/uparrow.svg</file>
220222
<file>theme/light_orange/primary/uparrow2.svg</file>
221223
<file>theme/light_orange/primary/vline.svg</file>
224+
<file>theme/dark_pink/disabled/base.svg</file>
225+
<file>theme/dark_pink/disabled/branch-closed.svg</file>
226+
<file>theme/dark_pink/disabled/branch-end.svg</file>
227+
<file>theme/dark_pink/disabled/branch-more.svg</file>
228+
<file>theme/dark_pink/disabled/branch-open.svg</file>
229+
<file>theme/dark_pink/disabled/checkbox_checked.svg</file>
230+
<file>theme/dark_pink/disabled/checkbox_checked_invert.svg</file>
231+
<file>theme/dark_pink/disabled/checkbox_indeterminate.svg</file>
232+
<file>theme/dark_pink/disabled/checkbox_indeterminate_invert.svg</file>
233+
<file>theme/dark_pink/disabled/checkbox_unchecked.svg</file>
234+
<file>theme/dark_pink/disabled/checkbox_unchecked_invert.svg</file>
235+
<file>theme/dark_pink/disabled/checklist.svg</file>
236+
<file>theme/dark_pink/disabled/checklist_indeterminate.svg</file>
237+
<file>theme/dark_pink/disabled/checklist_indeterminate_invert.svg</file>
238+
<file>theme/dark_pink/disabled/checklist_invert.svg</file>
239+
<file>theme/dark_pink/disabled/close.svg</file>
240+
<file>theme/dark_pink/disabled/downarrow.svg</file>
241+
<file>theme/dark_pink/disabled/downarrow2.svg</file>
242+
<file>theme/dark_pink/disabled/float.svg</file>
243+
<file>theme/dark_pink/disabled/leftarrow.svg</file>
244+
<file>theme/dark_pink/disabled/leftarrow2.svg</file>
245+
<file>theme/dark_pink/disabled/radiobutton_checked.svg</file>
246+
<file>theme/dark_pink/disabled/radiobutton_checked_invert.svg</file>
247+
<file>theme/dark_pink/disabled/radiobutton_unchecked.svg</file>
248+
<file>theme/dark_pink/disabled/radiobutton_unchecked_invert.svg</file>
249+
<file>theme/dark_pink/disabled/rightarrow.svg</file>
250+
<file>theme/dark_pink/disabled/rightarrow2.svg</file>
251+
<file>theme/dark_pink/disabled/sizegrip.svg</file>
252+
<file>theme/dark_pink/disabled/slider.svg</file>
253+
<file>theme/dark_pink/disabled/splitter-horizontal.svg</file>
254+
<file>theme/dark_pink/disabled/splitter-vertical.svg</file>
255+
<file>theme/dark_pink/disabled/tab_close.svg</file>
256+
<file>theme/dark_pink/disabled/toolbar-handle-horizontal.svg</file>
257+
<file>theme/dark_pink/disabled/toolbar-handle-vertical.svg</file>
258+
<file>theme/dark_pink/disabled/uparrow.svg</file>
259+
<file>theme/dark_pink/disabled/uparrow2.svg</file>
260+
<file>theme/dark_pink/disabled/vline.svg</file>
261+
<file>theme/dark_pink/primary/base.svg</file>
262+
<file>theme/dark_pink/primary/branch-closed.svg</file>
263+
<file>theme/dark_pink/primary/branch-end.svg</file>
264+
<file>theme/dark_pink/primary/branch-more.svg</file>
265+
<file>theme/dark_pink/primary/branch-open.svg</file>
266+
<file>theme/dark_pink/primary/checkbox_checked.svg</file>
267+
<file>theme/dark_pink/primary/checkbox_checked_invert.svg</file>
268+
<file>theme/dark_pink/primary/checkbox_indeterminate.svg</file>
269+
<file>theme/dark_pink/primary/checkbox_indeterminate_invert.svg</file>
270+
<file>theme/dark_pink/primary/checkbox_unchecked.svg</file>
271+
<file>theme/dark_pink/primary/checkbox_unchecked_invert.svg</file>
272+
<file>theme/dark_pink/primary/checklist.svg</file>
273+
<file>theme/dark_pink/primary/checklist_indeterminate.svg</file>
274+
<file>theme/dark_pink/primary/checklist_indeterminate_invert.svg</file>
275+
<file>theme/dark_pink/primary/checklist_invert.svg</file>
276+
<file>theme/dark_pink/primary/close.svg</file>
277+
<file>theme/dark_pink/primary/downarrow.svg</file>
278+
<file>theme/dark_pink/primary/downarrow2.svg</file>
279+
<file>theme/dark_pink/primary/float.svg</file>
280+
<file>theme/dark_pink/primary/leftarrow.svg</file>
281+
<file>theme/dark_pink/primary/leftarrow2.svg</file>
282+
<file>theme/dark_pink/primary/radiobutton_checked.svg</file>
283+
<file>theme/dark_pink/primary/radiobutton_checked_invert.svg</file>
284+
<file>theme/dark_pink/primary/radiobutton_unchecked.svg</file>
285+
<file>theme/dark_pink/primary/radiobutton_unchecked_invert.svg</file>
286+
<file>theme/dark_pink/primary/rightarrow.svg</file>
287+
<file>theme/dark_pink/primary/rightarrow2.svg</file>
288+
<file>theme/dark_pink/primary/sizegrip.svg</file>
289+
<file>theme/dark_pink/primary/slider.svg</file>
290+
<file>theme/dark_pink/primary/splitter-horizontal.svg</file>
291+
<file>theme/dark_pink/primary/splitter-vertical.svg</file>
292+
<file>theme/dark_pink/primary/tab_close.svg</file>
293+
<file>theme/dark_pink/primary/toolbar-handle-horizontal.svg</file>
294+
<file>theme/dark_pink/primary/toolbar-handle-vertical.svg</file>
295+
<file>theme/dark_pink/primary/uparrow.svg</file>
296+
<file>theme/dark_pink/primary/uparrow2.svg</file>
297+
<file>theme/dark_pink/primary/vline.svg</file>
298+
<file>theme/light_pink/disabled/base.svg</file>
299+
<file>theme/light_pink/disabled/branch-closed.svg</file>
300+
<file>theme/light_pink/disabled/branch-end.svg</file>
301+
<file>theme/light_pink/disabled/branch-more.svg</file>
302+
<file>theme/light_pink/disabled/branch-open.svg</file>
303+
<file>theme/light_pink/disabled/checkbox_checked.svg</file>
304+
<file>theme/light_pink/disabled/checkbox_checked_invert.svg</file>
305+
<file>theme/light_pink/disabled/checkbox_indeterminate.svg</file>
306+
<file>theme/light_pink/disabled/checkbox_indeterminate_invert.svg</file>
307+
<file>theme/light_pink/disabled/checkbox_unchecked.svg</file>
308+
<file>theme/light_pink/disabled/checkbox_unchecked_invert.svg</file>
309+
<file>theme/light_pink/disabled/checklist.svg</file>
310+
<file>theme/light_pink/disabled/checklist_indeterminate.svg</file>
311+
<file>theme/light_pink/disabled/checklist_indeterminate_invert.svg</file>
312+
<file>theme/light_pink/disabled/checklist_invert.svg</file>
313+
<file>theme/light_pink/disabled/close.svg</file>
314+
<file>theme/light_pink/disabled/downarrow.svg</file>
315+
<file>theme/light_pink/disabled/downarrow2.svg</file>
316+
<file>theme/light_pink/disabled/float.svg</file>
317+
<file>theme/light_pink/disabled/leftarrow.svg</file>
318+
<file>theme/light_pink/disabled/leftarrow2.svg</file>
319+
<file>theme/light_pink/disabled/radiobutton_checked.svg</file>
320+
<file>theme/light_pink/disabled/radiobutton_checked_invert.svg</file>
321+
<file>theme/light_pink/disabled/radiobutton_unchecked.svg</file>
322+
<file>theme/light_pink/disabled/radiobutton_unchecked_invert.svg</file>
323+
<file>theme/light_pink/disabled/rightarrow.svg</file>
324+
<file>theme/light_pink/disabled/rightarrow2.svg</file>
325+
<file>theme/light_pink/disabled/sizegrip.svg</file>
326+
<file>theme/light_pink/disabled/slider.svg</file>
327+
<file>theme/light_pink/disabled/splitter-horizontal.svg</file>
328+
<file>theme/light_pink/disabled/splitter-vertical.svg</file>
329+
<file>theme/light_pink/disabled/tab_close.svg</file>
330+
<file>theme/light_pink/disabled/toolbar-handle-horizontal.svg</file>
331+
<file>theme/light_pink/disabled/toolbar-handle-vertical.svg</file>
332+
<file>theme/light_pink/disabled/uparrow.svg</file>
333+
<file>theme/light_pink/disabled/uparrow2.svg</file>
334+
<file>theme/light_pink/disabled/vline.svg</file>
335+
<file>theme/light_pink/primary/base.svg</file>
336+
<file>theme/light_pink/primary/branch-closed.svg</file>
337+
<file>theme/light_pink/primary/branch-end.svg</file>
338+
<file>theme/light_pink/primary/branch-more.svg</file>
339+
<file>theme/light_pink/primary/branch-open.svg</file>
340+
<file>theme/light_pink/primary/checkbox_checked.svg</file>
341+
<file>theme/light_pink/primary/checkbox_checked_invert.svg</file>
342+
<file>theme/light_pink/primary/checkbox_indeterminate.svg</file>
343+
<file>theme/light_pink/primary/checkbox_indeterminate_invert.svg</file>
344+
<file>theme/light_pink/primary/checkbox_unchecked.svg</file>
345+
<file>theme/light_pink/primary/checkbox_unchecked_invert.svg</file>
346+
<file>theme/light_pink/primary/checklist.svg</file>
347+
<file>theme/light_pink/primary/checklist_indeterminate.svg</file>
348+
<file>theme/light_pink/primary/checklist_indeterminate_invert.svg</file>
349+
<file>theme/light_pink/primary/checklist_invert.svg</file>
350+
<file>theme/light_pink/primary/close.svg</file>
351+
<file>theme/light_pink/primary/downarrow.svg</file>
352+
<file>theme/light_pink/primary/downarrow2.svg</file>
353+
<file>theme/light_pink/primary/float.svg</file>
354+
<file>theme/light_pink/primary/leftarrow.svg</file>
355+
<file>theme/light_pink/primary/leftarrow2.svg</file>
356+
<file>theme/light_pink/primary/radiobutton_checked.svg</file>
357+
<file>theme/light_pink/primary/radiobutton_checked_invert.svg</file>
358+
<file>theme/light_pink/primary/radiobutton_unchecked.svg</file>
359+
<file>theme/light_pink/primary/radiobutton_unchecked_invert.svg</file>
360+
<file>theme/light_pink/primary/rightarrow.svg</file>
361+
<file>theme/light_pink/primary/rightarrow2.svg</file>
362+
<file>theme/light_pink/primary/sizegrip.svg</file>
363+
<file>theme/light_pink/primary/slider.svg</file>
364+
<file>theme/light_pink/primary/splitter-horizontal.svg</file>
365+
<file>theme/light_pink/primary/splitter-vertical.svg</file>
366+
<file>theme/light_pink/primary/tab_close.svg</file>
367+
<file>theme/light_pink/primary/toolbar-handle-horizontal.svg</file>
368+
<file>theme/light_pink/primary/toolbar-handle-vertical.svg</file>
369+
<file>theme/light_pink/primary/uparrow.svg</file>
370+
<file>theme/light_pink/primary/uparrow2.svg</file>
371+
<file>theme/light_pink/primary/vline.svg</file>
222372
<file>theme/scrollbar/scrollbar_arrowup_normal.png</file>
223373
<file>theme/scrollbar/scrollbar_arrowleft_normal.png</file>
224374
<file>theme/scrollbar/scrollbar_arrowup_down.png</file>
@@ -233,6 +383,8 @@
233383
<file>theme/scrollbar/scrollbar_arrowright_highlight.png</file>
234384
</qresource>
235385
<qresource prefix="file">
386+
<file>theme/dark_pink.qss</file>
387+
<file>theme/light_pink.qss</file>
236388
<file>theme/dark_orange.qss</file>
237389
<file>theme/light_orange.qss</file>
238390
<file>tr/tr_en.qm</file>

‎src/component/button/switch_button.py‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
from PySide6.QtGui import QPen, QColor, QBrush, Qt, QPainter, QFont
33
from PySide6.QtWidgets import QWidget
44

5+
from qt_owner import QtOwner
56
from tools.str import Str
67

78

@@ -49,7 +50,7 @@ def paintEvent(self, event):
4950
if self.state:
5051
# 绘制背景
5152
painter.setPen(Qt.NoPen)
52-
brush = QBrush(QColor('#E07000'))
53+
brush = QBrush(QColor(QtOwner().GetThemeColor()))
5354
painter.setBrush(brush)
5455
painter.drawRoundedRect(0, 0, self.width(), self.height(), self.height() // 2, self.height() // 2)
5556

‎src/component/list/comic_list_widget.py‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -116,6 +116,7 @@ def AddBookByLocal(self, v, category=""):
116116
assert isinstance(v, LocalData)
117117
index = self.count()
118118
widget = ComicItemWidget()
119+
widget.toolButton.hide()
119120
widget.setFocusPolicy(Qt.NoFocus)
120121
widget.id = v.id
121122
title = v.title
@@ -124,9 +125,9 @@ def AddBookByLocal(self, v, category=""):
124125
widget.picNum = v.picCnt
125126
widget.url = v.file
126127
if len(v.eps) > 0:
127-
fontColor = "<font color=#CC6600>{}</font>".format("(" + str(len(v.eps)) + "E)")
128+
fontColor = "<font color={}>{}</font>".format(QtOwner().GetThemeColor(), "(" + str(len(v.eps)) + "E)")
128129
else:
129-
fontColor = "<font color=#CC6600>{}</font>".format("(" + str(v.picCnt) + "P)")
130+
fontColor = "<font color={}>{}</font>".format(QtOwner().GetThemeColor(), "(" + str(v.picCnt) + "P)")
130131
if v.lastReadTime:
131132
categories = "{} {}".format(ToolUtil.GetUpdateStrByTick(v.lastReadTime), Str.GetStr(Str.Looked))
132133

0 commit comments

Comments
 (0)