Skip to content

Commit 4bd7766

Browse files
LadbabyLadbaby
committed
Merge branch 'dev_windows'
2 parents 729a0f0 + 7f71020 commit 4bd7766

File tree

9 files changed

+483258
-483737
lines changed

9 files changed

+483258
-483737
lines changed

‎app/common/config.py‎

Lines changed: 4 additions & 16 deletions
Original file line numberDiff line numberDiff line change

‎app/common/resource.py‎

Lines changed: 483227 additions & 483227 deletions
Original file line numberDiff line numberDiff line change

‎app/config/config.json‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change

‎app/view/battery_history_interface.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change

‎app/view/gallery_interface.py‎

Lines changed: 2 additions & 12 deletions
Original file line numberDiff line numberDiff line change

‎app/view/home_interface.py‎

Lines changed: 6 additions & 336 deletions
Original file line numberDiff line numberDiff line change

‎app/view/main_window.py‎

Lines changed: 2 additions & 22 deletions
Original file line numberDiff line numberDiff line change

‎app/view/monitoring_status_interface.py‎

Lines changed: 5 additions & 27 deletions
Original file line numberDiff line numberDiff line change

‎app/view/setting_interface.py‎

Lines changed: 11 additions & 89 deletions
Original file line numberDiff line numberDiff line change

0 commit comments

Comments
 (0)